From 5deed1cb86a8d0f9cf4523113f92ac8b1b25dca3 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 30 Jun 2016 18:59:18 -0500
Subject: [PATCH 0001/3449] network-interfaces: use setcap-wrappers for ping
 and ping6 iff linux kernel is at-least 4.3

---
 nixos/modules/tasks/network-interfaces.nix | 23 ++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index c52bd904caec..588a328192df 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, utils, ... }:
+{ config, lib, pkgs, utils, stdenv, ... }:
 
 with lib;
 with utils;
@@ -889,7 +889,26 @@ in
         (i: flip map [ "4" "6" ] (v: nameValuePair "net.ipv${v}.conf.${i.name}.proxy_arp" true))
       ));
 
-    security.setuidPrograms = [ "ping" "ping6" ];
+    # Capabilities won't work unless we have at-least a 4.3 Linux
+    # kernel because we need the ambient capability
+    security.setcapCapabilities = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") (
+      [
+        { program = "ping";
+          setcap  = true;
+          capabilities = "cap_net_raw+p";
+        }
+
+        { program = "ping6";
+          setcap  = true;
+          capabilities = "cap_net_raw+p";
+        }
+      ]
+    );
+
+    # If our linux kernel IS older than 4.3, let's setuid ping and ping6
+    security.setuidPrograms = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") (
+      [ "ping" "ping6" ]
+    );
 
     # Set the host and domain names in the activation script.  Don't
     # clear it if it's not configured in the NixOS configuration,

From bfc3956376128b9560926f6c122a49d809b4be97 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 30 Jun 2016 18:59:32 -0500
Subject: [PATCH 0002/3449] security: adding setcap-wrapper functionality

---
 nixos/modules/security/setcap-wrapper.c    | 210 +++++++++++++++++++++
 nixos/modules/security/setcap-wrappers.nix | 165 ++++++++++++++++
 2 files changed, 375 insertions(+)
 create mode 100644 nixos/modules/security/setcap-wrapper.c
 create mode 100644 nixos/modules/security/setcap-wrappers.nix

diff --git a/nixos/modules/security/setcap-wrapper.c b/nixos/modules/security/setcap-wrapper.c
new file mode 100644
index 000000000000..a44d174d90f7
--- /dev/null
+++ b/nixos/modules/security/setcap-wrapper.c
@@ -0,0 +1,210 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+#include <assert.h>
+#include <errno.h>
+#include <linux/capability.h>
+#include <sys/capability.h>
+#include <linux/prctl.h>
+#include <sys/prctl.h>
+#include <cap-ng.h>
+
+// Make sure assertions are not compiled out, we use them to codify
+// invariants about this program and we want it to fail fast and
+// loudly if they are violated.
+#undef NDEBUG
+
+extern char **environ;
+
+// The SOURCE_PROG and WRAPPER_DIR macros are supplied at compile time
+// for a security reason: So they cannot be changed at runtime.
+static char * sourceProg = SOURCE_PROG;
+static char * wrapperDir = WRAPPER_DIR;
+
+// Update the capabilities of the running process to include the given
+// capability in the Ambient set.
+static void set_ambient_cap(cap_value_t cap)
+{
+    capng_get_caps_process();
+
+    if (capng_update(CAPNG_ADD, CAPNG_INHERITABLE, (unsigned long) cap))
+    {
+        printf("cannot raise the capability into the Inheritable set\n");
+        exit(1);
+    }
+
+    capng_apply(CAPNG_SELECT_CAPS);
+    
+    if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, (unsigned long) cap, 0, 0))
+    {
+        perror("cannot raise the capability into the Ambient set\n");
+        exit(1);
+    }
+}
+
+// Given the path to this program, fetch its configured capability set
+// (as set by `setcap ... /path/to/file`) and raise those capabilities
+// into the Ambient set.
+static int make_caps_ambient(const char *selfPath)
+{
+    cap_t caps = cap_get_file(selfPath);
+
+    if(!caps)
+    {
+        fprintf(stderr, "could not retreive the capability set for this file\n");
+        return 1;
+    }
+
+    // We use `cap_to_text` and iteration over the tokenized result
+    // string because, as of libcap's current release, there is no
+    // facility for retrieving an array of `cap_value_t`'s that can be
+    // given to `prctl` in order to lift that capability into the
+    // Ambient set.
+    //
+    // Some discussion was had around shot-gunning all of the
+    // capabilities we know about into the Ambient set but that has a
+    // security smell and I deemed the risk of the current
+    // implementation crashing the program to be lower than the risk
+    // of a privilege escalation security hole being introduced by
+    // raising all capabilities, even ones we didn't intend for the
+    // program, into the Ambient set.
+    //
+    // `cap_t` which is returned by `cap_get_*` is an opaque type and
+    // even if we could retrieve the bitmasks (which, as far as I can
+    // tell we cannot) in order to get the `cap_value_t`
+    // representation for each capability we would have to take the
+    // total number of capabilities supported and iterate over the
+    // sequence of integers up-to that maximum total, testing each one
+    // against the bitmask ((bitmask >> n) & 1) to see if it's set and
+    // aggregating each "capability integer n" that is set in the
+    // bitmask.
+    //
+    // That, combined with the fact that we can't easily get the
+    // bitmask anyway seemed much more brittle than fetching the
+    // `cap_t`, transforming it into a textual representation,
+    // tokenizing the string, and using `cap_from_name` on the token
+    // to get the `cap_value_t` that we need for `prctl`. There is
+    // indeed risk involved if the output string format of
+    // `cap_to_text` ever changes but at this time the combination of
+    // factors involving the below list have led me to the conclusion
+    // that the best implementation at this time is reading then
+    // parsing with *lots of documentation* about why we're doing it
+    // this way.
+    //
+    // 1. No explicit API for fetching an array of `cap_value_t`'s or
+    //    for transforming a `cap_t` into such a representation
+    // 2. The risk of a crash is lower than lifting all capabilities
+    //    into the Ambient set
+    // 3. libcap is depended on heavily in the Linux ecosystem so
+    //    there is a high chance that the output representation of
+    //    `cap_to_text` will not change which reduces our risk that
+    //    this parsing step will cause a crash
+    //
+    // The preferred method, should it ever be available in the
+    // future, would be to use libcap API's to transform the result
+    // from a `cap_get_*` into an array of `cap_value_t`'s that can
+    // then be given to prctl.
+    //
+    // - Parnell
+    ssize_t capLen;
+    char* capstr = cap_to_text(caps, &capLen);
+    cap_free(caps);
+    
+    // TODO: For now, we assume that cap_to_text always starts its
+    // result string with " =" and that the first capability is listed
+    // immediately after that. We should verify this.
+    assert(capLen >= 2);
+    capstr += 2;
+
+    char* saveptr = NULL;
+    for(char* tok = strtok_r(capstr, ",", &saveptr); tok; tok = strtok_r(NULL, ",", &saveptr))
+    {
+      cap_value_t capnum;
+      if (cap_from_name(tok, &capnum))
+      {
+          fprintf(stderr, "cap_from_name failed, skipping: %s\n", tok);
+      }
+      else if (capnum == CAP_SETPCAP)
+      {
+        // Check for the cap_setpcap capability, we set this on the
+        // wrapper so it can elevate the capabilities to the Ambient
+        // set but we do not want to propagate it down into the
+        // wrapped program.
+        //
+        // TODO: what happens if that's the behavior you want
+        // though???? I'm preferring a strict vs. loose policy here.
+        fprintf(stderr, "cap_setpcap in set, skipping it\n");
+      }
+      else
+      {
+        set_ambient_cap(capnum);
+        printf("raised %s into the Ambient capability set\n", tok);
+      }
+    }
+    cap_free(capstr);
+
+    return 0;
+}
+
+int main(int argc, char * * argv)
+{
+    // I *think* it's safe to assume that a path from a symbolic link
+    // should safely fit within the PATH_MAX system limit. Though I'm
+    // not positive it's safe...
+    char selfPath[PATH_MAX];
+    int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath) - 1);
+
+    assert(selfPathSize > 0);
+
+    selfPath[selfPathSize] = '\0';
+
+    // Make sure that we are being executed from the right location,
+    // i.e., `safeWrapperDir'.  This is to prevent someone from creating
+    // hard link `X' from some other location, along with a false
+    // `X.real' file, to allow arbitrary programs from being executed
+    // with elevated capabilities.
+    int len = strlen(wrapperDir);
+    if (len > 0 && '/' == wrapperDir[len - 1])
+      --len;
+    assert(!strncmp(selfPath, wrapperDir, len));
+    assert('/' == wrapperDir[0]);
+    assert('/' == selfPath[len]);
+
+    // Make *really* *really* sure that we were executed as
+    // `selfPath', and not, say, as some other setuid program. That
+    // is, our effective uid/gid should match the uid/gid of
+    // `selfPath'.
+    struct stat st;
+    assert(lstat(selfPath, &st) != -1);
+
+    assert(!(st.st_mode & S_ISUID) || (st.st_uid == geteuid()));
+    assert(!(st.st_mode & S_ISGID) || (st.st_gid == getegid()));
+
+    // And, of course, we shouldn't be writable.
+    assert(!(st.st_mode & (S_IWGRP | S_IWOTH)));
+
+    struct stat stR;
+    stat(sourceProg, &stR);
+
+    // Make sure the program we're wrapping is non-zero
+    assert(stR.st_size > 0);
+
+    // Read the capabilities set on the file and raise them in to the
+    // Ambient set so the program we're wrapping receives the
+    // capabilities too!
+    assert(!make_caps_ambient(selfPath));
+
+    execve(sourceProg, argv, environ);
+    
+    fprintf(stderr, "%s: cannot run `%s': %s\n",
+        argv[0], sourceProg, strerror(errno));
+
+    exit(1);
+}
+
+
diff --git a/nixos/modules/security/setcap-wrappers.nix b/nixos/modules/security/setcap-wrappers.nix
new file mode 100644
index 000000000000..a9e3f8c0b1c2
--- /dev/null
+++ b/nixos/modules/security/setcap-wrappers.nix
@@ -0,0 +1,165 @@
+{ config, lib, pkgs, ... }:
+
+with lib; with pkgs;
+
+let
+
+  inherit (config.security) setcapWrapperDir;
+
+  cfg = config.security.setcapCapabilities;
+
+  # Produce a shell-code splice intended to be stitched into one of
+  # the build or install phases within the `setcapWrapper` derivation.
+  mkSetcapWrapper = { program, source ? null, ...}:
+    ''
+      if ! source=${if source != null then source else "$(readlink -f $(PATH=$SETCAP_PATH type -tP ${program}))"}; then
+          # If we can't find the program, fall back to the
+          # system profile.
+          source=/nix/var/nix/profiles/default/bin/${program}
+      fi
+
+      gcc -Wall -O2 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${setcapWrapperDir}\" \
+          -lcap-ng -lcap ${./setcap-wrapper.c} -o $out/bin/${program}.wrapper
+    '';
+
+  setcapWrappers = 
+
+    # This is only useful for Linux platforms and a kernel version of
+    # 4.3 or greater
+    assert pkgs.stdenv.isLinux;
+    assert versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3";
+
+    pkgs.stdenv.mkDerivation {
+      name         = "setcap-wrapper";
+      unpackPhase  = "true";
+      buildInputs  = [ linuxHeaders_4_4 libcap libcap_ng ];
+      installPhase = ''
+        mkdir -p $out/bin
+
+        # Concat together all of our shell splices to compile
+        # binary wrapper programs for all configured setcap programs.
+        ${concatMapStrings mkSetcapWrapper cfg}
+      '';
+    };
+in
+{
+  options = {
+    security.setcapCapabilities = mkOption {
+      type    = types.listOf types.attrs;
+      default = [];
+      example =
+        [ { program = "sendmail";
+            source  = "${pkgs.sendmail.bin}/bin/sendmail";
+            owner   = "nobody";
+            group   = "postdrop";
+            setcap  = true;
+            capabilities = "cap_net_raw+ep";
+          }
+        ];
+      description = ''
+        This option sets capabilities on a wrapper program that
+        propagates those capabilities down to the wrapped, real
+        program.
+
+        The `program` attribute is the name of the program to be
+        wrapped. If no `source` attribute is provided, specifying the
+        absolute path to the program, then the program will be
+        searched for in the path environment variable.
+
+        NOTE: cap_setpcap, which is required for the wrapper program
+        to be able to raise caps into the Ambient set is NOT raised to
+        the Ambient set so that the real program cannot modify its own
+        capabilities!! This may be too restrictive for cases in which
+        the real program needs cap_setpcap but it at least leans on
+        the side security paranoid vs. too relaxed.
+
+        The attribute `setcap` defaults to false and it will create a
+        wrapper program but never set the capability set on it. This
+        is done so that you can remove a capability sent entirely from
+        a wrapper program without also needing to go change any
+        absolute paths that may be directly referencing the wrapper
+        program.
+      '';
+    };
+
+    security.setcapWrapperDir = mkOption {
+      type        = types.path;
+      default     = "/nix/var/setcap-wrappers";
+      internal    = true;
+      description = ''
+        This option defines the path to the setcap wrappers. It
+        should generally not be overriden.
+      '';
+    };
+
+  };
+
+  config = {
+
+    # Make sure our setcap-wrapper dir exports to the PATH env
+    # variable when initializing the shell
+    environment.extraInit = ''
+    # The setcap wrappers override other bin directories.
+    export PATH="${config.security.setcapWrapperDir}:$PATH"
+    '';
+
+
+
+    system.activationScripts.setcap =
+      let
+        setcapPrograms = cfg;
+        configureSetcapWrapper =
+          { program
+          , capabilities
+          , source ? null
+          , owner  ? "nobody"
+          , group  ? "nogroup"
+          , setcap ? false
+          }:
+          ''
+            mkdir -p ${setcapWrapperDir}
+
+            cp ${setcapWrappers}/bin/${program}.wrapper ${setcapWrapperDir}/${program}
+
+            # Prevent races
+            chmod 0000 ${setcapWrapperDir}/${program}
+            chown ${owner}.${group} ${setcapWrapperDir}/${program}
+
+            # Set desired capabilities on the file plus cap_setpcap so
+            # the wrapper program can elevate the capabilities set on
+            # its file into the Ambient set.
+            #
+            # Only set the capabilities though if we're being told to
+            # do so.
+            ${
+            if setcap then
+              ''
+              ${libcap.out}/bin/setcap "cap_setpcap,${capabilities}" ${setcapWrapperDir}/${program}
+              ''
+            else ""
+            }
+
+            # Set the executable bit
+            chmod u+rx,g+x,o+x ${setcapWrapperDir}/${program}
+          '';
+
+      in stringAfter [ "users" ]
+        ''
+          # Look in the system path and in the default profile for
+          # programs to be wrapped.
+          SETCAP_PATH=${config.system.path}/bin:${config.system.path}/sbin
+
+          # When a program is removed from the security.setcapCapabilities
+          # list we have to remove all of the previous program wrappers
+          # and re-build them minus the wrapper for the program removed,
+          # hence the rm here in the activation script.
+
+          rm -f ${setcapWrapperDir}/*
+
+          # Concatenate the generated shell slices to configure
+          # wrappers for each program needing specialized capabilities.
+
+          ${concatMapStrings configureSetcapWrapper setcapPrograms}
+        '';
+  };
+}

From b3d63f81919d1da80b28362cbc6368d42d0deb68 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 30 Jun 2016 19:14:14 -0500
Subject: [PATCH 0003/3449] security: whitespace wibble

---
 nixos/modules/security/setcap-wrappers.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/security/setcap-wrappers.nix b/nixos/modules/security/setcap-wrappers.nix
index a9e3f8c0b1c2..dbd40e266bae 100644
--- a/nixos/modules/security/setcap-wrappers.nix
+++ b/nixos/modules/security/setcap-wrappers.nix
@@ -103,8 +103,6 @@ in
     export PATH="${config.security.setcapWrapperDir}:$PATH"
     '';
 
-
-
     system.activationScripts.setcap =
       let
         setcapPrograms = cfg;

From 00dc2c559ca98c449253ae0090cb227a3d4c59e1 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 30 Jun 2016 19:21:12 -0500
Subject: [PATCH 0004/3449] installer: adding mkdir command for the
 setcap-wrappers dir

---
 nixos/modules/installer/tools/nixos-install.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 589a51fa7094..f9412ed444e9 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -92,12 +92,14 @@ fi
 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/permissions-wrappers
 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
+mount -t tmpfs -o "mode=0755" none $mountPoint/var/permissions-wrappers
 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

From 6fe93ae42add1ac9174909a3b69e4c4cb2d82b33 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 30 Jun 2016 19:21:48 -0500
Subject: [PATCH 0005/3449] installer: adding perl 'next if' skip command for
 setcap-wrappers dir

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 5e576367eb2f..2190cac53d9e 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -329,6 +329,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
     # Skip special filesystems.
     next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs";
     next if $mountPoint eq "/var/setuid-wrappers";
+    next if $mountPoint eq "/var/setcap-wrappers";
 
     # Skip the optional fields.
     my $n = 6; $n++ while $fields[$n] ne "-"; $n++;

From 12a23b3d913573d6d7dbd202e00e4c6a1102d6fc Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 30 Jun 2016 19:22:19 -0500
Subject: [PATCH 0006/3449] boot: create setcap-wrappers dir as a tmpfs

---
 nixos/modules/system/boot/stage-2-init.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 704150e77d72..946897b1c433 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -141,6 +141,11 @@ if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then
     cat /etc/resolv.conf | resolvconf -m 1000 -a host
 fi
 
+# Create /var/permissions-wrappers as a tmpfs.
+rm -rf /var/permissions-wrappers
+mkdir -m 0755 -p /var/permissions-wrappers
+mount -t tmpfs -o "mode=0755" tmpfs /var/permissions-wrappers
+
 # Log the script output to /dev/kmsg or /run/log/stage-2-init.log.
 # Only at this point are all the necessary prerequisites ready for these commands.
 exec {logOutFd}>&1 {logErrFd}>&2

From 1c0f672f7ae2d7d1db29b7d1a4ed2181e71538b8 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 30 Jun 2016 19:23:19 -0500
Subject: [PATCH 0007/3449] security: update setcap-wrappers dir to match the
 system-level dir we're creating on init

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

diff --git a/nixos/modules/security/setcap-wrappers.nix b/nixos/modules/security/setcap-wrappers.nix
index dbd40e266bae..faebc6f7e0df 100644
--- a/nixos/modules/security/setcap-wrappers.nix
+++ b/nixos/modules/security/setcap-wrappers.nix
@@ -84,7 +84,7 @@ in
 
     security.setcapWrapperDir = mkOption {
       type        = types.path;
-      default     = "/nix/var/setcap-wrappers";
+      default     = "/var/setcap-wrappers";
       internal    = true;
       description = ''
         This option defines the path to the setcap wrappers. It

From 4e98aa639f9161fe461ba1c2e4f31519f9d89569 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Fri, 1 Jul 2016 11:07:16 -0500
Subject: [PATCH 0008/3449] module-list: adding setcap-wrappers to the import
 list

---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dfc1d694e976..dde0be5c14c3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -104,6 +104,7 @@
   ./security/rngd.nix
   ./security/rtkit.nix
   ./security/setuid-wrappers.nix
+  ./security/setcap-wrappers.nix
   ./security/sudo.nix
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix

From 2efb60c8e9c502b0fb4df81b03700b600118722a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Fri, 1 Jul 2016 11:09:14 -0500
Subject: [PATCH 0009/3449] security: tweaking the setcap-wrapper example to be
 more relevant

---
 nixos/modules/security/setcap-wrappers.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/setcap-wrappers.nix b/nixos/modules/security/setcap-wrappers.nix
index faebc6f7e0df..b8383d813585 100644
--- a/nixos/modules/security/setcap-wrappers.nix
+++ b/nixos/modules/security/setcap-wrappers.nix
@@ -48,10 +48,9 @@ in
       type    = types.listOf types.attrs;
       default = [];
       example =
-        [ { program = "sendmail";
-            source  = "${pkgs.sendmail.bin}/bin/sendmail";
+        [ { program = "ping";
             owner   = "nobody";
-            group   = "postdrop";
+            group   = "nogroup";
             setcap  = true;
             capabilities = "cap_net_raw+ep";
           }

From 79f1a1e07ae758de73cd640faf488a0bf1c479b8 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Fri, 1 Jul 2016 11:53:21 -0500
Subject: [PATCH 0010/3449] security: need to specify the ping binary paths for
 setcap wrappers.

---
 nixos/modules/tasks/network-interfaces.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 588a328192df..12605c245160 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -894,11 +894,13 @@ in
     security.setcapCapabilities = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") (
       [
         { program = "ping";
+          source  = "${pkgs.iputils.out}/bin/ping";
           setcap  = true;
           capabilities = "cap_net_raw+p";
         }
 
         { program = "ping6";
+          source  = "${pkgs.iputils.out}/bin/ping6";
           setcap  = true;
           capabilities = "cap_net_raw+p";
         }

From c16647ec29ab46b52cd365220288a8222cfcdad3 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Fri, 1 Jul 2016 15:54:33 -0500
Subject: [PATCH 0011/3449] security: switching to linuxHeaders so we always
 stay current with the selected kernel.

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

diff --git a/nixos/modules/security/setcap-wrappers.nix b/nixos/modules/security/setcap-wrappers.nix
index b8383d813585..ead3cb219f19 100644
--- a/nixos/modules/security/setcap-wrappers.nix
+++ b/nixos/modules/security/setcap-wrappers.nix
@@ -32,7 +32,7 @@ let
     pkgs.stdenv.mkDerivation {
       name         = "setcap-wrapper";
       unpackPhase  = "true";
-      buildInputs  = [ linuxHeaders_4_4 libcap libcap_ng ];
+      buildInputs  = [ linuxHeaders libcap libcap_ng ];
       installPhase = ''
         mkdir -p $out/bin
 

From 79e81aa31bc7a0fa88507c06f21b41fbbd1cb863 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Fri, 15 Jul 2016 18:05:28 -0500
Subject: [PATCH 0012/3449] security: Removing the old wrappers and replacing
 with 'permissions-wrappers'

---
 .../security/permissions-wrappers/default.nix | 201 ++++++++++++++++++
 .../permissions-wrapper.c}                    |  24 ++-
 .../setcap-wrapper-drv.nix                    |  37 ++++
 .../setcap-wrappers.nix                       |   0
 .../setuid-wrapper-drv.nix                    |  36 ++++
 .../setuid-wrappers.nix                       |   0
 nixos/modules/security/setuid-wrapper.c       |  81 -------
 7 files changed, 293 insertions(+), 86 deletions(-)
 create mode 100644 nixos/modules/security/permissions-wrappers/default.nix
 rename nixos/modules/security/{setcap-wrapper.c => permissions-wrappers/permissions-wrapper.c} (95%)
 create mode 100644 nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
 rename nixos/modules/security/{ => permissions-wrappers}/setcap-wrappers.nix (100%)
 create mode 100644 nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
 rename nixos/modules/security/{ => permissions-wrappers}/setuid-wrappers.nix (100%)
 delete mode 100644 nixos/modules/security/setuid-wrapper.c

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
new file mode 100644
index 000000000000..a4491946df5d
--- /dev/null
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -0,0 +1,201 @@
+{ config, lib, pkgs, ... }:
+let
+
+  inherit (config.security) permissionsWrapperDir;
+
+  cfg = config.security.permissionsWrappers;
+
+  setcapWrappers = import ./setcap-wrapper-drv.nix { };
+  setuidWrappers = import ./setuid-wrapper-drv.nix { };
+
+  ###### Activation script for the setcap wrappers
+  configureSetcapWrapper =
+    { program
+    , capabilities
+    , source ? null
+    , owner  ? "nobody"
+    , group  ? "nogroup"
+    , setcap ? false
+    }:
+    ''
+      cp ${setcapWrappers}/bin/${program}.wrapper ${permissionsWrapperDir}/${program}
+
+      # Prevent races
+      chmod 0000 ${permissionsWrapperDir}/${program}
+      chown ${owner}.${group} ${permissionsWrapperDir}/${program}
+
+      # Set desired capabilities on the file plus cap_setpcap so
+      # the wrapper program can elevate the capabilities set on
+      # its file into the Ambient set.
+      #
+      # Only set the capabilities though if we're being told to
+      # do so.
+      ${
+      if setcap then
+        ''
+        ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" ${permissionsWrapperDir}/${program}
+        ''
+      else ""
+      }
+
+      # Set the executable bit
+      chmod u+rx,g+x,o+x ${permissionsWrapperDir}/${program}
+    '';
+
+  ###### Activation script for the setuid wrappers
+  setuidPrograms =
+    (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
+      config.security.setuidPrograms)
+    ++ config.security.setuidOwners;
+
+  makeSetuidWrapper =
+    { program
+    , source ? null
+    , owner  ? "nobody"
+    , group  ? "nogroup"
+    , setuid ? false
+    , setgid ? false
+    , permissions ? "u+rx,g+x,o+x"
+    }:
+
+    ''
+      cp ${setuidWrappers}/bin/${program}.wrapper ${permissionsWrapperDir}/${program}
+
+      # Prevent races
+      chmod 0000 ${permissionsWrapperDir}/${program}
+      chown ${owner}.${group} ${permissionsWrapperDir}/${program}
+
+      chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
+    '';
+in
+{
+
+  ###### interface
+
+  options = {
+    security.permissionsWrappers.setcap = mkOption {
+      type    = types.listOf types.attrs;
+      default = [];
+      example =
+        [ { program = "ping";
+            source  = "${pkgs.iputils.out}/bin/ping"
+            owner   = "nobody";
+            group   = "nogroup";
+            setcap  = true;
+            capabilities = "cap_net_raw+ep";
+          }
+        ];
+      description = ''
+        This option sets capabilities on a wrapper program that
+        propagates those capabilities down to the wrapped, real
+        program.
+
+        The `program` attribute is the name of the program to be
+        wrapped. If no `source` attribute is provided, specifying the
+        absolute path to the program, then the program will be
+        searched for in the path environment variable.
+
+        NOTE: cap_setpcap, which is required for the wrapper program
+        to be able to raise caps into the Ambient set is NOT raised to
+        the Ambient set so that the real program cannot modify its own
+        capabilities!! This may be too restrictive for cases in which
+        the real program needs cap_setpcap but it at least leans on
+        the side security paranoid vs. too relaxed.
+
+        The attribute `setcap` defaults to false and it will create a
+        wrapper program but never set the capability set on it. This
+        is done so that you can remove a capability sent entirely from
+        a wrapper program without also needing to go change any
+        absolute paths that may be directly referencing the wrapper
+        program.
+      '';
+    };
+
+    security.permissionsWrappers.setuid = mkOption {
+      type = types.listOf types.attrs;
+      default = [];
+      example =
+        [ { program = "sendmail";
+            source = "${pkgs.sendmail.bin}/bin/sendmail";
+            owner = "nobody";
+            group = "postdrop";
+            setuid = false;
+            setgid = true;
+            permissions = "u+rx,g+x,o+x";
+          }
+        ];
+      description = ''
+        This option allows the ownership and permissions on the setuid
+        wrappers for specific programs to be overridden from the
+        default (setuid root, but not setgid root).
+      '';
+    };
+
+    security.permissionsWrapperDir = mkOption {
+      type        = types.path;
+      default     = "/var/permissions-wrappers";
+      internal    = true;
+      description = ''
+        This option defines the path to the permissions wrappers. It
+        should not be overriden.
+      '';
+    };
+
+  };
+
+
+  ###### implementation
+  
+  config = {
+
+    # Make sure our setcap-wrapper dir exports to the PATH env
+    # variable when initializing the shell
+    environment.extraInit = ''
+    # The permissions wrappers override other bin directories.
+    export PATH="${config.security.permissionsWrapperDir}:$PATH"
+    '';
+
+    ###### setcap activation script
+    system.activationScripts.setcap =
+      stringAfter [ "users" ]
+        ''
+          # Look in the system path and in the default profile for
+          # programs to be wrapped.
+          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
+
+          # When a program is removed from the security.permissionsWrappers.setcap
+          # list we have to remove all of the previous program wrappers
+          # and re-build them minus the wrapper for the program removed,
+          # hence the rm here in the activation script.
+
+          rm -f ${permissionsWrapperDir}/*
+
+          # Concatenate the generated shell slices to configure
+          # wrappers for each program needing specialized capabilities.
+
+          ${concatMapStrings configureSetcapWrapper cfg.setcap}
+        '';
+
+    ###### setuid activation script
+    system.activationScripts.setuid =
+      stringAfter [ "users" ]
+        ''
+          # Look in the system path and in the default profile for
+          # programs to be wrapped.
+          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
+
+          # When a program is removed from the security.permissionsWrappers.setcap
+          # list we have to remove all of the previous program wrappers
+          # and re-build them minus the wrapper for the program removed,
+          # hence the rm here in the activation script.
+
+          rm -f ${permissionsWrapperDir}/*
+
+          # Concatenate the generated shell slices to configure
+          # wrappers for each program needing specialized capabilities.
+
+          ${concatMapStrings configureSetuidWrapper cfg.setuid}
+        '';
+
+  };
+}
diff --git a/nixos/modules/security/setcap-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
similarity index 95%
rename from nixos/modules/security/setcap-wrapper.c
rename to nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index a44d174d90f7..effdaa930963 100644
--- a/nixos/modules/security/setcap-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -8,11 +8,6 @@
 #include <dirent.h>
 #include <assert.h>
 #include <errno.h>
-#include <linux/capability.h>
-#include <sys/capability.h>
-#include <linux/prctl.h>
-#include <sys/prctl.h>
-#include <cap-ng.h>
 
 // Make sure assertions are not compiled out, we use them to codify
 // invariants about this program and we want it to fail fast and
@@ -26,6 +21,24 @@ extern char **environ;
 static char * sourceProg = SOURCE_PROG;
 static char * wrapperDir = WRAPPER_DIR;
 
+// Make sure we have the WRAPPER_TYPE macro specified at compile
+// time...
+#ifdef WRAPPER_SETCAP
+static char * wrapperType = "setcap";
+#elif defined WRAPPER_SETUID
+static char * wrapperType = "setuid";
+#else
+fprintf(stderr, "Program must be compiled with either the WRAPPER_SETCAP or WRAPPER_SETUID macros specified!\n");
+exit(1);
+#endif
+
+#ifdef WRAPPER_SETCAP
+#include <linux/capability.h>
+#include <sys/capability.h>
+#include <linux/prctl.h>
+#include <sys/prctl.h>
+#include <cap-ng.h>
+
 // Update the capabilities of the running process to include the given
 // capability in the Ambient set.
 static void set_ambient_cap(cap_value_t cap)
@@ -150,6 +163,7 @@ static int make_caps_ambient(const char *selfPath)
 
     return 0;
 }
+#endif
 
 int main(int argc, char * * argv)
 {
diff --git a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
new file mode 100644
index 000000000000..f64c683f6e84
--- /dev/null
+++ b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+let  
+     cfg = config.security.permissionsWrappers;
+
+     # Produce a shell-code splice intended to be stitched into one of
+     # the build or install phases within the derivation.
+     mkSetcapWrapper = { program, source ? null, ...}:
+       ''
+         if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
+             # If we can't find the program, fall back to the
+             # system profile.
+             source=/nix/var/nix/profiles/default/bin/${program}
+         fi
+
+         gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.permissionsWrapperDir}\" \
+             -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper
+       '';
+in
+
+# This is only useful for Linux platforms and a kernel version of
+# 4.3 or greater
+assert pkgs.stdenv.isLinux;
+assert lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3";
+
+pkgs.stdenv.mkDerivation {
+  name         = "setcap-wrapper";
+  unpackPhase  = "true";
+  buildInputs  = [ pkgs.linuxHeaders pkgs.libcap pkgs.libcap_ng ];
+  installPhase = ''
+    mkdir -p $out/bin
+
+    # Concat together all of our shell splices to compile
+    # binary wrapper programs for all configured setcap programs.
+    ${concatMapStrings mkSetcapWrapper cfg.setcap}
+  '';
+};
diff --git a/nixos/modules/security/setcap-wrappers.nix b/nixos/modules/security/permissions-wrappers/setcap-wrappers.nix
similarity index 100%
rename from nixos/modules/security/setcap-wrappers.nix
rename to nixos/modules/security/permissions-wrappers/setcap-wrappers.nix
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
new file mode 100644
index 000000000000..15dc1918b5c5
--- /dev/null
+++ b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+let  
+     cfg = config.security.permissionsWrappers;
+
+     # Produce a shell-code splice intended to be stitched into one of
+     # the build or install phases within the derivation.
+     mkSetuidWrapper = { program, source ? null, ...}:
+       ''
+         if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
+             # If we can't find the program, fall back to the
+             # system profile.
+             source=/nix/var/nix/profiles/default/bin/${program}
+         fi
+
+         gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.permissionsWrapperDir}\" \
+             -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper
+       '';
+in
+
+# This is only useful for Linux platforms and a kernel version of
+# 4.3 or greater
+assert pkgs.stdenv.isLinux;
+assert lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3";
+
+pkgs.stdenv.mkDerivation {
+  name         = "setuid-wrapper";
+  unpackPhase  = "true";
+  installPhase = ''
+    mkdir -p $out/bin
+
+    # Concat together all of our shell splices to compile
+    # binary wrapper programs for all configured setcap programs.
+    ${concatMapStrings mkSetuidWrapper cfg.setuid}
+  '';
+};
diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/permissions-wrappers/setuid-wrappers.nix
similarity index 100%
rename from nixos/modules/security/setuid-wrappers.nix
rename to nixos/modules/security/permissions-wrappers/setuid-wrappers.nix
diff --git a/nixos/modules/security/setuid-wrapper.c b/nixos/modules/security/setuid-wrapper.c
deleted file mode 100644
index ffd0b65b7629..000000000000
--- a/nixos/modules/security/setuid-wrapper.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <assert.h>
-#include <string.h>
-#include <errno.h>
-
-/* Make sure assertions are not compiled out.  */
-#undef NDEBUG
-
-extern char **environ;
-
-static char * wrapperDir = WRAPPER_DIR;
-
-int main(int argc, char * * argv)
-{
-    char self[PATH_MAX];
-
-    int len = readlink("/proc/self/exe", self, sizeof(self) - 1);
-    assert (len > 0);
-    self[len] = 0;
-
-    /* Make sure that we are being executed from the right location,
-       i.e., `wrapperDir'.  This is to prevent someone from
-       creating hard link `X' from some other location, along with a
-       false `X.real' file, to allow arbitrary programs from being
-       executed setuid.  */
-    assert ((strncmp(self, wrapperDir, strlen(wrapperDir)) == 0) &&
-            (self[strlen(wrapperDir)] == '/'));
-
-    /* Make *really* *really* sure that we were executed as `self',
-       and not, say, as some other setuid program.  That is, our
-       effective uid/gid should match the uid/gid of `self'. */
-    //printf("%d %d\n", geteuid(), getegid());
-
-    struct stat st;
-    assert (lstat(self, &st) != -1);
-
-    //printf("%d %d\n", st.st_uid, st.st_gid);
-
-    assert ((st.st_mode & S_ISUID) == 0 ||
-            (st.st_uid == geteuid()));
-
-    assert ((st.st_mode & S_ISGID) == 0 ||
-            st.st_gid == getegid());
-
-    /* And, of course, we shouldn't be writable. */
-    assert (!(st.st_mode & (S_IWGRP | S_IWOTH)));
-
-
-    /* Read the path of the real (wrapped) program from <self>.real. */
-    char realFN[PATH_MAX + 10];
-    int realFNSize = snprintf (realFN, sizeof(realFN), "%s.real", self);
-    assert (realFNSize < sizeof(realFN));
-
-    int fdSelf = open(realFN, O_RDONLY);
-    assert (fdSelf != -1);
-
-    char real[PATH_MAX];
-    len = read(fdSelf, real, PATH_MAX);
-    assert (len != -1);
-    assert (len < sizeof (real));
-    assert (len > 0);
-    real[len] = 0;
-
-    close(fdSelf);
-
-    //printf("real = %s, len = %d\n", real, len);
-
-    execve(real, argv, environ);
-
-    fprintf(stderr, "%s: cannot run `%s': %s\n",
-        argv[0], real, strerror(errno));
-
-    exit(1);
-}

From 81b33eb46645b1bd3ab5029c0ca2012a24902bb0 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Fri, 15 Jul 2016 18:15:08 -0500
Subject: [PATCH 0013/3449] security: Updating the machinery for creating the
 wrapper programs dir in var and updating ping and ping6 for changed config
 interface.

---
 .../installer/tools/nixos-generate-config.pl  |  3 +--
 nixos/modules/module-list.nix                 |  3 +--
 nixos/modules/tasks/network-interfaces.nix    | 20 ++++++++++++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 2190cac53d9e..4da752e19050 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -328,8 +328,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
 
     # Skip special filesystems.
     next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs";
-    next if $mountPoint eq "/var/setuid-wrappers";
-    next if $mountPoint eq "/var/setcap-wrappers";
+    next if $mountPoint eq "/var/permissions-wrappers";
 
     # Skip the optional fields.
     my $n = 6; $n++ while $fields[$n] ne "-"; $n++;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dde0be5c14c3..6e69cebf7636 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -103,8 +103,7 @@
   ./security/prey.nix
   ./security/rngd.nix
   ./security/rtkit.nix
-  ./security/setuid-wrappers.nix
-  ./security/setcap-wrappers.nix
+  ./security/permissions-wrappers
   ./security/sudo.nix
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 12605c245160..1e0b874297a2 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -891,7 +891,7 @@ in
 
     # Capabilities won't work unless we have at-least a 4.3 Linux
     # kernel because we need the ambient capability
-    security.setcapCapabilities = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") (
+    security.permissionsWrappers.setcap = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") (
       [
         { program = "ping";
           source  = "${pkgs.iputils.out}/bin/ping";
@@ -908,8 +908,22 @@ in
     );
 
     # If our linux kernel IS older than 4.3, let's setuid ping and ping6
-    security.setuidPrograms = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") (
-      [ "ping" "ping6" ]
+    security.permissionsWrappers.setuid = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") (
+      [
+        { program = "ping";
+          source  = "${pkgs.iputils.out}/bin/ping";
+          owner   = "root";
+          group   = "root";
+          setuid  = true;
+        }
+        
+        { program = "ping6";
+          source  = "${pkgs.iputils.out}/bin/ping6";
+          owner   = "root";
+          group   = "root";
+          setuid  = true;
+        }
+      ]
     );
 
     # Set the host and domain names in the activation script.  Don't

From 390ab0b3eff809052d5b9d9b5335413b36898481 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Fri, 15 Jul 2016 19:10:48 -0500
Subject: [PATCH 0014/3449] everything?: Updating every package that depended
 on the old setuidPrograms configuration.

---
 nixos/modules/programs/kbdlight.nix           |  9 +++-
 nixos/modules/programs/light.nix              |  9 +++-
 nixos/modules/programs/shadow.nix             | 47 +++++++++++++++++--
 nixos/modules/rename.nix                      |  1 -
 nixos/modules/security/duosec.nix             | 12 ++++-
 nixos/modules/security/pam.nix                | 21 ++++++++-
 nixos/modules/security/pam_usb.nix            | 21 +++++++--
 .../security/permissions-wrappers/default.nix |  5 --
 nixos/modules/security/polkit.nix             | 10 +++-
 nixos/modules/security/sudo.nix               | 17 ++++++-
 nixos/modules/services/mail/exim.nix          | 10 +++-
 nixos/modules/services/scheduling/cron.nix    | 10 +++-
 nixos/modules/services/scheduling/fcron.nix   | 10 +++-
 .../x11/desktop-managers/enlightenment.nix    | 10 +++-
 pkgs/desktops/enlightenment/enlightenment.nix |  6 +--
 15 files changed, 170 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix
index 0172368e968f..c3ea6b5e9738 100644
--- a/nixos/modules/programs/kbdlight.nix
+++ b/nixos/modules/programs/kbdlight.nix
@@ -11,6 +11,13 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.kbdlight ];
-    security.setuidPrograms = [ "kbdlight" ];
+
+    security.permissionsWrappers.setuid =
+    [ { program = "kbdlight";
+        source  = "${pkgs.kbdlight.out}/bin/kbdlight";
+        user    = "root";
+        group   = "root";
+        setuid  = true;        
+    }];
   };
 }
diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index 09cd1113d9c7..d141eaf66f76 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@@ -21,6 +21,13 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.light ];
-    security.setuidPrograms = [ "light" ];
+
+    security.permissionsWrappers.setuid =
+    [ { program = "light";
+        source  = "${pkgs.light.out}/bin/light";
+        user    = "root";
+        group   = "root";
+        setuid  = true;        
+    }];
   };
 }
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 878c9cc0cf09..8ee324eaf63f 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -102,11 +102,48 @@ in
         chgpasswd = { rootOK = true; };
       };
 
-    security.setuidPrograms = [ "su" "chfn" ]
-      ++ [ "newuidmap" "newgidmap" ] # new in shadow 4.2.x
-      ++ lib.optionals config.users.mutableUsers
-      [ "passwd" "sg" "newgrp" ];
+    security.setuidPrograms = 
+    [
+      { program = "su";
+        source  = "${pkgs.shadow.su}/bin/su";
+        user    = "root";
+        group   = "root";
+        setuid  = true;        
+      }
 
+      { program = "chfn";
+        source  = "${pkgs.shadow.out}/bin/chfn";
+        user    = "root";
+        group   = "root";
+        setuid  = true;
+      }
+    ] ++
+    (lib.optionals config.users.mutableUsers
+     map (x: x // { user = "root";
+                    group   = "root";
+                    setuid  = true;
+                  })
+         [
+           { program = "passwd";
+             source  = "${pkgs.shadow.out}/bin/passwd";
+           }
+
+           { program = "sg";
+             source  = "${pkgs.shadow.out}/bin/sg";
+           }
+
+           { program = "newgrp";
+             source  = "${pkgs.shadow.out}/bin/newgrp";
+           }
+
+           { program = "newuidmap";
+             source  = "${pkgs.shadow.out}/bin/newuidmap";
+           }
+
+           { program = "newgidmap";
+             source  = "${pkgs.shadow.out}/bin/newgidmap";
+           }
+         ]
+    );
   };
-
 }
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 412cccc20d58..e4584146d6f0 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -10,7 +10,6 @@ with lib;
     (mkRenamedOptionModule [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ])
     (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ])
 
-    (mkRenamedOptionModule [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ])
     (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
     (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
 
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 0e3a54325cad..202218c915c9 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -193,7 +193,17 @@ in
       ];
 
      environment.systemPackages = [ pkgs.duo-unix ];
-     security.setuidPrograms    = [ "login_duo" ];
+
+     security.permissionsWrappers.setuid =
+     [
+       { program = "login_duo";
+         source  = "${pkgs.duo-unix.out}/bin/login_duo";
+         user    = "root";
+         group   = "root";
+         setuid  = true;
+       }
+     ];
+
      environment.etc = loginCfgFile ++ pamCfgFile;
 
      /* If PAM *and* SSH are enabled, then don't do anything special.
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 77815cd6dcc1..4c6b54f02745 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -442,8 +442,25 @@ in
       ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
       ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
 
-    security.setuidPrograms =
-        optionals config.security.pam.enableEcryptfs [ "mount.ecryptfs_private" "umount.ecryptfs_private" ];
+    security.permissionsWrappers.setuid =
+      [
+        (optionals config.security.pam.enableEcryptfs
+          { program = "mount.ecryptfs_private"
+            source  = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
+            user    = "root";
+            group   = "root";
+            setuid  = true;
+          })
+          
+        (optionals config.security.pam.enableEcryptfs
+          { program = "umount.ecryptfs_private";
+            source  = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
+            user    = "root";
+            group   = "root";
+            setuid  = true;
+          })
+      ]
+        
 
     environment.etc =
       mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 11708a1f0167..699cf6306e1d 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -32,10 +32,25 @@ in
 
   config = mkIf (cfg.enable || anyUsbAuth) {
 
-    # pmount need to have a set-uid bit to make pam_usb works in user
-    # environment. (like su, sudo)
+    # Make sure pmount and pumount are setuid wrapped.
+    security.permissionsWrappers.setuid =
+      [
+        { program = "pmount";
+          source  = "${pkgs.pmount.out}/bin/pmount";
+          user    = "root";
+          group   = "root";
+          setuid  = true;
+        }
 
-    security.setuidPrograms = [ "pmount" "pumount" ];
+        { program = "pumount";
+          source  = "${pkgs.pmount.out}/bin/pumount";
+          user    = "root";
+          group   = "root";
+          setuid  = true;
+        }
+      ];
+
+setuidPrograms = [ "pmount" "pumount" ];
     environment.systemPackages = [ pkgs.pmount ];
 
   };
diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index a4491946df5d..5d4634daf78b 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -43,11 +43,6 @@ let
     '';
 
   ###### Activation script for the setuid wrappers
-  setuidPrograms =
-    (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
-      config.security.setuidPrograms)
-    ++ config.security.setuidOwners;
-
   makeSetuidWrapper =
     { program
     , source ? null
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 507f81bbf073..db078667acf0 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -83,7 +83,15 @@ in
 
     security.pam.services.polkit-1 = {};
 
-    security.setuidPrograms = [ "pkexec" ];
+    security.permissionsWrappers.setuid = 
+      [
+        { program = "pkexec";
+          source  = "${pkgs.polkit.out}/bin/pkexec";
+          user    = "root";
+          group   = "root";
+          setuid  = true;
+        }
+      ];
 
     security.setuidOwners = [
       { program = "polkit-agent-helper-1";
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index bced2a6ed757..06dde14cd1c1 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -81,7 +81,22 @@ in
         ${cfg.extraConfig}
       '';
 
-    security.setuidPrograms = [ "sudo" "sudoedit" ];
+    security.permissionsWrappers.setuid =
+     [
+       { program = "sudo";
+         source  = "${pkgs.sudo.out}/bin/sudo";
+         user    = "root";
+         group   = "root";
+         setuid  = true;
+       }
+
+       { program = "sudoedit"
+         source  = "${pkgs.sudo.out}/bin/sudo";
+         user    = "root";
+         group   = "root";
+         setuid  = true;
+       }
+    ];
 
     environment.systemPackages = [ sudo ];
 
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index e0890d96a88b..aad497cbc719 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -89,7 +89,15 @@ in
       gid = config.ids.gids.exim;
     };
 
-    security.setuidPrograms = [ "exim" ];
+    security.permissionsWrappers.setuid =
+    [
+      { program = "exim";
+        source  = "${pkgs.exim.out}/bin/exim";
+        user    = "root";
+        group   = "root";
+        setuid  = true;
+      }
+    ]
 
     systemd.services.exim = {
       description = "Exim Mail Daemon";
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index f5e132fd77d8..541fbb7ee644 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -95,7 +95,15 @@ in
 
     (mkIf (config.services.cron.enable) {
 
-      security.setuidPrograms = [ "crontab" ];
+      security.permissionsWrappers.setuid =
+      [
+        { program = "crontab";
+          source  = "${pkgs.cronNixosPkg.out}/bin/crontab";
+          user    = "root";
+          group   = "root";
+          setuid  = true;        
+        }
+      ];
 
       environment.systemPackages = [ cronNixosPkg ];
 
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index 7b4665a82046..6e8465ab08f4 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -106,7 +106,15 @@ in
 
     environment.systemPackages = [ pkgs.fcron ];
 
-    security.setuidPrograms = [ "fcrontab" ];
+    security.permissionsWrappers.setuid =
+    [
+      { program = "fcrontab";
+        source  = "${pkgs.fcron.out}/bin/fcrontab";
+        user    = "root";
+        group   = "root";
+        setuid  = true;        
+      }
+    ];
 
     systemd.services.fcron = {
       description = "fcron daemon";
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 8a03dd65b335..b55950c6373b 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -62,7 +62,15 @@ in
       '';
     }];
 
-    security.setuidPrograms = [ "e_freqset" ];
+    security.permissionsWrappers.setuid =
+    [
+      { program = "e_freqset";
+        source  = "${e.enlightenment.out}/bin/e_freqset";
+        user    = "root";
+        group   = "root";
+        setuid  = true;        
+      }
+    ];
 
     environment.etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index f4ff94ad088e..979843ffe9c3 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -40,13 +40,13 @@ stdenv.mkDerivation rec {
   # this is a hack and without this cpufreq module is not working. does the following:
   #   1. moves the "freqset" binary to "e_freqset",
   #   2. linkes "e_freqset" to enlightenment/bin so that,
-  #   3. setuidPrograms detects it and makes appropriate stuff to /var/setuid-wrappers/e_freqset,
-  #   4. and finaly, linkes /var/setuid-wrappers/e_freqset to original destination where enlightenment wants it
+  #   3. permissionsWrappers.setuid detects it and places wrappers in /var/permissions-wrappers/e_freqset,
+  #   4. and finally, links /var/permissions-wrappers/e_freqset to original destination where enlightenment wants it
   postInstall = ''
     export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
     mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset
     ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset
-    ln -sv /var/setuid-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset
+    ln -sv /var/permissions-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset
   '';
 
   meta = {

From 98c058a1ee338731d72d33f320da48c95fecd0e0 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 1 Sep 2016 19:06:21 -0500
Subject: [PATCH 0015/3449] Adapting everything for the merged permissions
 wrappers work.

---
 nixos/modules/config/shells-environment.nix   |  2 +-
 .../modules/installer/tools/nixos-install.sh  |  2 +-
 nixos/modules/programs/kbdlight.nix           |  2 +-
 nixos/modules/programs/light.nix              |  2 +-
 nixos/modules/programs/shadow.nix             |  6 +--
 nixos/modules/programs/unity3d.nix            | 25 ++++++++++
 nixos/modules/security/apparmor-suid.nix      |  4 +-
 nixos/modules/security/duosec.nix             |  2 +-
 nixos/modules/security/pam.nix                | 45 ++++++++---------
 nixos/modules/security/pam_usb.nix            |  5 +-
 .../security/permissions-wrappers/default.nix | 48 +++++++++++--------
 .../setcap-wrapper-drv.nix                    |  6 +--
 .../setuid-wrapper-drv.nix                    |  6 +--
 nixos/modules/security/polkit.nix             | 18 ++++---
 nixos/modules/security/sudo.nix               |  8 ++--
 nixos/modules/services/logging/logcheck.nix   |  4 +-
 nixos/modules/services/mail/dovecot.nix       |  2 +-
 nixos/modules/services/mail/exim.nix          |  6 +--
 nixos/modules/services/mail/mail.nix          |  2 +-
 nixos/modules/services/monitoring/munin.nix   |  4 +-
 nixos/modules/services/monitoring/smartd.nix  |  2 +-
 .../services/network-filesystems/samba.nix    |  2 +-
 nixos/modules/services/networking/gale.nix    |  2 +-
 nixos/modules/services/networking/prayer.nix  |  2 +-
 nixos/modules/services/scheduling/atd.nix     |  4 +-
 nixos/modules/services/scheduling/cron.nix    |  6 +--
 nixos/modules/services/scheduling/fcron.nix   |  4 +-
 nixos/modules/services/system/dbus.nix        |  6 +--
 .../x11/desktop-managers/enlightenment.nix    |  2 +-
 .../services/x11/desktop-managers/kde4.nix    |  2 +-
 .../services/x11/desktop-managers/kde5.nix    |  2 +-
 .../virtualisation/virtualbox-host.nix        |  2 +-
 .../applications/editors/sublime3/default.nix |  2 +-
 .../gale/gale-install.in.patch                |  2 +-
 .../wireshark-lookup-dumpcap-in-path.patch    |  4 +-
 .../gitlab/remove-hardcoded-locations.patch   |  2 +-
 .../virtualization/virtualbox/hardened.patch  |  6 +--
 pkgs/build-support/build-fhs-userenv/env.nix  |  2 +-
 .../development/libraries/libgksu/default.nix |  4 +-
 pkgs/development/libraries/polkit/default.nix |  2 +-
 pkgs/development/tools/unity3d/default.nix    |  2 +-
 pkgs/os-specific/linux/fuse/default.nix       |  2 +-
 pkgs/os-specific/linux/mdadm/default.nix      |  2 +-
 pkgs/os-specific/linux/pam/default.nix        |  2 +-
 pkgs/os-specific/linux/util-linux/default.nix |  2 +-
 pkgs/servers/interlock/default.nix            |  2 +-
 pkgs/servers/mail/petidomo/default.nix        |  2 +-
 .../nagios/plugins/official-2.x.nix           |  4 +-
 pkgs/tools/X11/x11vnc/default.nix             |  4 +-
 pkgs/tools/admin/certbot/default.nix          |  2 +-
 pkgs/tools/misc/debian-devscripts/default.nix |  2 +-
 pkgs/tools/security/ecryptfs/default.nix      |  2 +-
 pkgs/tools/security/sudo/default.nix          |  2 +-
 pkgs/tools/system/at/default.nix              |  2 +-
 pkgs/tools/system/ts/default.nix              |  2 +-
 55 files changed, 162 insertions(+), 131 deletions(-)
 create mode 100644 nixos/modules/programs/unity3d.nix

diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index f458bc39adaa..54dd6f6570fa 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -169,7 +169,7 @@ in
          ${cfg.extraInit}
 
          # The setuid wrappers override other bin directories.
-         export PATH="${config.security.wrapperDir}:$PATH"
+         export PATH="${config.security.permissionsWrapperDir}:$PATH"
 
          # ~/bin if it exists overrides other bin directories.
          export PATH="$HOME/bin:$PATH"
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index f9412ed444e9..27c03ff9792a 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -262,7 +262,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate
 # Ask the user to set a root password.
 if [ -z "$noRootPasswd" ] && [ -x $mountPoint/var/setuid-wrappers/passwd ] && [ -t 0 ]; then
     echo "setting root password..."
-    chroot $mountPoint /var/setuid-wrappers/passwd
+    chroot $mountPoint /var/permissions-wrappers/passwd
 fi
 
 
diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix
index c3ea6b5e9738..30767a03291a 100644
--- a/nixos/modules/programs/kbdlight.nix
+++ b/nixos/modules/programs/kbdlight.nix
@@ -15,7 +15,7 @@ in
     security.permissionsWrappers.setuid =
     [ { program = "kbdlight";
         source  = "${pkgs.kbdlight.out}/bin/kbdlight";
-        user    = "root";
+        owner   = "root";
         group   = "root";
         setuid  = true;        
     }];
diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index d141eaf66f76..c89f8e937216 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@@ -25,7 +25,7 @@ in
     security.permissionsWrappers.setuid =
     [ { program = "light";
         source  = "${pkgs.light.out}/bin/light";
-        user    = "root";
+        owner   = "root";
         group   = "root";
         setuid  = true;        
     }];
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 8ee324eaf63f..f40faa1ca5fb 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -102,18 +102,18 @@ in
         chgpasswd = { rootOK = true; };
       };
 
-    security.setuidPrograms = 
+    security.permissionsWrappers.setuid = 
     [
       { program = "su";
         source  = "${pkgs.shadow.su}/bin/su";
-        user    = "root";
+        owner   = "root";
         group   = "root";
         setuid  = true;        
       }
 
       { program = "chfn";
         source  = "${pkgs.shadow.out}/bin/chfn";
-        user    = "root";
+        owner   = "root";
         group   = "root";
         setuid  = true;
       }
diff --git a/nixos/modules/programs/unity3d.nix b/nixos/modules/programs/unity3d.nix
new file mode 100644
index 000000000000..47f1d1ef1600
--- /dev/null
+++ b/nixos/modules/programs/unity3d.nix
@@ -0,0 +1,25 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.programs.unity3d;
+in {
+
+  options = {
+    programs.unity3d.enable = mkEnableOption "Unity3D, a game development tool";
+  };
+
+  config = mkIf cfg.enable {
+    security.permissionsWrappers.setuid = [{
+      program = "unity-chrome-sandbox";
+      source = "${pkgs.unity3d.sandbox}/bin/unity-chrome-sandbox";
+      owner = "root";
+      #group = "root";
+      setuid = true;
+      #setgid = true;
+    }];
+
+    environment.systemPackages = [ pkgs.unity3d ];
+  };
+
+}
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index 4a6d61d26766..799f27b6708f 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -19,7 +19,7 @@ with lib;
   config = mkIf (cfg.confineSUIDApplications) {
     security.apparmor.profiles = [ (pkgs.writeText "ping" ''
       #include <tunables/global>
-      /var/setuid-wrappers/ping {
+      /var/permissions-wrappers/ping {
         #include <abstractions/base>
         #include <abstractions/consoles>
         #include <abstractions/nameservice>
@@ -33,7 +33,7 @@ with lib;
         ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,
-        /var/setuid-wrappers/ping.real r,
+        /var/permissions-wrappers/ping.real r,
 
         #/etc/modules.conf r,
 
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index 202218c915c9..b5e1417fc897 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -198,7 +198,7 @@ in
      [
        { program = "login_duo";
          source  = "${pkgs.duo-unix.out}/bin/login_duo";
-         user    = "root";
+         owner   = "root";
          group   = "root";
          setuid  = true;
        }
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 4c6b54f02745..1c5e6862da68 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -444,34 +444,35 @@ in
 
     security.permissionsWrappers.setuid =
       [
-        (optionals config.security.pam.enableEcryptfs
-          { program = "mount.ecryptfs_private"
-            source  = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
-            user    = "root";
-            group   = "root";
-            setuid  = true;
-          })
+        { program = "unix_chkpwd";
+          source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
+          owner = "root";
+          group = "root";
+          setuid = true;
+        }
+
+
           
-        (optionals config.security.pam.enableEcryptfs
-          { program = "umount.ecryptfs_private";
-            source  = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
-            user    = "root";
-            group   = "root";
-            setuid  = true;
-          })
-      ]
+      ] ++ (optional config.security.pam.enableEcryptfs 
+        { program = "umount.ecryptfs_private";
+          source  = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
+          owner   = "root";
+          group   = "root";
+          setuid  = true;
+        }
+      ) ++ (optional config.security.pam.enableEcryptfs
+        { program = "mount.ecryptfs_private";
+          source  = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
+          owner   = "root";
+          group   = "root";
+          setuid  = true;
+        }
+      );
         
 
     environment.etc =
       mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
 
-    security.setuidOwners = [ {
-      program = "unix_chkpwd";
-      source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
-      owner = "root";
-      setuid = true;
-    } ];
-
     security.pam.services =
       { other.text =
           ''
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 699cf6306e1d..53a7921a2440 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -37,20 +37,19 @@ in
       [
         { program = "pmount";
           source  = "${pkgs.pmount.out}/bin/pmount";
-          user    = "root";
+          owner   = "root";
           group   = "root";
           setuid  = true;
         }
 
         { program = "pumount";
           source  = "${pkgs.pmount.out}/bin/pumount";
-          user    = "root";
+          owner   = "root";
           group   = "root";
           setuid  = true;
         }
       ];
 
-setuidPrograms = [ "pmount" "pumount" ];
     environment.systemPackages = [ pkgs.pmount ];
 
   };
diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 5d4634daf78b..6b0570faa402 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -3,10 +3,17 @@ let
 
   inherit (config.security) permissionsWrapperDir;
 
+  isNotNull = v: if v != null then true else false;
+
   cfg = config.security.permissionsWrappers;
 
-  setcapWrappers = import ./setcap-wrapper-drv.nix { };
-  setuidWrappers = import ./setuid-wrapper-drv.nix { };
+  setcapWrappers = import ./setcap-wrapper-drv.nix {
+    inherit config lib pkgs;
+  };
+
+  setuidWrappers = import ./setuid-wrapper-drv.nix {
+    inherit config lib pkgs;
+  };
 
   ###### Activation script for the setcap wrappers
   configureSetcapWrapper =
@@ -16,8 +23,7 @@ let
     , owner  ? "nobody"
     , group  ? "nogroup"
     , setcap ? false
-    }:
-    ''
+    }: ''
       cp ${setcapWrappers}/bin/${program}.wrapper ${permissionsWrapperDir}/${program}
 
       # Prevent races
@@ -43,22 +49,22 @@ let
     '';
 
   ###### Activation script for the setuid wrappers
-  makeSetuidWrapper =
+  configureSetuidWrapper =
     { program
     , source ? null
     , owner  ? "nobody"
+    # Legacy code I can't find :(
+    , user   ? null
     , group  ? "nogroup"
     , setuid ? false
     , setgid ? false
     , permissions ? "u+rx,g+x,o+x"
-    }:
-
-    ''
+    }: ''
       cp ${setuidWrappers}/bin/${program}.wrapper ${permissionsWrapperDir}/${program}
 
       # Prevent races
       chmod 0000 ${permissionsWrapperDir}/${program}
-      chown ${owner}.${group} ${permissionsWrapperDir}/${program}
+      chown ${if user != null then user else owner}.${group} ${permissionsWrapperDir}/${program}
 
       chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
     '';
@@ -68,12 +74,12 @@ in
   ###### interface
 
   options = {
-    security.permissionsWrappers.setcap = mkOption {
-      type    = types.listOf types.attrs;
+    security.permissionsWrappers.setcap = lib.mkOption {
+      type    = lib.types.listOf lib.types.attrs;
       default = [];
       example =
         [ { program = "ping";
-            source  = "${pkgs.iputils.out}/bin/ping"
+            source  = "${pkgs.iputils.out}/bin/ping";
             owner   = "nobody";
             group   = "nogroup";
             setcap  = true;
@@ -106,12 +112,12 @@ in
       '';
     };
 
-    security.permissionsWrappers.setuid = mkOption {
-      type = types.listOf types.attrs;
+    security.permissionsWrappers.setuid = lib.mkOption {
+      type = lib.types.listOf lib.types.attrs;
       default = [];
       example =
         [ { program = "sendmail";
-            source = "${pkgs.sendmail.bin}/bin/sendmail";
+            source = "/nix/store/.../bin/sendmail";
             owner = "nobody";
             group = "postdrop";
             setuid = false;
@@ -126,8 +132,8 @@ in
       '';
     };
 
-    security.permissionsWrapperDir = mkOption {
-      type        = types.path;
+    security.permissionsWrapperDir = lib.mkOption {
+      type        = lib.types.path;
       default     = "/var/permissions-wrappers";
       internal    = true;
       description = ''
@@ -152,7 +158,7 @@ in
 
     ###### setcap activation script
     system.activationScripts.setcap =
-      stringAfter [ "users" ]
+      lib.stringAfter [ "users" ]
         ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.
@@ -168,12 +174,12 @@ in
           # Concatenate the generated shell slices to configure
           # wrappers for each program needing specialized capabilities.
 
-          ${concatMapStrings configureSetcapWrapper cfg.setcap}
+          ${lib.concatMapStrings configureSetcapWrapper (builtins.filter isNotNull cfg.setcap)}
         '';
 
     ###### setuid activation script
     system.activationScripts.setuid =
-      stringAfter [ "users" ]
+      lib.stringAfter [ "users" ]
         ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.
@@ -189,7 +195,7 @@ in
           # Concatenate the generated shell slices to configure
           # wrappers for each program needing specialized capabilities.
 
-          ${concatMapStrings configureSetuidWrapper cfg.setuid}
+          ${lib.concatMapStrings configureSetuidWrapper (builtins.filter isNotNull cfg.setuid)}
         '';
 
   };
diff --git a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
index f64c683f6e84..adae9009fbe2 100644
--- a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
@@ -13,7 +13,7 @@ let
              source=/nix/var/nix/profiles/default/bin/${program}
          fi
 
-         gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.permissionsWrapperDir}\" \
+         gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
              -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper
        '';
 in
@@ -32,6 +32,6 @@ pkgs.stdenv.mkDerivation {
 
     # Concat together all of our shell splices to compile
     # binary wrapper programs for all configured setcap programs.
-    ${concatMapStrings mkSetcapWrapper cfg.setcap}
+    ${lib.concatMapStrings mkSetcapWrapper cfg.setcap}
   '';
-};
+}
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
index 15dc1918b5c5..e244364aa45b 100644
--- a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
@@ -13,7 +13,7 @@ let
              source=/nix/var/nix/profiles/default/bin/${program}
          fi
 
-         gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.permissionsWrapperDir}\" \
+         gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
              -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper
        '';
 in
@@ -31,6 +31,6 @@ pkgs.stdenv.mkDerivation {
 
     # Concat together all of our shell splices to compile
     # binary wrapper programs for all configured setcap programs.
-    ${concatMapStrings mkSetuidWrapper cfg.setuid}
+    ${lib.concatMapStrings mkSetuidWrapper cfg.setuid}
   '';
-};
+}
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index db078667acf0..098319d5ded3 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -87,20 +87,18 @@ in
       [
         { program = "pkexec";
           source  = "${pkgs.polkit.out}/bin/pkexec";
-          user    = "root";
+          owner   = "root";
           group   = "root";
           setuid  = true;
         }
-      ];
 
-    security.setuidOwners = [
-      { program = "polkit-agent-helper-1";
-        owner = "root";
-        group = "root";
-        setuid = true;
-        source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
-      }
-    ];
+        { program = "polkit-agent-helper-1";
+          owner = "root";
+          group = "root";
+          setuid = true;
+          source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
+        }
+      ];
 
     system.activationScripts.polkit =
       ''
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 06dde14cd1c1..8a8f1525df40 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -85,14 +85,14 @@ in
      [
        { program = "sudo";
          source  = "${pkgs.sudo.out}/bin/sudo";
-         user    = "root";
+         owner   = "root";
          group   = "root";
          setuid  = true;
        }
 
-       { program = "sudoedit"
-         source  = "${pkgs.sudo.out}/bin/sudo";
-         user    = "root";
+       { program = "sudoedit";
+         source  = "${pkgs.sudo.out}/bin/sudoedit";
+         owner   = "root";
          group   = "root";
          setuid  = true;
        }
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 3a85fa60fe7a..755599ff6215 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -29,8 +29,8 @@ let
     };
 
   cronJob = ''
-    @reboot   logcheck env PATH=/var/setuid-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags}
-    2 ${cfg.timeOfDay} * * * logcheck env PATH=/var/setuid-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
+    @reboot   logcheck env PATH=/var/permissions-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags}
+    2 ${cfg.timeOfDay} * * * logcheck env PATH=/var/permissions-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
   '';
 
   writeIgnoreRule = name: {level, regex, ...}:
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index f239dda564a2..7848288850af 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -13,7 +13,7 @@ let
     ''
       base_dir = ${baseDir}
       protocols = ${concatStringsSep " " cfg.protocols}
-      sendmail_path = /var/setuid-wrappers/sendmail
+      sendmail_path = /var/permissions-wrappers/sendmail
     ''
 
     (if isNull cfg.sslServerCert then ''
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index aad497cbc719..6dfb8fdef119 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -70,7 +70,7 @@ in
       etc."exim.conf".text = ''
         exim_user = ${cfg.user}
         exim_group = ${cfg.group}
-        exim_path = /var/setuid-wrappers/exim
+        exim_path = /var/permissions-wrappers/exim
         spool_directory = ${cfg.spoolDir}
         ${cfg.config}
       '';
@@ -93,11 +93,11 @@ in
     [
       { program = "exim";
         source  = "${pkgs.exim.out}/bin/exim";
-        user    = "root";
+        owner   = "root";
         group   = "root";
         setuid  = true;
       }
-    ]
+    ];
 
     systemd.services.exim = {
       description = "Exim Mail Daemon";
diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
index 63e8d78b5b02..e8b16349f1a5 100644
--- a/nixos/modules/services/mail/mail.nix
+++ b/nixos/modules/services/mail/mail.nix
@@ -26,7 +26,7 @@ with lib;
 
   config = mkIf (config.services.mail.sendmailSetuidWrapper != null) {
 
-    security.setuidOwners = [ config.services.mail.sendmailSetuidWrapper ];
+    security.permissionsWrappers.setuid = [ config.services.mail.sendmailSetuidWrapper ];
 
   };
 
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index aaa041ad4cd6..08ba161d38bd 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 "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \
+          --set PATH "/var/permissions-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \
           --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
           --set MUNIN_PLUGSTATE "/var/run/munin"
 
@@ -182,7 +182,7 @@ in
 
         mkdir -p /etc/munin/plugins
         rm -rf /etc/munin/plugins/*
-        PATH="/var/setuid-wrappers:/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="/var/permissions-wrappers:/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
       '';
       serviceConfig = {
         ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/";
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 1017005226b2..b67519b3424c 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -124,7 +124,7 @@ in
           };
 
           mailer = mkOption {
-            default = "/var/setuid-wrappers/sendmail";
+            default = "/var/permissions-wrappers/sendmail";
             type = types.path;
             description = ''
               Sendmail-compatible binary to be used to send the messages.
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index a186982ec9c0..91f1a333be7f 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -30,7 +30,7 @@ let
     ''
       [ global ]
       security = ${cfg.securityType}
-      passwd program = /var/setuid-wrappers/passwd %u
+      passwd program = /var/permissions-wrappers/passwd %u
       pam password change = ${smbToString cfg.syncPasswordsByPam}
       invalid users = ${smbToString cfg.invalidUsers}
 
diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix
index bc975159cdfd..bc9b884f11b4 100644
--- a/nixos/modules/services/networking/gale.nix
+++ b/nixos/modules/services/networking/gale.nix
@@ -141,7 +141,7 @@ in
          setgid = false;
        };
 
-       security.setuidOwners = [ cfg.setuidWrapper ];
+       security.permissionsWrappers.setuid = [ cfg.setuidWrapper ];
 
        systemd.services.gale-galed = {
          description = "Gale messaging daemon";
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index cb8fe6bf4fe9..4e1d66bc110a 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -18,7 +18,7 @@ let
     var_prefix = "${stateDir}"
     prayer_user = "${prayerUser}"
     prayer_group = "${prayerGroup}"
-    sendmail_path = "/var/setuid-wrappers/sendmail"
+    sendmail_path = "/var/permissions-wrappers/sendmail"
 
     use_http_port ${cfg.port}
 
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 2070b2ffa018..9c4f8d59faa4 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,8 +42,10 @@ in
 
   config = mkIf cfg.enable {
 
-    security.setuidOwners = map (program: {
+    security.permissionsWrappers.setuid = map (program: {
       inherit program;
+
+      source = "${pkgs.atd}/bin/${program}";
       owner = "atd";
       group = "atd";
       setuid = true;
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 541fbb7ee644..e33961658f02 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -20,7 +20,7 @@ let
   cronNixosPkg = pkgs.cron.override {
     # The mail.nix nixos module, if there is any local mail system enabled,
     # should have sendmail in this path.
-    sendmailPath = "/var/setuid-wrappers/sendmail";
+    sendmailPath = "/var/permissions-wrappers/sendmail";
   };
 
   allFiles =
@@ -61,7 +61,7 @@ in
           A list of Cron jobs to be appended to the system-wide
           crontab.  See the manual page for crontab for the expected
           format. If you want to get the results mailed you must setuid
-          sendmail. See <option>security.setuidOwners</option>
+          sendmail. See <option>security.permissionsWrappers.setuid</option>
 
           If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
           will is allowed to have its own crontab file. The /var/cron/cron.deny file
@@ -99,7 +99,7 @@ in
       [
         { program = "crontab";
           source  = "${pkgs.cronNixosPkg.out}/bin/crontab";
-          user    = "root";
+          owner   = "root";
           group   = "root";
           setuid  = true;        
         }
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index 6e8465ab08f4..5804f0ee72f7 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -96,7 +96,7 @@ in
             fcronallow  =       /etc/fcron.allow
             fcrondeny   =       /etc/fcron.deny
             shell       =       /bin/sh
-            sendmail    =       /var/setuid-wrappers/sendmail
+            sendmail    =       /var/permissions-wrappers/sendmail
             editor      =       /run/current-system/sw/bin/vi
           '';
           target = "fcron.conf";
@@ -110,7 +110,7 @@ in
     [
       { program = "fcrontab";
         source  = "${pkgs.fcron.out}/bin/fcrontab";
-        user    = "root";
+        owner   = "root";
         group   = "root";
         setuid  = true;        
       }
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 8bcd6f01656d..df93fcd2bdba 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -30,7 +30,7 @@ let
       mkdir -p $out
 
       sed '${./dbus-system-local.conf.in}' \
-        -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
+        -e 's,@servicehelper@,${config.security.permissionsWrapperDir}/dbus-daemon-launch-helper,g' \
         -e 's,@extra@,${systemExtraxml},' \
         > "$out/system-local.conf"
 
@@ -102,9 +102,9 @@ in
 
     systemd.packages = [ pkgs.dbus.daemon ];
 
-    security.setuidOwners = singleton
+    security.permissionsWrappers.setuid = singleton
       { program = "dbus-daemon-launch-helper";
-        source = "${pkgs.dbus_daemon.out}/libexec/dbus-daemon-launch-helper";
+        source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper";
         owner = "root";
         group = "messagebus";
         setuid = true;
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index b55950c6373b..90803ede9d92 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -66,7 +66,7 @@ in
     [
       { program = "e_freqset";
         source  = "${e.enlightenment.out}/bin/e_freqset";
-        user    = "root";
+        owner   = "root";
         group   = "root";
         setuid  = true;        
       }
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 1927341e45d4..88b3c3a1016b 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -119,7 +119,7 @@ in
           '';
       };
 
-    security.setuidOwners = singleton
+    security.permissionsWrappers.setuid = singleton
       { program = "kcheckpass";
         source = "${kde_workspace}/lib/kde4/libexec/kcheckpass";
         owner = "root";
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index bc010d1ce1cf..7856ff03f16d 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -47,7 +47,7 @@ in
       '';
     };
 
-    security.setuidOwners = [
+    security.permissionsWrappers.setuid = [
       {
         program = "kcheckpass";
         source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index ce4abecd6762..ee8569d3c0ca 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -63,7 +63,7 @@ in
     boot.extraModulePackages = [ virtualbox ];
     environment.systemPackages = [ virtualbox ];
 
-    security.setuidOwners = let
+    security.permissionsWrappers.setuid = let
       mkSuid = program: {
         inherit program;
         source = "${virtualbox}/libexec/virtualbox/${program}";
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 4eb428f37d88..9e7b52e40d4d 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2,
-  pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect,
+  pkexecPath ? "/var/permissions-wrappers/pkexec", libredirect,
   gksuSupport ? false, gksu}:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
index f9c3e3c55922..9a83fc09e4e7 100644
--- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
+++ b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
@@ -26,7 +26,7 @@ index 50e8ad8..eec0ed2 100644
 +	is_nixos=no
 +fi
 +
-+if [ -u /var/setuid-wrappers/gksign ]; then
++if [ -u /var/permissions-wrappers/gksign ]; then
 +	cat <<EOM
 +
 +Gale appears to have already been set up via the NixOS module system (check
diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
index 35b54c79e8f5..3d38cf3b604d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
+++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
@@ -4,7 +4,7 @@ Date: Thu, 26 Nov 2015 21:03:35 +0100
 Subject: [PATCH] Lookup dumpcap in PATH
 
 NixOS patch: Look for dumpcap in PATH first, because there may be a
-dumpcap setuid-wrapper that we want to use instead of the default
+dumpcap permissions-wrapper that we want to use instead of the default
 non-setuid dumpcap binary.
 
 Also change execv() to execvp() because we've set argv[0] to "dumpcap"
@@ -27,7 +27,7 @@ index 970688e..49914d5 100644
 -    exename = g_strdup_printf("%s/dumpcap", progfile_dir);
 +    /*
 +     * NixOS patch: Look for dumpcap in PATH first, because there may be a
-+     * dumpcap setuid-wrapper that we want to use instead of the default
++     * dumpcap permissions-wrapper that we want to use instead of the default
 +     * non-setuid dumpcap binary.
 +     */
 +    if (system("command -v dumpcap >/dev/null") == 0) {
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index a8a0542a8823..fb5b9e1d39d1 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -11,7 +11,7 @@ index a9d8ac4..85f13f5 100644
 -  # #   arguments: '-i -t'
 -  # # }
 +  config.action_mailer.sendmail_settings = {
-+    location: '/var/setuid-wrappers/sendmail',
++    location: '/var/permissions-wrappers/sendmail',
 +    arguments: '-i -t'
 +  }
    config.action_mailer.perform_deliveries = true
diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch
index 37d2ad3a515b..cae4abe8612c 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/pkgs/applications/virtualization/virtualbox/hardened.patch
@@ -96,7 +96,7 @@ index 95dc9a7..39170bc 100644
      /* get the path to the executable */
      char szPath[RTPATH_MAX];
 -    RTPathAppPrivateArch(szPath, sizeof(szPath) - 1);
-+    RTStrCopy(szPath, sizeof(szPath) - 1, "/var/setuid-wrappers");
++    RTStrCopy(szPath, sizeof(szPath) - 1, "/var/permissions-wrappers");
      size_t cchBufLeft = strlen(szPath);
      szPath[cchBufLeft++] = RTPATH_DELIMITER;
      szPath[cchBufLeft] = 0;
@@ -154,7 +154,7 @@ index be2ad8f..7ddf105 100644
  
 +RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath)
 +{
-+    return RTStrCopy(pszPath, cchPath, "/var/setuid-wrappers");
++    return RTStrCopy(pszPath, cchPath, "/var/permissions-wrappers");
 +}
 +
 +
@@ -174,7 +174,7 @@ index 7bde6af..2656cae 100644
 + * will cut off everything after the rightmost / as this function is analogous
 + * to RTProcGetExecutablePath().
 + */
-+#define SUIDDIR "/var/setuid-wrappers/"
++#define SUIDDIR "/var/permissions-wrappers/"
 +
 +RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath)
 +{
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 1dc71987f543..f69338cb16cc 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -51,7 +51,7 @@ let
     export PS1='${name}-chrootenv:\u@\h:\w\$ '
     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='/var/setuid-wrappers:/usr/bin:/usr/sbin'
+    export PATH='/var/permissions-wrappers:/usr/bin:/usr/sbin'
     export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
     # Force compilers to look in default search paths
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index b86eba685bbb..4cedd6f8e8fa 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
 
     # Fix some binary paths
     sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c
-    sed -i -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|g' libgksu/libgksu.c
-    sed -i -e 's|/bin/su\([^d]\)|/var/setuid-wrappers/su\1|g' libgksu/libgksu.c
+    sed -i -e 's|/usr/bin/sudo|/var/permissions-wrappers/sudo|g' libgksu/libgksu.c
+    sed -i -e 's|/bin/su\([^d]\)|/var/permissions-wrappers/su\1|g' libgksu/libgksu.c
 
     touch NEWS README
   '';
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index ab1943b85909..f33ee3917f18 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -5,7 +5,7 @@
 let
 
   system = "/var/run/current-system/sw";
-  setuid = "/var/setuid-wrappers"; #TODO: from <nixos> config.security.wrapperDir;
+  setuid = "/var/permissions-wrappers"; #TODO: from <nixos> config.security.wrapperDir;
 
   foolVars = {
     SYSCONF = "/etc";
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 0a72e6bb91eb..287422282cb2 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -94,7 +94,7 @@ in stdenv.mkDerivation rec {
     unitydir="$out/opt/Unity/Editor"
     mkdir -p $unitydir
     mv Editor/* $unitydir
-    ln -sf /var/setuid-wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
+    ln -sf /var/permissions-wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
 
     mkdir -p $out/share/applications
     sed "/^Exec=/c\Exec=$out/bin/unity-editor" \
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index d86eb2a9756a..9f63ae4f35a9 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       # Ensure that FUSE calls the setuid wrapper, not
       # $out/bin/fusermount. It falls back to calling fusermount in
       # $PATH, so it should also work on non-NixOS systems.
-      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\""
+      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/permissions-wrappers\""
 
       sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
     '';
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 3fa7e2ba8d14..531d55a7f12b 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/var/setuid-wrappers/sendmail@' -i Makefile
+        -e 's@/usr/sbin/sendmail@/var/permissions-wrappers/sendmail@' -i Makefile
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index d84c6224eebe..196af58183ff 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mv -v $out/sbin/unix_chkpwd{,.orig}
-    ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
+    ln -sv /var/permissions-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
   ''; /*
     rm -rf $out/etc
     mkdir -p $modules/lib
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 4d4a22fc720d..11444c57f9a4 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     --enable-last
     --enable-mesg
     --disable-use-tty-group
-    --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin
+    --enable-fs-paths-default=/var/permissions-wrappers:/var/run/current-system/sw/bin:/sbin
     ${if ncurses == null then "--without-ncurses" else ""}
     ${if systemd == null then "" else ''
       --with-systemd
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index 5842495e323e..d3c143617ddf 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -30,7 +30,7 @@ buildGoPackage rec {
       -e 's|/bin/chown|${coreutils}/bin/chown|' \
       -e 's|/bin/date|${coreutils}/bin/date|' \
       -e 's|/sbin/poweroff|${systemd}/sbin/poweroff|' \
-      -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|' \
+      -e 's|/usr/bin/sudo|/var/permissions-wrappers/sudo|' \
       -e 's|/sbin/cryptsetup|${cryptsetup}/bin/cryptsetup|'
   '';
 }
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix
index 3ecb00b64fc3..c112af567fd4 100644
--- a/pkgs/servers/mail/petidomo/default.nix
+++ b/pkgs/servers/mail/petidomo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, sendmailPath ? "/var/setuid-wrappers/sendmail" }:
+{ stdenv, fetchurl, flex, bison, sendmailPath ? "/var/permissions-wrappers/sendmail" }:
 
 stdenv.mkDerivation rec {
   name = "petidomo-4.3";
diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 79180f172417..695211a177d3 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   # configured on the build machine).
   preConfigure= "
     configureFlagsArray=(
-      --with-ping-command='/var/setuid-wrappers/ping -n -U -w %d -c %d %s'
-      --with-ping6-command='/var/setuid-wrappers/ping6 -n -U -w %d -c %d %s'
+      --with-ping-command='/var/permissions-wrappers/ping -n -U -w %d -c %d %s'
+      --with-ping6-command='/var/permissions-wrappers/ping6 -n -U -w %d -c %d %s'
     )
   ";
 
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index a8c249116c03..5f96a35af6fe 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
     configureFlags="--mandir=$out/share/man"
 
     substituteInPlace x11vnc/unixpw.c \
-        --replace '"/bin/su"' '"/var/setuid-wrappers/su"' \
+        --replace '"/bin/su"' '"/var/permissions-wrappers/su"' \
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
 
-    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/var/setuid-wrappers/su|g' x11vnc/ssltools.h
+    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/var/permissions-wrappers/su|g' x11vnc/ssltools.h
   '';
 
   meta = {
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 80805666a3a4..518c37639946 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
   buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
 
   patchPhase = ''
-    substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
+    substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/permissions-wrappers/sendmail"
     substituteInPlace certbot/le_util.py --replace "sw_vers" "/usr/bin/sw_vers"
   '';
 
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index ece9c5ed3824..15108852fbc5 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -2,7 +2,7 @@
 , FileDesktopEntry, libxslt, docbook_xsl, makeWrapper
 , python3Packages
 , perlPackages, curl, gnupg, diffutils
-, sendmailPath ? "/var/setuid-wrappers/sendmail"
+, sendmailPath ? "/var/permissions-wrappers/sendmail"
 }:
 
 let
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index 582b5ceae119..a477b22f191a 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   # TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
-  wrapperDir = "/var/setuid-wrappers";
+  wrapperDir = "/var/permissions-wrappers";
 
   postPatch = ''
     FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index e2c69377df5a..b0b19d750eb4 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, pam, groff
-, sendmailPath ? "/var/setuid-wrappers/sendmail"
+, sendmailPath ? "/var/permissions-wrappers/sendmail"
 , withInsults ? false
 }:
 
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 9991adf40131..2fb5b9670c88 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/setuid-wrappers/sendmail" }:
+{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/permissions-wrappers/sendmail" }:
 
 stdenv.mkDerivation {
   name = "at-3.1.16";
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index cad1230ac87a..1384ea04fb62 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl,
-sendmailPath ? "/var/setuid-wrappers/sendmail" }:
+sendmailPath ? "/var/permissions-wrappers/sendmail" }:
 
 stdenv.mkDerivation rec {
 

From 849dcde2a53398f91ab1da9adedcf65616c4e6ef Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 1 Sep 2016 19:22:37 -0500
Subject: [PATCH 0016/3449] Wonder why this wasn't removed in the rebase?

---
 nixos/modules/programs/unity3d.nix | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 nixos/modules/programs/unity3d.nix

diff --git a/nixos/modules/programs/unity3d.nix b/nixos/modules/programs/unity3d.nix
deleted file mode 100644
index 47f1d1ef1600..000000000000
--- a/nixos/modules/programs/unity3d.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let cfg = config.programs.unity3d;
-in {
-
-  options = {
-    programs.unity3d.enable = mkEnableOption "Unity3D, a game development tool";
-  };
-
-  config = mkIf cfg.enable {
-    security.permissionsWrappers.setuid = [{
-      program = "unity-chrome-sandbox";
-      source = "${pkgs.unity3d.sandbox}/bin/unity-chrome-sandbox";
-      owner = "root";
-      #group = "root";
-      setuid = true;
-      #setgid = true;
-    }];
-
-    environment.systemPackages = [ pkgs.unity3d ];
-  };
-
-}

From c686da8655bbdd4f0677bea788794e7b9f1d7dda Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 1 Sep 2016 19:26:30 -0500
Subject: [PATCH 0017/3449] Updatig the chromium-suid-sandbox module

---
 nixos/modules/security/chromium-suid-sandbox.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index 88fbe518c2de..6fe252136390 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -27,6 +27,10 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ sandbox ];
-    security.setuidPrograms    = [ sandbox.passthru.sandboxExecutableName ];
+    security.permissionsWrappers.setuid = [
+      { program = sandbox.passthru.sandboxExecutableName;
+        source  = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";
+      }
+    ];
   };
 }

From d60581d4d620787311e4268354680025eaeec27a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 1 Sep 2016 19:26:54 -0500
Subject: [PATCH 0018/3449] Resolving that silly bad argument error.

---
 nixos/modules/programs/shadow.nix                       | 2 +-
 nixos/modules/security/permissions-wrappers/default.nix | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index f40faa1ca5fb..3910831fb0e0 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -119,7 +119,7 @@ in
       }
     ] ++
     (lib.optionals config.users.mutableUsers
-     map (x: x // { user = "root";
+     map (x: x // { owner   = "root";
                     group   = "root";
                     setuid  = true;
                   })
diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 6b0570faa402..76a22b4f6038 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -53,8 +53,6 @@ let
     { program
     , source ? null
     , owner  ? "nobody"
-    # Legacy code I can't find :(
-    , user   ? null
     , group  ? "nogroup"
     , setuid ? false
     , setgid ? false
@@ -64,7 +62,7 @@ let
 
       # Prevent races
       chmod 0000 ${permissionsWrapperDir}/${program}
-      chown ${if user != null then user else owner}.${group} ${permissionsWrapperDir}/${program}
+      chown ${owner}.${group} ${permissionsWrapperDir}/${program}
 
       chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
     '';

From 1f9494b752082ec3ac048e56d1c6364a2e23a675 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@awakenetworks.com>
Date: Thu, 1 Sep 2016 19:47:41 -0500
Subject: [PATCH 0019/3449] Need to create a new build to see why it's failing

---
 nixos/modules/programs/shadow.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 3910831fb0e0..f6f66924f32b 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -102,6 +102,7 @@ in
         chgpasswd = { rootOK = true; };
       };
 
+
     security.permissionsWrappers.setuid = 
     [
       { program = "su";

From 52545aab7dee4fe874dd7d111e7069b9afd0d92e Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Sat, 3 Sep 2016 18:24:55 -0500
Subject: [PATCH 0020/3449] libmsgpack: fixed mingw32 cross-build

`cmake`, as usual, should be in `nativeBuildInputs` and we need to add a few cmake flags for mingw32 build to succeed.
---
 pkgs/development/libraries/libmsgpack/generic.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix
index 72943c098ba1..2da703da4cfd 100644
--- a/pkgs/development/libraries/libmsgpack/generic.nix
+++ b/pkgs/development/libraries/libmsgpack/generic.nix
@@ -8,7 +8,12 @@ stdenv.mkDerivation rec {
 
   inherit src patches;
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
+
+  crossAttrs = {
+  } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+    cmakeFlags = "-DMSGPACK_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=Windows";
+  };
 
   meta = with stdenv.lib; {
     description = "MessagePack implementation for C and C++";

From d849c0e2e1236b22e298254e75f8d30a665af66f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 30 Oct 2016 11:41:20 -0400
Subject: [PATCH 0021/3449] Build support

---
 pkgs/build-support/fetchurl/mirrors.nix       |  5 ++++
 .../java-modules/build-maven-package.nix      | 26 +++++++++++++++++++
 pkgs/development/java-modules/m2install.nix   | 21 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 4 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/java-modules/build-maven-package.nix
 create mode 100644 pkgs/development/java-modules/m2install.nix

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 5ae5eb105e79..0304165828f0 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -396,4 +396,9 @@ rec {
     https://archive.mozilla.org/pub/
   ];
 
+  # Maven Central
+  maven = [
+    http://repo1.maven.org/maven2
+    http://central.maven.org/maven2
+  ];
 }
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
new file mode 100644
index 000000000000..182740c552d8
--- /dev/null
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -0,0 +1,26 @@
+{ stdenv, maven, lib }:
+{ mavenDeps, src, name, meta, m2Path, ... }:
+
+with builtins;
+with lib;
+
+stdenv.mkDerivation rec {
+  inherit mavenDeps src name meta m2Path;
+
+  flatDeps = flatten mavenDeps;
+
+  propagatedBuildInput = [ maven ] ++ flatDeps;
+
+  find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
+  copy = ''cp -rs ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2'';
+
+  buildPhase = ''
+    mkdir -p $out/m2/${m2Path}
+    ${optionalString (length flatDeps > 0) find}
+    ${optionalString (length flatDeps > 0) copy}
+    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 clean install -Dmaven.test.skip=true -gs $out/m2/settings.xml
+  '';
+}
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
new file mode 100644
index 000000000000..56ae8132c61c
--- /dev/null
+++ b/pkgs/development/java-modules/m2install.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+{ version, baseName, package, sha512, type ? "jar" }:
+
+let
+  name = "${baseName}-${version}";
+  m2Path = "${package}/${baseName}/${version}";
+  m2File = "${name}.${type}";
+  src = fetchurl rec {
+      inherit sha512;
+      url = "mirror://maven/${m2Path}/${m2File}";
+  };
+in stdenv.mkDerivation rec {
+  inherit name m2Path m2File src;
+
+  installPhase = ''
+    mkdir -p $out/m2/$m2Path
+    cp $src $out/m2/$m2Path/$m2File
+  '';
+
+  phases = "installPhase";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cb32f3ce4df..bd0bdc0b5109 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9761,6 +9761,10 @@ in
 
   leaps = callPackage ../development/tools/leaps { };
 
+  ### DEVELOPMENT / JAVA MODULES
+
+  javaPackages = recurseIntoAttrs (callPackage ./java-packages.nix { });
+
   ### DEVELOPMENT / LISP MODULES
 
   asdf = callPackage ../development/lisp-modules/asdf {

From 1f2e19b67cdb68a89fc99a70eff5b851e488ab97 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 30 Oct 2016 11:44:56 -0400
Subject: [PATCH 0022/3449] Partial junit_4_12

---
 .../java-modules/apache/commons-cli.nix       |  14 +
 .../java-modules/apache/commons-lang.nix      |  14 +
 .../java-modules/beanshell/bsh.nix            |  14 +
 .../java-modules/classworlds/classworlds.nix  |  14 +
 .../java-modules/eclipse/aether-util.nix      |  15 +
 .../java-modules/hamcrest/core.nix            |  16 +
 .../java-modules/junit/default.nix            |  33 ++
 .../java-modules/maven/artifact-manager.nix   |  14 +
 .../java-modules/maven/artifact.nix           |  25 ++
 .../maven/common-artifact-filters.nix         |  14 +
 pkgs/development/java-modules/maven/core.nix  |  14 +
 .../java-modules/maven/dependency-tree.nix    |  14 +
 .../java-modules/maven/doxia-sink-api.nix     |  14 +
 .../java-modules/maven/enforcer.nix           |  25 ++
 .../java-modules/maven/error-diagnostics.nix  |  14 +
 pkgs/development/java-modules/maven/model.nix |  25 ++
 .../java-modules/maven/monitor.nix            |  14 +
 .../java-modules/maven/plugin-api.nix         |  36 ++
 .../java-modules/maven/plugin-descriptor.nix  |  14 +
 .../maven/plugin-parameter-documenter.nix     |  14 +
 .../java-modules/maven/plugin-registry.nix    |  14 +
 .../java-modules/maven/profile.nix            |  14 +
 .../java-modules/maven/project.nix            |  14 +
 .../java-modules/maven/reporting-api.nix      |  14 +
 .../maven/repository-metadata.nix             |  14 +
 .../java-modules/maven/settings.nix           |  14 +
 .../development/java-modules/mavenPlugins.nix | 113 ++++++
 .../plexus/component-annotations.nix          |  14 +
 .../java-modules/plexus/container-default.nix |  14 +
 pkgs/development/java-modules/plexus/i18n.nix |  14 +
 .../java-modules/plexus/interactivity-api.nix |  14 +
 .../development/java-modules/plexus/utils.nix |  47 +++
 pkgs/development/java-modules/poms.nix        | 331 ++++++++++++++++++
 pkgs/top-level/java-packages.nix              | 113 ++++++
 34 files changed, 1101 insertions(+)
 create mode 100644 pkgs/development/java-modules/apache/commons-cli.nix
 create mode 100644 pkgs/development/java-modules/apache/commons-lang.nix
 create mode 100644 pkgs/development/java-modules/beanshell/bsh.nix
 create mode 100644 pkgs/development/java-modules/classworlds/classworlds.nix
 create mode 100644 pkgs/development/java-modules/eclipse/aether-util.nix
 create mode 100644 pkgs/development/java-modules/hamcrest/core.nix
 create mode 100644 pkgs/development/java-modules/junit/default.nix
 create mode 100644 pkgs/development/java-modules/maven/artifact-manager.nix
 create mode 100644 pkgs/development/java-modules/maven/artifact.nix
 create mode 100644 pkgs/development/java-modules/maven/common-artifact-filters.nix
 create mode 100644 pkgs/development/java-modules/maven/core.nix
 create mode 100644 pkgs/development/java-modules/maven/dependency-tree.nix
 create mode 100644 pkgs/development/java-modules/maven/doxia-sink-api.nix
 create mode 100644 pkgs/development/java-modules/maven/enforcer.nix
 create mode 100644 pkgs/development/java-modules/maven/error-diagnostics.nix
 create mode 100644 pkgs/development/java-modules/maven/model.nix
 create mode 100644 pkgs/development/java-modules/maven/monitor.nix
 create mode 100644 pkgs/development/java-modules/maven/plugin-api.nix
 create mode 100644 pkgs/development/java-modules/maven/plugin-descriptor.nix
 create mode 100644 pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
 create mode 100644 pkgs/development/java-modules/maven/plugin-registry.nix
 create mode 100644 pkgs/development/java-modules/maven/profile.nix
 create mode 100644 pkgs/development/java-modules/maven/project.nix
 create mode 100644 pkgs/development/java-modules/maven/reporting-api.nix
 create mode 100644 pkgs/development/java-modules/maven/repository-metadata.nix
 create mode 100644 pkgs/development/java-modules/maven/settings.nix
 create mode 100644 pkgs/development/java-modules/mavenPlugins.nix
 create mode 100644 pkgs/development/java-modules/plexus/component-annotations.nix
 create mode 100644 pkgs/development/java-modules/plexus/container-default.nix
 create mode 100644 pkgs/development/java-modules/plexus/i18n.nix
 create mode 100644 pkgs/development/java-modules/plexus/interactivity-api.nix
 create mode 100644 pkgs/development/java-modules/plexus/utils.nix
 create mode 100644 pkgs/development/java-modules/poms.nix
 create mode 100644 pkgs/top-level/java-packages.nix

diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
new file mode 100644
index 000000000000..74087a04e0c9
--- /dev/null
+++ b/pkgs/development/java-modules/apache/commons-cli.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  commonsCli_1_0 = map (obj: fetchMaven {
+    version = "1.0";
+    baseName = "commons-cli";
+    package = "/commons-cli";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1pm5ba95viabcgpjhsqw21iwis9ajn8hwpyc6rzs9frr5k62hs7lj8darxmmp21hf14mxrs37a8swayhagq6i6g8js4nl4r8mmwjlvp"; }
+    { type = "jar"; sha512 = "0ybdbpfzadkncwcmnzkscbp2fhmcsqmpy60qppz7s8hs00hgqy64jr4qpdyz5bj0l4bc434vn0pv4gzxzi7y1lhh7b2rk4zv1mgs3ff"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
new file mode 100644
index 000000000000..eb60d19e8183
--- /dev/null
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  commonsLang_2_3 = map (obj: fetchMaven {
+    version = "2.3";
+    baseName = "commons-lang";
+    package = "/commons-lang";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "0i94xb3fgq0ig0aids9r1h1kblhlf762gsjxh422ra23saa4474q4iywgfk596bpcflngf2sarq8ch6lw09p0g43779d23b74bd939n"; }
+    { type = "jar"; sha512 = "1f30pryvd39m2yazflzy5l1h4l473dj8ccrd9v8z8lb6iassn4xc142f2snkzxlc7ncqsi6fbfd3zfxsy8afivmxmxds6mbsrxayqwk"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix
new file mode 100644
index 000000000000..e636fe557ecc
--- /dev/null
+++ b/pkgs/development/java-modules/beanshell/bsh.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  bsh_2_0_b4 = map (obj: fetchMaven {
+    version = "2.0b4";
+    baseName = "bsh";
+    package = "/org/beanshell";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1xgl3zw2gaca7f09224k3bi22dqdcd589c5jqk7p87s6dlbaai8sivklbq225yxmcpmwsi98r0a6xlgxnxnhk3b0qplf1bj4qp17dx9"; }
+    { type = "jar"; sha512 = "1idcadxcphpqh2f6qjijd2gdcklcv9qmv1aalh2z5rk5vipqm89hm05lwjapw2gy5x5q1grzxraalnspbhacrrwm15np07580k6vki9"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix
new file mode 100644
index 000000000000..a177927d3d68
--- /dev/null
+++ b/pkgs/development/java-modules/classworlds/classworlds.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  classworlds_1_1 = map (obj: fetchMaven {
+    version = "1.1";
+    baseName = "classworlds";
+    package = "/classworlds";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "202zfp93ly15q5iamjwy2vsrip8i87pmv5pqyxl9v7wvcmd4flyhlhkkx7hw9jy82dbzglrs2jklsm96dy22nv1njm5dw5kbzarhakq"; }
+    { type = "jar"; sha512 = "1cs8v7hhbgwfmlx4dm7r78mki5vk0gjn798qy4w1qzkz90hf9yl52srpjair2fg96qsmk22nd73r92vdmjji65l75ji3kfghzx9872x"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix
new file mode 100644
index 000000000000..33ba3d5edd78
--- /dev/null
+++ b/pkgs/development/java-modules/eclipse/aether-util.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  aetherUtil_0_9_0_M2 = map (obj: fetchMaven {
+    version = "0.9.0.M2";
+    baseName = "aether-util";
+    package = "/org/eclipse/aether";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1qh3vzdf33fffsry9256vbaskhp0xsw1d8s7c429a1hiyz8qi9p2sqsh2mqj5vrfj0mxri1nm68pv0nm9fhqzrwfy6f2sihl8rp7df1"; }
+    { type = "pom"; sha512 = "2a0z5r5avm7gfkabkha6h1b0gbnma725dqby9wz6lhhkwqhn3zmdr69a0ll6vfh1mv0ir4spcr02hi61xlng4lakdlmwllm0g5ixaiz"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix
new file mode 100644
index 000000000000..1414dc1fe6bb
--- /dev/null
+++ b/pkgs/development/java-modules/hamcrest/core.nix
@@ -0,0 +1,16 @@
+{ fetchMaven }:
+
+rec {
+  # Ant build, just fetch the binary
+  hamcrestCore_1_3 = map (obj: fetchMaven {
+    version = "1.3";
+    baseName = "hamcrest-core";
+    package = "/org/hamcrest";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "14vx453pk5shchdn3sz17s5im1cq1vav19rwnybafnsq2blfn3d0xz01cf9h1gnzclivhc4wgf7vvs23wcr7iiy4nksakxcb9rswdz2"; }
+    { type = "pom"; sha512 = "3rn4bs9ixdnwg916qdkjjv9m17l0ym7zj6cxaf18304wlbshxcb1fpa11rnll9g76ap0f4z8r70z3snfj6kyf6sw9xf9xpq4n1796rg"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
new file mode 100644
index 000000000000..7325b07700fe
--- /dev/null
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgs, mavenbuild }:
+
+with pkgs.javaPackages;
+
+rec {
+  junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
+    inherit mavenDeps sha512 version;
+
+    name = "junit-${version}";
+    src = pkgs.fetchFromGitHub {
+      inherit sha512;
+      owner = "junit-team";
+      repo = "junit4";
+      rev = "r${version}";
+    };
+    m2Path = "/junit/junit/${version}";
+
+    meta = {
+      homepage = http://junit.org/junit4/;
+      description = "Simple framework to write repeatable tests. It is an instance of the xUnit architecture for unit testing frameworks";
+      license = stdenv.lib.licenses.epl10;
+      platforms = stdenv.lib.platforms.all;
+      maintainers = with stdenv.lib.maintainers;
+        [ nequissimus ];
+    };
+  };
+
+  junit_4_12 = junitGen {
+    mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ] ++ mavenPlugins.mavenDefault;
+    sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
+    version = "4.12";
+  };
+}
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
new file mode 100644
index 000000000000..b46fb254b173
--- /dev/null
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenArtifactManager_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-artifact-manager";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; }
+    { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
new file mode 100644
index 000000000000..d0b528b916ae
--- /dev/null
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -0,0 +1,25 @@
+{ fetchMaven }:
+
+rec {
+  mavenArtifact_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "17g913m1zbrvarkwvmz5xx9nv7mrk2984rc9pkbc2laid7n1nb226g0262xyhcnc2s57av96337ag6jg2bq9p1kgx7gbd2z6gnvkkia"; }
+    { type = "pom"; sha512 = "0g0cbqihzxyaa1b0z9a7qb8lkhcm8bzxi7qnqaab2n2zaaql6jyy7cf4z4yzqw3yfj7ylqvydiwp32j2c7nqacyx0hmcydqkqg46kxv"; }
+  ];
+
+  mavenArtifact_3_0_3 = map (obj: fetchMaven {
+    version = "3.0.3";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0f842m7wi9ajvphgshnmsn8dppiwr326yp663gic45xzkpfvka118npl8xxqnr683dipvbnbrddim974qcpz4mgpypir0922803i3qv"; }
+    { type = "pom"; sha512 = "3wpambpgm68rap906gdvwlbywgjs57nkc8k05r8rx701800zbpwlrzc9b3ipxgjb7y6f2z1vi14yj9ia12wv7k8jn2aspf31pzp5plq"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
new file mode 100644
index 000000000000..4d46de674b55
--- /dev/null
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven {
+    version = "1.4";
+    baseName = "maven-common-artifact-filters";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "21wyk4llwjyanlggy281f9n0sjshjqvd322lbhxmzn42cd9vmj0s6xih82jwqlkcxkypwymyj1gl7van55ibd98p1jjjvr93gs1cn14"; }
+    { type = "jar"; sha512 = "1bv4lp1a8sb79almnygiq0pmm0fdhy9pyakp6xhz91b4v1cqg03sb586yc4lg2934yv4jjbybqjbh4l0y3kgnanjbxdxdgxgyf14iif"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
new file mode 100644
index 000000000000..6aed7095ad25
--- /dev/null
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenCore_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-core";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; }
+    { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix
new file mode 100644
index 000000000000..cdd626e58486
--- /dev/null
+++ b/pkgs/development/java-modules/maven/dependency-tree.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenDependencyTree_2_1 = map (obj: fetchMaven {
+    version = "2.1";
+    baseName = "maven-dependency-tree";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "29ibiyc1x20yrnxgcpvvf3k0pcjq63l98lakk10gipmx8a7bqs6m7npcqhzq6a3xrrcnz4pp7mj9gkmcs1svhg3qj4778cdax5pfy39"; }
+    { type = "jar"; sha512 = "3mr5ph5yngfvqwvrbiwvs66d8gbhpjsp009q5hrarkg53kwlphy6rmvdkfzp4j5rz8dd4cirv7vf6nhhrpdnjy2fc8bhx2s61zissnd"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
new file mode 100644
index 000000000000..6acf39b480d7
--- /dev/null
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenDoxiaSinkApi_1_0_alpha10 = map (obj: fetchMaven {
+    version = "1.0-alpha-10";
+    baseName = "doxia-sink-api";
+    package = "/org/apache/maven/doxia";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "31n980rx8m3sy6ia6izdjmc95pd8gvy31a1j933qznvs10flsf3gvmnywcyncf9y4pvaynddqjfvjpvf1qkxcw9jwjcmq7ka3325fi9"; }
+    { type = "jar"; sha512 = "1bgp929njkqvzv1q07drfncqagpkfw1ksi0cvwqq69ww2lbg3rmq2if11j7ldwn2rdvmfrr9qyhg34vwz13gfh7yylkw0il0q9h9hlj"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix
new file mode 100644
index 000000000000..83037e6adee6
--- /dev/null
+++ b/pkgs/development/java-modules/maven/enforcer.nix
@@ -0,0 +1,25 @@
+{ fetchMaven }:
+
+rec {
+  mavenEnforcerApi_1_3_1 = map (obj: fetchMaven {
+    version = "1.3.1";
+    baseName = "enforcer-api";
+    package = "/org/apache/maven/enforcer";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "2bh75j9f1hf80yhikd2r014kq8pgf9b49w62w7v9772kwdsza84v527vph0ifldpk561aivz5v604a9rpw5zb03gkixr51qspmsg2hp"; }
+    { type = "jar"; sha512 = "2pi1df9brkrlqp36pvk8ccc308b2882nmb2c1pbp2vaf4v95wm529vyng5gv9012l6c293ciamaxiv019zv04hl3zsgpk0m5fg3qhs0"; }
+  ];
+
+  mavenEnforcerRules_1_3_1 = map (obj: fetchMaven {
+    version = "1.3.1";
+    baseName = "enforcer-rules";
+    package = "/org/apache/maven/enforcer";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "16i11v6rlym87zvq3x0nn7m8g5w3vyf3g097cz79a3hjmzf3zk12837wi007697nr5dfd3sq9r9cgxmqw77y6cyphaic71hmhv4jx7c"; }
+    { type = "jar"; sha512 = "33xp9dgdml15bf8dpw4b61wfqnkypixd697q60lan3hvv10bs33jfw8xxsj2pl2l11hca6whk2c1wdddc913s88r13zzaghgizwsx55"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
new file mode 100644
index 000000000000..22ac264bdd10
--- /dev/null
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenErrorDiagnostics_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-error-diagnostics";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; }
+    { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
new file mode 100644
index 000000000000..fa3abf7c4d23
--- /dev/null
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -0,0 +1,25 @@
+{ fetchMaven }:
+
+rec {
+  mavenModel_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-model";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "14pxgdcim20x9lisf510nazzlcjxv9fpqabkdn0d86qa7d9270m4fmya5crasx2np9h0gxl407d77vcjf99fdxizg7i32w35yljqp3z"; }
+    { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; }
+  ];
+
+  mavenModel_3_0_3 = map (obj: fetchMaven {
+    version = "3.0.3";
+    baseName = "maven-model";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "13b339n0iibvy9x1d34b6gsnlz2s26ap866nhm4wyrlb0hkyb4zf7xbvc8aigr9zzzc4msn3yi98ylgsbinxx8dkbs89x1amnd7v1nr"; }
+    { type = "pom"; sha512 = "38dbv2z16h1wq16pxx5nrpndpkmnmj6wxsa4x13hsm7skmfwxdr51ddjddc4qlqk9dfnny0yv3lf009k0pfs06hfn0xiv85ki5y1hfg"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
new file mode 100644
index 000000000000..1304304257aa
--- /dev/null
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenMonitor_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-monitor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; }
+    { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
new file mode 100644
index 000000000000..56069bf19709
--- /dev/null
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -0,0 +1,36 @@
+{ fetchMaven }:
+
+rec {
+  mavenPluginApi_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-plugin-api";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "3926imf3d59530ldz9hajjq6xkb5mb1llx7br0025p8c1xfhgr4hqm6dripi0yd9f53sbdxhla5ly68q2vsbzbklpldrvrbz6b5wrql"; }
+    { type = "jar"; sha512 = "34fb0yw3z7bxlxxs8wmv59g351jkfp16ljq5zmyksq54kz2wvkv39w7bcnvlkbdwaggm7cd2jr9s4y4lynkblp8ydf9jbq8awwr7c00"; }
+  ];
+
+  mavenPluginApi_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-plugin-api";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "23qj23k049jz4mp77h2wj4mnjqszb99l4xvxas93cpnbdl51a5s0d0rsg60a8zg0ic04n6fr8nig0vvmmcsggx93a96w4p3na97q30n"; }
+    { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; }
+  ];
+
+  mavenPluginApi_3_0_3 = map (obj: fetchMaven {
+    version = "3.0.3";
+    baseName = "maven-plugin-api";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "17zyw3j4zbg1hhj18i4q1f0r8gdxl3q9x5ksyqlyr0mrw2sadc6lvbbhyp3l7vsbddl4bgdx36gwvjp5d97gbmk1nbpi1vabadfhq76"; }
+    { type = "jar"; sha512 = "0rk2nzkwcrkfy3vs0zl0l2lxp3w4hkwxrypisbivv5al7sc8lbzls6jgpp3h5gx9kk4scjj24qf5vyimnbadj63rvqffg581fs2zgl9"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
new file mode 100644
index 000000000000..35b829a85785
--- /dev/null
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenPluginDescriptor_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-plugin-descriptor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; }
+    { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
new file mode 100644
index 000000000000..17ed70bfa9f2
--- /dev/null
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenPluginParameterDocumenter_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-plugin-parameter-documenter";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; }
+    { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
new file mode 100644
index 000000000000..baccc1aeb765
--- /dev/null
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenPluginRegistry_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-plugin-registry";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; }
+    { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
new file mode 100644
index 000000000000..674f35a2ef9a
--- /dev/null
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenProfile_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-profile";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; }
+    { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
new file mode 100644
index 000000000000..0d88850fb5db
--- /dev/null
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenProject_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-project";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0laxsz9z48zvx27m395djfl9121jkr7amiv8n07z9nkz9i60wjl52bb7cw6hp6090ba098g8azqpnz8l5i0yj255phy1j6s92ci1i7c"; }
+    { type = "pom"; sha512 = "047a0a2bd5fkmg70gzhdiwiwq5dmr84pz6jq9yi5fz44y57ndp7nb72fnkr0p0qcwmry3gj03hk9p2xr4ph53bl1x68j22fnv0f9krq"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
new file mode 100644
index 000000000000..ea8088489112
--- /dev/null
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenReportingApi_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-reporting-api";
+    package = "/org/apache/maven/reporting";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0x7j7k3xbxps80swyp4ff1sw4rwrhlxsx80kyh0sj0i9jz50x18p1rba10gx2fqd4l29zri77nlm4qza5yrf61s68xby2zr2bygyc9r"; }
+    { type = "pom"; sha512 = "054v1p9h0141pahs52pg8wb0x4jghm5222yns6mf4dbc9gpy7x9j2b0z2lv9q3slx98378s4zakx4kbk5ca9ldlm8sz9y10fpqm35s6"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
new file mode 100644
index 000000000000..125788c54f92
--- /dev/null
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenRepositoryMetadata_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-repository-metadata";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; }
+    { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
new file mode 100644
index 000000000000..73d707144bdb
--- /dev/null
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSettings_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-settings";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; }
+    { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
new file mode 100644
index 000000000000..17d4c86ba995
--- /dev/null
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -0,0 +1,113 @@
+{ pkgs, stdenv, lib, maven, fetchurl }:
+
+with pkgs.javaPackages;
+
+let
+  mavenbuild = pkgs.callPackage ./build-maven-package.nix { };
+  fetchMaven = pkgs.callPackage ./m2install.nix { };
+  poms = import ./poms.nix { inherit fetchMaven; };
+in rec {
+  inherit mavenbuild fetchMaven poms;
+
+  # Standard plugins used by pretty much every Maven build
+  mavenDefault = lib.flatten [ aetherUtil_0_9_0_M2 bsh_2_0_b4 classworlds_1_1 commonsCli_1_0 commonsLang_2_3 mavenArtifact_2_0_9 mavenArtifact_3_0_3 mavenArtifactManager_2_0_9 mavenClean_2_5 mavenCommonArtifactFilters_1_4 mavenCompiler_3_1 mavenCore_2_0_9 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcer_1_3_1 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_9 mavenInstall_2_4 mavenJar_2_4 mavenModel_2_0_9 mavenModel_3_0_3 mavenMonitor_2_0_9 mavenPluginApi_2_0_6 mavenPluginApi_2_0_9 mavenPluginApi_3_0_3 mavenPluginDescriptor_2_0_9 mavenPluginParameterDocumenter_2_0_9 mavenPluginRegistry_2_0_9 mavenProfile_2_0_9 mavenProject_2_0_9 mavenReplacer_1_5_3 mavenReportingApi_2_0_9 mavenRepositoryMetadata_2_0_9 mavenResources_2_6 mavenSettings_2_0_9 mavenSurefire_2_17 plexusComponentAnnotations_1_5_5 plexusContainerDefault_1_0_alpha9_stable1 plexusI18n_1_0_beta6 plexusInteractivityApi_1_0_alpha4 plexusUtils_1_5_8 plexusUtils_2_0_6 plexusUtils_3_0 ] ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 apache_10 apache_11 apache_13 apache_3 apache_4 apache_6 beanshell_2_0_b4 codehausParent_4 doxia_1_0_alpha10 doxia_1_0 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_6 maven_2_0_9 maven_3_0_3 mavenParent_15 mavenParent_21 mavenParent_22 mavenParent_23 mavenParent_5 mavenParent_6 mavenParent_8 mavenPlugins_22 mavenPlugins_23 mavenPlugins_24 mavenReporting_2_0_9 mavenSharedComponents_17 mavenSharedComponents_19 mojoParent_32 plexus_1_0_4 plexus_2_0_2 plexus_2_0_7 plexusComponents_1_1_4 plexusContainers_1_0_3 plexusContainers_1_5_5 sonatypeForgeParent_5 sonatypeParent_7 sonatypeSpiceParent_16 surefire_2_17 ]);
+
+  animalSniffer_1_11 = map (obj: fetchMaven {
+    version = "1.11";
+    baseName = "animal-sniffer-maven-plugin";
+    package = "/org/codehaus/mojo";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "224y5klr8pmm4g3k1qcqrbsjdng1nc9rfzlrk5x50q3d8pn0pj7jr1wg58997m217qimx4pwgcdbgl9niaw0xg136p76kd4hschbxda"; }
+    { type = "jar"; sha512 = "24dih4wp7p1rddvxcznlz42yxhqlln5ljdbvwnp75rsyf3ng25zv881ixk5qx8canr1lxx4kh22kwkaahz3qnw54fqn7w5z58m5768n"; }
+  ];
+
+  mavenClean_2_5 = map (obj: fetchMaven rec {
+    version = "2.5";
+    baseName = "maven-clean-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1dc1jd65pz1wl0hr89a8v4g8kd2hcixcdlpa102ffm03mmddc1862whbj9hppx3i3297rahrwl81cph3cdc866fbhbgaj7wld2649n7"; }
+    { type = "jar"; sha512 = "2fprppwpmzyvaynadm6slk382khlpf5s8sbi5x249qcaw2vkg5n77q79lgq981v9kjlr5wighjzpjqv8gdig45m2p37mcfwsy3jsv89"; }
+  ];
+
+  mavenCompiler_3_1 = map (obj: fetchMaven rec {
+    version = "3.1";
+    baseName = "maven-compiler-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1dqav3mb4ppg9l10qw04galjmf7yhlyzdna5ldpp3pmpsqglb8m2ab1q324ansz29dbp014w9c7na703jk7qzrja1ilxj0w71rpmsd5"; }
+    { type = "jar"; sha512 = "1dvq13yc8yacxr66pkvwwd4cvx0jln8dv9fh5gmd5vir05h8l5j4y324r1bklnzpx0ancs5ad8z944zgmpaq3w195kfsarmndp0gv2y"; }
+  ];
+
+  mavenEnforcer_1_3_1 = map (obj: fetchMaven rec {
+    version = "1.3.1";
+    baseName = "maven-enforcer-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "0w47gx4ksksnl9siq954g2zvx8gx0qa6q5kp91qyyk88c65mfqjjm19613h3dhfmjq9f4rl8b1qhrq35gy7l90aplnibcimrpm6w6nk"; }
+    { type = "jar"; sha512 = "15sb9qmxgbq82nzc9x66152va121vf33nn0ah2g4z169cv6jnjq05gk1472k59imypvwsh9hd3hqi9q6g8d0sawgk5l1ax900cx7n25"; }
+  ];
+
+  mavenInstall_2_4 = map (obj: fetchMaven rec {
+    version = "2.4";
+    baseName = "maven-install-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1s5isapjz7mp9cl0jvk8nd1amrasdk257zbil76yabd1h89q4504y01482lxh7sp7x4mcqzj00i6517qcfdzf6w99cnd8dxwgkwqq06"; }
+    { type = "jar"; sha512 = "35hbj5hbz085y1dxfmza6m207kn68q2g1k5a9mc75i9pj8fww7xm7xzcdv81xyxjm3r4qbqf1izlg16l99b93rfii9rg8kqz8mxqmb6"; }
+  ];
+
+  mavenJar_2_4 = map (obj: fetchMaven rec {
+    version = "2.4";
+    baseName = "maven-jar-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "12pj3lg7gf0c9hisasrks27b3a0ibvmlbgwbx7p1dcp0as40xwffrx57am7xpqv5bzwl5plh7xxd7s14yyvk8dybjhlj7shqmgn973r"; }
+    { type = "jar"; sha512 = "0frbikq8jm5pynlmv51k349kiaipd9jsrh6970313s0g6n4i0ws9vi232wc1mjrc3d27k63xqmb97jzgbbc6q337ypv5vil1ql9wh0d"; }
+  ];
+
+  mavenReplacer_1_5_3 = map (obj: fetchMaven rec {
+    version = "1.5.3";
+    baseName = "replacer";
+    package = "/com/google/code/maven-replacer-plugin";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "08vz72v426hd8bzpz2wd003r4kz7rn5syva5picppgwdj69q8xm4dj78mx39ywsgzv2x8jd3w3jpc23pgr07dqj5h2kyj44147lkhsp"; }
+    { type = "jar"; sha512 = "0f2rngcxpll0iigv115132fld5n6shjfn7m981sg7mdzlj75q2h5knd4x1ip33w60cm1j0rmqaxp1y6qn76ykvhprdyy9smiy667l9x"; }
+  ];
+
+  mavenResources_2_6 = map (obj: fetchMaven rec {
+    version = "2.6";
+    baseName = "maven-resources-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "3rki0dhs3y7w9vbvwf2i7hmq9vismcfq79cdzd3qfs9bva4qxikx939idg8jmwnwaqww4q3wmgwg5vx3n910m8m2xr83x6y0dm62vbk"; }
+    { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; }
+  ];
+
+  mavenSurefire_2_17 = map (obj: fetchMaven rec {
+    version = "2.17";
+    baseName = "maven-surefire-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "367j67yy8jyq0k7ycnf9ixjy0rl2xb7cz0hwvh9rcbxkbr687bwam2gss0zdsr44q2ndk5hlcq56hhngp055194p90hkcvgr343ng6y"; }
+    { type = "jar"; sha512 = "3vhs3djga2ni3bsldn7jml8ya3vgvqaakiybj9y77q8z35xcnf34hsxkmlpm6mbyl5afcv2ij6syas0zppshqbp64ibx7bsqnfi0zbl"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix
new file mode 100644
index 000000000000..949238001bea
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/component-annotations.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven {
+    version = "1.5.5";
+    baseName = "plexus-component-annotations";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2r0dzjs65hzllvm7kizis0lmx4sp3967c1918181y0isnlp1fsxg8sakb2qnfn748xnnxgh7h5fk04az999isd8qs1p85cgi2waz91f"; }
+    { type = "pom"; sha512 = "1yx9dl3mq8wx3w4ksq0z1x84kry1l1agdg3ssnbjwxlh96hjxki88j89iyfwbwwia40113b62r8168s0lhgzca3w7kbdii3kldgbz6y"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix
new file mode 100644
index 000000000000..a720c06a186c
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/container-default.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusContainerDefault_1_0_alpha9_stable1 = map (obj: fetchMaven {
+    version = "1.0-alpha-9-stable-1";
+    baseName = "plexus-container-default";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1dpzdijx7xb3kgv2ybias3shzvpsq82w6x1ig5gdkg0i47m6a1ld53bi3gjczdpn88xparp80jkqlacjb65764v05ps6zg0v3vr1dkw"; }
+    { type = "pom"; sha512 = "1gnm9ivwrkr3aqpnmdl34hkx53189wxj9acp2fms8inhznrxqcyyk355gpgzwvs9qpgdis1q88mj1fy3x1v3ffa3b6wi758p95q79jc"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix
new file mode 100644
index 000000000000..7af0cd17de8e
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/i18n.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusI18n_1_0_beta6 = map (obj: fetchMaven {
+    version = "1.0-beta-6";
+    baseName = "plexus-i18n";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "28j0h3qd2xpddcs9wxr30235a8l1jlqwj7mhbvdhqcn8ck2bbp7dx1bl9p8mzl1v6lgzqi12ga6lccs2axadmz0w7fscvzmfh2v8mvk"; }
+    { type = "pom"; sha512 = "1zv1v86vqzmk03mvl1i74wqk5s2b0wgr6qksdnjp7msmm8k27ilbgsdf9nf9wfc84s4kw4xwwkg954x192klwmv16kslc6xqjbxl2gk"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix
new file mode 100644
index 000000000000..9d62aec70f47
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/interactivity-api.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven {
+    version = "1.0-alpha-4";
+    baseName = "plexus-interactivity-api";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2zy33hz2g0mgb2ryjbgjrf55bmmglkbsmh03wx29d4cwgcd83i1wb211c1wxdnnf7a8cx6ryfhx1fxwq379m4793apa9aix8px5sqj2"; }
+    { type = "pom"; sha512 = "27890lj546q9rapgzks8dkdc5d2lbsr1rgbhl9vxkr7hpqci0m2q6g7zpl94vk50hx4bb52p24j0x6dqsyd6ijnadbi1dysfnb6jm6f"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
new file mode 100644
index 000000000000..672a43455c9a
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -0,0 +1,47 @@
+{ fetchMaven }:
+
+rec {
+  plexusUtils_1_1 = map (obj: fetchMaven {
+    version = "1.1";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "36k6grn4as4ka3diizwvybcfsn4spqqmqxvsaf66iq1zi2vxj3rsfr4xq6isv3p8f09wnnv9jm9xqqz4z0n3ah5mi8z1p5zhskcm5fs"; }
+    { type = "pom"; sha512 = "0vbzdfsdcc4cq7hdqzb1vdfxp23vnavq7z4qmmlb4d4fiqj5wqdgagrs43gl7yzca2azpyj3kyxgaipimi7gck07jcsz0pzljkplk4w"; }
+  ];
+
+  plexusUtils_1_5_8 = map (obj: fetchMaven {
+    version = "1.5.8";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0nx0l29lmphylkmnacwj6n1spdxxaqn1jr5vg4pcil9y2p08bzyn715bhwgazg3sa94ynzi38lsmf60y00prv3cy2zgj0smg5psq3z5"; }
+    { type = "pom"; sha512 = "06z4gkq3bh2pwyj8pvaly9fihd8gbgcqp3jxl05vkj2rcdb4jw3lw3hwn8f8ggqi17i2fdm8cbndkqgr9vdgiz45p8f1nx8kjlqikbi"; }
+  ];
+
+  plexusUtils_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3n0g1xhjkjm0m3ch5wm34vxvldw889p401rlwqrlzm6nh53h36plq955v2vv30gjdgp7n54lpr4pb374fxz6wbzj385kphmsgxbsaxc"; }
+    { type = "pom"; sha512 = "22g2dlbgc557k126hd0nfaf6n76vwa19nnd0ga8ywdx5pnai63x9806d7dhvjm778rmgpxlrj65y8if36q0zkbg153i007cxg36indj"; }
+  ];
+
+  plexusUtils_3_0 = map (obj: fetchMaven {
+    version = "3.0";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "16m1khf9fafb9f79rbz93qgc35d8605v1qbs4ywnj4sk00d00d6n1649cc9rv593r8ghwd0rkz345z7wb00fagdr9af5h8h5w5blsa1"; }
+    { type = "pom"; sha512 = "123fsmm1jvy571yl1s3wp7yd5k52nfjqxzqpzx2940rsigm35rw2mx1g4bvr3wx0gv5bqlfmqj5cwdhhxdq5vzrax8z5vbmdg5vb77r"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
new file mode 100644
index 000000000000..39dc95281406
--- /dev/null
+++ b/pkgs/development/java-modules/poms.nix
@@ -0,0 +1,331 @@
+{ fetchMaven }:
+
+rec {
+  aether_0_9_0_M2 = fetchMaven {
+    version = "0.9.0.M2";
+    baseName = "aether";
+    package = "/org/eclipse/aether";
+    sha512 = "0ampl2jkkc1f5cbigmi1b5nnxhb9qqzz0nyfb5a2vzbw3ri7ry8dj6xgjznlpxib46zxgaxcsvhxq2yx6a9i8chnzvgghccwpl808yi";
+    type = "pom";
+  };
+
+  animalSnifferParent_1_11 = fetchMaven {
+    version = "1.11";
+    baseName = "animal-sniffer-parent";
+    package = "/org/codehaus/mojo";
+    sha512 = "3w9l3b4qxzmlwmaqppn1d794ycqf5piilv44fc74jccbgahdsq1as8dvyknnj2610yklwxx3146s7f0c3ms8y93alv02wybjwk5fd07";
+    type = "pom";
+  };
+
+  apache_3 = fetchMaven {
+    version = "3";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "3vvqxycj7zxa9dfxa6f8i2azdvxc7ci68fk3nlkjvhsglmwr39wf6cwgj6qqlrw3mabzs714lgz0wdacsidncadxzfw774ck20dq1rf";
+    type = "pom";
+  };
+
+  apache_4 = fetchMaven {
+    version = "4";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6";
+    type = "pom";
+  };
+
+  apache_6 = fetchMaven {
+    version = "6";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "2nvwk7fhiqcbr4vrwl0d3g4wz25vll24ga9kyc89fzq6b9nr6bqfphrm5a73kdih97l5cqlszw8xc847viw2ss1mwabn590f01ykhj0";
+    type = "pom";
+  };
+
+  apache_10 = fetchMaven {
+    version = "10";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "0kmva6f2q5rq7rk9ljwn3rxa4w2j7sjkxsmvambzqpj61cagdnq4vj9jk0xxx8448kqckdh5w2xkr5lr33sgfl67jy9l5h2s6h13v6m";
+    type = "pom";
+  };
+
+  apache_11 = fetchMaven {
+    version = "11";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "09v6sghdaxinrk3pnpnc36x24z62gqn65v25q83mc0q6n49l0xir55xk21qzc8kc6hrdr9khnr7jxkqz207cyv6wky6sy7c3pqg0na0";
+    type = "pom";
+  };
+
+  apache_13 = fetchMaven {
+    version = "13";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "0sf86l1457wwp8czg32xhh96l5nlw8v84lbi59nfdxxzcrsn8b1ysgwda3r1ck0d86c5gjmh3qg7kbwlrspwa71w9zn9sby3bszj99v";
+    type = "pom";
+  };
+
+  beanshell_2_0_b4 = fetchMaven {
+    version = "2.0b4";
+    baseName = "beanshell";
+    package = "/org/beanshell";
+    sha512 = "2xwgqmfwli40lvlgjx00ki5zm1290jhjvqg7wnq869kxkw9iam239zxb0jz46jcpbgy10qg6sd86cjw5g38njywcz33501f6byd0n3w";
+    type = "pom";
+  };
+
+  codehausParent_4 = fetchMaven {
+    version = "4";
+    baseName = "codehaus-parent";
+    package = "/org/codehaus";
+    sha512 = "11dacs4155xc3rn3crdayg1yp15abw81lbk6qwi7207009rnyk1kxvs56am9pllkybgja53ri0k084k2ppp4dlhxrg6w3zccbafxlgp";
+    type = "pom";
+  };
+
+  doxia_1_0_alpha10 = fetchMaven {
+    version = "1.0-alpha-10";
+    baseName = "doxia";
+    package = "/org/apache/maven/doxia";
+    sha512 = "3by91czdkjn4myc6xwzap37ydmhvic4myr8p2zflnpawrph00jkz9pivd84k2qykvmc5gxzbmklf1inwvkq1f5bsyhh440mlvsfsn1s";
+    type = "pom";
+  };
+
+  doxia_1_0 = fetchMaven {
+    version = "1.0";
+    baseName = "doxia";
+    package = "/org/apache/maven/doxia";
+    sha512 = "3z04h87dwn5panpr68ajzflw5n4wgi98isl5snz6vrd2vz9744fdqggmn6698wljw9h4pzkvjyrxf9b7w4km6w7kma28akvn951vw99";
+    type = "pom";
+  };
+
+  enforcer_1_3_1 = fetchMaven {
+    version = "1.3.1";
+    baseName = "enforcer";
+    package = "/org/apache/maven/enforcer";
+    sha512 = "1m84z5x2gxlbj9bl2jrfzh26pl7nz1d79sv72clp565z4lr2r1abih2c7aigbd95zik948dqrbh2vzm7vp1iv0d23vk89rx4nmfg0rv";
+    type = "pom";
+  };
+
+  hamcrestParent_1_3 = fetchMaven {
+    version = "1.3";
+    baseName = "hamcrest-parent";
+    package = "/org/hamcrest";
+    sha512 = "1da3ivp9n1h3hl35vhgd7avi4xh8p0802qj7xrk93gbz01s2av28p6ycdwiwp7kja0151wm5jvbgpnkxd8azqwkh7dh83w22k7jpwh3";
+    type = "pom";
+  };
+
+  maven_2_0_6 = fetchMaven {
+    version = "2.0.6";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "2k58pvcrdc52zsq6id4vl8a45srxllm2m49namqkzix4356haphk3i06px9jcc2cmkqw7bcpqh5xvvmkds5vhp2b9y9b0i2lcfgx8jw";
+    type = "pom";
+  };
+
+  maven_2_0_9 = fetchMaven {
+    version = "2.0.9";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0";
+    type = "pom";
+  };
+
+  maven_3_0_3 = fetchMaven {
+    version = "3.0.3";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "397qqkh9qd2aj346v4nvxrhaqz6k75l5xnm1xcqd0d4mmxg0p7jlz54yzkshqli2w5df9f7p8pavpkiw5xkl8ipxmp87vfcanvkx4x4";
+    type = "pom";
+  };
+
+  mavenParent_5 = fetchMaven {
+    version = "5";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "1810h5ziij9awpf2c6sgqlwd93dd3c54rxbnjxar97idw2zkmwqfxvxi74qjcpbqqam3ypxb893k3958jmhbrzmwhwbkhxyyiqgjsx0";
+    type = "pom";
+  };
+
+  mavenParent_6 = fetchMaven {
+    version = "6";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "2z9rkv875yx64mpbf1mgyb3hcxqbhr0ndczwqlmkgd05a679d4vyi92fndaz1bcfwc5bmmxf4s6zrg58swv05j2j9d6vqd2b0x385dq";
+    type = "pom";
+  };
+
+  mavenParent_8 = fetchMaven {
+    version = "8";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
+    type = "pom";
+  };
+
+  mavenParent_15 = fetchMaven {
+    version = "15";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "390z5v0nygsw075fa5jzl5baxb0bripiiy6arqk550zlg8dw8mcg6cyscwnh3zw4gxyr1qbcy0v8wsj375xc65i2agkzg1qbv5z6xxp";
+    type = "pom";
+  };
+
+  mavenParent_21 = fetchMaven {
+    version = "21";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "2dph51qjkmh9sixd12rgxhrvl3w5r7nmr4n3ra4y1lifml6h0md0indj3qw4lxm0db811p3hxf2f9l0gf6w4q5ypjp20lk9ia2xm5s0";
+    type = "pom";
+  };
+
+  mavenParent_22 = fetchMaven {
+    version = "22";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "112xv5inpan05vkm12g2lpz37pgga1nm8rar2bqhibvwljg4yv1myx8z99g0nkd3gzbgw5098aagm006w6bnmwsibwd1js8is5d4r88";
+    type = "pom";
+  };
+
+  mavenParent_23 = fetchMaven {
+    version = "23";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "3c6ydqi3sf5aq3aj42kxgrjpcf8wpl0rf6hmr6vkas04w0h4dyvjb78ipyxsqzqgzjm6cmdfhxzx8hjb2lwvy3ipf1x39j6cj7dwdy8";
+    type = "pom";
+  };
+
+  mavenPlugins_22 = fetchMaven {
+    version = "22";
+    baseName = "maven-plugins";
+    package = "/org/apache/maven/plugins";
+    sha512 = "14xy4s69dvqllkspc5b8q1gdbi0wn494ghwcdfcvjzvgczjhhxbr1h698amv3zmg59gb7liz77ws4vmcar8j9lazywcv13cy1myiywa";
+    type = "pom";
+  };
+
+  mavenPlugins_23 = fetchMaven {
+    version = "23";
+    baseName = "maven-plugins";
+    package = "/org/apache/maven/plugins";
+    sha512 = "1vh7izahb4sskja66hqrygv1r8iwpl97kp65yx6z3fnm761brag89fdcl4jl9hypvm57alf283gvq9rsy5kqnqcdki20k5vw26y1b1a";
+    type = "pom";
+  };
+
+  mavenPlugins_24 = fetchMaven {
+    version = "24";
+    baseName = "maven-plugins";
+    package = "/org/apache/maven/plugins";
+    sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs";
+    type = "pom";
+  };
+
+  mavenReporting_2_0_9 = fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-reporting";
+    package = "/org/apache/maven/reporting";
+    sha512 = "0cg49pq6rvk7c84xwnpq2p47b7y973sy9qfgzcq06bnrqm6cj26h8k7d9kpp3q3rd2hlw10db4sjfx0crlai27cbbz41i5m22lq21s5";
+    type = "pom";
+  };
+
+  mavenSharedComponents_17 = fetchMaven {
+    version = "17";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy";
+    type = "pom";
+  };
+
+  mavenSharedComponents_19 = fetchMaven {
+    version = "19";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "1na6rh2mlwq6yrg7jxxnkcjj4ki0lqcihwiq2cy2ygsd6q0z8fn755frrd1j1jvd5dnh8jxjqp1m5mpwwv13hxhy8lmq95a5pp2a2qh";
+    type = "pom";
+  };
+
+  mojoParent_32 = fetchMaven {
+    version = "32";
+    baseName = "mojo-parent";
+    package = "/org/codehaus/mojo";
+    sha512 = "15pzaqpdcr8c2w2b2ms3qc5d3r0flmzqav6h45nmg1l8nv7529lp6dkilhkwqag1i94vh8dvqnkxm475j9v2hxmz981azrvz7984z8w";
+    type = "pom";
+  };
+
+  plexus_1_0_4 = fetchMaven {
+    version = "1.0.4";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "22zsqss9aws73zvgqaz1brnvhk8bqn0flzd644nikprbb9dh1jyv1jig7xaxj942wq1w8h6ybx6b3v1ysfr8kw1z70sb5yrb4zd4kkm";
+    type = "pom";
+  };
+
+  plexus_2_0_2 = fetchMaven {
+    version = "2.0.2";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "095kxnh9238wlnxsbsl7wj3zsp2ijwx8p8bvbmsvj3iacw9fsvddv263j485zfjf4ipvp5dwqc3sc8mqkwbhx1qj7k1x1hj14nl6r8z";
+    type = "pom";
+  };
+
+  plexus_2_0_7 = fetchMaven {
+    version = "2.0.7";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "2ddbjp60y8g7n56hya5qa59f980a8sdj0d1dicv3na3pbc6k4wgdrix78lgg32sp4fzmxl7fyzw9gy3z2vpzf65zkj3c9yh030jcysr";
+    type = "pom";
+  };
+
+  plexusComponents_1_1_4 = fetchMaven {
+    version = "1.1.4";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "02kdl9z8nz26h4qf9mrdm8s1y2gy1f57n825yy0y3qifavlv51k2yxza7mjsdl1dwrq84c4qlj79iqlisnhrppfy0ncbbblnbir1yln";
+    type = "pom";
+  };
+
+  plexusContainers_1_0_3 = fetchMaven {
+    version = "1.0.3";
+    baseName = "plexus-containers";
+    package = "/org/codehaus/plexus";
+    sha512 = "39sw2lxlrgbj1zlf67qz14j53sxd45p1qmna5cfizqikrwiqrnb6xwdxr2rsp3h2kadwwpz6id2ls6x3hr93znkad404rg4lg11v9nj";
+    type = "pom";
+  };
+
+  plexusContainers_1_5_5 = fetchMaven {
+    version = "1.5.5";
+    baseName = "plexus-containers";
+    package = "/org/codehaus/plexus";
+    sha512 = "1dzg3ry73scisq02p1c96rn04rvdpyf9v6cbvvmy6hvcaw11y8mmjwjnlayljhr9za5hhq5bwv2vssmp683v3qjr5750f9aa62jxw0w";
+    type = "pom";
+  };
+
+  sonatypeForgeParent_5 = fetchMaven {
+    version = "5";
+    baseName = "forge-parent";
+    package = "/org/sonatype/forge";
+    sha512 = "1l3nll0i5cpf2rh5f4gqriwy2737n9sccr605nx1swn1qafbxbvvs4jl7argdzz0mkzrr8sir7vnksm9a273vrdica9l35nxivm6vrx";
+    type = "pom";
+  };
+
+  sonatypeParent_7 = fetchMaven {
+    version = "7";
+    baseName = "oss-parent";
+    package = "/org/sonatype/oss";
+    sha512 = "3xk0q7y2kdarr3l42dqjzq9qz1r840abqw9zhvl4gpc8jw5xcbqd781fp8z41i3hrkyaf740f2kppji9l77ci7f759d5s9yg4grbc33";
+    type = "pom";
+  };
+
+  sonatypeSpiceParent_16 = fetchMaven {
+    version = "16";
+    baseName = "spice-parent";
+    package = "/org/sonatype/spice";
+    sha512 = "0awfi8vf4xc5c9510sas7xqlik4g8ljivay372cksvlcwlgyrgliikak0xxbxj72df5b9jzc9fzvjxd9rlllnnlnm4zllw5p2hakb0g";
+    type = "pom";
+  };
+
+  surefire_2_17 = fetchMaven {
+    version = "2.17";
+    baseName = "surefire";
+    package = "/org/apache/maven/surefire";
+    sha512 = "3yraw37xwayyrvwa62y6li3wbzrha08j389psz16j1dawxmg78zlm2x1jmgz3nzdb60n9kk143606bgs3vrf7ri9d5pwkg9lvw7hk92";
+    type = "pom";
+  };
+}
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
new file mode 100644
index 000000000000..760dd01e7324
--- /dev/null
+++ b/pkgs/top-level/java-packages.nix
@@ -0,0 +1,113 @@
+{ pkgs, stdenv, maven }:
+
+with pkgs;
+
+let
+  mavenbuild = callPackage ../development/java-modules/build-maven-package.nix { };
+  fetchMaven = callPackage ../development/java-modules/m2install.nix { };
+in {
+  inherit mavenbuild fetchMaven;
+
+  mavenPlugins = recurseIntoAttrs (callPackage ../development/java-modules/mavenPlugins.nix { });
+
+  inherit (callPackage ../development/java-modules/eclipse/aether-util.nix { inherit fetchMaven; })
+    aetherUtil_0_9_0_M2;
+
+  inherit (callPackage ../development/java-modules/beanshell/bsh.nix { inherit fetchMaven; })
+    bsh_2_0_b4;
+
+  inherit (callPackage ../development/java-modules/classworlds/classworlds.nix { inherit fetchMaven; })
+    classworlds_1_1;
+
+  inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; })
+    commonsCli_1_0;
+
+  inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; })
+    commonsLang_2_3;
+
+  inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; })
+    hamcrestCore_1_3;
+
+  inherit (callPackage ../development/java-modules/junit { inherit mavenbuild; })
+    junit_4_12;
+
+  inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; })
+    mavenArtifact_2_0_9
+    mavenArtifact_3_0_3;
+
+  inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; })
+    mavenArtifactManager_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/common-artifact-filters.nix { inherit fetchMaven; })
+    mavenCommonArtifactFilters_1_4;
+
+  inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; })
+    mavenCore_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/dependency-tree.nix { inherit fetchMaven; })
+    mavenDependencyTree_2_1;
+
+  inherit (callPackage ../development/java-modules/maven/doxia-sink-api.nix { inherit fetchMaven; })
+    mavenDoxiaSinkApi_1_0_alpha10;
+
+  inherit (callPackage ../development/java-modules/maven/enforcer.nix { inherit fetchMaven; })
+    mavenEnforcerApi_1_3_1
+    mavenEnforcerRules_1_3_1;
+
+  inherit (callPackage ../development/java-modules/maven/error-diagnostics.nix { inherit fetchMaven; })
+    mavenErrorDiagnostics_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; })
+    mavenModel_2_0_9
+    mavenModel_3_0_3;
+
+  inherit (callPackage ../development/java-modules/maven/monitor.nix { inherit fetchMaven; })
+    mavenMonitor_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; })
+    mavenPluginApi_2_0_6
+    mavenPluginApi_2_0_9
+    mavenPluginApi_3_0_3;
+
+  inherit (callPackage ../development/java-modules/maven/plugin-descriptor.nix { inherit fetchMaven; })
+    mavenPluginDescriptor_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/plugin-parameter-documenter.nix { inherit fetchMaven; })
+    mavenPluginParameterDocumenter_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/plugin-registry.nix { inherit fetchMaven; })
+    mavenPluginRegistry_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/profile.nix { inherit fetchMaven; })
+    mavenProfile_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; })
+    mavenProject_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; })
+    mavenReportingApi_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/repository-metadata.nix { inherit fetchMaven; })
+    mavenRepositoryMetadata_2_0_9;
+
+  inherit (callPackage ../development/java-modules/maven/settings.nix { inherit fetchMaven; })
+    mavenSettings_2_0_9;
+
+  inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; })
+    plexusComponentAnnotations_1_5_5;
+
+  inherit (callPackage ../development/java-modules/plexus/container-default.nix { inherit fetchMaven; })
+    plexusContainerDefault_1_0_alpha9_stable1;
+
+  inherit (callPackage ../development/java-modules/plexus/i18n.nix { inherit fetchMaven; })
+    plexusI18n_1_0_beta6;
+
+  inherit (callPackage ../development/java-modules/plexus/interactivity-api.nix { inherit fetchMaven; })
+    plexusInteractivityApi_1_0_alpha4;
+
+  inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; })
+    plexusUtils_1_1
+    plexusUtils_1_5_8
+    plexusUtils_2_0_6
+    plexusUtils_3_0;
+}

From 38e762c6d1f145cf5a2eecec17f1db0c27ddc3a4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 31 Oct 2016 09:38:28 -0400
Subject: [PATCH 0023/3449] Partial maven-hello

---
 .../java-modules/build-maven-package.nix      |   4 +-
 .../java-modules/findbugs/jsr305.nix          |  15 ++
 .../java-modules/junit/default.nix            |  15 +-
 .../java-modules/maven-hello/default.nix      |  33 ++++
 .../java-modules/maven/archiver.nix           |  14 ++
 .../java-modules/maven/artifact-manager.nix   |  22 +++
 .../java-modules/maven/artifact.nix           |  11 ++
 .../maven/common-artifact-filters.nix         |  11 ++
 pkgs/development/java-modules/maven/core.nix  |  22 +++
 .../java-modules/maven/doxia-sink-api.nix     |  11 ++
 .../java-modules/maven/error-diagnostics.nix  |  22 +++
 .../java-modules/maven/filtering.nix          |  14 ++
 pkgs/development/java-modules/maven/model.nix |  22 +++
 .../java-modules/maven/monitor.nix            |  22 +++
 .../java-modules/maven/plugin-annotations.nix |  14 ++
 .../java-modules/maven/plugin-api.nix         |  11 ++
 .../java-modules/maven/plugin-descriptor.nix  |  22 +++
 .../maven/plugin-parameter-documenter.nix     |  22 +++
 .../java-modules/maven/plugin-registry.nix    |  22 +++
 .../java-modules/maven/profile.nix            |  22 +++
 .../java-modules/maven/project.nix            |  11 ++
 .../java-modules/maven/reporting-api.nix      |  11 ++
 .../maven/repository-metadata.nix             |  22 +++
 .../java-modules/maven/settings.nix           |  22 +++
 .../java-modules/maven/shared-incremental.nix |  14 ++
 .../java-modules/maven/shared-utils.nix       |  14 ++
 .../java-modules/maven/surefire-api.nix       |  14 ++
 .../java-modules/maven/surefire-booter.nix    |  14 ++
 .../java-modules/maven/surefire-common.nix    |  14 ++
 .../java-modules/maven/toolchain.nix          |  25 +++
 .../development/java-modules/mavenPlugins.nix | 141 ++++++++++++++-
 .../java-modules/plexus/build-api.nix         |  14 ++
 .../java-modules/plexus/compiler-api.nix      |  14 ++
 .../java-modules/plexus/interpolation.nix     |  14 ++
 .../development/java-modules/plexus/utils.nix |  22 +++
 pkgs/development/java-modules/poms.nix        | 160 ++++++++++++++++++
 pkgs/top-level/java-packages.nix              |  96 +++++++++--
 37 files changed, 956 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/java-modules/findbugs/jsr305.nix
 create mode 100644 pkgs/development/java-modules/maven-hello/default.nix
 create mode 100644 pkgs/development/java-modules/maven/archiver.nix
 create mode 100644 pkgs/development/java-modules/maven/filtering.nix
 create mode 100644 pkgs/development/java-modules/maven/plugin-annotations.nix
 create mode 100644 pkgs/development/java-modules/maven/shared-incremental.nix
 create mode 100644 pkgs/development/java-modules/maven/shared-utils.nix
 create mode 100644 pkgs/development/java-modules/maven/surefire-api.nix
 create mode 100644 pkgs/development/java-modules/maven/surefire-booter.nix
 create mode 100644 pkgs/development/java-modules/maven/surefire-common.nix
 create mode 100644 pkgs/development/java-modules/maven/toolchain.nix
 create mode 100644 pkgs/development/java-modules/plexus/build-api.nix
 create mode 100644 pkgs/development/java-modules/plexus/compiler-api.nix
 create mode 100644 pkgs/development/java-modules/plexus/interpolation.nix

diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 182740c552d8..499a48b22281 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,4 +1,4 @@
-{ stdenv, maven, lib }:
+{ stdenv, maven, lib, pkgs }:
 { mavenDeps, src, name, meta, m2Path, ... }:
 
 with builtins;
@@ -7,7 +7,7 @@ with lib;
 stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
-  flatDeps = flatten mavenDeps;
+  flatDeps = unique (flatten (mavenDeps ++ pkgs.javaPackages.mavenPlugins.mavenMinimal));
 
   propagatedBuildInput = [ maven ] ++ flatDeps;
 
diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix
new file mode 100644
index 000000000000..466ce2476330
--- /dev/null
+++ b/pkgs/development/java-modules/findbugs/jsr305.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  findbugsJsr305_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "jsr305";
+    package = "/com/google/code/findbugs";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "33flq50603n496c90981a0gsv30pgk6cnf859vdj6c8n4iq973prq847z5q8ld64j3rdmakxy9rsp49w7pddfd0v0i9n97rkr435f5k"; }
+    { type = "pom"; sha512 = "2iavm6d9nmy4g2i6y7q4l68bpjpncng1qfhbxdj44l3nqi7ixcjw0y38ymial7g2z0r1kd9qydr5lawjspr0fbzpjkcln2q7gsf0hfw"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 7325b07700fe..ebb614bb703e 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, mavenbuild }:
+{ stdenv, pkgs, mavenbuild, fetchMaven }:
 
 with pkgs.javaPackages;
 
@@ -25,8 +25,19 @@ rec {
     };
   };
 
+  junit_3_8_1 = map (obj: fetchMaven {
+    version = "3.8.1";
+    baseName = "junit";
+    package = "/junit";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "2b368057s8i61il387fqvznn70r9ndm815r681fn9i5afs1qgkw7i1d6vsn3pv2bbif1kmhb7qzcc574m3xcwc8a2mqw44b4bbxsfyl"; }
+    { type = "jar"; sha512 = "25yk0lzwk46r867nhrw4hg7cvz28wb8ln9nw1dqrb6zarifl54p4h1mcz90vmih405bsk96g0qb6hn1h4df0fas3f5kma9vxfjryvwf"; }
+  ];
+
   junit_4_12 = junitGen {
-    mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ] ++ mavenPlugins.mavenDefault;
+    mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ];
     sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
     version = "4.12";
   };
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
new file mode 100644
index 000000000000..feb3146ffd61
--- /dev/null
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgs, mavenbuild }:
+
+with pkgs.javaPackages;
+
+rec {
+  mavenHelloRec = { mavenDeps, sha512, version }: mavenbuild rec {
+    inherit mavenDeps sha512 version;
+
+    name = "maven-hello-${version}";
+    src = pkgs.fetchFromGitHub {
+      inherit sha512;
+      owner = "NeQuissimus";
+      repo = "maven-hello";
+      rev = "v${version}";
+    };
+    m2Path = "/com/nequissimus/maven-hello/${version}";
+
+    meta = {
+      homepage = http://github.com/NeQuissimus/maven-hello/;
+      description = "Maven Hello World";
+      license = stdenv.lib.licenses.unlicense;
+      platforms = stdenv.lib.platforms.all;
+      maintainers = with stdenv.lib.maintainers;
+        [ nequissimus ];
+    };
+  };
+
+  mavenHello_1_0 = mavenHelloRec {
+    mavenDeps = [];
+    sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2";
+    version = "1.0";
+  };
+}
diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix
new file mode 100644
index 000000000000..790e7894bff1
--- /dev/null
+++ b/pkgs/development/java-modules/maven/archiver.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenArchiver_2_5 = map (obj: fetchMaven {
+    version = "2.5";
+    baseName = "maven-archiver";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3kkv5kf3k5in69aplawkr0cr2cviyjgf8k6r6qvgxk53i3jmh7qylzrwkrd9bxclkjkgyg77cffxm48qhxm9pyqncdbwjldsmmdfb4f"; }
+    { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index b46fb254b173..7f0a9226e877 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenArtifactManager_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-artifact-manager";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1alp2iahaaf39yd3xp8817sz93nhz53flkkv5dx87vybsizpykb1g7jn6bnx0cbqqr9k5pi27z8mbkmry05vwqc6jyic1pyvzy1y3vn"; }
+    { type = "pom"; sha512 = "3pvj8gpcg57akalj4574k4mzw2skgm0w69bdvh0ivyd8skgdrf5gwxf57hl5rbgsdpr82m2za7yvi63fw82k7v84sib904fs639r3pf"; }
+  ];
+
   mavenArtifactManager_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-artifact-manager";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; }
     { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; }
   ];
+
+  mavenArtifactManager_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-artifact-manager";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; }
+    { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index d0b528b916ae..12876f53d5ae 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenArtifact_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3kkv5kf3k5in69aplawkr0cr2cviyjgf8k6r6qvgxk53i3jmh7qylzrwkrd9bxclkjkgyg77cffxm48qhxm9pyqncdbwjldsmmdfb4f"; }
+    { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; }
+  ];
+
   mavenArtifact_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-artifact";
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 4d46de674b55..e0ee7e6a59ed 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven {
+    version = "1.3";
+    baseName = "maven-common-artifact-filters";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "21wyk4llwjyanlggy281f9n0sjshjqvd322lbhxmzn42cd9vmj0s6xih82jwqlkcxkypwymyj1gl7van55ibd98p1jjjvr93gs1cn14"; }
+    { type = "jar"; sha512 = "1bv4lp1a8sb79almnygiq0pmm0fdhy9pyakp6xhz91b4v1cqg03sb586yc4lg2934yv4jjbybqjbh4l0y3kgnanjbxdxdgxgyf14iif"; }
+  ];
+
   mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven {
     version = "1.4";
     baseName = "maven-common-artifact-filters";
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index 6aed7095ad25..7f186503d31b 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenCore_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-core";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "2q4s5y8bpa73a10r4m9qgzfsczcap147p5gcc9inm5fx9x32sbr7zqw6xj7igsyjb9qsqpp3v727xv3ng57gczdqs1dazljqrgk9jal"; }
+    { type = "jar"; sha512 = "2ar2qvhig92gifm4zhd7mzcm0c7cnlyvd3d089a7chlvxhrxyhf08xxpd8sxa525sa413v2d762yx2mbhnkf564i1zw4gg7cdjl5z47"; }
+  ];
+
   mavenCore_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-core";
@@ -11,4 +22,15 @@ rec {
     { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; }
     { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; }
   ];
+
+  mavenCore_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-core";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; }
+    { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 6acf39b480d7..7454f7bbc969 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven {
+    version = "1.0-alpha-7";
+    baseName = "doxia-sink-api";
+    package = "/org/apache/maven/doxia";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "3lb710zyldqysy19cgsan6mb5yrxx07vphddasq4kv1z9p5l4mpx9jq8fdhcxm4bgrfpdxkrdy2z4h2w8kc3gp2dk5g515x854jhqar"; }
+    { type = "jar"; sha512 = "0q2vn7yyl8qvsifb629jh3hmaa5pkj5y22zy7qbji1xmn28qp0n1skfvlmpn0m8djwzmayw6xjbxhxvspzc9a14n3nkmjzmr5yz053a"; }
+  ];
+
   mavenDoxiaSinkApi_1_0_alpha10 = map (obj: fetchMaven {
     version = "1.0-alpha-10";
     baseName = "doxia-sink-api";
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index 22ac264bdd10..c8993f1f0c9c 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-error-diagnostics";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2rpzlgi1hyiq1qmfn9fdr3317mq990y67zb0jvyah7sgr5x969l984cfigwdcw0m7i4kpg5157myq4cps3d9pz81h4wx4plwwpkyp2v"; }
+    { type = "pom"; sha512 = "3r8r5sw3zbyms1yk1811cxh2a6p86lhg8aa9b6whn97mx3gmy9zy2nhsadgnxw1hbc2y6l1pk3xs2q73hmvag1bapks5bm7higmgdpg"; }
+  ];
+
   mavenErrorDiagnostics_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-error-diagnostics";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; }
     { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; }
   ];
+
+  mavenErrorDiagnostics_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-error-diagnostics";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; }
+    { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix
new file mode 100644
index 000000000000..5851a3db195d
--- /dev/null
+++ b/pkgs/development/java-modules/maven/filtering.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenFiltering_1_1 = map (obj: fetchMaven {
+    version = "1.1";
+    baseName = "maven-filtering";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "022n451vgprms5rp26iynlg7yn7p1l71d5sd5r177dmw0250pvrr5gvjrriq8fis2rxbdhr42zl1xm2mmzlg6sj55izzy03dwryhydn"; }
+    { type = "jar"; sha512 = "33ing5r916n71skj75cikhrapns28l6ryxw9q3yn5hyqzsbj2yk7lzss87ardg9j3wkmb4rpj9mkb63w0fljwjfpbja6qmzxrybj5rp"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index fa3abf7c4d23..34832c371d5f 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenModel_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-model";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0v4fzp4p71zjdxbf0lwjifydrxh9ag2c6pqc4n07hnr2rvcsx8n1rhb46ifaq6ycxps64fjnwkn29i5wlfqy9yfdh8gjs6i2sy523nv"; }
+    { type = "pom"; sha512 = "1r5bk36120534ngqkh8rbxi0q0allkaqy6yxvs6s5vwjq0gvm12snp6y6vxvh5p4bljpfms7r4ljglgnnfdrl8l8vmrj0af201gnv3m"; }
+  ];
+
   mavenModel_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-model";
@@ -12,6 +23,17 @@ rec {
     { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; }
   ];
 
+  mavenModel_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-model";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "14pxgdcim20x9lisf510nazzlcjxv9fpqabkdn0d86qa7d9270m4fmya5crasx2np9h0gxl407d77vcjf99fdxizg7i32w35yljqp3z"; }
+    { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; }
+  ];
+
   mavenModel_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
     baseName = "maven-model";
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index 1304304257aa..f127efba210c 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenMonitor_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-monitor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3ssw8r9qdhbvi21y8lqz39aml2l9pzw4g26hvlh3rbshvhhgsm672jl1pv8z5pbs73w7px6dnz1yhcf7l5df53apfzq0fggrw9fsnhz"; }
+    { type = "pom"; sha512 = "2wdvc5r3bsrml3w6nbym9flyj3ryj308bbfmns156p9pincc73pppad5cgyv4wrwjnmwp6qfbjsz90k6481v4li88a78nmc8lhmhylr"; }
+  ];
+
   mavenMonitor_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-monitor";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; }
     { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; }
   ];
+
+  mavenMonitor_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-monitor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; }
+    { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
new file mode 100644
index 000000000000..da7d52242a3b
--- /dev/null
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenPluginAnnotations = map (obj: fetchMaven {
+    version = "3.1";
+    baseName = "maven-plugin-annotations";
+    package = "/org/apache/maven/plugin-tools";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "17zyw3j4zbg1hhj18i4q1f0r8gdxl3q9x5ksyqlyr0mrw2sadc6lvbbhyp3l7vsbddl4bgdx36gwvjp5d97gbmk1nbpi1vabadfhq76"; }
+    { type = "jar"; sha512 = "0rk2nzkwcrkfy3vs0zl0l2lxp3w4hkwxrypisbivv5al7sc8lbzls6jgpp3h5gx9kk4scjj24qf5vyimnbadj63rvqffg581fs2zgl9"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index 56069bf19709..ed791a86955f 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -23,6 +23,17 @@ rec {
     { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; }
   ];
 
+  mavenPluginApi_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-plugin-api";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "23qj23k049jz4mp77h2wj4mnjqszb99l4xvxas93cpnbdl51a5s0d0rsg60a8zg0ic04n6fr8nig0vvmmcsggx93a96w4p3na97q30n"; }
+    { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; }
+  ];
+
   mavenPluginApi_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
     baseName = "maven-plugin-api";
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index 35b829a85785..397a7610cfe2 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-plugin-descriptor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0f23srb1clkmvq05rcmv8gn7lifaw5f1i2vqyn2cfnhgcmp9i32xsbhqpx9y0rqlv6497x80dck7xylp22d3hnqkpm3pxgws9wsz7sm"; }
+    { type = "pom"; sha512 = "10hra81gs8swq00k4rw3ip8wr9gl4d7vd3621ga4298b466wic7sbb9fy9ifw22q49ia7hkigqi4ha73q7kmrl7ihnb9iv4vil02yj6"; }
+  ];
+
   mavenPluginDescriptor_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-plugin-descriptor";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; }
     { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; }
   ];
+
+  mavenPluginDescriptor_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-plugin-descriptor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; }
+    { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index 17ed70bfa9f2..3fd437441a3f 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-plugin-parameter-documenter";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "11yxhw6pn6np1a828ww6iq4gcg6i6l6wlr6pwx3kd0fh4cavd93rfh2khvydfsz0cw40m1kbqglnwdqbdc9d5akhwpnvhkfwsqvl8li"; }
+    { type = "pom"; sha512 = "0g62n2g7jcknzgnpl46fsdn9yndjv09fwijahlnmc1gh9w2v0rxyq42p133vgv13jc5wzfqyrf7mh3fq7p0w9mfbharaz92flh2caik"; }
+  ];
+
   mavenPluginParameterDocumenter_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-plugin-parameter-documenter";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; }
     { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; }
   ];
+
+  mavenPluginParameterDocumenter_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-plugin-parameter-documenter";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; }
+    { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index baccc1aeb765..7191a377a337 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginRegistry_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-plugin-registry";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1d9134rarw653dgn1q80dahjpkl82sfrznkhdb6s8zy6d31bbr4ry6w362r7a2p54ijx2vw3rl0jmh805p3imlf1cgra1m7pihh2b63"; }
+    { type = "pom"; sha512 = "0b85gmdgwwxdw4czs7383ivssp5n8nxr5vxnj8agjlx6yclxpbbw7n192c4p1hba8as1md52c08cxilibjiiahlv83bmzyh2hb0vdm3"; }
+  ];
+
   mavenPluginRegistry_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-plugin-registry";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; }
     { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; }
   ];
+
+  mavenPluginRegistry_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-plugin-registry";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; }
+    { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index 674f35a2ef9a..bcaae06b1f99 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenProfile_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-profile";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3wng0csnn4v3y2gndazg46hqriz27kkb977xzw5wr8anyharlz2ancl38zyfjf5vm18irqn8cxqklhzd3x1h0h6rlvz5z1wrrivr5kl"; }
+    { type = "pom"; sha512 = "063vbh2miyfvrp90hs5cff5r8cj573zysjvd79lnz7zsah3ddbg6sbv09nb0pjy76pbqgrh913dziqk12l13kwngcgpq8v38v92vh63"; }
+  ];
+
   mavenProfile_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-profile";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; }
     { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; }
   ];
+
+  mavenProfile_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-profile";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; }
+    { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 0d88850fb5db..142a311feed0 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenProject_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-project";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "12k56956ad8r5fpz5ilxy1i2msg4vnpcyqc7zq9b5ncqx890bcnl9xl5f5y0bkj6l6688z6vrwi28rgj35a77x3wiwcvhgrgxyfy53a"; }
+    { type = "pom"; sha512 = "13z607rjazzrs3rjw6hlhpw6jip85lgdkvnkm1j17wsbhywa53x45ydyg1hzrcax8xr5zxn7mkrryp4wwwm4ihhsaz3nq8bh12yrh8p"; }
+  ];
+
   mavenProject_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-project";
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
index ea8088489112..36818dc57e0c 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenReportingApi_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-reporting-api";
+    package = "/org/apache/maven/reporting";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "236xqa5bqih3lkfwdmfsb4wgkn8mllnzpnr4dhzch2jlhcsvl4fm1zmawk1njd8ibq9dyfg3n41a6hc8ydndh0ffxdm1mjnch9bv1da"; }
+    { type = "pom"; sha512 = "3vlfls0g1bjrjpgzv6zlfglr1gxwm9m6zm88m9ij8ap934cxrzqj7pkqyx0s2vc8j700xgrwj57ahmfdrdi4v1arav1m1790plbip3y"; }
+  ];
+
   mavenReportingApi_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-reporting-api";
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 125788c54f92..7e29ada05129 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-repository-metadata";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3qh52jisq2facab5nw35pazf99z1yn8pfklvy8hcczd4dab1pj115jimfhpx48mmlaydaw50m006imfvlivxnadfxfk3887acmhp7bv"; }
+    { type = "pom"; sha512 = "2sg2n3wxfanhf4jgmp2q9lh2hsnch54mzgh1clna2ywnnwh88cn37c9m9b6a0qgdc1m7yzlfg8r3k77ypfa3aa7hr3f9b2hi2k4pb0c"; }
+  ];
+
   mavenRepositoryMetadata_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-repository-metadata";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; }
     { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; }
   ];
+
+  mavenRepositoryMetadata_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-repository-metadata";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; }
+    { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index 73d707144bdb..19f0a1ae24d9 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenSettings_2_0_6 = map (obj: fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-settings";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3yvxlk0d40p1i0vwf4ba6k45kikcvip1vvr86k6cnhs86gfy6w1b4kw4hc6p23i978cgcl19g79m0l40nsxpav9hc07573k47ammclv"; }
+    { type = "pom"; sha512 = "03cz2z90h9c3lssl53glbpz9hflsgb3a14i4xr5p7lpm993c07zn7xp2f6sjcdq7b774spbiww0alll9cz2vs8m7pvvwnbxk0s09d7l"; }
+  ];
+
   mavenSettings_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-settings";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; }
     { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; }
   ];
+
+  mavenSettings_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-settings";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; }
+    { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix
new file mode 100644
index 000000000000..2d4ec372be45
--- /dev/null
+++ b/pkgs/development/java-modules/maven/shared-incremental.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSharedIncremental_1_1 = map (obj: fetchMaven {
+    version = "1.1";
+    baseName = "maven-shared-incremental";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1g2gsk3s5v5dg6y81a2046aqf5v19jn6i0jwha78xi3gyx7ajgxkdn2wswf9gdxxvc44qk6lzn33bl3pk3vl1b84h2hdxz7yyhajbfr"; }
+    { type = "pom"; sha512 = "2fqj1p1059v462casy2mzj1bg8mawb5lihx5430px9440vyl1iggqg598r6798162m8c7ilav3x71x763rchhskpqakfkvydkjhrjfr"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix
new file mode 100644
index 000000000000..9b56075383d0
--- /dev/null
+++ b/pkgs/development/java-modules/maven/shared-utils.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSharedUtils_0_1 = map (obj: fetchMaven {
+    version = "0.1";
+    baseName = "maven-shared-utils";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; }
+    { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
new file mode 100644
index 000000000000..b696beae4c46
--- /dev/null
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
+    version = "2.12.4";
+    baseName = "maven-surefire-booter";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; }
+    { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
new file mode 100644
index 000000000000..b696beae4c46
--- /dev/null
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
+    version = "2.12.4";
+    baseName = "maven-surefire-booter";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; }
+    { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
new file mode 100644
index 000000000000..0d1bd53721cd
--- /dev/null
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSurefireCommon_2_12_4 = map (obj: fetchMaven {
+    version = "2.12.4";
+    baseName = "maven-surefire-common";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; }
+    { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
new file mode 100644
index 000000000000..14e6866ee329
--- /dev/null
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -0,0 +1,25 @@
+{ fetchMaven }:
+
+rec {
+  mavenToolchain_1_0 = map (obj: fetchMaven {
+    version = "1.0";
+    baseName = "maven-toolchain";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "34kxv3l3676ddrsj2k02f9fmphcq16avafka950d5dclrcx7w37wgxx3gcf6zfixfx9zlbb7annsa05y8f0rx97g13rkqdfdj1wknky"; }
+    { type = "pom"; sha512 = "0arkdm0bii7cm0g8qzzfih1jk9j7myn8w2ccr6j01wsj08gv7cbjr5k9jx1iwy1vzvhhsmsj6grq678zsgbvh4msn1s44i744x4fhvy"; }
+  ];
+
+  mavenToolchain_2_0_9 = map (obj: fetchMaven {
+    version = "2.0.9";
+    baseName = "maven-toolchain";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "34kxv3l3676ddrsj2k02f9fmphcq16avafka950d5dclrcx7w37wgxx3gcf6zfixfx9zlbb7annsa05y8f0rx97g13rkqdfdj1wknky"; }
+    { type = "pom"; sha512 = "0arkdm0bii7cm0g8qzzfih1jk9j7myn8w2ccr6j01wsj08gv7cbjr5k9jx1iwy1vzvhhsmsj6grq678zsgbvh4msn1s44i744x4fhvy"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 17d4c86ba995..15be1594117f 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -9,8 +9,134 @@ let
 in rec {
   inherit mavenbuild fetchMaven poms;
 
-  # Standard plugins used by pretty much every Maven build
-  mavenDefault = lib.flatten [ aetherUtil_0_9_0_M2 bsh_2_0_b4 classworlds_1_1 commonsCli_1_0 commonsLang_2_3 mavenArtifact_2_0_9 mavenArtifact_3_0_3 mavenArtifactManager_2_0_9 mavenClean_2_5 mavenCommonArtifactFilters_1_4 mavenCompiler_3_1 mavenCore_2_0_9 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcer_1_3_1 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_9 mavenInstall_2_4 mavenJar_2_4 mavenModel_2_0_9 mavenModel_3_0_3 mavenMonitor_2_0_9 mavenPluginApi_2_0_6 mavenPluginApi_2_0_9 mavenPluginApi_3_0_3 mavenPluginDescriptor_2_0_9 mavenPluginParameterDocumenter_2_0_9 mavenPluginRegistry_2_0_9 mavenProfile_2_0_9 mavenProject_2_0_9 mavenReplacer_1_5_3 mavenReportingApi_2_0_9 mavenRepositoryMetadata_2_0_9 mavenResources_2_6 mavenSettings_2_0_9 mavenSurefire_2_17 plexusComponentAnnotations_1_5_5 plexusContainerDefault_1_0_alpha9_stable1 plexusI18n_1_0_beta6 plexusInteractivityApi_1_0_alpha4 plexusUtils_1_5_8 plexusUtils_2_0_6 plexusUtils_3_0 ] ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 apache_10 apache_11 apache_13 apache_3 apache_4 apache_6 beanshell_2_0_b4 codehausParent_4 doxia_1_0_alpha10 doxia_1_0 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_6 maven_2_0_9 maven_3_0_3 mavenParent_15 mavenParent_21 mavenParent_22 mavenParent_23 mavenParent_5 mavenParent_6 mavenParent_8 mavenPlugins_22 mavenPlugins_23 mavenPlugins_24 mavenReporting_2_0_9 mavenSharedComponents_17 mavenSharedComponents_19 mojoParent_32 plexus_1_0_4 plexus_2_0_2 plexus_2_0_7 plexusComponents_1_1_4 plexusContainers_1_0_3 plexusContainers_1_5_5 sonatypeForgeParent_5 sonatypeParent_7 sonatypeSpiceParent_16 surefire_2_17 ]);
+  # "Minimal"
+  mavenMinimal = lib.flatten
+[
+classworlds_1_1
+commonsCli_1_0
+findbugsJsr305_2_0_1
+junit_3_8_1
+mavenArchiver_2_5
+mavenArtifact_2_0_6
+mavenArtifact_2_0_9
+mavenArtifactManager_2_0_6
+mavenArtifactManager_2_0_9
+mavenArtifactManager_2_2_1
+mavenClean_2_5
+mavenCompiler_3_1
+mavenCore_2_0_6
+mavenCore_2_0_9
+mavenCore_2_2_1
+mavenDoxiaSinkApi_1_0_alpha7
+mavenErrorDiagnostics_2_0_6
+mavenErrorDiagnostics_2_0_9
+mavenErrorDiagnostics_2_2_1
+mavenFiltering_1_1
+mavenInstall_2_4
+mavenJar_2_4
+mavenModel_2_0_6
+mavenModel_2_0_9
+mavenModel_2_2_1
+mavenMonitor_2_0_6
+mavenMonitor_2_0_9
+mavenMonitor_2_2_1
+mavenPluginDescriptor_2_0_6
+mavenPluginDescriptor_2_0_9
+mavenPluginDescriptor_2_2_1
+mavenPluginParameterDocumenter_2_0_6
+mavenPluginParameterDocumenter_2_0_9
+mavenPluginParameterDocumenter_2_2_1
+mavenProfile_2_0_6
+mavenProfile_2_0_9
+mavenProfile_2_2_1
+mavenProject_2_0_6
+mavenProject_2_0_9
+mavenPluginAnnotations_3_1
+mavenPluginApi_2_0_6
+mavenPluginApi_2_0_9
+mavenPluginApi_2_2_1
+mavenPluginRegistry_2_0_6
+mavenPluginRegistry_2_0_9
+mavenPluginRegistry_2_2_1
+mavenReportingApi_2_0_6
+mavenReportingApi_2_0_9
+mavenRepositoryMetadata_2_0_6
+mavenRepositoryMetadata_2_0_9
+mavenRepositoryMetadata_2_2_1
+mavenResources_2_6
+mavenSettings_2_0_6
+mavenSettings_2_0_9
+mavenSettings_2_2_1
+mavenSharedIncremental_1_1
+mavenSharedUtils_0_1
+mavenSurefire_2_12_4
+mavenSurefireApi_2_12_4
+mavenSurefireBooter_2_12_4
+mavenSurefireCommon_2_12_4
+mavenToolchain_1_0
+mavenToolchain_2_0_9
+plexusBuildApi_0_0_4
+plexusCompilerApi_2_2
+plexusContainerDefault_1_0_alpha9_stable1
+plexusInteractivityApi_1_0_alpha4
+plexusInterpolation_1_13
+plexusUtils_1_5_1
+plexusUtils_2_0_5
+plexusUtils_3_0
+]
+++
+(with
+poms;
+[
+apache_3
+apache_4
+apache_5
+apache_6
+apache_9
+apache_10
+apache_11
+apache_13
+doxia_1_0_alpha7
+maven_2_0_6
+maven_2_0_9
+maven_2_2_1
+mavenParent_5
+mavenParent_8
+mavenParent_11
+mavenParent_13
+mavenParent_21
+mavenParent_22
+mavenParent_23
+mavenPlugins_22
+mavenPlugins_23
+mavenPlugins_24
+mavenPluginTools_3_1
+mavenReporting_2_0_6
+mavenReporting_2_0_9
+mavenSharedComponents_12
+mavenSharedComponents_17
+mavenSharedComponents_18
+mavenSharedComponents_19
+plexus_1_0_4
+plexus_1_0_11
+plexus_2_0_3
+plexus_2_0_6
+plexus_2_0_7
+plexus_3_3_1
+plexusCompiler_2_2
+plexusComponents_1_1_15
+plexusComponents_1_3_1
+plexusComponentAnnotations_1_5_5
+plexusContainers_1_0_3
+plexusContainers_1_5_5
+sonatypeForgeParent_3
+sonatypeForgeParent_5
+sonatypeForgeParent_10
+sonatypeSpiceParent_10
+sonatypeSpiceParent_16
+sonatypeSpiceParent_17
+surefire_2_12_4
+]);
 
   animalSniffer_1_11 = map (obj: fetchMaven {
     version = "1.11";
@@ -100,6 +226,17 @@ in rec {
     { type = "jar"; sha512 = "3j8smsx6wk085iic5qhknrszixxna6szmvk2rn9zkn75ffjr7ham72hw9cmxf5160j73n8f2cmcbw1x462fqy12fqqpmzx08i1sbwcv"; }
   ];
 
+  mavenSurefire_2_12_4 = map (obj: fetchMaven rec {
+    version = "2.12.4";
+    baseName = "maven-surefire-plugin";
+    package = "/org/apache/maven/plugins";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "3qkzmh5fk3s7y3qy91qck1nc0yadwsizxy61wp410dspsd73cchqll7vjl11cj6k5kywjxsl9dihy2gp949nh8380lbvs11g83wrgmv"; }
+    { type = "jar"; sha512 = "2sjq2l8i97h3ay8wwrsi75cfs9d1im5ar2sn2zv4q6xsv4v3hh5y481l9xwc5dnbcfdjs38ald0z60pxpcyiqrng6h69s2ws8fhb0mm"; }
+  ];
+
   mavenSurefire_2_17 = map (obj: fetchMaven rec {
     version = "2.17";
     baseName = "maven-surefire-plugin";
diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix
new file mode 100644
index 000000000000..2425a6f12bae
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/build-api.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusBuildApi_0_0_4 = map (obj: fetchMaven {
+    version = "0.0.4";
+    baseName = "plexus-build-api";
+    package = "/org/sonatype/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0ihr946rd2cwc1qsi8g104vpyz1ml5ypl3374z3rhlmm4i0xgn6vsa9sg8bnh1848klhxsp11i0gm4adg6lzk3s88mqm5b4wlbsdvv2"; }
+    { type = "pom"; sha512 = "1135ca387fvzjb04j8z93jmy61zpi2w7a6c6rq9xxk33xz9nxzzwvca7k40j6jsj0bmjbswrpdck7qh2921rn3j4vfsihbi9g7mb31r"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix
new file mode 100644
index 000000000000..2ef5d3cdab15
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/compiler-api.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusCompilerApi_2_2 = map (obj: fetchMaven {
+    version = "2.2";
+    baseName = "plexus-compiler-api";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3by7icjfiymp7g2v1ci5dqwml6ibzh2njyg2w43kvaz3ydcxkzmfg5s97wsdqjsii7vdgqyhr16ydsn6mr90wbjvsi6wasaq1rqa812"; }
+    { type = "pom"; sha512 = "0pdl78hp921lgkfya54wl8hxgm1c5474j1p921q5ix1knx1rlr4klpjwx212wy2m7b6bxq0bkf8n66mqjr72rh2rh308qij00ymrga8"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix
new file mode 100644
index 000000000000..17660f0804c5
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/interpolation.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusInterpolation_1_13 = map (obj: fetchMaven {
+    version = "1.13";
+    baseName = "plexus-interpolation";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0sm1kaxsvn8007br7nr9ncjppmfkp8nzr6ipwwx86idai9bqcsm4kh2scxf893s4jf2ii7f5106dd5w4h7bw67csalhqqzi1zpndbk4"; }
+    { type = "pom"; sha512 = "3hlv9l82yxjbnaf2vqq6p3w38jq2id15a2yjg6wj810fl2286zz5ci3g3x7x0z0xdrxrrfvswns92v25197vpg0dki113lwdbw4bsvr"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index 672a43455c9a..17dc1acdf1f8 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -12,6 +12,17 @@ rec {
     { type = "pom"; sha512 = "0vbzdfsdcc4cq7hdqzb1vdfxp23vnavq7z4qmmlb4d4fiqj5wqdgagrs43gl7yzca2azpyj3kyxgaipimi7gck07jcsz0pzljkplk4w"; }
   ];
 
+  plexusUtils_1_5_1 = map (obj: fetchMaven {
+    version = "1.5.1";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "00vf59sg0wa4kip1m365xh3ngggvnr7avkf1mwsljyag5h8pb4fhpba550ka2mbpp10z8d7mjhj3wxinvf19m2bmrjmqvdxiwraa5jh"; }
+    { type = "pom"; sha512 = "161cdrgjrw2cab4lf189hwa4s1lh42fsahjcjkir696sx0m9bmmxgjbhwxl1l8kpaxn5p6jf701bx16gry393pws636vy59nvnnx1sw"; }
+  ];
+
   plexusUtils_1_5_8 = map (obj: fetchMaven {
     version = "1.5.8";
     baseName = "plexus-utils";
@@ -23,6 +34,17 @@ rec {
     { type = "pom"; sha512 = "06z4gkq3bh2pwyj8pvaly9fihd8gbgcqp3jxl05vkj2rcdb4jw3lw3hwn8f8ggqi17i2fdm8cbndkqgr9vdgiz45p8f1nx8kjlqikbi"; }
   ];
 
+  plexusUtils_2_0_5 = map (obj: fetchMaven {
+    version = "2.0.5";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3g72mxvlsf18hl1vn9sq4i13nlpd66fkn2l8d96883f4n638sx031f8cnx6f08my3rfc67pypy4lsiagx2rj2x5ccqp9g9kzvbh4i5w"; }
+    { type = "pom"; sha512 = "2rkkshqf3ahjijvr64ndzh10iksbz7pj0618drvg9iklnpv6i6y904fi31xjg7vxb3fy17k3mvi49pr2jxznbf1c8ndwbyawlvmw9j7"; }
+  ];
+
   plexusUtils_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "plexus-utils";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 39dc95281406..3e5ef87223f6 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -33,6 +33,14 @@ rec {
     type = "pom";
   };
 
+  apache_5 = fetchMaven {
+    version = "5";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6";
+    type = "pom";
+  };
+
   apache_6 = fetchMaven {
     version = "6";
     baseName = "apache";
@@ -41,6 +49,14 @@ rec {
     type = "pom";
   };
 
+  apache_9 = fetchMaven {
+    version = "9";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6";
+    type = "pom";
+  };
+
   apache_10 = fetchMaven {
     version = "10";
     baseName = "apache";
@@ -81,6 +97,14 @@ rec {
     type = "pom";
   };
 
+  doxia_1_0_alpha7 = fetchMaven {
+    version = "1.0-alpha-7";
+    baseName = "doxia";
+    package = "/org/apache/maven/doxia";
+    sha512 = "0fg3l7dyi0c7r1h9rzjn23gv57kc67jpzlcji6yh4nawp3byfbz1rq8wnbj3av3wd29v9h2ff34p06ia9wxbs8q3kz4xy31w7sw7fxg";
+    type = "pom";
+  };
+
   doxia_1_0_alpha10 = fetchMaven {
     version = "1.0-alpha-10";
     baseName = "doxia";
@@ -129,6 +153,14 @@ rec {
     type = "pom";
   };
 
+  maven_2_2_1 = fetchMaven {
+    version = "2.2.1";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0";
+    type = "pom";
+  };
+
   maven_3_0_3 = fetchMaven {
     version = "3.0.3";
     baseName = "maven";
@@ -217,6 +249,22 @@ rec {
     type = "pom";
   };
 
+  mavenPluginTools_3_1 = fetchMaven {
+    version = "3.1";
+    baseName = "maven-plugin-tools";
+    package = "/org/apache/maven/plugin-tools";
+    sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs";
+    type = "pom";
+  };
+
+  mavenReporting_2_0_6 = fetchMaven {
+    version = "2.0.6";
+    baseName = "maven-reporting";
+    package = "/org/apache/maven/reporting";
+    sha512 = "3bi678sg28yxhlby4d3a6mq9fhg1qnjb57kbkhi7dfx9g0c1p6cxhg8cixjz9wv31lkjpspbpp1fq0z29a93lqrjqczlg8a7i1sg554";
+    type = "pom";
+  };
+
   mavenReporting_2_0_9 = fetchMaven {
     version = "2.0.9";
     baseName = "maven-reporting";
@@ -225,6 +273,14 @@ rec {
     type = "pom";
   };
 
+  mavenSharedComponents_12 = fetchMaven {
+    version = "12";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy";
+    type = "pom";
+  };
+
   mavenSharedComponents_17 = fetchMaven {
     version = "17";
     baseName = "maven-shared-components";
@@ -233,6 +289,14 @@ rec {
     type = "pom";
   };
 
+  mavenSharedComponents_18 = fetchMaven {
+    version = "18";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "2qqabrvgs4kb14v28qkfwj16n715mj5mh4m8aw0dybi5igmrvwh1d8jsjggdfbh929m6499w8x5s6aw0gbzmfzr3wjkz54dqxnm49p0";
+    type = "pom";
+  };
+
   mavenSharedComponents_19 = fetchMaven {
     version = "19";
     baseName = "maven-shared-components";
@@ -257,6 +321,14 @@ rec {
     type = "pom";
   };
 
+  plexus_1_0_11 = fetchMaven {
+    version = "1.0.11";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "20fb1yvg26wg3lih55m8m4i1idiffyg3jlkvazmxqqvnahz2llgd5cfvqcrzg8lkinnypr4ic5glci4lza46k1sfl5nrviyfx0n7kgr";
+    type = "pom";
+  };
+
   plexus_2_0_2 = fetchMaven {
     version = "2.0.2";
     baseName = "plexus";
@@ -265,6 +337,22 @@ rec {
     type = "pom";
   };
 
+  plexus_2_0_3 = fetchMaven {
+    version = "2.0.3";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "15adqpm0gz7c0jwjd4yk0k8h4h7vnz15v1fdmzb6rgs6avl1dx84r5l0fqs6b02kw008rg68inii7nl4m5xwqrj807wr8qzrjm02cam";
+    type = "pom";
+  };
+
+  plexus_2_0_6 = fetchMaven {
+    version = "2.0.6";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "07rrw1yldy4c2qvwv3hcf9rdbr0jf57qsnnv2ai9fajwhjyjkgjixm2zlsid41bm2w8hacg9crzy6nfz8yh1sdh5p767niy9jripq2h";
+    type = "pom";
+  };
+
   plexus_2_0_7 = fetchMaven {
     version = "2.0.7";
     baseName = "plexus";
@@ -273,6 +361,22 @@ rec {
     type = "pom";
   };
 
+  plexus_3_3_1 = fetchMaven {
+    version = "3.3.1";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "1q1p0sfzkhdpknaf0ysq7vzd0qip9q86z62nwamfh9gdsp7lh99kh6hmxav2daha462c3jra6clfniyqrbvs07jwjhf4c79rwhnqc2q";
+    type = "pom";
+  };
+
+  plexusCompiler_2_2 = fetchMaven {
+    version = "2.2";
+    baseName = "plexus-compiler";
+    package = "/org/codehaus/plexus";
+    sha512 = "26sr1hg214qf65nym85viv1z4nk1bgqahx7n4bq3did49s9ymgz2c08vw7zdlcqws5jndz9n2xlyq285plgv3xx2mxrrsi2r24zmw29";
+    type = "pom";
+  };
+
   plexusComponents_1_1_4 = fetchMaven {
     version = "1.1.4";
     baseName = "plexus-components";
@@ -281,6 +385,22 @@ rec {
     type = "pom";
   };
 
+  plexusComponents_1_1_15 = fetchMaven {
+    version = "1.1.15";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "0lfzdq1wlsnkiapzjs8cqi2kzkaw9lfjhdhmf1pz2x83m5njfx2y59v14wgcs2k4cig8kjr45v4qnmd7mp03k8gginzflc1qi1y7yv6";
+    type = "pom";
+  };
+
+  plexusComponents_1_3_1 = fetchMaven {
+    version = "1.3.1";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "16bnfja035zb508f340y64v4vk7pkldn8bvnxvbk0grk8a76rirsn4dl60x3hgmasgkb0y75gr9qp4y72m079klhgg0mbvcfvslkxqb";
+    type = "pom";
+  };
+
   plexusContainers_1_0_3 = fetchMaven {
     version = "1.0.3";
     baseName = "plexus-containers";
@@ -297,6 +417,14 @@ rec {
     type = "pom";
   };
 
+  sonatypeForgeParent_3 = fetchMaven {
+    version = "3";
+    baseName = "forge-parent";
+    package = "/org/sonatype/forge";
+    sha512 = "20x89zl6k0wgd1gb6ysxm6bmgqxwyz3d7zyjn8bwzkz93k7lxnxm0k7skvha283q9ay4cd2vkjisi5avl1f3wvz89rrwg136gmdlksv";
+    type = "pom";
+  };
+
   sonatypeForgeParent_5 = fetchMaven {
     version = "5";
     baseName = "forge-parent";
@@ -305,6 +433,14 @@ rec {
     type = "pom";
   };
 
+  sonatypeForgeParent_10 = fetchMaven {
+    version = "10";
+    baseName = "forge-parent";
+    package = "/org/sonatype/forge";
+    sha512 = "3fpnvrxfkxpxqdsn6g7w1zyql4v0z9iqbjprhh4c6rldrbvq4h3yh7dl5sw4h7av516zhmb3bkc9ycfdr5gs34sfb6f6x5hk7qc374a";
+    type = "pom";
+  };
+
   sonatypeParent_7 = fetchMaven {
     version = "7";
     baseName = "oss-parent";
@@ -313,6 +449,14 @@ rec {
     type = "pom";
   };
 
+  sonatypeSpiceParent_10 = fetchMaven {
+    version = "10";
+    baseName = "spice-parent";
+    package = "/org/sonatype/spice";
+    sha512 = "0gg2cxqvfmg6jk7qi2f4hcgskpd1ysnf1d5vay8dza40wfbk2vy7qvhgjhg55dpbjkadmsj483hg81qdzwqbxmagd2xr9j9062hbja8";
+    type = "pom";
+  };
+
   sonatypeSpiceParent_16 = fetchMaven {
     version = "16";
     baseName = "spice-parent";
@@ -321,6 +465,22 @@ rec {
     type = "pom";
   };
 
+  sonatypeSpiceParent_17 = fetchMaven {
+    version = "17";
+    baseName = "spice-parent";
+    package = "/org/sonatype/spice";
+    sha512 = "1jqqp5xylm9bjz33wab7mj49xqczvkhpp4aysrcngszxmil61kanpjmn5ks5r0hq4waj0bqnr91p2p9a7ylqnqjs6ib1x9psl5c9cyw";
+    type = "pom";
+  };
+
+  surefire_2_12_4 = fetchMaven {
+    version = "2.12.4";
+    baseName = "surefire";
+    package = "/org/apache/maven/surefire";
+    sha512 = "1zyppjqqwpzcp16g7v49r9fsgdvrny325r583kpis5497ic0qbcczxn53x7s1hnmhgcs33dr0k3alrwl7m574lm2qdgj0s8x18pl6gb";
+    type = "pom";
+  };
+
   surefire_2_17 = fetchMaven {
     version = "2.17";
     baseName = "surefire";
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 760dd01e7324..a777d57ec2cc 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -25,29 +25,43 @@ in {
   inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; })
     commonsLang_2_3;
 
+  inherit (callPackage ../development/java-modules/findbugs/jsr305.nix { inherit fetchMaven; })
+    findbugsJsr305_2_0_1;
+
   inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; })
     hamcrestCore_1_3;
 
-  inherit (callPackage ../development/java-modules/junit { inherit mavenbuild; })
+  inherit (callPackage ../development/java-modules/junit { inherit mavenbuild fetchMaven; })
+    junit_3_8_1
     junit_4_12;
 
+  inherit (callPackage ../development/java-modules/maven/archiver.nix { inherit fetchMaven; })
+    mavenArchiver_2_5;
+
   inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; })
+    mavenArtifact_2_0_6
     mavenArtifact_2_0_9
     mavenArtifact_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; })
-    mavenArtifactManager_2_0_9;
+    mavenArtifactManager_2_0_6
+    mavenArtifactManager_2_0_9
+    mavenArtifactManager_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/common-artifact-filters.nix { inherit fetchMaven; })
+    mavenCommonArtifactFilters_1_3
     mavenCommonArtifactFilters_1_4;
 
   inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; })
-    mavenCore_2_0_9;
+    mavenCore_2_0_6
+    mavenCore_2_0_9
+    mavenCore_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/dependency-tree.nix { inherit fetchMaven; })
     mavenDependencyTree_2_1;
 
   inherit (callPackage ../development/java-modules/maven/doxia-sink-api.nix { inherit fetchMaven; })
+    mavenDoxiaSinkApi_1_0_alpha7
     mavenDoxiaSinkApi_1_0_alpha10;
 
   inherit (callPackage ../development/java-modules/maven/enforcer.nix { inherit fetchMaven; })
@@ -55,43 +69,98 @@ in {
     mavenEnforcerRules_1_3_1;
 
   inherit (callPackage ../development/java-modules/maven/error-diagnostics.nix { inherit fetchMaven; })
-    mavenErrorDiagnostics_2_0_9;
+    mavenErrorDiagnostics_2_0_6
+    mavenErrorDiagnostics_2_0_9
+    mavenErrorDiagnostics_2_2_1;
+
+  inherit (callPackage ../development/java-modules/maven/filtering.nix { inherit fetchMaven; })
+    mavenFiltering_1_1;
+
+  inherit (callPackage ../development/java-modules/maven-hello { inherit mavenbuild; })
+    mavenHello_1_0;
 
   inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; })
+    mavenModel_2_0_6
     mavenModel_2_0_9
+    mavenModel_2_2_1
     mavenModel_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/monitor.nix { inherit fetchMaven; })
-    mavenMonitor_2_0_9;
+    mavenMonitor_2_0_6
+    mavenMonitor_2_0_9
+    mavenMonitor_2_2_1;
+
+  inherit (callPackage ../development/java-modules/maven/plugin-annotations.nix { inherit fetchMaven; })
+    mavenPluginAnnotations_3_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; })
     mavenPluginApi_2_0_6
     mavenPluginApi_2_0_9
+    mavenPluginApi_2_2_1
     mavenPluginApi_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/plugin-descriptor.nix { inherit fetchMaven; })
-    mavenPluginDescriptor_2_0_9;
+    mavenPluginDescriptor_2_0_6
+    mavenPluginDescriptor_2_0_9
+    mavenPluginDescriptor_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-parameter-documenter.nix { inherit fetchMaven; })
-    mavenPluginParameterDocumenter_2_0_9;
+    mavenPluginParameterDocumenter_2_0_6
+    mavenPluginParameterDocumenter_2_0_9
+    mavenPluginParameterDocumenter_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-registry.nix { inherit fetchMaven; })
-    mavenPluginRegistry_2_0_9;
+    mavenPluginRegistry_2_0_6
+    mavenPluginRegistry_2_0_9
+    mavenPluginRegistry_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/profile.nix { inherit fetchMaven; })
-    mavenProfile_2_0_9;
+    mavenProfile_2_0_6
+    mavenProfile_2_0_9
+    mavenProfile_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; })
+    mavenProject_2_0_6
     mavenProject_2_0_9;
 
   inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; })
+    mavenReportingApi_2_0_6
     mavenReportingApi_2_0_9;
 
   inherit (callPackage ../development/java-modules/maven/repository-metadata.nix { inherit fetchMaven; })
-    mavenRepositoryMetadata_2_0_9;
+    mavenRepositoryMetadata_2_0_6
+    mavenRepositoryMetadata_2_0_9
+    mavenRepositoryMetadata_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/settings.nix { inherit fetchMaven; })
-    mavenSettings_2_0_9;
+    mavenSettings_2_0_6
+    mavenSettings_2_0_9
+    mavenSettings_2_2_1;
+
+  inherit (callPackage ../development/java-modules/maven/shared-incremental.nix { inherit fetchMaven; })
+    mavenSharedIncremental_1_1;
+
+  inherit (callPackage ../development/java-modules/maven/shared-utils.nix { inherit fetchMaven; })
+    mavenSharedUtils_0_1;
+
+  inherit (callPackage ../development/java-modules/maven/surefire-api.nix { inherit fetchMaven; })
+    mavenSurefireApi_2_12_4;
+
+  inherit (callPackage ../development/java-modules/maven/surefire-booter.nix { inherit fetchMaven; })
+    mavenSurefireBooter_2_12_4;
+
+  inherit (callPackage ../development/java-modules/maven/surefire-common.nix { inherit fetchMaven; })
+    mavenSurefireCommon_2_12_4;
+
+  inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; })
+    mavenToolchain_1_0
+    mavenToolchain_2_0_9;
+
+  inherit (callPackage ../development/java-modules/plexus/build-api.nix { inherit fetchMaven; })
+    plexusBuildApi_0_0_4;
+
+  inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; })
+    plexusCompilerApi_2_2;
 
   inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; })
     plexusComponentAnnotations_1_5_5;
@@ -105,9 +174,14 @@ in {
   inherit (callPackage ../development/java-modules/plexus/interactivity-api.nix { inherit fetchMaven; })
     plexusInteractivityApi_1_0_alpha4;
 
+  inherit (callPackage ../development/java-modules/plexus/interpolation.nix { inherit fetchMaven; })
+    plexusInterpolation_1_13;
+
   inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; })
     plexusUtils_1_1
+    plexusUtils_1_5_1
     plexusUtils_1_5_8
+    plexusUtils_2_0_5
     plexusUtils_2_0_6
     plexusUtils_3_0;
 }

From f23c44516cfa19fe19cf9764b47d9a520a73853a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 31 Oct 2016 10:23:22 -0400
Subject: [PATCH 0024/3449] Fixup

---
 .../java-modules/build-maven-package.nix      |   6 +-
 .../java-modules/maven-minimal.nix            | 138 ++++++++++++++++++
 .../java-modules/maven/plugin-annotations.nix |   2 +-
 .../java-modules/maven/surefire-api.nix       |   4 +-
 .../development/java-modules/mavenPlugins.nix | 136 +----------------
 pkgs/development/java-modules/poms.nix        |  16 ++
 6 files changed, 164 insertions(+), 138 deletions(-)
 create mode 100644 pkgs/development/java-modules/maven-minimal.nix

diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 499a48b22281..9449e3e17b15 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -4,10 +4,12 @@
 with builtins;
 with lib;
 
-stdenv.mkDerivation rec {
+let
+  mavenMinimal = import ./maven-minimal.nix { inherit pkgs lib stdenv maven; };
+in stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
-  flatDeps = unique (flatten (mavenDeps ++ pkgs.javaPackages.mavenPlugins.mavenMinimal));
+  flatDeps = unique (flatten (mavenDeps ++ mavenMinimal.mavenMinimal));
 
   propagatedBuildInput = [ maven ] ++ flatDeps;
 
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
new file mode 100644
index 000000000000..e97a97b69ea6
--- /dev/null
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -0,0 +1,138 @@
+{ stdenv, pkgs, lib, maven }:
+
+with pkgs.javaPackages;
+
+let
+  fetchMaven = pkgs.callPackage ./m2install.nix { };
+  poms = import ./poms.nix { inherit fetchMaven; };
+  plugins = import ./mavenPlugins.nix { inherit stdenv lib pkgs maven; };
+in rec {
+# "Minimal"
+  mavenMinimal = lib.flatten
+    (with plugins; [
+    classworlds_1_1
+    commonsCli_1_0
+    findbugsJsr305_2_0_1
+    junit_3_8_1
+    mavenArchiver_2_5
+    mavenArtifact_2_0_6
+    mavenArtifact_2_0_9
+    mavenArtifactManager_2_0_6
+    mavenArtifactManager_2_0_9
+    mavenArtifactManager_2_2_1
+    mavenClean_2_5
+    mavenCompiler_3_1
+    mavenCore_2_0_6
+    mavenCore_2_0_9
+    mavenCore_2_2_1
+    mavenDoxiaSinkApi_1_0_alpha7
+    mavenErrorDiagnostics_2_0_6
+    mavenErrorDiagnostics_2_0_9
+    mavenErrorDiagnostics_2_2_1
+    mavenFiltering_1_1
+    mavenInstall_2_4
+    mavenJar_2_4
+    mavenModel_2_0_6
+    mavenModel_2_0_9
+    mavenModel_2_2_1
+    mavenMonitor_2_0_6
+    mavenMonitor_2_0_9
+    mavenMonitor_2_2_1
+    mavenPluginDescriptor_2_0_6
+    mavenPluginDescriptor_2_0_9
+    mavenPluginDescriptor_2_2_1
+    mavenPluginParameterDocumenter_2_0_6
+    mavenPluginParameterDocumenter_2_0_9
+    mavenPluginParameterDocumenter_2_2_1
+    mavenProfile_2_0_6
+    mavenProfile_2_0_9
+    mavenProfile_2_2_1
+    mavenProject_2_0_6
+    mavenProject_2_0_9
+    mavenPluginAnnotations_3_1
+    mavenPluginApi_2_0_6
+    mavenPluginApi_2_0_9
+    mavenPluginApi_2_2_1
+    mavenPluginRegistry_2_0_6
+    mavenPluginRegistry_2_0_9
+    mavenPluginRegistry_2_2_1
+    mavenReportingApi_2_0_6
+    mavenReportingApi_2_0_9
+    mavenRepositoryMetadata_2_0_6
+    mavenRepositoryMetadata_2_0_9
+    mavenRepositoryMetadata_2_2_1
+    mavenResources_2_6
+    mavenSettings_2_0_6
+    mavenSettings_2_0_9
+    mavenSettings_2_2_1
+    mavenSharedIncremental_1_1
+    mavenSharedUtils_0_1
+    mavenSurefire_2_12_4
+    mavenSurefireApi_2_12_4
+    mavenSurefireBooter_2_12_4
+    mavenSurefireCommon_2_12_4
+    mavenToolchain_1_0
+    mavenToolchain_2_0_9
+    plexusBuildApi_0_0_4
+    plexusCompilerApi_2_2
+    plexusContainerDefault_1_0_alpha9_stable1
+    plexusInteractivityApi_1_0_alpha4
+    plexusInterpolation_1_13
+    plexusUtils_1_5_1
+    plexusUtils_2_0_5
+    plexusUtils_3_0
+    ])
+    ++
+    (with
+    poms;
+    [
+    apache_3
+    apache_4
+    apache_5
+    apache_6
+    apache_9
+    apache_10
+    apache_11
+    apache_13
+    doxia_1_0_alpha7
+    maven_2_0_6
+    maven_2_0_9
+    maven_2_2_1
+    mavenParent_5
+    mavenParent_8
+    mavenParent_11
+    mavenParent_13
+    mavenParent_21
+    mavenParent_22
+    mavenParent_23
+    mavenPlugins_22
+    mavenPlugins_23
+    mavenPlugins_24
+    mavenPluginTools_3_1
+    mavenReporting_2_0_6
+    mavenReporting_2_0_9
+    mavenSharedComponents_12
+    mavenSharedComponents_17
+    mavenSharedComponents_18
+    mavenSharedComponents_19
+    plexus_1_0_4
+    plexus_1_0_11
+    plexus_2_0_3
+    plexus_2_0_6
+    plexus_2_0_7
+    plexus_3_3_1
+    plexusCompiler_2_2
+    plexusComponents_1_1_15
+    plexusComponents_1_3_1
+    plexusComponentAnnotations_1_5_5
+    plexusContainers_1_0_3
+    plexusContainers_1_5_5
+    sonatypeForgeParent_3
+    sonatypeForgeParent_5
+    sonatypeForgeParent_10
+    sonatypeSpiceParent_10
+    sonatypeSpiceParent_16
+    sonatypeSpiceParent_17
+    surefire_2_12_4
+    ]);
+}
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index da7d52242a3b..c00d0a4f9a21 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -1,7 +1,7 @@
 { fetchMaven }:
 
 rec {
-  mavenPluginAnnotations = map (obj: fetchMaven {
+  mavenPluginAnnotations_3_1 = map (obj: fetchMaven {
     version = "3.1";
     baseName = "maven-plugin-annotations";
     package = "/org/apache/maven/plugin-tools";
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index b696beae4c46..550490a32b1b 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -1,9 +1,9 @@
 { fetchMaven }:
 
 rec {
-  mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
+  mavenSurefireApi_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "maven-surefire-booter";
+    baseName = "maven-surefire-api";
     package = "/org/apache/maven/surefire";
     sha512 = obj.sha512;
     type = obj.type;
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 15be1594117f..7c564037108a 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -1,142 +1,12 @@
-{ pkgs, stdenv, lib, maven, fetchurl }:
+{ pkgs, stdenv, lib, maven }:
 
+with pkgs;
 with pkgs.javaPackages;
 
 let
-  mavenbuild = pkgs.callPackage ./build-maven-package.nix { };
   fetchMaven = pkgs.callPackage ./m2install.nix { };
-  poms = import ./poms.nix { inherit fetchMaven; };
 in rec {
-  inherit mavenbuild fetchMaven poms;
-
-  # "Minimal"
-  mavenMinimal = lib.flatten
-[
-classworlds_1_1
-commonsCli_1_0
-findbugsJsr305_2_0_1
-junit_3_8_1
-mavenArchiver_2_5
-mavenArtifact_2_0_6
-mavenArtifact_2_0_9
-mavenArtifactManager_2_0_6
-mavenArtifactManager_2_0_9
-mavenArtifactManager_2_2_1
-mavenClean_2_5
-mavenCompiler_3_1
-mavenCore_2_0_6
-mavenCore_2_0_9
-mavenCore_2_2_1
-mavenDoxiaSinkApi_1_0_alpha7
-mavenErrorDiagnostics_2_0_6
-mavenErrorDiagnostics_2_0_9
-mavenErrorDiagnostics_2_2_1
-mavenFiltering_1_1
-mavenInstall_2_4
-mavenJar_2_4
-mavenModel_2_0_6
-mavenModel_2_0_9
-mavenModel_2_2_1
-mavenMonitor_2_0_6
-mavenMonitor_2_0_9
-mavenMonitor_2_2_1
-mavenPluginDescriptor_2_0_6
-mavenPluginDescriptor_2_0_9
-mavenPluginDescriptor_2_2_1
-mavenPluginParameterDocumenter_2_0_6
-mavenPluginParameterDocumenter_2_0_9
-mavenPluginParameterDocumenter_2_2_1
-mavenProfile_2_0_6
-mavenProfile_2_0_9
-mavenProfile_2_2_1
-mavenProject_2_0_6
-mavenProject_2_0_9
-mavenPluginAnnotations_3_1
-mavenPluginApi_2_0_6
-mavenPluginApi_2_0_9
-mavenPluginApi_2_2_1
-mavenPluginRegistry_2_0_6
-mavenPluginRegistry_2_0_9
-mavenPluginRegistry_2_2_1
-mavenReportingApi_2_0_6
-mavenReportingApi_2_0_9
-mavenRepositoryMetadata_2_0_6
-mavenRepositoryMetadata_2_0_9
-mavenRepositoryMetadata_2_2_1
-mavenResources_2_6
-mavenSettings_2_0_6
-mavenSettings_2_0_9
-mavenSettings_2_2_1
-mavenSharedIncremental_1_1
-mavenSharedUtils_0_1
-mavenSurefire_2_12_4
-mavenSurefireApi_2_12_4
-mavenSurefireBooter_2_12_4
-mavenSurefireCommon_2_12_4
-mavenToolchain_1_0
-mavenToolchain_2_0_9
-plexusBuildApi_0_0_4
-plexusCompilerApi_2_2
-plexusContainerDefault_1_0_alpha9_stable1
-plexusInteractivityApi_1_0_alpha4
-plexusInterpolation_1_13
-plexusUtils_1_5_1
-plexusUtils_2_0_5
-plexusUtils_3_0
-]
-++
-(with
-poms;
-[
-apache_3
-apache_4
-apache_5
-apache_6
-apache_9
-apache_10
-apache_11
-apache_13
-doxia_1_0_alpha7
-maven_2_0_6
-maven_2_0_9
-maven_2_2_1
-mavenParent_5
-mavenParent_8
-mavenParent_11
-mavenParent_13
-mavenParent_21
-mavenParent_22
-mavenParent_23
-mavenPlugins_22
-mavenPlugins_23
-mavenPlugins_24
-mavenPluginTools_3_1
-mavenReporting_2_0_6
-mavenReporting_2_0_9
-mavenSharedComponents_12
-mavenSharedComponents_17
-mavenSharedComponents_18
-mavenSharedComponents_19
-plexus_1_0_4
-plexus_1_0_11
-plexus_2_0_3
-plexus_2_0_6
-plexus_2_0_7
-plexus_3_3_1
-plexusCompiler_2_2
-plexusComponents_1_1_15
-plexusComponents_1_3_1
-plexusComponentAnnotations_1_5_5
-plexusContainers_1_0_3
-plexusContainers_1_5_5
-sonatypeForgeParent_3
-sonatypeForgeParent_5
-sonatypeForgeParent_10
-sonatypeSpiceParent_10
-sonatypeSpiceParent_16
-sonatypeSpiceParent_17
-surefire_2_12_4
-]);
+  inherit fetchMaven;
 
   animalSniffer_1_11 = map (obj: fetchMaven {
     version = "1.11";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 3e5ef87223f6..18944e27a865 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -193,6 +193,22 @@ rec {
     type = "pom";
   };
 
+  mavenParent_11 = fetchMaven {
+    version = "11";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
+    type = "pom";
+  };
+
+  mavenParent_13 = fetchMaven {
+    version = "13";
+    baseName = "maven-parent";
+    package = "/org/apache/maven";
+    sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
+    type = "pom";
+  };
+
   mavenParent_15 = fetchMaven {
     version = "15";
     baseName = "maven-parent";

From 8500c2491110031e5582b014691a57b27bc6722a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 31 Oct 2016 13:10:26 -0400
Subject: [PATCH 0025/3449] Finish maven-hello / framework

---
 .../java-modules/apache/commons-lang.nix      |  11 +
 .../java-modules/apache/commons-lang3.nix     |  14 +
 .../apache/commons-logging-api.nix            |  14 +
 .../java-modules/apache/xbean-reflect.nix     |  14 +
 .../java-modules/build-maven-package.nix      |  10 +-
 .../java-modules/classworlds/classworlds.nix  |  11 +
 .../java-modules/google/collections.nix       |  15 +
 .../java-modules/hamcrest/core.nix            |   1 -
 .../java-modules/junit/default.nix            |  11 +
 .../java-modules/log4j/default.nix            |  15 +
 .../java-modules/maven-minimal.nix            | 305 ++++++++++--------
 .../java-modules/maven/archiver.nix           |   4 +-
 .../java-modules/maven/artifact-manager.nix   |   4 +-
 .../java-modules/maven/artifact.nix           |  11 +
 .../maven/common-artifact-filters.nix         |   4 +-
 pkgs/development/java-modules/maven/core.nix  |   4 +-
 .../java-modules/maven/error-diagnostics.nix  |   4 +-
 pkgs/development/java-modules/maven/model.nix |   4 +-
 .../java-modules/maven/monitor.nix            |   4 +-
 .../java-modules/maven/plugin-annotations.nix |   4 +-
 .../java-modules/maven/plugin-api.nix         |   4 +-
 .../java-modules/maven/plugin-descriptor.nix  |   4 +-
 .../maven/plugin-parameter-documenter.nix     |   4 +-
 .../java-modules/maven/plugin-registry.nix    |   4 +-
 .../java-modules/maven/profile.nix            |   4 +-
 .../java-modules/maven/project.nix            |  11 +
 .../maven/repository-metadata.nix             |   4 +-
 .../java-modules/maven/settings.nix           |   4 +-
 .../java-modules/maven/surefire-api.nix       |   6 +-
 .../java-modules/maven/surefire-booter.nix    |   6 +-
 .../java-modules/maven/surefire-common.nix    |   4 +-
 .../java-modules/maven/toolchain.nix          |   4 +-
 .../development/java-modules/mavenPlugins.nix |   2 +-
 .../java-modules/plexus/archiver.nix          |  14 +
 .../java-modules/plexus/classworlds.nix       |  14 +
 .../java-modules/plexus/compiler-javac.nix    |  14 +
 .../java-modules/plexus/compiler-manager.nix  |  14 +
 .../java-modules/plexus/container-default.nix |  22 ++
 .../java-modules/plexus/digest.nix            |  14 +
 .../java-modules/plexus/interpolation.nix     |  33 ++
 pkgs/development/java-modules/plexus/io.nix   |  14 +
 .../development/java-modules/plexus/utils.nix |  77 +++++
 pkgs/development/java-modules/poms.nix        | 174 +++++++++-
 pkgs/top-level/java-packages.nix              |  58 +++-
 44 files changed, 789 insertions(+), 184 deletions(-)
 create mode 100644 pkgs/development/java-modules/apache/commons-lang3.nix
 create mode 100644 pkgs/development/java-modules/apache/commons-logging-api.nix
 create mode 100644 pkgs/development/java-modules/apache/xbean-reflect.nix
 create mode 100644 pkgs/development/java-modules/google/collections.nix
 create mode 100644 pkgs/development/java-modules/log4j/default.nix
 create mode 100644 pkgs/development/java-modules/plexus/archiver.nix
 create mode 100644 pkgs/development/java-modules/plexus/classworlds.nix
 create mode 100644 pkgs/development/java-modules/plexus/compiler-javac.nix
 create mode 100644 pkgs/development/java-modules/plexus/compiler-manager.nix
 create mode 100644 pkgs/development/java-modules/plexus/digest.nix
 create mode 100644 pkgs/development/java-modules/plexus/io.nix

diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index eb60d19e8183..8987823e4705 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  commonsLang_2_1 = map (obj: fetchMaven {
+    version = "2.1";
+    baseName = "commons-lang";
+    package = "/commons-lang";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1hr3q67cn0nk5kn9vdfs8155cw814jf20jk7dsn3cn0a6l2j6dx297z6akz5f62dkkn0nj4pac7z4wvnawisnvzhpg6q6qhwj7wwc8n"; }
+    { type = "jar"; sha512 = "2phbi7q2k3v48gyys7s0yw8xaa9kpczwif5jfqgfarzf7il1r0vplpwgwcnlsxpifjjnap7lw0yq38zp0mbajp7h8p5z0qp7gisa4m3"; }
+  ];
+
   commonsLang_2_3 = map (obj: fetchMaven {
     version = "2.3";
     baseName = "commons-lang";
diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix
new file mode 100644
index 000000000000..8b5498f362d4
--- /dev/null
+++ b/pkgs/development/java-modules/apache/commons-lang3.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  commonsLang3_3_1 = map (obj: fetchMaven {
+    version = "3.1";
+    baseName = "commons-lang3";
+    package = "/org/apache/commons";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "0msypmqn5q4sxks97zbvi85rq2zclkyz8j09riqw7c95n96nyv7x3pysi83vdgc53d0lhl4apkp7warl52xq1qzdyjxipjdlhqmhdcw"; }
+    { type = "jar"; sha512 = "3lw2naanwxjqrwgbg5ij6abzlkch0l6bcx44sl4a59m2r5fi2rvmc07pqai2l9kqwql05fyx9h1md5jjh2wzia15rqnvwssprykjwvi"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix
new file mode 100644
index 000000000000..9aae04e42064
--- /dev/null
+++ b/pkgs/development/java-modules/apache/commons-logging-api.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  commonsLoggingApi_1_1 = map (obj: fetchMaven {
+    version = "1.1";
+    baseName = "commons-logging-api";
+    package = "/commons-logging";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "3fp3d08l6m1xmma6pz7hvkvj5isbnyjimgvxf4plrwqmalifw0ywjbal5r5kmmrdlcda7l49mxdsv43ygglm9g22dzkbhdqlhlrn934"; }
+    { type = "jar"; sha512 = "316dgnyhwai9n8dqjkp9chkkbhkyli9mfbgsj8ch6cdpmzmcvzirnjj7z1xbxm7v8hlybqhyaf5075pxwz3cg1w5ih3rhwjfi19f8dq"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix
new file mode 100644
index 000000000000..c1e9916443c9
--- /dev/null
+++ b/pkgs/development/java-modules/apache/xbean-reflect.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  xbeanReflect_3_4 = map (obj: fetchMaven {
+    version = "3.4";
+    baseName = "xbean-reflect";
+    package = "/org/apache/xbean";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1nny6dcwif0kd0kr2l55j2l5rb1aw8l2f2fbhanj6j48zhcz3vv1wx5xi0l6vg4j70y12fxyg1kyn4lq0bx19by19r73k06wlxs001k"; }
+    { type = "jar"; sha512 = "3w22jbm4sii16lzkzwi6hv5zbid5jw8dv356q9hr0pnb8d4gm6ypl2pjqj0brzmpq9pydqya14wk798ddjalqjh25rl2ry9qhjx3hlm"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 9449e3e17b15..a056953f9ab3 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,11 +1,11 @@
-{ stdenv, maven, lib, pkgs }:
+{ stdenv, maven, pkgs }:
 { mavenDeps, src, name, meta, m2Path, ... }:
 
 with builtins;
-with lib;
+with stdenv.lib;
 
 let
-  mavenMinimal = import ./maven-minimal.nix { inherit pkgs lib stdenv maven; };
+  mavenMinimal = import ./maven-minimal.nix { inherit pkgs stdenv maven; };
 in stdenv.mkDerivation rec {
   inherit mavenDeps src name meta m2Path;
 
@@ -16,7 +16,10 @@ in stdenv.mkDerivation rec {
   find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
   copy = ''cp -rs ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2'';
 
+  phases = [ "unpackPhase" "buildPhase" ];
+
   buildPhase = ''
+    mkdir -p $out/target
     mkdir -p $out/m2/${m2Path}
     ${optionalString (length flatDeps > 0) find}
     ${optionalString (length flatDeps > 0) copy}
@@ -24,5 +27,6 @@ in stdenv.mkDerivation rec {
         <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 clean install -Dmaven.test.skip=true -gs $out/m2/settings.xml
+    cp -v ./target/*.jar $out/target/
   '';
 }
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix
index a177927d3d68..3a85cc4363ef 100644
--- a/pkgs/development/java-modules/classworlds/classworlds.nix
+++ b/pkgs/development/java-modules/classworlds/classworlds.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  classworlds_1_1_alpha2 = map (obj: fetchMaven {
+    version = "1.1-alpha-2";
+    baseName = "classworlds";
+    package = "/classworlds";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "027b0s13ck41wg75z7bz1zxazdxp56llxlg4z9kp01wys1sbkng8s0i0mxyvjaq61q5lg2gfrxypnzg7vha23vq57hkdhwyksjdcd5c"; }
+    { type = "jar"; sha512 = "36vir8jja85cg7khaf2qjln7m8q5iq0n43vvkxkwwngv67ffpvqqz6j1fscvl16hzb0nf6j9gzkcrgk3mk9jl49vrj3fw7c173m4xzb"; }
+  ];
+
   classworlds_1_1 = map (obj: fetchMaven {
     version = "1.1";
     baseName = "classworlds";
diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix
new file mode 100644
index 000000000000..9898ddeaf31e
--- /dev/null
+++ b/pkgs/development/java-modules/google/collections.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  googleCollections_1_0 = map (obj: fetchMaven {
+    version = "1.0";
+    baseName = "google-collections";
+    package = "/com/google/collections";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3vvgac799ilrmab28ya894jkyq3jj4217ix8mfyxzbkb8v0wy2rpmdbni3irrrdhc9skd0sldlcnfpvs1hjv5v07ajxlm1dbkgvqhap"; }
+    { type = "pom"; sha512 = "38x885cglwmx0chqlzhx83jcrqvnwwr9qj6awx3n0xqp175qznjwn0i94rwxhyj00a7xgvvm9jvwkppwfkcdiyxmimb1z8frdhkkh7p"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix
index 1414dc1fe6bb..104331f6f138 100644
--- a/pkgs/development/java-modules/hamcrest/core.nix
+++ b/pkgs/development/java-modules/hamcrest/core.nix
@@ -1,7 +1,6 @@
 { fetchMaven }:
 
 rec {
-  # Ant build, just fetch the binary
   hamcrestCore_1_3 = map (obj: fetchMaven {
     version = "1.3";
     baseName = "hamcrest-core";
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index ebb614bb703e..8304b1a8a01b 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -36,6 +36,17 @@ rec {
     { type = "jar"; sha512 = "25yk0lzwk46r867nhrw4hg7cvz28wb8ln9nw1dqrb6zarifl54p4h1mcz90vmih405bsk96g0qb6hn1h4df0fas3f5kma9vxfjryvwf"; }
   ];
 
+  junit_3_8_2 = map (obj: fetchMaven {
+    version = "3.8.2";
+    baseName = "junit";
+    package = "/junit";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "01npyfwl1f44l44x92cvqqcp58sckcjraf78dav6zgag3x6ispd9gz594nhpqckmjw0hlrkbqfxnzdcq1mlsj9rw6zyq4wk5ch8rl5j"; }
+    { type = "jar"; sha512 = "2jcih102666lcm7b23rgs5cd59ww49m78c8mja52mrcm25630zw28rjqkj5lsws18k5jf75div9wkd1sxcvwvq5cvvphgyg7550i8r9"; }
+  ];
+
   junit_4_12 = junitGen {
     mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ];
     sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix
new file mode 100644
index 000000000000..65aaa41adb14
--- /dev/null
+++ b/pkgs/development/java-modules/log4j/default.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  log4j_1_2_12 = map (obj: fetchMaven {
+    version = "1.2.12";
+    baseName = "log4j";
+    package = "/log4j";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "23amz03i51w4vhh2wfq4fppi5qp2rzy0gqz4fdaqg4s3mz0aj86jylp7akj7aprnm28q2y1v4sj0s64qqvakj1vj020hr9y8rrifdga"; }
+    { type = "pom"; sha512 = "0n5w0ywp90lllnyyxhaa7py1gapdw85jnnyyk86rm46k132q1lq6j7rh1mvzw1z01lh7bzb800r0rmgcc1mgn3fjgr9hxlr4ssm7gbx"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index e97a97b69ea6..359060c8dae2 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -1,138 +1,187 @@
-{ stdenv, pkgs, lib, maven }:
+{ stdenv, pkgs, maven }:
 
+with stdenv.lib;
 with pkgs.javaPackages;
 
 let
   fetchMaven = pkgs.callPackage ./m2install.nix { };
   poms = import ./poms.nix { inherit fetchMaven; };
-  plugins = import ./mavenPlugins.nix { inherit stdenv lib pkgs maven; };
+  plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; };
 in rec {
-# "Minimal"
-  mavenMinimal = lib.flatten
-    (with plugins; [
-    classworlds_1_1
-    commonsCli_1_0
-    findbugsJsr305_2_0_1
-    junit_3_8_1
-    mavenArchiver_2_5
-    mavenArtifact_2_0_6
-    mavenArtifact_2_0_9
-    mavenArtifactManager_2_0_6
-    mavenArtifactManager_2_0_9
-    mavenArtifactManager_2_2_1
-    mavenClean_2_5
-    mavenCompiler_3_1
-    mavenCore_2_0_6
-    mavenCore_2_0_9
-    mavenCore_2_2_1
-    mavenDoxiaSinkApi_1_0_alpha7
-    mavenErrorDiagnostics_2_0_6
-    mavenErrorDiagnostics_2_0_9
-    mavenErrorDiagnostics_2_2_1
-    mavenFiltering_1_1
-    mavenInstall_2_4
-    mavenJar_2_4
-    mavenModel_2_0_6
-    mavenModel_2_0_9
-    mavenModel_2_2_1
-    mavenMonitor_2_0_6
-    mavenMonitor_2_0_9
-    mavenMonitor_2_2_1
-    mavenPluginDescriptor_2_0_6
-    mavenPluginDescriptor_2_0_9
-    mavenPluginDescriptor_2_2_1
-    mavenPluginParameterDocumenter_2_0_6
-    mavenPluginParameterDocumenter_2_0_9
-    mavenPluginParameterDocumenter_2_2_1
-    mavenProfile_2_0_6
-    mavenProfile_2_0_9
-    mavenProfile_2_2_1
-    mavenProject_2_0_6
-    mavenProject_2_0_9
-    mavenPluginAnnotations_3_1
-    mavenPluginApi_2_0_6
-    mavenPluginApi_2_0_9
-    mavenPluginApi_2_2_1
-    mavenPluginRegistry_2_0_6
-    mavenPluginRegistry_2_0_9
-    mavenPluginRegistry_2_2_1
-    mavenReportingApi_2_0_6
-    mavenReportingApi_2_0_9
-    mavenRepositoryMetadata_2_0_6
-    mavenRepositoryMetadata_2_0_9
-    mavenRepositoryMetadata_2_2_1
-    mavenResources_2_6
-    mavenSettings_2_0_6
-    mavenSettings_2_0_9
-    mavenSettings_2_2_1
-    mavenSharedIncremental_1_1
-    mavenSharedUtils_0_1
-    mavenSurefire_2_12_4
-    mavenSurefireApi_2_12_4
-    mavenSurefireBooter_2_12_4
-    mavenSurefireCommon_2_12_4
-    mavenToolchain_1_0
-    mavenToolchain_2_0_9
-    plexusBuildApi_0_0_4
-    plexusCompilerApi_2_2
-    plexusContainerDefault_1_0_alpha9_stable1
-    plexusInteractivityApi_1_0_alpha4
-    plexusInterpolation_1_13
-    plexusUtils_1_5_1
-    plexusUtils_2_0_5
-    plexusUtils_3_0
-    ])
-    ++
-    (with
-    poms;
+  # Maven needs all of these to function
+  mavenMinimal = flatten
     [
-    apache_3
-    apache_4
-    apache_5
-    apache_6
-    apache_9
-    apache_10
-    apache_11
-    apache_13
-    doxia_1_0_alpha7
-    maven_2_0_6
-    maven_2_0_9
-    maven_2_2_1
-    mavenParent_5
-    mavenParent_8
-    mavenParent_11
-    mavenParent_13
-    mavenParent_21
-    mavenParent_22
-    mavenParent_23
-    mavenPlugins_22
-    mavenPlugins_23
-    mavenPlugins_24
-    mavenPluginTools_3_1
-    mavenReporting_2_0_6
-    mavenReporting_2_0_9
-    mavenSharedComponents_12
-    mavenSharedComponents_17
-    mavenSharedComponents_18
-    mavenSharedComponents_19
-    plexus_1_0_4
-    plexus_1_0_11
-    plexus_2_0_3
-    plexus_2_0_6
-    plexus_2_0_7
-    plexus_3_3_1
-    plexusCompiler_2_2
-    plexusComponents_1_1_15
-    plexusComponents_1_3_1
-    plexusComponentAnnotations_1_5_5
-    plexusContainers_1_0_3
-    plexusContainers_1_5_5
-    sonatypeForgeParent_3
-    sonatypeForgeParent_5
-    sonatypeForgeParent_10
-    sonatypeSpiceParent_10
-    sonatypeSpiceParent_16
-    sonatypeSpiceParent_17
-    surefire_2_12_4
+      classworlds_1_1_alpha2
+      classworlds_1_1
+      commonsCli_1_0
+      commonsLang_2_1
+      commonsLang3_3_1
+      commonsLoggingApi_1_1
+      findbugsJsr305_2_0_1
+      googleCollections_1_0
+      junit_3_8_1
+      junit_3_8_2
+      log4j_1_2_12
+      mavenArchiver_2_5
+      mavenArtifact_2_0_6
+      mavenArtifact_2_0_9
+      mavenArtifact_2_2_1
+      mavenArtifactManager_2_0_6
+      mavenArtifactManager_2_0_9
+      mavenArtifactManager_2_2_1
+      mavenCommonArtifactFilters_1_3
+      mavenCore_2_0_6
+      mavenCore_2_0_9
+      mavenCore_2_2_1
+      mavenDoxiaSinkApi_1_0_alpha7
+      mavenErrorDiagnostics_2_0_6
+      mavenErrorDiagnostics_2_0_9
+      mavenErrorDiagnostics_2_2_1
+      mavenFiltering_1_1
+      mavenModel_2_0_6
+      mavenModel_2_0_9
+      mavenModel_2_2_1
+      mavenMonitor_2_0_6
+      mavenMonitor_2_0_9
+      mavenMonitor_2_2_1
+      mavenPluginDescriptor_2_0_6
+      mavenPluginDescriptor_2_0_9
+      mavenPluginDescriptor_2_2_1
+      mavenPluginParameterDocumenter_2_0_6
+      mavenPluginParameterDocumenter_2_0_9
+      mavenPluginParameterDocumenter_2_2_1
+      mavenProfile_2_0_6
+      mavenProfile_2_0_9
+      mavenProfile_2_2_1
+      mavenProject_2_0_6
+      mavenProject_2_0_9
+      mavenProject_2_2_1
+      mavenPluginAnnotations_3_1
+      mavenPluginApi_2_0_6
+      mavenPluginApi_2_0_9
+      mavenPluginApi_2_2_1
+      mavenPluginRegistry_2_0_6
+      mavenPluginRegistry_2_0_9
+      mavenPluginRegistry_2_2_1
+      mavenReportingApi_2_0_6
+      mavenReportingApi_2_0_9
+      mavenRepositoryMetadata_2_0_6
+      mavenRepositoryMetadata_2_0_9
+      mavenRepositoryMetadata_2_2_1
+      mavenSettings_2_0_6
+      mavenSettings_2_0_9
+      mavenSettings_2_2_1
+      mavenSharedIncremental_1_1
+      mavenSharedUtils_0_1
+      mavenSurefireApi_2_12_4
+      mavenSurefireBooter_2_12_4
+      mavenSurefireCommon_2_12_4
+      mavenToolchain_1_0
+      mavenToolchain_2_0_9
+      plexusArchiver_2_1
+      plexusBuildApi_0_0_4
+      plexusClassworlds_2_2_2
+      plexusCompilerApi_2_2
+      plexusCompilerJavac_2_2
+      plexusCompilerManager_2_2
+      plexusComponentAnnotations_1_5_5
+      plexusContainerDefault_1_0_alpha9
+      plexusContainerDefault_1_0_alpha9_stable1
+      plexusContainerDefault_1_5_5
+      plexusDigest_1_0
+      plexusInteractivityApi_1_0_alpha4
+      plexusInterpolation_1_11
+      plexusInterpolation_1_12
+      plexusInterpolation_1_13
+      plexusInterpolation_1_15
+      plexusIo_2_0_2
+      plexusUtils_1_0_4
+      plexusUtils_1_4_1
+      plexusUtils_1_4_5
+      plexusUtils_1_5_1
+      plexusUtils_1_5_5
+      plexusUtils_1_5_8
+      plexusUtils_1_5_15
+      plexusUtils_2_0_5
+      plexusUtils_3_0
+      plexusUtils_3_0_5
+      plexusUtils_3_0_8
+      xbeanReflect_3_4
+    ] ++ (with plugins; [
+      mavenClean_2_5
+      mavenCompiler_3_1
+      mavenInstall_2_4
+      mavenJar_2_4
+      mavenResources_2_6
+      mavenSurefire_2_12_4
+    ]) ++ (with poms; [
+      apache_3
+      apache_4
+      apache_5
+      apache_6
+      apache_9
+      apache_10
+      apache_11
+      apache_13
+      backportUtilConcurrent_3_1
+      commonsParent_22
+      doxia_1_0_alpha7
+      googleParent_1
+      jclOverSlf4j_1_5_6
+      maven_2_0_6
+      maven_2_0_9
+      maven_2_2_1
+      mavenParent_5
+      mavenParent_8
+      mavenParent_11
+      mavenParent_13
+      mavenParent_21
+      mavenParent_22
+      mavenParent_23
+      mavenPlugins_22
+      mavenPlugins_23
+      mavenPlugins_24
+      mavenPluginTools_3_1
+      mavenReporting_2_0_6
+      mavenReporting_2_0_9
+      mavenSharedComponents_12
+      mavenSharedComponents_17
+      mavenSharedComponents_18
+      mavenSharedComponents_19
+      plexus_1_0_4
+      plexus_1_0_8
+      plexus_1_0_11
+      plexus_2_0_2
+      plexus_2_0_3
+      plexus_2_0_6
+      plexus_2_0_7
+      plexus_3_0_1
+      plexus_3_1
+      plexus_3_2
+      plexus_3_3_1
+      plexusCipher_1_4
+      plexusCompiler_2_2
+      plexusCompilers_2_2
+      plexusComponents_1_1_7
+      plexusComponents_1_1_14
+      plexusComponents_1_1_15
+      plexusComponents_1_1_19
+      plexusComponents_1_3_1
+      plexusContainers_1_0_3
+      plexusContainers_1_5_5
+      plexusSecDispatcher_1_3
+      slf4jApi_1_5_6
+      slf4jJdk14_1_5_6
+      slf4jParent_1_5_6
+      sonatypeForgeParent_3
+      sonatypeForgeParent_4
+      sonatypeForgeParent_5
+      sonatypeForgeParent_10
+      sonatypeSpiceParent_10
+      sonatypeSpiceParent_12
+      sonatypeSpiceParent_16
+      sonatypeSpiceParent_17
+      surefire_2_12_4
+      xbean_3_4
     ]);
 }
diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix
index 790e7894bff1..ecab1f1e99ce 100644
--- a/pkgs/development/java-modules/maven/archiver.nix
+++ b/pkgs/development/java-modules/maven/archiver.nix
@@ -8,7 +8,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "3kkv5kf3k5in69aplawkr0cr2cviyjgf8k6r6qvgxk53i3jmh7qylzrwkrd9bxclkjkgyg77cffxm48qhxm9pyqncdbwjldsmmdfb4f"; }
-    { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; }
+    { type = "jar"; sha512 = "0wx6248rn0821nnag659mm1n77r56chgx2lr26x81l7apx4zkc2nidjzy2d73snkir98h9bmcz09wnx21pkrq8mk50x7mjgkc0yziky"; }
+    { type = "pom"; sha512 = "1rfnwxnk45084rdc52a17bmg8zfyylq1m38wvp956xy455abjvxpnp7il7xpkq6wv16f3bq5yx35hk1b9nycw19w6123rz4v5cs3b0b"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index 7f0a9226e877..031bd37eb6fa 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "1vvxf2dannx9p2qvlbmrxfni5mc0f3722p3bcdz6bk3z4dhb2hlw2wx17nvirq5r3k43azgp13mg0638saz7v1g23f07n9yzm979f0p"; }
-    { type = "pom"; sha512 = "2v7371gsarjb4s2bp5vclqgdg82mh7nzy7af31g9z20q2r6ndw024xa8bpcxp227yv83lpawbhq0ysg0glnw9ql54100h9hbllam0p8"; }
+    { type = "jar"; sha512 = "04i9c4k5diyqz8hn20sxvrqkqrxxm7wxqh7xgyk3dm1hwhrqy3h29irvpb335kp8i0sxljz2p2a9cmjpx9wyl0266bj5y313whmfkr5"; }
+    { type = "pom"; sha512 = "02ryc46in725q4y11l1kmy6ra01wjnfq5gqwic005wc090l2j39kn5drvn3av6g7413v9x0cksy8qcbagc2jnz6wwxn8z2g5krynw6z"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index 12876f53d5ae..1cbb347baf4e 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -23,6 +23,17 @@ rec {
     { type = "pom"; sha512 = "0g0cbqihzxyaa1b0z9a7qb8lkhcm8bzxi7qnqaab2n2zaaql6jyy7cf4z4yzqw3yfj7ylqvydiwp32j2c7nqacyx0hmcydqkqg46kxv"; }
   ];
 
+  mavenArtifact_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1wfffq39ay1cdzany6x0d6h7icdqrvmj4py35a8i2aw94bc8mf6cam7lf8z7jjckhrnb7yxbqz6pj8sxsgpkwnl2q4flqaczr8nnx4j"; }
+    { type = "pom"; sha512 = "099hkdbccd9cf6w64c37z1b2i54h4y0bfx5n56birikgy3s92rrl4x454gvw3wnrpvhkikwvdyw9dv03w40rn50kdwgy0mxc3zgs6l4"; }
+  ];
+
   mavenArtifact_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
     baseName = "maven-artifact";
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index e0ee7e6a59ed..2b72293ac939 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -8,8 +8,8 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "pom"; sha512 = "21wyk4llwjyanlggy281f9n0sjshjqvd322lbhxmzn42cd9vmj0s6xih82jwqlkcxkypwymyj1gl7van55ibd98p1jjjvr93gs1cn14"; }
-    { type = "jar"; sha512 = "1bv4lp1a8sb79almnygiq0pmm0fdhy9pyakp6xhz91b4v1cqg03sb586yc4lg2934yv4jjbybqjbh4l0y3kgnanjbxdxdgxgyf14iif"; }
+    { type = "pom"; sha512 = "0kr47rinzfyir5lfzp74r6dbbrcddrxdyic7yf571jfzzlwappy77bhrdchaz3c5w94pz1vq6is6yy5nfawpgb2zr6jpi5k552cf1fz"; }
+    { type = "jar"; sha512 = "060siqwk0mscxznl05lzyp72hqr9jr23l3fa9k1kdyks1hghw76cp01jbfj9ijy81n62vb6am98c1695mzpgf453kw1gxp40mwv0ryh"; }
   ];
 
   mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven {
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index 7f186503d31b..d135bd28657e 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "pom"; sha512 = "1a17qcd05v08jpd9ah650kbmrdxrxjfl2jgx9fnc89x4ahzmml9fr2qal0pwnn0sw3g3j1cqbry9lwq5hzja6x779s90hqrb72s49l1"; }
-    { type = "jar"; sha512 = "0qp0kns07h4j7d67z0j09kjn0hwf6k6iz4vp2pmisx131f98acm516y8ca35ly7pp6zn9mdk3c4nh9c0rd7xnqvi12ijqrfvg01dri2"; }
+    { type = "pom"; sha512 = "3rph4ghz7y0a8a6g6h7hr470swyj99y70rwm9ccv40qjc6gxjrckgyax0ihz50x4gyihvpbz5nl046r1qdq4r57rwx0x81s4wns0vf2"; }
+    { type = "jar"; sha512 = "1dxfcyic0skz4pm4w5pxbvligyl9pif78lk915pdhzia16b54c65ffk832zs7d774ynjfxrgzpbicvldsdb1wmi15vfgxn421vynbjj"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index c8993f1f0c9c..8f3cd0a4485d 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "3czdrv2s1gafclm57m5qxw3aaxrm3r3z9yggscxg60fk0hn6jlpygclghkrl2g7c8ggdqdd01y6zcj1wgzq32yp1cd4s3kakf2y25dm"; }
-    { type = "pom"; sha512 = "3l0cpg0ssivfnadffc68cnac65vpfpl0qa9a4ik82jxcwhfa00337jxz37vyqaqs1vjrvd2cqhmjayddwkpwc8aqnz3nr0rlqnqzm7g"; }
+    { type = "jar"; sha512 = "3znssb9y54405gpxmz5cmjzq0hvs3hp77vqfwnxarghsyz52cwfkjix22a3g75a5aqspxlwdgd86lsfm6qvyxzjlvlcqa1m0yrbjbr7"; }
+    { type = "pom"; sha512 = "39hx14ad5g3jyxbvsmx22l2g8asnax5ym3r0n5dqiqh8pk9zwy2icgsji64kcvrdx48m2dr5blhpp7r2mw4n7si0rgvmmkkpdvzm44m"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index 34832c371d5f..41b2458550d4 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -30,8 +30,8 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "14pxgdcim20x9lisf510nazzlcjxv9fpqabkdn0d86qa7d9270m4fmya5crasx2np9h0gxl407d77vcjf99fdxizg7i32w35yljqp3z"; }
-    { type = "pom"; sha512 = "2vvyawhfq0gwa54ir5l2drcfxphkd47ghwgz89v3vsqgjry714vp01pa5a6yjlwfd45mknyrb71ws6dki4zjgzhdm09ck7cxg5qkpr9"; }
+    { type = "jar"; sha512 = "1f9ndvsxpiyybmr5p4pl0xrvxap17grad10vr0pskvx8g8phy7w7kmihhg8gd8m91nbikpaqycm54dp5xmhqzyq85dqapxbiy2m599v"; }
+    { type = "pom"; sha512 = "11imkxiw9wbgnv7zpghdmgpf02v668z78xr5v0cqyay88ph7wjbscwllbgx3v6rayffx64jbhlvsw97m9sdncrfih2c9wkvfp5m48kn"; }
   ];
 
   mavenModel_3_0_3 = map (obj: fetchMaven {
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index f127efba210c..699d34bbf939 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "2cxspfhf3sbz68y1kjqhw2lny6s1f1kf8sfad6f1qp653g4213c9yy7y3qk9szp528866vw7daa9gbymxd66k3bm09g1q4kgnkg5wn3"; }
-    { type = "pom"; sha512 = "0h9brjzkvxfmk549wmq4mw71yhhf1qb1diin9rnsc5nlvh189k60088b5pcc14324gffkrvdghivfy8spjci5izmay87qk7hfsg2lxc"; }
+    { type = "jar"; sha512 = "20yjvzy683ngrpkng4nv82vw081mwsqrmdmlsd66axj9w0sjk4s1d87d3b3jdjhqk4jn4f7vnm644awv17g9pxqvfk1shsn83lbnvi2"; }
+    { type = "pom"; sha512 = "1pqh6viikr8py8spmp1l55rcsqizsa1cv6kpycmpikj59bnxhd1kqj24rhn485ifam9i90w0p5yywmgg3fmvc09byfnfl5z2lf8j5dj"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index c00d0a4f9a21..782e3e141006 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -8,7 +8,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "pom"; sha512 = "17zyw3j4zbg1hhj18i4q1f0r8gdxl3q9x5ksyqlyr0mrw2sadc6lvbbhyp3l7vsbddl4bgdx36gwvjp5d97gbmk1nbpi1vabadfhq76"; }
-    { type = "jar"; sha512 = "0rk2nzkwcrkfy3vs0zl0l2lxp3w4hkwxrypisbivv5al7sc8lbzls6jgpp3h5gx9kk4scjj24qf5vyimnbadj63rvqffg581fs2zgl9"; }
+    { type = "pom"; sha512 = "2q1y622vaks1y2qjbq4005jmi41hpkivsrnmkf5kr3zndz4d6ai47d90jwr70pby8xqqsj461baljcjsicl6rrbq0v9ppyryr13q828"; }
+    { type = "jar"; sha512 = "1jd8b32kl9kh4dxpdg5i9qf3haqc5br0mz8bl1ri4hb9qgwkzsijvx6jr7pv9zgplanwvgca3lhpgzsgs03n8jlqnbxbmgsv1pl93zb"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index ed791a86955f..b06b83a8e944 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -30,8 +30,8 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "pom"; sha512 = "23qj23k049jz4mp77h2wj4mnjqszb99l4xvxas93cpnbdl51a5s0d0rsg60a8zg0ic04n6fr8nig0vvmmcsggx93a96w4p3na97q30n"; }
-    { type = "jar"; sha512 = "0hvl32k09wr34b6v0wl27y6353mx3afsgwyfw0vpx5aa5b8wiw86vlbknh3kjl43zp2ffxq6b4c7n07jq3y2wczz08gscs5apszhj9q"; }
+    { type = "pom"; sha512 = "25dqpzywbqck1za612d3wqxk61lz92rsk8nvb3arfk2wafw8h5janxy831ikikk34af8wrckkrhgn8smvksj8smyqkfkr5xkga4ywbw"; }
+    { type = "jar"; sha512 = "18wx59j3k2pgy6i5abxpl6x2glp51jnf2w2dcx9yxfh0qx809gbkad2ikkdaihhzzvipf2ly3xhhnpj0vbkyycnahn4lvl5ahj76g4q"; }
   ];
 
   mavenPluginApi_3_0_3 = map (obj: fetchMaven {
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index 397a7610cfe2..0a60032125ca 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "0q9jw44v1mi489bqmdvj7jpv753vdp9jzp50ky6pd912x190spkw6ccmpc87azmwsf131d4h0k0fqi6iidl9ip22a8rwaa22yq7gxi8"; }
-    { type = "pom"; sha512 = "0c4hrb6qhi8wxw7acyphv6l33973vhvg7vjknc3bx8bg36404ky9k78q79r3p2an2886hdfayb0l7wji86bq4q8464754gbx02ci7r8"; }
+    { type = "jar"; sha512 = "34pf7z07gba3a3mvn3q3324bfrlzz01ycf02a31m2daxr12427hczz3ml4jd0gjsjj36qwic89wpcb7p34px3lvgkvy1d5hz0ky6nh6"; }
+    { type = "pom"; sha512 = "2z3kchasac2jbw1n0zq6d5ym57yw6si7d5i7qhz81q3ripv7r19is4d459idymgcqgpdp98zaqg7dbcbz72d0p6k9g8ngaqgk2iml0x"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index 3fd437441a3f..82b16e616204 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "0djr58wp7a93p96sn0k24d6liabd7a4qvsd0p7lk88ws3jwfw5bqh6d0a3fyc86fkask1wi7krrvsm7i6yiw1f1r0d6xjzj8fx5m4kz"; }
-    { type = "pom"; sha512 = "39mhwcxwcqgy6pk3qlabs1b8k8fqvkps6r1zb1n7phfwh4dklngyqdrxh90j3wjg3692l7as1k0439z2x124wlh6bzpv83jmx64jiyh"; }
+    { type = "jar"; sha512 = "3fp8c3mz9w83r497mx8lrb3lb65v9m2hrqjs2kq7hdzg99rcgwcflg3dcv5bg89xf8vhr853zm702l3s40dqq41ys69g4f1h0ksdkld"; }
+    { type = "pom"; sha512 = "392c3zmdvwbz7iakaf93bk82s4la0wr8dj88vz2ipsbakmvqk82hs4r6jkpx7mkl04qhrpk4n4d7gl1gllhkyqapvdddf5qvp6a6b5q"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index 7191a377a337..547bda4fc9f4 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "14mkwxvj0rbj28df9gjnkvr20paayqdmsg0vrzcb23d3xng3zc1fy5hvkifnp7xg73qxpdz0nij56lnnj7q2dqxcnmqvh0vslhc2xja"; }
-    { type = "pom"; sha512 = "0c09imgd44b3pgnj1bjak7xn2z3mpwy9nhbchagfqkicras4djmn2dqwpm1z6p1d4khwx830x9grjrw45przan8lgc7wxzkalnnaqkf"; }
+    { type = "jar"; sha512 = "31kbwqlcwpyvp69sp41hb86dskyr4jp9pb1b43wc23lnk0qlyc712bqrr3qbc6kbl2wfra5fhpr70nfilx6bxsz66zizgdca3pdc0z3"; }
+    { type = "pom"; sha512 = "2i5zj8fmfjdnjl5y91b8m5n8gyiaih4n1i6rn85plibq4n8a42kmxgphvicnn36sgrgmy7la4vrzbaigm2zci857qws52j9p16hzv9c"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index bcaae06b1f99..d5e79d13c2c2 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "2v315cv62k3lmi23msk5rj9bijsafcajw7053jdzzk4zv03vdpdndm5cr995azrpdcvkcdq2m8zh5pdf44nzcdf2rvpm4nxdc2wr5rl"; }
-    { type = "pom"; sha512 = "05iif04frjgbmg7zb3jygn9av2ja48vs2z35b2zrlmgf3s1fxqlr4wxylrrmmk8r0hvg4qmg5j0inm414n0v4ipn08hrpzik5nhdfgy"; }
+    { type = "jar"; sha512 = "13lgj34xf9wgwx87z5gbqmq3f3l2dqprk68ji1vig49k2ngxfa8xz3a8qh7gbl9l234gkbdl3dcsafr158bi0m3n5myrczbz0wfcia7"; }
+    { type = "pom"; sha512 = "0m6fqn507a36rpk0bzwv2zzl1gngcf3h4lrbw8abkmyq7npaqcg57fb5wy6cm30r2cjv2vffrdi142wjxzvrqdr08lmi5nf57gi1sng"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 142a311feed0..880f821f76c3 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -22,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "0laxsz9z48zvx27m395djfl9121jkr7amiv8n07z9nkz9i60wjl52bb7cw6hp6090ba098g8azqpnz8l5i0yj255phy1j6s92ci1i7c"; }
     { type = "pom"; sha512 = "047a0a2bd5fkmg70gzhdiwiwq5dmr84pz6jq9yi5fz44y57ndp7nb72fnkr0p0qcwmry3gj03hk9p2xr4ph53bl1x68j22fnv0f9krq"; }
   ];
+
+  mavenProject_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-project";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3km1j5jnkyil76817gk37ds8v69fmiz2zh924vnsv8sbaj4bm8rs7n5d5laiyss5ff0p1q9by3k1ai94lw2ambc5pbmm6lz0v71naic"; }
+    { type = "pom"; sha512 = "10mk142nqdaq8nqg6sf4wfaq2ymlf3fs2ay8xjrfp07l68z838b2kmj7s8lvv1qzkcnkcjrg9w2kr1m3i8bqxc68fwd5iqdq674c1p3"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 7e29ada05129..7a076a3811ec 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "2np435shcca1jka1gdjxs4bzzayfnfzncpnxhlfy59b32vfpvf5v0kca0zgyx7251ghhb2ks2xxd798rbzvr0gzivicwdrnd5x8g0hm"; }
-    { type = "pom"; sha512 = "27b9z80qdkn7p4fs6k87a5i926c3dsr6jmq4rz8dyiml1svqsvvghzz59cby6n8wkx7wn003wk28jzc08x53vbk5zsvcg9ckslxhjyw"; }
+    { type = "jar"; sha512 = "1dhyh2m8kwys6b1pqnyrn9f9a0bm93xgy9d0nyr98sq3v14irmk6kaf91rgrzrgg5b526816gb41gw1i0rdsrjdgnawlml5dm4qqc8g"; }
+    { type = "pom"; sha512 = "3xcvc4rsmxsxadsqczzknyrdvklizbd6wr1ldvkqx0vqwwm89k9brgkvb5bqv5i3g8s3izx1xn4g24ya88qmgr3h231wpjby2nihdvg"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index 19f0a1ae24d9..b4416607ee9e 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -30,7 +30,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "1hy1wz2bb7f9y0rr5961zhalpbwmk0fhw49k0l527w897lz4zw7lnb8xnx530s6hmn58zqj7iwkx4spz2fahps4ss1ryk0601rzgv4a"; }
-    { type = "pom"; sha512 = "3i2nq3r6piwhv265jhsj9hqriw6113vkqllx5s4kd4y2dspjxh6l9xprrw347nkw68904dyq9hdx76fx2nzjd16ldh41pim5lw8r15n"; }
+    { type = "jar"; sha512 = "3fn6wij56cx3knhyn2w5q4bvsl6sm2ad5wxgszpp4mw5jvl5smczz3k6gpg1bnj5m9f0r9w4aahnf64qxpv4v0lv8fd6k6arwzr1lxd"; }
+    { type = "pom"; sha512 = "1vmbcxbrklhsyqhhz5x0skkckghi3lwgpksxi3aw0j57f86h7rk464ww1zppym451pqgqnpyvl83zzkizad5n8y8hrw41hgh1cdn3ij"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index 550490a32b1b..e7a561814e4b 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -3,12 +3,12 @@
 rec {
   mavenSurefireApi_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "maven-surefire-api";
+    baseName = "surefire-api";
     package = "/org/apache/maven/surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; }
-    { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; }
+    { type = "jar"; sha512 = "0chjp4jpfrhd99mpvh6v4sz71wgg8r0nyv8j2mgbsxsvbf0wha0za5g5bv16l4pflfigd4rhb2h1mkz51pb71qli8w39ycb3dw4lfpn"; }
+    { type = "pom"; sha512 = "28ra2n9ln8nb5j1xh6mnxc4kfabnvyqyrgy2wwm66pxhp1fxxxqz1izfvih9jzr3cps7pbvqwql770i14cfyjzvl0zccjsscsjyy50r"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
index b696beae4c46..8f4d79a9807e 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -3,12 +3,12 @@
 rec {
   mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "maven-surefire-booter";
+    baseName = "surefire-booter";
     package = "/org/apache/maven/surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; }
-    { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; }
+    { type = "jar"; sha512 = "08l0r0s1jhjdgljh26m4i612kf6wqs6g8lwx9n0cccjjzlpn3sxg7dryagwp2gz2g9y5kpdmbpsxmp5imbdak3qrwa56wxrmik16jh8"; }
+    { type = "pom"; sha512 = "3rj97rbbdm0m0f1cpbvw7mc9hc5jmfkqbg1w1ggr640bd8fzrgmxrcynxf440mf0wg4xy55v27g6v5c3z20zlw1h4qi500x6wfm0l5s"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
index 0d1bd53721cd..c7bd2995c3aa 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -8,7 +8,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "0xf4pb0bh2kr3qx1yqav528886fdvsb801mq22hnbs8cbaghgibcb0n8w6rbiyd59y1fmiacyhhcc18ahcxv71531m704w5gydrwx9k"; }
-    { type = "pom"; sha512 = "0w5ryz3kdx6c10bwhbdpic567cf1b4918anncls9gzy89lfc4lj4lnyhapv7lsfp3fzifas618m7mh4pv5gdpjbml3fgjnqcq6895g6"; }
+    { type = "jar"; sha512 = "3ny5b6mnmka3lzyqk03flmizj82c0hdbiqgcqxj7261pvcf2drrk85p5q2z6f2h15w60mhyvl80p39pzqa35ziqhqnp6walg7rdk0hb"; }
+    { type = "pom"; sha512 = "3iagspjgilwhbh5sxi64b2q8dpgrwa0s9wiw2417z2lvghy8knszha62n3j9qvbn7pxy819f2981s41aan6wcwx5scr9sg8jwbvcmff"; }
   ];
 }
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
index 14e6866ee329..806223615124 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -19,7 +19,7 @@ rec {
     sha512 = obj.sha512;
     type = obj.type;
   }) [
-    { type = "jar"; sha512 = "34kxv3l3676ddrsj2k02f9fmphcq16avafka950d5dclrcx7w37wgxx3gcf6zfixfx9zlbb7annsa05y8f0rx97g13rkqdfdj1wknky"; }
-    { type = "pom"; sha512 = "0arkdm0bii7cm0g8qzzfih1jk9j7myn8w2ccr6j01wsj08gv7cbjr5k9jx1iwy1vzvhhsmsj6grq678zsgbvh4msn1s44i744x4fhvy"; }
+    { type = "jar"; sha512 = "37jjcjfx51bszg13wjhkv2spyw1b2n8glgyaaflzfqxmfhizr43y1fq2zhn2khp2jba6avilkqi9p0f2sd30glrg7lpc0srzqns3yn8"; }
+    { type = "pom"; sha512 = "1r6w6za6smam46fpdfda2612ayz4a8gm87lgwa4f5jp5k92mzaj22rcsxlnibzly19vrgvycci63w9rgmzkwi2zvxxwxmf8sc5542c7"; }
   ];
 }
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 7c564037108a..5cd022b68377 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, maven }:
+{ pkgs, stdenv, maven }:
 
 with pkgs;
 with pkgs.javaPackages;
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix
new file mode 100644
index 000000000000..e831df44732c
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/archiver.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusArchiver_2_1 = map (obj: fetchMaven {
+    version = "2.1";
+    baseName = "plexus-archiver";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0xwsvld0s5p4abk5ain2ya3zbz97bkk8vzjdrmfrly3mwfbxp7lyjhshxqnr58m7kan6l0vygv7lsnyfg0yyxmnj8f5nwvssgxm1izx"; }
+    { type = "pom"; sha512 = "3rrwjlrwsl9ba7dyf5vp5r1pfvfmk4vwwpyq52yrmrv22djlh4dmbh1r97aizmrf17qbs7995vmcxs83ybpc62263dgxx1qa7c85hy1"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix
new file mode 100644
index 000000000000..44b5ff3441a7
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/classworlds.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusClassworlds_2_2_2 = map (obj: fetchMaven {
+    version = "2.2.2";
+    baseName = "plexus-classworlds";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0w6mhv2xjafqr45zx5fwm8iyp8kabrdvyx91qxwy04k71ah6zxzqx1l8ppq7xma4r40lpp98valr1ydgfm1cay87j1kbdgaw2j48vns"; }
+    { type = "pom"; sha512 = "12kxa236gg61gs6cshgwnsj0yfpywcb606j10l9hflp951vxvlcwpcdh1nlpir0zyqj7rnk5g8609grwahq2m62fs1ymqp8db2rqi56"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix
new file mode 100644
index 000000000000..e3f4defd97ad
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/compiler-javac.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusCompilerJavac_2_2 = map (obj: fetchMaven {
+    version = "2.2";
+    baseName = "plexus-compiler-javac";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "12xsiaqd1q6mmmkcsxf4nr4wdjl8fa1nwz32yqwrrbj9cgakph0368cnk1apjzngsmnl6bws87nlxcz64sg0rb7i2vdzggplj0a41br"; }
+    { type = "pom"; sha512 = "1fv2ij4h9xmzv3f5mvs0ilhkw7khkw5v8n1d97a2canfn254fipz7pd9nkmkqzjvy3cqwiczyh2nzibvcii624p8ggwl4s3yjw92jx4"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix
new file mode 100644
index 000000000000..0675fff5004e
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/compiler-manager.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusCompilerManager_2_2 = map (obj: fetchMaven {
+    version = "2.2";
+    baseName = "plexus-compiler-manager";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1r1sdj784x4zcnkaz840vsz36jn1p2j98c21nia56kcdl1njydjn714bsmdy816l6sdinkz4s196mm3hshmxhq8mkmf16wgxx8jnq94"; }
+    { type = "pom"; sha512 = "3cpfnbgil6g0bgq0cjbq2ysfjdpl05fh72d9l9cnwbilcsaxcmzn1hgmmkvam2ih222nl82dy7n5020is3y05kiv0i4n4lcs5m0ia48"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix
index a720c06a186c..4b9949f3eb3c 100644
--- a/pkgs/development/java-modules/plexus/container-default.nix
+++ b/pkgs/development/java-modules/plexus/container-default.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven {
+    version = "1.0-alpha-9";
+    baseName = "plexus-container-default";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2niq80yyq5kaq4qbmqsbibz9i1b6xqrfwy6iabddx9lwacsrq3a1qwh1ih877vk6dcgq8gbi0ahx19x95vwvbpp7449ja4wml5xmag2"; }
+    { type = "pom"; sha512 = "144xr23kq2ljhzzvac6w2s120s96jfaccaishb9lqmrx0a8gkq949ccyf3qmv6srryflsqc0sksl7rr3294iwjgwj04xidhd8c5jycd"; }
+  ];
+
   plexusContainerDefault_1_0_alpha9_stable1 = map (obj: fetchMaven {
     version = "1.0-alpha-9-stable-1";
     baseName = "plexus-container-default";
@@ -11,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "1dpzdijx7xb3kgv2ybias3shzvpsq82w6x1ig5gdkg0i47m6a1ld53bi3gjczdpn88xparp80jkqlacjb65764v05ps6zg0v3vr1dkw"; }
     { type = "pom"; sha512 = "1gnm9ivwrkr3aqpnmdl34hkx53189wxj9acp2fms8inhznrxqcyyk355gpgzwvs9qpgdis1q88mj1fy3x1v3ffa3b6wi758p95q79jc"; }
   ];
+
+  plexusContainerDefault_1_5_5 = map (obj: fetchMaven {
+    version = "1.5.5";
+    baseName = "plexus-container-default";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3f6qyisir3k7aa627fqh0q98zvfc4hz8xq1rzjgqjhgv34m2x8kgwfxvlcik5v7724gjj41vjvs909xw7l0v80ryhvl95r35ndqzvzy"; }
+    { type = "pom"; sha512 = "2axphhx8xiii80gbf9gmm6qrm6m4ws4fbdcmghzfsn1yvmmjsj7x1c15g5mkq0lhh0skscibqifsxh44qix21qfkxr532681jh5qq5h"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix
new file mode 100644
index 000000000000..8bd73891779f
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/digest.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusDigest_1_0 = map (obj: fetchMaven {
+    version = "1.0";
+    baseName = "plexus-digest";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0r343fhzhfdnavsjbl7jnxgdw64wsfzyk4q7l3m7s5wx3b8mxnizyg1r4fwb59bd8w8hw6x8l0nxrk16a9hnkhrdmnc01hyb3ra7irk"; }
+    { type = "pom"; sha512 = "1z7nqj2qa82g8dgd4jzmankz3hkh4r8y1q0abd37kwsx54ij681d46z916w009mq232jharynypg3682ds47jxxnqsmpm9k22i7fgib"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix
index 17660f0804c5..2d08495532d1 100644
--- a/pkgs/development/java-modules/plexus/interpolation.nix
+++ b/pkgs/development/java-modules/plexus/interpolation.nix
@@ -1,6 +1,28 @@
 { fetchMaven }:
 
 rec {
+  plexusInterpolation_1_11 = map (obj: fetchMaven {
+    version = "1.11";
+    baseName = "plexus-interpolation";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "064lk1i6x9jj0yaiw2j1738652mxwi6qavagi364dj0pyg65pp875hs6qv1kc4gpzk60ksr99mg49mhb216p0lim83xshrxqj9i5j2w"; }
+    { type = "pom"; sha512 = "2laqd4iv9mj4r7kdm0zyc07pyi04p1svb27fdzm2w4y3kmi4z5h2cg39rpn6slf8wmfnk3zlcj3w662sm1fy47qzdjwkkjil0fgv3m3"; }
+  ];
+
+  plexusInterpolation_1_12 = map (obj: fetchMaven {
+    version = "1.12";
+    baseName = "plexus-interpolation";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "239qj01vsvn7rxm67z15lgc4nc6lqas3fkxx8an5dddzsdjh7vm99ya576abwzngcm4ckz5d0dk7qx9rgsz6b9rwjq3zvqahmaw2h7a"; }
+    { type = "pom"; sha512 = "1jpkc2q1i325vscq9ryww1ip7vgpbzcwv23ks18b33gdxpkw25kfzncpcnpdg9fy5jn60fb6jhngxz9mkxnzyl0p3sfkkarwcmcx881"; }
+  ];
+
   plexusInterpolation_1_13 = map (obj: fetchMaven {
     version = "1.13";
     baseName = "plexus-interpolation";
@@ -11,4 +33,15 @@ rec {
     { type = "jar"; sha512 = "0sm1kaxsvn8007br7nr9ncjppmfkp8nzr6ipwwx86idai9bqcsm4kh2scxf893s4jf2ii7f5106dd5w4h7bw67csalhqqzi1zpndbk4"; }
     { type = "pom"; sha512 = "3hlv9l82yxjbnaf2vqq6p3w38jq2id15a2yjg6wj810fl2286zz5ci3g3x7x0z0xdrxrrfvswns92v25197vpg0dki113lwdbw4bsvr"; }
   ];
+
+  plexusInterpolation_1_15 = map (obj: fetchMaven {
+    version = "1.15";
+    baseName = "plexus-interpolation";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0a3bvnmawbnqyva73pcz6mwwd9qsy2hrhjn708qmcplv7n21h06qyvzm5advlrrbqf7k55140vdh6nzvzlwvbw3ksbchdh4r85a9i4j"; }
+    { type = "pom"; sha512 = "20z12w94g7pdmps9k3in3wmhirbz1qpgymfjpr5zx66kdiarj32b2akz28f5gr037zr3k3v366v3k3l694dx42rqhhwmalralybsj6a"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix
new file mode 100644
index 000000000000..1b17ae3c2cac
--- /dev/null
+++ b/pkgs/development/java-modules/plexus/io.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  plexusIo_2_0_2 = map (obj: fetchMaven {
+    version = "2.0.2";
+    baseName = "plexus-io";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1z1il2fj5vr20g4aadwc0wkx117gffh8ql38i6ww5ldv9lppq81wmbsngj9vw434viy1rjifmwrx0ia3k66plqi3w63x86igq7ka0hk"; }
+    { type = "pom"; sha512 = "3wlqpr3b8gw9kphnqkwbxmd5pmis9wkp31biqaa6qmib31k3az6qk81fd8bwr6ifpki11fabawzbmg0dnabxig8svg6c49ydgjm3p8p"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index 17dc1acdf1f8..137ac01c02d8 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  plexusUtils_1_0_4 = map (obj: fetchMaven {
+    version = "1.0.4";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3bk54p57k27fy0gdqbagscp0qqhpb116ds8jw9vcqncl3x31xs1fp0d59pjylc62h9r9g4jp068v0b116n00ljrfjfsnvnknnnlahmd"; }
+    { type = "pom"; sha512 = "35mm9fkfw1wljabr4lz6l5mq3mxgl7k87whlcz5qlddsbxy0j69j4xgf1fvjlyp06nqq2wz574v54aqpxgp8s6jwjyz9wyvqvsyka8d"; }
+  ];
+
   plexusUtils_1_1 = map (obj: fetchMaven {
     version = "1.1";
     baseName = "plexus-utils";
@@ -12,6 +23,28 @@ rec {
     { type = "pom"; sha512 = "0vbzdfsdcc4cq7hdqzb1vdfxp23vnavq7z4qmmlb4d4fiqj5wqdgagrs43gl7yzca2azpyj3kyxgaipimi7gck07jcsz0pzljkplk4w"; }
   ];
 
+  plexusUtils_1_4_1 = map (obj: fetchMaven {
+    version = "1.4.1";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "33b5mg4y3a57dfh41v2wimmvc9fqqh8dhihyd1hqg0lif40nnfc7yhypj1lr2ik95vd1vn6jghv0fi4pkzkbr7vb463gl6kz4yra2fk"; }
+    { type = "pom"; sha512 = "00h4r4l6isrks402minrpmm0shx8mxhkc31dbfcm86r220vl0bbgxw9mfqqc2ldjh7wkwcd0xp236kxwphxcrajiayxgvp7xgqnvfvb"; }
+  ];
+
+  plexusUtils_1_4_5 = map (obj: fetchMaven {
+    version = "1.4.5";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1f20xhp8jnkc70fy6b0fbhb16pvbwp83k4dwwar4r5570yn24j09iqlk8bhz6ra8pnkh0jz0idg61wrlz9mghzbmgdn6f2dj25dzr8s"; }
+    { type = "pom"; sha512 = "0liqhpc9pn81vn04qz4j3101jc33hygb415jnwpf0dhph3jay88l49gd9s1bwq6x4npn2v6863vidb8hdh5f8wd20k6m1lqhdpv882j"; }
+  ];
+
   plexusUtils_1_5_1 = map (obj: fetchMaven {
     version = "1.5.1";
     baseName = "plexus-utils";
@@ -23,6 +56,17 @@ rec {
     { type = "pom"; sha512 = "161cdrgjrw2cab4lf189hwa4s1lh42fsahjcjkir696sx0m9bmmxgjbhwxl1l8kpaxn5p6jf701bx16gry393pws636vy59nvnnx1sw"; }
   ];
 
+  plexusUtils_1_5_5 = map (obj: fetchMaven {
+    version = "1.5.5";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1ygv6mcv07kb0z8hrg98xg0sr0qqyf1v3snki6j3pn8wwn5bl46j8l70c7bpcv2jf623jn7g8gbkvjl9m04v23v3jlcc106cicbgx3v"; }
+    { type = "pom"; sha512 = "29knasqhkvjif27gm3ycqhc206ycgc9920mccw7biybxmiqqajyfvv74f02sqpavlk5h6l45cfb20bmldwfznvzz9bw4zhvc12s9y5h"; }
+  ];
+
   plexusUtils_1_5_8 = map (obj: fetchMaven {
     version = "1.5.8";
     baseName = "plexus-utils";
@@ -34,6 +78,17 @@ rec {
     { type = "pom"; sha512 = "06z4gkq3bh2pwyj8pvaly9fihd8gbgcqp3jxl05vkj2rcdb4jw3lw3hwn8f8ggqi17i2fdm8cbndkqgr9vdgiz45p8f1nx8kjlqikbi"; }
   ];
 
+  plexusUtils_1_5_15 = map (obj: fetchMaven {
+    version = "1.5.15";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0sya2d7nml8is8dfykyg7va1556ldnxxr90xynq9w5ghw8w8zz69hjhy5al91m4if11kc64d4ysssqqs6s83lxs75c0kipr4byn90gc"; }
+    { type = "pom"; sha512 = "3ax5sy7x5l7c3qxj4vn4fyak0s6d7m2hbv2r79z5mr7hf0wp29jvg9jjlb8x6mdrg9q0i363j32b4mrvbxcdq7i128sqgc80c5jczdk"; }
+  ];
+
   plexusUtils_2_0_5 = map (obj: fetchMaven {
     version = "2.0.5";
     baseName = "plexus-utils";
@@ -66,4 +121,26 @@ rec {
     { type = "jar"; sha512 = "16m1khf9fafb9f79rbz93qgc35d8605v1qbs4ywnj4sk00d00d6n1649cc9rv593r8ghwd0rkz345z7wb00fagdr9af5h8h5w5blsa1"; }
     { type = "pom"; sha512 = "123fsmm1jvy571yl1s3wp7yd5k52nfjqxzqpzx2940rsigm35rw2mx1g4bvr3wx0gv5bqlfmqj5cwdhhxdq5vzrax8z5vbmdg5vb77r"; }
   ];
+
+  plexusUtils_3_0_5 = map (obj: fetchMaven {
+    version = "3.0.5";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2b7l2xwn606nn227fiqg47y4cda6apr4nv618f5swjnsji0gifw4dz4a9xyb7p0iy27igkj0j2l6kp3y4fc0vhvi7wn07zfcckswiyf"; }
+    { type = "pom"; sha512 = "264k562pvd1cyh5danf56iyay1a661d15rywwq12fd3v8k7p85kl9b9ykqa5hssqkkixrv4gmhy6nkk5dhy5whbmlan99h6w6q0pjyw"; }
+  ];
+
+  plexusUtils_3_0_8 = map (obj: fetchMaven {
+    version = "3.0.8";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3745x0zvidknkzsl4p049c0qj0iv19ga9x9mfskl93r97nx7ip6qnwa9a0v9y3s5sy2klhlfg5dyyjnhr822529cv1p2dhlh46brknn"; }
+    { type = "pom"; sha512 = "1p1l437rwpxv9jfygr25b455xymqcmm4smin1bf7fzcmgkc3m7k0gdd7rfvfg2622070rmwjbk4fgv0z3alf1xz03ksjp6s0gr6sqr8"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 18944e27a865..2b3f28613999 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -37,7 +37,7 @@ rec {
     version = "5";
     baseName = "apache";
     package = "/org/apache";
-    sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6";
+    sha512 = "11l6b46mwm404vahylssab5mj4a1fw3zrjhsz3mcj5x3awnqa03131j8phias2n0rppn53xcg2p2xgr9mbp7llwabwx8jm0kz2mpgh0";
     type = "pom";
   };
 
@@ -53,7 +53,7 @@ rec {
     version = "9";
     baseName = "apache";
     package = "/org/apache";
-    sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6";
+    sha512 = "0wak95l7zlizrildiji9763zzs10dmhflxaqzg8r9qw2j8a20f2nmns03skvd8na2p12zzvrxa15p952gdfkvrynmvcv2vi1qz822g9";
     type = "pom";
   };
 
@@ -81,6 +81,14 @@ rec {
     type = "pom";
   };
 
+  backportUtilConcurrent_3_1 = fetchMaven {
+    version = "3.1";
+    baseName = "backport-util-concurrent";
+    package = "/backport-util-concurrent";
+    sha512 = "38i04cb0dggdjjsvl32wpxfbczl1d696nlpzissjlq9ya197rwa0g0704p7vz71xsylvpdjssb0cyx916xsigcyb95k8c84b2hmdhvr";
+    type = "pom";
+  };
+
   beanshell_2_0_b4 = fetchMaven {
     version = "2.0b4";
     baseName = "beanshell";
@@ -97,6 +105,14 @@ rec {
     type = "pom";
   };
 
+  commonsParent_22 = fetchMaven {
+    version = "22";
+    baseName = "commons-parent";
+    package = "/org/apache/commons";
+    sha512 = "1sm8g7iwyc5gi4w73yx3p1f1l81kw8d5wzqzqgdgy7k7hfvmsxlm5r9n99h9r0g5y494ad46hjzf8cwjf8am4rv0qzhrmsqkxyd24wk";
+    type = "pom";
+  };
+
   doxia_1_0_alpha7 = fetchMaven {
     version = "1.0-alpha-7";
     baseName = "doxia";
@@ -129,6 +145,14 @@ rec {
     type = "pom";
   };
 
+  googleParent_1 = fetchMaven {
+    version = "1";
+    baseName = "google";
+    package = "/com/google";
+    sha512 = "22whj7li6dvh4xjcdx1hwlh13ar8c8d9snal6ynnbsd566n9g0kif2fx75q5j4kwmqzb2yj3c3vxdfzg82650gkyvjm2x6cb35vdi30";
+    type = "pom";
+  };
+
   hamcrestParent_1_3 = fetchMaven {
     version = "1.3";
     baseName = "hamcrest-parent";
@@ -137,6 +161,14 @@ rec {
     type = "pom";
   };
 
+  jclOverSlf4j_1_5_6 = fetchMaven {
+    version = "1.5.6";
+    baseName = "jcl-over-slf4j";
+    package = "/org/slf4j";
+    sha512 = "3ync9p7ws4p8p494jifarwpqblmbkkl6r6rw4bms8fk6ija0ifxn6q5za3pxvp690p5lzw2zkgidr51rqxk8w1ms69pb1nib1r4j578";
+    type = "pom";
+  };
+
   maven_2_0_6 = fetchMaven {
     version = "2.0.6";
     baseName = "maven";
@@ -157,7 +189,7 @@ rec {
     version = "2.2.1";
     baseName = "maven";
     package = "/org/apache/maven";
-    sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0";
+    sha512 = "1bdf85rb7b3dvw9gjv376pk908jgvb35hs8p6fp4pzp19pj71150if09lmhw07gvy7sdd92daw7jmijmi1f9w4gxhkbqhvzkb7qx1rs";
     type = "pom";
   };
 
@@ -197,7 +229,7 @@ rec {
     version = "11";
     baseName = "maven-parent";
     package = "/org/apache/maven";
-    sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
+    sha512 = "21lz2qb0sl9akirk7fcbj7ldfgnq5nqy90s3hfvmfvz2spk1ppa5yq3702m7z72l3jpbm9vrcm4dvarar314lwjp3477p558gwcpkqf";
     type = "pom";
   };
 
@@ -205,7 +237,7 @@ rec {
     version = "13";
     baseName = "maven-parent";
     package = "/org/apache/maven";
-    sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
+    sha512 = "0vgjwpmnvcjfif84s5x19ixlxg4413mfma9f10v7klv88b08vwvkpwjnffgzrlqvp5524d8zyswshqkwpdqb0klgppxiipd52d546vw";
     type = "pom";
   };
 
@@ -269,7 +301,7 @@ rec {
     version = "3.1";
     baseName = "maven-plugin-tools";
     package = "/org/apache/maven/plugin-tools";
-    sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs";
+    sha512 = "2410rvvhnpwdg67slwb05v7vnpbvq00d36mbsc77parw4v9n3sr1hqai803g8q54lzv05zzcm7knkjv5ip5wcbvzrh0dr4f5lm904wy";
     type = "pom";
   };
 
@@ -293,7 +325,7 @@ rec {
     version = "12";
     baseName = "maven-shared-components";
     package = "/org/apache/maven/shared";
-    sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy";
+    sha512 = "1x5q96gigd54qp60i20kvmwi604ga55fc70gkz1nwn5fjmy36rlxldhhdij3kcpnxpwqp4dwxq717ai8rqv3lzjif8pxd06wzmz0q09";
     type = "pom";
   };
 
@@ -337,6 +369,14 @@ rec {
     type = "pom";
   };
 
+  plexus_1_0_8 = fetchMaven {
+    version = "1.0.8";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "1nwv49smddfvqn1fhi8aj993pkzsxa033a9g97z7sc3aia5wzwz86azzyrklgxywc26c3k3mw8vfzv758rv3v7cn0hfmyfzfkrg8vwp";
+    type = "pom";
+  };
+
   plexus_1_0_11 = fetchMaven {
     version = "1.0.11";
     baseName = "plexus";
@@ -377,6 +417,30 @@ rec {
     type = "pom";
   };
 
+  plexus_3_0_1 = fetchMaven {
+    version = "3.0.1";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "3rjh4msw1qjpj0vmc90f89zjkzcyahzh93jrpw25qb2wn0v18jgw65g0ai7ynssdh113kxi816syqcw8vbqwvhlr2b0acrmszy0jnps";
+    type = "pom";
+  };
+
+  plexus_3_1 = fetchMaven {
+    version = "3.1";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "1zyyzy6zvf73bnv8c76x2lmffllqqrgk1k8kpravcrd809acfslip1w7w8kr0rg3sc7554875wsq8fbhq3zdvxwjpzwgz4l5rjr3lmr";
+    type = "pom";
+  };
+
+  plexus_3_2 = fetchMaven {
+    version = "3.2";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "07y1vwz55l9yzfhix5w5fw5xvdj854c1ri1wws6r23xzyp5bqwrrz0x5ln26w05w78vpj1rvrq1mkk192vfr80si3ccr063aschf6ld";
+    type = "pom";
+  };
+
   plexus_3_3_1 = fetchMaven {
     version = "3.3.1";
     baseName = "plexus";
@@ -385,6 +449,14 @@ rec {
     type = "pom";
   };
 
+  plexusCipher_1_4 = fetchMaven {
+    version = "1.4";
+    baseName = "plexus-cipher";
+    package = "/org/sonatype/plexus";
+    sha512 = "1m4f7n6ch8gbwgvz7h8iab0jkan8ws3qq9776qc10k0kj6i3227kskk5s8pxlq9vrxw498jmjnkiga41fy33khrgvsvls2hrj9vv1g1";
+    type = "pom";
+  };
+
   plexusCompiler_2_2 = fetchMaven {
     version = "2.2";
     baseName = "plexus-compiler";
@@ -393,6 +465,14 @@ rec {
     type = "pom";
   };
 
+  plexusCompilers_2_2 = fetchMaven {
+    version = "2.2";
+    baseName = "plexus-compilers";
+    package = "/org/codehaus/plexus";
+    sha512 = "0yvvc8mdz1vd7mpw9h568mhlfxh3qpbz4qpyr5iw7f5ifm46gxsmnfd36ah6mn9hxh6lpra3mi536y5cv1k5mrbr128a1lwyr8p14rg";
+    type = "pom";
+  };
+
   plexusComponents_1_1_4 = fetchMaven {
     version = "1.1.4";
     baseName = "plexus-components";
@@ -401,6 +481,22 @@ rec {
     type = "pom";
   };
 
+  plexusComponents_1_1_7 = fetchMaven {
+    version = "1.1.7";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "2mh1qfbaf6f6nv0nj0g8skgv82jv1l2zg7iivd2jjrzrwnpkc58ajfl1wmylwpz035d9dd713h9szkwy2hdd6pardbc4ja2w4qv5s91";
+    type = "pom";
+  };
+
+  plexusComponents_1_1_14 = fetchMaven {
+    version = "1.1.14";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "2gf578c23wz38cnjnp8w80b6hzmfnzrv6is1yf52qrfcijk84fnj4k8wrqg0jms9yz6l5rkkv40zm2j7kkbxgn862mnh4i4qxcb604g";
+    type = "pom";
+  };
+
   plexusComponents_1_1_15 = fetchMaven {
     version = "1.1.15";
     baseName = "plexus-components";
@@ -409,6 +505,14 @@ rec {
     type = "pom";
   };
 
+  plexusComponents_1_1_19 = fetchMaven {
+    version = "1.1.19";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "01mllmbwfrimvsgmc3wfxp60nm999xa4abp0ywpxdrvbb88dwr4g7sg3mlz22xhc8pky72mif882ppgrdxj01lx3lmm84p3g5f51bii";
+    type = "pom";
+  };
+
   plexusComponents_1_3_1 = fetchMaven {
     version = "1.3.1";
     baseName = "plexus-components";
@@ -433,6 +537,38 @@ rec {
     type = "pom";
   };
 
+  plexusSecDispatcher_1_3 = fetchMaven {
+    version = "1.3";
+    baseName = "plexus-sec-dispatcher";
+    package = "/org/sonatype/plexus";
+    sha512 = "09blh68dwrh3zix33cbfbvmxbbm7ck80pwp9x4v1ilf11y6hgm065jx39viqm0zlr86kwngrlm4skrgjw5v67aj2q7d7kd5jgj5s0qc";
+    type = "pom";
+  };
+
+  slf4jApi_1_5_6 = fetchMaven {
+    version = "1.5.6";
+    baseName = "slf4j-api";
+    package = "/org/slf4j";
+    sha512 = "3ahxd5zfxpwrp97yq74xfhrh02a7hnmcdxk5rwjn4v5hcms9b98iizsgd2ssjxa1vy784jh45f6k8qby1c1bdcwk9y18mkcw79zhl2n";
+    type = "pom";
+  };
+
+  slf4jJdk14_1_5_6 = fetchMaven {
+    version = "1.5.6";
+    baseName = "slf4j-jdk14";
+    package = "/org/slf4j";
+    sha512 = "11yiy09mlm5dq2ir05n97nka3sqwn48k47x4d2vqmgjsk3vz255m8ilxvq5hjjzygyw0prcrp4zbwkphb5his00pw8f4hczd1w16nvr";
+    type = "pom";
+  };
+
+  slf4jParent_1_5_6 = fetchMaven {
+    version = "1.5.6";
+    baseName = "slf4j-parent";
+    package = "/org/slf4j";
+    sha512 = "036cizr5vh557l65jiv706iiy1q1s3lkr1xqa1hd5yspawd111d5iq8q3qdsw07c3rmxq7n9sflgcj08bhs149ni119fdr7hn9cx0nl";
+    type = "pom";
+  };
+
   sonatypeForgeParent_3 = fetchMaven {
     version = "3";
     baseName = "forge-parent";
@@ -441,6 +577,14 @@ rec {
     type = "pom";
   };
 
+  sonatypeForgeParent_4 = fetchMaven {
+    version = "4";
+    baseName = "forge-parent";
+    package = "/org/sonatype/forge";
+    sha512 = "0j13rfddklh25sdwppxvdn97y3l8vy809g2w5zpflh74v0rh0q04ylm3j2nj5hf3ypmgx3lhdp161jbv3l47gl7gh60fk3rnq17kfbq";
+    type = "pom";
+  };
+
   sonatypeForgeParent_5 = fetchMaven {
     version = "5";
     baseName = "forge-parent";
@@ -473,6 +617,14 @@ rec {
     type = "pom";
   };
 
+  sonatypeSpiceParent_12 = fetchMaven {
+    version = "12";
+    baseName = "spice-parent";
+    package = "/org/sonatype/spice";
+    sha512 = "3bx63k5frr99ma5wcjlqlym7qr6x1m031hns35rpvz039s9cxcn8r3f7slwqaa7s19i3j46kwgxirnhs4ylcddql4rsibaqjwy9lh0d";
+    type = "pom";
+  };
+
   sonatypeSpiceParent_16 = fetchMaven {
     version = "16";
     baseName = "spice-parent";
@@ -504,4 +656,12 @@ rec {
     sha512 = "3yraw37xwayyrvwa62y6li3wbzrha08j389psz16j1dawxmg78zlm2x1jmgz3nzdb60n9kk143606bgs3vrf7ri9d5pwkg9lvw7hk92";
     type = "pom";
   };
+
+  xbean_3_4 = fetchMaven {
+    version = "3.4";
+    baseName = "xbean";
+    package = "/org/apache/xbean";
+    sha512 = "2qdd1srj7ahskmxp1cb3gkxgdmy0ms4m5mi43mvfrl085fp58f67ip2y0w4r0xfwzds12727yili6hciiwix9i6hx7wasi5sa9djcp6";
+    type = "pom";
+  };
 }
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index a777d57ec2cc..fac982b5be23 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -17,30 +17,46 @@ in {
     bsh_2_0_b4;
 
   inherit (callPackage ../development/java-modules/classworlds/classworlds.nix { inherit fetchMaven; })
+    classworlds_1_1_alpha2
     classworlds_1_1;
 
   inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; })
     commonsCli_1_0;
 
   inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; })
+    commonsLang_2_1
     commonsLang_2_3;
 
+  inherit (callPackage ../development/java-modules/apache/commons-lang3.nix { inherit fetchMaven; })
+    commonsLang3_3_1;
+
+  inherit (callPackage ../development/java-modules/apache/commons-logging-api.nix { inherit fetchMaven; })
+    commonsLoggingApi_1_1;
+
   inherit (callPackage ../development/java-modules/findbugs/jsr305.nix { inherit fetchMaven; })
     findbugsJsr305_2_0_1;
 
+  inherit (callPackage ../development/java-modules/google/collections.nix { inherit fetchMaven; })
+    googleCollections_1_0;
+
   inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; })
     hamcrestCore_1_3;
 
   inherit (callPackage ../development/java-modules/junit { inherit mavenbuild fetchMaven; })
     junit_3_8_1
+    junit_3_8_2
     junit_4_12;
 
+  inherit (callPackage ../development/java-modules/log4j { inherit fetchMaven; })
+    log4j_1_2_12;
+
   inherit (callPackage ../development/java-modules/maven/archiver.nix { inherit fetchMaven; })
     mavenArchiver_2_5;
 
   inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; })
     mavenArtifact_2_0_6
     mavenArtifact_2_0_9
+    mavenArtifact_2_2_1
     mavenArtifact_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; })
@@ -121,7 +137,8 @@ in {
 
   inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; })
     mavenProject_2_0_6
-    mavenProject_2_0_9;
+    mavenProject_2_0_9
+    mavenProject_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; })
     mavenReportingApi_2_0_6
@@ -156,17 +173,34 @@ in {
     mavenToolchain_1_0
     mavenToolchain_2_0_9;
 
+  inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; })
+    plexusArchiver_2_1;
+
   inherit (callPackage ../development/java-modules/plexus/build-api.nix { inherit fetchMaven; })
     plexusBuildApi_0_0_4;
 
+  inherit (callPackage ../development/java-modules/plexus/classworlds.nix { inherit fetchMaven; })
+    plexusClassworlds_2_2_2;
+
   inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; })
     plexusCompilerApi_2_2;
 
+  inherit (callPackage ../development/java-modules/plexus/compiler-javac.nix { inherit fetchMaven; })
+    plexusCompilerJavac_2_2;
+
+  inherit (callPackage ../development/java-modules/plexus/compiler-manager.nix { inherit fetchMaven; })
+    plexusCompilerManager_2_2;
+
   inherit (callPackage ../development/java-modules/plexus/component-annotations.nix { inherit fetchMaven; })
     plexusComponentAnnotations_1_5_5;
 
   inherit (callPackage ../development/java-modules/plexus/container-default.nix { inherit fetchMaven; })
-    plexusContainerDefault_1_0_alpha9_stable1;
+    plexusContainerDefault_1_0_alpha9
+    plexusContainerDefault_1_0_alpha9_stable1
+    plexusContainerDefault_1_5_5;
+
+  inherit (callPackage ../development/java-modules/plexus/digest.nix { inherit fetchMaven; })
+    plexusDigest_1_0;
 
   inherit (callPackage ../development/java-modules/plexus/i18n.nix { inherit fetchMaven; })
     plexusI18n_1_0_beta6;
@@ -175,13 +209,29 @@ in {
     plexusInteractivityApi_1_0_alpha4;
 
   inherit (callPackage ../development/java-modules/plexus/interpolation.nix { inherit fetchMaven; })
-    plexusInterpolation_1_13;
+    plexusInterpolation_1_11
+    plexusInterpolation_1_12
+    plexusInterpolation_1_13
+    plexusInterpolation_1_15;
+
+  inherit (callPackage ../development/java-modules/plexus/io.nix { inherit fetchMaven; })
+    plexusIo_2_0_2;
 
   inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; })
+    plexusUtils_1_0_4
     plexusUtils_1_1
+    plexusUtils_1_4_1
+    plexusUtils_1_4_5
     plexusUtils_1_5_1
+    plexusUtils_1_5_5
     plexusUtils_1_5_8
+    plexusUtils_1_5_15
     plexusUtils_2_0_5
     plexusUtils_2_0_6
-    plexusUtils_3_0;
+    plexusUtils_3_0
+    plexusUtils_3_0_5
+    plexusUtils_3_0_8;
+
+  inherit (callPackage ../development/java-modules/apache/xbean-reflect.nix { inherit fetchMaven; })
+    xbeanReflect_3_4;
 }

From 5d54cfd7a4474c952faccd24dba10844f8348778 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 31 Oct 2016 13:25:27 -0400
Subject: [PATCH 0026/3449] junit_4_12 part 2

---
 .../java-modules/apache/ant-launcher.nix      |  14 +++
 pkgs/development/java-modules/apache/ant.nix  |  14 +++
 .../java-modules/apache/commons-io.nix        |  14 +++
 .../java-modules/apache/commons-lang.nix      |  11 ++
 .../java-modules/build-maven-package.nix      |   2 +-
 .../java-modules/junit/default.nix            |   8 +-
 pkgs/development/java-modules/m2install.nix   |   4 +-
 .../maven/common-artifact-filters.nix         |  11 ++
 .../java-modules/maven/plugin-annotations.nix |  11 ++
 .../java-modules/maven/project.nix            |  11 ++
 .../java-modules/maven/surefire-api.nix       |  11 ++
 .../java-modules/maven/surefire-booter.nix    |  11 ++
 .../java-modules/maven/surefire-common.nix    |  11 ++
 .../java-modules/maven/toolchain.nix          |  11 ++
 .../java-modules/mojo/animal-sniffer.nix      |  15 +++
 .../java-modules/plexus/classworlds.nix       |  11 ++
 .../development/java-modules/plexus/utils.nix |  11 ++
 pkgs/development/java-modules/poms.nix        | 104 ++++++++++++++++++
 pkgs/development/java-modules/sisu/guice.nix  |  14 +++
 .../java-modules/sisu/inject-bean.nix         |  14 +++
 .../java-modules/sisu/inject-plexus.nix       |  14 +++
 pkgs/development/java-modules/xerces/impl.nix |  14 +++
 .../java-modules/xml-apis/default.nix         |  14 +++
 pkgs/top-level/java-packages.nix              |  51 +++++++--
 24 files changed, 394 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/java-modules/apache/ant-launcher.nix
 create mode 100644 pkgs/development/java-modules/apache/ant.nix
 create mode 100644 pkgs/development/java-modules/apache/commons-io.nix
 create mode 100644 pkgs/development/java-modules/mojo/animal-sniffer.nix
 create mode 100644 pkgs/development/java-modules/sisu/guice.nix
 create mode 100644 pkgs/development/java-modules/sisu/inject-bean.nix
 create mode 100644 pkgs/development/java-modules/sisu/inject-plexus.nix
 create mode 100644 pkgs/development/java-modules/xerces/impl.nix
 create mode 100644 pkgs/development/java-modules/xml-apis/default.nix

diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix
new file mode 100644
index 000000000000..0e4d7b26765c
--- /dev/null
+++ b/pkgs/development/java-modules/apache/ant-launcher.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  antLauncher_1_8_2 = map (obj: fetchMaven {
+    version = "1.8.2";
+    baseName = "ant-launcher";
+    package = "/org/apache/ant";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3h1xmlamkh39lz3dgpbyxj0mai9a266qmxkcyb7kqpzkl0xxvgyi8i2l4nnn02n4qbxznhmvsba77v52ldh67qmhxk3vw1q3xqnn2xx"; }
+    { type = "pom"; sha512 = "3fvz9di9lbfgy5370gwwdp2d380gl42sn44kr97l8i7k0n9crrbjrxs2dpy9cnsnnavvk14nrrkc72n9f1gkg1dvdxqpxlwm0y9lxhy"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix
new file mode 100644
index 000000000000..fa83663f5ec2
--- /dev/null
+++ b/pkgs/development/java-modules/apache/ant.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  ant_1_8_2 = map (obj: fetchMaven {
+    version = "1.8.2";
+    baseName = "ant";
+    package = "/org/apache/ant";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3x9m09i4kn57avkjbz57v1chx0356lp4mz77adslcbmr59gxfs3km1f4dq3lm1nxspldwxqk654yzh5sgrcfz13r1zlg3bvlsjbb1bs"; }
+    { type = "pom"; sha512 = "2h8ajn6x40cn8cicx3h167blkv9p6478l610xrp2n1k1zlfnh1rz2kcsi74gy7psb4h98118p3zp90gvw4h8gsphz1n30f3c96qnpiq"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix
new file mode 100644
index 000000000000..612dcb85f8e1
--- /dev/null
+++ b/pkgs/development/java-modules/apache/commons-io.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  commonsIo_2_1 = map (obj: fetchMaven {
+    version = "2.1";
+    baseName = "commons-io";
+    package = "/commons-io";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "30bzhsnn2vhi3wfmkas58spl6sxvl9rvwkzaqf9z1lr3iz4iym6x1xgspgq1dvy7pwr7ajny1dfpj1l6vzh7adqm2b4pidjf2w00fp2"; }
+    { type = "jar"; sha512 = "14b2kcjsn12cnrl1qc7v7r48m9vmpw5h9jljhsx58ac8xrlb8g6l71j9lnhp8cf8vc3jwz4drrwn4l9p3r5sk02cparl3h2r0y4cp2c"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index 8987823e4705..f6dc6b407efa 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -22,4 +22,15 @@ rec {
     { type = "pom"; sha512 = "0i94xb3fgq0ig0aids9r1h1kblhlf762gsjxh422ra23saa4474q4iywgfk596bpcflngf2sarq8ch6lw09p0g43779d23b74bd939n"; }
     { type = "jar"; sha512 = "1f30pryvd39m2yazflzy5l1h4l473dj8ccrd9v8z8lb6iassn4xc142f2snkzxlc7ncqsi6fbfd3zfxsy8afivmxmxds6mbsrxayqwk"; }
   ];
+
+  commonsLang_2_6 = map (obj: fetchMaven {
+    version = "2.6";
+    baseName = "commons-lang";
+    package = "/commons-lang";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "2b3yp5bawbh9b0gh56g35x03swrjv2c5jpvwjwric7ywadaf4p6cw1kmabldmi0y3rja5cypz7gfdm1pwdrpr9lmi48ijjssimmgsh1"; }
+    { type = "jar"; sha512 = "11gnsj6c1rz61j19wnr0j5rbdnl63hq9axwm7wwampmdq70n3m1szbn014phl8y3nccvrq2ifcgwb48q6jwqs50rki4bij196z3snja"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index a056953f9ab3..203fa88aa00b 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -26,7 +26,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 clean install -Dmaven.test.skip=true -gs $out/m2/settings.xml
+    ${maven}/bin/mvn clean package -Dmaven.test.skip=true -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
     cp -v ./target/*.jar $out/target/
   '';
 }
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 8304b1a8a01b..5418679b78fe 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -2,7 +2,9 @@
 
 with pkgs.javaPackages;
 
-rec {
+let
+  poms = import (../poms.nix) { inherit fetchMaven; };
+in rec {
   junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
     inherit mavenDeps sha512 version;
 
@@ -48,7 +50,9 @@ rec {
   ];
 
   junit_4_12 = junitGen {
-    mavenDeps = [ mavenPlugins.animalSniffer_1_11 hamcrestCore_1_3 plexusUtils_1_1 ];
+    mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ])
+                  ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenProject_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_1 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
+                  ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 beanshell_2_0_b4 codehausParent_4 commonsParent_17 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenSharedComponents_11 mojoParent_32 plexus_1_0_12 plexusComponents_1_1_4 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]);
     sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
     version = "4.12";
   };
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
index 56ae8132c61c..88e8efca1a15 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/pkgs/development/java-modules/m2install.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl }:
-{ version, baseName, package, sha512, type ? "jar" }:
+{ version, baseName, package, sha512, type ? "jar", suffix ? "" }:
 
 let
   name = "${baseName}-${version}";
   m2Path = "${package}/${baseName}/${version}";
-  m2File = "${name}.${type}";
+  m2File = "${name}${suffix}.${type}";
   src = fetchurl rec {
       inherit sha512;
       url = "mirror://maven/${m2Path}/${m2File}";
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 2b72293ac939..3949882f98be 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven {
+    version = "1.2";
+    baseName = "maven-common-artifact-filters";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "33g4qwxxnwdzx8h5xh5gjx8ijy6cmc5iyv0jgn70hvz1zqnilr49ibzjnichyb3m77zma30zb1njgw7fbnlx177ph5h2w0radkh3m88"; }
+    { type = "jar"; sha512 = "1z55x8hrb9g4kk21jsk9n4r26ncgsxinr18nmjgxsrcbaxcjhxbhx3nin24gwvcy6zh2d6gv26dng8i90ccc1qxvpmga2ahk68jfyjk"; }
+  ];
+
   mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven {
     version = "1.3";
     baseName = "maven-common-artifact-filters";
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index 782e3e141006..6bd8928cf0fe 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -11,4 +11,15 @@ rec {
     { type = "pom"; sha512 = "2q1y622vaks1y2qjbq4005jmi41hpkivsrnmkf5kr3zndz4d6ai47d90jwr70pby8xqqsj461baljcjsicl6rrbq0v9ppyryr13q828"; }
     { type = "jar"; sha512 = "1jd8b32kl9kh4dxpdg5i9qf3haqc5br0mz8bl1ri4hb9qgwkzsijvx6jr7pv9zgplanwvgca3lhpgzsgs03n8jlqnbxbmgsv1pl93zb"; }
   ];
+
+  mavenPluginAnnotations_3_2 = map (obj: fetchMaven {
+    version = "3.2";
+    baseName = "maven-plugin-annotations";
+    package = "/org/apache/maven/plugin-tools";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "0ggvy7xhlgbpb7abc7vj0bhdqzfc6x0d4ldj7bl8qyi0qhv404qlfy4iqhn5jv3qwmj2pp9w4fa9jv5vsaz6yh8hpkzgdbpcwxdrmb9"; }
+    { type = "jar"; sha512 = "2j2lrm2dlikbpncz20r4yxhyi7h5dnhkxalvkih35m7fz57csbgd53whq969hixpfhyj18svd6695a3v4bfa94hg99mw78lzq8lwb37"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 880f821f76c3..25911fcdee81 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenProject_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-project";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "09dyyxwyjlr9q65r8zh7bsf41glpqxc9b6902s2s1clrs98k672kg04vq4fn569vx6hishna3kpxk8y7q5k5zpfy3g9wqsxcxhbqznx"; }
+    { type = "pom"; sha512 = "2fl4dl48cni9hqx0i7arrylcs028vymvmsa0wncbsz37g2gsxq462lqqd1swhgjnjqn1g6386rh6wq6j9mhpbm8kf741aypz9sf33wm"; }
+  ];
+
   mavenProject_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-project";
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index e7a561814e4b..cd422bbb7585 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "0chjp4jpfrhd99mpvh6v4sz71wgg8r0nyv8j2mgbsxsvbf0wha0za5g5bv16l4pflfigd4rhb2h1mkz51pb71qli8w39ycb3dw4lfpn"; }
     { type = "pom"; sha512 = "28ra2n9ln8nb5j1xh6mnxc4kfabnvyqyrgy2wwm66pxhp1fxxxqz1izfvih9jzr3cps7pbvqwql770i14cfyjzvl0zccjsscsjyy50r"; }
   ];
+
+  mavenSurefireApi_2_17 = map (obj: fetchMaven {
+    version = "2.17";
+    baseName = "surefire-api";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "319kkasis86cqimkvsvmry60sj9m1f8vmhawpa8a56arqxfiqifnjiqfppydzlm3hlk8m4qgx3k5s291acbrv05297db8qbcrb2n688"; }
+    { type = "pom"; sha512 = "0p0yc6sq26jsa19iiqy8d0mw3q0i1jmqz21m8fp855i8q07iyqbd1lmzasfdbblki52fdyk986mdw26yhznkr29hgpy8qv7f0l6a5pz"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
index 8f4d79a9807e..f7fb8068a26c 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "08l0r0s1jhjdgljh26m4i612kf6wqs6g8lwx9n0cccjjzlpn3sxg7dryagwp2gz2g9y5kpdmbpsxmp5imbdak3qrwa56wxrmik16jh8"; }
     { type = "pom"; sha512 = "3rj97rbbdm0m0f1cpbvw7mc9hc5jmfkqbg1w1ggr640bd8fzrgmxrcynxf440mf0wg4xy55v27g6v5c3z20zlw1h4qi500x6wfm0l5s"; }
   ];
+
+  mavenSurefireBooter_2_17 = map (obj: fetchMaven {
+    version = "2.17";
+    baseName = "surefire-booter";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1x8nldyxzx56an3zskbq40i3aq4sp21jlnybmrd6pjzf4c3pgrd8qsxkvz23pxyfzvskpkgmibfpshng9qk18c5dm2h4n5sljp1ayni"; }
+    { type = "pom"; sha512 = "0w2ql9a70ncdvzicv0947q8jil4ksha42xxswqk1aas1bsg7qwpg8v4pih887y4zirnl861qaw6d1v09l1s3jqq7hxid0w3jxnlcasb"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
index c7bd2995c3aa..4e56b0c5a86e 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "3ny5b6mnmka3lzyqk03flmizj82c0hdbiqgcqxj7261pvcf2drrk85p5q2z6f2h15w60mhyvl80p39pzqa35ziqhqnp6walg7rdk0hb"; }
     { type = "pom"; sha512 = "3iagspjgilwhbh5sxi64b2q8dpgrwa0s9wiw2417z2lvghy8knszha62n3j9qvbn7pxy819f2981s41aan6wcwx5scr9sg8jwbvcmff"; }
   ];
+
+  mavenSurefireCommon_2_17 = map (obj: fetchMaven {
+    version = "2.17";
+    baseName = "maven-surefire-common";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2ikw1ddnxxfglb3k4920lfr8ziav5n2wp13452bxyd1gbhpwkq0js58wy9jbhyzqgdblqhfj3syxka0mxd4vngyg4iqw3c2phslmn6i"; }
+    { type = "pom"; sha512 = "1l2dkbzbi80bjsh4ri6gxw84iwzsm5g6mmhrj1ndrsr66d4cg7vg5nfyqxvf7xhzwj45768y5id09r70zijliavpsxrvjq5j0g05yb6"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
index 806223615124..97ea74a5e529 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -22,4 +22,15 @@ rec {
     { type = "jar"; sha512 = "37jjcjfx51bszg13wjhkv2spyw1b2n8glgyaaflzfqxmfhizr43y1fq2zhn2khp2jba6avilkqi9p0f2sd30glrg7lpc0srzqns3yn8"; }
     { type = "pom"; sha512 = "1r6w6za6smam46fpdfda2612ayz4a8gm87lgwa4f5jp5k92mzaj22rcsxlnibzly19vrgvycci63w9rgmzkwi2zvxxwxmf8sc5542c7"; }
   ];
+
+  mavenToolchain_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-toolchain";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "02ya75k4n4w62s9p5y1mq758s33s6vqcqli77hknr4wn22rr5fgaax8qscdnj90w3y6rkr6w0afiw438wr4hxwns5vp90fkzym87bp6"; }
+    { type = "pom"; sha512 = "1iv6k0pwyq2w5l4gfkmh818mrja0il48sajmgnpnn7ayi2238mbja07sqccm75wmzapb4039p7xq2jfp0vm41y3s00410gq3jgnf2pw"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix
new file mode 100644
index 000000000000..b6a5565f6fc5
--- /dev/null
+++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  mojoAnimalSniffer_1_11 = map (obj: fetchMaven {
+    version = "1.11";
+    baseName = "animal-sniffer";
+    package = "/org/codehaus/mojo";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "36qx2q1zaja470zj7w3ygafb5n07vb623yicgwjqf1nak7ianin5nlmh7pp2pzpdd9arvg7d005rnsn79bqmxcb6y1ihsxsh6l7bmsv"; }
+    { type = "pom"; sha512 = "1dp427c8vyiw255193s4m0ffag6ngqxfkj1cwl7v40p5c1bh8avxaj8cg56nn8ajp39shxr5wgwgjs7xwjz46yjnblh9pl29z58lm4i"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix
index 44b5ff3441a7..308287a29048 100644
--- a/pkgs/development/java-modules/plexus/classworlds.nix
+++ b/pkgs/development/java-modules/plexus/classworlds.nix
@@ -11,4 +11,15 @@ rec {
     { type = "jar"; sha512 = "0w6mhv2xjafqr45zx5fwm8iyp8kabrdvyx91qxwy04k71ah6zxzqx1l8ppq7xma4r40lpp98valr1ydgfm1cay87j1kbdgaw2j48vns"; }
     { type = "pom"; sha512 = "12kxa236gg61gs6cshgwnsj0yfpywcb606j10l9hflp951vxvlcwpcdh1nlpir0zyqj7rnk5g8609grwahq2m62fs1ymqp8db2rqi56"; }
   ];
+
+  plexusClassworlds_2_4 = map (obj: fetchMaven {
+    version = "2.4";
+    baseName = "plexus-classworlds";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1299qgrf60pz9a40wccb1376wibk99rf79x8dw9z2c97gyzxb3narkpna3fk9wqs7a89p18d2b7zi7vxr3wcdhw6n8saxggz44w9gpq"; }
+    { type = "pom"; sha512 = "1g2xisql030wjb8kvrfp0qcip2b4jbf4islmxa0k1fvjyrzms5babgdpx7m75g29dl8s649z8fb90wrrqc7g14y9g74lydc9i6rd2q5"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index 137ac01c02d8..2cfdd60ccae7 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -67,6 +67,17 @@ rec {
     { type = "pom"; sha512 = "29knasqhkvjif27gm3ycqhc206ycgc9920mccw7biybxmiqqajyfvv74f02sqpavlk5h6l45cfb20bmldwfznvzz9bw4zhvc12s9y5h"; }
   ];
 
+  plexusUtils_1_5_6 = map (obj: fetchMaven {
+    version = "1.5.6";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "26p385szy6sphplalxc9750f29z7fnvmaz7m1fv0mx7p7qmvkk6pm5m4kl636m8jsflkfmzh4f4y5vj5vhxypfyc4pdzfsp9xyc3vwq"; }
+    { type = "pom"; sha512 = "261yv9sgjmslxjsfx7fj1ma53ld930qxic4br5m88wv96skyni09w2nh9sslgrmpxj3q89ykhq3fciscn40066v1qn0h0f6lbk3w68r"; }
+  ];
+
   plexusUtils_1_5_8 = map (obj: fetchMaven {
     version = "1.5.8";
     baseName = "plexus-utils";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 2b3f28613999..ee19aaf2103c 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -17,6 +17,22 @@ rec {
     type = "pom";
   };
 
+  antParent_1_8_2 = fetchMaven {
+    version = "1.8.2";
+    baseName = "ant-parent";
+    package = "/org/apache/ant";
+    sha512 = "1q560n9xbqk9qpprvm0nigd5nhm9s8m027qxjmzhay083sjrazscpaly4mzgry5lpdmr3xyhly1r1s88879y04qr5xqzqh0j45j943x";
+    type = "pom";
+  };
+
+  apache_1 = fetchMaven {
+    version = "1";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "0vbf7mbs61n13dmxndvzkafr0sg9p7g45ng9j1917cz8a9m4zflqf7xvpp9wfprmb4d1wd3ay2hhy9brxryqmvx41wfjlk9ahg34k0h";
+    type = "pom";
+  };
+
   apache_3 = fetchMaven {
     version = "3";
     baseName = "apache";
@@ -49,6 +65,14 @@ rec {
     type = "pom";
   };
 
+  apache_7 = fetchMaven {
+    version = "7";
+    baseName = "apache";
+    package = "/org/apache";
+    sha512 = "2yvwxxifqypmpgxyx10ggj6l52jnl64f9554kyfdph7z56n02bcalj3cr43m6br0as6yc67k5p23l2k3gvdr66c5dfw1l8rwhahk9lr";
+    type = "pom";
+  };
+
   apache_9 = fetchMaven {
     version = "9";
     baseName = "apache";
@@ -105,6 +129,14 @@ rec {
     type = "pom";
   };
 
+  commonsParent_17 = fetchMaven {
+    version = "17";
+    baseName = "commons-parent";
+    package = "/org/apache/commons";
+    sha512 = "31ijvmfj2yybfy0n4qh7ga8192wg75hs5v26vwm98hgvlppxs9irik4qlqzh4iqq0azp0xl8idz6nn6yb9vzsjxax4c3v5wyk3yvyfy";
+    type = "pom";
+  };
+
   commonsParent_22 = fetchMaven {
     version = "22";
     baseName = "commons-parent";
@@ -169,6 +201,14 @@ rec {
     type = "pom";
   };
 
+  maven_2_0_1 = fetchMaven {
+    version = "2.0.1";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "02n3kpll7w5iqaijawmm4rzr35sbv826c9vp1fzfnrgbvpfw22yrsjv2z416pzk2qyjh3wx7pc5xxxxdchmpzcxm694vsdl67ki2rrz";
+    type = "pom";
+  };
+
   maven_2_0_6 = fetchMaven {
     version = "2.0.6";
     baseName = "maven";
@@ -305,6 +345,14 @@ rec {
     type = "pom";
   };
 
+  mavenPluginTools_3_2 = fetchMaven {
+    version = "3.2";
+    baseName = "maven-plugin-tools";
+    package = "/org/apache/maven/plugin-tools";
+    sha512 = "28qhbacsb69rcp86l3lkc3d83267qdwwpl0zm134rxi58wy4y4rd8nz2yzk6yx4x8h0drq776b2qnr4ps1da1ybsvsi2sc655scx3lf";
+    type = "pom";
+  };
+
   mavenReporting_2_0_6 = fetchMaven {
     version = "2.0.6";
     baseName = "maven-reporting";
@@ -321,6 +369,14 @@ rec {
     type = "pom";
   };
 
+  mavenSharedComponents_11 = fetchMaven {
+    version = "11";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "3g30bgx3nhw1pwq5nq7ns17vs53cck3zrk6b4sqh56my7vhdv08v0n94l326q9f51sxvnsn11zmpnn8zri8hz2ci1g61ymgi2d0mxyd";
+    type = "pom";
+  };
+
   mavenSharedComponents_12 = fetchMaven {
     version = "12";
     baseName = "maven-shared-components";
@@ -385,6 +441,14 @@ rec {
     type = "pom";
   };
 
+  plexus_1_0_12 = fetchMaven {
+    version = "1.0.12";
+    baseName = "plexus";
+    package = "/org/codehaus/plexus";
+    sha512 = "2ckzb1z4hgmp2r61a05v3aqapkfnyfs4b7wrf60aiymrz57kliyq3nn50h7bj6ak9hlpyzxpqgqps0chzfpizr8v0abdkjmbplvw2ai";
+    type = "pom";
+  };
+
   plexus_2_0_2 = fetchMaven {
     version = "2.0.2";
     baseName = "plexus";
@@ -545,6 +609,38 @@ rec {
     type = "pom";
   };
 
+  sisuInject_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-inject";
+    package = "/org/sonatype/sisu";
+    sha512 = "0720p7ai7l1wqs2rfcgpvgd1rc3p2bdpp51a57jmqbgh9msr54iy0c6n0ipybd9lrl88iz4l8cc1s73qj5appf8r481bbwgv4wxi19v";
+    type = "pom";
+  };
+
+  sisuInjectGuiceBean_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "guice-bean";
+    package = "/org/sonatype/sisu/inject";
+    sha512 = "2arva9197d03whnavfspz8wm7fw8iqrhacp10984lxwig221m34p5bb9vmhn8bbswf7d8whzf9q5lsq9mxbmd2c90kc1m7n7qja6qq5";
+    type = "pom";
+  };
+
+  sisuInjectGuicePlexus_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "guice-plexus";
+    package = "/org/sonatype/sisu/inject";
+    sha512 = "0gspz9n6vbnlbx33xynm4sg0wxlr89i8490gcl0y0qw6mvjjqfwv1dqgncm9xp41mb21i00gxq0ml6d4wfr0sdayk9m736b826lrvq4";
+    type = "pom";
+  };
+
+  sisuParent_2_1_1 = fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-parent";
+    package = "/org/sonatype/sisu";
+    sha512 = "2z006ib6azrxf5s02ixv5plc1db0rglnv2m8k4il0s144v63ay98wjxawcc1chld64iribhhby6wnlv2fxvv8sl9mr03qb2q2isflgc";
+    type = "pom";
+  };
+
   slf4jApi_1_5_6 = fetchMaven {
     version = "1.5.6";
     baseName = "slf4j-api";
@@ -593,6 +689,14 @@ rec {
     type = "pom";
   };
 
+  sonatypeForgeParent_7 = fetchMaven {
+    version = "7";
+    baseName = "forge-parent";
+    package = "/org/sonatype/forge";
+    sha512 = "3l6c336cm6wnrw2l7lr0wg83w1304bggvw4qydh5bqbbyfpdgwqa3pbfkq4x760k3wqwarnlpf31fz2dp6abrynjl4rr1lv68j1hhyn";
+    type = "pom";
+  };
+
   sonatypeForgeParent_10 = fetchMaven {
     version = "10";
     baseName = "forge-parent";
diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix
new file mode 100644
index 000000000000..9fb70fad4466
--- /dev/null
+++ b/pkgs/development/java-modules/sisu/guice.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  sisuGuice_2_9_4 = map (obj: fetchMaven {
+    version = "2.9.4";
+    baseName = "sisu-guice";
+    package = "/org/sonatype/sisu";
+    suffix = "-no_aop";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1529vg4r0gy3ss68lprkdf13r79r0lng4iyx68gj94cf806li9kayi9p2byl6axbx174cvam9w3l90qcdsdz14vrvm163b2r8sq927m"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix
new file mode 100644
index 000000000000..fba7130cfbdc
--- /dev/null
+++ b/pkgs/development/java-modules/sisu/inject-bean.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  sisuInjectBean_2_1_1 = map (obj: fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-inject-bean";
+    package = "/org/sonatype/sisu";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0cqplf149dlqyqwaqk3bjlki97fbnav57vv5d9kkd2lvdradp7k89m5niwg5qgsfdlj91zidgrrkls5vyr4dcdy3lhxs1wyr4y8r0qb"; }
+    { type = "pom"; sha512 = "39dwwfh1p56crmx187wbm2kskxbcr0dfysdvqiwjfx91yhh64l9672axi28hdaw1qd5dh6whzxfqqlfjac94r37wv6fq5pkx6acp2dn"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix
new file mode 100644
index 000000000000..73335ec951e5
--- /dev/null
+++ b/pkgs/development/java-modules/sisu/inject-plexus.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  sisuInjectPlexus_2_1_1 = map (obj: fetchMaven {
+    version = "2.1.1";
+    baseName = "sisu-inject-plexus";
+    package = "/org/sonatype/sisu";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0qklkc024xc58ayl6503ig1yhpsvhxk5fc9vfb7xny9v8w2ds3f9yvd275n8iyy6iza0kj8xlk0clq1i50k96j11lf401r2vcfnk69g"; }
+    { type = "pom"; sha512 = "1fcpyrjz82v0lncyndrw61bb1p9kxzlikiw6qk2v71zgfz2cggw694g26nxsppab2d1ps689sijb9i934vf5bpkdvkc52ipbc43jwr4"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix
new file mode 100644
index 000000000000..7b04e21f50ee
--- /dev/null
+++ b/pkgs/development/java-modules/xerces/impl.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  xercesImpl_2_8_0 = map (obj: fetchMaven {
+    version = "2.8.0";
+    baseName = "xercesImpl";
+    package = "/xerces";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "09nwhb52g4ak92l8d0aymasbgjxmk4s7vp7i55l38x21zq1plxxkdp2sdk110qyg5mw06y433v28fm867jybpca8zrx51w4g7wg0w2y"; }
+    { type = "pom"; sha512 = "3lv2zqm25mmirazrpp53dicd3ficy32mdr3r7bc7xhmjky2r0051vzh5k0c01rwlb4kx0rinysxw9k20ml96ivw6ipwlrvpxjwgb74f"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix
new file mode 100644
index 000000000000..44044a35a57f
--- /dev/null
+++ b/pkgs/development/java-modules/xml-apis/default.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  xmlApis_1_3_03 = map (obj: fetchMaven {
+    version = "1.3.03";
+    baseName = "xml-apis";
+    package = "/xml-apis";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2sx6rm0lgzidcq1q81gnwxcj1himyny986ys6r60r3ws1p4bgxprargh5fdrmkp90djqzvy6d5b0sa0zfg1r9spynjbc8rjbr6agys9"; }
+    { type = "pom"; sha512 = "2n2pjaclvgllb8nzqkibvp1pida7sr9kmz0ngmsdrpk7sh5wrh32ri82gdj5l9mc1z88dwjyn1ydz6aazw36gdqqdwj3ba1mqs6pqmh"; }
+  ];
+}
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index fac982b5be23..2865418eb923 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -13,6 +13,12 @@ in {
   inherit (callPackage ../development/java-modules/eclipse/aether-util.nix { inherit fetchMaven; })
     aetherUtil_0_9_0_M2;
 
+  inherit (callPackage ../development/java-modules/apache/ant.nix { inherit fetchMaven; })
+    ant_1_8_2;
+
+  inherit (callPackage ../development/java-modules/apache/ant-launcher.nix { inherit fetchMaven; })
+    antLauncher_1_8_2;
+
   inherit (callPackage ../development/java-modules/beanshell/bsh.nix { inherit fetchMaven; })
     bsh_2_0_b4;
 
@@ -23,9 +29,13 @@ in {
   inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; })
     commonsCli_1_0;
 
+  inherit (callPackage ../development/java-modules/apache/commons-io.nix { inherit fetchMaven; })
+    commonsIo_2_1;
+
   inherit (callPackage ../development/java-modules/apache/commons-lang.nix { inherit fetchMaven; })
     commonsLang_2_1
-    commonsLang_2_3;
+    commonsLang_2_3
+    commonsLang_2_6;
 
   inherit (callPackage ../development/java-modules/apache/commons-lang3.nix { inherit fetchMaven; })
     commonsLang3_3_1;
@@ -65,6 +75,7 @@ in {
     mavenArtifactManager_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/common-artifact-filters.nix { inherit fetchMaven; })
+    mavenCommonArtifactFilters_1_2
     mavenCommonArtifactFilters_1_3
     mavenCommonArtifactFilters_1_4;
 
@@ -107,7 +118,8 @@ in {
     mavenMonitor_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-annotations.nix { inherit fetchMaven; })
-    mavenPluginAnnotations_3_1;
+    mavenPluginAnnotations_3_1
+    mavenPluginAnnotations_3_2;
 
   inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; })
     mavenPluginApi_2_0_6
@@ -136,6 +148,7 @@ in {
     mavenProfile_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; })
+    mavenProject_2_0_1
     mavenProject_2_0_6
     mavenProject_2_0_9
     mavenProject_2_2_1;
@@ -161,17 +174,24 @@ in {
     mavenSharedUtils_0_1;
 
   inherit (callPackage ../development/java-modules/maven/surefire-api.nix { inherit fetchMaven; })
-    mavenSurefireApi_2_12_4;
+    mavenSurefireApi_2_12_4
+    mavenSurefireApi_2_17;
 
   inherit (callPackage ../development/java-modules/maven/surefire-booter.nix { inherit fetchMaven; })
-    mavenSurefireBooter_2_12_4;
+    mavenSurefireBooter_2_12_4
+    mavenSurefireBooter_2_17;
 
   inherit (callPackage ../development/java-modules/maven/surefire-common.nix { inherit fetchMaven; })
-    mavenSurefireCommon_2_12_4;
+    mavenSurefireCommon_2_12_4
+    mavenSurefireCommon_2_17;
 
   inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; })
     mavenToolchain_1_0
-    mavenToolchain_2_0_9;
+    mavenToolchain_2_0_9
+    mavenToolchain_2_2_1;
+
+  inherit (callPackage ../development/java-modules/mojo/animal-sniffer.nix { inherit fetchMaven; })
+    mojoAnimalSniffer_1_11;
 
   inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; })
     plexusArchiver_2_1;
@@ -180,7 +200,8 @@ in {
     plexusBuildApi_0_0_4;
 
   inherit (callPackage ../development/java-modules/plexus/classworlds.nix { inherit fetchMaven; })
-    plexusClassworlds_2_2_2;
+    plexusClassworlds_2_2_2
+    plexusClassworlds_2_4;
 
   inherit (callPackage ../development/java-modules/plexus/compiler-api.nix { inherit fetchMaven; })
     plexusCompilerApi_2_2;
@@ -224,6 +245,7 @@ in {
     plexusUtils_1_4_5
     plexusUtils_1_5_1
     plexusUtils_1_5_5
+    plexusUtils_1_5_6
     plexusUtils_1_5_8
     plexusUtils_1_5_15
     plexusUtils_2_0_5
@@ -232,6 +254,21 @@ in {
     plexusUtils_3_0_5
     plexusUtils_3_0_8;
 
+  inherit (callPackage ../development/java-modules/sisu/guice.nix { inherit fetchMaven; })
+    sisuGuice_2_9_4;
+
+  inherit (callPackage ../development/java-modules/sisu/inject-bean.nix { inherit fetchMaven; })
+    sisuInjectBean_2_1_1;
+
+  inherit (callPackage ../development/java-modules/sisu/inject-plexus.nix { inherit fetchMaven; })
+    sisuInjectPlexus_2_1_1;
+
   inherit (callPackage ../development/java-modules/apache/xbean-reflect.nix { inherit fetchMaven; })
     xbeanReflect_3_4;
+
+  inherit (callPackage ../development/java-modules/xerces/impl.nix { inherit fetchMaven; })
+    xercesImpl_2_8_0;
+
+  inherit (callPackage ../development/java-modules/xml-apis { inherit fetchMaven; })
+    xmlApis_1_3_03;
 }

From 0e10bfa24646637e7054eb8235b260e02c6953a0 Mon Sep 17 00:00:00 2001
From: NeQuissimus <steinbach.tim@googlemail.com>
Date: Mon, 14 Nov 2016 19:23:08 -0500
Subject: [PATCH 0027/3449] maven_hello: Add 1.1, add ability to choose
 skipping tests

---
 pkgs/development/java-modules/build-maven-package.nix |  4 ++--
 pkgs/development/java-modules/maven-hello/default.nix | 11 +++++++++--
 pkgs/top-level/java-packages.nix                      |  3 ++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 203fa88aa00b..10dabadb50c8 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,5 +1,5 @@
 { stdenv, maven, pkgs }:
-{ mavenDeps, src, name, meta, m2Path, ... }:
+{ mavenDeps, src, name, meta, m2Path, skipTests ? true, ... }:
 
 with builtins;
 with stdenv.lib;
@@ -26,7 +26,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 clean package -Dmaven.test.skip=true -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
+    ${maven}/bin/mvn clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
     cp -v ./target/*.jar $out/target/
   '';
 }
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index feb3146ffd61..a1a6cfce6b42 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -3,8 +3,8 @@
 with pkgs.javaPackages;
 
 rec {
-  mavenHelloRec = { mavenDeps, sha512, version }: mavenbuild rec {
-    inherit mavenDeps sha512 version;
+  mavenHelloRec = { mavenDeps, sha512, version, skipTests }: mavenbuild rec {
+    inherit mavenDeps sha512 version skipTests;
 
     name = "maven-hello-${version}";
     src = pkgs.fetchFromGitHub {
@@ -30,4 +30,11 @@ rec {
     sha512 = "3kv5z1i02wfb0l5x3phbsk3qb3wky05sqn4v3y4cx56slqfp9z8j76vnh8v45ydgskwl2vs9xjx6ai8991mzb5ikvl3vdgmrj1j17p2";
     version = "1.0";
   };
+
+  mavenHello_1_1 = mavenHelloRec {
+    mavenDeps = [ junit_4_12 ];
+    sha512 = "3dhgl5z3nzqskjjcggrjyz37r20b0m5vhfzbx382qyqcy4d2jdhkl7v1ajhcg8vkz0qdzq85k09w5is81hybv8sd09h3hgb3rrigdaq";
+    version = "1.1";
+    skipTests = false;
+  };
 }
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 2865418eb923..488f4cb59db8 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -104,7 +104,8 @@ in {
     mavenFiltering_1_1;
 
   inherit (callPackage ../development/java-modules/maven-hello { inherit mavenbuild; })
-    mavenHello_1_0;
+    mavenHello_1_0
+    mavenHello_1_1;
 
   inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; })
     mavenModel_2_0_6

From 63a46e0914fb1eb40c1903998faf10ffe3383cc5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 15 Nov 2016 14:18:19 -0500
Subject: [PATCH 0028/3449] Complete hello world with test

---
 .../java-modules/apache/commons-cli.nix       | 11 +++
 .../java-modules/build-maven-package.nix      | 14 ++--
 .../development/java-modules/hamcrest/all.nix | 15 ++++
 .../java-modules/junit/default.nix            |  4 +-
 .../java-modules/maven-hello/default.nix      | 13 +--
 .../java-modules/maven/artifact-manager.nix   | 11 +++
 .../java-modules/maven/artifact.nix           | 22 +++++
 pkgs/development/java-modules/maven/core.nix  | 11 +++
 .../java-modules/maven/doxia-sink-api.nix     | 11 +++
 .../java-modules/maven/error-diagnostics.nix  | 11 +++
 pkgs/development/java-modules/maven/model.nix | 11 +++
 .../java-modules/maven/monitor.nix            | 11 +++
 .../java-modules/maven/plugin-api.nix         | 11 +++
 .../java-modules/maven/plugin-descriptor.nix  | 11 +++
 .../maven/plugin-parameter-documenter.nix     | 11 +++
 .../java-modules/maven/plugin-registry.nix    | 11 +++
 .../maven/plugin-testing-harness.nix          | 14 ++++
 .../java-modules/maven/profile.nix            | 11 +++
 .../java-modules/maven/project.nix            | 11 +++
 .../java-modules/maven/reporting-api.nix      | 22 +++++
 .../maven/repository-metadata.nix             | 11 +++
 .../java-modules/maven/settings.nix           | 11 +++
 .../java-modules/maven/surefire-junit4.nix    | 14 ++++
 .../mojo/java-boot-classpath-detector.nix     | 14 ++++
 pkgs/development/java-modules/ow2/asm-all.nix | 15 ++++
 .../java-modules/plexus/archiver.nix          | 11 +++
 .../development/java-modules/plexus/utils.nix | 22 +++++
 pkgs/development/java-modules/poms.nix        | 80 +++++++++++++++++++
 pkgs/top-level/java-packages.nix              | 41 +++++++++-
 29 files changed, 451 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/java-modules/hamcrest/all.nix
 create mode 100644 pkgs/development/java-modules/maven/plugin-testing-harness.nix
 create mode 100644 pkgs/development/java-modules/maven/surefire-junit4.nix
 create mode 100644 pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
 create mode 100644 pkgs/development/java-modules/ow2/asm-all.nix

diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
index 74087a04e0c9..ffad5632b0a0 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/pkgs/development/java-modules/apache/commons-cli.nix
@@ -11,4 +11,15 @@ rec {
     { type = "pom"; sha512 = "1pm5ba95viabcgpjhsqw21iwis9ajn8hwpyc6rzs9frr5k62hs7lj8darxmmp21hf14mxrs37a8swayhagq6i6g8js4nl4r8mmwjlvp"; }
     { type = "jar"; sha512 = "0ybdbpfzadkncwcmnzkscbp2fhmcsqmpy60qppz7s8hs00hgqy64jr4qpdyz5bj0l4bc434vn0pv4gzxzi7y1lhh7b2rk4zv1mgs3ff"; }
   ];
+
+  commonsCli_1_2 = map (obj: fetchMaven {
+    version = "1.2";
+    baseName = "commons-cli";
+    package = "/commons-cli";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "3lrjnrkq0vq1mjp1z6zbi6x0x45hj20yvs74aqnpzayd0prwv22hyfyadgrj343is54s6m2p5mx2kpziqz9wcih5hmwg5f80ni8mxp7"; }
+    { type = "jar"; sha512 = "2mdzpng0cybpnw5dw1q4dmpn2i89zhg13m8xjv8pdbn5q28zsf8m3m7w0y8irbjyplwrfdrxipkxxvnz5f61bxi4s85hnm0sc84d3qb"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/build-maven-package.nix b/pkgs/development/java-modules/build-maven-package.nix
index 10dabadb50c8..d83b43ffd75a 100644
--- a/pkgs/development/java-modules/build-maven-package.nix
+++ b/pkgs/development/java-modules/build-maven-package.nix
@@ -1,5 +1,5 @@
 { stdenv, maven, pkgs }:
-{ mavenDeps, src, name, meta, m2Path, skipTests ? true, ... }:
+{ mavenDeps, src, name, meta, m2Path, skipTests ? true, quiet ? true, ... }:
 
 with builtins;
 with stdenv.lib;
@@ -13,8 +13,8 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInput = [ maven ] ++ flatDeps;
 
-  find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
-  copy = ''cp -rs ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2'';
+  find = ''find ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2") flatDeps)} -type d -printf '%P\n' | xargs -I {} mkdir -p $out/m2/{}'';
+  copy = ''cp -rsfu ${foldl' (x: y: x + " " + y) "" (map (x: x + "/m2/*") flatDeps)} $out/m2'';
 
   phases = [ "unpackPhase" "buildPhase" ];
 
@@ -23,10 +23,12 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/m2/${m2Path}
     ${optionalString (length flatDeps > 0) find}
     ${optionalString (length flatDeps > 0) copy}
+    if [ -f $out/m2/settings.xml ]; then rm $out/m2/settings.xml; fi
     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 clean package -Dmaven.test.skip=${if skipTests then "true" else "false"} -Danimal.sniffer.skip=true -gs $out/m2/settings.xml
+      <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
+    cp ./target/*.jar $out/m2/${m2Path}
     cp -v ./target/*.jar $out/target/
   '';
 }
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix
new file mode 100644
index 000000000000..2bba1ac92491
--- /dev/null
+++ b/pkgs/development/java-modules/hamcrest/all.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  hamcrestAll_1_3 = map (obj: fetchMaven {
+    version = "1.3";
+    baseName = "hamcrest-all";
+    package = "/org/hamcrest";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3pmh19hhwr2vcvj3wqx0m8gipilny4ap9gax1xpks4k5pwykh74w0x9iwpns7cl8r7kqd6rbq4khhc0shcmfh6gydr8ax201wc7lvb8"; }
+    { type = "pom"; sha512 = "1w0byl3qy1gq2d8r66fzpffalc7pqm82iz5k3bqcxhclb60ifadmsxi1icqdhfpa29gvr5p1j5723zqpr11dk9w3p16njxc0arqxp2h"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 5418679b78fe..84ccef3975d2 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -51,8 +51,8 @@ in rec {
 
   junit_4_12 = junitGen {
     mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ])
-                  ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenProject_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_1 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
-                  ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 beanshell_2_0_b4 codehausParent_4 commonsParent_17 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenSharedComponents_11 mojoParent_32 plexus_1_0_12 plexusComponents_1_1_4 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]);
+                  ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_1 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenArtifactManager_2_0_1 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenCore_2_0_1 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_1 mavenModel_2_0_1 mavenModel_3_0_3 mavenMonitor_2_0_1 mavenPluginApi_2_0_1 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginDescriptor_2_0_1 mavenPluginParameterDocumenter_2_0_1 mavenPluginRegistry_2_0_1 mavenPluginTestingHarness_1_1 mavenProfile_2_0_1 mavenProject_2_0_1 mavenProject_2_0_8 mavenReportingApi_2_0_1 mavenReportingApi_2_2_1 mavenRepositoryMetadata_2_0_1 mavenSettings_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
+                  ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 asmParent_4_0 beanshell_2_0_b4 codehausParent_4 commonsParent_11 commonsParent_17 doxia_1_0_alpha6 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_2_0_8 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenReporting_2_0_1 mavenReporting_2_2_1 mavenSharedComponents_7 mavenSharedComponents_11 mojoParent_32 ow2_1_3 plexus_1_0_12 plexusComponents_1_1_4 plexusComponents_1_1_6 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]);
     sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
     version = "4.12";
   };
diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix
index a1a6cfce6b42..1ac023ec5344 100644
--- a/pkgs/development/java-modules/maven-hello/default.nix
+++ b/pkgs/development/java-modules/maven-hello/default.nix
@@ -2,9 +2,11 @@
 
 with pkgs.javaPackages;
 
-rec {
-  mavenHelloRec = { mavenDeps, sha512, version, skipTests }: mavenbuild rec {
-    inherit mavenDeps sha512 version skipTests;
+let
+  poms = import ../poms.nix { inherit fetchMaven; };
+in rec {
+  mavenHelloRec = { mavenDeps, sha512, version, skipTests ? true, quiet ? true }: mavenbuild rec {
+    inherit mavenDeps sha512 version skipTests quiet;
 
     name = "maven-hello-${version}";
     src = pkgs.fetchFromGitHub {
@@ -32,9 +34,10 @@ rec {
   };
 
   mavenHello_1_1 = mavenHelloRec {
-    mavenDeps = [ junit_4_12 ];
-    sha512 = "3dhgl5z3nzqskjjcggrjyz37r20b0m5vhfzbx382qyqcy4d2jdhkl7v1ajhcg8vkz0qdzq85k09w5is81hybv8sd09h3hgb3rrigdaq";
+    mavenDeps = [ junit_4_12 mavenSurefireJunit4_2_12_4 hamcrestCore_1_3 ] ++ (with poms; [ surefireProviders_2_12_4 ]);
+    sha512 = "2f13592blvfgwad61174fza99ncb5jlch4sjjindk1pcaixqw26fnjfxb4ck80cknkihvcsylhviyfvhpm1ivvpg0zkicxva37cr4ri";
     version = "1.1";
     skipTests = false;
+    quiet = false;
   };
 }
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index 031bd37eb6fa..6d7e0caadfd5 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenArtifactManager_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-artifact-manager";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0xciyvsl2l6fnd5k5dbhz5iih66fgacdagcrflk6cfiiv3qng5zrhx61v9fbjr0fpxbj7rswkczv7vn46359nlkb80513jwhzs8gqwv"; }
+    { type = "pom"; sha512 = "1j20ygljm0qa10ryw72j9q4jlwnsjdrcdg08a10ar456zi8gxzszp5cd0xsp0j29q69bp3wck2ggfr028v0zxivxgvakm4fa6l33sya"; }
+  ];
+
   mavenArtifactManager_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-artifact-manager";
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index 1cbb347baf4e..224570f910f8 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenArtifact_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3xmim81k0p3l7fpgr8xlbj3mcz83d1rw3nwzdlrnwh3nkc5xryxl8fx499351vjlmjs009bhd68a20v59y3flxz8hxiy07cijgcbqnx"; }
+    { type = "pom"; sha512 = "30y2mirgqvdm3gdalxkzjljswh9xhygsw6v2jfrd9y61wqng2hzyn7dawkn5q4cyiknmw1b9660pvbnysvh3rbic75lhw5xqqgdjmih"; }
+  ];
+
   mavenArtifact_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-artifact";
@@ -12,6 +23,17 @@ rec {
     { type = "pom"; sha512 = "37kvfxcpfajjn9lmvh5kay4y61ri1190hxxgiil8fqfvmvcm02jcqzfi4ry0nzc80g5fsarsd3s2ns2d8l0lnqjp28nn51dixm9a55w"; }
   ];
 
+  mavenArtifact_2_0_8 = map (obj: fetchMaven {
+    version = "2.0.8";
+    baseName = "maven-artifact";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0i2xd2fkvp5glb7yx8zhh96px4v2yq0bgxa6xxcy6if0sn8c3vps8jmd1z3ys27jzj1gvwgg4rpa17k0nk1c8szz1v7vwvyhp7s22pi"; }
+    { type = "pom"; sha512 = "37563kfswgk9yfzm46vk4nr44rncdd3y705vgg20lj4nsrqn7iwg55fx1a4f039gbaf8dzb6xwp0ypyspsx9q742wkwrsr5q41d99v7"; }
+  ];
+
   mavenArtifact_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-artifact";
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index d135bd28657e..ed3313bba595 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenCore_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-core";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "1iv0bg9z6zmlihxnynccdq0ivgk0bdi2vk863ii59qqnqp9wqcswx0bc60hyfasjm4d8m30b60www56v6y05mjjbpir4mmrjdbxw9gd"; }
+    { type = "jar"; sha512 = "04hrkgcpvxdisdgcp1mslkylm0b461mp42mylwpm6xdi9lcfdbd97k2rybvwgxd0y9r9j72ahm4fsqjb53xlz4737w96cmynpr8mrz4"; }
+  ];
+
   mavenCore_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-core";
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 7454f7bbc969..18ccf4b707a6 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven {
+    version = "1.0-alpha-6";
+    baseName = "doxia-sink-api";
+    package = "/org/apache/maven/doxia";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "156j8ic3m2j23nrh074j567qxcsqi8ahpl97ba68l88cq08al1z7mh72hm8jz24lq04kxkrf3r1icqbpki10jgv7qma0cpz86yw27x2"; }
+    { type = "jar"; sha512 = "12yqdygds5w4dx8zxq4ss65a28pqrhavzzmgi3n7473r1k5r3kiw5h5bm71zdhccv5lgb4lb9p9lswa2pjkwriykfm3fj0l3924x6dk"; }
+  ];
+
   mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven {
     version = "1.0-alpha-7";
     baseName = "doxia-sink-api";
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index 8f3cd0a4485d..6f22316edc7a 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-error-diagnostics";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2jva1b8myaxy6y56rkqh8lynj36rj1apsgasc8i9qrigrw2wjk9yhsywv2ylmbspva1aypn23di7bd5bfb7vhaxhlqrlakdx5pqv7kh"; }
+    { type = "pom"; sha512 = "250x4ajr37nlch6n502ggfmr558hvhdxfgwjr28svvbxlyhk73h2nz9r95gvkfymv32dml8j1d4cgy3zs3qy2wzb679pnyckjwpdq9z"; }
+  ];
+
   mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-error-diagnostics";
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index 41b2458550d4..70bfd34e737c 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenModel_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-model";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2y6dqd0xlkkmff5gwfnc5pk0w6zpircj7mrvfw2nwvsaxx9cw3fkn33m3bamzyz1zv5w1vlrlrnynifvm3mzfrgkl3dxa16p00yj5wp"; }
+    { type = "pom"; sha512 = "0mnjzcansaxakip9b2nq7pxl2nbf9033if8bap658q9i9fbm8b6djqs09frmdds1vns44vlirvmm94s2k7i1lswmsqjgv3p12lrvbb1"; }
+  ];
+
   mavenModel_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-model";
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index 699d34bbf939..0a71d7ba5a42 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenMonitor_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-monitor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "1jp0kf3hyvk3x25fnxb9qi1yxs4lk1bpc9r76fvkggm7xhda4k2cr4ql37py5qh08c67bixyl4qiqsvlzv41jqnkxrxr85z2962fy8m"; }
+    { type = "pom"; sha512 = "3i0fzz4lb6lckvnv61bxcb26cw5cd3ibyirzlh0nnaig80rykf1v0bvr2ll0xpz2ss25b3j320kpwncsir2qmlfi51vh6ms3zm7p1ik"; }
+  ];
+
   mavenMonitor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-monitor";
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index b06b83a8e944..e4d8fbec39b2 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginApi_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-api";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "pom"; sha512 = "0fvx3mhmpr03cgyy3rx6ysdpvya6zs77yvjki1s9qfd3axzbnh2xl4w2d389rpx2vmqqx3a1lr8nj2yphm5r1wz3sb7v9rnba6jrfcr"; }
+    { type = "jar"; sha512 = "1fwfw7smywavmafbdma7xla07vaaihkg9md1v16ckp6xpbdxpsknb7s07dnx5jx757gd0gp5ak7mawg0a5sfrvjh955ynikhzjq13lz"; }
+  ];
+
   mavenPluginApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-api";
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index 0a60032125ca..76f1bf5de1b2 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-descriptor";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2gwjmn4xnxh2hy9nnlr107q1fpnyy2yhkajvj2snpl1xmpn76m1vvj64zf52l9grpvpx91b0pvd8pxa8hzmh8kqdf1w3wqjg5k1p4zf"; }
+    { type = "pom"; sha512 = "0g9hl6i0kqfrifjmykrg5pfb2xh35by3dc1nfa4i1434xr1fzi4y5avdqaw3zlvhnybi611qxv1g2ydnwkq9mgnvjq8fis4ir60g82s"; }
+  ];
+
   mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-descriptor";
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index 82b16e616204..f3ef7c7fc5b0 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-parameter-documenter";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3hx5wg0jqhhknfgb98j7d3xy452lyw5yr3ncbk0jfzx1xkxc3v101s5s192q3c2agjgj76xsk1axmipdmwfv3801rbk99hmyjhdqbkn"; }
+    { type = "pom"; sha512 = "0x56m654vdgakslrbzfnvarh699ag288drbk6vnwjp5xxa5jg9vizrm6kz1917d2qygrpqnn5b6yzwawj864qy9xdadzr9mbak33424"; }
+  ];
+
   mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-parameter-documenter";
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index 547bda4fc9f4..b75806182cff 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenPluginRegistry_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-plugin-registry";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "392cx42731zgiyvjdpqcpbhqvpjbd4ydlxfnracws8vimifcsln33s48yzk2q671ydcwdzs3kla2npy410vqzvc535km5ssj60fhq2f"; }
+    { type = "pom"; sha512 = "3g1rbjz64x7cihfgmc061nm7sg52p7wr34cb1b1725w7d3hp0vz33s5ybql3vccbf7brx9vvfykxiwsgqbw6g19zv77276vdpy8v5nr"; }
+  ];
+
   mavenPluginRegistry_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-plugin-registry";
diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
new file mode 100644
index 000000000000..754bcc08031f
--- /dev/null
+++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenPluginTestingHarness_1_1 = map (obj: fetchMaven {
+    version = "1.1";
+    baseName = "maven-plugin-testing-harness";
+    package = "/org/apache/maven/shared";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "38cqg736n2nlzhssabyw47yl0rqcaha3k8sqgjs7pgvcpphapxinx9gck2n2y5m77rhjwkz0n6lyym6zi2k382jbasm2n59y5gkpnkj"; }
+    { type = "pom"; sha512 = "26gfh7i9qg79yggsp3sl21qj9s4j6hdabllvbvnnr0m6j8whadzbhfx2ds7p6ddvzvyi5214xrsl6ag3nxw6k5rjw10k4g32b0nyvv2"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index d5e79d13c2c2..b160fb4e9437 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenProfile_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-profile";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "39zjz3jh5q5k4ryyg8psj741gwy01blflmw2hk9krqid9fpmbbcj5f3h34i1q03qcz7kgb1sz1kp58j2fmbk8364y2i0xyrg4zalzz5"; }
+    { type = "pom"; sha512 = "32jcvvf47if22cy3z0ld2gf7873ysz4qcx6b2zp62r8pbmj1i2a1kd62llvjv7p2x5l960ndvlr1a80x6mm9mnsjrwxd4vy0iwyshmv"; }
+  ];
+
   mavenProfile_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-profile";
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index 25911fcdee81..f1ff4f05c4c5 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -23,6 +23,17 @@ rec {
     { type = "pom"; sha512 = "13z607rjazzrs3rjw6hlhpw6jip85lgdkvnkm1j17wsbhywa53x45ydyg1hzrcax8xr5zxn7mkrryp4wwwm4ihhsaz3nq8bh12yrh8p"; }
   ];
 
+  mavenProject_2_0_8 = map (obj: fetchMaven {
+    version = "2.0.8";
+    baseName = "maven-project";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2j3mwqh0zjm7pc7jydpdg6xp5gl3ila84zkhk1znn9663d84p4wgkv6zi1r16djc5jvy2g2z2id1zc7gr97spv5riwz3hbw1vw4ajzp"; }
+    { type = "pom"; sha512 = "1489hvb5g28afc2yjyc5qnlihg0qqiq0r1fkbl976hvr5kfj6pkx4h3sz69gv3pnsgpjkavqxafm11s7w1hgd8xsvajrnsy77hmpsqa"; }
+  ];
+
   mavenProject_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
     baseName = "maven-project";
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
index 36818dc57e0c..afb949d79c53 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenReportingApi_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-reporting-api";
+    package = "/org/apache/maven/reporting";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "06721y3g8zxhv2hx9c743ai3pc8d2agdgkz8wyaia6h7k2sy0rjxcfixpdxpw9hzdm0fqjqc3hdjf0j5dlkd11xzv9q87dr1s1x24w2"; }
+    { type = "pom"; sha512 = "2xjij0375hnv807sar41gk0qk8f7xaqm1fkrgvrbcl5sbwm614rrdxir14wlkkgr78qjx3b8m3r1jrdi47j1n5p4c9zmgg4vjl3n1sy"; }
+  ];
+
   mavenReportingApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-reporting-api";
@@ -22,4 +33,15 @@ rec {
     { type = "jar"; sha512 = "0x7j7k3xbxps80swyp4ff1sw4rwrhlxsx80kyh0sj0i9jz50x18p1rba10gx2fqd4l29zri77nlm4qza5yrf61s68xby2zr2bygyc9r"; }
     { type = "pom"; sha512 = "054v1p9h0141pahs52pg8wb0x4jghm5222yns6mf4dbc9gpy7x9j2b0z2lv9q3slx98378s4zakx4kbk5ca9ldlm8sz9y10fpqm35s6"; }
   ];
+
+  mavenReportingApi_2_2_1 = map (obj: fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-reporting-api";
+    package = "/org/apache/maven/reporting";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "38nbplfyi1xcf6q502m8sgz9iacqy06y9fq811sz75wsqxld8zxkr85lqg46zhpjm8k3hk7dg4an466j65mbpf0n7iswcjnqn78slil"; }
+    { type = "pom"; sha512 = "0clwbb7p9fm5xlwkjyxx97v0k9alpz98smlpv26gz9j22hlzl08zajgiw52abqarbk80x28c02clipv1ifgbwrxyji4s8rb5f689nkp"; }
+  ];
 }
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 7a076a3811ec..1ed2717ac4f3 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-repository-metadata";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3aq5k4ifam2lm6mny7zyjlylcpk6is2jnas81w6z5p6qd5jfwfj1i3g89y0vsl7mamh2rp7xncx60mvqr0jm9hxgx8ibjcynkq92kaf"; }
+    { type = "pom"; sha512 = "29nynsxh8k1q91whs4glca3qxigid32dx70c87jvk1x1cfc8s78bvm6lzr14x7wvw5i5n61lrqvq5mc6mzsi8xmspaqjhm2m7azyx7y"; }
+  ];
+
   mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-repository-metadata";
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index b4416607ee9e..a18532fa3627 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  mavenSettings_2_0_1 = map (obj: fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-settings";
+    package = "/org/apache/maven";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3jf3iix8zwbjrfxswn4x4q5jxmpkm5bqq0pb6yq5vjk74kipkk6cl5cfjhy8pakb1fymq7j7knsi791xp6jrhyyrzi31lgprdmlk06x"; }
+    { type = "pom"; sha512 = "2r0256akp6gkcg7mjpaf27s985x2hblqk2dqcjq4cl415j4hx1xvarvvkh9py8sk8sjp66nzabph2kyk7v01cy29ryay6b6hn1wzi62"; }
+  ];
+
   mavenSettings_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
     baseName = "maven-settings";
diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix
new file mode 100644
index 000000000000..83aaebc7f6de
--- /dev/null
+++ b/pkgs/development/java-modules/maven/surefire-junit4.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven {
+    version = "2.12.4";
+    baseName = "surefire-junit4";
+    package = "/org/apache/maven/surefire";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2m6k4dsy9d6yfcn33lrv1q4lb3hlg1q6c8ff0rhb05j7lzsiiqa55n2561a45bznhc8l85l31mrvva0h2hhca6xjyx1hw7k3ddgpzc5"; }
+    { type = "pom"; sha512 = "1na33q7j22fsdwcynd8pv8ivsq1fq51p818nyhhldaqnh7rm2478pnxyhq14wv9mrsgrfxffipaiqyvwq30y69y6ddn597arv16ihix"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
new file mode 100644
index 000000000000..95eb52ae3e80
--- /dev/null
+++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
@@ -0,0 +1,14 @@
+{ fetchMaven }:
+
+rec {
+  mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven {
+    version = "1.11";
+    baseName = "java-boot-classpath-detector";
+    package = "/org/codehaus/mojo";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "0dn0ry30n47544bbhp8j3r5fm6ip7cs1i8wg0wdfr735ak7r38wpb297q0k5kfaqrlqwi8cmnz4lngjan223lpwywjc806v27adjh57"; }
+    { type = "pom"; sha512 = "1ndzid9lik3a3bh8d2n9fqql29wypx4cw4ybvjgqhx63rs8hbb038irmcdr18jsalb8v2sj0bmjv6nmrr58wgf158r1zjv311m95yw0"; }
+  ];
+}
diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix
new file mode 100644
index 000000000000..2fee6529f16e
--- /dev/null
+++ b/pkgs/development/java-modules/ow2/asm-all.nix
@@ -0,0 +1,15 @@
+{ fetchMaven }:
+
+rec {
+  ow2AsmAll_4_0 = map (obj: fetchMaven {
+    version = "4.0";
+    baseName = "asm-all";
+    package = "/org/ow2/asm";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3b38kqyzg15plsdwwr5kri06h0pag1pxnxzlyqcwpaa2ncd4pqh44zc7mzaxrsvpx8z5cdl413xs2p0qn1qhcz92w5lqykm4gnvb2az"; }
+    { type = "pom"; sha512 = "11gcdp8417immlsb8dvw70cmqykcqvzcl2xz37vsimdpwjx31px88dgmxs6l3k50z9mvs6h1cfgfbaw1i2qmzdkdlbyai8iwnl8q2mr"; }
+  ];
+}
+
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix
index e831df44732c..3a2b0a347e3d 100644
--- a/pkgs/development/java-modules/plexus/archiver.nix
+++ b/pkgs/development/java-modules/plexus/archiver.nix
@@ -1,6 +1,17 @@
 { fetchMaven }:
 
 rec {
+  plexusArchiver_1_0_alpha7 = map (obj: fetchMaven {
+    version = "1.0-alpha-7";
+    baseName = "plexus-archiver";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "3r1c5bknlk9010wqw1m6asqhnbmqz6xammhpci929gjjims27fr0c9qmskqr55vnbswcmvsiikfjnjwa36msgscirzsay48zrs5iwfk"; }
+    { type = "pom"; sha512 = "05gnm321rx3zi5bnkgl64nbx6j8f3pz6y0v6nb3xfw44kgv7rxaq8b1v716wpr2p0bdrmarxmzidc92hps2w5src0ramg6xv35zfw6w"; }
+  ];
+
   plexusArchiver_2_1 = map (obj: fetchMaven {
     version = "2.1";
     baseName = "plexus-archiver";
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index 2cfdd60ccae7..ca46c0d4d624 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -12,6 +12,17 @@ rec {
     { type = "pom"; sha512 = "35mm9fkfw1wljabr4lz6l5mq3mxgl7k87whlcz5qlddsbxy0j69j4xgf1fvjlyp06nqq2wz574v54aqpxgp8s6jwjyz9wyvqvsyka8d"; }
   ];
 
+  plexusUtils_1_0_5 = map (obj: fetchMaven {
+    version = "1.0.5";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "2wj0xyywifivqq1rnmd3lj7c4kgprcyq3rb4v4y5rr89isdm40hnfhziz0zakyysk8wqw4l4wp3lg7vxhs3yd44rdfm0czvkjl726zj"; }
+    { type = "pom"; sha512 = "1pz98avnr6pml058mg2db79rpxckcxkgpl8z373l055kppsy1pvmkhjahkjpzfrg63pdsk2kgm2ls9ji5697whpbm7xcwi8j3ssx791"; }
+  ];
+
   plexusUtils_1_1 = map (obj: fetchMaven {
     version = "1.1";
     baseName = "plexus-utils";
@@ -45,6 +56,17 @@ rec {
     { type = "pom"; sha512 = "0liqhpc9pn81vn04qz4j3101jc33hygb415jnwpf0dhph3jay88l49gd9s1bwq6x4npn2v6863vidb8hdh5f8wd20k6m1lqhdpv882j"; }
   ];
 
+  plexusUtils_1_4_9 = map (obj: fetchMaven {
+    version = "1.4.9";
+    baseName = "plexus-utils";
+    package = "/org/codehaus/plexus";
+    sha512 = obj.sha512;
+    type = obj.type;
+  }) [
+    { type = "jar"; sha512 = "12fhq89mqj8m5y0ks8h39ig2q4nr3qlygjwygp9wg60dkfqrm6rscfrycs18pqd9y9fkhk8rqi96gq2vy8wg1v1a24h2wlzak1d22ip"; }
+    { type = "pom"; sha512 = "23fpn9f8gq0a3hi2mlwzjpbr3kyrsr4wl58zyq8i6xbdnnfx0wfwc2xsfn8yp3mq2pjjpdlza9l3qdmwsyzmrz8micvms8bladpvcmv"; }
+  ];
+
   plexusUtils_1_5_1 = map (obj: fetchMaven {
     version = "1.5.1";
     baseName = "plexus-utils";
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index ee19aaf2103c..7feff9548a1f 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -105,6 +105,14 @@ rec {
     type = "pom";
   };
 
+  asmParent_4_0 = fetchMaven {
+    version = "4.0";
+    baseName = "asm-parent";
+    package = "/org/ow2/asm";
+    sha512 = "2vysz9nn1pn1qzd40n7d2njmcpz7qi37pi73k9ajjmmbzwza6h8gc1pvadfqxlnih47gzc1wn3hqrc1sqd3b84kh8nrznwjcp10y0lf";
+    type = "pom";
+  };
+
   backportUtilConcurrent_3_1 = fetchMaven {
     version = "3.1";
     baseName = "backport-util-concurrent";
@@ -129,6 +137,14 @@ rec {
     type = "pom";
   };
 
+  commonsParent_11 = fetchMaven {
+    version = "11";
+    baseName = "commons-parent";
+    package = "/org/apache/commons";
+    sha512 = "3986i0mnawni27fqf74zfb1n9wvyn502nvslfmbwz5m3rgvhfdb7r1wj7qz8g3wznfvh3wd99h83d94300yvy6cilqy5sj9gfwxk3jv";
+    type = "pom";
+  };
+
   commonsParent_17 = fetchMaven {
     version = "17";
     baseName = "commons-parent";
@@ -145,6 +161,14 @@ rec {
     type = "pom";
   };
 
+  doxia_1_0_alpha6 = fetchMaven {
+    version = "1.0-alpha-6";
+    baseName = "doxia";
+    package = "/org/apache/maven/doxia";
+    sha512 = "0ya69g2xfzawf30r2n45n85h2bag0ihd2cbkd0896ykwndx62jyagc594f9pkvb8x9vwgq1dkhfc5lfw1sjcmsxm9dmyzvy2nmykpsy";
+    type = "pom";
+  };
+
   doxia_1_0_alpha7 = fetchMaven {
     version = "1.0-alpha-7";
     baseName = "doxia";
@@ -217,6 +241,14 @@ rec {
     type = "pom";
   };
 
+  maven_2_0_8 = fetchMaven {
+    version = "2.0.8";
+    baseName = "maven";
+    package = "/org/apache/maven";
+    sha512 = "0mzlba0vbanxvdgfvj3kq6xw211j40b6hk6w0b7lc686m2c26vgxks9iisgm10888lq140i6510813326bs9yb053hqfvnz3m72lkss";
+    type = "pom";
+  };
+
   maven_2_0_9 = fetchMaven {
     version = "2.0.9";
     baseName = "maven";
@@ -353,6 +385,14 @@ rec {
     type = "pom";
   };
 
+  mavenReporting_2_0_1 = fetchMaven {
+    version = "2.0.1";
+    baseName = "maven-reporting";
+    package = "/org/apache/maven/reporting";
+    sha512 = "3ns0j0w3g3xzvi4y2nbz7yl3w0bq6npvkpy56c2s2m8z0b0007vw97qm3z7b6iicwck69g9001qqqanhzr35x1qbzlqzrx5v271hvfa";
+    type = "pom";
+  };
+
   mavenReporting_2_0_6 = fetchMaven {
     version = "2.0.6";
     baseName = "maven-reporting";
@@ -369,6 +409,22 @@ rec {
     type = "pom";
   };
 
+  mavenReporting_2_2_1 = fetchMaven {
+    version = "2.2.1";
+    baseName = "maven-reporting";
+    package = "/org/apache/maven/reporting";
+    sha512 = "02gs0nk2hihvayh7gxn1ncbq7nq1hbpr40whby6c58adk7g6jq3cn84fi8svcv10w915f696drav1cimjpizcyjn00if1iql59dmfda";
+    type = "pom";
+  };
+
+  mavenSharedComponents_7 = fetchMaven {
+    version = "7";
+    baseName = "maven-shared-components";
+    package = "/org/apache/maven/shared";
+    sha512 = "35zwvraafv86jpyfvfmi76n9bzmahq5z90j9axb3b6d0wfvildz5qb43kw27si2ldwghiwsfh2jikd3gf9ms553pfillf4baab13dp6";
+    type = "pom";
+  };
+
   mavenSharedComponents_11 = fetchMaven {
     version = "11";
     baseName = "maven-shared-components";
@@ -417,6 +473,14 @@ rec {
     type = "pom";
   };
 
+  ow2_1_3 = fetchMaven {
+    version = "1.3";
+    baseName = "ow2";
+    package = "/org/ow2";
+    sha512 = "1jqfqqmh19lvrjk45zzzp895jbxb8giw8sn1qdvwhh1yqxr1z5vkv98n4g0ib2l359qmb9fal4d21ba57zmbl0rqxqlggv9c5l87gfs";
+    type = "pom";
+  };
+
   plexus_1_0_4 = fetchMaven {
     version = "1.0.4";
     baseName = "plexus";
@@ -545,6 +609,14 @@ rec {
     type = "pom";
   };
 
+  plexusComponents_1_1_6 = fetchMaven {
+    version = "1.1.6";
+    baseName = "plexus-components";
+    package = "/org/codehaus/plexus";
+    sha512 = "1m6f5xzp6mk1n0svznqc8l5x3klr9kk75223ms31q65llx765dxvrsmkjlzgshb0ipb9nfxwk9hs5fvf5dgh0xlzrnc1w2pnqdi8jnh";
+    type = "pom";
+  };
+
   plexusComponents_1_1_7 = fetchMaven {
     version = "1.1.7";
     baseName = "plexus-components";
@@ -761,6 +833,14 @@ rec {
     type = "pom";
   };
 
+  surefireProviders_2_12_4 = fetchMaven {
+    version = "2.12.4";
+    baseName = "surefire-providers";
+    package = "/org/apache/maven/surefire";
+    sha512 = "08di6wgiihz9svrdpkdvhlipdp83byd1s844fnjqfk3z0g5a72lpq718zy27rk41jma3hclmr4pv0g5dvbhf3v8hy92iby8w5rcxv5x";
+    type = "pom";
+  };
+
   xbean_3_4 = fetchMaven {
     version = "3.4";
     baseName = "xbean";
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 488f4cb59db8..0df0b5a51c93 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -27,7 +27,8 @@ in {
     classworlds_1_1;
 
   inherit (callPackage ../development/java-modules/apache/commons-cli.nix { inherit fetchMaven; })
-    commonsCli_1_0;
+    commonsCli_1_0
+    commonsCli_1_2;
 
   inherit (callPackage ../development/java-modules/apache/commons-io.nix { inherit fetchMaven; })
     commonsIo_2_1;
@@ -49,6 +50,9 @@ in {
   inherit (callPackage ../development/java-modules/google/collections.nix { inherit fetchMaven; })
     googleCollections_1_0;
 
+  inherit (callPackage ../development/java-modules/hamcrest/all.nix { inherit fetchMaven; })
+    hamcrestAll_1_3;
+
   inherit (callPackage ../development/java-modules/hamcrest/core.nix { inherit fetchMaven; })
     hamcrestCore_1_3;
 
@@ -64,12 +68,15 @@ in {
     mavenArchiver_2_5;
 
   inherit (callPackage ../development/java-modules/maven/artifact.nix { inherit fetchMaven; })
+    mavenArtifact_2_0_1
     mavenArtifact_2_0_6
+    mavenArtifact_2_0_8
     mavenArtifact_2_0_9
     mavenArtifact_2_2_1
     mavenArtifact_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/artifact-manager.nix { inherit fetchMaven; })
+    mavenArtifactManager_2_0_1
     mavenArtifactManager_2_0_6
     mavenArtifactManager_2_0_9
     mavenArtifactManager_2_2_1;
@@ -80,6 +87,7 @@ in {
     mavenCommonArtifactFilters_1_4;
 
   inherit (callPackage ../development/java-modules/maven/core.nix { inherit fetchMaven; })
+    mavenCore_2_0_1
     mavenCore_2_0_6
     mavenCore_2_0_9
     mavenCore_2_2_1;
@@ -88,6 +96,7 @@ in {
     mavenDependencyTree_2_1;
 
   inherit (callPackage ../development/java-modules/maven/doxia-sink-api.nix { inherit fetchMaven; })
+    mavenDoxiaSinkApi_1_0_alpha6
     mavenDoxiaSinkApi_1_0_alpha7
     mavenDoxiaSinkApi_1_0_alpha10;
 
@@ -96,6 +105,7 @@ in {
     mavenEnforcerRules_1_3_1;
 
   inherit (callPackage ../development/java-modules/maven/error-diagnostics.nix { inherit fetchMaven; })
+    mavenErrorDiagnostics_2_0_1
     mavenErrorDiagnostics_2_0_6
     mavenErrorDiagnostics_2_0_9
     mavenErrorDiagnostics_2_2_1;
@@ -108,12 +118,14 @@ in {
     mavenHello_1_1;
 
   inherit (callPackage ../development/java-modules/maven/model.nix { inherit fetchMaven; })
+    mavenModel_2_0_1
     mavenModel_2_0_6
     mavenModel_2_0_9
     mavenModel_2_2_1
     mavenModel_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/monitor.nix { inherit fetchMaven; })
+    mavenMonitor_2_0_1
     mavenMonitor_2_0_6
     mavenMonitor_2_0_9
     mavenMonitor_2_2_1;
@@ -123,27 +135,35 @@ in {
     mavenPluginAnnotations_3_2;
 
   inherit (callPackage ../development/java-modules/maven/plugin-api.nix { inherit fetchMaven; })
+    mavenPluginApi_2_0_1
     mavenPluginApi_2_0_6
     mavenPluginApi_2_0_9
     mavenPluginApi_2_2_1
     mavenPluginApi_3_0_3;
 
   inherit (callPackage ../development/java-modules/maven/plugin-descriptor.nix { inherit fetchMaven; })
+    mavenPluginDescriptor_2_0_1
     mavenPluginDescriptor_2_0_6
     mavenPluginDescriptor_2_0_9
     mavenPluginDescriptor_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-parameter-documenter.nix { inherit fetchMaven; })
+    mavenPluginParameterDocumenter_2_0_1
     mavenPluginParameterDocumenter_2_0_6
     mavenPluginParameterDocumenter_2_0_9
     mavenPluginParameterDocumenter_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/plugin-registry.nix { inherit fetchMaven; })
+    mavenPluginRegistry_2_0_1
     mavenPluginRegistry_2_0_6
     mavenPluginRegistry_2_0_9
     mavenPluginRegistry_2_2_1;
 
+  inherit (callPackage ../development/java-modules/maven/plugin-testing-harness.nix { inherit fetchMaven; })
+    mavenPluginTestingHarness_1_1;
+
   inherit (callPackage ../development/java-modules/maven/profile.nix { inherit fetchMaven; })
+    mavenProfile_2_0_1
     mavenProfile_2_0_6
     mavenProfile_2_0_9
     mavenProfile_2_2_1;
@@ -151,19 +171,24 @@ in {
   inherit (callPackage ../development/java-modules/maven/project.nix { inherit fetchMaven; })
     mavenProject_2_0_1
     mavenProject_2_0_6
+    mavenProject_2_0_8
     mavenProject_2_0_9
     mavenProject_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/reporting-api.nix { inherit fetchMaven; })
+    mavenReportingApi_2_0_1
     mavenReportingApi_2_0_6
-    mavenReportingApi_2_0_9;
+    mavenReportingApi_2_0_9
+    mavenReportingApi_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/repository-metadata.nix { inherit fetchMaven; })
+    mavenRepositoryMetadata_2_0_1
     mavenRepositoryMetadata_2_0_6
     mavenRepositoryMetadata_2_0_9
     mavenRepositoryMetadata_2_2_1;
 
   inherit (callPackage ../development/java-modules/maven/settings.nix { inherit fetchMaven; })
+    mavenSettings_2_0_1
     mavenSettings_2_0_6
     mavenSettings_2_0_9
     mavenSettings_2_2_1;
@@ -186,6 +211,9 @@ in {
     mavenSurefireCommon_2_12_4
     mavenSurefireCommon_2_17;
 
+  inherit (callPackage ../development/java-modules/maven/surefire-junit4.nix { inherit fetchMaven; })
+    mavenSurefireJunit4_2_12_4;
+
   inherit (callPackage ../development/java-modules/maven/toolchain.nix { inherit fetchMaven; })
     mavenToolchain_1_0
     mavenToolchain_2_0_9
@@ -194,7 +222,14 @@ in {
   inherit (callPackage ../development/java-modules/mojo/animal-sniffer.nix { inherit fetchMaven; })
     mojoAnimalSniffer_1_11;
 
+  inherit (callPackage ../development/java-modules/mojo/java-boot-classpath-detector.nix { inherit fetchMaven; })
+    mojoJavaBootClasspathDetector_1_11;
+
+  inherit (callPackage ../development/java-modules/ow2/asm-all.nix { inherit fetchMaven; })
+    ow2AsmAll_4_0;
+
   inherit (callPackage ../development/java-modules/plexus/archiver.nix { inherit fetchMaven; })
+    plexusArchiver_1_0_alpha7
     plexusArchiver_2_1;
 
   inherit (callPackage ../development/java-modules/plexus/build-api.nix { inherit fetchMaven; })
@@ -241,9 +276,11 @@ in {
 
   inherit (callPackage ../development/java-modules/plexus/utils.nix { inherit fetchMaven; })
     plexusUtils_1_0_4
+    plexusUtils_1_0_5
     plexusUtils_1_1
     plexusUtils_1_4_1
     plexusUtils_1_4_5
+    plexusUtils_1_4_9
     plexusUtils_1_5_1
     plexusUtils_1_5_5
     plexusUtils_1_5_6

From 82c1ff501aec3f625ad423c795e53fbe5ea761be Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 15 Nov 2016 14:44:35 -0500
Subject: [PATCH 0029/3449] Create mavenLibs

---
 pkgs/development/java-modules/collections.nix | 77 +++++++++++++++++++
 .../java-modules/junit/default.nix            |  4 +-
 .../java-modules/maven-minimal.nix            | 52 ++-----------
 3 files changed, 86 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/java-modules/collections.nix

diff --git a/pkgs/development/java-modules/collections.nix b/pkgs/development/java-modules/collections.nix
new file mode 100644
index 000000000000..39b274b5030a
--- /dev/null
+++ b/pkgs/development/java-modules/collections.nix
@@ -0,0 +1,77 @@
+{ pkgs }:
+
+with pkgs.javaPackages;
+
+rec {
+  mavenLibs_2_0_1 = [
+    mavenArtifact_2_0_1
+    mavenArtifactManager_2_0_1
+    mavenCore_2_0_1
+    mavenErrorDiagnostics_2_0_1
+    mavenModel_2_0_1
+    mavenMonitor_2_0_1
+    mavenPluginApi_2_0_1
+    mavenPluginDescriptor_2_0_1
+    mavenPluginParameterDocumenter_2_0_1
+    mavenPluginRegistry_2_0_1
+    mavenProfile_2_0_1
+    mavenProject_2_0_1
+    mavenReportingApi_2_0_1
+    mavenRepositoryMetadata_2_0_1
+    mavenSettings_2_0_1
+  ];
+
+  mavenLibs_2_0_6 = [
+    mavenArtifact_2_0_6
+    mavenArtifactManager_2_0_6
+    mavenCore_2_0_6
+    mavenErrorDiagnostics_2_0_6
+    mavenModel_2_0_6
+    mavenMonitor_2_0_6
+    mavenPluginApi_2_0_6
+    mavenPluginDescriptor_2_0_6
+    mavenPluginParameterDocumenter_2_0_6
+    mavenPluginRegistry_2_0_6
+    mavenProfile_2_0_6
+    mavenProject_2_0_6
+    mavenReportingApi_2_0_6
+    mavenRepositoryMetadata_2_0_6
+    mavenSettings_2_0_6
+  ];
+
+  mavenLibs_2_0_9 = [
+    mavenArtifact_2_0_9
+    mavenArtifactManager_2_0_9
+    mavenCore_2_0_9
+    mavenErrorDiagnostics_2_0_9
+    mavenModel_2_0_9
+    mavenMonitor_2_0_9
+    mavenPluginApi_2_0_9
+    mavenPluginDescriptor_2_0_9
+    mavenPluginParameterDocumenter_2_0_9
+    mavenPluginRegistry_2_0_9
+    mavenProfile_2_0_9
+    mavenProject_2_0_9
+    mavenReportingApi_2_0_9
+    mavenRepositoryMetadata_2_0_9
+    mavenSettings_2_0_9
+  ];
+
+  mavenLibs_2_2_1 = [
+    mavenArtifact_2_2_1
+    mavenArtifactManager_2_2_1
+    mavenCore_2_2_1
+    mavenErrorDiagnostics_2_2_1
+    mavenModel_2_2_1
+    mavenMonitor_2_2_1
+    mavenPluginApi_2_2_1
+    mavenPluginDescriptor_2_2_1
+    mavenPluginParameterDocumenter_2_2_1
+    mavenPluginRegistry_2_2_1
+    mavenProfile_2_2_1
+    mavenProject_2_2_1
+    mavenReportingApi_2_2_1
+    mavenRepositoryMetadata_2_2_1
+    mavenSettings_2_2_1
+  ];
+}
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 84ccef3975d2..2f315fa3161f 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -4,6 +4,7 @@ with pkgs.javaPackages;
 
 let
   poms = import (../poms.nix) { inherit fetchMaven; };
+  collections = import (../collections.nix) { inherit pkgs; };
 in rec {
   junitGen = { mavenDeps, sha512, version }: mavenbuild rec {
     inherit mavenDeps sha512 version;
@@ -51,7 +52,8 @@ in rec {
 
   junit_4_12 = junitGen {
     mavenDeps = (with mavenPlugins; [ animalSniffer_1_11 mavenEnforcer_1_3_1 mavenReplacer_1_5_3 mavenSurefire_2_17 ])
-                  ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_1 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenArtifactManager_2_0_1 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenCore_2_0_1 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenErrorDiagnostics_2_0_1 mavenModel_2_0_1 mavenModel_3_0_3 mavenMonitor_2_0_1 mavenPluginApi_2_0_1 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginDescriptor_2_0_1 mavenPluginParameterDocumenter_2_0_1 mavenPluginRegistry_2_0_1 mavenPluginTestingHarness_1_1 mavenProfile_2_0_1 mavenProject_2_0_1 mavenProject_2_0_8 mavenReportingApi_2_0_1 mavenReportingApi_2_2_1 mavenRepositoryMetadata_2_0_1 mavenSettings_2_0_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
+                  ++ collections.mavenLibs_2_0_1
+                  ++ [ aetherUtil_0_9_0_M2 ant_1_8_2 antLauncher_1_8_2 bsh_2_0_b4 commonsCli_1_2 commonsIo_2_1 commonsLang_2_3 commonsLang_2_6 hamcrestCore_1_3 mavenArtifact_2_0_8 mavenArtifact_3_0_3 mavenCommonArtifactFilters_1_2 mavenCommonArtifactFilters_1_4 mavenDependencyTree_2_1 mavenDoxiaSinkApi_1_0_alpha6 mavenDoxiaSinkApi_1_0_alpha10 mavenEnforcerApi_1_3_1 mavenEnforcerRules_1_3_1 mavenModel_3_0_3 mavenPluginApi_3_0_3 mavenPluginAnnotations_3_2 mavenPluginTestingHarness_1_1 mavenProject_2_0_8 mavenReportingApi_2_2_1 mavenSurefireApi_2_17 mavenSurefireBooter_2_17 mavenSurefireCommon_2_17 mavenToolchain_2_2_1 mojoAnimalSniffer_1_11 mojoJavaBootClasspathDetector_1_11 ow2AsmAll_4_0 plexusArchiver_1_0_alpha7 plexusClassworlds_2_4 plexusI18n_1_0_beta6 plexusUtils_1_0_5 plexusUtils_1_1 plexusUtils_1_4_9 plexusUtils_1_5_6 plexusUtils_2_0_6 sisuGuice_2_9_4 sisuInjectBean_2_1_1 sisuInjectPlexus_2_1_1 xercesImpl_2_8_0 xmlApis_1_3_03 ]
                   ++ (with poms; [ aether_0_9_0_M2 animalSnifferParent_1_11 antParent_1_8_2 apache_1 apache_7 asmParent_4_0 beanshell_2_0_b4 codehausParent_4 commonsParent_11 commonsParent_17 doxia_1_0_alpha6 doxia_1_0_alpha10 enforcer_1_3_1 hamcrestParent_1_3 maven_2_0_1 maven_2_0_8 maven_3_0_3 mavenParent_6 mavenParent_15 mavenPluginTools_3_2 mavenReporting_2_0_1 mavenReporting_2_2_1 mavenSharedComponents_7 mavenSharedComponents_11 mojoParent_32 ow2_1_3 plexus_1_0_12 plexusComponents_1_1_4 plexusComponents_1_1_6 sisuInjectGuiceBean_2_1_1 sisuInject_2_1_1 sisuInjectGuicePlexus_2_1_1 sisuParent_2_1_1 sonatypeForgeParent_7 sonatypeParent_7 surefire_2_17 ]);
     sha512 = "0bbldnf37jl855s1pdx2a518ivfifv75189vsbpylnj8530vnf8z6b2dglkcbcjgr22lp1s4m1nnplz5dmka9sr7vj055p88k27kqw9";
     version = "4.12";
diff --git a/pkgs/development/java-modules/maven-minimal.nix b/pkgs/development/java-modules/maven-minimal.nix
index 359060c8dae2..df87f51768df 100644
--- a/pkgs/development/java-modules/maven-minimal.nix
+++ b/pkgs/development/java-modules/maven-minimal.nix
@@ -4,13 +4,17 @@ with stdenv.lib;
 with pkgs.javaPackages;
 
 let
+  collections = import ./collections.nix { inherit pkgs; };
   fetchMaven = pkgs.callPackage ./m2install.nix { };
-  poms = import ./poms.nix { inherit fetchMaven; };
   plugins = import ./mavenPlugins.nix { inherit stdenv pkgs maven; };
+  poms = import ./poms.nix { inherit fetchMaven; };
 in rec {
   # Maven needs all of these to function
   mavenMinimal = flatten
-    [
+    collections.mavenLibs_2_0_6
+    ++ collections.mavenLibs_2_0_9
+    ++ collections.mavenLibs_2_2_1
+    ++ [
       classworlds_1_1_alpha2
       classworlds_1_1
       commonsCli_1_0
@@ -23,54 +27,10 @@ in rec {
       junit_3_8_2
       log4j_1_2_12
       mavenArchiver_2_5
-      mavenArtifact_2_0_6
-      mavenArtifact_2_0_9
-      mavenArtifact_2_2_1
-      mavenArtifactManager_2_0_6
-      mavenArtifactManager_2_0_9
-      mavenArtifactManager_2_2_1
       mavenCommonArtifactFilters_1_3
-      mavenCore_2_0_6
-      mavenCore_2_0_9
-      mavenCore_2_2_1
       mavenDoxiaSinkApi_1_0_alpha7
-      mavenErrorDiagnostics_2_0_6
-      mavenErrorDiagnostics_2_0_9
-      mavenErrorDiagnostics_2_2_1
       mavenFiltering_1_1
-      mavenModel_2_0_6
-      mavenModel_2_0_9
-      mavenModel_2_2_1
-      mavenMonitor_2_0_6
-      mavenMonitor_2_0_9
-      mavenMonitor_2_2_1
-      mavenPluginDescriptor_2_0_6
-      mavenPluginDescriptor_2_0_9
-      mavenPluginDescriptor_2_2_1
-      mavenPluginParameterDocumenter_2_0_6
-      mavenPluginParameterDocumenter_2_0_9
-      mavenPluginParameterDocumenter_2_2_1
-      mavenProfile_2_0_6
-      mavenProfile_2_0_9
-      mavenProfile_2_2_1
-      mavenProject_2_0_6
-      mavenProject_2_0_9
-      mavenProject_2_2_1
       mavenPluginAnnotations_3_1
-      mavenPluginApi_2_0_6
-      mavenPluginApi_2_0_9
-      mavenPluginApi_2_2_1
-      mavenPluginRegistry_2_0_6
-      mavenPluginRegistry_2_0_9
-      mavenPluginRegistry_2_2_1
-      mavenReportingApi_2_0_6
-      mavenReportingApi_2_0_9
-      mavenRepositoryMetadata_2_0_6
-      mavenRepositoryMetadata_2_0_9
-      mavenRepositoryMetadata_2_2_1
-      mavenSettings_2_0_6
-      mavenSettings_2_0_9
-      mavenSettings_2_2_1
       mavenSharedIncremental_1_1
       mavenSharedUtils_0_1
       mavenSurefireApi_2_12_4

From e5b7975fe3af0b62c6ac976895de510ce1673a53 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 16 Nov 2016 16:28:27 +0900
Subject: [PATCH 0030/3449] acme module: certs option loaOf -> attrsOf

---
 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 12736e57b4a6..3e9239406922 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -129,7 +129,7 @@ in
 
       certs = mkOption {
         default = { };
-        type = with types; loaOf (submodule certOpts);
+        type = with types; attrsOf (submodule certOpts);
         description = ''
           Attribute set of certificates to get signed and renewed.
         '';

From 418901a906e57bf558f80ae7b52c19e0f1c39777 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 16 Nov 2016 16:29:58 +0900
Subject: [PATCH 0031/3449] logcheck module: ignore, ignoreCron option loaOf ->
 attrsOf

---
 nixos/modules/services/logging/logcheck.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 27ed5374f561..2cb0a8523775 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -184,7 +184,7 @@ in
         description = ''
           This option defines extra ignore rules.
         '';
-        type = with types; loaOf (submodule ignoreOptions);
+        type = with types; attrsOf (submodule ignoreOptions);
       };
 
       ignoreCron = mkOption {
@@ -192,7 +192,7 @@ in
         description = ''
           This option defines extra ignore rules for cronjobs.
         '';
-        type = with types; loaOf (submodule ignoreCronOptions);
+        type = with types; attrsOf (submodule ignoreCronOptions);
       };
 
       extraGroups = mkOption {

From 2a9de9162f4281428ec64dcd9c2d06e1463a5b7e Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 16 Nov 2016 16:31:05 +0900
Subject: [PATCH 0032/3449] tahoe module: introducers, nodes option loaOf ->
 attrsOf

---
 nixos/modules/services/network-filesystems/tahoe.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
index f91827c379de..94668c9bb698 100644
--- a/nixos/modules/services/network-filesystems/tahoe.nix
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -8,7 +8,7 @@ in
     options.services.tahoe = {
       introducers = mkOption {
         default = {};
-        type = with types; loaOf (submodule {
+        type = with types; attrsOf (submodule {
           options = {
             nickname = mkOption {
               type = types.str;
@@ -49,7 +49,7 @@ in
       };
       nodes = mkOption {
         default = {};
-        type = with types; loaOf (submodule {
+        type = with types; attrsOf (submodule {
           options = {
             nickname = mkOption {
               type = types.str;

From b4d1d37b22c056d89456ff8ef3697b3bd6aa9225 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 16 Nov 2016 16:32:02 +0900
Subject: [PATCH 0033/3449] tinc module: networks, hosts option loaOf ->
 attrsOf

---
 nixos/modules/services/networking/tinc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index f8e68fda7fc2..6cb40185274d 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -18,7 +18,7 @@ in
 
       networks = mkOption {
         default = { };
-        type = with types; loaOf (submodule {
+        type = with types; attrsOf (submodule {
           options = {
 
             extraConfig = mkOption {
@@ -59,7 +59,7 @@ in
 
             hosts = mkOption {
               default = { };
-              type = types.loaOf types.lines;
+              type = types.attrsOf types.lines;
               description = ''
                 The name of the host in the network as well as the configuration for that host.
                 This name should only contain alphanumerics and underscores.

From 57c4d6f380ad3cc4f07b598dd838a09a4f38c4d2 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 16 Nov 2016 16:33:06 +0900
Subject: [PATCH 0034/3449] znc module: networks option loaOf -> attrsOf

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

diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 76ba78ff366f..0d41e3ea92ce 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -208,7 +208,7 @@ in
 
         networks = mkOption {
           default = { };
-          type = with types; loaOf (submodule networkOpts);
+          type = with types; attrsOf (submodule networkOpts);
           description = ''
             IRC networks to connect the user to.
           '';

From 821e8d46810e44215851696f686bd3ad9b360b8a Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 16 Nov 2016 16:34:00 +0900
Subject: [PATCH 0035/3449] zope2 module: instance option loaOf -> attrsOf

---
 nixos/modules/services/web-servers/zope2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix
index 8a453e015577..496e34db4a96 100644
--- a/nixos/modules/services/web-servers/zope2.nix
+++ b/nixos/modules/services/web-servers/zope2.nix
@@ -74,7 +74,7 @@ in
 
     services.zope2.instances = mkOption {
       default = {};
-      type = with types; loaOf (submodule zope2Opts);
+      type = with types; attrsOf (submodule zope2Opts);
       example = literalExample ''
         {
           plone01 = {

From c5607ceec5495ed77b5dcd566d6732881a153fe8 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 4 Dec 2016 22:05:15 +0100
Subject: [PATCH 0036/3449] pulseaudio module: set cookie env variable if
 running in systen wide mode

---
 nixos/modules/config/pulseaudio.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 06ce52004202..91daef5a19da 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -280,6 +280,8 @@ in {
           RestartSec = "500ms";
         };
       };
+
+      environment.variables.PULSE_COOKIE = "${stateDir}/.config/pulse/cookie";
     })
   ];
 

From 8ce94b6e891dbb59776f6a94a342f8efbcfc07f4 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 4 Dec 2016 22:06:14 +0100
Subject: [PATCH 0037/3449] virtualbox guest module: make x11 optional

---
 .../virtualisation/virtualbox-guest.nix       | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index d253e9eab62b..5da4b7e3bafd 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -15,18 +15,27 @@ in
 
   ###### interface
 
-  options.virtualisation.virtualbox.guest.enable = mkOption {
-    default = false;
-    description = "Whether to enable the VirtualBox service and other guest additions.";
+  options.virtualisation.virtualbox.guest = {
+    enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = "Whether to enable the VirtualBox service and other guest additions.";
+    };
+
+    x11 = mkOption {
+      default = true;
+      type = types.bool;
+      description = "Whether to enable x11 graphics";
+    };
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
-    assertions = [ {
+  config = mkIf cfg.enable (mkMerge [{
+    assertions = [{
       assertion = pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64;
       message = "Virtualbox not currently supported on ${pkgs.stdenv.system}";
-    } ];
+    }];
 
     environment.systemPackages = [ kernel.virtualboxGuestAdditions ];
 
@@ -49,6 +58,16 @@ in
         serviceConfig.ExecStart = "@${kernel.virtualboxGuestAdditions}/bin/VBoxService VBoxService --foreground";
       };
 
+    services.udev.extraRules =
+      ''
+        # /dev/vboxuser is necessary for VBoxClient to work.  Maybe we
+        # should restrict this to logged-in users.
+        KERNEL=="vboxuser",  OWNER="root", GROUP="root", MODE="0666"
+
+        # Allow systemd dependencies on vboxguest.
+        SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"
+      '';
+  } (mkIf cfg.x11 {
     services.xserver.videoDrivers = mkOverride 50 [ "virtualbox" "modesetting" ];
 
     services.xserver.config =
@@ -69,16 +88,6 @@ in
         PATH=${makeBinPath [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \
           ${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all
       '';
-
-    services.udev.extraRules =
-      ''
-        # /dev/vboxuser is necessary for VBoxClient to work.  Maybe we
-        # should restrict this to logged-in users.
-        KERNEL=="vboxuser",  OWNER="root", GROUP="root", MODE="0666"
-
-        # Allow systemd dependencies on vboxguest.
-        SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd"
-      '';
-  };
+  })]);
 
 }

From adabb646bdc87733c2ddb2ca4950fa67bbaf91ae Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 4 Dec 2016 22:26:43 +0100
Subject: [PATCH 0038/3449] xpra: add pam support

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

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 4ae367abf612..8206a0113311 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -3,7 +3,8 @@
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama
-, gst_all_1, pulseaudioLight, gobjectIntrospection }:
+, gst_all_1, pulseaudioLight, gobjectIntrospection
+, pam }:
 
 with lib;
 
@@ -36,16 +37,19 @@ in buildPythonApplication rec {
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-libav
 
+    pam
+
     makeWrapper
   ];
 
   propagatedBuildInputs = with python2Packages; [
     pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python
-    netifaces numpy websockify pygobject3 gst-python
+    netifaces numpy websockify pygobject3 gst-python pam
   ];
 
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0) $(pkg-config --cflags pygtk-2.0) $(pkg-config --cflags xtst)"
+    substituteInPlace xpra/server/auth/pam.py --replace "/lib/libpam.so.1" "${pam}/lib/libpam.so"
   '';
   setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
 

From 7fd8dfc6216f6dc2ff21163f55144dbda77d7fb8 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 4 Dec 2016 22:27:30 +0100
Subject: [PATCH 0039/3449] xpra: do not preset FONTCONFIG_FILE and
 XPRA_LOG_DIR env variables

---
 pkgs/tools/X11/xpra/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 8206a0113311..edfc46ea8987 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -61,13 +61,11 @@ in buildPythonApplication rec {
 
   postInstall = ''
     wrapProgram $out/bin/xpra \
-      --set FONTCONFIG_FILE "${fontsConf}" \
-      --set XPRA_LOG_DIR "\$HOME/.xpra" \
       --set XPRA_INSTALL_PREFIX "$out" \
       --set GI_TYPELIB_PATH "$GI_TYPELIB_PATH" \
       --set GST_PLUGIN_SYSTEM_PATH_1_0 "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]} \
+      --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib  \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux pulseaudioLight ]}
   '';
 
   preCheck = "exit 0";

From b72f8ccc5cb86a8f81768a74dd2beb5022f50969 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 4 Dec 2016 22:30:42 +0100
Subject: [PATCH 0040/3449] xpra module: add xpra, as xserver display-manager

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/x11/display-managers/xpra.nix    | 249 ++++++++++++++++++
 nixos/modules/services/x11/xserver.nix        |  14 +-
 3 files changed, 261 insertions(+), 3 deletions(-)
 create mode 100644 nixos/modules/services/x11/display-managers/xpra.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 155d7a5ef923..177f80fed975 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -534,6 +534,7 @@
   ./services/x11/display-managers/lightdm.nix
   ./services/x11/display-managers/sddm.nix
   ./services/x11/display-managers/slim.nix
+  ./services/x11/display-managers/xpra.nix
   ./services/x11/hardware/libinput.nix
   ./services/x11/hardware/multitouch.nix
   ./services/x11/hardware/synaptics.nix
diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix
new file mode 100644
index 000000000000..e60dd8765264
--- /dev/null
+++ b/nixos/modules/services/x11/display-managers/xpra.nix
@@ -0,0 +1,249 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.displayManager.xpra;
+  dmcfg = config.services.xserver.displayManager;
+
+in
+
+{
+  ###### interface
+
+  options = {
+    services.xserver.displayManager.xpra = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable xpra as display manager.";
+      };
+
+      bindTcp = mkOption {
+        default = "127.0.0.1:10000";
+        example = "0.0.0.0:10000";
+        type = types.nullOr types.str;
+        description = "Bind xpra to TCP";
+      };
+
+      auth = mkOption {
+        type = types.str;
+        default = "pam";
+        example = "password:value=mysecret";
+        description = "Authentication to use when connecting to xpra";
+      };
+
+      pulseaudio = mkEnableOption "pulseaudio audio streaming.";
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    services.xserver.videoDrivers = ["dummy"];
+
+    services.xserver.monitorSection = ''
+      HorizSync   1.0 - 2000.0
+      VertRefresh 1.0 - 200.0
+      #To add your own modes here, use a modeline calculator, like:
+      # cvt:
+      # http://www.x.org/archive/X11R7.5/doc/man/man1/cvt.1.html
+      # xtiming:
+      # http://xtiming.sourceforge.net/cgi-bin/xtiming.pl
+      # gtf:
+      # http://gtf.sourceforge.net/
+      #This can be used to get a specific DPI, but only for the default resolution:
+      #DisplaySize 508 317
+      #NOTE: the highest modes will not work without increasing the VideoRam
+      # for the dummy video card.
+      #Modeline "16000x15000" 300.00  16000 16408 18000 20000  15000 15003 15013 15016
+      #Modeline "15000x15000" 281.25  15000 15376 16872 18744  15000 15003 15013 15016
+      #Modeline "16384x8192" 167.75  16384 16800 18432 20480  8192 8195 8205 8208
+      #Modeline "15360x8640" 249.00 15360 15752 17280 19200 8640 8643 8648 8651
+      Modeline "8192x4096" 193.35 8192 8224 8952 8984 4096 4196 4200 4301
+      Modeline "7680x4320" 208.00 7680 7880 8640 9600 4320 4323 4328 4335
+      Modeline "6400x4096" 151.38 6400 6432 7000 7032 4096 4196 4200 4301
+      Modeline "6400x2560" 91.59 6400 6432 6776 6808 2560 2623 2626 2689
+      Modeline "6400x2160" 160.51 6400 6432 7040 7072 2160 2212 2216 2269
+      Modeline "5760x2160" 149.50 5760 5768 6320 6880 2160 2161 2164 2173
+      Modeline "5680x1440" 142.66 5680 5712 6248 6280 1440 1474 1478 1513
+      Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
+      Modeline "5280x2560" 75.72 5280 5312 5592 5624 2560 2623 2626 2689
+      Modeline "5280x1920" 56.04 5280 5312 5520 5552 1920 1967 1969 2017
+      Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
+      Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
+      Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
+      Modeline "5120x2560" 73.45 5120 5152 5424 5456 2560 2623 2626 2689
+      Modeline "5120x2880" 185.50 5120 5256 5760 6400 2880 2883 2888 2899
+      Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
+      Modeline "4720x3840" 227.86 4720 4752 5616 5648 3840 3933 3940 4033
+      Modeline "4400x2560" 133.70 4400 4432 4936 4968 2560 2622 2627 2689
+      Modeline "4480x1440" 72.94 4480 4512 4784 4816 1440 1475 1478 1513
+      Modeline "4240x1440" 69.09 4240 4272 4528 4560 1440 1475 1478 1513
+      Modeline "4160x1440" 67.81 4160 4192 4448 4480 1440 1475 1478 1513
+      Modeline "4096x2304" 249.25 4096 4296 4720 5344 2304 2307 2312 2333
+      Modeline "4096x2160" 111.25 4096 4200 4608 5120 2160 2163 2173 2176
+      Modeline "4000x1660" 170.32 4000 4128 4536 5072 1660 1661 1664 1679
+      Modeline "4000x1440" 145.00 4000 4088 4488 4976 1440 1441 1444 1457
+      Modeline "3904x1440" 63.70 3904 3936 4176 4208 1440 1475 1478 1513
+      Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
+      Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
+      Modeline "3840x2160" 104.25 3840 3944 4320 4800 2160 2163 2168 2175
+      Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
+      Modeline "3840x1200" 108.89 3840 3872 4280 4312 1200 1228 1232 1261
+      Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
+      Modeline "3864x1050" 94.58 3864 3896 4248 4280 1050 1074 1078 1103
+      Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
+      Modeline "3600x1080" 91.02 3600 3632 3976 4008 1080 1105 1109 1135
+      Modeline "3520x1196" 99.53 3520 3552 3928 3960 1196 1224 1228 1256
+      Modeline "3360x2560" 102.55 3360 3392 3776 3808 2560 2622 2627 2689
+      Modeline "3360x1050" 293.75 3360 3576 3928 4496 1050 1053 1063 1089
+      Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
+      Modeline "3200x1800" 233.00 3200 3384 3720 4240  1800 1803 1808 1834
+      Modeline "3200x1080" 236.16 3200 3232 4128 4160 1080 1103 1112 1135
+      Modeline "3120x2560" 95.36 3120 3152 3512 3544 2560 2622 2627 2689
+      Modeline "3120x1050" 272.75 3120 3320 3648 4176 1050 1053 1063 1089
+      Modeline "3072x2560" 93.92 3072 3104 3456 3488 2560 2622 2627 2689
+      Modeline "3008x1692" 130.93 3008 3112 3416 3824 1692 1693 1696 1712
+      Modeline "3000x2560" 91.77 3000 3032 3376 3408 2560 2622 2627 2689
+      Modeline "2880x1620" 396.25 2880 3096 3408 3936 1620 1623 1628 1679
+      Modeline "2728x1680" 148.02 2728 2760 3320 3352 1680 1719 1726 1765
+      Modeline "2560x2240" 151.55 2560 2688 2952 3344 2240 2241 2244 2266
+      Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
+      Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
+      Modeline "2560x1400" 267.86 2560 2592 3608 3640 1400 1429 1441 1471
+      Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
+      Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
+      Modeline "2048x1152" 197.97 2048 2184 2408 2768 1152 1153 1156 1192
+      Modeline "2048x1152" 165.92 2048 2080 2704 2736 1152 1176 1186 1210
+      Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
+      Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
+      Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
+      Modeline "1728x1520" 205.42 1728 1760 2536 2568 1520 1552 1564 1597
+      Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
+      Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
+      Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
+      Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
+      Modeline "1400x900" 103.50 1400 1480 1624 1848 900 903 913 934
+      ModeLine "1366x768" 72.00 1366 1414 1446 1494  768 771 777 803
+      Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807
+      Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
+      Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+      Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
+      Modeline "1280x720" 59.42 1280 1312 1536 1568 720 735 741 757
+      Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807
+      Modeline "1024x640" 41.98 1024 1056 1208 1240 640 653 659 673
+      Modeline "1024x576" 46.50 1024 1064 1160 1296  576 579 584 599
+      Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076
+      Modeline "960x540" 40.75 960 992 1088 1216 540 543 548 562
+      Modeline "864x486"  32.50 864 888 968 1072 486 489 494 506
+      Modeline "720x405" 22.50 720 744 808 896  405 408 413 422
+      Modeline "640x360" 14.75 640 664 720 800 360 363 368 374
+      #common resolutions for android devices (both orientations):
+      Modeline "800x1280" 25.89 800 832 928 960 1280 1310 1315 1345
+      Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+      Modeline "720x1280" 30.22 720 752 864 896 1280 1309 1315 1345
+      Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757
+      Modeline "768x1024" 24.93 768 800 888 920 1024 1047 1052 1076
+      Modeline "1024x768" 23.77 1024 1056 1144 1176 768 785 789 807
+      Modeline "600x1024" 19.90 600 632 704 736 1024 1047 1052 1076
+      Modeline "1024x600" 18.26 1024 1056 1120 1152 600 614 617 631
+      Modeline "536x960" 16.74 536 568 624 656 960 982 986 1009
+      Modeline "960x536" 15.23 960 992 1048 1080 536 548 551 563
+      Modeline "600x800" 15.17 600 632 688 720 800 818 822 841
+      Modeline "800x600" 14.50 800 832 880 912 600 614 617 631
+      Modeline "480x854" 13.34 480 512 560 592 854 873 877 897
+      Modeline "848x480" 12.09 848 880 920 952 480 491 493 505
+      Modeline "480x800" 12.43 480 512 552 584 800 818 822 841
+      Modeline "800x480" 11.46 800 832 872 904 480 491 493 505
+      #resolutions for android devices (both orientations)
+      #minus the status bar
+      #38px status bar (and width rounded up)
+      Modeline "800x1242" 25.03 800 832 920 952 1242 1271 1275 1305
+      Modeline "1280x762" 22.93 1280 1312 1392 1424 762 780 783 801
+      Modeline "720x1242" 29.20 720 752 856 888 1242 1271 1276 1305
+      Modeline "1280x682" 25.85 1280 1312 1408 1440 682 698 701 717
+      Modeline "768x986" 23.90 768 800 888 920 986 1009 1013 1036
+      Modeline "1024x730" 22.50 1024 1056 1136 1168 730 747 750 767
+      Modeline "600x986" 19.07 600 632 704 736 986 1009 1013 1036
+      Modeline "1024x562" 17.03 1024 1056 1120 1152 562 575 578 591
+      Modeline "536x922" 16.01 536 568 624 656 922 943 947 969
+      Modeline "960x498" 14.09 960 992 1040 1072 498 509 511 523
+      Modeline "600x762" 14.39 600 632 680 712 762 779 783 801
+      Modeline "800x562" 13.52 800 832 880 912 562 575 578 591
+      Modeline "480x810" 12.59 480 512 552 584 810 828 832 851
+      Modeline "848x442" 11.09 848 880 920 952 442 452 454 465
+      Modeline "480x762" 11.79 480 512 552 584 762 779 783 801
+    '';
+
+    services.xserver.resolutions = [
+      {x="8192"; y="4096";}
+      {x="5120"; y="3200";}
+      {x="3840"; y="2880";}
+      {x="3840"; y="2560";}
+      {x="3840"; y="2048";}
+      {x="3840"; y="2160";}
+      {x="2048"; y="2048";}
+      {x="2560"; y="1600";}
+      {x="1920"; y="1440";}
+      {x="1920"; y="1200";}
+      {x="1920"; y="1080";}
+      {x="1600"; y="1200";}
+      {x="1680"; y="1050";}
+      {x="1600"; y="900";}
+      {x="1400"; y="1050";}
+      {x="1440"; y="900";}
+      {x="1280"; y="1024";}
+      {x="1366"; y="768";}
+      {x="1280"; y="800";}
+      {x="1024"; y="768";}
+      {x="1024"; y="600";}
+      {x="800"; y="600";}
+      {x="320"; y="200";}
+    ];
+
+    services.xserver.serverFlagsSection = ''
+      Option "DontVTSwitch" "true"
+      Option "PciForceNone" "true"
+      Option "AutoEnableDevices" "false"
+      Option "AutoAddDevices" "false"
+    '';
+
+    services.xserver.deviceSection = ''
+      VideoRam 192000
+    '';
+
+    services.xserver.displayManager.job = {
+      logsXsession = true;
+
+      execCmd = ''
+        ${optionalString (cfg.pulseaudio)
+          "export PULSE_COOKIE=/var/run/pulse/.config/pulse/cookie"}
+        exec ${pkgs.xpra}/bin/xpra start \
+          --daemon=off \
+          --log-dir=/var/log \
+          --log-file=xpra.log \
+          --opengl=on \
+          --clipboard=on \
+          --notifications=on \
+          --speaker=yes \
+          --mdns=no \
+          --pulseaudio=no \
+          ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \
+          --socket-dirs=/var/run/xpra \
+          --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \
+          ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \
+          --auth=${cfg.auth}
+      '';
+    };
+
+    services.xserver.terminateOnReset = false;
+
+    environment.systemPackages = [pkgs.xpra];
+
+    virtualisation.virtualbox.guest.x11 = false;
+    hardware.pulseaudio.enable = mkDefault cfg.pulseaudio;
+    hardware.pulseaudio.systemWide = mkDefault cfg.pulseaudio;
+  };
+
+}
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index f5ed52338182..127577875af0 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -435,6 +435,14 @@ in
           by default.
         '';
       };
+
+      terminateOnReset = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to terminate X upon server reset.
+        '';
+      };
     };
 
   };
@@ -548,8 +556,7 @@ in
       };
 
     services.xserver.displayManager.xserverArgs =
-      [ "-terminate"
-        "-config ${configFile}"
+      [ "-config ${configFile}"
         "-xkbdir" "${cfg.xkbDir}"
         # Log at the default verbosity level to stderr rather than /var/log/X.*.log.
         "-verbose" "3" "-logfile" "/dev/null"
@@ -558,7 +565,8 @@ in
         ++ optional (cfg.dpi     != null) "-dpi ${toString cfg.dpi}"
         ++ optional (!cfg.enableTCP) "-nolisten tcp"
         ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}"
-        ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}";
+        ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"
+        ++ optional cfg.terminateOnReset "-terminate";
 
     services.xserver.modules =
       concatLists (catAttrs "modules" cfg.drivers) ++

From df1412c99068dc461022ccb075bb8bd8c9888479 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Fri, 16 Dec 2016 21:56:47 -0200
Subject: [PATCH 0041/3449] gcc-snapshot: init at 7-20161211

---
 .../compilers/gcc/snapshot/default.nix        | 552 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  15 +
 2 files changed, 567 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/snapshot/default.nix

diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
new file mode 100644
index 000000000000..81bed7119ea5
--- /dev/null
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -0,0 +1,552 @@
+{ stdenv, fetchurl, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langObjC ? stdenv.isDarwin
+, langObjCpp ? stdenv.isDarwin
+, langJava ? false
+, langAda ? false
+, langVhdl ? false
+, langGo ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, gmp, mpfr, libmpc, gettext, which
+, libelf                      # optional, for link-time optimizations (LTO)
+, isl ? null # optional, for the Graphite optimization framework.
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null
+, gtk2 ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, x11Support ? langJava
+, gnatboot ? null
+, enableMultilib ? false
+, enablePlugin ? true             # whether to support user-supplied plug-ins
+, name ? "gcc"
+, cross ? null
+, binutilsCross ? null
+, libcCross ? null
+, crossStageStatic ? true
+, gnat ? null
+, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+, binutils ? null
+, cloog # unused; just for compat with gcc4, as we override the parameter on some places
+, darwin ? null
+, flex ? null
+}:
+
+assert langJava     -> zip != null && unzip != null
+                       && zlib != null && boehmgc != null
+                       && perl != null;  # for `--enable-java-home'
+assert langAda      -> gnatboot != null;
+assert langVhdl     -> gnat != null;
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert stdenv.isDarwin -> gnused != null;
+
+# Need c++filt on darwin
+assert stdenv.isDarwin -> binutils != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "7-20161211";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = cross != null && cross.config == "i586-pc-gnu";
+
+    enableParallelBuilding = true;
+
+    patches =
+      [ ]
+      ++ optional (cross != null) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
+      # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
+      # target libraries and tools.
+      ++ optional langAda ../gnat-cflags.patch
+      ++ optional langFortran ../gfortran-driving.patch;
+
+    javaEcj = fetchurl {
+      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+      # `configure' time.
+
+      # XXX: Eventually we might want to take it from upstream.
+      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+    };
+
+    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
+    # binary distribution here to allow the whole chain to be bootstrapped.
+    javaAntlr = fetchurl {
+      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
+    };
+
+    xlibs = [
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+      xproto renderproto xextproto inputproto randrproto
+    ];
+
+    javaAwtGtk = langJava && x11Support;
+
+    /* Platform flags */
+    platformFlags = let
+        gccArch = stdenv.platform.gcc.arch or null;
+        gccCpu = stdenv.platform.gcc.cpu or null;
+        gccAbi = stdenv.platform.gcc.abi or null;
+        gccFpu = stdenv.platform.gcc.fpu or null;
+        gccFloat = stdenv.platform.gcc.float or null;
+        gccMode = stdenv.platform.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 "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode;
+
+    /* Cross-gcc settings */
+    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;
+        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 "";
+        withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else "";
+        withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
+        withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
+      in
+        "--target=${cross.config}" +
+        withArch +
+        withCpu +
+        withAbi +
+        withFpu +
+        withFloat +
+        withMode +
+        (if crossMingw && crossStageStatic then
+          " --with-headers=${libcCross}/include" +
+          " --with-gcc" +
+          " --with-gnu-as" +
+          " --with-gnu-ld" +
+          " --with-gnu-ld" +
+          " --disable-shared" +
+          " --disable-nls" +
+          " --disable-debug" +
+          " --enable-sjlj-exceptions" +
+          " --enable-threads=win32" +
+          " --disable-win32-registry"
+          else if crossStageStatic then
+          " --disable-libssp --disable-nls" +
+          " --without-headers" +
+          " --disable-threads " +
+          " --disable-libgomp " +
+          " --disable-libquadmath" +
+          " --disable-shared" +
+          " --disable-libatomic " +  # libatomic requires libc
+          " --disable-decimal-float" # libdecnumber requires libc
+          else
+          (if crossDarwin then " --with-sysroot=${getLib libcCross}/share/sysroot"
+           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"
+          )) +
+          " --enable-__cxa_atexit" +
+          " --enable-long-long" +
+          (if crossMingw then
+            " --enable-threads=win32" +
+            " --enable-sjlj-exceptions" +
+            " --enable-hash-synchronization" +
+            " --disable-libssp" +
+            " --disable-nls" +
+            " --with-dwarf2" +
+            # I think noone uses shared gcc libs in mingw, so we better do the same.
+            # In any case, mingw32 g++ linking is broken by default with shared libs,
+            # unless adding "-lsupc++" to any linking command. I don't know why.
+            " --disable-shared" +
+            # To keep ABI compatibility with upstream mingw-w64
+            " --enable-fully-dynamic-string"
+            else (if cross.libc == "uclibc" then
+              # libsanitizer requires netrom/netrom.h which is not
+              # available in uclibc.
+              " --disable-libsanitizer" +
+              # In uclibc cases, libgomp needs an additional '-ldl'
+              # and as I don't know how to pass it, I disable libgomp.
+              " --disable-libgomp" else "") +
+            " --enable-threads=posix" +
+            " --enable-nls" +
+            " --disable-decimal-float") # No final libdecnumber (it may work only in 386)
+          );
+    stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+    crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
+
+  bootstrap = cross == null;
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
+
+stdenv.mkDerivation ({
+  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+  builder = ../builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gcc/snapshots/${version}/gcc-${version}.tar.bz2";
+    sha256 = "114rrrm5d5cawmr3161d2wgjlzkb9l1imj1p7fnypwz7y85l1661";
+  };
+
+  inherit patches;
+
+  outputs = [ "out" "lib" "man" "info" ];
+  setOutputFlags = false;
+  NIX_NO_SELF_RPATH = true;
+
+  libc_dev = stdenv.cc.libc_dev;
+
+  hardeningDisable = [ "format" ];
+
+  postPatch =
+    if (stdenv.isGNU
+        || (libcCross != null                  # e.g., building `gcc.crossDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
+        || (crossGNU && libcCross != null))
+    then
+      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+      # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
+      let
+        libc = if libcCross != null then libcCross else stdenv.glibc;
+        gnu_h = "gcc/config/gnu.h";
+        extraCPPDeps =
+             libc.propagatedBuildInputs
+          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+          ++ stdenv.lib.optional (libpthread != null) libpthread;
+        extraCPPSpec =
+          concatStrings (intersperse " "
+                          (map (x: "-I${x.dev or x}/include") extraCPPDeps));
+        extraLibSpec =
+          if libpthreadCross != null
+          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+          else "-L${libpthread}/lib";
+      in
+        '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+        ''
+    else if cross != null || stdenv.cc.libc != null then
+      # On NixOS, use the right path to the dynamic linker instead of
+      # `/lib/ld*.so'.
+      let
+        libc = if libcCross != null then libcCross else stdenv.cc.libc;
+      in
+        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q LIBC_DYNAMIC_LINKER "$header" || continue
+             echo "  fixing \`$header'..."
+             sed -i "$header" \
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g'
+           done
+        ''
+    else null;
+
+  inherit noSysDirs staticCompiler langJava crossStageStatic
+    libcCross crossMingw;
+
+  nativeBuildInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
+
+  buildInputs = [ gmp mpfr libmpc libelf flex ]
+    ++ (optional (isl != null) isl)
+    ++ (optional (zlib != null) zlib)
+    ++ (optionals langJava [ boehmgc zip unzip ])
+    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
+    ++ (optionals (cross != null) [binutilsCross])
+    ++ (optionals langAda [gnatboot])
+    ++ (optionals langVhdl [gnat])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional stdenv.isDarwin gnused)
+    ++ (optional stdenv.isDarwin binutils)
+    ;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString  stdenv.isSunOS "-lm -ldl";
+
+  preConfigure = stdenv.lib.optionalString (stdenv.isSunOS && stdenv.is64bit) ''
+    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+    export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+    export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+    export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+  '';
+
+  dontDisableStatic = true;
+
+  configureFlags = "
+    ${if stdenv.isSunOS then
+      " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
+      # On Illumos/Solaris GNU as is preferred
+      " --with-gnu-as --without-gnu-ld "
+      else ""}
+    --enable-lto
+    ${if enableMultilib then "--enable-multilib --disable-libquadmath" else "--disable-multilib"}
+    ${if enableShared then "" else "--disable-shared"}
+    ${if enablePlugin then "--enable-plugin" else "--disable-plugin"}
+    ${optionalString (isl != null) "--with-isl=${isl}"}
+    ${if langJava then
+      "--with-ecj-jar=${javaEcj} " +
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre "
+      else ""}
+    ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+    ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
+    --with-gmp-include=${gmp.dev}/include
+    --with-gmp-lib=${gmp.out}/lib
+    --with-mpfr-include=${mpfr.dev}/include
+    --with-mpfr-lib=${mpfr.out}/lib
+    --with-mpc=${libmpc}
+    ${if libelf != null then "--with-libelf=${libelf}" else ""}
+    --disable-libstdcxx-pch
+    --without-included-gettext
+    --with-system-zlib
+    --enable-static
+    --enable-languages=${
+      concatStrings (intersperse ","
+        (  optional langC        "c"
+        ++ optional langCC       "c++"
+        ++ optional langFortran  "fortran"
+        ++ optional langJava     "java"
+        ++ optional langAda      "ada"
+        ++ optional langVhdl     "vhdl"
+        ++ optional langGo       "go"
+        ++ optional langObjC     "objc"
+        ++ optional langObjCpp   "obj-c++"
+        ++ optionals crossDarwin [ "objc" "obj-c++" ]
+        )
+      )
+    }
+    ${if cross == null
+      then if stdenv.isDarwin
+        then " --with-native-system-header-dir=${darwin.usr-include}"
+        else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include"
+      else ""}
+    ${if langAda then " --enable-libada" else ""}
+    ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
+    ${if cross != null then crossConfigureFlags else ""}
+    ${if !bootstrap then "--disable-bootstrap" else ""}
+    ${if cross == null then platformFlags else ""}
+  ";
+
+  targetConfig = if cross != null then cross.config else null;
+
+  buildFlags = if bootstrap then
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
+    else "";
+
+  installTargets =
+    if stripped
+    then "install-strip"
+    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;
+    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++";
+    # If we are making a cross compiler, cross != null
+    NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else "";
+    dontStrip = true;
+    configureFlags = ''
+      ${if enableMultilib then "" else "--disable-multilib"}
+      ${if enableShared then "" else "--disable-shared"}
+      ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
+      ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
+      ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
+      --with-gmp=${gmp.crossDrv}
+      --with-mpfr=${mpfr.crossDrv}
+      --with-mpc=${libmpc.crossDrv}
+      --disable-libstdcxx-pch
+      --without-included-gettext
+      --with-system-zlib
+      --enable-languages=${
+        concatStrings (intersperse ","
+          (  optional langC        "c"
+          ++ optional langCC       "c++"
+          ++ optional langFortran  "fortran"
+          ++ optional langJava     "java"
+          ++ optional langAda      "ada"
+          ++ optional langVhdl     "vhdl"
+          ++ optional langGo       "go"
+          )
+        )
+      }
+      ${if langAda then " --enable-libada" else ""}
+      --target=${stdenv.cross.config}
+      ${xwithArch}
+      ${xwithCpu}
+      ${xwithAbi}
+      ${xwithFpu}
+      ${xwithFloat}
+    '';
+    buildFlags = "";
+  };
+
+
+  # Needed for the cross compilation to work
+  AR = "ar";
+  LD = "ld";
+  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  CC = if stdenv.system == "x86_64-solaris" then "gcc -m64" else "gcc";
+
+  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find
+  # the library headers and binaries, regarless of the language being
+  # compiled.
+
+  # Note: When building the Java AWT GTK+ peer, the build system doesn't
+  # honor `--with-gmp' et al., e.g., when building
+  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just
+  # add them to $CPATH and $LIBRARY_PATH in this case.
+  #
+  # Likewise, the LTO code doesn't find zlib.
+
+  CPATH = makeSearchPathOutput "dev" "include" ([]
+    ++ optional (zlib != null) zlib
+    ++ optional langJava boehmgc
+    ++ optionals javaAwtGtk xlibs
+    ++ optionals javaAwtGtk [ gmp mpfr ]
+    ++ optional (libpthread != null) libpthread
+    ++ optional (libpthreadCross != null) libpthreadCross
+
+    # On GNU/Hurd glibc refers to Mach & Hurd
+    # headers.
+    ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs")
+                 libcCross.propagatedBuildInputs);
+
+  LIBRARY_PATH = makeLibraryPath ([]
+    ++ optional (zlib != null) zlib
+    ++ optional langJava boehmgc
+    ++ optionals javaAwtGtk xlibs
+    ++ optionals javaAwtGtk [ gmp mpfr ]
+    ++ optional (libpthread != null) libpthread);
+
+  EXTRA_TARGET_CFLAGS =
+    if cross != null && libcCross != null then [
+        "-idirafter ${getDev libcCross}/include"
+      ]
+      ++ optionals (! crossStageStatic) [
+        "-B${libcCross.out}/lib"
+      ]
+    else null;
+
+  EXTRA_TARGET_LDFLAGS =
+    if cross != null && libcCross != null then [
+        "-Wl,-L${libcCross.out}/lib"
+      ]
+      ++ (if crossStageStatic then [
+        "-B${libcCross.out}/lib"
+      ] else [
+        "-Wl,-rpath,${libcCross.out}/lib"
+        "-Wl,-rpath-link,${libcCross.out}/lib"
+      ])
+      ++ optionals (libpthreadCross != null) [
+        "-L${libpthreadCross}/lib"
+        "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
+      ]
+    else null;
+
+  passthru =
+    { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo version; isGNU = true; };
+
+  inherit enableParallelBuilding enableMultilib;
+
+  inherit (stdenv) is64bit;
+
+  meta = {
+    homepage = http://gcc.gnu.org/;
+    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    description = "GNU Compiler Collection, version ${version}"
+      + (if stripped then "" else " (with debugging info)");
+
+    longDescription = ''
+      The GNU Compiler Collection includes compiler front ends for C, C++,
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+      GCC development is a part of the GNU Project, aiming to improve the
+      compiler used in the GNU system including the GNU/Linux variant.
+    '';
+
+    maintainers = with stdenv.lib.maintainers; [ ];
+
+    # gnatboot is not available out of linux platforms, so we disable the darwin build
+    # for the gnat (ada compiler).
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      optionals (langAda == false) stdenv.lib.platforms.darwin;
+  };
+}
+
+// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) {
+  makeFlags = [ "all-gcc" "all-target-libgcc" ];
+  installTargets = "install-gcc install-target-libgcc";
+}
+
+# Strip kills static libs of other archs (hence cross != null)
+// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43f8f4bb2bb0..1e85afaf5f3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4760,6 +4760,21 @@ in
     isl = if !stdenv.isDarwin then isl_0_14 else null;
   }));
 
+  gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    # When building `gcc.crossDrv' (a "Canadian cross", with host == target
+    # and host != build), `cross' must be null but the cross-libc must still
+    # be passed.
+    cross = null;
+    libcCross = if crossSystem != null then libcCross else null;
+
+    isl = if !stdenv.isDarwin then isl_0_14 else null;
+  }));
+
   gfortran = if !stdenv.isDarwin then gfortran5
              else callPackage ../development/compilers/gcc/gfortran-darwin.nix {
     inherit (darwin) Libsystem;

From 4efd108e60ea56f13d3ff3c35a30432787a3a3d8 Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_c_git@memespace.net>
Date: Thu, 22 Dec 2016 23:30:09 +0000
Subject: [PATCH 0042/3449] digikam: Add patch to fix compilation against
 Lensfun 0.3.2

---
 pkgs/applications/graphics/digikam/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index f38e402ce929..11cc6c9c8089 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, automoc4, boost, shared_desktop_ontologies, cmake
-, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun
+{ stdenv, fetchurl, fetchpatch, automoc4, boost, shared_desktop_ontologies
+, cmake, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun
 , libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff
 , libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig
 , qca2, qimageblitz, qjson, qt4, soprano
@@ -36,6 +36,16 @@ let
       sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m";
     };
 
+    patches = [
+      (fetchpatch {
+        # Fix compilation against Lensfun 0.3.2
+        url = "http://cgit.kde.org/digikam.git/patch/?id=0f159981176faa6da701f112bfe557b79804d468";
+        sha256 = "1c8bg7s84vg4v620gbs16cjcbpml749018gy5dpvfacx5vl24wza";
+      })
+    ];
+
+    patchFlags = ["-p1" "-dcore"];
+
     nativeBuildInputs = [ 
       automoc4 cmake gettext perl pkgconfig
     ] ++ [

From 4ae23aaf3ce5aa470438abe8aa415fbe1ec5b55a Mon Sep 17 00:00:00 2001
From: Adam Beckmeyer <adam_git@thebeckmeyers.xyz>
Date: Fri, 23 Dec 2016 08:17:04 -0500
Subject: [PATCH 0043/3449] pythonPackages.livereload: init at 2.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8cc49d53c704..728879e046d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13825,6 +13825,28 @@ in {
     };
   };
 
+  livereload = buildPythonPackage rec {
+    name = "livereload-${version}";
+    version = "2.5.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "lepture";
+      repo = "python-livereload";
+      rev = "v${version}";
+      sha256 = "0ixsc7wibmkfk9fnyq0d1b5d9snxfpzzzgsxvq28rn54v6q8b7m2";
+    };
+
+    buildInputs = with self; [ nose django ];
+
+    propagatedBuildInputs = with self; [ tornado six ];
+
+    meta = {
+      description = "Runs a local server that reloads as you develop";
+      homepage = "https://github.com/lepture/python-livereload";
+      license = licenses.bsd3;
+    };
+  };
+
   llfuse = buildPythonPackage rec {
     name = "llfuse-1.0";
 

From 5683311b7c0ae5c20f7cdb3ae219b7bff7491d3f Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Sat, 24 Dec 2016 20:15:31 +0000
Subject: [PATCH 0044/3449] AgdaStdlib: v0.12 -> v0.13

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

diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix
index 24ba50387a4d..eb2fa2927cac 100644
--- a/pkgs/development/libraries/agda/agda-stdlib/default.nix
+++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, agda, fetchFromGitHub, ghcWithPackages }:
 
 agda.mkDerivation (self: rec {
-  version = "0.12";
+  version = "0.13";
   name = "agda-stdlib-${version}";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
     rev = "v${version}";
-    sha256 = "1n5hn3xa0bqyq8rjvfsfmh6z3l8rr4z3s7gyfmf3kiv9f235bnd2";
+    sha256 = "156xbqvqjck9izz613v52ppwk8s1y0kv7xkjpcm16vys2c3bh0x5";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];

From 094ac2d9b1d3c6895a9c9e0e4401919c475f4f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 23 Jan 2017 14:25:19 +0100
Subject: [PATCH 0045/3449] python-protobuf: enable python3 and enable py3
 tests

- moved expression out of python-packages
- no significant changes how package is built except the supported
  python versions
---
 pkgs/development/python-modules/protobuf.nix | 46 ++++++++++++
 pkgs/top-level/python-packages.nix           | 76 ++++++--------------
 2 files changed, 67 insertions(+), 55 deletions(-)
 create mode 100644 pkgs/development/python-modules/protobuf.nix

diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix
new file mode 100644
index 000000000000..8b9d1ddb03c4
--- /dev/null
+++ b/pkgs/development/python-modules/protobuf.nix
@@ -0,0 +1,46 @@
+{ stdenv, python, buildPythonPackage
+, protobuf, google_apputils
+, disabled, doCheck ? true }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  inherit (protobuf) name src;
+  inherit disabled doCheck;
+
+  propagatedBuildInputs = [ protobuf google_apputils ];
+  buildInputs = [ google_apputils ];
+
+  prePatch = ''
+    while [ ! -d python ]; do
+      cd *
+    done
+    cd python
+  '';
+
+  preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
+    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
+  '';
+
+  preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+    ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
+  '';
+
+  installFlags = optional (versionAtLeast protobuf.version "2.6.0")
+    "--install-option='--cpp_implementation'";
+
+  # the _message.so isn't installed, so we'll do that manually.
+  # if someone can figure out a less hacky way to get the _message.so to
+  # install, please do replace this.
+  postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") ''
+    cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
+  '';
+
+  meta = {
+    description = "Protocol Buffers are Google's data interchange format";
+    homepage = https://developers.google.com/protocol-buffers/;
+  };
+
+  passthru.protobuf = protobuf;
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 039779361210..827e85c94190 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9044,6 +9044,8 @@ in {
     };
 
     propagatedBuildInputs = with self; [ python-axolotl-curve25519 protobuf3_0 pycrypto ];
+    # IV == 0 in tests is not supported by pycrytpodom (our pycrypto drop-in)
+    doCheck = !isPy3k;
 
     meta = {
       homepage = "https://github.com/tgalal/python-axolotl";
@@ -19289,63 +19291,27 @@ in {
   });
 
   protobuf = self.protobuf2_6;
-  protobuf3_0 = (self.protobufBuild pkgs.protobuf3_0).override { doCheck = false; };
-  protobuf3_0_0b2 = (self.protobufBuild pkgs.protobuf3_0_0b2).override { doCheck = false; };
-  protobuf2_6 = self.protobufBuild pkgs.protobuf2_6;
-  protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
-  protobufBuild = protobuf: buildPythonPackage rec {
-    inherit (protobuf) name src;
-    disabled = isPy3k || isPyPy;
-
-    propagatedBuildInputs = with self; [ protobuf google_apputils ];
-
-    prePatch = ''
-      while [ ! -d python ]; do
-        cd *
-      done
-      cd python
-    '';
-
-    preConfigure = optionalString (versionAtLeast protobuf.version "2.6.0") ''
-      export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
-      export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2
-    '';
-
-    preBuild = optionalString (versionAtLeast protobuf.version "2.6.0") ''
-      ${python}/bin/${python.executable} setup.py build_ext --cpp_implementation
-    '';
-
-    checkPhase = ''
-      runHook preCheck
-    '' + (if versionAtLeast protobuf.version "2.6.0" then ''
-      ${python.executable} setup.py google_test --cpp_implementation
-      echo "sanity checking the C extension . . ."
-      echo "import google.protobuf.descriptor" | ${python.executable}
-    '' else ''
-      ${python.executable} setup.py test
-    '') + ''
-      runHook postCheck
-    '';
-
-    installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'";
-
-    # the _message.so isn't installed, so we'll do that manually.
-    # if someone can figure out a less hacky way to get the _message.so to
-    # install, please do replace this.
-    postInstall = optionalString (versionAtLeast protobuf.version "2.6.0") ''
-      cp -v $(find build -name "_message*") $out/${python.sitePackages}/google/protobuf/pyext
-    '';
-
-    doCheck = true;
-
-    meta = {
-      description = "Protocol Buffers are Google's data interchange format";
-      homepage = http://code.google.com/p/protobuf/;
-    };
-
-    passthru.protobuf = protobuf;
+  # only required by tensorflow
+  protobuf3_0_0b2 = callPackage ../development/python-modules/protobuf.nix {
+    disabled = isPyPy || isPy3k;
+    doCheck = isPy3k;
+    protobuf = pkgs.protobuf3_0_0b2;
   };
 
+  protobuf3_0 = callPackage ../development/python-modules/protobuf.nix {
+    disabled = isPyPy;
+    doCheck = isPy3k;
+    protobuf = pkgs.protobuf3_0;
+  };
+  protobuf2_6 = callPackage ../development/python-modules/protobuf.nix {
+    disabled = isPy3k || isPyPy;
+    doCheck = false;
+    protobuf = pkgs.protobuf2_6;
+  };
+  protobuf2_5 = callPackage ../development/python-modules/protobuf.nix {
+    disabled = isPy3k || isPyPy;
+    protobuf = pkgs.protobuf2_5;
+  };
 
   psutil = buildPythonPackage rec {
     name = "psutil-${version}";

From 02cc6797343958c957e476ace2edaf2c6566008a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Jan 2017 22:41:59 +0100
Subject: [PATCH 0046/3449] libcddb: fix darwin build

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

diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
index 8645fa37c335..6a164ef90553 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -1,17 +1,19 @@
-{fetchurl, stdenv}:
+{ stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libcddb-1.3.2";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/libcddb/${name}.tar.bz2";
     sha256 = "0fr21a7vprdyy1bq6s99m0x420c9jm5fipsd63pqv8qyfkhhxkim";
   };
 
-  meta = {
+  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+
+  meta = with stdenv.lib; {
     description = "C library to access data on a CDDB server (freedb.org)";
-    license = stdenv.lib.licenses.lgpl2Plus;
     homepage = http://libcddb.sourceforge.net/;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From e20fc5059d518d9b951d700f6ad7d37585cf1f83 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Jan 2017 22:45:08 +0100
Subject: [PATCH 0047/3449] libcdio: fix darwin build

---
 pkgs/development/libraries/libcdio/0.82.nix    | 13 +++++++------
 pkgs/development/libraries/libcdio/default.nix | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libcdio/0.82.nix b/pkgs/development/libraries/libcdio/0.82.nix
index 9cfc5f307edf..632ee9161351 100644
--- a/pkgs/development/libraries/libcdio/0.82.nix
+++ b/pkgs/development/libraries/libcdio/0.82.nix
@@ -1,19 +1,20 @@
-{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }:
+{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libcdio-0.82";
-  
+
   src = fetchurl {
     url = "mirror://gnu/libcdio/${name}.tar.gz";
     sha256 = "0fax1dzy84dzs20bmpq2gfw6hc1x2x9mhk53wynhcycjw3l3vjqs";
   };
 
-  buildInputs = [ libcddb pkgconfig ncurses help2man ];
+  buildInputs = [ libcddb pkgconfig ncurses help2man ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   # Disabled because one test (check_paranoia.sh) fails.
   #doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for OS-independent CD-ROM and CD image access";
     longDescription = ''
       GNU libcdio is a library for OS-independent CD-ROM and
@@ -21,8 +22,8 @@ stdenv.mkDerivation rec {
       ISO-9660 filesystems (libiso9660), as well as utility
       programs such as an audio CD player and an extractor.
     '';
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     homepage = http://www.gnu.org/software/libcdio/;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix
index f0cff815c443..74c95704bbf0 100644
--- a/pkgs/development/libraries/libcdio/default.nix
+++ b/pkgs/development/libraries/libcdio/default.nix
@@ -1,19 +1,20 @@
-{ fetchurl, stdenv, libcddb, pkgconfig, ncurses, help2man }:
+{ stdenv, fetchurl, libcddb, pkgconfig, ncurses, help2man, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libcdio-0.93";
-  
+
   src = fetchurl {
     url = "mirror://gnu/libcdio/${name}.tar.bz2";
     sha256 = "1a6x2c5bvpnkn7lhmxkjgz4axmh93m1clrlv41s1wzkc48lnc9zq";
   };
 
-  buildInputs = [ libcddb pkgconfig ncurses help2man ];
+  buildInputs = [ libcddb pkgconfig ncurses help2man ]
+    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   # Disabled because one test (check_paranoia.sh) fails.
   #doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for OS-independent CD-ROM and CD image access";
     longDescription = ''
       GNU libcdio is a library for OS-independent CD-ROM and
@@ -21,8 +22,8 @@ stdenv.mkDerivation rec {
       ISO-9660 filesystems (libiso9660), as well as utility
       programs such as an audio CD player and an extractor.
     '';
-    license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://www.gnu.org/software/libcdio/;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From fb954784dd617cf73a7db2d77f25ac354b920061 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Jan 2017 22:46:17 +0100
Subject: [PATCH 0048/3449] libcue: enable darwin build

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

diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index a1639397b5ea..22bda89c6030 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, bison, flex }:
+
 stdenv.mkDerivation rec {
   name = "libcue-${version}";
   version = "2.1.0";
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake bison flex ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "CUE Sheet Parser Library";
     longDescription = ''
       libcue is intended to parse a so called cue sheet from a char string or
@@ -20,8 +21,8 @@ stdenv.mkDerivation rec {
       available.
     '';
     homepage = http://sourceforge.net/projects/libcue/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 1e324cdd5791acf5bff5cabfa93ac37884049531 Mon Sep 17 00:00:00 2001
From: Michael Phillips <michaelalanphillips@gmail.com>
Date: Fri, 25 Mar 2016 10:40:01 -0500
Subject: [PATCH 0049/3449] cmus: add gcc build dep for darwin

(cherry picked from commit 597a3898fca1a2dd5875bc6bcf37b6e4e4d37279)
---
 pkgs/applications/audio/cmus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 8e4a08bcaccb..b71ffce61e27 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, pkgconfig
+{ stdenv, fetchFromGitHub, ncurses, pkgconfig, gcc
 
 , alsaSupport ? stdenv.isLinux, alsaLib ? null
 # simple fallback for everyone else
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     "CONFIG_WAV=y"
   ] ++ concatMap (a: a.flags) opts);
 
-  buildInputs = [ ncurses pkgconfig ] ++ concatMap (a: a.deps) opts;
+  buildInputs = [ ncurses pkgconfig gcc ] ++ concatMap (a: a.deps) opts;
 
   meta = {
     description = "Small, fast and powerful console music player for Linux and *BSD";

From 5afd6a9bea3fe54c642c42f3a20f7b02bf6f0a77 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Jan 2017 22:39:01 +0100
Subject: [PATCH 0050/3449] cmus: fix on darwin (using gcc)

---
 pkgs/applications/audio/cmus/default.nix | 18 +++++++++++-------
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index b71ffce61e27..c0fb900e3ee7 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, ncurses, pkgconfig, gcc
+{ stdenv, fetchFromGitHub, ncurses, pkgconfig
+, gcc, libiconv, CoreAudio
 
 , alsaSupport ? stdenv.isLinux, alsaLib ? null
 # simple fallback for everyone else
@@ -18,7 +19,7 @@
 , cddbSupport ? true, libcddb ? null
 , cdioSupport ? true, libcdio ? null
 , cueSupport ? true, libcue ? null
-, discidSupport ? true, libdiscid ? null
+, discidSupport ? (!stdenv.isDarwin), libdiscid ? null
 , ffmpegSupport ? true, ffmpeg ? null
 , flacSupport ? true, flac ? null
 , madSupport ? true, libmad ? null
@@ -109,13 +110,16 @@ stdenv.mkDerivation rec {
     "CONFIG_WAV=y"
   ] ++ concatMap (a: a.flags) opts);
 
-  buildInputs = [ ncurses pkgconfig gcc ] ++ concatMap (a: a.deps) opts;
+  buildInputs = [ ncurses pkgconfig ]
+    ++ stdenv.lib.optional stdenv.cc.isClang gcc
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
+    ++ concatMap (a: a.deps) opts;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Small, fast and powerful console music player for Linux and *BSD";
     homepage = https://cmus.github.io/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.oxij ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.oxij ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d924df6aea3..7fb6e4fef6ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12690,6 +12690,7 @@ with pkgs;
   cmatrix = callPackage ../applications/misc/cmatrix { };
 
   cmus = callPackage ../applications/audio/cmus {
+    inherit (darwin.apple_sdk.frameworks) CoreAudio;
     libjack = libjack2;
     libcdio = libcdio082;
     ffmpeg = ffmpeg_2;

From ad6ac35ae45ac0dadccbf3ad826e58e2a7189d2a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 25 Jan 2017 21:33:55 +0100
Subject: [PATCH 0051/3449] python-pycdio: fix darwin 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 061dcd68f9b6..d285a7febcaa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19883,9 +19883,8 @@ in {
       patchShebangs .
     '';
 
-    buildInputs = [
-      self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio
-    ];
+    buildInputs = [ self.setuptools self.nose pkgs.pkgconfig pkgs.swig pkgs.libcdio ]
+      ++ stdenv.lib.optional stdenv.isDarwin pkgs.libiconv;
 
     patches = [ ../development/python-modules/pycdio/add-cdtext-toc.patch ];
 

From 50e9921179066d00de84c421332cfd3de2f52d28 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 25 Jan 2017 21:48:43 +0100
Subject: [PATCH 0052/3449] cmus: use clang's gcc compatibility for a clang
 based stdenv

---
 pkgs/applications/audio/cmus/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index c0fb900e3ee7..bb2deb71ba20 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, ncurses, pkgconfig
-, gcc, libiconv, CoreAudio
+{ stdenv, fetchFromGitHub, runCommand, ncurses, pkgconfig
+, libiconv, CoreAudio
 
 , alsaSupport ? stdenv.isLinux, alsaLib ? null
 # simple fallback for everyone else
@@ -90,6 +90,13 @@ let
     #(mkFlag vtxSupport    "CONFIG_VTX=y"     libayemu)
   ];
 
+  clangGCC = runCommand "clang-gcc" {} ''
+    #! ${stdenv.shell}
+    mkdir -p $out/bin
+    ln -s ${stdenv.cc}/bin/clang $out/bin/gcc
+    ln -s ${stdenv.cc}/bin/clang++ $out/bin/g++
+  '';
+
 in
 
 stdenv.mkDerivation rec {
@@ -111,7 +118,7 @@ stdenv.mkDerivation rec {
   ] ++ concatMap (a: a.flags) opts);
 
   buildInputs = [ ncurses pkgconfig ]
-    ++ stdenv.lib.optional stdenv.cc.isClang gcc
+    ++ stdenv.lib.optional stdenv.cc.isClang clangGCC
     ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv CoreAudio ]
     ++ concatMap (a: a.deps) opts;
 

From 025555d7f1a0fc39ea152b03e942002e1bff1721 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 00:05:40 -0800
Subject: [PATCH 0053/3449] More fixes and improvements

---
 nixos/doc/manual/release-notes/rl-1609.xml    |  2 +-
 .../modules/installer/tools/nixos-install.sh  |  2 +-
 .../security/permissions-wrappers/default.nix |  4 ++++
 .../setcap-wrapper-drv.nix                    | 22 +++++++++----------
 .../setuid-wrapper-drv.nix                    |  5 +++--
 .../modules/services/networking/smokeping.nix | 13 ++++++++---
 nixos/tests/smokeping.nix                     |  2 +-
 .../networking/browsers/chromium/default.nix  |  4 ++--
 .../kinit/start_kdeinit-path.patch            |  2 +-
 pkgs/os-specific/linux/mdadm/4.nix            |  2 +-
 pkgs/tools/security/ecryptfs/helper.nix       |  2 +-
 pkgs/tools/system/cron/default.nix            |  2 +-
 12 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index ade7d5581ced..bf8be1b68f26 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -202,7 +202,7 @@ following incompatible changes:</para>
 
   <listitem>
     <para>The directory container setuid wrapper programs,
-    <filename>/var/setuid-wrappers</filename>, <link
+    <filename>/var/permissions-wrappers</filename>, <link
     xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now
     updated atomically to prevent failures if the switch to a new
     configuration is interrupted.</link></para>
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 5250edd1500a..4e9f8ab60f2c 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -260,7 +260,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate
 
 
 # Ask the user to set a root password.
-if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /var/setuid-wrappers/passwd ] && [ -t 0 ]; then
+if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /var/permissions-wrappers/passwd ] && [ -t 0 ]; then
     echo "setting root password..."
     chroot $mountPoint /var/permissions-wrappers/passwd
 fi
diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 76a22b4f6038..2f60d54fd770 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -154,6 +154,10 @@ in
     export PATH="${config.security.permissionsWrapperDir}:$PATH"
     '';
 
+    system.activationScripts.wrapper-dir = ''
+      mkdir -p "${config.security.permissionsWrapperDir}"
+    '';
+
     ###### setcap activation script
     system.activationScripts.setcap =
       lib.stringAfter [ "users" ]
diff --git a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
index adae9009fbe2..04cae3c84931 100644
--- a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
@@ -5,17 +5,17 @@ let
 
      # Produce a shell-code splice intended to be stitched into one of
      # the build or install phases within the derivation.
-     mkSetcapWrapper = { program, source ? null, ...}:
-       ''
-         if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
-             # If we can't find the program, fall back to the
-             # system profile.
-             source=/nix/var/nix/profiles/default/bin/${program}
-         fi
+     mkSetcapWrapper = { program, source ? null, ...}: ''
+       if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
+         # If we can't find the program, fall back to the
+         # system profile.
+         source=/nix/var/nix/profiles/default/bin/${program}
+       fi
 
-         gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
-             -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper
-       '';
+       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
+           -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
+           -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
+     '';
 in
 
 # This is only useful for Linux platforms and a kernel version of
@@ -26,7 +26,7 @@ assert lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.
 pkgs.stdenv.mkDerivation {
   name         = "setcap-wrapper";
   unpackPhase  = "true";
-  buildInputs  = [ pkgs.linuxHeaders pkgs.libcap pkgs.libcap_ng ];
+  buildInputs  = [ pkgs.linuxHeaders ];
   installPhase = ''
     mkdir -p $out/bin
 
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
index e244364aa45b..273aaf2a88a3 100644
--- a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
@@ -13,8 +13,9 @@ let
              source=/nix/var/nix/profiles/default/bin/${program}
          fi
 
-         gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
-             -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper
+         gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
+             -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
+             -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
        '';
 in
 
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 04312c39062f..6d2f5f8d41f1 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -219,14 +219,14 @@ in
         type = types.string;
         default = ''
           + FPing
-          binary = ${config.security.wrapperDir}/fping
+          binary = ${config.security.permissionsWrapperDir}/fping
         '';
         description = "Probe configuration";
       };
       sendmail = mkOption {
         type = types.nullOr types.path;
         default = null;
-        example = "/var/setuid-wrappers/sendmail";
+        example = "/var/permissions-wrappers/sendmail";
         description = "Use this sendmail compatible script to deliver alerts";
       };
       smokeMailTemplate = mkOption {
@@ -273,7 +273,14 @@ in
         message = "services.smokeping: sendmail and Mailhost cannot both be enabled.";
       }
     ];
-    security.setuidPrograms = [ "fping" ];
+    security.permissionsWrappers.setuid = [
+      { program = "fping";
+        source  = "${e.enlightenment.out}/bin/fping";
+        owner   = "root";
+        group   = "root";
+        setuid  = true;
+      }
+    ];
     environment.systemPackages = [ pkgs.fping ];
     users.extraUsers = singleton {
       name = cfg.user;
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 9de3030417f9..7e2d84f44224 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           mailHost = "127.0.0.2";
           probeConfig = ''
             + FPing
-            binary = /var/setuid-wrappers/fping
+            binary = /var/permissions-wrappers/fping
             offset = 0%
           '';
         };
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d014999a667c..dd8fd32adfde 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -83,9 +83,9 @@ in stdenv.mkDerivation {
     ed -v -s "$out/bin/chromium" << EOF
     2i
 
-    if [ -x "/var/setuid-wrappers/${sandboxExecutableName}" ]
+    if [ -x "/var/permissions-wrappers/${sandboxExecutableName}" ]
     then
-      export CHROME_DEVEL_SANDBOX="/var/setuid-wrappers/${sandboxExecutableName}"
+      export CHROME_DEVEL_SANDBOX="/var/permissions-wrappers/${sandboxExecutableName}"
     else
       export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}"
     fi
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
index fbecf9433f69..a16d35757255 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
@@ -7,7 +7,7 @@ Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c
  #include <unistd.h>
  
 -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
-+#define EXECUTE "/var/setuid-wrappers/start_kdeinit"
++#define EXECUTE "/var/permissions-wrappers/start_kdeinit"
  
  #if KDEINIT_OOM_PROTECT
  
diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix
index d929668a26aa..abe8632773f3 100644
--- a/pkgs/os-specific/linux/mdadm/4.nix
+++ b/pkgs/os-specific/linux/mdadm/4.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/var/setuid-wrappers/sendmail@' -i Makefile
+        -e 's@/usr/sbin/sendmail@/var/permissions-wrappers/sendmail@' -i Makefile
   '';
 
   meta = {
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 0d4b37a8efc0..6e3e6766a28e 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /var/setuid-wrappers
+  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /var/permissions-wrappers
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp $src $out/libexec/ecryptfs-helper.py
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index 3d03f19cb6f8..f7f2a6158a26 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     #define _PATH_SENDMAIL "${sendmailPath}"
 
     #undef _PATH_DEFPATH
-    #define _PATH_DEFPATH "/var/setuid-wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
+    #define _PATH_DEFPATH "/var/permissions-wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
     __EOT__
 
     # Implicit saved uids do not work here due to way NixOS uses setuid wrappers

From a20e65724bad6472bbf40080955ecc5d0bb351e6 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 00:32:59 -0800
Subject: [PATCH 0054/3449] Fixing

---
 .../security/permissions-wrappers/default.nix | 72 +++++++++----------
 .../permissions-wrapper.c                     |  2 +-
 .../setuid-wrapper-drv.nix                    | 21 +++---
 3 files changed, 46 insertions(+), 49 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 2f60d54fd770..2ec1e91cee9f 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -66,6 +66,39 @@ let
 
       chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
     '';
+
+    mkActivationScript = programsToWrap:
+      lib.stringAfter [ "users" ]
+        ''
+          # Look in the system path and in the default profile for
+          # programs to be wrapped.
+          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
+
+          mkdir -p /run/permissions-wrapper-dirs
+          permissionsWrapperDir=$(mktemp --directory --tmpdir=/run/permissions-wrapper-dirs permissions-wrappers.XXXXXXXXXX)
+          chmod a+rx $permissionsWrapperDir
+
+          ${programsToWrap}
+
+          if [ -L ${permissionsWrapperDir} ]; then
+            # Atomically replace the symlink
+            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
+            old=$(readlink ${permissionsWrapperDir})
+            ln --symbolic --force --no-dereference $permissionsWrapperDir ${permissionsWrapperDir}-tmp
+            mv --no-target-directory ${permissionsWrapperDir}-tmp ${permissionsWrapperDir}
+            rm --force --recursive $old
+          elif [ -d ${permissionsWrapperDir} ]; then
+            # Compatibility with old state, just remove the folder and symlink
+            rm -f ${permissionsWrapperDir}/*
+            # if it happens to be a tmpfs
+            ${pkgs.utillinux}/bin/umount ${permissionsWrapperDir} || true
+            rm -d ${permissionsWrapperDir}
+            ln -d --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
+          else
+            # For initial setup
+            ln --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
+          fi
+        '';
 in
 {
 
@@ -160,45 +193,10 @@ in
 
     ###### setcap activation script
     system.activationScripts.setcap =
-      lib.stringAfter [ "users" ]
-        ''
-          # Look in the system path and in the default profile for
-          # programs to be wrapped.
-          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
-
-          # When a program is removed from the security.permissionsWrappers.setcap
-          # list we have to remove all of the previous program wrappers
-          # and re-build them minus the wrapper for the program removed,
-          # hence the rm here in the activation script.
-
-          rm -f ${permissionsWrapperDir}/*
-
-          # Concatenate the generated shell slices to configure
-          # wrappers for each program needing specialized capabilities.
-
-          ${lib.concatMapStrings configureSetcapWrapper (builtins.filter isNotNull cfg.setcap)}
-        '';
+      mkActivationScript (lib.concatMapStrings configureSetcapWrapper (builtins.filter isNotNull cfg.setcap));
 
     ###### setuid activation script
     system.activationScripts.setuid =
-      lib.stringAfter [ "users" ]
-        ''
-          # Look in the system path and in the default profile for
-          # programs to be wrapped.
-          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
-
-          # When a program is removed from the security.permissionsWrappers.setcap
-          # list we have to remove all of the previous program wrappers
-          # and re-build them minus the wrapper for the program removed,
-          # hence the rm here in the activation script.
-
-          rm -f ${permissionsWrapperDir}/*
-
-          # Concatenate the generated shell slices to configure
-          # wrappers for each program needing specialized capabilities.
-
-          ${lib.concatMapStrings configureSetuidWrapper (builtins.filter isNotNull cfg.setuid)}
-        '';
-
+      mkActivationScript (lib.concatMapStrings configureSetuidWrapper (builtins.filter isNotNull cfg.setuid));
   };
 }
diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index effdaa930963..3cb5bb4f5603 100644
--- a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -211,7 +211,7 @@ int main(int argc, char * * argv)
     // Read the capabilities set on the file and raise them in to the
     // Ambient set so the program we're wrapping receives the
     // capabilities too!
-    assert(!make_caps_ambient(selfPath));
+    if (strcmp(wrapperType, "setcap") == 0) assert(!make_caps_ambient(selfPath));
 
     execve(sourceProg, argv, environ);
     
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
index 273aaf2a88a3..3bf3effb801a 100644
--- a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
@@ -5,18 +5,17 @@ let
 
      # Produce a shell-code splice intended to be stitched into one of
      # the build or install phases within the derivation.
-     mkSetuidWrapper = { program, source ? null, ...}:
-       ''
-         if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
-             # If we can't find the program, fall back to the
-             # system profile.
-             source=/nix/var/nix/profiles/default/bin/${program}
-         fi
+     mkSetuidWrapper = { program, source ? null, ...}: ''
+       if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
+         # If we can't find the program, fall back to the
+         # system profile.
+         source=/nix/var/nix/profiles/default/bin/${program}
+       fi
 
-         gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
-             -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
-             -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
-       '';
+       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
+           -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
+           -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
+     '';
 in
 
 # This is only useful for Linux platforms and a kernel version of

From e8bec4c75f9da5c2e6a12b8f96630dae2d2d57d6 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 00:35:01 -0800
Subject: [PATCH 0055/3449] Implicit declared function...

---
 .../security/permissions-wrappers/permissions-wrapper.c        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index 3cb5bb4f5603..4a77e8aa3d55 100644
--- a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -211,7 +211,8 @@ int main(int argc, char * * argv)
     // Read the capabilities set on the file and raise them in to the
     // Ambient set so the program we're wrapping receives the
     // capabilities too!
-    if (strcmp(wrapperType, "setcap") == 0) assert(!make_caps_ambient(selfPath));
+    if (strcmp(wrapperType, "setcap") == 0)
+        assert(!make_caps_ambient(selfPath));
 
     execve(sourceProg, argv, environ);
     

From 1ad541171e5d9362dce100de08d46fff91cab4d1 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 00:36:35 -0800
Subject: [PATCH 0056/3449] Hmm

---
 .../security/permissions-wrappers/permissions-wrapper.c      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index 4a77e8aa3d55..9834bcd937b5 100644
--- a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -211,8 +211,9 @@ int main(int argc, char * * argv)
     // Read the capabilities set on the file and raise them in to the
     // Ambient set so the program we're wrapping receives the
     // capabilities too!
-    if (strcmp(wrapperType, "setcap") == 0)
-        assert(!make_caps_ambient(selfPath));
+
+
+    assert(!make_caps_ambient(selfPath));
 
     execve(sourceProg, argv, environ);
     

From 785684f6c2367ce979d908e25dd7831992f19f24 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 00:39:17 -0800
Subject: [PATCH 0057/3449] Ahhh, my compile-time macros confused me...of
 course they did...

---
 .../security/permissions-wrappers/permissions-wrapper.c       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index 9834bcd937b5..f74a952b7d84 100644
--- a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -211,9 +211,9 @@ int main(int argc, char * * argv)
     // Read the capabilities set on the file and raise them in to the
     // Ambient set so the program we're wrapping receives the
     // capabilities too!
-
-
+    #ifdef WRAPPER_SETCAP
     assert(!make_caps_ambient(selfPath));
+    #endif
 
     execve(sourceProg, argv, environ);
     

From a4f905afc251e48ee106fdede8ad15e9cf5b4cdc Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 00:41:00 -0800
Subject: [PATCH 0058/3449] Enhhh I think compile time macros are gross

---
 .../permissions-wrappers/permissions-wrapper.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index f74a952b7d84..2e7b1edde3be 100644
--- a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -8,6 +8,11 @@
 #include <dirent.h>
 #include <assert.h>
 #include <errno.h>
+#include <linux/capability.h>
+#include <sys/capability.h>
+#include <linux/prctl.h>
+#include <sys/prctl.h>
+#include <cap-ng.h>
 
 // Make sure assertions are not compiled out, we use them to codify
 // invariants about this program and we want it to fail fast and
@@ -32,13 +37,6 @@ fprintf(stderr, "Program must be compiled with either the WRAPPER_SETCAP or WRAP
 exit(1);
 #endif
 
-#ifdef WRAPPER_SETCAP
-#include <linux/capability.h>
-#include <sys/capability.h>
-#include <linux/prctl.h>
-#include <sys/prctl.h>
-#include <cap-ng.h>
-
 // Update the capabilities of the running process to include the given
 // capability in the Ambient set.
 static void set_ambient_cap(cap_value_t cap)
@@ -163,7 +161,6 @@ static int make_caps_ambient(const char *selfPath)
 
     return 0;
 }
-#endif
 
 int main(int argc, char * * argv)
 {
@@ -211,9 +208,8 @@ int main(int argc, char * * argv)
     // Read the capabilities set on the file and raise them in to the
     // Ambient set so the program we're wrapping receives the
     // capabilities too!
-    #ifdef WRAPPER_SETCAP
-    assert(!make_caps_ambient(selfPath));
-    #endif
+    if (strcmp(wrapperType, "setcap") == 0)
+        assert(!make_caps_ambient(selfPath));
 
     execve(sourceProg, argv, environ);
     

From 21368c4c67580f6ff245636d4af37d3094a1cd09 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 00:58:44 -0800
Subject: [PATCH 0059/3449] Hmm, unnecessary

---
 nixos/modules/security/permissions-wrappers/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 2ec1e91cee9f..af8158aab920 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -22,7 +22,6 @@ let
     , source ? null
     , owner  ? "nobody"
     , group  ? "nogroup"
-    , setcap ? false
     }: ''
       cp ${setcapWrappers}/bin/${program}.wrapper ${permissionsWrapperDir}/${program}
 
@@ -36,13 +35,7 @@ let
       #
       # Only set the capabilities though if we're being told to
       # do so.
-      ${
-      if setcap then
-        ''
-        ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" ${permissionsWrapperDir}/${program}
-        ''
-      else ""
-      }
+      ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" ${permissionsWrapperDir}/${program}
 
       # Set the executable bit
       chmod u+rx,g+x,o+x ${permissionsWrapperDir}/${program}

From 48a0c5a3a728418286d4790491ed1bd9c4df9e7e Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 01:00:46 -0800
Subject: [PATCH 0060/3449] More fixing

---
 nixos/modules/security/permissions-wrappers/default.nix | 1 -
 nixos/modules/tasks/network-interfaces.nix              | 2 --
 2 files changed, 3 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index af8158aab920..14f9dadcb246 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -106,7 +106,6 @@ in
             source  = "${pkgs.iputils.out}/bin/ping";
             owner   = "nobody";
             group   = "nogroup";
-            setcap  = true;
             capabilities = "cap_net_raw+ep";
           }
         ];
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index a69435ff5937..61519c6a3ce8 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -902,13 +902,11 @@ in
       [
         { program = "ping";
           source  = "${pkgs.iputils.out}/bin/ping";
-          setcap  = true;
           capabilities = "cap_net_raw+p";
         }
 
         { program = "ping6";
           source  = "${pkgs.iputils.out}/bin/ping6";
-          setcap  = true;
           capabilities = "cap_net_raw+p";
         }
       ]

From 61fe8de40c9efbcd31301233e78278202485d8d8 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 01:03:18 -0800
Subject: [PATCH 0061/3449] Silly, should just have one activation script

---
 .../security/permissions-wrappers/default.nix | 69 +++++++++----------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 14f9dadcb246..55033266c9a4 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -61,37 +61,7 @@ let
     '';
 
     mkActivationScript = programsToWrap:
-      lib.stringAfter [ "users" ]
-        ''
-          # Look in the system path and in the default profile for
-          # programs to be wrapped.
-          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
-
-          mkdir -p /run/permissions-wrapper-dirs
-          permissionsWrapperDir=$(mktemp --directory --tmpdir=/run/permissions-wrapper-dirs permissions-wrappers.XXXXXXXXXX)
-          chmod a+rx $permissionsWrapperDir
-
-          ${programsToWrap}
-
-          if [ -L ${permissionsWrapperDir} ]; then
-            # Atomically replace the symlink
-            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
-            old=$(readlink ${permissionsWrapperDir})
-            ln --symbolic --force --no-dereference $permissionsWrapperDir ${permissionsWrapperDir}-tmp
-            mv --no-target-directory ${permissionsWrapperDir}-tmp ${permissionsWrapperDir}
-            rm --force --recursive $old
-          elif [ -d ${permissionsWrapperDir} ]; then
-            # Compatibility with old state, just remove the folder and symlink
-            rm -f ${permissionsWrapperDir}/*
-            # if it happens to be a tmpfs
-            ${pkgs.utillinux}/bin/umount ${permissionsWrapperDir} || true
-            rm -d ${permissionsWrapperDir}
-            ln -d --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
-          else
-            # For initial setup
-            ln --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
-          fi
-        '';
+;
 in
 {
 
@@ -184,11 +154,38 @@ in
     '';
 
     ###### setcap activation script
-    system.activationScripts.setcap =
-      mkActivationScript (lib.concatMapStrings configureSetcapWrapper (builtins.filter isNotNull cfg.setcap));
+    system.activationScripts.permissions-wrappers =
+      lib.stringAfter [ "users" ]
+        ''
+          # Look in the system path and in the default profile for
+          # programs to be wrapped.
+          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
-    ###### setuid activation script
-    system.activationScripts.setuid =
-      mkActivationScript (lib.concatMapStrings configureSetuidWrapper (builtins.filter isNotNull cfg.setuid));
+          mkdir -p /run/permissions-wrapper-dirs
+          permissionsWrapperDir=$(mktemp --directory --tmpdir=/run/permissions-wrapper-dirs permissions-wrappers.XXXXXXXXXX)
+          chmod a+rx $permissionsWrapperDir
+
+          ${lib.concatMapStrings configureSetcapWrapper (builtins.filter isNotNull cfg.setcap)}
+          ${lib.concatMapStrings configureSetuidWrapper (builtins.filter isNotNull cfg.setuid)}
+
+          if [ -L ${permissionsWrapperDir} ]; then
+            # Atomically replace the symlink
+            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
+            old=$(readlink ${permissionsWrapperDir})
+            ln --symbolic --force --no-dereference $permissionsWrapperDir ${permissionsWrapperDir}-tmp
+            mv --no-target-directory ${permissionsWrapperDir}-tmp ${permissionsWrapperDir}
+            rm --force --recursive $old
+          elif [ -d ${permissionsWrapperDir} ]; then
+            # Compatibility with old state, just remove the folder and symlink
+            rm -f ${permissionsWrapperDir}/*
+            # if it happens to be a tmpfs
+            ${pkgs.utillinux}/bin/umount ${permissionsWrapperDir} || true
+            rm -d ${permissionsWrapperDir}
+            ln -d --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
+          else
+            # For initial setup
+            ln --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
+          fi
+        '';
   };
 }

From fd974085bf5b7a18c0c053a1fdd331c523221fb1 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 01:04:12 -0800
Subject: [PATCH 0062/3449] It's clearly quite late

---
 nixos/modules/security/permissions-wrappers/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 55033266c9a4..0ea465fbd787 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -59,9 +59,6 @@ let
 
       chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
     '';
-
-    mkActivationScript = programsToWrap:
-;
 in
 {
 

From f64b06a3e045c14110d9a7fcac9e4c8ee70ae8f0 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 01:13:19 -0800
Subject: [PATCH 0063/3449] Hmmm

---
 .../security/permissions-wrappers/default.nix | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 0ea465fbd787..bb5ffff8e275 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -23,11 +23,11 @@ let
     , owner  ? "nobody"
     , group  ? "nogroup"
     }: ''
-      cp ${setcapWrappers}/bin/${program}.wrapper ${permissionsWrapperDir}/${program}
+      cp ${setcapWrappers}/bin/${program}.wrapper $permissionsWrapperDir/${program}
 
       # Prevent races
-      chmod 0000 ${permissionsWrapperDir}/${program}
-      chown ${owner}.${group} ${permissionsWrapperDir}/${program}
+      chmod 0000 $permissionsWrapperDir/${program}
+      chown ${owner}.${group} $permissionsWrapperDir/${program}
 
       # Set desired capabilities on the file plus cap_setpcap so
       # the wrapper program can elevate the capabilities set on
@@ -35,10 +35,10 @@ let
       #
       # Only set the capabilities though if we're being told to
       # do so.
-      ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" ${permissionsWrapperDir}/${program}
+      ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $permissionsWrapperDir/${program}
 
       # Set the executable bit
-      chmod u+rx,g+x,o+x ${permissionsWrapperDir}/${program}
+      chmod u+rx,g+x,o+x $permissionsWrapperDir/${program}
     '';
 
   ###### Activation script for the setuid wrappers
@@ -51,13 +51,13 @@ let
     , setgid ? false
     , permissions ? "u+rx,g+x,o+x"
     }: ''
-      cp ${setuidWrappers}/bin/${program}.wrapper ${permissionsWrapperDir}/${program}
+      cp ${setuidWrappers}/bin/${program}.wrapper $permissionsWrapperDir/${program}
 
       # Prevent races
-      chmod 0000 ${permissionsWrapperDir}/${program}
-      chown ${owner}.${group} ${permissionsWrapperDir}/${program}
+      chmod 0000 $permissionsWrapperDir/${program}
+      chown ${owner}.${group} $permissionsWrapperDir/${program}
 
-      chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${permissionsWrapperDir}/${program}
+      chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $permissionsWrapperDir/${program}
     '';
 in
 {
@@ -143,11 +143,11 @@ in
     # variable when initializing the shell
     environment.extraInit = ''
     # The permissions wrappers override other bin directories.
-    export PATH="${config.security.permissionsWrapperDir}:$PATH"
+    export PATH="${permissionsWrapperDir}:$PATH"
     '';
 
     system.activationScripts.wrapper-dir = ''
-      mkdir -p "${config.security.permissionsWrapperDir}"
+      mkdir -p "${permissionsWrapperDir}"
     '';
 
     ###### setcap activation script

From ce36b58e21e8d15c1de0c300819b06e83a2a1c5a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 01:31:49 -0800
Subject: [PATCH 0064/3449] Derp

---
 .../security/permissions-wrappers/default.nix    | 16 +++++++++++++---
 .../permissions-wrappers/setcap-wrapper-drv.nix  |  2 +-
 .../permissions-wrappers/setuid-wrapper-drv.nix  |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index bb5ffff8e275..585e4a13be61 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
 
-  inherit (config.security) permissionsWrapperDir;
+  inherit (config.security) run-permissionsWrapperDir permissionsWrapperDir;
 
   isNotNull = v: if v != null then true else false;
 
@@ -132,6 +132,16 @@ in
       '';
     };
 
+    security.run-permissionsWrapperDir = lib.mkOption {
+      type        = lib.types.path;
+      default     = "/run/permissions-wrapper-dirs";
+      internal    = true;
+      description = ''
+        This option defines the run path to the permissions
+        wrappers. It should not be overriden.
+      '';
+    };
+
   };
 
 
@@ -158,8 +168,8 @@ in
           # programs to be wrapped.
           PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
-          mkdir -p /run/permissions-wrapper-dirs
-          permissionsWrapperDir=$(mktemp --directory --tmpdir=/run/permissions-wrapper-dirs permissions-wrappers.XXXXXXXXXX)
+          mkdir -p ${run-permissionsWrapperDir}
+          permissionsWrapperDir=$(mktemp --directory --tmpdir=${run-permissionsWrapperDir} permissions-wrappers.XXXXXXXXXX)
           chmod a+rx $permissionsWrapperDir
 
           ${lib.concatMapStrings configureSetcapWrapper (builtins.filter isNotNull cfg.setcap)}
diff --git a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
index 04cae3c84931..3ec9b829a949 100644
--- a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
@@ -12,7 +12,7 @@ let
          source=/nix/var/nix/profiles/default/bin/${program}
        fi
 
-       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
+       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.run-permissionsWrapperDir}\" \
            -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
            -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
      '';
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
index 3bf3effb801a..97dc3c1b0e06 100644
--- a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
@@ -12,7 +12,7 @@ let
          source=/nix/var/nix/profiles/default/bin/${program}
        fi
 
-       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.permissionsWrapperDir}\" \
+       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.run-permissionsWrapperDir}\" \
            -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
            -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
      '';

From ad8fde5e5d9bc25a54ac238f485e28b37d6d185a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 01:33:25 -0800
Subject: [PATCH 0065/3449] Andddd more derp

---
 .../security/permissions-wrappers/setcap-wrapper-drv.nix        | 2 +-
 .../security/permissions-wrappers/setuid-wrapper-drv.nix        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
index 3ec9b829a949..2ae3067b1b1c 100644
--- a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
@@ -12,7 +12,7 @@ let
          source=/nix/var/nix/profiles/default/bin/${program}
        fi
 
-       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.run-permissionsWrapperDir}\" \
+       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-permissionsWrapperDir}\" \
            -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
            -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
      '';
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
index 97dc3c1b0e06..42b00c8548ab 100644
--- a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
@@ -12,7 +12,7 @@ let
          source=/nix/var/nix/profiles/default/bin/${program}
        fi
 
-       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${cfg.run-permissionsWrapperDir}\" \
+       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-permissionsWrapperDir}\" \
            -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
            -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
      '';

From c30cf645f84232eba03d542519b5eca398a06825 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 02:06:24 -0800
Subject: [PATCH 0066/3449] Make setting of the wrapper macros a compile-time
 error

---
 .../security/permissions-wrappers/permissions-wrapper.c        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index 2e7b1edde3be..6e00df9cef83 100644
--- a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -33,8 +33,7 @@ static char * wrapperType = "setcap";
 #elif defined WRAPPER_SETUID
 static char * wrapperType = "setuid";
 #else
-fprintf(stderr, "Program must be compiled with either the WRAPPER_SETCAP or WRAPPER_SETUID macros specified!\n");
-exit(1);
+#error Program must be compiled with either the WRAPPER_SETCAP or WRAPPER_SETUID macro
 #endif
 
 // Update the capabilities of the running process to include the given

From 189a0c25796d10ee5ca9e7e61b6a79ff1656f177 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 02:07:36 -0800
Subject: [PATCH 0067/3449] Wrap with quotes as-per GCC's recommendation

---
 .../modules/security/permissions-wrappers/permissions-wrapper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
index 6e00df9cef83..cb9d8d6b37b2 100644
--- a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/permissions-wrappers/permissions-wrapper.c
@@ -33,7 +33,7 @@ static char * wrapperType = "setcap";
 #elif defined WRAPPER_SETUID
 static char * wrapperType = "setuid";
 #else
-#error Program must be compiled with either the WRAPPER_SETCAP or WRAPPER_SETUID macro
+#error "Program must be compiled with either the WRAPPER_SETCAP or WRAPPER_SETUID macro"
 #endif
 
 // Update the capabilities of the running process to include the given

From 01e6b82f3f5584f76ec46354d34a787968a7f262 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 09:20:15 -0800
Subject: [PATCH 0068/3449] Removing dead code

---
 .../permissions-wrappers/setcap-wrappers.nix  | 162 ------------------
 .../permissions-wrappers/setuid-wrappers.nix  | 146 ----------------
 2 files changed, 308 deletions(-)
 delete mode 100644 nixos/modules/security/permissions-wrappers/setcap-wrappers.nix
 delete mode 100644 nixos/modules/security/permissions-wrappers/setuid-wrappers.nix

diff --git a/nixos/modules/security/permissions-wrappers/setcap-wrappers.nix b/nixos/modules/security/permissions-wrappers/setcap-wrappers.nix
deleted file mode 100644
index ead3cb219f19..000000000000
--- a/nixos/modules/security/permissions-wrappers/setcap-wrappers.nix
+++ /dev/null
@@ -1,162 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib; with pkgs;
-
-let
-
-  inherit (config.security) setcapWrapperDir;
-
-  cfg = config.security.setcapCapabilities;
-
-  # Produce a shell-code splice intended to be stitched into one of
-  # the build or install phases within the `setcapWrapper` derivation.
-  mkSetcapWrapper = { program, source ? null, ...}:
-    ''
-      if ! source=${if source != null then source else "$(readlink -f $(PATH=$SETCAP_PATH type -tP ${program}))"}; then
-          # If we can't find the program, fall back to the
-          # system profile.
-          source=/nix/var/nix/profiles/default/bin/${program}
-      fi
-
-      gcc -Wall -O2 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${setcapWrapperDir}\" \
-          -lcap-ng -lcap ${./setcap-wrapper.c} -o $out/bin/${program}.wrapper
-    '';
-
-  setcapWrappers = 
-
-    # This is only useful for Linux platforms and a kernel version of
-    # 4.3 or greater
-    assert pkgs.stdenv.isLinux;
-    assert versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3";
-
-    pkgs.stdenv.mkDerivation {
-      name         = "setcap-wrapper";
-      unpackPhase  = "true";
-      buildInputs  = [ linuxHeaders libcap libcap_ng ];
-      installPhase = ''
-        mkdir -p $out/bin
-
-        # Concat together all of our shell splices to compile
-        # binary wrapper programs for all configured setcap programs.
-        ${concatMapStrings mkSetcapWrapper cfg}
-      '';
-    };
-in
-{
-  options = {
-    security.setcapCapabilities = mkOption {
-      type    = types.listOf types.attrs;
-      default = [];
-      example =
-        [ { program = "ping";
-            owner   = "nobody";
-            group   = "nogroup";
-            setcap  = true;
-            capabilities = "cap_net_raw+ep";
-          }
-        ];
-      description = ''
-        This option sets capabilities on a wrapper program that
-        propagates those capabilities down to the wrapped, real
-        program.
-
-        The `program` attribute is the name of the program to be
-        wrapped. If no `source` attribute is provided, specifying the
-        absolute path to the program, then the program will be
-        searched for in the path environment variable.
-
-        NOTE: cap_setpcap, which is required for the wrapper program
-        to be able to raise caps into the Ambient set is NOT raised to
-        the Ambient set so that the real program cannot modify its own
-        capabilities!! This may be too restrictive for cases in which
-        the real program needs cap_setpcap but it at least leans on
-        the side security paranoid vs. too relaxed.
-
-        The attribute `setcap` defaults to false and it will create a
-        wrapper program but never set the capability set on it. This
-        is done so that you can remove a capability sent entirely from
-        a wrapper program without also needing to go change any
-        absolute paths that may be directly referencing the wrapper
-        program.
-      '';
-    };
-
-    security.setcapWrapperDir = mkOption {
-      type        = types.path;
-      default     = "/var/setcap-wrappers";
-      internal    = true;
-      description = ''
-        This option defines the path to the setcap wrappers. It
-        should generally not be overriden.
-      '';
-    };
-
-  };
-
-  config = {
-
-    # Make sure our setcap-wrapper dir exports to the PATH env
-    # variable when initializing the shell
-    environment.extraInit = ''
-    # The setcap wrappers override other bin directories.
-    export PATH="${config.security.setcapWrapperDir}:$PATH"
-    '';
-
-    system.activationScripts.setcap =
-      let
-        setcapPrograms = cfg;
-        configureSetcapWrapper =
-          { program
-          , capabilities
-          , source ? null
-          , owner  ? "nobody"
-          , group  ? "nogroup"
-          , setcap ? false
-          }:
-          ''
-            mkdir -p ${setcapWrapperDir}
-
-            cp ${setcapWrappers}/bin/${program}.wrapper ${setcapWrapperDir}/${program}
-
-            # Prevent races
-            chmod 0000 ${setcapWrapperDir}/${program}
-            chown ${owner}.${group} ${setcapWrapperDir}/${program}
-
-            # Set desired capabilities on the file plus cap_setpcap so
-            # the wrapper program can elevate the capabilities set on
-            # its file into the Ambient set.
-            #
-            # Only set the capabilities though if we're being told to
-            # do so.
-            ${
-            if setcap then
-              ''
-              ${libcap.out}/bin/setcap "cap_setpcap,${capabilities}" ${setcapWrapperDir}/${program}
-              ''
-            else ""
-            }
-
-            # Set the executable bit
-            chmod u+rx,g+x,o+x ${setcapWrapperDir}/${program}
-          '';
-
-      in stringAfter [ "users" ]
-        ''
-          # Look in the system path and in the default profile for
-          # programs to be wrapped.
-          SETCAP_PATH=${config.system.path}/bin:${config.system.path}/sbin
-
-          # When a program is removed from the security.setcapCapabilities
-          # list we have to remove all of the previous program wrappers
-          # and re-build them minus the wrapper for the program removed,
-          # hence the rm here in the activation script.
-
-          rm -f ${setcapWrapperDir}/*
-
-          # Concatenate the generated shell slices to configure
-          # wrappers for each program needing specialized capabilities.
-
-          ${concatMapStrings configureSetcapWrapper setcapPrograms}
-        '';
-  };
-}
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrappers.nix b/nixos/modules/security/permissions-wrappers/setuid-wrappers.nix
deleted file mode 100644
index fe220c94313f..000000000000
--- a/nixos/modules/security/permissions-wrappers/setuid-wrappers.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  inherit (config.security) wrapperDir;
-
-  setuidWrapper = pkgs.stdenv.mkDerivation {
-    name = "setuid-wrapper";
-    unpackPhase = "true";
-    installPhase = ''
-      mkdir -p $out/bin
-      cp ${./setuid-wrapper.c} setuid-wrapper.c
-      gcc -Wall -O2 -DWRAPPER_DIR=\"/run/setuid-wrapper-dirs\" \
-          setuid-wrapper.c -o $out/bin/setuid-wrapper
-    '';
-  };
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    security.setuidPrograms = mkOption {
-      type = types.listOf types.str;
-      default = [];
-      example = ["passwd"];
-      description = ''
-        The Nix store cannot contain setuid/setgid programs directly.
-        For this reason, NixOS can automatically generate wrapper
-        programs that have the necessary privileges.  This option
-        lists the names of programs in the system environment for
-        which setuid root wrappers should be created.
-      '';
-    };
-
-    security.setuidOwners = mkOption {
-      type = types.listOf types.attrs;
-      default = [];
-      example =
-        [ { program = "sendmail";
-            owner = "nobody";
-            group = "postdrop";
-            setuid = false;
-            setgid = true;
-            permissions = "u+rx,g+x,o+x";
-          }
-        ];
-      description = ''
-        This option allows the ownership and permissions on the setuid
-        wrappers for specific programs to be overridden from the
-        default (setuid root, but not setgid root).
-      '';
-    };
-
-    security.wrapperDir = mkOption {
-      internal = true;
-      type = types.path;
-      default = "/var/setuid-wrappers";
-      description = ''
-        This option defines the path to the setuid wrappers.  It
-        should generally not be overriden. Some packages in Nixpkgs
-        expect that <option>wrapperDir</option> is
-        <filename>/var/setuid-wrappers</filename>.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = {
-
-    security.setuidPrograms = [ "fusermount" ];
-
-    system.activationScripts.setuid =
-      let
-        setuidPrograms =
-          (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
-            config.security.setuidPrograms)
-          ++ config.security.setuidOwners;
-
-        makeSetuidWrapper =
-          { program
-          , source ? ""
-          , owner ? "nobody"
-          , group ? "nogroup"
-          , setuid ? false
-          , setgid ? false
-          , permissions ? "u+rx,g+x,o+x"
-          }:
-
-          ''
-            if ! source=${if source != "" then source else "$(readlink -f $(PATH=$SETUID_PATH type -tP ${program}))"}; then
-                # If we can't find the program, fall back to the
-                # system profile.
-                source=/nix/var/nix/profiles/default/bin/${program}
-            fi
-
-            cp ${setuidWrapper}/bin/setuid-wrapper $wrapperDir/${program}
-            echo -n "$source" > $wrapperDir/${program}.real
-            chmod 0000 $wrapperDir/${program} # to prevent races
-            chown ${owner}.${group} $wrapperDir/${program}
-            chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program}
-          '';
-
-      in stringAfter [ "users" ]
-        ''
-          # Look in the system path and in the default profile for
-          # programs to be wrapped.
-          SETUID_PATH=${config.system.path}/bin:${config.system.path}/sbin
-
-          mkdir -p /run/setuid-wrapper-dirs
-          wrapperDir=$(mktemp --directory --tmpdir=/run/setuid-wrapper-dirs setuid-wrappers.XXXXXXXXXX)
-          chmod a+rx $wrapperDir
-
-          ${concatMapStrings makeSetuidWrapper setuidPrograms}
-
-          if [ -L ${wrapperDir} ]; then
-            # Atomically replace the symlink
-            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
-            old=$(readlink ${wrapperDir})
-            ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp
-            mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}
-            rm --force --recursive $old
-          elif [ -d ${wrapperDir} ]; then
-            # Compatibility with old state, just remove the folder and symlink
-            rm -f ${wrapperDir}/*
-            # if it happens to be a tmpfs
-            ${pkgs.utillinux}/bin/umount ${wrapperDir} || true
-            rm -d ${wrapperDir}
-            ln -d --symbolic $wrapperDir ${wrapperDir}
-          else
-            # For initial setup
-            ln --symbolic $wrapperDir ${wrapperDir}
-          fi
-        '';
-
-  };
-
-}

From 9de070e620544f9637b20966eec62cbff42988d8 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 26 Jan 2017 09:39:37 -0800
Subject: [PATCH 0069/3449] Setuid wrapper should not be constrained to a
 specific linux kernel version

---
 nixos/modules/security/permissions-wrappers/default.nix    | 7 -------
 .../security/permissions-wrappers/setuid-wrapper-drv.nix   | 1 -
 2 files changed, 8 deletions(-)

diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
index 585e4a13be61..480bd371040e 100644
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ b/nixos/modules/security/permissions-wrappers/default.nix
@@ -92,13 +92,6 @@ in
         capabilities!! This may be too restrictive for cases in which
         the real program needs cap_setpcap but it at least leans on
         the side security paranoid vs. too relaxed.
-
-        The attribute `setcap` defaults to false and it will create a
-        wrapper program but never set the capability set on it. This
-        is done so that you can remove a capability sent entirely from
-        a wrapper program without also needing to go change any
-        absolute paths that may be directly referencing the wrapper
-        program.
       '';
     };
 
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
index 42b00c8548ab..53cce2ff48e7 100644
--- a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
+++ b/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
@@ -21,7 +21,6 @@ in
 # This is only useful for Linux platforms and a kernel version of
 # 4.3 or greater
 assert pkgs.stdenv.isLinux;
-assert lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3";
 
 pkgs.stdenv.mkDerivation {
   name         = "setuid-wrapper";

From e92b8402b05f34072a20075ed54660e7a7237cc3 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sat, 28 Jan 2017 20:48:03 -0800
Subject: [PATCH 0070/3449] Addressing PR feedback

---
 nixos/doc/manual/release-notes/rl-1609.xml    |   2 +-
 nixos/doc/manual/release-notes/rl-1703.xml    |   8 +
 nixos/modules/config/shells-environment.nix   |   4 +-
 .../installer/tools/nixos-generate-config.pl  |   2 +-
 .../modules/installer/tools/nixos-install.sh  |   7 +-
 nixos/modules/module-list.nix                 |   2 +-
 nixos/modules/programs/kbdlight.nix           |   9 +-
 nixos/modules/programs/light.nix              |   9 +-
 nixos/modules/programs/shadow.nix             |  48 +----
 nixos/modules/security/apparmor-suid.nix      |   4 +-
 .../security/chromium-suid-sandbox.nix        |   6 +-
 nixos/modules/security/duosec.nix             |  11 +-
 nixos/modules/security/pam.nix                |  33 +--
 nixos/modules/security/pam_usb.nix            |  17 +-
 .../security/permissions-wrappers/default.nix | 191 ------------------
 nixos/modules/security/polkit.nix             |  18 +-
 nixos/modules/security/sudo.nix               |  17 +-
 nixos/modules/security/wrappers/default.nix   | 191 ++++++++++++++++++
 .../permissions-wrapper.c                     |   0
 .../setcap-wrapper-drv.nix                    |   4 +-
 .../setuid-wrapper-drv.nix                    |  12 +-
 nixos/modules/services/logging/logcheck.nix   |   4 +-
 nixos/modules/services/mail/dovecot.nix       |   2 +-
 nixos/modules/services/mail/exim.nix          |  12 +-
 nixos/modules/services/mail/mail.nix          |   2 +-
 nixos/modules/services/monitoring/munin.nix   |   4 +-
 nixos/modules/services/monitoring/smartd.nix  |   2 +-
 .../services/network-filesystems/samba.nix    |   2 +-
 nixos/modules/services/networking/gale.nix    |   2 +-
 nixos/modules/services/networking/prayer.nix  |   2 +-
 .../modules/services/networking/smokeping.nix |  20 +-
 nixos/modules/services/scheduling/atd.nix     |   2 +-
 nixos/modules/services/scheduling/cron.nix    |  18 +-
 nixos/modules/services/scheduling/fcron.nix   |  13 +-
 nixos/modules/services/system/dbus.nix        |   4 +-
 .../x11/desktop-managers/enlightenment.nix    |  11 +-
 .../services/x11/desktop-managers/kde4.nix    |   2 +-
 .../services/x11/desktop-managers/kde5.nix    |   2 +-
 nixos/modules/system/boot/stage-2-init.sh     |   8 +-
 nixos/modules/tasks/network-interfaces.nix    |  45 ++---
 .../virtualisation/virtualbox-host.nix        |   4 +-
 nixos/tests/smokeping.nix                     |   2 +-
 .../applications/editors/sublime3/default.nix |   2 +-
 .../networking/browsers/chromium/default.nix  |   4 +-
 .../gale/gale-install.in.patch                |   2 +-
 .../gitlab/remove-hardcoded-locations.patch   |   2 +-
 .../virtualization/virtualbox/hardened.patch  |   6 +-
 pkgs/build-support/build-fhs-userenv/env.nix  |   2 +-
 pkgs/desktops/enlightenment/enlightenment.nix |   6 +-
 .../kinit/start_kdeinit-path.patch            |   2 +-
 .../development/libraries/libgksu/default.nix |   4 +-
 pkgs/development/libraries/polkit/default.nix |   2 +-
 pkgs/development/tools/unity3d/default.nix    |   2 +-
 pkgs/os-specific/linux/fuse/default.nix       |   2 +-
 pkgs/os-specific/linux/mdadm/4.nix            |   2 +-
 pkgs/os-specific/linux/mdadm/default.nix      |   2 +-
 pkgs/os-specific/linux/pam/default.nix        |   2 +-
 pkgs/os-specific/linux/util-linux/default.nix |   2 +-
 pkgs/servers/interlock/default.nix            |   2 +-
 pkgs/servers/mail/petidomo/default.nix        |   2 +-
 .../nagios/plugins/official-2.x.nix           |   4 +-
 pkgs/tools/X11/x11vnc/default.nix             |   4 +-
 pkgs/tools/admin/certbot/default.nix          |   2 +-
 pkgs/tools/misc/debian-devscripts/default.nix |   2 +-
 pkgs/tools/security/ecryptfs/default.nix      |   2 +-
 pkgs/tools/security/ecryptfs/helper.nix       |   2 +-
 pkgs/tools/security/sudo/default.nix          |   2 +-
 pkgs/tools/system/at/default.nix              |   2 +-
 pkgs/tools/system/cron/default.nix            |   2 +-
 pkgs/tools/system/ts/default.nix              |   2 +-
 70 files changed, 320 insertions(+), 510 deletions(-)
 delete mode 100644 nixos/modules/security/permissions-wrappers/default.nix
 create mode 100644 nixos/modules/security/wrappers/default.nix
 rename nixos/modules/security/{permissions-wrappers => wrappers}/permissions-wrapper.c (100%)
 rename nixos/modules/security/{permissions-wrappers => wrappers}/setcap-wrapper-drv.nix (92%)
 rename nixos/modules/security/{permissions-wrappers => wrappers}/setuid-wrapper-drv.nix (75%)

diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index bf8be1b68f26..ade7d5581ced 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -202,7 +202,7 @@ following incompatible changes:</para>
 
   <listitem>
     <para>The directory container setuid wrapper programs,
-    <filename>/var/permissions-wrappers</filename>, <link
+    <filename>/var/setuid-wrappers</filename>, <link
     xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now
     updated atomically to prevent failures if the switch to a new
     configuration is interrupted.</link></para>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 177010e2a322..94aa674fed6c 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -15,6 +15,14 @@ has the following highlights: </para>
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
     manual</link> for more information.</para>
   </listitem>
+
+  <listitem>
+
+    <para>Setting capabilities on programs is now supported with a
+    <literal>setcap-wrapper</literal> functionality. This
+    functionality and the <literal>setuid-wrapper</literal> are merged
+    into a single "wrappers" module.</para>
+  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix
index 7003c0745224..8a7b3ea0bfd2 100644
--- a/nixos/modules/config/shells-environment.nix
+++ b/nixos/modules/config/shells-environment.nix
@@ -168,8 +168,8 @@ in
 
          ${cfg.extraInit}
 
-         # The setuid wrappers override other bin directories.
-         export PATH="${config.security.permissionsWrapperDir}:$PATH"
+         # 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"
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index bb379dafc642..657c28f095dd 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -343,7 +343,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
 
     # Skip special filesystems.
     next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs";
-    next if $mountPoint eq "/var/permissions-wrappers";
+    next if $mountPoint eq "/run/wrappers";
 
     # Skip the optional fields.
     my $n = 6; $n++ while $fields[$n] ne "-"; $n++;
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 4e9f8ab60f2c..36b1a47956d6 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -92,14 +92,13 @@ fi
 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/permissions-wrappers
+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
-mount -t tmpfs -o "mode=0755" none $mountPoint/var/permissions-wrappers
 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
@@ -260,9 +259,9 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate
 
 
 # Ask the user to set a root password.
-if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /var/permissions-wrappers/passwd ] && [ -t 0 ]; then
+if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/passwd ] && [ -t 0 ]; then
     echo "setting root password..."
-    chroot $mountPoint /var/permissions-wrappers/passwd
+    chroot $mountPoint /run/wrappers/passwd
 fi
 
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f7206ea931b4..bd351460a528 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -113,7 +113,7 @@
   ./security/prey.nix
   ./security/rngd.nix
   ./security/rtkit.nix
-  ./security/permissions-wrappers
+  ./security/wrappers
   ./security/sudo.nix
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix
index 30767a03291a..0172368e968f 100644
--- a/nixos/modules/programs/kbdlight.nix
+++ b/nixos/modules/programs/kbdlight.nix
@@ -11,13 +11,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.kbdlight ];
-
-    security.permissionsWrappers.setuid =
-    [ { program = "kbdlight";
-        source  = "${pkgs.kbdlight.out}/bin/kbdlight";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;        
-    }];
+    security.setuidPrograms = [ "kbdlight" ];
   };
 }
diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index c89f8e937216..09cd1113d9c7 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@@ -21,13 +21,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.light ];
-
-    security.permissionsWrappers.setuid =
-    [ { program = "light";
-        source  = "${pkgs.light.out}/bin/light";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;        
-    }];
+    security.setuidPrograms = [ "light" ];
   };
 }
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 08d96cbcf4b5..c5a503180266 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -101,49 +101,9 @@ in
         chpasswd = { rootOK = true; };
       };
 
-
-    security.permissionsWrappers.setuid = 
-    [
-      { program = "su";
-        source  = "${pkgs.shadow.su}/bin/su";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;        
-      }
-
-      { program = "chfn";
-        source  = "${pkgs.shadow.out}/bin/chfn";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;
-      }
-    ] ++
-    (lib.optionals config.users.mutableUsers
-     map (x: x // { owner   = "root";
-                    group   = "root";
-                    setuid  = true;
-                  })
-         [
-           { program = "passwd";
-             source  = "${pkgs.shadow.out}/bin/passwd";
-           }
-
-           { program = "sg";
-             source  = "${pkgs.shadow.out}/bin/sg";
-           }
-
-           { program = "newgrp";
-             source  = "${pkgs.shadow.out}/bin/newgrp";
-           }
-
-           { program = "newuidmap";
-             source  = "${pkgs.shadow.out}/bin/newuidmap";
-           }
-
-           { program = "newgidmap";
-             source  = "${pkgs.shadow.out}/bin/newgidmap";
-           }
-         ]
-    );
+    security.setuidPrograms = [
+      "su" "chfn" "newuidmap" "newgidmap"
+      ] ++ lib.optionals config.users.mutableUsers
+      [ "passwd" "sg" "newgrp" ];
   };
 }
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index 799f27b6708f..e7b870864ee2 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -19,7 +19,7 @@ with lib;
   config = mkIf (cfg.confineSUIDApplications) {
     security.apparmor.profiles = [ (pkgs.writeText "ping" ''
       #include <tunables/global>
-      /var/permissions-wrappers/ping {
+      /run/wrappers/ping {
         #include <abstractions/base>
         #include <abstractions/consoles>
         #include <abstractions/nameservice>
@@ -33,7 +33,7 @@ with lib;
         ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,
-        /var/permissions-wrappers/ping.real r,
+        /run/wrappers/ping.real r,
 
         #/etc/modules.conf r,
 
diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index 6fe252136390..0699fbb728a7 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -27,10 +27,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ sandbox ];
-    security.permissionsWrappers.setuid = [
-      { program = sandbox.passthru.sandboxExecutableName;
-        source  = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";
-      }
-    ];
+    security.setuidPrograms = [ sandbox.passthru.sandboxExecutableName ];
   };
 }
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index e5b354270153..ee62c34438e5 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -188,16 +188,7 @@ in
 
      environment.systemPackages = [ pkgs.duo-unix ];
 
-     security.permissionsWrappers.setuid =
-     [
-       { program = "login_duo";
-         source  = "${pkgs.duo-unix.out}/bin/login_duo";
-         owner   = "root";
-         group   = "root";
-         setuid  = true;
-       }
-     ];
-
+     security.setuidPrograms = [ "login_duo" ];
      environment.etc = loginCfgFile ++ pamCfgFile;
 
      /* If PAM *and* SSH are enabled, then don't do anything special.
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index c5088b64bb31..3c944acf6cfa 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -472,33 +472,14 @@ in
       ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
       ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
 
-    security.permissionsWrappers.setuid =
-      [
-        { program = "unix_chkpwd";
-          source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
-          owner = "root";
-          group = "root";
-          setuid = true;
-        }
+    security.setuidPrograms =
+      optionals config.security.pam.enableEcryptfs [ "mount.ecryptfs_private" "umount.ecryptfs_private" ];
 
-
-          
-      ] ++ (optional config.security.pam.enableEcryptfs 
-        { program = "umount.ecryptfs_private";
-          source  = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;
-        }
-      ) ++ (optional config.security.pam.enableEcryptfs
-        { program = "mount.ecryptfs_private";
-          source  = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;
-        }
-      );
-        
+    security.wrappers.unix_chkpwd = {
+      source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
+      owner = "root";
+      setuid = true;
+    };
 
     environment.etc =
       mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 53a7921a2440..032f8e38d111 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -33,22 +33,7 @@ in
   config = mkIf (cfg.enable || anyUsbAuth) {
 
     # Make sure pmount and pumount are setuid wrapped.
-    security.permissionsWrappers.setuid =
-      [
-        { program = "pmount";
-          source  = "${pkgs.pmount.out}/bin/pmount";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;
-        }
-
-        { program = "pumount";
-          source  = "${pkgs.pmount.out}/bin/pumount";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;
-        }
-      ];
+    security.setuidPrograms = [ "pmount" "pumount" ];
 
     environment.systemPackages = [ pkgs.pmount ];
 
diff --git a/nixos/modules/security/permissions-wrappers/default.nix b/nixos/modules/security/permissions-wrappers/default.nix
deleted file mode 100644
index 480bd371040e..000000000000
--- a/nixos/modules/security/permissions-wrappers/default.nix
+++ /dev/null
@@ -1,191 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-
-  inherit (config.security) run-permissionsWrapperDir permissionsWrapperDir;
-
-  isNotNull = v: if v != null then true else false;
-
-  cfg = config.security.permissionsWrappers;
-
-  setcapWrappers = import ./setcap-wrapper-drv.nix {
-    inherit config lib pkgs;
-  };
-
-  setuidWrappers = import ./setuid-wrapper-drv.nix {
-    inherit config lib pkgs;
-  };
-
-  ###### Activation script for the setcap wrappers
-  configureSetcapWrapper =
-    { program
-    , capabilities
-    , source ? null
-    , owner  ? "nobody"
-    , group  ? "nogroup"
-    }: ''
-      cp ${setcapWrappers}/bin/${program}.wrapper $permissionsWrapperDir/${program}
-
-      # Prevent races
-      chmod 0000 $permissionsWrapperDir/${program}
-      chown ${owner}.${group} $permissionsWrapperDir/${program}
-
-      # Set desired capabilities on the file plus cap_setpcap so
-      # the wrapper program can elevate the capabilities set on
-      # its file into the Ambient set.
-      #
-      # Only set the capabilities though if we're being told to
-      # do so.
-      ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $permissionsWrapperDir/${program}
-
-      # Set the executable bit
-      chmod u+rx,g+x,o+x $permissionsWrapperDir/${program}
-    '';
-
-  ###### Activation script for the setuid wrappers
-  configureSetuidWrapper =
-    { program
-    , source ? null
-    , owner  ? "nobody"
-    , group  ? "nogroup"
-    , setuid ? false
-    , setgid ? false
-    , permissions ? "u+rx,g+x,o+x"
-    }: ''
-      cp ${setuidWrappers}/bin/${program}.wrapper $permissionsWrapperDir/${program}
-
-      # Prevent races
-      chmod 0000 $permissionsWrapperDir/${program}
-      chown ${owner}.${group} $permissionsWrapperDir/${program}
-
-      chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $permissionsWrapperDir/${program}
-    '';
-in
-{
-
-  ###### interface
-
-  options = {
-    security.permissionsWrappers.setcap = lib.mkOption {
-      type    = lib.types.listOf lib.types.attrs;
-      default = [];
-      example =
-        [ { program = "ping";
-            source  = "${pkgs.iputils.out}/bin/ping";
-            owner   = "nobody";
-            group   = "nogroup";
-            capabilities = "cap_net_raw+ep";
-          }
-        ];
-      description = ''
-        This option sets capabilities on a wrapper program that
-        propagates those capabilities down to the wrapped, real
-        program.
-
-        The `program` attribute is the name of the program to be
-        wrapped. If no `source` attribute is provided, specifying the
-        absolute path to the program, then the program will be
-        searched for in the path environment variable.
-
-        NOTE: cap_setpcap, which is required for the wrapper program
-        to be able to raise caps into the Ambient set is NOT raised to
-        the Ambient set so that the real program cannot modify its own
-        capabilities!! This may be too restrictive for cases in which
-        the real program needs cap_setpcap but it at least leans on
-        the side security paranoid vs. too relaxed.
-      '';
-    };
-
-    security.permissionsWrappers.setuid = lib.mkOption {
-      type = lib.types.listOf lib.types.attrs;
-      default = [];
-      example =
-        [ { program = "sendmail";
-            source = "/nix/store/.../bin/sendmail";
-            owner = "nobody";
-            group = "postdrop";
-            setuid = false;
-            setgid = true;
-            permissions = "u+rx,g+x,o+x";
-          }
-        ];
-      description = ''
-        This option allows the ownership and permissions on the setuid
-        wrappers for specific programs to be overridden from the
-        default (setuid root, but not setgid root).
-      '';
-    };
-
-    security.permissionsWrapperDir = lib.mkOption {
-      type        = lib.types.path;
-      default     = "/var/permissions-wrappers";
-      internal    = true;
-      description = ''
-        This option defines the path to the permissions wrappers. It
-        should not be overriden.
-      '';
-    };
-
-    security.run-permissionsWrapperDir = lib.mkOption {
-      type        = lib.types.path;
-      default     = "/run/permissions-wrapper-dirs";
-      internal    = true;
-      description = ''
-        This option defines the run path to the permissions
-        wrappers. It should not be overriden.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-  
-  config = {
-
-    # Make sure our setcap-wrapper dir exports to the PATH env
-    # variable when initializing the shell
-    environment.extraInit = ''
-    # The permissions wrappers override other bin directories.
-    export PATH="${permissionsWrapperDir}:$PATH"
-    '';
-
-    system.activationScripts.wrapper-dir = ''
-      mkdir -p "${permissionsWrapperDir}"
-    '';
-
-    ###### setcap activation script
-    system.activationScripts.permissions-wrappers =
-      lib.stringAfter [ "users" ]
-        ''
-          # Look in the system path and in the default profile for
-          # programs to be wrapped.
-          PERMISSIONS_WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
-
-          mkdir -p ${run-permissionsWrapperDir}
-          permissionsWrapperDir=$(mktemp --directory --tmpdir=${run-permissionsWrapperDir} permissions-wrappers.XXXXXXXXXX)
-          chmod a+rx $permissionsWrapperDir
-
-          ${lib.concatMapStrings configureSetcapWrapper (builtins.filter isNotNull cfg.setcap)}
-          ${lib.concatMapStrings configureSetuidWrapper (builtins.filter isNotNull cfg.setuid)}
-
-          if [ -L ${permissionsWrapperDir} ]; then
-            # Atomically replace the symlink
-            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
-            old=$(readlink ${permissionsWrapperDir})
-            ln --symbolic --force --no-dereference $permissionsWrapperDir ${permissionsWrapperDir}-tmp
-            mv --no-target-directory ${permissionsWrapperDir}-tmp ${permissionsWrapperDir}
-            rm --force --recursive $old
-          elif [ -d ${permissionsWrapperDir} ]; then
-            # Compatibility with old state, just remove the folder and symlink
-            rm -f ${permissionsWrapperDir}/*
-            # if it happens to be a tmpfs
-            ${pkgs.utillinux}/bin/umount ${permissionsWrapperDir} || true
-            rm -d ${permissionsWrapperDir}
-            ln -d --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
-          else
-            # For initial setup
-            ln --symbolic $permissionsWrapperDir ${permissionsWrapperDir}
-          fi
-        '';
-  };
-}
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 098319d5ded3..547b40cedfd9 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -83,22 +83,8 @@ in
 
     security.pam.services.polkit-1 = {};
 
-    security.permissionsWrappers.setuid = 
-      [
-        { program = "pkexec";
-          source  = "${pkgs.polkit.out}/bin/pkexec";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;
-        }
-
-        { program = "polkit-agent-helper-1";
-          owner = "root";
-          group = "root";
-          setuid = true;
-          source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
-        }
-      ];
+    security.setuidPrograms = [ "pkexec" ];
+    security.wrappers."polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
 
     system.activationScripts.polkit =
       ''
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index 652f23c2938f..f5612e1b0c5d 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -81,22 +81,7 @@ in
         ${cfg.extraConfig}
       '';
 
-    security.permissionsWrappers.setuid =
-     [
-       { program = "sudo";
-         source  = "${pkgs.sudo.out}/bin/sudo";
-         owner   = "root";
-         group   = "root";
-         setuid  = true;
-       }
-
-       { program = "sudoedit";
-         source  = "${pkgs.sudo.out}/bin/sudoedit";
-         owner   = "root";
-         group   = "root";
-         setuid  = true;
-       }
-    ];
+    security.setuidPrograms = [ "sudo" "sudoedit" ];
 
     environment.systemPackages = [ sudo ];
 
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
new file mode 100644
index 000000000000..d12209b375b8
--- /dev/null
+++ b/nixos/modules/security/wrappers/default.nix
@@ -0,0 +1,191 @@
+{ config, lib, pkgs, ... }:
+let
+
+  inherit (config.security) wrapperDir;
+
+  isNotNull = v: if v != null || v != "" then true else false;
+
+  cfg = config.security.wrappers;
+
+  setcapWrappers = import ./setcap-wrapper-drv.nix {
+    inherit config lib pkgs;
+  };
+
+  setuidWrappers = import ./setuid-wrapper-drv.nix {
+    inherit config lib pkgs;
+  };
+
+  ###### Activation script for the setcap wrappers
+  mkSetcapProgram =
+    { program
+    , capabilities
+    , source ? null
+    , owner  ? "nobody"
+    , group  ? "nogroup"
+    ...
+    }: ''
+      cp ${setcapWrappers}/bin/${program}.wrapper $wrapperDir/${program}
+
+      # Prevent races
+      chmod 0000 $wrapperDir/${program}
+      chown ${owner}.${group} $wrapperDir/${program}
+
+      # Set desired capabilities on the file plus cap_setpcap so
+      # the wrapper program can elevate the capabilities set on
+      # its file into the Ambient set.
+      #
+      # Only set the capabilities though if we're being told to
+      # do so.
+      ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program}
+
+      # Set the executable bit
+      chmod u+rx,g+x,o+x $wrapperDir/${program}
+    '';
+
+  ###### Activation script for the setuid wrappers
+  mkSetuidProgram =
+    { program
+    , source ? null
+    , owner  ? "nobody"
+    , group  ? "nogroup"
+    , setuid ? false
+    , setgid ? false
+    , permissions ? "u+rx,g+x,o+x"
+    ...
+    }: ''
+      cp ${setuidWrappers}/bin/${program}.wrapper $wrapperDir/${program}
+
+      # Prevent races
+      chmod 0000 $wrapperDir/${program}
+      chown ${owner}.${group} $wrapperDir/${program}
+
+      chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program}
+    '';
+in
+{
+
+  ###### interface
+
+  options = {
+    security.wrappers.setcap = lib.mkOption {
+      type    = lib.types.listOf lib.types.attrs;
+      default = [];
+      example =
+        [ { program = "ping";
+            source  = "${pkgs.iputils.out}/bin/ping";
+            owner   = "nobody";
+            group   = "nogroup";
+            capabilities = "cap_net_raw+ep";
+          }
+        ];
+      description = ''
+        This option sets capabilities on a wrapper program that
+        propagates those capabilities down to the wrapped, real
+        program.
+
+        The <literal>program</literal> attribute is the name of the
+        program to be wrapped. If no <literal>source</literal>
+        attribute is provided, specifying the absolute path to the
+        program, then the program will be searched for in the path
+        environment variable.
+
+        NOTE: cap_setpcap, which is required for the wrapper program
+        to be able to raise caps into the Ambient set is NOT raised to
+        the Ambient set so that the real program cannot modify its own
+        capabilities!! This may be too restrictive for cases in which
+        the real program needs cap_setpcap but it at least leans on
+        the side security paranoid vs. too relaxed.
+      '';
+    };
+
+    security.setuidPrograms = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = ["passwd"];
+      description = ''
+        The Nix store cannot contain setuid/setgid programs directly.
+        For this reason, NixOS can automatically generate wrapper
+        programs that have the necessary privileges.  This option
+        lists the names of programs in the system environment for
+        which setuid root wrappers should be created.
+      '';
+    };
+
+    security.wrappers = lib.mkOption {
+      type = lib.types.attrs;
+      default = {};
+      example = {
+        sendmail.source = "/nix/store/.../bin/sendmail";
+      };
+      description = ''
+        This option allows the ownership and permissions on the setuid
+        wrappers for specific programs to be overridden from the
+        default (setuid root, but not setgid root).
+      '';
+    };
+
+    security.old-wrapperDir = lib.mkOption {
+      type        = lib.types.path;
+      default     = "/var/setuid-wrappers";
+      internal    = true;
+      description = ''
+        This option defines the path to the wrapper programs. It
+        should not be overriden.
+      '';
+    };
+
+    security.wrapperDir = lib.mkOption {
+      type        = lib.types.path;
+      default     = "/run/wrappers";
+      internal    = true;
+      description = ''
+        This option defines the path to the wrapper programs. It
+        should not be overriden.
+      '';
+    };
+  };
+
+  ###### implementation
+  config = {
+    # Make sure our setcap-wrapper dir exports to the PATH env
+    # variable when initializing the shell
+    environment.extraInit = ''
+      # The permissions wrappers override other bin directories.
+      export PATH="${wrapperDir}:$PATH"
+    '';
+
+    ###### setcap activation script
+    system.activationScripts.wrappers =
+      let
+        programs =
+          (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
+            config.security.setuidPrograms)
+            ++ lib.mapAttrsToList
+                 (n: v: (if v ? "program" then v else v // {program=n;}))
+                 cfg.wrappers;
+
+        wrapperPrograms =
+          builtins.map
+            (s: if (s ? "setuid"  && s.setuid  == true) ||
+                   (s ? "setguid" && s.setguid == true) ||
+                   (s ? "permissions")
+                then mkSetuidProgram s
+                else if (s ? "capabilities")
+                then mkSetcapProgram s
+                else ""
+            ) programs;
+
+      in lib.stringAfter [ "users" ]
+        ''
+          # Look in the system path and in the default profile for
+          # programs to be wrapped.
+          WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
+
+          mkdir -p ${wrapperDir}
+          wrapperDir=$(mktemp --directory --tmpdir=${wrapperDir} wrappers.XXXXXXXXXX)
+          chmod a+rx $wrapperDir
+
+          ${lib.concatStringsSep "\n" (builtins.filter isNotNull cfg.wrappers)}
+        '';
+  };
+}
diff --git a/nixos/modules/security/permissions-wrappers/permissions-wrapper.c b/nixos/modules/security/wrappers/permissions-wrapper.c
similarity index 100%
rename from nixos/modules/security/permissions-wrappers/permissions-wrapper.c
rename to nixos/modules/security/wrappers/permissions-wrapper.c
diff --git a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix b/nixos/modules/security/wrappers/setcap-wrapper-drv.nix
similarity index 92%
rename from nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
rename to nixos/modules/security/wrappers/setcap-wrapper-drv.nix
index 2ae3067b1b1c..03dca5c9f42b 100644
--- a/nixos/modules/security/permissions-wrappers/setcap-wrapper-drv.nix
+++ b/nixos/modules/security/wrappers/setcap-wrapper-drv.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let  
-     cfg = config.security.permissionsWrappers;
+     cfg = config.security.wrappers;
 
      # Produce a shell-code splice intended to be stitched into one of
      # the build or install phases within the derivation.
@@ -12,7 +12,7 @@ let
          source=/nix/var/nix/profiles/default/bin/${program}
        fi
 
-       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-permissionsWrapperDir}\" \
+       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-wrapperDir}\" \
            -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
            -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
      '';
diff --git a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/wrappers/setuid-wrapper-drv.nix
similarity index 75%
rename from nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
rename to nixos/modules/security/wrappers/setuid-wrapper-drv.nix
index 53cce2ff48e7..e08ae799bf40 100644
--- a/nixos/modules/security/permissions-wrappers/setuid-wrapper-drv.nix
+++ b/nixos/modules/security/wrappers/setuid-wrapper-drv.nix
@@ -1,18 +1,18 @@
 { config, lib, pkgs, ... }:
 
 let  
-     cfg = config.security.permissionsWrappers;
+     cfg = config.security.wrappers;
 
      # Produce a shell-code splice intended to be stitched into one of
      # the build or install phases within the derivation.
      mkSetuidWrapper = { program, source ? null, ...}: ''
-       if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
-         # If we can't find the program, fall back to the
-         # system profile.
-         source=/nix/var/nix/profiles/default/bin/${program}
+       if ! source=${if source != null then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then
+           # If we can't find the program, fall back to the
+           # system profile.
+           source=/nix/var/nix/profiles/default/bin/${program}
        fi
 
-       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-permissionsWrapperDir}\" \
+       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-wrapperDir}\" \
            -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
            -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
      '';
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index 86451ec318c9..c933c4964798 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -29,8 +29,8 @@ let
     };
 
   cronJob = ''
-    @reboot   logcheck env PATH=/var/permissions-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags}
-    2 ${cfg.timeOfDay} * * * logcheck env PATH=/var/permissions-wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
+    @reboot   logcheck env PATH=/run/wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags}
+    2 ${cfg.timeOfDay} * * * logcheck env PATH=/run/wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
   '';
 
   writeIgnoreRule = name: {level, regex, ...}:
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 6b37a8a4ea2c..7cea2f75439b 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -13,7 +13,7 @@ let
     ''
       base_dir = ${baseDir}
       protocols = ${concatStringsSep " " cfg.protocols}
-      sendmail_path = /var/permissions-wrappers/sendmail
+      sendmail_path = /run/wrappers/sendmail
     ''
 
     (if isNull cfg.sslServerCert then ''
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index 6dfb8fdef119..71414bddd5dc 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -70,7 +70,7 @@ in
       etc."exim.conf".text = ''
         exim_user = ${cfg.user}
         exim_group = ${cfg.group}
-        exim_path = /var/permissions-wrappers/exim
+        exim_path = /run/wrappers/exim
         spool_directory = ${cfg.spoolDir}
         ${cfg.config}
       '';
@@ -89,15 +89,7 @@ in
       gid = config.ids.gids.exim;
     };
 
-    security.permissionsWrappers.setuid =
-    [
-      { program = "exim";
-        source  = "${pkgs.exim.out}/bin/exim";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;
-      }
-    ];
+    security.setuidPrograms = [ "exim" ];
 
     systemd.services.exim = {
       description = "Exim Mail Daemon";
diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
index e8b16349f1a5..aef02eddbe1c 100644
--- a/nixos/modules/services/mail/mail.nix
+++ b/nixos/modules/services/mail/mail.nix
@@ -26,7 +26,7 @@ with lib;
 
   config = mkIf (config.services.mail.sendmailSetuidWrapper != null) {
 
-    security.permissionsWrappers.setuid = [ config.services.mail.sendmailSetuidWrapper ];
+    security.wrappers.setuid = [ config.services.mail.sendmailSetuidWrapper ];
 
   };
 
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index a80565fa280b..cd4a5125029f 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 "/var/permissions-wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \
+          --set PATH "/run/wrappers:/run/current-system/sw/bin:/run/current-system/sw/bin" \
           --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
           --set MUNIN_PLUGSTATE "/var/run/munin"
 
@@ -183,7 +183,7 @@ in
 
         mkdir -p /etc/munin/plugins
         rm -rf /etc/munin/plugins/*
-        PATH="/var/permissions-wrappers:/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:/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
       '';
       serviceConfig = {
         ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/";
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index 99fd5c4d3674..af02d73597fe 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -124,7 +124,7 @@ in
           };
 
           mailer = mkOption {
-            default = "/var/permissions-wrappers/sendmail";
+            default = "/run/wrappers/sendmail";
             type = types.path;
             description = ''
               Sendmail-compatible binary to be used to send the messages.
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 884966363b8b..8cc8f21851c4 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -30,7 +30,7 @@ let
     ''
       [ global ]
       security = ${cfg.securityType}
-      passwd program = /var/permissions-wrappers/passwd %u
+      passwd program = /run/wrappers/passwd %u
       pam password change = ${smbToString cfg.syncPasswordsByPam}
       invalid users = ${smbToString cfg.invalidUsers}
 
diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix
index bc9b884f11b4..f4c75c17290f 100644
--- a/nixos/modules/services/networking/gale.nix
+++ b/nixos/modules/services/networking/gale.nix
@@ -141,7 +141,7 @@ in
          setgid = false;
        };
 
-       security.permissionsWrappers.setuid = [ cfg.setuidWrapper ];
+       security.wrappers.setuid = [ cfg.setuidWrapper ];
 
        systemd.services.gale-galed = {
          description = "Gale messaging daemon";
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index 67d8cece6115..58e6ad8a683e 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -18,7 +18,7 @@ let
     var_prefix = "${stateDir}"
     prayer_user = "${prayerUser}"
     prayer_group = "${prayerGroup}"
-    sendmail_path = "/var/permissions-wrappers/sendmail"
+    sendmail_path = "/run/wrappers/sendmail"
 
     use_http_port ${cfg.port}
 
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 67aa313c8605..b7bb55f55084 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -219,14 +219,14 @@ in
         type = types.string;
         default = ''
           + FPing
-          binary = ${config.security.permissionsWrapperDir}/fping
+          binary = ${config.security.wrapperDir}/fping
         '';
         description = "Probe configuration";
       };
       sendmail = mkOption {
         type = types.nullOr types.path;
         default = null;
-        example = "/var/permissions-wrappers/sendmail";
+        example = "/run/wrappers/sendmail";
         description = "Use this sendmail compatible script to deliver alerts";
       };
       smokeMailTemplate = mkOption {
@@ -273,21 +273,7 @@ in
         message = "services.smokeping: sendmail and Mailhost cannot both be enabled.";
       }
     ];
-    security.permissionsWrappers.setuid = [
-      { program = "fping";
-        source  = "${pkgs.fping}/bin/fping";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;
-      }
-
-      { program = "fping";
-        source  = "${pkgs.fping}/bin/fping6";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;
-      }
-    ];
+    security.setuidPrograms = [ "fping" "fping6" ];
     environment.systemPackages = [ pkgs.fping ];
     users.extraUsers = singleton {
       name = cfg.user;
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 9c4f8d59faa4..316ab847b343 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,7 +42,7 @@ in
 
   config = mkIf cfg.enable {
 
-    security.permissionsWrappers.setuid = map (program: {
+    security.wrappers.setuid = map (program: {
       inherit program;
 
       source = "${pkgs.atd}/bin/${program}";
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index e33961658f02..26ce3c98d67c 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -20,7 +20,7 @@ let
   cronNixosPkg = pkgs.cron.override {
     # The mail.nix nixos module, if there is any local mail system enabled,
     # should have sendmail in this path.
-    sendmailPath = "/var/permissions-wrappers/sendmail";
+    sendmailPath = "/run/wrappers/sendmail";
   };
 
   allFiles =
@@ -61,7 +61,7 @@ in
           A list of Cron jobs to be appended to the system-wide
           crontab.  See the manual page for crontab for the expected
           format. If you want to get the results mailed you must setuid
-          sendmail. See <option>security.permissionsWrappers.setuid</option>
+          sendmail. See <option>security.wrappers.setuid</option>
 
           If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
           will is allowed to have its own crontab file. The /var/cron/cron.deny file
@@ -92,21 +92,9 @@ in
   config = mkMerge [
 
     { services.cron.enable = mkDefault (allFiles != []); }
-
     (mkIf (config.services.cron.enable) {
-
-      security.permissionsWrappers.setuid =
-      [
-        { program = "crontab";
-          source  = "${pkgs.cronNixosPkg.out}/bin/crontab";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;        
-        }
-      ];
-
+      security.setuidPrograms = [ "crontab" ];
       environment.systemPackages = [ cronNixosPkg ];
-
       environment.etc.crontab =
         { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; }
             ''
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index 5804f0ee72f7..f0de996224ff 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -96,7 +96,7 @@ in
             fcronallow  =       /etc/fcron.allow
             fcrondeny   =       /etc/fcron.deny
             shell       =       /bin/sh
-            sendmail    =       /var/permissions-wrappers/sendmail
+            sendmail    =       /run/wrappers/sendmail
             editor      =       /run/current-system/sw/bin/vi
           '';
           target = "fcron.conf";
@@ -106,16 +106,7 @@ in
 
     environment.systemPackages = [ pkgs.fcron ];
 
-    security.permissionsWrappers.setuid =
-    [
-      { program = "fcrontab";
-        source  = "${pkgs.fcron.out}/bin/fcrontab";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;        
-      }
-    ];
-
+    security.setuidPrograms = [ "fcrontab" ];
     systemd.services.fcron = {
       description = "fcron daemon";
       after = [ "local-fs.target" ];
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index d15d5551e343..47fc4426af08 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -38,7 +38,7 @@ let
       sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf
 
       sed '${./dbus-system-local.conf.in}' \
-        -e 's,@servicehelper@,${config.security.permissionsWrapperDir}/dbus-daemon-launch-helper,g' \
+        -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
         -e 's,@extra@,${systemExtraxml},' \
         > "$out/system-local.conf"
 
@@ -114,7 +114,7 @@ in
 
     systemd.packages = [ pkgs.dbus.daemon ];
 
-    security.permissionsWrappers.setuid = singleton
+    security.wrappers.setuid = singleton
       { program = "dbus-daemon-launch-helper";
         source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper";
         owner = "root";
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 9d0ff77c2ae8..feee6ba87ec8 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -62,16 +62,7 @@ in
       '';
     }];
 
-    security.permissionsWrappers.setuid =
-    [
-      { program = "e_freqset";
-        source  = "${e.enlightenment.out}/bin/e_freqset";
-        owner   = "root";
-        group   = "root";
-        setuid  = true;        
-      }
-    ];
-
+    security.setuidPrograms = [ "e_freqset" ];
     environment.etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 31d2ebcdf1a6..d21a1f28dca3 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -131,7 +131,7 @@ in
           '';
       };
 
-    security.permissionsWrappers.setuid = singleton
+    security.wrappers.setuid = singleton
       { program = "kcheckpass";
         source = "${kde_workspace}/lib/kde4/libexec/kcheckpass";
         owner = "root";
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index f886c60793d9..a4124aaefa9a 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -68,7 +68,7 @@ in
         '';
       };
 
-      security.permissionsWrappers.setuid = [
+      security.wrappers.setuid = [
         {
           program = "kcheckpass";
           source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 86f552cd3caf..ffc0700806c6 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -131,10 +131,10 @@ if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then
     cat /etc/resolv.conf | resolvconf -m 1000 -a host
 fi
 
-# Create /var/permissions-wrappers as a tmpfs.
-rm -rf /var/permissions-wrappers
-mkdir -m 0755 -p /var/permissions-wrappers
-mount -t tmpfs -o "mode=0755" tmpfs /var/permissions-wrappers
+# Create /run/wrappers as a tmpfs.
+rm -rf /run/wrappers
+mkdir -m 0755 -p /run/wrappers
+mount -t tmpfs -o "mode=0755" tmpfs /run/wrappers
 
 # Log the script output to /dev/kmsg or /run/log/stage-2-init.log.
 # Only at this point are all the necessary prerequisites ready for these commands.
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 61519c6a3ce8..1afcddd915f7 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -898,38 +898,23 @@ in
 
     # Capabilities won't work unless we have at-least a 4.3 Linux
     # kernel because we need the ambient capability
-    security.permissionsWrappers.setcap = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") (
-      [
-        { program = "ping";
-          source  = "${pkgs.iputils.out}/bin/ping";
-          capabilities = "cap_net_raw+p";
-        }
+    security.wrappers = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") {
+      ping = {
+        source  = "${pkgs.iputils.out}/bin/ping";
+        capabilities = "cap_net_raw+p";
+      };
 
-        { program = "ping6";
-          source  = "${pkgs.iputils.out}/bin/ping6";
-          capabilities = "cap_net_raw+p";
-        }
-      ]
-    );
+      ping6 = {
+        source  = "${pkgs.iputils.out}/bin/ping6";
+        capabilities = "cap_net_raw+p";
+      };
+    };
 
-    # If our linux kernel IS older than 4.3, let's setuid ping and ping6
-    security.permissionsWrappers.setuid = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") (
-      [
-        { program = "ping";
-          source  = "${pkgs.iputils.out}/bin/ping";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;
-        }
-        
-        { program = "ping6";
-          source  = "${pkgs.iputils.out}/bin/ping6";
-          owner   = "root";
-          group   = "root";
-          setuid  = true;
-        }
-      ]
-    );
+    # If the linux kernel IS older than 4.3, create setuid wrappers
+    # for ping and ping6
+    security.setuidPrograms = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") [
+      "ping" "ping6"
+    ];
 
     # Set the host and domain names in the activation script.  Don't
     # clear it if it's not configured in the NixOS configuration,
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index b3647482f2cb..405a630dfa78 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -68,7 +68,7 @@ in
     boot.extraModulePackages = [ kernelModules ];
     environment.systemPackages = [ virtualbox ];
 
-    security.permissionsWrappers.setuid = let
+    security.wrappers.setuid = let
       mkSuid = program: {
         inherit program;
         source = "${virtualbox}/libexec/virtualbox/${program}";
@@ -99,7 +99,7 @@ in
         SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="${virtualbox}/libexec/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
       '';
 
-    # Since we lack the right setuid binaries, set up a host-only network by default.
+    # Since we lack the right setuid/setcap binaries, set up a host-only network by default.
   } (mkIf cfg.addNetworkInterface {
     systemd.services."vboxnet0" =
       { description = "VirtualBox vboxnet0 Interface";
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 7e2d84f44224..5e2d013abc52 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           mailHost = "127.0.0.2";
           probeConfig = ''
             + FPing
-            binary = /var/permissions-wrappers/fping
+            binary = /run/wrappers/fping
             offset = 0%
           '';
         };
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 0f7d50088a9d..1c24ff4737b9 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
-  pkexecPath ? "/var/permissions-wrappers/pkexec", libredirect,
+  pkexecPath ? "/run/wrappers/pkexec", libredirect,
   gksuSupport ? false, gksu}:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index dd8fd32adfde..7009cf17fab7 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -83,9 +83,9 @@ in stdenv.mkDerivation {
     ed -v -s "$out/bin/chromium" << EOF
     2i
 
-    if [ -x "/var/permissions-wrappers/${sandboxExecutableName}" ]
+    if [ -x "/run/wrappers/${sandboxExecutableName}" ]
     then
-      export CHROME_DEVEL_SANDBOX="/var/permissions-wrappers/${sandboxExecutableName}"
+      export CHROME_DEVEL_SANDBOX="/run/wrappers/${sandboxExecutableName}"
     else
       export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}"
     fi
diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
index 9a83fc09e4e7..4b59f1a376dd 100644
--- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
+++ b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
@@ -26,7 +26,7 @@ index 50e8ad8..eec0ed2 100644
 +	is_nixos=no
 +fi
 +
-+if [ -u /var/permissions-wrappers/gksign ]; then
++if [ -u /run/wrappers/gksign ]; then
 +	cat <<EOM
 +
 +Gale appears to have already been set up via the NixOS module system (check
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 5377ddb9a62b..6603e8d4b601 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -11,7 +11,7 @@ index a9d8ac4..85f13f5 100644
 -  # #   arguments: '-i -t'
 -  # # }
 +  config.action_mailer.sendmail_settings = {
-+    location: '/var/permissions-wrappers/sendmail',
++    location: '/run/wrappers/sendmail',
 +    arguments: '-i -t'
 +  }
    config.action_mailer.perform_deliveries = true
diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch
index cae4abe8612c..a788a1df3caa 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/pkgs/applications/virtualization/virtualbox/hardened.patch
@@ -96,7 +96,7 @@ index 95dc9a7..39170bc 100644
      /* get the path to the executable */
      char szPath[RTPATH_MAX];
 -    RTPathAppPrivateArch(szPath, sizeof(szPath) - 1);
-+    RTStrCopy(szPath, sizeof(szPath) - 1, "/var/permissions-wrappers");
++    RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers");
      size_t cchBufLeft = strlen(szPath);
      szPath[cchBufLeft++] = RTPATH_DELIMITER;
      szPath[cchBufLeft] = 0;
@@ -154,7 +154,7 @@ index be2ad8f..7ddf105 100644
  
 +RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath)
 +{
-+    return RTStrCopy(pszPath, cchPath, "/var/permissions-wrappers");
++    return RTStrCopy(pszPath, cchPath, "/run/wrappers");
 +}
 +
 +
@@ -174,7 +174,7 @@ index 7bde6af..2656cae 100644
 + * will cut off everything after the rightmost / as this function is analogous
 + * to RTProcGetExecutablePath().
 + */
-+#define SUIDDIR "/var/permissions-wrappers/"
++#define SUIDDIR "/run/wrappers/"
 +
 +RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath)
 +{
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index b30e1362aba9..98381d9023f0 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -51,7 +51,7 @@ let
     export PS1='${name}-chrootenv:\u@\h:\w\$ '
     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='/var/permissions-wrappers:/usr/bin:/usr/sbin'
+    export PATH='/run/wrappers:/usr/bin:/usr/sbin'
     export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
     # Force compilers to look in default search paths
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 753b939bd486..65e3bf2d642c 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
   # this is a hack and without this cpufreq module is not working. does the following:
   #   1. moves the "freqset" binary to "e_freqset",
   #   2. linkes "e_freqset" to enlightenment/bin so that,
-  #   3. permissionsWrappers.setuid detects it and places wrappers in /var/permissions-wrappers/e_freqset,
-  #   4. and finally, links /var/permissions-wrappers/e_freqset to original destination where enlightenment wants it
+  #   3. wrappers.setuid detects it and places wrappers in /run/wrappers/e_freqset,
+  #   4. and finally, links /run/wrappers/e_freqset to original destination where enlightenment wants it
   postInstall = ''
     export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
     mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset
     ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset
-    ln -sv /var/permissions-wrappers/e_freqset $CPUFREQ_DIRPATH/freqset
+    ln -sv /run/wrappers/e_freqset $CPUFREQ_DIRPATH/freqset
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
index a16d35757255..61aa49f70e59 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
@@ -7,7 +7,7 @@ Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c
  #include <unistd.h>
  
 -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
-+#define EXECUTE "/var/permissions-wrappers/start_kdeinit"
++#define EXECUTE "/run/wrappers/start_kdeinit"
  
  #if KDEINIT_OOM_PROTECT
  
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 7da4a900b7e7..6d57ca2397e5 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
 
     # Fix some binary paths
     sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c
-    sed -i -e 's|/usr/bin/sudo|/var/permissions-wrappers/sudo|g' libgksu/libgksu.c
-    sed -i -e 's|/bin/su\([^d]\)|/var/permissions-wrappers/su\1|g' libgksu/libgksu.c
+    sed -i -e 's|/usr/bin/sudo|/run/wrappers/sudo|g' libgksu/libgksu.c
+    sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/su\1|g' libgksu/libgksu.c
 
     touch NEWS README
   '';
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 0f7106181b8a..b2e2ecf04930 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -5,7 +5,7 @@
 let
 
   system = "/var/run/current-system/sw";
-  setuid = "/var/permissions-wrappers"; #TODO: from <nixos> config.security.wrapperDir;
+  setuid = "/run/wrappers"; #TODO: from <nixos> config.security.wrapperDir;
 
   foolVars = {
     SYSCONF = "/etc";
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 1fc56b986567..2d4977a31958 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -94,7 +94,7 @@ in stdenv.mkDerivation rec {
     unitydir="$out/opt/Unity/Editor"
     mkdir -p $unitydir
     mv Editor/* $unitydir
-    ln -sf /var/permissions-wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
+    ln -sf /run/wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
 
     mkdir -p $out/share/applications
     sed "/^Exec=/c\Exec=$out/bin/unity-editor" \
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index a36934004d2e..29bcc58c7c07 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       # Ensure that FUSE calls the setuid wrapper, not
       # $out/bin/fusermount. It falls back to calling fusermount in
       # $PATH, so it should also work on non-NixOS systems.
-      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/permissions-wrappers\""
+      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers\""
 
       sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
       sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix
index abe8632773f3..af8e53ec3a20 100644
--- a/pkgs/os-specific/linux/mdadm/4.nix
+++ b/pkgs/os-specific/linux/mdadm/4.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/var/permissions-wrappers/sendmail@' -i Makefile
+        -e 's@/usr/sbin/sendmail@/run/wrappers/sendmail@' -i Makefile
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 531d55a7f12b..d9bdf21723b2 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/var/permissions-wrappers/sendmail@' -i Makefile
+        -e 's@/usr/sbin/sendmail@/run/wrappers/sendmail@' -i Makefile
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 196af58183ff..dc61b3f27f6c 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mv -v $out/sbin/unix_chkpwd{,.orig}
-    ln -sv /var/permissions-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
+    ln -sv /run/wrappers/unix_chkpwd $out/sbin/unix_chkpwd
   ''; /*
     rm -rf $out/etc
     mkdir -p $modules/lib
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 1c4a7b798ce1..90fbf861448a 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     --enable-last
     --enable-mesg
     --disable-use-tty-group
-    --enable-fs-paths-default=/var/permissions-wrappers:/var/run/current-system/sw/bin:/sbin
+    --enable-fs-paths-default=/run/wrappers:/var/run/current-system/sw/bin:/sbin
     ${if ncurses == null then "--without-ncurses" else ""}
     ${if systemd == null then "" else ''
       --with-systemd
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index af733540ff35..b58c1b50e033 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -30,7 +30,7 @@ buildGoPackage rec {
       -e 's|/bin/chown|${coreutils}/bin/chown|' \
       -e 's|/bin/date|${coreutils}/bin/date|' \
       -e 's|/sbin/poweroff|${systemd}/sbin/poweroff|' \
-      -e 's|/usr/bin/sudo|/var/permissions-wrappers/sudo|' \
+      -e 's|/usr/bin/sudo|/run/wrappers/sudo|' \
       -e 's|/sbin/cryptsetup|${cryptsetup}/bin/cryptsetup|'
   '';
 }
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix
index c112af567fd4..1770517047fa 100644
--- a/pkgs/servers/mail/petidomo/default.nix
+++ b/pkgs/servers/mail/petidomo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, sendmailPath ? "/var/permissions-wrappers/sendmail" }:
+{ stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/sendmail" }:
 
 stdenv.mkDerivation rec {
   name = "petidomo-4.3";
diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index ac1cb1a5398e..30bd7e8a7c3c 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   # configured on the build machine).
   preConfigure= "
     configureFlagsArray=(
-      --with-ping-command='/var/permissions-wrappers/ping -n -U -w %d -c %d %s'
-      --with-ping6-command='/var/permissions-wrappers/ping6 -n -U -w %d -c %d %s'
+      --with-ping-command='/run/wrappers/ping -n -U -w %d -c %d %s'
+      --with-ping6-command='/run/wrappers/ping6 -n -U -w %d -c %d %s'
     )
   ";
 
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index 5f96a35af6fe..b343a7da378c 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
     configureFlags="--mandir=$out/share/man"
 
     substituteInPlace x11vnc/unixpw.c \
-        --replace '"/bin/su"' '"/var/permissions-wrappers/su"' \
+        --replace '"/bin/su"' '"/run/wrappers/su"' \
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
 
-    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/var/permissions-wrappers/su|g' x11vnc/ssltools.h
+    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/su|g' x11vnc/ssltools.h
   '';
 
   meta = {
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 23eb02e294a7..366213d2e1e2 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -31,7 +31,7 @@ python2Packages.buildPythonApplication rec {
   buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]);
 
   patchPhase = ''
-    substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/var/permissions-wrappers/sendmail"
+    substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/sendmail"
     substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers"
   '';
 
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 2261bfc66379..be3b674de049 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -2,7 +2,7 @@
 , FileDesktopEntry, libxslt, docbook_xsl, makeWrapper
 , python3Packages
 , perlPackages, curl, gnupg, diffutils
-, sendmailPath ? "/var/permissions-wrappers/sendmail"
+, sendmailPath ? "/run/wrappers/sendmail"
 }:
 
 let
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index 7e941e5378a7..98e06d1de3e9 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   # TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
-  wrapperDir = "/var/permissions-wrappers";
+  wrapperDir = "/run/wrappers";
 
   postPatch = ''
     FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 6e3e6766a28e..3daaadcaad6a 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /var/permissions-wrappers
+  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp $src $out/libexec/ecryptfs-helper.py
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index a3a13f198037..0d2953c6f45e 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, pam, groff
-, sendmailPath ? "/var/permissions-wrappers/sendmail"
+, sendmailPath ? "/run/wrappers/sendmail"
 , withInsults ? false
 }:
 
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 2fb5b9670c88..9f8bad00ca4f 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/var/permissions-wrappers/sendmail" }:
+{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/run/wrappers/sendmail" }:
 
 stdenv.mkDerivation {
   name = "at-3.1.16";
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index f7f2a6158a26..8a6a5dc15d36 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     #define _PATH_SENDMAIL "${sendmailPath}"
 
     #undef _PATH_DEFPATH
-    #define _PATH_DEFPATH "/var/permissions-wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
+    #define _PATH_DEFPATH "/run/wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
     __EOT__
 
     # Implicit saved uids do not work here due to way NixOS uses setuid wrappers
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 1384ea04fb62..1dfb856d4d6f 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl,
-sendmailPath ? "/var/permissions-wrappers/sendmail" }:
+sendmailPath ? "/run/wrappers/sendmail" }:
 
 stdenv.mkDerivation rec {
 

From 3fe7b1a4c97ef0a098c0cd786386e2b547762983 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:07:12 -0600
Subject: [PATCH 0071/3449] setcap-wrapper: Addressing more PR feedback,
 unifying drvs, and cleaning up a bit

---
 nixos/modules/security/wrappers/default.nix   | 58 +++++++++++--------
 .../security/wrappers/permissions-wrapper.c   | 25 ++++----
 .../security/wrappers/setcap-wrapper-drv.nix  | 37 ------------
 .../security/wrappers/setuid-wrapper-drv.nix  | 35 -----------
 4 files changed, 46 insertions(+), 109 deletions(-)
 delete mode 100644 nixos/modules/security/wrappers/setcap-wrapper-drv.nix
 delete mode 100644 nixos/modules/security/wrappers/setuid-wrapper-drv.nix

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index d12209b375b8..69b62d7b2ff2 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -3,17 +3,27 @@ let
 
   inherit (config.security) wrapperDir;
 
-  isNotNull = v: if v != null || v != "" then true else false;
+  wrappers  = config.security.wrappers;
+  mkWrapper = { program, source ? null, ...}: ''
+    if ! source=${if source != null then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then
+        # If we can't find the program, fall back to the
+        # system profile.
+        source=/nix/var/nix/profiles/default/bin/${program}
+    fi
 
-  cfg = config.security.wrappers;
+    gcc -Wall -O2 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.wrapperDir}\" \
+        -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
+        -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
+  '';
 
-  setcapWrappers = import ./setcap-wrapper-drv.nix {
-    inherit config lib pkgs;
-  };
-
-  setuidWrappers = import ./setuid-wrapper-drv.nix {
-    inherit config lib pkgs;
-  };
+  wrappedPrograms = pkgs.stdenv.mkDerivation {
+    name         = "permissions-wrapper";
+    unpackPhase  = "true";
+    installPhase = ''
+      mkdir -p $out/bin
+      ${lib.concatMapStrings mkWrapper wrappers}
+    '';
+  }
 
   ###### Activation script for the setcap wrappers
   mkSetcapProgram =
@@ -23,8 +33,10 @@ let
     , owner  ? "nobody"
     , group  ? "nogroup"
     ...
-    }: ''
-      cp ${setcapWrappers}/bin/${program}.wrapper $wrapperDir/${program}
+    }: 
+    assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");
+    ''
+      cp ${wrappedPrograms}/bin/${program}.wrapper $wrapperDir/${program}
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}
@@ -33,9 +45,6 @@ let
       # Set desired capabilities on the file plus cap_setpcap so
       # the wrapper program can elevate the capabilities set on
       # its file into the Ambient set.
-      #
-      # Only set the capabilities though if we're being told to
-      # do so.
       ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program}
 
       # Set the executable bit
@@ -53,7 +62,7 @@ let
     , permissions ? "u+rx,g+x,o+x"
     ...
     }: ''
-      cp ${setuidWrappers}/bin/${program}.wrapper $wrapperDir/${program}
+      cp ${wrappedPrograms}/bin/${program}.wrapper $wrapperDir/${program}
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}
@@ -147,10 +156,10 @@ in
 
   ###### implementation
   config = {
-    # Make sure our setcap-wrapper dir exports to the PATH env
-    # variable when initializing the shell
+    # Make sure our wrapperDir exports to the PATH env variable when
+    # initializing the shell
     environment.extraInit = ''
-      # The permissions wrappers override other bin directories.
+      # Wrappers override other bin directories.
       export PATH="${wrapperDir}:$PATH"
     '';
 
@@ -162,16 +171,17 @@ in
             config.security.setuidPrograms)
             ++ lib.mapAttrsToList
                  (n: v: (if v ? "program" then v else v // {program=n;}))
-                 cfg.wrappers;
+                 wrappers;
 
-        wrapperPrograms =
+        mkWrappedPrograms =
           builtins.map
-            (s: if (s ? "setuid"  && s.setuid  == true) ||
+            (s: if (s ? "capabilities")
+                then mkSetcapProgram s
+                else if 
+                   (s ? "setuid"  && s.setuid  == true) ||
                    (s ? "setguid" && s.setguid == true) ||
                    (s ? "permissions")
                 then mkSetuidProgram s
-                else if (s ? "capabilities")
-                then mkSetcapProgram s
                 else ""
             ) programs;
 
@@ -185,7 +195,7 @@ in
           wrapperDir=$(mktemp --directory --tmpdir=${wrapperDir} wrappers.XXXXXXXXXX)
           chmod a+rx $wrapperDir
 
-          ${lib.concatStringsSep "\n" (builtins.filter isNotNull cfg.wrappers)}
+          ${lib.concatStringsSep "\n" mkWrappedPrograms}
         '';
   };
 }
diff --git a/nixos/modules/security/wrappers/permissions-wrapper.c b/nixos/modules/security/wrappers/permissions-wrapper.c
index cb9d8d6b37b2..608bd3a378c7 100644
--- a/nixos/modules/security/wrappers/permissions-wrapper.c
+++ b/nixos/modules/security/wrappers/permissions-wrapper.c
@@ -26,16 +26,6 @@ extern char **environ;
 static char * sourceProg = SOURCE_PROG;
 static char * wrapperDir = WRAPPER_DIR;
 
-// Make sure we have the WRAPPER_TYPE macro specified at compile
-// time...
-#ifdef WRAPPER_SETCAP
-static char * wrapperType = "setcap";
-#elif defined WRAPPER_SETUID
-static char * wrapperType = "setuid";
-#else
-#error "Program must be compiled with either the WRAPPER_SETCAP or WRAPPER_SETUID macro"
-#endif
-
 // Update the capabilities of the running process to include the given
 // capability in the Ambient set.
 static void set_ambient_cap(cap_value_t cap)
@@ -66,7 +56,7 @@ static int make_caps_ambient(const char *selfPath)
 
     if(!caps)
     {
-        fprintf(stderr, "could not retreive the capability set for this file\n");
+        fprintf(stderr, "no caps set or could not retrieve the caps for this file, not doing anything...\n");
         return 1;
     }
 
@@ -171,6 +161,16 @@ int main(int argc, char * * argv)
 
     assert(selfPathSize > 0);
 
+    // Assert we have room for the zero byte, this ensures the path
+    // isn't being truncated because it's too big for the buffer.
+    //
+    // A better way to handle this might be to use something like the
+    // whereami library (https://github.com/gpakosz/whereami) or a
+    // loop that resizes the buffer and re-reads the link if the
+    // contents are being truncated.
+    assert(selfPathSize < sizeof(selfPath));
+
+    // Set the zero byte since readlink doesn't do that for us.
     selfPath[selfPathSize] = '\0';
 
     // Make sure that we are being executed from the right location,
@@ -207,8 +207,7 @@ int main(int argc, char * * argv)
     // Read the capabilities set on the file and raise them in to the
     // Ambient set so the program we're wrapping receives the
     // capabilities too!
-    if (strcmp(wrapperType, "setcap") == 0)
-        assert(!make_caps_ambient(selfPath));
+    make_caps_ambient(selfPath);
 
     execve(sourceProg, argv, environ);
     
diff --git a/nixos/modules/security/wrappers/setcap-wrapper-drv.nix b/nixos/modules/security/wrappers/setcap-wrapper-drv.nix
deleted file mode 100644
index 03dca5c9f42b..000000000000
--- a/nixos/modules/security/wrappers/setcap-wrapper-drv.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let  
-     cfg = config.security.wrappers;
-
-     # Produce a shell-code splice intended to be stitched into one of
-     # the build or install phases within the derivation.
-     mkSetcapWrapper = { program, source ? null, ...}: ''
-       if ! source=${if source != null then source else "$(readlink -f $(PATH=$PERMISSIONS_WRAPPER_PATH type -tP ${program}))"}; then
-         # If we can't find the program, fall back to the
-         # system profile.
-         source=/nix/var/nix/profiles/default/bin/${program}
-       fi
-
-       gcc -Wall -O2 -DWRAPPER_SETCAP=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-wrapperDir}\" \
-           -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
-           -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
-     '';
-in
-
-# This is only useful for Linux platforms and a kernel version of
-# 4.3 or greater
-assert pkgs.stdenv.isLinux;
-assert lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3";
-
-pkgs.stdenv.mkDerivation {
-  name         = "setcap-wrapper";
-  unpackPhase  = "true";
-  buildInputs  = [ pkgs.linuxHeaders ];
-  installPhase = ''
-    mkdir -p $out/bin
-
-    # Concat together all of our shell splices to compile
-    # binary wrapper programs for all configured setcap programs.
-    ${lib.concatMapStrings mkSetcapWrapper cfg.setcap}
-  '';
-}
diff --git a/nixos/modules/security/wrappers/setuid-wrapper-drv.nix b/nixos/modules/security/wrappers/setuid-wrapper-drv.nix
deleted file mode 100644
index e08ae799bf40..000000000000
--- a/nixos/modules/security/wrappers/setuid-wrapper-drv.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let  
-     cfg = config.security.wrappers;
-
-     # Produce a shell-code splice intended to be stitched into one of
-     # the build or install phases within the derivation.
-     mkSetuidWrapper = { program, source ? null, ...}: ''
-       if ! source=${if source != null then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then
-           # If we can't find the program, fall back to the
-           # system profile.
-           source=/nix/var/nix/profiles/default/bin/${program}
-       fi
-
-       gcc -Wall -O2 -DWRAPPER_SETUID=1 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.run-wrapperDir}\" \
-           -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
-           -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
-     '';
-in
-
-# This is only useful for Linux platforms and a kernel version of
-# 4.3 or greater
-assert pkgs.stdenv.isLinux;
-
-pkgs.stdenv.mkDerivation {
-  name         = "setuid-wrapper";
-  unpackPhase  = "true";
-  installPhase = ''
-    mkdir -p $out/bin
-
-    # Concat together all of our shell splices to compile
-    # binary wrapper programs for all configured setcap programs.
-    ${lib.concatMapStrings mkSetuidWrapper cfg.setuid}
-  '';
-}

From 2f113ee90a8c97be2ccb70dc6738fe243dde1b84 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:08:36 -0600
Subject: [PATCH 0072/3449] setcap-wrapper: Minor refactor

---
 nixos/modules/security/wrappers/default.nix                   | 2 +-
 .../security/wrappers/{permissions-wrapper.c => wrapper.c}    | 0
 .../sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch | 4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename nixos/modules/security/wrappers/{permissions-wrapper.c => wrapper.c} (100%)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 69b62d7b2ff2..4d51796b676c 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -12,7 +12,7 @@ let
     fi
 
     gcc -Wall -O2 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.wrapperDir}\" \
-        -lcap-ng -lcap ${./permissions-wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
+        -lcap-ng -lcap ${./wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
         -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
   '';
 
diff --git a/nixos/modules/security/wrappers/permissions-wrapper.c b/nixos/modules/security/wrappers/wrapper.c
similarity index 100%
rename from nixos/modules/security/wrappers/permissions-wrapper.c
rename to nixos/modules/security/wrappers/wrapper.c
diff --git a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
index 3d38cf3b604d..549da5436e60 100644
--- a/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
+++ b/pkgs/applications/networking/sniffers/wireshark/wireshark-lookup-dumpcap-in-path.patch
@@ -4,7 +4,7 @@ Date: Thu, 26 Nov 2015 21:03:35 +0100
 Subject: [PATCH] Lookup dumpcap in PATH
 
 NixOS patch: Look for dumpcap in PATH first, because there may be a
-dumpcap permissions-wrapper that we want to use instead of the default
+dumpcap wrapper that we want to use instead of the default
 non-setuid dumpcap binary.
 
 Also change execv() to execvp() because we've set argv[0] to "dumpcap"
@@ -27,7 +27,7 @@ index 970688e..49914d5 100644
 -    exename = g_strdup_printf("%s/dumpcap", progfile_dir);
 +    /*
 +     * NixOS patch: Look for dumpcap in PATH first, because there may be a
-+     * dumpcap permissions-wrapper that we want to use instead of the default
++     * dumpcap wrapper that we want to use instead of the default
 +     * non-setuid dumpcap binary.
 +     */
 +    if (system("command -v dumpcap >/dev/null") == 0) {

From 7680a40a373a89c683f5b87dfa3cd09c2a168473 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:16:04 -0600
Subject: [PATCH 0073/3449] setcap-wrapper: Syntax wibble

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

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 4d51796b676c..093f2bb49b09 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -23,7 +23,7 @@ let
       mkdir -p $out/bin
       ${lib.concatMapStrings mkWrapper wrappers}
     '';
-  }
+  };
 
   ###### Activation script for the setcap wrappers
   mkSetcapProgram =

From 82de4c0fad9607b9b193564dedf92ac830202eeb Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:20:02 -0600
Subject: [PATCH 0074/3449] setcap-wrapper: Syntax wibble

---
 nixos/modules/security/wrappers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 093f2bb49b09..3f1a42c53b71 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -32,7 +32,7 @@ let
     , source ? null
     , owner  ? "nobody"
     , group  ? "nogroup"
-    ...
+    , ...
     }: 
     assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");
     ''
@@ -60,7 +60,7 @@ let
     , setuid ? false
     , setgid ? false
     , permissions ? "u+rx,g+x,o+x"
-    ...
+    , ...
     }: ''
       cp ${wrappedPrograms}/bin/${program}.wrapper $wrapperDir/${program}
 

From 70ec24093c45a07a5b4f4d230390dfa16e87e1dc Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:22:19 -0600
Subject: [PATCH 0075/3449] Removing dead code

---
 nixos/modules/security/wrappers/default.nix | 54 +++++++++------------
 1 file changed, 23 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 3f1a42c53b71..3012439e13d4 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -76,37 +76,6 @@ in
   ###### interface
 
   options = {
-    security.wrappers.setcap = lib.mkOption {
-      type    = lib.types.listOf lib.types.attrs;
-      default = [];
-      example =
-        [ { program = "ping";
-            source  = "${pkgs.iputils.out}/bin/ping";
-            owner   = "nobody";
-            group   = "nogroup";
-            capabilities = "cap_net_raw+ep";
-          }
-        ];
-      description = ''
-        This option sets capabilities on a wrapper program that
-        propagates those capabilities down to the wrapped, real
-        program.
-
-        The <literal>program</literal> attribute is the name of the
-        program to be wrapped. If no <literal>source</literal>
-        attribute is provided, specifying the absolute path to the
-        program, then the program will be searched for in the path
-        environment variable.
-
-        NOTE: cap_setpcap, which is required for the wrapper program
-        to be able to raise caps into the Ambient set is NOT raised to
-        the Ambient set so that the real program cannot modify its own
-        capabilities!! This may be too restrictive for cases in which
-        the real program needs cap_setpcap but it at least leans on
-        the side security paranoid vs. too relaxed.
-      '';
-    };
-
     security.setuidPrograms = mkOption {
       type = types.listOf types.str;
       default = [];
@@ -125,11 +94,34 @@ in
       default = {};
       example = {
         sendmail.source = "/nix/store/.../bin/sendmail";
+        ping = {
+          source  = "${pkgs.iputils.out}/bin/ping";
+          owner   = "nobody";
+          group   = "nogroup";
+          capabilities = "cap_net_raw+ep";
+        };
       };
       description = ''
         This option allows the ownership and permissions on the setuid
         wrappers for specific programs to be overridden from the
         default (setuid root, but not setgid root).
+
+        Additionally, this option can set capabilities on a wrapper
+        program that propagates those capabilities down to the
+        wrapped, real program.
+
+        The <literal>program</literal> attribute is the name of the
+        program to be wrapped. If no <literal>source</literal>
+        attribute is provided, specifying the absolute path to the
+        program, then the program will be searched for in the path
+        environment variable.
+
+        NOTE: cap_setpcap, which is required for the wrapper program
+        to be able to raise caps into the Ambient set is NOT raised to
+        the Ambient set so that the real program cannot modify its own
+        capabilities!! This may be too restrictive for cases in which
+        the real program needs cap_setpcap but it at least leans on
+        the side security paranoid vs. too relaxed.
       '';
     };
 

From 8e159b9d1ed816abca9ca415aba0bc254c4e162c Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:22:47 -0600
Subject: [PATCH 0076/3449] Qualify mkOption with lib

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

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 3012439e13d4..fa3712837068 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -76,7 +76,7 @@ in
   ###### interface
 
   options = {
-    security.setuidPrograms = mkOption {
+    security.setuidPrograms = lib.mkOption {
       type = types.listOf types.str;
       default = [];
       example = ["passwd"];

From 0707a3eaa2ce33e8f490fff474c168a33dc1b5f5 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:23:10 -0600
Subject: [PATCH 0077/3449] Qualify with lib

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

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index fa3712837068..b71e3d219855 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -77,7 +77,7 @@ in
 
   options = {
     security.setuidPrograms = lib.mkOption {
-      type = types.listOf types.str;
+      type = lib.types.listOf lib.types.str;
       default = [];
       example = ["passwd"];
       description = ''

From 5077699605fae8840afe1a066a37412e7ea9206f Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:27:11 -0600
Subject: [PATCH 0078/3449] Derp derp

---
 nixos/modules/security/wrappers/default.nix | 46 ++++++++++-----------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index b71e3d219855..a93db916fad8 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -1,9 +1,15 @@
 { config, lib, pkgs, ... }:
 let
 
-  inherit (config.security) wrapperDir;
+  inherit (config.security) wrapperDir wrappers setuidPrograms;
+
+  programs =
+    (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
+      setuidPrograms)
+      ++ lib.mapAttrsToList
+           (n: v: (if v ? "program" then v else v // {program=n;}))
+           wrappers;
 
-  wrappers  = config.security.wrappers;
   mkWrapper = { program, source ? null, ...}: ''
     if ! source=${if source != null then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then
         # If we can't find the program, fall back to the
@@ -21,7 +27,7 @@ let
     unpackPhase  = "true";
     installPhase = ''
       mkdir -p $out/bin
-      ${lib.concatMapStrings mkWrapper wrappers}
+      ${lib.concatMapStrings (builtins.map mkWrapper programs)}
     '';
   };
 
@@ -70,6 +76,18 @@ let
 
       chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program}
     '';
+
+  mkWrappedPrograms =
+    builtins.map
+      (s: if (s ? "capabilities")
+          then mkSetcapProgram s
+          else if 
+             (s ? "setuid"  && s.setuid  == true) ||
+             (s ? "setguid" && s.setguid == true) ||
+             (s ? "permissions")
+          then mkSetuidProgram s
+          else ""
+      ) programs;
 in
 {
 
@@ -157,27 +175,7 @@ in
 
     ###### setcap activation script
     system.activationScripts.wrappers =
-      let
-        programs =
-          (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
-            config.security.setuidPrograms)
-            ++ lib.mapAttrsToList
-                 (n: v: (if v ? "program" then v else v // {program=n;}))
-                 wrappers;
-
-        mkWrappedPrograms =
-          builtins.map
-            (s: if (s ? "capabilities")
-                then mkSetcapProgram s
-                else if 
-                   (s ? "setuid"  && s.setuid  == true) ||
-                   (s ? "setguid" && s.setguid == true) ||
-                   (s ? "permissions")
-                then mkSetuidProgram s
-                else ""
-            ) programs;
-
-      in lib.stringAfter [ "users" ]
+      lib.stringAfter [ "users" ]
         ''
           # Look in the system path and in the default profile for
           # programs to be wrapped.

From 48564d1ae56b93a27ca6dc5565f389dfde66831a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:31:33 -0600
Subject: [PATCH 0079/3449] Another wibble

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

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index a93db916fad8..28aacb891ee3 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -27,7 +27,7 @@ let
     unpackPhase  = "true";
     installPhase = ''
       mkdir -p $out/bin
-      ${lib.concatMapStrings (builtins.map mkWrapper programs)}
+      ${lib.concatMapStrings mkWrapper programs}
     '';
   };
 

From af3b9a3d46672232d70e4ab6a45f00e10363bfae Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:41:39 -0600
Subject: [PATCH 0080/3449] More wibbles?

---
 nixos/modules/security/wrappers/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 28aacb891ee3..0170da03689a 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -4,11 +4,11 @@ let
   inherit (config.security) wrapperDir wrappers setuidPrograms;
 
   programs =
-    (map (x: { program = x; owner = "root"; group = "root"; setuid = true; })
-      setuidPrograms)
-      ++ lib.mapAttrsToList
-           (n: v: (if v ? "program" then v else v // {program=n;}))
-           wrappers;
+    (map (x: { program = x; owner = "root"; group = "root"; setuid = true; }) setuidPrograms)
+    ++
+    (lib.mapAttrsToList
+      (n: v: (if v ? "program" then v else v // {program=n;}))
+      wrappers);
 
   mkWrapper = { program, source ? null, ...}: ''
     if ! source=${if source != null then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then

From a8cb2afa981099889cf47185be33f4a831ff482b Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 01:58:12 -0600
Subject: [PATCH 0081/3449] Fixing a bunch of issues

---
 nixos/modules/services/mail/mail.nix           |  2 +-
 nixos/modules/services/networking/gale.nix     |  2 +-
 nixos/modules/services/scheduling/atd.nix      |  4 +---
 nixos/modules/services/scheduling/cron.nix     |  2 +-
 nixos/modules/services/system/dbus.nix         | 17 ++++++++---------
 .../services/x11/desktop-managers/kde4.nix     |  8 +-------
 .../services/x11/desktop-managers/kde5.nix     | 18 ++++--------------
 .../modules/virtualisation/virtualbox-host.nix |  5 ++---
 8 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/services/mail/mail.nix b/nixos/modules/services/mail/mail.nix
index aef02eddbe1c..cfe1b5496a45 100644
--- a/nixos/modules/services/mail/mail.nix
+++ b/nixos/modules/services/mail/mail.nix
@@ -26,7 +26,7 @@ with lib;
 
   config = mkIf (config.services.mail.sendmailSetuidWrapper != null) {
 
-    security.wrappers.setuid = [ config.services.mail.sendmailSetuidWrapper ];
+    security.wrappers.sendmail = config.services.mail.sendmailSetuidWrapper;
 
   };
 
diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix
index f4c75c17290f..fd83f9e3c1b7 100644
--- a/nixos/modules/services/networking/gale.nix
+++ b/nixos/modules/services/networking/gale.nix
@@ -141,7 +141,7 @@ in
          setgid = false;
        };
 
-       security.wrappers.setuid = [ cfg.setuidWrapper ];
+       security.wrappers.gksign = cfg.setuidWrapper;
 
        systemd.services.gale-galed = {
          description = "Gale messaging daemon";
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 316ab847b343..7b4937b5c673 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,9 +42,7 @@ in
 
   config = mkIf cfg.enable {
 
-    security.wrappers.setuid = map (program: {
-      inherit program;
-
+    security.wrappers.setuid = map (program: "${program}" = {
       source = "${pkgs.atd}/bin/${program}";
       owner = "atd";
       group = "atd";
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 26ce3c98d67c..7bd1e4818048 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -61,7 +61,7 @@ in
           A list of Cron jobs to be appended to the system-wide
           crontab.  See the manual page for crontab for the expected
           format. If you want to get the results mailed you must setuid
-          sendmail. See <option>security.wrappers.setuid</option>
+          sendmail. See <option>security.wrappers</option>
 
           If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root
           will is allowed to have its own crontab file. The /var/cron/cron.deny file
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 47fc4426af08..f787c02540d3 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -114,15 +114,14 @@ in
 
     systemd.packages = [ pkgs.dbus.daemon ];
 
-    security.wrappers.setuid = singleton
-      { program = "dbus-daemon-launch-helper";
-        source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper";
-        owner = "root";
-        group = "messagebus";
-        setuid = true;
-        setgid = false;
-        permissions = "u+rx,g+rx,o-rx";
-      };
+    security.wrappers.dbus-daemon-launch-helper = {
+      source = "${pkgs.dbus.daemon}/libexec/dbus-daemon-launch-helper";
+      owner = "root";
+      group = "messagebus";
+      setuid = true;
+      setgid = false;
+      permissions = "u+rx,g+rx,o-rx";
+    };
 
     services.dbus.packages = [
       pkgs.dbus.out
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index d21a1f28dca3..25ae75592c9d 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -131,13 +131,7 @@ in
           '';
       };
 
-    security.wrappers.setuid = singleton
-      { program = "kcheckpass";
-        source = "${kde_workspace}/lib/kde4/libexec/kcheckpass";
-        owner = "root";
-        group = "root";
-        setuid = true;
-      };
+    security.wrappers.kcheckpass.source = "${kde_workspace}/lib/kde4/libexec/kcheckpass";
 
     environment.systemPackages =
         [ pkgs.kde4.kdelibs
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index a4124aaefa9a..00fdfedbc7bb 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -68,20 +68,10 @@ in
         '';
       };
 
-      security.wrappers.setuid = [
-        {
-          program = "kcheckpass";
-          source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
-          owner = "root";
-          setuid = true;
-        }
-        {
-          program = "start_kdeinit";
-          source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";
-          owner = "root";
-          setuid = true;
-        }
-      ];
+      security.wrappers = {
+        kcheckpass.source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
+        "start_kdeinit".source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";
+      };
 
       environment.systemPackages =
         [
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 405a630dfa78..70ee44680ab8 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -68,9 +68,8 @@ in
     boot.extraModulePackages = [ kernelModules ];
     environment.systemPackages = [ virtualbox ];
 
-    security.wrappers.setuid = let
-      mkSuid = program: {
-        inherit program;
+    security.wrappers = let
+      mkSuid = program: "${program}" = {
         source = "${virtualbox}/libexec/virtualbox/${program}";
         owner = "root";
         group = "vboxusers";

From 4aa0923009dac4d2307b5fe018b944180bfad6a2 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 04:11:01 -0600
Subject: [PATCH 0082/3449] Getting rid of the var indirection and using a bin
 path instead

---
 .../modules/installer/tools/nixos-install.sh  |  4 +--
 nixos/modules/security/apparmor-suid.nix      |  3 +-
 nixos/modules/security/wrappers/default.nix   | 33 +++++++++++++++++--
 nixos/modules/services/logging/logcheck.nix   |  4 +--
 nixos/modules/services/mail/dovecot.nix       |  2 +-
 nixos/modules/services/mail/exim.nix          |  2 +-
 nixos/modules/services/monitoring/munin.nix   |  4 +--
 nixos/modules/services/monitoring/smartd.nix  |  2 +-
 .../services/network-filesystems/samba.nix    |  2 +-
 nixos/modules/services/networking/prayer.nix  |  2 +-
 .../modules/services/networking/smokeping.nix |  2 +-
 nixos/modules/services/scheduling/atd.nix     |  4 +--
 nixos/modules/services/scheduling/cron.nix    |  2 +-
 nixos/modules/services/scheduling/fcron.nix   |  2 +-
 nixos/modules/system/boot/stage-2-init.sh     |  5 ---
 .../virtualisation/virtualbox-host.nix        |  4 +--
 nixos/tests/smokeping.nix                     |  2 +-
 .../applications/editors/sublime3/default.nix |  2 +-
 .../networking/browsers/chromium/default.nix  |  4 +--
 .../gale/gale-install.in.patch                |  2 +-
 .../gitlab/remove-hardcoded-locations.patch   |  2 +-
 .../virtualization/virtualbox/hardened.patch  |  6 ++--
 pkgs/build-support/build-fhs-userenv/env.nix  |  2 +-
 pkgs/desktops/enlightenment/enlightenment.nix |  6 ++--
 .../kinit/start_kdeinit-path.patch            |  2 +-
 .../development/libraries/libgksu/default.nix |  4 +--
 pkgs/development/libraries/polkit/default.nix |  2 +-
 pkgs/development/tools/unity3d/default.nix    |  2 +-
 pkgs/os-specific/linux/fuse/default.nix       |  2 +-
 pkgs/os-specific/linux/mdadm/4.nix            |  2 +-
 pkgs/os-specific/linux/mdadm/default.nix      |  2 +-
 pkgs/os-specific/linux/pam/default.nix        |  2 +-
 pkgs/os-specific/linux/util-linux/default.nix |  2 +-
 pkgs/servers/interlock/default.nix            |  2 +-
 pkgs/servers/mail/petidomo/default.nix        |  2 +-
 .../nagios/plugins/official-2.x.nix           |  4 +--
 pkgs/tools/X11/x11vnc/default.nix             |  4 +--
 pkgs/tools/admin/certbot/default.nix          |  2 +-
 pkgs/tools/misc/debian-devscripts/default.nix |  2 +-
 pkgs/tools/security/ecryptfs/default.nix      |  2 +-
 pkgs/tools/security/ecryptfs/helper.nix       |  2 +-
 pkgs/tools/security/sudo/default.nix          |  2 +-
 pkgs/tools/system/at/default.nix              |  2 +-
 pkgs/tools/system/cron/default.nix            |  2 +-
 pkgs/tools/system/ts/default.nix              |  2 +-
 45 files changed, 86 insertions(+), 65 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 36b1a47956d6..57bc249360e7 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -259,9 +259,9 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate
 
 
 # Ask the user to set a root password.
-if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/passwd ] && [ -t 0 ]; then
+if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/bin/passwd ] && [ -t 0 ]; then
     echo "setting root password..."
-    chroot $mountPoint /run/wrappers/passwd
+    chroot $mountPoint /run/wrappers/bin/passwd
 fi
 
 
diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index e7b870864ee2..dfbf5d859ba9 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -19,7 +19,7 @@ with lib;
   config = mkIf (cfg.confineSUIDApplications) {
     security.apparmor.profiles = [ (pkgs.writeText "ping" ''
       #include <tunables/global>
-      /run/wrappers/ping {
+      /run/wrappers/bin/ping {
         #include <abstractions/base>
         #include <abstractions/consoles>
         #include <abstractions/nameservice>
@@ -33,7 +33,6 @@ with lib;
         ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,
-        /run/wrappers/ping.real r,
 
         #/etc/modules.conf r,
 
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 0170da03689a..8837ac35a53d 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -17,7 +17,9 @@ let
         source=/nix/var/nix/profiles/default/bin/${program}
     fi
 
-    gcc -Wall -O2 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"${config.security.wrapperDir}\" \
+    parentWrapperDir=$(dirname ${wrapperDir})
+
+    gcc -Wall -O2 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"$parentWrapperDir\" \
         -lcap-ng -lcap ${./wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
         -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
   '';
@@ -155,7 +157,7 @@ in
 
     security.wrapperDir = lib.mkOption {
       type        = lib.types.path;
-      default     = "/run/wrappers";
+      default     = "/run/wrappers/bin";
       internal    = true;
       description = ''
         This option defines the path to the wrapper programs. It
@@ -181,11 +183,36 @@ in
           # programs to be wrapped.
           WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
+          if [ -d ${config.security.old-wrapperDir} ]; then
+            rm -rf ${config.security.old-wrapperDir}
+          fi
+
+          parentWrapperDir="$(dirname ${wrapperDir})"
+
           mkdir -p ${wrapperDir}
-          wrapperDir=$(mktemp --directory --tmpdir=${wrapperDir} wrappers.XXXXXXXXXX)
+          wrapperDir=$(mktemp --directory --tmpdir="$parentWrapperDir" wrappers.XXXXXXXXXX)
           chmod a+rx $wrapperDir
 
           ${lib.concatStringsSep "\n" mkWrappedPrograms}
+
+          if [ -L ${wrapperDir} ]; then
+            # Atomically replace the symlink
+            # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
+            old=$(readlink ${wrapperDir})
+            ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp
+            mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}
+            rm --force --recursive $old
+          elif [ -d ${wrapperDir} ]; then
+            # Compatibility with old state, just remove the folder and symlink
+            rm -f ${wrapperDir}/*
+            # if it happens to be a tmpfs
+            ${pkgs.utillinux}/bin/umount ${wrapperDir} || true
+            rm -d ${wrapperDir}
+            ln -d --symbolic $wrapperDir ${wrapperDir}
+          else
+            # For initial setup
+            ln --symbolic $wrapperDir ${wrapperDir}
+          fi
         '';
   };
 }
diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix
index c933c4964798..72925b95cae4 100644
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@@ -29,8 +29,8 @@ let
     };
 
   cronJob = ''
-    @reboot   logcheck env PATH=/run/wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags}
-    2 ${cfg.timeOfDay} * * * logcheck env PATH=/run/wrappers:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
+    @reboot   logcheck env PATH=/run/wrappers/bin:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck -R ${flags}
+    2 ${cfg.timeOfDay} * * * logcheck env PATH=/run/wrappers/bin:$PATH nice -n10 ${pkgs.logcheck}/sbin/logcheck ${flags}
   '';
 
   writeIgnoreRule = name: {level, regex, ...}:
diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 7cea2f75439b..3b25e41edb19 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -13,7 +13,7 @@ let
     ''
       base_dir = ${baseDir}
       protocols = ${concatStringsSep " " cfg.protocols}
-      sendmail_path = /run/wrappers/sendmail
+      sendmail_path = /run/wrappers/bin/sendmail
     ''
 
     (if isNull cfg.sslServerCert then ''
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index 71414bddd5dc..b05344fa9b56 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -70,7 +70,7 @@ in
       etc."exim.conf".text = ''
         exim_user = ${cfg.user}
         exim_group = ${cfg.group}
-        exim_path = /run/wrappers/exim
+        exim_path = /run/wrappers/bin/exim
         spool_directory = ${cfg.spoolDir}
         ${cfg.config}
       '';
diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index cd4a5125029f..6d2ce5383687 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:/run/current-system/sw/bin:/run/current-system/sw/bin" \
+          --set PATH "/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/bin" \
           --set MUNIN_LIBDIR "${pkgs.munin}/lib" \
           --set MUNIN_PLUGSTATE "/var/run/munin"
 
@@ -183,7 +183,7 @@ in
 
         mkdir -p /etc/munin/plugins
         rm -rf /etc/munin/plugins/*
-        PATH="/run/wrappers:/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:/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/";
diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix
index af02d73597fe..4d10299a9879 100644
--- a/nixos/modules/services/monitoring/smartd.nix
+++ b/nixos/modules/services/monitoring/smartd.nix
@@ -124,7 +124,7 @@ in
           };
 
           mailer = mkOption {
-            default = "/run/wrappers/sendmail";
+            default = "/run/wrappers/bin/sendmail";
             type = types.path;
             description = ''
               Sendmail-compatible binary to be used to send the messages.
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 8cc8f21851c4..09a11585bc92 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -30,7 +30,7 @@ let
     ''
       [ global ]
       security = ${cfg.securityType}
-      passwd program = /run/wrappers/passwd %u
+      passwd program = /run/wrappers/bin/passwd %u
       pam password change = ${smbToString cfg.syncPasswordsByPam}
       invalid users = ${smbToString cfg.invalidUsers}
 
diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix
index 58e6ad8a683e..8cd4a0823534 100644
--- a/nixos/modules/services/networking/prayer.nix
+++ b/nixos/modules/services/networking/prayer.nix
@@ -18,7 +18,7 @@ let
     var_prefix = "${stateDir}"
     prayer_user = "${prayerUser}"
     prayer_group = "${prayerGroup}"
-    sendmail_path = "/run/wrappers/sendmail"
+    sendmail_path = "/run/wrappers/bin/sendmail"
 
     use_http_port ${cfg.port}
 
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index b7bb55f55084..eedc27593375 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -226,7 +226,7 @@ in
       sendmail = mkOption {
         type = types.nullOr types.path;
         default = null;
-        example = "/run/wrappers/sendmail";
+        example = "/run/wrappers/bin/sendmail";
         description = "Use this sendmail compatible script to deliver alerts";
       };
       smokeMailTemplate = mkOption {
diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index 7b4937b5c673..f3ada6b7496a 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,13 +42,13 @@ in
 
   config = mkIf cfg.enable {
 
-    security.wrappers.setuid = map (program: "${program}" = {
+    security.wrappers = map (program: {"${program}" = {
       source = "${pkgs.atd}/bin/${program}";
       owner = "atd";
       group = "atd";
       setuid = true;
       setgid = true;
-    }) [ "at" "atq" "atrm" "batch" ];
+    };}) [ "at" "atq" "atrm" "batch" ];
 
     environment.systemPackages = [ at ];
 
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 7bd1e4818048..48c5f6be3168 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -20,7 +20,7 @@ let
   cronNixosPkg = pkgs.cron.override {
     # The mail.nix nixos module, if there is any local mail system enabled,
     # should have sendmail in this path.
-    sendmailPath = "/run/wrappers/sendmail";
+    sendmailPath = "/run/wrappers/bin/sendmail";
   };
 
   allFiles =
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index f0de996224ff..339b0de66e98 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -96,7 +96,7 @@ in
             fcronallow  =       /etc/fcron.allow
             fcrondeny   =       /etc/fcron.deny
             shell       =       /bin/sh
-            sendmail    =       /run/wrappers/sendmail
+            sendmail    =       /run/wrappers/bin/sendmail
             editor      =       /run/current-system/sw/bin/vi
           '';
           target = "fcron.conf";
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index ffc0700806c6..f827e530f877 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -131,11 +131,6 @@ if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then
     cat /etc/resolv.conf | resolvconf -m 1000 -a host
 fi
 
-# Create /run/wrappers as a tmpfs.
-rm -rf /run/wrappers
-mkdir -m 0755 -p /run/wrappers
-mount -t tmpfs -o "mode=0755" tmpfs /run/wrappers
-
 # Log the script output to /dev/kmsg or /run/log/stage-2-init.log.
 # Only at this point are all the necessary prerequisites ready for these commands.
 exec {logOutFd}>&1 {logErrFd}>&2
diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 70ee44680ab8..501ed9bc6839 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -69,12 +69,12 @@ in
     environment.systemPackages = [ virtualbox ];
 
     security.wrappers = let
-      mkSuid = program: "${program}" = {
+      mkSuid = program: {"${program}" = {
         source = "${virtualbox}/libexec/virtualbox/${program}";
         owner = "root";
         group = "vboxusers";
         setuid = true;
-      };
+      };};
     in mkIf cfg.enableHardening (map mkSuid [
       "VBoxHeadless"
       "VBoxNetAdpCtl"
diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix
index 5e2d013abc52..4c77e4b78613 100644
--- a/nixos/tests/smokeping.nix
+++ b/nixos/tests/smokeping.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           mailHost = "127.0.0.2";
           probeConfig = ''
             + FPing
-            binary = /run/wrappers/fping
+            binary = /run/wrappers/bin/fping
             offset = 0%
           '';
         };
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 1c24ff4737b9..f900a4e9147c 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
-  pkexecPath ? "/run/wrappers/pkexec", libredirect,
+  pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
   gksuSupport ? false, gksu}:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 7009cf17fab7..c59d6b00945a 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -83,9 +83,9 @@ in stdenv.mkDerivation {
     ed -v -s "$out/bin/chromium" << EOF
     2i
 
-    if [ -x "/run/wrappers/${sandboxExecutableName}" ]
+    if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ]
     then
-      export CHROME_DEVEL_SANDBOX="/run/wrappers/${sandboxExecutableName}"
+      export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}"
     else
       export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}"
     fi
diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
index 4b59f1a376dd..33e3e09a96d2 100644
--- a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
+++ b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
@@ -26,7 +26,7 @@ index 50e8ad8..eec0ed2 100644
 +	is_nixos=no
 +fi
 +
-+if [ -u /run/wrappers/gksign ]; then
++if [ -u /run/wrappers/bin/gksign ]; then
 +	cat <<EOM
 +
 +Gale appears to have already been set up via the NixOS module system (check
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 6603e8d4b601..dfd024a762a6 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -11,7 +11,7 @@ index a9d8ac4..85f13f5 100644
 -  # #   arguments: '-i -t'
 -  # # }
 +  config.action_mailer.sendmail_settings = {
-+    location: '/run/wrappers/sendmail',
++    location: '/run/wrappers/bin/sendmail',
 +    arguments: '-i -t'
 +  }
    config.action_mailer.perform_deliveries = true
diff --git a/pkgs/applications/virtualization/virtualbox/hardened.patch b/pkgs/applications/virtualization/virtualbox/hardened.patch
index a788a1df3caa..8d408d3494e3 100644
--- a/pkgs/applications/virtualization/virtualbox/hardened.patch
+++ b/pkgs/applications/virtualization/virtualbox/hardened.patch
@@ -96,7 +96,7 @@ index 95dc9a7..39170bc 100644
      /* get the path to the executable */
      char szPath[RTPATH_MAX];
 -    RTPathAppPrivateArch(szPath, sizeof(szPath) - 1);
-+    RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers");
++    RTStrCopy(szPath, sizeof(szPath) - 1, "/run/wrappers/bin");
      size_t cchBufLeft = strlen(szPath);
      szPath[cchBufLeft++] = RTPATH_DELIMITER;
      szPath[cchBufLeft] = 0;
@@ -154,7 +154,7 @@ index be2ad8f..7ddf105 100644
  
 +RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath)
 +{
-+    return RTStrCopy(pszPath, cchPath, "/run/wrappers");
++    return RTStrCopy(pszPath, cchPath, "/run/wrappers/bin");
 +}
 +
 +
@@ -174,7 +174,7 @@ index 7bde6af..2656cae 100644
 + * will cut off everything after the rightmost / as this function is analogous
 + * to RTProcGetExecutablePath().
 + */
-+#define SUIDDIR "/run/wrappers/"
++#define SUIDDIR "/run/wrappers/bin/"
 +
 +RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath)
 +{
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix
index 98381d9023f0..9a1897695a9d 100644
--- a/pkgs/build-support/build-fhs-userenv/env.nix
+++ b/pkgs/build-support/build-fhs-userenv/env.nix
@@ -51,7 +51,7 @@ let
     export PS1='${name}-chrootenv:\u@\h:\w\$ '
     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:/usr/bin:/usr/sbin'
+    export PATH='/run/wrappers/bin:/usr/bin:/usr/sbin'
     export PKG_CONFIG_PATH=/usr/lib/pkgconfig
 
     # Force compilers to look in default search paths
diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 65e3bf2d642c..3949bffaba17 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
   # this is a hack and without this cpufreq module is not working. does the following:
   #   1. moves the "freqset" binary to "e_freqset",
   #   2. linkes "e_freqset" to enlightenment/bin so that,
-  #   3. wrappers.setuid detects it and places wrappers in /run/wrappers/e_freqset,
-  #   4. and finally, links /run/wrappers/e_freqset to original destination where enlightenment wants it
+  #   3. wrappers.setuid detects it and places wrappers in /run/wrappers/bin/e_freqset,
+  #   4. and finally, links /run/wrappers/bin/e_freqset to original destination where enlightenment wants it
   postInstall = ''
     export CPUFREQ_DIRPATH=`readlink -f $out/lib/enlightenment/modules/cpufreq/linux-gnu-*`;
     mv $CPUFREQ_DIRPATH/freqset $CPUFREQ_DIRPATH/e_freqset
     ln -sv $CPUFREQ_DIRPATH/e_freqset $out/bin/e_freqset
-    ln -sv /run/wrappers/e_freqset $CPUFREQ_DIRPATH/freqset
+    ln -sv /run/wrappers/bin/e_freqset $CPUFREQ_DIRPATH/freqset
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
index 61aa49f70e59..e3bfc2ebe6b4 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch
@@ -7,7 +7,7 @@ Index: kinit-5.24.0/src/start_kdeinit/start_kdeinit_wrapper.c
  #include <unistd.h>
  
 -#define EXECUTE CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit"
-+#define EXECUTE "/run/wrappers/start_kdeinit"
++#define EXECUTE "/run/wrappers/bin/start_kdeinit"
  
  #if KDEINIT_OOM_PROTECT
  
diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index 6d57ca2397e5..e96ef7329a20 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
 
     # Fix some binary paths
     sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c
-    sed -i -e 's|/usr/bin/sudo|/run/wrappers/sudo|g' libgksu/libgksu.c
-    sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/su\1|g' libgksu/libgksu.c
+    sed -i -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|g' libgksu/libgksu.c
+    sed -i -e 's|/bin/su\([^d]\)|/run/wrappers/bin/su\1|g' libgksu/libgksu.c
 
     touch NEWS README
   '';
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index b2e2ecf04930..27482743d2cf 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -5,7 +5,7 @@
 let
 
   system = "/var/run/current-system/sw";
-  setuid = "/run/wrappers"; #TODO: from <nixos> config.security.wrapperDir;
+  setuid = "/run/wrappers/bin"; #TODO: from <nixos> config.security.wrapperDir;
 
   foolVars = {
     SYSCONF = "/etc";
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 2d4977a31958..73cb902ae695 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -94,7 +94,7 @@ in stdenv.mkDerivation rec {
     unitydir="$out/opt/Unity/Editor"
     mkdir -p $unitydir
     mv Editor/* $unitydir
-    ln -sf /run/wrappers/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
+    ln -sf /run/wrappers/bin/${chromium.sandboxExecutableName} $unitydir/chrome-sandbox
 
     mkdir -p $out/share/applications
     sed "/^Exec=/c\Exec=$out/bin/unity-editor" \
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index 29bcc58c7c07..db18b13bfb80 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       # Ensure that FUSE calls the setuid wrapper, not
       # $out/bin/fusermount. It falls back to calling fusermount in
       # $PATH, so it should also work on non-NixOS systems.
-      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers\""
+      export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""
 
       sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c
       sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
diff --git a/pkgs/os-specific/linux/mdadm/4.nix b/pkgs/os-specific/linux/mdadm/4.nix
index af8e53ec3a20..05d98de0b234 100644
--- a/pkgs/os-specific/linux/mdadm/4.nix
+++ b/pkgs/os-specific/linux/mdadm/4.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/run/wrappers/sendmail@' -i Makefile
+        -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index d9bdf21723b2..e0109791ef22 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -e 's@/lib/udev@''${out}/lib/udev@' \
         -e 's@ -Werror @ @' \
-        -e 's@/usr/sbin/sendmail@/run/wrappers/sendmail@' -i Makefile
+        -e 's@/usr/sbin/sendmail@/run/wrappers/bin/sendmail@' -i Makefile
   '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index dc61b3f27f6c..5189b84ff7e2 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mv -v $out/sbin/unix_chkpwd{,.orig}
-    ln -sv /run/wrappers/unix_chkpwd $out/sbin/unix_chkpwd
+    ln -sv /run/wrappers/bin/unix_chkpwd $out/sbin/unix_chkpwd
   ''; /*
     rm -rf $out/etc
     mkdir -p $modules/lib
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 90fbf861448a..6c3aacbef297 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     --enable-last
     --enable-mesg
     --disable-use-tty-group
-    --enable-fs-paths-default=/run/wrappers:/var/run/current-system/sw/bin:/sbin
+    --enable-fs-paths-default=/run/wrappers/bin:/var/run/current-system/sw/bin:/sbin
     ${if ncurses == null then "--without-ncurses" else ""}
     ${if systemd == null then "" else ''
       --with-systemd
diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix
index b58c1b50e033..a0b59d332a3f 100644
--- a/pkgs/servers/interlock/default.nix
+++ b/pkgs/servers/interlock/default.nix
@@ -30,7 +30,7 @@ buildGoPackage rec {
       -e 's|/bin/chown|${coreutils}/bin/chown|' \
       -e 's|/bin/date|${coreutils}/bin/date|' \
       -e 's|/sbin/poweroff|${systemd}/sbin/poweroff|' \
-      -e 's|/usr/bin/sudo|/run/wrappers/sudo|' \
+      -e 's|/usr/bin/sudo|/run/wrappers/bin/sudo|' \
       -e 's|/sbin/cryptsetup|${cryptsetup}/bin/cryptsetup|'
   '';
 }
diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix
index 1770517047fa..395f3ded7fda 100644
--- a/pkgs/servers/mail/petidomo/default.nix
+++ b/pkgs/servers/mail/petidomo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/sendmail" }:
+{ stdenv, fetchurl, flex, bison, sendmailPath ? "/run/wrappers/bin/sendmail" }:
 
 stdenv.mkDerivation rec {
   name = "petidomo-4.3";
diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 30bd7e8a7c3c..1ea6f88084db 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   # configured on the build machine).
   preConfigure= "
     configureFlagsArray=(
-      --with-ping-command='/run/wrappers/ping -n -U -w %d -c %d %s'
-      --with-ping6-command='/run/wrappers/ping6 -n -U -w %d -c %d %s'
+      --with-ping-command='/run/wrappers/bin/ping -n -U -w %d -c %d %s'
+      --with-ping6-command='/run/wrappers/bin/ping6 -n -U -w %d -c %d %s'
     )
   ";
 
diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index b343a7da378c..2d319cccf206 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
     configureFlags="--mandir=$out/share/man"
 
     substituteInPlace x11vnc/unixpw.c \
-        --replace '"/bin/su"' '"/run/wrappers/su"' \
+        --replace '"/bin/su"' '"/run/wrappers/bin/su"' \
         --replace '"/bin/true"' '"${coreutils}/bin/true"'
 
-    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/su|g' x11vnc/ssltools.h
+    sed -i -e '/#!\/bin\/sh/a"PATH=${xorg.xdpyinfo}\/bin:${xorg.xauth}\/bin:$PATH\\n"' -e 's|/bin/su|/run/wrappers/bin/su|g' x11vnc/ssltools.h
   '';
 
   meta = {
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 366213d2e1e2..3648cb2c1360 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -31,7 +31,7 @@ python2Packages.buildPythonApplication rec {
   buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]);
 
   patchPhase = ''
-    substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/sendmail"
+    substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"
     substituteInPlace certbot/util.py --replace "sw_vers" "/usr/bin/sw_vers"
   '';
 
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index be3b674de049..cbc7a2e7e46c 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -2,7 +2,7 @@
 , FileDesktopEntry, libxslt, docbook_xsl, makeWrapper
 , python3Packages
 , perlPackages, curl, gnupg, diffutils
-, sendmailPath ? "/run/wrappers/sendmail"
+, sendmailPath ? "/run/wrappers/bin/sendmail"
 }:
 
 let
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index 98e06d1de3e9..ab4867a4cc81 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   # TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
-  wrapperDir = "/run/wrappers";
+  wrapperDir = "/run/wrappers/bin";
 
   postPatch = ''
     FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
diff --git a/pkgs/tools/security/ecryptfs/helper.nix b/pkgs/tools/security/ecryptfs/helper.nix
index 3daaadcaad6a..05327ad3a090 100644
--- a/pkgs/tools/security/ecryptfs/helper.nix
+++ b/pkgs/tools/security/ecryptfs/helper.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers
+  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /run/wrappers/bin
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp $src $out/libexec/ecryptfs-helper.py
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 0d2953c6f45e..9f56a9d7f26f 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, pam, groff
-, sendmailPath ? "/run/wrappers/sendmail"
+, sendmailPath ? "/run/wrappers/bin/sendmail"
 , withInsults ? false
 }:
 
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 9f8bad00ca4f..185645763fd2 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/run/wrappers/sendmail" }:
+{ fetchurl, stdenv, bison, flex, pam, sendmailPath ? "/run/wrappers/bin/sendmail" }:
 
 stdenv.mkDerivation {
   name = "at-3.1.16";
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index 8a6a5dc15d36..dec1bacd741c 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     #define _PATH_SENDMAIL "${sendmailPath}"
 
     #undef _PATH_DEFPATH
-    #define _PATH_DEFPATH "/run/wrappers:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
+    #define _PATH_DEFPATH "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/run/current-system/sw/bin:/run/current-system/sw/sbin:/usr/bin:/bin"
     __EOT__
 
     # Implicit saved uids do not work here due to way NixOS uses setuid wrappers
diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix
index 1dfb856d4d6f..97b35378673e 100644
--- a/pkgs/tools/system/ts/default.nix
+++ b/pkgs/tools/system/ts/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl,
-sendmailPath ? "/run/wrappers/sendmail" }:
+sendmailPath ? "/run/wrappers/bin/sendmail" }:
 
 stdenv.mkDerivation rec {
 

From 70b8167d4ac3572a2f364bba18432ea15df92971 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:05:30 -0600
Subject: [PATCH 0083/3449] A few more tweaks

---
 nixos/modules/security/wrappers/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 8837ac35a53d..8e20d773125f 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -11,7 +11,7 @@ let
       wrappers);
 
   mkWrapper = { program, source ? null, ...}: ''
-    if ! source=${if source != null then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then
+    if ! source=${if source != null || source != "" then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then
         # If we can't find the program, fall back to the
         # system profile.
         source=/nix/var/nix/profiles/default/bin/${program}
@@ -183,13 +183,16 @@ in
           # programs to be wrapped.
           WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
+          # Remove the old /var/setuid-wrappers path from the system...
           if [ -d ${config.security.old-wrapperDir} ]; then
             rm -rf ${config.security.old-wrapperDir}
           fi
 
+          # Get the "/run/wrappers" path, we want to place the tmpdirs
+          # for the wrappers there
           parentWrapperDir="$(dirname ${wrapperDir})"
 
-          mkdir -p ${wrapperDir}
+          mkdir -p "$parentWrapperDir"
           wrapperDir=$(mktemp --directory --tmpdir="$parentWrapperDir" wrappers.XXXXXXXXXX)
           chmod a+rx $wrapperDir
 
@@ -198,7 +201,7 @@ in
           if [ -L ${wrapperDir} ]; then
             # Atomically replace the symlink
             # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/
-            old=$(readlink ${wrapperDir})
+            old=$(readlink -f ${wrapperDir})
             ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp
             mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}
             rm --force --recursive $old

From 628e6a83d0f3b7ddc0592c88fef7978a7ee0063e Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:33:56 -0600
Subject: [PATCH 0084/3449] More derp

---
 .../security/chromium-suid-sandbox.nix        |  2 +-
 nixos/modules/security/duosec.nix             |  2 +-
 nixos/modules/security/pam.nix                | 15 ++++++++----
 nixos/modules/security/pam_usb.nix            |  5 +++-
 nixos/modules/security/polkit.nix             |  6 +++--
 nixos/modules/security/sudo.nix               |  5 +++-
 nixos/modules/security/wrappers/default.nix   | 24 +------------------
 nixos/modules/services/mail/exim.nix          |  2 +-
 .../modules/services/networking/smokeping.nix |  5 +++-
 nixos/modules/services/scheduling/cron.nix    |  2 +-
 nixos/modules/services/scheduling/fcron.nix   |  2 +-
 .../x11/desktop-managers/enlightenment.nix    |  3 ++-
 nixos/modules/tasks/network-interfaces.nix    |  7 +++---
 13 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/nixos/modules/security/chromium-suid-sandbox.nix b/nixos/modules/security/chromium-suid-sandbox.nix
index 0699fbb728a7..0458ffb6c46c 100644
--- a/nixos/modules/security/chromium-suid-sandbox.nix
+++ b/nixos/modules/security/chromium-suid-sandbox.nix
@@ -27,6 +27,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ sandbox ];
-    security.setuidPrograms = [ sandbox.passthru.sandboxExecutableName ];
+    security.wrappers."${sandbox.passthru.sandboxExecutableName}".source = "${sandbox}/bin/${sandbox.passthru.sandboxExecutableName}";
   };
 }
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index ee62c34438e5..9ca818e86ffa 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -188,7 +188,7 @@ in
 
      environment.systemPackages = [ pkgs.duo-unix ];
 
-     security.setuidPrograms = [ "login_duo" ];
+     security.wrappers.login_duo.source = "${pkgs.duo-unix.out}/bin/login_duo";
      environment.etc = loginCfgFile ++ pamCfgFile;
 
      /* If PAM *and* SSH are enabled, then don't do anything special.
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 3c944acf6cfa..86143dd2ee59 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -472,13 +472,18 @@ in
       ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
       ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
 
-    security.setuidPrograms =
+    security.wrapperssetuidPrograms =
       optionals config.security.pam.enableEcryptfs [ "mount.ecryptfs_private" "umount.ecryptfs_private" ];
 
-    security.wrappers.unix_chkpwd = {
-      source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
-      owner = "root";
-      setuid = true;
+    security.wrappers = {
+      unix_chkpwd = {
+        source = "${pkgs.pam}/sbin/unix_chkpwd.orig";
+        owner = "root";
+        setuid = true;
+      };
+    } // (mkIf config.security.pam.enableEcryptfs {
+      "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
+       "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
     };
 
     environment.etc =
diff --git a/nixos/modules/security/pam_usb.nix b/nixos/modules/security/pam_usb.nix
index 032f8e38d111..6f811dab8d76 100644
--- a/nixos/modules/security/pam_usb.nix
+++ b/nixos/modules/security/pam_usb.nix
@@ -33,7 +33,10 @@ in
   config = mkIf (cfg.enable || anyUsbAuth) {
 
     # Make sure pmount and pumount are setuid wrapped.
-    security.setuidPrograms = [ "pmount" "pumount" ];
+    security.wrappers = {
+      pmount.source = "${pkgs.pmount.out}/bin/pmount";
+      pumount.source = "${pkgs.pmount.out}/bin/pumount";
+    };
 
     environment.systemPackages = [ pkgs.pmount ];
 
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 547b40cedfd9..419abb8b086d 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -83,8 +83,10 @@ in
 
     security.pam.services.polkit-1 = {};
 
-    security.setuidPrograms = [ "pkexec" ];
-    security.wrappers."polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
+    security.wrappers = {
+      pkexec.source = "${pkgs.polkit.out}/bin/pkexec";
+      "polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
+    };
 
     system.activationScripts.polkit =
       ''
diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix
index f5612e1b0c5d..67a9b9a45ee3 100644
--- a/nixos/modules/security/sudo.nix
+++ b/nixos/modules/security/sudo.nix
@@ -81,7 +81,10 @@ in
         ${cfg.extraConfig}
       '';
 
-    security.setuidPrograms = [ "sudo" "sudoedit" ];
+    security.wrappers = {
+      sudo.source = "${pkgs.sudo.out}/bin/sudo";
+      sudoedit.source = "${pkgs.sudo.out}/bin/sudoedit";
+    };
 
     environment.systemPackages = [ sudo ];
 
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 8e20d773125f..9909c6406471 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -4,22 +4,13 @@ let
   inherit (config.security) wrapperDir wrappers setuidPrograms;
 
   programs =
-    (map (x: { program = x; owner = "root"; group = "root"; setuid = true; }) setuidPrograms)
-    ++
     (lib.mapAttrsToList
       (n: v: (if v ? "program" then v else v // {program=n;}))
       wrappers);
 
   mkWrapper = { program, source ? null, ...}: ''
-    if ! source=${if source != null || source != "" then source else "$(readlink -f $(PATH=$WRAPPER_PATH type -tP ${program}))"}; then
-        # If we can't find the program, fall back to the
-        # system profile.
-        source=/nix/var/nix/profiles/default/bin/${program}
-    fi
-
     parentWrapperDir=$(dirname ${wrapperDir})
-
-    gcc -Wall -O2 -DSOURCE_PROG=\"$source\" -DWRAPPER_DIR=\"$parentWrapperDir\" \
+    gcc -Wall -O2 -DSOURCE_PROG=\"${source}\" -DWRAPPER_DIR=\"$parentWrapperDir\" \
         -lcap-ng -lcap ${./wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
         -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
   '';
@@ -96,19 +87,6 @@ in
   ###### interface
 
   options = {
-    security.setuidPrograms = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [];
-      example = ["passwd"];
-      description = ''
-        The Nix store cannot contain setuid/setgid programs directly.
-        For this reason, NixOS can automatically generate wrapper
-        programs that have the necessary privileges.  This option
-        lists the names of programs in the system environment for
-        which setuid root wrappers should be created.
-      '';
-    };
-
     security.wrappers = lib.mkOption {
       type = lib.types.attrs;
       default = {};
diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index b05344fa9b56..440eae281f40 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -89,7 +89,7 @@ in
       gid = config.ids.gids.exim;
     };
 
-    security.setuidPrograms = [ "exim" ];
+    security.wrappers.exim.source = "${exim}/bin/exim";
 
     systemd.services.exim = {
       description = "Exim Mail Daemon";
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index eedc27593375..bac794745277 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -273,7 +273,10 @@ in
         message = "services.smokeping: sendmail and Mailhost cannot both be enabled.";
       }
     ];
-    security.setuidPrograms = [ "fping" "fping6" ];
+    security.wrappers = {
+      fping.source = "${pkgs.fping}/bin/fping";
+      "fping6".source = "${pkgs.fping}/bin/fping6";
+    };
     environment.systemPackages = [ pkgs.fping ];
     users.extraUsers = singleton {
       name = cfg.user;
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 48c5f6be3168..cc6eb96bf5da 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -93,7 +93,7 @@ in
 
     { services.cron.enable = mkDefault (allFiles != []); }
     (mkIf (config.services.cron.enable) {
-      security.setuidPrograms = [ "crontab" ];
+      security.wrappers.crontab.source = "${pkgs.cronNixosPkg.out}/bin/crontab";
       environment.systemPackages = [ cronNixosPkg ];
       environment.etc.crontab =
         { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; }
diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index 339b0de66e98..e4ada2768715 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -106,7 +106,7 @@ in
 
     environment.systemPackages = [ pkgs.fcron ];
 
-    security.setuidPrograms = [ "fcrontab" ];
+    security.wrappers.fcrontab.source = "${pkgs.fcron.out}/bin/fcrontab";
     systemd.services.fcron = {
       description = "fcron daemon";
       after = [ "local-fs.target" ];
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index feee6ba87ec8..77050bcb23f1 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -62,7 +62,8 @@ in
       '';
     }];
 
-    security.setuidPrograms = [ "e_freqset" ];
+    security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset";
+    
     environment.etc = singleton
       { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
         target = "X11/xkb";
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 1afcddd915f7..a01bf21af51a 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -912,9 +912,10 @@ in
 
     # If the linux kernel IS older than 4.3, create setuid wrappers
     # for ping and ping6
-    security.setuidPrograms = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") [
-      "ping" "ping6"
-    ];
+    security.wrappers = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") {
+      ping.source = "${pkgs.iputils.out}/bin/ping";
+      "ping6".source = "${pkgs.iputils.out}/bin/ping6";
+    };
 
     # Set the host and domain names in the activation script.  Don't
     # clear it if it's not configured in the NixOS configuration,

From 1cc500ea8e66b2f09735e7dccc756ba00518bd8a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:34:50 -0600
Subject: [PATCH 0085/3449] Syntax wibble

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

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 86143dd2ee59..713e15322c71 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -484,7 +484,7 @@ in
     } // (mkIf config.security.pam.enableEcryptfs {
       "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
        "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
-    };
+    });
 
     environment.etc =
       mapAttrsToList (n: v: makePAMService v) config.security.pam.services;

From a3e9d77640b686c29692294ca7d557b11dfe2c65 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:36:47 -0600
Subject: [PATCH 0086/3449] More derp? It's 5am...

---
 nixos/modules/tasks/network-interfaces.nix | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index a01bf21af51a..3ef0a2ee1a2f 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -898,23 +898,27 @@ in
 
     # Capabilities won't work unless we have at-least a 4.3 Linux
     # kernel because we need the ambient capability
-    security.wrappers = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") {
-      ping = {
-        source  = "${pkgs.iputils.out}/bin/ping";
-        capabilities = "cap_net_raw+p";
-      };
+    security = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") {
+      wrappers = {
+        ping = {
+          source  = "${pkgs.iputils.out}/bin/ping";
+          capabilities = "cap_net_raw+p";
+        };
 
-      ping6 = {
-        source  = "${pkgs.iputils.out}/bin/ping6";
-        capabilities = "cap_net_raw+p";
+        ping6 = {
+          source  = "${pkgs.iputils.out}/bin/ping6";
+          capabilities = "cap_net_raw+p";
+        };
       };
     };
 
     # If the linux kernel IS older than 4.3, create setuid wrappers
     # for ping and ping6
-    security.wrappers = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") {
-      ping.source = "${pkgs.iputils.out}/bin/ping";
-      "ping6".source = "${pkgs.iputils.out}/bin/ping6";
+    security = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") {
+      wrappers = {
+        ping.source = "${pkgs.iputils.out}/bin/ping";
+        "ping6".source = "${pkgs.iputils.out}/bin/ping6";
+      };
     };
 
     # Set the host and domain names in the activation script.  Don't

From 3215bcf4450080c44411171b4d69d0cb2dd1b1bd Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:39:18 -0600
Subject: [PATCH 0087/3449] Beebooboop

---
 nixos/modules/tasks/network-interfaces.nix | 28 ++++++++--------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 3ef0a2ee1a2f..dc77a6a40f83 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -898,27 +898,19 @@ in
 
     # Capabilities won't work unless we have at-least a 4.3 Linux
     # kernel because we need the ambient capability
-    security = mkIf (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") {
-      wrappers = {
-        ping = {
-          source  = "${pkgs.iputils.out}/bin/ping";
-          capabilities = "cap_net_raw+p";
-        };
-
-        ping6 = {
-          source  = "${pkgs.iputils.out}/bin/ping6";
-          capabilities = "cap_net_raw+p";
-        };
+    security.wrappers = if (versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.3") then {
+      ping = {
+        source  = "${pkgs.iputils.out}/bin/ping";
+        capabilities = "cap_net_raw+p";
       };
-    };
 
-    # If the linux kernel IS older than 4.3, create setuid wrappers
-    # for ping and ping6
-    security = mkIf (versionOlder (getVersion config.boot.kernelPackages.kernel) "4.3") {
-      wrappers = {
-        ping.source = "${pkgs.iputils.out}/bin/ping";
-        "ping6".source = "${pkgs.iputils.out}/bin/ping6";
+      ping6 = {
+        source  = "${pkgs.iputils.out}/bin/ping6";
+        capabilities = "cap_net_raw+p";
       };
+    } else {
+      ping.source = "${pkgs.iputils.out}/bin/ping";
+      "ping6".source = "${pkgs.iputils.out}/bin/ping6";
     };
 
     # Set the host and domain names in the activation script.  Don't

From cfe4351c33bd23e7007179d6c75299919a873210 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:39:54 -0600
Subject: [PATCH 0088/3449] I'm clearly very tired

---
 nixos/modules/security/pam.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 713e15322c71..711e4c55c7d5 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -472,9 +472,6 @@ in
       ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
       ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
 
-    security.wrapperssetuidPrograms =
-      optionals config.security.pam.enableEcryptfs [ "mount.ecryptfs_private" "umount.ecryptfs_private" ];
-
     security.wrappers = {
       unix_chkpwd = {
         source = "${pkgs.pam}/sbin/unix_chkpwd.orig";

From 9f82c9903d8cba0685795c526fe5e7c51a6bc9c8 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:44:29 -0600
Subject: [PATCH 0089/3449] More fixes

---
 nixos/modules/programs/shadow.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index c5a503180266..d497b6621130 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -101,9 +101,15 @@ in
         chpasswd = { rootOK = true; };
       };
 
-    security.setuidPrograms = [
-      "su" "chfn" "newuidmap" "newgidmap"
-      ] ++ lib.optionals config.users.mutableUsers
-      [ "passwd" "sg" "newgrp" ];
+    security.wrappers = {
+      su.source        = "${pkgs.shadow.su}/bin/su";
+      chfn.source      = "${pkgs.shadow.out}/bin/chfn";
+      newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
+      newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
+    } // (lib.mkIf config.users.mutableUsers {
+      passwd.source    = "${pkgs.shadow.out}/bin/passwd";
+      sg.source        = "${pkgs.shadow.out}/bin/sg";
+      newgrp.source    = "${pkgs.shadow.out}/bin/newgrp";
+    });
   };
 }

From c5f1f9a3b5bcf5d2990aba0ab086767d1d384922 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 05:45:43 -0600
Subject: [PATCH 0090/3449] More mistake fixes

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

diff --git a/nixos/modules/programs/kbdlight.nix b/nixos/modules/programs/kbdlight.nix
index 0172368e968f..58e45872fac8 100644
--- a/nixos/modules/programs/kbdlight.nix
+++ b/nixos/modules/programs/kbdlight.nix
@@ -11,6 +11,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.kbdlight ];
-    security.setuidPrograms = [ "kbdlight" ];
+    security.wrappers.kbdlight.source = "${pkgs.kbdlight.out}/bin/kbdlight";
   };
 }
diff --git a/nixos/modules/programs/light.nix b/nixos/modules/programs/light.nix
index 09cd1113d9c7..6f8c389acc97 100644
--- a/nixos/modules/programs/light.nix
+++ b/nixos/modules/programs/light.nix
@@ -21,6 +21,6 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.light ];
-    security.setuidPrograms = [ "light" ];
+    security.wrappers.light.source = "${pkgs.light.out}/bin/light";
   };
 }

From 9abe7528e4c495c868fa518af50c3cdfd1e755ed Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 11:27:08 -0600
Subject: [PATCH 0091/3449] Switching locate over to new wrapper API

---
 nixos/modules/misc/locate.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index a9c84f6db243..089f354f6119 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -103,15 +103,16 @@ in {
   config = mkIf cfg.enable {
     users.extraGroups = mkIf isMLocate { mlocate = {}; };
 
-    security.setuidOwners = mkIf isMLocate
-      [ { group = "mlocate";
-          owner = "root";
-          permissions = "u+rx,g+x,o+x";
-          setgid = true;
-          setuid = false;
-          program = "locate";
-        }
-      ];
+    security.wrappers = mkIf isMLocate {
+      mlocate = {
+        group = "mlocate";
+        owner = "root";
+        permissions = "u+rx,g+x,o+x";
+        setgid = true;
+        setuid = false;
+        program = "locate";
+      };
+    };
 
     nixpkgs.config = { locate.dbfile = cfg.output; };
 

From 4856b42ab69beb882414664551f1ca879d379936 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 16:47:14 -0600
Subject: [PATCH 0092/3449] Gotta provide sane defaults! This is what I get for
 5AM coding

---
 nixos/modules/security/wrappers/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 9909c6406471..cb288fc08809 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -79,7 +79,13 @@ let
              (s ? "setguid" && s.setguid == true) ||
              (s ? "permissions")
           then mkSetuidProgram s
-          else ""
+          else mkSetuidProgram
+                 ({ owner  = "root";
+                    group  = "root";
+                    setuid = true;
+                    setgid = false;
+                    permissions = "u+rx,g+x,o+x";
+                  } // s)
       ) programs;
 in
 {

From 0f728de67eeb8b1ebfb0c77418f95f2806f918b5 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 16:52:23 -0600
Subject: [PATCH 0093/3449] More migration cleanup + todos for cleanup

---
 nixos/modules/security/wrappers/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index cb288fc08809..5ec1a7e62069 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -168,10 +168,24 @@ in
           WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
           # Remove the old /var/setuid-wrappers path from the system...
+          #
+          # TDOO: this is only necessary for ugprades 16.09 => 17.x;
+          # this conditional removal block needs to be removed after
+          # the release.
           if [ -d ${config.security.old-wrapperDir} ]; then
             rm -rf ${config.security.old-wrapperDir}
           fi
 
+          # Remove the old /run/setuid-wrappers-dir path from the
+          # system as well...
+          #
+          # TDOO: this is only necessary for ugprades 16.09 => 17.x;
+          # this conditional removal block needs to be removed after
+          # the release.
+          if [ -d /run/setuid-wrappers-dir ]; then
+            rm -rf /run/setuid-wrappers-dir
+          fi
+
           # Get the "/run/wrappers" path, we want to place the tmpdirs
           # for the wrappers there
           parentWrapperDir="$(dirname ${wrapperDir})"

From f2f3f1479e18b530b57628c7d7725283afb57ac4 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 16:54:27 -0600
Subject: [PATCH 0094/3449] Derp, wrong path name

---
 nixos/modules/security/wrappers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 5ec1a7e62069..73b4cad86878 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -182,8 +182,8 @@ in
           # TDOO: this is only necessary for ugprades 16.09 => 17.x;
           # this conditional removal block needs to be removed after
           # the release.
-          if [ -d /run/setuid-wrappers-dir ]; then
-            rm -rf /run/setuid-wrappers-dir
+          if [ -d /run/setuid-wrapper-dirs ]; then
+            rm -rf /run/setuid-wrapper-dirs
           fi
 
           # Get the "/run/wrappers" path, we want to place the tmpdirs

From 264db4e30936cbb4dd9f88123aafb42a5259e74f Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Sun, 29 Jan 2017 17:10:32 -0600
Subject: [PATCH 0095/3449] Set merge + mkIf always surprises me

---
 nixos/modules/programs/shadow.nix           | 4 ++--
 nixos/modules/security/pam.nix              | 4 ++--
 nixos/modules/security/wrappers/default.nix | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index d497b6621130..0f3f42901bab 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -106,10 +106,10 @@ in
       chfn.source      = "${pkgs.shadow.out}/bin/chfn";
       newuidmap.source = "${pkgs.shadow.out}/bin/newuidmap";
       newgidmap.source = "${pkgs.shadow.out}/bin/newgidmap";
-    } // (lib.mkIf config.users.mutableUsers {
+    } // (if config.users.mutableUsers then {
       passwd.source    = "${pkgs.shadow.out}/bin/passwd";
       sg.source        = "${pkgs.shadow.out}/bin/sg";
       newgrp.source    = "${pkgs.shadow.out}/bin/newgrp";
-    });
+    } else {});
   };
 }
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 711e4c55c7d5..3cc5db2fb9b3 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -478,10 +478,10 @@ in
         owner = "root";
         setuid = true;
       };
-    } // (mkIf config.security.pam.enableEcryptfs {
+    } // (if config.security.pam.enableEcryptfs then {
       "mount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/mount.ecryptfs_private";
        "umount.ecryptfs_private".source = "${pkgs.ecryptfs.out}/bin/umount.ecryptfs_private";
-    });
+    } else {});
 
     environment.etc =
       mapAttrsToList (n: v: makePAMService v) config.security.pam.services;
diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 73b4cad86878..71799175011c 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -152,6 +152,9 @@ in
 
   ###### implementation
   config = {
+
+    security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";
+
     # Make sure our wrapperDir exports to the PATH env variable when
     # initializing the shell
     environment.extraInit = ''

From d8ecd5eb0d30c3dc302e336755a4a1d6d0cb1ba4 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Mon, 30 Jan 2017 12:26:56 -0600
Subject: [PATCH 0096/3449] Switching to individually generated derivations

---
 nixos/modules/security/wrappers/default.nix | 46 ++++++++++++---------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 71799175011c..757765ed08c4 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -8,21 +8,24 @@ let
       (n: v: (if v ? "program" then v else v // {program=n;}))
       wrappers);
 
-  mkWrapper = { program, source ? null, ...}: ''
-    parentWrapperDir=$(dirname ${wrapperDir})
-    gcc -Wall -O2 -DSOURCE_PROG=\"${source}\" -DWRAPPER_DIR=\"$parentWrapperDir\" \
-        -lcap-ng -lcap ${./wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
-        -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
-  '';
-
-  wrappedPrograms = pkgs.stdenv.mkDerivation {
-    name         = "permissions-wrapper";
-    unpackPhase  = "true";
-    installPhase = ''
-      mkdir -p $out/bin
-      ${lib.concatMapStrings mkWrapper programs}
-    '';
-  };
+  mkWrapper = { program, source ? null, ...}:
+    let buildWrapper = ''
+          parentWrapperDir=$(dirname ${wrapperDir})
+          gcc -Wall -O2 -DSOURCE_PROG=\"${source}\" -DWRAPPER_DIR=\"$parentWrapperDir\" \
+              -Wformat -Wformat-security -Werror=format-security \
+              -fstack-protector-strong --param ssp-buffer-size=4 \
+              -D_FORTIFY_SOURCE=2 -fPIC \
+              -lcap-ng -lcap ${./wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
+              -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
+        '';
+    in pkgs.stdenv.mkDerivation {
+      name         = "${program}-wrapper";
+      unpackPhase  = "true";
+      installPhase = ''
+        mkdir -p $out/bin
+        ${buildWrapper}
+      '';
+    };
 
   ###### Activation script for the setcap wrappers
   mkSetcapProgram =
@@ -32,10 +35,11 @@ let
     , owner  ? "nobody"
     , group  ? "nogroup"
     , ...
-    }: 
+    }:
     assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");
-    ''
-      cp ${wrappedPrograms}/bin/${program}.wrapper $wrapperDir/${program}
+    let wrapperDrv = mkWrapper { inherit program source; };
+    in ''
+      cp ${wrapperDrv}/bin/${program}.wrapper $wrapperDir/${program}
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}
@@ -60,8 +64,10 @@ let
     , setgid ? false
     , permissions ? "u+rx,g+x,o+x"
     , ...
-    }: ''
-      cp ${wrappedPrograms}/bin/${program}.wrapper $wrapperDir/${program}
+    }:
+    let wrapperDrv = mkWrapper { inherit program source; };
+    in ''
+      cp ${wrapperDrv}/bin/${program}.wrapper $wrapperDir/${program}
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}

From 128bdac94fe8173845e162c61ddb83cb4b8ed8de Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Mon, 30 Jan 2017 12:59:29 -0600
Subject: [PATCH 0097/3449] Conditionally logging debug messages based on the
 WRAPPER_DEBUG env var being set (or not)

---
 nixos/modules/security/wrappers/wrapper.c | 35 ++++++++++++++---------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c
index 608bd3a378c7..e6f2605143fe 100644
--- a/nixos/modules/security/wrappers/wrapper.c
+++ b/nixos/modules/security/wrappers/wrapper.c
@@ -26,6 +26,9 @@ extern char **environ;
 static char * sourceProg = SOURCE_PROG;
 static char * wrapperDir = WRAPPER_DIR;
 
+// Wrapper debug variable name
+static char * wrapperDebug = "WRAPPER_DEBUG";
+
 // Update the capabilities of the running process to include the given
 // capability in the Ambient set.
 static void set_ambient_cap(cap_value_t cap)
@@ -34,7 +37,7 @@ static void set_ambient_cap(cap_value_t cap)
 
     if (capng_update(CAPNG_ADD, CAPNG_INHERITABLE, (unsigned long) cap))
     {
-        printf("cannot raise the capability into the Inheritable set\n");
+        perror("cannot raise the capability into the Inheritable set\n");
         exit(1);
     }
 
@@ -56,7 +59,9 @@ static int make_caps_ambient(const char *selfPath)
 
     if(!caps)
     {
-        fprintf(stderr, "no caps set or could not retrieve the caps for this file, not doing anything...\n");
+        if(getenv(wrapperDebug))
+            fprintf(stderr, "no caps set or could not retrieve the caps for this file, not doing anything...");
+
         return 1;
     }
 
@@ -127,23 +132,27 @@ static int make_caps_ambient(const char *selfPath)
       cap_value_t capnum;
       if (cap_from_name(tok, &capnum))
       {
-          fprintf(stderr, "cap_from_name failed, skipping: %s\n", tok);
+          if(getenv(wrapperDebug))
+              fprintf(stderr, "cap_from_name failed, skipping: %s", tok);
       }
       else if (capnum == CAP_SETPCAP)
       {
-        // Check for the cap_setpcap capability, we set this on the
-        // wrapper so it can elevate the capabilities to the Ambient
-        // set but we do not want to propagate it down into the
-        // wrapped program.
-        //
-        // TODO: what happens if that's the behavior you want
-        // though???? I'm preferring a strict vs. loose policy here.
-        fprintf(stderr, "cap_setpcap in set, skipping it\n");
+          // Check for the cap_setpcap capability, we set this on the
+          // wrapper so it can elevate the capabilities to the Ambient
+          // set but we do not want to propagate it down into the
+          // wrapped program.
+          //
+          // TODO: what happens if that's the behavior you want
+          // though???? I'm preferring a strict vs. loose policy here.
+          if(getenv(wrapperDebug))
+              fprintf(stderr, "cap_setpcap in set, skipping it\n");
       }
       else
       {
-        set_ambient_cap(capnum);
-        printf("raised %s into the Ambient capability set\n", tok);
+          set_ambient_cap(capnum);
+
+          if(getenv(wrapperDebug))
+              fprintf(stderr, "raised %s into the Ambient capability set\n", tok);
       }
     }
     cap_free(capstr);

From f7871d3433d0a614886394a7edf6b94332f6b300 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Feb 2017 13:41:23 +0800
Subject: [PATCH 0098/3449] suil: 0.8.2 -> 0.8.4

We can now also build against qt5 but not qt4 and qt5 at the same time.
---
 .../libraries/audio/suil/default.nix          | 23 +++++++++++++------
 pkgs/top-level/all-packages.nix               | 12 +++++++++-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 518f89092ab3..8864d710174a 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -1,15 +1,24 @@
-{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }:
+{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
+, withQt4 ? true, qt4 ? null
+, withQt5 ? false, qt5 ? null }:
+
+# I haven't found an XOR operator in nix...
+assert withQt4 || withQt5;
+assert !(withQt4 && withQt5);
 
 stdenv.mkDerivation rec {
-  name = "suil-${version}";
-  version = "0.8.2";
+  pname = "suil";
+  version = "0.8.4";
+  name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}";
 
   src = fetchurl {
-    url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq";
+    url = "http://download.drobilla.net/${pname}-${version}.tar.bz2";
+    sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf";
   };
 
-  buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ];
+  buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ]
+    ++ (lib.optionals withQt4 [ qt4 ])
+    ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
 
   configurePhase = "python waf configure --prefix=$out";
 
@@ -21,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage = http://drobilla.net/software/suil;
     description = "A lightweight C library for loading and wrapping LV2 plugin UIs";
     license = licenses.mit;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28668e0fc1c2..c88e1d157fc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9550,7 +9550,17 @@ with pkgs;
 
   subtitleeditor = callPackage ../applications/video/subtitleeditor { };
 
-  suil = callPackage ../development/libraries/audio/suil { };
+  suil-qt4 = callPackage ../development/libraries/audio/suil {
+    withQt4 = true;
+    withQt5 = false;
+  };
+
+  suil-qt5 = callPackage ../development/libraries/audio/suil {
+    withQt4 = false;
+    withQt5 = true;
+  };
+
+  suil = suil-qt4;
 
   sutils = callPackage ../tools/misc/sutils { };
 

From 7c27554033b95f3a5bb9796fe457bbfbdcfcb85b Mon Sep 17 00:00:00 2001
From: laMudri <lamudri@gmail.com>
Date: Sat, 4 Feb 2017 11:53:11 +0000
Subject: [PATCH 0099/3449] xfce: make xfwm optional

---
 nixos/modules/services/x11/desktop-managers/xfce.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 530468be5f96..37523feb4140 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -41,6 +41,12 @@ in
           Shell commands executed just before XFCE is started.
         '';
       };
+
+      enableXfwm = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Enable the XFWM (default) window manager.";
+      };
     };
 
   };
@@ -87,7 +93,6 @@ in
         pkgs.xfce.xfce4volumed
         pkgs.xfce.xfce4-screenshooter
         pkgs.xfce.xfconf
-        pkgs.xfce.xfwm4
         # This supplies some "abstract" icons such as
         # "utilities-terminal" and "accessories-text-editor".
         pkgs.gnome3.defaultIconTheme
@@ -99,6 +104,7 @@ in
         pkgs.xfce.xfce4_appfinder
         pkgs.xfce.tumbler       # found via dbus
       ]
+      ++ optional cfg.enableXfwm pkgs.xfce.xfwm4
       ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager
       ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet
       ++ optionals (!cfg.noDesktop)

From 991c9da1d70d43242beee0251a6fa2752d3836c2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Feb 2017 12:48:24 +0800
Subject: [PATCH 0100/3449] ingen: 2016-10-29 -> 2017-01-18

This is needed to compile against suil 0.8.4
---
 pkgs/applications/audio/ingen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix
index 7f4bc0b3e9ef..0b0df0b55e4f 100644
--- a/pkgs/applications/audio/ingen/default.nix
+++ b/pkgs/applications/audio/ingen/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation  rec {
   name = "ingen-unstable-${rev}";
-  rev = "2016-10-29";
+  rev = "2017-01-18";
 
   src = fetchgit {
     url = "http://git.drobilla.net/cgit.cgi/ingen.git";
-    rev = "fd147d0b888090bfb897505852c1f25dbdf77e18";
-    sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z";
+    rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340";
+    sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k";
   };
 
   buildInputs = [

From 0f905b0dc8553b21d9da5333eb1d6c8be4e2ab9d Mon Sep 17 00:00:00 2001
From: James Alexander Feldman-Crough <alex@fldcr.com>
Date: Sun, 5 Feb 2017 10:57:02 -0800
Subject: [PATCH 0101/3449] polybar: init at 3.0.4

Polybar is a status bar in the vein of xmobar or i3bar.
---
 lib/maintainers.nix                        |  1 +
 pkgs/applications/misc/polybar/default.nix | 61 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/applications/misc/polybar/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cd9ced5832fc..aca3d963c1c0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -20,6 +20,7 @@
   adolfogc = "Adolfo E. García Castro <adolfo.garcia.cr@gmail.com>";
   aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
+  afldcr   = "James Alexander Feldman-Crough <alex@fldcr.com>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
new file mode 100644
index 000000000000..ef08ad2f1b4d
--- /dev/null
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -0,0 +1,61 @@
+{ cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
+, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
+, xcbutilwm, xcbutilxrm
+
+# optional packages-- override the variables ending in 'Support' to enable or
+# disable modules
+, alsaSupport   ? true,  alsaLib       ? null
+, iwSupport     ? true,  wirelesstools ? null
+, githubSupport ? false, curl          ? null
+, mpdSupport    ? false, mpd_clientlib ? null
+, i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null
+}:
+
+assert alsaSupport   -> alsaLib       != null;
+assert githubSupport -> curl          != null;
+assert iwSupport     -> wirelesstools != null;
+assert mpdSupport    -> mpd_clientlib != null;
+
+assert i3Support     -> ! i3GapsSupport && jsoncpp != null && i3      != null;
+assert i3GapsSupport -> ! i3Support     && jsoncpp != null && i3-gaps != null;
+
+stdenv.mkDerivation rec {
+    name = "polybar-${version}";
+    version = "3.0.4";
+    src = fetchgit {
+      url = "https://github.com/jaagr/polybar";
+      rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af";
+      sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas";
+      fetchSubmodules = true;
+    };
+
+    meta = with stdenv.lib; {
+      description = "A fast and easy-to-use tool for creatin status bars.";
+      longDescription = ''
+        Polybar aims to help users build beautiful and highly customizable
+        status bars for their desktop environment, without the need of 
+        having a black belt in shell scripting.
+      ''; 
+      license = licenses.mit;
+      maintainers = [ maintainers.afldcr ];
+      platforms = platforms.unix;
+    };
+
+    buildInputs = [
+      cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil
+      xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm
+
+      (if alsaSupport   then alsaLib       else null)
+      (if githubSupport then curl          else null)
+      (if iwSupport     then wirelesstools else null)
+      (if mpdSupport    then mpd_clientlib else null)
+
+      (if i3Support || i3GapsSupport then jsoncpp else null)
+      (if i3Support then i3 else null)
+      (if i3GapsSupport then i3-gaps else null)
+    ];
+
+    nativeBuildInputs = [
+      cmake pkgconfig
+    ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ef889ed13bc..2498ff7d5d2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14293,6 +14293,8 @@ with pkgs;
      stdenv = stdenv_32bit;
   };
 
+  polybar = callPackage ../applications/misc/polybar { };
+
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
 
   shotcut = qt5.callPackage ../applications/video/shotcut { };

From ae2932249edc58b3a95e5614497b83d60becefc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= <facundo.dominguez@tweag.io>
Date: Mon, 6 Feb 2017 17:18:15 -0300
Subject: [PATCH 0102/3449] spark: 1.6.0 -> 2.1.0

Tested in linux with:
nix-env -f . -i spark-1.6.0
nix-env -f . -i spark

cc @thoughtpolice @offlinehacker
---
 .../networking/cluster/spark/default.nix      | 26 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index b4c20e22680b..bdcb0a846259 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,22 +1,38 @@
 { stdenv, fetchzip, makeWrapper, jre, pythonPackages
 , mesosSupport ? true, mesos
+, version
 }:
 
+let
+  versionMap = {
+    "1.6.0" = {
+                hadoopVersion = "cdh4";
+                sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c";
+              };
+    "2.1.0" = {
+                hadoopVersion = "hadoop2.4";
+                sparkSha256 = "0pbsmbjwijsfgbnm56kgwnmnlqkz3w010ma0d7vzlkdklj40vqn2";
+              };
+  };
+in
+
+with versionMap.${version};
+
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name    = "spark-${version}";
-  version = "1.6.0";
+
+  name = "spark-${version}";
 
   src = fetchzip {
-    url    = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz";
-    sha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c";
+    url    = "mirror://apache/spark/${name}/${name}-bin-${hadoopVersion}.tgz";
+    sha256 = sparkSha256;
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
     ++ optional mesosSupport mesos;
 
-  untarDir = "${name}-bin-cdh4";
+  untarDir = "${name}-bin-${hadoopVersion}";
   installPhase = ''
     mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
     mv * $out/lib/${untarDir}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38479b26d56..53a6f2539914 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5931,7 +5931,9 @@ with pkgs;
 
   self = callPackage_i686 ../development/interpreters/self { };
 
-  spark = callPackage ../applications/networking/cluster/spark { };
+  spark = spark_21;
+  spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; };
+  spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; };
 
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };

From 3a9a707fd40c7b04a0d5a7d358ed45b30dd9052d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 6 Feb 2017 16:44:15 -0600
Subject: [PATCH 0103/3449] emacs24macport: remove

---
 nixos/modules/services/editors/emacs.xml      |  5 +-
 .../editors/emacs/macport-24.5.nix            | 91 -------------------
 .../emacs/{macport-25.1.nix => macport.nix}   |  0
 pkgs/top-level/all-packages.nix               | 14 +--
 4 files changed, 8 insertions(+), 102 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/macport-24.5.nix
 rename pkgs/applications/editors/emacs/{macport-25.1.nix => macport.nix} (100%)

diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index 89f09ed08449..9d6395ebd74c 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -79,10 +79,11 @@
             </listitem>
           </varlistentry>
           <varlistentry>
-            <term><varname>emacs24Macport</varname></term>
+            <term><varname>emacsMacport</varname></term>
+            <term><varname>emacs25Macport</varname></term>
             <listitem>
               <para>
-                Emacs 24 with the "Mac port" patches, providing a more
+                Emacs 25 with the "Mac port" patches, providing a more
                 native look and feel under OS X.
               </para>
             </listitem>
diff --git a/pkgs/applications/editors/emacs/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix
deleted file mode 100644
index 33d24242db79..000000000000
--- a/pkgs/applications/editors/emacs/macport-24.5.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext
-, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
-, autoconf, automake
-, ImageCaptureCore, GSS, ImageIO # These may be optional
-}:
-
-stdenv.mkDerivation rec {
-  emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.15";
-
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx";
-  };
-
-  macportSrc = fetchurl {
-    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "1r47bm1pf5av2yr37byz91y7bp6vdw9smahiy18g5qp4jp6mz193";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext autoconf automake ];
-
-  propagatedBuildInputs = [
-    AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
-    ImageCaptureCore GSS ImageIO   # may be optional
-  ];
-
-  postUnpack = ''
-    mv $emacsName $name
-    tar xzf $macportSrc
-    mv $name $emacsName
-  '';
-
-  postPatch = ''
-    patch -p1 < patch-mac
-    sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el
-  '';
-
-  configureFlags = [
-    "LDFLAGS=-L${ncurses.out}/lib"
-    "--with-xml2=yes"
-    "--with-gnutls=yes"
-    "--with-mac"
-    "--enable-mac-app=$$out/Applications"
-  ];
-
-  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
-  LDFLAGS = "-O3 -L${ncurses.out}/lib";
-
-  postInstall = ''
-    mkdir -p $out/share/emacs/site-lisp/
-    cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "GNU Emacs 24, the extensible, customizable text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
-    license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jwiegley ];
-    platforms   = platforms.darwin;
-
-    longDescription = ''
-      GNU Emacs is an extensible, customizable text editor—and more.  At its
-      core is an interpreter for Emacs Lisp, a dialect of the Lisp
-      programming language with extensions to support text editing.
-
-      The features of GNU Emacs include: content-sensitive editing modes,
-      including syntax coloring, for a wide variety of file types including
-      plain text, source code, and HTML; complete built-in documentation,
-      including a tutorial for new users; full Unicode support for nearly all
-      human languages and their scripts; highly customizable, using Emacs
-      Lisp code or a graphical interface; a large number of extensions that
-      add other functionality, including a project planner, mail and news
-      reader, debugger interface, calendar, and more.  Many of these
-      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
-      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.
-    '';
-  };
-}
diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport.nix
similarity index 100%
rename from pkgs/applications/editors/emacs/macport-25.1.nix
rename to pkgs/applications/editors/emacs/macport.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38479b26d56..2f0826f08d74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12934,19 +12934,15 @@ with pkgs;
     withGTK3 = false;
   }));
 
-  emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs/macport-24.5.nix {
+  emacsMacport = emacs25Macport;
+  emacs25Macport = callPackage ../applications/editors/emacs/macport.nix {
     inherit (darwin.apple_sdk.frameworks)
       AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
       ImageCaptureCore GSS ImageIO;
-  });
-  emacs24Macport = self.emacs24Macport_24_5;
+  };
 
-  emacs25Macport_25_1 = lowPrio (callPackage ../applications/editors/emacs/macport-25.1.nix {
-    inherit (darwin.apple_sdk.frameworks)
-      AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
-      ImageCaptureCore GSS ImageIO;
-  });
-  emacs25Macport = self.emacs25Macport_25_1;
+  # for backwards compatibility
+  emacs25Macport_25_1 = emacs25Macport;
 
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;

From af09e72d52d9b9918f7b2e2397181f87d0e148fd Mon Sep 17 00:00:00 2001
From: Neil Mayhew <neil@neil.mayhew.name>
Date: Tue, 7 Feb 2017 11:07:48 -0700
Subject: [PATCH 0104/3449] spideroak: enable it to appear in the application
 menus

Put files in $out/share instead of $out/usr/share
---
 pkgs/applications/networking/spideroak/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index 23c226b9f8a5..bcdc3cd8342b 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -40,6 +40,8 @@ in stdenv.mkDerivation {
     cp -r "./"* "$out"
     mkdir "$out/bin"
     rm "$out/usr/bin/SpiderOakONE"
+    rmdir $out/usr/bin || true
+    mv $out/usr/share $out/
 
     patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
       "$out/opt/SpiderOakONE/lib/SpiderOakONE"
@@ -48,6 +50,8 @@ in stdenv.mkDerivation {
     makeWrapper $out/opt/SpiderOakONE/lib/SpiderOakONE $out/bin/spideroak --set LD_LIBRARY_PATH $RPATH \
       --set QT_PLUGIN_PATH $out/opt/SpiderOakONE/lib/plugins/ \
       --set SpiderOak_EXEC_SCRIPT $out/bin/spideroak
+
+    sed -i 's/^Exec=.*/Exec=spideroak/' $out/share/applications/SpiderOakONE.desktop
   '';
 
   buildInputs = [ patchelf makeWrapper ];

From f586e4befe0a8780ed12778a31cb73bc0f0da3d4 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 7 Feb 2017 21:09:54 +0100
Subject: [PATCH 0105/3449] nghttp2: 1.17.0 -> 1.19.0

Package update.
New features as documented in changelogs : https://github.com/nghttp2/nghttp2/releases
---
 pkgs/development/libraries/nghttp2/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 0697b05c0a5d..aee0b3d7116c 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig
 
 # Optional Dependencies
-, openssl ? null, libev ? null, zlib ? null
+, openssl ? null, libev ? null, zlib ? null, libcares ? null
 , enableHpack ? false, jansson ? null
 , enableAsioLib ? false, boost ? null
 , enableGetAssets ? false, libxml2 ? null
@@ -17,18 +17,18 @@ with { inherit (stdenv.lib) optional; };
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.17.0";
+  version = "1.19.0";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "7685b6717d205d3a251b7dd5e73a7ca5e643bc5c01f928b82bfeed30c243f28a";
+    sha256 = "477466eee27158d37b4478d9335dd091497cae4d7f2375fc6657beab67db9e7a";
   };
 
   outputs = [ "out" "dev" "lib" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl libev zlib ]
+  buildInputs = [ openssl libev zlib libcares ]
     ++ optional enableHpack jansson
     ++ optional enableAsioLib boost
     ++ optional enableGetAssets libxml2

From b09215bed57a434810b7772201f594420dbac379 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Feb 2017 16:58:14 -0800
Subject: [PATCH 0106/3449] rakudo-star: 2016.07 -> 2017.01

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

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index 210570ad8468..83e8f1d00302 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "rakudo-star-${version}";
-  version = "2016.07";
+  version = "2017.01";
 
   src = fetchurl {
     url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
-    sha256 = "0czx7w1chf108mpyps7k7nqq8cbsy1rbb87ajms9xj65l4ywg8ka";
+    sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq";
   };
 
   buildInputs = [ icu zlib gmp readline perl ]
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage    = "http://www.rakudo.org";
     license     = licenses.artistic2;
     platforms   = platforms.unix;
-    maintainers = [ maintainers.thoughtpolice maintainers.vrthra ];
+    maintainers = with maintainers; [ thoughtpolice vrthra ];
   };
 }

From 7b169579c411697ffdc86df5b96c231cb3b7553b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 25 Nov 2016 18:37:15 -0400
Subject: [PATCH 0107/3449] glew: 1.13.0 -> 2.0.0

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

diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix
index 89bd7e918fdb..02c87cf709a7 100644
--- a/pkgs/development/libraries/glew/default.nix
+++ b/pkgs/development/libraries/glew/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "glew-1.13.0";
+  name = "glew-2.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/glew/${name}.tgz";
-    sha256 = "1iwb2a6wfhkzv6fa7zx2gz1lkwa0iwnd9ka1im5vdc44xm4dq9da";
+    sha256 = "0r37fg2s1f0jrvwh6c8cz5x6v4wqmhq42qm15cs9qs349q5c6wn5";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     mkdir -pv $out/share/doc/glew
     mkdir -p $out/lib/pkgconfig
     cp glew*.pc $out/lib/pkgconfig
-    cp -r README.txt LICENSE.txt doc $out/share/doc/glew
+    cp -r README.md LICENSE.txt doc $out/share/doc/glew
     rm $out/lib/*.a
   '';
 

From 86ff21af165c23bebf877623e0db65713f93a708 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 8 Feb 2017 14:48:26 +0100
Subject: [PATCH 0108/3449] paperwork: fix locale path

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

diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix
index 2c55be55b08b..c24812418180 100644
--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
     }' src/paperwork/frontend/util/__init__.py
 
     sed -i -e '/^LOCALE_PATHS = \[/,/^\]$/ {
-      c LOCALE_PATHS = ["'"$out/share/locale"'"]
+      c LOCALE_PATHS = ["'"$out/share"'"]
     }' src/paperwork/paperwork.py
 
     sed -i -e 's/"icon"/"icon-name"/g' \

From 781022de46fd821ee0683d7e81de1a16f48e9b82 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 22:47:07 +0300
Subject: [PATCH 0109/3449] chromium.mkDerivation: use ninja from
 nativeBuildInputs

Also move Python packages there.
---
 pkgs/applications/networking/browsers/chromium/common.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ea66703f166d..2acf5627756a 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -88,6 +88,11 @@ let
 
     nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ];
 
+    nativeBuildInputs = [
+      ninja which perl pkgconfig python
+      python2Packages.ply python2Packages.jinja2
+    ];
+
     buildInputs = defaultDependencies ++ [
       nspr nss systemd
       utillinux alsaLib
@@ -95,7 +100,6 @@ let
       glib gtk2 dbus_glib
       libXScrnSaver libXcursor libXtst mesa
       pciutils protobuf speechd libXdamage
-      python2Packages.ply python2Packages.jinja2
     ] ++ optional gnomeKeyringSupport libgnome_keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optional enableSELinux libselinux
@@ -182,7 +186,7 @@ let
 
     buildPhase = let
       buildCommand = target: ''
-        "${ninja}/bin/ninja" -C "${buildPath}"  \
+        ninja -C "${buildPath}"  \
           -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \
           "${target}"
       '' + optionalString (target == "mksnapshot" || target == "chrome") ''

From 3effe0b9b5458387798961dc510f626bf6e39b0e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 22:49:02 +0300
Subject: [PATCH 0110/3449] chromium: export version

---
 pkgs/applications/networking/browsers/chromium/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index d014999a667c..fdc22a5be006 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -108,7 +108,7 @@ in stdenv.mkDerivation {
     cp -v "${desktopItem}/share/applications/"* "$out/share/applications"
   '';
 
-  inherit (chromium.browser) meta packageName;
+  inherit (chromium.browser) meta packageName version;
 
   passthru = {
     inherit (chromium) upstream-info browser;

From b2eb9f4a9609ee319a6e136a1aac3c035c0c079c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 22:48:05 +0300
Subject: [PATCH 0111/3449] chromium.mkDerivation: run {pre,post}Configure

This allows us to add custom steps.
---
 pkgs/applications/networking/browsers/chromium/common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 2acf5627756a..bc581445450e 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -177,11 +177,15 @@ let
     } // (extraAttrs.gnFlags or {}));
 
     configurePhase = ''
+      runHook preConfigure
+
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gn_files.py \
         --system-libraries ${toString gnSystemLibraries}
       gn gen --args=${escapeShellArg gnFlags} out/Release
+
+      runHook postConfigure
     '';
 
     buildPhase = let

From 003fa8fed5480d3e22d518aeeba1d62809809279 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 22:40:39 +0300
Subject: [PATCH 0112/3449] gn: remove

Chromium depends on bundled versioon of gn. It's also chromium-specific build
tool, so it's not feasible to package.
---
 .../networking/browsers/chromium/common.nix   | 10 ++-
 .../tools/build-managers/gn/default.nix       | 80 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 6 insertions(+), 86 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gn/default.nix

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index bc581445450e..a99a5059d18c 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -1,4 +1,4 @@
-{ stdenv, gn, ninja, which
+{ stdenv, ninja, which
 
 # default dependencies
 , bzip2, flac, speex, libopus
@@ -86,10 +86,8 @@ let
 
     src = upstream-info.main;
 
-    nativeBuildInputs = [ gn which python2Packages.python perl pkgconfig ];
-
     nativeBuildInputs = [
-      ninja which perl pkgconfig python
+      ninja which python2Packages.python perl pkgconfig
       python2Packages.ply python2Packages.jinja2
     ];
 
@@ -179,6 +177,10 @@ let
     configurePhase = ''
       runHook preConfigure
 
+      # Build gn
+      python tools/gn/bootstrap/bootstrap.py -v -s --no-clean
+      PATH="$PWD/out/Release:$PATH"
+
       # This is to ensure expansion of $out.
       libExecPath="${libExecPath}"
       python build/linux/unbundle/replace_gn_files.py \
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
deleted file mode 100644
index 6fdd250913c9..000000000000
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ stdenv, fetchgit, fetchurl, python2, ninja, libevent, xdg-user-dirs }:
-
-let
-  date = "20161008";
-
-  sourceTree = {
-    "src/base" = {
-      rev = "e71a514e60b085cc92bf6ef951ec329f52c79f9f";
-      sha256 = "0zycbssmd2za0zij8czcs1fr66fi12f1g5ysc8fzkf8khbs5h6a9";
-    };
-    "src/build" = {
-      rev = "17093d45bf738e9ae4b6294492860ee65218a657";
-      sha256 = "0i9py78c3f46sc789qvdhmgjgyrghysbqjgr67iypwphw52jv2dz";
-    };
-    "src/tools/gn" = {
-      rev = "9ff32cf3f1f4ad0212ac674b6303e7aa68f44f3f";
-      sha256 = "14jr45k5fgcqk9d18fd77sijlqavvnv0knndh74zyb0b60464hz1";
-    };
-    "testing/gtest" = {
-      rev = "585ec31ea716f08233a815e680fc0d4699843938";
-      sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
-    };
-  };
-
-  mkDepend = path: attrs: fetchgit {
-    url = "https://chromium.googlesource.com/chromium/${path}";
-    inherit (attrs) rev sha256;
-  };
-
-in stdenv.mkDerivation rec {
-  name = "gn-${version}";
-  version = "0.0.0.${date}";
-
-  unpackPhase = ''
-    ${with stdenv.lib; concatStrings (mapAttrsToList (path: sha256: ''
-      dest=source/${escapeShellArg (removePrefix "src/" path)}
-      mkdir -p "$(dirname "$dest")"
-      cp --no-preserve=all -rT ${escapeShellArg (mkDepend path sha256)} "$dest"
-    '') sourceTree)}
-    ( mkdir -p source/third_party
-      cd source/third_party
-      unpackFile ${xdg-user-dirs.src}
-      mv * xdg_user
-    )
-  '';
-
-  sourceRoot = "source";
-
-  postPatch = ''
-    # GN's bootstrap script relies on shebangs (which are relying on FHS paths),
-    # except when on Windows. So instead of patchShebang-ing it, let's just
-    # force the same behaviour as on Windows.
-    sed -i -e '/^def  *check_call/,/^[^ ]/ {
-      s/is_win/True/
-    }' tools/gn/bootstrap/bootstrap.py
-
-    # Patch out Chromium-bundled libevent and xdg_user_dirs
-    sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
-      tools/gn/bootstrap/bootstrap.py
-  '';
-
-  NIX_LDFLAGS = "-levent";
-
-  nativeBuildInputs = [ python2 ninja ];
-  buildInputs = [ libevent ];
-
-  buildPhase = ''
-    python2 tools/gn/bootstrap/bootstrap.py -v -s --no-clean
-  '';
-
-  installPhase = ''
-    install -vD out_bootstrap/gn "$out/bin/gn"
-  '';
-
-  meta = {
-    description = "A meta-build system that generates NinjaBuild files";
-    homepage = "https://chromium.googlesource.com/chromium/src/tools/gn/";
-    license = stdenv.lib.licenses.bsd3;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9e20f795fcf..c0295234ffd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6372,8 +6372,6 @@ with pkgs;
 
   global = callPackage ../development/tools/misc/global { };
 
-  gn = callPackage ../development/tools/build-managers/gn { };
-
   gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {};
 
   gnum4 = callPackage ../development/tools/misc/gnum4 { };

From c5b07975d8926a65b433679e00f80e1db8f59fb3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 22:42:06 +0300
Subject: [PATCH 0113/3449] chromium.mkDerivation: update flags

* Remove libselinux flag: it's no longer supported;
* Use new gold flags.
---
 pkgs/applications/networking/browsers/chromium/common.nix  | 7 ++-----
 pkgs/applications/networking/browsers/chromium/default.nix | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index a99a5059d18c..8b852d4b6d3c 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -20,7 +20,6 @@
 , libexif ? null # only needed for Chromium before version 51
 
 # package customization
-, enableSELinux ? false, libselinux ? null
 , enableNaCl ? false
 , enableHotwording ? false
 , enableWideVine ? false
@@ -100,7 +99,6 @@ let
       pciutils protobuf speechd libXdamage
     ] ++ optional gnomeKeyringSupport libgnome_keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
-      ++ optional enableSELinux libselinux
       ++ optionals cupsSupport [ libgcrypt cups ]
       ++ optional pulseSupport libpulseaudio
       ++ optional (versionAtLeast version "56.0.0.0") gtk3;
@@ -139,8 +137,8 @@ let
 
     gnFlags = mkGnFlags ({
       linux_use_bundled_binutils = false;
-      linux_use_bundled_gold = false;
-      linux_use_gold_flags = true;
+      use_gold = true;
+      gold_path = "${stdenv.cc}/bin";
       is_debug = false;
 
       proprietary_codecs = false;
@@ -151,7 +149,6 @@ let
       enable_nacl = enableNaCl;
       enable_hotwording = enableHotwording;
       enable_widevine = enableWideVine;
-      selinux = enableSELinux;
       use_cups = cupsSupport;
     } // {
       treat_warnings_as_errors = false;
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index fdc22a5be006..fdda4f1122e8 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -2,7 +2,6 @@
 
 # package customization
 , channel ? "stable"
-, enableSELinux ? false
 , enableNaCl ? false
 , enableHotwording ? false
 , gnomeSupport ? false, gnome ? null
@@ -22,7 +21,7 @@ let
     upstream-info = (callPackage ./update.nix {}).getChannel channel;
 
     mkChromiumDerivation = callPackage ./common.nix {
-      inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome
+      inherit enableNaCl enableHotwording gnomeSupport gnome
               gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport
               enableWideVine;
     };

From 748e7b287b6a086f289dae9a2acf890168673b2d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Feb 2017 22:42:42 +0300
Subject: [PATCH 0114/3449] chromium: update dev and beta

chromiumBeta: 56.0.2924.76 -> 57.0.2987.21
chromiumDev: 57.0.2987.19 -> 58.0.3000.4
---
 .../networking/browsers/chromium/common.nix          |  4 ++--
 .../networking/browsers/chromium/upstream-info.nix   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 8b852d4b6d3c..dac821a4898f 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -104,9 +104,9 @@ let
       ++ optional (versionAtLeast version "56.0.0.0") gtk3;
 
     patches = [
-      ./patches/glibc-2.24.patch
       ./patches/nix_plugin_paths_52.patch
-    ] ++ optional enableWideVine ./patches/widevine.patch;
+    ] ++ optional (versionOlder version "57.0") ./patches/glibc-2.24.patch
+      ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 899f66cb2b0c..32a3713682e7 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,14 +1,14 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "0f1w9cba99s9hy6fdqkr39yhkay4kid72vdrgs4as5lwdci8xc6g";
-    sha256bin64 = "13hfkkgqywjapz01q3cy0i3ick1s24qhpl40by21c38nwbqplivw";
-    version = "56.0.2924.76";
+    sha256 = "0mwwscybips1kazl0rva3jdswfzfb7yp90ggqgk27z2ndp0qj8b3";
+    sha256bin64 = "17n0jcysxi99v8hwlg7f69nrs2y5z87644145a8r53l809hkvkrk";
+    version = "57.0.2987.21";
   };
   dev = {
-    sha256 = "0vw9l66412b9zd8v5l0i518mvfwf313gvh1ywxkf48lpjpi03qwh";
-    sha256bin64 = "1iagza9qjlr61149g6cmiak82898xrrhvk516xrssap2qkb6kyzp";
-    version = "57.0.2987.19";
+    sha256 = "18gsj415cdlllp95q8pv1s3hhjg8cmjb6kwrvbr5mjdvsvj0ianf";
+    sha256bin64 = "0z58rwz00bq61d24h8jynhzxanbh0m9wi04jbczci3681b4zyiyh";
+    version = "58.0.3000.4";
   };
   stable = {
     sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s";

From 1684c9a6a09f96af57301a14566e8f7c2020e40d Mon Sep 17 00:00:00 2001
From: Renzo Carbonara <gnuk0001@gmail.com>
Date: Thu, 9 Feb 2017 00:22:11 +0100
Subject: [PATCH 0115/3449] compilers/ghcjs/base.nix: Take ghcjsNodePkgs as
 argument

---
 pkgs/development/compilers/ghcjs/base.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 393278be49ef..f548db5def30 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -39,6 +39,11 @@
 , coreutils
 , libiconv
 
+, ghcjsNodePkgs ? callPackage ../../../top-level/node-packages.nix {
+    generated = ./node-packages-generated.nix;
+    self = ghcjsNodePkgs;
+  }
+
 , version ? "0.2.0"
 , ghcjsSrc ? fetchFromGitHub {
     owner = "ghcjs";
@@ -160,12 +165,7 @@ in mkDerivation (rec {
         --with-gmp-includes ${gmp.dev}/include \
         --with-gmp-libraries ${gmp.out}/lib
   '';
-  passthru = let
-    ghcjsNodePkgs = callPackage ../../../top-level/node-packages.nix {
-      generated = ./node-packages-generated.nix;
-      self = ghcjsNodePkgs;
-    };
-  in {
+  passthru = {
     inherit bootPkgs;
     isCross = true;
     isGhcjs = true;

From 7001a125d2411cb2e0ba1c92c2466eaaa33aaf6a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 10 Feb 2017 03:16:10 +0100
Subject: [PATCH 0116/3449] lf: 2016-10-02 -> 2017-02-04

---
 pkgs/tools/misc/lf/default.nix | 9 ++++-----
 pkgs/tools/misc/lf/deps.nix    | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 80b8457f07f4..c54f8ebec0d0 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,17 +2,16 @@
 
 buildGoPackage rec {
   name = "lf-unstable-${version}";
-  version = "2016-10-02";
-
-  goPackagePath = "github.com/gokcehan/lf";
+  version = "2017-02-04";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
-    rev = "7a851f6c720380a6b9f715542906a56334e7e98b"; # nightly
-    sha256 = "0hdxcibly3algz0hgy65xr3dxchf4aarpxdgxsgc67m1knizksjr";
+    rev = "c55c4bf254d59c4e943d5559cd6e062652751e36"; # nightly
+    sha256 = "0jq85pfhpzdplv083mxbys7pp8igcvhp4daa9dh0yn4xbd8x821d";
   };
 
+  goPackagePath = "github.com/gokcehan/lf";
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index ebd11853291e..d3aff8de33cc 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "b6acae516ace002cb8105a89024544a1480655a5"; # master
-      sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil";
+      rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; # master
+      sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv";
     };
   }
   {
@@ -13,8 +13,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev = "d6bea18f789704b5f83375793155289da36a3c7f"; # v0.0.1
-      sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs";
+      rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; # v0.0.2
+      sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
     };
   }
 ]

From 98617ccb9938d37a73804e4eb3d03c06079d7595 Mon Sep 17 00:00:00 2001
From: Sukant Hajra <rrudbskr5g@snkmail.com>
Date: Thu, 9 Feb 2017 23:04:17 -0600
Subject: [PATCH 0117/3449] Haskell infrastructure: fix #9871 (overrideCabal)

As per the recommendation by @Mathnerd314, this change seems to work
with the testing I did.

It makes sense to me why it works, but I think it's in an important
enough place that someone with much deeper knowledge of Haskell
infrastructure in Nixpkgs should give it a really heavy review.

I also consolidated all the overrideCabal definitions (there were two)
into a single definition in haskell-modules/lib.nix.
---
 pkgs/development/haskell-modules/default.nix | 9 ++++-----
 pkgs/development/haskell-modules/lib.nix     | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index d2ecc3381287..15a4ed42e8c0 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -6,12 +6,13 @@
 
 let
 
-  inherit (stdenv.lib) fix' extends;
+  inherit (stdenv.lib) fix' extends makeOverridable;
+  inherit (import ./lib.nix { inherit pkgs; }) overrideCabal;
 
   haskellPackages = self:
     let
 
-      mkDerivation = pkgs.callPackage ./generic-builder.nix {
+      mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
         inherit stdenv;
         inherit (pkgs) fetchurl pkgconfig glibcLocales coreutils gnugrep gnused;
         jailbreak-cabal = if (self.ghc.cross or null) != null
@@ -37,9 +38,7 @@ let
         });
       };
 
-      overrideCabal = drv: f: drv.override (args: args // {
-        mkDerivation = drv: args.mkDerivation (drv // f drv);
-      });
+      mkDerivation = makeOverridable mkDerivationImpl;
 
       callPackageWithScope = scope: drv: args: (stdenv.lib.callPackageWith scope drv args) // {
         overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args;
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index f7c9811234ec..2d5ba699d8ae 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -3,7 +3,7 @@
 rec {
 
   overrideCabal = drv: f: (drv.override (args: args // {
-    mkDerivation = drv: args.mkDerivation (drv // f drv);
+    mkDerivation = drv: (args.mkDerivation drv).override f;
   })) // {
     overrideScope = scope: overrideCabal (drv.overrideScope scope) f;
   };

From 0fe9b1e2033ac78b6ac6b4ded8179effee8cf592 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Thu, 9 Feb 2017 23:58:27 -0500
Subject: [PATCH 0118/3449] vim-plugins: use ycmd package for youcompleteme

---
 pkgs/misc/vim-plugins/default.nix             | 28 +++------------
 .../patches/youcompleteme/2-ycm-cmake.patch   | 36 -------------------
 .../vim2nix/additional-nix-code/youcompleteme | 27 +++-----------
 3 files changed, 9 insertions(+), 82 deletions(-)
 delete mode 100644 pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 3ee8f32da0ce..fb60317172b4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -3,6 +3,7 @@
 , which, fetchgit, llvmPackages
 , xkb_switch, rustracerd, fzf
 , python3, boost, icu
+, ycmd
 , Cocoa ? null
 }:
 
@@ -1429,32 +1430,13 @@ rec {
       sha256 = "1bilzzv02ksqv6m44alp32s61scxqqj5cxx1klr70mhm81k2ksb9";
     };
     dependencies = [];
-    buildInputs = [
-      python go cmake
-    ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
-
-    propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd;
-
-    patches = [
-      ./patches/youcompleteme/2-ycm-cmake.patch
-    ];
-
-    # YCM requires path to external libclang 3.9
-    # For explicit use and as env variable for ../third_party/ycmd/build.py
-    EXTRA_CMAKE_ARGS="-DEXTERNAL_LIBCLANG_PATH=${llvmPackages.clang.cc}/lib/libclang.${if stdenv.isDarwin then "dylib" else "so"}";
-
     buildPhase = ''
-      patchShebangs .
       substituteInPlace plugin/youcompleteme.vim \
-        --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'"
+        --replace "'ycm_path_to_python_interpreter', '''" \
+                  "'ycm_path_to_python_interpreter', '${python}/bin/python'"
 
-      mkdir build
-      pushd build
-      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON \
-        $EXTRA_CMAKE_ARGS
-      make ycm_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
-      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer
-      popd
+      rm -r third_party/ycmd
+      ln -s ${ycmd}/lib/ycmd third_party
     '';
 
     meta = {
diff --git a/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch b/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch
deleted file mode 100644
index a1c4b1b39a46..000000000000
--- a/pkgs/misc/vim-plugins/patches/youcompleteme/2-ycm-cmake.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./third_party/ycmd/cpp/ycm/CMakeLists.txt
-+++ ./third_party/ycmd/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/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index 8da267837fb7..d61fdff0f08d 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -1,29 +1,10 @@
-    buildInputs = [
-      python go cmake
-    ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
-
-    propagatedBuildInputs = stdenv.lib.optional (!stdenv.isDarwin) rustracerd;
-
-    patches = [
-      ./patches/youcompleteme/2-ycm-cmake.patch
-    ];
-
-    # YCM requires path to external libclang 3.9
-    # For explicit use and as env variable for ../third_party/ycmd/build.py
-    EXTRA_CMAKE_ARGS="-DEXTERNAL_LIBCLANG_PATH=${llvmPackages.clang.cc}/lib/libclang.${if stdenv.isDarwin then "dylib" else "so"}";
-
     buildPhase = ''
-      patchShebangs .
       substituteInPlace plugin/youcompleteme.vim \
-        --replace "'ycm_path_to_python_interpreter', '''" "'ycm_path_to_python_interpreter', '${python}/bin/python'"
+        --replace "'ycm_path_to_python_interpreter', '''" \
+                  "'ycm_path_to_python_interpreter', '${python}/bin/python'"
 
-      mkdir build
-      pushd build
-      cmake -G "Unix Makefiles" . ../third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON \
-        $EXTRA_CMAKE_ARGS
-      make ycm_core -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
-      ${python}/bin/python ../third_party/ycmd/build.py --gocode-completer --clang-completer
-      popd
+      rm -r third_party/ycmd
+      ln -s ${ycmd}/lib/ycmd third_party
     '';
 
     meta = {

From 70046019d9a5e929eb39d69abaabf52d3595d556 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:28:05 +0100
Subject: [PATCH 0119/3449] guitarix: use python2

---
 pkgs/applications/audio/guitarix/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index e0bca0fa1c86..a5e29a5e1747 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, intltool, pkgconfig, python
+{ stdenv, fetchurl, gettext, intltool, pkgconfig, python2
 , avahi, bluez, boost, eigen, fftw, glib, glib_networking
 , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "1qj3adjhg511jygbjkl9k5v0gcjmg6ifc479rspfyf45m383pp3p";
   };
 
-  nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python ];
+  nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];
 
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm glib_networking.out
@@ -35,11 +35,11 @@ stdenv.mkDerivation rec {
     "--no-faust" # todo: find out why --faust doesn't work
   ] ++ optional optimizationSupport "--optimization";
 
-  configurePhase = ''python waf configure --prefix=$out $configureFlags'';
+  configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';
 
-  buildPhase = ''python waf build'';
+  buildPhase = ''python2 waf build'';
 
-  installPhase = ''python waf install'';
+  installPhase = ''python2 waf install'';
 
   meta = with stdenv.lib; {
     description = "A virtual guitar amplifier for Linux running with JACK";

From 2832472da0aa41c11fc43c87b0d168d4bb01fbde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:28:13 +0100
Subject: [PATCH 0120/3449] golly: use python2

---
 pkgs/applications/science/misc/golly/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix
index 40d23cc7e8a4..8902bacf11ca 100644
--- a/pkgs/applications/science/misc/golly/default.nix
+++ b/pkgs/applications/science/misc/golly/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, wxGTK, perl, python, zlib, mesa, libX11}:
+{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}:
 let
   s = # Generated upstream information
   rec {
@@ -10,7 +10,7 @@ let
     sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
   };
   buildInputs = [
-    wxGTK perl python zlib mesa libX11
+    wxGTK perl python2 zlib mesa libX11
   ];
 in
 stdenv.mkDerivation rec {
@@ -26,12 +26,12 @@ stdenv.mkDerivation rec {
   makeFlags=[
     "AM_LDFLAGS="
   ];
-  NIX_LDFLAGS="-lpython${python.majorVersion} -lperl";
+  NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl";
   preConfigure=''
     export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
       -DPYTHON_SHLIB=$(basename "$(
-        readlink -f ${python}/lib/libpython*.so)")"
+        readlink -f ${python2}/lib/libpython*.so)")"
   '';
 
   meta = {

From 616f358f7e0b9473ad277229d930468730658fc1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:30:24 +0100
Subject: [PATCH 0121/3449] hamlib: use python2

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

diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index 185780e37162..3ea70fd49908 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, python, swig, gd, libxml2, tcl, libusb, pkgconfig,
+{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig,
  boost, libtool, perlPackages }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2";
   };
 
-  buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python swig gd libxml2
+  buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2
                   tcl libusb pkgconfig boost libtool ];
 
   configureFlags = [ "--with-perl-binding" "--with-python-binding"

From 81d0494390307bb19998be7b15bfe5fc5b7778d6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:22:29 +0100
Subject: [PATCH 0122/3449] jsonnet: use emscripten build against python2

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2befce8dea74..f986f37b9b12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7763,7 +7763,9 @@ with pkgs;
 
   jsoncpp = callPackage ../development/libraries/jsoncpp { };
 
-  jsonnet = callPackage ../development/compilers/jsonnet { };
+  jsonnet = callPackage ../development/compilers/jsonnet {
+    emscripten = emscripten.override {python=python2;};
+  };
 
   libjson = callPackage ../development/libraries/libjson { };
 

From bfb31d28e746931f7a4dfaf42ccf8d7c957502ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 10 Feb 2017 09:40:57 +0100
Subject: [PATCH 0123/3449] ranger: fix tests

---
 pkgs/applications/misc/ranger/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 673e4b020852..9b7aeddc2ffb 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -15,8 +15,13 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf";
   };
 
+  checkInputs = with pythonPackages; [ pytest ];
   propagatedBuildInputs = [ file ];
 
+  checkPhase = ''
+    py.test tests
+  '';
+
   preConfigure = ''
     substituteInPlace ranger/ext/img_display.py \
       --replace /usr/lib/w3m ${w3m}/libexec/w3m

From d04ee2f91cb4413d3fd6672e75e9f9677259d501 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:11:29 +0100
Subject: [PATCH 0124/3449] libretro: add reicast core

---
 pkgs/misc/emulators/retroarch/cores.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 259a6007975c..705150d4e20f 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -248,6 +248,19 @@ in
     buildPhase = "make";
   };
 
+  reicast = (mkLibRetroCore rec {
+    core = "reicast";
+    src = fetchRetro {
+      repo = core + "-emulator";
+      rev = "ed47c72cf2e124d9d753285fd61d12ea8e071d0d";
+      sha256 = "05dw7qjnprf1lw3ps0sb7sp73hsh1a27rxbwjqd26j85zr84g3r9";
+    };
+    description = "Reicast libretro port";
+    extraBuildInputs = [ mesa ];
+  }).override {
+    buildPhase = "make";
+  };
+
   scummvm = (mkLibRetroCore rec {
     core = "scummvm";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236d..6c1d52f8c859 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15599,6 +15599,7 @@ with pkgs;
       ++ optional (cfg.enablePrboom or false) prboom
       ++ optional (cfg.enablePPSSPP or false) ppsspp
       ++ optional (cfg.enableQuickNES or false) quicknes
+      ++ optional (cfg.enableReicast or false) reicast
       ++ optional (cfg.enableScummVM or false) scummvm
       ++ optional (cfg.enableSnes9x or false) snes9x
       ++ optional (cfg.enableSnes9xNext or false) snes9x-next

From 1713dae2e38cc31e5db5ea4dab728a8ce6a34092 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:17:11 +0100
Subject: [PATCH 0125/3449] cdi2iso: init at 0.1

---
 pkgs/tools/cd-dvd/cdi2iso/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/cd-dvd/cdi2iso/default.nix

diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix
new file mode 100644
index 000000000000..a65f2d47d8f8
--- /dev/null
+++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "cdi2iso-${version}";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz";
+    sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    cp cdi2iso $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format";
+    homepage = https://sourceforge.net/projects/cdi2iso.berlios;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ hrdinka ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236d..5dbb9174117f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1092,6 +1092,8 @@ with pkgs;
 
   cdecl = callPackage ../development/tools/cdecl { };
 
+  cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { };
+
   cdrdao = callPackage ../tools/cd-dvd/cdrdao { };
 
   cdrkit = callPackage ../tools/cd-dvd/cdrkit { };

From f0d0e21a5ecb9fdb2c10f240b6e942b8ce93b038 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 02:39:15 +0800
Subject: [PATCH 0126/3449] neovim-qt: clean up

---
 pkgs/applications/editors/neovim/qt.nix | 52 ++++++++++++-------------
 pkgs/top-level/all-packages.nix         |  5 +--
 2 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 07660eaddf6c..66c538a19766 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,46 +1,46 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, pythonPackages, libmsgpack
-, makeWrapper, neovim
-}:
+{ stdenv, fetchFromGitHub, cmake, doxygen
+, libmsgpack, makeWrapper, neovim, pythonPackages, qtbase }:
 
-let # not very usable ATM
-  version = "0.2.4";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
-    owner = "equalsraf";
-    repo = "neovim-qt";
-    rev = "v${version}";
+    owner  = "equalsraf";
+    repo   = "neovim-qt";
+    rev    = "v${version}";
     sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59";
   };
 
-  # It tries to download libmsgpack; let's use ours.
-  postPatch = let use-msgpack = ''
-    cmake_minimum_required(VERSION 2.8.11)
-    project(neovim-qt-deps)
-
-    # Similar enough to FindMsgpack
-    set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE)
-    set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE)
-  '';
-    in "echo '${use-msgpack}' > third-party/CMakeLists.txt";
-
-  buildInputs = with pythonPackages; [
-    cmake qt5.qtbase
-    python msgpack jinja2 libmsgpack
-    makeWrapper
+  cmakeFlags = [
+    "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include"
+    "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
   ];
 
+  doCheck = false; # 5 out of 7 fail
+
+  buildInputs = with pythonPackages; [
+    qtbase libmsgpack
+  ] ++ (with pythonPackages; [
+    jinja2 msgpack python
+  ]);
+
+  nativeBuildInputs = [ cmake doxygen makeWrapper ];
+
   enableParallelBuilding = true;
 
+  # avoid cmake trying to download libmsgpack
+  preConfigure = "echo \"\" > third-party/CMakeLists.txt";
+
   postInstall = ''
     wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin"
   '';
 
   meta = with stdenv.lib; {
-    description = "A prototype Qt5 GUI for neovim";
+    description = "Neovim client library and GUI, in Qt5";
     license = licenses.isc;
+    maintainers = with maintainers; [ peterhoeg ];
     inherit (neovim.meta) platforms;
+    inherit version;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47535f0ac0a5..fdd613e7b3f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15394,10 +15394,7 @@ with pkgs;
 
   neovim = callPackage ../applications/editors/neovim { };
 
-  neovim-qt = callPackage ../applications/editors/neovim/qt.nix {
-    qt5 = qt55;
-    libmsgpack = libmsgpack_1_4;
-  };
+  neovim-qt = qt5.callPackage ../applications/editors/neovim/qt.nix { };
 
   neovim-pygui = pythonPackages.neovim_gui;
 

From 7031e8fd01550763d95d7346b1d1fcc642c2ec16 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 10 Feb 2017 21:02:56 +0100
Subject: [PATCH 0127/3449] gnugrep: 2.27 -> 3.0

See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00005.html
and https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00006.html
for release information.
---
 pkgs/tools/text/gnugrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index b9dca2e8709a..b33ea7169783 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pcre, libiconv, perl }:
 
-let version = "2.27"; in
+let version = "3.0"; in
 
 stdenv.mkDerivation {
   name = "gnugrep-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
-    sha256 = "1syadppgpxpfhpwhhqcsibrn131azypzps5aicx1qjh74d6w8k5d";
+    sha256 = "1dcasjp3a578nrvzrcn38mpizb8w1q6mvfzhjmcqqgkf0nsivj72";
   };
 
   # Perl is needed for testing

From 9c4653cf46562314fdb388cf7d3a9c178a7daeab Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Sat, 11 Feb 2017 09:42:12 +1300
Subject: [PATCH 0128/3449] bash-completion: call readlink without errors on
 Darwin

---
 pkgs/shells/bash-completion/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix
index 0c96c72ffd03..3ac1ca2172dd 100644
--- a/pkgs/shells/bash-completion/default.nix
+++ b/pkgs/shells/bash-completion/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i -e 's/readlink -f/readlink/g' bash_completion completions/*
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/scop/bash-completion;
     description = "Programmable completion for the bash shell";

From 349bc2e1e240241d5faef246da2451c2b0200321 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 10 Feb 2017 22:12:21 +0100
Subject: [PATCH 0129/3449] phpPackages.composer: 1.2.0 -> 1.3.2

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1808d65b75c4..f0ebdf0096c0 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -235,11 +235,11 @@ let
 
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
-    version = "1.2.0";
+    version = "1.3.2";
 
     src = pkgs.fetchurl {
       url = "https://getcomposer.org/download/${version}/composer.phar";
-      sha256 = "15chwfsqmwmhry3bv13a5y4ih1vzb0j8h1dfd49pnzzd8lai706w";
+      sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva";
     };
 
     phases = [ "installPhase" ];

From 4f74f9158a474fec5940baf17b375597b514144b Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Fri, 10 Feb 2017 14:06:28 -0800
Subject: [PATCH 0130/3449] kakoune: 2016-12-30 -> 2017-02-09

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

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 14b13c394f31..4590939b516a 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kakoune-nightly-${version}";
-  version = "2016-12-30";
+  version = "2017-02-09";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "76c58aa022a896dc170c207ff821992ee354d934";
-    sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz";
+    rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14";
+    sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi";
   };
   buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
 

From 564e0c120be9f317a7c43eb246882065b1909c67 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 10 Feb 2017 17:35:52 -0500
Subject: [PATCH 0131/3449] kde4, kdm: mark services as deprecated

---
 nixos/modules/services/x11/desktop-managers/kde4.nix | 3 +++
 nixos/modules/services/x11/display-managers/kdm.nix  | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 3aa4821a0521..f0de9120c695 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -87,6 +87,9 @@ in
 
 
   config = mkIf (xcfg.enable && cfg.enable) {
+    warnings = [
+      "KDE4 is long unmaintained and will be removed. Please update to KDE5."
+    ];
 
     # If KDE 4 is enabled, make it the default desktop manager (unless
     # overridden by the user's configuration).
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
index 04701a1640cc..bfb763f2858d 100644
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ b/nixos/modules/services/x11/display-managers/kdm.nix
@@ -35,7 +35,7 @@ let
       ${optionalString (cfg.setupScript != "")
       ''
         Setup=${cfg.setupScript}
-      ''} 
+      ''}
 
       [X-*-Greeter]
       HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers}
@@ -128,6 +128,9 @@ in
   ###### implementation
 
   config = mkIf cfg.enable {
+    warnings = [
+      "KDM is long unmaintained and will be removed. Please update to SDDM."
+    ];
 
     services.xserver.displayManager.slim.enable = false;
 

From d4766e789b9020a68e16080a2ef969bf21f79445 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sat, 11 Feb 2017 01:44:29 +0100
Subject: [PATCH 0132/3449] caddy: set file descriptor limit to 8192, fixes
 #22454

the value is recommended for production use
a warning is produced when not set
---
 nixos/modules/services/web-servers/caddy.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 619e0f90b124..a49838c876f9 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -61,6 +61,7 @@ in
         User = "caddy";
         Group = "caddy";
         AmbientCapabilities = "cap_net_bind_service";
+        LimitNOFILE = 8192;
       };
     };
 

From d9ab783f581f5dc8aba02ba1d08cdc7e6706f431 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 10 Feb 2017 22:52:08 -0500
Subject: [PATCH 0133/3449] nixos manual: correct reference to sddm

---
 nixos/doc/manual/development/option-declarations.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index cab721f2e555..d62d0896bb7c 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -135,8 +135,8 @@ services.xserver.displayManager.enable = mkOption {
   type = with types; nullOr (enum [ "slim" ]);
 };</screen></example>
 
-<example xml:id='ex-option-declaration-eot-backend-sdm'><title>Extending
-    <literal>services.foo.backend</literal> in the <literal>sdm</literal>
+<example xml:id='ex-option-declaration-eot-backend-sddm'><title>Extending
+    <literal>services.foo.backend</literal> in the <literal>sddm</literal>
     module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {

From 56153133d1592d5143abab026a3d1bf2289837e1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Feb 2017 02:29:24 +0100
Subject: [PATCH 0134/3449] mattermost: 3.3.0 -> 3.6.2

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

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 977df3967554..477338a33174 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mattermost-${version}";
-  version = "3.3.0";
+  version = "3.6.2";
 
   src = fetchurl {
     url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "16mp75hv4lzkj99lj18c5vyqsmk9kqk5r81hirq41fgb6bdqx509";
+    sha256 = "1wf8xvy8njmhym45dwag6mdwhfgzg5xccvhyv7c68rz5h57vfgsb";
   };
 
   installPhase = ''

From 9973f490f24ce910b0fa3838d392281b79be076b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Feb 2017 02:29:41 +0100
Subject: [PATCH 0135/3449] matterircd: 0.9.0 -> 0.11.2

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

diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix
index f3b20add96d9..d830af19bdce 100644
--- a/pkgs/servers/mattermost/matterircd.nix
+++ b/pkgs/servers/mattermost/matterircd.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "matterircd-${version}";
-  version = "0.9.0";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "42wim";
     repo = "matterircd";
     rev = "v${version}";
-    sha256 = "1sh34vwi8ycmdsgpzqwa7gcjzb0rn46aig6n40hxy6q1lk2l6m3c";
+    sha256 = "0yxqlckir50kdlbi36kak5ncfzl6sh811hzicdar5yzanzcip8ja";
   };
 
   goPackagePath = "github.com/42vim/matterircd";

From 3fd44e2912795db39ad9c5c9bb977663a4d129c7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 23:09:07 +0100
Subject: [PATCH 0136/3449] network-interfaces service: add metric option for
 defaultGateways

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 10 +++++++---
 nixos/modules/tasks/network-interfaces.nix          |  7 +++++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index aa86fc85feb6..062598de83e1 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -104,15 +104,19 @@ in
                 # Set the default gateway.
                 ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip route add default via "${cfg.defaultGateway.address}" ${
+                  ip route add default ${optionalString (cfg.defaultGateway.metric != null)
+                      "metric ${toString cfg.defaultGateway.metric}"
+                    } via "${cfg.defaultGateway.address}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
                       "window ${toString cfg.defaultGatewayWindowSize}"} ${
                     optionalString (cfg.defaultGateway.interface != null)
-                      "dev ${cfg.defaultGateway.interface}"}|| true
+                      "dev ${cfg.defaultGateway.interface}"} || true
                 ''}
                 ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") ''
                   # FIXME: get rid of "|| true" (necessary to make it idempotent).
-                  ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${
+                  ip -6 route add ::/0 ${optionalString (cfg.defaultGateway6.metric != null)
+                      "metric ${toString cfg.defaultGateway6.metric}"
+                    } via "${cfg.defaultGateway6.address}" ${
                     optionalString (cfg.defaultGatewayWindowSize != null)
                       "window ${toString cfg.defaultGatewayWindowSize}"} ${
                     optionalString (cfg.defaultGateway6.interface != null)
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 3f56419d2a6d..d8ebe0af0886 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -134,6 +134,13 @@ let
         description = "The default gateway interface.";
       };
 
+      metric = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 42;
+        description = "The default gateway metric/preference.";
+      };
+
     };
 
   };

From c5fcd969700e05bc4f002ee1fbaf4321216ac450 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 12:26:17 +0800
Subject: [PATCH 0137/3449] sdl: fix very long filename

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

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index fb61233dfcb3..8330dada4d35 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
     # Workaround X11 bug to allow changing gamma
     # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
     (fetchpatch {
+      name = "SDL_SetGamma.patch";
       url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
       sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
     })

From 09800030408183de089e7d852bfdd05c744924b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertugrul=20S=C3=B6ylemez?= <esz@posteo.de>
Date: Thu, 9 Feb 2017 22:37:09 +0100
Subject: [PATCH 0138/3449] zdbsp: init at 1.19

---
 pkgs/games/zdoom/zdbsp.nix      | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/games/zdoom/zdbsp.nix

diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix
new file mode 100644
index 000000000000..e3453628ba98
--- /dev/null
+++ b/pkgs/games/zdoom/zdbsp.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, unzip, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "zdbsp-${version}";
+  version = "1.19";
+
+  src = fetchurl {
+    url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip";
+    sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr";
+  };
+
+  nativeBuildInputs = [cmake unzip];
+  buildInputs = [zlib];
+  sourceRoot = ".";
+  enableParallelBuilding = true;
+  installPhase = ''
+    install -Dm755 zdbsp $out/bin/zdbsp
+  '';
+
+  meta = with stdenv.lib; {
+    description = "ZDoom's internal node builder for DOOM maps";
+    homepage = "https://zdoom.org/wiki/ZDBSP";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ertes];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8dfff8e831ed..d60b7a080976 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16512,6 +16512,8 @@ with pkgs;
 
   zangband = callPackage ../games/zangband { };
 
+  zdbsp = callPackage ../games/zdoom/zdbsp.nix { };
+
   zdoom = callPackage ../games/zdoom { };
 
   zod = callPackage ../games/zod { };

From 357c536321abbe8c93b7ddac7d071f5872344a4f Mon Sep 17 00:00:00 2001
From: Ruben Astudillo <ruben.astud@gmail.com>
Date: Sat, 11 Feb 2017 01:09:50 -0300
Subject: [PATCH 0139/3449] hakuneko: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix
index 50d75de69cce..2a4de41332eb 100644
--- a/pkgs/tools/misc/hakuneko/default.nix
+++ b/pkgs/tools/misc/hakuneko/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hakuneko-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/hakuneko/hakuneko_${version}_src.tar.gz";
-    sha256 = "d7e066e3157445f273ccf14172c05077759da036ffe700a28a409fde862b69a7";
+    sha256 = "76a63fa05e91b082cb5a70a8abacef005354e99978ff8b1369f7aa0af7615d52";
   };
 
   preConfigure = ''

From 2667a8696b318840851dd178630fcd8d8dcb9262 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 10:44:07 +0800
Subject: [PATCH 0140/3449] terragrunt: 0.9.9 -> 0.10.0

---
 .../networking/cluster/terragrunt/default.nix             | 4 ++--
 pkgs/applications/networking/cluster/terragrunt/deps.nix  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 9325d074fea3..48d05fa96634 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terragrunt-${version}";
-  version = "0.9.9";
+  version = "0.10.0";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "08rygmcjlcdj4g575cpx2lfdq69r450ri5q2dngvnhbvzk8nvnr0";
+    sha256 = "1cdhl7rqd2jslvp1ia1gph1lg0sjzsnvj7dj6lg85jfdcffafygj";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 573f5acbd6ec..91425c30121a 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "4590e9b51cd6698144a025a75608fa7a90752d5d";
-      sha256 = "13hczsimaanfmbhj8aki8zib7fi161f7p7cjm7z9x8hwwa9q4nld";
+      rev = "63102d196e0996a2910839857c3584f62be907cc";
+      sha256 = "0n207g4bf5fjq23f63nkhh14shj7kjdrr4qn6h28d7x2vqfb9pss";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-getter";
-      rev = "cc80f38c726badeae53775d179755e1c4953d6cf";
-      sha256 = "1xbflbgg3gfh3zy5ibfzxv4gbzg62rkzr4l2i9igvz8m7sxgyy1f";
+      rev = "c3d66e76678dce180a7b452653472f949aedfbcd";
+      sha256 = "0ykpkiszcwp3hnvnnyl95zdrsziwrzr989ynyvbfkgpnkqfdhfy7";
     };
   }
   {

From 2f755b76d9f0a120d9320ce4c9e4f3852c81851f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 15:21:03 +0800
Subject: [PATCH 0141/3449] syncthing-inotify: 0.8.4 -> 0.8.5

---
 .../applications/networking/syncthing/inotify-deps.nix |  5 +++--
 pkgs/applications/networking/syncthing/inotify.nix     | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix
index 7b0be65c8afa..d8b087dcb80a 100644
--- a/pkgs/applications/networking/syncthing/inotify-deps.nix
+++ b/pkgs/applications/networking/syncthing/inotify-deps.nix
@@ -1,3 +1,4 @@
+# This file was generated by go2nix.
 [
   {
     goPackagePath = "github.com/cenkalti/backoff";
@@ -13,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/syncthing/syncthing";
-      rev = "7fba8cf759a3b48cfc1507a8c32355865500a571";
-      sha256 = "1s8l528fqq661ks70cna5cx1bawpv7szcx88z33bs4gkaq2fbws5";
+      rev = "fb6d453c74d8420af847460e42e05779e90311b6";
+      sha256 = "18fya44i80ij5wqpwg0bff2hp058rh87b9zld2rpw0z8r04bnsv0";
     };
   }
   {
diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix
index 8d9a813f961c..db99a1aa1090 100644
--- a/pkgs/applications/networking/syncthing/inotify.nix
+++ b/pkgs/applications/networking/syncthing/inotify.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "syncthing-inotify-${version}";
-  version = "0.8.4";
+  version = "0.8.5";
 
   goPackagePath = "github.com/syncthing/syncthing-inotify";
 
   src = fetchFromGitHub {
-    owner = "syncthing";
-    repo = "syncthing-inotify";
-    rev = "v${version}";
-    sha256 = "0iix4gd5zh2ydn429jmcf0pr1pxxd1wq1vp5ciq9bavhvnim9clw";
+    owner  = "syncthing";
+    repo   = "syncthing-inotify";
+    rev    = "v${version}";
+    sha256 = "13qfppwlqrx3fs44ghnffdp9x0hs7mn1gal2316p7jb0klkcpfzh";
   };
 
   goDeps = ./inotify-deps.nix;

From 6cf8875abd679b1f41d07cf37217cb5dedf3089c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:04:37 +0100
Subject: [PATCH 0142/3449] xorg.{libXi,libXpm}: minor update

---
 pkgs/servers/x11/xorg/default.nix       | 12 ++++++------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b825d86ac8df..f95650f07e1a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -812,11 +812,11 @@ let
   }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (mkDerivation "libXi" {
-    name = "libXi-1.7.8";
+    name = "libXi-1.7.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2;
-      sha256 = "1fr7mi4nbcxsa88qin9g2ipmzh595ydxy9qnabzl270laf6zmwnq";
+      url = mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2;
+      sha256 = "0idg1wc01hndvaa820fvfs7phvd1ymf0lldmq6386i7rhkzvirn2";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -856,11 +856,11 @@ let
   }) // {inherit printproto libX11 libXau libXext xextproto ;};
 
   libXpm = (mkDerivation "libXpm" {
-    name = "libXpm-3.5.11";
+    name = "libXpm-3.5.12";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2;
-      sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
+      url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2;
+      sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index c0d2065a9ff3..7df1b223094b 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -71,11 +71,11 @@ mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
-mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2
+mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2
 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2
 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2
 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2

From 201f0cec12c103ba4648f4693971f5144d4c491d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:05:30 +0100
Subject: [PATCH 0143/3449] xorg.presentproto: 1.0 -> 1.1

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f95650f07e1a..b7703aa815e7 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1120,11 +1120,11 @@ let
   }) // {inherit libfontenc freetype xproto zlib ;};
 
   presentproto = (mkDerivation "presentproto" {
-    name = "presentproto-1.0";
+    name = "presentproto-1.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/presentproto-1.0.tar.bz2;
-      sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
+      url = mirror://xorg/individual/proto/presentproto-1.1.tar.bz2;
+      sha256 = "1f96dlgfwhsd0834z8ydjzjnb0cwha5r6lxgia4say4zhsl276zn";
     };
     buildInputs = [pkgconfig ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 7df1b223094b..7a1ec0d26081 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -6,7 +6,7 @@ mirror://xorg/X11R7.7/src/everything/damageproto-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/dmxproto-2.3.1.tar.bz2
 mirror://xorg/individual/proto/dri2proto-2.8.tar.bz2
 mirror://xorg/individual/proto/dri3proto-1.0.tar.bz2
-mirror://xorg/individual/proto/presentproto-1.0.tar.bz2
+mirror://xorg/individual/proto/presentproto-1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/encodings-1.0.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/fixesproto-5.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-adobe-100dpi-1.0.3.tar.bz2

From 78a115dd4717ff3194fa2f093afd08100f4753aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:05:58 +0100
Subject: [PATCH 0144/3449] xorg util-macros: 1.19.0 -> 1.19.1

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b7703aa815e7..0d4d7cb2dd5a 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1241,11 +1241,11 @@ let
   }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
   utilmacros = (mkDerivation "utilmacros" {
-    name = "util-macros-1.19.0";
+    name = "util-macros-1.19.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2;
-      sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
+      url = mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2;
+      sha256 = "19h6wflpmh7xxqr6lk5z8pds6r9r0dn7ijbvaacymx2q0m05km0q";
     };
     buildInputs = [pkgconfig ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 7a1ec0d26081..adb192ea30c1 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -100,7 +100,7 @@ mirror://xorg/individual/app/sessreg-1.1.0.tar.bz2
 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
 mirror://xorg/individual/app/twm-1.0.9.tar.bz2
-mirror://xorg/individual/util/util-macros-1.19.0.tar.bz2
+mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2

From 473f95d80924504f07b483c94784fff169f90b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:06:41 +0100
Subject: [PATCH 0145/3449] xorg.xauth: 1.0.9 -> 1.0.10

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0d4d7cb2dd5a..c85d2c7140cc 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1285,11 +1285,11 @@ let
   }) // {inherit libX11 libXext libXft libXmu xproto libXrender ;};
 
   xauth = (mkDerivation "xauth" {
-    name = "xauth-1.0.9";
+    name = "xauth-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/app/xauth-1.0.9.tar.bz2;
-      sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
+      url = mirror://xorg/individual/app/xauth-1.0.10.tar.bz2;
+      sha256 = "0kgwz9rmxjfdvi2syf8g0ms5rr5cgyqx4n0n1m960kyz7k745zjs";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index adb192ea30c1..e832146db6ce 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -104,7 +104,7 @@ mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
-mirror://xorg/individual/app/xauth-1.0.9.tar.bz2
+mirror://xorg/individual/app/xauth-1.0.10.tar.bz2
 mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2

From a750890b0e885ff6f638c064fb7b19069b919b64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Feb 2017 16:07:06 +0100
Subject: [PATCH 0146/3449] xorg xkeyboard-config: 2.19 -> 2.20

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c85d2c7140cc..0d36f2a0290f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2232,11 +2232,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.19";
+    name = "xkeyboard-config-2.20";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2;
-      sha256 = "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2;
+      sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi";
     };
     buildInputs = [pkgconfig libX11 xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index e832146db6ce..d95de81a737d 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2
 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
-mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2
+mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2
 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2

From 9b185b6b87f560dc9a5e2e98bde527d614731880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 21:27:40 +0100
Subject: [PATCH 0147/3449] xfce.xfconf: minor update 4.12.0 -> 4.12.1

---
 pkgs/desktops/xfce/core/xfconf.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
index 3696cb6ed884..edbc11b86057 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/pkgs/desktops/xfce/core/xfconf.nix
@@ -2,14 +2,14 @@
 let
   p_name  = "xfconf";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
+    sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From b4588ee03c64b5e5b1921daf835cd779f8b80296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Feb 2017 21:31:21 +0100
Subject: [PATCH 0148/3449] xfce4-panel: maintenance 4.12.0 -> 4.12.1

---
 pkgs/desktops/xfce/core/xfce4-panel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index dde8481b519f..9a5d390f3b8e 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -7,14 +7,14 @@ let
   inherit (stdenv.lib) optional;
   p_name  = "xfce4-panel";
   ver_maj = "4.12";
-  ver_min = "0";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih";
+    sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck";
   };
 
   patches = [ ./xfce4-panel-datadir.patch ];

From f4d1bcb9a706a18669e027cb6bbeac4439e9c9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 11:03:59 +0100
Subject: [PATCH 0149/3449] llvm: fix #22567 oversaturated red icons

---
 pkgs/development/compilers/llvm/3.9/llvm.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index b64cf4fed5b0..64996ced54f0 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetch
+, fetchpatch
 , perl
 , groff
 , cmake
@@ -45,6 +46,13 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ ncurses zlib ];
 
   postPatch = ""
+  + ''
+    patch -p1 --reverse < ${fetchpatch {
+      name = "fix-red-icons.diff"; # https://bugs.freedesktop.org/show_bug.cgi?id=99078
+      url = https://github.com/llvm-mirror/llvm/commit/c280d74837d8.diff;
+      sha256 = "11sq86spw41v72f676igksapdlsgh7fiqp5qkkmgfj0ndqcn9skf";
+    }}
+  ''
   # hacky fix: New LLVM releases require a newer OS X SDK than
   # 10.9. This is a temporary measure until nixpkgs darwin support is
   # updated.

From 6f48d6291f0692cae4a3fe8be5cc3abc03e63990 Mon Sep 17 00:00:00 2001
From: Mica Semrick <mica@silentumbrella.com>
Date: Wed, 8 Feb 2017 20:36:03 -0800
Subject: [PATCH 0150/3449] gimpPlugins.gmic: 1.6.5.0 -> 1.7.8

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index fa6db4e7f02f..29d950ec695e 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -125,7 +125,7 @@ rec {
       Filters/Enhance/Smart remove selection
     */
     name = "resynthesizer-2.0.1";
-    buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] 
+    buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ]
       ++ gimp.nativeBuildInputs;
     makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/";
     src = fetchFromGitHub {
@@ -178,13 +178,13 @@ rec {
 
   gmic =
     pluginDerivation rec {
-      name = "gmic-1.6.5.0";
+      name = "gmic-1.7.8";
 
       buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs;
 
       src = fetchurl {
-        url = http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz;
-        sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb";
+        url = "http://gmic.eu/files/source/gmic_1.7.8.tar.gz";
+        sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs";
       };
 
       sourceRoot = "${name}/src";

From 970753317ca698e65784574fbf00fb5fa2471221 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 10 Feb 2017 18:56:46 +0100
Subject: [PATCH 0151/3449] gimpPlugins.gmic: use attribues from gmic
 expression

---
 .../graphics/gimp/plugins/default.nix         | 21 +++----------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 29d950ec695e..20a9648e8395 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -178,31 +178,16 @@ rec {
 
   gmic =
     pluginDerivation rec {
-      name = "gmic-1.7.8";
+      inherit (pkgs.gmic) name src meta;
 
-      buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs;
-
-      src = fetchurl {
-        url = "http://gmic.eu/files/source/gmic_1.7.8.tar.gz";
-        sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs";
-      };
+      nativeBuildInputs = [ pkgconfig ];
+      buildInputs = [ pkgs.fftw pkgs.opencv gimp ] ++ gimp.nativeBuildInputs;
 
       sourceRoot = "${name}/src";
 
       buildFlags = "gimp";
 
       installPhase = "installPlugins gmic_gimp";
-
-      meta = {
-        description = "Script language for image processing which comes with its open-source interpreter";
-        homepage = http://gmic.eu/gimp.shtml;
-        license = stdenv.lib.licenses.cecill20;
-        /*
-        The purpose of this Free Software license agreement is to grant users
-        the right to modify and redistribute the software governed by this
-        license within the framework of an open source distribution model.
-        [ ... ] */
-      };
   };
 
   # this is more than a gimp plugin !

From 52d692741383d7ba2a2514098fb1fd81235a2f3b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 11:15:41 +0800
Subject: [PATCH 0152/3449] libxml2: add optional icu support

---
 pkgs/development/libraries/libxml2/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 80354b10f3b9..930227ed2434 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, lib, fetchurl, zlib, xz, python2, findXMLCatalogs, libiconv, fetchpatch
-, pythonSupport ? (! stdenv ? cross) }:
+{ stdenv, lib, fetchurl, fetchpatch
+, zlib, xz, python2, findXMLCatalogs, libiconv
+, pythonSupport ? (! stdenv ? cross)
+, icuSupport ? false, icu ? null }:
 
 let
   python = python2;
+
 in stdenv.mkDerivation rec {
   name = "libxml2-${version}";
   version = "2.9.4";
@@ -37,9 +40,11 @@ in stdenv.mkDerivation rec {
     # RUNPATH for that, leading to undefined references for its users.
     ++ lib.optional stdenv.isFreeBSD xz;
 
-  propagatedBuildInputs = [ zlib findXMLCatalogs ];
+  propagatedBuildInputs = [ zlib findXMLCatalogs ] ++ lib.optional icuSupport icu;
 
-  configureFlags = lib.optional pythonSupport "--with-python=${python}"
+  configureFlags =
+       lib.optional pythonSupport "--with-python=${python}"
+    ++ lib.optional icuSupport    "--with-icu"
     ++ [ "--exec_prefix=$dev" ];
 
   enableParallelBuilding = true;

From 607be4d88e9f9287a16e0b3c7836c4618320ebc5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 12:23:16 +0200
Subject: [PATCH 0153/3449] sd-image-*: Copy all RPi firmware files

Turns out all variants of start.elf and fixup.dat are needed (depending
on what's in config.txt). I was under the mistaken impression that you
were supposed to rename one of the variants to switch using them, but
nope.
---
 nixos/modules/installer/cd-dvd/sd-image-aarch64.nix           | 4 +---
 .../installer/cd-dvd/sd-image-armv7l-multiplatform.nix        | 4 +---
 nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix       | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
index 8cf349fbd078..c769bc80a481 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix
@@ -52,9 +52,7 @@ in
         enable_uart=1
       '';
       in ''
-        for f in bootcode.bin fixup.dat start.elf; do
-          cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
-        done
+        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
         cp ${patchedUboot}/u-boot.bin boot/u-boot-rpi3.bin
         cp ${configTxt} boot/config.txt
         ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot
diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 76f5d4bf6472..0b858746ff0a 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -44,9 +44,7 @@ in
         enable_uart=1
       '';
       in ''
-        for f in bootcode.bin fixup.dat start.elf; do
-          cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
-        done
+        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
         cp ${pkgs.ubootRaspberryPi2}/u-boot.bin boot/u-boot-rpi2.bin
         cp ${pkgs.ubootRaspberryPi3_32bit}/u-boot.bin boot/u-boot-rpi3.bin
         cp ${configTxt} boot/config.txt
diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index c7915b578d8a..886ffd9a0923 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -34,9 +34,7 @@ in
 
   sdImage = {
     populateBootCommands = ''
-      for f in bootcode.bin fixup.dat start.elf; do
-        cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/$f boot/
-      done
+      (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
       cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin
       echo 'kernel u-boot-rpi.bin' > boot/config.txt
       ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot

From 00c80a247d2d6a3fc7188ce168c35743e861c6b3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 12:24:49 +0200
Subject: [PATCH 0154/3449] updateAutotoolsGnuConfigScriptsHook: Only fix files

Some package had a broken symlink named config.sub, and the script would
fail.
---
 .../setup-hooks/update-autotools-gnu-config-scripts.sh          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
index 5e33ace42b37..66f4e91c7bb6 100644
--- a/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
+++ b/pkgs/build-support/setup-hooks/update-autotools-gnu-config-scripts.sh
@@ -4,7 +4,7 @@ updateAutotoolsGnuConfigScriptsPhase() {
     if [ -n "$dontUpdateAutotoolsGnuConfigScripts" ]; then return; fi
 
     for script in config.sub config.guess; do
-        for f in $(find . -name "$script"); do
+        for f in $(find . -type f -name "$script"); do
             echo "Updating Autotools / GNU config script to a newer upstream version: $f"
             cp -f "@gnu_config@/$script" "$f"
         done

From 166464b5ad293e4ce5c50a9e150c00d10f836f93 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Fri, 3 Feb 2017 20:25:38 -0500
Subject: [PATCH 0155/3449] patch ati-drivers for kernel 4.9

uses patch from https://github.com/imageguy/fglrx-for-Fedora/blob/master/fglrx_kernel_4.9.diff
---
 .../os-specific/linux/ati-drivers/default.nix |  5 +++-
 .../patches/4.9-get_user_pages.patch          | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 395850384d1e..d9e6ec3cf624 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -80,7 +80,10 @@ stdenv.mkDerivation rec {
                  ./patches/kernel-4.6-page_cache_release-put_page.patch ]
   ++ optionals ( kernel != null &&
                  (lib.versionAtLeast kernel.version "4.7") )
-               [ ./patches/4.7-arch-cpu_has_pge-v2.patch ];
+               [ ./patches/4.7-arch-cpu_has_pge-v2.patch ]
+  ++ optionals ( kernel != null &&
+                 (lib.versionAtLeast kernel.version "4.9") )
+               [ ./patches/4.9-get_user_pages.patch ];
 
   buildInputs =
     [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
diff --git a/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch b/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch
new file mode 100644
index 000000000000..8a6c42cdb1fc
--- /dev/null
+++ b/pkgs/os-specific/linux/ati-drivers/patches/4.9-get_user_pages.patch
@@ -0,0 +1,28 @@
+commit b3e4353fc68a6a024dcb95e2d61aa0afd7370233
+Author: Matt McHenry <matt@mchenryfamily.org>
+Date:   Fri Feb 3 20:19:41 2017
+
+    patch for 4.9 only
+
+diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c
+index 4ce095f..3b591e1 100755
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c
+@@ -3224,7 +3224,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages(vaddr, page_cnt, 1, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;
+@@ -3242,7 +3242,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p
+     int ret;
+ 
+     down_read(&current->mm->mmap_sem);
+-    ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL);
++    ret = get_user_pages(vaddr, page_cnt, 0, (struct page **)page_list, NULL);
+     up_read(&current->mm->mmap_sem);
+ 
+     return ret;

From d4bf624f968fa7b94988080be231285a95ea2ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 12:47:15 +0100
Subject: [PATCH 0156/3449] nixos manual: add grub option to avoid #21830

Close #22659.  vcunat edited this slightly.
---
 nixos/doc/manual/configuration/luks-file-systems.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index 2062456703f7..00c795cd0898 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -37,6 +37,10 @@ boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-
 fileSystems."/".device = "/dev/mapper/crypted";
 </programlisting>
 
+Should grub be used as bootloader, and <filename>/boot</filename> is located
+on an encrypted partition, it is necessary to add the following grub option:
+<programlisting>boot.loader.grub.enableCryptodisk = true;</programlisting>
+
 </para>
 
 </section>

From 980565bca078e6a8754990c3ea610aaf3c69dfa1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 13:46:42 +0100
Subject: [PATCH 0157/3449] smtube: 16.7.2 -> 17.1.0

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 5026e6c48313..ea0bd083b1d8 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  version = "16.7.2";
+  version = "17.1.0";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "0k64hc6grn4nlp739b0w5fznh0k9xx9qdwx6s7w3fb5m5pfkdrmm";
+    sha256 = "1kg45qkr7nvchy9ih24vlbpkn6vd8v8qw5xqsjhjpjkizcmzaa61";
   };
 
   makeFlags = [

From c4a47bdb5e5c17e93b3be0f0257b919e8892231e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 11 Feb 2017 13:49:33 +0100
Subject: [PATCH 0158/3449] libretro: add mednafen-saturn core

---
 pkgs/misc/emulators/retroarch/cores.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 259a6007975c..775fc21a3dbb 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -170,6 +170,18 @@ in
     buildPhase = "make";
   };
 
+  mednafen-saturn = (mkLibRetroCore rec {
+    core = "mednafen-saturn";
+    src = fetchRetro {
+      repo = "beetle-saturn-libretro";
+      rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab";
+      sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b";
+    };
+    description = "Port of Mednafen's Saturn core to libretro";
+  }).override {
+    buildPhase = "make";
+  };
+
   mupen64plus = (mkLibRetroCore rec {
     core = "mupen64plus";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 105890e654aa..c8c3207327f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15598,6 +15598,7 @@ with pkgs;
       ++ optional (cfg.enableMAME or false) mame
       ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast
       ++ optional (cfg.enableMednafenPSX or false) mednafen-psx
+      ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia
       ++ optional (cfg.enablePicodrive or false) picodrive

From 44641997799d97f7aea83d8c8e01334197273b3a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 13:55:07 +0100
Subject: [PATCH 0159/3449] smplayer: 17.1.0 -> 17.2.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 0801dc8573d0..9c2f6d041197 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-17.1.0";
+  name = "smplayer-17.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0wgw940gxf3gqh6xzxvz037ipvr1xcw86gf0myvpb4lkwqh5jds0";
+    sha256 = "05nqwpyh3zlyzip7chs711sz97cgijb92h44cd5aqbwbx06hihdd";
   };
 
   buildInputs = [ qtscript ];

From 5712ac6a721879f481dc0d2955cc3d99fca38320 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Jan 2017 06:35:57 +0000
Subject: [PATCH 0160/3449] coqPackages.{ssreflect,mathcomp}: 1.6 -> 1.6.1

---
 pkgs/development/coq-modules/mathcomp/default.nix  | 11 +----------
 pkgs/development/coq-modules/mathcomp/generic.nix  |  7 ++-----
 pkgs/development/coq-modules/ssreflect/default.nix | 11 +----------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index dba6a3abbea5..a80c934c6c19 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,20 +1,11 @@
 { callPackage, fetchurl, coq }:
 
 let param =
-  let v16 = {
-    version = "1.6";
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  }; v161 = {
+  {
     version = "1.6.1";
     url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
     sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
   }; in
-{
-  "8.4" = v16;
-  "8.5" = v16;
-  "8.6" = v161;
-}."${coq.coq-version}"; in
 
 callPackage ./generic.nix {
   name = "coq${coq.coq-version}-mathcomp-${param.version}";
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 1c150c9e69fa..564cb6f65717 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coq, ssreflect, ncurses, which
+{ stdenv, fetchurl, coq, ncurses, which
 , graphviz, withDoc ? false
 , src, name
 }:
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ];
   buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ];
-  propagatedBuildInputs = [ coq ssreflect ];
+  propagatedBuildInputs = [ coq ];
 
   enableParallelBuilding = true;
 
@@ -24,9 +24,6 @@ stdenv.mkDerivation {
 
   installPhase = ''
     make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install
-    rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect*
-    rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/ssrmatching.cmi
-    rm -fr $out/share/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect*
   '' + stdenv.lib.optionalString withDoc ''
     make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/
   '';
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 18eafe5e9c2c..352b98ab88b9 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,20 +1,11 @@
 { callPackage, fetchurl, coq }:
 
 let param =
-  let v16 = {
-    version = "1.6";
-    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz;
-    sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8";
-  }; v161 = {
+  {
     version = "1.6.1";
     url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
     sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
   }; in
-{
-  "8.4" = v16;
-  "8.5" = v16;
-  "8.6" = v161;
-}."${coq.coq-version}"; in
 
 callPackage ./generic.nix {
   name = "coq${coq.coq-version}-ssreflect-${param.version}";

From dedba2a32d39bebe94ed5d3268616eabd53ed26b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Jan 2017 06:52:23 +0000
Subject: [PATCH 0161/3449] coqPackages.coquelicot: 2.1.1 -> 2.1.2

keeping old 2.1.1 version for Coq-8.4,
as newer versions of the library do not support older Coq versions
---
 .../coq-modules/coquelicot/default.nix        | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index a57686177c4e..a81b76849bce 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -1,11 +1,26 @@
 { stdenv, fetchurl, which, coq, ssreflect }:
 
-stdenv.mkDerivation {
-  name = "coq${coq.coq-version}-coquelicot-2.1.1";
-  src = fetchurl {
+let param =
+  let
+  v2_1_1 = {
+    version = "2.1.1";
     url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz;
     sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km";
   };
+  v2_1_2 = {
+    version = "2.1.2";
+    url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz;
+    sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an";
+  };
+  in {
+  "8.4" = v2_1_1;
+  "8.5" = v2_1_2;
+  "8.6" = v2_1_2;
+}."${coq.coq-version}"; in
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-coquelicot-${param.version}";
+  src = fetchurl { inherit (param) url sha256; };
 
   nativeBuildInputs = [ which ];
   buildInputs = [ coq ];

From 8bfce240457124eef57edab73faaea7c059ad722 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 28 Jan 2017 06:54:33 +0000
Subject: [PATCH 0162/3449] coqPackages.interval: 2.2.1 -> 3.1.1

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

diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index f367dad1fcaa..e07c7c80ac03 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }:
 
 stdenv.mkDerivation {
-  name = "coq-interval-${coq.coq-version}-2.2.1";
+  name = "coq${coq.coq-version}-interval-3.1.1";
 
   src = fetchurl {
-    url = https://gforge.inria.fr/frs/download.php/file/35431/interval-2.2.1.tar.gz;
-    sha256 = "1i6v7da9mf6907sa803xa0llsf9lj4akxbrl8rma6gsdgff2d78n";
+    url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz;
+    sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf";
   };
 
   nativeBuildInputs = [ which ];

From 8ea925b2404ac7b4d22ea3a3ec69241b757e7fb2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:26:17 +0100
Subject: [PATCH 0163/3449] ansible_2_1: windowsSupport off by default

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

diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix
index 5af0837387d4..077bfa198aaf 100644
--- a/pkgs/development/python-modules/ansible/2.1.nix
+++ b/pkgs/development/python-modules/ansible/2.1.nix
@@ -10,7 +10,8 @@
 , six
 , netaddr
 , dns
-, pywinrm
+, windowsSupport ? false
+, pywinrm ? null
 }:
 
 let
@@ -43,7 +44,6 @@ in buildPythonPackage rec {
   dontStrip = true;
   dontPatchELF = true;
   dontPatchShebangs = false;
-  windowsSupport = true;
 
   propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;

From 1ba17987f7bb1439791af8cf2b2d373ca00d8e09 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:26:52 +0100
Subject: [PATCH 0164/3449] ansible_2_2: windows support off by default

this was accidentally enabled when moving the expression.
---
 pkgs/development/python-modules/ansible/2.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix
index 48a325fec331..d62c1e74822d 100644
--- a/pkgs/development/python-modules/ansible/2.2.nix
+++ b/pkgs/development/python-modules/ansible/2.2.nix
@@ -10,7 +10,8 @@
 , six
 , netaddr
 , dns
-, pywinrm
+, windowsSupport ? false
+, pywinrm ? null
 }:
 
 let
@@ -44,7 +45,6 @@ in buildPythonPackage rec {
   dontStrip = true;
   dontPatchELF = true;
   dontPatchShebangs = false;
-  windowsSupport = true;
 
   propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
     boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;

From 6cf3667bc91913556bd1dd905088cab811a830bb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:27:18 +0100
Subject: [PATCH 0165/3449] pythonPackages.cinderclient: mark as broken

The whole python openstack needs some maintenance...
---
 pkgs/top-level/python-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0588ab5b3e2a..88ee5425f88a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17036,6 +17036,7 @@ in {
     meta = with stdenv.lib; {
       description = "Python bindings to the OpenStack Cinder API";
       homepage = "http://www.openstack.org/";
+      broken = true;
     };
   };
 

From e655ab08ee95b1563599539212798c8cfcd1d207 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 13:28:24 +0100
Subject: [PATCH 0166/3449] pythonPackages.ryu: mark as broken

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 88ee5425f88a..fc1f676ecf83 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17316,6 +17316,8 @@ in {
       url = "mirror://pypi/r/ryu/${name}.tar.gz";
       sha256 = "1fhriqi7qnvvx9mbvlfm94i5drh920lg204zy3v0qjz43sinkih6";
     };
+
+    meta.broken = true;
   };
 
   WSME = buildPythonPackage rec {

From 049a031e34f0855acbff260569979b6a6aecb6fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 14:13:36 +0100
Subject: [PATCH 0167/3449] pythonPackages.paramiko: 2.0.2 -> 2.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc1f676ecf83..c25be593e273 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18078,15 +18078,16 @@ in {
   };
 
   paramiko = buildPythonPackage rec {
-    name = "paramiko-${version}";
-    version = "2.0.2";
+    pname = "paramiko";
+    version = "2.1.1";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/paramiko/${name}.tar.gz";
-      sha256 = "1p21s7psqj18k9a97nq26yas058i5ivzk7pi7y98l1rbl87zj6s1";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0xdmamqgx2ymhdm46q8flpj4fncj4wv2dqxzz0bc2dh7mnkss7fm";
     };
 
-    propagatedBuildInputs = with self; [ cryptography cryptography_vectors ];
+    propagatedBuildInputs = with self; [ cryptography pyasn1 ];
 
     # https://github.com/paramiko/paramiko/issues/449
     doCheck = !(isPyPy || isPy33);

From 20578372e1e72a19e9c42e31d1f21cd8a3b6df39 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 15:53:01 +0200
Subject: [PATCH 0168/3449] U-Boot: Fix ubootBananaPi & ubootPcduino3Nano by
 adding python2

Also enable parallel building.
---
 pkgs/misc/uboot/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 6179f05d42b0..f0ec5f483d40 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bc, dtc }:
+{ stdenv, fetchurl, bc, dtc, python2 }:
 
 let
   buildUBoot = { targetPlatforms
@@ -17,7 +17,7 @@ let
       sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc";
     };
 
-    nativeBuildInputs = [ bc dtc ];
+    nativeBuildInputs = [ bc dtc python2 ];
 
     hardeningDisable = [ "all" ];
 
@@ -34,6 +34,7 @@ let
       runHook postInstall
     '';
 
+    enableParallelBuilding = true;
     dontStrip = true;
 
     crossAttrs = {

From e2834ca6113acc263ea7ed857fc1cdcf509510e2 Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Sat, 4 Feb 2017 18:30:00 +0100
Subject: [PATCH 0169/3449] Sile: Init at 0.9.4

---
 pkgs/tools/typesetting/sile/default.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/typesetting/sile/default.nix

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
new file mode 100644
index 000000000000..890103a0f989
--- /dev/null
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, makeWrapper, pkgconfig
+, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem
+, fontconfig, lua, libiconv
+}:
+
+with stdenv.lib;
+
+let
+
+  libs          = [lpeg luaexpat luazlib luafilesystem];
+  getPath       = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}";
+  getLuaPath    = lib : getPath lib "lua";
+  getLuaCPath   = lib : getPath lib "so";
+  luaPath       = concatStringsSep ";" (map getLuaPath libs);
+  luaCPath      = concatStringsSep ";" (map getLuaCPath libs);
+  in
+
+  stdenv.mkDerivation rec {
+    name = "sile-${version}";
+    version = "0.9.4";
+    src = fetchurl {
+      url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
+      sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w";
+    };
+
+  nativeBuildInputs = [pkgconfig makeWrapper];
+  buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ];
+
+  LUA_PATH = luaPath;
+  LUA_CPATH = luaCPath;
+
+  postInstall = ''
+    wrapProgram $out/bin/sile \
+      --set LUA_PATH "${luaPath};" \
+      --set LUA_CPATH "${luaCPath};" \
+  '';
+
+  meta = {
+    description = "A typesetting system";
+    longDescription = ''
+      SILE is a typesetting system; its job is to produce beautiful printed documents.
+      Conceptually, SILE is similar to TeX—from which it borrows some concepts and even syntax and algorithms—but the similarities end there. Rather than being a derivative of the TeX family SILE is a new typesetting and layout engine written from the ground up using modern technologies and borrowing some ideas from graphical systems such as InDesign.
+    '';
+    homepage = "http://www.sile-typesetter.org";
+    platforms = stdenv.lib.platforms.unix;
+    license = stdenv.lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b7b5cd5599b..96420aeb048f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3805,6 +3805,10 @@ with pkgs;
 
   silc_server = callPackage ../servers/silc-server { };
 
+  sile = callPackage ../tools/typesetting/sile {
+  inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg;
+  };
+
   silver-searcher = callPackage ../tools/text/silver-searcher { };
   ag = self.silver-searcher;
 

From 9550686be85b70be95967fbfcb4293ad3f44206b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 11 Feb 2017 22:48:18 +0800
Subject: [PATCH 0170/3449] subsurface: 4.5.97 -> 4.6.0 (#22615)

We do a few more things:

 - libmarble and libdivecomputer with the subsurface patches have both been
   inlined for 2 reasons:
   a) nobody else is using these forks
   b) they need to be updated in lockstep with subsurface

 - instead of building libmarble against qtquick1, we now build using
   qtquickcontrols (qtquick2)

 - getting rid of qtquick1 also allows us to use the default qt (currently 5.6)

 - we get rid of some hacks to deal with library dependencies

 - instead of manually overriding various phases, we simply use cmakeFlags to
   pass proper parameters
---
 pkgs/applications/misc/subsurface/default.nix | 103 +++++++++++++-----
 .../libraries/libdivecomputer/subsurface.nix  |  25 -----
 .../libraries/libmarble-ssrf/default.nix      |  33 ------
 pkgs/top-level/all-packages.nix               |   8 +-
 4 files changed, 76 insertions(+), 93 deletions(-)
 delete mode 100644 pkgs/development/libraries/libdivecomputer/subsurface.nix
 delete mode 100644 pkgs/development/libraries/libmarble-ssrf/default.nix

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index 06b367fa6e78..bb23f46d7334 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -1,49 +1,97 @@
 {
   stdenv,
-  cmake,
+  cmake, doxygen, pkgconfig, autoreconfHook,
   curl,
   fetchgit,
   grantlee,
-  libdivecomputer,
   libgit2,
-  libmarble-ssrf,
+  libusb,
   libssh2,
   libxml2,
   libxslt,
   libzip,
-  pkgconfig,
-  qtbase,
-  qtconnectivity,
-  qttools,
-  qtwebkit,
+  qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit,
   sqlite
 }:
 
-stdenv.mkDerivation rec {
-  version = "4.5.97";
+let
+  version = "4.6.0";
+
+  libmarble = stdenv.mkDerivation rec {
+    name = "libmarble-ssrf-${version}";
+
+    src = fetchgit {
+      url    = "git://git.subsurface-divelog.org/marble";
+      rev    = "refs/tags/v${version}";
+      sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd";
+    };
+
+    buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ];
+    nativeBuildInputs = [ doxygen pkgconfig cmake ];
+
+    enableParallelBuilding = true;
+
+    cmakeFlags = [
+      "-DQTONLY=TRUE"
+      "-DQT5BUILD=ON"
+      "-DBUILD_MARBLE_TESTS=NO"
+      "-DWITH_DESIGNER_PLUGIN=NO"
+      "-DBUILD_MARBLE_APPS=NO"
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Qt library for a slippy map with patches from the Subsurface project";
+      homepage = http://subsurface-divelog.org;
+      license = licenses.lgpl21;
+      maintainers = with maintainers; [ mguentner ];
+      platforms = platforms.all;
+    };
+  };
+
+  libdc = stdenv.mkDerivation rec {
+    name = "libdivecomputer-ssrf-${version}";
+
+    src = fetchgit {
+      url    = "git://subsurface-divelog.org/libdc";
+      rev    = "refs/tags/v${version}";
+      sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n";
+    };
+
+    nativeBuildInputs = [ autoreconfHook ];
+
+    enableParallelBuilding = true;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.libdivecomputer.org;
+      description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
+      maintainers = with maintainers; [ mguentner ];
+      license = licenses.lgpl21;
+      platforms = platforms.all;
+    };
+  };
+
+in stdenv.mkDerivation rec {
   name = "subsurface-${version}";
 
   src = fetchgit {
-    sha256 = "035ywhicadmr9sh7zhfxsvpchwa9sywccacbspfam39n2hpyqnmm";
-    url = "git://git.subsurface-divelog.org/subsurface";
-    rev = "72bcb6481f3b935444d7868a74599dda133f9b43";
-    branchName = "master";
+    url    = "git://git.subsurface-divelog.org/subsurface";
+    rev    = "refs/tags/v${version}";
+    sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c";
   };
 
-  buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt
-                  libzip libxml2 grantlee qtwebkit qttools
-                  qtconnectivity libgit2 libssh2 curl ];
-  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [
+    libdc libmarble
+    curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip
+    qtbase qtconnectivity qtsvg qttools qtwebkit
+  ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  #enableParallelBuilding = true; # fatal error: ui_mainwindow.h: No such file or directory
+  enableParallelBuilding = true;
 
-  # hack incoming...
-  preConfigure = ''
-    marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so)
-    cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \
-                            -DMARBLE_LIBRARIES=$marble_libs \
-                            -DNO_PRINTING=OFF"
-  '';
+  cmakeFlags = [
+    "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so"
+    "-DNO_PRINTING=OFF"
+  ];
 
   meta = with stdenv.lib; {
     description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux";
@@ -55,8 +103,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://subsurface-divelog.org;
     license = licenses.gpl2;
-    maintainers = [ maintainers.mguentner ];
+    maintainers = with maintainers; [ mguentner ];
     platforms = platforms.all;
   };
-
 }
diff --git a/pkgs/development/libraries/libdivecomputer/subsurface.nix b/pkgs/development/libraries/libdivecomputer/subsurface.nix
deleted file mode 100644
index 5840ea2ef85e..000000000000
--- a/pkgs/development/libraries/libdivecomputer/subsurface.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchgit, autoreconfHook }:
-
-stdenv.mkDerivation rec {
-  name = "libdivecomputer-${version}";
-  version = "ssrf-0.5.0";
-
-  src = fetchgit {
-    url = "git://subsurface-divelog.org/libdc";
-    rev = "534dd2f34b8271b2a1cac0e3151bfdc81da40e47";
-    branchName = "Subsurface-branch";
-    sha256 = "0iw9pczmwqlfjlgrik79b2pd4lmipxhjzj60ysk8qzl3axadjycp";
-  };
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.libdivecomputer.org;
-    description = "A cross-platform and open source library for communication with dive computers from various manufacturers";
-    maintainers = [ maintainers.mguentner ];
-    license = licenses.lgpl21;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/libmarble-ssrf/default.nix b/pkgs/development/libraries/libmarble-ssrf/default.nix
deleted file mode 100644
index 1d6c54134393..000000000000
--- a/pkgs/development/libraries/libmarble-ssrf/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchgit, doxygen, pkgconfig, cmake, qtbase, qtscript, qtquick1 }:
-
-stdenv.mkDerivation rec {
-  name = "libmarble-ssrf-${version}";
-  version = "2016-11-09";
-
-  src = fetchgit {
-    sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd";
-    url = "git://git.subsurface-divelog.org/marble";
-    rev = "4325da93b7516abb6f93a1417adc10593dacd794";
-  };
-
-  buildInputs = [ qtbase qtscript qtquick1 ];
-  nativeBuildInputs = [ doxygen pkgconfig cmake ];
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Release \
-                            -DQTONLY=TRUE -DQT5BUILD=ON \
-                            -DBUILD_MARBLE_TESTS=NO \
-                            -DWITH_DESIGNER_PLUGIN=NO \
-                            -DBUILD_MARBLE_APPS=NO"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Qt library for a slippy map with patches from the Subsurface project";
-    homepage = "http://subsurface-divelog.org";
-    license = licenses.lgpl21;
-    maintainers = [ maintainers.mguentner ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96420aeb048f..98dbd70fe966 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2488,8 +2488,6 @@ with pkgs;
 
   makebootfat = callPackage ../tools/misc/makebootfat { };
 
-  libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { };
-
   matrix-synapse = callPackage ../servers/matrix-synapse { };
 
   memtester = callPackage ../tools/system/memtester { };
@@ -3904,9 +3902,7 @@ with pkgs;
 
   su-exec = callPackage ../tools/security/su-exec {};
 
-  subsurface = qt55.callPackage ../applications/misc/subsurface {
-    libdivecomputer = libdivecomputer_ssrf;
-  };
+  subsurface = qt5.callPackage ../applications/misc/subsurface { };
 
   sudo = callPackage ../tools/security/sudo { };
 
@@ -8004,8 +8000,6 @@ with pkgs;
 
   libdivecomputer = callPackage ../development/libraries/libdivecomputer { };
 
-  libdivecomputer_ssrf = callPackage ../development/libraries/libdivecomputer/subsurface.nix { };
-
   libdivsufsort = callPackage ../development/libraries/libdivsufsort { };
 
   libdmtx = callPackage ../development/libraries/libdmtx { };

From bab37c73ac14e91c9fda22a1e7a7b54ffd2e9a7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 15:33:24 +0100
Subject: [PATCH 0171/3449] nvidia-x11: undo parallel building

In ffc498c4900bbc993b88ef5525698e06fd91beca -j$NIX_BUILD_JOBS was added.
Somehow this caused my machine to run many many more parallel jobs than
it was supposed to, freezing the system.

If you don't experience this, feel free to revert.
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 98858c4c9851..523396faf3d1 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -21,7 +21,7 @@ buildPhase() {
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_JOBS
+        make SYSSRC=$sysSrc SYSOUT=$sysOut module
 
         cd ..
     fi

From bbbd3c09701500c0d322f24c840e453a2973bf5f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 11 Feb 2017 15:52:50 +0100
Subject: [PATCH 0172/3449] sile: minor cleanup

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

diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix
index 890103a0f989..382219a0a3a3 100644
--- a/pkgs/tools/typesetting/sile/default.nix
+++ b/pkgs/tools/typesetting/sile/default.nix
@@ -13,15 +13,17 @@ let
   getLuaCPath   = lib : getPath lib "so";
   luaPath       = concatStringsSep ";" (map getLuaPath libs);
   luaCPath      = concatStringsSep ";" (map getLuaCPath libs);
-  in
 
-  stdenv.mkDerivation rec {
-    name = "sile-${version}";
-    version = "0.9.4";
-    src = fetchurl {
-      url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
-      sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w";
-    };
+in
+
+stdenv.mkDerivation rec {
+  name = "sile-${version}";
+  version = "0.9.4";
+
+  src = fetchurl {
+    url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2";
+    sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w";
+  };
 
   nativeBuildInputs = [pkgconfig makeWrapper];
   buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ];
@@ -38,8 +40,14 @@ let
   meta = {
     description = "A typesetting system";
     longDescription = ''
-      SILE is a typesetting system; its job is to produce beautiful printed documents.
-      Conceptually, SILE is similar to TeX—from which it borrows some concepts and even syntax and algorithms—but the similarities end there. Rather than being a derivative of the TeX family SILE is a new typesetting and layout engine written from the ground up using modern technologies and borrowing some ideas from graphical systems such as InDesign.
+      SILE is a typesetting system; its job is to produce beautiful
+      printed documents. Conceptually, SILE is similar to TeX—from
+      which it borrows some concepts and even syntax and
+      algorithms—but the similarities end there. Rather than being a
+      derivative of the TeX family SILE is a new typesetting and
+      layout engine written from the ground up using modern
+      technologies and borrowing some ideas from graphical systems
+      such as InDesign.
     '';
     homepage = "http://www.sile-typesetter.org";
     platforms = stdenv.lib.platforms.unix;

From 0b7fec62726613b2c9703cfa43dd8c440ad7da75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 17:46:00 +0100
Subject: [PATCH 0173/3449] knot-resolver: maintenance 1.2.1 -> 1.2.2

In particular, trust anchor bootstrapping is fixed after IANA publishing
an additional key.
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 45b1d0cb8cc153f83c47ef2ab6c8ba351b6367a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 17:51:57 +0100
Subject: [PATCH 0174/3449] knot-dns: maintenance 2.4.0 -> 2.4.1

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index c7b2032a5790..cba21fbeb8ec 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -5,20 +5,13 @@
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b";
+    sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin
-      (fetchpatch {
-        name = "before-sierra.diff";
-        url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff";
-        sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w";
-      });
-
   outputs = [ "bin" "out" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];

From a749b73ff8fd88a98417659cce37ce194f2c0a7c Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Sun, 29 Jan 2017 21:35:49 +0000
Subject: [PATCH 0175/3449] ne: migrate from (broken) tetex to texlive

related: #21770.  vcunat re-indented the longDescription.
---
 pkgs/applications/editors/ne/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index c7dbff366dbc..7feb7f22e222 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }:
+{ stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }:
 
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     rev = version;
     sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp";
   };
-  buildInputs = [ ncurses tetex texinfo perl ghostscript ];
+  buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ];
   dontBuild = true;
   installPhase = ''
     substituteInPlace src/makefile --replace "CC=c99" "cc=gcc"
@@ -20,14 +20,15 @@ stdenv.mkDerivation rec {
     cd src && make && cd ..
     make PREFIX=$out install
   '';
-  
+
   meta = {
     description = "The nice editor";
     homepage = https://github.com/vigna/ne;
     longDescription = ''
-      ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any 
-UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, 
-and most sparing in its resource usage. See the manual for some highlights of ne's features.      
+      ne is a free (GPL'd) text editor based on the POSIX standard that runs
+      (we hope) on almost any UN*X machine.  ne is easy to use for the beginner,
+      but powerful and fully configurable for the wizard, and most sparing in its
+      resource usage.  See the manual for some highlights of ne's features.
     '';
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;

From b9d6a6cbd0437c5482e5805594ed62394c74bdca Mon Sep 17 00:00:00 2001
From: Langston Barrett <langston.barrett@gmail.com>
Date: Sun, 29 Jan 2017 21:36:26 +0000
Subject: [PATCH 0176/3449] enblend-enfuse: migrate from (broken) tetex to
 texlive

related: #21770
---
 pkgs/tools/graphics/enblend-enfuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index 00cc5e385feb..2a0796699fb8 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra
-, help2man, pkgconfig, perl, tetex }:
+, help2man, pkgconfig, perl, texlive }:
 
 stdenv.mkDerivation rec {
   name = "enblend-enfuse-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ];
 
-  nativeBuildInputs = [ help2man perl pkgconfig tetex ];
+  nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ];
 
   preConfigure = ''
     patchShebangs src/embrace

From 2aff29c7b202725933dd5306eed4241fe86be0b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 18:09:43 +0100
Subject: [PATCH 0177/3449] tex4ht: deprecate in favor of texlive.tex4ht

I don't make an alias, as the attribute is used in a different way.
---
 pkgs/tools/typesetting/tex/tex4ht/default.nix | 1 +
 pkgs/top-level/all-packages.nix               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix
index 5aaae2c06b2a..6f387b5bf8bc 100644
--- a/pkgs/tools/typesetting/tex/tex4ht/default.nix
+++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix
@@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
     description = "A system to convert (La)TeX documents to HTML and various other formats";
     license = stdenv.lib.licenses.lppl12;
     platforms = stdenv.lib.platforms.unix;
+    broken = true; # use the one from texlive.tex4ht
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98dbd70fe966..317903b4988a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17815,7 +17815,7 @@ with pkgs;
 
   tewi-font = callPackage ../data/fonts/tewi  {};
 
-  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { };
+  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = null; };
 
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
 

From a7096107f34535f4f730c38f86708ad98a3df942 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 18:18:27 +0100
Subject: [PATCH 0178/3449] audacious: 3.8 -> 3.8.2

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

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index e9d7b5da79a6..6d4b18e29b00 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -8,16 +8,16 @@
 
 stdenv.mkDerivation rec {
   name = "audacious-${version}";
-  version = "3.8";
+  version = "3.8.2";
 
   src = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
-    sha256 = "0rpdzf9pb52lcswxypwh4nq3qkjzliw42v39nm5rlwwxdq6bm99q";
+    sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf";
   };
 
   pluginsSrc = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
-    sha256 = "0j9svdqdjvj5spx1vfp0m63xh8xwk8naqsikdxfxbb68xk33rxb9";
+    sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq";
   };
 
   nativeBuildInputs = [

From c512ba7e7e8cbd19737b659fb6edb9baaa75f174 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 11 Feb 2017 18:19:17 +0100
Subject: [PATCH 0179/3449] audaciousQt5: 3.8.1 -> 3.8.2, rename to
 audacious-qt5

The name is changed as well so it won't upgrade from the gtk3 version.
---
 pkgs/applications/audio/audacious/qt-5.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index b86efe7eb97e..663e0eb0cc8c 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -10,23 +10,23 @@
 }:
 
 let
-  version = "3.8.1";
+  version = "3.8.2";
   sources = {
     "audacious-${version}" = fetchurl {
       url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-      sha256 = "1k9blmgqia0df18l39bd2bbcwmjfxak6bd286vcd9zzmjhqs4qdc";
+      sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx";
     };
 
     "audacious-plugins-${version}" = fetchurl {
       url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-      sha256 = "0f16ivcp8nd83r781hnw1qgbs9hi2b2v22zwv7c3sw3jq1chb70h";
+      sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp";
     };
   };
 in
 
 stdenv.mkDerivation {
   inherit version;
-  name = "audacious-${version}";
+  name = "audacious-qt5-${version}";
 
   sourceFiles = lib.attrValues sources;
   sourceRoots = lib.attrNames sources;

From a3523022e704cfeda7c5c38166ff00343ed739ef Mon Sep 17 00:00:00 2001
From: David Terry <xwvvvvwx@users.noreply.github.com>
Date: Sat, 11 Feb 2017 19:10:46 +0100
Subject: [PATCH 0180/3449] range-v3: init at 2017-01-30 (#22661)

---
 lib/maintainers.nix                           |  1 +
 .../libraries/range-v3/default.nix            | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/range-v3/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 1afd32bc763f..8c778921fac2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -523,6 +523,7 @@
   womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>";
   wscott = "Wayne Scott <wsc9tt@gmail.com>";
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
+  xwvvvvwx = "David Terry <davidterry@posteo.de>";
   yarr = "Dmitry V. <savraz@gmail.com>";
   yochai = "Yochai <yochai@titat.info>";
   yorickvp = "Yorick van Pelt <yorickvanpelt@gmail.com>";
diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix
new file mode 100644
index 000000000000..f1d9026b5f92
--- /dev/null
+++ b/pkgs/development/libraries/range-v3/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "range-v3-${version}";
+  version = "2017-01-30";
+
+  src = fetchFromGitHub {
+    owner = "ericniebler";
+    repo = "range-v3";
+    rev = "bab29767cce120e11872d79a2537bc6f0be76963";
+    sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi";
+  };
+
+  dontBuild = true;
+  installPhase = ''
+    mkdir -p $out/include
+    mv include/ $out/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Experimental range library for C++11/14/17";
+    homepage = https://github.com/ericniebler/range-v3;
+    license = licenses.boost;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ xwvvvvwx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 317903b4988a..8837a65fba74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9347,6 +9347,8 @@ with pkgs;
 
   rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
 
+  range-v3 = callPackage ../development/libraries/range-v3 {};
+
   rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
 
   raul = callPackage ../development/libraries/audio/raul { };

From e644f9f8ecd4888b3a1a1c06e1c9f4edeaf83d60 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Feb 2017 19:24:06 +0100
Subject: [PATCH 0181/3449] python-packages: update "osc" to latest version
 from git

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c25be593e273..2ddaa2a4fc1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16679,22 +16679,23 @@ in {
     };
   });
 
-  osc = buildPythonPackage (rec {
-    name = "osc-0.133+git";
+  osc = buildPythonPackage {
+    name = "osc-0.156.0-16-g9e6d1a5";
     disabled = isPy3k;
-
-    src = pkgs.fetchgit {
-      url = https://github.com/openSUSE/osc;
-      rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce";
-      sha256 = "0bf0yc4y1q87k7hq40xnr687lyw3ma93b3zprjlgn9pr8s1cn9xw";
+    src = pkgs.fetchFromGitHub {
+      owner = "openSUSE";
+      repo = "osc";
+      rev = "9e6d1a592e89e8ee9fd40a96cfcf97bf74f68715";
+      sha256 = "13svha5zh1xn3jv4kn9h3d620p65qh5nnhhghjbscp9lzlwwba3g";
     };
-
-    doCheck = false;
+    propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
     postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";
-
-    propagatedBuildInputs = with self; [ self.m2crypto ];
-
-  });
+    meta = {
+      description = "opensuse-commander with svn like handling";
+      maintainers = [ maintainers.peti ];
+      license = licenses.gpl2;
+    };
+  };
 
   oslosphinx = buildPythonPackage rec {
     name = "oslosphinx-3.3.1";

From 3cec7d10dfb80b7466f171e7a59ac9af3bab2862 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 11 Feb 2017 13:55:09 -0500
Subject: [PATCH 0182/3449] kdm: drop service

---
 nixos/modules/misc/ids.nix                    |   4 +-
 nixos/modules/module-list.nix                 |   1 -
 .../services/x11/desktop-managers/kde4.nix    | 202 ------------------
 .../services/x11/display-managers/default.nix |   3 -
 .../services/x11/display-managers/kdm.nix     | 161 --------------
 .../system/boot/loader/grub/install-grub.pl   |   2 -
 .../modules/testing/test-instrumentation.nix  |   9 -
 nixos/tests/kde4.nix                          |  70 ------
 8 files changed, 2 insertions(+), 450 deletions(-)
 delete mode 100644 nixos/modules/services/x11/desktop-managers/kde4.nix
 delete mode 100644 nixos/modules/services/x11/display-managers/kdm.nix
 delete mode 100644 nixos/tests/kde4.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 60e00ce874a8..1566dbe1677e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -64,7 +64,7 @@
       cups = 36;
       foldingathome = 37;
       sabnzbd = 38;
-      kdm = 39;
+      #kdm = 39; # dropped in 17.03
       ghostone = 40;
       git = 41;
       fourstore = 42;
@@ -333,7 +333,7 @@
       #cups = 36; # unused
       #foldingathome = 37; # unused
       #sabnzd = 38; # unused
-      #kdm = 39; # unused
+      #kdm = 39; # unused, even before 17.03
       ghostone = 40;
       git = 41;
       fourstore = 42;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index afaaccb01562..7c9c9ac2a1e9 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -559,7 +559,6 @@
   ./services/x11/display-managers/auto.nix
   ./services/x11/display-managers/default.nix
   ./services/x11/display-managers/gdm.nix
-  ./services/x11/display-managers/kdm.nix
   ./services/x11/display-managers/lightdm.nix
   ./services/x11/display-managers/sddm.nix
   ./services/x11/display-managers/slim.nix
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
deleted file mode 100644
index f0de9120c695..000000000000
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ /dev/null
@@ -1,202 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.kde4;
-  xorg = pkgs.xorg;
-  kde_workspace = config.services.xserver.desktopManager.kde4.kdeWorkspacePackage;
-
-  # Disable Nepomuk and Strigi by default.  As of KDE 4.7, they don't
-  # really work very well (e.g. searching files often fails to find
-  # files), segfault sometimes and consume significant resources.
-  # They can be re-enabled in the KDE System Settings under "Desktop
-  # Search".
-  disableNepomuk = pkgs.writeTextFile
-    { name = "nepomuk-config";
-      destination = "/share/config/nepomukserverrc";
-      text =
-        ''
-          [Basic Settings]
-          Start Nepomuk=false
-
-          [Service-nepomukstrigiservice]
-          autostart=false
-        '';
-    };
-
-  phononBackends = {
-    gstreamer = [
-      pkgs.phonon-backend-gstreamer
-      pkgs.gst_all.gstPluginsBase
-      pkgs.gst_all.gstPluginsGood
-      pkgs.gst_all.gstPluginsUgly
-      pkgs.gst_all.gstPluginsBad
-      pkgs.gst_all.gstFfmpeg # for mp3 playback
-      pkgs.gst_all.gstreamer # needed?
-    ];
-
-    vlc = [pkgs.phonon-backend-vlc];
-  };
-
-  phononBackendPackages = flip concatMap cfg.phononBackends
-    (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
-
-in
-
-{
-  options = {
-
-    services.xserver.desktopManager.kde4 = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable the KDE 4 desktop environment.";
-      };
-
-      phononBackends = mkOption {
-        type = types.listOf types.str;
-        default = ["gstreamer"];
-        example = ["gstreamer" "vlc"];
-        description = "Which phonon multimedia backend kde should use";
-      };
-
-      kdeWorkspacePackage = mkOption {
-        internal = true;
-        default = pkgs.kde4.kde_workspace;
-        defaultText = "pkgs.kde4.kde_workspace";
-        type = types.package;
-        description = "Custom kde-workspace, used for NixOS rebranding.";
-      };
-
-      enablePIM = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies.";
-      };
-
-      enableNepomuk = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable Nepomuk (deprecated).";
-      };
-    };
-  };
-
-
-  config = mkIf (xcfg.enable && cfg.enable) {
-    warnings = [
-      "KDE4 is long unmaintained and will be removed. Please update to KDE5."
-    ];
-
-    # If KDE 4 is enabled, make it the default desktop manager (unless
-    # overridden by the user's configuration).
-    # !!! doesn't work yet ("Multiple definitions. Only one is allowed
-    # for this option.")
-    # services.xserver.desktopManager.default = mkOverride 900 "kde4";
-
-    services.xserver.desktopManager.session = singleton
-      { name = "kde4";
-        bgSupport = true;
-        start =
-          ''
-            # The KDE icon cache is supposed to update itself
-            # automatically, but it uses the timestamp on the icon
-            # theme directory as a trigger.  Since in Nix the
-            # timestamp is always the same, this doesn't work.  So as
-            # a workaround, nuke the icon cache on login.  This isn't
-            # perfect, since it may require logging out after
-            # installing new applications to update the cache.
-            # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-            rm -fv $HOME/.kde/cache-*/icon-cache.kcache
-
-            # Qt writes a weird ‘libraryPath’ line to
-            # ~/.config/Trolltech.conf that causes the KDE plugin
-            # paths of previous KDE invocations to be searched.
-            # Obviously using mismatching KDE libraries is potentially
-            # disastrous, so here we nuke references to the Nix store
-            # in Trolltech.conf.  A better solution would be to stop
-            # Qt from doing this wackiness in the first place.
-            if [ -e $HOME/.config/Trolltech.conf ]; then
-                sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-            fi
-
-            # Load PulseAudio module for routing support.
-            # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
-            ${optionalString config.hardware.pulseaudio.enable ''
-              ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
-            ''}
-
-            # Start KDE.
-            exec ${kde_workspace}/bin/startkde
-          '';
-      };
-
-    security.setuidOwners = singleton
-      { program = "kcheckpass";
-        source = "${kde_workspace}/lib/kde4/libexec/kcheckpass";
-        owner = "root";
-        group = "root";
-        setuid = true;
-      };
-
-    environment.systemPackages =
-        [ pkgs.kde4.kdelibs
-
-          pkgs.kde4.kde_baseapps # Splitted kdebase
-          kde_workspace
-          pkgs.kde4.kde_runtime
-          pkgs.kde4.konsole
-          pkgs.kde4.kate
-
-          pkgs.kde4.kde_wallpapers # contains kdm's default background
-          pkgs.kde4.oxygen_icons
-
-          # Starts KDE's Polkit authentication agent.
-          pkgs.kde4.polkit_kde_agent
-
-          # Miscellaneous runtime dependencies.
-          pkgs.kde4.qt4 # needed for qdbus
-          pkgs.shared_mime_info
-          xorg.xmessage # so that startkde can show error messages
-          xorg.xset # used by startkde, non-essential
-          xorg.xauth # used by kdesu
-        ]
-      ++ optionals cfg.enablePIM
-        [ pkgs.kde4.kdepim_runtime
-          pkgs.kde4.akonadi
-          pkgs.mysql # used by akonadi
-        ]
-      ++ (if cfg.enableNepomuk then
-        [ pkgs.shared_desktop_ontologies # used by nepomuk
-          pkgs.strigi # used by nepomuk
-          pkgs.virtuoso # to enable Nepomuk to find Virtuoso
-        ] else
-        [ disableNepomuk ])
-      ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix  # Perhaps this should always be enabled
-      ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil
-      ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm
-      ++ phononBackendPackages;
-
-    environment.pathsToLink = [ "/share" ];
-
-    environment.profileRelativeEnvVars = mkIf (elem "gstreamer" cfg.phononBackends) {
-      GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
-    };
-
-    environment.etc = singleton
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      };
-
-    # Enable helpful DBus services.
-    services.udisks2.enable = true;
-    services.upower.enable = config.powerManagement.enable;
-
-    security.pam.services.kde = { allowNullPassword = true; };
-
-  };
-
-}
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 98d2d0ea834d..7418ce563578 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -55,9 +55,6 @@ let
         fi
       ''}
 
-      # Handle being called by kdm.
-      if test "''${1:0:1}" = /; then eval exec "$1"; fi
-
       # Start PulseAudio if enabled.
       ${optionalString (config.hardware.pulseaudio.enable) ''
         ${optionalString (!config.hardware.pulseaudio.systemWide)
diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix
deleted file mode 100644
index bfb763f2858d..000000000000
--- a/nixos/modules/services/x11/display-managers/kdm.nix
+++ /dev/null
@@ -1,161 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  dmcfg = config.services.xserver.displayManager;
-  cfg = dmcfg.kdm;
-
-  inherit (pkgs.kde4) kdebase_workspace;
-
-  defaultConfig =
-    ''
-      [Shutdown]
-      HaltCmd=${config.systemd.package}/sbin/shutdown -h now
-      RebootCmd=${config.systemd.package}/sbin/shutdown -r now
-      ${optionalString (config.system.boot.loader.id == "grub") ''
-        BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"}
-      ''}
-
-      [X-*-Core]
-      Xrdb=${pkgs.xorg.xrdb}/bin/xrdb
-      SessionsDirs=${dmcfg.session.desktops}
-      Session=${dmcfg.session.script}
-      FailsafeClient=${pkgs.xterm}/bin/xterm
-
-      [X-:*-Core]
-      ServerCmd=${dmcfg.xserverBin} ${toString dmcfg.xserverArgs}
-      # KDM calls `rm' somewhere to clean up some temporary directory.
-      SystemPath=${pkgs.coreutils}/bin
-      # The default timeout (15) is too short in a heavily loaded boot process.
-      ServerTimeout=60
-      # Needed to prevent the X server from dying on logout and not coming back:
-      TerminateServer=true
-      ${optionalString (cfg.setupScript != "")
-      ''
-        Setup=${cfg.setupScript}
-      ''}
-
-      [X-*-Greeter]
-      HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers}
-      PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so
-      ${optionalString (cfg.themeDirectory != null)
-      ''
-        UseTheme=true
-        Theme=${cfg.themeDirectory}
-      ''
-      }
-
-      ${optionalString (cfg.enableXDMCP)
-      ''
-        [Xdmcp]
-        Enable=true
-      ''}
-    '';
-
-  kdmrc = pkgs.runCommand "kdmrc"
-    { config = defaultConfig + cfg.extraConfig;
-      preferLocalBuild = true;
-    }
-    ''
-      echo "$config" > $out
-
-      # The default kdmrc would add "-nolisten tcp", and we already
-      # have that managed by nixos. Hence the grep.
-      cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out
-    '';
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.xserver.displayManager.kdm = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable the KDE display manager.
-        '';
-      };
-
-      enableXDMCP = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable XDMCP, which allows remote logins.
-        '';
-      };
-
-      themeDirectory = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          The path to a KDM theme directory. This theme
-          will be used by the KDM greeter.
-        '';
-      };
-
-      setupScript = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          The path to a KDM setup script. This script is run as root just
-          before KDM starts. Can be used for setting up
-          monitors with xrandr, for example.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Options appended to <filename>kdmrc</filename>, the
-          configuration file of KDM.
-        '';
-      };
-
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-    warnings = [
-      "KDM is long unmaintained and will be removed. Please update to SDDM."
-    ];
-
-    services.xserver.displayManager.slim.enable = false;
-
-    services.xserver.displayManager.job =
-      { execCmd =
-          ''
-            mkdir -m 0755 -p /var/lib/kdm
-            chown kdm /var/lib/kdm
-            ${(optionalString (config.system.boot.loader.id == "grub" && config.system.build.grub != null) "PATH=${config.system.build.grub}/sbin:$PATH ") +
-              "KDEDIRS=/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon -logfile /dev/stderr"}
-          '';
-        logsXsession = true;
-      };
-
-    security.pam.services.kde = { allowNullPassword = true; startSession = true; };
-
-    users.extraUsers = singleton
-      { name = "kdm";
-        uid = config.ids.uids.kdm;
-        description = "KDM user";
-      };
-
-    environment.systemPackages =
-      [ pkgs.kde4.kde_wallpapers ]; # contains kdm's default background
-
-  };
-
-}
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 24442ca12a30..f92b17720f65 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -256,8 +256,6 @@ else {
         # ‘grub-reboot’ sets a one-time saved entry, which we process here and
         # then delete.
         if [ \"\${next_entry}\" ]; then
-          # FIXME: KDM expects the next line to be present.
-          set default=\"\${saved_entry}\"
           set default=\"\${next_entry}\"
           set next_entry=
           save_env next_entry
diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 099ead3d846c..7f5b55d5cca0 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -123,15 +123,6 @@ let kernel = config.boot.kernelPackages.kernel; in
     users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.logToJournal = true;
-
-    # Bump kdm's X server start timeout to account for heavily loaded
-    # VM host systems.
-    services.xserver.displayManager.kdm.extraConfig =
-      ''
-        [X-:*-Core]
-        ServerTimeout=240
-      '';
-
   };
 
 }
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
deleted file mode 100644
index 9ecfe6870564..000000000000
--- a/nixos/tests/kde4.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: {
-  name = "kde4";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ domenkozar eelco chaoflow ];
-  };
-
-  machine =
-    { config, pkgs, ... }:
-
-    { imports = [ ./common/user-account.nix ];
-
-      virtualisation.memorySize = 1024;
-
-      services.xserver.enable = true;
-
-      services.httpd.enable = true;
-      services.httpd.adminAddr = "foo@example.org";
-      services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
-
-      services.xserver.displayManager.kdm.enable = true;
-      services.xserver.displayManager.kdm.extraConfig =
-        ''
-          [X-:0-Core]
-          AutoLoginEnable=true
-          AutoLoginUser=alice
-          AutoLoginPass=foobar
-        '';
-
-      services.xserver.desktopManager.kde4.enable = true;
-
-      # Include most of KDE. We don't really test these here, but at
-      # least they should build.
-      environment.systemPackages =
-        [ pkgs.kde4.kdemultimedia
-          pkgs.kde4.kdegraphics
-          pkgs.kde4.kdeutils
-          pkgs.kde4.kdegames
-          #pkgs.kde4.kdeedu
-          pkgs.kde4.kdeaccessibility
-          pkgs.kde4.kdeadmin
-          pkgs.kde4.kdenetwork
-          pkgs.kde4.kdetoys
-          pkgs.kde4.kdewebdev
-          pkgs.xorg.xmessage
-        ];
-    };
-
-  testScript = ''
-      $machine->waitUntilSucceeds("pgrep plasma-desktop");
-      $machine->succeed("xauth merge ~alice/.Xauthority");
-      $machine->waitForWindow(qr/plasma-desktop/);
-
-      # Check that logging in has given the user ownership of devices.
-      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-
-      $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
-      $machine->waitForWindow(qr/messages.*KWrite/);
-
-      $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
-      $machine->waitForWindow(qr/Valgrind.*Konqueror/);
-
-      $machine->execute("su - alice -c 'DISPLAY=:0.0 gwenview ${pkgs.kde4.kde_wallpapers}/share/wallpapers/Hanami/contents/images/1280x1024.jpg &'");
-      $machine->waitForWindow(qr/Gwenview/);
-
-      $machine->sleep(10);
-
-      $machine->screenshot("screen");
-    '';
-
-})

From b1a05a0865a6a7cfddb1dd5f6c0f32a91c20f473 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 11 Feb 2017 14:01:13 -0500
Subject: [PATCH 0183/3449] nixos: drop references to kde4

Excluding modules/programs/environment.nix for PATHand QT_PLUGIN_PATH to allow the programs to continue running.
---
 nixos/modules/services/hardware/bluetooth.nix           | 6 ++----
 nixos/modules/services/networking/quassel.nix           | 6 +++---
 nixos/modules/services/x11/desktop-managers/default.nix | 5 ++---
 nixos/modules/services/x11/desktop-managers/kde5.nix    | 4 ----
 nixos/release-combined.nix                              | 1 -
 nixos/release.nix                                       | 1 -
 6 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index ef2fce613f20..de0d48032113 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -2,9 +2,7 @@
 
 with lib;
 let
-  isBluez4 = config.services.xserver.desktopManager.kde4.enable;
-  bluez-bluetooth = if isBluez4 then pkgs.bluez4 else pkgs.bluez;
-
+  bluez-bluetooth = pkgs.bluez;
 in
 
 {
@@ -38,7 +36,7 @@ in
       aliases = [ "dbus-org.bluez.service" ];
     };
 
-    systemd.user.services.obex = mkIf (!isBluez4) {
+    systemd.user.services.obex = {
       aliases = [ "dbus-org.bluez.obex.service" ];
     };
 
diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index edcc12170b20..9b06cccca79e 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -25,12 +25,12 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.kde4.quasselDaemon;
-        defaultText = "pkgs.kde4.quasselDaemon";
+        default = pkgs.quasselDaemon_qt5;
+        defaultText = "pkgs.quasselDaemon_qt5";
         description = ''
           The package of the quassel daemon.
         '';
-        example = literalExample "pkgs.quasselDaemon";
+        example = literalExample "pkgs.quasselDaemon_qt5";
       };
 
       interfaces = mkOption {
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 144e4aada277..1f7a925ed054 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,9 +18,8 @@ in
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
   imports = [
-    ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix
-    ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix
-    ./kodi.nix
+    ./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix
+    ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
   ];
 
   options = {
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 8f081a1e9d2a..644fd8d77527 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -50,10 +50,6 @@ in
     })
 
     (mkIf (xcfg.enable && cfg.enable) {
-
-      warnings = optional config.services.xserver.desktopManager.kde4.enable
-        "KDE 4 should not be enabled at the same time as KDE 5";
-
       services.xserver.desktopManager.session = singleton {
         name = "kde5";
         bgSupport = true;
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 70b29aa23a5b..6c048e8a0aca 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -72,7 +72,6 @@ in rec {
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
-        (all nixos.tests.kde4)
         (all nixos.tests.kde5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
diff --git a/nixos/release.nix b/nixos/release.nix
index 0f298188c6c7..c061b9801a0c 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -255,7 +255,6 @@ in rec {
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
-  tests.kde4 = callTest tests/kde4.nix {};
   tests.kde5 = callTest tests/kde5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};

From 70d54cdbe393cf179a880a58c0ca6e8a108eb22a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 20:33:21 +0100
Subject: [PATCH 0184/3449] skrooge: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix
index 98c1c4c8b79f..42cc9b0c6eb1 100644
--- a/pkgs/applications/office/skrooge/2.nix
+++ b/pkgs/applications/office/skrooge/2.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp";
+    sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
   };
 
   nativeBuildInputs = [ cmake ecm makeQtWrapper ];

From 36d6a3041a3f8c23b1d439fcffb34402d5d220bf Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Tue, 7 Feb 2017 16:11:16 -0800
Subject: [PATCH 0185/3449] jimtcl: 0.76 -> 0.77

---
 pkgs/development/interpreters/jimtcl/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix
index 4ac9b6479560..3bef4996a4cc 100644
--- a/pkgs/development/interpreters/jimtcl/default.nix
+++ b/pkgs/development/interpreters/jimtcl/default.nix
@@ -1,20 +1,24 @@
 { stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }:
 
-stdenv.mkDerivation {
-  name = "jimtcl-0.76";
+let
+  makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL");
+
+in stdenv.mkDerivation rec {
+  name = "jimtcl-${version}";
+  version = "0.77";
 
   src = fetchFromGitHub {
     owner = "msteveb";
     repo = "jimtcl";
-    rev = "51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0";
-    sha256 = "00ldal1w9ysyfmx28xdcaz81vaazr1fqixxb2abk438yfpp1i9hq";
+    rev = version;
+    sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp";
   };
 
   buildInputs = [
     sqlite readline asciidoc SDL SDL_gfx
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
+  NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ];
 
   configureFlags = [
     "--with-ext=oo"

From 89db3a0bc6d54c8ff49d48c235d427b2bc68030a Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Sat, 11 Feb 2017 18:41:47 +0000
Subject: [PATCH 0186/3449] perlPackages.Swim: 0.1.44 -> 0.1.45

This patch updates the Perl package `Swim` (attribute path
`perlPackages.Swim`) from version 0.1.44 to version 0.1.45.

I have tested this patch per nixpkgs manual section 11.1 ("Making
patches").
---
 pkgs/top-level/perl-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6105fcf54aa5..f50d5dfe38d8 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11964,10 +11964,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Swim = buildPerlPackage rec {
-    name = "Swim-0.1.44";
+    name = "Swim-0.1.45";
     src = fetchurl {
       url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz";
-      sha256 = "06aac148d7b1778028ffae657fdf79b1093b52035661fd8b9bdad729dc8741aa";
+      sha256 = "3755ba1a02aee933c8e1de3995aca1523d6175291a1fa60c3f7fd477f5bb2469";
     };
     buildInputs = [ FileShareDirInstall ];
     propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ];

From a01f8a4c38d4958ff45abf3ff72c0d5066aaccfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 11 Feb 2017 22:14:49 +0100
Subject: [PATCH 0187/3449] glibc: security 2.24 -> 2.25

https://sourceware.org/ml/libc-alpha/2017-02/msg00079.html

Stripping was failing on libm.a; I don't know why.
---
 pkgs/development/libraries/glibc/common.nix  | 6 +++---
 pkgs/development/libraries/glibc/default.nix | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 32c1b3647372..7128f5606193 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -10,8 +10,8 @@ cross:
 , preConfigure ? "", ... }@args:
 
 let
-  version = "2.24";
-  sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by";
+  version = "2.25";
+  sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
 in
 
 assert cross != null -> gccCross != null;
@@ -138,7 +138,7 @@ stdenv.mkDerivation ({
     lib.optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
-    url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
+    url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index d6c496819da5..12996e1b9221 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -52,6 +52,7 @@ in
           # the .so It used to be a symlink, but now it is a script
           cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so
       fi
+      set -x
     '';
 
     postInstall = ''
@@ -81,7 +82,7 @@ in
       # to bootstrap-tools; on cross-arm this stripping would break objects.
       if [ -z "$crossConfig" ]; then
         for i in "$out"/lib/*.a; do
-            strip -S "$i"
+            [ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
         done
       fi
 

From c4fab214fae3c89c0c9505cedd6782892db8bcdb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 11 Feb 2017 22:16:10 +0100
Subject: [PATCH 0188/3449] blender: 2.78a -> 2.78b

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

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index e07fa1df5464..76810a6f2493 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -11,11 +11,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.78a";
+  name = "blender-2.78b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1";
+    sha256 = "0wgrqwznih6c19y2fpvrk3k6qsaxsy3g7xja87rb4hq7r7j8x22d";
   };
 
   buildInputs =

From cb4e8919c31a3ed79d01a44742a2b310d7568977 Mon Sep 17 00:00:00 2001
From: David Terry <davidterry@posteo.de>
Date: Sat, 11 Feb 2017 22:20:42 +0100
Subject: [PATCH 0189/3449] spotify: 1.0.47.13 -> 1.0.49.125

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index b678380f12dd..72514d7b67b0 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -6,7 +6,9 @@ assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
-  version = "1.0.48.103.g15edf1ec-94";
+  # Latest version number can be found at:
+  # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
+  version = "1.0.49.125.g72ee7853-83";
 
   deps = [
     alsaLib
@@ -51,7 +53,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "0rpwxgxv2ihfhlri98k4n87ynlcp569gm9q6hd8jg0vd2jgji8b3";
+      sha256 = "1sqi79yj503y4b7pfvr6xi0i8g7hj01hkhn0vpkc3y3jz5c0ih9g";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From 5b2a71fa250926010e6da0a6c6325dc1270770c1 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 11 Feb 2017 23:06:17 +0100
Subject: [PATCH 0190/3449] droopy: init at 20160830 (#22499)

---
 .../networking/droopy/default.nix             | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/networking/droopy/default.nix

diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix
new file mode 100644
index 000000000000..8be5ee3c775a
--- /dev/null
+++ b/pkgs/applications/networking/droopy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, wrapPython }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "droopy-${version}";
+  version = "20160830";
+
+  src = fetchFromGitHub {
+    owner = "stackp";
+    repo = "Droopy";
+    rev = "7a9c7bc46c4ff8b743755be86a9b29bd1a8ba1d9";
+    sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff";
+  };
+
+  nativeBuildInputs = [ wrapPython ];
+
+  installPhase = ''
+    install -vD droopy $out/bin/droopy
+    install -vD -m 644 man/droopy.1 $out/share/man/man1/droopy.1
+    wrapPythonPrograms
+  '';
+
+  meta = {
+    description = "Mini Web server that let others upload files to your computer";
+    homepage = http://stackp.online.fr/droopy;
+    license = licenses.bsd3;
+    maintainers = maintainers.profpatsch;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3de30ceee902..7beca5009f68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12881,6 +12881,10 @@ with pkgs;
 
   doodle = callPackage ../applications/search/doodle { };
 
+  droopy = callPackage ../applications/networking/droopy {
+    inherit (python3Packages) wrapPython;
+  };
+
   drumgizmo = callPackage ../applications/audio/drumgizmo { };
 
   dunst = callPackage ../applications/misc/dunst { };

From 1941a740c59769a261cef10dde7803dd0a98eac8 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Wed, 1 Feb 2017 21:53:40 -0500
Subject: [PATCH 0191/3449] cryptography: 1.5.3 -> 1.7.2

Also update cryptography-vectors
---
 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 0588ab5b3e2a..95ea727968df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4492,11 +4492,11 @@ in {
   cryptography = buildPythonPackage rec {
     # also bump cryptography_vectors
     name = "cryptography-${version}";
-    version = "1.5.3";
+    version = "1.7.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/cryptography/${name}.tar.gz";
-      sha256 = "cf82ddac919b587f5e44247579b433224cc2e03332d2ea4d89aa70d7e6b64ae5";
+      sha256 = "1ad9zmzi31fnz31qfchxcwiydvlxq88xndlgsvzr7m537n5vd347";
     };
 
     buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors
@@ -4513,11 +4513,11 @@ in {
   cryptography_vectors = buildPythonPackage rec {
       # also bump cryptography
     name = "cryptography_vectors-${version}";
-    version = "1.5.3";
+    version = "1.7.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz";
-      sha256 = "e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae";
+      sha256 = "1p5cw3dzgcpzmp81qb9860hn9qlcvr4rnf0fy31fbvhxl7lfxr2b";
     };
   };
 

From 947c26972b8451e0f00839c9b0e9cfd321e152d4 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Sat, 11 Feb 2017 16:13:29 -0600
Subject: [PATCH 0192/3449] LLVM: Fix licensing metadata, closes #22679.
 (#22681)

* All projects are available under NCSA license,
  other than dragonegg.
* "Runtime" projects are dual-licensed under
  both NCSA and MIT:
  libc++, libc++abi, compiler-rt
* I don't mention MIT for compiler-rt as
  we only build it as part of LLVM.
---
 pkgs/development/compilers/llvm/3.4/clang.nix             | 2 +-
 pkgs/development/compilers/llvm/3.4/lld.nix               | 2 +-
 pkgs/development/compilers/llvm/3.4/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.4/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.4/polly.nix             | 2 +-
 pkgs/development/compilers/llvm/3.5/clang.nix             | 2 +-
 pkgs/development/compilers/llvm/3.5/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.5/libc++abi/default.nix | 2 +-
 pkgs/development/compilers/llvm/3.5/lld.nix               | 2 +-
 pkgs/development/compilers/llvm/3.5/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.5/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.5/polly.nix             | 2 +-
 pkgs/development/compilers/llvm/3.7/clang/default.nix     | 2 +-
 pkgs/development/compilers/llvm/3.7/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.7/libc++abi.nix         | 2 +-
 pkgs/development/compilers/llvm/3.7/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.7/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.8/clang/default.nix     | 2 +-
 pkgs/development/compilers/llvm/3.8/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.8/libc++abi.nix         | 2 +-
 pkgs/development/compilers/llvm/3.8/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.8/llvm.nix              | 2 +-
 pkgs/development/compilers/llvm/3.9/clang/default.nix     | 2 +-
 pkgs/development/compilers/llvm/3.9/libc++/default.nix    | 2 +-
 pkgs/development/compilers/llvm/3.9/libc++abi.nix         | 2 +-
 pkgs/development/compilers/llvm/3.9/lldb.nix              | 2 +-
 pkgs/development/compilers/llvm/3.9/llvm.nix              | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index b05496eabf26..741ecc3856f8 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix
index c1841610f314..0398a5a543ad 100644
--- a/pkgs/development/compilers/llvm/3.4/lld.nix
+++ b/pkgs/development/compilers/llvm/3.4/lld.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A set of modular code for creating linker tools";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix
index a50f95365423..c5ed82f53e57 100644
--- a/pkgs/development/compilers/llvm/3.4/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.4/lldb.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 54346baba0d4..0a18f7e01cf6 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -67,7 +67,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix
index 3d3483afafaa..1ea806a1266d 100644
--- a/pkgs/development/compilers/llvm/3.4/polly.nix
+++ b/pkgs/development/compilers/llvm/3.4/polly.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A polyhedral optimizer for llvm";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index d11259c82f07..f15c989ef510 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
   meta = {
     description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 476fc7bcd43f..abc198b06864 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
index 963caf809708..268f2702a234 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix
index 7ee90818ac99..4a398bd96a05 100644
--- a/pkgs/development/compilers/llvm/3.5/lld.nix
+++ b/pkgs/development/compilers/llvm/3.5/lld.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A set of modular code for creating linker tools";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix
index bbffa1a9a938..a5161333b282 100644
--- a/pkgs/development/compilers/llvm/3.5/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.5/lldb.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
     broken = true;
   };
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 4f54f1438a7c..8bb5a6c684bb 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -72,7 +72,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix
index 42b3fd74e6c8..bacf4d30556b 100644
--- a/pkgs/development/compilers/llvm/3.5/polly.nix
+++ b/pkgs/development/compilers/llvm/3.5/polly.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A polyhedral optimizer for llvm";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index 6c1a89cf60a9..535dbbc93d51 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -49,7 +49,7 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = http://llvm.org/;
-      license     = stdenv.lib.licenses.bsd3;
+      license     = stdenv.lib.licenses.ncsa;
       platforms   = stdenv.lib.platforms.all;
     };
   };
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
index 1196645b923e..69ce87bcbf30 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
index ec0be51a11cf..6a62a6256b4f 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix
index 36f9cb1f1398..294410f99869 100644
--- a/pkgs/development/compilers/llvm/3.7/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.7/lldb.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index c674b959c787..d4e7c73ad0de 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -83,7 +83,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 6052246dad07..41e515249eb3 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -60,7 +60,7 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = http://llvm.org/;
-      license     = stdenv.lib.licenses.bsd3;
+      license     = stdenv.lib.licenses.ncsa;
       platforms   = stdenv.lib.platforms.all;
     };
   };
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index 15f7ee1e3e4a..e4198599904c 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
index 61ff6341c30a..6b98a5726cf6 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix
index fe0dcfc83060..d27786464c05 100644
--- a/pkgs/development/compilers/llvm/3.8/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.8/lldb.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index fa647e62ff14..9394179a8f94 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -85,7 +85,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index e6c804c96b1f..677c4a526ea4 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -49,7 +49,7 @@ let
     meta = {
       description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
       homepage    = http://llvm.org/;
-      license     = stdenv.lib.licenses.bsd3;
+      license     = stdenv.lib.licenses.ncsa;
       platforms   = stdenv.lib.platforms.all;
     };
   };
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index 7a53ffa0d8fc..f656f553f16b 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://libcxx.llvm.org/;
     description = "A new implementation of the C++ standard library, targeting C++11";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
index aff4205d6a96..1ad2cb102950 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://libcxxabi.llvm.org/;
     description = "A new implementation of low level support for a standard C++ library";
-    license = "BSD";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
     maintainers = with stdenv.lib.maintainers; [ vlstill ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix
index 5d8878b3b06d..52f27de8cdb5 100644
--- a/pkgs/development/compilers/llvm/3.9/lldb.nix
+++ b/pkgs/development/compilers/llvm/3.9/lldb.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     platforms   = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index b64cf4fed5b0..e1edbf5d0e70 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -109,7 +109,7 @@ in stdenv.mkDerivation rec {
   meta = {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.bsd3;
+    license     = stdenv.lib.licenses.ncsa;
     maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
     platforms   = stdenv.lib.platforms.all;
   };

From c3e3b6a19ab8a2082197d8076da75de95568e3a1 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Sat, 11 Feb 2017 14:29:37 -0800
Subject: [PATCH 0193/3449] nvidia-x11: fix parallel building variable name

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 523396faf3d1..7dee6b4776c1 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -21,7 +21,7 @@ buildPhase() {
         sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source)
         sysOut=$(echo $kernel/lib/modules/$kernelVersion/build)
         unset src # used by the nv makefile
-        make SYSSRC=$sysSrc SYSOUT=$sysOut module
+        make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES
 
         cd ..
     fi

From 35d06e947f761b3e92e063e9323a4cff4892045f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 11 Feb 2017 23:35:59 +0100
Subject: [PATCH 0194/3449] python-packages: bump osc to fix bug with NixOS's
 default $PAGER setting

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ddaa2a4fc1a..40201bc6047d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16685,8 +16685,8 @@ in {
     src = pkgs.fetchFromGitHub {
       owner = "openSUSE";
       repo = "osc";
-      rev = "9e6d1a592e89e8ee9fd40a96cfcf97bf74f68715";
-      sha256 = "13svha5zh1xn3jv4kn9h3d620p65qh5nnhhghjbscp9lzlwwba3g";
+      rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9";
+      sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z";
     };
     propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
     postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";

From 0045f932bba018345cbb2f03bb5d4d17d01850b1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 11 Feb 2017 20:58:53 +0000
Subject: [PATCH 0195/3449] proj: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index bc9178f6367a..8fceacd870a4 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "proj-4.9.2";
+  name = "proj-4.9.3";
 
   src = fetchurl {
-    url = http://download.osgeo.org/proj/proj-4.9.2.tar.gz;
-    sha256 = "15kpcmz3qjxfrs6vq48mgyvb4vxscmwgkzrdcn71a60wxp8rmgv0";
+    url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz;
+    sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139";
   };
 
   doCheck = true;

From c19b17d14ff25a86bc4b563999bfa3569344d16a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 17 Jan 2017 11:19:39 +0000
Subject: [PATCH 0196/3449] raspberryPi boot loader: fix booting Raspberry Pi 3

The Raspberry Pi 3 seems to need the .DTB file when booting the kernel,
so we must copy it to /boot when installing a new kernel.
---
 .../system/boot/loader/raspberrypi/builder.sh        | 12 +++++++++---
 .../system/boot/loader/raspberrypi/raspberrypi.nix   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
index ccb88ca1c529..1a02bf231709 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
@@ -61,12 +61,13 @@ addEntry() {
 
     local kernel=$(readlink -f $path/kernel)
     local initrd=$(readlink -f $path/initrd)
+    local dtb_path=$(readlink -f $path/kernel-modules/dtbs)
 
     if test -n "@copyKernels@"; then
         copyToKernelsDir $kernel; kernel=$result
         copyToKernelsDir $initrd; initrd=$result
     fi
-    
+
     echo $(readlink -f $path) > $outdir/$generation-system
     echo $(readlink -f $path/init) > $outdir/$generation-init
     cp $path/kernel-params $outdir/$generation-cmdline.txt
@@ -80,6 +81,11 @@ addEntry() {
         copyForced $kernel /boot/kernel7.img
       fi
       copyForced $initrd /boot/initrd
+      for dtb in $dtb_path/bcm*.dtb; do
+        dst="/boot/$(basename $dtb)"
+        copyForced $dtb "$dst"
+        filesCopied[$dst]=1
+      done
       cp "$(readlink -f "$path/init")" /boot/nixos-init
       echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt
 
@@ -108,8 +114,8 @@ copyForced $fwdir/start_cd.elf  /boot/start_cd.elf
 copyForced $fwdir/start_db.elf  /boot/start_db.elf
 copyForced $fwdir/start_x.elf   /boot/start_x.elf
 
-# Remove obsolete files from /boot/old.
-for fn in /boot/old/*linux* /boot/old/*initrd*; do
+# Remove obsolete files from /boot and /boot/old.
+for fn in /boot/old/*linux* /boot/old/*initrd* /boot/bcm*.dtb; do
     if ! test "${filesCopied[$fn]}" = 1; then
         rm -vf -- "$fn"
     fi
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index eb8ea6130972..f246d04284ca 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -33,7 +33,7 @@ in
 
     boot.loader.raspberryPi.version = mkOption {
       default = 2;
-      type = types.enum [ 1 2 ];
+      type = types.enum [ 1 2 3 ];
       description = ''
       '';
     };

From 123cbd40c244c84a1caebce9082aa3704be7f57c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 19 Jan 2017 14:10:03 +0100
Subject: [PATCH 0197/3449] raspberryPi boot loader: don't remove xx-initrd
 files

The Raspberry Pi boot loader was deleting all xx-initrd text files
(which simply contain the path to the actual initrd files) just after
having created them. The code was actually trying to delete real,
obsolete initrd files, which are named <hash>-initrd-initrd (after path
cleaning), but the glob was catching the other files as well.
---
 nixos/modules/system/boot/loader/raspberrypi/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
index 1a02bf231709..f627d093eafb 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
@@ -115,7 +115,7 @@ copyForced $fwdir/start_db.elf  /boot/start_db.elf
 copyForced $fwdir/start_x.elf   /boot/start_x.elf
 
 # Remove obsolete files from /boot and /boot/old.
-for fn in /boot/old/*linux* /boot/old/*initrd* /boot/bcm*.dtb; do
+for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do
     if ! test "${filesCopied[$fn]}" = 1; then
         rm -vf -- "$fn"
     fi

From 5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 02:31:21 +0100
Subject: [PATCH 0198/3449] libidn2: fix darwin build

cc #22595
---
 .../development/libraries/libidn2/default.nix |  8 +++--
 .../libraries/libidn2/fix-error-darwin.patch  | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libidn2/fix-error-darwin.patch

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 083b04d4b093..ea26f480cd12 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -1,4 +1,6 @@
-{ fetchurl, stdenv, libiconv, libunistring }:
+{ fetchurl, stdenv, libiconv, libunistring, help2man }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-0.16";
@@ -10,8 +12,10 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];
 
+  patches = optional stdenv.isDarwin ./fix-error-darwin.patch;
+
   buildInputs = [ libunistring ]
-    ++ stdenv.lib.optional stdenv.isDarwin libiconv;
+    ++ optionals stdenv.isDarwin [ libiconv help2man ];
 
   meta = {
     homepage = "https://www.gnu.org/software/libidn/#libidn2";
diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/development/libraries/libidn2/fix-error-darwin.patch
new file mode 100644
index 000000000000..db3edd6e4a08
--- /dev/null
+++ b/pkgs/development/libraries/libidn2/fix-error-darwin.patch
@@ -0,0 +1,31 @@
+diff --git a/src/idn2.c b/src/idn2.c
+index 6abbc72..804f0f2 100644
+--- a/src/idn2.c
++++ b/src/idn2.c
+@@ -31,7 +31,6 @@
+ #include <unistr.h>
+ 
+ /* Gnulib headers. */
+-#include "error.h"
+ #include "gettext.h"
+ #define _(String) dgettext (PACKAGE, String)
+ #include "progname.h"
+@@ -161,9 +160,7 @@ process_input (char *readbuf, int flags)
+       free (output);
+     }
+   else
+-    error (EXIT_FAILURE, 0, "%s: %s",
+-	   args_info.register_given ? "register" : "lookup",
+-	   idn2_strerror (rc));
++    perror (idn2_strerror (rc));
+ }
+ 
+ int
+@@ -222,7 +219,7 @@ main (int argc, char *argv[])
+     }
+ 
+   if (ferror (stdin))
+-    error (EXIT_FAILURE, errno, "%s", _("input error"));
++    perror (_("input error"));
+ 
+   cmdline_parser_free (&args_info);

From e9a5ec099efe3769f0e4c7d8093c74255dcfbeff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 02:52:25 +0100
Subject: [PATCH 0199/3449] wget: 1.19 -> 1.19.1

Fixes build on darwin.

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

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index 60edc1ad16fa..f024c637c341 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,11 @@
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.19";
+  name = "wget-1.19.1";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.xz";
-    sha256 = "1133c14g19ysv74j7am66jwgwrr0rdn0rdyxw7rikbnsyjxmf48g";
+    sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c";
   };
 
   patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];

From 6651c72df1c4c47d36e67fe59dcf3c50e75c5383 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 11 Feb 2017 21:01:56 -0500
Subject: [PATCH 0200/3449] proofgeneral_HEAD: Bump

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

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index a6ccd4f631d5..fabf8ac4ce4c 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation (rec {
 
   src = fetchgit {
     url = "https://github.com/ProofGeneral/PG.git";
-    rev = "64ca55b1593fff8cfffab89c51d7e92c1a68dc27";
-    sha256 = "1gz13fagxf0w2zgp7qd0w328qiv97295jwq7ra8vj61pdfi8xklj";
+    rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4";
+    sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64";
   };
 
   buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;

From 6b2ea7ec6ee968b9613ce06a3e8e182c1a281de9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Feb 2017 10:12:16 +0800
Subject: [PATCH 0201/3449] diskscan: init at 0.19

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

diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix
new file mode 100644
index 000000000000..e1024d70bce9
--- /dev/null
+++ b/pkgs/tools/misc/diskscan/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cmake, ncurses, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "diskscan-${version}";
+  version = "0.19";
+
+  src = fetchFromGitHub {
+    owner  = "baruch";
+    repo   = "diskscan";
+    rev    = "${version}";
+    sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra";
+  };
+
+  buildInputs = [ ncurses zlib ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/baruch/diskscan;
+    description = "Scan HDD/SSD for failed and near failed sectors";
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ peterhoeg ];
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7beca5009f68..1d7d103c00a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -816,6 +816,8 @@ with pkgs;
 
   discount = callPackage ../tools/text/discount { };
 
+  diskscan = callPackage ../tools/misc/diskscan { };
+
   disorderfs = callPackage ../tools/filesystems/disorderfs {
     asciidoc = asciidoc-full;
   };

From f6dd263d4244b832a761c808597cf00b2688f4af Mon Sep 17 00:00:00 2001
From: Changlin Li <mail@changlinli.com>
Date: Sun, 12 Feb 2017 01:00:29 -0500
Subject: [PATCH 0202/3449] bfg-repo-cleaner: init at 1.12.15

---
 lib/maintainers.nix                           |  1 +
 .../bfg-repo-cleaner/default.nix              | 49 +++++++++++++++++++
 .../git-and-tools/default.nix                 |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8c778921fac2..151674087862 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -87,6 +87,7 @@
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   chattered = "Phil Scott <me@philscotted.com>";
+  changlinli = "Changlin Li <mail@changlinli.com>";
   choochootrain = "Hurshal Patel <hurshal@imap.cc>";
   chris-martin = "Chris Martin <ch.martin@gmail.com>";
   chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
new file mode 100644
index 000000000000..b2324581244a
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+let
+  version = "1.12.15";
+  jarName = "bfg-${version}.jar";
+  mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}";
+in
+  stdenv.mkDerivation {
+    inherit version jarName;
+
+    name = "bfg-repo-cleaner";
+
+    src = fetchurl {
+      url = mavenUrl;
+      sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik";
+    };
+
+    buildInputs = [ jre makeWrapper ];
+
+    phases = "installPhase";
+
+    installPhase = ''
+      mkdir -p $out/share/java
+      mkdir -p $out/bin
+      cp $src $out/share/java/$jarName
+      makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main"
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = "https://rtyley.github.io/bfg-repo-cleaner/";
+      # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner
+      description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster";
+      longDescription = ''
+        The BFG is a simpler, faster alternative to git-filter-branch for
+        cleansing bad data out of your Git repository history, in particular removing
+        crazy big files and removing passwords, credentials, and other private data.
+
+        The git-filter-branch command is enormously powerful and can do things
+        that the BFG can't - but the BFG is much better for the tasks above, because
+        it's faster (10-720x), simpler (dedicated to just removing things), and
+        beautiful (can use Scala instead of bash to script customizations).
+      '';
+      license = licenses.gpl3;
+      maintainers = [ maintainers.changlinli ];
+      platforms = platforms.unix;
+      downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}";
+    };
+
+  }
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 975c83c6e979..d68b1e41c8d5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -22,6 +22,8 @@ in
 rec {
   # Try to keep this generally alphabetized
 
+  bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { };
+
   bitbucket-server-cli = callPackage ./bitbucket-server-cli { };
 
   darcsToGit = callPackage ./darcs-to-git { };

From c07f1589bf91f35e9e72536e660c0d1ba39285e6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 12 Feb 2017 09:10:35 +0000
Subject: [PATCH 0203/3449] Make azure-mgmt-resource work with requests 2.11.x.
 We should update the azure python packages, however, that is a much bigger
 effort. This is needed to make sure nixops keeps working with Azure.

(cherry picked from commit 81f2bde0a2af99d84666628fae89af648ce2fa3e)
---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40201bc6047d..d49fcc8613c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1762,6 +1762,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip;
       sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py

From 9ed445a0f780c00043adc3e6457f9db518cd1814 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 11 Feb 2017 16:48:58 +0200
Subject: [PATCH 0204/3449] wineUnstable: 2.0 -> 2.1

---
 pkgs/misc/emulators/wine/sources.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e86c6bef05a7..e8409a631c3c 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,23 +31,23 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "2.0";
-    url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2";
-    sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp";
+    version = "2.1";
+    url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
+    sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "02jrdm49zlc0f357m0z65pilmg4lxh16va32ll3p4y8vr13nwawk";
+    sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20170101";
-    sha256 = "0c2aam68x3nlvc6f4r6rnfw6y3a86644zb0qirwkmh3p04mpdl39";
+    version = "20170207";
+    sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From a74d1594f1db7ae22179dec4ab32fe2c324524e8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sun, 12 Feb 2017 09:23:52 +0000
Subject: [PATCH 0205/3449] Make azure-mgmt-... work with requests 2.11.x. We
 should update the azure python packages, however, that is a much bigger
 effort. This is needed to make sure nixops keeps working with Azure.

(cherry picked from commit 4eb92c5c64906a5142e7cb34bdcfc7e16ab77dd1)
---
 pkgs/top-level/python-packages.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d49fcc8613c2..985ab3ae6bec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1706,6 +1706,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip;
       sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
@@ -1726,6 +1731,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip;
       sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py
@@ -1787,6 +1797,11 @@ in {
       url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip;
       sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim";
     };
+    preConfigure = ''
+      # Patch to make this package work on requests >= 2.11.x
+      # CAN BE REMOVED ON NEXT PACKAGE UPDATE
+      sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py
+    '';
     postInstall = ''
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py
       echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py

From bee23d7dfc944de82a1b6945294567ed98f964d2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:27:36 +0100
Subject: [PATCH 0206/3449] pythonPackages.argparse: only for Python < 2.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 985ab3ae6bec..0b4e5cb462cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1321,7 +1321,7 @@ in {
 
   };
 
-  argparse = buildPythonPackage (rec {
+  argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec {
     name = "argparse-1.4.0";
 
     src = pkgs.fetchurl {

From 12c62d9cd81899d4e936726829755d9a8150c5e8 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 8 Feb 2017 18:31:32 +0100
Subject: [PATCH 0207/3449] xfce4-mailwatch-plugin: init at 1.2.0

---
 pkgs/desktops/xfce/default.nix                |  5 ++--
 .../panel-plugins/xfce4-mailwatch-plugin.nix  | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index ace5f289ab4d..597829db960b 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -32,9 +32,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   thunar          = callPackage ./core/thunar.nix { };
   thunarx-2-dev   = thunar-build; # Plugins need only the `thunarx-2` part of the package. Awaiting multiple outputs.
   thunar_volman   = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
-  thunar-archive-plugin 
+  thunar-archive-plugin
                   = callPackage ./thunar-plugins/archive { };
-  thunar-dropbox-plugin 
+  thunar-dropbox-plugin
                   = callPackage ./thunar-plugins/dropbox { };
   tumbler         = callPackage ./core/tumbler.nix { };
   xfce4panel      = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
@@ -89,6 +89,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
   xfce4_netload_plugin          = callPackage ./panel-plugins/xfce4-netload-plugin.nix          { };
   xfce4_notes_plugin            = callPackage ./panel-plugins/xfce4-notes-plugin.nix            { };
+  xfce4_mailwatch_plugin        = callPackage ./panel-plugins/xfce4-mailwatch-plugin.nix        { };
   xfce4-sensors-plugin          = callPackage ./panel-plugins/xfce4-sensors-plugin.nix          { };
   xfce4_systemload_plugin       = callPackage ./panel-plugins/xfce4-systemload-plugin.nix       { };
   xfce4_verve_plugin            = callPackage ./panel-plugins/xfce4-verve-plugin.nix            { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
new file mode 100644
index 000000000000..9aa6593e2263
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui,
+libxfcegui4, xfconf, gtk, exo}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-mailwatch-plugin";
+  ver_maj = "1.2";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel
+    libxfcegui4 xfconf gtk exo ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Mailwatch plugin for Xfce panel";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}

From af9857ef47b6afa68b8631f3b5e7299e60a8764f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 12 Feb 2017 09:59:23 +0000
Subject: [PATCH 0208/3449] proj: disable tests on 32 bit

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

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 8fceacd870a4..b92aa49a092e 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139";
   };
 
-  doCheck = true;
+  doCheck = stdenv.is64bit;
 
   meta = with stdenv.lib; {
     description = "Cartographic Projections Library";

From ab5fe171af14ae61b4dfab07b2c6b2ad9b3729be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 11:14:45 +0100
Subject: [PATCH 0209/3449] fontconfig: patch to build with glibc-2.25

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

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 0130ee2a014b..58ca7c41891a 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -28,7 +28,16 @@ stdenv.mkDerivation rec {
       src = ./config-compat.patch;
       inherit configVersion;
     })
+    (fetchpatch {
+      name = "glibc-2.25.diff";
+      url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
+      sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
+    })
   ];
+  # additionally required for the glibc-2.25 patch
+  postPatch = ''
+    sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
+  '';
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 

From 543721d766af9980f4a47225128936a3cdf5ebe5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 11:27:13 +0100
Subject: [PATCH 0210/3449] Revert "pythonPackages.argparse: only for Python <
 2.7"

Mass-rebuild, goes into staging.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b4e5cb462cc..985ab3ae6bec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1321,7 +1321,7 @@ in {
 
   };
 
-  argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec {
+  argparse = buildPythonPackage (rec {
     name = "argparse-1.4.0";
 
     src = pkgs.fetchurl {

From 12d9eac8f050dda7a0dce726d438cc38ff6b6f8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:27:36 +0100
Subject: [PATCH 0211/3449] pythonPackages.argparse: only for Python < 2.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0588ab5b3e2a..1a67e14a35a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1321,7 +1321,7 @@ in {
 
   };
 
-  argparse = buildPythonPackage (rec {
+  argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec {
     name = "argparse-1.4.0";
 
     src = pkgs.fetchurl {

From 5b1a1b0e50995d5d8ff11b7986bbc85aa800b4ce Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 11:32:02 +0100
Subject: [PATCH 0212/3449] pythonPackages.afew: 2016-02-29 -> 2017-02-08

Failed to build because sha256 of the source tarball changed.
---
 pkgs/top-level/python-packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 985ab3ae6bec..858981697291 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -551,13 +551,13 @@ in {
   };
 
   afew = buildPythonPackage rec {
-    rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128";
-    name = "afew-git-2016-02-29";
+    name = "afew-git-2017-02-08";
 
-    src = pkgs.fetchurl {
-      url = "https://github.com/teythoon/afew/tarball/${rev}";
-      name = "${name}.tar.bz";
-      sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k";
+    src = pkgs.fetchFromGitHub {
+      owner = "afewmail";
+      repo = "afew";
+      rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67";
+      sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm";
     };
 
     buildInputs = with self; [ pkgs.dbacl ];

From 9960f7e9f8e94756c3321951cac1034d9a14421e Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@gmail.com>
Date: Sun, 12 Feb 2017 11:41:47 +0100
Subject: [PATCH 0213/3449] flow: 0.37.4 -> 0.39.0

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 4e15ed8572ea..a63e9f65e5cb 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
+{ stdenv, fetchFromGitHub, lib, ocaml_4_02, libelf, cf-private, CoreServices }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.37.4";
+  version = "0.39.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0v3hi2wn4ysybmd768wdmijlbnq41i6yzzzj5d7cmd4blzd9c0nq";
+    sha256 = "05a0kvhlakm7c7n19npg77rj52cz6282290126sfn0qq2059zhli";
   };
 
   installPhase = ''
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml libelf ]
+  buildInputs = [ ocaml_4_02 libelf ]
     ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {

From a7ca11454533b0b2f2d9fb4c481e9db5f3313486 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 10 Feb 2017 12:03:14 +0100
Subject: [PATCH 0214/3449] libretro: add mGBA core

Closes #22618.
---
 pkgs/misc/emulators/retroarch/cores.nix | 10 ++++++++++
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 8247f95f9da7..50f73d6f4e6e 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -182,6 +182,16 @@ in
     buildPhase = "make";
   };
 
+  mgba = mkLibRetroCore rec {
+    core = "mgba";
+    src = fetchRetro {
+      repo = core;
+      rev = "4000128339b535896615c994cafcd777637573f4";
+      sha256 = "1yar78rvgfqx7jdna9chkmmbnpcf7k9ckbzj506f7k7m7zv819fn";
+    };
+    description = "Port of mGBA to libretro";
+  };
+
   mupen64plus = (mkLibRetroCore rec {
     core = "mupen64plus";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d7d103c00a5..2a4823882908 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15615,6 +15615,7 @@ with pkgs;
       ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast
       ++ optional (cfg.enableMednafenPSX or false) mednafen-psx
       ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn
+      ++ optional (cfg.enableMGBA or false) mgba
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia
       ++ optional (cfg.enablePicodrive or false) picodrive

From ffefd8389775f8d256ca6dddcfd4573d12a8ee71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 12:50:04 +0100
Subject: [PATCH 0215/3449] xorg xf86-video-*: bump drivers that seem unused

I verified they build, at least with xorg-server-1.19.1.
---
 pkgs/servers/x11/xorg/default.nix       | 72 ++++++++++++-------------
 pkgs/servers/x11/xorg/overrides.nix     |  8 ---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 24 ++++-----
 3 files changed, 48 insertions(+), 56 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b825d86ac8df..285c4504280c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1714,11 +1714,11 @@ let
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videochips = (mkDerivation "xf86videochips" {
-    name = "xf86-video-chips-1.2.6";
+    name = "xf86-video-chips-1.2.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2;
-      sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr";
+      url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2;
+      sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1736,11 +1736,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videodummy = (mkDerivation "xf86videodummy" {
-    name = "xf86-video-dummy-0.3.7";
+    name = "xf86-video-dummy-0.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2;
-      sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
+      url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2;
+      sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1780,11 +1780,11 @@ let
   }) // {inherit xextproto xorgserver xproto ;};
 
   xf86videoglint = (mkDerivation "xf86videoglint" {
-    name = "xf86-video-glint-1.2.8";
+    name = "xf86-video-glint-1.2.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2;
-      sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
+      url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2;
+      sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1802,11 +1802,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoi740 = (mkDerivation "xf86videoi740" {
-    name = "xf86-video-i740-1.3.5";
+    name = "xf86-video-i740-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2;
-      sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w";
+      url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2;
+      sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1836,11 +1836,11 @@ let
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomga = (mkDerivation "xf86videomga" {
-    name = "xf86-video-mga-1.6.4";
+    name = "xf86-video-mga-1.6.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2;
-      sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8";
+      url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2;
+      sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1880,11 +1880,11 @@ let
   }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videonv = (mkDerivation "xf86videonv" {
-    name = "xf86-video-nv-2.1.20";
+    name = "xf86-video-nv-2.1.21";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2;
-      sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
+      url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2;
+      sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1913,11 +1913,11 @@ let
   }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
   xf86videor128 = (mkDerivation "xf86videor128" {
-    name = "xf86-video-r128-6.10.0";
+    name = "xf86-video-r128-6.10.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2;
-      sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0";
+      url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2;
+      sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -1946,33 +1946,33 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videosavage = (mkDerivation "xf86videosavage" {
-    name = "xf86-video-savage-2.3.8";
+    name = "xf86-video-savage-2.3.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2;
-      sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx";
+      url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2;
+      sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
-    name = "xf86-video-siliconmotion-1.7.8";
+    name = "xf86-video-siliconmotion-1.7.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2;
-      sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79";
+      url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2;
+      sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
   xf86videosis = (mkDerivation "xf86videosis" {
-    name = "xf86-video-sis-0.10.8";
+    name = "xf86-video-sis-0.10.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2;
-      sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8";
+      url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2;
+      sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -2001,11 +2001,11 @@ let
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
   xf86videotdfx = (mkDerivation "xf86videotdfx" {
-    name = "xf86-video-tdfx-1.4.6";
+    name = "xf86-video-tdfx-1.4.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2;
-      sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is";
+      url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2;
+      sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
@@ -2023,11 +2023,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
   xf86videotrident = (mkDerivation "xf86videotrident" {
-    name = "xf86-video-trident-1.3.7";
+    name = "xf86-video-trident-1.3.8";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2;
-      sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc";
+      url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2;
+      sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 3ae7b481978b..d706a0963214 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -338,7 +338,6 @@ in
   xf86videoark        = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videogeode      = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videoglide      = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
-  xf86videoglint      = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videoi128       = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videonewport    = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
   xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; };
@@ -355,13 +354,6 @@ in
     NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver.dev or xorg.xorgserver}/include/xorg";
   };
 
-  xf86videonv = attrs: attrs // {
-    patches = [( args.fetchpatch {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da;
-      sha256 = "0i2ddgqwj6cfnk8f4r73kkq3cna7hfnz7k3xj3ifx5v8mfiva6gw";
-    })];
-  };
-
   xf86videovmware = attrs: attrs // {
     buildInputs =  attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker
   };
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index c0d2065a9ff3..143411304db1 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -132,34 +132,34 @@ mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2
-mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2
+mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2
 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2
 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2
+mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
-mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2
+mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2
+mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
-mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
+mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2
 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
-mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2
-mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2
-mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2
+mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2
+mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
-mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2
+mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2

From e970b8e8df6bffcbbea2a1bd58a6efb5ac35e286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:00:37 +0100
Subject: [PATCH 0216/3449] xorg xf86-input-evdev: 2.10.3 -> 2.10.5

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 285c4504280c..c1b97ccc1470 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1571,11 +1571,11 @@ let
   }) // {inherit ;};
 
   xf86inputevdev = (mkDerivation "xf86inputevdev" {
-    name = "xf86-input-evdev-2.10.3";
+    name = "xf86-input-evdev-2.10.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2;
-      sha256 = "18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2;
+      sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 143411304db1..c5d4fda1aa2c 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -119,7 +119,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2

From 53600eae3d5fb884c884ae14fc8776691fbcb7f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:01:24 +0100
Subject: [PATCH 0217/3449] xorg xf86-input-libinput: 0.19.1 -> 0.23.0

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c1b97ccc1470..19f31fa3d0ea 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1604,11 +1604,11 @@ let
   }) // {inherit inputproto xorgserver xproto ;};
 
   xf86inputlibinput = (mkDerivation "xf86inputlibinput" {
-    name = "xf86-input-libinput-0.19.1";
+    name = "xf86-input-libinput-0.23.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2;
-      sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7";
+      url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2;
+      sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index c5d4fda1aa2c..185a4485c6ac 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -122,7 +122,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2
-mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2
+mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2

From d4b8737e007e1d298364397e37106f0674413d2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:07:55 +0100
Subject: [PATCH 0218/3449] xorg: add xf86-video-{sisusb,sunleo}

They might be useless, but they build :-)
---
 pkgs/servers/x11/xorg/default.nix       | 22 ++++++++++++++++++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 19f31fa3d0ea..1fb5ac85d604 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1978,6 +1978,17 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
+  xf86videosisusb = (mkDerivation "xf86videosisusb" {
+    name = "xf86-video-sisusb-0.9.7";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2;
+      sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l";
+    };
+    buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;};
+
   xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
     name = "xf86-video-suncg6-1.1.2";
     builder = ./builder.sh;
@@ -2000,6 +2011,17 @@ let
     meta.platforms = stdenv.lib.platforms.unix;
   }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
+  xf86videosunleo = (mkDerivation "xf86videosunleo" {
+    name = "xf86-video-sunleo-1.2.2";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2;
+      sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3";
+    };
+    buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
+    meta.platforms = stdenv.lib.platforms.unix;
+  }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
+
   xf86videotdfx = (mkDerivation "xf86videotdfx" {
     name = "xf86-video-tdfx-1.4.7";
     builder = ./builder.sh;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 185a4485c6ac..d5470039315b 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -155,8 +155,10 @@ mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2
+mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2

From c5c0f63320039a43aa1351bb11d006e66f0f4a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:10:51 +0100
Subject: [PATCH 0219/3449] xorg xf86-video-qxl: 0.1.3 -> 0.1.5

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1fb5ac85d604..01a452083096 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1902,11 +1902,11 @@ let
   }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
   xf86videoqxl = (mkDerivation "xf86videoqxl" {
-    name = "xf86-video-qxl-0.1.3";
+    name = "xf86-video-qxl-0.1.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2;
-      sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m";
+      url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2;
+      sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index d5470039315b..8ca45b8b1616 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -144,7 +144,7 @@ mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2
+mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2

From 3348905cdecff53190eb011e76ab2dba5855c107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 13:12:10 +0100
Subject: [PATCH 0220/3449] xorg-server: major bump 1.18.4 -> 1.19.1

I encountered no problems with it.  Nvidia binary drivers are tested,
and AMD ones now both set `abiCompat` to use older server versions.
---
 nixos/doc/manual/release-notes/rl-1703.xml |  6 ++++++
 pkgs/servers/x11/xorg/default.nix          | 10 +++++-----
 pkgs/servers/x11/xorg/overrides.nix        |  1 +
 pkgs/servers/x11/xorg/tarballs-7.7.list    |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index ae8aeb6e7072..37173ccd7442 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -15,6 +15,12 @@ has the following highlights: </para>
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
     manual</link> for more information.</para>
   </listitem>
+
+  <listitem>
+    <para>X.org server uses branch 1.19.  Due to ABI incompatibilities,
+      <literal>ati_unfree</literal> keeps forcing 1.17
+      and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>
+  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 01a452083096..d81879d51690 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2364,15 +2364,15 @@ let
   }) // {inherit ;};
 
   xorgserver = (mkDerivation "xorgserver" {
-    name = "xorg-server-1.18.4";
+    name = "xorg-server-1.19.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2;
-      sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117";
+      url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2;
+      sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr";
     };
-    buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
+    buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
     meta.platforms = stdenv.lib.platforms.unix;
-  }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};
+  }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;};
 
   xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
     name = "xorg-sgml-doctools-1.11";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index d706a0963214..0afbb21ea228 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -428,6 +428,7 @@ in
         damageproto xcmiscproto  bigreqsproto
         inputproto xextproto randrproto renderproto presentproto
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
+        libXfont2
       ];
       # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316
       commonPatches = [ ];
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 8ca45b8b1616..8d37d9f46b5e 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2
 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2
 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

From 9e04b57dde58c4db462bba8057e49eb071f5e5c0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 12 Feb 2017 02:56:29 +0200
Subject: [PATCH 0221/3449] nixos top-level: Add 'dtbs' symlink when kernel
 uses device trees

Currently e.g. extlinux-conf-builder.sh uses
`readlink -m "$toplevel/kernel/../dtbs"` to figure out the directory.
That is obscenely ugly.
---
 nixos/modules/system/activation/top-level.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 0c08375da646..84c23bed3e3b 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -45,6 +45,9 @@ let
 
         ln -s ${kernelPath} $out/kernel
         ln -s ${config.system.modulesTree} $out/kernel-modules
+        ${optionalString (pkgs.stdenv.platform.kernelDTB or false) ''
+          ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs
+        ''}
 
         echo -n "$kernelParams" > $out/kernel-params
 

From 9d55479e07421d1c02c4bbab9508bf5d0913c21b Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.conf>
Date: Sun, 12 Feb 2017 13:57:42 +0000
Subject: [PATCH 0222/3449] add .overrideDerivation and .overrideAttrs to
 packages created with `callPackages`/`callPackagesWith`

nix/nixUnstable, tomcatN and postgresqlNN use `callPackages` pattern, they have .override
attribute, but lack .overrideDerivation and recent .overrideAttrs.
Packages created with `callPackage` have all of those. Because .overrideDerivation function
is used in public, without this we can break code when refactoring callPackage -> callPackages.
---
 lib/customisation.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 41fe07fbd0a7..bedb91af7735 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -106,11 +106,9 @@ rec {
     let
       f = if builtins.isFunction fn then fn else import fn;
       auto = builtins.intersectAttrs (builtins.functionArgs f) autoArgs;
-      finalArgs = auto // args;
-      pkgs = f finalArgs;
-      mkAttrOverridable = name: pkg: pkg // {
-        override = newArgs: mkAttrOverridable name (f (finalArgs // newArgs)).${name};
-      };
+      origArgs = auto // args;
+      pkgs = f origArgs;
+      mkAttrOverridable = name: pkg: makeOverridable (newArgs: (f newArgs).${name}) origArgs;
     in lib.mapAttrs mkAttrOverridable pkgs;
 
 

From 824d82fa0f6fdd1b2213020283d8bd7aa77738b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 6 Jun 2016 17:38:51 +0200
Subject: [PATCH 0223/3449] nixos/geoip-updater: new service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The GeoIP databases from MaxMind have no stable URLs and change every
month (or so). Our current method of packaging these database in Nix and
playing catch-up with ever-changing file hashes is a bad idea. For
instance, it makes it impossible to realize old NixOS configurations.

This patch adds a NixOS service that periodically updates the GeoIP
databases in /var/lib/geoip-databases. Moving NixOS modules over can be
done in later patches.

I tried adding MD5 check, but not all databases have them, so i skipped
it. We are downloading over HTTPS though, it should be good. I also
tried adding zip support, but the first zip file I extracted had a
different filename inside than the archive name, which breaks an
assumption in this service, so I skipped that too.

Changes v9 -> v10:
  - Pass "--max-time" to curl to set upper bound on downloads (ensures
    no indefinite hanging if there's problem with networking).
    Timeout for network connectivity check: 60s.
    Timeout for geoip database (each): 15m.

Changes v8 -> v9:
  - Mention the random timer delay in the documentation for the
    'interval' option.

Changes v7 -> v8:
  - Add "RemainAfterExit=true" for the setup service, so it won't be
    restarted needlessly. (Thanks @danbst!)

Changes v6 -> v7:
  - Add --skip-existing flag to geoip-updater, which skips updating
    existing database files. Pass that flag when we run the service on
    boot (and on any NixOS configuration change).
    (IMHO, this is somewhat a workaround for systemd persistent timers
    not being triggered immediately when a timer has never expired
    before. But it does have the nice side effect of ensuring that the
    installed databases always correspond to the configured ones, since
    the service is now always run after configuration changes.)

Changes v5 -> v6:
  - Update database files atomically (per DB)
  - If a database is removed from the configuration, it'll be removed
    from /var/lib/geoip-databases too (on next run).
  - Add NixOS module assertion so that if user inputs non- .gz or .xz
    file there will be a build time error instead of runtime.
  - Run updater as user "nobody" instead of "root".
  - Rename NixOS service from "geoip-databases" to "geoip-updater".
  - Drop RemainAfterExit, or else the timer won't trigger the unit.
  - Bring back "curl --fail", or else we won't catch and log curl
    failures.

Changes v4 -> v5:
  - Add "GeoLite2-City.mmdb.gz" to default database list.

Changes v3 -> v4:
  - Remove unneeded geoip-updater-setup.service after adding
    'wantedBy = [ "multi-user.target" ]' directly to
    geoip-updater.service
  - Drop unneeded "Service" name from service descriptions.

Changes v2 -> v3:
  - Network may be down when starting from a cold boot, so try a few
    times. Possibly, if using systemd-networkd, it'll pass on the first
    try. But with default DHCP on NixOS, the service is started before
    hostnames can be resolved and thus we need a few extra seconds.
  - Add error handling and mark service as failed if fatal error.
  - Add proper syslog log levels.
  - Add RandomizedDelaySec=3600 to the timer to not put high load on the
    MaxMind servers. Suggested by @Mic92.
  - Set RemainAfterExit on geoip-updater.service instead of
    geoip-updater-setup.service. (The latter is only a proxy that pulls
    in the former service).

Changes v1 -> v2:
From Данило Глинський (Danylo Hlynskyi) <abcz2.uprola@gmail.com>:
  nixos/geoip-databases: add `databases` option and fix initial setup

  There were two great issues when using this service:
  - When you just enable service, databases aren't downloaded, they are
    downloaded when timer triggers. Fixed this with automatic download on
    first system activation.
  - When there is no internet, updater outputs nothing to logs, which is
    IMO misbehavior. Fixed this with removing `--fail` option, better be
    explicit here.
---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/misc/geoip-updater.nix | 300 ++++++++++++++++++
 2 files changed, 301 insertions(+)
 create mode 100644 nixos/modules/services/misc/geoip-updater.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7c9c9ac2a1e9..9bf6a400b098 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -259,6 +259,7 @@
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
   ./services/misc/gammu-smsd.nix
+  ./services/misc/geoip-updater.nix
   #./services/misc/gitit.nix
   ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
new file mode 100644
index 000000000000..021ee02782d2
--- /dev/null
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -0,0 +1,300 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.geoip-updater;
+
+  dbBaseUrl = "https://geolite.maxmind.com/download/geoip/database";
+
+  randomizedTimerDelaySec = "3600";
+
+  # Use writeScriptBin instead of writeScript, so that argv[0] (logged to the
+  # journal) doesn't include the long nix store path hash. (Prefixing the
+  # ExecStart= command with '@' doesn't work because we start a shell (new
+  # process) that creates a new argv[0].)
+  geoip-updater = pkgs.writeScriptBin "geoip-updater" ''
+    #!${pkgs.stdenv.shell}
+    skipExisting=0
+    debug()
+    {
+        echo "<7>$@"
+    }
+    info()
+    {
+        echo "<6>$@"
+    }
+    error()
+    {
+        echo "<3>$@"
+    }
+    die()
+    {
+        error "$@"
+        exit 1
+    }
+    waitNetworkOnline()
+    {
+        ret=1
+        for i in $(seq 6); do
+            curl_out=$("${pkgs.curl.bin}/bin/curl" \
+                --silent --fail --show-error --max-time 60 "${dbBaseUrl}" 2>&1)
+            if [ $? -eq 0 ]; then
+                debug "Server is reachable (try $i)"
+                ret=0
+                break
+            else
+                debug "Server is unreachable (try $i): $curl_out"
+                sleep 10
+            fi
+        done
+        return $ret
+    }
+    dbFnameTmp()
+    {
+        dburl=$1
+        echo "${cfg.databaseDir}/.$(basename "$dburl")"
+    }
+    dbFnameTmpDecompressed()
+    {
+        dburl=$1
+        echo "${cfg.databaseDir}/.$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//'
+    }
+    dbFname()
+    {
+        dburl=$1
+        echo "${cfg.databaseDir}/$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//'
+    }
+    downloadDb()
+    {
+        dburl=$1
+        curl_out=$("${pkgs.curl.bin}/bin/curl" \
+            --silent --fail --show-error --max-time 900 -L -o "$(dbFnameTmp "$dburl")" "$dburl" 2>&1)
+        if [ $? -ne 0 ]; then
+            error "Failed to download $dburl: $curl_out"
+            return 1
+        fi
+    }
+    decompressDb()
+    {
+        fn=$(dbFnameTmp "$1")
+        ret=0
+        case "$fn" in
+            *.gz)
+                cmd_out=$("${pkgs.gzip}/bin/gzip" --decompress --force "$fn" 2>&1)
+                ;;
+            *.xz)
+                cmd_out=$("${pkgs.xz.bin}/bin/xz" --decompress --force "$fn" 2>&1)
+                ;;
+            *)
+                cmd_out=$(echo "File \"$fn\" is neither a .gz nor .xz file")
+                false
+                ;;
+        esac
+        if [ $? -ne 0 ]; then
+            error "$cmd_out"
+            ret=1
+        fi
+    }
+    atomicRename()
+    {
+        dburl=$1
+        mv "$(dbFnameTmpDecompressed "$dburl")" "$(dbFname "$dburl")"
+    }
+    removeIfNotInConfig()
+    {
+        # Arg 1 is the full path of an installed DB.
+        # If the corresponding database is not specified in the NixOS config we
+        # remove it.
+        db=$1
+        for cdb in ${lib.concatStringsSep " " cfg.databases}; do
+            confDb=$(echo "$cdb" | sed 's/\.\(gz\|xz\)$//')
+            if [ "$(basename "$db")" = "$(basename "$confDb")" ]; then
+                return 0
+            fi
+        done
+        rm "$db"
+        if [ $? -eq 0 ]; then
+            debug "Removed $(basename "$db") (not listed in services.geoip-updater.databases)"
+        else
+            error "Failed to remove $db"
+        fi
+    }
+    removeUnspecifiedDbs()
+    {
+        for f in "${cfg.databaseDir}/"*; do
+            test -f "$f" || continue
+            case "$f" in
+                *.dat|*.mmdb|*.csv)
+                    removeIfNotInConfig "$f"
+                    ;;
+                *)
+                    debug "Not removing \"$f\" (unknown file extension)"
+                    ;;
+            esac
+        done
+    }
+    downloadAndInstall()
+    {
+        dburl=$1
+        if [ "$skipExisting" -eq 1 -a -f "$(dbFname "$dburl")" ]; then
+            debug "Skipping existing file: $(dbFname "$dburl")"
+            return 0
+        fi
+        downloadDb "$dburl" || return 1
+        decompressDb "$dburl" || return 1
+        atomicRename "$dburl" || return 1
+        info "Updated $(basename "$(dbFname "$dburl")")"
+    }
+    for arg in "$@"; do
+        case "$arg" in
+            --skip-existing)
+                skipExisting=1
+                info "Option --skip-existing is set: not updating existing databases"
+                ;;
+            *)
+                error "Unknown argument: $arg";;
+        esac
+    done
+    waitNetworkOnline || die "Network is down (${dbBaseUrl} is unreachable)"
+    test -d "${cfg.databaseDir}" || die "Database directory (${cfg.databaseDir}) doesn't exist"
+    debug "Starting update of GeoIP databases in ${cfg.databaseDir}"
+    all_ret=0
+    for db in ${lib.concatStringsSep " \\\n        " cfg.databases}; do
+        downloadAndInstall "${dbBaseUrl}/$db" || all_ret=1
+    done
+    removeUnspecifiedDbs || all_ret=1
+    if [ $all_ret -eq 0 ]; then
+        info "Completed GeoIP database update in ${cfg.databaseDir}"
+    else
+        error "Completed GeoIP database update in ${cfg.databaseDir}, with error(s)"
+    fi
+    # Hack to work around systemd journal race:
+    # https://github.com/systemd/systemd/issues/2913
+    sleep 2
+    exit $all_ret
+  '';
+
+in
+
+{
+  options = {
+    services.geoip-updater = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to enable periodic downloading of GeoIP databases from
+          maxmind.com. You might want to enable this if you, for instance, use
+          ntopng or Wireshark.
+        '';
+      };
+
+      interval = mkOption {
+        type = types.str;
+        default = "weekly";
+        description = ''
+          Update the GeoIP databases at this time / interval.
+          The format is described in
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum></citerefentry>.
+          To prevent load spikes on maxmind.com, the timer interval is
+          randomized by an additional delay of ${randomizedTimerDelaySec}
+          seconds. Setting a shorter interval than this is not recommended.
+        '';
+      };
+
+      databaseDir = mkOption {
+        type = types.path;
+        default = "/var/lib/geoip-databases";
+        description = ''
+          Directory that will contain GeoIP databases.
+        '';
+      };
+
+      databases = mkOption {
+        type = types.listOf types.str;
+        default = [
+          "GeoLiteCountry/GeoIP.dat.gz"
+          "GeoIPv6.dat.gz"
+          "GeoLiteCity.dat.xz"
+          "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"
+          "asnum/GeoIPASNum.dat.gz"
+          "asnum/GeoIPASNumv6.dat.gz"
+          "GeoLite2-Country.mmdb.gz"
+          "GeoLite2-City.mmdb.gz"
+        ];
+        description = ''
+          Which GeoIP databases to update. The full URL is ${dbBaseUrl}/ +
+          <literal>the_database</literal>.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    assertions = [
+      { assertion = (builtins.filter
+          (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases) == [];
+        message = ''
+          services.geoip-updater.databases supports only .gz and .xz databases.
+
+          Current value:
+          ${toString cfg.databases}
+
+          Offending element(s):
+          ${toString (builtins.filter (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases)};
+        '';
+      }
+    ];
+
+    systemd.timers.geoip-updater =
+      { description = "GeoIP Updater Timer";
+        partOf = [ "geoip-updater.service" ];
+        wantedBy = [ "timers.target" ];
+        timerConfig.OnCalendar = cfg.interval;
+        timerConfig.Persistent = "true";
+        timerConfig.RandomizedDelaySec = randomizedTimerDelaySec;
+      };
+
+    systemd.services.geoip-updater = {
+      description = "GeoIP Updater";
+      after = [ "network-online.target" "nss-lookup.target" ];
+      wants = [ "network-online.target" ];
+      preStart = ''
+        mkdir -p "${cfg.databaseDir}"
+        chmod 755 "${cfg.databaseDir}"
+        chown nobody:root "${cfg.databaseDir}"
+      '';
+      serviceConfig = {
+        ExecStart = "${geoip-updater}/bin/geoip-updater";
+        User = "nobody";
+        PermissionsStartOnly = true;
+      };
+    };
+
+    systemd.services.geoip-updater-setup = {
+      description = "GeoIP Updater Setup";
+      after = [ "network-online.target" "nss-lookup.target" ];
+      wants = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+      conflicts = [ "geoip-updater.service" ];
+      preStart = ''
+        mkdir -p "${cfg.databaseDir}"
+        chmod 755 "${cfg.databaseDir}"
+        chown nobody:root "${cfg.databaseDir}"
+      '';
+      serviceConfig = {
+        ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing";
+        User = "nobody";
+        PermissionsStartOnly = true;
+        # So it won't be (needlessly) restarted:
+        RemainAfterExit = true;
+      };
+    };
+
+  };
+}

From 8e19dc565ec43d9ca7722aa0527224f19086d56e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 15:44:19 +0100
Subject: [PATCH 0224/3449] pythonPackages.slixmpp: 1.2.1 -> 1.2.4.post1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 858981697291..4a0fd02df5c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15572,13 +15572,13 @@ in {
 
   slixmpp = buildPythonPackage rec {
     name = "slixmpp-${version}";
-    version = "1.2.1";
+    version = "1.2.4.post1";
 
     disabled = pythonOlder "3.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/slixmpp/${name}.tar.gz";
-      sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9";
+      sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk";
     };
 
     patchPhase = ''

From cf4775571fe55fdbb41fc99a423452f72e460fef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 12 Feb 2017 15:55:35 +0100
Subject: [PATCH 0225/3449] poezio: 0.10 -> 0.11

---
 .../poezio/fix_plugins_imports.patch          | 80 -------------------
 .../poezio/make_default_config_writable.patch | 25 ------
 pkgs/top-level/python-packages.nix            |  7 +-
 3 files changed, 3 insertions(+), 109 deletions(-)
 delete mode 100644 pkgs/development/python-modules/poezio/fix_plugins_imports.patch
 delete mode 100644 pkgs/development/python-modules/poezio/make_default_config_writable.patch

diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch
deleted file mode 100644
index 821b9c41588a..000000000000
--- a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py
---- poezio-0.10.orig/plugins/canat.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/canat.py	2016-11-16 14:32:21.565445266 +0100
-@@ -34,9 +34,9 @@
- 
- 
- """
--from plugin import BasePlugin
--import tabs
--from decorators import command_args_parser
-+from poezio.plugin import BasePlugin
-+import poezio.tabs
-+from poezio.decorators import command_args_parser
- 
- def move(text, step, spacing):
-     new_text = text + (" " * spacing)
-diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py
---- poezio-0.10.orig/plugins/corrections_diff.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/corrections_diff.py	2016-11-16 14:30:53.992684959 +0100
-@@ -22,11 +22,11 @@
- 
- 
- """
--from plugin import BasePlugin
-+from poezio.plugin import BasePlugin
- import difflib
-+import collections
- from functools import wraps
--import tabs
--from config import config
-+from poezio.config import config
- 
- shim_message_fields = ('txt nick_color time str_time nickname user identifier'
-                   ' highlight me old_message revisions jid ack')
-@@ -61,10 +61,6 @@
-         rev -= 1
-     return ''.join(acc)
- 
--Message.__repr__ = repr_message
--Message.__str__ = repr_message
--
--
- 
- def corrections_enabled(func):
-     @wraps(func)
-diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py
---- poezio-0.10.orig/plugins/coucou.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/coucou.py	2016-11-16 14:25:37.101337668 +0100
-@@ -1,4 +1,4 @@
--from plugin import BasePlugin
-+from poezio.plugin import BasePlugin
- import tracemalloc
- import cProfile, pstats, io
- 
-diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py
---- poezio-0.10.orig/plugins/flood.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/flood.py	2016-11-16 14:32:56.452155220 +0100
-@@ -1,6 +1,6 @@
--from plugin import BasePlugin
--import tabs
--import multiuserchat as muc
-+from poezio.plugin import BasePlugin
-+import poezio.tabs
-+import poezio.multiuserchat as muc
- 
- class Plugin(BasePlugin):
-     def init(self):
-diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py
---- poezio-0.10.orig/plugins/invisible.py	2016-08-21 14:56:35.000000000 +0200
-+++ poezio-0.10/plugins/invisible.py	2016-11-16 14:31:31.743288152 +0100
-@@ -20,8 +20,7 @@
- .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html
- """
- 
--from plugin import BasePlugin
--import tabs
-+from poezio.plugin import BasePlugin
- 
- class Plugin(BasePlugin):
-     def init(self):
diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch
deleted file mode 100644
index 03d732e256c4..000000000000
--- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ruN a/src/config.py b/src/config.py
---- a/src/config.py	2015-07-31 19:35:37.000000000 +0000
-+++ b/src/config.py	2015-08-03 09:23:34.322098081 +0000
-@@ -14,6 +14,7 @@
- 
- import logging.config
- import os
-+import stat
- import sys
- import pkg_resources
- 
-@@ -563,6 +564,13 @@
-             copy2(default, options.filename)
-         elif path.isfile(other):
-             copy2(other, options.filename)
-+
-+        # Inside the nixstore, the reference file is readonly, so is the copy.
-+        # Make it writable by the user who just created it.
-+        if os.path.exists(options.filename):
-+            os.chmod(options.filename,
-+                     os.stat(options.filename).st_mode | stat.S_IWUSR)
-+
-         global firstrun
-         firstrun = True
- 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a0fd02df5c3..36ccc57b5457 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30186,7 +30186,7 @@ EOF
 
   poezio = buildPythonApplication rec {
     name = "poezio-${version}";
-    version = "0.10";
+    version = "0.11";
 
     disabled = pythonOlder "3.4";
 
@@ -30194,13 +30194,12 @@ EOF
     propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ];
 
     src = pkgs.fetchurl {
-      url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz";
-      sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn";
+      url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz";
+      sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0";
     };
 
     patches = [
       ../development/python-modules/poezio/fix_gnupg_import.patch
-      ../development/python-modules/poezio/fix_plugins_imports.patch
     ];
 
     checkPhase = ''

From 94b28a8072a6f93dad7ba6270422af8a99cc7e76 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgewhewell@users.noreply.github.com>
Date: Sun, 12 Feb 2017 15:06:59 +0000
Subject: [PATCH 0226/3449] fix systemd.services.kube-proxy to use correct
 extraOpts

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

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index 029b11ad98b7..a82802c32662 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -775,7 +775,7 @@ in {
             --bind-address=${cfg.proxy.address} \
             ${optionalString cfg.verbose "--v=6"} \
             ${optionalString cfg.verbose "--log-flush-frequency=1s"} \
-            ${cfg.controllerManager.extraOpts}
+            ${cfg.proxy.extraOpts}
           '';
           WorkingDirectory = cfg.dataDir;
         };

From a8d7a6a9577d70a80f55f1ddd766ee94617fad61 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 12 Feb 2017 14:18:04 -0400
Subject: [PATCH 0227/3449] xwayland : fix build by giving wayland-protocols to
 the build.

---
 pkgs/servers/x11/xorg/xwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index ee4b5695c7cd..513e4ceee623 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -1,5 +1,5 @@
 
-{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
+{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }:
 
 with stdenv.lib;
 
@@ -7,7 +7,7 @@ overrideDerivation xorgserver (oldAttrs: {
 
   name = "xwayland-${xorgserver.version}";
   propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs
-    ++ [wayland epoxy libxslt makeWrapper libunwind];
+    ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind];
   configureFlags = [
     "--disable-docs"
     "--disable-devel-docs"

From 84e7ad1eb7620f94760ba72f81b4ebf277608eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Fri, 20 Jan 2017 19:02:19 +0100
Subject: [PATCH 0228/3449] ipfs: 0.4.4 -> 0.4.5

0.4.5 introduces a new repo format. You might need
to run a migration:

https://github.com/ipfs/fs-repo-migrations
---
 pkgs/applications/networking/ipfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 0d018c9588f6..40ac09177975 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "ipfs-${version}";
-  version = "0.4.4";
-  rev = "d905d485192616abaea25f7e721062a9e1093ab9";
+  version = "0.4.5";
+  rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
   extraSrcPaths = [
     (fetchgx {
       inherit name src;
-      sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb";
+      sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d";
     })
   ];
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l";
+    sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47";
   };
 
   meta = with stdenv.lib; {

From 072adafb66d8f2a9e70d6d3965ce52b865f8ac54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 26 Jan 2017 17:25:01 +0100
Subject: [PATCH 0229/3449] ipfsapi: 0.4.0 -> 0.4.5-pre

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36ccc57b5457..b4ad21ffb5f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7733,15 +7733,16 @@ in {
 
   ipfsapi = buildPythonPackage rec {
     name = "ipfsapi-${version}";
-    version = "0.4.0";
+    version = "0.4.5-pre";
     disabled = isPy26 || isPy27;
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/ipfsapi/${name}.tar.gz";
-      sha256 = "0mqqsihannxzaqi8zcj9nca7fxwg1c85bp7xxic3xqa5zslcdcc3";
+    src = pkgs.fetchFromGitHub {
+      owner = "ipfs";
+      repo = "py-ipfs-api";
+      rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f";
+      sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126";
     };
 
-    buildInputs = with self; [ pkgs.pandoc ];
     propagatedBuildInputs = with self; [ six requests2 ];
 
     meta = {

From 3dad33227f0b527569da022a3635d219d726b35d Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Sun, 12 Feb 2017 20:53:49 +0100
Subject: [PATCH 0230/3449] xen: update domU config for pvgrub2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #22709

Recent pvgrub (from Grub built with “--with-platform=xen”) understands
the Grub2 configuration format. Grub legacy configuration (menu.lst) is
ignored.
---
 nixos/modules/virtualisation/xen-domU.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-domU.nix b/nixos/modules/virtualisation/xen-domU.nix
index 8dd0d1dbfd2c..b46002c10b54 100644
--- a/nixos/modules/virtualisation/xen-domU.nix
+++ b/nixos/modules/virtualisation/xen-domU.nix
@@ -3,11 +3,8 @@
 { config, pkgs, ... }:
 
 {
-  # We're being booted using pv-grub, which means that we need to
-  # generate a GRUB 1 menu without actually installing GRUB.
-  boot.loader.grub.version = 1;
+  boot.loader.grub.version = 2;
   boot.loader.grub.device = "nodev";
-  boot.loader.grub.extraPerEntryConfig = "root (hd0)";
 
   boot.initrd.kernelModules =
     [ "xen-blkfront" "xen-tpmfront" "xen-kbdfront" "xen-fbfront"

From 31eba21d1dab7da2e75be229c542990e8f4b56b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Feb 2017 21:06:59 +0100
Subject: [PATCH 0231/3449] virtualbox: force xorg-server-1.18 for now

This is getting a little hacky, but hopefully it won't break anything.
---
 nixos/modules/services/x11/xserver.nix                   | 2 ++
 .../virtualbox/guest-additions/default.nix               | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index f5ed52338182..7ac776571a01 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -459,6 +459,8 @@ in
           knownVideoDrivers;
       in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver));
 
+    nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; };
+
     assertions =
       [ { assertion = config.security.polkit.enable;
           message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’).";
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index d73c18badb19..6e58d42a1cb5 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -4,7 +4,14 @@
 let
   version = virtualbox.version;
   xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version);
-  xserverABI = xserverVListFunc 0 + xserverVListFunc 1;
+
+  # Forced to 1.18 in <nixpkgs/nixos/modules/services/x11/xserver.nix>
+  # as it even fails to build otherwise.  Still, override this even here,
+  # in case someone does just a standalone build
+  # (not via videoDrivers = ["vboxvideo"]).
+  # It's likely to work again in some future update.
+  xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1;
+    in if abi == "119" then "118" else abi;
 in
 
 stdenv.mkDerivation {

From 446aa6834aae0c585a94688247608458a0f93e4b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 12 Feb 2017 21:14:09 +0100
Subject: [PATCH 0232/3449] subtitle-editor: fix build

Apply Debian patch that makes the project build with later GStreamer
versions.
---
 pkgs/applications/video/subtitleeditor/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix
index 3f8f683e0ca9..88768b3cb8f6 100644
--- a/pkgs/applications/video/subtitleeditor/default.nix
+++ b/pkgs/applications/video/subtitleeditor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, file, desktop_file_utils,
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils,
   enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx,
   xdg_utils, isocodes, wrapGAppsHook
 }:
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch";
+      sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c";
+    })
+  ];
+
   nativeBuildInputs =  [
     pkgconfig
     intltool

From 06bacb10e5c0ae4af621648891da0aa979c8c8de Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sun, 12 Feb 2017 10:38:08 +0100
Subject: [PATCH 0233/3449] scalafmt: 0.4.10 -> 0.5.6

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

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 534f358e5319..af7854b33dcb 100644
--- a/pkgs/development/tools/scalafmt/default.nix
+++ b/pkgs/development/tools/scalafmt/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.10";
+  version = "0.5.6";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz";
+    sha256 = "17fwli6jlsh4q7nqgqmqmhb368hpmj1yg9fdsybk8yq57hb24bwq";
   };
 
   unpackPhase = "tar xvzf $src";

From a82b3dd8e22e1d4555bd4f5487192e9d7cd58be6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 10 Feb 2017 15:22:49 -0600
Subject: [PATCH 0234/3449] creduce: init at 2.6.0

Also includes perl dependency 'GetOpt::Tabular'.
---
 .../tools/misc/creduce/default.nix            | 61 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  7 +++
 pkgs/top-level/perl-packages.nix              |  8 +++
 3 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/tools/misc/creduce/default.nix

diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
new file mode 100644
index 000000000000..a9296adf3343
--- /dev/null
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, cmake
+, llvm, clang-unwrapped
+, flex
+, zlib
+, perl, ExporterLite, FileWhich, GetoptTabular, RegexpCommon, TermReadKey
+, utillinux
+}:
+
+assert stdenv.isLinux -> (utillinux != null);
+
+stdenv.mkDerivation rec {
+  name = "creduce-${version}";
+  version = "2.6.0";
+
+  src = fetchurl {
+    url = "http://embed.cs.utah.edu/creduce/${name}.tar.gz";
+    sha256 = "0pf5q0n8vkdcr1wrkxn2jzxv0xkrir13bwmqfw3jpbm3dh2c3b6d";
+  };
+
+  buildInputs = [
+    # Ensure stdenv's CC is on PATH before clang-unwrapped
+    stdenv.cc
+    # Actual deps:
+    cmake
+    llvm clang-unwrapped
+    flex zlib
+  ];
+
+  # On Linux, c-reduce's preferred way to reason about
+  # the cpu architecture/topology is to use 'lscpu',
+  # so let's make sure it knows where to find it:
+  patchPhase = stdenv.lib.optionalString stdenv.isLinux ''
+    substituteInPlace creduce/creduce_utils.pm --replace \
+      lscpu ${utillinux}/bin/lscpu
+  '';
+
+  perlDeps = [
+    perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey
+  ];
+
+  propagatedNativeBuildInputs = perlDeps;
+  propagatedUserEnvPkgs = perlDeps;
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A C program reducer";
+    homepage = "https://embed.cs.utah.edu/creduce";
+    # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING
+    license = licenses.ncsa;
+    longDescription = ''
+      C-Reduce is a tool that takes a large C or C++ program that has a
+      property of interest (such as triggering a compiler bug) and
+      automatically produces a much smaller C/C++ program that has the same
+      property.  It is intended for use by people who discover and report
+      bugs in compilers and other tools that process C/C++ code.
+    '';
+    maintainers = [ maintainers.dtzWill ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ddc9d34284..8d5fc9dd783a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6263,6 +6263,13 @@ with pkgs;
 
   cppcheck = callPackage ../development/tools/analysis/cppcheck { };
 
+  creduce = callPackage ../development/tools/misc/creduce {
+    inherit (perlPackages) perl
+      ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey;
+    inherit (llvmPackages_39) llvm clang-unwrapped;
+    utillinux = if stdenv.isLinux then utillinuxMinimal else null;
+  };
+
   cscope = callPackage ../development/tools/misc/cscope { };
 
   csslint = callPackage ../development/web/csslint { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f50d5dfe38d8..744ca5f53e5e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5611,6 +5611,14 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  GetoptTabular = buildPerlPackage rec {
+    name = "Getopt-Tabular-0.3";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GW/GWARD/${name}.tar.gz";
+      sha256 = "0xskl9lcj07sdfx5dkma5wvhhgf5xlsq0khgh8kk34dm6dv0dpwv";
+    };
+  };
+
   GitPurePerl = buildPerlPackage {
     name = "Git-PurePerl-0.51";
     src = fetchurl {

From 939c846ae7c2b330dbc317e4703926dbd554b030 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Feb 2017 15:19:22 -0800
Subject: [PATCH 0235/3449] elvish: 0.1 -> 0.5

---
 pkgs/shells/elvish/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix
index 884f34dcf022..7dc6029acb42 100644
--- a/pkgs/shells/elvish/default.nix
+++ b/pkgs/shells/elvish/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "elvish-${version}";
-  version = "0.1";
+  version = "0.5";
 
   goPackagePath = "github.com/elves/elvish";
 
   src = fetchFromGitHub {
     repo = "elvish";
     owner = "elves";
-    rev = "4125c2bb927330b0100b354817dd4ad252118ba6";
-    sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f";
+    rev = version;
+    sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6";
   };
 
   goDeps = ./deps.nix;
@@ -20,6 +20,6 @@ buildGoPackage rec {
     homepage = https://github.com/elves/elvish;
     license = licenses.bsd2;
     maintainers = with maintainers; [ vrthra ];
-    platforms = with platforms; [ linux ];
+    platforms = with platforms; linux;
   };
 }

From 21cb82f34b04e76c285b3ea1aab6ac1c8170f71f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 12 Feb 2017 22:27:11 +0100
Subject: [PATCH 0236/3449] mpd: fix on i686

Was submtitted to upstream, but fix here in the meantime.
---
 pkgs/servers/mpd/default.nix |  2 ++
 pkgs/servers/mpd/i386.patch  | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/servers/mpd/i386.patch

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 09d72a12cf03..b1aa80341436 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi";
   };
 
+  patches = [ ./i386.patch ];
+
   buildInputs = [ pkgconfig glib boost ]
     ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
     ++ opt stdenv.isLinux systemd
diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/i386.patch
new file mode 100644
index 000000000000..dca8ea88a8b5
--- /dev/null
+++ b/pkgs/servers/mpd/i386.patch
@@ -0,0 +1,14 @@
+diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+index 6986453..167fc07 100644
+--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
+@@ -20,8 +20,8 @@
+ /* necessary because libavutil/common.h uses UINT64_C */
+ #define __STDC_CONSTANT_MACROS
+ 
+-#include "lib/ffmpeg/Time.hxx"
+ #include "config.h"
++#include "lib/ffmpeg/Time.hxx"
+ #include "FfmpegDecoderPlugin.hxx"
+ #include "lib/ffmpeg/Domain.hxx"
+ #include "lib/ffmpeg/Error.hxx"

From cbedb932f9d2320e708c804e82d20e9d63ec0b1f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 12 Feb 2017 23:12:13 +0100
Subject: [PATCH 0237/3449] nodePackages.mocha: init at 3.2.0

---
 .../node-packages/node-packages-v4.nix        | 1102 ++++++++++-------
 .../node-packages/node-packages-v6.nix        | 1062 +++++++++-------
 .../node-packages/node-packages.json          |    1 +
 3 files changed, 1262 insertions(+), 903 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index 54687d92bbdd..ceebd52b61c3 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -400,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.0" = {
+    "azure-arm-cdn-1.0.2" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
-        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz";
+        sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -418,13 +418,13 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.1" = {
+    "azure-arm-compute-0.20.0" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.1";
+      version = "0.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
-        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz";
+        sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32";
       };
     };
     "azure-arm-datalake-analytics-1.0.1-preview" = {
@@ -535,13 +535,13 @@ let
         sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
       };
     };
-    "azure-arm-rediscache-0.2.1" = {
+    "azure-arm-rediscache-0.2.3" = {
       name = "azure-arm-rediscache";
       packageName = "azure-arm-rediscache";
-      version = "0.2.1";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz";
-        sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
+        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
+        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
       };
     };
     "azure-arm-devtestlabs-0.1.0" = {
@@ -724,13 +724,13 @@ let
         sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb";
       };
     };
-    "azure-servicefabric-0.1.4" = {
+    "azure-servicefabric-0.1.5" = {
       name = "azure-servicefabric";
       packageName = "azure-servicefabric";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz";
-        sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
+        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz";
+        sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
       };
     };
     "applicationinsights-0.16.0" = {
@@ -1687,13 +1687,13 @@ let
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.5.0" = {
+    "aws4-1.6.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
-        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
+        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
     "bl-1.1.2" = {
@@ -2155,13 +2155,13 @@ let
         sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
       };
     };
-    "jsbn-0.1.0" = {
+    "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
-      version = "0.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
-        sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -2380,13 +2380,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "sax-1.2.1" = {
+    "sax-1.2.2" = {
       name = "sax";
       packageName = "sax";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
-        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz";
+        sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828";
       };
     };
     "mute-stream-0.0.7" = {
@@ -2830,13 +2830,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.1.5" = {
+    "hosted-git-info-2.2.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.1.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
-        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3109,13 +3109,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.6.0" = {
+    "debug-2.6.1" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
       };
     };
     "ms-0.7.2" = {
@@ -3190,13 +3190,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-5.0.2" = {
+    "buffer-5.0.5" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.2";
+      version = "5.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz";
-        sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
+        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
       };
     };
     "cached-path-relative-1.0.0" = {
@@ -3784,13 +3784,13 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.2" = {
+    "elliptic-6.3.3" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.2";
+      version = "6.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz";
-        sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz";
+        sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f";
       };
     };
     "parse-asn1-5.0.0" = {
@@ -3802,13 +3802,13 @@ let
         sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
       };
     };
-    "brorand-1.0.6" = {
+    "brorand-1.0.7" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz";
-        sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz";
+        sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc";
       };
     };
     "hash.js-1.0.3" = {
@@ -4945,13 +4945,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.4.0" = {
+    "random-access-file-1.5.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
-        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz";
+        sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17";
       };
     };
     "run-parallel-1.1.6" = {
@@ -4963,13 +4963,13 @@ let
         sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039";
       };
     };
-    "thunky-1.0.1" = {
+    "thunky-1.0.2" = {
       name = "thunky";
       packageName = "thunky";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz";
-        sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68";
+        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz";
+        sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
     "ip-1.1.4" = {
@@ -5170,13 +5170,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.6.1" = {
+    "k-rpc-socket-1.6.2" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz";
-        sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz";
+        sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21";
       };
     };
     "bencode-0.8.0" = {
@@ -5215,22 +5215,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.2.1" = {
+    "simple-peer-6.2.2" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz";
-        sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz";
+        sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba";
       };
     };
-    "simple-websocket-4.2.0" = {
+    "simple-websocket-4.3.0" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.2.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz";
-        sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz";
+        sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea";
       };
     };
     "string2compact-1.2.2" = {
@@ -5269,6 +5269,24 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
+    "ws-2.0.3" = {
+      name = "ws";
+      packageName = "ws";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz";
+        sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb";
+      };
+    };
+    "ultron-1.1.0" = {
+      name = "ultron";
+      packageName = "ultron";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz";
+        sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864";
+      };
+    };
     "addr-to-ip-port-1.4.2" = {
       name = "addr-to-ip-port";
       packageName = "addr-to-ip-port";
@@ -6664,6 +6682,15 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
+    "hosted-git-info-2.1.5" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
+        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+      };
+    };
     "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
@@ -9089,13 +9116,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.7.0" = {
+    "js-yaml-3.8.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.7.0";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+        sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
       };
     };
     "json-stable-stringify-1.0.1" = {
@@ -9395,13 +9422,13 @@ let
         sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86";
       };
     };
-    "esprima-2.7.3" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "2.7.3";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
-        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -9476,13 +9503,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.11.2" = {
+    "ajv-4.11.3" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.2";
+      version = "4.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz";
-        sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz";
+        sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -10070,13 +10097,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.2" = {
+    "gauge-2.7.3" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.2";
+      version = "2.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
-        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz";
+        sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10088,13 +10115,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "aproba-1.0.4" = {
+    "aproba-1.1.1" = {
       name = "aproba";
       packageName = "aproba";
-      version = "1.0.4";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz";
+        sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab";
       };
     };
     "wide-align-1.1.0" = {
@@ -11457,6 +11484,15 @@ let
         sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
+    "esprima-2.7.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
+        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+      };
+    };
     "handlebars-4.0.6" = {
       name = "handlebars";
       packageName = "handlebars";
@@ -11529,13 +11565,13 @@ let
         sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
-    "body-parser-1.16.0" = {
+    "body-parser-1.16.1" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.16.0";
+      version = "1.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz";
-        sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz";
+        sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11646,13 +11682,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.11" = {
+    "useragent-2.1.12" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.11";
+      version = "2.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz";
-        sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz";
+        sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2";
       };
     };
     "bytes-2.4.0" = {
@@ -12843,6 +12879,78 @@ let
         sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
       };
     };
+    "browser-stdout-1.3.0" = {
+      name = "browser-stdout";
+      packageName = "browser-stdout";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
+        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
+    "glob-7.0.5" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz";
+        sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95";
+      };
+    };
+    "growl-1.9.2" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+      };
+    };
+    "lodash.create-3.1.1" = {
+      name = "lodash.create";
+      packageName = "lodash.create";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
+        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
+      };
+    };
+    "supports-color-3.1.2" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
+        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
+      };
+    };
+    "lodash._baseassign-3.2.0" = {
+      name = "lodash._baseassign";
+      packageName = "lodash._baseassign";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
+        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
+      };
+    };
+    "lodash._basecreate-3.0.3" = {
+      name = "lodash._basecreate";
+      packageName = "lodash._basecreate";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
+        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
+      };
+    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -13248,15 +13356,6 @@ let
         sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
       };
     };
-    "lodash._baseassign-3.2.0" = {
-      name = "lodash._baseassign";
-      packageName = "lodash._baseassign";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
-        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
-      };
-    };
     "lodash._createassigner-3.1.1" = {
       name = "lodash._createassigner";
       packageName = "lodash._createassigner";
@@ -13383,6 +13482,15 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
+    "js-yaml-3.7.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      };
+    };
     "jsonata-1.0.10" = {
       name = "jsonata";
       packageName = "jsonata";
@@ -13464,13 +13572,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.15" = {
+    "node-red-node-email-0.1.16" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.15";
+      version = "0.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
-        sha1 = "7a528596d3b693a077b1ee293300299855537142";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz";
+        sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -14031,6 +14139,15 @@ let
         sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
+    "node-pre-gyp-0.6.32" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.6.32";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14616,6 +14733,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "aproba-1.0.4" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
+        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14670,13 +14796,13 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
-    "mississippi-1.2.0" = {
+    "mississippi-1.3.0" = {
       name = "mississippi";
       packageName = "mississippi";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
-        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
+        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
       };
     };
     "node-gyp-3.5.0" = {
@@ -14814,6 +14940,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "parallel-transform-1.1.0" = {
+      name = "parallel-transform";
+      packageName = "parallel-transform";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
+        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+      };
+    };
     "stream-each-1.2.0" = {
       name = "stream-each";
       packageName = "stream-each";
@@ -14823,6 +14958,15 @@ let
         sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
       };
     };
+    "cyclist-0.2.2" = {
+      name = "cyclist";
+      packageName = "cyclist";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
+        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+      };
+    };
     "stream-iterate-1.2.0" = {
       name = "stream-iterate";
       packageName = "stream-iterate";
@@ -15310,15 +15454,6 @@ let
         sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
       };
     };
-    "diff-1.4.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
-        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
-      };
-    };
     "domino-1.0.28" = {
       name = "domino";
       packageName = "domino";
@@ -15384,13 +15519,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.13" = {
+    "service-runner-2.1.15" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.13";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
-        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz";
+        sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15519,13 +15654,13 @@ let
         sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
       };
     };
-    "yargs-5.0.0" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "5.0.0";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
-        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
     "dtrace-provider-0.8.0" = {
@@ -15655,6 +15790,15 @@ let
         sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
     "get-caller-file-1.0.2" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -15664,15 +15808,6 @@ let
         sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
     "require-directory-2.1.1" = {
       name = "require-directory";
       packageName = "require-directory";
@@ -15700,6 +15835,24 @@ let
         sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
       };
     };
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    };
     "window-size-0.2.0" = {
       name = "window-size";
       packageName = "window-size";
@@ -15709,24 +15862,6 @@ let
         sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
       };
     };
-    "yargs-parser-3.2.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
-        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
-      };
-    };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
     "yargs-parser-2.4.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -16663,40 +16798,31 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "private-0.1.6" = {
+    "private-0.1.7" = {
       name = "private";
       packageName = "private";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz";
-        sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
+        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
+        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.20" = {
+    "recast-0.11.21" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.20";
+      version = "0.11.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz";
-        sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz";
+        sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9";
       };
     };
-    "ast-types-0.9.4" = {
+    "ast-types-0.9.5" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.4";
+      version = "0.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz";
-        sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz";
+        sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a";
       };
     };
     "base62-0.1.1" = {
@@ -17366,13 +17492,13 @@ let
         sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
       };
     };
-    "stream-transform-0.1.1" = {
+    "stream-transform-0.1.2" = {
       name = "stream-transform";
       packageName = "stream-transform";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz";
-        sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71";
+        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz";
+        sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f";
       };
     };
     "csv-stringify-0.0.8" = {
@@ -17888,13 +18014,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.1" = {
+    "raven-1.1.2" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
-        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz";
+        sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718";
       };
     };
     "signals-1.0.0" = {
@@ -17924,15 +18050,6 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-6.6.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "6.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
-      };
-    };
     "color-convert-1.9.0" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -18140,6 +18257,15 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
+    "mississippi-1.2.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+      };
+    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -18167,15 +18293,6 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
-      };
-    };
     "kew-0.1.7" = {
       name = "kew";
       packageName = "kew";
@@ -18221,6 +18338,15 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
+    "acorn-4.0.11" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "4.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
+        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
+      };
+    };
     "acorn-dynamic-import-2.0.1" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
@@ -18230,13 +18356,13 @@ let
         sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
       };
     };
-    "enhanced-resolve-3.0.3" = {
+    "enhanced-resolve-3.1.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz";
-        sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz";
+        sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec";
       };
     };
     "json-loader-0.5.4" = {
@@ -18619,10 +18745,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.8";
+    version = "0.10.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
-      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz";
+      sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18660,9 +18786,9 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.0"
+      sources."azure-arm-cdn-1.0.2"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-compute-0.20.0"
       sources."azure-arm-datalake-analytics-1.0.1-preview"
       sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
@@ -18675,7 +18801,7 @@ in
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
       sources."azure-arm-website-0.11.4"
-      sources."azure-arm-rediscache-0.2.1"
+      sources."azure-arm-rediscache-0.2.3"
       sources."azure-arm-devtestlabs-0.1.0"
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
@@ -18731,7 +18857,7 @@ in
       })
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
-      sources."azure-servicefabric-0.1.4"
+      sources."azure-servicefabric-0.1.5"
       sources."applicationinsights-0.16.0"
       (sources."caller-id-0.1.0" // {
         dependencies = [
@@ -18879,7 +19005,7 @@ in
       (sources."request-2.74.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           (sources."bl-1.1.2" // {
             dependencies = [
               (sources."readable-stream-2.0.6" // {
@@ -18978,7 +19104,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -19081,7 +19207,7 @@ in
       sources."wordwrap-0.0.2"
       (sources."xml2js-0.1.14" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
         ];
       })
       sources."xmlbuilder-0.4.3"
@@ -19219,7 +19345,7 @@ in
                   sources."minimist-1.2.0"
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -19379,7 +19505,7 @@ in
       (sources."promised-temp-0.1.0" // {
         dependencies = [
           sources."q-1.4.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -19472,7 +19598,7 @@ in
           sources."pako-0.2.9"
         ];
       })
-      (sources."buffer-5.0.2" // {
+      (sources."buffer-5.0.5" // {
         dependencies = [
           sources."base64-js-1.2.0"
           sources."ieee754-1.1.8"
@@ -19525,9 +19651,9 @@ in
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
-              (sources."elliptic-6.3.2" // {
+              (sources."elliptic-6.3.3" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  sources."brorand-1.0.7"
                   sources."hash.js-1.0.3"
                 ];
               })
@@ -19552,9 +19678,9 @@ in
           (sources."create-ecdh-4.0.0" // {
             dependencies = [
               sources."bn.js-4.11.6"
-              (sources."elliptic-6.3.2" // {
+              (sources."elliptic-6.3.3" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  sources."brorand-1.0.7"
                   sources."hash.js-1.0.3"
                 ];
               })
@@ -19573,7 +19699,7 @@ in
               sources."bn.js-4.11.6"
               (sources."miller-rabin-4.0.0" // {
                 dependencies = [
-                  sources."brorand-1.0.6"
+                  sources."brorand-1.0.7"
                 ];
               })
             ];
@@ -19847,7 +19973,7 @@ in
         ];
       })
       sources."debounced-seeker-1.0.0"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -19885,7 +20011,7 @@ in
               sources."map-obj-1.0.1"
               (sources."normalize-package-data-2.3.5" // {
                 dependencies = [
-                  sources."hosted-git-info-2.1.5"
+                  sources."hosted-git-info-2.2.0"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -20119,14 +20245,14 @@ in
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."random-access-file-1.4.0" // {
+                  (sources."random-access-file-1.5.0" // {
                     dependencies = [
                       sources."inherits-2.0.3"
                     ];
                   })
                   sources."randombytes-2.0.3"
                   sources."run-parallel-1.1.6"
-                  sources."thunky-1.0.1"
+                  sources."thunky-1.0.2"
                 ];
               })
               sources."hat-0.0.3"
@@ -20236,7 +20362,7 @@ in
                               sources."randombytes-2.0.3"
                             ];
                           })
-                          (sources."k-rpc-socket-1.6.1" // {
+                          (sources."k-rpc-socket-1.6.2" // {
                             dependencies = [
                               sources."bencode-0.11.0"
                             ];
@@ -20269,7 +20395,7 @@ in
                           sources."unzip-response-2.0.1"
                         ];
                       })
-                      (sources."simple-peer-6.2.1" // {
+                      (sources."simple-peer-6.2.2" // {
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
@@ -20285,7 +20411,7 @@ in
                           })
                         ];
                       })
-                      (sources."simple-websocket-4.2.0" // {
+                      (sources."simple-websocket-4.3.0" // {
                         dependencies = [
                           (sources."readable-stream-2.2.2" // {
                             dependencies = [
@@ -20297,6 +20423,11 @@ in
                               sources."util-deprecate-1.0.2"
                             ];
                           })
+                          (sources."ws-2.0.3" // {
+                            dependencies = [
+                              sources."ultron-1.1.0"
+                            ];
+                          })
                         ];
                       })
                       (sources."string2compact-1.2.2" // {
@@ -20446,7 +20577,7 @@ in
       sources."stream-transcoder-0.0.5"
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -20715,9 +20846,9 @@ in
                         dependencies = [
                           sources."bn.js-4.11.6"
                           sources."browserify-rsa-4.0.1"
-                          (sources."elliptic-6.3.2" // {
+                          (sources."elliptic-6.3.3" // {
                             dependencies = [
-                              sources."brorand-1.0.6"
+                              sources."brorand-1.0.7"
                               sources."hash.js-1.0.3"
                             ];
                           })
@@ -20742,9 +20873,9 @@ in
                       (sources."create-ecdh-4.0.0" // {
                         dependencies = [
                           sources."bn.js-4.11.6"
-                          (sources."elliptic-6.3.2" // {
+                          (sources."elliptic-6.3.3" // {
                             dependencies = [
-                              sources."brorand-1.0.6"
+                              sources."brorand-1.0.7"
                               sources."hash.js-1.0.3"
                             ];
                           })
@@ -20763,7 +20894,7 @@ in
                           sources."bn.js-4.11.6"
                           (sources."miller-rabin-4.0.0" // {
                             dependencies = [
-                              sources."brorand-1.0.6"
+                              sources."brorand-1.0.7"
                             ];
                           })
                         ];
@@ -21147,7 +21278,7 @@ in
               })
               (sources."npm-package-arg-4.2.0" // {
                 dependencies = [
-                  sources."hosted-git-info-2.1.5"
+                  sources."hosted-git-info-2.2.0"
                   sources."semver-5.3.0"
                 ];
               })
@@ -21166,7 +21297,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -21289,7 +21420,7 @@ in
                     dependencies = [
                       (sources."array-index-1.0.0" // {
                         dependencies = [
-                          (sources."debug-2.6.0" // {
+                          (sources."debug-2.6.1" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -21408,7 +21539,7 @@ in
               (sources."request-2.74.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   (sources."bl-1.1.2" // {
                     dependencies = [
                       (sources."readable-stream-2.0.6" // {
@@ -21497,7 +21628,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -21816,7 +21947,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -21880,7 +22011,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -22313,7 +22444,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -22684,7 +22815,7 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."awscred-1.2.0"
       sources."ini-1.3.4"
       (sources."optimist-0.6.1" // {
@@ -22776,7 +22907,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -22948,7 +23079,7 @@ in
           sources."minimist-1.2.0"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -23059,10 +23190,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.14.1";
+    version = "3.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz";
-      sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz";
+      sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2";
     };
     dependencies = [
       (sources."babel-code-frame-6.22.0" // {
@@ -23103,7 +23234,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23295,14 +23426,14 @@ in
           sources."tryit-1.0.3"
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
-          sources."esprima-2.7.3"
+          sources."esprima-3.1.3"
         ];
       })
       (sources."json-stable-stringify-1.0.1" // {
@@ -23359,7 +23490,7 @@ in
       sources."strip-json-comments-2.0.1"
       (sources."table-3.8.3" // {
         dependencies = [
-          (sources."ajv-4.11.2" // {
+          (sources."ajv-4.11.3" // {
             dependencies = [
               sources."co-4.6.0"
             ];
@@ -23625,7 +23756,7 @@ in
               (sources."fsevents-1.0.17" // {
                 dependencies = [
                   sources."nan-2.5.1"
-                  (sources."node-pre-gyp-0.6.32" // {
+                  (sources."node-pre-gyp-0.6.33" // {
                     dependencies = [
                       (sources."mkdirp-0.5.1" // {
                         dependencies = [
@@ -23655,10 +23786,9 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.2" // {
+                          (sources."gauge-2.7.3" // {
                             dependencies = [
-                              sources."aproba-1.0.4"
-                              sources."supports-color-0.2.0"
+                              sources."aproba-1.1.1"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.1"
                               sources."signal-exit-3.0.2"
@@ -23694,7 +23824,7 @@ in
                       (sources."request-2.79.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
-                          sources."aws4-1.5.0"
+                          sources."aws4-1.6.0"
                           sources."caseless-0.11.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
@@ -23775,7 +23905,7 @@ in
                                   sources."assert-plus-1.0.0"
                                   sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
-                                  sources."jsbn-0.1.0"
+                                  sources."jsbn-0.1.1"
                                   sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
@@ -24239,7 +24369,7 @@ in
       })
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -24973,13 +25103,14 @@ in
           })
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
+          sources."esprima-3.1.3"
         ];
       })
       (sources."mkdirp-0.5.1" // {
@@ -25149,10 +25280,10 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.7.0";
+    version = "3.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-      sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+      sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
     };
     dependencies = [
       (sources."argparse-1.0.9" // {
@@ -25160,7 +25291,7 @@ in
           sources."sprintf-js-1.0.3"
         ];
       })
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25180,11 +25311,11 @@ in
     };
     dependencies = [
       sources."bluebird-3.4.7"
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -25328,7 +25459,7 @@ in
           (sources."fsevents-1.0.17" // {
             dependencies = [
               sources."nan-2.5.1"
-              (sources."node-pre-gyp-0.6.32" // {
+              (sources."node-pre-gyp-0.6.33" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -25358,10 +25489,9 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.2" // {
+                      (sources."gauge-2.7.3" // {
                         dependencies = [
-                          sources."aproba-1.0.4"
-                          sources."supports-color-0.2.0"
+                          sources."aproba-1.1.1"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.1"
                           sources."signal-exit-3.0.2"
@@ -25397,7 +25527,7 @@ in
                   (sources."request-2.79.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
-                      sources."aws4-1.5.0"
+                      sources."aws4-1.6.0"
                       sources."caseless-0.11.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
@@ -25478,7 +25608,7 @@ in
                               sources."assert-plus-1.0.0"
                               sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
-                              sources."jsbn-0.1.0"
+                              sources."jsbn-0.1.1"
                               sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
@@ -25787,7 +25917,7 @@ in
           sources."os-tmpdir-1.0.2"
         ];
       })
-      (sources."useragent-2.1.11" // {
+      (sources."useragent-2.1.12" // {
         dependencies = [
           sources."lru-cache-2.2.4"
         ];
@@ -26097,7 +26227,7 @@ in
       sources."connect-restreamer-1.0.3"
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -26413,6 +26543,94 @@ in
     };
     production = true;
   };
+  mocha = nodeEnv.buildNodePackage {
+    name = "mocha";
+    packageName = "mocha";
+    version = "3.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz";
+      sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3";
+    };
+    dependencies = [
+      sources."browser-stdout-1.3.0"
+      (sources."commander-2.9.0" // {
+        dependencies = [
+          sources."graceful-readlink-1.0.1"
+        ];
+      })
+      (sources."debug-2.2.0" // {
+        dependencies = [
+          sources."ms-0.7.1"
+        ];
+      })
+      sources."diff-1.4.0"
+      sources."escape-string-regexp-1.0.5"
+      (sources."glob-7.0.5" // {
+        dependencies = [
+          sources."fs.realpath-1.0.0"
+          (sources."inflight-1.0.6" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
+          sources."inherits-2.0.3"
+          (sources."minimatch-3.0.3" // {
+            dependencies = [
+              (sources."brace-expansion-1.1.6" // {
+                dependencies = [
+                  sources."balanced-match-0.4.2"
+                  sources."concat-map-0.0.1"
+                ];
+              })
+            ];
+          })
+          (sources."once-1.4.0" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
+          sources."path-is-absolute-1.0.1"
+        ];
+      })
+      sources."growl-1.9.2"
+      sources."json3-3.3.2"
+      (sources."lodash.create-3.1.1" // {
+        dependencies = [
+          (sources."lodash._baseassign-3.2.0" // {
+            dependencies = [
+              sources."lodash._basecopy-3.0.1"
+              (sources."lodash.keys-3.1.2" // {
+                dependencies = [
+                  sources."lodash._getnative-3.9.1"
+                  sources."lodash.isarguments-3.1.0"
+                  sources."lodash.isarray-3.0.4"
+                ];
+              })
+            ];
+          })
+          sources."lodash._basecreate-3.0.3"
+          sources."lodash._isiterateecall-3.0.9"
+        ];
+      })
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      (sources."supports-color-3.1.2" // {
+        dependencies = [
+          sources."has-flag-1.0.0"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "simple, flexible, fun test framework";
+      homepage = https://mochajs.org/;
+      license = "MIT";
+    };
+    production = true;
+  };
   nijs = nodeEnv.buildNodePackage {
     name = "nijs";
     packageName = "nijs";
@@ -26471,7 +26689,7 @@ in
           })
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -26491,7 +26709,7 @@ in
           })
           (sources."npm-package-arg-4.2.0" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
             ];
           })
           (sources."once-1.4.0" // {
@@ -26502,7 +26720,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -26583,7 +26801,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -26661,7 +26879,7 @@ in
               sources."console-control-strings-1.1.0"
               (sources."gauge-2.6.0" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
+                  sources."aproba-1.1.1"
                   sources."has-color-0.1.7"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
@@ -26878,10 +27096,9 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.3" // {
             dependencies = [
-              sources."aproba-1.0.4"
-              sources."supports-color-0.2.0"
+              sources."aproba-1.1.1"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
@@ -26915,7 +27132,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -26996,7 +27213,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -27128,7 +27345,7 @@ in
                       sources."map-obj-1.0.1"
                       (sources."normalize-package-data-2.3.5" // {
                         dependencies = [
-                          sources."hosted-git-info-2.1.5"
+                          sources."hosted-git-info-2.2.0"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -27237,7 +27454,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -27372,7 +27589,7 @@ in
       (sources."v8-debug-0.7.7" // {
         dependencies = [
           sources."nan-2.5.1"
-          (sources."node-pre-gyp-0.6.32" // {
+          (sources."node-pre-gyp-0.6.33" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27403,10 +27620,9 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.3" // {
                     dependencies = [
-                      sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."aproba-1.1.1"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -27434,7 +27650,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -27515,7 +27731,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -27640,7 +27856,7 @@ in
       (sources."v8-profiler-5.6.5" // {
         dependencies = [
           sources."nan-2.5.1"
-          (sources."node-pre-gyp-0.6.32" // {
+          (sources."node-pre-gyp-0.6.33" // {
             dependencies = [
               (sources."mkdirp-0.5.1" // {
                 dependencies = [
@@ -27671,10 +27887,9 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.3" // {
                     dependencies = [
-                      sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."aproba-1.1.1"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -27702,7 +27917,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -27783,7 +27998,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -28004,10 +28219,9 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.3" // {
             dependencies = [
-              sources."aproba-1.0.4"
-              sources."supports-color-0.2.0"
+              sources."aproba-1.1.1"
               sources."has-unicode-2.0.1"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
@@ -28043,7 +28257,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -28124,7 +28338,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -28369,7 +28583,7 @@ in
           (sources."fsevents-1.0.17" // {
             dependencies = [
               sources."nan-2.5.1"
-              (sources."node-pre-gyp-0.6.32" // {
+              (sources."node-pre-gyp-0.6.33" // {
                 dependencies = [
                   (sources."mkdirp-0.5.1" // {
                     dependencies = [
@@ -28399,10 +28613,9 @@ in
                         ];
                       })
                       sources."console-control-strings-1.1.0"
-                      (sources."gauge-2.7.2" // {
+                      (sources."gauge-2.7.3" // {
                         dependencies = [
-                          sources."aproba-1.0.4"
-                          sources."supports-color-0.2.0"
+                          sources."aproba-1.1.1"
                           sources."has-unicode-2.0.1"
                           sources."object-assign-4.1.1"
                           sources."signal-exit-3.0.2"
@@ -28438,7 +28651,7 @@ in
                   (sources."request-2.79.0" // {
                     dependencies = [
                       sources."aws-sign2-0.6.0"
-                      sources."aws4-1.5.0"
+                      sources."aws4-1.6.0"
                       sources."caseless-0.11.0"
                       (sources."combined-stream-1.0.5" // {
                         dependencies = [
@@ -28519,7 +28732,7 @@ in
                               sources."assert-plus-1.0.0"
                               sources."dashdash-1.14.1"
                               sources."getpass-0.1.6"
-                              sources."jsbn-0.1.0"
+                              sources."jsbn-0.1.1"
                               sources."tweetnacl-0.14.5"
                               sources."jodid25519-1.0.2"
                               sources."ecc-jsbn-0.1.1"
@@ -28615,7 +28828,7 @@ in
           })
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -29069,7 +29282,7 @@ in
       })
       (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29359,7 +29572,7 @@ in
         dependencies = [
           sources."uid2-0.0.3"
           sources."utils-merge-1.0.0"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -29451,7 +29664,7 @@ in
       })
       (sources."xml2js-0.4.17" // {
         dependencies = [
-          sources."sax-1.2.1"
+          sources."sax-1.2.2"
           (sources."xmlbuilder-4.2.1" // {
             dependencies = [
               sources."lodash-4.17.4"
@@ -29479,7 +29692,7 @@ in
           (sources."request-2.74.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               (sources."bl-1.1.2" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -29578,7 +29791,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -29608,7 +29821,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.15" // {
+      (sources."node-red-node-email-0.1.16" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -29628,7 +29841,7 @@ in
                       sources."libqp-1.1.0"
                       (sources."needle-0.10.0" // {
                         dependencies = [
-                          (sources."debug-2.6.0" // {
+                          (sources."debug-2.6.1" // {
                             dependencies = [
                               sources."ms-0.7.2"
                             ];
@@ -29642,7 +29855,7 @@ in
               })
               (sources."needle-0.11.0" // {
                 dependencies = [
-                  (sources."debug-2.6.0" // {
+                  (sources."debug-2.6.1" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -29716,7 +29929,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -29797,7 +30010,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -29858,10 +30071,9 @@ in
                     ];
                   })
                   sources."console-control-strings-1.1.0"
-                  (sources."gauge-2.7.2" // {
+                  (sources."gauge-2.7.3" // {
                     dependencies = [
-                      sources."aproba-1.0.4"
-                      sources."supports-color-0.2.0"
+                      sources."aproba-1.1.1"
                       sources."has-unicode-2.0.1"
                       sources."object-assign-4.1.1"
                       sources."signal-exit-3.0.2"
@@ -29897,7 +30109,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -29978,7 +30190,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -30162,7 +30374,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -30302,10 +30514,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.2";
+    version = "4.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-      sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+      url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz";
+      sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a";
     };
     dependencies = [
       (sources."JSONStream-1.3.0" // {
@@ -30315,6 +30527,7 @@ in
         ];
       })
       sources."abbrev-1.0.9"
+      sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
@@ -30417,7 +30630,7 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
-      (sources."mississippi-1.2.0" // {
+      (sources."mississippi-1.3.0" // {
         dependencies = [
           (sources."concat-stream-1.6.0" // {
             dependencies = [
@@ -30441,6 +30654,11 @@ in
           })
           sources."flush-write-stream-1.0.2"
           sources."from2-2.3.0"
+          (sources."parallel-transform-1.1.0" // {
+            dependencies = [
+              sources."cyclist-0.2.2"
+            ];
+          })
           sources."pump-1.0.2"
           sources."pumpify-1.3.5"
           (sources."stream-each-1.2.0" // {
@@ -30507,9 +30725,8 @@ in
             ];
           })
           sources."console-control-strings-1.1.0"
-          (sources."gauge-2.7.2" // {
+          (sources."gauge-2.7.3" // {
             dependencies = [
-              sources."supports-color-0.2.0"
               sources."object-assign-4.1.1"
               sources."signal-exit-3.0.2"
               (sources."string-width-1.0.2" // {
@@ -30587,7 +30804,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -30659,7 +30876,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -30741,7 +30958,6 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.1"
-      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -30792,7 +31008,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -30873,7 +31089,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -30959,10 +31175,9 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."aproba-1.1.1"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
@@ -31105,10 +31320,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.10";
+    version = "2.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz";
-      sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz";
+      sha1 = "9614c58ec84d31702a85881c844c3fb93611a585";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -31314,7 +31529,7 @@ in
                 dependencies = [
                   (sources."array-index-1.0.0" // {
                     dependencies = [
-                      (sources."debug-2.6.0" // {
+                      (sources."debug-2.6.1" // {
                         dependencies = [
                           sources."ms-0.7.2"
                         ];
@@ -31406,9 +31621,8 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."supports-color-0.2.0"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
@@ -31481,7 +31695,7 @@ in
           (sources."request-2.75.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               (sources."bl-1.1.2" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -31553,7 +31767,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -31826,11 +32040,11 @@ in
           sources."is-arguments-1.0.2"
         ];
       })
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -32126,14 +32340,14 @@ in
           sources."gelfling-0.2.0"
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
-          sources."esprima-2.7.3"
+          sources."esprima-3.1.3"
         ];
       })
       sources."mediawiki-title-0.5.6"
@@ -32144,7 +32358,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -32225,7 +32439,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -32263,7 +32477,7 @@ in
           sources."parseurl-1.3.1"
         ];
       })
-      (sources."service-runner-2.1.13" // {
+      (sources."service-runner-2.1.15" // {
         dependencies = [
           sources."bluebird-3.4.7"
           (sources."bunyan-1.8.5" // {
@@ -32363,8 +32577,9 @@ in
               })
             ];
           })
-          (sources."yargs-5.0.0" // {
+          (sources."yargs-6.6.0" // {
             dependencies = [
+              sources."camelcase-3.0.0"
               (sources."cliui-3.2.0" // {
                 dependencies = [
                   (sources."strip-ansi-3.0.1" // {
@@ -32377,7 +32592,6 @@ in
               })
               sources."decamelize-1.2.0"
               sources."get-caller-file-1.0.2"
-              sources."lodash.assign-4.2.0"
               (sources."os-locale-1.4.0" // {
                 dependencies = [
                   (sources."lcid-1.0.0" // {
@@ -32428,7 +32642,7 @@ in
                       })
                       (sources."normalize-package-data-2.3.5" // {
                         dependencies = [
-                          sources."hosted-git-info-2.1.5"
+                          sources."hosted-git-info-2.2.0"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -32480,13 +32694,8 @@ in
                 ];
               })
               sources."which-module-1.0.0"
-              sources."window-size-0.2.0"
               sources."y18n-3.2.1"
-              (sources."yargs-parser-3.2.0" // {
-                dependencies = [
-                  sources."camelcase-3.0.0"
-                ];
-              })
+              sources."yargs-parser-4.2.1"
             ];
           })
         ];
@@ -32557,7 +32766,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -32790,7 +32999,7 @@ in
                   sources."map-obj-1.0.1"
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -33082,9 +33291,9 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."random-access-file-1.4.0" // {
+              (sources."random-access-file-1.5.0" // {
                 dependencies = [
-                  (sources."debug-2.6.0" // {
+                  (sources."debug-2.6.1" // {
                     dependencies = [
                       sources."ms-0.7.2"
                     ];
@@ -33094,7 +33303,7 @@ in
               })
               sources."randombytes-2.0.3"
               sources."run-parallel-1.1.6"
-              sources."thunky-1.0.1"
+              sources."thunky-1.0.2"
             ];
           })
           sources."hat-0.0.3"
@@ -33204,7 +33413,7 @@ in
                           sources."randombytes-2.0.3"
                         ];
                       })
-                      (sources."k-rpc-socket-1.6.1" // {
+                      (sources."k-rpc-socket-1.6.2" // {
                         dependencies = [
                           sources."bencode-0.11.0"
                         ];
@@ -33238,7 +33447,7 @@ in
                       sources."unzip-response-2.0.1"
                     ];
                   })
-                  (sources."simple-peer-6.2.1" // {
+                  (sources."simple-peer-6.2.2" // {
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
@@ -33254,7 +33463,7 @@ in
                       })
                     ];
                   })
-                  (sources."simple-websocket-4.2.0" // {
+                  (sources."simple-websocket-4.3.0" // {
                     dependencies = [
                       (sources."readable-stream-2.2.2" // {
                         dependencies = [
@@ -33266,6 +33475,11 @@ in
                           sources."util-deprecate-1.0.2"
                         ];
                       })
+                      (sources."ws-2.0.3" // {
+                        dependencies = [
+                          sources."ultron-1.1.0"
+                        ];
+                      })
                     ];
                   })
                   (sources."string2compact-1.2.2" // {
@@ -33283,7 +33497,7 @@ in
                   })
                 ];
               })
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.6.1" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33657,7 +33871,7 @@ in
               sources."addr-to-ip-port-1.4.2"
               sources."bencode-0.7.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.6.1" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -33694,7 +33908,7 @@ in
               sources."bencode-0.6.0"
               sources."bn.js-1.3.0"
               sources."buffer-equal-0.0.1"
-              (sources."debug-2.6.0" // {
+              (sources."debug-2.6.1" // {
                 dependencies = [
                   sources."ms-0.7.2"
                 ];
@@ -34004,7 +34218,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -34150,11 +34364,11 @@ in
               sources."minimist-0.0.8"
             ];
           })
-          sources."private-0.1.6"
+          sources."private-0.1.7"
           sources."q-1.4.1"
-          (sources."recast-0.11.20" // {
+          (sources."recast-0.11.21" // {
             dependencies = [
-              sources."ast-types-0.9.4"
+              sources."ast-types-0.9.5"
               sources."esprima-3.1.3"
               sources."source-map-0.5.6"
             ];
@@ -34194,7 +34408,7 @@ in
         dependencies = [
           (sources."xml2js-0.2.4" // {
             dependencies = [
-              sources."sax-1.2.1"
+              sources."sax-1.2.2"
             ];
           })
           sources."xmlbuilder-0.4.2"
@@ -34250,7 +34464,7 @@ in
             ];
           })
           sources."cookie-signature-1.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -34282,7 +34496,7 @@ in
               (sources."request-2.79.0" // {
                 dependencies = [
                   sources."aws-sign2-0.6.0"
-                  sources."aws4-1.5.0"
+                  sources."aws4-1.6.0"
                   sources."caseless-0.11.0"
                   (sources."combined-stream-1.0.5" // {
                     dependencies = [
@@ -34363,7 +34577,7 @@ in
                           sources."assert-plus-1.0.0"
                           sources."dashdash-1.14.1"
                           sources."getpass-0.1.6"
-                          sources."jsbn-0.1.0"
+                          sources."jsbn-0.1.1"
                           sources."tweetnacl-0.14.5"
                           sources."jodid25519-1.0.2"
                           sources."ecc-jsbn-0.1.1"
@@ -34396,7 +34610,7 @@ in
           })
           (sources."xml2js-0.4.17" // {
             dependencies = [
-              sources."sax-1.2.1"
+              sources."sax-1.2.2"
               (sources."xmlbuilder-4.2.1" // {
                 dependencies = [
                   sources."lodash-4.17.4"
@@ -34536,11 +34750,11 @@ in
           })
         ];
       })
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
           sources."content-type-1.0.2"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -34602,14 +34816,14 @@ in
           sources."graceful-readlink-1.0.1"
         ];
       })
-      (sources."js-yaml-3.7.0" // {
+      (sources."js-yaml-3.8.1" // {
         dependencies = [
           (sources."argparse-1.0.9" // {
             dependencies = [
               sources."sprintf-js-1.0.3"
             ];
           })
-          sources."esprima-2.7.3"
+          sources."esprima-3.1.3"
         ];
       })
       (sources."cookies-0.6.2" // {
@@ -34621,7 +34835,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -34697,7 +34911,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -34989,7 +35203,7 @@ in
             dependencies = [
               sources."csv-generate-0.0.6"
               sources."csv-parse-1.2.0"
-              sources."stream-transform-0.1.1"
+              sources."stream-transform-0.1.2"
               sources."csv-stringify-0.0.8"
             ];
           })
@@ -35127,7 +35341,7 @@ in
             dependencies = [
               sources."asn1-0.2.3"
               sources."assert-plus-0.2.0"
-              sources."jsbn-0.1.0"
+              sources."jsbn-0.1.1"
               sources."tweetnacl-0.14.5"
               sources."jodid25519-1.0.2"
               sources."ecc-jsbn-0.1.1"
@@ -35195,7 +35409,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -35251,7 +35465,7 @@ in
       sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
     };
     dependencies = [
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       (sources."coa-1.0.1" // {
         dependencies = [
           sources."q-1.4.1"
@@ -35424,7 +35638,7 @@ in
           (sources."request-2.69.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               (sources."bl-1.0.3" // {
                 dependencies = [
                   (sources."readable-stream-2.0.6" // {
@@ -35523,7 +35737,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -35605,7 +35819,7 @@ in
       (sources."request-2.78.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -35686,7 +35900,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -35747,10 +35961,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.5";
+    version = "2.1.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
-      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz";
+      sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -35827,10 +36041,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.3";
+    version = "1.1.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz";
-      sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz";
+      sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b";
     };
     dependencies = [
       sources."async-2.1.4"
@@ -36345,9 +36559,8 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."supports-color-0.2.0"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
                   (sources."string-width-1.0.2" // {
@@ -36424,7 +36637,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -36496,7 +36709,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -36619,7 +36832,7 @@ in
           sources."graceful-fs-4.1.11"
           (sources."normalize-package-data-2.3.5" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
               (sources."is-builtin-module-1.0.0" // {
                 dependencies = [
                   sources."builtin-modules-1.1.1"
@@ -36639,7 +36852,7 @@ in
           })
           (sources."npm-package-arg-4.2.0" // {
             dependencies = [
-              sources."hosted-git-info-2.1.5"
+              sources."hosted-git-info-2.2.0"
             ];
           })
           (sources."once-1.4.0" // {
@@ -36650,7 +36863,7 @@ in
           (sources."request-2.79.0" // {
             dependencies = [
               sources."aws-sign2-0.6.0"
-              sources."aws4-1.5.0"
+              sources."aws4-1.6.0"
               sources."caseless-0.11.0"
               (sources."combined-stream-1.0.5" // {
                 dependencies = [
@@ -36731,7 +36944,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -36781,10 +36994,9 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."aproba-1.1.1"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
@@ -36825,7 +37037,7 @@ in
           sources."passport-strategy-1.0.0"
         ];
       })
-      (sources."raven-1.1.1" // {
+      (sources."raven-1.1.2" // {
         dependencies = [
           sources."cookie-0.3.1"
           sources."json-stringify-safe-5.0.1"
@@ -37042,7 +37254,7 @@ in
           sources."component-emitter-1.1.2"
           sources."methods-1.0.1"
           sources."cookiejar-2.0.1"
-          (sources."debug-2.6.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
@@ -37150,7 +37362,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -37391,7 +37603,7 @@ in
                       sources."assert-plus-1.0.0"
                       sources."dashdash-1.14.1"
                       sources."getpass-0.1.6"
-                      sources."jsbn-0.1.0"
+                      sources."jsbn-0.1.1"
                       sources."tweetnacl-0.14.5"
                       sources."jodid25519-1.0.2"
                       sources."ecc-jsbn-0.1.1"
@@ -37503,9 +37715,9 @@ in
       sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
     };
     dependencies = [
-      sources."acorn-4.0.4"
+      sources."acorn-4.0.11"
       sources."acorn-dynamic-import-2.0.1"
-      (sources."ajv-4.11.2" // {
+      (sources."ajv-4.11.3" // {
         dependencies = [
           sources."co-4.6.0"
           (sources."json-stable-stringify-1.0.1" // {
@@ -37521,7 +37733,7 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      (sources."enhanced-resolve-3.0.3" // {
+      (sources."enhanced-resolve-3.1.0" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
           sources."object-assign-4.1.1"
@@ -37611,9 +37823,9 @@ in
                 dependencies = [
                   sources."bn.js-4.11.6"
                   sources."browserify-rsa-4.0.1"
-                  (sources."elliptic-6.3.2" // {
+                  (sources."elliptic-6.3.3" // {
                     dependencies = [
-                      sources."brorand-1.0.6"
+                      sources."brorand-1.0.7"
                       sources."hash.js-1.0.3"
                     ];
                   })
@@ -37638,9 +37850,9 @@ in
               (sources."create-ecdh-4.0.0" // {
                 dependencies = [
                   sources."bn.js-4.11.6"
-                  (sources."elliptic-6.3.2" // {
+                  (sources."elliptic-6.3.3" // {
                     dependencies = [
-                      sources."brorand-1.0.6"
+                      sources."brorand-1.0.7"
                       sources."hash.js-1.0.3"
                     ];
                   })
@@ -37659,7 +37871,7 @@ in
                   sources."bn.js-4.11.6"
                   (sources."miller-rabin-4.0.0" // {
                     dependencies = [
-                      sources."brorand-1.0.6"
+                      sources."brorand-1.0.7"
                     ];
                   })
                 ];
@@ -37922,7 +38134,7 @@ in
               (sources."fsevents-1.0.17" // {
                 dependencies = [
                   sources."nan-2.5.1"
-                  (sources."node-pre-gyp-0.6.32" // {
+                  (sources."node-pre-gyp-0.6.33" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
                         dependencies = [
@@ -37947,10 +38159,9 @@ in
                             ];
                           })
                           sources."console-control-strings-1.1.0"
-                          (sources."gauge-2.7.2" // {
+                          (sources."gauge-2.7.3" // {
                             dependencies = [
-                              sources."aproba-1.0.4"
-                              sources."supports-color-0.2.0"
+                              sources."aproba-1.1.1"
                               sources."has-unicode-2.0.1"
                               sources."object-assign-4.1.1"
                               sources."signal-exit-3.0.2"
@@ -37986,7 +38197,7 @@ in
                       (sources."request-2.79.0" // {
                         dependencies = [
                           sources."aws-sign2-0.6.0"
-                          sources."aws4-1.5.0"
+                          sources."aws4-1.6.0"
                           sources."caseless-0.11.0"
                           (sources."combined-stream-1.0.5" // {
                             dependencies = [
@@ -38067,7 +38278,7 @@ in
                                   sources."assert-plus-1.0.0"
                                   sources."dashdash-1.14.1"
                                   sources."getpass-0.1.6"
-                                  sources."jsbn-0.1.0"
+                                  sources."jsbn-0.1.1"
                                   sources."tweetnacl-0.14.5"
                                   sources."jodid25519-1.0.2"
                                   sources."ecc-jsbn-0.1.1"
@@ -38251,7 +38462,7 @@ in
                   })
                   (sources."normalize-package-data-2.3.5" // {
                     dependencies = [
-                      sources."hosted-git-info-2.1.5"
+                      sources."hosted-git-info-2.2.0"
                       (sources."is-builtin-module-1.0.0" // {
                         dependencies = [
                           sources."builtin-modules-1.1.1"
@@ -38378,7 +38589,7 @@ in
         ];
       })
       sources."death-1.1.0"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -38572,10 +38783,9 @@ in
                 ];
               })
               sources."console-control-strings-1.1.0"
-              (sources."gauge-2.7.2" // {
+              (sources."gauge-2.7.3" // {
                 dependencies = [
-                  sources."aproba-1.0.4"
-                  sources."supports-color-0.2.0"
+                  sources."aproba-1.1.1"
                   sources."has-unicode-2.0.1"
                   sources."object-assign-4.1.1"
                   sources."signal-exit-3.0.2"
@@ -38637,7 +38847,7 @@ in
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
-          sources."aws4-1.5.0"
+          sources."aws4-1.6.0"
           sources."caseless-0.11.0"
           (sources."combined-stream-1.0.5" // {
             dependencies = [
@@ -38696,7 +38906,7 @@ in
                   sources."assert-plus-1.0.0"
                   sources."dashdash-1.14.1"
                   sources."getpass-0.1.6"
-                  sources."jsbn-0.1.0"
+                  sources."jsbn-0.1.1"
                   sources."tweetnacl-0.14.5"
                   sources."jodid25519-1.0.2"
                   sources."ecc-jsbn-0.1.1"
@@ -38815,4 +39025,4 @@ in
     };
     production = true;
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index dc11038fcd01..fd7a6ed52fc1 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -400,13 +400,13 @@ let
         sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f";
       };
     };
-    "azure-arm-cdn-1.0.0" = {
+    "azure-arm-cdn-1.0.2" = {
       name = "azure-arm-cdn";
       packageName = "azure-arm-cdn";
-      version = "1.0.0";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz";
-        sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85";
+        url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz";
+        sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96";
       };
     };
     "azure-arm-commerce-0.2.0" = {
@@ -418,13 +418,13 @@ let
         sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd";
       };
     };
-    "azure-arm-compute-0.19.1" = {
+    "azure-arm-compute-0.20.0" = {
       name = "azure-arm-compute";
       packageName = "azure-arm-compute";
-      version = "0.19.1";
+      version = "0.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz";
-        sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd";
+        url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz";
+        sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32";
       };
     };
     "azure-arm-datalake-analytics-1.0.1-preview" = {
@@ -535,13 +535,13 @@ let
         sha1 = "6972dd9844a0d12376d74014b541c49247caa37d";
       };
     };
-    "azure-arm-rediscache-0.2.1" = {
+    "azure-arm-rediscache-0.2.3" = {
       name = "azure-arm-rediscache";
       packageName = "azure-arm-rediscache";
-      version = "0.2.1";
+      version = "0.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz";
-        sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02";
+        url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz";
+        sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06";
       };
     };
     "azure-arm-devtestlabs-0.1.0" = {
@@ -724,13 +724,13 @@ let
         sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb";
       };
     };
-    "azure-servicefabric-0.1.4" = {
+    "azure-servicefabric-0.1.5" = {
       name = "azure-servicefabric";
       packageName = "azure-servicefabric";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz";
-        sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e";
+        url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz";
+        sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6";
       };
     };
     "applicationinsights-0.16.0" = {
@@ -1687,13 +1687,13 @@ let
         sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
       };
     };
-    "aws4-1.5.0" = {
+    "aws4-1.6.0" = {
       name = "aws4";
       packageName = "aws4";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz";
-        sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755";
+        url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz";
+        sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e";
       };
     };
     "bl-1.1.2" = {
@@ -2155,13 +2155,13 @@ let
         sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6";
       };
     };
-    "jsbn-0.1.0" = {
+    "jsbn-0.1.1" = {
       name = "jsbn";
       packageName = "jsbn";
-      version = "0.1.0";
+      version = "0.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
-        sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
+        url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz";
+        sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -2812,13 +2812,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.1.5" = {
+    "hosted-git-info-2.2.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.1.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
-        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -3091,13 +3091,13 @@ let
         sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
       };
     };
-    "debug-2.6.0" = {
+    "debug-2.6.1" = {
       name = "debug";
       packageName = "debug";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz";
+        sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351";
       };
     };
     "ms-0.7.2" = {
@@ -3172,13 +3172,13 @@ let
         sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
       };
     };
-    "buffer-5.0.2" = {
+    "buffer-5.0.5" = {
       name = "buffer";
       packageName = "buffer";
-      version = "5.0.2";
+      version = "5.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz";
-        sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d";
+        url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz";
+        sha1 = "35c9393244a90aff83581063d16f0882cecc9418";
       };
     };
     "cached-path-relative-1.0.0" = {
@@ -3766,13 +3766,13 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.2" = {
+    "elliptic-6.3.3" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.2";
+      version = "6.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz";
-        sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz";
+        sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f";
       };
     };
     "parse-asn1-5.0.0" = {
@@ -3784,13 +3784,13 @@ let
         sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
       };
     };
-    "brorand-1.0.6" = {
+    "brorand-1.0.7" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.6";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz";
-        sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz";
+        sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc";
       };
     };
     "hash.js-1.0.3" = {
@@ -4927,13 +4927,13 @@ let
         sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
       };
     };
-    "random-access-file-1.4.0" = {
+    "random-access-file-1.5.0" = {
       name = "random-access-file";
       packageName = "random-access-file";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz";
-        sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767";
+        url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz";
+        sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17";
       };
     };
     "run-parallel-1.1.6" = {
@@ -4945,13 +4945,13 @@ let
         sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039";
       };
     };
-    "thunky-1.0.1" = {
+    "thunky-1.0.2" = {
       name = "thunky";
       packageName = "thunky";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz";
-        sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68";
+        url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz";
+        sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371";
       };
     };
     "ip-1.1.4" = {
@@ -5152,13 +5152,13 @@ let
         sha1 = "58cccb244f563326ba893bf5c06a35f644846daa";
       };
     };
-    "k-rpc-socket-1.6.1" = {
+    "k-rpc-socket-1.6.2" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
-      version = "1.6.1";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz";
-        sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e";
+        url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz";
+        sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21";
       };
     };
     "bencode-0.8.0" = {
@@ -5197,22 +5197,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.2.1" = {
+    "simple-peer-6.2.2" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz";
-        sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz";
+        sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba";
       };
     };
-    "simple-websocket-4.2.0" = {
+    "simple-websocket-4.3.0" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.2.0";
+      version = "4.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz";
-        sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz";
+        sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea";
       };
     };
     "string2compact-1.2.2" = {
@@ -5251,6 +5251,24 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
+    "ws-2.0.3" = {
+      name = "ws";
+      packageName = "ws";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz";
+        sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb";
+      };
+    };
+    "ultron-1.1.0" = {
+      name = "ultron";
+      packageName = "ultron";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz";
+        sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864";
+      };
+    };
     "addr-to-ip-port-1.4.2" = {
       name = "addr-to-ip-port";
       packageName = "addr-to-ip-port";
@@ -5548,13 +5566,13 @@ let
         sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc";
       };
     };
-    "sax-1.2.1" = {
+    "sax-1.2.2" = {
       name = "sax";
       packageName = "sax";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
-        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz";
+        sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828";
       };
     };
     "xmlbuilder-4.2.1" = {
@@ -6655,6 +6673,15 @@ let
         sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a";
       };
     };
+    "hosted-git-info-2.1.5" = {
+      name = "hosted-git-info";
+      packageName = "hosted-git-info";
+      version = "2.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
+        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+      };
+    };
     "lockfile-1.0.3" = {
       name = "lockfile";
       packageName = "lockfile";
@@ -9080,13 +9107,13 @@ let
         sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
       };
     };
-    "js-yaml-3.7.0" = {
+    "js-yaml-3.8.1" = {
       name = "js-yaml";
       packageName = "js-yaml";
-      version = "3.7.0";
+      version = "3.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+        sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
       };
     };
     "json-stable-stringify-1.0.1" = {
@@ -9386,13 +9413,13 @@ let
         sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86";
       };
     };
-    "esprima-2.7.3" = {
+    "esprima-3.1.3" = {
       name = "esprima";
       packageName = "esprima";
-      version = "2.7.3";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
-        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
+        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -9467,13 +9494,13 @@ let
         sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
       };
     };
-    "ajv-4.11.2" = {
+    "ajv-4.11.3" = {
       name = "ajv";
       packageName = "ajv";
-      version = "4.11.2";
+      version = "4.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz";
-        sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz";
+        sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -10061,13 +10088,13 @@ let
         sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
       };
     };
-    "gauge-2.7.2" = {
+    "gauge-2.7.3" = {
       name = "gauge";
       packageName = "gauge";
-      version = "2.7.2";
+      version = "2.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz";
-        sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774";
+        url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz";
+        sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09";
       };
     };
     "set-blocking-2.0.0" = {
@@ -10079,13 +10106,13 @@ let
         sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7";
       };
     };
-    "aproba-1.0.4" = {
+    "aproba-1.1.1" = {
       name = "aproba";
       packageName = "aproba";
-      version = "1.0.4";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz";
+        sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab";
       };
     };
     "wide-align-1.1.0" = {
@@ -11448,6 +11475,15 @@ let
         sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018";
       };
     };
+    "esprima-2.7.3" = {
+      name = "esprima";
+      packageName = "esprima";
+      version = "2.7.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz";
+        sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581";
+      };
+    };
     "handlebars-4.0.6" = {
       name = "handlebars";
       packageName = "handlebars";
@@ -11520,13 +11556,13 @@ let
         sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3";
       };
     };
-    "body-parser-1.16.0" = {
+    "body-parser-1.16.1" = {
       name = "body-parser";
       packageName = "body-parser";
-      version = "1.16.0";
+      version = "1.16.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz";
-        sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b";
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz";
+        sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329";
       };
     };
     "combine-lists-1.0.1" = {
@@ -11637,13 +11673,13 @@ let
         sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
       };
     };
-    "useragent-2.1.11" = {
+    "useragent-2.1.12" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.1.11";
+      version = "2.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz";
-        sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz";
+        sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2";
       };
     };
     "bytes-2.4.0" = {
@@ -12834,6 +12870,78 @@ let
         sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
       };
     };
+    "browser-stdout-1.3.0" = {
+      name = "browser-stdout";
+      packageName = "browser-stdout";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz";
+        sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f";
+      };
+    };
+    "diff-1.4.0" = {
+      name = "diff";
+      packageName = "diff";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
+      };
+    };
+    "glob-7.0.5" = {
+      name = "glob";
+      packageName = "glob";
+      version = "7.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz";
+        sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95";
+      };
+    };
+    "growl-1.9.2" = {
+      name = "growl";
+      packageName = "growl";
+      version = "1.9.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz";
+        sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f";
+      };
+    };
+    "lodash.create-3.1.1" = {
+      name = "lodash.create";
+      packageName = "lodash.create";
+      version = "3.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz";
+        sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7";
+      };
+    };
+    "supports-color-3.1.2" = {
+      name = "supports-color";
+      packageName = "supports-color";
+      version = "3.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
+        sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
+      };
+    };
+    "lodash._baseassign-3.2.0" = {
+      name = "lodash._baseassign";
+      packageName = "lodash._baseassign";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
+        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
+      };
+    };
+    "lodash._basecreate-3.0.3" = {
+      name = "lodash._basecreate";
+      packageName = "lodash._basecreate";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz";
+        sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821";
+      };
+    };
     "optparse-1.0.5" = {
       name = "optparse";
       packageName = "optparse";
@@ -13239,15 +13347,6 @@ let
         sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
       };
     };
-    "lodash._baseassign-3.2.0" = {
-      name = "lodash._baseassign";
-      packageName = "lodash._baseassign";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
-        sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
-      };
-    };
     "lodash._createassigner-3.1.1" = {
       name = "lodash._createassigner";
       packageName = "lodash._createassigner";
@@ -13383,6 +13482,15 @@ let
         sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
       };
     };
+    "js-yaml-3.7.0" = {
+      name = "js-yaml";
+      packageName = "js-yaml";
+      version = "3.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
+        sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      };
+    };
     "jsonata-1.0.10" = {
       name = "jsonata";
       packageName = "jsonata";
@@ -13464,13 +13572,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.15" = {
+    "node-red-node-email-0.1.16" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.15";
+      version = "0.1.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz";
-        sha1 = "7a528596d3b693a077b1ee293300299855537142";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz";
+        sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -14031,6 +14139,15 @@ let
         sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
       };
     };
+    "node-pre-gyp-0.6.32" = {
+      name = "node-pre-gyp";
+      packageName = "node-pre-gyp";
+      version = "0.6.32";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz";
+        sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5";
+      };
+    };
     "mongoose-3.6.7" = {
       name = "mongoose";
       packageName = "mongoose";
@@ -14616,6 +14733,15 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
+    "aproba-1.0.4" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
+        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+      };
+    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14670,13 +14796,13 @@ let
         sha1 = "3cd4574a00b67bae373a94b748772640507b7aac";
       };
     };
-    "mississippi-1.2.0" = {
+    "mississippi-1.3.0" = {
       name = "mississippi";
       packageName = "mississippi";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
-        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz";
+        sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5";
       };
     };
     "node-gyp-3.5.0" = {
@@ -14814,6 +14940,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "parallel-transform-1.1.0" = {
+      name = "parallel-transform";
+      packageName = "parallel-transform";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz";
+        sha1 = "d410f065b05da23081fcd10f28854c29bda33b06";
+      };
+    };
     "stream-each-1.2.0" = {
       name = "stream-each";
       packageName = "stream-each";
@@ -14823,6 +14958,15 @@ let
         sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991";
       };
     };
+    "cyclist-0.2.2" = {
+      name = "cyclist";
+      packageName = "cyclist";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz";
+        sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640";
+      };
+    };
     "stream-iterate-1.2.0" = {
       name = "stream-iterate";
       packageName = "stream-iterate";
@@ -15310,15 +15454,6 @@ let
         sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
       };
     };
-    "diff-1.4.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
-        sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
-      };
-    };
     "domino-1.0.28" = {
       name = "domino";
       packageName = "domino";
@@ -15384,13 +15519,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.13" = {
+    "service-runner-2.1.15" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.13";
+      version = "2.1.15";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz";
-        sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz";
+        sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb";
       };
     };
     "simplediff-0.1.1" = {
@@ -15519,13 +15654,13 @@ let
         sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
       };
     };
-    "yargs-5.0.0" = {
+    "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
-      version = "5.0.0";
+      version = "6.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz";
-        sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e";
+        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
+        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
     "dtrace-provider-0.8.0" = {
@@ -15655,6 +15790,15 @@ let
         sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0";
       };
     };
+    "camelcase-3.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
+        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
+      };
+    };
     "get-caller-file-1.0.2" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -15664,15 +15808,6 @@ let
         sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
-      };
-    };
     "require-directory-2.1.1" = {
       name = "require-directory";
       packageName = "require-directory";
@@ -15700,6 +15835,24 @@ let
         sha1 = "bba63ca861948994ff307736089e3b96026c2a4f";
       };
     };
+    "yargs-parser-4.2.1" = {
+      name = "yargs-parser";
+      packageName = "yargs-parser";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
+        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
+      };
+    };
+    "lodash.assign-4.2.0" = {
+      name = "lodash.assign";
+      packageName = "lodash.assign";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
+        sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7";
+      };
+    };
     "window-size-0.2.0" = {
       name = "window-size";
       packageName = "window-size";
@@ -15709,24 +15862,6 @@ let
         sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
       };
     };
-    "yargs-parser-3.2.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz";
-        sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f";
-      };
-    };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a";
-      };
-    };
     "yargs-parser-2.4.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -16663,40 +16798,31 @@ let
         sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
       };
     };
-    "private-0.1.6" = {
+    "private-0.1.7" = {
       name = "private";
       packageName = "private";
-      version = "0.1.6";
+      version = "0.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz";
-        sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
+        url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz";
+        sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.20" = {
+    "recast-0.11.21" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.20";
+      version = "0.11.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz";
-        sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz";
+        sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9";
       };
     };
-    "ast-types-0.9.4" = {
+    "ast-types-0.9.5" = {
       name = "ast-types";
       packageName = "ast-types";
-      version = "0.9.4";
+      version = "0.9.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz";
-        sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b";
-      };
-    };
-    "esprima-3.1.3" = {
-      name = "esprima";
-      packageName = "esprima";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz";
-        sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633";
+        url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz";
+        sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a";
       };
     };
     "base62-0.1.1" = {
@@ -17366,13 +17492,13 @@ let
         sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425";
       };
     };
-    "stream-transform-0.1.1" = {
+    "stream-transform-0.1.2" = {
       name = "stream-transform";
       packageName = "stream-transform";
-      version = "0.1.1";
+      version = "0.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz";
-        sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71";
+        url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz";
+        sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f";
       };
     };
     "csv-stringify-0.0.8" = {
@@ -17888,13 +18014,13 @@ let
         sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
       };
     };
-    "raven-1.1.1" = {
+    "raven-1.1.2" = {
       name = "raven";
       packageName = "raven";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz";
-        sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42";
+        url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz";
+        sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718";
       };
     };
     "signals-1.0.0" = {
@@ -17924,15 +18050,6 @@ let
         sha1 = "0b48420d978c01804cf0230b648861598225a119";
       };
     };
-    "yargs-6.6.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "6.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz";
-        sha1 = "782ec21ef403345f830a808ca3d513af56065208";
-      };
-    };
     "color-convert-1.9.0" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -18140,6 +18257,15 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
+    "mississippi-1.2.0" = {
+      name = "mississippi";
+      packageName = "mississippi";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz";
+        sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c";
+      };
+    };
     "lsmod-1.0.0" = {
       name = "lsmod";
       packageName = "lsmod";
@@ -18167,15 +18293,6 @@ let
         sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
       };
     };
-    "yargs-parser-4.2.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz";
-        sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
-      };
-    };
     "kew-0.1.7" = {
       name = "kew";
       packageName = "kew";
@@ -18221,6 +18338,15 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
+    "acorn-4.0.11" = {
+      name = "acorn";
+      packageName = "acorn";
+      version = "4.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
+        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
+      };
+    };
     "acorn-dynamic-import-2.0.1" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
@@ -18230,13 +18356,13 @@ let
         sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2";
       };
     };
-    "enhanced-resolve-3.0.3" = {
+    "enhanced-resolve-3.1.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "3.0.3";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz";
-        sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz";
+        sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec";
       };
     };
     "json-loader-0.5.4" = {
@@ -18583,10 +18709,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.8";
+    version = "0.10.9";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz";
-      sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz";
+      sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -18598,9 +18724,9 @@ in
         ];
       })
       sources."azure-arm-authorization-2.0.0"
-      sources."azure-arm-cdn-1.0.0"
+      sources."azure-arm-cdn-1.0.2"
       sources."azure-arm-commerce-0.2.0"
-      sources."azure-arm-compute-0.19.1"
+      sources."azure-arm-compute-0.20.0"
       sources."azure-arm-datalake-analytics-1.0.1-preview"
       sources."azure-arm-datalake-store-1.0.1-preview"
       sources."azure-arm-hdinsight-0.2.2"
@@ -18613,7 +18739,7 @@ in
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
       sources."azure-arm-website-0.11.4"
-      sources."azure-arm-rediscache-0.2.1"
+      sources."azure-arm-rediscache-0.2.3"
       sources."azure-arm-devtestlabs-0.1.0"
       sources."azure-graph-1.1.1"
       sources."azure-gallery-2.0.0-pre.18"
@@ -18648,7 +18774,7 @@ in
       })
       sources."azure-arm-batch-0.3.0"
       sources."azure-batch-0.5.2"
-      sources."azure-servicefabric-0.1.4"
+      sources."azure-servicefabric-0.1.5"
       sources."applicationinsights-0.16.0"
       sources."caller-id-0.1.0"
       sources."colors-1.1.2"
@@ -18794,7 +18920,7 @@ in
       sources."cycle-1.0.3"
       sources."isstream-0.1.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -18866,7 +18992,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -18994,7 +19120,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -19054,7 +19180,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."q-1.4.1"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -19089,7 +19215,7 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      sources."buffer-5.0.2"
+      sources."buffer-5.0.5"
       sources."cached-path-relative-1.0.0"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
@@ -19186,9 +19312,9 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.2"
+      sources."elliptic-6.3.3"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.6"
+      sources."brorand-1.0.7"
       sources."hash.js-1.0.3"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -19251,7 +19377,7 @@ in
       sources."chalk-1.0.0"
       sources."chromecast-player-0.2.3"
       sources."debounced-seeker-1.0.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."diveSync-0.3.0"
       sources."got-1.2.2"
       sources."internal-ip-1.2.0"
@@ -19340,7 +19466,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -19454,7 +19580,7 @@ in
       (sources."fs-chunk-store-1.6.4" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
@@ -19466,10 +19592,10 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.4.0" // {
+      (sources."random-access-file-1.5.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
@@ -19519,33 +19645,38 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.1"
+      sources."k-rpc-socket-1.6.2"
       sources."bn.js-4.11.6"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.2.1" // {
+      (sources."simple-peer-6.2.2" // {
         dependencies = [
           sources."readable-stream-2.2.2"
           sources."isarray-1.0.0"
         ];
       })
-      (sources."simple-websocket-4.2.0" // {
+      (sources."simple-websocket-4.3.0" // {
         dependencies = [
           sources."readable-stream-2.2.2"
+          sources."ws-2.0.3"
           sources."isarray-1.0.0"
         ];
       })
       sources."string2compact-1.2.2"
-      sources."ws-1.1.1"
+      (sources."ws-1.1.1" // {
+        dependencies = [
+          sources."ultron-1.0.2"
+        ];
+      })
       sources."ipaddr.js-1.2.0"
       sources."get-browser-rtc-1.0.2"
       sources."buffer-shims-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."util-deprecate-1.0.2"
+      sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
-      sources."ultron-1.0.2"
       sources."pad-0.0.5"
       sources."single-line-log-0.4.1"
       (sources."request-2.16.6" // {
@@ -19587,7 +19718,7 @@ in
       sources."commander-2.9.0"
       sources."typedarray-0.0.6"
       sources."graceful-readlink-1.0.1"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."underscore-1.6.0"
     ];
     buildInputs = globalBuildInputs;
@@ -19710,6 +19841,7 @@ in
       (sources."npm-2.15.11" // {
         dependencies = [
           sources."glob-7.0.6"
+          sources."hosted-git-info-2.1.5"
           sources."nopt-3.0.6"
           sources."npm-package-arg-4.1.1"
           sources."readable-stream-2.1.5"
@@ -19878,9 +20010,9 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.2"
+      sources."elliptic-6.3.3"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.6"
+      sources."brorand-1.0.7"
       sources."hash.js-1.0.3"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -19975,7 +20107,7 @@ in
       })
       sources."validate-npm-package-license-3.0.1"
       sources."validate-npm-package-name-2.2.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."mute-stream-0.0.7"
       sources."json-parse-helpfulerror-1.0.3"
       sources."normalize-package-data-2.3.5"
@@ -20066,7 +20198,7 @@ in
       sources."es5-ext-0.10.12"
       sources."es6-iterator-2.0.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -20119,7 +20251,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -20545,7 +20677,7 @@ in
     dependencies = [
       sources."JSONStream-1.3.0"
       sources."async-2.1.4"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."awscred-1.2.0"
       sources."ini-1.3.4"
       sources."optimist-0.6.1"
@@ -20618,7 +20750,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -20706,7 +20838,7 @@ in
       sources."camelcase-2.1.1"
       sources."currently-unhandled-0.4.1"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -20744,16 +20876,16 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.14.1";
+    version = "3.15.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz";
-      sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz";
+      sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2";
     };
     dependencies = [
       sources."babel-code-frame-6.22.0"
       sources."chalk-1.1.3"
       sources."concat-stream-1.6.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."doctrine-1.5.0"
       sources."escope-3.6.0"
       sources."espree-3.4.0"
@@ -20767,7 +20899,7 @@ in
       sources."inquirer-0.12.0"
       sources."is-my-json-valid-2.15.0"
       sources."is-resolvable-1.0.0"
-      sources."js-yaml-3.7.0"
+      sources."js-yaml-3.8.1"
       sources."json-stable-stringify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.4"
@@ -20874,7 +21006,7 @@ in
       sources."is-property-1.0.2"
       sources."tryit-1.0.3"
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
       sources."jsonify-0.0.0"
       sources."prelude-ls-1.1.2"
@@ -20889,7 +21021,7 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."resolve-1.2.0"
-      sources."ajv-4.11.2"
+      sources."ajv-4.11.3"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
       sources."co-4.6.0"
@@ -21062,7 +21194,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -21088,15 +21220,14 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
+      (sources."gauge-2.7.3" // {
         dependencies = [
           sources."object-assign-4.1.1"
         ];
       })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -21110,7 +21241,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -21131,17 +21262,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -21174,7 +21302,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -21356,7 +21484,7 @@ in
       sources."acorn-globals-1.0.9"
       sources."pop-iterate-1.0.1"
       sources."weak-map-1.0.5"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
       sources."nan-2.5.1"
@@ -21708,7 +21836,11 @@ in
           sources."source-map-0.4.4"
         ];
       })
-      sources."js-yaml-3.7.0"
+      (sources."js-yaml-3.8.1" // {
+        dependencies = [
+          sources."esprima-3.1.3"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -21884,14 +22016,14 @@ in
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
-    version = "3.7.0";
+    version = "3.8.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz";
-      sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz";
+      sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628";
     };
     dependencies = [
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
     ];
     buildInputs = globalBuildInputs;
@@ -21912,7 +22044,7 @@ in
     };
     dependencies = [
       sources."bluebird-3.4.7"
-      sources."body-parser-1.16.0"
+      sources."body-parser-1.16.1"
       sources."chokidar-1.6.1"
       sources."colors-1.1.2"
       (sources."combine-lists-1.0.1" // {
@@ -21964,10 +22096,10 @@ in
       })
       sources."source-map-0.5.6"
       sources."tmp-0.0.28"
-      sources."useragent-2.1.11"
+      sources."useragent-2.1.12"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."depd-1.1.0"
       sources."http-errors-1.5.1"
       sources."iconv-lite-0.4.15"
@@ -22034,7 +22166,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
@@ -22061,11 +22193,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -22080,7 +22211,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -22099,17 +22230,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -22142,7 +22270,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -22396,7 +22524,7 @@ in
       sources."oauth-0.9.15"
       sources."passport-oauth2-1.4.0"
       sources."uid2-0.0.3"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
     ];
@@ -22572,6 +22700,57 @@ in
     };
     production = true;
   };
+  mocha = nodeEnv.buildNodePackage {
+    name = "mocha";
+    packageName = "mocha";
+    version = "3.2.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz";
+      sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3";
+    };
+    dependencies = [
+      sources."browser-stdout-1.3.0"
+      sources."commander-2.9.0"
+      sources."debug-2.2.0"
+      sources."diff-1.4.0"
+      sources."escape-string-regexp-1.0.5"
+      sources."glob-7.0.5"
+      sources."growl-1.9.2"
+      sources."json3-3.3.2"
+      sources."lodash.create-3.1.1"
+      sources."mkdirp-0.5.1"
+      sources."supports-color-3.1.2"
+      sources."graceful-readlink-1.0.1"
+      sources."ms-0.7.1"
+      sources."fs.realpath-1.0.0"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."minimatch-3.0.3"
+      sources."once-1.4.0"
+      sources."path-is-absolute-1.0.1"
+      sources."wrappy-1.0.2"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."lodash._baseassign-3.2.0"
+      sources."lodash._basecreate-3.0.3"
+      sources."lodash._isiterateecall-3.0.9"
+      sources."lodash._basecopy-3.0.1"
+      sources."lodash.keys-3.1.2"
+      sources."lodash._getnative-3.9.1"
+      sources."lodash.isarguments-3.1.0"
+      sources."lodash.isarray-3.0.4"
+      sources."minimist-0.0.8"
+      sources."has-flag-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "simple, flexible, fun test framework";
+      homepage = https://mochajs.org/;
+      license = "MIT";
+    };
+    production = true;
+  };
   nijs = nodeEnv.buildNodePackage {
     name = "nijs";
     packageName = "nijs";
@@ -22646,7 +22825,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."minimist-0.0.8"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -22655,7 +22834,7 @@ in
       sources."spdx-license-ids-1.2.2"
       sources."wrappy-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -22718,7 +22897,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -22738,7 +22917,7 @@ in
       sources."gauge-2.6.0"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-color-0.1.7"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
@@ -22813,7 +22992,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -22823,8 +23002,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -22838,7 +23016,7 @@ in
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -22859,17 +23037,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -22902,7 +23077,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -22931,7 +23106,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."biased-opener-0.2.8"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       (sources."express-4.14.1" // {
         dependencies = [
           sources."debug-2.2.0"
@@ -22998,7 +23173,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -23090,7 +23265,7 @@ in
       sources."strip-json-comments-1.0.4"
       sources."truncate-1.0.5"
       sources."nan-2.5.1"
-      (sources."node-pre-gyp-0.6.32" // {
+      (sources."node-pre-gyp-0.6.33" // {
         dependencies = [
           sources."rimraf-2.5.4"
           sources."semver-5.3.0"
@@ -23118,7 +23293,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23127,8 +23302,7 @@ in
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
@@ -23137,7 +23311,7 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."ansi-regex-2.1.1"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -23156,16 +23330,13 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -23196,7 +23367,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -23256,7 +23427,7 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -23267,8 +23438,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -23283,7 +23453,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -23304,17 +23474,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -23347,7 +23514,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -23390,7 +23557,7 @@ in
     };
     dependencies = [
       sources."chokidar-1.6.1"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -23459,7 +23626,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
@@ -23483,11 +23650,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
-      sources."supports-color-0.2.0"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -23502,7 +23668,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -23523,17 +23689,14 @@ in
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -23566,7 +23729,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -23678,7 +23841,7 @@ in
       sources."express-4.14.0"
       (sources."follow-redirects-1.2.1" // {
         dependencies = [
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
           sources."ms-0.7.2"
         ];
       })
@@ -23714,7 +23877,7 @@ in
       sources."ws-1.1.1"
       sources."xml2js-0.4.17"
       sources."node-red-node-feedparser-0.1.7"
-      sources."node-red-node-email-0.1.15"
+      sources."node-red-node-email-0.1.16"
       (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
           sources."request-2.79.0"
@@ -23938,7 +24101,7 @@ in
       sources."longest-1.0.1"
       sources."options-0.0.6"
       sources."ultron-1.0.2"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."xmlbuilder-4.2.1"
       sources."lodash-4.17.4"
       (sources."feedparser-1.1.3" // {
@@ -23957,7 +24120,7 @@ in
       sources."addressparser-0.1.3"
       sources."array-indexofobject-0.0.1"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
@@ -24018,7 +24181,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -24098,14 +24261,10 @@ in
       })
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -24185,7 +24344,7 @@ in
       sources."methods-0.0.1"
       sources."send-0.1.0"
       sources."cookie-signature-1.0.1"
-      (sources."debug-2.6.0" // {
+      (sources."debug-2.6.1" // {
         dependencies = [
           sources."ms-0.7.2"
         ];
@@ -24260,14 +24419,15 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.1.2";
+    version = "4.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz";
-      sha1 = "daaa77d631947135b36528c304573243f5cd2e07";
+      url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz";
+      sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a";
     };
     dependencies = [
       sources."JSONStream-1.3.0"
       sources."abbrev-1.0.9"
+      sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
@@ -24302,7 +24462,7 @@ in
       sources."lodash.union-4.6.0"
       sources."lodash.uniq-4.5.0"
       sources."lodash.without-4.4.0"
-      sources."mississippi-1.2.0"
+      sources."mississippi-1.3.0"
       sources."mkdirp-0.5.1"
       (sources."node-gyp-3.5.0" // {
         dependencies = [
@@ -24359,7 +24519,6 @@ in
       sources."which-1.2.12"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-1.3.1"
-      sources."ansi-regex-2.1.1"
       sources."debuglog-1.0.1"
       sources."imurmurhash-0.1.4"
       sources."lodash._baseindexof-3.1.0"
@@ -24400,22 +24559,23 @@ in
       })
       sources."flush-write-stream-1.0.2"
       sources."from2-2.3.0"
+      sources."parallel-transform-1.1.0"
       sources."pump-1.0.2"
       sources."pumpify-1.3.5"
       sources."stream-each-1.2.0"
       sources."through2-2.0.3"
       sources."typedarray-0.0.6"
       sources."stream-shift-1.0.0"
+      sources."cyclist-0.2.2"
       sources."xtend-4.0.1"
       sources."minimist-0.0.8"
       sources."is-builtin-module-1.0.0"
       sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."supports-color-0.2.0"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -24436,7 +24596,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -24456,17 +24616,14 @@ in
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -24498,7 +24655,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -24572,7 +24729,7 @@ in
       sources."couch-login-0.1.20"
       sources."npmlog-4.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -24635,7 +24792,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -24655,11 +24812,7 @@ in
       sources."concat-map-0.0.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
       sources."readable-stream-2.2.2"
@@ -24669,7 +24822,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
@@ -24717,10 +24870,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.8.10";
+    version = "2.10.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz";
-      sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz";
+      sha1 = "9614c58ec84d31702a85881c844c3fb93611a585";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -24812,8 +24965,7 @@ in
       sources."npm-user-validate-0.1.5"
       (sources."npmlog-4.0.2" // {
         dependencies = [
-          sources."gauge-2.7.2"
-          sources."supports-color-0.2.0"
+          sources."gauge-2.7.3"
         ];
       })
       sources."once-1.4.0"
@@ -24887,7 +25039,7 @@ in
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
       sources."array-index-1.0.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."es6-symbol-3.1.0"
       sources."ms-0.7.2"
       sources."d-0.1.1"
@@ -24912,7 +25064,7 @@ in
       sources."mute-stream-0.0.7"
       sources."util-extend-1.0.3"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       (sources."bl-1.1.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -24969,7 +25121,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -25047,7 +25199,7 @@ in
     dependencies = [
       sources."async-0.9.2"
       sources."babybird-0.0.1"
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."content-type-1.0.2"
         ];
@@ -25081,7 +25233,7 @@ in
         ];
       })
       sources."gelf-stream-0.2.4"
-      sources."js-yaml-3.7.0"
+      sources."js-yaml-3.8.1"
       sources."mediawiki-title-0.5.6"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."node-uuid-1.4.7"
@@ -25094,13 +25246,13 @@ in
       })
       sources."semver-5.3.0"
       sources."serve-favicon-2.3.2"
-      (sources."service-runner-2.1.13" // {
+      (sources."service-runner-2.1.15" // {
         dependencies = [
           sources."gelf-stream-1.1.1"
-          sources."yargs-5.0.0"
+          sources."yargs-6.6.0"
           sources."gelfling-0.3.1"
+          sources."camelcase-3.0.0"
           sources."cliui-3.2.0"
-          sources."window-size-0.2.0"
         ];
       })
       sources."simplediff-0.1.1"
@@ -25115,7 +25267,7 @@ in
       sources."asap-2.0.5"
       sources."is-arguments-1.0.2"
       sources."bytes-2.4.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."depd-1.1.0"
       sources."http-errors-1.5.1"
       sources."iconv-lite-0.4.15"
@@ -25224,10 +25376,10 @@ in
       sources."foreach-2.0.5"
       sources."gelfling-0.2.0"
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -25288,7 +25440,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -25352,7 +25504,6 @@ in
         ];
       })
       sources."get-caller-file-1.0.2"
-      sources."lodash.assign-4.2.0"
       sources."os-locale-1.4.0"
       sources."read-pkg-up-1.0.1"
       sources."require-directory-2.1.1"
@@ -25361,7 +25512,7 @@ in
       sources."string-width-1.0.2"
       sources."which-module-1.0.0"
       sources."y18n-3.2.1"
-      (sources."yargs-parser-3.2.0" // {
+      (sources."yargs-parser-4.2.1" // {
         dependencies = [
           sources."camelcase-3.0.0"
         ];
@@ -25381,7 +25532,7 @@ in
       sources."error-ex-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -25391,6 +25542,7 @@ in
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
+      sources."lodash.assign-4.2.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25516,7 +25668,7 @@ in
       sources."currently-unhandled-0.4.1"
       sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."semver-5.3.0"
       sources."validate-npm-package-license-3.0.1"
@@ -25586,7 +25738,7 @@ in
       (sources."fs-chunk-store-1.6.4" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
@@ -25598,16 +25750,16 @@ in
       sources."rimraf-2.5.4"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
-      (sources."random-access-file-1.4.0" // {
+      (sources."random-access-file-1.5.0" // {
         dependencies = [
           sources."mkdirp-0.5.1"
-          sources."thunky-1.0.1"
+          sources."thunky-1.0.2"
           sources."minimist-0.0.8"
         ];
       })
       sources."randombytes-2.0.3"
       sources."run-parallel-1.1.6"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."ms-0.7.2"
       sources."flatten-0.0.1"
       sources."fifo-0.1.4"
@@ -25649,20 +25801,28 @@ in
       })
       sources."lru-2.0.1"
       sources."buffer-equal-0.0.1"
-      sources."k-rpc-socket-1.6.1"
+      sources."k-rpc-socket-1.6.2"
       sources."bn.js-4.11.6"
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-peer-6.2.1"
-      sources."simple-websocket-4.2.0"
+      sources."simple-peer-6.2.2"
+      (sources."simple-websocket-4.3.0" // {
+        dependencies = [
+          sources."ws-2.0.3"
+        ];
+      })
       sources."string2compact-1.2.2"
-      sources."ws-1.1.1"
+      (sources."ws-1.1.1" // {
+        dependencies = [
+          sources."ultron-1.0.2"
+        ];
+      })
       sources."ipaddr.js-1.2.0"
       sources."get-browser-rtc-1.0.2"
+      sources."ultron-1.1.0"
       sources."addr-to-ip-port-1.4.2"
       sources."options-0.0.6"
-      sources."ultron-1.0.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25897,13 +26057,13 @@ in
       sources."bitfield-0.1.0"
       (sources."bittorrent-dht-3.2.6" // {
         dependencies = [
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
         ];
       })
       (sources."bittorrent-tracker-2.12.1" // {
         dependencies = [
           sources."bencode-0.6.0"
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
         ];
       })
       sources."bncode-0.5.3"
@@ -26057,7 +26217,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26114,9 +26274,9 @@ in
       sources."graceful-fs-4.1.11"
       sources."iconv-lite-0.4.15"
       sources."mkdirp-0.5.1"
-      sources."private-0.1.6"
+      sources."private-0.1.7"
       sources."q-1.4.1"
-      sources."recast-0.11.20"
+      sources."recast-0.11.21"
       sources."graceful-readlink-1.0.1"
       sources."acorn-3.3.0"
       sources."defined-1.0.0"
@@ -26130,7 +26290,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
-      sources."ast-types-0.9.4"
+      sources."ast-types-0.9.5"
       sources."esprima-3.1.3"
       sources."source-map-0.5.6"
       sources."base62-0.1.1"
@@ -26179,7 +26339,7 @@ in
       sources."crypto-0.0.3"
       sources."xml2js-0.2.4"
       sources."xmlbuilder-0.4.2"
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."coffee-script-1.6.3"
       sources."node-uuid-1.4.1"
       (sources."connect-2.11.0" // {
@@ -26195,7 +26355,7 @@ in
       sources."methods-0.1.0"
       sources."send-0.1.4"
       sources."cookie-signature-1.0.1"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."qs-0.6.5"
       sources."bytes-0.2.1"
       sources."pause-0.0.1"
@@ -26225,7 +26385,7 @@ in
       sources."formidable-1.0.11"
       sources."crc-0.2.0"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -26290,7 +26450,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26331,10 +26491,10 @@ in
     dependencies = [
       sources."express-5.0.0-alpha.3"
       sources."express-json5-0.1.0"
-      (sources."body-parser-1.16.0" // {
+      (sources."body-parser-1.16.1" // {
         dependencies = [
           sources."bytes-2.4.0"
-          sources."debug-2.6.0"
+          sources."debug-2.6.1"
           sources."iconv-lite-0.4.15"
           sources."qs-6.2.1"
           sources."raw-body-2.2.0"
@@ -26347,7 +26507,7 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."js-yaml-3.7.0"
+      sources."js-yaml-3.8.1"
       sources."cookies-0.6.2"
       (sources."request-2.79.0" // {
         dependencies = [
@@ -26427,11 +26587,11 @@ in
       sources."on-headers-1.0.1"
       sources."graceful-readlink-1.0.1"
       sources."argparse-1.0.9"
-      sources."esprima-2.7.3"
+      sources."esprima-3.1.3"
       sources."sprintf-js-1.0.3"
       sources."keygrip-1.0.1"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -26490,7 +26650,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26687,7 +26847,7 @@ in
       sources."precond-0.2.3"
       sources."csv-generate-0.0.6"
       sources."csv-parse-1.2.0"
-      sources."stream-transform-0.1.1"
+      sources."stream-transform-0.1.2"
       sources."csv-stringify-0.0.8"
       sources."asn1-0.1.11"
       sources."ctype-0.5.3"
@@ -26734,7 +26894,7 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -26757,7 +26917,7 @@ in
     dependencies = [
       sources."css-parse-1.7.0"
       sources."mkdirp-0.5.1"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."sax-0.5.8"
       sources."glob-7.0.6"
       sources."source-map-0.1.43"
@@ -26792,7 +26952,7 @@ in
       sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5";
     };
     dependencies = [
-      sources."sax-1.2.1"
+      sources."sax-1.2.2"
       sources."coa-1.0.1"
       sources."js-yaml-3.7.0"
       sources."colors-1.1.2"
@@ -26928,7 +27088,7 @@ in
       sources."wordwrap-0.0.3"
       sources."minimist-0.0.10"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."bl-1.0.3"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
@@ -26997,7 +27157,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -27041,10 +27201,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.5";
+    version = "2.1.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz";
-      sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz";
+      sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -27092,10 +27252,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.3";
+    version = "1.1.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz";
-      sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz";
+      sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b";
     };
     dependencies = [
       sources."async-2.1.4"
@@ -27163,7 +27323,7 @@ in
       sources."os-homedir-1.0.2"
       sources."passport-0.3.2"
       sources."passport-local-1.0.0"
-      (sources."raven-1.1.1" // {
+      (sources."raven-1.1.2" // {
         dependencies = [
           sources."json-stringify-safe-5.0.1"
           sources."uuid-3.0.0"
@@ -27500,10 +27660,9 @@ in
       sources."builtin-modules-1.1.1"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.2"
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."supports-color-0.2.0"
       sources."object-assign-4.1.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -27523,7 +27682,7 @@ in
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."extend-3.0.0"
       sources."har-validator-2.0.6"
@@ -27533,17 +27692,14 @@ in
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."asynckit-0.4.0"
-      (sources."chalk-1.1.3" // {
-        dependencies = [
-          sources."supports-color-2.0.0"
-        ];
-      })
+      sources."chalk-1.1.3"
       sources."commander-2.9.0"
       sources."is-my-json-valid-2.15.0"
       sources."pinkie-promise-2.0.1"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
+      sources."supports-color-2.0.0"
       sources."graceful-readlink-1.0.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
@@ -27571,7 +27727,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -27809,7 +27965,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -27856,12 +28012,12 @@ in
       sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475";
     };
     dependencies = [
-      sources."acorn-4.0.4"
+      sources."acorn-4.0.11"
       sources."acorn-dynamic-import-2.0.1"
-      sources."ajv-4.11.2"
+      sources."ajv-4.11.3"
       sources."ajv-keywords-1.5.1"
       sources."async-2.1.4"
-      sources."enhanced-resolve-3.0.3"
+      sources."enhanced-resolve-3.1.0"
       sources."interpret-1.0.1"
       sources."json-loader-0.5.4"
       sources."loader-runner-2.3.0"
@@ -27957,9 +28113,9 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.2"
+      sources."elliptic-6.3.3"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.6"
+      sources."brorand-1.0.7"
       sources."hash.js-1.0.3"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
@@ -28031,7 +28187,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."nan-2.5.1"
-      sources."node-pre-gyp-0.6.32"
+      sources."node-pre-gyp-0.6.33"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
       (sources."rc-1.1.6" // {
@@ -28052,14 +28208,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
@@ -28073,7 +28225,7 @@ in
       sources."ini-1.3.4"
       sources."strip-json-comments-1.0.4"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."extend-3.0.0"
@@ -28136,7 +28288,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -28181,7 +28333,7 @@ in
       sources."error-ex-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."is-utf8-0.2.1"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."is-builtin-module-1.0.0"
       sources."validate-npm-package-license-3.0.1"
       sources."builtin-modules-1.1.1"
@@ -28229,7 +28381,7 @@ in
       sources."cmd-shim-2.0.2"
       sources."commander-2.9.0"
       sources."death-1.1.0"
-      sources."debug-2.6.0"
+      sources."debug-2.6.1"
       sources."defaults-1.0.3"
       sources."detect-indent-4.0.0"
       sources."diff-2.2.3"
@@ -28332,14 +28484,10 @@ in
       sources."abbrev-1.0.9"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      (sources."gauge-2.7.2" // {
-        dependencies = [
-          sources."supports-color-0.2.0"
-        ];
-      })
+      sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."has-unicode-2.0.1"
       sources."wide-align-1.1.0"
       sources."os-homedir-1.0.2"
@@ -28347,7 +28495,7 @@ in
       sources."retry-0.10.1"
       sources."is-finite-1.0.2"
       sources."aws-sign2-0.6.0"
-      sources."aws4-1.5.0"
+      sources."aws4-1.6.0"
       sources."caseless-0.11.0"
       sources."combined-stream-1.0.5"
       sources."forever-agent-0.6.1"
@@ -28398,7 +28546,7 @@ in
           sources."assert-plus-1.0.0"
         ];
       })
-      sources."jsbn-0.1.0"
+      sources."jsbn-0.1.1"
       sources."tweetnacl-0.14.5"
       sources."jodid25519-1.0.2"
       sources."ecc-jsbn-0.1.1"
@@ -28425,4 +28573,4 @@ in
     };
     production = true;
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 89f0075a3a3f..5f48cb9b02ef 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -33,6 +33,7 @@
 , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
 , "lcov-result-merger"
 , "meat"
+, "mocha"
 , "nijs"
 , "node2nix"
 , "node-gyp"

From 8a1fcaf5bdde62d316b10d923cae9fb4f1d100b2 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 12 Feb 2017 19:09:24 -0400
Subject: [PATCH 0238/3449] Fix sessions with sddm.

---
 nixos/modules/services/x11/display-managers/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 7418ce563578..e8b897fb6050 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -32,6 +32,9 @@ let
     ''
       #! ${pkgs.bash}/bin/bash
 
+      # Handle being called by SDDM.
+      if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi
+
       ${optionalString cfg.displayManager.logToJournal ''
         if [ -z "$_DID_SYSTEMD_CAT" ]; then
           _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@"

From 59e77daf5b077d6f9b1e940a6c884bf0637f1732 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 12 Feb 2017 18:16:18 -0500
Subject: [PATCH 0239/3449] nixos tests: make getTTYText smart about tty size

---
 nixos/lib/test-driver/Machine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 14c39e859bc1..85bc376f67fa 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -508,7 +508,7 @@ sub screenshot {
 sub getTTYText {
     my ($self, $tty) = @_;
 
-    my ($status, $out) = $self->execute("fold -w 80 /dev/vcs${tty}");
+    my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}");
     return $out;
 }
 

From 96d767de621242a5df6de5db82a9b088d24ef606 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 12 Feb 2017 18:17:08 -0500
Subject: [PATCH 0240/3449] pam_oath: require OATH and pam_unix credentials to
 be valid

---
 nixos/modules/security/pam.nix |   4 +-
 nixos/release.nix              |   1 +
 nixos/tests/pam-oath-login.nix | 126 +++++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 nixos/tests/pam-oath-login.nix

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 96e7c45d4963..67652fbd1e70 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -253,6 +253,8 @@ let
               "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"}
           ${optionalString cfg.usbAuth
               "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"}
+          ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
+              "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
         '' +
           # Modules in this block require having the password set in PAM_AUTHTOK.
           # pam_unix is marked as 'sufficient' on NixOS which means nothing will run
@@ -271,8 +273,6 @@ let
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
           ${optionalString cfg.otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
-          ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
-              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
           ${optionalString use_ldap
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
           ${optionalString config.services.sssd.enable
diff --git a/nixos/release.nix b/nixos/release.nix
index c061b9801a0c..0f93deddf263 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -283,6 +283,7 @@ in rec {
   tests.leaps = callTest tests/leaps.nix { };
   tests.nsd = callTest tests/nsd.nix {};
   tests.openssh = callTest tests/openssh.nix {};
+  tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
   #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
   tests.peerflix = callTest tests/peerflix.nix {};
   tests.postgresql = callTest tests/postgresql.nix {};
diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix
new file mode 100644
index 000000000000..4364d6e354a6
--- /dev/null
+++ b/nixos/tests/pam-oath-login.nix
@@ -0,0 +1,126 @@
+import ./make-test.nix ({ pkgs, latestKernel ? false, ... }:
+
+let
+  oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3";
+
+  # With HOTP mode the password is calculated based on a counter of
+  # how many passwords have been made. In this env, we'll always be on
+  # the 0th counter, so the password is static.
+  #
+  # Generated in nix-shell -p oathToolkit
+  # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3
+  # and picking a the first 4:
+  oathSnakeOilPassword1 = "143349";
+  oathSnakeOilPassword2 = "801753";
+  oathSnakeOilPassword3 = "019933";
+  oathSnakeOilPassword4 = "403895";
+
+  alicePassword = "foobar";
+  # Generated via: mkpasswd -m sha-512 and passing in "foobar"
+  hashedAlicePassword = "$6$MsMrE1q.1HrCgTS$Vq2e/uILzYjSN836TobAyN9xh9oi7EmCmucnZID25qgPoibkw8qTCugiAPnn4eCGvn1A.7oEBFJaaGUaJsQQY.";
+
+in
+{
+  name = "pam-oath-login";
+
+  machine =
+    { config, pkgs, lib, ... }:
+    {
+      security.pam.oath = {
+        enable = true;
+      };
+
+      users.extraUsers.alice = {
+        isNormalUser = true;
+        name = "alice";
+        uid = 1000;
+        hashedPassword = hashedAlicePassword;
+        extraGroups = [ "wheel" ];
+        createHome = true;
+        home = "/home/alice";
+      };
+
+
+      systemd.services.setupOathSnakeoilFile = {
+        wantedBy = [ "default.target" ];
+        before = [ "default.target" ];
+        unitConfig = {
+          type = "oneshot";
+          RemainAfterExit = true;
+        };
+        script = ''
+          touch /etc/users.oath
+          chmod 600 /etc/users.oath
+          chown root /etc/users.oath
+          echo "HOTP/E/6 alice - ${oathSnakeoilSecret}" > /etc/users.oath
+        '';
+      };
+    };
+
+  testScript =
+    ''
+      $machine->waitForUnit('multi-user.target');
+      $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'");
+      $machine->screenshot("postboot");
+
+
+      subtest "Invalid password", sub {
+        $machine->fail("pgrep -f 'agetty.*tty2'");
+        $machine->sendKeys("alt-f2");
+        $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]");
+        $machine->waitForUnit('getty@tty2.service');
+        $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'");
+
+        $machine->waitUntilTTYMatches(2, "login: ");
+        $machine->sendChars("alice\n");
+        $machine->waitUntilTTYMatches(2, "login: alice");
+        $machine->waitUntilSucceeds("pgrep login");
+
+        $machine->waitUntilTTYMatches(2, "One-time password");
+        $machine->sendChars("${oathSnakeOilPassword1}\n");
+        $machine->waitUntilTTYMatches(2, "Password: ");
+        $machine->sendChars("blorg\n");
+        $machine->waitUntilTTYMatches(2, "Login incorrect");
+      };
+
+      subtest "Invalid oath token", sub {
+        $machine->fail("pgrep -f 'agetty.*tty3'");
+        $machine->sendKeys("alt-f3");
+        $machine->waitUntilSucceeds("[ \$(fgconsole) = 3 ]");
+        $machine->waitForUnit('getty@tty3.service');
+        $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty3'");
+
+        $machine->waitUntilTTYMatches(3, "login: ");
+        $machine->sendChars("alice\n");
+        $machine->waitUntilTTYMatches(3, "login: alice");
+        $machine->waitUntilSucceeds("pgrep login");
+        $machine->waitUntilTTYMatches(3, "One-time password");
+        $machine->sendChars("000000\n");
+        $machine->waitUntilTTYMatches(3, "Login incorrect");
+        $machine->waitUntilTTYMatches(3, "login:");
+      };
+
+      subtest "Happy path (both passwords are mandatory to get us in)", sub {
+        $machine->fail("pgrep -f 'agetty.*tty4'");
+        $machine->sendKeys("alt-f4");
+        $machine->waitUntilSucceeds("[ \$(fgconsole) = 4 ]");
+        $machine->waitForUnit('getty@tty4.service');
+        $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty4'");
+
+        $machine->waitUntilTTYMatches(4, "login: ");
+        $machine->sendChars("alice\n");
+        $machine->waitUntilTTYMatches(4, "login: alice");
+        $machine->waitUntilSucceeds("pgrep login");
+        $machine->waitUntilTTYMatches(4, "One-time password");
+        $machine->sendChars("${oathSnakeOilPassword2}\n");
+        $machine->waitUntilTTYMatches(4, "Password: ");
+        $machine->sendChars("${alicePassword}\n");
+
+        $machine->waitUntilSucceeds("pgrep -u alice bash");
+        $machine->sendChars("touch  done4\n");
+        $machine->waitForFile("/home/alice/done4");
+      };
+
+    '';
+
+})

From a77705748bf85b70807b52b3b27ff446826dde17 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Feb 2017 14:36:37 -0600
Subject: [PATCH 0241/3449] worker: init at 3.8.5

	modified:   pkgs/top-level/all-packages.nix

    pick 8096649e47 worker: init at 3.8.5
    squash 9267acbd46 modified:   pkgs/top-level/all-packages.nix

worker: updated default.nix license field

Added myself to lib/maintainers.nix

    squash 28173341fa worker: updated default.nix license field
    squash b22407cf5c Added myself to lib/maintainers.nix

Fixed indent and added missing > in maintainers.nix

Fixed curly bracket indent
---
 lib/maintainers.nix                       |  1 +
 pkgs/applications/misc/worker/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/misc/worker/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 151674087862..3753a6955c80 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -336,6 +336,7 @@
   Nate-Devv = "Nathan Moore <natedevv@gmail.com>";
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
+  ndowens = "Nathan Owens <ndowens04@gmail.com>";
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
   nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
   nhooyr = "Anmol Sethi <anmol@aubble.com>";
diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
new file mode 100644
index 000000000000..63349670d013
--- /dev/null
+++ b/pkgs/applications/misc/worker/default.nix
@@ -0,0 +1,20 @@
+{pkgs, stdenv, xorg, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "worker";
+  version = "3.8.5";
+
+ src = fetchurl {
+   url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz";
+   sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
+};
+
+buildInputs = with pkgs; [ xorg.libX11 ];
+
+  meta = with stdenv.lib; {
+    description = "a two-pane file manager with advanced file manipulation features";
+    homepage = "http://www.boomerangsworld.de/cms/worker/index.html";
+    license =  licenses.gpl2;
+    maintainers = [ maintainers.ndowens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5ddc9d34284..f9ddc52ea22f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15588,6 +15588,8 @@ with pkgs;
   wmii_hg = callPackage ../applications/window-managers/wmii-hg { };
 
   wordnet = callPackage ../applications/misc/wordnet { };
+  
+  worker = callPackage ../applications/misc/worker { };
 
   workrave = callPackage ../applications/misc/workrave {
     inherit (gnome2) GConf gconfmm;

From f5a82e4714371a65ed5ccc5ae46c5f106c953f83 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 13 Feb 2017 00:55:12 +0100
Subject: [PATCH 0242/3449] gitlab service: fix database creation

Providing custom a username and database name was broken. They were
hardcoded to "gitlab".
---
 nixos/modules/services/misc/gitlab.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 1fc3a5cc8691..36db4fb96606 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -528,8 +528,8 @@ in {
 
         if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
           if ! test -e "${cfg.statePath}/db-created"; then
-            psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
-            ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
+            psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
+            ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} || true
             touch "${cfg.statePath}/db-created"
           fi
         fi

From 836ab672a89c300a1a6f7a55a4f77bd67107dcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Mon, 13 Feb 2017 01:02:09 +0100
Subject: [PATCH 0243/3449] worker: fix indentation

---
 pkgs/applications/misc/worker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 63349670d013..fade4905cfc0 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
   name = "worker";
   version = "3.8.5";
 
- src = fetchurl {
-   url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz";
-   sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
-};
+  src = fetchurl {
+    url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz";
+    sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
+  };
 
-buildInputs = with pkgs; [ xorg.libX11 ];
+  buildInputs = with pkgs; [ xorg.libX11 ];
 
   meta = with stdenv.lib; {
     description = "a two-pane file manager with advanced file manipulation features";

From 005a9d2d9da3a393bf1a595447487b26b4d96a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 12 Feb 2017 23:46:43 +0100
Subject: [PATCH 0244/3449] vimPlugins: update to latest

---
 pkgs/misc/vim-plugins/default.nix | 564 +++++++++++++++---------------
 1 file changed, 277 insertions(+), 287 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 3ee8f32da0ce..f7274219bdcb 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -123,11 +123,11 @@ rec {
   };
 
   CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2015-06-22";
+    name = "CheckAttach-2017-02-12";
     src = fetchgit {
       url = "git://github.com/chrisbra/CheckAttach";
-      rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
-      sha256 = "0scshz5vc5j2lhjj5is4y392xarwsdh4z3y7kyibq3d7fmszksgn";
+      rev = "17e8e37e348a93f2a2104f07f1224c9c8798f85e";
+      sha256 = "0i8y0h840bpj5s0vf603ghjnpfyds5q7y8c4p8a58qzw20i2v88g";
     };
     dependencies = [];
 
@@ -178,11 +178,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-12-23";
+    name = "Syntastic-2017-02-07";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "78c0d21a9b0329766732ca2743a848af1c49e791";
-      sha256 = "1n744grp4ajn4zfra5kfg97sj8rjkqcw1sgx2jbj5qq8l3p5ghad";
+      rev = "53a3db5e3bfbafb660ebbdbc8210e3b30cb60c10";
+      sha256 = "0kinqr5azlcs01q8czynxvbjswfdjh30xww26a8lf2h9750qzyhi";
     };
     dependencies = [];
 
@@ -200,22 +200,22 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-01-03";
+    name = "Tagbar-2017-02-12";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "18b536ce43f1be88be380e5f3b7cd0fd930b4908";
-      sha256 = "0k4c5f3qvszn3a9ndkcl984w832vk2g4hfwl4nkvy9bwqg7q89ya";
+      rev = "9d051c1e2d9f3dc88d3ae00485e55934b06d42f7";
+      sha256 = "055n6armj80vmyv9kc8jhd84wl6nrr8qf7fj6b5vxp221y86wf3x";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2016-12-15";
+    name = "The_NERD_Commenter-2017-01-22";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "18cfe815501c8264844223a944eb388285b48caa";
-      sha256 = "05dg5v1pal5ly8shc4rlnqip5zsdx9901h4336a2k81lss269wd4";
+      rev = "607253203dc2fc1798dbe2ea9a3471db9c12e005";
+      sha256 = "1z7rg52153vm5vj5xpvqny0aikvlr7nk9nfkrwnfxcs4jq8i752d";
     };
     dependencies = [];
 
@@ -233,11 +233,11 @@ rec {
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2016-12-16";
+    name = "UltiSnips-2017-01-20";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "f974e0317f549c7cf54fa231ee0501206aed6882";
-      sha256 = "0kvpgdkfc70phj2zf6lcblxb25hliiaz2cwg61bq7ip06sbk0fq0";
+      rev = "5352d98f212e273b3e8b1d84efdbe2d6a6d557e9";
+      sha256 = "0d27823qnfd9qcj2a2x77slsw725jfa9s40ilw4qp9ab03bma1ci";
     };
     dependencies = [];
 
@@ -281,28 +281,6 @@ rec {
     sourceRoot = ".";
   };
 
-  vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-01-04";
-    src = fetchgit {
-      url = "git://github.com/machakann/vim-highlightedyank";
-      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
-      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
-    };
-    dependencies = [];
-
-  };
-
-  alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist.vim-2017-01-02";
-    src = fetchgit {
-      url = "git://github.com/slashmili/alchemist.vim";
-      rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4";
-      sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf";
-    };
-    dependencies = [];
-
-  };
-
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "commentary-2016-03-10";
     src = fetchgit {
@@ -330,11 +308,11 @@ rec {
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2016-09-02";
+    name = "ctrlp-py-matcher-2017-01-05";
     src = fetchgit {
       url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1";
-      sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d";
+      rev = "a0710a4937ab9dc10bc0a8b56b41fcc88534147c";
+      sha256 = "198y8998sx2maarn2vawx8hqldsfbnn4i6rlg56qw6brsrssssx2";
     };
     dependencies = [];
 
@@ -351,17 +329,6 @@ rec {
 
   };
 
-  delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "delimitMate-2016-07-19";
-    src = fetchgit {
-      url = "git://github.com/Raimondi/delimitMate";
-      rev = "b5719054beebe0135c94f4711a06dc7588041f09";
-      sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3";
-    };
-    dependencies = [];
-
-  };
-
   extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "extradite-2015-09-22";
     src = fetchgit {
@@ -374,22 +341,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2016-11-13";
+    name = "fugitive-2017-02-10";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "b754bc2031f21a532c083dd0d072ba373bbe3a37";
-      sha256 = "1sig8dl3m1dw5zjxdsp00n1cacmcwdvas3iz04zk88v6xsm8rj22";
-    };
-    dependencies = [];
-
-  };
-
-  vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-lawrencium-2017-01-10";
-    src = fetchgit {
-      url = "git://github.com/ludovicchabant/vim-lawrencium";
-      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
-      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+      rev = "f44845e4408aae03e018e98afb7fbf0c2ee87dd5";
+      sha256 = "1rd6iqg1q8wchsypm0mg75mfc93y871xsx6cl733771w83zi91hq";
     };
     dependencies = [];
 
@@ -407,22 +363,22 @@ rec {
   };
 
   vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-auto-save-2016-09-12";
+    name = "vim-auto-save-2017-01-16";
     src = fetchgit {
       url = "git://github.com/907th/vim-auto-save";
-      rev = "28300c8a7b8cea137c065a48fd9bcc2348f08707";
-      sha256 = "0n3xbp8vf3xsh6y6f855q313scldqm9593bhxydyszy1parvxwb5";
+      rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5";
+      sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y";
     };
     dependencies = [];
 
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2016-12-13";
+    name = "vim-autoformat-2017-02-06";
     src = fetchgit {
       url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "3715e166a5aa006353ca5bfad2386767676fe848";
-      sha256 = "0ki41pdrl5y4fry3xqn4sdx48zvvd3gc59qzs1nssvn9zp0k9il5";
+      rev = "56170ff0d3c4e7b9acf0d373425ae2b2f047036e";
+      sha256 = "0q4jz79jn6w9nkfvy9dk41d2krccx6pn91lm51987j9viijb6kyq";
     };
     dependencies = [];
 
@@ -439,12 +395,34 @@ rec {
 
   };
 
+  tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "tsuquyomi-2017-01-31";
+    src = fetchgit {
+      url = "git://github.com/Quramy/tsuquyomi";
+      rev = "201d84d37ac9077855942dc9c6e6e235e285f20f";
+      sha256 = "1rcibh4clxw8sq2n8072i4x52msvfxim9r9rwqi264jm31s81yyx";
+    };
+    dependencies = [];
+
+  };
+
+  delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "delimitMate-2016-07-19";
+    src = fetchgit {
+      url = "git://github.com/Raimondi/delimitMate";
+      rev = "b5719054beebe0135c94f4711a06dc7588041f09";
+      sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3";
+    };
+    dependencies = [];
+
+  };
+
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-01-04";
+    name = "deoplete-nvim-2017-02-09";
     src = fetchgit {
       url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "90569837af21ad0438448582b34d8418b745ffeb";
-      sha256 = "1qkzvgvjg397zaj1i56ld9i0gf2w9y5x2if5gbmag56nhxcwfw32";
+      rev = "2e9fd874b7d974a03df8af10a090e2601b16c7f0";
+      sha256 = "1zj80jxsnff2s16wkim56sxks7p2nj5dv073v30nbscbxacq6hvp";
     };
     dependencies = [];
 
@@ -473,22 +451,22 @@ rec {
   };
 
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-css-color-2016-10-11";
+    name = "vim-css-color-2017-02-09";
     src = fetchgit {
       url = "git://github.com/ap/vim-css-color";
-      rev = "27903efc1b5330230d5c8c336c26ac7a8ac2e5dc";
-      sha256 = "0kr9xf2y001d42x7fam50qbd09fb3rr374qv8m2p5z2d9c21par1";
+      rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b";
+      sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc";
     };
     dependencies = [];
 
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-01-03";
+    name = "clighter8-2017-02-12";
     src = fetchgit {
       url = "git://github.com/bbchung/clighter8";
-      rev = "89d70129ab5437c749041094fa71da97c95bda3f";
-      sha256 = "147i6rhz6ri86k6p0sim72vpsc5f6y8dvwxn7am6vyi21avy4zrz";
+      rev = "357a0292438dfad356ce52c94f96840063fad80d";
+      sha256 = "0rd5ikq7ln0n2a1alhjzcjhqdfa5m5laylsg24xl1py32lcqayak";
     };
     dependencies = [];
     preFixup = ''
@@ -498,11 +476,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-01-04";
+    name = "neomake-2017-02-12";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "9794f6caef063ba1283bb728ac3befda477935f3";
-      sha256 = "11rpc98nv9viyv82j5y4l29jc62bmd2rddp90a6740p8dx5gvx5q";
+      rev = "375684a1c81ffe24a8e2dfb1e92d164498f38653";
+      sha256 = "1yhkh94fpnwk335s6xd17jl5w6mrzj8vz9aw3g39gf5m4lwlqn8w";
     };
     dependencies = [];
 
@@ -520,33 +498,33 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2016-09-03";
+    name = "vim-tmux-navigator-2017-01-28";
     src = fetchgit {
       url = "git://github.com/christoomey/vim-tmux-navigator";
-      rev = "e79d4c0c24c43d3ada283b1f5a1b8fa6cf820a70";
-      sha256 = "1p4kb8ja86pa3l9jh8yfjvdvdik4fwnpbpl34npjwbga52pawn65";
+      rev = "34f8fbf1d4ebaa1bf1db6715b17a197eaffe1ad8";
+      sha256 = "074isx0kksl7kc72n1n8ywqcx5vj7ndz01jaih14nwqpqshv2zgx";
     };
     dependencies = [];
 
   };
 
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "spacevim-2016-12-02";
+    name = "spacevim-2017-01-22";
     src = fetchgit {
       url = "git://github.com/ctjhoa/spacevim";
-      rev = "9bb2a04b14964a7db1d4131e1af1ed8bd31e910b";
-      sha256 = "0hq6g8czi73hgpkpigi177kp49dslh8xny3j7wjl03bjxsq9fkmk";
+      rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5";
+      sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn";
     };
     dependencies = [];
 
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2016-11-29";
+    name = "ctrlp-vim-2017-01-13";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "2868678a987834563bbc384763135462c2423eb8";
-      sha256 = "0s98nqj22i4x79mqspjkz6b6rpg8hf79iblv4md2ivzlj7ffccx3";
+      rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359";
+      sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc";
     };
     dependencies = [];
 
@@ -575,18 +553,18 @@ rec {
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2016-10-31";
+    name = "vim-jade-2017-02-01";
     src = fetchgit {
       url = "git://github.com/digitaltoad/vim-jade";
-      rev = "cc1bddc890f4856aa0511fdfd7c55d2e66f688b5";
-      sha256 = "1d5rbaslvr14lcdffrxp0ycsm2nzvq5zyjk0x0nzwhzvvs4fqi40";
+      rev = "eb8c6b23b86fdc93cd2a34217adfe5f6b2d7d05d";
+      sha256 = "1y325pq8r4njx6mz5y2hk0j6dpkbw9f6cxp0n2hdfp4xj9qgx9v1";
     };
     dependencies = [];
 
   };
 
-  dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "dracula-2016-09-21";
+  vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-2016-09-21";
     src = fetchgit {
       url = "git://github.com/dracula/vim";
       rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
@@ -607,17 +585,6 @@ rec {
 
   };
 
-  neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-vim-2017-01-16";
-    src = fetchgit {
-      url = "git://github.com/shougo/neco-vim";
-      rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
-      sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
-    };
-    dependencies = [];
-
-  };
-
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "editorconfig-vim-2016-07-16";
     src = fetchgit {
@@ -640,23 +607,34 @@ rec {
 
   };
 
+  vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-elixir-2017-01-24";
+    src = fetchgit {
+      url = "git://github.com/elixir-lang/vim-elixir";
+      rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f";
+      sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4";
+    };
+    dependencies = [];
+
+  };
+
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2016-11-26";
+    name = "elm-vim-2017-01-13";
     src = fetchgit {
       url = "git://github.com/elmcast/elm-vim";
-      rev = "16a9a380a514e23c02d4bd7374112aa2dac1f3a4";
-      sha256 = "1mjccw7yx8hrn4vriickzag9z5g3xzqd6qh6w3xkw0nfh8mx2sgn";
+      rev = "0c1fbfdf12f165681b8134ed2cae2c148105ac40";
+      sha256 = "0l871hzg55ysns5h6v7xq63lwf4135m3xggm2s4q2pmzizivk0x2";
     };
     dependencies = [];
 
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2016-11-08";
+    name = "vim-localvimrc-2017-02-07";
     src = fetchgit {
       url = "git://github.com/embear/vim-localvimrc";
-      rev = "9f6de2ddfea2a397bc3e5335779bc93a8260ff99";
-      sha256 = "0ks8x7zjqnbm06y3niidj9h0ccqky29b2vpdkvs1vwnli10bg6sh";
+      rev = "775ea57b9f433bdaf83c42c26d51137e1e7b3b98";
+      sha256 = "094jmnfzl1girjwhpg4kq48lrdcfrx4x1baq1n8rjlm2zln2sbdx";
     };
     dependencies = [];
 
@@ -685,11 +663,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-01-01";
+    name = "vim-go-2017-02-02";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "d7c628ff228c2e6a4d4d5808f198471a775cf8b5";
-      sha256 = "1375qz8id08d10p6i7ppvk3khq778996bx1n7qarz6vx6kb19zcn";
+      rev = "1425decf6d4e1b313955cefe08c859d07c2c2822";
+      sha256 = "1pql4m5iiajqk6qfb3nahlf2q2ixp425lg5bni16rk78r173wqvl";
     };
     dependencies = [];
 
@@ -707,11 +685,11 @@ rec {
   };
 
   floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "floobits-neovim-2016-10-07";
+    name = "floobits-neovim-2017-02-08";
     src = fetchgit {
       url = "git://github.com/floobits/floobits-neovim";
-      rev = "85d3493d05ac1d7f5606d40fbe619df16af917bc";
-      sha256 = "16c12dgk60mmhyijfk4f33k8i48r1hpjlnxlvdk5kymv7b2xq0fa";
+      rev = "9755412fcd68cfc76a36aa000682a84d96013650";
+      sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1";
     };
     dependencies = [];
 
@@ -740,55 +718,55 @@ rec {
   };
 
   vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jsdoc-2016-10-30";
+    name = "vim-jsdoc-2017-02-11";
     src = fetchgit {
       url = "git://github.com/heavenshell/vim-jsdoc";
-      rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff";
-      sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za";
+      rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35";
+      sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j";
     };
     dependencies = [];
 
   };
 
   vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-leader-guide-2016-11-06";
+    name = "vim-leader-guide-2017-02-12";
     src = fetchgit {
       url = "git://github.com/hecal3/vim-leader-guide";
-      rev = "b1dd2667cb74147c06853c39530984fbc629eb48";
-      sha256 = "0xacamv3dcnkdh9xclvw76fp20rxgqb1m3068l582c6g5p7lj0yi";
+      rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da";
+      sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1";
     };
     dependencies = [];
 
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2016-07-29";
+    name = "idris-vim-2017-01-27";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "7ef7a2ed9135d69a0dea6b571a20ddf2b0bf7a90";
-      sha256 = "0py7vyg38yn6bl7pwyyhylpqp14smqjzbfj7rjzjfnlq33v7ysij";
+      rev = "c9b8066730fd8e62cf20eecf0e2c60f225ff12c8";
+      sha256 = "0nkr2qwykl57xky3dpz40m5gy7s1kjfsgb1kzj7z9jqm6a41m2bb";
     };
     dependencies = [];
 
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2016-12-06";
+    name = "calendar-vim-2017-02-09";
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
-      rev = "6cf60f08a42c8b22ea3ae191a89e1faa4fdd3dae";
-      sha256 = "172xgsmzwpy890bg813d89wz210lfdhckvispdl45l15armdy99y";
+      rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852";
+      sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip";
     };
     dependencies = [];
 
   };
 
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "lightline-vim-2016-12-03";
+    name = "lightline-vim-2017-02-12";
     src = fetchgit {
       url = "git://github.com/itchyny/lightline.vim";
-      rev = "059888ab650fa192dd441e52bd9f41f08b247529";
-      sha256 = "1pa627jjmrhlfbd8yms8lvfgnm0gj9xkr29jkq122icfl6hv3fwx";
+      rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a";
+      sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5";
     };
     dependencies = [];
 
@@ -805,17 +783,6 @@ rec {
 
   };
 
-  typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2016-08-10";
-    src = fetchgit {
-      url = "git://github.com/leafgarland/typescript-vim";
-      rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a";
-      sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk";
-    };
-    dependencies = [];
-
-  };
-
   vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-ipython-2015-06-23";
     src = fetchgit {
@@ -839,22 +806,22 @@ rec {
   };
 
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-orgmode-2016-11-12";
+    name = "vim-orgmode-2017-01-31";
     src = fetchgit {
       url = "git://github.com/jceb/vim-orgmode";
-      rev = "67a693c37bac75ba163d35b9972efd0c7e0deb71";
-      sha256 = "1rdcyfdyq4lbfh9ya63kf05aqcr9g6q7r4ngzn1fgy7pmqdpk7vf";
+      rev = "37fc5db4d167ca0def23febcb06d984ab72015be";
+      sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x";
     };
     dependencies = [];
 
   };
 
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2016-10-19";
+    name = "vim-buffergator-2017-02-05";
     src = fetchgit {
       url = "git://github.com/jeetsukumaran/vim-buffergator";
-      rev = "c07d16dd3df10bbb5adc3e9b009e341bfa1f673e";
-      sha256 = "0bj70lkqizfzmaxwrxcqv1151kx37v2v57aaqy4vcnfn04wq3h95";
+      rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d";
+      sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7";
     };
     dependencies = [];
 
@@ -872,22 +839,22 @@ rec {
   };
 
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "auto-pairs-2016-11-21";
+    name = "auto-pairs-2017-01-26";
     src = fetchgit {
       url = "git://github.com/jiangmiao/auto-pairs";
-      rev = "84518168107c34fb540ee4f8cde743ceaf682bae";
-      sha256 = "104mahfn956vb98psfml0b4x1yhwn8w6af3hkym3fdxy4ksh4fj4";
+      rev = "e915d857fe927309ef0090e830f892204b750c43";
+      sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4";
     };
     dependencies = [];
 
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nerdtree-tabs-2016-09-19";
+    name = "vim-nerdtree-tabs-2017-02-12";
     src = fetchgit {
       url = "git://github.com/jistr/vim-nerdtree-tabs";
-      rev = "5a91230193fea7f9c8d792cb5c635998d868337d";
-      sha256 = "08g587bnd8n61nj44ghjadwqpbbqya4hig56afna6rhs341zwlpm";
+      rev = "de6a60909e71790baf5d46f863643379ec19bc4c";
+      sha256 = "1h9r9c9b788b6fz56s12ih85zyf1vv0bzrl7k54vl4cncryyw37y";
     };
     dependencies = [];
 
@@ -927,11 +894,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2016-12-25";
+    name = "fzf-vim-2017-02-08";
     src = fetchgit {
       url = "git://github.com/junegunn/fzf.vim";
-      rev = "2066643243eddf2ed1f5d3a1a5485d6ff71851a4";
-      sha256 = "0svw41n4x1j7s9l7qh5s0mk2s5ibdfq4pzdiknvfb342na6xi2b5";
+      rev = "dade777e6dad6a318630d7ce26b9761761522c40";
+      sha256 = "0yixz5nr6c6719yfcpci21fhx6kk6wa0213zlkipj8aij2y6ygfy";
     };
     dependencies = [];
 
@@ -949,11 +916,11 @@ rec {
   };
 
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-peekaboo-2016-08-05";
+    name = "vim-peekaboo-2017-01-13";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-peekaboo";
-      rev = "9c8415c022ab24ce51af13aa43255d5a7c7ef670";
-      sha256 = "10c8j4wcg7g3i3vyvlcc21j0a3xmbl5ii5fl5k27iy2icf5rm018";
+      rev = "9de6fd70ad20cbf568664c06d673c69e2f622287";
+      sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky";
     };
     dependencies = [];
 
@@ -981,6 +948,17 @@ rec {
 
   };
 
+  typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "typescript-vim-2016-08-10";
+    src = fetchgit {
+      url = "git://github.com/leafgarland/typescript-vim";
+      rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a";
+      sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk";
+    };
+    dependencies = [];
+
+  };
+
   vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jinja-2016-11-16";
     src = fetchgit {
@@ -993,11 +971,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-01-03";
+    name = "vimtex-2017-02-09";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "4c76e8f74025c6c753167f23a6be0bcfc1e39af7";
-      sha256 = "1syl4wyffn59i43q6kcy3hz5kzwmp0wj4xmwsahg81fxq4wzdz3n";
+      rev = "de61b31cf89b6fd4653dc812d779abcf21ed33d0";
+      sha256 = "0cg0l4jm9zfmg7nx0zha5cpv9c9szyj7fmfs19v1r7bzc3dvi492";
     };
     dependencies = [];
 
@@ -1014,6 +992,17 @@ rec {
 
   };
 
+  vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-lawrencium-2017-01-10";
+    src = fetchgit {
+      url = "git://github.com/ludovicchabant/vim-lawrencium";
+      rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
+      sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
+    };
+    dependencies = [];
+
+  };
+
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow-2016-10-28";
     src = fetchgit {
@@ -1040,12 +1029,23 @@ rec {
     buildInputs = [ xkb_switch ];
   };
 
+  vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-highlightedyank-2017-01-04";
+    src = fetchgit {
+      url = "git://github.com/machakann/vim-highlightedyank";
+      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
+      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
+    };
+    dependencies = [];
+
+  };
+
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-01-02";
+    name = "vim-startify-2017-02-04";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "c26fcfcd17cfa64e051c8aa97f78894d91a21604";
-      sha256 = "0rcvh612qvcsbf0bagq44dk2hbarhcc2v9a8n7lc5f7rsgdhxp7w";
+      rev = "5e9e6a48c992d9255a3be2f96765c9bb80faae97";
+      sha256 = "1gnpg59i81hwhqva5grjd4f5lnjaclwwra58sgv30mrxkjg4d741";
     };
     dependencies = [];
 
@@ -1096,22 +1096,22 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2016-12-29";
+    name = "haskell-vim-2017-02-08";
     src = fetchgit {
       url = "git://github.com/neovimhaskell/haskell-vim";
-      rev = "434f5903556e2bea99d433d48adb681cb4967d27";
-      sha256 = "0lwclld3yqh4mf0bqqaxvqsfqsjq8q5pl27q1byqrr9x3ngjx5zz";
+      rev = "c07c2b63f393252412b9c65726f2693bcacef71b";
+      sha256 = "09xcsh3411l1wj7w0cwalcpd26rdw4k9idd2mclywrzlrlfddl9b";
     };
     dependencies = [];
 
   };
 
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "cpsm-2016-09-21";
+    name = "cpsm-2017-02-12";
     src = fetchgit {
       url = "git://github.com/nixprime/cpsm";
-      rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d";
-      sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k";
+      rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c";
+      sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs";
     };
     dependencies = [];
     buildInputs = [
@@ -1151,22 +1151,22 @@ rec {
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2016-05-19";
+    name = "vim-markdown-2017-02-02";
     src = fetchgit {
       url = "git://github.com/plasticboy/vim-markdown";
-      rev = "a3169545f330ec8080244c3ad755bb2211eca8a0";
-      sha256 = "1ycqx280xpc5gvfx8rrnmkqlv8q8g51hgiryx6yvd9a8ci805cx1";
+      rev = "d6d59eef6f604b6430fd6adade9e18364666232b";
+      sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6";
     };
     dependencies = [];
 
   };
 
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-racer-2017-01-04";
+    name = "vim-racer-2017-02-08";
     src = fetchgit {
       url = "git://github.com/racer-rust/vim-racer";
-      rev = "3bd56cc87518c1bf02b681d586447366ae8e815a";
-      sha256 = "0wq2iwgb7wpg62r68f9j5g3kycyap8sks735p9mcsq63rrqmw6l4";
+      rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e";
+      sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd";
     };
     dependencies = [];
 
@@ -1184,11 +1184,11 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-01-03";
+    name = "vim-grammarous-2017-02-12";
     src = fetchgit {
       url = "git://github.com/rhysd/vim-grammarous";
-      rev = "33f9b3a0f8d6fb01e3c565948bd6185f5079d732";
-      sha256 = "0l4qbd5phqqxdz1g7xz20p2fql1x2ccsv6v7sgal8bvk6b5f8dk0";
+      rev = "3e096ed4d5b702167470f771ba2a40b31949dddf";
+      sha256 = "0lxfy6gilcpjjypgpmw37hy3gk27bf51vggjkkrh3270xwxkmqj0";
     };
     dependencies = [];
 
@@ -1206,66 +1206,77 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2016-12-24";
+    name = "neoformat-2017-02-11";
     src = fetchgit {
       url = "git://github.com/sbdchd/neoformat";
-      rev = "a0460e8ef4e48d8d1ee9c377546820a6164fee16";
-      sha256 = "0jlvvc1ijpkadjqix6gr17y8gnfc0rhjqzbg08biw8jpks4fh44p";
+      rev = "21117552efdc3fa8bac0d6977a30ba247c20e67b";
+      sha256 = "09mrfbzpqi0kk39f9k76nmwq2b5pr0pvrdak9p13774kxm76gwvm";
     };
     dependencies = [];
 
   };
 
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-polyglot-2016-12-20";
+    name = "vim-polyglot-2017-02-02";
     src = fetchgit {
       url = "git://github.com/sheerun/vim-polyglot";
-      rev = "e404a658b1647fad396a954776eda0bdabf8353c";
-      sha256 = "11q4k3yj1spxzhxjcwnild4njqmafznm179scvcw8lci8sm8w3hm";
+      rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb";
+      sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny";
+    };
+    dependencies = [];
+
+  };
+
+  neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "neco-vim-2017-01-16";
+    src = fetchgit {
+      url = "git://github.com/shougo/neco-vim";
+      rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
+      sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
     };
     dependencies = [];
 
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2017-01-01";
+    name = "neocomplete-vim-2017-01-08";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "7904f0ff33ce667dfb203e812b783bf443c983cf";
-      sha256 = "1gxvmzmlk8ga45vs8c24in92k6i9z3vxpmcpqpjjc40f4l8hqyds";
+      rev = "9617d825c0d4acdb18aec903e9c1c0443058d18b";
+      sha256 = "0a6mhh0ylzgjddlnwqaa5zq4abpv2dhhw7wv7w9lmwa82w31j5ya";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2016-11-05";
+    name = "neosnippet-snippets-2017-01-24";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "4431bf176650696d5a8dd93814812afd0d06212c";
-      sha256 = "0fbwzlvdbrmia97pyzgyffbqrimp2dxjn6cc45ia1kqgnhwdk4pd";
+      rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a";
+      sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-01-02";
+    name = "neosnippet-vim-2017-02-09";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "65af2b9bcad50ba1543b38a8dd30df1aee2142ce";
-      sha256 = "107xb0pvqc4ivqpz5i7z8xfk26577y3jsxzvm86bizbxc2wi92m9";
+      rev = "db828325268ca28c17674bd876b40be895daa27e";
+      sha256 = "1l3zxxj90341slf0k6hprjgjy4slsajbc95v4l46bchcsyxsrh3i";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-12-14";
+    name = "unite-vim-2017-02-10";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "be09b0e5784c4c4c13aefae4f16313696c6f51de";
-      sha256 = "1nd09llf9v09acyizdmwgjkkdg1b14f8d02b5h3bgidv753dbx64";
+      rev = "97e634117ff05d3c867d625940da5c7947cebf63";
+      sha256 = "1qc7k5n7whw5z78czhi363fbllj9znz1gqlps096aiwhapfv3m1z";
     };
     dependencies = [];
 
@@ -1311,6 +1322,17 @@ rec {
 
   };
 
+  alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "alchemist-vim-2017-01-24";
+    src = fetchgit {
+      url = "git://github.com/slashmili/alchemist.vim";
+      rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4";
+      sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf";
+    };
+    dependencies = [];
+
+  };
+
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hardtime-2016-12-19";
     src = fetchgit {
@@ -1345,11 +1367,11 @@ rec {
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2016-12-14";
+    name = "vim-quickrun-2017-01-22";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "f968a467781f0f3c788768b95487d80efa6ceb28";
-      sha256 = "0kd6qi7zqahrgr3y773x3q885ww41ladgl10lx0r1x2yjr5y8nv4";
+      rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2";
+      sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv";
     };
     dependencies = [];
 
@@ -1422,11 +1444,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-01-04";
+    name = "youcompleteme-2017-02-11";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "3fde57b029f760baedeaf7c0c880326e32f5c4d9";
-      sha256 = "1bilzzv02ksqv6m44alp32s61scxqqj5cxx1klr70mhm81k2ksb9";
+      rev = "1d1a4f4cff04ed32ab924dda20666e67eabdefb4";
+      sha256 = "12xz019jrvr6wgjbp0w052awpmhwbpkwy6j7v0f0ldx242rv9sr8";
     };
     dependencies = [];
     buildInputs = [
@@ -1467,22 +1489,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-12-09";
+    name = "vim-airline-themes-2016-12-31";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "2a97d9ee410d7b9980a7741fc6e705d53eea23c2";
-      sha256 = "1crqpryfvamjqw8wqn6nlfqbflgwcfxqf4jk3j58rjxssl0vrfbc";
+      rev = "6026eb78bf362cb3aa875aff8487f65728d0f7d8";
+      sha256 = "13ijkavh1r0935cn2rjsfbdd1q3ka8bi26kw0bdkrqlrqxwvpss8";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2016-12-16";
+    name = "vim-pandoc-2017-02-07";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc";
-      rev = "56b0940954c98c9a089948e1cbbafd2e6e7369e7";
-      sha256 = "0yn4cc3i71vxickvwz4g94fc39pgg9phqdz7sc6kf6xran6p0jdy";
+      rev = "32ebfb105cf86b191b72e6c9aaf8d6230d05684c";
+      sha256 = "0k79bj9lb65w5nxsb226bf3r0ppqh9p9g8yigbs0qgfx8aidwnsw";
     };
     dependencies = [];
 
@@ -1500,11 +1522,11 @@ rec {
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2016-11-05";
+    name = "vim-pandoc-syntax-2017-01-19";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "c76442ccbdd7889184683dc1d39c16c612c2c19f";
-      sha256 = "1ad60ls4xrbf01sjprksrx2j9x2y4m6gd7hq3p9ygrcmcxw64khm";
+      rev = "89341527b2bde3fbd473f5677e1df09072c319b5";
+      sha256 = "106h40vbcgap4jqqwcc6k01q65ss8r99594g6144kacnk0jixg52";
     };
     dependencies = [];
 
@@ -1599,22 +1621,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2016-11-01";
+    name = "vim-wakatime-2017-02-08";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "5fb34105de863ca90f3f8568b85fa017a42568af";
-      sha256 = "1flsdmf60fp8z0k080qfzdcpcb761zrj5qa3np2y9w24wbff9m5p";
+      rev = "3d343f656521ef0521a3277b81e4cd9af8be671a";
+      sha256 = "0xr6q39a20121kkscjpz1bly9j0z3lbzwj34gl3msba91mv1glb1";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2016-10-27";
+    name = "command-t-2017-01-08";
     src = fetchgit {
       url = "git://github.com/wincent/command-t";
-      rev = "d2467c84af8a1f1a2d0366127550d0a241dd2548";
-      sha256 = "1r81a0wlj9aqx0s11h6ddkdwbahxbg1l425jdyrwvxwd973nwkj6";
+      rev = "ce9daf8d792c945d32d0bf8878149eaa8aee2b81";
+      sha256 = "13ylc9bwf5qxsc8i62ppbcr446m35iyp243293ahn7xdrlnv2f9g";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1638,14 +1660,14 @@ rec {
   };
 
   deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2016-12-22";
+    name = "deoplete-go-2017-02-10";
     src = fetchgit {
       url = "git://github.com/zchee/deoplete-go";
-      rev = "3762a44995559277ea6b0bbcd3242dc5250d438e";
-      sha256 = "16hdp7gq3mxddwbi4qbpqknc67yfr8xr52v198189jgnwajs3c6x";
+      rev = "85a9c1847aa76e13e0e6e59e9694927281f3f15a";
+      sha256 = "0i0hfkr7xnm8v8rz2788xvz65yrwhw6i2sin17hymkfwscjdds86";
     };
     dependencies = [];
-    buildInputs = [ python3 ]; 
+    buildInputs = [ python3 ];
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -1655,11 +1677,11 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2016-12-01";
+    name = "deoplete-jedi-2017-01-16";
     src = fetchgit {
       url = "git://github.com/zchee/deoplete-jedi";
-      rev = "13c69a4baefdcf3be4288d82b9a75405fff06838";
-      sha256 = "15w53k5mxrpj6qaybxgyvmbxizkk6r06hsmw9hff8aig4xd3dw74";
+      rev = "6240de812f06263524f46379ad08a0d3d539730f";
+      sha256 = "00hn00dv7klywqv14zhicsa0gd9iiv5va155ayr6mpj74p9lp2a1";
     };
     dependencies = [];
 
@@ -1798,11 +1820,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2016-09-28";
+    name = "table-mode-2017-01-05";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "441c30c35aec9d5c2de1d58a77a7d22aa8d93b06";
-      sha256 = "04fdd2hgrcrgqqflzlvv7j9c53m8f2divi075p75g6grkxxyninv";
+      rev = "30a3eba81628fdd099adc6dfdec8aa627c4783f7";
+      sha256 = "0pw3mvrx3iyyj5xz05gixhvnrqxpl274cv04449mxm50q32zvmhr";
     };
     dependencies = [];
 
@@ -1840,17 +1862,6 @@ rec {
 
   };
 
-  tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-01-02";
-    src = fetchgit {
-      url = "git://github.com/Quramy/tsuquyomi";
-      rev = "473aa2703950816748329acca56c069df7339c96";
-      sha256 = "0h5gbhs4gsvyjsin2wvdlbrr6ykpcmipmpwpf39595j1dlqnab59";
-    };
-    dependencies = [];
-
-  };
-
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "undotree-2016-07-19";
     src = fetchgit {
@@ -2028,11 +2039,11 @@ rec {
   };
 
   vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-sql-2014-01-18";
+    name = "vim-addon-sql-2017-02-11";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-sql";
-      rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b";
-      sha256 = "15l2201jkfml08znvkkpy7fm3wn87n91zgd9ysrf5h73amjx9y2w";
+      rev = "048a139af36829fce670c8ff80d3aad927557ee6";
+      sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3";
     };
     dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
@@ -2072,11 +2083,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-12-29";
+    name = "vim-airline-2017-02-11";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "a2431f2adb23a003abdfe5294861bbd69de52e52";
-      sha256 = "1qd5f133rg3pqdm889zg0hxhrmgzd71maz6jif4a4hjbghi61wjs";
+      rev = "b66c1ef07005fad6a70957b90d4f47bb932e33e2";
+      sha256 = "0y8adl6dl7c501na2k2j38cs200ykm6pjva19xshiv0h2f916l2b";
     };
     dependencies = [];
 
@@ -2094,26 +2105,16 @@ rec {
   };
 
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2016-03-06";
+    name = "vim-easy-align-2017-02-08";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
-      rev = "0cb6b98fc155717b0a56c110551ac57d1d951ddb";
-      sha256 = "10j1fz7si7xqqs4p7h66jd0xzr116cv3xjyac9p20fc0yyyg1wbh";
+      rev = "3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9";
+      sha256 = "0nqvzxr2i9jsyx1qhspf636q0j4b0d8y98yqhxklcpq18ap442zp";
     };
     dependencies = [];
 
   };
 
-  vim-elixir = buildVimPluginFrom2Nix {
-      name = "vim-elixir-2017-02-01";
-      src = fetchgit {
-        url = "https://github.com/elixir-lang/vim-elixir";
-        rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f";
-        sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4";
-      };
-      dependencies = [];
-    };
-
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-gista-2016-09-21";
     src = fetchgit {
@@ -2126,11 +2127,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2016-12-23";
+    name = "vim-gitgutter-2017-02-06";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "7b81a8a22607f073b76b106e2d5e63cc936b0d25";
-      sha256 = "19v2akrhhfb9zy7mvljjwvi7lqrnviw88gxh4xmpy82vghiwdrfs";
+      rev = "5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143";
+      sha256 = "19iz6k1wb8jy51lpr8pwp3fy80ww4sw6n6mp56lw59n8227gffc1";
     };
     dependencies = [];
 
@@ -2158,17 +2159,6 @@ rec {
 
   };
 
-  vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-misc-2015-05-21";
-    src = fetchgit {
-      url = "git://github.com/xolox/vim-misc";
-      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
-      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
-    };
-    dependencies = [];
-
-  };
-
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-multiple-cursors-2016-06-03";
     src = fetchgit {
@@ -2192,22 +2182,22 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-12-31";
+    name = "vim-signify-2017-02-10";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "32d8797d887b0980514cdf7f11c9c1379d597e57";
-      sha256 = "1jhb6pljqbz8mlcc4zfjqzhyyp4yz5b6h7s0224m7vm4xvsphq8y";
+      rev = "a2c28f654087735a276ec7c1f558b782db5488a5";
+      sha256 = "0zhm26d5s68gcj1lmw866m0gcfss46mr4z79zggiara83x5abbxp";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-12-27";
+    name = "vim-snippets-2017-02-07";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "e24d33f96a95332dde0edaa7e7e3e7a64244de56";
-      sha256 = "1clba2x05klqab5ifkg19cxm22ibx6ycdfdn71clglk96wli1h0f";
+      rev = "b8c340daf084f243a487f8853a0984504909dfda";
+      sha256 = "1173hck15aijhvh00rjdsyiv21ax6hp9h7w2yph514zi9mhzgg8q";
     };
     dependencies = [];
 
@@ -2236,11 +2226,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2016-12-18";
+    name = "vimwiki-2017-01-30";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "3a8743700581923c6fd2684510dad48a8b2b8c64";
-      sha256 = "19b27h0zsmi1xphzf1qhmry11gca4j1mh0mli12yvkr9v61rnj6b";
+      rev = "be79f68a9292cbe53d330cb37fd18d835e8f74d4";
+      sha256 = "0n43vaxh90v5wbgqld61bwlhzr11s0c72dgrp0cirj7ri7xajq8z";
     };
     dependencies = [];
 

From 76a3c30471e57faaa75f4ed957c12f13e9f92d90 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Feb 2017 23:08:48 +0100
Subject: [PATCH 0245/3449] network-interfaces service: fix bindsTo deps for
 masters

Previously, netdev units for network interfaces defined in the nixos
configurations would bindTo the systemd device unit of the interface if
not in a container.

In situations where you switch to a new nixos configration with changes
to network-setup.service (like nameservers) and have stacked interfaces
like vlans on a bond, it would fail to propagate restarts to the netdevs
correctly resulting with broken networking. The bond would be present
but no vlan interfaces rendering the machine unreachable.

My fear is that the udev events fail to propagate correctly while a systemd
transaction that is also restarting the triggered netdev service is running.
This commit changes this behaviour so netdev services bindTo other netdev
services if present and otherwise fall back to the previous behaviour.

We also noticed that stacked interfaces would sometimes seemingly be stopped
in the wrong order. For instance in the above example, the bond interface
would be deleted before the vlan interfaces resulting in the vlan interfaces
not being present when their service is being stopped. This would cause the
systemd transaction to fail and thus break networking. Their postStop hooks
are now allowed to fail as we have reached the desired state.
---
 .../tasks/network-interfaces-scripted.nix     | 34 ++++++++-----------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 062598de83e1..cf90f05e8d3a 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -47,21 +47,17 @@ in
       let
 
         deviceDependency = dev:
-          if (config.boot.isContainer == false)
-          then
-            # Trust udev when not in the container
-            optional (dev != null) (subsystemDevice dev)
-          else
-            # When in the container, check whether the interface is built from other definitions
-            if (hasAttr dev cfg.bridges) ||
-               (hasAttr dev cfg.bonds) ||
-               (hasAttr dev cfg.macvlans) ||
-               (hasAttr dev cfg.sits) ||
-               (hasAttr dev cfg.vlans) ||
-               (hasAttr dev cfg.vswitches) ||
-               (hasAttr dev cfg.wlanInterfaces)
-            then [ "${dev}-netdev.service" ]
-            else [];
+          # Use systemd service if we manage device creation, else
+          # trust udev when not in a container
+          if (hasAttr dev cfg.bridges) ||
+             (hasAttr dev cfg.bonds) ||
+             (hasAttr dev cfg.macvlans) ||
+             (hasAttr dev cfg.sits) ||
+             (hasAttr dev cfg.vlans) ||
+             (hasAttr dev cfg.vswitches) ||
+             (hasAttr dev cfg.wlanInterfaces)
+          then [ "${dev}-netdev.service" ]
+          else optional (dev != null && !config.boot.isContainer) (subsystemDevice dev);
 
         networkLocalCommands = {
           after = [ "network-setup.service" ];
@@ -198,7 +194,7 @@ in
               user "${i.virtualOwner}"
             '';
             postStop = ''
-              ip link del ${i.name}
+              ip link del ${i.name} || true
             '';
           };
 
@@ -335,7 +331,7 @@ in
               ip link set "${n}" up
             '';
             postStop = ''
-              ip link delete "${n}"
+              ip link delete "${n}" || true
             '';
           });
 
@@ -363,7 +359,7 @@ in
               ip link set "${n}" up
             '';
             postStop = ''
-              ip link delete "${n}"
+              ip link delete "${n}" || true
             '';
           });
 
@@ -387,7 +383,7 @@ in
               ip link set "${n}" up
             '';
             postStop = ''
-              ip link delete "${n}"
+              ip link delete "${n}" || true
             '';
           });
 

From 4c0aae964c9e8d3f3e9361583a88c9c4561f6895 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 13 Feb 2017 01:32:37 +0000
Subject: [PATCH 0246/3449] ssm-agent: init at 2.0.633.0

---
 .../networking/cluster/ssm-agent/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/ssm-agent/default.nix

diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix
new file mode 100644
index 000000000000..bb179606b367
--- /dev/null
+++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, buildGoPackage }:
+
+buildGoPackage rec {
+  name    = "${pname}-${version}";
+  pname   = "amazon-ssm-agent";
+  version = "2.0.633.0";
+
+  goPackagePath = "github.com/aws/${pname}";
+  subPackages   = [ "agent" ];
+
+  src = fetchFromGitHub {
+    rev    = "v${version}";
+    owner  = "aws";
+    repo   = pname;
+    sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv";
+  };
+
+  preBuild = ''
+    mv go/src/${goPackagePath}/vendor strange-vendor
+    mv strange-vendor/src go/src/${goPackagePath}/vendor
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Agent to enable remote management of your Amazon EC2 instance configuration";
+    homepage    = "https://github.com/aws/amazon-ssm-agent";
+    license     = licenses.asl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ copumpkin ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67dcb8bedbeb..1ad48f262d2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5960,6 +5960,8 @@ with pkgs;
   spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
   spidermonkey = spidermonkey_31;
 
+  ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
+
   supercollider = callPackage ../development/interpreters/supercollider {
     fftw = fftwSinglePrec;
   };

From 4450327c062a41f7df2f6756057df4ebb6548011 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 12 Feb 2017 20:52:37 -0500
Subject: [PATCH 0247/3449] flow: pin ocaml to ocaml_4_02

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index a63e9f65e5cb..c1cb4412b9ca 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lib, ocaml_4_02, libelf, cf-private, CoreServices }:
+{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }:
 
 with lib;
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml_4_02 libelf ]
+  buildInputs = [ ocaml libelf ]
     ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ad48f262d2a..855de099cbac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6363,6 +6363,7 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
+    ocaml = ocaml_4_02;
   };
 
   framac = callPackage ../development/tools/analysis/frama-c { };
@@ -15600,7 +15601,7 @@ with pkgs;
   wmii_hg = callPackage ../applications/window-managers/wmii-hg { };
 
   wordnet = callPackage ../applications/misc/wordnet { };
-  
+
   worker = callPackage ../applications/misc/worker { };
 
   workrave = callPackage ../applications/misc/workrave {

From e928cb1c631fedde3837dabc518931ea12522163 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 13 Feb 2017 04:01:28 +0000
Subject: [PATCH 0248/3449] ssm-agent NixOS module: init

---
 nixos/modules/module-list.nix             |  1 +
 nixos/modules/services/misc/ssm-agent.nix | 45 +++++++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 nixos/modules/services/misc/ssm-agent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9bf6a400b098..cf791a67f53f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -294,6 +294,7 @@
   ./services/misc/siproxd.nix
   ./services/misc/sonarr.nix
   ./services/misc/spice-vdagentd.nix
+  ./services/misc/ssm-agent.nix
   ./services/misc/sssd.nix
   ./services/misc/subsonic.nix
   ./services/misc/sundtek.nix
diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix
new file mode 100644
index 000000000000..b04959a9686a
--- /dev/null
+++ b/nixos/modules/services/misc/ssm-agent.nix
@@ -0,0 +1,45 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.services.ssm-agent;
+
+  # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool
+  # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM
+  # looks for. See https://github.com/aws/amazon-ssm-agent/issues/38 for upstream fix.
+  fake-lsb-release = pkgs.writeScriptBin "lsb_release" ''
+    #!${pkgs.stdenv.shell}
+
+    case "$1" in
+      -i) echo "nixos";;
+      -r) echo "${config.system.nixosVersion}";;
+    esac
+  '';
+in {
+  options.services.ssm-agent = {
+    enable = mkEnableOption "AWS SSM agent";
+
+    package = mkOption {
+      type = types.path;
+      description = "The SSM agent package to use";
+      default = pkgs.ssm-agent;
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.ssm-agent = {
+      inherit (cfg.package.meta) description;
+      after    = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = [ fake-lsb-release ];
+      serviceConfig = {
+        ExecStart = "${cfg.package.bin}/bin/agent";
+        KillMode = "process";
+        Restart = "on-failure";
+        RestartSec = "15min";
+      };
+    };
+  };
+}
+

From e63d15f1732b2a27c362d376337ecb231f638649 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 13 Feb 2017 04:06:22 +0000
Subject: [PATCH 0249/3449] ecs-agent NixOS module: enable docker

---
 nixos/modules/virtualisation/ecs-agent.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix
index ed17fbf49310..18e45e0b8457 100644
--- a/nixos/modules/virtualisation/ecs-agent.nix
+++ b/nixos/modules/virtualisation/ecs-agent.nix
@@ -22,6 +22,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    # This service doesn't run if docker isn't running, and unlike potentially remote services like e.g., postgresql, docker has
+    # to be running locally so `docker.enable` will always be set if the ECS agent is enabled.
+    virtualisation.docker.enable = true;
+
     systemd.services.ecs-agent = {
       inherit (cfg.package.meta) description;
       after    = [ "network.target" ];

From 8616c0d39194291da44af0cb503b5120eb0485a6 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Thu, 26 Jan 2017 08:30:50 +0100
Subject: [PATCH 0250/3449] tsearch-extras: init at 0.2

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

diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
new file mode 100644
index 000000000000..d434fa98e09b
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, pkgconfig, postgresql }:
+
+stdenv.mkDerivation rec {
+  name = "tsearch-extras-${version}";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "zulip";
+    repo = "tsearch_extras";
+    rev = version;
+    sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg";
+  };
+
+  nativebuildInputs = [ pkgconfig ];
+  buildInputs = [ postgresql ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D tsearch_extras.so -t $out/lib/
+    install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Provides a few PostgreSQL functions for a lower-level data full text search";
+    homepage = https://github.com/zulip/tsearch_extras/;
+    license = licenses.postgresql;
+    maintainers = with maintainers; [ DerTim1 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236d..e798e1db26ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15310,6 +15310,8 @@ with pkgs;
   # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build
   trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { };
 
+  tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { };
+
   tudu = callPackage ../applications/office/tudu { };
 
   tuxguitar = callPackage ../applications/editors/music/tuxguitar { };

From 94db8d7dd22dddb4988bdf396faffb6f722979b0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 09:52:07 +0100
Subject: [PATCH 0251/3449] Revert "pythonPackages.argparse: only for Python <
 2.7"

This reverts commit 12d9eac8f050dda7a0dce726d438cc38ff6b6f8c.
---
 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 ca5b5bec21db..95ea727968df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1321,7 +1321,7 @@ in {
 
   };
 
-  argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec {
+  argparse = buildPythonPackage (rec {
     name = "argparse-1.4.0";
 
     src = pkgs.fetchurl {

From eff0752dbc36f52fce9c27ff10b8db41a5f632f4 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 13 Feb 2017 08:54:10 +0000
Subject: [PATCH 0252/3449] Use default qemu for azure image generation, and
 use option to enforce sizing of image to be compliant with Azure/HyperV.

(cherry picked from commit e16db5666af987f8a76be82ff219e138e92af442)
---
 nixos/modules/virtualisation/azure-image.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 9fac543b03d5..91fae88fc98c 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -16,14 +16,14 @@ in
               cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
               size=$(($cyl*255*63*512))              
               roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
+              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
               mv closure xchg/
             '';
 
           postVM =
             ''
               mkdir -p $out
-              ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
+              ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd
               rm $diskImage
             '';
           diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";

From 71812be9ef75612e489379de7110978811c2229c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:47:44 +0100
Subject: [PATCH 0253/3449] kwooty: kde-apps url's have changed

---
 pkgs/applications/networking/newsreaders/kwooty/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix
index d8e417cdd3a8..1f6a20fc76b6 100644
--- a/pkgs/applications/networking/newsreaders/kwooty/default.nix
+++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114385-${name}.tar.gz";
+    url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz";
     sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap";
   };
 

From d375d7b354a8f7839154cd53f207e4bcb65bfbd7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:48:23 +0100
Subject: [PATCH 0254/3449] kmplayer: file not available via new mirror either

---
 pkgs/applications/video/kmplayer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index 2e62cb139e34..cbd0347078ef 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation {
     description = "MPlayer front-end for KDE";
     license = "GPL";
     homepage = http://kmplayer.kde.org;
+    broken = true; # Also unavailable on this mirror
     maintainers = [ stdenv.lib.maintainers.sander ];
   };
 }

From 63bff03f97620faa92ca8b44c7a5ac897eee6750 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:48:43 +0100
Subject: [PATCH 0255/3449] kronometer: 2.1.0 -> 2.1.3

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

diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 37399a1a4184..598d01266233 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "kronometer";
-  version = "2.1.0";
+  version = "2.1.3";
   unwrapped = kdeDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
       url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1nh7y4c13rscy55f5n8s2v8jij27b55rwkxh9g8r0p7mdwmw8vri";
+      sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
     };
 
     meta = with lib; {

From a35ffe3c01e087896adab5c58f63306d427841e3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:49:12 +0100
Subject: [PATCH 0256/3449] kde frameworks: 5.30 -> 5.31

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../kpackage/allow-external-paths.patch       |  12 +-
 .../libraries/kde-frameworks/srcs.nix         | 592 +++++++++---------
 3 files changed, 303 insertions(+), 303 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 9c8d06b14c68..263f811ebc62 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.30/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.31/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
index 5fa1c3fe79b2..c1c9efde7f74 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch
@@ -1,11 +1,11 @@
-Index: kpackage-5.30.0/src/kpackage/package.cpp
-===================================================================
---- kpackage-5.30.0.orig/src/kpackage/package.cpp
-+++ kpackage-5.30.0/src/kpackage/package.cpp
+diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
+index 5aec9fd..b15c933 100644
+--- a/src/kpackage/package.cpp
++++ b/src/kpackage/package.cpp
 @@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate()
      : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
+       fallbackPackage(nullptr),
+       metadata(nullptr),
 -      externalPaths(false),
 +      externalPaths(true),
        valid(false),
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 0783c3bd9ed4..f879005da1d0 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/attica-5.30.0.tar.xz";
-      sha256 = "1v8y6dx5qcqrs1dlybmc3lx05qsra0111qf7kzlq8azljdy20i2v";
-      name = "attica-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz";
+      sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56";
+      name = "attica-5.31.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/baloo-5.30.0.tar.xz";
-      sha256 = "022frn2f5mw71496r2i70q3z9diq6d5386nh8aymvii0l84c0mm9";
-      name = "baloo-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz";
+      sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz";
+      name = "baloo-5.31.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/bluez-qt-5.30.0.tar.xz";
-      sha256 = "1asf2hcljzhca9pmh42fz25nnp05xxf4yab4r13wwwdzk4ms0x6f";
-      name = "bluez-qt-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz";
+      sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl";
+      name = "bluez-qt-5.31.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/breeze-icons-5.30.0.tar.xz";
-      sha256 = "0n8705sly52sp4lsikr8xs671ch23ykk8xg3ksb9na700v837rak";
-      name = "breeze-icons-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz";
+      sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845";
+      name = "breeze-icons-5.31.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/extra-cmake-modules-5.30.0.tar.xz";
-      sha256 = "0v59f76ghqckg857559sb4vla1d6pza4hj5bai8dnd712isn9abx";
-      name = "extra-cmake-modules-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz";
+      sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4";
+      name = "extra-cmake-modules-5.31.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/frameworkintegration-5.30.0.tar.xz";
-      sha256 = "1a9zqd96jn9p8niqz0jwclfl1np1ryszdz8q02s9cwy35zia1dfk";
-      name = "frameworkintegration-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz";
+      sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj";
+      name = "frameworkintegration-5.31.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kactivities-5.30.0.tar.xz";
-      sha256 = "0njq8jc9vqag3h6ryjiraib44sgrd66fswnldl0w0n2kvgf948qv";
-      name = "kactivities-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz";
+      sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz";
+      name = "kactivities-5.31.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kactivities-stats-5.30.0.tar.xz";
-      sha256 = "116mcnadlqidx90hllpwkxrmhwapnvmak5rzmqngnzkdvrpicl6r";
-      name = "kactivities-stats-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz";
+      sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy";
+      name = "kactivities-stats-5.31.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kapidox-5.30.0.tar.xz";
-      sha256 = "08qpbmgw8cb4ygs4m3y9529dwsyn7nrln5rkfmbfkvfjlfry7njf";
-      name = "kapidox-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz";
+      sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za";
+      name = "kapidox-5.31.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/karchive-5.30.0.tar.xz";
-      sha256 = "0f0zax2hihiq504nr3m5vap0ssmx5hvnc3rxk006zgvwgr1mvcqq";
-      name = "karchive-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz";
+      sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay";
+      name = "karchive-5.31.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kauth-5.30.0.tar.xz";
-      sha256 = "0qf0wkkiaykcl79q0rsfmg7h7v342ycz9s6xr841qqs9w17dns3c";
-      name = "kauth-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz";
+      sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8";
+      name = "kauth-5.31.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kbookmarks-5.30.0.tar.xz";
-      sha256 = "0cibgw032n9n92fp78w04qw851lp3bfkd1rnyqvz7biypx4cz82z";
-      name = "kbookmarks-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz";
+      sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp";
+      name = "kbookmarks-5.31.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kcmutils-5.30.0.tar.xz";
-      sha256 = "12x32jwf8gb77l5brj169ahrgdlsmn0zrzmjfp7f4dfykfnbfws9";
-      name = "kcmutils-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz";
+      sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9";
+      name = "kcmutils-5.31.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kcodecs-5.30.0.tar.xz";
-      sha256 = "1via1xv4qswlyasyppi3q3a76bl5hk5ji34k63bp06p029ar7dkf";
-      name = "kcodecs-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz";
+      sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13";
+      name = "kcodecs-5.31.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kcompletion-5.30.0.tar.xz";
-      sha256 = "1205xq2r550lb4v39h3g1sr8cgsysfkkxkk5scp4d92vawlbsrx6";
-      name = "kcompletion-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz";
+      sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g";
+      name = "kcompletion-5.31.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kconfig-5.30.0.tar.xz";
-      sha256 = "1p23q7ykkrsj847m244v1wjcg7b85rh7shc8lkn290cydk5kr6m2";
-      name = "kconfig-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz";
+      sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi";
+      name = "kconfig-5.31.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kconfigwidgets-5.30.0.tar.xz";
-      sha256 = "15ir4qr4hzr8ia9g8c13fnn2szhs07wys54nialbj0dggx9qa782";
-      name = "kconfigwidgets-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz";
+      sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs";
+      name = "kconfigwidgets-5.31.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.30.1";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kcoreaddons-5.30.1.tar.xz";
-      sha256 = "0w1yqcvd97jhm3w2x7mmayrifb1swda8lmzzmlz41crsq909ilnd";
-      name = "kcoreaddons-5.30.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz";
+      sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m";
+      name = "kcoreaddons-5.31.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kcrash-5.30.0.tar.xz";
-      sha256 = "0hmcg81iahd2bvcm57yk7mdy6lnrsrzl7z6cv8lxpj9xw0ajd8h4";
-      name = "kcrash-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz";
+      sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j";
+      name = "kcrash-5.31.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kdbusaddons-5.30.0.tar.xz";
-      sha256 = "1ql5xjxfq8y0bmagq2zw44rilyrm1cmkjsfcfrjy0d2adhl23w7p";
-      name = "kdbusaddons-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz";
+      sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk";
+      name = "kdbusaddons-5.31.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kdeclarative-5.30.0.tar.xz";
-      sha256 = "0898mxh7izxn9d4iyv8gsxrjl2wms4m6mr69qd4bfygd8z8hqp46";
-      name = "kdeclarative-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz";
+      sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1";
+      name = "kdeclarative-5.31.0.tar.xz";
     };
   };
   kded = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kded-5.30.0.tar.xz";
-      sha256 = "1sqmnxii0i3m65cacjxasm99pq2cvfymbalak8r0mip8g8fdarrd";
-      name = "kded-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz";
+      sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51";
+      name = "kded-5.31.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/portingAids/kdelibs4support-5.30.0.tar.xz";
-      sha256 = "0fkg5bk1p91iq1na67h02wdqnq71ln8g22r6sc7rva54w5ilnwxm";
-      name = "kdelibs4support-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz";
+      sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl";
+      name = "kdelibs4support-5.31.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kdesignerplugin-5.30.0.tar.xz";
-      sha256 = "0hf7209zd398v4m3aa99yva1bbphzlyn0x9i5ydalwvwykmvjvdz";
-      name = "kdesignerplugin-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz";
+      sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x";
+      name = "kdesignerplugin-5.31.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kdesu-5.30.0.tar.xz";
-      sha256 = "1cnl6pap4399s7l9ggi23f5b6mscfddsgwra4d2qy1093y0nb8mk";
-      name = "kdesu-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz";
+      sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax";
+      name = "kdesu-5.31.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kdewebkit-5.30.0.tar.xz";
-      sha256 = "1rq3ypsw2svvzfxjd6gj231phhnw19fwyr5qkcsik4076h6ycwvk";
-      name = "kdewebkit-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz";
+      sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0";
+      name = "kdewebkit-5.31.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kdnssd-5.30.0.tar.xz";
-      sha256 = "1if1gaykgad5vg32p0impx4vwjaxd77r34gajg1kiywan6jpq6d8";
-      name = "kdnssd-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz";
+      sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk";
+      name = "kdnssd-5.31.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kdoctools-5.30.0.tar.xz";
-      sha256 = "14i7ffmlwqhbq7gp5k8wajvg7x65nwxr5p1qqgxhmpmranyickvy";
-      name = "kdoctools-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz";
+      sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk";
+      name = "kdoctools-5.31.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kemoticons-5.30.0.tar.xz";
-      sha256 = "0h3a9xs110l1d2wyp8dfkaf3fnpc0wvfdacpgbnihk1xvccmq4nl";
-      name = "kemoticons-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz";
+      sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk";
+      name = "kemoticons-5.31.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kfilemetadata-5.30.0.tar.xz";
-      sha256 = "1m07hj5nnb81wraylhh36f2k82zqxz5g766wwcn12pd8v0r99ilh";
-      name = "kfilemetadata-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz";
+      sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd";
+      name = "kfilemetadata-5.31.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kglobalaccel-5.30.0.tar.xz";
-      sha256 = "123c7sqwj4davrwrgwy16qag8ss205pk9af4jc9sky74h531fdm1";
-      name = "kglobalaccel-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz";
+      sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc";
+      name = "kglobalaccel-5.31.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kguiaddons-5.30.0.tar.xz";
-      sha256 = "0kn0ia6ciafng227lrrdslmxhh30426wywarxvihlcqfzrgmnpzm";
-      name = "kguiaddons-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz";
+      sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3";
+      name = "kguiaddons-5.31.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/portingAids/khtml-5.30.0.tar.xz";
-      sha256 = "1z4pj3cr8bzbl80bi1z87lsg1adr9hbm60wf3811wdma2d4w4bbh";
-      name = "khtml-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz";
+      sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h";
+      name = "khtml-5.31.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/ki18n-5.30.0.tar.xz";
-      sha256 = "1wvjrmpsypfhivk3hfpb9lm09d0w2c9lc4mxvbyfkibhan1x1lid";
-      name = "ki18n-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz";
+      sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g";
+      name = "ki18n-5.31.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kiconthemes-5.30.0.tar.xz";
-      sha256 = "0sixqg2fvm9m14xbn3dmsk564i9ig3zn6zf5ww10hnqd1wcd4sg9";
-      name = "kiconthemes-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz";
+      sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5";
+      name = "kiconthemes-5.31.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kidletime-5.30.0.tar.xz";
-      sha256 = "1vbjvwy5ihz5id2484d2hn5a81p85vz3mvwpcjbypkd3y5mqcrq6";
-      name = "kidletime-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz";
+      sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25";
+      name = "kidletime-5.31.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kimageformats-5.30.0.tar.xz";
-      sha256 = "057a9gallq1j3a51ijyp47x82hmn8vssxb74jchlf90jjnyq4g2i";
-      name = "kimageformats-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz";
+      sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12";
+      name = "kimageformats-5.31.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kinit-5.30.0.tar.xz";
-      sha256 = "047vxnq4ypl70vspq800k00cj2cjqd6hx46yp11m33np03106rj2";
-      name = "kinit-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz";
+      sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l";
+      name = "kinit-5.31.0.tar.xz";
     };
   };
   kio = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kio-5.30.0.tar.xz";
-      sha256 = "0finbv7kcaz81bsj6yv6pxwxcjrwkj5mmkxhg0pa5j77jn1nhnm1";
-      name = "kio-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz";
+      sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9";
+      name = "kio-5.31.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kitemmodels-5.30.0.tar.xz";
-      sha256 = "1yf2bfzxqgw75p5bi7byg9rbbiclhqayybiyd8cq3d8b8ws4bfdf";
-      name = "kitemmodels-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz";
+      sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5";
+      name = "kitemmodels-5.31.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kitemviews-5.30.0.tar.xz";
-      sha256 = "0fx4sdrflp2h0y6ixdnbaxd8l5cham4lx0f36y7dfz6jlk56d12y";
-      name = "kitemviews-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz";
+      sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv";
+      name = "kitemviews-5.31.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kjobwidgets-5.30.0.tar.xz";
-      sha256 = "0ilzl1sm9fx7cx03nh5y2y656jfssp7b46xiawgnasvc94ysl9hf";
-      name = "kjobwidgets-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz";
+      sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa";
+      name = "kjobwidgets-5.31.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/portingAids/kjs-5.30.0.tar.xz";
-      sha256 = "0yh7n0q1vbx8nd6j25jys6hd24m3knn44n6xc09pwnr3mn0shvih";
-      name = "kjs-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz";
+      sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1";
+      name = "kjs-5.31.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/portingAids/kjsembed-5.30.0.tar.xz";
-      sha256 = "0ixd56krz66psxk9h8dzd5jr693kh9xx4303zicws85014ba33q5";
-      name = "kjsembed-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz";
+      sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14";
+      name = "kjsembed-5.31.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/portingAids/kmediaplayer-5.30.0.tar.xz";
-      sha256 = "0bir4g7bfhjdrs2skhr7jclc3f7frmfm6p8n2q10ag9in8h5hwd8";
-      name = "kmediaplayer-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz";
+      sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4";
+      name = "kmediaplayer-5.31.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.30.1";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/knewstuff-5.30.1.tar.xz";
-      sha256 = "1vsaprynq6dazg64zmj6j1wd8g4aw6pzz3208nqgjjwk5kw8zh0h";
-      name = "knewstuff-5.30.1.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz";
+      sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl";
+      name = "knewstuff-5.31.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/knotifications-5.30.0.tar.xz";
-      sha256 = "199jh1gizdwc1xz97khac9m6bdg38n5hr5c96pq7sk7b2rdr49ks";
-      name = "knotifications-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz";
+      sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly";
+      name = "knotifications-5.31.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/knotifyconfig-5.30.0.tar.xz";
-      sha256 = "04l5hjdd0376y9ygmrz8a49w8hxnb01y0fi13spvkmx8dhal0fmq";
-      name = "knotifyconfig-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz";
+      sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi";
+      name = "knotifyconfig-5.31.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kpackage-5.30.0.tar.xz";
-      sha256 = "1j1vwna5w67wqsdfl5s83gx7vizj5qnsl6nck7ny055yzzwb2gna";
-      name = "kpackage-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz";
+      sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr";
+      name = "kpackage-5.31.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kparts-5.30.0.tar.xz";
-      sha256 = "1sgqylynq35d6xir99kgqial3p0pf0lcaqagl2vh1qandipmcp8g";
-      name = "kparts-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz";
+      sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa";
+      name = "kparts-5.31.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kpeople-5.30.0.tar.xz";
-      sha256 = "1h72fwr6121w0cfhaci32s4510kwinjah9ynfhjl998mg00k42hj";
-      name = "kpeople-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz";
+      sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy";
+      name = "kpeople-5.31.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kplotting-5.30.0.tar.xz";
-      sha256 = "00wrz16m4blh130713fk0q3gzpsx33zs6wnd4ghwhaakmqydn2gh";
-      name = "kplotting-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz";
+      sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm";
+      name = "kplotting-5.31.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kpty-5.30.0.tar.xz";
-      sha256 = "0dna8a0n7lg22522khxq0vxn76g484198p80hzvysnkl218fav60";
-      name = "kpty-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz";
+      sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196";
+      name = "kpty-5.31.0.tar.xz";
     };
   };
   kross = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/portingAids/kross-5.30.0.tar.xz";
-      sha256 = "1bqfznfrr87c88ffs7hj0iqcv8vgzrz57l31zpij3cgiy09q7axz";
-      name = "kross-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz";
+      sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp";
+      name = "kross-5.31.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/krunner-5.30.0.tar.xz";
-      sha256 = "1smkanc14nlsdrg31skzb9y7f0fahyf09iq1h2xfla4kvgk811qz";
-      name = "krunner-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz";
+      sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw";
+      name = "krunner-5.31.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kservice-5.30.0.tar.xz";
-      sha256 = "1jcb938m3kllmrzmwz21zjlhrx0r6dmyrglsf0zbjs2cg9hwww0l";
-      name = "kservice-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz";
+      sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg";
+      name = "kservice-5.31.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/ktexteditor-5.30.0.tar.xz";
-      sha256 = "0bhbcqfkmpy95p3w66xxnhi4h7h3k3k362fhsrl38rc83r9agnns";
-      name = "ktexteditor-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz";
+      sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln";
+      name = "ktexteditor-5.31.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/ktextwidgets-5.30.0.tar.xz";
-      sha256 = "1fpqjig6wzb1gycvak9h4p48c623fkzj2lxvf0p3vmb6b0yxr1jw";
-      name = "ktextwidgets-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz";
+      sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy";
+      name = "ktextwidgets-5.31.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kunitconversion-5.30.0.tar.xz";
-      sha256 = "0fjkl355dwcgd4a39212qwmmbj37nfhmw3ik2bxg3gxg07a4yra5";
-      name = "kunitconversion-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz";
+      sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx";
+      name = "kunitconversion-5.31.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kwallet-5.30.0.tar.xz";
-      sha256 = "1nnc0gcn7w5jmmzs4zr4qlrhn3ns9x42f2dfcwc5vi281gghl54k";
-      name = "kwallet-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz";
+      sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n";
+      name = "kwallet-5.31.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kwayland-5.30.0.tar.xz";
-      sha256 = "0sc2mdiazql2012qadbqjm4wxmhhanbba9r9qjxqx2li14ax6yci";
-      name = "kwayland-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz";
+      sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b";
+      name = "kwayland-5.31.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kwidgetsaddons-5.30.0.tar.xz";
-      sha256 = "0jn2iw46cwfqh550rrb37yfznr4lrlsj8bh8v21xhgm3afm25hrl";
-      name = "kwidgetsaddons-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz";
+      sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815";
+      name = "kwidgetsaddons-5.31.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kwindowsystem-5.30.0.tar.xz";
-      sha256 = "0sz1wyawah03ygx3kh1x6wy1y1gp9f5h6296yy1mxy4qz4jp1b10";
-      name = "kwindowsystem-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz";
+      sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna";
+      name = "kwindowsystem-5.31.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kxmlgui-5.30.0.tar.xz";
-      sha256 = "005cn74h0rjvjsmfzrn3pai0jrgczj3y6h50g07rgmynmrcnygys";
-      name = "kxmlgui-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz";
+      sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr";
+      name = "kxmlgui-5.31.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/kxmlrpcclient-5.30.0.tar.xz";
-      sha256 = "18azc85vfng9gnjf09yhvg5g4432dy5ia9hk54jk9ibmy7kaqlqq";
-      name = "kxmlrpcclient-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz";
+      sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb";
+      name = "kxmlrpcclient-5.31.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/modemmanager-qt-5.30.0.tar.xz";
-      sha256 = "1qh39nd3lwdb8z58brqf0k48k5n3xx9wdi4kak2wg7vwmqwwammf";
-      name = "modemmanager-qt-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz";
+      sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r";
+      name = "modemmanager-qt-5.31.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/networkmanager-qt-5.30.0.tar.xz";
-      sha256 = "1scxcqrwxjwdzg2j3r6wz3bk23h7v9dil8n892ykfrpxa4cidgzi";
-      name = "networkmanager-qt-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz";
+      sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4";
+      name = "networkmanager-qt-5.31.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/oxygen-icons5-5.30.0.tar.xz";
-      sha256 = "1b1kfgk2vgr85kbgvx8fwpyib5yvdkz07vi6p1s8a61cabcymkhl";
-      name = "oxygen-icons5-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz";
+      sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi";
+      name = "oxygen-icons5-5.31.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/plasma-framework-5.30.0.tar.xz";
-      sha256 = "1qdyc0li07sns71gdyw31jhzhnghcvzc0r0y4y8f157nyz23pw70";
-      name = "plasma-framework-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz";
+      sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2";
+      name = "plasma-framework-5.31.0.tar.xz";
     };
   };
   prison = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/prison-5.30.0.tar.xz";
-      sha256 = "15vlz67qv1pm87hlnyak2jbdw87xw3jx3vaqwjfn07hbzlh8dmpc";
-      name = "prison-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz";
+      sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s";
+      name = "prison-5.31.0.tar.xz";
     };
   };
   solid = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/solid-5.30.0.tar.xz";
-      sha256 = "10rfsp39s8d8zgz02f4biyh9n7hbwxkib5r6g3cldbbf0ch3inmh";
-      name = "solid-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz";
+      sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m";
+      name = "solid-5.31.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/sonnet-5.30.0.tar.xz";
-      sha256 = "1i4i59vjq16mmqjfyr5hc7afnc5w2h54iz4rmqi0wdfk37cl5zcr";
-      name = "sonnet-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz";
+      sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3";
+      name = "sonnet-5.31.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/syntax-highlighting-5.30.0.tar.xz";
-      sha256 = "0iipg1khc27a3cgysk6qpj5lf846z3n29gj2yas36lgr8n6ddm53";
-      name = "syntax-highlighting-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz";
+      sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a";
+      name = "syntax-highlighting-5.31.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.30.0";
+    version = "5.31.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.30/threadweaver-5.30.0.tar.xz";
-      sha256 = "12zirga9qyjrizwxja2n5mh7kxgdb7xyl2d3makdjpnjk5kry8by";
-      name = "threadweaver-5.30.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz";
+      sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f";
+      name = "threadweaver-5.31.0.tar.xz";
     };
   };
 }

From dce2202d535a5fa1f1881f45363dbd954b5c8c7d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:50:16 +0100
Subject: [PATCH 0257/3449] kde applications: 16.12.1 -> 16.12.2

---
 pkgs/desktops/kde-5/applications/fetch.sh |    2 +-
 pkgs/desktops/kde-5/applications/srcs.nix | 2224 ++++++++++-----------
 2 files changed, 1113 insertions(+), 1113 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh
index 1ef623fe5133..607a16eb45b1 100644
--- a/pkgs/desktops/kde-5/applications/fetch.sh
+++ b/pkgs/desktops/kde-5/applications/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/16.12.1/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/16.12.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix
index 10bb6936bca7..60c412e55fda 100644
--- a/pkgs/desktops/kde-5/applications/srcs.nix
+++ b/pkgs/desktops/kde-5/applications/srcs.nix
@@ -3,2227 +3,2227 @@
 
 {
   akonadi = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-16.12.1.tar.xz";
-      sha256 = "1snf6jdr7yz1ng5whqkjsc89h82a97zj6vw8ijwiqqyas1cifdm3";
-      name = "akonadi-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-16.12.2.tar.xz";
+      sha256 = "1csaa69n65d3cnkajzk5702vxskfaiajvxw724s17a5y6sgk0h5z";
+      name = "akonadi-16.12.2.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-16.12.1.tar.xz";
-      sha256 = "0q2gpk8ci5snlz1v4rwwnrl74damjlz7fvdys875jykdnnb7jsfi";
-      name = "akonadi-calendar-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-16.12.2.tar.xz";
+      sha256 = "1qfkwmh82l5ahzjpsla9gwwk2kqxv773ddq8f5h52qlxx56agc6k";
+      name = "akonadi-calendar-16.12.2.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-calendar-tools-16.12.1.tar.xz";
-      sha256 = "1v9nj1nv4sxvqvd397vr38vscda0r3z80hll7jr8psyx7lyn91jx";
-      name = "akonadi-calendar-tools-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-tools-16.12.2.tar.xz";
+      sha256 = "1isjvsas6fnz2v2a8yl6ggkimfknr56a3zydwhq59lzcm15hn0hj";
+      name = "akonadi-calendar-tools-16.12.2.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadiconsole-16.12.1.tar.xz";
-      sha256 = "11rqyp7grjijhbl1apjjhc3d9qcxf0mz31l9mgd223vaxkv5lbjs";
-      name = "akonadiconsole-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadiconsole-16.12.2.tar.xz";
+      sha256 = "188qb2lc6d0xhvq8n5y7ax13a6wz3agg1mx3j2kphwn8f53grgzb";
+      name = "akonadiconsole-16.12.2.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-contacts-16.12.1.tar.xz";
-      sha256 = "042m4mnvs8a6jgrlyybysm0jax07r1756fixn4kglb0ki3lp57kr";
-      name = "akonadi-contacts-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-contacts-16.12.2.tar.xz";
+      sha256 = "1ixd1qzakxhq9qlfr6l8igii2ny8fi8hxasdadq9cyr5jl20rpgp";
+      name = "akonadi-contacts-16.12.2.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-import-wizard-16.12.1.tar.xz";
-      sha256 = "1ns7y1wqd4zvbgpzlczyailmvf6raqwqrpxxhshdskdd672n849p";
-      name = "akonadi-import-wizard-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-import-wizard-16.12.2.tar.xz";
+      sha256 = "0xdmcs8l0lqqx2f2yabp1xx60h1jcz05q7lk6zzapzc0xqa8pqnq";
+      name = "akonadi-import-wizard-16.12.2.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-mime-16.12.1.tar.xz";
-      sha256 = "01bzh2hb73q25jnw9wkragvglr9j89rh079p6k4f898cpjqfvdin";
-      name = "akonadi-mime-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-mime-16.12.2.tar.xz";
+      sha256 = "0w88splvk1ci6l590kybb8dgddhk8q0mqag1xxliws534kl9bd0s";
+      name = "akonadi-mime-16.12.2.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-notes-16.12.1.tar.xz";
-      sha256 = "1brc53mc1zggqgx6gy9f3vysis3cqyrsn7h02zc49mljycmkri7n";
-      name = "akonadi-notes-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-notes-16.12.2.tar.xz";
+      sha256 = "181d4sv6vqrx0iy5fwdpd28h78i0jy4bj51jxbdn7fqmx1mavbkl";
+      name = "akonadi-notes-16.12.2.tar.xz";
     };
   };
   akonadi-search = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akonadi-search-16.12.1.tar.xz";
-      sha256 = "05xdznd4g3jm74n3yjg0w9vh435l0ix4sssmh2z3i2apxak3rxdy";
-      name = "akonadi-search-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akonadi-search-16.12.2.tar.xz";
+      sha256 = "1jfcpjn45cxxnfg9y15fjkig6nfj6w8ggq3a7339kdhb79lkh1p5";
+      name = "akonadi-search-16.12.2.tar.xz";
     };
   };
   akregator = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/akregator-16.12.1.tar.xz";
-      sha256 = "1f1hf3r124icy59k829f6yfrk6zy512f3zy9rm5zv33vl5fmc437";
-      name = "akregator-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/akregator-16.12.2.tar.xz";
+      sha256 = "0yyjpl6kajy0ip60m6vf0jnm217m5ax34a5y14k1wj7civ4fz9il";
+      name = "akregator-16.12.2.tar.xz";
     };
   };
   analitza = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/analitza-16.12.1.tar.xz";
-      sha256 = "1b07hl516sd7qvrkhv0ihsc83jycyp2dqckziw8g0cm2sj81ymcz";
-      name = "analitza-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/analitza-16.12.2.tar.xz";
+      sha256 = "1jii70a2nppfzqlzwrjvawfq2cfjqrcsj0mbpgahb8zphcfs5xhy";
+      name = "analitza-16.12.2.tar.xz";
     };
   };
   ark = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ark-16.12.1.tar.xz";
-      sha256 = "1l78pshhkpyc9fybpypi3kdp7jism1c6lljflncpvxxvk1q16k5m";
-      name = "ark-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ark-16.12.2.tar.xz";
+      sha256 = "07jp25jqnfcx48x7w0wwyldk56czyx2341yf2k73p3fy67rldlr3";
+      name = "ark-16.12.2.tar.xz";
     };
   };
   artikulate = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/artikulate-16.12.1.tar.xz";
-      sha256 = "1v8p494x9dgm6yqw6mfhzkg6hkbb1rnk8x4jfjdsncknfk27ni5b";
-      name = "artikulate-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/artikulate-16.12.2.tar.xz";
+      sha256 = "11065zl5gdc1q7rvzmjvbz33k9xhdph7ynqwnv628c6a0478xwc5";
+      name = "artikulate-16.12.2.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/audiocd-kio-16.12.1.tar.xz";
-      sha256 = "1s06lnmzllb4nd24x7bri1g4g77865k1w5gdn46ryfmlhwg4bccm";
-      name = "audiocd-kio-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/audiocd-kio-16.12.2.tar.xz";
+      sha256 = "184grq1nfpv9sfcsk6kcx6bdnbh938jc3qr6n00gnnj509347xga";
+      name = "audiocd-kio-16.12.2.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/baloo-widgets-16.12.1.tar.xz";
-      sha256 = "0z1109wi0gdz9c8qr278ca1r0ff1p89966245fgg6rcxpm52zzsb";
-      name = "baloo-widgets-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/baloo-widgets-16.12.2.tar.xz";
+      sha256 = "000v5s33j6qsdbxqf856si0z5dmh9dan41kf2lrzc017hj6pr34x";
+      name = "baloo-widgets-16.12.2.tar.xz";
     };
   };
   blinken = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/blinken-16.12.1.tar.xz";
-      sha256 = "0jijzz31iv9v1yv898j6q25y5fmrk8vqsvx7xwcj84ca8qmp9scf";
-      name = "blinken-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/blinken-16.12.2.tar.xz";
+      sha256 = "1wcl8199wg74cv9hyrhcpqkf1awpf3q960jzgfv0z0c28xywb76x";
+      name = "blinken-16.12.2.tar.xz";
     };
   };
   blogilo = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/blogilo-16.12.1.tar.xz";
-      sha256 = "11dq36vis770hgmyq119aw2bl99855j5r38f7kr81ad2fjmla54z";
-      name = "blogilo-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/blogilo-16.12.2.tar.xz";
+      sha256 = "0j5mz8nfndr0g99l84s7n3gxrj6y4jbql1srnyl0yspmcjwmnc09";
+      name = "blogilo-16.12.2.tar.xz";
     };
   };
   bomber = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/bomber-16.12.1.tar.xz";
-      sha256 = "081109mf1lqcc03ba852h021s2i3kwy6nnl3jc4zyn5igkm08cad";
-      name = "bomber-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/bomber-16.12.2.tar.xz";
+      sha256 = "1fy17y5grir6kbr7xzclslrxyip4favhag6wasg9ah60r6k15cqc";
+      name = "bomber-16.12.2.tar.xz";
     };
   };
   bovo = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/bovo-16.12.1.tar.xz";
-      sha256 = "1dk0hrpn22v5ia8qnlan0i4wrxbccwl88k9bapxydnrgwyw4vfkx";
-      name = "bovo-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/bovo-16.12.2.tar.xz";
+      sha256 = "0dszbxisq172x5jv10w62wg3kcs1f8wdxgw9pjq423j3jq8rw9zq";
+      name = "bovo-16.12.2.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/calendarsupport-16.12.1.tar.xz";
-      sha256 = "0d74sghas76ry9vyd19fr9hgirvhycljdrvdmrxsh1sxjd04q96g";
-      name = "calendarsupport-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/calendarsupport-16.12.2.tar.xz";
+      sha256 = "065h09kq6h2hr4lg34lqckw0g91zkhxpviagdgymx7qpdy36l2sb";
+      name = "calendarsupport-16.12.2.tar.xz";
     };
   };
   cantor = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/cantor-16.12.1.tar.xz";
-      sha256 = "1m7n7n03p7060w7rw3mgzpkv841azv42flrzq4h9589akl91k0js";
-      name = "cantor-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/cantor-16.12.2.tar.xz";
+      sha256 = "055sxyl2x2mipnidrsgkmbjy4vw64pf5k0fql64p7pjhknn3i6x4";
+      name = "cantor-16.12.2.tar.xz";
     };
   };
   cervisia = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/cervisia-16.12.1.tar.xz";
-      sha256 = "1lsg8hb2kgsbygi63hdfbfng2lk7kl8mdksfhkwfa2g4l7sjlcy8";
-      name = "cervisia-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/cervisia-16.12.2.tar.xz";
+      sha256 = "1fdnvdp27wa8pni4vq501ajdln6dmg2kc0468x1c375g734npabx";
+      name = "cervisia-16.12.2.tar.xz";
     };
   };
   dolphin = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/dolphin-16.12.1.tar.xz";
-      sha256 = "0vpsj1s2hijksay7wblzgk97md4hbrpzzdnrdxmfz3izdnzbyaxh";
-      name = "dolphin-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/dolphin-16.12.2.tar.xz";
+      sha256 = "1xqkrkhpcxcrrk3msd7fkhqikwrx2mjd0c4cna2iwd0s4h7ahmy6";
+      name = "dolphin-16.12.2.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/dolphin-plugins-16.12.1.tar.xz";
-      sha256 = "1g9sdfmq04incgxj428y5r3k7wgjl77bv95cp3svwd5kxz6syipz";
-      name = "dolphin-plugins-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/dolphin-plugins-16.12.2.tar.xz";
+      sha256 = "07i4w95b20db51bzg0rnx6m3dgk2bz5nwivz6zngfiiksmb39dj3";
+      name = "dolphin-plugins-16.12.2.tar.xz";
     };
   };
   dragon = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/dragon-16.12.1.tar.xz";
-      sha256 = "14k0q96k1h6b21c5wpwr3bxjngkm1qz3pisv0cvx7dcahy4z20ik";
-      name = "dragon-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/dragon-16.12.2.tar.xz";
+      sha256 = "07iip379kpwy8yfiwacykkgzj7bfw2nz3vij61q68lr64k5sg4kk";
+      name = "dragon-16.12.2.tar.xz";
     };
   };
   eventviews = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/eventviews-16.12.1.tar.xz";
-      sha256 = "1ghpd7rsfkh2xvy2p8pfxgrabhkq4hbq05n1sqa95zb3ax2q4qwd";
-      name = "eventviews-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/eventviews-16.12.2.tar.xz";
+      sha256 = "1hl0adi0ss533mnncyih3y9075i90accklbk8068dvxb7la9b7zd";
+      name = "eventviews-16.12.2.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ffmpegthumbs-16.12.1.tar.xz";
-      sha256 = "19rnqkwbv5dflhhkrczr5hd8qnscvbdfr8kfb3phcai2shgn0pps";
-      name = "ffmpegthumbs-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ffmpegthumbs-16.12.2.tar.xz";
+      sha256 = "0p1fqxqcgz3k910acacr86pa66yl5d65wxf93nlg4627dfhmrbkc";
+      name = "ffmpegthumbs-16.12.2.tar.xz";
     };
   };
   filelight = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/filelight-16.12.1.tar.xz";
-      sha256 = "0zax3vmynh2aajq24znbdqnxslgkyqmy6n0d9xasi10zq0hli97q";
-      name = "filelight-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/filelight-16.12.2.tar.xz";
+      sha256 = "0ynqnagyrn61gzvi0rl38200yxbxa2zpch3cl917wff527kjd7cw";
+      name = "filelight-16.12.2.tar.xz";
     };
   };
   granatier = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/granatier-16.12.1.tar.xz";
-      sha256 = "1v85cw83gfzd3vwnbmmpbvsz85n6vh7478r572pikq1scgvxpn62";
-      name = "granatier-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/granatier-16.12.2.tar.xz";
+      sha256 = "01b0nvfj5v2spaml003bpd4f5snncxsilfplwgb06kf8wwsb9mzd";
+      name = "granatier-16.12.2.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/grantlee-editor-16.12.1.tar.xz";
-      sha256 = "08jkdcj3nka8r31h76vl9nf2wlmr92ndab8pj42wx7kf7nldbzh1";
-      name = "grantlee-editor-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/grantlee-editor-16.12.2.tar.xz";
+      sha256 = "16r1f7vwsqfngv3kld4wqmvxn4pnxgcpiaaxa2z9szsjfrz10bp9";
+      name = "grantlee-editor-16.12.2.tar.xz";
     };
   };
   grantleetheme = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/grantleetheme-16.12.1.tar.xz";
-      sha256 = "1b199870pkg1lkqbyf27b2rn4xqpbkm5hkwr08x65y67cfy1jm8v";
-      name = "grantleetheme-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/grantleetheme-16.12.2.tar.xz";
+      sha256 = "09qr7icbkq4my594xkjkydkfwx8sixbc73i3gxjnki64w549gan2";
+      name = "grantleetheme-16.12.2.tar.xz";
     };
   };
   gwenview = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/gwenview-16.12.1.tar.xz";
-      sha256 = "0r1cg3zw98wmbvdfb1cjlqpca30067zzc3w8flrql9rldfbgcp95";
-      name = "gwenview-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/gwenview-16.12.2.tar.xz";
+      sha256 = "1ldflh10b34r9xy8a8yh72jcjdxs3ylhyjhs97xcg381q4dyg1dr";
+      name = "gwenview-16.12.2.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/incidenceeditor-16.12.1.tar.xz";
-      sha256 = "0n4fq7pbmnkn9zx96svd6azs89arhpzlnrbjp60vbrpix8r6m0q5";
-      name = "incidenceeditor-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/incidenceeditor-16.12.2.tar.xz";
+      sha256 = "0z8ysrdkxfkn71anlzifd0dxh6fysl924jh4wjsphb4dnb417rym";
+      name = "incidenceeditor-16.12.2.tar.xz";
     };
   };
   jovie = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/jovie-16.12.1.tar.xz";
-      sha256 = "0c5sz80yzkmp18r1c9wcf6n9cg9rj12sax5yx3j3x7gz5p9r5jj0";
-      name = "jovie-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/jovie-16.12.2.tar.xz";
+      sha256 = "19ifp3p02ayka2zqnwfq381mjqpxhm0hydf1yx9lh2p8n6j9s4gy";
+      name = "jovie-16.12.2.tar.xz";
     };
   };
   juk = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/juk-16.12.1.tar.xz";
-      sha256 = "0v647vlfvq7lm33295v2c8w5qjm8ww9mxmxvvqd4rj35vg419zsb";
-      name = "juk-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/juk-16.12.2.tar.xz";
+      sha256 = "1453s0zxagqmx91f3x7fqrb6xdlgzr2sqj6hcj2pgl6jaz2x3n1c";
+      name = "juk-16.12.2.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kaccessible-16.12.1.tar.xz";
-      sha256 = "04j74411rsjyvv7ann1hgb6wmqxk2ym7g6h2y07ld1vdl9kcj1vl";
-      name = "kaccessible-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kaccessible-16.12.2.tar.xz";
+      sha256 = "1ibh2nw4bdnj1ll8qp3d3vkwvzdkv2k53n98p9282w3jhckpiq5r";
+      name = "kaccessible-16.12.2.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kaccounts-integration-16.12.1.tar.xz";
-      sha256 = "0d4z9b8w76njnjqsr5w555p3016d0aa5hlsxplac9h82gysdj6q7";
-      name = "kaccounts-integration-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kaccounts-integration-16.12.2.tar.xz";
+      sha256 = "0nx9wlh7arjqz0wf2zyaj3fwzm7sn38hn00m74mj7zvxr1pwcypv";
+      name = "kaccounts-integration-16.12.2.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kaccounts-providers-16.12.1.tar.xz";
-      sha256 = "1aphsn0xwlrsw2snwhzbj4kpwpw09nwsv61lpmp97byl3sq814fw";
-      name = "kaccounts-providers-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kaccounts-providers-16.12.2.tar.xz";
+      sha256 = "0dln1l44bzaw782qjc57w2hgydbqzn4g7xh8d93qq52yz8ph875g";
+      name = "kaccounts-providers-16.12.2.tar.xz";
     };
   };
   kaddressbook = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kaddressbook-16.12.1.tar.xz";
-      sha256 = "14sdkfzmfhfyvy8cky6015gnsz199ngj4ffg9r4qrkkdqcvw5rar";
-      name = "kaddressbook-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kaddressbook-16.12.2.tar.xz";
+      sha256 = "023mfnin8si234yczhhfm3nk083w8bixg1b3gr8bzc1x92ka93m2";
+      name = "kaddressbook-16.12.2.tar.xz";
     };
   };
   kajongg = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kajongg-16.12.1.tar.xz";
-      sha256 = "0g6amf644q2540y5iyqcv5d25g32hfi13qm3hcc1rmqghz7dn4k4";
-      name = "kajongg-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kajongg-16.12.2.tar.xz";
+      sha256 = "0909hzwj8yf6sv97r2rgzbp8l7ixlxxy8nwy8dcv471dznlvqznn";
+      name = "kajongg-16.12.2.tar.xz";
     };
   };
   kalarm = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kalarm-16.12.1.tar.xz";
-      sha256 = "015hylcqn4z57a9ibhvi5wrngjks8qkp7wg5faiwhx6cvw77jhw7";
-      name = "kalarm-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kalarm-16.12.2.tar.xz";
+      sha256 = "1znp4lym95jz93wwn1nrw9q8nkbwg7x489iccndrv4pl93jfsnqk";
+      name = "kalarm-16.12.2.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kalarmcal-16.12.1.tar.xz";
-      sha256 = "061wzn0y5cslgarz8lv73waipp0cahm5am27hc1a9j7y14cbqm16";
-      name = "kalarmcal-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kalarmcal-16.12.2.tar.xz";
+      sha256 = "06rx33hdwz940cggr5rg6g1gh84yzz6vrnvk5lrgr8vxqgrssp3s";
+      name = "kalarmcal-16.12.2.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kalgebra-16.12.1.tar.xz";
-      sha256 = "0fyfpsh8pgdnspyaxrnmr93rh2shxrhn0nl0772a5bssw35xgb3x";
-      name = "kalgebra-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kalgebra-16.12.2.tar.xz";
+      sha256 = "02yykjrsa01r697bk4jsly7762hvml7f67gy33vgywhh8lz3h3cd";
+      name = "kalgebra-16.12.2.tar.xz";
     };
   };
   kalzium = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kalzium-16.12.1.tar.xz";
-      sha256 = "1ipscw8721sl9kkb4lxpz3bg9pgf0fp3jx1y4643pk6qrrci1mcm";
-      name = "kalzium-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kalzium-16.12.2.tar.xz";
+      sha256 = "043prql6bwg2ka6y0inh8h46y7d5060b0h2inw0lhm49vizgkmsh";
+      name = "kalzium-16.12.2.tar.xz";
     };
   };
   kamera = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kamera-16.12.1.tar.xz";
-      sha256 = "1rwd88qnbp7ha5rlndbillwhshs6fnv0ppr2gva4m8w9s4sj008q";
-      name = "kamera-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kamera-16.12.2.tar.xz";
+      sha256 = "1kxmjpk0vdj9s3kxgcp2vw8dpx4r69j3jwifyvzrh06sg9z0bnqd";
+      name = "kamera-16.12.2.tar.xz";
     };
   };
   kanagram = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kanagram-16.12.1.tar.xz";
-      sha256 = "0rrdav0rigbvi1ya8iwv9h2jjkf4vqcywsb7wxdrksrng35hc57h";
-      name = "kanagram-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kanagram-16.12.2.tar.xz";
+      sha256 = "09d20x0z066pgkwp25ig49v78k89nyxs769a3zjmq1y490nm34y1";
+      name = "kanagram-16.12.2.tar.xz";
     };
   };
   kapman = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kapman-16.12.1.tar.xz";
-      sha256 = "1wxxk7airpfq43rmwskjkv8r9zyrlb7vzd9ihbsxgacb8i0dvb86";
-      name = "kapman-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kapman-16.12.2.tar.xz";
+      sha256 = "0g9swdgz8sd49q3sw2107b50ww978nppzp1b7bkv7ygiz49p28bq";
+      name = "kapman-16.12.2.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kapptemplate-16.12.1.tar.xz";
-      sha256 = "0k7gvjqfp8iq9z9mc6jvp7f90kysgmqla83qfxqmpin1k5l24p8z";
-      name = "kapptemplate-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kapptemplate-16.12.2.tar.xz";
+      sha256 = "1agpq16wxbzd7crgbj1cj60alqv090dkvxi2szg054bmks82j6rc";
+      name = "kapptemplate-16.12.2.tar.xz";
     };
   };
   kate = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kate-16.12.1.tar.xz";
-      sha256 = "1p0jf0fwsq28jk3rmck4sv0pnipp4sv1amsjn3m57dcpb0084jlq";
-      name = "kate-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kate-16.12.2.tar.xz";
+      sha256 = "1hkqzidd2cfp3wg7pq47ymsw1dh26qwn4cybnxw23d95ss85wx2p";
+      name = "kate-16.12.2.tar.xz";
     };
   };
   katomic = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/katomic-16.12.1.tar.xz";
-      sha256 = "1galbrlpj331mxi9a1zivx78v1qjvb1mdbf7nzgsqg9qqdszrx2p";
-      name = "katomic-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/katomic-16.12.2.tar.xz";
+      sha256 = "1sgi8npzq3p7qwv3c4q8ji83gp33zxb0i19dx2i6rb45lir3lj68";
+      name = "katomic-16.12.2.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kblackbox-16.12.1.tar.xz";
-      sha256 = "0782v6dqc8jvzvmsirfjg9ddngx3m9wxjwbj3mahxdn0hjzghxhj";
-      name = "kblackbox-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kblackbox-16.12.2.tar.xz";
+      sha256 = "1cv5kqyqspiz0aaamnyq37s683m2iw27ma6yf3blm5f9g1r43n2k";
+      name = "kblackbox-16.12.2.tar.xz";
     };
   };
   kblocks = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kblocks-16.12.1.tar.xz";
-      sha256 = "16i9c7w81y70r834g3chv479pv28xvkb8p2b8kapqdl1qci17niw";
-      name = "kblocks-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kblocks-16.12.2.tar.xz";
+      sha256 = "1xd5pxpi97nmrp4xglhm2qfpz8ksv8vyq4wrv25qbgvfc8jis790";
+      name = "kblocks-16.12.2.tar.xz";
     };
   };
   kblog = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kblog-16.12.1.tar.xz";
-      sha256 = "1azg2yp0nbvknkff4d8g2i28l48gvgny1j12aqs540wag9jv8j68";
-      name = "kblog-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kblog-16.12.2.tar.xz";
+      sha256 = "001mqvahsmf4amxqmz2ah5chlgpp2zi8g4pcg83qb9d65cvr6877";
+      name = "kblog-16.12.2.tar.xz";
     };
   };
   kbounce = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kbounce-16.12.1.tar.xz";
-      sha256 = "109lik70lqvfpk4b2k5pkcbb9dfn2b9cfl6s3vdybvd8j79w3kcf";
-      name = "kbounce-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kbounce-16.12.2.tar.xz";
+      sha256 = "1gsrafcjk55lbxi2mx382hj2lahlgnn3pv13ldi7zh6ms4sms1wm";
+      name = "kbounce-16.12.2.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kbreakout-16.12.1.tar.xz";
-      sha256 = "0wfdskc3bqb8cffqc6abgdziqg47k9w06s0w58khzvh6skjafxn5";
-      name = "kbreakout-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kbreakout-16.12.2.tar.xz";
+      sha256 = "0lwwz17ynhdi6qw76yih8an6p890w8gwh1khsr8casc1wlm04s0y";
+      name = "kbreakout-16.12.2.tar.xz";
     };
   };
   kbruch = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kbruch-16.12.1.tar.xz";
-      sha256 = "058lidgj8b03lkksy0jjrkh4jk7fmajc7sx994bxccb907r9jbav";
-      name = "kbruch-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kbruch-16.12.2.tar.xz";
+      sha256 = "1n119nkm0385pv8pngsbwxd56v6y6pwh0rshbk0ryd7974i2z4mi";
+      name = "kbruch-16.12.2.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcachegrind-16.12.1.tar.xz";
-      sha256 = "1qr5fgxkzk4ql8ib2bb3m85bx033gxg468860aqkz0im0lf216s4";
-      name = "kcachegrind-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcachegrind-16.12.2.tar.xz";
+      sha256 = "0wcizav1z3n31n7qcc05mx42vl2rv71c7haaa8vn0ma39rj4iaqv";
+      name = "kcachegrind-16.12.2.tar.xz";
     };
   };
   kcalc = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcalc-16.12.1.tar.xz";
-      sha256 = "0ncq609jil3ssqj8rslxz9pn4cdlbik0y93rc6mvw4hgk0p0yfgv";
-      name = "kcalc-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcalc-16.12.2.tar.xz";
+      sha256 = "07lyssmkq34ym1w3ajm1vf4f57xv2h8y2zb039vj7gdx609syaq0";
+      name = "kcalc-16.12.2.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcalcore-16.12.1.tar.xz";
-      sha256 = "167c8rl5zqfbnk5ricy0lrw8jjyqm5j5d39d2xgf6p5hd3lqw22f";
-      name = "kcalcore-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcalcore-16.12.2.tar.xz";
+      sha256 = "1lq5shp8jwy490qx0rnc0sd67976r7j3sblzw0j5hn95k8n23hzd";
+      name = "kcalcore-16.12.2.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcalutils-16.12.1.tar.xz";
-      sha256 = "1p36vhk3ylvw1zn82pahg3grwl6ag4rdwn8lzgf9day3bdr9fr8h";
-      name = "kcalutils-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcalutils-16.12.2.tar.xz";
+      sha256 = "1sf5f8mwjdi2d8lpkrprnqc9jkj72p6mdz3pbczmixgfy7d7y4ci";
+      name = "kcalutils-16.12.2.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcharselect-16.12.1.tar.xz";
-      sha256 = "0fv989ff94bhlhapk1irwkdghx8vq19n5b208qkrbfna5jzs0nfz";
-      name = "kcharselect-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcharselect-16.12.2.tar.xz";
+      sha256 = "0a5cmc6n9h8h64in68qdi8bmqx341fvm8vf98vcqn5sivwwnflhc";
+      name = "kcharselect-16.12.2.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcolorchooser-16.12.1.tar.xz";
-      sha256 = "1vq72gm73vpmjb635cmjx25cfx5rgvpmapjkw6yhdpp9bdv3xs3z";
-      name = "kcolorchooser-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcolorchooser-16.12.2.tar.xz";
+      sha256 = "07psjid00bjw0s6xx2hq96f8cj2axdsr7lqvgrclksa07lphzcvm";
+      name = "kcolorchooser-16.12.2.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcontacts-16.12.1.tar.xz";
-      sha256 = "10g2r62db7mbfrkr8qjf7m4kl7c9ybv5l3ci37mabkvnnnacqqni";
-      name = "kcontacts-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcontacts-16.12.2.tar.xz";
+      sha256 = "18z7894xh1ifkg177xxy41n61djcy07m8a39favbpab0ya1xk81l";
+      name = "kcontacts-16.12.2.tar.xz";
     };
   };
   kcron = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kcron-16.12.1.tar.xz";
-      sha256 = "00ipxmfm5wvj3szjlw550xsm3cpcm27wnvwbffxjpikzipzrhsr9";
-      name = "kcron-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kcron-16.12.2.tar.xz";
+      sha256 = "1z72wcrr8ggw89ivq70v98zwg1hw3sn5l5czpq00scqpaf8664g2";
+      name = "kcron-16.12.2.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdebugsettings-16.12.1.tar.xz";
-      sha256 = "0valppahimpdj00gbvhasqq12d2rvl4i16cqc7g9q5mbmr51fs3y";
-      name = "kdebugsettings-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdebugsettings-16.12.2.tar.xz";
+      sha256 = "1zbmvn9c1sjjxiskivl0s4mpmh52hqj7921v2bac7bvqd2hkc5cv";
+      name = "kdebugsettings-16.12.2.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-dev-scripts-16.12.1.tar.xz";
-      sha256 = "11b4mbxs22x78qzz4dnq15cgvjsb3z8w23xz4x6af8vd6dizy8xc";
-      name = "kde-dev-scripts-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-dev-scripts-16.12.2.tar.xz";
+      sha256 = "0l4sbzpnczixavyppc3swb09jna44rb61awwgh37ngsz97iza3sx";
+      name = "kde-dev-scripts-16.12.2.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-dev-utils-16.12.1.tar.xz";
-      sha256 = "1acadqsi5sv3dbdxrlil8a5yrhgqvvibi05sdvvqzmz0c1fw6w0k";
-      name = "kde-dev-utils-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-dev-utils-16.12.2.tar.xz";
+      sha256 = "0fhf9w5v355jsrr25yhj612gi0qh8kvrbfdfplns04q7viycn44f";
+      name = "kde-dev-utils-16.12.2.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdeedu-data-16.12.1.tar.xz";
-      sha256 = "1axg6k0jwnpsfbk5mis17fnsacdlf9p8pfqy8qp83l0n8pink1nb";
-      name = "kdeedu-data-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdeedu-data-16.12.2.tar.xz";
+      sha256 = "05jhqasi5h5dl4xlydx6jmn1i81qd8q8bzimhc2f9bwakkhqf73b";
+      name = "kdeedu-data-16.12.2.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-mobipocket-16.12.1.tar.xz";
-      sha256 = "0a59irbkwcvf81jj0rqf9fb1ks6crk4xrrqzp0l0h0hjza7qmk6n";
-      name = "kdegraphics-mobipocket-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-mobipocket-16.12.2.tar.xz";
+      sha256 = "07mpm55ipdqq6absvhcsrbc3c9xmb3b5bnl5k852mqpp0v36ijs8";
+      name = "kdegraphics-mobipocket-16.12.2.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdegraphics-thumbnailers-16.12.1.tar.xz";
-      sha256 = "08qj67xkij6g8hzs5wj4c53pwnm711y54qdcrnrl4cpbcfvcynzd";
-      name = "kdegraphics-thumbnailers-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-thumbnailers-16.12.2.tar.xz";
+      sha256 = "0asv8wjr5nm5i6zylvhn8qgxvpr79yg681rc6mg1liimimwzxia3";
+      name = "kdegraphics-thumbnailers-16.12.2.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ar-16.12.1.tar.xz";
-      sha256 = "0s4a05zl66xks3kixf07z1s05y932qb5ssz1njwas6j8sx7dxvl5";
-      name = "kde-l10n-ar-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ar-16.12.2.tar.xz";
+      sha256 = "0an0r2l4vc2sdi4lc2p7iks9gnwasgvxnq81vf3qb40q290x4fim";
+      name = "kde-l10n-ar-16.12.2.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ast-16.12.1.tar.xz";
-      sha256 = "0dk2wcb3yd9lgc5j0imkfsclir54za83g5kqkyf7a81fwy799ndm";
-      name = "kde-l10n-ast-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ast-16.12.2.tar.xz";
+      sha256 = "0fjpypz9w1ic9w75gpp1c71l43x3j8nm37h1bgbqkyik3spxin2l";
+      name = "kde-l10n-ast-16.12.2.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bg-16.12.1.tar.xz";
-      sha256 = "15qz82sbmyxi1gj62d36a6hdx1q9fmg8b9wchxkbls84429ancgz";
-      name = "kde-l10n-bg-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bg-16.12.2.tar.xz";
+      sha256 = "1iwcs8nz2rfi0b05ypl6mydiw02c64hscy3zlz998nww65x3nks0";
+      name = "kde-l10n-bg-16.12.2.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-bs-16.12.1.tar.xz";
-      sha256 = "1jqcib98rs2albx9vxcn2cnk23rx05pk2fhd4mgbcdcx7vmj2ws3";
-      name = "kde-l10n-bs-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bs-16.12.2.tar.xz";
+      sha256 = "0kps4paygx10l2nijwd946wns6sxlgn2771fzv1cmn5h1smffhkn";
+      name = "kde-l10n-bs-16.12.2.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca-16.12.1.tar.xz";
-      sha256 = "0vnvpnrxfasfmkahmvs28x2kbq7rb725nspgp9y96m58brwis4h9";
-      name = "kde-l10n-ca-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca-16.12.2.tar.xz";
+      sha256 = "0r6yccw7fdi2dsz9qf9rccgdmznkc66z5c51asdhrmyzq4x7c7r2";
+      name = "kde-l10n-ca-16.12.2.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.12.1";
+    version = "ca_valencia-16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ca@valencia-16.12.1.tar.xz";
-      sha256 = "0mhiwqih6z4cj9hwksnkiad29l4bn9bvbnngnh5dgz8m566471sq";
-      name = "kde-l10n-ca_valencia-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca@valencia-16.12.2.tar.xz";
+      sha256 = "15wpsjzk9z61rpai8dzpzi5j9w57nmhm7fx4b6i5hsr9c4ypmi01";
+      name = "kde-l10n-ca_valencia-16.12.2.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-cs-16.12.1.tar.xz";
-      sha256 = "033yzzvs8cb747fnjjy982y6sadprmwbjhpxy2icgkhppimyi90y";
-      name = "kde-l10n-cs-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-cs-16.12.2.tar.xz";
+      sha256 = "1z6a3rl7p0wmq6zs8fap052dp5hvlpzxf4xvjxk9c75wl2m9nvlg";
+      name = "kde-l10n-cs-16.12.2.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-da-16.12.1.tar.xz";
-      sha256 = "01kwa0swc2jg870v60hp01hkksw4h85644qf0capq84diqy370j9";
-      name = "kde-l10n-da-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-da-16.12.2.tar.xz";
+      sha256 = "0zi7h0cvzza1ly88821fsl2bnr2vn524rrdqsfc9yj3z1jbpnn2h";
+      name = "kde-l10n-da-16.12.2.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-de-16.12.1.tar.xz";
-      sha256 = "0rlv3mqd1m7vk29ywlhs11zspgzzlhvai25w1j3cj89mbsyryqja";
-      name = "kde-l10n-de-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-de-16.12.2.tar.xz";
+      sha256 = "0s1c22ad1r0qxpkc878gxz2wqkb52qrn1k753kqpn9105p5l92fh";
+      name = "kde-l10n-de-16.12.2.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-el-16.12.1.tar.xz";
-      sha256 = "087nj0w3r9vs9ph8459jy26bmyj9dq1q8hwww40dsvi6lg4pm09m";
-      name = "kde-l10n-el-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-el-16.12.2.tar.xz";
+      sha256 = "02d4j12yr4v9apa3iziza611v6cgjf6725wgd41g00pj41p61kcq";
+      name = "kde-l10n-el-16.12.2.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.12.1";
+    version = "en_GB-16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-en_GB-16.12.1.tar.xz";
-      sha256 = "0wf6kwb2i5lp5j2mhh4sdj14w6gzgmpz4avjvxsydal13mcvb8q0";
-      name = "kde-l10n-en_GB-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-en_GB-16.12.2.tar.xz";
+      sha256 = "09h3zsq5qhzyagl8xysv74g2iv26739y02xgbwv5dahv0iln99rs";
+      name = "kde-l10n-en_GB-16.12.2.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eo-16.12.1.tar.xz";
-      sha256 = "1qbb3pcvyszfmjzl1jcwhj3fybfza181wnm28jzw2c68s7n7f18s";
-      name = "kde-l10n-eo-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eo-16.12.2.tar.xz";
+      sha256 = "1isqdnnj1g9jxagns3yq611pfd6nbanji9a8igfgm55djj5hx527";
+      name = "kde-l10n-eo-16.12.2.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-es-16.12.1.tar.xz";
-      sha256 = "1whwbaxklr972w0s6ck277ql5vhh2v15dnw3gfasp5k5rx1g1rcb";
-      name = "kde-l10n-es-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-es-16.12.2.tar.xz";
+      sha256 = "0h3c5an1i072rk9mkc9mc6k3bvlk37slhgl6qy3rs2l77mhhnpyi";
+      name = "kde-l10n-es-16.12.2.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-et-16.12.1.tar.xz";
-      sha256 = "0jlx8rf4y7mdwcmc9ypyi2rm09mddmpz2l2p0k1p2fb3596n6yg8";
-      name = "kde-l10n-et-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-et-16.12.2.tar.xz";
+      sha256 = "0dpkxwpl17pgimx94v67wq90fzdayp6p3wcz7y0g8b0hn3bsbidj";
+      name = "kde-l10n-et-16.12.2.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-eu-16.12.1.tar.xz";
-      sha256 = "0x8pmxdnzzxbki9r66y5ha44q6j7sihjkn6y5psqrqghrgxmg11b";
-      name = "kde-l10n-eu-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eu-16.12.2.tar.xz";
+      sha256 = "0q7l5s502ayr2vfa4ysvk4c6k5i8y5ci6yb34mm3lpwlain3bssb";
+      name = "kde-l10n-eu-16.12.2.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fa-16.12.1.tar.xz";
-      sha256 = "0m886zx1kp6aykwcmrhc6w2g20va3sskwjg5l03lb0dq2g4b8nlv";
-      name = "kde-l10n-fa-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fa-16.12.2.tar.xz";
+      sha256 = "03qvv814kvddf24fjvg55pbxaq58kc936b5qwbddxjr05n1dy964";
+      name = "kde-l10n-fa-16.12.2.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fi-16.12.1.tar.xz";
-      sha256 = "0mcz0cc1wzrfhbacgxas9wlk9jczbnbbdb96q0dypj7vbwdw15j2";
-      name = "kde-l10n-fi-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fi-16.12.2.tar.xz";
+      sha256 = "0902bbyi10vpn0qn0xn46p8fy98kaa4cvlgnn4cb2dgp8q3kni8j";
+      name = "kde-l10n-fi-16.12.2.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-fr-16.12.1.tar.xz";
-      sha256 = "07ax7ldfjzvrlkwh1bl4y1j8ngq5rgnikykjqc0iy5g8vv71pb24";
-      name = "kde-l10n-fr-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fr-16.12.2.tar.xz";
+      sha256 = "0zjlryvyq8z2llrba4hp3awz5hq74b6z21wp2x86g4k6y154i0as";
+      name = "kde-l10n-fr-16.12.2.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ga-16.12.1.tar.xz";
-      sha256 = "19gqdnih89cbqjxdxxj6mv1528z0kqhh020pf6cnb638k6fw2jpf";
-      name = "kde-l10n-ga-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ga-16.12.2.tar.xz";
+      sha256 = "1gwd4r28qv5sh4r008nq5mdzzb8cwq8dg17r19l3syydxxhjlf86";
+      name = "kde-l10n-ga-16.12.2.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-gl-16.12.1.tar.xz";
-      sha256 = "03bwvly40j9ynh6gqxjxq3p9rqdiwclm3iyn6iwa0ri1y8jix0dy";
-      name = "kde-l10n-gl-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-gl-16.12.2.tar.xz";
+      sha256 = "1jka29dh5aqdzgmqc9rf3lmrq4mm4vahhsk2klhp12ajzp9dgg70";
+      name = "kde-l10n-gl-16.12.2.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-he-16.12.1.tar.xz";
-      sha256 = "0zj9ppvj6k2wxsp0f8drrrwhb93xlgggskhyp93dcb7d6dpl561x";
-      name = "kde-l10n-he-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-he-16.12.2.tar.xz";
+      sha256 = "0g87g0mpa3i59fk4fm5hk2z54s07cy9niy2kal50fbm5lnr7czfk";
+      name = "kde-l10n-he-16.12.2.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hi-16.12.1.tar.xz";
-      sha256 = "0l8aa97mkl0csz3yrq8ib1ypdwiir47nhnll8zgw8gxh97rzkr4w";
-      name = "kde-l10n-hi-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hi-16.12.2.tar.xz";
+      sha256 = "05q608wic0ssx0d14n39s786k8xw86hc560ywfs3k89v973nba5b";
+      name = "kde-l10n-hi-16.12.2.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hr-16.12.1.tar.xz";
-      sha256 = "1azp8rpai0v7wyqm8a8cfw8dnx9053nmb9cjps4jxvzfcxggbb1x";
-      name = "kde-l10n-hr-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hr-16.12.2.tar.xz";
+      sha256 = "0sm7ba6x3hgw1ml6qm00g9dfi56w2kx3pk37944l3r4jx2wdqs4f";
+      name = "kde-l10n-hr-16.12.2.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-hu-16.12.1.tar.xz";
-      sha256 = "111g42krxx41zph5h02mrxd8zj31gfpji9ai7hw88h089gxy1c0z";
-      name = "kde-l10n-hu-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hu-16.12.2.tar.xz";
+      sha256 = "1qcdqm6wjcgd5br99mm93lwlaxk5dvrliyj1ff4bxfxx0cabhx2g";
+      name = "kde-l10n-hu-16.12.2.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ia-16.12.1.tar.xz";
-      sha256 = "0bncwdnwa7bzm5n5gac3f44qai9z6ymwgn72g3fr9g8lw0a48h2m";
-      name = "kde-l10n-ia-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ia-16.12.2.tar.xz";
+      sha256 = "0r1fryhi4czgbl1r228zry0msk11s075y15i4flznwdps99s5q8c";
+      name = "kde-l10n-ia-16.12.2.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-id-16.12.1.tar.xz";
-      sha256 = "0nqnl8aisvvmx4rrycyixarjrkq8cil6wq9xyxd1gv6r3wyxi25i";
-      name = "kde-l10n-id-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-id-16.12.2.tar.xz";
+      sha256 = "1lz51bilx8dziiff65l91pknif9w7390q3l9amdlcjq86cj44khz";
+      name = "kde-l10n-id-16.12.2.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-is-16.12.1.tar.xz";
-      sha256 = "0afkgwz3rqsl5fmvi7lij4krwkal9qcfgafpqfsgxh053ip4h97r";
-      name = "kde-l10n-is-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-is-16.12.2.tar.xz";
+      sha256 = "08bqhxppib360ywzmphjqx5yalzr3bgwpqkff79rl5ffq9dd4psv";
+      name = "kde-l10n-is-16.12.2.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-it-16.12.1.tar.xz";
-      sha256 = "0bjbq21w7pm88ij5p69rjg5a5plbk5kblf760zyxw19dhmj1rx98";
-      name = "kde-l10n-it-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-it-16.12.2.tar.xz";
+      sha256 = "12k9vqdr2nrcqh535crylxrmznndx7bkwz68vrdvqidlabd0ci7m";
+      name = "kde-l10n-it-16.12.2.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ja-16.12.1.tar.xz";
-      sha256 = "0y05zaw7a6xyvzkc0zy5snlxzpdmh796h1nm6hqjr3l1w65anj0x";
-      name = "kde-l10n-ja-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ja-16.12.2.tar.xz";
+      sha256 = "0i9hc66qlnq0yij9d3754m5wa2wkra95wcdbp6xwk82ws7lkckai";
+      name = "kde-l10n-ja-16.12.2.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-kk-16.12.1.tar.xz";
-      sha256 = "16ca99aaqmg4n9lp0h554s399kxmk42i6qlkaw3slzr9s2ljbb70";
-      name = "kde-l10n-kk-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-kk-16.12.2.tar.xz";
+      sha256 = "1h9scz1z046szxf54702w3wzlsvzr8016rx9fwg7z5fc1vpkhxxn";
+      name = "kde-l10n-kk-16.12.2.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-km-16.12.1.tar.xz";
-      sha256 = "0sm0v7y9lpzzdagvbjybj8ym0ihr26j4slmga4izr9i035rid24m";
-      name = "kde-l10n-km-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-km-16.12.2.tar.xz";
+      sha256 = "09vw686y9qdx09cz58d11ldqz5bsnch1sx2dsbxvp1drypb1nhxk";
+      name = "kde-l10n-km-16.12.2.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ko-16.12.1.tar.xz";
-      sha256 = "0g54fz1z611i6r49ahr54mz40950w8yv8ii4w6gx66yh7m805czw";
-      name = "kde-l10n-ko-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ko-16.12.2.tar.xz";
+      sha256 = "1q9kla2djqsvkj773wybxb1lds50v0lg3jkfpnrg2pvm49jl2c9g";
+      name = "kde-l10n-ko-16.12.2.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lt-16.12.1.tar.xz";
-      sha256 = "19z5fwsv67pm5fj62g5vsjy56614kwv198sh9wr06b0c1122a33s";
-      name = "kde-l10n-lt-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lt-16.12.2.tar.xz";
+      sha256 = "1i6nzmqm1sl895x7hnsk9snw2ci8cbdvswdfbvllqivcd8l4vmg5";
+      name = "kde-l10n-lt-16.12.2.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-lv-16.12.1.tar.xz";
-      sha256 = "0q8ni73yyfkqzc4kdh9cm7518pvczjbf7z27fy662vpx6bdw8dab";
-      name = "kde-l10n-lv-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lv-16.12.2.tar.xz";
+      sha256 = "0why1sa09pd7pwwa57c27y969ijgmjsmni8x7n9gxx5w0317kq9d";
+      name = "kde-l10n-lv-16.12.2.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-mr-16.12.1.tar.xz";
-      sha256 = "143s0ldvz1lkq1mc3cv4xifhrmiqbqavval40dn5w78f3qsb2h6q";
-      name = "kde-l10n-mr-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-mr-16.12.2.tar.xz";
+      sha256 = "0wkncbs5di9vlcfqbc8g4msp6kp926049jlkj4jhvgj1in434ay8";
+      name = "kde-l10n-mr-16.12.2.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nb-16.12.1.tar.xz";
-      sha256 = "100ykwdw4nhwahijn9mqp1y9cyllw8i7dy9lyhvhw4zw1r89nbyj";
-      name = "kde-l10n-nb-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nb-16.12.2.tar.xz";
+      sha256 = "0p9yq33jzh83c1471072p94mrx8jazrinb987ifrl5lk8m54k34z";
+      name = "kde-l10n-nb-16.12.2.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nds-16.12.1.tar.xz";
-      sha256 = "0gn35547hjya99bxzf47frh3y2jm6vgmwfc822s7hr7a629bdvmv";
-      name = "kde-l10n-nds-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nds-16.12.2.tar.xz";
+      sha256 = "1yb7axm4k1rlfp41s9q8ql7l2mjbyrf7ry1ww7c1rprcb93gm7f8";
+      name = "kde-l10n-nds-16.12.2.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nl-16.12.1.tar.xz";
-      sha256 = "0a11cqn7brvxfbh497qmqivdki0hwbgjnmlp1y438xgnmmny8kr8";
-      name = "kde-l10n-nl-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nl-16.12.2.tar.xz";
+      sha256 = "04d75kfxxijb4a7xk5saxz5vbrwfsl2nx0i4x3d4i2k06wzysvch";
+      name = "kde-l10n-nl-16.12.2.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-nn-16.12.1.tar.xz";
-      sha256 = "1s43fh3kc0w9cd0fnwhb04hm8q2la5s5qkx9dadc0v8mwxnr56k9";
-      name = "kde-l10n-nn-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nn-16.12.2.tar.xz";
+      sha256 = "09vmvvmakcybgy6zl51xj05wflq88xkbjmns4wv42jf0fn4kipif";
+      name = "kde-l10n-nn-16.12.2.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pa-16.12.1.tar.xz";
-      sha256 = "1zzv3bjn159a4lapfiqcvhdlvvac29q5h42jc7w1kfbv15byykz8";
-      name = "kde-l10n-pa-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pa-16.12.2.tar.xz";
+      sha256 = "0nv9pch0s24aamcz8lgbs26kp343kyw0rnz4a7myzcrb8g8sm0d3";
+      name = "kde-l10n-pa-16.12.2.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pl-16.12.1.tar.xz";
-      sha256 = "07l5vfchiwwszxfw3fpidh869049wg9fkjkjzpf0hvqgknlii2va";
-      name = "kde-l10n-pl-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pl-16.12.2.tar.xz";
+      sha256 = "1bxhcqwmcfl2srfrn50ib57890m3m6w4x9vwn24qxwapb9s6nzav";
+      name = "kde-l10n-pl-16.12.2.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt-16.12.1.tar.xz";
-      sha256 = "14cp6mm740v8fwc2p8c1w164yl925wk5ysz19527g6nmydfww3f0";
-      name = "kde-l10n-pt-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt-16.12.2.tar.xz";
+      sha256 = "02x96cdvrbdcmrhnn4pamsdnr8m530p047avh82xvjvqywsnqf7z";
+      name = "kde-l10n-pt-16.12.2.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.12.1";
+    version = "pt_BR-16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-pt_BR-16.12.1.tar.xz";
-      sha256 = "173yjk28hbvgjcr07p99svw2z5g3bb58ln2cv50lckj0lmr4j379";
-      name = "kde-l10n-pt_BR-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt_BR-16.12.2.tar.xz";
+      sha256 = "17155laifayfb5c2hznlpnmaa8kwxzlmk7yb2skrf92fzzqx2379";
+      name = "kde-l10n-pt_BR-16.12.2.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ro-16.12.1.tar.xz";
-      sha256 = "1jakhzs21417rd6cafq6p1qda3w3w0vq8v4lp45nas45iij2f9vr";
-      name = "kde-l10n-ro-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ro-16.12.2.tar.xz";
+      sha256 = "1zsng3m031cbyz1jl5lv1fjg5vb3ig3pk0gaamvxbs6fxaz14ss3";
+      name = "kde-l10n-ro-16.12.2.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ru-16.12.1.tar.xz";
-      sha256 = "05hxgd4dpqdvyhbn1vj64x7h00iylwl2cih4myb77pcjw0hdpgi4";
-      name = "kde-l10n-ru-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ru-16.12.2.tar.xz";
+      sha256 = "1shs2j4kqqf2b8jz2691yi45f5bpsr9nx2i5j67mmn94dnds4ps6";
+      name = "kde-l10n-ru-16.12.2.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sk-16.12.1.tar.xz";
-      sha256 = "0rhjqsa15xp99k67yy88qp2v7pi1i29v7kr1jvvwrfn4byrgjr5f";
-      name = "kde-l10n-sk-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sk-16.12.2.tar.xz";
+      sha256 = "1397sxczn9jdxbab3d9296w15swc40a8ypa3f4yhckqm4nmr8xn1";
+      name = "kde-l10n-sk-16.12.2.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sl-16.12.1.tar.xz";
-      sha256 = "00p4j40f5sbsfnbmnfj6hciq2817m41ii81m6g3ckg3fyv184vbh";
-      name = "kde-l10n-sl-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sl-16.12.2.tar.xz";
+      sha256 = "1z14sbdk5zdshn36wija4hkj7l825i336bz92rq42f8by4mha0h4";
+      name = "kde-l10n-sl-16.12.2.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sr-16.12.1.tar.xz";
-      sha256 = "18k4nhbiriq0wng0jr51wbkgi6hzwn7g3r2aqh57gsf50z5rjj6k";
-      name = "kde-l10n-sr-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sr-16.12.2.tar.xz";
+      sha256 = "12v6whnydgxxpx9vl3pimnxqny22kfiv51i1r9dk6vfqik18kxzy";
+      name = "kde-l10n-sr-16.12.2.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-sv-16.12.1.tar.xz";
-      sha256 = "0ca6gyxfvss3sxl3lxb9jf6ac2fb1lnz5bs4imrgxly1wphzd66p";
-      name = "kde-l10n-sv-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sv-16.12.2.tar.xz";
+      sha256 = "10dzz39779lbb5mcnnmhwm86pkwc2g5qyiqg5jzpf0mg1zbl9y3w";
+      name = "kde-l10n-sv-16.12.2.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-tr-16.12.1.tar.xz";
-      sha256 = "10j649xb1zvn9zp9i0zmsmc6bwx08wgm0a3y66213w2framsx9fn";
-      name = "kde-l10n-tr-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-tr-16.12.2.tar.xz";
+      sha256 = "0m4rgz7ha2i9bladavc5g3n94kai82ilx8akd2jcxz6q3wb75r0r";
+      name = "kde-l10n-tr-16.12.2.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-ug-16.12.1.tar.xz";
-      sha256 = "0dr23z6f9azvxnagdsyzgbwqr0xknricxwm6lykqdaa1r4s3mnzs";
-      name = "kde-l10n-ug-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ug-16.12.2.tar.xz";
+      sha256 = "1kjdiy92pi5vdxbfy61ckq8j9pc8kmrccfqnlm7yqvh8p5i28p2x";
+      name = "kde-l10n-ug-16.12.2.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-uk-16.12.1.tar.xz";
-      sha256 = "0cxjz1d07429z0fasppjl8p0gr9a4ylz8ymcx3pqmaa872sgg7h6";
-      name = "kde-l10n-uk-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-uk-16.12.2.tar.xz";
+      sha256 = "1nhclnwy5lgkzhs6lm8dkhh4957v78rv2d9ss13a1jn2salz5kfv";
+      name = "kde-l10n-uk-16.12.2.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-wa-16.12.1.tar.xz";
-      sha256 = "1pdzr1hs0zr31qv11n029chjgbwi7si8nas26y8wz5xxbfrjrb07";
-      name = "kde-l10n-wa-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-wa-16.12.2.tar.xz";
+      sha256 = "12f2kvks21hj5gjqjys7fa295148j0ndhxbzs5jysl0zq9y4909j";
+      name = "kde-l10n-wa-16.12.2.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.12.1";
+    version = "zh_CN-16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_CN-16.12.1.tar.xz";
-      sha256 = "04bxkjdpld13i609dircbdh8zknlsn9jcwy4nvcwa1p2xf04dr5z";
-      name = "kde-l10n-zh_CN-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_CN-16.12.2.tar.xz";
+      sha256 = "1v21kap5lyzgygqv02jjx9yrfnkjkk0qrd85l0pjhqjyycs5r97w";
+      name = "kde-l10n-zh_CN-16.12.2.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.12.1";
+    version = "zh_TW-16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-l10n/kde-l10n-zh_TW-16.12.1.tar.xz";
-      sha256 = "0wmcf8v3c68a4mfqzfy1dxdyb1bx29ak1zy8skmrvshn1arfhyab";
-      name = "kde-l10n-zh_TW-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_TW-16.12.2.tar.xz";
+      sha256 = "049q9d9ykhxk0dkmm4aw7fx1aa39s5cslk4011335jmg1msmrfna";
+      name = "kde-l10n-zh_TW-16.12.2.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.28";
+    version = "4.14.29";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdelibs-4.14.28.tar.xz";
-      sha256 = "1r2dyr723w75yh65zgpzg9irm0jx3nsywa9zxw1xgls4p8xksyy0";
-      name = "kdelibs-4.14.28.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdelibs-4.14.29.tar.xz";
+      sha256 = "0xvw0cscvz8arclgfhrrbgdg94mz4h9y33nyndlsw67qrbg8slqv";
+      name = "kdelibs-4.14.29.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdenetwork-filesharing-16.12.1.tar.xz";
-      sha256 = "100pagqj2y2jdzn5b37zyiab382dmx7j4kdwyrrnz6rzsr0lm9pr";
-      name = "kdenetwork-filesharing-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdenetwork-filesharing-16.12.2.tar.xz";
+      sha256 = "0q43c2xim5ibxyib1xz1wfz6bigkmk97bkvy9wrlk869c0qvrcn5";
+      name = "kdenetwork-filesharing-16.12.2.tar.xz";
     };
   };
   kdenlive = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdenlive-16.12.1.tar.xz";
-      sha256 = "13bn0i7qyw4cil5cp0s1ynx80y2xp9wzbycmw9mcvbi66clyk9dw";
-      name = "kdenlive-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdenlive-16.12.2.tar.xz";
+      sha256 = "116lk641qlx8jkiaxm54g6svc6adg0bilhf634cyc8c46991a8z7";
+      name = "kdenlive-16.12.2.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdepim-addons-16.12.1.tar.xz";
-      sha256 = "1yaymzyh6rg1b17d556v5prbd4y46kph33r55riq5mbzfwfwx85j";
-      name = "kdepim-addons-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdepim-addons-16.12.2.tar.xz";
+      sha256 = "1gi87bbdkj8cwinhicr5r6qxysc5rmylj8gajn0qh99rsyxy52dn";
+      name = "kdepim-addons-16.12.2.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdepim-apps-libs-16.12.1.tar.xz";
-      sha256 = "14sx43g7fi62g278m95mjpfixwcyrj2qrz0hlp3zzlcjpq0ra9zv";
-      name = "kdepim-apps-libs-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdepim-apps-libs-16.12.2.tar.xz";
+      sha256 = "07imq7nb1aqan8pbapvqg9mkzj18pj1v9xah9lpi6k64rhh0bkw9";
+      name = "kdepim-apps-libs-16.12.2.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdepim-runtime-16.12.1.tar.xz";
-      sha256 = "0l8ypmynwmiyh2v9kwr3b5wdydwzmm9q02qij1vff01frq7hnh8s";
-      name = "kdepim-runtime-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdepim-runtime-16.12.2.tar.xz";
+      sha256 = "0wd04zhc7nq2qf8iyjqf036bjs5by0zl0c58hl8r579b7gp5xljz";
+      name = "kdepim-runtime-16.12.2.tar.xz";
     };
   };
   kde-runtime = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kde-runtime-16.12.1.tar.xz";
-      sha256 = "1inz7dlbw9ngjizc7nrnr6y93b34zmkjp89v58xqzmyajk1hbqp1";
-      name = "kde-runtime-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kde-runtime-16.12.2.tar.xz";
+      sha256 = "1bsnb7inxqv652vq9izwdj02gi15xxf34my51kdq2xk9dn2kmj8x";
+      name = "kde-runtime-16.12.2.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdesdk-kioslaves-16.12.1.tar.xz";
-      sha256 = "0qi9pkbg63kc8b27my05z9ih8z48mffc54m05gdcapgqx1qxigis";
-      name = "kdesdk-kioslaves-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdesdk-kioslaves-16.12.2.tar.xz";
+      sha256 = "18wd4lb3v2br40xclsig718r8mqs5hgl7xw13pq5bfqk5kx11md1";
+      name = "kdesdk-kioslaves-16.12.2.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdesdk-thumbnailers-16.12.1.tar.xz";
-      sha256 = "07fbm60x6rqf39w13980dmg4qcm9i6y004hzydfgjd7gyfmh2jrx";
-      name = "kdesdk-thumbnailers-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdesdk-thumbnailers-16.12.2.tar.xz";
+      sha256 = "1jjchrbpyxjzs4zv68av53zhnlj46705261p0ad7x9ayb1mdrr24";
+      name = "kdesdk-thumbnailers-16.12.2.tar.xz";
     };
   };
   kdf = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdf-16.12.1.tar.xz";
-      sha256 = "1nhb718fmqqk22vrb5brykymsjfvh6w57v83lnyvp7w9ryks52fv";
-      name = "kdf-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdf-16.12.2.tar.xz";
+      sha256 = "0zkwqqrcna2f9j4g798lhdi2v5j9p6r3zqkhf7clh4nk2c6f766k";
+      name = "kdf-16.12.2.tar.xz";
     };
   };
   kdialog = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdialog-16.12.1.tar.xz";
-      sha256 = "1qg1fcjyh8fybl2vg9dp1v9bwb3xx2mrlcx4zdr3fhpaq13pqs3f";
-      name = "kdialog-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdialog-16.12.2.tar.xz";
+      sha256 = "0jrp06zbdj5c3nigdard0a7whb3lg8j2lgnf3dp2gf7iqj8gb189";
+      name = "kdialog-16.12.2.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kdiamond-16.12.1.tar.xz";
-      sha256 = "16vssx8zklsia84zdp5yb5y9did92dqfly95a8w82zabdm47rx3b";
-      name = "kdiamond-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kdiamond-16.12.2.tar.xz";
+      sha256 = "1bflb2lbhahwmcqzck0xbr39rcbyaw4fzjaalbsdf9n5mk5ixmxs";
+      name = "kdiamond-16.12.2.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/keditbookmarks-16.12.1.tar.xz";
-      sha256 = "0jnldxlx9kdqrl3i8b4xa1p2dbna80ffxw83cbv53125fqg5ii71";
-      name = "keditbookmarks-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/keditbookmarks-16.12.2.tar.xz";
+      sha256 = "16a2sq92r6nq7ksp905xp9v3fv8ynhfp9hslq4a46v71an06yh4p";
+      name = "keditbookmarks-16.12.2.tar.xz";
     };
   };
   kfilereplace = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kfilereplace-16.12.1.tar.xz";
-      sha256 = "1pzf2gz89slv7fhp9d7n32p7vjpdr594qqmc4qi4i51gv0cksj2m";
-      name = "kfilereplace-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kfilereplace-16.12.2.tar.xz";
+      sha256 = "086x9k71s2bc80863vlfryblg0cyw1qhk20vwhxmq81xkxsah6ky";
+      name = "kfilereplace-16.12.2.tar.xz";
     };
   };
   kfind = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kfind-16.12.1.tar.xz";
-      sha256 = "0bddyxjzha9flbj3b8ry805w5xns7al7hmx7hmpik7w1ph3ch0fx";
-      name = "kfind-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kfind-16.12.2.tar.xz";
+      sha256 = "0jpn75d331qiyhqswflkad5nc5r6c21q1d8236k2qvcm80xp10bm";
+      name = "kfind-16.12.2.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kfloppy-16.12.1.tar.xz";
-      sha256 = "0g9v6rgvjfwmikyd7c7w6xpbdymvqm8p4gs0mlbb7d1ianylfgv1";
-      name = "kfloppy-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kfloppy-16.12.2.tar.xz";
+      sha256 = "1q1fh16msixpn59y0yglmjbib6a5c9pb3hpmcd5vsiy2ilpgffbm";
+      name = "kfloppy-16.12.2.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kfourinline-16.12.1.tar.xz";
-      sha256 = "1zna1l1pll6hvjh1cbrh2kji17d67axwc955mx8xpjjm2fhw3np3";
-      name = "kfourinline-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kfourinline-16.12.2.tar.xz";
+      sha256 = "1df3si16d4ra3x3v9m4kiknlflx1ac10fq3vydcsn4yi89rhx2ix";
+      name = "kfourinline-16.12.2.tar.xz";
     };
   };
   kgeography = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kgeography-16.12.1.tar.xz";
-      sha256 = "1irs63lb8gaghb2qxqbih4bi7w3fyjbkl379jzlxacz963a35hk8";
-      name = "kgeography-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kgeography-16.12.2.tar.xz";
+      sha256 = "1sw7blr264p88702718m5ch9qdzyd5krpf5qjvfhypx0fgzr40b6";
+      name = "kgeography-16.12.2.tar.xz";
     };
   };
   kget = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kget-16.12.1.tar.xz";
-      sha256 = "0n670vxkqa9w51rdmp07g8ihh80v60m076f4rcrlliavw3wg2s76";
-      name = "kget-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kget-16.12.2.tar.xz";
+      sha256 = "1qiwcbdvr9g7cgqm4i3gcc6aw60d36n2m8a7faqa28srrw8f55lj";
+      name = "kget-16.12.2.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kgoldrunner-16.12.1.tar.xz";
-      sha256 = "17gi794m6s0v7c1xgxwmy5sldicds3yiyyf5520s56q3vx8sav93";
-      name = "kgoldrunner-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kgoldrunner-16.12.2.tar.xz";
+      sha256 = "0sa7yf3656f8mib785xdv7q86gsslx1hwy69vqrnrfwg24vzx3gy";
+      name = "kgoldrunner-16.12.2.tar.xz";
     };
   };
   kgpg = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kgpg-16.12.1.tar.xz";
-      sha256 = "08f8jq9inic05639xx0jh31d8mky4v3w7ig6d7b4k47nm06zzkpi";
-      name = "kgpg-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kgpg-16.12.2.tar.xz";
+      sha256 = "082fvxpawhsvfn6c1y32rvgp2qcim6lnk1gpp92cgn6k70dcx4lr";
+      name = "kgpg-16.12.2.tar.xz";
     };
   };
   khangman = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/khangman-16.12.1.tar.xz";
-      sha256 = "1lcwkfppkkiq3fswhydgkxcqgcaq65x0ijdymrnp4g0bsk4y6w2l";
-      name = "khangman-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/khangman-16.12.2.tar.xz";
+      sha256 = "1v57za5bqhppc1fy2xd7d1x1fvanwxgl3xzckfz1k7kbx1kcpn1s";
+      name = "khangman-16.12.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/khelpcenter-16.12.1.tar.xz";
-      sha256 = "1psjs1p3va6f3prymr9pzk0bn41zk6g69y0v1dpxf5ylgpn45234";
-      name = "khelpcenter-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/khelpcenter-16.12.2.tar.xz";
+      sha256 = "1cij7v57zs14ynvmplcgn14m30hdc554kvrsbjgb695kmcvm1jv9";
+      name = "khelpcenter-16.12.2.tar.xz";
     };
   };
   kholidays = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kholidays-16.12.1.tar.xz";
-      sha256 = "137rkfngcfjb5piva7iihyb3fib3qg84b9xk7f801pwy61pq30rk";
-      name = "kholidays-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kholidays-16.12.2.tar.xz";
+      sha256 = "0pybdq2asx10sxf4kz1p85yfs66dhccz2xvf95n8hky7833kqs1n";
+      name = "kholidays-16.12.2.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kidentitymanagement-16.12.1.tar.xz";
-      sha256 = "0m0x42jd2nlr3xj15zp8iv527driihxqsi64km20577jniw0jz6i";
-      name = "kidentitymanagement-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kidentitymanagement-16.12.2.tar.xz";
+      sha256 = "0wv7b3rfysbsj87xgp5ymy5glh9p12i9x8ffv483nm8xqyzwaa9p";
+      name = "kidentitymanagement-16.12.2.tar.xz";
     };
   };
   kig = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kig-16.12.1.tar.xz";
-      sha256 = "148mnp03j9kx3n2xlswc6jpamazljrh3j1r3xi3fkwqhdmqx7ybf";
-      name = "kig-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kig-16.12.2.tar.xz";
+      sha256 = "0v261pb1l7cnjkqcqfg3885wxa2hb2bgdk0a1dcwrg4q6fr9kw1g";
+      name = "kig-16.12.2.tar.xz";
     };
   };
   kigo = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kigo-16.12.1.tar.xz";
-      sha256 = "09srhp1p14yxnk31fps6cpm4cbpaqghlijf62mjg9414hpm13wyf";
-      name = "kigo-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kigo-16.12.2.tar.xz";
+      sha256 = "19sns6w32pm12634xqxx53hgpmrb4ggzx2idcx3ldknbixhmqm7c";
+      name = "kigo-16.12.2.tar.xz";
     };
   };
   killbots = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/killbots-16.12.1.tar.xz";
-      sha256 = "0dabz54bdncvbhldgwdwp7yb5p0fzxjd7rhgciqs387isnrf9l3k";
-      name = "killbots-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/killbots-16.12.2.tar.xz";
+      sha256 = "1cc2ddmp7a21yn0aavbh887j4xmzm2a6xlyq71b3msraw3p5vbmy";
+      name = "killbots-16.12.2.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kimagemapeditor-16.12.1.tar.xz";
-      sha256 = "1ljkbljxz4656pn6yhsni5jxdw3zpkik7d3b86ns1gaicq2ghw3r";
-      name = "kimagemapeditor-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kimagemapeditor-16.12.2.tar.xz";
+      sha256 = "0n82v73da8hnan2c96g2lxy826dg6xhln28wwr8iib89zd5gmbi6";
+      name = "kimagemapeditor-16.12.2.tar.xz";
     };
   };
   kimap = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kimap-16.12.1.tar.xz";
-      sha256 = "0c58jf16i8mwk20446sy7wf72a519nj7aa3g7iw79shjxzljx4zb";
-      name = "kimap-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kimap-16.12.2.tar.xz";
+      sha256 = "04shglmr8rv5r16qb3n9x7vwrsm55121rkj9pz1y7l40kybajl87";
+      name = "kimap-16.12.2.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kio-extras-16.12.1.tar.xz";
-      sha256 = "14vhh16xbrb1ywmclc2sbr1dm3lvjjcbv2riz5kyx548cnkmid9c";
-      name = "kio-extras-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kio-extras-16.12.2.tar.xz";
+      sha256 = "0bfjmggyl7x7nmkqq10pmcc2507yfkbv5c5v86225g9mk02frmhp";
+      name = "kio-extras-16.12.2.tar.xz";
     };
   };
   kiriki = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kiriki-16.12.1.tar.xz";
-      sha256 = "0rvj9f3kpdc0p6bpjgfjm3j4gxfhmqswag866s9zkm4zmr9l05y9";
-      name = "kiriki-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kiriki-16.12.2.tar.xz";
+      sha256 = "1fgdw7f4fqdfzsryvd8crdv60j2s2g3cvbibv3g91xkcq6p155wk";
+      name = "kiriki-16.12.2.tar.xz";
     };
   };
   kiten = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kiten-16.12.1.tar.xz";
-      sha256 = "1kzw3867jvmc7yj3897hn2lgh59s571g6629ih7ncwsqbilbagz3";
-      name = "kiten-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kiten-16.12.2.tar.xz";
+      sha256 = "1ya1wwgh1x4iap3vs947ln949hjc499aiylg24666ab7vcqkbhh8";
+      name = "kiten-16.12.2.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kjumpingcube-16.12.1.tar.xz";
-      sha256 = "0mfllbzhlvhr3h8crzg89zarxzsn9lgridyc6q9ljxzv6hf6w9rp";
-      name = "kjumpingcube-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kjumpingcube-16.12.2.tar.xz";
+      sha256 = "0flx7sxqac763i2nsvyjzjv9aii27hnv51k0yhqcp6pnsjy1fbhh";
+      name = "kjumpingcube-16.12.2.tar.xz";
     };
   };
   kldap = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kldap-16.12.1.tar.xz";
-      sha256 = "070vk1ig1qp8aqv457bwxg8z9gszj90g9ff5n5wyjcgl721n23nz";
-      name = "kldap-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kldap-16.12.2.tar.xz";
+      sha256 = "06ql2d7l22c19gnw6wigym3qpqw22arsmwpnnwz9i76l3wq32s3x";
+      name = "kldap-16.12.2.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kleopatra-16.12.1.tar.xz";
-      sha256 = "14d71qym527akx90krzk863f45rmbyj632bvhl2zfwx6ra5wpayx";
-      name = "kleopatra-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kleopatra-16.12.2.tar.xz";
+      sha256 = "1kh75qjas4x4aqvshdgcryqdrp475lx60gksjfh34ygz03avdssl";
+      name = "kleopatra-16.12.2.tar.xz";
     };
   };
   klettres = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/klettres-16.12.1.tar.xz";
-      sha256 = "0d9z4g6hkryky8gs5x2agrql4lyw0n64miwk88b5gb7yg3723mp5";
-      name = "klettres-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/klettres-16.12.2.tar.xz";
+      sha256 = "116igb1gbl3dfh5rm4mp0n8krm0d9kpgns63sh355g02wf0cbz3f";
+      name = "klettres-16.12.2.tar.xz";
     };
   };
   klickety = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/klickety-16.12.1.tar.xz";
-      sha256 = "1gg91l2fy5iwkmd8z990b561nhgqwvy4rb5i0cv67sikd1mafx0m";
-      name = "klickety-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/klickety-16.12.2.tar.xz";
+      sha256 = "00fqfnxh8bb069q3a5jszggnwq0z45najd6qg3z9gqb2i6bb4w93";
+      name = "klickety-16.12.2.tar.xz";
     };
   };
   klines = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/klines-16.12.1.tar.xz";
-      sha256 = "04mrgv7xbqn4cjwiwr9cydpnkw50zkiv1a0nf2syppcayib3jgyz";
-      name = "klines-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/klines-16.12.2.tar.xz";
+      sha256 = "1pr5pvxd6fnybkjqxig9zjiq04d7g6igw24p2j6kfz91ihaf4g6q";
+      name = "klines-16.12.2.tar.xz";
     };
   };
   klinkstatus = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/klinkstatus-16.12.1.tar.xz";
-      sha256 = "1g13npcqdslg6ggk5bjr61q06skkb92w9z8gd0nbkkq8ca6438kd";
-      name = "klinkstatus-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/klinkstatus-16.12.2.tar.xz";
+      sha256 = "07wmaphs56x0jwgbkdynahwa0hrr3rakkbbfa4w046dga5z6dz60";
+      name = "klinkstatus-16.12.2.tar.xz";
     };
   };
   kmag = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmag-16.12.1.tar.xz";
-      sha256 = "0398jb6fj1vw2lrby3smns59fiv3s109bd1nnzv69jba11gnr47f";
-      name = "kmag-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmag-16.12.2.tar.xz";
+      sha256 = "02vjwfh926jvhxn1sw603ijdrayk4jxrw9rl7kv48q00kgk5sr23";
+      name = "kmag-16.12.2.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmahjongg-16.12.1.tar.xz";
-      sha256 = "1qpvykd7adf3fx3sl6rd4d64d6y1ffmx9b048bm3vhlx32g6ksim";
-      name = "kmahjongg-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmahjongg-16.12.2.tar.xz";
+      sha256 = "1rbcbak87jyf6bc8k44xvpcihagwh4i3v20af14hvm52gdvzdhij";
+      name = "kmahjongg-16.12.2.tar.xz";
     };
   };
   kmail = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmail-16.12.1.tar.xz";
-      sha256 = "0vx7ydm9rzw71b46va89k83l1ck364nczla3jia5wcqmli13wswl";
-      name = "kmail-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmail-16.12.2.tar.xz";
+      sha256 = "0a3r6pwm3dvvmljp5grl1mgymp3fb1l3hb8issdqlk4s805q0pql";
+      name = "kmail-16.12.2.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmail-account-wizard-16.12.1.tar.xz";
-      sha256 = "0166vfycgcvxfj2zlizcmzqdsv6s41djb14x8sff6hxhhxni4hyd";
-      name = "kmail-account-wizard-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmail-account-wizard-16.12.2.tar.xz";
+      sha256 = "1vm4lx5jwk5kqf3zdfm3zyzhap1dalslwj03gxmif6hh65d2s7h5";
+      name = "kmail-account-wizard-16.12.2.tar.xz";
     };
   };
   kmailtransport = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmailtransport-16.12.1.tar.xz";
-      sha256 = "1jwdpw7b1yji2zj70d4bn8z5cjrc51ar00qd0chzi2ykjb4fwvla";
-      name = "kmailtransport-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmailtransport-16.12.2.tar.xz";
+      sha256 = "0g2f25l4l8jlj4d5dcdlbz8rgy4xvm6if2i3qm4naqh35kb4rycn";
+      name = "kmailtransport-16.12.2.tar.xz";
     };
   };
   kmbox = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmbox-16.12.1.tar.xz";
-      sha256 = "0s1qimkiglhsb889sxvsg7w4w9k0l703f8r0092bv0zpz54rzx7l";
-      name = "kmbox-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmbox-16.12.2.tar.xz";
+      sha256 = "1j30kvvlnfbky5x19gxjsbrshrdys6ajdbhpd9fy46jjh2dv3y6j";
+      name = "kmbox-16.12.2.tar.xz";
     };
   };
   kmime = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmime-16.12.1.tar.xz";
-      sha256 = "1g792vqm8lb60psccwjg8kdcawdfrbnsflpg1kqif8a2327p0df4";
-      name = "kmime-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmime-16.12.2.tar.xz";
+      sha256 = "0sl34qahgvxaw9xi56d0l2a2iim9bpiv8ysf3spsc1m2ribf3400";
+      name = "kmime-16.12.2.tar.xz";
     };
   };
   kmines = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmines-16.12.1.tar.xz";
-      sha256 = "1vq836nj46r3rn2hddg2vs3541p7q4s4sh6l554pjpdd8dbs8kjv";
-      name = "kmines-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmines-16.12.2.tar.xz";
+      sha256 = "1324j3myr1wds3f6nzw186d1rc2aakxv0mqsx89bdvnky6zq2v5q";
+      name = "kmines-16.12.2.tar.xz";
     };
   };
   kmix = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmix-16.12.1.tar.xz";
-      sha256 = "1acc77v9arr7593qzw0vwhdpxdxd00gmvymkyyn2qlzwy4ihci8g";
-      name = "kmix-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmix-16.12.2.tar.xz";
+      sha256 = "1s8di3jbgcaamfxfmmwxlajixia9m2ngl4qc1z7rq6a14fk3w5hz";
+      name = "kmix-16.12.2.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmousetool-16.12.1.tar.xz";
-      sha256 = "02qm8x9jfs86d1hv3g130q0kqiqxm7i9ab11f5n93xb9migi7q68";
-      name = "kmousetool-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmousetool-16.12.2.tar.xz";
+      sha256 = "128hp75zyyariflx03ilmvw09jngfy9ylykb73gg7xw2zqnjjw4i";
+      name = "kmousetool-16.12.2.tar.xz";
     };
   };
   kmouth = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmouth-16.12.1.tar.xz";
-      sha256 = "1l7r63f93q46p1kgjyyvg49mfdfr3n1bbzy6081wlb18igjgwkmq";
-      name = "kmouth-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmouth-16.12.2.tar.xz";
+      sha256 = "0gk8rdlpwh304k7g85i80rfdjnvj4fcd1nlj89zmq2qh5s9jmqzg";
+      name = "kmouth-16.12.2.tar.xz";
     };
   };
   kmplot = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kmplot-16.12.1.tar.xz";
-      sha256 = "0djrxsh8zm5dncmiy8xn1x54k3g1hscds0f7vaa1lv97prcclqcz";
-      name = "kmplot-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kmplot-16.12.2.tar.xz";
+      sha256 = "0lwx0d1gv6k3nm0nxry6bl282j3vjc0p7rssbvhi5qsc7z9lc8s3";
+      name = "kmplot-16.12.2.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/knavalbattle-16.12.1.tar.xz";
-      sha256 = "1h98fvi31l20b2mx812z1wy0njp22jwc546h6wp50q4l1m7shxg1";
-      name = "knavalbattle-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/knavalbattle-16.12.2.tar.xz";
+      sha256 = "065hyrdqaj0g7kpgxdyjbf2msdxb6w6m2y50bw23p4w69y7fdxgn";
+      name = "knavalbattle-16.12.2.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/knetwalk-16.12.1.tar.xz";
-      sha256 = "1129v31xabk27wqfq3nvyhd8gx3yipcl15zcn2vg89qbj5j71pc9";
-      name = "knetwalk-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/knetwalk-16.12.2.tar.xz";
+      sha256 = "1rhmgr2qk8h04y87dviy0yhrv5dg8za5v00csmia3s1jyvz0fbwp";
+      name = "knetwalk-16.12.2.tar.xz";
     };
   };
   knotes = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/knotes-16.12.1.tar.xz";
-      sha256 = "0i8s8rfqilc8r4x26bisshhp2x3hss748kz1rs9wv2lb6s60r2n8";
-      name = "knotes-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/knotes-16.12.2.tar.xz";
+      sha256 = "12bdrw4ikw014phbq9w4q5y9lgjnazhvri7j13ld5r6806bxls04";
+      name = "knotes-16.12.2.tar.xz";
     };
   };
   kolf = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kolf-16.12.1.tar.xz";
-      sha256 = "0rjzk40szpfkfc32qyhc41kpnpd96avwl6l4ahgdghx86bdn233k";
-      name = "kolf-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kolf-16.12.2.tar.xz";
+      sha256 = "1v9lhir520n7kcc061z3zcc8wxswhnmjv7yifbqvviazl1n0p0vx";
+      name = "kolf-16.12.2.tar.xz";
     };
   };
   kollision = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kollision-16.12.1.tar.xz";
-      sha256 = "0yml0a5c2iypj4gzdvak2jjm09gjslbzcyqv0cwaygydzclkn896";
-      name = "kollision-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kollision-16.12.2.tar.xz";
+      sha256 = "1dklg0ns3abfxbfr7xrnzkcxxng3v7avzj4bjvsmsbq3lzy3pb8c";
+      name = "kollision-16.12.2.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kolourpaint-16.12.1.tar.xz";
-      sha256 = "06fg433dqnm1x4v7ixiix5vq33kr865jhw2bnbrpfhyq8qhvcqk1";
-      name = "kolourpaint-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kolourpaint-16.12.2.tar.xz";
+      sha256 = "1himisb1f68pgaz15qam73qv9acqqh8i1jnk9wbsqjyj6z67wvnj";
+      name = "kolourpaint-16.12.2.tar.xz";
     };
   };
   kommander = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kommander-16.12.1.tar.xz";
-      sha256 = "12d7j6nifblg24zn9bgghil0qcc9sljy4h09sh6qxchnagdx8bb3";
-      name = "kommander-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kommander-16.12.2.tar.xz";
+      sha256 = "140sz82gm5p8f8mhr2kdfy24fr6jjs0l53jcqr9hwdw6vlrm399w";
+      name = "kommander-16.12.2.tar.xz";
     };
   };
   kompare = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kompare-16.12.1.tar.xz";
-      sha256 = "0kjk6bad6321mgfxfvh9hjj823cilpjrihlrspwr4jh7w8gkb730";
-      name = "kompare-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kompare-16.12.2.tar.xz";
+      sha256 = "1dd4k3rq8wlzsvl5nv5mrd0ddxgwlriik3vxj8xx3b4nqk720lh6";
+      name = "kompare-16.12.2.tar.xz";
     };
   };
   konqueror = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/konqueror-16.12.1.tar.xz";
-      sha256 = "1rrv20mi5czcpdq0h294s9gr9970f88yhv8hvc10i3h3gpjcv5vg";
-      name = "konqueror-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/konqueror-16.12.2.tar.xz";
+      sha256 = "0md9glzr1br2n5dsfmmv6gxsfhv6jl0r4fa1qgw4d2j2kpm94zw7";
+      name = "konqueror-16.12.2.tar.xz";
     };
   };
   konquest = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/konquest-16.12.1.tar.xz";
-      sha256 = "1fib398af900c99x1k263dwqhwp2d6wfp8qn04ry6siyfwlpxkrj";
-      name = "konquest-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/konquest-16.12.2.tar.xz";
+      sha256 = "0k58adqr20k9wrwbaf1s6lqqgcma08wqnv66zrxbgacgsgx3pnzi";
+      name = "konquest-16.12.2.tar.xz";
     };
   };
   konsole = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/konsole-16.12.1.tar.xz";
-      sha256 = "0nik8xvfppr30942pjcz2h70xdj0p35mxvq2cirh4h1wwb4458nm";
-      name = "konsole-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/konsole-16.12.2.tar.xz";
+      sha256 = "1mwfv2hznmd1qml8hq1z81jv9y8jn1ybc69dqgnf1n6ygmz14676";
+      name = "konsole-16.12.2.tar.xz";
     };
   };
   kontact = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kontact-16.12.1.tar.xz";
-      sha256 = "1ynk2cv9ik6zahb92cq4miw05qrw0ffipcq9j71n6m79f319hmkc";
-      name = "kontact-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kontact-16.12.2.tar.xz";
+      sha256 = "1rfqb5a4brbvkhv905lcvc40r0as8zwdm2h67jc96cix358cpshv";
+      name = "kontact-16.12.2.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kontactinterface-16.12.1.tar.xz";
-      sha256 = "1qdii6y05ya8jjjfimr61r6d6x31bqgrdb89gms9qpf5rpr3ql2l";
-      name = "kontactinterface-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kontactinterface-16.12.2.tar.xz";
+      sha256 = "0z6mjg8sy18jhkfmk9s098851gdqbh03031l92yqzsgsfph9nk77";
+      name = "kontactinterface-16.12.2.tar.xz";
     };
   };
   kopete = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kopete-16.12.1.tar.xz";
-      sha256 = "0pi3i02myj8bgkqif94n434l13k2ydslrn2nvy47rwsiyr77wrn2";
-      name = "kopete-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kopete-16.12.2.tar.xz";
+      sha256 = "0bf0bffcsyhrj70yb4l5g6n0jr38i5zkcl4hsfi9hac43xvp62ib";
+      name = "kopete-16.12.2.tar.xz";
     };
   };
   korganizer = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/korganizer-16.12.1.tar.xz";
-      sha256 = "1v85bfyq0iyd9qc3lcqi7k65w8hpaq9yx093g4l6yh561xkw8yac";
-      name = "korganizer-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/korganizer-16.12.2.tar.xz";
+      sha256 = "1211rhxvx42lndqv6n23mj6ibhfp09vvmzz59k1j0l9z8y1zyr2g";
+      name = "korganizer-16.12.2.tar.xz";
     };
   };
   kpat = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kpat-16.12.1.tar.xz";
-      sha256 = "1zgwg6pvpq6adlzcm12mqq73w9rpixh7cx892c687930d17r5l8i";
-      name = "kpat-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kpat-16.12.2.tar.xz";
+      sha256 = "1yc16yfsq18m5xxm9b17zba3ppw7j5hq82z0ln8sw2yisz59mylr";
+      name = "kpat-16.12.2.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kpimtextedit-16.12.1.tar.xz";
-      sha256 = "1x1q26qwby3d3krx9nimwnx72zp3yns5inc88xkb0r74sn9743la";
-      name = "kpimtextedit-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kpimtextedit-16.12.2.tar.xz";
+      sha256 = "0xspr7hip57j8n3mp71x8s908vlj7acl27jwyc33yi4xvlyfcgfy";
+      name = "kpimtextedit-16.12.2.tar.xz";
     };
   };
   kppp = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kppp-16.12.1.tar.xz";
-      sha256 = "01alps13995d1b3974c8ihi7i1pjm5xf5iskrp9bsc2ad8hka7xb";
-      name = "kppp-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kppp-16.12.2.tar.xz";
+      sha256 = "1gvb3sgxg1ysdrv18rf5kh6znvwlkp673yld6ghj3dcif8w6xq0n";
+      name = "kppp-16.12.2.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kqtquickcharts-16.12.1.tar.xz";
-      sha256 = "0pff2jm814x9f1zyxb8c718f43x34g9diggd15hbzshl0mhdx9h8";
-      name = "kqtquickcharts-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kqtquickcharts-16.12.2.tar.xz";
+      sha256 = "1gh3alqlmj2icd2jblncps4k6kklckbpqv18wplybgaz4h0pi4pi";
+      name = "kqtquickcharts-16.12.2.tar.xz";
     };
   };
   krdc = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/krdc-16.12.1.tar.xz";
-      sha256 = "1v1p6ghvv72swqpv43f6k6wn5jwvk5b21aarm2as6c4x4nzkhffx";
-      name = "krdc-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/krdc-16.12.2.tar.xz";
+      sha256 = "1ql2mkx7xc2y0vkxjk3i5scxa6ws5mwz39zynmyx7rmxp9f8frsf";
+      name = "krdc-16.12.2.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kremotecontrol-16.12.1.tar.xz";
-      sha256 = "0l4i47wlzpsm02r5fvkzfqjx9jixkc5c9j69s3ms4h4wwysi7r2z";
-      name = "kremotecontrol-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kremotecontrol-16.12.2.tar.xz";
+      sha256 = "1c1xx458lchn9b3c9h27zb13m2y6b01sb0g6lf6bpx4skbdwdwma";
+      name = "kremotecontrol-16.12.2.tar.xz";
     };
   };
   kreversi = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kreversi-16.12.1.tar.xz";
-      sha256 = "1mhdz7wqi8ij2rdbsa30wsmz33z04dbxbczymi0wcbnvm2hai34a";
-      name = "kreversi-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kreversi-16.12.2.tar.xz";
+      sha256 = "18zfy3dzi9rgwhgvci93iv0gkmvac30rbj4xwpvzr3bc8zwz76df";
+      name = "kreversi-16.12.2.tar.xz";
     };
   };
   krfb = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/krfb-16.12.1.tar.xz";
-      sha256 = "0ggpzycqd2jdi0k3knbc0hyfa1vl8mim9v5s4nbclg99y2yyybvl";
-      name = "krfb-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/krfb-16.12.2.tar.xz";
+      sha256 = "1sqij11a6pbivf2xbcglxzkfrpqvzcqxb4d85jxrhbp2wljx0xvy";
+      name = "krfb-16.12.2.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kross-interpreters-16.12.1.tar.xz";
-      sha256 = "1m7xpjsggsrig1wqar8m7hjnhr561h20wqkyz66xf11fvwrc7zks";
-      name = "kross-interpreters-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kross-interpreters-16.12.2.tar.xz";
+      sha256 = "1cw84z2wdh1kb7fgwmmljmc5d57skh6hlm0p6kzlqdbqknnva8ad";
+      name = "kross-interpreters-16.12.2.tar.xz";
     };
   };
   kruler = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kruler-16.12.1.tar.xz";
-      sha256 = "1j4xl3s2yw44qb1p287zc8af1nsjrc8dxvsn4xhc5cl0c5hcwi0s";
-      name = "kruler-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kruler-16.12.2.tar.xz";
+      sha256 = "11i7k53kpfampbkzzabp0v97pb22h7sb2i0r6qdx78kyhmkgdrvp";
+      name = "kruler-16.12.2.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ksaneplugin-16.12.1.tar.xz";
-      sha256 = "05s38s1j1nf9flhaf089bjd10s8mi97ngw0ckr2xjjjkfj4p6abq";
-      name = "ksaneplugin-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ksaneplugin-16.12.2.tar.xz";
+      sha256 = "0ljk7cf4ns39xszn6g1vk8av3dkkgwzj4ry4n56305mqyjgqx258";
+      name = "ksaneplugin-16.12.2.tar.xz";
     };
   };
   kscd = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kscd-16.12.1.tar.xz";
-      sha256 = "1njzzvkhxqfw889rxw4vd6jyqsmqsrrcjgb5fmrjvwhg94h4i745";
-      name = "kscd-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kscd-16.12.2.tar.xz";
+      sha256 = "1w1gcfwp1r18pjfp526pdb837kpd8zj08g1jrjcb3bmvh600apm0";
+      name = "kscd-16.12.2.tar.xz";
     };
   };
   kshisen = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kshisen-16.12.1.tar.xz";
-      sha256 = "118fad0k4cv7klkv20x7rvwabnn6fcymypmraamprc76ygvyvk02";
-      name = "kshisen-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kshisen-16.12.2.tar.xz";
+      sha256 = "0sw78qwlpimlhqzlz5migbngrhj7w6gdbqx12q7949paa03ash1b";
+      name = "kshisen-16.12.2.tar.xz";
     };
   };
   ksirk = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ksirk-16.12.1.tar.xz";
-      sha256 = "0w05nxqw5a18h0ylwx5lmw10wcmjrv293npfz1fl7nkhkxry0wy5";
-      name = "ksirk-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ksirk-16.12.2.tar.xz";
+      sha256 = "0f9k476wbwx0maf0wsicgipqyv7gccm7ydwvns399iamb6xkiqnn";
+      name = "ksirk-16.12.2.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ksnakeduel-16.12.1.tar.xz";
-      sha256 = "1zrh34kb66sg1crhbndxhqychz359d1779ykw25q577panagwhgd";
-      name = "ksnakeduel-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ksnakeduel-16.12.2.tar.xz";
+      sha256 = "0lhwz1b1v1dir7k1vbkcwb73x7f3h7prb3zv4f8wlh32dj1yg983";
+      name = "ksnakeduel-16.12.2.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kspaceduel-16.12.1.tar.xz";
-      sha256 = "1g0ghr8lwvhlxq9b27864hfbsirb3y3zn0ipcw5cc0qdfcs9cqq2";
-      name = "kspaceduel-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kspaceduel-16.12.2.tar.xz";
+      sha256 = "0h6m8xnmxx0q2r863ikck0kpyscd8s4iidcjiqz7wqgbsw1dadqb";
+      name = "kspaceduel-16.12.2.tar.xz";
     };
   };
   ksquares = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ksquares-16.12.1.tar.xz";
-      sha256 = "1bb7saml0l76cpkngpvdfn9yv7kg3fzj152dgav6cgvfzaj6xdz5";
-      name = "ksquares-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ksquares-16.12.2.tar.xz";
+      sha256 = "14x1d9300wdhrnri5f5n5i31bs83hcbxs5w9cai1m8mlql99vvfy";
+      name = "ksquares-16.12.2.tar.xz";
     };
   };
   kstars = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kstars-16.12.1.tar.xz";
-      sha256 = "0pfmg3669nigdl0zhab45jh7h6gh5jmxvca1vxavwp8jmn96ghkl";
-      name = "kstars-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kstars-16.12.2.tar.xz";
+      sha256 = "0acbirhr970fh53hfsbfw9jn4jqlww9zf80jfyg2drixi9d70mpp";
+      name = "kstars-16.12.2.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ksudoku-16.12.1.tar.xz";
-      sha256 = "07h550yvv48xk8s8ppnhxr6lfv69qsfxghadybf4g777hyxl06dy";
-      name = "ksudoku-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ksudoku-16.12.2.tar.xz";
+      sha256 = "1nvk8l6n7sja19s2kazf6xhzqwi9mrjxvz5i0i9nmpwmksii6lbg";
+      name = "ksudoku-16.12.2.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ksystemlog-16.12.1.tar.xz";
-      sha256 = "0mjwqczvmncrf7hr19vdyyswnnfnvzqx18i7fqj7f15cg29yzh86";
-      name = "ksystemlog-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ksystemlog-16.12.2.tar.xz";
+      sha256 = "13q2h3yhlpjy8hiiz6vdx5xwniysbmz5agvvn28a469710601154";
+      name = "ksystemlog-16.12.2.tar.xz";
     };
   };
   kteatime = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kteatime-16.12.1.tar.xz";
-      sha256 = "0dx74zz4mk3ckg51hyckwk5ff96jd95pdcpmywkyjzxqlqkyg5j0";
-      name = "kteatime-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kteatime-16.12.2.tar.xz";
+      sha256 = "0m163a11hp90rqf5170iqapmvn4ym6m2n42da2p1jgyim4877613";
+      name = "kteatime-16.12.2.tar.xz";
     };
   };
   ktimer = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktimer-16.12.1.tar.xz";
-      sha256 = "18va6sb4qcb54rgrxaa0s87bxh15ynvvz8vispb054h8mj5k469j";
-      name = "ktimer-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktimer-16.12.2.tar.xz";
+      sha256 = "1l9xwfg3701h1f16ifh74c5hv7j7z0f332izcvfpiccps7gplhvz";
+      name = "ktimer-16.12.2.tar.xz";
     };
   };
   ktnef = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktnef-16.12.1.tar.xz";
-      sha256 = "18k9a36qn0fbfx797cb7ngg9xss7h4svl491inwg6l0s2ydwxf74";
-      name = "ktnef-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktnef-16.12.2.tar.xz";
+      sha256 = "0id9shripwahgb258hgfpmxyg0z9x2dqpxgyrvb47d44rrcf9dxg";
+      name = "ktnef-16.12.2.tar.xz";
     };
   };
   ktouch = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktouch-16.12.1.tar.xz";
-      sha256 = "03q9l2s09gm1fgqkr4c71zyyrsrymikfh69z4yyba3azr15ayzy3";
-      name = "ktouch-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktouch-16.12.2.tar.xz";
+      sha256 = "08c0g35ypsndh8pj1nbxn8gnzis10a5cxkz175x4asi5lcpw3kc1";
+      name = "ktouch-16.12.2.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-accounts-kcm-16.12.1.tar.xz";
-      sha256 = "1lmmy4pmr44x7kgwc72xn8sijbqgblqkxcr08qj8hrmpvzrc8nh0";
-      name = "ktp-accounts-kcm-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-accounts-kcm-16.12.2.tar.xz";
+      sha256 = "1p3pqvkyhwcqcwgpyfghhii3d5shbfpm8i9vap8vc43clvj9sfah";
+      name = "ktp-accounts-kcm-16.12.2.tar.xz";
     };
   };
   ktp-approver = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-approver-16.12.1.tar.xz";
-      sha256 = "0nzpmylm58yx28lz1wx1c0ib19v980h6r0dylp2lx9h738jh0wq4";
-      name = "ktp-approver-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-approver-16.12.2.tar.xz";
+      sha256 = "1ky4wg8qk4n2qyh5009zz6487pf31jb8w8zmjmck9fypc9rhzw2j";
+      name = "ktp-approver-16.12.2.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-auth-handler-16.12.1.tar.xz";
-      sha256 = "14b31mqy4n5ymm0adxlsi2aqlgdhzhhg5yq3smg13361dj0jxf70";
-      name = "ktp-auth-handler-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-auth-handler-16.12.2.tar.xz";
+      sha256 = "05dvbq1q0fbznyj11wkg0ic8svgkqdq8i20xddkkx2jpwhpkmcnl";
+      name = "ktp-auth-handler-16.12.2.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-call-ui-16.12.1.tar.xz";
-      sha256 = "00s81rh7zffry754yzqvxz6q9wcn0nb7v2z9xq4iav6spl7b35c3";
-      name = "ktp-call-ui-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-call-ui-16.12.2.tar.xz";
+      sha256 = "1czm56vvbjbyyib2wi60f9s2icnyac007zzh2qxsxfnlp52mkzm2";
+      name = "ktp-call-ui-16.12.2.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-common-internals-16.12.1.tar.xz";
-      sha256 = "083hbvdd8xzlvdgldvxc45a8jq78k4dsz2idz9ljj7x5naizmkjx";
-      name = "ktp-common-internals-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-common-internals-16.12.2.tar.xz";
+      sha256 = "0323dhfiddq5yhbp0rpmpw60334z41f45ml8lcada8dv6mbjxlc6";
+      name = "ktp-common-internals-16.12.2.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-list-16.12.1.tar.xz";
-      sha256 = "0qddi195ayq63nji7cppqxxq2jifflfxr8zskd6shr720invkdm3";
-      name = "ktp-contact-list-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-list-16.12.2.tar.xz";
+      sha256 = "0gk0lims3ypjsir9k9a010kylnqzqb2dsh5yfv24a6fb1ix6q4yy";
+      name = "ktp-contact-list-16.12.2.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-contact-runner-16.12.1.tar.xz";
-      sha256 = "10f2cygyjchydd35rx1daimlfkab4wijahp0vznjc46k332znl37";
-      name = "ktp-contact-runner-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-runner-16.12.2.tar.xz";
+      sha256 = "1bfm4639jshw9ncchcj6m8q6xg49a20z4fzc66vrjkdbha8fwr0g";
+      name = "ktp-contact-runner-16.12.2.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-desktop-applets-16.12.1.tar.xz";
-      sha256 = "109aq8dgf9gig4dvb5n2khcslnyhfcfrl95b3h0dkbfiz6xlxhby";
-      name = "ktp-desktop-applets-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-desktop-applets-16.12.2.tar.xz";
+      sha256 = "1ahm69h309dyg3byv3jxxm3j0c5jphzxng2g87hvjs9dvgx00msv";
+      name = "ktp-desktop-applets-16.12.2.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-filetransfer-handler-16.12.1.tar.xz";
-      sha256 = "1qwhqyn2v0axn7rdlm5ckkjybfhmysz8612akd499yp8jyvgm046";
-      name = "ktp-filetransfer-handler-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-filetransfer-handler-16.12.2.tar.xz";
+      sha256 = "1j1bmrwabh0mzm51ibb0qyf164g7hznjk2vm2kwkgk5sy8r1a363";
+      name = "ktp-filetransfer-handler-16.12.2.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-kded-module-16.12.1.tar.xz";
-      sha256 = "173a3pdrlsl7vv8xxxckfn7y0vi2ndbds2vzm2ir4crxcl5mm3cm";
-      name = "ktp-kded-module-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-kded-module-16.12.2.tar.xz";
+      sha256 = "1ia62r55my8s6l3am22z6nkvmi2x2gnpbwmmpiv8n2i7j2ysdjp9";
+      name = "ktp-kded-module-16.12.2.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-send-file-16.12.1.tar.xz";
-      sha256 = "0makfaalzidnqm4gk3kd2qnchjy15xcqprbjs9908jvixk3nfj1c";
-      name = "ktp-send-file-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-send-file-16.12.2.tar.xz";
+      sha256 = "0vl00bbnpddq9nczb53apf3sdr1r2hnpa3fa390yx3jrrr4hp3k0";
+      name = "ktp-send-file-16.12.2.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktp-text-ui-16.12.1.tar.xz";
-      sha256 = "16lwsy4fjxc77pg2gsjsmj7fhbrsjcgpiv0yx6a6nh2mz69zw3ml";
-      name = "ktp-text-ui-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktp-text-ui-16.12.2.tar.xz";
+      sha256 = "0c0khkargj4hg2j1va72hp45b3dzwvkvbssq7k309iljxgfi9qry";
+      name = "ktp-text-ui-16.12.2.tar.xz";
     };
   };
   ktuberling = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/ktuberling-16.12.1.tar.xz";
-      sha256 = "1g1sbvnizs5cp80jyn1liizd8lj3jl38nysgii8fzdfpqmspwx35";
-      name = "ktuberling-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/ktuberling-16.12.2.tar.xz";
+      sha256 = "0867ci5bi0phcwwxlqlyn3w1pv5q5wvzyqnzjvywc0bzy2qbpp0p";
+      name = "ktuberling-16.12.2.tar.xz";
     };
   };
   kturtle = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kturtle-16.12.1.tar.xz";
-      sha256 = "0q1qq2a9308y85b9lk44k109gfi9cmzrkaqd8darp3alwaqbaphr";
-      name = "kturtle-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kturtle-16.12.2.tar.xz";
+      sha256 = "183glhn0amkcrzylax9cjyj3if9iz3dybmw55ljw003mf1s0sydq";
+      name = "kturtle-16.12.2.tar.xz";
     };
   };
   kubrick = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kubrick-16.12.1.tar.xz";
-      sha256 = "01q3rswfn5r32r2ssq6xmhym158x4pwb7l76xw0h096s4swwri2k";
-      name = "kubrick-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kubrick-16.12.2.tar.xz";
+      sha256 = "10yakz1ffdx33sqgqmlga525r3cnz90m0rm5m2sl3b97ib7r0fxl";
+      name = "kubrick-16.12.2.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kwalletmanager-16.12.1.tar.xz";
-      sha256 = "16kjgqrv9w9il9kla5swywqbc3qrijiz1ii49bjhn1vsa4g1f9n1";
-      name = "kwalletmanager-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kwalletmanager-16.12.2.tar.xz";
+      sha256 = "129q3c805g4jsrws3gvy751y4pdwp9m8yvlc62pkp703xwlnkzj4";
+      name = "kwalletmanager-16.12.2.tar.xz";
     };
   };
   kwave = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kwave-16.12.1.tar.xz";
-      sha256 = "1sr19gjr7m3f140vl2lqp6ms8j6vz1djdnkh1ggs7chr2aws52p2";
-      name = "kwave-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kwave-16.12.2.tar.xz";
+      sha256 = "0g3n0fm3pyp6sd28qjpadpqs2kqd5gsbicdz1c5jkm8c1bypi0ij";
+      name = "kwave-16.12.2.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/kwordquiz-16.12.1.tar.xz";
-      sha256 = "14sa1gjswp9y9kzxk5qfg3df8n9527zkspdz2v9phf9n0jdl9wqw";
-      name = "kwordquiz-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/kwordquiz-16.12.2.tar.xz";
+      sha256 = "1jy9833zrgaddzpfaaps2gcxjnf9mg2yx4w7mfpa3vglsyvhqlzx";
+      name = "kwordquiz-16.12.2.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libgravatar-16.12.1.tar.xz";
-      sha256 = "1j53kqa9ypv3igcllr1a9z7pvg1ax3lk957l2i7bb0kwjqhvlqkb";
-      name = "libgravatar-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libgravatar-16.12.2.tar.xz";
+      sha256 = "0vdryr9q30jkk5b9fa75yiqpspj83wvcy2zry8rsrx7pj21cdlsw";
+      name = "libgravatar-16.12.2.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkcddb-16.12.1.tar.xz";
-      sha256 = "16429hxxq1kw9gv61sljy96y4zxyq5qgs3hvq1n73rq7vwl4bgl3";
-      name = "libkcddb-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkcddb-16.12.2.tar.xz";
+      sha256 = "0gs0zyisrgbzbcnwp95qi8msj5x2ysmqk9nwja3bwqzbangm0y82";
+      name = "libkcddb-16.12.2.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkcompactdisc-16.12.1.tar.xz";
-      sha256 = "0s4107aa4qrzrh4xi3p4j40alx9nynckawjhyh42c0yz2cgzdvbg";
-      name = "libkcompactdisc-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkcompactdisc-16.12.2.tar.xz";
+      sha256 = "1ydhfi3hp30zg9nlmnzd5pslwlq6v6jbim2jda8ciyvniw0pm6va";
+      name = "libkcompactdisc-16.12.2.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkdcraw-16.12.1.tar.xz";
-      sha256 = "09vrj7ds257f699782vgp4pvanirkbacar5w2aiy89s5c88wcf3p";
-      name = "libkdcraw-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkdcraw-16.12.2.tar.xz";
+      sha256 = "0w54h8fa1hgyvqps936annb8dhbrpizv4ifcix0gq714p573l8w3";
+      name = "libkdcraw-16.12.2.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkdegames-16.12.1.tar.xz";
-      sha256 = "0a511clm36dvlvqzarf2sppp5mmr3jqzbvq3873fwyyjhk17n9si";
-      name = "libkdegames-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkdegames-16.12.2.tar.xz";
+      sha256 = "0lw6v81pr4xq5h58mgkbzlvp5bxic9szfmabgd3nrdijh6mla4ly";
+      name = "libkdegames-16.12.2.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkdepim-16.12.1.tar.xz";
-      sha256 = "04l073xl6wdzslvnlpg4jxg74bc5jnqij4gk9cw6zm93fxcs61kh";
-      name = "libkdepim-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkdepim-16.12.2.tar.xz";
+      sha256 = "1xblfj2i205jsm6nl05r3jis4gb4d15naq2mmfgxwy913pjh74jf";
+      name = "libkdepim-16.12.2.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkeduvocdocument-16.12.1.tar.xz";
-      sha256 = "1s3qbv67vzqvwaym9ac1izpfffp1gvc9crydg1hwgpfxccgnk0sf";
-      name = "libkeduvocdocument-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkeduvocdocument-16.12.2.tar.xz";
+      sha256 = "118z200ffqb2rj6yhmqp4b998cq6mlbpzn2gh2pdp70yin9w35qz";
+      name = "libkeduvocdocument-16.12.2.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkexiv2-16.12.1.tar.xz";
-      sha256 = "0mnw9ck144x1b2bhjs0llx4kx95z2y1qrblzrvjaydg7f4q5h3qd";
-      name = "libkexiv2-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkexiv2-16.12.2.tar.xz";
+      sha256 = "1bpk2mwiplk7c5xrdx7nq9fa0g53sgx6f5xa7d4k2i9mzn2s8hyr";
+      name = "libkexiv2-16.12.2.tar.xz";
     };
   };
   libkface = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkface-16.12.1.tar.xz";
-      sha256 = "0pmwxrd1afgmj2bhqnk903kq20mzfji3wnzrlv5xyc8jd7w5f7s8";
-      name = "libkface-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkface-16.12.2.tar.xz";
+      sha256 = "0jhnx71bnn2f8x5w5iylkk7369fcbx0y793182vc5rdqaax983sc";
+      name = "libkface-16.12.2.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkgeomap-16.12.1.tar.xz";
-      sha256 = "0phqx125n1nklk9v3bnhnfr13b7qylga0zwvb9hajq6g67frsh95";
-      name = "libkgeomap-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkgeomap-16.12.2.tar.xz";
+      sha256 = "1skmmg3hppzj923nl90r7v26k4fii7h3sr6yxzzvzaakwbil7d9q";
+      name = "libkgeomap-16.12.2.tar.xz";
     };
   };
   libkipi = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkipi-16.12.1.tar.xz";
-      sha256 = "137r2kympkqf06a9w1a174krinra63yknnphprygaxxr6dbrh3a4";
-      name = "libkipi-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkipi-16.12.2.tar.xz";
+      sha256 = "0g1yyd5lhvwwa7q4in1p3q4mwlpp00lbir1a25wanlr6hqr2247w";
+      name = "libkipi-16.12.2.tar.xz";
     };
   };
   libkleo = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkleo-16.12.1.tar.xz";
-      sha256 = "0cziv4pwippcikj4nlsdgz5nkrb7kimap0nyldvq8rzhi6s7dy4r";
-      name = "libkleo-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkleo-16.12.2.tar.xz";
+      sha256 = "031lfrn48xzi0kxkvg9597nxzharv0s0nxlkbdcr4xx8d8iga2l0";
+      name = "libkleo-16.12.2.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkmahjongg-16.12.1.tar.xz";
-      sha256 = "0crbkxaym2z9p76v3bya414xcpn6h52nbp5902fa4l67a3z1k736";
-      name = "libkmahjongg-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkmahjongg-16.12.2.tar.xz";
+      sha256 = "0imj2xv6qcf00dx53h37yq84cqrg806qjfmm836hw6wicw24117f";
+      name = "libkmahjongg-16.12.2.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libkomparediff2-16.12.1.tar.xz";
-      sha256 = "1garymnwcnwrlcpxz9dyh9spqgx91z8cznrxirw22cgz5n6mn1ld";
-      name = "libkomparediff2-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libkomparediff2-16.12.2.tar.xz";
+      sha256 = "02d3bd7miq1nq81z6b4c8c64wjj2z9shr8y0rd0yqlzmf8ma05p2";
+      name = "libkomparediff2-16.12.2.tar.xz";
     };
   };
   libksane = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libksane-16.12.1.tar.xz";
-      sha256 = "0p133qfrd5pmsifmq8064wrw49vrrn27d6543nrg88x9l2d7hi53";
-      name = "libksane-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libksane-16.12.2.tar.xz";
+      sha256 = "0p215qc56ma4laajmql72f8bngi2x88nk1q8ysq0wviadgack885";
+      name = "libksane-16.12.2.tar.xz";
     };
   };
   libksieve = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/libksieve-16.12.1.tar.xz";
-      sha256 = "1qbnd2pwbb39nkdc6v4mrmyiva333b0l2h0x57cxsjw5zbcpx467";
-      name = "libksieve-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/libksieve-16.12.2.tar.xz";
+      sha256 = "1bzd8lfz0d9gnq6kh8k9wrcfbc61mdigy2madn7ywpxpcjp4rp3v";
+      name = "libksieve-16.12.2.tar.xz";
     };
   };
   lokalize = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/lokalize-16.12.1.tar.xz";
-      sha256 = "1cf3zs81p6fqi6dgn12bskldydwm0yqbfvkjqh5h41qzlfky1j7s";
-      name = "lokalize-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/lokalize-16.12.2.tar.xz";
+      sha256 = "03cr89skhwbzq4h6fr78iaziplahpr4i7fvsf8395w6yiwsvcnyk";
+      name = "lokalize-16.12.2.tar.xz";
     };
   };
   lskat = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/lskat-16.12.1.tar.xz";
-      sha256 = "0ldyw445cqgb2bf6ymcpwcrizypldghh611ihr6sa1l1x16238v2";
-      name = "lskat-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/lskat-16.12.2.tar.xz";
+      sha256 = "1jz7bjzw5msz5nyjvr21n3c355598afdnnqc6xzfl9zjkfgx4q9w";
+      name = "lskat-16.12.2.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/mailcommon-16.12.1.tar.xz";
-      sha256 = "18mm2fmyvqs6rlxdgi2fh1vj4b3jjs6vf2jsy4dimw4ghgbag0m2";
-      name = "mailcommon-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/mailcommon-16.12.2.tar.xz";
+      sha256 = "0b9qawglc42y4wd98xaaiqdz7586wabj9zabs3dvk9vs10qpb9p0";
+      name = "mailcommon-16.12.2.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/mailimporter-16.12.1.tar.xz";
-      sha256 = "0ivgyl3bz2vcn6vwshcbxlydlxcsxqhkxzfy9rc690asvn9152cg";
-      name = "mailimporter-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/mailimporter-16.12.2.tar.xz";
+      sha256 = "0dvnqqmmxdca7wmsajhzdxgz1k07dfbac0z1paww4d2inr164b8q";
+      name = "mailimporter-16.12.2.tar.xz";
     };
   };
   marble = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/marble-16.12.1.tar.xz";
-      sha256 = "1hv2qpikskx7n4myfvfh403cjcsrxdd24955743mlnsikbq3rj0s";
-      name = "marble-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/marble-16.12.2.tar.xz";
+      sha256 = "0p7ka2hl0f9ghpmyh124p57dy1ynhw0dszihg4rbbrjfjj65vig0";
+      name = "marble-16.12.2.tar.xz";
     };
   };
   mbox-importer = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/mbox-importer-16.12.1.tar.xz";
-      sha256 = "0jpxrwl3v8fkpx5blbagm1ls9h1j9bd7ac7pm78ihavvm4n4piw6";
-      name = "mbox-importer-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/mbox-importer-16.12.2.tar.xz";
+      sha256 = "00q7x30bl1fwfgwvqmgbspp74bmjm40d30rykq052v1cp6n0c060";
+      name = "mbox-importer-16.12.2.tar.xz";
     };
   };
   messagelib = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/messagelib-16.12.1.tar.xz";
-      sha256 = "054hjrm3z8mslkl5j05ik30bwbn95rrbbrnc5b6jmi937ks57z56";
-      name = "messagelib-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/messagelib-16.12.2.tar.xz";
+      sha256 = "0b65248mc6qamj1wcpv73v1ywda9gk2s2y20vjf35lmv5xi4cz88";
+      name = "messagelib-16.12.2.tar.xz";
     };
   };
   minuet = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/minuet-16.12.1.tar.xz";
-      sha256 = "07jl0n0w34wbnzxwjj6zainkw3gyzkk99p7c21hqkhmiivbk3rab";
-      name = "minuet-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/minuet-16.12.2.tar.xz";
+      sha256 = "1sv9b1lq2dyvlwq0bmmnxak60nz83wbwnw1d8w3n5xadssarbr1s";
+      name = "minuet-16.12.2.tar.xz";
     };
   };
   okteta = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/okteta-16.12.1.tar.xz";
-      sha256 = "08zygqhrz7i1dvb2i6dqpn9zmyr43y2rkdjl43rwlgcj59hd0xvc";
-      name = "okteta-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/okteta-16.12.2.tar.xz";
+      sha256 = "1xq1bjpy7g8qn9d7dfgy00kf5bdcpvj1489b65yrlmyi382m5k7s";
+      name = "okteta-16.12.2.tar.xz";
     };
   };
   okular = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/okular-16.12.1.tar.xz";
-      sha256 = "134afacy3d9hjq2avzp8d0fp3vwlaaxcvf4b65wvkds2zhggi8w3";
-      name = "okular-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/okular-16.12.2.tar.xz";
+      sha256 = "020z6wlycip067j398lznqcspi3b6dx1zds9ibhxw9zzh3ms92kc";
+      name = "okular-16.12.2.tar.xz";
     };
   };
   palapeli = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/palapeli-16.12.1.tar.xz";
-      sha256 = "1kpca4l45c9ydhls1sqqlhca7wv2d0xf33wxa5dmgriivn0s0qym";
-      name = "palapeli-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/palapeli-16.12.2.tar.xz";
+      sha256 = "1vkkq9r9r85x46xx91gqyhpagx1xscrvlkx4knd72rcxfygipzf9";
+      name = "palapeli-16.12.2.tar.xz";
     };
   };
   parley = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/parley-16.12.1.tar.xz";
-      sha256 = "0jxzz9dg3bb1pk8rrfqvjf5aww361wkaiz4xvsfc6vj4333kgzid";
-      name = "parley-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/parley-16.12.2.tar.xz";
+      sha256 = "0fvkhph41y5ig3nwmb4zfh8n3sip52r5al3vn4yll2ndkbwdkgjb";
+      name = "parley-16.12.2.tar.xz";
     };
   };
   picmi = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/picmi-16.12.1.tar.xz";
-      sha256 = "0l9y4h9q032vqham0nlci9kcp143rdaaz9rhwwh0i7mw5p98xg5r";
-      name = "picmi-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/picmi-16.12.2.tar.xz";
+      sha256 = "0j0jhvw8b18sskvd32snk4g7xpjk3kqfw9kpvfri0qayrshcxk2c";
+      name = "picmi-16.12.2.tar.xz";
     };
   };
   pimcommon = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/pimcommon-16.12.1.tar.xz";
-      sha256 = "0hk0p5x78mcxv07x4jpx2d6dh2wxxiqp79vma37g90zlh8p28323";
-      name = "pimcommon-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/pimcommon-16.12.2.tar.xz";
+      sha256 = "1c4h1g6hpa7hw3ka2r561q813if031vriz646skin840jwdhnv7m";
+      name = "pimcommon-16.12.2.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/pim-data-exporter-16.12.1.tar.xz";
-      sha256 = "0qx156jg03xpl62rxsm5lma0z7pr6nrsq5912d6kx1w7zxwizjln";
-      name = "pim-data-exporter-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/pim-data-exporter-16.12.2.tar.xz";
+      sha256 = "14gkkyvcwa7q1yq6qhswq4ch9gcp1ddpjyf46d0550z1rkpws28m";
+      name = "pim-data-exporter-16.12.2.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/pim-sieve-editor-16.12.1.tar.xz";
-      sha256 = "02km83p4h39bl8zm5lf7qypqq6qs1cl0b9ncr0c68b0kd05pfms3";
-      name = "pim-sieve-editor-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/pim-sieve-editor-16.12.2.tar.xz";
+      sha256 = "03a3imm5zs4p6zlp3m0pdc22cii26cnkgl1s1059lhmd3g3dhl85";
+      name = "pim-sieve-editor-16.12.2.tar.xz";
     };
   };
   pim-storage-service-manager = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/pim-storage-service-manager-16.12.1.tar.xz";
-      sha256 = "19mfxxpvx5lz0067ssdmw0xdmznl7jak4rapkawvfwkbk0vsfpd3";
-      name = "pim-storage-service-manager-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/pim-storage-service-manager-16.12.2.tar.xz";
+      sha256 = "1kcbrg9h3c5khyabs5n6adqljj60vks7npb8iy649y0rx2qc2fn9";
+      name = "pim-storage-service-manager-16.12.2.tar.xz";
     };
   };
   poxml = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/poxml-16.12.1.tar.xz";
-      sha256 = "19g964bb96z86ynx7zi3chg1pksvcyrv41qz5qnhlj258a3b9g4m";
-      name = "poxml-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/poxml-16.12.2.tar.xz";
+      sha256 = "17sv19rg1d65h6ks11k7f8zx6yliyhk1j2fxnc81l8md1flarfm0";
+      name = "poxml-16.12.2.tar.xz";
     };
   };
   print-manager = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/print-manager-16.12.1.tar.xz";
-      sha256 = "1vwsd71y3r6w9gix6d5n06j0yv4rw9qgzz1d4nb8axlnmwdnkzy6";
-      name = "print-manager-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/print-manager-16.12.2.tar.xz";
+      sha256 = "1amhl13n7i5z1jfhyrhvigk0bhh9myag7kk83bqkxffsx0lzzwbw";
+      name = "print-manager-16.12.2.tar.xz";
     };
   };
   rocs = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/rocs-16.12.1.tar.xz";
-      sha256 = "0xkkd3hwrnv52074q53wx5agdc75arm2pg80k2ck7vnxl3mpp997";
-      name = "rocs-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/rocs-16.12.2.tar.xz";
+      sha256 = "1gd0wdvp3c4s8br23fqqa0cp2vwfjp3xqkj1y3xf6pzv01sk7n7g";
+      name = "rocs-16.12.2.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/signon-kwallet-extension-16.12.1.tar.xz";
-      sha256 = "1xfmwz3h7acdkj61zq9rwz654lf8z9wfhzlmr1ss530c94isfpjb";
-      name = "signon-kwallet-extension-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/signon-kwallet-extension-16.12.2.tar.xz";
+      sha256 = "187xjbjw9a34p9cjjhijmwg8n7m83qikxa5q8nsffd48pl7pag2i";
+      name = "signon-kwallet-extension-16.12.2.tar.xz";
     };
   };
   spectacle = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/spectacle-16.12.1.tar.xz";
-      sha256 = "1pmpmfzch9d8iapjpgyzy77d9a8zjhafkw52x9mqj0r8ym0kgq2p";
-      name = "spectacle-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/spectacle-16.12.2.tar.xz";
+      sha256 = "1snz8kgnwm2cbfa6y9awb3d0markfmmbgkjs1k0xs938mqam4507";
+      name = "spectacle-16.12.2.tar.xz";
     };
   };
   step = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/step-16.12.1.tar.xz";
-      sha256 = "0ks8mzw9wmp57pkz3mbpnlpa2vsvdhngvj0i2pyvhwzmclifgm03";
-      name = "step-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/step-16.12.2.tar.xz";
+      sha256 = "0ghr054c644hvay0k4xsahrl8bwnd9w8yqq3slrdblhs7z3c7iqk";
+      name = "step-16.12.2.tar.xz";
     };
   };
   svgpart = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/svgpart-16.12.1.tar.xz";
-      sha256 = "0m84z6jm52mvsbb6khajxp8cp52bhyix8s2ssc3j86dhi0n7imbi";
-      name = "svgpart-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/svgpart-16.12.2.tar.xz";
+      sha256 = "0z9a7654f3n5870d02zm8a9dpymc3jxgmf79wavsp8jjr8sdgy6g";
+      name = "svgpart-16.12.2.tar.xz";
     };
   };
   sweeper = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/sweeper-16.12.1.tar.xz";
-      sha256 = "0ds7w70zhnqmyq0b5703sjw3airmfby21vfjl69nqqmsncf8snb4";
-      name = "sweeper-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/sweeper-16.12.2.tar.xz";
+      sha256 = "0g0iw89l27v4ivqzsrv9j1q4dgihk80nvgf2cfagadfd50hmifr4";
+      name = "sweeper-16.12.2.tar.xz";
     };
   };
   syndication = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/syndication-16.12.1.tar.xz";
-      sha256 = "1l1klni18xlgfjlhwc3gdzpkj5gfcmwzwv6f6q731xkjay7rdlqh";
-      name = "syndication-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/syndication-16.12.2.tar.xz";
+      sha256 = "0vgpbr46ibyb097pbqmvpl934d4zwz3gb0fkyc23gwpxq1fgsizp";
+      name = "syndication-16.12.2.tar.xz";
     };
   };
   umbrello = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/umbrello-16.12.1.tar.xz";
-      sha256 = "1f8bsf60y5s5ms9ypgd0865is5xf8fjhsfrp7dg8hi15nmd69k9c";
-      name = "umbrello-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/umbrello-16.12.2.tar.xz";
+      sha256 = "1g4856mvj9vzm3k86nqm9sfynall1wcj3mvnc80jji7aazmpkl6z";
+      name = "umbrello-16.12.2.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.12.1";
+    version = "16.12.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.1/src/zeroconf-ioslave-16.12.1.tar.xz";
-      sha256 = "1r6ls8hsahgbqvailwaz2qwk3m3z3mfwav8g2rwdqk7s3p2fp1cx";
-      name = "zeroconf-ioslave-16.12.1.tar.xz";
+      url = "${mirror}/stable/applications/16.12.2/src/zeroconf-ioslave-16.12.2.tar.xz";
+      sha256 = "1wqiakgc82zylvssxrm2askw6rjw89x85dws7q9zw13hdpvh12ss";
+      name = "zeroconf-ioslave-16.12.2.tar.xz";
     };
   };
 }

From b71985256866d6c119d4101f52c9e0c102250af3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 10:50:33 +0100
Subject: [PATCH 0258/3449] kde5.khotkeys: fix for new frameworks

---
 pkgs/desktops/kde-5/plasma/khotkeys.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/kde-5/plasma/khotkeys.nix
index 760a2a4ee375..97beabc6b513 100644
--- a/pkgs/desktops/kde-5/plasma/khotkeys.nix
+++ b/pkgs/desktops/kde-5/plasma/khotkeys.nix
@@ -1,11 +1,20 @@
 { plasmaPackage, ecm, kdoctools, kcmutils
 , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
 , plasma-framework, plasma-workspace, qtx11extras
+, fetchpatch
 }:
 
 plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [ ecm kdoctools ];
+
+  patches = [
+    # Patch is in 5.9 and up.
+    (fetchpatch {
+      url = "https://cgit.kde.org/khotkeys.git/patch/?id=f8f7eaaf41e2b95ebfa4b2e35c6ee252524a471b";
+      sha256 = "1jpd9zwrvp7pwv6v5cx6aqr2p1zhismpig7xv71wfxi7skfh3389";
+    })
+  ];
   propagatedBuildInputs = [
     kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
     qtx11extras kcmutils kdbusaddons kxmlgui

From af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 13 Feb 2017 09:54:18 +0000
Subject: [PATCH 0259/3449] Azure: switch back to qemu 2.2.0 for generating
 image. Seems to work best.

(cherry picked from commit 2da8a5dac8674501ba9ed10e44650088b466688a)
---
 nixos/modules/virtualisation/azure-image.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 91fae88fc98c..33f84986cac6 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -16,14 +16,14 @@ in
               cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
               size=$(($cyl*255*63*512))              
               roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
-              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
+              ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
               mv closure xchg/
             '';
 
           postVM =
             ''
               mkdir -p $out
-              ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd
+              ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd
               rm $diskImage
             '';
           diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";

From 4af79a73316981a7ba96cfa9501ab210f589a2a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 13 Feb 2017 12:16:39 +0100
Subject: [PATCH 0260/3449] Revert "linux: Apply 9p veryloose patch to 4.9"

This reverts commit a82810c7a7e62848b75739b1cccddca8f1363c75.

Fixes #22695.
---
 pkgs/os-specific/linux/kernel/patches.nix | 6 +++---
 pkgs/top-level/all-packages.nix           | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ea93815e7861..1f528f9412be 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,12 +175,12 @@ rec {
       };
     };
 
-  p9_caching_4_9 = rec
+  p9_caching_4_4 = rec
     { name = "9p-caching.patch";
       patch = fetchpatch {
         inherit name;
-        url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch;
-        sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a";
+        url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
+        sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
       };
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 855de099cbac..0bd5f1e490d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11282,6 +11282,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.p9_caching_4_4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11298,7 +11299,6 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.p9_caching_4_9
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11311,7 +11311,6 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-      kernelPatches.p9_caching_4_9
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill

From a4ec1841da14fc98c5c35cc72242c23bb698d4ac Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 13 Feb 2017 12:18:10 +0100
Subject: [PATCH 0261/3449] VM tests: veryloose -> cache=loose

---
 nixos/modules/virtualisation/qemu-vm.nix | 4 ++--
 pkgs/build-support/vm/default.nix        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index e0b3bb2c683c..56a05028b1d1 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -440,7 +440,7 @@ in
         ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
           { device = "store";
             fsType = "9p";
-            options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp" = mkIf config.boot.tmpOnTmpfs
@@ -453,7 +453,7 @@ in
         "/tmp/xchg" =
           { device = "xchg";
             fsType = "9p";
-            options = [ "trans=virtio" "version=9p2000.L" "veryloose" ];
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp/shared" =
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 36cb068d93d6..461bdd08fb57 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -130,7 +130,7 @@ rec {
 
     echo "mounting Nix store..."
     mkdir -p /fs${storeDir}
-    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose
+    mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
 
     mkdir -p /fs/tmp /fs/run /fs/var
     mount -t tmpfs -o "mode=1777" none /fs/tmp
@@ -139,7 +139,7 @@ rec {
 
     echo "mounting host's temporary directory..."
     mkdir -p /fs/tmp/xchg
-    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose
+    mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose
 
     mkdir -p /fs/proc
     mount -t proc none /fs/proc

From 5d3bb96f622e62062945aa8e70a827449c21f686 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 10:41:07 +0100
Subject: [PATCH 0262/3449] LTS Haskell 8.0

This includes an update to hackage-packages.nix, which was generated by hackage2nix v2.0.4-11-gd82133a
from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/53fcf983669a3f0cdfd795fec28ecb40740a64ca.
---
 .../configuration-hackage2nix.yaml            | 1307 ++-
 .../haskell-modules/hackage-packages.nix      | 9646 +++--------------
 pkgs/top-level/all-packages.nix               |    2 +-
 3 files changed, 2108 insertions(+), 8847 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 634648b91759..0a05cc6ca81a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1,34 +1,34 @@
 # pkgs/development/haskell-modules/configuration-hackage2nix.yaml
 
-compiler: ghc-8.0.1
+compiler: ghc-8.0.2
 
 core-packages:
   - array-0.5.1.1
-  - base-4.9.0.0
+  - base-4.9.1.0
   - binary-0.8.3.0
   - bytestring-0.10.8.1
-  - Cabal-1.24.0.0
+  - Cabal-1.24.2.0
   - containers-0.5.7.1
   - deepseq-1.4.2.0
-  - directory-1.2.6.2
-  - filepath-1.4.1.0
-  - ghc-8.0.1
-  - ghc-boot-8.0.1
-  - ghc-boot-th-8.0.1
+  - directory-1.3.0.0
+  - filepath-1.4.1.1
+  - ghc-8.0.2
+  - ghc-boot-8.0.2
+  - ghc-boot-th-8.0.2
+  - ghci-8.0.2
   - ghc-prim-0.5.0.0
-  - ghci-8.0.1
-  - haskeline-0.7.2.3
+  - haskeline-0.7.3.0
   - hoopl-3.10.2.1
   - hpc-0.6.0.3
   - integer-gmp-1.0.0.1
   - pretty-1.1.3.3
-  - process-1.4.2.0
+  - process-1.4.3.0
   - rts-1.0
-  - template-haskell-2.11.0.0
+  - template-haskell-2.11.1.0
   - terminfo-0.4.0.2
   - time-1.6.0.1
   - transformers-0.5.2.0
-  - unix-2.7.2.0
+  - unix-2.7.2.1
   - xhtml-3000.2.1
 
   # Hack: The following package is a core package of GHCJS. If we don't declare
@@ -37,7 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 7.19
+  # LTS Haskell 8.0
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -46,106 +46,124 @@ default-package-overrides:
   - ace ==0.6
   - acid-state ==0.14.2
   - action-permutations ==0.0.0.1
-  - active ==0.2.0.10
+  - active ==0.2.0.12
   - ad ==4.3.2.1
   - adjunctions ==4.3
   - adler32 ==0.1.1.0
-  - aeson ==0.11.3.0
+  - aeson ==1.0.2.1
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.6
+  - aeson-extra ==0.4.0.0
   - aeson-generic-compat ==0.0.1.0
   - aeson-injector ==1.0.7.0
   - aeson-pretty ==0.8.2
   - aeson-qq ==0.8.1
   - aeson-utils ==0.3.0.2
-  - Agda ==2.5.1.1
+  - Agda ==2.5.2
   - airship ==0.6.0
   - alarmclock ==0.4.0.2
-  - alex ==3.1.7
-  - amazonka ==1.4.3
-  - amazonka-apigateway ==1.4.3
-  - amazonka-application-autoscaling ==1.4.3
-  - amazonka-autoscaling ==1.4.3
-  - amazonka-certificatemanager ==1.4.3
-  - amazonka-cloudformation ==1.4.3
-  - amazonka-cloudfront ==1.4.3
-  - amazonka-cloudhsm ==1.4.3
-  - amazonka-cloudsearch ==1.4.3
-  - amazonka-cloudsearch-domains ==1.4.3
-  - amazonka-cloudtrail ==1.4.3
-  - amazonka-cloudwatch ==1.4.3
-  - amazonka-cloudwatch-events ==1.4.3
-  - amazonka-cloudwatch-logs ==1.4.3
-  - amazonka-codecommit ==1.4.3
-  - amazonka-codedeploy ==1.4.3
-  - amazonka-codepipeline ==1.4.3
-  - amazonka-cognito-identity ==1.4.3
-  - amazonka-cognito-idp ==1.4.3
-  - amazonka-cognito-sync ==1.4.3
-  - amazonka-config ==1.4.3
-  - amazonka-core ==1.4.3
-  - amazonka-datapipeline ==1.4.3
-  - amazonka-devicefarm ==1.4.3
-  - amazonka-directconnect ==1.4.3
-  - amazonka-discovery ==1.4.3
-  - amazonka-dms ==1.4.3
-  - amazonka-ds ==1.4.3
-  - amazonka-dynamodb ==1.4.3
-  - amazonka-dynamodb-streams ==1.4.3
-  - amazonka-ec2 ==1.4.3
-  - amazonka-ecr ==1.4.3
-  - amazonka-ecs ==1.4.3
-  - amazonka-efs ==1.4.3
-  - amazonka-elasticache ==1.4.3
-  - amazonka-elasticbeanstalk ==1.4.3
-  - amazonka-elasticsearch ==1.4.3
-  - amazonka-elastictranscoder ==1.4.3
-  - amazonka-elb ==1.4.3
-  - amazonka-emr ==1.4.3
-  - amazonka-gamelift ==1.4.3
-  - amazonka-glacier ==1.4.3
-  - amazonka-iam ==1.4.3
-  - amazonka-importexport ==1.4.3
-  - amazonka-inspector ==1.4.3
-  - amazonka-iot ==1.4.3
-  - amazonka-iot-dataplane ==1.4.3
-  - amazonka-kinesis ==1.4.3
-  - amazonka-kinesis-firehose ==1.4.3
-  - amazonka-kms ==1.4.3
-  - amazonka-lambda ==1.4.3
-  - amazonka-marketplace-analytics ==1.4.3
-  - amazonka-marketplace-metering ==1.4.3
-  - amazonka-ml ==1.4.3
-  - amazonka-opsworks ==1.4.3
-  - amazonka-rds ==1.4.3
-  - amazonka-redshift ==1.4.3
-  - amazonka-route53 ==1.4.3
-  - amazonka-route53-domains ==1.4.3
-  - amazonka-s3 ==1.4.3
-  - amazonka-sdb ==1.4.3
-  - amazonka-ses ==1.4.3
-  - amazonka-sns ==1.4.3
-  - amazonka-sqs ==1.4.3
-  - amazonka-ssm ==1.4.3
-  - amazonka-storagegateway ==1.4.3
-  - amazonka-sts ==1.4.3
-  - amazonka-support ==1.4.3
-  - amazonka-swf ==1.4.3
-  - amazonka-test ==1.4.3
-  - amazonka-waf ==1.4.3
-  - amazonka-workspaces ==1.4.3
+  - alex ==3.2.1
+  - alternators ==0.1.1.0
+  - ALUT ==2.4.0.2
+  - amazonka ==1.4.5
+  - amazonka-apigateway ==1.4.5
+  - amazonka-application-autoscaling ==1.4.5
+  - amazonka-appstream ==1.4.5
+  - amazonka-autoscaling ==1.4.5
+  - amazonka-budgets ==1.4.5
+  - amazonka-certificatemanager ==1.4.5
+  - amazonka-cloudformation ==1.4.5
+  - amazonka-cloudfront ==1.4.5
+  - amazonka-cloudhsm ==1.4.5
+  - amazonka-cloudsearch ==1.4.5
+  - amazonka-cloudsearch-domains ==1.4.5
+  - amazonka-cloudtrail ==1.4.5
+  - amazonka-cloudwatch ==1.4.5
+  - amazonka-cloudwatch-events ==1.4.5
+  - amazonka-cloudwatch-logs ==1.4.5
+  - amazonka-codebuild ==1.4.5
+  - amazonka-codecommit ==1.4.5
+  - amazonka-codedeploy ==1.4.5
+  - amazonka-codepipeline ==1.4.5
+  - amazonka-cognito-identity ==1.4.5
+  - amazonka-cognito-idp ==1.4.5
+  - amazonka-cognito-sync ==1.4.5
+  - amazonka-config ==1.4.5
+  - amazonka-core ==1.4.5
+  - amazonka-datapipeline ==1.4.5
+  - amazonka-devicefarm ==1.4.5
+  - amazonka-directconnect ==1.4.5
+  - amazonka-discovery ==1.4.5
+  - amazonka-dms ==1.4.5
+  - amazonka-ds ==1.4.5
+  - amazonka-dynamodb ==1.4.5
+  - amazonka-dynamodb-streams ==1.4.5
+  - amazonka-ec2 ==1.4.5
+  - amazonka-ecr ==1.4.5
+  - amazonka-ecs ==1.4.5
+  - amazonka-efs ==1.4.5
+  - amazonka-elasticache ==1.4.5
+  - amazonka-elasticbeanstalk ==1.4.5
+  - amazonka-elasticsearch ==1.4.5
+  - amazonka-elastictranscoder ==1.4.5
+  - amazonka-elb ==1.4.5
+  - amazonka-elbv2 ==1.4.5
+  - amazonka-emr ==1.4.5
+  - amazonka-gamelift ==1.4.5
+  - amazonka-glacier ==1.4.5
+  - amazonka-health ==1.4.5
+  - amazonka-iam ==1.4.5
+  - amazonka-importexport ==1.4.5
+  - amazonka-inspector ==1.4.5
+  - amazonka-iot ==1.4.5
+  - amazonka-iot-dataplane ==1.4.5
+  - amazonka-kinesis ==1.4.5
+  - amazonka-kinesis-analytics ==1.4.5
+  - amazonka-kinesis-firehose ==1.4.5
+  - amazonka-kms ==1.4.5
+  - amazonka-lambda ==1.4.5
+  - amazonka-lightsail ==1.4.5
+  - amazonka-marketplace-analytics ==1.4.5
+  - amazonka-marketplace-metering ==1.4.5
+  - amazonka-ml ==1.4.5
+  - amazonka-opsworks ==1.4.5
+  - amazonka-opsworks-cm ==1.4.5
+  - amazonka-pinpoint ==1.4.5
+  - amazonka-polly ==1.4.5
+  - amazonka-rds ==1.4.5
+  - amazonka-redshift ==1.4.5
+  - amazonka-rekognition ==1.4.5
+  - amazonka-route53 ==1.4.5
+  - amazonka-route53-domains ==1.4.5
+  - amazonka-s3 ==1.4.5
+  - amazonka-s3-streaming ==0.1.0.4
+  - amazonka-sdb ==1.4.5
+  - amazonka-servicecatalog ==1.4.5
+  - amazonka-ses ==1.4.5
+  - amazonka-shield ==1.4.5
+  - amazonka-sms ==1.4.5
+  - amazonka-snowball ==1.4.5
+  - amazonka-sns ==1.4.5
+  - amazonka-sqs ==1.4.5
+  - amazonka-ssm ==1.4.5
+  - amazonka-stepfunctions ==1.4.5
+  - amazonka-storagegateway ==1.4.5
+  - amazonka-sts ==1.4.5
+  - amazonka-support ==1.4.5
+  - amazonka-swf ==1.4.5
+  - amazonka-test ==1.4.5
+  - amazonka-waf ==1.4.5
+  - amazonka-workspaces ==1.4.5
+  - amazonka-xray ==1.4.5
   - amqp ==0.14.1
-  - angel ==0.6.2
   - annotated-wl-pprint ==0.7.0
-  - anonymous-sums ==0.4.0.0
+  - anonymous-sums ==0.6.0.0
   - ansi-terminal ==0.6.2.3
   - ansi-wl-pprint ==0.6.7.3
-  - ansigraph ==0.2.0.0
-  - api-field-json-th ==0.1.0.1
+  - ansigraph ==0.3.0.2
   - app-settings ==0.2.0.10
   - appar ==0.1.4
-  - apply-refact ==0.3.0.0
   - arbtt ==0.9.0.12
   - arithmoi ==0.4.3.0
   - array-memoize ==0.6.0
@@ -157,24 +175,29 @@ default-package-overrides:
   - asn1-types ==0.3.2
   - async ==2.1.1
   - async-dejafu ==0.1.3.0
-  - atndapi ==0.1.1.0
-  - atom-conduit ==0.3.1.2
+  - async-extra ==0.1.0.0
+  - atom-basic ==0.2.4
+  - atom-conduit ==0.4.0.1
   - atomic-primops ==0.8.0.4
   - atomic-write ==0.2.0.5
   - attoparsec ==0.13.1.0
   - attoparsec-binary ==0.2
   - attoparsec-expr ==0.1.1.2
   - authenticate ==1.3.3.2
-  - authenticate-oauth ==1.5.1.2
+  - authenticate-oauth ==1.6
   - auto ==0.4.3.1
   - auto-update ==0.1.4
-  - autoexporter ==0.2.3
-  - aws ==0.14.1
+  - autoexporter ==1.0.0
+  - avers ==0.0.17.1
+  - avers-api ==0.0.18.0
+  - avers-api-docs ==0.0.18.0
+  - avers-server ==0.0.18.0
+  - avwx ==0.3.0.2
   - b9 ==0.5.31
-  - bake ==0.4
+  - bake ==0.5
   - bank-holidays-england ==0.1.0.5
   - base-compat ==0.9.1
-  - base-noprelude ==4.9.0.0
+  - base-noprelude ==4.9.1.0
   - base-orphans ==0.5.4
   - base-prelude ==1.0.1.1
   - base-unicode-symbols ==0.2.2.4
@@ -193,9 +216,11 @@ default-package-overrides:
   - bimap-server ==0.1.0.1
   - binary-bits ==0.5
   - binary-conduit ==1.2.4.1
+  - binary-ieee754 ==0.1.0.0
   - binary-list ==1.1.1.2
   - binary-orphans ==0.1.6.0
   - binary-parser ==0.5.2
+  - binary-parsers ==0.2.3.0
   - binary-search ==1.0.0.3
   - binary-tagged ==0.1.4.2
   - binary-typed ==1.0
@@ -208,15 +233,13 @@ default-package-overrides:
   - biofasta ==0.0.3
   - biofastq ==0.1
   - biopsl ==0.4
-  - bitcoin-api ==0.12.1
-  - bitcoin-api-extra ==0.9.1
+  - bitarray ==0.0.1.1
   - bitcoin-block ==0.13.1
-  - bitcoin-payment-channel ==0.3.0.1
   - bitcoin-script ==0.11.1
   - bitcoin-tx ==0.13.1
   - bitcoin-types ==0.9.2
   - bits ==0.5
-  - bitx-bitcoin ==0.10.0.0
+  - bitx-bitcoin ==0.11.0.0
   - blake2 ==0.2.0
   - blank-canvas ==0.6
   - BlastHTTP ==1.2.1
@@ -227,23 +250,29 @@ default-package-overrides:
   - blaze-markup ==0.7.1.1
   - blaze-svg ==0.3.6
   - blaze-textual ==0.2.1.0
-  - bloodhound ==0.11.0.0
-  - blosum ==0.1.1.2
+  - BlogLiterately ==0.8.4.3
+  - BlogLiterately-diagrams ==0.2.0.5
+  - bloodhound ==0.12.1.0
+  - blosum ==0.1.1.4
   - bmp ==1.2.6.3
+  - bool-extras ==0.4.0
   - Boolean ==0.2.3
+  - boolean-like ==0.1.1.0
   - boolsimplifier ==0.1.8
   - boomerang ==1.4.5.2
   - both ==0.1.1.0
   - BoundedChan ==1.0.3.0
   - boundingboxes ==0.2.3
-  - bower-json ==0.8.1
+  - bower-json ==1.0.0.1
   - boxes ==0.1.4
+  - brick ==0.17
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
-  - btrfs ==0.1.2.0
+  - btrfs ==0.1.2.3
+  - buffer-builder ==0.2.4.4
   - bumper ==0.6.0.3
-  - bustle ==0.5.4
+  - bv ==0.4.1
   - byteable ==0.1.1
   - bytedump ==1.0
   - byteorder ==1.0.4
@@ -260,28 +289,26 @@ default-package-overrides:
   - bzlib-conduit ==0.2.1.4
   - c2hs ==0.28.1
   - Cabal ==1.24.2.0
-  - cabal-dependency-licenses ==0.1.2.0
+  - cabal-dependency-licenses ==0.2.0.0
   - cabal-doctest ==1
   - cabal-file-th ==0.2.4
   - cabal-helper ==0.7.3.0
-  - cabal-rpm ==0.10.1
-  - cabal-sort ==0.0.5.3
-  - cabal-src ==0.3.0.2
+  - cabal-rpm ==0.11
   - cache ==0.1.0.0
-  - cacophony ==0.8.0
+  - cacophony ==0.9.1
   - cairo ==0.13.3.1
   - call-stack ==0.1.0
-  - camfort ==0.900
+  - camfort ==0.901
   - carray ==0.1.6.5
   - cartel ==0.18.0.2
   - case-insensitive ==1.2.0.7
   - cased ==0.1.0.0
-  - cases ==0.1.3.1
+  - cases ==0.1.3.2
   - cassava ==0.4.5.1
-  - cassava-conduit ==0.3.2
+  - cassava-conduit ==0.3.5.1
   - cassava-megaparsec ==0.1.0
   - cassette ==0.1.0
-  - cayley-client ==0.2.1.1
+  - cayley-client ==0.4.0
   - cereal ==0.5.4.0
   - cereal-conduit ==0.7.3
   - cereal-text ==0.1.0.2
@@ -293,6 +320,7 @@ default-package-overrides:
   - Chart ==1.8.1
   - Chart-cairo ==1.8.1
   - Chart-diagrams ==1.8.1
+  - chart-unit ==0.1.0.0
   - ChasingBottoms ==1.3.1.2
   - cheapskate ==0.1.0.5
   - cheapskate-highlight ==0.1.0.0
@@ -300,7 +328,7 @@ default-package-overrides:
   - check-email ==1.0
   - checkers ==0.4.6
   - chell ==0.4.0.1
-  - chell-quickcheck ==0.2.5
+  - choice ==0.2.0
   - chunked-data ==0.3.0
   - cipher-aes ==0.2.11
   - cipher-aes128 ==0.7.0.3
@@ -309,27 +337,30 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.5
-  - clash-lib ==0.6.21
-  - clash-prelude ==0.10.14
-  - clash-systemverilog ==0.6.10
-  - clash-verilog ==0.6.10
-  - clash-vhdl ==0.6.16
-  - classy-prelude ==1.0.2
-  - classy-prelude-conduit ==1.0.2
-  - classy-prelude-yesod ==1.0.2
-  - clay ==0.11
-  - clckwrks ==0.23.19.2
+  - clang-pure ==0.2.0.2
+  - clash-ghc ==0.7.0.1
+  - clash-lib ==0.7
+  - clash-prelude ==0.11
+  - clash-systemverilog ==0.7
+  - clash-verilog ==0.7
+  - clash-vhdl ==0.7
+  - classy-prelude ==1.2.0
+  - classy-prelude-conduit ==1.2.0
+  - classy-prelude-yesod ==1.2.0
+  - clay ==0.12.1
+  - clckwrks ==0.24.0.3
   - clckwrks-cli ==0.2.17.1
-  - clckwrks-plugin-media ==0.6.16.2
-  - clckwrks-plugin-page ==0.4.3.5
+  - clckwrks-plugin-media ==0.6.16.3
+  - clckwrks-plugin-page ==0.4.3.9
   - clckwrks-theme-bootstrap ==0.4.2.1
   - cli ==0.1.2
   - clientsession ==0.9.1.2
   - Clipboard ==2.3.1.0
   - clock ==0.7.2
+  - clock-extras ==0.1.0.2
   - clumpiness ==0.17.0.0
-  - ClustalParser ==1.1.4
-  - clustering ==0.2.1
+  - ClustalParser ==1.2.1
+  - clustering ==0.3.1
   - cmark ==0.5.5
   - cmark-highlight ==0.2.0.0
   - cmark-lucid ==0.1.0.0
@@ -337,22 +368,21 @@ default-package-overrides:
   - code-builder ==0.1.3
   - code-page ==0.1.1
   - codo-notation ==0.5.2
+  - colorful-monoids ==0.2.1.0
   - colour ==2.3.3
   - commutative ==0.0.1.4
   - comonad ==5
   - comonad-transformers ==4.0
   - comonads-fd ==4.0
   - compactmap ==0.1.4.2
-  - compdata ==0.10.1
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
-  - concatenative ==1.0.1
   - concurrency ==1.0.0.0
-  - concurrent-extra ==0.7.0.10
   - concurrent-output ==1.7.8
   - concurrent-supply ==0.1.8
-  - conduit ==1.2.8
-  - conduit-combinators ==1.0.8.3
+  - conduit ==1.2.9
+  - conduit-combinators ==1.1.0
+  - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.15
   - conduit-iconv ==0.1.1.1
   - conduit-parse ==0.1.2.0
@@ -361,31 +391,35 @@ default-package-overrides:
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - connection ==0.2.7
-  - constraints ==0.8
-  - consul-haskell ==0.3
+  - console-style ==0.0.2.1
+  - constraints ==0.9
+  - consul-haskell ==0.4.2
   - containers-unicode-symbols ==0.3.1.1
-  - continued-fractions ==0.9.1.1
   - contravariant ==1.4
   - contravariant-extras ==0.3.3.1
   - control-bool ==0.2.1
   - control-monad-free ==0.6.1
   - control-monad-loop ==0.1
   - control-monad-omega ==0.3.1
-  - converge ==0.1.0.1
+  - convert-annotation ==0.5.0.1
   - convertible ==1.1.1.0
   - cookie ==0.4.2.1
   - countable ==1.0
   - courier ==0.1.1.4
-  - cpphs ==1.20.2
+  - cpphs ==1.20.3
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
-  - crackNum ==1.5
-  - criterion ==1.1.1.0
-  - cron ==0.4.2
+  - cpuinfo ==0.1.0.1
+  - cql ==3.1.1
+  - cql-io ==0.16.0
+  - crackNum ==1.9
+  - criterion ==1.1.4.0
+  - cron ==0.5.0
   - crypto-api ==0.13.2
   - crypto-api-tests ==0.3
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
+  - crypto-enigma ==0.0.2.8
   - crypto-numbers ==0.2.7
   - crypto-pubkey ==0.2.8
   - crypto-pubkey-types ==0.4.3
@@ -400,12 +434,16 @@ default-package-overrides:
   - cryptohash-sha256 ==0.11.100.1
   - cryptol ==2.4.0
   - cryptonite ==0.21
-  - cryptonite-conduit ==0.1
+  - cryptonite-conduit ==0.2.0
+  - cryptonite-openssl ==0.5
   - css-syntax ==0.0.5
   - css-text ==0.1.2.2
   - csv ==0.1.2
+  - csv-conduit ==0.6.7
   - ctrie ==0.1.1.0
+  - cubicbezier ==0.5.0.0
   - cubicspline ==0.1.2
+  - cue-sheet ==0.1.0
   - curl ==1.3.8
   - darcs ==2.12.5
   - data-accessor ==0.2.2.7
@@ -421,39 +459,39 @@ default-package-overrides:
   - data-inttrie ==0.1.2
   - data-lens-light ==0.1.2.2
   - data-memocombinators ==0.5.1
+  - data-msgpack ==0.0.9
   - data-or ==1.0.0.5
   - data-ordlist ==0.4.7.0
   - data-reify ==0.6.1
+  - datasets ==0.2.1
   - dataurl ==0.1.0.0
   - DAV ==1.3.1
   - dawg-ord ==0.5.1.0
-  - dbus ==0.10.12
   - debian-build ==0.10.1.0
   - Decimal ==0.4.2
-  - declarative ==0.2.3
+  - declarative ==0.5.1
   - deepseq-generics ==0.2.0.0
   - dejafu ==0.4.0.0
   - dependent-map ==0.2.4.0
-  - dependent-sum ==0.3.2.2
-  - dependent-sum-template ==0.0.0.5
-  - derive ==2.5.26
+  - dependent-sum ==0.4
   - deriving-compat ==0.3.5
   - descriptive ==0.9.4
-  - diagrams ==1.3.0.1
-  - diagrams-cairo ==1.3.1.1
-  - diagrams-canvas ==1.3.0.6
-  - diagrams-contrib ==1.3.0.12
-  - diagrams-core ==1.3.0.8
-  - diagrams-gtk ==1.3.0.2
-  - diagrams-html5 ==1.3.0.7
-  - diagrams-lib ==1.3.1.4
-  - diagrams-postscript ==1.3.0.7
-  - diagrams-rasterific ==1.3.1.8
+  - diagrams ==1.4
+  - diagrams-builder ==0.8.0.1
+  - diagrams-cairo ==1.4
+  - diagrams-canvas ==1.4
+  - diagrams-contrib ==1.4.0.1
+  - diagrams-core ==1.4
+  - diagrams-gtk ==1.4
+  - diagrams-html5 ==1.4
+  - diagrams-lib ==1.4.0.1
+  - diagrams-postscript ==1.4
+  - diagrams-rasterific ==1.4
   - diagrams-solve ==0.1.0.1
-  - diagrams-svg ==1.4.0.3
+  - diagrams-svg ==1.4.1
   - dice ==0.1
   - Diff ==0.3.4
-  - diff3 ==0.2.0.3
+  - diff3 ==0.3.0
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.0.1.3
@@ -461,23 +499,29 @@ default-package-overrides:
   - directory-tree ==0.12.1
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
+  - distance ==0.1.0.0
   - distributed-closure ==0.3.3.0
+  - distributed-process ==0.6.6
+  - distributed-process-simplelocalnet ==0.2.3.3
   - distributed-static ==0.3.5.0
   - distribution-nixpkgs ==1.0.0.1
   - distributive ==0.5.2
-  - diversity ==0.8.0.1
+  - diversity ==0.8.0.2
   - djinn-ghc ==0.0.2.3
   - djinn-lib ==0.0.1.2
   - dlist ==0.8.0.2
   - dlist-instances ==0.1.1.1
+  - dmenu ==0.3.1.1
+  - dmenu-pkill ==0.1.0.1
+  - dmenu-pmount ==0.1.0.1
+  - dmenu-search ==0.1.0.1
   - dns ==2.0.10
   - do-list ==1.0.1
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
+  - doctemplates ==0.1.0.2
   - doctest ==0.11.1
   - doctest-discover ==0.1.0.7
-  - doctest-prop ==0.2.0.1
-  - docvim ==0.3.2.1
   - dotenv ==0.3.1.0
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
@@ -486,13 +530,14 @@ default-package-overrides:
   - drawille ==0.1.2.0
   - DRBG ==0.5.5
   - drifter ==0.2.2
-  - drifter-postgresql ==0.0.2
+  - drifter-postgresql ==0.1.0
   - dual-tree ==0.2.0.9
   - dynamic-state ==0.2.2.0
   - dyre ==0.8.12
   - Earley ==0.11.0.1
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
+  - echo ==0.1.3
   - ed25519 ==0.0.5.0
   - ede ==0.2.8.7
   - EdisonAPI ==1.3.1
@@ -505,26 +550,34 @@ default-package-overrides:
   - ekg ==0.4.0.12
   - ekg-core ==0.1.1.1
   - ekg-json ==0.1.0.4
+  - ekg-statsd ==0.2.1.0
   - elerea ==2.9.0
-  - elm-bridge ==0.3.0.2
+  - elm-bridge ==0.4.0
   - elm-core-sources ==1.0.0
+  - elm-export ==0.6.0.1
+  - elm-export-persistent ==0.1.2
   - email-validate ==2.2.0
-  - emailaddress ==0.1.6.0
+  - emailaddress ==0.2.0.0
   - enclosed-exceptions ==1.0.2
   - encoding-io ==0.0.1
+  - EntrezHTTP ==1.0.3
   - entropy ==0.3.7
   - enummapset-th ==0.6.1.1
-  - envelope ==0.1.0.0
+  - envelope ==0.2.1.0
+  - envparse ==0.4
+  - envy ==1.3.0.1
+  - epub-metadata ==4.5
   - eq ==4.0.4
-  - equivalence ==0.3.1
+  - equivalence ==0.3.2
   - erf ==2.0.0.0
   - errors ==2.1.3
   - ersatz ==0.3.1
+  - esqueleto ==2.5.1
   - etcd ==1.0.5
   - ether ==0.4.0.2
   - euphoria ==0.8.0.0
   - event ==0.1.4
-  - eventstore ==0.13.1.2
+  - eventstore ==0.14.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.2
   - exception-mtl ==0.4.0.1
@@ -533,28 +586,26 @@ default-package-overrides:
   - exceptions ==0.8.3
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3
-  - exp-pairs ==0.1.5.1
+  - exhaustive ==1.1.3
+  - exp-pairs ==0.1.5.2
   - expiring-cache-map ==0.0.6.1
-  - explicit-exception ==0.1.8
   - extensible ==0.3.7
   - extensible-effects ==1.11.0.4
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.4.10
-  - extract-dependencies ==0.2.0.1
+  - extra ==1.5.1
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
   - fast-builder ==0.0.0.6
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.10
-  - fasta ==0.10.4.0
-  - fay ==0.23.1.12
+  - fasta ==0.10.4.1
+  - fay ==0.23.1.16
   - fay-base ==0.20.0.1
   - fay-builder ==0.2.0.5
   - fay-dom ==0.5.0.1
   - fay-jquery ==0.6.1.0
   - fay-text ==0.3.2.2
   - fay-uri ==0.2.0.0
-  - fb ==1.0.13
   - fclabels ==2.0.3.2
   - feature-flags ==0.1.0.1
   - feed ==0.3.12.0
@@ -567,15 +618,17 @@ default-package-overrides:
   - filecache ==0.2.9
   - filelock ==0.1.0.1
   - filemanip ==0.3.6.3
-  - find-clumpiness ==0.2.0.1
-  - FindBin ==0.0.5
   - fingertree ==0.1.1.0
   - fingertree-psqueue ==0.3
+  - finite-typelits ==0.1.1.0
   - fixed ==0.2.1.1
-  - fixed-vector ==0.8.1.0
+  - fixed-vector ==0.9.0.0
   - fixed-vector-hetero ==0.3.1.1
-  - flat-mcmc ==1.0.1
+  - flac ==0.1.1
+  - flac-picture ==0.1.0
+  - flat-mcmc ==1.5.0
   - flexible-defaults ==0.0.1.2
+  - FloatingHex ==0.4
   - flock ==0.3.1.8
   - flow ==1.0.7
   - fmlist ==0.9
@@ -584,43 +637,44 @@ default-package-overrides:
   - fold-debounce ==0.2.0.5
   - fold-debounce-conduit ==0.1.0.5
   - foldl ==1.2.3
+  - foldl-statistics ==0.1.4.2
+  - folds ==0.7.1
   - FontyFruity ==0.5.3.2
   - force-layout ==0.4.0.6
-  - forecast-io ==0.2.0.0
   - foreign-store ==0.2
+  - format-numbers ==0.1.0.0
   - formatting ==6.2.4
   - fortran-src ==0.1.0.4
   - Frames ==0.1.9
   - free ==4.12.4
   - free-vl ==0.1.4
   - freenect ==1.2.1
-  - freer ==0.2.4.1
   - friendly-time ==0.4
   - frisby ==0.2
+  - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.2.1
   - fsnotify-conduit ==0.1.0.0
   - funcmp ==1.8
   - fuzzcheck ==0.1.1
-  - gamma ==0.9.0.2
   - gd ==3000.7.3
   - Genbank ==1.0.3
   - generic-aeson ==0.2.0.8
   - generic-deriving ==1.11.1
+  - generic-random ==0.4.0.0
   - generic-xmlpickler ==0.1.0.5
   - GenericPretty ==1.2.1
   - generics-eot ==0.2.1.1
   - generics-sop ==0.2.4.0
   - generics-sop-lens ==0.1.2.1
   - geniplate-mirror ==0.7.4
-  - genvalidity ==0.2.0.4
-  - genvalidity-hspec ==0.2.0.5
   - getopt-generics ==0.13
   - ghc-events ==0.4.4.0
-  - ghc-exactprint ==0.5.2.1
+  - ghc-exactprint ==0.5.3.0
   - ghc-heap-view ==0.5.7
-  - ghc-mod ==5.6.0.0
+  - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
+  - ghc-prof ==1.3.0.2
   - ghc-syb-utils ==0.2.3
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.2
@@ -629,138 +683,145 @@ default-package-overrides:
   - ghcid ==0.6.6
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-hplay ==0.3.4.2
-  - ghcjs-perch ==0.3.3
-  - gi-atk ==2.0.3
-  - gi-cairo ==1.0.3
-  - gi-gdk ==3.0.3
-  - gi-gdkpixbuf ==2.0.3
-  - gi-gio ==2.0.3
-  - gi-glib ==2.0.3
-  - gi-gobject ==2.0.3
-  - gi-gtk ==3.0.3
-  - gi-javascriptcore ==3.0.3
-  - gi-pango ==1.0.3
-  - gi-soup ==2.4.3
-  - gi-webkit ==3.0.3
+  - ghcjs-perch ==0.3.3.1
+  - gi-atk ==2.0.11
+  - gi-cairo ==1.0.11
+  - gi-gdk ==3.0.11
+  - gi-gdkpixbuf ==2.0.11
+  - gi-gio ==2.0.11
+  - gi-glib ==2.0.11
+  - gi-gobject ==2.0.11
+  - gi-gtk ==3.0.11
+  - gi-javascriptcore ==3.0.11
+  - gi-pango ==1.0.11
+  - gi-soup ==2.4.11
+  - gi-webkit ==3.0.11
+  - ginger ==0.3.9.1
   - gio ==0.13.3.1
   - gipeda ==0.3.3.1
-  - giphy-api ==0.4.0.0
-  - git-fmt ==0.4.1.0
+  - giphy-api ==0.5.2.0
+  - github ==0.15.0
+  - github-release ==1.0.1
   - github-types ==0.2.1
   - github-webhook-handler ==0.0.8
+  - github-webhook-handler-snap ==0.0.7
   - gitlib ==3.1.1
   - gitlib-libgit2 ==3.1.1
   - gitlib-test ==3.1.0.3
   - gitrev ==1.2.0
   - gitson ==0.5.2
-  - gl ==0.7.8.1
-  - glabrous ==0.1.3.0
+  - glabrous ==0.3.1
+  - glaze ==0.2.0.2
+  - glazier ==0.7.0.0
+  - glazier-pipes ==0.1.4.0
   - GLFW-b ==1.4.8.1
   - glib ==0.13.4.1
   - Glob ==0.7.14
+  - glob-posix ==0.1.0.1
   - gloss ==1.10.2.5
   - gloss-rendering ==1.10.3.5
   - GLURaw ==2.0.0.3
   - GLUT ==2.7.0.11
-  - gogol ==0.1.0
-  - gogol-adexchange-buyer ==0.1.0
-  - gogol-adexchange-seller ==0.1.0
-  - gogol-admin-datatransfer ==0.1.0
-  - gogol-admin-directory ==0.1.0
-  - gogol-admin-emailmigration ==0.1.0
-  - gogol-admin-reports ==0.1.0
-  - gogol-adsense ==0.1.0
-  - gogol-adsense-host ==0.1.0
-  - gogol-affiliates ==0.1.0
-  - gogol-analytics ==0.1.0
-  - gogol-android-enterprise ==0.1.0
-  - gogol-android-publisher ==0.1.0
-  - gogol-appengine ==0.1.0
-  - gogol-apps-activity ==0.1.0
-  - gogol-apps-calendar ==0.1.0
-  - gogol-apps-licensing ==0.1.0
-  - gogol-apps-reseller ==0.1.0
-  - gogol-apps-tasks ==0.1.0
-  - gogol-appstate ==0.1.0
-  - gogol-autoscaler ==0.1.0
-  - gogol-bigquery ==0.1.0
-  - gogol-billing ==0.1.0
-  - gogol-blogger ==0.1.0
-  - gogol-books ==0.1.0
-  - gogol-civicinfo ==0.1.0
-  - gogol-classroom ==0.1.0
-  - gogol-cloudmonitoring ==0.1.0
-  - gogol-cloudtrace ==0.1.0
-  - gogol-compute ==0.1.0
-  - gogol-container ==0.1.0
-  - gogol-core ==0.1.0
-  - gogol-customsearch ==0.1.0
-  - gogol-dataflow ==0.1.0
-  - gogol-dataproc ==0.1.0
-  - gogol-datastore ==0.1.0
-  - gogol-debugger ==0.1.0
-  - gogol-deploymentmanager ==0.1.0
-  - gogol-dfareporting ==0.1.0
-  - gogol-discovery ==0.1.0
-  - gogol-dns ==0.1.0
-  - gogol-doubleclick-bids ==0.1.0
-  - gogol-doubleclick-search ==0.1.0
-  - gogol-drive ==0.1.0
-  - gogol-firebase-rules ==0.1.0
-  - gogol-fitness ==0.1.0
-  - gogol-fonts ==0.1.0
-  - gogol-freebasesearch ==0.1.0
-  - gogol-fusiontables ==0.1.0
-  - gogol-games ==0.1.0
-  - gogol-games-configuration ==0.1.0
-  - gogol-games-management ==0.1.0
-  - gogol-genomics ==0.1.0
-  - gogol-gmail ==0.1.0
-  - gogol-groups-migration ==0.1.0
-  - gogol-groups-settings ==0.1.0
-  - gogol-identity-toolkit ==0.1.0
-  - gogol-kgsearch ==0.1.0
-  - gogol-latencytest ==0.1.0
-  - gogol-logging ==0.1.0
-  - gogol-maps-coordinate ==0.1.0
-  - gogol-maps-engine ==0.1.0
-  - gogol-mirror ==0.1.0
-  - gogol-monitoring ==0.1.0
-  - gogol-oauth2 ==0.1.0
-  - gogol-pagespeed ==0.1.0
-  - gogol-partners ==0.1.0
-  - gogol-people ==0.1.0
-  - gogol-play-moviespartner ==0.1.0
-  - gogol-plus ==0.1.0
-  - gogol-plus-domains ==0.1.0
-  - gogol-prediction ==0.1.0
-  - gogol-proximitybeacon ==0.1.0
-  - gogol-pubsub ==0.1.0
-  - gogol-qpxexpress ==0.1.0
-  - gogol-replicapool ==0.1.0
-  - gogol-replicapool-updater ==0.1.0
-  - gogol-resourcemanager ==0.1.0
-  - gogol-resourceviews ==0.1.0
-  - gogol-script ==0.1.0
-  - gogol-sheets ==0.1.0
-  - gogol-shopping-content ==0.1.0
-  - gogol-siteverification ==0.1.0
-  - gogol-spectrum ==0.1.0
-  - gogol-sqladmin ==0.1.0
-  - gogol-storage ==0.1.0
-  - gogol-storage-transfer ==0.1.0
-  - gogol-tagmanager ==0.1.0
-  - gogol-taskqueue ==0.1.0
-  - gogol-translate ==0.1.0
-  - gogol-urlshortener ==0.1.0
-  - gogol-useraccounts ==0.1.0
-  - gogol-vision ==0.1.0
-  - gogol-webmaster-tools ==0.1.0
-  - gogol-youtube ==0.1.0
-  - gogol-youtube-analytics ==0.1.0
-  - gogol-youtube-reporting ==0.1.0
+  - gogol ==0.1.1
+  - gogol-adexchange-buyer ==0.1.1
+  - gogol-adexchange-seller ==0.1.1
+  - gogol-admin-datatransfer ==0.1.1
+  - gogol-admin-directory ==0.1.1
+  - gogol-admin-emailmigration ==0.1.1
+  - gogol-admin-reports ==0.1.1
+  - gogol-adsense ==0.1.1
+  - gogol-adsense-host ==0.1.1
+  - gogol-affiliates ==0.1.1
+  - gogol-analytics ==0.1.1
+  - gogol-android-enterprise ==0.1.1
+  - gogol-android-publisher ==0.1.1
+  - gogol-appengine ==0.1.1
+  - gogol-apps-activity ==0.1.1
+  - gogol-apps-calendar ==0.1.1
+  - gogol-apps-licensing ==0.1.1
+  - gogol-apps-reseller ==0.1.1
+  - gogol-apps-tasks ==0.1.1
+  - gogol-appstate ==0.1.1
+  - gogol-autoscaler ==0.1.1
+  - gogol-bigquery ==0.1.1
+  - gogol-billing ==0.1.1
+  - gogol-blogger ==0.1.1
+  - gogol-books ==0.1.1
+  - gogol-civicinfo ==0.1.1
+  - gogol-classroom ==0.1.1
+  - gogol-cloudmonitoring ==0.1.1
+  - gogol-cloudtrace ==0.1.1
+  - gogol-compute ==0.1.1
+  - gogol-container ==0.1.1
+  - gogol-core ==0.1.1
+  - gogol-customsearch ==0.1.1
+  - gogol-dataflow ==0.1.1
+  - gogol-dataproc ==0.1.1
+  - gogol-datastore ==0.1.1
+  - gogol-debugger ==0.1.1
+  - gogol-deploymentmanager ==0.1.1
+  - gogol-dfareporting ==0.1.1
+  - gogol-discovery ==0.1.1
+  - gogol-dns ==0.1.1
+  - gogol-doubleclick-bids ==0.1.1
+  - gogol-doubleclick-search ==0.1.1
+  - gogol-drive ==0.1.1
+  - gogol-firebase-rules ==0.1.1
+  - gogol-fitness ==0.1.1
+  - gogol-fonts ==0.1.1
+  - gogol-freebasesearch ==0.1.1
+  - gogol-fusiontables ==0.1.1
+  - gogol-games ==0.1.1
+  - gogol-games-configuration ==0.1.1
+  - gogol-games-management ==0.1.1
+  - gogol-genomics ==0.1.1
+  - gogol-gmail ==0.1.1
+  - gogol-groups-migration ==0.1.1
+  - gogol-groups-settings ==0.1.1
+  - gogol-identity-toolkit ==0.1.1
+  - gogol-kgsearch ==0.1.1
+  - gogol-latencytest ==0.1.1
+  - gogol-logging ==0.1.1
+  - gogol-maps-coordinate ==0.1.1
+  - gogol-maps-engine ==0.1.1
+  - gogol-mirror ==0.1.1
+  - gogol-monitoring ==0.1.1
+  - gogol-oauth2 ==0.1.1
+  - gogol-pagespeed ==0.1.1
+  - gogol-partners ==0.1.1
+  - gogol-people ==0.1.1
+  - gogol-play-moviespartner ==0.1.1
+  - gogol-plus ==0.1.1
+  - gogol-plus-domains ==0.1.1
+  - gogol-prediction ==0.1.1
+  - gogol-proximitybeacon ==0.1.1
+  - gogol-pubsub ==0.1.1
+  - gogol-qpxexpress ==0.1.1
+  - gogol-replicapool ==0.1.1
+  - gogol-replicapool-updater ==0.1.1
+  - gogol-resourcemanager ==0.1.1
+  - gogol-resourceviews ==0.1.1
+  - gogol-script ==0.1.1
+  - gogol-sheets ==0.1.1
+  - gogol-shopping-content ==0.1.1
+  - gogol-siteverification ==0.1.1
+  - gogol-spectrum ==0.1.1
+  - gogol-sqladmin ==0.1.1
+  - gogol-storage ==0.1.1
+  - gogol-storage-transfer ==0.1.1
+  - gogol-tagmanager ==0.1.1
+  - gogol-taskqueue ==0.1.1
+  - gogol-translate ==0.1.1
+  - gogol-urlshortener ==0.1.1
+  - gogol-useraccounts ==0.1.1
+  - gogol-vision ==0.1.1
+  - gogol-webmaster-tools ==0.1.1
+  - gogol-youtube ==0.1.1
+  - gogol-youtube-analytics ==0.1.1
+  - gogol-youtube-reporting ==0.1.1
   - google-cloud ==0.0.4
   - google-oauth2-jwt ==0.1.3
+  - google-translate ==0.3
   - gpolyline ==0.1.0.1
   - graph-core ==0.3.0.0
   - graph-wrapper ==0.2.5.1
@@ -779,53 +840,64 @@ default-package-overrides:
   - gtksourceview3 ==0.13.3.1
   - H ==0.9.0.1
   - hackage-db ==1.22
-  - hackage-mirror ==0.1.1.1
   - hackage-security ==0.5.2.2
-  - hackage-whatsnew ==0.1.0.1
-  - hackmanager ==0.1.0.0
-  - haddock-api ==2.17.3
+  - hackernews ==1.1.1.0
   - haddock-library ==1.4.2
   - hailgun ==0.4.1.1
+  - hailgun-simple ==0.1.0.0
+  - hakyll ==4.9.5.1
   - half ==0.2.2.3
+  - hamilton ==0.1.0.0
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
-  - handwriting ==0.1.0.3
   - hapistrano ==0.2.1.2
   - happstack-authenticate ==2.3.4.7
   - happstack-clientsession ==7.3.1
   - happstack-hsp ==7.3.7.1
   - happstack-jmacro ==7.0.11
-  - happstack-server ==7.4.6.2
+  - happstack-server ==7.4.6.3
   - happstack-server-tls ==7.1.6.2
   - happy ==1.19.5
-  - HaRe ==0.8.3.0
   - harp ==0.4.2
-  - hashable ==1.2.4.0
-  - hashable-extras ==0.2.3
+  - hashable ==1.2.5.0
   - hashable-time ==0.2
   - hashmap ==1.3.2
   - hashtables ==1.2.1.0
-  - haskeline ==0.7.3.0
-  - haskell-gi ==0.18
-  - haskell-gi-base ==0.18.4
+  - haskeline ==0.7.3.1
+  - haskell-gi ==0.20
+  - haskell-gi-base ==0.20
   - haskell-lexer ==1.0.1
-  - haskell-names ==0.7.0
+  - haskell-names ==0.8.0
   - haskell-neo4j-client ==0.3.2.4
-  - haskell-packages ==0.4
+  - haskell-packages ==0.5
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.2.0
-  - haskell-src-exts ==1.17.1
-  - haskell-src-meta ==0.6.0.14
+  - haskell-src-exts ==1.18.2
+  - haskell-src-exts-simple ==1.19.0.0
+  - haskell-src-meta ==0.7.0.1
+  - haskell-tools-ast ==0.5.0.0
+  - haskell-tools-backend-ghc ==0.5.0.0
+  - haskell-tools-cli ==0.5.0.0
+  - haskell-tools-daemon ==0.5.0.0
+  - haskell-tools-debug ==0.5.0.0
+  - haskell-tools-demo ==0.5.0.0
+  - haskell-tools-prettyprint ==0.5.0.0
+  - haskell-tools-refactor ==0.5.0.0
+  - haskell-tools-rewrite ==0.5.0.0
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.3.0
-  - haskintex ==0.6.0.1
-  - haskoin-core ==0.4.0
+  - haskintex ==0.7.0.1
   - hasql ==0.19.16
+  - hasql-migration ==0.1.3
+  - hasql-transaction ==0.5
   - hastache ==0.6.1
-  - hasty-hamiltonian ==1.1.5
+  - hasty-hamiltonian ==1.3.0
   - HaTeX ==3.17.1.0
   - hatex-guide ==1.3.1.6
-  - hbayes ==0.5.2
+  - haxl ==0.5.0.0
+  - haxl-amazonka ==0.1.1
+  - HaXml ==1.25.3
+  - haxr ==3000.11.2
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
   - HCodecs ==0.5
@@ -839,37 +911,43 @@ default-package-overrides:
   - hedis ==0.9.7
   - here ==1.2.9
   - heredoc ==0.2.0.0
+  - heterocephalus ==1.0.4.0
   - hex ==0.1.2
+  - hexml ==0.3.1
   - hexstring ==0.11.1
   - hflags ==0.4.2
   - hformat ==0.1.0.1
   - hfsevents ==0.1.6
-  - hgettext ==0.1.30
   - hid ==0.2.2
   - hidapi ==0.1.4
   - hierarchical-clustering ==0.4.6
+  - highjson ==0.4.0.0
+  - highjson-swagger ==0.4.0.0
+  - highjson-th ==0.4.0.0
   - highlighting-kate ==0.6.4
   - hinotify ==0.3.9
   - hint ==0.6.0
-  - hip ==1.2.0.0
+  - hip ==1.5.2.0
   - histogram-fill ==0.8.4.1
   - hit ==0.6.3
+  - hjpath ==3.0.1
   - hjsmin ==0.2.0.2
-  - hjsonpointer ==1.0.0.2
-  - hjsonschema ==1.1.0.1
-  - hlibgit2 ==0.18.0.15
+  - hjson ==1.3.2
+  - hjsonpointer ==1.1.0.2
+  - hjsonschema ==1.5.0.1
+  - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.5.0
-  - hlint ==1.9.35
-  - hmatrix ==0.17.0.2
-  - hmatrix-gsl ==0.17.0.0
-  - hmatrix-gsl-stats ==0.4.1.4
+  - hlint ==1.9.41
+  - hmatrix ==0.18.0.0
+  - hmatrix-gsl ==0.18.0.1
+  - hmatrix-gsl-stats ==0.4.1.6
+  - hmatrix-repa ==0.1.2.2
   - hmatrix-special ==0.4.0.1
   - hmpfr ==0.4.2.1
   - hmt ==0.15
-  - hoauth2 ==0.5.4.0
-  - hocilib ==0.1.0
+  - hoauth2 ==0.5.7
+  - hocilib ==0.2.0
   - holy-project ==0.2.0.1
-  - homplexity ==0.4.3.3
   - hOpenPGP ==2.5.5
   - hopenpgp-tools ==0.19.4
   - hopenssl ==1.7
@@ -877,29 +955,30 @@ default-package-overrides:
   - hostname ==1.0
   - hostname-validate ==1.0.0
   - hourglass ==0.2.10
-  - hpack-convert ==0.14.6
   - hpc-coveralls ==1.0.8
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
   - hpio ==0.8.0.6
-  - hprotoc ==2.4.0
+  - hpp ==0.4.0
+  - hpqtypes ==1.5.1.1
   - hquantlib ==0.0.3.3
-  - hreader ==1.0.2
+  - hreader ==1.1.0
   - hruby ==0.3.4.3
   - hs-bibutils ==5.5
   - hs-GeoIP ==0.3
   - hsass ==0.4.0
   - hsb2hs ==0.3.1
   - hscolour ==1.24.1
-  - hsdns ==1.6.1
-  - hse-cpp ==0.1
+  - hsdns ==1.7
+  - hse-cpp ==0.2
   - hsebaysdk ==0.4.0.0
   - hsemail ==1.7.7
   - HSet ==0.0.0
   - hset ==2.2.0
   - hsexif ==0.6.0.10
-  - hsignal ==0.2.7.4
+  - hsignal ==0.2.7.5
+  - hsinstall ==1.5
   - hslogger ==1.2.10
   - hslua ==0.4.1
   - hsndfile ==0.8.0
@@ -907,63 +986,67 @@ default-package-overrides:
   - HsOpenSSL ==0.11.4
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.2.4
+  - hspec ==2.4.1
   - hspec-attoparsec ==0.1.0.2
-  - hspec-contrib ==0.3.0
-  - hspec-core ==2.2.4
-  - hspec-discover ==2.2.4
-  - hspec-expectations ==0.7.2
+  - hspec-core ==2.4.1
+  - hspec-discover ==2.4.1
+  - hspec-expectations ==0.8.2
   - hspec-expectations-pretty-diff ==0.7.2.4
   - hspec-golden-aeson ==0.2.0.3
-  - hspec-jenkins ==0.1.1
-  - hspec-megaparsec ==0.2.1
-  - hspec-meta ==2.2.1
-  - hspec-setup ==0.1.1.1
-  - hspec-smallcheck ==0.4.1
-  - hspec-wai ==0.6.6
-  - hspec-wai-json ==0.6.1
+  - hspec-megaparsec ==0.3.1
+  - hspec-meta ==2.3.2
+  - hspec-setup ==0.2.1.0
+  - hspec-smallcheck ==0.4.2
+  - hspec-wai ==0.8.0
+  - hspec-wai-json ==0.8.0
   - hspec-webdriver ==1.2.0
-  - hstatistics ==0.2.5.4
+  - hstatistics ==0.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.5
   - hsx-jmacro ==7.3.8
-  - hsx2hs ==0.13.5
+  - hsx2hs ==0.14.0
   - hsyslog ==4
   - htaglib ==1.0.4
   - HTF ==0.13.1.0
   - html ==1.0.1.2
   - html-conduit ==1.2.1.1
+  - html-email-validate ==0.2.0.0
   - htoml ==1.0.0.3
   - HTTP ==4000.3.5
-  - http-api-data ==0.2.4
-  - http-client ==0.4.31.2
+  - http-api-data ==0.3.5
+  - http-client ==0.5.5
   - http-client-openssl ==0.2.0.4
-  - http-client-tls ==0.2.4.1
+  - http-client-tls ==0.3.3.1
   - http-common ==0.8.2.0
-  - http-conduit ==2.1.11
+  - http-conduit ==2.2.3
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
   - http-reverse-proxy ==0.4.3.2
   - http-streams ==0.8.4.0
   - http-types ==0.9.1
-  - http2 ==1.6.2
-  - httpd-shed ==0.4.0.3
+  - http2 ==1.6.3
   - human-readable-duration ==0.2.0.3
-  - HUnit ==1.3.1.2
-  - HUnit-approx ==1.0
+  - HUnit ==1.5.0.0
+  - HUnit-approx ==1.1
   - hunit-dejafu ==0.3.0.3
-  - hvect ==0.3.1.0
-  - hw-bits ==0.1.0.1
-  - hw-conduit ==0.0.0.11
+  - hvect ==0.4.0.0
+  - hw-balancedparens ==0.1.0.0
+  - hw-bits ==0.5.0.0
+  - hw-conduit ==0.1.0.0
   - hw-diagnostics ==0.0.0.5
+  - hw-excess ==0.1.0.0
+  - hw-int ==0.0.0.1
+  - hw-json ==0.4.0.0
+  - hw-mquery ==0.1.0.1
   - hw-parser ==0.0.0.1
-  - hw-prim ==0.1.0.3
-  - hw-rankselect ==0.3.0.0
-  - hw-succinct ==0.0.0.14
+  - hw-prim ==0.4.0.2
+  - hw-rankselect ==0.8.0.0
+  - hw-rankselect-base ==0.2.0.0
+  - hw-string-parse ==0.0.0.3
+  - hw-succinct ==0.1.0.1
   - hweblib ==0.6.3
   - hworker ==0.1.0.1
-  - hworker-ses ==0.1.1.0
   - hxt ==9.3.1.16
   - hxt-charproperties ==9.2.0.1
   - hxt-css ==0.1.0.3
@@ -975,33 +1058,38 @@ default-package-overrides:
   - hyphenation ==0.6
   - ical ==0.0.1
   - iconv ==0.4.1.3
-  - identicon ==0.1.0
-  - idris ==0.12.3
-  - ieee754 ==0.7.9
+  - identicon ==0.2.0
+  - ieee754 ==0.8.0
+  - if ==0.1.0.0
   - IfElse ==0.85
   - ignore ==0.1.1.0
   - ilist ==0.2.0.0
   - imagesize-conduit ==1.1
-  - imm ==1.0.1.0
+  - imm ==1.1.0.0
   - immortal ==0.2.2
   - include-file ==0.1.0.3
   - incremental-parser ==0.2.5
   - indentation-core ==0.0
   - indentation-parsec ==0.0
-  - indents ==0.3.3
-  - inflections ==0.2.0.1
+  - indents ==0.4.0.0
+  - inflections ==0.3.0.0
   - ini ==0.3.5
   - inline-c ==0.5.6.1
   - inline-c-cpp ==0.1.0.0
+  - inline-java ==0.6.1
   - inline-r ==0.9.0.1
-  - insert-ordered-containers ==0.1.0.1
+  - insert-ordered-containers ==0.2.0.0
+  - instance-control ==0.1.1.1
+  - integer-logarithms ==1.0.1
   - integration ==0.2.1
   - intero ==0.1.20
   - interpolate ==0.1.0
   - interpolatedstring-perl6 ==1.0.0
   - IntervalMap ==0.5.2.0
   - intervals ==0.7.2
+  - intro ==0.1.0.6
   - invariant ==0.4
+  - invertible ==0.2.0
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1030,21 +1118,28 @@ default-package-overrides:
   - jmacro ==0.6.14
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
-  - jose ==0.4.0.3
+  - jmacro-rpc-snap ==0.3
+  - jni ==0.2.3
+  - jose ==0.5.0.2
   - jose-jwt ==0.7.4
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
-  - json-autotype ==1.0.15
+  - json-builder ==0.3
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
+  - json-stream ==0.4.1.3
   - JuicyPixels ==3.2.8
   - JuicyPixels-extra ==0.1.1
   - JuicyPixels-scale-dct ==0.1.1.2
+  - jvm ==0.1.2
+  - jvm-streaming ==0.1
   - jwt ==0.7.2
   - kan-extensions ==5.0.1
   - kansas-comet ==0.4
-  - kawhi ==0.0.1
+  - katip ==0.3.1.4
+  - katip-elasticsearch ==0.3.0.2
+  - kawhi ==0.2.1
   - kdt ==0.2.4
   - keter ==1.4.3.2
   - keycode ==0.2.2
@@ -1053,6 +1148,8 @@ default-package-overrides:
   - knob ==0.1.1
   - koofr-client ==1.0.0.3
   - kraken ==0.0.3
+  - l10n ==0.1.0.0
+  - labels ==0.3.0
   - lackey ==0.4.2
   - language-c ==0.5.0
   - language-c-quote ==0.11.7.1
@@ -1065,14 +1162,16 @@ default-package-overrides:
   - language-javascript ==0.6.0.9
   - language-lua2 ==0.1.0.5
   - language-nix ==2.1.0.1
-  - language-puppet ==1.3.1.1
-  - language-thrift ==0.9.0.2
+  - language-puppet ==1.3.5.1
+  - language-python ==0.5.4
+  - language-thrift ==0.10.0.0
+  - large-hashable ==0.1.0.3
   - largeword ==1.2.5
   - lattices ==1.5.0
   - lazy-csv ==0.5.1
   - lca ==0.3
   - leapseconds-announced ==2017
-  - lens ==4.14
+  - lens ==4.15.1
   - lens-action ==0.2.0.2
   - lens-aeson ==1.0.0.5
   - lens-datetime ==0.3
@@ -1081,6 +1180,7 @@ default-package-overrides:
   - lens-family-th ==0.5.0.0
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
+  - lentil ==1.0.8.0
   - leveldb-haskell ==0.6.4
   - lexer-applicative ==2.1.0.1
   - lhs2tex ==1.19
@@ -1088,33 +1188,47 @@ default-package-overrides:
   - libinfluxdb ==0.0.4
   - libmpd ==0.9.0.6
   - libnotify ==0.2
-  - libxml-sax ==0.7.5
+  - librato ==0.2.0.1
+  - libsystemd-journal ==1.4.1
   - LibZip ==1.0.1
+  - licensor ==0.2.0
   - lift-generics ==0.1.1
   - lifted-async ==0.9.1.1
   - lifted-base ==0.2.3.8
-  - line ==1.0.1.0
+  - line ==2.2.0
   - linear ==1.20.5
   - linear-accelerate ==0.2
+  - linked-list-with-iterator ==0.1.1.0
   - linux-file-extents ==0.2.0.0
   - linux-namespaces ==0.1.2.0
+  - List ==0.6.0
   - list-fusion-probe ==0.1.0.6
   - list-prompt ==0.1.1.0
   - list-t ==1
   - ListLike ==4.5.1
-  - load-env ==0.1.1
+  - lmdb ==0.2.5
   - loch-th ==0.2.1
-  - log-domain ==0.10.3.1
+  - log ==0.7
+  - log-base ==0.7
+  - log-domain ==0.11
+  - log-elasticsearch ==0.7
+  - log-postgres ==0.7
   - logfloat ==0.13.3.3
+  - logger-thread ==0.1.0.2
+  - logging-effect ==1.1.2
   - logging-facade ==0.1.1
   - logict ==0.6.0.2
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.1
-  - ltext ==0.1.2.1
   - lucid ==2.9.7
   - lucid-svg ==0.7.0.0
+  - lzma-conduit ==1.1.3.1
   - machines ==0.6.1
+  - machines-binary ==0.3.0.3
+  - machines-directory ==0.2.0.10
+  - machines-io ==0.2.0.13
+  - machines-process ==0.2.0.8
   - magic ==1.1
   - mainland-pretty ==0.4.1.4
   - makefile ==0.1.0.5
@@ -1124,43 +1238,47 @@ default-package-overrides:
   - markdown-unlit ==0.4.0
   - markup ==3.1.0
   - math-functions ==0.2.1.0
+  - mathexpr ==0.3.0.0
   - matrices ==0.4.4
   - matrix ==0.3.5.0
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
   - mcmc-types ==1.0.3
-  - megaparsec ==5.0.1
-  - memory ==0.13
-  - MemoTrie ==0.6.4
+  - median-stream ==0.7.0.0
+  - mega-sdist ==0.3.0
+  - megaparsec ==5.2.0
+  - memory ==0.14.1
+  - MemoTrie ==0.6.7
   - mersenne-random ==1.0.0.1
-  - mersenne-random-pure64 ==0.2.0.5
+  - mersenne-random-pure64 ==0.2.2.0
   - messagepack ==0.5.4
   - messagepack-rpc ==0.5.1
-  - metrics ==0.3.0.2
+  - metrics ==0.4.0.1
   - MFlow ==0.4.6.0
+  - mfsolve ==0.3.2.0
   - microformats2-parser ==1.0.1.6
   - microlens ==0.4.7.0
-  - microlens-aeson ==2.1.1.3
+  - microlens-aeson ==2.2.0
   - microlens-contra ==0.1.0.1
   - microlens-ghc ==0.4.7.0
   - microlens-mtl ==0.1.10.0
   - microlens-platform ==0.3.7.1
   - microlens-th ==0.4.1.1
-  - mighty-metropolis ==1.0.4
-  - mime-mail ==0.4.12
+  - mighty-metropolis ==1.2.0
+  - mime-mail ==0.4.13
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
+  - mintty ==0.1
   - misfortune ==0.1.1.2
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
   - mmap ==0.5.9
   - mmorph ==1.0.9
   - mockery ==0.3.4
-  - modify-fasta ==0.8.2.1
-  - moesocks ==1.0.0.41
+  - modify-fasta ==0.8.2.3
   - monad-control ==1.0.1.0
   - monad-coroutine ==0.9.0.3
-  - monad-extras ==0.5.11
+  - monad-extras ==0.6.0
   - monad-http ==0.1.0.0
   - monad-journal ==0.7.2
   - monad-logger ==0.3.20.1
@@ -1168,6 +1286,7 @@ default-package-overrides:
   - monad-logger-prefix ==0.1.6
   - monad-logger-syslog ==0.1.3.0
   - monad-loops ==0.4.3
+  - monad-metrics ==0.1.0.2
   - monad-par ==0.3.4.8
   - monad-par-extras ==0.3.3
   - monad-parallel ==0.7.2.2
@@ -1184,16 +1303,17 @@ default-package-overrides:
   - monadloc ==0.7.1
   - monadplus ==1.4.2
   - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.4.2.3
+  - MonadRandom ==0.5.1
   - monads-tf ==0.1.0.3
   - mongoDB ==2.1.1.1
   - mono-traversable ==1.0.1.1
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
-  - monoid-subclasses ==0.4.2.1
+  - monoid-subclasses ==0.4.3.1
   - monoidal-containers ==0.3.0.1
-  - morte ==1.6.2
+  - morte ==1.6.5
   - mountpoints ==1.0.2
+  - mstate ==0.2.7
   - mtl ==2.2.1
   - mtl-compat ==0.2.1.3
   - mtl-prelude ==2.0.3.1
@@ -1202,14 +1322,17 @@ default-package-overrides:
   - multipart ==0.1.2
   - multiset ==0.3.3
   - multiset-comb ==0.2.4.1
+  - multistate ==0.7.1.1
   - murmur-hash ==0.1.0.9
-  - murmur3 ==1.0.3
   - MusicBrainz ==0.2.4
-  - mustache ==2.1.2
   - mutable-containers ==0.3.3
-  - mwc-probability ==1.2.2
+  - mwc-probability ==1.3.0
   - mwc-random ==0.13.5.0
   - mwc-random-monad ==0.7.3.1
+  - mysql ==0.1.4
+  - mysql-haskell ==0.8.0.0
+  - mysql-haskell-openssl ==0.8.0.0
+  - mysql-simple ==0.4.0.0
   - nagios-check ==0.3.2
   - names-th ==0.2.0.2
   - nano-erl ==0.1.0.1
@@ -1217,18 +1340,25 @@ default-package-overrides:
   - nationstates ==0.5.0.0
   - nats ==1.1.1
   - natural-sort ==0.1.2
-  - natural-transformation ==0.3.1
+  - natural-transformation ==0.4
   - ndjson-conduit ==0.1.0.5
   - neat-interpolation ==0.3.2.1
   - netpbm ==1.0.2
   - nettle ==0.2.0
+  - netwire ==5.0.2
+  - netwire-input ==0.0.6
+  - netwire-input-glfw ==0.0.6
   - network ==2.6.3.1
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
+  - network-carbon ==1.0.8
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.8
+  - network-msgpack-rpc ==0.0.3
+  - network-multicast ==0.2.0
+  - Network-NineP ==0.4.1
   - network-simple ==0.4.0.5
   - network-transport ==0.4.4.0
   - network-transport-composed ==0.2.0.1
@@ -1236,9 +1366,12 @@ default-package-overrides:
   - network-transport-tcp ==0.5.1
   - network-transport-tests ==0.2.3.0
   - network-uri ==2.6.1.0
-  - network-uri-flag ==0.1
   - newtype ==0.2
+  - newtype-generics ==0.5
+  - next-ref ==0.1.0.2
+  - nfc ==0.0.1
   - nicify-lib ==1.0.1
+  - NineP ==0.0.2.1
   - nix-paths ==1.0.0.1
   - non-empty-sequence ==0.2.0.2
   - nonce ==1.0.2
@@ -1248,21 +1381,23 @@ default-package-overrides:
   - numeric-extras ==0.1
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
+  - oanda-rest-api ==0.3.0.0
   - objective ==1.1.1
   - ObjectName ==1.1.0.1
-  - octane ==0.16.3
+  - octane ==0.18.2
   - Octree ==0.5.4.3
   - oeis ==0.3.8
   - ofx ==0.4.2.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
-  - omnifmt ==0.2.1.1
   - once ==0.2
   - OneTuple ==0.2.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.5.2.2
+  - opaleye ==0.5.3.0
   - opaleye-trans ==0.3.4
   - open-browser ==0.2.1.0
+  - open-witness ==0.4
+  - OpenAL ==1.7.0.4
   - OpenGL ==3.0.1.0
   - OpenGLRaw ==3.2.4.0
   - openpgp-asciiarmor ==0.1
@@ -1270,32 +1405,35 @@ default-package-overrides:
   - openssl-streams ==1.2.1.0
   - operational ==0.2.3.5
   - operational-class ==0.3.0.0
-  - opml-conduit ==0.5.0.1
+  - opml-conduit ==0.6.0.1
   - optional-args ==1.0.1
   - options ==1.2.1.1
-  - optparse-applicative ==0.12.1.0
-  - optparse-generic ==1.1.1
+  - optparse-applicative ==0.13.1.0
+  - optparse-generic ==1.1.4
   - optparse-helper ==0.2.1.1
   - optparse-simple ==0.0.3
   - optparse-text ==0.1.1.0
   - osdkeys ==0.0
   - overloaded-records ==0.4.2.0
-  - package-description-remote ==0.2.0.0
   - packdeps ==0.4.3
   - pager ==0.1.1.0
-  - pagerduty ==0.0.7
+  - pagerduty ==0.0.8
   - pagination ==0.1.1
   - palette ==0.1.0.4
-  - pandoc ==1.17.1
+  - pandoc ==1.19.2.1
   - pandoc-citeproc ==0.10.4
-  - pandoc-types ==1.16.1.1
+  - pandoc-types ==1.17.0.5
   - pango ==0.13.3.1
   - parallel ==3.2.1.0
   - parallel-io ==0.3.3
   - parseargs ==0.2.0.8
   - parsec ==3.1.11
+  - parsec-numeric ==0.1.0.0
+  - ParsecTools ==0.0.2.0
   - parsers ==0.12.4
   - partial-handler ==1.0.2
+  - partial-isomorphisms ==0.2.2
+  - patat ==0.5.0.0
   - path ==0.5.12
   - path-extra ==0.0.3
   - path-io ==1.2.2
@@ -1303,8 +1441,6 @@ default-package-overrides:
   - pathwalk ==0.3.1.2
   - patience ==0.1.1
   - pattern-arrows ==0.0.2
-  - pbkdf ==1.1.1.1
-  - pcap ==0.4.5.2
   - pcre-heavy ==1.0.0.2
   - pcre-light ==0.4.0.4
   - pcre-utils ==0.1.8.1
@@ -1317,6 +1453,7 @@ default-package-overrides:
   - persistable-record ==0.4.1.0
   - persistable-types-HDBC-pg ==0.0.1.4
   - persistent ==2.6
+  - persistent-mysql ==2.6
   - persistent-postgresql ==2.6
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
@@ -1324,39 +1461,41 @@ default-package-overrides:
   - persistent-template ==2.5.1.6
   - pgp-wordlist ==0.1.0.2
   - phantom-state ==0.2.1.2
+  - picedit ==0.2.3.0
   - picoparsec ==0.1.2.3
-  - pinboard ==0.9.6
+  - pid1 ==0.1.0.1
+  - pinboard ==0.9.12.4
   - pinch ==0.3.0.2
-  - pinchot ==0.22.0.0
-  - pipes ==4.1.9
-  - pipes-aeson ==0.4.1.7
+  - pinchot ==0.24.0.0
+  - pipes ==4.3.2
   - pipes-attoparsec ==0.5.1.4
-  - pipes-bgzf ==0.2.0.1
   - pipes-bytestring ==2.1.4
-  - pipes-cacophony ==0.4.0
-  - pipes-cliff ==0.12.0.0
+  - pipes-cacophony ==0.4.1
+  - pipes-category ==0.2.0.1
   - pipes-concurrency ==2.0.7
   - pipes-csv ==1.4.3
   - pipes-extras ==1.0.8
-  - pipes-fastx ==0.3.0.0
+  - pipes-fluid ==0.5.0.3
   - pipes-group ==1.0.6
-  - pipes-http ==1.0.5
-  - pipes-illumina ==0.1.0.0
+  - pipes-misc ==0.2.3.0
   - pipes-mongodb ==0.1.0.0
-  - pipes-network ==0.6.4.1
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.3
-  - pipes-safe ==2.2.4
+  - pipes-safe ==2.2.5
   - pipes-text ==0.0.2.5
   - pipes-wai ==3.2.0
   - pixelated-avatar-generator ==0.1.3
-  - pkcs10 ==0.1.1.0
+  - pkcs10 ==0.2.0.0
   - placeholders ==0.1
   - plan-b ==0.2.0
+  - plot ==0.2.3.6
+  - plot-gtk ==0.2.0.4
+  - plot-gtk-ui ==0.3.0.2
+  - plot-gtk3 ==0.1.0.2
   - point-octree ==0.5.5.3
   - pointed ==5
   - pointedlist ==0.6.1
-  - pointful ==1.0.8
+  - pointful ==1.0.9
   - pointless-fun ==1.1.0.6
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12
@@ -1364,11 +1503,12 @@ default-package-overrides:
   - post-mess-age ==0.2.1.0
   - postgresql-binary ==0.9.2
   - postgresql-libpq ==0.9.3.0
-  - postgresql-query ==3.0.1
-  - postgresql-schema ==0.1.10
   - postgresql-simple ==0.5.2.1
-  - postgresql-simple-url ==0.1.0.1
+  - postgresql-simple-migration ==0.1.8.0
+  - postgresql-simple-url ==0.2.0.0
   - postgresql-transactional ==1.1.1
+  - postgresql-typed ==0.5.0
+  - pqueue ==1.3.2
   - pred-set ==0.0.1
   - prednote ==0.36.0.4
   - prefix-units ==0.2.0
@@ -1379,13 +1519,15 @@ default-package-overrides:
   - pretty-class ==1.0.1.1
   - pretty-hex ==1.0
   - pretty-show ==1.6.12
+  - pretty-simple ==2.0.0.0
   - pretty-types ==0.2.3.1
   - prettyclass ==1.0.0.0
   - primes ==0.2.1.0
   - primitive ==0.6.1.0
-  - process-extras ==0.4.1.4
+  - printcess ==0.1.0.3
+  - process-extras ==0.7.1
   - product-profunctors ==0.7.1.0
-  - profiteur ==0.3.0.3
+  - profiteur ==0.4.2.0
   - profunctor-extras ==4.0
   - profunctors ==5.2
   - project-template ==0.2.0
@@ -1402,30 +1544,29 @@ default-package-overrides:
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
   - psqueues ==0.2.2.3
-  - publicsuffix ==0.20160716
+  - publicsuffix ==0.20170109
   - pure-cdb ==0.1.2
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
-  - purescript ==0.9.3
-  - purescript-bridge ==0.8.0.1
+  - purescript-bridge ==0.10.0.0
+  - pusher-http-haskell ==1.1.0.4
   - pwstore-fast ==2.4.4
   - pwstore-purehaskell ==2.1.4
-  - quantum-random ==0.6.4
   - QuasiText ==0.1.2.6
   - questioner ==0.1.1.0
   - quickbench ==1.0
-  - QuickCheck ==2.8.2
+  - QuickCheck ==2.9.2
   - quickcheck-arbitrary-adt ==0.2.0.0
-  - quickcheck-assertions ==0.2.0
-  - quickcheck-combinators ==0.0.1
+  - quickcheck-assertions ==0.3.0
   - quickcheck-instances ==0.3.12
   - quickcheck-io ==0.1.4
-  - quickcheck-properties ==0.1
   - quickcheck-simple ==0.1.0.1
+  - quickcheck-special ==0.1.0.3
   - quickcheck-text ==0.1.2.1
   - quickcheck-unicode ==1.0.0.1
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
+  - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
   - random-shuffle ==0.0.4
@@ -1434,29 +1575,36 @@ default-package-overrides:
   - range ==0.1.2.0
   - range-set-list ==0.1.2.0
   - rank1dynamic ==0.3.3.0
-  - Rasterific ==0.6.1.1
-  - rasterific-svg ==0.3.1.2
+  - Rasterific ==0.7.1
+  - rasterific-svg ==0.3.2.1
   - ratel ==0.3.2
   - ratel-wai ==0.2.0
+  - rattletrap ==2.1.5
   - raw-strings-qq ==1.1
+  - rawfilepath ==0.1.0.0
+  - rawstring-qm ==0.2.3.0
+  - rdf ==0.1.0.1
   - read-editor ==0.1.0.2
   - read-env-var ==0.1.0.1
   - readable ==0.3.1
   - ReadArgs ==1.2.3
   - readline ==1.0.3.0
   - rebase ==1.0.8
+  - recursion-schemes ==5.0.1
   - redis-io ==0.7.0
   - redis-resp ==0.4.0
   - reducers ==3.12.1
+  - reedsolomon ==0.0.4.3
   - ref-fd ==0.4.0.1
   - refact ==0.3.0.2
+  - references ==0.3.2.1
   - reflection ==2.1.2
   - reform ==0.2.7.1
-  - reform-blaze ==0.2.4.1
-  - reform-hamlet ==0.0.5.1
+  - reform-blaze ==0.2.4.3
+  - reform-hamlet ==0.0.5.3
   - reform-happstack ==0.2.5.1
   - reform-hsp ==0.2.7.1
-  - RefSerialize ==0.3.1.4
+  - RefSerialize ==0.4.0
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1477,15 +1625,19 @@ default-package-overrides:
   - repa-algorithms ==3.4.1.1
   - repa-io ==3.4.1.1
   - RepLib ==0.5.4
+  - repline ==0.1.6.0
+  - req ==0.2.0
+  - req-conduit ==0.1.0
   - rerebase ==1.0.3
-  - reroute ==0.4.0.1
+  - reroute ==0.4.1.0
   - resolve-trivial-conflicts ==0.3.2.4
   - resource-pool ==0.2.3.2
   - resourcet ==1.1.9
   - rest-client ==0.5.1.1
   - rest-core ==0.39
-  - rest-gen ==0.19.0.3
+  - rest-gen ==0.20.0.0
   - rest-happstack ==0.3.1.1
+  - rest-snap ==0.2.0.1
   - rest-stringmap ==0.2.0.6
   - rest-types ==1.14.1.1
   - rest-wai ==0.2.0.1
@@ -1495,32 +1647,37 @@ default-package-overrides:
   - retry ==0.7.4.2
   - rev-state ==0.1.2
   - rfc5051 ==0.1.0.3
+  - riak ==1.1.1.0
+  - riak-protobuf ==0.22.0.0
+  - RNAlien ==1.3.1
   - rng-utils ==0.2.1
   - rose-trees ==0.0.4.3
-  - rosezipper ==0.2
-  - rotating-log ==0.4
+  - rotating-log ==0.4.2
   - RSA ==2.2.0
-  - rss-conduit ==0.2.0.2
+  - rss-conduit ==0.3.0.0
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
-  - safe ==0.3.11
+  - safe ==0.3.13
   - safe-exceptions ==0.1.4.0
+  - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.2
   - SafeSemaphore ==0.10.1
-  - sampling ==0.2.0
+  - sampling ==0.3.2
   - sandi ==0.4.0
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbv ==5.12
-  - scalpel ==0.3.1
+  - sbv ==5.14
+  - scalpel ==0.5.0
+  - scalpel-core ==0.5.0
   - scanner ==0.2
-  - scientific ==0.3.4.9
+  - scientific ==0.3.4.10
   - scotty ==0.11.0
-  - scrape-changes ==0.1.0.4
   - scrypt ==0.5.0
-  - sdl2 ==2.1.3.1
-  - secp256k1 ==0.4.6
+  - sdl2 ==2.2.0
+  - sdl2-gfx ==0.2
+  - sdl2-image ==2.0.0
+  - sdl2-mixer ==0.1
   - securemem ==0.1.9
   - SegmentTree ==0.3
   - semigroupoid-extras ==5
@@ -1532,19 +1689,21 @@ default-package-overrides:
   - seqalign ==0.2.0.4
   - seqloc ==0.6.1.1
   - serf ==0.1.1.0
-  - servant ==0.8.1
+  - servant ==0.9.1.1
   - servant-aeson-specs ==0.5.2.0
+  - servant-auth-cookie ==0.4.3.2
   - servant-blaze ==0.7.1
   - servant-cassava ==0.8
-  - servant-client ==0.8.1
-  - servant-docs ==0.8.1
-  - servant-foreign ==0.8.1
-  - servant-js ==0.8.1
+  - servant-client ==0.9.1.1
+  - servant-docs ==0.9.1.1
+  - servant-elm ==0.4.0.0
+  - servant-foreign ==0.9.1.1
+  - servant-js ==0.9.1
   - servant-JuicyPixels ==0.3.0.2
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.1.1
-  - servant-purescript ==0.3.1.5
-  - servant-server ==0.8.1
+  - servant-purescript ==0.6.0.0
+  - servant-server ==0.9.1.1
   - servant-subscriber ==0.5.0.3
   - servant-swagger ==1.1.2
   - servant-swagger-ui ==0.2.2.2.2.8
@@ -1563,15 +1722,15 @@ default-package-overrides:
   - shake-language-c ==0.10.0
   - shakespeare ==2.0.12.1
   - shell-conduit ==4.5.2
-  - shelly ==1.6.8.1
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
-  - show-type ==0.1.1
+  - show-prettyprint ==0.1.2
+  - sibe ==0.2.0.4
   - signal ==0.1.0.3
   - silently ==1.2.5
   - simple ==0.11.1
   - simple-download ==0.0.2
-  - simple-log ==0.4.0
+  - simple-log ==0.5.1
   - simple-reflect ==0.3.2
   - simple-sendfile ==0.2.25
   - simple-session ==0.10.1.1
@@ -1582,12 +1741,12 @@ default-package-overrides:
   - siphash ==1.0.3
   - skein ==1.0.9.4
   - skeletons ==0.4.0
+  - skylighting ==0.1.1.5
   - slave-thread ==1.0.2
   - slug ==0.1.6
   - smallcaps ==0.6.0.4
   - smallcheck ==1.1.1
   - smoothie ==0.4.2.6
-  - smsaero ==0.6.2
   - smtLib ==1.0.8
   - smtp-mail ==0.1.4.6
   - snap-core ==1.0.1.0
@@ -1596,34 +1755,36 @@ default-package-overrides:
   - soap ==0.2.3.3
   - soap-openssl ==0.1.0.2
   - soap-tls ==0.1.1.2
-  - socket ==0.6.1.0
+  - socket ==0.7.0.0
+  - socket-activation ==0.1.0.2
   - socks ==0.5.5
-  - solga ==0.1.0.1
+  - solga ==0.1.0.2
   - solga-swagger ==0.1.0.2
   - sorted-list ==0.2.0.0
   - sourcemap ==0.1.6
+  - sparkle ==0.4.0.2
+  - sparse-linear-algebra ==0.2.2.0
   - spdx ==0.2.1.0
   - speculation ==1.5.0.3
-  - speedy-slice ==0.1.5
+  - speedy-slice ==0.3.0
   - sphinx ==0.6.0.2
-  - Spintax ==0.1.0.1
+  - Spintax ==0.3.1
   - splice ==0.6.1.1
   - split ==0.2.3.1
-  - Spock ==0.11.0.0
-  - Spock-api ==0.11.0.0
-  - Spock-api-server ==0.11.0.0
-  - Spock-core ==0.11.0.0
+  - Spock ==0.12.0.0
+  - Spock-api ==0.12.0.0
+  - Spock-api-server ==0.12.0.0
+  - Spock-core ==0.12.0.0
   - Spock-lucid ==0.3.0.0
   - Spock-worker ==0.3.1.0
   - spool ==0.1
   - spoon ==0.3.1
   - sql-words ==0.1.4.1
   - sqlite-simple ==0.4.12.1
+  - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.0
-  - stache ==0.1.8
-  - stack-run-auto ==0.1.1.4
-  - stackage-curator ==0.14.3
-  - stackage-types ==1.2.0
+  - stache ==0.2.0
+  - stack-type ==0.1.0.0
   - state-plus ==0.1.2
   - stateref ==0.3
   - statestack ==0.2.0.5
@@ -1631,24 +1792,28 @@ default-package-overrides:
   - stateWriter ==0.2.8
   - static-canvas ==0.2.0.3
   - statistics ==0.13.3.0
+  - stb-image-redux ==0.2.1.0
+  - stemmer ==0.5.2
   - stm ==2.4.4.1
   - stm-chans ==3.0.0.4
   - stm-conduit ==3.0.0
   - stm-containers ==0.2.15
   - stm-delay ==0.1.1.1
+  - stm-extras ==0.1.0.1
   - stm-stats ==0.2.0.0
-  - STMonadTrans ==0.3.4
+  - stm-supply ==0.2.0.0
+  - STMonadTrans ==0.4.3
   - stopwatch ==0.1.0.4
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.3.1
-  - store ==0.2.1.2
-  - store-core ==0.2.0.2
   - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.1.6
+  - stratosphere ==0.4.0
   - streaming ==0.1.4.5
   - streaming-bytestring ==0.1.4.6
   - streaming-commons ==0.1.17
+  - streaming-utils ==0.1.4.7
+  - streaming-wai ==0.1.1
   - streamproc ==1.6.2
   - streams ==3.3
   - strict ==0.3.2
@@ -1661,15 +1826,15 @@ default-package-overrides:
   - stringable ==0.1.3
   - stringbuilder ==0.5.0
   - stringsearch ==0.3.6.6
-  - stripe-core ==2.1.0
   - strive ==3.0.2
-  - stylish-haskell ==0.6.1.0
+  - stylish-haskell ==0.7.1.0
   - success ==0.2.6
   - sundown ==0.6
+  - superbuffer ==0.2.0.1
   - svg-builder ==0.1.0.2
-  - svg-tree ==0.5.1.2
-  - SVGFonts ==1.5.0.1
-  - swagger ==0.2.2
+  - svg-tree ==0.6
+  - SVGFonts ==1.6.0.1
+  - swagger ==0.3.0
   - swagger2 ==2.1.3
   - syb ==0.6
   - syb-with-class ==0.6.1.7
@@ -1683,17 +1848,22 @@ default-package-overrides:
   - tabular ==0.2.2.7
   - tagged ==0.8.5
   - tagged-binary ==0.2.0.0
+  - tagged-identity ==0.1.1
   - taggy ==0.2.0
   - taggy-lens ==0.1.2
   - tagshare ==0.0
   - tagsoup ==0.14
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.0.3
+  - tar-conduit ==0.1.0
   - tardis ==0.4.1.0
   - tasty ==0.11.1
   - tasty-ant-xml ==1.0.4
+  - tasty-auto ==0.1.0.1
   - tasty-dejafu ==0.3.0.2
+  - tasty-discover ==1.1.0
   - tasty-expected-failure ==0.11.0.4
+  - tasty-fail-fast ==0.0.2
   - tasty-golden ==2.3.1.1
   - tasty-hspec ==1.1.3.1
   - tasty-html ==0.4.1.1
@@ -1704,16 +1874,21 @@ default-package-overrides:
   - tasty-rerun ==1.1.6
   - tasty-silver ==3.1.9
   - tasty-smallcheck ==0.8.1
+  - tasty-tap ==0.0.4
   - tasty-th ==0.1.4
+  - Taxonomy ==1.0.2
   - TCache ==0.12.0
-  - tcp-streams ==0.4.0.0
+  - tce-conf ==1.3
+  - tcp-streams ==0.6.0.0
+  - tcp-streams-openssl ==0.6.0.0
+  - telegram-api ==0.6.0.0
   - template ==0.2.0.10
   - temporary ==1.2.0.4
   - temporary-rc ==1.2.0.3
-  - terminal-progress-bar ==0.0.1.4
+  - terminal-progress-bar ==0.1.1
   - terminal-size ==0.3.2.1
   - terminfo ==0.4.0.2
-  - test-fixture ==0.4.2.0
+  - test-fixture ==0.5.0.0
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
   - test-framework-quickcheck2 ==0.3.0.3
@@ -1721,20 +1896,23 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - test-simple ==0.1.9
   - testing-feat ==0.4.0.3
-  - texmath ==0.8.6.7
+  - texmath ==0.9.1
   - text ==1.2.2.1
   - text-all ==0.3.0.2
   - text-binary ==0.2.1.1
   - text-conversions ==0.3.0
   - text-format ==0.3.1.1
+  - text-generic-pretty ==1.2.1
   - text-icu ==0.7.0.1
   - text-ldap ==0.1.1.8
   - text-manipulate ==0.2.0.1
-  - text-metrics ==0.1.0
+  - text-metrics ==0.2.0
   - text-postgresql ==0.0.2.2
   - text-region ==0.1.0.1
-  - text-show ==3.4
-  - text-show-instances ==3.4
+  - text-show ==3.4.1.1
+  - text-show-instances ==3.5
+  - text-zipper ==0.10
+  - textlocal ==0.1.0.5
   - tf-random ==0.5
   - th-data-compat ==0.0.2.2
   - th-desugar ==1.6
@@ -1743,13 +1921,13 @@ default-package-overrides:
   - th-lift ==0.7.6
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.3
-  - th-printf ==0.3.1
   - th-reify-compat ==0.0.1.1
   - th-reify-many ==0.1.6
   - th-to-exp ==0.0.1.0
-  - th-utilities ==0.2.0.1
   - these ==0.7.3
+  - thread-local-storage ==0.1.1
   - threads ==0.5.1.4
+  - threepenny-gui ==0.7.0.1
   - through-text ==0.1.0.0
   - thumbnail-plus ==1.0.5
   - thyme ==0.3.5.5
@@ -1762,14 +1940,17 @@ default-package-overrides:
   - timelens ==0.2.0.2
   - timemap ==0.0.4
   - timerep ==2.0.0.2
+  - timespan ==0.3.0.0
   - timezone-olson ==0.1.7
   - timezone-series ==0.1.6.1
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
+  - titlecase ==0.1.0.3
   - tls ==1.3.9
   - tls-debug ==0.4.4
   - token-bucket ==0.1.0.1
   - tostring ==0.2.1.1
+  - tracy ==0.1.4.0
   - transformers-base ==0.4.4
   - transformers-compat ==0.5.1.4
   - transformers-lift ==0.1.0.1
@@ -1777,30 +1958,30 @@ default-package-overrides:
   - transient-universe ==0.3.5.1
   - traverse-with-class ==0.2.0.4
   - tree-fun ==0.8.1.0
-  - tree-view ==0.4
-  - tries ==0.0.4
   - trifecta ==1.6.2.1
   - true-name ==0.1.0.2
   - ttrie ==0.1.2.1
-  - tttool ==1.6.1.2
+  - tttool ==1.7.0.1
   - tuple ==0.3.0.2
   - tuple-th ==0.2.5
   - tuples-homogenous-h98 ==0.1.1.0
-  - turtle ==1.2.8
+  - turtle ==1.3.1
   - turtle-options ==0.1.0.4
-  - twitter-conduit ==0.2.1
   - twitter-feed ==0.2.0.11
-  - twitter-types ==0.7.2.2
-  - twitter-types-lens ==0.7.2
   - type-aligned ==0.9.6
+  - type-assertions ==0.1.0.0
   - type-eq ==0.5
   - type-fun ==0.1.1
+  - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
   - type-list ==0.5.0.0
-  - type-spec ==0.2.0.0
+  - type-operators ==0.1.0.4
+  - type-spec ==0.3.0.1
+  - TypeCompose ==0.9.12
   - typed-process ==0.1.0.0
   - typelits-witnesses ==0.2.3.0
   - typography-geometry ==1.0.0.1
+  - tz ==0.1.2.1
   - tzdata ==0.1.20161123.0
   - ua-parser ==0.7.3
   - uglymemo ==0.1.0.1
@@ -1809,15 +1990,13 @@ default-package-overrides:
   - unbounded-delays ==0.1.0.9
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
-  - unfoldable ==0.8.4
-  - unfoldable-restricted ==0.0.2
   - unicode-show ==0.1.0.2
-  - unicode-transforms ==0.1.0.1
+  - unicode-transforms ==0.2.1
   - unification-fd ==0.10.0.1
   - union ==0.1.1.1
   - union-find ==0.2
   - uniplate ==1.6.12
-  - unit-constraint ==0.0.0
+  - Unique ==0.4.6.1
   - units ==2.4
   - units-defs ==2.0.1.1
   - units-parser ==0.1.0.0
@@ -1831,9 +2010,11 @@ default-package-overrides:
   - unix-compat ==0.4.3.1
   - unix-time ==0.3.7
   - Unixutils ==1.54.1
+  - unlit ==0.4.0.0
   - unordered-containers ==0.2.7.2
   - uri-bytestring ==0.2.2.1
   - uri-encode ==1.5.0.5
+  - uri-templater ==0.2.1.0
   - url ==2.1.3
   - urlpath ==5.0.0.1
   - userid ==0.1.2.8
@@ -1850,9 +2031,7 @@ default-package-overrides:
   - uuid-types ==1.0.3
   - vado ==0.0.8
   - validate-input ==0.4.0.0
-  - validation ==0.5.4
-  - validity ==0.3.1.1
-  - varying ==0.5.0.3
+  - varying ==0.7.0.3
   - vault ==0.3.0.6
   - vcswrapper ==0.1.5
   - vector ==0.11.0.0
@@ -1860,29 +2039,33 @@ default-package-overrides:
   - vector-binary-instances ==0.2.3.4
   - vector-buffer ==0.4.1
   - vector-fftw ==0.1.3.7
-  - vector-instances ==3.3.1
+  - vector-instances ==3.4
+  - vector-sized ==0.5.1.0
   - vector-space ==0.10.4
+  - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
   - vectortiles ==1.2.0.2
   - versions ==3.0.0
   - vhd ==0.2.2
-  - ViennaRNAParser ==1.2.9
+  - ViennaRNAParser ==1.3.2
+  - viewprof ==0.0.0.1
   - vinyl ==0.5.3
   - vinyl-utils ==0.3.0.0
   - void ==0.7.1
-  - vty ==5.11.3
+  - vty ==5.15
   - wai ==3.2.1.1
   - wai-app-static ==3.1.6.1
   - wai-conduit ==3.0.0.3
   - wai-cors ==0.2.5
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.19.1
+  - wai-handler-launch ==3.0.2.2
   - wai-logger ==2.3.0
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
   - wai-middleware-consul ==0.1.0.2
-  - wai-middleware-content-type ==0.4.1
+  - wai-middleware-content-type ==0.5.0.1
   - wai-middleware-crowd ==0.1.4.2
   - wai-middleware-metrics ==0.2.3
   - wai-middleware-prometheus ==0.1.0.1
@@ -1890,7 +2073,9 @@ default-package-overrides:
   - wai-middleware-throttle ==0.2.1.0
   - wai-middleware-verbs ==0.3.2
   - wai-predicates ==0.9.0
-  - wai-request-spec ==0.10.2.4
+  - wai-route ==0.3.1.1
+  - wai-routes ==0.9.10
+  - wai-routing ==0.13.0
   - wai-session ==0.3.2
   - wai-session-postgresql ==0.2.1.0
   - wai-transformers ==0.0.7
@@ -1898,6 +2083,9 @@ default-package-overrides:
   - waitra ==0.0.4.0
   - warp ==3.2.11
   - warp-tls ==3.2.3
+  - wave ==0.1.4
+  - wavefront ==0.7.0.2
+  - wavefront-obj ==0.1.0.1
   - web-plugins ==0.2.9
   - web-routes ==0.27.11
   - web-routes-boomerang ==0.28.4.2
@@ -1911,32 +2099,42 @@ default-package-overrides:
   - webkitgtk3-javascriptcore ==0.14.2.1
   - webpage ==0.0.4
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.9.8.2
+  - websockets ==0.10.0.0
+  - websockets-snap ==0.10.2.0
   - weigh ==0.0.3
-  - werewolf ==1.5.1.1
-  - werewolf-slack ==1.0.2.0
-  - wikicfp-scraper ==0.1.0.7
+  - wikicfp-scraper ==0.1.0.8
+  - wild-bind ==0.1.0.3
+  - wild-bind-indicator ==0.1.0.1
+  - wild-bind-task-x11 ==0.1.0.1
+  - wild-bind-x11 ==0.1.0.6
   - Win32 ==2.3.1.1
   - Win32-extras ==0.2.0.1
   - Win32-notify ==0.3.0.1
+  - wire-streams ==0.1.1.0
   - with-location ==0.1.0
   - withdependencies ==0.2.4
   - witherable ==0.1.3.3
+  - witness ==0.4
   - wizards ==1.0.2
   - wl-pprint ==1.2
+  - wl-pprint-annotated ==0.0.1.4
+  - wl-pprint-console ==0.1.0.1
   - wl-pprint-extras ==3.5.0.5
   - wl-pprint-terminfo ==3.7.1.4
   - wl-pprint-text ==1.1.1.0
   - word-trie ==0.3.0
+  - word24 ==2.0.1
   - word8 ==0.1.2
   - wordpass ==1.0.0.7
   - Workflow ==0.8.3
   - wrap ==0.0.0
-  - wreq ==0.4.1.0
+  - writer-cps-full ==0.1.0.0
+  - writer-cps-lens ==0.1.0.0
+  - writer-cps-morph ==0.1.0.1
   - writer-cps-mtl ==0.1.1.2
   - writer-cps-transformers ==0.1.1.2
   - wuss ==1.1.3
-  - X11 ==1.6.1.2
+  - X11 ==1.8
   - x509 ==1.6.5
   - x509-store ==1.6.2
   - x509-system ==1.6.4
@@ -1947,43 +2145,41 @@ default-package-overrides:
   - xenstore ==0.1.1
   - xhtml ==3000.2.1
   - xlsior ==0.1.0.1
-  - xlsx ==0.2.4
-  - xlsx-tabular ==0.1.0.1
+  - xlsx ==0.4.2
+  - xlsx-tabular ==0.2.2
   - xml ==1.3.14
-  - xml-conduit ==1.3.5
+  - xml-conduit ==1.4.0.3
   - xml-conduit-parse ==0.3.1.0
   - xml-conduit-writer ==0.1.1.1
   - xml-hamlet ==0.4.1
+  - xml-html-qq ==0.1.0.1
   - xml-lens ==0.1.6.3
+  - xml-picklers ==0.3.6
   - xml-to-json-fast ==2.0.0
   - xml-types ==0.3.6
   - xmlgen ==0.6.2.1
   - xmlhtml ==0.2.3.5
-  - xmonad ==0.12
+  - xmonad ==0.13
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
-  - yahoo-finance-api ==0.1.0.0
+  - yahoo-finance-api ==0.2.0.1
   - yaml ==0.8.21.2
   - Yampa ==0.10.5
   - YampaSynth ==0.2
-  - yarr ==1.4.0.2
   - yes-precure5-command ==5.5.3
   - yesod ==1.4.4
   - yesod-auth ==1.4.16
   - yesod-auth-account ==1.4.3
   - yesod-auth-basic ==0.1.0.2
-  - yesod-auth-hashdb ==1.5.1.3
-  - yesod-auth-oauth2 ==0.2.2
+  - yesod-auth-hashdb ==1.6.0.1
   - yesod-bin ==1.5.1
   - yesod-core ==1.4.31
   - yesod-eventsource ==1.4.0.1
   - yesod-fay ==0.8.0
-  - yesod-fb ==0.3.4
   - yesod-form ==1.4.10
   - yesod-form-richtext ==0.1.0.0
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
-  - yesod-job-queue ==0.3.0.1
   - yesod-newsfeed ==1.6
   - yesod-persistent ==1.4.1.1
   - yesod-sitemap ==1.4.0.1
@@ -1992,21 +2188,30 @@ default-package-overrides:
   - yesod-table ==2.0.3
   - yesod-test ==1.5.4.1
   - yesod-websockets ==0.2.5
-  - yi ==0.12.6
-  - yi-fuzzy-open ==0.1.0.1
-  - yi-language ==0.2.1
-  - yi-rope ==0.7.0.2
+  - yi-core ==0.13.5
+  - yi-frontend-vty ==0.13.5
+  - yi-fuzzy-open ==0.13.5
+  - yi-ireader ==0.13.5
+  - yi-keymap-cua ==0.13.5
+  - yi-keymap-emacs ==0.13.5
+  - yi-keymap-vim ==0.13.5
+  - yi-language ==0.13.5
+  - yi-misc-modes ==0.13.5
+  - yi-mode-haskell ==0.13.5
+  - yi-mode-javascript ==0.13.5
+  - yi-rope ==0.8
+  - yi-snippet ==0.13.5
   - yjtools ==0.9.18
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
-  - zip ==0.1.5
+  - zip ==0.1.7
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
   - zlib ==0.6.1.2
   - zlib-bindings ==0.1.1.5
   - zlib-lens ==0.1.2.1
-  - zoom-refs ==0.0.0.1
   - zot ==0.0.3
+  - ztail ==1.2
 
 extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index cdf68fd0d0d5..07e1d55a1ae9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -679,54 +679,6 @@ self: {
      }) {};
 
   "Agda" = callPackage
-    ({ mkDerivation, alex, array, base, binary, boxes, bytestring
-     , containers, cpphs, data-hash, deepseq, directory, EdisonAPI
-     , EdisonCore, edit-distance, emacs, equivalence, filemanip
-     , filepath, geniplate-mirror, happy, hashable, hashtables
-     , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty
-     , process, QuickCheck, strict, template-haskell, text, time
-     , transformers, transformers-compat, unordered-containers, xhtml
-     , zlib
-     }:
-     mkDerivation {
-       pname = "Agda";
-       version = "2.5.1.1";
-       sha256 = "563b8063fc94349b56ae1867e973f1751db0e9a8997af7ede93d3c3a8c66a6b0";
-       revision = "1";
-       editedCabalFile = "388327fd9b4f98671a05ba6aa873d8161133d71e6234fcdb208882eda9fd161b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary boxes bytestring containers data-hash deepseq
-         directory EdisonAPI EdisonCore edit-distance equivalence filepath
-         geniplate-mirror hashable hashtables haskeline haskell-src-exts
-         monadplus mtl parallel pretty process QuickCheck strict
-         template-haskell text time transformers transformers-compat
-         unordered-containers xhtml zlib
-       ];
-       libraryToolDepends = [ alex cpphs happy ];
-       executableHaskellDepends = [
-         base binary containers directory filemanip filepath
-         haskell-src-exts mtl process
-       ];
-       executableToolDepends = [ emacs ];
-       postInstall = ''
-         files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
-         for f in "''${files[@]}" ; do
-           $out/bin/agda $f
-         done
-         for f in "''${files[@]}" ; do
-           $out/bin/agda -c --no-main $f
-         done
-         $out/bin/agda-mode compile
-       '';
-       homepage = "http://wiki.portal.chalmers.se/agda/";
-       description = "A dependently typed functional programming language and proof assistant";
-       license = "unknown";
-       maintainers = with stdenv.lib.maintainers; [ abbradar ];
-     }) {inherit (pkgs) emacs;};
-
-  "Agda_2_5_2" = callPackage
     ({ mkDerivation, alex, array, base, binary, boxes, bytestring
      , containers, cpphs, data-hash, deepseq, directory, EdisonCore
      , edit-distance, emacs, equivalence, filepath, geniplate-mirror
@@ -767,7 +719,6 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
@@ -2559,6 +2510,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart_1_8_2" = callPackage
+    ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
+     , old-locale, operational, time, vector
+     }:
+     mkDerivation {
+       pname = "Chart";
+       version = "1.8.2";
+       sha256 = "8442c16959e2a46355418b82c0c6fc3174d04b41ea6e2e320c56588a563be28d";
+       libraryHaskellDepends = [
+         array base colour data-default-class lens mtl old-locale
+         operational time vector
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "A library for generating 2D Charts and Plots";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-cairo" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, colour
      , data-default-class, lens, mtl, old-locale, operational, time
@@ -2576,6 +2545,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-cairo_1_8_2" = callPackage
+    ({ mkDerivation, array, base, cairo, Chart, colour
+     , data-default-class, lens, mtl, old-locale, operational, time
+     }:
+     mkDerivation {
+       pname = "Chart-cairo";
+       version = "1.8.2";
+       sha256 = "7cd8ba9da4c43ff4d6ba468d65e91b7239a0543038996a9a626818dc1a408fc1";
+       libraryHaskellDepends = [
+         array base cairo Chart colour data-default-class lens mtl
+         old-locale operational time
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Cairo backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-diagrams" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
      , containers, data-default-class, diagrams-core, diagrams-lib
@@ -2597,14 +2584,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-diagrams_1_8_2" = callPackage
+    ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
+     , containers, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-postscript, diagrams-svg, lens, mtl, old-locale
+     , operational, svg-builder, SVGFonts, text, time
+     }:
+     mkDerivation {
+       pname = "Chart-diagrams";
+       version = "1.8.2";
+       sha256 = "ca181dec04bac1029101dd75951f48710ebc42f5333e06c57943e3245bba9f41";
+       libraryHaskellDepends = [
+         base blaze-markup bytestring Chart colour containers
+         data-default-class diagrams-core diagrams-lib diagrams-postscript
+         diagrams-svg lens mtl old-locale operational svg-builder SVGFonts
+         text time
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Diagrams backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-gtk" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, colour
      , data-default-class, gtk, mtl, old-locale, time
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.8.1";
-       sha256 = "964a8dd5b23d86f4a0d91fde5d1144fba8dd29d2810a05864ce0e795c2f7056a";
+       version = "1.8.2";
+       sha256 = "20c97819a35e0983af3e27e196c593e1bb1262f7dda86f4a874485e6042274c9";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -2771,38 +2780,20 @@ self: {
      }) {};
 
   "ClustalParser" = callPackage
-    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec
-     , vector
-     }:
-     mkDerivation {
-       pname = "ClustalParser";
-       version = "1.1.4";
-       sha256 = "d32db29dd58b9fe305b76dbdde6d0b2b328a526b63872e02177600f6832cc48f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base parsec vector ];
-       executableHaskellDepends = [ base cmdargs either-unwrap ];
-       testHaskellDepends = [ base hspec parsec ];
-       description = "Libary for parsing Clustal tools output";
-       license = "GPL";
-     }) {};
-
-  "ClustalParser_1_2_0" = callPackage
     ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
      , vector
      }:
      mkDerivation {
        pname = "ClustalParser";
-       version = "1.2.0";
-       sha256 = "e444b4780a976d13178ba0d47d34ff1c7e1222077d2ec6c81f4370dce58a8ec8";
+       version = "1.2.1";
+       sha256 = "0034a9fdca3e4bcb70edb961536ee4acb162fec0ab1b2c67108598bfcd75879d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec text vector ];
        executableHaskellDepends = [ base cmdargs either-unwrap ];
-       testHaskellDepends = [ base hspec parsec ];
+       testHaskellDepends = [ base hspec parsec text ];
        description = "Libary for parsing Clustal tools output";
-       license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "Coadjute" = callPackage
@@ -4420,6 +4411,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Earley_0_12_0_0" = callPackage
+    ({ mkDerivation, base, ListLike, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.12.0.0";
+       sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337";
+       libraryHaskellDepends = [ base ListLike ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -8254,19 +8262,6 @@ self: {
      }) {};
 
   "HUnit" = callPackage
-    ({ mkDerivation, base, deepseq, filepath }:
-     mkDerivation {
-       pname = "HUnit";
-       version = "1.3.1.2";
-       sha256 = "badebf99ae5a4982cdf2f8932f080e349240dc2b75c40e75ce2518ea086c5381";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [ base deepseq filepath ];
-       homepage = "https://github.com/hspec/HUnit#readme";
-       description = "A unit testing framework for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HUnit_1_5_0_0" = callPackage
     ({ mkDerivation, base, call-stack, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -8277,7 +8272,6 @@ self: {
        homepage = "https://github.com/hspec/HUnit#readme";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -8316,19 +8310,6 @@ self: {
      }) {};
 
   "HUnit-approx" = callPackage
-    ({ mkDerivation, base, HUnit }:
-     mkDerivation {
-       pname = "HUnit-approx";
-       version = "1.0";
-       sha256 = "618f492b3f55d7a2c332d2e3916b2cd79af1229421ad64e12a514babd896736b";
-       libraryHaskellDepends = [ base HUnit ];
-       testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/goldfirere/HUnit-approx";
-       description = "Approximate equality for floating point numbers with HUnit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HUnit-approx_1_1" = callPackage
     ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "HUnit-approx";
@@ -8339,7 +8320,6 @@ self: {
        homepage = "https://github.com/goldfirere/HUnit-approx";
        description = "Approximate equality for floating point numbers with HUnit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HXMPP" = callPackage
@@ -8389,16 +8369,16 @@ self: {
      }) {};
 
   "HaLeX" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, base, HUnit, mtl, QuickCheck }:
      mkDerivation {
        pname = "HaLeX";
-       version = "1.2.2";
-       sha256 = "8b21e5a3c5ff7f2d195f667ae4892ffcdc626fa32ff3e22c1fb0f5b5676b9c95";
+       version = "1.2.6";
+       sha256 = "5b4e22ecf647362f9d3f1908e9c211f34539c037881701f01b02414130fb7dd7";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base mtl ];
+       libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
-       description = "HaLeX enables modelling, manipulation and animation of regular languages";
+       description = "HaLeX enables modelling, manipulation and visualization of regular languages";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -8429,43 +8409,33 @@ self: {
      }) {};
 
   "HaRe" = callPackage
-    ({ mkDerivation, array, base, Cabal, cabal-helper, containers
-     , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
-     , ghc-paths, ghc-prim, ghc-syb-utils, gitrev, hslogger, hspec
-     , HUnit, monad-control, monoid-extras, mtl, old-time
-     , optparse-applicative, optparse-simple, parsec, pretty, process
-     , QuickCheck, rosezipper, semigroups, silently
-     , Strafunski-StrategyLib, stringbuilder, syb, syz, time
-     , transformers, transformers-base
+    ({ mkDerivation, attoparsec, base, base-prelude, Cabal
+     , cabal-helper, case-insensitive, containers, conversion
+     , conversion-case-insensitive, conversion-text, Diff, directory
+     , filepath, foldl, ghc, ghc-exactprint, ghc-mod, ghc-syb-utils
+     , gitrev, hslogger, hspec, HUnit, monad-control, mtl
+     , optparse-applicative, optparse-simple, parsec
+     , Strafunski-StrategyLib, syb, syz, turtle
      }:
      mkDerivation {
        pname = "HaRe";
-       version = "0.8.3.0";
-       sha256 = "11e302f5379fe88aa8740a886f321e3e14c29b0b39417ab0621f3a070c1edcd2";
+       version = "0.8.4.0";
+       sha256 = "733272478f0aa195c86a344b548bdfdc453c41eaf5b9bc482e5a8fa8f81615fb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal cabal-helper containers directory filepath ghc
-         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger
-         monad-control monoid-extras mtl old-time pretty rosezipper
-         semigroups Strafunski-StrategyLib syb syz time transformers
-         transformers-base
+         base cabal-helper containers directory filepath ghc ghc-exactprint
+         ghc-mod ghc-syb-utils hslogger monad-control mtl
+         Strafunski-StrategyLib syb syz
        ];
        executableHaskellDepends = [
-         array base Cabal cabal-helper containers directory filepath ghc
-         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils gitrev
-         hslogger monad-control monoid-extras mtl old-time
-         optparse-applicative optparse-simple parsec pretty rosezipper
-         semigroups Strafunski-StrategyLib syb syz time transformers
-         transformers-base
+         base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple
        ];
        testHaskellDepends = [
-         base Cabal cabal-helper containers deepseq Diff directory filepath
-         ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils
-         hslogger hspec HUnit monad-control monoid-extras mtl old-time
-         process QuickCheck rosezipper semigroups silently
-         Strafunski-StrategyLib stringbuilder syb syz time transformers
-         transformers-base
+         attoparsec base base-prelude case-insensitive containers conversion
+         conversion-case-insensitive conversion-text Diff directory foldl
+         ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl
+         parsec turtle
        ];
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
@@ -10065,6 +10035,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Jdh" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Jdh";
+       version = "0.1.0.0";
+       sha256 = "df460a97cde668b6d170ddcbfe547e146de56524108a4e811c6ca7bb26b4e864";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/brunoczim/Json-Data-for-Haskell";
+       description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "JsContracts" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
      , pretty, syb, WebBits, WebBits-Html
@@ -11194,8 +11176,8 @@ self: {
     ({ mkDerivation, base, bytestring, hidapi, mtl }:
      mkDerivation {
        pname = "MBot";
-       version = "0.1.1.0";
-       sha256 = "6752fb112e01c02273ef55254b0f9cb16bbff4954592372ba9c152d9cb41dc12";
+       version = "0.1.2.0";
+       sha256 = "5edf898d58cfd9fbe4774993db794967e0af4c4202c8e43c788c05ef90a2f223";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
@@ -11445,20 +11427,6 @@ self: {
      }) {};
 
   "MemoTrie" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "MemoTrie";
-       version = "0.6.4";
-       sha256 = "4238c8f7ea1ecd2497d0a948493acbdc47728b2528b6e7841ef064b783d68b1c";
-       revision = "1";
-       editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/conal/MemoTrie";
-       description = "Trie-based memo functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "MemoTrie_0_6_7" = callPackage
     ({ mkDerivation, base, newtype-generics }:
      mkDerivation {
        pname = "MemoTrie";
@@ -11468,7 +11436,6 @@ self: {
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MetaHDBC" = callPackage
@@ -11801,34 +11768,18 @@ self: {
      }) {};
 
   "MonadRandom" = callPackage
-    ({ mkDerivation, base, mtl, random, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "MonadRandom";
-       version = "0.4.2.3";
-       sha256 = "de40b12a70ec6425a9e54b33e2ac652e14d7c005a3b46d701d1e5696b98636c0";
-       libraryHaskellDepends = [
-         base mtl random transformers transformers-compat
-       ];
-       description = "Random-number generation monad";
-       license = "unknown";
-     }) {};
-
-  "MonadRandom_0_5" = callPackage
     ({ mkDerivation, base, fail, mtl, primitive, random, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "MonadRandom";
-       version = "0.5";
-       sha256 = "e239800faed1142b348d1125232ee1266209865ff6aa09516d4d516bec88c3dc";
+       version = "0.5.1";
+       sha256 = "9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87";
        libraryHaskellDepends = [
          base fail mtl primitive random transformers transformers-compat
        ];
        description = "Random-number generation monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadRandomLazy" = callPackage
@@ -14083,25 +14034,6 @@ self: {
      }) {};
 
   "QuickCheck" = callPackage
-    ({ mkDerivation, base, containers, random, template-haskell
-     , test-framework, tf-random, transformers
-     }:
-     mkDerivation {
-       pname = "QuickCheck";
-       version = "2.8.2";
-       sha256 = "98c64de1e2dbf801c54dcdcb8ddc33b3569e0da38b39d711ee6ac505769926aa";
-       libraryHaskellDepends = [
-         base containers random template-haskell tf-random transformers
-       ];
-       testHaskellDepends = [
-         base containers template-haskell test-framework
-       ];
-       homepage = "https://github.com/nick8325/quickcheck";
-       description = "Automatic testing of Haskell programs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "QuickCheck_2_9_2" = callPackage
     ({ mkDerivation, base, containers, random, template-haskell
      , test-framework, tf-random, transformers
      }:
@@ -14118,7 +14050,6 @@ self: {
        homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-GenT" = callPackage
@@ -14417,8 +14348,8 @@ self: {
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.3.0";
-       sha256 = "43d4b160cab7a7c39e4c21744637752beb527ebcb9f12ca674c18fb84135dfab";
+       version = "1.3.1";
+       sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -14607,22 +14538,6 @@ self: {
      }) {};
 
   "Rasterific" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
-     , free, JuicyPixels, mtl, primitive, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "Rasterific";
-       version = "0.6.1.1";
-       sha256 = "1887b28b9921dfb2d4d64cb888e5febce17db828103a7e2aed0a978d9fa78665";
-       libraryHaskellDepends = [
-         base bytestring containers dlist FontyFruity free JuicyPixels mtl
-         primitive vector vector-algorithms
-       ];
-       description = "A pure haskell drawing engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Rasterific_0_7_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
      , free, JuicyPixels, mtl, primitive, transformers, vector
      , vector-algorithms
@@ -14639,7 +14554,6 @@ self: {
        ];
        description = "A pure haskell drawing engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ReadArgs" = callPackage
@@ -14703,8 +14617,8 @@ self: {
      }:
      mkDerivation {
        pname = "RefSerialize";
-       version = "0.3.1.4";
-       sha256 = "dc38719d34a5e238dc7cda731f49a5367fc5a0bf7d4b1db44be5e2ac5a9781c2";
+       version = "0.4.0";
+       sha256 = "05b25eb1ab943d96119aa2acca678fc8f194c3411af521e3835f4de5c752bbb2";
        libraryHaskellDepends = [
          base binary bytestring containers hashtables stringsearch
        ];
@@ -15183,27 +15097,14 @@ self: {
     ({ mkDerivation, array, base, Cabal, mtl }:
      mkDerivation {
        pname = "STMonadTrans";
-       version = "0.3.4";
-       sha256 = "44935ff710369da1614e00a40dabea6ba3a4dd02959d7b0e5ed17a915c3f0210";
+       version = "0.4.3";
+       sha256 = "574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db";
        libraryHaskellDepends = [ array base mtl ];
        testHaskellDepends = [ array base Cabal mtl ];
        description = "A monad transformer version of the ST monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "STMonadTrans_0_4" = callPackage
-    ({ mkDerivation, array, base, Cabal, mtl }:
-     mkDerivation {
-       pname = "STMonadTrans";
-       version = "0.4";
-       sha256 = "518667c253184c8c5cf707564d117f67bb0fabf5f6ebe8b25400359d4a8a6200";
-       libraryHaskellDepends = [ array base mtl ];
-       testHaskellDepends = [ array base Cabal mtl ];
-       description = "A monad transformer version of the ST monad";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "SVG2Q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -15224,24 +15125,6 @@ self: {
      }) {};
 
   "SVGFonts" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
-     , containers, data-default-class, diagrams-core, diagrams-lib
-     , directory, parsec, split, text, tuple, vector, xml
-     }:
-     mkDerivation {
-       pname = "SVGFonts";
-       version = "1.5.0.1";
-       sha256 = "7b3431a70f94e89e78e1e28c5730060c5af522526ac7a1318b51de2c4d4c4ef4";
-       libraryHaskellDepends = [
-         attoparsec base blaze-markup blaze-svg containers
-         data-default-class diagrams-core diagrams-lib directory parsec
-         split text tuple vector xml
-       ];
-       description = "Fonts from the SVG-Font format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "SVGFonts_1_6_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
      , bytestring, cereal, cereal-vector, containers, data-default-class
      , diagrams-core, diagrams-lib, directory, parsec, split, text
@@ -15258,7 +15141,6 @@ self: {
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGPath" = callPackage
@@ -15974,18 +15856,6 @@ self: {
      }) {};
 
   "Spintax" = callPackage
-    ({ mkDerivation, attoparsec, base, extra, mwc-random, text }:
-     mkDerivation {
-       pname = "Spintax";
-       version = "0.1.0.1";
-       sha256 = "bf749b240dcec32068ca1b94f34bfd824722f57c63c0c81473fd8ff88533dfe7";
-       libraryHaskellDepends = [ attoparsec base extra mwc-random text ];
-       homepage = "https://github.com/MichelBoucey/spintax";
-       description = "Random text generation based on spintax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spintax_0_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
      mkDerivation {
        pname = "Spintax";
@@ -15997,38 +15867,9 @@ self: {
        homepage = "https://github.com/MichelBoucey/spintax";
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, containers
-     , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
-     , list-t, monad-control, mtl, reroute, resource-pool, resourcet
-     , Spock-core, stm, stm-containers, text, time, transformers
-     , transformers-base, unordered-containers, vault, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "Spock";
-       version = "0.11.0.0";
-       sha256 = "9dcc232e83860d28f44bd4f35a8b38e59330ada78a30c661aaddf244f4a5deb3";
-       revision = "1";
-       editedCabalFile = "22e12daad61dfaeefdbad563859bf8efe1ee38cf0be49cb18e954227d7e76eac";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring containers cryptonite focus
-         hashable http-types hvect list-t monad-control mtl reroute
-         resource-pool resourcet Spock-core stm stm-containers text time
-         transformers transformers-base unordered-containers vault wai
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hspec-wai Spock-core stm text time
-         unordered-containers vault wai wai-extra
-       ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock_0_12_0_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, containers
      , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
      , list-t, monad-control, mtl, reroute, resource-pool, resourcet
@@ -16052,22 +15893,9 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-api" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
-     mkDerivation {
-       pname = "Spock-api";
-       version = "0.11.0.0";
-       sha256 = "993272b289d95f2e7e704b24d8297b63257b1434ec205faddf8a2ec7bc1aea29";
-       libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-api_0_12_0_0" = callPackage
     ({ mkDerivation, aeson, base, deepseq, hvect, reroute }:
      mkDerivation {
        pname = "Spock-api";
@@ -16077,7 +15905,6 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-api-ghcjs" = callPackage
@@ -16098,18 +15925,6 @@ self: {
      }) {};
 
   "Spock-api-server" = callPackage
-    ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
-     mkDerivation {
-       pname = "Spock-api-server";
-       version = "0.11.0.0";
-       sha256 = "35d0fd72caed2bd4e2cc52d2a39b3af528845ec9bc58cf64dfe4b6ccd956ac3d";
-       libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-api-server_0_12_0_0" = callPackage
     ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }:
      mkDerivation {
        pname = "Spock-api-server";
@@ -16119,7 +15934,6 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-auth" = callPackage
@@ -16136,32 +15950,6 @@ self: {
      }) {};
 
   "Spock-core" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , case-insensitive, containers, cookie, directory, hashable, hspec
-     , hspec-wai, http-types, hvect, mtl, old-locale, path-pieces
-     , reroute, resourcet, stm, text, time, transformers
-     , unordered-containers, vault, wai, wai-extra, warp
-     }:
-     mkDerivation {
-       pname = "Spock-core";
-       version = "0.11.0.0";
-       sha256 = "d6339c4b8e5ac3a98e5545e3f4c64f1ff515c125ae9fb33d2176972e1244aa9a";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring case-insensitive containers
-         cookie directory hashable http-types hvect mtl old-locale
-         path-pieces reroute resourcet stm text time transformers
-         unordered-containers vault wai wai-extra warp
-       ];
-       testHaskellDepends = [
-         base base64-bytestring bytestring hspec hspec-wai http-types
-         reroute text time transformers unordered-containers wai
-       ];
-       homepage = "https://www.spock.li";
-       description = "Another Haskell web framework for rapid development";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Spock-core_0_12_0_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, containers, cookie, directory, hashable, hspec
      , hspec-wai, http-api-data, http-types, hvect, mtl, old-locale
@@ -16185,7 +15973,6 @@ self: {
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-digestive" = callPackage
@@ -16600,6 +16387,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "TCache_0_12_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , hashtables, mtl, old-time, RefSerialize, stm, text
+     }:
+     mkDerivation {
+       pname = "TCache";
+       version = "0.12.1";
+       sha256 = "f134b45fcdd127fa1a4214f01d44dc34e994fed137cec63f4c4ea632363ab7bd";
+       libraryHaskellDepends = [
+         base bytestring containers directory hashtables mtl old-time
+         RefSerialize stm text
+       ];
+       description = "A Transactional cache with user-defined persistence";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "THEff" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -17591,18 +17395,6 @@ self: {
      }) {};
 
   "ViennaRNAParser" = callPackage
-    ({ mkDerivation, base, hspec, parsec, process, transformers }:
-     mkDerivation {
-       pname = "ViennaRNAParser";
-       version = "1.2.9";
-       sha256 = "f4e8964ce0710a0461d49e790784a8b82579f4c6079c5732b7fe1ae09fefb219";
-       libraryHaskellDepends = [ base parsec process transformers ];
-       testHaskellDepends = [ base hspec parsec ];
-       description = "Libary for parsing ViennaRNA package output";
-       license = "GPL";
-     }) {};
-
-  "ViennaRNAParser_1_3_2" = callPackage
     ({ mkDerivation, base, hspec, parsec, ParsecTools, process
      , transformers
      }:
@@ -17616,7 +17408,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vulkan" = callPackage
@@ -17942,14 +17733,14 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_5_0_0" = callPackage
+  "Win32_2_5_1_0" = callPackage
     ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
      , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.5.0.0";
-       sha256 = "45d7fd5f251ba418d649100cfea9d924b7ef42a8c35df5bb373fd6dd687d2694";
+       version = "2.5.1.0";
+       sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52";
        libraryHaskellDepends = [ base bytestring filepath ];
        librarySystemDepends = [
          advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32
@@ -18236,27 +18027,8 @@ self: {
      }:
      mkDerivation {
        pname = "X11";
-       version = "1.6.1.2";
-       sha256 = "5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf";
-       libraryHaskellDepends = [ base data-default ];
-       librarySystemDepends = [
-         libX11 libXext libXinerama libXrandr libXrender
-       ];
-       homepage = "https://github.com/haskell-pkg-janitors/X11";
-       description = "A binding to the X11 graphics library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; 
-         inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
-         inherit (pkgs.xorg) libXrender;};
-
-  "X11_1_7" = callPackage
-    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
-     , libXrandr, libXrender
-     }:
-     mkDerivation {
-       pname = "X11";
-       version = "1.7";
-       sha256 = "9e7a67b9521fc0140b4804928f3821b6c3d3950fdc1d9c55478844dc4f57f5f4";
+       version = "1.8";
+       sha256 = "541b166aab1e05a92dc8f42a511d827e7aad373af12ae283b9df9982ccc09d8e";
        libraryHaskellDepends = [ base data-default ];
        librarySystemDepends = [
          libX11 libXext libXinerama libXrandr libXrender
@@ -18264,7 +18036,6 @@ self: {
        homepage = "https://github.com/xmonad/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; 
          inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXrender;};
@@ -19940,24 +19711,6 @@ self: {
      }) {};
 
   "active" = callPackage
-    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
-     , semigroups, vector
-     }:
-     mkDerivation {
-       pname = "active";
-       version = "0.2.0.10";
-       sha256 = "0819b0ae7a690bba42f974ba3d1efb1b356919e0f9e278cb30653d022bce78b1";
-       libraryHaskellDepends = [
-         base lens linear semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base lens linear QuickCheck semigroupoids semigroups vector
-       ];
-       description = "Abstractions for animation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "active_0_2_0_12" = callPackage
     ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
      , semigroups, vector
      }:
@@ -19973,7 +19726,6 @@ self: {
        ];
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activehs" = callPackage
@@ -20301,34 +20053,6 @@ self: {
      }) {};
 
   "aeson" = callPackage
-    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
-     , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
-     , QuickCheck, quickcheck-instances, scientific, syb, tagged
-     , template-haskell, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson";
-       version = "0.11.3.0";
-       sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers deepseq dlist fail ghc-prim
-         hashable mtl scientific syb tagged template-haskell text time
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         attoparsec base base-orphans bytestring containers ghc-prim
-         hashable HUnit QuickCheck quickcheck-instances tagged
-         template-haskell test-framework test-framework-hunit
-         test-framework-quickcheck2 text time unordered-containers vector
-       ];
-       homepage = "https://github.com/bos/aeson";
-       description = "Fast JSON parsing and encoding";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson_1_0_2_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, dlist
      , generic-deriving, ghc-prim, hashable, hashable-time, HUnit
@@ -20357,7 +20081,6 @@ self: {
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_1_1_0_0" = callPackage
@@ -21262,6 +20985,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "airtable-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hashable, lens, text
+     , unordered-containers, wreq
+     }:
+     mkDerivation {
+       pname = "airtable-api";
+       version = "0.1.0.4";
+       sha256 = "049949b130b19ee06c638494c95ca9b55fe3c071079a490ae10f01430c04b0dd";
+       libraryHaskellDepends = [
+         aeson base bytestring hashable lens text unordered-containers wreq
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/ooblahman/airtable-api";
+       description = "Requesting and introspecting Tables within an Airtable project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika" = callPackage
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
@@ -21501,26 +21241,6 @@ self: {
      }) {};
 
   "alex" = callPackage
-    ({ mkDerivation, array, base, containers, directory, happy, process
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "alex";
-       version = "3.1.7";
-       sha256 = "89a1a13da6ccbeb006488d9574382e891cf7c0567752b330cc8616d748bf28d1";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         array base containers directory QuickCheck
-       ];
-       executableToolDepends = [ happy ];
-       testHaskellDepends = [ base process ];
-       homepage = "http://www.haskell.org/alex/";
-       description = "Alex is a tool for generating lexical analysers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alex_3_2_1" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy, process
      , QuickCheck
      }:
@@ -21538,7 +21258,6 @@ self: {
        homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex-meta" = callPackage
@@ -22193,27 +21912,6 @@ self: {
      }) {};
 
   "amazonka" = callPackage
-    ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
-     , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
-     , time, transformers, transformers-base, transformers-compat
-     }:
-     mkDerivation {
-       pname = "amazonka";
-       version = "1.4.3";
-       sha256 = "18aa7816d755df58a824fc252d34cb1f81c6cba2ca2a7194c3a3f0d630c26686";
-       libraryHaskellDepends = [
-         amazonka-core base bytestring conduit conduit-extra directory
-         exceptions http-conduit ini mmorph monad-control mtl resourcet
-         retry text time transformers transformers-base transformers-compat
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Comprehensive Amazon Web Services SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
      , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
      , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
@@ -22232,29 +21930,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-apigateway" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-apigateway";
-       version = "1.4.3";
-       sha256 = "74fe95daa465255ad2a49f3f0b78242c5e1ec33d81d0e9dfffa833324894d948";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon API Gateway SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "amazonka-apigateway_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22274,24 +21952,6 @@ self: {
      }) {};
 
   "amazonka-application-autoscaling" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-application-autoscaling";
-       version = "1.4.3";
-       sha256 = "5506a59b594355ab0e78f3e1c0f550bd5b2a858c4a0688732a4931e6ac096f6c";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Application Auto Scaling SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-application-autoscaling_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22307,7 +21967,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Auto Scaling SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-appstream" = callPackage
@@ -22330,24 +21989,6 @@ self: {
      }) {};
 
   "amazonka-autoscaling" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-autoscaling";
-       version = "1.4.3";
-       sha256 = "4a47502b75b54cae3ab3da1792f5862a1e726e551d25bc0ba54f7854a66fa3df";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Auto Scaling SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-autoscaling_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22363,7 +22004,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-budgets" = callPackage
@@ -22386,24 +22026,6 @@ self: {
      }) {};
 
   "amazonka-certificatemanager" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-certificatemanager";
-       version = "1.4.3";
-       sha256 = "d1228f95581d90f53a29dba53c1d7a1d0eb7439e278c4c5aca70af01f3e30d55";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Certificate Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-certificatemanager_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22419,28 +22041,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Certificate Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudformation" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudformation";
-       version = "1.4.3";
-       sha256 = "3b2069debd35ddfd08af2281902d7c063b267fd2a23b71057321cd2e55cd7690";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudFormation SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudformation_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22456,28 +22059,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudfront" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudfront";
-       version = "1.4.3";
-       sha256 = "5241ccb0d39cc055f97eb6496835783a97de0ce0b33c765a1325d01119abecbe";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudFront SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudfront_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22493,28 +22077,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudhsm" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudhsm";
-       version = "1.4.3";
-       sha256 = "6848989619b58c75fa1d72d122e96c621b881bf4c376b9325eeb54c8c3200c43";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudHSM SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudhsm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22530,28 +22095,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudsearch";
-       version = "1.4.3";
-       sha256 = "7126175d24355afa678c9dd59400fd1b1a40c18240d96de88bd831b0099c0c26";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudSearch SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudsearch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22567,28 +22113,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudsearch-domains" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudsearch-domains";
-       version = "1.4.3";
-       sha256 = "4416cb88845bd27c845ecac50029e7721f3d13d26d24ab6c9c571b5c2c543f7d";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudSearch Domain SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudsearch-domains_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22604,28 +22131,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudtrail" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudtrail";
-       version = "1.4.3";
-       sha256 = "04ea4c78e0d73f71e1144eb5a357e1e6bce16109453ab30c31d8e7a9ae77fa6f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudTrail SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudtrail_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22641,28 +22149,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudwatch";
-       version = "1.4.3";
-       sha256 = "98df67a18bfdf4c00736f6be41576877f8191ac936ab2f5666b160cb80c22d5f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudWatch SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudwatch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22678,28 +22167,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-events" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudwatch-events";
-       version = "1.4.3";
-       sha256 = "fb839e3e4c402151e138b1d69356600f2d378d53631a3616b6228f620713df56";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudWatch Events SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudwatch-events_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22715,28 +22185,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Events SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cloudwatch-logs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cloudwatch-logs";
-       version = "1.4.3";
-       sha256 = "de201710b2d594519b1c9d8b20fab92e1a0f4e777e5c05ed1bd32c91ae260161";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CloudWatch Logs SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cloudwatch-logs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22752,7 +22203,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codebuild" = callPackage
@@ -22775,24 +22225,6 @@ self: {
      }) {};
 
   "amazonka-codecommit" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-codecommit";
-       version = "1.4.3";
-       sha256 = "fe8d033203bccb7c8c7242a063a814cdbb8a22fb4a95e5fa4f01b200d547966b";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CodeCommit SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-codecommit_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22808,28 +22240,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeCommit SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codedeploy" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-codedeploy";
-       version = "1.4.3";
-       sha256 = "d216d3af7472428fecab9763e65e2f2ea412dfaaf8debbbe5e37ab158c5392d9";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CodeDeploy SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-codedeploy_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22845,28 +22258,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-codepipeline" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-codepipeline";
-       version = "1.4.3";
-       sha256 = "2422824f998a0808151310c88c780bfa411a0f56966f93f614694f4dd526fdb1";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon CodePipeline SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-codepipeline_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22882,28 +22276,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodePipeline SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-identity" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cognito-identity";
-       version = "1.4.3";
-       sha256 = "a45aa18f815e75da5e928ec8dfe7ed827394b0b1f4654bf059fe1f3897bfb232";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Cognito Identity SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cognito-identity_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22919,28 +22294,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-idp" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cognito-idp";
-       version = "1.4.3";
-       sha256 = "a7c23b78acf5ca6701540bd74bb5e20b007acbce0bf97905083e2e5dcab940e2";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Cognito Identity Provider SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cognito-idp_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22956,28 +22312,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity Provider SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-cognito-sync" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-cognito-sync";
-       version = "1.4.3";
-       sha256 = "51a484d6dd44e9d6f9506bd8d97f04ccfa48a04e79aadb193b8644e17a696be7";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Cognito Sync SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-cognito-sync_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -22993,28 +22330,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-config" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-config";
-       version = "1.4.3";
-       sha256 = "d9c105b20e1269c55a59180ef61f040315643f873c0075b8b95e84723508e266";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Config SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-config_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23030,42 +22348,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-core" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
-     , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
-     , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups
-     , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, time, transformers, transformers-compat
-     , unordered-containers, xml-conduit, xml-types
-     }:
-     mkDerivation {
-       pname = "amazonka-core";
-       version = "1.4.3";
-       sha256 = "8270e26104bb0cbc7654d3522dce631c9804b433ec9ff5a2a0c7f844938eead0";
-       revision = "1";
-       editedCabalFile = "c2a93b788f323072f99ab6c120449c605f9249ba5e44d9e56221fa95b5254dba";
-       libraryHaskellDepends = [
-         aeson attoparsec base bifunctors bytestring case-insensitive
-         conduit conduit-extra cryptonite deepseq exceptions hashable
-         http-conduit http-types lens memory mtl resourcet scientific
-         semigroups tagged text time transformers transformers-compat
-         unordered-containers xml-conduit xml-types
-       ];
-       testHaskellDepends = [
-         aeson base bytestring case-insensitive http-types QuickCheck
-         quickcheck-unicode tasty tasty-hunit tasty-quickcheck
-         template-haskell text time
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Core data types and functionality for Amazonka libraries";
-       license = "unknown";
-     }) {};
-
-  "amazonka-core_1_4_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite, deepseq
      , exceptions, hashable, http-conduit, http-types, lens, memory, mtl
@@ -23093,28 +22378,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Core data types and functionality for Amazonka libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-datapipeline" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-datapipeline";
-       version = "1.4.3";
-       sha256 = "04bb3873f247a6fc75b5f0a7822e28c1d212765b7918d490474b6bb0faf3d781";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Data Pipeline SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-datapipeline_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23130,28 +22396,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-devicefarm" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-devicefarm";
-       version = "1.4.3";
-       sha256 = "36ac89a5166ac8bf89d628b43ea7bd88e6624e9fedd6e7de2a7be5501a3d35cd";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Device Farm SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-devicefarm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23167,28 +22414,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Device Farm SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-directconnect" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-directconnect";
-       version = "1.4.3";
-       sha256 = "96f67da0a8afb2013c84fc5650e700736711105b7924ce8f288f7f61ba133c7d";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Direct Connect SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-directconnect_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23204,28 +22432,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-discovery" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-discovery";
-       version = "1.4.3";
-       sha256 = "bfe7c0601d44ca07c28171cb1def3eec5297fa690e6d005edeed4659ec49365f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Application Discovery Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-discovery_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23241,28 +22450,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Discovery Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dms" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-dms";
-       version = "1.4.3";
-       sha256 = "1714e72bc22176cab07ab9932cec4050e816c450afc3bf6a2810f3318066f8ff";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Database Migration Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-dms_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23278,28 +22468,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Database Migration Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ds" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ds";
-       version = "1.4.3";
-       sha256 = "d3433eb5c52093f2274055595174bda99e32eb3a4c4760811c22f9c0bbcfe700";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Directory Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ds_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23315,28 +22486,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Directory Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-dynamodb";
-       version = "1.4.3";
-       sha256 = "309d695e84fcf5fb2234031b5c650ae2d72ee9bb91bee1cc2522b95228e4d652";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon DynamoDB SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-dynamodb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23352,28 +22504,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-dynamodb-streams" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-dynamodb-streams";
-       version = "1.4.3";
-       sha256 = "61cc56bdbd831438d1daa1149106df1b1f5f0d8f6d8b20cbafcb4ad2869206c5";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon DynamoDB Streams SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-dynamodb-streams_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23389,28 +22522,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Streams SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ec2" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ec2";
-       version = "1.4.3";
-       sha256 = "caeb98e701196d9350d44cd6b1f7b1f5790cc1c4bbbb30dd70824d025c7cc1b7";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Compute Cloud SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ec2_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23426,28 +22540,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecr" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ecr";
-       version = "1.4.3";
-       sha256 = "e9c1475c8eb4b89cafc7df8f2e8d6c4cff16b349db5407d014ef49726d7b1861";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon EC2 Container Registry SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ecr_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23463,28 +22558,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Registry SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ecs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ecs";
-       version = "1.4.3";
-       sha256 = "4c10a7da68605f7a9656714cb134cf47d920b2aa02f0c38e0c06f8ddf9152471";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon EC2 Container Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ecs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23500,28 +22576,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-efs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-efs";
-       version = "1.4.3";
-       sha256 = "c65054594451e774e1e9ad1fbfbf8a724dac86cbd4efa01aa5119d3d9f7a8301";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic File System SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-efs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23537,28 +22594,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic File System SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticache" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elasticache";
-       version = "1.4.3";
-       sha256 = "673912e1f5db5762dd00da1312cc09e2265da0ac6a35d92ee2bbb6e88230f879";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon ElastiCache SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elasticache_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23574,28 +22612,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticbeanstalk" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elasticbeanstalk";
-       version = "1.4.3";
-       sha256 = "675730e477fcf3926605dc42bf08f3fba48f7272cc63cb5c845bb16c296fbd9b";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Beanstalk SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elasticbeanstalk_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23611,28 +22630,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elasticsearch" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elasticsearch";
-       version = "1.4.3";
-       sha256 = "9e7b1911946ce7a0df8c7ef13277f32a06a26e2a7a6334b3d1514cf089d014d5";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elasticsearch Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elasticsearch_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23648,28 +22648,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elasticsearch Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elastictranscoder" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elastictranscoder";
-       version = "1.4.3";
-       sha256 = "9a5d534e54f5421a37103b4117d07bcf16eb241a0bd153457037f1f83ccb8b2f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Transcoder SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elastictranscoder_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23685,28 +22666,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elb" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-elb";
-       version = "1.4.3";
-       sha256 = "81fae99dff50a8feb54150afdb5ef6a06b1be57b6d46957e37c503a730bd2d56";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic Load Balancing SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-elb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23722,7 +22684,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-elbv2" = callPackage
@@ -23745,24 +22706,6 @@ self: {
      }) {};
 
   "amazonka-emr" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-emr";
-       version = "1.4.3";
-       sha256 = "b31ab69a06ea6ba585a89c133a78ed0ea2cb89faa9e2a04b6d12228167fa8e75";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Elastic MapReduce SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-emr_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23778,28 +22721,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-gamelift" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-gamelift";
-       version = "1.4.3";
-       sha256 = "c7fa8f5e3d83a6c1b2848676e270534dac9c8084d702abcd2edc79b603766429";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon GameLift SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-gamelift_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23815,28 +22739,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon GameLift SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-glacier" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-glacier";
-       version = "1.4.3";
-       sha256 = "dddfa10e13eceba289a534fa6f7accd2969c8c6cc06b967e5bf35604c6738bec";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Glacier SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-glacier_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23852,7 +22757,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-health" = callPackage
@@ -23875,24 +22779,6 @@ self: {
      }) {};
 
   "amazonka-iam" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-iam";
-       version = "1.4.3";
-       sha256 = "4208dcc7e9f4a5c351246d4c33f7215079dad2325e0e894186284d86c8243734";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Identity and Access Management SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-iam_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23908,28 +22794,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-importexport" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-importexport";
-       version = "1.4.3";
-       sha256 = "ce555f40f865c0ef4680b6fd2344927f86f44bc04cb4f97d8bdd47c18de3ca64";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Import/Export SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-importexport_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23945,28 +22812,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-inspector" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-inspector";
-       version = "1.4.3";
-       sha256 = "0f54b9b7c5bf3317390e86e3351806116fc55dce8614f26c79af7bfed1bf28c8";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Inspector SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-inspector_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -23982,28 +22830,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Inspector SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-iot";
-       version = "1.4.3";
-       sha256 = "4b9f17daddab2f04f60d84109e8c78077bd1feae610f0053fbe7edf0317c3e91";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon IoT SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-iot_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24019,28 +22848,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-iot-dataplane" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-iot-dataplane";
-       version = "1.4.3";
-       sha256 = "2c3ef08bc6a294591f029a7189a35acf5cbd9bc332f1f3f8f94cca0a8e9a5b96";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon IoT Data Plane SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-iot-dataplane_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24056,28 +22866,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT Data Plane SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-kinesis";
-       version = "1.4.3";
-       sha256 = "6b9f597488893470ef9914857ec3e593aea3a41b2c69794d95065ce3e332e812";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Kinesis SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-kinesis_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24093,7 +22884,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kinesis-analytics" = callPackage
@@ -24116,24 +22906,6 @@ self: {
      }) {};
 
   "amazonka-kinesis-firehose" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-kinesis-firehose";
-       version = "1.4.3";
-       sha256 = "2add7d8f8b27cbc339c473244007683d7ceab6caa00258c9030ed8983d16853a";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Kinesis Firehose SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-kinesis-firehose_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24149,28 +22921,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Firehose SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-kms" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-kms";
-       version = "1.4.3";
-       sha256 = "933a098970511c03b72698138329350ac722dd84dbd3fc76b49e2eb5504a73ed";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Key Management Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-kms_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24186,28 +22939,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lambda" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-lambda";
-       version = "1.4.3";
-       sha256 = "4ed68d68eaa379b41f0ccf4ef82981687bd029fea84b544a0137ce0408d01787";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Lambda SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-lambda_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24223,7 +22957,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-lightsail" = callPackage
@@ -24246,24 +22979,6 @@ self: {
      }) {};
 
   "amazonka-marketplace-analytics" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-marketplace-analytics";
-       version = "1.4.3";
-       sha256 = "cca9bd6001747c33714601b7b9cc85623e179e99f67e05e04d38be340d80dec7";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Marketplace Commerce Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-marketplace-analytics_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24279,28 +22994,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-marketplace-metering" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-marketplace-metering";
-       version = "1.4.3";
-       sha256 = "577270b944784ea27d8cc0e911757c5a5fe18657892d2862e5e20e3e64b37a21";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Marketplace Metering SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-marketplace-metering_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24316,28 +23012,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Metering SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-ml" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ml";
-       version = "1.4.3";
-       sha256 = "dd5731a2df42ecb1d07968436ed27c1a72b61a3e1b5a3b7c8c04d38ed9ada4dd";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Machine Learning SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ml_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24353,28 +23030,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-opsworks" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-opsworks";
-       version = "1.4.3";
-       sha256 = "8a3844b702d7d68e7f26b8a886e3c4ca3984b6f2522c13f0e7c5174f2e8ef273";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon OpsWorks SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-opsworks_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24390,7 +23048,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-opsworks-cm" = callPackage
@@ -24451,25 +23108,6 @@ self: {
      }) {};
 
   "amazonka-rds" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-rds";
-       version = "1.4.3";
-       sha256 = "4d58e361bdc88245b71e718edace7f2a360fecb7bf243a61d0eac1424abf2acf";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Relational Database Service SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "amazonka-rds_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24489,24 +23127,6 @@ self: {
      }) {};
 
   "amazonka-redshift" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-redshift";
-       version = "1.4.3";
-       sha256 = "af9d7957c68c0e66cb1301b611bc196adaead8eb2b88210d369dc01ed377fe68";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Redshift SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-redshift_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24522,7 +23142,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-rekognition" = callPackage
@@ -24545,24 +23164,6 @@ self: {
      }) {};
 
   "amazonka-route53" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-route53";
-       version = "1.4.3";
-       sha256 = "a7fb42486f54b7e1b858edc907a57be656b20a2da8a08c982e3d8bf0c592b0cf";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Route 53 SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-route53_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24578,28 +23179,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-route53-domains" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-route53-domains";
-       version = "1.4.3";
-       sha256 = "1a773fc3c18faa770874fc708ff0cb6b7150a09836c3a9c6332b9d222a4fe18b";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Route 53 Domains SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-route53-domains_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24615,28 +23197,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , lens, tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-s3";
-       version = "1.4.3";
-       sha256 = "9ed6c9e7675e99a545a84ac2c979a7542ecd898dd6e4c2fbbbba2c4a40d8fc50";
-       libraryHaskellDepends = [ amazonka-core base lens text ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Storage Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-s3_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , lens, tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24652,7 +23215,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -24680,24 +23242,6 @@ self: {
      }) {};
 
   "amazonka-sdb" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sdb";
-       version = "1.4.3";
-       sha256 = "7fac8b39c2210e09d1ef15f7c964b64397c1b6165638c92f4069be8002ebf1d3";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon SimpleDB SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-sdb_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24713,7 +23257,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-servicecatalog" = callPackage
@@ -24736,24 +23279,6 @@ self: {
      }) {};
 
   "amazonka-ses" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ses";
-       version = "1.4.3";
-       sha256 = "2ccab07f3c08d9145c2bc936048e5f973532871f1a366e0111a2bf70973d96a2";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Email Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ses_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24769,7 +23294,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-shield" = callPackage
@@ -24830,24 +23354,6 @@ self: {
      }) {};
 
   "amazonka-sns" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sns";
-       version = "1.4.3";
-       sha256 = "681335a9d385af666d5c895b982fb757fa65862a0047d3a498d544f6d136544a";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Notification Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-sns_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24863,29 +23369,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sqs" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sqs";
-       version = "1.4.3";
-       sha256 = "2e94eaab5fc5c9a4471bfe834ccf975c1776b268cb291281740db62148825ece";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Queue Service SDK";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "amazonka-sqs_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24905,24 +23391,6 @@ self: {
      }) {};
 
   "amazonka-ssm" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-ssm";
-       version = "1.4.3";
-       sha256 = "260a3e4178f48f4df2bb2574809ac7c81c7208fa9d77225c6101844bb21c38c1";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Systems Management Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-ssm_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24938,7 +23406,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Manager (SSM) SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-stepfunctions" = callPackage
@@ -24961,24 +23428,6 @@ self: {
      }) {};
 
   "amazonka-storagegateway" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-storagegateway";
-       version = "1.4.3";
-       sha256 = "5522fa5aa0bfed529b5b85385d2000aedf5b1c8fb5400bf280d4b131275b7b47";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Storage Gateway SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-storagegateway_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -24994,28 +23443,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-sts" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-sts";
-       version = "1.4.3";
-       sha256 = "d36e38218fe83a696c13dfef9362028cb23f73b96fb468bb9b809ef69598606c";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Security Token Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-sts_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25031,28 +23461,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-support" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-support";
-       version = "1.4.3";
-       sha256 = "d9acfb0d35f3c987dd534c0a59959cef44825facfc4665ba20bf286e4023d70f";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Support SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-support_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25068,28 +23479,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-swf" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-swf";
-       version = "1.4.3";
-       sha256 = "0443d02c23d93eca09f6b91ad7aa1e32ab02e6b92e0bb6595ab65ce5f13ab469";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon Simple Workflow Service SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-swf_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25105,32 +23497,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-test" = callPackage
-    ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
-     , case-insensitive, conduit, conduit-extra, groom, http-client
-     , http-types, process, resourcet, tasty, tasty-hunit
-     , template-haskell, temporary, text, time, unordered-containers
-     , yaml
-     }:
-     mkDerivation {
-       pname = "amazonka-test";
-       version = "1.4.3";
-       sha256 = "10310abf1036afb3f2ea688b300d738700f780a2459a10f306b1bedff9019d9b";
-       libraryHaskellDepends = [
-         aeson amazonka-core base bifunctors bytestring case-insensitive
-         conduit conduit-extra groom http-client http-types process
-         resourcet tasty tasty-hunit template-haskell temporary text time
-         unordered-containers yaml
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Common functionality for Amazonka library test-suites";
-       license = "unknown";
-     }) {};
-
-  "amazonka-test_1_4_5" = callPackage
     ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, groom, http-client
      , http-types, process, resourcet, tasty, tasty-hunit
@@ -25150,28 +23519,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Common functionality for Amazonka library test-suites";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-waf" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-waf";
-       version = "1.4.3";
-       sha256 = "7e9c9d7ca82c8d1e95e7aabf696980040f8644d96c011438e06c51dd41655a85";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon WAF SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-waf_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25187,28 +23537,9 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WAF SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-workspaces" = callPackage
-    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
-     , tasty, tasty-hunit, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "amazonka-workspaces";
-       version = "1.4.3";
-       sha256 = "61828d17aec286062dd453e69b730e180a651f59387c7355872d1cae47805d78";
-       libraryHaskellDepends = [ amazonka-core base ];
-       testHaskellDepends = [
-         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
-         time unordered-containers
-       ];
-       homepage = "https://github.com/brendanhay/amazonka";
-       description = "Amazon WorkSpaces SDK";
-       license = "unknown";
-     }) {};
-
-  "amazonka-workspaces_1_4_5" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
@@ -25224,7 +23555,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka-xray" = callPackage
@@ -25691,18 +24021,6 @@ self: {
      }) {};
 
   "anonymous-sums" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "anonymous-sums";
-       version = "0.4.0.0";
-       sha256 = "116626dd139f7ba57b66d790915ff21cdf09f267da16f873f396ae76aad16749";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://www.github.com/massysett/anonymous-sums";
-       description = "Anonymous sum types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "anonymous-sums_0_6_0_0" = callPackage
     ({ mkDerivation, base, lens, template-haskell }:
      mkDerivation {
        pname = "anonymous-sums";
@@ -25712,7 +24030,6 @@ self: {
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anonymous-sums-tests" = callPackage
@@ -25773,19 +24090,6 @@ self: {
      }) {};
 
   "ansigraph" = callPackage
-    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "ansigraph";
-       version = "0.2.0.0";
-       sha256 = "3ded8cb86e659854a051328982c4b3f3527c409c5bbeb37383d717685e76ca43";
-       libraryHaskellDepends = [ ansi-terminal base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/BlackBrane/ansigraph";
-       description = "Terminal-based graphing via ANSI and Unicode";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ansigraph_0_3_0_2" = callPackage
     ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "ansigraph";
@@ -25796,7 +24100,6 @@ self: {
        homepage = "https://github.com/BlackBrane/ansigraph";
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antagonist" = callPackage
@@ -26674,39 +24977,6 @@ self: {
      }) {};
 
   "apply-refact" = callPackage
-    ({ mkDerivation, base, containers, directory, filemanip, filepath
-     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
-     , silently, syb, tasty, tasty-expected-failure, tasty-golden
-     , temporary, transformers, unix-compat
-     }:
-     mkDerivation {
-       pname = "apply-refact";
-       version = "0.3.0.0";
-       sha256 = "0d2a8845ed554c4a6742a3d0a130dac3f16d0d710b65b20dfeb8e773409ed70f";
-       revision = "1";
-       editedCabalFile = "372095fc0b1e53e884362d5650486b4c2fb624588271a7b4917903ea977899ea";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers directory filemanip ghc ghc-exactprint mtl process
-         refact syb temporary transformers unix-compat
-       ];
-       executableHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact syb temporary transformers
-         unix-compat
-       ];
-       testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-exactprint mtl
-         optparse-applicative process refact silently syb tasty
-         tasty-expected-failure tasty-golden temporary transformers
-         unix-compat
-       ];
-       description = "Perform refactorings specified by the refact library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "apply-refact_0_3_0_1" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
      , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
      , silently, syb, tasty, tasty-expected-failure, tasty-golden
@@ -26735,7 +25005,6 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -28229,32 +26498,6 @@ self: {
      }) {};
 
   "atom-conduit" = callPackage
-    ({ mkDerivation, base, conduit, conduit-parse, data-default
-     , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers
-     , quickcheck-instances, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, uri-bytestring
-     , xml-conduit, xml-conduit-parse, xml-types
-     }:
-     mkDerivation {
-       pname = "atom-conduit";
-       version = "0.3.1.2";
-       sha256 = "ab469b789cd81a5dab366c367a5b86a073e7cfc8fbb1a978d3107441795f7a22";
-       libraryHaskellDepends = [
-         base conduit conduit-parse exceptions foldl lens-simple
-         mono-traversable parsers text time timerep uri-bytestring
-         xml-conduit xml-conduit-parse xml-types
-       ];
-       testHaskellDepends = [
-         base conduit conduit-parse data-default exceptions hlint
-         lens-simple mono-traversable parsers quickcheck-instances resourcet
-         tasty tasty-hunit tasty-quickcheck text time uri-bytestring
-         xml-conduit xml-conduit-parse xml-types
-       ];
-       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
-       license = "unknown";
-     }) {};
-
-  "atom-conduit_0_4_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators
      , data-default, hlint, lens-simple, mono-traversable, parsers
      , quickcheck-instances, resourcet, safe-exceptions, tasty
@@ -28278,7 +26521,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -28856,25 +27098,6 @@ self: {
      }) {};
 
   "authenticate-oauth" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , crypto-pubkey-types, data-default, http-client, http-types
-     , random, RSA, SHA, time, transformers
-     }:
-     mkDerivation {
-       pname = "authenticate-oauth";
-       version = "1.5.1.2";
-       sha256 = "294279ff1a4e746eedb5186d8230c34b2ffa770f020d30341424a59fedb76a33";
-       libraryHaskellDepends = [
-         base base64-bytestring blaze-builder bytestring crypto-pubkey-types
-         data-default http-client http-types random RSA SHA time
-         transformers
-       ];
-       homepage = "http://github.com/yesodweb/authenticate";
-       description = "Library to authenticate with OAuth for Haskell web applications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "authenticate-oauth_1_6" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , crypto-pubkey-types, data-default, http-client, http-types
      , random, RSA, SHA, time, transformers, transformers-compat
@@ -28891,7 +27114,6 @@ self: {
        homepage = "http://github.com/yesodweb/authenticate";
        description = "Library to authenticate with OAuth for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "authinfo-hs" = callPackage
@@ -28957,21 +27179,6 @@ self: {
      }) {};
 
   "autoexporter" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath }:
-     mkDerivation {
-       pname = "autoexporter";
-       version = "0.2.3";
-       sha256 = "b3b9bfb44a5942ee83b45b4c9bcf3a61335362c507a98acddaf47889e394ab8a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/autoexporter#readme";
-       description = "Automatically re-export modules";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "autoexporter_1_0_0" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
@@ -28984,7 +27191,6 @@ self: {
        homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "autom" = callPackage
@@ -29362,41 +27568,6 @@ self: {
      }) {awesomium = null;};
 
   "aws" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-extra, containers
-     , cryptohash, data-default, directory, errors, filepath
-     , http-client, http-client-tls, http-conduit, http-types
-     , lifted-base, monad-control, mtl, network, old-locale, QuickCheck
-     , quickcheck-instances, resourcet, safe, scientific, tagged, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, transformers
-     , transformers-base, unordered-containers, utf8-string, vector
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "aws";
-       version = "0.14.1";
-       sha256 = "6a2079853ddc781b46fe3ddce31e88c0b6b2441f458141bca3cd1c7216cbe579";
-       libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring base64-bytestring
-         blaze-builder byteable bytestring case-insensitive cereal conduit
-         conduit-extra containers cryptohash data-default directory filepath
-         http-conduit http-types lifted-base monad-control mtl network
-         old-locale resourcet safe scientific tagged text time transformers
-         unordered-containers utf8-string vector xml-conduit
-       ];
-       testHaskellDepends = [
-         aeson base bytestring errors http-client http-client-tls http-types
-         lifted-base monad-control mtl QuickCheck quickcheck-instances
-         resourcet tagged tasty tasty-hunit tasty-quickcheck text time
-         transformers transformers-base
-       ];
-       homepage = "http://github.com/aristidb/aws";
-       description = "Amazon Web Services (AWS) for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aws_0_16" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
      , case-insensitive, cereal, conduit, conduit-combinators
@@ -29429,7 +27600,6 @@ self: {
        homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-cloudfront-signer" = callPackage
@@ -30171,36 +28341,6 @@ self: {
      }) {};
 
   "bake" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
-     , deepseq, direct-sqlite, directory, disk-free-space, extra
-     , filepath, hashable, HTTP, http-types, old-locale, process, random
-     , safe, shake, smtp-mail, sqlite-simple, text, time, transformers
-     , unordered-containers, wai, warp
-     }:
-     mkDerivation {
-       pname = "bake";
-       version = "0.4";
-       sha256 = "ff0b6eb38e68f2542713074da3c64368e3a56c029dadb9c1e011262c223abbf7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring cmdargs containers deepseq direct-sqlite
-         directory disk-free-space extra filepath hashable HTTP http-types
-         old-locale random safe shake smtp-mail sqlite-simple text time
-         transformers unordered-containers wai warp
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs containers deepseq direct-sqlite
-         directory disk-free-space extra filepath hashable HTTP http-types
-         old-locale process random safe shake smtp-mail sqlite-simple text
-         time transformers unordered-containers wai warp
-       ];
-       homepage = "https://github.com/ndmitchell/bake#readme";
-       description = "Continuous integration system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bake_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , deepseq, direct-sqlite, directory, disk-free-space, extra
      , filepath, hashable, HTTP, http-client, http-conduit, http-types
@@ -30231,7 +28371,6 @@ self: {
        homepage = "https://github.com/ndmitchell/bake#readme";
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo" = callPackage
@@ -30592,19 +28731,6 @@ self: {
      }) {};
 
   "base-noprelude" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "base-noprelude";
-       version = "4.9.0.0";
-       sha256 = "1c5509c33366d7d0810c12d3e00579709f1b940733fda0f5f38079eba8f2fe5d";
-       libraryHaskellDepends = [ base ];
-       doHaddock = false;
-       homepage = "https://github.com/hvr/base-noprelude";
-       description = "\"base\" package sans \"Prelude\" module";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "base-noprelude_4_9_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
@@ -30615,7 +28741,6 @@ self: {
        homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-orphans" = callPackage
@@ -32852,6 +30977,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bindings-monetdb-mapi" = callPackage
+    ({ mkDerivation, base, monetdb-mapi }:
+     mkDerivation {
+       pname = "bindings-monetdb-mapi";
+       version = "0.1.0.0";
+       sha256 = "63efa91e5c3224666cdda44762e830339ed311148392d14c651b54048ad5218a";
+       libraryHaskellDepends = [ base ];
+       libraryPkgconfigDepends = [ monetdb-mapi ];
+       description = "Low-level bindings for the MonetDB API (mapi)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {monetdb-mapi = null;};
+
   "bindings-mpdecimal" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
      mkDerivation {
@@ -33514,31 +31651,6 @@ self: {
      }) {};
 
   "bitcoin-payment-channel" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, base58string
-     , base64-bytestring, bytestring, cereal, errors, haskoin-core
-     , hexstring, QuickCheck, scientific, text, time
-     }:
-     mkDerivation {
-       pname = "bitcoin-payment-channel";
-       version = "0.3.0.1";
-       sha256 = "97bc6dc75c72735f28c84ef90734f2e31bde8693f9c88e216f8a66d3f95ae8c8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bytestring cereal
-         errors haskoin-core hexstring scientific text time
-       ];
-       executableHaskellDepends = [
-         aeson base base16-bytestring base58string base64-bytestring
-         bytestring cereal haskoin-core hexstring QuickCheck text time
-       ];
-       homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
-       description = "Library for working with Bitcoin payment channels";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "bitcoin-payment-channel_1_0_1_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
      , bytestring, cereal, deepseq, errors, haskoin-core, hexstring
      , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific
@@ -33916,30 +32028,6 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , exceptions, hspec, http-client, http-client-tls, http-types
-     , microlens, microlens-th, network, QuickCheck, safe, scientific
-     , split, text, time
-     }:
-     mkDerivation {
-       pname = "bitx-bitcoin";
-       version = "0.10.0.0";
-       sha256 = "a55e13de9eadffe78a0fc3edf4055a98c70a6f9738c98db4f055df8aa9fc509c";
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-client http-client-tls
-         http-types microlens microlens-th network QuickCheck scientific
-         split text time
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory doctest hspec http-client
-         http-types microlens safe text time
-       ];
-       homepage = "https://github.com/tebello-thejane/bitx-haskell";
-       description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bitx-bitcoin_0_11_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, directory
      , doctest, exceptions, hspec, http-client, http-client-tls
      , http-types, microlens, microlens-th, network, QuickCheck, safe
@@ -33961,7 +32049,6 @@ self: {
        homepage = "https://github.com/tebello-thejane/bitx.hs";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bk-tree" = callPackage
@@ -34282,6 +32369,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blaze-colonnade" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, doctest
+     , text
+     }:
+     mkDerivation {
+       pname = "blaze-colonnade";
+       version = "0.1";
+       sha256 = "cee73ec0777ecc268958699ead67b527b2b99cfbad38532b4687628bf70138e8";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup colonnade text
+       ];
+       testHaskellDepends = [ base colonnade doctest ];
+       homepage = "https://github.com/andrewthad/colonnade#readme";
+       description = "Helper functions for using blaze-html with colonnade";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "blaze-from-html" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, tagsoup }:
      mkDerivation {
@@ -34688,35 +32792,6 @@ self: {
      }) {};
 
   "bloodhound" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , data-default-class, derive, directory, doctest, doctest-prop
-     , errors, exceptions, filepath, hashable, hspec, http-client
-     , http-types, mtl, mtl-compat, network-uri, QuickCheck
-     , quickcheck-properties, scientific, semigroups, text, time
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "bloodhound";
-       version = "0.11.0.0";
-       sha256 = "df3c708675ad1e113aa31f6d1492bcf55dbef6c7e86e6202b118670a6fcbb939";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers data-default-class
-         exceptions hashable http-client http-types mtl mtl-compat
-         network-uri scientific semigroups text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers derive directory doctest
-         doctest-prop errors filepath hspec http-client http-types mtl
-         QuickCheck quickcheck-properties semigroups text time
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/bitemyapp/bloodhound";
-       description = "ElasticSearch client library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bloodhound_0_12_1_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
      , data-default-class, directory, doctest, errors, exceptions
      , filepath, generics-sop, hashable, hspec, http-client, http-types
@@ -34743,7 +32818,6 @@ self: {
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -34809,29 +32883,6 @@ self: {
      }) {};
 
   "blosum" = callPackage
-    ({ mkDerivation, base, containers, fasta, lens
-     , optparse-applicative, pipes, pipes-text, split, text, text-show
-     }:
-     mkDerivation {
-       pname = "blosum";
-       version = "0.1.1.2";
-       sha256 = "acfbca000b0f7da3e20c5ae0b124ff029d4777a056f74546828fe6a9eee29d55";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers fasta lens text text-show
-       ];
-       executableHaskellDepends = [
-         base containers fasta optparse-applicative pipes pipes-text split
-         text
-       ];
-       homepage = "http://github.com/GregorySchwartz/blosum#readme";
-       description = "BLOSUM generator";
-       license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "blosum_0_1_1_4" = callPackage
     ({ mkDerivation, base, containers, fasta, lens
      , optparse-applicative, pipes, pipes-text, split, text, text-show
      }:
@@ -35077,8 +33128,8 @@ self: {
      }:
      mkDerivation {
        pname = "bond";
-       version = "0.7.0.0";
-       sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3";
+       version = "0.8.0.0";
+       sha256 = "9ba0c8b618d342575d480488783117ea99dc19b0b5485192e3757cdbe267ccf7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35391,12 +33442,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "boring-game" = callPackage
+    ({ mkDerivation, base, gloss }:
+     mkDerivation {
+       pname = "boring-game";
+       version = "0.1.0.1";
+       sha256 = "51cc6d7b7cdda9ca35021c7005d75773119bdb3331f5fb40c750c9e231392b81";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base gloss ];
+       executableHaskellDepends = [ base gloss ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/checkraiser/boring-game#readme";
+       description = "An educational game";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "boring-window-switcher" = callPackage
     ({ mkDerivation, base, gtk, transformers, X11 }:
      mkDerivation {
        pname = "boring-window-switcher";
-       version = "0.1.0.3";
-       sha256 = "ac8273d978973b9424ce195ab48b6f599d06bb1af1af6abf94305b35ffed2748";
+       version = "0.1.0.4";
+       sha256 = "4f9f7dbe3ad1e3f5ad40a79e59e03e3598c9be7a91afe9d3ffb7148fd3063196";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
@@ -35505,27 +33572,6 @@ self: {
      }) {};
 
   "bower-json" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, base, bytestring
-     , deepseq, mtl, scientific, tasty, tasty-hunit, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "bower-json";
-       version = "0.8.1";
-       sha256 = "3fb3cdecc55a0997a9d4d9c3443bcf39b7feed09feb8629fc89b48b1ca7b713f";
-       libraryHaskellDepends = [
-         aeson aeson-better-errors base bytestring deepseq mtl scientific
-         text transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring tasty tasty-hunit text unordered-containers
-       ];
-       homepage = "https://github.com/hdgarrood/bower-json";
-       description = "Read bower.json from Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "bower-json_1_0_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, base, bytestring
      , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text
      , transformers, unordered-containers, vector
@@ -35544,7 +33590,6 @@ self: {
        homepage = "https://github.com/hdgarrood/bower-json";
        description = "Read bower.json from Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bowntz" = callPackage
@@ -35958,18 +34003,6 @@ self: {
      }) {};
 
   "btrfs" = callPackage
-    ({ mkDerivation, base, bytestring, time, unix }:
-     mkDerivation {
-       pname = "btrfs";
-       version = "0.1.2.0";
-       sha256 = "a1e7bdb44c587686299e3e9e3910fb7a271bcd7462ee6fac0ffccd8c7a60fe0c";
-       libraryHaskellDepends = [ base bytestring time unix ];
-       homepage = "https://github.com/redneb/hs-btrfs";
-       description = "Bindings to the btrfs API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "btrfs_0_1_2_3" = callPackage
     ({ mkDerivation, base, bytestring, time, unix }:
      mkDerivation {
        pname = "btrfs";
@@ -35979,7 +34012,6 @@ self: {
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buchhaltung" = callPackage
@@ -37013,6 +35045,19 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "c2hs-extra" = callPackage
+    ({ mkDerivation, base, c2hs }:
+     mkDerivation {
+       pname = "c2hs-extra";
+       version = "0.1.0.0";
+       sha256 = "f22faa55babb95ac1acb29c775ebf9cf0fd1673985c802bd5b6037d6db558b3d";
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "Convenient marshallers for complicate C types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "c2hsc" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
      , HStringTemplate, language-c, mtl, pretty, split, transformers
@@ -37201,22 +35246,6 @@ self: {
      }) {};
 
   "cabal-dependency-licenses" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath }:
-     mkDerivation {
-       pname = "cabal-dependency-licenses";
-       version = "0.1.2.0";
-       sha256 = "436a3d8745d6645cac1b51f54974f38811fbc37a3784ac0bdba3c3ddb22f2494";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal containers directory filepath
-       ];
-       homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
-       description = "Compose a list of a project's transitive dependencies with their licenses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cabal-dependency-licenses_0_2_0_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "cabal-dependency-licenses";
@@ -37230,7 +35259,6 @@ self: {
        homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dev" = callPackage
@@ -37637,24 +35665,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
-     , process, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "0.10.1";
-       sha256 = "46aae9f3b5734ceb9c35d9a5dbe7603bd26235169f16a10035078de33140cde9";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base Cabal directory filepath old-locale process time unix
-       ];
-       homepage = "https://github.com/juhp/cabal-rpm";
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_0_11" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, old-locale
      , process, time, unix
      }:
@@ -37670,7 +35680,6 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -38144,29 +36153,6 @@ self: {
      }) {};
 
   "cacophony" = callPackage
-    ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
-     , cryptonite, deepseq, directory, exceptions, free, hlint, lens
-     , memory, monad-coroutine, mtl, safe-exceptions, text, transformers
-     }:
-     mkDerivation {
-       pname = "cacophony";
-       version = "0.8.0";
-       sha256 = "063069adea7ae07f3ec458b76194edca2acb96871acc0fd437cc6b0c68739c01";
-       libraryHaskellDepends = [
-         base bytestring cryptonite deepseq exceptions free lens memory
-         monad-coroutine mtl safe-exceptions transformers
-       ];
-       testHaskellDepends = [
-         aeson async base base16-bytestring bytestring directory free hlint
-         lens mtl text
-       ];
-       homepage = "https://github.com/centromere/cacophony";
-       description = "A library implementing the Noise protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cacophony_0_9_1" = callPackage
     ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
      , cryptonite, directory, exceptions, free, hlint, lens, memory
      , monad-coroutine, mtl, safe-exceptions, text, transformers
@@ -38527,37 +36513,6 @@ self: {
      }) {};
 
   "camfort" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text
-     , transformers, uniplate, vector
-     }:
-     mkDerivation {
-       pname = "camfort";
-       version = "0.900";
-       sha256 = "fc92d5a5d5ecf42470d4f7aea2848eb785e44ba925949df86599e7b96f4a4427";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring containers directory fgl filepath fortran-src
-         GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers
-         uniplate vector
-       ];
-       libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [
-         array base bytestring containers directory fgl filepath fortran-src
-         GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text
-         transformers uniplate vector
-       ];
-       testHaskellDepends = [
-         array base bytestring containers directory filepath fortran-src
-         hmatrix hspec mtl QuickCheck uniplate
-       ];
-       description = "CamFort - Cambridge Fortran infrastructure";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "camfort_0_901" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
      , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text
@@ -38586,7 +36541,6 @@ self: {
        ];
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camh" = callPackage
@@ -38993,8 +36947,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "3.1.0.2";
-       sha256 = "c137dece9554219a980a74f0aaa3d44c13f83b6312c8802f4766702250514a95";
+       version = "3.1.0.3";
+       sha256 = "c9a2e3b246b344f48a771c419db3cdddda7f71c1995d184340d91817bebf6439";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
@@ -39177,8 +37131,8 @@ self: {
      }:
      mkDerivation {
        pname = "cases";
-       version = "0.1.3.1";
-       sha256 = "472bd45f1e9361b250e1b48aeaa92494fce5283f4154856cb13d1a8376897987";
+       version = "0.1.3.2";
+       sha256 = "9ecf632f7751aac2ed7ec93407f9499237316f2eb50f331bb4969abf3359a8a9";
        libraryHaskellDepends = [ attoparsec base-prelude loch-th text ];
        testHaskellDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
@@ -39462,24 +37416,6 @@ self: {
      }) {};
 
   "cassava-conduit" = callPackage
-    ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, conduit-extra, containers, mtl, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "cassava-conduit";
-       version = "0.3.2";
-       sha256 = "e6ac1e3da4e43540ea0d31ecfa31a30c4ec401878aff10f1a1f6126e4462ffd2";
-       libraryHaskellDepends = [
-         array base bifunctors bytestring cassava conduit conduit-extra
-         containers mtl text
-       ];
-       testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/domdere/cassava-conduit";
-       description = "Conduit interface for cassava package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cassava-conduit_0_3_5_1" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, conduit-extra, containers, mtl, QuickCheck, text
      }:
@@ -39497,7 +37433,6 @@ self: {
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-megaparsec" = callPackage
@@ -39735,27 +37670,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.2.1.1";
-       sha256 = "04547226bf0e504d41527de6e2d81ba66d6c59d4460e2ce37f34a6d9aca747cf";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -41720,32 +39634,6 @@ self: {
      }) {};
 
   "clash-lib" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
-     , concurrent-supply, containers, deepseq, directory, errors, fgl
-     , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process
-     , template-haskell, text, time, transformers, unbound-generics
-     , unordered-containers, uu-parsinglib, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-lib";
-       version = "0.6.21";
-       sha256 = "2b0135d15e5e3b66a59ccdb40a3bf38bb8895bf67c49eb9b54a80082752b98ad";
-       revision = "1";
-       editedCabalFile = "4dc5af7e94897c9afc254661bb7e19a09acd0467be034c8d82bbe5b2582bd262";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring clash-prelude concurrent-supply
-         containers deepseq directory errors fgl filepath ghc hashable
-         integer-gmp lens mtl pretty process template-haskell text time
-         transformers unbound-generics unordered-containers uu-parsinglib
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - As a Library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-lib_0_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, data-binary-ieee754, deepseq
      , directory, errors, fgl, filepath, ghc, hashable, integer-gmp
@@ -41783,30 +39671,6 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, array, base, data-default, deepseq, doctest
-     , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise
-     , integer-gmp, lens, QuickCheck, reflection, singletons
-     , template-haskell
-     }:
-     mkDerivation {
-       pname = "clash-prelude";
-       version = "0.10.14";
-       sha256 = "bf99eabf5a0ac6a86523c95a122242d3f5631d1b1870ba83d8e7319f245ef7f2";
-       revision = "1";
-       editedCabalFile = "badae6cf81fc1997c660b45485f9779eeeda298e676b2df6c07b060919b63f19";
-       libraryHaskellDepends = [
-         array base data-default deepseq ghc-prim ghc-typelits-extra
-         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
-         singletons template-haskell
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - Prelude library";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-prelude_0_11" = callPackage
     ({ mkDerivation, array, base, constraints, data-binary-ieee754
      , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
@@ -41842,24 +39706,6 @@ self: {
      }) {};
 
   "clash-systemverilog" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-systemverilog";
-       version = "0.6.10";
-       sha256 = "20c33d2966648ecf383793308b0292437cccd06c4bd5535c1f280689180a2d6b";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-systemverilog_0_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
      }:
@@ -41878,24 +39724,6 @@ self: {
      }) {};
 
   "clash-verilog" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-verilog";
-       version = "0.6.10";
-       sha256 = "943c2c8752a3b44badce60595ffc5bbea2c87316681cd69460d75053e00fb26c";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - Verilog backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-verilog_0_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
      }:
@@ -41914,26 +39742,6 @@ self: {
      }) {};
 
   "clash-vhdl" = callPackage
-    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
-     , text, unordered-containers, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "clash-vhdl";
-       version = "0.6.16";
-       sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8";
-       revision = "1";
-       editedCabalFile = "b2816898222a54367e8426adb2f3359fd32b1ec8e00d546f32ff3f2839c01b3c";
-       libraryHaskellDepends = [
-         base clash-lib clash-prelude fgl lens mtl text unordered-containers
-         wl-pprint-text
-       ];
-       homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - VHDL backend";
-       license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clash-vhdl_0_7" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable
      , lens, mtl, text, unordered-containers, wl-pprint-text
      }:
@@ -41979,38 +39787,6 @@ self: {
      }) {};
 
   "classy-prelude" = callPackage
-    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
-     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
-     , hashable, hspec, lifted-async, lifted-base, monad-unlift
-     , mono-traversable, mono-traversable-instances, mtl
-     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
-     , semigroups, stm, stm-chans, text, time, time-locale-compat
-     , transformers, transformers-base, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "classy-prelude";
-       version = "1.0.2";
-       sha256 = "4e5facf997758af2f15387349f373997abeee3edf3a3953e412490d4a9f5a467";
-       libraryHaskellDepends = [
-         async base basic-prelude bifunctors bytestring chunked-data
-         containers deepseq dlist exceptions ghc-prim hashable lifted-async
-         lifted-base monad-unlift mono-traversable
-         mono-traversable-instances mtl mutable-containers primitive
-         safe-exceptions say semigroups stm stm-chans text time
-         time-locale-compat transformers transformers-base
-         unordered-containers vector vector-instances
-       ];
-       testHaskellDepends = [
-         base containers hspec QuickCheck transformers unordered-containers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude_1_2_0" = callPackage
     ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
      , hashable, hspec, lifted-async, lifted-base, monad-unlift
@@ -42043,28 +39819,6 @@ self: {
      }) {};
 
   "classy-prelude-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude, conduit
-     , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
-     , transformers, void
-     }:
-     mkDerivation {
-       pname = "classy-prelude-conduit";
-       version = "1.0.2";
-       sha256 = "ab8f17db80cf1058013e00a16078275681faa93f91894263cf6a608c03843f19";
-       libraryHaskellDepends = [
-         base bytestring classy-prelude conduit conduit-combinators
-         monad-control resourcet transformers void
-       ];
-       testHaskellDepends = [
-         base bytestring conduit hspec QuickCheck transformers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "classy-prelude together with conduit functions";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude-conduit_1_2_0" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
      , transformers, void
@@ -42087,26 +39841,6 @@ self: {
      }) {};
 
   "classy-prelude-yesod" = callPackage
-    ({ mkDerivation, aeson, base, classy-prelude
-     , classy-prelude-conduit, data-default, http-conduit, http-types
-     , persistent, yesod, yesod-newsfeed, yesod-static
-     }:
-     mkDerivation {
-       pname = "classy-prelude-yesod";
-       version = "1.0.2";
-       sha256 = "3183921a292159e8deb0ed63130defa239510beb1692f505438edebd2ca19406";
-       libraryHaskellDepends = [
-         aeson base classy-prelude classy-prelude-conduit data-default
-         http-conduit http-types persistent yesod yesod-newsfeed
-         yesod-static
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Provide a classy prelude including common Yesod functionality";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude-yesod_1_2_0" = callPackage
     ({ mkDerivation, aeson, base, classy-prelude
      , classy-prelude-conduit, data-default, http-conduit, http-types
      , persistent, yesod, yesod-newsfeed, yesod-static
@@ -42138,19 +39872,6 @@ self: {
      }) {};
 
   "clay" = callPackage
-    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
-     mkDerivation {
-       pname = "clay";
-       version = "0.11";
-       sha256 = "c3172361b21508ec0634cf43a3cd018323bd0e24ce936f554b0f16ca4329b3c1";
-       libraryHaskellDepends = [ base mtl text ];
-       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
-       homepage = "http://fvisser.nl/clay";
-       description = "CSS preprocessor as embedded Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "clay_0_12_1" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
      mkDerivation {
        pname = "clay";
@@ -42161,7 +39882,6 @@ self: {
        homepage = "http://fvisser.nl/clay";
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks" = callPackage
@@ -42178,42 +39898,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.23.19.2";
-       sha256 = "1453a56daccb669931ef6c1a1e6311abc6fef28341c9c75de0fcc34e03e4fb84";
-       libraryHaskellDepends = [
-         acid-state aeson aeson-qq attoparsec base blaze-html bytestring
-         cereal containers directory filepath happstack-authenticate
-         happstack-hsp happstack-jmacro happstack-server
-         happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl
-         network network-uri old-locale process random reform
-         reform-happstack reform-hsp safecopy stm text time
-         time-locale-compat unordered-containers userid utf8-string
-         uuid-orphans uuid-types vector web-plugins web-routes
-         web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
-       ];
-       librarySystemDepends = [ openssl ];
-       homepage = "http://www.clckwrks.com/";
-       description = "A secure, reliable content management system (CMS) and blogging platform";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "clckwrks_0_24_0_2" = callPackage
-    ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
-     , blaze-html, bytestring, cereal, containers, directory, filepath
-     , happstack-authenticate, happstack-hsp, happstack-jmacro
-     , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs
-     , ixset, jmacro, lens, mtl, network, network-uri, old-locale
-     , openssl, process, random, reform, reform-happstack, reform-hsp
-     , safecopy, stm, text, time, time-locale-compat
-     , unordered-containers, userid, utf8-string, uuid-orphans
-     , uuid-types, vector, web-plugins, web-routes, web-routes-happstack
-     , web-routes-hsp, web-routes-th, xss-sanitize
-     }:
-     mkDerivation {
-       pname = "clckwrks";
-       version = "0.24.0.2";
-       sha256 = "2b1ec612cfb2071de5bdfc166be7d392cc7a00df5e95c53b9b7a3a407e5563d5";
+       version = "0.24.0.3";
+       sha256 = "aeeaf7c0275295ae45d21721fe9a454ab9fa67991495849eff076344b84a1eb0";
        libraryHaskellDepends = [
          acid-state aeson aeson-qq attoparsec base blaze-html bytestring
          cereal containers directory filepath happstack-authenticate
@@ -42333,8 +40019,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-media";
-       version = "0.6.16.2";
-       sha256 = "bcd36e122d0ab4b791f738d6accb8a98488b73842cef3c4721f6fb89dc62d986";
+       version = "0.6.16.3";
+       sha256 = "26f77337fa1e9c429462f49616432b2bace533cced64961f32761abe7d9054cf";
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
          directory filepath gd happstack-server hsp ixset magic mtl reform
@@ -42349,32 +40035,6 @@ self: {
      }) {};
 
   "clckwrks-plugin-page" = callPackage
-    ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
-     , containers, directory, filepath, happstack-hsp, happstack-server
-     , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
-     , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell
-     , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins
-     , web-routes, web-routes-happstack, web-routes-th
-     }:
-     mkDerivation {
-       pname = "clckwrks-plugin-page";
-       version = "0.4.3.5";
-       sha256 = "fb52a13751c322fde387786e93fdd41e4bb5a6019136fd8daa9d622d15e5d498";
-       libraryHaskellDepends = [
-         acid-state aeson attoparsec base clckwrks containers directory
-         filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl
-         old-locale random reform reform-happstack reform-hsp safecopy
-         tagsoup template-haskell text time time-locale-compat uuid
-         uuid-orphans web-plugins web-routes web-routes-happstack
-         web-routes-th
-       ];
-       homepage = "http://www.clckwrks.com/";
-       description = "support for CMS/Blogging in clckwrks";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clckwrks-plugin-page_0_4_3_9" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -42728,8 +40388,8 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.2.4";
-       sha256 = "0642761a2e3a3426e0ca676503b0c00f7434f3b1d807e799005382e18680109d";
+       version = "0.2.2.5";
+       sha256 = "e45c77e70996765c2d9f4e803add4e88c3a3701766ee1777eb067e49dff5c21f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42976,28 +40636,6 @@ self: {
      }) {};
 
   "clustering" = callPackage
-    ({ mkDerivation, base, binary, containers, hierarchical-clustering
-     , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
-     , tasty-hunit, tasty-quickcheck, vector
-     }:
-     mkDerivation {
-       pname = "clustering";
-       version = "0.2.1";
-       sha256 = "5078c28e185fd26770726cb2632ff043d99b6918d7a5d135c30bd53fc27ab9cb";
-       libraryHaskellDepends = [
-         base binary containers matrices mwc-random parallel primitive
-         vector
-       ];
-       testHaskellDepends = [
-         base binary hierarchical-clustering matrices mwc-random Rlang-QQ
-         split tasty tasty-hunit tasty-quickcheck vector
-       ];
-       description = "High performance clustering algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "clustering_0_3_1" = callPackage
     ({ mkDerivation, base, binary, containers, hierarchical-clustering
      , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
      , tasty-hunit, tasty-quickcheck, unordered-containers, vector
@@ -43824,8 +41462,8 @@ self: {
      }:
      mkDerivation {
        pname = "colonnade";
-       version = "0.5";
-       sha256 = "ed16c4510b89ec592fe3f96eef3a3725173aa6184fb89efef604b19aef1d6fb3";
+       version = "1.0.0";
+       sha256 = "47280e7dc733a66d0e507492e2b5499115027911d6ab859e29c602308f7bdf08";
        libraryHaskellDepends = [
          base bytestring contravariant text vector
        ];
@@ -44110,8 +41748,8 @@ self: {
     ({ mkDerivation, attoparsec, base, QuickCheck, text }:
      mkDerivation {
        pname = "comma";
-       version = "1.0.1";
-       sha256 = "c038511aeb2c5651b853cfd64c0251103a3ae4ba4b722b752e070a8e6029df72";
+       version = "1.1.0";
+       sha256 = "fec0b23d79c39f3d19660dd2c7652c868de64590f8a9efe0115ab4b08b33befb";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base QuickCheck text ];
        homepage = "https://github.com/lovasko/comma";
@@ -45232,20 +42870,20 @@ self: {
 
   "conduit" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
-     , mmorph, monad-control, mtl, QuickCheck, resourcet, safe
+     , mmorph, monad-control, mtl, QuickCheck, resourcet, safe, split
      , transformers, transformers-base
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.8";
-       sha256 = "80d5df4c70adf2b7e87138c55fba25e05be30eaef0c9a7926d97ae0c0cdb17fb";
+       version = "1.2.9";
+       sha256 = "8adf9d8916dcb7abf86c4c82cc1c92e99dea8d0a9a5835302a824142d214cf06";
        libraryHaskellDepends = [
          base exceptions lifted-base mmorph monad-control mtl resourcet
          transformers transformers-base
        ];
        testHaskellDepends = [
          base containers exceptions hspec mtl QuickCheck resourcet safe
-         transformers
+         split transformers
        ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
@@ -45328,34 +42966,6 @@ self: {
      }) {};
 
   "conduit-combinators" = callPackage
-    ({ mkDerivation, base, base16-bytestring, base64-bytestring
-     , bytestring, chunked-data, conduit, conduit-extra, containers
-     , directory, filepath, hspec, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
-     , text, transformers, transformers-base, unix, unix-compat, vector
-     , void
-     }:
-     mkDerivation {
-       pname = "conduit-combinators";
-       version = "1.0.8.3";
-       sha256 = "3b81e379c4dcb1cb6212bcbad1d0714e46f400ebf9ae2abe23621db500406dbe";
-       libraryHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit conduit-extra filepath monad-control mono-traversable
-         mwc-random primitive resourcet text transformers transformers-base
-         unix unix-compat vector void
-       ];
-       testHaskellDepends = [
-         base base16-bytestring base64-bytestring bytestring chunked-data
-         conduit containers directory filepath hspec mono-traversable mtl
-         mwc-random QuickCheck safe silently text transformers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Commonly used conduit functions, for both chunked and unchunked data";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-combinators_1_1_0" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, chunked-data, conduit, conduit-extra, containers
      , directory, filepath, hspec, monad-control, mono-traversable, mtl
@@ -45381,7 +42991,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Commonly used conduit functions, for both chunked and unchunked data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-connection" = callPackage
@@ -45985,8 +43594,8 @@ self: {
      }:
      mkDerivation {
        pname = "console-program";
-       version = "0.4.2.0";
-       sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a";
+       version = "0.4.2.1";
+       sha256 = "fe8af591d5adcc26c3c8d7cb8830c8e162e8b7cfd3fd53fd36d17a90c1685bc1";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory haskeline
          parsec parsec-extra split transformers unix utility-ht
@@ -46072,23 +43681,6 @@ self: {
      }) {};
 
   "constraints" = callPackage
-    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "constraints";
-       version = "0.8";
-       sha256 = "4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588";
-       libraryHaskellDepends = [
-         base binary deepseq ghc-prim hashable mtl transformers
-         transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/constraints/";
-       description = "Constraint manipulation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "constraints_0_9" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
      , transformers, transformers-compat
      }:
@@ -46103,7 +43695,6 @@ self: {
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructible" = callPackage
@@ -46134,30 +43725,6 @@ self: {
      }) {};
 
   "consul-haskell" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , connection, either, http-client, http-client-tls, http-types
-     , HUnit, lifted-async, lifted-base, monad-control, network, stm
-     , tasty, tasty-hunit, text, transformers
-     }:
-     mkDerivation {
-       pname = "consul-haskell";
-       version = "0.3";
-       sha256 = "073efdcba614f92e3add447e21e5df032a1f46ec987aa3e12de2353e38121634";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring connection either
-         http-client http-client-tls http-types lifted-async lifted-base
-         monad-control network stm text transformers
-       ];
-       testHaskellDepends = [
-         base http-client HUnit network tasty tasty-hunit text transformers
-       ];
-       homepage = "https://github.com/alphaHeavy/consul-haskell";
-       description = "A consul client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "consul-haskell_0_4_2" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , connection, either, exceptions, http-client, http-client-tls
      , http-types, HUnit, lifted-async, lifted-base, monad-control
@@ -46262,15 +43829,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "containers_0_5_9_1" = callPackage
+  "containers_0_5_10_1" = callPackage
     ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim
      , HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
-       version = "0.5.9.1";
-       sha256 = "132d2ab0d56a631fc883bc843c5661380135e19992f724897d24cf6ead450a23";
+       version = "0.5.10.1";
+       sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347";
        libraryHaskellDepends = [ array base deepseq ghc-prim ];
        testHaskellDepends = [
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
@@ -47485,8 +45052,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.20.2";
-       sha256 = "dcb1d712a0f867c8a4fdd6e4ce7cbd33ce7912c76ac2db3a6157933fad8629db";
+       version = "1.20.3";
+       sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -47853,22 +45420,6 @@ self: {
      }) {crack = null;};
 
   "crackNum" = callPackage
-    ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
-     mkDerivation {
-       pname = "crackNum";
-       version = "1.5";
-       sha256 = "ef41fe4afa6866a578b17f84ee231ed70493696fdca9fe54341e124215c1e205";
-       revision = "1";
-       editedCabalFile = "a8b9973ada5a3b5afbebd90991cf8913dc3f4c0f795ce8ebe61a0d4ff2802e13";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ];
-       executableHaskellDepends = [ base data-binary-ieee754 ieee754 ];
-       description = "Crack various integer, floating-point data formats";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crackNum_1_9" = callPackage
     ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
      mkDerivation {
        pname = "crackNum";
@@ -47884,7 +45435,6 @@ self: {
        ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craft" = callPackage
@@ -48081,6 +45631,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "credential-store" = callPackage
+    ({ mkDerivation, base, bytestring, containers, cryptonite, dbus
+     , memory, safe-exceptions, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "credential-store";
+       version = "0.1.0.0";
+       sha256 = "568ba9a4d8a40a1ae074e08da76a0ad48c6507047e6cf89999cc3c0ebafd0f29";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers cryptonite dbus memory safe-exceptions
+       ];
+       executableHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
+       homepage = "https://github.com/rblaze/credential-store#readme";
+       description = "Library to access secure credential storage providers";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "credentials" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb
      , amazonka-kms, base, bytestring, conduit, cryptonite, exceptions
@@ -48229,38 +45799,6 @@ self: {
      }) {};
 
   "criterion" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
-     , cassava, containers, deepseq, directory, filepath, Glob, hastache
-     , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck
-     , statistics, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, transformers
-     , transformers-compat, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "criterion";
-       version = "1.1.1.0";
-       sha256 = "e71855a7a9cd946044b2137f31603e0578f6e517a2ed667a2b479990cc0949dd";
-       revision = "3";
-       editedCabalFile = "0e89cf15205fea2b90e95198774fba60839aab36fc67a695baa482d55013978e";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint base binary bytestring cassava containers
-         deepseq directory filepath Glob hastache mtl mwc-random
-         optparse-applicative parsec statistics text time transformers
-         transformers-compat vector vector-algorithms
-       ];
-       executableHaskellDepends = [ base optparse-applicative ];
-       testHaskellDepends = [
-         base bytestring HUnit QuickCheck statistics test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
-       ];
-       homepage = "http://www.serpentine.com/criterion";
-       description = "Robust, reliable performance measurement and analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "criterion_1_1_4_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
      , cassava, code-page, containers, deepseq, directory, filepath
      , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random
@@ -48287,7 +45825,6 @@ self: {
        homepage = "http://www.serpentine.com/criterion";
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criterion-plus" = callPackage
@@ -48338,6 +45875,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "criu-rpc" = callPackage
+    ({ mkDerivation, base, criu-rpc-types, lens-family, network
+     , process, proto-lens, text, unix
+     }:
+     mkDerivation {
+       pname = "criu-rpc";
+       version = "0.0.2";
+       sha256 = "9c9e267eea934021575c15acadb3642292a78a9ebad136563cec43d65d0160ce";
+       libraryHaskellDepends = [
+         base criu-rpc-types lens-family network process proto-lens text
+         unix
+       ];
+       description = "CRIU RPC client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "criu-rpc-types" = callPackage
     ({ mkDerivation, base, proto-lens, proto-lens-protoc, protobuf }:
      mkDerivation {
@@ -48384,29 +45937,6 @@ self: {
      }) {};
 
   "cron" = callPackage
-    ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat
-     , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, transformers-compat
-     }:
-     mkDerivation {
-       pname = "cron";
-       version = "0.4.2";
-       sha256 = "31f186b9237c802260a7c1468e9b81006c086df1d6ad3d0d6ef51d9d2e8d07d3";
-       revision = "1";
-       editedCabalFile = "5f6737e07b84d324ea03dc18096622a49b649c5eb372ef64e504695d442b0bde";
-       libraryHaskellDepends = [
-         attoparsec base mtl mtl-compat old-locale semigroups text time
-       ];
-       testHaskellDepends = [
-         attoparsec base generics-sop quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck text time transformers-compat
-       ];
-       homepage = "http://github.com/michaelxavier/cron";
-       description = "Cron datatypes and Attoparsec parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "cron_0_5_0" = callPackage
     ({ mkDerivation, attoparsec, base, data-default-class, generics-sop
      , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups
      , tasty, tasty-hunit, tasty-quickcheck, text, time
@@ -48427,7 +45957,6 @@ self: {
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron-compat" = callPackage
@@ -49029,23 +46558,6 @@ self: {
      }) {};
 
   "cryptonite-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , cryptonite, resourcet, transformers
-     }:
-     mkDerivation {
-       pname = "cryptonite-conduit";
-       version = "0.1";
-       sha256 = "a79cd5bc2f86093bbc45290889ca5a9c502804a3c19188874bc2ff3f2a97aac0";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra cryptonite resourcet
-         transformers
-       ];
-       homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
-       description = "cryptonite conduit";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cryptonite-conduit_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit
      , transformers
@@ -49065,7 +46577,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
        description = "cryptonite conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite-openssl" = callPackage
@@ -52156,6 +49667,24 @@ self: {
      }) {};
 
   "datasets" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, directory
+     , file-embed, filepath, hashable, HTTP, stringsearch, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "datasets";
+       version = "0.2.1";
+       sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava directory file-embed filepath
+         hashable HTTP stringsearch text time vector
+       ];
+       homepage = "https://github.com/glutamate/datasets";
+       description = "Classical data sets for statistics and machine learning";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "datasets_0_2_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, directory
      , file-embed, filepath, hashable, microlens, stringsearch, text
      , time, vector, wreq
@@ -52171,6 +49700,7 @@ self: {
        homepage = "https://github.com/glutamate/datasets";
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dataurl" = callPackage
@@ -52203,6 +49733,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "date-conversions" = callPackage
+    ({ mkDerivation, base, dates, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "date-conversions";
+       version = "0.1.0.0";
+       sha256 = "16b3c0ab70c86b25af6202f5a4a9df442d3cdc095b18fd61082659524eac880c";
+       libraryHaskellDepends = [ base dates time ];
+       testHaskellDepends = [ base dates hspec QuickCheck time ];
+       homepage = "https://github.com/thoughtbot/date-conversions#readme";
+       description = "Date conversions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "dates" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }:
      mkDerivation {
@@ -53087,25 +50630,6 @@ self: {
      }) {};
 
   "declarative" = callPackage
-    ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types
-     , mighty-metropolis, mwc-probability, pipes, primitive
-     , speedy-slice, transformers
-     }:
-     mkDerivation {
-       pname = "declarative";
-       version = "0.2.3";
-       sha256 = "f6b0a65295f59d9c696257d667fa9995d9ebefc38b6d98a354fdc428d65d65aa";
-       libraryHaskellDepends = [
-         base hasty-hamiltonian lens mcmc-types mighty-metropolis
-         mwc-probability pipes primitive speedy-slice transformers
-       ];
-       testHaskellDepends = [ base mwc-probability ];
-       homepage = "http://github.com/jtobin/declarative";
-       description = "DIY Markov Chains";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "declarative_0_5_1" = callPackage
     ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens
      , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive
      , speedy-slice, transformers
@@ -53123,7 +50647,6 @@ self: {
        homepage = "http://github.com/jtobin/declarative";
        description = "DIY Markov Chains";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "decode-utf8" = callPackage
@@ -53755,18 +51278,6 @@ self: {
      }) {};
 
   "dependent-sum" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "dependent-sum";
-       version = "0.3.2.2";
-       sha256 = "34fbe4675fa3a6ea7ca34913954657a3defee785bd39d55cffcf375f4a3cf864";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mokus0/dependent-sum";
-       description = "Dependent sum type";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "dependent-sum_0_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "dependent-sum";
@@ -53776,7 +51287,6 @@ self: {
        homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependent-sum-template" = callPackage
@@ -54369,23 +51879,6 @@ self: {
      }) {};
 
   "diagrams" = callPackage
-    ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
-     , diagrams-svg
-     }:
-     mkDerivation {
-       pname = "diagrams";
-       version = "1.3.0.1";
-       sha256 = "ee8abf5c262955a6a535ddc297bdf829ccd17bc179f61faf953371118ec4e4a7";
-       libraryHaskellDepends = [
-         diagrams-contrib diagrams-core diagrams-lib diagrams-svg
-       ];
-       doHaddock = false;
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Embedded domain-specific language for declarative vector graphics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams_1_4" = callPackage
     ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
      , diagrams-svg
      }:
@@ -54400,7 +51893,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -54448,27 +51940,6 @@ self: {
      }) {};
 
   "diagrams-cairo" = callPackage
-    ({ mkDerivation, array, base, bytestring, cairo, colour, containers
-     , data-default-class, diagrams-core, diagrams-lib, filepath
-     , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
-     , split, statestack, transformers, unix, vector
-     }:
-     mkDerivation {
-       pname = "diagrams-cairo";
-       version = "1.3.1.1";
-       sha256 = "00c635a58a480033a2fc1240b703a4afab721f990e1412f57b8fa6becd6878b8";
-       libraryHaskellDepends = [
-         array base bytestring cairo colour containers data-default-class
-         diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
-         optparse-applicative pango split statestack transformers unix
-         vector
-       ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Cairo backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-cairo_1_4" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, colour, containers
      , data-default-class, diagrams-core, diagrams-lib, filepath
      , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
@@ -54487,30 +51958,9 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-canvas" = callPackage
-    ({ mkDerivation, base, blank-canvas, cmdargs, containers
-     , data-default-class, diagrams-core, diagrams-lib, lens, mtl
-     , NumInstances, optparse-applicative, statestack, text
-     }:
-     mkDerivation {
-       pname = "diagrams-canvas";
-       version = "1.3.0.6";
-       sha256 = "20e905738a7a78061690fc55209041b2c3cdd6f6b6a534b6fdb75728a595a0ff";
-       libraryHaskellDepends = [
-         base blank-canvas cmdargs containers data-default-class
-         diagrams-core diagrams-lib lens mtl NumInstances
-         optparse-applicative statestack text
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "diagrams-canvas_1_4" = callPackage
     ({ mkDerivation, base, blank-canvas, cmdargs, containers
      , data-default-class, diagrams-core, diagrams-lib, lens, mtl
      , NumInstances, optparse-applicative, statestack, text
@@ -54531,33 +51981,6 @@ self: {
      }) {};
 
   "diagrams-contrib" = callPackage
-    ({ mkDerivation, base, circle-packing, colour, containers
-     , data-default, data-default-class, diagrams-core, diagrams-lib
-     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
-     , mtl, parsec, QuickCheck, random, semigroups, split
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text
-     }:
-     mkDerivation {
-       pname = "diagrams-contrib";
-       version = "1.3.0.12";
-       sha256 = "a576a63fc9f216558415303ace621e42778d5db08286b838dd850e9640279620";
-       libraryHaskellDepends = [
-         base circle-packing colour containers data-default
-         data-default-class diagrams-core diagrams-lib diagrams-solve
-         force-layout lens linear MonadRandom mtl parsec random semigroups
-         split text
-       ];
-       testHaskellDepends = [
-         base containers diagrams-lib HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Collection of user contributions to diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-contrib_1_4_0_1" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , cubicbezier, data-default, data-default-class, diagrams-core
      , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens
@@ -54584,28 +52007,9 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
-    ({ mkDerivation, adjunctions, base, containers, distributive
-     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "diagrams-core";
-       version = "1.3.0.8";
-       sha256 = "356f5fd77916422616e77fcdcde44aa76c0ff74c9ec9d56c20a54abd96459c73";
-       libraryHaskellDepends = [
-         adjunctions base containers distributive dual-tree lens linear
-         monoid-extras mtl semigroups unordered-containers
-       ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Core libraries for diagrams EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-core_1_4" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, profunctors
      , semigroups, unordered-containers
@@ -54621,7 +52025,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -54641,20 +52044,6 @@ self: {
      }) {};
 
   "diagrams-gtk" = callPackage
-    ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
-     mkDerivation {
-       pname = "diagrams-gtk";
-       version = "1.3.0.2";
-       sha256 = "ef4751e30f9b51ddb78f5310c5fd890ab9f26dd7cf409e3dbf39a96e73884c29";
-       libraryHaskellDepends = [
-         base cairo diagrams-cairo diagrams-lib gtk
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Backend for rendering diagrams directly to GTK windows";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-gtk_1_4" = callPackage
     ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
      mkDerivation {
        pname = "diagrams-gtk";
@@ -54666,7 +52055,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -54720,25 +52108,6 @@ self: {
      }) {};
 
   "diagrams-html5" = callPackage
-    ({ mkDerivation, base, cmdargs, containers, data-default-class
-     , diagrams-core, diagrams-lib, lens, mtl, NumInstances
-     , optparse-applicative, split, statestack, static-canvas, text
-     }:
-     mkDerivation {
-       pname = "diagrams-html5";
-       version = "1.3.0.7";
-       sha256 = "8bddc55b95b6e0616552d09e59ae74ae315d296ef816552c5d7649035d49f7a4";
-       libraryHaskellDepends = [
-         base cmdargs containers data-default-class diagrams-core
-         diagrams-lib lens mtl NumInstances optparse-applicative split
-         statestack static-canvas text
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "HTML5 canvas backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-html5_1_4" = callPackage
     ({ mkDerivation, base, cmdargs, containers, data-default-class
      , diagrams-core, diagrams-lib, lens, mtl, NumInstances
      , optparse-applicative, split, statestack, static-canvas, text
@@ -54755,36 +52124,9 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-lib" = callPackage
-    ({ mkDerivation, active, adjunctions, array, base, colour
-     , containers, data-default-class, diagrams-core, diagrams-solve
-     , directory, distributive, dual-tree, exceptions, filepath
-     , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
-     , linear, monoid-extras, mtl, optparse-applicative, process
-     , semigroups, tagged, tasty, tasty-hunit, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "diagrams-lib";
-       version = "1.3.1.4";
-       sha256 = "0ed2c2b81a872abc747dffcce74a7b19714f81a78dc44426d9d2baa999009617";
-       libraryHaskellDepends = [
-         active adjunctions array base colour containers data-default-class
-         diagrams-core diagrams-solve directory distributive dual-tree
-         exceptions filepath fingertree fsnotify hashable intervals
-         JuicyPixels lens linear monoid-extras mtl optparse-applicative
-         process semigroups tagged text transformers unordered-containers
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "http://projects.haskell.org/diagrams";
-       description = "Embedded domain-specific language for declarative graphics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-lib_1_4_0_1" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, cereal, colour
      , containers, data-default-class, deepseq, diagrams-core
      , diagrams-solve, directory, distributive, dual-tree, exceptions
@@ -54815,7 +52157,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pandoc" = callPackage
@@ -54885,25 +52226,6 @@ self: {
      }) {};
 
   "diagrams-postscript" = callPackage
-    ({ mkDerivation, base, containers, data-default-class
-     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
-     , monoid-extras, mtl, semigroups, split, statestack
-     }:
-     mkDerivation {
-       pname = "diagrams-postscript";
-       version = "1.3.0.7";
-       sha256 = "f045ad88def2ce2d8ebb641a7c48eacfe6d1eccf2baf42f50935ad2a21def751";
-       libraryHaskellDepends = [
-         base containers data-default-class diagrams-core diagrams-lib dlist
-         filepath hashable lens monoid-extras mtl semigroups split
-         statestack
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Postscript backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-postscript_1_4" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
      , monoid-extras, mtl, semigroups, split, statestack
@@ -54920,7 +52242,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -54940,28 +52261,6 @@ self: {
      }) {};
 
   "diagrams-rasterific" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default-class
-     , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
-     , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
-     , unix
-     }:
-     mkDerivation {
-       pname = "diagrams-rasterific";
-       version = "1.3.1.8";
-       sha256 = "b76001105055563e2a51f6dbff2e1c12547644014f748e7564f1ded42b75cb99";
-       revision = "1";
-       editedCabalFile = "9a5004b0563415202937cd437518f75c9910ff25c605630eed77456ce2238041";
-       libraryHaskellDepends = [
-         base bytestring containers data-default-class diagrams-core
-         diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
-         optparse-applicative Rasterific split unix
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "Rasterific backend for diagrams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-rasterific_1_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
      , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
      , hashable, JuicyPixels, lens, mtl, optparse-applicative
@@ -54979,7 +52278,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-reflex" = callPackage
@@ -55031,28 +52329,6 @@ self: {
      }) {};
 
   "diagrams-svg" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, colour
-     , containers, diagrams-core, diagrams-lib, directory, filepath
-     , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time
-     , optparse-applicative, process, semigroups, split, svg-builder
-     , text, time
-     }:
-     mkDerivation {
-       pname = "diagrams-svg";
-       version = "1.4.0.3";
-       sha256 = "1ed1579ea601d2061373e636f558765179981b3d70e62cf18adf0617c4bf59e5";
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring colour containers diagrams-core
-         diagrams-lib directory filepath hashable JuicyPixels lens
-         monoid-extras mtl old-time optparse-applicative process semigroups
-         split svg-builder text time
-       ];
-       homepage = "http://projects.haskell.org/diagrams/";
-       description = "SVG backend for diagrams drawing EDSL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diagrams-svg_1_4_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
      , containers, diagrams-core, diagrams-lib, filepath, hashable
      , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative
@@ -55070,7 +52346,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -55291,23 +52566,6 @@ self: {
      }) {};
 
   "diff3" = callPackage
-    ({ mkDerivation, base, Diff, QuickCheck, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "diff3";
-       version = "0.2.0.3";
-       sha256 = "e84c84f03bd100c2ae950b218397fb6af1f838ca1fce8b876817610d65b0ae7d";
-       libraryHaskellDepends = [ base Diff ];
-       testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-       ];
-       homepage = "http://github.com/ocharles/diff3.git";
-       description = "Perform a 3-way difference of documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diff3_0_3_0" = callPackage
     ({ mkDerivation, base, Diff, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
@@ -55322,7 +52580,6 @@ self: {
        homepage = "http://github.com/ocharles/diff3.git";
        description = "Perform a 3-way difference of documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diffarray" = callPackage
@@ -55502,8 +52759,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-aeson";
-       version = "1.1.20";
-       sha256 = "017594d7489f33a2d162eb83f4f64bc110b3bd0cfb54982e3220ac3abc440bcc";
+       version = "1.1.21";
+       sha256 = "1f294cf79bd20f872545b84cf88acc3745304d342ff0253c52e948e53d304e78";
        libraryHaskellDepends = [
          aeson base containers digestive-functors lens lens-aeson safe text
          vector
@@ -56768,8 +54025,8 @@ self: {
     ({ mkDerivation, array, base, containers, MonadRandom, random }:
      mkDerivation {
        pname = "distribution";
-       version = "1.0.1.0";
-       sha256 = "c5777b37b0b200966f73c69d3586dd694fe13ab7e587c5d8fd23efad9cdc1f0e";
+       version = "1.1.0.0";
+       sha256 = "dbe2682b5fdf93c3e0d98f950926774a8c7bd9b443a41016e8f86e86e254810e";
        libraryHaskellDepends = [
          array base containers MonadRandom random
        ];
@@ -56840,29 +54097,6 @@ self: {
      }) {};
 
   "diversity" = callPackage
-    ({ mkDerivation, base, containers, data-ordlist, fasta
-     , math-functions, MonadRandom, optparse-applicative, parsec, pipes
-     , random-shuffle, scientific, split
-     }:
-     mkDerivation {
-       pname = "diversity";
-       version = "0.8.0.1";
-       sha256 = "06ee80a100424346e725777467173198a574d1df354cfd0051b0ee2983c1feba";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers data-ordlist fasta math-functions MonadRandom
-         parsec random-shuffle scientific split
-       ];
-       executableHaskellDepends = [
-         base containers fasta optparse-applicative pipes
-       ];
-       homepage = "https://github.com/GregorySchwartz/diversity";
-       description = "Quantify the diversity of a population";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "diversity_0_8_0_2" = callPackage
     ({ mkDerivation, base, containers, data-ordlist, fasta
      , math-functions, MonadRandom, optparse-applicative, parsec, pipes
      , random-shuffle, scientific, semigroups, split
@@ -56883,7 +54117,6 @@ self: {
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dixi" = callPackage
@@ -58193,28 +55426,6 @@ self: {
      }) {};
 
   "drifter-postgresql" = callPackage
-    ({ mkDerivation, base, drifter, either, mtl, postgresql-simple
-     , tasty, tasty-hunit, text, time
-     }:
-     mkDerivation {
-       pname = "drifter-postgresql";
-       version = "0.0.2";
-       sha256 = "07fbd1e08b517d2fde939657237c7a05f2b1d1abe276681ab7254b1ab8415190";
-       revision = "1";
-       editedCabalFile = "577c35da613b6dface440995d0428e846dc4014764a635b61aa3f4bd83fa2f6b";
-       libraryHaskellDepends = [
-         base drifter either mtl postgresql-simple time
-       ];
-       testHaskellDepends = [
-         base drifter either postgresql-simple tasty tasty-hunit text
-       ];
-       homepage = "http://github.com/michaelxavier/drifter-postgresql";
-       description = "PostgreSQL support for the drifter schema migration tool";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "drifter-postgresql_0_1_0" = callPackage
     ({ mkDerivation, base, containers, drifter, either, mtl
      , postgresql-simple, tasty, tasty-hunit, text, time
      }:
@@ -59081,6 +56292,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "earclipper" = callPackage
+    ({ mkDerivation, base, filepath, hspec }:
+     mkDerivation {
+       pname = "earclipper";
+       version = "0.0.0.1";
+       sha256 = "9f0adbe9e9520657a1af71f45b7b0476447ab8466664ddfcb83e0e31394e6615";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base filepath hspec ];
+       homepage = "https://github.com/zaidan/earclipper#readme";
+       description = "Ear Clipping Triangulation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "easy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, either, http-conduit, mtl
      , resourcet, text
@@ -59950,8 +57177,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.6";
-       sha256 = "1083f3fac91439ccd32d1d0fcdf0fd6a1885ef78c688f02082e6369dcbb5364f";
+       version = "1.0.7";
+       sha256 = "2266b9bd5f43108d9f386efd0c8fa1976e59ec2baa12ecefb815387a3a4be927";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -59967,8 +57194,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.5";
-       sha256 = "a2617140efc624787954f73700a05a79aa466742ae054c50c415ddbb418ad661";
+       version = "1.0.6";
+       sha256 = "730398bdc04966332584439346e242554b5f0e03c38ff00243eee54c451225b5";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -60233,23 +57460,6 @@ self: {
      }) {};
 
   "elm-bridge" = callPackage
-    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
-     , template-haskell, text
-     }:
-     mkDerivation {
-       pname = "elm-bridge";
-       version = "0.3.0.2";
-       sha256 = "d83389362bfdc0c526bc574b413136b578cc01b61a694eaf45325531e850192f";
-       libraryHaskellDepends = [ aeson base template-haskell ];
-       testHaskellDepends = [
-         aeson base containers hspec QuickCheck text
-       ];
-       homepage = "https://github.com/agrafix/elm-bridge";
-       description = "Derive Elm types from Haskell types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "elm-bridge_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
      , template-haskell, text
      }:
@@ -60264,7 +57474,6 @@ self: {
        homepage = "https://github.com/agrafix/elm-bridge";
        description = "Derive Elm types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -60367,8 +57576,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-export-persistent";
-       version = "0.1.1";
-       sha256 = "a1866db56266261df0d8e99acc0534c32db75c1314b0578c089f02e34cad7ca2";
+       version = "0.1.2";
+       sha256 = "bc45ef54b7538b0c8223a1b966cbd10a69dac3879897d2a75b148dcdc7d8de9d";
        libraryHaskellDepends = [
          aeson base elm-export persistent scientific text
          unordered-containers
@@ -60742,27 +57951,6 @@ self: {
      }) {};
 
   "emailaddress" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest
-     , email-validate, Glob, http-api-data, opaleye, path-pieces
-     , persistent, postgresql-simple, product-profunctors, profunctors
-     , text
-     }:
-     mkDerivation {
-       pname = "emailaddress";
-       version = "0.1.6.0";
-       sha256 = "5b81ba46a7228bad005cf0370a4762fac06729277355dc02085c4d81697c689d";
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring email-validate http-api-data
-         opaleye path-pieces persistent postgresql-simple
-         product-profunctors profunctors text
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/emailaddress#readme";
-       description = "Wrapper around email-validate library adding instances for common type classes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "emailaddress_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest
      , email-validate, Glob, http-api-data, opaleye, path-pieces
      , persistent, postgresql-simple, product-profunctors, profunctors
@@ -60781,7 +57969,6 @@ self: {
        homepage = "https://github.com/cdepillabout/emailaddress#readme";
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emailparse" = callPackage
@@ -60991,8 +58178,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.14";
-       sha256 = "f321e826d56d7f14b4e027ddb57be59b2efa34a714e566e23a6bcee192ab6f33";
+       version = "1.2.15";
+       sha256 = "fb9430bec86f82463b7314c9d699441bd96a1681d6b1fac0bfd2cb4be7b9f9df";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -61025,18 +58212,17 @@ self: {
      }) {};
 
   "engine-io-snap" = callPackage
-    ({ mkDerivation, attoparsec-enumerator, base, bytestring
-     , containers, engine-io, MonadCatchIO-transformers, snap-core
-     , unordered-containers, websockets, websockets-snap
+    ({ mkDerivation, base, bytestring, containers, engine-io
+     , io-streams, lifted-base, snap-core, unordered-containers
+     , websockets, websockets-snap
      }:
      mkDerivation {
        pname = "engine-io-snap";
-       version = "1.0.3";
-       sha256 = "6f411258df83db0466096a70f3b3eb78aee8de6e24ba68be9d7fe746564a4044";
+       version = "1.0.4";
+       sha256 = "687323f00aecb1196c5790aaac1361c055ffa3a1d4658a6ad963469e034779f0";
        libraryHaskellDepends = [
-         attoparsec-enumerator base bytestring containers engine-io
-         MonadCatchIO-transformers snap-core unordered-containers websockets
-         websockets-snap
+         base bytestring containers engine-io io-streams lifted-base
+         snap-core unordered-containers websockets websockets-snap
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
@@ -61315,19 +58501,6 @@ self: {
      }) {};
 
   "envelope" = callPackage
-    ({ mkDerivation, aeson, base, doctest, Glob, mtl, text }:
-     mkDerivation {
-       pname = "envelope";
-       version = "0.1.0.0";
-       sha256 = "9116ceda5b6e103219361bcd5cdaa699a1365a43df06e5752c61dfb6419b316e";
-       libraryHaskellDepends = [ aeson base mtl text ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/envelope#readme";
-       description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "envelope_0_2_1_0" = callPackage
     ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl
      , text
      }:
@@ -61340,7 +58513,6 @@ self: {
        homepage = "https://github.com/cdepillabout/envelope#readme";
        description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envparse" = callPackage
@@ -61362,8 +58534,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "1.3.0.0";
-       sha256 = "ed2906c08163045e8b2ba22d591d79954e2b070b7643632e4e860ad09a7968bd";
+       version = "1.3.0.1";
+       sha256 = "ac630e03e9f4c8c99c39e622b9638c3bdc3b71300ef92597d60acac7ace8e85c";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -61582,8 +58754,8 @@ self: {
      }:
      mkDerivation {
        pname = "equivalence";
-       version = "0.3.1";
-       sha256 = "7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e";
+       version = "0.3.2";
+       sha256 = "7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529";
        libraryHaskellDepends = [
          base containers mtl STMonadTrans transformers transformers-compat
        ];
@@ -61592,7 +58764,7 @@ self: {
          test-framework test-framework-quickcheck2 transformers
          transformers-compat
        ];
-       homepage = "https://bitbucket.org/paba/equivalence/";
+       homepage = "https://github.com/pa-ba/equivalence";
        description = "Maintaining an equivalence relation implemented as union-find using STT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62508,32 +59680,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bytestring, cereal
-     , connection, containers, dns, dotnet-timespan, http-client
-     , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "0.13.1.2";
-       sha256 = "b519ae59c56c345cc2abe2bc6a779627d35c5553e9c0cfd51cb4aea4db9538fc";
-       libraryHaskellDepends = [
-         aeson array async base bytestring cereal connection containers dns
-         dotnet-timespan http-client protobuf random semigroups stm text
-         time unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson base connection dotnet-timespan stm tasty tasty-hunit text
-         time
-       ];
-       homepage = "http://github.com/YoEight/eventstore";
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_0_14_0_1" = callPackage
     ({ mkDerivation, aeson, array, base, cereal, classy-prelude
      , connection, containers, dns, dotnet-timespan, http-client, mtl
      , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time
@@ -62849,21 +59995,22 @@ self: {
 
   "exherbo-cabal" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal
-     , containers, data-default, doctest, haddock-library, http-client
-     , http-types, optparse-applicative, pcre-light, pretty
+     , containers, data-default, deepseq, directory, doctest, filepath
+     , haddock-library, http-client, http-types, optparse-applicative
+     , pcre-light, pretty
      }:
      mkDerivation {
        pname = "exherbo-cabal";
-       version = "0.2.0.0";
-       sha256 = "f052683dc1c0ecd91dfae4c3c3200e6601615590b51549e756e8ccb5260a7d5f";
+       version = "0.2.1.1";
+       sha256 = "30b744eced087cbffc9b631e0e4cdd150bf78c13db2363411ddf3330a6c6da3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base Cabal containers data-default haddock-library pretty
        ];
        executableHaskellDepends = [
-         ansi-wl-pprint base bytestring Cabal data-default http-client
-         http-types optparse-applicative pcre-light
+         ansi-wl-pprint base bytestring Cabal data-default deepseq directory
+         filepath http-client http-types optparse-applicative pcre-light
        ];
        testHaskellDepends = [ base doctest ];
        description = "Exheres generator for cabal packages";
@@ -63018,27 +60165,6 @@ self: {
      }) {};
 
   "exp-pairs" = callPackage
-    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
-     , QuickCheck, random, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, wl-pprint
-     }:
-     mkDerivation {
-       pname = "exp-pairs";
-       version = "0.1.5.1";
-       sha256 = "cb83312447031547092d9eef5ee092494d624d8e0c6a314ea66b8ec006f3aa2f";
-       libraryHaskellDepends = [
-         base containers deepseq ghc-prim wl-pprint
-       ];
-       testHaskellDepends = [
-         base matrix QuickCheck random smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/Bodigrim/exp-pairs";
-       description = "Linear programming over exponent pairs";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "exp-pairs_0_1_5_2" = callPackage
     ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
      , QuickCheck, random, smallcheck, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, wl-pprint
@@ -63057,7 +60183,6 @@ self: {
        homepage = "https://github.com/Bodigrim/exp-pairs";
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -63419,25 +60544,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, QuickCheck
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.4.10";
-       sha256 = "b40b3f74c02e40697f4ba5242a764c2846921e8aafdd92e79a30a7afd9e56759";
-       libraryHaskellDepends = [
-         base directory filepath process time unix
-       ];
-       testHaskellDepends = [
-         base directory filepath QuickCheck time unix
-       ];
-       homepage = "https://github.com/ndmitchell/extra#readme";
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_5_1" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -63454,7 +60560,6 @@ self: {
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -63924,8 +61029,8 @@ self: {
      }:
      mkDerivation {
        pname = "fasta";
-       version = "0.10.4.0";
-       sha256 = "d37616f6107834ce47cc57163e9dddda055ef13b0400d74d6e77cbdd249f69da";
+       version = "0.10.4.1";
+       sha256 = "0a282adecb22764cd99c056cc0a871e29adac3568ba92b37eabf8f064ad6d482";
        libraryHaskellDepends = [
          attoparsec base bytestring containers foldl lens parsec pipes
          pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
@@ -64049,37 +61154,6 @@ self: {
      }) {};
 
   "fay" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, bytestring, containers
-     , data-default, data-lens-light, directory, filepath, ghc-paths
-     , haskell-src-exts, language-ecmascript, mtl, mtl-compat
-     , optparse-applicative, process, safe, sourcemap, split, spoon, syb
-     , text, time, transformers, transformers-compat
-     , traverse-with-class, type-eq, uniplate, unordered-containers
-     , utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "fay";
-       version = "0.23.1.12";
-       sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727";
-       revision = "6";
-       editedCabalFile = "4dd008fc4b03b8fc6e67eff2fb1c42b4f5552529bdd4f63f4290ef25a5327e0b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers data-default
-         data-lens-light directory filepath ghc-paths haskell-src-exts
-         language-ecmascript mtl mtl-compat process safe sourcemap split
-         spoon syb text time transformers transformers-compat
-         traverse-with-class type-eq uniplate unordered-containers
-         utf8-string vector
-       ];
-       executableHaskellDepends = [ base mtl optparse-applicative split ];
-       homepage = "https://github.com/faylang/fay/wiki";
-       description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fay_0_23_1_16" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, containers
      , data-default, data-lens-light, directory, filepath, ghc-paths
      , haskell-src-exts, language-ecmascript, mtl, mtl-compat
@@ -64108,7 +61182,6 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base" = callPackage
@@ -65809,18 +62882,6 @@ self: {
      }) {};
 
   "fixed-vector" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
-     mkDerivation {
-       pname = "fixed-vector";
-       version = "0.8.1.0";
-       sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93";
-       libraryHaskellDepends = [ base deepseq primitive ];
-       testHaskellDepends = [ base doctest filemanip primitive ];
-       description = "Generic vectors with statically known size";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fixed-vector_0_9_0_0" = callPackage
     ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
      mkDerivation {
        pname = "fixed-vector";
@@ -65830,7 +62891,6 @@ self: {
        testHaskellDepends = [ base doctest filemanip primitive ];
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-binary" = callPackage
@@ -66162,24 +63222,6 @@ self: {
      }) {};
 
   "flat-mcmc" = callPackage
-    ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras
-     , mwc-probability, pipes, primitive, transformers, vector
-     }:
-     mkDerivation {
-       pname = "flat-mcmc";
-       version = "1.0.1";
-       sha256 = "a2852f0b020b086fa9e28e63b502a7bbdcbc4151080ce01baa366d53362de774";
-       libraryHaskellDepends = [
-         base mcmc-types monad-par monad-par-extras mwc-probability pipes
-         primitive transformers vector
-       ];
-       testHaskellDepends = [ base vector ];
-       homepage = "http://jtobin.github.com/flat-mcmc";
-       description = "Painless general-purpose sampling";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "flat-mcmc_1_5_0" = callPackage
     ({ mkDerivation, base, formatting, mcmc-types, monad-par
      , monad-par-extras, mwc-probability, pipes, primitive, text
      , transformers, vector
@@ -66196,7 +63238,6 @@ self: {
        homepage = "https://github.com/jtobin/flat-mcmc";
        description = "Painless general-purpose sampling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flat-tex" = callPackage
@@ -66603,8 +63644,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.6";
-       sha256 = "aef86dd12b001265c4e3ab15edea6cdae8f795baafc8a32764740179c2159fdd";
+       version = "0.5.0.7";
+       sha256 = "428add7568eea3e7b813b7ae89d824d7a97e8810662aa5371357b17f630dccde";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -67007,6 +64048,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "folgerhs" = callPackage
+    ({ mkDerivation, base, xml }:
+     mkDerivation {
+       pname = "folgerhs";
+       version = "0.1.0.0";
+       sha256 = "fbaf6da3ce10a7bf33ab696b807e475613257080679a36933cb3097b82df7abf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base xml ];
+       executableHaskellDepends = [ base xml ];
+       homepage = "https://github.com/SU-LOSP/tools#readme";
+       description = "Toolset for Folger Shakespeare Library's XML annotated plays";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "follower" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, cmdargs, directory, filepath
      , hs-twitter, old-locale, strict, time
@@ -68644,15 +65700,16 @@ self: {
      }) {};
 
   "ftp-client" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, connection, network
-     , transformers
+    ({ mkDerivation, attoparsec, base, bytestring, connection
+     , exceptions, network, transformers
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.3.0.0";
-       sha256 = "f21e6669f32eb088b51a1770cd8eaf66f6af97cb27ae5254ab9ed971325da3da";
+       version = "0.4.0.0";
+       sha256 = "6742576a894fbebe30a4f4b55d78baf03ae0e0d068d9704d7d41c33077bd93c7";
        libraryHaskellDepends = [
-         attoparsec base bytestring connection network transformers
+         attoparsec base bytestring connection exceptions network
+         transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/mr/ftp-client";
@@ -68661,15 +65718,15 @@ self: {
      }) {};
 
   "ftp-client-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, ftp-client
-     , ftp-clientconduit, resourcet
+    ({ mkDerivation, base, bytestring, conduit, connection, exceptions
+     , ftp-client, ftp-clientconduit, resourcet
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.3.0.0";
-       sha256 = "dc5fd4556567f3d902b4d2a8511dc4732de2a26b0206f7af1e5c9e602ec00c52";
+       version = "0.4.0.0";
+       sha256 = "cdfea17aa55aaceba29f627b24bc6f0d6c350578e0675e3ec8161bafbe76004f";
        libraryHaskellDepends = [
-         base bytestring conduit connection ftp-client resourcet
+         base bytestring conduit connection exceptions ftp-client resourcet
        ];
        testHaskellDepends = [ base ftp-clientconduit ];
        homepage = "https://github.com/mr/ftp-client";
@@ -70360,21 +67417,6 @@ self: {
      }) {};
 
   "genvalidity" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, validity }:
-     mkDerivation {
-       pname = "genvalidity";
-       version = "0.2.0.4";
-       sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57";
-       revision = "2";
-       editedCabalFile = "6865bde6373f043b1411042b9837392bcc3662c1ed78fa1b53f905af3fbb3461";
-       libraryHaskellDepends = [ base QuickCheck validity ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
-       description = "Testing utilities for the validity library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity_0_3_0_0" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
@@ -70387,7 +67429,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-containers" = callPackage
@@ -70411,25 +67452,6 @@ self: {
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
-     , validity
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec";
-       version = "0.2.0.5";
-       sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b";
-       revision = "1";
-       editedCabalFile = "34c42da21c1b3a5120be73a5b01f005d3c9278c8b45bce87b8d10b25d185db46";
-       libraryHaskellDepends = [
-         base genvalidity hspec QuickCheck validity
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
-       description = "Standard spec's for GenValidity instances";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "genvalidity-hspec_0_3_0_0" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
      , validity
      }:
@@ -70446,7 +67468,6 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -71037,21 +68058,21 @@ self: {
      }) {};
 
   "ghc-exactprint" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filemanip
-     , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently
-     , syb
+    ({ mkDerivation, base, bytestring, containers, Diff, directory
+     , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
+     , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.2.1";
-       sha256 = "756d6d0a706321a3ccd0b3c11c6cee65b5ecce95a988dda540e4f6743a602f08";
+       version = "0.5.3.0";
+       sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d";
        libraryHaskellDepends = [
          base bytestring containers directory filepath free ghc ghc-boot
          ghc-paths mtl syb
        ];
        testHaskellDepends = [
-         base containers directory filemanip filepath ghc ghc-boot ghc-paths
-         HUnit mtl silently syb
+         base bytestring containers Diff directory filemanip filepath ghc
+         ghc-boot ghc-paths HUnit mtl silently syb
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -71168,45 +68189,6 @@ self: {
      }) {};
 
   "ghc-mod" = callPackage
-    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
-     , containers, deepseq, directory, djinn-ghc, doctest, extra
-     , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils
-     , haskell-src-exts, hlint, hspec, monad-control, monad-journal, mtl
-     , old-time, optparse-applicative, pipes, pretty, process, safe
-     , split, syb, template-haskell, temporary, text, time, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "ghc-mod";
-       version = "5.6.0.0";
-       sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e";
-       revision = "4";
-       editedCabalFile = "c432e3b9ee808551fe785d6c61b9daa8370add1a6a9b7ec1a25869e2122cd3e4";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [
-         base Cabal containers filepath process template-haskell
-         transformers
-       ];
-       libraryHaskellDepends = [
-         base binary bytestring cabal-helper containers deepseq directory
-         djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths
-         ghc-syb-utils haskell-src-exts hlint monad-control monad-journal
-         mtl old-time optparse-applicative pipes pretty process safe split
-         syb template-haskell temporary text time transformers
-         transformers-base
-       ];
-       executableHaskellDepends = [
-         base binary deepseq directory fclabels filepath ghc monad-control
-         mtl old-time optparse-applicative pretty process split time
-       ];
-       testHaskellDepends = [ base doctest hspec ];
-       homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
-       description = "Happy Haskell Programming";
-       license = stdenv.lib.licenses.agpl3;
-     }) {};
-
-  "ghc-mod_5_7_0_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper
      , containers, deepseq, directory, djinn-ghc, doctest, extra
      , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils
@@ -71244,7 +68226,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -71884,17 +68865,6 @@ self: {
      }) {};
 
   "ghcjs-perch" = callPackage
-    ({ mkDerivation, base, transformers }:
-     mkDerivation {
-       pname = "ghcjs-perch";
-       version = "0.3.3";
-       sha256 = "89691df04bf1c056df7f66969a25a15c8ab7edeaaa36afdd01d15b7f21049416";
-       libraryHaskellDepends = [ base transformers ];
-       description = "GHCJS version of Perch library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ghcjs-perch_0_3_3_1" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "ghcjs-perch";
@@ -71903,7 +68873,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-promise" = callPackage
@@ -72034,25 +69003,6 @@ self: {
      }) {};
 
   "gi-atk" = callPackage
-    ({ mkDerivation, atk, base, bytestring, containers, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-atk";
-       version = "2.0.3";
-       sha256 = "3470813961cc6223c02b29cceaede04966b4e5ed497748bd0a61c023d7142620";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ atk ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Atk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) atk;};
-
-  "gi-atk_2_0_11" = callPackage
     ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, text, transformers
      }:
@@ -72070,35 +69020,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, containers
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-cairo";
-       version = "1.0.3";
-       sha256 = "0b54aff46b1998285a79a7356c5a74699112d6b09f1952bb30622ee6b53afe8b";
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ cairo gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-cairo_1_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
@@ -72122,32 +69046,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
 
   "gi-gdk" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-cairo
-     , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
-     , haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gdk";
-       version = "3.0.3";
-       sha256 = "12bd380233f41a43479891a3f731391b7ecd1d74712f263f835089cb8090be4b";
-       libraryHaskellDepends = [
-         base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
-         gi-gobject gi-pango haskell-gi haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gdk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "gi-gdk_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
      , haskell-gi, haskell-gi-base, text, transformers
@@ -72171,31 +69072,6 @@ self: {
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-gdkpixbuf" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio
-     , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
-     , haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gdkpixbuf";
-       version = "2.0.3";
-       sha256 = "5c1dcc322ad42839c74e5be2fb715f29bfa1f06d285ea4e90d2f3a19a6f545c9";
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''
-         export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0
-         export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GdkPixbuf bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk_pixbuf; 
-         inherit (pkgs) gobjectIntrospection;};
-
-  "gi-gdkpixbuf_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
      , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
@@ -72218,32 +69094,10 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs) gobjectIntrospection;};
 
   "gi-gio" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
-     , glib, gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gio";
-       version = "2.0.3";
-       sha256 = "1b2cc15f3cb60b72a7256ec8b5d0a07644b850055ae45fab5b0be9633d96f09c";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gio bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-gio_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, glib, gobjectIntrospection, haskell-gi
      , haskell-gi-base, text, transformers
@@ -72263,7 +69117,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-girepository" = callPackage
@@ -72289,27 +69142,6 @@ self: {
      }) {inherit (pkgs) gobjectIntrospection;};
 
   "gi-glib" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-glib";
-       version = "2.0.3";
-       sha256 = "2a961091547deaf8509ef3213353ec7b6ea458a584a81eef7d2685f8312b1170";
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GLib bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-glib_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
@@ -72329,31 +69161,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-gobject" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-glib, glib
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-gobject";
-       version = "2.0.3";
-       sha256 = "9cd5c2c8a2c1599334f705ea15fc3e7e63f012c60a46669ad108a2965d73973b";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "GObject bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "gi-gobject_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
      , gobjectIntrospection, haskell-gi, haskell-gi-base, text
      , transformers
@@ -72373,7 +69183,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "gi-gst" = callPackage
@@ -72471,29 +69280,6 @@ self: {
          gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
 
   "gi-gtk" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
-     , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
-     , haskell-gi, haskell-gi-base, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-gtk";
-       version = "3.0.3";
-       sha256 = "490acc92f75b231e9770b5bba2e041c2e3cd163c5e6483a153f072b0b6987c31";
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text
-         transformers
-       ];
-       libraryPkgconfigDepends = [ gtk3 ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0'';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Gtk bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk;};
-
-  "gi-gtk_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers
@@ -72583,13 +69369,14 @@ self: {
      }) {inherit (pkgs.gnome2) gtksourceview;};
 
   "gi-javascriptcore" = callPackage
-    ({ mkDerivation, base, bytestring, containers, haskell-gi
+    ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
      , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "3.0.3";
-       sha256 = "b2d01c9b72c4da8b2ebe28cc515a6ecbf0f1eed23519b5cabe3f7381872df974";
+       version = "3.0.11";
+       sha256 = "88f288c8e70dace97422b7385f77a4d7f856e4a2f5940abc4d41947ec76bb250";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
@@ -72648,33 +69435,6 @@ self: {
      }) {inherit (pkgs) libnotify;};
 
   "gi-pango" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, containers, gi-glib
-     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
-     , pango, text, transformers
-     }:
-     mkDerivation {
-       pname = "gi-pango";
-       version = "1.0.3";
-       sha256 = "d1a5f97c17038967573576e2eba05207e1d6d8c89a704d87767681e858fb0257";
-       libraryHaskellDepends = [
-         base bytestring containers gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ];
-       doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Pango bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; 
-         inherit (pkgs.gnome2) pango;};
-
-  "gi-pango_1_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
      , haskell-gi-base, pango, text, transformers
@@ -72757,26 +69517,6 @@ self: {
      }) {inherit (pkgs) poppler;};
 
   "gi-soup" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib
-     , gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-soup";
-       version = "2.4.3";
-       sha256 = "ee786ad3b35b6468f53f3962611e5316a020bdf98d9b4050a598f7b45a575a4b";
-       libraryHaskellDepends = [
-         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
-         haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ libsoup ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Libsoup bindings";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs.gnome2) libsoup;};
-
-  "gi-soup_2_4_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
      , transformers
@@ -72795,7 +69535,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome2) libsoup;};
 
   "gi-vte" = callPackage
@@ -72821,29 +69560,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "gi-webkit" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
-     , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-gtk
-     , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text
-     , transformers, webkit
-     }:
-     mkDerivation {
-       pname = "gi-webkit";
-       version = "3.0.3";
-       sha256 = "8652475bdd3bd713a2eb6ceb55c4ab81bf0939824d707dfe888e007c782fd216";
-       libraryHaskellDepends = [
-         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
-         gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
-         haskell-gi haskell-gi-base text transformers
-       ];
-       libraryPkgconfigDepends = [ webkit ];
-       doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "WebKit bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit = null;};
-
-  "gi-webkit_3_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
@@ -73045,33 +69761,6 @@ self: {
      }) {};
 
   "giphy-api" = callPackage
-    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
-     , directory, hspec, http-api-data, http-client, http-client-tls
-     , lens, microlens, microlens-th, mtl, network-uri, servant
-     , servant-client, text, transformers
-     }:
-     mkDerivation {
-       pname = "giphy-api";
-       version = "0.4.0.0";
-       sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876";
-       revision = "2";
-       editedCabalFile = "bf615e33d6be695e26434f8cb6747bb91be136093e0181eb85efe415c689d9f5";
-       libraryHaskellDepends = [
-         aeson base containers http-api-data http-client http-client-tls
-         microlens microlens-th mtl network-uri servant servant-client text
-         transformers
-       ];
-       testHaskellDepends = [
-         aeson base basic-prelude bytestring containers directory hspec lens
-         network-uri text
-       ];
-       homepage = "http://github.com/passy/giphy-api#readme";
-       description = "Giphy HTTP API wrapper and CLI search tool";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "giphy-api_0_5_2_0" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, hspec, http-api-data, http-client, http-client-tls
      , lens, microlens, microlens-th, mtl, network-uri, servant
@@ -73515,8 +70204,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitHUD";
-       version = "1.3.5";
-       sha256 = "7956019a42632f8658ba9a6508943fd212e9796657252eedec53f48850a07009";
+       version = "1.3.6";
+       sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec process text unix ];
@@ -74066,6 +70755,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gjk" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "gjk";
+       version = "0.0.0.1";
+       sha256 = "8a1dc10dffd485632bb519db13abbfd6a6f9c3cbdc12f33a8c8c6a0359dc104f";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/zaidan/gjk#readme";
+       description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gl" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, fixed, half
      , hxt, mesa, split, transformers
@@ -74095,27 +70797,6 @@ self: {
      }) {};
 
   "glabrous" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , cereal, cereal-text, directory, either, hspec, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "glabrous";
-       version = "0.1.3.0";
-       sha256 = "a9afb52cb80e5a9a1ef6bd77897229e7aa29d8fb2b863019d346357792600576";
-       libraryHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
-         either text unordered-containers
-       ];
-       testHaskellDepends = [
-         base directory either hspec text unordered-containers
-       ];
-       homepage = "https://github.com/MichelBoucey/glabrous";
-       description = "A template DSL library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "glabrous_0_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , cereal, cereal-text, directory, either, hspec, text
      , unordered-containers
@@ -74134,7 +70815,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/glabrous";
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glade" = callPackage
@@ -74250,6 +70930,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glazier-pipes" = callPackage
+    ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes
+     , pipes-concurrency, pipes-misc, stm, stm-extras, transformers
+     }:
+     mkDerivation {
+       pname = "glazier-pipes";
+       version = "0.1.4.0";
+       sha256 = "351c8002e893ad8cbb6a8eeb2b54c79b3b13665f110180a52d297f85d0a086cc";
+       libraryHaskellDepends = [
+         base glazier lens mmorph mtl pipes pipes-concurrency pipes-misc stm
+         stm-extras transformers
+       ];
+       homepage = "https://github.com/louispan/glazier-pipes#readme";
+       description = "Converts Glazier widgets into a Pipe";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gli" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , friendly-time, http-client, http-client-tls, http-conduit
@@ -74372,8 +71069,8 @@ self: {
      }:
      mkDerivation {
        pname = "gll";
-       version = "0.4.0.2";
-       sha256 = "89ee909a9120d6fa34f718079fca0e07f18ce20be93573caafa506ee72ec7818";
+       version = "0.4.0.3";
+       sha256 = "9be9e20690fa8e54e6068eaa89c676a704438efa40c2ccfd8e7d8f9a7b5d418f";
        libraryHaskellDepends = [
          array base containers pretty regex-applicative text TypeCompose
        ];
@@ -75172,30 +71869,6 @@ self: {
      }) {};
 
   "gogol" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
-     , conduit-extra, cryptonite, data-default-class, directory
-     , exceptions, filepath, gogol-core, http-client, http-conduit
-     , http-media, http-types, lens, memory, mime-types, monad-control
-     , mtl, resourcet, text, time, transformers, transformers-base
-     , unordered-containers, x509, x509-store
-     }:
-     mkDerivation {
-       pname = "gogol";
-       version = "0.1.0";
-       sha256 = "3bf4a133da2f9e5343025a272d04290a2d229d3429d748b2a49b9b29b85e398e";
-       libraryHaskellDepends = [
-         aeson base bytestring case-insensitive conduit conduit-extra
-         cryptonite data-default-class directory exceptions filepath
-         gogol-core http-client http-conduit http-media http-types lens
-         memory mime-types monad-control mtl resourcet text time
-         transformers transformers-base unordered-containers x509 x509-store
-       ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Comprehensive Google Services SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
      , conduit-extra, cryptonite, directory, exceptions, filepath
      , gogol-core, http-client, http-conduit, http-media, http-types
@@ -75217,22 +71890,34 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Comprehensive Google Services SDK";
        license = "unknown";
+     }) {};
+
+  "gogol_0_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit
+     , conduit-extra, cryptonite, directory, exceptions, filepath
+     , gogol-core, http-client, http-conduit, http-media, http-types
+     , lens, memory, mime-types, monad-control, mtl, resourcet, text
+     , time, transformers, transformers-base, unordered-containers, x509
+     , x509-store
+     }:
+     mkDerivation {
+       pname = "gogol";
+       version = "0.2.0";
+       sha256 = "5ccc62171ca67889d5e55263627c775b3242bdfa6489b509ae03ceb3d6886c8f";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive conduit conduit-extra
+         cryptonite directory exceptions filepath gogol-core http-client
+         http-conduit http-media http-types lens memory mime-types
+         monad-control mtl resourcet text time transformers
+         transformers-base unordered-containers x509 x509-store
+       ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Comprehensive Google Services SDK";
+       license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-buyer" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adexchange-buyer";
-       version = "0.1.0";
-       sha256 = "63a778a15a3bdb595e2c0ff46bbe35616891dfda687a8af520dbba219ff09d83";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Ad Exchange Buyer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adexchange-buyer_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-buyer";
@@ -75242,22 +71927,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Buyer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adexchange-seller" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adexchange-seller";
-       version = "0.1.0";
-       sha256 = "28c81ea7cc984534c445d3fa2278e1306370464e00194e844dc76b8e33a798cc";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Ad Exchange Seller SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adexchange-seller_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adexchange-seller";
@@ -75267,27 +71939,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Seller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-datatransfer" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-datatransfer";
-       version = "0.1.0";
-       sha256 = "195ab5e18d789959e559d9f7af4db757b5779cdb4b8e61f96bcb14b3fa4ad97b";
+       version = "0.1.1";
+       sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
        license = "unknown";
      }) {};
 
-  "gogol-admin-datatransfer_0_1_1" = callPackage
+  "gogol-admin-datatransfer_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-datatransfer";
-       version = "0.1.1";
-       sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9";
+       version = "0.2.0";
+       sha256 = "50960b0cd3048d7a3b9860d97f2fd02affea4dd735bc28b4603b3656dba7ef2a";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
@@ -75296,18 +71967,6 @@ self: {
      }) {};
 
   "gogol-admin-directory" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-directory";
-       version = "0.1.0";
-       sha256 = "ce8882d955c7646cb9f2ece2a2827f4db0e44cc0d1af6a968e25ce9cf7cf4622";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Admin Directory SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-directory_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-directory";
@@ -75317,22 +71976,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Directory SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-emailmigration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-emailmigration";
-       version = "0.1.0";
-       sha256 = "15b3cea41e4ba648e952adeea91467981e61d8a01b48b5231e78773d89c0da77";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Email Migration API v2 SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-emailmigration_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-emailmigration";
@@ -75342,22 +71988,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Email Migration API v2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-admin-reports" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-admin-reports";
-       version = "0.1.0";
-       sha256 = "ce4986e756a1f6d9b5bdf30c1775d32634455ed30c59dd914cc9615be68b785d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Admin Reports SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-admin-reports_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-admin-reports";
@@ -75367,22 +72000,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Reports SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-adsense";
-       version = "0.1.0";
-       sha256 = "2ff7819e65e4378a6e8f875b0dbfe2bc0e839794c738fd3e004957e7a6ac7bde";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google AdSense Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-adsense_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense";
@@ -75392,27 +72012,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-adsense-host" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense-host";
-       version = "0.1.0";
-       sha256 = "64ff681bd7da5da1fff056678137c82811b3b91dfd6077722f30e5d531b32440";
+       version = "0.1.1";
+       sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
        license = "unknown";
      }) {};
 
-  "gogol-adsense-host_0_1_1" = callPackage
+  "gogol-adsense-host_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-adsense-host";
-       version = "0.1.1";
-       sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112";
+       version = "0.2.0";
+       sha256 = "f52fc7f8b5e07bfd193a428476e7c255e9910505d151ef96848519c44e0c73b3";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
@@ -75424,20 +72043,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-affiliates";
-       version = "0.1.0";
-       sha256 = "d0800cf733018b75665bbbb382e23f07a033474de438a4064771a541e39e200e";
+       version = "0.1.1";
+       sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
        license = "unknown";
      }) {};
 
-  "gogol-affiliates_0_1_1" = callPackage
+  "gogol-affiliates_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-affiliates";
-       version = "0.1.1";
-       sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c";
+       version = "0.2.0";
+       sha256 = "83b7d65c19295f276e31fd798eff9a01268dea90419315304be7a6abced94387";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
@@ -75446,18 +72065,6 @@ self: {
      }) {};
 
   "gogol-analytics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-analytics";
-       version = "0.1.0";
-       sha256 = "e88b9c6b13566cb2d2e1eee62c24b5ec14c0cb96577bbfd690a17f9810b24548";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-analytics_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-analytics";
@@ -75467,22 +72074,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-enterprise" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-android-enterprise";
-       version = "0.1.0";
-       sha256 = "b71ee2b74419f575c5c5142dd35a23e3762172f664f489f1fa27143e9b8deb9a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play EMM SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-android-enterprise_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-enterprise";
@@ -75492,22 +72086,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play EMM SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-android-publisher" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-android-publisher";
-       version = "0.1.0";
-       sha256 = "0dbcf500379366d09e434a4f17790d53bf91a6214e2ff31d52216cd6be17437e";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Developer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-android-publisher_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-android-publisher";
@@ -75517,22 +72098,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appengine" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-appengine";
-       version = "0.1.0";
-       sha256 = "3aabc08737482e8f0ef9aa0bec136e827540a8de6f66fbf67a1d8e8167a7d523";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google App Engine Admin SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-appengine_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appengine";
@@ -75542,22 +72110,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App Engine Admin SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-activity" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-activity";
-       version = "0.1.0";
-       sha256 = "f0cbd5847f751d7ed5e448d9d610986d390161ae37899d368107b0fb7c7a5704";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Apps Activity SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-activity_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-activity";
@@ -75567,27 +72122,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Activity SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-calendar" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-calendar";
-       version = "0.1.0";
-       sha256 = "4f7d33f1d43d4f9e63d6b1d2077b07280f68a260652fc2d9ed9e5653efa24886";
+       version = "0.1.1";
+       sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
        license = "unknown";
      }) {};
 
-  "gogol-apps-calendar_0_1_1" = callPackage
+  "gogol-apps-calendar_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-calendar";
-       version = "0.1.1";
-       sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67";
+       version = "0.2.0";
+       sha256 = "1b1772c5c1084ffd1aef4f3c71afba297823362ef7c674cdf53cf86bfe4ffcae";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
@@ -75596,18 +72150,6 @@ self: {
      }) {};
 
   "gogol-apps-licensing" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-licensing";
-       version = "0.1.0";
-       sha256 = "a037cc3f62f65826e948113f24013349b71b561c97f0d06cd01f8448d136e481";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Enterprise License Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-licensing_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-licensing";
@@ -75617,22 +72159,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise License Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-reseller" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-reseller";
-       version = "0.1.0";
-       sha256 = "8abc6ee6aad16c27d7d7b37c53e9fcc5343d1d6cf50f4fe732fd436c429a71b5";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Enterprise Apps Reseller SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-reseller_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-reseller";
@@ -75642,22 +72171,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise Apps Reseller SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-apps-tasks" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-apps-tasks";
-       version = "0.1.0";
-       sha256 = "222060457d7c5b790cea90a74317f4a760ec7381f2561db9da0715e639e53b92";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Tasks SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-apps-tasks_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-apps-tasks";
@@ -75667,22 +72183,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tasks SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-appstate" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-appstate";
-       version = "0.1.0";
-       sha256 = "63961d638f4716ea2f7a619aa21a5ca528159a514aa72d52c0a3ae54b9bd519a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google App State SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-appstate_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-appstate";
@@ -75692,22 +72195,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google App State SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-autoscaler" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-autoscaler";
-       version = "0.1.0";
-       sha256 = "dd7e75cff814b08190add708a014790ab58b1ef8f9456a314e6ce732045f658f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Autoscaler SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-autoscaler_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-autoscaler";
@@ -75717,22 +72207,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Autoscaler SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-bigquery" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-bigquery";
-       version = "0.1.0";
-       sha256 = "b38065d1d83722b6d39124dc87856343ab11af936e9abb9db4efe55fbf5cf1c3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google BigQuery SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-bigquery_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-bigquery";
@@ -75742,27 +72219,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google BigQuery SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-billing" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-billing";
-       version = "0.1.0";
-       sha256 = "b8da90f45e13fc4fc3d6b717d15805ad9a2431364c9f66be77f22635e76629dd";
+       version = "0.1.1";
+       sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
        license = "unknown";
      }) {};
 
-  "gogol-billing_0_1_1" = callPackage
+  "gogol-billing_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-billing";
-       version = "0.1.1";
-       sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8";
+       version = "0.2.0";
+       sha256 = "52d867cda0d2acbd9fe4381379ab80a9821709b02ef358423d60dc83ba1bf3e9";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
@@ -75771,18 +72247,6 @@ self: {
      }) {};
 
   "gogol-blogger" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-blogger";
-       version = "0.1.0";
-       sha256 = "ef7105faf8560416fb417b462fb81a21ace2b54983a6c43095f7859a2705277a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Blogger SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-blogger_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-blogger";
@@ -75792,22 +72256,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Blogger SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-books" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-books";
-       version = "0.1.0";
-       sha256 = "f3bcdfcf2b5daf79effc5b6b137468af37e8640d63f65ba24929b414b4b1dc22";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Books SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-books_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-books";
@@ -75817,27 +72268,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Books SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-civicinfo" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-civicinfo";
-       version = "0.1.0";
-       sha256 = "0553bf55ec3e453e63e6050528614d6dfe5030413b19c27cdeebf273bae58be7";
+       version = "0.1.1";
+       sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
        license = "unknown";
      }) {};
 
-  "gogol-civicinfo_0_1_1" = callPackage
+  "gogol-civicinfo_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-civicinfo";
-       version = "0.1.1";
-       sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442";
+       version = "0.2.0";
+       sha256 = "6c33f17eaf8eda636b54c6f6e863d73a3ebbd8edf9ed5b0c22cd548ff9f653c3";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
@@ -75849,20 +72299,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-classroom";
-       version = "0.1.0";
-       sha256 = "5b5715d5403614b588053a6341a24546eec8f9f9269c4e7fb08f3ec36da71134";
+       version = "0.1.1";
+       sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
        license = "unknown";
      }) {};
 
-  "gogol-classroom_0_1_1" = callPackage
+  "gogol-classroom_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-classroom";
-       version = "0.1.1";
-       sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a";
+       version = "0.2.0";
+       sha256 = "b7b101543bcb5e1316dc41d48bcb49f6b516cd38727e5bc052e44198c1f7b230";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
@@ -75871,18 +72321,6 @@ self: {
      }) {};
 
   "gogol-cloudmonitoring" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-cloudmonitoring";
-       version = "0.1.0";
-       sha256 = "c822932fd8ec45eb690ba197e4dfd08734d2288fe0ac55562649509d2d66f32b";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-cloudmonitoring_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudmonitoring";
@@ -75892,22 +72330,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-cloudtrace" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-cloudtrace";
-       version = "0.1.0";
-       sha256 = "98c84fc8086cc7defd131a5c99cf1cd307a15343e8ef3d8c038b3e752ceee2b2";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Trace SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-cloudtrace_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-cloudtrace";
@@ -75917,22 +72342,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Trace SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-compute" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-compute";
-       version = "0.1.0";
-       sha256 = "176bf2c9ae0701bba60f8a9f19d886125a983cd46c05241c4d98778f26926f3b";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-compute_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-compute";
@@ -75942,27 +72354,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-container" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-container";
-       version = "0.1.0";
-       sha256 = "e2030647c09d58c90a1770c7841d6a0dd2f9f36b19ed12ee2514c34ba9eb79ec";
+       version = "0.1.1";
+       sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
        license = "unknown";
      }) {};
 
-  "gogol-container_0_1_1" = callPackage
+  "gogol-container_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-container";
-       version = "0.1.1";
-       sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1";
+       version = "0.2.0";
+       sha256 = "3db448086fc5cd9c2ba967096ebadb44497b00305285cb51a21fd92002f3bcbb";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
@@ -75974,8 +72385,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-containerbuilder";
-       version = "0.1.1";
-       sha256 = "7362d60cf98c8856351669c0c27fb6945098f598f6de55dd17aed817a7547df8";
+       version = "0.2.0";
+       sha256 = "5566c8f5ffd62882234b98470e2affe5e0df720aca2b2e097519b7576ffbd1f7";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Container Builder SDK";
@@ -75984,31 +72395,6 @@ self: {
      }) {};
 
   "gogol-core" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , case-insensitive, conduit, dlist, exceptions, hashable
-     , http-api-data, http-client, http-media, http-types, lens, memory
-     , resourcet, scientific, servant, tasty, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "gogol-core";
-       version = "0.1.0";
-       sha256 = "2284f49106b41cc0ea81c848a5b5c31f0a7bcb2fc5c604519451238cbc3c01b0";
-       revision = "1";
-       editedCabalFile = "11dbfa4b8778e6b446b60ad1add04d9049169936f6f762d45a3e727e92d5a0b6";
-       libraryHaskellDepends = [
-         aeson attoparsec base bifunctors bytestring case-insensitive
-         conduit dlist exceptions hashable http-api-data http-client
-         http-media http-types lens memory resourcet scientific servant text
-         time unordered-containers
-       ];
-       testHaskellDepends = [ base tasty ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Core data types and functionality for Gogol libraries";
-       license = "unknown";
-     }) {};
-
-  "gogol-core_0_1_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, dlist, exceptions, hashable
      , http-api-data, http-client, http-media, http-types, lens, memory
@@ -76031,22 +72417,33 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Core data types and functionality for Gogol libraries";
        license = "unknown";
+     }) {};
+
+  "gogol-core_0_2_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
+     , case-insensitive, conduit, dlist, exceptions, hashable
+     , http-api-data, http-client, http-media, http-types, lens
+     , resourcet, scientific, servant, tasty, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "gogol-core";
+       version = "0.2.0";
+       sha256 = "a629f7bce87624d0ac1314c8aa080ec1d5488f809864031eab716a51167244ab";
+       libraryHaskellDepends = [
+         aeson attoparsec base bifunctors bytestring case-insensitive
+         conduit dlist exceptions hashable http-api-data http-client
+         http-media http-types lens resourcet scientific servant text time
+         unordered-containers
+       ];
+       testHaskellDepends = [ base tasty ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Core data types and functionality for Gogol libraries";
+       license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-customsearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-customsearch";
-       version = "0.1.0";
-       sha256 = "3b264eed97aea0cb6ce97edc32ec66f962af7f4892f0ea6313413fba1512eee0";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google CustomSearch SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-customsearch_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-customsearch";
@@ -76056,22 +72453,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google CustomSearch SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataflow" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dataflow";
-       version = "0.1.0";
-       sha256 = "ac82d506a5efd3934f08fde8cd77b4ca387ecbe77409ff4ba2dc657bb7834515";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Dataflow SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dataflow_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataflow";
@@ -76081,22 +72465,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Dataflow SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dataproc" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dataproc";
-       version = "0.1.0";
-       sha256 = "d4a60220037b16e884499d0944aa6c858889aa322b48783249f7b6006d648b4f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Dataproc SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dataproc_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dataproc";
@@ -76106,22 +72477,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Dataproc SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-datastore" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-datastore";
-       version = "0.1.0";
-       sha256 = "346888db283ed3ff3ffad7310891cd33d230dfe98234ceb006d9b7aea28b5ea4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Datastore SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-datastore_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-datastore";
@@ -76131,27 +72489,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Datastore SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-debugger" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-debugger";
-       version = "0.1.0";
-       sha256 = "2f70ed92ff0edd99e7a2e24a00e546a79c1e082f79f97ffbd48b6a24c0f061da";
+       version = "0.1.1";
+       sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Debugger SDK";
+       description = "Google Stackdriver Debugger SDK";
        license = "unknown";
      }) {};
 
-  "gogol-debugger_0_1_1" = callPackage
+  "gogol-debugger_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-debugger";
-       version = "0.1.1";
-       sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2";
+       version = "0.2.0";
+       sha256 = "142b93f72a911e2f039d7b85e5a2b55c85fd631a3251f7089b78ee1496a882e2";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Debugger SDK";
@@ -76160,18 +72517,6 @@ self: {
      }) {};
 
   "gogol-deploymentmanager" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-deploymentmanager";
-       version = "0.1.0";
-       sha256 = "a3f03570dc6c3d0d678dd4a98d993a0daf8dfa8151fb75b572d372e7b2f881fb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Deployment Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-deploymentmanager_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-deploymentmanager";
@@ -76181,22 +72526,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Deployment Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dfareporting" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dfareporting";
-       version = "0.1.0";
-       sha256 = "3c42ecab212babf6ff6355f8f0083216897dcf344d26e22d9743c14794466625";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google DCM/DFA Reporting And Trafficking SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dfareporting_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dfareporting";
@@ -76206,22 +72538,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DCM/DFA Reporting And Trafficking SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-discovery" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-discovery";
-       version = "0.1.0";
-       sha256 = "f8f107dedc76a4aeeb6e18874a79e0d6fcb9e0212953b2ff89d1770466f629ac";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google APIs Discovery Service SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-discovery_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-discovery";
@@ -76231,22 +72550,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google APIs Discovery Service SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-dns" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-dns";
-       version = "0.1.0";
-       sha256 = "d07e3fb4f8cdcd079a80509ffe7300b300679900d8234e8833152fd83d378b40";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud DNS SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-dns_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-dns";
@@ -76256,27 +72562,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud DNS SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-doubleclick-bids" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-bids";
-       version = "0.1.0";
-       sha256 = "0ac3d6be06ae897c9dd59fde3cc160708a04f0b1853749df5186a60077590fd5";
+       version = "0.1.1";
+       sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
        license = "unknown";
      }) {};
 
-  "gogol-doubleclick-bids_0_1_1" = callPackage
+  "gogol-doubleclick-bids_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-bids";
-       version = "0.1.1";
-       sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a";
+       version = "0.2.0";
+       sha256 = "19f2d882820a756ddc7ad6d22b91ae1198e2ff53db2ad03c897e241a61c4b73c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
@@ -76285,18 +72590,6 @@ self: {
      }) {};
 
   "gogol-doubleclick-search" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-doubleclick-search";
-       version = "0.1.0";
-       sha256 = "2ed70d962d5c1ca189682a9ec22af0a903ebe08223ffd6d4b9abff414ea239db";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google DoubleClick Search SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-doubleclick-search_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-doubleclick-search";
@@ -76306,22 +72599,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-drive" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-drive";
-       version = "0.1.0";
-       sha256 = "7cccab1d269aa3ee5d6276ff78c86f29974f85418148a15a13d195ac7fd29ca3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Drive SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-drive_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-drive";
@@ -76331,7 +72611,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Drive SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-firebase-dynamiclinks" = callPackage
@@ -76348,18 +72627,6 @@ self: {
      }) {};
 
   "gogol-firebase-rules" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-firebase-rules";
-       version = "0.1.0";
-       sha256 = "b3f5483c339b0bc5882fdfeb49865d3b13f2c1d61dc7f4e46e25ccc651af2c74";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Firebase Rules SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-firebase-rules_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-firebase-rules";
@@ -76369,22 +72636,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Rules SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fitness" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-fitness";
-       version = "0.1.0";
-       sha256 = "486f83148db7c98021f81c9eff1d2e5adea532246adb9627cc0b824aeedda6cd";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Fitness SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-fitness_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fitness";
@@ -76394,22 +72648,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fitness SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fonts" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-fonts";
-       version = "0.1.0";
-       sha256 = "b87b347f22f13e7fd0e809841b4b075bc62169318575b59a0a3a4ff979b41dc9";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Fonts Developer SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-fonts_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fonts";
@@ -76419,22 +72660,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fonts Developer SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-freebasesearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-freebasesearch";
-       version = "0.1.0";
-       sha256 = "668e8e58a7830a391c8bcd1836436bb0adf606017a71d94a6aef638fe078e33c";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Freebase Search SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-freebasesearch_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-freebasesearch";
@@ -76444,27 +72672,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Freebase Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-fusiontables" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fusiontables";
-       version = "0.1.0";
-       sha256 = "2473bf1d25ae2cbe2af0c454f6dcb20765ab652502770327e4b0be6b72994ff1";
+       version = "0.1.1";
+       sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
        license = "unknown";
      }) {};
 
-  "gogol-fusiontables_0_1_1" = callPackage
+  "gogol-fusiontables_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-fusiontables";
-       version = "0.1.1";
-       sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14";
+       version = "0.2.0";
+       sha256 = "a8a9c0a90d7dea80b4f76047da04e107c45d4eb6a7ffff7ce418f0eaa79ca159";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
@@ -76473,18 +72700,6 @@ self: {
      }) {};
 
   "gogol-games" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games";
-       version = "0.1.0";
-       sha256 = "0b20a0a057942b5b99b1060c01c6042017d1db5e3cb49e44a8bf95cd5389ffd6";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games";
@@ -76494,22 +72709,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-configuration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games-configuration";
-       version = "0.1.0";
-       sha256 = "8f27ec3b23e704b6cd9d33d4bf41fa336098ef2d06edfc7482daa734ae2aa937";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services Publishing SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games-configuration_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-configuration";
@@ -76519,22 +72721,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Publishing SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-games-management" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-games-management";
-       version = "0.1.0";
-       sha256 = "4a4459968df56bd364be7f62300f9a950c466cfa62bc6db91f2460fd67d9f414";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Game Services Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-games-management_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-games-management";
@@ -76544,22 +72733,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Management SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-genomics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-genomics";
-       version = "0.1.0";
-       sha256 = "72098eeef0f3ce6ee3c9febe433ac94a1240a98679a32ca7ce65867f3e972784";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Genomics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-genomics_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-genomics";
@@ -76569,22 +72745,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Genomics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-gmail" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-gmail";
-       version = "0.1.0";
-       sha256 = "c5f39483cdfc5123b2bc16a85dccb00651f51cbc05be034ab1f72927d8a1aa8f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Gmail SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-gmail_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-gmail";
@@ -76594,22 +72757,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Gmail SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-migration" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-groups-migration";
-       version = "0.1.0";
-       sha256 = "af18dfa8279bc475851870b44d66f015fa36dfdb6136320a00d76a5245d86364";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Groups Migration SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-groups-migration_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-migration";
@@ -76619,27 +72769,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Migration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-groups-settings" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-settings";
-       version = "0.1.0";
-       sha256 = "47c2237898cbf007074c767c738f24d2e099cc17ea2914c1434f703933eb1713";
+       version = "0.1.1";
+       sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
        license = "unknown";
      }) {};
 
-  "gogol-groups-settings_0_1_1" = callPackage
+  "gogol-groups-settings_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-groups-settings";
-       version = "0.1.1";
-       sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed";
+       version = "0.2.0";
+       sha256 = "a9239bbb414bc01dc3639d6c808cbbfa681125fc6aa13708c6f6d9c8f24e7ee6";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
@@ -76661,18 +72810,6 @@ self: {
      }) {};
 
   "gogol-identity-toolkit" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-identity-toolkit";
-       version = "0.1.0";
-       sha256 = "c6ad66395f449cf7900d1f12657977e5864db8a426acc0f56a9d4674dfbd488d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Identity Toolkit SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-identity-toolkit_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-identity-toolkit";
@@ -76682,22 +72819,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity Toolkit SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-kgsearch" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-kgsearch";
-       version = "0.1.0";
-       sha256 = "c7f006ee6e37cd3c893cd7a60e9cc44d857a7aca5bb29f9d942269c3c88767f3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Identity and Access Management SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-kgsearch_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-kgsearch";
@@ -76707,22 +72831,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Knowledge Graph Search SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-latencytest" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-latencytest";
-       version = "0.1.0";
-       sha256 = "866074c84140f6ff0cb13eaef954d015f681b7fb5250d9299cc7c993b9e0953d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Network Performance Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-latencytest_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-latencytest";
@@ -76732,22 +72843,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Network Performance Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-logging" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-logging";
-       version = "0.1.0";
-       sha256 = "88ee7e43040ab494ba9b138cfa01a626546dadd9aaca9ac451325b118bb97f73";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Logging SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-logging_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-logging";
@@ -76757,27 +72855,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Logging SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-maps-coordinate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-coordinate";
-       version = "0.1.0";
-       sha256 = "85a7cc97ca13c5b65d8d7fa4c49b643cec3913fb51952b0032fd5e889e33d9c0";
+       version = "0.1.1";
+       sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
        license = "unknown";
      }) {};
 
-  "gogol-maps-coordinate_0_1_1" = callPackage
+  "gogol-maps-coordinate_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-coordinate";
-       version = "0.1.1";
-       sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89";
+       version = "0.2.0";
+       sha256 = "414b03bd9c3679df9c923dd71aa9ecf35fe29c7e17f33630583a2e4e563f30b4";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
@@ -76786,18 +72883,6 @@ self: {
      }) {};
 
   "gogol-maps-engine" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-maps-engine";
-       version = "0.1.0";
-       sha256 = "fe092be561b6b93619ad2626d7b31edad0f08b51f7a9c40273dfafa249d93f09";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Maps Engine SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-maps-engine_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-maps-engine";
@@ -76807,22 +72892,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Engine SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-mirror" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-mirror";
-       version = "0.1.0";
-       sha256 = "de360430d65ded18ba6f0cc3c4bdf381230ad3cf1e37b0c6aaeb0a85737ba41d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Mirror SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-mirror_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-mirror";
@@ -76832,7 +72904,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Mirror SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-ml" = callPackage
@@ -76849,18 +72920,6 @@ self: {
      }) {};
 
   "gogol-monitoring" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-monitoring";
-       version = "0.1.0";
-       sha256 = "b3d92680ed5688d6556f58fa5db6ff36e4319f03abb58374ee2d51498b7feab1";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Monitoring SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-monitoring_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-monitoring";
@@ -76870,22 +72929,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Monitoring SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-oauth2" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-oauth2";
-       version = "0.1.0";
-       sha256 = "7dfa28c2babc8f0ba8b82e4ecf58108a289d97147848678662870d1404c4798d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google OAuth2 SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-oauth2_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-oauth2";
@@ -76895,22 +72941,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google OAuth2 SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-pagespeed" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-pagespeed";
-       version = "0.1.0";
-       sha256 = "1243c9dc68363fed8a96596d368622ae7b23296f7c231134f354401428f5815b";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google PageSpeed Insights SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-pagespeed_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pagespeed";
@@ -76920,27 +72953,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google PageSpeed Insights SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-partners" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-partners";
-       version = "0.1.0";
-       sha256 = "205d4a467aa60df3ae42923341eb2fa688f5f9121e92eeff93e042571df8eb7e";
+       version = "0.1.1";
+       sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
        license = "unknown";
      }) {};
 
-  "gogol-partners_0_1_1" = callPackage
+  "gogol-partners_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-partners";
-       version = "0.1.1";
-       sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc";
+       version = "0.2.0";
+       sha256 = "3bce3a43fc727b78b0d90d566a6769ff704eb4764948d0d2c328d95d5c24722c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
@@ -76949,18 +72981,6 @@ self: {
      }) {};
 
   "gogol-people" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-people";
-       version = "0.1.0";
-       sha256 = "8cb6eba72fbee2057c58ab7521ba962a44cfd131f4b5dc1a382c8b2e97083e50";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google People SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-people_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-people";
@@ -76970,22 +72990,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google People SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-play-moviespartner" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-play-moviespartner";
-       version = "0.1.0";
-       sha256 = "6ddde72865f91a798e8a1e1281a0a79d6f3d5cd2c34b94146d72bd764d91df9a";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Play Movies Partner SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-play-moviespartner_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-play-moviespartner";
@@ -76995,22 +73002,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Movies Partner SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-plus";
-       version = "0.1.0";
-       sha256 = "97646d9b6678b5bb56b0d9ba92bbbdd9baac2e8e50df49f25d60f4bbe08a3840";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google + SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-plus_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus";
@@ -77020,27 +73014,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-plus-domains" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus-domains";
-       version = "0.1.0";
-       sha256 = "dce9a8f2f7404a39be2f44b269fc0ef5fa0eb908cc5dda184ea865abca31449f";
+       version = "0.1.1";
+       sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
        license = "unknown";
      }) {};
 
-  "gogol-plus-domains_0_1_1" = callPackage
+  "gogol-plus-domains_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-plus-domains";
-       version = "0.1.1";
-       sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea";
+       version = "0.2.0";
+       sha256 = "c5497f9e0637a5e657cfbbf3003e4101de371b407e81e0df8a89db0979dc0a9b";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
@@ -77049,18 +73042,6 @@ self: {
      }) {};
 
   "gogol-prediction" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-prediction";
-       version = "0.1.0";
-       sha256 = "f877ae9455f43b924b91e08f11c0c6053b72b78a5be28d8f4ea4ed7256e68ca9";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Prediction SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-prediction_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-prediction";
@@ -77070,27 +73051,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Prediction SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-proximitybeacon" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-proximitybeacon";
-       version = "0.1.0";
-       sha256 = "b46bfe6c5bffb3714c3b66a9aa6768ad8d62e84588cc20202956da9fc45ad872";
+       version = "0.1.1";
+       sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
        license = "unknown";
      }) {};
 
-  "gogol-proximitybeacon_0_1_1" = callPackage
+  "gogol-proximitybeacon_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-proximitybeacon";
-       version = "0.1.1";
-       sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2";
+       version = "0.2.0";
+       sha256 = "5bff5ddbf059ca8fa55a19f9a892339ef50acb5e5864016cc5a6eae58def1456";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
@@ -77099,18 +73079,6 @@ self: {
      }) {};
 
   "gogol-pubsub" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-pubsub";
-       version = "0.1.0";
-       sha256 = "2063ab0083d0f8538bdf9ff73b567dfaf705198efa3507b30a54a38bf4c8c6fb";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud Pub/Sub SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-pubsub_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-pubsub";
@@ -77120,22 +73088,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Pub/Sub SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-qpxexpress" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-qpxexpress";
-       version = "0.1.0";
-       sha256 = "388e2920fc6c35d8341fe728652448edfe5305d48f8dac579af4ed369d918d42";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google QPX Express SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-qpxexpress_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-qpxexpress";
@@ -77145,22 +73100,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google QPX Express SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-replicapool";
-       version = "0.1.0";
-       sha256 = "765772804708e48f0f443d94bed6980454b2a2d01ae390808cd23fa278e068d3";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Group Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-replicapool_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool";
@@ -77170,22 +73112,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-replicapool-updater" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-replicapool-updater";
-       version = "0.1.0";
-       sha256 = "c57504625cbd16f4cb6c8022736f5b6135dacea1daf9a550aba303e38abe8c40";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Group Updater SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-replicapool-updater_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-replicapool-updater";
@@ -77195,27 +73124,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Updater SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-resourcemanager" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourcemanager";
-       version = "0.1.0";
-       sha256 = "021bfb32c5f98e730815d4731c0beabb61e9ff20645096d6d10ed338a1000d4f";
+       version = "0.1.1";
+       sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
        license = "unknown";
      }) {};
 
-  "gogol-resourcemanager_0_1_1" = callPackage
+  "gogol-resourcemanager_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourcemanager";
-       version = "0.1.1";
-       sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577";
+       version = "0.2.0";
+       sha256 = "32c1537b1a8238e8c91f67a6289fc07d72c596a4b0b3625306565465173f2445";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
@@ -77224,18 +73152,6 @@ self: {
      }) {};
 
   "gogol-resourceviews" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-resourceviews";
-       version = "0.1.0";
-       sha256 = "3ae66598edf8248f78a82f229c0333b3e1de9bfd56f25ebf1339802f51a1c8a2";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Compute Engine Instance Groups SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-resourceviews_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-resourceviews";
@@ -77245,15 +73161,14 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Groups SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-runtimeconfig" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-runtimeconfig";
-       version = "0.1.1";
-       sha256 = "44efa4354d6cd66ccf7a49d4af0b2243eeac2ad375b3ba6a394abdb65f4d4e5c";
+       version = "0.2.0";
+       sha256 = "d4b92f4929007d2da9741c46907137a30a8fb308f0defabe4b64b1c8af58a681";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud RuntimeConfig SDK";
@@ -77265,8 +73180,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-safebrowsing";
-       version = "0.1.1";
-       sha256 = "fb510fb5f125c02f768f3b0653fe2c8a65776a0f81b989906867004aaed31de8";
+       version = "0.2.0";
+       sha256 = "32b972796fddf933ef21c28b4904b7f9192459a5e7b98ce46adca4f3f2d3a171";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Safe Browsing APIs SDK";
@@ -77275,18 +73190,6 @@ self: {
      }) {};
 
   "gogol-script" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-script";
-       version = "0.1.0";
-       sha256 = "92ed9c5f8a2ece251dc7a5777cd24ad2f8cab14683eae775b2f9eea30a0bf731";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Apps Script Execution SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-script_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-script";
@@ -77296,7 +73199,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Script Execution SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-servicecontrol" = callPackage
@@ -77326,18 +73228,6 @@ self: {
      }) {};
 
   "gogol-sheets" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-sheets";
-       version = "0.1.0";
-       sha256 = "ba134680a2c6337acbf7f302d953a993993553618a5032e39c49eaabdc7b7a94";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Sheets SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-sheets_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sheets";
@@ -77347,22 +73237,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-shopping-content" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-shopping-content";
-       version = "0.1.0";
-       sha256 = "27d3ea61026c0cf577795d1b36766eddcce90f942409ed0dea512d730fbbd361";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Content API for Shopping SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-shopping-content_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-shopping-content";
@@ -77372,22 +73249,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Content API for Shopping SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-siteverification" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-siteverification";
-       version = "0.1.0";
-       sha256 = "4dd9bcd9e9ba39d4d9a6245086faea856c3baa3b4728e9849d8fe50a7f2ff8e1";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Site Verification SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-siteverification_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-siteverification";
@@ -77397,22 +73261,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Site Verification SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-spectrum" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-spectrum";
-       version = "0.1.0";
-       sha256 = "1c1f35f2520281a27e9ebd86895cc91432f1ae4f6e26caf5936054fd72fd04a4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Spectrum Database SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-spectrum_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-spectrum";
@@ -77422,22 +73273,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Spectrum Database SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-sqladmin" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-sqladmin";
-       version = "0.1.0";
-       sha256 = "04a14790303a9bf830e4fe7471c52924e5ed7f9248676e9f6a3afea7aaab7519";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Cloud SQL Administration SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-sqladmin_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-sqladmin";
@@ -77447,27 +73285,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud SQL Administration SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-storage" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage";
-       version = "0.1.0";
-       sha256 = "eba6b6c0c2d7fbc9a24f66f08fa02699317a26b5a85cd2936dabb7c418f90912";
+       version = "0.1.1";
+       sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
        license = "unknown";
      }) {};
 
-  "gogol-storage_0_1_1" = callPackage
+  "gogol-storage_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage";
-       version = "0.1.1";
-       sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72";
+       version = "0.2.0";
+       sha256 = "158528dc7488c5ac987c2cd05e9d1d15576aa9085d8c1ed3bfb9f3cba517d8da";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
@@ -77479,20 +73316,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage-transfer";
-       version = "0.1.0";
-       sha256 = "fb860f45966d2c5a3545a554a2446c9f66ab58b7cb85f09137ba452dcbf965cd";
+       version = "0.1.1";
+       sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
        license = "unknown";
      }) {};
 
-  "gogol-storage-transfer_0_1_1" = callPackage
+  "gogol-storage-transfer_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-storage-transfer";
-       version = "0.1.1";
-       sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745";
+       version = "0.2.0";
+       sha256 = "64aa9748678d9ed6785cd0475b1711b13389b83c84dc99c71cd4fde2dbde3f1e";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
@@ -77501,18 +73338,6 @@ self: {
      }) {};
 
   "gogol-tagmanager" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-tagmanager";
-       version = "0.1.0";
-       sha256 = "cab01a9f11ac12381e410d16c4a951dc4def7a08e42a94cd084c3e156faf61aa";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Tag Manager SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-tagmanager_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-tagmanager";
@@ -77522,27 +73347,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tag Manager SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-taskqueue" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-taskqueue";
-       version = "0.1.0";
-       sha256 = "5f03a174e2bbf26fa35823e50106b476ecfed71757519fa4c251b24961491765";
+       version = "0.1.1";
+       sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
        license = "unknown";
      }) {};
 
-  "gogol-taskqueue_0_1_1" = callPackage
+  "gogol-taskqueue_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-taskqueue";
-       version = "0.1.1";
-       sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c";
+       version = "0.2.0";
+       sha256 = "5b172c962a9aca7eed4cb4af3e05ccebef93b80584fb6fc902b1c462a8b5b8a6";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
@@ -77551,18 +73375,6 @@ self: {
      }) {};
 
   "gogol-translate" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-translate";
-       version = "0.1.0";
-       sha256 = "17d71ff0f9665e8d8737b120cae1d73222d2bea8dce031bf49e9246461921679";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Translate SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-translate_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-translate";
@@ -77572,22 +73384,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Translate SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-urlshortener" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-urlshortener";
-       version = "0.1.0";
-       sha256 = "7247b9d5432d2ef0386134a6ac011b93365779158e62ec56f2d4c8666ceea4ab";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google URL Shortener SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-urlshortener_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-urlshortener";
@@ -77597,27 +73396,26 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google URL Shortener SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-useraccounts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-useraccounts";
-       version = "0.1.0";
-       sha256 = "5ca3d5fca236a4c17d66daee9db3f79a8e57e3cccfb8d494514a8f3c3fba7b10";
+       version = "0.1.1";
+       sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
        license = "unknown";
      }) {};
 
-  "gogol-useraccounts_0_1_1" = callPackage
+  "gogol-useraccounts_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-useraccounts";
-       version = "0.1.1";
-       sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647";
+       version = "0.2.0";
+       sha256 = "91504ac3cbdb11a45ee6762799bfefb3be973b8883ab84254c3bb3101eb9cc67";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
@@ -77629,20 +73427,20 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-vision";
-       version = "0.1.0";
-       sha256 = "0a501b91618996ee75f127838626b632c987b0e91ae15d948afecdd4de4c0b0d";
+       version = "0.1.1";
+       sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
        license = "unknown";
      }) {};
 
-  "gogol-vision_0_1_1" = callPackage
+  "gogol-vision_0_2_0" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-vision";
-       version = "0.1.1";
-       sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565";
+       version = "0.2.0";
+       sha256 = "6c87358e77e3565249701b36d8e5fa552f454dfd496c1f65f6586a5781846071";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
@@ -77651,18 +73449,6 @@ self: {
      }) {};
 
   "gogol-webmaster-tools" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-webmaster-tools";
-       version = "0.1.0";
-       sha256 = "0137d9c88a2c4fb1ef1a10a026ff44e628e52dcf5c915d6b479457b98536aec4";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google Search Console SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-webmaster-tools_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-webmaster-tools";
@@ -77672,22 +73458,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Search Console SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube";
-       version = "0.1.0";
-       sha256 = "2edc3a34cb428be4be4bec367f718f047936a80ece335a9b841d82ada7c3cc1f";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Data SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube";
@@ -77697,22 +73470,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Data SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-analytics" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube-analytics";
-       version = "0.1.0";
-       sha256 = "8c6a8681cb678edf8208f58f051db36e25cc4b8326319eab071ef573e9e4783d";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Analytics SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube-analytics_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-analytics";
@@ -77722,22 +73482,9 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Analytics SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-youtube-reporting" = callPackage
-    ({ mkDerivation, base, gogol-core }:
-     mkDerivation {
-       pname = "gogol-youtube-reporting";
-       version = "0.1.0";
-       sha256 = "2ba85f30e218fa1718cf1a2dcf3c768d023856cdd30a3544c5ffea0750b3f37c";
-       libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
-       description = "Google YouTube Reporting SDK";
-       license = "unknown";
-     }) {};
-
-  "gogol-youtube-reporting_0_1_1" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-youtube-reporting";
@@ -77747,7 +73494,6 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Reporting SDK";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gooey" = callPackage
@@ -79209,6 +74955,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gridbox" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "gridbox";
+       version = "0.2.0.0";
+       sha256 = "0f035d7cf07e87a46037e5f52e7742667b58a8e049d1a1211b95aaa8731eb580";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/zaidan/gridbox#readme";
+       description = "A grid box model";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gridfs" = callPackage
     ({ mkDerivation, base, bson, bytestring, conduit, conduit-extra
      , monad-control, mongoDB, mtl, pureMD5, resourcet, tagged, text
@@ -82250,8 +78009,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.9.5.0";
-       sha256 = "47cb6b1859911f638a69ff7cc4fb3ca837be56c51a98b5ff98e43f638ac406d7";
+       version = "4.9.5.1";
+       sha256 = "8deca33939717372ca227559dfe82aa0b02af49b19e9ea60051f555dcee2cfe6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83605,8 +79364,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.4.6.2";
-       sha256 = "0725900491022e8073d0d61408c2f1d170dbeb7c51bc52e1716c9bf829763b09";
+       version = "7.4.6.3";
+       sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -84262,27 +80021,6 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
-     , QuickCheck, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, unix
-     }:
-     mkDerivation {
-       pname = "hashable";
-       version = "1.2.4.0";
-       sha256 = "fb9671db0c39cd48d38e2e13e3352e2bf7dfa6341edfe68789a1753d21bb3cf3";
-       libraryHaskellDepends = [
-         base bytestring ghc-prim integer-gmp text
-       ];
-       testHaskellDepends = [
-         base bytestring ghc-prim HUnit QuickCheck random test-framework
-         test-framework-hunit test-framework-quickcheck2 text unix
-       ];
-       homepage = "http://github.com/tibbe/hashable";
-       description = "A class for types that can be converted to a hash value";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashable_1_2_5_0" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
      , QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, unix
@@ -84301,7 +80039,6 @@ self: {
        homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-extras" = callPackage
@@ -85082,32 +80819,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, directory
-     , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl
-     , pretty-show, process, safe, text, transformers, xdg-basedir
-     , xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.18";
-       sha256 = "c6dabdef4093d0fcbd67fe5b7fa83911f66fdd602bdc02a2615c16d0a1279162";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring Cabal containers directory filepath haskell-gi-base
-         mtl pretty-show process safe text transformers xdg-basedir
-         xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
-
-  "haskell-gi_0_20" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl
      , pretty-show, process, regex-tdfa, safe, text, transformers
@@ -85131,23 +80842,9 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
 
   "haskell-gi-base" = callPackage
-    ({ mkDerivation, base, bytestring, containers, glib, text }:
-     mkDerivation {
-       pname = "haskell-gi-base";
-       version = "0.18.4";
-       sha256 = "45fb9bd2b65668d09f0643c3e4e0629df27610dfb501049c4a4b14a5edba8e16";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
-       description = "Foundation for libraries generated by haskell-gi";
-       license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib;};
-
-  "haskell-gi-base_0_20" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
@@ -85158,7 +80855,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "haskell-google-trends" = callPackage
@@ -85210,10 +80906,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-import-graph";
-       version = "1.0.0";
-       sha256 = "af555336b7e734dae263e5f68b439d6c4234d7b2da493917fadfe132a7034dee";
-       revision = "1";
-       editedCabalFile = "4c2ba0b2c6d5649842b1f124e4183662cdc4db66810017775ce450cf84223d50";
+       version = "1.0.1";
+       sha256 = "c708c2d5fa7e48c205aeaf1661b07dc52ec4d6e459f3544585b71dbc63f3be92";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85328,30 +81022,6 @@ self: {
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
-     , pretty-show, tasty, tasty-golden, transformers
-     , traverse-with-class, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-names";
-       version = "0.7.0";
-       sha256 = "c0582b2a51526e24483d71f1669bba2ef340ae7014babb3a9a5b59296fc5faf2";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-lens-light filepath
-         haskell-src-exts mtl transformers traverse-with-class uniplate
-       ];
-       testHaskellDepends = [
-         base containers filemanip filepath haskell-src-exts mtl pretty-show
-         tasty tasty-golden traverse-with-class
-       ];
-       homepage = "http://documentup.com/haskell-suite/haskell-names";
-       description = "Name resolution library for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-names_0_8_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , data-lens-light, filemanip, filepath, haskell-src-exts, mtl
      , pretty-show, tasty, tasty-golden, transformers
@@ -85425,25 +81095,6 @@ self: {
      }) {};
 
   "haskell-packages" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl
-     , optparse-applicative, tagged, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "haskell-packages";
-       version = "0.4";
-       sha256 = "2c9af5515ce210da304560d6a16b36fa056eefcb2ec609dc0b25c2002ba31021";
-       libraryHaskellDepends = [
-         aeson base bytestring Cabal containers deepseq directory filepath
-         haskell-src-exts hse-cpp mtl optparse-applicative tagged
-         transformers transformers-compat
-       ];
-       homepage = "http://documentup.com/haskell-suite/haskell-packages";
-       description = "Haskell suite library for package management and integration with Cabal";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-packages_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl
      , optparse-applicative, tagged, transformers, transformers-compat
@@ -85460,7 +81111,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-packages";
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -85659,29 +81309,6 @@ self: {
      }) {};
 
   "haskell-src-exts" = callPackage
-    ({ mkDerivation, array, base, containers, cpphs, directory
-     , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
-     , syb, tasty, tasty-golden, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "haskell-src-exts";
-       version = "1.17.1";
-       sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd";
-       revision = "1";
-       editedCabalFile = "c07248f2a7b4bee1c7777dc6e441e8d1f32a02fb596ea49f47074c68b3c9ea0b";
-       libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
-       libraryToolDepends = [ happy ];
-       testHaskellDepends = [
-         base containers directory filepath mtl pretty-show smallcheck syb
-         tasty tasty-golden tasty-smallcheck
-       ];
-       doCheck = false;
-       homepage = "https://github.com/haskell-suite/haskell-src-exts";
-       description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-exts_1_18_2" = callPackage
     ({ mkDerivation, array, base, containers, cpphs, directory
      , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck
      , tasty, tasty-golden, tasty-smallcheck
@@ -85700,7 +81327,6 @@ self: {
        homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts_1_19_1" = callPackage
@@ -85770,21 +81396,6 @@ self: {
      }) {};
 
   "haskell-src-meta" = callPackage
-    ({ mkDerivation, base, haskell-src-exts, pretty, syb
-     , template-haskell, th-orphans
-     }:
-     mkDerivation {
-       pname = "haskell-src-meta";
-       version = "0.6.0.14";
-       sha256 = "769124392398695667c800225cd908cb455dadf54a9317870bd9384e0eeb20c9";
-       libraryHaskellDepends = [
-         base haskell-src-exts pretty syb template-haskell th-orphans
-       ];
-       description = "Parse source to template-haskell abstract syntax";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-meta_0_7_0_1" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
      , template-haskell, th-orphans
      }:
@@ -85797,7 +81408,6 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -86794,29 +82404,6 @@ self: {
      }) {};
 
   "haskintex" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "haskintex";
-       version = "0.6.0.1";
-       sha256 = "9b45463a0d77e8665cc82b656b6d9f8020c873d73f2dd9fe92fcb85a45e90f44";
-       revision = "1";
-       editedCabalFile = "8a16e2748e754c6fe0d7bd20186166b46819b12c6853c1275fda55e56d8ef8c7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers directory filepath
-         haskell-src-exts HaTeX hint parsec process text transformers
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "http://daniel-diaz.github.io/projects/haskintex";
-       description = "Haskell Evaluation inside of LaTeX code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskintex_0_7_0_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text
      , transformers
@@ -86835,7 +82422,6 @@ self: {
        homepage = "http://daniel-diaz.github.io/projects/haskintex";
        description = "Haskell Evaluation inside of LaTeX code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskmon" = callPackage
@@ -87731,23 +83317,6 @@ self: {
      }) {};
 
   "hasty-hamiltonian" = callPackage
-    ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes
-     , primitive, transformers
-     }:
-     mkDerivation {
-       pname = "hasty-hamiltonian";
-       version = "1.1.5";
-       sha256 = "d3a62d1933ca6ebc2b53a7a620922809297350d33986904e69072c1e8bfa3fa6";
-       libraryHaskellDepends = [
-         base lens mcmc-types mwc-probability pipes primitive transformers
-       ];
-       testHaskellDepends = [ ad base mwc-probability ];
-       homepage = "http://github.com/jtobin/hasty-hamiltonian";
-       description = "Speedy traversal through parameter space";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hasty-hamiltonian_1_3_0" = callPackage
     ({ mkDerivation, ad, base, kan-extensions, lens, mcmc-types
      , mwc-probability, pipes, primitive, transformers
      }:
@@ -87763,7 +83332,6 @@ self: {
        homepage = "http://github.com/jtobin/hasty-hamiltonian";
        description = "Speedy traversal through parameter space";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hat" = callPackage
@@ -90029,8 +85597,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.3.1";
-       sha256 = "9be3bf3945b4a937cb7c34e040ba5ebc220551a4e4685258a9ad3da7280575c4";
+       version = "1.0.4.0";
+       sha256 = "4a208830f15a3575f10c238bed8ff09827483eec94b8cc068c6907d2106f982a";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers dlist parsec shakespeare
          template-haskell text
@@ -91147,8 +86715,8 @@ self: {
      }:
      mkDerivation {
        pname = "highjson";
-       version = "0.3.0.0";
-       sha256 = "4d1d518ca40891e76e67dc6616d8ec94351efa70715098a745b596c987ddc5f7";
+       version = "0.4.0.0";
+       sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962";
        libraryHaskellDepends = [ aeson base hvect lens text ];
        testHaskellDepends = [ aeson base hspec lens QuickCheck text ];
        homepage = "https://github.com/agrafix/highjson";
@@ -91163,8 +86731,8 @@ self: {
      }:
      mkDerivation {
        pname = "highjson-swagger";
-       version = "0.3.0.0";
-       sha256 = "d03b13a9fdd2fa9ef3c68cbecd2b1a875242fd68787c667d19e3d592796d992f";
+       version = "0.4.0.0";
+       sha256 = "2df02d2fd764fd5386094de59e181314ba152bd87dc2905d9869fefd4cb87e1f";
        libraryHaskellDepends = [
          base highjson hvect insert-ordered-containers lens swagger2 text
        ];
@@ -91176,6 +86744,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "highjson-th" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, highjson
+     , highjson-swagger, hspec, lens, QuickCheck, swagger2
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "highjson-th";
+       version = "0.4.0.0";
+       sha256 = "f30c4937a9db6eb1cea8b9efef76855af3b4745e3a620798681b8cf3c73202c5";
+       libraryHaskellDepends = [
+         aeson base highjson highjson-swagger swagger2 template-haskell text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring highjson highjson-swagger hspec lens
+         QuickCheck swagger2 text
+       ];
+       homepage = "https://github.com/agrafix/highjson";
+       description = "Template Haskell helpers for highjson specs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "highlight-versions" = callPackage
     ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db
      }:
@@ -91608,26 +87197,6 @@ self: {
      }) {};
 
   "hip" = callPackage
-    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
-     , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
-     , primitive, process, QuickCheck, repa, temporary, vector
-     }:
-     mkDerivation {
-       pname = "hip";
-       version = "1.2.0.0";
-       sha256 = "d72879134b56197e0abf21abd09b0198581cb0302574711ffbcfff6da17dd083";
-       libraryHaskellDepends = [
-         base bytestring Chart Chart-diagrams colour deepseq directory
-         filepath JuicyPixels netpbm primitive process repa temporary vector
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/lehins/hip";
-       description = "Haskell Image Processing (HIP) Library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hip_1_5_2_0" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
      , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
      , primitive, process, QuickCheck, repa, temporary, vector
@@ -92087,26 +87656,6 @@ self: {
      }) {};
 
   "hjsonpointer" = callPackage
-    ({ mkDerivation, aeson, base, hspec, http-types, QuickCheck, text
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hjsonpointer";
-       version = "1.0.0.2";
-       sha256 = "98e2675781d11e1c9eb903b6a7c35020137625e305efb0fcb8f7614f09e6e8f2";
-       libraryHaskellDepends = [
-         aeson base QuickCheck text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base hspec http-types QuickCheck text unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/seagreen/hjsonpointer";
-       description = "JSON Pointer library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hjsonpointer_1_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, hashable, hspec, http-types
      , QuickCheck, semigroups, text, unordered-containers, vector
      }:
@@ -92125,37 +87674,9 @@ self: {
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjsonschema" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , directory, file-embed, filepath, hjsonpointer, http-client
-     , http-types, HUnit, pcre-heavy, profunctors, QuickCheck
-     , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , text, unordered-containers, vector, wai-app-static, warp
-     }:
-     mkDerivation {
-       pname = "hjsonschema";
-       version = "1.1.0.1";
-       sha256 = "52e85f98ace68a20ad1435b56c0d201a5cbb8c475dd3086aee860aa72da3824d";
-       libraryHaskellDepends = [
-         aeson base bytestring containers file-embed filepath hjsonpointer
-         http-client http-types pcre-heavy profunctors QuickCheck scientific
-         semigroups text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring directory filepath hjsonpointer HUnit
-         profunctors QuickCheck semigroups tasty tasty-hunit
-         tasty-quickcheck text unordered-containers vector wai-app-static
-         warp
-       ];
-       homepage = "https://github.com/seagreen/hjsonschema";
-       description = "JSON Schema library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hjsonschema_1_5_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-types, pcre-heavy, profunctors, protolude
@@ -92180,7 +87701,6 @@ self: {
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hkdf" = callPackage
@@ -92624,8 +88144,8 @@ self: {
     ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }:
      mkDerivation {
        pname = "hlibgit2";
-       version = "0.18.0.15";
-       sha256 = "1170c1f71b39d13699018c29688c005c7aa2d07d8bbbb9d383a9a85e5d4c5601";
+       version = "0.18.0.16";
+       sha256 = "199e4027faafe0a39d18ca3168923d44c57b386b960c72398df1c0fb7eff8e5e";
        libraryHaskellDepends = [ base bindings-DSL zlib ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base process ];
@@ -92656,8 +88176,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.35";
-       sha256 = "5e6289dadc77a0862ee12ec09136059011fd779c96ff6ffeec899170a97d7a8a";
+       version = "1.9.41";
+       sha256 = "2d9299f7952af44b2f06a67af917859fd51e1056c7d405f0930769ea1e093fb4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92671,29 +88191,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hlint_1_9_40" = callPackage
-    ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
-     , directory, extra, filepath, haskell-src-exts, hscolour, process
-     , refact, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "hlint";
-       version = "1.9.40";
-       sha256 = "68ff63ac4686ac5b09ff71be811af57a2e640af49e3e606f389901b6388594a1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal base cmdargs containers cpphs directory extra
-         filepath haskell-src-exts hscolour process refact transformers
-         uniplate
-       ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/hlint#readme";
-       description = "Source code suggestions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hlogger" = callPackage
     ({ mkDerivation, base, old-locale, time }:
      mkDerivation {
@@ -92799,26 +88296,6 @@ self: {
      }) {};
 
   "hmatrix" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, deepseq
-     , openblasCompat, random, split, storable-complex, vector
-     }:
-     mkDerivation {
-       pname = "hmatrix";
-       version = "0.17.0.2";
-       sha256 = "28ed9558064917636db095ef76e10b59ae935e3ee68c96ff0d27f9e405ccfab9";
-       configureFlags = [ "-fopenblas" ];
-       libraryHaskellDepends = [
-         array base binary bytestring deepseq random split storable-complex
-         vector
-       ];
-       librarySystemDepends = [ openblasCompat ];
-       preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'";
-       homepage = "https://github.com/albertoruiz/hmatrix";
-       description = "Numeric Linear Algebra";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) openblasCompat;};
-
-  "hmatrix_0_18_0_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq
      , openblasCompat, random, split, storable-complex, vector
      }:
@@ -92836,7 +88313,6 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openblasCompat;};
 
   "hmatrix-banded" = callPackage
@@ -92880,22 +88356,6 @@ self: {
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
-    ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
-     }:
-     mkDerivation {
-       pname = "hmatrix-gsl";
-       version = "0.17.0.0";
-       sha256 = "fc50e9f80adee9f93874b20aae1a8009a1dcd94316784827618d5ad192e578c9";
-       libraryHaskellDepends = [
-         array base hmatrix process random vector
-       ];
-       libraryPkgconfigDepends = [ gsl ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
-       description = "Numerical computation";
-       license = "GPL";
-     }) {inherit (pkgs) gsl;};
-
-  "hmatrix-gsl_0_18_0_1" = callPackage
     ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
      }:
      mkDerivation {
@@ -92909,27 +88369,9 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
-    ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
-     , vector
-     }:
-     mkDerivation {
-       pname = "hmatrix-gsl-stats";
-       version = "0.4.1.4";
-       sha256 = "98fe0e49be78a1ff7e5ca44ab086d57bafcf97b86bc249d940501a28dacffafa";
-       libraryHaskellDepends = [
-         base binary hmatrix storable-complex vector
-       ];
-       libraryPkgconfigDepends = [ gsl ];
-       homepage = "http://code.haskell.org/hmatrix-gsl-stats";
-       description = "GSL Statistics interface";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) gsl;};
-
-  "hmatrix-gsl-stats_0_4_1_6" = callPackage
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
      , vector
      }:
@@ -92944,7 +88386,6 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-gsl-stats";
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "hmatrix-mmap" = callPackage
@@ -93426,14 +88867,15 @@ self: {
 
   "hoauth2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
-     , text
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "0.5.4.0";
-       sha256 = "dc83b0cd5ee51b9c9b28ea04417341dbd146720f43ac73792b180e205ea4cdf9";
+       version = "0.5.7";
+       sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
+         unordered-containers
        ];
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
@@ -93525,27 +88967,6 @@ self: {
      }) {};
 
   "hocilib" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, inline-c
-     , ocilib, tasty, tasty-hunit, template-haskell
-     }:
-     mkDerivation {
-       pname = "hocilib";
-       version = "0.1.0";
-       sha256 = "44354cbcfd324ce02786131fc3e0ffac29d4a8676854cac45e675e47cdc35e51";
-       libraryHaskellDepends = [
-         base containers inline-c template-haskell
-       ];
-       librarySystemDepends = [ ocilib ];
-       libraryToolDepends = [ c2hs ];
-       testHaskellDepends = [ base bytestring tasty tasty-hunit ];
-       testSystemDepends = [ ocilib ];
-       homepage = "https://github.com/fpinsight/hocilib";
-       description = "FFI binding to OCILIB";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {ocilib = null;};
-
-  "hocilib_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, containers, inline-c
      , ocilib, tasty, tasty-hunit, template-haskell
      }:
@@ -93821,28 +89242,6 @@ self: {
      }) {};
 
   "homplexity" = callPackage
-    ({ mkDerivation, base, containers, cpphs, deepseq, directory
-     , filepath, happy, haskell-src-exts, hflags, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "homplexity";
-       version = "0.4.3.3";
-       sha256 = "a536f540770c741a12387df2e6f68042f9644311e9077dbdd7d59a4551753609";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base containers cpphs deepseq directory filepath haskell-src-exts
-         hflags template-haskell uniplate
-       ];
-       executableToolDepends = [ happy ];
-       testHaskellDepends = [ base haskell-src-exts uniplate ];
-       homepage = "https://github.com/mgajda/homplexity";
-       description = "Haskell code quality tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "homplexity_0_4_3_4" = callPackage
     ({ mkDerivation, base, containers, cpphs, deepseq, directory
      , filepath, happy, haskell-src-exts, hflags, template-haskell
      , uniplate
@@ -93862,7 +89261,6 @@ self: {
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "honi" = callPackage
@@ -95584,24 +90982,6 @@ self: {
      }) {};
 
   "hreader" = callPackage
-    ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl
-     , tagged, transformers-base
-     }:
-     mkDerivation {
-       pname = "hreader";
-       version = "1.0.2";
-       sha256 = "49e1e805966fab3f82ef2e1f2565b2a760b73026f392410b53df6c2c8b8f59d4";
-       libraryHaskellDepends = [
-         base exceptions hset mmorph monad-control mtl tagged
-         transformers-base
-       ];
-       testHaskellDepends = [ base hset transformers-base ];
-       homepage = "https://bitbucket.org/s9gf4ult/hreader";
-       description = "Generalization of MonadReader and ReaderT using hset";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hreader_1_1_0" = callPackage
     ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl
      , tagged, transformers, transformers-base
      }:
@@ -95617,7 +90997,6 @@ self: {
        homepage = "https://bitbucket.org/s9gf4ult/hreader";
        description = "Generalization of MonadReader and ReaderT using hset";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hreader-lens" = callPackage
@@ -97094,20 +92473,6 @@ self: {
      }) {};
 
   "hsdns" = callPackage
-    ({ mkDerivation, adns, base, containers, network }:
-     mkDerivation {
-       pname = "hsdns";
-       version = "1.6.1";
-       sha256 = "64c1475d7625733c9fafe804ae809d459156f6a96a922adf99e5d8e02553c368";
-       libraryHaskellDepends = [ base containers network ];
-       librarySystemDepends = [ adns ];
-       homepage = "http://github.com/peti/hsdns";
-       description = "Asynchronous DNS Resolver";
-       license = stdenv.lib.licenses.lgpl3;
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {inherit (pkgs) adns;};
-
-  "hsdns_1_7" = callPackage
     ({ mkDerivation, adns, base, containers, network }:
      mkDerivation {
        pname = "hsdns";
@@ -97118,7 +92483,6 @@ self: {
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {inherit (pkgs) adns;};
 
@@ -97140,19 +92504,6 @@ self: {
      }) {};
 
   "hse-cpp" = callPackage
-    ({ mkDerivation, base, cpphs, haskell-src-exts }:
-     mkDerivation {
-       pname = "hse-cpp";
-       version = "0.1";
-       sha256 = "a075790dd132107b8005478179fcaf7e37a78c3011ca536ff0d95e0b437c2b38";
-       revision = "1";
-       editedCabalFile = "9ed587127e9760a075bf6ea478997e1a1fb9e500102bd883206aa843e7d92a4b";
-       libraryHaskellDepends = [ base cpphs haskell-src-exts ];
-       description = "Preprocess+parse haskell code";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hse-cpp_0_2" = callPackage
     ({ mkDerivation, base, cpphs, haskell-src-exts }:
      mkDerivation {
        pname = "hse-cpp";
@@ -97161,7 +92512,6 @@ self: {
        libraryHaskellDepends = [ base cpphs haskell-src-exts ];
        description = "Preprocess+parse haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsebaysdk" = callPackage
@@ -97275,6 +92625,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsexif_0_6_1_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
+     , iconv, text, time
+     }:
+     mkDerivation {
+       pname = "hsexif";
+       version = "0.6.1.0";
+       sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f";
+       libraryHaskellDepends = [
+         base binary bytestring containers iconv text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers hspec HUnit iconv text time
+       ];
+       homepage = "https://github.com/emmanueltouzery/hsexif";
+       description = "EXIF handling library in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsfacter" = callPackage
     ({ mkDerivation, base, containers, language-puppet, text }:
      mkDerivation {
@@ -97390,27 +92760,6 @@ self: {
      }) {};
 
   "hsignal" = callPackage
-    ({ mkDerivation, array, base, binary, blas, bytestring, gsl
-     , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack
-     , mtl, storable-complex, vector
-     }:
-     mkDerivation {
-       pname = "hsignal";
-       version = "0.2.7.4";
-       sha256 = "290436ca76d13a4435da0b33d20a69663d955abcf361661cf9835e7eedb4f53a";
-       libraryHaskellDepends = [
-         array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats
-         hstatistics mtl storable-complex vector
-       ];
-       librarySystemDepends = [ blas liblapack ];
-       libraryPkgconfigDepends = [ gsl ];
-       homepage = "http://code.haskell.org/hsignal";
-       description = "Signal processing and EEG data analysis";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
-         inherit (pkgs) liblapack;};
-
-  "hsignal_0_2_7_5" = callPackage
     ({ mkDerivation, array, base, binary, blas, bytestring, gsl
      , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack
      , mtl, storable-complex, vector
@@ -97428,7 +92777,6 @@ self: {
        homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) gsl; 
          inherit (pkgs) liblapack;};
 
@@ -98019,30 +93367,6 @@ self: {
      }) {};
 
   "hspec" = callPackage
-    ({ mkDerivation, base, directory, hspec-core, hspec-discover
-     , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hspec";
-       version = "2.2.4";
-       sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1";
-       revision = "1";
-       editedCabalFile = "eb22cb737adc3312b21699b6ac4137489590ada1ee9ee9ae21aae3c342b3880f";
-       libraryHaskellDepends = [
-         base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
-         transformers
-       ];
-       testHaskellDepends = [
-         base directory hspec-core hspec-discover hspec-expectations
-         hspec-meta HUnit QuickCheck stringbuilder transformers
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec_2_4_1" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
@@ -98063,7 +93387,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -98111,32 +93434,6 @@ self: {
      }) {};
 
   "hspec-core" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, deepseq
-     , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
-     , quickcheck-io, random, setenv, silently, tf-random, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "hspec-core";
-       version = "2.2.4";
-       sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475";
-       revision = "1";
-       editedCabalFile = "9a0c9fc612eb71ee55ebcaacbce010b87ffef8a535ed6ee1f50d8bd952dc86c3";
-       libraryHaskellDepends = [
-         ansi-terminal async base deepseq hspec-expectations HUnit
-         QuickCheck quickcheck-io random setenv tf-random time transformers
-       ];
-       testHaskellDepends = [
-         ansi-terminal async base deepseq hspec-expectations hspec-meta
-         HUnit process QuickCheck quickcheck-io random setenv silently
-         tf-random time transformers
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "A Testing Framework for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-core_2_4_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, async, base, call-stack
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -98160,26 +93457,9 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-discover" = callPackage
-    ({ mkDerivation, base, directory, filepath, hspec-meta }:
-     mkDerivation {
-       pname = "hspec-discover";
-       version = "2.2.4";
-       sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [ base directory filepath hspec-meta ];
-       homepage = "http://hspec.github.io/";
-       description = "Automatically discover and run Hspec tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-discover_2_4_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
@@ -98193,22 +93473,9 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations" = callPackage
-    ({ mkDerivation, base, HUnit }:
-     mkDerivation {
-       pname = "hspec-expectations";
-       version = "0.7.2";
-       sha256 = "371a176b22ebdbc94b7bba55e0bda2296b44c11af01d20b23e4350ef7094a6f0";
-       libraryHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/sol/hspec-expectations#readme";
-       description = "Catchy combinators for HUnit";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-expectations_0_8_2" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
        pname = "hspec-expectations";
@@ -98219,7 +93486,6 @@ self: {
        homepage = "https://github.com/hspec/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations-lens" = callPackage
@@ -98363,27 +93629,6 @@ self: {
      }) {};
 
   "hspec-megaparsec" = callPackage
-    ({ mkDerivation, base, containers, hspec, hspec-expectations
-     , megaparsec
-     }:
-     mkDerivation {
-       pname = "hspec-megaparsec";
-       version = "0.2.1";
-       sha256 = "6474bc9a4d77cf68c4415bfa2d76da77ece418d6570429ca6c8b68eb7463de6b";
-       revision = "2";
-       editedCabalFile = "6da45ba059597259f057ddbfeb7b852beccd3476a21f7e0e2e68ced36a5668c8";
-       libraryHaskellDepends = [
-         base containers hspec-expectations megaparsec
-       ];
-       testHaskellDepends = [
-         base containers hspec hspec-expectations megaparsec
-       ];
-       homepage = "https://github.com/mrkkrp/hspec-megaparsec";
-       description = "Utility functions for testing Megaparsec parsers with Hspec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hspec-megaparsec_0_3_1" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-expectations
      , megaparsec
      }:
@@ -98400,31 +93645,9 @@ self: {
        homepage = "https://github.com/mrkkrp/hspec-megaparsec";
        description = "Utility functions for testing Megaparsec parsers with Hspec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-meta" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, deepseq, directory
-     , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io
-     , random, setenv, time, transformers
-     }:
-     mkDerivation {
-       pname = "hspec-meta";
-       version = "2.2.1";
-       sha256 = "aa7b54c33cad9842783035d1a5cddbbbc3d556c8b2c8f6d0e6bfd3177b9e37d4";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         ansi-terminal async base deepseq hspec-expectations HUnit
-         QuickCheck quickcheck-io random setenv time transformers
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       homepage = "http://hspec.github.io/";
-       description = "A version of Hspec which is used to test Hspec itself";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-meta_2_3_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq
      , directory, filepath, hspec-expectations, HUnit, QuickCheck
      , quickcheck-io, random, setenv, time, transformers
@@ -98447,7 +93670,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-monad-control" = callPackage
@@ -98485,22 +93707,6 @@ self: {
      }) {};
 
   "hspec-setup" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, projectroot }:
-     mkDerivation {
-       pname = "hspec-setup";
-       version = "0.1.1.1";
-       sha256 = "fd294bd10fc0fa1573e84d78ba7f6fd77e294efbaac419a5530e0818ece91109";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base directory filepath process projectroot
-       ];
-       homepage = "https://github.com/yamadapc/haskell-hspec-setup";
-       description = "Add an hspec test-suite in one command";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-setup_0_2_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, cryptohash
      , directory, directory-tree, filepath, haskell-src-exts, hspec
      , language-dockerfile, pretty, process, projectroot, QuickCheck
@@ -98528,7 +93734,6 @@ self: {
        homepage = "https://github.com/yamadapc/haskell-hspec-setup";
        description = "Add an hspec test-suite in one command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-shouldbe" = callPackage
@@ -98557,23 +93762,6 @@ self: {
      }) {};
 
   "hspec-smallcheck" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
-     mkDerivation {
-       pname = "hspec-smallcheck";
-       version = "0.4.1";
-       sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5";
-       revision = "1";
-       editedCabalFile = "b53fe047da5d19509d2b756c094a2acba8f7cc7011b750b0ae3f77176a53c5f6";
-       libraryHaskellDepends = [ base hspec-core smallcheck ];
-       testHaskellDepends = [
-         base hspec hspec-core QuickCheck smallcheck
-       ];
-       homepage = "http://hspec.github.io/";
-       description = "SmallCheck support for the Hspec testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-smallcheck_0_4_2" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
      mkDerivation {
        pname = "hspec-smallcheck";
@@ -98586,7 +93774,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-snap" = callPackage
@@ -98682,30 +93869,6 @@ self: {
      }) {};
 
   "hspec-wai" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
-     , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
-     , text, transformers, wai, wai-extra, with-location
-     }:
-     mkDerivation {
-       pname = "hspec-wai";
-       version = "0.6.6";
-       sha256 = "89a1753cd56b6f312a0af11b7f312c744c73a97d8ab3facfd87f8e4e3080b0e0";
-       libraryHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra with-location
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra with-location
-       ];
-       homepage = "https://github.com/hspec/hspec-wai#readme";
-       description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-wai_0_8_0" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, case-insensitive
      , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
      , text, transformers, wai, wai-extra
@@ -98727,28 +93890,9 @@ self: {
        homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Experimental Hspec support for testing WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-wai-json" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring
-     , case-insensitive, hspec, hspec-wai, template-haskell
-     }:
-     mkDerivation {
-       pname = "hspec-wai-json";
-       version = "0.6.1";
-       sha256 = "303e0e67c217ead3ef64f3ac3870b6c9b14a4135df5e8b2c79ad73df5a347c69";
-       libraryHaskellDepends = [
-         aeson aeson-qq base bytestring case-insensitive hspec-wai
-         template-haskell
-       ];
-       testHaskellDepends = [ base hspec hspec-wai ];
-       homepage = "https://github.com/hspec/hspec-wai#readme";
-       description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hspec-wai-json_0_8_0" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring
      , case-insensitive, hspec, hspec-wai, template-haskell
      }:
@@ -98764,7 +93908,6 @@ self: {
        homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Testing JSON APIs with hspec-wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-webdriver" = callPackage
@@ -99231,22 +94374,6 @@ self: {
      }) {};
 
   "hstatistics" = callPackage
-    ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random
-     , vector
-     }:
-     mkDerivation {
-       pname = "hstatistics";
-       version = "0.2.5.4";
-       sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b";
-       libraryHaskellDepends = [
-         array base hmatrix hmatrix-gsl-stats random vector
-       ];
-       homepage = "http://code.haskell.org/hstatistics";
-       description = "Statistics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hstatistics_0_3" = callPackage
     ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random
      , vector
      }:
@@ -99260,7 +94387,6 @@ self: {
        homepage = "http://code.haskell.org/hstatistics";
        description = "Statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstats" = callPackage
@@ -99541,25 +94667,6 @@ self: {
      }) {};
 
   "hsx2hs" = callPackage
-    ({ mkDerivation, base, bytestring, haskell-src-exts
-     , haskell-src-meta, mtl, template-haskell, utf8-string
-     }:
-     mkDerivation {
-       pname = "hsx2hs";
-       version = "0.13.5";
-       sha256 = "0dbaa29287ef82bfbe573f399a635aa109fe675e4dd91f3ee8c2cefd5593ed6e";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring haskell-src-exts haskell-src-meta mtl
-         template-haskell utf8-string
-       ];
-       homepage = "https://github.com/seereason/hsx2hs";
-       description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsx2hs_0_14_0" = callPackage
     ({ mkDerivation, base, bytestring, haskell-src-exts
      , haskell-src-meta, mtl, template-haskell, utf8-string
      }:
@@ -99576,7 +94683,6 @@ self: {
        homepage = "https://github.com/seereason/hsx2hs";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsyscall" = callPackage
@@ -100078,26 +95184,6 @@ self: {
      }) {};
 
   "http-api-data" = callPackage
-    ({ mkDerivation, base, bytestring, directory, doctest, filepath
-     , hspec, HUnit, QuickCheck, text, time, time-locale-compat
-     }:
-     mkDerivation {
-       pname = "http-api-data";
-       version = "0.2.4";
-       sha256 = "6bb90863343b17b9ce6ee8cfce9a41db0b4287343aa6cf0654a3ad5c5c5e6635";
-       libraryHaskellDepends = [
-         base bytestring text time time-locale-compat
-       ];
-       testHaskellDepends = [
-         base bytestring directory doctest filepath hspec HUnit QuickCheck
-         text time
-       ];
-       homepage = "http://github.com/fizruk/http-api-data";
-       description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-api-data_0_3_5" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , doctest, filepath, hashable, hspec, HUnit, QuickCheck
      , quickcheck-instances, text, time, time-locale-compat
@@ -100119,7 +95205,6 @@ self: {
        homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-attoparsec" = callPackage
@@ -100136,36 +95221,6 @@ self: {
      }) {};
 
   "http-client" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, directory, exceptions, filepath
-     , ghc-prim, hspec, http-types, mime-types, monad-control, network
-     , network-uri, random, streaming-commons, text, time, transformers
-     , zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.4.31.2";
-       sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie data-default-class deepseq
-         exceptions filepath ghc-prim http-types mime-types network
-         network-uri random streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_5" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , deepseq, directory, exceptions, filepath, ghc-prim, hspec
@@ -100192,7 +95247,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -100328,27 +95382,6 @@ self: {
      }) {};
 
   "http-client-tls" = callPackage
-    ({ mkDerivation, base, bytestring, connection, data-default-class
-     , hspec, http-client, http-types, network, tls
-     }:
-     mkDerivation {
-       pname = "http-client-tls";
-       version = "0.2.4.1";
-       sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3";
-       revision = "1";
-       editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c";
-       libraryHaskellDepends = [
-         base bytestring connection data-default-class http-client network
-         tls
-       ];
-       testHaskellDepends = [ base hspec http-client http-types ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "http-client backend using the connection package and tls library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client-tls_0_3_3_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , cryptonite, data-default-class, exceptions, hspec, http-client
      , http-types, memory, network, tls, transformers
@@ -100367,7 +95400,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-common" = callPackage
@@ -100389,36 +95421,6 @@ self: {
      }) {};
 
   "http-conduit" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, connection, cookie
-     , data-default-class, exceptions, hspec, http-client
-     , http-client-tls, http-types, HUnit, lifted-base, monad-control
-     , mtl, network, resourcet, streaming-commons, temporary, text, time
-     , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
-     }:
-     mkDerivation {
-       pname = "http-conduit";
-       version = "2.1.11";
-       sha256 = "75df5c0515080a09b4cdc73a759523b10265a692ff50beb964766d4f8dcf0d7f";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra data-default-class
-         exceptions http-client http-client-tls http-types lifted-base
-         monad-control mtl resourcet transformers
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder bytestring case-insensitive conduit
-         conduit-extra connection cookie data-default-class hspec
-         http-client http-types HUnit lifted-base network streaming-commons
-         temporary text time transformers utf8-string wai wai-conduit warp
-         warp-tls
-       ];
-       doCheck = false;
-       homepage = "http://www.yesodweb.com/book/http-conduit";
-       description = "HTTP client package with conduit interface and HTTPS support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-conduit_2_2_3" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
      , data-default-class, exceptions, hspec, http-client
@@ -100446,7 +95448,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-browser" = callPackage
@@ -100998,29 +95999,6 @@ self: {
      }) {};
 
   "http2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
-     , bytestring-builder, case-insensitive, containers, directory
-     , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
-     , unordered-containers, vector, word8
-     }:
-     mkDerivation {
-       pname = "http2";
-       version = "1.6.2";
-       sha256 = "99e75ac0fa19276d276ec63bb94eefb2e952b0a374aea8f3d2c2408a634b6fe7";
-       libraryHaskellDepends = [
-         array base bytestring bytestring-builder case-insensitive
-         containers psqueues stm
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty array base bytestring bytestring-builder
-         case-insensitive containers directory doctest filepath Glob hex
-         hspec psqueues stm text unordered-containers vector word8
-       ];
-       description = "HTTP/2.0 library including frames and HPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http2_1_6_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, case-insensitive, containers, directory
      , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
@@ -101042,7 +96020,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/http2";
        description = "HTTP/2 library including frames, priority queues and HPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "httpd-shed" = callPackage
@@ -101679,19 +96656,6 @@ self: {
      }) {};
 
   "hvect" = callPackage
-    ({ mkDerivation, base, HTF }:
-     mkDerivation {
-       pname = "hvect";
-       version = "0.3.1.0";
-       sha256 = "b9ba2408a3718b7a38b72cf7f81ce51ac9f0db63908969d386213c47b6526ab8";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base HTF ];
-       homepage = "https://github.com/agrafix/hvect";
-       description = "Simple strict heterogeneous lists";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hvect_0_4_0_0" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "hvect";
@@ -101702,7 +96666,6 @@ self: {
        homepage = "https://github.com/agrafix/hvect";
        description = "Simple strict heterogeneous lists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-balancedparens" = callPackage
@@ -101726,31 +96689,6 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap
-     , parsec, QuickCheck, resourcet, safe, vector
-     }:
-     mkDerivation {
-       pname = "hw-bits";
-       version = "0.1.0.1";
-       sha256 = "7d20025de04db0e4639aded0ae6ad6b9252358a14626a1bfeb726dfbf084fd0e";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring hw-prim parsec safe vector
-       ];
-       executableHaskellDepends = [
-         base criterion mmap resourcet vector
-       ];
-       testHaskellDepends = [
-         base bytestring hspec hw-prim QuickCheck vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-bits#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-bits_0_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
      }:
@@ -101771,27 +96709,6 @@ self: {
      }) {};
 
   "hw-conduit" = callPackage
-    ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , hw-bits, resourcet, word8
-     }:
-     mkDerivation {
-       pname = "hw-conduit";
-       version = "0.0.0.11";
-       sha256 = "e0e1193a901858d9bc5fccc51f99977a9bffd24993f9de6c1c3030aa0a1ed77b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base bytestring conduit hw-bits resourcet word8
-       ];
-       executableHaskellDepends = [ base criterion ];
-       testHaskellDepends = [ base bytestring hspec ];
-       homepage = "http://github.com/haskell-works/hw-conduit#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-conduit_0_1_0_0" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
      , hw-bits, resourcet, word8
      }:
@@ -101997,26 +96914,6 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck
-     , random, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.1.0.3";
-       sha256 = "f237844283733b85403e18d5243925946946395a2b7c2d731b7312f4a0293b84";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring deepseq random vector ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base bytestring hspec QuickCheck random vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-prim#readme";
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_4_0_2" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
      mkDerivation {
        pname = "hw-prim";
@@ -102027,30 +96924,9 @@ self: {
        homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect" = callPackage
-    ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "hw-rankselect";
-       version = "0.3.0.0";
-       sha256 = "c1b053a7b5752c55636bd95ad30678f0143aa0a3afc962ba2827187309782cfe";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base hw-bits hw-prim vector ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base hspec hw-bits hw-prim QuickCheck vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-rankselect_0_8_0_0" = callPackage
     ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim
      , hw-rankselect-base, QuickCheck, vector
      }:
@@ -102104,25 +96980,6 @@ self: {
      }) {};
 
   "hw-succinct" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, conduit, containers
-     , hw-bits, hw-conduit, hw-parser, hw-prim, hw-rankselect
-     , mono-traversable, text, vector, word8
-     }:
-     mkDerivation {
-       pname = "hw-succinct";
-       version = "0.0.0.14";
-       sha256 = "f3e2ec65f1d7e0baa7cda17442cdcd60635cd2693a38873361df9578b65ffbeb";
-       libraryHaskellDepends = [
-         attoparsec base bytestring conduit containers hw-bits hw-conduit
-         hw-parser hw-prim hw-rankselect mono-traversable text vector word8
-       ];
-       homepage = "http://github.com/haskell-works/hw-succinct#readme";
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hw-succinct_0_1_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, conduit, containers
      , hw-balancedparens, hw-bits, hw-prim, hw-rankselect
      , hw-rankselect-base, mmap, mono-traversable, text, vector, word8
@@ -103668,19 +98525,6 @@ self: {
      }) {};
 
   "identicon" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
-     mkDerivation {
-       pname = "identicon";
-       version = "0.1.0";
-       sha256 = "cc710ce81b969cd4a6a13b3ea46c72e5a5dd9805e8f437f5c54c9ba6b4abac93";
-       libraryHaskellDepends = [ base bytestring JuicyPixels ];
-       testHaskellDepends = [ base bytestring hspec JuicyPixels ];
-       homepage = "https://github.com/mrkkrp/identicon";
-       description = "Flexible generation of identicons";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "identicon_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
      mkDerivation {
        pname = "identicon";
@@ -103691,7 +98535,6 @@ self: {
        homepage = "https://github.com/mrkkrp/identicon";
        description = "Flexible generation of identicons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "identifiers" = callPackage
@@ -103785,49 +98628,6 @@ self: {
      }) {};
 
   "idris" = callPackage
-    ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
-     , ansi-wl-pprint, array, async, base, base64-bytestring, binary
-     , blaze-html, blaze-markup, bytestring, cheapskate, containers
-     , deepseq, directory, filepath, fingertree, fsnotify, gmp
-     , haskeline, ieee754, libffi, mtl, network, optparse-applicative
-     , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty
-     , tasty-golden, tasty-rerun, terminal-size, text, time
-     , transformers, transformers-compat, trifecta, uniplate, unix
-     , unordered-containers, utf8-string, vector
-     , vector-binary-instances, zip-archive
-     }:
-     mkDerivation {
-       pname = "idris";
-       version = "0.12.3";
-       sha256 = "3a9f3d5aeb032b1d987402cf4ca54a2fbfc7b02d852a629f528943a5fe5b59c6";
-       configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
-         base base64-bytestring binary blaze-html blaze-markup bytestring
-         cheapskate containers deepseq directory filepath fingertree
-         fsnotify haskeline ieee754 libffi mtl network optparse-applicative
-         parsers pretty process regex-tdfa safe split terminal-size text
-         time transformers transformers-compat trifecta uniplate unix
-         unordered-containers utf8-string vector vector-binary-instances
-         zip-archive
-       ];
-       librarySystemDepends = [ gmp ];
-       executableHaskellDepends = [
-         base directory filepath haskeline transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers directory filepath haskeline
-         optparse-applicative process tagged tasty tasty-golden tasty-rerun
-         time transformers
-       ];
-       homepage = "http://www.idris-lang.org/";
-       description = "Functional Programming Language with Dependent Types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) gmp;};
-
-  "idris_0_99" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
      , ansi-wl-pprint, array, async, base, base64-bytestring, binary
      , blaze-html, blaze-markup, bytestring, cheapskate, containers
@@ -103868,7 +98668,6 @@ self: {
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp;};
 
   "ieee" = callPackage
@@ -103907,18 +98706,6 @@ self: {
      }) {};
 
   "ieee754" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "ieee754";
-       version = "0.7.9";
-       sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/patperry/hs-ieee754";
-       description = "Utilities for dealing with IEEE floating point numbers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ieee754_0_8_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ieee754";
@@ -103928,7 +98715,6 @@ self: {
        homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ieee754-parser" = callPackage
@@ -104589,41 +99375,6 @@ self: {
      }) {};
 
   "imm" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
-     , bytestring, case-insensitive, chunked-data, comonad, compdata
-     , conduit, conduit-combinators, conduit-parse, connection
-     , containers, directory, dyre, exceptions, fast-logger, filepath
-     , free, hashable, HaskellNet, HaskellNet-SSL, http-client
-     , http-client-tls, http-types, mime-mail, mono-traversable
-     , monoid-subclasses, network, opml-conduit, optparse-applicative
-     , rainbow, rainbox, rss-conduit, text, time, timerep, tls
-     , transformers, uri-bytestring, xml, xml-conduit
-     }:
-     mkDerivation {
-       pname = "imm";
-       version = "1.0.1.0";
-       sha256 = "287a4815b43de90e89b27a356215e57d97c03ba4f929965b1a8ca5c4fe35658b";
-       revision = "1";
-       editedCabalFile = "b6f35aaba374bd580f6f40b4629047706562a9d677ff917a7b0dee1063817e25";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint atom-conduit base bytestring case-insensitive
-         chunked-data comonad compdata conduit conduit-combinators
-         conduit-parse connection containers directory dyre exceptions
-         fast-logger filepath free hashable HaskellNet HaskellNet-SSL
-         http-client http-client-tls http-types mime-mail mono-traversable
-         monoid-subclasses network opml-conduit optparse-applicative rainbow
-         rainbox rss-conduit text time timerep tls transformers
-         uri-bytestring xml xml-conduit
-       ];
-       executableHaskellDepends = [ base free ];
-       homepage = "https://github.com/k0ral/imm";
-       description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
-       license = "unknown";
-     }) {};
-
-  "imm_1_1_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base
      , blaze-html, blaze-markup, bytestring, case-insensitive
      , chunked-data, comonad, conduit, conduit-combinators, connection
@@ -104655,7 +99406,6 @@ self: {
        homepage = "https://github.com/k0ral/imm";
        description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -105092,18 +99842,6 @@ self: {
      }) {};
 
   "indents" = callPackage
-    ({ mkDerivation, base, concatenative, mtl, parsec }:
-     mkDerivation {
-       pname = "indents";
-       version = "0.3.3";
-       sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a";
-       libraryHaskellDepends = [ base concatenative mtl parsec ];
-       homepage = "http://patch-tag.com/r/salazar/indents";
-       description = "indentation sensitive parser-combinators for parsec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "indents_0_4_0_0" = callPackage
     ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
      mkDerivation {
        pname = "indents";
@@ -105114,7 +99852,6 @@ self: {
        homepage = "http://github.com/jaspervdj/indents";
        description = "indentation sensitive parser-combinators for parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "index-core" = callPackage
@@ -105328,24 +100065,6 @@ self: {
      }) {};
 
   "inflections" = callPackage
-    ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "inflections";
-       version = "0.2.0.1";
-       sha256 = "4bc856a2b409fbf874714f7bf50b9db4701242cf58e133bd31b1ae39fe8e2c35";
-       libraryHaskellDepends = [ base containers parsec ];
-       testHaskellDepends = [
-         base containers HUnit parsec QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/stackbuilders/inflections-hs";
-       description = "Inflections library for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "inflections_0_3_0_0" = callPackage
     ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec
      , megaparsec, QuickCheck, text, unordered-containers
      }:
@@ -105362,7 +100081,6 @@ self: {
        homepage = "https://github.com/stackbuilders/inflections-hs";
        description = "Inflections library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflist" = callPackage
@@ -105637,31 +100355,6 @@ self: {
      }) {aether = null;};
 
   "insert-ordered-containers" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, hashable, lens
-     , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "insert-ordered-containers";
-       version = "0.1.0.1";
-       sha256 = "4905e5d128c19887a79b281150acb16cb3b043ab2c5a7788b0151ba7d46b900a";
-       revision = "3";
-       editedCabalFile = "c81fa69aa035ad468b45c812c16b80bc70020b05bf2d4a8298c90b4f772c98b1";
-       libraryHaskellDepends = [
-         aeson base base-compat hashable lens semigroupoids semigroups text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base base-compat hashable lens QuickCheck semigroupoids
-         semigroups tasty tasty-quickcheck text transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/phadej/insert-ordered-containers#readme";
-       description = "Associative containers retating insertion order for traversals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "insert-ordered-containers_0_2_0_0" = callPackage
     ({ mkDerivation, aeson, base, base-compat, hashable, lens
      , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
      , text, transformers, unordered-containers
@@ -105684,7 +100377,6 @@ self: {
        homepage = "https://github.com/phadej/insert-ordered-containers#readme";
        description = "Associative containers retating insertion order for traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inserts" = callPackage
@@ -108680,36 +103372,6 @@ self: {
      }) {};
 
   "jose" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bifunctors, byteable, bytestring, cryptonite, data-default-class
-     , hspec, lens, memory, mtl, network-uri, QuickCheck
-     , quickcheck-instances, safe, semigroups, tasty, tasty-hspec
-     , tasty-quickcheck, template-haskell, text, time
-     , unordered-containers, vector, x509
-     }:
-     mkDerivation {
-       pname = "jose";
-       version = "0.4.0.3";
-       sha256 = "742b8037e5cc9c427789196bd425594c3fb17768fb584c8434548415aa5e0f0a";
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bifunctors byteable
-         bytestring cryptonite data-default-class lens memory mtl
-         network-uri QuickCheck quickcheck-instances safe semigroups
-         template-haskell text time unordered-containers vector x509
-       ];
-       testHaskellDepends = [
-         aeson attoparsec base base64-bytestring bifunctors byteable
-         bytestring cryptonite data-default-class hspec lens memory mtl
-         network-uri QuickCheck quickcheck-instances safe semigroups tasty
-         tasty-hspec tasty-quickcheck template-haskell text time
-         unordered-containers vector x509
-       ];
-       homepage = "https://github.com/frasertweedale/hs-jose";
-       description = "Javascript Object Signing and Encryption and JSON Web Token library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "jose_0_5_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , byteable, bytestring, containers, cryptonite, hspec, lens, memory
      , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances
@@ -108739,7 +103401,6 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -109012,8 +103673,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-assertions";
-       version = "1.0.8";
-       sha256 = "d4e060ec54e264581e47d409e303dc3165c311dcfcd6127278c99b7a876ae259";
+       version = "1.0.9";
+       sha256 = "5a046e3559638d902adbf01d8ba99c3e3aef01e4c1ee26b5701ebdcd7a0f980b";
        libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
@@ -110464,31 +105125,6 @@ self: {
      }) {};
 
   "kawhi" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
-     , http-conduit, http-types, mtl, safe, scientific, smallcheck
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "kawhi";
-       version = "0.0.1";
-       sha256 = "bb7bb30129c065032d217834d9f991df63ddfa55ee14e4c45ef5ddf141839d6f";
-       revision = "1";
-       editedCabalFile = "624bf276517215fb85d51f9252dce93acfde800feaa6439d054f6037bc2f3cb3";
-       libraryHaskellDepends = [
-         aeson base bytestring exceptions http-client http-conduit
-         http-types mtl safe scientific text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring exceptions http-client http-types mtl
-         scientific smallcheck tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text
-       ];
-       homepage = "https://github.com/hamsterdam/kawhi";
-       description = "stats.NBA.com library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "kawhi_0_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
      , http-conduit, http-types, mtl, safe, scientific, smallcheck
      , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
@@ -110509,7 +105145,6 @@ self: {
        homepage = "https://github.com/hamsterdam/kawhi";
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kazura-queue" = callPackage
@@ -113278,50 +107913,6 @@ self: {
      }) {};
 
   "language-puppet" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptonite, directory, either, exceptions, filecache, formatting
-     , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec
-     , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec
-     , memory, mtl, operational, optparse-applicative, parallel-io
-     , parsec, pcre-utils, process, random, regex-pcre-builtin
-     , scientific, semigroups, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "language-puppet";
-       version = "1.3.1.1";
-       sha256 = "e2fba21b6adb148896819687062378022393fc6b237d0c65ddb7196bc86ddd12";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptonite directory either exceptions
-         filecache formatting hashable hruby hslogger hspec http-api-data
-         http-client lens lens-aeson megaparsec memory mtl operational
-         parsec pcre-utils process random regex-pcre-builtin scientific
-         semigroups servant servant-client split stm strict-base-types text
-         time transformers unix unordered-containers vector yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers Glob hslogger http-client lens
-         megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin
-         servant-client strict-base-types text transformers
-         unordered-containers vector yaml
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens
-         megaparsec mtl scientific strict-base-types temporary text
-         transformers unix unordered-containers vector
-       ];
-       homepage = "http://lpuppet.banquise.net/";
-       description = "Tools to parse and evaluate the Puppet DSL";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
-     }) {};
-
-  "language-puppet_1_3_5_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
      , cryptonite, directory, either, exceptions, filecache, formatting
@@ -113362,7 +107953,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -113506,28 +108097,6 @@ self: {
      }) {};
 
   "language-thrift" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, hspec
-     , hspec-discover, megaparsec, QuickCheck, scientific, semigroups
-     , text, transformers
-     }:
-     mkDerivation {
-       pname = "language-thrift";
-       version = "0.9.0.2";
-       sha256 = "a5c204193572f1272a9e1593f553df6d6471ea01a6432475fff0115b458bd740";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base containers megaparsec scientific semigroups
-         text transformers
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base containers hspec hspec-discover megaparsec
-         QuickCheck scientific semigroups text transformers
-       ];
-       homepage = "https://github.com/abhinav/language-thrift#readme";
-       description = "Parser and pretty printer for the Thrift IDL format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-thrift_0_10_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, hspec
      , hspec-discover, megaparsec, QuickCheck, scientific, semigroups
      , text, transformers
@@ -113547,7 +108116,6 @@ self: {
        homepage = "https://github.com/abhinav/language-thrift#readme";
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-typescript" = callPackage
@@ -114506,39 +109074,6 @@ self: {
      }) {};
 
   "lens" = callPackage
-    ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , comonad, containers, contravariant, distributive, exceptions
-     , filepath, free, ghc-prim, hashable, hlint, HUnit, kan-extensions
-     , mtl, parallel, profunctors, QuickCheck, reflection, semigroupoids
-     , semigroups, tagged, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, text, transformers, transformers-compat
-     , unordered-containers, vector, void
-     }:
-     mkDerivation {
-       pname = "lens";
-       version = "4.14";
-       sha256 = "70a3cd18ef352950b88d6cac449988b9320704b56dceda80e7de9f2907ee5f4b";
-       revision = "1";
-       editedCabalFile = "ec2f258fa783b324c6c9177b16b5432e757928b5efec042295c88306148059c4";
-       libraryHaskellDepends = [
-         array base base-orphans bifunctors bytestring comonad containers
-         contravariant distributive exceptions filepath free ghc-prim
-         hashable kan-extensions mtl parallel profunctors reflection
-         semigroupoids semigroups tagged template-haskell text transformers
-         transformers-compat unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         base containers hlint HUnit mtl QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 test-framework-th
-         transformers
-       ];
-       homepage = "http://github.com/ekmett/lens/";
-       description = "Lenses, Folds and Traversals";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lens_4_15_1" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , comonad, containers, contravariant, deepseq, directory
      , distributive, doctest, exceptions, filepath, free
@@ -114572,7 +109107,6 @@ self: {
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-action" = callPackage
@@ -116193,25 +110727,6 @@ self: {
      }) {};
 
   "line" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , cryptohash-sha256, http-types, lens, text, time, transformers
-     , wai, wreq
-     }:
-     mkDerivation {
-       pname = "line";
-       version = "1.0.1.0";
-       sha256 = "b356e813369b9ebf80ea71a79e658caabbc32645de8821eb878809afb0f1e1d5";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring cryptohash-sha256
-         http-types lens text time transformers wai wreq
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/noraesae/line";
-       description = "Haskell SDK for the LINE API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "line_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types
      , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text
@@ -116233,7 +110748,6 @@ self: {
        homepage = "https://github.com/noraesae/line";
        description = "Haskell SDK for the LINE API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "line-break" = callPackage
@@ -118129,31 +112643,6 @@ self: {
      }) {};
 
   "log-domain" = callPackage
-    ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
-     , directory, distributive, doctest, filepath, generic-deriving
-     , hashable, hashable-extras, safecopy, semigroupoids, semigroups
-     , simple-reflect, vector
-     }:
-     mkDerivation {
-       pname = "log-domain";
-       version = "0.10.3.1";
-       sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815";
-       revision = "2";
-       editedCabalFile = "d5c0d4af0c551eb4b014ce825c1ff6a92fa947225992a89ec9f4b67ece705c6f";
-       libraryHaskellDepends = [
-         base binary bytes cereal comonad deepseq distributive hashable
-         hashable-extras safecopy semigroupoids semigroups vector
-       ];
-       testHaskellDepends = [
-         base directory doctest filepath generic-deriving semigroups
-         simple-reflect
-       ];
-       homepage = "http://github.com/ekmett/log-domain/";
-       description = "Log-domain arithmetic";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "log-domain_0_11" = callPackage
     ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
      , directory, distributive, doctest, filepath, generic-deriving
      , hashable, safecopy, semigroupoids, semigroups, simple-reflect
@@ -118174,7 +112663,6 @@ self: {
        homepage = "http://github.com/ekmett/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-effect" = callPackage
@@ -118401,8 +112889,8 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.1.1";
-       sha256 = "4e1a6f746757ebf787820cbdb202b0b9ff206a44a24895d5500bec2ffc789fc5";
+       version = "1.1.2";
+       sha256 = "7a39a46028c456b024088fcc5995f7552abe21f6578019970cb079083180d12c";
        libraryHaskellDepends = [
          async base exceptions free monad-control mtl semigroups stm
          stm-delay text time transformers transformers-base wl-pprint-text
@@ -118410,7 +112898,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -120134,8 +114621,8 @@ self: {
      }:
      mkDerivation {
        pname = "mailchimp";
-       version = "0.1.0";
-       sha256 = "dbbc4645a3322e11ce33059a4660dd837574f58530aaa459b4d99dc7b1b91fe2";
+       version = "0.1.1";
+       sha256 = "d6bdac26adc60ded7352010674a0b562f9b809e5c49954dd738d1cbfd6cb95d6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-client http-client-tls
          servant servant-client text transformers
@@ -122018,30 +116505,6 @@ self: {
      }) {};
 
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
-     , HUnit, mtl, QuickCheck, scientific, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "megaparsec";
-       version = "5.0.1";
-       sha256 = "8bd9c4f4f1d92cf45577ceabd13f58e0a980848142fba1036fa37bcab4aa3b25";
-       libraryHaskellDepends = [
-         base bytestring containers deepseq exceptions mtl scientific text
-         transformers
-       ];
-       testHaskellDepends = [
-         base bytestring containers exceptions HUnit mtl QuickCheck
-         scientific test-framework test-framework-hunit
-         test-framework-quickcheck2 text transformers
-       ];
-       homepage = "https://github.com/mrkkrp/megaparsec";
-       description = "Monadic parser combinators";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "megaparsec_5_2_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
      , hspec, hspec-expectations, mtl, QuickCheck, scientific, text
      , transformers
@@ -122061,7 +116524,6 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -122353,21 +116815,6 @@ self: {
      }) {};
 
   "memory" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
-     , tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "memory";
-       version = "0.13";
-       sha256 = "dc73602573eaed85b1887f07057151c7de63f559ef90a10297c363d9b120870a";
-       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/vincenthz/hs-memory";
-       description = "memory and related abstraction stuff";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "memory_0_14_1" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -122380,7 +116827,6 @@ self: {
        homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memorypool" = callPackage
@@ -122444,18 +116890,6 @@ self: {
      }) {};
 
   "mersenne-random-pure64" = callPackage
-    ({ mkDerivation, base, old-time, random }:
-     mkDerivation {
-       pname = "mersenne-random-pure64";
-       version = "0.2.0.5";
-       sha256 = "3ca131d6c26fe8a086c40c6e79459149286c31083e0e110f7032aeba8038346e";
-       libraryHaskellDepends = [ base old-time random ];
-       homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
-       description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mersenne-random-pure64_0_2_2_0" = callPackage
     ({ mkDerivation, base, random, time }:
      mkDerivation {
        pname = "mersenne-random-pure64";
@@ -122465,7 +116899,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "messagepack" = callPackage
@@ -122630,28 +117063,6 @@ self: {
      }) {};
 
   "metrics" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , lens, mtl, mwc-random, primitive, QuickCheck, text, time, unix
-     , unordered-containers, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "metrics";
-       version = "0.3.0.2";
-       sha256 = "0df2801b630fcfe5c4a1968ccc1571016fb4c9408dfc881c599ba6f872543c02";
-       libraryHaskellDepends = [
-         ansi-terminal base bytestring containers lens mtl mwc-random
-         primitive text time unix unordered-containers vector
-         vector-algorithms
-       ];
-       testHaskellDepends = [
-         async base lens mwc-random primitive QuickCheck unix
-       ];
-       description = "High-performance application metric tracking";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "metrics_0_4_0_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , HUnit, lens, mwc-random, primitive, QuickCheck, text, time
      , transformers, transformers-base, unix-compat
@@ -122839,29 +117250,6 @@ self: {
      }) {};
 
   "microlens-aeson" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
-     , scientific, tasty, tasty-hunit, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "microlens-aeson";
-       version = "2.1.1.3";
-       sha256 = "4e43bdbd0d258804ee4de0f78149dc93cfe1aaa2e1e235bc11b1965c94166731";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring microlens scientific text
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring microlens tasty tasty-hunit text
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/fosskers/microlens-aeson/";
-       description = "Law-abiding lenses for Aeson, using microlens";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "microlens-aeson_2_2_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens
      , scientific, tasty, tasty-hunit, text, unordered-containers
      , vector
@@ -123217,8 +117605,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.3.4";
-       sha256 = "9a8dd3e2bf2a62f34695a8baf8b715223c3aa57de1c3b30d5a604d364ae1d4b4";
+       version = "3.3.5";
+       sha256 = "89e4e32bab7820b01e2b6e45cf70e406af1639aaf8534f769225efd89cc3730a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123241,23 +117629,6 @@ self: {
      }) {};
 
   "mighty-metropolis" = callPackage
-    ({ mkDerivation, base, containers, mcmc-types, mwc-probability
-     , pipes, primitive, transformers
-     }:
-     mkDerivation {
-       pname = "mighty-metropolis";
-       version = "1.0.4";
-       sha256 = "6e670796298b3f47a7226c0ce51a97889395119e3de32e4722186af55d8092cf";
-       libraryHaskellDepends = [
-         base mcmc-types mwc-probability pipes primitive transformers
-       ];
-       testHaskellDepends = [ base containers mwc-probability ];
-       homepage = "http://github.com/jtobin/mighty-metropolis";
-       description = "The Metropolis algorithm";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mighty-metropolis_1_2_0" = callPackage
     ({ mkDerivation, base, containers, kan-extensions, mcmc-types
      , mwc-probability, pipes, primitive, transformers
      }:
@@ -123273,7 +117644,6 @@ self: {
        homepage = "http://github.com/jtobin/mighty-metropolis";
        description = "The Metropolis algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mikmod" = callPackage
@@ -123334,8 +117704,8 @@ self: {
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.5.0.1";
-       sha256 = "2fe50795fe7a1826d1a24e66f5f31823cc83621de5137dd98196e2ce7420db10";
+       version = "0.5.0.2";
+       sha256 = "8e770eba91b0caddd5fb16b96f191ca7f4554689fc88f41261687a1af74f5c4b";
        libraryHaskellDepends = [
          base bytestring cereal containers digest lens lifted-base mtl
          murmur-hash network random resource-pool semigroups transformers
@@ -123383,8 +117753,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.12";
-       sha256 = "93e1caa9932bec12dc1b931db2f3ea9e2e2db9b8382b7babaf0a5e559936217c";
+       version = "0.4.13";
+       sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -123591,6 +117961,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "minio-hs" = callPackage
+    ({ mkDerivation, async, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default, directory, exceptions, filepath
+     , http-client, http-conduit, http-types, lifted-async, lifted-base
+     , memory, monad-control, protolude, QuickCheck, resourcet, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
+     , time, transformers, transformers-base, xml-conduit
+     }:
+     mkDerivation {
+       pname = "minio-hs";
+       version = "0.1.0";
+       sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908";
+       libraryHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude resourcet
+         text time transformers transformers-base xml-conduit
+       ];
+       testHaskellDepends = [
+         async base bytestring case-insensitive conduit conduit-combinators
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions filepath http-client http-conduit http-types
+         lifted-async lifted-base memory monad-control protolude QuickCheck
+         resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+         temporary text time transformers transformers-base xml-conduit
+       ];
+       homepage = "https://github.com/donatello/minio-hs#readme";
+       description = "A Minio client library, compatible with S3 like services";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "minions" = callPackage
     ({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
      mkDerivation {
@@ -124099,31 +118502,6 @@ self: {
      }) {};
 
   "modify-fasta" = callPackage
-    ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
-     , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text
-     , text-show
-     }:
-     mkDerivation {
-       pname = "modify-fasta";
-       version = "0.8.2.1";
-       sha256 = "5af7cddb753353ac1e16e15e5962e6a6c46eeb6a1d1ae38a8f014e20b04e61a0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers fasta regex-tdfa regex-tdfa-text split text
-         text-show
-       ];
-       executableHaskellDepends = [
-         base containers fasta mtl optparse-applicative pipes pipes-text
-         split text
-       ];
-       homepage = "https://github.com/GregorySchwartz/modify-fasta";
-       description = "Modify fasta (and CLIP) files in several optional ways";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "modify-fasta_0_8_2_3" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
      , text, text-show
@@ -124570,8 +118948,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-extras";
-       version = "0.5.11";
-       sha256 = "76972ce47148f8a60498a878394135cd4079bef79f79f12c9cd86d1766230467";
+       version = "0.6.0";
+       sha256 = "df33d7c51a97d16226b8160d9bc09686cb6f7b7bf5c54557381c6fe4a3c84f2c";
        libraryHaskellDepends = [
          base mmorph monad-control stm transformers transformers-base
        ];
@@ -124885,10 +119263,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-metrics";
-       version = "0.1.0.1";
-       sha256 = "f34fd76689245c12d694de7db877ea9ab20c259aafc57489f1fa6baecb1f2d61";
-       revision = "1";
-       editedCabalFile = "265f5c26b239a08c4c003eda08a9863928f2a3ac6530d24566cf3ecad4522dcd";
+       version = "0.1.0.2";
+       sha256 = "a64e5f3aebe020c0f38892874f74b2b94ad84b319cee2e7ec092c5b2bd842276";
        libraryHaskellDepends = [
          base clock containers ekg-core microlens mtl text transformers
        ];
@@ -125610,6 +119986,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monetdb-mapi" = callPackage
+    ({ mkDerivation, base, bindings-monetdb-mapi }:
+     mkDerivation {
+       pname = "monetdb-mapi";
+       version = "0.1.0.0";
+       sha256 = "b9e2b238b7442757e849fa61016251c42fc52d8950cc56fd3f008bbe7f02e76c";
+       libraryHaskellDepends = [ base bindings-monetdb-mapi ];
+       description = "Mid-level bindings for the MonetDB API (mapi)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "money" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -125840,26 +120227,6 @@ self: {
      }) {};
 
   "monoid-subclasses" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "monoid-subclasses";
-       version = "0.4.2.1";
-       sha256 = "4fe3360d06c09b66ba89c080337e2813ad225b1e6a28a580410930e882f5032a";
-       libraryHaskellDepends = [
-         base bytestring containers primes text vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers primes QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text vector
-       ];
-       homepage = "https://github.com/blamario/monoid-subclasses/";
-       description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-subclasses_0_4_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -125877,7 +120244,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -126154,34 +120520,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers, deepseq
-     , Earley, http-client, http-client-tls, microlens, microlens-mtl
-     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
-     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-format, transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.2";
-       sha256 = "277ba41cc40236a8a02dd154d29108ddc9d8ca7706daa5fe3177189487363b5a";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text text-format transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [ base optparse-applicative text ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_5" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, microlens, microlens-mtl
      , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -126207,7 +120545,6 @@ self: {
        ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -127905,18 +122242,6 @@ self: {
      }) {};
 
   "mwc-probability" = callPackage
-    ({ mkDerivation, base, mwc-random, primitive, transformers }:
-     mkDerivation {
-       pname = "mwc-probability";
-       version = "1.2.2";
-       sha256 = "a54e9e9e51c7b67e0eb8244d584fcfc999ab7af00e5146ffdf3efed837d5915a";
-       libraryHaskellDepends = [ base mwc-random primitive transformers ];
-       homepage = "http://github.com/jtobin/mwc-probability";
-       description = "Sampling function-based probability distributions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mwc-probability_1_3_0" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -127926,7 +122251,6 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random" = callPackage
@@ -127957,6 +122281,48 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mxnet" = callPackage
+    ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }:
+     mkDerivation {
+       pname = "mxnet";
+       version = "0.1.0.1";
+       sha256 = "9407f88beb3f0f472b3aa61ca9a16b0ae41c6b3eff6b1bb868d4787ad27bb10e";
+       libraryHaskellDepends = [ base c2hs-extra ];
+       librarySystemDepends = [ mxnet ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "MXNet interface in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {mxnet = null;};
+
+  "mxnet-examples" = callPackage
+    ({ mkDerivation, base, mxnet }:
+     mkDerivation {
+       pname = "mxnet-examples";
+       version = "0.1.0.0";
+       sha256 = "147cb175fd9b409dd11292b3ce3ab98359a69a4fbd6c42fdcd4a75b0c7e8f7bf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base mxnet ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "Examples for MXNet in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "mxnet-nnvm" = callPackage
+    ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }:
+     mkDerivation {
+       pname = "mxnet-nnvm";
+       version = "0.1.0.0";
+       sha256 = "1e9e0b48a91789553befa80b8714365a63a9185809463a6127df715eb11f6561";
+       libraryHaskellDepends = [ base c2hs-extra ];
+       librarySystemDepends = [ mxnet ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
+       description = "NNVM interface in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {mxnet = null;};
+
   "myTestlll" = callPackage
     ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring
      , Cabal, CCA, containers, deepseq, Euterpea, ghc-prim, HCodecs
@@ -128764,23 +123130,6 @@ self: {
      }) {};
 
   "natural-transformation" = callPackage
-    ({ mkDerivation, base, containers, quickcheck-instances, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "natural-transformation";
-       version = "0.3.1";
-       sha256 = "9b5a39f18790f33807298d47dc7098e2863ca874e8b3d2b419bf696f2ad09702";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers quickcheck-instances tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/ku-fpg/natural-transformation";
-       description = "A natural transformation package";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "natural-transformation_0_4" = callPackage
     ({ mkDerivation, base, containers, quickcheck-instances, tasty
      , tasty-quickcheck
      }:
@@ -128795,7 +123144,6 @@ self: {
        homepage = "https://github.com/ku-fpg/natural-transformation";
        description = "A natural transformation package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "naturalcomp" = callPackage
@@ -129786,10 +124134,8 @@ self: {
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
-       version = "1.0.7";
-       sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0";
-       revision = "1";
-       editedCabalFile = "aed14a345bcd3d3ef50f393ffd360e8d2870aa0272926190565c39e7e4989c4b";
+       version = "1.0.8";
+       sha256 = "071b81db16f33edfb0dd11e918911f177b9584da27b3481c23a82a9d29f61d86";
        libraryHaskellDepends = [
          base bytestring network text time vector
        ];
@@ -132348,36 +126694,6 @@ self: {
      }) {};
 
   "octane" = callPackage
-    ({ mkDerivation, aeson, base, bimap, binary, binary-bits
-     , bytestring, containers, data-binary-ieee754, data-default-class
-     , deepseq, file-embed, http-client, http-client-tls
-     , overloaded-records, regex-compat, tasty, tasty-hspec
-     , tasty-quickcheck, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "octane";
-       version = "0.16.3";
-       sha256 = "e62faeb9bec990995d507e7542ebde84edfb42cbae4b0369bfe4aadec05d91fe";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bimap binary binary-bits bytestring containers
-         data-binary-ieee754 data-default-class deepseq file-embed
-         overloaded-records regex-compat text unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base binary bytestring http-client http-client-tls
-       ];
-       testHaskellDepends = [
-         base binary binary-bits bytestring containers tasty tasty-hspec
-         tasty-quickcheck text
-       ];
-       homepage = "https://github.com/tfausak/octane#readme";
-       description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "octane_0_18_2" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
      , overloaded-records, rattletrap, text
@@ -132398,7 +126714,6 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octohat" = callPackage
@@ -132834,6 +127149,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "onama" = callPackage
+    ({ mkDerivation, base, containers, parsec, tagsoup }:
+     mkDerivation {
+       pname = "onama";
+       version = "0.2.2.0";
+       sha256 = "df85a43fa050f6d6afc6f56789fdf176da7b615019871b3a8f4f82c635f47626";
+       libraryHaskellDepends = [ base containers parsec tagsoup ];
+       description = "HTML-parsing primitives for Parsec";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "once" = callPackage
     ({ mkDerivation, base, containers, hashable, template-haskell
      , unordered-containers
@@ -132856,8 +127182,8 @@ self: {
      }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.7";
-       sha256 = "2ea06f985f3755c870b2cdcd9b7ab0d541b51e1687507acccd833eb2de258ab4";
+       version = "0.8";
+       sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6";
        libraryHaskellDepends = [
          base bifunctors contravariant ghc-prim profunctors tagged
          transformers
@@ -132958,8 +127284,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye";
-       version = "0.5.2.2";
-       sha256 = "e09e565314d59a420349f0a5295ee4f9ed7215d579741fcf06d376703dd3d102";
+       version = "0.5.3.0";
+       sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -133825,37 +128151,6 @@ self: {
      }) {};
 
   "opml-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, case-insensitive, conduit
-     , conduit-combinators, conduit-parse, containers, data-default
-     , exceptions, foldl, hlint, lens-simple, mono-traversable
-     , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances
-     , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse
-     , xml-types
-     }:
-     mkDerivation {
-       pname = "opml-conduit";
-       version = "0.5.0.1";
-       sha256 = "69c22270aa0f3a9c45dcf993e9de06982a780b5e035e343f257bf9d8fd8a2533";
-       libraryHaskellDepends = [
-         base case-insensitive conduit conduit-parse containers exceptions
-         foldl lens-simple mono-traversable monoid-subclasses parsers
-         semigroups text time timerep uri-bytestring xml-conduit
-         xml-conduit-parse xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-combinators conduit-parse
-         containers data-default exceptions hlint lens-simple
-         mono-traversable mtl parsers QuickCheck quickcheck-instances
-         resourcet semigroups tasty tasty-hunit tasty-quickcheck text time
-         uri-bytestring xml-conduit-parse
-       ];
-       homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format.";
-       license = "unknown";
-     }) {};
-
-  "opml-conduit_0_6_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, containers, data-default, hlint, lens-simple
      , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck
@@ -133881,7 +128176,6 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -134031,29 +128325,13 @@ self: {
      }) {};
 
   "optparse-applicative" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, process, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "optparse-applicative";
-       version = "0.12.1.0";
-       sha256 = "18b46d6d2c17e941bb02f84e980390f056795dce73ece946d71d3d4d002313d5";
-       libraryHaskellDepends = [
-         ansi-wl-pprint base process transformers transformers-compat
-       ];
-       homepage = "https://github.com/pcapriotti/optparse-applicative";
-       description = "Utilities and combinators for parsing command line options";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-applicative_0_13_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
      , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "optparse-applicative";
-       version = "0.13.0.0";
-       sha256 = "cec6b1d94d347898a25446fb8a6643399d8429cf326f221e38a02d849b2b0cac";
+       version = "0.13.1.0";
+       sha256 = "f1fcf9d7e78ddf14083a07d8fe1aa65d75c5102e0d44df981585bce54c5c2a2b";
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
@@ -134061,7 +128339,6 @@ self: {
        homepage = "https://github.com/pcapriotti/optparse-applicative";
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -134077,22 +128354,6 @@ self: {
      }) {};
 
   "optparse-generic" = callPackage
-    ({ mkDerivation, base, bytestring, optparse-applicative
-     , system-filepath, text, time, transformers, void
-     }:
-     mkDerivation {
-       pname = "optparse-generic";
-       version = "1.1.1";
-       sha256 = "02938fa18d2d2aee9ccd69ed402771e01eff20da280be5a1ca1229e07929c611";
-       libraryHaskellDepends = [
-         base bytestring optparse-applicative system-filepath text time
-         transformers void
-       ];
-       description = "Auto-generate a command-line parser for your datatype";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-generic_1_1_4" = callPackage
     ({ mkDerivation, base, bytestring, optparse-applicative, semigroups
      , system-filepath, text, time, transformers, void
      }:
@@ -134106,7 +128367,6 @@ self: {
        ];
        description = "Auto-generate a command-line parser for your datatype";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-helper" = callPackage
@@ -134421,8 +128681,8 @@ self: {
        pname = "orgstat";
        version = "0.0.1";
        sha256 = "573cf350998a5625162d997290d932ab962f3ed594e20e81c810c962892635c8";
-       revision = "1";
-       editedCabalFile = "ccd6a9c2b4f92b27c55e90af11ecd4841bb757e48f066a0407b37af49240238b";
+       revision = "2";
+       editedCabalFile = "90bf3eedb1ad96d0ac2601cbd6732270793c6b5a4d3fdc26592b688a3a387d47";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134946,30 +129206,6 @@ self: {
      }) {};
 
   "pagerduty" = callPackage
-    ({ mkDerivation, aeson, base, bifunctors, bytestring
-     , bytestring-conversion, conduit, data-default-class, exceptions
-     , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
-     , monad-control, mtl, template-haskell, text, time
-     , time-locale-compat, transformers, transformers-base
-     , transformers-compat, unordered-containers
-     }:
-     mkDerivation {
-       pname = "pagerduty";
-       version = "0.0.7";
-       sha256 = "5e46075a080cf6c6561977e3f0cdd53a32a627b3a193d58c61a05e628757fe9c";
-       libraryHaskellDepends = [
-         aeson base bifunctors bytestring bytestring-conversion conduit
-         data-default-class exceptions generics-sop http-client http-types
-         lens lens-aeson mmorph monad-control mtl template-haskell text time
-         time-locale-compat transformers transformers-base
-         transformers-compat unordered-containers
-       ];
-       homepage = "http://github.com/brendanhay/pagerduty";
-       description = "Client library for PagerDuty Integration and REST APIs";
-       license = "unknown";
-     }) {};
-
-  "pagerduty_0_0_8" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring
      , bytestring-conversion, conduit, data-default-class, exceptions
      , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
@@ -134991,7 +129227,6 @@ self: {
        homepage = "http://github.com/brendanhay/pagerduty";
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagination" = callPackage
@@ -135023,6 +129258,18 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "paint" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "paint";
+       version = "1.0.0";
+       sha256 = "a4029057144e91384edfa6e6c56e90b2fe2f1e166201d73f9f8e02e265b6424f";
+       libraryHaskellDepends = [ base text ];
+       homepage = "https://github.com/lovasko/paint";
+       description = "Colorization of text for command-line output";
+       license = "unknown";
+     }) {};
+
   "palette" = callPackage
     ({ mkDerivation, array, base, colour, containers }:
      mkDerivation {
@@ -135084,55 +129331,6 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, base
-     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , cmark, containers, data-default, deepseq, Diff, directory
-     , executable-path, extensible-exceptions, filemanip, filepath
-     , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP
-     , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
-     , network, network-uri, old-time, pandoc-types, parsec, process
-     , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , texmath, text, time, unordered-containers, vector, xml, yaml
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "1.17.1";
-       sha256 = "5978baaf664ce254b508108a6be9d5a11a2c2ac61462ae85286be2ecdb010c86";
-       revision = "1";
-       editedCabalFile = "0ceaa11f58bcbaa0b3aa8babf7a92de818ff331f38193c8e42ee8bc174113681";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring binary blaze-html blaze-markup
-         bytestring cmark containers data-default deepseq directory
-         extensible-exceptions filemanip filepath ghc-prim haddock-library
-         highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-time pandoc-types parsec
-         process random scientific SHA syb tagsoup temporary texmath text
-         time unordered-containers vector xml yaml zip-archive zlib
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory extensible-exceptions
-         filepath highlighting-kate HTTP network network-uri pandoc-types
-         text yaml
-       ];
-       testHaskellDepends = [
-         ansi-terminal base bytestring containers Diff directory
-         executable-path filepath highlighting-kate HUnit pandoc-types
-         process QuickCheck syb test-framework test-framework-hunit
-         test-framework-quickcheck2 text zip-archive
-       ];
-       doCheck = false;
-       homepage = "http://pandoc.org";
-       description = "Conversion between markup formats";
-       license = "GPL";
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_1_19_2_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
@@ -135177,7 +129375,6 @@ self: {
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
@@ -135390,22 +129587,6 @@ self: {
      }) {};
 
   "pandoc-types" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , ghc-prim, syb
-     }:
-     mkDerivation {
-       pname = "pandoc-types";
-       version = "1.16.1.1";
-       sha256 = "f8feb3aef9adc16e7a81d4fd4548e5a142366c59a826272f9b04a9dddbfb9524";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq ghc-prim syb
-       ];
-       homepage = "http://johnmacfarlane.net/pandoc";
-       description = "Types for representing a structured document";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-types_1_17_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -135424,7 +129605,6 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -139281,30 +133461,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, either, hspec
-     , http-client, http-client-tls, http-types, mtl, network
-     , old-locale, profunctors, QuickCheck, random, semigroups, text
-     , time, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.6";
-       sha256 = "1b999ac66e530a840b425a4656b8499eccf1928bb25dd059a09b9e14863347db";
-       libraryHaskellDepends = [
-         aeson base bytestring containers either http-client http-client-tls
-         http-types mtl network old-locale profunctors random text time
-         transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck semigroups
-         text time transformers unordered-containers
-       ];
-       homepage = "https://github.com/jonschoning/pinboard";
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_9_12_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -139328,7 +133484,6 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -139354,24 +133509,6 @@ self: {
      }) {};
 
   "pinchot" = callPackage
-    ({ mkDerivation, base, containers, Earley, lens, ListLike
-     , non-empty-sequence, pretty-show, semigroups, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pinchot";
-       version = "0.22.0.0";
-       sha256 = "248a9e9108d5e12afd4da1aa5bc6bc8d2e732257da318c60bb225844edb88617";
-       libraryHaskellDepends = [
-         base containers Earley lens ListLike non-empty-sequence pretty-show
-         semigroups template-haskell transformers
-       ];
-       homepage = "http://www.github.com/massysett/pinchot";
-       description = "Write grammars, not parsers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinchot_0_24_0_0" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, pretty-show
      , semigroups, template-haskell, transformers
      }:
@@ -139386,7 +133523,6 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Write grammars, not parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -139418,23 +133554,6 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers
-     }:
-     mkDerivation {
-       pname = "pipes";
-       version = "4.1.9";
-       sha256 = "c2d5d08761bbb62dca03f81b3d99bb2f50a386c52c30b2abc8c3ca8aabdea3ea";
-       libraryHaskellDepends = [ base mmorph mtl transformers ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_2" = callPackage
     ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck
      , test-framework, test-framework-quickcheck2, transformers
      }:
@@ -139451,7 +133570,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -139614,20 +133732,6 @@ self: {
      }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony" = callPackage
-    ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }:
-     mkDerivation {
-       pname = "pipes-cacophony";
-       version = "0.4.0";
-       sha256 = "224ff8983cc61a92bc733cbdd2a9632b30858ef7a644203a346c0c9d18821ec0";
-       libraryHaskellDepends = [ base bytestring cacophony pipes ];
-       testHaskellDepends = [ base hlint ];
-       homepage = "https://github.com/centromere/pipes-cacophony";
-       description = "Pipes for Noise-secured network connections";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "pipes-cacophony_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes
      }:
      mkDerivation {
@@ -139907,16 +134011,16 @@ self: {
   "pipes-fluid" = callPackage
     ({ mkDerivation, async, base, constraints, hspec, lens
      , lifted-async, mmorph, monad-control, mtl, pipes
-     , pipes-concurrency, pipes-misc, stm, these, transformers
-     , transformers-base
+     , pipes-concurrency, pipes-misc, semigroups, stm, these
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "pipes-fluid";
-       version = "0.4.0.0";
-       sha256 = "c82a04b5799e9c94a1989fc6f940ad4fb624259e6c8eda98515fe43d7b67131d";
+       version = "0.5.0.3";
+       sha256 = "0d2ef03e16992ef96a4f5d15f1c6d566c7ea7d65eb87e9c64be081d8a60b2b39";
        libraryHaskellDepends = [
-         base constraints lens lifted-async monad-control pipes stm these
-         transformers transformers-base
+         base constraints lens lifted-async monad-control pipes semigroups
+         stm these transformers transformers-base
        ];
        testHaskellDepends = [
          async base constraints hspec lens lifted-async mmorph monad-control
@@ -140176,8 +134280,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-postgresql-simple";
-       version = "0.1.2.0";
-       sha256 = "81f11a44938d2ba1744f0ba82053a3a5aaaa0cfc716f5a4762ff4bde7415328a";
+       version = "0.1.3.0";
+       sha256 = "53de5231df1c0591e9dbd3b989a4075e45fa2a493adce060b53b8e741dbae688";
        libraryHaskellDepends = [
          async base bytestring exceptions mtl pipes pipes-concurrency
          pipes-safe postgresql-simple stm text transformers
@@ -140238,18 +134342,23 @@ self: {
      }) {};
 
   "pipes-s3" = callPackage
-    ({ mkDerivation, aws, base, bytestring, http-client
-     , http-client-tls, pipes, pipes-bytestring, pipes-safe, resourcet
-     , text, transformers
+    ({ mkDerivation, aws, base, bytestring, exceptions, http-client
+     , http-client-tls, http-types, pipes, pipes-bytestring, pipes-safe
+     , QuickCheck, resourcet, tasty, tasty-quickcheck, text
+     , transformers
      }:
      mkDerivation {
        pname = "pipes-s3";
-       version = "0.1.0.0";
-       sha256 = "a41869e5fa135c8abb3749474cb4c7e9fd572de201109de79176a4c09e33d813";
+       version = "0.3.0.2";
+       sha256 = "fd89bb1af54af172c2b4fb2c75782a1cbf8ff7778fbb40da1bc2d2e3ec2fa4e7";
        libraryHaskellDepends = [
-         aws base bytestring http-client http-client-tls pipes
+         aws base bytestring http-client http-client-tls http-types pipes
          pipes-bytestring pipes-safe resourcet text transformers
        ];
+       testHaskellDepends = [
+         base bytestring exceptions pipes pipes-bytestring pipes-safe
+         QuickCheck tasty tasty-quickcheck text
+       ];
        homepage = "http://github.com/bgamari/pipes-s3";
        description = "A simple interface for streaming data to and from Amazon S3";
        license = stdenv.lib.licenses.bsd3;
@@ -140257,24 +134366,6 @@ self: {
      }) {};
 
   "pipes-safe" = callPackage
-    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
-     , pipes, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "pipes-safe";
-       version = "2.2.4";
-       sha256 = "502dca5ab38596c70917906ed979f917db52ed91b938d52d96dcb7c56735486e";
-       revision = "1";
-       editedCabalFile = "c91c8835d9ed03ad82795b877f080a06ed43557bacf5bce90121ca0e6d58e873";
-       libraryHaskellDepends = [
-         base containers exceptions monad-control mtl pipes transformers
-         transformers-base
-       ];
-       description = "Safety for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-safe_2_2_5" = callPackage
     ({ mkDerivation, base, containers, exceptions, monad-control, mtl
      , pipes, transformers, transformers-base
      }:
@@ -140288,7 +134379,6 @@ self: {
        ];
        description = "Safety for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-shell" = callPackage
@@ -140574,28 +134664,6 @@ self: {
      }) {};
 
   "pkcs10" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
-     , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, transformers, x509
-     }:
-     mkDerivation {
-       pname = "pkcs10";
-       version = "0.1.1.0";
-       sha256 = "1d4665fa5a429e859535e132c507b1e1ec713de50d3e085de9731bbd1c9cbeec";
-       libraryHaskellDepends = [
-         asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
-         x509
-       ];
-       testHaskellDepends = [
-         asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
-         QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509
-       ];
-       homepage = "https://github.com/fcomb/pkcs10-hs#readme";
-       description = "PKCS#10 library";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "pkcs10_0_2_0_0" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
      , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck, transformers, x509
@@ -140615,7 +134683,6 @@ self: {
        homepage = "https://github.com/fcomb/pkcs10-hs#readme";
        description = "PKCS#10 library";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pkcs7" = callPackage
@@ -141137,6 +135204,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pocket" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
+     , http-client-tls, servant, servant-client, text, transformers
+     }:
+     mkDerivation {
+       pname = "pocket";
+       version = "0.1.0";
+       sha256 = "c73d73f4221023178324a954c4c0f5873febed698db8ed86acf70d999eb6b712";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring http-client http-client-tls
+         servant servant-client text transformers
+       ];
+       homepage = "https://github.com/jpvillaisaza/pocket-haskell";
+       description = "Bindings for the Pocket API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pocket-dns" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cabal-test-bin
      , data-default, dns, hspec, hspec-contrib, hspec-server
@@ -141260,29 +135344,6 @@ self: {
      }) {};
 
   "pointful" = callPackage
-    ({ mkDerivation, base, containers, haskell-src-exts, mtl, syb
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pointful";
-       version = "1.0.8";
-       sha256 = "813152e920e7aad9d2ba2ab5d922deff9cd82ec156f981d16de4bc91320967ac";
-       revision = "1";
-       editedCabalFile = "b2038459d89251a94f3cc8709f5be0ce80c0cc1be72e2b65fca387efdd61d477";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers haskell-src-exts mtl syb transformers
-       ];
-       executableHaskellDepends = [
-         base containers haskell-src-exts mtl syb transformers
-       ];
-       homepage = "http://github.com/23Skidoo/pointful";
-       description = "Pointful refactoring tool";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pointful_1_0_9" = callPackage
     ({ mkDerivation, base, containers, haskell-src-exts-simple, mtl
      , syb, transformers
      }:
@@ -141301,7 +135362,6 @@ self: {
        homepage = "http://github.com/23Skidoo/pointful";
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-fun" = callPackage
@@ -142517,27 +136577,6 @@ self: {
      }) {};
 
   "postgresql-simple-url" = callPackage
-    ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-url";
-       version = "0.1.0.1";
-       sha256 = "cf165ec652e1192f392349e09e413a776921ddef71d95bac0d23e9f81cfbe8a0";
-       revision = "7";
-       editedCabalFile = "f4f8535e362cc496675fa36640cea043fbe46e99e2d3bc8ee449ebe6a293c8cc";
-       libraryHaskellDepends = [
-         base network-uri postgresql-simple split
-       ];
-       testHaskellDepends = [
-         base postgresql-simple tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/futurice/postgresql-simple-url";
-       description = "Parse postgres:// url into ConnectInfo";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-simple-url_0_2_0_0" = callPackage
     ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty
      , tasty-quickcheck
      }:
@@ -142554,7 +136593,6 @@ self: {
        homepage = "https://github.com/futurice/postgresql-simple-url";
        description = "Parse postgres:// url into ConnectInfo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-transactional" = callPackage
@@ -143947,22 +137985,6 @@ self: {
      }) {};
 
   "process-extras" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, generic-deriving
-     , ListLike, process, text
-     }:
-     mkDerivation {
-       pname = "process-extras";
-       version = "0.4.1.4";
-       sha256 = "05cd949158ff605cb63fc86a2de1b51bfd8d27bf54b5fbe6427a1941e938cfc0";
-       libraryHaskellDepends = [
-         base bytestring deepseq generic-deriving ListLike process text
-       ];
-       homepage = "https://github.com/seereason/process-extras";
-       description = "Process extras";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "process-extras_0_7_1" = callPackage
     ({ mkDerivation, base, bytestring, data-default, deepseq
      , generic-deriving, HUnit, ListLike, mtl, process, text
      }:
@@ -143978,7 +138000,6 @@ self: {
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-iterio" = callPackage
@@ -144262,25 +138283,6 @@ self: {
      }) {};
 
   "profiteur" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath
-     , text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "profiteur";
-       version = "0.3.0.3";
-       sha256 = "4f9929059826c24be4c4cbfae00cfea5985c20c4c2ddb03d56a47cd72c18e144";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson attoparsec base bytestring filepath text unordered-containers
-         vector
-       ];
-       homepage = "http://github.com/jaspervdj/profiteur";
-       description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profiteur_0_4_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , ghc-prof, js-jquery, scientific, text, unordered-containers
      , vector
@@ -144298,7 +138300,6 @@ self: {
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -144654,8 +138655,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.2.3";
-       sha256 = "078b51c15e4dbce6f55cd26eeb82ed6307e3c47661ab6518f421a1c95e60a11a";
+       version = "3.3.0";
+       sha256 = "dba271f7078786ba229c5dfe72caf4f03b92044506fab82e1a0ed24c555d9172";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145271,19 +139272,6 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, filepath, hspec, template-haskell }:
-     mkDerivation {
-       pname = "publicsuffix";
-       version = "0.20160716";
-       sha256 = "19d7fd9990954284073323d9d22a892f1b600761e5353e9a0473d46591956956";
-       libraryHaskellDepends = [ base filepath template-haskell ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
-       description = "The publicsuffix list exposed as proper Haskell types";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "publicsuffix_0_20170109" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
@@ -145294,7 +139282,6 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -145717,59 +139704,12 @@ self: {
      }) {};
 
   "purescript" = callPackage
-    ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal
-     , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring
-     , clock, containers, directory, dlist, edit-distance, file-embed
-     , filepath, fsnotify, Glob, haskeline, hspec, hspec-discover
-     , http-client, http-types, HUnit, language-javascript, lifted-base
-     , monad-control, monad-logger, mtl, network, optparse-applicative
-     , parallel, parsec, pattern-arrows, pipes, pipes-http, process
-     , protolude, regex-tdfa, safe, semigroups, silently, sourcemap
-     , spdx, split, stm, syb, text, time, transformers
-     , transformers-base, transformers-compat, unordered-containers
-     , utf8-string, vector, wai, wai-websockets, warp, websockets
-     }:
-     mkDerivation {
-       pname = "purescript";
-       version = "0.9.3";
-       sha256 = "0e4628232508a37568103d3ffcce68355258af388bba1b0bb3847c1fb33b91e5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-better-errors ansi-terminal base base-compat bower-json
-         boxes bytestring clock containers directory dlist edit-distance
-         filepath fsnotify Glob haskeline http-client http-types
-         language-javascript lifted-base monad-control monad-logger mtl
-         parallel parsec pattern-arrows pipes pipes-http process protolude
-         regex-tdfa safe semigroups sourcemap spdx split stm syb text time
-         transformers transformers-base transformers-compat
-         unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [
-         aeson ansi-terminal ansi-wl-pprint base base-compat boxes
-         bytestring containers directory file-embed filepath Glob haskeline
-         http-types monad-logger mtl network optparse-applicative parsec
-         process protolude split stm text time transformers
-         transformers-compat utf8-string wai wai-websockets warp websockets
-       ];
-       testHaskellDepends = [
-         aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline hspec hspec-discover
-         HUnit mtl optparse-applicative parsec process protolude silently
-         stm text time transformers transformers-compat utf8-string vector
-       ];
-       doCheck = false;
-       homepage = "http://www.purescript.org/";
-       description = "PureScript Programming Language Compiler";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "purescript_0_10_5" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty
-     , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json
-     , boxes, bytestring, clock, containers, data-ordlist, directory
-     , dlist, edit-distance, file-embed, filepath, foldl, fsnotify, Glob
-     , haskeline, hspec, hspec-discover, http-client, http-types, HUnit
+     , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html
+     , bower-json, boxes, bytestring, cheapskate, clock, containers
+     , data-ordlist, deepseq, directory, dlist, edit-distance
+     , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec
+     , hspec-discover, http-client, http-types, HUnit
      , language-javascript, lens, lifted-base, monad-control
      , monad-logger, mtl, network, optparse-applicative, parallel
      , parsec, pattern-arrows, pipes, pipes-http, process, protolude
@@ -145781,19 +139721,20 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.10.5";
-       sha256 = "0d36361819866efe703eb3ae37f597316098ec3ead6edc9236ea63d54bdc8916";
+       version = "0.10.7";
+       sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-better-errors ansi-terminal base base-compat bower-json
-         boxes bytestring clock containers data-ordlist directory dlist
-         edit-distance filepath fsnotify Glob haskeline http-client
-         http-types language-javascript lens lifted-base monad-control
-         monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
-         process protolude regex-tdfa safe scientific semigroups sourcemap
-         spdx split stm syb text time transformers transformers-base
-         transformers-compat unordered-containers utf8-string vector
+         aeson aeson-better-errors ansi-terminal base base-compat blaze-html
+         bower-json boxes bytestring cheapskate clock containers
+         data-ordlist deepseq directory dlist edit-distance filepath
+         fsnotify Glob haskeline http-client http-types language-javascript
+         lens lifted-base monad-control monad-logger mtl parallel parsec
+         pattern-arrows pipes pipes-http process protolude regex-tdfa safe
+         scientific semigroups sourcemap spdx split stm syb text time
+         transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat
@@ -145806,15 +139747,14 @@ self: {
        testHaskellDepends = [
          aeson aeson-better-errors base base-compat bower-json boxes
          bytestring containers directory filepath Glob haskeline hspec
-         hspec-discover HUnit mtl optparse-applicative parsec process
-         protolude silently stm text time transformers transformers-compat
-         utf8-string vector
+         hspec-discover HUnit lens monad-logger mtl optparse-applicative
+         parsec process protolude silently stm text time transformers
+         transformers-compat utf8-string vector
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -145824,8 +139764,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.8.0.1";
-       sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329";
+       version = "0.10.0.0";
+       sha256 = "6bfb056e3dc2f93a4bb5db20e1151f258145ae7a8c2a13a2e8478936b4ff37d3";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -145838,15 +139778,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "purescript-bridge_0_9_0_0" = callPackage
+  "purescript-bridge_0_10_1_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
      , mtl, text, transformers
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.9.0.0";
-       sha256 = "ba7ed603c5cc92099b48388ce4caade457f6f51a8b3eaf87c665aea21d394f04";
+       version = "0.10.1.0";
+       sha256 = "1a5f92b77f01a214272aed6df3c0b47d28c8f7954c07b2d16f7cdd3f2c596223";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -146001,6 +139941,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pusher-http-haskell_1_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptohash, hashable, hspec, http-client, http-types, QuickCheck
+     , text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "1.2.0.0";
+       sha256 = "372de78c2efaf60512d22311ad38bd6e968e9e29de171517438c8b129a4b7371";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptohash hashable
+         http-client http-types text time transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec http-client http-types QuickCheck text
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/pusher-community/pusher-http-haskell";
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pusher-ws" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , hashable, http-conduit, lens, lens-aeson, network, scientific
@@ -146855,19 +140818,6 @@ self: {
      }) {};
 
   "quickcheck-assertions" = callPackage
-    ({ mkDerivation, base, hspec, ieee754, QuickCheck }:
-     mkDerivation {
-       pname = "quickcheck-assertions";
-       version = "0.2.0";
-       sha256 = "600fbafab414f5fba7df40a10635aa407d3af8de3938a6c2866bf80f0952f740";
-       libraryHaskellDepends = [ base ieee754 QuickCheck ];
-       testHaskellDepends = [ base hspec ieee754 QuickCheck ];
-       homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
-       description = "HUnit like assertions for QuickCheck";
-       license = stdenv.lib.licenses.lgpl3;
-     }) {};
-
-  "quickcheck-assertions_0_3_0" = callPackage
     ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-assertions";
@@ -146878,7 +140828,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
        description = "HUnit like assertions for QuickCheck";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-combinators" = callPackage
@@ -147892,8 +141841,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }:
      mkDerivation {
        pname = "ramus";
-       version = "0.1.0";
-       sha256 = "8acc90e5aec53ea31b8da0a1dd0164c4e2aa6e3226c5b69da0882b5c47255537";
+       version = "0.1.2";
+       sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
        homepage = "https://github.com/NickSeagull/ramus#readme";
@@ -148561,33 +142510,6 @@ self: {
      }) {};
 
   "rasterific-svg" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
-     , optparse-applicative, Rasterific, scientific, svg-tree, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "rasterific-svg";
-       version = "0.3.1.2";
-       sha256 = "83c90ea97d73f05003de2a4622ed26754fa52cb94a3341feada477713332a789";
-       revision = "1";
-       editedCabalFile = "1a66db5d85478533f4d6702dd36b158f464f3a725a365bcb68fefed59edfa586";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl Rasterific scientific svg-tree text
-         transformers vector
-       ];
-       executableHaskellDepends = [
-         base directory filepath FontyFruity JuicyPixels
-         optparse-applicative Rasterific svg-tree
-       ];
-       description = "SVG renderer based on Rasterific";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rasterific-svg_0_3_2_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
      , optparse-applicative, primitive, Rasterific, scientific, svg-tree
@@ -148610,7 +142532,6 @@ self: {
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rate-limit" = callPackage
@@ -150487,10 +144408,8 @@ self: {
     ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }:
      mkDerivation {
        pname = "reform-blaze";
-       version = "0.2.4.1";
-       sha256 = "d4acf094d75cef125e9d587646b9bbb66ce927b43ed16c99738f11e80569678b";
-       revision = "1";
-       editedCabalFile = "abe598582e2e9627ce899e3fe47c1d495da157d0059115aca220beecee6a05f1";
+       version = "0.2.4.3";
+       sha256 = "11bcf127356bf5840a0947ea1058cbf1e08096ab0fc872aa5c1ec7d88e40b2e4";
        libraryHaskellDepends = [
          base blaze-html blaze-markup reform text
        ];
@@ -150503,8 +144422,8 @@ self: {
     ({ mkDerivation, base, blaze-markup, reform, shakespeare, text }:
      mkDerivation {
        pname = "reform-hamlet";
-       version = "0.0.5.1";
-       sha256 = "a0271fc7580463d3790f26e651836e0030178444987c9132b3c74dab249286f2";
+       version = "0.0.5.3";
+       sha256 = "512729389fc3eec118a8079486eb2319e1e8eaecdeecafdd6b36205373ce3466";
        libraryHaskellDepends = [
          base blaze-markup reform shakespeare text
        ];
@@ -152405,26 +146324,6 @@ self: {
      }) {};
 
   "reroute" = callPackage
-    ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl
-     , path-pieces, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "reroute";
-       version = "0.4.0.1";
-       sha256 = "d1c3636aa6d2895055721ff9290a595fff2ce3e9d917e9af7e36aafb71701f0e";
-       libraryHaskellDepends = [
-         base deepseq hashable hvect mtl path-pieces text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         base hspec hvect mtl text unordered-containers vector
-       ];
-       homepage = "http://github.com/agrafix/Spock";
-       description = "abstract implementation of typed and untyped web routing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "reroute_0_4_1_0" = callPackage
     ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data
      , hvect, mtl, text, unordered-containers, vector
      }:
@@ -152442,7 +146341,6 @@ self: {
        homepage = "http://github.com/agrafix/Spock";
        description = "abstract implementation of typed and untyped web routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reserve" = callPackage
@@ -152749,34 +146647,6 @@ self: {
      }) {};
 
   "rest-gen" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
-     , code-builder, directory, fclabels, filepath, hashable
-     , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
-     , pretty, process, rest-core, safe, scientific, semigroups, split
-     , test-framework, test-framework-hunit, text, uniplate
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "rest-gen";
-       version = "0.19.0.3";
-       sha256 = "9ed4224ed8de81c56000b6814724bfed46f4e7b8890fe5892d308b6edcab2e76";
-       revision = "1";
-       editedCabalFile = "d613ead87b1c5a0a7fee13c46dc42edf4c9e486277a14f1a3ce5314799963abd";
-       libraryHaskellDepends = [
-         aeson base base-compat blaze-html Cabal code-builder directory
-         fclabels filepath hashable haskell-src-exts HStringTemplate hxt
-         json-schema pretty process rest-core safe scientific semigroups
-         split text uniplate unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base fclabels haskell-src-exts HUnit rest-core test-framework
-         test-framework-hunit
-       ];
-       description = "Documentation and client generation from rest definition";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rest-gen_0_20_0_0" = callPackage
     ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
      , code-builder, directory, fclabels, filepath, hashable
      , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
@@ -152802,7 +146672,6 @@ self: {
        ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-happstack" = callPackage
@@ -154202,21 +148071,6 @@ self: {
      }) {};
 
   "rotating-log" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, time }:
-     mkDerivation {
-       pname = "rotating-log";
-       version = "0.4";
-       sha256 = "661a22b9f5b05d7dd8989f61f1d625862d57b18aa19fba7077746f05be77b451";
-       libraryHaskellDepends = [
-         base bytestring directory filepath time
-       ];
-       testHaskellDepends = [ base bytestring directory filepath time ];
-       homepage = "http://github.com/Soostone/rotating-log";
-       description = "Size-limited, concurrent, automatically-rotating log writer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rotating-log_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-locale
      , time, time-locale-compat
      }:
@@ -154234,7 +148088,6 @@ self: {
        homepage = "http://github.com/Soostone/rotating-log";
        description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundRobin" = callPackage
@@ -154540,33 +148393,6 @@ self: {
      }) {};
 
   "rss-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , conduit-parse, containers, data-default, exceptions, foldl, hlint
-     , lens-simple, mono-traversable, parsers, QuickCheck
-     , quickcheck-instances, resourcet, safe, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, uri-bytestring
-     , xml-conduit, xml-conduit-parse, xml-types
-     }:
-     mkDerivation {
-       pname = "rss-conduit";
-       version = "0.2.0.2";
-       sha256 = "304a2918743f7b65191ce8c4a57c94b1c3afb2692e5c79d6b0822a05be3294d1";
-       libraryHaskellDepends = [
-         base conduit conduit-parse containers exceptions foldl lens-simple
-         mono-traversable parsers safe text time timerep uri-bytestring
-         xml-conduit xml-conduit-parse xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring conduit conduit-extra conduit-parse data-default
-         exceptions hlint lens-simple mono-traversable parsers QuickCheck
-         quickcheck-instances resourcet tasty tasty-hunit tasty-quickcheck
-         text time uri-bytestring xml-conduit xml-conduit-parse xml-types
-       ];
-       description = "Streaming parser/renderer for the RSS 2.0 standard.";
-       license = "unknown";
-     }) {};
-
-  "rss-conduit_0_3_0_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, containers, data-default, hlint, lens-simple
      , mono-traversable, QuickCheck, quickcheck-instances, resourcet
@@ -154590,7 +148416,6 @@ self: {
        ];
        description = "Streaming parser/renderer for the RSS 2.0 standard.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss2irc" = callPackage
@@ -155019,8 +148844,8 @@ self: {
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
-       version = "0.3.11";
-       sha256 = "6a58c8199a8c5ee7ca14077b69c2e876b29be51c797ec4b93de9c7ab3c7bd879";
+       version = "0.3.13";
+       sha256 = "4a75af71313ef98bb66fbb4f1416f6f1220cd37a2c8b1462ed8c5a982a264884";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/ndmitchell/safe#readme";
@@ -155028,20 +148853,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "safe_0_3_12" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "safe";
-       version = "0.3.12";
-       sha256 = "738c849bdc619f9bbcd23f7fc956af2b87a182a9887ac88c1a80895ae931e29e";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
-       description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -155543,23 +149354,6 @@ self: {
      }) {};
 
   "sampling" = callPackage
-    ({ mkDerivation, base, foldl, mwc-random, primitive, vector }:
-     mkDerivation {
-       pname = "sampling";
-       version = "0.2.0";
-       sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a";
-       revision = "1";
-       editedCabalFile = "705929c9a629db8150478fd996315889fb8e5ab16dd584bc969727d6cc7e25b1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base foldl mwc-random primitive vector ];
-       executableHaskellDepends = [ base ];
-       homepage = "https://github.com/jtobin/sampling";
-       description = "Sample values from collections";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "sampling_0_3_2" = callPackage
     ({ mkDerivation, base, containers, foldl, mwc-random, primitive
      , vector
      }:
@@ -155574,7 +149368,6 @@ self: {
        homepage = "https://github.com/jtobin/sampling";
        description = "Sample values from collections";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "samtools" = callPackage
@@ -155913,8 +149706,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbp";
-       version = "2.1.6";
-       sha256 = "85387a8556d0b25b009ab48b6bcbafb5ac91bfb7dc5442838376f913be59924b";
+       version = "2.1.7";
+       sha256 = "481f1bb36ecd467b2e60d2a97c6393384d78b96ece7afd644d96641ee51bb32e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155964,8 +149757,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.12";
-       sha256 = "0c43caeb77fd6a3d6d4e8e71835da0ca5e207dcc2b0bf6ef07abb7dd5c3bd55f";
+       version = "5.14";
+       sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156107,24 +149900,6 @@ self: {
      }) {};
 
   "scalpel" = callPackage
-    ({ mkDerivation, base, bytestring, containers, curl, data-default
-     , HUnit, regex-base, regex-tdfa, tagsoup, text
-     }:
-     mkDerivation {
-       pname = "scalpel";
-       version = "0.3.1";
-       sha256 = "5db9046a506f40d713fb678e496b7fd9cfa21c453bd5e6f574720d57826a204f";
-       libraryHaskellDepends = [
-         base bytestring containers curl data-default regex-base regex-tdfa
-         tagsoup text
-       ];
-       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
-       homepage = "https://github.com/fimad/scalpel";
-       description = "A high level web scraping library for Haskell";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "scalpel_0_5_0" = callPackage
     ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core
      , tagsoup, text
      }:
@@ -156138,7 +149913,6 @@ self: {
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalpel-core" = callPackage
@@ -156531,31 +150305,6 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty
-     , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
-     , text, vector
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.4.9";
-       sha256 = "108330662b0af9a04d7da55864211ce12008efe36614d897ba635e80670918a8";
-       revision = "1";
-       editedCabalFile = "833f5960e622c7346c3c02547538da037bcc4eececc00ba2ab9412eabdb71d61";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq ghc-prim hashable
-         integer-gmp text vector
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_4_10" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck
      , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
@@ -156576,7 +150325,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -157180,23 +150928,6 @@ self: {
      }) {};
 
   "sdl2" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
-     , StateVar, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "sdl2";
-       version = "2.1.3.1";
-       sha256 = "788a7f1e2bb08e393b806d9f700f62234703ec85b772e0e25ff740b4aafaae14";
-       libraryHaskellDepends = [
-         base bytestring exceptions linear StateVar text transformers vector
-       ];
-       librarySystemDepends = [ SDL2 ];
-       libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.2+).";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) SDL2;};
-
-  "sdl2_2_2_0" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, linear, SDL2
      , StateVar, text, transformers, vector
      }:
@@ -157211,7 +150942,6 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -157947,8 +151677,8 @@ self: {
      }:
      mkDerivation {
        pname = "semiring-num";
-       version = "0.8.0.0";
-       sha256 = "13b47bc891b8b2bcfe648409554e4b811ce964d86febd1403584beb5f3b21a4e";
+       version = "0.9.0.1";
+       sha256 = "2605eddf961927ce04be8167a2a01123ee0a0dcae55dcd44f3830736ae4d9830";
        libraryHaskellDepends = [ base containers template-haskell ];
        testHaskellDepends = [
          base containers doctest nat-sized-numbers QuickCheck smallcheck
@@ -158532,19 +152262,21 @@ self: {
 
   "servant" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , bytestring-conversion, case-insensitive, directory, doctest
-     , filemanip, filepath, hspec, http-api-data, http-media, http-types
-     , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances
-     , string-conversions, text, url, vault
+     , case-insensitive, directory, doctest, filemanip, filepath, hspec
+     , http-api-data, http-media, http-types, mmorph, mtl, network-uri
+     , QuickCheck, quickcheck-instances, string-conversions, text, url
+     , vault
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.8.1";
-       sha256 = "2b5494ceb4d8123c7a92535d0cf109485e165dfc9cba9471b11127e04556d8c1";
+       version = "0.9.1.1";
+       sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa";
+       revision = "1";
+       editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d";
        libraryHaskellDepends = [
-         aeson attoparsec base base-compat bytestring bytestring-conversion
-         case-insensitive http-api-data http-media http-types mmorph mtl
-         network-uri string-conversions text vault
+         aeson attoparsec base base-compat bytestring case-insensitive
+         http-api-data http-media http-types mmorph mtl network-uri
+         string-conversions text vault
        ];
        testHaskellDepends = [
          aeson attoparsec base base-compat bytestring directory doctest
@@ -158645,7 +152377,6 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-client" = callPackage
@@ -158752,6 +152483,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-server_0_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
+     , bytestring, bytestring-conversion, case-insensitive, cookie
+     , crypto-api, data-default-class, entropy, hspec, http-api-data
+     , http-client, http-types, jose, lens, lens-aeson, markdown-unlit
+     , monad-time, mtl, QuickCheck, servant-auth, servant-server, text
+     , time, transformers, unordered-containers, wai, warp, wreq
+     }:
+     mkDerivation {
+       pname = "servant-auth-server";
+       version = "0.2.1.0";
+       sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy http-api-data jose lens monad-time mtl
+         servant-auth servant-server text time unordered-containers wai
+       ];
+       executableHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy http-api-data jose lens markdown-unlit
+         monad-time mtl servant-auth servant-server text time transformers
+         unordered-containers wai warp
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring blaze-builder bytestring
+         bytestring-conversion case-insensitive cookie crypto-api
+         data-default-class entropy hspec http-api-data http-client
+         http-types jose lens lens-aeson monad-time mtl QuickCheck
+         servant-auth servant-server text time unordered-containers wai warp
+         wreq
+       ];
+       homepage = "http://github.com/plow-technologies/servant-auth#readme";
+       description = "servant-server/servant-auth compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-auth-server" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, bytestring-conversion, case-insensitive, cookie
@@ -158790,7 +152562,6 @@ self: {
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -158801,8 +152572,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.3.2.0";
-       sha256 = "e15307d04c1011f118696c791d641d2a22844737d2484138147beb49f1abcae2";
+       version = "0.4.0.0";
+       sha256 = "e194c5c860508e22b8eb030d6c52c431df9fd7631a6287b042b48daf74825250";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers mtl persistent
          persistent-postgresql persistent-template pwstore-fast
@@ -158814,14 +152585,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-token-acid" = callPackage
+    ({ mkDerivation, acid-state, aeson-injector, base, bytestring
+     , containers, ghc-prim, monad-control, mtl, safe, safecopy
+     , servant-auth-token, servant-auth-token-api, servant-server
+     , template-haskell, text, time, transformers, transformers-base
+     , uuid
+     }:
+     mkDerivation {
+       pname = "servant-auth-token-acid";
+       version = "0.4.0.0";
+       sha256 = "22c16f9a7d05a3555c7f3195248165b384c99792bf0e952326d3992831da318b";
+       libraryHaskellDepends = [
+         acid-state aeson-injector base bytestring containers ghc-prim
+         monad-control mtl safe safecopy servant-auth-token
+         servant-auth-token-api servant-server template-haskell text time
+         transformers transformers-base uuid
+       ];
+       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
+       description = "Acid-state backend for servant-auth-token server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-auth-token-api" = callPackage
     ({ mkDerivation, aeson, aeson-injector, base, lens, raw-strings-qq
      , servant, servant-docs, servant-swagger, swagger2, text
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.3.2.0";
-       sha256 = "f2fe6ed30518036c9866095521fc9212877e3760ea9a57fd40543d601b8c5e4e";
+       version = "0.4.0.0";
+       sha256 = "6a8ab7ae1f63d2aecca8c6d63f2b305238b010e5c2e19e4c7f51e01d6bb65526";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -158832,6 +152625,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-token-persistent" = callPackage
+    ({ mkDerivation, aeson-injector, base, bytestring, containers
+     , ghc-prim, monad-control, mtl, persistent, persistent-postgresql
+     , persistent-template, servant-auth-token, servant-auth-token-api
+     , servant-server, text, time, transformers, transformers-base, uuid
+     }:
+     mkDerivation {
+       pname = "servant-auth-token-persistent";
+       version = "0.4.0.0";
+       sha256 = "8b2a6cbc45e3f52ac5d12cd05c052373ca758599672b6086b3148e0dd5f9a075";
+       libraryHaskellDepends = [
+         aeson-injector base bytestring containers ghc-prim monad-control
+         mtl persistent persistent-postgresql persistent-template
+         servant-auth-token servant-auth-token-api servant-server text time
+         transformers transformers-base uuid
+       ];
+       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
+       description = "Persistent backend for servant-auth-token server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-blaze" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
@@ -158861,27 +152675,29 @@ self: {
      }) {};
 
   "servant-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bytestring, deepseq, exceptions, hspec, http-api-data
-     , http-client, http-client-tls, http-media, http-types, HUnit
-     , network, network-uri, QuickCheck, safe, servant, servant-server
-     , string-conversions, text, transformers, transformers-compat, wai
-     , warp
+    ({ mkDerivation, aeson, attoparsec, base, base-compat
+     , base64-bytestring, bytestring, deepseq, exceptions, hspec
+     , http-api-data, http-client, http-client-tls, http-media
+     , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe
+     , servant, servant-server, string-conversions, text, transformers
+     , transformers-compat, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.8.1";
-       sha256 = "a007328f261e8d5596fee87cf541d0886bd1d644fb545fbb05fca683d8f8e33a";
+       version = "0.9.1.1";
+       sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724";
+       revision = "1";
+       editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5";
        libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring bytestring exceptions
-         http-api-data http-client http-client-tls http-media http-types
-         network-uri safe servant string-conversions text transformers
-         transformers-compat
+         aeson attoparsec base base-compat base64-bytestring bytestring
+         exceptions http-api-data http-client http-client-tls http-media
+         http-types mtl network-uri safe servant string-conversions text
+         transformers transformers-compat
        ];
        testHaskellDepends = [
-         aeson base bytestring deepseq hspec http-client http-media
-         http-types HUnit network QuickCheck servant servant-server text
-         transformers transformers-compat wai warp
+         aeson base base-compat bytestring deepseq hspec http-api-data
+         http-client http-media http-types HUnit network QuickCheck servant
+         servant-server text transformers transformers-compat wai warp
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
@@ -158978,24 +152794,23 @@ self: {
 
   "servant-docs" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
-     , bytestring-conversion, case-insensitive, control-monad-omega
-     , hashable, hspec, http-media, http-types, lens, servant
-     , string-conversions, text, unordered-containers
+     , case-insensitive, control-monad-omega, hashable, hspec
+     , http-media, http-types, lens, servant, string-conversions, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.8.1";
-       sha256 = "5a68ef0248da54fddf2fbba0a209a2bbba4144a576c681545b8019041645868d";
+       version = "0.9.1.1";
+       sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring bytestring-conversion
-         case-insensitive control-monad-omega hashable http-media http-types
-         lens servant string-conversions text unordered-containers
+         aeson aeson-pretty base bytestring case-insensitive
+         control-monad-omega hashable http-media http-types lens servant
+         string-conversions text unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring-conversion lens servant string-conversions
-         text
+         aeson base lens servant string-conversions text
        ];
        testHaskellDepends = [
          aeson base hspec lens servant string-conversions
@@ -159003,7 +152818,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-docs_0_10" = callPackage
@@ -159101,7 +152915,6 @@ self: {
        homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-examples" = callPackage
@@ -159132,8 +152945,8 @@ self: {
     ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
      mkDerivation {
        pname = "servant-foreign";
-       version = "0.8.1";
-       sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171";
+       version = "0.9.1.1";
+       sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca";
        libraryHaskellDepends = [ base http-types lens servant text ];
        testHaskellDepends = [ base hspec ];
        description = "Helpers for generating clients for servant APIs in any programming language";
@@ -159245,27 +153058,6 @@ self: {
      }) {};
 
   "servant-js" = callPackage
-    ({ mkDerivation, base, base-compat, charset, hspec
-     , hspec-expectations, language-ecmascript, lens, servant
-     , servant-foreign, text
-     }:
-     mkDerivation {
-       pname = "servant-js";
-       version = "0.8.1";
-       sha256 = "5f60d692953f9f5f1570c7fd6b1c8c524545e588b3f1c63669ef219dde8c0363";
-       libraryHaskellDepends = [
-         base base-compat charset lens servant servant-foreign text
-       ];
-       testHaskellDepends = [
-         base base-compat hspec hspec-expectations language-ecmascript lens
-         servant text
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Automatically derive javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-js_0_9_1" = callPackage
     ({ mkDerivation, base, base-compat, charset, hspec
      , hspec-expectations, language-ecmascript, lens, QuickCheck
      , servant, servant-foreign, text
@@ -159286,7 +153078,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-lucid" = callPackage
@@ -159451,31 +153242,6 @@ self: {
      }) {};
 
   "servant-purescript" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, http-types, lens, mainland-pretty, purescript-bridge
-     , servant, servant-foreign, servant-server, servant-subscriber
-     , text
-     }:
-     mkDerivation {
-       pname = "servant-purescript";
-       version = "0.3.1.5";
-       sha256 = "3bf4363b2154c7fb3e6da4eb9f5ef227c5e15d4cc6048342086d77426f74b9d5";
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath http-types lens
-         mainland-pretty purescript-bridge servant servant-foreign
-         servant-server servant-subscriber text
-       ];
-       testHaskellDepends = [
-         aeson base containers lens mainland-pretty purescript-bridge
-         servant servant-foreign servant-subscriber text
-       ];
-       homepage = "https://github.com/eskimor/servant-purescript#readme";
-       description = "Generate PureScript accessor functions for you servant API";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "servant-purescript_0_6_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, http-types, lens, mainland-pretty, purescript-bridge
      , servant, servant-foreign, servant-server, servant-subscriber
@@ -159500,6 +153266,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-pushbullet-client" = callPackage
+    ({ mkDerivation, aeson, base, http-api-data, http-client
+     , http-client-tls, microlens, microlens-th, scientific, servant
+     , servant-client, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-pushbullet-client";
+       version = "0.0.3.0";
+       sha256 = "f6374498a3f6cfd59b8562cd506408dcbd6805cb107d2a756c1e3700aef09b9d";
+       libraryHaskellDepends = [
+         aeson base http-api-data http-client http-client-tls microlens
+         microlens-th scientific servant servant-client text time
+         unordered-containers
+       ];
+       description = "Bindings to the Pushbullet API using servant-client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "servant-quickcheck" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring
      , case-insensitive, clock, data-default-class, hspec, hspec-core
@@ -159584,18 +153368,19 @@ self: {
 
   "servant-server" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
-     , base64-bytestring, bytestring, bytestring-conversion, containers
-     , directory, doctest, exceptions, filemanip, filepath, hspec
-     , hspec-wai, http-api-data, http-types, mtl, network, network-uri
-     , parsec, QuickCheck, safe, servant, should-not-typecheck, split
-     , string-conversions, system-filepath, temporary, text
-     , transformers, transformers-compat, wai, wai-app-static, wai-extra
-     , warp, word8
+     , base64-bytestring, bytestring, containers, directory, doctest
+     , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data
+     , http-types, mtl, network, network-uri, parsec, QuickCheck, safe
+     , servant, should-not-typecheck, split, string-conversions
+     , system-filepath, temporary, text, transformers
+     , transformers-compat, wai, wai-app-static, wai-extra, warp, word8
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.8.1";
-       sha256 = "2a662864df00ce431eb1a6d01245d65c1483847c6228c540e6374108fe84a2b2";
+       version = "0.9.1.1";
+       sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1";
+       revision = "1";
+       editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159606,11 +153391,11 @@ self: {
        ];
        executableHaskellDepends = [ aeson base servant text wai warp ];
        testHaskellDepends = [
-         aeson base base-compat base64-bytestring bytestring
-         bytestring-conversion directory doctest exceptions filemanip
-         filepath hspec hspec-wai http-types mtl network parsec QuickCheck
-         safe servant should-not-typecheck string-conversions temporary text
-         transformers transformers-compat wai wai-extra warp
+         aeson base base-compat base64-bytestring bytestring directory
+         doctest exceptions filemanip filepath hspec hspec-wai http-types
+         mtl network parsec QuickCheck safe servant should-not-typecheck
+         string-conversions temporary text transformers transformers-compat
+         wai wai-extra warp
        ];
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
@@ -162035,24 +155820,6 @@ self: {
      }) {};
 
   "simple-log" = callPackage
-    ({ mkDerivation, async, base, containers, deepseq, directory
-     , exceptions, filepath, mtl, SafeSemaphore, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "simple-log";
-       version = "0.4.0";
-       sha256 = "548c444505f70beb02b14b5b1e0c647acaa1879edc5699ef365ec516a9b55aa5";
-       libraryHaskellDepends = [
-         async base containers deepseq directory exceptions filepath mtl
-         SafeSemaphore text time transformers
-       ];
-       homepage = "http://github.com/mvoidex/simple-log";
-       description = "Simple log for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-log_0_5_1" = callPackage
     ({ mkDerivation, async, base, containers, deepseq, directory
      , exceptions, filepath, mtl, SafeSemaphore, text, time
      , transformers
@@ -162068,7 +155835,6 @@ self: {
        homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-log-syslog" = callPackage
@@ -163574,24 +157340,6 @@ self: {
      }) {};
 
   "smsaero" = callPackage
-    ({ mkDerivation, aeson, base, containers, http-api-data
-     , http-client, servant, servant-client, servant-docs, text, time
-     }:
-     mkDerivation {
-       pname = "smsaero";
-       version = "0.6.2";
-       sha256 = "32f2dcbde9d588e11cebba3149a5e3a9e915cb47e13de8a4466690a171d490ec";
-       libraryHaskellDepends = [
-         aeson base containers http-api-data http-client servant
-         servant-client servant-docs text time
-       ];
-       homepage = "https://github.com/GetShopTV/smsaero";
-       description = "SMSAero API and HTTP client based on servant library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "smsaero_0_7_1" = callPackage
     ({ mkDerivation, aeson, base, containers, http-api-data
      , http-client, servant, servant-client, servant-docs, text, time
      }:
@@ -164011,16 +157759,16 @@ self: {
      }) {};
 
   "snap-error-collector" = callPackage
-    ({ mkDerivation, async, base, containers, monad-loops
-     , MonadCatchIO-transformers, snap, stm, time, transformers
+    ({ mkDerivation, async, base, containers, lifted-base, monad-loops
+     , snap, stm, time, transformers
      }:
      mkDerivation {
        pname = "snap-error-collector";
-       version = "1.1.1";
-       sha256 = "9dadb634f69f0a9549c951c18c24c176db7c1b8024594563c55dfe00e6d21cac";
+       version = "1.1.2";
+       sha256 = "8c313ebefaa89447d6193d3346d37d46e198279fe4eb7218228da03fb3ba485c";
        libraryHaskellDepends = [
-         async base containers monad-loops MonadCatchIO-transformers snap
-         stm time transformers
+         async base containers lifted-base monad-loops snap stm time
+         transformers
        ];
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
@@ -165086,12 +158834,12 @@ self: {
     ({ mkDerivation, array, base, binary, bytestring, snappy }:
      mkDerivation {
        pname = "snappy-framing";
-       version = "0.1.0";
-       sha256 = "62c960bbe61da6afb89a7e78dacab87e19e0f627f39c76c211f045a42d99ffd4";
+       version = "0.1.1";
+       sha256 = "f01b99cfa2e8d2c677e45e1852e0ae0a00034b8318e69d84b1857936c8c24be5";
        libraryHaskellDepends = [ array base binary bytestring snappy ];
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
-       license = "unknown";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -165423,19 +159171,6 @@ self: {
      }) {};
 
   "socket" = callPackage
-    ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }:
-     mkDerivation {
-       pname = "socket";
-       version = "0.6.1.0";
-       sha256 = "c010f5b5c705483f52a8c1d45f07f57b49e8b61c07187bc3e50d658c72c409e6";
-       libraryHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [ async base bytestring tasty tasty-hunit ];
-       homepage = "https://github.com/lpeterse/haskell-socket";
-       description = "An extensible socket library";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "socket_0_7_0_0" = callPackage
     ({ mkDerivation, async, base, bytestring, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
@@ -165450,7 +159185,6 @@ self: {
        homepage = "https://github.com/lpeterse/haskell-socket";
        description = "An extensible socket library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -165471,8 +159205,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.6";
-       sha256 = "6ec1577c7f701253bc85a9df03379d77ae99c33d1db5ee4f7e6b06972701fb1a";
+       version = "1.3.7";
+       sha256 = "bbd92d2a6711e950e6bb2da8342a3e103c66638cad2207820c5cb6d8090fef0a";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -165610,30 +159344,6 @@ self: {
      }) {};
 
   "solga" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hashable
-     , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck
-     , resourcet, safe-exceptions, scientific, text
-     , unordered-containers, vector, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "solga";
-       version = "0.1.0.1";
-       sha256 = "4949717429b3698d619bca644fedb340b8f0eaac50e3e9b0b55007d9eb1db8ba";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-types resourcet
-         safe-exceptions text wai wai-extra
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hashable hspec hspec-wai hspec-wai-json
-         http-types QuickCheck scientific text unordered-containers vector
-         wai wai-extra
-       ];
-       homepage = "https://github.com/chpatrick/solga";
-       description = "Simple typesafe web routing";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "solga_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hashable
      , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck
      , resourcet, safe-exceptions, scientific, text
@@ -165655,7 +159365,6 @@ self: {
        homepage = "https://github.com/chpatrick/solga";
        description = "Simple typesafe web routing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "solga-swagger" = callPackage
@@ -166032,8 +159741,8 @@ self: {
 
   "sparkle" = callPackage
     ({ mkDerivation, base, binary, bytestring, choice
-     , distributed-closure, filepath, jni, jvm, process, regex-tdfa
-     , singletons, streaming, text, vector, zip-archive
+     , distributed-closure, filepath, jni, jvm, jvm-streaming, process
+     , regex-tdfa, singletons, streaming, text, vector, zip-archive
      }:
      mkDerivation {
        pname = "sparkle";
@@ -166043,7 +159752,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring choice distributed-closure jni jvm
-         singletons streaming text vector
+         jvm-streaming singletons streaming text vector
        ];
        executableHaskellDepends = [
          base bytestring filepath process regex-tdfa text zip-archive
@@ -166332,23 +160041,6 @@ self: {
      }) {};
 
   "speedy-slice" = callPackage
-    ({ mkDerivation, base, containers, lens, mcmc-types
-     , mwc-probability, pipes, primitive, transformers
-     }:
-     mkDerivation {
-       pname = "speedy-slice";
-       version = "0.1.5";
-       sha256 = "d072049b142e1df47a2a6b269dc7a9fc754a1ecd62ed5c6a6e8fb4122dd02441";
-       libraryHaskellDepends = [
-         base lens mcmc-types mwc-probability pipes primitive transformers
-       ];
-       testHaskellDepends = [ base containers mwc-probability ];
-       homepage = "http://github.com/jtobin/speedy-slice";
-       description = "Speedy slice sampling";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "speedy-slice_0_3_0" = callPackage
     ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types
      , mwc-probability, pipes, primitive, transformers
      }:
@@ -166364,7 +160056,6 @@ self: {
        homepage = "http://github.com/jtobin/speedy-slice";
        description = "Speedy slice sampling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -166884,8 +160575,8 @@ self: {
      }:
      mkDerivation {
        pname = "sproxy2";
-       version = "1.94.0";
-       sha256 = "3affef81be078269b7acbfa761d2e1fde761ee7b4e4fe6182a67e7278ae4a2cb";
+       version = "1.94.1";
+       sha256 = "be00dbeb5a81ecd38034ea549772eb3f3c94c8185a26c2f7de86c17084586e21";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167495,32 +161186,6 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , directory, exceptions, file-embed, filepath, hspec
-     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "0.1.8";
-       sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2";
-       revision = "2";
-       editedCabalFile = "293e587834fd528a8f1869027b1de5f3ea492597350688a86db36c18453757d9";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory exceptions
-         filepath megaparsec mtl template-haskell text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec text yaml
-       ];
-       homepage = "https://github.com/stackbuilders/stache";
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stache_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , directory, exceptions, file-embed, filepath, hspec
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
@@ -167544,7 +161209,6 @@ self: {
        homepage = "https://github.com/stackbuilders/stache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
@@ -167814,52 +161478,6 @@ self: {
      }) {};
 
   "stackage-curator" = callPackage
-    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
-     , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
-     , classy-prelude-conduit, conduit, conduit-extra, containers
-     , cryptohash, cryptohash-conduit, data-default-class, directory
-     , exceptions, filepath, hashable, hspec, html-conduit, http-client
-     , http-client-tls, http-conduit, lucid, mime-types, monad-unlift
-     , monad-unlift-ref, mono-traversable, mtl, old-locale
-     , optparse-applicative, optparse-simple, process, QuickCheck
-     , resourcet, safe, semigroups, stm, store, streaming-commons, syb
-     , system-fileio, system-filepath, tar, temporary, text, time
-     , transformers, unix-compat, unordered-containers, utf8-string
-     , vector, xml-conduit, xml-types, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "stackage-curator";
-       version = "0.14.3";
-       sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson amazonka amazonka-core amazonka-s3 async base
-         base16-bytestring blaze-html byteable bytestring Cabal
-         classy-prelude-conduit conduit conduit-extra containers cryptohash
-         cryptohash-conduit data-default-class directory exceptions filepath
-         hashable html-conduit http-client http-client-tls http-conduit
-         lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl
-         old-locale process resourcet safe semigroups stm store
-         streaming-commons syb system-fileio system-filepath tar temporary
-         text time transformers unix-compat unordered-containers utf8-string
-         vector xml-conduit xml-types yaml zlib
-       ];
-       executableHaskellDepends = [
-         aeson base http-client http-client-tls optparse-applicative
-         optparse-simple system-filepath text
-       ];
-       testHaskellDepends = [
-         base Cabal classy-prelude-conduit containers directory hspec
-         http-client http-client-tls QuickCheck text yaml
-       ];
-       homepage = "https://github.com/fpco/stackage-curator";
-       description = "Tools for curating Stackage bundles";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "stackage-curator_0_14_5" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
@@ -169284,46 +162902,6 @@ self: {
      }) {};
 
   "store" = callPackage
-    ({ mkDerivation, array, base, base-orphans, base64-bytestring
-     , bytestring, cereal, cereal-vector, conduit, containers, criterion
-     , cryptohash, deepseq, directory, fail, filepath, ghc-prim
-     , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base
-     , monad-control, mono-traversable, primitive, resourcet, safe
-     , semigroups, smallcheck, store-core, syb, template-haskell, text
-     , th-lift, th-lift-instances, th-orphans, th-reify-many
-     , th-utilities, time, transformers, unordered-containers, vector
-     , vector-binary-instances, void, weigh
-     }:
-     mkDerivation {
-       pname = "store";
-       version = "0.2.1.2";
-       sha256 = "5accb9a9aa79fd5dbc315b398a926722dee424935271c9a6cb90aea84f3e1cad";
-       libraryHaskellDepends = [
-         array base base-orphans base64-bytestring bytestring conduit
-         containers cryptohash deepseq directory fail filepath ghc-prim
-         hashable hspec hspec-smallcheck integer-gmp lifted-base
-         monad-control mono-traversable primitive resourcet safe semigroups
-         smallcheck store-core syb template-haskell text th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unordered-containers vector void
-       ];
-       testHaskellDepends = [
-         array base base-orphans base64-bytestring bytestring cereal
-         cereal-vector conduit containers criterion cryptohash deepseq
-         directory fail filepath ghc-prim hashable hspec hspec-smallcheck
-         integer-gmp lifted-base monad-control mono-traversable primitive
-         resourcet safe semigroups smallcheck store-core syb
-         template-haskell text th-lift th-lift-instances th-orphans
-         th-reify-many th-utilities time transformers unordered-containers
-         vector vector-binary-instances void weigh
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast binary serialization";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "store_0_3" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
      , containers, criterion, cryptohash, deepseq, directory, filepath
@@ -169367,22 +162945,6 @@ self: {
      }) {};
 
   "store-core" = callPackage
-    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "store-core";
-       version = "0.2.0.2";
-       sha256 = "025f6d186f96329d1f0b76e2e2753e78852413896d19917856c096bf22e6420e";
-       libraryHaskellDepends = [
-         base bytestring fail ghc-prim primitive text transformers
-       ];
-       homepage = "https://github.com/fpco/store#readme";
-       description = "Fast and lightweight binary serialization";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "store-core_0_3" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
      }:
@@ -169396,7 +162958,6 @@ self: {
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast and lightweight binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "str" = callPackage
@@ -169418,34 +162979,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
-     , hlint, lens, tasty, tasty-hspec, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.1.6";
-       sha256 = "16f6aefde00cb48105506b8f396f61d32947a36456a29a377da512d40b81aae1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring lens template-haskell text
-         unordered-containers
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty base bytestring lens template-haskell text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring directory hlint lens tasty
-         tasty-hspec template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_4_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
      , unordered-containers
@@ -169465,7 +162998,6 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -169986,6 +163518,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "strict-writer" = callPackage
+    ({ mkDerivation, base, doctest, mtl }:
+     mkDerivation {
+       pname = "strict-writer";
+       version = "0.4.0.0";
+       sha256 = "bae1b58384f96a61eb491dc432d5fe6551fe2d5cfb0f0c3c736a819a12844caa";
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/oisdk/strict-writer";
+       description = "A stricter writer, which uses StateT in order to avoid space leaks";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "strictify" = callPackage
     ({ mkDerivation, base, directory, filepath, process, unix }:
      mkDerivation {
@@ -170304,8 +163849,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-core";
-       version = "2.1.0";
-       sha256 = "74d48a1db4244258b1850e2e657cb53fabe1d280638530a1f730e46538973ce5";
+       version = "2.2.0";
+       sha256 = "ca694e710f1670ea844e8f65ab483b9acb24e27dc26de1f8500b11d8f13af559";
        libraryHaskellDepends = [
          aeson base bytestring mtl text time transformers
          unordered-containers
@@ -170319,8 +163864,8 @@ self: {
     ({ mkDerivation, base, stripe-core, stripe-http-streams }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "2.1.0";
-       sha256 = "83f88fe7c264ee30b7da8e0630f0efeee722677d745705cc2059ea9ba3d82775";
+       version = "2.2.0";
+       sha256 = "f69fe32fd135a802587339d5043411f030cb2e2627df739193252f3015e971a0";
        libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
@@ -170334,8 +163879,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-http-streams";
-       version = "2.1.0";
-       sha256 = "053e696d1f2d671594bd0ffe70e473f54fb551bee0bdf040222e7a995174301e";
+       version = "2.2.0";
+       sha256 = "83b86304a51975625196dfac2db567e82e93ae437ef4fdd26204061c360ac07a";
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
@@ -170347,7 +163892,25 @@ self: {
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {stripe-tests = null;};
+     }) {};
+
+  "stripe-tests" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core
+     , mtl, random, stripe-core, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "stripe-tests";
+       version = "2.2.0";
+       sha256 = "7a7c5771408807509ed5708ed7e9e6f7d10d8e6d39ecaf7a1fce0b61b73b4913";
+       libraryHaskellDepends = [
+         aeson base bytestring free hspec hspec-core mtl random stripe-core
+         text time transformers unordered-containers
+       ];
+       homepage = "https://github.com/dmjio/stripe-haskell";
+       description = "Tests for Stripe API bindings for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
 
   "strips" = callPackage
     ({ mkDerivation, base, containers, hspec, mtl }:
@@ -170574,35 +164137,6 @@ self: {
      }) {};
 
   "stylish-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
-     , strict, syb, test-framework, test-framework-hunit, yaml
-     }:
-     mkDerivation {
-       pname = "stylish-haskell";
-       version = "0.6.1.0";
-       sha256 = "eef85fe3940779e092c3a3ffa26c17ae6c96625a5fa606f0c816a37fce357b0d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl syb yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl optparse-applicative strict syb yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
-         yaml
-       ];
-       homepage = "https://github.com/jaspervdj/stylish-haskell";
-       description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stylish-haskell_0_7_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
      , strict, syb, test-framework, test-framework-hunit, yaml
@@ -170629,7 +164163,6 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylized" = callPackage
@@ -171190,23 +164723,6 @@ self: {
      }) {};
 
   "svg-tree" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
-     , vector, xml
-     }:
-     mkDerivation {
-       pname = "svg-tree";
-       version = "0.5.1.2";
-       sha256 = "0c285cf21203555c7d7179e6c3924c0ba1b5e03ed42dacf596ff891317893da0";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "svg-tree_0_6" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
      , vector, xml
@@ -171221,7 +164737,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg2q" = callPackage
@@ -171338,23 +164853,6 @@ self: {
      }) {};
 
   "swagger" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "swagger";
-       version = "0.2.2";
-       sha256 = "19ffcf443fd03a87258fb4b3225166315d0fd835a7539ea70d7992619329ecc2";
-       libraryHaskellDepends = [
-         aeson base bytestring text time transformers
-       ];
-       testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ];
-       description = "Implementation of swagger data model";
-       license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "swagger_0_3_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text
      , time, transformers
      }:
@@ -173654,6 +167152,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-auto_0_1_0_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-auto";
+       version = "0.1.0.2";
+       sha256 = "d76076b780cce1a83b50b4602928d3756a5df72f4294e50b5f1499c5f6381a1c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/minad/tasty-auto#readme";
+       description = "Auto discovery for Tasty with support for ingredients and test tree generation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, tagged, tasty }:
      mkDerivation {
@@ -173984,6 +167504,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-stats" = callPackage
+    ({ mkDerivation, base, containers, directory, process, stm, tagged
+     , tasty, time
+     }:
+     mkDerivation {
+       pname = "tasty-stats";
+       version = "0.2.0.0";
+       sha256 = "73a1e34f30eeddf2e855c1c8813338ae4aa23f29ea74f4c0272f0e6de5007e9d";
+       libraryHaskellDepends = [
+         base containers directory process stm tagged tasty time
+       ];
+       homepage = "https://github.com/minad/tasty-stats#readme";
+       description = "Collect statistics of your Tasty testsuite in a CSV file";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -174135,30 +167671,6 @@ self: {
      }) {};
 
   "tcp-streams" = callPackage
-    ({ mkDerivation, base, bytestring, data-default-class, HsOpenSSL
-     , HsOpenSSL-x509-system, HUnit, io-streams, network, openssl, pem
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, tls, x509, x509-store, x509-system
-     }:
-     mkDerivation {
-       pname = "tcp-streams";
-       version = "0.4.0.0";
-       sha256 = "e6ada5a4c34cb8653bd03c5db43229f8f954bc0eda60e8169b4fd1c4156a0824";
-       libraryHaskellDepends = [
-         base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system
-         io-streams network pem tls x509 x509-store x509-system
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [
-         base bytestring HUnit io-streams network QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
-       ];
-       description = "One stop solution for tcp client and server with tls support";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) openssl;};
-
-  "tcp-streams_0_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, directory
      , HUnit, io-streams, network, pem, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, tls, x509
@@ -174785,26 +168297,6 @@ self: {
      }) {};
 
   "terminal-progress-bar" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans
-     , test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "terminal-progress-bar";
-       version = "0.0.1.4";
-       sha256 = "a36b3a305c58def80aa01fc2df46f4c15ea411a4531dd1723784e839448cbb51";
-       libraryHaskellDepends = [
-         base base-unicode-symbols stm stm-chans
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols HUnit test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/roelvandijk/terminal-progress-bar";
-       description = "A simple progress bar in the terminal";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "terminal-progress-bar_0_1_1" = callPackage
     ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework
      , test-framework-hunit
      }:
@@ -174947,24 +168439,6 @@ self: {
      }) {};
 
   "test-fixture" = callPackage
-    ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl
-     , template-haskell, th-to-exp, transformers
-     }:
-     mkDerivation {
-       pname = "test-fixture";
-       version = "0.4.2.0";
-       sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a";
-       libraryHaskellDepends = [ base data-default mtl template-haskell ];
-       testHaskellDepends = [
-         base hspec hspec-discover mtl template-haskell th-to-exp
-         transformers
-       ];
-       homepage = "http://github.com/cjdev/test-fixture#readme";
-       description = "Test monadic side-effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "test-fixture_0_5_0_0" = callPackage
     ({ mkDerivation, base, data-default, haskell-src-exts
      , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell
      , th-orphans, th-to-exp, transformers
@@ -174984,7 +168458,6 @@ self: {
        homepage = "http://github.com/cjdev/test-fixture#readme";
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework" = callPackage
@@ -175503,27 +168976,6 @@ self: {
      }) {};
 
   "texmath" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "texmath";
-       version = "0.8.6.7";
-       sha256 = "9e5fd9571a7257bdc8cfa6e0da077b16e867011a9f813065d68dd046bd358c88";
-       libraryHaskellDepends = [
-         base containers mtl pandoc-types parsec syb xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath process split temporary text
-         utf8-string xml
-       ];
-       homepage = "http://github.com/jgm/texmath";
-       description = "Conversion between formats used to represent mathematics";
-       license = "GPL";
-     }) {};
-
-  "texmath_0_9_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
@@ -175542,7 +168994,6 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -175927,19 +169378,6 @@ self: {
      }) {};
 
   "text-metrics" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, text }:
-     mkDerivation {
-       pname = "text-metrics";
-       version = "0.1.0";
-       sha256 = "b7af083250d9debefa2ef85b53aeab2e90b4939705f5f14df8af5b173d679b4f";
-       libraryHaskellDepends = [ base text ];
-       testHaskellDepends = [ base hspec QuickCheck text ];
-       homepage = "https://github.com/mrkkrp/text-metrics";
-       description = "Calculate various string metrics efficiently";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-metrics_0_2_0" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, text }:
      mkDerivation {
        pname = "text-metrics";
@@ -175950,7 +169388,6 @@ self: {
        homepage = "https://github.com/mrkkrp/text-metrics";
        description = "Calculate various string metrics efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-normal" = callPackage
@@ -176086,37 +169523,6 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
-     , bytestring, bytestring-builder, containers, contravariant
-     , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
-     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
-     , tagged, template-haskell, text, th-lift, transformers
-     , transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.4";
-       sha256 = "ce8a7adcca87617766a4c988808ff41fee20a2c84ac5442d6f3d8c5cec55d7c7";
-       libraryHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant generic-deriving ghc-boot-th ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text th-lift
-         transformers transformers-compat void
-       ];
-       testHaskellDepends = [
-         array base base-compat base-orphans bifunctors bytestring
-         bytestring-builder containers contravariant deriving-compat
-         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
-         QuickCheck quickcheck-instances semigroups tagged template-haskell
-         text th-lift transformers transformers-compat void
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show";
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "text-show_3_4_1_1" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
      , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
@@ -176148,40 +169554,6 @@ self: {
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
-     , containers, directory, generic-deriving, ghc-boot, ghc-prim
-     , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
-     , QuickCheck, quickcheck-instances, random, semigroups, tagged
-     , template-haskell, terminfo, text, text-show, th-orphans, time
-     , transformers, transformers-compat, unix, unordered-containers
-     , vector, xhtml
-     }:
-     mkDerivation {
-       pname = "text-show-instances";
-       version = "3.4";
-       sha256 = "bf2e9e4a8ed01481024cce33a611daf52d733527e2ceb2ef2a576cf79ace6322";
-       libraryHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         ghc-boot haskeline hoopl hpc old-locale old-time pretty random
-         semigroups tagged template-haskell terminfo text text-show time
-         transformers transformers-compat unix unordered-containers vector
-         xhtml
-       ];
-       testHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         generic-deriving ghc-boot ghc-prim haskeline hoopl hpc hspec
-         old-locale old-time pretty QuickCheck quickcheck-instances random
-         semigroups tagged template-haskell terminfo text text-show
-         th-orphans time transformers transformers-compat unix
-         unordered-containers vector xhtml
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show-instances";
-       description = "Additional instances for text-show";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "text-show-instances_3_5" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
@@ -177492,8 +170864,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.0.4";
-       sha256 = "64fe33564b370cb906fa877d5f130c25618800351c12bc6fb6fed77edd3af1ae";
+       version = "0.1.1.0";
+       sha256 = "008b976ca9b9bbd5ebe620e64bddccde31e0eed95ddcda20378cac96d3ca8115";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -177697,8 +171069,8 @@ self: {
      }:
      mkDerivation {
        pname = "tighttp";
-       version = "0.0.0.9";
-       sha256 = "8b73c5ae1f631621b3e67f9665e5b1dc886c60b16f608f3f929653c21dae1b96";
+       version = "0.0.0.10";
+       sha256 = "bf75164be06ef3de8c3b8bd8b915864b940ac8511ff0860fd5868553ed390160";
        libraryHaskellDepends = [
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
@@ -179650,12 +173022,15 @@ self: {
      }) {};
 
   "transformers-eff" = callPackage
-    ({ mkDerivation, base, free, mmorph, pipes, transformers }:
+    ({ mkDerivation, base, free, list-transformer, mmorph, transformers
+     }:
      mkDerivation {
        pname = "transformers-eff";
-       version = "0.1.0.0";
-       sha256 = "577f7ce07459239b1039d9f8c2935c02cc55bc585a5a4d21f5a81ac758f20037";
-       libraryHaskellDepends = [ base free mmorph pipes transformers ];
+       version = "0.2.0.0";
+       sha256 = "16be6a4fcb355a9295b62853106c947ae690221eee140f779faee905d77e48d9";
+       libraryHaskellDepends = [
+         base free list-transformer mmorph transformers
+       ];
        homepage = "https://github.com/ocharles/transformers-eff";
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
        license = stdenv.lib.licenses.bsd3;
@@ -179898,17 +173273,6 @@ self: {
      }) {};
 
   "tree-view" = callPackage
-    ({ mkDerivation, base, containers, mtl }:
-     mkDerivation {
-       pname = "tree-view";
-       version = "0.4";
-       sha256 = "f64de6b9461d125fa4755fc98b6921a7a53cb4f096f88692fe86dd68cde5fe57";
-       libraryHaskellDepends = [ base containers mtl ];
-       description = "Render trees as foldable HTML and Unicode art";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tree-view_0_5" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
        pname = "tree-view";
@@ -179919,7 +173283,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Render trees as foldable HTML and Unicode art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "treemap" = callPackage
@@ -180411,30 +173774,6 @@ self: {
      }) {};
 
   "tttool" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , directory, executable-path, filepath, hashable, haskeline, HPDF
-     , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
-     , process, random, split, spool, template-haskell, time, vector
-     , yaml, zlib
-     }:
-     mkDerivation {
-       pname = "tttool";
-       version = "1.6.1.2";
-       sha256 = "8f5f05c91ea4f50e43924618090f7806e0649dc83edd8c1af0e05d9032098384";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base binary bytestring containers directory executable-path
-         filepath hashable haskeline HPDF JuicyPixels mtl natural-sort
-         optparse-applicative parsec process random split spool
-         template-haskell time vector yaml zlib
-       ];
-       homepage = "https://github.com/entropia/tip-toi-reveng";
-       description = "Working with files for the Tiptoi® pen";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tttool_1_7_0_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline, HPDF
      , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec
@@ -180456,7 +173795,6 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tubes" = callPackage
@@ -180711,26 +174049,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, async, base, clock, directory, doctest, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , stm, system-fileio, system-filepath, temporary, text, time
-     , transformers, unix
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.2.8";
-       sha256 = "798e4047773877323eb35e610e709db70880d2913ff652ff676a97902a6fbb01";
-       libraryHaskellDepends = [
-         async base clock directory foldl hostname managed optional-args
-         optparse-applicative process stm system-fileio system-filepath
-         temporary text time transformers unix
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_3_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , directory, doctest, foldl, hostname, managed, optional-args
      , optparse-applicative, process, stm, system-fileio
@@ -180750,7 +174068,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -181828,19 +175145,6 @@ self: {
      }) {};
 
   "type-spec" = callPackage
-    ({ mkDerivation, base, pretty, show-type }:
-     mkDerivation {
-       pname = "type-spec";
-       version = "0.2.0.0";
-       sha256 = "8203f98c53d9d533da9e20e6e3c74ed5d144fad2ee21f58d8b3addd78cd172fa";
-       libraryHaskellDepends = [ base pretty show-type ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/sheyll/type-spec#readme";
-       description = "Type Level Specification by Example";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-spec_0_3_0_1" = callPackage
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "type-spec";
@@ -181851,7 +175155,6 @@ self: {
        homepage = "https://github.com/sheyll/type-spec#readme";
        description = "Type Level Specification by Example";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-spine" = callPackage
@@ -182818,21 +176121,6 @@ self: {
      }) {};
 
   "unfoldable" = callPackage
-    ({ mkDerivation, base, ghc-prim, QuickCheck, random, transformers
-     }:
-     mkDerivation {
-       pname = "unfoldable";
-       version = "0.8.4";
-       sha256 = "af86e863625d4ae45820d1942a49de00559e4d4ee25db20610859d0a19cc1683";
-       libraryHaskellDepends = [
-         base ghc-prim QuickCheck random transformers
-       ];
-       homepage = "https://github.com/sjoerdvisscher/unfoldable";
-       description = "Class of data structures that can be unfolded";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unfoldable_0_9_2" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
      }:
@@ -182846,7 +176134,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable-restricted" = callPackage
@@ -183080,19 +176367,6 @@ self: {
      }) {};
 
   "unicode-transforms" = callPackage
-    ({ mkDerivation, base, bytestring, split, text }:
-     mkDerivation {
-       pname = "unicode-transforms";
-       version = "0.1.0.1";
-       sha256 = "5fe607ec91e1cf25db1842e7409d4ed0e1bb6829409e846e010db25b2c75cb0b";
-       libraryHaskellDepends = [ base bytestring text ];
-       testHaskellDepends = [ base split text ];
-       homepage = "http://github.com/harendra-kumar/unicode-transforms";
-       description = "Unicode transforms (normalization NFC/NFD/NFKC/NFKD)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unicode-transforms_0_2_1" = callPackage
     ({ mkDerivation, base, bitarray, bytestring, deepseq
      , getopt-generics, QuickCheck, split, text
      }:
@@ -183107,7 +176381,6 @@ self: {
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicoder" = callPackage
@@ -183251,6 +176524,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uniq-deep" = callPackage
+    ({ mkDerivation, base, bytestring, containers }:
+     mkDerivation {
+       pname = "uniq-deep";
+       version = "1.1.0.0";
+       sha256 = "f8953f91cbf90c5073ca90d4e9235dbe0a399ff811709d051b037a8a7db0d38e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring containers ];
+       homepage = "https://github.com/ncaq/uniq-deep";
+       description = "uniq-deep";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "unique" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable }:
      mkDerivation {
@@ -183423,6 +176710,46 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unitym" = callPackage
+    ({ mkDerivation, base, text, transformers }:
+     mkDerivation {
+       pname = "unitym";
+       version = "0.1.0.2";
+       sha256 = "5a22f2e26ba053af73d9c92d37fa41bae147f59ac49a4c412fb725e5c5d93b9b";
+       libraryHaskellDepends = [ base text transformers ];
+       homepage = "https://github.com/bhurt/unitym#readme";
+       description = "A monad type class shared between web services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "unitym-servant" = callPackage
+    ({ mkDerivation, base, mtl, servant-server, text, transformers
+     , unitym
+     }:
+     mkDerivation {
+       pname = "unitym-servant";
+       version = "0.1.0.0";
+       sha256 = "3394f5c1568116c3ad3283cece89e2c2ece74b93c3a644e4b2ba481ceeb0acf0";
+       libraryHaskellDepends = [
+         base mtl servant-server text transformers unitym
+       ];
+       homepage = "https://github.com/bhurt/unitym#readme";
+       description = "Implementaation of unitym for Servant servers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "unitym-yesod" = callPackage
+    ({ mkDerivation, base, unitym, yesod }:
+     mkDerivation {
+       pname = "unitym-yesod";
+       version = "0.1.0.2";
+       sha256 = "dc0fef13cc5142c8bf9df62916f3284ab34dcc1dcca56efc9f05fbc1398ee0e1";
+       libraryHaskellDepends = [ base unitym yesod ];
+       homepage = "https://github.com/bhurt/unitym#readme";
+       description = "Implementation of the unity monad for the Yesod framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "universal-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -184068,6 +177395,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "update-repos" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , monad-parallel, process, QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "update-repos";
+       version = "0.0.1";
+       sha256 = "5bdba9fecbeb9aee916fdb38a6c8586d9a389544700c50515e243ad51a7ab47b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory filepath monad-parallel process split
+         text
+       ];
+       executableHaskellDepends = [
+         base directory filepath monad-parallel split
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/pedrovgs/update-repos";
+       description = "Update all your git repositories with just one command";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "uploadcare" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptohash
      , hex, http-conduit, http-types, old-locale, time
@@ -185445,22 +178795,6 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
-     mkDerivation {
-       pname = "varying";
-       version = "0.5.0.3";
-       sha256 = "a1eff74bb76c4a6b6af64f4490621f3c8a24deec7d44032dfb90e02fc2c73039";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base transformers ];
-       executableHaskellDepends = [ base time transformers ];
-       testHaskellDepends = [ base hspec QuickCheck time transformers ];
-       homepage = "https://github.com/schell/varying";
-       description = "FRP through value streams and monadic splines";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "varying_0_7_0_3" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
      mkDerivation {
        pname = "varying";
@@ -185474,7 +178808,6 @@ self: {
        homepage = "https://github.com/schell/varying";
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault" = callPackage
@@ -185990,22 +179323,6 @@ self: {
      }) {};
 
   "vector-instances" = callPackage
-    ({ mkDerivation, base, comonad, keys, pointed, semigroupoids
-     , semigroups, vector
-     }:
-     mkDerivation {
-       pname = "vector-instances";
-       version = "3.3.1";
-       sha256 = "68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59";
-       libraryHaskellDepends = [
-         base comonad keys pointed semigroupoids semigroups vector
-       ];
-       homepage = "http://github.com/ekmett/vector-instances";
-       description = "Orphan Instances for 'Data.Vector'";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vector-instances_3_4" = callPackage
     ({ mkDerivation, base, comonad, hashable, keys, pointed
      , semigroupoids, semigroups, vector
      }:
@@ -186019,7 +179336,6 @@ self: {
        homepage = "http://github.com/ekmett/vector-instances";
        description = "Orphan Instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-instances-collections" = callPackage
@@ -186912,42 +180228,6 @@ self: {
      }) {inherit (pkgs.gnome2) vte;};
 
   "vty" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
-     , data-default, deepseq, directory, filepath, hashable, HUnit
-     , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec
-     , QuickCheck, quickcheck-assertions, random, smallcheck, stm
-     , string-qq, terminfo, test-framework, test-framework-hunit
-     , test-framework-smallcheck, text, transformers, unix, utf8-string
-     , vector
-     }:
-     mkDerivation {
-       pname = "vty";
-       version = "5.11.3";
-       sha256 = "0ee3fc39e8e5219b551bfc26ee38e9342e38b028480dacc2e6ac87fab5380232";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers data-default deepseq
-         directory filepath hashable microlens microlens-mtl microlens-th
-         mtl parallel parsec stm terminfo text transformers unix utf8-string
-         vector
-       ];
-       executableHaskellDepends = [
-         base containers data-default microlens microlens-mtl mtl
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring Cabal containers data-default deepseq
-         HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions
-         random smallcheck stm string-qq terminfo test-framework
-         test-framework-hunit test-framework-smallcheck text unix
-         utf8-string vector
-       ];
-       homepage = "https://github.com/coreyoconnor/vty";
-       description = "A simple terminal UI library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vty_5_15" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , deepseq, directory, filepath, hashable, HUnit, microlens
      , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
@@ -186980,7 +180260,6 @@ self: {
        homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-examples" = callPackage
@@ -187818,36 +181097,6 @@ self: {
      }) {};
 
   "wai-middleware-content-type" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
-     , clay, exceptions, hashable, hspec, hspec-wai, http-media
-     , http-types, lucid, mmorph, monad-control, monad-logger, mtl
-     , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec
-     , text, transformers, transformers-base, unordered-containers
-     , urlpath, wai, wai-transformers, warp
-     }:
-     mkDerivation {
-       pname = "wai-middleware-content-type";
-       version = "0.4.1";
-       sha256 = "99dcd8ae5da77650d31a1cd91d43d93c1a18687cd8947a3ea32cb1424229743e";
-       libraryHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable http-media http-types lucid mmorph monad-control
-         monad-logger mtl pandoc resourcet shakespeare text transformers
-         transformers-base unordered-containers urlpath wai wai-transformers
-       ];
-       testHaskellDepends = [
-         aeson base blaze-builder blaze-html bytestring clay exceptions
-         hashable hspec hspec-wai http-media http-types lucid mmorph
-         monad-control monad-logger mtl pandoc pandoc-types resourcet
-         shakespeare tasty tasty-hspec text transformers transformers-base
-         unordered-containers urlpath wai wai-transformers warp
-       ];
-       description = "Route to different middlewares based on the incoming Accept header";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "wai-middleware-content-type_0_5_0_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , clay, exceptions, hashable, hspec, hspec-wai, http-media
      , http-types, lucid, mmorph, monad-control, monad-logger, mtl
@@ -188834,6 +182083,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wavefront_0_7_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "wavefront";
+       version = "0.7.0.3";
+       sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65";
+       libraryHaskellDepends = [
+         attoparsec base dlist filepath mtl text transformers vector
+       ];
+       homepage = "https://github.com/phaazon/wavefront";
+       description = "Wavefront OBJ loader";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wavefront-obj" = callPackage
     ({ mkDerivation, attoparsec, base, containers, hspec, linear, text
      , transformers
@@ -189653,32 +182919,6 @@ self: {
      }) {};
 
   "websockets" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , blaze-builder, bytestring, case-insensitive, containers, entropy
-     , HUnit, network, QuickCheck, random, SHA, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
-       version = "0.9.8.2";
-       sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2";
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy network random SHA text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy HUnit network QuickCheck random
-         SHA test-framework test-framework-hunit test-framework-quickcheck2
-         text
-       ];
-       doCheck = false;
-       homepage = "http://jaspervdj.be/websockets";
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_10_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers, entropy
      , HUnit, network, QuickCheck, random, SHA, test-framework
@@ -189702,7 +182942,6 @@ self: {
        homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-snap" = callPackage
@@ -189792,6 +183031,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weighted" = callPackage
+    ({ mkDerivation, base, mtl, semiring-num, transformers }:
+     mkDerivation {
+       pname = "weighted";
+       version = "0.3.0.0";
+       sha256 = "6d30cf0d4a833f82ed2e44e22c81658e55744f53308a25a895eaf7bc940131cb";
+       libraryHaskellDepends = [ base mtl semiring-num transformers ];
+       homepage = "https://github.com/oisdk/weighted";
+       description = "Writer monad which uses semiring constraint";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "weighted-regexp" = callPackage
     ({ mkDerivation, array, base, happy }:
      mkDerivation {
@@ -190033,12 +183284,14 @@ self: {
      }) {};
 
   "wide-word" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, hspec, QuickCheck }:
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "wide-word";
-       version = "0.1.0.1";
-       sha256 = "d822ae64cf7edae19d7893d6b57e1d3fe6acf28a5c077e00b47bb865058df4cb";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "0.1.0.2";
+       sha256 = "c5fa2df76b8391b34f5671c6280bedecd56ee6600db260bd4942bc91cacb41fb";
+       libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
        homepage = "https://github.com/erikd/wide-word";
        description = "Data types for large but fixed width signed and unsigned integers";
@@ -190060,23 +183313,6 @@ self: {
      }) {};
 
   "wikicfp-scraper" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
-     , scalpel, text, time
-     }:
-     mkDerivation {
-       pname = "wikicfp-scraper";
-       version = "0.1.0.7";
-       sha256 = "1e76ab2361c54b4f68dbe9c099f1e36144b405927abd69e6ee09c2292f65c582";
-       libraryHaskellDepends = [
-         attoparsec base bytestring scalpel text time
-       ];
-       testHaskellDepends = [ base bytestring filepath hspec time ];
-       homepage = "https://github.com/debug-ito/wikicfp-scraper";
-       description = "Scrape WikiCFP web site";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wikicfp-scraper_0_1_0_8" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec
      , scalpel-core, text, time
      }:
@@ -190091,7 +183327,6 @@ self: {
        homepage = "https://github.com/debug-ito/wikicfp-scraper";
        description = "Scrape WikiCFP web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wikipedia4epub" = callPackage
@@ -190171,8 +183406,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-x11";
-       version = "0.1.0.5";
-       sha256 = "655f263a134e26a45b1001f7ea861743dbdbd30e69ea4808050c5d3178d557e1";
+       version = "0.1.0.6";
+       sha256 = "1e144b2833acee00da55cab3b28b57bc5347186f761cb1d7375532cfca38e4b4";
        libraryHaskellDepends = [
          base containers fold-debounce stm text transformers wild-bind X11
        ];
@@ -192170,34 +185405,6 @@ self: {
      }) {};
 
   "xlsx" = callPackage
-    ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
-     , conduit, containers, data-default, Diff, errors, extra, filepath
-     , groom, lens, mtl, mtl-compat, network-uri, old-locale
-     , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xml-conduit
-     , zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.2.4";
-       sha256 = "e0b424417fb04d885b78eccde94d10bd28be59184b0bbbedf321fc15a2f23d40";
-       libraryHaskellDepends = [
-         base base64-bytestring binary-search bytestring conduit containers
-         data-default errors extra filepath lens mtl mtl-compat network-uri
-         old-locale safe text time transformers vector xml-conduit
-         zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck time vector
-         xml-conduit
-       ];
-       homepage = "https://github.com/qrilka/xlsx";
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xlsx_0_4_2" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary-search, bytestring
      , conduit, containers, data-default, Diff, errors, extra, filepath
      , groom, lens, mtl, mtl-compat, network-uri, old-locale
@@ -192223,27 +185430,9 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-tabular" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , lens, text, xlsx
-     }:
-     mkDerivation {
-       pname = "xlsx-tabular";
-       version = "0.1.0.1";
-       sha256 = "29efb942a99bd0afe4ffda1856a51354b9ffa44253574b307f51bb2f05cf539a";
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default lens text xlsx
-       ];
-       testHaskellDepends = [ base ];
-       homepage = "http://github.com/kkazuo/xlsx-tabular#readme";
-       description = "Xlsx table decode utility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xlsx-tabular_0_2_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , lens, text, xlsx
      }:
@@ -192258,7 +185447,6 @@ self: {
        homepage = "https://github.com/kkazuo/xlsx-tabular";
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -192328,30 +185516,6 @@ self: {
      }) {};
 
   "xml-conduit" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, conduit, conduit-extra, containers
-     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
-     , text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.3.5";
-       sha256 = "25635a066b6a17a0d6c038ddf974a48b6d455d8fa14989f99341703da344dc83";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         conduit conduit-extra containers data-default deepseq monad-control
-         resourcet text transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       homepage = "http://github.com/snoyberg/xml";
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xml-conduit_1_4_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -192373,7 +185537,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -192542,6 +185705,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xml-html-qq" = callPackage
+    ({ mkDerivation, base, blaze-markup, conduit, data-default, doctest
+     , from-sum, Glob, heterocephalus, html-conduit, resourcet, tasty
+     , tasty-hunit, template-haskell, text, th-lift, th-lift-instances
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "xml-html-qq";
+       version = "0.1.0.1";
+       sha256 = "1a2ebb1f4ca58a4f442c470db6d3271e6b1069d41860f8683b5da9082329235a";
+       libraryHaskellDepends = [
+         base blaze-markup conduit data-default from-sum heterocephalus
+         html-conduit resourcet template-haskell text th-lift
+         th-lift-instances xml-conduit
+       ];
+       testHaskellDepends = [
+         base doctest Glob tasty tasty-hunit text xml-conduit
+       ];
+       homepage = "https://github.com/cdepillabout/xml-html-qq";
+       description = "Quasi-quoters for XML and HTML Documents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xml-isogen" = callPackage
     ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck
      , semigroups, template-haskell, text, xml-conduit-writer
@@ -193008,8 +186194,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad";
-       version = "0.12";
-       sha256 = "e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7";
+       version = "0.13";
+       sha256 = "f9f81b63569f18c777a939741024ec3ae34e4ec84015e5cc50f6622034a303ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193051,19 +186237,17 @@ self: {
      }) {};
 
   "xmonad-contrib" = callPackage
-    ({ mkDerivation, base, containers, directory, extensible-exceptions
-     , filepath, mtl, old-locale, old-time, process, random, unix
-     , utf8-string, X11, X11-xft, xmonad
+    ({ mkDerivation, base, bytestring, containers, directory
+     , extensible-exceptions, filepath, mtl, old-locale, old-time
+     , process, random, unix, utf8-string, X11, X11-xft, xmonad
      }:
      mkDerivation {
        pname = "xmonad-contrib";
-       version = "0.12";
-       sha256 = "131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311";
-       revision = "2";
-       editedCabalFile = "8a17b7fe46dc9d7435538a0db3997bcb2a125e71923ecd401024d84081a41807";
+       version = "0.13";
+       sha256 = "a760827fe5b1f99d783f52ccbb72b272d02d53daa26757363cde3ceba014476e";
        libraryHaskellDepends = [
-         base containers directory extensible-exceptions filepath mtl
-         old-locale old-time process random unix utf8-string X11 X11-xft
+         base bytestring containers directory extensible-exceptions filepath
+         mtl old-locale old-time process random unix utf8-string X11 X11-xft
          xmonad
        ];
        homepage = "http://xmonad.org/";
@@ -193601,25 +186785,6 @@ self: {
      }) {};
 
   "yahoo-finance-api" = callPackage
-    ({ mkDerivation, aeson, base, doctest, Glob, http-api-data
-     , http-client, lens, lens-aeson, mtl, servant, servant-client, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "yahoo-finance-api";
-       version = "0.1.0.0";
-       sha256 = "d7e8f52d8549fc2084698a520dcb17681e1917c2ca5ca63d3bda67522fdc5182";
-       libraryHaskellDepends = [
-         aeson base http-api-data http-client lens lens-aeson mtl servant
-         servant-client text time transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/yahoo-finance-api";
-       description = "Read quotes from Yahoo Finance API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "yahoo-finance-api_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, doctest, either, Glob, hspec
      , http-api-data, http-client, http-client-tls, mtl, safe, servant
      , servant-client, text, time, transformers, vector
@@ -193639,7 +186804,6 @@ self: {
        homepage = "https://github.com/cdepillabout/yahoo-finance-api";
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -194409,32 +187573,6 @@ self: {
      }) {};
 
   "yesod-auth-hashdb" = callPackage
-    ({ mkDerivation, base, basic-prelude, bytestring, containers
-     , cryptohash, hspec, http-conduit, http-types, monad-logger
-     , network-uri, persistent, persistent-sqlite, pwstore-fast
-     , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core
-     , yesod-form, yesod-persistent, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-auth-hashdb";
-       version = "1.5.1.3";
-       sha256 = "ea455c6cb2c60de6254860ed1b8d29f8e73154c24db3e2edbfc0090f728b051a";
-       libraryHaskellDepends = [
-         base bytestring cryptohash persistent pwstore-fast text yesod-auth
-         yesod-core yesod-form yesod-persistent
-       ];
-       testHaskellDepends = [
-         base basic-prelude bytestring containers hspec http-conduit
-         http-types monad-logger network-uri persistent-sqlite resourcet
-         text wai-extra yesod yesod-auth yesod-core yesod-test
-       ];
-       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
-       description = "Authentication plugin for Yesod";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yesod-auth-hashdb_1_6_0_1" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , hspec, http-conduit, http-types, monad-logger, network-uri
      , persistent, persistent-sqlite, pwstore-fast, resourcet, text
@@ -194693,12 +187831,16 @@ self: {
      }) {};
 
   "yesod-colonnade" = callPackage
-    ({ mkDerivation, base, colonnade, text, yesod-core }:
+    ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, text
+     , yesod-core
+     }:
      mkDerivation {
        pname = "yesod-colonnade";
-       version = "0.2";
-       sha256 = "92a36ab103779aa8a541910456899fae8e8df6f4da27524200b54134c4b26a21";
-       libraryHaskellDepends = [ base colonnade text yesod-core ];
+       version = "0.4";
+       sha256 = "3cdb1f10dee36cdf4adebc5799fb108e4112065659051aed025ef4359b3509d7";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup colonnade text yesod-core
+       ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
@@ -196055,42 +189197,6 @@ self: {
      }) {};
 
   "yi" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
-     , data-default, directory, dlist, dynamic-state, dyre, exceptions
-     , filepath, glib, gtk, hashable, Hclip, hint, HUnit, lens, mtl
-     , old-locale, oo-prototypes, pango, parsec, pointedlist, process
-     , QuickCheck, random, safe, semigroups, split, stm, tasty
-     , tasty-hunit, tasty-quickcheck, template-haskell, text, text-icu
-     , time, transformers-base, unix, unix-compat, unordered-containers
-     , vty, word-trie, xdg-basedir, yi-language, yi-rope
-     }:
-     mkDerivation {
-       pname = "yi";
-       version = "0.12.6";
-       sha256 = "886bbac8634a251d9872fbcc47350df3e84cf881e42cb7408d1a1e92614205d8";
-       configureFlags = [ "-fpango" "-fvty" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring Cabal containers data-default
-         directory dlist dynamic-state dyre exceptions filepath glib gtk
-         hashable Hclip hint lens mtl old-locale oo-prototypes pango parsec
-         pointedlist process QuickCheck random safe semigroups split stm
-         template-haskell text text-icu time transformers-base unix
-         unix-compat unordered-containers vty word-trie xdg-basedir
-         yi-language yi-rope
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base directory filepath HUnit lens QuickCheck semigroups tasty
-         tasty-hunit tasty-quickcheck text yi-language yi-rope
-       ];
-       homepage = "https://yi-editor.github.io";
-       description = "The Haskell-Scriptable Editor";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi_0_13_5" = callPackage
     ({ mkDerivation, base, microlens-platform, mtl
      , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty
      , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell
@@ -196111,7 +189217,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-contrib" = callPackage
@@ -196220,24 +189325,6 @@ self: {
      }) {};
 
   "yi-fuzzy-open" = callPackage
-    ({ mkDerivation, base, binary, containers, data-default, directory
-     , filepath, mtl, text, transformers-base, vector, yi, yi-language
-     , yi-rope
-     }:
-     mkDerivation {
-       pname = "yi-fuzzy-open";
-       version = "0.1.0.1";
-       sha256 = "92eda3ac60f57509716f8473c840d6a46b1be52f3713b27c1a5d0aa70978b02a";
-       libraryHaskellDepends = [
-         base binary containers data-default directory filepath mtl text
-         transformers-base vector yi yi-language yi-rope
-       ];
-       homepage = "https://github.com/yi-editor/yi-fuzzy-open";
-       description = "Fuzzy open plugin for Yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-fuzzy-open_0_13_5" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
      , yi-language, yi-rope
@@ -196253,7 +189340,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-gtk" = callPackage
@@ -196352,32 +189438,6 @@ self: {
      }) {};
 
   "yi-language" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers
-     , data-default, filepath, hashable, hspec, microlens-platform
-     , oo-prototypes, pointedlist, QuickCheck, regex-base, regex-tdfa
-     , template-haskell, transformers-base, unordered-containers
-     }:
-     mkDerivation {
-       pname = "yi-language";
-       version = "0.2.1";
-       sha256 = "58153110fa9fad0c873a8376e73bb21b9ebdbb32357d23b29e1bd6d901cffacd";
-       libraryHaskellDepends = [
-         array base binary containers data-default hashable
-         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
-       ];
-       libraryToolDepends = [ alex ];
-       testHaskellDepends = [
-         array base binary containers data-default filepath hashable hspec
-         microlens-platform pointedlist QuickCheck regex-base regex-tdfa
-         template-haskell transformers-base unordered-containers
-       ];
-       homepage = "https://github.com/yi-editor/yi-language";
-       description = "Collection of language-related Yi libraries";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-language_0_13_5" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
      , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
@@ -196403,7 +189463,6 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-misc-modes" = callPackage
@@ -196487,26 +189546,6 @@ self: {
      }) {};
 
   "yi-rope" = callPackage
-    ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
-     , data-default, deepseq, fingertree, hspec, QuickCheck
-     , quickcheck-instances, text, text-icu
-     }:
-     mkDerivation {
-       pname = "yi-rope";
-       version = "0.7.0.2";
-       sha256 = "e05df2d905460723c62dba6f5201964504bf8214b3db9db11c1378dc0f08ca9d";
-       libraryHaskellDepends = [
-         base binary bytestring charsetdetect-ae data-default deepseq
-         fingertree text text-icu
-       ];
-       testHaskellDepends = [
-         base hspec QuickCheck quickcheck-instances text
-       ];
-       description = "A rope data structure used by Yi";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "yi-rope_0_8" = callPackage
     ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
      , data-default, deepseq, fingertree, hspec, QuickCheck
      , quickcheck-instances, text, text-icu
@@ -196524,7 +189563,6 @@ self: {
        ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-snippet" = callPackage
@@ -197231,8 +190269,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "0.1.5";
-       sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974";
+       version = "0.1.7";
+       sha256 = "8b7e4f597e926db852397bb2cbad04d05c718a222702076fbbdfcccb62679c9e";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest exceptions filepath mtl path
@@ -197663,6 +190701,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zstd" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, QuickCheck
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "zstd";
+       version = "0.1.0.0";
+       sha256 = "0875840799d987cf8f8dd5e0a7686978084b3088c07123e66f6f88561f474bff";
+       libraryHaskellDepends = [ base bytestring deepseq ghc-prim ];
+       testHaskellDepends = [
+         base bytestring QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/facebookexperimental/hs-zstd";
+       description = "Haskell bindings to the Zstandard compression algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ztail" = callPackage
     ({ mkDerivation, array, base, bytestring, filepath, hinotify
      , process, regex-posix, time, unix, unordered-containers
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bd5f1e490d7..02fca8d0d1ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5067,7 +5067,7 @@ with pkgs;
 
   haskell = callPackage ./haskell-packages.nix { };
 
-  haskellPackages = haskell.packages.ghc801.override {
+  haskellPackages = haskell.packages.ghc802.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
   };
 

From 958b1008274847f6b4297204f84bb12641ca493e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:29:28 +0100
Subject: [PATCH 0263/3449] haskell-common: drop overrides that have become
 obsolete with LTS 8.x

---
 .../haskell-modules/configuration-common.nix  | 82 ++-----------------
 1 file changed, 8 insertions(+), 74 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 81eff1d42507..31410f58e21a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -392,7 +392,6 @@ self: super: {
 
   # https://ghc.haskell.org/trac/ghc/ticket/9625
   vty = dontCheck super.vty;
-  vty_5_15 = dontCheck super.vty_5_15;
 
   # https://github.com/vincenthz/hs-crypto-pubkey/issues/20
   crypto-pubkey = dontCheck super.crypto-pubkey;
@@ -472,11 +471,6 @@ self: super: {
     preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal";
   });
 
-  # Requires bower-json >= 1.0.0.1 && < 1.1
-  purescript_0_10_5 = super.purescript_0_10_5.overrideScope (self: super: {
-    bower-json = self.bower-json_1_0_0_1;
-  });
-
   # https://github.com/tych0/xcffib/issues/37
   xcffib = dontCheck super.xcffib;
 
@@ -497,41 +491,6 @@ self: super: {
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 
-  # Packages of the diagrams ecosystem that require:
-  #   diagrams-core ==1.4.*
-  #   diagrams-lib ==1.4.*
-  #   optparse-applicative ==0.13.*
-  diagrams_1_4 = super.diagrams_1_4.overrideScope (self: super: {
-    diagrams-contrib = self.diagrams-contrib_1_4_0_1;
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    diagrams-svg = self.diagrams-svg_1_4_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-contrib_1_4_0_1 = super.diagrams-contrib_1_4_0_1.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-  });
-  diagrams-lib_1_4_0_1 = super.diagrams-lib_1_4_0_1.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-rasterific_1_4 = super.diagrams-rasterific_1_4.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-  diagrams-svg_1_4_1 = super.diagrams-svg_1_4_1.overrideScope (self: super: {
-    diagrams-core = self.diagrams-core_1_4;
-    diagrams-lib = self.diagrams-lib_1_4_0_1;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-
   # Test suite won't compile against tasty-hunit 0.9.x.
   zlib = dontCheck super.zlib;
 
@@ -744,15 +703,14 @@ self: super: {
   });
 
   # The most current version needs some packages to build that are not in LTS 7.x.
-  stack = super.stack.overrideScope (self: super: {
-    http-client = self.http-client_0_5_5;
-    http-client-tls = self.http-client-tls_0_3_3_1;
-    http-conduit = self.http-conduit_2_2_3;
-    optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0;
-    criterion = super.criterion.override { inherit (super) optparse-applicative; };
-    aeson = self.aeson_1_0_2_1;
-    hpack = self.hpack_0_15_0;
-  });
+  # stack = super.stack.overrideScope (self: super: {
+  #   http-client = self.http-client_0_5_5;
+  #   http-client-tls = self.http-client-tls_0_3_3_1;
+  #   http-conduit = self.http-conduit_2_2_3;
+  #   criterion = super.criterion.override { inherit (super) optparse-applicative; };
+  #   aeson = self.aeson_1_0_2_1;
+  #   hpack = self.hpack_0_15_0;
+  # });
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
@@ -776,9 +734,6 @@ self: super: {
   # Needs new version.
   haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
 
-  # Test suite fails a QuickCheck property.
-  optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0;
-
   # https://github.com/Philonous/hs-stun/pull/1
   # Remove if a version > 0.1.0.1 ever gets released.
   stunclient = overrideCabal super.stunclient (drv: {
@@ -800,10 +755,6 @@ self: super: {
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
 
-  # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version
-  # is hard because of transitive dependencies, so we just disable tests.
-  http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5;
-
   # Fix build for latest versions of servant and servant-client.
   servant_0_10 = super.servant_0_10.overrideScope (self: super: {
     http-api-data = self.http-api-data_0_3_5;
@@ -842,16 +793,9 @@ self: super: {
   # https://github.com/plow-technologies/servant-auth/issues/20
   servant-auth = dontCheck super.servant-auth;
 
-  servant-auth-server = super.servant-auth-server.overrideScope (self: super: {
-    jose = super.jose_0_5_0_2;
-  });
-
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;
 
-  # Use proper store-core version.
-  store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; });
-
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = doJailbreak super.applicative-quoters;
 
@@ -885,21 +829,11 @@ self: super: {
   # https://github.com/josefs/STMonadTrans/issues/4
   STMonadTrans = dontCheck super.STMonadTrans;
 
-  socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; });
-
-  # requires most recent vty
-  brick = super.brick.overrideScope (self: super: { vty = self.vty_5_15; });
-
-  turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: {
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
-  });
-
   # No upstream issue tracker
   hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff;
 
   lentil = super.lentil.overrideScope (self: super: {
     pipes = self.pipes_4_3_2;
-    optparse-applicative = self.optparse-applicative_0_13_0_0;
     # https://github.com/roelvandijk/terminal-progress-bar/issues/14
     terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1;
   });

From 29a1db9a97872f7eb791aa7ffe26b2098835dc5e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:48:58 +0100
Subject: [PATCH 0264/3449] haskell-lifted-base: jailbreak to work around
 https://github.com/basvandijk/lifted-base/issues/34

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 31410f58e21a..da305345b5aa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -837,4 +837,8 @@ self: super: {
     # https://github.com/roelvandijk/terminal-progress-bar/issues/14
     terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1;
   });
+
+  # https://github.com/basvandijk/lifted-base/issues/34
+  lifted-base = doJailbreak super.lifted-base;
+
 }

From 7b96859cab5302cab206ff1825495900cac5a814 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:51:33 +0100
Subject: [PATCH 0265/3449] haskell-parsec: jailbreak to work around
 https://github.com/aslatter/parsec/issues/68

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index da305345b5aa..5b548550bf02 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -841,4 +841,7 @@ self: super: {
   # https://github.com/basvandijk/lifted-base/issues/34
   lifted-base = doJailbreak super.lifted-base;
 
+  # https://github.com/aslatter/parsec/issues/68
+  parsec = doJailbreak super.parsec;
+
 }

From 0583ffb7c275d82eb447fab91c80c80a225240c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 13:59:12 +0100
Subject: [PATCH 0266/3449] haskell-system-filepath: disable test suite to
 remove dependency on chell-quickcheck

chell-quickcheck does not support recent versions of QuickCheck and
therefore does not compile in LTS 8.x.
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5b548550bf02..87645b5abf0e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -844,4 +844,8 @@ self: super: {
   # https://github.com/aslatter/parsec/issues/68
   parsec = doJailbreak super.parsec;
 
+  # Don't depend on chell-quickcheck, which doesn't compile due to restricting
+  # QuickCheck to versions ">=2.3 && <2.9".
+  system-filepath = dontCheck super.system-filepath;
+
 }

From 8968bff4614899fa0b851d33d72b5df8f97d2931 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 14:08:26 +0100
Subject: [PATCH 0267/3449] haskell-case-insensitive: jailbreak to work around
 https://github.com/basvandijk/case-insensitive/issues/24

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 87645b5abf0e..0733a2ff31b9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -848,4 +848,7 @@ self: super: {
   # QuickCheck to versions ">=2.3 && <2.9".
   system-filepath = dontCheck super.system-filepath;
 
+  # https://github.com/basvandijk/case-insensitive/issues/24
+  case-insensitive = doJailbreak super.case-insensitive;
+
 }

From 30b762a9776282333628d5d708783dd11a880f5a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 14:13:53 +0100
Subject: [PATCH 0268/3449] haskell-vector: disable the test suite to work
 around https://github.com/haskell/vector/issues/138

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0733a2ff31b9..9c9a73797253 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -139,9 +139,9 @@ self: super: {
   # https://github.com/techtangents/ablist/issues/1
   ABList = dontCheck super.ABList;
 
-  # https://github.com/haskell/vector/issues/47
-  # https://github.com/haskell/vector/issues/138
-  vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
+  # sse2 flag due to https://github.com/haskell/vector/issues/47.
+  # dontCheck due to https://github.com/haskell/vector/issues/138
+  vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
 
   # Fix Darwin build.
   halive = if pkgs.stdenv.isDarwin

From 7a6648f20ef5e0125fa2d1fa9cb45c0976f8ab20 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 14:39:00 +0100
Subject: [PATCH 0269/3449] haskell-uuid{,-types}: jailbreak to work around
 https://github.com/hvr/uuid/issues/28

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 9c9a73797253..5a508e9137a5 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -851,4 +851,8 @@ self: super: {
   # https://github.com/basvandijk/case-insensitive/issues/24
   case-insensitive = doJailbreak super.case-insensitive;
 
+  # https://github.com/hvr/uuid/issues/28
+  uuid-types = doJailbreak super.uuid-types;
+  uuid = doJailbreak super.uuid;
+
 }

From c37e51fa681f24be68629eb63a637a44119ab83c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 15:27:40 +0100
Subject: [PATCH 0270/3449] haskell-stack: jailbreak to work around
 https://github.com/commercialhaskell/stack/issues/3001

---
 .../haskell-modules/configuration-common.nix          | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5a508e9137a5..89a248cb717b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -702,15 +702,8 @@ self: super: {
     '';
   });
 
-  # The most current version needs some packages to build that are not in LTS 7.x.
-  # stack = super.stack.overrideScope (self: super: {
-  #   http-client = self.http-client_0_5_5;
-  #   http-client-tls = self.http-client-tls_0_3_3_1;
-  #   http-conduit = self.http-conduit_2_2_3;
-  #   criterion = super.criterion.override { inherit (super) optparse-applicative; };
-  #   aeson = self.aeson_1_0_2_1;
-  #   hpack = self.hpack_0_15_0;
-  # });
+  # https://github.com/commercialhaskell/stack/issues/3001
+  stack = doJailbreak super.stack;
 
   # The latest Hoogle needs versions not yet in LTS Haskell 7.x.
   hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };

From e60992354b27fb54ef688fef7ca0230cdf17f67c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 15:35:08 +0100
Subject: [PATCH 0271/3449] haskell-hspec-contrib: disable test suite due to
 https://github.com/hspec/hspec/issues/307

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 89a248cb717b..ce6e97d5cc25 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -848,4 +848,7 @@ self: super: {
   uuid-types = doJailbreak super.uuid-types;
   uuid = doJailbreak super.uuid;
 
+  # https://github.com/hspec/hspec/issues/307
+  hspec-contrib = dontCheck super.hspec-contrib;
+
 }

From 216d277095869c2013b87db81b466f41c8bee0e4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 17:27:04 +0100
Subject: [PATCH 0272/3449] haskell-servant: update hash for the documentation
 download

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ce6e97d5cc25..20668d229f38 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -768,7 +768,7 @@ self: super: {
           owner = "haskell-servant";
           repo = "servant";
           rev = "v${ver}";
-          sha256 = "0fynv77m7rk79pdp535c2a2bd44csgr32zb4wqavbalr7grpxg4q";
+          sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0";
         }}/doc";
         buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ];
         makeFlags = "html";

From 8821b3899ec2d1dc89d3a8347c5af8173ab90c81 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 12 Feb 2017 18:04:17 +0100
Subject: [PATCH 0273/3449] haskell-lens: disable doctest suite to work around
 https://github.com/ekmett/lens/issues/713

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 20668d229f38..2dbcbdff4c79 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -851,4 +851,7 @@ self: super: {
   # https://github.com/hspec/hspec/issues/307
   hspec-contrib = dontCheck super.hspec-contrib;
 
+  # https://github.com/ekmett/lens/issues/713
+  lens = disableCabalFlag super.lens "test-doctests";
+
 }

From b2fcf9fec58086a97a7740921369d1bc2a83f932 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Feb 2017 12:49:08 +0100
Subject: [PATCH 0274/3449] love_0_10: 0.10.1 -> 0.10.2

---
 pkgs/development/interpreters/love/0.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
index ed5aa1e60de3..04b574d45592 100644
--- a/pkgs/development/interpreters/love/0.10.nix
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -5,7 +5,7 @@
 
 let
   pname = "love";
-  version = "0.10.1";
+  version = "0.10.2";
 in
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "rude";
     repo = "love";
     rev = "${version}";
-    sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj";
+    sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym";
   };
 
   buildInputs = [

From b4cd251c54e8a07cfcb8cb46c53083f2f6c7a573 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 13 Feb 2017 11:44:22 +0000
Subject: [PATCH 0275/3449] Manual: document users.users.<name>.hashedPassword

---
 nixos/doc/manual/configuration/user-mgmt.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index 829e5b9ea842..2bd9cca5622f 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -36,7 +36,10 @@ to set a password, which is retained across invocations of
 and /etc/group will be congruent to your NixOS configuration. For instance,
 if you remove a user from users.extraUsers and run nixos-rebuild, the user
 account will cease to exist. Also, imperative commands for managing users
-and groups, such as useradd, are no longer available.</para>
+and groups, such as useradd, are no longer available. Passwords may still be
+assigned by setting the user's <literal>hashedPassword</literal> option. A
+hashed password can be generated using <command>mkpasswd -m sha-512</command>
+after installing the <literal>mkpasswd</literal> package.</para>
 
 <para>A user ID (uid) is assigned automatically.  You can also specify
 a uid manually by adding

From 5de48cc3ed3e7a695d58c0c743e23c4a2b5b96d6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 13:57:54 +0100
Subject: [PATCH 0276/3449] kde4.digikam: mark as broken

---
 pkgs/applications/graphics/digikam/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index f38e402ce929..f6ce07eb1645 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -182,6 +182,7 @@ runCommand "${pName}" {
     homepage = http://www.digikam.org;
     maintainers = with stdenv.lib.maintainers; [ /*jraygauthier*/ ];
     inherit (kdelibs.meta) platforms;
+    broken = true;
   };
 
 } ''

From b7d65f8af0fa6422b1f6fae492ed02aeca633825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 13 Feb 2017 00:53:20 +0100
Subject: [PATCH 0277/3449] vim.vam: fix filetype detection

According to https://github.com/MarcWeber/vim-addon-manager/blob/master/doc/vim-addon-manager-additional-documentation.txt#L1310
`filetype on` must be called after all VAM plugins are initialized.
Otherwise vim set `conf` filetype for some files containing hash tags.
---
 pkgs/misc/vim-plugins/vim-utils.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 3ce88320ddfa..d714b290a905 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -65,8 +65,8 @@ See vimHelpTags sample code below.
 
 CONTRIBUTING AND CUSTOMIZING
 ============================
-The example file pkgs/misc/vim-plugins/default.nix provides both: 
-* manually mantained plugins 
+The example file pkgs/misc/vim-plugins/default.nix provides both:
+* manually mantained plugins
 * plugins created by VAM's nix#ExportPluginsForNix implementation
 
 I highly recommend to lookup vim plugin attribute names at the [vim-pi] project
@@ -105,7 +105,7 @@ Then ":source %" it.
 
 nix#ExportPluginsForNix is provided by ./vim2nix
 
-A buffer will open containing the plugin derivation lines as well list 
+A buffer will open containing the plugin derivation lines as well list
 fitting the vimrcConfig.vam.pluginDictionaries option.
 
 Thus the most simple usage would be:
@@ -125,7 +125,7 @@ Thus the most simple usage would be:
       vimrcConfig.vam.knownPlugins = vimPlugins;
       vimrcConfig.vam.pluginDictionaries = [
           # the plugin list form ~/.vim-scripts turned into nix format added to
-          # the buffer created by the nix#ExportPluginsForNix 
+          # the buffer created by the nix#ExportPluginsForNix
       ];
     }
 
@@ -262,13 +262,14 @@ let
   in writeText "vimrc" ''
   " minimal setup, generated by NIX
   set nocompatible
-  filetype indent plugin on | syn on
 
   ${vamImpl}
   ${pathogenImpl}
   ${vundleImpl}
   ${neobundleImpl}
 
+  filetype indent plugin on | syn on
+
   ${customRC}
   '';
 

From b059f63c6e10d864c641ebcc43cbd850b62d0f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 9 Feb 2017 14:02:00 +0100
Subject: [PATCH 0278/3449] pythonPackages.libasyncns: init at 0.7.1

---
 .../development/python-modules/libasyncns.nix | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/libasyncns.nix

diff --git a/pkgs/development/python-modules/libasyncns.nix b/pkgs/development/python-modules/libasyncns.nix
new file mode 100644
index 000000000000..de0d6ea610d8
--- /dev/null
+++ b/pkgs/development/python-modules/libasyncns.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl
+, libasyncns, pkgconfig }:
+
+buildPythonPackage rec {
+  name = "libasyncns-python-${version}";
+  version = "0.7.1";
+
+  src = fetchurl {
+    url = "https://launchpad.net/libasyncns-python/trunk/${version}/+download/libasyncns-python-${version}.tar.bz2";
+    sha256 = "1q4l71b2h9q756x4pjynp6kczr2d8c1jvbdp982hf7xzv7w5gxqg";
+  };
+
+  buildInputs = [ libasyncns ];
+  nativeBuildInputs = [ pkgconfig ];
+  doCheck = false; # requires network access
+
+  meta = with stdenv.lib; {
+    description = "libasyncns-python is a python binding for the asynchronous name service query library";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://launchpad.net/libasyncns-python;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40201bc6047d..92f5ccc2070b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28092,6 +28092,10 @@ EOF
     buildInputs = with self; [ pytest pkgs.glibcLocales ];
   };
 
+  libasyncns = callPackage ../development/python-modules/libasyncns.nix {
+    inherit (pkgs) libasyncns pkgconfig;
+  };
+
   pybrowserid = buildPythonPackage rec {
     name = "PyBrowserID-${version}";
     version = "0.9.2";

From 8ed1d3f8d8264aab302f5f0e6fe8cd00f801bffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 9 Feb 2017 14:02:47 +0100
Subject: [PATCH 0279/3449] gajim: use libasyncns as resolver

---
 .../instant-messengers/gajim/default.nix      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index f0652bf4a1e0..d78bd759ea6e 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -2,7 +2,7 @@
 , ldns, pythonPackages
 
 # Test requirements
-, xvfb_run, dnsutils
+, xvfb_run
 
 , enableJingle ? true, farstream ? null, gst_plugins_bad ? null
 ,                      libnice ? null
@@ -63,9 +63,8 @@ stdenv.mkDerivation rec {
         }$GST_PLUGIN_PATH"'"
     }' scripts/gajim.in
 
-    sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \
-      src/features_window.py
-    sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py
+    # requires network access
+    echo "" > test/integration/test_resolver.py
 
     # We want to run tests in installCheckPhase rather than checkPhase to test
     # whether the *installed* version of Gajim works rather than just whether it
@@ -83,19 +82,20 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook pythonPackages.wrapPython intltool pkgconfig
     # Test dependencies
-    xvfb_run dnsutils
+    xvfb_run
   ];
 
   autoreconfPhase = ''
     sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
   '';
 
-  propagatedBuildInputs = [
-    pythonPackages.pygobject2 pythonPackages.pyGtkGlade
-    pythonPackages.pyasn1
-    pythonPackages.pyxdg
-    pythonPackages.nbxmpp
-    pythonPackages.pyopenssl pythonPackages.dbus-python
+  propagatedBuildInputs = with pythonPackages; [
+    libasyncns
+    pygobject2 pyGtkGlade
+    pyasn1
+    pyxdg
+    nbxmpp
+    pyopenssl dbus-python
   ] ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils
     ++ optional enableNotifications pythonPackages.notify

From c71a893334ddecb0c29470e1ad3b906dfbec574b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 13 Feb 2017 14:37:30 +0100
Subject: [PATCH 0280/3449] Revert "Use looser 9pfs caching in VM tests/builds"

This reverts commit bbd03e236a58e9344c91861513699e070186a3c5.
---
 pkgs/os-specific/linux/kernel/patches.nix | 9 ---------
 pkgs/top-level/all-packages.nix           | 1 -
 2 files changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 1f528f9412be..7e1ec3b9941c 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,13 +175,4 @@ rec {
       };
     };
 
-  p9_caching_4_4 = rec
-    { name = "9p-caching.patch";
-      patch = fetchpatch {
-        inherit name;
-        url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch;
-        sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2";
-      };
-    };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02fca8d0d1ea..a6bd01b24675 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11282,7 +11282,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.p9_caching_4_4
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From d5c4737c2dd87384c4e548b5e9c8dce40101997c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:01:35 +0100
Subject: [PATCH 0281/3449] pythonPackages.aws_shell: cleanup

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b4ad21ffb5f4..b3ec73f251c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1600,10 +1600,10 @@ in {
         sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5";
         url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz";
       };
+
     # Why does it propagate packages that are used for testing?
     propagatedBuildInputs = with self; [
-      configobj prompt_toolkit awscli boto3 pygments mock pytest
-      pytestcov unittest2 tox
+      awscli prompt_toolkit boto3 configobj pygments
     ];
 
     #Checks are failing due to missing TTY, which won't exist.

From 6891c9291d41058451b05a96bb5f6eded966b0f4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:28:48 +0100
Subject: [PATCH 0282/3449] pythonPackages.unittest2: no need to depend on
 argparse

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3ec73f251c8..243fe400ce96 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26328,14 +26328,17 @@ in {
     # # 1.0.0 and up create a circle dependency with traceback2/pbr
     doCheck = false;
 
-    patchPhase = ''
+    postPatch = ''
+      # argparse is needed for python < 2.7, which we do not support anymore.
+      substituteInPlace setup.py --replace "argparse"
+
       # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
       sed -i '510i\        return None, False' unittest2/loader.py
       # https://github.com/pypa/packaging/pull/36
       sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
     '';
 
-    propagatedBuildInputs = with self; [ six argparse traceback2 ];
+    propagatedBuildInputs = with self; [ six traceback2 ];
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework";

From c2e2a4d2c5bdf4937c8a08e4e374b471fa44b0f9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:32:49 +0100
Subject: [PATCH 0283/3449] Python: remove 2.6

---
 .../python/cpython/2.6/default.nix            | 228 ------------------
 .../python/cpython/2.6/nix-store-mtime.patch  |  12 -
 .../2.6/python2.6-fix-parallel-make.patch     |  37 ---
 .../python/cpython/2.6/search-path.patch      |  27 ---
 .../python/cpython/2.6/setup-hook.sh          |  15 --
 .../python/cpython/docs/2.6-html.nix          |  18 --
 .../python/cpython/docs/2.6-pdf-a4.nix        |  18 --
 .../python/cpython/docs/2.6-pdf-letter.nix    |  18 --
 .../python/cpython/docs/2.6-text.nix          |  18 --
 .../python/cpython/docs/default.nix           |  12 -
 pkgs/top-level/all-packages.nix               |  11 +-
 11 files changed, 1 insertion(+), 413 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/default.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/search-path.patch
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-html.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix
 delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-text.nix

diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix
deleted file mode 100644
index 9a4c2d5b3981..000000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/default.nix
+++ /dev/null
@@ -1,228 +0,0 @@
-{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
-, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage
-# For the Python package set
-, pkgs, packageOverrides ? (self: super: {})
-}:
-
-assert zlibSupport -> zlib != null;
-
-with stdenv.lib;
-
-let
-  majorVersion = "2.6";
-  minorVersion = "9";
-  minorVersionSuffix = "";
-  pythonVersion = majorVersion;
-  version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
-  libPrefix = "python${majorVersion}";
-
-  src = fetchurl {
-    url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya";
-  };
-
-  patches =
-    [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff.
-      ./search-path.patch
-
-      # Python recompiles a Python if the mtime stored *in* the
-      # pyc/pyo file differs from the mtime of the source file.  This
-      # doesn't work in Nix because Nix changes the mtime of files in
-      # the Nix store to 1.  So treat that as a special case.
-      ./nix-store-mtime.patch
-
-      # http://bugs.python.org/issue10013
-      ./python2.6-fix-parallel-make.patch
-    ];
-    
-  preConfigure = ''
-      # Purity.
-      for i in /usr /sw /opt /pkg; do
-        substituteInPlace ./setup.py --replace $i /no-such-path
-      done
-    '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) ''
-      for i in Lib/plat-*/regen; do
-        substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/
-      done
-    '' + optionalString stdenv.isCygwin ''
-      # On Cygwin, `make install' tries to read this Makefile.
-      mkdir -p $out/lib/python${majorVersion}/config
-      touch $out/lib/python${majorVersion}/config/Makefile
-      mkdir -p $out/include/python${majorVersion}
-      touch $out/include/python${majorVersion}/pyconfig.h
-    '';
-
-  configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4";
-
-  buildInputs =
-    optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
-    [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ]
-    ++ optional zlibSupport zlib;
-
-  mkPaths = paths: {
-    C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
-    LIBRARY_PATH = makeLibraryPath paths;
-  };
-
-  # Build the basic Python interpreter without modules that have
-  # external dependencies.
-  python = stdenv.mkDerivation {
-    name = "python${if includeModules then "" else "-minimal"}-${version}";
-    pythonVersion = majorVersion;
-
-    inherit majorVersion version src patches buildInputs preConfigure
-            configureFlags;
-
-    inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
-
-    NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
-
-    setupHook = ./setup-hook.sh;
-
-    postInstall =
-      ''
-        # needed for some packages, especially packages that backport
-        # functionality to 2.x from 3.x
-        for item in $out/lib/python${majorVersion}/test/*; do
-          if [[ "$item" != */test_support.py* ]]; then
-            rm -rf "$item"
-          fi
-        done
-        touch $out/lib/python${majorVersion}/test/__init__.py
-        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb
-        ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
-        mv $out/share/man/man1/{python.1,python2.6.1}
-        ln -s $out/share/man/man1/{python2.6.1,python.1}
-
-        paxmark E $out/bin/python${majorVersion}
-
-        # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484
-        echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
-
-        ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
-      '';
-
-    passthru = let
-      pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
-    in rec {
-      inherit libPrefix;
-      inherit zlibSupport;
-      isPy2 = true;
-      isPy26 = true;
-      buildEnv = callPackage ../../wrapper.nix { python = self; };
-      withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
-      pkgs = pythonPackages;
-      executable = libPrefix;
-      sitePackages = "lib/${libPrefix}/site-packages";
-      interpreter = "${self}/bin/${executable}";
-    };
-
-    enableParallelBuilding = true;
-
-    meta = {
-      homepage = "http://python.org";
-      description = "A high-level dynamically-typed programming language";
-      longDescription = ''
-        Python is a remarkably powerful dynamic programming language that
-        is used in a wide variety of application domains. Some of its key
-        distinguishing features include: clear, readable syntax; strong
-        introspection capabilities; intuitive object orientation; natural
-        expression of procedural code; full modularity, supporting
-        hierarchical packages; exception-based error handling; and very
-        high level dynamic data types.
-      '';
-      license = stdenv.lib.licenses.psfl;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
-      # If you want to use Python 2.6, remove "broken = true;" at your own
-      # risk.  Python 2.6 has known security vulnerabilities is not receiving
-      # security updates as of October 2013.
-      broken = true;
-    };
-  };
-
-
-  # This function builds a Python module included in the main Python
-  # distribution in a separate derivation.
-  buildInternalPythonModule =
-    { moduleName
-    , internalName ? "_" + moduleName
-    , deps
-    }:
-    if includeModules then null else stdenv.mkDerivation rec {
-      name = "python-${moduleName}-${python.version}";
-
-      inherit src patches preConfigure configureFlags;
-
-      buildInputs = [ python ] ++ deps;
-
-      inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
-
-      buildPhase =
-        ''
-          substituteInPlace setup.py --replace 'self.extensions = extensions' \
-            'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]'
-
-          python ./setup.py build_ext
-          [ -z "$(find build -name '*_failed.so' -print)" ]
-        '';
-
-      installPhase =
-        ''
-          dest=$out/lib/${python.libPrefix}/site-packages
-          mkdir -p $dest
-          cp -p $(find . -name "*.${if stdenv.isCygwin then "dll" else "so"}") $dest/
-        '';
-    };
-
-
-  # The Python modules included in the main Python distribution, built
-  # as separate derivations.
-  modules = {
-
-    bsddb = buildInternalPythonModule {
-      moduleName = "bsddb";
-      deps = [ db ];
-    };
-
-    crypt = buildInternalPythonModule {
-      moduleName = "crypt";
-      internalName = "crypt";
-      deps = optional (stdenv ? glibc) stdenv.glibc;
-    };
-
-    curses = buildInternalPythonModule {
-      moduleName = "curses";
-      deps = [ ncurses ];
-    };
-
-    curses_panel = buildInternalPythonModule {
-      moduleName = "curses_panel";
-      deps = [ ncurses modules.curses ];
-    };
-
-    gdbm = buildInternalPythonModule {
-      moduleName = "gdbm";
-      internalName = "gdbm";
-      deps = [ gdbm ];
-    };
-
-    sqlite3 = buildInternalPythonModule {
-      moduleName = "sqlite3";
-      deps = [ sqlite ];
-    };
-
-    tkinter = buildInternalPythonModule {
-      moduleName = "tkinter";
-      deps = [ tcl tk xlibsWrapper ];
-    };
-
-    readline = buildInternalPythonModule {
-      moduleName = "readline";
-      internalName = "readline";
-      deps = [ readline ];
-    };
-
-  };
-
-in python // { inherit modules; }
diff --git a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch b/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch
deleted file mode 100644
index 83f3fea1931b..000000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' Python-2.7.1-orig/Python/import.c Python-2.7.1/Python/import.c
---- Python-2.7.1-orig/Python/import.c	2010-05-20 20:37:55.000000000 +0200
-+++ Python-2.7.1/Python/import.c	2011-01-04 15:55:11.000000000 +0100
-@@ -751,7 +751,7 @@
-         return NULL;
-     }
-     pyc_mtime = PyMarshal_ReadLongFromFile(fp);
--    if (pyc_mtime != mtime) {
-+    if (pyc_mtime != mtime && mtime != 1) {
-         if (Py_VerboseFlag)
-             PySys_WriteStderr("# %s has bad mtime\n", cpathname);
-         fclose(fp);
diff --git a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch b/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch
deleted file mode 100644
index c43e141f9afb..000000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up Python-2.7/Makefile.pre.in.fix-parallel-make Python-2.7/Makefile.pre.in
---- Python-2.7/Makefile.pre.in.fix-parallel-make	2010-07-22 15:01:39.567996932 -0400
-+++ Python-2.7/Makefile.pre.in	2010-07-22 15:47:02.437998509 -0400
-@@ -207,6 +207,7 @@ SIGNAL_OBJS=	@SIGNAL_OBJS@
- 
- ##########################################################################
- # Grammar
-+GRAMMAR_STAMP=	$(srcdir)/grammar-stamp
- GRAMMAR_H=	$(srcdir)/Include/graminit.h
- GRAMMAR_C=	$(srcdir)/Python/graminit.c
- GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
-@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get
- Modules/python.o: $(srcdir)/Modules/python.c
- 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
- 
-+# GNU "make" interprets rules with two dependents as two copies of the rule.
-+# 
-+# In a parallel build this can lead to pgen being run twice, once for each of
-+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler
-+# reads a partially-overwritten copy of one of these files, leading to syntax
-+# errors (or linker errors if the fragment happens to be syntactically valid C)
-+#
-+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html
-+# for more information
-+#
-+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid
-+# this:
-+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP)
- 
--$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)
-+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT)
- 		-@$(INSTALL) -d Include
- 		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		touch $(GRAMMAR_STAMP)
- 
- $(PGEN):	$(PGENOBJS)
- 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
diff --git a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch b/pkgs/development/interpreters/python/cpython/2.6/search-path.patch
deleted file mode 100644
index 2e7b7526c0ce..000000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py
-*** Python-2.4.4-orig/setup.py	2006-10-08 19:41:25.000000000 +0200
---- Python-2.4.4/setup.py	2007-05-27 16:04:54.000000000 +0200
-***************
-*** 279,288 ****
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
--             lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
--             inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-  
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
---- 279,289 ----
-          # Check for AtheOS which has libraries in non-standard locations
-          if platform == 'atheos':
-              lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
-              inc_dirs += ['/system/include', '/atheos/autolnk/include']
-  
-+         lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
-+         inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
-+         
-          # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
-          if platform in ['osf1', 'unixware7', 'openunix8']:
-              lib_dirs += ['/usr/ccs/lib']
diff --git a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh
deleted file mode 100644
index 4caff9c9d846..000000000000
--- a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-addPythonPath() {
-    addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages
-}
-
-toPythonPath() {
-    local paths="$1"
-    local result=
-    for i in $paths; do
-        p="$i/lib/python2.6/site-packages"
-        result="${result}${result:+:}$p"
-    done
-    echo $result
-}
-
-envHooks+=(addPythonPath)
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix
deleted file mode 100644
index 2b41f122fa9b..000000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-html-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-html.tar.bz2;
-    sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/html
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix
deleted file mode 100644
index ec031821a03f..000000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-pdf-a4-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-a4.tar.bz2;
-    sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/pdf-a4
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix
deleted file mode 100644
index 7cacf7778348..000000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-pdf-letter-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-letter.tar.bz2;
-    sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/pdf-letter
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix
deleted file mode 100644
index eb394a3f3e2d..000000000000
--- a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file was generated and will be overwritten by ./generate.sh
-
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  name = "python26-docs-text-2.6.8";
-  src = fetchurl {
-    url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-text.tar.bz2;
-    sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c";
-  };
-  installPhase = ''
-    mkdir -p $out/share/doc/python26
-    cp -R ./ $out/share/doc/python26/text
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix
index 8f5fc810fb71..89e60f961f63 100644
--- a/pkgs/development/interpreters/python/cpython/docs/default.nix
+++ b/pkgs/development/interpreters/python/cpython/docs/default.nix
@@ -10,9 +10,6 @@ pythonDocs = {
     python27 = import ./2.7-html.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-html.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
   pdf_a4 = {
     recurseForDerivations = true;
@@ -22,9 +19,6 @@ pythonDocs = {
     python27 = import ./2.7-pdf-a4.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-pdf-a4.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
   pdf_letter = {
     recurseForDerivations = true;
@@ -34,9 +28,6 @@ pythonDocs = {
     python27 = import ./2.7-pdf-letter.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-pdf-letter.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
   text = {
     recurseForDerivations = true;
@@ -46,8 +37,5 @@ pythonDocs = {
     python27 = import ./2.7-text.nix {
       inherit stdenv fetchurl lib;
     };
-    python26 = import ./2.6-text.nix {
-      inherit stdenv fetchurl lib;
-    };
   };
 }; in pythonDocs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6bd01b24675..59b8e4e0f750 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5845,7 +5845,6 @@ with pkgs;
   # These are for compatibility and should not be used inside Nixpkgs.
   pythonFull = python.override{x11Support=true;};
   python2Full = python2.override{x11Support=true;};
-  python26Full = python26.override{includeModules=true;self=python26Full;};
   python27Full = python27.override{x11Support=true;};
   python3Full = python3.override{x11Support=true;};
   python33Full = python33.override{x11Support=true;};
@@ -5858,10 +5857,6 @@ with pkgs;
   python2Packages = python27Packages;
   python3Packages = python35Packages;
 
-  python26 = callPackage ../development/interpreters/python/cpython/2.6 {
-    db = db4;
-    self = python26;
-  };
   python27 = callPackage ../development/interpreters/python/cpython/2.7 {
     self = python27;
     inherit (darwin) CF configd;
@@ -10165,11 +10160,7 @@ with pkgs;
 
   ### DEVELOPMENT / PYTHON MODULES
 
-  # `nix-env -i python-nose` installs for 2.7, the default python.
-  # Therefore we do not recurse into attributes here, in contrast to
-  # python27Packages. `nix-env -iA python26Packages.nose` works
-  # regardless.
-  python26Packages = python26.pkgs;
+  # Python package sets.
 
   python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
 

From ccf4d5e3d514eb8706b8aa89a3710c07a21b3483 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 12 Feb 2017 12:34:11 +0100
Subject: [PATCH 0284/3449] cudatoolkit5: remove this ancient version

---
 pkgs/development/compilers/cudatoolkit/default.nix | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f74815a3b955..927a1bcdf0b0 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python26, python27, zlib
+{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python27, zlib
 , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
 }:
 
@@ -85,13 +85,6 @@ let
 
 in {
 
-  cudatoolkit5 = common {
-    version = "5.5.22";
-    url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
-    sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
-    python = python26;
-  };
-
   cudatoolkit6 = common {
     version = "6.0.37";
     url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run;

From 5d00edcf4f018d80dbed9e55e431d2054faf7078 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 14:45:18 +0100
Subject: [PATCH 0285/3449] cudatoolkit5 fixup, fixes eval

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59b8e4e0f750..7f5e8abeb4b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1309,7 +1309,6 @@ with pkgs;
   cron = callPackage ../tools/system/cron { };
 
   inherit (callPackages ../development/compilers/cudatoolkit { })
-    cudatoolkit5
     cudatoolkit6
     cudatoolkit65
     cudatoolkit7

From 0b87efacb14425f65e75c489e26b21952ece805c Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Mon, 13 Feb 2017 14:53:15 +0100
Subject: [PATCH 0286/3449] grub: add grub.useOSProber option (#22558)

---
 nixos/modules/system/boot/loader/grub/grub.nix     | 14 ++++++++++++--
 .../system/boot/loader/grub/install-grub.pl        |  9 ++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 294fc1988e9f..23b970186a39 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -53,12 +53,14 @@ let
       inherit (args) devices;
       inherit (efi) canTouchEfiVariables;
       inherit (cfg)
-        version extraConfig extraPerEntryConfig extraEntries forceInstall 
+        version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber
         extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
         default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios;
       path = (makeBinPath ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
-        pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
+        pkgs.utillinux ]
+        ++ (optional (cfg.efiSupport && (cfg.version == 2)) pkgs.efibootmgr)
+        ++ (optionals cfg.useOSProber [pkgs.busybox pkgs.os-prober])
       )) + ":" + (makeSearchPathOutput "bin" "sbin" [
         pkgs.mdadm pkgs.utillinux
       ]);
@@ -265,6 +267,14 @@ in
         '';
       };
 
+      useOSProber = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If set to true, append entries for other OSs detected by os-prober.
+        '';
+      };
+
       splashImage = mkOption {
         type = types.nullOr types.path;
         example = literalExample "./my-background.png";
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index f92b17720f65..74eb32d1fc13 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -424,10 +424,17 @@ if ($extraPrepareConfig ne "") {
   system((get("shell"), "-c", $extraPrepareConfig));
 }
 
-# Atomically update the GRUB config.
+# write the GRUB config.
 my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg";
 my $tmpFile = $confFile . ".tmp";
 writeFile($tmpFile, $conf);
+
+# Append entries detected by os-prober
+if (get("useOsprober") eq "true") {
+    system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile");
+}
+
+# Atomically switch to the new config
 rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n";
 
 

From 1b02439b61f23b3c2b8f9da4c549dc28c84bab5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 13 Feb 2017 14:54:30 +0100
Subject: [PATCH 0287/3449] servant-server: disable testsuite

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2dbcbdff4c79..8e00386267bf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -748,6 +748,9 @@ self: super: {
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
 
+  # broken test suite
+  servant-server = dontCheck super.servant-server;
+
   # Fix build for latest versions of servant and servant-client.
   servant_0_10 = super.servant_0_10.overrideScope (self: super: {
     http-api-data = self.http-api-data_0_3_5;

From af9f44dd575bdf6390e14b34b7a652f766b39db0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Feb 2017 14:54:30 +0100
Subject: [PATCH 0288/3449] grub: fix capitalisation

Missed this occurence while renaming the option
---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 74eb32d1fc13..c9a51288747b 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -430,7 +430,7 @@ my $tmpFile = $confFile . ".tmp";
 writeFile($tmpFile, $conf);
 
 # Append entries detected by os-prober
-if (get("useOsprober") eq "true") {
+if (get("useOSProber") eq "true") {
     system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile");
 }
 

From 99fdc8b65162da56c4d90f4a937f9f0cfdc89b69 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgewhewell@users.noreply.github.com>
Date: Mon, 13 Feb 2017 14:03:59 +0000
Subject: [PATCH 0289/3449] pythonPackages.matplotlib: re-add Cocoa as
 buildInput on darwin (#22741)

---
 pkgs/development/python-modules/matplotlib/default.nix | 4 +++-
 pkgs/top-level/python-packages.nix                     | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 9f85cb06d97c..b917575e2390 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -7,6 +7,7 @@
 , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
 , enableQt ? false, pyqt4
 , libcxx
+, Cocoa
 }:
 
 assert enableGhostscript -> ghostscript != null;
@@ -32,7 +33,8 @@ buildPythonPackage rec {
   XDG_RUNTIME_DIR = "/tmp";
 
   buildInputs = [ python which sphinx stdenv ]
-    ++ stdenv.lib.optional enableGhostscript ghostscript;
+    ++ stdenv.lib.optional enableGhostscript ghostscript
+    ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
 
   propagatedBuildInputs =
     [ cycler dateutil nose numpy pyparsing tornado freetype
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 243fe400ce96..e7592ce69a27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14281,6 +14281,7 @@ in {
   matplotlib = callPackage ../development/python-modules/matplotlib/default.nix {
     stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
     enableGhostscript = true;
+    inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa;
   };
 
 

From 2e648bdacf5db569bc93a44eb7e5ae18adbbb1ec Mon Sep 17 00:00:00 2001
From: lufia <lufia@lufia.org>
Date: Mon, 13 Feb 2017 21:43:19 +0900
Subject: [PATCH 0290/3449] google-cloud-sdk: support x86_64-darwin

---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index dd8aada62fe8..acc440b34ed4 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -3,7 +3,7 @@
 with python27Packages;
 
 # other systems not supported yet
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin";
 
 stdenv.mkDerivation rec {
   name = "google-cloud-sdk-${version}";
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz";
         sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616";
       }
+    else if stdenv.system == "x86_64-darwin" then
+      fetchurl {
+        url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz";
+        sha256 = "efbe2074da5a544c09b6bf87a8ca045dc429ac38dfcd5380561987769491d5ba";
+      }
     else
       fetchurl {
         url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz";
@@ -58,6 +63,6 @@ stdenv.mkDerivation rec {
     license = licenses.free;
     homepage = "https://cloud.google.com/sdk/";
     maintainers = with maintainers; [stephenmw zimbatm];
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From 035e2028d80eae9b0988c5d26b6b4d4f72e51c45 Mon Sep 17 00:00:00 2001
From: Mikhail Volkhov <volhovm.cs@gmail.com>
Date: Mon, 13 Feb 2017 17:13:02 +0300
Subject: [PATCH 0291/3449] Disable orgmode-parse tests in config-common.nix

---
 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 81eff1d42507..273e225e9ecf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -340,6 +340,7 @@ self: super: {
   opaleye = dontCheck super.opaleye;
   openpgp = dontCheck super.openpgp;
   optional = dontCheck super.optional;
+  orgmode-parse = dontCheck super.orgmode-parse;
   os-release = dontCheck super.os-release;
   persistent-redis = dontCheck super.persistent-redis;
   pipes-extra = dontCheck super.pipes-extra;

From 909a1dd569b214660769f75a79827d9267786fd5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Feb 2017 15:24:29 +0100
Subject: [PATCH 0292/3449] tigervnc: 1.7.1 -> 1.8.0pre20170211

This allows to build with X.org server 1.19.1
---
 pkgs/tools/admin/tigervnc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 71c4ebd10a40..60d2b2bcd111 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -7,14 +7,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.7.1";
+  version = "1.8.0pre20170211";
   name = "tigervnc-${version}";
 
   src = fetchFromGitHub {
     owner = "TigerVNC";
     repo = "tigervnc";
-    sha256 = "0s2v1h24cl5ypnr35hima580xvvsh0cdqi501mvyvi7wz9cp33rj";
-    rev = "v1.7.1";
+    sha256 = "10bs6394ya953gmak8g2d3n133vyfrryq9zq6dc27g8s6lw0mrbh";
+    rev = "b6c46a1a99a402d5d17b1afafc4784ce0958d6ec";
   };
 
   inherit fontDirectories;
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   dontUseCmakeBuildDir = true;
 
   postBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast"
     export CXXFLAGS="$CXXFLAGS -fpermissive"
     # Build Xvnc
     tar xf ${xorg.xorgserver.src}

From a50b4d0e03df781d081a492bd292a34a81e059e1 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Mon, 13 Feb 2017 16:42:39 +0100
Subject: [PATCH 0293/3449] docker: 1.13.0 -> 1.13.1

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../applications/virtualization/docker/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 7c0475697c03..903ee98a0e1b 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,14 +11,14 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.13.0";
-  rev = "49bf474"; # should match the version commit
+  version = "1.13.1";
+  rev = "092cba3"; # should match the version commit
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "03b181xiqgnwanc567w9p6rbdgdvrfv0lk4r7b604ksm0fr4cz23";
+    sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
   };
 
   docker-runc = runc.overrideAttrs (oldAttrs: rec {
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "docker";
       repo = "runc";
-      rev = "2f7393a47307a16f8cee44a37b262e8b81021e3e";
-      sha256 = "1s5nfnbinzmcnm8avhvsniz0ihxyva4w5qz1hzzyqdyr0w2scnbj";
+      rev = "9df8b306d01f59d3a8029be411de015b7304dd8f";
+      sha256 = "1yvrk1w2409b90gk55k72z7l3jlkj682x4h3b7004mkl9bhscqd9";
     };
     # docker/runc already include these patches / are not applicable
     patches = [];
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "docker";
       repo = "containerd";
-      rev = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e";
-      sha256 = "184sd9dwkcba3zhxnz9grw8p81x05977p36cif2dgkhjdhv12map";
+      rev = "aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1";
+      sha256 = "0vidbsgyn77m98kisrqnbykva0zmk1ljprgqhbfp5lw16ac6qj8c";
     };
   });
   docker-tini = tini.overrideAttrs  (oldAttrs: rec {

From 1a55974cef94fb53f68cdcaf305405a8790af78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 15:47:08 +0100
Subject: [PATCH 0294/3449] lmdb: split outputs and add lmdb.pc

lmdb.a is removed, until someone needs it.
---
 pkgs/development/libraries/lmdb/default.nix | 24 ++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index a73a95000d64..6b3070a39aa9 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -14,14 +14,28 @@ in stdenv.mkDerivation rec {
 
   postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
 
-  makeFlags = ["prefix=$(out)"]
-              ++ optional stdenv.cc.isClang "CC=clang";
+  outputs = [ "bin" "out" "dev" ];
+
+  makeFlags = [ "prefix=$(out)" "CC=cc" ];
 
   doCheck = true;
   checkPhase = "make test";
 
-  preInstall = ''
-    mkdir -p $out/{bin,lib,include}
+  postInstall = ''
+    moveToOutput bin "$bin"
+    moveToOutput "lib/*.a" REMOVE # until someone needs it
+  ''
+    # add lmdb.pc (dynamic only)
+    + ''
+    mkdir -p "$dev/lib/pkgconfig"
+    cat > "$dev/lib/pkgconfig/lmdb.pc" <<EOF
+    Name: lmdb
+    Description: ${meta.description}
+    Version: ${version}
+
+    Cflags: -I$dev/include
+    Libs: -L$out/lib -llmdb
+    EOF
   '';
 
   meta = with stdenv.lib; {
@@ -34,7 +48,7 @@ in stdenv.mkDerivation rec {
       limited to the size of the virtual address space.
     '';
     homepage = http://symas.com/mdb/;
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ jb55 vcunat ];
     license = licenses.openldap;
     platforms = platforms.all;
   };

From 5b75338a50e5bf23f4175ffce28df51c54256156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 16:37:52 +0100
Subject: [PATCH 0295/3449] knot-dns: use shared lmdb

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index cba21fbeb8ec..af7d4d4c48ca 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -16,15 +16,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu libidn
+    gnutls jansson liburcu libidn lmdb
     nettle libedit
     libiconv
     # without sphinx &al. for developer documentation
   ]
     # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ]
     ++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
+  configureFlags = [ "--with-lmdb=${stdenv.lib.getLib lmdb}"/*not perfect*/ ];
+
   enableParallelBuilding = true;
 
   CFLAGS = [ "-O2" "-DNDEBUG" ];

From 935ede8a595aea3dfb875859dfa75de2d94d5094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 16:56:54 +0100
Subject: [PATCH 0296/3449] knot-resovler: use shared lmdb now

---
 pkgs/servers/dns/knot-resolver/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index b74f50beb610..10181de159f5 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
 
-  buildInputs = [ knot-dns luajit libuv gnutls ]
-    # TODO: lmdb needs lmdb.pc; embedded for now
+  buildInputs = [ knot-dns lmdb luajit libuv gnutls ]
     ## optional dependencies
     ++ optional doInstallCheck cmocka
     ++ optional stdenv.isLinux systemd # socket activation

From 7e55c3cfc7de189679cc6a3c16052712e01a0b7f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 17:00:57 +0100
Subject: [PATCH 0297/3449] kde4.kwooty: broken

---
 pkgs/applications/networking/newsreaders/kwooty/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix
index 1f6a20fc76b6..f4bd04e8a2d1 100644
--- a/pkgs/applications/networking/newsreaders/kwooty/default.nix
+++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix
@@ -34,5 +34,6 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "Binary news reader of KDE";
+    broken = true;
   };
 }

From 7a0f1f44629d601ed201ae4e4441184398b14b85 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Feb 2017 15:45:21 -0800
Subject: [PATCH 0298/3449] pytimeparse: 1.1.5 -> 1.1.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ee8ad5ebd50..14aa08e182b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -331,8 +331,9 @@ in {
   pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
 
   pytimeparse = buildPythonPackage rec {
-    name = "pytimeparse-1.1.5";
-    disabled = isPy3k;
+    pname = "pytimeparse";
+    version = "1.1.6";
+    name = "${pname}-${version}";
 
     meta = {
       description = "A small Python library to parse various kinds of time expressions";
@@ -343,9 +344,9 @@ in {
 
     propagatedBuildInputs = with self; [ nose ];
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytimeparse/${name}.tar.gz";
-      sha256 = "01xj31m5brydm4gvc6lwx26r74903wvm1jx3g05633k3mqlvvpcs";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl";
     };
   };
 

From 5af946bd2cd1bb3285b973f31c969f776069a2c7 Mon Sep 17 00:00:00 2001
From: George Whewell <georgerw@gmail.com>
Date: Mon, 13 Feb 2017 16:36:40 +0000
Subject: [PATCH 0299/3449] skip failing tests on darwin

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ee8ad5ebd50..c0908484325b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9447,8 +9447,8 @@ in {
 
     buildInputs = with self; [ nose sphinx numpydoc ];
 
-    # Failing test on Python 3.x
-    postPatch = '''' + optionalString isPy3k ''
+    # Failing test on Python 3.x and Darwin
+    postPatch = '''' + optionalString (isPy3k || stdenv.isDarwin) ''
       sed -i -e '70,84d' joblib/test/test_format_stack.py
       # test_nested_parallel_warnings: ValueError: Non-zero return code: -9.
       # Not sure why but it's nix-specific. Try removing for new joblib releases.

From 23fee8bfbddd8ce4c0a38ff4cbdd3cc9481232bd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 14:18:17 +0200
Subject: [PATCH 0300/3449] nixos-rebuild: Support passing e.g. '-j8'

Where there is no space between '-j' and the number.
---
 nixos/modules/installer/tools/nixos-rebuild.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 8e55a4f525f9..846f79d77f4d 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -52,13 +52,13 @@ while [ "$#" -gt 0 ]; do
         repair=1
         extraBuildFlags+=("$i")
         ;;
-      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q)
-        extraBuildFlags+=("$i")
-        ;;
       --max-jobs|-j|--cores|-I)
         j="$1"; shift 1
         extraBuildFlags+=("$i" "$j")
         ;;
+      --show-trace|--no-build-hook|--keep-failed|-K|--keep-going|-k|--verbose|-v|-vv|-vvv|-vvvv|-vvvvv|--fallback|--repair|--no-build-output|-Q|-j*)
+        extraBuildFlags+=("$i")
+        ;;
       --option)
         j="$1"; shift 1
         k="$1"; shift 1

From 2000f0941e5de5ce62ede09f2003ff3ccfcd26ac Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Feb 2017 15:52:23 +0200
Subject: [PATCH 0301/3449] nixos-rebuild: Don't build nixos-rebuild with
 --fast

---
 nixos/modules/installer/tools/nixos-rebuild.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 846f79d77f4d..4f73865dad6a 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -15,6 +15,7 @@ origArgs=("$@")
 extraBuildFlags=()
 action=
 buildNix=1
+fast=
 rollback=
 upgrade=
 repair=
@@ -66,6 +67,7 @@ while [ "$#" -gt 0 ]; do
         ;;
       --fast)
         buildNix=
+        fast=1
         extraBuildFlags+=(--show-trace)
         ;;
       --profile-name|-p)
@@ -217,7 +219,7 @@ if [ -z "$_NIXOS_REBUILD_REEXEC" ]; then
 fi
 
 # Re-execute nixos-rebuild from the Nixpkgs tree.
-if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" ]; then
+if [ -z "$_NIXOS_REBUILD_REEXEC" -a -n "$canRun" -a -z "$fast" ]; then
     if p=$(nix-build --no-out-link --expr 'with import <nixpkgs/nixos> {}; config.system.build.nixos-rebuild' "${extraBuildFlags[@]}"); then
         export _NIXOS_REBUILD_REEXEC=1
         exec $p/bin/nixos-rebuild "${origArgs[@]}"

From 982520d771c398129ef74b542105693f0234d2c9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 21:16:07 +0100
Subject: [PATCH 0302/3449] pythonPackages.awesome-slugify: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6667ae2f99dd..f93bc71109b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1544,6 +1544,10 @@ in {
 
     propagatedBuildInputs = with self; [ unidecode regex ];
 
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
     meta = with stdenv.lib; {
       homepage = "https://github.com/dimka665/awesome-slugify";
       description = "Python flexible slugify function";

From 9298467923f129480cdd3beebcab4f08ad3229c8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 13 Feb 2017 21:42:26 +0100
Subject: [PATCH 0303/3449] svtplay-dl: 1.9.1 -> 1.9.2

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

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

From a2d2649a8fe84c00cc14df24611c9e2c907873ba Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 13 Feb 2017 21:44:59 +0100
Subject: [PATCH 0304/3449] perl-MooseX-Types: 0.46 -> 0.50

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f50d5dfe38d8..6b3e7d99a98a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9136,13 +9136,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   MooseXTypes = buildPerlPackage rec {
-    name = "MooseX-Types-0.46";
+    name = "MooseX-Types-0.50";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a";
+      sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08";
     };
-    buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires ];
-    propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ];
+    buildInputs = [ ModuleBuildTiny TestFatal TestRequires self."if" ];
+    propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubExporterForMethods SubInstall SubName namespaceautoclean ];
     meta = {
       homepage = https://github.com/moose/MooseX-Types;
       description = "Organise your Moose types in libraries";

From 4882e431c7523f7298bebfde5d494aceeb1529b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 21:55:54 +0100
Subject: [PATCH 0305/3449] Revert "pythonPackages.unittest2: no need to depend
 on argparse"

This reverts commit 6891c9291d41058451b05a96bb5f6eded966b0f4.
Moving the mass rebuild to staging.
---
 pkgs/top-level/python-packages.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f93bc71109b0..e7ee93e21fec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26334,17 +26334,14 @@ in {
     # # 1.0.0 and up create a circle dependency with traceback2/pbr
     doCheck = false;
 
-    postPatch = ''
-      # argparse is needed for python < 2.7, which we do not support anymore.
-      substituteInPlace setup.py --replace "argparse"
-
+    patchPhase = ''
       # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
       sed -i '510i\        return None, False' unittest2/loader.py
       # https://github.com/pypa/packaging/pull/36
       sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
     '';
 
-    propagatedBuildInputs = with self; [ six traceback2 ];
+    propagatedBuildInputs = with self; [ six argparse traceback2 ];
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework";

From c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 21:57:56 +0100
Subject: [PATCH 0306/3449] Re-revert "pythonPackages.unittest2: without
 argparse""

This reverts commit 4882e431c7523f7298bebfde5d494aceeb1529b7.
Moved from master.
---
 pkgs/top-level/python-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b4c9f74497f..c1456818663f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26334,14 +26334,17 @@ in {
     # # 1.0.0 and up create a circle dependency with traceback2/pbr
     doCheck = false;
 
-    patchPhase = ''
+    postPatch = ''
+      # argparse is needed for python < 2.7, which we do not support anymore.
+      substituteInPlace setup.py --replace "argparse"
+
       # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547
       sed -i '510i\        return None, False' unittest2/loader.py
       # https://github.com/pypa/packaging/pull/36
       sed -i 's/version=VERSION/version=str(VERSION)/' setup.py
     '';
 
-    propagatedBuildInputs = with self; [ six argparse traceback2 ];
+    propagatedBuildInputs = with self; [ six traceback2 ];
 
     meta = {
       description = "A backport of the new features added to the unittest testing framework";

From 9775a26da39e72298bae1914ddec24799f80e33f Mon Sep 17 00:00:00 2001
From: Rongcui Dong <rongcuid@outlook.com>
Date: Sat, 11 Feb 2017 18:44:29 -0800
Subject: [PATCH 0307/3449] stlink: 1.1.0 -> 1.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: Upstream moved from autotools to cmake.]
---
 .../development/tools/misc/stlink/default.nix | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index e52795bf5cde..de13f6709b2b 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -1,30 +1,33 @@
-{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, libusb1 }:
+{ stdenv, fetchurl, cmake, libusb1 }:
 
-# IMPORTANT: You need permissions to access the stlink usb devices. Here are
-# example udev rules for stlink v1 and v2 so you don't need to have root
-# permissions (copied from <stlink>/49-stlink*.rules):
-#
-# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n"
-# SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n"
+# IMPORTANT: You need permissions to access the stlink usb devices. 
+# Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix
 
 let
-  version = "1.1.0";
+  version = "1.3.0";
 in
 stdenv.mkDerivation {
   name = "stlink-${version}";
 
   src = fetchurl {
     url = "https://github.com/texane/stlink/archive/${version}.tar.gz";
-    sha256 = "0b38a32ids9dpnz5h892l279fz8y1zzqk1qsnyhl1nm03p7xzi1s";
+    sha256 = "3e8cba21744d2c38a0557f6835a05189e1b98202931bb0183d22efc462c893dd";
   };
 
-  buildInputs = [ autoconf automake libtool pkgconfig libusb1 ];
-  preConfigure = "./autogen.sh";
+  buildInputs = [ cmake libusb1 ];
+  patchPhase = ''
+    sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt
+    sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt
+  '';
+  preInstall = ''
+    mkdir -p $out/etc/udev/rules.d
+    mkdir -p $out/etc/modprobe.d
+  '';
 
   meta = with stdenv.lib; {
     description = "In-circuit debug and programming for ST-Link devices";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = [ maintainers.bjornfor maintainers.rongcuid ];
   };
 }

From be7a6eb70e7c305eed877850c9ebb6d50c52457e Mon Sep 17 00:00:00 2001
From: Matthias Herrmann <matthias.mh.herrmann@googlemail.com>
Date: Sun, 12 Feb 2017 20:22:35 +0100
Subject: [PATCH 0308/3449] sweethome3d: 5.2 -> 5.4

---
 pkgs/applications/misc/sweethome3d/default.nix | 9 ++++-----
 pkgs/applications/misc/sweethome3d/editors.nix | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 68dd69f385d9..4a530a927815 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -6,9 +6,8 @@ let
   getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
 
   # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
-  extensionOf = filePath: 
-    lib.concatStringsSep "." (lib.tail (lib.splitString "." 
-      (builtins.baseNameOf filePath)));
+  extensionOf = filePath:
+    lib.concatStringsSep "." (lib.tail (lib.splitString "." (builtins.baseNameOf filePath)));
 
   installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: ''
     mkdir -p "$out/share/icons/hicolor/${size}/apps"
@@ -68,14 +67,14 @@ let
 in rec {
 
   application = mkSweetHome3D rec {
-    version = "5.2";
+    version = "5.4";
     module = "SweetHome3D";
     name = stdenv.lib.toLower module + "-application-" + version;
     description = "Design and visualize your future home";
     license = stdenv.lib.licenses.gpl2Plus;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb";
+      sha256 = "09sk4svmaiw8dabcya3407iq5yjwxbss8pik1rzalrlds2428vyw";
       module = module;
       tag = "V_" + d2u version;
     };
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 61b47dcdd2ad..7dbf1e8f2a31 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -30,6 +30,7 @@ let
 
     patchPhase = ''
       sed -i -e 's,../SweetHome3D,${application.src},g' build.xml
+      sed -i -e 's,lib/macosx/java3d-1.6/jogl-all.jar,lib/java3d-1.6/jogl-all.jar,g' build.xml
     '';
 
     buildPhase = ''

From 5ed010f50b3fc808ec3edbb85a6b62617c43baf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 22:10:50 +0100
Subject: [PATCH 0309/3449] findutils: disable tests on i686-linux

They won't work since glibc-2.25, and I don't like to spend more time on that.
---
 pkgs/tools/misc/findutils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 1271aa8c9863..549175ed7b01 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ coreutils ];
 
-  doCheck = !stdenv.isDarwin;
+  # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
+  doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
 
   outputs = [ "out" "info" ];
 

From 2ad8face66e73529bda21aac97e9a374c8d7deda Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Mon, 13 Feb 2017 22:20:49 +0100
Subject: [PATCH 0310/3449] wireguard: 0.0.20170115 -> 0.0.20170213 (#22759)

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 12c5eedcb96a..8a2e6287364f 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.18";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20170115";
+  version = "0.0.20170213";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1s7zypgbwyf3mkh9any413p0awpny0dxix8d1plsrm52k539ypvy";
+    sha256 = "256a7d41cf228f2a88e1b03b3911746dc827fe7be5b982c60080e7f81998cc6d";
   };
 
   meta = with stdenv.lib; {

From 7b6a88c95e99c29e6d89ff4e34beac701c1f0681 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 13 Feb 2017 22:16:12 +0100
Subject: [PATCH 0311/3449] urh: init at 1.3.3

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

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
new file mode 100644
index 000000000000..713a36f10296
--- /dev/null
+++ b/pkgs/applications/misc/urh/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  name = "urh-${version}";
+  version = "1.3.3";
+
+  src = fetchFromGitHub {
+    owner = "jopohl";
+    repo = "urh";
+    rev = "v${version}";
+    sha256 = "137dsxs4i0lmxwp31g8fzwpwv1i8rsiir9gxvs5cmnwsrbcrdvxh";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ pyqt5 numpy psutil cython ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Universal Radio Hacker: investigate wireless protocols like a boss";
+    license = licenses.asl20;
+    platform = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96b56479d57d..30694dc8740d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15354,6 +15354,8 @@ with pkgs;
 
   unpaper = callPackage ../tools/graphics/unpaper { };
 
+  urh = callPackage ../applications/misc/urh { };
+
   uucp = callPackage ../tools/misc/uucp { };
 
   uvccapture = callPackage ../applications/video/uvccapture { };

From 51592a3f495b032dbe53b0d97a2fe471c550e3d1 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Feb 2017 22:38:36 +0100
Subject: [PATCH 0312/3449] ripgrep: 0.3.2 -> 0.4.0

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

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 8d7ffd3e4779..7ba43e38f382 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "ripgrep-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "15j68bkkxpbh9c05f8l7j0y33da01y28kpg781lc0234h45535f3";
+    sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
   };
 
-  depsSha256 = "142h6pcf2mr4i7dg7di4299c18aqn0yvk9nr1mxnkb7wjcmrvcfg";
+  depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
 
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";

From 7e5424ac0913e1f890fb8227c8e4790dbf098cb0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Feb 2017 22:43:40 +0100
Subject: [PATCH 0313/3449] php: default to php71

---
 nixos/doc/manual/release-notes/rl-1703.xml | 4 ++++
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 37173ccd7442..51de93db92f2 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -21,6 +21,10 @@ has the following highlights: </para>
       <literal>ati_unfree</literal> keeps forcing 1.17
       and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>
   </listitem>
+
+  <listitem>
+    <para>PHP now defaults to PHP 7.1</para>
+  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30694dc8740d..33273481cd47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5792,7 +5792,7 @@ with pkgs;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
-  php = php70;
+  php = php71;
 
   phpPackages = php70Packages;
 

From dda70d9b06cfb876d34f07b668c04cd2a401f9fd Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Feb 2017 20:51:17 -0600
Subject: [PATCH 0314/3449] epic5: init at 2.0.1

Added conditional to support darwin

Changed comment about buildInputs

Added 's' to optional condition
---
 .../networking/irc/epic5/default.nix          | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/epic5/default.nix

diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
new file mode 100644
index 000000000000..94c3833995dd
--- /dev/null
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, pkgs, openssl
+  , ncurses, libiconv, tcl }:
+
+stdenv.mkDerivation rec {
+  name = "epic5-${version}";
+  version = "2.0.1";
+
+  src = fetchurl {
+    url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz";
+    sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm";
+    };
+
+   # Darwin needs libiconv, tcl; while Linux build don't
+ 
+   buildInputs = [ openssl ncurses ]  
+   ++ stdenv.lib.optionals 
+   stdenv.isDarwin [ libiconv tcl ];
+  
+  postConfigure = ''
+      substituteInPlace bsdinstall \
+      --replace /bin/cp cp \
+      --replace /bin/rm rm \
+      --replace /bin/chmod chmod \
+      '';
+  meta = with stdenv.lib; {
+    homepage = "http://epicsol.org/";
+    description = "a IRC client that offers a great ircII interface";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.ndowens ];
+  };
+}
+
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9ddc52ea22f..4784fcf1df48 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13154,6 +13154,8 @@ with pkgs;
 
   inherit (gnome3) epiphany;
 
+  epic5 = callPackage ../applications/networking/irc/epic5 { };
+  
   eq10q = callPackage ../applications/audio/eq10q { };
 
   errbot = callPackage ../applications/networking/errbot {

From 0c524c63c6c1db5610c6b8d7901e13926538feaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Feb 2017 23:01:46 +0100
Subject: [PATCH 0315/3449] guile: refactor expression

No rebuild on non-Solaris.
---
 .../interpreters/guile/default.nix            | 39 ++++++++-----------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 41ce9c659aa2..0283f7774857 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -46,7 +46,21 @@
   # don't have "libgcc_s.so.1" on darwin
   LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
-  configureFlags = [ "--with-libreadline-prefix" ];
+  configureFlags = [ "--with-libreadline-prefix" ]
+    ++ stdenv.lib.optionals stdenv.isSunOS [
+      # Make sure the right <gmp.h> is found, and not the incompatible
+      # /usr/include/mp.h from OpenSolaris.  See
+      # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
+      # for details.
+      "--with-libgmp-prefix=${gmp.dev}"
+
+      # Same for these (?).
+      "--with-libreadline-prefix=${readline.dev}"
+      "--with-libunistring-prefix=${libunistring}"
+
+      # See below.
+      "--without-threads"
+    ];
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
@@ -92,27 +106,6 @@
       processing.
     '';
   };
-}
-
-//
-
-(stdenv.lib.optionalAttrs stdenv.isSunOS {
-  # TODO: Move me above.
-  configureFlags =
-    [
-      # Make sure the right <gmp.h> is found, and not the incompatible
-      # /usr/include/mp.h from OpenSolaris.  See
-      # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
-      # for details.
-      "--with-libgmp-prefix=${gmp.dev}"
-
-      # Same for these (?).
-      "--with-libreadline-prefix=${readline.dev}"
-      "--with-libunistring-prefix=${libunistring}"
-
-      # See below.
-      "--without-threads"
-    ];
 })
 
 //
@@ -121,4 +114,4 @@
   # Work around <http://bugs.gnu.org/14201>.
   SHELL = "/bin/sh";
   CONFIG_SHELL = "/bin/sh";
-}))
+})

From 74041a42a929cefb9e88435b3857cc37f10166db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Feb 2017 16:02:14 -0600
Subject: [PATCH 0316/3449] shimbun: init at 20170203.647

---
 .../editors/emacs-modes/melpa-generated.nix   | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index a47b5d69760d..7a95620d7278 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -60062,6 +60062,25 @@
           license = lib.licenses.free;
         };
       }) {};
+    shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "shimbun";
+        version = "20170203.647";
+        src = fetchcvs {
+          cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
+          module = "emacs-w3m";
+          sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun";
+          sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x";
+          name = "shimbun";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/shimbun";
+          license = lib.licenses.free;
+        };
+      }) {};
     shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shm";

From 549f5b7d139315e37d6cfa9cf2cb9ac356a7b749 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 13 Feb 2017 16:02:51 -0600
Subject: [PATCH 0317/3449] Update e-mail address for ttuegel

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3753a6955c80..82f59e728ed3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -490,7 +490,7 @@
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
   tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>";
-  ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
+  ttuegel = "Thomas Tuegel <ttuegel@mailbox.org>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
   tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";
   tvorog = "Marsel Zaripov <marszaripov@gmail.com>";

From cda4a4dcfce277b93b87be49945ed44f61483ee1 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 13 Feb 2017 23:11:40 +0100
Subject: [PATCH 0318/3449] nixos/grafana: Don't print password warning if no
 password has been set

---
 nixos/modules/services/monitoring/grafana.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index b9e4015c2380..97806d5d83eb 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ options, config, lib, pkgs, ... }:
 
 with lib;
 
@@ -232,9 +232,10 @@ in {
   };
 
   config = mkIf cfg.enable {
-    warnings = [
-      "Grafana passwords will be stored as plaintext in the Nix store!"
-    ];
+    warnings = optional (
+      cfg.database.password != options.services.grafana.database.password.default ||
+      cfg.security.adminPassword != options.services.grafana.security.adminPassword.default
+    ) "Grafana passwords will be stored as plaintext in the Nix store!";
 
     environment.systemPackages = [ cfg.package ];
 

From 66eba1f3e0f0bb4c8b424e69c19a704e1b102a7f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 13 Feb 2017 23:35:09 +0100
Subject: [PATCH 0319/3449] epic5: add configure flags

---
 .../networking/irc/epic5/default.nix          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index 94c3833995dd..2daeab5d3026 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -1,5 +1,4 @@
-{stdenv, fetchurl, pkgs, openssl
-  , ncurses, libiconv, tcl }:
+{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl }:
 
 stdenv.mkDerivation rec {
   name = "epic5-${version}";
@@ -8,20 +7,21 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${name}.tar.xz";
     sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm";
-    };
+  };
+
+  # Darwin needs libiconv, tcl; while Linux build don't
+  buildInputs = [ openssl ncurses ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv tcl ];
+
+  configureFlags = [ "--disable-debug" "--with-ipv6" ];
 
-   # Darwin needs libiconv, tcl; while Linux build don't
- 
-   buildInputs = [ openssl ncurses ]  
-   ++ stdenv.lib.optionals 
-   stdenv.isDarwin [ libiconv tcl ];
-  
   postConfigure = ''
-      substituteInPlace bsdinstall \
+    substituteInPlace bsdinstall \
       --replace /bin/cp cp \
       --replace /bin/rm rm \
-      --replace /bin/chmod chmod \
-      '';
+      --replace /bin/chmod chmod
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://epicsol.org/";
     description = "a IRC client that offers a great ircII interface";

From 2aad8590d71f433d7263c5ddb4e7540e7e308473 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Feb 2017 22:53:08 +0100
Subject: [PATCH 0320/3449] sudo: 1.8.19p1 -> 1.8.19p2

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

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index f2fede456d12..d360bd8b17e5 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.19p1";
+  name = "sudo-1.8.19p2";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "14pwdwl03kdbbyjkvxrfx409x3c1fjqz8aqz2wgwddinhz7v3bxq";
+    sha256 = "1q2j3b1xqw66kdd5h8a6j62cz7xhk1qp1dx4rz59xm9agkk1hzi3";
   };
 
   configureFlags = [

From 0b8564ba35bf20405c94154f27777b6bfaea3b31 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Feb 2017 23:57:50 +0100
Subject: [PATCH 0321/3449] qutebrowser: 0.9.0 -> 0.9.1

---
 .../networking/browsers/qutebrowser/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 3746bbe4f7ec..4c186fcf5ea9 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -7,11 +7,11 @@
 let
   pdfjs = stdenv.mkDerivation rec {
     name = "pdfjs-${version}";
-    version = "1.5.188";
+    version = "1.7.225";
 
     src = fetchurl {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
-      sha256 = "1y3yaqfgjj96qzvbm5200x68j5hy1qs7l2mqm3kbbj2b58z9f1qv";
+      sha256 = "1n8ylmv60r0qbw2vilp640a87l4lgnrsi15z3iihcs6dj1n1yy67";
     };
 
     nativeBuildInputs = [ unzip ];
@@ -24,12 +24,12 @@ let
 
 in buildPythonApplication rec {
   name = "qutebrowser-${version}";
-  version = "0.9.0";
+  version = "0.9.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1fp7yddx8xmy6hx01gg4z3vnw8b9qa5ixam7150i3xaalx0gjzfq";
+    sha256 = "0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass";
   };
 
   # Needs tox

From 486b9be579fc1f046671ddaf1157f084ba956bdd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 13 Feb 2017 23:59:03 +0100
Subject: [PATCH 0322/3449] eclipse-plugin-scala: use stable download URL

Unfortunately, the latest release does not appear to be available
through a stable URL.
---
 pkgs/applications/editors/eclipse/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 68859a7ac41e..76f6f4bcc486 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -388,7 +388,7 @@ rec {
     version = "4.4.1.201605041056";
 
     src = fetchzip {
-      url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
+      url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/base-20160504-1321.zip";
       sha256 = "13xgx2rwlll0l4bs0g6gyvrx5gcc0125vzn501fdj0wv2fqxn5lw";
     };
 

From d0a086770a1be8c1f3175c195587052c5a5bfe1c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 13 Feb 2017 18:06:01 -0500
Subject: [PATCH 0323/3449] nix-daemon: default useSandbox to true

---
 nixos/doc/manual/release-notes/rl-1703.xml | 4 ++++
 nixos/modules/services/misc/nix-daemon.nix | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 51de93db92f2..08b772e56703 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -25,6 +25,10 @@ has the following highlights: </para>
   <listitem>
     <para>PHP now defaults to PHP 7.1</para>
   </listitem>
+
+  <listitem>
+    <para>nix-daemon now uses sandboxing by default.</para>
+  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 7101cadfeed2..4c7264f4ac83 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -100,14 +100,14 @@ in
 
       useSandbox = mkOption {
         type = types.either types.bool (types.enum ["relaxed"]);
-        default = false;
+        default = true;
         description = "
           If set, Nix will perform builds in a sandboxed environment that it
           will set up automatically for each build.  This prevents
           impurities in builds by disallowing access to dependencies
-          outside of the Nix store. This isn't enabled by default for
-          performance. It doesn't affect derivation hashes, so changing
-          this option will not trigger a rebuild of packages.
+          outside of the Nix store. It doesn't affect derivation
+          hashes, so changing this option will not trigger a rebuild
+          of packages.
         ";
       };
 

From 218713aa3d05ecba57884ce3624d971217443b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 14 Feb 2017 00:09:21 +0100
Subject: [PATCH 0324/3449] guile*: split outputs to fix #22757

The main aim is to decouple propagatedBuildInputs from $out.
---
 pkgs/development/interpreters/guile/1.8.nix     | 3 +++
 pkgs/development/interpreters/guile/default.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index 5db3f10fb07d..c50a5fbab077 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -11,6 +11,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./cpp-4.5.patch ];
 
+  outputs = [ "out" "dev" "info" ];
+  setOutputFlags = false; # $dev gets into the library otherwise
+
   # GCC 4.6 raises a number of set-but-unused warnings.
   configureFlags = [ "--disable-error-on-warning" ];
 
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 0283f7774857..fa8bd29bd684 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -14,6 +14,9 @@
     sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
   };
 
+  outputs = [ "out" "dev" "info" ];
+  setOutputFlags = false; # $dev gets into the library otherwise
+
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
   propagatedBuildInputs = [ gmp boehmgc ]

From acce1d9ad26bbec08b9e8621e9afdd66da4475ef Mon Sep 17 00:00:00 2001
From: Rongcui Dong <rongcuid@outlook.com>
Date: Mon, 6 Feb 2017 17:05:12 -0800
Subject: [PATCH 0325/3449] ngspice: Add XSpice and Cider support

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

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index 7a493e14bca7..dfcdac20ae08 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
+{stdenv, fetchurl, readline, bison, flex, libX11, libICE, libXaw, libXext}:
 
 stdenv.mkDerivation {
   name = "ngspice-26";
@@ -8,9 +8,9 @@ stdenv.mkDerivation {
     sha256 = "51e230c8b720802d93747bc580c0a29d1fb530f3dd06f213b6a700ca9a4d0108";
   };
 
-  buildInputs = [ readline libX11 bison libICE libXaw libXext ];
+  buildInputs = [ readline libX11 flex bison libICE libXaw libXext ];
 
-  configureFlags = [ "--enable-x" "--with-x" "--with-readline" ];
+  configureFlags = [ "--enable-x" "--with-x" "--with-readline" "--enable-xspice" "--enable-cider" ];
 
   meta = with stdenv.lib; {
     description = "The Next Generation Spice (Electronic Circuit Simulator)";

From 07c21bfaf72b54c3bcc1649c635d95fdc900a5ed Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 14 Feb 2017 00:27:12 +0100
Subject: [PATCH 0326/3449] ycmd: fix darwin build

---
 .../tools/misc/ycmd/2-ycm-cmake.patch         | 41 +++++++++----------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
index 76b996ec2cca..baa907b21262 100644
--- a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
+++ b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch
@@ -2,30 +2,19 @@ diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt
 index 2074c58e..9ecd6e57 100644
 --- a/cpp/ycm/CMakeLists.txt
 +++ b/cpp/ycm/CMakeLists.txt
-@@ -366,35 +366,6 @@ if( LIBCLANG_TARGET )
-       POST_BUILD
+@@ -335,7 +335,7 @@
        COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>"
      )
--
+ 
 -    if( APPLE )
--      # In OS X El Capitan, Apple introduced System Integrity Protection.
--      # Amongst other things, this introduces features to the dynamic loader
--      # (dyld) which cause it to "sanitise" (and complain about) embedded
--      # LC_RPATH entries which contain @executable_path when then are loaded
--      # into "restricted" binaries.  For our purposes, "restricted" here means
--      # "supplied by Apple" and includes the system versions of python.  For
--      # unknown reasons, the libclang.dylib that comes from llvm.org includes an
--      # LC_RPATH entry '@executable_path/../lib' which causes the OS X dynamic
--      # loader to print a cryptic warning to stderr of the form:
--      #
--      #    dyld: warning, LC_RPATH @executable_path/../lib in
--      #    /path/to/ycmd/libclang.dylib being ignored in restricted program
--      #    because of @executable_path
--      #
--      # In order to prevent this harmless and annoying message appearing, we
--      # simply strip the rpath entry from the dylib.  There's no way any
--      # @executable_path that python might have could be in any way useful to
--      # libclang.dylib, so this seems perfectly safe.
++  #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
@@ -35,6 +24,14 @@ index 2074c58e..9ecd6e57 100644
 -                          "$<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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 496d6e9e236d..622fcaadb48c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6807,6 +6807,7 @@ with pkgs;
 
   ycmd = callPackage ../development/tools/misc/ycmd {
     inherit (darwin.apple_sdk.frameworks) Cocoa;
+    llvmPackages = llvmPackages_39;
     python = python2;
   };
 

From 08779a71e996a8d2a8a1f185d04e7d833b8c7884 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Feb 2017 00:26:59 +0100
Subject: [PATCH 0327/3449] eclipse-plugin-jdt: 4.6 -> 4.6.2

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 76f6f4bcc486..46b81cb0a545 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -341,12 +341,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.6";
+    version = "4.6.2";
 
     src = fetchzip {
       stripRoot = false;
-      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6-201606061100/org.eclipse.jdt-4.6.zip";
-      sha256 = "0raz8d09fnnx19l012l5frca97qavfivvygn3mvsllcyskhqc5hg";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/org.eclipse.jdt-4.6.2.zip";
+      sha256 = "1nnlrl05lh1hcsh14dlisnx0vwmj21agm4wia98rv0gl2gkp19n1";
     };
 
     meta = with stdenv.lib; {

From 8a7a44c9181217e3640534b49b7a135023d22890 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 Nov 2016 12:39:59 -0500
Subject: [PATCH 0328/3449] javaPackages: Use artifactId/groupId

---
 pkgs/build-support/fetchurl/mirrors.nix       |   4 +-
 .../java-modules/apache/ant-launcher.nix      |   4 +-
 pkgs/development/java-modules/apache/ant.nix  |   4 +-
 .../java-modules/apache/commons-cli.nix       |   8 +-
 .../java-modules/apache/commons-io.nix        |   4 +-
 .../java-modules/apache/commons-lang.nix      |  12 +-
 .../java-modules/apache/commons-lang3.nix     |   4 +-
 .../apache/commons-logging-api.nix            |   4 +-
 .../java-modules/apache/xbean-reflect.nix     |   4 +-
 .../java-modules/beanshell/bsh.nix            |   4 +-
 .../java-modules/classworlds/classworlds.nix  |   8 +-
 .../java-modules/eclipse/aether-util.nix      |   4 +-
 .../java-modules/findbugs/jsr305.nix          |   4 +-
 .../java-modules/google/collections.nix       |   4 +-
 .../development/java-modules/hamcrest/all.nix |   4 +-
 .../java-modules/hamcrest/core.nix            |   4 +-
 .../java-modules/junit/default.nix            |   8 +-
 .../java-modules/log4j/default.nix            |   4 +-
 pkgs/development/java-modules/m2install.nix   |   6 +-
 .../java-modules/maven/archiver.nix           |   4 +-
 .../java-modules/maven/artifact-manager.nix   |  16 +-
 .../java-modules/maven/artifact.nix           |  24 +-
 .../maven/common-artifact-filters.nix         |  12 +-
 pkgs/development/java-modules/maven/core.nix  |  16 +-
 .../java-modules/maven/dependency-tree.nix    |   4 +-
 .../java-modules/maven/doxia-sink-api.nix     |  12 +-
 .../java-modules/maven/enforcer.nix           |   8 +-
 .../java-modules/maven/error-diagnostics.nix  |  16 +-
 .../java-modules/maven/filtering.nix          |   4 +-
 pkgs/development/java-modules/maven/model.nix |  20 +-
 .../java-modules/maven/monitor.nix            |  16 +-
 .../java-modules/maven/plugin-annotations.nix |   8 +-
 .../java-modules/maven/plugin-api.nix         |  20 +-
 .../java-modules/maven/plugin-descriptor.nix  |  16 +-
 .../maven/plugin-parameter-documenter.nix     |  16 +-
 .../java-modules/maven/plugin-registry.nix    |  16 +-
 .../maven/plugin-testing-harness.nix          |   4 +-
 .../java-modules/maven/profile.nix            |  16 +-
 .../java-modules/maven/project.nix            |  20 +-
 .../java-modules/maven/reporting-api.nix      |  16 +-
 .../maven/repository-metadata.nix             |  16 +-
 .../java-modules/maven/settings.nix           |  16 +-
 .../java-modules/maven/shared-incremental.nix |   4 +-
 .../java-modules/maven/shared-utils.nix       |   4 +-
 .../java-modules/maven/surefire-api.nix       |   8 +-
 .../java-modules/maven/surefire-booter.nix    |   8 +-
 .../java-modules/maven/surefire-common.nix    |   8 +-
 .../java-modules/maven/surefire-junit4.nix    |   4 +-
 .../java-modules/maven/toolchain.nix          |  12 +-
 .../development/java-modules/mavenPlugins.nix |  40 +-
 .../java-modules/mojo/animal-sniffer.nix      |   4 +-
 .../mojo/java-boot-classpath-detector.nix     |   4 +-
 pkgs/development/java-modules/ow2/asm-all.nix |   4 +-
 .../java-modules/plexus/archiver.nix          |   8 +-
 .../java-modules/plexus/build-api.nix         |   4 +-
 .../java-modules/plexus/classworlds.nix       |   8 +-
 .../java-modules/plexus/compiler-api.nix      |   4 +-
 .../java-modules/plexus/compiler-javac.nix    |   4 +-
 .../java-modules/plexus/compiler-manager.nix  |   4 +-
 .../plexus/component-annotations.nix          |   4 +-
 .../java-modules/plexus/container-default.nix |  12 +-
 .../java-modules/plexus/digest.nix            |   4 +-
 pkgs/development/java-modules/plexus/i18n.nix |   4 +-
 .../java-modules/plexus/interactivity-api.nix |   4 +-
 .../java-modules/plexus/interpolation.nix     |  16 +-
 pkgs/development/java-modules/plexus/io.nix   |   4 +-
 .../development/java-modules/plexus/utils.nix |  64 +--
 pkgs/development/java-modules/poms.nix        | 424 +++++++++---------
 pkgs/development/java-modules/sisu/guice.nix  |   4 +-
 .../java-modules/sisu/inject-bean.nix         |   4 +-
 .../java-modules/sisu/inject-plexus.nix       |   4 +-
 pkgs/development/java-modules/xerces/impl.nix |   4 +-
 .../java-modules/xml-apis/default.nix         |   4 +-
 73 files changed, 551 insertions(+), 551 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 0304165828f0..f181ade10725 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -398,7 +398,7 @@ rec {
 
   # Maven Central
   maven = [
-    http://repo1.maven.org/maven2
-    http://central.maven.org/maven2
+    http://repo1.maven.org/maven2/
+    http://central.maven.org/maven2/
   ];
 }
diff --git a/pkgs/development/java-modules/apache/ant-launcher.nix b/pkgs/development/java-modules/apache/ant-launcher.nix
index 0e4d7b26765c..e6a2b0cae99d 100644
--- a/pkgs/development/java-modules/apache/ant-launcher.nix
+++ b/pkgs/development/java-modules/apache/ant-launcher.nix
@@ -3,8 +3,8 @@
 rec {
   antLauncher_1_8_2 = map (obj: fetchMaven {
     version = "1.8.2";
-    baseName = "ant-launcher";
-    package = "/org/apache/ant";
+    artifactId = "ant-launcher";
+    groupId = "org.apache.ant";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/apache/ant.nix b/pkgs/development/java-modules/apache/ant.nix
index fa83663f5ec2..b4a6aa68f448 100644
--- a/pkgs/development/java-modules/apache/ant.nix
+++ b/pkgs/development/java-modules/apache/ant.nix
@@ -3,8 +3,8 @@
 rec {
   ant_1_8_2 = map (obj: fetchMaven {
     version = "1.8.2";
-    baseName = "ant";
-    package = "/org/apache/ant";
+    artifactId = "ant";
+    groupId = "org.apache.ant";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-cli.nix b/pkgs/development/java-modules/apache/commons-cli.nix
index ffad5632b0a0..050d511b0a10 100644
--- a/pkgs/development/java-modules/apache/commons-cli.nix
+++ b/pkgs/development/java-modules/apache/commons-cli.nix
@@ -3,8 +3,8 @@
 rec {
   commonsCli_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "commons-cli";
-    package = "/commons-cli";
+    artifactId = "commons-cli";
+    groupId = "commons-cli";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   commonsCli_1_2 = map (obj: fetchMaven {
     version = "1.2";
-    baseName = "commons-cli";
-    package = "/commons-cli";
+    artifactId = "commons-cli";
+    groupId = "commons-cli";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-io.nix b/pkgs/development/java-modules/apache/commons-io.nix
index 612dcb85f8e1..70ce940ccf17 100644
--- a/pkgs/development/java-modules/apache/commons-io.nix
+++ b/pkgs/development/java-modules/apache/commons-io.nix
@@ -3,8 +3,8 @@
 rec {
   commonsIo_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "commons-io";
-    package = "/commons-io";
+    artifactId = "commons-io";
+    groupId = "commons-io";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-lang.nix b/pkgs/development/java-modules/apache/commons-lang.nix
index f6dc6b407efa..a2d71e9db0c8 100644
--- a/pkgs/development/java-modules/apache/commons-lang.nix
+++ b/pkgs/development/java-modules/apache/commons-lang.nix
@@ -3,8 +3,8 @@
 rec {
   commonsLang_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "commons-lang";
-    package = "/commons-lang";
+    artifactId = "commons-lang";
+    groupId = "commons-lang";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   commonsLang_2_3 = map (obj: fetchMaven {
     version = "2.3";
-    baseName = "commons-lang";
-    package = "/commons-lang";
+    artifactId = "commons-lang";
+    groupId = "commons-lang";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   commonsLang_2_6 = map (obj: fetchMaven {
     version = "2.6";
-    baseName = "commons-lang";
-    package = "/commons-lang";
+    artifactId = "commons-lang";
+    groupId = "commons-lang";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-lang3.nix b/pkgs/development/java-modules/apache/commons-lang3.nix
index 8b5498f362d4..63f68b925430 100644
--- a/pkgs/development/java-modules/apache/commons-lang3.nix
+++ b/pkgs/development/java-modules/apache/commons-lang3.nix
@@ -3,8 +3,8 @@
 rec {
   commonsLang3_3_1 = map (obj: fetchMaven {
     version = "3.1";
-    baseName = "commons-lang3";
-    package = "/org/apache/commons";
+    artifactId = "commons-lang3";
+    groupId = "org.apache.commons";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/apache/commons-logging-api.nix b/pkgs/development/java-modules/apache/commons-logging-api.nix
index 9aae04e42064..47750abe4623 100644
--- a/pkgs/development/java-modules/apache/commons-logging-api.nix
+++ b/pkgs/development/java-modules/apache/commons-logging-api.nix
@@ -3,8 +3,8 @@
 rec {
   commonsLoggingApi_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "commons-logging-api";
-    package = "/commons-logging";
+    artifactId = "commons-logging-api";
+    groupId = "commons-logging";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/apache/xbean-reflect.nix b/pkgs/development/java-modules/apache/xbean-reflect.nix
index c1e9916443c9..f0614ec99e36 100644
--- a/pkgs/development/java-modules/apache/xbean-reflect.nix
+++ b/pkgs/development/java-modules/apache/xbean-reflect.nix
@@ -3,8 +3,8 @@
 rec {
   xbeanReflect_3_4 = map (obj: fetchMaven {
     version = "3.4";
-    baseName = "xbean-reflect";
-    package = "/org/apache/xbean";
+    artifactId = "xbean-reflect";
+    groupId = "org.apache.xbean";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/beanshell/bsh.nix b/pkgs/development/java-modules/beanshell/bsh.nix
index e636fe557ecc..41756bb80d50 100644
--- a/pkgs/development/java-modules/beanshell/bsh.nix
+++ b/pkgs/development/java-modules/beanshell/bsh.nix
@@ -3,8 +3,8 @@
 rec {
   bsh_2_0_b4 = map (obj: fetchMaven {
     version = "2.0b4";
-    baseName = "bsh";
-    package = "/org/beanshell";
+    artifactId = "bsh";
+    groupId = "org.beanshell";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/classworlds/classworlds.nix b/pkgs/development/java-modules/classworlds/classworlds.nix
index 3a85cc4363ef..f8bbc07f1025 100644
--- a/pkgs/development/java-modules/classworlds/classworlds.nix
+++ b/pkgs/development/java-modules/classworlds/classworlds.nix
@@ -3,8 +3,8 @@
 rec {
   classworlds_1_1_alpha2 = map (obj: fetchMaven {
     version = "1.1-alpha-2";
-    baseName = "classworlds";
-    package = "/classworlds";
+    artifactId = "classworlds";
+    groupId = "classworlds";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   classworlds_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "classworlds";
-    package = "/classworlds";
+    artifactId = "classworlds";
+    groupId = "classworlds";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/eclipse/aether-util.nix b/pkgs/development/java-modules/eclipse/aether-util.nix
index 33ba3d5edd78..60aac560b9b2 100644
--- a/pkgs/development/java-modules/eclipse/aether-util.nix
+++ b/pkgs/development/java-modules/eclipse/aether-util.nix
@@ -3,8 +3,8 @@
 rec {
   aetherUtil_0_9_0_M2 = map (obj: fetchMaven {
     version = "0.9.0.M2";
-    baseName = "aether-util";
-    package = "/org/eclipse/aether";
+    artifactId = "aether-util";
+    groupId = "org.eclipse.aether";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/findbugs/jsr305.nix b/pkgs/development/java-modules/findbugs/jsr305.nix
index 466ce2476330..2e842410aafb 100644
--- a/pkgs/development/java-modules/findbugs/jsr305.nix
+++ b/pkgs/development/java-modules/findbugs/jsr305.nix
@@ -3,8 +3,8 @@
 rec {
   findbugsJsr305_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "jsr305";
-    package = "/com/google/code/findbugs";
+    artifactId = "jsr305";
+    groupId = "com.google.code.findbugs";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/google/collections.nix b/pkgs/development/java-modules/google/collections.nix
index 9898ddeaf31e..ec874c73e365 100644
--- a/pkgs/development/java-modules/google/collections.nix
+++ b/pkgs/development/java-modules/google/collections.nix
@@ -3,8 +3,8 @@
 rec {
   googleCollections_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "google-collections";
-    package = "/com/google/collections";
+    artifactId = "google-collections";
+    groupId = "com.google.collections";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/hamcrest/all.nix b/pkgs/development/java-modules/hamcrest/all.nix
index 2bba1ac92491..bab9e1b115d0 100644
--- a/pkgs/development/java-modules/hamcrest/all.nix
+++ b/pkgs/development/java-modules/hamcrest/all.nix
@@ -3,8 +3,8 @@
 rec {
   hamcrestAll_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-all";
-    package = "/org/hamcrest";
+    artifactId = "hamcrest-all";
+    groupId = "org.hamcrest";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/hamcrest/core.nix b/pkgs/development/java-modules/hamcrest/core.nix
index 104331f6f138..3842b8c5afa0 100644
--- a/pkgs/development/java-modules/hamcrest/core.nix
+++ b/pkgs/development/java-modules/hamcrest/core.nix
@@ -3,8 +3,8 @@
 rec {
   hamcrestCore_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-core";
-    package = "/org/hamcrest";
+    artifactId = "hamcrest-core";
+    groupId = "org.hamcrest";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix
index 2f315fa3161f..5017cb39602e 100644
--- a/pkgs/development/java-modules/junit/default.nix
+++ b/pkgs/development/java-modules/junit/default.nix
@@ -30,8 +30,8 @@ in rec {
 
   junit_3_8_1 = map (obj: fetchMaven {
     version = "3.8.1";
-    baseName = "junit";
-    package = "/junit";
+    artifactId = "junit";
+    groupId = "junit";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -41,8 +41,8 @@ in rec {
 
   junit_3_8_2 = map (obj: fetchMaven {
     version = "3.8.2";
-    baseName = "junit";
-    package = "/junit";
+    artifactId = "junit";
+    groupId = "junit";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/log4j/default.nix b/pkgs/development/java-modules/log4j/default.nix
index 65aaa41adb14..a8b1ea9f0217 100644
--- a/pkgs/development/java-modules/log4j/default.nix
+++ b/pkgs/development/java-modules/log4j/default.nix
@@ -3,8 +3,8 @@
 rec {
   log4j_1_2_12 = map (obj: fetchMaven {
     version = "1.2.12";
-    baseName = "log4j";
-    package = "/log4j";
+    artifactId = "log4j";
+    groupId = "log4j";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/m2install.nix b/pkgs/development/java-modules/m2install.nix
index 88e8efca1a15..7ebe655580e5 100644
--- a/pkgs/development/java-modules/m2install.nix
+++ b/pkgs/development/java-modules/m2install.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl }:
-{ version, baseName, package, sha512, type ? "jar", suffix ? "" }:
+{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }:
 
 let
-  name = "${baseName}-${version}";
-  m2Path = "${package}/${baseName}/${version}";
+  name = "${artifactId}-${version}";
+  m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
   m2File = "${name}${suffix}.${type}";
   src = fetchurl rec {
       inherit sha512;
diff --git a/pkgs/development/java-modules/maven/archiver.nix b/pkgs/development/java-modules/maven/archiver.nix
index ecab1f1e99ce..14c5a99d42ff 100644
--- a/pkgs/development/java-modules/maven/archiver.nix
+++ b/pkgs/development/java-modules/maven/archiver.nix
@@ -3,8 +3,8 @@
 rec {
   mavenArchiver_2_5 = map (obj: fetchMaven {
     version = "2.5";
-    baseName = "maven-archiver";
-    package = "/org/apache/maven";
+    artifactId = "maven-archiver";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/artifact-manager.nix b/pkgs/development/java-modules/maven/artifact-manager.nix
index 6d7e0caadfd5..0796d0665103 100644
--- a/pkgs/development/java-modules/maven/artifact-manager.nix
+++ b/pkgs/development/java-modules/maven/artifact-manager.nix
@@ -3,8 +3,8 @@
 rec {
   mavenArtifactManager_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenArtifactManager_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenArtifactManager_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenArtifactManager_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-artifact-manager";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact-manager";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/artifact.nix b/pkgs/development/java-modules/maven/artifact.nix
index 224570f910f8..bb0e578d5d63 100644
--- a/pkgs/development/java-modules/maven/artifact.nix
+++ b/pkgs/development/java-modules/maven/artifact.nix
@@ -3,8 +3,8 @@
 rec {
   mavenArtifact_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenArtifact_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenArtifact_2_0_8 = map (obj: fetchMaven {
     version = "2.0.8";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenArtifact_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenArtifact_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -58,8 +58,8 @@ rec {
 
   mavenArtifact_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
-    baseName = "maven-artifact";
-    package = "/org/apache/maven";
+    artifactId = "maven-artifact";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/common-artifact-filters.nix b/pkgs/development/java-modules/maven/common-artifact-filters.nix
index 3949882f98be..948dbc3baf6c 100644
--- a/pkgs/development/java-modules/maven/common-artifact-filters.nix
+++ b/pkgs/development/java-modules/maven/common-artifact-filters.nix
@@ -3,8 +3,8 @@
 rec {
   mavenCommonArtifactFilters_1_2 = map (obj: fetchMaven {
     version = "1.2";
-    baseName = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-common-artifact-filters";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenCommonArtifactFilters_1_3 = map (obj: fetchMaven {
     version = "1.3";
-    baseName = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-common-artifact-filters";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenCommonArtifactFilters_1_4 = map (obj: fetchMaven {
     version = "1.4";
-    baseName = "maven-common-artifact-filters";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-common-artifact-filters";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/core.nix b/pkgs/development/java-modules/maven/core.nix
index ed3313bba595..5b45f89e9d54 100644
--- a/pkgs/development/java-modules/maven/core.nix
+++ b/pkgs/development/java-modules/maven/core.nix
@@ -3,8 +3,8 @@
 rec {
   mavenCore_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenCore_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenCore_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenCore_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-core";
-    package = "/org/apache/maven";
+    artifactId = "maven-core";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/dependency-tree.nix b/pkgs/development/java-modules/maven/dependency-tree.nix
index cdd626e58486..00d089ea249b 100644
--- a/pkgs/development/java-modules/maven/dependency-tree.nix
+++ b/pkgs/development/java-modules/maven/dependency-tree.nix
@@ -3,8 +3,8 @@
 rec {
   mavenDependencyTree_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "maven-dependency-tree";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-dependency-tree";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/doxia-sink-api.nix b/pkgs/development/java-modules/maven/doxia-sink-api.nix
index 18ccf4b707a6..9fa1051cd80b 100644
--- a/pkgs/development/java-modules/maven/doxia-sink-api.nix
+++ b/pkgs/development/java-modules/maven/doxia-sink-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenDoxiaSinkApi_1_0_alpha6 = map (obj: fetchMaven {
     version = "1.0-alpha-6";
-    baseName = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia-sink-api";
+    groupId = "org.apache.maven.doxia";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenDoxiaSinkApi_1_0_alpha7 = map (obj: fetchMaven {
     version = "1.0-alpha-7";
-    baseName = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia-sink-api";
+    groupId = "org.apache.maven.doxia";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenDoxiaSinkApi_1_0_alpha10 = map (obj: fetchMaven {
     version = "1.0-alpha-10";
-    baseName = "doxia-sink-api";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia-sink-api";
+    groupId = "org.apache.maven.doxia";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/enforcer.nix b/pkgs/development/java-modules/maven/enforcer.nix
index 83037e6adee6..014f678bc149 100644
--- a/pkgs/development/java-modules/maven/enforcer.nix
+++ b/pkgs/development/java-modules/maven/enforcer.nix
@@ -3,8 +3,8 @@
 rec {
   mavenEnforcerApi_1_3_1 = map (obj: fetchMaven {
     version = "1.3.1";
-    baseName = "enforcer-api";
-    package = "/org/apache/maven/enforcer";
+    artifactId = "enforcer-api";
+    groupId = "org.apache.maven.enforcer";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenEnforcerRules_1_3_1 = map (obj: fetchMaven {
     version = "1.3.1";
-    baseName = "enforcer-rules";
-    package = "/org/apache/maven/enforcer";
+    artifactId = "enforcer-rules";
+    groupId = "org.apache.maven.enforcer";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/error-diagnostics.nix b/pkgs/development/java-modules/maven/error-diagnostics.nix
index 6f22316edc7a..80cbf993a60d 100644
--- a/pkgs/development/java-modules/maven/error-diagnostics.nix
+++ b/pkgs/development/java-modules/maven/error-diagnostics.nix
@@ -3,8 +3,8 @@
 rec {
   mavenErrorDiagnostics_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenErrorDiagnostics_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenErrorDiagnostics_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenErrorDiagnostics_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-error-diagnostics";
-    package = "/org/apache/maven";
+    artifactId = "maven-error-diagnostics";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/filtering.nix b/pkgs/development/java-modules/maven/filtering.nix
index 5851a3db195d..963d6c6b646d 100644
--- a/pkgs/development/java-modules/maven/filtering.nix
+++ b/pkgs/development/java-modules/maven/filtering.nix
@@ -3,8 +3,8 @@
 rec {
   mavenFiltering_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "maven-filtering";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-filtering";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/model.nix b/pkgs/development/java-modules/maven/model.nix
index 70bfd34e737c..2ae3bfe6034c 100644
--- a/pkgs/development/java-modules/maven/model.nix
+++ b/pkgs/development/java-modules/maven/model.nix
@@ -3,8 +3,8 @@
 rec {
   mavenModel_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenModel_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenModel_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenModel_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenModel_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
-    baseName = "maven-model";
-    package = "/org/apache/maven";
+    artifactId = "maven-model";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/monitor.nix b/pkgs/development/java-modules/maven/monitor.nix
index 0a71d7ba5a42..ce6c7c176941 100644
--- a/pkgs/development/java-modules/maven/monitor.nix
+++ b/pkgs/development/java-modules/maven/monitor.nix
@@ -3,8 +3,8 @@
 rec {
   mavenMonitor_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenMonitor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenMonitor_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenMonitor_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-monitor";
-    package = "/org/apache/maven";
+    artifactId = "maven-monitor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-annotations.nix b/pkgs/development/java-modules/maven/plugin-annotations.nix
index 6bd8928cf0fe..f852cc957a56 100644
--- a/pkgs/development/java-modules/maven/plugin-annotations.nix
+++ b/pkgs/development/java-modules/maven/plugin-annotations.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginAnnotations_3_1 = map (obj: fetchMaven {
     version = "3.1";
-    baseName = "maven-plugin-annotations";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-annotations";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginAnnotations_3_2 = map (obj: fetchMaven {
     version = "3.2";
-    baseName = "maven-plugin-annotations";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-annotations";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-api.nix b/pkgs/development/java-modules/maven/plugin-api.nix
index e4d8fbec39b2..be9642b0e206 100644
--- a/pkgs/development/java-modules/maven/plugin-api.nix
+++ b/pkgs/development/java-modules/maven/plugin-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginApi_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginApi_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginApi_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenPluginApi_3_0_3 = map (obj: fetchMaven {
     version = "3.0.3";
-    baseName = "maven-plugin-api";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-api";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-descriptor.nix b/pkgs/development/java-modules/maven/plugin-descriptor.nix
index 76f1bf5de1b2..dbdc09a46734 100644
--- a/pkgs/development/java-modules/maven/plugin-descriptor.nix
+++ b/pkgs/development/java-modules/maven/plugin-descriptor.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginDescriptor_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginDescriptor_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginDescriptor_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginDescriptor_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-descriptor";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-descriptor";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
index f3ef7c7fc5b0..9e11c0f40829 100644
--- a/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
+++ b/pkgs/development/java-modules/maven/plugin-parameter-documenter.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginParameterDocumenter_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginParameterDocumenter_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginParameterDocumenter_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginParameterDocumenter_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-parameter-documenter";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-parameter-documenter";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-registry.nix b/pkgs/development/java-modules/maven/plugin-registry.nix
index b75806182cff..f0074ef816ed 100644
--- a/pkgs/development/java-modules/maven/plugin-registry.nix
+++ b/pkgs/development/java-modules/maven/plugin-registry.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginRegistry_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenPluginRegistry_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenPluginRegistry_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenPluginRegistry_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-plugin-registry";
-    package = "/org/apache/maven";
+    artifactId = "maven-plugin-registry";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/plugin-testing-harness.nix b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
index 754bcc08031f..a65f19620485 100644
--- a/pkgs/development/java-modules/maven/plugin-testing-harness.nix
+++ b/pkgs/development/java-modules/maven/plugin-testing-harness.nix
@@ -3,8 +3,8 @@
 rec {
   mavenPluginTestingHarness_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "maven-plugin-testing-harness";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-plugin-testing-harness";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/profile.nix b/pkgs/development/java-modules/maven/profile.nix
index b160fb4e9437..6940fafae821 100644
--- a/pkgs/development/java-modules/maven/profile.nix
+++ b/pkgs/development/java-modules/maven/profile.nix
@@ -3,8 +3,8 @@
 rec {
   mavenProfile_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenProfile_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenProfile_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenProfile_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-profile";
-    package = "/org/apache/maven";
+    artifactId = "maven-profile";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/project.nix b/pkgs/development/java-modules/maven/project.nix
index f1ff4f05c4c5..0b07d8b8679b 100644
--- a/pkgs/development/java-modules/maven/project.nix
+++ b/pkgs/development/java-modules/maven/project.nix
@@ -3,8 +3,8 @@
 rec {
   mavenProject_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenProject_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenProject_2_0_8 = map (obj: fetchMaven {
     version = "2.0.8";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenProject_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   mavenProject_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-project";
-    package = "/org/apache/maven";
+    artifactId = "maven-project";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/reporting-api.nix b/pkgs/development/java-modules/maven/reporting-api.nix
index afb949d79c53..8a508cf15053 100644
--- a/pkgs/development/java-modules/maven/reporting-api.nix
+++ b/pkgs/development/java-modules/maven/reporting-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenReportingApi_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenReportingApi_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenReportingApi_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenReportingApi_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-reporting-api";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting-api";
+    groupId = "org.apache.maven.reporting";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/repository-metadata.nix b/pkgs/development/java-modules/maven/repository-metadata.nix
index 1ed2717ac4f3..443a1acd4513 100644
--- a/pkgs/development/java-modules/maven/repository-metadata.nix
+++ b/pkgs/development/java-modules/maven/repository-metadata.nix
@@ -3,8 +3,8 @@
 rec {
   mavenRepositoryMetadata_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenRepositoryMetadata_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenRepositoryMetadata_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenRepositoryMetadata_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-repository-metadata";
-    package = "/org/apache/maven";
+    artifactId = "maven-repository-metadata";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/settings.nix b/pkgs/development/java-modules/maven/settings.nix
index a18532fa3627..6b42082cfd8a 100644
--- a/pkgs/development/java-modules/maven/settings.nix
+++ b/pkgs/development/java-modules/maven/settings.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSettings_2_0_1 = map (obj: fetchMaven {
     version = "2.0.1";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSettings_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenSettings_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   mavenSettings_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-settings";
-    package = "/org/apache/maven";
+    artifactId = "maven-settings";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/shared-incremental.nix b/pkgs/development/java-modules/maven/shared-incremental.nix
index 2d4ec372be45..67c44986d0a0 100644
--- a/pkgs/development/java-modules/maven/shared-incremental.nix
+++ b/pkgs/development/java-modules/maven/shared-incremental.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSharedIncremental_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "maven-shared-incremental";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-incremental";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/shared-utils.nix b/pkgs/development/java-modules/maven/shared-utils.nix
index 9b56075383d0..b3cfc9280914 100644
--- a/pkgs/development/java-modules/maven/shared-utils.nix
+++ b/pkgs/development/java-modules/maven/shared-utils.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSharedUtils_0_1 = map (obj: fetchMaven {
     version = "0.1";
-    baseName = "maven-shared-utils";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-utils";
+    groupId = "org.apache.maven.shared";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-api.nix b/pkgs/development/java-modules/maven/surefire-api.nix
index cd422bbb7585..c1f7fcc3f76c 100644
--- a/pkgs/development/java-modules/maven/surefire-api.nix
+++ b/pkgs/development/java-modules/maven/surefire-api.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireApi_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-api";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-api";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSurefireApi_2_17 = map (obj: fetchMaven {
     version = "2.17";
-    baseName = "surefire-api";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-api";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-booter.nix b/pkgs/development/java-modules/maven/surefire-booter.nix
index f7fb8068a26c..b62aa86bf45c 100644
--- a/pkgs/development/java-modules/maven/surefire-booter.nix
+++ b/pkgs/development/java-modules/maven/surefire-booter.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireBooter_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-booter";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-booter";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSurefireBooter_2_17 = map (obj: fetchMaven {
     version = "2.17";
-    baseName = "surefire-booter";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-booter";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-common.nix b/pkgs/development/java-modules/maven/surefire-common.nix
index 4e56b0c5a86e..bc0573f6b706 100644
--- a/pkgs/development/java-modules/maven/surefire-common.nix
+++ b/pkgs/development/java-modules/maven/surefire-common.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireCommon_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "maven-surefire-common";
-    package = "/org/apache/maven/surefire";
+    artifactId = "maven-surefire-common";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenSurefireCommon_2_17 = map (obj: fetchMaven {
     version = "2.17";
-    baseName = "maven-surefire-common";
-    package = "/org/apache/maven/surefire";
+    artifactId = "maven-surefire-common";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/surefire-junit4.nix b/pkgs/development/java-modules/maven/surefire-junit4.nix
index 83aaebc7f6de..1374080d0874 100644
--- a/pkgs/development/java-modules/maven/surefire-junit4.nix
+++ b/pkgs/development/java-modules/maven/surefire-junit4.nix
@@ -3,8 +3,8 @@
 rec {
   mavenSurefireJunit4_2_12_4 = map (obj: fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-junit4";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-junit4";
+    groupId = "org.apache.maven.surefire";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/maven/toolchain.nix b/pkgs/development/java-modules/maven/toolchain.nix
index 97ea74a5e529..864d3b98f7ba 100644
--- a/pkgs/development/java-modules/maven/toolchain.nix
+++ b/pkgs/development/java-modules/maven/toolchain.nix
@@ -3,8 +3,8 @@
 rec {
   mavenToolchain_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "maven-toolchain";
-    package = "/org/apache/maven";
+    artifactId = "maven-toolchain";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   mavenToolchain_2_0_9 = map (obj: fetchMaven {
     version = "2.0.9";
-    baseName = "maven-toolchain";
-    package = "/org/apache/maven";
+    artifactId = "maven-toolchain";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   mavenToolchain_2_2_1 = map (obj: fetchMaven {
     version = "2.2.1";
-    baseName = "maven-toolchain";
-    package = "/org/apache/maven";
+    artifactId = "maven-toolchain";
+    groupId = "org.apache.maven";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/mavenPlugins.nix b/pkgs/development/java-modules/mavenPlugins.nix
index 5cd022b68377..e9ce5b1ce8cf 100644
--- a/pkgs/development/java-modules/mavenPlugins.nix
+++ b/pkgs/development/java-modules/mavenPlugins.nix
@@ -10,8 +10,8 @@ in rec {
 
   animalSniffer_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "animal-sniffer-maven-plugin";
-    package = "/org/codehaus/mojo";
+    artifactId = "animal-sniffer-maven-plugin";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -21,8 +21,8 @@ in rec {
 
   mavenClean_2_5 = map (obj: fetchMaven rec {
     version = "2.5";
-    baseName = "maven-clean-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-clean-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -32,8 +32,8 @@ in rec {
 
   mavenCompiler_3_1 = map (obj: fetchMaven rec {
     version = "3.1";
-    baseName = "maven-compiler-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-compiler-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -43,8 +43,8 @@ in rec {
 
   mavenEnforcer_1_3_1 = map (obj: fetchMaven rec {
     version = "1.3.1";
-    baseName = "maven-enforcer-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-enforcer-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -54,8 +54,8 @@ in rec {
 
   mavenInstall_2_4 = map (obj: fetchMaven rec {
     version = "2.4";
-    baseName = "maven-install-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-install-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -65,8 +65,8 @@ in rec {
 
   mavenJar_2_4 = map (obj: fetchMaven rec {
     version = "2.4";
-    baseName = "maven-jar-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-jar-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -76,8 +76,8 @@ in rec {
 
   mavenReplacer_1_5_3 = map (obj: fetchMaven rec {
     version = "1.5.3";
-    baseName = "replacer";
-    package = "/com/google/code/maven-replacer-plugin";
+    artifactId = "replacer";
+    groupId = "com.google.code.maven-replacer-plugin";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -87,8 +87,8 @@ in rec {
 
   mavenResources_2_6 = map (obj: fetchMaven rec {
     version = "2.6";
-    baseName = "maven-resources-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-resources-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -98,8 +98,8 @@ in rec {
 
   mavenSurefire_2_12_4 = map (obj: fetchMaven rec {
     version = "2.12.4";
-    baseName = "maven-surefire-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-surefire-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -109,8 +109,8 @@ in rec {
 
   mavenSurefire_2_17 = map (obj: fetchMaven rec {
     version = "2.17";
-    baseName = "maven-surefire-plugin";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-surefire-plugin";
+    groupId = "org.apache.maven.plugins";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/mojo/animal-sniffer.nix b/pkgs/development/java-modules/mojo/animal-sniffer.nix
index b6a5565f6fc5..dd9b1d1b0aa5 100644
--- a/pkgs/development/java-modules/mojo/animal-sniffer.nix
+++ b/pkgs/development/java-modules/mojo/animal-sniffer.nix
@@ -3,8 +3,8 @@
 rec {
   mojoAnimalSniffer_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "animal-sniffer";
-    package = "/org/codehaus/mojo";
+    artifactId = "animal-sniffer";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
index 95eb52ae3e80..245daa5fdb90 100644
--- a/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
+++ b/pkgs/development/java-modules/mojo/java-boot-classpath-detector.nix
@@ -3,8 +3,8 @@
 rec {
   mojoJavaBootClasspathDetector_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "java-boot-classpath-detector";
-    package = "/org/codehaus/mojo";
+    artifactId = "java-boot-classpath-detector";
+    groupId = "org.codehaus.mojo";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/ow2/asm-all.nix b/pkgs/development/java-modules/ow2/asm-all.nix
index 2fee6529f16e..08d18745ed7f 100644
--- a/pkgs/development/java-modules/ow2/asm-all.nix
+++ b/pkgs/development/java-modules/ow2/asm-all.nix
@@ -3,8 +3,8 @@
 rec {
   ow2AsmAll_4_0 = map (obj: fetchMaven {
     version = "4.0";
-    baseName = "asm-all";
-    package = "/org/ow2/asm";
+    artifactId = "asm-all";
+    groupId = "org.ow2.asm";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/archiver.nix b/pkgs/development/java-modules/plexus/archiver.nix
index 3a2b0a347e3d..384b92859762 100644
--- a/pkgs/development/java-modules/plexus/archiver.nix
+++ b/pkgs/development/java-modules/plexus/archiver.nix
@@ -3,8 +3,8 @@
 rec {
   plexusArchiver_1_0_alpha7 = map (obj: fetchMaven {
     version = "1.0-alpha-7";
-    baseName = "plexus-archiver";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-archiver";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusArchiver_2_1 = map (obj: fetchMaven {
     version = "2.1";
-    baseName = "plexus-archiver";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-archiver";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/build-api.nix b/pkgs/development/java-modules/plexus/build-api.nix
index 2425a6f12bae..c417c955b69b 100644
--- a/pkgs/development/java-modules/plexus/build-api.nix
+++ b/pkgs/development/java-modules/plexus/build-api.nix
@@ -3,8 +3,8 @@
 rec {
   plexusBuildApi_0_0_4 = map (obj: fetchMaven {
     version = "0.0.4";
-    baseName = "plexus-build-api";
-    package = "/org/sonatype/plexus";
+    artifactId = "plexus-build-api";
+    groupId = "org.sonatype.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/classworlds.nix b/pkgs/development/java-modules/plexus/classworlds.nix
index 308287a29048..6ff1755e8f53 100644
--- a/pkgs/development/java-modules/plexus/classworlds.nix
+++ b/pkgs/development/java-modules/plexus/classworlds.nix
@@ -3,8 +3,8 @@
 rec {
   plexusClassworlds_2_2_2 = map (obj: fetchMaven {
     version = "2.2.2";
-    baseName = "plexus-classworlds";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-classworlds";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusClassworlds_2_4 = map (obj: fetchMaven {
     version = "2.4";
-    baseName = "plexus-classworlds";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-classworlds";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/compiler-api.nix b/pkgs/development/java-modules/plexus/compiler-api.nix
index 2ef5d3cdab15..11baab0950d0 100644
--- a/pkgs/development/java-modules/plexus/compiler-api.nix
+++ b/pkgs/development/java-modules/plexus/compiler-api.nix
@@ -3,8 +3,8 @@
 rec {
   plexusCompilerApi_2_2 = map (obj: fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler-api";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler-api";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/compiler-javac.nix b/pkgs/development/java-modules/plexus/compiler-javac.nix
index e3f4defd97ad..a42064a0e9e8 100644
--- a/pkgs/development/java-modules/plexus/compiler-javac.nix
+++ b/pkgs/development/java-modules/plexus/compiler-javac.nix
@@ -3,8 +3,8 @@
 rec {
   plexusCompilerJavac_2_2 = map (obj: fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler-javac";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler-javac";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/compiler-manager.nix b/pkgs/development/java-modules/plexus/compiler-manager.nix
index 0675fff5004e..f7221a96627f 100644
--- a/pkgs/development/java-modules/plexus/compiler-manager.nix
+++ b/pkgs/development/java-modules/plexus/compiler-manager.nix
@@ -3,8 +3,8 @@
 rec {
   plexusCompilerManager_2_2 = map (obj: fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler-manager";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler-manager";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/component-annotations.nix b/pkgs/development/java-modules/plexus/component-annotations.nix
index 949238001bea..fd3fc80e7e05 100644
--- a/pkgs/development/java-modules/plexus/component-annotations.nix
+++ b/pkgs/development/java-modules/plexus/component-annotations.nix
@@ -3,8 +3,8 @@
 rec {
   plexusComponentAnnotations_1_5_5 = map (obj: fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-component-annotations";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-component-annotations";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/container-default.nix b/pkgs/development/java-modules/plexus/container-default.nix
index 4b9949f3eb3c..375a1913afcd 100644
--- a/pkgs/development/java-modules/plexus/container-default.nix
+++ b/pkgs/development/java-modules/plexus/container-default.nix
@@ -3,8 +3,8 @@
 rec {
   plexusContainerDefault_1_0_alpha9 = map (obj: fetchMaven {
     version = "1.0-alpha-9";
-    baseName = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-container-default";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusContainerDefault_1_0_alpha9_stable1 = map (obj: fetchMaven {
     version = "1.0-alpha-9-stable-1";
-    baseName = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-container-default";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   plexusContainerDefault_1_5_5 = map (obj: fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-container-default";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-container-default";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/digest.nix b/pkgs/development/java-modules/plexus/digest.nix
index 8bd73891779f..be2013a26760 100644
--- a/pkgs/development/java-modules/plexus/digest.nix
+++ b/pkgs/development/java-modules/plexus/digest.nix
@@ -3,8 +3,8 @@
 rec {
   plexusDigest_1_0 = map (obj: fetchMaven {
     version = "1.0";
-    baseName = "plexus-digest";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-digest";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/i18n.nix b/pkgs/development/java-modules/plexus/i18n.nix
index 7af0cd17de8e..5b34cde0503c 100644
--- a/pkgs/development/java-modules/plexus/i18n.nix
+++ b/pkgs/development/java-modules/plexus/i18n.nix
@@ -3,8 +3,8 @@
 rec {
   plexusI18n_1_0_beta6 = map (obj: fetchMaven {
     version = "1.0-beta-6";
-    baseName = "plexus-i18n";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-i18n";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/interactivity-api.nix b/pkgs/development/java-modules/plexus/interactivity-api.nix
index 9d62aec70f47..8ada106f48fd 100644
--- a/pkgs/development/java-modules/plexus/interactivity-api.nix
+++ b/pkgs/development/java-modules/plexus/interactivity-api.nix
@@ -3,8 +3,8 @@
 rec {
   plexusInteractivityApi_1_0_alpha4 = map (obj: fetchMaven {
     version = "1.0-alpha-4";
-    baseName = "plexus-interactivity-api";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interactivity-api";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/interpolation.nix b/pkgs/development/java-modules/plexus/interpolation.nix
index 2d08495532d1..90ff3de6a3fe 100644
--- a/pkgs/development/java-modules/plexus/interpolation.nix
+++ b/pkgs/development/java-modules/plexus/interpolation.nix
@@ -3,8 +3,8 @@
 rec {
   plexusInterpolation_1_11 = map (obj: fetchMaven {
     version = "1.11";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusInterpolation_1_12 = map (obj: fetchMaven {
     version = "1.12";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   plexusInterpolation_1_13 = map (obj: fetchMaven {
     version = "1.13";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   plexusInterpolation_1_15 = map (obj: fetchMaven {
     version = "1.15";
-    baseName = "plexus-interpolation";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-interpolation";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/io.nix b/pkgs/development/java-modules/plexus/io.nix
index 1b17ae3c2cac..eee41f5ed2fd 100644
--- a/pkgs/development/java-modules/plexus/io.nix
+++ b/pkgs/development/java-modules/plexus/io.nix
@@ -3,8 +3,8 @@
 rec {
   plexusIo_2_0_2 = map (obj: fetchMaven {
     version = "2.0.2";
-    baseName = "plexus-io";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-io";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/plexus/utils.nix b/pkgs/development/java-modules/plexus/utils.nix
index ca46c0d4d624..ce0537cea7d8 100644
--- a/pkgs/development/java-modules/plexus/utils.nix
+++ b/pkgs/development/java-modules/plexus/utils.nix
@@ -3,8 +3,8 @@
 rec {
   plexusUtils_1_0_4 = map (obj: fetchMaven {
     version = "1.0.4";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -14,8 +14,8 @@ rec {
 
   plexusUtils_1_0_5 = map (obj: fetchMaven {
     version = "1.0.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -25,8 +25,8 @@ rec {
 
   plexusUtils_1_1 = map (obj: fetchMaven {
     version = "1.1";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -36,8 +36,8 @@ rec {
 
   plexusUtils_1_4_1 = map (obj: fetchMaven {
     version = "1.4.1";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -47,8 +47,8 @@ rec {
 
   plexusUtils_1_4_5 = map (obj: fetchMaven {
     version = "1.4.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -58,8 +58,8 @@ rec {
 
   plexusUtils_1_4_9 = map (obj: fetchMaven {
     version = "1.4.9";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -69,8 +69,8 @@ rec {
 
   plexusUtils_1_5_1 = map (obj: fetchMaven {
     version = "1.5.1";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -80,8 +80,8 @@ rec {
 
   plexusUtils_1_5_5 = map (obj: fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -91,8 +91,8 @@ rec {
 
   plexusUtils_1_5_6 = map (obj: fetchMaven {
     version = "1.5.6";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -102,8 +102,8 @@ rec {
 
   plexusUtils_1_5_8 = map (obj: fetchMaven {
     version = "1.5.8";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -113,8 +113,8 @@ rec {
 
   plexusUtils_1_5_15 = map (obj: fetchMaven {
     version = "1.5.15";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -124,8 +124,8 @@ rec {
 
   plexusUtils_2_0_5 = map (obj: fetchMaven {
     version = "2.0.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -135,8 +135,8 @@ rec {
 
   plexusUtils_2_0_6 = map (obj: fetchMaven {
     version = "2.0.6";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -146,8 +146,8 @@ rec {
 
   plexusUtils_3_0 = map (obj: fetchMaven {
     version = "3.0";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -157,8 +157,8 @@ rec {
 
   plexusUtils_3_0_5 = map (obj: fetchMaven {
     version = "3.0.5";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
@@ -168,8 +168,8 @@ rec {
 
   plexusUtils_3_0_8 = map (obj: fetchMaven {
     version = "3.0.8";
-    baseName = "plexus-utils";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-utils";
+    groupId = "org.codehaus.plexus";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/poms.nix b/pkgs/development/java-modules/poms.nix
index 7feff9548a1f..610f98a7e466 100644
--- a/pkgs/development/java-modules/poms.nix
+++ b/pkgs/development/java-modules/poms.nix
@@ -3,848 +3,848 @@
 rec {
   aether_0_9_0_M2 = fetchMaven {
     version = "0.9.0.M2";
-    baseName = "aether";
-    package = "/org/eclipse/aether";
+    artifactId = "aether";
+    groupId = "org.eclipse.aether";
     sha512 = "0ampl2jkkc1f5cbigmi1b5nnxhb9qqzz0nyfb5a2vzbw3ri7ry8dj6xgjznlpxib46zxgaxcsvhxq2yx6a9i8chnzvgghccwpl808yi";
     type = "pom";
   };
 
   animalSnifferParent_1_11 = fetchMaven {
     version = "1.11";
-    baseName = "animal-sniffer-parent";
-    package = "/org/codehaus/mojo";
+    artifactId = "animal-sniffer-parent";
+    groupId = "org.codehaus.mojo";
     sha512 = "3w9l3b4qxzmlwmaqppn1d794ycqf5piilv44fc74jccbgahdsq1as8dvyknnj2610yklwxx3146s7f0c3ms8y93alv02wybjwk5fd07";
     type = "pom";
   };
 
   antParent_1_8_2 = fetchMaven {
     version = "1.8.2";
-    baseName = "ant-parent";
-    package = "/org/apache/ant";
+    artifactId = "ant-parent";
+    groupId = "org.apache.ant";
     sha512 = "1q560n9xbqk9qpprvm0nigd5nhm9s8m027qxjmzhay083sjrazscpaly4mzgry5lpdmr3xyhly1r1s88879y04qr5xqzqh0j45j943x";
     type = "pom";
   };
 
   apache_1 = fetchMaven {
     version = "1";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0vbf7mbs61n13dmxndvzkafr0sg9p7g45ng9j1917cz8a9m4zflqf7xvpp9wfprmb4d1wd3ay2hhy9brxryqmvx41wfjlk9ahg34k0h";
     type = "pom";
   };
 
   apache_3 = fetchMaven {
     version = "3";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "3vvqxycj7zxa9dfxa6f8i2azdvxc7ci68fk3nlkjvhsglmwr39wf6cwgj6qqlrw3mabzs714lgz0wdacsidncadxzfw774ck20dq1rf";
     type = "pom";
   };
 
   apache_4 = fetchMaven {
     version = "4";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "3yb998i1azfxdjk2ndcc19gzx12i0bdi6jqwp5mhwp9ac5dfsplkb5np4bkpsb948y8kpvw1pyvkx8rw0a0rvkxqzxr98ng5nq80vw6";
     type = "pom";
   };
 
   apache_5 = fetchMaven {
     version = "5";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "11l6b46mwm404vahylssab5mj4a1fw3zrjhsz3mcj5x3awnqa03131j8phias2n0rppn53xcg2p2xgr9mbp7llwabwx8jm0kz2mpgh0";
     type = "pom";
   };
 
   apache_6 = fetchMaven {
     version = "6";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "2nvwk7fhiqcbr4vrwl0d3g4wz25vll24ga9kyc89fzq6b9nr6bqfphrm5a73kdih97l5cqlszw8xc847viw2ss1mwabn590f01ykhj0";
     type = "pom";
   };
 
   apache_7 = fetchMaven {
     version = "7";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "2yvwxxifqypmpgxyx10ggj6l52jnl64f9554kyfdph7z56n02bcalj3cr43m6br0as6yc67k5p23l2k3gvdr66c5dfw1l8rwhahk9lr";
     type = "pom";
   };
 
   apache_9 = fetchMaven {
     version = "9";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0wak95l7zlizrildiji9763zzs10dmhflxaqzg8r9qw2j8a20f2nmns03skvd8na2p12zzvrxa15p952gdfkvrynmvcv2vi1qz822g9";
     type = "pom";
   };
 
   apache_10 = fetchMaven {
     version = "10";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0kmva6f2q5rq7rk9ljwn3rxa4w2j7sjkxsmvambzqpj61cagdnq4vj9jk0xxx8448kqckdh5w2xkr5lr33sgfl67jy9l5h2s6h13v6m";
     type = "pom";
   };
 
   apache_11 = fetchMaven {
     version = "11";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "09v6sghdaxinrk3pnpnc36x24z62gqn65v25q83mc0q6n49l0xir55xk21qzc8kc6hrdr9khnr7jxkqz207cyv6wky6sy7c3pqg0na0";
     type = "pom";
   };
 
   apache_13 = fetchMaven {
     version = "13";
-    baseName = "apache";
-    package = "/org/apache";
+    artifactId = "apache";
+    groupId = "org.apache";
     sha512 = "0sf86l1457wwp8czg32xhh96l5nlw8v84lbi59nfdxxzcrsn8b1ysgwda3r1ck0d86c5gjmh3qg7kbwlrspwa71w9zn9sby3bszj99v";
     type = "pom";
   };
 
   asmParent_4_0 = fetchMaven {
     version = "4.0";
-    baseName = "asm-parent";
-    package = "/org/ow2/asm";
+    artifactId = "asm-parent";
+    groupId = "org.ow2.asm";
     sha512 = "2vysz9nn1pn1qzd40n7d2njmcpz7qi37pi73k9ajjmmbzwza6h8gc1pvadfqxlnih47gzc1wn3hqrc1sqd3b84kh8nrznwjcp10y0lf";
     type = "pom";
   };
 
   backportUtilConcurrent_3_1 = fetchMaven {
     version = "3.1";
-    baseName = "backport-util-concurrent";
-    package = "/backport-util-concurrent";
+    artifactId = "backport-util-concurrent";
+    groupId = "backport-util-concurrent";
     sha512 = "38i04cb0dggdjjsvl32wpxfbczl1d696nlpzissjlq9ya197rwa0g0704p7vz71xsylvpdjssb0cyx916xsigcyb95k8c84b2hmdhvr";
     type = "pom";
   };
 
   beanshell_2_0_b4 = fetchMaven {
     version = "2.0b4";
-    baseName = "beanshell";
-    package = "/org/beanshell";
+    artifactId = "beanshell";
+    groupId = "org.beanshell";
     sha512 = "2xwgqmfwli40lvlgjx00ki5zm1290jhjvqg7wnq869kxkw9iam239zxb0jz46jcpbgy10qg6sd86cjw5g38njywcz33501f6byd0n3w";
     type = "pom";
   };
 
   codehausParent_4 = fetchMaven {
     version = "4";
-    baseName = "codehaus-parent";
-    package = "/org/codehaus";
+    artifactId = "codehaus-parent";
+    groupId = "org.codehaus";
     sha512 = "11dacs4155xc3rn3crdayg1yp15abw81lbk6qwi7207009rnyk1kxvs56am9pllkybgja53ri0k084k2ppp4dlhxrg6w3zccbafxlgp";
     type = "pom";
   };
 
   commonsParent_11 = fetchMaven {
     version = "11";
-    baseName = "commons-parent";
-    package = "/org/apache/commons";
+    artifactId = "commons-parent";
+    groupId = "org.apache.commons";
     sha512 = "3986i0mnawni27fqf74zfb1n9wvyn502nvslfmbwz5m3rgvhfdb7r1wj7qz8g3wznfvh3wd99h83d94300yvy6cilqy5sj9gfwxk3jv";
     type = "pom";
   };
 
   commonsParent_17 = fetchMaven {
     version = "17";
-    baseName = "commons-parent";
-    package = "/org/apache/commons";
+    artifactId = "commons-parent";
+    groupId = "org.apache.commons";
     sha512 = "31ijvmfj2yybfy0n4qh7ga8192wg75hs5v26vwm98hgvlppxs9irik4qlqzh4iqq0azp0xl8idz6nn6yb9vzsjxax4c3v5wyk3yvyfy";
     type = "pom";
   };
 
   commonsParent_22 = fetchMaven {
     version = "22";
-    baseName = "commons-parent";
-    package = "/org/apache/commons";
+    artifactId = "commons-parent";
+    groupId = "org.apache.commons";
     sha512 = "1sm8g7iwyc5gi4w73yx3p1f1l81kw8d5wzqzqgdgy7k7hfvmsxlm5r9n99h9r0g5y494ad46hjzf8cwjf8am4rv0qzhrmsqkxyd24wk";
     type = "pom";
   };
 
   doxia_1_0_alpha6 = fetchMaven {
     version = "1.0-alpha-6";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "0ya69g2xfzawf30r2n45n85h2bag0ihd2cbkd0896ykwndx62jyagc594f9pkvb8x9vwgq1dkhfc5lfw1sjcmsxm9dmyzvy2nmykpsy";
     type = "pom";
   };
 
   doxia_1_0_alpha7 = fetchMaven {
     version = "1.0-alpha-7";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "0fg3l7dyi0c7r1h9rzjn23gv57kc67jpzlcji6yh4nawp3byfbz1rq8wnbj3av3wd29v9h2ff34p06ia9wxbs8q3kz4xy31w7sw7fxg";
     type = "pom";
   };
 
   doxia_1_0_alpha10 = fetchMaven {
     version = "1.0-alpha-10";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "3by91czdkjn4myc6xwzap37ydmhvic4myr8p2zflnpawrph00jkz9pivd84k2qykvmc5gxzbmklf1inwvkq1f5bsyhh440mlvsfsn1s";
     type = "pom";
   };
 
   doxia_1_0 = fetchMaven {
     version = "1.0";
-    baseName = "doxia";
-    package = "/org/apache/maven/doxia";
+    artifactId = "doxia";
+    groupId = "org.apache.maven.doxia";
     sha512 = "3z04h87dwn5panpr68ajzflw5n4wgi98isl5snz6vrd2vz9744fdqggmn6698wljw9h4pzkvjyrxf9b7w4km6w7kma28akvn951vw99";
     type = "pom";
   };
 
   enforcer_1_3_1 = fetchMaven {
     version = "1.3.1";
-    baseName = "enforcer";
-    package = "/org/apache/maven/enforcer";
+    artifactId = "enforcer";
+    groupId = "org.apache.maven.enforcer";
     sha512 = "1m84z5x2gxlbj9bl2jrfzh26pl7nz1d79sv72clp565z4lr2r1abih2c7aigbd95zik948dqrbh2vzm7vp1iv0d23vk89rx4nmfg0rv";
     type = "pom";
   };
 
   googleParent_1 = fetchMaven {
     version = "1";
-    baseName = "google";
-    package = "/com/google";
+    artifactId = "google";
+    groupId = "com.google";
     sha512 = "22whj7li6dvh4xjcdx1hwlh13ar8c8d9snal6ynnbsd566n9g0kif2fx75q5j4kwmqzb2yj3c3vxdfzg82650gkyvjm2x6cb35vdi30";
     type = "pom";
   };
 
   hamcrestParent_1_3 = fetchMaven {
     version = "1.3";
-    baseName = "hamcrest-parent";
-    package = "/org/hamcrest";
+    artifactId = "hamcrest-parent";
+    groupId = "org.hamcrest";
     sha512 = "1da3ivp9n1h3hl35vhgd7avi4xh8p0802qj7xrk93gbz01s2av28p6ycdwiwp7kja0151wm5jvbgpnkxd8azqwkh7dh83w22k7jpwh3";
     type = "pom";
   };
 
   jclOverSlf4j_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "jcl-over-slf4j";
-    package = "/org/slf4j";
+    artifactId = "jcl-over-slf4j";
+    groupId = "org.slf4j";
     sha512 = "3ync9p7ws4p8p494jifarwpqblmbkkl6r6rw4bms8fk6ija0ifxn6q5za3pxvp690p5lzw2zkgidr51rqxk8w1ms69pb1nib1r4j578";
     type = "pom";
   };
 
   maven_2_0_1 = fetchMaven {
     version = "2.0.1";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "02n3kpll7w5iqaijawmm4rzr35sbv826c9vp1fzfnrgbvpfw22yrsjv2z416pzk2qyjh3wx7pc5xxxxdchmpzcxm694vsdl67ki2rrz";
     type = "pom";
   };
 
   maven_2_0_6 = fetchMaven {
     version = "2.0.6";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "2k58pvcrdc52zsq6id4vl8a45srxllm2m49namqkzix4356haphk3i06px9jcc2cmkqw7bcpqh5xvvmkds5vhp2b9y9b0i2lcfgx8jw";
     type = "pom";
   };
 
   maven_2_0_8 = fetchMaven {
     version = "2.0.8";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "0mzlba0vbanxvdgfvj3kq6xw211j40b6hk6w0b7lc686m2c26vgxks9iisgm10888lq140i6510813326bs9yb053hqfvnz3m72lkss";
     type = "pom";
   };
 
   maven_2_0_9 = fetchMaven {
     version = "2.0.9";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "2b3wfqxbg0v2lm82a7nzw8wzw708isfrnzriy90bk89dhnj59qzpgvwrjbhs26a32gnpii5ivivh1msq51k1b7j5knmyf0hi1v0blw0";
     type = "pom";
   };
 
   maven_2_2_1 = fetchMaven {
     version = "2.2.1";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "1bdf85rb7b3dvw9gjv376pk908jgvb35hs8p6fp4pzp19pj71150if09lmhw07gvy7sdd92daw7jmijmi1f9w4gxhkbqhvzkb7qx1rs";
     type = "pom";
   };
 
   maven_3_0_3 = fetchMaven {
     version = "3.0.3";
-    baseName = "maven";
-    package = "/org/apache/maven";
+    artifactId = "maven";
+    groupId = "org.apache.maven";
     sha512 = "397qqkh9qd2aj346v4nvxrhaqz6k75l5xnm1xcqd0d4mmxg0p7jlz54yzkshqli2w5df9f7p8pavpkiw5xkl8ipxmp87vfcanvkx4x4";
     type = "pom";
   };
 
   mavenParent_5 = fetchMaven {
     version = "5";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "1810h5ziij9awpf2c6sgqlwd93dd3c54rxbnjxar97idw2zkmwqfxvxi74qjcpbqqam3ypxb893k3958jmhbrzmwhwbkhxyyiqgjsx0";
     type = "pom";
   };
 
   mavenParent_6 = fetchMaven {
     version = "6";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "2z9rkv875yx64mpbf1mgyb3hcxqbhr0ndczwqlmkgd05a679d4vyi92fndaz1bcfwc5bmmxf4s6zrg58swv05j2j9d6vqd2b0x385dq";
     type = "pom";
   };
 
   mavenParent_8 = fetchMaven {
     version = "8";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "315cgnn7mvwq5kyrln3nw85x3893zdd4dg267gk9xkig1mwjpa86l6yyd6qnrwxywcrgn0wmn2l781yvwip9rys4dd9jmbma2qhzapp";
     type = "pom";
   };
 
   mavenParent_11 = fetchMaven {
     version = "11";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "21lz2qb0sl9akirk7fcbj7ldfgnq5nqy90s3hfvmfvz2spk1ppa5yq3702m7z72l3jpbm9vrcm4dvarar314lwjp3477p558gwcpkqf";
     type = "pom";
   };
 
   mavenParent_13 = fetchMaven {
     version = "13";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "0vgjwpmnvcjfif84s5x19ixlxg4413mfma9f10v7klv88b08vwvkpwjnffgzrlqvp5524d8zyswshqkwpdqb0klgppxiipd52d546vw";
     type = "pom";
   };
 
   mavenParent_15 = fetchMaven {
     version = "15";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "390z5v0nygsw075fa5jzl5baxb0bripiiy6arqk550zlg8dw8mcg6cyscwnh3zw4gxyr1qbcy0v8wsj375xc65i2agkzg1qbv5z6xxp";
     type = "pom";
   };
 
   mavenParent_21 = fetchMaven {
     version = "21";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "2dph51qjkmh9sixd12rgxhrvl3w5r7nmr4n3ra4y1lifml6h0md0indj3qw4lxm0db811p3hxf2f9l0gf6w4q5ypjp20lk9ia2xm5s0";
     type = "pom";
   };
 
   mavenParent_22 = fetchMaven {
     version = "22";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "112xv5inpan05vkm12g2lpz37pgga1nm8rar2bqhibvwljg4yv1myx8z99g0nkd3gzbgw5098aagm006w6bnmwsibwd1js8is5d4r88";
     type = "pom";
   };
 
   mavenParent_23 = fetchMaven {
     version = "23";
-    baseName = "maven-parent";
-    package = "/org/apache/maven";
+    artifactId = "maven-parent";
+    groupId = "org.apache.maven";
     sha512 = "3c6ydqi3sf5aq3aj42kxgrjpcf8wpl0rf6hmr6vkas04w0h4dyvjb78ipyxsqzqgzjm6cmdfhxzx8hjb2lwvy3ipf1x39j6cj7dwdy8";
     type = "pom";
   };
 
   mavenPlugins_22 = fetchMaven {
     version = "22";
-    baseName = "maven-plugins";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-plugins";
+    groupId = "org.apache.maven.plugins";
     sha512 = "14xy4s69dvqllkspc5b8q1gdbi0wn494ghwcdfcvjzvgczjhhxbr1h698amv3zmg59gb7liz77ws4vmcar8j9lazywcv13cy1myiywa";
     type = "pom";
   };
 
   mavenPlugins_23 = fetchMaven {
     version = "23";
-    baseName = "maven-plugins";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-plugins";
+    groupId = "org.apache.maven.plugins";
     sha512 = "1vh7izahb4sskja66hqrygv1r8iwpl97kp65yx6z3fnm761brag89fdcl4jl9hypvm57alf283gvq9rsy5kqnqcdki20k5vw26y1b1a";
     type = "pom";
   };
 
   mavenPlugins_24 = fetchMaven {
     version = "24";
-    baseName = "maven-plugins";
-    package = "/org/apache/maven/plugins";
+    artifactId = "maven-plugins";
+    groupId = "org.apache.maven.plugins";
     sha512 = "07flf37pkkc34466bnzi4rfwdlgvd3ydasm39qzy2hybxv26306zrhipglmgsjvd84z07dscij4n7qdd2jkx9hrkm900hid4xwvxzrs";
     type = "pom";
   };
 
   mavenPluginTools_3_1 = fetchMaven {
     version = "3.1";
-    baseName = "maven-plugin-tools";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-tools";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = "2410rvvhnpwdg67slwb05v7vnpbvq00d36mbsc77parw4v9n3sr1hqai803g8q54lzv05zzcm7knkjv5ip5wcbvzrh0dr4f5lm904wy";
     type = "pom";
   };
 
   mavenPluginTools_3_2 = fetchMaven {
     version = "3.2";
-    baseName = "maven-plugin-tools";
-    package = "/org/apache/maven/plugin-tools";
+    artifactId = "maven-plugin-tools";
+    groupId = "org.apache.maven.plugin-tools";
     sha512 = "28qhbacsb69rcp86l3lkc3d83267qdwwpl0zm134rxi58wy4y4rd8nz2yzk6yx4x8h0drq776b2qnr4ps1da1ybsvsi2sc655scx3lf";
     type = "pom";
   };
 
   mavenReporting_2_0_1 = fetchMaven {
     version = "2.0.1";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "3ns0j0w3g3xzvi4y2nbz7yl3w0bq6npvkpy56c2s2m8z0b0007vw97qm3z7b6iicwck69g9001qqqanhzr35x1qbzlqzrx5v271hvfa";
     type = "pom";
   };
 
   mavenReporting_2_0_6 = fetchMaven {
     version = "2.0.6";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "3bi678sg28yxhlby4d3a6mq9fhg1qnjb57kbkhi7dfx9g0c1p6cxhg8cixjz9wv31lkjpspbpp1fq0z29a93lqrjqczlg8a7i1sg554";
     type = "pom";
   };
 
   mavenReporting_2_0_9 = fetchMaven {
     version = "2.0.9";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "0cg49pq6rvk7c84xwnpq2p47b7y973sy9qfgzcq06bnrqm6cj26h8k7d9kpp3q3rd2hlw10db4sjfx0crlai27cbbz41i5m22lq21s5";
     type = "pom";
   };
 
   mavenReporting_2_2_1 = fetchMaven {
     version = "2.2.1";
-    baseName = "maven-reporting";
-    package = "/org/apache/maven/reporting";
+    artifactId = "maven-reporting";
+    groupId = "org.apache.maven.reporting";
     sha512 = "02gs0nk2hihvayh7gxn1ncbq7nq1hbpr40whby6c58adk7g6jq3cn84fi8svcv10w915f696drav1cimjpizcyjn00if1iql59dmfda";
     type = "pom";
   };
 
   mavenSharedComponents_7 = fetchMaven {
     version = "7";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "35zwvraafv86jpyfvfmi76n9bzmahq5z90j9axb3b6d0wfvildz5qb43kw27si2ldwghiwsfh2jikd3gf9ms553pfillf4baab13dp6";
     type = "pom";
   };
 
   mavenSharedComponents_11 = fetchMaven {
     version = "11";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "3g30bgx3nhw1pwq5nq7ns17vs53cck3zrk6b4sqh56my7vhdv08v0n94l326q9f51sxvnsn11zmpnn8zri8hz2ci1g61ymgi2d0mxyd";
     type = "pom";
   };
 
   mavenSharedComponents_12 = fetchMaven {
     version = "12";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "1x5q96gigd54qp60i20kvmwi604ga55fc70gkz1nwn5fjmy36rlxldhhdij3kcpnxpwqp4dwxq717ai8rqv3lzjif8pxd06wzmz0q09";
     type = "pom";
   };
 
   mavenSharedComponents_17 = fetchMaven {
     version = "17";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "3f2pifiapx09h3wv9lglm0mkd9gid268lfz27jhqb4ck2yxna31872db7cj5c9lsg0pl2l3bwgp526whq14zj2qffqxrdq8mn9m0rhy";
     type = "pom";
   };
 
   mavenSharedComponents_18 = fetchMaven {
     version = "18";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "2qqabrvgs4kb14v28qkfwj16n715mj5mh4m8aw0dybi5igmrvwh1d8jsjggdfbh929m6499w8x5s6aw0gbzmfzr3wjkz54dqxnm49p0";
     type = "pom";
   };
 
   mavenSharedComponents_19 = fetchMaven {
     version = "19";
-    baseName = "maven-shared-components";
-    package = "/org/apache/maven/shared";
+    artifactId = "maven-shared-components";
+    groupId = "org.apache.maven.shared";
     sha512 = "1na6rh2mlwq6yrg7jxxnkcjj4ki0lqcihwiq2cy2ygsd6q0z8fn755frrd1j1jvd5dnh8jxjqp1m5mpwwv13hxhy8lmq95a5pp2a2qh";
     type = "pom";
   };
 
   mojoParent_32 = fetchMaven {
     version = "32";
-    baseName = "mojo-parent";
-    package = "/org/codehaus/mojo";
+    artifactId = "mojo-parent";
+    groupId = "org.codehaus.mojo";
     sha512 = "15pzaqpdcr8c2w2b2ms3qc5d3r0flmzqav6h45nmg1l8nv7529lp6dkilhkwqag1i94vh8dvqnkxm475j9v2hxmz981azrvz7984z8w";
     type = "pom";
   };
 
   ow2_1_3 = fetchMaven {
     version = "1.3";
-    baseName = "ow2";
-    package = "/org/ow2";
+    artifactId = "ow2";
+    groupId = "org.ow2";
     sha512 = "1jqfqqmh19lvrjk45zzzp895jbxb8giw8sn1qdvwhh1yqxr1z5vkv98n4g0ib2l359qmb9fal4d21ba57zmbl0rqxqlggv9c5l87gfs";
     type = "pom";
   };
 
   plexus_1_0_4 = fetchMaven {
     version = "1.0.4";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "22zsqss9aws73zvgqaz1brnvhk8bqn0flzd644nikprbb9dh1jyv1jig7xaxj942wq1w8h6ybx6b3v1ysfr8kw1z70sb5yrb4zd4kkm";
     type = "pom";
   };
 
   plexus_1_0_8 = fetchMaven {
     version = "1.0.8";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "1nwv49smddfvqn1fhi8aj993pkzsxa033a9g97z7sc3aia5wzwz86azzyrklgxywc26c3k3mw8vfzv758rv3v7cn0hfmyfzfkrg8vwp";
     type = "pom";
   };
 
   plexus_1_0_11 = fetchMaven {
     version = "1.0.11";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "20fb1yvg26wg3lih55m8m4i1idiffyg3jlkvazmxqqvnahz2llgd5cfvqcrzg8lkinnypr4ic5glci4lza46k1sfl5nrviyfx0n7kgr";
     type = "pom";
   };
 
   plexus_1_0_12 = fetchMaven {
     version = "1.0.12";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "2ckzb1z4hgmp2r61a05v3aqapkfnyfs4b7wrf60aiymrz57kliyq3nn50h7bj6ak9hlpyzxpqgqps0chzfpizr8v0abdkjmbplvw2ai";
     type = "pom";
   };
 
   plexus_2_0_2 = fetchMaven {
     version = "2.0.2";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "095kxnh9238wlnxsbsl7wj3zsp2ijwx8p8bvbmsvj3iacw9fsvddv263j485zfjf4ipvp5dwqc3sc8mqkwbhx1qj7k1x1hj14nl6r8z";
     type = "pom";
   };
 
   plexus_2_0_3 = fetchMaven {
     version = "2.0.3";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "15adqpm0gz7c0jwjd4yk0k8h4h7vnz15v1fdmzb6rgs6avl1dx84r5l0fqs6b02kw008rg68inii7nl4m5xwqrj807wr8qzrjm02cam";
     type = "pom";
   };
 
   plexus_2_0_6 = fetchMaven {
     version = "2.0.6";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "07rrw1yldy4c2qvwv3hcf9rdbr0jf57qsnnv2ai9fajwhjyjkgjixm2zlsid41bm2w8hacg9crzy6nfz8yh1sdh5p767niy9jripq2h";
     type = "pom";
   };
 
   plexus_2_0_7 = fetchMaven {
     version = "2.0.7";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "2ddbjp60y8g7n56hya5qa59f980a8sdj0d1dicv3na3pbc6k4wgdrix78lgg32sp4fzmxl7fyzw9gy3z2vpzf65zkj3c9yh030jcysr";
     type = "pom";
   };
 
   plexus_3_0_1 = fetchMaven {
     version = "3.0.1";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "3rjh4msw1qjpj0vmc90f89zjkzcyahzh93jrpw25qb2wn0v18jgw65g0ai7ynssdh113kxi816syqcw8vbqwvhlr2b0acrmszy0jnps";
     type = "pom";
   };
 
   plexus_3_1 = fetchMaven {
     version = "3.1";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "1zyyzy6zvf73bnv8c76x2lmffllqqrgk1k8kpravcrd809acfslip1w7w8kr0rg3sc7554875wsq8fbhq3zdvxwjpzwgz4l5rjr3lmr";
     type = "pom";
   };
 
   plexus_3_2 = fetchMaven {
     version = "3.2";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "07y1vwz55l9yzfhix5w5fw5xvdj854c1ri1wws6r23xzyp5bqwrrz0x5ln26w05w78vpj1rvrq1mkk192vfr80si3ccr063aschf6ld";
     type = "pom";
   };
 
   plexus_3_3_1 = fetchMaven {
     version = "3.3.1";
-    baseName = "plexus";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus";
+    groupId = "org.codehaus.plexus";
     sha512 = "1q1p0sfzkhdpknaf0ysq7vzd0qip9q86z62nwamfh9gdsp7lh99kh6hmxav2daha462c3jra6clfniyqrbvs07jwjhf4c79rwhnqc2q";
     type = "pom";
   };
 
   plexusCipher_1_4 = fetchMaven {
     version = "1.4";
-    baseName = "plexus-cipher";
-    package = "/org/sonatype/plexus";
+    artifactId = "plexus-cipher";
+    groupId = "org.sonatype.plexus";
     sha512 = "1m4f7n6ch8gbwgvz7h8iab0jkan8ws3qq9776qc10k0kj6i3227kskk5s8pxlq9vrxw498jmjnkiga41fy33khrgvsvls2hrj9vv1g1";
     type = "pom";
   };
 
   plexusCompiler_2_2 = fetchMaven {
     version = "2.2";
-    baseName = "plexus-compiler";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compiler";
+    groupId = "org.codehaus.plexus";
     sha512 = "26sr1hg214qf65nym85viv1z4nk1bgqahx7n4bq3did49s9ymgz2c08vw7zdlcqws5jndz9n2xlyq285plgv3xx2mxrrsi2r24zmw29";
     type = "pom";
   };
 
   plexusCompilers_2_2 = fetchMaven {
     version = "2.2";
-    baseName = "plexus-compilers";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-compilers";
+    groupId = "org.codehaus.plexus";
     sha512 = "0yvvc8mdz1vd7mpw9h568mhlfxh3qpbz4qpyr5iw7f5ifm46gxsmnfd36ah6mn9hxh6lpra3mi536y5cv1k5mrbr128a1lwyr8p14rg";
     type = "pom";
   };
 
   plexusComponents_1_1_4 = fetchMaven {
     version = "1.1.4";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "02kdl9z8nz26h4qf9mrdm8s1y2gy1f57n825yy0y3qifavlv51k2yxza7mjsdl1dwrq84c4qlj79iqlisnhrppfy0ncbbblnbir1yln";
     type = "pom";
   };
 
   plexusComponents_1_1_6 = fetchMaven {
     version = "1.1.6";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "1m6f5xzp6mk1n0svznqc8l5x3klr9kk75223ms31q65llx765dxvrsmkjlzgshb0ipb9nfxwk9hs5fvf5dgh0xlzrnc1w2pnqdi8jnh";
     type = "pom";
   };
 
   plexusComponents_1_1_7 = fetchMaven {
     version = "1.1.7";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "2mh1qfbaf6f6nv0nj0g8skgv82jv1l2zg7iivd2jjrzrwnpkc58ajfl1wmylwpz035d9dd713h9szkwy2hdd6pardbc4ja2w4qv5s91";
     type = "pom";
   };
 
   plexusComponents_1_1_14 = fetchMaven {
     version = "1.1.14";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "2gf578c23wz38cnjnp8w80b6hzmfnzrv6is1yf52qrfcijk84fnj4k8wrqg0jms9yz6l5rkkv40zm2j7kkbxgn862mnh4i4qxcb604g";
     type = "pom";
   };
 
   plexusComponents_1_1_15 = fetchMaven {
     version = "1.1.15";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "0lfzdq1wlsnkiapzjs8cqi2kzkaw9lfjhdhmf1pz2x83m5njfx2y59v14wgcs2k4cig8kjr45v4qnmd7mp03k8gginzflc1qi1y7yv6";
     type = "pom";
   };
 
   plexusComponents_1_1_19 = fetchMaven {
     version = "1.1.19";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "01mllmbwfrimvsgmc3wfxp60nm999xa4abp0ywpxdrvbb88dwr4g7sg3mlz22xhc8pky72mif882ppgrdxj01lx3lmm84p3g5f51bii";
     type = "pom";
   };
 
   plexusComponents_1_3_1 = fetchMaven {
     version = "1.3.1";
-    baseName = "plexus-components";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-components";
+    groupId = "org.codehaus.plexus";
     sha512 = "16bnfja035zb508f340y64v4vk7pkldn8bvnxvbk0grk8a76rirsn4dl60x3hgmasgkb0y75gr9qp4y72m079klhgg0mbvcfvslkxqb";
     type = "pom";
   };
 
   plexusContainers_1_0_3 = fetchMaven {
     version = "1.0.3";
-    baseName = "plexus-containers";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-containers";
+    groupId = "org.codehaus.plexus";
     sha512 = "39sw2lxlrgbj1zlf67qz14j53sxd45p1qmna5cfizqikrwiqrnb6xwdxr2rsp3h2kadwwpz6id2ls6x3hr93znkad404rg4lg11v9nj";
     type = "pom";
   };
 
   plexusContainers_1_5_5 = fetchMaven {
     version = "1.5.5";
-    baseName = "plexus-containers";
-    package = "/org/codehaus/plexus";
+    artifactId = "plexus-containers";
+    groupId = "org.codehaus.plexus";
     sha512 = "1dzg3ry73scisq02p1c96rn04rvdpyf9v6cbvvmy6hvcaw11y8mmjwjnlayljhr9za5hhq5bwv2vssmp683v3qjr5750f9aa62jxw0w";
     type = "pom";
   };
 
   plexusSecDispatcher_1_3 = fetchMaven {
     version = "1.3";
-    baseName = "plexus-sec-dispatcher";
-    package = "/org/sonatype/plexus";
+    artifactId = "plexus-sec-dispatcher";
+    groupId = "org.sonatype.plexus";
     sha512 = "09blh68dwrh3zix33cbfbvmxbbm7ck80pwp9x4v1ilf11y6hgm065jx39viqm0zlr86kwngrlm4skrgjw5v67aj2q7d7kd5jgj5s0qc";
     type = "pom";
   };
 
   sisuInject_2_1_1 = fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-inject";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-inject";
+    groupId = "org.sonatype.sisu";
     sha512 = "0720p7ai7l1wqs2rfcgpvgd1rc3p2bdpp51a57jmqbgh9msr54iy0c6n0ipybd9lrl88iz4l8cc1s73qj5appf8r481bbwgv4wxi19v";
     type = "pom";
   };
 
   sisuInjectGuiceBean_2_1_1 = fetchMaven {
     version = "2.1.1";
-    baseName = "guice-bean";
-    package = "/org/sonatype/sisu/inject";
+    artifactId = "guice-bean";
+    groupId = "org.sonatype.sisu.inject";
     sha512 = "2arva9197d03whnavfspz8wm7fw8iqrhacp10984lxwig221m34p5bb9vmhn8bbswf7d8whzf9q5lsq9mxbmd2c90kc1m7n7qja6qq5";
     type = "pom";
   };
 
   sisuInjectGuicePlexus_2_1_1 = fetchMaven {
     version = "2.1.1";
-    baseName = "guice-plexus";
-    package = "/org/sonatype/sisu/inject";
+    artifactId = "guice-plexus";
+    groupId = "org.sonatype.sisu.inject";
     sha512 = "0gspz9n6vbnlbx33xynm4sg0wxlr89i8490gcl0y0qw6mvjjqfwv1dqgncm9xp41mb21i00gxq0ml6d4wfr0sdayk9m736b826lrvq4";
     type = "pom";
   };
 
   sisuParent_2_1_1 = fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-parent";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-parent";
+    groupId = "org.sonatype.sisu";
     sha512 = "2z006ib6azrxf5s02ixv5plc1db0rglnv2m8k4il0s144v63ay98wjxawcc1chld64iribhhby6wnlv2fxvv8sl9mr03qb2q2isflgc";
     type = "pom";
   };
 
   slf4jApi_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "slf4j-api";
-    package = "/org/slf4j";
+    artifactId = "slf4j-api";
+    groupId = "org.slf4j";
     sha512 = "3ahxd5zfxpwrp97yq74xfhrh02a7hnmcdxk5rwjn4v5hcms9b98iizsgd2ssjxa1vy784jh45f6k8qby1c1bdcwk9y18mkcw79zhl2n";
     type = "pom";
   };
 
   slf4jJdk14_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "slf4j-jdk14";
-    package = "/org/slf4j";
+    artifactId = "slf4j-jdk14";
+    groupId = "org.slf4j";
     sha512 = "11yiy09mlm5dq2ir05n97nka3sqwn48k47x4d2vqmgjsk3vz255m8ilxvq5hjjzygyw0prcrp4zbwkphb5his00pw8f4hczd1w16nvr";
     type = "pom";
   };
 
   slf4jParent_1_5_6 = fetchMaven {
     version = "1.5.6";
-    baseName = "slf4j-parent";
-    package = "/org/slf4j";
+    artifactId = "slf4j-parent";
+    groupId = "org.slf4j";
     sha512 = "036cizr5vh557l65jiv706iiy1q1s3lkr1xqa1hd5yspawd111d5iq8q3qdsw07c3rmxq7n9sflgcj08bhs149ni119fdr7hn9cx0nl";
     type = "pom";
   };
 
   sonatypeForgeParent_3 = fetchMaven {
     version = "3";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "20x89zl6k0wgd1gb6ysxm6bmgqxwyz3d7zyjn8bwzkz93k7lxnxm0k7skvha283q9ay4cd2vkjisi5avl1f3wvz89rrwg136gmdlksv";
     type = "pom";
   };
 
   sonatypeForgeParent_4 = fetchMaven {
     version = "4";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "0j13rfddklh25sdwppxvdn97y3l8vy809g2w5zpflh74v0rh0q04ylm3j2nj5hf3ypmgx3lhdp161jbv3l47gl7gh60fk3rnq17kfbq";
     type = "pom";
   };
 
   sonatypeForgeParent_5 = fetchMaven {
     version = "5";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "1l3nll0i5cpf2rh5f4gqriwy2737n9sccr605nx1swn1qafbxbvvs4jl7argdzz0mkzrr8sir7vnksm9a273vrdica9l35nxivm6vrx";
     type = "pom";
   };
 
   sonatypeForgeParent_7 = fetchMaven {
     version = "7";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "3l6c336cm6wnrw2l7lr0wg83w1304bggvw4qydh5bqbbyfpdgwqa3pbfkq4x760k3wqwarnlpf31fz2dp6abrynjl4rr1lv68j1hhyn";
     type = "pom";
   };
 
   sonatypeForgeParent_10 = fetchMaven {
     version = "10";
-    baseName = "forge-parent";
-    package = "/org/sonatype/forge";
+    artifactId = "forge-parent";
+    groupId = "org.sonatype.forge";
     sha512 = "3fpnvrxfkxpxqdsn6g7w1zyql4v0z9iqbjprhh4c6rldrbvq4h3yh7dl5sw4h7av516zhmb3bkc9ycfdr5gs34sfb6f6x5hk7qc374a";
     type = "pom";
   };
 
   sonatypeParent_7 = fetchMaven {
     version = "7";
-    baseName = "oss-parent";
-    package = "/org/sonatype/oss";
+    artifactId = "oss-parent";
+    groupId = "org.sonatype.oss";
     sha512 = "3xk0q7y2kdarr3l42dqjzq9qz1r840abqw9zhvl4gpc8jw5xcbqd781fp8z41i3hrkyaf740f2kppji9l77ci7f759d5s9yg4grbc33";
     type = "pom";
   };
 
   sonatypeSpiceParent_10 = fetchMaven {
     version = "10";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "0gg2cxqvfmg6jk7qi2f4hcgskpd1ysnf1d5vay8dza40wfbk2vy7qvhgjhg55dpbjkadmsj483hg81qdzwqbxmagd2xr9j9062hbja8";
     type = "pom";
   };
 
   sonatypeSpiceParent_12 = fetchMaven {
     version = "12";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "3bx63k5frr99ma5wcjlqlym7qr6x1m031hns35rpvz039s9cxcn8r3f7slwqaa7s19i3j46kwgxirnhs4ylcddql4rsibaqjwy9lh0d";
     type = "pom";
   };
 
   sonatypeSpiceParent_16 = fetchMaven {
     version = "16";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "0awfi8vf4xc5c9510sas7xqlik4g8ljivay372cksvlcwlgyrgliikak0xxbxj72df5b9jzc9fzvjxd9rlllnnlnm4zllw5p2hakb0g";
     type = "pom";
   };
 
   sonatypeSpiceParent_17 = fetchMaven {
     version = "17";
-    baseName = "spice-parent";
-    package = "/org/sonatype/spice";
+    artifactId = "spice-parent";
+    groupId = "org.sonatype.spice";
     sha512 = "1jqqp5xylm9bjz33wab7mj49xqczvkhpp4aysrcngszxmil61kanpjmn5ks5r0hq4waj0bqnr91p2p9a7ylqnqjs6ib1x9psl5c9cyw";
     type = "pom";
   };
 
   surefire_2_12_4 = fetchMaven {
     version = "2.12.4";
-    baseName = "surefire";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = "1zyppjqqwpzcp16g7v49r9fsgdvrny325r583kpis5497ic0qbcczxn53x7s1hnmhgcs33dr0k3alrwl7m574lm2qdgj0s8x18pl6gb";
     type = "pom";
   };
 
   surefire_2_17 = fetchMaven {
     version = "2.17";
-    baseName = "surefire";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire";
+    groupId = "org.apache.maven.surefire";
     sha512 = "3yraw37xwayyrvwa62y6li3wbzrha08j389psz16j1dawxmg78zlm2x1jmgz3nzdb60n9kk143606bgs3vrf7ri9d5pwkg9lvw7hk92";
     type = "pom";
   };
 
   surefireProviders_2_12_4 = fetchMaven {
     version = "2.12.4";
-    baseName = "surefire-providers";
-    package = "/org/apache/maven/surefire";
+    artifactId = "surefire-providers";
+    groupId = "org.apache.maven.surefire";
     sha512 = "08di6wgiihz9svrdpkdvhlipdp83byd1s844fnjqfk3z0g5a72lpq718zy27rk41jma3hclmr4pv0g5dvbhf3v8hy92iby8w5rcxv5x";
     type = "pom";
   };
 
   xbean_3_4 = fetchMaven {
     version = "3.4";
-    baseName = "xbean";
-    package = "/org/apache/xbean";
+    artifactId = "xbean";
+    groupId = "org.apache.xbean";
     sha512 = "2qdd1srj7ahskmxp1cb3gkxgdmy0ms4m5mi43mvfrl085fp58f67ip2y0w4r0xfwzds12727yili6hciiwix9i6hx7wasi5sa9djcp6";
     type = "pom";
   };
diff --git a/pkgs/development/java-modules/sisu/guice.nix b/pkgs/development/java-modules/sisu/guice.nix
index 9fb70fad4466..51a004ed5451 100644
--- a/pkgs/development/java-modules/sisu/guice.nix
+++ b/pkgs/development/java-modules/sisu/guice.nix
@@ -3,8 +3,8 @@
 rec {
   sisuGuice_2_9_4 = map (obj: fetchMaven {
     version = "2.9.4";
-    baseName = "sisu-guice";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-guice";
+    groupId = "org.sonatype.sisu";
     suffix = "-no_aop";
     sha512 = obj.sha512;
     type = obj.type;
diff --git a/pkgs/development/java-modules/sisu/inject-bean.nix b/pkgs/development/java-modules/sisu/inject-bean.nix
index fba7130cfbdc..bca16ccd114c 100644
--- a/pkgs/development/java-modules/sisu/inject-bean.nix
+++ b/pkgs/development/java-modules/sisu/inject-bean.nix
@@ -3,8 +3,8 @@
 rec {
   sisuInjectBean_2_1_1 = map (obj: fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-inject-bean";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-inject-bean";
+    groupId = "org.sonatype.sisu";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/sisu/inject-plexus.nix b/pkgs/development/java-modules/sisu/inject-plexus.nix
index 73335ec951e5..0a181dc1a1ec 100644
--- a/pkgs/development/java-modules/sisu/inject-plexus.nix
+++ b/pkgs/development/java-modules/sisu/inject-plexus.nix
@@ -3,8 +3,8 @@
 rec {
   sisuInjectPlexus_2_1_1 = map (obj: fetchMaven {
     version = "2.1.1";
-    baseName = "sisu-inject-plexus";
-    package = "/org/sonatype/sisu";
+    artifactId = "sisu-inject-plexus";
+    groupId = "org.sonatype.sisu";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/xerces/impl.nix b/pkgs/development/java-modules/xerces/impl.nix
index 7b04e21f50ee..11295b3128fd 100644
--- a/pkgs/development/java-modules/xerces/impl.nix
+++ b/pkgs/development/java-modules/xerces/impl.nix
@@ -3,8 +3,8 @@
 rec {
   xercesImpl_2_8_0 = map (obj: fetchMaven {
     version = "2.8.0";
-    baseName = "xercesImpl";
-    package = "/xerces";
+    artifactId = "xercesImpl";
+    groupId = "xerces";
     sha512 = obj.sha512;
     type = obj.type;
   }) [
diff --git a/pkgs/development/java-modules/xml-apis/default.nix b/pkgs/development/java-modules/xml-apis/default.nix
index 44044a35a57f..a96e3670b401 100644
--- a/pkgs/development/java-modules/xml-apis/default.nix
+++ b/pkgs/development/java-modules/xml-apis/default.nix
@@ -3,8 +3,8 @@
 rec {
   xmlApis_1_3_03 = map (obj: fetchMaven {
     version = "1.3.03";
-    baseName = "xml-apis";
-    package = "/xml-apis";
+    artifactId = "xml-apis";
+    groupId = "xml-apis";
     sha512 = obj.sha512;
     type = obj.type;
   }) [

From 0ec9e695c8f9f9a2017618a7ff4e58e9a3debba0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 13 Feb 2017 18:47:01 -0500
Subject: [PATCH 0329/3449] linux: 3.10.104 -> 3.10.105

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 42546b0262e6..8ab879f7b00e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.104";
+  version = "3.10.105";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "04kc64zdpg8h8655m825lbny3fwvqhmh3mg9h564i2irnll35lp3";
+    sha256 = "1739mikbyfx1zfmra16lnprca3pcvcplqss4x1jzdqmvkh9cqnqw";
   };
 
   kernelPatches = args.kernelPatches;

From 2fce8dda39c1877acf02b018ae3513ad5014f706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 14 Feb 2017 00:47:01 +0100
Subject: [PATCH 0330/3449] knot-dns: fixup Darwin build again, hopefully

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index af7d4d4c48ca..94d5ee9f5c71 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -2,6 +2,8 @@
 , systemd, nettle, libedit, zlib, libiconv, fetchpatch
 }:
 
+with { inherit (stdenv.lib) optional optionals; };
+
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
@@ -16,16 +18,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gnutls jansson liburcu libidn lmdb
+    gnutls jansson liburcu libidn
     nettle libedit
     libiconv
     # without sphinx &al. for developer documentation
   ]
     # Use embedded lmdb there for now, as detection is broken on Darwin somehow.
-    ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ]
-    ++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls
+    ++ optionals stdenv.isLinux [ libcap_ng systemd lmdb ]
+    ++ optional stdenv.isDarwin zlib; # perhaps due to gnutls
 
-  configureFlags = [ "--with-lmdb=${stdenv.lib.getLib lmdb}"/*not perfect*/ ];
+  # Not ideal but seems to work on Linux.
+  configureFlags = optional stdenv.isLinux "--with-lmdb=${stdenv.lib.getLib lmdb}";
 
   enableParallelBuilding = true;
 

From cca2e1155617304b5bcb3457309983cf8e99b067 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Mon, 13 Feb 2017 18:03:06 -0600
Subject: [PATCH 0331/3449] Resurrecting the single-wrapper read from sibling
 .real file behavior

---
 nixos/modules/security/wrappers/default.nix | 44 ++++++++++-----------
 nixos/modules/security/wrappers/wrapper.c   | 28 ++++++++-----
 2 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 757765ed08c4..0548b1d96593 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -8,24 +8,20 @@ let
       (n: v: (if v ? "program" then v else v // {program=n;}))
       wrappers);
 
-  mkWrapper = { program, source ? null, ...}:
-    let buildWrapper = ''
-          parentWrapperDir=$(dirname ${wrapperDir})
-          gcc -Wall -O2 -DSOURCE_PROG=\"${source}\" -DWRAPPER_DIR=\"$parentWrapperDir\" \
-              -Wformat -Wformat-security -Werror=format-security \
-              -fstack-protector-strong --param ssp-buffer-size=4 \
-              -D_FORTIFY_SOURCE=2 -fPIC \
-              -lcap-ng -lcap ${./wrapper.c} -o $out/bin/${program}.wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
-              -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
-        '';
-    in pkgs.stdenv.mkDerivation {
-      name         = "${program}-wrapper";
-      unpackPhase  = "true";
-      installPhase = ''
-        mkdir -p $out/bin
-        ${buildWrapper}
-      '';
-    };
+  securityWrapper = pkgs.stdenv.mkDerivation {
+    name         = "security-wrapper";
+    unpackPhase  = "true";
+    installPhase = ''
+      mkdir -p $out/bin
+      parentWrapperDir=$(dirname ${wrapperDir})
+      gcc -Wall -O2 -DWRAPPER_DIR=\"$parentWrapperDir\" \
+          -Wformat -Wformat-security -Werror=format-security \
+          -fstack-protector-strong --param ssp-buffer-size=4 \
+          -D_FORTIFY_SOURCE=2 -fPIC \
+          -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
+          -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
+    '';
+  };
 
   ###### Activation script for the setcap wrappers
   mkSetcapProgram =
@@ -37,9 +33,9 @@ let
     , ...
     }:
     assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");
-    let wrapperDrv = mkWrapper { inherit program source; };
-    in ''
-      cp ${wrapperDrv}/bin/${program}.wrapper $wrapperDir/${program}
+    ''
+      cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program}
+      echo -n "$source" > $wrapperDir/${program}.real
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}
@@ -65,9 +61,9 @@ let
     , permissions ? "u+rx,g+x,o+x"
     , ...
     }:
-    let wrapperDrv = mkWrapper { inherit program source; };
-    in ''
-      cp ${wrapperDrv}/bin/${program}.wrapper $wrapperDir/${program}
+    ''
+      cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program}
+      echo -n "$source" > $wrapperDir/${program}.real
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}
diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c
index e6f2605143fe..4a656c54e3f9 100644
--- a/nixos/modules/security/wrappers/wrapper.c
+++ b/nixos/modules/security/wrappers/wrapper.c
@@ -21,9 +21,8 @@
 
 extern char **environ;
 
-// The SOURCE_PROG and WRAPPER_DIR macros are supplied at compile time
-// for a security reason: So they cannot be changed at runtime.
-static char * sourceProg = SOURCE_PROG;
+// The WRAPPER_DIR macro is supplied at compile time so that it cannot
+// be changed at runtime
 static char * wrapperDir = WRAPPER_DIR;
 
 // Wrapper debug variable name
@@ -207,14 +206,25 @@ int main(int argc, char * * argv)
     // And, of course, we shouldn't be writable.
     assert(!(st.st_mode & (S_IWGRP | S_IWOTH)));
 
-    struct stat stR;
-    stat(sourceProg, &stR);
+    // Read the path of the real (wrapped) program from <self>.real.
+    char realFN[PATH_MAX + 10];
+    int realFNSize = snprintf (realFN, sizeof(realFN), "%s.real", selfPath);
+    assert (realFNSize < sizeof(realFN));
 
-    // Make sure the program we're wrapping is non-zero
-    assert(stR.st_size > 0);
+    int fdSelf = open(realFN, O_RDONLY);
+    assert (fdSelf != -1);
 
-    // Read the capabilities set on the file and raise them in to the
-    // Ambient set so the program we're wrapping receives the
+    char sourceProg[PATH_MAX];
+    len = read(fdSelf, sourceProg, PATH_MAX);
+    assert (len != -1);
+    assert (len < sizeof(sourceProg));
+    assert (len > 0);
+    sourceProg[len] = 0;
+
+    close(fdSelf);
+
+    // Read the capabilities set on the wrapper and raise them in to
+    // the Ambient set so the program we're wrapping receives the
     // capabilities too!
     make_caps_ambient(selfPath);
 

From 25121d4350b8e0deb552575a9377cb2e899fc7c9 Mon Sep 17 00:00:00 2001
From: Itai Zukerman <zukerman@math-hat.com>
Date: Mon, 13 Feb 2017 16:12:26 -0800
Subject: [PATCH 0332/3449] bazel: 0.3.2 -> 0.4.4

---
 .../tools/build-managers/bazel/default.nix       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 5d57c9b4579a..7b98ce7898af 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, buildFHSUserEnv, writeScript, jdk, zip, unzip,
+{ stdenv, fetchurl, buildFHSUserEnv, writeScript, jdk, zip, unzip,
   which, makeWrapper, binutils }:
 
 let
 
-  version = "0.3.2";
+  version = "0.4.4";
 
   meta = with stdenv.lib; {
     homepage = http://github.com/bazelbuild/bazel/;
@@ -22,14 +22,16 @@ let
   };
 
   bazelBinary = stdenv.mkDerivation rec {
+
     name = "bazel-${version}";
 
-    src = fetchFromGitHub {
-      owner = "bazelbuild";
-      repo = "bazel";
-      rev = version;
-      sha256 = "085cjz0qhm4a12jmhkjd9w3ic4a67035j01q111h387iklvgn6xg";
+    src = fetchurl {
+      url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
+      sha256 = "1fwfahkqi680zyxmdriqj603lpacyh6cg6ff25bn9bkilbfj2anm";
     };
+
+    sourceRoot = ".";
+
     patches = [ ./java_stub_template.patch ];
 
     packagesNotFromEnv = [

From a27f35993d380487d7262055aff0bfc939c235ec Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Mon, 13 Feb 2017 18:28:13 -0600
Subject: [PATCH 0333/3449] Derp, correctly write the source program's path

---
 nixos/modules/security/wrappers/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 0548b1d96593..e51103981e6f 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -27,7 +27,7 @@ let
   mkSetcapProgram =
     { program
     , capabilities
-    , source ? null
+    , source
     , owner  ? "nobody"
     , group  ? "nogroup"
     , ...
@@ -35,7 +35,7 @@ let
     assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");
     ''
       cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program}
-      echo -n "$source" > $wrapperDir/${program}.real
+      echo -n "${source}" > $wrapperDir/${program}.real
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}
@@ -53,7 +53,7 @@ let
   ###### Activation script for the setuid wrappers
   mkSetuidProgram =
     { program
-    , source ? null
+    , source
     , owner  ? "nobody"
     , group  ? "nogroup"
     , setuid ? false
@@ -63,7 +63,7 @@ let
     }:
     ''
       cp ${securityWrapper}/bin/security-wrapper $wrapperDir/${program}
-      echo -n "$source" > $wrapperDir/${program}.real
+      echo -n "${source}" > $wrapperDir/${program}.real
 
       # Prevent races
       chmod 0000 $wrapperDir/${program}

From d5691d98fc625b06443d51fb22ca9d01af86d201 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 14 Feb 2017 10:07:30 +0900
Subject: [PATCH 0334/3449] groonga: 6.1.5 -> 7.0.0

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

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 6e3ab5a4eaea..e71c570f736f 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "6.1.5";
+  version = "7.0.0";
 
   src = fetchurl {
     url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "0phh4qp7ky5rw8xgxv3gjzw2cadkjl604xrdyxxbpd30i354sh5x";
+    sha256 = "0c3vzw2ias0xpz1hwywlib1qqfjvvzwj1zggswd5l2cj87f1krfd";
   };
 
   buildInputs = with stdenv.lib;

From 8cef304ede7f8d9d3647dcb885e05df9d097469c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 14:57:48 +0800
Subject: [PATCH 0335/3449] libtoxcore: init at 0.1.6 and move old versions
 away

---
 .../libraries/libtoxcore/default.nix          | 41 +++++++++++++++++++
 .../{new-api/default.nix => new-api.nix}      |  2 +-
 .../{old-api/default.nix => old-api.nix}      |  6 +--
 pkgs/top-level/all-packages.nix               |  6 ++-
 4 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libtoxcore/default.nix
 rename pkgs/development/libraries/libtoxcore/{new-api/default.nix => new-api.nix} (98%)
 rename pkgs/development/libraries/libtoxcore/{old-api/default.nix => old-api.nix} (94%)

diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
new file mode 100644
index 000000000000..3a00408c7ca3
--- /dev/null
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
+, libvpx, check, libconfig, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libtoxcore-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner  = "TokTok";
+    repo   = "c-toxcore";
+    rev    = "v${version}";
+    sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6";
+  };
+
+  cmakeFlags = [
+    "-DBUILD_NTOX=ON"
+    "-DDHT_BOOTSTRAP=ON"
+    "-DBOOTSTRAP_DAEMON=ON"
+  ];
+
+  buildInputs = [
+    libsodium libmsgpack ncurses
+  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+    libopus
+    libvpx
+  ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  checkInputs = [ check ];
+
+  checkPhase = "ctest";
+
+  # for some reason the tests are not running - it says "No tests found!!"
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
similarity index 98%
rename from pkgs/development/libraries/libtoxcore/new-api/default.nix
rename to pkgs/development/libraries/libtoxcore/new-api.nix
index b88f4f6a74e1..8d0a467c82a8 100644
--- a/pkgs/development/libraries/libtoxcore/new-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -2,7 +2,7 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tox-core-dev-20160727";
+  name = "tox-core-new-20160727";
 
   src = fetchFromGitHub {
     owner  = "irungentoo";
diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api.nix
similarity index 94%
rename from pkgs/development/libraries/libtoxcore/old-api/default.nix
rename to pkgs/development/libraries/libtoxcore/old-api.nix
index 2fb5e93eab95..5757e94559a8 100644
--- a/pkgs/development/libraries/libtoxcore/old-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/old-api.nix
@@ -4,9 +4,9 @@
 let
   version = "4c220e336330213b151a0c20307d0a1fce04ac9e";
   date = "20150126";
-in
-stdenv.mkDerivation rec {
-  name = "tox-core-${date}-${builtins.substring 0 7 version}";
+
+in stdenv.mkDerivation rec {
+  name = "tox-core-old-${date}-${builtins.substring 0 7 version}";
 
   src = fetchFromGitHub {
     owner  = "irungentoo";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 855de099cbac..b95dca132e2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8581,9 +8581,11 @@ with pkgs;
 
   libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { };
 
-  libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { };
+  libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { };
 
-  libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { };
+  libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
+
+  libtoxcore = callPackage ../development/libraries/libtoxcore { };
 
   libtap = callPackage ../development/libraries/libtap { };
 

From 5a88ab3f55327a87c44671178d9304312b3f9df4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 14:58:28 +0800
Subject: [PATCH 0336/3449] tox-prpl: 20141202 -> 0.5.1

---
 .../pidgin-plugins/tox-prpl/default.nix       | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 90f6655d1453..3997980bed41 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,29 +1,27 @@
 { stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
 
-let
-  version = "dd181722ea";
-  date = "20141202";
-in
 stdenv.mkDerivation rec {
-  name = "tox-prpl-${date}-${version}";
+  name = "tox-prpl-${version}";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
-    owner = "jin-eld";
-    repo = "tox-prpl";
-    rev = "${version}";
-    sha256 = "0wzyvg11h4ym28zqd24p35lza3siwm2519ga0yhk98rv458zks0v";
+    owner  = "jin-eld";
+    repo   = "tox-prpl";
+    rev    = "v${version}";
+    sha256 = "0ms367l2f7x83k407c93bmhpyc820f1css61fh2gx4jq13cxqq3p";
   };
 
   NIX_LDFLAGS = "-lssp -lsodium";
 
   postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
 
-  buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];
+  buildInputs = [ libtoxcore pidgin libsodium ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tox.dhs.org/;
     description = "Tox plugin for Pidgin / libpurple";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b95dca132e2f..ca76d235c672 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14640,7 +14640,9 @@ with pkgs;
 
   telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };
 
-  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
+  toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {
+    libtoxcore = libtoxcore-new;
+  };
 
   pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { };
 

From eb52ef12c2a025d87e1c6a6e1500fc2e4fc39f60 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 14:59:08 +0800
Subject: [PATCH 0337/3449] ratox: use libtoxcore-old

---
 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 ca76d235c672..48ebbf13f4d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14826,7 +14826,9 @@ with pkgs;
 
   ratmen = callPackage ../tools/X11/ratmen {};
 
-  ratox = callPackage ../applications/networking/instant-messengers/ratox { };
+  ratox = callPackage ../applications/networking/instant-messengers/ratox {
+    libtoxcore = libtoxcore-old;
+  };
 
   ratpoison = callPackage ../applications/window-managers/ratpoison { };
 

From a66e04d3bec08581efb3e21188eb7625e72eaeee Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 14:59:30 +0800
Subject: [PATCH 0338/3449] toxic: 20160728 -> 0.7.2

---
 .../instant-messengers/toxic/default.nix      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index be72895b430a..fb7a13b3af9b 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -1,26 +1,27 @@
 { stdenv, fetchFromGitHub, libsodium, ncurses, curl
-, libtoxcore-dev, openal, libvpx, freealut, libconfig, pkgconfig
-, libqrencode }:
+, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
+, libqrencode, gdk_pixbuf, libnotify }:
 
 stdenv.mkDerivation rec {
-  name = "toxic-dev-20160728";
+  name = "toxic-${version}";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
-    owner = "Tox";
-    repo = "toxic";
-    rev = "cb21672600206423c844306a84f8b122e534c348";
-    sha256 = "1nq1xnbyjfrk8jrjvk5sli1bm3i9r8b4m8f4xgmiz68mx1r3fn5k";
+    owner  = "Tox";
+    repo   = "toxic";
+    rev    = "v${version}";
+    sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc";
   };
 
-  makeFlags = [ "PREFIX=$(out)" ];
-  installFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)"];
+  installFlags = [ "PREFIX=$(out)"];
 
-  nativeBuildInputs = [ pkgconfig libconfig ];
   buildInputs = [
-    libtoxcore-dev libsodium ncurses curl
+    libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
   ] ++ stdenv.lib.optionals (!stdenv.isArm) [
-    openal libvpx freealut libqrencode
+    openal libopus libvpx freealut libqrencode
   ];
+  nativeBuildInputs = [ pkgconfig libconfig ];
 
   meta = with stdenv.lib; {
     description = "Reference CLI for Tox";

From 7690ec0022c8da7aa813b6b2440fe0daeb5467f2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 14:59:59 +0800
Subject: [PATCH 0339/3449] toxvpn: 20160909 -> 20161230

---
 pkgs/tools/networking/toxvpn/default.nix | 28 +++++++++---------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index 29b1ec5f39c4..05e833f2f8ef 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -1,31 +1,23 @@
-{ stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }:
+{ stdenv, fetchFromGitHub, cmake, lib
+, libtoxcore, jsoncpp, libsodium, systemd, libcap }:
 
 with lib;
 
-let
-  libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: {
-    name = "libtoxcore-2016-09-07";
-    src = fetchFromGitHub {
-      owner  = "TokTok";
-      repo   = "toxcore";
-      rev    = "3521898b0cbf398d882496f6382f6c4ea1c23bc1";
-      sha256 = "1jvf0v9cqwd4ssj1iarhgsr05qg48v7yvmbnn3k01jy0lqci8iaq";
-    };
-  });
-
-in stdenv.mkDerivation {
-  name = "toxvpn-2016-09-09";
+stdenv.mkDerivation rec {
+  name = "toxvpn-${version}";
+  version = "20161230";
 
   src = fetchFromGitHub {
     owner  = "cleverca22";
     repo   = "toxvpn";
-    rev    = "6e188f26fff8bddc1014ee3cc7a7423f9f344a09";
-    sha256 = "1bshc6pzk7z7q7g17cwx9gmlcyzn4szqvdiy0ihbk2xmx9k31c6p";
+    rev    = "4b7498a5fae680484cb5779ac01fb08ad3089bdd";
+    sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp";
   };
 
-  buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd;
+  buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd;
+  nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ];
+  cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
 
   meta = with stdenv.lib; {
     description = "A powerful tool that allows one to make tunneled point to point connections over Tox";

From e110f38bd4f3997ef1e71e26b6c3fe2c31487b17 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 15:00:22 +0800
Subject: [PATCH 0340/3449] utox: 0.9.8 -> 0.12.2

---
 .../instant-messengers/utox/default.nix       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 75995a6c5e38..0653558c940f 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,20 +1,26 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
 , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
-  version = "0.9.8";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
-    owner = "GrayHatter";
-    repo = "uTox";
-    rev = "v${version}";
-    sha256 = "0ahwdwqhi1gmvw80jihc1ba4cqqnx8ifjnzazxidfdky4ikzccmn";
+    owner  = "uTox";
+    repo   = "uTox";
+    rev    = "v${version}";
+    sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn";
   };
 
-  buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype
-                  libv4l libXrender fontconfig libXext libXft filter-audio
-                  git libsodium ];
+  buildInputs = [
+    libtoxcore dbus libvpx libX11 openal freetype
+    libv4l libXrender fontconfig libXext libXft filter-audio
+    libsodium
+  ];
+
+  nativeBuildInputs = [
+    cmake git pkgconfig
+  ];
 
   doCheck = false;
 

From 55e1d04e91f8e3600064e1972c84b9fbc31623ee Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 15:00:42 +0800
Subject: [PATCH 0341/3449] qtox: 1.5.0 -> 1.8.1

---
 .../instant-messengers/qtox/default.nix       | 53 +++++++------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 9a26e2e4fc0f..036d7fb3ce52 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,46 +1,31 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv,
-  libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
+  libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,
   pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,
-  qtbase, qtsvg, qttools, qmakeHook, qttranslations, sqlcipher }:
-
-let
-  version = "1.5.0";
-  revision = "v${version}";
-in
+  qtbase, qtsvg, qttools, qttranslations, sqlcipher,
+  libvpx, libopus }:
 
 stdenv.mkDerivation rec {
   name = "qtox-${version}";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
-      owner = "tux3";
-      repo = "qTox";
-      rev = revision;
-      sha256 = "1na2qqzbdbjfw8kymxw5jfglslmw18fz3vpw805pqg4d5y7f7vsi";
+    owner  = "tux3";
+    repo   = "qTox";
+    rev    = "v${version}";
+    sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq";
   };
 
-  buildInputs =
-    [
-      libtoxcore-dev openal opencv libsodium filter-audio
-      qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
-      pango atk qrencode ffmpeg qttranslations makeQtWrapper
-      sqlcipher
-    ];
+  buildInputs = [
+    libtoxcore openal opencv libsodium filter-audio
+    qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
+    pango atk qrencode ffmpeg qttranslations
+    sqlcipher
+    libopus libvpx
+  ] ++ (with xorg; [
+    libpthreadstubs libXdmcp
+  ]);
 
-  nativeBuildInputs = [ pkgconfig qmakeHook ];
-
-  preConfigure = ''
-    # patch .pro file for proper set of the git hash
-    sed -i '/git rev-parse/d' qtox.pro
-    sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro
-    # since .pro have hardcoded paths, we need to explicitly set paths here
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)"
-  '';
+  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
 
   installPhase = ''
     runHook preInstall

From dc2262b41cac98ef2b6a4de064e2a6df40ec6b63 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 10:47:33 +0100
Subject: [PATCH 0342/3449] pythonPackages.urllib3: 1.12 -> 1.20

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c1456818663f..39ff1f0f26c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6482,27 +6482,28 @@ in {
     };
   };
 
-  urllib3 = buildPythonPackage rec {
-    name = "urllib3-1.12";
+  urllib3 = let
+    disabled_tests = [
+      "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
+      "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
+    ];
+  in buildPythonPackage rec {
+    pname = "urllib3";
+    version = "1.20";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/u/urllib3/${name}.tar.gz";
-      sha256 = "1ikj72kd4cdcq7pmmcd5p6s9dvp7wi0zw01635v4xzkid5vi598f";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0bx76if7shzlyykmaj4fhjkir5bswc4fdx5r4q0lrn3q51p2pvwp";
     };
 
-    doCheck = !isPy3k;  # lots of transient failures
-    checkPhase = ''
-      # Not worth the trouble
-      rm test/with_dummyserver/test_poolmanager.py
-      rm test/with_dummyserver/test_proxy_poolmanager.py
-      rm test/with_dummyserver/test_socketlevel.py
-      # pypy: https://github.com/shazow/urllib3/issues/736
-      rm test/with_dummyserver/test_connectionpool.py
+    NOSE_EXCLUDE=concatStringsSep "," disabled_tests;
 
+    checkPhase = ''
       nosetests -v --cover-min-percentage 1
     '';
 
-    buildInputs = with self; [ coverage tornado mock nose ];
+    buildInputs = with self; [ coverage tornado mock nose psutil pysocks ];
 
     meta = {
       description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs";

From 9ac753323d5b16a774eb71c3a7cdcc5703aeaff5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 10:59:59 +0100
Subject: [PATCH 0343/3449] pythonPackages.llvmlite: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index 65d5c95114db..1da503417503 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.14.0";
+  version = "0.15.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "1ybgsmvamj0i51dvrn268ziczpm63y2h4sgagf6fkgkpydrr01g8";
+    sha256 = "c855835537eda61f3a0d19aedc44f006d5084a2d322aee8ffa87aa06bb800dc4";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
@@ -47,4 +47,4 @@ buildPythonPackage rec {
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ fridh ];
   };
-}
\ No newline at end of file
+}

From 8a4730642fbf44e09fcf88c3fb87195e2d550a2e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 11:00:12 +0100
Subject: [PATCH 0344/3449] pythonPackages.numba: 0.29.0 -> 0.30.1

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 1feb9e009e27..422fee396412 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.29.0";
+  version = "0.30.1";
   name = "numba-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "00ae294f3fb3a99e8f0a9f568213cebed26675bacc9c6f8d2e025b6d564e460d";
+    sha256 = "66e6254b3002f448fd212c5df4c8a69964dff9b9f315fb733e3c95e7e2b6c8fd";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@@ -28,8 +28,7 @@ buildPythonPackage rec {
 
   # Copy test script into $out and run the test suite.
   checkPhase = ''
-    cp runtests.py $out/${python.sitePackages}/numba/runtests.py
-    ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py
+    python -m numba.runtests
   '';
   # ImportError: cannot import name '_typeconv'
   doCheck = false;
@@ -40,4 +39,4 @@ buildPythonPackage rec {
     description = "Compiling Python code using LLVM";
     maintainers = with stdenv.lib.maintainers; [ fridh ];
   };
-}
\ No newline at end of file
+}

From 12285d162c95fd6c59de09c0f871fa5224565487 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 11:41:46 +0100
Subject: [PATCH 0345/3449] pypy: inherit pythonVersion

---
 .../interpreters/python/pypy/2.7/default.nix           | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 163c3847db9b..456a078874cd 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -15,11 +15,9 @@ let
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
   libPrefix = "pypy${majorVersion}";
 
-  pypy = stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
     name = "pypy-${version}";
-    pythonVersion = "2.7";
-
-    inherit majorVersion version;
+    inherit majorVersion version pythonVersion;
 
     src = fetchurl {
       url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2";
@@ -146,6 +144,4 @@ let
       platforms = platforms.linux;
       maintainers = with maintainers; [ domenkozar ];
     };
-  };
-
-in pypy
+}

From 58175843b13d01534e60f8827695e31187ec9f53 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 11:42:46 +0100
Subject: [PATCH 0346/3449] pythonPackages: python.majorVersion ->
 python.pythonVersion

...because we're interested in the version of the language, not of the
interpreter. This is important for PyPy packages.
---
 pkgs/top-level/python-packages.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39ff1f0f26c9..920772d47333 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12,14 +12,14 @@ let
 let
   pythonAtLeast = versionAtLeast python.pythonVersion;
   pythonOlder = versionOlder python.pythonVersion;
-  isPy26 = python.majorVersion == "2.6";
-  isPy27 = python.majorVersion == "2.7";
-  isPy33 = python.majorVersion == "3.3";
-  isPy34 = python.majorVersion == "3.4";
-  isPy35 = python.majorVersion == "3.5";
-  isPy36 = python.majorVersion == "3.6";
+  isPy26 = python.pythonVersion == "2.6";
+  isPy27 = python.pythonVersion == "2.7";
+  isPy33 = python.pythonVersion == "3.3";
+  isPy34 = python.pythonVersion == "3.4";
+  isPy35 = python.pythonVersion == "3.5";
+  isPy36 = python.pythonVersion == "3.6";
   isPyPy = python.executable == "pypy";
-  isPy3k = strings.substring 0 1 python.majorVersion == "3";
+  isPy3k = strings.substring 0 1 python.pythonVersion == "3";
 
   callPackage = pkgs.newScope self;
 

From 733dc656b17d52ac9a8d73e5c65817941969f67d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Feb 2017 11:43:13 +0100
Subject: [PATCH 0347/3449] pythonPackages.enum34: 1.0.4 -> 1.1.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 920772d47333..095498b73dc3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10993,15 +10993,20 @@ in {
   };
 
   enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec {
-    name = "enum34-${version}";
-    version = "1.0.4";
+    pname = "enum34";
+    version = "1.1.6";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/e/enum34/${name}.tar.gz";
-      sha256 = "0iz4jjdvdgvfllnpmd92qxj5fnfxqpgmjpvpik0jjim3lqk9zhfk";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1";
     };
 
     buildInputs = optional isPy26 self.ordereddict;
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
 
     meta = {
       homepage = https://pypi.python.org/pypi/enum34;

From 868d30f97574c50f2cfd272aa047cae683bfe1f8 Mon Sep 17 00:00:00 2001
From: Cillian de Roiste <deroiste@syslab.com>
Date: Tue, 14 Feb 2017 09:29:57 +0100
Subject: [PATCH 0348/3449] openconnect: add support for stoken

Tested with a Juniper Network Connect VPN
---
 pkgs/tools/networking/openconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index d9e3063f5c14..e1104a88c909 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, zlib } :
+{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, stoken, zlib } :
 
 let
   xor = a: b: (a || b) && (!(a && b));
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ vpnc openssl gnutls libxml2 zlib ];
+  propagatedBuildInputs = [ vpnc openssl gnutls libxml2 stoken zlib ];
 
   meta = {
     description = "VPN Client for Cisco's AnyConnect SSL VPN";

From 6a472cf4c1b78580de79c79ca7d7b714f4d8d36e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 14 Feb 2017 01:00:17 +0100
Subject: [PATCH 0349/3449] opensubdiv: Remove cudatoolkit from the closure

This reduces Blender's closure size by around ~2 GiB when CUDA support
is enabled.
---
 pkgs/development/libraries/opensubdiv/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index b253a27a7db3..f5f84ee15463 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -39,7 +39,16 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall = "rm $out/lib/*.a";
+  postInstall =
+    ''
+      rm $out/lib/*.a
+    '' + lib.optionalString cudaSupport ''
+      # Drop cudatoolkit reference from the closure. We'll get
+      # libOpenCL from /run/opengl-driver.
+      s=${cudatoolkit}/lib
+      t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
+      sed -i $out/lib/libosdGPU.so.* -e "s|$s|$t|g"
+    '';
 
   meta = {
     description = "An Open-Source subdivision surface library";

From 61236eb7ee816259178eba718cfcadad283ae300 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 14 Feb 2017 10:50:32 +0100
Subject: [PATCH 0350/3449] lmdb on Darwin: fix bogus library name

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

diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix
index 6b3070a39aa9..ec3e9997690e 100644
--- a/pkgs/development/libraries/lmdb/default.nix
+++ b/pkgs/development/libraries/lmdb/default.nix
@@ -25,6 +25,12 @@ in stdenv.mkDerivation rec {
     moveToOutput bin "$bin"
     moveToOutput "lib/*.a" REMOVE # until someone needs it
   ''
+
+    # fix bogus library name
+    + stdenv.lib.optionalString stdenv.isDarwin ''
+    mv "$out"/lib/liblmdb.{so,dylib}
+    ''
+
     # add lmdb.pc (dynamic only)
     + ''
     mkdir -p "$dev/lib/pkgconfig"

From 8d853d0190b90695f8324c509285d651204d2313 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 14 Feb 2017 10:39:36 +0100
Subject: [PATCH 0351/3449] gitlab: 8.16.3 -> 8.16.4

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

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index a2b08e436174..23100a85e7eb 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -22,7 +22,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.16.3";
+  version = "8.16.4";
 
   buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "0fdm92w97ggnpiqlpr5aia6x8j09v8id7n6pks134hq3pkdiz6mv";
+    sha256 = "118p3c9i9r2acc0yv5jzw9p7hql5pbp37k54qzrfgrs8vjjxi14i";
   };
 
   patches = [

From 62ca214d4a0dee898d6fa931d849031dfaaf417a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 14 Feb 2017 11:19:47 +0100
Subject: [PATCH 0352/3449] guile: fix include path in guile-2.0.pc

I forgot to /cc maintainer @civodul about the output-splitting.
---
 pkgs/development/interpreters/guile/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index fa8bd29bd684..6b4e6c2a7288 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -72,9 +72,11 @@
     # why `--with-libunistring-prefix' and similar options coming from
     # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
     sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
-        -e 's|-lunistring|-L${libunistring}/lib -lunistring|g ;
+        -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
             s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
-            s|-lltdl|-L${libtool.lib}/lib -lltdl|g'
+            s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
+            s|includedir=$out|includedir=$dev|g
+            "
   '';
 
   # make check doesn't work on darwin

From c9d822b51803504056cbc49365c950b0f1e8f832 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 14 Feb 2017 11:38:24 +0100
Subject: [PATCH 0353/3449] Perl::CGI: 4.31 -> 4.35

---
 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 f50d5dfe38d8..95d7810aeec9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1555,10 +1555,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CGI = buildPerlPackage rec {
-    name = "CGI-4.31";
+    name = "CGI-4.35";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "dee34f45525efb698d02c56ba2458a72acc34c4dcb05344706b587840b4e8c99";
+      sha256 = "07gwnlc7vq58fjwmfsrv0hfyirqqdrpjhf89caq34rjrkz2wsd0b";
     };
     buildInputs = [ TestDeep TestWarn ];
     propagatedBuildInputs = [ HTMLParser self."if" ];

From 020fb2cce1684e84da2b584374a85e4d5f36fae1 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Mon, 13 Feb 2017 17:46:05 +0100
Subject: [PATCH 0354/3449] syslog-ng: 3.6.2 -> 3.9.1

This should fix: https://github.com/NixOS/nixpkgs/issues/20153
---
 pkgs/tools/system/syslog-ng/default.nix | 39 ++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 7c7d5df4df8f..01aa0d1b01bd 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,17 +1,40 @@
-{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
-, riemann_c_client, protobufc, pcre, yacc }:
+{ stdenv, fetchgit, autoconf, autoconf-archive, automake, libtool, flex, openssl
+, eventlog, pkgconfig, glib, python, systemd, perl
+, riemann_c_client, protobufc, pcre, yacc, which }:
 
 stdenv.mkDerivation rec {
   name = "syslog-ng-${version}";
+  version = "3.9.1";
 
-  version = "3.6.2";
-
-  src = fetchurl {
-    url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/${version}/source/syslog-ng_${version}.tar.gz";
-    sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
+  src = fetchgit {
+    url = "https://github.com/balabit/syslog-ng.git";
+    rev = "59aa4e5d9396d293aae021746214b97d7fe0a8ee"; # tag: syslog-ng-3.9.1
+    sha256 = "15lalqf6dmpm4nr1pp0f2p0a6wbckkrh1k83vhp9ws0by5m8m66r";
   };
 
-  buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];
+  buildInputs = [
+    autoconf
+    autoconf-archive
+    automake
+    libtool
+    which
+    flex
+    openssl
+    eventlog
+    pkgconfig
+    glib
+    python
+    systemd
+    perl
+    riemann_c_client
+    protobufc
+    yacc
+    pcre
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
 
   configureFlags = [
     "--enable-dynamic-linking"

From 36d50978b275f0986ed805c42471feb0f6d2cc0f Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 14 Feb 2017 12:08:58 +0100
Subject: [PATCH 0355/3449] wireguard: 0.0.20170213 -> 0.0.20170214

This has a quick fix for old bash.
---
 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 8a2e6287364f..3e78fed7aded 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.20170213";
+  version = "0.0.20170214";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "256a7d41cf228f2a88e1b03b3911746dc827fe7be5b982c60080e7f81998cc6d";
+    sha256 = "1e4ee213d2a5ac672c952c59e9c64d6d7d5dc3e21c003aee30d75208237e8bf5";
   };
 
   meta = with stdenv.lib; {

From 8493a2d0609b1ba4fa5be36f4542ad6d55ecf54c Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 14 Feb 2017 12:19:40 +0100
Subject: [PATCH 0356/3449] heaptrack: init at 2017-02-14

---
 .../tools/profiling/heaptrack/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/profiling/heaptrack/default.nix

diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
new file mode 100644
index 000000000000..378073d16c00
--- /dev/null
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, cmake, zlib, boost162, libunwind,
+  elfutils, qt5, kde5, sparsehash }:
+
+stdenv.mkDerivation rec {
+  name = "heaptrack-${version}";
+  version = "2017-02-14";
+
+  src = fetchFromGitHub {
+    owner = "KDE";
+    repo = "heaptrack";
+    rev = "2469003b3172874e1df7e1f81c56e469b80febdb";
+    sha256 = "0dqchd2r4khv9gzj4n0qjii2nqygkj5jclkji8jbvivx5qwsqznc";
+  };
+
+  buildInputs = [ cmake zlib boost162 libunwind elfutils sparsehash
+                  qt5.ecm qt5.qtbase kde5.kio kde5.kitemmodels
+                  kde5.threadweaver kde5.kconfigwidgets kde5.kcoreaddons ];
+
+  meta = with stdenv.lib; {
+    description = "Heap memory profiler for Linux";
+    homepage = https://github.com/KDE/heaptrack;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ gebner ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24d3b9ad485c..37b2ae714607 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2190,6 +2190,8 @@ with pkgs;
 
   hecate = callPackage ../applications/editors/hecate { };
 
+  heaptrack = callPackage ../development/tools/profiling/heaptrack {};
+
   heimdall = callPackage ../tools/misc/heimdall { };
 
   hevea = callPackage ../tools/typesetting/hevea { };
@@ -13156,7 +13158,7 @@ with pkgs;
   inherit (gnome3) epiphany;
 
   epic5 = callPackage ../applications/networking/irc/epic5 { };
-  
+
   eq10q = callPackage ../applications/audio/eq10q { };
 
   errbot = callPackage ../applications/networking/errbot {

From 30e8d577f10048526e92d15dd3d547d2fd975b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 14 Feb 2017 11:49:24 +0100
Subject: [PATCH 0357/3449] ccid: 1.4.23 -> 1.4.26

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

diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix
index cfa9f69b3869..914247dcd0b5 100644
--- a/pkgs/tools/security/ccid/default.nix
+++ b/pkgs/tools/security/ccid/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.23";
+  version = "1.4.26";
   name = "ccid-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/4169/ccid-1.4.23.tar.bz2";
-    sha256 = "0s7c2g8idnnh19958aswaa2s51ncr2j7gqrkk5g95qpfnv7asdh8";
+    url = "https://alioth.debian.org/frs/download.php/file/4205/ccid-1.4.26.tar.bz2";
+    sha256 = "0bxy835c133ajalpj4gx60nqkjvpf9y1n97n04pw105pi9qbyrrj";
   };
 
   patchPhase = ''

From 5ebf37f749d8567262aed1ed3ec3bb19cf2a0e86 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 11 Feb 2017 19:51:11 -0500
Subject: [PATCH 0358/3449] org-packages: 2017-02-13

---
 .../editors/emacs-modes/org-generated.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix
index d5bccbbc6428..0e3d3fea3280 100644
--- a/pkgs/applications/editors/emacs-modes/org-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/org-generated.nix
@@ -1,10 +1,10 @@
 { callPackage }: {
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170124";
+        version = "20170210";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-20170124.tar";
-          sha256 = "0zlqb31fkwv74wszfz914agnprnh6jlr60v9dw62y9jyivaxg99k";
+          url = "http://orgmode.org/elpa/org-20170210.tar";
+          sha256 = "1v8adjz3rv429is8m7xx2v8hvc20dxl4hcdhdf2vhcx44bgbvyjb";
         };
         packageRequires = [];
         meta = {
@@ -14,10 +14,10 @@
       }) {};
     org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org-plus-contrib";
-        version = "20170124";
+        version = "20170210";
         src = fetchurl {
-          url = "http://orgmode.org/elpa/org-plus-contrib-20170124.tar";
-          sha256 = "1vgiw9xbh7zcr7gywb021h46idm0k69ifgkmwb9f9wb4snar4yq8";
+          url = "http://orgmode.org/elpa/org-plus-contrib-20170210.tar";
+          sha256 = "1h0lwf1sw7n1df865ip5mp0pdmdi2md6hz6fq53r4zhali041ifx";
         };
         packageRequires = [];
         meta = {

From 58b5c49ddd73c763583f4a274395ff6838f5d5d3 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 11 Feb 2017 19:51:32 -0500
Subject: [PATCH 0359/3449] elpa-packages: 2017-02-13

---
 .../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 4298f6057440..a11518735d7d 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -725,10 +725,10 @@
       }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.12";
+        version = "0.13";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.12.tar";
-          sha256 = "1h964w9ir8plam45c194af74g5q1wdvgwrldlmlcplcswlsn3n4z";
+          url = "https://elpa.gnu.org/packages/exwm-0.13.tar";
+          sha256 = "0n1wzy6chh024r0yaywjbf7mdsrxs6hrfycv5v0ps0drf6q3zldc";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -1377,10 +1377,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20170124";
+        version = "20170210";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-20170124.tar";
-          sha256 = "0mcnjwvily0xv1xl11dj18lg38llvrxja2j9mwn6vql8n5y1srxi";
+          url = "https://elpa.gnu.org/packages/org-20170210.tar";
+          sha256 = "15415wh3w8d4c8hd7qfrfdjnjb1zppmrkg8cdp7hw2ilyr90c0bn";
         };
         packageRequires = [];
         meta = {

From cd90c7fe7997b0cf36e555c3a08d9b21df7981fb Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 11 Feb 2017 19:51:41 -0500
Subject: [PATCH 0360/3449] melpa-stable-packages: 2017-02-13

---
 .../emacs-modes/melpa-stable-generated.nix    | 171 +++++++++++-------
 1 file changed, 110 insertions(+), 61 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index cc794cc6cf2e..88b3f04cb5a3 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -2578,12 +2578,12 @@
     bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bing-dict";
-        version = "0.2.2";
+        version = "0.2.3";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "bing-dict.el";
-          rev = "e94975ac63ba87225b56eec13a153ce169e4ec94";
-          sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
+          rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7";
+          sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict";
@@ -7763,12 +7763,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "4775dfb0957605308985ce2d2cf73550704137ae";
-          sha256 = "0xdb3l9184lmsabq9ajm7xj47pcg1rn743f24j7vp8r93ac21x5x";
+          rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c";
+          sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -13548,22 +13548,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "0.27";
+        version = "0.30";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "ebf17e486bb64af494278f851f674303c954432c";
-          sha256 = "1n5fnlfq9cy9rbn2hizqqsy0iryw5g2blaa7nd75ya03gxm10p8j";
+          rev = "f1ad302ec4073354801e613293be2f55ba770618";
+          sha256 = "0hkwhmgjyn5jxrd0k1nakrvy4d7cz7sxb1nw4hb1rqmz4yd14c8i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
-        packageRequires = [ cl-lib go-mode ];
+        packageRequires = [ emacs go-mode ];
         meta = {
           homepage = "https://melpa.org/#/go-eldoc";
           license = lib.licenses.free;
@@ -15782,6 +15782,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm-projectile, lib, melpaBuild, perspeen }:
+    melpaBuild {
+        pname = "helm-perspeen";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "jimo1001";
+          repo = "helm-perspeen";
+          rev = "28c91e4e8a43921457f047a548366dd799c07f69";
+          sha256 = "1zn7k0v734d9qcp79p3ajz6kr4hdxqiwi82i2rplg7y4ylikq0jq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
+          sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y";
+          name = "helm-perspeen";
+        };
+        packageRequires = [ helm-projectile perspeen ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-perspeen";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-proc";
@@ -18299,6 +18320,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jdecomp";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "xiongtx";
+          repo = "jdecomp";
+          rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7";
+          sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp";
+          sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz";
+          name = "jdecomp";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/jdecomp";
+          license = lib.licenses.free;
+        };
+      }) {};
     jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
     melpaBuild {
         pname = "jedi";
@@ -19977,14 +20019,14 @@
         pname = "magit-filenotify";
         version = "0.1";
         src = fetchFromGitHub {
-          owner = "emacsorphanage";
+          owner = "ruediger";
           repo = "magit-filenotify";
           rev = "575c4321f61fb8f25e4779f9ffd4514ac086ae96";
           sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/41aeebef8ed914fb378fef13ba47572accee332c/recipes/magit-filenotify";
-          sha256 = "0bbw6ay3csbc5zc6wa9p9nxpbxl3k35xz9jwqlw8mgz2b1xq083d";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify";
+          sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn";
           name = "magit-filenotify";
         };
         packageRequires = [ emacs magit ];
@@ -20143,12 +20185,12 @@
     magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-svn";
-        version = "2.2.0";
+        version = "2.2.1";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-svn";
-          rev = "d9e61effc55480694014e5422e8f74f0f17a757a";
-          sha256 = "128ra3habdqk1rsnmy87m0aw2pqi033dqmmjmgsmfblnfvi987p9";
+          rev = "c833903732a14478f5c4cfc561bae7c50671b36c";
+          sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn";
@@ -20182,22 +20224,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "magithub";
-        version = "0.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "c94ff69749dd14200956e0b59a3757618c594730";
-          sha256 = "12z9gl5lrvdfvhvk213phhgddvvr3y3hpigpzzcq0jla65db367b";
+          rev = "283bde94b3fe5cd8f4634887812c58eaf55aef60";
+          sha256 = "0nd9q3x60pydigyrp7b00xgnw7pgb0plh6mry7pj1532z3xxz1d7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
           sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw";
           name = "magithub";
         };
-        packageRequires = [ emacs magit ];
+        packageRequires = [ emacs git-commit magit s with-editor ];
         meta = {
           homepage = "https://melpa.org/#/magithub";
           license = lib.licenses.free;
@@ -20434,22 +20476,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
+    markdown-preview-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, uuidgen, web-server, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "0.7";
+        version = "0.8";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "2fc9f06fdf8489a2d5661b794941abb6f863f194";
-          sha256 = "0grljxihip0xyfm47ljwz6hy4kn30vw69bv4w5dw8kr33d51y5ym";
+          rev = "65f48df07c87d37275cc6a135741df4b585f1836";
+          sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode";
           sha256 = "1cam5wfxca91q3i1kl0qbdvnfy62hr5ksargi4430kgaz34bcbyn";
           name = "markdown-preview-mode";
         };
-        packageRequires = [ cl-lib markdown-mode websocket ];
+        packageRequires = [
+          cl-lib
+          emacs
+          markdown-mode
+          uuidgen
+          web-server
+          websocket
+        ];
         meta = {
           homepage = "https://melpa.org/#/markdown-preview-mode";
           license = lib.licenses.free;
@@ -20689,12 +20738,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.5.0";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "6b1b514ca3424c08301325f99608510130365cd1";
-          sha256 = "1pl65186k696mx6lm6lnn2jm86kwky780rph97cqb1dy506qpqxf";
+          rev = "9f73f1b0656a6a2ea55bbacf7659ffd3b35cdd9d";
+          sha256 = "0hnhzkkggv035x0qkxmw64migq6v6jpg8m6ayfc95avimyf1j67r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -21990,12 +22039,12 @@
     nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nginx-mode";
-        version = "1.1.6";
+        version = "1.1.7";
         src = fetchFromGitHub {
           owner = "ajc";
           repo = "nginx-mode";
-          rev = "304c9e2dbe884645661e3f133c11217a2b4d4274";
-          sha256 = "1i9yh55zi7ml4i9nfjgvyz62y7id3c9fszs0h41skdzjfs9x5p6j";
+          rev = "b58708d15a6659577945c0aa3a63983eebff2e67";
+          sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -25282,12 +25331,12 @@
     phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "phpunit";
-        version = "0.14.0";
+        version = "0.15.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "phpunit.el";
-          rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18";
-          sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k";
+          rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f";
+          sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -26095,22 +26144,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
     melpaBuild {
         pname = "projectile-ripgrep";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752";
-          sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g";
+          rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
+          sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
           sha256 = "1iczizyayql40wcljvpc1mvfvn9r28b1dkrkcmdxif732gd01jjg";
           name = "projectile-ripgrep";
         };
-        packageRequires = [];
+        packageRequires = [ projectile ripgrep ];
         meta = {
           homepage = "https://melpa.org/#/projectile-ripgrep";
           license = lib.licenses.free;
@@ -27400,12 +27449,12 @@
     repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "repo";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "canatella";
           repo = "repo-el";
-          rev = "98bde6fdc840d42a24c5784ee440cad39e8264d9";
-          sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
+          rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de";
+          sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo";
@@ -27610,12 +27659,12 @@
     rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rg";
-        version = "1.1.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "ec9eb5240191612debf0392ee7a7f491c7dae27e";
-          sha256 = "0773d0n5jq42yr5p1xbbfji027j0kw4msv1p8b7zk82ij1yc7hyr";
+          rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db";
+          sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -27694,12 +27743,12 @@
     ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ripgrep";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "1d579c5dc820b9a2c58261d362ffb95a02a8a752";
-          sha256 = "0ayq3h0mfqyn695r3qp31yamsyy6hcgj9fxsmlrsm615axvmki9g";
+          rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
+          sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -28427,12 +28476,12 @@
     selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selectric-mode";
-        version = "1.2";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "selectric-mode";
-          rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6";
-          sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31";
+          rev = "e60703d9a6c9944270d77bc829dae3a8b092346f";
+          sha256 = "04i5rrn93hzcf8zzfli2ams927lm83hl4q6w2azcg24lhldaqf8p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
@@ -28553,12 +28602,12 @@
     shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shackle";
-        version = "0.9.0";
+        version = "0.9.2";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "shackle";
-          rev = "4069e0cbff0d172de2cd7d588de971d8b02915c6";
-          sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y";
+          rev = "979b021077655ca38749a60c9752c0817e8fd93e";
+          sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -29537,22 +29586,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    socyl = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "socyl";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "socyl";
-          rev = "09ea9d1ea02060ccdb17b80ad88f912c08045c5b";
-          sha256 = "09zdknrg4ar38nbhvz4407x78i3lngmnrcijr7a4x1ybs5x61zis";
+          rev = "fcc0deda5b6c39d25e48e7da2a0ae73295193ea8";
+          sha256 = "1a8qd9hcmp4xl6hyvlq116nr9cn392bmrrda8vqkvjpd8rm8i776";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl";
           sha256 = "00b7x247cyjh4gci101fq1j6708vbcz1g9ls3845w863wjf6m5sz";
           name = "socyl";
         };
-        packageRequires = [ dash pkg-info s ];
+        packageRequires = [ cl-lib dash pkg-info s ];
         meta = {
           homepage = "https://melpa.org/#/socyl";
           license = lib.licenses.free;

From 25a2f9073142d7bedfab17cfa4ba3ecb831ddc31 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 11 Feb 2017 19:55:16 -0500
Subject: [PATCH 0361/3449] melpa-packages: 2017-02-13

Removals:
 - ebib-handy: removed from melpa
 - goose-theme: repository removed
---
 .../editors/emacs-modes/melpa-generated.nix   | 880 ++++++++++--------
 1 file changed, 482 insertions(+), 398 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index a47b5d69760d..7a7d05f58990 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -127,12 +127,12 @@
     abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abl-mode";
-        version = "20170208.647";
+        version = "20170211.1328";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
           repo = "abl-mode";
-          rev = "9c928c2968d7960ef672c3312051f0fbd4a7aeb3";
-          sha256 = "0fxl67nmy6vi6viwxday4j81m9lg4l8vg6yw2phgagm4zlp65k58";
+          rev = "54777551c1760f02b35043a51e1cadad1468aa44";
+          sha256 = "0p5jhp71n4021p173c9agmm26xqqx7z864ygaskf9dh810mxs1yh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode";
@@ -1570,12 +1570,12 @@
     all-the-icons-dired = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons-dired";
-        version = "20161203.605";
+        version = "20170210.811";
         src = fetchFromGitHub {
           owner = "jtbm37";
           repo = "all-the-icons-dired";
-          rev = "3ccab8ae4113e03ff2c7b103d388fa6ec1447d9c";
-          sha256 = "0rbcbhsw5js9wx29pp65s7q6mxhbz1jskhvzl0k4gqlk4m6gqcxq";
+          rev = "6e5152dfeb0f8be01a61d6fb0c0cb248ecdf1718";
+          sha256 = "1siwrcfpj9wnrq5q0y5yhbqnh081db0v4kzvxiiqs3idppdnddxg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8e432e3cd316ffeb7e0b68b855e23bcc3b9491/recipes/all-the-icons-dired";
@@ -1688,8 +1688,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "fe7a4ece906c5aec242b94e95befa50080414d3c";
-          sha256 = "0lisa1j4x13yk5cgdakdk2xly3ds3hw2s2vq0am375a57p65vpq0";
+          rev = "a6b80a4fbb4e6ce3bc6a51a6e9f0982ea219b16b";
+          sha256 = "06rgwx03x84r4i5z07sia09nsb76a3cb7zxkravx78h7anlw16xw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -2492,12 +2492,12 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20170120.1254";
+        version = "20170212.1229";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "9b4a0058a41ac7849c3d4e9cbe05a79e80b3fee1";
-          sha256 = "0xaq9ssvc5ysc18cjcm07plhf0b02rwwzfm82s4cakh8zffm2rnd";
+          rev = "f5ffcabf7f079bd899d95ffa11a78ccca7eb8c8e";
+          sha256 = "1vrpg0fjshqcfhj4iwkgrqw052rvx9kf2l217mg2z94rjm1y9g55";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme";
@@ -4221,12 +4221,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170208.1225";
+        version = "20170213.1604";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "53a4b2175ad58db5314105244f74d1f03a9f3df2";
-          sha256 = "1la5qljl8jcvnla5xfql509pwrcyjbamc6a3bzdxq55snh6hdkda";
+          rev = "f7cbf7734d99733ed99eb8a7b95d2dc808a73927";
+          sha256 = "16i617i3pflwdmdijiklwwh9ywiin6ln7mar0k7yybmlr6xbvlkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4931,8 +4931,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a";
-          sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz";
+          rev = "6c2d81cfadb12c10af0dabe148ede355737ed1a8";
+          sha256 = "18aqyphq1cwandfarql773d0h3ki6c9ip1wji1ni86fm29f99ikq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5036,8 +5036,8 @@
         src = fetchFromGitHub {
           owner = "canatella";
           repo = "bitbake-el";
-          rev = "4ab424d970bee0f6b91a1fc545b14ded173e3476";
-          sha256 = "0xqi5s8536hajjl3g1a2i8p9ll4vq9gdx2jjbjzlid65h669bny8";
+          rev = "4d9f0a4ffb7b9c6cd4d8271f1b429ca1bb7e9130";
+          sha256 = "0c8f6w8pgbr63g1zhgppfyh5g3sb0iv31ywqmvp6467766di4qh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/da099b66180ed537f8962ab4ca727d2441f9691d/recipes/bitbake";
@@ -6050,8 +6050,8 @@
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "bury-successful-compilation";
-          rev = "2b673a6df1513d976836087259e35384d94a9bed";
-          sha256 = "11bhpad8h9pmmm84ps95wdnaxn76wz4wm4l04mhcps5fsj7x15by";
+          rev = "52da2c07419beceab9b4d426d76adb3dcf2548d1";
+          sha256 = "1qdkx14rwabrfm9kzp4w9gvk9h4qg8f5b3qdwlyn863d2y7q468g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f66e2e23c7a1fa0ce6fa8a0e814242b7c46c299c/recipes/bury-successful-compilation";
@@ -6720,8 +6720,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e";
-          sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd";
+          rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1";
+          sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6762,8 +6762,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e";
-          sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd";
+          rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1";
+          sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7759,12 +7759,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170205.1414";
+        version = "20170212.240";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "773e48624edc32022764d9b3bab861f32c336ac3";
-          sha256 = "0s0ksk4f8hz2jajh7hx8b5qv8vrv5mr8mvk8n51ycip0gmrl98nf";
+          rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902";
+          sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7846,7 +7846,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "294752";
+          rev = "295019";
           sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y";
         };
         recipeFile = fetchurl {
@@ -8488,8 +8488,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "ada0bc21f42e25882ddf5a8aab10eaf3ea7e0b89";
-          sha256 = "0cl8c2kbsd8jcc9mdpdriamxv9bk5fnjra5c7rpwc19qahgf2w3a";
+          rev = "38bfe65eba21c697d05e8bed79635fc125cdac17";
+          sha256 = "1dqh7rd2hnn68dfj271sbm1j5dgpkd3phhjrcxnkg0wxyhpcpp7w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8758,8 +8758,8 @@
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "coffee-mode";
-          rev = "d7d554cbf435aa875fbf56e67c4374375a164a93";
-          sha256 = "1glif3jxh31cmy2rgz39bc2bbrlgh87v5wd5c93f7slb45gkinqi";
+          rev = "231eccd8cf662516159359ed24d1b27d068ec7f8";
+          sha256 = "1anidih1kbwqifrb7v90ga172alqhxizwz1vrf87cnj5ns1h1hx8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode";
@@ -9298,8 +9298,8 @@
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "company-arduino";
-          rev = "5958b917cc5cc729dc64d74d947da5ee91c48980";
-          sha256 = "08766m35s0r2fyv32y0h3sns9d5jykbgg24d2z8czklnc8hay7jc";
+          rev = "d7e369702b8eee63e6dfdeba645ce28b6dc66fb1";
+          sha256 = "06v7y7gxlxrxdaqy8c93niy1di80r738cq7rkghnhqi174pwl1wv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45350f816c4f5249792d29f97ef91f8c0685b983/recipes/company-arduino";
@@ -10050,12 +10050,12 @@
     company-statistics = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-statistics";
-        version = "20161213.159";
+        version = "20170210.1133";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-statistics";
-          rev = "36d9692da9172c3ad1e1a46d66ffa9346a44b212";
-          sha256 = "05br3ikxad7gm7h6327yfwdfap6bbg68fbybsx967a31yv4rxhvm";
+          rev = "e62157d43b2c874d2edbd547c3bdfb05d0a7ae5c";
+          sha256 = "12mwviz1mwx4ywks2lkmybbgh1wny67wkzlq5y3ml8gvyc288n3i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/89d05b43f31ec157ce8e7bfba4b7c9119bda6dd2/recipes/company-statistics";
@@ -10515,8 +10515,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
-          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
+          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
+          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10634,6 +10634,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "cov";
+        version = "20170130.1727";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "cov";
+          rev = "d73b3aa7f3f285f046e448ffabd3525ccfcc08a1";
+          sha256 = "0l21422mjhknabm1l4d9f5radq153vr6qc6ihsm0hxhy1i713mqn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
+          sha256 = "02wk8ikanl5lcwqb9wqc8xx5vwzhn2hpqpxdchg5mdi7fifa1rni";
+          name = "cov";
+        };
+        packageRequires = [ emacs f s ];
+        meta = {
+          homepage = "https://melpa.org/#/cov";
+          license = lib.licenses.free;
+        };
+      }) {};
     coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
     melpaBuild {
         pname = "coverage";
@@ -11530,8 +11551,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "e4b8a88d1e9b0ff053705b5082d6f9e12a839069";
-          sha256 = "1m4h0jw4baa70z5difns5afbylagdw11w3ppc92sjzjpicxn2g9v";
+          rev = "4924bd9cb7fc9350646f347e99292d115c39852c";
+          sha256 = "0yrq1hi79kyca774ab5kg0ran9nyjyh0h504rs17f8w05ly48n3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12135,12 +12156,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20161127.118";
+        version = "20170213.315";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e";
-          sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd";
+          rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1";
+          sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -14193,6 +14214,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dokuwiki = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "dokuwiki";
+        version = "20170213.122";
+        src = fetchFromGitHub {
+          owner = "accidentalrebel";
+          repo = "emacs-dokuwiki";
+          rev = "4f23638ab6f795fe70508576fa73583d447aecae";
+          sha256 = "18vfbvx2mck48pd1s3h2a8zx8axa808krailvfjm3ypa86ia95w6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e46cf6a57b93ddfda8e2d6e74cee8d0df2cb1ec7/recipes/dokuwiki";
+          sha256 = "1vi6crl5y3g1p6xcpqzybmidn09cdf4gplmrvb2nkc94pyd9qxnw";
+          name = "dokuwiki";
+        };
+        packageRequires = [ emacs xml-rpc ];
+        meta = {
+          homepage = "https://melpa.org/#/dokuwiki";
+          license = lib.licenses.free;
+        };
+      }) {};
     dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dokuwiki-mode";
@@ -14498,12 +14540,12 @@
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "20161119.1345";
+        version = "20170210.830";
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "c9f8a97eba74a82a65554c9b282e86125a22ecb2";
-          sha256 = "12918nidcmqnhkqhhrnhhd2sihqld5dy1v06q4j9fkrcbp4j4l4l";
+          rev = "0b865af179768c24a1f7135c2866eca0f65b9295";
+          sha256 = "114kxmki4hmrckxflkzgrl8i6n9qc1jdvma5assbvmhnfqmy4hvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14667,8 +14709,8 @@
         src = fetchFromGitHub {
           owner = "arnested";
           repo = "drupal-mode";
-          rev = "6f40ad04b760d2266b8c07283df266471d85a9b2";
-          sha256 = "13wlgy1g1nl3xxkibh0cj983lq3snw4xxmq4nsphq92pjd2lggs7";
+          rev = "9d5808972f344a09dcf665d5113ae81e39ac1051";
+          sha256 = "0vz41jfkfir7ymyl5y0v836zclqfihrjdiyz3vnb081x0gara8l0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode";
@@ -14707,7 +14749,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1782484";
+          rev = "1782905";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15329,27 +15371,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "ebib-handy";
-        version = "20170208.524";
-        src = fetchFromGitHub {
-          owner = "tumashu";
-          repo = "ebib-handy";
-          rev = "d70731bd02dd86500cb7807d0d11fc05b53d2a69";
-          sha256 = "03db4k69qkp4s9xj910ynkq4ky68hs404djsglhlcirdpwj58d80";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/8843caa0d80000c70d3b264854f50daac94e6962/recipes/ebib-handy";
-          sha256 = "069dq4sfw4jz4cd8mw611qzcz7jyj271qwv2l54fyi3pfvd68h17";
-          name = "ebib-handy";
-        };
-        packageRequires = [ chinese-pyim ebib emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/ebib-handy";
-          license = lib.licenses.free;
-        };
-      }) {};
     ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ecb";
@@ -15581,12 +15602,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "20170123.1113";
+        version = "20170212.450";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "141de1002c289e9852d34b6f603126fd21fcaf83";
-          sha256 = "1d4a1502lsz48r183iqw3xn06jd32n01dydvi2rgzydj5kf0lyka";
+          rev = "c25e7dd7ade0e514b1dc94e69b73415fd3eb57c3";
+          sha256 = "1v7jpm81r3c4iqrbslrlnczxfs35s7lky7v75x9ahm5vbnrd9iig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -15967,11 +15988,11 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20170207.1259";
+        version = "20170213.1254";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "756ebff43c4c2393a679ea7d26e22743831d4564";
-          sha256 = "135ymq7pc9478dlx6q4nln439r9d64ylmbbykcpisgw6ypn1yzbz";
+          rev = "66d4490ec38dd992ba90b3801879d3f0ff312635";
+          sha256 = "1y8imvgms7nb8fcpm1v6zkx3hqsf6zygc38gbj87c8s85f2qmfrq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide";
@@ -16008,12 +16029,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170209.956";
+        version = "20170212.2016";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "faf61c3cc371a9d4caa2e84687c31e5efb4577e9";
-          sha256 = "1rhd7l5pjfg11m6njc6z13p92v3fdswjr354rfrc2p0w03vc6nyb";
+          rev = "f1d3fbe96713e85aaea2f1027c2cc1782e0e5a70";
+          sha256 = "0kf8glywsdscviml8gwdj659zm28npkz0w6ybcx2k1wv9gkg3shs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16071,12 +16092,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170210.30";
+        version = "20170211.259";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "4046b291dce26148e62fed3974b94489ccc24674";
-          sha256 = "127kiplrwf1wkwpjf1fra6j1ic0wwiiza7d4ih47ffs40cq1f91r";
+          rev = "94617344a74336ecaebc17a414f4d05162a79303";
+          sha256 = "1lcc8y6lhqv0fgdik0qifbb1dzj077s86skrnvy92x373wv565kr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16117,8 +16138,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "f98bbc72303e17fe6833ece472c5f110ccd97911";
-          sha256 = "19l295g5ryx95jxgxgh55s1j97la30qjl7xkgkd5gn01hdvn9v97";
+          rev = "6b707565b7328d8bcb8898db1a5b9dffaa06cdf8";
+          sha256 = "02qvxpg3pnw6crr13isimbhxyk6lf0x216418bhilgvgzmp1jwmj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16197,12 +16218,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170201.1652";
+        version = "20170211.1725";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "df3cb294fdbed717fd7f7fcb8dd917226c5f2d8d";
-          sha256 = "01z824qxbqzgggj07x1ryx7mvw0jqq2s9hwg1jn23vzy7fchij44";
+          rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c";
+          sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -17059,12 +17080,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170201.629";
+        version = "20170212.420";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "ff0277013bf1319c72759d3f6eb001f2317cb52b";
-          sha256 = "13wdw9y78gwdlz83zgbbhkmk2q3wvf569pgnlcpy330fxmalbj6v";
+          rev = "7e005dc48530007aeac871dbe214512289ec5dea";
+          sha256 = "0pjdsh53f8d2fva55kvm726x5830r78fyigcd4ni4sifl83szrpf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -18239,12 +18260,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170131.627";
+        version = "20170205.616";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "f2daeceb98766914548bf9a3c8206ae64850e395";
-          sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6";
+          rev = "521026f777543b73bee6107aab089f44fb809c91";
+          sha256 = "0k2vxhr9rjkya95wca4v2qihbs72yx9zv1z7snm0wgfy39y385fh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -18760,22 +18781,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20170208.306";
+        version = "20170209.52";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "47b4abf118e2dac88c5c2cbd531372cc217854ec";
-          sha256 = "13fhkkfnvyf938gznl4av9gn7r4yyvw2rv438pabf0d0min37qqf";
+          rev = "6282023d28588e4838f37ea45a060ec48ef5ba3f";
+          sha256 = "01bbx82746abfqlr6hqja9jkvwalqyvxhdmzk6qarngyr2fpq1sa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
           sha256 = "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq";
           name = "erlang";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/erlang";
           license = lib.licenses.free;
@@ -18924,22 +18945,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }:
+    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170207.1035";
+        version = "20170213.1137";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "996730ebce57d810d2c275c7fadb11c2b1134dea";
-          sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg";
+          rev = "9fb395996316c140f3a6c77afb10dcd37cb49126";
+          sha256 = "0g2x3jwy3v45p6nqjfskj0w0c94gyvxm1xzi5yypnyhsj188fsyp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
-        packageRequires = [ cl-lib dash spark ];
+        packageRequires = [ cl-lib dash s spark ];
         meta = {
           homepage = "https://melpa.org/#/es-mode";
           license = lib.licenses.free;
@@ -19326,12 +19347,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170206.310";
+        version = "20170211.805";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "2ca23d826dfeeeb248739d68e5528286af3346a5";
-          sha256 = "16i6zqnnj4c12y7bfhmk723gffqn05mjc9zs8lyb0c59s6la54c9";
+          rev = "59233439aaa73ae34d548ab126fd3a79e8363c92";
+          sha256 = "0p1hs4fy8aig504qck4j7c5jc9nw5fny42az1k56gifw6c243wfr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19908,12 +19929,12 @@
     evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-ediff";
-        version = "20170208.848";
+        version = "20170213.539";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-ediff";
-          rev = "b77232b82ca0d81f2acd0d3ff60a8b99e0a30460";
-          sha256 = "18rlwn2yn6yf11hfhvs76qk3i9l45gry3lpahpsd2gf426hd48mg";
+          rev = "4f3b9652e5df58ccc454d970df558f921958894d";
+          sha256 = "1nc7xq86v5ns3d47ifwnfm7x7x3qxb18rjqx37mqvga91nz2i1k3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/45eb1339792849b80a3ec94b96a88dd36262df2b/recipes/evil-ediff";
@@ -20937,12 +20958,12 @@
     exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exec-path-from-shell";
-        version = "20161229.1338";
+        version = "20170212.2116";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "0f53502d463eeeaefe48dfeb0c2fbaac1e6302e3";
-          sha256 = "12mkh5sna8j0ijxc6fd8sr2zlk3p6w9q3fv5l3n16sjmnlj3cf0r";
+          rev = "9def990ba4c30409a316d5cbf7b02296a394dece";
+          sha256 = "1ghivxwslvsbcimhhacbl07kxc1kfv7gn95fwsdx687p9qyffyfb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell";
@@ -20979,12 +21000,12 @@
     expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-region";
-        version = "20170122.2241";
+        version = "20170213.616";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "expand-region.el";
-          rev = "c75dab7bf0f9bb392ceafb10de16deee87467fa6";
-          sha256 = "0bhwv92wqccz8y5xm6gj71ryci8cpsnm8z8vmdj8lsf6ki8vz512";
+          rev = "d9435e3d0954e9b791001a36d628124cc520445e";
+          sha256 = "0i4463821lhi3cid6y3v3milq0ckagbdc513xs5vv3ri44h91n57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -21843,8 +21864,8 @@
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "find-file-in-project";
-          rev = "1c50ca72acd816c5d5b3fbdb605bbd85a0172b11";
-          sha256 = "0nzn5bccxr8nsxqbc2gx17hrydbx511h4ba6bz3gaf78qfppn2ff";
+          rev = "08ab38b89d21f528fa7dc18f860191365852959a";
+          sha256 = "1ybv1scpf7578zfjpl71nynzydq8g5607ai6l0vavprdhri70xdf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@@ -22463,12 +22484,12 @@
     fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
     melpaBuild {
         pname = "fluxus-mode";
-        version = "20161124.1145";
+        version = "20170210.1141";
         src = fetchFromGitHub {
           owner = "defaultxr";
           repo = "fluxus-mode";
-          rev = "6670eeda008e2f0180e549624da708d5aa3599f6";
-          sha256 = "1r2i88qv7zxcgccvyxpgq36ilsv3rdplx52pvd6kvfcw7whym205";
+          rev = "3661d4dfdaf249138e7f215f15f291c9391ede8d";
+          sha256 = "1dp974qs80agx9qcq5k5awdsr8p8smv8cdwkjz2d8xfd5wq2vhh9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3396e0da67153ad051b8551bf34630d32f974f4/recipes/fluxus-mode";
@@ -22547,12 +22568,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170209.1145";
+        version = "20170212.1015";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "4c0aa8e00d9419a37dbb58a4faef36ab273b69c3";
-          sha256 = "0ridbz5xnxr8lj83xn45h4y5pl09mwl053b3b3vq0z8dh3r8ac7n";
+          rev = "3943b4cc991eba2d6aff6ef085ab34915dc274ee";
+          sha256 = "1n2rl1b7xca5vyk6x60q7v3xn55n7a971xcmzz10yqh28qxn6qlg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -24374,12 +24395,12 @@
     flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flyspell-correct";
-        version = "20161031.1134";
+        version = "20170213.700";
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
-          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
+          rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
+          sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct";
@@ -24399,8 +24420,8 @@
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
-          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
+          rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
+          sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm";
@@ -24420,8 +24441,8 @@
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
-          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
+          rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
+          sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy";
@@ -24441,8 +24462,8 @@
         src = fetchFromGitHub {
           owner = "d12frosted";
           repo = "flyspell-correct";
-          rev = "7e7f94a36699c7e7bba728df722e13a7b4af4b73";
-          sha256 = "16lbhbgyrpp9ig9li1v31bs9i5z8dchjb1vrkcih020p3g9vwi27";
+          rev = "1e19a2b506470e8d741b521da0bd9b66214256f3";
+          sha256 = "03npd8yd9l64xmla3z7q86q267z9455kbsd8752w4737cjw65avl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup";
@@ -24725,6 +24746,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "font-lock-profiler";
+        version = "20170208.1208";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "font-lock-profiler";
+          rev = "6e096458416888a4f63cca0d6bc5965a052753c8";
+          sha256 = "186fvyfbakz54fr8j1l7cijvaklw96m1hfbjyw7nha08zc2m1hw5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b372892a29376bc3f0101ea5865efead41e1df26/recipes/font-lock-profiler";
+          sha256 = "089r74jgi5gwjk9w1bc600vkj0p5ac84rgcl7aqcpqfbh9ylwcp9";
+          name = "font-lock-profiler";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/font-lock-profiler";
+          license = lib.licenses.free;
+        };
+      }) {};
     font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "font-lock-studio";
@@ -25253,12 +25295,12 @@
     fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170209.744";
+        version = "20170210.1336";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "826422333deac91b390836a3bb4bb0b696c4f926";
-          sha256 = "1zrpz6qdfwa9p7wp5pd0xsax1cvlz0vr177w9bkvwvnax8cy1n42";
+          rev = "26ac5bb8fe1cafbf2bd09ef8a528af506c2caf8a";
+          sha256 = "0gbcwj36ns34xqgjp6pxml6zn8kza080gyyf383vhqqfqp640vqj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -25277,8 +25319,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "d63c992d97f415ba97b115356d796e2da2dadbe1";
-          sha256 = "15scnv8gbinazwf97da7crpmj6nlqi8ai4psk257x9c82p3jyln6";
+          rev = "e826546c6d33ff02048b3652cc64058dde819f1c";
+          sha256 = "1pgpmsyxilsqwjr57zd1afzr33fq0nnahx8ppih6pqnfza97008s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25983,8 +26025,8 @@
         src = fetchFromGitHub {
           owner = "javaguirre";
           repo = "ghost-blog-emacs";
-          rev = "19c2f62da87c756ff080a235bf1b115c88d499ba";
-          sha256 = "1br27p8kqnj6gfii6xp37yd3rja876vhpcf784n98qhnkd7a63q1";
+          rev = "d4e66d114ff7b846b967af4cff64dcafa381ead3";
+          sha256 = "174swf066vcf99g38c9x5lxp14fyh59cy9lriywhm6hk7mcaakng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b589edfacb807fb17936e139499bdd9673dad94/recipes/ghost-blog";
@@ -26193,8 +26235,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b";
-          sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj";
+          rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737";
+          sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27233,22 +27275,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "20161012.616";
+        version = "20170211.721";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "ecf71a75ccfac7f9bc6fac64ef536f2ffb56b3bf";
-          sha256 = "1q3l8x7qlcblxy0h4j48hzqjx90c14qh7nzbk8gds3ff2yrxy2kl";
+          rev = "f9c6e25419c2d13f3841050ba66610a7ac728f49";
+          sha256 = "033md85r3y5gxvw458l125d0jxc3k8yfn5im22zi64rrbwlwkifx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
-        packageRequires = [ cl-lib go-mode ];
+        packageRequires = [ emacs go-mode ];
         meta = {
           homepage = "https://melpa.org/#/go-eldoc";
           license = lib.licenses.free;
@@ -27362,12 +27404,12 @@
     go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
     melpaBuild {
         pname = "go-playground";
-        version = "20170126.1240";
+        version = "20170211.2";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "eebb1fec2177bc85b746b948beac873a77bea4a2";
-          sha256 = "0ixpcms4f0q8327jyp2k48x03vjxwmzdsq76vg4j0kmjs9dfad1v";
+          rev = "70437bc4348ef252e4788f867c86622aff670f91";
+          sha256 = "1mvldim8igbrnff80h0x7570bhhxa0pli84888wfylks30r9kg5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -27639,8 +27681,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "6d7efc48f3ecdd4fdd4035680f25173dbb22fdba";
-          sha256 = "1i50sxyvvykdw51iafaw87aj2dwisgj0qcxi5gl1czdfw9x0v06k";
+          rev = "b8599f7d71e7fead76b25aeb919c0e2558672f4a";
+          sha256 = "0dlai5893607dirgwiw39zfmmp3iaswayym4gc1m4p7v9pvl7hx9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -27800,27 +27842,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "goose-theme";
-        version = "20160828.545";
-        src = fetchFromGitHub {
-          owner = "thwg";
-          repo = "goose-theme";
-          rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c";
-          sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/818b526f3e633cf9922c011f3db5d3db7e17ee5d/recipes/goose-theme";
-          sha256 = "18kfz61mhf8pvp3z5cdvjklla9p840p1dazylrgjb1g5hdwqw0n9";
-          name = "goose-theme";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://melpa.org/#/goose-theme";
-          license = lib.licenses.free;
-        };
-      }) {};
     gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "gore-mode";
@@ -27968,12 +27989,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170107.2101";
+        version = "20170213.1516";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "0a28e595c8e9e99879e8d2f796e82c5a68202ff0";
-          sha256 = "1raknv2iv4hxdv8c8vxwrf1q90b9q4b5vgkbhmcfv08ii6s5dxn5";
+          rev = "9bda6c3e3d4e1a477092cf2967ddbe5195cb7833";
+          sha256 = "1shdh2hx6vildj8daqivy7227ywf7arz1wy2hzk46dck6q58w9ls";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28010,12 +28031,12 @@
     grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grab-mac-link";
-        version = "20170131.254";
+        version = "20170211.619";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "grab-mac-link.el";
-          rev = "d428ce46eaf4243510955f05f0890250b74b1837";
-          sha256 = "0zmvd6j21fynmyjzmychpghy23r800zmaj4naqz4jcand8skd79z";
+          rev = "e47faf9c190d694b8b19b99bc919db98e51e67d8";
+          sha256 = "1hkyd8mr2rrvkrm2rqmi2yb2way05jkxj3l6z3d8026l88rwiddy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -28604,12 +28625,12 @@
     guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, typo }:
     melpaBuild {
         pname = "guess-language";
-        version = "20170210.216";
+        version = "20170213.330";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "9763f9e81892c7dd2f5ffa6e771b356beeefafee";
-          sha256 = "07k0cf3n3c9hmrhnj2h6yfp4hbw09qn22a5wq5c54bskfyhrkj4s";
+          rev = "c0a9cd33d8233e2e0cd62b28fdb7128945b3de99";
+          sha256 = "0jlhk8vqxhsjvrf5iln9rii8vcvcaz247cpk51fymy5sh4dbc5sw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -29150,12 +29171,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170209.415";
+        version = "20170210.1038";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "f430fdce5ff747fb3c6490d29bc6be23d5444480";
-          sha256 = "0z31wsbjq67dm8bfb5gcrncp3xif47vxr51gjyprsam9k5ixlmm4";
+          rev = "0f8eabf8c633df2539a158108a7c9083f894970f";
+          sha256 = "0a3iqsq6pdsifylydk1wqrf45y5j9r86imh5pac15r2p0xqg6p46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29418,12 +29439,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170209.513";
+        version = "20170211.2302";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bbd39ac5d2833e50882a8736b846e432aea3a754";
-          sha256 = "0px36psp6lp3wih8i8xv0q4yb6c3ps39mkrlc8b8a50zf7bi75x7";
+          rev = "fdc277116bcc57917a17838a388d880f7c7ea83b";
+          sha256 = "0s0qnwx8sm4dm0hgn70433rvkqw7144a3pvsk3yli56crvdpxvi4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29989,8 +30010,8 @@
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "bbd39ac5d2833e50882a8736b846e432aea3a754";
-          sha256 = "0px36psp6lp3wih8i8xv0q4yb6c3ps39mkrlc8b8a50zf7bi75x7";
+          rev = "fdc277116bcc57917a17838a388d880f7c7ea83b";
+          sha256 = "0s0qnwx8sm4dm0hgn70433rvkqw7144a3pvsk3yli56crvdpxvi4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30384,12 +30405,12 @@
     helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flyspell";
-        version = "20160927.1648";
+        version = "20170210.1101";
         src = fetchFromGitHub {
           owner = "pronobis";
           repo = "helm-flyspell";
-          rev = "5aeace7004cbb689276fb5056a9935d27593ce8c";
-          sha256 = "1jnphdmh6j252bgyxw5jl01wkfwnjrv2j7isnq40xnqs4azjwz80";
+          rev = "8d4d947c687cb650cb149aa2271ad5201ea92594";
+          sha256 = "0q0xcgg8w9rrlsrrnk0l7qd8q7jc6x1agm2i769j21wpyfv1nbns";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-flyspell";
@@ -30573,12 +30594,12 @@
     helm-gitignore = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gitignore-mode, helm, lib, melpaBuild, request }:
     melpaBuild {
         pname = "helm-gitignore";
-        version = "20150517.2056";
+        version = "20170210.1608";
         src = fetchFromGitHub {
           owner = "jupl";
           repo = "helm-gitignore";
-          rev = "03aad6edb0ed4471c093230856f26719754e570b";
-          sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g";
+          rev = "2a2e7da7855a6db0ab3bb6a6a087863d7abd4391";
+          sha256 = "07770qhy56cf5l69mk6aq882sryjbfjd05kdk78v65mgmlwv806a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3146b9309e8cbe464330dcd1f5b8a9fd8788ad6f/recipes/helm-gitignore";
@@ -31584,8 +31605,8 @@
         src = fetchFromGitHub {
           owner = "asok";
           repo = "helm-rails";
-          rev = "31d79cd0feca11cbb1aa532a8d2112ec794de4f0";
-          sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158";
+          rev = "506d9948d45dfbc575c9c4c0d102c1ad2f511e82";
+          sha256 = "0i5ps5yds21bsrx86piy9bdgca95l1farsrbjpqz88ad8pq6xa9c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af52fd266364a81ff42eb6d08389fa549bd6c2c/recipes/helm-rails";
@@ -32700,11 +32721,11 @@
     highlight-operators = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-operators";
-        version = "20160517.1349";
+        version = "20170213.1420";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/highlight-operators";
-          rev = "c06a29726f3e";
-          sha256 = "0fqfxwdz1xbc6dwxbjdhryvnvrb5vc38cq7c2yiz294mfzyn3l5s";
+          rev = "3938e88e78c5";
+          sha256 = "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bd74b7a3484e437c6db4f18613744ebae030f5/recipes/highlight-operators";
@@ -32759,6 +32780,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    highlight-refontification = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-refontification";
+        version = "20170211.1224";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "highlight-refontification";
+          rev = "32632897d88c4611fadb08517ca00ef5cbc989b6";
+          sha256 = "1k6af947h70ivkj31mk3nv2vkxlfpqvpwq8za53n2l7adsjdlf73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c59f2b5cf1594248e8365b6ce3324f493c5647/recipes/highlight-refontification";
+          sha256 = "0cm9p4d7yhkz5a88m0y4646a6b9lb2ha7q12fcrdikyckpmbkqss";
+          name = "highlight-refontification";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/highlight-refontification";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-stages";
@@ -34211,8 +34253,8 @@
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d";
-          sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz";
+          rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1";
+          sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -34501,12 +34543,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20160623.815";
+        version = "20170211.1432";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "a1c2965e31ebc6bf6f86fba0184415da32a8214d";
-          sha256 = "0fvsi6hll1x0nvx1axsmsfv93pydkpmzq36hjw4kkp07nrf2byrz";
+          rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1";
+          sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -34874,12 +34916,12 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "20160211.341";
+        version = "20170212.518";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "a68d596b437ce1c125d8bd5414467ca1ff55bdcc";
-          sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
+          rev = "415a8db6598e949e4389f2e06dc2c28f96892214";
+          sha256 = "0w1x3psbzwqmbjm2dcqx4x72p43pdsliz0z40g2zjqkbqjs2al2q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -35248,12 +35290,12 @@
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20170115.1602";
+        version = "20170212.1444";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "bf380c13e50c18b6bac6651b22b6fc6ba349062f";
-          sha256 = "1in57d8q33x68ccxng13yp8l4frdgab3nx74p4n4lxa183qcs2n5";
+          rev = "af4f238ef4555521d13c5eb2fb8e818acf59d70a";
+          sha256 = "1668dr6y0nph739x947kjz435qikg77m8ja7h6laf3f9wzcxcg9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby";
@@ -35664,12 +35706,12 @@
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
-        version = "20170110.234";
+        version = "20170211.807";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "interleave";
-          rev = "0993383bf4a36f8e4480e5ea50226e1f8fa549c8";
-          sha256 = "1f4syyfga5f49nvlcw4ajxabxki9hglf89mslxkh15zib3mpakf9";
+          rev = "822ae2d29aaf92bcf96324442126b551e4477d6a";
+          sha256 = "0nq2f6pgq4vszy3hx84qdml4i9lbqlrh9knqgwgrl819vr15srqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave";
@@ -36247,8 +36289,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
-          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
+          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
+          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36331,8 +36373,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
-          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
+          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
+          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -36931,15 +36973,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jdecomp";
+        version = "20170212.2147";
+        src = fetchFromGitHub {
+          owner = "xiongtx";
+          repo = "jdecomp";
+          rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7";
+          sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp";
+          sha256 = "1s8y7q361300i7f6pany1phxzr42j8gcdv9vpin05xx15p2nr3qz";
+          name = "jdecomp";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/jdecomp";
+          license = lib.licenses.free;
+        };
+      }) {};
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170209.1026";
+        version = "20170211.609";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "60bf9339d1871e06e37865b58be4b6716d081a7c";
-          sha256 = "09hv4pm5p1m4wpr7wfvxda6w1y5wacg6apbn90c6w0zgivq89k4i";
+          rev = "0ac750cb6c3b9b9f0c4c8d440a88bc9d7377d9f7";
+          sha256 = "094sip7s0vqvn7xv6w66gd3pxhsdb3a1psvcv4dyliqj2zkfa3q4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -37706,12 +37769,12 @@
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
-        version = "20161027.625";
+        version = "20170210.1504";
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia-emacs";
-          rev = "feb6e79dddc8f992f85ae8c955ce024d57ec5e26";
-          sha256 = "015y0y5xx7b3iky3r9gdnkh4kq1nxvdshvmlb0yy3mg71s62xi76";
+          rev = "9c36479c83039c4fc26e583bb1c4dc27de058a4e";
+          sha256 = "1w9fhc8k8zxxiscpyip39rrwd2yr1xpxias16scj470mviwh7j26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -38482,8 +38545,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "b15c6507a60ed3ef6dc3cb9489ddc8ca6ebba4b2";
-          sha256 = "0bkk8cld7g0id0xs7ql6piyzdng6rzn4w0i3xlkhlq759mv413dg";
+          rev = "ec7f2477ac417e4ccad245b3ce69472c3766d008";
+          sha256 = "063wp6fv6wi5qc7ybam6swmhmakavg3lh7n8v4lms7zjiq47c90c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39356,12 +39419,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170129.1131";
+        version = "20170211.1157";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "98c8e660f24d9e4873aa5cee00f47437ac301084";
-          sha256 = "10fwz2zlyvvlwnjb2dxdb8gfvcfb1y0j0qkagbk5lkyb6j65yayl";
+          rev = "4d32174f5930bd4de81117d83a232768cf96ce4c";
+          sha256 = "1w64pa0rl2fr8z3l0bq4sw4543rfp53zdgjm5gm5f84py3fjkwmc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -39420,8 +39483,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "332f39d3fef443ef2d869b6a393e8a1c16a7e1f9";
-          sha256 = "11n8d8rbjgi3wfhcwidavg3wfsn1fvdzpqi4s3m8lqc2gq2srccn";
+          rev = "640ef0f7251ae23b43f6824bd4f116fa2ee16b9b";
+          sha256 = "067n6i4vvjldwrm2xif7qskbxy59aqz8jrkjniq4kv8jgpab9iwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -39733,12 +39796,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170209.125";
+        version = "20170212.1136";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "205cd556621d5d1db0c6e9f2608a80fc014b492d";
-          sha256 = "080azhzp6gd1ihkd6ydbcrqzrhggprwn08n9pz7ms0cd75vwxj9k";
+          rev = "3dcacc88a0964550b7f4f37290e46cecee8843d8";
+          sha256 = "0vhysxh264bdh4rmfnk0hczb80fi8gbhvbnc9ah1nip9l53m1gdf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -39983,12 +40046,12 @@
     literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "literate-coffee-mode";
-        version = "20160114.434";
+        version = "20170211.715";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-literate-coffee-mode";
-          rev = "996bffe70499fb807b824a4a03d7fa0e5b675c82";
-          sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc";
+          rev = "55ce0305495f4a38c8063c4bd63deb1e1252373d";
+          sha256 = "1gm89azjgsdg0c7z9yprpjbph211c5jnqv11pkf1i1r1wzx0wanj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a20410e916d45e5b243e7eb3bb2226c7e1e67b00/recipes/literate-coffee-mode";
@@ -40046,12 +40109,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170209.2119";
+        version = "20170212.2013";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "61822a570283987d93543a4fd230c738813072cf";
-          sha256 = "1chf8vkr3sn3i63q1rzpn3cxw16fqv29bbhrzw64scgdjqjn796w";
+          rev = "c4e28fdf6c409c870ecbb7b4d3c19d0dda76e79c";
+          sha256 = "19m2k9srlc8v5nrb4a44v8pdcfg9zbx28b5s7qa7m676b3yav58b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -40133,8 +40196,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "7f4371b614a6e25f0efd2133d11d631329eba1fb";
-          sha256 = "0wa86zmbs3i8v50yvww5anzl29194vfkgn9zdh24vkzwxlshfmwk";
+          rev = "9053d357baecccf1399f934c5faea2b2e6c0a742";
+          sha256 = "09p441mrp4bfg5imh2dghz0zr95qibh0hwv278lbdbq33svl8qmg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40507,8 +40570,8 @@
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "de6e3615b0c0775bd9739aeb98ce629e59f77695";
-          sha256 = "1bfspb3iwr6py6v8k3h5qc84bhgp1w80zvgn3kvkm27mlh6qpbv9";
+          rev = "7f43aa9c669832f1c2f22a3f785f3cd05aacfe02";
+          sha256 = "0dfyyjvzh55cnm33w6gq841cbldki8yfzqpz37gs98zxy0wkc6kw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -40794,12 +40857,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170208.834";
+        version = "20170213.927";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b";
-          sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj";
+          rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737";
+          sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -40822,12 +40885,12 @@
     magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-annex";
-        version = "20161115.1528";
+        version = "20170211.1601";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "74e0343b4152ad5c0d4f77f9f15dd6f1b02de432";
-          sha256 = "08mpnj9c43p528iy3hj8yljhzpkpjxkjiaiiss5n2jgyyc64hw9z";
+          rev = "2437efb93767b352eecf27f5d5e3513e34a395ca";
+          sha256 = "1pmsbl8jh3dgs42k7b0a9ya1ywwy5435pshplc23z33i7qplva9f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex";
@@ -40973,8 +41036,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b";
-          sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj";
+          rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737";
+          sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41032,12 +41095,12 @@
     magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-svn";
-        version = "20170118.925";
+        version = "20170213.433";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-svn";
-          rev = "d9e61effc55480694014e5422e8f74f0f17a757a";
-          sha256 = "128ra3habdqk1rsnmy87m0aw2pqi033dqmmjmgsmfblnfvi987p9";
+          rev = "c833903732a14478f5c4cfc561bae7c50671b36c";
+          sha256 = "01kcsc53q3mbhgjssjpby7ypnhqsr48rkl1xz3ahaypmlp929gl9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-svn";
@@ -41074,12 +41137,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "magithub";
-        version = "20170203.437";
+        version = "20170213.1926";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "6880e5efb73e0cc8b8b71c639328cbec29d9cb9d";
-          sha256 = "1l82vibgmhpwpsarvh40js6q044b458h3i7r0wm7l897izsxkk84";
+          rev = "a94502461ada9098ccb031ec6241414dcbfce989";
+          sha256 = "0wsk7qhvz1k41lfajx0hrrdj5pwvqr2m10a9lil1f124pkc883w0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
@@ -41431,12 +41494,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170210.348";
+        version = "20170210.2253";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "2727f2b1b217764e8217fb0db9ab87a8bcc80201";
-          sha256 = "1lxmxka6jg3ma6nmg5b4b6a2lz94in43pgb7gh1kprwl3i13578w";
+          rev = "578d87183d2a759811a5d1eab4dc9c74513e557c";
+          sha256 = "02zgc56s1wl7a27vrgycfgsy0fd6xbsbhgnpy6rrq5iyrb6a6wnc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -41498,8 +41561,8 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "marcopolo";
-          rev = "85db828f2bb4346a811b3326349b1c6d0aae4601";
-          sha256 = "1qf724y1zq3z6fzm23qhwjl2knhs49nbz0vizwf8g9s51bk6bny2";
+          rev = "e53ee8a0822d092d8669d75138f6d73f46d076f9";
+          sha256 = "1hhqgwx65489rdq9qd8v0dpcnwicfr772j3i4k8cmnn2lkr3fmm8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/936a1cff601594575c5b550c5eb16e7dafc8a5ab/recipes/marcopolo";
@@ -41557,12 +41620,12 @@
     markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "markdown-edit-indirect";
-        version = "20170208.722";
+        version = "20170210.1504";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "markdown-edit-indirect.el";
-          rev = "f617397e5f1a77d87a1d189f66c5a2f012f66b4d";
-          sha256 = "00l6mkvsfq37jy3c7qmw4ca5h0an9326ambrkrna4ii03qlshqik";
+          rev = "980d8bf3a123a72aef18f608e99be3472be100c3";
+          sha256 = "1idsh6gsm7kaz7i8kv3s326qxnd2j3nmwn8ykbnfwracm6him3qf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect";
@@ -42063,12 +42126,12 @@
     mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mbsync";
-        version = "20170118.448";
+        version = "20170213.357";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "mbsync-el";
-          rev = "874b6dd2debabf5dd5516db7f976634157bb7eec";
-          sha256 = "1i068rw9kg9z8pbja4qhh6cqn3ysbgf79cl31c2pvdz3p6fgaks6";
+          rev = "a1fbd1a350e7da5cf4da09ded0443bfee826a45a";
+          sha256 = "0a52s9pvh83hdj05rg04na6pnr4dra256h64bgdvf65703yfbs8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync";
@@ -42147,12 +42210,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170131.627";
+        version = "20170212.2226";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "6b1b514ca3424c08301325f99608510130365cd1";
-          sha256 = "1pl65186k696mx6lm6lnn2jm86kwky780rph97cqb1dy506qpqxf";
+          rev = "9f73f1b0656a6a2ea55bbacf7659ffd3b35cdd9d";
+          sha256 = "0hnhzkkggv035x0qkxmw64migq6v6jpg8m6ayfc95avimyf1j67r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -44131,11 +44194,11 @@
     multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-project";
-        version = "20170128.1236";
+        version = "20170212.1130";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/multi-project";
-          rev = "1b4aa85d1e65";
-          sha256 = "0pgj1kkv7ddbg3zk4b6q4d6r4xw8dhsj4wwg9ydxd9ahdlbb6i66";
+          rev = "7465189ae9ac";
+          sha256 = "1zgvg3gx283jgclqyl141p2nbrc21x775d4nnz9fp8bxz3gci7nk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
@@ -45314,12 +45377,12 @@
     nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nginx-mode";
-        version = "20161023.223";
+        version = "20170213.1326";
         src = fetchFromGitHub {
           owner = "ajc";
           repo = "nginx-mode";
-          rev = "a04cef3a07d235eb03bd944fe6923664493896ee";
-          sha256 = "0bk5jjh0rz81q27k105f5azvgy1zcn4w33xygzzpblks760dkgar";
+          rev = "b58708d15a6659577945c0aa3a63983eebff2e67";
+          sha256 = "0y2wwgvm3495h6hms425gzgi3qx2wn33xq6b7clrvj4amfy29qix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6da3640b72496e2b32e6ed21aa39df87af9f7f3/recipes/nginx-mode";
@@ -45423,8 +45486,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "2993752dd617ada5218836dd6545fb06690e238b";
-          sha256 = "0lwh4jb3q7gdchapd83lg6zj9gpmff6fvlny4vfhp7q95xd7nz36";
+          rev = "fb3c70049b82d53101fc6086a1699ecf16966792";
+          sha256 = "0amylb876720959hhsd31k025l1d3rv1i9i8qhf2k1skd8xfrvpj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -45465,8 +45528,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "4724903c78e80481fc63d627081fac6a98e4205d";
-          sha256 = "1wqyha271xvlyjmk4ygqhdj8m8gcz2f9npknpz5vriqnpv22hwmr";
+          rev = "62ff5ad424547630e70f35406da85fbb5ec3445a";
+          sha256 = "1xcx70km6zb8qmnjb2fsk66qmx2lpqv94rfp34a0bpn98an7akwc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -47914,12 +47977,12 @@
     org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-download";
-        version = "20170202.927";
+        version = "20170213.1151";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "org-download";
-          rev = "c63b057e84b8ba1e7c969391a0263f7d0ce936e4";
-          sha256 = "1qb0vqk1k7v0ydhfwsvhfqrjfm3c5baz8358ibivnm126d2hbsya";
+          rev = "137c3d2aa083283a3fc853f9ecbbc03039bf397b";
+          sha256 = "0c4vvpccmc60bavywsd0lijzyzchs6cdmp8y36d70lmp4s66863v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download";
@@ -48315,8 +48378,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "eb59c75f394ddec8f0714ccff3e9a6280ee1898d";
-          sha256 = "0sk3232jgrnfjxix8mrrcq8zwxww16iy6vpsq5njh8avqdf6mi9n";
+          rev = "2e3270984332013b8df22d2995bdeba256534a63";
+          sha256 = "1ixr16v2gfg5gyj42gic6kipqa3c8vv6iq1qdj9gj0ky6zlyy9wg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48335,8 +48398,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "eb59c75f394ddec8f0714ccff3e9a6280ee1898d";
-          sha256 = "0sk3232jgrnfjxix8mrrcq8zwxww16iy6vpsq5njh8avqdf6mi9n";
+          rev = "2e3270984332013b8df22d2995bdeba256534a63";
+          sha256 = "1ixr16v2gfg5gyj42gic6kipqa3c8vv6iq1qdj9gj0ky6zlyy9wg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49835,8 +49898,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "f0eae25e9d5c7e426551c2ae2ba5695f0df2cff2";
-          sha256 = "1lxh2zangf0r8xd11h9fja6jcgxfs6miw2n5r89z92nj0b0vsh3g";
+          rev = "b3d9d6310a411ada0212c702a75f32dc2f7743a1";
+          sha256 = "1hllqlh89y4cn7jx72bxljvvys6avgnq2qb2543q8iabh1jj4q2m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50686,6 +50749,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    paperless = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "paperless";
+        version = "20170213.503";
+        src = fetchFromGitHub {
+          owner = "atgreen";
+          repo = "paperless";
+          rev = "abf43ed368c909dfeeab1faa5b91763976945b81";
+          sha256 = "0qlwbwym4575kxxssi9y2g60ai9k5pccbjp963rkwsnabczg0lxg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless";
+          sha256 = "02jbqdhbq4b3yb9lrqkwaxmyymvcqrjswhzp4sbccw6arla4q7wg";
+          name = "paperless";
+        };
+        packageRequires = [ cl-lib emacs f s ];
+        meta = {
+          homepage = "https://melpa.org/#/paperless";
+          license = lib.licenses.free;
+        };
+      }) {};
     paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
     melpaBuild {
         pname = "paradox";
@@ -51193,8 +51277,8 @@
         src = fetchFromGitHub {
           owner = "promethial";
           repo = "paxedit";
-          rev = "48df0a26285f68cd20ea64368e7bf2a5fbf13135";
-          sha256 = "0z32lb2s943vk9fincsifdrjqmk7ks2skpzr6g4s3gd40sz5imfz";
+          rev = "09f3d5aeb108937a801e77ef413e29eaa4ecc4be";
+          sha256 = "1yd5wh8fsxh3v2fgpxm2cd7h9xz9zfj2d8g4bh4gzqjwrmn5rlgl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/106b272c2f0741d21d31a0ddfa4f521c575559c1/recipes/paxedit";
@@ -52221,8 +52305,8 @@
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "phpplus-mode";
-          rev = "e66950502e7c9a9cd39c9a619ad66fc54c12aafa";
-          sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg";
+          rev = "36efff84dd1303eeef5fc116eff0ac89a0248c74";
+          sha256 = "1aw3sp3wa58m7csml2cfys8s8d0x1m9bkqvxqqxz52iyf8ji0cz3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/php+-mode";
@@ -52301,12 +52385,12 @@
     phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "phpunit";
-        version = "20161219.319";
+        version = "20161219.320";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "phpunit.el";
-          rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18";
-          sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k";
+          rev = "5ca5ee53e16b2cf0939dbeacbf1dffa13b41b48f";
+          sha256 = "0gmb5fxnllkjg45cmqpr2gy2k6qhg1r6j2w67qbpir0x4h3q2x6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit";
@@ -54085,12 +54169,12 @@
     projectile-ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, ripgrep }:
     melpaBuild {
         pname = "projectile-ripgrep";
-        version = "20161119.59";
+        version = "20170211.857";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2";
-          sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298";
+          rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
+          sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep";
@@ -54229,22 +54313,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    promise = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "promise";
-        version = "20170208.348";
+        version = "20170213.426";
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-promise";
-          rev = "06161da00e73afa013f3de59f2cf2a2d5a721f36";
-          sha256 = "13k6cj3igvslwwiar92vg58vr8jd24ns927xxxjjb5wdgzvbj5i9";
+          rev = "f109b089a387af081c1dfceb29aea14864f31bbf";
+          sha256 = "1g9f7vbbxk1qrbr8bcza1f93a9h4inh7qlqmizpygil0s17ng1kk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
           sha256 = "1y1v3ikcmh9yp5fdwagcjg755bgkyqk714lb6s1hb2606m3ia03s";
           name = "promise";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ async emacs ];
         meta = {
           homepage = "https://melpa.org/#/promise";
           license = lib.licenses.free;
@@ -54362,8 +54446,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "c6e0d0e7f3dca63c006edae515dfca2a89b9c1e4";
-          sha256 = "00808ymwd7y0qq3xkyxkn3bvmp806qwd6jil3x4kqhymnwqnah7g";
+          rev = "d2dfe46b2789dfe155559508c3f567a746a50616";
+          sha256 = "0sywn6b6m2vbdkv4vycrhlg1l3hjmcpvbps0v35wqk1ll1l66rqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -54599,12 +54683,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170120.1813";
+        version = "20170213.207";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "3df623f41134c260d591c1fde1a82e99a09cd527";
-          sha256 = "02glqgs484zg5izrvd8r7iai2glwy4qsqv2y4chq6d5i1f2fdrp2";
+          rev = "03f608234ed0cf403966454de6758ec7fc9c784d";
+          sha256 = "11kqbi4bjwn9cb48wn1nfy4d8rln07wmpj263cpb3npm1y6hfvpp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -55105,8 +55189,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "a59a1581571c8f27708778a9ded58435c05f7703";
-          sha256 = "0r3pwq7hy8cawljk63lm239cjf4q9zfs1cmhjaq493dd9xjizwms";
+          rev = "62361d10f5dc5fa751038745d23e06b5a9c5bc56";
+          sha256 = "1sa4vqpqmgf0pagn2y72vvfki7jgqrnaigwfxnhjwfi6x3diz2fh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -55248,12 +55332,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170208.237";
+        version = "20170211.1101";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "ad91fe544cc8f361c718ca8a538bd44a4fb331d8";
-          sha256 = "1wcgaydw7fnix5c5ka2lkjliznbavls51sgzq5l5s6l48190a7l9";
+          rev = "eb03f0172efe5c368a830a8b9ca15366feaf083d";
+          sha256 = "0pjq4a7gkzysmhwr1i3bzfnqi33899j1l13n1ij6a4bdy8km0hm4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -55353,12 +55437,12 @@
     pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyvenv";
-        version = "20160527.442";
+        version = "20170211.456";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "726940c59d584a7e3a6647e149c20e426c3d883d";
-          sha256 = "1fqp3khz8rl0frg6kaqj53p0w07ricbnl2xw57c4w776jnmc0npa";
+          rev = "3fd0fad48cfdc978b3cbc2da56b26af0e33dd94c";
+          sha256 = "09mqkqdp615c689qz71q94ynyysiz4qc280cvznp6k4w28nskbwf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -57112,12 +57196,12 @@
     repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "repo";
-        version = "20160114.1114";
+        version = "20170213.139";
         src = fetchFromGitHub {
           owner = "canatella";
           repo = "repo-el";
-          rev = "98bde6fdc840d42a24c5784ee440cad39e8264d9";
-          sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
+          rev = "d7b87cd515bad8a67d3a892a46a23f5fe81e08de";
+          sha256 = "0rbvcvm7bfr6ncji7cllfxyyr6x7n9fx863byp243phsj3n93adz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1729d4ea9498549fff3594b971fcde5f81592f84/recipes/repo";
@@ -57505,12 +57589,12 @@
     rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "rg";
-        version = "20170206.833";
+        version = "20170212.938";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "ec9eb5240191612debf0392ee7a7f491c7dae27e";
-          sha256 = "0773d0n5jq42yr5p1xbbfji027j0kw4msv1p8b7zk82ij1yc7hyr";
+          rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db";
+          sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg";
@@ -57631,12 +57715,12 @@
     ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ripgrep";
-        version = "20170116.47";
+        version = "20170211.857";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "ripgrep.el";
-          rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2";
-          sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298";
+          rev = "73595f1364f2117db49e1e4a49290bd6d430e345";
+          sha256 = "1a5rdpmvsgsjlc9sywism9pq7jd6n9qbcdsvpbfkq1npwhpifkbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep";
@@ -57970,7 +58054,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57597";
+          rev = "57624";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58050,7 +58134,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57597";
+          rev = "57624";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58319,12 +58403,12 @@
     rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "rust-playground";
-        version = "20170106.1734";
+        version = "20170211.5";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "rust-playground";
-          rev = "29075a3753cc0b48b4fcc0a99340306a856a8bc1";
-          sha256 = "1g0b0jg45pf7xivk8xjsm77vd8fvpp2vwdwvgzr810hj8npnqhs7";
+          rev = "ff4149489c30a65817750428847217368bd995ba";
+          sha256 = "04d5z33pv1xqsn539nfkyjh7dvf0kc0rwili1zr6817z0406k1qn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground";
@@ -58680,8 +58764,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "2ef5333d8dbeddf7f862c76c84a8550275b13c3c";
-          sha256 = "0jxns9jzmlzr7qvsprid2ij26y246nb8yzhw9i8w2xv09gbmfxvw";
+          rev = "e990ac49eb449bb8b1befcf0fd021c901f687ac5";
+          sha256 = "068m6lny2xf2i7bm2hxqn1dcjxgs4g8pkd730x0shvvn3yc5jqql";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -59382,12 +59466,12 @@
     selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selectric-mode";
-        version = "20161125.429";
+        version = "20170211.1108";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "selectric-mode";
-          rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6";
-          sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31";
+          rev = "e60703d9a6c9944270d77bc829dae3a8b092346f";
+          sha256 = "04i5rrn93hzcf8zzfli2ams927lm83hl4q6w2azcg24lhldaqf8p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
@@ -59693,12 +59777,12 @@
     shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shackle";
-        version = "20170201.1322";
+        version = "20170213.1534";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "shackle";
-          rev = "4ccacf92d0bfd7729388a3e698c1ded55e7f2b92";
-          sha256 = "0lmclwhv3wic0b5dxnjggi7191r63iv2gwn2k50c7ldm526qld0c";
+          rev = "979b021077655ca38749a60c9752c0817e8fd93e";
+          sha256 = "11qp4gqxfi5d6krvxlqxfn58b1kcgsnldpi54r8lx6mis8l0f4wl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@@ -60002,12 +60086,12 @@
     shen-elisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shen-elisp";
-        version = "20161113.1611";
+        version = "20170213.1303";
         src = fetchFromGitHub {
           owner = "deech";
           repo = "shen-elisp";
-          rev = "1828dbd81ced737a7b0bc6e3c8caf9380d5f8fdd";
-          sha256 = "1paf9lyk552kl3lmfsfw9r45ab9s8iypvg20jwdw6y6p1fjcykmk";
+          rev = "8248cd96a0931cb3215dc13e0905ac4be1701981";
+          sha256 = "1acml0p04wxnm0di9iy5kwml6myr7gcj09ky6dw35f0k0m1w51ba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ed9f0577c6828236582df1781e751b8b81746492/recipes/shen-elisp";
@@ -61523,12 +61607,12 @@
     smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartscan";
-        version = "20160705.138";
+        version = "20170211.1233";
         src = fetchFromGitHub {
           owner = "mickeynp";
           repo = "smart-scan";
-          rev = "2aea1a1ac3c4b12032e5599c4eb6df5b8f68a01b";
-          sha256 = "0szx1w2zkxi74xfzcfw7sgdyd34fbv3pcgl7vhjcl0zp0ch473rl";
+          rev = "234e077145710a174c20742de792b97ed2f965f6";
+          sha256 = "1nzkgfr1w30yi88h4kwgiwq4lcd0fpm1cd50gy0csjcpbnyq6ykf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/26c73e1d15186ebf300c6397fda61a8a885a130f/recipes/smartscan";
@@ -61921,12 +62005,12 @@
     socyl = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "socyl";
-        version = "20170129.144";
+        version = "20170211.2242";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "socyl";
-          rev = "38157e3bb0d7afa8b90b744648f63c85b4edb230";
-          sha256 = "1ha0827zcdkl1ih8c7018cpbiw2k1b8ik4h7p6asw7pg0n5xf1c6";
+          rev = "1ef2da42f66f3ab31a34131e51648f352416f0ba";
+          sha256 = "0jks5dkxhhgh4gbli90p71s8354iywlwj2lq6n5fyqxbdxzk412d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/774b3006f5b6b781594257f1d9819068becbbcc1/recipes/socyl";
@@ -63550,10 +63634,10 @@
       }) {};
     strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "strings";
-        version = "20170101.1137";
+        version = "20170210.1925";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/strings.el";
-          sha256 = "0gvj39cjc50ks31dzridskync3dnaxsr28wmyky781l87cgna4hq";
+          sha256 = "0am2w3p2igh0y5mdbmjfdzyrx3bngs4c3nibjjcky3pmvj4k3r4i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings";
@@ -64272,12 +64356,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170208.2028";
+        version = "20170213.1002";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6";
-          sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4";
+          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
+          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -65940,8 +66024,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "3590f1e7ca49c3eea879008d510023edf30b6408";
-          sha256 = "0kh2ws9ryfk5qgnaszacsznrg3bwr9vx6riiy2za02in0dlbldk9";
+          rev = "0a660ee285e4a4cbac8f702168c40fd4ef5495d1";
+          sha256 = "19cn5kkj9jmjghb54l64wpvbcn355ixfzdp7rqrxcy2gcxwcc95a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -65997,12 +66081,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170210.255";
+        version = "20170210.1932";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "1d000d8cebd5ae8768b0acba065cf267ba5d9c23";
-          sha256 = "059q2pijha146hpiz19ykckbcprdfmw825p45wfqqm4lll1dfd9y";
+          rev = "8e2c78de6e7a0eb42853ba2dee3ffe5c81cff336";
+          sha256 = "0imdjxvvz9b1b1mlzdp5mildjz1s2m7zz3y383p1x6m8w4vzxln7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -66729,8 +66813,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "773e48624edc32022764d9b3bab861f32c336ac3";
-          sha256 = "0s0ksk4f8hz2jajh7hx8b5qv8vrv5mr8mvk8n51ycip0gmrl98nf";
+          rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902";
+          sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -67116,12 +67200,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170202.1751";
+        version = "20170212.139";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "8614825a9dcc08f0c77264ae8892f2417468cefb";
-          sha256 = "0jfvva5j33hs99grz4jzpr1qkmhx5vwrixl2pf20ggb4jd7c482j";
+          rev = "662f6af94c3273f2dab04b9c7485dfe627812c95";
+          sha256 = "06iigh6kia60r4i3d414z594s3xab20z73q1l0z2fkb0613wznbg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -68045,8 +68129,8 @@
         src = fetchFromGitHub {
           owner = "EricCrosson";
           repo = "unkillable-scratch";
-          rev = "0e1d9e1574e497171a7ccfbcb8c994cb9c5880da";
-          sha256 = "0bhdqpxq6cly4b6v4ya1ksw0yfdb9g2f2ifbjn4gfcq6j4zszbdm";
+          rev = "676a5a97658830caece18fa65a23e3d113933151";
+          sha256 = "14k9ad542y0haz1yid9jy8f9zvpvac6cirnf0751g8rwjbdnvr85";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/822ac5610f333e41b676a29ef45a6f8bfea3162e/recipes/unkillable-scratch";
@@ -68143,12 +68227,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170116.1309";
+        version = "20170213.1353";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a";
-          sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz";
+          rev = "6c2d81cfadb12c10af0dabe148ede355737ed1a8";
+          sha256 = "18aqyphq1cwandfarql773d0h3ki6c9ip1wji1ni86fm29f99ikq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -69582,12 +69666,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170131.1400";
+        version = "20170211.1516";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "2d05692634766cfa647d9441aaf7f8d95d2d5206";
-          sha256 = "1q7vpw56fqjgyiq21xjnhclhbz9hdynapp53hsdsd361nghdg9d0";
+          rev = "c6d73fb48ee3c0911b7361cd556765c94742dee2";
+          sha256 = "0b9gcm0dlbp9v57pv9dkh08a8f5bacmjkyqkh0pr285gvsfi776i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -70724,12 +70808,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20161231.217";
+        version = "20170211.402";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "ca9a42b64938f43d757c6e0c41f21610bea87dba";
-          sha256 = "0nwsryj7xiizvrcnwb1an8siihqjbdvcwg6mjc36cyr6cv3icqmw";
+          rev = "cba75ae94e6c233f92fcdde005d023107495df7b";
+          sha256 = "1sxs89mqns9n847m0gqpv43b9gr15zicjhcnavk5n8g7gnssjmj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -71102,12 +71186,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170210.354";
+        version = "20170213.321";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "7fd0ae4bd2afbe59273b224b299519aad564189c";
-          sha256 = "1di8i2x7gg8w3kviz7az7wrg6gfr06p67rkmkm2z7pwblbsbd57f";
+          rev = "073190840e6a07566f75a6dcabd1d3c120b0639e";
+          sha256 = "19b8d4a5g43n9y2y0r8l12ds5badns9zlky0j201bzz3yrcid7xb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -71165,12 +71249,12 @@
     xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20161222.327";
+        version = "20170210.2128";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "4ab83f7d9bcd6f2697a77507930542bc2a00a1a3";
-          sha256 = "13h7gkdy47mnks1r80j94j3h825s93fwi43l9r7wp9jbngdx057f";
+          rev = "a4b8aa833f65c028f7f94b9c3b5b8993b8961736";
+          sha256 = "02xin68nrzlg6qaniincj5dk1aw5fbqfb8cj00yjyyjnv55jrbpn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input";
@@ -71459,16 +71543,16 @@
     xquery-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xquery-mode";
-        version = "20140121.943";
+        version = "20161218.1617";
         src = fetchFromGitHub {
-          owner = "mblakele";
+          owner = "xquery-mode";
           repo = "xquery-mode";
-          rev = "ac0ca72ccd575952393804330c3efe3b2271c4e2";
-          sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v";
+          rev = "58e947e2630223b89822c2c3e5883be4950ea2f5";
+          sha256 = "0zasfq8cgp42ac7ad041f7bn785y10359ayrd9h2wwyb34bw9wjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c7c145039be872cd5a19383232180ba481e4e144/recipes/xquery-mode";
-          sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ea1c9e26963f290d912df21b81afd689543658/recipes/xquery-mode";
+          sha256 = "13xrvygk7wdby6599q6yxw8cm45qqki8szrm49fc3b6pr6vzpidg";
           name = "xquery-mode";
         };
         packageRequires = [];
@@ -71774,12 +71858,12 @@
     yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yaml-mode";
-        version = "20161105.814";
+        version = "20170213.1023";
         src = fetchFromGitHub {
           owner = "yoshiki";
           repo = "yaml-mode";
-          rev = "f378589912af8731428198ef57546c616d941df0";
-          sha256 = "0ag1psjrn4b1idz096jwdsygax7ydirhlky7zpj6awqzx4gh43yg";
+          rev = "1c3ade410fb0bf5b6f2140b099f0ef96836ee74e";
+          sha256 = "1p0m702lyjx5xcqvifc8lkrj430nvjiwswpf3ghcvl5sls8bf5af";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/yaml-mode";
@@ -71837,12 +71921,12 @@
     yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yang-mode";
-        version = "20161220.157";
+        version = "20170213.154";
         src = fetchFromGitHub {
           owner = "mbj4668";
           repo = "yang-mode";
-          rev = "bcf698acbdb4df91f587942348739b407a8b0807";
-          sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs";
+          rev = "46c201b1d5195842fdf540d4c153127f91b1a125";
+          sha256 = "0bfx6wsj8g6ryawxly17x2nppzcgg3bxpkx00ar1hgcrs11988kk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";
@@ -72002,12 +72086,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170203.626";
+        version = "20170212.832";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "9abf842e356e7b42fa105fe6284fb5ebe58a7ed1";
-          sha256 = "1gnaa8nwxa969pxgspk1v1vmfcxb32mbswy7yr60gnmb6mlfmjkk";
+          rev = "c87afe0901735d4421c712b25dfa69b2ac59c8e9";
+          sha256 = "0ssk3pgkq4bv74g8h0zbi38z3lb11cn4ylnfsa0gnn5jlyg0bccc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";

From 1a9cf94ba2ddd169f15e751cacd1847f97cdc8d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 14 Feb 2017 11:16:37 +0100
Subject: [PATCH 0362/3449] Revert "opensubdiv: Remove cudatoolkit from the
 closure"

This reverts commit 6a472cf4c1b78580de79c79ca7d7b714f4d8d36e. On
second thought, this is not a good idea, because it means that a
CUDA-enabled Blender doesn't work on non-CUDA systems anymore (since
they don't have libOpenCL.so in /run/opengl-driver). I guess a better
solution will be to split cudatoolkit into multiple outputs.
---
 pkgs/development/libraries/opensubdiv/default.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index f5f84ee15463..b253a27a7db3 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -39,16 +39,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      rm $out/lib/*.a
-    '' + lib.optionalString cudaSupport ''
-      # Drop cudatoolkit reference from the closure. We'll get
-      # libOpenCL from /run/opengl-driver.
-      s=${cudatoolkit}/lib
-      t=$(for ((i = 0; i < ''${#s}; i++)); do echo -n X; done)
-      sed -i $out/lib/libosdGPU.so.* -e "s|$s|$t|g"
-    '';
+  postInstall = "rm $out/lib/*.a";
 
   meta = {
     description = "An Open-Source subdivision surface library";

From adcd9bc884d9518ee41f3d763742e725f8d34c08 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 14 Feb 2017 21:13:04 +0900
Subject: [PATCH 0363/3449] flashplayer: 24.0.0.194 -> 24.0.0.221

---
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 8ae86eed02ca..9e0b0852bf8a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "24.0.0.194";
+  version = "24.0.0.221";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "197s3ksx6h3dkfx8q7v9c8mf8ai9s1jpqnaczjdkmzcyp5jd29w9"
+          "10f8m5zc8p4xbhihbl785lws1kpv6smnbhx4ydzf8ai3mlv3y241"
         else
-          "0ll0ddss3gkzngmm96pyvnf4a6mf8axraxlqpjdl63ghrndd1gkc"
+          "1rz9rkbvln8wdkfmsnnq936xs6969qma141jc4qx408419q7v3hg"
       else
         if arch == "x86_64" then
-          "0bri8kjqy9g929ix4qx4whmxz5rzbgjff253kvs6dlr8vyglz0gx"
+          "1cb4mvslphj3bcchgr7lcswz8kk8si0s60rl5266mi53byplhw08"
         else
-          "1lrfwwhl18411bk9qsizhch8n3ilcvhmj4i7sak5zjv5r6mwnqgl";
+          "1vcyp9041171xkcnz05dlk3n7bnbcb9qbh4sy5wfgjkqsyd6i5bl";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index be33cf139d26..248fe63ab0c6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -57,7 +57,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "24.0.0.194";
+  version = "24.0.0.221";
 
   src = fetchurl {
     url =
@@ -67,9 +67,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0yiln97l8b27s5c6nv9m09cdgwa4c47idnf2p6y6i0slfcqj1cxv"
+        "0cy81cml72ayx2wa0fd9vgp2wzny866jasahndg01v0jfxcxw5rz"
       else
-        "1f34qm8grj3141p6kym6y2pqisrmn9l6nkhbfmfhsd472g5q85v1";
+        "0xgiycd47mzmwvmhbi0ig3rd7prksfdpcd4h62as1m9gs1ax4d7l";
   };
 
   nativeBuildInputs = [ unzip ];

From 3508b4832fbed06db1d0dd6bbf6ca9c1c3c3ed8e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 14 Feb 2017 13:23:12 +0100
Subject: [PATCH 0364/3449] haskellPackages: fgl, fgl-arbitrary: jailbreak
 (w.r.t. hspec for tests)

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8e00386267bf..3f448aa9c6c2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -857,4 +857,8 @@ self: super: {
   # https://github.com/ekmett/lens/issues/713
   lens = disableCabalFlag super.lens "test-doctests";
 
+  # https://github.com/haskell/fgl/issues/60
+  fgl = doJailbreak super.fgl;
+  fgl-arbitrary = doJailbreak super.fgl-arbitrary;
+
 }

From 232639ccbba0e45ee526fac47e59c5dcab344d3e Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 14 Feb 2017 13:38:30 +0100
Subject: [PATCH 0365/3449] haskellPackages: Remove jailbreak for xxhash and
 Glob (fixed upstream)

---
 .../development/haskell-modules/configuration-ghc-8.0.x.nix | 6 ------
 1 file changed, 6 deletions(-)

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 095b6ee4f1b8..78c3823a0f95 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -60,12 +60,6 @@ self: super: {
     sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
   });
 
-  # https://github.com/christian-marie/xxhash/issues/3
-  xxhash = doJailbreak super.xxhash;
-
-  # https://github.com/Deewiant/glob/issues/8
-  Glob = doJailbreak super.Glob;
-
   ## GHC 8.0.2
 
   # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715

From 866525084463de9b36662c9fa7c4c6805e2ffc56 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 14 Feb 2017 13:46:20 +0100
Subject: [PATCH 0366/3449] haskellPackages.dirstream: jailbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3f448aa9c6c2..51287f14979f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -861,4 +861,6 @@ self: super: {
   fgl = doJailbreak super.fgl;
   fgl-arbitrary = doJailbreak super.fgl-arbitrary;
 
+  # https://github.com/Gabriel439/Haskell-DirStream-Library/issues/8
+  dirstream = doJailbreak super.dirstream;
 }

From 51a338a601150a01e958ed004e622ca7328aed99 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Feb 2017 14:14:27 +0100
Subject: [PATCH 0367/3449] sabnzbd: 1.1.0 -> 1.2.0

---
 pkgs/servers/sabnzbd/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 616d898b33f0..19990da147c7 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,15 +1,18 @@
-{stdenv, fetchurl, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
+{stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
 
 let
   pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah yenc ]);
   path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
 in stdenv.mkDerivation rec {
-  version = "1.1.0";
-  name = "sabnzbd-${version}";
+  version = "1.2.0";
+  pname = "sabnzbd";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/sabnzbd/sabnzbd/archive/${version}.tar.gz";
-    sha256 = "16srhknmjx5x2zsg1m0w9bipcv9b3b96bvb27fkf4dc2aswwcsc7";
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = version;
+    sha256 = "1g1zf0zrlqgparg6hws6agpr414dw2q4xq9l8nh720rn6m7fv4vb";
   };
 
   buildInputs = [ pythonEnv makeWrapper ];

From 67bd8d552fc79f127b1fc89c27e1acb4af9bf37f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Feb 2017 14:19:38 +0100
Subject: [PATCH 0368/3449] sabnzbd: fix dependencies

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

diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 19990da147c7..f685d8b24d6b 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}:
 
 let
-  pythonEnv = python2.withPackages(ps: with ps; [ pyopenssl cheetah yenc ]);
+  pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]);
   path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
 in stdenv.mkDerivation rec {
   version = "1.2.0";

From 1a9707de24dd8c8d09cec8e18f4bab7465b2e424 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 14 Feb 2017 08:19:19 -0500
Subject: [PATCH 0369/3449] wireguard: update description to describe its
 current state

---
 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 8a2e6287364f..a5102a7b197b 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -16,7 +16,7 @@ let
   meta = with stdenv.lib; {
     homepage     = https://www.wireguard.io/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = "Fast, modern, secure VPN tunnel";
+    description  = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
     maintainers  = with maintainers; [ ericsagnes ];
     license      = licenses.gpl2;
     platforms    = platforms.linux;

From ba499e3aa04dccd5e99676731055bf3c3a34b249 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 07:30:21 -0600
Subject: [PATCH 0370/3449] Removing unused module option old-wrapperDir

---
 nixos/modules/security/wrappers/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index e51103981e6f..8c4353fdd96b 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -131,16 +131,6 @@ in
       '';
     };
 
-    security.old-wrapperDir = lib.mkOption {
-      type        = lib.types.path;
-      default     = "/var/setuid-wrappers";
-      internal    = true;
-      description = ''
-        This option defines the path to the wrapper programs. It
-        should not be overriden.
-      '';
-    };
-
     security.wrapperDir = lib.mkOption {
       type        = lib.types.path;
       default     = "/run/wrappers/bin";

From 467bb3f674fad56ef697bafbcc5f4db71acb036e Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 07:32:24 -0600
Subject: [PATCH 0371/3449] /run/wrapper is not a filesystem, no need to skip
 it

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index a1b6cf535971..b72db1f6f503 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -347,7 +347,6 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
 
     # Skip special filesystems.
     next if in($mountPoint, "/proc") || in($mountPoint, "/dev") || in($mountPoint, "/sys") || in($mountPoint, "/run") || $mountPoint eq "/var/lib/nfs/rpc_pipefs";
-    next if $mountPoint eq "/run/wrappers";
 
     # Skip the optional fields.
     my $n = 6; $n++ while $fields[$n] ne "-"; $n++;

From fb6d13c01aa22cdaffe45597495f390ef2989eda Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 07:38:45 -0600
Subject: [PATCH 0372/3449] Addressing feedback and fixing a bug

---
 nixos/doc/manual/release-notes/rl-1703.xml | 6 ++----
 nixos/modules/module-list.nix              | 2 +-
 nixos/modules/security/wrappers/wrapper.c  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 5d6053fcbf74..8f9694bad8bd 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -17,10 +17,8 @@ has the following highlights: </para>
   </listitem>
 
   <listitem>
-    <para>Setting capabilities on programs is now supported with a
-    <literal>setcap-wrapper</literal> functionality. This
-    functionality and the <literal>setuid-wrapper</literal> are merged
-    into a single "wrappers" module.</para>
+    <para>The setuid wrapper functionality now supports setting
+    capabilities.</para>
   </listitem>
 
   <listitem>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9dbc009a6e44..81597d91d89a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -113,7 +113,7 @@
   ./security/prey.nix
   ./security/rngd.nix
   ./security/rtkit.nix
-  ./security/wrappers
+  ./security/wrappers/default.nix
   ./security/sudo.nix
   ./services/amqp/activemq/default.nix
   ./services/amqp/rabbitmq.nix
diff --git a/nixos/modules/security/wrappers/wrapper.c b/nixos/modules/security/wrappers/wrapper.c
index 4a656c54e3f9..7091e314bb22 100644
--- a/nixos/modules/security/wrappers/wrapper.c
+++ b/nixos/modules/security/wrappers/wrapper.c
@@ -165,7 +165,7 @@ int main(int argc, char * * argv)
     // should safely fit within the PATH_MAX system limit. Though I'm
     // not positive it's safe...
     char selfPath[PATH_MAX];
-    int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath) - 1);
+    int selfPathSize = readlink("/proc/self/exe", selfPath, sizeof(selfPath));
 
     assert(selfPathSize > 0);
 

From c86798125b85a6c4fc49520e79b59ed2299f2885 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 10 Jan 2016 16:45:25 +0200
Subject: [PATCH 0373/3449] amoeba: init at 1.1

This uses all the patches from Debian since otherwise it would work on
i686 among other things.
---
 pkgs/games/amoeba/data.nix               | 24 +++++++++++++
 pkgs/games/amoeba/default.nix            | 45 ++++++++++++++++++++++++
 pkgs/games/amoeba/include-string-h.patch | 12 +++++++
 pkgs/top-level/all-packages.nix          |  3 ++
 4 files changed, 84 insertions(+)
 create mode 100644 pkgs/games/amoeba/data.nix
 create mode 100644 pkgs/games/amoeba/default.nix
 create mode 100644 pkgs/games/amoeba/include-string-h.patch

diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix
new file mode 100644
index 000000000000..b5c7f4b730b8
--- /dev/null
+++ b/pkgs/games/amoeba/data.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "amoeba-data-${version}";
+  version = "1.1";
+
+  src = fetchurl {
+    url = "http://http.debian.net/debian/pool/non-free/a/amoeba-data/amoeba-data_${version}.orig.tar.gz";
+    sha256 = "1bgclr1v63n14bj9nwzm5zxg48nm0cla9bq1rbd5ylxra18k0jbg";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/amoeba
+    cp demo.dat $out/share/amoeba/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fast-paced, polished OpenGL demonstration by Excess (data files)";
+    homepage = https://packages.qa.debian.org/a/amoeba-data.html;
+    license = licenses.unfree;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix
new file mode 100644
index 000000000000..4e5f85f7d5ae
--- /dev/null
+++ b/pkgs/games/amoeba/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, mesa_glu, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "amoeba-${version}-${debver}";
+  version = "1.1";
+  debver = "29.1";
+
+  srcs = [
+    (fetchurl {
+      url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}.orig.tar.gz";
+      sha256 = "1hyycw4r36ryka2gab9vzkgs8gq4gqhk08vn29cwak95w0rahgim";
+    })
+    (fetchurl {
+      url = "http://http.debian.net/debian/pool/contrib/a/amoeba/amoeba_${version}-${debver}.debian.tar.xz";
+      sha256 = "1xgi2sqzq97w6hd3dcyq6cka8xmp6nr25qymzhk52cwqh7qb75p3";
+    })
+  ];
+  sourceRoot = "amoeba-1.1.orig";
+
+  prePatch = ''
+    patches="${./include-string-h.patch} $(echo ../debian/patches/*.diff)"
+  '';
+  postPatch = ''
+    sed -i packer/pakfile.cpp -e 's|/usr/share/amoeba|${amoeba-data}/share/amoeba|'
+    sed -i main/linux-config/linux-config.cpp -e 's|libgdk-x11-2.0.so.0|${gtk2}/lib/&|'
+    sed -i main/linux-config/linux-config.cpp -e 's|libgtk-x11-2.0.so.0|${gtk2}/lib/&|'
+  '';
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ alsaLib expat freetype gtk2 libvorbis mesa_glu ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1/
+    cp amoeba $out/bin/
+    cp ../debian/amoeba.1 $out/share/man/man1/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fast-paced, polished OpenGL demonstration by Excess";
+    homepage = https://packages.qa.debian.org/a/amoeba.html;
+    license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/games/amoeba/include-string-h.patch b/pkgs/games/amoeba/include-string-h.patch
new file mode 100644
index 000000000000..828cab88d989
--- /dev/null
+++ b/pkgs/games/amoeba/include-string-h.patch
@@ -0,0 +1,12 @@
+diff --git a/image/png_image.cpp b/image/png_image.cpp
+index 37875fc..1531d6f 100644
+--- a/image/png_image.cpp
++++ b/image/png_image.cpp
+@@ -4,6 +4,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include <png.h>
+ #include "png_image.h"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37b2ae714607..d37db1b33111 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15941,6 +15941,9 @@ with pkgs;
 
   alienarena = callPackage ../games/alienarena { };
 
+  amoeba = callPackage ../games/amoeba { };
+  amoeba-data = callPackage ../games/amoeba/data.nix { };
+
   andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null;
 
   angband = callPackage ../games/angband { };

From 4e72d2da504a0e6b957df7d15ca280e6f314ac8b Mon Sep 17 00:00:00 2001
From: Toni Reina <areina0@gmail.com>
Date: Tue, 14 Feb 2017 15:12:54 +0100
Subject: [PATCH 0374/3449] aspell-dict-ca: init at 2.1.5-1

---
 pkgs/development/libraries/aspell/dictionaries.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index be61640553d3..fc6b47e8a63c 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -28,6 +28,15 @@ let
 
 in {
 
+  ca = buildDict {
+    shortName = "ca-2.1.5-1";
+    fullName = "Catalan";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/ca/aspell6-ca-2.1.5-1.tar.bz2;
+      sha256 = "1fb5y5kgvk25nlsfvc8cai978hg66x3pbp9py56pldc7vxzf9npb";
+    };
+  };
+
   cs = buildDict {
     shortName = "cs-20040614-1";
     fullName = "Czech";

From f8b8c353ffcfb2a29178c1f7b145baebfab55f81 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 08:27:40 -0600
Subject: [PATCH 0375/3449] Simplifying the wrapper program derivation

---
 nixos/modules/security/wrappers/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 8c4353fdd96b..96f4544c2fa4 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -9,17 +9,15 @@ let
       wrappers);
 
   securityWrapper = pkgs.stdenv.mkDerivation {
-    name         = "security-wrapper";
-    unpackPhase  = "true";
+    name            = "security-wrapper";
+    phases          = [ "installPhase" "fixupPhase" ];
+    buildInputs     = [ pkgs.libcap pkgs.libcap_ng pkgs.linuxHeaders ];
+    hardeningEnable = [ "pie" ];
     installPhase = ''
       mkdir -p $out/bin
       parentWrapperDir=$(dirname ${wrapperDir})
       gcc -Wall -O2 -DWRAPPER_DIR=\"$parentWrapperDir\" \
-          -Wformat -Wformat-security -Werror=format-security \
-          -fstack-protector-strong --param ssp-buffer-size=4 \
-          -D_FORTIFY_SOURCE=2 -fPIC \
-          -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper -L ${pkgs.libcap.lib}/lib -L ${pkgs.libcap_ng}/lib \
-          -I ${pkgs.libcap.dev}/include -I ${pkgs.libcap_ng}/include -I ${pkgs.linuxHeaders}/include
+          -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper
     '';
   };
 

From c01689f8dab3387eb004192ce078659e9a4f334c Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 08:33:07 -0600
Subject: [PATCH 0376/3449] Fixing ref to old-wrappersDir

---
 nixos/modules/security/wrappers/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 96f4544c2fa4..144053a4ea3b 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -162,11 +162,11 @@ in
 
           # Remove the old /var/setuid-wrappers path from the system...
           #
-          # TDOO: this is only necessary for ugprades 16.09 => 17.x;
+          # TODO: this is only necessary for ugprades 16.09 => 17.x;
           # this conditional removal block needs to be removed after
           # the release.
-          if [ -d ${config.security.old-wrapperDir} ]; then
-            rm -rf ${config.security.old-wrapperDir}
+          if [ -d /var/setuid-wrappers ]; then
+            rm -rf /var/setuid-wrappers
           fi
 
           # Remove the old /run/setuid-wrappers-dir path from the

From e856d6efe812f24034aa8077fb538af0e8f8462d Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 08:40:12 -0600
Subject: [PATCH 0377/3449] Default should be to set owner and group to root on
 setcap wrappers too

---
 nixos/modules/security/wrappers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 144053a4ea3b..2ed8a601a035 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -73,7 +73,10 @@ let
   mkWrappedPrograms =
     builtins.map
       (s: if (s ? "capabilities")
-          then mkSetcapProgram s
+          then mkSetcapProgram
+                 ({ owner = "root";
+                  , group = "root";
+                  } // s)
           else if 
              (s ? "setuid"  && s.setuid  == true) ||
              (s ? "setguid" && s.setguid == true) ||

From 794b3721bc8bd06169b23ed923ce45905a1baf7b Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 08:42:08 -0600
Subject: [PATCH 0378/3449] Syntax wibble

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

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 2ed8a601a035..6f93403960af 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -75,7 +75,7 @@ let
       (s: if (s ? "capabilities")
           then mkSetcapProgram
                  ({ owner = "root";
-                  , group = "root";
+                    group = "root";
                   } // s)
           else if 
              (s ? "setuid"  && s.setuid  == true) ||

From 69794e333a41f3d7d0de44da790c5d356c58e28b Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 08:53:30 -0600
Subject: [PATCH 0379/3449] Using para tags for manual formatting

---
 nixos/modules/security/wrappers/default.nix | 31 +++++++++++----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 6f93403960af..c5b99c0c8015 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -109,26 +109,27 @@ in
         };
       };
       description = ''
-        This option allows the ownership and permissions on the setuid
-        wrappers for specific programs to be overridden from the
-        default (setuid root, but not setgid root).
+        <para>This option allows the ownership and permissions on the
+        setuid wrappers for specific programs to be overridden from
+        the default (setuid root, but not setgid root).</para>
 
-        Additionally, this option can set capabilities on a wrapper
-        program that propagates those capabilities down to the
-        wrapped, real program.
+        <para>Additionally, this option can set capabilities on a
+        wrapper program that propagates those capabilities down to the
+        wrapped, real program.</para>
 
-        The <literal>program</literal> attribute is the name of the
-        program to be wrapped. If no <literal>source</literal>
+        <para>The <literal>program</literal> attribute is the name of
+        the program to be wrapped. If no <literal>source</literal>
         attribute is provided, specifying the absolute path to the
         program, then the program will be searched for in the path
-        environment variable.
+        environment variable.</para>
 
-        NOTE: cap_setpcap, which is required for the wrapper program
-        to be able to raise caps into the Ambient set is NOT raised to
-        the Ambient set so that the real program cannot modify its own
-        capabilities!! This may be too restrictive for cases in which
-        the real program needs cap_setpcap but it at least leans on
-        the side security paranoid vs. too relaxed.
+        <para>NOTE: cap_setpcap, which is required for the wrapper
+        program to be able to raise caps into the Ambient set is NOT
+        raised to the Ambient set so that the real program cannot
+        modify its own capabilities!! This may be too restrictive for
+        cases in which the real program needs cap_setpcap but it at
+        least leans on the side security paranoid vs. too
+        relaxed.</para>
       '';
     };
 

From d43738ae931475cc456e556c52e2b57a357b1a2d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 14 Feb 2017 08:54:10 -0600
Subject: [PATCH 0380/3449] notmuch: don't double-compress man pages

---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index a8502b33cc5b..212d366facb3 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     make install-man
   '';
+  dontGzipMan = true; # already compressed
 
   meta = {
     description = "Mail indexer";

From d95868e9809b84f1c743ca1218a1b5dc6b521470 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 14 Feb 2017 17:43:58 +0100
Subject: [PATCH 0381/3449] geogebra: 5-0-320-0 -> 5-0-328-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 8c02af752e7f..f72ec5bacc22 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-320-0";
+  version = "5-0-328-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "039mrjwgkj3z51zq4xpchzr4msz5xgscgmp36dr1wms1kl42vibk";
+    sha256 = "1bzmnw5410fv9s29ji8f4naa6m6ykvv8h88mmxhiygr3rfsc7050";
   };
 
   srcIcon = fetchurl {

From ce859290e9a31acd9b0be51fa2c0ebe988b2c8bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 14 Feb 2017 12:36:02 -0600
Subject: [PATCH 0382/3449] offlineimap: install man pages

---
 pkgs/tools/networking/offlineimap/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 790212ec6890..d585be26e26d 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, pythonPackages, }:
+{ stdenv, fetchFromGitHub, pythonPackages,
+  asciidoc, libxml2, libxslt, docbook_xml_xslt }:
 
 pythonPackages.buildPythonApplication rec {
   version = "7.0.13";
@@ -12,10 +13,22 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0108xmp9df6cb1nzw3ym59mir3phgfdgp5d43n44ymsk2cc39xcc";
   };
 
+  postPatch = ''
+    # Skip xmllint to stop failures due to no network access
+    sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |"
+  '';
+
   doCheck = false;
 
+  nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ];
   propagatedBuildInputs = [ pythonPackages.six ];
 
+  postInstall = ''
+    make -C docs man
+    install -D -m 644 docs/offlineimap.1 ''${!outputMan}/share/man/man1/offlineimap.1
+    install -D -m 644 docs/offlineimapui.7 ''${!outputMan}/share/man/man7/offlineimapui.7
+  '';
+
   meta = {
     description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
     homepage = "http://offlineimap.org";

From 8d8bd31e5f24227eb4d955c6085fc400b18a5d0a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 14 Feb 2017 19:40:39 +0100
Subject: [PATCH 0383/3449] ddrescue: 1.21 -> 1.22

See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00003.html
for release note.
---
 pkgs/tools/system/ddrescue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 173c2623e18d..3dcbf59d4d7d 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, lzip }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.21";
+  name = "ddrescue-1.22";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.lz";
-    sha256 = "1b71hb42lh33y9843nd1mxlwkk9qh9ajvnz6ivzd1jq9lav4x7ph";
+    sha256 = "19qhx9ggkkjl0g3a88g501wmybkj1y4n5lm5kp0km0blh0p7p189";
   };
 
   nativeBuildInputs = [ lzip ];

From 3a0efcc4ca59cc3ebb3676e47b05f05dfbc6c9d2 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 14 Feb 2017 10:42:11 -0800
Subject: [PATCH 0384/3449] configuration-common: http-api-data is now at
 version 0.3.5

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 51287f14979f..f18582d501a6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -752,11 +752,7 @@ self: super: {
   servant-server = dontCheck super.servant-server;
 
   # Fix build for latest versions of servant and servant-client.
-  servant_0_10 = super.servant_0_10.overrideScope (self: super: {
-    http-api-data = self.http-api-data_0_3_5;
-  });
   servant-client_0_10 = super.servant-client_0_10.overrideScope (self: super: {
-    http-api-data = self.http-api-data_0_3_5;
     servant-server = self.servant-server_0_10;
     servant = self.servant_0_10;
   });

From 7483ba093222371e33d5daa22269992104f401c6 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 14 Feb 2017 14:13:39 -0500
Subject: [PATCH 0385/3449] Revert "nix-daemon: default useSandbox to true"

This reverts commit d0a086770a1be8c1f3175c195587052c5a5bfe1c.
---
 nixos/doc/manual/release-notes/rl-1703.xml | 4 ----
 nixos/modules/services/misc/nix-daemon.nix | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 68dc8e9b4bfc..8f9694bad8bd 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -30,10 +30,6 @@ has the following highlights: </para>
   <listitem>
     <para>PHP now defaults to PHP 7.1</para>
   </listitem>
-
-  <listitem>
-    <para>nix-daemon now uses sandboxing by default.</para>
-  </listitem>
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4c7264f4ac83..7101cadfeed2 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -100,14 +100,14 @@ in
 
       useSandbox = mkOption {
         type = types.either types.bool (types.enum ["relaxed"]);
-        default = true;
+        default = false;
         description = "
           If set, Nix will perform builds in a sandboxed environment that it
           will set up automatically for each build.  This prevents
           impurities in builds by disallowing access to dependencies
-          outside of the Nix store. It doesn't affect derivation
-          hashes, so changing this option will not trigger a rebuild
-          of packages.
+          outside of the Nix store. This isn't enabled by default for
+          performance. It doesn't affect derivation hashes, so changing
+          this option will not trigger a rebuild of packages.
         ";
       };
 

From 057fae5ea0e6efa7356f444b505294267e6427d5 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 14 Feb 2017 22:50:29 +0100
Subject: [PATCH 0386/3449] ghcWithHoogle: fix for ghcjs

`haskell.packages.ghcjs.ghcWithHoogle` failed because the following line:

  for docdir in ${ghc.doc}/${docLibGlob}/*; do

failed because `doc` is not an attribute of `ghc` when `ghc` is
substituted for ghcjs.
---
 pkgs/development/haskell-modules/hoogle.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index a0b909628297..b6063f6ef977 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -40,14 +40,14 @@ let
     if !isGhcjs
     then "ghc"
     else "ghcjs";
-  docLibGlob =
+  ghcDocLibDir =
     if !isGhcjs
-    then ''share/doc/ghc*/html/libraries''
-    else ''doc/lib'';
+    then ghc.doc + ''/share/doc/ghc*/html/libraries''
+    else ghc     + ''/doc/lib'';
   # On GHCJS, use a stripped down version of GHC's prologue.txt
   prologue =
     if !isGhcjs
-    then "${ghc.doc}/${docLibGlob}/prologue.txt"
+    then "${ghcDocLibDir}/prologue.txt"
     else writeText "ghcjs-prologue.txt" ''
       This index includes documentation for many Haskell modules.
     '';
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
     mkdir -p $out/share/doc/hoogle
 
     echo importing builtin packages
-    for docdir in ${ghc.doc}/${docLibGlob}/*; do
+    for docdir in ${ghcDocLibDir}/*; do
       name="$(basename $docdir)"
       ${opts isGhcjs ''docdir="$docdir/html"''}
       if [[ -d $docdir ]]; then

From c2a21d4d7b5780664a1c356244b97801f663ad01 Mon Sep 17 00:00:00 2001
From: Tom Doggett <nocoolnametom@gmail.com>
Date: Tue, 14 Feb 2017 14:25:42 -0800
Subject: [PATCH 0387/3449] gcalcli: init at 3.4.0 (#22725)

---
 lib/maintainers.nix                        | 1 +
 pkgs/applications/misc/gcalcli/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 82f59e728ed3..6e53114354cf 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -344,6 +344,7 @@
   nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
   nixy = "Andrew R. M. <andrewmiller237@gmail.com>";
+  nocoolnametom = "Tom Doggett <nocoolnametom@gmail.com>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index 7d5f16cfde19..7560a8bfeb40 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
+{ fetchFromGitHub, lib, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   version = "3.4.0";
@@ -26,5 +26,6 @@ pythonPackages.buildPythonApplication rec {
     homepage = https://github.com/insanum/gcalcli;
     description = "CLI for Google Calendar";
     license = licenses.mit;
+    maintainers = [ maintainers.nocoolnametom ];
   };
 }

From 0280d327f44a8f084520793bf30ab66f263bc936 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 14 Feb 2017 23:47:27 +0100
Subject: [PATCH 0388/3449] fzf: 0.16.2 -> 0.16.4

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

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index f0a1b63e8310..84b074de6cc9 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.2";
+  version = "0.16.4";
   rev = "${version}";
 
   goPackagePath = "github.com/junegunn/fzf";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "junegunn";
     repo = "fzf";
-    sha256 = "160474x0m3fzxi2ddy53chzhmlrx6lvialjknfxb72rm938fc845";
+    sha256 = "0kq4j6q1xk17ryzzcb8s6l2zqsjkk75lrwalias9gwcriqs6k6yn";
   };
 
   outputs = [ "bin" "out" "man" ];

From e3d7ce842bfb72cf04cc4a512a78ff28491d4e63 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Tue, 14 Feb 2017 23:59:00 +0100
Subject: [PATCH 0389/3449] shotwell: 0.25.2 -> 0.25.5

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index ca74cd1a4aa3..814127abe7d2 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -8,12 +8,12 @@
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
   major = "0.25";
-  minor = "2";
+  minor = "5";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "1bih5hr3pvpkx3fck55bnhngn4fl92ryjizc34wb8pwigbkxnaj1";
+    sha256 = "10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";

From 736fde5be36eff8bfd62d392f2912e1b55998c89 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 00:35:54 +0100
Subject: [PATCH 0390/3449] grafana: 4.1.1 -> 4.1.2

---
 pkgs/servers/monitoring/grafana/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index f2ce7822b8af..6c7b7ff001a1 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,8 +1,8 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "4.1.1";
-  ts = "1484211277";
+  version = "4.1.2";
+  ts = "1486989747";
   name = "grafana-v${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -10,12 +10,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "028s8fq8akv509kqw49865qpccxmhskaxcm51nn3c0i7vask2ivs";
+    sha256 = "0x2knb2lrs6sbj3svcjn70p46fzdy71gh8fgi801g1l0yp9s5yrg";
   };
 
   srcStatic = fetchurl {
     url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz";
-    sha256 = "1srscjlm9m08z7shydhkl4wnhv19by7pqfd7qvbvz2v3d5slqiji";
+    sha256 = "1i7n1a2xn65flwy2zqs3kqg1ch51653r52qn3gfh5hp92k81q4dq";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From f87eb8920c1aa665b71f386b7bdc674827c43931 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 00:41:20 +0100
Subject: [PATCH 0391/3449] grafana-old: outdated, probably without users

---
 .../tools/misc/grafana/default.nix            | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/grafana/default.nix

diff --git a/pkgs/development/tools/misc/grafana/default.nix b/pkgs/development/tools/misc/grafana/default.nix
deleted file mode 100644
index fc98d9703ef2..000000000000
--- a/pkgs/development/tools/misc/grafana/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, unzip, conf ? null }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "grafana-${version}";
-  version = "1.9.1";
-
-  src = fetchurl {
-    url = "http://grafanarel.s3.amazonaws.com/${name}.zip";
-    sha256 = "1zyzsbspxrzaf2kk6fysp6c3y025s6nd75rc2p9qq9q95dv8fj23";
-  };
-
-  buildInputs = [ unzip ];
-
-  phases = ["unpackPhase" "installPhase"];
-  installPhase = ''
-    mkdir -p $out && cp -R * $out
-    ${optionalString (conf!=null) ''cp ${conf} $out/config.js''}
-  '';
-
-  meta = {
-    description = "A Graphite & InfluxDB Dashboard and Graph Editor";
-    homepage = http://grafana.org/;
-    license = licenses.asl20;
-
-    maintainers = [ maintainers.offline ];
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cdc6f0a5baf..d3aadd147716 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1993,8 +1993,6 @@ with pkgs;
 
   gptfdisk = callPackage ../tools/system/gptfdisk { };
 
-  grafana-old = callPackage ../development/tools/misc/grafana { };
-
   grafx2 = callPackage ../applications/graphics/grafx2 {};
 
   grails = callPackage ../development/web/grails { jdk = null; };

From e18bec1e3c902d6ae8ce84f8d5586fc3e784aed0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 00:38:26 +0100
Subject: [PATCH 0392/3449] nginxMainline: 1.11.9 -> 1.11.10

---
 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 5d976a33488c..a9f3d74e99cb 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.9";
-  sha256 = "0j2pcara9ir2xj3m2mjzf7wz46mdy51c0kal61cp0ldm2qgvf8nw";
+  version = "1.11.10";
+  sha256 = "0gak6pcsn1m8fsz0g95z4b72nn12ivy35vlxrmagfcvnn2mkr2vp";
 })

From f56fa4824a3ebb79c797e83dda4eb6fb3f0dcee0 Mon Sep 17 00:00:00 2001
From: Laverne Schrock <laverne@schrock.email>
Date: Mon, 13 Feb 2017 18:40:36 -0600
Subject: [PATCH 0393/3449] mnemosyne: move generated locale files to correct
 location

It feels like a bit of a hack to move them after the install rather
than generating them in the correct spot in the first place, but this
fixes #12763.
---
 pkgs/games/mnemosyne/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index c1bde5fcbc36..03052c52f7fe 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -20,6 +20,11 @@ in pythonPackages.buildPythonApplication rec {
     substituteInPlace setup.py --replace /usr $out
     find . -type f -exec grep -H sys.exec_prefix {} ';' | cut -d: -f1 | xargs sed -i s,sys.exec_prefix,\"$out\",
   '';
+  postInstall = ''
+    mkdir -p $out/share
+    mv $out/lib/python2.7/site-packages/$out/share/locale $out/share
+    rm -r $out/lib/python2.7/site-packages/nix
+  '';
   meta = {
     homepage = http://mnemosyne-proj.org/;
     description = "Spaced-repetition software";

From 0637f83fb8fc8b7eb7090d75dce42ca9e8058b75 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 14 Feb 2017 16:51:55 -0800
Subject: [PATCH 0394/3449] update xmonad nix patch to apply to new xmonad

---
 .../haskell-modules/patches/xmonad-nix.patch  | 63 ++++++++++++++-----
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/patches/xmonad-nix.patch b/pkgs/development/haskell-modules/patches/xmonad-nix.patch
index cfce819747f5..2a9ec4bfedfb 100644
--- a/pkgs/development/haskell-modules/patches/xmonad-nix.patch
+++ b/pkgs/development/haskell-modules/patches/xmonad-nix.patch
@@ -1,31 +1,33 @@
+diff --git a/src/XMonad/Core.hs b/src/XMonad/Core.hs
+index 138d735..65b5a84 100644
 --- a/src/XMonad/Core.hs
 +++ b/src/XMonad/Core.hs
-@@ -48,6 +48,7 @@ import System.Posix.Types (ProcessID)
+@@ -51,6 +51,7 @@ import System.Posix.Types (ProcessID)
  import System.Process
  import System.Directory
  import System.Exit
 +import System.Environment (lookupEnv)
  import Graphics.X11.Xlib
- import Graphics.X11.Xlib.Extras (Event)
+ import Graphics.X11.Xlib.Extras (getWindowAttributes, WindowAttributes, Event)
  import Data.Typeable
-@@ -463,6 +464,7 @@ recompile force = io $ do
-         err  = base ++ ".errors"
-         src  = base ++ ".hs"
-         lib  = dir </> "lib"
+@@ -571,6 +572,7 @@ recompile force = io $ do
+         lib  = cfgdir </> "lib"
+         buildscript = cfgdir </> "build"
+ 
 +    ghc <- fromMaybe "ghc" <$> liftIO (lookupEnv "NIX_GHC")
      libTs <- mapM getModTime . Prelude.filter isSource =<< allFiles lib
      srcT <- getModTime src
      binT <- getModTime bin
-@@ -471,7 +473,7 @@ recompile force = io $ do
-         -- temporarily disable SIGCHLD ignoring:
-         uninstallSignalHandlers
-         status <- bracket (openFile err WriteMode) hClose $ \h ->
--            waitForProcess =<< runProcess "ghc" ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-main-is", "main", "-v0", "-o",binn] (Just dir)
-+            waitForProcess =<< runProcess ghc ["--make", "xmonad.hs", "-i", "-ilib", "-fforce-recomp", "-main-is", "main", "-v0", "-o",binn] (Just dir)
-                                     Nothing Nothing Nothing (Just h)
+@@ -586,7 +588,7 @@ recompile force = io $ do
+         status <- bracket (openFile err WriteMode) hClose $ \errHandle ->
+             waitForProcess =<< if useBuildscript
+                                then compileScript bin cfgdir buildscript errHandle
+-                               else compileGHC bin cfgdir errHandle
++                               else compileGHC ghc bin cfgdir errHandle
  
          -- re-enable SIGCHLD:
-@@ -480,6 +482,7 @@ recompile force = io $ do
+         installSignalHandlers
+@@ -594,6 +596,7 @@ recompile force = io $ do
          -- now, if it fails, run xmessage to let the user know:
          when (status /= ExitSuccess) $ do
              ghcErr <- readFile err
@@ -33,12 +35,39 @@
              let msg = unlines $
                      ["Error detected while loading xmonad configuration file: " ++ src]
                      ++ lines (if null ghcErr then show status else ghcErr)
-@@ -487,7 +490,7 @@ recompile force = io $ do
+@@ -601,7 +604,7 @@ recompile force = io $ do
              -- nb, the ordering of printing, then forking, is crucial due to
              -- lazy evaluation
              hPutStrLn stderr msg
--            forkProcess $ executeFile "xmessage" True ["-default", "okay", msg] Nothing
-+            forkProcess $ executeFile xmessage True ["-default", "okay", msg] Nothing
+-            forkProcess $ executeFile "xmessage" True ["-default", "okay", replaceUnicode msg] Nothing
++            forkProcess $ executeFile xmessage True ["-default", "okay", replaceUnicode msg] Nothing
              return ()
          return (status == ExitSuccess)
        else return True
+@@ -619,16 +622,16 @@ recompile force = io $ do
+            '\8216' -> '`'  -- ‘
+            '\8217' -> '`'  -- ’
+            _ -> c
+-       compileGHC bin dir errHandle =
+-         runProcess "ghc" ["--make"
+-                          , "xmonad.hs"
+-                          , "-i"
+-                          , "-ilib"
+-                          , "-fforce-recomp"
+-                          , "-main-is", "main"
+-                          , "-v0"
+-                          , "-o", bin
+-                          ] (Just dir) Nothing Nothing Nothing (Just errHandle)
++       compileGHC ghc bin dir errHandle =
++         runProcess ghc ["--make"
++                        , "xmonad.hs"
++                        , "-i"
++                        , "-ilib"
++                        , "-fforce-recomp"
++                        , "-main-is", "main"
++                        , "-v0"
++                        , "-o", bin
++                        ] (Just dir) Nothing Nothing Nothing (Just errHandle)
+        compileScript bin dir script errHandle =
+          runProcess script [bin] (Just dir) Nothing Nothing Nothing (Just errHandle)
+ 

From c34a52bf5da351a13211a87ebc1a7a32ef2af6ba Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 13 Feb 2017 18:24:22 +0100
Subject: [PATCH 0395/3449] mozart: prefer local builds

The build essentially unpacks a tarball and generates
a few wrappers.  No need to use hydra for that.
---
 pkgs/development/compilers/mozart/binary.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index e3dd950e0d1a..1c3a21e2e449 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -9,6 +9,8 @@ let
 in stdenv.mkDerivation {
   name = "mozart-binary-${version}";
 
+  preferLocalBuild = true;
+
   src = fetchurl {
     url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
     sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";

From e38f7c625e58a05f0c461599183da6511e7613cd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 01:49:51 +0100
Subject: [PATCH 0396/3449] syslog-ng: refactor

---
 pkgs/tools/system/syslog-ng/default.nix | 52 +++++++++++++++----------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 01aa0d1b01bd..4e1fb6719573 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,52 +1,62 @@
-{ stdenv, fetchgit, autoconf, autoconf-archive, automake, libtool, flex, openssl
+{ stdenv, fetchurl, openssl, libcap, curl, which
 , eventlog, pkgconfig, glib, python, systemd, perl
-, riemann_c_client, protobufc, pcre, yacc, which }:
+, riemann_c_client, protobufc, pcre, libnet
+, json_c, libuuid, libivykis, mongoc, rabbitmq-c }:
+
+let
+  pname = "syslog-ng";
+in
 
 stdenv.mkDerivation rec {
-  name = "syslog-ng-${version}";
+  name = "${pname}-${version}";
   version = "3.9.1";
 
-  src = fetchgit {
-    url = "https://github.com/balabit/syslog-ng.git";
-    rev = "59aa4e5d9396d293aae021746214b97d7fe0a8ee"; # tag: syslog-ng-3.9.1
-    sha256 = "15lalqf6dmpm4nr1pp0f2p0a6wbckkrh1k83vhp9ws0by5m8m66r";
+  src = fetchurl {
+    url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
+    sha256 = "05qaqw115py5iz55vmc0j1xcwcpr8wa9vpmbixhr1rqaamm8ay2n";
   };
 
+  nativeBuildInputs = [ pkgconfig which ];
+
   buildInputs = [
-    autoconf
-    autoconf-archive
-    automake
-    libtool
-    which
-    flex
+    libcap
+    curl
     openssl
     eventlog
-    pkgconfig
     glib
+    perl
     python
     systemd
-    perl
     riemann_c_client
     protobufc
-    yacc
     pcre
+    libnet
+    json_c
+    libuuid
+    libivykis
+    mongoc
+    rabbitmq-c
   ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
   configureFlags = [
+    "--enable-manpages"
     "--enable-dynamic-linking"
     "--enable-systemd"
+    "--with-ivykis=system"
+    "--with-librabbitmq-client=system"
+    "--with-mongoc=system"
+    "--with-jsonc=system"
+    "--with-systemd-journal=system"
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
   ];
 
+  outputs = [ "out" "man" ];
+
   meta = with stdenv.lib; {
     homepage = "http://www.balabit.com/network-security/syslog-ng/";
     description = "Next-generation syslogd with advanced networking and filtering capabilities";
     license = licenses.gpl2;
-    maintainers = [ maintainers.rickynils ];
+    maintainers = with maintainers; [ rickynils  fpletz ];
     platforms = platforms.linux;
   };
 }

From ea309fcf4893d50f8dc1b2db05bac6fadc261444 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 01:55:51 +0100
Subject: [PATCH 0397/3449] syslogng_incubator: 141106 -> 0.5.0, mark as broken

This is the current release but neither this nor the current master
is compatible with syslog-ng 3.8+. Committed work on update and
refactor of expression to make it easier in the future to bump.
---
 pkgs/tools/system/syslog-ng-incubator/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix
index 004b2b58fa37..b72673167bc3 100644
--- a/pkgs/tools/system/syslog-ng-incubator/default.nix
+++ b/pkgs/tools/system/syslog-ng-incubator/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng
-, eventlog, perl, python, yacc, riemann_c_client, libivykis, protobufc
+, eventlog, perl, python, yacc, protobufc, libivykis
 }:
 
 stdenv.mkDerivation rec {
   name = "syslog-ng-incubator-${version}";
-  version = "141106-54179c5";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "balabit";
     repo = "syslog-ng-incubator";
-    rev = "54179c5f733487fe97ee856bc27130d0b09f3d5a";
-    sha256 = "1y099f7pdan1441ycycd67igcwbla2m2cgnxjfvdw76llvi35sam";
+    rev = name;
+    sha256 = "00j123ya0xfj1jicaqnk1liffx07mhhf0r406pabxjjj97gy8nlk";
   };
 
+  nativeBuildInputs = [ pkgconfig autoreconfHook yacc ];
+
   buildInputs = [
-    autoreconfHook pkgconfig glib syslogng eventlog perl python
-    yacc riemann_c_client libivykis protobufc
+    glib syslogng eventlog perl python protobufc libivykis
   ];
 
   configureFlags = [
-    "--without-ivykis"
     "--with-module-dir=$(out)/lib/syslog-ng"
   ];
 
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
     platforms = platforms.linux;
+    broken = true; # does not work with our new syslog-ng version yet
   };
 }

From bf565a4635e51240f33d339a2c8a7214e893a62f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 01:29:28 +0100
Subject: [PATCH 0398/3449] libivykis: 0.40 -> 0.41

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

diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix
index d9e438da1313..dbc5c1e2ae92 100644
--- a/pkgs/development/libraries/libivykis/default.nix
+++ b/pkgs/development/libraries/libivykis/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "libivykis-${version}";
 
-  version = "0.40";
+  version = "0.41";
 
   src = fetchurl {
     url = "mirror://sourceforge/libivykis/${version}/ivykis-${version}.tar.gz";
-    sha256 = "1rn32dijv0pn9y2mbdg1n7al4h4i5pwwhhihr9pyakwyb6qgmqxj";
+    sha256 = "1igk3svf36i5xgb6ipc507xpj6zjm4xi9j1j2cdqaachllwlb4rc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 1f83f1c8789e4ad30f0242d4a8896324b8f9e89a Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Tue, 14 Feb 2017 21:30:04 -0600
Subject: [PATCH 0399/3449] security-wrapper: Wrap <para> tags in a <note> tag

---
 nixos/modules/security/wrappers/default.nix | 38 +++++++++++----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index c5b99c0c8015..9e4f3fdaa01f 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -109,27 +109,29 @@ in
         };
       };
       description = ''
-        <para>This option allows the ownership and permissions on the
-        setuid wrappers for specific programs to be overridden from
-        the default (setuid root, but not setgid root).</para>
+        This option allows the ownership and permissions on the setuid
+        wrappers for specific programs to be overridden from the
+        default (setuid root, but not setgid root).
 
-        <para>Additionally, this option can set capabilities on a
-        wrapper program that propagates those capabilities down to the
-        wrapped, real program.</para>
+        <note>
+          <para>Additionally, this option can set capabilities on a
+          wrapper program that propagates those capabilities down to the
+          wrapped, real program.</para>
 
-        <para>The <literal>program</literal> attribute is the name of
-        the program to be wrapped. If no <literal>source</literal>
-        attribute is provided, specifying the absolute path to the
-        program, then the program will be searched for in the path
-        environment variable.</para>
+          <para>The <literal>program</literal> attribute is the name of
+          the program to be wrapped. If no <literal>source</literal>
+          attribute is provided, specifying the absolute path to the
+          program, then the program will be searched for in the path
+          environment variable.</para>
 
-        <para>NOTE: cap_setpcap, which is required for the wrapper
-        program to be able to raise caps into the Ambient set is NOT
-        raised to the Ambient set so that the real program cannot
-        modify its own capabilities!! This may be too restrictive for
-        cases in which the real program needs cap_setpcap but it at
-        least leans on the side security paranoid vs. too
-        relaxed.</para>
+          <para>NOTE: cap_setpcap, which is required for the wrapper
+          program to be able to raise caps into the Ambient set is NOT
+          raised to the Ambient set so that the real program cannot
+          modify its own capabilities!! This may be too restrictive for
+          cases in which the real program needs cap_setpcap but it at
+          least leans on the side security paranoid vs. too
+          relaxed.</para>
+        </note>
       '';
     };
 

From 3490508ed1708a7dad1307a5739665b51df9b34d Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Sun, 27 Nov 2016 02:37:50 -0800
Subject: [PATCH 0400/3449] nixos-container: support bridge.

---
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 5cb7e3b560b8..18ee2f111b41 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -16,7 +16,7 @@ umask 0022;
 sub showHelp {
     print <<EOF;
 Usage: nixos-container list
-       nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start]
+       nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start] [--bridge <iface>]
        nixos-container destroy <container-name>
        nixos-container start <container-name>
        nixos-container stop <container-name>
@@ -36,6 +36,7 @@ my $systemPath;
 my $nixosPath;
 my $ensureUniqueName = 0;
 my $autoStart = 0;
+my $bridge;
 my $extraConfig;
 my $signal;
 my $configFile;
@@ -44,6 +45,7 @@ GetOptions(
     "help" => sub { showHelp() },
     "ensure-unique-name" => \$ensureUniqueName,
     "auto-start" => \$autoStart,
+    "bridge=s" => \$bridge,
     "system-path=s" => \$systemPath,
     "signal=s" => \$signal,
     "nixos-path=s" => \$nixosPath,
@@ -153,6 +155,7 @@ if ($action eq "create") {
     push @conf, "PRIVATE_NETWORK=1\n";
     push @conf, "HOST_ADDRESS=$hostAddress\n";
     push @conf, "LOCAL_ADDRESS=$localAddress\n";
+    push @conf, "HOST_BRIDGE=$bridge\n";
     push @conf, "AUTO_START=$autoStart\n";
     write_file($confFile, \@conf);
 

From a238c8a575a0397861e75b9509ded670f9e6381b Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Fri, 2 Dec 2016 13:21:03 -0800
Subject: [PATCH 0401/3449] nixos-container: add --port option for
 nixos-container (forward network ports to systemd-nspawn container)

---
 nixos/modules/virtualisation/containers.nix                  | 3 +++
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 7d445fa0951e..7193029d4518 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -89,6 +89,9 @@ let
         if [ -n "$HOST_BRIDGE" ]; then
           extraFlags+=" --network-bridge=$HOST_BRIDGE"
         fi
+        if [ -n "$HOST_PORT" ]; then
+          extraFlags+=" --port=$HOST_PORT"
+        fi
       fi
 
       extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}"
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 18ee2f111b41..cde79f8a8208 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -16,7 +16,7 @@ umask 0022;
 sub showHelp {
     print <<EOF;
 Usage: nixos-container list
-       nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start] [--bridge <iface>]
+       nixos-container create <container-name> [--nixos-path <path>] [--system-path <path>] [--config-file <path>] [--config <string>] [--ensure-unique-name] [--auto-start] [--bridge <iface>] [--port <port>]
        nixos-container destroy <container-name>
        nixos-container start <container-name>
        nixos-container stop <container-name>
@@ -37,6 +37,7 @@ my $nixosPath;
 my $ensureUniqueName = 0;
 my $autoStart = 0;
 my $bridge;
+my $port;
 my $extraConfig;
 my $signal;
 my $configFile;
@@ -46,6 +47,7 @@ GetOptions(
     "ensure-unique-name" => \$ensureUniqueName,
     "auto-start" => \$autoStart,
     "bridge=s" => \$bridge,
+    "port=s" => \$port,
     "system-path=s" => \$systemPath,
     "signal=s" => \$signal,
     "nixos-path=s" => \$nixosPath,
@@ -156,6 +158,7 @@ if ($action eq "create") {
     push @conf, "HOST_ADDRESS=$hostAddress\n";
     push @conf, "LOCAL_ADDRESS=$localAddress\n";
     push @conf, "HOST_BRIDGE=$bridge\n";
+    push @conf, "HOST_PORT=$port\n";
     push @conf, "AUTO_START=$autoStart\n";
     write_file($confFile, \@conf);
 

From 86842852513a8e0132e5580802b0fa1d90ef5f9b Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Fri, 2 Dec 2016 13:49:38 -0800
Subject: [PATCH 0402/3449] nixos-container: introduce hostPort in declarative
 container options.

---
 nixos/modules/virtualisation/containers.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 7193029d4518..88273545c2b6 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -131,6 +131,7 @@ let
         --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \
         --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \
         --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \
+        --setenv HOST_PORT="$HOST_PORT" \
         --setenv PATH="$PATH" \
         ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then
           ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else ""
@@ -318,6 +319,16 @@ let
       '';
     };
 
+    hostPort = mkOption {
+      type = types.nullOr types.string;
+      default = null;
+      example = "8080";
+      description = ''
+        Allow port forwarding from the host to the container. 
+      '';
+    };
+
+
     hostAddress = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -654,6 +665,9 @@ in
               ${optionalString (cfg.hostBridge != null) ''
                 HOST_BRIDGE=${cfg.hostBridge}
               ''}
+              ${optionalString (cfg.hostPort != null) ''
+                HOST_PORT=${cfg.hostPort}
+              ''}
               ${optionalString (cfg.hostAddress != null) ''
                 HOST_ADDRESS=${cfg.hostAddress}
               ''}

From 0bfc631de20a351b23af571e80347df1a58a298a Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Sun, 4 Dec 2016 04:00:07 +0000
Subject: [PATCH 0403/3449] nixos-container: support multiple port forwarding.
 change type of hostPort from 'string' to 'listOf str'

---
 nixos/modules/virtualisation/containers.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 88273545c2b6..83b7a2fdecdd 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -90,7 +90,13 @@ let
           extraFlags+=" --network-bridge=$HOST_BRIDGE"
         fi
         if [ -n "$HOST_PORT" ]; then
-          extraFlags+=" --port=$HOST_PORT"
+	  OIFS=$IFS
+	  IFS=","
+          for i in $HOST_PORT
+	  do
+              extraFlags+=" --port=$i"
+	  done
+	  IFS=$OIFS
         fi
       fi
 
@@ -320,11 +326,11 @@ let
     };
 
     hostPort = mkOption {
-      type = types.nullOr types.string;
+      type = types.listOf types.str;
       default = null;
-      example = "8080";
+      example = [ "8080" ];
       description = ''
-        Allow port forwarding from the host to the container. 
+        List of forwarded ports from the host to the container. 
       '';
     };
 
@@ -665,8 +671,8 @@ in
               ${optionalString (cfg.hostBridge != null) ''
                 HOST_BRIDGE=${cfg.hostBridge}
               ''}
-              ${optionalString (cfg.hostPort != null) ''
-                HOST_PORT=${cfg.hostPort}
+              ${optionalString (length cfg.hostPort > 0) ''
+                HOST_PORT=${concatStringsSep "," cfg.hostPort}
               ''}
               ${optionalString (cfg.hostAddress != null) ''
                 HOST_ADDRESS=${cfg.hostAddress}

From 4f0b663c2e3939981d2e254a3f1d93ea2901599b Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Sat, 3 Dec 2016 20:57:24 -0800
Subject: [PATCH 0404/3449] nixos-container: hostPort -> forwardPort and
 forwardPort is now a list of (protocol,hostPort,containerPort).

---
 nixos/modules/virtualisation/containers.nix | 45 +++++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 83b7a2fdecdd..5c867cbc2c81 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -90,13 +90,13 @@ let
           extraFlags+=" --network-bridge=$HOST_BRIDGE"
         fi
         if [ -n "$HOST_PORT" ]; then
-	  OIFS=$IFS
-	  IFS=","
+          OIFS=$IFS
+          IFS=","
           for i in $HOST_PORT
-	  do
+          do
               extraFlags+=" --port=$i"
-	  done
-	  IFS=$OIFS
+          done
+          IFS=$OIFS
         fi
       fi
 
@@ -325,12 +325,29 @@ let
       '';
     };
 
-    hostPort = mkOption {
-      type = types.listOf types.str;
-      default = null;
-      example = [ "8080" ];
+    forwardPorts = mkOption {
+      type = types.listOf (types.submodule {
+        options = {
+          protocol = mkOption {
+            type = types.str;
+            default = "tcp";
+            description = "The protocol specifier for port forwarding between host and container";
+          };
+          hostPort = mkOption {
+            type = types.int;
+            description = "Source port of the external interface on host";
+          };
+          containerPort = mkOption {
+            type = types.nullOr types.int;
+            default = null;
+            description = "Target port of container";
+          };
+        };
+      });
+      default = [];
+      example = [ { protocol = "tcp"; hostPort = 8080; containerPort = 80; } ];
       description = ''
-        List of forwarded ports from the host to the container. 
+        List of forwarded ports from host to container. Each forwarded port is specified by protocol, hostPort and containerPort. By default, protocol is tcp and hostPort and containerPort are assumed to be the same if containerPort is not explicitly given. 
       '';
     };
 
@@ -662,7 +679,9 @@ in
     # Generate a configuration file in /etc/containers for each
     # container so that container@.target can get the container
     # configuration.
-    environment.etc = mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
+    environment.etc =
+      let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort); 
+      in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf"
       { text =
           ''
             SYSTEM_PATH=${cfg.path}
@@ -671,8 +690,8 @@ in
               ${optionalString (cfg.hostBridge != null) ''
                 HOST_BRIDGE=${cfg.hostBridge}
               ''}
-              ${optionalString (length cfg.hostPort > 0) ''
-                HOST_PORT=${concatStringsSep "," cfg.hostPort}
+              ${optionalString (length cfg.forwardPorts > 0) ''
+                HOST_PORT=${concatStringsSep "," (map mkPortStr cfg.forwardPorts)}
               ''}
               ${optionalString (cfg.hostAddress != null) ''
                 HOST_ADDRESS=${cfg.hostAddress}

From 5ca0f72472a08ee42231410642a4928a3d58c61f Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Sat, 17 Dec 2016 17:48:29 -0800
Subject: [PATCH 0405/3449] nixos-container: break lines in description of
 forwardPorts.

---
 nixos/modules/virtualisation/containers.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 5c867cbc2c81..f79854967f1d 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -347,7 +347,10 @@ let
       default = [];
       example = [ { protocol = "tcp"; hostPort = 8080; containerPort = 80; } ];
       description = ''
-        List of forwarded ports from host to container. Each forwarded port is specified by protocol, hostPort and containerPort. By default, protocol is tcp and hostPort and containerPort are assumed to be the same if containerPort is not explicitly given. 
+        List of forwarded ports from host to container. Each forwarded port
+        is specified by protocol, hostPort and containerPort. By default,
+        protocol is tcp and hostPort and containerPort are assumed to be
+        the same if containerPort is not explicitly given. 
       '';
     };
 

From b7a24e0a2b540c0598fc3ff4056feb1208ec89f9 Mon Sep 17 00:00:00 2001
From: Ian-Woo Kim <ianwookim@gmail.com>
Date: Fri, 3 Feb 2017 12:50:02 -0800
Subject: [PATCH 0406/3449] nixos-container: added test for port forwarding (
 nixos/tests/containers-portforward.nix )

---
 nixos/tests/containers-portforward.nix | 63 ++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 nixos/tests/containers-portforward.nix

diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
new file mode 100644
index 000000000000..78cc445c2dd0
--- /dev/null
+++ b/nixos/tests/containers-portforward.nix
@@ -0,0 +1,63 @@
+# Test for NixOS' container support.
+
+let
+  hostIp = "192.168.0.1";
+  hostPort = 10080;
+  containerIp = "192.168.0.100";
+  containerPort = 80;
+in 
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "containers-portforward";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ aristid aszlig eelco chaoflow kampfschlaefer ianwookim ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+    { imports = [ ../modules/installer/cd-dvd/channel.nix ];
+      virtualisation.writableStore = true;
+      virtualisation.memorySize = 768;
+
+      containers.webserver =
+        { privateNetwork = true;
+          hostAddress = hostIp;
+          localAddress = containerIp;
+          forwardPorts = [ { protocol = "tcp"; hostPort = hostPort; containerPort = containerPort; } ];
+          config =
+            { services.httpd.enable = true;
+              services.httpd.adminAddr = "foo@example.org";
+              networking.firewall.allowedTCPPorts = [ 80 ];
+              networking.firewall.allowPing = true;
+            };
+        };
+
+      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+    };
+
+  testScript =
+    ''
+      $machine->succeed("nixos-container list") =~ /webserver/ or die;
+
+      # Start the webserver container.
+      $machine->succeed("nixos-container start webserver");
+
+      # wait two seconds for the container to start and the network to be up
+      sleep 2;
+
+      # Since "start" returns after the container has reached
+      # multi-user.target, we should now be able to access it.
+      #my $ip = $machine->succeed("nixos-container show-ip webserver");
+      #chomp $ip;
+      $machine->succeed("ping -n -c1 ${hostIp}");
+      $machine->succeed("curl --fail http://${hostIp}:${toString hostPort}/ > /dev/null");
+
+      # Stop the container.
+      $machine->succeed("nixos-container stop webserver");
+      $machine->fail("curl --fail --connect-timeout 2 http://${hostIp}:${toString hostPort}/ > /dev/null");
+
+      # Destroying a declarative container should fail.
+      $machine->fail("nixos-container destroy webserver");
+    '';
+
+})

From 9d8a0f8dd8153ea2f41104820b0c234b5aea9dba Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Feb 2017 05:36:03 +0100
Subject: [PATCH 0407/3449] pax-utils: 1.1.7 -> 1.2.2

Fixes at least a few out-of-bounds reads[1][2]

[1]: http://seclists.org/oss-sec/2017/q1/256
[2]: http://seclists.org/oss-sec/2017/q1/308
---
 pkgs/os-specific/linux/pax-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 1e4373f286c1..956492ba747b 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pax-utils-${version}";
-  version = "1.1.7";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "https://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
-    sha256 = "045dxgl4kkmq6205iw6fqyx3565gd607p3xpad5l9scdi3qdp6xv";
+    sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb";
   };
 
   makeFlags = [

From 7ee777d784de06a088c5ec933bfb2383c7001d1f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 14 Feb 2017 16:08:51 +0100
Subject: [PATCH 0408/3449] picard: 1.32. -> 1.4

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

diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index bbd59f56f707..886a77bb714a 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,7 +1,7 @@
 { stdenv, python2Packages, fetchurl, gettext, chromaprint }:
 
 let
-  version = "1.3.2";
+  version = "1.4";
   pythonPackages = python2Packages;
 in pythonPackages.buildPythonApplication {
   name = "picard-${version}";
@@ -9,7 +9,7 @@ in pythonPackages.buildPythonApplication {
 
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz";
-    sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77";
+    sha256 = "0gi7f1h7jcg7n18cx8iw38sd868viv3w377xmi7cq98f1g76d4h6";
   };
 
   buildInputs = [ gettext ];

From 01e5b8527dacfb61319dcdc2178ec6aed7f7f3c5 Mon Sep 17 00:00:00 2001
From: Philipp <philipp@xndr.de>
Date: Wed, 15 Feb 2017 07:05:22 +0100
Subject: [PATCH 0409/3449] dehydrated: 0.3.1 -> 0.4.0 (#22804)

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

diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index 6bd915e70508..4860311fa73f 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,7 +1,7 @@
 { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
 let
   pkgName = "dehydrated";
-  version = "0.3.1";
+  version = "0.4.0";
 in
 stdenv.mkDerivation rec {
   name = pkgName + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "lukas2511";
     repo = "dehydrated";
     rev = "v${version}";
-    sha256 = "0prg940ykbsfb4w48bc03j5abycg8v7f9rg9x3kcva37y8ml0jsp";
+    sha256 = "0nxs6l5i6409dzgiyjn8cnzjcblwj4rqcpxxb766vcvb8d4kqwby";
   };
 
   buildInputs = [ makeWrapper ];

From 195ca7393c42a9d93d34ca8911082101cb8db642 Mon Sep 17 00:00:00 2001
From: rardiol <ricardo.ardissone@gmail.com>
Date: Wed, 15 Feb 2017 04:11:59 -0200
Subject: [PATCH 0410/3449] widelands: 18 -> 19 (#22796)

---
 pkgs/games/widelands/bincmake.patch | 21 ++++++++++++++++
 pkgs/games/widelands/default.nix    | 37 +++++++++++++++++++----------
 pkgs/top-level/all-packages.nix     |  2 +-
 3 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/games/widelands/bincmake.patch

diff --git a/pkgs/games/widelands/bincmake.patch b/pkgs/games/widelands/bincmake.patch
new file mode 100644
index 000000000000..ed6a99125223
--- /dev/null
+++ b/pkgs/games/widelands/bincmake.patch
@@ -0,0 +1,21 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -25,6 +25,8 @@
+ # Packagers (or people using make install) have to set this variable to an absolute path.
+ wl_set_if_unset(WL_INSTALL_DATADIR "./data")
+ 
++wl_set_if_unset(WL_INSTALL_BINARY "./bin")
++
+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+   if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7)
+     message(FATAL_ERROR "Widelands needs GCC >= 4.7 to compile.")
+
+--- a/cmake/WlFunctions.cmake
++++ b/cmake/WlFunctions.cmake
+@@ -276,5 +276,5 @@
+ 
+   #Quoting the CMake documentation on DESTINATION:
+   #"If a relative path is given it is interpreted relative to the value of CMAKE_INSTALL_PREFIX"
+-  install(TARGETS ${NAME} DESTINATION "." COMPONENT ExecutableFiles)
++  install(TARGETS ${NAME} DESTINATION ${WL_INSTALL_BINARY} COMPONENT ExecutableFiles)
+ endfunction()
diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix
index b6008bd7e76a..94fd23cd8cbd 100644
--- a/pkgs/games/widelands/default.nix
+++ b/pkgs/games/widelands/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, cmake, python, gettext
-, boost, libpng, zlib, glew, lua
-, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, SDL_gfx
+, boost, libpng, zlib, glew, lua, doxygen, icu
+, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf, SDL2_gfx
 }:
 
-stdenv.mkDerivation {
-  name = "widelands-18";
+stdenv.mkDerivation rec {
+  name = "widelands-${version}";
+  version = "19";
 
   meta = with stdenv.lib; {
     description = "RTS with multiple-goods economy";
@@ -20,27 +21,39 @@ stdenv.mkDerivation {
     hydraPlatforms = [];
   };
 
+  patches = [
+    ./bincmake.patch
+  ];
 
   src = fetchurl {
-    url = "https://launchpad.net/widelands/build18/build-18/+download/"
-        + "widelands-build18-src.tar.bz2";
-    sha256 = "1qvx1cwkf61iwq0qkngvg460dsxqsfvk36qc7jf7mzwkiwbxkzvd";
+    url = "https://launchpad.net/widelands/build${version}/build${version}/+download/"
+        + "widelands-build${version}-src.tar.bz2";
+    sha256 = "19h1gina7k1ai2mn2fd75lxm8iz8wrs6dz6dchdvg8i8d39gj4g5";
   };
 
   preConfigure = ''
     cmakeFlags="
-      -DWL_INSTALL_PREFIX=$out
-      -DWL_INSTALL_BINDIR=bin
-      -DWL_INSTALL_DATADIR=share/widelands
+      -DWL_INSTALL_BASEDIR=$out
+      -DWL_INSTALL_DATADIR=$out/share/widelands
+      -DWL_INSTALL_BINARY=$out/bin
     "
   '';
 
   nativeBuildInputs = [ cmake python gettext ];
 
   buildInputs = [
-    boost libpng zlib glew lua
-    SDL SDL_image SDL_mixer SDL_net SDL_ttf SDL_gfx
+    boost libpng zlib glew lua doxygen icu
+    SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf
   ];
 
+  prePatch = ''
+    substituteInPlace ./debian/widelands.desktop --replace "/usr/share/games/widelands/data/" "$out/share/widelands/"
+  '';
+
+  postInstall = ''
+    mkdir -p "$out/share/applications/"
+    cp -v "../debian/widelands.desktop" "$out/share/applications/"
+  '';
+
   enableParallelBuilding = true;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3aadd147716..3ba672c477d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16491,7 +16491,7 @@ with pkgs;
   wesnoth-dev = callPackage ../games/wesnoth/dev.nix { };
 
   widelands = callPackage ../games/widelands {
-    lua = lua5_1;
+    lua = lua5_2;
   };
 
   worldofgoo_demo = callPackage ../games/worldofgoo {

From 448acd8e5e722bbd6396f6d069bf1b06993f72d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 14 Feb 2017 22:20:27 +0100
Subject: [PATCH 0411/3449] nixos: remove remaining reference to setuidPrograms

The option doesn't exist anymore.
---
 nixos/modules/security/wrappers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 9e4f3fdaa01f..cdf7e5a17650 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 let
 
-  inherit (config.security) wrapperDir wrappers setuidPrograms;
+  inherit (config.security) wrapperDir wrappers;
 
   programs =
     (lib.mapAttrsToList

From 34c1b74421f2c158dfb9f54c2855fd7b74ba1bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 14 Feb 2017 22:56:37 +0100
Subject: [PATCH 0412/3449] nixos/virtualbox: unbreak wrt. new
 security.wrappers

The new option takes an attrset, not a list.
---
 nixos/modules/virtualisation/virtualbox-host.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 501ed9bc6839..bb0c38bd4eb8 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -69,13 +69,14 @@ in
     environment.systemPackages = [ virtualbox ];
 
     security.wrappers = let
-      mkSuid = program: {"${program}" = {
+      mkSuid = program: {
         source = "${virtualbox}/libexec/virtualbox/${program}";
         owner = "root";
         group = "vboxusers";
         setuid = true;
-      };};
-    in mkIf cfg.enableHardening (map mkSuid [
+      };
+    in mkIf cfg.enableHardening
+      (builtins.listToAttrs (map (x: { name = x; value = mkSuid x; }) [
       "VBoxHeadless"
       "VBoxNetAdpCtl"
       "VBoxNetDHCP"
@@ -83,7 +84,7 @@ in
       "VBoxSDL"
       "VBoxVolInfo"
       "VirtualBox"
-    ]);
+    ]));
 
     users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers;
 

From b1bfe9d3db71de1aa9524ec76b188cfe4cd7dd3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 14 Feb 2017 22:58:11 +0100
Subject: [PATCH 0413/3449] nixos: hint about security.setuidOwners/Programs ->
 security.wrappers

Let users know about the option rename / change during nixos-rebuild
with a useful message instead of an error (with no way forward).
---
 nixos/modules/rename.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index e419474b3e32..ee68f8bff81a 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -32,6 +32,9 @@ with lib;
 
     (mkRenamedOptionModule [ "services" "clamav" "updater" "config" ] [ "services" "clamav" "updater" "extraConfig" ])
 
+    (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
+    (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
+
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
     (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])

From aaac02f6c47f509f9371be3b844c45ef779439b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 15 Feb 2017 08:25:59 +0100
Subject: [PATCH 0414/3449] nixos/atd: unbreak after new security.wrappers

* convert list -> attrset
* 'atd' doesn't exist, 'at' does
---
 nixos/modules/services/scheduling/atd.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix
index f3ada6b7496a..0216c9771c96 100644
--- a/nixos/modules/services/scheduling/atd.nix
+++ b/nixos/modules/services/scheduling/atd.nix
@@ -42,13 +42,14 @@ in
 
   config = mkIf cfg.enable {
 
-    security.wrappers = map (program: {"${program}" = {
-      source = "${pkgs.atd}/bin/${program}";
+    security.wrappers = builtins.listToAttrs (
+      map (program: { name = "${program}"; value = {
+      source = "${at}/bin/${program}";
       owner = "atd";
       group = "atd";
       setuid = true;
       setgid = true;
-    };}) [ "at" "atq" "atrm" "batch" ];
+    };}) [ "at" "atq" "atrm" "batch" ]);
 
     environment.systemPackages = [ at ];
 

From a45821e7a849db511ea4aa1f19040645c3e8d0b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 15 Feb 2017 08:30:58 +0100
Subject: [PATCH 0415/3449] nixos/cron: unbreak since new security.wrapper

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

diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index cc6eb96bf5da..6eb277d0a2f2 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -93,7 +93,7 @@ in
 
     { services.cron.enable = mkDefault (allFiles != []); }
     (mkIf (config.services.cron.enable) {
-      security.wrappers.crontab.source = "${pkgs.cronNixosPkg.out}/bin/crontab";
+      security.wrappers.crontab.source = "${cronNixosPkg}/bin/crontab";
       environment.systemPackages = [ cronNixosPkg ];
       environment.etc.crontab =
         { source = pkgs.runCommand "crontabs" { inherit allFiles; preferLocalBuild = true; }

From 76da40e5a72008acc35383bf9b36113316ea202d Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 15 Feb 2017 09:07:25 +0100
Subject: [PATCH 0416/3449] cups-dymo: init at 1.4.0.5

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

diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix
new file mode 100644
index 000000000000..b2801c7ae671
--- /dev/null
+++ b/pkgs/misc/cups/drivers/dymo/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchurl, cups, ... }:
+
+stdenv.mkDerivation rec {
+  name = "cups-dymo-${version}";
+  version = "1.4.0.5";
+
+  # exposed version and 'real' version may differ
+  # in this case the download states '1.4.0' but the real version is '1.4.0.5'
+  # this has the potential to break future builds
+  dl-name = "dymo-cups-drivers-1.4.0";
+
+  src = fetchurl {
+    url = "http://download.dymo.com/dymo/Software/Download%20Drivers/Linux/Download/${dl-name}.tar.gz";
+    sha256 = "0wagsrz3q7yrkzb5ws0m5faq68rqnqfap9p98sgk5jl6x7krf1y6";
+  };
+
+  buildInputs = [ cups ];
+  makeFlags = [ "cupsfilterdir=$(out)/lib/cups/filter" "cupsmodeldir=$(out)/share/cups/model" ];
+
+  meta = {
+    description = "CUPS Linux drivers and SDK for DYMO printers";
+    homepage = "http://www.dymo.com/";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ makefu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 855de099cbac..cb6a495ee68e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17474,6 +17474,8 @@ with pkgs;
 
   cups-kyocera = callPackage ../misc/cups/drivers/kyocera {};
 
+  cups-dymo = callPackage ../misc/cups/drivers/dymo {};
+
   crashplan = callPackage ../applications/backup/crashplan { };
 
   e17gtk = callPackage ../misc/themes/e17gtk { };

From f9cb2b56402a76b51fa9fd25a947372f5ec6ff81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 15 Feb 2017 09:07:16 +0100
Subject: [PATCH 0417/3449] nixos/security.wrappers: use literalExample in
 documentation

It's much more readable when the example attrset is pretty printed
instead of written as one line.
---
 nixos/modules/security/wrappers/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index cdf7e5a17650..98913a974fc9 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -99,15 +99,17 @@ in
     security.wrappers = lib.mkOption {
       type = lib.types.attrs;
       default = {};
-      example = {
-        sendmail.source = "/nix/store/.../bin/sendmail";
-        ping = {
-          source  = "${pkgs.iputils.out}/bin/ping";
-          owner   = "nobody";
-          group   = "nogroup";
-          capabilities = "cap_net_raw+ep";
-        };
-      };
+      example = lib.literalExample
+        ''
+          { sendmail.source = "/nix/store/.../bin/sendmail";
+            ping = {
+              source  = "${pkgs.iputils.out}/bin/ping";
+              owner   = "nobody";
+              group   = "nogroup";
+              capabilities = "cap_net_raw+ep";
+            };
+          }
+        '';
       description = ''
         This option allows the ownership and permissions on the setuid
         wrappers for specific programs to be overridden from the

From a73afa89b402f969d9ed2e0d71dc2a19c80aaa72 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 06:33:26 +0100
Subject: [PATCH 0418/3449] prometheus: 1.4.2 -> 1.5.2

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

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index a5fc6e4d94e6..5d7a75b20132 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "prometheus-${version}";
-  version = "1.4.1";
+  version = "1.5.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/prometheus";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "05yd3y1b0406qdmx7p27pya9kzcrv66069z1y8dqwj3bf9c7csnm";
+    sha256 = "1b24nx6gmx2c7fj92p2byla3i0zs6xwymxqji00gvgpxr8bsfhn1";
   };
 
   docheck = true;
@@ -36,7 +36,7 @@ buildGoPackage rec {
     description = "Service monitoring system and time series database";
     homepage = http://prometheus.io;
     license = licenses.asl20;
-    maintainers = with maintainers; [ benley ];
+    maintainers = with maintainers; [ benley fpletz ];
     platforms = platforms.unix;
   };
 }

From 188526da3da7162be11e7cc4e46e64d4279b834b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 06:34:20 +0100
Subject: [PATCH 0419/3449] prometheus.blackboxExporter service: add
 CAP_NET_RAW

The blackbox-exporter for prometheus needs CAP_NET_RAW for sending icmp
probes.
---
 .../modules/services/monitoring/prometheus/blackbox-exporter.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
index 7a343299c315..388e4d4ac01d 100644
--- a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
+++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix
@@ -54,6 +54,7 @@ in {
         Restart = "always";
         PrivateTmp = true;
         WorkingDirectory = /tmp;
+        AmbientCapabilities = [ "CAP_NET_RAW" ]; # for ping probes
         ExecStart = ''
           ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \
             -web.listen-address :${toString cfg.port} \

From 78f59f1223b1a4cafebabeca88b28a159c9663d9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 08:41:37 +0100
Subject: [PATCH 0420/3449] ffmpeg: 2.8.10 -> 2.8.11 for multiple CVEs

Fixes CVE-2017-5024 & CVE-2017-5025.

See https://ffmpeg.org/security.html.
---
 pkgs/development/libraries/ffmpeg/2.8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index 366adfbefca2..5e5fef5cd834 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.10";
+  version = "${branch}.11";
   branch = "2.8";
-  sha256 = "1jd9vqrsng6swk1xsms3qvwqjzla58xbk3103qmnxkixa1rimkni";
+  sha256 = "0cldkzcbvsnb7mxz3kwpa0mnb44wmlc0qyl01wwi2qznn7vf11wr";
 })

From d2426f0aa877369ed7130075a7afc967004b69c0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 08:42:42 +0100
Subject: [PATCH 0421/3449] ffmpeg: 3.1.6 -> 3.1.7 for multiple CVEs

Fixes CVE-2017-5024 & CVE-2017-5025.

See https://ffmpeg.org/security.html.
---
 pkgs/development/libraries/ffmpeg/3.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/3.1.nix b/pkgs/development/libraries/ffmpeg/3.1.nix
index a3504bf897cc..8e79d1ad0e11 100644
--- a/pkgs/development/libraries/ffmpeg/3.1.nix
+++ b/pkgs/development/libraries/ffmpeg/3.1.nix
@@ -5,9 +5,9 @@
 }@args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.6";
+  version = "${branch}.7";
   branch = "3.1";
-  sha256 = "0c9g9zhrnvbfwwcca35jis7f7njskhzrwa7n7wpd1618cms2kjvx";
+  sha256 = "0ldf484r3waslv0sjx3vcwlkfgh28bd1wqcj26snfhav7zkf10kl";
   darwinFrameworks = [ Cocoa CoreMedia ];
   patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
 })

From e8af5dcd8eaab5aae4cd85940e4714066adaf95b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 08:43:14 +0100
Subject: [PATCH 0422/3449] ffmpeg: 3.2.2 -> 3.2.4 for multiple CVEs

Fixes CVE-2017-5024 & CVE-2017-5025.

See https://ffmpeg.org/security.html.
---
 pkgs/development/libraries/ffmpeg/3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix
index 7587ca7c3cac..17ed6fb0e4ba 100644
--- a/pkgs/development/libraries/ffmpeg/3.2.nix
+++ b/pkgs/development/libraries/ffmpeg/3.2.nix
@@ -5,9 +5,9 @@
 }@args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.2";
+  version = "${branch}.4";
   branch = "3.2";
-  sha256 = "0srn788i4k5827sl8vmds6133vjy9ygsmgzwn40n3l5qs5b9l4hb";
+  sha256 = "194n8hwmz2rpgh2rz8bc3mnxjyj3jh090mqp7k76msg9la9kbyn0";
   darwinFrameworks = [ Cocoa CoreMedia ];
   patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
 })

From 07309d740a8e9375a45111677f617345a6314ebd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 08:47:58 +0100
Subject: [PATCH 0423/3449] webkitgtk: 2.14.3 -> 2.14.4 for multiple CVEs

Fixes:

  * CVE-2017-2350
  * CVE-2017-2354
  * CVE-2017-2355
  * CVE-2017-2356
  * CVE-2017-2362
  * CVE-2017-2363
  * CVE-2017-2364
  * CVE-2017-2365
  * CVE-2017-2366
  * CVE-2017-2369
  * CVE-2017-2371
  * CVE-2017-2373

See https://webkitgtk.org/security/WSA-2017-0002.html.
---
 pkgs/development/libraries/webkitgtk/2.14.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index 2af7133bf2b5..cb490c801b69 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.3";
+  version = "2.14.4";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0v0hkvggxi38cdb3v672qwr0m0y3x2rmnwh8j3q28869li8d9shb";
+    sha256 = "1b73rcyfqjyg5rqw6f4760b2h1kixwva88clp2wl9vnl3psjvbni";
   };
 
   # see if we can clean this up....

From 1e65d0b9e995e18b289f0fb2b3724665c945d345 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 15 Feb 2017 08:52:21 +0100
Subject: [PATCH 0424/3449] gnutls: 3.5.8 -> 3.5.9

Bugfix release.
---
 pkgs/development/libraries/gnutls/3.5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index 7d58bfcd67ff..a5076b9d4985 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchurl, libunistring, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.8";
+  version = "3.5.9";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf";
+    sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2";
   };
 
   buildInputs = [ libunistring ];

From 1a77e4141d83b1b0025c226303b77428f6eb74af Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 15 Feb 2017 08:50:15 +0100
Subject: [PATCH 0425/3449] chromium: flashplayer: 24.0.0.194 -> 24.0.0.221

[Critical security fix] - see #22792
---
 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 cb0309bac89d..02b7ec34cfcd 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 = "24.0.0.194";
+    version = "24.0.0.221";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1l9gz81mwb4p1yj9n8s7hrkxdyw0amcpcc3295dq7zhsr35dm76z";
+      sha256 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80";
       stripRoot = false;
     };
 

From e1165abcb868728d410b2b32f141d7fe5792c219 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 15 Feb 2017 17:08:23 +0800
Subject: [PATCH 0426/3449] terragrunt: 0.10.0 -> 0.10.1

---
 .../networking/cluster/terragrunt/default.nix             | 4 ++--
 pkgs/applications/networking/cluster/terragrunt/deps.nix  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 48d05fa96634..4c5c6fe53ce8 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.10.0";
+  version = "0.10.1";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "1cdhl7rqd2jslvp1ia1gph1lg0sjzsnvj7dj6lg85jfdcffafygj";
+    sha256 = "04q9wm8dnbm1pcy9i3c7ral49k3z10a7gx7h6h4bsvjy1sdf58vz";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 91425c30121a..bb438ef4e326 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "63102d196e0996a2910839857c3584f62be907cc";
-      sha256 = "0n207g4bf5fjq23f63nkhh14shj7kjdrr4qn6h28d7x2vqfb9pss";
+      rev = "f85f603a3e5b4d0eb9516dddb33778918f3b45c6";
+      sha256 = "10frgavkbsqpfninrlgwh64qjx9rwyjzbdfrikciv75v1gljh6zv";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "347a9884a87374d000eec7e6445a34487c1f4a2b";
-      sha256 = "0wii48b2g5dyp6bknnlgs3ln93qxz5jvi96420wnpkkz51nrcmbp";
+      rev = "2526b57c56f30b50466c96c4133b1a4ad0f0191f";
+      sha256 = "03vvr1wq4pw2fixxsbr1d623hwqxf93d07p8vjml6iyd6k97b15p";
     };
   }
 ]

From 59639ad8b027b3fbf69c74fcead0db905c8616b3 Mon Sep 17 00:00:00 2001
From: Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr>
Date: Tue, 14 Feb 2017 11:18:03 +0100
Subject: [PATCH 0427/3449] opengrok: 0.12.1 (broken) -> 0.12.5

---
 .../development/tools/misc/opengrok/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix
index fa77890655e6..c2268ba8da20 100644
--- a/pkgs/development/tools/misc/opengrok/default.nix
+++ b/pkgs/development/tools/misc/opengrok/default.nix
@@ -1,11 +1,22 @@
 { fetchurl, stdenv, jre, ctags, makeWrapper, coreutils, git }:
 
 stdenv.mkDerivation rec {
-  name = "opengrok-0.12.1";
+  name = "opengrok-${version}";
+  version = "0.12.5";
 
+  # 0.12.5 is the latest distributed as a .tar.gz file.
+  # Newer are distribued as .zip so a source build is required.
+
+  # if builded from source
+  #src = fetchurl {
+  #  url = "https://github.com/OpenGrok/OpenGrok/archive/${version}.tar.gz";
+  #  sha256 = "01r7ipnj915rnyxyqrnmjfagkip23q5lx9g787qb7qrnbvgfi118";
+  #};
+
+  # binary distribution
   src = fetchurl {
-    url = "http://java.net/projects/opengrok/downloads/download/${name}.tar.gz";
-    sha256 = "0ihaqgf1z2gsjmy2q96m0s07dpnh92j3ss3myiqjdsh9957fwg79";
+    url = https://github.com/OpenGrok/OpenGrok/files/213268/opengrok-0.12.1.5.tar.gz;
+    sha256 = "c3ce079f6ed1526c475cb4b9a7aa901f75507318c93b436d6c14eba4098e4ead";
   };
 
   buildInputs = [ makeWrapper ];

From e5ac6bc9992b17c59df2f16d9b0ec469ec600566 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 15 Feb 2017 10:21:45 +0100
Subject: [PATCH 0428/3449] knot-resolver: use embedded lmdb on Darwin for now

I don't know what's wrong there, and Darwin isn't among primary platforms
for kresd.
---
 pkgs/servers/dns/knot-resolver/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 10181de159f5..323b0b500008 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ];
 
-  buildInputs = [ knot-dns lmdb luajit libuv gnutls ]
+  buildInputs = [ knot-dns luajit libuv gnutls ]
+    ++ optional stdenv.isLinux lmdb # system lmdb causes some problems on Darwin
     ## optional dependencies
     ++ optional doInstallCheck cmocka
     ++ optional stdenv.isLinux systemd # socket activation

From ce8af120f222ef16de8f2ff5d130ef1c0a76080e Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Feb 2017 15:44:23 -0800
Subject: [PATCH 0429/3449] leather: Init at 0.3.3

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

diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix
new file mode 100644
index 000000000000..e7c67819ed70
--- /dev/null
+++ b/pkgs/development/python-modules/leather/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  pname = "leather";
+  version = "0.3.3";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "125r372q7bwcajfdysp7w5zh5wccwxf1mkhqawl8h518nl1icv87";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://leather.rtfd.io";
+    description = "Python charting library";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ vrthra ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e7ee93e21fec..1c57d181a45c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5651,6 +5651,8 @@ in {
     };
   };
 
+  leather = callPackage ../development/python-modules/leather { };
+
   libtmux = buildPythonPackage rec {
     name = "libtmux-${version}";
     version = "0.6.0";

From e69f76470a58aa80fab4095cc7a47880a90ec3c6 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sat, 11 Feb 2017 16:12:10 -0800
Subject: [PATCH 0430/3449] aenum: Init at 1.4.7

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

diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
new file mode 100644
index 000000000000..1233b94dccdf
--- /dev/null
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "aenum";
+  version = "1.4.7";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bvn2k53nz99fiwql5fkl0fh7xjw8ama9qzdjp36609mpk05ikl8";
+  };
+
+  meta = {
+    description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants";
+    maintainer = with stdenv.lib.maintainers; [ vrthra ];
+    license = with stdenv.lib.licenses; [ bsd3 ];
+    homepage = https://bitbucket.org/stoneleaf/aenum;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c57d181a45c..2934e19a96b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -95,6 +95,8 @@ in {
     };
   };
 
+  aenum = callPackage ../development/python-modules/aenum { };
+
   agate = buildPythonPackage rec {
     name = "agate-1.2.2";
     disabled = isPy3k;

From a674dea6756b773e1e41f9df2aaa29e9499f74f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 15 Feb 2017 11:04:35 +0100
Subject: [PATCH 0431/3449] iputils: 20151218 -> 20161105

most notable change is the removal of tracepath6 and ping6
---
 pkgs/os-specific/linux/iputils/default.nix | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 3e2eb93d2137..1b6be8e4aa1b 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl, libsysfs, gnutls, openssl, libcap, sp, docbook_sgml_dtd_31
+{ stdenv, fetchurl
+, libsysfs, gnutls, openssl
+, libcap, sp, docbook_sgml_dtd_31
+, libidn, nettle
 , SGMLSpm, libgcrypt }:
 
 assert stdenv ? glibc;
 
 let
-  time = "20151218";
+  time = "20161105";
 in
 stdenv.mkDerivation rec {
   name = "iputils-${time}";
 
   src = fetchurl {
-    url = "http://www.skbuff.net/iputils/iputils-s${time}.tar.bz2";
-    sha256 = "189592jlkhxdgy8jc07m4bsl41ik9r6i6aaqb532prai37bmi7sl";
+    url = "https://github.com/iputils/iputils/archive/s${time}.tar.gz";
+    sha256 = "12mdmh4qbf5610csaw3rkzhpzf6djndi4jsl4gyr8wni0cphj4zq";
   };
 
   prePatch = ''
@@ -21,27 +24,24 @@ stdenv.mkDerivation rec {
   makeFlags = "USE_GNUTLS=no";
 
   buildInputs = [
-    libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt
+    libsysfs openssl libcap sp docbook_sgml_dtd_31 SGMLSpm libgcrypt libidn nettle
   ];
 
   buildFlags = "man all ninfod";
 
   installPhase =
     ''
-      mkdir -p $out/sbin $out/bin
-      cp -p ping ping6 tracepath tracepath6 traceroute6 $out/bin/
-      cp -p clockdiff arping rdisc ninfod/ninfod $out/sbin/
+      mkdir -p $out/bin
+      cp -p ping tracepath clockdiff arping rdisc ninfod/ninfod $out/bin/
 
       mkdir -p $out/share/man/man8
-      cp -p doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 \
-        doc/tracepath.8 doc/ninfod.8 doc/traceroute6.8 \
+      cp -p \
+        doc/clockdiff.8 doc/arping.8 doc/ping.8 doc/rdisc.8 doc/tracepath.8 doc/ninfod.8 \
         $out/share/man/man8
-      ln -s $out/share/man/man8/{ping,ping6}.8
-      ln -s $out/share/man/man8/{tracepath,tracepath6}.8
     '';
 
   meta = {
-    homepage = http://www.skbuff.net/iputils/;
+    homepage = https://github.com/iputils/iputils;
     description = "A set of small useful utilities for Linux networking";
     platforms = stdenv.lib.platforms.linux;
   };

From a069c16c2240fecc69545b9b26c0becea8ac559d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 15 Feb 2017 12:30:30 +0100
Subject: [PATCH 0432/3449] tensorflowNoGpuSupport -> tensorflowWithoutCuda

and move expression
---
 .../python-modules/tensorflow/default.nix     | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 37 +-------------
 2 files changed, 50 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/development/python-modules/tensorflow/default.nix

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
new file mode 100644
index 000000000000..f8bc35eb5684
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -0,0 +1,48 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, numpy
+, six
+, protobuf3_0_0b2
+, swig
+, mock
+, gcc
+, zlib
+}:
+
+# tensorflow is built from a downloaded wheel, because the upstream
+# project's build system is an arcane beast based on
+# bazel. Untangling it and building the wheel from source is an open
+# problem.
+
+buildPythonPackage rec {
+  pname = "tensorflow";
+  version = "0.10.0";
+  name = "${pname}-${version}";
+  format = "wheel";
+
+  src = fetchurl {
+    url = if stdenv.isDarwin then
+      "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else
+      "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
+    sha256 = if stdenv.isDarwin then
+      "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else
+      "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx";
+  };
+
+  propagatedBuildInputs = [ numpy six protobuf3_0_0b2 swig mock];
+
+  preFixup = ''
+    RPATH="${stdenv.lib.makeLibraryPath [ gcc.cc.lib zlib ]}"
+    find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \;
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "TensorFlow helps the tensors flow (no gpu support)";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    platforms = with platforms; linux ++ darwin;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2934e19a96b1..1fb98a655244 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31243,43 +31243,10 @@ EOF
     };
   };
 
-  # tensorflow is built from a downloaded wheel, because the upstream
-  # project's build system is an arcane beast based on
-  # bazel. Untangling it and building the wheel from source is an open
-  # problem.
+  tensorflow = self.tensorflowWithoutCuda;
 
-  tensorflow = self.tensorflowNoGpuSupport;
+  tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { };
 
-  tensorflowNoGpuSupport = buildPythonPackage rec {
-    name = "tensorflow";
-    version = "0.10.0";
-    format = "wheel";
-
-    src = pkgs.fetchurl {
-      url = if stdenv.isDarwin then
-        "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else
-        "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
-      sha256 = if stdenv.isDarwin then
-        "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else
-        "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx";
-    };
-
-    propagatedBuildInputs = with self; [ numpy six protobuf3_0_0b2 pkgs.swig mock];
-
-    preFixup = ''
-      RPATH="${stdenv.lib.makeLibraryPath [ pkgs.gcc.cc.lib pkgs.zlib ]}"
-      find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \;
-    '';
-
-    doCheck = false;
-
-    meta = {
-      description = "TensorFlow helps the tensors flow (no gpu support)";
-      homepage = http://tensorflow.org;
-      license = licenses.asl20;
-      platforms = with platforms; linux ++ darwin;
-    };
-  };
 
   tensorflowCuDNN = buildPythonPackage rec {
     name = "tensorflow";

From 97c3bebd92772359a3f0e03f5aa74f79e4aacfb7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 15 Feb 2017 12:30:52 +0100
Subject: [PATCH 0433/3449] tensorflowCuDNN -> tensorflowWithCuda

and move expression
---
 .../python-modules/tensorflow/cuda.nix        | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 36 +------------
 2 files changed, 53 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/development/python-modules/tensorflow/cuda.nix

diff --git a/pkgs/development/python-modules/tensorflow/cuda.nix b/pkgs/development/python-modules/tensorflow/cuda.nix
new file mode 100644
index 000000000000..05a4cc3e4c18
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/cuda.nix
@@ -0,0 +1,52 @@
+{ stdenv
+, fetchurl
+, buildPythonPackage
+, swig
+, numpy
+, six
+, protobuf3_0
+, cudatoolkit75
+, cudnn5_cudatoolkit75
+, gcc49
+, zlib
+, linuxPackages
+, mock
+}:
+
+buildPythonPackage rec {
+  pname = "tensorflow";
+  version = "0.11.0rc0";
+  name = "${pname}-${version}";
+  format = "wheel";
+
+  src = fetchurl {
+    url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
+    sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
+  };
+
+  buildInputs = [ swig ];
+  propagatedBuildInputs = [ numpy six protobuf3_0 cudatoolkit75 cudnn5_cudatoolkit75 gcc49 mock ];
+
+  # Note that we need to run *after* the fixup phase because the
+  # libraries are loaded at runtime. If we run in preFixup then
+  # patchelf --shrink-rpath will remove the cuda libraries.
+  postFixup = let
+    rpath = stdenv.lib.makeLibraryPath [
+      gcc49.cc.lib
+      zlib cudatoolkit75
+      cudnn5_cudatoolkit75
+      linuxPackages.nvidia_x11
+    ];
+  in ''
+    find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
+  '';
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "TensorFlow helps the tensors flow (no gpu support)";
+    homepage = http://tensorflow.org;
+    license = licenses.asl20;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1fb98a655244..0b4e8a3443dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31247,41 +31247,7 @@ EOF
 
   tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { };
 
-
-  tensorflowCuDNN = buildPythonPackage rec {
-    name = "tensorflow";
-    version = "0.11.0rc0";
-    format = "wheel";
-
-    src = pkgs.fetchurl {
-      url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
-      sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
-    };
-
-    buildInputs = with self; [ pkgs.swig ];
-    propagatedBuildInputs = with self; [ numpy six protobuf3_0 pkgs.cudatoolkit75 pkgs.cudnn5_cudatoolkit75 pkgs.gcc49 self.mock ];
-
-    # Note that we need to run *after* the fixup phase because the
-    # libraries are loaded at runtime. If we run in preFixup then
-    # patchelf --shrink-rpath will remove the cuda libraries.
-    postFixup = let rpath = stdenv.lib.makeLibraryPath [
-      pkgs.gcc49.cc.lib
-      pkgs.zlib pkgs.cudatoolkit75
-      pkgs.cudnn5_cudatoolkit75
-      pkgs.linuxPackages.nvidia_x11
-    ]; in ''
-      find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
-    '';
-
-    doCheck = false;
-
-    meta = {
-      description = "TensorFlow helps the tensors flow (no gpu support)";
-      homepage = http://tensorflow.org;
-      license = licenses.asl20;
-      platforms   = platforms.linux;
-    };
-  };
+  tensorflowWithCuda = callPackage ../development/python-modules/tensorflow/cuda.nix { };
 
   tflearn = buildPythonPackage rec {
     name = "tflearn-0.2.1";

From 397e59b4c93af1a090841c762cd845e216ba3c1f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 15 Feb 2017 12:56:58 +0100
Subject: [PATCH 0434/3449] pythonPackages.Keras: 1.0.3 -> 1.2.2

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

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
new file mode 100644
index 000000000000..65c72ca98314
--- /dev/null
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -0,0 +1,43 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestcov
+, pytestpep8
+, pytest_xdist
+, six
+, Theano
+, pyyaml
+}:
+
+buildPythonPackage rec {
+  pname = "Keras";
+  version = "1.2.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bby93sffjadrxnx9j9nn2lq0ygsgqjp16260c6lz77b6r1qrcfj";
+  };
+
+  checkInputs = [
+    pytest
+    pytestcov
+    pytestpep8
+    pytest_xdist
+  ];
+
+  propagatedBuildInputs = [
+    six Theano pyyaml
+  ];
+
+  # Couldn't get tests working
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Deep Learning library for Theano and TensorFlow";
+    homepage = "https://keras.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ NikolaMandic ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b4e8a3443dd..f7084938b965 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31100,27 +31100,7 @@ EOF
     };
   };
 
-  Keras = buildPythonPackage rec {
-    name = "Keras-${version}";
-    version = "1.0.3";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/keras/${name}.tar.gz";
-      sha256 = "0wi826bvifvy12w490ghj1g45z5xb83q2cadqh425sg56p98khaq";
-    };
-
-    propagatedBuildInputs = with self; [
-      six Theano pyyaml
-    ];
-
-    meta = {
-      description = "Deep Learning library for Theano and TensorFlow";
-      homepage = "https://keras.io";
-      license = licenses.mit;
-      maintainers = with maintainers; [ NikolaMandic ];
-    };
-  };
+  Keras = callPackage ../development/python-modules/keras { };
 
   Lasagne = buildPythonPackage rec {
     name = "Lasagne-${version}";

From 4ebfc1933563943711e1e4326c964faf30c332be Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Mon, 13 Feb 2017 19:36:12 +0100
Subject: [PATCH 0435/3449] keepalived: 1.2.19 -> 1.3.2

---
 pkgs/tools/networking/keepalived/default.nix | 38 +++++++++-----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix
index c579d12b6bd4..1f5a6216e7b5 100644
--- a/pkgs/tools/networking/keepalived/default.nix
+++ b/pkgs/tools/networking/keepalived/default.nix
@@ -1,33 +1,29 @@
-{ stdenv, fetchurl, openssl, net_snmp, libnl }:
+{ stdenv, fetchFromGitHub, libnfnetlink, libnl, net_snmp, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "keepalived-1.2.19";
+  name = "keepalived-${version}";
+  version = "1.3.2";
 
-  src = fetchurl {
-    url = "http://keepalived.org/software/${name}.tar.gz";
-    sha256 = "0lrq963pxhgh74qmxjyy5hvxdfpm4r50v4vsrp559n0w5irsxyrj";
+  src = fetchFromGitHub {
+    owner = "acassen";
+    repo = "keepalived";
+    rev = "v${version}";
+    sha256 = "1mfw8116b7j8y37l382v154yssm635kbm72f4x8303g5zwg6n6qx";
   };
 
-  buildInputs = [ openssl net_snmp libnl ];
+  buildInputs = [
+    libnfnetlink
+    libnl
+    net_snmp
+    openssl
+  ];
 
-  postPatch = ''
-    sed -i 's,$(DESTDIR)/usr/share,$out/share,g' Makefile.in
-  '';
-
-  # It doesn't know about the include/libnl<n> directory
-  NIX_CFLAGS_COMPILE="-I${libnl.dev}/include/libnl3";
-  NIX_LDFLAGS="-lnl-3 -lnl-genl-3";
+  nativeBuildInputs = [ pkgconfig ];
 
   configureFlags = [
-    "--sysconfdir=/etc"
-    "--localstatedir=/var"
-    "--enable-snmp"
     "--enable-sha1"
-  ];
-
-  installFlags = [
-    "sysconfdir=\${out}/etc"
-  ];
+    "--enable-snmp"
+ ];
 
   meta = with stdenv.lib; {
     homepage = http://keepalived.org;

From 91d0260feba50b25b13d1e0dd2705039f75e09a2 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Feb 2017 13:22:48 +0100
Subject: [PATCH 0436/3449] modules/filesystems: disallow non-empty fstab
 fields (#22803)

It was possible to pass empty strings / strings with only separator characters;
this lead to broken fstab formatting.
---
 nixos/modules/tasks/filesystems.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 8bd35385739e..8a4299113f2b 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -5,6 +5,11 @@ with utils;
 
 let
 
+  addCheckDesc = desc: elemType: check: types.addCheck elemType check
+    // { description = "${elemType.description} (with check: ${desc})"; };
+  nonEmptyStr = addCheckDesc "non-empty" types.str
+    (x: x != "" && ! (all (c: c == " " || c == "\t") (stringToCharacters x)));
+
   fileSystems' = toposort fsBefore (attrValues config.fileSystems);
 
   fileSystems = if fileSystems' ? "result"
@@ -26,21 +31,21 @@ let
 
       mountPoint = mkOption {
         example = "/mnt/usb";
-        type = types.str;
+        type = nonEmptyStr;
         description = "Location of the mounted the file system.";
       };
 
       device = mkOption {
         default = null;
         example = "/dev/sda";
-        type = types.nullOr types.str;
+        type = types.nullOr nonEmptyStr;
         description = "Location of the device.";
       };
 
       fsType = mkOption {
         default = "auto";
         example = "ext3";
-        type = types.str;
+        type = nonEmptyStr;
         description = "Type of the file system.";
       };
 
@@ -48,7 +53,7 @@ let
         default = [ "defaults" ];
         example = [ "data=journal" ];
         description = "Options used to mount the file system.";
-        type = types.listOf types.str;
+        type = types.listOf nonEmptyStr;
       };
 
     };
@@ -67,7 +72,7 @@ let
       label = mkOption {
         default = null;
         example = "root-partition";
-        type = types.nullOr types.str;
+        type = types.nullOr nonEmptyStr;
         description = "Label of the device (if any).";
       };
 

From 87650525ce2027698fae192eefd952c84ad98376 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 13:31:02 +0100
Subject: [PATCH 0437/3449] bean-add: 2016-12-02 -> 2017-01-20

---
 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 4e73a305ea46..7535b6abf3c7 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-2016-12-02";
+  name = "bean-add-2017-01-20";
 
   src = fetchFromGitHub {
     owner = "simon-v";
     repo = "bean-add";
-    rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9";
-    sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09";
+    rev = "752674259fb9512e076ef2048927fb791ad21507";
+    sha256 = "1ja26dgl2j25873s5nav57pjaqb9rr3mdbmkawajz2gdkk9r7n61";
   };
 
   propagatedBuildInputs = with python3Packages; [ python ];

From 1017489b9691792bc338793a66612f8a896eebd1 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 13:33:43 +0100
Subject: [PATCH 0438/3449] buku: 2.7 -> 2.8

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

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index a0414786ba42..85d8180983e8 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -2,14 +2,14 @@
 }:
 
 with pythonPackages; buildPythonApplication rec {
-  version = "2.7";
+  version = "2.8";
   name = "buku-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "buku";
     rev = "v${version}";
-    sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk";
+    sha256 = "1gazvij0072lca0jh84i8mhnaxiwg56hcxmrmk2clxd2x213zyjm";
   };
 
   buildInputs = [

From f370cbbfdf996d67fcda2f9291d320672e5d13b6 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 13:43:19 +0100
Subject: [PATCH 0439/3449] hstr: 1.19 -> 1.22

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

diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index e2290ac01e85..78f3c2f391b9 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline, ncurses }:
 
 let
-  version = "1.19";
+  version = "1.22";
 in
 stdenv.mkDerivation rec {
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "0ix6550l9si29j8vz375vzjmp22i19ik5dq2nh7zsj2ra7ibaz5n";
+    sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp";
   };
 
   buildInputs = [ readline ncurses ];

From 83d09a333667fb379c5180b8dca12125b8f762df Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 13:45:58 +0100
Subject: [PATCH 0440/3449] http-prompt: 0.8.0 -> 0.9.1

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

diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 55ba6b9db558..6f2ca8fc5bab 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pythonPackages, httpie }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.8.0";
+  version = "0.9.1";
   name = "http-prompt";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     repo = "http-prompt";
     owner = "eliangcs";
-    sha256 = "0zvkmdc6mhc5kk7cbrgzxsl8n2d02gnxy1sppm83mhwx6s1dkz30";
+    sha256 = "0s2syjjz5n7256a4hn8gv3xfr0zd3qqimf4w8l188dbfvx8b8s06";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 7620ea63b9eacf865271b5842560ec871f84c316 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 13:51:05 +0100
Subject: [PATCH 0441/3449] khal: 0.8.4 -> 0.9.2

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

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 0e93418255e8..8d7eeffad310 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -3,13 +3,12 @@
 with python3Packages;
 
 buildPythonApplication rec {
-  # Reenable tests for 0.9.0, they are broken at the moment: #15981
-  version = "0.8.4";
+  version = "0.9.2";
   name = "khal-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/k/khal/khal-${version}.tar.gz";
-    sha256 = "03vy4dp9n43w51mwqjjy08dr5nj7wxqnb085visz3j43vzm42p1f";
+    sha256 = "1ryh5c7408w8gpql5s9mkxkvz1ngnds3xm43p7r96ynx8prr9swp";
   };
 
   LC_ALL = "en_US.UTF-8";

From 3de22bb760e5ac3d5e93fb648e56fea25e809b59 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 13:55:27 +0100
Subject: [PATCH 0442/3449] khard: 0.11.1 -> 0.11.3

From the README of khard:

    # vobject version is pinned to 0.9.2 for now because of bug
    # https://github.com/eventable/vobject/issues/39

This is why we explicitely pin the dependency "vobject" via a new python
package in the expression here.
---
 pkgs/applications/misc/khard/default.nix | 32 +++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 2a6329b48d76..da6dece237ed 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,39 @@
-{ stdenv, fetchurl, glibcLocales, python3Packages }:
+{ stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }:
 
+let
+  vobject = python3Packages.buildPythonPackage rec {
+    version = "0.9.2";
+    name = "vobject-${version}";
+
+    src = fetchFromGitHub {
+      owner = "eventable";
+      repo = "vobject";
+      sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g";
+      rev = version;
+    };
+
+    disabled = python3Packages.isPyPy;
+
+    propagatedBuildInputs = with python3Packages; [ dateutil ];
+
+    checkPhase = "${python3Packages.python.interpreter} tests.py";
+
+    meta = with stdenv.lib; {
+      description = "Module for reading vCard and vCalendar files";
+      homepage = http://eventable.github.io/vobject/;
+      license = licenses.asl20;
+      maintainers = [ maintainers.matthiasbeyer ];
+    };
+  };
+in
 python3Packages.buildPythonApplication rec {
-  version = "0.11.1";
+  version = "0.11.3";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "0055xx9icmsr6l7v0iqrndmygygdpdv10550w6pyrb96svzhry27";
+    sha256 = "0brnwg7f1qnz83q5d6bl2260wykgjhhrpcxxhr2r9gj66q5hdd69";
   };
 
   # setup.py reads the UTF-8 encoded readme.

From bf86a268dfd6b3d72b3b3d66ae7e1970719c8cfa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 15 Feb 2017 21:00:49 +0800
Subject: [PATCH 0443/3449] gtk-vnc: 0.6.0 -> 0.7.0

---
 pkgs/tools/admin/gtk-vnc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index b6185631551a..da269049b2ca 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -8,11 +8,11 @@ let
   inherit (pythonPackages) pygobject3 python;
 in stdenv.mkDerivation rec {
   name = "gtk-vnc-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz";
-    sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433";
+    url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz";
+    sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw";
   };
 
   buildInputs = [

From f9d7d29fa939eeba39d5aa497b9703e60a016eab Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 14:18:53 +0100
Subject: [PATCH 0444/3449] sqlitebrowser: 3.8.0 -> 3.9.1

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

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 338f3323d947..8290b57d41ba 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, qt4, sqlite, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "3.8.0";
+  version = "3.9.1";
   name = "sqlitebrowser-${version}";
 
   src = fetchFromGitHub {
     repo   = "sqlitebrowser";
     owner  = "sqlitebrowser";
     rev    = "v${version}";
-    sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp";
+    sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150";
   };
 
   buildInputs = [ qt4 sqlite cmake ];

From 64627751930aa8fe84f4a299c6a0b5067bcf6d72 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 15 Feb 2017 14:58:19 +0100
Subject: [PATCH 0445/3449] girara: 0.2.6 -> 0.2.7

---
 pkgs/applications/misc/girara/default.nix | 26 +++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 47e301757958..860068c5667a 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -1,29 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gettext, withBuildColors ? true, ncurses ? null}:
+{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses
+, withBuildColors ? true
+}:
 
 assert withBuildColors -> ncurses != null;
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchurl {
-    url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "03wsxj27hvcbs3x96nah7j3paclifwlfag8kdph4kldl48srp9pb";
+    url    = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
+    sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq";
   };
 
   preConfigure = ''
-    sed -i 's/ifdef TPUT_AVAILABLE/ifneq ($(TPUT_AVAILABLE), 0)/' colors.mk
+    substituteInPlace colors.mk \
+      --replace 'ifdef TPUT_AVAILABLE' 'ifneq ($(TPUT_AVAILABLE), 0)'
   '';
 
   buildInputs = [ pkgconfig gtk gettext ];
 
-  makeFlags = [ "PREFIX=$(out)" ]
-    ++ optional withBuildColors "TPUT=${ncurses.out}/bin/tput"
-    ++ optional (!withBuildColors) "TPUT_AVAILABLE=0"
-    ;
+  makeFlags = [
+    "PREFIX=$(out)"
+    (if withBuildColors
+      then "TPUT=${ncurses.out}/bin/tput"
+      else "TPUT_AVAILABLE=0")
+  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pwmt.org/projects/girara/;
     description = "User interface library";
     longDescription = ''

From c731738ecc132f450bc1cb0eaad7c1fa232fa299 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Feb 2017 15:08:20 +0100
Subject: [PATCH 0446/3449] graphviz_2_0: hide inside monotoneViz

The old Graphviz version is vulnerable, but monotone-viz will never feed
it bad input.
---
 .../version-management/monotone-viz/default.nix        | 10 +++++++++-
 .../version-management/monotone-viz/graphviz-2.0.nix}  |  0
 pkgs/top-level/all-packages.nix                        |  6 ------
 3 files changed, 9 insertions(+), 7 deletions(-)
 rename pkgs/{tools/graphics/graphviz/2.0.nix => applications/version-management/monotone-viz/graphviz-2.0.nix} (100%)

diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 154d6442a2f2..255192a91282 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -1,4 +1,12 @@
-{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}:
+{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, makeWrapper
+, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
+}:
+# We need an old version of Graphviz for format compatibility reasons.
+# This version is vulnerable, but monotone-viz will never feed it bad input.
+let graphviz_2_0 = import ./graphviz-2.0.nix {
+      inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
+        yacc libtool fontconfig pango gd libwebp;
+    }; in
 stdenv.mkDerivation rec {
   version = "1.0.2";
   name = "monotone-viz-${version}";
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
similarity index 100%
rename from pkgs/tools/graphics/graphviz/2.0.nix
rename to pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ba672c477d7..bd1fd4e823a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2013,12 +2013,6 @@ with pkgs;
     libdevil = libdevil-nox;
   };
 
-  /* Readded by Michael Raskin. There are programs in the wild
-   * that do want 2.0 but not 2.22. Please give a day's notice for
-   * objections before removal. The feature is integer coordinates
-   */
-  graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { };
-
   /* Readded by Michael Raskin. There are programs in the wild
    * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for
    * objections before removal. The feature is libgraph.

From ac9222f03bbd77fa0c5cc8c7ed7c7c7ff8946ebc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 15 Feb 2017 09:09:42 -0500
Subject: [PATCH 0447/3449] gnome3.gnome-boxes: 3.22.0 -> 3.22.4

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

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 edb0075fdae5..a9bb4514a3a2 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
@@ -3,7 +3,7 @@
 , 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
+, libusb, libarchive, acl, libgudev, qemu, libsecret
 }:
 
 # TODO: ovirt (optional)
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     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
+    librsvg desktop_file_utils acl libgudev numactl xen libsecret
   ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
index 7fa6fbf9da6b..ff43d41c53ab 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-boxes-3.22.0";
+  name = "gnome-boxes-3.22.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.0.tar.xz;
-    sha256 = "9f02e3032f8b6aaa77d9eab6aabe7fc09902be429e266ad9fd4185b94ac867ee";
+    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;
+    sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";
   };
 }

From b96a2fdd1b4ccec7839c75cd150530cf2cfc3897 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 15 Feb 2017 14:21:52 +0100
Subject: [PATCH 0448/3449] vdirsyncer: 0.14.0 -> 0.14.1

---
 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 e32e58fcded7..a5abc8bef831 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.0";
+  version = "0.14.1";
   name = "vdirsyncer-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "1mbh2gykx9sqsnyfa962ifxksx4afl2lb9rcsbd6rsh3gj2il898";
+    sha256 = "044f01fjd8dpz4y9dm3qcc1a8cihcxxbr1sz6y6fkvglpb6k85y5";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 13a1d38f55829f10db31198ea1923d5168a3043c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Feb 2017 15:28:13 +0100
Subject: [PATCH 0449/3449] irssi: 1.0.0 -> 1.0.1

---
 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 88e2ede631b9..d46539a88b7d 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.0";
+  version = "1.0.1";
   name = "irssi-${version}";
 
   src = fetchurl {
     url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz";
-    sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr";
+    sha256 = "1nqrm376bipvh4x483vygydjzs05n4fmfzip1gfakq1vfqqfhshr";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 21cdf340dbdc6ba5dca4e9dc1532b17d251e77ba Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Feb 2017 15:40:31 +0100
Subject: [PATCH 0450/3449] pythonPackages: use a more direct mirror (#22833)

The pypi.io domain is redirected two (!) times and lands on the URL added by
this commit.
---
 pkgs/build-support/fetchurl/mirrors.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index e3759fe49cd8..7071fa18c231 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -387,6 +387,9 @@ rec {
 
   # Python PyPI mirrors
   pypi = [
+    https://files.pythonhosted.org/packages/source/
+    # pypi.io is a more semantic link, but atm it’s referencing
+    # files.pythonhosted.org over two redirects
     https://pypi.io/packages/source/
   ];
 

From 806683545412f9e2f789a9cef9d358d3edd42c7a Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 15 Feb 2017 15:01:40 +0100
Subject: [PATCH 0451/3449] zathura: 0.3.6 -> 0.3.7

---
 .../misc/zathura/core/default.nix             | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 4995c425699c..a646cd10b6df 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,22 +1,28 @@
-{ stdenv, lib, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils
-, file, makeWrapper, sqlite, glib
-, synctexSupport ? true, texlive ? null }:
+{ stdenv, fetchurl, makeWrapper, pkgconfig
+, gtk, girara, ncurses, gettext, docutils
+, file, sqlite, glib, texlive
+, synctexSupport ? true
+}:
 
 assert synctexSupport -> texlive != null;
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  version = "0.3.6";
-  name = "zathura-core-${version}";
+  name    = "zathura-core-${version}";
+  version = "0.3.7";
 
   src = fetchurl {
-    url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "0fyb5hak0knqvg90rmdavwcmilhnrwgg1s5ykx9wd3skbpi8nsh8";
+    url    = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
+    sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2";
   };
 
   icon = ./icon.xpm;
 
-  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib
-  ] ++ lib.optional synctexSupport texlive.bin.core;
+  buildInputs = [
+    pkgconfig file gtk girara
+    gettext makeWrapper sqlite glib
+  ] ++ optional synctexSupport texlive.bin.core;
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
 
@@ -25,11 +31,12 @@ stdenv.mkDerivation rec {
     "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
     "TPUT=${ncurses.out}/bin/tput"
-  ] ++ lib.optional synctexSupport "WITH_SYNCTEX=1";
+    (optionalString synctexSupport "WITH_SYNCTEX=1")
+  ];
 
   postInstall = ''
     wrapProgram "$out/bin/zathura" \
-      --prefix PATH ":" "${lib.makeBinPath [ file ]}" \
+      --prefix PATH ":" "${makeBinPath [ file ]}" \
       --prefix XDG_CONFIG_DIRS ":" "$out/etc"
 
     install -Dm644 $icon $out/share/pixmaps/pwmt.xpm
@@ -38,11 +45,11 @@ stdenv.mkDerivation rec {
     echo "Icon=pwmt" >> $out/share/applications/zathura.desktop
   '';
 
-  meta = with stdenv.lib; {
-    homepage = http://pwmt.org/projects/zathura/;
+  meta = {
+    homepage    = http://pwmt.org/projects/zathura/;
     description = "A core component for zathura PDF viewer";
-    license = licenses.zlib;
-    platforms = platforms.linux;
+    license     = licenses.zlib;
+    platforms   = platforms.linux;
     maintainers = with maintainers; [ garbas ];
   };
 }

From d6fdba7f454c7206c84f494b1af9ae215934a932 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Feb 2017 15:44:30 +0100
Subject: [PATCH 0452/3449] haskellPackages: data-pprint jailbreak

---
 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 81eff1d42507..5d542728bba8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -869,6 +869,9 @@ self: super: {
   # note: the library is unmaintained, no upstream issue
   dataenc = doJailbreak super.dataenc;
 
+  # https://github.com/divipp/ActiveHs-misc/issues/10
+  data-pprint = doJailbreak super.data-pprint;
+
   # horribly outdated (X11 interface changed a lot)
   sindre = markBroken super.sindre;
 

From 8a928708b41f90b68cb76b7448a1b5e39ebd82b7 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 14 Feb 2017 16:17:40 +0100
Subject: [PATCH 0453/3449] haskell: add support for Haskell Program Coverage
 (HPC) to the generic builder

A function is added to enable the generation of a HPC report. For example:

  pkgs.haskell.lib.doCoverage drv

will create a HPC report of the Haskell package drv in the directory:

  $out/share/hpc

Closes https://github.com/NixOS/nixpkgs/pull/22797/files.
---
 pkgs/development/haskell-modules/generic-builder.nix | 8 +++++---
 pkgs/development/haskell-modules/lib.nix             | 3 +++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 09ab30bb1761..1998b090687d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -32,6 +32,7 @@
 , jailbreak ? false
 , license
 , maintainers ? []
+, doCoverage ? false
 # TODO Do we care about haddock when cross-compiling?
 , doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
 , passthru ? {}
@@ -59,7 +60,7 @@ assert enableSplitObjs == null;
 
 let
 
-  inherit (stdenv.lib) optional optionals optionalString versionOlder
+  inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast
                        concatStringsSep enableFeature optionalAttrs toUpper;
 
   isGhcjs = ghc.isGhcjs or false;
@@ -111,10 +112,11 @@ let
     (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
     (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
-    (enableFeature (enableDeadCodeElimination && (stdenv.lib.versionAtLeast "8.0.1" ghc.version)) "split-objs")
+    (enableFeature (enableDeadCodeElimination && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
     (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
     (enableFeature enableSharedLibraries "shared")
+    (optionalString (versionAtLeast ghc.version "7.10") (enableFeature doCoverage "coverage"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla"))
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
@@ -286,7 +288,7 @@ stdenv.mkDerivation ({
       local pkgId=$( ${gnused}/bin/sed -n -e 's|^id: ||p' $packageConfFile )
       mv $packageConfFile $packageConfDir/$pkgId.conf
     ''}
-
+    ${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
         install_name_tool -add_rpath "$out/lib/ghc-${ghc.version}/${pname}-${version}" "$exe"
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index f7c9811234ec..cc9daf336b02 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -8,6 +8,9 @@ rec {
     overrideScope = scope: overrideCabal (drv.overrideScope scope) f;
   };
 
+  doCoverage = drv: overrideCabal drv (drv: { doCoverage = true; });
+  dontCoverage = drv: overrideCabal drv (drv: { doCoverage = false; });
+
   doHaddock = drv: overrideCabal drv (drv: { doHaddock = true; });
   dontHaddock = drv: overrideCabal drv (drv: { doHaddock = false; });
 

From 8978a9ee4819024778b609b79de4f5f0c439487f Mon Sep 17 00:00:00 2001
From: Jaanus Torp <jaanus@saun.ee>
Date: Wed, 15 Feb 2017 15:28:01 +0000
Subject: [PATCH 0454/3449] sway: 0.9 -> 0.11 (#22835)

---
 pkgs/applications/window-managers/sway/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index df4a33fbd461..79077b477b44 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, pango, libinput
 , makeWrapper, cmake, pkgconfig, asciidoc, libxslt, docbook_xsl, cairo
-, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs
+, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, dbus_libs, libcap
 }:
 
 let
-  version = "0.9";
+  version = "0.11";
 in
   stdenv.mkDerivation rec {
     name = "sway-${version}";
@@ -13,12 +13,12 @@ in
       owner = "Sircmpwn";
       repo = "sway";
       rev = "${version}";
-      sha256 = "0qqqg23rknxnjcgvkfrx3pijqc3dvi74qmmavq07vy2qfs1xlwg0";
+      sha256 = "01k01f72kh90fwgqh2hgg6dv9931x4v18bzz11b47mn7p9z68ddv";
     };
 
     nativeBuildInputs = [ makeWrapper cmake pkgconfig asciidoc libxslt docbook_xsl ];
 
-    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput ];
+    buildInputs = [ wayland wlc libxkbcommon pixman fontconfig pcre json_c dbus_libs pango cairo libinput libcap ];
 
     patchPhase = ''
       sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;

From 0ed06bcce7f48aa42d1c8dbc633b9f8195ac132e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= <k.soeholm@gmail.com>
Date: Wed, 15 Feb 2017 16:28:23 +0100
Subject: [PATCH 0455/3449] pypandoc: 1.2.0 (broken) -> 1.3.3 (#22782)

---
 lib/maintainers.nix                |  1 +
 pkgs/top-level/python-packages.nix | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 6e53114354cf..167a231af8b9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -249,6 +249,7 @@
   koral = "Koral <koral@mailoo.org>";
   kovirobi = "Kovacsics Robert <kovirobi@gmail.com>";
   kragniz = "Louis Taylor <louis@kragniz.eu>";
+  kristoff3r = "Kristoffer Søholm <k.soeholm@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lassulus = "Lassulus <lassulus@gmail.com>";
   layus = "Guillaume Maudoux <layus.on@gmail.com>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7084938b965..4e67f33bde50 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31916,18 +31916,28 @@ EOF
   };
 
   pypandoc = buildPythonPackage rec {
-    name = "pypandoc-1.2.0";
+    name = "pypandoc-1.3.3";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pypandoc/${name}.zip";
-      sha256 = "1sxmgrpy0a0yy3nyxiymzqrw715gm23s01fq53q4vgn79j47jakm";
+      url = "mirror://pypi/p/pypandoc/${name}.tar.gz";
+      sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
     };
+
+    # Fix tests: first requires network access, second is a bug (reported upstream)
+    preConfigure = ''
+      substituteInPlace tests.py --replace "pypandoc.convert(url, 'html')" "'GPL2 license'"
+      substituteInPlace tests.py --replace "pypandoc.convert_file(file_name, lua_file_name)" "'<h1 id=\"title\">title</h1>'"
+    '';
+
+    LC_ALL="en_US.UTF-8";
+
     propagatedBuildInputs = with self; [ self.pip ];
-    buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc ];
+    buildInputs = [ pkgs.pandoc pkgs.texlive.combined.scheme-small pkgs.haskellPackages.pandoc-citeproc pkgs.glibcLocales ];
+
     meta = with pkgs.stdenv.lib; {
       description = "Thin wrapper for pandoc";
       homepage = "https://github.com/bebraw/pypandoc";
       license = licenses.mit;
-      maintainers = with maintainers; [ bennofs ];
+      maintainers = with maintainers; [ bennofs kristoff3r ];
     };
   };
 

From 2ce7dd7fbbbb84b86e72131fa616ba4f6a8e5927 Mon Sep 17 00:00:00 2001
From: Aycan iRiCAN <iricanaycan@gmail.com>
Date: Wed, 15 Feb 2017 18:33:01 +0300
Subject: [PATCH 0456/3449] emacs: fix sha256 hashes of savannah patches

---
 pkgs/applications/editors/emacs/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index d5ca5e394423..fbf8895f971f 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -40,19 +40,19 @@ stdenv.mkDerivation rec {
     ## https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24358
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=9afea93ed536fb9110ac62b413604cf4c4302199;
-      sha256 = "1iifyfqh7qfdfsrpqgz2l7z0l7alvma57jlklyq258qyjg0pc8n4"; })
+      sha256 = "0pshhq8wlh98m9hm8xd3g7gy3ms0l44dq6vgzkg67ydlccziqz40"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=71ca4f6a43bad06192cbc4bb8c7a2d69c179b7b0;
-      sha256 = "0vadqvcigca0j891yis1mhjn18rg4l9qj621q6vzip46ka6qig0d"; })
+      sha256 = "0h76wrrqyrky441immprskx5x7200zl7ajf7hyg4da22q7sr09qa"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=1047496722a58ef5b736dae64d32adeb58c5055c;
-      sha256 = "01lfa89qw7y0spcy57hm1ymijb57i6kvhb9z9impcxwza60lbi7b"; })
+      sha256 = "0hk9pi3f2zj266qj8armzpl0z8rfjg0m9ss4k09mgg1hyz80wdvv"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=96ac0c3ebce825e60595794f99e703ec8302e240;
-      sha256 = "0bmkrm356fbwc8wsiqh2w706mq5r9q4ic4m8vzdj099ihnf121nn"; })
+      sha256 = "1q2hqkjvj9z46b5ik56lv9wiibz09mvg2q3pn8fnpa04ki3zbh4x"; })
     (fetchurl {
       url = http://git.savannah.gnu.org/cgit/emacs.git/patch/?id=43986d16fb6ad78a627250e14570ea70bdb1f23a;
-      sha256 = "0kp8dgs7fjgvidhm2y84jrxad78mxi0c47jhyszj5644qqxm47cr";
+      sha256 = "1wlyy04qahvls7bdrcxaazh9k27gksk7if1q58h83f7h6g9xxkzj";
     })
   ];
 

From be1c04e225c04c4fced1b7ee10f702c2e6499cbe Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 21 Oct 2016 05:35:31 +0200
Subject: [PATCH 0457/3449] Revert "gnome-session: enable debug"

Enough debugging.

This reverts commit 8ec776eb73ae772da60bd01b172789835dfb3cd5.
---
 pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
index 2f4aefe69a8e..8dec630354ce 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     for desktopFile in $(grep -rl "Exec=gnome-session" $out/share)
     do
       echo "Patching gnome-session path in: $desktopFile"
-      sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session --debug," $desktopFile
+      sed -i "s,^Exec=gnome-session,Exec=$out/bin/gnome-session," $desktopFile
     done
     wrapProgram "$out/bin/gnome-session" \
       --prefix PATH : "${glib.dev}/bin" \

From aba35a5c2df62876c4835c551ef315c245055088 Mon Sep 17 00:00:00 2001
From: Ross MacLeod <Dridus@users.noreply.github.com>
Date: Wed, 15 Feb 2017 12:02:22 -0500
Subject: [PATCH 0458/3449] python2.7-future: #22590 remove platform
 restriction (#22837)

Per #22590, `haskellPackages.servant` and by extension any package which transitively depends on `pythonX.Y-future` will fail to build on darwin even though there's apparently no reason why it can't be built there.
---
 pkgs/top-level/python-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e67f33bde50..6567158c185c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11912,7 +11912,6 @@ in {
       downloadPage = https://github.com/PythonCharmers/python-future/releases;
       license = licenses.mit;
       maintainers = with maintainers; [ prikhi ];
-      platforms = platforms.linux;
     };
   };
 

From 6d8235210d34a914e55589f056626561c6eb1eaf Mon Sep 17 00:00:00 2001
From: Ilya Kolpakov <ilya.kolpakov@gmail.com>
Date: Wed, 15 Feb 2017 18:29:39 +0100
Subject: [PATCH 0459/3449] boost: 1.63.0 (not default)

---
 pkgs/development/libraries/boost/1.63.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/libraries/boost/1.63.nix

diff --git a/pkgs/development/libraries/boost/1.63.nix b/pkgs/development/libraries/boost/1.63.nix
new file mode 100644
index 000000000000..c4749bc3ee41
--- /dev/null
+++ b/pkgs/development/libraries/boost/1.63.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.63.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/boost/boost_1_63_0.tar.bz2";
+    # SHA256 from http://www.boost.org/users/history/version_1_63_0.html
+    sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0";
+  };
+
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd1fd4e823a7..3c01d071a690 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6919,6 +6919,7 @@ with pkgs;
   boost159 = callPackage ../development/libraries/boost/1.59.nix { };
   boost160 = callPackage ../development/libraries/boost/1.60.nix { };
   boost162 = callPackage ../development/libraries/boost/1.62.nix { };
+  boost163 = callPackage ../development/libraries/boost/1.63.nix { };
   boost = boost162;
 
   boost_process = callPackage ../development/libraries/boost-process { };

From ce0a52f9bfd5bdc5e2e0ed09ee1abaa9b088638e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 15 Feb 2017 19:51:12 +0100
Subject: [PATCH 0460/3449] nixos/security.wrappers: improve documentation

* The source attribute is mandatory, not optional
* The program attribute is optional
* Move the info about the mandatory attribute first (most important,
  IMHO)
---
 nixos/modules/security/wrappers/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 98913a974fc9..861ce225257d 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -116,16 +116,18 @@ in
         default (setuid root, but not setgid root).
 
         <note>
+          <para>The sub-attribute <literal>source</literal> is mandatory,
+          it must be the absolute path to the program to be wrapped.
+          </para>
+
+          <para>The sub-attribute <literal>program</literal> is optional and
+          can give the wrapper program a new name. The default name is the same
+          as the attribute name itself.</para>
+
           <para>Additionally, this option can set capabilities on a
           wrapper program that propagates those capabilities down to the
           wrapped, real program.</para>
 
-          <para>The <literal>program</literal> attribute is the name of
-          the program to be wrapped. If no <literal>source</literal>
-          attribute is provided, specifying the absolute path to the
-          program, then the program will be searched for in the path
-          environment variable.</para>
-
           <para>NOTE: cap_setpcap, which is required for the wrapper
           program to be able to raise caps into the Ambient set is NOT
           raised to the Ambient set so that the real program cannot

From 2640c87fb9da376dd1a8a1fc44e99fd20188f327 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 15 Feb 2017 17:22:11 +0100
Subject: [PATCH 0461/3449] webkitgtk: 2.14.4 -> 2.14.5

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

diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix
index cb490c801b69..99a41ec0c185 100644
--- a/pkgs/development/libraries/webkitgtk/2.14.nix
+++ b/pkgs/development/libraries/webkitgtk/2.14.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.14.4";
+  version = "2.14.5";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1b73rcyfqjyg5rqw6f4760b2h1kixwva88clp2wl9vnl3psjvbni";
+    sha256 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w";
   };
 
   # see if we can clean this up....

From 54e3fad0f4376f7f92f0f4d89e0cc429784475b6 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 15 Feb 2017 20:25:02 +0100
Subject: [PATCH 0462/3449] webkitgtk212x: remove

2.12 isn't maintained anymore and superseded by the (compatible) 2.14
---
 pkgs/development/libraries/webkitgtk/2.12.nix | 57 -------------------
 pkgs/top-level/all-packages.nix               |  5 --
 2 files changed, 62 deletions(-)
 delete mode 100644 pkgs/development/libraries/webkitgtk/2.12.nix

diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix
deleted file mode 100644
index 04ab4d967737..000000000000
--- a/pkgs/development/libraries/webkitgtk/2.12.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
-, pkgconfig, gettext, gobjectIntrospection, libnotify
-, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
-, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
-, enableGeoLocation ? true, geoclue2, sqlite
-, gst-plugins-base
-}:
-
-assert enableGeoLocation -> geoclue2 != null;
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "webkitgtk-${version}";
-  version = "2.12.5";
-
-  meta = {
-    description = "Web content rendering engine, GTK+ port";
-    homepage = "http://webkitgtk.org/";
-    license = licenses.bsd2;
-    platforms = platforms.linux;
-    hydraPlatforms = [];
-    maintainers = with maintainers; [ koral ];
-  };
-
-  preConfigure = "patchShebangs Tools";
-
-  src = fetchurl {
-    url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0h0wig413399wws6l88mn1nnjbqb42vb55yvz8az39b4p1a7h53b";
-  };
-
-  patches = [ ./finding-harfbuzz-icu.patch ];
-
-  cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
-
-  # 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";
-
-  nativeBuildInputs = [
-    cmake perl python2 ruby bison gperf sqlite
-    pkgconfig gettext gobjectIntrospection
-  ];
-
-  buildInputs = [
-    gtk2 wayland libwebp enchant libnotify
-    libxml2 libsecret libxslt harfbuzz libpthreadstubs
-    gst-plugins-base libxkbcommon epoxy at_spi2_core
-  ] ++ optional enableGeoLocation geoclue2
-    ++ (with xlibs; [ libXdmcp libXt libXtst ]);
-
-  propagatedBuildInputs = [
-    libsoup gtk3
-  ];
-
-  enableParallelBuilding = true;
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd1fd4e823a7..225e6d3dd2b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9836,11 +9836,6 @@ with pkgs;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
-  webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {
-    harfbuzz = harfbuzz-icu;
-    gst-plugins-base = gst_all_1.gst-plugins-base;
-  };
-
   webkitgtk2 = webkitgtk24x.override {
     withGtk2 = true;
     enableIntrospection = false;

From 09695699027efb35f3f560725e8ef93509d5929f Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 15 Feb 2017 20:53:37 +0100
Subject: [PATCH 0463/3449] eclipse-plugin-yedit: init at 1.0.20.201509041456

---
 pkgs/applications/editors/eclipse/plugins.nix | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 46b81cb0a545..fddd9e4920b3 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -424,6 +424,29 @@ rec {
     };
   };
 
+  yedit = buildEclipsePlugin rec {
+    name = "yedit-${version}";
+    version = "1.0.20.201509041456";
+
+    srcFeature = fetchurl {
+      url = "http://dadacoalition.org/yedit/features/org.dadacoalition.yedit.feature_${version}-RELEASE.jar";
+      sha256 = "0rps73y19gwlrdr8jjrg3rhcaaagghnmri8297inxc5q2dvg0mlk";
+    };
+
+    srcPlugin = fetchurl {
+      url = "http://dadacoalition.org/yedit/plugins/org.dadacoalition.yedit_${version}-RELEASE.jar";
+      sha256 = "1wpyw4z28ka60z36f8m71kz1giajcm26wb9bpv18sjiqwdgx9v0z";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/oyse/yedit;
+      description = "A YAML editor plugin for Eclipse";
+      license = licenses.epl10;
+      platforms = platforms.all;
+      maintainers = [ maintainers.rycee ];
+    };
+  };
+
   zest = buildEclipseUpdateSite rec {
     name = "zest-${version}";
     version = "3.9.101";

From d2d12c2f4cab4cb3b4cbfd42ac716997893a446a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 15 Feb 2017 21:00:59 +0100
Subject: [PATCH 0464/3449] vim: 8.0.0075 -> 8.0.0329

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

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 39975c3dc69d..0412d1d2d6c6 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.0075";
+  version = "8.0.0329";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1imhvrd90f797jlbzvx8sc08h53s55ns6jxy1kl5kh8lz1qq455w";
+    sha256 = "0dcvj2la5g6s87mx3vm96jk904xfmqbwi0jyds9bd3qgbpnn80r1";
   };
 
   enableParallelBuilding = true;

From 7832806e205493482b349c0a53dbc3e4b1412456 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 15 Feb 2017 21:06:27 +0100
Subject: [PATCH 0465/3449] fontconfig: fixup fragile build after ab5fe171a

Sometimes it might fail due to timestamps suggesting some files needed
regenerating and failing to find gperf.  Now it should be OK, I hope.
---
 pkgs/development/libraries/fontconfig/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 58ca7c41891a..14983b744df9 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -34,9 +34,10 @@ stdenv.mkDerivation rec {
       sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
     })
   ];
-  # additionally required for the glibc-2.25 patch
+  # additionally required for the glibc-2.25 patch; avoid requiring gperf
   postPatch = ''
     sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
+    touch src/*
   '';
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config

From 17e9f21b9c48ef488f305f3c5161743c8605b092 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 9 Feb 2017 16:56:23 +0000
Subject: [PATCH 0466/3449] parsel: 1.0.3 -> 1.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6567158c185c..8ad0daa0a075 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18146,11 +18146,11 @@ in {
 
   parsel = buildPythonPackage rec {
     name = "parsel-${version}";
-    version = "1.0.3";
+    version = "1.1.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/parsel/${name}.tar.gz";
-      sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431";
+      sha256 = "0a34d1c0bj1fzb5dk5744m2ag6v3b8glk4xp0amqxdan9ldbcd97";
     };
 
     buildInputs = with self; [ pytest pytestrunner ];

From dde5350971953d7bc06f1b3bb540f1806ad06f00 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 9 Feb 2017 16:56:42 +0000
Subject: [PATCH 0467/3449] w3lib: 1.14.2 -> 1.17.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ad0daa0a075..d40fa0821079 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30937,13 +30937,13 @@ EOF
 
   w3lib = buildPythonPackage rec {
     name = "w3lib-${version}";
-    version = "1.14.2";
+    version = "1.17.0";
 
     buildInputs = with self ; [ six pytest ];
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/w/w3lib/${name}.tar.gz";
-      sha256 = "bd87eae62d208eef70869951abf05e96a8ee559714074a485168de4c5b190004";
+      sha256 = "0vshh300ay5wn5hwl9qcb32m71pz5s6miy0if56vm4nggy159inq";
     };
 
     meta = {

From c10b0e7bc4b001da7d0530765ba84c79f9432530 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 9 Feb 2017 16:56:52 +0000
Subject: [PATCH 0468/3449] scrapy: 1.1.2 -> 1.3.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 d40fa0821079..12d59d9847c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31004,7 +31004,7 @@ EOF
 
   scrapy = buildPythonPackage rec {
     name = "Scrapy-${version}";
-    version = "1.1.2";
+    version = "1.3.1";
 
     buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ];
     propagatedBuildInputs = with self; [
@@ -31020,7 +31020,7 @@ EOF
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
-      sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4";
+      sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk";
     };
 
     meta = {

From d1a9f2e8be9624e06d42714a107d2b8288945d12 Mon Sep 17 00:00:00 2001
From: Ignat Loskutov <ignat.loskutov@gmail.com>
Date: Thu, 16 Feb 2017 01:13:23 +0300
Subject: [PATCH 0469/3449] gpgme: fix build on macOS

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

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 307fde4e5c27..2ab0977004c4 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
   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";
     description = "Library for making GnuPG easier to use";

From d4e5bb34b76c98adee1d7fc00440adeb6a2a8c13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 13 Feb 2017 22:26:21 +0100
Subject: [PATCH 0470/3449] nixos/geoip-updater: run as user 'geoip' instead of
 'nobody'

That way 'nobody' is prevented from messing with the databases.
---
 nixos/modules/misc/ids.nix                    |  2 ++
 nixos/modules/services/misc/geoip-updater.nix | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 1566dbe1677e..d51b29b99dae 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -287,6 +287,7 @@
       pdns-recursor = 269;
       kresd = 270;
       rpc = 271;
+      geoip = 272;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -543,6 +544,7 @@
       gogs = 268;
       kresd = 270;
       #rpc = 271; # unused
+      #geoip = 272; # unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix
index 021ee02782d2..5135fac8f7dc 100644
--- a/nixos/modules/services/misc/geoip-updater.nix
+++ b/nixos/modules/services/misc/geoip-updater.nix
@@ -251,6 +251,12 @@ in
       }
     ];
 
+    users.extraUsers.geoip = {
+      group = "root";
+      description = "GeoIP database updater";
+      uid = config.ids.uids.geoip;
+    };
+
     systemd.timers.geoip-updater =
       { description = "GeoIP Updater Timer";
         partOf = [ "geoip-updater.service" ];
@@ -267,11 +273,11 @@ in
       preStart = ''
         mkdir -p "${cfg.databaseDir}"
         chmod 755 "${cfg.databaseDir}"
-        chown nobody:root "${cfg.databaseDir}"
+        chown geoip:root "${cfg.databaseDir}"
       '';
       serviceConfig = {
         ExecStart = "${geoip-updater}/bin/geoip-updater";
-        User = "nobody";
+        User = "geoip";
         PermissionsStartOnly = true;
       };
     };
@@ -285,11 +291,11 @@ in
       preStart = ''
         mkdir -p "${cfg.databaseDir}"
         chmod 755 "${cfg.databaseDir}"
-        chown nobody:root "${cfg.databaseDir}"
+        chown geoip:root "${cfg.databaseDir}"
       '';
       serviceConfig = {
         ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing";
-        User = "nobody";
+        User = "geoip";
         PermissionsStartOnly = true;
         # So it won't be (needlessly) restarted:
         RemainAfterExit = true;

From 4d54324f7cc554aca7f146e280b1366b5a630856 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 14 Feb 2017 15:40:56 +0200
Subject: [PATCH 0471/3449] mesa: 13.0.4 -> 17.0.0

Also enable the etnaviv driver on ARM, which got added in this release
(and I've confirmed that it can run glmark2 relatively successfully).
---
 pkgs/development/libraries/mesa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index abca82e62979..11d0c1334a96 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -27,7 +27,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
 else
 
 let
-  version = "13.0.4";
+  version = "17.0.0";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -41,7 +41,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 = "a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726";
+    sha256 = "10c4cvm6hhdch0idh2kn7qv1dq6zlw97sc3pz7bssn81f1ckvnrr";
   };
 
   prePatch = "patchShebangs .";
@@ -69,7 +69,7 @@ stdenv.mkDerivation {
     "--with-dri-searchpath=${driverLink}/lib/dri"
     "--with-egl-platforms=x11,wayland,drm"
   ] ++ (if stdenv.isArm || stdenv.isAarch64 then [
-      "--with-gallium-drivers=nouveau,freedreno,vc4,swrast"
+      "--with-gallium-drivers=nouveau,freedreno,vc4,etnaviv,swrast"
       "--with-dri-drivers=nouveau,swrast"
   ] else [
       "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,swrast"

From da1f93f445d952ce24f6727eeed2cd7e60473447 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 16 Feb 2017 01:25:56 +0200
Subject: [PATCH 0472/3449] mesa: Remove obsolete patching

The code we're patching was removed in 2015:

http://comments.gmane.org/gmane.comp.video.mesa3d.devel/102524
---
 pkgs/development/libraries/mesa/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 11d0c1334a96..b36316f72f4e 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -54,11 +54,6 @@ stdenv.mkDerivation {
     ./symlink-drivers.patch
   ];
 
-  postPatch = ''
-    substituteInPlace src/egl/main/egldriver.c \
-      --replace _EGL_DRIVER_SEARCH_DIR '"${driverLink}"'
-  '';
-
   outputs = [ "out" "dev" "drivers" "osmesa" ];
 
   # TODO: Figure out how to enable opencl without having a runtime dependency on clang

From 5e3a26e07b16458670bc7c93ec1d8d14367dc056 Mon Sep 17 00:00:00 2001
From: Kier Davis <kierdavis@gmail.com>
Date: Wed, 15 Feb 2017 23:44:11 +0000
Subject: [PATCH 0473/3449] Fix typo introduced by #22677

---
 nixos/modules/services/networking/quassel.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix
index 9b06cccca79e..bc7d6912b5ce 100644
--- a/nixos/modules/services/networking/quassel.nix
+++ b/nixos/modules/services/networking/quassel.nix
@@ -25,12 +25,12 @@ in
 
       package = mkOption {
         type = types.package;
-        default = pkgs.quasselDaemon_qt5;
-        defaultText = "pkgs.quasselDaemon_qt5";
+        default = pkgs.quasselDaemon;
+        defaultText = "pkgs.quasselDaemon";
         description = ''
           The package of the quassel daemon.
         '';
-        example = literalExample "pkgs.quasselDaemon_qt5";
+        example = literalExample "pkgs.quasselDaemon";
       };
 
       interfaces = mkOption {

From 61f2f8c98a505d893c8c999948cb58d207fda1f7 Mon Sep 17 00:00:00 2001
From: Stefan Goetz <goetzst@hotmail.de>
Date: Thu, 16 Feb 2017 00:46:10 +0100
Subject: [PATCH 0474/3449] youtube-dl: 2017.02.04.1 -> 2017.02.16 (#22851)

---
 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 efc73e5aa4f2..307b1a1592a5 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.02.04.1";
+  version = "2017.02.16";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1aqca4mxgdjiv1qfnzqxx6lpwggfxsaahvvs235pyz0j3kywa4nj";
+    sha256 = "21a5014f25d8ad2882999dd8cbf8cc2fd13c42116f5fe7b4781c982421ea59b0";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

From b207bf523b8c49b037a4a87456d61f63043cd2c6 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 15 Feb 2017 19:46:46 -0500
Subject: [PATCH 0475/3449] redis: 3.2.5 -> 3.2.7 for two vulnerabilities

more: https://www.reddit.com/r/redis/comments/5r8wxn/redis_327_is_out_important_security_fixes_inside/
---
 pkgs/servers/nosql/redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 59f2b4ac5cf0..e50ecf605675 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.5";
+  version = "3.2.7";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "05ak12xfkcinky6wvhy77knzd95m4vlshwka6jrdcjfqxyqww2c5";
+    sha256 = "1abghfr9nq5k69vg0kjh2409k51xy6fhyf466gy7pzjb6zjz77dz";
   };
 
   buildInputs = [ lua ];

From 463e90273fba176931d58e633707106c8f11d23a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 14 Feb 2017 19:38:52 -0500
Subject: [PATCH 0476/3449] pam: add optional pam_kwallet5 integration

---
 nixos/modules/security/pam.nix                | 19 ++++++++++++++++++-
 .../services/x11/desktop-managers/kde5.nix    | 10 ++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index e37c55aa1ac9..b51c8b4996be 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -212,6 +212,17 @@ let
         '';
       };
 
+      enableKwallet = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          If enabled, pam_wallet will attempt to automatically unlock the
+          user's default KDE wallet upon login. If the user has no wallet named
+          "kdewallet", or the login password does not match their wallet
+          password, KDE will prompt separately after login.
+        '';
+      };
+
       text = mkOption {
         type = types.nullOr types.lines;
         description = "Contents of the PAM service file.";
@@ -262,12 +273,15 @@ let
           # prompts the user for password so we run it once with 'required' at an
           # earlier point and it will run again with 'sufficient' further down.
           # We use try_first_pass the second time to avoid prompting password twice
-          (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount)) ''
+          (optionalString (cfg.unixAuth && (config.security.pam.enableEcryptfs || cfg.pamMount || cfg.enableKwallet)) ''
               auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth
               ${optionalString config.security.pam.enableEcryptfs
                 "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"}
               ${optionalString cfg.pamMount
                 "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
+              ${optionalString cfg.enableKwallet
+                ("auth optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+                 " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
             '') + ''
           ${optionalString cfg.unixAuth
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -334,6 +348,9 @@ let
               "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
           ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
               "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
+          ${optionalString (cfg.enableKwallet)
+              ("session optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+               " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
         '');
     };
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 06f9f0a62ef8..1b44b9e42c81 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -103,6 +103,8 @@ in
           kde5.kservice
           kde5.ktextwidgets
           kde5.kwallet
+          kde5.kwallet-pam
+          kde5.kwalletmanager
           kde5.kwayland
           kde5.kwidgetsaddons
           kde5.kxmlgui
@@ -234,6 +236,14 @@ in
 
       security.pam.services.kde = { allowNullPassword = true; };
 
+      # Doing these one by one seems silly, but we currently lack a better
+      # construct for handling common pam configs.
+      security.pam.services.gdm.enableKwallet = true;
+      security.pam.services.kdm.enableKwallet = true;
+      security.pam.services.lightdm.enableKwallet = true;
+      security.pam.services.sddm.enableKwallet = true;
+      security.pam.services.slim.enableKwallet = true;
+
       # use kimpanel as the default IBus panel
       i18n.inputMethod.ibus.panel =
         lib.mkDefault

From 0418f784b2616795ba2e0412ab883f4624ee1304 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 16 Feb 2017 16:19:41 +0800
Subject: [PATCH 0477/3449] terraform: 0.8.6 -> 0.8.7

---
 .../networking/cluster/terraform/default.nix          | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8db066516c2a..2f57456f309c 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,16 +2,15 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.8.6";
-  rev = "v${version}";
+  version = "0.8.7";
 
   goPackagePath = "github.com/hashicorp/terraform";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "hashicorp";
-    repo = "terraform";
-    sha256 = "1yrsb940xx4iqjz4s6c4dbmxzmqzffrxn6if7ywixg4dgpi279mx";
+    owner  = "hashicorp";
+    repo   = "terraform";
+    rev    = "v${version}";
+    sha256 = "0b30m0qc50x84klc8ggc3i83z36l46b1qmc8mpw90mxp07ra8vbw";
   };
 
   postInstall = ''

From 97fc806a7b40babe7872bdb5cb1361bd7f8c2b3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 16 Feb 2017 11:13:47 +0100
Subject: [PATCH 0478/3449] nix-prefetch-zip: Remove

This script is not needed anymore since "nix-prefetch-url --unpack
<url>" and "nix-prefetch-url -A foo.src" (where "foo.src" is a
fetchzip / fetchFromGitHub call) work fine.
---
 pkgs/build-support/fetchzip/nix-prefetch-zip  | 171 ------------------
 .../nix-prefetch-scripts/default.nix          |   3 +-
 pkgs/top-level/all-packages.nix               |   1 -
 3 files changed, 1 insertion(+), 174 deletions(-)
 delete mode 100755 pkgs/build-support/fetchzip/nix-prefetch-zip

diff --git a/pkgs/build-support/fetchzip/nix-prefetch-zip b/pkgs/build-support/fetchzip/nix-prefetch-zip
deleted file mode 100755
index d9a5f51057f2..000000000000
--- a/pkgs/build-support/fetchzip/nix-prefetch-zip
+++ /dev/null
@@ -1,171 +0,0 @@
-#! /bin/sh -e
-
-usage(){
-    echo  >&2 "syntax: nix-prefetch-zip [OPTIONS] [URL [EXPECTED-HASH]]
-
-Options:
-      --url         url    The url of the archive to fetch.
-      --name        name   The name to use for the store path (defaults to \`basename \$url\`).
-      --ext         ext    The file extension (.zip, .tar.gz, ...) to be REMOVED from name
-      --hash        hash   The hash of unpacked archive.
-      --hash-type   type   Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256.
-      --leave-root         Keep the root directory of the archive.
-      --help               Show this help text.
-"
-    exit 1
-}
-
-
-name=""
-ext=""
-argi=0
-argfun=""
-for arg; do
-  if test -z "$argfun"; then
-    case $arg in
-      --url) argfun=set_url;;
-      --name) argfun=set_name;;
-      --ext) argfun=set_ext;;
-      --hash) argfun=set_expHash;;
-      --hash-type) argfun=set_hashType;;
-      --leave-root) leaveRoot=true;;
-      --help) usage;;
-      *) argi=$(($argi + 1))
-         case $argi in
-           1) url=$arg;;
-           2) rev=$arg;;
-           3) expHash=$arg;;
-           *) echo "Unexpected argument: $arg" >&2
-              usage
-              ;;
-         esac
-         ;;
-    esac
-  else
-    case $argfun in
-      set_*)
-        var=$(echo $argfun | sed 's,^set_,,')
-        eval "$var=\$arg"
-        ;;
-    esac
-    argfun=""
-  fi
-done
-
-if [ -z "$url" ]; then
-  echo "Error: No --url flag given" >&2
-  usage
-fi
-
-if [ -z "$name" ]; then
-  name=$(basename "$url")
-fi
-
-if test -z "$hashType"; then
-  hashType=sha256
-fi
-
-hashFormat="--base32"
-
-tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$")
-trap "rm -rf '$tmp'" EXIT
-
-dirname=$(basename -s "$ext" "$name")
-
-unpackDirTmp=$tmp/unpacked-tmp/$dirname
-mkdir -p $unpackDirTmp
-
-unpackDir=$tmp/unpacked/$dirname
-mkdir -p $unpackDir
-
-downloadedFile=$tmp/$(basename "$url")
-
-unpackFile() {
-  local curSrc="$1"
-
-  case "$curSrc" in
-    *.tar.xz | *.tar.lzma)
-      # Don't rely on tar knowing about .xz.
-      xz -d < $curSrc | tar xf -
-      ;;
-    *.tar | *.tar.* | *.tgz | *.tbz2)
-      # GNU tar can automatically select the decompression method
-      # (info "(tar) gzip").
-      tar xf $curSrc
-      ;;
-    *.zip)
-      unzip -qq $curSrc
-      ;;
-    *)
-      echo "source archive $curSrc has unknown type" >&2
-      exit 1
-      ;;
-  esac
-}
-
-# If the hash was given, a file with that hash may already be in the
-# store.
-if test -n "$expHash"; then
-  finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$name")
-  if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
-    finalPath=
-  fi
-  hash=$expHash
-fi
-
-# If we don't know the hash or a path with that hash doesn't exist,
-# download the file and add it to the store.
-if test -z "$finalPath"; then
-  curl="curl \
-   --location --max-redirs 20 \
-   --disable-epsv \
-   --insecure"
-
-  if ! $curl --fail "$url" --output "$downloadedFile"; then
-    echo "error: could not download $url" >&2
-    exit 1
-  fi
-
-  if [ -z "$leaveRoot" ]; then
-    shopt -s dotglob
-
-    cd "$unpackDirTmp"
-    unpackFile "$downloadedFile"
-
-    if [ $(ls "$unpackDirTmp" | wc -l) != 1 ]; then
-      echo "error: zip file must contain a single file or directory."
-      exit 1
-    fi
-
-    fn=$(cd "$unpackDirTmp" && echo *)
-
-    if [ -f "$unpackDirTmp/$fn" ]; then
-      mv "$unpackDirTmp/$fn" "$unpackDir"
-    else
-      mv "$unpackDirTmp/$fn/"* "$unpackDir/"
-    fi
-  else
-    cd $unpackDir
-    unpackFile "$downloadedFile"
-  fi
-
-  # Compute the hash.
-  hash=$(nix-hash --type $hashType $hashFormat $unpackDir)
-  if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
-
-  # Add the downloaded file to the Nix store.
-  finalPath=$(nix-store --add-fixed --recursive "$hashType" $unpackDir)
-
-  if test -n "$expHash" -a "$expHash" != "$hash"; then
-    echo "hash mismatch for URL \`$url'"
-    exit 1
-  fi
-fi
-
-if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
-
-echo $hash
-
-if test -n "$PRINT_PATH"; then
-  echo $finalPath
-fi
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 6c5cb467a8fb..f37940c65c1e 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -37,12 +37,11 @@ in rec {
   nix-prefetch-git = mkPrefetchScript "git" ../../../build-support/fetchgit/nix-prefetch-git [git coreutils];
   nix-prefetch-hg  = mkPrefetchScript "hg"  ../../../build-support/fetchhg/nix-prefetch-hg   [mercurial];
   nix-prefetch-svn = mkPrefetchScript "svn" ../../../build-support/fetchsvn/nix-prefetch-svn [subversion.out];
-  nix-prefetch-zip = mkPrefetchScript "zip" ../../../build-support/fetchzip/nix-prefetch-zip [unzip curl.bin];
 
   nix-prefetch-scripts = buildEnv {
     name = "nix-prefetch-scripts";
 
-    paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn nix-prefetch-zip ];
+    paths = [ nix-prefetch-bzr nix-prefetch-cvs nix-prefetch-git nix-prefetch-hg nix-prefetch-svn ];
 
     meta = with stdenv.lib; {
       description = "Collection of all the nix-prefetch-* scripts which may be used to obtain source hashes";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 353283a409b8..fca4257b371e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17655,7 +17655,6 @@ with pkgs;
     nix-prefetch-git
     nix-prefetch-hg
     nix-prefetch-svn
-    nix-prefetch-zip
     nix-prefetch-scripts;
 
   nix-template-rpm = callPackage ../build-support/templaterpm { inherit (pythonPackages) python toposort; };

From 790e5bf4d8aac5da407274350712b402b5d73c89 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 16 Feb 2017 11:31:30 +0100
Subject: [PATCH 0479/3449] ecryptfs: fix after security wrapper change

The replacements matched to much due to wrapperDir having `/bin` in its
path now.

cc #16654
---
 pkgs/tools/security/ecryptfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index ab4867a4cc81..f8ef409813cc 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
     for file in $FILES; do
       substituteInPlace "$file" \
+        --replace /bin/mount ${utillinux}/bin/mount \
+        --replace /bin/umount ${utillinux}/bin/umount \
         --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
         --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
         --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
@@ -26,8 +28,6 @@ stdenv.mkDerivation rec {
         --replace /usr/bin/ecryptfs-setup-private $out/bin/ecryptfs-setup-private \
         --replace /sbin/cryptsetup ${cryptsetup}/sbin/cryptsetup \
         --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \
-        --replace /bin/mount ${utillinux}/bin/mount \
-        --replace /bin/umount ${utillinux}/bin/umount \
         --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \
         --replace /bin/bash ${bash}/bin/bash
     done

From 34584b2c3c09b2517568a8bd44a23f1a015d67e2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Feb 2017 14:25:45 +0100
Subject: [PATCH 0480/3449] hackage: update snapshot to 2017-02-12T15:49:03Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 447fc1a94bd8..fd8b50e4c0bd 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -6,6 +6,6 @@
 fetchFromGitHub {
   owner = "commercialhaskell";
   repo = "all-cabal-hashes";
-  rev = "a7e72af80fb1e68d9a2c4a5927a253b71ed68239";
-  sha256 = "1ppk5r7yllvibsgxgs7k9kb2dcwh4pphf0876hcdh392cal47h3x";
+  rev = "53fcf983669a3f0cdfd795fec28ecb40740a64ca";
+  sha256 = "0jfrr6mjb3x1ybgrsinhm0nl3jmdjyf9mghpgsm75lgr83cm12a5";
 }

From 918a5926c6b945e8effdc894fec761331c971cdd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 13 Feb 2017 14:27:02 +0100
Subject: [PATCH 0481/3449] hackage2nix: drop obsolete extra packages

---
 .../haskell-modules/configuration-hackage2nix.yaml         | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 0a05cc6ca81a..364c5bcdf329 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2223,10 +2223,8 @@ extra-packages:
   - containers < 0.5                    # required to build alex with GHC 6.12.3
   - control-monad-free < 0.6            # newer versions don't compile with anything but GHC 7.8.x
   - deepseq == 1.3.0.1                  # required to build Cabal with GHC 6.12.3
-  - esqueleto < 2.5                     # needed for git-annex: https://github.com/bitemyapp/esqueleto/issues/8
   - generic-deriving == 1.10.5.*        # new versions don't compile with GHC 7.10.x
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
-  - hpack == 0.15.*                     # needed for stack-1.3.2
   - haddock < 2.17                      # required on GHC 7.10.x
   - haddock-api == 2.15.*               # required on GHC 7.8.x
   - haddock-api == 2.16.*               # required on GHC 7.10.x
@@ -2235,14 +2233,11 @@ extra-packages:
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3
-  - persistent == 2.2.*                 # needed for git-annex
-  - persistent-sqlite == 2.2.*          # needed for git-annex
-  - persistent-template == 2.1.*        # needed for git-annex
   - primitive == 0.5.1.*                # required to build alex with GHC 6.12.3
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
-  - servant-auth-server < 0.2.2.0       # https://github.com/plow-technologies/servant-auth/issues/25
   - seqid < 0.2                         # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
   - seqid-streams < 0.2                 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
+  - servant-auth-server < 0.2.2.0       # https://github.com/plow-technologies/servant-auth/issues/25
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet

From 5e910bcbf6d1d0760e097f216f28fb8d06b9d9c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 14 Feb 2017 14:06:32 +0100
Subject: [PATCH 0482/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/2701517fd67fdbecb477b0afb1382e7083aba1a2.
---
 .../haskell-modules/hackage-packages.nix      | 2387 ++++++++++++++---
 1 file changed, 2043 insertions(+), 344 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 07e1d55a1ae9..b83d984b0bb2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9180,8 +9180,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HoleyMonoid";
-       version = "0.1.1";
-       sha256 = "d9a5fcfc1b388dcb7533dfd6916fc007cdfb2bbab48b820740c7226e32406dfc";
+       version = "0.1.2";
+       sha256 = "299f34a70c85f0f6858b7fb1af6b7466e81e543c4ad9d2007449d2dc977d4978";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/MedeaMelana/HoleyMonoid";
        description = "Monoids with holes";
@@ -16248,8 +16248,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "StringUtils";
-       version = "0.1.0.0";
-       sha256 = "9208f603ae362ab0788b7f61aa424e7b929e4eaaea97b6eca0a1b83c51eaacdb";
+       version = "0.2.0.0";
+       sha256 = "da88bf375d0889b428fb725c454d44c1c06a526477a18d20356a605554ab48c6";
        libraryHaskellDepends = [ base ];
        description = "String manipulation utilities";
        license = stdenv.lib.licenses.lgpl3;
@@ -20987,14 +20987,15 @@ self: {
 
   "airtable-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hashable, lens, text
-     , unordered-containers, wreq
+     , time, unordered-containers, wreq
      }:
      mkDerivation {
        pname = "airtable-api";
-       version = "0.1.0.4";
-       sha256 = "049949b130b19ee06c638494c95ca9b55fe3c071079a490ae10f01430c04b0dd";
+       version = "0.2.0.0";
+       sha256 = "aeb20ea165849959f6a4463dd85a0c3f4d41012bfd11b4b8eef65942f24f024a";
        libraryHaskellDepends = [
-         aeson base bytestring hashable lens text unordered-containers wreq
+         aeson base bytestring hashable lens text time unordered-containers
+         wreq
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ooblahman/airtable-api";
@@ -23241,6 +23242,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "amazonka-s3-streaming_0_2_0_0" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
+     , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
+     , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
+     , text
+     }:
+     mkDerivation {
+       pname = "amazonka-s3-streaming";
+       version = "0.2.0.0";
+       sha256 = "d4a583eead4b7d050c9a6e762d77050cf07c5da541a04e25424850fa0e66dbd7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 base bytestring conduit deepseq
+         dlist exceptions http-client lens lifted-async mmap mmorph mtl
+         resourcet
+       ];
+       executableHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 base bytestring conduit
+         conduit-extra text
+       ];
+       homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
+       description = "Provides conduits to upload data to S3 using the Multipart API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
@@ -29397,6 +29425,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "benchpress_0_2_2_9" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, time }:
+     mkDerivation {
+       pname = "benchpress";
+       version = "0.2.2.9";
+       sha256 = "15c696bdde79a1acf31633a81def65cec8c04bee14cf8b0d0fa6a32d995a4aab";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl time ];
+       executableHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/WillSewell/benchpress";
+       description = "Micro-benchmarking with detailed statistics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bencode" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, parsec }:
      mkDerivation {
@@ -29963,6 +30007,8 @@ self: {
        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
@@ -32820,6 +32866,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bloodhound_0_13_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
+     , QuickCheck, quickcheck-properties, scientific, semigroups
+     , temporary, text, time, transformers, unix-compat
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "bloodhound";
+       version = "0.13.0.0";
+       sha256 = "65217195be1d4d29c99bfc05712e3aa6ed9f67d8e12180e703b67be1b093c4f9";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring containers data-default-class
+         exceptions hashable http-client http-types mtl mtl-compat
+         network-uri scientific semigroups text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers errors exceptions generics-sop
+         hspec http-client http-types mtl network-uri QuickCheck
+         quickcheck-properties semigroups temporary text time unix-compat
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/bitemyapp/bloodhound";
+       description = "ElasticSearch client library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bloodhound-amazonka-auth" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core
      , amazonka-elasticsearch, base, bloodhound, exceptions, http-client
@@ -37096,6 +37172,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "case-insensitive_1_2_0_8" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "case-insensitive";
+       version = "1.2.0.8";
+       sha256 = "27aa610a7e0128c346d4a5cddb5d395a85b0889e4a9912acbb3b9ccbc4e99f68";
+       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+       testHaskellDepends = [
+         base bytestring HUnit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/basvandijk/case-insensitive";
+       description = "Case insensitive string comparison";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "case-insensitive-match" = callPackage
     ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }:
      mkDerivation {
@@ -40388,15 +40482,12 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.2.5";
-       sha256 = "e45c77e70996765c2d9f4e803add4e88c3a3701766ee1777eb067e49dff5c21f";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.2.6";
+       sha256 = "28913ec550761c623008250ef071840761216eaa1bb9e02b77c32c1dac6bb656";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring data-default http-client
          http-client-tls http-types lens optparse-applicative split text
        ];
-       executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
@@ -42681,6 +42772,23 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-output_1_7_9" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , process, stm, terminal-size, text, transformers, unix
+     }:
+     mkDerivation {
+       pname = "concurrent-output";
+       version = "1.7.9";
+       sha256 = "343c9685d24795bb38761f5c3600df5c67dbc6d410e5e0b862aa8d092e4e10d5";
+       libraryHaskellDepends = [
+         ansi-terminal async base directory exceptions process stm
+         terminal-size text transformers unix
+       ];
+       description = "Ungarble output from several threads or commands";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-rpc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -45637,8 +45745,8 @@ self: {
      }:
      mkDerivation {
        pname = "credential-store";
-       version = "0.1.0.0";
-       sha256 = "568ba9a4d8a40a1ae074e08da76a0ad48c6507047e6cf89999cc3c0ebafd0f29";
+       version = "0.1.1";
+       sha256 = "35087bea87d96fdeec351805f2bd7d8bf277e96e7b6689e33b6c4ce5314c35e2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46749,8 +46857,8 @@ self: {
      }:
      mkDerivation {
        pname = "csp";
-       version = "1.3";
-       sha256 = "8be3102fda62818d3ccb4649dc73b8cb6bb29d9620d7284023475297c6efdd32";
+       version = "1.3.1";
+       sha256 = "d83c5e51dd32a796af8cfacac94312cb99691be30d924e159bc1c4b8cef9530b";
        libraryHaskellDepends = [ base containers mtl nondeterminism ];
        testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
        description = "Discrete constraint satisfaction problem (CSP) solver";
@@ -53223,12 +53331,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_0_1" = callPackage
+  "directory_1_3_0_2" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.0.1";
-       sha256 = "b2b444aea7faac750efa23c994d9a16f207f12b2009cf38ba39fc7334f373f3c";
+       version = "1.3.0.2";
+       sha256 = "f9ee11de8bbaf7b8e2710d40ca0f1081fd1aaa609faede14a3706d60345c7aa3";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -58756,6 +58864,8 @@ self: {
        pname = "equivalence";
        version = "0.3.2";
        sha256 = "7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529";
+       revision = "1";
+       editedCabalFile = "c83ef0092c45011e4d58091d0d90fdd068ef8e04dddaf69e8df66631ef031604";
        libraryHaskellDepends = [
          base containers mtl STMonadTrans transformers transformers-compat
        ];
@@ -59142,33 +59252,6 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto_2_4_3" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
-     , hspec, HUnit, monad-control, monad-logger, persistent
-     , persistent-sqlite, persistent-template, QuickCheck, resourcet
-     , tagged, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "esqueleto";
-       version = "2.4.3";
-       sha256 = "bf555cfb40519ed1573f7bb90c65f693b9639dfa93fc2222230d3ded6e897434";
-       revision = "1";
-       editedCabalFile = "651ee129d694aedefa6d6f54e4fd8950f1d8c817e2984141c2ef2fb9174b1e38";
-       libraryHaskellDepends = [
-         base blaze-html bytestring conduit monad-logger persistent
-         resourcet tagged text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base conduit containers hspec HUnit monad-control monad-logger
-         persistent persistent-sqlite persistent-template QuickCheck
-         resourcet text transformers
-       ];
-       homepage = "https://github.com/prowdsponsor/esqueleto";
-       description = "Type-safe EDSL for SQL queries on persistent backends";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "esqueleto" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
@@ -59977,6 +60060,36 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "exference" = callPackage
+    ({ mkDerivation, base, base-orphans, bifunctors, containers
+     , data-pprint, deepseq, deepseq-generics, directory, either
+     , hashable, haskell-src-exts, hood, lens, mmorph, mtl, multistate
+     , parsec, pqueue, pretty, process, safe, split, template-haskell
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "exference";
+       version = "1.6.0.0";
+       sha256 = "303f1deaba594489712351b969b6bc93dc27272b03848b28e44cfe61b5a5cad2";
+       revision = "3";
+       editedCabalFile = "e3f9d32a394fc1790ce74c5a9ba629f97dbd3a11796d4ac1e5f642f76802cc56";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-orphans bifunctors containers deepseq deepseq-generics
+         directory either hashable haskell-src-exts hood lens mmorph mtl
+         multistate parsec pqueue pretty process safe split template-haskell
+         transformers unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         base containers data-pprint deepseq either haskell-src-exts hood
+         mtl multistate process transformers
+       ];
+       homepage = "https://github.com/lspitzner/exference";
+       description = "Tool to search/generate (haskell) expressions with a given type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "exhaustive" = callPackage
     ({ mkDerivation, base, generics-sop, template-haskell, transformers
      }:
@@ -61040,6 +61153,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "fasta_0_10_4_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
+     , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
+     , pipes-group, pipes-text, split, text
+     }:
+     mkDerivation {
+       pname = "fasta";
+       version = "0.10.4.2";
+       sha256 = "2b760dfd5029dee94d56010f8125f4317d6fa675a84817c352311d308d1897be";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers foldl lens parsec pipes
+         pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
+       ];
+       homepage = "https://github.com/GregorySchwartz/fasta";
+       description = "A simple, mindless parser for fasta files";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fastbayes" = callPackage
     ({ mkDerivation, base, hmatrix, vector }:
      mkDerivation {
@@ -62376,8 +62508,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.3";
-       sha256 = "b1f3ea70bdecb17281c65b14c8f5c6c52e189a30ad102d87a8f9c2fe08d92d57";
+       version = "0.6.3.1";
+       sha256 = "816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de";
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
          parsec process split time utf8-string xml
@@ -63644,8 +63776,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.7";
-       sha256 = "428add7568eea3e7b813b7ae89d824d7a97e8810662aa5371357b17f630dccde";
+       version = "0.5.0.8";
+       sha256 = "1be849d2dbf73a7ad02d0945ae7eb834085ed4a192dcdf5733c2fd764d308adb";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
@@ -65701,14 +65833,14 @@ self: {
 
   "ftp-client" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, connection
-     , exceptions, network, transformers
+     , containers, exceptions, network, transformers
      }:
      mkDerivation {
        pname = "ftp-client";
-       version = "0.4.0.0";
-       sha256 = "6742576a894fbebe30a4f4b55d78baf03ae0e0d068d9704d7d41c33077bd93c7";
+       version = "0.4.0.1";
+       sha256 = "c4ae91a103e3b3288a803831d55e8ddde1f2c6946d3fc3ec27bfde8995f71b4c";
        libraryHaskellDepends = [
-         attoparsec base bytestring connection exceptions network
+         attoparsec base bytestring connection containers exceptions network
          transformers
        ];
        testHaskellDepends = [ base ];
@@ -65718,15 +65850,16 @@ self: {
      }) {};
 
   "ftp-client-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, connection, exceptions
-     , ftp-client, ftp-clientconduit, resourcet
+    ({ mkDerivation, base, bytestring, conduit-combinators, connection
+     , exceptions, ftp-client, ftp-clientconduit, resourcet
      }:
      mkDerivation {
        pname = "ftp-client-conduit";
-       version = "0.4.0.0";
-       sha256 = "cdfea17aa55aaceba29f627b24bc6f0d6c350578e0675e3ec8161bafbe76004f";
+       version = "0.4.0.1";
+       sha256 = "baabf54a382463cf91a147f9553edff86baf9b3554e69f2f3e612ea37c8e399f";
        libraryHaskellDepends = [
-         base bytestring conduit connection exceptions ftp-client resourcet
+         base bytestring conduit-combinators connection exceptions
+         ftp-client resourcet
        ];
        testHaskellDepends = [ base ftp-clientconduit ];
        homepage = "https://github.com/mr/ftp-client";
@@ -67420,10 +67553,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.3.0.0";
-       sha256 = "22c279c1409fbb0b9c9d709873c0639f555c34c8919cd481e2eb6fcab729ccff";
-       revision = "1";
-       editedCabalFile = "fbaf3c842ce3316d3fef10d69dcf9a0279aa0d35be0f420da4749c6cdca1528a";
+       version = "0.3.1.0";
+       sha256 = "fd79841970e8d29a204e8cdf540478760f2a488bde21583668a3e7d8526f588a";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -67452,36 +67583,40 @@ self: {
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck
-     , validity
+    ({ mkDerivation, base, doctest, genvalidity, hspec, hspec-core
+     , QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.3.0.0";
-       sha256 = "0d25376307b9bbbf8a7d438f0e9252e86f1f3227c356a2979f002ebb711d612d";
-       revision = "2";
-       editedCabalFile = "dc8f7ce63cb185436f09ee5ff581a6b6430576a9e1053849321cd4d4ad653719";
+       version = "0.3.1.0";
+       sha256 = "abead88444f51c39f59cf2b959ad0d9532f4b58b87cb9f53b6e6c0bc6f62ef5d";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
+       testHaskellDepends = [
+         base doctest genvalidity hspec hspec-core QuickCheck
+       ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, doctest, genvalidity
-     , genvalidity-hspec, hspec, QuickCheck
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+     , genvalidity, genvalidity-hspec, genvalidity-text, hspec
+     , QuickCheck, text
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.0.0.0";
-       sha256 = "c33756346e6435553f938caa6ed0886852495ebc2cd458badd35d87d76fd00de";
+       version = "0.0.1.0";
+       sha256 = "58da64350fb137c8fae3a62450fe541adf66ddc4f2d42791350cb6085ac1b2b0";
        libraryHaskellDepends = [
-         aeson base deepseq genvalidity genvalidity-hspec hspec QuickCheck
+         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
+         QuickCheck
+       ];
+       testHaskellDepends = [
+         aeson base doctest genvalidity genvalidity-text hspec text
        ];
-       testHaskellDepends = [ base doctest genvalidity hspec ];
        homepage = "http://cs-syd.eu";
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
@@ -67523,23 +67658,40 @@ self: {
      }) {};
 
   "genvalidity-text" = callPackage
-    ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text
-     , validity, validity-text
+    ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, text, validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.2.0.0";
-       sha256 = "93f5a28f1dcb08bbfd65c58764ee73df2cd49b74150b5e4657313048ab08bf0b";
+       version = "0.3.0.0";
+       sha256 = "ac533aec5b7d845596d5f0caef8fa2c931a8ba9fee17650e0141df4a6baacd0b";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
-       testHaskellDepends = [ base genvalidity hspec QuickCheck text ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec QuickCheck text
+       ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-time" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, time
+     , validity-time
+     }:
+     mkDerivation {
+       pname = "genvalidity-time";
+       version = "0.0.0.0";
+       sha256 = "6f0a0872e4163afbe03ebdca19cc3411ba60cfc8ff44db03cd06c66c4b974e3e";
+       libraryHaskellDepends = [ base genvalidity time validity-time ];
+       testHaskellDepends = [ base genvalidity-hspec hspec time ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for time";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "geo-resolver" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, http-conduit, http-types, HUnit, QuickCheck
@@ -67661,8 +67813,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.2.1.1";
-       sha256 = "74d432e6abbfb82187272a3e35505cdc0714c4dc2b5c3fac730cb4450e32cd0e";
+       version = "0.2.2.0";
+       sha256 = "04a29f729f3cbfd8bf1c5f041c0412a95a8c496b5215896e9393a6f5f84bd03e";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -68021,6 +68173,8 @@ self: {
        pname = "ghc-events-analyze";
        version = "0.2.4";
        sha256 = "6161f5491a34252289c8265c7c48c5a70c1e2a69ffbfe64800cfdc3a8d3d4dd9";
+       revision = "1";
+       editedCabalFile = "3224314053b1774c18a19a558be964916f87e146f7ce47970a5de65a1bc962bc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68387,6 +68541,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_0" = 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";
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-flamegraph" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -69812,8 +69987,8 @@ self: {
      }:
      mkDerivation {
        pname = "git";
-       version = "0.1";
-       sha256 = "846907115b7b81dd046c78581d4709b403e307046f1ab4680c7ac0475130bef3";
+       version = "0.2.0";
+       sha256 = "d773dcfdd34b2b4ca34a1e84fac7c80f44c0ea0f89378ab3d161683c8acd8ea8";
        libraryHaskellDepends = [
          base byteable bytestring containers cryptonite hourglass memory mtl
          patience random system-fileio system-filepath unix-compat
@@ -69823,7 +69998,7 @@ self: {
          base bytedump bytestring hourglass tasty tasty-quickcheck
        ];
        doCheck = false;
-       homepage = "https://github.com/vincenthz/hit";
+       homepage = "https://github.com/vincenthz/hs-git";
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69870,8 +70045,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20170101";
-       sha256 = "5fbf88652a84278275d9d4bec083189f590b045e23a73bfe8d395c3e356e3f53";
+       version = "6.20170214";
+       sha256 = "d2f5a5bfa8077f417a8c0fee556571f498a9fbdabb99cdeed326df0a1f042e4b";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -70474,8 +70649,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.12.2";
-       sha256 = "160a928d992847823ab11982fa6465a4d80e59ce2a45e54e8a5e1838aba22b78";
+       version = "0.12.2.1";
+       sha256 = "15114e589f90bb4361fda3cbaec23c82c2a765f4e09debc93b2b46ac698053f4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70575,6 +70750,8 @@ self: {
        pname = "gitlib-libgit2";
        version = "3.1.1";
        sha256 = "fc2806ebc1bb51f5043a0d5091c5045be40bf82cae3296213b353507b8c868bb";
+       revision = "1";
+       editedCabalFile = "15ea81db4b514f97392188994df86421d9a8cb76cfb0558de3fc9ba60903a16c";
        libraryHaskellDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
@@ -70930,6 +71107,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glazier_0_8_0_0" = callPackage
+    ({ mkDerivation, base, lens, mmorph, mtl, profunctors
+     , semigroupoids, transformers
+     }:
+     mkDerivation {
+       pname = "glazier";
+       version = "0.8.0.0";
+       sha256 = "758345dee0b3401091ce52ce8e91332dd763bcfba112e211166ee7e7f69efa9c";
+       libraryHaskellDepends = [
+         base lens mmorph mtl profunctors semigroupoids transformers
+       ];
+       homepage = "https://github.com/louispan/glazier#readme";
+       description = "Composable widgets framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glazier-pipes" = callPackage
     ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes
      , pipes-concurrency, pipes-misc, stm, stm-extras, transformers
@@ -71929,6 +72123,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adexchange-buyer_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adexchange-buyer";
+       version = "0.2.0";
+       sha256 = "3d873f33e21113ba0fb37d23596cdc12afcb5945996b11ad9f80c7b584c73cf4";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Ad Exchange Buyer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adexchange-seller" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71941,6 +72148,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adexchange-seller_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adexchange-seller";
+       version = "0.2.0";
+       sha256 = "47de32da4902d6b04b97986bf30d604422946866f6150163f117584da79ef3be";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Ad Exchange Seller SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-datatransfer" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71978,6 +72198,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-directory_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-directory";
+       version = "0.2.0";
+       sha256 = "df04ced257650903e50ab444c50f4e4e29e33f37a6a54b4995d4e3c3cdb20772";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Admin Directory SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-emailmigration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -71990,6 +72223,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-admin-emailmigration_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-admin-emailmigration";
+       version = "0.2.0";
+       sha256 = "b37267faa6cae7e9e911f0952acbaf558fc0626da4650299141e84f28f4b58d2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Email Migration API v2 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-admin-reports" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72014,6 +72260,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-adsense_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-adsense";
+       version = "0.2.0";
+       sha256 = "96fd93139c8ba6746dc42df54a42a7288d8c874b4be973216cfb16b195a4db4c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google AdSense Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-adsense-host" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72076,6 +72335,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-analytics_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-analytics";
+       version = "0.2.0";
+       sha256 = "3854fc9b147867dcbdc5517fe2616936bf2dd2699f75463976113c031af429da";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-android-enterprise" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72088,6 +72360,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-android-enterprise_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-android-enterprise";
+       version = "0.2.0";
+       sha256 = "e1761fcfaea7541e219180c6cbad01663b96c6340c58cf059361ea3daf45d5ea";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play EMM SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-android-publisher" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72100,6 +72385,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-android-publisher_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-android-publisher";
+       version = "0.2.0";
+       sha256 = "c27db46fc5a29f077a79d6fac7af161e891d9931554aed4e3cfa5a18cc380da3";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Developer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-appengine" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72112,6 +72410,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-appengine_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-appengine";
+       version = "0.2.0";
+       sha256 = "f59ca638940b39c3b4f1a1a7c5d1951ff53ba0ba29d0b9cf8e4e816fa4d235e5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google App Engine Admin SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-activity" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72124,6 +72435,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-activity_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-activity";
+       version = "0.2.0";
+       sha256 = "b5cb8d5a54165e3bcda3a27ce284bd93bc0b0792b344c6595079df6de4844988";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Apps Activity SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-calendar" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72161,6 +72485,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-licensing_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-licensing";
+       version = "0.2.0";
+       sha256 = "1d568798f981d73a4114a58a195ceef17eba6166b07a15036d131c5d8ac46a86";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Enterprise License Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-reseller" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72173,6 +72510,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-reseller_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-reseller";
+       version = "0.2.0";
+       sha256 = "97cfd83d01034d0d4c6b8dbe6203da51d0f9c33e3690a38cc0688bdaa41ef60b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Enterprise Apps Reseller SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-apps-tasks" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72185,6 +72535,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-apps-tasks_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-apps-tasks";
+       version = "0.2.0";
+       sha256 = "5090d963d887943fc3723396355f746bd84f05df294c04e3c4a1d01a8b84179d";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Tasks SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-appstate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72197,6 +72560,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-appstate_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-appstate";
+       version = "0.2.0";
+       sha256 = "0fcf974036e78e6fb429702a2485ae7c7613b89380c26044e18ce5839658c4ae";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google App State SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-autoscaler" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72209,6 +72585,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-autoscaler_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-autoscaler";
+       version = "0.2.0";
+       sha256 = "99ddf55dc78ecd3b4745259615016b677d0343b31d7c9adc9fbba1d1eb34779c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Autoscaler SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-bigquery" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72221,6 +72610,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-bigquery_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-bigquery";
+       version = "0.2.0";
+       sha256 = "c3ce3a5677375f6ead59d90fa4589bf1d42ee0dc3ceeda25c0700551918e98be";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google BigQuery SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-billing" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72258,6 +72660,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-blogger_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-blogger";
+       version = "0.2.0";
+       sha256 = "4a65b159bb5d7f55dee7bdcb7aa594c0f7de1014bbe01f8796ed06b400bb5f04";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Blogger SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-books" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72270,6 +72685,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-books_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-books";
+       version = "0.2.0";
+       sha256 = "bd0b528943aeb018809ba7309e5c3b45061b90101f695a050b9cae6ac876e30c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Books SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-civicinfo" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72332,6 +72760,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-cloudmonitoring_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-cloudmonitoring";
+       version = "0.2.0";
+       sha256 = "e2567828a7e50ab4eaef10b82cfea1b97476dc44388cb5ba8b2ca56cf1530790";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-cloudtrace" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72344,6 +72785,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-cloudtrace_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-cloudtrace";
+       version = "0.2.0";
+       sha256 = "3799a1febfe93fce7040eda7e870c6d22bed46b9c23820f8bbbc2157fb65542b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Trace SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-compute" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72356,6 +72810,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-compute_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-compute";
+       version = "0.2.0";
+       sha256 = "0264743c5b76e8c1c4c522f2d560de91618353594a45647c9b330db97b9adf62";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-container" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72419,7 +72886,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "gogol-core_0_2_0" = callPackage
+  "gogol-core_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, dlist, exceptions, hashable
      , http-api-data, http-client, http-media, http-types, lens
@@ -72428,8 +72895,8 @@ self: {
      }:
      mkDerivation {
        pname = "gogol-core";
-       version = "0.2.0";
-       sha256 = "a629f7bce87624d0ac1314c8aa080ec1d5488f809864031eab716a51167244ab";
+       version = "0.2.0.1";
+       sha256 = "62e65a36ec74bca9599741c27f0f9b7432b5db362e1670a6bff5c90468112f0e";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit dlist exceptions hashable http-api-data http-client
@@ -72455,6 +72922,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-customsearch_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-customsearch";
+       version = "0.2.0";
+       sha256 = "c96cdef0a652a7859bf5d8dbc8d6c3c05339d4be28d6f34454b337186af15e72";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google CustomSearch SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dataflow" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72467,6 +72947,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dataflow_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dataflow";
+       version = "0.2.0";
+       sha256 = "45590531284533737405e6cfb7d4ee00c29c262a25926a86dcb0089f81bc12ff";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Dataflow SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dataproc" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72479,6 +72972,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dataproc_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dataproc";
+       version = "0.2.0";
+       sha256 = "7b79a0dee033c647982e6883ac0cc57475624a7a8ca86ec3a5bd44e073ea0533";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Dataproc SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-datastore" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72491,6 +72997,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-datastore_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-datastore";
+       version = "0.2.0";
+       sha256 = "5cd4a693a90ea2cae406aace00a441398071ae41f61b194562f37eaf4fec3857";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Datastore SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-debugger" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72528,6 +73047,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-deploymentmanager_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-deploymentmanager";
+       version = "0.2.0";
+       sha256 = "5dda38584d10a85f90aff0a1d8636c8f1e5b2e7a78a332b41352b1b2a565ac03";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Deployment Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dfareporting" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72540,6 +73072,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dfareporting_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dfareporting";
+       version = "0.2.0";
+       sha256 = "9295a5968c696d814fd77f099fbf1fd2dd89357582ae2c2cf8ddeb5b40502c24";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google DCM/DFA Reporting And Trafficking SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-discovery" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72552,6 +73097,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-discovery_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-discovery";
+       version = "0.2.0";
+       sha256 = "556992c0da8ad27206211845ab46fbf7dffdad55a9c1ca4274da0df672a896c4";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google APIs Discovery Service SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-dns" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72564,6 +73122,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-dns_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-dns";
+       version = "0.2.0";
+       sha256 = "bf24d5a57f7d316a49b3b413ba4c9aa94a164a009f3911f86be19386b204be87";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud DNS SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-doubleclick-bids" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72601,6 +73172,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-doubleclick-search_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-doubleclick-search";
+       version = "0.2.0";
+       sha256 = "8ecfa7547c2d08a2d8d39389c4a889bdc32eaf63ae4b80ec2b1be36f969887cb";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google DoubleClick Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-drive" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72613,12 +73197,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-drive_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-drive";
+       version = "0.2.0";
+       sha256 = "dc68e0331e441b6b9488fbc29b5864b9955dc3978c7092340870191a8f86cc6c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Drive SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-firebase-dynamiclinks" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-firebase-dynamiclinks";
-       version = "0.1.1";
-       sha256 = "e98604b85e66579ee99073ed335032e7983db5948f2a8c427be78b00b96ab24f";
+       version = "0.2.0";
+       sha256 = "8ba21d6d26785e0c43493ba2a035cc3d5eb07f663dff57c166113580a8f1161e";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Dynamic Links SDK";
@@ -72638,6 +73235,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-firebase-rules_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-firebase-rules";
+       version = "0.2.0";
+       sha256 = "96ba97607341e89c5ca376f6ab77076b9caae896f91c219711ba9e97f2a8bd43";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Firebase Rules SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fitness" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72650,6 +73260,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-fitness_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-fitness";
+       version = "0.2.0";
+       sha256 = "bf8f4136d3cec3e34057731ca02b1ad97e9a6bb15e72ed89a1eb072cca433d8c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Fitness SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fonts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72662,6 +73285,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-fonts_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-fonts";
+       version = "0.2.0";
+       sha256 = "b4a7ae314ea71acaecb7a60463230d48213b5f4d41f6e82962064bab39309f06";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Fonts Developer SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-freebasesearch" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72674,6 +73310,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-freebasesearch_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-freebasesearch";
+       version = "0.2.0";
+       sha256 = "b37d8631971615d6e04c1a3b46386336462b3bd63d3ea4e3ab9ba2130398c45f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Freebase Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-fusiontables" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72711,6 +73360,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games";
+       version = "0.2.0";
+       sha256 = "caab93ef1124477ee354bdaf9d9b193c48261cc0adba82d8aa712d4c7b6c7ff5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-games-configuration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72723,6 +73385,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games-configuration_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games-configuration";
+       version = "0.2.0";
+       sha256 = "5df2b8b8610e31aeea29f67793377b310aaf16ecb8b18fd4e42a23750ae0c6a5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services Publishing SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-games-management" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72735,6 +73410,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-games-management_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-games-management";
+       version = "0.2.0";
+       sha256 = "dfe5b07bd33e2f7997c82e6ffbd01427ad02bbc2a225ac4629c480ce0d1f00c6";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Game Services Management SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-genomics" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72747,6 +73435,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-genomics_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-genomics";
+       version = "0.2.0";
+       sha256 = "10ef615601475e3baec18567b442fdca5a239f1caf67de66f5703cd00eee1b56";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Genomics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-gmail" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72759,6 +73460,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-gmail_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-gmail";
+       version = "0.2.0";
+       sha256 = "ab972260ba64d358dbb71200b438b042c5549e75a110f2cdcf15f5be332afaf5";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Gmail SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-groups-migration" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72771,6 +73485,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-groups-migration_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-groups-migration";
+       version = "0.2.0";
+       sha256 = "933e7453e808e3878f38b0263bfd5b48b698284b370b951a99a6dd858bbeabe2";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Groups Migration SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-groups-settings" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72800,8 +73527,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-iam";
-       version = "0.1.1";
-       sha256 = "ec66ff6403ce2b59308703c8dbc47b9609d1a9029cae9b77c2137be336c783b9";
+       version = "0.2.0";
+       sha256 = "c793665c0cf11fbf609cbc22399b84dd060411524210544ec848eb73f2136f58";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity and Access Management (IAM) SDK";
@@ -72821,6 +73548,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-identity-toolkit_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-identity-toolkit";
+       version = "0.2.0";
+       sha256 = "835f936b942a60c3d4290cdbb66d7f8ea36697c8a8192ea7b4613ccc194cbc94";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Identity Toolkit SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-kgsearch" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72833,6 +73573,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-kgsearch_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-kgsearch";
+       version = "0.2.0";
+       sha256 = "e693a96569b16252ca14a7d684e51652b58d691456ab008b74c4276c29cf1a22";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Knowledge Graph Search SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-language" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-language";
+       version = "0.2.0";
+       sha256 = "88233a59c4f1f6319be39332a231aa823a262580b442f875e8e358698dc18fcf";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Natural Language SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-latencytest" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72845,6 +73610,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-latencytest_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-latencytest";
+       version = "0.2.0";
+       sha256 = "8ae96a0d45874f2bd8733d2e7194ba875e09bf081a6425ff943e6ffff367d894";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Network Performance Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-logging" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72857,6 +73635,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-logging_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-logging";
+       version = "0.2.0";
+       sha256 = "cd2d8c6d2f72f27fd8ac911ebbdcb8acfad84597036a5cf81f5857cd6985dfad";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Stackdriver Logging SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-manufacturers" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-manufacturers";
+       version = "0.2.0";
+       sha256 = "7d7001d2593365a23ab809a815934e3cf2327f1a40d5597a2fc012bd87df0f36";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Manufacturer Center SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-maps-coordinate" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72894,6 +73697,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-maps-engine_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-maps-engine";
+       version = "0.2.0";
+       sha256 = "aafe4135dcaf7329f86fe80f73b419619765e8ea30db249a912db62c9f0bfb1f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Maps Engine SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-mirror" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72906,12 +73722,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-mirror_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-mirror";
+       version = "0.2.0";
+       sha256 = "0c60337f67257069096fc1187a48569a3b370d705f80b40c3c7dfcc0f701408b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Mirror SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-ml" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-ml";
-       version = "0.1.1";
-       sha256 = "bee43d94edd81a53f387bfcf76c6679d91c36bfe50e11dd26f8bd047c758709c";
+       version = "0.2.0";
+       sha256 = "88202ed828ba87713a522423c2b29add4f7f9fcb9de52101bd5deabd5a2ab44c";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Machine Learning SDK";
@@ -72931,6 +73760,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-monitoring_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-monitoring";
+       version = "0.2.0";
+       sha256 = "e0f505881e97c1fa3d85e8eb12a827928ad8c253c6689ba436ab6fa2886cbf21";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Stackdriver Monitoring SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-oauth2" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72943,6 +73785,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-oauth2_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-oauth2";
+       version = "0.2.0";
+       sha256 = "7bd97bebf58e0aac97e84f86bad65d077bec7f8ead67b2b0518e9d0173284a8f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google OAuth2 SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-pagespeed" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72955,6 +73810,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-pagespeed_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-pagespeed";
+       version = "0.2.0";
+       sha256 = "e5033e168843a2c821d22cf94a8e5402b0908335bdef6baa626a8fe27857dc10";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google PageSpeed Insights SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-partners" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -72992,6 +73860,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-people_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-people";
+       version = "0.2.0";
+       sha256 = "18b1c3d8b916acd8e53c618c00f7e6f06dd310840a7a2f242f271635409bd9bb";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google People SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-play-moviespartner" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73004,6 +73885,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-play-moviespartner_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-play-moviespartner";
+       version = "0.2.0";
+       sha256 = "397206cf5681131cdd97191b9b98151c468923c6df6df73d8391e600036d8b44";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Play Movies Partner SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-plus" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73016,6 +73910,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-plus_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-plus";
+       version = "0.2.0";
+       sha256 = "32f64fd22d7a2290fe7ef29edf2a982cfe2c76fb9817d068733837bdca48d8da";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google + SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-plus-domains" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73053,6 +73960,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-prediction_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-prediction";
+       version = "0.2.0";
+       sha256 = "91c34600473b3e09b0e6a0bcf151b4e7d5120a8d0ad7fd6a225cb9312f2e8ba7";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Prediction SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-proximitybeacon" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73090,6 +74010,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-pubsub_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-pubsub";
+       version = "0.2.0";
+       sha256 = "643868bfe3e341d81c576e6a274676d5fda86ad542dc8a8021f82570a51a5ed3";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud Pub/Sub SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-qpxexpress" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73102,6 +74035,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-qpxexpress_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-qpxexpress";
+       version = "0.2.0";
+       sha256 = "a62fbb56b641032b33b55d26235df766db1e2cca27f307054fcd0e48d5bb7813";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google QPX Express SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-replicapool" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73114,6 +74060,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-replicapool_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-replicapool";
+       version = "0.2.0";
+       sha256 = "82331105facb5afe1d86fdaa1dfd8da0c17ea76b4b5af559e1fb8dfda8ddc245";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Group Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-replicapool-updater" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73126,6 +74085,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-replicapool-updater_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-replicapool-updater";
+       version = "0.2.0";
+       sha256 = "0d35642fdc7d5c319501bd091e1225b516249ef0f082290e8b1750c44c9037b8";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Group Updater SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-resourcemanager" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73163,6 +74135,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-resourceviews_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-resourceviews";
+       version = "0.2.0";
+       sha256 = "fb8024792a51e8c7a2d4a93edd3b2d4d8d6b03d826ffdadcbfb26cd4d07bc171";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Compute Engine Instance Groups SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-runtimeconfig" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73201,12 +74186,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-script_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-script";
+       version = "0.2.0";
+       sha256 = "e2572e207591d10c8a7eaff165ccb54286ca2b041c4ea2323d010c186ada47cb";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Apps Script Execution SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-servicecontrol" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-servicecontrol";
-       version = "0.1.1";
-       sha256 = "1f8da851a8d5056c67fd9f3fdba2269dde07c1ef65572aeb77a74194066b8e77";
+       version = "0.2.0";
+       sha256 = "0f94288509755891bb1195911a1cb367b1a9304ff1acb30d6713c5d776fb3c27";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Control SDK";
@@ -73218,8 +74216,8 @@ self: {
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
        pname = "gogol-servicemanagement";
-       version = "0.1.1";
-       sha256 = "4a8ed16569b5e342181a91a07479da3fa50e3c00ab12c4dc27313455fd64c4ac";
+       version = "0.2.0";
+       sha256 = "0b0e654df7bf54672ff8b34feff48208a07ec8215c69f7665946f4b3386a762d";
        libraryHaskellDepends = [ base gogol-core ];
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Management SDK";
@@ -73239,6 +74237,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-sheets_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-sheets";
+       version = "0.2.0";
+       sha256 = "8494db34d160118c23391864c3d3602179313cd81a874fd2c19059309b6a37e0";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Sheets SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-shopping-content" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73251,6 +74262,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-shopping-content_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-shopping-content";
+       version = "0.2.0";
+       sha256 = "f64953dd9618c5dbf1904df08b4211afb1e06109cf053e3e1244e3b167645662";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Content API for Shopping SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-siteverification" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73263,6 +74287,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-siteverification_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-siteverification";
+       version = "0.2.0";
+       sha256 = "1f743419a85baafdfa1cbbea01f6f1cfbcf23ae95943517166ae7518cbfc0a32";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Site Verification SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gogol-slides" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-slides";
+       version = "0.2.0";
+       sha256 = "e51390bc85a54109473bf24b7434f0f7dd5ec189cc9b76a6201f9a26c6d4ac4c";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Slides SDK";
+       license = "unknown";
+     }) {};
+
   "gogol-spectrum" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73275,6 +74324,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-spectrum_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-spectrum";
+       version = "0.2.0";
+       sha256 = "268d3a60b2f05702ff63fbaf56d485e36089691c83e1a2a491419e3b547b6f7e";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Spectrum Database SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-sqladmin" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73287,6 +74349,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-sqladmin_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-sqladmin";
+       version = "0.2.0";
+       sha256 = "d7cb8593629a7694b12ef4e1249158883e4334d8d1d68ef8612f987aa1dfe153";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Cloud SQL Administration SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-storage" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73349,6 +74424,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-tagmanager_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-tagmanager";
+       version = "0.2.0";
+       sha256 = "fc589362f09adf19a1b4e1b2609d4787eb7df73a27ff6f433fecb4614bd0543f";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Tag Manager SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-taskqueue" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73386,6 +74474,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-translate_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-translate";
+       version = "0.2.0";
+       sha256 = "b965db2484daf4e5d91594d5e7eed8aa020c99ae1512925718c23406a55e78cc";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Translate SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-urlshortener" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73398,6 +74499,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-urlshortener_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-urlshortener";
+       version = "0.2.0";
+       sha256 = "6bb29a4f08babe57deff1ce6d4ee045266cdfdc91ace37d821962801717e8672";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google URL Shortener SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-useraccounts" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73460,6 +74574,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-webmaster-tools_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-webmaster-tools";
+       version = "0.2.0";
+       sha256 = "00633481f3965ecaf2a3d6b56e4d67d8d13bb901b9023d613b4c527f7a5da04b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google Search Console SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73472,6 +74599,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube";
+       version = "0.2.0";
+       sha256 = "425ead26d5096dc3fff0333971b79e7cd4b2ee49b52efdb1609a5ca557b29005";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Data SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube-analytics" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73484,6 +74624,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube-analytics_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube-analytics";
+       version = "0.2.0";
+       sha256 = "0e888dce3cba650909e577641d7e60b19e521db3c48b36d83cf7f0e8300a451b";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Analytics SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gogol-youtube-reporting" = callPackage
     ({ mkDerivation, base, gogol-core }:
      mkDerivation {
@@ -73496,6 +74649,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "gogol-youtube-reporting_0_2_0" = callPackage
+    ({ mkDerivation, base, gogol-core }:
+     mkDerivation {
+       pname = "gogol-youtube-reporting";
+       version = "0.2.0";
+       sha256 = "f116487fb543dc596485ce07bf9b17f3867197871ff434a9de68414706a92d39";
+       libraryHaskellDepends = [ base gogol-core ];
+       homepage = "https://github.com/brendanhay/gogol";
+       description = "Google YouTube Reporting SDK";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gooey" = callPackage
     ({ mkDerivation, base, renderable, transformers, varying }:
      mkDerivation {
@@ -74112,8 +75278,8 @@ self: {
      }:
      mkDerivation {
        pname = "graflog";
-       version = "6.1.4";
-       sha256 = "d798087880663d3edd16f4ff6f9503b6f40917178aa86e19613dfba9811ed824";
+       version = "6.1.5";
+       sha256 = "8e784641738220a999963e36b9e1b10b88a767bd79763481da5e2f47e4f37ddd";
        libraryHaskellDepends = [
          aeson base bytestring containers mtl text text-conversions
        ];
@@ -74955,12 +76121,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gridbounds" = callPackage
+    ({ mkDerivation, base, earclipper, gjk, gridbox, hspec }:
+     mkDerivation {
+       pname = "gridbounds";
+       version = "0.0.0.1";
+       sha256 = "100a017e6286ec0cc738099982643ea0e0016076d2d48e11f71a061da1641eea";
+       libraryHaskellDepends = [ base earclipper gjk gridbox ];
+       testHaskellDepends = [ base earclipper gjk gridbox hspec ];
+       homepage = "https://github.com/zaidan/gridbounds#readme";
+       description = "Collision detection for GridBox";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "gridbox" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "gridbox";
-       version = "0.2.0.0";
-       sha256 = "0f035d7cf07e87a46037e5f52e7742667b58a8e049d1a1211b95aaa8731eb580";
+       version = "0.3.0.0";
+       sha256 = "912792b8f7df3d343f68caafe4bae91ef138686073c80a7f9486cbdb77a0aa45";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/zaidan/gridbox#readme";
@@ -77800,6 +78979,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_2" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -89978,6 +91176,8 @@ self: {
        pname = "horname";
        version = "0.1.3.0";
        sha256 = "e9a6cfb0ba87f063f04a7273d476b200905625ce60b00d87c8995332b1b7f218";
+       revision = "1";
+       editedCabalFile = "94e798feada4d4014ee1438672fe57e6181f1b9b64bc92858644037a77678f81";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90277,36 +91477,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hpack_0_15_0" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
-     , deepseq, directory, filepath, Glob, hspec, interpolate, mockery
-     , QuickCheck, temporary, text, unordered-containers, yaml
-     }:
-     mkDerivation {
-       pname = "hpack";
-       version = "0.15.0";
-       sha256 = "72a39a5d7d8dc2e94a37f75642f7e491ae9d560070b07c5c17e9ced6e3cbab63";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
-       ];
-       executableHaskellDepends = [
-         aeson base base-compat containers deepseq directory filepath Glob
-         text unordered-containers yaml
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat containers deepseq directory
-         filepath Glob hspec interpolate mockery QuickCheck temporary text
-         unordered-containers yaml
-       ];
-       homepage = "https://github.com/sol/hpack#readme";
-       description = "An alternative format for Haskell packages";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hpack" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring
      , containers, deepseq, directory, filepath, Glob, hspec
@@ -93424,8 +94594,8 @@ self: {
     ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
      mkDerivation {
        pname = "hspec-contrib";
-       version = "0.3.0";
-       sha256 = "c4f62a0e23468716d735581ffa1899b4741c5ee43e696e40d7d03dd511f7da00";
+       version = "0.4.0";
+       sha256 = "6f9e2201ee176c723f91ee932b7fc8b677e0d54376f897f52c133c8ca9860c16";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
        homepage = "http://hspec.github.io/";
@@ -94870,6 +96040,8 @@ self: {
        pname = "html-conduit";
        version = "1.2.1.1";
        sha256 = "98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8";
+       revision = "1";
+       editedCabalFile = "de32ca4d6df94a7c027a11db1b2e32ef1a7ccfe0565923f24528613ade821343";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra containers resourcet
          tagstream-conduit text transformers xml-conduit xml-types
@@ -94904,8 +96076,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.1.2";
-       sha256 = "cb3fdaf2329b6af5b59bc36c6a6721b0fe4d53c1b30885c82faf7b11fcab34de";
+       version = "1.1.3";
+       sha256 = "6bb2ae9f6b65b5652854e78ece26d7c78e4c5eef6c7f5a75ee88e6730469bc1d";
        libraryHaskellDepends = [
          attoparsec base-prelude text unordered-containers
        ];
@@ -96861,6 +98033,61 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hw-kafka-client" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
+     , either, hspec, monad-loops, rdkafka, regex-posix, temporary
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "hw-kafka-client";
+       version = "1.0.0";
+       sha256 = "01722988ca762cfefcbb97944d408fb3f4463fe56a3697e7e3aba501962d3af0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring containers temporary transformers unix
+       ];
+       librarySystemDepends = [ rdkafka ];
+       libraryToolDepends = [ c2hs ];
+       executableHaskellDepends = [
+         base bifunctors bytestring containers temporary transformers unix
+       ];
+       testHaskellDepends = [
+         base bifunctors bytestring containers either hspec monad-loops
+         regex-posix
+       ];
+       homepage = "https://github.com/haskell-works/hw-kafka-client";
+       description = "Kafka bindings for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {inherit (pkgs) rdkafka;};
+
+  "hw-kafka-conduit" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, conduit
+     , conduit-extra, containers, exceptions, hspec, hw-kafka-client
+     , mtl, resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "hw-kafka-conduit";
+       version = "1.0.0";
+       sha256 = "9b37eecd87f4e166a9cf8fec4dc2685aadb458028fae5d2adaea480e05826d1a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bifunctors bytestring conduit conduit-extra containers
+         exceptions hw-kafka-client mtl resourcet transformers
+       ];
+       executableHaskellDepends = [
+         base bifunctors bytestring conduit containers resourcet
+       ];
+       testHaskellDepends = [
+         base bifunctors bytestring conduit conduit-extra containers hspec
+         hw-kafka-client mtl resourcet transformers
+       ];
+       homepage = "https://github.com/haskell-works/hw-kafka-client-conduit";
+       description = "Conduit bindings for kafka-client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hw-mquery" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }:
      mkDerivation {
@@ -101033,6 +102260,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "intro_0_1_0_8" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
+     , deepseq, dlist, extra, hashable, lens, mtl, safe
+     , string-conversions, tagged, text, transformers
+     , unordered-containers, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "intro";
+       version = "0.1.0.8";
+       sha256 = "09c570361dddf8c67572acffc7fd6c93bdfa1c8143d2f7eb9aec0ad5db4f21bf";
+       libraryHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable mtl safe string-conversions tagged text transformers
+         unordered-containers writer-cps-mtl
+       ];
+       testHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable lens mtl safe string-conversions 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";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intro-prelude" = callPackage
     ({ mkDerivation, intro }:
      mkDerivation {
@@ -101401,6 +102654,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "iostring" = callPackage
+    ({ mkDerivation, base, bytestring, path, text }:
+     mkDerivation {
+       pname = "iostring";
+       version = "0.0.0.0";
+       sha256 = "d6865def561239a0e148d78c8e03a950308bcda45e70272ab6a64420d12a112f";
+       libraryHaskellDepends = [ base bytestring path text ];
+       homepage = "http://cs-syd.eu";
+       description = "A class of strings that can be involved in IO";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "iothread" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -104486,8 +105751,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.10";
-       sha256 = "24f5eb0e48f6f05fe8ef41400891f3fd3ce2a7d4ac59822454c610a79a4ffad8";
+       version = "0.2.11";
+       sha256 = "ec2419917909588b5aaf88fef64fc0b7cb40d9da9e41a26763c53def58f8c506";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110507,6 +111772,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-base_0_2_3_10" = callPackage
+    ({ mkDerivation, base, HUnit, monad-control, test-framework
+     , test-framework-hunit, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-base";
+       version = "0.2.3.10";
+       sha256 = "e677e560b176c40da2478d2f27dbeadc79630b2295ea3828603e0de4784d24fc";
+       libraryHaskellDepends = [ base monad-control transformers-base ];
+       testHaskellDepends = [
+         base HUnit monad-control test-framework test-framework-hunit
+         transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/basvandijk/lifted-base";
+       description = "lifted IO operations from the base library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-protolude" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, ghc-prim, lifted-async, lifted-base, mtl, safe, stm
@@ -112692,6 +113977,8 @@ self: {
        pname = "log-elasticsearch";
        version = "0.7";
        sha256 = "bf2326aa0c54972452543973cec3f03f68c6d0c6f9aed285696425da24122bb7";
+       revision = "1";
+       editedCabalFile = "b2bd9f57908bc61b3869fdde26babb546db01aa2378e93734514a87448e5b135";
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bloodhound bytestring
          deepseq http-client log-base semigroups text text-show time
@@ -112750,23 +114037,23 @@ self: {
 
   "log-warper" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
-     , data-default, directory, dlist, errors, exceptions, extra
-     , filepath, formatting, hashable, hslogger, hspec, HUnit, lens
-     , monad-control, mtl, QuickCheck, safecopy, text, text-format, time
-     , transformers, transformers-base, universum, unordered-containers
-     , yaml
+     , containers, data-default, directory, dlist, errors, exceptions
+     , extra, filepath, formatting, hashable, hslogger, hspec, HUnit
+     , lens, monad-control, monad-loops, mtl, QuickCheck, safecopy, text
+     , text-format, time, transformers, transformers-base, universum
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.4.2";
-       sha256 = "78f497120d94dd64f85846e2f4c805c4f1dcbcedb655771678441e28bbe8d393";
+       version = "0.4.4";
+       sha256 = "9a2cfcf95d0c88ae6471106f67314e81e2bd370fe092a4f21d9459f1f235dbea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal base bytestring directory dlist errors
-         exceptions extra filepath formatting hashable hslogger lens
-         monad-control mtl safecopy text text-format time transformers
-         transformers-base universum unordered-containers yaml
+         aeson ansi-terminal base bytestring containers directory dlist
+         errors exceptions extra filepath formatting hashable hslogger lens
+         monad-control monad-loops mtl safecopy text text-format time
+         transformers transformers-base universum unordered-containers yaml
        ];
        executableHaskellDepends = [ base exceptions hslogger text ];
        testHaskellDepends = [
@@ -114404,10 +115691,8 @@ self: {
      }:
      mkDerivation {
        pname = "mackerel-client";
-       version = "0.0.2";
-       sha256 = "c0b9b1b074176b45771ae6b1bfb3bc41dacdb1c0ccfab675b06eceba037ddaf1";
-       revision = "1";
-       editedCabalFile = "e4fd64b142d46108e28cc52262779ae1096efefdb01ea6128f4a86161d880030";
+       version = "0.0.3";
+       sha256 = "aaa47cb30b2e727602de95d600446aba6094854bd772ac5be945b86cedbbc269";
        libraryHaskellDepends = [
          aeson base bytestring data-default directory filepath htoml
          http-client http-client-tls http-types parsec split text
@@ -114472,8 +115757,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "0.1.0.3";
-       sha256 = "da323b35826c891860b6d93a79cc4d83c53ab7d4f558fab23bc706ac8fb58d43";
+       version = "0.1.0.5";
+       sha256 = "2fcb9eea46f6cd7d67164baaa82078b9c4f3a486ce9ff0abf225731e68066f7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115967,6 +117252,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matrix-market-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory
+     , exceptions, hspec, QuickCheck, scientific
+     }:
+     mkDerivation {
+       pname = "matrix-market-attoparsec";
+       version = "0.1.0.3";
+       sha256 = "e6c71b7405174df690d7617d1b295bc12b3e8be52b766fff79801f207fc93e20";
+       libraryHaskellDepends = [
+         attoparsec base bytestring exceptions scientific
+       ];
+       testHaskellDepends = [
+         base directory exceptions hspec QuickCheck
+       ];
+       homepage = "https://github.com/ocramz/matrix-market-attoparsec";
+       description = "Parsing and serialization functions for the NIST Matrix Market format";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "matrix-market-pure" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -117502,6 +118806,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "midi-simple" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, generic-random
+     , hspec, hspec-attoparsec, QuickCheck, tasty, tasty-hspec
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "midi-simple";
+       version = "0.1.0.0";
+       sha256 = "f680eed206f3623e01817794b9f7dd9a7c8fb6aa935648a3a5cb24119621849a";
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       testHaskellDepends = [
+         attoparsec base bytestring generic-random hspec hspec-attoparsec
+         QuickCheck tasty tasty-hspec tasty-quickcheck
+       ];
+       homepage = "https://github.com/tsahyt/midi-simple#readme";
+       description = "A simple and fast library for working with MIDI messages";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "midi-util" = callPackage
     ({ mkDerivation, base, containers, event-list, midi, non-negative
      }:
@@ -118449,15 +119772,13 @@ self: {
      }) {};
 
   "modbus-tcp" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, mtl, network
-     , transformers
-     }:
+    ({ mkDerivation, base, bytestring, cereal, mtl, transformers }:
      mkDerivation {
        pname = "modbus-tcp";
-       version = "0.3";
-       sha256 = "539d030348f403431f763bcc822bc5e8dd946ed28e353e2a877427409b3d7737";
+       version = "0.4";
+       sha256 = "eb77f105623bdf639d0f309eb7fecbc89512b9b0d2acb47ae8f2a589b270510f";
        libraryHaskellDepends = [
-         base bytestring cereal mtl network transformers
+         base bytestring cereal mtl transformers
        ];
        homepage = "https://github.com/roelvandijk/modbus-tcp";
        description = "Communicate with Modbus devices over TCP";
@@ -119126,6 +120447,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_20_2" = 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.20.2";
+       sha256 = "1f004999b282b3895cc0904053befb48b863efc2899a89e93195b4544cc9c737";
+       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
      }:
@@ -120149,6 +121493,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, foldl, hashable
+     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
+     , unordered-containers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.1.2";
+       sha256 = "1875b0281b2956530c33d20cfdbc1d0e1d46d09d1f9623cff19c31b7a4d296ea";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -128679,10 +130046,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgstat";
-       version = "0.0.1";
-       sha256 = "573cf350998a5625162d997290d932ab962f3ed594e20e81c810c962892635c8";
-       revision = "2";
-       editedCabalFile = "90bf3eedb1ad96d0ac2601cbd6732270793c6b5a4d3fdc26592b688a3a387d47";
+       version = "0.0.2";
+       sha256 = "7187c2118b82f48f25306315160b3483e05a7638df53e5167fc519b8f8e4ff8d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -129411,6 +130776,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_10_4_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , containers, data-default, directory, filepath, hs-bibutils, mtl
+     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.10.4.1";
+       sha256 = "6e6b0a89a831f9bfaa33dc0f3dff1792ee1626a5e66e1bd34da9447cd3c7de51";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory filepath mtl pandoc pandoc-types
+         process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -132147,41 +133546,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistent_2_2_4_1" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , blaze-html, blaze-markup, bytestring, conduit, containers
-     , exceptions, fast-logger, hspec, http-api-data, lifted-base
-     , monad-control, monad-logger, mtl, old-locale, path-pieces
-     , resource-pool, resourcet, scientific, silently, tagged
-     , template-haskell, text, time, transformers, transformers-base
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "persistent";
-       version = "2.2.4.1";
-       sha256 = "1473bdd952854d7f5fdb5896d2df07ef1ecf301c7fdb136054f49625329d50db";
-       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" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
@@ -132546,29 +133910,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "persistent-sqlite_2_2_1" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , hspec, monad-control, monad-logger, old-locale, persistent
-     , persistent-template, resourcet, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-sqlite";
-       version = "2.2.1";
-       sha256 = "bac71080bb25ad20b9116e42df463bbe230bacb2d963a5b101a501cff7fffc5e";
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers monad-control monad-logger
-         old-locale persistent resourcet text time transformers
-       ];
-       testHaskellDepends = [
-         base hspec persistent persistent-template time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
   "persistent-sqlite" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, monad-control, monad-logger, old-locale, persistent
@@ -132594,31 +133935,6 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-template_2_1_8_1" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
-     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
-     , path-pieces, persistent, QuickCheck, tagged, template-haskell
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
-       version = "2.1.8.1";
-       sha256 = "34911f40028357567717f6724abae4e6fc905567ffc8ba8ee5042e9680b2f168";
-       libraryHaskellDepends = [
-         aeson aeson-compat base bytestring containers ghc-prim
-         http-api-data monad-control monad-logger path-pieces persistent
-         tagged template-haskell text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
   "persistent-template" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
@@ -134171,6 +135487,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-misc_0_2_4_0" = callPackage
+    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
+     , pipes, pipes-category, pipes-concurrency, semigroups, stm
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-misc";
+       version = "0.2.4.0";
+       sha256 = "5602e1cc4a726b62de393b0236db0ba1bbd2f847f8fc5ac30c5ee727fb40041b";
+       libraryHaskellDepends = [
+         base clock Decimal lens mtl pipes pipes-category pipes-concurrency
+         semigroups stm transformers
+       ];
+       testHaskellDepends = [
+         base hspec lens mmorph pipes pipes-concurrency stm transformers
+       ];
+       homepage = "https://github.com/louispan/pipes-misc#readme";
+       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -135205,16 +136543,16 @@ self: {
      }) {};
 
   "pocket" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
-     , http-client-tls, servant, servant-client, text, transformers
+    ({ mkDerivation, aeson, base, http-client, http-client-tls, servant
+     , servant-client, text, transformers
      }:
      mkDerivation {
        pname = "pocket";
-       version = "0.1.0";
-       sha256 = "c73d73f4221023178324a954c4c0f5873febed698db8ed86acf70d999eb6b712";
+       version = "0.2.0";
+       sha256 = "5f9c76f99aacd6a9daf2075daf989af8387c76e411f91b36073ebca2d204d6b9";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring http-client http-client-tls
-         servant servant-client text transformers
+         aeson base http-client http-client-tls servant servant-client text
+         transformers
        ];
        homepage = "https://github.com/jpvillaisaza/pocket-haskell";
        description = "Bindings for the Pocket API";
@@ -136290,6 +137628,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-binary_0_9_3" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rerebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.9.3";
+       sha256 = "fdc10a4ccc5c6927f39d89450395c5316448b5f4d763c6386d1b056cc9685d04";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson conversion conversion-bytestring conversion-text json-ast
+         loch-th placeholders postgresql-libpq QuickCheck
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -136525,6 +137891,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple-migration_0_1_9_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+     , directory, hspec, postgresql-simple, text, time
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-migration";
+       version = "0.1.9.0";
+       sha256 = "005d2f031ab8d889daaee5cffdb222dbe164267042829b88031166b66361726a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple time
+       ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple text time
+       ];
+       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
+       homepage = "https://github.com/ameingast/postgresql-simple-migration";
+       description = "PostgreSQL Schema Migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, hspec, markdown-unlit
      , optparse-applicative, optparse-generic, postgresql-simple
@@ -136836,6 +138227,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "powerqueue" = callPackage
+    ({ mkDerivation, async, base, contravariant, hspec, stm }:
+     mkDerivation {
+       pname = "powerqueue";
+       version = "0.1.0.0";
+       sha256 = "91835dd0495cb47b5a589703e7904104e7001597f06039f87067192fcdb8254c";
+       libraryHaskellDepends = [ async base contravariant ];
+       testHaskellDepends = [ async base hspec stm ];
+       homepage = "https://github.com/agrafix/powerqueue#readme";
+       description = "A flexible job queue with exchangeable backends";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "powerqueue-levelmem" = callPackage
+    ({ mkDerivation, async, base, bytestring, cereal, dlist, filepath
+     , focus, hspec, leveldb, leveldb-haskell, list-t, powerqueue
+     , snappy, stm, stm-containers, temporary, unagi-chan
+     }:
+     mkDerivation {
+       pname = "powerqueue-levelmem";
+       version = "0.1.0.0";
+       sha256 = "b23d92c0b70b06e4168f03cdfedf7d38f12c85bcf493fb8874e66bd5ddc7ee76";
+       libraryHaskellDepends = [
+         async base bytestring cereal dlist filepath focus leveldb-haskell
+         list-t powerqueue stm stm-containers unagi-chan
+       ];
+       testHaskellDepends = [
+         async base cereal hspec powerqueue temporary
+       ];
+       testSystemDepends = [ leveldb snappy ];
+       homepage = "https://github.com/agrafix/powerqueue#readme";
+       description = "A high performance in memory and LevelDB backend for powerqueue";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
+
   "ppm" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -138302,6 +139728,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "profiteur_0_4_2_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, filepath
+     , ghc-prof, js-jquery, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "profiteur";
+       version = "0.4.2.1";
+       sha256 = "6b2af36243f15aa5396e0056159d9ad38422cce9eebafa59e6d439b2a8932916";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath ghc-prof js-jquery
+         scientific text unordered-containers vector
+       ];
+       homepage = "http://github.com/jaspervdj/profiteur";
+       description = "Treemap visualiser for GHC prof files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "profunctor-extras" = callPackage
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
@@ -138773,8 +140220,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens";
-       version = "0.1.0.4";
-       sha256 = "2d4d1fc8fea2aae5bec2da31f64cac3a9ed11608628fde9f549b46476d51000e";
+       version = "0.1.0.5";
+       sha256 = "d3096c4e089bc7a8e6221afde8afc0b02f8e67028e119f3be04906cf4fc67a6e";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class
          lens-family parsec pretty text transformers void
@@ -138825,6 +140272,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proto-lens-descriptors" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , lens-family, proto-lens, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-descriptors";
+       version = "0.1.0.5";
+       sha256 = "89e2eef7c99dc8ca669ad63dd4020a5d05133f92ddb148b1965ced523a6ad18a";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class lens-family
+         proto-lens text
+       ];
+       description = "Protocol buffers for describing the definitions of messages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proto-lens-optparse" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
@@ -138843,21 +140306,22 @@ self: {
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
      , data-default-class, directory, filepath, haskell-src-exts
-     , lens-family, process, proto-lens, text
+     , lens-family, process, proto-lens, proto-lens-descriptors, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.1.0.4";
-       sha256 = "bb5f04069ae2fd5d7a429523434be7c1c5e2a279a49394bf27d4a212b35d3e62";
+       version = "0.1.0.5";
+       sha256 = "0efb5b62e2cccb3edc29b93c75aabcccc652992a01e8f5eae7bf7eae2078192e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring Cabal containers data-default-class directory
-         filepath haskell-src-exts lens-family process proto-lens text
+         filepath haskell-src-exts lens-family process proto-lens
+         proto-lens-descriptors text
        ];
        executableHaskellDepends = [
          base bytestring containers data-default-class filepath
-         haskell-src-exts lens-family proto-lens text
+         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
        ];
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
@@ -139520,8 +140984,8 @@ self: {
     ({ mkDerivation, base, containers, libpulseaudio, stm, unix }:
      mkDerivation {
        pname = "pulseaudio";
-       version = "0.0.1.1";
-       sha256 = "11696b8df21dc010b0792c3b7ded2ea683b4d379657eca39ace2a04fabaf36f0";
+       version = "0.0.2.0";
+       sha256 = "72cbacaf7c94bdaa27c9e0d299a00fe3f31e0cc0f9c2d6e7de9690b3154c078e";
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
@@ -140355,17 +141819,14 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "0.2.2.0";
-       sha256 = "ea05cd1bad4720bbd0927c118add95e83e4d92a576d81c4f1b56d32b726d3e47";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.0.0.1";
+       sha256 = "ab437b12f05962d92a54a9dbaec62bb1df4cf688434b42ea3d3c958ee2a8278e";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels lens MissingH optparse-applicative process
          vector
        ];
        libraryPkgconfigDepends = [ libqrencode ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/vmchale/QRImager#readme";
        description = "Library to generate QR codes from bytestrings and objects";
@@ -143369,6 +144830,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "read-io" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hspec }:
+     mkDerivation {
+       pname = "read-io";
+       version = "0.0.0.1";
+       sha256 = "5c3efb07e781f53b9053ba97927076801825cb49b2f012a9911f64cbc65937e6";
+       libraryHaskellDepends = [ base containers directory filepath ];
+       testHaskellDepends = [ base containers directory filepath hspec ];
+       homepage = "https://github.com/zaidan/read-io#readme";
+       description = "Read IO library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "readable" = callPackage
     ({ mkDerivation, base, bytestring, text }:
      mkDerivation {
@@ -145362,6 +146836,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_8_3_5" = 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.5";
+       sha256 = "473145c2bf23b03711a307b4dd6a22609606327e0c15f8f27f874ee783f7f1a6";
+       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
@@ -145399,6 +146897,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-record_0_1_6_0" = callPackage
+    ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
+     , relational-query-HDBC
+     }:
+     mkDerivation {
+       pname = "relational-record";
+       version = "0.1.6.0";
+       sha256 = "7f7b6ba0a9646e475b0092a062cbffd32f8cabb0d4da1f29e7c0672472afb115";
+       libraryHaskellDepends = [
+         base persistable-types-HDBC-pg relational-query
+         relational-query-HDBC
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Meta package of Relational Record";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record-examples" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3
      , persistable-record, relational-query, relational-query-HDBC
@@ -145523,8 +147039,8 @@ self: {
      }:
      mkDerivation {
        pname = "remarks";
-       version = "0.1.11";
-       sha256 = "769f3e9bd64926a8bf00e76d60265baf02d69d3622a161f5e43e3b21a4f0e245";
+       version = "0.1.12";
+       sha256 = "3a36340fd00c3cd002dc1494508e1577004ea71a204e66785a1861d61356d087";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers GenericPretty pretty ];
@@ -147019,8 +148535,8 @@ self: {
      }:
      mkDerivation {
        pname = "reverse-geocoding";
-       version = "0.2.4.0";
-       sha256 = "07a70639586b92b557b922672685b353ff47fbbdb963196b0cd1d88020cf791d";
+       version = "0.3.0.0";
+       sha256 = "d29cd172aaccd01856a7fcf05995e1418a36d813f724fa5fdec566e829bb78b0";
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
@@ -148853,6 +150369,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe_0_3_14" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "safe";
+       version = "0.3.14";
+       sha256 = "db580cc748f6421e54a9a86a4cbf75c39cfc696880e31f972f99731737fdc88f";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       homepage = "https://github.com/ndmitchell/safe#readme";
+       description = "Library of safe (exception free) functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -151677,9 +153207,9 @@ self: {
      }:
      mkDerivation {
        pname = "semiring-num";
-       version = "0.9.0.1";
-       sha256 = "2605eddf961927ce04be8167a2a01123ee0a0dcae55dcd44f3830736ae4d9830";
-       libraryHaskellDepends = [ base containers template-haskell ];
+       version = "1.1.0.1";
+       sha256 = "49702af909207e5025b06ebb8f597e2334feeb7c040ffb774d8f6630ceac3678";
+       libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [
          base containers doctest nat-sized-numbers QuickCheck smallcheck
        ];
@@ -152566,17 +154096,15 @@ self: {
 
   "servant-auth-token" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl
-     , persistent, persistent-postgresql, persistent-template
      , pwstore-fast, servant-auth-token-api, servant-server, text, time
      , transformers, uuid
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.0.0";
-       sha256 = "e194c5c860508e22b8eb030d6c52c431df9fd7631a6287b042b48daf74825250";
+       version = "0.4.1.0";
+       sha256 = "4d2165bed0789e627cc716270491bf87863d5cda4c3041dfd10c0a297b22e3dc";
        libraryHaskellDepends = [
-         aeson-injector base bytestring containers mtl persistent
-         persistent-postgresql persistent-template pwstore-fast
+         aeson-injector base bytestring containers mtl pwstore-fast
          servant-auth-token-api servant-server text time transformers uuid
        ];
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
@@ -152594,8 +154122,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.4.0.0";
-       sha256 = "22c16f9a7d05a3555c7f3195248165b384c99792bf0e952326d3992831da318b";
+       version = "0.4.1.0";
+       sha256 = "517d4e084cd0884ec1931f2fbe19039c7af16e14b86bf36aeddde844bdbc3354";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -152917,6 +154445,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-elm_0_4_0_1" = callPackage
+    ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
+     , servant, servant-foreign, text, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "servant-elm";
+       version = "0.4.0.1";
+       sha256 = "69b3a5dcbb680fc1e923d76afa8255987d4613e0d4387eb493de071c9842ffc5";
+       libraryHaskellDepends = [
+         base elm-export lens servant servant-foreign text wl-pprint-text
+       ];
+       testHaskellDepends = [
+         aeson base Diff elm-export hspec HUnit servant text
+       ];
+       homepage = "http://github.com/mattjbray/servant-elm#readme";
+       description = "Automatically derive Elm functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-examples" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, either
      , http-types, js-jquery, lucid, random, servant, servant-client
@@ -153531,6 +155079,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-subscriber_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
+     , bytestring, case-insensitive, containers, directory, filepath
+     , http-types, lens, lifted-base, monad-control, monad-logger
+     , network-uri, purescript-bridge, servant, servant-foreign
+     , servant-server, stm, text, time, transformers, wai
+     , wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "servant-subscriber";
+       version = "0.6.0.0";
+       sha256 = "1875445b8dde41e86dd962bd71848255a6ea25e54c21cd9cf046638c16ff405d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async attoparsec base blaze-builder bytestring
+         case-insensitive containers directory filepath http-types lens
+         lifted-base monad-control monad-logger network-uri servant
+         servant-foreign servant-server stm text time transformers wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [ base purescript-bridge ];
+       homepage = "http://github.com/eskimor/servant-subscriber#readme";
+       description = "When REST is not enough ...";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-swagger" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory
      , doctest, filepath, hspec, http-media, insert-ordered-containers
@@ -157781,20 +159357,20 @@ self: {
      , case-insensitive, configurator, containers, data-default
      , digestive-functors, digestive-functors-heist
      , digestive-functors-snap, directory-tree, filepath, heist, jmacro
-     , lens, mtl, pcre-light, QuickCheck, readable, safe, snap
-     , snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , lens, map-syntax, mtl, pcre-light, QuickCheck, readable, safe
+     , snap, snap-core, tasty, tasty-hunit, tasty-quickcheck, text, time
      , transformers, wl-pprint-text, xmlhtml
      }:
      mkDerivation {
        pname = "snap-extras";
-       version = "0.11.0.2";
-       sha256 = "15e8ab812bf53b3f7ab0377e945b3e3448d5b8d4b89404751f83d51d722deb5e";
+       version = "0.12.0.0";
+       sha256 = "76ec979fa905a305392a545f24c6a33217e83aeedd0a8eec311623722b26e494";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
          digestive-functors-heist digestive-functors-snap directory-tree
-         filepath heist jmacro lens mtl pcre-light readable safe snap
-         snap-core text time transformers wl-pprint-text xmlhtml
+         filepath heist jmacro lens map-syntax mtl pcre-light readable safe
+         snap snap-core text time transformers wl-pprint-text xmlhtml
        ];
        testHaskellDepends = [
          base bytestring containers QuickCheck snap-core tasty tasty-hunit
@@ -159830,6 +161406,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "sparse-linear-algebra_0_2_9_1" = callPackage
+    ({ mkDerivation, base, containers, criterion, exceptions, hspec
+     , mtl, mwc-random, primitive, QuickCheck, transformers, vector
+     , vector-algorithms, vector-space
+     }:
+     mkDerivation {
+       pname = "sparse-linear-algebra";
+       version = "0.2.9.1";
+       sha256 = "5210a7491d2cd6efb5c4cf7be53c10a8c4240b0653bd7d8bfbb5c5f86393a442";
+       libraryHaskellDepends = [
+         base containers exceptions mtl transformers vector
+         vector-algorithms vector-space
+       ];
+       testHaskellDepends = [
+         base containers criterion exceptions hspec mtl mwc-random primitive
+         QuickCheck vector-space
+       ];
+       homepage = "https://github.com/ocramz/sparse-linear-algebra";
+       description = "Sparse linear algebra in native Haskell";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparsebit" = callPackage
     ({ mkDerivation, base, haskell98 }:
      mkDerivation {
@@ -161237,6 +162836,8 @@ self: {
        pname = "stack";
        version = "1.3.2";
        sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7";
+       revision = "2";
+       editedCabalFile = "c15bab02b5aa26847ce94aab4bca3ac7bbd38e7e3c56039364f70bb107cb7968";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -162199,8 +163800,8 @@ self: {
        pname = "stb-image-redux";
        version = "0.2.1.0";
        sha256 = "c0e4a5d2bf6d99934430ffd068cb3d28003554c5c8beb84ce76dd487f191eb1d";
-       revision = "1";
-       editedCabalFile = "cc40e775afe473f06ae9f2c9864fdeee7fa4830b2f4b7ee5a8bed504baa4007b";
+       revision = "2";
+       editedCabalFile = "e2e25f22d0fedbe7c49b0c0db29511c4bbc03bcc4dd95ec18c840d6f060f9ac6";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
        homepage = "https://github.com/sasinestro/stb-image-redux#readme";
@@ -162904,23 +164505,23 @@ self: {
   "store" = callPackage
     ({ mkDerivation, array, async, base, base-orphans
      , base64-bytestring, bytestring, cereal, cereal-vector, conduit
-     , containers, criterion, cryptohash, deepseq, directory, filepath
-     , free, ghc-prim, hashable, hspec, hspec-smallcheck, integer-gmp
-     , lifted-base, monad-control, mono-traversable, network, primitive
-     , resourcet, safe, semigroups, smallcheck, store-core
-     , streaming-commons, syb, template-haskell, text, th-lift
-     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
-     , transformers, unordered-containers, vector
+     , containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, network, primitive, resourcet, safe, semigroups
+     , smallcheck, store-core, streaming-commons, syb, template-haskell
+     , text, th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unordered-containers, vector
      , vector-binary-instances, void, weigh
      }:
      mkDerivation {
        pname = "store";
-       version = "0.3";
-       sha256 = "bdefbf35d52ef36d33b57eed5f24761e33feb689ef38fba3eebcfab723491b5b";
+       version = "0.3.1";
+       sha256 = "ec1005ebaf7334f6e5166315f8406553c94cffa8e06bc1d60f372c0d46ceda90";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring conduit
-         containers cryptohash deepseq directory filepath free ghc-prim
-         hashable hspec hspec-smallcheck integer-gmp lifted-base
+         containers contravariant cryptohash deepseq directory filepath free
+         ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
          monad-control mono-traversable network primitive resourcet safe
          semigroups smallcheck store-core streaming-commons syb
          template-haskell text th-lift th-lift-instances th-orphans
@@ -162929,14 +164530,14 @@ self: {
        ];
        testHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring cereal
-         cereal-vector conduit containers criterion cryptohash deepseq
-         directory filepath free ghc-prim hashable hspec hspec-smallcheck
-         integer-gmp lifted-base monad-control mono-traversable network
-         primitive resourcet safe semigroups smallcheck store-core
-         streaming-commons syb template-haskell text th-lift
-         th-lift-instances th-orphans th-reify-many th-utilities time
-         transformers unordered-containers vector vector-binary-instances
-         void weigh
+         cereal-vector conduit containers contravariant criterion cryptohash
+         deepseq directory filepath free ghc-prim hashable hspec
+         hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable network primitive resourcet safe semigroups
+         smallcheck store-core streaming-commons syb template-haskell text
+         th-lift th-lift-instances th-orphans th-reify-many th-utilities
+         time transformers unordered-containers vector
+         vector-binary-instances void weigh
        ];
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
@@ -163499,6 +165100,8 @@ self: {
        pname = "strict-identity";
        version = "0.1.0.0";
        sha256 = "218e8746098c246a5cf497e96eac6b4305495de18dc5f281598d79b54e8decbb";
+       revision = "1";
+       editedCabalFile = "dfbae3f135c13e0809e251df1c3f654eaa80c74d8cce3be4ca5c29f777fb6a53";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/cartazio/strict-identity";
        description = "Strict Identity Monad, handy for writing fast code!";
@@ -167112,6 +168715,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_0_11_2" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers
+     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
+     , unbounded-delays
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "0.11.2";
+       sha256 = "d26fbc4e5112af9ec3ca0a4a45d0f5edc5ae6675ffd72f922acb768062db675e";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers deepseq mtl
+         optparse-applicative regex-tdfa stm tagged unbounded-delays
+       ];
+       homepage = "http://documentup.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -167510,8 +169132,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-stats";
-       version = "0.2.0.0";
-       sha256 = "73a1e34f30eeddf2e855c1c8813338ae4aa23f29ea74f4c0272f0e6de5007e9d";
+       version = "0.2.0.1";
+       sha256 = "0957921fffb8ecc225694ab16812d329dbb3ab60c4905cd08bca6b087faa4311";
        libraryHaskellDepends = [
          base containers directory process stm tagged tasty time
        ];
@@ -171113,18 +172735,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time_1_7_0_1" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck, test-framework
-     , test-framework-quickcheck2, unix
+  "time_1_8" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.7.0.1";
-       sha256 = "2730197c3665a1e5af87475de7a57cf0dd8ddbd339167251b4a44cb3b61407ca";
+       version = "1.8";
+       sha256 = "38631adfbcd176a3f62fe3b14d9e03a44cc95e1971e4eeb7d46e1018e9e59aff";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
-         base deepseq QuickCheck test-framework test-framework-quickcheck2
-         unix
+         base deepseq QuickCheck tasty tasty-hunit tasty-quickcheck unix
        ];
        homepage = "https://github.com/haskell/time";
        description = "A time library";
@@ -176128,6 +177749,8 @@ self: {
        pname = "unfoldable";
        version = "0.9.2";
        sha256 = "9592ec5b6d021fe5c93bc2a047e4f9dddb4bc688bae546fb357e8cd4071b0e04";
+       revision = "1";
+       editedCabalFile = "21e9b1499fe1d0232359616b81cb8cb4b7e4efdbca5550d5643118edb45be94d";
        libraryHaskellDepends = [
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
@@ -176383,6 +178006,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-transforms_0_3_0" = callPackage
+    ({ mkDerivation, base, bitarray, bytestring, deepseq
+     , getopt-generics, QuickCheck, split, text
+     }:
+     mkDerivation {
+       pname = "unicode-transforms";
+       version = "0.3.0";
+       sha256 = "2dc25ead8d19598f6833a490ef1b1f29b9c1f987c8224fd99be6820535aa5245";
+       libraryHaskellDepends = [ base bitarray bytestring text ];
+       testHaskellDepends = [
+         base deepseq getopt-generics QuickCheck split text
+       ];
+       homepage = "http://github.com/harendra-kumar/unicode-transforms";
+       description = "Unicode normalization";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unicoder" = callPackage
     ({ mkDerivation, attoparsec, base, directory, text }:
      mkDerivation {
@@ -178636,8 +180277,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "validity";
-       version = "0.3.1.1";
-       sha256 = "c5ba39b30af35e275467bf016d9df71f3368abaaeb0d47c0cbbdbf78de627b0c";
+       version = "0.3.2.0";
+       sha256 = "e6ac32bfc76284be81817098be5192d91aac84ff9985b26ecd41a0cded54729e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -178684,14 +180325,26 @@ self: {
     ({ mkDerivation, base, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.1.0.1";
-       sha256 = "ab92980b7e900db8cf8e11cf986a5a952d2306cbb4735e8bc810acf8ca5e2189";
+       version = "0.1.1.0";
+       sha256 = "43cf2ce6b53a406901cae0ac01d1e46a70e2c7eddac129e35f242bbb82bf7a02";
        libraryHaskellDepends = [ base text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-time" = callPackage
+    ({ mkDerivation, base, time, validity }:
+     mkDerivation {
+       pname = "validity-time";
+       version = "0.0.0.0";
+       sha256 = "4c061a1c238c846e2e6e9838355c9a340ffc6080fb9185b18fb3c8667178af3d";
+       libraryHaskellDepends = [ base time validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for time";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "value-supply" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -179708,6 +181361,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "viewprof_0_0_0_2" = callPackage
+    ({ mkDerivation, base, brick, containers, ghc-prof, lens
+     , scientific, text, vector, vector-algorithms, vty
+     }:
+     mkDerivation {
+       pname = "viewprof";
+       version = "0.0.0.2";
+       sha256 = "52962f9eca6970001b703fdb4948d375d3bf5521e803ac98ad7a60eb1d25bffb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick containers ghc-prof lens scientific text vector
+         vector-algorithms vty
+       ];
+       homepage = "https://github.com/maoe/viewprof";
+       description = "Text-based interactive GHC .prof viewer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "views" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -183035,8 +184708,8 @@ self: {
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
        pname = "weighted";
-       version = "0.3.0.0";
-       sha256 = "6d30cf0d4a833f82ed2e44e22c81658e55744f53308a25a895eaf7bc940131cb";
+       version = "0.3.0.1";
+       sha256 = "1a5d93717a03e573fcc3a691206954b5b4d59e46b42b580e1d92e7048ae13ff6";
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
        homepage = "https://github.com/oisdk/weighted";
        description = "Writer monad which uses semiring constraint";
@@ -184233,10 +185906,8 @@ self: {
      }:
      mkDerivation {
        pname = "wreq";
-       version = "0.4.1.0";
-       sha256 = "3b8409e2fb7670d7060fdaa780008eeecb08e9b65bdab9d9690d8d26e5cb8e6d";
-       revision = "1";
-       editedCabalFile = "415dee42256dec3b5dae7c18bd9bf610ebe55c053d371c8afb994c9525fafa36";
+       version = "0.5.0.0";
+       sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5";
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -184250,7 +185921,7 @@ self: {
          http-client http-types HUnit lens lens-aeson network-info
          QuickCheck snap-core snap-server temporary test-framework
          test-framework-hunit test-framework-quickcheck2 text time
-         transformers unix-compat uuid vector
+         transformers unix-compat unordered-containers uuid vector
        ];
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
@@ -184297,8 +185968,8 @@ self: {
     ({ mkDerivation, base, bytestring, text, utf8-string, wreq }:
      mkDerivation {
        pname = "wreq-stringless";
-       version = "0.4.1.0";
-       sha256 = "f2d80a50007a7f9666d67a3cfe15b8b459c53945c6b1add310d0733246fe41e2";
+       version = "0.5.0.0";
+       sha256 = "e58cb6e6c44b33df3507c1e5fc3f7cea2961a8244c3c6840a085327ce731b921";
        libraryHaskellDepends = [ base bytestring text utf8-string wreq ];
        homepage = "https://github.com/j-keck/wreq-stringless#readme";
        description = "Simple wrapper to use wreq without Strings";
@@ -185539,6 +187210,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit_1_4_0_4" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.4.0.4";
+       sha256 = "11058279d3f75a71b5731d26fc490f86fc1b7cc461053cd54aedde8f152d52fc";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default deepseq monad-control
+         resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-decode" = callPackage
     ({ mkDerivation, base, bifunctors, data-default, lens, semigroups
      , tasty, tasty-hunit, text, time, xml-conduit, xml-types
@@ -185660,6 +187356,8 @@ self: {
        pname = "xml-hamlet";
        version = "0.4.1";
        sha256 = "7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb";
+       revision = "1";
+       editedCabalFile = "5c9d521224d4f08f59a3dbbde041c4f0267da46528cfc6b24da052387ebd4033";
        libraryHaskellDepends = [
          base containers parsec shakespeare template-haskell text
          xml-conduit
@@ -186371,17 +188069,18 @@ self: {
      }) {};
 
   "xmonad-vanessa" = callPackage
-    ({ mkDerivation, base, containers, process, X11, xmonad
-     , xmonad-contrib, xmonad-extras
+    ({ mkDerivation, base, containers, process, transformers, X11
+     , xmonad, xmonad-contrib, xmonad-extras
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.0.2";
-       sha256 = "40c23ebf4725488ef6548df811f7fe435d43860d6722cbb8bd59a4ea12f7c647";
+       version = "0.1.0.3";
+       sha256 = "2ec997506b554282bbbddf02d9bb72326637ce5c6cd5634604b93a7e6e2b9ffa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers process X11 xmonad xmonad-contrib xmonad-extras
+         base containers process transformers X11 xmonad xmonad-contrib
+         xmonad-extras
        ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
@@ -188374,8 +190073,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.11.2";
-       sha256 = "28a1b1dbcc5a171ee88b8eb1850aef43cf17d03553b29116ca0934721c228ae3";
+       version = "0.11.4";
+       sha256 = "ea2e4c5506543922711ed169c90afe510ddf857276fdd5850e7481a2c181a916";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form

From 3c0b1919e7440262a9d0d259d77d5ba142e44af5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 15 Feb 2017 16:44:11 +0100
Subject: [PATCH 0483/3449] git-annex: update sha256 hash for the new version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 237703699700..ff6dbfa1b092 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -62,7 +62,7 @@ self: super: {
     src = pkgs.fetchFromGitHub {
       owner = "joeyh";
       repo = "git-annex";
-      sha256 = "1vy6bj7f8zyj4n1r0gpi0r7mxapsrjvhwmsi5sbnradfng5j3jya";
+      sha256 = "0f79i2i1cr8j02vc4ganw92prbkv9ca1yl9jgkny0rxf28wdlc6v";
       rev = drv.version;
     };
   }))).override {

From abcb132effe9bdeaa629d4e7100f7360a83cd342 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 16 Feb 2017 10:29:09 -0200
Subject: [PATCH 0484/3449] pygments: 2.1.3 -> 2.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6567158c185c..a44ec360ac7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20321,12 +20321,12 @@ in {
   };
 
   pygments = buildPythonPackage rec {
-    version = "2.1.3";
+    version = "2.2.0";
     name = "Pygments-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/Pygments/${name}.tar.gz";
-      sha256 = "10axnp2wpjnq9g8wg53fx0c70dfxqrz498jyz8mrdx9a3flwir48";
+      sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
     };
 
     propagatedBuildInputs = with self; [ docutils ];

From 434affb14df7b5b785b835c4d8651effc16279be Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Feb 2017 11:05:11 +0300
Subject: [PATCH 0485/3449] openbox: fix openbox-xdg-autostart

Also add more optional dependencies.
---
 .../window-managers/openbox/default.nix            | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index ba0c812ef6a6..7b60d573d1e5 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig
-, libxml2, libXinerama, libXcursor, libXau, libXrandr
+{ stdenv, fetchurl, pkgconfig, python2
+, libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM
 , imlib2, pango, libstartup_notification, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -8,8 +8,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libxml2
-    libXinerama libXcursor libXau libXrandr
+    libXinerama libXcursor libXau libXrandr libICE libSM
     libstartup_notification makeWrapper
+    python2.pkgs.wrapPython
+  ];
+
+  pythonPath = with python2.pkgs; [
+    pyxdg
   ];
 
   propagatedBuildInputs = [
@@ -35,7 +40,8 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
-    '';
+    wrapPythonPrograms
+  '';
 
   meta = {
     description = "X window manager for non-desktop embedded systems";

From 300c9a6c3d73cb486fca6385271acc2cd341ed51 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Feb 2017 14:55:03 +0300
Subject: [PATCH 0486/3449] dbus: use /etc as datadir, install dtd

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

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 7743c1e3f80b..49b71ff99748 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -50,7 +50,8 @@ self = stdenv.mkDerivation {
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
       "--with-systemduserunitdir=$(out)/etc/systemd/user"
       "--enable-user-session"
-      "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
+      "--datadir=/etc"
+      "--libexecdir=$(out)/libexec"
     ] ++ lib.optional (!x11Support) "--without-x";
 
     # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
@@ -63,7 +64,12 @@ self = stdenv.mkDerivation {
 
     doCheck = true;
 
-    installFlags = [ "sysconfdir=$(out)/etc" ];
+    installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ];
+
+    postInstall = ''
+      mkdir -p $doc/share/xml/dbus
+      cp doc/*.dtd $doc/share/xml/dbus
+    '';
 
     # it's executed from $lib by absolute path
     postFixup = ''

From 3e23ec44503df219b8a705357eafd1f3960f34d9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Feb 2017 14:55:38 +0300
Subject: [PATCH 0487/3449] makeDBusConf: init

Use XSLT transform to modify stock dbus configuration file. This is needed
because some dbus components doesn't support <include> so we need to put our
core configuration in the main file.
---
 .../libraries/dbus/make-dbus-conf.nix         | 27 +++++++++++++++
 .../libraries/dbus/make-session-conf.xsl      | 30 ++++++++++++++++
 .../libraries/dbus/make-system-conf.xsl       | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 4 files changed, 96 insertions(+)
 create mode 100644 pkgs/development/libraries/dbus/make-dbus-conf.nix
 create mode 100644 pkgs/development/libraries/dbus/make-session-conf.xsl
 create mode 100644 pkgs/development/libraries/dbus/make-system-conf.xsl

diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
new file mode 100644
index 000000000000..7e35a9162c8d
--- /dev/null
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -0,0 +1,27 @@
+{ runCommand, libxslt, dbus, serviceDirectories ? [], suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" }:
+
+/* DBus has two configuration parsers -- normal and "trivial", which is used
+ * for suid helper. Unfortunately the latter doesn't support <include>
+ * directive. That means that we can't just place our configuration to
+ * *-local.conf -- it needs to be in the main configuration file.
+ */
+runCommand "dbus-1"
+  {
+    buildInputs = [ libxslt ];
+    inherit serviceDirectories suidHelper;
+  }
+  ''
+    mkdir -p $out
+
+    xsltproc \
+      --stringparam serviceDirectories "$serviceDirectories" \
+      --stringparam suidHelper "$suidHelper" \
+      --path ${dbus.doc}/share/xml/dbus \
+      ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
+      > $out/system.conf
+    xsltproc \
+      --stringparam serviceDirectories "$serviceDirectories" \
+      --path ${dbus.doc}/share/xml/dbus \
+      ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
+      > $out/session.conf
+  ''
diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl
new file mode 100644
index 000000000000..bc73369af944
--- /dev/null
+++ b/pkgs/development/libraries/dbus/make-session-conf.xsl
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<!--
+  This script copies the original system.conf from the dbus
+  distribution, but sets paths from $serviceDirectories parameter
+  and suid helper from $suidHelper parameter.
+-->
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:str="http://exslt.org/strings"
+                extension-element-prefixes="str"
+                >
+
+  <xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" />
+
+  <xsl:param name="serviceDirectories" />
+
+  <xsl:template match="/busconfig">
+    <busconfig>
+      <xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_session_servicedirs' and name() != 'servicedir' and name() != 'includedir']" />
+
+      <xsl:for-each select="str:tokenize($serviceDirectories)">
+        <servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir>
+        <includedir><xsl:value-of select="." />/etc/dbus-1/session.d</includedir>
+      </xsl:for-each>
+    </busconfig>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/pkgs/development/libraries/dbus/make-system-conf.xsl b/pkgs/development/libraries/dbus/make-system-conf.xsl
new file mode 100644
index 000000000000..3d8b823437d6
--- /dev/null
+++ b/pkgs/development/libraries/dbus/make-system-conf.xsl
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<!--
+  This script copies the original system.conf from the dbus
+  distribution, but sets paths from $serviceDirectories parameter
+  and suid helper from $suidHelper parameter.
+-->
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:str="http://exslt.org/strings"
+                extension-element-prefixes="str"
+                >
+
+  <xsl:output method='xml' encoding="UTF-8" doctype-system="busconfig.dtd" />
+
+  <xsl:param name="serviceDirectories" />
+  <xsl:param name="suidHelper" />
+
+  <xsl:template match="/busconfig">
+    <busconfig>
+      <xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_system_servicedirs' and name() != 'servicehelper' and name() != 'servicedir' and name() != 'includedir']" />
+
+      <!-- set suid helper -->
+      <servicehelper><xsl:value-of select="$suidHelper" /></servicehelper>
+
+      <xsl:for-each select="str:tokenize($serviceDirectories)">
+        <servicedir><xsl:value-of select="." />/share/dbus-1/system-services</servicedir>
+        <includedir><xsl:value-of select="." />/etc/dbus-1/system.d</includedir>
+      </xsl:for-each>
+    </busconfig>
+  </xsl:template>
+
+</xsl:stylesheet>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ba672c477d7..0dadf9b99ffc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7094,6 +7094,11 @@ with pkgs;
   dbus_libs = dbus;
   dbus_daemon = dbus.daemon;
 
+  makeDBusConf = { suidHelper, serviceDirectories }:
+    callPackage ../development/libraries/dbus/make-dbus-conf.nix {
+      inherit suidHelper serviceDirectories;
+    };
+
   dee = callPackage ../development/libraries/dee { };
 
   dhex = callPackage ../applications/editors/dhex { };

From ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Feb 2017 14:56:45 +0300
Subject: [PATCH 0488/3449] dbus service: use makeDBusConf

---
 .../system/dbus-session-local.conf.in         |  5 ----
 .../services/system/dbus-system-local.conf.in |  6 ----
 nixos/modules/services/system/dbus.nix        | 30 +++----------------
 3 files changed, 4 insertions(+), 37 deletions(-)
 delete mode 100644 nixos/modules/services/system/dbus-session-local.conf.in
 delete mode 100644 nixos/modules/services/system/dbus-system-local.conf.in

diff --git a/nixos/modules/services/system/dbus-session-local.conf.in b/nixos/modules/services/system/dbus-session-local.conf.in
deleted file mode 100644
index 5fd6f80a3539..000000000000
--- a/nixos/modules/services/system/dbus-session-local.conf.in
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  @extra@
-</busconfig>
diff --git a/nixos/modules/services/system/dbus-system-local.conf.in b/nixos/modules/services/system/dbus-system-local.conf.in
deleted file mode 100644
index edbb476f585a..000000000000
--- a/nixos/modules/services/system/dbus-system-local.conf.in
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <servicehelper>@servicehelper@</servicehelper>
-  @extra@
-</busconfig>
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 33bc890a78c8..643bec188142 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -10,32 +10,10 @@ let
 
   homeDir = "/run/dbus";
 
-  systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [
-    "<servicedir>${d}/share/dbus-1/system-services</servicedir>"
-    "<includedir>${d}/etc/dbus-1/system.d</includedir>"
-  ]));
-
-  sessionExtraxml = concatStrings (flip concatMap cfg.packages (d: [
-    "<servicedir>${d}/share/dbus-1/services</servicedir>"
-    "<includedir>${d}/etc/dbus-1/session.d</includedir>"
-  ]));
-
-  configDir = pkgs.runCommand "dbus-conf"
-    { preferLocalBuild = true;
-      allowSubstitutes = false;
-    }
-    ''
-      mkdir -p $out
-
-      sed '${./dbus-system-local.conf.in}' \
-        -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
-        -e 's,@extra@,${systemExtraxml},' \
-        > "$out/system-local.conf"
-
-      sed '${./dbus-session-local.conf.in}' \
-        -e 's,@extra@,${sessionExtraxml},' \
-        > "$out/session-local.conf"
-    '';
+  configDir = pkgs.makeDBusConf {
+    suidHelper = "${config.security.wrapperDir}/dbus-daemon-launch-helper";
+    serviceDirectories = cfg.packages;
+  };
 
 in
 

From 073ca2b34faf33e835ac136024f9b1f419f8b1fa Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 16 Feb 2017 07:55:25 -0500
Subject: [PATCH 0489/3449] aspcu: 1.9.0 -> 1.9.1

---
 pkgs/tools/misc/aspcud/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix
index 577c0a33b3ee..f3d2cbca6516 100644
--- a/pkgs/tools/misc/aspcud/default.nix
+++ b/pkgs/tools/misc/aspcud/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.9.0";
+  version = "1.9.1";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz";
-    sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373";
+    sha256 = "09sqbshwrqz2fvlkz73mns5i3m70fh8mvwhz8450izy5lsligsg0";
   };
 
   buildInputs = [ boost clasp cmake gringo re2c ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f6647d11a10..f135d5edaf76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -548,7 +548,7 @@ with pkgs;
   aria = aria2;
 
   aspcud = callPackage ../tools/misc/aspcud {
-    boost = boost155;
+    boost = boost163;
   };
 
   at = callPackage ../tools/system/at { };

From 5125ecb2c189ca542a37d9066019005c188b74ed Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Feb 2017 19:32:36 +0300
Subject: [PATCH 0490/3449] blueman: add librsvg

---
 pkgs/tools/bluetooth/blueman/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 1c1085ff8146..508fc7810690 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
 , obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
-, hicolor_icon_theme , withPulseAudio ? true, libpulseaudio }:
+, hicolor_icon_theme, librsvg
+, withPulseAudio ? true, libpulseaudio }:
 
 let
   binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
@@ -16,7 +17,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
 
-  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf
+  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg
                   gsettings_desktop_schemas hicolor_icon_theme ]
                 ++ pythonPath
                 ++ lib.optional withPulseAudio libpulseaudio;

From a46258ed0adae68ee46380a7f5eeef810a884c11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 16 Feb 2017 10:31:42 -0300
Subject: [PATCH 0491/3449] lxappearance: 0.6.2 -> 0.6.3 (#22865)

---
 pkgs/desktops/lxde/core/lxappearance/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix
index 06a0b5b8bffb..b6b63e316152 100644
--- a/pkgs/desktops/lxde/core/lxappearance/default.nix
+++ b/pkgs/desktops/lxde/core/lxappearance/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "lxappearance-0.6.2";
+  name = "lxappearance-0.6.3";
 
   src = fetchurl{
     url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
-    sha256 = "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4";
+    sha256 = "0f4bjaamfxxdr9civvy55pa6vv9dx1hjs522gjbbgx7yp1cdh8kj";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A lightweight program for configuring the theme and fonts of gtk applications";
+    homepage = "http://lxde.org/";
     maintainers = [ stdenv.lib.maintainers.hinton ];
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
-    homepage = "http://lxde.org/";
   };
 }

From 2d643613f3f56bc23060cc3bedbff231dd9e9e1e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Feb 2017 02:13:22 +0100
Subject: [PATCH 0492/3449] mozart: refactoring

- Append emacs to the oz wrapper's command search path rather than the
  rpath.  Previously, emacs would end up in the closure but the oz
  shell script would not be helped by it. Now a user without emacs in
  their PATH can still get the complete Oz experience (which depends
  crucially on emacs).  To build a variant without emacs, do
  mozart.override { emacs = null; }
- Patch full path to oz executable into the oz desktop item to make the
  output less reliant on the runtime PATH
- Compress .elc files to save a little bit of space
- Make it easier to extend platform support
- Inline builder.sh
- Be more specific about patching.  oz and ozc are capable of inferring
  OZHOME themselves; thus we generate wrappers only for the binary
  executable components.

Note that gmp and boost would be removed by patchelf --shrink-path; I've
no idea whether they are used somehow, so we leave them in and forego
rpath shrinking for now.
---
 pkgs/development/compilers/mozart/binary.nix | 54 ++++++++++++++++----
 pkgs/development/compilers/mozart/builder.sh | 26 ----------
 2 files changed, 43 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/development/compilers/mozart/builder.sh

diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix
index 1c3a21e2e449..d802aa4fe2e7 100644
--- a/pkgs/development/compilers/mozart/binary.nix
+++ b/pkgs/development/compilers/mozart/binary.nix
@@ -1,25 +1,30 @@
-{ stdenv, fetchurl, boost, emacs, gmp, makeWrapper
+{ stdenv, fetchurl, makeWrapper
+, boost, gmp
 , tcl-8_5, tk-8_5
+, emacs
 }:
 
 let
-
   version = "2.0.0";
 
-in stdenv.mkDerivation {
+  binaries = {
+    "x86_64-linux" = fetchurl {
+      url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
+      sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
+    };
+  };
+in
+
+stdenv.mkDerivation {
   name = "mozart-binary-${version}";
 
   preferLocalBuild = true;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/mozart-oz/v${version}-alpha.0/mozart2-${version}-alpha.0+build.4105.5c06ced-x86_64-linux.tar.gz";
-    sha256 = "0rsfrjimjxqbwprpzzlmydl3z3aiwg5qkb052jixdxjyad7gyh5z";
-  };
+  src = binaries."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
 
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc
       boost
-      emacs
       gmp
       tcl-8_5
       tk-8_5
@@ -27,10 +32,36 @@ in stdenv.mkDerivation {
 
   TK_LIBRARY = "${tk-8_5}/lib/tk8.5";
 
-  builder = ./builder.sh;
-
   buildInputs = [ makeWrapper ];
 
+  buildCommand = ''
+    mkdir $out
+    tar xvf $src -C $out --strip-components=1
+
+    for exe in $out/bin/{ozemulator,ozwish} ; do
+      patchelf --set-interpreter $(< $NIX_CC/nix-support/dynamic-linker) \
+               --set-rpath $libPath \
+               $exe
+    done
+
+    wrapProgram $out/bin/ozwish \
+      --set OZHOME $out \
+      --set TK_LIBRARY $TK_LIBRARY
+
+    wrapProgram $out/bin/ozemulator --set OZHOME $out
+
+    ${stdenv.lib.optionalString (emacs != null) ''
+      wrapProgram $out/bin/oz --suffix PATH ":" ${stdenv.lib.makeBinPath [ emacs ]}
+    ''}
+
+    sed -i $out/share/applications/oz.desktop \
+        -e "s,Exec=oz %u,Exec=$out/bin/oz %u,"
+
+    gzip -9n $out/share/mozart/elisp"/"*.elc
+
+    patchShebangs $out
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://www.mozart-oz.org/";
     description = "Multiplatform implementation of the Oz programming language";
@@ -42,6 +73,7 @@ in stdenv.mkDerivation {
       expressive power and advanced functionality.
     '';
     license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
+    platforms = attrNames binaries;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/development/compilers/mozart/builder.sh b/pkgs/development/compilers/mozart/builder.sh
deleted file mode 100644
index b606d4c1bde9..000000000000
--- a/pkgs/development/compilers/mozart/builder.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-source $stdenv/setup
-
-echo "unpacking $src..."
-tar xvfz $src
-
-mkdir -p $out/bin
-mkdir -p $out/share
-
-mv mozart*linux/bin/* $out/bin
-mv mozart*linux/share/* $out/share
-
-patchShebangs $out
-
-for f in $out/bin/*; do
-    b=$(basename $f)
-
-    if [ $b == "ozemulator" ] || [ $b == "ozwish" ]; then
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                 --set-rpath $libPath \
-                 $f
-        continue;
-    fi
-
-    wrapProgram $f --set OZHOME $out \
-                   --set TK_LIBRARY $TK_LIBRARY
-done

From bc2f53fd295c5e9f290b6705789653497aeb047a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 16 Feb 2017 14:45:31 +0100
Subject: [PATCH 0493/3449] grsecurity: 4.9.8-201702071801 ->
 4.9.10-201702152052

---
 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 5640aa80576f..320af7cb0bae 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.8";
+  version = "4.9.10";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "39r4hq5f70nc1v8qq4qvnd0fq98h4akm6y6zp7ml6mi5knz7v6zm86ykq87a0ph3zh23msimi4155354qcsmsxp4cbd22cq8s1w86ds";
+    sha512 = "1mqlw5x7ryqb1jlhkn31p5xhilmqi55j5307i94xdj1xgn2411fiym5mpx1h8b0jc42g728jl896qplkrbd682vz5wci7fg4022ry81";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 7e1ec3b9941c..33f11ad5ae3e 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.8";
-      grrev  = "201702071801";
-      sha512 = "05hxn9jzkywd15iqjd7lykj0f9czw0kq1rs7krxnrk4lhr4k4ahbhq4330mw4pwcvln4ys25dw7mbljn9zvymb7b1kc3m301rrbgj5f";
+    { kver   = "4.9.10";
+      grrev  = "201702152052";
+      sha512 = "3whjlrm06r724q9lkycm2jalv3wm9bhxjlvgnglrfnc48rnv3b4j2m6gnq396pc3axnd2mpiinlwjwarw59dhs9qax9l7ddcc3cxd4k";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 109ee2a338eeff0d6be820e2caa2950922124cf1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Feb 2017 16:45:19 +0300
Subject: [PATCH 0494/3449] kbd service: use systemd-vconsole-setup even with
 early setup

This way we have fonts reloaded on switches.
---
 nixos/modules/tasks/kbd.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 0af376a90bcf..4aa4c7d22ac2 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -71,7 +71,7 @@ in
   ###### implementation
 
   config = mkMerge [
-    (mkIf (!setVconsole || (setVconsole && config.boot.earlyVconsoleSetup)) {
+    (mkIf (!setVconsole) {
       systemd.services."systemd-vconsole-setup".enable = false;
     })
 
@@ -97,9 +97,7 @@ in
             printf "${makeColorCS n color}" >> /dev/console
           '') config.i18n.consoleColors}
         '';
-      }
 
-      (mkIf (!config.boot.earlyVconsoleSetup) {
         systemd.services."systemd-vconsole-setup" =
           { wantedBy = [ "sysinit.target" ];
             before = [ "display-manager.service" ];
@@ -107,7 +105,7 @@ in
             restartTriggers = [ vconsoleConf kbdEnv ];
             restartIfChanged = false; # fails when tty is inactive
           };
-      })
+      }
 
       (mkIf config.boot.earlyVconsoleSetup {
         boot.initrd.extraUtilsCommands = ''

From 0c81594a29d99d9ee9c9c88c680340d56823cfb2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Feb 2017 16:46:30 +0300
Subject: [PATCH 0495/3449] kbd service: use /dev/tty1 for
 systemd-vconsole-setup

Fixes #22470
---
 nixos/modules/tasks/kbd.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index 4aa4c7d22ac2..3975dd5b0ffd 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -98,12 +98,22 @@ in
           '') config.i18n.consoleColors}
         '';
 
+        /* XXX: systemd-vconsole-setup needs a "main" terminal. By default
+         * /dev/tty0 is used which wouldn't work when the service is restarted
+         * from X11. We set this to /dev/tty1; not ideal because it may also be
+         * owned by X11 or something else.
+         *
+         * See #22470.
+         */
         systemd.services."systemd-vconsole-setup" =
           { wantedBy = [ "sysinit.target" ];
             before = [ "display-manager.service" ];
             after = [ "systemd-udev-settle.service" ];
             restartTriggers = [ vconsoleConf kbdEnv ];
-            restartIfChanged = false; # fails when tty is inactive
+            serviceConfig.ExecStart = [
+              ""
+              "${pkgs.systemd}/lib/systemd/systemd-vconsole-setup /dev/tty1"
+            ];
           };
       }
 

From 0d2ba7ef2b85403d2b8b001409c53fe99fa147bc Mon Sep 17 00:00:00 2001
From: Matthew Maurer <matthew.r.maurer@gmail.com>
Date: Thu, 16 Feb 2017 09:16:41 -0500
Subject: [PATCH 0496/3449] openssl: 1.1.0d -> 1.1.0e for High severity
 CVE-2017-3733

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7b413fa92d1c..2591a43f1d47 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -115,8 +115,8 @@ in {
   };
 
   openssl_1_1_0 = common {
-    version = "1.1.0d";
-    sha256 = "1pv0zql3r73qpjini90hn29l28d65b7i777zav0larbmi6gbnpkx";
+    version = "1.1.0e";
+    sha256 = "0k47sdd9gs6yxfv6ldlgpld2lyzrkcv9kz4cf88ck04xjwc8dgjp";
   };
 
   openssl_1_0_2-steam = common {

From a72dc9f3bfc26cf59075fb8e01ac6f3e448793dc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 28 Jan 2017 11:13:03 +0300
Subject: [PATCH 0497/3449] compton: 0.1_beta2 -> 0.1_beta2.5

---
 .../window-managers/compton/default.nix       | 56 ++++++++++++-------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index 5a79c0829b5a..8388e3870753 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -1,38 +1,52 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libconfig, libdrm, libxml2, mesa, pcre,
-  libXcomposite, libXfixes, libXdamage, libXinerama, libXrandr, libXrender,
-  libXext, xwininfo }:
+{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
+, docbook_xsl, libxslt, libxml2, makeWrapper
+, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage
+, libXinerama, libXrandr, libXrender, libXext, xwininfo }:
 
 stdenv.mkDerivation rec {
-  name = "compton-0.1_beta2";
+  name = "compton-0.1_beta2.5";
 
-  src = fetchurl {
-    url = https://github.com/chjj/compton/releases/download/v0.1_beta2/compton-git-v0.1_beta2-2013-10-21.tar.xz;
-    sha256 = "1mpgn1d98dv66xs2j8gaxjiw26nzwl9a641lrday7h40g3k45g9v";
+  src = fetchFromGitHub {
+    owner = "chjj";
+    repo = "compton";
+    rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8";
+    sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18";
   };
 
   buildInputs = [
-    pkgconfig
-    dbus
-    libconfig
-    libdrm
-    libxml2
-    mesa
-    pcre
+    libX11
     libXcomposite
-    libXfixes
     libXdamage
-    libXinerama
-    libXrandr
     libXrender
+    libXrandr
     libXext
+    libXinerama
+    libdrm
+    pcre
+    libconfig
+    dbus
+    mesa_noglu
+  ];
+
+  nativeBuildInputs = [
+    pkgconfig
+    asciidoc
+    libxml2
+    docbook_xml_dtd_45
+    docbook_xsl
+    libxslt
+    makeWrapper
   ];
   
-  propagatedBuildInputs = [ xwininfo ];
-  
-  installFlags = "PREFIX=$(out)";
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/compton-trans \
+      --prefix PATH : ${lib.makeBinPath [ xwininfo ]}
+  '';
 
   meta = with stdenv.lib; {
-    homepage = https://github.com/chjj/compton/;
+    homepage = "https://github.com/chjj/compton/";
     description = "A fork of XCompMgr, a sample compositing manager for X servers";
     longDescription = ''
       A fork of XCompMgr, which is a sample compositing manager for X

From 21430431466df7ae54c9ecea7309f940d0a77c93 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 16 Feb 2017 09:48:26 -0600
Subject: [PATCH 0498/3449] isyncUnstable: download over https

---
 pkgs/tools/networking/isync/unstable.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix
index eae7167f2fed..9408546f6a05 100644
--- a/pkgs/tools/networking/isync/unstable.nix
+++ b/pkgs/tools/networking/isync/unstable.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   rev = "46e792";
 
   src = fetchgit {
-    url = "git://git.code.sf.net/p/isync/isync";
+    url = "https://git.code.sf.net/p/isync/isync";
     inherit rev;
     sha256 = "02bm5m3bwpfns7qdwfybyl4fwa146n55v67pdchkhxaqpa4ddws1";
   };

From 88fec3005bf29145271e21e42b8d21c98d14e3f2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 16 Feb 2017 09:48:45 -0600
Subject: [PATCH 0499/3449] isyncUnstable: 2015-11-08 -> 20161218

The extra dashes are removed from the version number because Nix treats only the
first component as the version, i.e. `2015-11-08` is version `2015` with two
tags `-11` and `-08`.
---
 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 9408546f6a05..c8e4231f7b5f 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-2015-11-08";
-  rev = "46e792";
+  name = "isync-git-20161218";
+  rev = "77acc268123b8233843ca9bc3dcf90669efde08f";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/isync/isync";
     inherit rev;
-    sha256 = "02bm5m3bwpfns7qdwfybyl4fwa146n55v67pdchkhxaqpa4ddws1";
+    sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj";
   };
 
   buildInputs = [ openssl pkgconfig db cyrus_sasl autoconf automake ];

From 3994004a6f8db87f0deb99afc2081bcc3c975d77 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 16 Feb 2017 09:50:18 -0600
Subject: [PATCH 0500/3449] isyncUnstable: build with zlib support

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

diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix
index c8e4231f7b5f..cf3882ad83bb 100644
--- a/pkgs/tools/networking/isync/unstable.nix
+++ b/pkgs/tools/networking/isync/unstable.nix
@@ -1,4 +1,4 @@
-{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl
+{ fetchgit, stdenv, openssl, pkgconfig, db, cyrus_sasl, zlib
 , autoconf, automake }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0i21cgmgm8acvd7xwdk9pll3kl6cxj9s1hakqzbwks8j4ncygwkj";
   };
 
-  buildInputs = [ openssl pkgconfig db cyrus_sasl autoconf automake ];
+  buildInputs = [ openssl pkgconfig db cyrus_sasl zlib autoconf automake ];
 
   preConfigure = ''
     touch ChangeLog

From 953a1e76a25239577441443848506a5a4c46c457 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 16 Feb 2017 09:50:31 -0600
Subject: [PATCH 0501/3449] isyncUnstable: add ttuegel to maintainers

---
 pkgs/tools/networking/isync/unstable.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/isync/unstable.nix b/pkgs/tools/networking/isync/unstable.nix
index cf3882ad83bb..a20fa2fe7371 100644
--- a/pkgs/tools/networking/isync/unstable.nix
+++ b/pkgs/tools/networking/isync/unstable.nix
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://isync.sourceforge.net/;
     description = "Free IMAP and MailDir mailbox synchronizer";
     license = licenses.gpl2Plus;
-
-    maintainers = with maintainers; [ the-kenny ];
+    maintainers = with maintainers; [ the-kenny ttuegel ];
     platforms = platforms.unix;
   };
 }

From b172684c17aa1eea76a996ab888cef13ea7a16af Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Feb 2017 22:32:45 +0000
Subject: [PATCH 0502/3449] amazon-init NixOS module: fix (I think) race
 condition with network

The initialization code is now a systemd service that explicitly
waits for network-online, so the occasional failure I was seeing
because the `nixos-rebuild` couldn't get anything from the binary
cache should stop. I hope!
---
 nixos/modules/virtualisation/amazon-init.nix | 29 ++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index c9356c9b4eaa..5797d9db4362 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -1,20 +1,18 @@
-{ config, pkgs, modulesPath, ... }:
-
-# This attempts to pull a nix expression from this EC2 instance's user-data.
+{ config, pkgs, ... }:
 
 let
-  bootScript = pkgs.writeScript "bootscript.sh" ''
+  script = ''
     #!${pkgs.stdenv.shell} -eu
 
     echo "attempting to fetch configuration from EC2 user data..."
 
+    export HOME=/root
     export PATH=${pkgs.lib.makeBinPath [ config.nix.package pkgs.systemd pkgs.gnugrep pkgs.gnused config.system.build.nixos-rebuild]}:$PATH
     export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
     userData=/etc/ec2-metadata/user-data
 
     if [ -s "$userData" ]; then
-
       # If the user-data looks like it could be a nix expression,
       # copy it over. Also, look for a magic three-hash comment and set
       # that as the channel.
@@ -43,7 +41,22 @@ let
     nixos-rebuild switch
   '';
 in {
-  boot.postBootCommands = ''
-    ${bootScript} &
-  '';
+  systemd.services.amazon-init = {
+    inherit script;
+    description = "Reconfigure the system from EC2 userdata on startup";
+
+    wantedBy = [ "sshd.service" ];
+    before = [ "sshd.service" ];
+    after = [ "network-online.target" ];
+    requires = [ "network-online.target" ];
+ 
+    restartIfChanged = false;
+    unitConfig.X-StopOnRemoval = false;
+
+    serviceConfig = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+    };
+  };
 }
+

From 69363e96113598d95f9083346d5600cc64e349fd Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Wed, 15 Feb 2017 22:01:38 +0000
Subject: [PATCH 0503/3449] Move scrapy to its own module and add patch to fix
 broken permission code.

Scrapy is usually installed via pip where copying all permissions
makes sense. In Nix the files copied are owned by root and
readonly. As a consequence scrapy can't edit the project templates so

  scrapy startproject

fails.
---
 .../python-modules/scrapy/default.nix         | 38 +++++++++++++++++++
 .../scrapy/permissions-fix.patch              | 28 ++++++++++++++
 pkgs/top-level/python-packages.nix            | 29 +-------------
 3 files changed, 67 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/scrapy/default.nix
 create mode 100644 pkgs/development/python-modules/scrapy/permissions-fix.patch

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
new file mode 100644
index 000000000000..8f3b2ef74b21
--- /dev/null
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -0,0 +1,38 @@
+{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
+  testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
+  service-identity, parsel, pydispatcher, cssselect, lib }:
+buildPythonPackage rec {
+    name = "Scrapy-${version}";
+    version = "1.3.1";
+
+    buildInputs = [ glibcLocales mock pytest botocore testfixtures pillow ];
+    propagatedBuildInputs = [
+      six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
+    ];
+
+    # Scrapy is usually installed via pip where copying all
+    # permissions makes sense. In Nix the files copied are owned by
+    # root and readonly. As a consequence scrapy can't edit the
+    # project templates.
+    patches = [ ./permissions-fix.patch ];
+
+    LC_ALL="en_US.UTF-8";
+
+    checkPhase = ''
+      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
+      # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
+    '';
+
+    src = fetchurl {
+      url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
+      sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk";
+    };
+
+    meta = with lib; {
+      description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
+      homepage = "http://scrapy.org/";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ drewkett ];
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/development/python-modules/scrapy/permissions-fix.patch b/pkgs/development/python-modules/scrapy/permissions-fix.patch
new file mode 100644
index 000000000000..5ea5269c799e
--- /dev/null
+++ b/pkgs/development/python-modules/scrapy/permissions-fix.patch
@@ -0,0 +1,28 @@
+diff --git a/scrapy/commands/startproject.py b/scrapy/commands/startproject.py
+index 5941066..89f8edb 100644
+--- a/scrapy/commands/startproject.py
++++ b/scrapy/commands/startproject.py
+@@ -4,7 +4,7 @@ import os
+ import string
+ from importlib import import_module
+ from os.path import join, exists, abspath
+-from shutil import ignore_patterns, move, copy2, copystat
++from shutil import ignore_patterns, move, copyfile, copystat
+ 
+ import scrapy
+ from scrapy.commands import ScrapyCommand
+@@ -76,8 +76,7 @@ class Command(ScrapyCommand):
+             if os.path.isdir(srcname):
+                 self._copytree(srcname, dstname)
+             else:
+-                copy2(srcname, dstname)
+-        copystat(src, dst)
++                copyfile(srcname, dstname)
+ 
+     def run(self, args, opts):
+         if len(args) not in (1, 2):
+@@ -118,4 +117,3 @@ class Command(ScrapyCommand):
+         _templates_base_dir = self.settings['TEMPLATES_DIR'] or \
+             join(scrapy.__path__[0], 'templates')
+         return join(_templates_base_dir, 'project')
+-    
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12d59d9847c9..03f6d7ce07eb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31002,35 +31002,8 @@ EOF
     };
   };
 
-  scrapy = buildPythonPackage rec {
-    name = "Scrapy-${version}";
-    version = "1.3.1";
+  scrapy = callPackage ../development/python-modules/scrapy { };
 
-    buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ];
-    propagatedBuildInputs = with self; [
-      six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher
-    ];
-
-    LC_ALL="en_US.UTF-8";
-
-    checkPhase = ''
-      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
-      # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
-    '';
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/S/Scrapy/${name}.tar.gz";
-      sha256 = "0s5qkxwfq842maxjd2j82ldp4dyb70kla3z5rr56z0p7ig53cbvk";
-    };
-
-    meta = {
-      description = "A fast high-level web crawling and web scraping framework, used to crawl websites and extract structured data from their pages";
-      homepage = "http://scrapy.org/";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ drewkett ];
-      platforms = platforms.linux;
-    };
-  };
   pandocfilters = buildPythonPackage rec{
     version = "1.4.1";
     pname = "pandocfilters";

From 2ad43792ad511cc051b7f9d1dc380737a7b5a53f Mon Sep 17 00:00:00 2001
From: James Alexander Feldman-Crough <alex@fldcr.com>
Date: Thu, 16 Feb 2017 08:54:28 -0800
Subject: [PATCH 0504/3449] Remove redundant "fetchSubmodules" attr

---
 pkgs/applications/misc/polybar/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index ef08ad2f1b4d..aceaf43ac976 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
       url = "https://github.com/jaagr/polybar";
       rev = "1f31870d43f5cd87a5529a55b1d2d3e64105e0af";
       sha256 = "1nhj4npqhs6zy161931sbdi52gz6163lik0wri9wr122sjf90jas";
-      fetchSubmodules = true;
     };
 
     meta = with stdenv.lib; {

From 1c366b4e0647abea0385395dcb2981a5b3161cf8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 16 Feb 2017 17:01:56 +0000
Subject: [PATCH 0505/3449] nixops: update to 1.5

(cherry picked from commit 780a38c611162c34229c9d06b09dd4ec2f8466f4)
---
 pkgs/tools/package-management/nixops/default.nix  | 4 ++--
 pkgs/tools/package-management/nixops/generic.nix  | 4 +++-
 pkgs/tools/package-management/nixops/unstable.nix | 7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index bba392e30e76..820bcbb9a35a 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.4";
+  version = "1.5";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd";
+    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
   };
 })
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 87ed6295977f..4d67e8a5d6f5 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -23,8 +23,10 @@ python2Packages.buildPythonApplication {
       azure-mgmt-resource
       azure-mgmt-storage
       adal
-      pysqlite  # Go back to builtin sqlite once Python 2.7.13 is released
+      # Go back to sqlite once Python 2.7.13 is released
+      pysqlite
       datadog
+      digital-ocean
     ];
 
   doCheck = false;
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index fb5791be2397..820bcbb9a35a 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -1,10 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "2016-11-23";
+  version = "1.5";
   src = fetchurl {
-    # Hydra doesn't serve production outputs anymore :(
-    url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2";
-    sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz";
+    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
+    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
   };
 })

From 55cc7700e968001c9ac79190fbcf25ed3620680a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 Feb 2017 18:16:06 +0100
Subject: [PATCH 0506/3449] Revert "Merge: glibc: 2.24 -> 2.25"

This reverts commit 1daf2e26d221712dfbe72f9f6d2f73ef230cc43c, reversing
changes made to c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4.

It seems this is what has been causing all the reliability problems
on Hydra.  I'm currently unable to find why it happens, so I'm forced
to revert the update for now.  Discussion: #22874.
---
 pkgs/development/libraries/fontconfig/default.nix | 10 ----------
 pkgs/development/libraries/glibc/common.nix       |  6 +++---
 pkgs/development/libraries/glibc/default.nix      |  2 +-
 pkgs/tools/misc/findutils/default.nix             |  3 +--
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 14983b744df9..0130ee2a014b 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -28,17 +28,7 @@ stdenv.mkDerivation rec {
       src = ./config-compat.patch;
       inherit configVersion;
     })
-    (fetchpatch {
-      name = "glibc-2.25.diff";
-      url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
-      sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
-    })
   ];
-  # additionally required for the glibc-2.25 patch; avoid requiring gperf
-  postPatch = ''
-    sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
-    touch src/*
-  '';
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 7128f5606193..32c1b3647372 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -10,8 +10,8 @@ cross:
 , preConfigure ? "", ... }@args:
 
 let
-  version = "2.25";
-  sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
+  version = "2.24";
+  sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by";
 in
 
 assert cross != null -> gccCross != null;
@@ -138,7 +138,7 @@ stdenv.mkDerivation ({
     lib.optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
-    url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
+    url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index a46f97e0e051..d6c496819da5 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -81,7 +81,7 @@ in
       # to bootstrap-tools; on cross-arm this stripping would break objects.
       if [ -z "$crossConfig" ]; then
         for i in "$out"/lib/*.a; do
-            [ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
+            strip -S "$i"
         done
       fi
 
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 549175ed7b01..1271aa8c9863 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -10,8 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ coreutils ];
 
-  # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
-  doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
+  doCheck = !stdenv.isDarwin;
 
   outputs = [ "out" "info" ];
 

From 524de86db03a0dbecb9c51353cdd70bc0b74a8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 Feb 2017 19:16:51 +0100
Subject: [PATCH 0507/3449] findutils: plug a memory leak (close #22857)

Using the upstream patch directly.  It's copied in nixpkgs, because:
 - fetchpatch isn't usable at this point in bootstrapping,
 - the upstream patch creates collisions in NEWS.
---
 pkgs/tools/misc/findutils/default.nix       |  4 +++-
 pkgs/tools/misc/findutils/memory-leak.patch | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/findutils/memory-leak.patch

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 1271aa8c9863..086c72bdbb22 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
   };
 
-  nativeBuildInputs = [ coreutils ];
+  patches = [ ./memory-leak.patch ];
+
+  buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
 
   doCheck = !stdenv.isDarwin;
 
diff --git a/pkgs/tools/misc/findutils/memory-leak.patch b/pkgs/tools/misc/findutils/memory-leak.patch
new file mode 100644
index 000000000000..56f65f856224
--- /dev/null
+++ b/pkgs/tools/misc/findutils/memory-leak.patch
@@ -0,0 +1,21 @@
+http://git.savannah.gnu.org/cgit/findutils.git/patch/?id=c1556892a
+diff --git a/find/fstype.c b/find/fstype.c
+index 535f920..a0ac8bc 100644
+--- a/find/fstype.c
++++ b/find/fstype.c
+@@ -75,14 +75,7 @@ free_file_system_list (struct mount_entry *p)
+   while (p)
+     {
+       struct mount_entry *pnext = p->me_next;
+-
+-      free (p->me_devname);
+-      free (p->me_mountdir);
+-
+-      if (p->me_type_malloced)
+-	free (p->me_type);
+-      p->me_next = NULL;
+-      free (p);
++      free_mount_entry (p);
+       p = pnext;
+     }
+ }

From c37464a9b1e533c723b5a63a016c939dbc921326 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 16 Feb 2017 13:32:39 -0500
Subject: [PATCH 0508/3449] ghostscript: fix installed library name on darwin

---
 pkgs/misc/ghostscript/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 22a148398c5c..285a5b4ee497 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -92,6 +92,10 @@ stdenv.mkDerivation rec {
     mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/"
 
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    for file in $out/lib/*.dylib* ; do
+      install_name_tool -id "$file" $file
+    done
   '';
 
   preFixup = lib.optionalString stdenv.isDarwin ''

From 5ad81ab09c86a7acc99b31224a6aeb8fca4c152e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 Feb 2017 20:03:21 +0100
Subject: [PATCH 0509/3449] libxml2: bugfix updates from git upstream

This should solve CVE-2016-5131 and some other bugs, but not what Suse
calls CVE-2016-9597: https://bugzilla.suse.com/show_bug.cgi?id=1017497
The bugzilla discussion seems to indicate that the CVE is referenced
incorrectly and only shows reproducing when using command-line flags
that are considered "unsafe".

CVE-2016-9318 also remains unfixed, as I consider their reasoning OK:
https://lwn.net/Alerts/714411/

/cc #22826.
---
 pkgs/development/libraries/libxml2/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 930227ed2434..d44a8c973fdc 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -17,19 +17,13 @@ in stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      name = "CVE-2016-4658.patch";
-      url = "https://git.gnome.org/browse/libxml2/patch/?id=c1d1f7121194036608bf555f08d3062a36fd344b";
-      sha256 = "0q7i5qgwgzp2x4r820mqq3nx69bgkd7n0v00j28wa6hndbfaaxmb";
+      # Contains fixes for CVE-2016-{4658,5131} and other bugs.
+      name = "misc.patch";
+      url = "https://git.gnome.org/browse/libxml2/patch/?id=e905f081&id2=v2.9.4";
+      sha256 = "14rnzilspmh92bcpwbd6kqikj36gx78al42ilgpqgl1609krb5m5";
     })
   ];
 
-  # https://bugzilla.gnome.org/show_bug.cgi?id=766834#c5
-  postPatch = "patch -R < " + fetchpatch {
-    name = "schemas-validity.patch";
-    url = "https://git.gnome.org/browse/libxml2/patch/?id=f6599c5164";
-    sha256 = "0i7a0nhxwkxx6dkm8917qn0bsfn1av6ghg2f4dxanxi4bn4b1jjn";
-  };
-
   outputs = [ "bin" "dev" "out" "doc" ]
     ++ lib.optional pythonSupport "py";
   propagatedBuildOutputs = "out bin" + lib.optionalString pythonSupport " py";

From 03024b39b7d4b94724faa1a62f21aed3531bb35a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 Feb 2017 20:24:56 +0100
Subject: [PATCH 0510/3449] tex4ht: fixup evaluation errors in the broken
 package

https://github.com/NixOS/nixpkgs/pull/22873#issuecomment-280390590
---
 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 f135d5edaf76..d136fd7dfb52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17840,7 +17840,7 @@ with pkgs;
 
   tewi-font = callPackage ../data/fonts/tewi  {};
 
-  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = null; };
+  tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; };
 
   texFunctions = callPackage ../tools/typesetting/tex/nix pkgs;
 

From 3f971d9863e4551aca97aefbb59f5d764f09f655 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Fri, 17 Feb 2017 01:17:30 +0530
Subject: [PATCH 0511/3449] vault: 0.6.4 -> 0.6.5

---
 pkgs/tools/security/vault/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 1eea59b71f33..0344fc0a74ee 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,7 +9,7 @@ let
   };
 in buildGoPackage rec {
   name = "vault-${version}";
-  version = "0.6.4";
+  version = "0.6.5";
 
   goPackagePath = "github.com/hashicorp/vault";
 
@@ -17,7 +17,7 @@ in buildGoPackage rec {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "0rrrzkza12zbbfc24q4q7ygfczq1j8ljsjagsa8vpp3375dflzdy";
+    sha256 = "0ci46zn9d9h26flgjf4inmvk4mb1hlixvx5g7vg02raw0cqvknnb";
   };
 
   buildFlagsArray = ''
@@ -33,6 +33,7 @@ in buildGoPackage rec {
   meta = with stdenv.lib; {
     homepage = https://www.vaultproject.io;
     description = "A tool for managing secrets";
+    platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
     maintainers = with maintainers; [ rushmorem offline pradeepchhetri ];
   };

From 9debdaf512bc510f7f5d5450c4902e7d1f713274 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 2 Feb 2017 22:21:03 +0100
Subject: [PATCH 0512/3449] networking.bonds: add support for arbitrary
 driverOptions

Until now the four attributes available very selectively provided a small
subset, while copying upstream documentation.

We make driver options an arbitrary key-value set and point to kernel
documentation, which is always up-to-date. This way every option can be set.
The four already existing options are deprecated with a warning.
---
 .../tasks/network-interfaces-scripted.nix     | 36 +++++++++++++++----
 nixos/modules/tasks/network-interfaces.nix    | 20 +++++++++++
 nixos/tests/networking.nix                    |  2 +-
 3 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 062598de83e1..d94d9db54ca5 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -37,11 +37,24 @@ let
     ip link del "${i}" 2>/dev/null || true
   '';
 
-in
+  # warn that these attributes are deprecated (2017-2-2)
+  # Should be removed in the release after next
+  bondDeprecation = rec {
+    deprecated = [ "lacp_rate" "miimon" "mode" "xmit_hash_policy" ];
+    filterDeprecated = bond: (filterAttrs (attrName: attr:
+                         elem attrName deprecated && attr != null) bond);
+  };
 
-{
+  bondWarnings =
+    let oneBondWarnings = bondName: bond:
+          mapAttrsToList (bondText bondName) (bondDeprecation.filterDeprecated bond);
+        bondText = bondName: optName: _:
+          "${bondName}.${optName} is deprecated, use ${bondName}.driverOptions";
+    in {
+      warnings = flatten (mapAttrsToList oneBondWarnings cfg.bonds);
+    };
 
-  config = mkIf (!cfg.useNetworkd) {
+  normalConfig = {
 
     systemd.services =
       let
@@ -296,10 +309,11 @@ in
 
               echo "Creating new bond ${n}..."
               ip link add name "${n}" type bond \
-                ${optionalString (v.mode != null) "mode ${toString v.mode}"} \
-                ${optionalString (v.miimon != null) "miimon ${toString v.miimon}"} \
-                ${optionalString (v.xmit_hash_policy != null) "xmit_hash_policy ${toString v.xmit_hash_policy}"} \
-                ${optionalString (v.lacp_rate != null) "lacp_rate ${toString v.lacp_rate}"}
+              ${let opts = (mapAttrs (const toString)
+                             (bondDeprecation.filterDeprecated v))
+                           // v.driverOptions;
+                 in concatStringsSep "\n"
+                      (mapAttrsToList (set: val: "  ${set} ${val} \\") opts)}
 
               # !!! There must be a better way to wait for the interface
               while [ ! -d "/sys/class/net/${n}" ]; do sleep 0.1; done;
@@ -410,6 +424,14 @@ in
         KERNEL=="tun", TAG+="systemd"
       '';
 
+
   };
 
+in
+
+{
+  config = mkMerge [
+    bondWarnings
+    (mkIf (!cfg.useNetworkd) normalConfig)
+  ];
 }
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 28c7b358093d..898207ef7a3c 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -587,11 +587,28 @@ in
             description = "The interfaces to bond together";
           };
 
+          driverOptions = mkOption {
+            type = types.attrsOf types.str;
+            default = {};
+            example = literalExample {
+              interfaces = [ "eth0" "wlan0" ];
+              miimon = 100;
+              mode = "active-backup";
+            };
+            description = ''
+              Options for the bonding driver.
+              Documentation can be found in
+              <link xlink:href="https://www.kernel.org/doc/Documentation/networking/bonding.txt" />
+            '';
+
+          };
+
           lacp_rate = mkOption {
             default = null;
             example = "fast";
             type = types.nullOr types.str;
             description = ''
+              DEPRECATED, use `driverOptions`.
               Option specifying the rate in which we'll ask our link partner
               to transmit LACPDU packets in 802.3ad mode.
             '';
@@ -602,6 +619,7 @@ in
             example = 100;
             type = types.nullOr types.int;
             description = ''
+              DEPRECATED, use `driverOptions`.
               Miimon is the number of millisecond in between each round of polling
               by the device driver for failed links. By default polling is not
               enabled and the driver is trusted to properly detect and handle
@@ -614,6 +632,7 @@ in
             example = "active-backup";
             type = types.nullOr types.str;
             description = ''
+              DEPRECATED, use `driverOptions`.
               The mode which the bond will be running. The default mode for
               the bonding driver is balance-rr, optimizing for throughput.
               More information about valid modes can be found at
@@ -626,6 +645,7 @@ in
             example = "layer2+3";
             type = types.nullOr types.str;
             description = ''
+              DEPRECATED, use `driverOptions`.
               Selects the transmit hash policy to use for slave selection in
               balance-xor, 802.3ad, and tlb modes.
             '';
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 83103f35d482..8b573869c157 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -236,8 +236,8 @@ let
           firewall.allowPing = true;
           useDHCP = false;
           bonds.bond = {
-            mode = "balance-rr";
             interfaces = [ "eth1" "eth2" ];
+            driverOptions.mode = "balance-rr";
           };
           interfaces.eth1.ip4 = mkOverride 0 [ ];
           interfaces.eth2.ip4 = mkOverride 0 [ ];

From bb797c1390971753f17f33882cfd477bc0f6d186 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 3 Feb 2017 02:20:47 +0100
Subject: [PATCH 0513/3449] networking.networkd: adjust autmatic mapping of
 bonds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since the bonds interface changed to a lot more possible values we create a
mapping of kernel bond attribute names and values to networkd attributes.
Those match for the most part, but have to transformed slightly.

There is also an assert that unknown options won’t slip through silently.
---
 nixos/modules/system/boot/networkd.nix        |  2 +-
 .../tasks/network-interfaces-systemd.nix      | 68 ++++++++++++++++---
 2 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index be70bdbf0a91..f96dde153610 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -79,7 +79,7 @@ let
   checkBond = checkUnitConfig "Bond" [
     (assertOnlyFields [
       "Mode" "TransmitHashPolicy" "LACPTransmitRate" "MIIMonitorSec"
-      "UpDelaySec" "DownDelaySec"
+      "UpDelaySec" "DownDelaySec" "GratuitousARP"
     ])
     (assertValueOneOf "Mode" [
       "balance-rr" "active-backup" "balance-xor"
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index cd599d8b8941..736292400fd4 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -115,17 +115,65 @@ in
             Name = name;
             Kind = "bond";
           };
-          bondConfig =
-            (optionalAttrs (bond.lacp_rate != null) {
-              LACPTransmitRate = bond.lacp_rate;
-            }) // (optionalAttrs (bond.miimon != null) {
-              MIIMonitorSec = bond.miimon;
-            }) // (optionalAttrs (bond.mode != null) {
-              Mode = bond.mode;
-            }) // (optionalAttrs (bond.xmit_hash_policy != null) {
-              TransmitHashPolicy = bond.xmit_hash_policy;
-            });
+          bondConfig = let
+            # manual mapping as of 2017-02-03
+            # man 5 systemd.netdev [BOND]
+            # to https://www.kernel.org/doc/Documentation/networking/bonding.txt
+            # driver options.
+            driverOptionMapping = let
+              trans = f: optName: { valTransform = f; optNames = [optName]; };
+              simp  = trans id;
+              ms    = trans (v: v + "ms");
+              in {
+                Mode                       = simp "mode";
+                TransmitHashPolixy         = simp "xmit_hash_policy";
+                LACPTransmitRate           = simp "lacp_rate";
+                MIIMonitorSec              = ms "miimon";
+                UpDelaySec                 = ms "updelay";
+                DownDelaySec               = ms "downdelay";
+                LearnPacketIntervalSec     = simp "lp_interval";
+                AdSelect                   = simp "ad_select";
+                FailOverMACPolicy          = simp "fail_over_mac";
+                ARPValidate                = simp "arp_validate";
+                # apparently in ms for this value?! Upstream bug?
+                ARPIntervalSec             = simp "arp_interval";
+                ARPIPTargets               = simp "arp_ip_target";
+                ARPAllTargets              = simp "arp_all_targets";
+                PrimaryReselectPolicy      = simp "primary_reselect";
+                ResendIGMP                 = simp "resend_igmp";
+                PacketsPerSlave            = simp "packets_per_slave";
+                GratuitousARP = { valTransform = id;
+                                  optNames = [ "num_grat_arp" "num_unsol_na" ]; };
+                AllSlavesActive            = simp "all_slaves_active";
+                MinLinks                   = simp "min_links";
+              };
+
+            do = bond.driverOptions;
+            assertNoUnknownOption = let
+              knownOptions = flatten (mapAttrsToList (_: kOpts: kOpts.optNames)
+                                                     driverOptionMapping);
+              # options that apparently don’t exist in the networkd config
+              unknownOptions = [ "primary" ];
+              assertTrace = bool: msg: if bool then true else builtins.trace msg false;
+              in assert all (driverOpt: assertTrace
+                               (elem driverOpt (knownOptions ++ unknownOptions))
+                               "The bond.driverOption `${driverOpt}` cannot be mapped to the list of known networkd bond options. Please add it to the mapping above the assert or to `unknownOptions` should it not exist in networkd.")
+                            (mapAttrsToList (k: _: k) do); "";
+            # get those driverOptions that have been set
+            filterSystemdOptions = filterAttrs (sysDOpt: kOpts:
+                                     any (kOpt: do ? "${kOpt}") kOpts.optNames);
+            # build final set of systemd options to bond values
+            buildOptionSet = mapAttrs (_: kOpts: with kOpts;
+                               # we simply take the first set kernel bond option
+                               # (one option has multiple names, which is silly)
+                               head (map (optN: valTransform (do."${optN}"))
+                                 # only map those that exist
+                                 (filter (o: do ? "${o}") optNames)));
+            in seq assertNoUnknownOption
+                   (buildOptionSet (filterSystemdOptions driverOptionMapping));
+
         };
+
         networks = listToAttrs (flip map bond.interfaces (bi:
           nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) {
             DHCP = mkOverride 0 (dhcpStr false);

From 0cee46dd217641baf09a8dee40e80ff4c32d47d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 16 Feb 2017 21:34:44 +0100
Subject: [PATCH 0514/3449] brotli: update to 0.5.2

From 0.3.0
---
 pkgs/tools/compression/brotli/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index eac4af0ec5f0..921802166718 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -1,25 +1,19 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchFromGitHub, cmake }:
 
 # ?TODO: there's also python lib in there
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "0.3.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1ijwr8fbrajp4gh8x6lrrpf8gymm0i6w06s97rv294q5dcszn299";
+    sha256 = "0wjypkzhbv30x30j2z8ba45r6nm4k98hsa4i42kqx03vzarsr2l4";
   };
 
-  preConfigure = "cd tools";
-
-  # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now.
-  installPhase = ''
-    mkdir -p "$out/bin"
-    mv ./bro "$out/bin/"
-  '';
+  buildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From e62fe375757fb3175b859bb6dc171a23e15726c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 16 Feb 2017 21:46:48 +0100
Subject: [PATCH 0515/3449] zstd: update to 1.1.3

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

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index d966175f50da..dba6e6fc3376 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "1.1.1";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
-    sha256 = "18snd1jiz0j6r1yk4vkgqmil2gbzwxgmcv2chvpnc5i93pp18hri";
+    sha256 = "1d46hs6pyq55izcmnk7hzvbl8iyxh7bp7qchc7rl8ay396ax2sd5";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";

From 6c1ba728789073f182a9d30d061ceb962fbdb1ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 Feb 2017 22:17:51 +0100
Subject: [PATCH 0516/3449] kde5.khotkey: fix patch hash wrongly added in
 b719852

---
 pkgs/desktops/kde-5/plasma/khotkeys.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/kde-5/plasma/khotkeys.nix
index 97beabc6b513..f23a17e5479e 100644
--- a/pkgs/desktops/kde-5/plasma/khotkeys.nix
+++ b/pkgs/desktops/kde-5/plasma/khotkeys.nix
@@ -12,7 +12,7 @@ plasmaPackage {
     # Patch is in 5.9 and up.
     (fetchpatch {
       url = "https://cgit.kde.org/khotkeys.git/patch/?id=f8f7eaaf41e2b95ebfa4b2e35c6ee252524a471b";
-      sha256 = "1jpd9zwrvp7pwv6v5cx6aqr2p1zhismpig7xv71wfxi7skfh3389";
+      sha256 = "1wxx3qv16jd623jh728xcda8i4y1daq25skwilhv4cfvqxyzk7nn";
     })
   ];
   propagatedBuildInputs = [

From 0c42efd9d70774eafb47212967caada630335731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 16 Feb 2017 22:24:40 +0100
Subject: [PATCH 0517/3449] SDL2: fix creation of libSDL2main.a

It's required by a trigger rally update I will commit next.
And other games use that too.
---
 pkgs/development/libraries/SDL2/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 5d818cb315c5..719329bd528f 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
   # https://bugzilla.libsdl.org/show_bug.cgi?id=1431
   dontDisableStatic = true;
 
+  enableParallelBuilding = true;
+
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems
   # to fail at doing this, hence `--disable-pulseaudio-shared'.
@@ -62,6 +64,7 @@ stdenv.mkDerivation rec {
   };
 
   postInstall = ''
+    moveToOutput lib/libSDL2main.a "$dev"
     rm $out/lib/*.a
     moveToOutput bin/sdl2-config "$dev"
   '';

From 1e7da9ec78d11f586fc74747d77b17f91969a7ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 16 Feb 2017 22:25:23 +0100
Subject: [PATCH 0518/3449] trigger: update to 0.6.5

---
 pkgs/games/trigger/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix
index 9f7a1844f9ee..df005af39e57 100644
--- a/pkgs/games/trigger/default.nix
+++ b/pkgs/games/trigger/default.nix
@@ -1,20 +1,20 @@
-{ fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, glew }:
+{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, mesa, glew }:
 
 stdenv.mkDerivation rec {
-  name = "trigger-rally-0.6.3";
+  name = "trigger-rally-0.6.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/trigger-rally/${name}.tar.gz";
-    sha256 = "103mv4vpq335mrmgzlhahrfncq7ds3b5ip5a52967rv2j6hhzpvy";
+    sha256 = "095s4sx0s1ijlarkh84rvzlv4nxh9llrsal1lb3m3pf0v228gnzj";
   };
 
-  buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa glew ];
+  buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib mesa glew ];
 
   preConfigure = ''
     sed s,/usr/local,$out, -i bin/*defs
 
     cd src
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL2.dev}/include/SDL2"
     export makeFlags="$makeFlags prefix=$out"
   '';
 
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/trigger-rally
   '';
 
-  # search.patch :   fix c++ error.
-  patches = [ ./search.patch ];
-
   meta = {
     description = "Rally";
     homepage = http://trigger-rally.sourceforge.net/;

From 6e12406e30b263ea7ce49a784c85f5a727b5fc8a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 16 Feb 2017 22:43:49 +0100
Subject: [PATCH 0519/3449] Revert "nginx: Format the config file"

This reverts commit e362a3d5c94ba379d428fbd2cc40470719a61556.

See #22883
---
 .../services/web-servers/nginx/default.nix        | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index aa11a5d5e80a..9e93e56b9c2c 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -16,20 +16,7 @@ let
   ) cfg.virtualHosts;
   enableIPv6 = config.networking.enableIPv6;
 
-  configFile = pkgs.runCommand "nginx.conf" {
-    inherit configFileUnformatted;
-    passAsFile = [ "configFileUnformatted" ];
-    # configFileUnformatted is created locally, therefore so should this be.
-    preferLocalBuild = true;
-    allowSubstitutes = false;
-  } ''
-    cp ${configFileUnformatted} nginx.conf
-    chmod u+w nginx.conf
-    ${pkgs.nginx-config-formatter}/bin/nginxfmt nginx.conf
-    cp nginx.conf $out
-  '';
-
-  configFileUnformatted = pkgs.writeText "nginx.unformatted.conf" ''
+  configFile = pkgs.writeText "nginx.conf" ''
     user ${cfg.user} ${cfg.group};
     error_log stderr;
     daemon off;

From 110f136dc26902b4d985179117d5761c14280080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 16 Feb 2017 23:10:42 +0100
Subject: [PATCH 0520/3449] python*: upstream patches to fix with glibc-2.25

https://bugs.python.org/issue29157
The 3.6 release already contains the fix (from 3.5);
the branches in-between are claimed to be unaffected.
/cc #22874.
---
 .../interpreters/python/cpython/2.7/default.nix   |  2 ++
 .../python/cpython/2.7/glibc-2.25-enosys.patch    | 15 +++++++++++++++
 .../interpreters/python/cpython/3.5/default.nix   | 10 +++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 15b21b5bed9b..ccf9296e0bcb 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -66,6 +66,8 @@ let
       # libuuid, slowing down program startup a lot).
       ./no-ldconfig.patch
 
+      ./glibc-2.25-enosys.patch
+
     ] ++ optionals stdenv.isCygwin [
       ./2.5.2-ctypes-util-find_library.patch
       ./2.5.2-tkinter-x11.patch
diff --git a/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch b/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch
new file mode 100644
index 000000000000..31da78e35f1c
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/2.7/glibc-2.25-enosys.patch
@@ -0,0 +1,15 @@
+https://bugs.python.org/issue29157
+https://github.com/python/cpython/commit/01bdbad3e951
+diff --git a/Python/random.c b/Python/random.c
+index 2f83b5d..0b775ec 100644
+--- a/Python/random.c
++++ b/Python/random.c
+@@ -98,7 +98,7 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise)
+ 
+ /* Issue #25003: Don't use getentropy() on Solaris (available since
+  * Solaris 11.3), it is blocking whereas os.urandom() should not block. */
+-#elif defined(HAVE_GETENTROPY) && !defined(sun)
++#elif defined(HAVE_GETENTROPY) && !defined(sun) && !defined(linux)
+ #define PY_GETENTROPY 1
+ 
+ /* Fill buffer with size pseudo-random bytes generated by getentropy().
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 6e0b7614c7cb..215229086b75 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , bzip2
 , gdbm
 , lzma
@@ -55,6 +55,14 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  patches = [
+    (fetchpatch {
+      name = "glibc-2.25-enosys.patch";
+      url = https://github.com/python/cpython/commit/035ba5da3e53e.patch;
+      sha256 = "1y74ir1w5cq542w27rgzgp70chhq2x047db9911mihpab8p2nj71";
+    })
+  ];
+
   postPatch = optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   '';

From 31ff2ac05792a5132ae87c968c35bd51419750d1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 16 Feb 2017 23:56:27 +0100
Subject: [PATCH 0521/3449] systemd: add patch to fix docker

https://github.com/systemd/systemd/commit/843d5baf6aad6c53fc00ea8d95d83209a4f92de1

"don't use the unified hierarchy for the systemd cgroup yet"

fixes #22472
---
 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 3248b93a5229..db474f688e59 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 = "9a35924a4f15dab2a84b3104b1cd125a3c36f77d";
-    sha256 = "1z3rishvjlr5d4qgd262r13z04vzvlrlgwm7kpsf4hk7w0gmz4i5";
+    rev = "c110fc3504d7a2fa944575b347814f7e97d3c5a0";
+    sha256 = "19carch1adad70nifbqdx649kj5m8pgpiq27hh05ig38yrbmb2vz";
   };
 
   outputs = [ "out" "lib" "man" "dev" ];

From 108c6d1a03ea945a9c6d9de8b36dce3c262a8686 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 02:02:26 +0100
Subject: [PATCH 0522/3449] socat: 1.7.3.1 -> 1.7.3.2

fixes compatibility with openssl 1.1.0 (and libressl)
---
 pkgs/tools/networking/socat/default.nix       |  6 ++----
 .../tools/networking/socat/enable-ecdhe.patch | 19 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/tools/networking/socat/enable-ecdhe.patch

diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index 19cdb884bd1a..0e9efb028ba8 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchurl, openssl, readline }:
 
 stdenv.mkDerivation rec {
-  name = "socat-1.7.3.1";
+  name = "socat-1.7.3.2";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj";
+    sha256 = "0lcj6zpra33xhgvhmz9l3cqz10v8ybafb8dd1yqkwf1rhy01ymp3";
   };
 
   buildInputs = [ openssl readline ];
 
-  patches = [ ./enable-ecdhe.patch ./libressl-fixes.patch ];
-
   hardeningEnable = [ "pie" ];
 
   meta = {
diff --git a/pkgs/tools/networking/socat/enable-ecdhe.patch b/pkgs/tools/networking/socat/enable-ecdhe.patch
deleted file mode 100644
index ad63ec287bcf..000000000000
--- a/pkgs/tools/networking/socat/enable-ecdhe.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- socat-1.7.3.0/xio-openssl.c	2015-01-24 15:33:42.000000000 +0100
-+++ socat-1.7.3.0-ecdhe/xio-openssl.c	2015-01-25 13:38:54.353641097 +0100
-@@ -960,7 +960,6 @@
-       }
-    }
-
--#if defined(EC_KEY)	/* not on Openindiana 5.11 */
-    {
-       /* see http://openssl.6102.n7.nabble.com/Problem-with-cipher-suite-ECDHE-ECDSA-AES256-SHA384-td42229.html */
-       int	 nid;
-@@ -982,7 +981,6 @@
-
-       SSL_CTX_set_tmp_ecdh(*ctx, ecdh);
-    }
--#endif /* !defined(EC_KEY) */
-
- #if OPENSSL_VERSION_NUMBER >= 0x00908000L
-    if (opt_compress) {
-

From 71e8ef6e766804214c16be4f432f921b6653d149 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 02:14:47 +0100
Subject: [PATCH 0523/3449] afflib: 3.7.6 -> 3.7.15

---
 pkgs/development/libraries/afflib/default.nix | 27 +++++++------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix
index 7f5767d2818f..8b7dddf0e151 100644
--- a/pkgs/development/libraries/afflib/default.nix
+++ b/pkgs/development/libraries/afflib/default.nix
@@ -1,29 +1,20 @@
-{ stdenv, fetchgit, zlib, curl, expat, fuse, openssl
-, autoconf, automake, libtool, python
+{ stdenv, fetchFromGitHub, zlib, curl, expat, fuse, openssl
+, autoreconfHook, python
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.7.6";
+  version = "3.7.15";
   name = "afflib-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/sshock/AFFLIBv3/";
-    rev = "refs/tags/v${version}";
-    sha256 = "08www22njllqz1j3jkmgn1p36sifxrjd6qlsa7ch4kqy4jaaka1k";
-    name = "afflib-${version}-checkout";
+  src = fetchFromGitHub {
+    owner = "sshock";
+    repo = "AFFLIBv3";
+    rev = "v${version}";
+    sha256 = "0ckg49m15lz5cxg0k12z2ys6v4smjr6l8bbazrvsqlm649gwd2bw";
   };
 
-  buildInputs = [ zlib curl expat fuse openssl 
-    libtool autoconf automake python
-    ];
+  buildInputs = [ zlib curl expat fuse openssl autoreconfHook python ];
 
-  preConfigure = ''
-    libtoolize -f
-    autoheader -f
-    aclocal
-    automake --add-missing -c 
-    autoconf -f
-  '';
 
   meta = {
     homepage = http://afflib.sourceforge.net/;

From 4277978fb26ddc18499b2e5cb9e11c3689dbec6c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 02:25:23 +0100
Subject: [PATCH 0524/3449] gsoap: 2.8.37 -> 2.8.42

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

diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix
index bf1d29dae0e8..89abd93180d9 100644
--- a/pkgs/development/libraries/gsoap/default.nix
+++ b/pkgs/development/libraries/gsoap/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gsoap-${version}";
-  version = "2.8.37";
+  version = "2.8.42";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/gsoap2/gsoap-2.8/gsoap_${version}.zip";
-    sha256 = "1nvf5hgwff1agqdzbn3qc5569jzm14qkwqws0673z6hv2l3lijx3";
+    sha256 = "0fav4lhdibwggkf495pggmqna632jxkh6q2mi32b9hsn883pg5m7";
   };
 
   buildInputs = [ unzip m4 bison flex openssl zlib ];

From 9d39e8b974900b98f376e49dabdeb7a614b99514 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 02:29:39 +0100
Subject: [PATCH 0525/3449] imapfilter: 2.6.3 -> 2.6.10

---
 .../networking/mailreaders/imapfilter.nix           | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index 1aa30ddcb67e..0606ed86e135 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, openssl, lua, pcre }:
+{ stdenv, fetchFromGitHub, openssl, lua, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "imapfilter-2.6.3";
+  name = "imapfilter-${version}";
+  version = "2.6.10";
 
-  src = fetchurl {
-    url = "https://github.com/lefcha/imapfilter/archive/v2.6.3.tar.gz";
-    sha256 = "0i6j9ilzh43b9gyqs3y3rv0d9yvbbg12gcbqbar9i92wdlnqcx0i";
+  src = fetchFromGitHub {
+    owner = "lefcha";
+    repo = "imapfilter";
+    rev = "v${version}";
+    sha256 = "1011pbgbaz43kmxcc5alv06jly9wqmqgr0b64cm5i1md727v3rzc";
   };
 
   makeFlagsArray = "PREFIX=$(out)";

From 80d8b8c71660aa9607d45481e8ece491bec302bc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 02:45:28 +0100
Subject: [PATCH 0526/3449] mongoc: 1.1.10 -> 1.5.4

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

diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 510dbe0e1904..56f11396e719 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -2,16 +2,13 @@
 , openssl, which
 }:
 
-let
-  version = "1.1.10";
-in
-
 stdenv.mkDerivation rec {
   name = "mongoc-${version}";
+  version = "1.5.4";
 
   src = fetchzip {
     url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
-    sha256 = "13yg8dpqgbpc44lsblr3szk2a5bnl2prlayv4xlkivx90m86lcx3";
+    sha256 = "0xjk3k76n8yz7zi6a0dx1wgpsvvn5qhpzrapdw4v3h49hwf7rc5q";
   };
 
   propagatedBuildInputs = [ libbson ];

From c3011fde96f4f8645ca8672ac02e91a16eba9276 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 02:50:58 +0100
Subject: [PATCH 0527/3449] neon: 0.30.1 -> 0.30.2

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

diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index bd27790447a8..e0156be5da52 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -14,12 +14,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.30.1";
+  version = "0.30.2";
   name = "neon-${version}";
 
   src = fetchurl {
     url = "http://www.webdav.org/neon/${name}.tar.gz";
-    sha256 = "1pawhk02x728xn396a1kcivy9gqm94srmgad6ymr9l0qvk02dih0";
+    sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv";
   };
 
   patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];

From f6778c8137e089c059742f13db21eced669a08d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 03:03:22 +0100
Subject: [PATCH 0528/3449] aircrack-ng: 1.2-rc3 -> 1.2-rc4

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

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 21f03f27ab70..3b7c2926bd49 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools, libnl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.2-rc3";
+  name = "aircrack-ng-1.2-rc4";
 
   src = fetchurl {
     url = "http://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "11a53acln0fpar6v75qlybzdg8hdwc9ssd06fxygr47yp755qncf";
+    sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr";
   };
 
   buildInputs = [ libpcap openssl zlib libnl pkgconfig ];

From df58ed2f131d19dfbf8b6bb1bab7490cf09cdebb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 03:43:45 +0100
Subject: [PATCH 0529/3449] hostapd: 2.5 -> 2.6

---
 pkgs/os-specific/linux/hostapd/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 63fd17117211..0fef297ea5f6 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,23 +1,15 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libnl, openssl, sqlite ? null }:
+{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "hostapd-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
-    sha256 = "0jn77r39ysshkzihv5rjbdajqazci59v2yab4rn05my09najs9wf";
+    sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/voidlinux/void-packages/a7bcbc258ba9884bccde831c0ae2069cade99e41/srcpkgs/wpa_supplicant/patches/patch-src_crypto_tls_openssl_c";
-      sha256 = "1ifa2i54a7ijsha197dyldal3m4q5i05ih2sk15f5a5ybb6x7vmp";
-      addPrefixes = true;
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libnl openssl sqlite ];
 

From 46966ad4e5458289c7b477f4b0cf84d5ff480e0a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 03:44:48 +0100
Subject: [PATCH 0530/3449] ipmitool: 1.8.15 -> 1.8.17

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

diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index 16bb05898416..dcbea5156771 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -2,14 +2,14 @@
 
 let
   pkgname = "ipmitool";
-  version = "1.8.15";
+  version = "1.8.17";
 in
 stdenv.mkDerivation {
   name = "${pkgname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz";
-    sha256 = "0y6g8xg9p854n7xm3kds8m3d53jrsllnknp8lcr3jscf99j4x5ph";
+    sha256 = "0qcrz1d1dbjg46n3fj6viglzcxlf2q15xa7bx9w1hm2hq1r3jzbi";
   };
 
   patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''

From 6729b9e23bb054a0cd6019c4d6dfc5fd209e85a7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 03:48:12 +0100
Subject: [PATCH 0531/3449] ircdHybrid: 8.2.2 -> 8.2.21

---
 pkgs/servers/irc/ircd-hybrid/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index 1f11f1526f94..82a571ca77c3 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib }:
 
-stdenv.mkDerivation {
-  name = "ircd-hybrid-8.2.2";
+stdenv.mkDerivation rec {
+  name = "ircd-hybrid-8.2.21";
 
   src = fetchurl {
-    url = mirror://sourceforge/ircd-hybrid/ircd-hybrid-8.2.2.tgz;
-    sha256 = "0k9w2mxgi03cpnmagshcr5v6qjgnmyidf966b50dd6yn1fgqcibm";
+    url = "mirror://sourceforge/ircd-hybrid/${name}.tgz";
+    sha256 = "19cgrgmmz1c72x4gxpd39f9ckm4j9cp1gpgvlkk73d3v13znfzy3";
   };
 
   buildInputs = [ openssl zlib ];
@@ -18,5 +18,6 @@ stdenv.mkDerivation {
   meta = {
     description = "An IPv6-capable IRC server";
     platforms = stdenv.lib.platforms.unix;
+    homepage = "http://www.ircd-hybrid.org/";
   };
 }

From bee26ba6b250e0cb2b3d2d52f7139a87d8c2056f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:02:16 +0100
Subject: [PATCH 0532/3449] lastpass-cli: 1.0.0 -> 1.1.1

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

diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index 7b6720a2139b..e40422399056 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }:
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
+, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }:
 
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "1.0.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "0hidx2qfr52bwjb6as4fbfa34jqh3zwvrcx590vbsji3bq4g7avb";
+    sha256 = "1slqrv877c1bhivgd2i9cr1lsd72371dpz6a3h6s56l3qbyk28sa";
   };
 
+  nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
-    openssl curl libxml2 pkgconfig asciidoc docbook_xsl libxslt
+    openssl curl libxml2 asciidoc docbook_xsl libxslt
   ];
 
   makeFlags = "PREFIX=$(out)";

From 7977cc4451a24119932755ba1ec5a38dc7b9c8f0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:03:33 +0100
Subject: [PATCH 0533/3449] ngircd: 21 -> 24

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

diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix
index ebc7e7c3128e..4dd57b17fed3 100644
--- a/pkgs/servers/irc/ngircd/default.nix
+++ b/pkgs/servers/irc/ngircd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, openssl, pam, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "ngircd-21";
+  name = "ngircd-24";
 
   src = fetchurl {
     url = "http://ngircd.barton.de/pub/ngircd/${name}.tar.xz";
-    sha256 = "19llx54zy6hc8k7kcs1f234qc20mqpnlnb30c663c42jxq5x6xii";
+    sha256 = "020h9d1awyxqr0l42x1fhs47q7cmm17fdxzjish8p2kq23ma0gqp";
   };
 
   configureFlags = [

From 900cc90fbe635ebdf614a7c7d205a9b292641c00 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:06:34 +0100
Subject: [PATCH 0534/3449] openfortivpn: 1.1.4 -> 1.2.0

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

diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix
index e3e2053e2ce6..3854d94f9093 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let repo = "openfortivpn";
-    version = "1.1.4";
+    version = "1.2.0";
 
 in stdenv.mkDerivation {
   name = "${repo}-${version}";
@@ -12,12 +12,12 @@ in stdenv.mkDerivation {
     owner = "adrienverge";
     inherit repo;
     rev = "v${version}";
-    sha256 = "08ycz053wa29ckgr93132hr3vrd84r3bks9q807qanri0n35y256";
+    sha256 = "1a1l9f6zivfyxg9g2x7kzkvcyh84s7l6v0kimihhrd19zl0m41jn";
   };
 
   buildInputs = [ openssl ppp autoreconfHook ];
 
-  hardeningDisable = [ "format" ];
+  NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";
 
   preConfigure = ''
     substituteInPlace src/tunnel.c --replace "/usr/sbin/pppd" "${ppp}/bin/pppd"

From 96b4d69136dabcdd718dc40d3e554ba24943feb6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:08:14 +0100
Subject: [PATCH 0535/3449] openisns: 0.95 -> 0.97

---
 pkgs/os-specific/linux/open-isns/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index 49100fc5a44b..bb4ee5e98777 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -1,17 +1,18 @@
 { stdenv, openssl, fetchFromGitHub }:
+
 stdenv.mkDerivation rec {
   name = "open-isns-${version}";
-  version = "0.95";
+  version = "0.97";
 
   src = fetchFromGitHub {
     owner = "gonzoleeman";
     repo = "open-isns";
     rev = "v${version}";
-    sha256 = "1c2x3yf9806gbjsw4xi805rfhyxk353a3whqvpccz8dwas6jajwh";
+    sha256 = "17aichjgkwjfp9dx1piw7dw8ddz1bgm5mk3laid2zvjks1h739k3";
   };
 
   propagatedBuildInputs = [ openssl ];
-  outputs = ["out" "lib" ];
+  outputs = [ "out" "lib" ];
   outputInclude = "lib";
 
   installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns";

From 643703366dd44bd0848dc302a959c5cce9a4d2bf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:14:04 +0100
Subject: [PATCH 0536/3449] pam_ssh_agent_auth: 0.9.5 -> 0.10.3

---
 .../linux/pam_ssh_agent_auth/default.nix      |  10 +-
 .../multiple-key-files.patch                  | 338 ------------------
 2 files changed, 2 insertions(+), 346 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch

diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
index db6f04674a08..9ce1ef6ae53d 100644
--- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
+++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
@@ -1,19 +1,13 @@
 { stdenv, fetchurl, pam, openssl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "pam_ssh_agent_auth-0.9.5";
+  name = "pam_ssh_agent_auth-0.10.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/pamsshagentauth/${name}.tar.bz2";
-    sha256 = "1aihfyj17nvqhf0d5i0dg2lsly3r24xjyx0sfqpf60s0libkp4y0";
+    sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw";
   };
 
-  patches =
-    [ # Allow multiple colon-separated authorized keys files to be
-      # specified in the file= option.
-      ./multiple-key-files.patch
-    ];
-
   buildInputs = [ pam openssl perl ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
deleted file mode 100644
index dc97b7d54f7c..000000000000
--- a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
+++ /dev/null
@@ -1,338 +0,0 @@
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c
---- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.c	2012-06-28 01:47:49.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.c	2012-12-17 19:29:16.014226336 +0000
-@@ -69,14 +69,14 @@
-     return cookie;
- }
- 
--int
-+const char *
- pamsshagentauth_find_authorized_keys(uid_t uid)
- {
-     Identity *id;
-     Key *key;
-     AuthenticationConnection *ac;
-     char *comment;
--    uint8_t retval = 0;
-+    const char *key_file = 0;
- 
-     OpenSSL_add_all_digests();
-     session_id2 = pamsshagentauth_session_id2_gen();
-@@ -90,13 +90,11 @@
-                 id->key = key;
-                 id->filename = comment;
-                 id->ac = ac;
--                if(userauth_pubkey_from_id(id)) {
--                    retval = 1;
--                }
-+                key_file = userauth_pubkey_from_id(id);
-                 pamsshagentauth_xfree(id->filename);
-                 pamsshagentauth_key_free(id->key);
-                 pamsshagentauth_xfree(id);
--                if(retval == 1)
-+                if(key_file)
-                     break;
-             }
-         }
-@@ -107,5 +105,5 @@
-     }
-     pamsshagentauth_xfree(session_id2);
-     EVP_cleanup();
--    return retval;
-+    return key_file;
- }
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h
---- pam_ssh_agent_auth-0.9.4-orig/iterate_ssh_agent_keys.h	2012-06-28 01:47:49.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/iterate_ssh_agent_keys.h	2012-12-17 19:28:57.454334806 +0000
-@@ -31,6 +31,6 @@
- #ifndef _ITERATE_SSH_AGENT_KEYS_H
- #define _ITERATE_SSH_AGENT_KEYS_H
- 
--int pamsshagentauth_find_authorized_keys(uid_t);
-+const char * pamsshagentauth_find_authorized_keys(uid_t);
- 
- #endif
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c
---- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.c	2012-06-28 01:47:49.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.c	2012-12-17 19:30:24.013830673 +0000
-@@ -60,7 +60,6 @@
- 
- #define strncasecmp_literal(A,B) strncasecmp( A, B, sizeof(B) - 1)
- 
--char           *authorized_keys_file = NULL;
- uint8_t         allow_user_owned_authorized_keys_file = 0;
- 
- #if ! HAVE___PROGNAME || HAVE_BUNDLE
-@@ -161,15 +160,13 @@
-         goto cleanexit;
-     }
- 
--    if(authorized_keys_file_input && user) {
--        /*
--         * user is the name of the target-user, and so must be used for validating the authorized_keys file
--         */
--        parse_authorized_key_file(user, authorized_keys_file_input);
--    } else {
--        pamsshagentauth_verbose("Using default file=/etc/security/authorized_keys");
--        authorized_keys_file = pamsshagentauth_xstrdup("/etc/security/authorized_keys");
--    }
-+    if (!authorized_keys_file_input || !user)
-+        authorized_keys_file_input = "/etc/security/authorized_keys";
-+
-+    /*
-+     * user is the name of the target-user, and so must be used for validating the authorized_keys file
-+     */
-+    parse_authorized_key_files(user, authorized_keys_file_input);
- 
-     /* 
-      * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter.
-@@ -177,16 +174,17 @@
-      */
- 
-     if(user && strlen(ruser) > 0) {
--        pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
-+        pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
- 
-         /* 
-          * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user
-          */
--        if(pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid)) {
--            pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
-+        const char *key_file;
-+        if((key_file = pamsshagentauth_find_authorized_keys(getpwnam(ruser)->pw_uid))) {
-+            pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file);
-             retval = PAM_SUCCESS;
-         } else {
--            pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
-+            pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
-         }
-     } else {
-         pamsshagentauth_logit("No %s specified, cannot continue with this form of authentication", (user) ? "ruser" : "user" );
-@@ -198,7 +196,7 @@
-     free(__progname);
- #endif
- 
--    free(authorized_keys_file);
-+    free_authorized_key_files();
- 
-     return retval;
- }
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod
---- pam_ssh_agent_auth-0.9.4-orig/pam_ssh_agent_auth.pod	2012-06-28 01:47:49.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/pam_ssh_agent_auth.pod	2012-12-17 19:52:35.968965448 +0000
-@@ -26,7 +26,7 @@
- 
- =item file=<path to authorized_keys>
- 
--Specify the path to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below) 
-+Specify the path(s) to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below). Paths are separated using colons.
- 
- =item allow_user_owned_authorized_keys_file
- 
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c
---- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.c	2012-06-28 01:47:49.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.c	2012-12-17 19:32:20.830157313 +0000
-@@ -79,66 +79,96 @@
- 
- #include "identity.h"
- #include "pam_user_key_allowed2.h"
-+#include "pam_user_authorized_keys.h"
- 
--extern char    *authorized_keys_file;
-+#define MAX_AUTHORIZED_KEY_FILES 16
-+
-+char           *authorized_keys_files[MAX_AUTHORIZED_KEY_FILES];
-+unsigned int    nr_authorized_keys_files = 0;
- extern uint8_t  allow_user_owned_authorized_keys_file;
- uid_t           authorized_keys_file_allowed_owner_uid;
- 
- void
--parse_authorized_key_file(const char *user, const char *authorized_keys_file_input)
-+parse_authorized_key_files(const char *user, const char *authorized_keys_file_input)
- {
--    char            fqdn[HOST_NAME_MAX] = "";
-+    const char      *pos = authorized_keys_file_input;
-     char            hostname[HOST_NAME_MAX] = "";
--    char            auth_keys_file_buf[4096] = "";
--    char           *slash_ptr = NULL;
--    char            owner_uname[128] = "";
--    size_t          owner_uname_len = 0;
--
--    /*
--     * temporary copy, so that both tilde expansion and percent expansion both get to apply to the path
--     */
--    strncat(auth_keys_file_buf, authorized_keys_file_input, sizeof(auth_keys_file_buf) - 1);
-+    char            fqdn[HOST_NAME_MAX] = "";
-+
-+#if HAVE_GETHOSTNAME
-+    *hostname = '\0';
-+    gethostname(fqdn, HOST_NAME_MAX);
-+    strncat(hostname, fqdn, strcspn(fqdn,"."));
-+#endif
- 
--    if(allow_user_owned_authorized_keys_file)
--        authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
-+    while (pos) {
-+        const char     *colon = strchr(pos, ':');
-+        char            auth_keys_file_buf[4096] = "";
-+        char           *slash_ptr = NULL;
-+        char            owner_uname[128] = "";
-+        size_t          owner_uname_len = 0;
-+
-+        strncat(auth_keys_file_buf, pos, sizeof(auth_keys_file_buf) - 1);
-+        if (colon) {
-+            auth_keys_file_buf[colon - pos] = 0;
-+            pos = colon + 1;
-+        } else {
-+            pos = 0;
-+        }
- 
--    if(*auth_keys_file_buf == '~') {
--        if(*(auth_keys_file_buf+1) == '/') {
-+        if(allow_user_owned_authorized_keys_file)
-             authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
-+
-+        if(*auth_keys_file_buf == '~') {
-+            if(*(auth_keys_file_buf+1) == '/') {
-+                authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
-+            }
-+            else {
-+                slash_ptr = strchr(auth_keys_file_buf,'/');
-+                if(!slash_ptr)
-+                    pamsshagentauth_fatal("cannot expand tilde in path without a `/'");
-+
-+                owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
-+                if(owner_uname_len > (sizeof(owner_uname) - 1) ) 
-+                    pamsshagentauth_fatal("Username too long");
-+
-+                strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
-+                if(!authorized_keys_file_allowed_owner_uid)
-+                    authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid;
-+            }
-+            char *tmp = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid);
-+            strncpy(auth_keys_file_buf, tmp, sizeof(auth_keys_file_buf) - 1 );
-+            pamsshagentauth_xfree(tmp);
-         }
--        else {
--            slash_ptr = strchr(auth_keys_file_buf,'/');
--            if(!slash_ptr)
--                pamsshagentauth_fatal("cannot expand tilde in path without a `/'");
--
--            owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
--            if(owner_uname_len > (sizeof(owner_uname) - 1) ) 
--                pamsshagentauth_fatal("Username too long");
--
--            strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
--            if(!authorized_keys_file_allowed_owner_uid)
--                authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid;
-+
-+        if(strstr(auth_keys_file_buf, "%h")) {
-+            authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
-         }
--        authorized_keys_file = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid);
--        strncpy(auth_keys_file_buf, authorized_keys_file, sizeof(auth_keys_file_buf) - 1 );
--        pamsshagentauth_xfree(authorized_keys_file) /* when we percent_expand later, we'd step on this, so free it immediately */;
--    }
- 
--    if(strstr(auth_keys_file_buf, "%h")) {
--        authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
-+        if (nr_authorized_keys_files >= MAX_AUTHORIZED_KEY_FILES)
-+            pamsshagentauth_fatal("Too many authorized key files");
-+        authorized_keys_files[nr_authorized_keys_files++] =
-+            pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL);
-     }
-+}
- 
--#if HAVE_GETHOSTNAME
--    *hostname = '\0';
--    gethostname(fqdn, HOST_NAME_MAX);
--    strncat(hostname, fqdn, strcspn(fqdn,"."));
--#endif
--    authorized_keys_file = pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL);
-+void
-+free_authorized_key_files()
-+{
-+    unsigned int n;
-+    for (n = 0; n < nr_authorized_keys_files; n++)
-+        free(authorized_keys_files[n]);
-+    nr_authorized_keys_files = 0;
- }
- 
--int
-+const char *
- pam_user_key_allowed(Key * key)
- {
--    return pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_file)
--        || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_file);
-+    unsigned int n;
-+    for (n = 0; n < nr_authorized_keys_files; n++) {
-+        if (pam_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_files[n])
-+            || pam_user_key_allowed2(getpwuid(0), key, authorized_keys_files[n]))
-+            return authorized_keys_files[n];
-+    }
-+    return 0;
- }
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h
---- pam_ssh_agent_auth-0.9.4-orig/pam_user_authorized_keys.h	2010-01-13 02:17:01.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/pam_user_authorized_keys.h	2012-12-17 19:24:34.477894517 +0000
-@@ -28,11 +28,12 @@
-  */
- 
- 
--#ifndef _PAM_USER_KEY_ALLOWED_H
--#define _PAM_USER_KEY_ALLOWED_H
-+#ifndef _PAM_USER_AUTHORIZED_KEYS_H
-+#define _PAM_USER_AUTHORIZED_KEYS_H
- 
- #include "identity.h"
--int pam_user_key_allowed(Key *);
--void parse_authorized_key_file(const char *, const char *);
-+const char * pam_user_key_allowed(Key *);
-+void parse_authorized_key_files(const char *, const char *);
-+void free_authorized_key_files();
- 
- #endif
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c
---- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.c	2012-06-28 01:47:49.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.c	2012-12-17 19:27:30.813843933 +0000
-@@ -51,7 +51,7 @@
- extern u_char  *session_id2;
- extern uint8_t  session_id_len;
- 
--int
-+const char *
- userauth_pubkey_from_id(Identity * id)
- {
-     Buffer          b = { 0 };
-@@ -59,11 +59,12 @@
-     u_char         *pkblob = NULL, *sig = NULL;
-     u_int           blen = 0, slen = 0;
-     int             authenticated = 0;
-+    const char     *key_file;
- 
-     pkalg = (char *) key_ssh_name(id->key);
- 
-     /* first test if this key is even allowed */
--    if(! pam_user_key_allowed(id->key))
-+    if(!(key_file = pam_user_key_allowed(id->key)))
-         goto user_auth_clean_exit;
- 
-     if(pamsshagentauth_key_to_blob(id->key, &pkblob, &blen) == 0)
-@@ -96,5 +97,5 @@
-     if(pkblob != NULL)
-         pamsshagentauth_xfree(pkblob);
-     CRYPTO_cleanup_all_ex_data();
--    return authenticated;
-+    return authenticated ? key_file : 0;
- }
-diff -ru -x '*~' pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h
---- pam_ssh_agent_auth-0.9.4-orig/userauth_pubkey_from_id.h	2010-01-13 02:17:01.000000000 +0000
-+++ pam_ssh_agent_auth-0.9.4/userauth_pubkey_from_id.h	2012-12-17 19:25:54.893412987 +0000
-@@ -32,6 +32,6 @@
- #define _USERAUTH_PUBKEY_FROM_ID_H
- 
- #include <identity.h>
--int userauth_pubkey_from_id(Identity *);
-+const char * userauth_pubkey_from_id(Identity *);
- 
- #endif

From 79e65969936f0b503f83033938f71c819d156375 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:30:01 +0100
Subject: [PATCH 0537/3449] s3backer: 1.4.2 -> 1.4.3

---
 pkgs/tools/filesystems/s3backer/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix
index d7e9c02d1ab3..cc31a6680597 100644
--- a/pkgs/tools/filesystems/s3backer/default.nix
+++ b/pkgs/tools/filesystems/s3backer/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig
 , fuse, curl, expat }:
-  
+
 stdenv.mkDerivation rec {
   name = "s3backer-${version}";
-  version = "1.4.2";
-  
+  version = "1.4.3";
+
   src = fetchFromGitHub {
-    sha256 = "0b9vmykrfpzs9is31pqb8xvgjraghnax1ph2jkbib1ya0vhxm8dj";
+    sha256 = "0fhkha5kap8dji3iy48cbszhq83b2anssscgjj9d5dsl5dj57zak";
     rev = version;
     repo = "s3backer";
     owner = "archiecobbs";

From 22bea837f4f0b20d5ea2bf9aca8054265c173efc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:37:29 +0100
Subject: [PATCH 0538/3449] tcltls: 1.6 -> 1.6.7

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

diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix
index dc0504454f61..29c96bea421b 100644
--- a/pkgs/development/libraries/tcltls/default.nix
+++ b/pkgs/development/libraries/tcltls/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tcltls-${version}";
-  version = "1.6";
+  version = "1.6.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/tls/tls${version}-src.tar.gz";
-    sha256 = "adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3";
+    sha256 = "1f53sfcnrridjl5ayrq1xrqkahs8khf8c3d0m2brndbhahzdw6ai";
   };
 
   buildInputs = [ tcl openssl ];

From 395ca86018eaa2aa6bcbdc16417de910361284d3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:39:24 +0100
Subject: [PATCH 0539/3449] tcpcrypt: 0.4 -> 0.5

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

diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix
index 222b861f937c..7ffec8c4c884 100644
--- a/pkgs/tools/security/tcpcrypt/default.nix
+++ b/pkgs/tools/security/tcpcrypt/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "tcpcrypt-${version}";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchFromGitHub {
     repo = "tcpcrypt";
     owner = "scslab";
     rev = "v${version}";
-    sha256 = "04n1qpf4x8x289xa7jndmx99xp0lbxjzjw013kf64i1n70i9wbnp";
+    sha256 = "0a015rlyvagz714pgwr85f8gjq1fkc0il7d7l39qcgxrsp15b96w";
   };
 
   postUnpack = ''mkdir -vp $sourceRoot/m4'';

From e1eda9764982814ef6f411f74ec5e27147775224 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:45:52 +0100
Subject: [PATCH 0540/3449] uftp: 4.9.2 -> 4.9.3

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

diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index 32dcb98b20ea..22cc5646f8bf 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -2,16 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "uftp-${version}";
-  version = "4.9.2";
+  version = "4.9.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
-    sha256 = "0pra2sm8rdscyqkagi2v99az1vxbcch47wkdnz9wv4qg1x5phpmr";
+    sha256 = "13y7k6g6jksnllw0mwgzw4dqczh5c5hvq3zlqin7q98m0fpib4ly";
   };
 
-  buildInputs = [
-    openssl
-  ];
+  buildInputs = [ openssl ];
 
   outputs = [ "out" "doc" ];
 

From fa98d417878a3ed09d839638e549dd9b93537c70 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:48:11 +0100
Subject: [PATCH 0541/3449] umurmr: 0.2.16 -> 0.2.16a

---
 pkgs/applications/networking/umurmur/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index 194b22f0fd72..19a077d15898 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "umurmur-${version}";
-  version = "0.2.16";
-  
+  version = "0.2.16a";
+
   src = fetchFromGitHub {
     owner = "fatbob313";
     repo = "umurmur";
     rev = version;
-    sha256 = "0njvdqvjda13v1a2yyjn47mb0l0cdfb2bfvb5s13wpgwy2xxk0px";
+    sha256 = "1xv1knrivy2i0ggwrczw60y0ayww9df9k6sif7klgzq556xk47d1";
   };
-  
+
   buildInputs = [ autoreconfHook openssl protobufc libconfig ];
 
   configureFlags = [

From c505564fc5d2b60e7a193b83371b8c644d4b22fa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 04:58:13 +0100
Subject: [PATCH 0542/3449] yara: 3.4.0 -> 3.5.0

---
 pkgs/tools/security/yara/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix
index 6a5269c03dc5..a3b3c1c0290f 100644
--- a/pkgs/tools/security/yara/default.nix
+++ b/pkgs/tools/security/yara/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, fetchFromGitHub, autoconf, automake, libtool, pcre
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pcre
 , withCrypto ? true, openssl
 , enableMagic ? true, file
 , enableCuckoo ? true, jansson
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.4.0";
+  version = "3.5.0";
   name = "yara-${version}";
 
   src = fetchFromGitHub {
-    owner = "plusvic";
+    owner = "VirusTotal";
     repo = "yara";
     rev = "v${version}";
-    sha256 = "1rv1xixbjqx1vkcij8r01rq08ncqgy6nn98xvkrpixwvi4fy956s";
+    sha256 = "18hn6acfj0cha9cv70f6hyaqf8qbgj0c0dm9db4v2q8z7cgi1681";
   };
 
   # FIXME: this is probably not the right way to make it work
@@ -34,10 +34,6 @@ stdenv.mkDerivation rec {
     EOF
   '';
   patches = [
-    (fetchurl {
-      url = "https://github.com/plusvic/yara/pull/261.diff";
-      sha256 = "1fkxnk84ryvrjq7p225xvw9pn5gm2bjia2jz38fclwbsaxdi6p3b";
-    })
     "staticlibrary.patch"
   ];
 

From 9593049e065e7b50843acb4ea69a80fbae3fa611 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 13:28:51 +0100
Subject: [PATCH 0543/3449] pkcs11helper: 1.11 -> 1.21

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

diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 9094eca26e5d..f59c538856ca 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pkcs11-helper-${version}";
-  version = "1.11";
+  version = "1.21";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "pkcs11-helper";
     rev = "${name}";
-    sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q";
+    sha256 = "17a2cssycl7fh44xikmhszigx57vvn0h2sjsnmsy3772kfj796b1";
   };
 
   buildInputs = [ pkgconfig openssl autoreconfHook ];

From b1d24a0472f6b24f63f9415bece4485cb16b0fcf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 15:27:00 +0100
Subject: [PATCH 0544/3449] libressl: default to 2.4 due to recent breakages

---
 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 f135d5edaf76..8e3db437174b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9023,7 +9023,7 @@ with pkgs;
 
   openslp = callPackage ../development/libraries/openslp {};
 
-  libressl = libressl_2_5;
+  libressl = libressl_2_4;
   libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix {
     fetchurl = fetchurlBoot;
   };

From 73ba9b0ef021773495d5cf59262bec23ba96ac18 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 17:29:51 +0100
Subject: [PATCH 0545/3449] facter: 3.5.1 -> 3.6.0

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

diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix
index 677981b97ca5..9f97a403159a 100644
--- a/pkgs/tools/system/facter/default.nix
+++ b/pkgs/tools/system/facter/default.nix
@@ -2,9 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "facter-${version}";
-  version = "3.5.1";
+  version = "3.6.0";
+
   src = fetchFromGitHub {
-    sha256 = "1rhfww0knjh6bj3b0ykxgfgw6rg2bzibkdrisq3nhl3djfq7r1a8";
+    sha256 = "1fwvjd84nw39lgclkz4kn90z84fs9lsama3ikq0qs1in3y3jfmvi";
     rev = version;
     repo = "facter";
     owner = "puppetlabs";
@@ -24,5 +25,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.womfoo ];
     platforms = platforms.linux;
   };
-
 }

From 38ef3bbc0845668cf8541bd06381e217a14c311e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Feb 2017 18:35:55 +0100
Subject: [PATCH 0546/3449] perlPackages.CryptOpenSSLRandom: 0.10 -> 0.11

---
 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 9ecb9c32002d..af7f520aab67 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2696,10 +2696,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CryptOpenSSLRandom = buildPerlPackage rec {
-    name = "Crypt-OpenSSL-Random-0.10";
+    name = "Crypt-OpenSSL-Random-0.11";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RU/RURBAN/${name}.tar.gz";
-      sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf";
+      sha256 = "0yjcabkibrkafywvdkmd1xpi6br48skyk3l15ni176wvlg38335v";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
     NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";

From 5063a8099b35a8f1705bccf3afd7cb95ec0a7d3e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 3 Feb 2017 01:56:15 +0100
Subject: [PATCH 0547/3449] serf: 1.3.7 -> 1.3.9

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

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 48c70695909e..c10a355dee02 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, kerberos, pkgconfig, gnused }:
 
 stdenv.mkDerivation rec {
-  name = "serf-1.3.7";
+  name = "serf-1.3.9";
 
   src = fetchurl {
-    url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2";
-    sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c";
+    url = "https://www.apache.org/dist/serf/${name}.tar.bz2";
+    sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
   };
 
   buildInputs = [ apr scons openssl aprutil zlib ]

From e400eb36d117d134eb8457ba18651684c1a15674 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 3 Feb 2017 02:21:52 +0100
Subject: [PATCH 0548/3449] nodejs: 6.9.1 -> 6.9.5

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

diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index b91ec8df6873..5fb122aefa86 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -10,12 +10,10 @@ let
   baseName = if enableNpm then "nodejs" else "nodejs-slim";
 in
   stdenv.mkDerivation (nodejs // rec {
-    version = "6.9.1";
+    version = "6.9.5";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "0a87vzb33xdg8w0xi3c605hfav3c9m4ylab1436whz3p0l9qvp8b";
+      sha256 = "1cxnsprv2sy2djskx6yfw14f578s1fwzvmvnw7rh75djajix3znp";
     };
-
   })
-

From 0abc8295908da264fed996593606bc541a936d1e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 3 Feb 2017 17:34:52 +0100
Subject: [PATCH 0549/3449] pythonPackages.pyopenssl: 16.1.0 -> 16.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1fa5303c3469..d42791b602b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21471,11 +21471,11 @@ in {
 
   pyopenssl = buildPythonPackage rec {
     name = "pyopenssl-${version}";
-    version = "16.1.0";
+    version = "16.2.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz";
-      sha256 = "88f7ada2a71daf2c78a4f139b19d57551b4c8be01f53a1cb5c86c2f3bf01355f";
+      sha256 = "0vji4yrfshs15xpczbhzhasnjrwcarsqg87n98ixnyafnyxs6ybp";
     };
 
     preCheck = ''

From 54018c8f6331641f97ebb9773a1f7956c2da24b4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Feb 2017 14:23:07 +0100
Subject: [PATCH 0550/3449] xmlsec: 1.2.20 -> 1.2.23

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

diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index b4c0a51f6ddc..468ab25fb11e 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -2,14 +2,14 @@
 , openssl, makeWrapper }:
 
 let
-  version = "1.2.20";
+  version = "1.2.23";
 in
 stdenv.mkDerivation rec {
   name = "xmlsec-${version}";
 
   src = fetchurl {
     url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
-    sha256 = "01bkbv2y3x8d1sf4dcln1x3y2jyj391s3208d9a2ndhglly5j89j";
+    sha256 = "17qfw5crkqn4v6xbkjxrjvcccfc00dy053892wrwv54qdk8n7m21";
   };
 
   buildInputs = [ makeWrapper libxml2 gnutls libxslt pkgconfig libgcrypt libtool openssl ];

From d9d66375ec58af5734cd7f995491dbc19a6d63dd Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Feb 2017 15:23:30 +0100
Subject: [PATCH 0551/3449] pythonPackages.boto3: 1.4.2 -> 1.4.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d42791b602b0..34ddf8a221c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3148,12 +3148,9 @@ in {
     '';
 
     meta = {
-      homepage = https://github.com/boto3/boto;
-
+      homepage = https://github.com/boto/boto3;
       license = stdenv.lib.licenses.asl20;
-
       description = "AWS SDK for Python";
-
       longDescription = ''
         Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
         Python, which allows Python developers to write software that makes use of

From 449c895f31f0e418aa7198428502c17f3aad5de2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Feb 2017 07:43:25 +0100
Subject: [PATCH 0552/3449] podofo: 0.9.4 -> 0.9.5

---
 pkgs/development/libraries/podofo/default.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index b68bc20ecf35..d7569c017a7a 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-, gcc5, openssl, libpng, lua5 }:
+, gcc5, openssl, libpng, lua5, pkgconfig, libidn, expat }:
 
 stdenv.mkDerivation rec {
-  name = "podofo-0.9.4";
+  name = "podofo-0.9.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
-    sha256 = "0ngqgwl38afmzcj2zpf18a2g63vhm2fp45cbf9z62129rdgm1pyc";
+    sha256 = "012kgfx5j5n6w4zkc1d290d2cwjk60jhzsjlr2x19g3yi75q2jc5";
   };
 
-  propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
-  nativeBuildInputs = [ cmake gcc5 ];
+  propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng libidn expat ];
+  nativeBuildInputs = [ cmake gcc5 pkgconfig ];
   buildInputs = [ lua5 stdenv.cc.libc ];
 
   crossAttrs = {
@@ -19,15 +19,6 @@ stdenv.mkDerivation rec {
       lua5.crossDrv stdenv.ccCross.libc ];
   };
 
-  # fix finding freetype-2.5
-  preConfigure = ''
-    substituteInPlace ./CMakeLists.txt \
-      --replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \
-      --replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype'
-
-    rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake
-  '';
-
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
 
   meta = {

From 72cda1667b03ac4db3d371719207fb2663ccc75b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Feb 2017 07:54:47 +0100
Subject: [PATCH 0553/3449] certbot: 0.9.3 -> 0.11.1

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

diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 3648cb2c1360..9ac6ed17f66a 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -4,13 +4,13 @@
 
 python2Packages.buildPythonApplication rec {
   name = "certbot-${version}";
-  version = "0.9.3";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     rev = "v${version}";
-    sha256 = "03yfr8vlq62l0h14qk03flrkbvbv9mc5cf6rmh37naj8jwpl8cic";
+    sha256 = "0f8s6wzj69gnqld6iaskmmwyg5zy5v3zwhp1n1izxixm0vhkzgrq";
   };
 
   propagatedBuildInputs = with python2Packages; [

From 538aed6dea201f3f4cee8cbfb4c2b5d075051962 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Feb 2017 08:59:55 +0100
Subject: [PATCH 0554/3449] twinkle: remove

---
 .../twinkle/boost_regex.patch                 | 17 -----
 .../instant-messengers/twinkle/default.nix    | 40 -----------
 .../instant-messengers/twinkle/libgsm.patch   | 70 -------------------
 .../twinkle/localetime_r_conflict.diff        | 13 ----
 .../twinkle/newer-libccrtp.diff               | 22 ------
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 164 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/twinkle/default.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
 delete mode 100644 pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff

diff --git a/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch b/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch
deleted file mode 100644
index 3d4c46b2431d..000000000000
--- a/pkgs/applications/networking/instant-messengers/twinkle/boost_regex.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: twinkle-1.4.2/configure.in
-===================================================================
---- twinkle-1.4.2.orig/configure.in	2013-07-25 11:07:54.160534950 -0400
-+++ twinkle-1.4.2/configure.in	2013-07-25 11:07:59.000000000 -0400
-@@ -294,7 +294,11 @@
- 	AC_CHECK_LIB(boost_regex-gcc, main, [
- 		LIBS="-lboost_regex-gcc $LIBS"
- 		echo "LIBS += -lboost_regex-gcc" >> $QT_INCL_PRO],
--		[AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])
-+		[
-+		AC_CHECK_LIB(boost_regex, main, [
-+			LIBS="-lboost_regex $LIBS"
-+			echo "LIBS += -lboost_regex" >> $QT_INCL_PRO],
-+			[AC_MSG_ERROR([libboost_regex library is missing (boost package).])])])])
- 
- ms_CHECK_LRELEASE()
- 	
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix
deleted file mode 100644
index 90528b35140a..000000000000
--- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, commoncpp2, ccrtp, openssl, boost
-, libsndfile, libxml2, libjpeg, readline, qt3, perl, file
-, alsaLib, speex, libzrtpcpp, xorg }:
-
-stdenv.mkDerivation rec {
-  name = "twinkle-1.4.2";
-
-  src = fetchurl {
-    url = "http://www.xs4all.nl/~mfnboer/twinkle/download/${name}.tar.gz";
-    sha256 = "19c9gqam78srsgv0463g7lfnv4mn5lvbxx3zl87bnm0vmk3qcxl0";
-  };
-
-  patches = [ # all from Debian
-    ./newer-libccrtp.diff
-    ./libgsm.patch
-    ./localetime_r_conflict.diff
-    ./boost_regex.patch # modified not to use "-mt" suffix
-  ];
-
-  configureFlags = "--with-extra-includes=${libjpeg.dev}/include";
-
-  buildInputs =
-    [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile
-      libxml2 libjpeg readline qt3 perl file ccrtp
-      # optional ? :
-      alsaLib speex
-      libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext
-    ];
-
-  NIX_CFLAGS_LINK = "-Wl,--as-needed -lboost_regex -lasound -lzrtpcpp -lspeex -lspeexdsp";
-
-  #enableParallelBuilding = true; # fatal error: messageform.h: No such file or directory
-
-  meta = with stdenv.lib; {
-    homepage = http://www.twinklephone.com/;
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch b/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch
deleted file mode 100644
index 1574273feb53..000000000000
--- a/pkgs/applications/networking/instant-messengers/twinkle/libgsm.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: twinkle-1.4.2/configure.in
-===================================================================
---- twinkle-1.4.2.orig/configure.in	2013-07-25 11:07:54.264533206 -0400
-+++ twinkle-1.4.2/configure.in	2013-07-25 11:07:54.256533340 -0400
-@@ -195,22 +195,33 @@
- 
- # This check does not work on all platforms
- # Check if libgsm is available
--# AC_CHECK_LIB(gsm, sf_open, [
--#	AC_CHECK_HEADER(gsm.h, [],
--#		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
--#	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
--#	GSM_LIBS="-lgsm"
--#	echo "LIBS += -lgsm" >> $QT_INCL_PRO
--#	have_gsm="yes" ], [
--#	have_gsm="no"
--#	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
--#	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
--have_gsm="no"
--GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
--echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
-+AC_CHECK_LIB(gsm, sf_open, [
-+	AC_CHECK_HEADER(gsm.h, [],
-+		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
-+	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
-+	GSM_LIBS="-lgsm"
-+	echo "LIBS += -lgsm" >> $QT_INCL_PRO
-+	have_gsm="yes" ], [
-+	have_gsm="no"
-+	GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-+	echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
-+#have_gsm="no"
-+#GSM_LIBS="\$(top_builddir)/src/audio/gsm/libgsm.a"
-+#echo "LIBS += ../audio/gsm/libgsm.a" >> $QT_INCL_PRO
- 
- AC_SUBST(GSM_LIBS)
- 
-+# Check if libgsm is available
-+AC_CHECK_LIB(gsm, sf_open, [
-+	AC_CHECK_HEADER(gsm.h, [],
-+		[AC_MSG_ERROR([gsm header files missing (gsm.h)])])
-+	AC_DEFINE(HAVE_GSM, 1, [Define to 1 if you have the <libgsm> library.])
-+	LIBS="-lgsm $LIBS"
-+	echo "LIBS += -lgsm" >> $QT_INCL_PRO
-+	have_gsm="yes" ], [
-+	have_gsm="no"
-+	echo "$(top_builddir)/src/audio/gsm/libgsm.a" >> $QT_INCL_PRO ])
-+
- # Check if ALSA is available
- AC_CHECK_LIB(asound, main, [
- 	AC_CHECK_HEADER(alsa/asoundlib.h, [],
-@@ -348,3 +359,4 @@
- AC_MSG_RESULT([Speex:       $have_speex])
- AC_MSG_RESULT([iLBC:        $have_ilbc])
- AC_MSG_RESULT([ZRTP:        $have_zrtp])
-+AC_MSG_RESULT([Libgsm dynamic link:	$have_gsm])
-Index: twinkle-1.4.2/src/twinkle_config.h.in
-===================================================================
---- twinkle-1.4.2.orig/src/twinkle_config.h.in	2013-07-25 11:07:54.264533206 -0400
-+++ twinkle-1.4.2/src/twinkle_config.h.in	2013-07-25 11:07:54.256533340 -0400
-@@ -19,6 +19,9 @@
- /* Define to 1 if you have the <history.h> header file. */
- #undef HAVE_HISTORY_H
- 
-+/* Define to 1 if you have the <libgsm> library. */
-+#undef HAVE_GSM
-+
- /* Define to 1 if you have the <ilbc> library. */
- #undef HAVE_ILBC
- 
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff b/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
deleted file mode 100644
index 3fbc2eb0cb1e..000000000000
--- a/pkgs/applications/networking/instant-messengers/twinkle/localetime_r_conflict.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: twinkle-1.4.2/src/log.cpp
-===================================================================
---- twinkle-1.4.2.orig/src/log.cpp	2009-01-18 09:35:28.000000000 -0500
-+++ twinkle-1.4.2/src/log.cpp	2013-07-25 11:43:08.901209713 -0400
-@@ -161,7 +161,7 @@
- 
- 	gettimeofday(&t, NULL);
- 	date = t.tv_sec;
--	localtime_r(&date, &tm);
-+	ost::localtime_r(&date, &tm);
- 
- 	*log_stream << "+++ ";
- 	*log_stream << tm.tm_mday;
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff b/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff
deleted file mode 100644
index 9d07b3dbd6ae..000000000000
--- a/pkgs/applications/networking/instant-messengers/twinkle/newer-libccrtp.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: twinkle-1.4.2/configure.in
-===================================================================
---- twinkle-1.4.2.orig/configure.in	2013-07-25 11:09:16.000000000 -0400
-+++ twinkle-1.4.2/configure.in	2013-07-25 11:11:59.512418187 -0400
-@@ -66,7 +66,7 @@
- 
- export PKG_CONFIG_PATH
- 
--PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
-+PKG_CHECK_MODULES(CCRTP, libccrtp >= 1.6.0)
- 
- PKG_CHECK_MODULES(XML2, libxml-2.0)
- # AC_CHECK_HEADER(libxml/tree.h, [],
-@@ -136,7 +136,7 @@
- #echo "INCLUDEPATH += `$CCGNU2_CONFIG --includes`" | sed -e s/-I//g > $QT_INCL_PRO
- # libccrtp1(ccrtp) depend from libccgnu2(commoncpp2) and
- # should include above flags !
--echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp1`" | sed -e s/-I//g >> $QT_INCL_PRO
-+echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libccrtp`" | sed -e s/-I//g >> $QT_INCL_PRO
- echo "INCLUDEPATH += `$PKG_CONFIG --cflags-only-I libxml-2.0`" | sed -e s/-I//g >> $QT_INCL_PRO
- 
- # get libraries specified on command line
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e3db437174b..f312219225b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15343,8 +15343,6 @@ with pkgs;
 
   twmn = qt5.callPackage ../applications/misc/twmn { };
 
-  twinkle = callPackage ../applications/networking/instant-messengers/twinkle { };
-
   umurmur = callPackage ../applications/networking/umurmur { };
 
   unigine-valley = callPackage ../applications/graphics/unigine-valley { };

From 4324ff2f735433104315d6b932b3651ca3fd5879 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Feb 2017 09:02:51 +0100
Subject: [PATCH 0555/3449] sflphone: remove

---
 .../instant-messengers/sflphone/default.nix   | 86 -------------------
 .../sflphone/libzrtpcpp-cflags.patch          | 15 ----
 pkgs/top-level/all-packages.nix               |  4 -
 3 files changed, 105 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/sflphone/default.nix
 delete mode 100644 pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch

diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
deleted file mode 100644
index 10f63369a9b0..000000000000
--- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ stdenv, fetchurl, libyaml, alsaLib, openssl, libuuid, pkgconfig, libpulseaudio, libsamplerate
-, commoncpp2, ccrtp, libzrtpcpp, dbus, dbus_cplusplus, expat, pcre, gsm, speex, ilbc, libopus
-, autoconf, automake, libtool, gettext, perl
-, cmake, qt4
-, gtk, glib, dbus_glib, libnotify, intltool, makeWrapper }:
-
-let
-  name = "sflphone-1.2.3";
-
-  src = fetchurl {
-    url = "https://projects.savoirfairelinux.com/attachments/download/6423/${name}.tar.gz";
-    sha256 = "0aiwlky7mp5l51a7kkhkmaz7ivapypar291kdxzdxl1s3qy0x6fd";
-  };
-
-  meta = {
-    homepage = http://sflphone.org/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    description = "Free software enterprise-class softphone for GNU/Linux";
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [viric];
-  };
-
-in
-rec {
-  daemon = stdenv.mkDerivation {
-    name = name + "-daemon";
-
-    inherit src;
-
-    patches = [ ./libzrtpcpp-cflags.patch ];
-
-    preConfigure = ''
-      cd daemon
-
-      # Post patch, required
-      autoreconf -vfi
-
-      cd libs
-      bash ./compile_pjsip.sh
-      cd ..
-    '';
-
-    configureFlags = "--with-expat --with-expat-inc=${expat.dev}/include " +
-      "--with-expat-lib=-lexpat --with-opus ";
-
-    buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate
-      commoncpp2 ccrtp libzrtpcpp dbus dbus_cplusplus expat pcre gsm speex ilbc libopus
-      autoconf automake libtool gettext perl ];
-  };
-
-  # This fails still.
-  # I don't know the best way to make this a KDE program (with switchable kde
-  # libs, like digikam for example)
-  /*
-  kde = stdenv.mkDerivation {
-    name = name + "-kde";
-
-    inherit src;
-
-    preConfigure = ''
-      cd kde
-    '';
-
-    buildInputs = [ daemon cmake qt4 pkgconfig ];
-  };
-  */
-
-  gnome = stdenv.mkDerivation {
-    name = name + "-gnome";
-
-    inherit src;
-
-    preConfigure = ''
-      cd gnome
-    '';
-
-    # gtk3 programs have the runtime dependency on XDG_DATA_DIRS
-    preFixup = ''
-      for f in "$out/bin/sflphone" "$out/bin/sflphone-client-gnome"; do
-        wrapProgram $f --prefix XDG_DATA_DIRS ":" "${gtk.out}/share:$GSETTINGS_SCHEMAS_PATH"
-      done
-    '';
-
-    buildInputs = [ daemon pkgconfig gtk glib dbus_glib libnotify intltool makeWrapper ];
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch b/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch
deleted file mode 100644
index 972d9c588082..000000000000
--- a/pkgs/applications/networking/instant-messengers/sflphone/libzrtpcpp-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/daemon/src/audio/audiortp/Makefile.am b/daemon/src/audio/audiortp/Makefile.am
-index c27eedd..fe64077 100644
---- a/daemon/src/audio/audiortp/Makefile.am
-+++ b/daemon/src/audio/audiortp/Makefile.am
-@@ -4,6 +4,10 @@ noinst_LTLIBRARIES = libaudiortp.la
- 
- if BUILD_ZRTP
- SFL_ZRTP_SRC=audio_zrtp_session.h audio_zrtp_session.cpp zrtp_session_callback.cpp zrtp_session_callback.h
-+libaudiortp_la_CXXFLAGS = \
-+		@CCGNU2_CFLAGS@ \
-+		@ZRTPCPP_CFLAGS@ \
-+		@CCRTP_CFLAGS@
- endif
- 
- libaudiortp_la_SOURCES = \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f312219225b0..135f8c18d103 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14939,10 +14939,6 @@ with pkgs;
 
   setbfree = callPackage ../applications/audio/setbfree { };
 
-  sflphone = callPackage ../applications/networking/instant-messengers/sflphone {
-    gtk = gtk3;
-  };
-
   shfmt = callPackage ../tools/text/shfmt { };
 
   shutter = callPackage ../applications/graphics/shutter { };

From d7e5883d5e00b11a76c235084d5570a7b2a3fa4c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Feb 2017 09:43:33 +0100
Subject: [PATCH 0556/3449] freeswitch: 1.6.9 -> 1.6.15

---
 pkgs/servers/sip/freeswitch/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix         |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index ac8c3a1b1c91..5c9737660c42 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,19 +1,19 @@
 { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline
-, openssl, perl, sqlite, libjpeg, libzrtpcpp, speex, pcre
+, openssl, perl, sqlite, libjpeg, speex, pcre
 , ldns, libedit, yasm, which, lua, libopus, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.6.9";
+  name = "freeswitch-1.6.15";
 
   src = fetchurl {
     url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
-    sha256 = "0g0x4m8rb2ybpxwrszb4w37rb10v9fbszm7l2skjakf4dx0gw5i7";
+    sha256 = "071g7229shr9srwzspx29fcx3ccj3rwakkydpc4vdf1q3lldd2ld";
   };
   postPatch = "patchShebangs libs/libvpx/build/make/rtcd.pl";
 
   buildInputs = [
-    ncurses curl pkgconfig gnutls readline openssl perl libjpeg
-    sqlite libzrtpcpp pcre speex ldns libedit yasm which lua libopus
+    openssl ncurses curl pkgconfig gnutls readline perl libjpeg
+    sqlite pcre speex ldns libedit yasm which lua libopus
     libsndfile
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 135f8c18d103..2d84851505e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10345,7 +10345,9 @@ with pkgs;
 
   freeradius = callPackage ../servers/freeradius { };
 
-  freeswitch = callPackage ../servers/sip/freeswitch { };
+  freeswitch = callPackage ../servers/sip/freeswitch {
+    openssl = openssl_1_0_2;
+  };
 
   gatling = callPackage ../servers/http/gatling { };
 

From 101d90d18b338a73541d5ddaac0c35b5ad57a9d8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Feb 2017 09:04:52 +0100
Subject: [PATCH 0557/3449] libzrtpcpp: remove

---
 .../libraries/libzrtpcpp/default.nix          | 26 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/development/libraries/libzrtpcpp/default.nix

diff --git a/pkgs/development/libraries/libzrtpcpp/default.nix b/pkgs/development/libraries/libzrtpcpp/default.nix
deleted file mode 100644
index 9c4affd90329..000000000000
--- a/pkgs/development/libraries/libzrtpcpp/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, openssl, pkgconfig, ccrtp }:
-
-stdenv.mkDerivation rec {
-  name = "libzrtpcpp-2.3.4";
-
-  src = fetchurl {
-    url = "mirror://gnu/ccrtp/${name}.tar.gz";
-    sha256 = "020hfyrh8qdwkqdg1r1n65wdzj5i01ba9dzjghbm9lbz93gd9r83";
-  };
-
-  # We disallow 'lib64', or pkgconfig will not find it.
-  prePatch = ''
-    sed -i s/lib64/lib/ CMakeLists.txt
-  '';
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ openssl ccrtp ];
-
-  meta = { 
-    description = "GNU RTP stack for the zrtp protocol developed by Phil Zimmermann";
-    homepage = "http://www.gnutelephony.org/index.php/GNU_ZRTP";
-    license = stdenv.lib.licenses.gpl2;
-    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 2d84851505e1..2c05a1ea4924 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8736,8 +8736,6 @@ with pkgs;
 
   libzdb = callPackage ../development/libraries/libzdb { };
 
-  libzrtpcpp = callPackage ../development/libraries/libzrtpcpp { };
-
   libwacom = callPackage ../development/libraries/libwacom { };
 
   lightning = callPackage ../development/libraries/lightning { };

From c2a573365422f200e7d99823f29ba5ffec338579 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 14 Feb 2017 20:26:17 -0500
Subject: [PATCH 0558/3449] wxPython: fix on darwin

---
 .../python-modules/wxPython/3.0.nix           | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/wxPython/3.0.nix b/pkgs/development/python-modules/wxPython/3.0.nix
index 8dc99955af31..defdc920d6e5 100644
--- a/pkgs/development/python-modules/wxPython/3.0.nix
+++ b/pkgs/development/python-modules/wxPython/3.0.nix
@@ -1,8 +1,11 @@
 { fetchurl
 , lib
+, stdenv
+, darwin
 , openglSupport ? true
 , libX11
 , wxGTK
+, wxmac
 , pkgconfig
 , buildPythonPackage
 , pyopengl
@@ -27,15 +30,27 @@ buildPythonPackage rec {
 
   hardeningDisable = [ "format" ];
 
-  propagatedBuildInputs = [ pkgconfig wxGTK (wxGTK.gtk) libX11 ]  ++ lib.optional openglSupport pyopengl;
-  preConfigure = "cd wxPython";
+  propagatedBuildInputs = [ pkgconfig ]
+    ++ (lib.optional openglSupport pyopengl)
+    ++ (lib.optionals (!stdenv.isDarwin) [ wxGTK (wxGTK.gtk) libX11 ])
+    ++ (lib.optionals stdenv.isDarwin [ wxmac darwin.apple_sdk.frameworks.Cocoa ])
+    ;
+  preConfigure = ''
+    cd wxPython
+    # remove wxPython's darwin hack that interference with python-2.7-distutils-C++.patch
+    substituteInPlace config.py \
+      --replace "distutils.unixccompiler.UnixCCompiler = MyUnixCCompiler" ""
+    # 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;"
+  '';
 
-  NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0";
+  NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lX11 -lgdk-x11-2.0";
 
   buildPhase = "";
 
   installPhase = ''
-    ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out
+    ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out
     wrapPythonPrograms
   '';
 

From 0a44f259b517dd3710882040edf7b347b2889281 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 15 Feb 2017 15:25:18 -0500
Subject: [PATCH 0559/3449] python27Packages.taskcoach: mark as broken on
 darwin

---
 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 e7ee93e21fec..0e88986ee1c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25362,6 +25362,7 @@ in {
       homepage = http://taskcoach.org/;
       description = "Todo manager to keep track of personal tasks and todo lists";
       license = licenses.gpl3Plus;
+      broken = stdenv.isDarwin;
     };
   };
 

From 6515854248601b78ef08f52c3de7b80858892d5f Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Fri, 17 Feb 2017 00:49:46 +0530
Subject: [PATCH 0560/3449] awless: init at 0.0.13

---
 pkgs/tools/virtualization/awless/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/virtualization/awless/default.nix

diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
new file mode 100644
index 000000000000..afc45a2d5a75
--- /dev/null
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "awless-${version}";
+  version = "0.0.13";
+  rev = "${version}";
+
+  goPackagePath = "github.com/wallix/awless";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "wallix";
+    repo = "awless";
+    sha256 = "045n4r2mk40pjggsfcjlxni6q4arybs9x9raghqb9n8dyfg9v5kv";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/wallix/awless/;
+    description = "A Mighty CLI for AWS";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pradeepchhetri ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d136fd7dfb52..83679710eb43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -460,6 +460,8 @@ with pkgs;
 
   azure-vhd-utils  = callPackage ../tools/misc/azure-vhd-utils { };
 
+  awless = callPackage ../tools/virtualization/awless { };
+
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
 
   ec2_ami_tools = callPackage ../tools/virtualization/ec2-ami-tools { };

From 90d225db766baa997a2ded830de968d27432b9d8 Mon Sep 17 00:00:00 2001
From: David Terry <davidterry@posteo.de>
Date: Thu, 16 Feb 2017 00:11:38 +0100
Subject: [PATCH 0561/3449] microsoft_gsl: init at 2017-02-13

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

diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix
new file mode 100644
index 000000000000..b419eccfe794
--- /dev/null
+++ b/pkgs/development/libraries/microsoft_gsl/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "microsoft_gsl-${version}";
+  version = "2017-02-13";
+
+  src = fetchgit {
+    url = "https://github.com/Microsoft/GSL.git";
+    rev = "3819df6e378ffccf0e29465afe99c3b324c2aa70";
+    sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35";
+  };
+
+  # build phase just runs the unit tests
+  buildInputs = [ cmake ];
+
+  installPhase = ''
+    mkdir -p $out/include
+    mv ../include/ $out/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Functions and types that are suggested for use by the C++ Core Guidelines";
+    homepage = https://github.com/Microsoft/GSL;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ xwvvvvwx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83679710eb43..5dea365f4854 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8826,6 +8826,8 @@ with pkgs;
 
   mhddfs = callPackage ../tools/filesystems/mhddfs { };
 
+  microsoft_gsl = callPackage ../development/libraries/microsoft_gsl { };
+
   minizip = callPackage ../development/libraries/minizip { };
 
   miro = callPackage ../applications/video/miro {

From cfea4469208ab01d2d60bac080c70ff856241a4d Mon Sep 17 00:00:00 2001
From: Mogria <m0gr14@gmail.com>
Date: Thu, 16 Feb 2017 18:54:32 +0100
Subject: [PATCH 0562/3449] phpPackages.memcached: add missing zlib build
 dependency

---
 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 f0ebdf0096c0..fb1cd63a4dce 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -51,7 +51,7 @@ let
       "--with-libmemcached-dir=${pkgs.libmemcached}"
     ];
 
-    buildInputs = with pkgs; [ pkgconfig cyrus_sasl ];
+    buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ];
   };
 
   # Not released yet
@@ -69,7 +69,7 @@ let
       "--with-libmemcached-dir=${pkgs.libmemcached}"
     ];
 
-    buildInputs = with pkgs; [ pkgconfig cyrus_sasl ];
+    buildInputs = with pkgs; [ pkgconfig cyrus_sasl zlib ];
   };
 
   # No support for PHP 7 yet (and probably never will be)

From 3e484e7880679e5217660ee5a6a0489241ea9eb8 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Fri, 17 Feb 2017 00:35:46 +0530
Subject: [PATCH 0563/3449] consul-template: 0.18.0 -> 0.18.1

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

diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix
index ad7222a67e50..dee99586c318 100644
--- a/pkgs/tools/system/consul-template/default.nix
+++ b/pkgs/tools/system/consul-template/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "consul-template-${version}";
-  version = "0.18.0";
+  version = "0.18.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul-template";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "hashicorp";
     repo = "consul-template";
-    sha256 = "1a1r7jwv0d4l8bcjal9chvr871hmw0ljbihgjqasp6gvjg0hfbx6";
+    sha256 = "0swyhc5smjbp5wql43qhpxrcbg47v89l5icb1s60gszhxizlkk7d";
   };
 
   meta = with stdenv.lib; {

From 7ab871b394c25c37295e26787c9d9f5de5591dcc Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Fri, 17 Feb 2017 00:24:08 +0530
Subject: [PATCH 0564/3449] consul: 0.7.3 -> 0.7.5

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

diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix
index 25482b2b3881..41a0bea1cddb 100644
--- a/pkgs/servers/consul/default.nix
+++ b/pkgs/servers/consul/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "consul-${version}";
-  version = "0.7.3";
+  version = "0.7.5";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/consul";
@@ -11,9 +11,17 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "consul";
     inherit rev;
-    sha256 = "0ab84sm281ibl9h6zfk17mr7yc9vxpi8i2xb4kzi8bg43n05lj4d";
+    sha256 = "0zh4j5p0v41v7i6v084dgsdchx1azjs2mjb3dlfdv671rsnwi54z";
   };
 
   # Keep consul.ui for backward compatability
   passthru.ui = consul-ui;
+
+  meta = with stdenv.lib; {
+    description = "Tool for service discovery, monitoring and configuration";
+    homepage = "https://www.consul.io/";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ pradeepchhetri ];
+  };
 }

From 0ea76ef83126e05b4704328b2a7f8959bcc495fe Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Fri, 17 Feb 2017 01:02:06 +0530
Subject: [PATCH 0565/3449] wuzz: 2017-02-09 -> 0.1.0

---
 pkgs/tools/networking/wuzz/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index 87b962b9154e..994a6f75d549 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -2,15 +2,16 @@
 
 buildGoPackage rec {
   name = "wuzz-${version}";
-  version = "2017-02-09";
+  version = "0.1.0";
+  rev = "v${version}";
 
   goPackagePath = "https://github.com/asciimoo/wuzz";
 
   src = fetchFromGitHub {
     owner = "asciimoo";
     repo = "wuzz";
-    rev = "dd696dc6e014e08b6042a71dca600356eb3156c2";
-    sha256 = "0m7jcb6rk0cb3giz1cbfhy3h4nzjl6qrk2k6czhn9267688rznpx";
+    inherit rev;
+    sha256 = "0n55y9dmx4rsccjscvbrgiq2g1qwqxj44lg90589i55b5f7r1ljd";
   };
 
   goDeps = ./deps.nix;

From c1fb4ec0413c412f2fdb692f21d9737f457a2b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Thu, 9 Feb 2017 20:59:26 +0000
Subject: [PATCH 0566/3449] keybase: 1.0.18 -> 20170209.17b641d

---
 pkgs/tools/security/keybase/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index fbed233b090d..b962a6409b45 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,8 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "1.0.18";
-  rev = "v${version}";
+  version = "20170209.17b641d";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -13,8 +12,8 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "keybase";
     repo = "client";
-    inherit rev;
-    sha256 = "16n9fwx8v3jradp1l2564872akq6npib794jadfl5d122cll0n7h";
+    rev = "17b641de629a85ad77621d0efa3e2442661b5ee7";
+    sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11";
   };
 
   buildFlags = [ "-tags production" ];

From 8561af2db91464de3737592794389acfc99e9648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjarki=20=C3=81g=C3=BAst=20Gu=C3=B0mundsson?=
 <suprdewd@gmail.com>
Date: Thu, 9 Feb 2017 20:59:57 +0000
Subject: [PATCH 0567/3449] kbfs: 1.0.2 -> 20170209.d1db463

---
 pkgs/tools/security/kbfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix
index a38e70df6323..e502c296a50e 100644
--- a/pkgs/tools/security/kbfs/default.nix
+++ b/pkgs/tools/security/kbfs/default.nix
@@ -1,8 +1,8 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "kbfs-2016-11-18-git";
-  version = "1.0.2";
+  name = "kbfs-${version}";
+  version = "20170209.d1db463";
 
   goPackagePath = "github.com/keybase/kbfs";
   subPackages = [ "kbfsfuse" ];
@@ -12,8 +12,8 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "keybase";
     repo = "kbfs";
-    rev = "aac615d7c50e7512a51a133c14cb699d9941ba8c";
-    sha256 = "0vah6x37g2w1f7mb5x16f1815608mvv2d1mrpkpnhz2gz7qzz6bv";
+    rev = "d1db46315d9271f21ca2700a84ca19767e638296";
+    sha256 = "12i2m370r27mmn37s55krdkhr5k8kpl3x8y3gzg7w5zn2wiw8i1g";
   };
 
   buildFlags = [ "-tags production" ];

From 17f566d1e191290683fac0b3e93428db12e5dd13 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Tue, 14 Feb 2017 19:10:42 +1100
Subject: [PATCH 0568/3449] keybase-gui: init at 20170209.17b641d

The GUI requires the keybase and kbfs packages to be installed and
running with /keybase as the mount.
---
 pkgs/tools/security/keybase-gui/default.nix | 91 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 93 insertions(+)
 create mode 100644 pkgs/tools/security/keybase-gui/default.nix

diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix
new file mode 100644
index 000000000000..b1d8181da65b
--- /dev/null
+++ b/pkgs/tools/security/keybase-gui/default.nix
@@ -0,0 +1,91 @@
+{ stdenv, fetchurl, buildFHSUserEnv, writeTextFile, alsaLib, atk, cairo, cups
+, dbus, expat, fontconfig, freetype, gcc, gdk_pixbuf, glib, gnome2, gtk2, nspr
+, nss, pango, systemd, xorg, utillinuxMinimal }:
+
+let
+  libPath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    dbus
+    expat
+    fontconfig
+    freetype
+    gcc.cc
+    gdk_pixbuf
+    glib
+    gnome2.GConf
+    gtk2
+    nspr
+    nss
+    pango
+    systemd
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+  ];
+in
+stdenv.mkDerivation rec {
+  name = "keybase-gui-${version}";
+  version = "1.0.18-20170209170023.17b641d";
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb";
+    sha256 = "01mr6hyzs208g3ankl4swikna66n85xzn7ig4k7p6hxmnnvplgb3";
+  };
+  phases = ["unpackPhase" "installPhase" "fixupPhase"];
+  unpackPhase = ''
+    ar xf $src
+    tar xf data.tar.xz
+  '';
+  installPhase = ''
+    mkdir -p $out/{bin,share}
+    mv opt/keybase $out/share/
+
+    cat > $out/bin/keybase-gui <<EOF
+    #!${stdenv.shell}
+
+    checkFailed() {
+      if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then
+        return
+      fi
+      echo "Set NIX_SKIP_KEYBASE_CHECKS=1 if you want to skip this check." >&2
+      exit 1
+    }
+
+    if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then
+      echo "Keybase service doesn't seem to be running." >&2
+      echo "You might need to run: keybase service" >&2
+      checkFailed
+    fi
+
+    ${utillinuxMinimal}/bin/mountpoint /keybase &>/dev/null
+    if [ "\$?" -ne "0" ]; then
+      echo "Keybase is not mounted to /keybase." >&2
+      echo "You might need to run: kbfsfuse /keybase" >&2
+      checkFailed
+    fi
+
+    exec $out/share/keybase/Keybase "\$@"
+    EOF
+    chmod +x $out/bin/keybase-gui
+  '';
+  postFixup = ''
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}:\$ORIGIN" "$out/share/keybase/Keybase"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.keybase.io/;
+    description = "The Keybase official GUI.";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ puffnfresh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5dea365f4854..34532300afd4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2415,6 +2415,8 @@ with pkgs;
 
   kbfs = callPackage ../tools/security/kbfs { };
 
+  keybase-gui = callPackage ../tools/security/keybase-gui { };
+
   keychain = callPackage ../tools/misc/keychain { };
 
   keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };

From 53c2e38e0d16fa10db8237bdeef3ed824c3ffef4 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 16 Feb 2017 11:10:07 -0200
Subject: [PATCH 0569/3449] qbittorrent: 3.3.7 -> 3.3.10

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

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 620b8601d7dc..cdafea3be79f 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.7";
+  version = "3.3.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "0h2ccqmjnm0x0qjvd0vz5hk7dy9qbqhiqvxywqjhip7sj1585p3j";
+    sha256 = "1lm8y5k9363gajbw0k9jb1cb7zg0lz5rw2ja0kd36h68rpm7qr9c";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     description = "Free Software alternative to µtorrent";
     homepage    = http://www.qbittorrent.org/;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ viric ];
     platforms   = platforms.linux;
+    maintainers = with maintainers; [ viric ];
   };
 }

From a9584c9510771f96594b4461e9ea546a75bf59d4 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Fri, 17 Feb 2017 09:39:18 +0530
Subject: [PATCH 0570/3449] kafka: 0.10.1.0 -> 0.10.1.1

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

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index b6f4fef0f050..4041eae64683 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -11,9 +11,9 @@ let
               scalaVersion = "2.11";
               sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
             };
-    "0.10" = { kafkaVersion = "0.10.1.0";
+    "0.10" = { kafkaVersion = "0.10.1.1";
                scalaVersion = "2.11";
-               sha256 = "144k6bqg8q8f3x3nk05hvaaad8xa32qjifg785i15j69cnp355bd";
+               sha256 = "0a89dyvisa5vilfa0h0ljrb00l5n9h730yxy1058z7a2g43q0h0m";
              };
   };
 in

From 24b1c6ee883cfa8eaae147e72288d9c97e602322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 17 Feb 2017 11:39:21 +0100
Subject: [PATCH 0571/3449] subsurface: disable parallel make

It was failing on Hydra:
http://hydra.nixos.org/build/48847277/nixlog/2/raw
---
 pkgs/applications/misc/subsurface/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix
index bb23f46d7334..950f8da78605 100644
--- a/pkgs/applications/misc/subsurface/default.nix
+++ b/pkgs/applications/misc/subsurface/default.nix
@@ -86,7 +86,7 @@ in stdenv.mkDerivation rec {
   ];
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false; # subsurfacewebservices.h dependency on ui_webservices.h
 
   cmakeFlags = [
     "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so"

From 834de6ebaaa0af9044ae79bd2e8e3e18d0eb55c3 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Fri, 17 Feb 2017 12:08:54 +0100
Subject: [PATCH 0572/3449] glide: output correct version (#22896)

It currently displays `0.12.0-dev` instead of the specified
version.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/glide/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix
index 4f853e900b39..bd83a63e5d66 100644
--- a/pkgs/development/tools/glide/default.nix
+++ b/pkgs/development/tools/glide/default.nix
@@ -6,6 +6,11 @@ buildGoPackage rec {
 
   goPackagePath = "github.com/Masterminds/glide";
 
+   buildFlagsArray = ''
+   -ldflags=
+      -X main.version=${version}
+  '';
+
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "Masterminds";

From cc4fd4f7156860fc7056fc86f271870394c1f59c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 17 Feb 2017 09:10:42 +0000
Subject: [PATCH 0573/3449] perl-Net-IMAP-Client: init at 0.9505

---
 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 6b3e7d99a98a..df7dd3a60114 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9640,6 +9640,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetIMAPClient = buildPerlPackage rec {
+    name = "Net-IMAP-Client-0.9505";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GA/GANGLION/${name}.tar.gz";
+      sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912";
+    };
+    buildInputs = [TestPod TestPodCoverage];
+    propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ];
+    meta = {
+      description = "Not so simple IMAP client library";
+    };
+  };
+
   NetIP = buildPerlPackage {
     name = "Net-IP-1.26";
     src = fetchurl {

From 47ded42788caf8c8ec939de387341b9c113943e6 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 17 Feb 2017 09:11:03 +0000
Subject: [PATCH 0574/3449] lumail: init at 2.9

---
 .../networking/mailreaders/lumail/default.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/networking/mailreaders/lumail/default.nix

diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix
new file mode 100644
index 000000000000..d28144f92ba8
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/lumail/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, pkgconfig, lua5_2, file, ncurses, gmime, pcre-cpp
+, perl, perlPackages }:
+
+let
+  version = "2.9";
+in
+stdenv.mkDerivation {
+  name = "lumail-${version}";
+
+  src = fetchurl {
+    url = "https://lumail.org/download/lumail-${version}.tar.gz";
+    sha256 = "1rni5lbic36v4cd1r0l28542x0hlmfqkl6nac79gln491in2l2sc";
+  };
+
+  buildInputs = [
+    pkgconfig lua5_2 file ncurses gmime pcre-cpp
+    perl perlPackages.JSON perlPackages.NetIMAPClient
+  ];
+
+  preConfigure = ''
+    sed -e 's|"/etc/lumail2|LUMAIL_LUAPATH"/..|' -i src/lumail2.cc src/imap_proxy.cc
+
+    perlFlags=
+    for i in $(IFS=:; echo $PERL5LIB); do
+        perlFlags="$perlFlags -I$i"
+    done
+
+    sed -e "s|^#\!\(.*/perl.*\)$|#\!\1$perlFlags|" -i perl.d/imap-proxy
+  '';
+
+  makeFlags = [
+    "LVER=lua"
+    "PREFIX=$(out)"
+    "SYSCONFDIR=$(out)/etc"
+  ];
+
+  postInstall = ''
+    cp lumail2.user.lua $out/etc/lumail2/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Console-based email client";
+    homepage = https://lumail.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [orivej];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 079f3220015a..dcec9f6094e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14089,6 +14089,8 @@ with pkgs;
     gtk = gtk2;
   };
 
+  lumail = callPackage ../applications/networking/mailreaders/lumail { };
+
   lv2bm = callPackage ../applications/audio/lv2bm { };
 
   lynx = callPackage ../applications/networking/browsers/lynx { };

From 336d6cc51332965a7c9c6f9f9feefbcfe9760b18 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Fri, 17 Feb 2017 12:47:27 +0100
Subject: [PATCH 0575/3449] stanchion: remove ssl option

---
 nixos/modules/services/databases/stanchion.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/services/databases/stanchion.nix b/nixos/modules/services/databases/stanchion.nix
index f2dbb78b5c4b..a4597cac3cd6 100644
--- a/nixos/modules/services/databases/stanchion.nix
+++ b/nixos/modules/services/databases/stanchion.nix
@@ -76,14 +76,6 @@ in
         '';
       };
 
-      stanchionSsl = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Tell stanchion to use SSL.
-        '';
-      };
-
       distributedCookie = mkOption {
         type = types.str;
         default = "riak";
@@ -148,8 +140,6 @@ in
 
       distributed_cookie = ${cfg.distributedCookie}
 
-      stanchion_ssl=${if cfg.stanchionSsl then "on" else "off"}
-
       ${cfg.extraConfig}
     '';
 

From 4798196447669556d259e00849a300e13ae9aa9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 17 Feb 2017 13:45:43 +0100
Subject: [PATCH 0576/3449] s3fs-fuse: 1.78 -> 1.80

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

diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index edc8dd00f3e5..051d27321003 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,11 +1,13 @@
 {stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
 
 stdenv.mkDerivation {
-  name = "s3fs-fuse-1.79";
+  name = "s3fs-fuse-1.80";
+
   src = fetchurl {
-    url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.79.tar.gz;
-    sha256 = "0rmzkngzq040g020pv75qqx3jy34vdxzqvxz29k6q8yfb3wpkhb1";
+    url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.80.tar.gz;
+    sha256 = "0ddx5khlyyrxm4s8is4gqbczmrcivj11hmkk9s893r3kpp4q30yy";
   };
+
   preConfigure = "./autogen.sh";
   buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ];
 

From dcc84d8fcf5490e7660df0af3de324e37370f414 Mon Sep 17 00:00:00 2001
From: Octavian Cerna <octavian.cerna@gmail.com>
Date: Fri, 17 Feb 2017 15:33:13 +0200
Subject: [PATCH 0577/3449] quagga: 1.0.20161017 -> 1.2.0

---
 pkgs/servers/quagga/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index 45c195c2cb29..b60212dea014 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo }:
+{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo,
+  pkgconfig, c-ares }:
 
 stdenv.mkDerivation rec {
   name = "quagga-${version}";
-  version = "1.0.20161017";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "mirror://savannah/quagga/${name}.tar.gz";
-    sha256 = "0629f7bkyh0a3n90kkr202g2i44id09qzkl05y8z66blvd6p49lg";
+    sha256 = "1qyw675hrs3f67zprdbyw91wldmyihv97ibn1f99ypcp6x6n8hqh";
   };
 
   buildInputs =
-    [ readline net_snmp ]
+    [ readline net_snmp c-ares ]
     ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ];
 
-  nativeBuildInputs = [ perl texinfo ];
+  nativeBuildInputs = [ pkgconfig perl texinfo ];
 
   configureFlags = [
     "--sysconfdir=/etc/quagga"

From 692f3c18cd83a2bd65692b1ea898339e8ddef2d8 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Fri, 17 Feb 2017 13:50:13 +0100
Subject: [PATCH 0578/3449] riak: 2.1.1 -> 2.2.0

---
 pkgs/servers/nosql/riak/2.1.1.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix
index b66e99f0afbe..b18650fbbca8 100644
--- a/pkgs/servers/nosql/riak/2.1.1.nix
+++ b/pkgs/servers/nosql/riak/2.1.1.nix
@@ -1,22 +1,22 @@
 { stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }:
 
 let
-  solrName = "solr-4.7.0-yz-1.tgz";
-  yokozunaJarName = "yokozuna-2.jar";
+  solrName = "solr-4.10.4-yz-2.tgz";
+  yokozunaJarName = "yokozuna-3.jar";
   yzMonitorJarName = "yz_monitor-1.jar";
 
   srcs = {
     riak = fetchurl {
-      url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.1/2.1.1/riak-2.1.1.tar.gz";
-      sha256 = "1bm5j3zknz82mkyh5zgaap73awflh4mkibdvdz164235mdxlwhdm";
+      url = "http://s3.amazonaws.com/downloads.basho.com/riak/2.2/2.2.0/riak-2.2.0.tar.gz";
+      sha256 = "0kl28bpyzajcllybili46jfr1schl45w5ysii187jr0ssgls2c9p";
     };
     solr = fetchurl {
       url = "http://s3.amazonaws.com/files.basho.com/solr/${solrName}";
-      sha256 = "0brml3lb3xk26rmi05rrzpxrw92alfi9gi7p7537ny9lqg3808qp";
+      sha256 = "0fy5slnldn628gmr2kilyx606ph0iykf7pz6j0xjcc3wqvrixa2a";
     };
     yokozunaJar = fetchurl {
       url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yokozunaJarName}";
-      sha256 = "0xzfy181qxv27pc4f5xd0szn8vls5743273awr5rwv3608gkspj2";
+      sha256 = "17n6m100fz8affdcxsn4niw2lrpnswgfnd6aszgzipffwbg7v8v5";
     };
     yzMonitorJar = fetchurl {
       url = "http://s3.amazonaws.com/files.basho.com/yokozuna/${yzMonitorJarName}";
@@ -26,7 +26,7 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "riak-2.1.1";
+  name = "riak-2.2.0";
 
   buildInputs = [
     which unzip erlangR16 pam

From b4e9bcfc12cba74f8fb4804c170658db634e5d0a Mon Sep 17 00:00:00 2001
From: Philipp Gesang <phg@phi-gamma.net>
Date: Tue, 14 Feb 2017 22:20:52 +0100
Subject: [PATCH 0579/3449] afio: init at 2.5.1

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
---
 .../archivers/afio/afio-2.5.1-install.patch   | 48 +++++++++++++++++++
 pkgs/tools/archivers/afio/default.nix         | 31 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 81 insertions(+)
 create mode 100644 pkgs/tools/archivers/afio/afio-2.5.1-install.patch
 create mode 100644 pkgs/tools/archivers/afio/default.nix

diff --git a/pkgs/tools/archivers/afio/afio-2.5.1-install.patch b/pkgs/tools/archivers/afio/afio-2.5.1-install.patch
new file mode 100644
index 000000000000..9fa7aacfa887
--- /dev/null
+++ b/pkgs/tools/archivers/afio/afio-2.5.1-install.patch
@@ -0,0 +1,48 @@
+--- p1/Makefile.orig	2017-02-14 21:40:20.404249126 +0100
++++ p1/Makefile	2017-02-19 23:38:43.880414077 +0100
+@@ -66,37 +66,42 @@
+ # systems the large file compile environment itself might be buggy or beta.
+ #LARGEFILEFLAGS=
+ LARGEFILEFLAGS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+ 
+ # even more warnings flags..
+ MW=
+ #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations
+ 
+ CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW}
+ 
+-CC=gcc
++#CC=gcc
+ 
+ CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I
+ LDFLAGS =
+ 
+ afio : afio.o compfile.o exten.o match.o $M
+ 	${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio
+ 
+ clean:
+ 	rm -f *.o afio 
+ 	rm -f regtest/cmpstat regtest/makesparse
+ 	rm -f regtest/statsize regtest/statsize64
+ 	cd regtest; /bin/sh regtest.clean
+ 
++ifndef DESTDIR
++install:
++	$(error Please specify install prefix as $$DESTDIR)
++else
+ install: afio
+-	cp afio /usr/local/bin
+-	cp afio.1 /usr/share/man/man1
++	install -Dm755 afio $(DESTDIR)/bin/afio
++	install -Dm644 afio.1 $(DESTDIR)/share/man/man1/afio.1
++endif
+ 
+ # generate default list of -E extensions from manpage
+ # note: on sun, I had to change awk command below to nawk or gawk
+ # to get it to work.
+ exten_default.h : afio.1
+ 		awk -f exten_make.awk afio.1 >exten_default.h
+ 
+ 
+ afio.o : afio.h patchlevel.h
+ compfile.o : afio.h
diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix
new file mode 100644
index 000000000000..551e38a7869d
--- /dev/null
+++ b/pkgs/tools/archivers/afio/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl } :
+
+stdenv.mkDerivation rec {
+  version = "2.5.1";
+  name = "afio-${version}";
+
+  src = fetchurl {
+    url = "http://members.chello.nl/~k.holtman/${name}.tgz";
+    sha256 = "363457a5d6ee422d9b704ef56d26369ca5ee671d7209cfe799cab6e30bf2b99a";
+  };
+
+  /*
+   * A patch to simplify the installation and for removing the
+   * hard coded dependency on GCC.
+   */
+  patches = [ ./afio-2.5.1-install.patch ];
+
+  installFlags = "DESTDIR=$(out)";
+
+  meta = {
+    homepage = http://members.chello.nl/~k.holtman/afio.html;
+    description = "Fault tolerant cpio archiver targeting backups";
+    platforms = stdenv.lib.platforms.all;
+    /*
+     * Licensing is complicated due to the age of the code base, but
+     * generally free. See the file ``afio_license_issues_v5.txt`` for
+     * a comprehensive discussion.
+     */
+    license = stdenv.lib.licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87b0ec76a1f7..83b5f04d4f04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -359,6 +359,8 @@ with pkgs;
 
   aescrypt = callPackage ../tools/misc/aescrypt { };
 
+  afio = callPackage ../tools/archivers/afio { };
+
   afl = callPackage ../tools/security/afl { };
 
   afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { };

From 070825d443a384e8cf2928bab0367d430aaeca75 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 17 Feb 2017 15:41:31 +0100
Subject: [PATCH 0580/3449] setcapWrapper: add support for setting permissions

---
 nixos/modules/security/wrappers/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 861ce225257d..52f251876605 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -28,6 +28,7 @@ let
     , source
     , owner  ? "nobody"
     , group  ? "nogroup"
+    , permissions ? "u+rx,g+x,o+x"
     , ...
     }:
     assert (lib.versionAtLeast (lib.getVersion config.boot.kernelPackages.kernel) "4.3");
@@ -45,7 +46,7 @@ let
       ${pkgs.libcap.out}/bin/setcap "cap_setpcap,${capabilities}" $wrapperDir/${program}
 
       # Set the executable bit
-      chmod u+rx,g+x,o+x $wrapperDir/${program}
+      chmod ${permissions} $wrapperDir/${program}
     '';
 
   ###### Activation script for the setuid wrappers

From 8f3e6fdd8cb68af56d40e646be3077e319769a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 16 Feb 2017 21:53:09 +0100
Subject: [PATCH 0581/3449] nixos: add programs.wireshark option

To be able to use Wireshark as an ordinary user, the 'dumpcap' program
must be installed setuid root. This module module simplifies such a
configuration to simply:

  programs.wireshark.enable = true;

The setuid wrapper is available for users in the 'wireshark' group.

Changes v1 -> v2:
  - add "defaultText" to the programs.wireshark.package option (AFAIK,
    that prevents the manual from being needlessly rebuilt when the
    package changes)
---
 nixos/modules/misc/ids.nix           |  2 +
 nixos/modules/module-list.nix        |  1 +
 nixos/modules/programs/wireshark.nix | 57 ++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 nixos/modules/programs/wireshark.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d51b29b99dae..a3845737410d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -288,6 +288,7 @@
       kresd = 270;
       rpc = 271;
       geoip = 272;
+      #wireshark = 273; # unused
 
       # 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
+      wireshark = 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 81597d91d89a..e60f93d52d98 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -91,6 +91,7 @@
   ./programs/tmux.nix
   ./programs/venus.nix
   ./programs/vim.nix
+  ./programs/wireshark.nix
   ./programs/wvdial.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
diff --git a/nixos/modules/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix
new file mode 100644
index 000000000000..aaaf678d362c
--- /dev/null
+++ b/nixos/modules/programs/wireshark.nix
@@ -0,0 +1,57 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.programs.wireshark;
+  wireshark = cfg.package;
+
+in
+
+{
+
+  options = {
+
+    programs.wireshark = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to add Wireshark to the global environment and configure a
+          setuid wrapper for 'dumpcap' for users in the 'wireshark' group.
+        '';
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.wireshark-cli;
+        defaultText = "pkgs.wireshark-cli";
+        description = ''
+          Which Wireshark package to install in the global environment.
+        '';
+      };
+
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ wireshark ];
+    
+    security.wrappers.dumpcap = {
+      source = "${wireshark}/bin/dumpcap";
+      owner = "root";
+      group = "wireshark";
+      setuid = true;
+      setgid = false;
+      permissions = "u+rx,g+x";
+    };
+
+    users.extraGroups.wireshark.gid = config.ids.gids.wireshark;
+
+  };
+
+}

From 7ec5faa8a4c26beb189c01e27a02d4e2606a4df3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 17 Feb 2017 13:15:59 +0100
Subject: [PATCH 0582/3449] programs.wireshark: use setcap wrapper

---
 nixos/modules/misc/ids.nix           |  2 --
 nixos/modules/programs/wireshark.nix | 25 +++++--------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index a3845737410d..d51b29b99dae 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -288,7 +288,6 @@
       kresd = 270;
       rpc = 271;
       geoip = 272;
-      #wireshark = 273; # unused
 
       # 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
-      wireshark = 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/programs/wireshark.nix b/nixos/modules/programs/wireshark.nix
index aaaf678d362c..710d223b6f59 100644
--- a/nixos/modules/programs/wireshark.nix
+++ b/nixos/modules/programs/wireshark.nix
@@ -3,27 +3,19 @@
 with lib;
 
 let
-
   cfg = config.programs.wireshark;
   wireshark = cfg.package;
-
-in
-
-{
-
+in {
   options = {
-
     programs.wireshark = {
-
       enable = mkOption {
         type = types.bool;
         default = false;
         description = ''
           Whether to add Wireshark to the global environment and configure a
-          setuid wrapper for 'dumpcap' for users in the 'wireshark' group.
+          setcap wrapper for 'dumpcap' for users in the 'wireshark' group.
         '';
       };
-
       package = mkOption {
         type = types.package;
         default = pkgs.wireshark-cli;
@@ -32,26 +24,19 @@ in
           Which Wireshark package to install in the global environment.
         '';
       };
-
     };
-
   };
 
   config = mkIf cfg.enable {
-
     environment.systemPackages = [ wireshark ];
-    
+    users.extraGroups.wireshark = {};
+
     security.wrappers.dumpcap = {
       source = "${wireshark}/bin/dumpcap";
+      capabilities = "cap_net_raw+p";
       owner = "root";
       group = "wireshark";
-      setuid = true;
-      setgid = false;
       permissions = "u+rx,g+x";
     };
-
-    users.extraGroups.wireshark.gid = config.ids.gids.wireshark;
-
   };
-
 }

From facb2c0483eb49f8baadadcacff02209659aa9f0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 17 Feb 2017 22:48:39 +0800
Subject: [PATCH 0583/3449] bundler: 1.14.3 -> 1.14.4

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

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

From fd78ff23f7dd0db1a468189672aeb85f53d4ec99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 15 Feb 2017 11:05:50 +0100
Subject: [PATCH 0584/3449] replace ping6 with ping

reason: after the upgrade of iputils from 20151218 to 20161105
functionality of ping6 and tracepath6 was merged into ping and tracepath.

Ping is now mostly a drop-in replacment for ping6, except that selecting a
specific interface is done by encoding it into the address (ex.: fe80::1%eth0)
rather then specifing it with the `-I` flag.
---
 nixos/modules/tasks/network-interfaces.nix    |  6 -----
 nixos/tests/cjdns.nix                         | 12 +++++-----
 nixos/tests/containers-bridge.nix             |  2 +-
 nixos/tests/containers-extra_veth.nix         |  2 +-
 nixos/tests/containers-ipv6.nix               |  2 +-
 nixos/tests/ipv6.nix                          | 12 +++++-----
 nixos/tests/networking.nix                    | 24 +++++++++----------
 .../nagios/plugins/official-2.x.nix           |  4 ++--
 8 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 28c7b358093d..59043444ef76 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -940,14 +940,8 @@ in
         source  = "${pkgs.iputils.out}/bin/ping";
         capabilities = "cap_net_raw+p";
       };
-
-      ping6 = {
-        source  = "${pkgs.iputils.out}/bin/ping6";
-        capabilities = "cap_net_raw+p";
-      };
     } else {
       ping.source = "${pkgs.iputils.out}/bin/ping";
-      "ping6".source = "${pkgs.iputils.out}/bin/ping6";
     };
 
     # Set the host and domain names in the activation script.  Don't
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix
index f32ec52dfc26..466663799241 100644
--- a/nixos/tests/cjdns.nix
+++ b/nixos/tests/cjdns.nix
@@ -109,14 +109,14 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       # ping a few times each to let the routing table establish itself
 
-      $alice->succeed("ping6 -c 4 $carolIp6");
-      $bob->succeed("ping6 -c 4 $carolIp6");
+      $alice->succeed("ping -c 4 $carolIp6");
+      $bob->succeed("ping -c 4 $carolIp6");
 
-      $carol->succeed("ping6 -c 4 $aliceIp6");
-      $carol->succeed("ping6 -c 4 $bobIp6");
+      $carol->succeed("ping -c 4 $aliceIp6");
+      $carol->succeed("ping -c 4 $bobIp6");
 
-      $alice->succeed("ping6 -c 4 $bobIp6");
-      $bob->succeed("ping6 -c 4 $aliceIp6");
+      $alice->succeed("ping -c 4 $bobIp6");
+      $bob->succeed("ping -c 4 $aliceIp6");
 
       $alice->waitForUnit("httpd.service");
 
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index bb32d852a6f5..598abd22e61b 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -66,7 +66,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       "${containerIp6}" =~ /([^\/]+)\/([0-9+])/;
       my $ip6 = $1;
       chomp $ip6;
-      $machine->succeed("ping6 -n -c 1 $ip6");
+      $machine->succeed("ping -n -c 1 $ip6");
       $machine->succeed("curl --fail http://[$ip6]/ > /dev/null");
 
       # Stop the container.
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index 2a54b1d961c8..6339c8c558b9 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -84,7 +84,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       # Ping on main veth
       $machine->succeed("ping -n -c 1 192.168.0.100");
-      $machine->succeed("ping6 -n -c 1 fc00::2");
+      $machine->succeed("ping -n -c 1 fc00::2");
 
       # Ping on the first extra veth
       $machine->succeed("ping -n -c 1 192.168.1.100 >&2");
diff --git a/nixos/tests/containers-ipv6.nix b/nixos/tests/containers-ipv6.nix
index 320465ebb95b..f676ed122bb3 100644
--- a/nixos/tests/containers-ipv6.nix
+++ b/nixos/tests/containers-ipv6.nix
@@ -47,7 +47,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       # multi-user.target, we should now be able to access it.
       my $ip = "${localIp}";
       chomp $ip;
-      $machine->succeed("ping6 -n -c 1 $ip");
+      $machine->succeed("ping -n -c 1 $ip");
       $machine->succeed("curl --fail http://[$ip]/ > /dev/null");
 
       # Stop the container.
diff --git a/nixos/tests/ipv6.nix b/nixos/tests/ipv6.nix
index 4e2e6379cad3..060f63216796 100644
--- a/nixos/tests/ipv6.nix
+++ b/nixos/tests/ipv6.nix
@@ -54,22 +54,22 @@ import ./make-test.nix ({ pkgs, ...} : {
       }
 
       subtest "loopback address", sub {
-          $client->succeed("ping6 -c 1 ::1 >&2");
-          $client->fail("ping6 -c 1 ::2 >&2");
+          $client->succeed("ping -c 1 ::1 >&2");
+          $client->fail("ping -c 1 ::2 >&2");
       };
 
       subtest "local link addressing", sub {
           my $clientIp = waitForAddress $client, "eth1", "link";
           my $serverIp = waitForAddress $server, "eth1", "link";
-          $client->succeed("ping6 -c 1 -I eth1 $clientIp >&2");
-          $client->succeed("ping6 -c 1 -I eth1 $serverIp >&2");
+          $client->succeed("ping -c 1 $clientIp%eth1 >&2");
+          $client->succeed("ping -c 1 $serverIp%eth1 >&2");
       };
 
       subtest "global addressing", sub {
           my $clientIp = waitForAddress $client, "eth1", "global";
           my $serverIp = waitForAddress $server, "eth1", "global";
-          $client->succeed("ping6 -c 1 $clientIp >&2");
-          $client->succeed("ping6 -c 1 $serverIp >&2");
+          $client->succeed("ping -c 1 $clientIp >&2");
+          $client->succeed("ping -c 1 $serverIp >&2");
           $client->succeed("curl --fail -g http://[$serverIp]");
           $client->fail("curl --fail -g http://[$clientIp]");
       };
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 83103f35d482..541f03324ab5 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -166,24 +166,24 @@ let
           # Test vlan 1
           $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
           $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
-          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
+          $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
+          $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
 
           $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
           $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1");
-          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2");
+          $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::1");
+          $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:1::2");
 
           # Test vlan 2
           $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
           $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
-          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
-          $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
+          $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
+          $client->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
 
           $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
           $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
-          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1");
-          $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2");
+          $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::1");
+          $router->waitUntilSucceeds("ping -c 1 fd00:1234:5678:2::2");
         '';
     };
     dhcpOneIf = {
@@ -390,11 +390,11 @@ let
           $client2->succeed("ip addr >&2");
 
           # Test ipv6
-          $client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
-          $client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
+          $client1->waitUntilSucceeds("ping -c 1 fc00::1");
+          $client1->waitUntilSucceeds("ping -c 1 fc00::2");
 
-          $client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
-          $client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
+          $client2->waitUntilSucceeds("ping -c 1 fc00::1");
+          $client2->waitUntilSucceeds("ping -c 1 fc00::2");
         '';
     };
     vlan = let
diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 1ea6f88084db..67c3954ef569 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   # configured on the build machine).
   preConfigure= "
     configureFlagsArray=(
-      --with-ping-command='/run/wrappers/bin/ping -n -U -w %d -c %d %s'
-      --with-ping6-command='/run/wrappers/bin/ping6 -n -U -w %d -c %d %s'
+      --with-ping-command='/run/wrappers/bin/ping -4 -n -U -w %d -c %d %s'
+      --with-ping6-command='/run/wrappers/bin/ping -6 -n -U -w %d -c %d %s'
     )
   ";
 

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 0585/3449] 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 000000000000..dcec6b058fc3
--- /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 2cccee0a4e3b..90d17ba52818 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 90e44c9819ac..f246df2874fb 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 0586/3449] 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 000000000000..299f075115ad
--- /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 8d1bd281cc02b80e2a1a1297064f33abe770cf75 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 15 Feb 2017 15:49:31 +0100
Subject: [PATCH 0587/3449] rustc: 1.15 -> 1.15.1

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

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index e3314732fa4d..91d7cda1c00a 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,12 +6,12 @@ let
 in
 rec {
   rustc = callPackage ./rustc.nix {
-    shortVersion = "1.15";
+    shortVersion = "1.15.1";
     isRelease = true;
     forceBundledLLVM = false;
     configureFlags = [ "--release-channel=stable" ];
-    srcRev = "10893a9a349cdd423f2490a6984acb5b3b7c8046";
-    srcSha = "0861iivb98ir9ixq2qzznfc1b2l9khlwdln5n0gf2mp1fi3w4d4f";
+    srcRev = "021bd294c039bd54aa5c4aa85bcdffb0d24bc892";
+    srcSha = "1dp7cjxj8nv960jxkq3p18agh9bpfb69ac14x284jmhwyksim3y7";
 
     patches = [
       ./patches/darwin-disable-fragile-tcp-tests.patch

From 73112a6e788a0f41190bcf3d3a2247c2fc17a1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 17 Feb 2017 17:00:28 +0100
Subject: [PATCH 0588/3449] pcsctools: unbreak 'gscriptor' by adding cairo

Fixes this:

  $ gscriptor
  Can't load '/nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so' for module Pango: /nix/store/17w6hdwbli924v7d43xxxp66qhgqpc24-perl-Pango-1.227/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/auto/Pango/Pango.so: undefined symbol: cairo_font_type_to_sv at /nix/store/5z1wn7knhckr3a0asb8lzp99sdai09f2-perl-5.22.2/lib/perl5/5.22.2/x86_64-linux-thread-multi/DynaLoader.pm line 193.
   at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  BEGIN failed--compilation aborted at /nix/store/srdac7af3nz6fb74haa8l8ls9wd9pas0-perl-Gtk2-1.2498/lib/perl5/site_perl/5.22.2/x86_64-linux-thread-multi/Gtk2.pm line 31.
  Compilation failed in require at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.
  BEGIN failed--compilation aborted at /nix/store/sgy2xsyvmam09pl25x8gb507gyiz9ybn-pcsc-tools-1.4.25/bin/.gscriptor-wrapped line 28.
---
 pkgs/tools/security/pcsctools/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index 2932143fa0e1..585e089b8af4 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite
 , wget, coreutils
-, perl, pcscperl, Glib, Gtk2, Pango
+, perl, pcscperl, Glib, Gtk2, Pango, Cairo
 }:
 
 let deps = lib.makeBinPath [ wget coreutils ];
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
     wrapProgram $out/bin/scriptor \
       --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
     wrapProgram $out/bin/gscriptor \
-      --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}"
+      --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango Cairo ]}"
     wrapProgram $out/bin/ATR_analysis \
       --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
     wrapProgram $out/bin/pcsc_scan \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f2c5e57d12b..47bd30652f38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3324,7 +3324,7 @@ with pkgs;
   };
 
   pcsctools = callPackage ../tools/security/pcsctools {
-    inherit (perlPackages) pcscperl Glib Gtk2 Pango;
+    inherit (perlPackages) pcscperl Glib Gtk2 Pango Cairo;
   };
 
   pcsc-cyberjack = callPackage ../tools/security/pcsc-cyberjack { };

From b510dccc94fe787c295e497ed629cb81601d3617 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 17 Feb 2017 08:03:09 -0600
Subject: [PATCH 0589/3449] kde5.applications: update instructions

---
 pkgs/desktops/kde-5/applications/default.nix | 29 ++++++++++++++------
 pkgs/top-level/all-packages.nix              | 11 ++++++--
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index fab9e2c29f8a..228d9443f6de 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -1,11 +1,27 @@
 /*
 
+# New packages
+
+READ THIS FIRST
+
+This module is for official packages in the KDE Applications Bundle. All
+available packages are listed in `./srcs.nix`, although some are not yet
+packaged in Nixpkgs (see below).
+
+IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+
+Many of the packages released upstream are not yet built in Nixpkgs due to lack
+of demand. To add a Nixpkgs build for an upstream package, copy one of the
+existing packages here and modify it as necessary. A simple example package that
+still shows most of the available features is in `./gwenview.nix`.
+
 # Updates
 
-1. Update the URL in `maintainers/scripts/generate-kde-applications.sh` and
-   run that script from the top of the Nixpkgs tree.
-2. Check that the new packages build correctly.
-3. Commit the changes and open a pull request.
+1. Update the URL in `./fetch.sh`.
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
+   from the top of the Nixpkgs tree.
+3. Invoke `nix-build -A kde5` and ensure that everything builds.
+4. Commit the changes and open a pull request.
 
 */
 
@@ -71,11 +87,6 @@ let
     spectacle = callPackage ./spectacle.nix {};
 
     l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
-
-    # External packages
-    kipi-plugins = callPackage ../../../applications/graphics/kipi-plugins/5.x.nix {};
-    ktorrent = callPackage ../../../applications/networking/p2p/ktorrent/5.nix { };
-    libktorrent = callPackage ../../../development/libraries/libktorrent/5.nix { };
   };
 
 in packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcec9f6094e1..5779186d1076 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9279,6 +9279,8 @@ with pkgs;
 
     libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
 
+    libktorrent = callPackage ../development/libraries/libktorrent/5.nix { };
+
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;
     };
@@ -13947,6 +13949,8 @@ with pkgs;
 
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 
+  ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent/5.nix { };
+
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {
     go = go_1_6;
   };
@@ -16845,9 +16849,12 @@ with pkgs;
       plasma = import ../desktops/kde-5/plasma { inherit pkgs; };
       applications = import ../desktops/kde-5/applications { inherit pkgs; };
       merged = self:
-        { plasma = plasma self;
+        {
+          plasma = plasma self;
           frameworks = qt5.kdeFrameworks;
-          applications = applications self; }
+          applications = applications self;
+          kipi-plugins = self.callPackage ../applications/graphics/kipi-plugins/5.x.nix {};
+        }
         // qt5.kdeFrameworks
         // plasma self
         // applications self;

From 304da2449aaf113e6dc7e5789296b2a10c8f02b2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 17 Feb 2017 08:04:43 -0600
Subject: [PATCH 0590/3449] kde5.plasma: update instructions

---
 pkgs/desktops/kde-5/plasma/default.nix | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index 36850824d63c..3ac1c51848e9 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -1,11 +1,26 @@
 /*
 
+# New packages
+
+READ THIS FIRST
+
+This module is for official packages in KDE Plasma 5. All available packages are
+listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
+below).
+
+IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+
+Many of the packages released upstream are not yet built in Nixpkgs due to lack
+of demand. To add a Nixpkgs build for an upstream package, copy one of the
+existing packages here and modify it as necessary.
+
 # Updates
 
-1. Update the URL in `maintainers/scripts/generate-kde-plasma.sh` and run
-   that script from the top of the Nixpkgs tree.
-2. Check that the new packages build correctly.
-3. Commit the changes and open a pull request.
+1. Update the URL in `./fetch.sh`.
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
+   from the top of the Nixpkgs tree.
+3. Invoke `nix-build -A kde5` and ensure that everything builds.
+4. Commit the changes and open a pull request.
 
 */
 

From 580bdde06c29a2eb98a82c5f22043411fdcaf845 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 17 Feb 2017 08:05:39 -0600
Subject: [PATCH 0591/3449] kde5.frameworks: update instructions

---
 .../libraries/kde-frameworks/default.nix      | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 93a8d62ed1dd..ee7614bbcf10 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -1,11 +1,26 @@
 /*
 
+# New packages
+
+READ THIS FIRST
+
+This module is for official packages in KDE Frameworks 5. All available packages
+are listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
+below).
+
+IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+
+Many of the packages released upstream are not yet built in Nixpkgs due to lack
+of demand. To add a Nixpkgs build for an upstream package, copy one of the
+existing packages here and modify it as necessary.
+
 # Updates
 
-1. Update the URL in `maintainers/scripts/generate-kde-frameworks.sh` and
-   run that script from the top of the Nixpkgs tree.
-2. Check that the new packages build correctly.
-3. Commit the changes and open a pull request.
+1. Update the URL in `./fetch.sh`.
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks`
+   from the top of the Nixpkgs tree.
+3. Invoke `nix-build -A kde5` and ensure that everything builds.
+4. Commit the changes and open a pull request.
 
 */
 

From 73577a2b05c2fe89c7ecaf030caf76f5148301da Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 17 Feb 2017 19:08:14 +0100
Subject: [PATCH 0592/3449] linux_4_9: 4.9.9 -> 4.9.10

---
 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 ac51cb73a912..103c8f6c6989 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.9";
+  version = "4.9.10";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1vnr6688gg8njmivdzlx21v1f3w02ahca194bjvm15apajcccd96";
+    sha256 = "098mcq3rg05gpammcdfhr2xhcy69ggc9h5g18m4ymnfqdx3havmx";
   };
 
   kernelPatches = args.kernelPatches;

From e8007c0e8911fbcd99268b0b30d3e9f069f22c20 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 17 Feb 2017 19:09:50 +0100
Subject: [PATCH 0593/3449] linux_4_9: patch for CVE-2017-5986

Seems fairly low impact[1] but we might as well patch it until a new 4.9
version is released

[1]: https://bugzilla.redhat.com/show_bug.cgi?id=1420276
---
 pkgs/os-specific/linux/kernel/patches.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix           | 1 +
 2 files changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 33f11ad5ae3e..9bc47dd624d8 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -175,4 +175,13 @@ rec {
       };
     };
 
+  sctp_bug_on_CVE_2017_5986 = rec
+    { name = "sctp_BUG_ON_CVE_2017_5986.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2dcab598484185dea7ec22219c76dcdd59e3cb90";
+        sha256 = "15np10bfm5yzby9zbkrh23qpm91wnprblsk0xn9yjryypnz8njxh";
+      };
+    };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47bd30652f38..1b178665b816 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11294,6 +11294,7 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.sctp_bug_on_CVE_2017_5986
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 89a036506396dd869474a32e984f5cab5c07992a Mon Sep 17 00:00:00 2001
From: Matthias Herrmann <matthias.mh.herrmann@googlemail.com>
Date: Fri, 17 Feb 2017 18:59:01 +0100
Subject: [PATCH 0594/3449] sweethome3d: version compatible with master and
 16.09
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: let the package function take 'libXxf86vm' as input instead of
'xorg' (the whole set).]
---
 pkgs/applications/misc/sweethome3d/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 4a530a927815..62e66e4ad38e 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
-, gtk3, gsettings_desktop_schemas, p7zip }:
+, gtk3, gsettings_desktop_schemas, p7zip, libXxf86vm }:
 
 let
 
@@ -29,6 +29,13 @@ let
       categories = "Application;Graphics;2DGraphics;3DGraphics;";
     };
 
+    patchPhase = ''
+      patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_awt.so
+      patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/amd64/libnativewindow_x11.so
+      patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_awt.so
+      patchelf --set-rpath ${libXxf86vm}/lib lib/java3d-1.6/linux/i586/libnativewindow_x11.so
+    '';
+
     buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ];
 
     buildPhase = ''

From 5231d0ac290f387885a20ece0c5cbb89ee223472 Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Fri, 17 Feb 2017 19:44:04 +0100
Subject: [PATCH 0595/3449] bluetooth module: add option to power up bluetooth
 controller (#22685)

---
 nixos/modules/services/hardware/bluetooth.nix | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index de0d48032113..71b3a93a2e0d 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -1,8 +1,11 @@
 { config, lib, pkgs, ... }:
 
 with lib;
+
 let
   bluez-bluetooth = pkgs.bluez;
+  cfg = config.hardware.bluetooth;
+
 in
 
 {
@@ -11,33 +14,53 @@ in
 
   options = {
 
-    hardware.bluetooth.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Whether to enable support for Bluetooth.";
+    hardware.bluetooth.enable = mkEnableOption "support for Bluetooth.";
+
+    hardware.bluetooth.powerOnBoot = mkOption {
+      type    = types.bool;
+      default = true;
+      description = "Whether to power up the default Bluetooth controller on boot.";
     };
 
   };
 
   ###### implementation
 
-  config = mkIf config.hardware.bluetooth.enable {
+  config = mkIf cfg.enable {
 
     environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
 
     services.udev.packages = [ bluez-bluetooth ];
-
     services.dbus.packages = [ bluez-bluetooth ];
+    systemd.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.services.bluetooth = {
-      wantedBy = [ "bluetooth.target" ];
-      aliases = [ "dbus-org.bluez.service" ];
     };
 
-    systemd.user.services.obex = {
-      aliases = [ "dbus-org.bluez.obex.service" ];
+    systemd.user.services = {
+      obex.aliases = [ "dbus-org.bluez.obex.service" ];
     };
 
   };

From a5e9668c5c2a43703a4f49ae673909c66acf7785 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 17 Feb 2017 18:18:16 +0100
Subject: [PATCH 0596/3449] nixos/test: Fix escaping for copyFileFromHost

A long-time issue and one of the reasons I've never used that function
before. So let's remove that todo-comment and escape the contents
properly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
---
 nixos/lib/test-driver/Machine.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 85bc376f67fa..30664406b26d 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -607,7 +607,8 @@ sub waitForWindow {
 sub copyFileFromHost {
     my ($self, $from, $to) = @_;
     my $s = `cat $from` or die;
-    $self->mustSucceed("echo '$s' > $to"); # !!! escaping
+    $s =~ s/'/'\\''/g;
+    $self->mustSucceed("echo '$s' > $to");
 }
 
 

From 32c2e8f4aeea5a35302b450ed4233dd1af6b22c8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 17 Feb 2017 18:20:53 +0100
Subject: [PATCH 0597/3449] taskserver/helpertool: Fix error message on export

The error message displays that a specific user doesn't exist in an
organisation, but uses the User object's name attribute to show which
user it was.

This is basically a very stupid chicken and egg problem and easily fixed
by using the user name provided on the command line.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/misc/taskserver/helper-tool.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py
index 03e7cdf8987a..9c662ef047c1 100644
--- a/nixos/modules/services/misc/taskserver/helper-tool.py
+++ b/nixos/modules/services/misc/taskserver/helper-tool.py
@@ -526,7 +526,7 @@ def export_user(organisation, user):
     userobj = organisation.get_user(user)
     if userobj is None:
         msg = "User {} doesn't exist in organisation {}."
-        sys.exit(msg.format(userobj.name, organisation.name))
+        sys.exit(msg.format(user, organisation.name))
 
     sys.stdout.write(userobj.export())
 

From 78fe00da7c2d6c4e5746558f366e1c8fbf97fb47 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 17 Feb 2017 19:03:49 +0100
Subject: [PATCH 0598/3449] taskserver: Allow helper tool in manual config

The helper tool so far was only intended for use in automatic PKI
handling, but it also is very useful if you have an existing CA.

One of the main advantages is that you don't need to specify the data
directory anymore and the right permissions are also handled as well.

Another advantage is that we now have an uniform management tool for
both automatic and manual config, so the documentation in the NixOS
manual now applies to the manual PKI config as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../services/misc/taskserver/default.nix      |  4 +-
 .../modules/services/misc/taskserver/doc.xml  |  6 +--
 .../services/misc/taskserver/helper-tool.py   | 41 ++++++++++++-------
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index d28c5dc7af85..88331a56fb0b 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -154,9 +154,8 @@ let
 
   certtool = "${pkgs.gnutls.bin}/bin/certtool";
 
-  nixos-taskserver = pkgs.pythonPackages.buildPythonPackage {
+  nixos-taskserver = pkgs.pythonPackages.buildPythonApplication {
     name = "nixos-taskserver";
-    namePrefix = "";
 
     src = pkgs.runCommand "nixos-taskserver-src" {} ''
       mkdir -p "$out"
@@ -167,6 +166,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";
       }}" > "$out/main.py"
       cat > "$out/setup.py" <<EOF
       from setuptools import setup
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml
index 48591129264a..6d4d2a9b488c 100644
--- a/nixos/modules/services/misc/taskserver/doc.xml
+++ b/nixos/modules/services/misc/taskserver/doc.xml
@@ -136,9 +136,9 @@ $ ssh server nixos-taskserver user export my-company alice | sh
 
     <para>
       If you set any options within
-      <option>service.taskserver.pki.manual.*</option>, the automatic user and
-      CA management by the <command>nixos-taskserver</command> is disabled and
-      you need to create certificates and keys by yourself.
+      <option>service.taskserver.pki.manual.*</option>,
+      <command>nixos-taskserver</command> won't issue certificates, but you can
+      still use it for adding or removing user accounts.
     </para>
   </section>
 </chapter>
diff --git a/nixos/modules/services/misc/taskserver/helper-tool.py b/nixos/modules/services/misc/taskserver/helper-tool.py
index 9c662ef047c1..b97bc1df74f7 100644
--- a/nixos/modules/services/misc/taskserver/helper-tool.py
+++ b/nixos/modules/services/misc/taskserver/helper-tool.py
@@ -13,6 +13,7 @@ from tempfile import NamedTemporaryFile
 
 import click
 
+IS_AUTO_CONFIG = @isAutoConfig@ # NOQA
 CERTTOOL_COMMAND = "@certtool@"
 CERT_BITS = "@certBits@"
 CLIENT_EXPIRATION = "@clientExpiration@"
@@ -149,6 +150,12 @@ def create_template(contents):
 
 
 def generate_key(org, user):
+    if not IS_AUTO_CONFIG:
+        msg = "Automatic PKI handling is disabled, you need to " \
+              "manually issue a client certificate for user {}.\n"
+        sys.stderr.write(msg.format(user))
+        return
+
     basedir = os.path.join(TASKD_DATA_DIR, "keys", org, user)
     if os.path.exists(basedir):
         raise OSError("Keyfile directory for {} already exists.".format(user))
@@ -243,26 +250,32 @@ class User(object):
         self.key = key
 
     def export(self):
-        pubcert = getkey(self.__org, self.name, "public.cert")
-        privkey = getkey(self.__org, self.name, "private.key")
-        cacert = getkey("ca.cert")
-
-        keydir = "${TASKDATA:-$HOME/.task}/keys"
-
         credentials = '/'.join([self.__org, self.name, self.key])
         allow_unquoted = string.ascii_letters + string.digits + "/-_."
         if not all((c in allow_unquoted) for c in credentials):
             credentials = "'" + credentials.replace("'", r"'\''") + "'"
 
-        script = [
-            "umask 0077",
-            'mkdir -p "{}"'.format(keydir),
-            mktaskkey("certificate", os.path.join(keydir, "public.cert"),
-                      pubcert),
-            mktaskkey("key", os.path.join(keydir, "private.key"), privkey),
-            mktaskkey("ca", os.path.join(keydir, "ca.cert"), cacert),
+        script = []
+
+        if IS_AUTO_CONFIG:
+            pubcert = getkey(self.__org, self.name, "public.cert")
+            privkey = getkey(self.__org, self.name, "private.key")
+            cacert = getkey("ca.cert")
+
+            keydir = "${TASKDATA:-$HOME/.task}/keys"
+
+            script += [
+                "umask 0077",
+                'mkdir -p "{}"'.format(keydir),
+                mktaskkey("certificate", os.path.join(keydir, "public.cert"),
+                          pubcert),
+                mktaskkey("key", os.path.join(keydir, "private.key"), privkey),
+                mktaskkey("ca", os.path.join(keydir, "ca.cert"), cacert)
+            ]
+
+        script.append(
             "task config taskd.credentials -- {}".format(credentials)
-        ]
+        )
 
         return "\n".join(script) + "\n"
 

From c7bbb93878a0b9772c34a6c19eb3f1b15a82a345 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 17 Feb 2017 19:18:04 +0100
Subject: [PATCH 0599/3449] taskserver: Pass configuration via command line

Putting an include directive in the configuration file referencing a
store path with the real configuration file has the disavantage that
once we change the real configuration file the store path is also a
different one.

So we would have to replace that include directive with the new
configuration file, which is very much error-prone, because whenever
taskd modifies the configuration file on its own it generates a new one
with *only* the key/value options and without any include directives.

Another problem is that we only added the include directive on the first
initalization, so whenever there is *any* configuration change, it won't
affect anything.

We're now passing all the configuration options via command line,
because taskd treats everything in the form of --<name>=<value> to be a
configuration directive.

This also has the effect that we now no longer have extraConfig, because
configuration isn't a file anymore.

Instead we now have an attribute set that is mapped down to
configuration options.

Unfortunately this isn't so easy with the way taskd is configured,
because there is an option called "server" and also other options like
"server.cert", "server.key" and so on, which do not map very well to
attribute sets.

So we have an exception for the "server" option, which is now called
"server.listen", because it specifies the listening address.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #22705
---
 .../services/misc/taskserver/default.nix      | 129 ++++++++++++------
 1 file changed, 84 insertions(+), 45 deletions(-)

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 88331a56fb0b..9040cbaf838f 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -94,44 +94,6 @@ let
     in flatten (mapAttrsToList mkSublist attrs);
   in all isNull (findPkiDefinitions [] manualPkiOptions);
 
-  configFile = pkgs.writeText "taskdrc" (''
-    # systemd related
-    daemon = false
-    log = -
-
-    # logging
-    ${mkConfLine "debug" cfg.debug}
-    ${mkConfLine "ip.log" cfg.ipLog}
-
-    # general
-    ${mkConfLine "ciphers" cfg.ciphers}
-    ${mkConfLine "confirmation" cfg.confirmation}
-    ${mkConfLine "extensions" cfg.extensions}
-    ${mkConfLine "queue.size" cfg.queueSize}
-    ${mkConfLine "request.limit" cfg.requestLimit}
-
-    # client
-    ${mkConfLine "client.allow" cfg.allowedClientIDs}
-    ${mkConfLine "client.deny" cfg.disallowedClientIDs}
-
-    # server
-    server = ${cfg.listenHost}:${toString cfg.listenPort}
-    ${mkConfLine "trust" cfg.trust}
-
-    # PKI options
-    ${if needToCreateCA then ''
-      ca.cert = ${cfg.dataDir}/keys/ca.cert
-      server.cert = ${cfg.dataDir}/keys/server.cert
-      server.key = ${cfg.dataDir}/keys/server.key
-      server.crl = ${cfg.dataDir}/keys/server.crl
-    '' else ''
-      ca.cert = ${cfg.pki.manual.ca.cert}
-      server.cert = ${cfg.pki.manual.server.cert}
-      server.key = ${cfg.pki.manual.server.key}
-      server.crl = ${cfg.pki.manual.server.crl}
-    ''}
-  '' + cfg.extraConfig);
-
   orgOptions = { name, ... }: {
     options.users = mkOption {
       type = types.uniq (types.listOf types.str);
@@ -365,17 +327,54 @@ in {
       pki.manual = manualPkiOptions;
       pki.auto = autoPkiOptions;
 
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        example = "client.cert = /tmp/debugging.cert";
+      config = mkOption {
+        type = types.attrs;
+        example.client.cert = "/tmp/debugging.cert";
         description = ''
-          Extra lines to append to the taskdrc configuration file.
+          Configuration options to pass to Taskserver.
+
+          The options here are the same as described in <citerefentry>
+            <refentrytitle>taskdrc</refentrytitle>
+            <manvolnum>5</manvolnum>
+          </citerefentry>, but with one difference:
+
+          The <literal>server</literal> option is
+          <literal>server.listen</literal> here, because the
+          <literal>server</literal> option would collide with other options
+          like <literal>server.cert</literal> and we would run in a type error
+          (attribute set versus string).
+
+          Nix types like integers or booleans are automatically converted to
+          the right values Taskserver would expect.
         '';
+        apply = let
+          mkKey = path: if path == ["server" "listen"] then "server"
+                        else concatStringsSep "." path;
+          recurse = path: attrs: let
+            mapper = name: val: let
+              newPath = path ++ [ name ];
+              scalar = if val == true then "true"
+                       else if val == false then "false"
+                       else toString val;
+            in if isAttrs val then recurse newPath val
+               else [ "${mkKey newPath}=${scalar}" ];
+          in concatLists (mapAttrsToList mapper attrs);
+        in recurse [];
       };
     };
   };
 
+  imports = [
+    (mkRemovedOptionModule ["services" "taskserver" "extraConfig"] ''
+      This option was removed in favor of `services.taskserver.config` with
+      different semantics (it's now a list of attributes instead of lines).
+
+      Please look up the documentation of `services.taskserver.config' to get
+      more information about the new way to pass additional configuration
+      options.
+    '')
+  ];
+
   config = mkMerge [
     (mkIf cfg.enable {
       environment.systemPackages = [ pkgs.taskserver nixos-taskserver ];
@@ -392,6 +391,44 @@ in {
         gid = config.ids.gids.taskd;
       };
 
+      services.taskserver.config = {
+        # systemd related
+        daemon = false;
+        log = "-";
+
+        # logging
+        debug = cfg.debug;
+        ip.log = cfg.ipLog;
+
+        # general
+        ciphers = cfg.ciphers;
+        confirmation = cfg.confirmation;
+        extensions = cfg.extensions;
+        queue.size = cfg.queueSize;
+        request.limit = cfg.requestLimit;
+
+        # client
+        client.allow = cfg.allowedClientIDs;
+        client.deny = cfg.disallowedClientIDs;
+
+        # server
+        trust = cfg.trust;
+        server = {
+          listen = "${cfg.listenHost}:${toString cfg.listenPort}";
+        } // (if needToCreateCA then {
+          cert = "${cfg.dataDir}/keys/server.cert";
+          key = "${cfg.dataDir}/keys/server.key";
+          crl = "${cfg.dataDir}/keys/server.crl";
+        } else {
+          cert = "${cfg.pki.manual.server.cert}";
+          key = "${cfg.pki.manual.server.key}";
+          crl = "${cfg.pki.manual.server.crl}";
+        });
+
+        ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert"
+                  else "${cfg.pki.manual.ca.cert}";
+      };
+
       systemd.services.taskserver-init = {
         wantedBy = [ "taskserver.service" ];
         before = [ "taskserver.service" ];
@@ -404,7 +441,6 @@ in {
 
         script = ''
           ${taskd} init
-          echo "include ${configFile}" > "${cfg.dataDir}/config"
           touch "${cfg.dataDir}/.is_initialized"
         '';
 
@@ -436,7 +472,10 @@ in {
         in "${helperTool} process-json '${jsonFile}'";
 
         serviceConfig = {
-          ExecStart = "@${taskd} taskd server";
+          ExecStart = let
+            mkCfgFlag = flag: escapeShellArg "--${flag}";
+            cfgFlags = concatMapStringsSep " " mkCfgFlag cfg.config;
+          in "@${taskd} taskd server ${cfgFlags}";
           ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
           Restart = "on-failure";
           PermissionsStartOnly = true;

From 5af8b120a6d5e8abaf2e0397e9ac077a3ab33897 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 17 Feb 2017 19:28:55 +0100
Subject: [PATCH 0600/3449] nixos/tests/taskserver: Add test for manual config

This subtest actually serves two purposes:

  1. Test manual PKI configuration
  2. Test changing of configuration files

In order to only test manual PKI configuration it would have been enough
to just add another server with a manual config.

But as the switch from automatic PKI config to manual config is probably
one of the most fundamental changes in configuration, so it serves
*very* well to also check whether changes in the NixOS configuration
actually have an impact in the real system.

So instead of adding another server, we now create a dummy "newServer"
machine, which is the new configuration for "server" and use
switch-to-configuration to switch "server" to the config of "newServer".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/taskserver.nix | 129 +++++++++++++++++++++++++++++++++++--
 1 file changed, 124 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/taskserver.nix b/nixos/tests/taskserver.nix
index d770b20a7757..cdccb11d8887 100644
--- a/nixos/tests/taskserver.nix
+++ b/nixos/tests/taskserver.nix
@@ -1,4 +1,62 @@
-import ./make-test.nix {
+import ./make-test.nix ({ pkgs, ... }: let
+  snakeOil = pkgs.runCommand "snakeoil-certs" {
+    outputs = [ "out" "cacert" "cert" "key" "crl" ];
+    buildInputs = [ pkgs.gnutls.bin ];
+    caTemplate = pkgs.writeText "snakeoil-ca.template" ''
+      cn = server
+      expiration_days = -1
+      cert_signing_key
+      ca
+    '';
+    certTemplate = pkgs.writeText "snakeoil-cert.template" ''
+      cn = server
+      expiration_days = -1
+      tls_www_server
+      encryption_key
+      signing_key
+    '';
+    crlTemplate = pkgs.writeText "snakeoil-crl.template" ''
+      expiration_days = -1
+    '';
+    userCertTemplace = pkgs.writeText "snakoil-user-cert.template" ''
+      organization = snakeoil
+      cn = server
+      expiration_days = -1
+      tls_www_client
+      encryption_key
+      signing_key
+    '';
+  } ''
+    certtool -p --bits 4096 --outfile ca.key
+    certtool -s --template "$caTemplate" --load-privkey ca.key \
+                --outfile "$cacert"
+    certtool -p --bits 4096 --outfile "$key"
+    certtool -c --template "$certTemplate" \
+                --load-ca-privkey ca.key \
+                --load-ca-certificate "$cacert" \
+                --load-privkey "$key" \
+                --outfile "$cert"
+    certtool --generate-crl --template "$crlTemplate" \
+                            --load-ca-privkey ca.key \
+                            --load-ca-certificate "$cacert" \
+                            --outfile "$crl"
+
+    mkdir "$out"
+
+    # Stripping key information before the actual PEM-encoded values is solely
+    # to make test output a bit less verbose when copying the client key to the
+    # actual client.
+    certtool -p --bits 4096 | sed -n \
+      -e '/^----* *BEGIN/,/^----* *END/p' > "$out/alice.key"
+
+    certtool -c --template "$userCertTemplace" \
+                --load-privkey "$out/alice.key" \
+                --load-ca-privkey ca.key \
+                --load-ca-certificate "$cacert" \
+                --outfile "$out/alice.cert"
+  '';
+
+in {
   name = "taskserver";
 
   nodes = rec {
@@ -12,6 +70,23 @@ import ./make-test.nix {
       };
     };
 
+    # New generation of the server with manual config
+    newServer = { lib, nodes, ... }: {
+      imports = [ server ];
+      services.taskserver.pki.manual = {
+        ca.cert = snakeOil.cacert;
+        server.cert = snakeOil.cert;
+        server.key = snakeOil.key;
+        server.crl = snakeOil.crl;
+      };
+      # This is to avoid assigning a different network address to the new
+      # generation.
+      networking = lib.mapAttrs (lib.const lib.mkForce) {
+        inherit (nodes.server.config.networking)
+          hostName interfaces primaryIPAddress extraHosts;
+      };
+    };
+
     client1 = { pkgs, ... }: {
       environment.systemPackages = [ pkgs.taskwarrior pkgs.gnutls ];
       users.users.alice.isNormalUser = true;
@@ -26,6 +101,8 @@ import ./make-test.nix {
   testScript = { nodes, ... }: let
     cfg = nodes.server.config.services.taskserver;
     portStr = toString cfg.listenPort;
+    newServerSystem = nodes.newServer.config.system.build.toplevel;
+    switchToNewServer = "${newServerSystem}/bin/switch-to-configuration test";
   in ''
     sub su ($$) {
       my ($user, $cmd) = @_;
@@ -33,8 +110,8 @@ import ./make-test.nix {
       return "su - $user -c '$esc'";
     }
 
-    sub setupClientsFor ($$) {
-      my ($org, $user) = @_;
+    sub setupClientsFor ($$;$) {
+      my ($org, $user, $extraInit) = @_;
 
       for my $client ($client1, $client2) {
         $client->nest("initialize client for user $user", sub {
@@ -58,6 +135,8 @@ import ./make-test.nix {
             }
           });
 
+          eval { &$extraInit($client, $org, $user) };
+
           $client->succeed(su $user,
             "task config taskd.server server:${portStr} >&2"
           );
@@ -104,7 +183,10 @@ import ./make-test.nix {
       return su $user, $cmd;
     }
 
-    startAll;
+    # Explicitly start the VMs so that we don't accidentally start newServer
+    $server->start;
+    $client1->start;
+    $client2->start;
 
     $server->waitForUnit("taskserver.service");
 
@@ -162,5 +244,42 @@ import ./make-test.nix {
       restartServer;
       testSync "bar";
     };
+
+    subtest "check manual configuration", sub {
+      $server->succeed('${switchToNewServer} >&2');
+      $server->waitForUnit("taskserver.service");
+      $server->waitForOpenPort(${portStr});
+
+      $server->succeed(
+        "nixos-taskserver org add manualOrg",
+        "nixos-taskserver user add manualOrg alice"
+      );
+
+      setupClientsFor "manualOrg", "alice", sub {
+        my ($client, $org, $user) = @_;
+        my $cfgpath = "/home/$user/.task";
+
+        $client->copyFileFromHost("${snakeOil.cacert}", "$cfgpath/ca.cert");
+        for my $file ('alice.key', 'alice.cert') {
+          $client->copyFileFromHost("${snakeOil}/$file", "$cfgpath/$file");
+        }
+
+        for my $file ("$user.key", "$user.cert") {
+          $client->copyFileFromHost(
+            "${snakeOil}/$file", "$cfgpath/$file"
+          );
+        }
+        $client->copyFileFromHost(
+          "${snakeOil.cacert}", "$cfgpath/ca.cert"
+        );
+        $client->succeed(
+          (su "alice", "task config taskd.ca $cfgpath/ca.cert"),
+          (su "alice", "task config taskd.key $cfgpath/$user.key"),
+          (su $user, "task config taskd.certificate $cfgpath/$user.cert")
+        );
+      };
+
+      testSync "alice";
+    };
   '';
-}
+})

From 08881b8cbe03a058310eb62aa316dbd095682e59 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 17 Feb 2017 19:36:57 +0100
Subject: [PATCH 0601/3449] taskserver: Remove taskserver from systemPackages

This is deliberate because using the taskd binary to configure
Taskserver has a good chance of messing up permissions.

The nixos-taskserver tool now can manage even manual configurations, so
there really is no need anymore to expose the taskd binary.

If people still want to use the taskd binary at their own risk they can
still add taskserver to systemPackages themselves.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/misc/taskserver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 9040cbaf838f..826f463bbd75 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -377,7 +377,7 @@ in {
 
   config = mkMerge [
     (mkIf cfg.enable {
-      environment.systemPackages = [ pkgs.taskserver nixos-taskserver ];
+      environment.systemPackages = [ nixos-taskserver ];
 
       users.users = optional (cfg.user == "taskd") {
         name = "taskd";

From 213356c9278330f32749a06cd8bc5e8727ff6849 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 17 Sep 2016 13:53:12 +0300
Subject: [PATCH 0602/3449] activation-script service: add utillinux to path

---
 nixos/modules/system/activation/activation-script.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index dcf105eb7844..c2ac731d433d 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -19,6 +19,7 @@ let
       glibc # needed for getent
       shadow
       nettools # needed for hostname
+      utillinux # needed for mount and mountpoint
     ];
 
 in
@@ -168,12 +169,12 @@ in
           local options="$3"
           local fsType="$4"
 
-          if ${pkgs.utillinux}/bin/mountpoint -q "$mountPoint"; then
+          if mountpoint -q "$mountPoint"; then
             local options="remount,$options"
           else
             mkdir -m 0755 -p "$mountPoint"
           fi
-          ${pkgs.utillinux}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint"
+          mount -t "$fsType" -o "$options" "$device" "$mountPoint"
         }
         source ${config.system.build.earlyMountScript}
       '';

From cb96ed615e48d13c165046363623f0f0e7007796 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Fri, 17 Feb 2017 18:56:39 +0000
Subject: [PATCH 0603/3449] lib: Add a function to filter sources by regular
 expressions.

---
 lib/sources.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/sources.nix b/lib/sources.nix
index f41abe1e1eae..8f312a9db5c4 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -26,6 +26,12 @@ rec {
 
   cleanSource = builtins.filterSource cleanSourceFilter;
 
+  # Filter sources by a list of regular expressions.
+  #
+  # E.g. `src = sourceByRegex ./my-subproject [".*\.py$" "^database.sql$"]`
+  sourceByRegex = src: regexes: builtins.filterSource (path: type:
+    let relPath = lib.removePrefix (toString src + "/") (toString path);
+    in lib.any (re: builtins.match re relPath != null) regexes) src;
 
   # Get all files ending with the specified suffices from the given
   # directory or its descendants.  E.g. `sourceFilesBySuffices ./dir

From e67416f7e2685ab6136863f96545a1c22f8a23cd Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 16 Feb 2017 18:22:38 -0600
Subject: [PATCH 0604/3449] awesome-4.0: Add hicolor-icon-theme for theme
 support

Closes #22888.
---
 .../window-managers/awesome/default.nix       | 61 ++++++-------------
 1 file changed, 19 insertions(+), 42 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 9fa4d6a6d8ef..0a1256d67a48 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -4,29 +4,17 @@
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
 , which, dbus, nettools, git, asciidoc, doxygen
 , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs
-, libxkbcommon, xcbutilxrm
+, libxkbcommon, xcbutilxrm, hicolor_icon_theme
 }:
 
-let
-  version = "4.0";
-in with luaPackages;
-
-stdenv.mkDerivation rec {
+with luaPackages; stdenv.mkDerivation rec {
   name = "awesome-${version}";
-
+  version = "4.0";
   src = fetchurl {
     url    = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
     sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
   };
 
-  meta = with stdenv.lib; {
-    description = "Highly configurable, dynamic window manager for X";
-    homepage    = https://awesomewm.org/;
-    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 rasendubi ];
-    platforms   = platforms.linux;
-  };
-
   nativeBuildInputs = [
     asciidoc
     cmake
@@ -36,33 +24,14 @@ stdenv.mkDerivation rec {
     pkgconfig
     xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
   ];
-
-  buildInputs = [
-    cairo
-    dbus
-    gdk_pixbuf
-    gobjectIntrospection
-    git
-    lgi
-    libpthreadstubs
-    libstartup_notification
-    libxdg_basedir
-    lua
-    nettools
-    pango
-    xcb-util-cursor
-    xorg.libXau
-    xorg.libXdmcp
-    xorg.libxcb
-    xorg.libxshmfence
-    xorg.xcbutil
-    xorg.xcbutilimage
-    xorg.xcbutilkeysyms
-    xorg.xcbutilrenderutil
-    xorg.xcbutilwm
-    libxkbcommon
-    xcbutilxrm
-  ];
+  propagatedUserEnvPkgs = [ hicolor_icon_theme ];
+  buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection
+                  git lgi libpthreadstubs libstartup_notification
+                  libxdg_basedir lua nettools pango xcb-util-cursor
+                  xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
+                  xorg.xcbutil xorg.xcbutilimage xorg.xcbutilkeysyms
+                  xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
+                  xcbutilxrm ];
 
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
 
@@ -86,4 +55,12 @@ stdenv.mkDerivation rec {
   passthru = {
     inherit lua;
   };
+
+  meta = with stdenv.lib; {
+    description = "Highly configurable, dynamic window manager for X";
+    homepage    = https://awesomewm.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 rasendubi ndowens ];
+    platforms   = platforms.linux;
+  };
 }

From bd0d8ed807d29faa3deee96bafcbbd76c8fa4060 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 17 Feb 2017 20:14:59 +0100
Subject: [PATCH 0605/3449] programs.mtr: init setcap-wrapper

---
 nixos/modules/module-list.nix  |  1 +
 nixos/modules/programs/mtr.nix | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 nixos/modules/programs/mtr.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 81597d91d89a..2195a828a1ee 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -80,6 +80,7 @@
   ./programs/light.nix
   ./programs/man.nix
   ./programs/mosh.nix
+  ./programs/mtr.nix
   ./programs/nano.nix
   ./programs/oblogout.nix
   ./programs/screen.nix
diff --git a/nixos/modules/programs/mtr.nix b/nixos/modules/programs/mtr.nix
new file mode 100644
index 000000000000..927fe68be875
--- /dev/null
+++ b/nixos/modules/programs/mtr.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.mtr;
+in {
+  options = {
+    programs.mtr = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to add mtr to the global environment and configure a
+          setcap wrapper for it.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    security.wrappers.mtr = {
+      source = "${pkgs.mtr}/bin/mtr";
+      capabilities = "cap_net_raw+p";
+    };
+  };
+}

From 7a113e9e83b10b8cf85ed07e10f7c47f5e5c493d Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 17 Feb 2017 19:20:45 +0000
Subject: [PATCH 0606/3449] fakechroot: 2.17.2 -> 2.19 (with modification)

There's a PR I need merged so this is currently pointing at a fork
on my GitHub but I'll repoint it to mainline once that gets merged.
---
 pkgs/tools/system/fakechroot/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix
index 5827a11714d6..be3a32de251f 100644
--- a/pkgs/tools/system/fakechroot/default.nix
+++ b/pkgs/tools/system/fakechroot/default.nix
@@ -1,14 +1,19 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchFromGitHub, autoreconfHook, perl }:
 
 stdenv.mkDerivation rec {
   name = "fakechroot-${version}";
-  version = "2.17.2";
+  version = "2.19";
 
-  src = fetchurl {
-    url = "https://github.com/dex4er/fakechroot/archive/${version}.tar.gz";
-    sha256 = "0z4cxj4lb8cfb63sw82dbc31hf082fv3hshbmhk49cqkc0f673q3";
+  # TODO: move back to mainline once https://github.com/dex4er/fakechroot/pull/46 is merged
+  src = fetchFromGitHub {
+    owner  = "copumpkin";
+    repo   = "fakechroot";
+    rev    = "dcc0cfe3941e328538f9e62b2c0b15430d393ec1";
+    sha256 = "1ls3y97qqfcfd3z0balz94xq1gskfk04pg85x6b7wjw8dm4030qd";
   };
 
+  buildInputs = [ autoreconfHook perl ];
+
   meta = with stdenv.lib; {
     homepage = https://github.com/dex4er/fakechroot;
     description = "Give a fake chroot environment through LD_PRELOAD";

From 376b377775b8c31db48f8eb757c016a7a404f181 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 17 Feb 2017 16:13:18 -0500
Subject: [PATCH 0607/3449] atom: 1.14.1 -> 1.14.3

---
 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 c91028b7fe4e..27ba155ad74d 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.14.1";
+  version = "1.14.3";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0dmzqz1j2nfcm459zgfzqym26kmbspdn9lipf77aawbbn2y36xqp";
+    sha256 = "16zc1bbvxs9fpd9y3mzgbl789djp3p1664a8b2nn9ann1mbkdgsk";
     name = "${name}.deb";
   };
 

From d950e8c084f050f971958e3aeb2d69adba520875 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Fri, 17 Feb 2017 20:38:17 +0100
Subject: [PATCH 0608/3449] fping: 3.15 -> 3.16

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

diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix
index 11e019dfec3b..e5764fa421d5 100644
--- a/pkgs/tools/networking/fping/default.nix
+++ b/pkgs/tools/networking/fping/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "fping-3.15";
+  name = "fping-3.16";
 
   src = fetchurl {
     url = "http://www.fping.org/dist/${name}.tar.gz";
-    sha256 = "072jhm9wpz1bvwnwgvz24ijw0xwwnn3z3zan4mgr5s5y6ml8z54n";
+    sha256 = "2f753094e4df3cdb1d99be1687c0fb7d2f14c0d526ebf03158c8c5519bc78f54";
   };
 
   configureFlags = [ "--enable-ipv6" "--enable-ipv4" ];

From 34c12b1c73c36ad5c1bcc19b1343848e8d1ec09a Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Fri, 17 Feb 2017 23:45:52 +0100
Subject: [PATCH 0609/3449] e2fsprogs: 1.43.3 -> 1.43.4

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

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 8ff100394494..c44c92efae00 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.43.3";
+  name = "e2fsprogs-1.43.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "09wrn60rlqdgjkmm09yv32zxdjba2pd4ya3704bhywyln2xz33nf";
+    sha256 = "a648a90a513f1b25113c7f981af978b8a19f832b3a32bd10707af3ff682ba66d";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];

From 19a302f6f6fef39b466e66a5fabf99e62363bf05 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@tjaldur.nl>
Date: Fri, 17 Feb 2017 16:28:54 +0100
Subject: [PATCH 0610/3449] scummvm: 1.8.0 -> 1.9.0

Use direct download instead of sourceforge mirror which no longer
works.
---
 pkgs/games/scummvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix
index 603e0b0e9e4e..29ba75f9aa24 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/games/scummvm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib, mesa }:
 
 stdenv.mkDerivation rec {
-  name = "scummvm-1.8.0";
+  name = "scummvm-1.9.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/scummvm/${name}.tar.bz2";
-    sha256 = "0f3zgvz886lk9ps0v333aq74vx6grlx68hg14gfaxcvj55g73v01";
+    url = "http://scummvm.org/frs/scummvm/1.9.0/scummvm-1.9.0.tar.bz2";
+    sha256 = "813d7d8a76e3d05b45001d37451368711dadc32899ecf907df1cc7abfb1754d2";
   };
   
   buildInputs = [ SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib mesa ];

From e2c78910d1134ee2c971a99d1f577b5d915711b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 10 Feb 2017 18:36:36 +0100
Subject: [PATCH 0611/3449] dhparams module: initialize

---
 nixos/modules/module-list.nix       |  1 +
 nixos/modules/security/dhparams.nix | 90 +++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 nixos/modules/security/dhparams.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bd427bc679c7..1a98097ce2b1 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -102,6 +102,7 @@
   ./security/audit.nix
   ./security/ca.nix
   ./security/chromium-suid-sandbox.nix
+  ./security/dhparams.nix
   ./security/duosec.nix
   ./security/grsecurity.nix
   ./security/hidepid.nix
diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
new file mode 100644
index 000000000000..c16cd2fafef4
--- /dev/null
+++ b/nixos/modules/security/dhparams.nix
@@ -0,0 +1,90 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.security.dhparams;
+in
+{
+  options = {
+    security.dhparams = {
+      params = mkOption {
+        description =
+          ''
+            Diffie-Hellman parameters to generate.
+
+            The value is the size (in bits) of the DH params to generate. The
+            generated DH params path can be found in
+            <filename><replaceable>security.dhparams.path</replaceable>/<replaceable>name</replaceable>.pem</filename>.
+
+            Note: The name of the DH params is taken as being the name of the
+            service it serves: the params will be generated before the said
+            service is started.
+          '';
+        type = with types; attrsOf int;
+        default = {};
+        example = { nginx = 3072; };
+      };
+
+      path = mkOption {
+        description =
+          ''
+            Path to the directory in which Diffie-Hellman parameters will be
+            stored.
+          '';
+        type = types.str;
+        default = "/var/lib/dhparams";
+      };
+    };
+  };
+
+  config.systemd.services = {
+    dhparams-init = {
+      description = "Cleanup old Diffie-Hellman parameters";
+      wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set
+      serviceConfig.Type = "oneshot";
+      script =
+        # Create directory
+        ''
+          if [ ! -d ${cfg.path} ]; then
+            mkdir -p ${cfg.path}
+          fi
+        '' +
+        # Remove old dhparams
+        ''
+          for file in ${cfg.path}/*; do
+            if [ ! -f "$file" ]; then
+              continue
+            fi
+        '' + concatStrings (mapAttrsToList (name: value:
+        ''
+            if [ "$file" == "${cfg.path}/${name}.pem" ] && \
+                ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then
+              continue
+            fi
+        ''
+        ) cfg.params) +
+        ''
+            rm $file
+          done
+
+          # TODO: Ideally this would be removing the *former* cfg.path, though this
+          # does not seem really important
+          rmdir -p --ignore-fail-on-non-empty ${cfg.path}
+        '';
+    };
+  } //
+    mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" {
+      description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
+      after = [ "dhparams-init.service" ];
+      before = [ "${name}.service" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig.Type = "oneshot";
+      script =
+        ''
+          mkdir -p ${cfg.path}
+          if [ ! -f ${cfg.path}/${name}.pem ]; then
+            ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value}
+          fi
+        '';
+    }) cfg.params;
+}

From 9cee962c43329c2e458ba91ecebb702c4492eb92 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 17 Feb 2017 22:51:02 -0200
Subject: [PATCH 0612/3449] youtube-dl: 2017.02.04.1 -> 2017.02.17

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 307b1a1592a5..175281d2a48f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, buildPythonApplication, makeWrapper, zip, ffmpeg, rtmpdump, pandoc
-, atomicparsley
+{ stdenv, fetchurl, buildPythonApplication
+, zip, ffmpeg, rtmpdump, atomicparsley, pandoc
 # Pandoc is required to build the package's man page. Release tarballs contain a
 # formatted man page already, though, it will still be installed. We keep the
 # manpage argument in place in case someone wants to use this derivation to
@@ -8,29 +8,31 @@
 , generateManPage ? false
 , ffmpegSupport ? true
 , rtmpSupport ? true
-}:
+, makeWrapper }:
 
 with stdenv.lib;
-
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.02.16";
+  version = "2017.02.17";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "21a5014f25d8ad2882999dd8cbf8cc2fd13c42116f5fe7b4781c982421ea59b0";
+    sha256 = "06k0g3s0c27f0kwhvm2gpk01q0q0cbhqh09zvh19svl1zc2ky72b";
   };
 
-  buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;
+  buildInputs = [ zip makeWrapper ] ++ optional generateManPage pandoc;
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
   # rtmpdump is required to download files over RTMP
   # atomicparsley for embedding thumbnails
   postInstall = let
-    packagesthatwillbeusedbelow = [ atomicparsley ] ++ optional ffmpegSupport ffmpeg ++ optional rtmpSupport rtmpdump;
+    packagesToBinPath =
+    [ atomicparsley ]
+    ++ optional ffmpegSupport ffmpeg
+    ++ optional rtmpSupport rtmpdump;
   in ''
-    wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesthatwillbeusedbelow}"
+    wrapProgram $out/bin/youtube-dl --prefix PATH : "${makeBinPath packagesToBinPath}"
   '';
 
   # Requires network

From 38771badd3bd4e6a46495577506a3eacb299726c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 16 Feb 2017 21:02:13 -0500
Subject: [PATCH 0613/3449] nixpkgs: allow packages to be marked insecure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If a package's meta has `knownVulnerabilities`, like so:

    stdenv.mkDerivation {
      name = "foobar-1.2.3";

      ...

      meta.knownVulnerabilities = [
        "CVE-0000-00000: remote code execution"
        "CVE-0000-00001: local privilege escalation"
      ];
    }

and a user attempts to install the package, they will be greeted with
a warning indicating that maybe they don't want to install it:

    error: Package ‘foobar-1.2.3’ in ‘...default.nix:20’ is marked as insecure, refusing to evaluate.

    Known issues:

     - CVE-0000-00000: remote code execution
     - CVE-0000-00001: local privilege escalation

    You can install it anyway by whitelisting this package, using the
    following methods:

    a) for `nixos-rebuild` you can add ‘foobar-1.2.3’ to
       `nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
       like so:

         {
           nixpkgs.config.permittedInsecurePackages = [
             "foobar-1.2.3"
           ];
         }

    b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
    ‘foobar-1.2.3’ to `permittedInsecurePackages` in
    ~/.config/nixpkgs/config.nix, like so:

         {
           permittedInsecurePackages = [
             "foobar-1.2.3"
           ];
         }

Adding either of these configurations will permit this specific
version to be installed. A third option also exists:

  NIXPKGS_ALLOW_INSECURE=1 nix-build ...

though I specifically avoided having a global file-based toggle to
disable this check. This way, users don't disable it once in order to
get a single package, and then don't realize future packages are
insecure.
---
 pkgs/stdenv/generic/default.nix | 72 +++++++++++++++++++++++++++------
 1 file changed, 60 insertions(+), 12 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 34ba2fd8dd9c..cb94db48f4bd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -75,6 +75,14 @@ let
     isUnfree (lib.lists.toList attrs.meta.license) &&
     !allowUnfreePredicate attrs;
 
+  allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []);
+  allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x;
+
+  hasAllowedInsecure = attrs:
+    (attrs.meta.knownVulnerabilities or []) == [] ||
+    allowInsecurePredicate attrs ||
+    builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1";
+
   showLicense = license: license.shortName or "unknown";
 
   defaultNativeBuildInputs = extraBuildInputs ++
@@ -137,24 +145,62 @@ let
           builtins.unsafeGetAttrPos "name" attrs;
       pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»";
 
-      throwEvalHelp = { reason, errormsg }:
-        # uppercase the first character of string s
-        let up = s: with lib;
-          (toUpper (substring 0 1 s)) + (substring 1 (stringLength s) s);
-        in
-        assert builtins.elem reason ["unfree" "broken" "blacklisted"];
-
-        throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate."
-        + (lib.strings.optionalString (reason != "blacklisted") ''
 
+      remediation = {
+        unfree = remediate_whitelist "Unfree";
+        broken = remediate_whitelist "Broken";
+        blacklisted = x: "";
+        insecure = remediate_insecure;
+      };
+      remediate_whitelist = allow_attr: attrs:
+        ''
           a) For `nixos-rebuild` you can set
-            { nixpkgs.config.allow${up reason} = true; }
+            { nixpkgs.config.allow${allow_attr} = true; }
           in configuration.nix to override this.
 
           b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
-            { allow${up reason} = true; }
+            { allow${allow_attr} = true; }
           to ~/.config/nixpkgs/config.nix.
-        ''));
+        '';
+
+      remediate_insecure = attrs:
+        ''
+
+          Known issues:
+
+        '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + ''
+
+          You can install it anyway by whitelisting this package, using the
+          following methods:
+
+          a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to
+             `nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
+             like so:
+
+               {
+                 nixpkgs.config.permittedInsecurePackages = [
+                   "${attrs.name or "«name-missing»"}"
+                 ];
+               }
+
+          b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
+          ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in
+          ~/.config/nixpkgs/config.nix, like so:
+
+               {
+                 permittedInsecurePackages = [
+                   "${attrs.name or "«name-missing»"}"
+                 ];
+               }
+
+        '';
+
+
+      throwEvalHelp = { reason , errormsg ? "" }:
+        throw (''
+          Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate.
+
+          '' + ((builtins.getAttr reason remediation) attrs));
 
       # Check if a derivation is valid, that is whether it passes checks for
       # e.g brokenness or license.
@@ -171,6 +217,8 @@ let
           { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
           { 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 { valid = true; };
 
       outputs' =

From d26ac6afa4cd264b6c8613a28ff09ca87eff45ee Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Sat, 18 Feb 2017 04:07:55 +0100
Subject: [PATCH 0614/3449] haskellPackages.xmonad-extras: jailbreak to allow
 xmonad 0.13 (#22927)

Fixes https://github.com/NixOS/nixpkgs/issues/22919
---
 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 ff6dbfa1b092..0a0c7ee0644b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -862,4 +862,7 @@ self: super: {
 
   # https://github.com/Gabriel439/Haskell-DirStream-Library/issues/8
   dirstream = doJailbreak super.dirstream;
+
+  # https://github.com/xmonad/xmonad-extras/issues/3
+  xmonad-extras = doJailbreak super.xmonad-extras;
 }

From f308722a0002c83a1ab8a2b7bfd7aac312761e01 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 17 Feb 2017 22:17:34 -0500
Subject: [PATCH 0615/3449] netpbm: 10.70.00 -> 10.77.02 for numerous fixes

more: https://sourceforge.net/p/netpbm/code/2883/tree/advanced/doc/HISTORY
---
 pkgs/tools/graphics/netpbm/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index 7fafc5218e9e..1f1dd3632335 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -1,13 +1,16 @@
-{ lib, stdenv, fetchurl, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2
+{ lib, stdenv, fetchsvn, pkgconfig, libjpeg, libpng, flex, zlib, perl, libxml2
 , makeWrapper, libtiff
 , enableX11 ? false, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "netpbm-10.70.00";
+  # Determine version and revision from:
+  # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced
+  name = "netpbm-10.77.02";
 
-  src = fetchurl {
-    url = "mirror://gentoo/distfiles/${name}.tar.xz";
-    sha256 = "14vxmzbwsy4rzrqjnzr4cvz1s0amacq69faps3v1j1kr05lcns0j";
+  src = fetchsvn {
+    url = "svn://svn.code.sf.net/p/netpbm/code/advanced";
+    rev = 2883;
+    sha256 = "1lxa5gasmqrwgihkk8ij7vb9kgdw3d5mp25kydkrf6x4wibg1w5f";
   };
 
   postPatch = /* CVE-2005-2471, from Arch */ ''

From 6fc38401a28e4638bd840743ae29a2806b68936d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 17 Feb 2017 22:24:33 -0500
Subject: [PATCH 0616/3449] tomcat6: drop, no longer supported.

---
 pkgs/servers/http/tomcat/default.nix            | 7 -------
 pkgs/servers/http/tomcat/jdbc/mysql/default.nix | 4 ++--
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 909b26f162b0..ac507794a91e 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -30,13 +30,6 @@ let
   });
 
 in {
-
-  tomcat6 = common {
-    versionMajor = "6";
-    versionMinor = "0.48";
-    sha256 = "1w4jf28g8p25fmijixw6b02iqlagy2rvr57y3n90hvz341kb0bbc";
-  };
-
   tomcat7 = common {
     versionMajor = "7";
     versionMinor = "0.73";
diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
index 3562ea1e129d..d070a9f17404 100644
--- a/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
+++ b/pkgs/servers/http/tomcat/jdbc/mysql/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, tomcat6, mysql_jdbc }:
+{ stdenv, mysql_jdbc }:
 
 stdenv.mkDerivation {
   name = "tomcat-mysql-jdbc";
   builder = ./builder.sh;
   buildInputs = [ mysql_jdbc ];
-  
+
   inherit mysql_jdbc;
 
   meta = {

From c4bbadf2d553088d9fe5a72f543ced6696c72ada Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 17 Feb 2017 22:25:52 -0500
Subject: [PATCH 0617/3449] tomcat6: more thoroughly remove tomcat6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11b76e853059..42fa58a73440 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10777,7 +10777,6 @@ with pkgs;
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
 
   inherit (callPackages ../servers/http/tomcat { })
-    tomcat6
     tomcat7
     tomcat8
     tomcat85

From 7b17c5bc6e003d7e6dbfa633054e83a557486ff9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 17 Feb 2017 22:28:01 -0500
Subject: [PATCH 0618/3449] tomcat7: 7.0.73 -> 7.0.75

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

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index ac507794a91e..e1041a642a5c 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -32,8 +32,8 @@ let
 in {
   tomcat7 = common {
     versionMajor = "7";
-    versionMinor = "0.73";
-    sha256 = "11gaiy56q7pik06sdypr80sl3g6k41s171wqqwlhxffmsxm4v08f";
+    versionMinor = "0.75";
+    sha256 = "0w5adsy4792qkf3ws46f539lrdbpz7lghy79s6b04c9yqaxjz6ni";
   };
 
   tomcat8 = common {

From f246ea0de2b914dcc75d14db53b5de2da0b5b217 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 17 Feb 2017 22:28:34 -0500
Subject: [PATCH 0619/3449] tomcat8: 8.0.39 -> 8.0.41

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

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index e1041a642a5c..47bd377247af 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -38,8 +38,8 @@ in {
 
   tomcat8 = common {
     versionMajor = "8";
-    versionMinor = "0.39";
-    sha256 = "16hyypdawby66qa8y66sfprcf78wjy319a0gsi4jgfqfywcsm4s0";
+    versionMinor = "0.41";
+    sha256 = "1mvnf6m29y3p40vvi9mgghrddlmgwcrcvfwrf9vbama78fsh8wm5";
   };
 
   tomcat85 = common {

From ae3820bad9594c8d3f522026111a3c87f1c4a21f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 17 Feb 2017 22:29:24 -0500
Subject: [PATCH 0620/3449] tomcat85: 8.5.9 -> 8.5.11

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

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 47bd377247af..46de5db5b694 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -44,8 +44,8 @@ in {
 
   tomcat85 = common {
     versionMajor = "8";
-    versionMinor = "5.9";
-    sha256 = "1dy8bf18jwyi6p7ayb96gbhd4iyfq4d37s3qxnlll8vklfx388np";
+    versionMinor = "5.11";
+    sha256 = "0i1xvgpj4l4agc8vxrnfm127w4mc33pyl8963pwpklqpdk4shcjn";
   };
 
   tomcatUnstable = common {

From 33bf23bbcaabdbba5227a8dbecfca02f74cea90d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 17 Feb 2017 22:30:41 -0500
Subject: [PATCH 0621/3449] tomcatUnstable: 9.0.0.M15 -> 9.0.0.M17

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

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 46de5db5b694..12d6f8996ad4 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -50,7 +50,7 @@ in {
 
   tomcatUnstable = common {
     versionMajor = "9";
-    versionMinor = "0.0.M15";
-    sha256 = "1spbq5vh2dplp83ki3fbbwl0klxq36s4rwkpcjdnwjxjymg9k432";
+    versionMinor = "0.0.M17";
+    sha256 = "1ilvka2062m7412bj2fsdwvfxbrjyj9qxcia40hhv22prvkxw3cg";
   };
 }

From 9097b9e34a80bfa43bb6af5964f88fc65ac7ebf9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 18 Feb 2017 11:35:02 +0800
Subject: [PATCH 0622/3449] usb-modeswitch: 2.2.1 -> 2.5.0

We were carrying v2.2.1 and not v2.3.0 due to the update only touching
the version and not the sha256 sum.
---
 .../tools/misc/usb-modeswitch/default.nix     | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index 893df94d2379..8a1ce7c08868 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -1,31 +1,32 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
-let
-   version = "2.3.0";
-in
-
 stdenv.mkDerivation rec {
   name = "usb-modeswitch-${version}";
+  version = "2.5.0";
 
   src = fetchurl {
-    url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
-    sha256 = "1jqih1g0y78w03rchpw7fjvzwjfakak61qjp7hbr1m5nnsh2dn9p";
+    url    = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+    sha256 = "0cvnd16n2sp3w46fy507nl29q39jxxdk5qqbvk1rxaa91llbxh1i";
   };
 
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX=$(out)"
+  ];
+
   # make clean: we always build from source. It should be necessary on x86_64 only
   preConfigure = ''
     find -type f | xargs sed 's@/bin/rm@rm@g' -i
     make clean
-    mkdir -p $out/{etc,lib/udev,share/man/man1}
-    makeFlags="DESTDIR=$out PREFIX=$out"
   '';
 
-  buildInputs = [ pkgconfig libusb1 ];
+  buildInputs = [ libusb1 ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A mode switching tool for controlling 'multi-mode' USB devices";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ marcweber peterhoeg ];
+    platforms = platforms.linux;
   };
 }

From cad335eb0110ef9ff708d12da34d053b5fbddcb0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 18 Feb 2017 11:35:25 +0800
Subject: [PATCH 0623/3449] usb-modeswitch-data: 20160112 -> 20170205

Plus some minor cleanups.
---
 .../tools/misc/usb-modeswitch/data.nix        | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/misc/usb-modeswitch/data.nix b/pkgs/development/tools/misc/usb-modeswitch/data.nix
index f543d3a475c1..a45db5fbcaf1 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/data.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/data.nix
@@ -1,29 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, libusb1, usb-modeswitch }:
-
-let
-   version = "20160112";
-in
+{ stdenv, fetchurl, pkgconfig, libusb1, tcl, usb-modeswitch }:
 
 stdenv.mkDerivation rec {
   name = "usb-modeswitch-data-${version}";
+  version = "20170205";
 
   src = fetchurl {
-     url = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
-     sha256 = "19yzqv0592b9mwgdi7apzw881q70ajyx5d56zr1z5ldi915a8yfn";
-   };
+    url    = "http://www.draisberghof.de/usb_modeswitch/${name}.tar.bz2";
+    sha256 = "1l9q4xk02zd0l50bqhyk906wbcs26ji7259q0f7qv3cj52fzvp72";
+  };
+
+  inherit (usb-modeswitch) makeFlags;
 
-  # make clean: we always build from source. It should be necessary on x86_64 only
   prePatch = ''
     sed -i 's@usb_modeswitch@${usb-modeswitch}/bin/usb_modeswitch@g' 40-usb_modeswitch.rules
-    sed -i "1 i\DESTDIR=$out" Makefile
   '';
 
-  buildInputs = [ pkgconfig libusb1 usb-modeswitch ];
+  buildInputs = [ libusb1 usb-modeswitch ];
+  # we add tcl here so we can patch in support for new devices by dropping config into
+  # the usb_modeswitch.d directory
+  nativeBuildInputs = [ pkgconfig tcl ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Device database and the rules file for 'multi-mode' USB devices";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    inherit (usb-modeswitch.meta) license maintainers platforms;
   };
 }

From 714eabc5af342f81fc36481486b4b388ebefb8c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Feb 2017 08:23:07 +0100
Subject: [PATCH 0624/3449] guile rev-deps: fix build by adding pkgconfig

Without it packages fail to find the headers, after guile has split
them into a separate output in 218713a.
---
 pkgs/development/guile-modules/guile-ncurses/default.nix | 3 ++-
 pkgs/development/guile-modules/guile-sdl/default.nix     | 4 ++--
 pkgs/development/libraries/libmatheval/default.nix       | 4 ++--
 pkgs/tools/X11/xbindkeys/default.nix                     | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index 291b410ef93c..bd6d90751308 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, guile, ncurses, libffi }:
+{ fetchurl, stdenv, pkgconfig, guile, ncurses, libffi }:
 
 stdenv.mkDerivation rec {
   name = "guile-ncurses-1.7";
@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ guile ncurses libffi ];
 
   preConfigure =
diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix
index 94f3418b0316..e2bfe485c5b8 100644
--- a/pkgs/development/guile-modules/guile-sdl/default.nix
+++ b/pkgs/development/guile-modules/guile-sdl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, guile, buildEnv
+{ stdenv, fetchurl, pkgconfig, guile, buildEnv
 , SDL, SDL_image, SDL_ttf, SDL_mixer
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "126n4rd0ydh6i2s11ari5k85iivradlf12zq13b34shf9k1wn5am";
   };
 
-  nativeBuildInputs = [ guile ];
+  nativeBuildInputs = [ pkgconfig guile ];
 
   buildInputs = [
     SDL.dev SDL_image SDL_ttf SDL_mixer
diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix
index 7336e7d757a1..467d707adee9 100644
--- a/pkgs/development/libraries/libmatheval/default.nix
+++ b/pkgs/development/libraries/libmatheval/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, guile, autoconf, flex, fetchpatch }:
+{ stdenv, fetchurl, pkgconfig, guile, autoconf, flex, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "1.1.11";
   name = "libmatheval-${version}";
 
-  nativeBuildInputs = [ autoconf flex ];
+  nativeBuildInputs = [ pkgconfig autoconf flex ];
   buildInputs = [ guile ];
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
index 0d63c190b054..1c23593bd141 100644
--- a/pkgs/tools/X11/xbindkeys/default.nix
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libX11, guile }:
+{ stdenv, fetchurl, pkgconfig, libX11, guile }:
 
 let version = "1.8.6"; in
 stdenv.mkDerivation {
@@ -8,6 +8,7 @@ stdenv.mkDerivation {
     sha256 = "060df6d8y727jp1inp7blp44cs8a7jig7vcm8ndsn6gw36z1h3bc";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libX11 guile ];
 
   meta = {

From 70cadb6cbd09f1d62d19b3a0381e00449eac53f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Feb 2017 09:04:03 +0100
Subject: [PATCH 0625/3449] krita: 3.1.1 -> 3.1.2.1

This fixes build after KDE updates in f228ea521 #22698.
/cc maintainer @abbradar.  I only tested starting it up.
---
 pkgs/applications/graphics/krita/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

From 43dbd916efa828ccd5ec7f77ef38b16044a3e049 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 18 Feb 2017 16:57:13 +0800
Subject: [PATCH 0626/3449] calibre: 2.76.0 -> 2.79.1

---
 pkgs/applications/misc/calibre/default.nix    |  4 +--
 .../calibre/dont_build_unrar_plugin.patch     | 27 +++++++++----------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 5c05d1e17873..16ac38b3263f 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.76.0";
+  version = "2.79.1";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8";
+    sha256 = "0slk3cili50a8kwwsk6syqqrcz0yx8yjvhm8gyggn2k2kpqjax15";
   };
 
   patches = [
diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
index 522b2e6202c0..71cc688f7da0 100644
--- a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
+++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
@@ -1,13 +1,8 @@
-Author: Dmitry Shachnev <mitya57@gmail.com>
-Description: do not build unrar extension as we strip unrar from the tarball
-Forwarded: not-needed
-Last-Update: 2013-04-04
-
-Index: calibre/setup/extensions.json
-===================================================================
---- calibre.orig/setup/extensions.json
-+++ calibre/setup/extensions.json
-@@ -211,14 +211,5 @@
+diff --git a/setup/extensions.json b/setup/extensions.json
+index 1f6d1fb..1273904 100644
+--- a/setup/extensions.json
++++ b/setup/extensions.json
+@@ -211,16 +211,5 @@
          "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
          "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
          "libraries": "mtp"
@@ -18,15 +13,17 @@ Index: calibre/setup/extensions.json
 -        "inc_dirs": "unrar",
 -        "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
 -        "windows_defines": "SILENT RARDLL UNRAR",
+-        "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE",
+-        "haiku_libraries": "bsd",
 -        "optimize_level": 2,
 -        "windows_libraries": "User32 Advapi32 kernel32 Shell32"
      }
  ]
-Index: calibre/src/calibre/ebooks/metadata/archive.py
-===================================================================
---- calibre.orig/src/calibre/ebooks/metadata/archive.py	2014-02-02 10:42:14.510954007 +0100
-+++ calibre/src/calibre/ebooks/metadata/archive.py	2014-02-02 10:42:14.502954007 +0100
-@@ -42,7 +42,7 @@
+diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
+index 938ab24..1e095f8 100644
+--- a/src/calibre/ebooks/metadata/archive.py
++++ b/src/calibre/ebooks/metadata/archive.py
+@@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin):
      description = _('Extract common e-book formats from archives '
          '(zip/rar) files. Also try to autodetect if they are actually '
          'cbz/cbr files.')

From ae91514b269afc8053d55d8ba8cb1515c6b6683c Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Feb 2017 10:00:04 +0000
Subject: [PATCH 0627/3449] gapi-ocaml: 0.2.10 -> 0.3.1

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

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 224f3537a2e0..8ead12427fdb 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
 
 stdenv.mkDerivation rec {
-  name = "gapi-ocaml-0.2.10";
+  name = "gapi-ocaml-0.3.1";
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz";
-    sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl";
+    url = "https://forge.ocamlcore.org/frs/download.php/1665/${name}.tar.gz";
+    sha256 = "1fn563k9mpqp61909l5bzddnkyn04bk106vrcr7qiim1d2i6cf8i";
   };
   buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];

From 1f9d33b9e4e704b0c04adb8566b01375a873bf5c Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Feb 2017 10:01:36 +0000
Subject: [PATCH 0628/3449] google-drive-ocamlfuse: 0.5.22 -> 0.6.17

---
 .../networking/google-drive-ocamlfuse/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index 0a938766e930..64519ce17d5b 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -2,12 +2,12 @@
 , ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }:
 
 stdenv.mkDerivation rec {
-  name = "google-drive-ocamlfuse-${version}";
-  version = "0.5.22";
+  name    = "google-drive-ocamlfuse-${version}";
+  version = "0.6.17";
 
   src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1587/${name}.tar.gz";
-    sha256 = "1hjm6hyva9sl6lddb0372wsy7f76105iaxh976yyzfn3b4ran6ab";
+    url = "https://forge.ocamlcore.org/frs/download.php/1674/${name}.tar.gz";
+    sha256 = "1ldja7080pnjaibrbdvfqwakp4mac8yw1lkb95f7lgldmy96lxas";
   };
 
   buildInputs = [ zlib ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl];

From 0c488ed8f0d1af52c219f0632d4752d3d9ebb9d9 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Feb 2017 10:10:50 +0000
Subject: [PATCH 0629/3449] keepass: 2.34 -> 2.35

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

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 5eaad6514e1f..57f6cfc4c4b4 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -8,11 +8,11 @@
 # plugin derivations in the Nix store and nowhere else.
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.34";
+  version = "2.35";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa";
+    sha256 = "1pv3x1lr2kymjpm6z26fqx997jivzy0diqsysq4diygj38wdkajz";
   };
 
   sourceRoot = ".";

From db9509767434c29bd83adf455c4d7a98cb1ca8b0 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Feb 2017 10:39:01 +0000
Subject: [PATCH 0630/3449] syscall_limiter: 20160105 -> 20170123

---
 .../linux/syscall_limiter/default.nix         | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix
index 658137a569ef..a5c69e1d876e 100644
--- a/pkgs/os-specific/linux/syscall_limiter/default.nix
+++ b/pkgs/os-specific/linux/syscall_limiter/default.nix
@@ -6,16 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "syscall_limiter-${version}";
-  version = "${date}-${stdenv.lib.strings.substring 0 7 rev}";
-  date = "20160105";
-  rev = "b02c0316a2aaff496f712f1467e20337006655cc";
+  name    = "syscall_limiter-${version}";
+  version = "20170123";
 
   src = fetchFromGitHub {
-    owner = "vi";
-    repo = "syscall_limiter";
-    inherit rev;
-    sha256 = "14q5k5c8hk7gnxhgwaamwbibasb3pwj6jnqsxa1bdp16n6jdajxd";
+    owner  = "vi";
+    repo   = "syscall_limiter";
+    rev    = "481c8c883f2e1260ebc83b352b63bf61a930a341";
+    sha256 = "0z5arj1kq1xczgrbw1b8m9kicbv3vs9bd32wvgfr4r6ndingsp5m";
   };
 
   configurePhase = "";
@@ -35,9 +33,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Start Linux programs with only selected syscalls enabled";
-    homepage = https://github.com/vi/syscall_limiter;
-    license = licenses.mit;
+    homepage    = https://github.com/vi/syscall_limiter;
+    license     = licenses.mit;
     maintainers = with maintainers; [ obadz ];
-    platforms = platforms.linux;
+    platforms   = platforms.linux;
   };
 }

From 92f66c252033c1a4afd4e78bc00ef8d000819cf4 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 18 Feb 2017 12:12:22 +0100
Subject: [PATCH 0631/3449] khard: 0.11.3 -> 0.11.4

---
 pkgs/applications/misc/khard/default.nix | 30 ++----------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index da6dece237ed..3a87e854dc1f 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,39 +1,13 @@
 { stdenv, fetchurl, fetchFromGitHub, glibcLocales, python3Packages }:
 
-let
-  vobject = python3Packages.buildPythonPackage rec {
-    version = "0.9.2";
-    name = "vobject-${version}";
-
-    src = fetchFromGitHub {
-      owner = "eventable";
-      repo = "vobject";
-      sha256 = "0zj0wplj8pry98x3g551wdhh12ric7rl6rsd6li23lzdxik82s3g";
-      rev = version;
-    };
-
-    disabled = python3Packages.isPyPy;
-
-    propagatedBuildInputs = with python3Packages; [ dateutil ];
-
-    checkPhase = "${python3Packages.python.interpreter} tests.py";
-
-    meta = with stdenv.lib; {
-      description = "Module for reading vCard and vCalendar files";
-      homepage = http://eventable.github.io/vobject/;
-      license = licenses.asl20;
-      maintainers = [ maintainers.matthiasbeyer ];
-    };
-  };
-in
 python3Packages.buildPythonApplication rec {
-  version = "0.11.3";
+  version = "0.11.4";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "0brnwg7f1qnz83q5d6bl2260wykgjhhrpcxxhr2r9gj66q5hdd69";
+    sha256 = "1hngg3z5cdjny7wdf2mf9wv35ffx7ivpq6mx7kgqf40fr5905l0r";
   };
 
   # setup.py reads the UTF-8 encoded readme.

From fb13588a8e81ea83083bde977878bb04c97b0ad3 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Sat, 18 Feb 2017 12:23:00 +0100
Subject: [PATCH 0632/3449] gnome3.gnome_shell: Don't propagate python
 dependency (#21851)

---
 .../gnome-3/3.22/core/gnome-shell/default.nix        | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
index dccdb8a5a5f8..8f77b7e5e3b1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
@@ -7,7 +7,9 @@
 
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
-stdenv.mkDerivation rec {
+let
+  pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+in stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   # Needed to find /etc/NetworkManager/VPN
@@ -23,9 +25,8 @@ stdenv.mkDerivation rec {
       defaultIconTheme sqlite gnome3.gnome-bluetooth
       libgweather # not declared at build time, but typelib is needed at runtime
       gnome3.gnome-clocks # schemas needed
-      at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
-  propagatedBuildInputs = [ python3Packages.pygobject3 python3Packages.python gobjectIntrospection ];
+      at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
+      pythonEnv gobjectIntrospection ];
 
   installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
 
@@ -42,9 +43,6 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
       --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
-    wrapProgram "$out/bin/gnome-shell-extension-tool" \
-      --prefix PYTHONPATH : "${python3Packages.pygobject3}/${python3Packages.python.sitePackages}:$PYTHONPATH"
-
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
 

From 69ea45da63c1e58a9132206df989cafaaa21377e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Feb 2017 12:28:07 +0100
Subject: [PATCH 0633/3449] lxqt.screengrab: fixup build after KDE updates

/cc #22698 and maintainer @romildo.
---
 pkgs/desktops/lxqt/optional/screengrab/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index 99a372553a13..2ef1c7532a5a 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DSG_USE_SYSTEM_QXT=ON" "-DCMAKE_INSTALL_LIBDIR=lib" ];
 
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
   meta = with stdenv.lib; {
     description = "Crossplatform tool for fast making screenshots";
     homepage = https://github.com/lxde/screengrab;

From c83dfedaa26d57b7c5e5a22d0375d9b8d00d0fbe Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Sat, 18 Feb 2017 12:24:18 +0100
Subject: [PATCH 0634/3449] gnome3.gnome-tweak-tool: Don't propagate python
 dependency (#21851)

---
 .../3.22/misc/gnome-tweak-tool/default.nix     | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
index f75cdd0e83e2..5a1baa5e3307 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
@@ -4,7 +4,7 @@
 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
 let
-  python = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+  pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
 in stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
@@ -12,15 +12,6 @@ in stdenv.mkDerivation rec {
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
-  # Make sure that Python 2 is first in $PATH because gnome3.gnome_shell
-  # propagates python3Packages.python.  If we do not do this, autoconf will use
-  # Python 3 instead which gnome-tweak-tool does not support at this time.  See:
-  # https://github.com/NixOS/nixpkgs/issues/21851
-  # https://github.com/NixOS/nixpkgs/pull/22370
-  preConfigure = ''
-    PATH="${python}/bin:$PATH"
-  '';
-
   makeFlags = [ "DESTDIR=/" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
@@ -28,11 +19,10 @@ in stdenv.mkDerivation rec {
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libnotify gnome3.gnome_shell
                   libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop wrapGAppsHook ];
+                  gnome3.gnome_desktop wrapGAppsHook
+                  python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
 
-  propagatedBuildInputs = [ python gobjectIntrospection ];
-
-  PYTHONPATH = "$out/${python.python.sitePackages}";
+  PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 

From 9d82b3ebebb5752c2ba437e64834692af19f9689 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 28 Jan 2017 20:38:28 -0200
Subject: [PATCH 0635/3449] Intercal: a little fix

Intercal doesn't build with the most recent version of flex -
it complains with an "undefined reference to `yywrap'"
in the link phase.

So, we need to downgrade flex.
---
 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 1b178665b816..c6a7f0d0cdc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5143,7 +5143,9 @@ with pkgs;
 
   ikarus = callPackage ../development/compilers/ikarus { };
 
-  intercal = callPackage ../development/compilers/intercal { };
+  intercal = callPackage ../development/compilers/intercal {
+    flex = flex_2_6_1; # Works with 2.5.35 too, but not 2.6.3
+  };
 
   irony-server = callPackage ../development/tools/irony-server/default.nix {
     # The repository of irony to use -- must match the version of the employed emacs

From 0db10d76d2a28f57ececd36058f13091b88728db Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Sat, 18 Feb 2017 16:31:02 +0530
Subject: [PATCH 0636/3449] kafka: 0.8.2.1 -> 0.8.2.2

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

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 4041eae64683..2d3a74e18aa0 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -3,9 +3,9 @@
 
 let
   versionMap = {
-    "0.8" = { kafkaVersion = "0.8.2.1";
+    "0.8" = { kafkaVersion = "0.8.2.2";
               scalaVersion = "2.10";
-              sha256 = "1klri23fjxbzv7rmi05vcqqfpy7dzi1spn2084y1dxsi1ypfkvc9";
+              sha256 = "1azccf1k0nr8y1sfpjgqf9swyp87ypvgva68ci4kczwcx1z9d89v";
             };
     "0.9" = { kafkaVersion = "0.9.0.1";
               scalaVersion = "2.11";

From 47c214cc2ac2bf83dac05b96f6807610a6743fe4 Mon Sep 17 00:00:00 2001
From: Brice Waegeneire <brice.wge@gmail.com>
Date: Sat, 18 Feb 2017 00:40:54 +0100
Subject: [PATCH 0637/3449] fix comments about nixos-hardware-scan

It has been renamed to nixos-generate-config in 3ed4173
---
 nixos/modules/installer/scan/detected.nix     | 2 +-
 nixos/modules/installer/scan/not-detected.nix | 2 +-
 nixos/modules/system/boot/kernel.nix          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix
index f350cd986afa..e72c78532943 100644
--- a/nixos/modules/installer/scan/detected.nix
+++ b/nixos/modules/installer/scan/detected.nix
@@ -1,4 +1,4 @@
-# List all devices which are detected by nixos-hardware-scan.
+# List all devices which are detected by nixos-generate-config.
 # Common devices are enabled by default.
 { config, lib, pkgs, ... }:
 
diff --git a/nixos/modules/installer/scan/not-detected.nix b/nixos/modules/installer/scan/not-detected.nix
index b30c569ed2a7..e1a3052ba957 100644
--- a/nixos/modules/installer/scan/not-detected.nix
+++ b/nixos/modules/installer/scan/not-detected.nix
@@ -1,4 +1,4 @@
-# List all devices which are _not_ detected by nixos-hardware-scan.
+# List all devices which are _not_ detected by nixos-generate-config.
 # Common devices are enabled by default.
 { config, lib, pkgs, ... }:
 
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index e751ff141f70..cf70a891c0ca 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -176,7 +176,7 @@ in
 
     boot.initrd.availableKernelModules =
       [ # Note: most of these (especially the SATA/PATA modules)
-        # shouldn't be included by default since nixos-hardware-scan
+        # shouldn't be included by default since nixos-generate-config
         # detects them, but I'm keeping them for now for backwards
         # compatibility.
 

From 741770c99abbd6a165b5a7b0d8206aebba671de7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 18 Feb 2017 04:54:15 +0100
Subject: [PATCH 0638/3449] network-interface service: tuntap ifs have netdev
 services

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index cf90f05e8d3a..9264434d8438 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -49,7 +49,8 @@ in
         deviceDependency = dev:
           # Use systemd service if we manage device creation, else
           # trust udev when not in a container
-          if (hasAttr dev cfg.bridges) ||
+          if (hasAttr dev (filterAttrs (k: v: v.virtual) cfg.interfaces)) ||
+             (hasAttr dev cfg.bridges) ||
              (hasAttr dev cfg.bonds) ||
              (hasAttr dev cfg.macvlans) ||
              (hasAttr dev cfg.sits) ||

From 5236e235022ca8542f934938866fe2c9de11bfcc Mon Sep 17 00:00:00 2001
From: Rene Treffer <treffer+github@measite.de>
Date: Sat, 18 Feb 2017 13:43:59 +0100
Subject: [PATCH 0639/3449] prometheus-bind-exporter: init at 20161221

prometheus-bind-exporter: init at 20161221
---
 lib/maintainers.nix                           |  1 +
 .../monitoring/prometheus/bind-exporter.nix   | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/bind-exporter.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cb3ba191a719..89c088726988 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -428,6 +428,7 @@
   rongcuid = "Rongcui Dong <rongcuid@outlook.com>";
   ronny = "Ronny Pfannschmidt <nixos@ronnypfannschmidt.de>";
   rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
+  rtreffer = "Rene Treffer <treffer+nixos@measite.de>";
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>";
   rvlander = "Gaëtan André <rvlander@gaetanandre.eu>";
diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
new file mode 100644
index 000000000000..db58c7e14e5f
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "bind_exporter-${version}";
+  version = "20161221-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba";
+
+  goPackagePath = "github.com/digitalocean/bind_exporter";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "digitalocean";
+    repo = "bind_exporter";
+    sha256 = "1nd6pc1z627w4x55vd42zfhlqxxjmfsa9lyn0g6qq19k4l85v1qm";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Prometheus exporter for bind9 server";
+    homepage = https://github.com/digitalocean/bind_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ rtreffer ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 171ce7a24646..c0c59450d1ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10640,6 +10640,7 @@ with pkgs;
   prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { };
   prometheus = callPackage ../servers/monitoring/prometheus { };
   prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { };
+  prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };

From 979d20794d8651d7ac5c86ad37b68eacbadc5cc1 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 18 Feb 2017 22:25:24 +0900
Subject: [PATCH 0640/3449] buildRebar3: fix buildPhase & cleanup (#22744)

---
 .../development/beam-modules/build-rebar3.nix | 30 ++++++++-----------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/beam-modules/build-rebar3.nix b/pkgs/development/beam-modules/build-rebar3.nix
index f783683cd4a5..de2c6d40d40c 100644
--- a/pkgs/development/beam-modules/build-rebar3.nix
+++ b/pkgs/development/beam-modules/build-rebar3.nix
@@ -26,6 +26,10 @@ let
           buildInputs = [ drv ];
     };
 
+  customPhases = filterAttrs
+    (_: v: v != null)
+    { inherit setupHook configurePhase buildPhase installPhase; };
+
   pkg = self: stdenv.mkDerivation (attrs // {
 
     name = "${name}-${version}";
@@ -41,37 +45,30 @@ let
 
     inherit src;
 
-    setupHook = if setupHook == null
-    then writeText "setupHook.sh" ''
+    setupHook = writeText "setupHook.sh" ''
        addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
-    ''
-    else setupHook;
+    '';
 
     postPatch = ''
       rm -f rebar rebar3
     '' + postPatch;
 
-    configurePhase = if configurePhase == null
-    then ''
+    configurePhase = ''
       runHook preConfigure
       ${erlang}/bin/escript ${rebar3.bootstrapper} ${debugInfoFlag}
       runHook postConfigure
-    ''
-    else configurePhase;
+    '';
 
-    buildPhase = if buildPhase == null
-    then ''
+    buildPhase = ''
       runHook preBuild
       HOME=. rebar3 compile
       ${if compilePorts then ''
         HOME=. rebar3 pc compile
       '' else ''''}
       runHook postBuild
-    ''
-    else installPhase;
+    '';
 
-    installPhase = if installPhase == null
-    then ''
+    installPhase = ''
       runHook preInstall
       mkdir -p "$out/lib/erlang/lib/${name}-${version}"
       for reldir in src ebin priv include; do
@@ -81,8 +78,7 @@ let
         success=1
       done
       runHook postInstall
-    ''
-    else installPhase;
+    '';
 
     meta = {
       inherit (erlang.meta) platforms;
@@ -93,6 +89,6 @@ let
       env = shell self;
       inherit beamDeps;
     };
-  });
+  } // customPhases);
 in
   fix pkg

From 7901a7a65f10c820fbc7b3887e564cc2cd99b975 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <vrthra@users.noreply.github.com>
Date: Sat, 18 Feb 2017 08:25:49 -0500
Subject: [PATCH 0641/3449] dgsh-unstable: Init at 2017-02-05 (#22657)

Dgsh is the directed graph shell
---
 pkgs/shells/dgsh/default.nix    | 41 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/shells/dgsh/default.nix

diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix
new file mode 100644
index 000000000000..51319aef90aa
--- /dev/null
+++ b/pkgs/shells/dgsh/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig,
+  libtool, check, bison, git, gperf,
+  perl, texinfo, help2man, gettext, ncurses
+}:
+
+stdenv.mkDerivation rec {
+  name = "dgsh-unstable-${version}";
+  version = "2017-02-05";
+
+  src = fetchFromGitHub {
+    owner = "dspinellis";
+    repo = "dgsh";
+    rev = "bc4fc2e8009c069ee4df5140c32a2fc15d0acdec";
+    sha256 = "0k3hmnarz56wphw45mabn5zcc427l5p77jldh1qqy89pxqy1wnql";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ autoconf automake pkgconfig libtool check
+    bison git gettext gperf perl texinfo help2man ncurses
+  ];
+
+  configurePhase = ''
+    cp -r ./unix-tools/coreutils/gnulib gnulib
+    perl -pi -e \
+      's#./bootstrap #./bootstrap --no-bootstrap-sync --skip-po --no-git --gnulib-srcdir='$PWD/gnulib' #g' \
+      unix-tools/Makefile
+    find . -name \*.diff | xargs rm -f
+    rm -rf unix-tools/*/gnulib
+    patchShebangs unix-tools/diffutils/man/help2man
+    export RSYNC=true # set to rsync binary, eventhough it is not used.
+    make PREFIX=$out config
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The Directed Graph Shell";
+    homepage = http://www.dmst.aueb.gr/dds/sw/dgsh;
+    license = with licenses; asl20;
+    maintainers = with maintainers; [ vrthra ];
+    platforms = with platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89a547d3f589..6d48f8972e14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -494,6 +494,8 @@ with pkgs;
 
   djmount = callPackage ../tools/filesystems/djmount { };
 
+  dgsh = callPackage ../shells/dgsh { };
+
   elvish = callPackage ../shells/elvish { };
 
   encryptr = callPackage ../tools/security/encryptr {

From 17c5ca9018619d819c48e25add78f47d7d575611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 18 Feb 2017 14:33:26 +0100
Subject: [PATCH 0642/3449] haskell: add nix-specific fixes for various
 packages in stackage

With these overrides, nearly all of the stackage packages in the latest
stackage release should compile now.
---
 .../haskell-modules/configuration-common.nix  | 27 +--------
 .../haskell-modules/configuration-nix.nix     | 60 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0a0c7ee0644b..f6c677f0bd09 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -41,6 +41,8 @@ self: super: {
   nanospec = dontCheck super.nanospec;
   options = dontCheck super.options;
   statistics = dontCheck super.statistics;
+
+  # segfault due to missing return: https://github.com/haskell/c2hs/pull/184
   c2hs = dontCheck super.c2hs;
 
   # This test keeps being aborted because it runs too quietly for too long
@@ -228,7 +230,6 @@ self: super: {
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
-  hapistrano = dontCheck super.hapistrano;
   HerbiePlugin = dontCheck super.HerbiePlugin;
   wai-cors = dontCheck super.wai-cors;
 
@@ -278,7 +279,6 @@ self: super: {
   dotfs = dontCheck super.dotfs;                        # http://hydra.cryp.to/build/498599/log/raw
   DRBG = dontCheck super.DRBG;                          # http://hydra.cryp.to/build/498245/nixlog/1/raw
   ed25519 = dontCheck super.ed25519;
-  either-unwrap = dontCheck super.either-unwrap;        # http://hydra.cryp.to/build/498782/log/raw
   etcd = dontCheck super.etcd;
   fb = dontCheck super.fb;                              # needs credentials for Facebook
   fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
@@ -307,7 +307,6 @@ self: super: {
   hi = dontCheck super.hi;
   hierarchical-clustering = dontCheck super.hierarchical-clustering;
   hmatrix-tests = dontCheck super.hmatrix-tests;
-  hPDB-examples = dontCheck super.hPDB-examples;
   hquery = dontCheck super.hquery;
   hs2048 = dontCheck super.hs2048;
   hsbencher = dontCheck super.hsbencher;
@@ -427,9 +426,6 @@ self: super: {
   # https://github.com/NixOS/nixpkgs/issues/6350
   paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
 
-  # https://github.com/afcowie/http-streams/issues/80
-  http-streams = dontCheck super.http-streams;
-
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
@@ -451,9 +447,6 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
-  # https://github.com/alephcloud/hs-configuration-tools/issues/40
-  configuration-tools = dontCheck super.configuration-tools;
-
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 
@@ -695,13 +688,6 @@ self: super: {
   cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
   pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
 
-  # Fix tests which would otherwise fail with "Couldn't launch intero process."
-  intero = overrideCabal super.intero (drv: {
-    postPatch = (drv.postPatch or "") + ''
-      substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\""
-    '';
-  });
-
   # https://github.com/commercialhaskell/stack/issues/3001
   stack = doJailbreak super.stack;
 
@@ -736,14 +722,7 @@ self: super: {
   });
 
   # test suite cannot find its own "idris" binary
-  idris = overrideCabal super.idris (drv: {
-    # "idris" binary cannot find Idris library otherwise while building. After
-    # installing it's completely fine though. This seems like a bug in Idris
-    # that's related to builds with shared libraries enabled. It would be great
-    # if someone who knows a thing or two about Idris could look into this.
-    preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
-    doCheck = false;
-  });
+  idris = dontCheck super.idris;
 
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bd74e0e6e04d..c62d2702b44e 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -167,6 +167,13 @@ self: super: builtins.intersectAttrs super {
   http-client-tls = dontCheck super.http-client-tls;
   http-conduit = dontCheck super.http-conduit;
   transient-universe = dontCheck super.transient-universe;
+  typed-process = dontCheck super.typed-process;
+  js-jquery = dontCheck super.js-jquery;
+  hPDB-examples = dontCheck super.hPDB-examples;
+  configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40
+  tcp-streams = dontCheck super.tcp-streams;
+  holy-project = dontCheck super.holy-project;
+  mustache = dontCheck super.mustache;
 
   # Tries to mess with extended POSIX attributes, but can't in our chroot environment.
   xattr = dontCheck super.xattr;
@@ -378,13 +385,62 @@ self: super: builtins.intersectAttrs super {
   idris = overrideCabal super.idris (drv: {
     # https://github.com/idris-lang/Idris-dev/issues/2499
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+
+    # tests and build run executable, so need to set LD_LIBRARY_PATH
+    preBuild = ''
+      export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH"
+    '';
   });
 
   libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
     librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
   });
 
-  # Needs network in tests.
-  typed-process = dontCheck super.typed-process;
+  # does not specify tests in cabal file, instead has custom runTest cabal hook,
+  # so cabal2nix will not detect test dependencies.
+  either-unwrap = overrideCabal super.either-unwrap (drv: {
+    testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
+  });
 
+  hidapi = addExtraLibrary super.hidapi pkgs.libudev;
+
+  hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
+
+  discount = super.discount.override { markdown = pkgs.discount; };
+
+  # tests require working stack installation with all-cabal-hashes cloned in $HOME
+  stackage-curator = dontCheck super.stackage-curator;
+
+  # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59
+  io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
+
+  # requires autotools to build
+  secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ];
+
+  # tests require git
+  hapistrano = addBuildTool super.hapistrano pkgs.git;
+
+  # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
+  gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
+  gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
+
+  # requires valid, writeable $HOME
+  hatex-guide = overrideCabal super.hatex-guide (drv: {
+    preConfigure = ''
+      ${drv.preConfigure or ""}
+      export HOME=$PWD
+    '';
+  });
+
+  # Fails to link against with newer gsl versions because a deprecrated function
+  # was removed
+  hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; };
+
+  # tests run executable, relying on PATH
+  # without this, tests fail with "Couldn't launch intero process"
+  intero = overrideCabal super.intero (drv: {
+    preCheck = ''
+      export PATH="$PWD/dist/build/intero:$PATH"
+    '';
+  });
 }

From 405e117d310b2c1e3b281623de2aafca42045a55 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 18 Feb 2017 13:44:56 +0100
Subject: [PATCH 0643/3449] php70: 7.0.15 -> 7.0.16

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b7777d55667c..f0cb412e0267 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -315,8 +315,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.15";
-    sha256 = "1nbxwj4yx30k77qibhmnx0rvqhia1zbkwi5ps5nzm0sn6d3zkj58";
+    version = "7.0.16";
+    sha256 = "1awp6l5bs7qkvak9hgn1qbwkn6303mprslmgcfjyq3ywfmszbic3";
   };
 
   php71 = generic {

From 78abfe951b0af77da3d7865e598fc1393d3a6b2f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 18 Feb 2017 13:45:12 +0100
Subject: [PATCH 0644/3449] php71: 7.1.1 -> 7.1.2

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index f0cb412e0267..116d4adf204d 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -320,7 +320,7 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.1";
-    sha256 = "1g3mqscxnsic9ypf641jhiyn95d4d1nz198539245v2lgffx74fp";
+    version = "7.1.2";
+    sha256 = "013hlvzjmp7ilckqf3851xwmj37xzq6afsqm67i4whv64d723wp0";
   };
 }

From 4e4161c21268d6952f0f0f5130414e30dcf5cd97 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 18 Feb 2017 15:01:32 +0100
Subject: [PATCH 0645/3449] systemd: setup tmpfiles on switching configuration

This fixes systemd.tmpfiles.rules on switching configuration so that
does not only get applied on a fresh boot. This e.g. fixes kubernetes.
---
 nixos/modules/system/activation/switch-to-configuration.pl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 8747c1e3d4ac..ca7932a3c5cd 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -383,6 +383,10 @@ system("@systemd@/bin/systemctl", "reset-failed");
 # Make systemd reload its units.
 system("@systemd@/bin/systemctl", "daemon-reload") == 0 or $res = 3;
 
+# Set the new tmpfiles
+print STDERR "setting up tmpfiles\n";
+system("@systemd@/bin/systemd-tmpfiles", "--create", "--remove", "--exclude-prefix=/dev") == 0 or $res = 3;
+
 # Reload units that need it. This includes remounting changed mount
 # units.
 if (scalar(keys %unitsToReload) > 0) {

From 5e0b978eff60998d9b2ff7152e87e876a3296169 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 18 Feb 2017 06:44:31 -0800
Subject: [PATCH 0646/3449] mwprocapture: init at 1.2.3269 (#22160)

---
 .../hardware/video/capture/mwprocapture.nix   | 61 +++++++++++++++++
 nixos/modules/module-list.nix                 |  1 +
 .../linux/mwprocapture/default.nix            | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 130 insertions(+)
 create mode 100644 nixos/modules/hardware/video/capture/mwprocapture.nix
 create mode 100644 pkgs/os-specific/linux/mwprocapture/default.nix

diff --git a/nixos/modules/hardware/video/capture/mwprocapture.nix b/nixos/modules/hardware/video/capture/mwprocapture.nix
new file mode 100644
index 000000000000..aee15dcec6e5
--- /dev/null
+++ b/nixos/modules/hardware/video/capture/mwprocapture.nix
@@ -0,0 +1,61 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.hardware.mwProCapture;
+
+  kernelPackages = config.boot.kernelPackages;
+
+in
+
+{
+
+  options.hardware.mwProCapture.enable = mkEnableOption "Magewell Pro Capture family kernel module";
+
+  config = mkIf cfg.enable {
+
+    assertions = singleton {
+      assertion = versionAtLeast kernelPackages.kernel.version "3.2";
+      message = "Magewell Pro Capture family module is not supported for kernels older than 3.2";
+    };
+
+    boot.kernelModules = [ "ProCapture" ];
+
+    environment.systemPackages = [ kernelPackages.mwprocapture ];
+
+    boot.extraModulePackages = [ kernelPackages.mwprocapture ];
+
+    boot.extraModprobeConfig = ''
+      # Set the png picture to be displayed when no input signal is detected.
+      options ProCapture nosignal_file=${kernelPackages.mwprocapture}/res/NoSignal.png
+
+      # Set the png picture to be displayed when an unsupported input signal is detected.
+      options ProCapture unsupported_file=${kernelPackages.mwprocapture}/res/Unsupported.png
+
+      # Set the png picture to be displayed when an loking input signal is detected.
+      options ProCapture locking_file=${kernelPackages.mwprocapture}/res/Locking.png
+
+      # Message signaled interrupts switch
+      #options ProCapture disable_msi=0
+
+      # Set the debug level
+      #options ProCapture debug_level=0
+
+      # Force init switch eeprom
+      #options ProCapture init_switch_eeprom=0
+
+      # Min frame interval for VIDIOC_ENUM_FRAMEINTERVALS (default: 166666(100ns))
+      #options ProCapture enum_frameinterval_min=166666
+
+      # VIDIOC_ENUM_FRAMESIZES type (1: DISCRETE; 2: STEPWISE; otherwise: CONTINUOUS )
+      #options ProCapture enum_framesizes_type=0
+
+      # Parameters for internal usage
+      #options ProCapture internal_params=""
+    '';
+
+  };
+
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2195a828a1ee..5cd60e1b9d78 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -41,6 +41,7 @@
   ./hardware/video/amdgpu.nix
   ./hardware/video/amdgpu-pro.nix
   ./hardware/video/ati.nix
+  ./hardware/video/capture/mwprocapture.nix
   ./hardware/video/bumblebee.nix
   ./hardware/video/displaylink.nix
   ./hardware/video/nvidia.nix
diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
new file mode 100644
index 000000000000..f09e9543c48d
--- /dev/null
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchurl, kernel, alsaLib }:
+
+# The Magewell Pro Capture drivers are not supported for kernels older than 3.2
+assert stdenv.lib.versionAtLeast kernel.version "3.2.0";
+
+# this package currently only supports x86 and x86_64, as I have no ARM device to test on
+assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
+
+let
+  bits =
+  if stdenv.is64bit then "64"
+  else "32";
+
+  libpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc alsaLib ];
+
+in
+stdenv.mkDerivation rec {
+  name = "mwprocapture-1.2.${version}-${kernel.version}";
+  version = "3269";
+
+  src = fetchurl {
+    url = "http://www.magewell.com/files/ProCaptureForLinux_${version}.tar.gz";
+    sha256 = "0i1y50mf559flhxgaxy2gdpa7dvpp12ix9xfzgxa61rc135x0im4";
+  };
+
+  preConfigure =
+  ''
+    cd ./src
+    export INSTALL_MOD_PATH="$out"
+  '';
+
+  hardeningDisable = [ "pic" "format" ];
+
+  makeFlags = [
+    "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  postInstall = ''
+    cd ../
+    mkdir -p $out/bin
+    cp bin/mwcap-control_${bits} $out/bin/mwcap-control
+    cp bin/mwcap-info_${bits} $out/bin/mwcap-info
+    mkdir -p $out/lib/udev/rules.d
+    # source has a filename typo
+    cp scripts/10-procatpure-event-dev.rules $out/lib/udev/rules.d/10-procapture-event-dev.rules
+    cp -r src/res $out
+
+    patchelf \
+      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+      --set-rpath "${libpath}" \
+      "$out"/bin/mwcap-control
+
+    patchelf \
+      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+      --set-rpath "${libpath}" \
+      "$out"/bin/mwcap-info
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.magewell.com/;
+    description = "Linux driver for the Magewell Pro Capture family";
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ MP2E ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d48f8972e14..197b2970b463 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11425,6 +11425,8 @@ with pkgs;
 
     mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };
 
+    mwprocapture = callPackage ../os-specific/linux/mwprocapture { };
+
     mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };
 
     /* compiles but has to be integrated into the kernel somehow

From 313ccd5be3bfe780356615d22e54428fdb4c165b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 18 Feb 2017 15:51:07 +0100
Subject: [PATCH 0647/3449] network-interfaces service: fix typo in bonding
 options

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

diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 736292400fd4..8b85ff0057f9 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -126,7 +126,7 @@ in
               ms    = trans (v: v + "ms");
               in {
                 Mode                       = simp "mode";
-                TransmitHashPolixy         = simp "xmit_hash_policy";
+                TransmitHashPolicy         = simp "xmit_hash_policy";
                 LACPTransmitRate           = simp "lacp_rate";
                 MIIMonitorSec              = ms "miimon";
                 UpDelaySec                 = ms "updelay";

From 31dac10c330faf453ba946cbf558c04ca19102b9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 16 Feb 2017 01:17:31 +0100
Subject: [PATCH 0648/3449] mpd: add avahi zeroconf support

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

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index b1aa80341436..e2ec4a7617d2 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin
 , alsaSupport ? true, alsaLib
+, avahiSupport ? true, avahi, dbus
 , flacSupport ? true, flac
 , vorbisSupport ? true, libvorbis
 , madSupport ? true, libmad
@@ -26,6 +27,8 @@
 , soundcloudSupport ? true, yajl
 }:
 
+assert avahiSupport -> avahi != null && dbus != null;
+
 let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
@@ -45,6 +48,8 @@ in stdenv.mkDerivation rec {
     ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
     ++ opt stdenv.isLinux systemd
     ++ opt (stdenv.isLinux && alsaSupport) alsaLib
+    ++ opt avahiSupport avahi
+    ++ opt avahiSupport dbus
     ++ opt flacSupport flac
     ++ opt vorbisSupport libvorbis
     # using libmad to decode mp3 files on darwin is causing a segfault -- there
@@ -101,6 +106,7 @@ in stdenv.mkDerivation rec {
       (mkFlag opusSupport "opus")
       (mkFlag soundcloudSupport "soundcloud")
       "--enable-debug"
+      "--with-zeroconf=avahi"
     ]
     ++ opt stdenv.isLinux
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system";

From 2b0469c48f3211425ed06ae3ee5f257f97d9753c Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 16 Feb 2017 01:17:44 +0100
Subject: [PATCH 0649/3449] modules/mpd: factor out name & mention man 5
 mpd.conf

---
 nixos/modules/services/audio/mpd.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index a89215d73828..56af8fe152e0 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -4,6 +4,8 @@ with lib;
 
 let
 
+  name = "mpd";
+
   uid = config.ids.uids.mpd;
   gid = config.ids.gids.mpd;
   cfg = config.services.mpd;
@@ -54,13 +56,14 @@ in {
         description = ''
           Extra directives added to to the end of MPD's configuration file,
           mpd.conf. Basic configuration like file location and uid/gid
-          is added automatically to the beginning of the file.
+          is added automatically to the beginning of the file. For available
+          options see <literal>man 5 mpd.conf</literal>'.
         '';
       };
 
       dataDir = mkOption {
         type = types.path;
-        default = "/var/lib/mpd";
+        default = "/var/lib/${name}";
         description = ''
           The directory where MPD stores its state, tag cache,
           playlists etc.
@@ -69,13 +72,13 @@ in {
 
       user = mkOption {
         type = types.str;
-        default = "mpd";
+        default = name;
         description = "User account under which MPD runs.";
       };
 
       group = mkOption {
         type = types.str;
-        default = "mpd";
+        default = name;
         description = "Group account under which MPD runs.";
       };
 
@@ -131,17 +134,17 @@ in {
       };
     };
 
-    users.extraUsers = optionalAttrs (cfg.user == "mpd") (singleton {
+    users.extraUsers = optionalAttrs (cfg.user == name) (singleton {
       inherit uid;
-      name = "mpd";
+      inherit name;
       group = cfg.group;
       extraGroups = [ "audio" ];
       description = "Music Player Daemon user";
       home = "${cfg.dataDir}";
     });
 
-    users.extraGroups = optionalAttrs (cfg.group == "mpd") (singleton {
-      name = "mpd";
+    users.extraGroups = optionalAttrs (cfg.group == name) (singleton {
+      inherit name;
       gid = gid;
     });
   };

From f78f207f1775fbf37c67e546b77ba206c107da36 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 17 Feb 2017 18:04:45 +0100
Subject: [PATCH 0650/3449] nixos.samba: add enableNmbd and enableWinbindd
 options

This allows for disabling these services, in case they are not needed.
---
 .../services/network-filesystems/samba.nix    | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 09a11585bc92..6ae5292fc303 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -91,6 +91,26 @@ in
         '';
       };
 
+      enableNmbd = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable Samba's nmbd, which replies to NetBIOS over IP name
+          service requests. It also participates in the browsing protocols
+          which make up the Windows "Network Neighborhood" view.
+        '';
+      };
+
+      enableWinbindd = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable Samba's winbindd, which provides a number of services
+          to the Name Service Switch capability found in most modern C libraries,
+          to arbitrary applications via PAM and ntlm_auth and to Samba itself.
+        '';
+      };
+
       package = mkOption {
         type = types.package;
         default = pkgs.samba;
@@ -185,7 +205,12 @@ in
   ###### implementation
 
   config = mkMerge
-    [ { # Always provide a smb.conf to shut up programs like smbclient and smbspool.
+    [ { assertions =
+          [ { assertion = cfg.nsswins -> cfg.enableWinbindd;
+              message   = "If samba.nsswins is enabled, then samba.enableWinbindd must also be enabled";
+            }
+          ];
+        # Always provide a smb.conf to shut up programs like smbclient and smbspool.
         environment.etc = singleton
           { source =
               if cfg.enable then configFile
@@ -194,7 +219,7 @@ in
           };
       }
 
-      (mkIf config.services.samba.enable {
+      (mkIf cfg.enable {
 
         system.nssModules = optional cfg.nsswins samba;
 
@@ -207,9 +232,9 @@ in
           };
 
           services = {
-            "samba-nmbd" = daemonService "nmbd" "-F";
             "samba-smbd" = daemonService "smbd" "-F";
-            "samba-winbindd" = daemonService "winbindd" "-F";
+            "samba-nmbd" = mkIf cfg.enableNmbd (daemonService "nmbd" "-F");
+            "samba-winbindd" = mkIf cfg.enableWinbindd (daemonService "winbindd" "-F");
             "samba-setup" = {
               description = "Samba Setup Task";
               script = setupScript;

From 713918a094d7d6ad0d75aea16e4b1f5b316f8c59 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 18 Feb 2017 17:47:36 +0300
Subject: [PATCH 0651/3449] haskellPackages.pointfree: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f6c677f0bd09..34907151f0b9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -844,4 +844,10 @@ self: super: {
 
   # https://github.com/xmonad/xmonad-extras/issues/3
   xmonad-extras = doJailbreak super.xmonad-extras;
+
+  # https://github.com/bmillwood/pointfree/issues/21
+  pointfree = appendPatch super.pointfree (pkgs.fetchpatch {
+    url = "https://github.com/bmillwood/pointfree/pull/22.patch";
+    sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp";
+  });
 }

From 32560d26998fb593d512ac8dce0946486bb299f1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 18 Feb 2017 19:23:35 +0300
Subject: [PATCH 0652/3449] haskellPackages.lambdabot: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 34907151f0b9..8b363bfedade 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -850,4 +850,16 @@ self: super: {
     url = "https://github.com/bmillwood/pointfree/pull/22.patch";
     sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp";
   });
+
+  # https://github.com/int-e/QuickCheck-safe/issues/2
+  QuickCheck-safe = doJailbreak super.QuickCheck-safe;
+
+  # https://github.com/mokus0/dependent-sum-template/issues/7
+  dependent-sum-template = doJailbreak super.dependent-sum-template;
+
+  # https://github.com/jcristovao/newtype-generics/issues/13
+  newtype-generics = doJailbreak super.newtype-generics;
+
+  # https://github.com/lambdabot/lambdabot/issues/158
+  lambdabot-core = doJailbreak super.lambdabot-core;
 }

From fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:48:05 -0600
Subject: [PATCH 0653/3449] Revert "haskell: add nix-specific fixes for various
 packages in stackage"

This reverts commit 17c5ca9018619d819c48e25add78f47d7d575611.

This commit causes an evaluation error due to infinite recursion, which can be
tested by running:
```
$ nix-env -f . -qa \* --meta --xml --drv-path --show-trace > /dev/null
```
---
 .../haskell-modules/configuration-common.nix  | 27 ++++++++-
 .../haskell-modules/configuration-nix.nix     | 60 +------------------
 2 files changed, 26 insertions(+), 61 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8b363bfedade..a2b4c375212d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -41,8 +41,6 @@ self: super: {
   nanospec = dontCheck super.nanospec;
   options = dontCheck super.options;
   statistics = dontCheck super.statistics;
-
-  # segfault due to missing return: https://github.com/haskell/c2hs/pull/184
   c2hs = dontCheck super.c2hs;
 
   # This test keeps being aborted because it runs too quietly for too long
@@ -230,6 +228,7 @@ self: super: {
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
+  hapistrano = dontCheck super.hapistrano;
   HerbiePlugin = dontCheck super.HerbiePlugin;
   wai-cors = dontCheck super.wai-cors;
 
@@ -279,6 +278,7 @@ self: super: {
   dotfs = dontCheck super.dotfs;                        # http://hydra.cryp.to/build/498599/log/raw
   DRBG = dontCheck super.DRBG;                          # http://hydra.cryp.to/build/498245/nixlog/1/raw
   ed25519 = dontCheck super.ed25519;
+  either-unwrap = dontCheck super.either-unwrap;        # http://hydra.cryp.to/build/498782/log/raw
   etcd = dontCheck super.etcd;
   fb = dontCheck super.fb;                              # needs credentials for Facebook
   fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
@@ -307,6 +307,7 @@ self: super: {
   hi = dontCheck super.hi;
   hierarchical-clustering = dontCheck super.hierarchical-clustering;
   hmatrix-tests = dontCheck super.hmatrix-tests;
+  hPDB-examples = dontCheck super.hPDB-examples;
   hquery = dontCheck super.hquery;
   hs2048 = dontCheck super.hs2048;
   hsbencher = dontCheck super.hsbencher;
@@ -426,6 +427,9 @@ self: super: {
   # https://github.com/NixOS/nixpkgs/issues/6350
   paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
 
+  # https://github.com/afcowie/http-streams/issues/80
+  http-streams = dontCheck super.http-streams;
+
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
@@ -447,6 +451,9 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
+  # https://github.com/alephcloud/hs-configuration-tools/issues/40
+  configuration-tools = dontCheck super.configuration-tools;
+
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 
@@ -688,6 +695,13 @@ self: super: {
   cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
   pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
 
+  # Fix tests which would otherwise fail with "Couldn't launch intero process."
+  intero = overrideCabal super.intero (drv: {
+    postPatch = (drv.postPatch or "") + ''
+      substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\""
+    '';
+  });
+
   # https://github.com/commercialhaskell/stack/issues/3001
   stack = doJailbreak super.stack;
 
@@ -722,7 +736,14 @@ self: super: {
   });
 
   # test suite cannot find its own "idris" binary
-  idris = dontCheck super.idris;
+  idris = overrideCabal super.idris (drv: {
+    # "idris" binary cannot find Idris library otherwise while building. After
+    # installing it's completely fine though. This seems like a bug in Idris
+    # that's related to builds with shared libraries enabled. It would be great
+    # if someone who knows a thing or two about Idris could look into this.
+    preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
+    doCheck = false;
+  });
 
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c62d2702b44e..bd74e0e6e04d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -167,13 +167,6 @@ self: super: builtins.intersectAttrs super {
   http-client-tls = dontCheck super.http-client-tls;
   http-conduit = dontCheck super.http-conduit;
   transient-universe = dontCheck super.transient-universe;
-  typed-process = dontCheck super.typed-process;
-  js-jquery = dontCheck super.js-jquery;
-  hPDB-examples = dontCheck super.hPDB-examples;
-  configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40
-  tcp-streams = dontCheck super.tcp-streams;
-  holy-project = dontCheck super.holy-project;
-  mustache = dontCheck super.mustache;
 
   # Tries to mess with extended POSIX attributes, but can't in our chroot environment.
   xattr = dontCheck super.xattr;
@@ -385,62 +378,13 @@ self: super: builtins.intersectAttrs super {
   idris = overrideCabal super.idris (drv: {
     # https://github.com/idris-lang/Idris-dev/issues/2499
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
-
-    # tests and build run executable, so need to set LD_LIBRARY_PATH
-    preBuild = ''
-      export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH"
-    '';
   });
 
   libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
     librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
   });
 
-  # does not specify tests in cabal file, instead has custom runTest cabal hook,
-  # so cabal2nix will not detect test dependencies.
-  either-unwrap = overrideCabal super.either-unwrap (drv: {
-    testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
-  });
+  # Needs network in tests.
+  typed-process = dontCheck super.typed-process;
 
-  hidapi = addExtraLibrary super.hidapi pkgs.libudev;
-
-  hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
-
-  discount = super.discount.override { markdown = pkgs.discount; };
-
-  # tests require working stack installation with all-cabal-hashes cloned in $HOME
-  stackage-curator = dontCheck super.stackage-curator;
-
-  # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59
-  io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
-
-  # requires autotools to build
-  secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ];
-
-  # tests require git
-  hapistrano = addBuildTool super.hapistrano pkgs.git;
-
-  # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
-  gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
-  gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
-
-  # requires valid, writeable $HOME
-  hatex-guide = overrideCabal super.hatex-guide (drv: {
-    preConfigure = ''
-      ${drv.preConfigure or ""}
-      export HOME=$PWD
-    '';
-  });
-
-  # Fails to link against with newer gsl versions because a deprecrated function
-  # was removed
-  hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; };
-
-  # tests run executable, relying on PATH
-  # without this, tests fail with "Couldn't launch intero process"
-  intero = overrideCabal super.intero (drv: {
-    preCheck = ''
-      export PATH="$PWD/dist/build/intero:$PATH"
-    '';
-  });
 }

From fca09185d0021256a28b1a2cb710b197e3a08bd6 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 15 Feb 2017 12:01:29 +0100
Subject: [PATCH 0654/3449] pycurl: 7.19.5 -> 7.19.5.1

Fixes import error when curl was built with LibreSSL.
---
 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 34ddf8a221c3..d004a14adf85 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19913,12 +19913,12 @@ in {
   };
 
   pycurl = buildPythonPackage (rec {
-    name = "pycurl-7.19.5";
+    name = "pycurl-7.19.5.1";
     disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
     src = pkgs.fetchurl {
       url = "http://pycurl.sourceforge.net/download/${name}.tar.gz";
-      sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839";
+      sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf";
     };
 
     propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ];

From bd97e19d011eeafb4a182018ab2e247d9e6e83a3 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Feb 2017 13:10:00 -0600
Subject: [PATCH 0655/3449] epic5: changed rm, cp, chmod to use pkgs.coreutils

epic5: removed pkgs from pkgs.coreutils

	modified:   pkgs/applications/networking/irc/epic5/default.nix
---
 pkgs/applications/networking/irc/epic5/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix
index 2daeab5d3026..35e436eb7154 100644
--- a/pkgs/applications/networking/irc/epic5/default.nix
+++ b/pkgs/applications/networking/irc/epic5/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl }:
+{ stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "epic5-${version}";
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
 
   postConfigure = ''
     substituteInPlace bsdinstall \
-      --replace /bin/cp cp \
-      --replace /bin/rm rm \
-      --replace /bin/chmod chmod
+      --replace /bin/cp ${coreutils}/bin/cp \
+      --replace /bin/rm ${coreutils}/bin/rm \
+      --replace /bin/chmod ${coreutils}/bin/chmod \
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://epicsol.org/";
-    description = "a IRC client that offers a great ircII interface";
+    homepage = "http://epicsol.org";
+    description = "A IRC client that offers a great ircII interface";
     license = licenses.bsd3;
     maintainers = [ maintainers.ndowens ];
   };

From e3f5ebd38ff18482fc166ad6eef4bd3556d2df6f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Feb 2017 13:26:18 -0600
Subject: [PATCH 0656/3449] worker: add version to name and so some minor
 cleanups (#22949)

---
 pkgs/applications/misc/worker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index fade4905cfc0..00e42fdbba98 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -1,18 +1,18 @@
-{pkgs, stdenv, xorg, fetchurl }:
+{ stdenv, libX11, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "worker";
+  name = "worker-${version}";
   version = "3.8.5";
 
   src = fetchurl {
-    url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz";
+    url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
     sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw";
   };
 
-  buildInputs = with pkgs; [ xorg.libX11 ];
+  buildInputs = [ libX11 ];
 
   meta = with stdenv.lib; {
-    description = "a two-pane file manager with advanced file manipulation features";
+    description = "A two-pane file manager with advanced file manipulation features";
     homepage = "http://www.boomerangsworld.de/cms/worker/index.html";
     license =  licenses.gpl2;
     maintainers = [ maintainers.ndowens ];

From fccea078699c9bef851e630d34fbb6eb9a0acdfa Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Sat, 18 Feb 2017 20:27:23 +0100
Subject: [PATCH 0657/3449] glances: 2.7.1_1 -> 2.8.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b93c25262bd8..82d7f848a4fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12205,14 +12205,14 @@ in {
 
   glances = buildPythonPackage rec {
     name = "glances-${version}";
-    version = "2.7.1_1";
+    version = "2.8.2";
     disabled = isPyPy;
 
     src = pkgs.fetchFromGitHub {
       owner = "nicolargo";
       repo = "glances";
       rev = "v${version}";
-      sha256 = "0gc2qgpzmy7q31z8b11ls4ifb0lwrz94xnz1kj27kc369a01gbxv";
+      sha256 = "1jwaq9k6q8wn197wadiwid7d8aik24rhsypmcl5q0jviwkhhiri9";
     };
 
     doCheck = false;

From 467f7d3f6cc8b0c6080720a4abda1391a82d3b99 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sat, 18 Feb 2017 22:09:06 +0200
Subject: [PATCH 0658/3449] zmq: v4.2.0 -> v4.2.2

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

diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index ab95f4ec3f35..4352e7f05c29 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zeromq-${version}";
-  version = "4.2.0";
+  version = "4.2.2";
 
   src = fetchurl {
     url = "https://github.com/zeromq/libzmq/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "05y1s0938x5w838z79b4f9w6bspz9anldjx9dzvk32cpxvq3pf2k";
+    sha256 = "0syzwsiqblimfjb32fr6hswhdvp3cmbk0pgm7ayxaigmkv5g88sv";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ca016c26269f130e37d020712b742e365520e328 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Feb 2017 21:59:24 +0100
Subject: [PATCH 0659/3449] grsecurity: 4.9.10-201702152052 ->
 4.9.11-201702181444

---
 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 320af7cb0bae..c185442c772a 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.10";
+  version = "4.9.11";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "1mqlw5x7ryqb1jlhkn31p5xhilmqi55j5307i94xdj1xgn2411fiym5mpx1h8b0jc42g728jl896qplkrbd682vz5wci7fg4022ry81";
+    sha512 = "3lh2nrkq3254diqdjry857gmh39ijxxhd7h8563jdzv9i8awv564zajpdcr6bjpf5swyicjsylifym2b5ww41b0fp6z4pkns9mmppny";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 9bc47dd624d8..c94907efc4a7 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.10";
-      grrev  = "201702152052";
-      sha512 = "3whjlrm06r724q9lkycm2jalv3wm9bhxjlvgnglrfnc48rnv3b4j2m6gnq396pc3axnd2mpiinlwjwarw59dhs9qax9l7ddcc3cxd4k";
+    { kver   = "4.9.11";
+      grrev  = "201702181444";
+      sha512 = "22yfq0w2hdhn0mhw0m2knm368f69z0qsf7vsfid7sw4m9ylmxfwzlnl92vfz15vldfl10hk78y59dcf8nv6jljh8gb5ycv4q61qlph6";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 0860565ee0d95192cea006e49656e33959984e9a Mon Sep 17 00:00:00 2001
From: ikervagyok <ikervagyok@gmail.com>
Date: Sat, 18 Feb 2017 22:20:42 +0100
Subject: [PATCH 0660/3449] btrfs-dedupe: init at 1.1.0 (#22938)

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

diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
new file mode 100644
index 000000000000..2cd1e8162c62
--- /dev/null
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, rustPlatform, lzo, zlib }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "btrfs-dedupe-${version}";
+  version = "1.1.0";
+
+
+  src = fetchurl {
+    url = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe/repository/archive.tar.bz2?ref=72c6a301d20f935827b994db210bf0a1e121273a";
+    sha256 = "0qy1g4crhfgs2f5cmrsjv6qscg3r66gb8n6sxhimm9ksivhjyyjp";
+  };
+
+  depsSha256 = "04jlz7nzsmg86i73w75i8rmlbk635xrg8m1dfac8h17dwb29yj6a";
+
+  buildInputs = [ lzo zlib ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe";
+    description = "BTRFS deduplication utility";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ikervagyok ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 197b2970b463..3bdd09ee723f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -668,6 +668,8 @@ with pkgs;
   btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
   btrfs-progs_4_4_1 = callPackage ../tools/filesystems/btrfs-progs/4.4.1.nix { };
 
+  btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {};
+
   btrbk = callPackage ../tools/backup/btrbk { };
 
   bwm_ng = callPackage ../tools/networking/bwm-ng { };

From 492101dfce919350d1897f8c96ff402e7ca53827 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 18 Feb 2017 22:40:31 +0100
Subject: [PATCH 0661/3449] nixos-container: fix destroy with immutable
 /var/empty

fixes #21573
---
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index cde79f8a8208..65a9c3f5814b 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -248,6 +248,7 @@ if ($action eq "destroy") {
 
     safeRemoveTree($profileDir) if -e $profileDir;
     safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
+    system("chattr", "-i", "$root/var/empty") if -e $root;
     safeRemoveTree($root) if -e $root;
     unlink($confFile) or die;
 }

From 3f09f8fa4d32fa532177858cf8c5e6b6ba9e36c4 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sat, 18 Feb 2017 21:24:49 +0200
Subject: [PATCH 0662/3449] czmq: v3.0.2 -> v4.0.2

---
 .../libraries/czmq/{default.nix => 3.x.nix}   |  0
 pkgs/development/libraries/czmq/4.x.nix       | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 ++++++--
 3 files changed, 29 insertions(+), 2 deletions(-)
 rename pkgs/development/libraries/czmq/{default.nix => 3.x.nix} (100%)
 create mode 100644 pkgs/development/libraries/czmq/4.x.nix

diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/3.x.nix
similarity index 100%
rename from pkgs/development/libraries/czmq/default.nix
rename to pkgs/development/libraries/czmq/3.x.nix
diff --git a/pkgs/development/libraries/czmq/4.x.nix b/pkgs/development/libraries/czmq/4.x.nix
new file mode 100644
index 000000000000..dd957d07340c
--- /dev/null
+++ b/pkgs/development/libraries/czmq/4.x.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, zeromq }:
+
+stdenv.mkDerivation rec {
+  version = "4.0.2";
+  name = "czmq-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/zeromq/czmq/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "12gbh57xnz2v82x1g80gv4bwapmyzl00lbin5ix3swyac8i7m340";
+  };
+
+  # Needs to be propagated for the .pc file to work
+  propagatedBuildInputs = [ zeromq ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://czmq.zeromq.org/";
+    description = "High-level C Binding for ZeroMQ";
+    license = licenses.mpl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 197b2970b463..e647d2ab237d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -945,6 +945,7 @@ with pkgs;
 
   rsyslog = callPackage ../tools/system/rsyslog {
     hadoop = null; # Currently Broken
+    czmq = czmq3;
   };
 
   rsyslog-light = callPackage ../tools/system/rsyslog {
@@ -9998,9 +9999,13 @@ with pkgs;
 
   cppzmq = callPackage ../development/libraries/cppzmq {};
 
-  czmq = callPackage ../development/libraries/czmq { };
+  czmq3 = callPackage ../development/libraries/czmq/3.x.nix {};
+  czmq4 = callPackage ../development/libraries/czmq/4.x.nix {};
+  czmq = czmq4;
 
-  czmqpp = callPackage ../development/libraries/czmqpp { };
+  czmqpp = callPackage ../development/libraries/czmqpp {
+    czmq = czmq3;
+  };
 
   zimlib = callPackage ../development/libraries/zimlib { };
 

From 9326a89910434f96b3af4dd7758614e0143735e2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 18 Feb 2017 23:14:52 +0100
Subject: [PATCH 0663/3449] lvm: add missing dependency

fixes #14394
---
 pkgs/os-specific/linux/lvm2/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 5af100eacb29..9645a2d16b52 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid, enable_dmeventd ? false }:
+{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, libuuid
+, thin-provisioning-tools, enable_dmeventd ? false }:
 
 let
   version = "2.02.140";
@@ -22,7 +23,7 @@ stdenv.mkDerivation {
   ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libudev libuuid ];
+  buildInputs = [ libudev libuuid thin-provisioning-tools ];
 
   preConfigure =
     ''

From 7cbe538e942e2ae753f83225f97c8dc22cbd4817 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 18 Feb 2017 23:14:07 +0300
Subject: [PATCH 0664/3449] pythonPackages.wrapPython: fix for paths with
 spaces

---
 pkgs/development/interpreters/python/wrap.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/wrap.sh b/pkgs/development/interpreters/python/wrap.sh
index f4b63b826403..55998bc5b41e 100644
--- a/pkgs/development/interpreters/python/wrap.sh
+++ b/pkgs/development/interpreters/python/wrap.sh
@@ -47,7 +47,7 @@ wrapPythonProgramsIn() {
     buildPythonPath "$pythonPath"
 
     # Find all regular files in the output directory that are executable.
-    for f in $(find "$dir" -type f -perm -0100); do
+    find "$dir" -type f -perm -0100 -print0 | while read -d "" f; do
         # Rewrite "#! .../env python" to "#! /nix/store/.../python".
         # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
         # Python to use besides one with this hook anyway.

From 39aac045f63170f35d9e4a036f2d2dd6c7855821 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sun, 19 Feb 2017 00:39:14 +0200
Subject: [PATCH 0665/3449] rustPackages: update to latest

---
 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 e35153a36701..faed3a218fc5 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-01-27";
-  rev = "6a73a15e27364a0c191d61d52406bebb7639b657";
-  sha256 = "1dklswbf3acfqid4vv7g2xpqc4gswjgh4ih9xjx3a0m3a69cw9lb";
+  version = "2017-02-19";
+  rev = "d822c5853cb14caa5de84a71f6d4ed07ea5e31e1";
+  sha256 = "18m0smlqw3vkn0ljk01l333jj0x32m8rr1dgmpnq621vqvpk5mzp";
 
   src = fetchFromGitHub {
       inherit rev;

From 993d2db029577b580741a58b68694d5b05869e19 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 18 Feb 2017 18:20:40 +0800
Subject: [PATCH 0666/3449] libreoffice-fresh: build on hydra

---
 pkgs/applications/office/libreoffice/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index b74483b82747..989cf17e2761 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -266,6 +266,5 @@ in stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     maintainers = with maintainers; [ viric raskin ];
     platforms = platforms.linux;
-    hydraPlatforms = [];
   };
 }

From 2423313581c6429b7cab25aa24c8bad848ad164f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 18 Feb 2017 18:33:36 -0500
Subject: [PATCH 0667/3449] kernel: 4.9.10 -> 4.9.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 103c8f6c6989..09f0fd72eeeb 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.10";
+  version = "4.9.11";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "098mcq3rg05gpammcdfhr2xhcy69ggc9h5g18m4ymnfqdx3havmx";
+    sha256 = "1czj88bj27yaiikf88kz131ayivcqhkq9d5r863w1s3qj04c2bsi";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c94907efc4a7..824d685378c5 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -174,14 +174,4 @@ rec {
         sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
       };
     };
-
-  sctp_bug_on_CVE_2017_5986 = rec
-    { name = "sctp_BUG_ON_CVE_2017_5986.patch";
-      patch = fetchpatch {
-        inherit name;
-        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2dcab598484185dea7ec22219c76dcdd59e3cb90";
-        sha256 = "15np10bfm5yzby9zbkrh23qpm91wnprblsk0xn9yjryypnz8njxh";
-      };
-    };
-
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67072b5128b9..d67305f51b8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11312,7 +11312,6 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.sctp_bug_on_CVE_2017_5986
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 7274fc32d2af261f2d0884152140a821b005b56f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 18 Feb 2017 18:40:04 -0500
Subject: [PATCH 0668/3449] linux: 4.4.48 -> 4.4.50

---
 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 db5aa849f1ea..0aac9b43f1e6 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.48";
+  version = "4.4.50";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "09c0rfm9ycyjyz0nsz34fa1cvfzx8pyzcmxhyz0dqiw6x4fqal3w";
+    sha256 = "1dqnhajciy9vgcx4lz5mngc21j5w73fzpivxx6kn7pqbpfjlr574";
   };
 
   kernelPatches = args.kernelPatches;

From 523444db38e50fe7ddcf96c7fca6b8a89d3634c4 Mon Sep 17 00:00:00 2001
From: Renato Alves <alves.rjc@gmail.com>
Date: Sat, 18 Feb 2017 22:48:50 +0100
Subject: [PATCH 0669/3449] luaPackages.luaposix: init at 33.4.0

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index a5490970b728..6ad2e288c971 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -151,6 +151,21 @@ let
     };
   };
 
+  luaposix = buildLuaPackage rec {
+    name = "posix-${version}";
+    version = "33.4.0";
+    src = fetchurl {
+      url = "https://github.com/luaposix/luaposix/archive/release-v${version}.tar.gz";
+      sha256 = "e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21";
+    };
+    buildInputs = [ perl ];
+    meta = {
+      description = "Lua bindings for POSIX API";
+      homepage = "https://github.com/luaposix/luaposix";
+      hydraPlatforms = stdenv.lib.platforms.unix;
+    };
+  };
+
   lpty = buildLuaPackage rec {
     name = "lpty-${version}";
     version = "1.1.1";

From af6c722a7b3f32a3ef78eaedb06a2d9c4eee42b3 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sun, 19 Feb 2017 01:14:43 +0200
Subject: [PATCH 0670/3449] intecture-cli: init at 0.3.2

---
 pkgs/tools/admin/intecture/cli.nix | 32 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/admin/intecture/cli.nix

diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
new file mode 100644
index 000000000000..0f530f636d78
--- /dev/null
+++ b/pkgs/tools/admin/intecture/cli.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform
+, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "intecture-cli-${version}";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "intecture";
+    repo = "cli";
+    rev = version;
+    sha256 = "0f5pyrlkxzz4kdfzwambxzqr48g3n06f1pv163h06ggssqa51wbc";
+  };
+
+  depsSha256 = "0f3rhjs5addppva4cjx3ngpa5gz2i2n46hyc3zd4l7lhh8gaggix";
+
+  buildInputs = [ openssl zeromq czmq zlib ];
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  # Needed for tests
+  USER = "$(whoami)";
+
+  meta = with lib; {
+    description = "A developer friendly, language agnostic configuration management tool for server systems";
+    homepage = https://intecture.io;
+    license = licenses.mpl20;
+    maintainers = [ maintainers.rushmorem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67072b5128b9..1382a5307f40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2301,6 +2301,8 @@ with pkgs;
 
   innoextract = callPackage ../tools/archivers/innoextract { };
 
+  intecture-cli = callPackage ../tools/admin/intecture/cli.nix { };
+
   ioping = callPackage ../tools/system/ioping { };
 
   iops = callPackage ../tools/system/iops { };

From 1ae9b50a772e7acf5ce61fe55a56b9f4effa73e7 Mon Sep 17 00:00:00 2001
From: Michele Guerini Rocco <rnhmjoj@users.noreply.github.com>
Date: Sun, 19 Feb 2017 02:11:08 +0100
Subject: [PATCH 0671/3449] vapoursynth: disable OCR by default (#22943)

---
 pkgs/development/libraries/vapoursynth/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix
index 0922a5e37852..ae43307cf31d 100644
--- a/pkgs/development/libraries/vapoursynth/default.nix
+++ b/pkgs/development/libraries/vapoursynth/default.nix
@@ -1,8 +1,12 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook,
-  glibc, zimg, imagemagick, libass, tesseract, yasm,
-  python3
+  glibc, zimg, imagemagick, libass, yasm, python3,
+  ocrSupport ? false, tesseract
 }:
 
+assert ocrSupport -> tesseract != null;
+
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "vapoursynth-${version}";
   version = "R36";
@@ -18,14 +22,15 @@ stdenv.mkDerivation rec {
     pkgconfig autoreconfHook
     zimg imagemagick libass glibc tesseract yasm
     (python3.withPackages (ps: with ps; [ sphinx cython ]))
-  ];
+  ] ++ optional ocrSupport tesseract;
 
   configureFlags = [
     "--enable-imwri"
     "--disable-static"
+    (optionalString (!ocrSupport) "--disable-ocr")
   ];
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A video processing framework with the future in mind";
     homepage    = http://www.vapoursynth.com/;
     license     = licenses.lgpl21;

From d738ac4fd598fb2983aa336e94df4efa2a5f1e1a Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Fri, 17 Feb 2017 23:18:48 +0100
Subject: [PATCH 0672/3449] ocaml-angstrom: init at 0.3.0

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

diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
new file mode 100644
index 000000000000..56509ab5786a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, ocaml, cstruct, result, findlib, ocaml_oasis }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.0";
+  name = "ocaml-angstrom-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "inhabitedtype";
+    repo   = "angstrom";
+    rev    = "${version}";
+    sha256 = "1x9pvy5vw98ns4pspj7i10pmgqyngn4v4cdlz5pbvwbrpwpn090q";
+  };
+
+  createFindlibDestdir = true;
+
+  buildInputs = [ ocaml ocaml_oasis findlib ];
+  propagatedBuildInputs = [ result cstruct ];
+
+  meta = {
+    homepage = https://github.com/inhabitedtype/angstrom;
+    description = "OCaml parser combinators built for speed and memory efficiency";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ sternenseemann ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 73669c58b553..941b8ebd65de 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -18,6 +18,8 @@ let
 
     alcotest = callPackage ../development/ocaml-modules/alcotest {};
 
+    angstrom = callPackage ../development/ocaml-modules/angstrom { };
+
     ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { };
 
     apron = callPackage ../development/ocaml-modules/apron { };

From 31d4b7b83041129dffd009323cd87d1feb143762 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sun, 19 Feb 2017 03:05:18 +0200
Subject: [PATCH 0673/3449] intecture-auth: init at 0.1.0

---
 pkgs/tools/admin/intecture/auth.nix | 29 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/admin/intecture/auth.nix

diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
new file mode 100644
index 000000000000..88ef137d841c
--- /dev/null
+++ b/pkgs/tools/admin/intecture/auth.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform
+, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "intecture-auth-${version}";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "intecture";
+    repo = "auth";
+    rev = version;
+    sha256 = "1p3jahha8k139f22ijg050cl8akfzxda4gzvijpqv869hmhc70py";
+  };
+
+  depsSha256 = "0mki57yzb29y9fhh16xvpi5gfp6c14r5q3f45f3v8sdj95rjahz1";
+
+  buildInputs = [ openssl zeromq czmq zlib ];
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  meta = with lib; {
+    description = "Authentication client/server for Intecture components";
+    homepage = https://intecture.io;
+    license = licenses.mpl20;
+    maintainers = [ maintainers.rushmorem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93476b74e8f5..3bed76a142f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2301,6 +2301,8 @@ with pkgs;
 
   innoextract = callPackage ../tools/archivers/innoextract { };
 
+  intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };
+
   intecture-cli = callPackage ../tools/admin/intecture/cli.nix { };
 
   ioping = callPackage ../tools/system/ioping { };

From 87cf2231fa9d932cbd8a634ed722f1f73b457cb5 Mon Sep 17 00:00:00 2001
From: rushmorem <rushmore@webenchanter.com>
Date: Sun, 19 Feb 2017 03:36:52 +0200
Subject: [PATCH 0674/3449] intecture-agent: init at 0.3.0

---
 pkgs/tools/admin/intecture/agent.nix | 29 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/admin/intecture/agent.nix

diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
new file mode 100644
index 000000000000..27891614f4b2
--- /dev/null
+++ b/pkgs/tools/admin/intecture/agent.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, fetchFromGitHub, rustPlatform
+, openssl, zeromq, czmq, pkgconfig, cmake, zlib }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "intecture-agent-${version}";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "intecture";
+    repo = "agent";
+    rev = version;
+    sha256 = "0b59ij9c7hv2p4jx96f3acbygw27wiv8cfzzg6sg73l6k244k6l6";
+  };
+
+  depsSha256 = "1f94j54pg94f2x2lmmyj8dlki8plq6vnppmf3hzk3kd0rp7fzban";
+
+  buildInputs = [ openssl zeromq czmq zlib ];
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
+  meta = with lib; {
+    description = "Authentication client/server for Intecture components";
+    homepage = https://intecture.io;
+    license = licenses.mpl20;
+    maintainers = [ maintainers.rushmorem ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bed76a142f3..622201ac10d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2301,6 +2301,8 @@ with pkgs;
 
   innoextract = callPackage ../tools/archivers/innoextract { };
 
+  intecture-agent = callPackage ../tools/admin/intecture/agent.nix { };
+
   intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };
 
   intecture-cli = callPackage ../tools/admin/intecture/cli.nix { };

From 798e0f50f4dd6d26da285a851d1cd08665f60ae5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 18 Feb 2017 19:21:11 -0600
Subject: [PATCH 0675/3449] creduce: Use wrapper instead of
 propagatedUserEnvPkgs

Friendlier when installed,
fixes execution outside of NixOS.
---
 pkgs/development/tools/misc/creduce/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index a9296adf3343..d768f68576c5 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchurl, cmake, makeWrapper
 , llvm, clang-unwrapped
 , flex
 , zlib
@@ -21,9 +21,10 @@ stdenv.mkDerivation rec {
     # Ensure stdenv's CC is on PATH before clang-unwrapped
     stdenv.cc
     # Actual deps:
-    cmake
+    cmake makeWrapper
     llvm clang-unwrapped
     flex zlib
+    perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey
   ];
 
   # On Linux, c-reduce's preferred way to reason about
@@ -34,15 +35,13 @@ stdenv.mkDerivation rec {
       lscpu ${utillinux}/bin/lscpu
   '';
 
-  perlDeps = [
-    perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey
-  ];
-
-  propagatedNativeBuildInputs = perlDeps;
-  propagatedUserEnvPkgs = perlDeps;
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    wrapProgram $out/bin/creduce --prefix PERL5LIB : "$PERL5LIB"
+  '';
+
   meta = with stdenv.lib; {
     description = "A C program reducer";
     homepage = "https://embed.cs.utah.edu/creduce";

From 326fa70896d3184c628676510654144c5c68ef9b Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <Kendos-Kenlen@users.noreply.github.com>
Date: Sun, 19 Feb 2017 03:10:50 +0100
Subject: [PATCH 0676/3449] idea.webstorm: 2016.3.2 -> 2016.3.3

---
 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 12ca97e12c57..2ed8e505d46e 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.2";
+    version = "2016.3.3";
     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 = "1h3kjvd10j48n9ch2ldqjsizq5n8gkm0vrrvznayc1bz2kjvhavn";
+      sha256 = "08f266afi8ia5jvvgk2lncra2n3i0l5c3h7c8fwxz6y8fhhlas4y";
     };
     wmClass = "jetbrains-webstorm";
   };

From 1973a2953681490e4a9b0be4c9da1ac869a475c0 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Sat, 18 Feb 2017 00:50:28 +0530
Subject: [PATCH 0677/3449] envconsul: init at 0.6.2

---
 pkgs/tools/system/envconsul/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/system/envconsul/default.nix

diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix
new file mode 100644
index 000000000000..fcc3f217d64b
--- /dev/null
+++ b/pkgs/tools/system/envconsul/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "envconsul-${version}";
+  version = "0.6.2";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/hashicorp/envconsul";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "hashicorp";
+    repo = "envconsul";
+    sha256 = "176jbicyg7vwd0kgawz859gq7ldrxyw1gx55wig7azakiidkl731";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/hashicorp/envconsul/;
+    description = "Read and set environmental variables for processes from Consul";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ pradeepchhetri ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d136fd7dfb52..c35dbd93ec2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -856,6 +856,8 @@ with pkgs;
 
   ent = callPackage ../tools/misc/ent { };
 
+  envconsul = callPackage ../tools/system/envconsul { };
+
   f3 = callPackage ../tools/filesystems/f3 { };
 
   facter = callPackage ../tools/system/facter {

From 4f0feb4f5f2f4662a075f015d9675b25865b3ae9 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sat, 18 Feb 2017 22:57:45 +0100
Subject: [PATCH 0678/3449] ocaml-logs: init at 0.6.2

---
 .../ocaml-modules/logs/default.nix            | 40 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/logs/default.nix

diff --git a/pkgs/development/ocaml-modules/logs/default.nix b/pkgs/development/ocaml-modules/logs/default.nix
new file mode 100644
index 000000000000..ab0b6c8579bd
--- /dev/null
+++ b/pkgs/development/ocaml-modules/logs/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam
+, topkg, result, lwt, cmdliner, fmt }:
+let
+  pname = "logs";
+  webpage = "http://erratique.ch/software/${pname}";
+in
+
+assert stdenv.lib.versionAtLeast ocaml.version "4.01.0";
+
+stdenv.mkDerivation rec {
+  name = "ocaml-${pname}-${version}";
+  version = "0.6.2";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "1khbn7jqpid83zn8rvyh1x1sirls7zc878zj4fz985m5xlsfy853";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg fmt cmdliner lwt ];
+  propagatedBuildInputs = [ result ];
+
+  buildPhase = ''
+    ocaml -I ${findlib}/lib/ocaml/${ocaml.version}/site-lib/ pkg/pkg.ml build \
+      --with-js_of_ocaml false
+    '';
+
+  inherit (topkg) installPhase;
+
+  createFindlibDestdir = true;
+
+  meta = with stdenv.lib; {
+    description = "Logging infrastructure for OCaml";
+    homepage = "${webpage}";
+    inherit (ocaml.meta) platforms;
+    maintainers = [ maintainers.sternenseemann ];
+    license = licenses.isc;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 941b8ebd65de..615268e3778e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -257,6 +257,10 @@ let
       llvm = pkgs.llvm_37;
     };
 
+    logs = callPackage ../development/ocaml-modules/logs {
+      lwt = ocaml_lwt;
+    };
+
     macaque = callPackage ../development/ocaml-modules/macaque { };
 
     magic-mime = callPackage ../development/ocaml-modules/magic-mime { };

From 44820907afab52221ac7db20bf6e115ee42a927a Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sat, 18 Feb 2017 22:52:46 +0100
Subject: [PATCH 0679/3449] ocaml-ezjsonm: 0.4.1 -> 0.4.3

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

diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix
index 4d63b0c3f95f..44d8ce393fbd 100644
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib_p4, lwt }:
+{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }:
 
-let version = "0.4.1"; in
+let version = "0.4.3"; in
 
 stdenv.mkDerivation {
   name = "ocaml-ezjsonm-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz";
-    sha256 = "0cfjh8awajvw6kkmxr65dvri4k6h29pynxvk76a8c2lkixpsc095";
+    sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls";
   };
 
-  buildInputs = [ ocaml findlib ];
-  propagatedBuildInputs = [ jsonm hex sexplib_p4 lwt ];
+  buildInputs = [ ocaml findlib lwt ];
+  propagatedBuildInputs = [ jsonm hex sexplib ];
   createFindlibDestdir = true;
 
   configureFlags = "--enable-lwt";

From b322271dd653b477fd400a269d6e7ba6c9afb91a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 19 Feb 2017 11:35:31 +0300
Subject: [PATCH 0680/3449] pythonPackages.webassets: 0.12 -> 0.12.1

Fixes #22965
---
 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 335d7e9c62d3..b0fffe2dc489 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26784,11 +26784,11 @@ EOF
 
   webassets = buildPythonPackage rec {
     name = "webassets-${version}";
-    version = "0.12.0";
+    version = "0.12.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/w/webassets/${name}.tar.gz";
-      sha256 = "14m13xa5sc7iqq2j1wsd2klcwaihqlhz2l9lmn92dks2yc8hplcr";
+      sha256 = "1nrqkpb7z46h2b77xafxihqv3322cwqv6293ngaky4j3ff4cing7";
     };
 
     buildInputs = with self; [ nose jinja2 mock pytest ];

From 362ef377c8e5314902c313fbc1d40efabd0c9406 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 19 Feb 2017 11:53:23 +0300
Subject: [PATCH 0681/3449] nvidia_x11.settings: link dlopen'ed libraries

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

diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index de60c9ccf4f1..d088fe5253c0 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -1,6 +1,6 @@
 nvidia_x11: sha256:
 
-{ stdenv, lib, fetchurl, pkgconfig, m4, gtk2, gtk3, libXv, libvdpau
+{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau
 , withGtk2 ? false, withGtk3 ? true
 }:
 
@@ -15,8 +15,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig m4 ];
 
-  buildInputs = [ gtk2 gtk3 libXv libvdpau ];
+  buildInputs = [ jansson gtk2 gtk3 libXv libXrandr libvdpau nvidia_x11 ];
 
+  NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];
+
+  makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
   installFlags = [ "PREFIX=$(out)" ];
 
   preBuild = ''
@@ -37,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib:${nvidia_x11}/lib" \
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib" \
       $out/bin/nvidia-settings
   '';
 

From 03617767646e6a8cb0d1d3e10afd1899afcddf05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 19 Feb 2017 09:56:31 +0100
Subject: [PATCH 0682/3449] pyroute2: 0.4.12 -> 0.4.13

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

diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 7fb7b7f5e685..91bfa97cb970 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, buildPythonPackage, fetchurl}:
 
 buildPythonPackage rec {
-  name = "pyroute2-0.4.12";
+  name = "pyroute2-0.4.13";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "0csp6y38pgswhn46rivdgrlqw99dpjzwa0g32h6iiaj12n2f9qlq";
+    sha256 = "0f8a1ihxc1r78m6dqwhks2vdp4vwwbw72mbv88v70qmkb0pxgwwk";
   };
 
   # requires root priviledges

From 9ed2846e046db0a896145fdee64f22e810a92c90 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 18 Feb 2017 23:30:24 +0100
Subject: [PATCH 0683/3449] grub module: add extraInitrd option

---
 nixos/modules/system/boot/loader/grub/grub.nix    | 15 ++++++++++++++-
 .../system/boot/loader/grub/install-grub.pl       | 14 ++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 23b970186a39..5ab2d0775518 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -54,7 +54,7 @@ let
       inherit (efi) canTouchEfiVariables;
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber
-        extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
+        extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels
         default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios;
       path = (makeBinPath ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
@@ -267,6 +267,19 @@ in
         '';
       };
 
+      extraInitrd = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/boot/extra_initrafms.gz";
+        description = ''
+          The path to a second initramfs to be supplied to the kernel.
+          This ramfs will not be copied to the store, so that it can
+          contain secrets such as LUKS keyfiles or ssh keys.
+          This implies that rolling back to a previous configuration
+          won't rollback the state of this file.
+        '';
+      };
+
       useOSProber = mkOption {
         default = false;
         type = types.bool;
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index c9a51288747b..c7559cd634a2 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -49,6 +49,7 @@ my $extraPrepareConfig = get("extraPrepareConfig");
 my $extraPerEntryConfig = get("extraPerEntryConfig");
 my $extraEntries = get("extraEntries");
 my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true";
+my $extraInitrd = get("extraInitrd");
 my $splashImage = get("splashImage");
 my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
@@ -226,6 +227,13 @@ my $grubStore;
 if ($copyKernels == 0) {
     $grubStore = GrubFs($storePath);
 }
+my $extraInitrdPath;
+if ($extraInitrd) {
+    if (! -f $extraInitrd) {
+        print STDERR "Warning: the specified extraInitrd " . $extraInitrd . " doesn't exist. Your system won't boot without it.\n";
+    }
+    $extraInitrdPath = GrubFs($extraInitrd);
+}
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
@@ -336,6 +344,9 @@ sub addEntry {
 
     my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
     my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd"));
+    if ($extraInitrd) {
+        $initrd .= " " .$extraInitrdPath->path;
+    }
     my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef;
 
     # FIXME: $confName
@@ -358,6 +369,9 @@ sub addEntry {
         if ($copyKernels == 0) {
             $conf .= $grubStore->search . "\n";
         }
+        if ($extraInitrd) {
+            $conf .= $extraInitrdPath->search . "\n";
+        }
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";

From 785fbfac65b66ff4cef32525c7a6cb2b1c9e58c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 19 Feb 2017 11:34:21 +0100
Subject: [PATCH 0684/3449] haskell: add nix-specific fixes for various
 packages in stackage"

This reverts commit fd0e0cdc761d1edb0f02b0f5d2d04f557d06711b.

http-streams test suite is no longer broken, but still needs to be
disabled due to cyclic dependencies (http-streams(test) -> snap ->
http-streams)
---
 .../haskell-modules/configuration-common.nix  | 28 ++-------
 .../haskell-modules/configuration-nix.nix     | 60 ++++++++++++++++++-
 2 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a2b4c375212d..48fb3e172ac9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -41,6 +41,9 @@ self: super: {
   nanospec = dontCheck super.nanospec;
   options = dontCheck super.options;
   statistics = dontCheck super.statistics;
+  http-streams = dontCheck super.http-streams;
+
+  # segfault due to missing return: https://github.com/haskell/c2hs/pull/184
   c2hs = dontCheck super.c2hs;
 
   # This test keeps being aborted because it runs too quietly for too long
@@ -228,7 +231,6 @@ self: super: {
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
-  hapistrano = dontCheck super.hapistrano;
   HerbiePlugin = dontCheck super.HerbiePlugin;
   wai-cors = dontCheck super.wai-cors;
 
@@ -278,7 +280,6 @@ self: super: {
   dotfs = dontCheck super.dotfs;                        # http://hydra.cryp.to/build/498599/log/raw
   DRBG = dontCheck super.DRBG;                          # http://hydra.cryp.to/build/498245/nixlog/1/raw
   ed25519 = dontCheck super.ed25519;
-  either-unwrap = dontCheck super.either-unwrap;        # http://hydra.cryp.to/build/498782/log/raw
   etcd = dontCheck super.etcd;
   fb = dontCheck super.fb;                              # needs credentials for Facebook
   fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
@@ -307,7 +308,6 @@ self: super: {
   hi = dontCheck super.hi;
   hierarchical-clustering = dontCheck super.hierarchical-clustering;
   hmatrix-tests = dontCheck super.hmatrix-tests;
-  hPDB-examples = dontCheck super.hPDB-examples;
   hquery = dontCheck super.hquery;
   hs2048 = dontCheck super.hs2048;
   hsbencher = dontCheck super.hsbencher;
@@ -427,9 +427,6 @@ self: super: {
   # https://github.com/NixOS/nixpkgs/issues/6350
   paypal-adaptive-hoops = overrideCabal super.paypal-adaptive-hoops (drv: { testTarget = "local"; });
 
-  # https://github.com/afcowie/http-streams/issues/80
-  http-streams = dontCheck super.http-streams;
-
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
@@ -451,9 +448,6 @@ self: super: {
   apiary-session = dontCheck super.apiary-session;
   apiary-websockets = dontCheck super.apiary-websockets;
 
-  # https://github.com/alephcloud/hs-configuration-tools/issues/40
-  configuration-tools = dontCheck super.configuration-tools;
-
   # HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
   unlambda = dontHyperlinkSource super.unlambda;
 
@@ -695,13 +689,6 @@ self: super: {
   cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
   pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
 
-  # Fix tests which would otherwise fail with "Couldn't launch intero process."
-  intero = overrideCabal super.intero (drv: {
-    postPatch = (drv.postPatch or "") + ''
-      substituteInPlace src/test/Main.hs --replace "\"intero\"" "\"$PWD/dist/build/intero/intero\""
-    '';
-  });
-
   # https://github.com/commercialhaskell/stack/issues/3001
   stack = doJailbreak super.stack;
 
@@ -736,14 +723,7 @@ self: super: {
   });
 
   # test suite cannot find its own "idris" binary
-  idris = overrideCabal super.idris (drv: {
-    # "idris" binary cannot find Idris library otherwise while building. After
-    # installing it's completely fine though. This seems like a bug in Idris
-    # that's related to builds with shared libraries enabled. It would be great
-    # if someone who knows a thing or two about Idris could look into this.
-    preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH";
-    doCheck = false;
-  });
+  idris = dontCheck super.idris;
 
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index bd74e0e6e04d..c62d2702b44e 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -167,6 +167,13 @@ self: super: builtins.intersectAttrs super {
   http-client-tls = dontCheck super.http-client-tls;
   http-conduit = dontCheck super.http-conduit;
   transient-universe = dontCheck super.transient-universe;
+  typed-process = dontCheck super.typed-process;
+  js-jquery = dontCheck super.js-jquery;
+  hPDB-examples = dontCheck super.hPDB-examples;
+  configuration-tools = dontCheck super.configuration-tools; # https://github.com/alephcloud/hs-configuration-tools/issues/40
+  tcp-streams = dontCheck super.tcp-streams;
+  holy-project = dontCheck super.holy-project;
+  mustache = dontCheck super.mustache;
 
   # Tries to mess with extended POSIX attributes, but can't in our chroot environment.
   xattr = dontCheck super.xattr;
@@ -378,13 +385,62 @@ self: super: builtins.intersectAttrs super {
   idris = overrideCabal super.idris (drv: {
     # https://github.com/idris-lang/Idris-dev/issues/2499
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp];
+
+    # tests and build run executable, so need to set LD_LIBRARY_PATH
+    preBuild = ''
+      export LD_LIBRARY_PATH="$PWD/dist/build:$LD_LIBRARY_PATH"
+    '';
   });
 
   libsystemd-journal = overrideCabal super.libsystemd-journal (old: {
     librarySystemDepends = old.librarySystemDepends or [] ++ [ pkgs.systemd ];
   });
 
-  # Needs network in tests.
-  typed-process = dontCheck super.typed-process;
+  # does not specify tests in cabal file, instead has custom runTest cabal hook,
+  # so cabal2nix will not detect test dependencies.
+  either-unwrap = overrideCabal super.either-unwrap (drv: {
+    testHaskellDepends = (drv.testHaskellDepends or []) ++ [ self.test-framework self.test-framework-hunit ];
+  });
 
+  hidapi = addExtraLibrary super.hidapi pkgs.libudev;
+
+  hs-GeoIP = super.hs-GeoIP.override { GeoIP = pkgs.geoipWithDatabase; };
+
+  discount = super.discount.override { markdown = pkgs.discount; };
+
+  # tests require working stack installation with all-cabal-hashes cloned in $HOME
+  stackage-curator = dontCheck super.stackage-curator;
+
+  # hardcodes /usr/bin/tr: https://github.com/snapframework/io-streams/pull/59
+  io-streams = enableCabalFlag super.io-streams "NoInteractiveTests";
+
+  # requires autotools to build
+  secp256k1 = addBuildTools super.secp256k1 [ pkgs.autoconf pkgs.automake pkgs.libtool ];
+
+  # tests require git
+  hapistrano = addBuildTool super.hapistrano pkgs.git;
+
+  # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
+  gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
+  gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
+
+  # requires valid, writeable $HOME
+  hatex-guide = overrideCabal super.hatex-guide (drv: {
+    preConfigure = ''
+      ${drv.preConfigure or ""}
+      export HOME=$PWD
+    '';
+  });
+
+  # Fails to link against with newer gsl versions because a deprecrated function
+  # was removed
+  hmatrix-gsl = super.hmatrix-gsl.override { gsl = pkgs.gsl_1; };
+
+  # tests run executable, relying on PATH
+  # without this, tests fail with "Couldn't launch intero process"
+  intero = overrideCabal super.intero (drv: {
+    preCheck = ''
+      export PATH="$PWD/dist/build/intero:$PATH"
+    '';
+  });
 }

From 27395d33fba08f4352edd3e2601b3aa9316bfdfc Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 07:45:37 -0300
Subject: [PATCH 0685/3449] lxqt-build-tools: init at 0.3.2

---
 .../lxqt/base/lxqt-build-tools/default.nix    | 23 +++++++++++++++++++
 pkgs/desktops/lxqt/default.nix                |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix

diff --git a/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
new file mode 100644
index 000000000000..f8db33bc5a4d
--- /dev/null
+++ b/pkgs/desktops/lxqt/base/lxqt-build-tools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "lxqt-build-tools-${version}";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "lxqt-build-tools";
+    rev = version;
+    sha256 = "1awd70ifbbi67pklhldjw968c1fw1lcif9nh4qbrjqmlg1gn3kmv";
+  };
+
+  nativeBuildInputs = [ cmake qt5.qtbase ];
+
+  meta = with stdenv.lib; {
+    description = "Various packaging tools and scripts for LXQt applications";
+    homepage = https://github.com/lxde/lxqt-build-tools;
+    license = licenses.lgpl21;
+    platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
+  };
+}
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index d5f5194c48e4..3cd8fdf22123 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -28,6 +28,7 @@ let
 
     ### BASE
     libqtxdg = callPackage ./base/libqtxdg { };
+    lxqt-build-tools = callPackage ./base/lxqt-build-tools { };
     libsysstat = callPackage ./base/libsysstat { };
     liblxqt = callPackage ./base/liblxqt { };
 

From e6472f136001d4ee355a24c902a8774a6ee991eb Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 07:55:45 -0300
Subject: [PATCH 0686/3449] libsysstat: 0.3.2 -> 0.3.3

---
 pkgs/desktops/lxqt/base/libsysstat/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix
index 363b3d33d141..2776a53fa833 100644
--- a/pkgs/desktops/lxqt/base/libsysstat/default.nix
+++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, qt5 }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
 
 stdenv.mkDerivation rec {
   name = "libsysstat-${version}";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "libsysstat";
     rev = version;
-    sha256 = "1swpnz37daj3njkbqddmhaiipfl335c3g675y9afhabg7l4anf1n";
+    sha256 = "1rkbh6jj69wsf8a7w7cq8psqw08vqf9rq5pdnv4xxqb036r4bi31";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake lxqt.lxqt-build-tools ];
 
   buildInputs = [ qt5.qtbase ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "Library used to query system info and statistics";
     homepage = https://github.com/lxde/libsysstat;
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From d2a4a84f00019596006cf218df9f8b143c7d624d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 19 Feb 2017 11:57:24 +0100
Subject: [PATCH 0687/3449] ocamlPackages.uri: 1.9.1 -> 1.9.2

The old version is also kept, under the attribute `uri_p4`.
It is built against `sexplib` version prior to 113.33 and needed by `trv`.
---
 .../ocaml-modules/cohttp/default.nix          |  4 +--
 .../ocaml-modules/conduit/default.nix         |  4 +--
 .../development/ocaml-modules/uri/default.nix | 27 ++++++++++++++-----
 pkgs/top-level/ocaml-packages.nix             |  3 +++
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix
index 5a22e37d8213..99f101010f3e 100644
--- a/pkgs/development/ocaml-modules/cohttp/default.nix
+++ b/pkgs/development/ocaml-modules/cohttp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri, fieldslib_p4
+{ stdenv, buildOcaml, fetchurl, ocaml, cmdliner, re, uri_p4, fieldslib_p4
 , sexplib_p4, conduit , stringext, base64, magic-mime, ounit, alcotest
 , asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
 , lwt ? null, async_p4 ? null, async_ssl_p4 ? null
@@ -17,7 +17,7 @@ buildOcaml rec {
 
   buildInputs = [ alcotest cmdliner conduit magic-mime ounit lwt ]
   ++ stdenv.lib.optionals asyncSupport [ async_p4 async_ssl_p4 ];
-  propagatedBuildInputs = [ re stringext uri fieldslib_p4 sexplib_p4 base64 ];
+  propagatedBuildInputs = [ re stringext uri_p4 fieldslib_p4 sexplib_p4 base64 ];
 
   buildFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index afe44ea0a7f6..22c74d7f92e5 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri, cstruct, ipaddr
+{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr
 , asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
 , async_p4 ? null, async_ssl_p4 ? null, lwt ? null
 }:
@@ -12,7 +12,7 @@ buildOcaml rec {
     sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
   };
 
-  propagatedBuildInputs = [ sexplib_p4 stringext uri cstruct ipaddr ];
+  propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr ];
   buildInputs = stdenv.lib.optional (lwt != null) lwt
              ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
              ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index a6335274f737..c7d991504ec9 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -1,19 +1,32 @@
-{ stdenv, fetchzip, ocaml, findlib, re, sexplib_p4, stringext, ounit }:
+{ stdenv, fetchzip, ocaml, findlib, re, stringext, ounit
+, sexplib, ppx_sexp_conv
+, legacyVersion ? false
+, sexplib_p4
+}:
 
-assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4";
+assert stdenv.lib.versionAtLeast ocaml.version "4";
 
-let version = "1.9.1"; in
+with
+  if legacyVersion
+  then {
+    version = "1.9.1";
+    sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85";
+  } else {
+    version = "1.9.2";
+    sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx";
+  };
 
 stdenv.mkDerivation {
-  name = "ocaml-uri-${version}";
+  name = "ocaml${ocaml.version}-uri-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz";
-    sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85";
+    inherit sha256;
   };
 
-  buildInputs = [ ocaml findlib ounit ];
-  propagatedBuildInputs = [ re sexplib_p4 stringext ];
+  buildInputs = [ ocaml findlib ounit ]
+  ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv;
+  propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ];
 
   configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests";
   buildPhase = ''
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 615268e3778e..41cf8306992b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -510,6 +510,9 @@ let
     uunf = callPackage ../development/ocaml-modules/uunf { };
 
     uri = callPackage ../development/ocaml-modules/uri { };
+    uri_p4 = callPackage ../development/ocaml-modules/uri {
+      legacyVersion = true;
+    };
 
     uuseg = callPackage ../development/ocaml-modules/uuseg { };
     uutf = callPackage ../development/ocaml-modules/uutf { };

From 2070627040ab1e02abc503c21a59f4e2a79bff88 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 08:02:25 -0300
Subject: [PATCH 0688/3449] liblxqt: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/base/liblxqt/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
index b973940b9b63..2d4faee5cf33 100644
--- a/pkgs/desktops/lxqt/base/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -3,17 +3,18 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "liblxqt";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "12gla3pdg0n28w15qrmha83xm3021xdby8ydwp1qzcips5pa5zac";
+    sha256 = "0dcsgj0qr4589wsibs6fdza4ncqavrhykd05d25rs78pa94lvvh5";
   };
 
   nativeBuildInputs = [
     cmake
+    lxqt.lxqt-build-tools
   ];
 
   buildInputs = [
@@ -38,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Core utility library for all LXQt components";
     homepage = https://github.com/lxde/liblxqt;
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From f1e7a60b168b52c4705366ddf52aaf0c2db539fa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 19 Feb 2017 12:11:52 +0100
Subject: [PATCH 0689/3449] dnsutils: +sigchase support for dig

Fixes #10728, closes #22989.
The dnsutils output got ~60kiB bigger, and I see no extra runtime deps.
---
 pkgs/servers/dns/bind/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 0741603b3ec6..2f8bdd06bf1d 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl libtool perl libxml2 ] ++
     stdenv.lib.optional stdenv.isLinux libseccomp;
 
+  STD_CDEFINES = [ "-DDIG_SIGCHASE=1" ]; # support +sigchase
+
   configureFlags = [
     "--localstatedir=/var"
     "--with-libtool"

From bed2f5c4a69d852b0c44a0e08183c90eabcf89ec Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 08:13:36 -0300
Subject: [PATCH 0690/3449] compton-conf: 0.2.0 -> 0.2.1

---
 .../lxqt/optional/compton-conf/default.nix      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index 45717fe31e20..c25ee10bd255 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -3,25 +3,24 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "compton-conf";
-  version = "0.2.0";
+  version = "0.2.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "04svxawa8l0ciflrspkzi13nnl7bljmfwwrgxn5lb3sw6qdcmdlk";
+    sha256 = "1hmirhsz010h6a6k7my1krh5nw5ds4x00c5fq6apamrdd8d4zrmq";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
     qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
     libconfig
   ];
 
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "GUI configuration tool for compton X composite manager";
     homepage = https://github.com/lxde/compton-conf;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From a452714799b36fae4c34e7167122d2b26ff07747 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sat, 18 Feb 2017 22:58:29 +0100
Subject: [PATCH 0691/3449] ocaml-cow: init at 2.2.0

---
 .../development/ocaml-modules/cow/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/cow/default.nix

diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix
new file mode 100644
index 000000000000..eaf07818aeb9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cow/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib
+, ocamlbuild, topkg, opam
+, uri, xmlm, omd, ezjsonm }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.0";
+  name = "ocaml-cow-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "mirage";
+    repo   = "ocaml-cow";
+    rev    = "v${version}";
+    sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2";
+  };
+
+  createFindlibDestdir = true;
+
+  buildInputs = [ ocaml opam ocamlbuild findlib topkg ];
+  propagatedBuildInputs = [ xmlm uri ezjsonm omd ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = with stdenv.lib; {
+    description = "Caml on the Web";
+    longDescription = ''
+      Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code.
+    '';
+    license = licenses.isc;
+    maintainers = [ maintainers.sternenseemann ];
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 41cf8306992b..2dd913864a47 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -132,6 +132,8 @@ let
 
     containers = callPackage ../development/ocaml-modules/containers { };
 
+    cow = callPackage ../development/ocaml-modules/cow { };
+
     cpdf = callPackage ../development/ocaml-modules/cpdf { };
 
     cppo = callPackage ../development/tools/ocaml/cppo { };

From 160b9539f4cf668f85ec40ba02909c63368b7541 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 08:23:38 -0300
Subject: [PATCH 0692/3449] libfm-qt: 0.11.1 -> 0.11.2

---
 pkgs/desktops/lxqt/core/libfm-qt/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
index 71b6cff5899e..4c7ecbc1804d 100644
--- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -4,29 +4,24 @@ libfm, menu-cache }:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "libfm-qt";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1kgvzjsa4ihlj2clz6y6s95nq0lhg66d1dhkgw3mdqaak7d0pdiz";
+    sha256 = "0k2g6bkz7bvawqkjzykbxi18wqsnhbxklqy6aqqkclpzcw45vk5v";
   };
 
   nativeBuildInputs = [
     cmake
     pkgconfig
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    lxqt.lxqt-build-tools
   ];
 
   buildInputs = [
     qt5.qtx11extras
     qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    xorg.libpthreadstubs
-    xorg.libXdmcp
     libfm
     menu-cache
   ];
@@ -37,7 +32,7 @@ stdenv.mkDerivation rec {
     description = "Core library of PCManFM-Qt (Qt binding for libfm)";
     homepage = https://github.com/lxde/libfm-qt;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 9016be45891fba34f4a29979ec0526d95be17933 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sun, 19 Feb 2017 12:25:33 +0100
Subject: [PATCH 0693/3449] qtikz: update to Qt5; remove ktikz

---
 pkgs/applications/graphics/ktikz/default.nix | 116 +++++++++----------
 pkgs/top-level/all-packages.nix              |   7 +-
 2 files changed, 55 insertions(+), 68 deletions(-)

diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index e351534f9e6a..5d0bbcad54fd 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -1,78 +1,70 @@
-{ withKDE ? true
-, stdenv, fetchurl, gettext, poppler_qt4, qt4
-# Qt only (no KDE):
-, pkgconfig
-# With KDE
-, cmake, automoc4, kdelibs
-}:
+{ stdenv, fetchFromGitHub, gettext, poppler_qt5, qt5 , pkgconfig }:
 
-# Warning: You will also need a working pdflatex installation containing (at
-# least) auctex and pgf.
+# Warning: You will also need a working pdflatex installation containing
+# at least auctex and pgf.
 
-assert withKDE -> kdelibs != null;
+# This package only builds ktikz without KDE integration because KDE4 is
+# deprecated and upstream does not (yet ?) support KDE5.
+# See historical versions of this file for building ktikz with KDE4.
 
-let
-  version = "0.10";
+stdenv.mkDerivation rec {
+  version = "unstable-20161122";
+  name = "qtikz-${version}";
 
-  qtikz = {
-    name = "qtikz-${version}";
+  src = fetchFromGitHub {
+    owner = "fhackenberger";
+    repo = "ktikz";
+    rev = "be66c8b1ff7e6b791b65af65e83c4926f307cf5a";
+    sha256 = "15jx53sjlnky4yg3ry1i1c29g28v1jbbvhbz66h7a49pfxa40fj3";
+  };
 
-    conf = ''
-      # installation prefix:
-      #PREFIX = ""
+  meta = with stdenv.lib; {
+    description = "Editor for the TikZ language";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.layus ];
+  };
 
-      # install desktop file here (*nix only):
-      DESKTOPDIR = ''$''${PREFIX}/share/applications
+  conf = ''
+    # installation prefix:
+    PREFIX = @out@
 
-      # install mimetype here:
-      MIMEDIR = ''$''${PREFIX}/share/mime/packages
+    # install desktop file here (*nix only):
+    DESKTOP_INSTALL_DIR = @out@/share/applications
 
-      CONFIG -= debug
-      CONFIG += release
+    # install mimetype here:
+    MIME_INSTALL_DIR = @out@/share/mime/packages
 
-      # qmake command:
-      QMAKECOMMAND = qmake
-      # lrelease command:
-      LRELEASECOMMAND = lrelease
-      # qcollectiongenerator command:
-      #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator
+    # install doc here:
+    MAN_INSTALL_DIR = @out@/share/man
 
-      # TikZ documentation default file path:
-      TIKZ_DOCUMENTATION_DEFAULT = ''$''${PREFIX}/share/doc/texmf/pgf/pgfmanual.pdf.gz
-    '';
+    CONFIG -= debug
+    CONFIG += release
 
-    patchPhase = ''
-      echo "$conf" > conf.pri
-    '';
+    # qmake command:
+    QMAKECOMMAND = qmake
+    # lrelease command:
+    LRELEASECOMMAND = lrelease
+    # qcollectiongenerator command:
+    #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator
 
-    configurePhase = ''
+    # TikZ documentation default file path:
+    TIKZ_DOCUMENTATION_DEFAULT = @out@/share/doc/texmf/pgf/pgfmanual.pdf.gz
+  '';
+
+  # 1. Configuration is done by overwriting qtikzconfig.pri
+  # 2. Recent Qt removed QString::fromAscii in favor of QString::fromLatin1
+  patchPhase = ''
+    echo "$conf" | sed "s!@out@!$out!g" > qmake/qtikzconfig.pri
+    find -name "*.cpp" -exec sed -i s/fromAscii/fromLatin1/g "{}" \;
+  '';
+
+  configurePhase = ''
       qmake PREFIX="$out" ./qtikz.pro
-    '';
+  '';
 
-    buildInputs = [ gettext qt4 poppler_qt4 pkgconfig ];
-  };
+  buildInputs = [ gettext qt5.full poppler_qt5 pkgconfig ];
 
-  ktikz = {
-    name = "ktikz-${version}";
-    buildInputs = [ kdelibs cmake qt4 automoc4 gettext poppler_qt4 ];
-  };
-
-  common = {
-    inherit version;
-    src = fetchurl {
-      url = "http://www.hackenberger.at/ktikz/ktikz_${version}.tar.gz";
-      sha256 = "19jl49r7dw3vb3hg52man8p2lszh71pvnx7d0xawyyi0x6r8ml9i";
-    };
-
-    enableParallelBuilding = true;
-
-    meta = with stdenv.lib; {
-      description = "Editor for the TikZ language";
-      license = licenses.gpl2;
-      platforms = platforms.linux;
-      maintainers = [ maintainers.layus ];
-    };
-  };
-
-in stdenv.mkDerivation (common // (if withKDE then ktikz else qtikz))
+  enableParallelBuilding = true;
+}
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1385be2c99f0..a106074e97b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3568,10 +3568,7 @@ with pkgs;
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
-  qtikz = callPackage ../applications/graphics/ktikz {
-    withKDE = false;
-    kdelibs = null;
-  };
+  qtikz = callPackage ../applications/graphics/ktikz { };
 
   quicktun = callPackage ../tools/networking/quicktun { };
 
@@ -16711,8 +16708,6 @@ with pkgs;
 
           konversation = callPackage ../applications/networking/irc/konversation { };
 
-          ktikz = callPackage ../applications/graphics/ktikz { };
-
           kvirc = callPackage ../applications/networking/irc/kvirc { };
 
           krename = callPackage ../applications/misc/krename/kde4.nix {

From 45aa578ee4ac86101533b447717d0eb38b5c07d1 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 08:34:30 -0300
Subject: [PATCH 0694/3449] lxqt-common: 0.11.0 -> 0.11.2

---
 .../desktops/lxqt/core/lxqt-common/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
index a4b8f000dc7b..cc114c31dfd5 100644
--- a/pkgs/desktops/lxqt/core/lxqt-common/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-common/default.nix
@@ -1,26 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, hicolor_icon_theme, xmessage }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt, hicolor_icon_theme, xmessage }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-common";
-  version = "0.11.0";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "14nx3zcknwsn713wdnmb2xl15vf21vh13kxscdwmfnd48m5j4m3b";
+    sha256 = "07ih2w9ksbxqwy36xvgb9b31740nhkm7ap70wvv8q6x0wyhn71gn";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
-    qt5.qtx11extras
-    qt5.qttools
     qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
     hicolor_icon_theme
     xmessage
   ];
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Common files for LXQt";
     homepage = https://github.com/lxde/lxqt-common;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 203e3c52924aade143174ee26a762247fbf19a92 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 19 Feb 2017 11:38:29 +0000
Subject: [PATCH 0695/3449] trv: fix the propagate build inputs

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

diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix
index e73d77f772df..c8747e66e39b 100644
--- a/pkgs/development/tools/misc/trv/default.nix
+++ b/pkgs/development/tools/misc/trv/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4
 , re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find
-, cohttp, conduit, magic-mime, uri, tzdata
+, cohttp, conduit, magic-mime, tzdata
 }:
 
 assert stdenv.lib.versionOlder "4.02" ocaml.version;
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
   };
 
 
-  buildInputs = [ ocaml findlib camlp4 conduit magic-mime ];
+  buildInputs = [ ocaml findlib camlp4 ];
   propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4
                             async_extra_p4 sexplib_p4 async_shell core_extended_p4
-                            async_find cohttp uri re2_p4 ];
+                            async_find cohttp conduit magic-mime re2_p4 ];
 
   createFindlibDestdir = true;
   dontStrip = true;

From ed798060e5dcf2a21e95ad5b42e40d09175f01db Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 08:39:19 -0300
Subject: [PATCH 0696/3449] lxqt-l10n: 0.11.0 -> 0.11.2

---
 pkgs/desktops/lxqt/core/lxqt-l10n/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
index 477575289bb1..b836b9776e65 100644
--- a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix
@@ -1,25 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
 
 stdenv.mkDerivation rec {
   name = "lxqt-l10n-${version}";
-  version = "0.11.0";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxqt-l10n";
     rev = version;
-    sha256 = "1gwismyjfdd7lwlgfl5jvbxmkbq9v9ia0shm4f7hkkvlpc2y24gk";
+    sha256 = "1vk4q98kraq0lba50n9z6jwiapc7nz2b143b4ldlmrz4wscd867h";
   };
 
   nativeBuildInputs = [
     cmake
-    qt5.qtbase
-    qt5.qtx11extras
     qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    lxqt.lxqt-build-tools
   ];
 
   postPatch = ''
@@ -31,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Translations of LXQt";
     homepage = https://github.com/lxde/lxqt-l10n;
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 6f9fec945ba5034f9a6cd418de874f9055eefd33 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 08:50:29 -0300
Subject: [PATCH 0697/3449] lxqt-qtplugin: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
index e0a95d23c4e1..49fa7c616335 100644
--- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-qtplugin";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "14bwi1c078arin025jcygz0db9nfr8qla9071ls17bbp4dh14vhx";
+    sha256 = "12hyw7rk3zx51n6g2bazlqv70xap0lygm9v21ibxgy1aw0j6iy02";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -20,8 +23,6 @@ stdenv.mkDerivation rec {
     qt5.qttools
     qt5.qtsvg
     qt5.libdbusmenu
-    kde5.kwindowsystem
-    lxqt.liblxqt
     lxqt.libqtxdg
   ];
 
@@ -33,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "LXQt Qt platform integration plugin";
     homepage = https://github.com/lxde/lxqt-qtplugin;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From eec3973004a231a1c5b3861914e3d6c1b8aec617 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 11:22:53 +0100
Subject: [PATCH 0698/3449] leo2: force ocaml-4.01

---
 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 622201ac10d0..f3dc7fbafe4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17223,7 +17223,8 @@ with pkgs;
   lean2 = callPackage ../applications/science/logic/lean2 {};
   lean3 = lean;
 
-  leo2 = callPackage ../applications/science/logic/leo2 {};
+  leo2 = callPackage ../applications/science/logic/leo2 {
+     ocaml = ocamlPackages_4_01_0.ocaml;};
 
   logisim = callPackage ../applications/science/logic/logisim {};
 

From 11e4fcf9413aff12dd4638bc098bfebeb936b2fb Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 11:27:10 +0100
Subject: [PATCH 0699/3449] ocamlPackages.llpp: only allow with ocaml-4.04

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

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 615268e3778e..750fb7324a4b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -695,7 +695,11 @@ let
 
     google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
-    llpp = callPackage ../applications/misc/llpp { };
+    llpp =
+      if lib.versionOlder "4.04" ocaml.version
+      then callPackage ../applications/misc/llpp { }
+      else null;
+
 
     monotoneViz = callPackage ../applications/version-management/monotone-viz {
       inherit (pkgs.gnome2) libgnomecanvas glib;

From 47cb2a9f3e43f004719245563742358fecd07fd4 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 11:41:09 +0100
Subject: [PATCH 0700/3449] monotone-viz: fix build with ocaml 4.02+

---
 pkgs/applications/version-management/monotone-viz/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
index 255192a91282..7b8b0598925e 100644
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   version = "1.0.2";
   name = "monotone-viz-${version}";
 
-  buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper];
+  buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper camlp4];
   src = fetchurl {
     url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
     sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";

From ad671eaba9a2031ceb0b752fa8bd78e7721008ad Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 11:41:33 +0100
Subject: [PATCH 0701/3449] mldonkey: force ocaml 4.01

---
 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 f3dc7fbafe4b..fc85cf0f835f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14214,7 +14214,9 @@ with pkgs;
 
   mjpg-streamer = callPackage ../applications/video/mjpg-streamer { };
 
-  mldonkey = callPackage ../applications/networking/p2p/mldonkey { };
+  mldonkey = callPackage ../applications/networking/p2p/mldonkey {
+    ocaml = ocamlPackages_4_01_0.ocaml;
+  };
 
   MMA = callPackage ../applications/audio/MMA { };
 

From e7953d20d25be0125e9bf981097ac6b2490fb08d Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 11:55:15 +0100
Subject: [PATCH 0702/3449] orpie: fix build with ocaml 4.02+

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

diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix
index b04f0f265000..b1df6378f1e9 100644
--- a/pkgs/applications/misc/orpie/default.nix
+++ b/pkgs/applications/misc/orpie/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0v9xgpcf186ni55rkmx008msyszw0ypd6rd98hgwpih8yv3pymfy";
   };
 
-  buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml ]);
+  buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]);
 
   meta = {
     homepage = http://pessimization.com/software/orpie/;

From ea68576b7a1cfb48b0a37f88f115746ebe23316b Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 11:55:33 +0100
Subject: [PATCH 0703/3449] satallax: force ocaml 4.01

---
 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 fc85cf0f835f..e0c3edad5f1f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17256,7 +17256,9 @@ with pkgs;
 
   proverif = callPackage ../applications/science/logic/proverif { };
 
-  satallax = callPackage ../applications/science/logic/satallax {};
+  satallax = callPackage ../applications/science/logic/satallax {
+    ocaml = ocamlPackages_4_01_0.ocaml;
+  };
 
   saw-tools = callPackage ../applications/science/logic/saw-tools {};
 

From b0d7d60fd4afb938fa92294c012f8ae2e5c80294 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 11:55:47 +0100
Subject: [PATCH 0704/3449] prooftree: force ocaml 4.01

---
 pkgs/top-level/ocaml-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 750fb7324a4b..aab1f31d68cf 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -723,7 +723,10 @@ let
       camlp5 = camlp5_transitional;
     };
 
-    prooftree = callPackage ../applications/science/logic/prooftree {
+    prooftree =
+      if lib.versionOlder "4.01" ocaml.version
+      then null
+      else callPackage ../applications/science/logic/prooftree {
       camlp5 = camlp5_transitional;
     };
   };

From 2f46fb2cba87f299c74e45bdd31b9a21d1a0a1fc Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 12:00:24 +0100
Subject: [PATCH 0705/3449] sks: fix build with ocaml 4.02+

---
 pkgs/servers/sks/default.nix    | 4 ++--
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index 9149f050655c..1d3b04565c86 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl }:
+{ stdenv, fetchFromBitbucket, ocaml, zlib, db48, perl, camlp4 }:
 
 stdenv.mkDerivation rec {
   name = "sks-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "00q5ma5rvl10rkc6cdw8d69bddgrmvy0ckqj3hbisy65l4idj2zm";
   };
 
-  buildInputs = [ ocaml zlib db48 perl ];
+  buildInputs = [ ocaml zlib db48 perl camlp4 ];
 
   makeFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0c3edad5f1f..84d8931c02e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3830,7 +3830,7 @@ with pkgs;
 
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
-  sks = callPackage ../servers/sks { };
+  sks = callPackage ../servers/sks { inherit (ocamlPackages) ocaml camlp4; };
 
   skydns = callPackage ../servers/skydns { };
 

From ba993ad506d50cd4826b5b4e5c8d070d405d3233 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 12:16:09 +0100
Subject: [PATCH 0706/3449] coccinelle: build with caml 4.01

---
 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 84d8931c02e6..ce4db54bbc2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6256,7 +6256,9 @@ with pkgs;
   # Does not actually depend on Qt 5
   extra-cmake-modules = qt5.ecmNoHooks;
 
-  coccinelle = callPackage ../development/tools/misc/coccinelle { };
+  coccinelle = callPackage ../development/tools/misc/coccinelle {
+    ocamlPackages = ocamlPackages_4_01_0;
+   };
 
   cpptest = callPackage ../development/libraries/cpptest { };
 

From 2a17b75fb1f41f58901746121214c3eb43e56e63 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 12:16:49 +0100
Subject: [PATCH 0707/3449] ocamlPackages.bitsring: associate ocaml versions
 with bitstring versions univocally

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

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index aab1f31d68cf..340ad8ff6cf2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -53,13 +53,10 @@ let
 
     bolt = callPackage ../development/ocaml-modules/bolt { };
 
-    bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
-    bitstring_git   = callPackage ../development/ocaml-modules/bitstring { };
-
     bitstring =
       if lib.versionOlder "4.02" ocaml.version
-      then bitstring_git
-      else bitstring_2_0_4;
+      then callPackage ../development/ocaml-modules/bitstring { }
+      else callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { };
 
     camlidl = callPackage ../development/tools/ocaml/camlidl { };
 

From 9d57f1ae9a392f7050b5acfa4decc4875caeb07d Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 15:01:44 +0100
Subject: [PATCH 0708/3449] frama-c: fix compilation with ocaml 4.02+

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

diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix
index a1239c6a1216..14efe29442bc 100644
--- a/pkgs/development/tools/analysis/frama-c/default.nix
+++ b/pkgs/development/tools/analysis/frama-c/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with ocamlPackages; [
     ncurses ocaml findlib alt-ergo ltl2ba ocamlgraph
-    lablgtk coq graphviz zarith why3 apron
+    lablgtk coq graphviz zarith why3 apron camlp4
   ];
 
 
@@ -56,13 +56,15 @@ stdenv.mkDerivation rec {
   patches = [ ./dynamic.diff ];
   postPatch = ''
     # strip absolute paths to /usr/bin
-    for file in ./configure ./share/Makefile.common ./src/*/configure; do
+    for file in ./configure ./share/Makefile.common ./src/*/configure; do #*/
       substituteInPlace $file  --replace '/usr/bin/' ""
     done
 
     substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba'
 
     cd ../why*
+
+    substituteInPlace ./Makefile.in --replace '-warn-error A' '-warn-error A-3'    
     substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c"
     substituteInPlace ./jc/jc_make.ml --replace ' why-dp '       " $out/bin/why-dp "
     substituteInPlace ./jc/jc_make.ml --replace "?= why@\n"      "?= $out/bin/why@\n"

From bf13a2cfc6923f6b7ca7d47b604bf2d152619f3a Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 15:03:20 +0100
Subject: [PATCH 0709/3449] ocamlPackages.camlimages_4_0: only build with ocaml
 4.01

---
 pkgs/top-level/ocaml-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 340ad8ff6cf2..659b9243b6eb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -96,7 +96,10 @@ let
     camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { };
     camomile = callPackage ../development/ocaml-modules/camomile { };
 
-    camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix {
+    camlimages_4_0 =
+      if lib.versionOlder "4.02" ocaml.version
+      then null
+      else callPackage ../development/ocaml-modules/camlimages/4.0.nix {
       libpng = pkgs.libpng12;
       giflib = pkgs.giflib_4_1;
     };

From ffe9343c750a38b0fb91a8f575af9e6fbf469539 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:02:17 -0300
Subject: [PATCH 0710/3449] obconf-qt: 0.11.0 -> 0.11.1

---
 .../lxqt/optional/obconf-qt/default.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
index 381c998616f5..36490b726e0f 100644
--- a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix
@@ -1,30 +1,30 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt,
-openbox, hicolor_icon_theme }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, openbox, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "obconf-qt";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1q3y4sc1kg3hw4869rx4g08y85rnvnxgk8rf8h6amkf5r5561iyk";
+    sha256 = "1w94g8jk2j9qrkwg3i6qwgai2sj1m657bbk2zlk9bc3qvzmwxwrc";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
     qt5.qttools
     qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
     xorg.libpthreadstubs
     xorg.libXdmcp
+    xorg.libSM
     openbox
     hicolor_icon_theme
   ];
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "The Qt port of obconf, the Openbox configuration tool";
     homepage = https://github.com/lxde/obconf-qt;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From cc9a50ec03e9eef8c6de9d70ab6b2e9e5f742229 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 16:01:30 +0100
Subject: [PATCH 0711/3449] virt-top: compile with ocaml 4.01

---
 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 ce4db54bbc2d..11ea168cd912 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15478,7 +15478,9 @@ with pkgs;
     spice_gtk = spice_gtk;
   };
 
-  virt-top = callPackage ../applications/virtualization/virt-top { };
+  virt-top = callPackage ../applications/virtualization/virt-top {
+    ocamlPackages = ocamlPackages_4_01_0;
+  };
 
   virtmanager = callPackage ../applications/virtualization/virt-manager {
     vte = gnome3.vte;

From f18ac15dcad7d07f6c9c31b049a45bba9cd77b2a Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 16:57:40 +0100
Subject: [PATCH 0712/3449] ocamlPackages.spacetime: only build with ocaml-4.04

---
 pkgs/top-level/ocaml-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 659b9243b6eb..146405c7bad9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -390,7 +390,10 @@ let
 
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
-    spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
+    spacetime_lib = if lib.versionOlder "4.04" ocaml.version then
+    callPackage ../development/tools/ocaml/ocamlbuild { }
+    else
+    null;
 
     sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
 

From 88dac94e3bc7be400dd6e22a27b4a5a300768f77 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Thu, 16 Feb 2017 16:58:05 +0100
Subject: [PATCH 0713/3449] switch ocamlPackages to 4.02

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

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 146405c7bad9..08c8d64a15e6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -759,5 +759,5 @@ in rec
 
   ocamlPackages_latest = ocamlPackages_4_04;
 
-  ocamlPackages = ocamlPackages_4_01_0;
+  ocamlPackages = ocamlPackages_4_02;
 }

From 6893d8a2fdc5dc609c6a4be97b87ba95ee6a0bcf Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 18 Feb 2017 14:57:51 +0100
Subject: [PATCH 0714/3449] llpp: move out of ocamlPackages

---
 pkgs/top-level/all-packages.nix   | 2 +-
 pkgs/top-level/ocaml-packages.nix | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11ea168cd912..22b63a492eea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14098,7 +14098,7 @@ with pkgs;
     bison = bison2;
   };
 
-  inherit (ocaml-ng.ocamlPackages_4_04) llpp;
+  llpp = ocaml-ng.ocamlPackages_4_04.callPackage ../applications/misc/llpp { };
 
   lmms = callPackage ../applications/audio/lmms { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 08c8d64a15e6..5f000099e142 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -698,11 +698,6 @@ let
 
     google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
-    llpp =
-      if lib.versionOlder "4.04" ocaml.version
-      then callPackage ../applications/misc/llpp { }
-      else null;
-
 
     monotoneViz = callPackage ../applications/version-management/monotone-viz {
       inherit (pkgs.gnome2) libgnomecanvas glib;

From 4c5f083d7016c737d321bbe8ac65adf73cc125ee Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 18 Feb 2017 18:10:00 +0100
Subject: [PATCH 0715/3449] prooftree: move out of ocamlPackages

---
 pkgs/top-level/all-packages.nix   | 5 ++++-
 pkgs/top-level/ocaml-packages.nix | 6 ------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22b63a492eea..7e29ff17185c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17254,7 +17254,10 @@ with pkgs;
 
   picosat = callPackage ../applications/science/logic/picosat {};
 
-  inherit (ocaml-ng.ocamlPackages_4_01_0) prooftree;
+  prooftree = (with ocamlPackages_4_01_0;
+    callPackage  ../applications/science/logic/prooftree {
+      camlp5 = camlp5_transitional;
+    });
 
   prover9 = callPackage ../applications/science/logic/prover9 { };
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5f000099e142..e580ac416604 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -721,12 +721,6 @@ let
       camlp5 = camlp5_transitional;
     };
 
-    prooftree =
-      if lib.versionOlder "4.01" ocaml.version
-      then null
-      else callPackage ../applications/science/logic/prooftree {
-      camlp5 = camlp5_transitional;
-    };
   };
     in lib.fix' (lib.extends overrides packageSet);
 in rec

From 05a3a541436527823883d3d39813912bc89e7782 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:16:38 -0300
Subject: [PATCH 0716/3449] pavucontrol-qt: 0.1.0 -> 0.2.0

---
 .../lxqt/core/pavucontrol-qt/default.nix      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
index ea2f24d6cf1f..b8421d062021 100644
--- a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix
@@ -1,29 +1,27 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt,
-xdg-user-dirs, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pavucontrol-qt";
-  version = "0.1.0";
+  version = "0.2.0";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1bis88ykasrnk9a55nnbn832acjz2h76h6i3lbxnb36yq71wan7j";
+    sha256 = "0k7sg4dxr48nk15gpqlnkjr9gbh7r5gs0s0ydifcmw281khrzlzj";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
     qt5.qttools
     qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
-    xdg-user-dirs
     libpulseaudio
   ];
 
@@ -33,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "A Pulseaudio mixer in Qt (port of pavucontrol)";
     homepage = https://github.com/lxde/pavucontrol-qt;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From cadb035ebe629efdbc4ee3366bb4fb16733c7957 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:21:45 -0300
Subject: [PATCH 0717/3449] qtermwidget: 0.7.0 -> 0.7.1

---
 pkgs/desktops/lxqt/core/qtermwidget/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
index 33f3cc19cf67..66620e195ec0 100644
--- a/pkgs/desktops/lxqt/core/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qtermwidget";
-  version = "0.7.0";
+  version = "0.7.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "18dnrzpbijh0xdgx83zs8nlbxk0d7hgzib54fqqvxyrjjy4g9scz";
+    sha256 = "0awp33cnkpi9brpx01mz5hwj7j2lq1wdi8cabk3wassd99vvxdxz";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "A terminal emulator widget for Qt 5";
     homepage = https://github.com/lxde/qtermwidget;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 660329fe9bb3a315ca61516ed44873f8ed1cf825 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:33:42 -0300
Subject: [PATCH 0718/3449] lximage-qt: 0.5.0 -> 0.5.1

---
 .../lxqt/optional/lximage-qt/default.nix      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
index ac7055924c42..3308f0e412bd 100644
--- a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix
@@ -1,33 +1,33 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt,
- libfm, menu-cache, libexif }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, xorg, lxqt, libfm, libexif }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lximage-qt";
-  version = "0.5.0";
+  version = "0.5.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0c5s0c2y73hp7mcxwg31bpn0kmjyhv519d0dxzp3na56n0xk9vl0";
+    sha256 = "0hyiarjjxjwvzinlfnfxbqx40dhgydd3ccv3xqwvj7yni1nfx7pb";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
     qt5.qttools
     qt5.qtx11extras
     qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
     lxqt.libfm-qt
     xorg.libpthreadstubs
     xorg.libXdmcp
     libfm
-    menu-cache
     libexif
   ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "The image viewer and screenshot tool for lxqt";
     homepage = https://github.com/lxde/lximage-qt;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 3f03825ba6b30ecca2f59409e626286489b08fbc Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:43:43 -0300
Subject: [PATCH 0719/3449] pcmanfm-qt: 0.11.1 -> 0.11.3

---
 .../desktops/lxqt/core/pcmanfm-qt/default.nix | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
index bc9cf774017f..7c115c2ca27f 100644
--- a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix
@@ -1,31 +1,28 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, libfm,
-menu-cache, lxmenu-data }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, lxqt, libfm, menu-cache, lxmenu-data }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "pcmanfm-qt";
-  version = "0.11.1";
+  version = "0.11.3";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "04fv23glcnfiszam90iy3gvn2sigyk8zj8a1s43wz8fgjijnws32";
+    sha256 = "04vhfhjmz1a4rhkpb6y35hwg565047rp53rcxf4pdn0i9f6zhr4f";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
     qt5.qttools
     qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
     lxqt.libfm-qt
-    xorg.libpthreadstubs
-    xorg.libXdmcp
     libfm
     menu-cache
     lxmenu-data
@@ -37,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)";
     homepage = https://github.com/lxde/pcmanfm-qt;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 61f859d820270a675810f42ce24117cef4547732 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:48:38 -0300
Subject: [PATCH 0720/3449] qterminal: 0.7.0 -> 0.7.1

---
 .../lxqt/optional/qterminal/default.nix         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix
index 7f0f66c6fbe4..ff59a2d893c6 100644
--- a/pkgs/desktops/lxqt/optional/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix
@@ -1,27 +1,26 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qterminal";
-  version = "0.7.0";
+  version = "0.7.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1g8d66h8avk094wvgqw0mgl9caamdig6bnn4vawshn4j7y8g4n7v";
+    sha256 = "14pfwii8axyswrkwvfmc2i0a07fjnhpyk3hh06qkbj2w3r00xhyb";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
     qt5.qttools
     qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
     lxqt.qtermwidget
   ];
 
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "A lightweight Qt-based terminal emulator";
     homepage = https://github.com/lxde/qterminal;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From d01f1690d38093b6517e0083aa5628488c7c84ad Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 19 Feb 2017 11:54:31 +0100
Subject: [PATCH 0721/3449] redis: 3.2.7 -> 3.2.8

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

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index e50ecf605675..d87aefd37fb5 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.7";
+  version = "3.2.8";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "1abghfr9nq5k69vg0kjh2409k51xy6fhyf466gy7pzjb6zjz77dz";
+    sha256 = "0b28d0fpkvf4m186gr2k53f1cqkccxzspmb959swrrhq7p177cv1";
   };
 
   buildInputs = [ lua ];

From 8f162eb0239e0e24422c66e9c6ef36973a133b94 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:54:27 -0300
Subject: [PATCH 0722/3449] lxqt-about: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-about/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
index 3e3b047dd4ed..34491d0414bc 100644
--- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-about";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0739gp3af68cvf8fxqvd203xqzncglmxpklq8mryrs5f1xnqp6gc";
+    sha256 = "1pa68pr0iwvh34lippagc8kxdfd0l2071m0vh7dnvfqbnwly29dk";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtx11extras
@@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Dialogue window providing information about LXQt and the system it's running on";
     homepage = https://github.com/lxde/lxqt-about;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From a4825a2ed99b7430993716528233347f6d61f785 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 09:59:23 -0300
Subject: [PATCH 0723/3449] lxqt-admin: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-admin/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
index da47e02dcf1f..2e6ae9858ad3 100644
--- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, polkit }:
+{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, polkit }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-admin";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "17g9v6dyqy5pgpqragpf0sgnfxz2ip2g7xix7kmkna3qyym44b23";
+    sha256 = "12c1wdciqgiifsk5aslw3990pk9ylk9jhgwnrxvh798rr48hhflr";
   };
 
   nativeBuildInputs = [
     cmake
+    lxqt.lxqt-build-tools
   ];
 
   buildInputs = [
@@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "LXQt system administration tool";
     homepage = https://github.com/lxde/lxqt-admin;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 49d8d91d5e13d7915351c4e31c398298eed3ab88 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:05:14 -0300
Subject: [PATCH 0724/3449] lxqt-config: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-config/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index 66187a0ae6f8..a16fcd21f68f 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -3,19 +3,20 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-config";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "187x19s0jw20an37v7svkry6p021ply4i3ngh5w2nx5rlqkf63qw";
+    sha256 = "0mqvv93djsw49n0gxpws3hrwimnyf9kzvc2vhjkzrjfxpabk2axx";
   };
 
   nativeBuildInputs = [
     cmake
     pkgconfig
-   ];
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "Tools to configure LXQt and the underlying operating system";
     homepage = https://github.com/lxde/lxqt-config;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 87393b2a6ff63001bb28bbb4e0be0a86b34694b2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:08:45 -0300
Subject: [PATCH 0725/3449] lxqt-globalkeys: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
index 7f1f140653fe..a23bff6e8d1d 100644
--- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
@@ -3,16 +3,19 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-globalkeys";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "05kcq21fyz7vnhh9k4nzhskgbghp1slsz14gh9anhya4a567xx0y";
+    sha256 = "1kwibll2azi4pafk7crfgibk5a54rnsia3c4cz680iny7xz1wy6h";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -32,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Daemon used to register global keyboard shortcuts";
     homepage = https://github.com/lxde/lxqt-globalkeys;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 183550cb2ee4766bcd4acc9e0fca149c0862f286 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:15:20 -0300
Subject: [PATCH 0726/3449] lxqt-notificationd: 0.11.0 -> 0.11.1

---
 .../lxqt/core/lxqt-notificationd/default.nix         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
index 1ecef6334946..3646a461c830 100644
--- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -3,16 +3,19 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-notificationd";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "001xcvmg7ap5pbssc9pqp4jshgq2h4zxk9rra76xnrby6k8n6p3x";
+    sha256 = "1n39zjczzhqn73vfyjngybmk9w8j1z3vjkaq80rf2hk89vwsm0wc";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -21,6 +24,7 @@ stdenv.mkDerivation rec {
     kde5.kwindowsystem
     lxqt.liblxqt
     lxqt.libqtxdg
+    lxqt.lxqt-common
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
@@ -29,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "The LXQt notification daemon";
     homepage = https://github.com/lxde/lxqt-notificationd;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From a0cc7797479feb2c2c8e8af38ab33c9b658a1797 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:20:13 -0300
Subject: [PATCH 0727/3449] lxqt-openssh-askpass: 0.11.0 -> 0.11.1

---
 .../lxqt/core/lxqt-openssh-askpass/default.nix        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
index 202231fbdea9..9190718fde4f 100644
--- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
@@ -3,16 +3,19 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-openssh-askpass";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0nz8sv3yrqbzgmd6jahaqaa71axy5x06k091splp9cmab0vzng7c";
+    sha256 = "030pzys86s7rpgl35kl4b3y7gmv9982j3blmg8927nq4pw61gfj9";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -30,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "GUI to query passwords on behalf of SSH agents";
     homepage = https://github.com/lxde/lxqt-openssh-askpass;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 7ca3611a496020f9e61f20d5ce0bb72a3a27288c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:24:17 -0300
Subject: [PATCH 0728/3449] lxqt-policykit: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-policykit/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
index 627f43f8be60..f4351a9598d7 100644
--- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
@@ -3,16 +3,20 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-policykit";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0rbqzh8r259cc44f1cb236p9c3lp195zjdsw3w1nz7j7gzv9yjnd";
+    sha256 = "0sf8wj152z1xid1i2x5g1zpgh7lwq8f0rbrk3r9shyksxqcj2d8p";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -31,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "The LXQt PolicyKit agent";
     homepage = https://github.com/lxde/lxqt-policykit;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 9fb51ec316047e8a95e440b9d4730814a79aaf12 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:28:13 -0300
Subject: [PATCH 0729/3449] lxqt-powermanagement: 0.11.0 -> 0.11.1

---
 .../lxqt/core/lxqt-powermanagement/default.nix        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
index aabce857edd5..b7321c646686 100644
--- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
@@ -3,16 +3,19 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-powermanagement";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "10myxrhlhvr9cmcqv67skzd11c40bgqgf6qdvm5smww2il1mzfwa";
+    sha256 = "0rcjq20ap6kc3m1f2glb8c62qhsx8qh0rkzlj3rykdj6n4hc0x79";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -32,7 +35,7 @@ stdenv.mkDerivation rec {
     description = "Power management module for LXQt";
     homepage = https://github.com/lxde/lxqt-powermanagement;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From e4c6b47f477b246cc47bf80e3f483055809ff4cb Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:33:04 -0300
Subject: [PATCH 0730/3449] lxqt-session: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-session/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
index a226169b21a9..1dfdd303a720 100644
--- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -3,16 +3,20 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-session";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1vb8mcy6z1irnd977x5425mbp4c7yc9dhk5552isqss1qb44hpn4";
+    sha256 = "14ahgix5jsv7fkmvz1imw9a12ygxccqrdxp9yfbpin1az9q1n1qv";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -21,6 +25,7 @@ stdenv.mkDerivation rec {
     kde5.kwindowsystem
     lxqt.liblxqt
     lxqt.libqtxdg
+    lxqt.lxqt-common
     xorg.libpthreadstubs
     xorg.libXdmcp
     xdg-user-dirs
@@ -32,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "An alternative session manager ported from the original razor-session";
     homepage = https://github.com/lxde/lxqt-session;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From b5ae4f42dc590d053e4ef8b531fd7a195f03765b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:35:35 -0300
Subject: [PATCH 0731/3449] lxqt-sudo: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-sudo/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
index ad0885917aed..83b16587523d 100644
--- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
@@ -3,16 +3,19 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-sudo";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0nmn0j5qvqpkhlq8yvl8ycn3hijbnwxd32hhmxhcnaq07cmzbg1j";
+    sha256 = "0imy4cs51im81rd0wa03wy418cdv9gqqgmwkc7v58cip7h665pyk";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -31,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "GUI frontend for sudo/su";
     homepage = https://github.com/lxde/lxqt-sudo;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 349c252c58b9a6f343e7df31cd919cfc490715f3 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:53:59 -0300
Subject: [PATCH 0732/3449] lxqt-panel: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-panel/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index d5786444fadb..0c899c67dad5 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -5,16 +5,20 @@ lxmenu-data }:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-panel";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "0lwgz6nir4cd50xbmc3arngnw38rb5kqgcsgp3dlq6gpncg45hdq";
+    sha256 = "097rivly61i99v0w9a3dgbwbc4c5x9nh3jl0n94dix1qgd4w983y";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -27,6 +31,7 @@ stdenv.mkDerivation rec {
     kde5.kguiaddons
     lxqt.liblxqt
     lxqt.libqtxdg
+    lxqt.lxqt-common
     lxqt.lxqt-globalkeys
     lxqt.libsysstat
     xorg.libpthreadstubs
@@ -47,7 +52,7 @@ stdenv.mkDerivation rec {
     description = "The LXQt desktop panel";
     homepage = https://github.com/lxde/lxqt-panel;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 2e046f2bedfa99c60e21eeb14d26c063c21d38fe Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 10:56:07 -0300
Subject: [PATCH 0733/3449] lxqt-runner: 0.11.0 -> 0.11.1

---
 pkgs/desktops/lxqt/core/lxqt-runner/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
index 02d6f90397ac..f420e9e410ae 100644
--- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -4,16 +4,20 @@ menu-cache, muparser }:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "lxqt-runner";
-  version = "0.11.0";
+  version = "0.11.1";
 
   srcs = fetchFromGitHub {
     owner = "lxde";
     repo = pname;
     rev = version;
-    sha256 = "1gqs1b90km39dbg49g80x770i9jknni4h8y6ka2r1fga35amllkc";
+    sha256 = "1nsxm0fplwrzz3vccd5fm82lpl4fqss6kv558zj44vzpsl13l954";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+    lxqt.lxqt-build-tools
+  ];
 
   buildInputs = [
     qt5.qtbase
@@ -22,6 +26,7 @@ stdenv.mkDerivation rec {
     kde5.kwindowsystem
     lxqt.liblxqt
     lxqt.libqtxdg
+    lxqt.lxqt-common
     lxqt.lxqt-globalkeys
     menu-cache
     muparser
@@ -33,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Tool used to launch programs quickly by typing their names";
     homepage = https://github.com/lxde/lxqt-runner;
     license = licenses.lgpl21;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 0360e61d889439e930c4b02b08835825c527b95a Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Sat, 18 Feb 2017 00:20:38 +0530
Subject: [PATCH 0734/3449] serf: 20150515 -> 0.8.1

---
 pkgs/servers/serf/default.nix |  21 ++++--
 pkgs/servers/serf/deps.nix    | 137 ----------------------------------
 2 files changed, 14 insertions(+), 144 deletions(-)
 delete mode 100644 pkgs/servers/serf/deps.nix

diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix
index 44c766d35d01..23daa99b3bcb 100644
--- a/pkgs/servers/serf/default.nix
+++ b/pkgs/servers/serf/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "serf-${version}";
-  version = "20150515-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "668982d8f90f5eff4a766583c1286393c1d27f68";
+  version = "0.8.1";
+  rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/serf";
 
-  src = fetchgit {
+  src = fetchFromGitHub {
+    owner = "hashicorp";
+    repo = "serf";
     inherit rev;
-    url = "https://github.com/hashicorp/serf";
-    sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk";
+    sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx";
   };
 
-  goDeps = ./deps.nix;
+  meta = with stdenv.lib; {
+    description = "Tool for service orchestration and management";
+    homepage = "https://www.serf.io/";
+    platforms = platforms.linux ++ platforms.darwin;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ pradeepchhetri ];
+  };
 }
diff --git a/pkgs/servers/serf/deps.nix b/pkgs/servers/serf/deps.nix
deleted file mode 100644
index bc5b960d1476..000000000000
--- a/pkgs/servers/serf/deps.nix
+++ /dev/null
@@ -1,137 +0,0 @@
-[
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6";
-      sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa";
-    };
-  }
-  {
-    goPackagePath = "github.com/miekg/dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/dns";
-      rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa";
-      sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl";
-    };
-  }
-  {
-    goPackagePath = "github.com/armon/go-metrics";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/go-metrics";
-      rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25";
-      sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck";
-    };
-  }
-  {
-    goPackagePath = "github.com/mattn/go-isatty";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mattn/go-isatty";
-      rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
-      sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/logutils";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/logutils";
-      rev = "0dc08b1671f34c4250ce212759ebd880f743d883";
-      sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r";
-    };
-  }
-  {
-    goPackagePath = "github.com/armon/go-radix";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/go-radix";
-      rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93";
-      sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-syslog";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go-syslog";
-      rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba";
-      sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/memberlist";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/memberlist";
-      rev = "6025015f2dc659ca2c735112d37e753bda6e329d";
-      sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/mapstructure";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/mapstructure";
-      rev = "281073eb9eb092240d33ef253c404f1cca550309";
-      sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
-    };
-  }
-  {
-    goPackagePath = "github.com/armon/circbuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/armon/circbuf";
-      rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf";
-      sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/mdns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/mdns";
-      rev = "2b439d37011456df8ff83a70ffd1cd6046410113";
-      sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96";
-    };
-  }
-  {
-    goPackagePath = "github.com/mitchellh/cli";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/cli";
-      rev = "8102d0ed5ea2709ade1243798785888175f6e415";
-      sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2";
-    };
-  }
-  {
-    goPackagePath = "github.com/ryanuber/columnize";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ryanuber/columnize";
-      rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a";
-      sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go-msgpack";
-    fetch = {
-      type = "git";
-      url = "https://github.com/ugorji/go";
-      rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6";
-      sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v";
-    };
-  }
-  {
-    goPackagePath = "github.com/hashicorp/go.net";
-    fetch = {
-      type = "git";
-      url = "https://github.com/hashicorp/go.net";
-      rev = "104dcad90073cd8d1e6828b2af19185b60cf3e29";
-      sha256 = "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf";
-    };
-  }
-]

From 8286ce1bcfa6a7a068360bc106176cb4e2ac4721 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 11:45:02 -0300
Subject: [PATCH 0735/3449] screengrab: 2016-02-24 -> 2017-02-18

---
 pkgs/desktops/lxqt/optional/screengrab/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index 2ef1c7532a5a..b3524d36777c 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "screengrab-unstable-2016-09-12";
+  name = "screengrab-unstable-2017-02-18";
 
   srcs = fetchFromGitHub {
     owner = "QtDesktop";
     repo = "screengrab";
-    rev = "3dbacb9d6f52825689846c798a6c4c95e3815bf6";
-    sha256 = "0rflb1q5b1mik8sm1wm63hwpyaah8liizxq1f5q33zapl1qafzi5";
+    rev = "6fc03c70fe132b89f35d4cef2f62c9d804de3b64";
+    sha256 = "1h3rlpmaqxzysaibcw7s5msbrwaxkg6sz7a8xv6cqzjvggv09my0";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From b53c53b1b4dd30d4c28ed86ec4f6c49079de4f66 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 31 Dec 2016 14:31:56 +0200
Subject: [PATCH 0736/3449] maintainers: Add script to patch version/sha256 in
 .nix files

Adds a script to help automatically upgrading packages: this one can
patch name/version attributes like:
    version = "50.1.0";
    name = "bc-1.06";
... to the given version, and updates the sha256 hash to match.

Usage is:

update-source-version <attr> <new-version> [<new-source-hash>]

where:
    - attr is the attribute path of the package
    - new-version is the version string to be patched in
    - new-source-hash is the optional sha256/etc. hash of the source.
      If not given, the script will automatically calculate it.

This is added to a subdirectory where other useful scripts can be added
in the future, like figuring out the newest version from a git repo or
GitHub releases etc.
---
 pkgs/common-updater/scripts.nix               | 18 ++++
 .../scripts/update-source-version             | 91 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 110 insertions(+)
 create mode 100644 pkgs/common-updater/scripts.nix
 create mode 100755 pkgs/common-updater/scripts/update-source-version

diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix
new file mode 100644
index 000000000000..cb7f23f7480a
--- /dev/null
+++ b/pkgs/common-updater/scripts.nix
@@ -0,0 +1,18 @@
+{ stdenv, makeWrapper, coreutils, gawk, gnused, nix }:
+
+stdenv.mkDerivation {
+  name = "common-updater-scripts";
+
+  buildInputs = [ makeWrapper ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${./scripts}/* $out/bin
+
+    for f in $out/bin/*; do
+      wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk gnused nix ]}
+    done
+  '';
+}
diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version
new file mode 100755
index 000000000000..13f8adf56771
--- /dev/null
+++ b/pkgs/common-updater/scripts/update-source-version
@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+set -e
+
+die() {
+    echo "$0: error: $1" >&2
+    exit 1
+}
+
+# Usage: update-source-hash <attr> <version> [<new-source-hash>]
+attr=$1
+newVersion=$2
+newHash=$3
+
+nixFile=$(nix-instantiate --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/')
+if [ ! -f "$nixFile" ]; then
+    die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!"
+fi
+
+oldHashAlgo=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"')
+oldHash=$(nix-instantiate --eval --strict -A "$attr.src.drvAttrs.outputHash" | tr -d '"')
+
+if [ -z "$oldHashAlgo" -o -z "$oldHash" ]; then
+    die "Couldn't evaluate old source hash from '$attr.src'!"
+fi
+
+if [ $(grep -c "$oldHash" "$nixFile") != 1 ]; then
+    die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!"
+fi
+
+drvName=$(nix-instantiate --eval -E "with import ./. {}; (builtins.parseDrvName $attr.name).name" | tr -d '"')
+oldVersion=$(nix-instantiate --eval -E "with import ./. {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')
+
+if [ -z "$drvName" -o -z "$oldVersion" ]; then
+    die "Couldn't evaluate name and version from '$attr.name'!"
+fi
+
+if [ "$oldVersion" = "$newVersion" ]; then
+    echo "$0: New version same as old version, nothing to do." >&2
+    exit 0
+fi
+
+# Escape dots, there should not be any other regex characters allowed in store path names
+oldVersion=$(echo "$oldVersion" | sed -re 's|\.|\\.|g')
+
+if [ $(grep -c -E "^\s*(let\b)?\s*version\s+=\s+\"$oldVersion\"" "$nixFile") = 1 ]; then
+    pattern="/\bversion\b\s*=/ s|\"$oldVersion\"|\"$newVersion\"|"
+elif [ $(grep -c -E "^\s*(let\b)?\s*name\s+=\s+\"$drvName-$oldVersion\"" "$nixFile") = 1 ]; then
+    pattern="/\bname\b\s*=/ s|\"$drvName-$oldVersion\"|\"$drvName-$newVersion\"|"
+else
+    die "Couldn't figure out where out where to patch in new version in '$attr'!"
+fi
+
+# Replace new version
+sed -i.bak "$nixFile" -re "$pattern"
+if cmp -s "$nixFile" "$nixFile.bak"; then
+    die "Failed to replace version '$oldVersion' to '$newVersion' in '$attr'!"
+fi
+
+case "$oldHashAlgo" in
+    sha256) hashLength=64 ;;
+    sha512) hashLength=128 ;;
+    *) die "Unhandled hash algorithm '$oldHashAlgo' in '$attr'!" ;;
+esac
+
+# Make a temporary all-zeroes hash of $hashLength characters
+tempHash=$(printf '%0*d' "$hashLength" 0)
+
+sed -i "$nixFile" -re "s|\"$oldHash\"|\"$tempHash\"|"
+if cmp -s "$nixFile" "$nixFile.bak"; then
+    die "Failed to replace source hash of '$attr' to a temporary hash!"
+fi
+
+# If new hash not given on the command line, recalculate it ourselves.
+if [ -z "$newHash" ]; then
+    nix-build --no-out-link -A "$attr.src" 2>"$attr.fetchlog" >/dev/null || true
+    # FIXME: use nix-build --hash here once https://github.com/NixOS/nix/issues/1172 is fixed
+    newHash=$(tail -n2 "$attr.fetchlog" | grep "output path .* has .* hash .* when .* was expected" | head -n1 | tr -dc '\040-\177' | awk '{ print $(NF-4) }')
+fi
+
+if [ -z "$newHash" ]; then
+    cat "$attr.fetchlog" >&2
+    die "Couldn't figure out new hash of '$attr.src'!"
+fi
+
+sed -i "$nixFile" -re "s|\"$tempHash\"|\"$newHash\"|"
+if cmp -s "$nixFile" "$nixFile.bak"; then
+    die "Failed to replace temporary source hash of '$attr' to the final source hash!"
+fi
+
+rm -f "$nixFile.bak"
+rm -f "$attr.fetchlog"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1385be2c99f0..30452e7fa6f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -65,6 +65,7 @@ with pkgs;
 
   nixpkgs-lint = callPackage ../../maintainers/scripts/nixpkgs-lint.nix { };
 
+  common-updater-scripts = callPackage ../common-updater/scripts.nix { };
 
   ### BUILD SUPPORT
 

From 9483359887f815aa7441176be5af2d4e9ae6f5b2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 19 Feb 2017 16:33:31 +0200
Subject: [PATCH 0737/3449] linuxPackages.tp_smapi: Use
 common-updater/update-source-version script

This way we have the benefit of the usual Nixpkgs style, and gain a
slight reduction in amount of code in the updater.

Also use callPackage to reduce duplication of the dependencies of the
update script and use makeBinPath to make things neater.
---
 pkgs/os-specific/linux/tp_smapi/default.nix | 14 ++++++++------
 pkgs/os-specific/linux/tp_smapi/update.nix  | 19 +++----------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
index cb5c539a94ee..765305d0fdaf 100644
--- a/pkgs/os-specific/linux/tp_smapi/default.nix
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, kernel, writeScript, coreutils, gnugrep, jq, curl
+{ stdenv, lib, fetchFromGitHub, kernel, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts
 }:
 
 stdenv.mkDerivation rec {
   name = "tp_smapi-${version}-${kernel.version}";
-
   version = "0.42";
 
-  src = fetchurl {
-    url = "https://github.com/evgeni/tp_smapi/archive/tp-smapi/${version}.tar.gz";
-    sha256 = "cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381";
+  src = fetchFromGitHub {
+    owner = "evgeni";
+    repo = "tp_smapi";
+    rev = "tp-smapi/${version}";
+    sha256 = "12lnig90lrmkmqwl386q7ssqs9p0jikqhwl2wsmcmii1gn92hzfy";
+    name = "tp-smapi-${version}";
   };
 
   hardeningDisable = [ "pic" ];
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.updateScript = import ./update.nix {
-    inherit writeScript coreutils gnugrep jq curl;
+    inherit lib writeScript coreutils gnugrep jq curl common-updater-scripts;
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/tp_smapi/update.nix b/pkgs/os-specific/linux/tp_smapi/update.nix
index 0c97d18472cd..94eb44b744cb 100644
--- a/pkgs/os-specific/linux/tp_smapi/update.nix
+++ b/pkgs/os-specific/linux/tp_smapi/update.nix
@@ -1,23 +1,10 @@
-{ writeScript, coreutils, gnugrep, jq, curl
-}:
+{ lib, writeScript, coreutils, curl, gnugrep, jq, common-updater-scripts }:
 
 writeScript "update-tp_smapi" ''
-PATH=${coreutils}/bin:${gnugrep}/bin:${jq}/bin:${curl}/bin
+PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq ]}
 
-pushd pkgs/os-specific/linux/tp_smapi
-
-tmpfile=`mktemp`
 tags=`curl -s https://api.github.com/repos/evgeni/tp_smapi/tags`
 latest_tag=`echo $tags | jq -r '.[] | .name' | grep -oP "^tp-smapi/\K.*" | sort --version-sort | tail -1`
-sha256=`curl -sL "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz" | sha256sum | cut -d" " -f1`
 
-cat > update.json <<EOF
-{
-  "version": "$latest_tag",
-  "url": "https://github.com/evgeni/tp_smapi/archive/tp-smapi/$latest_tag.tar.gz",
-  "sha256": "$sha256"
-}
-EOF
-
-popd
+update-source-version linuxPackages.tp_smapi "$latest_tag"
 ''

From e5e1bdca538cb2b8c0e1b184b4acb33649ad3270 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 5 Jan 2017 00:38:55 +0200
Subject: [PATCH 0738/3449] firefox, thunderbird: Use
 common-updater/update-source-version script

Replace the custom patching code with the common script.

Also use callPackage and makeBinPath
---
 .../networking/browsers/firefox/default.nix   | 12 +++----
 .../networking/browsers/firefox/update.nix    | 34 ++++---------------
 .../mailreaders/thunderbird/default.nix       | 10 +++---
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 4a1b642d8388..a01cde4d6de6 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -5,7 +5,7 @@
 , hunspell, libevent, libstartup_notification, libvpx
 , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
 , autoconf213, which
-, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed
+, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , enableGTK3 ? false
 , debugBuild ? false
 , # If you want the resulting program to call itself "Firefox" instead
@@ -151,8 +151,8 @@ in {
     version = "51.0.1";
     sha512 = "556e31b717c0640ef5e181e00b9d2a6ea0ace7c16ae04333d0f2e9e120d0ab9efe82a4ca314ef43594c080523edf37953e65dbf694c7428be0a024f3719d8312";
     updateScript = import ./update.nix {
-        name = "firefox";
-        inherit writeScript xidel coreutils gnused gnugrep curl ed;
+      attrPath = "firefox-unwrapped";
+      inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
     };
   };
 
@@ -161,9 +161,9 @@ in {
     version = "45.7.0esr";
     sha512 = "6424101b6958191ce654d0619950dfbf98d4aa6bdd979306a2df8d6d30d3fecf1ab44638061a2b4fb1af85fe972f5ff49400e8eeda30cdcb9087c4b110b97a7d";
     updateScript = import ./update.nix {
-        name = "firefox-esr";
-        versionSuffix = "esr";
-        inherit writeScript xidel coreutils gnused gnugrep curl ed;
+      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/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 33c9f3079181..0f4651228069 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -1,23 +1,18 @@
-{ name
-, writeScript
+{ writeScript
+, lib
 , xidel
+, common-updater-scripts
 , coreutils
 , gnused
 , gnugrep
 , curl
-, ed
-, sourceSectionRegex ? "${name}-unwrapped = common"
-, basePath ? "pkgs/applications/networking/browsers/firefox"
+, attrPath
 , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
 , versionSuffix ? ""
 }:
 
-let
-  version = (builtins.parseDrvName name).version;
-in writeScript "update-${name}" ''
-  PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${ed}/bin
-
-  pushd ${basePath}
+writeScript "update-${attrPath}" ''
+  PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused xidel ]}
 
   url=${baseUrl}
 
@@ -35,20 +30,5 @@ in writeScript "update-${name}" ''
 
   shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1`
 
-  ed default.nix <<COMMANDS
-  # search line
-    /${sourceSectionRegex}/
-  # search version number line
-    /version/
-  # update the version
-    s/".*"/"$version"/
-  # search hash line
-    /sha512/
-  # update the hash
-    s/".*"/"$shasum"/
-  # write then quit
-    wq
-  COMMANDS
-
-  popd
+  update-source-version ${attrPath} "$version" "$shasum"
 ''
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 52775ce9781d..f71a6dff37c5 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python2, zip, libIDL
+{ stdenv, lib, fetchurl, pkgconfig, 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
-, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed
+, writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Earlybird", enable this option.  However, those
@@ -140,10 +140,8 @@ stdenv.mkDerivation rec {
   };
 
   passthru.updateScript = import ./../../browsers/firefox/update.nix {
-    name = "thunderbird";
-    sourceSectionRegex = ".";
-    basePath = "pkgs/applications/networking/mailreaders/thunderbird";
+    attrPath = "thunderbird";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
-    inherit writeScript xidel coreutils gnused gnugrep curl ed;
+    inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
   };
 }

From ea4bb7ca9e5aad268c7b9031cb91f27309eb94b0 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Feb 2017 11:52:26 -0300
Subject: [PATCH 0739/3449] qlipper: 2016-09-26 -> 5.0.0

---
 pkgs/desktops/lxqt/optional/qlipper/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/lxqt/optional/qlipper/default.nix b/pkgs/desktops/lxqt/optional/qlipper/default.nix
index 551259ac3a05..376b8fb0190d 100644
--- a/pkgs/desktops/lxqt/optional/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/optional/qlipper/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "qlipper";
-  version = "2016-09-26";
+  version = "5.0.0";
 
   srcs = fetchFromGitHub {
     owner = "pvanek";
     repo = pname;
-    rev = "48754f28fe1050df58f2d9f7cd2becc019e2f486";
-    sha256 = "0s35c08rlfnhp6j1hx5f19034q84ac56cs90wcb3p4spavdnzy2k";
+    rev = version;
+    sha256 = "1y34vadxxjg2l7021y1rpvb8x6pzhk2sk9p35wfm9inilwi8bg8j";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Cross-platform clipboard history applet";
     homepage = https://github.com/pvanek/qlipper;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ romildo ];
     platforms = with platforms; unix;
+    maintainers = with maintainers; [ romildo ];
   };
 }

From 5d62724e27c8c0f7c215b01a87c3ac08c65d11c4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 19 Feb 2017 16:44:49 +0100
Subject: [PATCH 0740/3449] geogebra: 5-0-328-0 -> 5-0-331-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 f72ec5bacc22..c5b1fbabde17 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-328-0";
+  version = "5-0-331-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "1bzmnw5410fv9s29ji8f4naa6m6ykvv8h88mmxhiygr3rfsc7050";
+    sha256 = "135g2xqafgs1gv98vqq2jpfwyi1aflyiynx1gmsgs23jxbr218v2";
   };
 
   srcIcon = fetchurl {

From 10a453c61bb54640356901e23718c6d4ee2e08c1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 19 Feb 2017 16:51:01 +0100
Subject: [PATCH 0741/3449] geogebra: add ma27 as maintainer

---
 lib/maintainers.nix                                 | 1 +
 pkgs/applications/science/math/geogebra/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 89c088726988..fa19809cc65f 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -277,6 +277,7 @@
   luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
   lukego = "Luke Gorrie <luke@snabb.co>";
   lw = "Sergey Sofeychuk <lw@fmap.me>";
+  ma27 = "Maximilian Bosch <maximilian@mbosch.me>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
   magnetophon = "Bart Brouns <bart@magnetophon.nl>";
   mahe = "Matthias Herrmann <matthias.mh.herrmann@gmail.com>";
diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix
index c5b1fbabde17..45f8dd1960b7 100644
--- a/pkgs/applications/science/math/geogebra/default.nix
+++ b/pkgs/applications/science/math/geogebra/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
       calculus in one easy-to-use package.
     '';
     homepage = https://www.geogebra.org/;
+    maintainers = with maintainers; [ ma27 ];
     license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ];
     platforms = platforms.all;
     hydraPlatforms = [];

From 511f82d6e5efbf9a0cf4d8a7cfa1b30967e9aee6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Feb 2017 17:29:42 +0100
Subject: [PATCH 0742/3449] fbterm: install terminfo definition

Hopefully helps with #22988
---
 pkgs/os-specific/linux/fbterm/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix
index 59f93e836c41..ad3c145cd8a9 100644
--- a/pkgs/os-specific/linux/fbterm/default.nix
+++ b/pkgs/os-specific/linux/fbterm/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses}:
+{stdenv, fetchurl, gpm, freetype, fontconfig, pkgconfig, ncurses, libx86}:
 let
   s = # Generated upstream information
   rec {
@@ -9,7 +9,7 @@ let
     url="http://fbterm.googlecode.com/files/fbterm-1.7.0.tar.gz";
     sha256="0pciv5by989vzvjxsv1jsv4bdp4m8j0nfbl29jm5fwi12w4603vj";
   };
-  buildInputs = [gpm freetype fontconfig pkgconfig ncurses];
+  buildInputs = [gpm freetype fontconfig pkgconfig ncurses libx86];
 in
 stdenv.mkDerivation {
   inherit (s) name version;
@@ -24,6 +24,10 @@ stdenv.mkDerivation {
     export HOME=$PWD;
     export NIX_LDFLAGS="$NIX_LDFLAGS -lfreetype"
   '';
+  preBuild = ''
+    mkdir -p "$out/share/terminfo"
+    tic -a -v2 -o"$out/share/terminfo" terminfo/fbterm
+  '';
   meta = {
     inherit (s) version;
     description = "Framebuffer terminal emulator";

From 505d7bea3af48c79af4212111324a4b95f80f212 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 Feb 2017 17:40:18 +0100
Subject: [PATCH 0743/3449] lua-packages: hydraPlatforms -> platforms

I see no original reason.  It seems someone started using hydraPlatforms
in that file and everyone else was just conforming to the style.
---
 pkgs/top-level/lua-packages.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 6ad2e288c971..4b5552b87384 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -126,7 +126,7 @@ let
 
     meta = {
       homepage = "http://matthewwild.co.uk/projects/luaexpat";
-      hydraPlatforms = stdenv.lib.platforms.unix;
+      plaftorms = stdenv.lib.platforms.unix;
       maintainers = [ stdenv.lib.maintainers.flosse ];
     };
   };
@@ -146,7 +146,7 @@ let
     '';
     meta = {
       homepage = "https://github.com/keplerproject/luafilesystem";
-      hydraPlatforms = stdenv.lib.platforms.unix;
+      plaftorms = stdenv.lib.platforms.unix;
       maintainers = with maintainers; [ flosse ];
     };
   };
@@ -162,7 +162,7 @@ let
     meta = {
       description = "Lua bindings for POSIX API";
       homepage = "https://github.com/luaposix/luaposix";
-      hydraPlatforms = stdenv.lib.platforms.unix;
+      plaftorms = stdenv.lib.platforms.unix;
     };
   };
 
@@ -175,7 +175,7 @@ let
     };
     meta = {
       homepage = "http://www.tset.de/lpty";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      plaftorms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
     preBuild = ''
@@ -239,7 +239,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = "http://w3.impa.br/~diego/software/luasocket/";
-      hydraPlatforms = with platforms; [darwin linux freebsd illumos];
+      plaftorms = with platforms; [darwin linux freebsd illumos];
       maintainers = with maintainers; [ mornfall ];
     };
   };
@@ -257,7 +257,7 @@ let
     disabled = isLua52;
     meta = {
       homepage = "https://github.com/luaforge/luazip";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      plaftorms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -288,7 +288,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = https://github.com/brimworks/lua-zlib;
-      hydraPlatforms = platforms.unix;
+      plaftorms = platforms.unix;
       license = licenses.mit;
       maintainers = [ maintainers.koral ];
     };
@@ -304,7 +304,7 @@ let
     buildInputs = [ autoreconfHook unzip ];
     meta = {
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      plaftorms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -339,7 +339,7 @@ let
 
     meta = {
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      plaftorms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
       broken = true;
     };
@@ -359,7 +359,7 @@ let
 
     meta = {
       homepage = "https://github.com/LuaDist/luasql-sqlite3";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      plaftorms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -387,7 +387,7 @@ let
 
     meta = {
       homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/";
-      hydraPlatforms = stdenv.lib.platforms.all;
+      plaftorms = stdenv.lib.platforms.all;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -459,7 +459,7 @@ let
     meta = {
       description = "Simple implementation of msgpack in C Lua 5.1";
       homepage = "https://github.com/tarruda/libmpack";
-      hydraPlatforms = stdenv.lib.platforms.linux;
+      plaftorms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };

From f6eedf08674769a0bf12ec0ce8e3e7d6a8dc3c1b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 19 Feb 2017 19:44:53 +0300
Subject: [PATCH 0744/3449] nvidia-x11.settings: add librsvg for gtk3

---
 pkgs/os-specific/linux/nvidia-x11/settings.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index d088fe5253c0..abf208cff93b 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -1,6 +1,7 @@
 nvidia_x11: sha256:
 
 { stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, gtk3, libXv, libXrandr, libvdpau
+, librsvg, wrapGAppsHook
 , withGtk2 ? false, withGtk3 ? true
 }:
 
@@ -15,7 +16,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig m4 ];
 
-  buildInputs = [ jansson gtk2 gtk3 libXv libXrandr libvdpau nvidia_x11 ];
+  buildInputs = [ jansson libXv libXrandr libvdpau nvidia_x11 gtk2 ]
+             ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ];
 
   NIX_LDFLAGS = [ "-lvdpau" "-lXrandr" "-lXv" "-lnvidia-ml" ];
 
@@ -39,9 +41,11 @@ stdenv.mkDerivation rec {
     ''}
   '';
 
+  binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
+
   postFixup = ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib" \
-      $out/bin/nvidia-settings
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib" \
+      $out/bin/$binaryName
   '';
 
   meta = with stdenv.lib; {

From 22750b36fdd96f0b88a8048e00e6ef4c31106f81 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Feb 2017 17:11:18 +0300
Subject: [PATCH 0745/3449] nvidia: support application profiles

Closes #22666.
---
 nixos/modules/hardware/video/nvidia.nix         | 4 ++++
 pkgs/os-specific/linux/nvidia-x11/builder.sh    | 7 +++++++
 pkgs/os-specific/linux/nvidia-x11/default.nix   | 1 +
 pkgs/os-specific/linux/nvidia-x11/generic.nix   | 3 ++-
 pkgs/os-specific/linux/nvidia-x11/legacy173.nix | 1 +
 pkgs/os-specific/linux/nvidia-x11/settings.nix  | 4 ++++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index cf723d53269b..161ed9457af9 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -49,6 +49,10 @@ in
         Option "RandRRotation" "on"
       '';
 
+    environment.etc."nvidia/nvidia-application-profiles-rc" = mkIf nvidia_x11.useProfiles {
+      source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";
+    };
+
     hardware.opengl.package = nvidiaPackage nvidia_x11 pkgs;
     hardware.opengl.package32 = nvidiaPackage nvidia_libs32 pkgs_i686;
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 7dee6b4776c1..24a2e2cf06ff 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -68,6 +68,13 @@ installPhase() {
             nuke-refs $i
             cp $i $bin/lib/modules/$kernelVersion/misc/
         done
+
+        # Install application profiles.
+        if [ "$useProfiles" = "1" ]; then
+            mkdir -p $bin/share/nvidia
+            cp nvidia-application-profiles-*-rc $bin/share/nvidia/nvidia-application-profiles-rc
+            cp nvidia-application-profiles-*-key-documentation $bin/share/nvidia/nvidia-application-profiles-key-documentation
+        fi
     fi
 
     # All libs except GUI-only are installed now, so fixup them.
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 204ef62138a1..5e26fef6e19d 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -37,6 +37,7 @@ in
     settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf";
     persistencedSha256 = null;
     useGLVND = false;
+    useProfiles = false;
   };
 
   legacy_173 = callPackage ./legacy173.nix { };
diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 1398dae0e64f..9e39a6df09c1 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -4,6 +4,7 @@
 , settingsSha256
 , persistencedSha256
 , useGLVND ? true
+, useProfiles ? true
 , preferGtk2 ? false
 }:
 
@@ -41,7 +42,7 @@ let
         }
       else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
-    inherit version useGLVND;
+    inherit version useGLVND useProfiles;
     inherit (stdenv) system;
 
     outputs = [ "out" ] ++ optional (!libsOnly) "bin";
diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
index 19199579e77f..6e5b412a9b8f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
     settings = null;
     persistenced = null;
     useGLVND = false;
+    useProfiles = false;
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index abf208cff93b..f89997441649 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
   makeFlags = [ "NV_USE_BUNDLED_LIBJANSSON=0" ];
   installFlags = [ "PREFIX=$(out)" ];
 
+  postPatch = lib.optionalString nvidia_x11.useProfiles ''
+    sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c
+  '';
+
   preBuild = ''
     if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then
       ( cd src/libXNVCtrl

From 77f5a50c400d7e312e7491593dcc8ee8cab86c2c 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 Feb 2017 17:55:50 +0100
Subject: [PATCH 0746/3449] lua-packages: fix my mass typo in meta

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 4b5552b87384..5ca9f697b874 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -126,7 +126,7 @@ let
 
     meta = {
       homepage = "http://matthewwild.co.uk/projects/luaexpat";
-      plaftorms = stdenv.lib.platforms.unix;
+      platforms = stdenv.lib.platforms.unix;
       maintainers = [ stdenv.lib.maintainers.flosse ];
     };
   };
@@ -146,7 +146,7 @@ let
     '';
     meta = {
       homepage = "https://github.com/keplerproject/luafilesystem";
-      plaftorms = stdenv.lib.platforms.unix;
+      platforms = stdenv.lib.platforms.unix;
       maintainers = with maintainers; [ flosse ];
     };
   };
@@ -162,7 +162,7 @@ let
     meta = {
       description = "Lua bindings for POSIX API";
       homepage = "https://github.com/luaposix/luaposix";
-      plaftorms = stdenv.lib.platforms.unix;
+      platforms = stdenv.lib.platforms.unix;
     };
   };
 
@@ -175,7 +175,7 @@ let
     };
     meta = {
       homepage = "http://www.tset.de/lpty";
-      plaftorms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
     preBuild = ''
@@ -239,7 +239,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = "http://w3.impa.br/~diego/software/luasocket/";
-      plaftorms = with platforms; [darwin linux freebsd illumos];
+      platforms = with platforms; [darwin linux freebsd illumos];
       maintainers = with maintainers; [ mornfall ];
     };
   };
@@ -257,7 +257,7 @@ let
     disabled = isLua52;
     meta = {
       homepage = "https://github.com/luaforge/luazip";
-      plaftorms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -288,7 +288,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = https://github.com/brimworks/lua-zlib;
-      plaftorms = platforms.unix;
+      platforms = platforms.unix;
       license = licenses.mit;
       maintainers = [ maintainers.koral ];
     };
@@ -304,7 +304,7 @@ let
     buildInputs = [ autoreconfHook unzip ];
     meta = {
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
-      plaftorms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -339,7 +339,7 @@ let
 
     meta = {
       homepage = "https://github.com/lua-stdlib/lua-stdlib/";
-      plaftorms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
       broken = true;
     };
@@ -359,7 +359,7 @@ let
 
     meta = {
       homepage = "https://github.com/LuaDist/luasql-sqlite3";
-      plaftorms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -387,7 +387,7 @@ let
 
     meta = {
       homepage = "http://www.inf.puc-rio.br/~roberto/lpeg/";
-      plaftorms = stdenv.lib.platforms.all;
+      platforms = stdenv.lib.platforms.all;
       license = stdenv.lib.licenses.mit;
     };
   };
@@ -459,7 +459,7 @@ let
     meta = {
       description = "Simple implementation of msgpack in C Lua 5.1";
       homepage = "https://github.com/tarruda/libmpack";
-      plaftorms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
     };
   };

From 1078758b12cf2749f78333a9184d7d2af8149d4a Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sun, 19 Feb 2017 17:13:09 +0000
Subject: [PATCH 0747/3449] haskellPackages.lentil: no longer needs overrides

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4370feef40f5..1f24556a1a2f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -808,12 +808,6 @@ self: super: {
   # No upstream issue tracker
   hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff;
 
-  lentil = super.lentil.overrideScope (self: super: {
-    pipes = self.pipes_4_3_2;
-    # https://github.com/roelvandijk/terminal-progress-bar/issues/14
-    terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1;
-  });
-
   # https://github.com/basvandijk/lifted-base/issues/34
   lifted-base = doJailbreak super.lifted-base;
 

From febda39df386f374de7ee441f4c9b63ce2c15b84 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Feb 2017 18:35:22 +0100
Subject: [PATCH 0748/3449] qca2: 2.1.1 -> 2.1.3

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

diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix
index 431fd432ecb6..6a951fddb79c 100644
--- a/pkgs/development/libraries/qca2/default.nix
+++ b/pkgs/development/libraries/qca2/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, cmake, pkgconfig, qt }:
 
 stdenv.mkDerivation rec {
-  name = "qca-2.1.1";
+  name = "qca-${version}";
+  version = "2.1.3";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/qca/2.1.1/src/qca-2.1.1.tar.xz";
-    sha256 = "10z9icq28fww4qbzwra8d9z55ywbv74qk68nhiqfrydm21wkxplm";
+    url = "http://download.kde.org/stable/qca/${version}/src/qca-${version}.tar.xz";
+    sha256 = "0lz3n652z208daxypdcxiybl0a9fnn6ida0q7fh5f42269mdhgq0";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -13,8 +14,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [ ./libressl.patch ];
-
   meta = with stdenv.lib; {
     description = "Qt Cryptographic Architecture";
     license = "LGPL";

From 5759206608378365de940ad2630f6932ce9e3157 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Feb 2017 18:36:12 +0100
Subject: [PATCH 0749/3449] qca2: add qca2-qt5 top-level attribute

---
 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 abead3b3b210..7d79258ab5ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9218,6 +9218,7 @@ with pkgs;
   re2 = callPackage ../development/libraries/re2 { };
 
   qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
+  qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; };
 
   qimageblitz = callPackage ../development/libraries/qimageblitz {};
 

From 9d8166448086a95dab25876ccc96e5b1f912dad3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Feb 2017 18:37:56 +0100
Subject: [PATCH 0750/3449] psi: move out of kdePackages, it doesn't use
 kdelibs anyway

---
 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 7d79258ab5ae..87b0ec76a1f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3502,6 +3502,8 @@ with pkgs;
 
   ps3netsrv = callPackage ../servers/ps3netsrv { };
 
+  psi = callPackage ../applications/networking/instant-messengers/psi { };
+
   psmisc = callPackage ../os-specific/linux/psmisc { };
 
   pssh = callPackage ../tools/networking/pssh { };
@@ -16757,8 +16759,6 @@ with pkgs;
 
           polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
 
-          psi = callPackage ../applications/networking/instant-messengers/psi { };
-
           qtcurve = callPackage ../misc/themes/qtcurve { };
 
           quassel = callPackage ../applications/networking/irc/quassel rec {

From 048c04654dfcb48c8d8e6ddbb011c752eaa88e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 19 Feb 2017 18:30:19 +0100
Subject: [PATCH 0751/3449] maintainers: update my email address

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fa19809cc65f..fba18ac75a72 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -305,7 +305,7 @@
   meisternu = "Matt Miemiec <meister@krutt.org>";
   metabar = "Celine Mercier <softs@metabarcoding.org>";
   mguentner = "Maximilian Güntner <code@klandest.in>";
-  mic92 = "Jörg Thalheim <joerg@higgsboson.tk>";
+  mic92 = "Jörg Thalheim <joerg@thalheim.io>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
   michalrus = "Michal Rus <m@michalrus.com>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";

From 6dbb3ab03124610dad016fdd52fa2caae969d143 Mon Sep 17 00:00:00 2001
From: anderspapitto <anderspapitto@gmail.com>
Date: Sun, 19 Feb 2017 10:25:25 -0800
Subject: [PATCH 0752/3449] buildRustPackage: fix deprecated use of
 registry.index config key (#22987)

See
https://github.com/rust-lang/cargo/commit/8214bb953dee7f529747ce69ff81fe294259a6a0
for the cargo commit which deprecated the registry.index key, and
implements this as a replacement. This gets rid of the error message

warning: custom registry support via the `registry.index` configuration is being removed, this functionality will not work in the future
---
 pkgs/build-support/rust/fetch-cargo-deps | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 54593994990f..89b78547b38d 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -11,8 +11,11 @@ fetchCargoDeps() {
     echo "Using rust registry from $rustRegistry"
 
     cat <<EOF > $out/config
-[registry]
-index = "file://$rustRegistry"
+[source.nix-store-rust-registry]
+registry = "file://$rustRegistry"
+
+[source.crates-io]
+replace-with = "nix-store-rust-registry"
 EOF
 
     export CARGO_HOME=$out

From 4129697445a84e0291bc53f28166af6147271d3e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@gmail.com>
Date: Sun, 19 Feb 2017 15:27:04 -0300
Subject: [PATCH 0753/3449] higan: 101 -> 102 (#22942)

---
 pkgs/misc/emulators/higan/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix
index 8d3537b0ee6d..b1495987e613 100644
--- a/pkgs/misc/emulators/higan/default.nix
+++ b/pkgs/misc/emulators/higan/default.nix
@@ -4,19 +4,18 @@
 , udev
 , mesa, SDL
 , libao, openal, libpulseaudio
-, gtk2, gtksourceview
-}:
+, gtk2, gtksourceview }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "higan-${version}";
-  version = "101";
+  version = "102";
   sourceName = "higan_v${version}-source";
 
   src = fetchurl {
     urls = [ "http://download.byuu.org/${sourceName}.7z" ];
-    sha256 = "04vr3fp0b3cwq7q8d9v60qmv08zpcsb5gqn1whl4fvwcxcl22by8";
+    sha256 = "1wcr2sxk0n4rngnf9g2qcjcv70s8rf5cqj195sav1yjwxkrdrnjj";
     curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick...
   };
 
@@ -71,16 +70,17 @@ stdenv.mkDerivation rec {
     longDescription = ''
       Higan (formerly bsnes) is a Nintendo multi-system emulator.
       It currently supports the following systems:
-        Famicom; Super Famicom;
-        Game Boy; Game Boy Color; Game Boy Advance
-        WonderSwan; WonderSwan Color
-      higan also supports the following subsystems:
-        Super Game Boy; BS-X Satellaview; Sufami Turbo
+        - Nintendo's Famicom, Super Famicom (with subsystems: 
+          Super Game Boy, BS-X Satellaview, Sufami Turbo); 
+          Game Boy, Game Boy Color, Game Boy Advance;
+        - Sega's Master System, Game Gear, Mega Drive;
+        - NEC's PC Engine, SuperGrafx;
+        - Bandai' WonderSwan, WonderSwan Color.
     '';
     homepage = http://byuu.org/higan/;
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; unix;
   };
 }
 

From a21455d989d320cb316be50c58c8a3fbe090865d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 19 Feb 2017 13:33:31 -0500
Subject: [PATCH 0754/3449] firefox-bin: Add gpg verification to updater
 (#22270)

---
 .../browsers/firefox-bin/default.nix          |  3 +-
 .../browsers/firefox-bin/firefox.key          | 63 +++++++++++++++++++
 .../browsers/firefox-bin/update.nix           | 16 +++--
 3 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/firefox-bin/firefox.key

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 0b9ff9db219c..80197999f5a3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -43,6 +43,7 @@
 , coreutils
 , gnused
 , gnugrep
+, gnupg
 }:
 
 assert stdenv.isLinux;
@@ -173,7 +174,7 @@ stdenv.mkDerivation {
 
   passthru.ffmpegSupport = true;
   passthru.updateScript = import ./update.nix {
-    inherit name writeScript xidel coreutils gnused gnugrep curl;
+    inherit name writeScript xidel coreutils gnused gnugrep gnupg curl;
   };
   meta = with stdenv.lib; {
     description = "Mozilla Firefox, free web browser (binary package)";
diff --git a/pkgs/applications/networking/browsers/firefox-bin/firefox.key b/pkgs/applications/networking/browsers/firefox-bin/firefox.key
new file mode 100644
index 000000000000..9169c4f9c44e
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox-bin/firefox.key
@@ -0,0 +1,63 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQINBFWpQAQBEAC+9wVlwGLy8ILCybLesuB3KkHHK+Yt1F1PJaI30X448ttGzxCz
+PQpH6BoA73uzcTReVjfCFGvM4ij6qVV2SNaTxmNBrL1uVeEUsCuGduDUQMQYRGxR
+tWq5rCH48LnltKPamPiEBzrgFL3i5bYEUHO7M0lATEknG7Iaz697K/ssHREZfuuc
+B4GNxXMgswZ7GTZO3VBDVEw5GwU3sUvww93TwMC29lIPCux445AxZPKr5sOVEsEn
+dUB2oDMsSAoS/dZcl8F4otqfR1pXg618cU06omvq5yguWLDRV327BLmezYK0prD3
+P+7qwEp8MTVmxlbkrClS5j5pR47FrJGdyupNKqLzK+7hok5kBxhsdMsdTZLd4tVR
+jXf04isVO3iFFf/GKuwscOi1+ZYeB3l3sAqgFUWnjbpbHxfslTmo7BgvmjZvAH5Z
+asaewF3wA06biCDJdcSkC9GmFPmN5DS5/Dkjwfj8+dZAttuSKfmQQnypUPaJ2sBu
+blnJ6INpvYgsEZjV6CFG1EiDJDPu2Zxap8ep0iRMbBBZnpfZTn7SKAcurDJptxin
+CRclTcdOdi1iSZ35LZW0R2FKNnGL33u1IhxU9HRLw3XuljXCOZ84RLn6M+PBc1eZ
+suv1TA+Mn111yD3uDv/u/edZ/xeJccF6bYcMvUgRRZh0sgZ0ZT4b0Q6YcQARAQAB
+tC9Nb3ppbGxhIFNvZnR3YXJlIFJlbGVhc2VzIDxyZWxlYXNlQG1vemlsbGEuY29t
+PokCOAQTAQIAIgUCValABAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ
+Ybe1JtmPA1NQqg//Rr6/V7uLqrIwx0UFknyNJasRJZhUkYxdGsLD18zO0Na8Ve3Q
+sYpOC3ojpqaFUzpqm6KNv8eXfd/Ku7j3WGr9kPkbjZNghvy6V5Lva4JkxO6LMxKk
+JYqiqF2o1Gfda8NfcK08GFy4C0L8zNwlADvmdMo4382tmHNGbTTft7BeVaRrE9xW
+9eGmGQ2jYOsjxb5MsadAdZUuK8IC95ZHlUDR3gH9KqhfbQWp5Bo924Kiv+f2JUzN
+rrG98eOm1Qb8F9rePzZ2DOYRJyOe4p8Gpl+kojCXNntkJgcwJ1a1yRE6wy9RzpeB
+lCeoQuLS92MNne+deQZUskTZFoYXUadf6vbdfqL0nuPCKdl9lhef1QNwE30IRymt
+6fhJCFffFQjGdeMfSiCHgcI8ichQbrzhBCGGR3bAHan9c2EbQ+puqG3Aa0YjX6Db
+GJjWOI6A61bqSPepLCMVaXqV2mZEIaZWdZkOHjnRrU6CJdXG/+D4m1YBZwYM60eJ
+kNu4eMMwMFnRsHiWf7bhqKptwuk8HyIGp2o4j8iqrFRVJEbK/ctdhA3H1AlKug9f
+NrfwCfqhNCSBju97V03U26j04JMn9nrZ2UEGbpty+8ONTb38WX5/oC61BgwV8Ki4
+6Lwyb7fImUzz8jE83pjh7s3+NCKvvbH+VfT12f+V/fsphN3EwGwJPTC3fX25Ag0E
+ValA9AEQAK/z677fpoVUj4zQz0g60wVWf+1y2lGb8iFYICmvrJyaEra5SRkyihYA
+1WmEzhN4T//tHw3UIfe646+GkY3eIQW2jY9DM2XaElmMN8k/v54nbn5oD7rNEyCT
+FTvCOq5d74HH1vw96Lzay1vy45E7jPWvqfg9Se8KAnzElohTJjizyhU+0QbmPHnQ
+lY8gOkT/SvRo9bFEUnqjWh0fRq+K1tdLPhcFB1scc25iFqh9IAKUGDur8jQ+SDHC
+jgQlkFOg3rbqtaUOnVHPohfrBM90ZNwuneFgQY7ZFSUidCimp/EN4CXnzgjDYXUU
+A42S8G86+G4KAJC22gRQo4mcVmehwHTH0glfLmUK7TEu29A1KWNL3R/R7Zdyajjp
+CvUaK2A0Abj3ZE2BSDbJrVlbBVfy5kfPdZjhd3wUWqFaDHiVcImcjZRWPncllhcy
+6fhqEy3ELZrkezpJjnARsVkij3GXz6oX+HVULne2w0dkTXydR6muZI/GeNtrLHmA
+8B3/0/TllmLy8ChmYZVIKZ8zt1ghq3f+hFTXgtZil7eBewZgA6L+EXXK6dZj14lb
+e6CMS2kungTX9stU1s42I+WRbiqiLpAxCX6qcLBOWrJwsOep2nvu5bhrPHptSfRh
+F4Vs1xteVFckCWhcLgdYi/Je1XBEM+AAVa0k1FiywCg7MqlG6toLABEBAAGJBEQE
+GAECAA8FAlWpQPQCGwIFCQPCZwACKQkQYbe1JtmPA1PBXSAEGQECAAYFAlWpQPQA
+CgkQHGnE5V6ZBdsvxQ/6A62ZteN0b/TVfSJ51SdG66amwe2rpRX4UdSw7ifxo3qh
+gEICQmXR5c09qXwl17MFJWM3FhGrbxnA5KGgeWGtqrPup4QZPKU+l2Ea2QLSJSiB
+q5QqqEgZvR14Lhr/hCGhBAq9s/xbp8fbKNJj/uWiZ+uTPbt5T5rgKJ4+g3B6DNO1
+rH7F70OLrd32mxZs4pSxngHRAyiMPB59yQVDsVMha0JTqC+P96itUzvnInc/9mwE
+0EMiBtpDTkoBwbJVPnuv+7FjkOLn5s5u3RLH9fe8z1xnV0fPC0/ndrlNiuBpAn3z
+VCsWasvW18Vz8K+CQY8Sw0Jw75edBgFoz2QMFxHfDpMJefvMadB7mdte1lKk/Im9
+KFFH8Idh9b6zD0a/+Ooujukx6QpFfAVhe2sT2CIm2nmMAuAZI2cCt7SC+REn9n9M
+SuIWxN8YTE3qgAUB6F3ea0O0hGlLl+z5UOfX0bNAs+ebx/P6PczJtDzeqpmRb0QX
+qo55JWXLvmXT/fgjF7fNTTLsyCtV+xH6ZFKGpvGJGJMHApEbz2a0hy12RZH58eI1
+ueN3Tzn8nI57+oYSsqFw/QgcdGXDonLGJsPVzIpQRg92/GXSukWF+MsCjVOilHRS
+Y1wfPPmJ7+kMQ4rdXpjAhwNYJc1ff5N+omCxCKoFgYsCXlFCHFKs4JwRbTdd3Mku
+qBAAlBlIjym8NyJIBltfWckuhQTX4BiBltGPNga9CpQsml519EePuLtoe5H0fTUp
+4UYbL0ZzyJImQE2uw/hMNZ36bA057YtHOoP4FcPUwv6wsl5JC87UR1XFhAXb5xSU
+0qdi3hWh0hm772X6CBlM8lM6GtT/fDZkSGNXMQaIs1X/O9vf8wGg+HwLJcaCvybI
+4w7w1K0R7WjWZlJXutCZf8hRc0d88W/qSZYooKD9q2S7foqaJhySIaF11sH5ETvV
+P3oCfGVIVhKWb0Tp2jXPXlXLeRAQA8S+4B1o5XHiM+J3SNXhPQHRGQ3VGcDn45it
+g3F4xQX2Qvo4SV42NMYd6TykM/dIfQyJDOVg3CT3+nqfjCknf94SNvyZprHEPmpc
+DeseoPMw8kjKNwDwPXFLxBRntPgnqVXDcNN41OH2kqx4jF7FLlRmwNpB2mFVH8xe
+VuRm7h2WZRsaEoqvivhzRtESVA2um5Eg763CVTcNYlK6MD/iy8JzbMuZBrlOHr58
+HKDdcOy1W0z2quESGoqrwA995IgPav/1DSpyuJPNc/oUTWlhpYshqYKoflezAyKj
+30+UzC3R/mY03ri6zUvCgXHNgZlKUsM3VEXk6h5oDuaXniHLLzuxjTBVrILnGYgH
+SFRP80L/knz+o4Uvq4wj7NHnruc5fP1foFxRNsMt40yRJfU=
+=D+jC
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/pkgs/applications/networking/browsers/firefox-bin/update.nix b/pkgs/applications/networking/browsers/firefox-bin/update.nix
index d32f4dfcf5b0..a6cf8c1c1e01 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/update.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/update.nix
@@ -5,8 +5,9 @@
 , gnused
 , gnugrep
 , curl
+, gnupg
 , baseName ? "firefox"
-, basePath ? "pkgs/applications/networking/browsers/firefox-bin" 
+, basePath ? "pkgs/applications/networking/browsers/firefox-bin"
 , baseUrl ? "http://archive.mozilla.org/pub/firefox/releases/"
 }:
 
@@ -14,10 +15,13 @@ let
   version = (builtins.parseDrvName name).version;
   isBeta = builtins.stringLength version + 1 == builtins.stringLength (builtins.replaceStrings ["b"] ["bb"] version);
 in writeScript "update-${baseName}-bin" ''
-  PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin
-
+  PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
+  set -eux
   pushd ${basePath}
 
+  HOME=`mktemp -d`
+  cat ${./firefox.key} | gpg2 --import
+
   tmpfile=`mktemp`
   url=${baseUrl}
 
@@ -39,8 +43,12 @@ in writeScript "update-${baseName}-bin" ''
            grep -e "${if isBeta then "b" else ""}\([[:digit:]]\|[[:digit:]][[:digit:]]\)$" | ${if isBeta then "" else "grep -v \"b\" |"} \
            tail -1`
 
+  curl --silent -o $HOME/shasums "$url$version/SHA512SUMS"
+  curl --silent -o $HOME/shasums.asc "$url$version/SHA512SUMS.asc"
+  gpgv2 --keyring=$HOME/.gnupg/pubring.kbx $HOME/shasums.asc $HOME/shasums
+
   # this is a list of sha512 and tarballs for both arches
-  shasums=`curl --silent $url$version/SHA512SUMS`
+  shasums=`cat $HOME/shasums`
 
   cat > $tmpfile <<EOF
   {

From 7bcb58ad712a0390a8dff3a5eeccad9ae2b5e299 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Sun, 19 Feb 2017 19:16:56 +0100
Subject: [PATCH 0755/3449] keepalived: 1.3.2 -> 1.3.4

---
 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 1f5a6216e7b5..6e18e1dba1dd 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.2";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "acassen";
     repo = "keepalived";
     rev = "v${version}";
-    sha256 = "1mfw8116b7j8y37l382v154yssm635kbm72f4x8303g5zwg6n6qx";
+    sha256 = "0vmflvr7j53dhpfawd1l2kkqw9prs2vl6r4a8rv5ilrrj3j0q989";
   };
 
   buildInputs = [

From 07b301529ca0020963e7d0ebcf616837f79d06c2 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep@barricade.io>
Date: Mon, 20 Feb 2017 00:41:00 +0530
Subject: [PATCH 0756/3449] wuzz: 0.1.0 -> 0.2.0 (#23002)

---
 pkgs/tools/networking/wuzz/default.nix |  6 +--
 pkgs/tools/networking/wuzz/deps.nix    | 67 +++++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix
index 994a6f75d549..b13e5dee18c7 100644
--- a/pkgs/tools/networking/wuzz/default.nix
+++ b/pkgs/tools/networking/wuzz/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "wuzz-${version}";
-  version = "0.1.0";
+  version = "0.2.0";
   rev = "v${version}";
 
   goPackagePath = "https://github.com/asciimoo/wuzz";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "asciimoo";
     repo = "wuzz";
     inherit rev;
-    sha256 = "0n55y9dmx4rsccjscvbrgiq2g1qwqxj44lg90589i55b5f7r1ljd";
+    sha256 = "1fcr5jr0vn5w60bn08lkh2mi0hdarwp361h94in03139j7hhqrfs";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/networking/wuzz/deps.nix b/pkgs/tools/networking/wuzz/deps.nix
index 1025793cc981..8904596a712d 100644
--- a/pkgs/tools/networking/wuzz/deps.nix
+++ b/pkgs/tools/networking/wuzz/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/jroimartin/gocui";
-      rev = "7ac95c981b8a07b624ab197b3ad5813fdfbe4864";
-      sha256 = "1xr752gpjv32mnzzy5v367maczl7sn8frn258wqrs6gqf07sdmjp";
+      rev = "ed41d1bd2c217d4d1e312c2ee5d2f0c7793a99cc";
+      sha256 = "1h4jxhvkf43jsbn85w45fq2xsmcg08mc9g7pkxf880g6sqznrmcz";
     };
   }
   {
@@ -26,4 +26,67 @@
       sha256 = "0y6yq9zd4kh7fimnc00r3h9pr2pwa5j85b3jcn5dyfamsnm2xdsv";
     };
   }
+  {
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+    };
+  }
+  {
+    goPackagePath = "github.com/BurntSushi/toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/BurntSushi/toml";
+      rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
+      sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
+    };
+  }
+  {
+    goPackagePath = "github.com/nwidger/jsoncolor";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nwidger/jsoncolor";
+      rev = "0192e84d44af834c3a90c8a17bf670483b91ad5a";
+      sha256 = "17mndgd1d233c22bd19xv4v2l2i5k8kz7y6n4n54a9i7fi9d10al";
+    };
+  }
+  {
+    goPackagePath = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev = "e8e01ee22a7d4a91b49646e39245fe08e69c7878";
+      sha256 = "1660g29qhshk6zxhpnc0f52m69jdqqdw2ccbkqw9y4kilnripfvl";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev = "30a891c33c7cde7b02a981314b4228ec99380cca";
+      sha256 = "03gsxn89pgkj4jkxm9avnj4f0ckvcskc6fj2lcd98l3akrz50ndg";
+    };
+  }
+  {
+    goPackagePath = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev = "d228849504861217f796da67fae4f6e347643f15";
+      sha256 = "0ch5sfcpmqczsh8kjbwpzdw31lacbkfyzvpzh4disnhhydbxjq0d";
+    };
+  }
+  {
+    goPackagePath = "github.com/asciimoo/wuzz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/asciimoo/wuzz";
+      rev = "f34c82a4386951022f8bfc011fe6a7362dd8286c";
+      sha256 = "1fcr5jr0vn5w60bn08lkh2mi0hdarwp361h94in03139j7hhqrfs";
+    };
+  }
 ]

From aefb01a94577806351b6dd921f3265a291cf86ba Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 18 Feb 2017 19:23:28 +0300
Subject: [PATCH 0757/3449] haskellPackages.lambdabot: maintain

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 364c5bcdf329..492b2005ccd3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2296,6 +2296,7 @@ package-maintainers:
     - shakespeare
   abbradar:
     - Agda
+    - lambdabot
 
 dont-distribute-packages:
   # hard restrictions that really belong into meta.platforms
@@ -5418,9 +5419,6 @@ dont-distribute-packages:
   lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda2js:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-haskell-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-media:                              [ i686-linux, x86_64-linux, x86_64-darwin ]

From 7734d159d102251fafdd1573e99e712d840d8c84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 16 Feb 2017 12:34:49 +0100
Subject: [PATCH 0758/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/cc52bff6e8781efaf053d9a19dd42ec4fe8ba02a.
---
 .../haskell-modules/hackage-packages.nix      | 937 ++++++++++++++----
 1 file changed, 732 insertions(+), 205 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b83d984b0bb2..fddb99eb1302 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1344,8 +1344,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.3";
-       sha256 = "88963139ccce5e5ab1125bf590847d403d08a9b9f17f91a4fcb704a6881f6335";
+       version = "1.0.4";
+       sha256 = "b3c36291729328b42ba73ee777c4ef1490eccee982b64ee3dbf5103c25d5c2f3";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -1713,6 +1713,8 @@ self: {
        pname = "BlogLiterately";
        version = "0.8.4.3";
        sha256 = "56789deadc7e7a3b94b6dbbc0f8857565348ddde049ed8f0d938d4701f761721";
+       revision = "1";
+       editedCabalFile = "fa4ead9c5b7ffc4b664584723d9cb95fccab0ba835b8ec8ca8303787bbe1d705";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11537,8 +11539,8 @@ self: {
      }:
      mkDerivation {
        pname = "MiniAgda";
-       version = "0.2016.12.19";
-       sha256 = "c182c028ecf764a4f363426fbd101eb1e3c9283d5558cae898cdbd45847d4fca";
+       version = "0.2017.2.18";
+       sha256 = "bce3d9eb1b99f620cae1fd35046e6829deb564846b1f847168924de251b87d68";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -15880,6 +15882,8 @@ self: {
        pname = "Spock";
        version = "0.12.0.0";
        sha256 = "8392d1ee34b46238c6bfe951080f06e11e1f3622d8402e7762c70aa61430e3d9";
+       revision = "1";
+       editedCabalFile = "88a5e8b3c6fb8b7b23bb5b6f37a4ac071842fba1420d6bd835d9ac7085753529";
        libraryHaskellDepends = [
          base base64-bytestring bytestring containers cryptonite focus
          hashable http-types hvect list-t monad-control mtl reroute
@@ -15901,6 +15905,8 @@ self: {
        pname = "Spock-api";
        version = "0.12.0.0";
        sha256 = "8cfdbcbd2fa426c595fb7d29f8a6395dea17476c15d5ae863da2605b1c6ebe00";
+       revision = "1";
+       editedCabalFile = "7fb9f5bacb759e7763ff03fb910b6d7ff3a19436bf70ba7bd0f9e54801541d70";
        libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
        homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
@@ -15960,6 +15966,8 @@ self: {
        pname = "Spock-core";
        version = "0.12.0.0";
        sha256 = "e69b70ea3027fa644d546bcae25bbf75e38abd6f4a7f88f0628fea6e16e97895";
+       revision = "1";
+       editedCabalFile = "183fb6ab42002aff45add4cc8808ba29d8c6e7939c8cdc2877f100a4669d6676";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          cookie directory hashable http-api-data http-types hvect mtl
@@ -16007,6 +16015,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spock-lucid_0_4_0_0" = callPackage
+    ({ mkDerivation, base, lucid, Spock, transformers }:
+     mkDerivation {
+       pname = "Spock-lucid";
+       version = "0.4.0.0";
+       sha256 = "09ca1adac56dd7c1bd465d5a893f592e8b352337ab834418fa98d55eadabf26c";
+       libraryHaskellDepends = [ base lucid Spock transformers ];
+       homepage = "http://github.com/aelve/Spock-lucid";
+       description = "Lucid support for Spock";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock-worker" = callPackage
     ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl
      , Spock, stm, text, time, transformers, vector
@@ -16120,8 +16141,8 @@ self: {
      }:
      mkDerivation {
        pname = "StockholmAlignment";
-       version = "1.0.0";
-       sha256 = "0b1234009521e37f69d734391138bec11c7c3d2df2496c939268fbff2cb1c86b";
+       version = "1.0.1";
+       sha256 = "04ae48d0061e8c7b8120c924677c33179cd837b2171e295c30558ad31583867f";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools SVGFonts text vector
@@ -26551,6 +26572,33 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "atom-conduit_0_4_0_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators
+     , data-default, hlint, lens-simple, mono-traversable, parsers
+     , quickcheck-instances, resourcet, safe-exceptions, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, timerep
+     , uri-bytestring, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "atom-conduit";
+       version = "0.4.0.2";
+       sha256 = "dca5d06000961b82120440b17ff241dc785426b2bf50071f1979f8d4f6e839ff";
+       libraryHaskellDepends = [
+         base blaze-builder conduit conduit-combinators lens-simple
+         mono-traversable parsers safe-exceptions text time timerep
+         uri-bytestring xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base conduit data-default hlint lens-simple mono-traversable
+         parsers quickcheck-instances resourcet safe-exceptions tasty
+         tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit
+         xml-types
+       ];
+       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "atom-msp430" = callPackage
     ({ mkDerivation, atom, base, mtl }:
      mkDerivation {
@@ -31270,6 +31318,8 @@ self: {
        pname = "bindynamic";
        version = "1.0.0.0";
        sha256 = "f1e9c392ea6a9be6a4d7200ed8060e5560ac6881c65c9423cc6e63d2bbe7246e";
+       revision = "1";
+       editedCabalFile = "d2dca13b71f94e70829d5d290af936fd21d93e1fb9f6b89a8540cd6f40a0a7e5";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        homepage = "https://github.com/lspitzner/bindynamic";
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
@@ -33315,6 +33365,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bookkeeping" = callPackage
+    ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
+     mkDerivation {
+       pname = "bookkeeping";
+       version = "0.1.0.1";
+       sha256 = "3fcfd3c8754c14b4882c35bb9762d928ada95fc099bac3ab5bb4821aeb879a58";
+       libraryHaskellDepends = [ base dlist mtl text time ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
+       description = "A module for bookkeeping by double entry";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bool-extras" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -41662,10 +41725,8 @@ self: {
      }:
      mkDerivation {
        pname = "colour-space";
-       version = "0.1.2.0";
-       sha256 = "963b04b703a2d5f273ffc43b3687e6d58afed144eef47d4070b0bdec6f3bd3e5";
-       revision = "1";
-       editedCabalFile = "54a4d19227a0e550ad5c89295596d5c8b3b3d8d9ffd0b1f937ca48198ce6e7ad";
+       version = "0.1.3.0";
+       sha256 = "d8e324ce287c9607c0358a70ecc02ee5a1c071661b020dac4a0d674b94b55119";
        libraryHaskellDepends = [
          base colour constrained-categories JuicyPixels linear
          linearmap-category manifolds semigroups vector-space
@@ -56218,10 +56279,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamic-plot";
-       version = "0.2.1.0";
-       sha256 = "8d75d0d068f801f2da0199738b43261966f265f62f58b3ad9f5b33e7c7158999";
-       revision = "1";
-       editedCabalFile = "d2d367212ca5c730e629b14d04a12eccc8bee0d3bead4f16c7db230507753c4e";
+       version = "0.2.2.0";
+       sha256 = "7f04a719fd74874eab8f362443ebdac8ad9caffd6271f72a8904f4723a2a9cf0";
        libraryHaskellDepends = [
          base colour colour-space constrained-categories containers
          data-default deepseq diagrams-cairo diagrams-core diagrams-gtk
@@ -57285,8 +57344,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.7";
-       sha256 = "2266b9bd5f43108d9f386efd0c8fa1976e59ec2baa12ecefb815387a3a4be927";
+       version = "1.0.8";
+       sha256 = "8a12b4ee452e708e0e345963487341c48bf1936aabc47eef2e8b2efd69771b78";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -57302,8 +57361,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.6";
-       sha256 = "730398bdc04966332584439346e242554b5f0e03c38ff00243eee54c451225b5";
+       version = "1.0.7";
+       sha256 = "4dc63dc6fa6305a601152fa1a4f8e41f4d519e53967940bbc8565baf09b450a3";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -63776,11 +63835,11 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.0.8";
-       sha256 = "1be849d2dbf73a7ad02d0945ae7eb834085ed4a192dcdf5733c2fd764d308adb";
+       version = "0.5.1.0";
+       sha256 = "0153c9fe8224f1cf72acfd6b738f03fed28e7b498ececaec176edb98556ef184";
        isLibrary = true;
        isExecutable = true;
-       setupHaskellDepends = [ base Cabal ];
+       setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [ base bytestring text ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base directory filepath mtl parsec ];
@@ -65104,8 +65163,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.7";
-       sha256 = "bb30362bc3c5f8293a75af0bda8e52dee497e06ab3c0f44b088d619a41f5707d";
+       version = "0.7.1";
+       sha256 = "051dff857638b93e574aecce065860e1985e71a8e0f07c410966cdf87880930c";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -67663,8 +67722,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.3.0.0";
-       sha256 = "ac533aec5b7d845596d5f0caef8fa2c931a8ba9fee17650e0141df4a6baacd0b";
+       version = "0.3.1.0";
+       sha256 = "84ca3ffc6717a1cf9c535a53e4f8451ae4878370870555bced73ea33fd724a02";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -69871,6 +69930,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ginger_0_5_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
+     , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "ginger";
+       version = "0.5.0.0";
+       sha256 = "619261156d6d5fa5cdde9b2f39429c22b20b9d9159dcb4e867a598f5ed5c7f5c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default filepath http-types mtl parsec
+         safe scientific text time transformers unordered-containers
+         utf8-string vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring data-default text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default mtl tasty tasty-hunit
+         tasty-quickcheck text time transformers unordered-containers
+         utf8-string
+       ];
+       homepage = "https://bitbucket.org/tdammers/ginger";
+       description = "An implementation of the Jinja2 template language in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ginsu" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, containers
      , directory, hashable, hashtables, mtl, network, old-locale
@@ -71107,16 +71198,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glazier_0_8_0_0" = callPackage
-    ({ mkDerivation, base, lens, mmorph, mtl, profunctors
-     , semigroupoids, transformers
+  "glazier_0_10_0_0" = callPackage
+    ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids
+     , transformers
      }:
      mkDerivation {
        pname = "glazier";
-       version = "0.8.0.0";
-       sha256 = "758345dee0b3401091ce52ce8e91332dd763bcfba112e211166ee7e7f69efa9c";
+       version = "0.10.0.0";
+       sha256 = "af7325fd898b62b8a29c106836b25fd334ab637d5d773a55da1fc25942af5167";
        libraryHaskellDepends = [
-         base lens mmorph mtl profunctors semigroupoids transformers
+         base lens mmorph mtl semigroupoids transformers
        ];
        homepage = "https://github.com/louispan/glazier#readme";
        description = "Composable widgets framework";
@@ -75316,13 +75407,13 @@ self: {
      }:
      mkDerivation {
        pname = "grapefruit-examples";
-       version = "0.1.0.5";
-       sha256 = "994a75f551cfe8c1a91eb83c5100abb6177acc3fdcd13c643ef08573ad24a629";
+       version = "0.1.0.6";
+       sha256 = "d12f367a313bebb5d793a152ab59223ada856fb4150428d994f30b87ae60e99b";
        libraryHaskellDepends = [
          base colour containers fraction grapefruit-frp grapefruit-records
          grapefruit-ui
        ];
-       homepage = "http://grapefruit-project.org/";
+       homepage = "https://grapefruit-project.org/";
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75334,12 +75425,12 @@ self: {
      }:
      mkDerivation {
        pname = "grapefruit-frp";
-       version = "0.1.0.5";
-       sha256 = "15b626d8eaa352f3ad891cf7a235a71161791797326400d630a4fe4a9dacb094";
+       version = "0.1.0.6";
+       sha256 = "4e661fd1f137e438e1fa82d2d2bba7e9df24f5cf2e08027b2085793bc0c08ec0";
        libraryHaskellDepends = [
          arrows base containers fingertree semigroups TypeCompose
        ];
-       homepage = "http://grapefruit-project.org/";
+       homepage = "https://grapefruit-project.org/";
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75349,10 +75440,10 @@ self: {
     ({ mkDerivation, arrows, base, grapefruit-frp }:
      mkDerivation {
        pname = "grapefruit-records";
-       version = "0.1.0.5";
-       sha256 = "011af70c436e6463b0fa43e873fcdbe584ac7a29546deb6d4dd401f1f5ca1e0a";
+       version = "0.1.0.6";
+       sha256 = "f5b41878c93312c4149b8c44dbc51bef35de6f9ab9b0d6a5e898f3285c5c99e4";
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
-       homepage = "http://grapefruit-project.org/";
+       homepage = "https://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75364,13 +75455,13 @@ self: {
      }:
      mkDerivation {
        pname = "grapefruit-ui";
-       version = "0.1.0.5";
-       sha256 = "58264c0628092bef6ecaa148de601a267bea6c352a8488f8fd7e1f82c4dbbd87";
+       version = "0.1.0.6";
+       sha256 = "16c7d95fa20d962c72dcc25d13ccd60d625f6c8fee6ea2b7d8a66dc1725f8fc9";
        libraryHaskellDepends = [
          arrows base colour containers fraction grapefruit-frp
          grapefruit-records
        ];
-       homepage = "http://grapefruit-project.org/";
+       homepage = "https://grapefruit-project.org/";
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75378,17 +75469,18 @@ self: {
 
   "grapefruit-ui-gtk" = callPackage
     ({ mkDerivation, base, colour, containers, fraction, glib
-     , grapefruit-frp, grapefruit-records, grapefruit-ui, gtk
+     , grapefruit-frp, grapefruit-records, grapefruit-ui, gtk3
+     , transformers
      }:
      mkDerivation {
        pname = "grapefruit-ui-gtk";
-       version = "0.1.0.5";
-       sha256 = "3f91385bada888f49f9b61b8c0bc289675fcd447f875c766044e9c6da5dfda80";
+       version = "0.1.0.6";
+       sha256 = "1f3411ae628b64f842a205e22226bc651e698dd368950d0063bf8ef3f1a7ba42";
        libraryHaskellDepends = [
          base colour containers fraction glib grapefruit-frp
-         grapefruit-records grapefruit-ui gtk
+         grapefruit-records grapefruit-ui gtk3 transformers
        ];
-       homepage = "http://grapefruit-project.org/";
+       homepage = "https://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78321,8 +78413,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.2.2";
        sha256 = "507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41";
-       revision = "1";
-       editedCabalFile = "abb26d1da6e07e187a4494591154080415152787c2583c09acf522ab929b9642";
+       revision = "2";
+       editedCabalFile = "678fde798c4291a66cc8d0497c1df558292dd8526b46132d6c651dc090ef0e5a";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring Cabal
          containers cryptohash-sha256 directory ed25519 filepath ghc-prim
@@ -85659,8 +85751,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.0.1";
-       sha256 = "6d4e53adcfc7375736ce47beb07e0ab3c6ec96300ce91edbae1fbd009bfff0db";
+       version = "0.5.0.2";
+       sha256 = "bcaf93d7febb8f04540010b2b0a244030bda1d5002b7cc158bbd05ba5acc9172";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87246,6 +87338,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hformat_0_2_0_0" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, hspec, text }:
+     mkDerivation {
+       pname = "hformat";
+       version = "0.2.0.0";
+       sha256 = "a949d752095cdc21a2e48ab4adf068ba67e5e53fa394e6fae9f29fe156dccefb";
+       libraryHaskellDepends = [ base base-unicode-symbols text ];
+       testHaskellDepends = [ base base-unicode-symbols hspec text ];
+       homepage = "http://github.com/mvoidex/hformat";
+       description = "Simple Haskell formatting";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hfov" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -88679,12 +88785,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "histogram-fill_0_8_5_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, primitive, vector }:
+     mkDerivation {
+       pname = "histogram-fill";
+       version = "0.8.5.0";
+       sha256 = "fbdd167d6f27c0d88f9aa8647ae95a313101c63a827275ac8d016d6028975133";
+       libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
+       homepage = "https://github.com/Shimuuar/histogram-fill/";
+       description = "Library for histograms creation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "histogram-fill-binary" = callPackage
     ({ mkDerivation, base, binary, histogram-fill, vector }:
      mkDerivation {
        pname = "histogram-fill-binary";
-       version = "0.6.2.1";
-       sha256 = "22ea6f6453ae85486621d05afaed5e3903be4b41464594f5e8a040840304672f";
+       version = "0.8.5.0";
+       sha256 = "1eefe685953e205c8dfb9003f56e28bd17b673c0e6bd5455bb59d9a50b6b7b36";
        libraryHaskellDepends = [ base binary histogram-fill vector ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Binary instances for histogram-fill package";
@@ -88695,11 +88814,11 @@ self: {
     ({ mkDerivation, base, cereal, histogram-fill, vector }:
      mkDerivation {
        pname = "histogram-fill-cereal";
-       version = "0.6.2.0";
-       sha256 = "55c7212207e03e55e01f6ce5715ee75f4029520804410ca61a6310b398b1769d";
+       version = "0.8.5.0";
+       sha256 = "38e36d11e6de32b2fd955a66961bfca4f81711e139cee680264c5c76962952cd";
        libraryHaskellDepends = [ base cereal histogram-fill vector ];
-       homepage = "http://bitbucket.org/Shimuuar/histogram-fill-cereal/";
-       description = "Library for histograms creation";
+       homepage = "https://github.com/Shimuuar/histogram-fill/";
+       description = "Binary instances for histogram-fill package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -91049,8 +91168,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-generator";
-       version = "0.3.0";
-       sha256 = "48d8e8c41c1204ced517a337d454a1dc87bd6a5ef3697f09756fac22e4d374ef";
+       version = "0.3.1";
+       sha256 = "162598c04c1e977b666c491dfb34451c43c08354427d9ed806b81169d6dd9c80";
        libraryHaskellDepends = [
          base containers directory filepath haskell-src mtl
        ];
@@ -98040,8 +98159,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "1.0.0";
-       sha256 = "01722988ca762cfefcbb97944d408fb3f4463fe56a3697e7e3aba501962d3af0";
+       version = "1.1.1";
+       sha256 = "be1ae93a00f627052a5f6c2d87bf26b531d59c737d69db6d0717cf0ef1b03402";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98068,8 +98187,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "1.0.0";
-       sha256 = "9b37eecd87f4e166a9cf8fec4dc2685aadb458028fae5d2adaea480e05826d1a";
+       version = "1.1.1";
+       sha256 = "308d8e9ed13fc980148b0b1b26e090739533c210bdbbfceb990d4ae54170a212";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102701,8 +102820,8 @@ self: {
        pname = "ip";
        version = "0.8.7";
        sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690";
-       revision = "1";
-       editedCabalFile = "53d0cca59537fcb2f837d6afcb3d9b0ac3df15a7cdbc4a06f97d696931698ebd";
+       revision = "2";
+       editedCabalFile = "121a83393fc17cfc59aee069015fcfd0a6f6d33e14314cb6688fed05396aafb6";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -103345,6 +103464,18 @@ self: {
        license = "LGPL";
      }) {};
 
+  "iso3166-country-codes_0_20140203_8" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "iso3166-country-codes";
+       version = "0.20140203.8";
+       sha256 = "b4d6e01cd61bcaef9a8e455c331a8e7a2298531cb587ef6f23675eae7a6b0a36";
+       libraryHaskellDepends = [ base ];
+       description = "A datatype for ISO 3166 country codes";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iso639" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -104179,8 +104310,8 @@ self: {
      }:
      mkDerivation {
        pname = "jammittools";
-       version = "0.5.2";
-       sha256 = "cf7b09b08144d7cdc35111a07a1374b08b099a4d639da12bcad9502a830bcebc";
+       version = "0.5.3";
+       sha256 = "2e6ab2632c50b2141ec9ab885db21f9ec8ad4d8499507d5f6a8ede49955764d1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104690,6 +104821,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jose-jwt_0_7_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
+     , containers, 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
+       ];
+       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 {
@@ -105751,8 +105905,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.11";
-       sha256 = "ec2419917909588b5aaf88fef64fc0b7cb40d9da9e41a26763c53def58f8c506";
+       version = "0.2.14";
+       sha256 = "cae9327fe9d2068d74f9e8ed80125cb78f0a0612b3eb8f361ff7b5871cc77eb5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107656,6 +107810,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "labels_0_3_2" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "labels";
+       version = "0.3.2";
+       sha256 = "c4060c9fe6adb9f8c34f21acf761a4a5e0f45c4d580a27ead0f05ea2717e0a31";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "https://github.com/chrisdone/labels#readme";
+       description = "Anonymous records via named tuples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "laborantin-hs" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cmdlib, containers
      , directory, hslogger, mtl, old-locale, parsec, random, split, text
@@ -108020,7 +108187,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {};
 
   "lambdabot-core" = callPackage
@@ -108073,7 +108240,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -108200,7 +108366,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacat" = callPackage
@@ -112218,15 +112383,16 @@ self: {
   "linearmap-category" = callPackage
     ({ mkDerivation, base, constrained-categories, containers
      , free-vector-spaces, ieee754, lens, linear, manifolds-core
-     , semigroups, tagged, vector, vector-space
+     , semigroups, tagged, transformers, vector, vector-space
      }:
      mkDerivation {
        pname = "linearmap-category";
-       version = "0.3.0.1";
-       sha256 = "f8f24aa068e6578798b9fcdbbc4e7058322db89cf630540b7b91a7cbfe5d5f78";
+       version = "0.3.2.0";
+       sha256 = "45932979d622e33de233a01e8e66e5925be9553caa246132705e36437580233d";
        libraryHaskellDepends = [
          base constrained-categories containers free-vector-spaces ieee754
-         lens linear manifolds-core semigroups tagged vector vector-space
+         lens linear manifolds-core semigroups tagged transformers vector
+         vector-space
        ];
        homepage = "https://github.com/leftaroundabout/linearmap-family";
        description = "Native, complete, matrix-free linear algebra";
@@ -114187,6 +114353,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_1_3" = callPackage
+    ({ mkDerivation, async, base, exceptions, free, monad-control, mtl
+     , semigroups, stm, stm-delay, text, time, transformers
+     , transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.1.3";
+       sha256 = "0eaa34ec9174acc7cbc4c806b44f4b616430658bf215c086b3ee29877cbe7914";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl semigroups stm
+         stm-delay text time transformers transformers-base wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-facade" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
@@ -114394,31 +114579,23 @@ self: {
      }) {};
 
   "lol" = callPackage
-    ({ mkDerivation, arithmoi, base, binary, bytestring, constraints
-     , containers, crypto-api, data-default, deepseq, DRBG
+    ({ mkDerivation, arithmoi, base, bytestring, constraints
+     , containers, crypto-api, data-default, deepseq, directory
      , monadcryptorandom, MonadRandom, mtl, numeric-prelude
-     , protocol-buffers, protocol-buffers-descriptor, QuickCheck, random
-     , reflection, repa, singletons, tagged-transformer
-     , template-haskell, test-framework, test-framework-quickcheck2
-     , th-desugar, transformers, vector, vector-th-unbox
+     , protocol-buffers, protocol-buffers-descriptor, random, reflection
+     , singletons, tagged-transformer, template-haskell, vector
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "lol";
-       version = "0.5.0.2";
-       sha256 = "7a3a494d8262865e7262bf34e39030f1bf48c81a602b8f81e1d50770372030ca";
-       revision = "1";
-       editedCabalFile = "3e58e5596d39e3a7265acecf79ece269b44cf58fd14699bdbc9a28fde0bd622d";
+       version = "0.6.0.0";
+       sha256 = "973a5ecd6397fd01e34bb7a40e80a3b0b564ca00aeafb73dc66fb0ec988c950d";
        libraryHaskellDepends = [
-         arithmoi base binary bytestring constraints containers crypto-api
-         data-default deepseq monadcryptorandom MonadRandom mtl
-         numeric-prelude protocol-buffers protocol-buffers-descriptor
-         QuickCheck random reflection repa singletons tagged-transformer
-         template-haskell th-desugar transformers vector vector-th-unbox
-       ];
-       testHaskellDepends = [
-         arithmoi base constraints deepseq DRBG MonadRandom mtl QuickCheck
-         random repa singletons test-framework test-framework-quickcheck2
-         vector
+         arithmoi base bytestring constraints containers crypto-api
+         data-default deepseq directory monadcryptorandom MonadRandom mtl
+         numeric-prelude protocol-buffers protocol-buffers-descriptor random
+         reflection singletons tagged-transformer template-haskell vector
+         vector-th-unbox
        ];
        homepage = "https://github.com/cpeikert/Lol";
        description = "A library for lattice cryptography";
@@ -114456,6 +114633,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lol-benches" = callPackage
+    ({ mkDerivation, ansi-terminal, base, containers, criterion
+     , crypto-api, deepseq, DRBG, lol, MonadRandom, split, statistics
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "lol-benches";
+       version = "0.0.0.1";
+       sha256 = "13c40b8c3d05c57e43bbc76546486abfff269f412d81104c8790bf1fb4a7ed91";
+       libraryHaskellDepends = [
+         ansi-terminal base containers criterion crypto-api deepseq DRBG lol
+         MonadRandom split statistics transformers vector
+       ];
+       homepage = "https://github.com/cpeikert/Lol";
+       description = "A library for benchmarking <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "lol-calculus" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, haskeline
      , mtl, parsec, text, text-format, transformers
@@ -114478,6 +114673,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lol-tests" = callPackage
+    ({ mkDerivation, base, lol, MonadRandom, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "lol-tests";
+       version = "0.0.0.1";
+       sha256 = "656cbe1a7bcea84cffd271a61d0f2b731e14705309636d872afff363628a37ed";
+       libraryHaskellDepends = [
+         base lol MonadRandom QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       testHaskellDepends = [ base lol test-framework ];
+       homepage = "https://github.com/cpeikert/Lol";
+       description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "lol-typing" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , ghc-prim, lol-calculus, monad-classes, parsec, tasty, tasty-hunit
@@ -115752,18 +115965,19 @@ self: {
      }) {};
 
   "madlang" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-megaparsec
-     , lens, megaparsec, mtl, mwc-random, optparse-generic, text
+    ({ mkDerivation, ansi-wl-pprint, base, gitrev, hspec
+     , hspec-megaparsec, lens, megaparsec, mtl, mwc-random
+     , optparse-generic, text
      }:
      mkDerivation {
        pname = "madlang";
-       version = "0.1.0.5";
-       sha256 = "2fcb9eea46f6cd7d67164baaa82078b9c4f3a486ce9ff0abf225731e68066f7a";
+       version = "1.0.0.0";
+       sha256 = "d8fd8f0055eab476c13c23361cec3a780319d90e45c2b45fccd1208b0ff24120";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base lens megaparsec mtl mwc-random optparse-generic
-         text
+         ansi-wl-pprint base gitrev lens megaparsec mtl mwc-random
+         optparse-generic text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -115901,16 +116115,17 @@ self: {
      }) {};
 
   "mailchimp" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
-     , http-client-tls, servant, servant-client, text, transformers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, generics-sop
+     , http-client, http-client-tls, servant, servant-client, text
+     , transformers
      }:
      mkDerivation {
        pname = "mailchimp";
-       version = "0.1.1";
-       sha256 = "d6bdac26adc60ded7352010674a0b562f9b809e5c49954dd738d1cbfd6cb95d6";
+       version = "0.2.0";
+       sha256 = "03cbeca629b8f9cc4e9ebd86c98aa05c03726d7358b523d8fc81e309dfa4e4da";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring http-client http-client-tls
-         servant servant-client text transformers
+         aeson attoparsec base bytestring generics-sop http-client
+         http-client-tls servant servant-client text transformers
        ];
        homepage = "https://github.com/jpvillaisaza/mailchimp-haskell";
        description = "Bindings for the MailChimp API";
@@ -116072,6 +116287,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "makefile_0_1_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }:
+     mkDerivation {
+       pname = "makefile";
+       version = "0.1.1.0";
+       sha256 = "3ccab1e08b9920e4390b9dca8504e4ba621b693e0fa25b4c3dd68042373a325e";
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       testHaskellDepends = [ attoparsec base bytestring doctest Glob ];
+       homepage = "http://github.com/nmattia/mask";
+       description = "Simple Makefile parser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "managed" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -116542,8 +116771,8 @@ self: {
      }:
      mkDerivation {
        pname = "manifold-random";
-       version = "0.4.0.0";
-       sha256 = "7300fabce3e4c7723cc320f4c96bbd7980ca4e72cb694aa422b91d51b6e26c5e";
+       version = "0.4.1.0";
+       sha256 = "a59a301f18bd852b7ac135a723631145e0b766b216046f5392d014ac83f02311";
        libraryHaskellDepends = [
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
@@ -116556,18 +116785,19 @@ self: {
 
   "manifolds" = callPackage
     ({ mkDerivation, base, comonad, constrained-categories, containers
-     , deepseq, free-vector-spaces, lens, linear, linearmap-category
-     , manifolds-core, MemoTrie, semigroups, tagged, transformers
-     , vector, vector-space, void
+     , deepseq, free, free-vector-spaces, lens, linear
+     , linearmap-category, manifolds-core, MemoTrie, number-show
+     , semigroups, tagged, transformers, vector, vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.4.0.0";
-       sha256 = "7a4a8a4c392b5e0743e0984bbd361a744a7e054838ca9353131b0bea04e09f93";
+       version = "0.4.1.0";
+       sha256 = "a10fb25dbfedc0bd308d4bbdabae83721784fef8e0e91278124a1cefc166afee";
        libraryHaskellDepends = [
-         base comonad constrained-categories containers deepseq
+         base comonad constrained-categories containers deepseq free
          free-vector-spaces lens linear linearmap-category manifolds-core
-         MemoTrie semigroups tagged transformers vector vector-space void
+         MemoTrie number-show semigroups tagged transformers vector
+         vector-space void
        ];
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
@@ -116579,8 +116809,8 @@ self: {
     ({ mkDerivation, base, tagged, vector-space }:
      mkDerivation {
        pname = "manifolds-core";
-       version = "0.4.0.0";
-       sha256 = "53a19cc72ef02345f161676d04701249fbf36cd02303672a1d5e3ecd78341568";
+       version = "0.4.1.0";
+       sha256 = "8fd0dc49d4bc1246abd0e1043355154d1d747dad6ec5f03cdd00209a65252b10";
        libraryHaskellDepends = [ base tagged vector-space ];
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "The basic classes for the manifolds hierarchy";
@@ -116935,31 +117165,32 @@ self: {
      }) {};
 
   "marvin" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, configurator
-     , directory, filepath, hashable, haskeline, lens, lifted-async
-     , lifted-base, marvin-interpolate, monad-control, monad-logger
-     , monad-loops, mono-traversable, mtl, mustache, network-uri
-     , optparse-applicative, random, stm, text, text-icu, time
-     , transformers-base, unordered-containers, vector, wai, warp
-     , websockets, wreq, wuss
+    ({ mkDerivation, aeson, base, bytestring, configurator, deepseq
+     , directory, filepath, hashable, haskeline, http-client
+     , http-client-tls, http-types, lens, lifted-async, lifted-base
+     , marvin-interpolate, monad-control, monad-logger, monad-loops, mtl
+     , mustache, network-uri, optparse-applicative, random, stm, text
+     , text-icu, time, transformers, transformers-base
+     , unordered-containers, vector, wai, warp, warp-tls, websockets
+     , wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.0.9";
-       sha256 = "10c98f4282208ec6c99ac4530dd8e4127b5e6635b1d6df9d250432e0eff01dfa";
+       version = "0.1.5";
+       sha256 = "42cebd7af1b7d20575a08bbd1510226761aa2f494f64b0e7110d350f211b504a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson async base bytestring configurator hashable haskeline lens
-         lifted-async lifted-base marvin-interpolate monad-control
-         monad-logger monad-loops mono-traversable mtl network-uri
-         optparse-applicative random stm text text-icu time
-         transformers-base unordered-containers vector wai warp websockets
-         wreq wuss
+         aeson base bytestring configurator deepseq hashable haskeline
+         http-client http-client-tls http-types lens lifted-async
+         lifted-base marvin-interpolate monad-control monad-logger
+         monad-loops mtl network-uri optparse-applicative random stm text
+         text-icu time transformers transformers-base unordered-containers
+         vector wai warp warp-tls websockets wreq wuss
        ];
        executableHaskellDepends = [
-         aeson base bytestring configurator directory filepath
-         mono-traversable mustache optparse-applicative text
+         aeson base bytestring configurator directory filepath mustache
+         optparse-applicative text
        ];
        homepage = "https://marvin.readthedocs.io";
        description = "A modular chat bot";
@@ -116973,8 +117204,8 @@ self: {
      }:
      mkDerivation {
        pname = "marvin-interpolate";
-       version = "1.0";
-       sha256 = "bb80ab05ba25400c688af5f1ca1f0a02e07aa3a99115b1cf2d4f684caaa339ae";
+       version = "1.1";
+       sha256 = "4ab8a4739390bf13b1612f223a671b440d959e8f70c9b2913e35cf1cb9e75656";
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell text
        ];
@@ -117258,8 +117489,8 @@ self: {
      }:
      mkDerivation {
        pname = "matrix-market-attoparsec";
-       version = "0.1.0.3";
-       sha256 = "e6c71b7405174df690d7617d1b295bc12b3e8be52b766fff79801f207fc93e20";
+       version = "0.1.0.4";
+       sha256 = "f26e637d3e10c0ef98dbb3307d2410eed5dca54affbd052162d1b1bc378b8e6d";
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions scientific
        ];
@@ -117343,6 +117574,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "maxent-learner-hw" = callPackage
+    ({ mkDerivation, array, base, containers, csv, deepseq, file-embed
+     , mtl, optparse-applicative, parallel, random, text, vector
+     }:
+     mkDerivation {
+       pname = "maxent-learner-hw";
+       version = "0.1.2";
+       sha256 = "582b87a3f644043455906a2e48cfacc83a384d08bc5c97de7b2feb971efcb434";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers csv deepseq mtl random text vector
+       ];
+       executableHaskellDepends = [
+         array base containers deepseq file-embed mtl optparse-applicative
+         parallel random text
+       ];
+       homepage = "https://github.com/george-steel/maxent-learner";
+       description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
+       license = "GPL";
+     }) {};
+
   "maximal-cliques" = callPackage
     ({ mkDerivation, base, containers, vector }:
      mkDerivation {
@@ -119775,8 +120028,8 @@ self: {
     ({ mkDerivation, base, bytestring, cereal, mtl, transformers }:
      mkDerivation {
        pname = "modbus-tcp";
-       version = "0.4";
-       sha256 = "eb77f105623bdf639d0f309eb7fecbc89512b9b0d2acb47ae8f2a589b270510f";
+       version = "0.5";
+       sha256 = "be27b38fc90ed81d5a4b3f15ee180519ac47fe9e905e77e3eed7db7371b3e856";
        libraryHaskellDepends = [
          base bytestring cereal mtl transformers
        ];
@@ -125512,6 +125765,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "network-carbon_1_0_9" = callPackage
+    ({ mkDerivation, base, bytestring, network, text, time, vector }:
+     mkDerivation {
+       pname = "network-carbon";
+       version = "1.0.9";
+       sha256 = "70860d724fce8a1ee8f2ef80ea0466544ef1deb4c2b9435f15ea234d914a3b35";
+       libraryHaskellDepends = [
+         base bytestring network text time vector
+       ];
+       homepage = "http://github.com/ocharles/network-carbon";
+       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-conduit" = callPackage
     ({ mkDerivation, base, conduit }:
      mkDerivation {
@@ -127357,8 +127625,8 @@ self: {
      }:
      mkDerivation {
        pname = "ntrip-client";
-       version = "0.1.5";
-       sha256 = "eb93158c19610209c4d5e89de75afe7aa70bf3871e0e0b3ee70418d1f0d1aee8";
+       version = "0.1.6";
+       sha256 = "c508b4e7a9859b7eb306b58383d177f4cb66aec7c356ffe9323e32e6a3e46dac";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -127448,6 +127716,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "number-show" = callPackage
+    ({ mkDerivation, base, microlens, microlens-th }:
+     mkDerivation {
+       pname = "number-show";
+       version = "0.1.0.0";
+       sha256 = "3e4ba74494fce27278ae6c07773d75be901be09c51028f47cbdc9087d9e29e06";
+       revision = "1";
+       editedCabalFile = "8c75cd93ac276a74f86693467c56de7ecb7c04f9d93d26c369199d7a7baaf173";
+       libraryHaskellDepends = [ base microlens microlens-th ];
+       description = "Flexible and accurate (for a given precision) numerical->string conversion";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "numbering" = callPackage
     ({ mkDerivation, base, containers, vector }:
      mkDerivation {
@@ -129545,6 +129826,35 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "opml-conduit_0_6_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, containers, data-default, hlint, lens-simple
+     , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck
+     , quickcheck-instances, resourcet, safe-exceptions, semigroups
+     , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep
+     , uri-bytestring, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "opml-conduit";
+       version = "0.6.0.2";
+       sha256 = "b1f66c0ba92fdf436889058e7fa62dca5a86398348432ab38c352af1804e4125";
+       libraryHaskellDepends = [
+         base case-insensitive conduit conduit-combinators containers
+         lens-simple mono-traversable monoid-subclasses safe-exceptions
+         semigroups text time timerep uri-bytestring xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators containers data-default
+         hlint lens-simple mono-traversable mtl parsers QuickCheck
+         quickcheck-instances resourcet semigroups tasty tasty-hunit
+         tasty-quickcheck text time uri-bytestring xml-conduit
+       ];
+       homepage = "https://github.com/k0ral/opml-conduit";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opn" = callPackage
     ({ mkDerivation, base, directory, filepath, ini, network-uri
      , optparse-applicative, process, text, unordered-containers
@@ -133529,6 +133839,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-record_0_4_1_1" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, names-th
+     , quickcheck-simple, template-haskell, th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "persistable-record";
+       version = "0.4.1.1";
+       sha256 = "dd62fde2b2cde224f8bbc2fdb71abc586ed1c16519d2ddd1a5744412144c57d6";
+       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
@@ -134610,6 +134939,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pi-lcd" = callPackage
+    ({ mkDerivation, base, bytestring, clock, text, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "pi-lcd";
+       version = "0.1.0.0";
+       sha256 = "afd0dc56b2c3254420b7b3590bca606be9a7d6881cacfab04e5fb2dbe31303d9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring clock text unix unordered-containers
+       ];
+       executableHaskellDepends = [ base text ];
+       homepage = "https://github.com/ppelleti/pi-lcd";
+       description = "Control an Adafruit character LCD and keypad kit on a Raspberry Pi";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pia-forward" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , filepath, http-client, http-client-tls, network-info, process
@@ -134747,6 +135095,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pidfile" = callPackage
+    ({ mkDerivation, base, unix }:
+     mkDerivation {
+       pname = "pidfile";
+       version = "0.1.0.1";
+       sha256 = "5af1a8984396635229057f9d0a6bc5cf7d7fa2fba55c8f0e9dfc2a4534e448df";
+       libraryHaskellDepends = [ base unix ];
+       homepage = "https://github.com/jonpetterbergman/pidfile";
+       description = "Run an IO action protected by a pidfile";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "piet" = callPackage
     ({ mkDerivation, array, base, containers, Imlib, mtl }:
      mkDerivation {
@@ -135487,18 +135847,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-misc_0_2_4_0" = callPackage
+  "pipes-misc_0_2_5_0" = callPackage
     ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
      , pipes, pipes-category, pipes-concurrency, semigroups, stm
      , transformers
      }:
      mkDerivation {
        pname = "pipes-misc";
-       version = "0.2.4.0";
-       sha256 = "5602e1cc4a726b62de393b0236db0ba1bbd2f847f8fc5ac30c5ee727fb40041b";
+       version = "0.2.5.0";
+       sha256 = "69cf964dcc21efcf74a30e2bf792405019fb0b0ab22130ca806f7907f1ed3669";
        libraryHaskellDepends = [
-         base clock Decimal lens mtl pipes pipes-category pipes-concurrency
-         semigroups stm transformers
+         base clock Decimal lens mmorph mtl pipes pipes-category
+         pipes-concurrency semigroups stm transformers
        ];
        testHaskellDepends = [
          base hspec lens mmorph pipes pipes-concurrency stm transformers
@@ -135689,6 +136049,8 @@ self: {
        pname = "pipes-s3";
        version = "0.3.0.2";
        sha256 = "fd89bb1af54af172c2b4fb2c75782a1cbf8ff7778fbb40da1bc2d2e3ec2fa4e7";
+       revision = "1";
+       editedCabalFile = "3ea6a4e25482c09ecd13270fc8c6c85340f803990f6dc72e8e4d9a5982ab2b70";
        libraryHaskellDepends = [
          aws base bytestring http-client http-client-tls http-types pipes
          pipes-bytestring pipes-safe resourcet text transformers
@@ -137491,10 +137853,8 @@ self: {
      }:
      mkDerivation {
        pname = "posix-paths";
-       version = "0.2.1.0";
-       sha256 = "2086e66f6aef0629d586c63d461a0c45232dc6c3afc939898106bcc632c0faa0";
-       revision = "2";
-       editedCabalFile = "8ad8aaa78d501b83f4583cb66365cc518f531a54fa4f97e458c0b86008a1acfe";
+       version = "0.2.1.1";
+       sha256 = "dff5332ea4648bb2c4e25ce2f79d89282f653af60f03b09efe8110673709245f";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [
          base bytestring doctest HUnit QuickCheck unix
@@ -138384,8 +138744,8 @@ self: {
      }:
      mkDerivation {
        pname = "preamble";
-       version = "0.0.21";
-       sha256 = "7b5918a713a9d56c85bc36027541809ccf5a60706c0e74f0875fa059cbf8dc24";
+       version = "0.0.23";
+       sha256 = "9da28ef916d8c8dec8bb28071e2536a4a5076438028d2e7b1c4e4b020383b044";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -139283,12 +139643,16 @@ self: {
      }) {};
 
   "privileged-concurrency" = callPackage
-    ({ mkDerivation, base, stm }:
+    ({ mkDerivation, base, lifted-base, monad-control, stm
+     , transformers-base
+     }:
      mkDerivation {
        pname = "privileged-concurrency";
-       version = "0.3";
-       sha256 = "c760e05e350ad4af188d031cb12749b2d1468046d9f06e6cdcb77a9a50286464";
-       libraryHaskellDepends = [ base stm ];
+       version = "0.5";
+       sha256 = "5be035781722144dec6ab14f443ecccb6addcf4be2f871f4bb372e5a9790ebfe";
+       libraryHaskellDepends = [
+         base lifted-base monad-control stm transformers-base
+       ];
        description = "Provides privilege separated versions of the concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144580,6 +144944,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reactive-banana-gi-gtk" = callPackage
+    ({ mkDerivation, base, gi-gtk, haskell-gi-base, reactive-banana
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "reactive-banana-gi-gtk";
+       version = "0.1.0.0";
+       sha256 = "adb56a19f5021b446929620bdb6a3977194d1e47698f192173f7e7e169821f30";
+       libraryHaskellDepends = [
+         base gi-gtk haskell-gi-base reactive-banana text transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/mr/reactive-banana-gi-gtk";
+       description = "Simple reactive programming with GTK GObject Introspection";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "reactive-banana-sdl" = callPackage
     ({ mkDerivation, base, data-lens, data-lens-template
      , reactive-banana, SDL, SDL-image, SDL-ttf
@@ -145961,38 +146342,41 @@ self: {
      }) {};
 
   "regex" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, directory
-     , hashable, heredoc, regex-base, regex-pcre-builtin, regex-tdfa
-     , regex-tdfa-text, shelly, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, template-haskell, text, time, transformers
+    ({ mkDerivation, array, base, base-compat, bytestring, containers
+     , directory, hashable, heredoc, http-conduit, regex-base
+     , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly
+     , smallcheck, tasty, tasty-hunit, tasty-smallcheck
+     , template-haskell, text, time, time-locale-compat, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.0.0.2";
-       sha256 = "200695e102f2a698939833c35c6862bfa93803a5f4e22fa7ad40e76999ed2396";
+       version = "0.1.0.0";
+       sha256 = "21ed5c61fe5c97790a085657b6c022c48953fa8a5904d0d14c695ae3593f3448";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base bytestring containers hashable heredoc regex-base
-         regex-pcre-builtin regex-tdfa regex-tdfa-text smallcheck tasty
-         tasty-hunit tasty-smallcheck template-haskell text time
-         transformers unordered-containers
+         array base base-compat bytestring containers hashable heredoc
+         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
+         template-haskell text time time-locale-compat transformers
+         unordered-containers
        ];
        executableHaskellDepends = [
-         array base bytestring containers directory hashable heredoc
-         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly
-         smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text
-         time transformers unordered-containers
+         array base base-compat bytestring containers directory hashable
+         heredoc http-conduit regex-base regex-pcre-builtin regex-tdfa
+         regex-tdfa-text shelly smallcheck tasty tasty-hunit
+         tasty-smallcheck template-haskell text time time-locale-compat
+         transformers unordered-containers
        ];
        testHaskellDepends = [
-         array base bytestring containers directory hashable heredoc
-         regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text shelly
-         smallcheck tasty tasty-hunit tasty-smallcheck template-haskell text
-         time transformers unordered-containers
+         array base base-compat bytestring containers directory hashable
+         heredoc http-conduit regex-base regex-pcre-builtin regex-tdfa
+         regex-tdfa-text shelly smallcheck tasty tasty-hunit
+         tasty-smallcheck template-haskell text time time-locale-compat
+         transformers unordered-containers
        ];
        homepage = "https://iconnect.github.io/regex";
-       description = "A Regular Expression Toolkit for regex-base";
+       description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -146897,14 +147281,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "relational-record_0_1_6_0" = callPackage
+  "relational-record_0_1_6_1" = callPackage
     ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
      , relational-query-HDBC
      }:
      mkDerivation {
        pname = "relational-record";
-       version = "0.1.6.0";
-       sha256 = "7f7b6ba0a9646e475b0092a062cbffd32f8cabb0d4da1f29e7c0672472afb115";
+       version = "0.1.6.1";
+       sha256 = "c18bb200618b86a0baec590408ac941fb6a2a1d158ba74d6f9f4239a8d4bdada";
        libraryHaskellDepends = [
          base persistable-types-HDBC-pg relational-query
          relational-query-HDBC
@@ -147039,8 +147423,8 @@ self: {
      }:
      mkDerivation {
        pname = "remarks";
-       version = "0.1.12";
-       sha256 = "3a36340fd00c3cd002dc1494508e1577004ea71a204e66785a1861d61356d087";
+       version = "0.1.13";
+       sha256 = "60d0765189daca9eb70e8c4c1598924ac9a72682d2962d56b781660de0d0ed74";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers GenericPretty pretty ];
@@ -149934,6 +150318,33 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "rss-conduit_0_3_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , conduit-extra, containers, data-default, hlint, lens-simple
+     , mono-traversable, QuickCheck, quickcheck-instances, resourcet
+     , safe, safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, timerep, uri-bytestring, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "rss-conduit";
+       version = "0.3.0.1";
+       sha256 = "d30265d4e68f7563580e6dd3a2b39c0017145d111c60def1d9667fdb6ca3aae6";
+       libraryHaskellDepends = [
+         base conduit conduit-combinators containers lens-simple
+         mono-traversable safe safe-exceptions text time timerep
+         uri-bytestring xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-extra data-default hlint
+         lens-simple mono-traversable QuickCheck quickcheck-instances
+         resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text
+         time uri-bytestring xml-conduit xml-types
+       ];
+       description = "Streaming parser/renderer for the RSS 2.0 standard.";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rss2irc" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, deepseq
      , feed, http-client, http-conduit, http-types, io-storage, irc
@@ -152293,8 +152704,8 @@ self: {
      }:
      mkDerivation {
        pname = "scrape-changes";
-       version = "0.1.0.4";
-       sha256 = "cdeba91d063c2e2368c15ad5c9767572e6101003d15bb7f1ae79b317c5792a72";
+       version = "0.1.0.5";
+       sha256 = "e1c2a54d597d12ced09af8e5247d4468e8a11cd6b90d9b1d398d2ebb9ebd06d1";
        libraryHaskellDepends = [
          async attoparsec base bytestring cron directory email-validate
          filepath hashable hslogger http-client lens mime-mail network-uri
@@ -152681,8 +153092,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-postgresql";
-       version = "0.1.0.0";
-       sha256 = "b8557deb006934cd605eabcf1a00c0c9ab4492490f140df22eef3e38a8d21752";
+       version = "0.1.1.0";
+       sha256 = "e13909695f1c4b1aa4615c2e2d586a352e42a144cbb7552fe0d029702d9f5533";
        libraryHaskellDepends = [
          base bytestring free mtl postgresql-libpq seakale time
        ];
@@ -153706,8 +154117,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.3.2";
-       sha256 = "0fc433fd42e2281fc9cb3e76a55cd0d6806b611c25fdba516734350507682a77";
+       version = "0.1.3.4";
+       sha256 = "553d2d47c1c04cb67c08632d26d817a8b1969d10064dd66409dc9d559056468f";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -157413,6 +157824,25 @@ 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
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "simple-log";
+       version = "0.6.0";
+       sha256 = "e22ba314bcfc3be5594db3d2a7ad505dcbf7b89d91e6f71f9921d80b76fadc5d";
+       libraryHaskellDepends = [
+         async base containers data-default deepseq directory exceptions
+         filepath hformat mtl SafeSemaphore text time transformers
+       ];
+       homepage = "http://github.com/mvoidex/simple-log";
+       description = "Simple log for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-log-syslog" = callPackage
     ({ mkDerivation, base, hsyslog, simple-log, text }:
      mkDerivation {
@@ -157661,6 +158091,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-smt_0_7_0" = callPackage
+    ({ mkDerivation, base, process }:
+     mkDerivation {
+       pname = "simple-smt";
+       version = "0.7.0";
+       sha256 = "87191687e3e0e63375a99520866de5eaa318b4f41f15adbcdffc3786e58687a5";
+       libraryHaskellDepends = [ base process ];
+       description = "A simple way to interact with an SMT solver process";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-sql-parser" = callPackage
     ({ mkDerivation, base, HUnit, mtl, parsec, pretty, test-framework
      , test-framework-hunit
@@ -159340,8 +159782,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-error-collector";
-       version = "1.1.2";
-       sha256 = "8c313ebefaa89447d6193d3346d37d46e198279fe4eb7218228da03fb3ba485c";
+       version = "1.1.3";
+       sha256 = "33873a9f9bc51a32d940ea43801090e40d5dbceabcbbd696834ef7c0f90d7ab5";
        libraryHaskellDepends = [
          async base containers lifted-base monad-loops snap stm time
          transformers
@@ -161406,15 +161848,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "sparse-linear-algebra_0_2_9_1" = callPackage
+  "sparse-linear-algebra_0_2_9_4" = callPackage
     ({ mkDerivation, base, containers, criterion, exceptions, hspec
      , mtl, mwc-random, primitive, QuickCheck, transformers, vector
      , vector-algorithms, vector-space
      }:
      mkDerivation {
        pname = "sparse-linear-algebra";
-       version = "0.2.9.1";
-       sha256 = "5210a7491d2cd6efb5c4cf7be53c10a8c4240b0653bd7d8bfbb5c5f86393a442";
+       version = "0.2.9.4";
+       sha256 = "5d97d81653785f08783cd29107f0f87c01611cf5b1ad1395ef1a8b799a04adf6";
        libraryHaskellDepends = [
          base containers exceptions mtl transformers vector
          vector-algorithms vector-space
@@ -161424,7 +161866,7 @@ self: {
          QuickCheck vector-space
        ];
        homepage = "https://github.com/ocramz/sparse-linear-algebra";
-       description = "Sparse linear algebra in native Haskell";
+       description = "Numerical computation in native Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -169369,6 +169811,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tdigest" = callPackage
+    ({ mkDerivation, base, base-compat, binary, bytes, Cabal
+     , cabal-doctest, deepseq, directory, doctest, filepath, reducers
+     , semigroups, tasty, tasty-quickcheck, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "tdigest";
+       version = "0";
+       sha256 = "bfadc69c58f576831b60da5c141f66eb8e0e0ed7d7b9353e04a39cb44fde37ff";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base base-compat binary deepseq reducers semigroups vector
+         vector-algorithms
+       ];
+       testHaskellDepends = [
+         base base-compat binary bytes deepseq directory doctest filepath
+         semigroups tasty tasty-quickcheck vector vector-algorithms
+       ];
+       homepage = "https://github.com/futurice/haskell-tdigest#readme";
+       description = "On-line accumulation of rank-based statistics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tdoc" = callPackage
     ({ mkDerivation, base, bytestring, template-haskell, transformers
      , xhtml
@@ -169454,6 +169919,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "telegram-api_0_6_0_2" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath
+     , hjpath, hspec, http-api-data, http-client, http-client-tls
+     , http-media, http-types, mime-types, mtl, optparse-applicative
+     , servant, servant-client, string-conversions, text, transformers
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "telegram-api";
+       version = "0.6.0.2";
+       sha256 = "e5a29e558d5a5930be9c7d79cb16c66499fe12d9c5ffe663f830be683d3527f7";
+       libraryHaskellDepends = [
+         aeson base bytestring http-api-data http-client http-media
+         http-types mime-types mtl servant servant-client string-conversions
+         text transformers
+       ];
+       testHaskellDepends = [
+         aeson ansi-wl-pprint base filepath hjpath hspec http-client
+         http-client-tls http-types optparse-applicative servant
+         servant-client text transformers utf8-string
+       ];
+       homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
+       description = "Telegram Bot API bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "telegram-bot" = callPackage
     ({ mkDerivation, base, containers, http-client, http-client-tls
      , pipes, telegram-api, text, transformers
@@ -171118,6 +171610,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-region_0_2_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";
+       libraryHaskellDepends = [
+         aeson base base-unicode-symbols bytestring groups lens text
+       ];
+       testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
+       homepage = "https://github.com/mvoidex/text-region";
+       description = "Marking text regions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-register-machine" = callPackage
     ({ mkDerivation, base, containers, mtl, vector }:
      mkDerivation {
@@ -174552,12 +175062,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers_0_5_2_0" = callPackage
+  "transformers_0_5_4_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "transformers";
-       version = "0.5.2.0";
-       sha256 = "6c408713a8ba7dd7a6573a4644e0c17fe11747f5bf259eab958421a7358a70e2";
+       version = "0.5.4.0";
+       sha256 = "f87f3f338aa2d85af55aadad643ca1ce32052a017b7d1273b0226c84bdb8889a";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -175330,6 +175840,23 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "tsv2csv" = callPackage
+    ({ mkDerivation, base, HUnit, split }:
+     mkDerivation {
+       pname = "tsv2csv";
+       version = "0.1.0.1";
+       sha256 = "c0c505350d73c53068f5c186d58de7bcabea839ce3b3d84c2c604a633f4c77fc";
+       revision = "2";
+       editedCabalFile = "f93f38f878487b20ee86e91a3923f285acd63a2a360fab8097224ec7e8da37b0";
+       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;
+     }) {};
+
   "tsvsql" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , optparse-applicative, string-qq, text, unordered-containers
@@ -180322,12 +180849,12 @@ self: {
      }) {};
 
   "validity-text" = callPackage
-    ({ mkDerivation, base, text, validity }:
+    ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.1.1.0";
-       sha256 = "43cf2ce6b53a406901cae0ac01d1e46a70e2c7eddac129e35f242bbb82bf7a02";
-       libraryHaskellDepends = [ base text validity ];
+       version = "0.1.2.0";
+       sha256 = "f08e3a0f3ebdfe57419dfc6eef7e119d2a6ce7b8d0948297384c73ad8de0913f";
+       libraryHaskellDepends = [ base bytestring text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
@@ -185540,8 +186067,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.7";
-       sha256 = "6ecd4a1430d63568683fd3d9282cf778e94b27f2d076de67f5853aa5eacb007e";
+       version = "0.3.8";
+       sha256 = "af9021f6b883cd9f90d984e6e66535f17738d0064fa96bd0f39938eeb863dd4b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 5fc89a6778fe9633c680a6f46a91d8ba839113f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 19 Feb 2017 20:29:42 +0100
Subject: [PATCH 0759/3449] language-ecmascript: jailbreak

---
 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 1f24556a1a2f..1a7d928dbdd9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -858,4 +858,7 @@ self: super: {
 
   # https://github.com/lambdabot/lambdabot/issues/158
   lambdabot-core = doJailbreak super.lambdabot-core;
+
+  # https://github.com/jswebtools/language-ecmascript/pull/81
+  language-ecmascript = doJailbreak super.language-ecmascript;
 }

From 055d6399ef4a6b958b97836144ca3e84c29df935 Mon Sep 17 00:00:00 2001
From: Rene Treffer <rene.treffer@soundcloud.com>
Date: Sun, 19 Feb 2017 21:08:26 +0100
Subject: [PATCH 0760/3449] coredns: 001 -> 005

---
 pkgs/servers/dns/coredns/default.nix    |   8 +-
 pkgs/servers/dns/coredns/deps.nix       | 488 +++++++++---------------
 pkgs/servers/dns/coredns/pull-278.patch | 153 --------
 3 files changed, 179 insertions(+), 470 deletions(-)
 delete mode 100644 pkgs/servers/dns/coredns/pull-278.patch

diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix
index 1955cce2a9f8..6dcb8fbbd772 100644
--- a/pkgs/servers/dns/coredns/default.nix
+++ b/pkgs/servers/dns/coredns/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "coredns-${version}";
-  version = "001";
+  version = "005";
 
   goPackagePath = "github.com/miekg/coredns";
   subPackages = [ "." ];
@@ -11,17 +11,15 @@ buildGoPackage rec {
     owner = "miekg";
     repo = "coredns";
     rev = "v${version}";
-    sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak";
+    sha256 = "11wvy3xp9in5ny6h7hp24dq6asc013vrwc6bqiky83dlzasjwkf6";
   };
 
-  patches = [ ./pull-278.patch ];
-
   goDeps = ./deps.nix;
 
   meta = with stdenv.lib; {
     homepage = https://coredns.io;
     description = "A DNS server that runs middleware";
     license = licenses.asl20;
-    maintainers = [ maintainers.rushmorem ];
+    maintainers = [ maintainers.rushmorem maintainers.rtreffer ];
   };
 }
diff --git a/pkgs/servers/dns/coredns/deps.nix b/pkgs/servers/dns/coredns/deps.nix
index 2aa442a8fef4..18bd2b1f85d8 100644
--- a/pkgs/servers/dns/coredns/deps.nix
+++ b/pkgs/servers/dns/coredns/deps.nix
@@ -1,111 +1,38 @@
-# This file was generated by go2nix.
 [
   {
-    goPackagePath = "cloud.google.com/go";
+    goPackagePath = "github.com/cockroachdb/cmux";
     fetch = {
       type = "git";
-      url = "https://code.googlesource.com/gocloud";
-      rev = "0a9baebe991e5ff35dd9f35578eb002cf07d229c";
-      sha256 = "18palgdg1ldfmjqm4almlcymx9f0kf6vy9lfspl0iwkv3wsnvfb6";
+      url = "https://github.com/cockroachdb/cmux";
+      rev = "30d10be492927e2dcae0089c374c455d42414fcb";
+      sha256 = "0ixif6hwcm2dpi1si5ah49dmdyy5chillz1048jpvjzwzxyfv1nx";
     };
   }
   {
-    goPackagePath = "github.com/PuerkitoBio/purell";
+    goPackagePath = "github.com/coreos/go-semver";
     fetch = {
       type = "git";
-      url = "https://github.com/PuerkitoBio/purell";
-      rev = "8a290539e2e8629dbc4e6bad948158f790ec31f4";
-      sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1";
+      url = "https://github.com/coreos/go-semver";
+      rev = "5e3acbb5668c4c3deb4842615c4098eb61fb6b1e";
+      sha256 = "0kbfr8q7s10z2r01xvbv6i31n4wq6z1qvgfj7njgbcgb65bkjjrh";
     };
   }
   {
-    goPackagePath = "github.com/PuerkitoBio/urlesc";
+    goPackagePath = "github.com/eapache/go-xerial-snappy";
     fetch = {
       type = "git";
-      url = "https://github.com/PuerkitoBio/urlesc";
-      rev = "5bd2802263f21d8788851d5305584c82a5c75d7e";
-      sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp";
+      url = "https://github.com/eapache/go-xerial-snappy";
+      rev = "bb955e01b9346ac19dc29eb16586c90ded99a98c";
+      sha256 = "1zhxcil8hn88hvxr2d6rmj4cls5zgss1scj0ikwiqq89f8vcgwn4";
     };
   }
   {
-    goPackagePath = "github.com/beorn7/perks";
+    goPackagePath = "github.com/eapache/queue";
     fetch = {
       type = "git";
-      url = "https://github.com/beorn7/perks";
-      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
-      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
-    };
-  }
-  {
-    goPackagePath = "github.com/blang/semver";
-    fetch = {
-      type = "git";
-      url = "https://github.com/blang/semver";
-      rev = "60ec3488bfea7cca02b021d106d9911120d25fe9";
-      sha256 = "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2";
-    };
-  }
-  {
-    goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml";
-    fetch = {
-      type = "git";
-      url = "https://github.com/cloudfoundry-incubator/candiedyaml";
-      rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf";
-      sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/etcd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/etcd";
-      rev = "c016325647ff1837d8e9695bc79837ff7549d31f";
-      sha256 = "0jm0kas8c2zhkaqibvzbx7bqfg67b9yb9cs0q8g9r0b9rxjr5prk";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/go-oidc";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/go-oidc";
-      rev = "fe7346e2e6855bda769d5b3db7d917f159c5613c";
-      sha256 = "141h47s2z56pff8fi926m7wzswkr34kj7hzwib8w5s8zxgdp0wld";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/pkg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/pkg";
-      rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef";
-      sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l";
-    };
-  }
-  {
-    goPackagePath = "github.com/davecgh/go-spew";
-    fetch = {
-      type = "git";
-      url = "https://github.com/davecgh/go-spew";
-      rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9";
-      sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93";
-    };
-  }
-  {
-    goPackagePath = "github.com/docker/distribution";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docker/distribution";
-      rev = "431cfa3179d9b3766e39f6a74283db8bb5a13209";
-      sha256 = "0hwqlqns0igaa3hg1dvz2grgy46q0v8wixyzfsmxsr5xb4ggpf32";
-    };
-  }
-  {
-    goPackagePath = "github.com/emicklei/go-restful";
-    fetch = {
-      type = "git";
-      url = "https://github.com/emicklei/go-restful";
-      rev = "c795848f1d7f574bbf767a8f17c7357e4003fed6";
-      sha256 = "0abnk4055kcz57v3f5d15pd5dvvlkg7bwfy1f22rmsqwzs44ixmz";
+      url = "https://github.com/eapache/queue";
+      rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98";
+      sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg";
     };
   }
   {
@@ -122,98 +49,35 @@
     fetch = {
       type = "git";
       url = "https://github.com/fsnotify/fsnotify";
-      rev = "f12c6236fe7b5cf6bcf30e5935d08cb079d78334";
-      sha256 = "1h5s03y6b17qj12p8fpm5pdijnsbfvaq38z7b2hfjn5qp45h02xb";
+      rev = "a904159b9206978bb6d53fcc7a769e5cd726c737";
+      sha256 = "0qq758fcnhlqa1913jki79a1ic7p2iczdx1l2mn8s886nxydn0fi";
     };
   }
   {
-    goPackagePath = "github.com/ghodss/yaml";
+    goPackagePath = "github.com/golang/snappy";
     fetch = {
       type = "git";
-      url = "https://github.com/ghodss/yaml";
-      rev = "aa0c862057666179de291b67d9f093d12b5a8473";
-      sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr";
+      url = "https://github.com/golang/snappy";
+      rev = "553a641470496b2327abcac10b36396bd98e45c9";
+      sha256 = "0kssxnih1l722hx9219c7javganjqkqhvl3i0hp0hif6xm6chvqk";
     };
   }
   {
-    goPackagePath = "github.com/go-openapi/jsonpointer";
+    goPackagePath = "github.com/go-logfmt/logfmt";
     fetch = {
       type = "git";
-      url = "https://github.com/go-openapi/jsonpointer";
-      rev = "46af16f9f7b149af66e5d1bd010e3574dc06de98";
-      sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc";
+      url = "https://github.com/go-logfmt/logfmt";
+      rev = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5";
+      sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9";
     };
   }
   {
-    goPackagePath = "github.com/go-openapi/jsonreference";
+    goPackagePath = "github.com/hashicorp/golang-lru";
     fetch = {
       type = "git";
-      url = "https://github.com/go-openapi/jsonreference";
-      rev = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272";
-      sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-openapi/spec";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/spec";
-      rev = "2433d2f0fc794728337e0c5d65716e79e163f04d";
-      sha256 = "14kdzfzjs06c2050fsg9vc0mn12b6i72gj45964mzxa5a6i09ph6";
-    };
-  }
-  {
-    goPackagePath = "github.com/go-openapi/swag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/go-openapi/swag";
-      rev = "0e04f5e499b19bf51031c01a00f098f25067d8dc";
-      sha256 = "0kbqrfargkx3yb6gj0k5rpi728pcgjyvy1as9x79sh3sgvnrq15f";
-    };
-  }
-  {
-    goPackagePath = "github.com/gogo/protobuf";
-    fetch = {
-      type = "git";
-      url = "https://github.com/gogo/protobuf";
-      rev = "a31fa025390fe54d2af14a04199ed08dea5dc2fd";
-      sha256 = "141059khzlkfjx5qsgzryqhl1mgilb13ha7syjm1297m54ch749c";
-    };
-  }
-  {
-    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 = "1f49d83d9aa00e6ce4fc8258c71cc7786aec968a";
-      sha256 = "0ny3nvjrsczihzmng2s0awvhq8k389l4lzl3vwgifi6ng34fszbj";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/cadvisor";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/cadvisor";
-      rev = "418c181ebad0d592828bd53c5704ed9af9a7c5a6";
-      sha256 = "1k3r7a333a6x53fs0anvraf8n93dyanjfwp396sng1zxchb07dk3";
-    };
-  }
-  {
-    goPackagePath = "github.com/google/gofuzz";
-    fetch = {
-      type = "git";
-      url = "https://github.com/google/gofuzz";
-      rev = "fd52762d25a41827db7ef64c43756fd4b9f7e382";
-      sha256 = "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8";
+      url = "https://github.com/hashicorp/golang-lru";
+      rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6";
+      sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi";
     };
   }
   {
@@ -221,53 +85,161 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/go-syslog";
-      rev = "315de0c1920b18b942603ffdc2229e2af4803c17";
-      sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6";
+      rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb";
+      sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb";
     };
   }
   {
-    goPackagePath = "github.com/howeyc/gopass";
+    goPackagePath = "github.com/klauspost/crc32";
     fetch = {
       type = "git";
-      url = "https://github.com/howeyc/gopass";
-      rev = "26c6e1184fd5255fa5f5289d0b789a4819c203a4";
-      sha256 = "00fd4pa2dq8fala5sc6ics2721hnkh69p7d35w5lb2zf1i41l6dq";
+      url = "https://github.com/klauspost/crc32";
+      rev = "1bab8b35b6bb565f92cbc97939610af9369f942a";
+      sha256 = "0n71bf2xkrk3b6svzsph3brwvam0cbz21pcwyymdw8scdn7mmyak";
     };
   }
   {
-    goPackagePath = "github.com/imdario/mergo";
+    goPackagePath = "github.com/mholt/caddy";
     fetch = {
       type = "git";
-      url = "https://github.com/imdario/mergo";
-      rev = "50d4dbd4eb0e84778abe37cefef140271d96fade";
-      sha256 = "06z52vri1ymb0s8nk2qr4xmw068s4abh6b66qj4w92whjxmxsvnh";
+      url = "https://github.com/mholt/caddy";
+      rev = "60838710883baa70cf6aae08e73820b21134ee72";
+      sha256 = "15dx12sap8ziwyn2wkgiy7fj1s320444zh0pn32mwjvn065c2k3z";
     };
   }
   {
-    goPackagePath = "github.com/jonboulle/clockwork";
+    goPackagePath = "github.com/miekg/coredns";
     fetch = {
       type = "git";
-      url = "https://github.com/jonboulle/clockwork";
-      rev = "bcac9884e7502bb2b474c0339d889cb981a2f27f";
-      sha256 = "1a732411y26arr0pq9j5rfkyql7rqxbkanjs4m59hil8cx8mb068";
+      url = "https://github.com/miekg/coredns";
+      rev = "a7c9fd5d6b5157958a3df8dba0cdc1f24407957b";
+      sha256 = "11zbwx74hhgrd3qlwm91gqw6zcj4yf7af54cn3183ca8v66f3xyf";
     };
   }
   {
-    goPackagePath = "github.com/juju/ratelimit";
+    goPackagePath = "github.com/miekg/dns";
     fetch = {
       type = "git";
-      url = "https://github.com/juju/ratelimit";
-      rev = "77ed1c8a01217656d2080ad51981f6e99adaa177";
-      sha256 = "1r7xdl3bpdzny4d05fpm229864ipghqwv5lplv5im5b4vhv9ryp7";
+      url = "https://github.com/miekg/dns";
+      rev = "75229eecb7af00b2736e93b779a78429dcb19472";
+      sha256 = "1vsjy07kkyx11iz4qsihhykac3ddq3ywdgv6bwrv407504f7x6wl";
     };
   }
   {
-    goPackagePath = "github.com/mailru/easyjson";
+    goPackagePath = "github.com/opentracing/opentracing-go";
     fetch = {
       type = "git";
-      url = "https://github.com/mailru/easyjson";
-      rev = "e978125a7e335d8f4db746a9ac5b44643f27416b";
-      sha256 = "1if7bzxs9ibq1a1d8z96djixqrxnwc2wplcbc67ddk071anrbs8w";
+      url = "https://github.com/opentracing/opentracing-go";
+      rev = "6edb48674bd9467b8e91fda004f2bd7202d60ce4";
+      sha256 = "0kwighhdm187b1yzcccm4hpy7m5sv1dij5ckg31n2614xvpippby";
+    };
+  }
+  {
+    goPackagePath = "github.com/openzipkin/zipkin-go-opentracing";
+    fetch = {
+      type = "git";
+      url = "https://github.com/openzipkin/zipkin-go-opentracing";
+      rev = "6022d4d3ed39632fad842942bda1813a9b4f63c8";
+      sha256 = "0gg9g2nxjf9almgzhx5sgqvbcx4zwvs873nl1d62jb6kqhsr8sjd";
+    };
+  }
+  {
+    goPackagePath = "github.com/pierrec/lz4";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pierrec/lz4";
+      rev = "5c9560bfa9ace2bf86080bf40d46b34ae44604df";
+      sha256 = "0j74a3xc48ispj8sb9c2sd1h53q99ws0f2x827b5p86xlpam8xyj";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "a1dba9ce8baed984a2495b658c82687f8157b98f";
+      sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6";
+    };
+  }
+  {
+    goPackagePath = "github.com/rcrowley/go-metrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/rcrowley/go-metrics";
+      rev = "1f30fe9094a513ce4c700b9a54458bbb0c96996c";
+      sha256 = "1hvbiaq4b6dqgjz6jkkxglfh9gf71zin6qsg508sh0r0ixfavrzj";
+    };
+  }
+  {
+    goPackagePath = "github.com/Shopify/sarama";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Shopify/sarama";
+      rev = "1416bd78f804d523005322194994f08c2a0ad797";
+      sha256 = "1skfkb1yhwf8w2n31dawr1kk145h3nwdf7xmm6yrwn69vbv8jqns";
+    };
+  }
+  {
+    goPackagePath = "github.com/apache/thrift";
+    fetch = {
+      type = "git";
+      url = "https://github.com/apache/thrift";
+      rev = "655b9b6ef86c45b423a194abee2a9cd057a16a74";
+      sha256 = "1kagirgxy2a9iabm8i32i5hdr36v5p0h651bsbyr0l99970myqfp";
+    };
+  }
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/coreos/etcd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/coreos/etcd";
+      rev = "2533c2a50c4b6114ad6fd4c0000175fac3b6ee06";
+      sha256 = "0z8byms8hfn7ncq8sqcw9avn9nfal5hw75ckbladd6gzjc8jay02";
+    };
+  }
+  {
+    goPackagePath = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev = "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
+    };
+  }
+  {
+    goPackagePath = "github.com/eapache/go-resiliency";
+    fetch = {
+      type = "git";
+      url = "https://github.com/eapache/go-resiliency";
+      rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3";
+      sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21";
+    };
+  }
+  {
+    goPackagePath = "github.com/gogo/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gogo/protobuf";
+      rev = "d2e1ade2d719b78fe5b061b4c18a9f7111b5bdc8";
+      sha256 = "1fh4jyxv1drh9jmadidrlszcnjp4zfazysbq5075lqd1mhq99lz0";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "69b215d01a5606c843240eab4937eab3acee6530";
+      sha256 = "1cy9jxqi6ba5qnjmvznlq49n2zzr5vqgky6pa9mckrbli8ssvzw7";
     };
   }
   {
@@ -280,48 +252,12 @@
     };
   }
   {
-    goPackagePath = "github.com/mholt/caddy";
+    goPackagePath = "github.com/pierrec/xxHash";
     fetch = {
       type = "git";
-      url = "https://github.com/mholt/caddy";
-      rev = "bbf954cbf2801bc32f4378fe5059eb16de3ae4d3";
-      sha256 = "1i5p9xz3lhir5k070a580mi77n4vbjlbglzi92qbn0mxrdvd13lr";
-    };
-  }
-  {
-    goPackagePath = "github.com/miekg/coredns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/coredns.git";
-      rev = "a8fb01bfd28e8b57f6d7b7d33f8282d807b2457d";
-      sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak";
-    };
-  }
-  {
-    goPackagePath = "github.com/miekg/dns";
-    fetch = {
-      type = "git";
-      url = "https://github.com/miekg/dns";
-      rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e";
-      sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6";
-    };
-  }
-  {
-    goPackagePath = "github.com/patrickmn/go-cache";
-    fetch = {
-      type = "git";
-      url = "https://github.com/patrickmn/go-cache";
-      rev = "1881a9bccb818787f68c52bfba648c6cf34c34fa";
-      sha256 = "1nd0kqijx6mrxb8wlh20bx73mwj0fqzla2sr68y6j6lz3fsy1fw2";
-    };
-  }
-  {
-    goPackagePath = "github.com/pborman/uuid";
-    fetch = {
-      type = "git";
-      url = "https://github.com/pborman/uuid";
-      rev = "b984ec7fa9ff9e428bd0cf0abf429384dfbe3e37";
-      sha256 = "0y4nxc0kzlmqfqi3w3m7r9h508bx80vxbzj4qn0mksp40mfhjxyv";
+      url = "https://github.com/pierrec/xxHash";
+      rev = "5a004441f897722c627870a981d02b29924215fa";
+      sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
     };
   }
   {
@@ -329,8 +265,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_golang";
-      rev = "5636dc67ae776adf5590da7349e70fbb9559972d";
-      sha256 = "0fb4w52zp0jk8218gwk4wgbhpj7d4hp6n00dvm8s0ajbysbx524d";
+      rev = "6ab3432d241cbe3cb7543da7e7e9a934c7e9fe76";
+      sha256 = "19phcsvq1gn53af3nnh1lvvyzg8kpwribka9mszk18jv7l6nq9mf";
     };
   }
   {
@@ -338,8 +274,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_model";
-      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
+      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
     };
   }
   {
@@ -347,26 +283,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "9a94032291f2192936512bab367bc45e77990d6a";
-      sha256 = "10ligvvdh6v5l7i1khirnhhfdhnlasxrqq39b3hxpnz9fq0fibg5";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/procfs";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/procfs";
-      rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5";
-      sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
-    };
-  }
-  {
-    goPackagePath = "github.com/spf13/pflag";
-    fetch = {
-      type = "git";
-      url = "https://github.com/spf13/pflag";
-      rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f";
-      sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l";
+      rev = "3007b6072c17c8d985734e6e19b1dea9174e13d3";
+      sha256 = "0jpvnmzqbzy2krwzan7pp3bc8pj9f1qic98lqq4hanccr0g5cmk3";
     };
   }
   {
@@ -374,17 +292,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/ugorji/go";
-      rev = "b7eff9abce531d6aeda923e759ae668e56601d21";
-      sha256 = "0w84jwpiq0knspc9pp8dfvr5z6h7yl3qdq59ihvlfixl3kczw5k4";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "6ab629be5e31660579425a738ba8870beb5b7404";
-      sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj";
+      rev = "c88ee250d0221a57af388746f5cf03768c21d6e2";
+      sha256 = "0ylb5p5i9hln8chq8whk5iy8qypjpzyrp07zpwjd1zbf5nsm1nmv";
     };
   }
   {
@@ -392,17 +301,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6";
-      sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/oauth2";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/oauth2";
-      rev = "3c3a985cb79f52a3190fbc056984415ca6763d01";
-      sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv";
+      rev = "6b27048ae5e6ad1ef927e72e437531493de612fe";
+      sha256 = "08zk0vavl7g6jzklhxhwrgcjh42mn2flbx2d2rxsblyxkbqri07j";
     };
   }
   {
@@ -410,44 +310,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9";
-      sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "2df9074612f50810d82416d2229398a1e7188c5c";
-      sha256 = "0ibg4pr9hxlvc5m4zn5hl4nsb6v5i0yfr9japsnjm010318df885";
-    };
-  }
-  {
-    goPackagePath = "gopkg.in/inf.v0";
-    fetch = {
-      type = "git";
-      url = "https://gopkg.in/inf.v0";
-      rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4";
-      sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82";
-    };
-  }
-  {
-    goPackagePath = "k8s.io/client-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/client-go";
-      rev = "93fcd402979cfad8a7151f96e016416947c6a3cb";
-      sha256 = "1v0kyav7i40wrahg9ng1vfq87xcp8r8hi4y7bspyfg35np6j8wdj";
-    };
-  }
-  {
-    goPackagePath = "k8s.io/kubernetes";
-    fetch = {
-      type = "git";
-      url = "https://github.com/kubernetes/kubernetes";
-      rev = "313ef63993017597bd28f5efd23677820274cb58";
-      sha256 = "1rl2mwhg20h5ay3crg5jqiwabfwgn8amp4dps6qmzyy3pcrjvsa8";
+      rev = "075e574b89e4c2d22f2286a7e2b919519c6f3547";
+      sha256 = "1p38siwqcbd592lphaqpigl7scshkfy67k6jcwscbcsl6akw51km";
     };
   }
 ]
diff --git a/pkgs/servers/dns/coredns/pull-278.patch b/pkgs/servers/dns/coredns/pull-278.patch
deleted file mode 100644
index 1323f898c785..000000000000
--- a/pkgs/servers/dns/coredns/pull-278.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 1158d4cb3a3cd43f1d0a72bd35c6dea9b1de345e Mon Sep 17 00:00:00 2001
-From: Manuel de Brito Fontes <aledbf@gmail.com>
-Date: Wed, 21 Sep 2016 14:16:52 -0300
-Subject: [PATCH] Fix k8s build
-
----
- contrib/kubernetes/testscripts/00_run_k8s.sh       |  2 +-
- contrib/kubernetes/testscripts/10_setup_kubectl.sh |  2 +-
- middleware/kubernetes/controller.go                | 38 ++++++++--------------
- middleware/kubernetes/kubernetes.go                |  9 +++--
- 4 files changed, 20 insertions(+), 31 deletions(-)
-
-diff --git a/contrib/kubernetes/testscripts/00_run_k8s.sh b/contrib/kubernetes/testscripts/00_run_k8s.sh
-index ef98a8e..7ff6811 100755
---- a/contrib/kubernetes/testscripts/00_run_k8s.sh
-+++ b/contrib/kubernetes/testscripts/00_run_k8s.sh
-@@ -5,7 +5,7 @@ set -e
- # Based on instructions at: http://kubernetes.io/docs/getting-started-guides/docker/
- 
- #K8S_VERSION=$(curl -sS https://storage.googleapis.com/kubernetes-release/release/latest.txt)
--K8S_VERSION="v1.2.4"
-+K8S_VERSION="v1.3.7"
- 
- ARCH="amd64"
- 
-diff --git a/contrib/kubernetes/testscripts/10_setup_kubectl.sh b/contrib/kubernetes/testscripts/10_setup_kubectl.sh
-index 1778671..a7cfc1e 100755
---- a/contrib/kubernetes/testscripts/10_setup_kubectl.sh
-+++ b/contrib/kubernetes/testscripts/10_setup_kubectl.sh
-@@ -10,7 +10,7 @@ cd ${BASEDIR}
- echo "Setting up kubectl..."
- 
- if [ ! -e kubectl ]; then
--	curl -O http://storage.googleapis.com/kubernetes-release/release/v1.2.4/bin/linux/amd64/kubectl
-+	curl -O http://storage.googleapis.com/kubernetes-release/release/v1.3.7/bin/linux/amd64/kubectl
- 	chmod u+x kubectl
- fi
- 
-diff --git a/middleware/kubernetes/controller.go b/middleware/kubernetes/controller.go
-index 126d415..c7f9e9e 100644
---- a/middleware/kubernetes/controller.go
-+++ b/middleware/kubernetes/controller.go
-@@ -55,12 +55,15 @@ func newdnsController(kubeClient *client.Client, resyncPeriod time.Duration, lse
- 		},
- 		&api.Endpoints{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
- 
--	dns.svcLister.Store, dns.svcController = cache.NewInformer(
-+	dns.svcLister.Indexer, dns.svcController = cache.NewIndexerInformer(
- 		&cache.ListWatch{
- 			ListFunc:  serviceListFunc(dns.client, namespace, dns.selector),
- 			WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector),
- 		},
--		&api.Service{}, resyncPeriod, cache.ResourceEventHandlerFuncs{})
-+		&api.Service{},
-+		resyncPeriod,
-+		cache.ResourceEventHandlerFuncs{},
-+		cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
- 
- 	dns.nsLister.Store, dns.nsController = cache.NewInformer(
- 		&cache.ListWatch{
-@@ -163,47 +166,34 @@ func (dns *dnsController) GetNamespaceList() *api.NamespaceList {
- 	return &nsList
- }
- 
--func (dns *dnsController) GetServiceList() *api.ServiceList {
--	svcList, err := dns.svcLister.List()
-+func (dns *dnsController) GetServiceList() []*api.Service {
-+	svcs, err := dns.svcLister.List(labels.Everything())
- 	if err != nil {
--		return &api.ServiceList{}
-+		return []*api.Service{}
- 	}
--
--	return &svcList
-+	return svcs
- }
- 
- // GetServicesByNamespace returns a map of
- // namespacename :: [ kubernetesService ]
- func (dns *dnsController) GetServicesByNamespace() map[string][]api.Service {
- 	k8sServiceList := dns.GetServiceList()
--	if k8sServiceList == nil {
--		return nil
--	}
--
--	items := make(map[string][]api.Service, len(k8sServiceList.Items))
--	for _, i := range k8sServiceList.Items {
-+	items := make(map[string][]api.Service, len(k8sServiceList))
-+	for _, i := range k8sServiceList {
- 		namespace := i.Namespace
--		items[namespace] = append(items[namespace], i)
-+		items[namespace] = append(items[namespace], *i)
- 	}
--
- 	return items
- }
- 
- // GetServiceInNamespace returns the Service that matches
- // servicename in the namespace
- func (dns *dnsController) GetServiceInNamespace(namespace string, servicename string) *api.Service {
--	svcKey := fmt.Sprintf("%v/%v", namespace, servicename)
--	svcObj, svcExists, err := dns.svcLister.Store.GetByKey(svcKey)
--
-+	svcObj, err := dns.svcLister.Services(namespace).Get(servicename)
- 	if err != nil {
- 		// TODO(...): should return err here
- 		return nil
- 	}
- 
--	if !svcExists {
--		// TODO(...): should return err here
--		return nil
--	}
--
--	return svcObj.(*api.Service)
-+	return svcObj
- }
-diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go
-index 0bd1dc7..eddc58b 100644
---- a/middleware/kubernetes/kubernetes.go
-+++ b/middleware/kubernetes/kubernetes.go
-@@ -183,14 +183,14 @@ func (k *Kubernetes) Get(namespace string, nsWildcard bool, servicename string,
- 
- 	var resultItems []api.Service
- 
--	for _, item := range serviceList.Items {
-+	for _, item := range serviceList {
- 		if symbolMatches(namespace, item.Namespace, nsWildcard) && symbolMatches(servicename, item.Name, serviceWildcard) {
- 			// If namespace has a wildcard, filter results against Corefile namespace list.
- 			// (Namespaces without a wildcard were filtered before the call to this function.)
- 			if nsWildcard && (len(k.Namespaces) > 0) && (!util.StringInSlice(item.Namespace, k.Namespaces)) {
- 				continue
- 			}
--			resultItems = append(resultItems, item)
-+			resultItems = append(resultItems, *item)
- 		}
- 	}
- 
-@@ -216,12 +216,11 @@ func isKubernetesNameError(err error) bool {
- }
- 
- func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service {
--	svcList, err := k.APIConn.svcLister.List()
-+	svcList, err := k.APIConn.svcLister.List(labels.Everything())
- 	if err != nil {
- 		return nil
- 	}
--
--	for _, service := range svcList.Items {
-+	for _, service := range svcList {
- 		if service.Spec.ClusterIP == ip {
- 			return []msg.Service{msg.Service{Host: ip}}
- 		}

From f2b1d6e5dce0f67086e2dc1ddf0ac3d688e96cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sun, 19 Feb 2017 21:31:41 +0100
Subject: [PATCH 0761/3449] vimPlugins.clang_complete: init at 2017-02-16

---
 pkgs/misc/vim-plugins/default.nix                  | 14 ++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names             |  1 +
 .../vim2nix/additional-nix-code/clang_complete     |  4 ++++
 3 files changed, 19 insertions(+)
 create mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 953957c7c124..0f1c8e9a2010 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -282,6 +282,20 @@ rec {
     sourceRoot = ".";
   };
 
+  clang_complete = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "clang_complete-2017-02-16";
+    src = fetchgit {
+      url = "git://github.com/Rip-Rip/clang_complete";
+      rev = "b1a507fbc27ef581c966b035f52eafae773a6f32";
+      sha256 = "19zs03giv8h5xmv18y9zn85sxr8akphvbscclrqhs4cf88285cgl";
+    };
+    dependencies = [];
+    preFixup = ''
+      substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
+        --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
+    '';
+  };
+
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "commentary-2016-03-10";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index f9e79a8019b8..b8fb32db0948 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -14,6 +14,7 @@
 "VimOutliner"
 "WebAPI"
 "YankRing"
+"clang_complete"
 "commentary"
 "ctrlp-py-matcher"
 "ctrlp-cmatcher"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
new file mode 100644
index 000000000000..64e064e2a460
--- /dev/null
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
@@ -0,0 +1,4 @@
+    preFixup = ''
+      substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
+        --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
+    '';

From a2b8ceb83aa71336ed666e8fa3e863cf687853f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 19 Feb 2017 23:19:07 +0100
Subject: [PATCH 0762/3449] Create AMIs for ca-central-1 (Canada)

---
 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 7cceac8cbf5a..1e397b0f1761 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -19,7 +19,7 @@ rm -f ec2-amis.nix
 
 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 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1"
+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"
 
 for type in $types; do
     link=$stateDir/$type

From bfdfd6c3dff618370b4b8a39f8875f2977edcbbf Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 19 Feb 2017 11:52:36 -0800
Subject: [PATCH 0763/3449] vulkan-loader: fix search paths in suid processes

Fixes #22990
---
 .../libraries/vulkan-loader/default.nix       |  5 +-
 .../vulkan-loader/fallback-paths.patch        | 52 +++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/vulkan-loader/fallback-paths.patch

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 46994a495eb4..a1b9ee03f23a 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3,
   python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr,
-  libXext, wayland }:
+  libXext, wayland, mesa_noglu }:
 
 let
   version = "1.0.39.1";
@@ -23,9 +23,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DBUILD_WSI_MIR_SUPPORT=OFF"
+    "-DFALLBACK_DATA_DIRS=${mesa_noglu.driverLink}/share:/usr/local/share:/usr/share"
   ];
 
-  patches = [ ./use-xdg-paths.patch ];
+  patches = [ ./use-xdg-paths.patch ./fallback-paths.patch ];
 
   outputs = [ "out" "dev" "demos" ];
 
diff --git a/pkgs/development/libraries/vulkan-loader/fallback-paths.patch b/pkgs/development/libraries/vulkan-loader/fallback-paths.patch
new file mode 100644
index 000000000000..d8d9fdd3f5f1
--- /dev/null
+++ b/pkgs/development/libraries/vulkan-loader/fallback-paths.patch
@@ -0,0 +1,52 @@
+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;

From 4b833facf18adca73872f07b5394019af5b1a8bd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sun, 19 Feb 2017 23:45:39 +0100
Subject: [PATCH 0764/3449] Add ca-central-1 AMIs

---
 nixos/modules/virtualisation/ec2-amis.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 0753e2ce9948..d592a23c303f 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -156,6 +156,10 @@ let self = {
   "16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4";
   "16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb";
   "16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5";
+  "16.09".ca-central-1.hvm-ebs = "ami-9f863bfb";
+  "16.09".ca-central-1.hvm-s3 = "ami-ea85388e";
+  "16.09".ca-central-1.pv-ebs = "ami-ce8a37aa";
+  "16.09".ca-central-1.pv-s3 = "ami-448a3720";
   "16.09".eu-central-1.hvm-ebs = "ami-1b884774";
   "16.09".eu-central-1.hvm-s3 = "ami-b08c43df";
   "16.09".eu-central-1.pv-ebs = "ami-888946e7";

From 7c9f4ee0325d3d1902d8123a6708a449c2fa3eac Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 19 Feb 2017 23:58:33 +0100
Subject: [PATCH 0765/3449] lua-packages/luasocket: Fix wrong platforms value

This has surfaced due to 505d7bea3af48c79af4212111324a4b95f80f212 and
the fixup commit 77f5a50c400d7e312e7491593dcc8ee8cab86c2c.

The individial platform attributes are a list rather than single
elements, so in this case we got:

with platforms; [darwin linux freebsd illumos]

Which results in:

[ ["x86_64-darwin"]
  ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux"
   "armv7l-linux" "aarch64-linux" "mips64el-linux"]
  ["i686-freebsd" "x86_64-freebsd"]
  ["x86_64-solaris"]
]

So if you don't have allowBroken set in nixpkgs config, you end up with
an evaluation error because meta.platforms is expected to be a list
instead of a list of lists which we got here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @mornfall, @vcunat
---
 pkgs/top-level/lua-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 5ca9f697b874..3b6603996fcc 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -239,7 +239,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = "http://w3.impa.br/~diego/software/luasocket/";
-      platforms = with platforms; [darwin linux freebsd illumos];
+      platforms = with platforms; darwin ++ linux ++ freebsd ++ illumos;
       maintainers = with maintainers; [ mornfall ];
     };
   };

From 9ca3caeb09f4bbc0710a1a8a9cb05e3f4a84ec2e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 18 Feb 2017 18:32:35 +0800
Subject: [PATCH 0766/3449] gnupg: include systemd user units in output

---
 pkgs/tools/security/gnupg/21.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index e40d1f7bf019..a301cf0c5690 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -37,6 +37,14 @@ stdenv.mkDerivation rec {
   pinentryBinaryPath = pinentry.binaryPath or "bin/pinentry";
   configureFlags = optional guiSupport "--with-pinentry-pgm=${pinentry}/${pinentryBinaryPath}";
 
+  postInstall = ''
+    mkdir -p $out/lib/systemd/user
+    for f in doc/examples/systemd-user/*.{service,socket} ; do
+      substitute $f $out/lib/systemd/user/$(basename $f) \
+        --replace /usr/bin $out/bin
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://gnupg.org;
     description = "A complete and free implementation of the OpenPGP standard";

From 59d2eeff841f1018b0498cfbf61bf0ebc218167d Mon Sep 17 00:00:00 2001
From: Richard Larocque <richard.larocque@gmail.com>
Date: Sun, 12 Feb 2017 11:44:44 -0800
Subject: [PATCH 0767/3449] openant: init at unstable-2017-02-11

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40201bc6047d..ae64512e73d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4659,6 +4659,37 @@ in {
     };
   };
 
+  openant = buildPythonPackage rec {
+    name = "openant-unstable-2017-02-11";
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/Tigge/openant";
+      description = "ANT and ANT-FS Python Library";
+      license = licenses.mit;
+      platforms = platforms.linux;
+    };
+
+    src = pkgs.fetchFromGitHub {
+      owner = "Tigge";
+      repo = "openant";
+      rev = "ed89281e37f65d768641e87356cef38877952397";
+      sha256 = "1g81l9arqdy09ijswn3sp4d6i3z18d44lzyb78bwnvdb14q22k19";
+    };
+
+    # Removes some setup.py hacks intended to install udev rules.
+    # We do the job ourselves in postInstall below.
+    postPatch = ''
+      sed -i -e '/cmdclass=.*/d' setup.py
+    '';
+
+    postInstall = ''
+      install -dm755 "$out/etc/udev/rules.d"
+      install -m644 resources/ant-usb-sticks.rules "$out/etc/udev/rules.d/99-ant-usb-sticks.rules"
+    '';
+
+    propagatedBuildInputs = with self; [ pyusb ];
+  };
+
   opencv = pkgs.opencv.override {
     enablePython = true;
     pythonPackages = self;

From 13884d6de1295b376884a74733796345c468668b Mon Sep 17 00:00:00 2001
From: Richard Larocque <richard.larocque@gmail.com>
Date: Sun, 12 Feb 2017 11:45:05 -0800
Subject: [PATCH 0768/3449] antfs-cli: init at unstable-2017-02-11

---
 pkgs/applications/misc/antfs-cli/default.nix | 21 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/misc/antfs-cli/default.nix

diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix
new file mode 100644
index 000000000000..556c1db3c836
--- /dev/null
+++ b/pkgs/applications/misc/antfs-cli/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "antfs-cli-unstable-2017-02-11";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/Tigge/antfs-cli";
+    description = "Extracts FIT files from ANT-FS based sport watches";
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+
+  src = fetchFromGitHub {
+    owner = "Tigge";
+    repo = "antfs-cli";
+    rev = "85a6cc6fe6fc0ec38399f5aa30fb39177c565b52";
+    sha256 = "0v8y64kldfbs809j1g9d75dd1vxq7mfxnp4b45pz8anpxhjf64fy";
+  };
+
+  propagatedBuildInputs = [ pythonPackages.openant ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d7d103c00a5..54aec17b7ece 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12457,6 +12457,8 @@ with pkgs;
     };
   };
 
+  antfs-cli = callPackage ../applications/misc/antfs-cli {};
+
   antimony = qt5.callPackage ../applications/graphics/antimony {};
 
   antiword = callPackage ../applications/office/antiword {};

From edce2b759cc31d6ee5ad1682819240f59b1b03a8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 20 Feb 2017 00:54:19 +0100
Subject: [PATCH 0769/3449] make-dbus-conf: Don't try to access network

This is the output of the builder:

building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1'
error : connection refused
error : connection refused

However, even when using --nonet we'd still get this:

I/O error : Attempt to load network entity
http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd

So in order to avoid this, we now provide an XML catalog file, mapping
the public URLs to the local DTD paths inside the store instead of using
--path (which doesn't seem to work with xsltproc).

Tested this by comparing the SHA256 (nix-hash --type sha256) of the
output path generated by:

nix-build -E '(import ./. {}).makeDBusConf {
  suidHelper = "SUIDHELPER";
  serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ];
}'

... with the SHA256 of the generated output path prior to this commit
and they have the same hash:

6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
---
 .../libraries/dbus/make-dbus-conf.nix         | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index 7e35a9162c8d..46cf1046d6a2 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -1,4 +1,7 @@
-{ runCommand, libxslt, dbus, serviceDirectories ? [], suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper" }:
+{ runCommand, writeText, libxslt, dbus
+, serviceDirectories ? []
+, suidHelper ? "/var/setuid-wrappers/dbus-daemon-launch-helper"
+}:
 
 /* DBus has two configuration parsers -- normal and "trivial", which is used
  * for suid helper. Unfortunately the latter doesn't support <include>
@@ -9,19 +12,29 @@ runCommand "dbus-1"
   {
     buildInputs = [ libxslt ];
     inherit serviceDirectories suidHelper;
+    XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
+      <?xml version="1.0"?>
+      <!DOCTYPE catalog PUBLIC
+        "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
+        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+
+      <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+        <rewriteSystem
+          systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/"
+          rewritePrefix="file://${dbus.doc}/share/xml/dbus/"/>
+      </catalog>
+    '';
   }
   ''
     mkdir -p $out
 
-    xsltproc \
+    xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
       --stringparam suidHelper "$suidHelper" \
-      --path ${dbus.doc}/share/xml/dbus \
       ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
       > $out/system.conf
-    xsltproc \
+    xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
-      --path ${dbus.doc}/share/xml/dbus \
       ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
       > $out/session.conf
   ''

From fc6684054d054ad677a49e2a3ba162563e126093 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 20 Feb 2017 03:09:41 +0100
Subject: [PATCH 0770/3449] make-dbus-conf: Use libxslt.bin instead of .dev

The problem with using libxslt as buildInputs is that the dev output is
used for building the dbus config.

This is one of the reasons why the installer tests are failing since
ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd, because the tests do not have
libxslt.dev in their closure and really shouldn't.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
---
 pkgs/development/libraries/dbus/make-dbus-conf.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index 46cf1046d6a2..a45b4b5443c5 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -10,7 +10,6 @@
  */
 runCommand "dbus-1"
   {
-    buildInputs = [ libxslt ];
     inherit serviceDirectories suidHelper;
     XML_CATALOG_FILES = writeText "dbus-catalog.xml" ''
       <?xml version="1.0"?>
@@ -28,12 +27,12 @@ runCommand "dbus-1"
   ''
     mkdir -p $out
 
-    xsltproc --nonet \
+    ${libxslt.bin}/bin/xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
       --stringparam suidHelper "$suidHelper" \
       ${./make-system-conf.xsl} ${dbus}/share/dbus-1/system.conf \
       > $out/system.conf
-    xsltproc --nonet \
+    ${libxslt.bin}/bin/xsltproc --nonet \
       --stringparam serviceDirectories "$serviceDirectories" \
       ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \
       > $out/session.conf

From c5b2714bc79a27230690821c1c6bd99bdd457c63 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 20 Feb 2017 03:16:26 +0100
Subject: [PATCH 0771/3449] dbus: Put DTDs into $out instead of $doc

First of all, these "documents" are not really documentation, so it
really doesn't make much sense to put it into $doc.

The main point however is that the installer tests are failing since
this was introduced in ac0cdc1952fb0133ec26f2fdde5a77a648d3c1cd.

One way to circumvent this is putting dbus.doc into
system.extraDependencies of the installer tests, but given the first
point this sounds a bit odd to me.

So I went for the second way of putting it into $out, because it's now
basically necessary to build a NixOS system.

With this the NixOS installer tests should now work again, although I
have only tested this with the installer.simple test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
---
 pkgs/development/libraries/dbus/default.nix        | 4 ++--
 pkgs/development/libraries/dbus/make-dbus-conf.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 49b71ff99748..7075874adf87 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -67,8 +67,8 @@ self = stdenv.mkDerivation {
     installFlags = [ "sysconfdir=$(out)/etc" "datadir=$(out)/share" ];
 
     postInstall = ''
-      mkdir -p $doc/share/xml/dbus
-      cp doc/*.dtd $doc/share/xml/dbus
+      mkdir -p "$out/share/xml/dbus"
+      cp doc/*.dtd "$out/share/xml/dbus"
     '';
 
     # it's executed from $lib by absolute path
diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index a45b4b5443c5..d836d87efef8 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -20,7 +20,7 @@ runCommand "dbus-1"
       <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
         <rewriteSystem
           systemIdStartString="http://www.freedesktop.org/standards/dbus/1.0/"
-          rewritePrefix="file://${dbus.doc}/share/xml/dbus/"/>
+          rewritePrefix="file://${dbus}/share/xml/dbus/"/>
       </catalog>
     '';
   }

From a8c738713bd13f13987bde696f1e811bc253e884 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 19 Feb 2017 22:30:01 -0500
Subject: [PATCH 0772/3449] gnupg21: Fix scdaemon for usb smartcards (#22891)

The use of smartcard functionality for yubikeys (and presumably other
usb smartcards) was broken in gnupg 2.1.18.  This has apparently already
been fixed in gnupg master, and debian backports the included patches
for 2.1.18.

See also:
https://bugs.gnupg.org/gnupg/issue2933
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=852702
https://github.com/NixOS/nixpkgs/pull/21991
---
 pkgs/tools/security/gnupg/21.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index a301cf0c5690..f7968e47b1ce 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, libiconv, npth
-, gettext, texinfo, pcsclite, sqlite
+{ fetchurl, fetchpatch, stdenv, pkgconfig, libgcrypt, libassuan, libksba
+, libiconv, npth, gettext, texinfo, pcsclite, sqlite
 
 # Each of the dependencies below are optional.
 # Gnupg can be built without them at the cost of reduced functionality.
@@ -29,7 +29,20 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
-  patches = [ ./fix-libusb-include-path.patch ];
+  patches = [
+    ./fix-libusb-include-path.patch
+    # TODO: Remove the following two patches on the next gnupg release after 2.1.18
+    (fetchpatch {
+      name = "scd-Backport-two-fixes-from-master";
+      url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0028-scd-Backport-two-fixes-from-master.patch?h=debian/2.1.18-6";
+      sha256 = "01l2s4s7kp6j2f3qd371arq7pfphvncc9k1m63rqm0kyzy9jk20k";
+    })
+    (fetchpatch {
+      name = "scd-Fix-use-case-of-PC-SC";
+      url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch?h=debian/2.1.18-6";
+      sha256 = "0lxqj614fialbqs2x0z13q5ikq2rc9xwphmkly179qs03d4mawsz";
+    })
+  ];
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(

From 252fbbf2d22915e0b7a793d74e5dd1a3991982c7 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Mon, 20 Feb 2017 04:43:04 +0100
Subject: [PATCH 0773/3449] mattermost sevice: JoinsNamespaceOf for local pgsql
 (#22899)

---
 nixos/modules/services/web-apps/mattermost.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index bf3a8eed6004..8e6baf6a17e3 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -202,6 +202,7 @@ in
           ExecStart = "${pkgs.mattermost}/bin/mattermost-platform";
           WorkingDirectory = "${cfg.statePath}";
           PrivateTmp = true;
+          JoinsNamespaceOf = mkIf cfg.localDatabaseCreate "postgresql.service";
           Restart = "always";
           RestartSec = "10";
           LimitNOFILE = "49152";

From c23c2c50ded3e1dd3e7e30ba4f29142c84d0aca3 Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Mon, 20 Feb 2017 06:13:48 +0100
Subject: [PATCH 0774/3449] munin service: listen on IPv6 loopback as well
 (#23012)

munin service: listen on IPv6 loopback as well
---
 nixos/modules/services/monitoring/munin.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 6d2ce5383687..364f18e7543d 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -76,6 +76,7 @@ let
       # wrapped plugins by makeWrapper being with dots
       ignore_file ^\.
 
+      allow ^::1$
       allow ^127\.0\.0\.1$
 
       ${nodeCfg.extraConfig}

From 5abca15f2119077dcfb0253d196b32bf37d6c322 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Sun, 19 Feb 2017 22:46:47 -0900
Subject: [PATCH 0775/3449] bumblebee service: Fix pmMethod bbswitch check

Made useBbswitch work when pmMethod is "auto" and removed invalid pmMethod option "nouveau".
---
 nixos/modules/hardware/video/bumblebee.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/hardware/video/bumblebee.nix b/nixos/modules/hardware/video/bumblebee.nix
index 3967137fcf8b..2278c7b40611 100644
--- a/nixos/modules/hardware/video/bumblebee.nix
+++ b/nixos/modules/hardware/video/bumblebee.nix
@@ -13,7 +13,7 @@ let
     useDisplayDevice = cfg.connectDisplay;
   };
 
-  useBbswitch = cfg.pmMethod == "bbswitch";
+  useBbswitch = cfg.pmMethod == "bbswitch" || cfg.pmMethod == "auto" && useNvidia;
 
   primus = pkgs.primus.override {
     inherit useNvidia;
@@ -65,7 +65,7 @@ in
 
       pmMethod = mkOption {
         default = "auto";
-        type = types.enum [ "auto" "bbswitch" "nouveau" "switcheroo" "none" ];
+        type = types.enum [ "auto" "bbswitch" "switcheroo" "none" ];
         description = ''
           Set preferred power management method for unused card.
         '';

From ffe6935ea8663d99da5b339d6ac886012b0f3f09 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 20 Feb 2017 11:41:55 +0100
Subject: [PATCH 0776/3449] kile: 2016-10-24 -> 2017-02-09

---
 pkgs/applications/editors/kile/frameworks.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
index 34ea76478937..ad3300b9221f 100644
--- a/pkgs/applications/editors/kile/frameworks.nix
+++ b/pkgs/applications/editors/kile/frameworks.nix
@@ -24,12 +24,12 @@ let
   unwrapped =
     kdeDerivation rec {
       name = "kile-${version}";
-      version = "2016-10-24";
+      version = "2017-02-09";
 
       src = fetchgit {
         url = git://anongit.kde.org/kile.git;
-        rev = "e005e2ac140881aa7610bd363d181cf306f91f80";
-        sha256 = "1labv8jagsfk0k7nvxh90in9464avzdabgs215y1h658zjh1wpy4";
+        rev = "f77f6e627487c152f111e307ad6dc71699ade746";
+        sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
 
       };
 

From c79371b82398cef0b8b50228c458bd728ccd956f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 20 Feb 2017 11:42:07 +0100
Subject: [PATCH 0777/3449] kdeconnect: 1.0 -> 1.0.3

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

diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index ecf3e38aeb04..22c9cfc7e986 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   name = "kdeconnect-${version}";
-  version = "1.0";
+  version = "1.0.3";
 
   src = fetchurl {
-    url = http://download.kde.org/stable/kdeconnect/1.0/src/kdeconnect-kde-1.0.tar.xz;
-    sha256 = "0pd8qw0w6akc7yzmsr0sjkfj3nw6rgm5xvq41g61ak8pp05syzr0";
+    url = "http://download.kde.org/stable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
+    sha256 = "0b40402adw7cqz19fh8zw70f6l7b5p400mw668n3wic4favn27r2";
   };
 
   buildInputs = [

From dc19ba7bc67bbcc4d743bc37dc54a6df402f8cc6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 19 Feb 2017 17:35:24 -0500
Subject: [PATCH 0778/3449] beets: enable gstreamer support

So this was suggested as [long ago as October, 2015](https://github.com/NixOS/nixpkgs/issues/10376#issuecomment-147734898).

Despite being fairly ignorant of the nix Python support, I decided
that I really wanted this; this change brings in what I believe are
the necessary components---I have, at least, successfully run `beet
replaygain` and `beet bpd`---but it may not do it in the best way; I'm
happy to consider input on that front.

I can at least state that all three changes are necessary---leave any
one of them out and gstreamer support doesn't work.
---
 pkgs/tools/audio/beets/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 48d42e6533a6..69f0d89e7f85 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales
-, pythonPackages, imagemagick
+, pythonPackages, imagemagick, gobjectIntrospection, gst_all_1
 
 , enableAcousticbrainz ? true
 , enableAcoustid       ? true
@@ -93,6 +93,9 @@ in pythonPackages.buildPythonApplication rec {
     pythonPackages.pathlib
     pythonPackages.pyyaml
     pythonPackages.unidecode
+    pythonPackages.gst-python
+    pythonPackages.pygobject3
+    gobjectIntrospection
   ] ++ optional enableAcoustid     pythonPackages.pyacoustid
     ++ optional (enableFetchart
               || enableEmbyupdate
@@ -119,7 +122,11 @@ in pythonPackages.buildPythonApplication rec {
     nose
     rarfile
     responses
-  ];
+  ] ++ (with gst_all_1; [
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+  ]);
 
   patches = [
     ./replaygain-default-bs1770gain.patch
@@ -198,6 +205,8 @@ in pythonPackages.buildPythonApplication rec {
     runHook postInstallCheck
   '';
 
+  makeWrapperArgs = [ "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\"" "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\"" ];
+
   meta = {
     description = "Music tagger and library organizer";
     homepage = http://beets.radbox.org;

From f0de1dc89d2ddd054a8ae60d5944e4ae1f33ee01 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2017 12:08:54 +0100
Subject: [PATCH 0779/3449] python-suseapi: add package at version
 0.24-5-g9937e3b

---
 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 4c993581f85d..cb845704b165 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31974,6 +31974,29 @@ EOF
 
   yarl = callPackage ../development/python-modules/yarl { };
 
+  suseapi = buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "suseapi";
+    version = "0.24-5-g9937e3b";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "openSUSE";
+      repo = "python-${pname}";
+      rev = version;
+      sha256 = "1144h26wrzazzy6y3yy163fccqmggk5hazjkk8l9a547390ilgrv";
+    };
+
+    propagatedBuildInputs = with self; [
+      django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil
+    ];
+
+    meta = {
+      homepage = "https://github.com/openSUSE/python-suseapi/";
+      description = "Python module to work with various SUSE services";
+      license = licenses.gpl3Plus;
+    };
+  };
+
   stripe = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "stripe";

From 31759274f1d52d075f80b9fffaace7234f9fe2a6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2017 12:21:59 +0100
Subject: [PATCH 0780/3449] python-suseapi: 'requests' isn't needed at
 build-time, but it's needed at run-time

---
 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 cb845704b165..ba17335ebe64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31987,7 +31987,7 @@ EOF
     };
 
     propagatedBuildInputs = with self; [
-      django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil
+      django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests
     ];
 
     meta = {

From fea71f84d0c1c7bc6da80d70a639e1e443ef24a8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Feb 2017 06:47:49 -0500
Subject: [PATCH 0781/3449] linux 4.10

---
 .../linux/kernel/common-config.nix            |  4 ++--
 pkgs/os-specific/linux/kernel/linux-4.10.nix  | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 19 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.10.nix

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 40c49509fd05..9cc4027903e8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -188,7 +188,7 @@ with stdenv.lib;
     DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
   ''}
   ${optionalString (versionAtLeast version "4.9") ''
-    DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
+    DRM_AMDGPU_SI? y # (experimental) amdgpu support for verde and newer chipsets
     DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
   ''}
 
@@ -229,7 +229,7 @@ with stdenv.lib;
   EXT3_FS_POSIX_ACL y
   EXT3_FS_SECURITY y
   EXT4_FS_POSIX_ACL y
-  EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
+  EXT4_ENCRYPTION? ${if (versionOlder version "4.8") || (versionAtLeast version "4.10") then "m" else "y"}
   EXT4_FS_SECURITY y
   REISERFS_FS_XATTR? y
   REISERFS_FS_POSIX_ACL? y
diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
new file mode 100644
index 000000000000..a556d2dc24d1
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.10";
+  extraMeta.branch = "4.10";
+  modDirVersion = "4.10.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "4ac22e4a619417213cfdab24714413bb9118fbaebe6012c6c89c279cdadef2ce";
+  };
+
+  kernelPatches = args.kernelPatches;
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e7ee4d856389..273d187d67e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11334,6 +11334,22 @@ with pkgs;
       ];
   };
 
+  linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        # 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
+        # kernelPatches.cpu-cgroup-v2."4.7"
+        kernelPatches.modinst_arg_list_too_long
+      ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -11506,7 +11522,7 @@ with pkgs;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_9;
+  linuxPackages_latest = linuxPackages_4_10;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -11517,6 +11533,7 @@ with pkgs;
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
+  linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10);
   # Don't forget to update linuxPackages_latest!
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.

From 464529c603cb72046121fb61208b7819757900bf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Feb 2017 12:47:46 +0100
Subject: [PATCH 0782/3449] simp_le: 2016-12-16 -> 0.1.1

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

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index aef077e21a06..134afa72ad03 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,17 +1,25 @@
 { stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "simp_le-2016-12-16";
+  pname = "simp_le-client";
+  version = "0.1.1";
+  name = "${pname}-${version}";
 
-  # kuba/simp_le seems unmaintained
-  src = fetchFromGitHub {
-    owner = "zenhack";
-    repo = "simp_le";
-    rev = "63a43b8547cd9fbc87db6bcd9497c6e37f73abef";
-    sha256 = "04dr8lvcpi797722lsy06nxhlihrxdqgdy187pg3hl1ki2iq3ixx";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "18y8mg0s0i2bs57pi6mbkwgjlr5mmivchiyvrpcbdmkg9qlbfwaa";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ acme ];
+  prePatch = ''
+    substituteInPlace setup.py \
+      --replace 'acme>=0.9,<0.10' acme
+  '';
+
+  checkPhase = ''
+    $out/bin/simp_le --test
+  '';
+
+  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From b191ac0d8963b7e09b428ed13007f56a16ebfb1a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Feb 2017 07:29:47 -0500
Subject: [PATCH 0783/3449] Revert "linux 4.10"

Somehow the tarball was actually linux 4.4.10

This reverts commit fea71f84d0c1c7bc6da80d70a639e1e443ef24a8.
---
 .../linux/kernel/common-config.nix            |  4 ++--
 pkgs/os-specific/linux/kernel/linux-4.10.nix  | 19 -------------------
 pkgs/top-level/all-packages.nix               | 19 +------------------
 3 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.10.nix

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 9cc4027903e8..40c49509fd05 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -188,7 +188,7 @@ with stdenv.lib;
     DRM_AMD_POWERPLAY y # necessary for amdgpu polaris support
   ''}
   ${optionalString (versionAtLeast version "4.9") ''
-    DRM_AMDGPU_SI? y # (experimental) amdgpu support for verde and newer chipsets
+    DRM_AMDGPU_SI y # (experimental) amdgpu support for verde and newer chipsets
     DRM_AMDGPU_CIK y # (stable) amdgpu support for bonaire and newer chipsets
   ''}
 
@@ -229,7 +229,7 @@ with stdenv.lib;
   EXT3_FS_POSIX_ACL y
   EXT3_FS_SECURITY y
   EXT4_FS_POSIX_ACL y
-  EXT4_ENCRYPTION? ${if (versionOlder version "4.8") || (versionAtLeast version "4.10") then "m" else "y"}
+  EXT4_ENCRYPTION? ${if versionOlder version "4.8" then "m" else "y"}
   EXT4_FS_SECURITY y
   REISERFS_FS_XATTR? y
   REISERFS_FS_POSIX_ACL? y
diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
deleted file mode 100644
index a556d2dc24d1..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.10";
-  extraMeta.branch = "4.10";
-  modDirVersion = "4.10.0";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "4ac22e4a619417213cfdab24714413bb9118fbaebe6012c6c89c279cdadef2ce";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1ca54b0587d..0c10c016ac4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11334,22 +11334,6 @@ with pkgs;
       ];
   };
 
-  linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        # 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
-        # kernelPatches.cpu-cgroup-v2."4.7"
-        kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -11522,7 +11506,7 @@ with pkgs;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_10;
+  linuxPackages_latest = linuxPackages_4_9;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -11533,7 +11517,6 @@ with pkgs;
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
-  linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10);
   # Don't forget to update linuxPackages_latest!
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.

From f454297a7d57f1996e1b5d351be0982fe6d617da Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Feb 2017 07:32:46 -0500
Subject: [PATCH 0784/3449] linux 4.10

---
 pkgs/os-specific/linux/kernel/linux-4.10.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              | 19 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.10.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
new file mode 100644
index 000000000000..ff6fac2ac6d3
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.10";
+  extraMeta.branch = "4.10";
+  modDirVersion = "4.10.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b";
+  };
+
+  kernelPatches = args.kernelPatches;
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c10c016ac4a..c1ca54b0587d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11334,6 +11334,22 @@ with pkgs;
       ];
   };
 
+  linux_4_10 = callPackage ../os-specific/linux/kernel/linux-4.10.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        # 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
+        # kernelPatches.cpu-cgroup-v2."4.7"
+        kernelPatches.modinst_arg_list_too_long
+      ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -11506,7 +11522,7 @@ with pkgs;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_9;
+  linuxPackages_latest = linuxPackages_4_10;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -11517,6 +11533,7 @@ with pkgs;
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
+  linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10);
   # Don't forget to update linuxPackages_latest!
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.

From fee43308ed139191238c23655d7784c531eab709 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 20 Feb 2017 15:22:14 +0200
Subject: [PATCH 0785/3449] platforms.nix: Remove unnecessary kernelExtraConfig
 for ARMv7

AHCI_IMX is already enabled in multi_v7_defconfig since kernel 4.9.
---
 pkgs/top-level/platforms.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/top-level/platforms.nix b/pkgs/top-level/platforms.nix
index 41cd0fff52ba..e26bc9e66ae1 100644
--- a/pkgs/top-level/platforms.nix
+++ b/pkgs/top-level/platforms.nix
@@ -416,9 +416,6 @@ rec {
     kernelAutoModules = false;
     uboot = null;
     kernelTarget = "zImage";
-    kernelExtraConfig = ''
-      AHCI_IMX y
-    '';
     gcc = {
       # Some table about fpu flags:
       # http://community.arm.com/servlet/JiveServlet/showImage/38-1981-3827/blogentry-103749-004812900+1365712953_thumb.png

From 2c4d9c92286841515a56e2a05049987fe04637d7 Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Sun, 19 Feb 2017 17:53:09 +0100
Subject: [PATCH 0786/3449] manual: Add link to config section (#22994)

Add link to "Configuration" chapter from "Changing the Configuration" section.

Also, fix grammar error.
(cherry picked from commit a585f987fa32f2e81b3f273291971151c25f98b7)
---
 nixos/doc/manual/installation/changing-config.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 43b591a1cae9..75df307a1b7c 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -7,7 +7,7 @@
 
 <para>The file <filename>/etc/nixos/configuration.nix</filename>
 contains the current configuration of your machine.  Whenever you’ve
-changed something to that file, you should do
+<link linkend="ch-configuration">changed something</link> in that file, you should do
 
 <screen>
 # nixos-rebuild switch</screen>

From 4daccf208feccb027731d3fc8dc2686ab9ef3428 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 20 Feb 2017 13:25:08 +0100
Subject: [PATCH 0787/3449] systemd-boot: Make sure /etc/machine-id exists

This leads to the following error when trying to install a new machine
where the machine ID wasn't yet initialized during boot:

Failed to get machine did: No such file or directory

In addition this was also detected by the simpleUefiGummiboot installer
test.

So let's generate a fallback machine ID by using
systemd-machine-id-setup before actually running bootctl.

Tested this by running the installer.simpleUefiGummiboot test, it still
fails but not because of the machine ID.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra, @shlevy, @mic92
Fixes: #22561
---
 .../systemd-boot/systemd-boot-builder.py      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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 b91d64bb0a7f..9218e1dc8a74 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
@@ -101,6 +101,18 @@ def main():
     parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot')
     args = parser.parse_args()
 
+    try:
+        with open("/etc/machine-id") as machine_file:
+            machine_id = machine_file.readlines()[0]
+    except IOError as e:
+        if e.errno != errno.ENOENT:
+            raise
+        # Since systemd version 232 a machine ID is required and it might not
+        # be there on newly installed systems, so let's generate one so that
+        # bootctl can find it and we can also pass it to write_entry() later.
+        cmd = ["@systemd@/bin/systemd-machine-id-setup", "--print"]
+        machine_id = subprocess.check_output(cmd).rstrip()
+
     if os.getenv("NIXOS_INSTALL_GRUB") == "1":
         warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning)
         os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1"
@@ -113,13 +125,6 @@ def main():
 
     mkdir_p("@efiSysMountPoint@/efi/nixos")
     mkdir_p("@efiSysMountPoint@/loader/entries")
-    try:
-        with open("/etc/machine-id") as machine_file:
-            machine_id = machine_file.readlines()[0]
-    except IOError as e:
-        if e.errno != errno.ENOENT:
-            raise
-        machine_id = None
 
     gens = get_generations("system")
     remove_old_entries(gens)

From dc31a1ea29cae217b71134bf59f888c5a90f630b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 20 Feb 2017 14:28:53 +0100
Subject: [PATCH 0788/3449] systemd-boot: Unlink loader.conf if it exists

Since systemd version 232 the install subcommand of bootctl opens the
loader.conf with fopen() modes "wxe", where the "e" stands for
exclusive, so the call will fail if the file exists.

For installing the boot loader just once this is fine, but if we're
using NIXOS_INSTALL_BOOTLOADER on a systemd where the bootloader is
already present this will fail.

Exactly this is done within the simpleUefiGummiboot installer test,
where nixos-install is called twice and thus the bootloader is also
installed twice, resulting in an error during the fopen call:

Failed to open loader.conf for writing: File exists

Removing the file prior to calling bootctl should fix this.

I've tested this using the installer.simpleUefiGummiboot test and it now
succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra, @shlevy, @mic92
Fixes: #22925
---
 .../system/boot/loader/systemd-boot/systemd-boot-builder.py   | 4 ++++
 1 file changed, 4 insertions(+)

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 9218e1dc8a74..04cf17c1b0b4 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
@@ -118,6 +118,10 @@ def main():
         os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1"
 
     if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1":
+        # bootctl uses fopen() with modes "wxe" and fails if the file exists.
+        if os.path.exists("@efiSysMountPoint@/loader/loader.conf"):
+            os.unlink("@efiSysMountPoint@/loader/loader.conf")
+
         if "@canTouchEfiVariables@" == "1":
             subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"])
         else:

From d7f10f282819eebcab4c8e350affff425dc4ed84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2017 15:01:46 +0100
Subject: [PATCH 0789/3449] python-osc: enable (install) bash completion

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 224aae7b574a..395745413140 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16752,8 +16752,19 @@ in {
       rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9";
       sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z";
     };
+    buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
     propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
-    postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc";
+    postInstall = ''
+      ln -s $out/bin/osc-wrapper.py $out/bin/osc
+      install -D -m555 dist/osc.complete $out/share/bash-completion/helpers/osc-helper
+      mkdir -p $out/share/bash-completion/completions
+      cat >>$out/share/bash-completion/completions/osc <<EOF
+      test -z "\$BASH_VERSION" && return
+      complete -o default _nullcommand >/dev/null 2>&1 || return
+      complete -r _nullcommand >/dev/null 2>&1         || return
+      complete -o default -C $out/share/bash-completion/helpers/osc-helper osc
+      EOF
+    '';
     meta = {
       description = "opensuse-commander with svn like handling";
       maintainers = [ maintainers.peti ];

From 5e3eea0cd3f8e7f28dc4fad4b1fb29b73cc103e1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 20 Feb 2017 09:36:25 +0100
Subject: [PATCH 0790/3449] LTS Haskell 8.2

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 492b2005ccd3..d2c86c935aa3 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.0
+  # LTS Haskell 8.2
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -208,7 +208,7 @@ default-package-overrides:
   - base64-string ==0.2
   - basic-prelude ==0.6.1
   - bcrypt ==0.0.10
-  - benchpress ==0.2.2.8
+  - benchpress ==0.2.2.9
   - bencode ==0.6.0.0
   - bento ==0.1.0
   - bifunctors ==5.4.1
@@ -256,7 +256,7 @@ default-package-overrides:
   - blosum ==0.1.1.4
   - bmp ==1.2.6.3
   - bool-extras ==0.4.0
-  - Boolean ==0.2.3
+  - Boolean ==0.2.4
   - boolean-like ==0.1.1.0
   - boolsimplifier ==0.1.8
   - boomerang ==1.4.5.2
@@ -301,7 +301,7 @@ default-package-overrides:
   - camfort ==0.901
   - carray ==0.1.6.5
   - cartel ==0.18.0.2
-  - case-insensitive ==1.2.0.7
+  - case-insensitive ==1.2.0.8
   - cased ==0.1.0.0
   - cases ==0.1.3.2
   - cassava ==0.4.5.1
@@ -317,9 +317,9 @@ default-package-overrides:
   - ChannelT ==0.0.0.2
   - charset ==0.3.7.1
   - charsetdetect-ae ==1.1.0.2
-  - Chart ==1.8.1
-  - Chart-cairo ==1.8.1
-  - Chart-diagrams ==1.8.1
+  - Chart ==1.8.2
+  - Chart-cairo ==1.8.2
+  - Chart-diagrams ==1.8.2
   - chart-unit ==0.1.0.0
   - ChasingBottoms ==1.3.1.2
   - cheapskate ==0.1.0.5
@@ -378,7 +378,7 @@ default-package-overrides:
   - composition ==1.0.2.1
   - composition-extra ==2.0.0
   - concurrency ==1.0.0.0
-  - concurrent-output ==1.7.8
+  - concurrent-output ==1.7.9
   - concurrent-supply ==0.1.8
   - conduit ==1.2.9
   - conduit-combinators ==1.1.0
@@ -598,7 +598,7 @@ default-package-overrides:
   - fast-builder ==0.0.0.6
   - fast-digits ==0.2.1.0
   - fast-logger ==2.4.10
-  - fasta ==0.10.4.1
+  - fasta ==0.10.4.2
   - fay ==0.23.1.16
   - fay-base ==0.20.0.1
   - fay-builder ==0.2.0.5
@@ -843,7 +843,7 @@ default-package-overrides:
   - hackage-security ==0.5.2.2
   - hackernews ==1.1.1.0
   - haddock-library ==1.4.2
-  - hailgun ==0.4.1.1
+  - hailgun ==0.4.1.2
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.9.5.1
   - half ==0.2.2.3
@@ -928,7 +928,7 @@ default-package-overrides:
   - hinotify ==0.3.9
   - hint ==0.6.0
   - hip ==1.5.2.0
-  - histogram-fill ==0.8.4.1
+  - histogram-fill ==0.8.5.0
   - hit ==0.6.3
   - hjpath ==3.0.1
   - hjsmin ==0.2.0.2
@@ -976,7 +976,7 @@ default-package-overrides:
   - hsemail ==1.7.7
   - HSet ==0.0.0
   - hset ==2.2.0
-  - hsexif ==0.6.0.10
+  - hsexif ==0.6.1.0
   - hsignal ==0.2.7.5
   - hsinstall ==1.5
   - hslogger ==1.2.10
@@ -988,6 +988,7 @@ default-package-overrides:
   - hsp ==0.10.0
   - hspec ==2.4.1
   - hspec-attoparsec ==0.1.0.2
+  - hspec-contrib ==0.4.0
   - hspec-core ==2.4.1
   - hspec-discover ==2.4.1
   - hspec-expectations ==0.8.2
@@ -1087,7 +1088,7 @@ default-package-overrides:
   - interpolatedstring-perl6 ==1.0.0
   - IntervalMap ==0.5.2.0
   - intervals ==0.7.2
-  - intro ==0.1.0.6
+  - intro ==0.1.0.8
   - invariant ==0.4
   - invertible ==0.2.0
   - io-choice ==0.0.6
@@ -1107,7 +1108,7 @@ default-package-overrides:
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.0
   - islink ==0.1.0.0
-  - iso3166-country-codes ==0.20140203.7
+  - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.4
   - iterable ==3.0
@@ -1121,7 +1122,7 @@ default-package-overrides:
   - jmacro-rpc-snap ==0.3
   - jni ==0.2.3
   - jose ==0.5.0.2
-  - jose-jwt ==0.7.4
+  - jose-jwt ==0.7.5
   - js-flot ==0.8.3
   - js-jquery ==3.1.1
   - json ==0.9.1
@@ -1149,7 +1150,7 @@ default-package-overrides:
   - koofr-client ==1.0.0.3
   - kraken ==0.0.3
   - l10n ==0.1.0.0
-  - labels ==0.3.0
+  - labels ==0.3.2
   - lackey ==0.4.2
   - language-c ==0.5.0
   - language-c-quote ==0.11.7.1
@@ -1194,7 +1195,7 @@ default-package-overrides:
   - licensor ==0.2.0
   - lift-generics ==0.1.1
   - lifted-async ==0.9.1.1
-  - lifted-base ==0.2.3.8
+  - lifted-base ==0.2.3.10
   - line ==2.2.0
   - linear ==1.20.5
   - linear-accelerate ==0.2
@@ -1215,7 +1216,7 @@ default-package-overrides:
   - log-postgres ==0.7
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.1.2
+  - logging-effect ==1.1.3
   - logging-facade ==0.1.1
   - logict ==0.6.0.2
   - loop ==0.3.0
@@ -1231,7 +1232,7 @@ default-package-overrides:
   - machines-process ==0.2.0.8
   - magic ==1.1
   - mainland-pretty ==0.4.1.4
-  - makefile ==0.1.0.5
+  - makefile ==0.1.1.0
   - managed ==1.0.5
   - mandrill ==0.5.3.1
   - markdown ==0.1.16
@@ -1281,7 +1282,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.1
+  - monad-logger ==0.3.20.2
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.6
   - monad-logger-syslog ==0.1.3.0
@@ -1306,7 +1307,7 @@ default-package-overrides:
   - MonadRandom ==0.5.1
   - monads-tf ==0.1.0.3
   - mongoDB ==2.1.1.1
-  - mono-traversable ==1.0.1.1
+  - mono-traversable ==1.0.1.2
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.3.1
@@ -1352,7 +1353,7 @@ default-package-overrides:
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
-  - network-carbon ==1.0.8
+  - network-carbon ==1.0.9
   - network-conduit-tls ==1.2.2
   - network-house ==0.1.0.2
   - network-info ==0.2.0.8
@@ -1421,7 +1422,7 @@ default-package-overrides:
   - pagination ==0.1.1
   - palette ==0.1.0.4
   - pandoc ==1.19.2.1
-  - pandoc-citeproc ==0.10.4
+  - pandoc-citeproc ==0.10.4.1
   - pandoc-types ==1.17.0.5
   - pango ==0.13.3.1
   - parallel ==3.2.1.0
@@ -1450,7 +1451,7 @@ default-package-overrides:
   - pdfinfo ==1.5.4
   - pem ==0.2.2
   - permutation ==0.5.0.5
-  - persistable-record ==0.4.1.0
+  - persistable-record ==0.4.1.1
   - persistable-types-HDBC-pg ==0.0.1.4
   - persistent ==2.6
   - persistent-mysql ==2.6
@@ -1477,7 +1478,7 @@ default-package-overrides:
   - pipes-extras ==1.0.8
   - pipes-fluid ==0.5.0.3
   - pipes-group ==1.0.6
-  - pipes-misc ==0.2.3.0
+  - pipes-misc ==0.2.5.0
   - pipes-mongodb ==0.1.0.0
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.3
@@ -1499,12 +1500,13 @@ default-package-overrides:
   - pointless-fun ==1.1.0.6
   - polynomials-bernstein ==1.1.2
   - polyparse ==1.12
+  - posix-paths ==0.2.1.1
   - posix-realtime ==0.0.0.4
   - post-mess-age ==0.2.1.0
-  - postgresql-binary ==0.9.2
+  - postgresql-binary ==0.9.3
   - postgresql-libpq ==0.9.3.0
   - postgresql-simple ==0.5.2.1
-  - postgresql-simple-migration ==0.1.8.0
+  - postgresql-simple-migration ==0.1.9.0
   - postgresql-simple-url ==0.2.0.0
   - postgresql-transactional ==1.1.1
   - postgresql-typed ==0.5.0
@@ -1527,7 +1529,7 @@ default-package-overrides:
   - printcess ==0.1.0.3
   - process-extras ==0.7.1
   - product-profunctors ==0.7.1.0
-  - profiteur ==0.4.2.0
+  - profiteur ==0.4.2.1
   - profunctor-extras ==4.0
   - profunctors ==5.2
   - project-template ==0.2.0
@@ -1548,7 +1550,7 @@ default-package-overrides:
   - pure-cdb ==0.1.2
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
-  - purescript-bridge ==0.10.0.0
+  - purescript-bridge ==0.10.1.0
   - pusher-http-haskell ==1.1.0.4
   - pwstore-fast ==2.4.4
   - pwstore-purehaskell ==2.1.4
@@ -1616,9 +1618,9 @@ 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.4
+  - relational-query ==0.8.3.5
   - relational-query-HDBC ==0.6.0.2
-  - relational-record ==0.1.5.1
+  - relational-record ==0.1.6.1
   - relational-schemas ==0.1.3.1
   - renderable ==0.2.0.1
   - repa ==3.4.1.2
@@ -1652,13 +1654,14 @@ default-package-overrides:
   - RNAlien ==1.3.1
   - rng-utils ==0.2.1
   - rose-trees ==0.0.4.3
+  - rot13 ==0.1.0.2
   - rotating-log ==0.4.2
   - RSA ==2.2.0
   - rss-conduit ==0.3.0.0
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
-  - safe ==0.3.13
+  - safe ==0.3.14
   - safe-exceptions ==0.1.4.0
   - safe-exceptions-checked ==0.1.0
   - safecopy ==0.9.2
@@ -1696,7 +1699,7 @@ default-package-overrides:
   - servant-cassava ==0.8
   - servant-client ==0.9.1.1
   - servant-docs ==0.9.1.1
-  - servant-elm ==0.4.0.0
+  - servant-elm ==0.4.0.1
   - servant-foreign ==0.9.1.1
   - servant-js ==0.9.1
   - servant-JuicyPixels ==0.3.0.2
@@ -1763,7 +1766,7 @@ default-package-overrides:
   - sorted-list ==0.2.0.0
   - sourcemap ==0.1.6
   - sparkle ==0.4.0.2
-  - sparse-linear-algebra ==0.2.2.0
+  - sparse-linear-algebra ==0.2.9.4
   - spdx ==0.2.1.0
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
@@ -1857,9 +1860,9 @@ default-package-overrides:
   - tar ==0.5.0.3
   - tar-conduit ==0.1.0
   - tardis ==0.4.1.0
-  - tasty ==0.11.1
+  - tasty ==0.11.2
   - tasty-ant-xml ==1.0.4
-  - tasty-auto ==0.1.0.1
+  - tasty-auto ==0.1.0.2
   - tasty-dejafu ==0.3.0.2
   - tasty-discover ==1.1.0
   - tasty-expected-failure ==0.11.0.4
@@ -1877,11 +1880,11 @@ default-package-overrides:
   - tasty-tap ==0.0.4
   - tasty-th ==0.1.4
   - Taxonomy ==1.0.2
-  - TCache ==0.12.0
+  - TCache ==0.12.1
   - tce-conf ==1.3
   - tcp-streams ==0.6.0.0
   - tcp-streams-openssl ==0.6.0.0
-  - telegram-api ==0.6.0.0
+  - telegram-api ==0.6.0.2
   - template ==0.2.0.10
   - temporary ==1.2.0.4
   - temporary-rc ==1.2.0.3
@@ -2084,7 +2087,7 @@ default-package-overrides:
   - warp ==3.2.11
   - warp-tls ==3.2.3
   - wave ==0.1.4
-  - wavefront ==0.7.0.2
+  - wavefront ==0.7.0.3
   - wavefront-obj ==0.1.0.1
   - web-plugins ==0.2.9
   - web-routes ==0.27.11
@@ -2145,10 +2148,10 @@ default-package-overrides:
   - xenstore ==0.1.1
   - xhtml ==3000.2.1
   - xlsior ==0.1.0.1
-  - xlsx ==0.4.2
+  - xlsx ==0.4.3
   - xlsx-tabular ==0.2.2
   - xml ==1.3.14
-  - xml-conduit ==1.4.0.3
+  - xml-conduit ==1.4.0.4
   - xml-conduit-parse ==0.3.1.0
   - xml-conduit-writer ==0.1.1.1
   - xml-hamlet ==0.4.1

From 8bc0ece0f160d11b2e10d6e3403521d6542969a1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 19 Feb 2017 21:34:47 +0100
Subject: [PATCH 0791/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.0.4-12-gf83834c from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/fbb2c029b0e99e31122aeddc1ccf0e822a1d0ea2.
---
 .../haskell-modules/hackage-packages.nix      | 1187 +++++------------
 1 file changed, 326 insertions(+), 861 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index fddb99eb1302..6feed8f5c987 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1800,8 +1800,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "Boolean";
-       version = "0.2.3";
-       sha256 = "f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3";
+       version = "0.2.4";
+       sha256 = "67216013b02b8ac5b534a1ef25f409f930eea1a85eae801933a01ad43145eef8";
        libraryHaskellDepends = [ base ];
        description = "Generalized booleans and numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -2496,23 +2496,6 @@ self: {
      }) {};
 
   "Chart" = callPackage
-    ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
-     , old-locale, operational, time, vector
-     }:
-     mkDerivation {
-       pname = "Chart";
-       version = "1.8.1";
-       sha256 = "635241e4b6b8aa1ddeb244c94002edc21603617fadeaf50aa7f52e28493ba15e";
-       libraryHaskellDepends = [
-         array base colour data-default-class lens mtl old-locale
-         operational time vector
-       ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
-       description = "A library for generating 2D Charts and Plots";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Chart_1_8_2" = callPackage
     ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
      , old-locale, operational, time, vector
      }:
@@ -2527,27 +2510,9 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-cairo" = callPackage
-    ({ mkDerivation, array, base, cairo, Chart, colour
-     , data-default-class, lens, mtl, old-locale, operational, time
-     }:
-     mkDerivation {
-       pname = "Chart-cairo";
-       version = "1.8.1";
-       sha256 = "b21494feb055a55674b66d51f0522af9c06094ed86ba62db93fba54179c47c14";
-       libraryHaskellDepends = [
-         array base cairo Chart colour data-default-class lens mtl
-         old-locale operational time
-       ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
-       description = "Cairo backend for Charts";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Chart-cairo_1_8_2" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, colour
      , data-default-class, lens, mtl, old-locale, operational, time
      }:
@@ -2562,31 +2527,9 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-diagrams" = callPackage
-    ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
-     , containers, data-default-class, diagrams-core, diagrams-lib
-     , diagrams-postscript, diagrams-svg, lens, mtl, old-locale
-     , operational, svg-builder, SVGFonts, text, time
-     }:
-     mkDerivation {
-       pname = "Chart-diagrams";
-       version = "1.8.1";
-       sha256 = "1c2e12d7719e6798721a3957e6df6ea772dff0bd7d6900e5a1f5c009cd5635bb";
-       libraryHaskellDepends = [
-         base blaze-markup bytestring Chart colour containers
-         data-default-class diagrams-core diagrams-lib diagrams-postscript
-         diagrams-svg lens mtl old-locale operational svg-builder SVGFonts
-         text time
-       ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
-       description = "Diagrams backend for Charts";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Chart-diagrams_1_8_2" = callPackage
     ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
      , containers, data-default-class, diagrams-core, diagrams-lib
      , diagrams-postscript, diagrams-svg, lens, mtl, old-locale
@@ -2605,7 +2548,6 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -14071,10 +14013,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "QuickCheck-safe";
-       version = "0.1.0.1";
-       sha256 = "874d16e6bcd6da551c3efcf8f91aeea97a935a7a2086f78dab6991806c68b867";
-       revision = "3";
-       editedCabalFile = "4e791ac9fa2f2e73029ab92d17e3ab93571ec5b1d5acda0ea1f340c5ee1346f6";
+       version = "0.1.0.2";
+       sha256 = "2b6e41260800d399487537d186b1f8f55efb0ad26502333a956ecace9350f8f8";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
@@ -16393,22 +16333,6 @@ self: {
      }) {};
 
   "TCache" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
-     , hashtables, mtl, old-time, RefSerialize, stm, text
-     }:
-     mkDerivation {
-       pname = "TCache";
-       version = "0.12.0";
-       sha256 = "fab4e5fb6751a06324994577d6d4e5feae106496d28326e2c8c63c593ed55955";
-       libraryHaskellDepends = [
-         base bytestring containers directory hashtables mtl old-time
-         RefSerialize stm text
-       ];
-       description = "A Transactional cache with user-defined persistence";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "TCache_0_12_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , hashtables, mtl, old-time, RefSerialize, stm, text
      }:
@@ -16422,7 +16346,6 @@ self: {
        ];
        description = "A Transactional cache with user-defined persistence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "THEff" = callPackage
@@ -20710,8 +20633,8 @@ self: {
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.1";
-       sha256 = "4d66b2b478888db84d13cd3557cc938902a97958e87bb9ea70dce9cd60e41f51";
+       version = "0.0.0.2";
+       sha256 = "e8e0ba4af134cabf1af0b63e1d010e9d868f881074baf8096551dfdf5c68bf29";
        libraryHaskellDepends = [
          babl base clock containers gegl glib linear monad-loops mtl sdl2
          text
@@ -21250,8 +21173,8 @@ self: {
     ({ mkDerivation, base, optparse-applicative, random, text }:
      mkDerivation {
        pname = "alea";
-       version = "0.5.1.0";
-       sha256 = "32188a6da518656e962379038e0aa05f08c1434380d4eacf0ab162815638f5bd";
+       version = "0.5.2.0";
+       sha256 = "093cf33b6f3127cbb49ccfc6ad11183a4ef48b302fdb5771190eb497f0f9cb4f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -21813,6 +21736,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alternative-extra" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "alternative-extra";
+       version = "0.1.0.0";
+       sha256 = "896aadd55ce70bbd339838596878eae9fabf469dc46d383e96036234e096ced0";
+       libraryHaskellDepends = [ base ];
+       description = "Extra utilities for alternatives";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "alternative-io" = callPackage
     ({ mkDerivation, base, lifted-base, monad-control, transformers
      , transformers-base
@@ -26321,6 +26255,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "async-io-either" = callPackage
+    ({ mkDerivation, async, base, transformers }:
+     mkDerivation {
+       pname = "async-io-either";
+       version = "0.1.0.2";
+       sha256 = "71d7ed0974ac8aaaeba0a53268f13ad7277a24b224762b33837d0aab93d76601";
+       libraryHaskellDepends = [ async base transformers ];
+       homepage = "https://github.com/mankyKitty/async-io-either#readme";
+       description = "Could be useful";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "async-manager" = callPackage
     ({ mkDerivation, async, base, stm, unordered-containers }:
      mkDerivation {
@@ -29459,21 +29405,6 @@ self: {
      }) {};
 
   "benchpress" = callPackage
-    ({ mkDerivation, base, bytestring, mtl, time }:
-     mkDerivation {
-       pname = "benchpress";
-       version = "0.2.2.8";
-       sha256 = "39fbf32e333466931c8de7dafa922de8a010ee57cd0a8fde8961da310d04057d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base mtl time ];
-       executableHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/WillSewell/benchpress";
-       description = "Micro-benchmarking with detailed statistics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "benchpress_0_2_2_9" = callPackage
     ({ mkDerivation, base, bytestring, mtl, time }:
      mkDerivation {
        pname = "benchpress";
@@ -29486,7 +29417,6 @@ self: {
        homepage = "https://github.com/WillSewell/benchpress";
        description = "Micro-benchmarking with detailed statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencode" = callPackage
@@ -37219,23 +37149,6 @@ self: {
      }) {};
 
   "case-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
-     , test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "case-insensitive";
-       version = "1.2.0.7";
-       sha256 = "160d3898fd0d8b50bed820ff633e6292438f069adec5267c42b8bcf0f386cac8";
-       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit text
-       ];
-       homepage = "https://github.com/basvandijk/case-insensitive";
-       description = "Case insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "case-insensitive_1_2_0_8" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
      , test-framework, test-framework-hunit, text
      }:
@@ -37250,7 +37163,6 @@ self: {
        homepage = "https://github.com/basvandijk/case-insensitive";
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "case-insensitive-match" = callPackage
@@ -39927,6 +39839,22 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "classy-influxdb-simple" = callPackage
+    ({ mkDerivation, aeson, async-io-either, base, bytestring, lens
+     , mtl, text, wreq
+     }:
+     mkDerivation {
+       pname = "classy-influxdb-simple";
+       version = "0.1.0.1";
+       sha256 = "37655507a92d3bc9c019a5d25b746db95f948b57f5d58126bac4abba38d37383";
+       libraryHaskellDepends = [
+         aeson async-io-either base bytestring lens mtl text wreq
+       ];
+       homepage = "https://github.com/mankyKitty/classy-influxdb-simple#readme";
+       description = "Super simple InfluxDB package in Classy-MTL style";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "classy-parallel" = callPackage
     ({ mkDerivation, base, lifted-base, monad-control, parallel
      , resourcet, transformers
@@ -42818,22 +42746,6 @@ self: {
      }) {};
 
   "concurrent-output" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , process, stm, terminal-size, text, transformers, unix
-     }:
-     mkDerivation {
-       pname = "concurrent-output";
-       version = "1.7.8";
-       sha256 = "8c9b0ab30ff9ea930039efcd9cc3d8541f0647c617afc17370de9de793ca9a6f";
-       libraryHaskellDepends = [
-         ansi-terminal async base directory exceptions process stm
-         terminal-size text transformers unix
-       ];
-       description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "concurrent-output_1_7_9" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
      , process, stm, terminal-size, text, transformers, unix
      }:
@@ -42847,7 +42759,6 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -53716,27 +53627,26 @@ self: {
   "distributed-process-async" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, containers
      , data-accessor, deepseq, distributed-process
-     , distributed-process-extras, distributed-process-tests, fingertree
-     , hashable, HUnit, mtl, network, network-transport
-     , network-transport-tcp, rematch, stm, test-framework
-     , test-framework-hunit, time, transformers, unordered-containers
+     , distributed-process-extras, distributed-process-systest
+     , exceptions, fingertree, hashable, HUnit, mtl, network
+     , network-transport, network-transport-tcp, rematch, stm
+     , test-framework, test-framework-hunit, time, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "distributed-process-async";
-       version = "0.2.3";
-       sha256 = "d3031457c36bb3c35496031c185354417b54ce253e1878f35072d04e8161ad95";
-       revision = "1";
-       editedCabalFile = "56ae624c478fa2a42dd48850189ffdd1540416e820a83bbe00c54569b76af288";
+       version = "0.2.4";
+       sha256 = "ebf1a907e2f857ff853eff2f9c096f8acf5db20938ccf0d51391164e986487ec";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
-         distributed-process-extras fingertree hashable mtl stm time
-         transformers unordered-containers
+         distributed-process-extras exceptions fingertree hashable mtl stm
+         time transformers unordered-containers
        ];
        testHaskellDepends = [
          ansi-terminal base binary deepseq distributed-process
-         distributed-process-extras distributed-process-tests HUnit network
-         network-transport network-transport-tcp rematch stm test-framework
-         test-framework-hunit transformers
+         distributed-process-extras distributed-process-systest exceptions
+         HUnit network network-transport network-transport-tcp rematch stm
+         test-framework test-framework-hunit transformers
        ];
        homepage = "http://github.com/haskell-distributed/distributed-process-async";
        description = "Cloud Haskell Async API";
@@ -61195,24 +61105,6 @@ self: {
      }) {};
 
   "fasta" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
-     , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
-     , pipes-group, pipes-text, split, text
-     }:
-     mkDerivation {
-       pname = "fasta";
-       version = "0.10.4.1";
-       sha256 = "0a282adecb22764cd99c056cc0a871e29adac3568ba92b37eabf8f064ad6d482";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers foldl lens parsec pipes
-         pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
-       ];
-       homepage = "https://github.com/GregorySchwartz/fasta";
-       description = "A simple, mindless parser for fasta files";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "fasta_0_10_4_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
      , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
      , pipes-group, pipes-text, split, text
@@ -61228,7 +61120,6 @@ self: {
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fastbayes" = callPackage
@@ -68169,8 +68060,8 @@ self: {
        pname = "ghc-dump-tree";
        version = "0.2.0.2";
        sha256 = "a89a52e448926eab7ecd97ba7081b858486bcaf487cd800403c3e2a0a76a9cc3";
-       revision = "2";
-       editedCabalFile = "9a950ee81c799050c982191431e3df03a178288c03faa077f21bc5b136ee002e";
+       revision = "3";
+       editedCabalFile = "b6d735f4e90a0c006513f1efc963d7b45bae8a95e0bee736e7e1fb55553643b8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79054,24 +78945,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.1";
-       sha256 = "d584d2bfec3eb94088452bb0611a4f8aea255bba4b3bf861ff3aeb888b5d4d03";
-       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_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -79087,7 +78960,6 @@ self: {
        ];
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun-send" = callPackage
@@ -88770,22 +88642,6 @@ self: {
      }) {};
 
   "histogram-fill" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, monad-primitive
-     , primitive, vector
-     }:
-     mkDerivation {
-       pname = "histogram-fill";
-       version = "0.8.4.1";
-       sha256 = "385919434a933b7ad4c7c262308186e4057d6e2e653fa98fa020f949d4c7557d";
-       libraryHaskellDepends = [
-         base deepseq ghc-prim monad-primitive primitive vector
-       ];
-       homepage = "https://github.com/Shimuuar/histogram-fill/";
-       description = "Library for histograms creation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "histogram-fill_0_8_5_0" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, primitive, vector }:
      mkDerivation {
        pname = "histogram-fill";
@@ -88795,7 +88651,6 @@ self: {
        homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "histogram-fill-binary" = callPackage
@@ -93896,25 +93751,6 @@ self: {
      }) {};
 
   "hsexif" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
-     , iconv, text, time
-     }:
-     mkDerivation {
-       pname = "hsexif";
-       version = "0.6.0.10";
-       sha256 = "64cb8abfa31085475ae45fddfc2716cb40764714d47c0fc6146fec2b8ab65d33";
-       libraryHaskellDepends = [
-         base binary bytestring containers iconv text time
-       ];
-       testHaskellDepends = [
-         base binary bytestring containers hspec HUnit iconv text time
-       ];
-       homepage = "https://github.com/emmanueltouzery/hsexif";
-       description = "EXIF handling library in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsexif_0_6_1_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit
      , iconv, text, time
      }:
@@ -93931,7 +93767,6 @@ self: {
        homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfacter" = callPackage
@@ -96540,6 +96375,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client_0_5_6" = callPackage
+    ({ mkDerivation, array, async, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , deepseq, directory, exceptions, filepath, ghc-prim, hspec
+     , http-types, mime-types, monad-control, network, network-uri
+     , random, streaming-commons, text, time, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "http-client";
+       version = "0.5.6";
+       sha256 = "514271d83fff7169a493111105e77ea93d11b562effa840c47117a3db912216a";
+       libraryHaskellDepends = [
+         array base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie deepseq exceptions filepath
+         ghc-prim http-types mime-types network network-uri random
+         streaming-commons text time transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring blaze-builder bytestring
+         case-insensitive containers deepseq directory hspec http-types
+         monad-control network network-uri streaming-commons text time
+         transformers zlib
+       ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "An HTTP client engine";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-auth" = callPackage
     ({ mkDerivation, base, base64-string, blaze-builder, bytestring
      , case-insensitive, conduit, crypto-conduit, http-client
@@ -102354,32 +102219,6 @@ self: {
      }) {};
 
   "intro" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
-     , deepseq, dlist, extra, hashable, lens, mtl, safe
-     , string-conversions, tagged, text, transformers
-     , unordered-containers, writer-cps-mtl
-     }:
-     mkDerivation {
-       pname = "intro";
-       version = "0.1.0.6";
-       sha256 = "a3ebf5474aa99626287859c27669ffb2bcd0873204e1d9a6994f628742180bcd";
-       libraryHaskellDepends = [
-         base bifunctors binary bytestring containers deepseq dlist extra
-         hashable mtl safe string-conversions tagged text transformers
-         unordered-containers writer-cps-mtl
-       ];
-       testHaskellDepends = [
-         base bifunctors binary bytestring containers deepseq dlist extra
-         hashable lens mtl safe string-conversions 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";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "intro_0_1_0_8" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
      , deepseq, dlist, extra, hashable, lens, mtl, safe
      , string-conversions, tagged, text, transformers
@@ -103454,17 +103293,6 @@ self: {
      }) {};
 
   "iso3166-country-codes" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "iso3166-country-codes";
-       version = "0.20140203.7";
-       sha256 = "3a9d48b3ccb6d0df6df9e41e3a58bfb1afa2c0ae702a9e33caacf1d2f3ccd5b1";
-       libraryHaskellDepends = [ base ];
-       description = "A datatype for ISO 3166 country codes";
-       license = "LGPL";
-     }) {};
-
-  "iso3166-country-codes_0_20140203_8" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "iso3166-country-codes";
@@ -103473,7 +103301,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A datatype for ISO 3166 country codes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iso639" = callPackage
@@ -104800,28 +104627,6 @@ self: {
      }) {};
 
   "jose-jwt" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , cryptonite, doctest, either, hspec, HUnit, memory, mtl
-     , QuickCheck, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "jose-jwt";
-       version = "0.7.4";
-       sha256 = "747088658aee2b57bce8dc27fa921f9c4181f2f01677dde9a4c17de18bd3febd";
-       libraryHaskellDepends = [
-         aeson base bytestring cereal containers cryptonite either memory
-         mtl text time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cryptonite doctest either hspec HUnit memory
-         mtl QuickCheck text unordered-containers vector
-       ];
-       homepage = "http://github.com/tekul/jose-jwt";
-       description = "JSON Object Signing and Encryption Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "jose-jwt_0_7_5" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
      , containers, cryptonite, doctest, either, hspec, HUnit, memory
      , mtl, QuickCheck, text, time, unordered-containers, vector
@@ -104841,7 +104646,6 @@ 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;
      }) {};
 
   "jpeg" = callPackage
@@ -105905,8 +105709,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.14";
-       sha256 = "cae9327fe9d2068d74f9e8ed80125cb78f0a0612b3eb8f361ff7b5871cc77eb5";
+       version = "0.2.15";
+       sha256 = "4ff1279e9f4d54c605a22792f411d4b84324337b454449a0cd4c7c009abb2269";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107127,8 +106931,8 @@ self: {
     ({ mkDerivation, base, udbus }:
      mkDerivation {
        pname = "keyring";
-       version = "0.1.0.4";
-       sha256 = "2ddbfe06b0cdbd888c5e2e420e698d746fd3f98ce9ba4f6cc3594f7db2f5f6c8";
+       version = "0.1.0.5";
+       sha256 = "9565c1b08e1b5b4a11d4f3df30fe053893c6228dc79f3766602837074a2901f8";
        libraryHaskellDepends = [ base udbus ];
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
@@ -107799,18 +107603,6 @@ self: {
      }) {};
 
   "labels" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "labels";
-       version = "0.3.0";
-       sha256 = "2e7fa244c88e4de017440a617bc10c4899e3ade4422e435698923b24d84a1afb";
-       libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/chrisdone/labels#readme";
-       description = "Anonymous records via named tuples";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "labels_0_3_2" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "labels";
@@ -107820,7 +107612,6 @@ self: {
        homepage = "https://github.com/chrisdone/labels#readme";
        description = "Anonymous records via named tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "laborantin-hs" = callPackage
@@ -108175,8 +107966,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot";
-       version = "5.1";
-       sha256 = "6a8d27eb05dff3c3cf8950994e04239bc0fbc84d811cab6bd185a4f5fd0f6ffc";
+       version = "5.1.0.1";
+       sha256 = "24dc7cd5081c443933ce40a1c18c8f492dec436c67d71b7728f23acceca9bda4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108184,7 +107975,7 @@ self: {
          lambdabot-misc-plugins lambdabot-novelty-plugins
          lambdabot-reference-plugins lambdabot-social-plugins mtl
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
@@ -108201,8 +107992,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-core";
-       version = "5.1";
-       sha256 = "f44e0f1264bb6158b79394a2ce7595d81028413cb97911c0a9e5ae19cecc4425";
+       version = "5.1.0.1";
+       sha256 = "ebb542e189ce551c79e3d89f9a0c2898e545abb8c6bf19655b0ec8052cd28970";
        libraryHaskellDepends = [
          base binary bytestring containers dependent-map dependent-sum
          dependent-sum-template directory edit-distance filepath haskeline
@@ -108211,7 +108002,7 @@ self: {
          split syb template-haskell time transformers transformers-base unix
          utf8-string zlib
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
      }) {};
@@ -108249,13 +108040,13 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-irc-plugins";
-       version = "5.1";
-       sha256 = "000e84f1f72af87180c67a8088b15d5e4f6078e1fb4e06f3ea0cc827baa835d5";
+       version = "5.1.0.1";
+       sha256 = "4e50f2430da752ac36e23cf87ce5b2db9e42cf2e76b48447d2fbc882cdeab1ab";
        libraryHaskellDepends = [
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
      }) {};
@@ -108269,8 +108060,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-misc-plugins";
-       version = "5.1";
-       sha256 = "b3868b5099b399cc1d5d12a1407edf3ed12cde74d210a8c0362afd844ae5ce62";
+       version = "5.1.0.1";
+       sha256 = "7a424f1c3919c0e34378ce6187e88b456f264bdf3ddf3d2d6f800631cf2fe1ad";
        libraryHaskellDepends = [
          base bytestring containers filepath hstatsd lambdabot-core
          lifted-base mtl network network-uri parsec process random random-fu
@@ -108278,7 +108069,7 @@ self: {
          template-haskell time transformers transformers-base unix
          utf8-string zlib
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
      }) {};
@@ -108290,13 +108081,13 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-novelty-plugins";
-       version = "5.1";
-       sha256 = "afbf25fad387f8e3232d1dfb2bcfbcb42f639f2cff6346459732f47d9b44cff9";
+       version = "5.1.0.1";
+       sha256 = "f11918f9fbd0b1c49e69864e7a3a6f4669c4791d5ed9103473c88928c2b557c7";
        libraryHaskellDepends = [
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
      }) {};
@@ -108308,13 +108099,13 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-reference-plugins";
-       version = "5.1";
-       sha256 = "441a94ddd6dc686c1d0fe991ee898922eb06b4caafb97dfdd1852612a321129c";
+       version = "5.1.0.1";
+       sha256 = "9713547bd30e5a84ebc9f672aa09ea4f677277a4a42412bdf2ff06aae110a968";
        libraryHaskellDepends = [
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
      }) {};
@@ -108325,12 +108116,12 @@ self: {
      }:
      mkDerivation {
        pname = "lambdabot-social-plugins";
-       version = "5.1";
-       sha256 = "a8bbd6a1ac47f64fa9e6a71a2b69383570fd5af4e2a13b6e24f7397cb0802ef4";
+       version = "5.1.0.1";
+       sha256 = "82502bebb4f51ace089dbccd97e7e699a05d580d33199f743f039e2e96c786dc";
        libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
      }) {};
@@ -108339,10 +108130,10 @@ self: {
     ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }:
      mkDerivation {
        pname = "lambdabot-trusted";
-       version = "5.1";
-       sha256 = "f3719ceb57523f2e4448431581070bb0bdd0b089a4f1956af10398e79232b0bc";
+       version = "5.1.0.1";
+       sha256 = "f92c7d46bca96da2f7dbc7dbc71f90bf911364aba8470a78447a75b25fbf1b87";
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot trusted code";
        license = "GPL";
      }) {};
@@ -111919,25 +111710,6 @@ self: {
      }) {};
 
   "lifted-base" = callPackage
-    ({ mkDerivation, base, HUnit, monad-control, test-framework
-     , test-framework-hunit, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "lifted-base";
-       version = "0.2.3.8";
-       sha256 = "1605df810bc941951522d0cd1b777ff1d62dac6628aabed165a49b848f25df9f";
-       libraryHaskellDepends = [ base monad-control transformers-base ];
-       testHaskellDepends = [
-         base HUnit monad-control test-framework test-framework-hunit
-         transformers transformers-base transformers-compat
-       ];
-       homepage = "https://github.com/basvandijk/lifted-base";
-       description = "lifted IO operations from the base library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lifted-base_0_2_3_10" = callPackage
     ({ mkDerivation, base, HUnit, monad-control, test-framework
      , test-framework-hunit, transformers, transformers-base
      , transformers-compat
@@ -111954,7 +111726,6 @@ self: {
        homepage = "https://github.com/basvandijk/lifted-base";
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -114336,24 +114107,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, exceptions, free, monad-control, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.1.2";
-       sha256 = "7a39a46028c456b024088fcc5995f7552abe21f6578019970cb079083180d12c";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       homepage = "https://github.com/ocharles/logging-effect";
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_1_3" = callPackage
     ({ mkDerivation, async, base, exceptions, free, monad-control, mtl
      , semigroups, stm, stm-delay, text, time, transformers
      , transformers-base, wl-pprint-text
@@ -114369,7 +114122,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -114640,8 +114392,8 @@ self: {
      }:
      mkDerivation {
        pname = "lol-benches";
-       version = "0.0.0.1";
-       sha256 = "13c40b8c3d05c57e43bbc76546486abfff269f412d81104c8790bf1fb4a7ed91";
+       version = "0.0.0.3";
+       sha256 = "4ec18d88b5153220c89ec9f39bf9a0d2e6c1fdfff69f980cdabc42423ee092b5";
        libraryHaskellDepends = [
          ansi-terminal base containers criterion crypto-api deepseq DRBG lol
          MonadRandom split statistics transformers vector
@@ -114673,6 +114425,56 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lol-cpp" = callPackage
+    ({ mkDerivation, arithmoi, base, bytestring, constraints
+     , containers, crypto-api, data-default, deepseq, lol, lol-tests
+     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
+     , protocol-buffers, protocol-buffers-descriptor, random, reflection
+     , repa, singletons, tagged-transformer, template-haskell
+     , th-desugar, transformers, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "lol-cpp";
+       version = "0.0.0.1";
+       sha256 = "86d374f5628c89a35d969c6e6cc59da9c2ca85758bf7375b25f7c0e2ddcf0b57";
+       libraryHaskellDepends = [
+         arithmoi base bytestring constraints containers crypto-api
+         data-default deepseq lol monadcryptorandom MonadRandom mtl
+         numeric-prelude protocol-buffers protocol-buffers-descriptor random
+         reflection repa singletons tagged-transformer template-haskell
+         th-desugar transformers vector vector-th-unbox
+       ];
+       testHaskellDepends = [ base lol-tests ];
+       homepage = "https://github.com/cpeikert/Lol";
+       description = "A fast C++ backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
+  "lol-repa" = callPackage
+    ({ mkDerivation, arithmoi, base, bytestring, constraints
+     , containers, crypto-api, data-default, deepseq, lol, lol-tests
+     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
+     , protocol-buffers, protocol-buffers-descriptor, random, reflection
+     , repa, singletons, tagged-transformer, template-haskell
+     , th-desugar, transformers, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "lol-repa";
+       version = "0.0.0.1";
+       sha256 = "c175e5881ee98795a0e24adde1a7c1955102b5723048d540389f773fff239b98";
+       libraryHaskellDepends = [
+         arithmoi base bytestring constraints containers crypto-api
+         data-default deepseq lol monadcryptorandom MonadRandom mtl
+         numeric-prelude protocol-buffers protocol-buffers-descriptor random
+         reflection repa singletons tagged-transformer template-haskell
+         th-desugar transformers vector vector-th-unbox
+       ];
+       testHaskellDepends = [ base lol-tests ];
+       homepage = "https://github.com/cpeikert/Lol";
+       description = "A repa backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "lol-tests" = callPackage
     ({ mkDerivation, base, lol, MonadRandom, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -116275,19 +116077,6 @@ self: {
      }) {};
 
   "makefile" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }:
-     mkDerivation {
-       pname = "makefile";
-       version = "0.1.0.5";
-       sha256 = "e47e5f07b23071ea1a9881c034ce66f915d3c2a3cf646b4f7db2718725d80316";
-       libraryHaskellDepends = [ attoparsec base bytestring ];
-       testHaskellDepends = [ attoparsec base bytestring doctest Glob ];
-       homepage = "http://github.com/nmattia/mask";
-       description = "Simple Makefile parser";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "makefile_0_1_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, Glob }:
      mkDerivation {
        pname = "makefile";
@@ -116298,7 +116087,6 @@ self: {
        homepage = "http://github.com/nmattia/mask";
        description = "Simple Makefile parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "managed" = callPackage
@@ -117489,8 +117277,8 @@ self: {
      }:
      mkDerivation {
        pname = "matrix-market-attoparsec";
-       version = "0.1.0.4";
-       sha256 = "f26e637d3e10c0ef98dbb3307d2410eed5dca54affbd052162d1b1bc378b8e6d";
+       version = "0.1.0.5";
+       sha256 = "cb200336ba478707e4c0aefc7d4cb4ba4d38ec7a1d637e105184c26ff401565a";
        libraryHaskellDepends = [
          attoparsec base bytestring exceptions scientific
        ];
@@ -117499,7 +117287,7 @@ self: {
        ];
        homepage = "https://github.com/ocramz/matrix-market-attoparsec";
        description = "Parsing and serialization functions for the NIST Matrix Market format";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "matrix-market-pure" = callPackage
@@ -120679,28 +120467,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.20.1";
-       sha256 = "8e7cd3af6a28c6be29ec184d221c60d745d14142794efbd175077ee3e8c0baad";
-       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_20_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -120720,7 +120486,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
@@ -121725,28 +121490,6 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, hashable
-     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
-     , unordered-containers, vector, vector-algorithms
-     }:
-     mkDerivation {
-       pname = "mono-traversable";
-       version = "1.0.1.1";
-       sha256 = "3afa27672db118c215dca1233d7c0cdb9c3ba7f6e4fb4d56e9c75deebb3dde57";
-       libraryHaskellDepends = [
-         base bytestring containers hashable split text transformers
-         unordered-containers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec HUnit QuickCheck semigroups
-         text transformers unordered-containers vector
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mono-traversable_1_0_1_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, foldl, hashable
      , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
      , unordered-containers, vector, vector-algorithms
@@ -121766,7 +121509,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -125751,21 +125493,6 @@ self: {
      }) {};
 
   "network-carbon" = callPackage
-    ({ mkDerivation, base, bytestring, network, text, time, vector }:
-     mkDerivation {
-       pname = "network-carbon";
-       version = "1.0.8";
-       sha256 = "071b81db16f33edfb0dd11e918911f177b9584da27b3481c23a82a9d29f61d86";
-       libraryHaskellDepends = [
-         base bytestring network text time vector
-       ];
-       homepage = "http://github.com/ocharles/network-carbon";
-       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "network-carbon_1_0_9" = callPackage
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
@@ -131054,39 +130781,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
-     , containers, data-default, directory, filepath, hs-bibutils, mtl
-     , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
-     , setenv, split, syb, tagsoup, temporary, text, time
-     , unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.10.4";
-       sha256 = "1dcfffe0dc26d0a1b5ef5688a09c1bb81231702169196e6faed8ddef360d848f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
-         setenv split syb tagsoup text time unordered-containers vector
-         xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base bytestring filepath pandoc
-         pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory filepath mtl pandoc pandoc-types
-         process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_10_4_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -131117,7 +130811,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -131203,6 +130896,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pandoc-include-code" = callPackage
+    ({ mkDerivation, base, containers, filepath, pandoc-types
+     , pcre-heavy, process
+     }:
+     mkDerivation {
+       pname = "pandoc-include-code";
+       version = "0.1.0";
+       sha256 = "f6a14ba6e4d00a27aef573336d6da703a39d1788a5fe9a5d18f080c3486c935c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers filepath pandoc-types pcre-heavy process
+       ];
+       homepage = "https://github.com/owickstrom/pandoc-include-code";
+       description = "A Pandoc filter for including code from source files";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "pandoc-japanese-filters" = callPackage
     ({ mkDerivation, base, containers, data-default, effin, HaTeX
      , HaTeX-qq, hxt, pandoc, pandoc-types, shelly, system-fileio
@@ -133823,23 +133534,6 @@ self: {
      }) {};
 
   "persistable-record" = callPackage
-    ({ mkDerivation, array, base, containers, dlist, names-th
-     , template-haskell, th-data-compat, transformers
-     }:
-     mkDerivation {
-       pname = "persistable-record";
-       version = "0.4.1.0";
-       sha256 = "5bf42a49a7efa127b5f5308ed812c367d3fe1afe499f32e24d0ac0f846df7619";
-       libraryHaskellDepends = [
-         array base containers dlist names-th template-haskell
-         th-data-compat transformers
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Binding between SQL database values and haskell records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistable-record_0_4_1_1" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , quickcheck-simple, template-haskell, th-data-compat, transformers
      }:
@@ -133855,7 +133549,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Binding between SQL database values and haskell records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
@@ -135827,27 +135520,6 @@ self: {
      }) {};
 
   "pipes-misc" = callPackage
-    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
-     , pipes, pipes-category, pipes-concurrency, semigroups, stm
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pipes-misc";
-       version = "0.2.3.0";
-       sha256 = "15a45dcef5c4893c517632772991602b34dd128d59b9eb4fa9d37a6aa7d62d66";
-       libraryHaskellDepends = [
-         base clock Decimal lens mtl pipes pipes-category pipes-concurrency
-         semigroups stm transformers
-       ];
-       testHaskellDepends = [
-         base hspec lens mmorph pipes pipes-concurrency stm transformers
-       ];
-       homepage = "https://github.com/louispan/pipes-misc#readme";
-       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-misc_0_2_5_0" = callPackage
     ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
      , pipes, pipes-category, pipes-concurrency, semigroups, stm
      , transformers
@@ -135866,7 +135538,6 @@ self: {
        homepage = "https://github.com/louispan/pipes-misc#readme";
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-mongodb" = callPackage
@@ -137962,33 +137633,6 @@ self: {
      }) {};
 
   "postgresql-binary" = callPackage
-    ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, conversion, conversion-bytestring, conversion-text
-     , foldl, json-ast, loch-th, placeholders, postgresql-libpq
-     , QuickCheck, quickcheck-instances, rerebase, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
-     , transformers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.9.2";
-       sha256 = "ba9df352bbfc0ee3dff91ef1462f1a3d676e5bac3a45ff3af5d765b7365b1d47";
-       libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring foldl loch-th
-         placeholders scientific text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         aeson conversion conversion-bytestring conversion-text json-ast
-         loch-th placeholders postgresql-libpq QuickCheck
-         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       homepage = "https://github.com/nikita-volkov/postgresql-binary";
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "postgresql-binary_0_9_3" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
      , foldl, json-ast, loch-th, placeholders, postgresql-libpq
@@ -138013,7 +137657,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-config" = callPackage
@@ -138228,30 +137871,6 @@ self: {
      }) {};
 
   "postgresql-simple-migration" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
-     , directory, hspec, postgresql-simple, text, time
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-migration";
-       version = "0.1.8.0";
-       sha256 = "69d24f8f9dce302206562edc76afa2653d977770d6b223583da9126f2f6635fa";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple time
-       ];
-       executableHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple text time
-       ];
-       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       homepage = "https://github.com/ameingast/postgresql-simple-migration";
-       description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple-migration_0_1_9_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
      , directory, hspec, postgresql-simple, text, time
      }:
@@ -138273,7 +137892,6 @@ self: {
        homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -140073,26 +139691,6 @@ self: {
      }) {};
 
   "profiteur" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, filepath
-     , ghc-prof, js-jquery, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "profiteur";
-       version = "0.4.2.0";
-       sha256 = "eb1936c5b9db53695530ba6302fe6950dd8dc275628112b05b7902996f414b91";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring containers filepath ghc-prof js-jquery
-         scientific text unordered-containers vector
-       ];
-       homepage = "http://github.com/jaspervdj/profiteur";
-       description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profiteur_0_4_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , ghc-prof, js-jquery, scientific, text, unordered-containers
      , vector
@@ -140110,7 +139708,6 @@ self: {
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -141586,27 +141183,6 @@ self: {
      }) {};
 
   "purescript-bridge" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
-     , mtl, text, transformers
-     }:
-     mkDerivation {
-       pname = "purescript-bridge";
-       version = "0.10.0.0";
-       sha256 = "6bfb056e3dc2f93a4bb5db20e1151f258145ae7a8c2a13a2e8478936b4ff37d3";
-       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-bridge_0_10_1_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
      , mtl, text, transformers
@@ -146343,39 +145919,21 @@ self: {
 
   "regex" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
-     , directory, hashable, heredoc, http-conduit, regex-base
-     , regex-pcre-builtin, regex-tdfa, regex-tdfa-text, shelly
-     , smallcheck, tasty, tasty-hunit, tasty-smallcheck
-     , template-haskell, text, time, time-locale-compat, transformers
-     , unordered-containers
+     , hashable, heredoc, 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.1.0.0";
-       sha256 = "21ed5c61fe5c97790a085657b6c022c48953fa8a5904d0d14c695ae3593f3448";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.1";
+       sha256 = "43ee04802ef3a4d6884cd97c73a261277d89eaa80abc31f148bd0b8f9c6f4a31";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable heredoc
          regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
          template-haskell text time time-locale-compat transformers
          unordered-containers
        ];
-       executableHaskellDepends = [
-         array base base-compat bytestring containers directory hashable
-         heredoc http-conduit regex-base regex-pcre-builtin regex-tdfa
-         regex-tdfa-text 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-base regex-pcre-builtin regex-tdfa
-         regex-tdfa-text shelly smallcheck tasty tasty-hunit
-         tasty-smallcheck template-haskell text time time-locale-compat
-         transformers unordered-containers
-       ];
-       homepage = "https://iconnect.github.io/regex";
+       homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146516,6 +146074,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "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, shelly
+     , smallcheck, tasty, tasty-hunit, tasty-smallcheck
+     , template-haskell, text, time, time-locale-compat, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "regex-examples";
+       version = "0.2.0.1";
+       sha256 = "73b95d1ca92342fff14b2a5f634b8b1a703d22e6a32140a6f0faea2c68ca55a1";
+       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 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 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";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-genex" = callPackage
     ({ mkDerivation, base, containers, logict, mtl, regex-tdfa, sbv
      , stream-monad, text
@@ -147198,29 +146789,6 @@ self: {
      }) {};
 
   "relational-query" = 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.4";
-       sha256 = "5c31665bf5cae82c06090e2d9b539f8001434db2888ab891755584b74b9560c2";
-       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;
-     }) {};
-
-  "relational-query_0_8_3_5" = 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
@@ -147241,7 +146809,6 @@ self: {
        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
@@ -147265,23 +146832,6 @@ self: {
      }) {};
 
   "relational-record" = callPackage
-    ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
-     , relational-query-HDBC
-     }:
-     mkDerivation {
-       pname = "relational-record";
-       version = "0.1.5.1";
-       sha256 = "b62734918834dfecb41be5dd9c9c90d409498e307d26eed37c7df30298e4571b";
-       libraryHaskellDepends = [
-         base persistable-types-HDBC-pg relational-query
-         relational-query-HDBC
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Meta package of Relational Record";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-record_0_1_6_1" = callPackage
     ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
      , relational-query-HDBC
      }:
@@ -147296,7 +146846,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Meta package of Relational Record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-record-examples" = callPackage
@@ -150768,19 +150317,6 @@ self: {
      }) {};
 
   "safe" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck }:
-     mkDerivation {
-       pname = "safe";
-       version = "0.3.13";
-       sha256 = "4a75af71313ef98bb66fbb4f1416f6f1220cd37a2c8b1462ed8c5a982a264884";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
-       description = "Library of safe (exception free) functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "safe_0_3_14" = callPackage
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "safe";
@@ -150791,7 +150327,6 @@ self: {
        homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-access" = callPackage
@@ -154117,8 +153652,10 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.3.4";
-       sha256 = "553d2d47c1c04cb67c08632d26d817a8b1969d10064dd66409dc9d559056468f";
+       version = "0.1.3.5";
+       sha256 = "4d39b93b18636db11004b7b03fc118da8417ff9abe4db32164c200da23a22391";
+       revision = "1";
+       editedCabalFile = "3bcba06004dd1f2cfe23b7321917dd53e08efff1c65e2c48898d773b91ce5a35";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -154838,25 +154375,6 @@ self: {
      }) {};
 
   "servant-elm" = callPackage
-    ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
-     , servant, servant-foreign, text, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "servant-elm";
-       version = "0.4.0.0";
-       sha256 = "2421e8eb140d3848ba4713bc4fb0b8c0c804aef8ef361c0cba08d4df3f50c24b";
-       libraryHaskellDepends = [
-         base elm-export lens servant servant-foreign text wl-pprint-text
-       ];
-       testHaskellDepends = [
-         aeson base Diff elm-export hspec HUnit servant text
-       ];
-       homepage = "http://github.com/mattjbray/servant-elm#readme";
-       description = "Automatically derive Elm functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-elm_0_4_0_1" = callPackage
     ({ mkDerivation, aeson, base, Diff, elm-export, hspec, HUnit, lens
      , servant, servant-foreign, text, wl-pprint-text
      }:
@@ -154873,7 +154391,6 @@ self: {
        homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-examples" = callPackage
@@ -155225,6 +154742,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-purescript_0_7_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, http-types, lens, mainland-pretty, purescript-bridge
+     , servant, servant-foreign, servant-server, servant-subscriber
+     , text
+     }:
+     mkDerivation {
+       pname = "servant-purescript";
+       version = "0.7.0.0";
+       sha256 = "672cf63144b54f3f3de3662794a06270d806d5a7575d52156f3b487eb637d6f8";
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath http-types lens
+         mainland-pretty purescript-bridge servant servant-foreign
+         servant-server servant-subscriber text
+       ];
+       testHaskellDepends = [
+         aeson base containers lens mainland-pretty purescript-bridge
+         servant servant-foreign servant-subscriber text
+       ];
+       homepage = "https://github.com/eskimor/servant-purescript#readme";
+       description = "Generate PureScript accessor functions for you servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-pushbullet-client" = callPackage
     ({ mkDerivation, aeson, base, http-api-data, http-client
      , http-client-tls, microlens, microlens-th, scientific, servant
@@ -158823,6 +158365,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "skylighting_0_3" = callPackage
+    ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
+     , case-insensitive, containers, Diff, directory, filepath, HUnit
+     , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty
+     , tasty-golden, tasty-hunit, text, utf8-string
+     }:
+     mkDerivation {
+       pname = "skylighting";
+       version = "0.3";
+       sha256 = "ebfb2d5c8ce5769522826a2d5744064c578291d25d3671dcfe89a41f694ebf59";
+       libraryHaskellDepends = [
+         aeson base binary blaze-html bytestring case-insensitive containers
+         directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers Diff directory filepath HUnit
+         pretty-show random tasty tasty-golden tasty-hunit text
+       ];
+       homepage = "https://github.com/jgm/skylighting";
+       description = "syntax highlighting library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "skype4hs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, lifted-base
      , monad-control, mtl, stm, text, time, transformers-base, word8
@@ -161827,28 +161393,6 @@ self: {
      }) {};
 
   "sparse-linear-algebra" = callPackage
-    ({ mkDerivation, base, containers, criterion, hspec, mtl
-     , mwc-random, primitive, QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "sparse-linear-algebra";
-       version = "0.2.2.0";
-       sha256 = "7ef54d3351bd03dadd73797a48aaa629d71deff5a47f2c0e4ea780cdf47b3568";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers hspec mtl mwc-random primitive QuickCheck vector
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base containers criterion hspec mtl mwc-random primitive
-       ];
-       homepage = "https://github.com/ocramz/sparse-linear-algebra";
-       description = "Numerical computation in native Haskell";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "sparse-linear-algebra_0_2_9_4" = callPackage
     ({ mkDerivation, base, containers, criterion, exceptions, hspec
      , mtl, mwc-random, primitive, QuickCheck, transformers, vector
      , vector-algorithms, vector-space
@@ -161868,7 +161412,6 @@ self: {
        homepage = "https://github.com/ocramz/sparse-linear-algebra";
        description = "Numerical computation in native Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparsebit" = callPackage
@@ -165894,8 +165437,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-core";
-       version = "2.2.0";
-       sha256 = "ca694e710f1670ea844e8f65ab483b9acb24e27dc26de1f8500b11d8f13af559";
+       version = "2.2.1";
+       sha256 = "1c95d6a8479e1f87b5800252427f2f2b2ddc2a3b39e7f45b3bd097705b336c6d";
        libraryHaskellDepends = [
          aeson base bytestring mtl text time transformers
          unordered-containers
@@ -165909,8 +165452,8 @@ self: {
     ({ mkDerivation, base, stripe-core, stripe-http-streams }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "2.2.0";
-       sha256 = "f69fe32fd135a802587339d5043411f030cb2e2627df739193252f3015e971a0";
+       version = "2.2.1";
+       sha256 = "aae0995a0c678fbe5c2f9f150f6a6183c0948500ca51a4a54b1257b88faed0bf";
        libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
@@ -165924,8 +165467,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-http-streams";
-       version = "2.2.0";
-       sha256 = "83b86304a51975625196dfac2db567e82e93ae437ef4fdd26204061c360ac07a";
+       version = "2.2.1";
+       sha256 = "5de7f0f2167ee004a0cb67de2a99fb753022a142e5c12c8477e9c928b4976662";
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
@@ -165946,8 +165489,8 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-tests";
-       version = "2.2.0";
-       sha256 = "7a7c5771408807509ed5708ed7e9e6f7d10d8e6d39ecaf7a1fce0b61b73b4913";
+       version = "2.2.1";
+       sha256 = "e170b605119c5da30efceefe446e6c3b31ed2c7b8c7edf6e643464a57a7ce3e9";
        libraryHaskellDepends = [
          aeson base bytestring free hspec hspec-core mtl random stripe-core
          text time transformers unordered-containers
@@ -169140,24 +168683,6 @@ self: {
      }) {};
 
   "tasty" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, clock, containers
-     , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
-     , unbounded-delays
-     }:
-     mkDerivation {
-       pname = "tasty";
-       version = "0.11.1";
-       sha256 = "ab9f83401ba8b99d05bc85e2447e32416da593684daae14647777db8bb5eabdc";
-       libraryHaskellDepends = [
-         ansi-terminal async base clock containers deepseq mtl
-         optparse-applicative regex-tdfa stm tagged unbounded-delays
-       ];
-       homepage = "http://documentup.com/feuerbach/tasty";
-       description = "Modern and extensible testing framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty_0_11_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, clock, containers
      , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged
      , unbounded-delays
@@ -169173,7 +168698,6 @@ self: {
        homepage = "http://documentup.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-ant-xml" = callPackage
@@ -169195,28 +168719,6 @@ self: {
      }) {};
 
   "tasty-auto" = callPackage
-    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
-     }:
-     mkDerivation {
-       pname = "tasty-auto";
-       version = "0.1.0.1";
-       sha256 = "ec858ac5f1890af16c7a98ae866231e15ee3f46c374245bd89a9168b52a7d109";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base directory filepath ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base directory filepath tasty tasty-hspec tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/minad/tasty-auto#readme";
-       description = "Simple auto discovery for Tasty";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "tasty-auto_0_1_0_2" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
      }:
@@ -169893,33 +169395,6 @@ self: {
      }) {};
 
   "telegram-api" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath
-     , hjpath, hspec, http-api-data, http-client, http-client-tls
-     , http-media, http-types, mime-types, mtl, optparse-applicative
-     , servant, servant-client, string-conversions, text, transformers
-     , utf8-string
-     }:
-     mkDerivation {
-       pname = "telegram-api";
-       version = "0.6.0.0";
-       sha256 = "8e930edd4291c66e73ca8fcd30b642b66141a17b1c534aac092642c93311f7f2";
-       libraryHaskellDepends = [
-         aeson base bytestring http-api-data http-client http-media
-         http-types mime-types mtl servant servant-client string-conversions
-         text transformers
-       ];
-       testHaskellDepends = [
-         aeson ansi-wl-pprint base filepath hjpath hspec http-client
-         http-client-tls http-types optparse-applicative servant
-         servant-client text transformers utf8-string
-       ];
-       homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
-       description = "Telegram Bot API bindings";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "telegram-api_0_6_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, filepath
      , hjpath, hspec, http-api-data, http-client, http-client-tls
      , http-media, http-types, mime-types, mtl, optparse-applicative
@@ -184268,22 +183743,6 @@ self: {
      }) {};
 
   "wavefront" = callPackage
-    ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
-     , transformers, vector
-     }:
-     mkDerivation {
-       pname = "wavefront";
-       version = "0.7.0.2";
-       sha256 = "3ec8338855efbdc430f3c7f5449c9e5308d7c854dea8a51ae192b983681eae26";
-       libraryHaskellDepends = [
-         attoparsec base dlist filepath mtl text transformers vector
-       ];
-       homepage = "https://github.com/phaazon/wavefront";
-       description = "Wavefront OBJ loader";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wavefront_0_7_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text
      , transformers, vector
      }:
@@ -184297,7 +183756,6 @@ self: {
        homepage = "https://github.com/phaazon/wavefront";
        description = "Wavefront OBJ loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavefront-obj" = callPackage
@@ -187612,8 +187070,8 @@ self: {
      }:
      mkDerivation {
        pname = "xlsx";
-       version = "0.4.2";
-       sha256 = "cc4fa6267c36824637f36f3e10c6a8ef301402a1ccd81be1ebb036ef6b0cc3c8";
+       version = "0.4.3";
+       sha256 = "1862f1a68be3d4d8619c60d858355aa9c1ad535b79845c359686ab5f1e0699a0";
        libraryHaskellDepends = [
          base base64-bytestring binary-search bytestring conduit containers
          data-default errors extra filepath lens mtl mtl-compat network-uri
@@ -187714,30 +187172,6 @@ self: {
      }) {};
 
   "xml-conduit" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, conduit, conduit-extra, containers
-     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
-     , text, transformers, xml-types
-     }:
-     mkDerivation {
-       pname = "xml-conduit";
-       version = "1.4.0.3";
-       sha256 = "b924632258a68fc31d5c14e00393f9c38bdfad8fb753010b8a6b5b417d99bbdf";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         conduit conduit-extra containers data-default deepseq monad-control
-         resourcet text transformers xml-types
-       ];
-       testHaskellDepends = [
-         base blaze-markup bytestring conduit containers hspec HUnit
-         resourcet text transformers xml-types
-       ];
-       homepage = "http://github.com/snoyberg/xml";
-       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "xml-conduit_1_4_0_4" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -187759,7 +187193,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit-decode" = callPackage
@@ -189147,6 +188580,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_22" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, filepath, hspec
+     , HUnit, libyaml, mockery, resourcet, scientific, semigroups
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.22";
+       sha256 = "76429aedad04cadacbdc20fdb7f4a763b8e5bf9f733d6c97f166edb24bd9b5a3";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       executableHaskellDepends = [ aeson base bytestring ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat bytestring conduit directory hspec
+         HUnit mockery resourcet temporary text transformers
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty
      , tasty-quickcheck, text, unordered-containers, yaml

From 183eeb3c0fdac8de3146aedaa6028b474f96db6f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Feb 2017 16:06:17 +0100
Subject: [PATCH 0792/3449] simp_le: fix meta.homepage

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

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 134afa72ad03..b3707a4f4da0 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ];
 
   meta = with stdenv.lib; {
-    inherit (src.meta) homepage;
+    homepage = "https://github.com/zenhack/simp_le";
     description = "Simple Let's Encrypt client";
     license = licenses.gpl3;
     maintainers = with maintainers; [ gebner nckx ];

From 9d8ad57abc5462edb246bc6a27f38cc7cf777a02 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 18 Feb 2017 13:53:46 -0600
Subject: [PATCH 0793/3449] llvm-4.0: init at rc2 in preparation for release.

Also adds 'lld'.
---
 .../compilers/llvm/4.0/clang/default.nix      |  56 +++++++++
 .../compilers/llvm/4.0/clang/purity.patch     |  16 +++
 .../compilers/llvm/4.0/default.nix            |  51 ++++++++
 .../compilers/llvm/4.0/libc++/darwin.patch    |  39 ++++++
 .../compilers/llvm/4.0/libc++/default.nix     |  40 ++++++
 .../compilers/llvm/4.0/libc++/setup-hook.sh   |   3 +
 .../compilers/llvm/4.0/libc++abi.nix          |  45 +++++++
 pkgs/development/compilers/llvm/4.0/lld.nix   |  32 +++++
 pkgs/development/compilers/llvm/4.0/lldb.nix  |  47 +++++++
 .../compilers/llvm/4.0/llvm-outputs.patch     |  26 ++++
 pkgs/development/compilers/llvm/4.0/llvm.nix  | 116 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   8 ++
 12 files changed, 479 insertions(+)
 create mode 100644 pkgs/development/compilers/llvm/4.0/clang/default.nix
 create mode 100644 pkgs/development/compilers/llvm/4.0/clang/purity.patch
 create mode 100644 pkgs/development/compilers/llvm/4.0/default.nix
 create mode 100644 pkgs/development/compilers/llvm/4.0/libc++/darwin.patch
 create mode 100644 pkgs/development/compilers/llvm/4.0/libc++/default.nix
 create mode 100644 pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh
 create mode 100644 pkgs/development/compilers/llvm/4.0/libc++abi.nix
 create mode 100644 pkgs/development/compilers/llvm/4.0/lld.nix
 create mode 100644 pkgs/development/compilers/llvm/4.0/lldb.nix
 create mode 100644 pkgs/development/compilers/llvm/4.0/llvm-outputs.patch
 create mode 100644 pkgs/development/compilers/llvm/4.0/llvm.nix

diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4.0/clang/default.nix
new file mode 100644
index 000000000000..d482f91cb83a
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/clang/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+
+let
+  gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
+  self = stdenv.mkDerivation {
+    name = "clang-${version}";
+
+    unpackPhase = ''
+      unpackFile ${fetch "cfe" "1p55db1yfya60r2fnr9bh8pj8fqq5gjc1fnv0c1kmac8yfvwkmkn"}
+      mv cfe-${version}* clang
+      sourceRoot=$PWD/clang
+      unpackFile ${clang-tools-extra_src}
+      mv clang-tools-extra-* $sourceRoot/tools/extra
+    '';
+
+    buildInputs = [ cmake libedit libxml2 llvm python ];
+
+    cmakeFlags = [
+      "-DCMAKE_CXX_FLAGS=-std=c++11"
+    ] ++
+    # Maybe with compiler-rt this won't be needed?
+    (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
+    (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
+
+    patches = [ ./purity.patch ];
+
+    postPatch = ''
+      sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
+      sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp
+    '';
+
+    # 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
+    '';
+
+    enableParallelBuilding = true;
+
+    passthru = {
+      lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
+      isClang = true;
+    } // stdenv.lib.optionalAttrs stdenv.isLinux {
+      inherit gcc;
+    };
+
+    meta = {
+      description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler";
+      homepage    = http://llvm.org/;
+      license     = stdenv.lib.licenses.ncsa;
+      platforms   = stdenv.lib.platforms.all;
+    };
+  };
+in self
diff --git a/pkgs/development/compilers/llvm/4.0/clang/purity.patch b/pkgs/development/compilers/llvm/4.0/clang/purity.patch
new file mode 100644
index 000000000000..f5fb4c73af47
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/clang/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/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4.0/default.nix
new file mode 100644
index 000000000000..a239825533eb
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/default.nix
@@ -0,0 +1,51 @@
+{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
+let
+  callPackage = newScope (self // { inherit stdenv isl version fetch; });
+
+  version = "4.0.0";
+  rc = "rc2";
+
+  fetch = fetch_v version;
+  fetch_v = ver: name: sha256: fetchurl {
+    url = "http://llvm.org/pre-releases/${version}/${rc}/${name}-${version}${rc}.src.tar.xz";
+    # Once 4.0 is released, use this instead:
+    # url = "http://llvm.org/releases/${version}/${name}-${ver}.src.tar.xz";
+    inherit sha256;
+  };
+
+  compiler-rt_src = fetch "compiler-rt" "07i098rj41h1sq2f30d6161924zr5yd9gx5kans79p7akxxgc0jr";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0ypvkv55pw88iaixib29sgz44d4pfs166vpswnrrbkqlhz92ns0z";
+
+  self = {
+    llvm = callPackage ./llvm.nix {
+      inherit compiler-rt_src stdenv;
+    };
+
+    clang-unwrapped = callPackage ./clang {
+      inherit clang-tools-extra_src stdenv;
+    };
+
+    clang = wrapCC self.clang-unwrapped;
+
+    libcxxClang = ccWrapperFun {
+      cc = self.clang-unwrapped;
+      isClang = true;
+      inherit (self) stdenv;
+      /* FIXME is this right? */
+      inherit (stdenv.cc) libc nativeTools nativeLibc;
+      extraPackages = [ self.libcxx self.libcxxabi ];
+    };
+
+    stdenv = overrideCC stdenv self.clang;
+
+    libcxxStdenv = overrideCC stdenv self.libcxxClang;
+
+    lld = callPackage ./lld.nix {};
+
+    lldb = callPackage ./lldb.nix {};
+
+    libcxx = callPackage ./libc++ {};
+
+    libcxxabi = callPackage ./libc++abi.nix {};
+  };
+in self
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/darwin.patch b/pkgs/development/compilers/llvm/4.0/libc++/darwin.patch
new file mode 100644
index 000000000000..6dd756f01cc2
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/libc++/darwin.patch
@@ -0,0 +1,39 @@
+--- libcxx-3.8.0.src.org/lib/CMakeLists.txt	2015-12-16 15:41:05.000000000 -0800
++++ libcxx-3.8.0.src/lib/CMakeLists.txt	2016-06-17 19:40:00.293394500 -0700
+@@ -94,30 +94,30 @@
+     add_definitions(-D__STRICT_ANSI__)
+     add_link_flags(
+       "-compatibility_version 1"
+       "-current_version 1"
+-      "-install_name /usr/lib/libc++.1.dylib"
+-      "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
++      "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
++      "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
+       "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
+       "/usr/lib/libSystem.B.dylib")
+   else()
+     if ( ${CMAKE_OSX_SYSROOT} )
+       list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
+       if (OSX_HAS_ARMV7)
+         set(OSX_RE_EXPORT_LINE
+-          "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
++          "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
+           "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
+       else()
+         set(OSX_RE_EXPORT_LINE
+-          "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
++          "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
+       endif()
+     else()
+-      set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
++      set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
+     endif()
+ 
+     add_link_flags(
+       "-compatibility_version 1"
+-      "-install_name /usr/lib/libc++.1.dylib"
++      "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
+       "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
+       "${OSX_RE_EXPORT_LINE}"
+       "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp"
+       "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp")
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4.0/libc++/default.nix
new file mode 100644
index 000000000000..76ca05333231
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/libc++/default.nix
@@ -0,0 +1,40 @@
+{ lib, stdenv, fetch, cmake, llvm, libcxxabi, fixDarwinDylibNames, version }:
+
+stdenv.mkDerivation rec {
+  name = "libc++-${version}";
+
+  src = fetch "libcxx" "130clvfffqml8hbnlvr596nfjk18n6ifxab27xl66nxhq99wccfn";
+
+  postUnpack = ''
+    unpackFile ${libcxxabi.src}
+    export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include"
+  '';
+
+  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")
+  '';
+
+  patches = lib.optional stdenv.isDarwin ./darwin.patch;
+
+  buildInputs = [ cmake llvm libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  cmakeFlags = [
+      "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
+      "-DLIBCXX_LIBCPPABI_VERSION=2"
+      "-DLIBCXX_CXX_ABI=libcxxabi"
+    ];
+
+  enableParallelBuilding = true;
+
+  linkCxxAbi = stdenv.isLinux;
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    homepage = http://libcxx.llvm.org/;
+    description = "A new implementation of the C++ standard library, targeting C++11";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh
new file mode 100644
index 000000000000..9022fced6ecf
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh
@@ -0,0 +1,3 @@
+linkCxxAbi="@linkCxxAbi@"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4.0/libc++abi.nix
new file mode 100644
index 000000000000..52da7cc1988e
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/libc++abi.nix
@@ -0,0 +1,45 @@
+{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
+
+stdenv.mkDerivation {
+  name = "libc++abi-${version}";
+
+  src = fetch "libcxxabi" "09hlqlbxpnqi3449nrk43khp4jgd34xwx406mw6igwl8a673pa85";
+
+  buildInputs = [ cmake llvm ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+
+  postUnpack = ''
+    unpackFile ${libcxx.src}
+    export cmakeFlags="-DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export TRIPLE=x86_64-apple-darwin
+  '';
+
+  installPhase = if stdenv.isDarwin
+    then ''
+      for file in lib/*.dylib; do
+        # this should be done in CMake, but having trouble figuring out
+        # the magic combination of necessary CMake variables
+        # if you fancy a try, take a look at
+        # http://www.cmake.org/Wiki/CMake_RPATH_handling
+        install_name_tool -id $out/$file $file
+      done
+      make install
+      install -d 755 $out/include
+      install -m 644 ../include/*.h $out/include
+    ''
+    else ''
+      install -d -m 755 $out/include $out/lib
+      install -m 644 lib/libc++abi.so.1.0 $out/lib
+      install -m 644 ../include/cxxabi.h $out/include
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so
+      ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1
+    '';
+
+  meta = {
+    homepage = http://libcxxabi.llvm.org/;
+    description = "A new implementation of low level support for a standard C++ library";
+    license = with stdenv.lib.licenses; [ ncsa mit ];
+    maintainers = with stdenv.lib.maintainers; [ vlstill ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4.0/lld.nix
new file mode 100644
index 000000000000..004230ca81ab
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/lld.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, llvm
+, python
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "lld-${version}";
+
+  src = fetch "lld" "144vmb13800s33xgd18321lrviw21mjx5dphzszjgvizn4a1sf1p";
+
+  buildInputs = [ cmake llvm ];
+
+  outputs = [ "out" "dev" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    moveToOutput include "$dev"
+    moveToOutput lib "$dev"
+  '';
+
+  meta = {
+    description = "The LLVM Linker";
+    homepage    = http://lld.llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4.0/lldb.nix
new file mode 100644
index 000000000000..7bca695fafc1
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/lldb.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, fetch
+, cmake
+, zlib
+, ncurses
+, swig
+, which
+, libedit
+, llvm
+, clang-unwrapped
+, python
+, version
+}:
+
+stdenv.mkDerivation {
+  name = "lldb-${version}";
+
+  src = fetch "lldb" "0g3il7bz1b0xbcm85c6r64vgn8ppxigi1s39s3xzga4pkllf7k07";
+
+  patchPhase = ''
+    # Fix up various paths that assume llvm and clang are installed in the same place
+    sed -i 's,".*ClangConfig.cmake","${clang-unwrapped}/lib/cmake/clang/ClangConfig.cmake",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,".*tools/clang/include","${clang-unwrapped}/include",' \
+      cmake/modules/LLDBStandalone.cmake
+    sed -i 's,"$.LLVM_LIBRARY_DIR.",${llvm}/lib ${clang-unwrapped}/lib,' \
+      cmake/modules/LLDBStandalone.cmake
+  '';
+
+  buildInputs = [ cmake python which swig ncurses zlib libedit llvm ];
+
+  CXXFLAGS = "-fno-rtti";
+  hardeningDisable = [ "format" ];
+
+  cmakeFlags = [
+    "-DLLDB_DISABLE_LIBEDIT=1" 
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A next-generation high-performance debugger";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/llvm/4.0/llvm-outputs.patch b/pkgs/development/compilers/llvm/4.0/llvm-outputs.patch
new file mode 100644
index 000000000000..40096fa3497f
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/llvm-outputs.patch
@@ -0,0 +1,26 @@
+diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp
+index 94d426b..37f7794 100644
+--- a/tools/llvm-config/llvm-config.cpp
++++ b/tools/llvm-config/llvm-config.cpp
+@@ -333,6 +333,21 @@ int main(int argc, char **argv) {
+     ActiveIncludeOption = "-I" + ActiveIncludeDir;
+   }
+ 
++  /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared
++  if (!IsInDevelopmentTree) {
++    bool WantShared = true;
++    for (int i = 1; i < argc; ++i) {
++      StringRef Arg = argv[i];
++      if (Arg == "--link-shared")
++        WantShared = true;
++      else if (Arg == "--link-static")
++        WantShared = false; // the last one wins
++    }
++
++    if (WantShared)
++      ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX;
++  }
++
+   /// We only use `shared library` mode in cases where the static library form
+   /// of the components provided are not available; note however that this is
+   /// skipped if we're run from within the build dir. However, once installed,
diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4.0/llvm.nix
new file mode 100644
index 000000000000..0139f40791cc
--- /dev/null
+++ b/pkgs/development/compilers/llvm/4.0/llvm.nix
@@ -0,0 +1,116 @@
+{ stdenv
+, fetch
+, fetchpatch
+, perl
+, groff
+, cmake
+, python
+, libffi
+, binutils
+, libxml2
+, valgrind
+, ncurses
+, version
+, zlib
+, compiler-rt_src
+, libcxxabi
+, debugVersion ? false
+, enableSharedLibraries ? true
+, darwin
+}:
+
+let
+  src = fetch "llvm" "1qfvvblca2aa5shamz66132k30hmpq2mkpfn172xzzlm6znzlmr2";
+  shlib = if stdenv.isDarwin then "dylib" else "so";
+
+  # Used when creating a version-suffixed symlink of libLLVM.dylib
+  shortVersion = with stdenv.lib;
+    concatStringsSep "." (take 2 (splitString "." version));
+in stdenv.mkDerivation rec {
+  name = "llvm-${version}";
+
+  unpackPhase = ''
+    unpackFile ${src}
+    mv llvm-${version}* llvm
+    sourceRoot=$PWD/llvm
+    unpackFile ${compiler-rt_src}
+    mv compiler-rt-* $sourceRoot/projects/compiler-rt
+  '';
+
+  outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib";
+
+  buildInputs = [ perl groff cmake libxml2 python libffi ]
+    ++ stdenv.lib.optionals stdenv.isDarwin
+         [ libcxxabi darwin.cctools darwin.apple_sdk.libs.xpc ];
+
+  propagatedBuildInputs = [ ncurses zlib ];
+
+  # 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.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+        sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+  ''
+  # Patch llvm-config to return correct library path based on --link-{shared,static}.
+  + stdenv.lib.optionalString (enableSharedLibraries) ''
+    substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
+    patch -p1 < ./llvm-outputs.patch
+  '';
+
+  # hacky fix: created binaries need to be run before installation
+  preBuild = ''
+    mkdir -p $out/
+    ln -sv $PWD/lib $out
+  '';
+
+  cmakeFlags = with stdenv; [
+    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
+    "-DLLVM_INSTALL_UTILS=ON"  # Needed by rustc
+    "-DLLVM_BUILD_TESTS=ON"
+    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_ENABLE_RTTI=ON"
+    "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
+  ] ++ stdenv.lib.optional enableSharedLibraries [
+    "-DLLVM_LINK_LLVM_DYLIB=ON"
+  ] ++ stdenv.lib.optional (!isDarwin)
+    "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include"
+    ++ stdenv.lib.optionals (isDarwin) [
+    "-DLLVM_ENABLE_LIBCXX=ON"
+    "-DCAN_TARGET_i386=false"
+    "-DCMAKE_LIBTOOL=${darwin.cctools}/bin/libtool"
+  ];
+
+  postBuild = ''
+    rm -fR $out
+
+    paxmark m bin/{lli,llvm-rtdyld}
+  '';
+
+  postInstall = ""
+  + stdenv.lib.optionalString (enableSharedLibraries) ''
+    moveToOutput "lib/libLLVM-*" "$lib"
+    moveToOutput "lib/libLLVM.${shlib}" "$lib"
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-"
+  ''
+  + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+    substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
+      --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
+    install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
+    install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.src = src;
+
+  meta = {
+    description = "Collection of modular and reusable compiler and toolchain technologies";
+    homepage    = http://llvm.org/;
+    license     = stdenv.lib.licenses.ncsa;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+    platforms   = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bfb6d92a8e8..95a19240a0a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4730,6 +4730,7 @@ with pkgs;
 
   clang = llvmPackages.clang;
 
+  clang_40 = llvmPackages_40.clang;
   clang_39 = llvmPackages_39.clang;
   clang_38 = llvmPackages_38.clang;
   clang_37 = llvmPackages_37.clang;
@@ -5277,10 +5278,13 @@ with pkgs;
 
   lizardfs = callPackage ../tools/filesystems/lizardfs { };
 
+  lld = llvmPackages_40.lld;
+
   lldb = llvmPackages.lldb;
 
   llvm = llvmPackages.llvm;
 
+  llvm_40 = llvmPackages_40.llvm;
   llvm_39 = llvmPackages_39.llvm;
   llvm_38 = llvmPackages_38.llvm;
   llvm_37 = llvmPackages_37.llvm;
@@ -5318,6 +5322,10 @@ with pkgs;
     inherit (stdenvAdapters) overrideCC;
   };
 
+  llvmPackages_40 = callPackage ../development/compilers/llvm/4.0 {
+    inherit (stdenvAdapters) overrideCC;
+  };
+
   manticore = callPackage ../development/compilers/manticore { };
 
   mentorToolchains = recurseIntoAttrs (

From 2ebb086df167d7881b82af9585c65d43c440ff86 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 18 Feb 2017 17:30:08 -0600
Subject: [PATCH 0794/3449] llvm-4.0/libc++abi: Remove LLVM build dep to
 unbreak Darwin evaluation.

---
 pkgs/development/compilers/llvm/4.0/libc++abi.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4.0/libc++abi.nix
index 52da7cc1988e..362663ed443f 100644
--- a/pkgs/development/compilers/llvm/4.0/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4.0/libc++abi.nix
@@ -5,11 +5,12 @@ stdenv.mkDerivation {
 
   src = fetch "libcxxabi" "09hlqlbxpnqi3449nrk43khp4jgd34xwx406mw6igwl8a673pa85";
 
-  buildInputs = [ cmake llvm ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
+  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
   postUnpack = ''
     unpackFile ${libcxx.src}
-    export cmakeFlags="-DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
+    unpackFile ${llvm.src}
+    export cmakeFlags="-DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)"
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
   '';

From 753058baef591f68767de08984a463f50ccd8bf2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 Feb 2017 13:18:01 -0600
Subject: [PATCH 0795/3449] libc++-4.0rc2: Use substituteInPlace instead of the
 Darwin patch.

On 3.9 the substituteInPlace is equivalent to the patch,
hopefully this is a slightly more robust way to make
the same substitution for the 4.0 version.

Apply this change unconditionally for consistency across versions,
even if the changed strings are unused on other platforms.

Discussion:
https://github.com/NixOS/nixpkgs/pull/22970#discussion_r101926144
---
 .../compilers/llvm/4.0/libc++/darwin.patch    | 39 -------------------
 .../compilers/llvm/4.0/libc++/default.nix     |  4 +-
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/4.0/libc++/darwin.patch

diff --git a/pkgs/development/compilers/llvm/4.0/libc++/darwin.patch b/pkgs/development/compilers/llvm/4.0/libc++/darwin.patch
deleted file mode 100644
index 6dd756f01cc2..000000000000
--- a/pkgs/development/compilers/llvm/4.0/libc++/darwin.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- libcxx-3.8.0.src.org/lib/CMakeLists.txt	2015-12-16 15:41:05.000000000 -0800
-+++ libcxx-3.8.0.src/lib/CMakeLists.txt	2016-06-17 19:40:00.293394500 -0700
-@@ -94,30 +94,30 @@
-     add_definitions(-D__STRICT_ANSI__)
-     add_link_flags(
-       "-compatibility_version 1"
-       "-current_version 1"
--      "-install_name /usr/lib/libc++.1.dylib"
--      "-Wl,-reexport_library,/usr/lib/libc++abi.dylib"
-+      "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
-+      "-Wl,-reexport_library,${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
-       "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
-       "/usr/lib/libSystem.B.dylib")
-   else()
-     if ( ${CMAKE_OSX_SYSROOT} )
-       list(FIND ${CMAKE_OSX_ARCHITECTURES} "armv7" OSX_HAS_ARMV7)
-       if (OSX_HAS_ARMV7)
-         set(OSX_RE_EXPORT_LINE
--          "${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib"
-+          "${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib"
-           "-Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++sjlj-abi.exp")
-       else()
-         set(OSX_RE_EXPORT_LINE
--          "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}/usr/lib/libc++abi.dylib")
-+          "-Wl,-reexport_library,${CMAKE_OSX_SYSROOT}${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib")
-       endif()
-     else()
--      set(OSX_RE_EXPORT_LINE "/usr/lib/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
-+      set(OSX_RE_EXPORT_LINE "${LIBCXX_LIBCXXABI_LIB_PATH}/libc++abi.dylib -Wl,-reexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++abi${LIBCXX_LIBCPPABI_VERSION}.exp")
-     endif()
- 
-     add_link_flags(
-       "-compatibility_version 1"
--      "-install_name /usr/lib/libc++.1.dylib"
-+      "-install_name ${LIBCXX_LIBCXXABI_LIB_PATH}/libc++.1.dylib"
-       "-Wl,-unexported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/libc++unexp.exp"
-       "${OSX_RE_EXPORT_LINE}"
-       "-Wl,-force_symbols_not_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/notweak.exp"
-       "-Wl,-force_symbols_weak_list,${CMAKE_CURRENT_SOURCE_DIR}/weak.exp")
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4.0/libc++/default.nix
index 76ca05333231..9f950e601b21 100644
--- a/pkgs/development/compilers/llvm/4.0/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4.0/libc++/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
     cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")
   '';
 
-  patches = lib.optional stdenv.isDarwin ./darwin.patch;
+  patchPhase = ''
+		substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
+  '';
 
   buildInputs = [ cmake llvm libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 

From a5aedafbd9819880aa27c455345cfa7c26a68424 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 Feb 2017 14:33:47 -0600
Subject: [PATCH 0796/3449] llvm-4.0: Distinguish release version, fix naming
 to clarify rc2.

---
 .../development/compilers/llvm/4.0/clang/default.nix |  4 ++--
 pkgs/development/compilers/llvm/4.0/default.nix      | 12 ++++++------
 pkgs/development/compilers/llvm/4.0/llvm.nix         |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4.0/clang/default.nix
index d482f91cb83a..f566cd6d21c2 100644
--- a/pkgs/development/compilers/llvm/4.0/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4.0/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -33,7 +33,7 @@ let
     # 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 ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp
     '';
 
diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4.0/default.nix
index a239825533eb..f407b2cdc9f5 100644
--- a/pkgs/development/compilers/llvm/4.0/default.nix
+++ b/pkgs/development/compilers/llvm/4.0/default.nix
@@ -1,15 +1,15 @@
 { newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
 let
-  callPackage = newScope (self // { inherit stdenv isl version fetch; });
+  callPackage = newScope (self // { inherit stdenv isl release_version version fetch; });
 
-  version = "4.0.0";
+  release_version = "4.0.0";
   rc = "rc2";
+  version = "${release_version}${rc}";
 
-  fetch = fetch_v version;
-  fetch_v = ver: name: sha256: fetchurl {
-    url = "http://llvm.org/pre-releases/${version}/${rc}/${name}-${version}${rc}.src.tar.xz";
+  fetch = name: sha256: fetchurl {
+    url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz";
     # Once 4.0 is released, use this instead:
-    # url = "http://llvm.org/releases/${version}/${name}-${ver}.src.tar.xz";
+    # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4.0/llvm.nix
index 0139f40791cc..d54390e5ee8d 100644
--- a/pkgs/development/compilers/llvm/4.0/llvm.nix
+++ b/pkgs/development/compilers/llvm/4.0/llvm.nix
@@ -11,6 +11,7 @@
 , valgrind
 , ncurses
 , version
+, release_version
 , zlib
 , compiler-rt_src
 , libcxxabi
@@ -25,7 +26,7 @@ let
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
-    concatStringsSep "." (take 2 (splitString "." version));
+    concatStringsSep "." (take 2 (splitString "." release_version));
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
@@ -99,7 +100,7 @@ in stdenv.mkDerivation rec {
     install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib
     install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
-    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib
+    ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
   '';
 
   enableParallelBuilding = true;

From 7ea342708afd4dc4a48064d1b6067b8584d326e8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 Feb 2017 12:11:48 -0600
Subject: [PATCH 0797/3449] lldb-4.0rc2: Try to fix but ultimately disable on
 Darwin.

Currently it's failing due to needing Foundation.h,
but LLDB on Nix-Darwin is a bit sketchy anyway
due to code-signing requirements.
---
 pkgs/development/compilers/llvm/4.0/lldb.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4.0/lldb.nix
index 7bca695fafc1..f37e6fdfafc2 100644
--- a/pkgs/development/compilers/llvm/4.0/lldb.nix
+++ b/pkgs/development/compilers/llvm/4.0/lldb.nix
@@ -6,10 +6,12 @@
 , swig
 , which
 , libedit
+, libxml2
 , llvm
 , clang-unwrapped
 , python
 , version
+, darwin
 }:
 
 stdenv.mkDerivation {
@@ -27,21 +29,22 @@ stdenv.mkDerivation {
       cmake/modules/LLDBStandalone.cmake
   '';
 
-  buildInputs = [ cmake python which swig ncurses zlib libedit llvm ];
+  buildInputs = [ cmake python which swig ncurses zlib libedit libxml2 llvm ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ];
 
   CXXFLAGS = "-fno-rtti";
   hardeningDisable = [ "format" ];
 
   cmakeFlags = [
-    "-DLLDB_DISABLE_LIBEDIT=1" 
+    "-DLLDB_DISABLE_LIBEDIT=ON"
   ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A next-generation high-performance debugger";
     homepage    = http://llvm.org/;
-    license     = stdenv.lib.licenses.ncsa;
-    platforms   = stdenv.lib.platforms.all;
+    license     = licenses.ncsa;
+    platforms   = platforms.allBut platforms.darwin;
   };
 }

From ac8fabd0e08507e857600641ce4163c2c8cc0ff6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Feb 2017 19:07:57 +0300
Subject: [PATCH 0798/3449] phpPackages: also default to 7.1

---
 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 0bfb6d92a8e8..0c8b4868fe79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5806,8 +5806,7 @@ with pkgs;
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
 
   php = php71;
-
-  phpPackages = php70Packages;
+  phpPackages = php71Packages;
 
   php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php56;

From f0f75433fba293ab826bac2271f53dedca92ffcd Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Mon, 20 Feb 2017 19:31:36 +0200
Subject: [PATCH 0799/3449] pythonPackages.evdev: 0.4.7 -> 0.6.4

pythonPackages.evdev did not work due to
https://github.com/gvalkov/python-evdev/issues/43.
---
 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 1a7a5e6ae5a0..32dc5a18347b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6686,18 +6686,18 @@ in {
   };
 
   evdev = buildPythonPackage rec {
-    version = "0.4.7";
+    version = "0.6.4";
     name = "evdev-${version}";
     disabled = isPy34;  # see http://bugs.python.org/issue21121
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/e/evdev/${name}.tar.gz";
-      sha256 = "1mz8cfncpxc1wbk2nj7apl0ssqc0vfndysxchq3wabd9vzx5p71k";
+      sha256 = "1wkag91s8j0f45jx5n619z354n8pz8in9krn81hp7hlkhi6p8s2j";
     };
 
     buildInputs = with self; [ pkgs.linuxHeaders ];
 
-    patchPhase = "sed -e 's#/usr/include/linux/input.h#${pkgs.linuxHeaders}/include/linux/input.h#' -i setup.py";
+    patchPhase = "sed -e 's#/usr/include/linux/#${pkgs.linuxHeaders}/include/linux/#g' -i setup.py";
 
     doCheck = false;
 

From 0ff2179e0ffc5aded75168cb5a13ca1821bdcd24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:07:35 +0100
Subject: [PATCH 0800/3449] gnutls: use 3.5 and remove 3.4

3.4 branch detects support for getrandom() call during configure-time,
which gets picked up since glibc-2.25, and consequently it will fail
with older kernels during rutime.
---
 pkgs/development/libraries/gnutls/3.4.nix | 10 ----------
 pkgs/top-level/all-packages.nix           |  6 +-----
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 pkgs/development/libraries/gnutls/3.4.nix

diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
deleted file mode 100644
index 0cb2c67c501b..000000000000
--- a/pkgs/development/libraries/gnutls/3.4.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "3.4.17";
-
-  src = fetchurl {
-    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz";
-    sha256 = "0bhp8cqrmw15yins65cn0zwbcpj1vmymr4wnbm151sfmf2kfhl4v";
-  };
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f135d5edaf76..0cc77de90d4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7506,11 +7506,7 @@ with pkgs;
 
   gnu-efi = callPackage ../development/libraries/gnu-efi { };
 
-  gnutls = gnutls34;
-
-  gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
-    guileBindings = config.gnutls.guile or false;
-  };
+  gnutls = gnutls35;
 
   gnutls35 = callPackage ../development/libraries/gnutls/3.5.nix {
     guileBindings = config.gnutls.guile or false;

From b634622be0a78fd62f2631ee63e1a73d965f3527 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Feb 2017 20:09:53 +0000
Subject: [PATCH 0801/3449] compcert: 2.7.1 -> 3.0.1

---
 pkgs/development/compilers/compcert/default.nix | 14 +++++++-------
 pkgs/top-level/all-packages.nix                 |  9 ++++++++-
 pkgs/top-level/ocaml-packages.nix               |  8 --------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 20d4a430ac4b..8086a9f97495 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,25 +1,25 @@
 { stdenv, lib, fetchurl
-, coq, ocaml, findlib, menhir
+, coq, ocamlPackages
 , tools ? stdenv.cc
 }:
 
-assert lib.versionAtLeast ocaml.version "4.02";
+assert lib.versionAtLeast ocamlPackages.ocaml.version "4.02";
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "2.7.1";
+  version = "3.0.1";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4";
+    sha256 = "0dgrj26dzdy4n3s9b5hwc6lm54vans1v4qx9hdp1q8w1qqcdriq9";
   };
 
-  buildInputs = [ coq ocaml findlib menhir ];
+  buildInputs = [ coq ]
+  ++ (with ocamlPackages; [ ocaml findlib menhir ]);
 
   enableParallelBuilding = true;
 
   configurePhase = ''
-    substituteInPlace ./configure --replace pl2 pl3
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
     ./configure -clightgen -prefix $out -toolprefix ${tools}/bin/ '' +
     (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     mkdir -p $lib/share/doc/compcert
     mv doc/html $lib/share/doc/compcert/
     mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
-    mv backend cfrontend common cparser driver flocq ia32 lib \
+    mv backend cfrontend common cparser driver flocq x86 x86_32 lib \
       $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0c8b4868fe79..722b9b9d9d8f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4766,7 +4766,14 @@ with pkgs;
 
   cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
 
-  inherit (ocaml-ng.ocamlPackages_4_02) compcert;
+  compcert = callPackage ../development/compilers/compcert ((
+    if system == "x86_64-linux"
+    then { tools = pkgsi686Linux.stdenv.cc; }
+    else {}
+  ) // {
+    coq = coq_8_6;
+  });
+
 
   # Users installing via `nix-env` will likely be using the REPL,
   # which has a hard dependency on Z3, so make sure it is available.
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bd902396ba1e..b980e0530201 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -671,14 +671,6 @@ let
 
     wyrd = callPackage ../tools/misc/wyrd { };
 
-    compcert = callPackage ../development/compilers/compcert ((
-      if system == "x86_64-linux"
-      then { tools = pkgs.pkgsi686Linux.stdenv.cc; }
-      else {}
-    ) // {
-      coq = pkgs.coq_8_5;
-    });
-
     haxe = callPackage ../development/compilers/haxe { };
 
     ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };

From 09d02f72f6dc9201fbfce631cb1155d295350176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:16:41 +0100
Subject: [PATCH 0802/3449] Re-revert "Merge: glibc: 2.24 -> 2.25"

This reverts commit 55cc7700e968001c9ac79190fbcf25ed3620680a.
I hope most problems have been solved.  /cc #22874.
---
 pkgs/development/libraries/fontconfig/default.nix | 10 ++++++++++
 pkgs/development/libraries/glibc/common.nix       |  6 +++---
 pkgs/development/libraries/glibc/default.nix      |  2 +-
 pkgs/tools/misc/findutils/default.nix             |  3 ++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 0130ee2a014b..14983b744df9 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -28,7 +28,17 @@ stdenv.mkDerivation rec {
       src = ./config-compat.patch;
       inherit configVersion;
     })
+    (fetchpatch {
+      name = "glibc-2.25.diff";
+      url = "https://cgit.freedesktop.org/fontconfig/patch/?id=1ab5258f7c";
+      sha256 = "0x2a4qx51j3gqcp1kp4lisdzmhrkw1zw0r851d82ksgjlc0vkbaz";
+    })
   ];
+  # additionally required for the glibc-2.25 patch; avoid requiring gperf
+  postPatch = ''
+    sed s/CHAR_WIDTH/CHARWIDTH/g -i src/fcobjshash.{h,gperf}
+    touch src/*
+  '';
 
   outputs = [ "bin" "dev" "lib" "out" ]; # $out contains all the config
 
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 32c1b3647372..7128f5606193 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -10,8 +10,8 @@ cross:
 , preConfigure ? "", ... }@args:
 
 let
-  version = "2.24";
-  sha256 = "1ghzp41ryvsqxn4rhrm8r25wc33m2jf8zrcc1pj3jxyk8ad9a0by";
+  version = "2.25";
+  sha256 = "067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0";
 in
 
 assert cross != null -> gccCross != null;
@@ -138,7 +138,7 @@ stdenv.mkDerivation ({
     lib.optionalString (cross != null) "-${cross.config}";
 
   src = fetchurl {
-    url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
+    url = "mirror://gnu/glibc/glibc-${version}.tar.xz";
     inherit sha256;
   };
 
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index d6c496819da5..a46f97e0e051 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -81,7 +81,7 @@ in
       # to bootstrap-tools; on cross-arm this stripping would break objects.
       if [ -z "$crossConfig" ]; then
         for i in "$out"/lib/*.a; do
-            strip -S "$i"
+            [ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
         done
       fi
 
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 086c72bdbb22..8bedbeb12fef 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
 
-  doCheck = !stdenv.isDarwin;
+  # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
+  doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux");
 
   outputs = [ "out" "info" ];
 

From 292efffb6285cb55cfbbc1b22a54c40b8e63eada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 17 Feb 2017 14:57:41 +0100
Subject: [PATCH 0803/3449] libuv: 1.10.1 -> 1.11.0

And a nitpick in the expression.
---
 pkgs/development/libraries/libuv/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 2b062f58b248..2a1c82ec639a 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.10.1";
+  version = "1.11.0";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "0gna53fgsjjs38kv1g20xfaalv0fk3xncb6abga3saswrv283hx0";
+    sha256 = "02sm7f3l0shpfz25b77q2jjvlypc1mmz4zpzfgfmiplhgxxaa6la";
   };
 
   postPatch = let
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
       sed '/${tdRegexp}/d' -i test/test-list.h
     '';
 
-  buildInputs = [ automake autoconf libtool pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
 
   preConfigure = ''
     LIBTOOLIZE=libtoolize ./autogen.sh

From 1daf49ccf4117c2de3810f4257cfc8571ab206d5 Mon Sep 17 00:00:00 2001
From: "Rafael de F. Ferreira" <rafael@rafaelferreira.net>
Date: Mon, 20 Feb 2017 14:37:01 -0300
Subject: [PATCH 0804/3449] idea-community: 2016.3.3 -> 2016.3.4

---
 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 2ed8e505d46e..ef5022f58b3f 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.3";
+    version = "2016.3.4";
     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 = "1v9rzfj84fyz3m3b6bh45jns8wcil9n8f8mfha0x8m8534r6w368";
+      sha256 = "712dccd726b43e2187e8025a6effb711d35310b36d553dbf7bf85400ec1cec15";
     };
     wmClass = "jetbrains-idea-ce";
   };

From 5cf7b7c10954178217bd9cd6a6db00de0c5b8fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:29:52 +0100
Subject: [PATCH 0805/3449] cmake: 3.7.1 -> 3.7.2

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 31870fdaf209..9f607a60b596 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -13,7 +13,7 @@ with stdenv.lib;
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.7";
-  minorVersion = "1";
+  minorVersion = "2";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    # from https://cmake.org/files/v3.7/cmake-3.7.1-SHA-256.txt
-    sha256 = "449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1";
+    # from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
+    sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0";
   };
 
   prePatch = optionalString (!useSharedLibraries) ''

From 62c323bdffafacc0aebe5db158530816a8be7282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:30:12 +0100
Subject: [PATCH 0806/3449] gtk3: maintenance 3.22.7 -> 3.22.8

---
 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 bf63c9425ae7..d21fef3e6746 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 = "7";
+  ver_min = "8";
   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 = "a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432";
+    sha256 = "c7254a88df5c17e9609cee9e848c3d0104512707edad4c3b4f256b131f8d3af1";
   };
 
   outputs = [ "out" "dev" ];

From 4339dca980bfbaaf958d11ae8e3db6e21fc33fc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:31:41 +0100
Subject: [PATCH 0807/3449] gdk-pixbuf: maintenance 2.36.4 -> 2.36.5

---
 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 6ac8a134b1f5..af4bfc0709e1 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 = "4";
+  ver_min = "5";
 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 = "0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463";
+    sha256 = "7ace06170291a1f21771552768bace072ecdea9bd4a02f7658939b9a314c40fc";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From dbae14164b1748e6f5b67bcf43e0c64b48c37e8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:33:03 +0100
Subject: [PATCH 0808/3449] glib: maintenance 2.50.2 -> 2.50.3

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

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index c7c704c641f8..9eb71fc708f0 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -43,7 +43,7 @@ let
   '';
 
   ver_maj = "2.50";
-  ver_min = "2";
+  ver_min = "3";
 in
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5";
+    sha256 = "82ee94bf4c01459b6b00cb9db0545c2237921e3060c0b74cff13fbc020cfd999";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;

From 9458018a875402fe246efad2672a1a4c0ede074a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:38:24 +0100
Subject: [PATCH 0809/3449] dbus: 1.10.14 -> 1.10.16

It's for "security" issue that's considered unexploitable with a sane
config.
---
 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 7075874adf87..6f7a845b809f 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.14";
-  sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3";
+  version = "1.10.16";
+  sha256 = "121kqkjsd3vgf8vca8364xl44qa5086h7qy5zs5f1l78ldpbmc57";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";

From 007380362c5fe8b678a62f7e1ccca562a995e5d4 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Mon, 20 Feb 2017 14:36:53 +0100
Subject: [PATCH 0810/3449] riak: change filename to appropriate version

---
 pkgs/servers/nosql/riak/{2.1.1.nix => 2.2.0.nix} | 0
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/servers/nosql/riak/{2.1.1.nix => 2.2.0.nix} (100%)

diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.2.0.nix
similarity index 100%
rename from pkgs/servers/nosql/riak/2.1.1.nix
rename to pkgs/servers/nosql/riak/2.2.0.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 722b9b9d9d8f..89d7aa826c60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10576,7 +10576,7 @@ with pkgs;
 
   mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
 
-  riak = callPackage ../servers/nosql/riak/2.1.1.nix { };
+  riak = callPackage ../servers/nosql/riak/2.2.0.nix { };
 
   riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

From 3ba1875743c21d5fe184123a88015fdf916a22ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 21:53:03 +0100
Subject: [PATCH 0811/3449] mesa: maintenance 13.0.4 -> 13.0.5

I'm being conservative here until 17.0.1 is released.
---
 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 abca82e62979..08fb80c8435a 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -27,7 +27,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
 else
 
 let
-  version = "13.0.4";
+  version = "13.0.5";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -41,7 +41,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 = "a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726";
+    sha256 = "bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87";
   };
 
   prePatch = "patchShebangs .";

From c302cb49103d798bbb176eff20b2a33606d04d91 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 20 Feb 2017 21:41:55 +0100
Subject: [PATCH 0812/3449] gitlab: 8.16.4 -> 8.16.6

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

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 23100a85e7eb..60921fc54886 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -22,7 +22,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.16.4";
+  version = "8.16.6";
 
   buildInputs = [ env ruby bundler tzdata git nodejs procps ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "118p3c9i9r2acc0yv5jzw9p7hql5pbp37k54qzrfgrs8vjjxi14i";
+    sha256 = "03rzms2frwx4c09l2rig1amlxj965s2iq421i52j8wj2khb7pd7g";
   };
 
   patches = [

From ffcb272e01bd1abc595878e11378ef01a149137e Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Sun, 19 Feb 2017 12:47:04 -0800
Subject: [PATCH 0813/3449] antimicro: 2.22 -> 2.23

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

diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 4bba4858beb4..710641281e52 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "antimicro-${version}";
-  version = "2.22";
+  version = "2.23";
 
   src = fetchFromGitHub {
     owner = "AntiMicro";
     repo = "antimicro";
     rev = "${version}";
-    sha256 = "102fh9ysd2dmfc6b73bj88m064jhlglqrz2gd7k9jccadxpbp3mq";
+    sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v";
   };
 
   buildInputs = [

From d9ae88694695c21d599790c4fdebc3fa062ddaa1 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 17 Feb 2017 00:08:06 +0100
Subject: [PATCH 0814/3449] nixos.openntpd: don't spam systemd journal

Starting `ntpd` with the `-d` option spams the systemd journal.
Instead, let the server fork.
---
 nixos/modules/services/networking/openntpd.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index 13a1b5258ce0..4bb9da54fe09 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -11,6 +11,9 @@ let
     ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)}
     ${cfg.extraConfig}
   '';
+
+  pidFile = "/run/openntpd.pid";
+
 in
 {
   ###### interface
@@ -67,7 +70,11 @@ in
       wants = [ "network-online.target" "time-sync.target" ];
       before = [ "time-sync.target" ];
       after = [ "dnsmasq.service" "bind.service" "network-online.target" ];
-      serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile} ${cfg.extraOptions}";
+      serviceConfig = {
+        ExecStart = "${package}/sbin/ntpd -f ${cfgFile} -p ${pidFile} ${cfg.extraOptions}";
+        Type = "forking";
+        PIDFile = pidFile;
+      };
     };
   };
 }

From 1caecd759d7da996bbd6f939c9d190670e7e15f3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 20 Feb 2017 22:46:35 +0100
Subject: [PATCH 0815/3449] perl-Digest-CRC: 0.21 -> 0.22.2

---
 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 7d3e0df62e6a..4b58e8d20a73 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3928,10 +3928,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DigestCRC = buildPerlPackage rec {
-    name = "Digest-CRC-0.21";
+    name = "Digest-CRC-0.22.2";
     src = fetchurl {
       url = "mirror://cpan/authors/id/O/OL/OLIMAUL/${name}.tar.gz";
-      sha256 = "79a0ef8081767c324edb9da39f80835910ed7c5b0539ed106caf7f2467d1958f";
+      sha256 = "112b50f7fbc6f6baf5d4584ee97f542ced6c9ec03a3147f7902c84b8b26778cb";
     };
     meta = {
       description = "Module that calculates CRC sums of all sorts";

From a2dd4ea7d157a88687f2f7cb077ef1c094ba1d49 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sat, 18 Feb 2017 21:00:22 +0100
Subject: [PATCH 0816/3449] python-sql: init at 0.8

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

diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix
new file mode 100644
index 000000000000..30f734d57193
--- /dev/null
+++ b/pkgs/development/python-modules/python-sql/default.nix
@@ -0,0 +1,16 @@
+{ lib, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "python-sql-${version}";
+  version = "0.8";
+  src = fetchurl {
+    url = "mirror://pypi/p/python-sql/${name}.tar.gz";
+    sha256 = "0xik939sxqfqqbpgcsnfjnws692bjip32khgwhq1ycphfy7df3h2";
+  };
+  meta = {
+    homepage = http://python-sql.tryton.org/;
+    description = "A library to write SQL queries in a pythonic way";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 335d7e9c62d3..b8dd178bfa56 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -332,6 +332,8 @@ in {
 
   pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
 
+  python-sql = callPackage ../development/python-modules/python-sql { };
+
   pytimeparse = buildPythonPackage rec {
     pname = "pytimeparse";
     version = "1.1.6";

From 79cba3d3fffc141a44489b8114fc292142b67a7b Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sat, 18 Feb 2017 21:04:52 +0100
Subject: [PATCH 0817/3449] relatorio: init at 0.6.4

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

diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
new file mode 100644
index 000000000000..4f2c3da8936e
--- /dev/null
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchurl, buildPythonPackage, genshi, lxml }:
+
+buildPythonPackage rec {
+  name = "relatorio-${version}";
+  version = "0.6.4";
+  src = fetchurl {
+    url = "mirror://pypi/r/relatorio/${name}.tar.gz";
+    sha256 = "0lincq79mzgazwd9gh41dybjh9c3n87r83pl8nk3j79aihyfk84z";
+  };
+  propagatedBuildInputs = [
+    genshi
+    lxml
+  ];
+  meta = {
+    homepage = http://relatorio.tryton.org/;
+    description = "A templating library able to output odt and pdf files";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8dd178bfa56..d06eb1f2a3a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -356,6 +356,8 @@ in {
 
   pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}";
 
+  relatorio = callPackage ../development/python-modules/relatorio { };
+
   rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}";
 
   sip = callPackage ../development/python-modules/sip { };

From 6f8a44820e04c0635c258e7575b5d511fece6a59 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sat, 18 Feb 2017 16:27:25 +0100
Subject: [PATCH 0818/3449] trytond: init at 4.2.1

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

diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
new file mode 100644
index 000000000000..e77287faae25
--- /dev/null
+++ b/pkgs/applications/office/trytond/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, python2Packages
+, withPostgresql ? true }:
+
+with stdenv.lib;
+
+python2Packages.buildPythonApplication rec {
+  name = "trytond-${version}";
+  version = "4.2.1";
+  src = fetchurl {
+    url = "mirror://pypi/t/trytond/${name}.tar.gz";
+    sha256 = "1ijjpbsf3s0s7ksbi7xgzss4jgr14q5hqsyf6d68l8hwardrwpj7";
+  };
+
+  # Tells the tests which database to use
+  DB_NAME = ":memory:";
+
+  buildInputs = with python2Packages; [
+    mock
+  ];
+  propagatedBuildInputs = with python2Packages; ([
+    dateutil
+    lxml
+    polib
+    python-sql
+    relatorio
+    werkzeug
+    wrapt
+
+    # extra dependencies
+    bcrypt
+    pydot
+    python-Levenshtein
+    simplejson
+  ] ++ stdenv.lib.optional withPostgresql psycopg2);
+  meta = {
+    description = "The server of the Tryton application platform";
+    longDescription = ''
+      The server for Tryton, a three-tier high-level general purpose
+      application platform under the license GPL-3 written in Python and using
+      PostgreSQL as database engine.
+
+      It is the core base of a complete business solution providing
+      modularity, scalability and security.
+    '';
+    homepage = http://www.tryton.org/;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.johbo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 171ce7a24646..04e7632f8986 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4121,6 +4121,8 @@ with pkgs;
 
   tryton = callPackage ../applications/office/tryton { };
 
+  trytond = callPackage ../applications/office/trytond { };
+
   omapd = callPackage ../tools/security/omapd { };
 
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };

From b17eb34203b891cd801d5d9394d2b3cfa15c786f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 23:17:10 +0100
Subject: [PATCH 0819/3449] gnutls: don't propagate -lunistring

This fixes systemd build.  Also put it into the generic expression,
as there's only one version in nixpkgs ATM.
---
 pkgs/development/libraries/gnutls/3.5.nix     | 2 --
 pkgs/development/libraries/gnutls/generic.nix | 7 +++++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index a5076b9d4985..8bb1a2d97f76 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -7,6 +7,4 @@ callPackage ./generic.nix (args // rec {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
     sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2";
   };
-
-  buildInputs = [ libunistring ];
 })
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 74737eb23893..42bc5d3da662 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,6 +1,6 @@
 { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
-, tpmSupport ? false, trousers, nettools, bash
+, tpmSupport ? false, trousers, nettools, libunistring
 
 # Version dependent args
 , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen ]
+  buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ]
     ++ lib.optional doCheck nettools
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
@@ -58,6 +58,9 @@ stdenv.mkDerivation {
         -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \
         -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \
         -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc"
+    # It seems only useful for static linking but basically noone does that.
+    substituteInPlace "$out/lib/libgnutls.la" \
+      --replace "-lunistring" ""
   '';
 
   meta = with lib; {

From b87be6e8ec10b794ffe038d34985544c8a87027b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 20 Feb 2017 23:55:08 +0100
Subject: [PATCH 0820/3449] stix-two: init at 2.0.0

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

diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix
new file mode 100644
index 000000000000..d4ec083a0708
--- /dev/null
+++ b/pkgs/data/fonts/stix-two/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "stix-two-${version}";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/stixfonts/Current%20Release/STIXv${version}.zip";
+    sha256 = "0f6rcg0p2dhnks523nywgkjk56bjajz3gnwsrap932674xxjkb3g";
+  };
+
+  buildInputs = [ unzip ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp -v "Fonts/OTF/"*.otf $out/share/fonts/opentype
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.stixfonts.org/;
+    description = "Fonts for Scientific and Technical Information eXchange";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = [ maintainers.rycee ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d7aa826c60..aec433ae54f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12335,6 +12335,8 @@ with pkgs;
 
   stix-otf = callPackage ../data/fonts/stix-otf { };
 
+  stix-two = callPackage ../data/fonts/stix-two { };
+
   inherit (callPackages ../data/fonts/gdouros { })
     symbola aegyptus akkadian anatolian maya unidings musica analecta;
 

From e688bbbee427c8320272e2b81eb710b35ddf7b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Feb 2017 23:37:53 +0100
Subject: [PATCH 0821/3449] libunistring: split into multiple outputs

Saves ~1 MB.  Through default gnutls, many closures are affected.
Reverse deps seem to build OK.
---
 pkgs/development/libraries/libunistring/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 95946cb8284b..662767b6678f 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];
 
+  outputs = [ "out" "dev" "info" "doc" ];
+
   propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
 
   configureFlags = [

From 10d48574eb7a501db9b6eab0f726db1c07c8e971 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 Feb 2017 00:46:32 +0100
Subject: [PATCH 0822/3449] xorg-server: use 1.18 branch on Darwin for now

Fixes #23027.  I'm no good in truly fixing it on Darwin,
leaving to others.
---
 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 aec433ae54f1..51f184336a7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10869,7 +10869,8 @@ with pkgs;
     python = python2; # Incompatible with Python 3x
     udev = if stdenv.isLinux then udev else null;
     libdrm = if stdenv.isLinux then libdrm else null;
-    abiCompat = config.xorg.abiCompat or null; # `config` because we have no `xorg.override`
+    abiCompat = config.xorg.abiCompat # `config` because we have no `xorg.override`
+      or (if stdenv.isDarwin then "1.18" else null); # 1.19 needs fixing on Darwin
   } // { inherit xlibsWrapper; } );
 
   xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };

From c5d211df4cb17379e9eb36d56219725093b2061d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 20 Feb 2017 16:39:40 -0500
Subject: [PATCH 0823/3449] elpa-packages: 2017-02-20

---
 .../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 a11518735d7d..53b7d04d2e9b 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -484,10 +484,10 @@
     debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }:
     elpaBuild {
         pname = "debbugs";
-        version = "0.12";
+        version = "0.14";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/debbugs-0.12.tar";
-          sha256 = "1swi4d7fhahimid9j12cypmkz7dlqgffrnhfxy5ra44y3j2b35ph";
+          url = "https://elpa.gnu.org/packages/debbugs-0.14.tar";
+          sha256 = "07wgcvg038l88gxvjr0gjpjhyk743w22x1rqghz3gkmif0g70say";
         };
         packageRequires = [ cl-lib soap-client ];
         meta = {
@@ -822,10 +822,10 @@
     gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }:
     elpaBuild {
         pname = "gnugo";
-        version = "3.0.2";
+        version = "3.1.0";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnugo-3.0.2.tar";
-          sha256 = "12xm960awsn2k8ph1yibhrxdg8iz1icifdqimysg3qxljmhmnb3k";
+          url = "https://elpa.gnu.org/packages/gnugo-3.1.0.tar";
+          sha256 = "0xpjvs250gg71qwapdsb1hlc61gs0gpkjds01srf784fvyxx2gf1";
         };
         packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
         meta = {
@@ -2101,10 +2101,10 @@
       }) {};
     xpm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "xpm";
-        version = "1.0.3";
+        version = "1.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xpm-1.0.3.tar";
-          sha256 = "0qckb93xwzcg8iwiv4bd08r60jn0n853czmilz0hyyb1lfi82lp4";
+          url = "https://elpa.gnu.org/packages/xpm-1.0.4.tar";
+          sha256 = "075miyashh9cm3b0gk6ngld3rm8bfgnh4qxnhxmmvjgzf6a64grh";
         };
         packageRequires = [];
         meta = {

From 602fbdbf48e2f477108549007b801523d55ff6dd Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 20 Feb 2017 20:14:58 -0500
Subject: [PATCH 0824/3449] melpa-stable-packages: 2017-02-20

Removals:
 - malabar-mode: removed from melpa
---
 .../emacs-modes/melpa-stable-generated.nix    | 220 +++++++++++-------
 1 file changed, 131 insertions(+), 89 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 88b3f04cb5a3..99ac15d14f90 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1124,12 +1124,12 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "0.1.6";
+        version = "0.1.7";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "3f473150009f86dac68edb02e2f22850788289a5";
-          sha256 = "16c2q6c44qc3bdaxq835rrbyq49z6rd3h6cgss50p4gqwfwxfxn7";
+          rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059";
+          sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -5178,7 +5178,7 @@
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
-        version = "0.3";
+        version = "0.3.20";
         src = fetchFromGitHub {
           owner = "nivekuil";
           repo = "corral";
@@ -6992,8 +6992,8 @@
         version = "0.7";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "9ae0c786e1e7";
-          sha256 = "1a498jkj15vhf2x4an6raghjf9fszrkw0zl617m8pibcn3yrnv62";
+          rev = "c4f10d72febc";
+          sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -7048,22 +7048,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
     melpaBuild {
         pname = "e2wm";
-        version = "1.3";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-window-manager";
-          rev = "397cb6c110c9337cfc1a25ea7fddad00f168613c";
-          sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
+          rev = "4353d3394c77a49f8f0291c239858c8c5e877549";
+          sha256 = "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8da85815c39f58552a968ae68ee07c08c53b0f61/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
-        packageRequires = [];
+        packageRequires = [ window-layout ];
         meta = {
           homepage = "https://melpa.org/#/e2wm";
           license = lib.licenses.free;
@@ -9781,14 +9781,14 @@
         pname = "evil-magit";
         version = "0.4.1";
         src = fetchFromGitHub {
-          owner = "justbur";
+          owner = "emacs-evil";
           repo = "evil-magit";
           rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62";
           sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit";
-          sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
+          sha256 = "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980";
           name = "evil-magit";
         };
         packageRequires = [ evil magit ];
@@ -11022,6 +11022,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-checkpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-checkpatch";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "zpp0";
+          repo = "flycheck-checkpatch";
+          rev = "aca98ea79f8b26a95f9dbdd4142b01fdd2def866";
+          sha256 = "0bs36dp1jy2z9zfq4mnrin9ik0ffl7023h6dx3qbfya1gcxs07py";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/193aaae5640434559cd479df1463ee44eab14d86/recipes/flycheck-checkpatch";
+          sha256 = "1apjn26n663rjddv5iagfs65fdf22049ykmzggybbnprvnmasf55";
+          name = "flycheck-checkpatch";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-checkpatch";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clojure";
@@ -11442,6 +11463,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-title";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "flycheck-title";
+          rev = "2b7a11c39420e517a07d0c95126455c1617f2c61";
+          sha256 = "07p3bwf4mvsdxvqwl9zd35rm6ax6ywqiy8gsh1ag3ygqbmd94cwy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title";
+          sha256 = "1cxid9qmzy8pl8qkvr6kgvfqm05pjw8cxpz66x619hbkw2vr7sza";
+          name = "flycheck-title";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-title";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
@@ -12879,12 +12921,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "2.10.1";
+        version = "2.10.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "acba806a823977108bae60438466da71f773a7c8";
-          sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
+          rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
+          sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -13803,12 +13845,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "1.1.6";
+        version = "1.1.8";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "ba781db5c0e6e8e5d20bdc0f623f6b187daf0d9f";
-          sha256 = "1lgljlfxs3gwxr072bvpl55r0b4z78wiww2g093sy7dgxgzgzmq6";
+          rev = "d9b00bd93ab3fed0e7fff99b0dc8773584f5207d";
+          sha256 = "0vrz97w9yzkxl8pc9jmxkxvj5nagpnzqq9pvavwmvlh68wrh58gi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -15782,22 +15824,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm-projectile, lib, melpaBuild, perspeen }:
+    helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }:
     melpaBuild {
         pname = "helm-perspeen";
-        version = "0.1.0";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "jimo1001";
           repo = "helm-perspeen";
-          rev = "28c91e4e8a43921457f047a548366dd799c07f69";
-          sha256 = "1zn7k0v734d9qcp79p3ajz6kr4hdxqiwi82i2rplg7y4ylikq0jq";
+          rev = "aec145d5196aed1689563d138a2aa37b139e1759";
+          sha256 = "1wv13mvm9149nl9p93znl3d2yfnq4rph440ja07w804cd61qjhq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
           sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y";
           name = "helm-perspeen";
         };
-        packageRequires = [ helm-projectile perspeen ];
+        packageRequires = [ helm perspeen ];
         meta = {
           homepage = "https://melpa.org/#/helm-perspeen";
           license = lib.licenses.free;
@@ -17381,12 +17423,12 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "0.5";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "a68d596b437ce1c125d8bd5414467ca1ff55bdcc";
-          sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
+          rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f";
+          sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -17989,12 +18031,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "0.1.4";
+        version = "0.1.5";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "f5bee7c5368d55be4ebca30610b73c33978830cf";
-          sha256 = "0lcydjg8kyxdv5bbly0jf4d5wl4z7s63i536gvnlz0wfgj5swp5v";
+          rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af";
+          sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -18094,12 +18136,12 @@
     ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
     melpaBuild {
         pname = "ivy-youtube";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e";
-          sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b";
+          rev = "32f609f1d1a3718739be5797e020d6266d8340d2";
+          sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
@@ -19968,12 +20010,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "2.10.1";
+        version = "2.10.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "acba806a823977108bae60438466da71f773a7c8";
-          sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
+          rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
+          sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -20122,12 +20164,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "2.10.1";
+        version = "2.10.2";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "acba806a823977108bae60438466da71f773a7c8";
-          sha256 = "1b1z700ngd2mchaw7w3h4bmywg5inrcsl2b0r8lcrz2di1hkxk6n";
+          rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
+          sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -20287,27 +20329,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    malabar-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
-    melpaBuild {
-        pname = "malabar-mode";
-        version = "20140303.946";
-        src = fetchFromGitHub {
-          owner = "m0smith";
-          repo = "malabar-mode";
-          rev = "4c5fde559f518509763a55040fdb0e4b6b04856a";
-          sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/29bbefd1e3cc5726584c89244fb5d8ecd18200c3/recipes/malabar-mode";
-          sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
-          name = "malabar-mode";
-        };
-        packageRequires = [ fringe-helper ];
-        meta = {
-          homepage = "https://melpa.org/#/malabar-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
@@ -20738,12 +20759,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.6.0";
+        version = "0.6.2";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "9f73f1b0656a6a2ea55bbacf7659ffd3b35cdd9d";
-          sha256 = "0hnhzkkggv035x0qkxmw64migq6v6jpg8m6ayfc95avimyf1j67r";
+          rev = "bcbd1701745c2dc0b161fdf428f3db3887dfa48a";
+          sha256 = "1zs9b8ijwj7b61m3az4k5ch89siz4hy74adz9k4amaab9s6chzcf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22476,12 +22497,12 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "0.0.5";
+        version = "0.1.0";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "47a7b367314f6051715882e46a0e40477bda20a2";
-          sha256 = "1y5izm9yxa556536mnpc8dp0nzm8wzr778qycpk4l9xfyp4xybaw";
+          rev = "9155a413e41d918042e9839399e3940aa0f8499c";
+          sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -22795,8 +22816,8 @@
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165";
-          sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb";
+          rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367";
+          sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -23342,22 +23363,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "0.0.5";
+        version = "0.0.6";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8";
-          sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn";
+          rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
+          sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
           sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
           name = "org-mime";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/org-mime";
           license = lib.licenses.free;
@@ -26861,12 +26882,12 @@
     railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "railscasts-reloaded-theme";
-        version = "1.4.0";
+        version = "1.5.0";
         src = fetchFromGitHub {
           owner = "thegeorgeous";
           repo = "railscasts-reloaded-theme";
-          rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f";
-          sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk";
+          rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2";
+          sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -28476,12 +28497,12 @@
     selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selectric-mode";
-        version = "1.4";
+        version = "1.4.1";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "selectric-mode";
-          rev = "e60703d9a6c9944270d77bc829dae3a8b092346f";
-          sha256 = "04i5rrn93hzcf8zzfli2ams927lm83hl4q6w2azcg24lhldaqf8p";
+          rev = "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e";
+          sha256 = "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
@@ -31202,12 +31223,12 @@
     tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "tern";
-        version = "0.20.0";
+        version = "0.21.0";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "459b6705bada72027fbb922f4097b4dcf0ab305d";
-          sha256 = "1b95sw2fmnyfsw6c25a2nhkxcwqypgpnnw7yn1wfry6i81p8j8kg";
+          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
+          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -31223,12 +31244,12 @@
     tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
     melpaBuild {
         pname = "tern-auto-complete";
-        version = "0.20.0";
+        version = "0.21.0";
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "459b6705bada72027fbb922f4097b4dcf0ab305d";
-          sha256 = "1b95sw2fmnyfsw6c25a2nhkxcwqypgpnnw7yn1wfry6i81p8j8kg";
+          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
+          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -33181,12 +33202,12 @@
     window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "window-layout";
-        version = "1.3";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-window-layout";
-          rev = "9caf5be4ff1b5d1e141783d7133dab7a46424fef";
-          sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
+          rev = "cd2e4f967b610c2bbef53182829e47250d027056";
+          sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b17efdf8b7306eadf37e331fc1d585b42f37b09/recipes/window-layout";
@@ -33870,6 +33891,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yankpad";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "Kungsgeten";
+          repo = "yankpad";
+          rev = "d2ea6920a2444f1ce6f53947640446b8e16f84b7";
+          sha256 = "1lw2d25rwszk35bi3gm3bg0cb30b8c2bf3p32b89shnsmwylw52m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
+          sha256 = "1w5r9zk33cjgsmk45znfg32ym06nyqj5q3knr59jmn1fafx7a3z4";
+          name = "yankpad";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/yankpad";
+          license = lib.licenses.free;
+        };
+      }) {};
     yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yascroll";

From e2487c26b465b00187aa8528b9c60b2f5aa58a6f Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 20 Feb 2017 20:17:57 -0500
Subject: [PATCH 0825/3449] melpa-packages: 2017-02-20

Removals:
 - malabar-mode: removed from melpa
---
 .../editors/emacs-modes/melpa-generated.nix   | 1206 ++++++++++-------
 1 file changed, 687 insertions(+), 519 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index f47cdb989b56..f9aef05a4d7c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -737,8 +737,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "436567c1e28cce979aab7820a8fc74b5b5294218";
-          sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -758,8 +758,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "436567c1e28cce979aab7820a8fc74b5b5294218";
-          sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -1069,12 +1069,12 @@
     ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-window";
-        version = "20161018.1624";
+        version = "20170219.256";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-window";
-          rev = "de873d17f0ac33d49b769b302f94a71ccddd4502";
-          sha256 = "1jyrycbgrl3m5ab1k9r5w4p2pvmiqf6cgpwqdbxz8wdgfpzjk9ki";
+          rev = "d92320e74089cb346e172c63b02cce48a0d8cca7";
+          sha256 = "06sidq00xaw0n0gfh7akzyxfr65ma5h299yk347f1q916bqqxna5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window";
@@ -1549,12 +1549,12 @@
     all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "all-the-icons";
-        version = "20170208.433";
+        version = "20170217.103";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "51079bb7f25d5c3d30517023e2bf13b28aa6d2c0";
-          sha256 = "0jpnv9j1f6q459kzgvn2k0qh2li9qb9116c39qaxid8j1r1jp6lg";
+          rev = "c39a6184c665e5ee3e53ed22beab6c4b6e8be2ce";
+          sha256 = "17s35dj95nprac081v34bvj7mipnydj4blvjcymsn698aa21vgxm";
         };
         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 = "20161121.1137";
+        version = "20170214.556";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "a6b80a4fbb4e6ce3bc6a51a6e9f0982ea219b16b";
-          sha256 = "06rgwx03x84r4i5z07sia09nsb76a3cb7zxkravx78h7anlw16xw";
+          rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059";
+          sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1959,8 +1959,8 @@
         src = fetchFromGitHub {
           owner = "zellio";
           repo = "ansible-vault-mode";
-          rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df";
-          sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb";
+          rev = "71d1df3b1c2d1569b6c3091a9d54baf2ebc7019d";
+          sha256 = "0l5rsxbr9k5nq86v7vyv2l0inczfmcyfp95van84dk5fa1kpm3kc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault";
@@ -2273,8 +2273,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "52b8c8dac2f56979a14504e3c97f00ad275f9345";
-          sha256 = "1z0ylrl4scm0faapq9xhl4r20ljr4bl489ggyxi1v3rbksw1lp0q";
+          rev = "4e7e13bedb3900ff8f8843bd3111c17a9381ce7b";
+          sha256 = "0brk9218racdkbmqdqslmpwiynch89c9j0lk0w5xix9s03gqsg6q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2759,12 +2759,12 @@
     async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "async";
-        version = "20161103.1036";
+        version = "20170219.942";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "emacs-async";
-          rev = "54977d6c596a295f7519a0da36407c3a3e055b36";
-          sha256 = "1kzah2714nppaai8cckvbryq6b10fwp025fv3kzjspf3sjf5ijva";
+          rev = "666066d30a420d86801d8380f5991f2b82471107";
+          sha256 = "1hjyac7dm0yvg5y32fii6508wwhl5q493i8ikf3fszafz03nc6sc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6a0fe448e82f42cad0fdaa40c964032892fedd83/recipes/async";
@@ -4225,8 +4225,8 @@
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "f7cbf7734d99733ed99eb8a7b95d2dc808a73927";
-          sha256 = "16i617i3pflwdmdijiklwwh9ywiin6ln7mar0k7yybmlr6xbvlkf";
+          rev = "9b6f8f93af9eb892a4df0e460f3d98031b8bad30";
+          sha256 = "1l4h4cyhbkfg3zpf8wi7c44zkxjv1qjjm0v9mjv4cb7bav7f8kfb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4738,12 +4738,12 @@
     better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-shell";
-        version = "20170205.2308";
+        version = "20170215.1020";
         src = fetchFromGitHub {
           owner = "killdash9";
           repo = "better-shell";
-          rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7";
-          sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd";
+          rev = "4ee06b8791f7363a19109d9ea6c5ee95ce998d33";
+          sha256 = "08w3z4srbz478rmnnzjmbbd5bknady417x7s0r3nxszkxfpn3iy5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell";
@@ -4931,8 +4931,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6c2d81cfadb12c10af0dabe148ede355737ed1a8";
-          sha256 = "18aqyphq1cwandfarql773d0h3ki6c9ip1wji1ni86fm29f99ikq";
+          rev = "53bf803f1d3efc61653f94fe56ff30a72304861e";
+          sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5404,12 +5404,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170109.1223";
+        version = "20170214.1228";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "c0a5a8763ea617de58e595ee30f8e20533e663c0";
-          sha256 = "1mfxcdh6m1s0v43hbiprysflm3yb0b3j9b22vzxclf4sfz2yywz2";
+          rev = "bb751855aa099ea3d6f4573534e0d3fa010aaea8";
+          sha256 = "09bfmds8xfjafcqpn6fc5qjaixd0pvjn42jyr4kkgb8pi5c4vkvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6720,8 +6720,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1";
-          sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3";
+          rev = "1536311cda64a00abb5c1631bbdb253689117a1c";
+          sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6762,8 +6762,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1";
-          sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3";
+          rev = "1536311cda64a00abb5c1631bbdb253689117a1c";
+          sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6949,8 +6949,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "6fc41c74644a457f1f426e2ac62ac2ac88b1fa30";
-          sha256 = "1lx3qcj9khalasx3xd1b8za41zmjylypx7cp0sn0flbhmw1irybk";
+          rev = "55a097ff3743e8a0c806a168545390007336f97e";
+          sha256 = "0h51y5k6bly50w280v948r3lbj849w8117zlgk0zyhjqzr3xzp4h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6989,7 +6989,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12000";
+          rev = "12010";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7157,8 +7157,8 @@
         src = fetchFromGitHub {
           owner = "eikek";
           repo = "chee";
-          rev = "aba1317a57cb673f61038d217aab88709aa254d5";
-          sha256 = "04cpvwkbmcjf69m8xp6p4ldn0qc48saq87k6cpa9pgxhf8z84lxa";
+          rev = "a986cce6fe0290934dedfb7afcfdcf5f5eb47a30";
+          sha256 = "1cwn5xjchra3dsngbyh23w2p4ndjyjjg0zmj1ij4fk3v86cfqf79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee";
@@ -7321,12 +7321,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20170208.501";
+        version = "20170219.2115";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "113d93e02ae41767342fe9b24b3758e75fd3af23";
-          sha256 = "06xryf0wmlsyr2g9m0vxqdnsaicf6jb8nxc20n3jg89b96688wnq";
+          rev = "527af4291245b4ede1983cc27c08fe00db38ea1c";
+          sha256 = "09jbfnwhvrv8dvxzdd7w0j6p305wfpv95z9v45w8wjc987fgzs6l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7384,12 +7384,12 @@
     chinese-pyim-wbdict = callPackage ({ chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-pyim-wbdict";
-        version = "20161029.2308";
+        version = "20170217.15";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim-wbdict";
-          rev = "7a755a1808526bd777b1fd5049b3891fd9a5ec0c";
-          sha256 = "04c87l9y53xq21najw37wywilaxpk1kki8y2pisjyd36rvr7ad1y";
+          rev = "59856a7199dde278c33f6f8d8e21df4944ba996a";
+          sha256 = "1aahff6r0liil7nx1pprmkmb5c39kwywblj3n6zs80ikwy4759xb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7c77ba5562e8bd8b8f532e7745edcdf3489584ac/recipes/chinese-pyim-wbdict";
@@ -7846,7 +7846,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "295019";
+          rev = "295677";
           sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y";
         };
         recipeFile = fetchurl {
@@ -8488,8 +8488,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "38bfe65eba21c697d05e8bed79635fc125cdac17";
-          sha256 = "1dqh7rd2hnn68dfj271sbm1j5dgpkd3phhjrcxnkg0wxyhpcpp7w";
+          rev = "3c0de6db2d9e0580f23cc95c4a1e00a8f66108c9";
+          sha256 = "01ngv9qylhxfg3jj3yvj927y0iyjqlxpxs7fnzywpmkwv50mfj2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9231,12 +9231,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170112.2005";
+        version = "20170218.1913";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "c494fc65d35f7f00c2da17206e6550385ae9b300";
-          sha256 = "07ys3rbsdvhi60lan2gsk7rccikf9gsl2ddmm0sz2g8qal7d2a2a";
+          rev = "bc2ce4e23ff2a3bd4a8ffa766acc5efb0643a7d1";
+          sha256 = "0s246gaa85g6mmvzrk6293qni39rg43lmdgkfn5hwz2zrbp9blfx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9670,8 +9670,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "5070dacabf2a80deeaf4ddb0be3761d06fce7be5";
-          sha256 = "0w54cwjcyq7cr3g50kg4zy1xrkaqakb18qbdam11qvz6kix3syg1";
+          rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc";
+          sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9817,8 +9817,8 @@
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50";
-          sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb";
+          rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee";
+          sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
@@ -9838,8 +9838,8 @@
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "d15182df3eac72b29772802759b77c9eafef5066";
-          sha256 = "05108s2a3c857n9j3c34hdni3fyq149pva4m3f51lis4wqrm4zv7";
+          rev = "23c4d6b2ef184da1a4ce0a7f3e979bc2ea2600ca";
+          sha256 = "1db1wzrcrbh4yfc23xx46fv43n45npzg0syz5d8pwrh1xlx1aj04";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -9876,12 +9876,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20170209.2128";
+        version = "20170214.45";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "436567c1e28cce979aab7820a8fc74b5b5294218";
-          sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10511,12 +10511,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170208.107";
+        version = "20170219.2346";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
-          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
+          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
+          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10616,12 +10616,12 @@
     counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "counsel-projectile";
-        version = "20170111.456";
+        version = "20170216.1426";
         src = fetchFromGitHub {
           owner = "ericdanan";
           repo = "counsel-projectile";
-          rev = "6d126d599b36aeaf840ca5fc3cd595e8fad4697e";
-          sha256 = "1lmmgwgggwh9h2rkfrwdy6bdi1j3z3498kbmzmlj72i3b1lx9w8n";
+          rev = "aefd25c74718e66f180127c0d273eade887325b0";
+          sha256 = "10d29mpvsav19m9x51w8bjv0r9agxdwsvhk1ql62lj7rcy4256jq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile";
@@ -10637,12 +10637,12 @@
     cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cov";
-        version = "20170130.1727";
+        version = "20170217.1633";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "cov";
-          rev = "d73b3aa7f3f285f046e448ffabd3525ccfcc08a1";
-          sha256 = "0l21422mjhknabm1l4d9f5radq153vr6qc6ihsm0hxhy1i713mqn";
+          rev = "e295cde1fc924c01dade3909f5b591bcfe5cf9d8";
+          sha256 = "1axddbrwhb3akb07v20gxhpnaqj2nq04gn5501lh26351p2zjl3l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
@@ -11551,8 +11551,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "4924bd9cb7fc9350646f347e99292d115c39852c";
-          sha256 = "0yrq1hi79kyca774ab5kg0ran9nyjyh0h504rs17f8w05ly48n3r";
+          rev = "299ad1163ac8e72c1910da3e03013e7634a94b91";
+          sha256 = "1xcxmmzyag8lj5kdnw0p0yram0ahbzb4cjy7h1ca0za6v0m3yc4l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11862,12 +11862,12 @@
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20161227.655";
+        version = "20170216.2034";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "37987cccd3f06f02a76cab39bad9a83719e65dcd";
-          sha256 = "1mfpw97y87cccgng7j3chhai1ln1jwppk01i11rzhm96b7vffc5w";
+          rev = "53ee536cc912a900a16b768abd0f8e23e609ef5e";
+          sha256 = "04lj0161la9fb4fd7mdvr1raqnyarzp73dkfydvsaziggg8vnab8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12156,12 +12156,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170213.315";
+        version = "20170218.1508";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "4681d150d80da779bc8f95ec912c7de13cecd0f1";
-          sha256 = "0hsz5gpj2lq7f8grb9wmjv5sqm8ky2c98di0m8n27y4ikcqv7dz3";
+          rev = "1536311cda64a00abb5c1631bbdb253689117a1c";
+          sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -13138,8 +13138,8 @@
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "acf8a3dec14e68934d7d7ef0b867e347ce5d81e9";
-          sha256 = "0wsas576mk5n13wmb2rpazgys3sxgl3ds936gr8yy1sb43mv21r4";
+          rev = "0af40bc6755454beddc0d3cce7dead1b87b58904";
+          sha256 = "01swk3pp88myfams2kpnyzl0d3r4bry1hn6gf6vvvglwif02d3rn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13196,10 +13196,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170112.1427";
+        version = "20170220.922";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "136nacjnnfd8j771k90zszbjq96fsvm944l1zb06gqlm7x94psll";
+          sha256 = "1f84ym2c1wwbjsw7bh4p60k2qvrcr850vb1d7sha506b7319rgqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13810,12 +13810,12 @@
     dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix";
-        version = "20170209.538";
+        version = "20170217.112";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "fc19b2e0c387a545901365a01c4a355bf0504405";
-          sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy";
+          rev = "e335e5cb619b69d68a179cb1d4d757d9314da9ba";
+          sha256 = "1q1rrzfqc9a8mwmi8h35binh43f6zi6bgw4b5km4mqfgwpckrcqx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13835,8 +13835,8 @@
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "fc19b2e0c387a545901365a01c4a355bf0504405";
-          sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy";
+          rev = "e335e5cb619b69d68a179cb1d4d757d9314da9ba";
+          sha256 = "1q1rrzfqc9a8mwmi8h35binh43f6zi6bgw4b5km4mqfgwpckrcqx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -14221,8 +14221,8 @@
         src = fetchFromGitHub {
           owner = "accidentalrebel";
           repo = "emacs-dokuwiki";
-          rev = "4f23638ab6f795fe70508576fa73583d447aecae";
-          sha256 = "18vfbvx2mck48pd1s3h2a8zx8axa808krailvfjm3ypa86ia95w6";
+          rev = "a78289d99068ec3dfb4945877c32751e789d099d";
+          sha256 = "0hynymx3gm9nqmpb0a9j8d9g298vsl0gxa9f1yx9xp60mq6y7l3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e46cf6a57b93ddfda8e2d6e74cee8d0df2cb1ec7/recipes/dokuwiki";
@@ -14301,12 +14301,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170131.2109";
+        version = "20170217.1444";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "2c843fd80d91bb7bd9de9a6bd820998689854fac";
-          sha256 = "0dcln2z63j7wpz6yczpsfmhb68gvak7y66g56373fsv2i3n4ydz0";
+          rev = "21354daf4cea7796ebbe238aea04720f14871d79";
+          sha256 = "1j3rcvdp4wwyp7v45j5ypkb62660qmff704h77d1rxspn62rcs1x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14749,7 +14749,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1782905";
+          rev = "1783810";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14913,11 +14913,11 @@
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
-        version = "20170117.550";
+        version = "20170215.333";
         src = fetchhg {
           url = "https://bitbucket.com/harsman/dyalog-mode";
-          rev = "9ae0c786e1e7";
-          sha256 = "1a498jkj15vhf2x4an6raghjf9fszrkw0zl617m8pibcn3yrnv62";
+          rev = "c4f10d72febc";
+          sha256 = "0x9h38vs5vnvswp3dm3i2pdzw8rvqwxpsfpsjx7r84bww9nr9dyd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@@ -15017,12 +15017,12 @@
     e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
     melpaBuild {
         pname = "e2wm";
-        version = "20150608.1723";
+        version = "20170214.1636";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-window-manager";
-          rev = "71543ce4502bdb09c888e24b3a80e47786785b88";
-          sha256 = "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw";
+          rev = "4353d3394c77a49f8f0291c239858c8c5e877549";
+          sha256 = "12midsrx07pdrsr1qbl2rpi7xyhxqx08bkz7n7gf8vsmqkpfp56s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8da85815c39f58552a968ae68ee07c08c53b0f61/recipes/e2wm";
@@ -15602,12 +15602,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "20170212.450";
+        version = "20170220.1134";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "c25e7dd7ade0e514b1dc94e69b73415fd3eb57c3";
-          sha256 = "1v7jpm81r3c4iqrbslrlnczxfs35s7lky7v75x9ahm5vbnrd9iig";
+          rev = "ed0bbffe5270a1df19e0e751c08a852f6f5a5c8e";
+          sha256 = "0p64nvqxb3a554qa3x3w1lh9qj8dafzpjpmdvj2g47hr840sxdfn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -16029,12 +16029,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170212.2016";
+        version = "20170216.1457";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "f1d3fbe96713e85aaea2f1027c2cc1782e0e5a70";
-          sha256 = "0kf8glywsdscviml8gwdj659zm28npkz0w6ybcx2k1wv9gkg3shs";
+          rev = "9e1341a704cfd6cacc1f5e4ffd75e8866a2519e8";
+          sha256 = "1x73qsdnaywlvigas8m4djpb7gkddsp96v4v5vh178k9ppcrm8j0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16092,12 +16092,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170211.259";
+        version = "20170218.916";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "94617344a74336ecaebc17a414f4d05162a79303";
-          sha256 = "1lcc8y6lhqv0fgdik0qifbb1dzj077s86skrnvy92x373wv565kr";
+          rev = "6ed56bc8a860c6b0719614210632202fd474bec7";
+          sha256 = "0dgwl918n7pzmhflm3ljlsz218hqvfbblpmfiihjgy9zni4idfpj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -17080,12 +17080,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170212.420";
+        version = "20170214.318";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "7e005dc48530007aeac871dbe214512289ec5dea";
-          sha256 = "0pjdsh53f8d2fva55kvm726x5830r78fyigcd4ni4sifl83szrpf";
+          rev = "65e7c410acfcc8d675f531894269866ecaedea6e";
+          sha256 = "0khsycp7l93zz3n9aa2lbyk4imcdwyfpp2i9jc6g2j9k9jn1dcal";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17757,12 +17757,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 = "20161102.940";
+        version = "20170213.655";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "aa7e2af7f2a40ae9691d8d8183060c947f4ba55e";
-          sha256 = "062s55qhznd04vas602zzgxba3wd9yvx489ww7qjssj4wqgkckb6";
+          rev = "6897e43223eac133f0c2d9101932fec6479e58b6";
+          sha256 = "1qjrnh25rv4n0cvdd8ynjlmvnb7zqibz1ky0x8ahkml72g672f5i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios";
@@ -18788,8 +18788,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "6282023d28588e4838f37ea45a060ec48ef5ba3f";
-          sha256 = "01bbx82746abfqlr6hqja9jkvwalqyvxhdmzk6qarngyr2fpq1sa";
+          rev = "32a74e6c83cd110b8e8ab714be4365c0da558fca";
+          sha256 = "12aw6rkh5dvznzzbwdlcjraw0s91bp5azs2d0lyblrnpi7lf28gg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19260,6 +19260,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eslintd-fix";
+        version = "20170220.832";
+        src = fetchFromGitHub {
+          owner = "aaronjensen";
+          repo = "eslintd-fix";
+          rev = "4b0c93731d451ea7ddf4b1a8a61bab07915bbb0f";
+          sha256 = "08384v47dasnw4dy3wlnj0n9wzc03wcf6r6y3hy36xizvkng4qdl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
+          sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v";
+          name = "eslintd-fix";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/eslintd-fix";
+          license = lib.licenses.free;
+        };
+      }) {};
     espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "espresso-theme";
@@ -19347,12 +19368,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170211.805";
+        version = "20170219.1024";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "59233439aaa73ae34d548ab126fd3a79e8363c92";
-          sha256 = "0p1hs4fy8aig504qck4j7c5jc9nw5fny42az1k56gifw6c243wfr";
+          rev = "081ce9c0ac19e2f98fe2c35384f301de10cf8ce2";
+          sha256 = "0q2s5mj2m3daqfhw34idvvlx0qkscbgqgpan6rc5aflibv7rlhk5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19635,12 +19656,12 @@
     eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "eval-in-repl";
-        version = "20161224.1932";
+        version = "20170217.1432";
         src = fetchFromGitHub {
           owner = "kaz-yos";
           repo = "eval-in-repl";
-          rev = "674873139ebde439fbeecaf0fb217d54f470bc14";
-          sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s";
+          rev = "d96a134abe65c736bfaf0a78d1f899ea7cf0fee5";
+          sha256 = "00ilv46ybpw5arfqi3pk7gjabkac76siqpgj3ca47s6vlmz41anv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl";
@@ -19716,22 +19737,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
+    evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170209.1259";
+        version = "20170219.629";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "c29c32be3327294036a8a56513836ee515091f16";
-          sha256 = "05g7wp9aaf767d4277q86nrz1azhbhlxxc1pncf2f5dmid9pbgbq";
+          rev = "5d040cdf9769f484448385715103d0e48efb1425";
+          sha256 = "0d8cfnch23s80nymbjls4xsqj8ib89mrpi6ln185xh9jzscjfra1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
           sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb";
           name = "evil";
         };
-        packageRequires = [ goto-chg undo-tree ];
+        packageRequires = [ cl-lib emacs goto-chg undo-tree ];
         meta = {
           homepage = "https://melpa.org/#/evil";
           license = lib.licenses.free;
@@ -19931,14 +19952,14 @@
         pname = "evil-ediff";
         version = "20170213.539";
         src = fetchFromGitHub {
-          owner = "justbur";
+          owner = "emacs-evil";
           repo = "evil-ediff";
           rev = "4f3b9652e5df58ccc454d970df558f921958894d";
           sha256 = "1nc7xq86v5ns3d47ifwnfm7x7x3qxb18rjqx37mqvga91nz2i1k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/45eb1339792849b80a3ec94b96a88dd36262df2b/recipes/evil-ediff";
-          sha256 = "1xwl2511byb00ybfnm6q6mbkgzarrq8bfv5rbip67zqbw2qgmb6i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-ediff";
+          sha256 = "0yglhxm670996hd7305q38y5f47y87n75hh0q7qlm2vra2m2wa5s";
           name = "evil-ediff";
         };
         packageRequires = [ evil ];
@@ -20204,14 +20225,14 @@
         pname = "evil-magit";
         version = "20161130.847";
         src = fetchFromGitHub {
-          owner = "justbur";
+          owner = "emacs-evil";
           repo = "evil-magit";
           rev = "9251065b73c5023fc21d56f5b94c505cb7bee52d";
           sha256 = "17jnqd73i680fpmghghadc4d4xlg39xfjx3ra8sll0h1xf4xkspi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit";
-          sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/50315ec837d2951bf5b2bb75809a35dd7ffc8fe8/recipes/evil-magit";
+          sha256 = "02ncki7qrl22804576h76xl4d5lvvk32lzn9gvxn63hb19r0s980";
           name = "evil-magit";
         };
         packageRequires = [ evil magit ];
@@ -20563,8 +20584,8 @@
         src = fetchFromGitHub {
           owner = "expez";
           repo = "evil-smartparens";
-          rev = "3bbb96c1064accee0715b039d09955ed5ca9851f";
-          sha256 = "0c3zb0s6snsb0a312pgha760njvb6gpl25g8ywm5dzp03r99490d";
+          rev = "7cde5544934930819e9dcaa1e0db2e3c58f0cd6f";
+          sha256 = "0pmw98n32fyqr4qnpl52a7vax4rk8dfq98v66v8400b78j6d0n3q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/850898fbfc8e0aeb779e8feae56476d989110e79/recipes/evil-smartparens";
@@ -20584,8 +20605,8 @@
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "evil-snipe";
-          rev = "b1bcddda1e2fe7f239223fe0fe0994c1745657d1";
-          sha256 = "0vpa0hbi1m3f2yxy56wyhm9fja35frnq6xs7bb93gmigbpa96f47";
+          rev = "e8acacd31466def1e8fa1eac0c5ccbbcd5a0ba2e";
+          sha256 = "1x8qwvpjv87sv2lyda57k0l47mjvn0ichpgjs0vc7q8kmhww5k5h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe";
@@ -22691,6 +22712,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-checkpatch = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-checkpatch";
+        version = "20170217.225";
+        src = fetchFromGitHub {
+          owner = "zpp0";
+          repo = "flycheck-checkpatch";
+          rev = "6461fc7b0d493eb9863814055f8bce5fa35739de";
+          sha256 = "1651xmw01n5h7x81y3cvsamdmb67jcf385ax52dkp8miyq1a090r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/193aaae5640434559cd479df1463ee44eab14d86/recipes/flycheck-checkpatch";
+          sha256 = "1apjn26n663rjddv5iagfs65fdf22049ykmzggybbnprvnmasf55";
+          name = "flycheck-checkpatch";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-checkpatch";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-clangcheck = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-clangcheck";
@@ -23405,22 +23447,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
     melpaBuild {
         pname = "flycheck-pkg-config";
-        version = "20170209.1545";
+        version = "20170214.1114";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-pkg-config";
-          rev = "f615b9da412425f65f2818e26970412a7736b178";
-          sha256 = "02if6mjxjlbgdsfzgmbn7j65c3zrszr92mnpydbbksg1abqr7146";
+          rev = "fda3f828082bd957c838126577a6b7e4d747dd54";
+          sha256 = "0pvbw9qgpa8x3cs0xbql2spbaza2hxsnamk92pdqppm4g797k3k8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config";
           sha256 = "0w7h4fa4mv8377sdbkilqcw4b9qda98c1k01nxic7a8i3iyq02d6";
           name = "flycheck-pkg-config";
         };
-        packageRequires = [ dash s ];
+        packageRequires = [ dash flycheck s ];
         meta = {
           homepage = "https://melpa.org/#/flycheck-pkg-config";
           license = lib.licenses.free;
@@ -23576,12 +23618,12 @@
     flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }:
     melpaBuild {
         pname = "flycheck-scala-sbt";
-        version = "20161127.1321";
+        version = "20170217.934";
         src = fetchFromGitHub {
           owner = "rjmac";
           repo = "flycheck-scala-sbt";
-          rev = "5b2c7a24b5b57573d0f9dbc759158bf90fa305da";
-          sha256 = "08p2acxa8irqb75d6ygk4rvh3i25faz06ilmqj3a3lf0xs0v5adc";
+          rev = "872a8f4e22d625149fb523dd75e69587773c2591";
+          sha256 = "0zdnh4rfrg3wrr7jkbhq4p4g3cbcl4dzr4i4zkdzsda8g7y3gz7n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt";
@@ -23702,12 +23744,12 @@
     flycheck-title = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-title";
-        version = "20161112.1716";
+        version = "20170216.1546";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "flycheck-title";
-          rev = "524fe02e58ee2ff698c2a108306b2b79e23944a3";
-          sha256 = "1yccgsa9lcm2wklrrbs5vk89zfln70k4jnvzx0lvcjsy0swq147j";
+          rev = "6faea67be8661faf8152217869d16e993cc2bc49";
+          sha256 = "08b2cq5bzmq9aa8b8glx5js2nhfpgdsd0r2sgvi0ij937yz8lf37";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2996b70645cd6fd093e3b31b9586ce5acb036cf6/recipes/flycheck-title";
@@ -25319,8 +25361,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "e826546c6d33ff02048b3652cc64058dde819f1c";
-          sha256 = "1pgpmsyxilsqwjr57zd1afzr33fq0nnahx8ppih6pqnfza97008s";
+          rev = "55834faba7e5f7096f9ce53613333137ab20ad07";
+          sha256 = "15vn4bw0qzgg3y5ak703c4jqds8zjc758fnrq2xsdi84d4r67c91";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25438,6 +25480,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "futhark-mode";
+        version = "20170216.138";
+        src = fetchFromGitHub {
+          owner = "HIPERFIT";
+          repo = "futhark";
+          rev = "b66b691c56b128ee03541a7e0e777ceb78811f16";
+          sha256 = "1ya49xakc30ljy3g6bfb1kikdhrgsq6rg2z63gvkzxhpqx63wjr5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
+          sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq";
+          name = "futhark-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/futhark-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fuzzy";
@@ -26231,12 +26294,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170128.745";
+        version = "20170214.347";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737";
-          sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7";
+          rev = "35566abd2d21e6576dc2e33311c15977f5ba5667";
+          sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26399,12 +26462,12 @@
     git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20161203.1823";
+        version = "20170218.1541";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "255f42e72f7565eeb7feb40e18507348dfccec0a";
-          sha256 = "1333vll16snfg135hbczl8d0l8smqz98kz89jv4fcyp9gs6g8sp7";
+          rev = "4bb6dacc8e3faf781415e9fab44ebd45aa002fb4";
+          sha256 = "0l0irmjl44kj4ghvr7jrbyi84q5ggyr36g3jpmvy3pag2fk3pc5n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -26714,12 +26777,12 @@
     github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-theme";
-        version = "20170112.2207";
+        version = "20170220.1038";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-github-theme";
-          rev = "cf9a167e8940ee8f678f2c72495f4ffff9e88509";
-          sha256 = "01wxs4vywfnzb0j2inxmm37glqz004laay711scrizwvqs3bhjd6";
+          rev = "a424395262b2215866a02bf42bf8d93667979c13";
+          sha256 = "017p4l68gw4gyfd2yr5yr3di407f50fs7ki6bqa0z74hc661n1g5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
@@ -27198,8 +27261,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "5070dacabf2a80deeaf4ddb0be3761d06fce7be5";
-          sha256 = "0w54cwjcyq7cr3g50kg4zy1xrkaqakb18qbdam11qvz6kix3syg1";
+          rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc";
+          sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -27908,12 +27971,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20170210.151";
+        version = "20170219.2338";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "a5bfe13e7bba81d25b32d836c0b870e8f3f6c463";
-          sha256 = "02hb0znxwbxlkchlkya4j6hm6p1djza6ajij6d94a7p13dnpmygb";
+          rev = "d9b00bd93ab3fed0e7fff99b0dc8773584f5207d";
+          sha256 = "0vrz97w9yzkxl8pc9jmxkxvj5nagpnzqq9pvavwmvlh68wrh58gi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -27989,12 +28052,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170213.1516";
+        version = "20170214.1211";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "9bda6c3e3d4e1a477092cf2967ddbe5195cb7833";
-          sha256 = "1shdh2hx6vildj8daqivy7227ywf7arz1wy2hzk46dck6q58w9ls";
+          rev = "93064c0677521a409cfc701a9b6739ca2ee0a1f4";
+          sha256 = "1r28da357iggz6mw7cvizf41pap6wy76ma883zxa8cwpb7g5qfhb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28622,22 +28685,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, typo }:
+    guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guess-language";
-        version = "20170213.330";
+        version = "20170216.909";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "c0a9cd33d8233e2e0cd62b28fdb7128945b3de99";
-          sha256 = "0jlhk8vqxhsjvrf5iln9rii8vcvcaz247cpk51fymy5sh4dbc5sw";
+          rev = "89537dca05a72c0ad501856bbd3d12355d14a93d";
+          sha256 = "08r7bknp602zsjhq7zzm021xlf686zdnabgzshrnrpiiwfgqv7wy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
           sha256 = "1p8j18hskvsv4pn3cal5s91l19hgshq8hpclmp84z9hlnj9g9fpm";
           name = "guess-language";
         };
-        packageRequires = [ cl-lib emacs typo ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/guess-language";
           license = lib.licenses.free;
@@ -28688,12 +28751,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170131.1037";
+        version = "20170215.241";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "fbb16f39951dbcb1f185cd24b07063e166a1cc2d";
-          sha256 = "1pwq9yipycgn3v32yiz8r59g02z5l9hsab8ng3zbgrv42ivddd2j";
+          rev = "092ea5a157621c6ef3236dd00dc1230a0c7ffc05";
+          sha256 = "05ya8jny9j4amsmvgsnzpscbx8k7j016li5aikny7c12z4lf1n5d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29216,8 +29279,8 @@
         version = "20151205.1159";
         src = fetchgit {
           url = "https://git.spwhitton.name/haskell-tab-indent";
-          rev = "150f52176242ba3bc4f58179cd2dbee4d89580f4";
-          sha256 = "0hfq8wpnyz5sqhkr53smw0k1wi7mb5k215xnvywkh5lhsq8cjhby";
+          rev = "93ea6a3a707fc34a97ce94e0285e9569e01062c4";
+          sha256 = "04698q2c75bbbcib94zdjkmm2k0zlxxzhnd34fflhzzxljcr02cj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/371f9f45e441cdf4e95557d1e9692619fab3024a/recipes/haskell-tab-indent";
@@ -29439,12 +29502,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170211.2302";
+        version = "20170216.738";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "fdc277116bcc57917a17838a388d880f7c7ea83b";
-          sha256 = "0s0qnwx8sm4dm0hgn70433rvkqw7144a3pvsk3yli56crvdpxvi4";
+          rev = "e991087781e17de415ead3dec0d3e67897b637f7";
+          sha256 = "0rar882mpaw48nvg6xdv69z3q5hd79y8dqqby65rrb6vh7hvjz77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29527,8 +29590,8 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7";
-          sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni";
+          rev = "2fc02c4ead29bf0db06fd70740cc7c364cb650ac";
+          sha256 = "1gnn0byywbld6afcq1vp92cjvy4wlag9d1wgymnqn86c3b1bcf21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag";
@@ -30006,12 +30069,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170210.5";
+        version = "20170215.2338";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "fdc277116bcc57917a17838a388d880f7c7ea83b";
-          sha256 = "0s0qnwx8sm4dm0hgn70433rvkqw7144a3pvsk3yli56crvdpxvi4";
+          rev = "e991087781e17de415ead3dec0d3e67897b637f7";
+          sha256 = "0rar882mpaw48nvg6xdv69z3q5hd79y8dqqby65rrb6vh7hvjz77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30951,12 +31014,12 @@
     helm-j-cheatsheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-j-cheatsheet";
-        version = "20131228.441";
+        version = "20170217.29";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "helm-j-cheatsheet";
-          rev = "70560fd2fb880eccba3b1927d0fa5e870e0734e4";
-          sha256 = "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v";
+          rev = "6c47e7162b9ba2de4b41221d01180146973d860b";
+          sha256 = "0ayv6aqmwjy95gc9cpyx0s71486rvlmn04iwgfn43mr192c38y9p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/681b43eb224942155b97181bbb78bcd295347d04/recipes/helm-j-cheatsheet";
@@ -31014,12 +31077,12 @@
     helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ls-git";
-        version = "20161122.241";
+        version = "20170214.525";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-ls-git";
-          rev = "98ce7dc709cf1468a50de18e96c028baa7f4357d";
-          sha256 = "1hlya6rc8iwmfjqk2grr80y3842x3763yl7siwp5jflpzryxhk97";
+          rev = "7b7b6dc2554603ad98412927f84a803625069ab3";
+          sha256 = "1s748a5abj58hd7cwzfggfnnmyzhj04gpbqqwqmskn8xlsq5qcdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b487b4c0db9092bb7e32aad9265b79a9d18c8478/recipes/helm-ls-git";
@@ -31223,12 +31286,12 @@
     helm-open-github = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-open-github";
-        version = "20161203.604";
+        version = "20170219.1759";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-open-github";
-          rev = "553f3ab0fe0a028015e9b6cb7c35fb139ec222fc";
-          sha256 = "1xj5b44nkdvbxhk1bnllqm2qq393w22ccy708prrhiq8fmk53aa8";
+          rev = "2f03d97552a1233db7694116d5f80ecde7612756";
+          sha256 = "1nzi2m23mqvxkpa7wsd2j0rwvlv5pj0mcaz2ypgfd023k2vh9is1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-open-github";
@@ -31286,12 +31349,12 @@
     helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-package";
-        version = "20160917.2232";
+        version = "20170216.2002";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-package";
-          rev = "dec1600da71301d14a7c17052286ac4a25378b7c";
-          sha256 = "0qg7q01i48x8igfv3sh3gx77af76hj3yrwwc7f878r56k3w9d2ca";
+          rev = "0f3ac5623cc6220a65f3c9ec0f587225101e96d5";
+          sha256 = "0z45gj2rb4n26khkk9lg445s69c1jwks0hcyqww63asch6ydizgj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package";
@@ -31370,12 +31433,12 @@
     helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }:
     melpaBuild {
         pname = "helm-perspeen";
-        version = "20170205.742";
+        version = "20170219.812";
         src = fetchFromGitHub {
           owner = "jimo1001";
           repo = "helm-perspeen";
-          rev = "9f1cfd4b9a4881e089486a02eeba07c551d5d706";
-          sha256 = "1jdcvli9j5q5n4qp4qa5ylyb47mrh3crhbq316qkxk473r8hprlc";
+          rev = "aec145d5196aed1689563d138a2aa37b139e1759";
+          sha256 = "1wv13mvm9149nl9p93znl3d2yfnq4rph440ja07w804cd61qjhq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
@@ -31983,8 +32046,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "18bb091ed100895a1dfbc3ee1f85c08de541f742";
-          sha256 = "12fbpsn7wywgbr1npxv3smb0z5s7j8zpg4s60zs28hz49j8v4058";
+          rev = "adfd03eeee3d8c3393695646cb8f37d729dd87c4";
+          sha256 = "1ram4fqzmrqs04vxjapl4hddazb9489c9jal1xa6m8644hg5jpqa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -33254,12 +33317,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170209.938";
+        version = "20170219.532";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "76d60bd3f740aabc8c9d3e25240aa71bb20f7d2b";
-          sha256 = "1wwj9sqjhkjdwn69nd5h9mmrqb42d7c066bl3f7szmg6mhwgffw3";
+          rev = "6c1d1cd47ffa003c7b6fac9a0130f2401cab5dcb";
+          sha256 = "1idsw6hvrs5cjaz0sx4nfikv8md9mc4010245lpfhx4hn559c5k3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -34044,7 +34107,7 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170201.1015";
+        version = "20170217.1048";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x";
@@ -34631,8 +34694,8 @@
         src = fetchFromGitHub {
           owner = "idris-hackers";
           repo = "idris-mode";
-          rev = "4c70405ffcb54157f43662ed5a561a96e08777d6";
-          sha256 = "095l1vv0q5xzvxwksnjl4llj9w79ih341xayx84l45m06s1a8j5b";
+          rev = "b5e057bf6b805f4da7c17cb6ca5e69833935e900";
+          sha256 = "1bwrf529m9xjb9bdypx35ss5v6k5v96hcqah3sij98x9357g7b6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17a86efca3bdebef7c92ba6ece2de214d283c627/recipes/idris-mode";
@@ -34916,12 +34979,12 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "20170212.518";
+        version = "20170215.125";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "415a8db6598e949e4389f2e06dc2c28f96892214";
-          sha256 = "0w1x3psbzwqmbjm2dcqx4x72p43pdsliz0z40g2zjqkbqjs2al2q";
+          rev = "999fc0ec7f03b56be8e2a6e673d9473f51e5a92f";
+          sha256 = "0py4sc5a5hjdijavymjmvipkm9z4jy1l8yb35d8rl7mfzr5cz3l7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/86dea881a5b2d0458449f08b82c2614ad9abd068/recipes/imenu-list";
@@ -34955,12 +35018,12 @@
     imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenus";
-        version = "20170115.1226";
+        version = "20170217.47";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "imenus.el";
-          rev = "5449180574f52a3a9f8de7408594ccf45c92d5d5";
-          sha256 = "1xd9ymqmxdfnw6l6bz2bvpn764h3y9abgymm3c66403cq3dx8rz3";
+          rev = "7eea33f0aeca0737b3d7d87aeb67073ef4b5d978";
+          sha256 = "1xcw3gsw5alhdnvh7c98cwhxdjhfxrrx1nrl5zn3ibdk8cj3z0p6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus";
@@ -35101,12 +35164,12 @@
     import-popwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
     melpaBuild {
         pname = "import-popwin";
-        version = "20161105.849";
+        version = "20170218.607";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-import-popwin";
-          rev = "6a21efc7fd44f8c2484d22eadf298e4bfd4bc003";
-          sha256 = "1h4c3cib87hvgp37c30lx7cpyxvgdsb9hp7z0nfrkbbif0acrj2i";
+          rev = "bb05a9e226f8c63fe7b18a3e92010357049ab5ba";
+          sha256 = "0jjm214zfq2kk8vzf67vala46lbbkjyms7qm27qv3yhcbc7ricvn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6f0629515f36e2e98839a6894ca8c0f58862dc2/recipes/import-popwin";
@@ -35143,12 +35206,12 @@
     indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indent-guide";
-        version = "20161226.2332";
+        version = "20170220.57";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "indent-guide";
-          rev = "c0343c76362b25148738ccc11317f7ccb89580d0";
-          sha256 = "1r6cq0984yacby96hphvsvvbifa4qz2j6s25mz72l15r344m769q";
+          rev = "92dd919f70b4d7398ae528123d035936c0ad9d05";
+          sha256 = "1jmb53kcl3x94raba8g5w0ys3dgrnam6a540i5jmxpc5z1vanskc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
@@ -35168,8 +35231,8 @@
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "indent-tools";
-          rev = "3b0e62e15091123cc6d54bf4d401ccf0d5e22062";
-          sha256 = "1rklsf6x7lwhpvzs9s8sdlfj98wh6zjsdb28pnlha09g2nm5c7jj";
+          rev = "b6b8bf42bf50c8b0b1aff56894d8265df79361cc";
+          sha256 = "007102am1q2dkp18p1vlsy34i28lvvq4n8b3grz7nyblbik1v5wp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools";
@@ -35727,12 +35790,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170206.1238";
+        version = "20170220.440";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "9cd5e5047cb0147f50bc722bb748e9b55ae89fa2";
-          sha256 = "1j6r8nswgnjd343dlvf4b43sym7cypw6m54gzdg9sbgqgr51avbc";
+          rev = "9d183b6eeeef274092127385b8e4075bde87ba78";
+          sha256 = "171as5lssfy1ccpn6hzvqbjs72cl62nifs45909df9782l3d0608";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -35997,12 +36060,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20161227.348";
+        version = "20170217.136";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "ebc373b0b4f2b3f491c91d3a7f6dc9ce565a2960";
-          sha256 = "1594q15664awzb4ylr74x4ab8lram135rr0fr1l1gq4nsqzv4pg9";
+          rev = "284ca00b48d8261106efc6c6ac128ebec608c86f";
+          sha256 = "0clpnv6byy8zxw0qlxmljbsx9zf4qag9i1lmzianczdpiba4pq9a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36285,12 +36348,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170208.956";
+        version = "20170217.605";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
-          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
+          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
+          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36327,12 +36390,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170203.244";
+        version = "20170216.952";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "f5bee7c5368d55be4ebca30610b73c33978830cf";
-          sha256 = "0lcydjg8kyxdv5bbly0jf4d5wl4z7s63i536gvnlz0wfgj5swp5v";
+          rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af";
+          sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -36373,8 +36436,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
-          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
+          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
+          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -36432,12 +36495,12 @@
     ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-rich";
-        version = "20170102.1820";
+        version = "20170210.409";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "7ff0b3e43b27353fabcb01d2252236e266916e50";
-          sha256 = "1gy45rm8pznrkqh7d7wrppd2z2bd654yzi9ddav1ibzaip52g5m3";
+          rev = "4517ca22b462f5202d3959a11acbcd4b64d883b3";
+          sha256 = "0zy7scakd2hj0zggb41r3c9lh9y437121yjlha5mmlbd4zszdyxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -36474,12 +36537,12 @@
     ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }:
     melpaBuild {
         pname = "ivy-youtube";
-        version = "20170109.338";
+        version = "20170217.404";
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e";
-          sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b";
+          rev = "32f609f1d1a3718739be5797e020d6266d8340d2";
+          sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
@@ -36997,12 +37060,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170211.609";
+        version = "20170217.22";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "0ac750cb6c3b9b9f0c4c8d440a88bc9d7377d9f7";
-          sha256 = "094sip7s0vqvn7xv6w66gd3pxhsdb3a1psvcv4dyliqj2zkfa3q4";
+          rev = "41c15d11fa0ed3f84c8a18aecf391c4a87e3ac56";
+          sha256 = "1c51sy5951hz3zyhs1w9r365qsw2amppf87141gsyl688vjrbn2s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38545,8 +38608,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "ec7f2477ac417e4ccad245b3ce69472c3766d008";
-          sha256 = "063wp6fv6wi5qc7ybam6swmhmakavg3lh7n8v4lms7zjiq47c90c";
+          rev = "bf1da4672ca848eee59ccf486e68f74157e45af1";
+          sha256 = "064nak7bkpzip03k81cz3fzjf1kn7vq2azcazhspn4i6f8xgfzb5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38688,12 +38751,12 @@
     kosmos-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kosmos-theme";
-        version = "20160829.2135";
+        version = "20170218.1121";
         src = fetchFromGitHub {
           owner = "habamax";
           repo = "kosmos-theme";
-          rev = "968113f1a6ebcb4876c4f1fc9bd0882845d2845e";
-          sha256 = "02244gmvs5hpxa3wxhcd4ajc2gj5f773m7mx76siwf2lidq5gr21";
+          rev = "0c7b2257ab1d8aedafcf89a43dd2112871df23b4";
+          sha256 = "18n0lw6cfc56np4s3mvpdp13pnsmqhjn1izipjv1s1sgyjj04qj4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/617eb74a7a2416d244acc6feaba50eeeb425bda5/recipes/kosmos-theme";
@@ -39419,12 +39482,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170211.1157";
+        version = "20170218.357";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "4d32174f5930bd4de81117d83a232768cf96ce4c";
-          sha256 = "1w64pa0rl2fr8z3l0bq4sw4543rfp53zdgjm5gm5f84py3fjkwmc";
+          rev = "f2778f661ebfe1159aa632c987db7f46673aac14";
+          sha256 = "08p4nlh5f4bw65p75rlf6nxrbs5fv84l6fwvcl5frs6lng3a2s0s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -39539,12 +39602,12 @@
     lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lice";
-        version = "20170131.1601";
+        version = "20170220.143";
         src = fetchFromGitHub {
           owner = "buzztaiki";
           repo = "lice-el";
-          rev = "e6f7f827bcf5246aff25f52d6185c9bed91beeba";
-          sha256 = "1kjai3kvzn0flakjzrarh676ja6x6v0wbjxr69wqw9nvicvww7zx";
+          rev = "4339929927c62bd636f89bb39ea999d18d269250";
+          sha256 = "0879z761b7gajkhq176ps745xpdrivch349crransv8fnsc759yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2508699ebfc846742940c5e4356b095b540e2405/recipes/lice";
@@ -39796,12 +39859,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170212.1136";
+        version = "20170214.123";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "3dcacc88a0964550b7f4f37290e46cecee8843d8";
-          sha256 = "0vhysxh264bdh4rmfnk0hczb80fi8gbhvbnc9ah1nip9l53m1gdf";
+          rev = "cb94346e9cd1fdf70cb872acc7e10f8bf6f3e1ed";
+          sha256 = "08sakrwaz0dcwl8zhqkkanajhnc94vy9qagcdmax52w708kyrspr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40109,12 +40172,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170212.2013";
+        version = "20170218.2328";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "c4e28fdf6c409c870ecbb7b4d3c19d0dda76e79c";
-          sha256 = "19m2k9srlc8v5nrb4a44v8pdcfg9zbx28b5s7qa7m676b3yav58b";
+          rev = "6e413e5692b38e5b7e3713cf0216b143c765cfc2";
+          sha256 = "0zsi0y2fhynj0qdvyds1vihzli4nw9ii0i5mksqki0v02jmaaygh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -40196,8 +40259,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "9053d357baecccf1399f934c5faea2b2e6c0a742";
-          sha256 = "09p441mrp4bfg5imh2dghz0zr95qibh0hwv278lbdbq33svl8qmg";
+          rev = "3abe103b2e7d593974f7dff008d09139e1e5e030";
+          sha256 = "104qhhbgd68wrxyrlrywb7rsh095lg9hviyv3w8p6wymzfa9j2ms";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40238,8 +40301,8 @@
         src = fetchFromGitHub {
           owner = "vic";
           repo = "color-theme-buffer-local";
-          rev = "faf7415c99e132094f1f09c6b6974ec118a18d87";
-          sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0";
+          rev = "e606dec66f16a06140b9aad625a4fd52bca4f936";
+          sha256 = "0c04fy3hc8wc0aabilqx9mcipmd41rmshqjxc3z8m1w0bm4288g1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/load-theme-buffer-local";
@@ -40857,12 +40920,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170213.927";
+        version = "20170219.906";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737";
-          sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7";
+          rev = "35566abd2d21e6576dc2e33311c15977f5ba5667";
+          sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41032,12 +41095,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170209.1031";
+        version = "20170214.347";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1643dc626ab28fd28eff8a94272f0f4fba8e2737";
-          sha256 = "0fank75arc9bwndpv87jli7cadbh2dgka42m0nc5lqldykflnfd7";
+          rev = "35566abd2d21e6576dc2e33311c15977f5ba5667";
+          sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41137,12 +41200,12 @@
     magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }:
     melpaBuild {
         pname = "magithub";
-        version = "20170213.1926";
+        version = "20170214.1710";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "magithub";
-          rev = "a94502461ada9098ccb031ec6241414dcbfce989";
-          sha256 = "0wsk7qhvz1k41lfajx0hrrdj5pwvqr2m10a9lil1f124pkc883w0";
+          rev = "0b5207f3097dee40feefea916cdf211734c9fe32";
+          sha256 = "143iwmga1ypa6v9086pcfr3n5jvaf1dl9czlld5y7npm4r0pxnbr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub";
@@ -41344,27 +41407,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    malabar-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, groovy-mode, lib, melpaBuild }:
-    melpaBuild {
-        pname = "malabar-mode";
-        version = "20161002.1455";
-        src = fetchFromGitHub {
-          owner = "m0smith";
-          repo = "malabar-mode";
-          rev = "e72597045a124fb05993447a009bbd18ec43b4e5";
-          sha256 = "13z3pn5fxn1rvf9w1sv41c6v21znxmqbk9sg4albkx8v7pxwfbs7";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/29bbefd1e3cc5726584c89244fb5d8ecd18200c3/recipes/malabar-mode";
-          sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
-          name = "malabar-mode";
-        };
-        packageRequires = [ fringe-helper groovy-mode ];
-        meta = {
-          homepage = "https://melpa.org/#/malabar-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
     melpaBuild {
         pname = "malinka";
@@ -42210,12 +42252,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170212.2226";
+        version = "20170219.1656";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "9f73f1b0656a6a2ea55bbacf7659ffd3b35cdd9d";
-          sha256 = "0hnhzkkggv035x0qkxmw64migq6v6jpg8m6ayfc95avimyf1j67r";
+          rev = "bcbd1701745c2dc0b161fdf428f3db3887dfa48a";
+          sha256 = "1zs9b8ijwj7b61m3az4k5ch89siz4hy74adz9k4amaab9s6chzcf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -42231,12 +42273,12 @@
     melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "melancholy-theme";
-        version = "20161228.1643";
+        version = "20170220.1248";
         src = fetchFromGitHub {
           owner = "techquila";
           repo = "melancholy-theme";
-          rev = "033cb2690c3f4deb6188dabeb811d42debd78a5a";
-          sha256 = "0qv1dv0l7q6j0r1s9mvw40h4wj44g0lsd1nmcpg2pv48mk6dhdjk";
+          rev = "a9e13ca7051731b3a2c2aece9f3e3033b9a5e41d";
+          sha256 = "13wgh3w9wh1y1ynsbz4zi2vj14h8z1kj5vhq4w6szs0y0zzjb9zj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme";
@@ -42432,6 +42474,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    messages-are-flowing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "messages-are-flowing";
+        version = "20170218.1720";
+        src = fetchFromGitHub {
+          owner = "legoscia";
+          repo = "messages-are-flowing";
+          rev = "649061753b67b24c54a2eaadc8b3218cafae7376";
+          sha256 = "01y9cx5d5sqgvg97dzrnyi7m3yp0q3hm2yqcgknkp111afcgiwm7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/275d537d9dab56e21d0d6d25a287ae9cbcc26d98/recipes/messages-are-flowing";
+          sha256 = "0shqldzd2421ii42briqfbgf7nws54d1ajx6xw8iax8q1yqv4g8q";
+          name = "messages-are-flowing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/messages-are-flowing";
+          license = lib.licenses.free;
+        };
+      }) {};
     meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "meta-presenter";
@@ -43285,12 +43348,12 @@
     mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20170131.1751";
+        version = "20170216.620";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "mode-icons";
-          rev = "da41bb7ba35a4ce0a4e02e1ce2fa7fe4190b1bf9";
-          sha256 = "0p4jm7klfh27g1wbsa8qm7vlmpqs57pdk2phxq2qwbim095fsp0l";
+          rev = "2d47c03ee33c53d069fd64409f7212a2e1ed3f18";
+          sha256 = "1cdjrd9jap56wna89v48lc45vycd225ly1wpii31s8sbikxfna2v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons";
@@ -43344,10 +43407,10 @@
       }) {};
     modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-posn";
-        version = "20170205.926";
+        version = "20170219.757";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
-          sha256 = "085q998d7b4i3ay5cg4dcny7jw8a3hbvx2hifshwx4cck10p8f8b";
+          sha256 = "1f3qdf2drdx0sv1rgcg87n4zhjlg8d9iaxzqgfz4qdjxhi1swg0z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -43552,12 +43615,12 @@
     monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monroe";
-        version = "20170126.1821";
+        version = "20170220.540";
         src = fetchFromGitHub {
           owner = "sanel";
           repo = "monroe";
-          rev = "03e09ff0c4ae9fb4b0d1d436ca56f36b63e21b7c";
-          sha256 = "1cxng7gi2ik57w11li9fl12cp9hiv98ynpm6nr0mw80rvb9qxhak";
+          rev = "6190d9935109e116944296be2faa46773e545d91";
+          sha256 = "1lp0xbsgiajbx27fnsx61krcbj6p0frar4wh5dq6i98af46vwly6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe";
@@ -43777,12 +43840,12 @@
     move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "move-text";
-        version = "20170101.125";
+        version = "20170213.2128";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "move-text";
-          rev = "df534f345b960cd3315caa9dca9e4893c38e48fd";
-          sha256 = "0svrdyij17nasdsj3fnj31p92ff7byzrwvbr49mifsqh2isibs54";
+          rev = "ea57d20a49bcffbcd948ad2f6f6c710fdd71d689";
+          sha256 = "0cc6cyqwm6nivnplr1226xz25vmjk6icsjp80kkwdwgfbiyj986j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text";
@@ -44092,12 +44155,12 @@
     mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mu4e-maildirs-extension";
-        version = "20170118.150";
+        version = "20170217.40";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "mu4e-maildirs-extension";
-          rev = "5a929e2e37cc48a81f61997ec74abbe6e5f8660c";
-          sha256 = "051a5ba04ajyl6vvaysshvvdjmrh3rsm2vb0gcy9jm8rf6rcxbv1";
+          rev = "485438c466464fd4fe0c4b3305cd3110455f0f05";
+          sha256 = "1rj5vcb5f2xs5wvb3z5wd4866cjdzn8lmkbk6xflqq9wrakzl1kh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension";
@@ -44295,12 +44358,12 @@
     multiple-cursors = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multiple-cursors";
-        version = "20161021.1431";
+        version = "20170215.552";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "632768113df76ac9d688fef5530f567716419dd6";
-          sha256 = "19x0czlk51v5vd1rs8ny8f5zap3mxwbjmjg1g4flmvc0glwd05qd";
+          rev = "ddbe3ae932b6564c7429c3b2507510093ed1f3aa";
+          sha256 = "0icaz5md2jydsp8w9fdgxj7689g8v6yq123yi7bp17g6lfnw4v7y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors";
@@ -44586,12 +44649,12 @@
     mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mysql-to-org";
-        version = "20161119.1256";
+        version = "20170205.1306";
         src = fetchFromGitHub {
           owner = "mallt";
           repo = "mysql-to-org-mode";
-          rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc";
-          sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz";
+          rev = "d87e9b6117fc0db4b156e8a12550cf9ee4bd692a";
+          sha256 = "10wz20842j6yj4k9kg7pd93pzppsc31klbfzlvlkfywqv6j311cz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org";
@@ -44856,12 +44919,12 @@
     nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nand2tetris";
-        version = "20161109.1637";
+        version = "20170214.2248";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50";
-          sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb";
+          rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee";
+          sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
@@ -44881,8 +44944,8 @@
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "e1be652b7d46e653a85c564ed917b5b75ab4bc50";
-          sha256 = "1xnb5y1ddy4s7kia6zfzd8s5q9m2zfd72344qizywla86rqk7lpb";
+          rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee";
+          sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
@@ -45528,8 +45591,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "62ff5ad424547630e70f35406da85fbb5ec3445a";
-          sha256 = "1xcx70km6zb8qmnjb2fsk66qmx2lpqv94rfp34a0bpn98an7akwc";
+          rev = "5789b692d4b0a74f5804a1dfdb4b1f429ab877ea";
+          sha256 = "1ri76jwvnh533ylnqh96dhqcpinj2r90b9vysyzm62ppzny7lkxp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -45689,6 +45752,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nocomments-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nocomments-mode";
+        version = "20170213.1237";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "nocomments-mode";
+          rev = "5a41a20cc44dfe4a9ea584354ed6dbc15dd92f46";
+          sha256 = "0jwwnypa0lx812p3dqqn9c05g27qavnvr23pzphydx9i15nz80g0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d88074771b581d21f48b707f93949f7224a28633/recipes/nocomments-mode";
+          sha256 = "1qhalhs29fb3kv5ckk8ny9fbqn2c4r4lwnc566j3bb1caqf2j7g0";
+          name = "nocomments-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/nocomments-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     noctilux-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "noctilux-theme";
@@ -45797,8 +45881,8 @@
         version = "20170127.1808";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "08343d3da03a11e7a575981fac20ab10426f19be";
-          sha256 = "0bbfp7mgcp48qvcxwznncaskihxxf99j8mhsiqww4ll1pfpi1w3q";
+          rev = "0e037c34dd4b7eb9be96e62e0ee18260291de1b2";
+          sha256 = "1vafbkmyk7gf7jnk70nypah1y2r0x43v9ki00bxdg51rh61fyhqx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -46039,6 +46123,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nv-delete-back = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nv-delete-back";
+        version = "20170213.1355";
+        src = fetchFromGitHub {
+          owner = "nivaca";
+          repo = "nv-delete-back";
+          rev = "a977d0446a94aed12f7d01abe339fe01d55085cf";
+          sha256 = "1jfliyrp8wl9xz76lfpqgpcgxfhvf6cbrp2hf7ry5mk6iqwwnmd2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a7bdc83e14be56f5848d3066686f5d24c2ed4a3c/recipes/nv-delete-back";
+          sha256 = "0gq119zqcpckm0d6w08mphrssgbvxvschl7xn5y4vdn880vfm7q1";
+          name = "nv-delete-back";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nv-delete-back";
+          license = lib.licenses.free;
+        };
+      }) {};
     nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "nvm";
@@ -46335,12 +46440,12 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20161208.222";
+        version = "20170218.503";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "9155a413e41d918042e9839399e3940aa0f8499c";
-          sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k";
+          rev = "f5c12bc3447baed9bfb03a627dadace975969b7f";
+          sha256 = "1qzb2h4acmbljixnky3sksd1sjfnpcknf4z6zjm89lz8nrjldx5a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -46647,6 +46752,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-sql-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-sql-mode";
+        version = "20170213.1056";
+        src = fetchFromGitHub {
+          owner = "nikclayton";
+          repo = "ob-sql-mode";
+          rev = "778232af7c87b6a32ecb3668a9e5a2763d6a4830";
+          sha256 = "04npsn7awdp1n7fgwidaza58mjbmm3jsv2d992h2vzslfcyx2hnl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/892f629420f5e9e312e46b2022f45244ead39156/recipes/ob-sql-mode";
+          sha256 = "1yrm0v0msy9d51w0b08bg3042cdrp4s78x41iwni4czmf6w3hpih";
+          name = "ob-sql-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-sql-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ob-swift";
@@ -47175,12 +47301,12 @@
     omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "omnisharp";
-        version = "20160920.2343";
+        version = "20170216.754";
         src = fetchFromGitHub {
           owner = "OmniSharp";
           repo = "omnisharp-emacs";
-          rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165";
-          sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb";
+          rev = "d6a00ff463f53f7357fd7ffbad95accdc8d1c367";
+          sha256 = "0zq0rn1vbwmhr4z5dcgd5k9kslq3xxl05jiyab8835nfacb0zdf2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp";
@@ -47641,12 +47767,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170207.634";
+        version = "20170214.734";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "7f07d1bb5758a28f7e1618a14281ad4da71c26e2";
-          sha256 = "18ngnd4fkh59az0mj4lgvp5zil56qxn01d9aif6n6xszfcbgsnj1";
+          rev = "3854459ba0356be7385cfc707eb33fab7d1baf41";
+          sha256 = "1k30djkyah6qpkb09a9pid091agkvq97vf5idscjjxxpdjyglcj6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -47939,8 +48065,8 @@
         src = fetchFromGitHub {
           owner = "omouse";
           repo = "org-doing";
-          rev = "4819e75c827c2115bd28f3b3148d846aa64ccd9b";
-          sha256 = "0pb7ljysh8ap572f9y813js6lvvac4kjky2a5r39hv28px33hmx5";
+          rev = "07ddbfc238cba31e4990c9b52e9a2757b39111da";
+          sha256 = "1d9gf6wf3jp07bn2h6bbc75iy0wwdvzdlj9n4nwbc46nf3k154pa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing";
@@ -48378,8 +48504,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "2e3270984332013b8df22d2995bdeba256534a63";
-          sha256 = "1ixr16v2gfg5gyj42gic6kipqa3c8vv6iq1qdj9gj0ky6zlyy9wg";
+          rev = "f5722944575dc83b1e12c730b2887c584fd523d7";
+          sha256 = "16sdfzlk522yiz45brnk7kzkrnp4b9cwknl7q4nhpa5awz22ny15";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48398,8 +48524,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "2e3270984332013b8df22d2995bdeba256534a63";
-          sha256 = "1ixr16v2gfg5gyj42gic6kipqa3c8vv6iq1qdj9gj0ky6zlyy9wg";
+          rev = "f5722944575dc83b1e12c730b2887c584fd523d7";
+          sha256 = "16sdfzlk522yiz45brnk7kzkrnp4b9cwknl7q4nhpa5awz22ny15";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48412,22 +48538,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-mime";
-        version = "20170205.149";
+        version = "20170218.501";
         src = fetchFromGitHub {
           owner = "org-mime";
           repo = "org-mime";
-          rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8";
-          sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn";
+          rev = "d540da37df26c673b83cc9aab36f2ca6cfed3481";
+          sha256 = "0fcq75cjvd0fh7ic0j28ly40i95clgn5i7j1sj5infycqkrj87xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime";
           sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6";
           name = "org-mime";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/org-mime";
           license = lib.licenses.free;
@@ -48785,12 +48911,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170209.623";
+        version = "20170217.1354";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "2d9c53509e6930d8857ac74ef710637b7c34d77c";
-          sha256 = "1ja8b60w5snnkks94qb63fy6rscwcpkx3anaq6z9fdv78yjbx1x1";
+          rev = "6a13b566b1272773921b76bc6142fb2cf243bc7e";
+          sha256 = "1n125f2r3g5lkypk02cz5mfyhywlm8q5cnlh4h2rs5vdx39kpji8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -48939,6 +49065,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-table-sticky-header";
+        version = "20170216.2216";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "org-table-sticky-header";
+          rev = "a47f67927cdd66a0bd44bd45d41bd74c97c5d873";
+          sha256 = "1wxqlccbfywik5fj79clv781g41aialpi3xwbibx8m6p4h51rlrl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
+          sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m";
+          name = "org-table-sticky-header";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-table-sticky-header";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-tfl";
@@ -49184,8 +49331,8 @@
         src = fetchFromGitHub {
           owner = "myuhe";
           repo = "org-wunderlist.el";
-          rev = "b89633fcfd74e83dd8a5d81619244a666a45715c";
-          sha256 = "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa";
+          rev = "f7f1ca73661356b9fa072efd73431592ff1182e1";
+          sha256 = "169wzfjc9bbk2ydgq1zghrwkfp2fjwsrnwsw86npslj4c4bz41mm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44019e5d9e3d0f3e2cf76fa5828e1f953fd5e60b/recipes/org-wunderlist";
@@ -49222,12 +49369,12 @@
     org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org2elcomment";
-        version = "20161014.2125";
+        version = "20170216.1455";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org2elcomment";
-          rev = "be67394b675f226b50a1ede46ef9d621d9534c6b";
-          sha256 = "1n3fa06nbk7f50cy1c65zfyix46067wxllin16ryi649rx5qklwl";
+          rev = "c97c8934c8df20873ce1bc7023740b69beeb2d30";
+          sha256 = "1995w31na7g4agyknbm9jgxzs4mwbz0mli43cj8aqlbnq5py31hg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment";
@@ -49919,8 +50066,8 @@
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "ox-gfm";
-          rev = "0741216c637946a243b6c3b97fe6906486c17068";
-          sha256 = "1d1341k9kd44wm8wg2h20mgsn7n0bbsivamakn7daxsazym2h89f";
+          rev = "cd01aa0970e8836718731cb096a2c4c030423bd6";
+          sha256 = "1n825l86738qkqgmnhg84z52vp4csvr1ql2i1n1nc1pvyykb9kva";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
@@ -50167,12 +50314,12 @@
     ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-rst";
-        version = "20161227.1109";
+        version = "20170219.2052";
         src = fetchFromGitHub {
           owner = "masayuko";
           repo = "ox-rst";
-          rev = "7b6095c53211978c73e1d686cd2d672cf28eb4c3";
-          sha256 = "05fb1xflv82600lzlm3icf4vvcfiyh8lmcp0f4w8xybkp0f4kdpc";
+          rev = "c5f300cf020e6bdd654e304e0388a0c63d4b8ea1";
+          sha256 = "1cdlqk0sbj8pa24dqxwg5kgjrghq4f7dma8d0mk33cfaxaq7jvxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst";
@@ -50398,12 +50545,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170203.429";
+        version = "20170219.2318";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "77bb3161c99949949426a544444b27eeb8b3ea2f";
-          sha256 = "0kvb46n9578xs1nx1y5p21akia9i1jycj58zyy0zq9iqj82lbb8d";
+          rev = "9f8f808244f00666d335810757b2f366309a4d53";
+          sha256 = "1af8izvx5fqk0w71yyg9hqxmj7cxqnrrnsc7h4zdjakimdss6rhw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -50981,12 +51128,12 @@
     parsec = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsec";
-        version = "20161027.1726";
+        version = "20170219.1442";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "parsec.el";
-          rev = "21f5a117a054d1d21af51b0d92e7fa40b056a7e9";
-          sha256 = "1fmsaf4fgg9nkwbrjafvfgsscgspggxbrbg32kpc2db5lcmi6h7y";
+          rev = "45046868fb2d5f3c914f2e3b67fbe15033c93532";
+          sha256 = "07brvf6wcnvwz3y29gxk2yckgcg59898s1dhr3jfsnsq0nxam2ix";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec";
@@ -52007,12 +52154,12 @@
     phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "phi-autopair";
-        version = "20150527.223";
+        version = "20170216.1953";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "phi-autopair";
-          rev = "ec4e02f3b1602a6450ece118c79d4beb2430ff08";
-          sha256 = "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5";
+          rev = "3c7556779c3a53b045f5df33ae2a0c67469cbf60";
+          sha256 = "16gh2r1mhmirbq20kklym4l60rfcfn8dsj0vv3hx3fj8q81h8qc9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f26b586c0126699f3de65bf38dfbf9c4c0149c15/recipes/phi-autopair";
@@ -52028,12 +52175,12 @@
     phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phi-grep";
-        version = "20170206.2055";
+        version = "20170220.103";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "phi-grep";
-          rev = "efccc26f3beb6a3d8c1b655c31aa3c457115cfa4";
-          sha256 = "0r67zzc6b2f330zixywxcy4xxd9hxww7x77brrs242bcgi2d7ryc";
+          rev = "e0cdb6d6b8502f9cb4db2d5536d8b32a3be9ebc5";
+          sha256 = "12y7jhhqg16sqm063zbz8hjlh1hggjl627qqigqnslxbgsghk97n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep";
@@ -52301,12 +52448,12 @@
     php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-plus--mode";
-        version = "20121129.1252";
+        version = "20170215.657";
         src = fetchFromGitHub {
           owner = "echosa";
           repo = "phpplus-mode";
-          rev = "36efff84dd1303eeef5fc116eff0ac89a0248c74";
-          sha256 = "1aw3sp3wa58m7csml2cfys8s8d0x1m9bkqvxqqxz52iyf8ji0cz3";
+          rev = "963eb19c06a7237879ae7b7a111c83abcfe9ca36";
+          sha256 = "06ffbw66zw5ssavgbllcb9a0syi5asy6wq8yqxdyw66nj941kjbr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f10631b740eea56e7209d7e84f0da8613274ef1d/recipes/php+-mode";
@@ -52445,6 +52592,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "picpocket";
+        version = "20170219.420";
+        src = fetchFromGitHub {
+          owner = "johanclaesson";
+          repo = "picpocket";
+          rev = "e483b1a5661871bcd9dfffbf24fe388db82e839d";
+          sha256 = "1l9wxhs459ygmm40g8w2wpy6yyv4kkbmc20saf0gl7fkf14vgmf5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
+          sha256 = "0p2mrjcd8ig0h7dk0zvyfma4nnfk2ic6gp2dwfqyqq6irb010f45";
+          name = "picpocket";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/picpocket";
+          license = lib.licenses.free;
+        };
+      }) {};
     pig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pig-mode";
@@ -52991,8 +53159,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "b631191323cd789137c14a3e00ea2d355c2fbbdc";
-          sha256 = "1qgsdawr0b05h8xdc8mw2rkzs6y66rl2cqmva9k82f7776d3x02w";
+          rev = "e5a008ae54ffa54a5343632f88f10ba2e63c4595";
+          sha256 = "0fvr0bybqyaix3qcbaj06r61gw69wff63vgsflkc36a92pj971b1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -53131,12 +53299,12 @@
     polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "polymode";
-        version = "20161218.1326";
+        version = "20170216.615";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "polymode";
-          rev = "a29b8a07cc9081bd75114d68fc7afdcef2e5bc94";
-          sha256 = "1vsvnia8px35ip13zc94l7nh4201z6z15dzrhfcj6bd0jnbqpxh6";
+          rev = "f72ab719c054ad2a46d175c77ad893bb6f476e36";
+          sha256 = "1pkhp3b1fv7zvsq8qnf06czyv3ax95kni7k6zjgnrwrvm3ks8fsn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode";
@@ -53471,8 +53639,8 @@
         src = fetchFromGitHub {
           owner = "yukihr";
           repo = "emacs-pow";
-          rev = "7c0b39a07069d8b0f6b21adf3b4e462944641ad9";
-          sha256 = "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf";
+          rev = "ea83986b8ca8e27cb996290d6463b111ec0966ce";
+          sha256 = "112s6qb80sn44b1cxggqfci89wymxvvwkwl7nknfnr2dzd58lzzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/795b8723e105a22c729ef77377a85c63ee0a2a1f/recipes/pow";
@@ -54316,12 +54484,12 @@
     promise = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "promise";
-        version = "20170213.426";
+        version = "20170215.2204";
         src = fetchFromGitHub {
           owner = "chuntaro";
           repo = "emacs-promise";
-          rev = "f109b089a387af081c1dfceb29aea14864f31bbf";
-          sha256 = "1g9f7vbbxk1qrbr8bcza1f93a9h4inh7qlqmizpygil0s17ng1kk";
+          rev = "7adac1f8e87d69b3d328add8db396f73254a4303";
+          sha256 = "0xaa54plzlr894j3bp78c9nf8fqwgjscvdrrirh581ff772gx26z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise";
@@ -54446,8 +54614,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "d2dfe46b2789dfe155559508c3f567a746a50616";
-          sha256 = "0sywn6b6m2vbdkv4vycrhlg1l3hjmcpvbps0v35wqk1ll1l66rqh";
+          rev = "a9ab38c17178fcedd9b46c09fa33f94d1a6335c3";
+          sha256 = "0rhwxpbb328ivndnck5dcgwi8g4a8lrdvbsc4vcjhxc2yrfm93q8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -55189,8 +55357,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "62361d10f5dc5fa751038745d23e06b5a9c5bc56";
-          sha256 = "1sa4vqpqmgf0pagn2y72vvfki7jgqrnaigwfxnhjwfi6x3diz2fh";
+          rev = "0d3b4a72b585b34cc12cb95eaf62ca3d13173a9e";
+          sha256 = "1nrz534rb8lkrb1ch7804i8r0gxrjbwim90j7pzsinqfl21xg5p2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -55332,12 +55500,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170211.1101";
+        version = "20170219.809";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "eb03f0172efe5c368a830a8b9ca15366feaf083d";
-          sha256 = "0pjq4a7gkzysmhwr1i3bzfnqi33899j1l13n1ij6a4bdy8km0hm4";
+          rev = "52024dfb55354b3cc59f7115421bc130a7670c2d";
+          sha256 = "1v0qd7935nlxz7y9175xz8ygx1m6snd0nhgfs2k0bkfyv14ps5bg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -55710,12 +55878,12 @@
     racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20170106.1524";
+        version = "20170218.516";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "d83091ff6b55b4663fed49de63ec2c751cdb2603";
-          sha256 = "1fj2zq9cjlnf45z1xqcfir3y739jpiv08sqlgv807i6dgbr0vxls";
+          rev = "40f99f69b46edbf0855c92d908c11e29bf2e817c";
+          sha256 = "18gf9fzn30190mgdgijzqxyh11q1kmx94fixs6c7gv927i8j7whm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer";
@@ -55815,12 +55983,12 @@
     railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "railscasts-reloaded-theme";
-        version = "20170124.1912";
+        version = "20170214.116";
         src = fetchFromGitHub {
           owner = "thegeorgeous";
           repo = "railscasts-reloaded-theme";
-          rev = "318c9a812d53884da1a9d67206fcfd9ded4d320f";
-          sha256 = "1al62r2fys6z1ja8zbh6yskprp1iq03l2jbnwbx8i3gd2w0ib7qk";
+          rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2";
+          sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -56403,12 +56571,12 @@
     realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20170128.727";
+        version = "20170218.740";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "df6921b587f2e14876ee7bf106b5c1fad81da2dc";
-          sha256 = "1sssq5q89qn4jcsl6hmmbq008b23hpaa7jga88wlc867dd5f66d8";
+          rev = "f7012d43f55957256ca81612c2ab5ae496b5a9da";
+          sha256 = "0irhzy52vyg7363m0z3d0m9pymzdjwspaffi1j5ahi0lma18c438";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -56514,12 +56682,12 @@
     rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rebecca-theme";
-        version = "20161227.2131";
+        version = "20170220.1342";
         src = fetchFromGitHub {
           owner = "vic";
           repo = "rebecca-theme";
-          rev = "ae1463a7118f5e50ca82267824c86a77e35e9697";
-          sha256 = "1k6f90kjsx1mjihy6l7h7f1ld66g0qxkzbbq203010fjdlsmlhk6";
+          rev = "c42e33227a18258145156e69627b713b303ee702";
+          sha256 = "0nkf3jf8x95ybw29gwkivfc3pnaiga7awz2mpyjm5bnz4i335mkm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme";
@@ -56784,8 +56952,8 @@
         src = fetchFromGitHub {
           owner = "ferfebles";
           repo = "redtick";
-          rev = "618255aa1100948af29d76d54aca7554fd66aede";
-          sha256 = "0zbx9g91xrh7ppaa8lq9mh1ax6k9yv3xsyjiyan9zsji3qzh59qv";
+          rev = "e6d2e9b69ec666f460f9158dd31cdf035eeb1080";
+          sha256 = "03l36ik7a4a7ibgxh22hk8p43wkj6nb5x8mmlyjhh4phzc9i0kav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3187bd436541e2a5c2b28de67c62f5d5165af737/recipes/redtick";
@@ -56822,12 +56990,12 @@
     refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "refine";
-        version = "20161205.549";
+        version = "20170219.807";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refine";
-          rev = "3609642fc83f344783e7c8229edb529264ca1eea";
-          sha256 = "01qc7qsyhcm3i0ix4zhzwiq770mf2z0831gz1ybjaa6f5lwqslx5";
+          rev = "9ac5ccaab861968ff54ce4a89efeb29ea3e4fae9";
+          sha256 = "1jqm4dmyzcknzpn6i00wgv1f7fa6acxg4b5vp6hzp8za8i9fzc6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -57326,8 +57494,8 @@
         src = fetchFromGitHub {
           owner = "dpsutton";
           repo = "resize-window";
-          rev = "27364959798de0f019da799975027842c07e7829";
-          sha256 = "0x92s4cv9k566rc248zrcmh507df7d19p7b3vcfd0dlfpbqc0qnv";
+          rev = "194805787694194cf713ff15ee52a78c8da2d1fa";
+          sha256 = "1g2vyi53sna5416q1sgc74yaw8vpqwwhxas4r5xcp8qyxxk5zspy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/601a8d8f9046db6c4d50af983a11fa2501304028/recipes/resize-window";
@@ -57992,7 +58160,7 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "4e4f6c01cda75dde0cba313751897c3b8c67b014";
+          rev = "37eef2838ea78b7e457e7236af93cd1581a63492";
           sha256 = "097niszwri76g5sbwh4hnsv27wk1nfqd7gpx974rh1bwfk735jxg";
         };
         recipeFile = fetchurl {
@@ -58054,7 +58222,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57624";
+          rev = "57668";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58134,7 +58302,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57624";
+          rev = "57668";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58445,12 +58613,12 @@
     ryo-modal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ryo-modal";
-        version = "20161007.1633";
+        version = "20170217.1021";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "ryo-modal";
-          rev = "83de15288751ca985a668a9f57a113cb107a6229";
-          sha256 = "1631lsqwvgy7zbgdrfyfbhsa0n7qp28m8h5ima7siy5f9clfdvlz";
+          rev = "f6073b56c43a8bc4fc01eb27faba3335d556606a";
+          sha256 = "1pq8c79qrs2zwp8q89rhm5lmcpl48axnc9mwl10gq4jy2rlzfrks";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a4d9f86140b0ee95742c3a66dfbc063b5f87fb3a/recipes/ryo-modal";
@@ -58529,12 +58697,12 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20170113.631";
+        version = "20170218.1829";
         src = fetchFromGitHub {
           owner = "sagemath";
           repo = "sage-shell-mode";
-          rev = "80f2f7b06e48c2a771411c39f7d0067c9d145050";
-          sha256 = "0ljd2v60f9i5pkqw2j8yylv1ya994hymrblx8dks38mx9br8m7b0";
+          rev = "c10f969e06deb0cb1471ebaa4c9bef8e3aeed39c";
+          sha256 = "05g6pd125bjh4494fm65iyxjc1nn3a21amdf8cbzcyjakywajjwa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode";
@@ -58676,12 +58844,12 @@
     save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "save-visited-files";
-        version = "20151021.1043";
+        version = "20170215.1537";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "save-visited-files";
-          rev = "35f8055a3eb0614721b5b755a3902ba008a4d6fa";
-          sha256 = "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm";
+          rev = "fd5f53256a81e57f438f37a6088862d7555a8aaa";
+          sha256 = "0vf1b3x7s4w0szvf9vkgj9dqivfvzgx3pwznvd9s1n7fxk70ghsn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f5979e2c2dbfc4e8e3b4d2881cf860c26f63db5/recipes/save-visited-files";
@@ -58760,12 +58928,12 @@
     scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scad-mode";
-        version = "20160205.1043";
+        version = "20170219.2003";
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "e990ac49eb449bb8b1befcf0fd021c901f687ac5";
-          sha256 = "068m6lny2xf2i7bm2hxqn1dcjxgs4g8pkd730x0shvvn3yc5jqql";
+          rev = "56d73a422a61dae4bb18fc0c89b53647cfe90e81";
+          sha256 = "1f8labhw1a224hmh71b1lv0i2m6ynga4lqwali83a0214hnksyh7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -59361,12 +59529,12 @@
     seeing-is-believing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "seeing-is-believing";
-        version = "20160602.718";
+        version = "20170214.520";
         src = fetchFromGitHub {
           owner = "jcinnamond";
           repo = "seeing-is-believing";
-          rev = "6f123ad897dcca40652ef682b298881fc25d8ddf";
-          sha256 = "1anxxx0wm8rwqbxwllk7dwsnnjw19pwrp3x16r5m3y4ccxzpdr3f";
+          rev = "fbbe246c0fda87bb26227bb826eebadb418a220f";
+          sha256 = "1h1b48s2iirswdlvfz41jbflm4x09ksc2lycrc1awzlwd6r8hdhg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14bb6de5c051a68284ee1a7e25ecb2c7c19ffd3b/recipes/seeing-is-believing";
@@ -59445,12 +59613,12 @@
     selected = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selected";
-        version = "20160428.37";
+        version = "20170217.1106";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "selected.el";
-          rev = "4603f703c0460bcc0b56884ff704848038ecec37";
-          sha256 = "0qc2lyzmvcgld6vnlnp6a01cw0268c4hs2y7lwzaah2c8cps6n6h";
+          rev = "478dc7a8b04819f9a7ba809b3ee6080450e32bb4";
+          sha256 = "0xr7vgm7yr86vrx75z4q3az7npn8n5ar4wr5w27m8cij0mvaw831";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/selected";
@@ -59466,12 +59634,12 @@
     selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selectric-mode";
-        version = "20170211.1108";
+        version = "20170216.311";
         src = fetchFromGitHub {
           owner = "rbanffy";
           repo = "selectric-mode";
-          rev = "e60703d9a6c9944270d77bc829dae3a8b092346f";
-          sha256 = "04i5rrn93hzcf8zzfli2ams927lm83hl4q6w2azcg24lhldaqf8p";
+          rev = "a35cb3815caceaf273ad7d16ac3b2dd3c7a3003e";
+          sha256 = "04bj71080wqybznyx63dawhppq6x3p88x1j56gvl8kvxv2hwzgzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode";
@@ -60731,8 +60899,8 @@
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "skeletor.el";
-          rev = "8dffccd773d6c8e73ea3d9c1de689634cbf427d4";
-          sha256 = "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq";
+          rev = "78df0da39bdf0d3e78f8d672a3486c02baa9dbd0";
+          sha256 = "1sabk2ly80k67hwypm5g292n3c4hjlcmvc61n3ixlkm4nq8dp6sy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e63aefc869900c2af6f958dc138f9c72c63e2b8/recipes/skeletor";
@@ -60853,12 +61021,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170209.1932";
+        version = "20170218.2336";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "97ed24213df302b5848b57b0e9a17a3af40cee32";
-          sha256 = "1pj8zl7nk31mr94izpqhhan7fav0n7k37yipwphs6f1sbxdi8h3l";
+          rev = "0927080970374a1f8591fa412ae2b3201f5a7d18";
+          sha256 = "0zcchsanjggdlczl9wrq6lb809rsx0iwlnb5qn3aplp7178imrxb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -61588,8 +61756,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "7647f790e005b0e3e18edcf54e425d01a30ae3b4";
-          sha256 = "1s0kz75m3hazgdhqi7a28v6qzxy2sbmlxlpqyix6874gvkfcwchz";
+          rev = "290ce9f63b9fa07e1a7514ccb9abb6aaf98ab045";
+          sha256 = "02cchakanr8zlvahdrrgm9rnqa49wqfvc4g90g7nwwqifdhr5njs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -62472,12 +62640,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170127.457";
+        version = "20170217.1753";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "863e447f1b37d40c74b836b5132033430c6e8a7b";
-          sha256 = "14jcw75jvrqarg04bdk28c5bi0456d5xi4xyy53wd7knkm2zval5";
+          rev = "dbe5eb19a1b3267b87b59f7082b3a618df6024f2";
+          sha256 = "03cgx82kpdl0g193wi38gb5k6y28dllrz6wln910555s3rymym29";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -62850,8 +63018,8 @@
         src = fetchFromGitLab {
           owner = "iankelling";
           repo = "spray";
-          rev = "8e6385f2f09b8d72a480b6cbe211344be646005e";
-          sha256 = "0sc5ygv0qxvral16gv1908jh2dvmlpx8lfc9b0cmbihhxpg1j305";
+          rev = "df326991acb2bd64af373bcf09816df9c6424d0d";
+          sha256 = "1jk7qyj7yvbcs9m977fi73ypgp9bgsckgrqcf95wsfcfviajf8z4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4f5053aa4e1af3f636febe9c3ce8c6ae20c090d/recipes/spray";
@@ -63302,12 +63470,12 @@
     standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "standoff-mode";
-        version = "20150628.1642";
+        version = "20170214.1713";
         src = fetchFromGitHub {
           owner = "lueck";
           repo = "standoff-mode";
-          rev = "a1ad5b3823bf43242dfc54cfd8cd1b09bee286d8";
-          sha256 = "1bakh0rwq0kxy6k6yjrywbcvj0hszq44z9v1gny2cf824shqa3r9";
+          rev = "a1bea7231a6d25fc05f88c9af588538fea664caa";
+          sha256 = "0cxnph1n1f77xhdafl5glmgqysg89k4lk2fy8384gbyhamfj95v4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode";
@@ -64109,8 +64277,8 @@
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "suomalainen-kalenteri";
-          rev = "b7991cb35624ebc04a89bbe759d40f186c9c097e";
-          sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
+          rev = "f5907236ce4da372325fce8b3ce429defa5b0f5a";
+          sha256 = "1f16ds671mp8jwkkhvpbdqkk3jji96q9ipjlr8ij9vglp2arvslg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/181adf1b16253481674663fd28b195172231b7da/recipes/suomalainen-kalenteri";
@@ -64375,12 +64543,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170213.1002";
+        version = "20170217.57";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "5f732cdce5ac2529f36b5c8cc9f053789783de45";
-          sha256 = "1ha7filrnkdya4905yy002n1hjdl23k9hbb2w2id3wfj0cbw930f";
+          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
+          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -64959,12 +65127,12 @@
     tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tablist";
-        version = "20160424.235";
+        version = "20170219.1935";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "tablist";
-          rev = "f13b8f048d0bde14bcf4ee4c9006fcd875b28783";
-          sha256 = "013gkl672vmrji03wd74azcq390lgcr71i5c5qbs0p1v4rcbvqd2";
+          rev = "c834a84efb6efa32497efe1e73160fade741b836";
+          sha256 = "0nkrndgg0zrqxb7hilqbrywi8n1lcf3jxjjp1hfn5f0arxy64pcv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5fc0c6c02d609fb22710560337bd577f4b1e0c8f/recipes/tablist";
@@ -65063,12 +65231,12 @@
     tango-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tango-plus-theme";
-        version = "20161016.322";
+        version = "20170214.908";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "tango-plus-theme";
-          rev = "ef8510d75c60459a7c3bce8aaf686280faf71663";
-          sha256 = "0k7mmffr73i14brh7zf0bdzw0m8g3ljff8q4vi5fnxzrr4k99z8l";
+          rev = "8ba8901397e3e9f1d53110487bfa0effc65015e7";
+          sha256 = "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b069fa60d3bbf41168b938f71f4903e313b2c6ac/recipes/tango-plus-theme";
@@ -65550,8 +65718,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "db13aac6c89c48410d674bcddaf23716b77d0c16";
-          sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk";
+          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
+          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -65571,8 +65739,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "db13aac6c89c48410d674bcddaf23716b77d0c16";
-          sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk";
+          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
+          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -66043,8 +66211,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "0a660ee285e4a4cbac8f702168c40fd4ef5495d1";
-          sha256 = "19cn5kkj9jmjghb54l64wpvbcn355ixfzdp7rqrxcy2gcxwcc95a";
+          rev = "bc0082e02357de2f30b997188bdfa94d703331f4";
+          sha256 = "02g4pl8vsrgzcc6p934lsq1qqxlmgck1dw387il17gwmbz467zb0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -66100,12 +66268,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170210.1932";
+        version = "20170220.157";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "8e2c78de6e7a0eb42853ba2dee3ffe5c81cff336";
-          sha256 = "0imdjxvvz9b1b1mlzdp5mildjz1s2m7zz3y383p1x6m8w4vzxln7";
+          rev = "35686d79a2603693d855a55c56f9486b8af89b20";
+          sha256 = "1srcrr9bzvngkp0hy5cbiv34gip55c3f4nzfi0l5l1jam96bczs8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -66933,12 +67101,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170201.426";
+        version = "20170216.457";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "462584da4677af833054e023bd630a2d9f10c692";
-          sha256 = "1i8k6jiwzrsamc887mdmzipbr7vshv4mfa9sgzzsmq521diaigk7";
+          rev = "133a3b8b6bc61927183b775b8a8209b9abc794ef";
+          sha256 = "1wgydsqy4p1y6kfs53a06ardabd4fxrdzqxwqimyslv7sqz0y3kc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -67223,8 +67391,8 @@
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "662f6af94c3273f2dab04b9c7485dfe627812c95";
-          sha256 = "06iigh6kia60r4i3d414z594s3xab20z73q1l0z2fkb0613wznbg";
+          rev = "0148e6d3c780e3914a5732fdd0201100394a2dbf";
+          sha256 = "1wmfnjkmxf0z7hadzgmv1s3fpk49rc9h1vxkj2c8s2xpz8ymck42";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -67675,12 +67843,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170209.24";
+        version = "20170220.116";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "2b54793859c0569b0e201f5c32cb796097250393";
-          sha256 = "07c25f129948j52vfy42fzfhpd9dvq2568iclnbhzn9jpiz8m9d8";
+          rev = "b8a3c13978ba6d0043b263f8efe829bb87145e25";
+          sha256 = "16v6m9q1hw7wkp9si43h4chjabygqpx90ds45lq9k0r3lx9vsmd6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68060,12 +68228,12 @@
     unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "unify-opening";
-        version = "20151116.1648";
+        version = "20170215.657";
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "unify-opening";
-          rev = "2812e43029cab7183197ce5e3c9577856bfd22c5";
-          sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
+          rev = "2f0164328b9234c9083758349103be873cb65af8";
+          sha256 = "0d7advfxfnx0v2y292fq4ynqm7ial6p0x7mh28l511b8b4qgpjgv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0a2faab13744262ef4d12750f70b300b3afd2835/recipes/unify-opening";
@@ -68246,12 +68414,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170213.1353";
+        version = "20170218.132";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "6c2d81cfadb12c10af0dabe148ede355737ed1a8";
-          sha256 = "18aqyphq1cwandfarql773d0h3ki6c9ip1wji1ni86fm29f99ikq";
+          rev = "53bf803f1d3efc61653f94fe56ff30a72304861e";
+          sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -69584,8 +69752,8 @@
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "wcheck-mode";
-          rev = "57c41b2f98aabc4fda375df26254a8ae097fe814";
-          sha256 = "1yfqvyz76v3ir0fcvmw7f55llmmdpn2n0wij82anxx5sqmjjp8df";
+          rev = "d56345a1ec910a7d95103a441536cfba10ec9672";
+          sha256 = "1vdw9519rqqc3gidrlqpal01vllryi5ljzlrx2aayf8rf98lg6dy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d10b59f568fdedf248c2e8eaa06c4a74032ca56/recipes/wcheck-mode";
@@ -69685,12 +69853,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170211.1516";
+        version = "20170219.1202";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "c6d73fb48ee3c0911b7361cd556765c94742dee2";
-          sha256 = "0b9gcm0dlbp9v57pv9dkh08a8f5bacmjkyqkh0pr285gvsfi776i";
+          rev = "dafb6c0b4d6de9475ba2adfaa117157f881d880c";
+          sha256 = "0bh9z3kd3y7f78hdgnrzwgggmkw807a175xabx66pjacqwm9laia";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -70211,8 +70379,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-widget-mvc";
-          rev = "a3fd2d2abc29a1b53aeaae8b267d0718740fb783";
-          sha256 = "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz";
+          rev = "ef5648d7dd6dbb88ca946e42011fe8eccadb524e";
+          sha256 = "1wlybqs45firifk7w7yndh70wmsimdrw6pv7hyaciyy0ghidya3n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc";
@@ -70411,12 +70579,12 @@
     window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "window-layout";
-        version = "20150716.2207";
+        version = "20170214.1633";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-window-layout";
-          rev = "03ee615fc8fad5be4efec9c3febab8c851271257";
-          sha256 = "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg";
+          rev = "cd2e4f967b610c2bbef53182829e47250d027056";
+          sha256 = "0wgqi8r844lbx52fn6az8c1n8m681rp6dkfzd54wmdk1ka7zmvv6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3b17efdf8b7306eadf37e331fc1d585b42f37b09/recipes/window-layout";
@@ -70576,12 +70744,12 @@
     winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "winum";
-        version = "20170111.29";
+        version = "20170217.110";
         src = fetchFromGitHub {
           owner = "deb0ch";
           repo = "emacs-winum";
-          rev = "25fbb9524ac7cde601b07cecd81fd1446e571282";
-          sha256 = "1aibzgb9np9ik27jzaxg1gl1n15q1chxr5lhjvvpp05rr70ykll0";
+          rev = "3c28c0dd685ee71b073e6a336efe3bff21f65a9b";
+          sha256 = "0bxwhkshyxzq5f2jlsp6z97j2gdgz3a0hbp8bvjj71biywhn2m26";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum";
@@ -71559,22 +71727,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    xquery-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    xquery-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xquery-mode";
-        version = "20161218.1617";
+        version = "20170214.319";
         src = fetchFromGitHub {
           owner = "xquery-mode";
           repo = "xquery-mode";
-          rev = "58e947e2630223b89822c2c3e5883be4950ea2f5";
-          sha256 = "0zasfq8cgp42ac7ad041f7bn785y10359ayrd9h2wwyb34bw9wjd";
+          rev = "19e6f9553ce05380843582b879712de00679e4ab";
+          sha256 = "0q04p75qkcbij7cqvhwnfx2729f1v4si05xjv433v7f6dfxxkhhl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ea1c9e26963f290d912df21b81afd689543658/recipes/xquery-mode";
           sha256 = "13xrvygk7wdby6599q6yxw8cm45qqki8szrm49fc3b6pr6vzpidg";
           name = "xquery-mode";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/xquery-mode";
           license = lib.licenses.free;
@@ -71961,12 +72129,12 @@
     yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yankpad";
-        version = "20170124.1014";
+        version = "20170220.55";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "yankpad";
-          rev = "d2ea6920a2444f1ce6f53947640446b8e16f84b7";
-          sha256 = "1lw2d25rwszk35bi3gm3bg0cb30b8c2bf3p32b89shnsmwylw52m";
+          rev = "0f2af3671f5f3b879a2c9a3f521f1d4066889d58";
+          sha256 = "0qx98klmc40064si47s7ivvyx3vzki1skyjkxszi6gl8g5k0i1dl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad";
@@ -72105,12 +72273,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170212.832";
+        version = "20170216.1928";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "c87afe0901735d4421c712b25dfa69b2ac59c8e9";
-          sha256 = "0ssk3pgkq4bv74g8h0zbi38z3lb11cn4ylnfsa0gnn5jlyg0bccc";
+          rev = "cddb8260a0d89cc05577742f0f06938f2317de26";
+          sha256 = "1yrlzknbspkwysqalcbhfi0gfdk7mjknvzz60ijsyx14f26y8lds";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -72406,12 +72574,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20170103.2328";
+        version = "20170219.1611";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "554778b48ffa35b0ebfbed31a6dc249afa16ba24";
-          sha256 = "19zh9ifaqgf8d9lkxsgznd935p4yfhxcrdi583gp8m2vwa22kgrm";
+          rev = "310c270d164fdb740c6af41120d5841a54c895b4";
+          sha256 = "1b6q7aaafxn5vllgx4ihyylgns8ykr5j9p45xphpx62n70m3c6qr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -72838,21 +73006,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    zpresent = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
+    zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170205.2239";
+        version = "20170216.2206";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "b02b168a98c7";
-          sha256 = "0vkywpzlrpwasjnjksmsy7ab5vn1l3frb3ygvy0c98wds0g8dxgc";
+          rev = "50aeab07a53a";
+          sha256 = "1qzxmnvhl39a4vzbdb9a3rh1mzkxdckvd1b3960py9xcnba23ikn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
           sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j";
           name = "zpresent";
         };
-        packageRequires = [ emacs org-parser ];
+        packageRequires = [ dash emacs org-parser ];
         meta = {
           homepage = "https://melpa.org/#/zpresent";
           license = lib.licenses.free;

From 8c98c311d32ed38f3a7bc017edc0328298bd8c40 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 20 Feb 2017 20:46:33 -0300
Subject: [PATCH 0826/3449] nitrogen: 1.6.0 -> 1.6.1

---
 pkgs/tools/X11/nitrogen/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix
index 06a7630c7bc0..f53ab38672bd 100644
--- a/pkgs/tools/X11/nitrogen/default.nix
+++ b/pkgs/tools/X11/nitrogen/default.nix
@@ -1,23 +1,20 @@
 { stdenv, fetchurl, pkgconfig, glib, gtkmm2 }:
 
-let version = "1.6.0";
+let version = "1.6.1";
 in
 stdenv.mkDerivation rec {
   name = "nitrogen-${version}";
 
   src = fetchurl {
     url = "http://projects.l3ib.org/nitrogen/files/${name}.tar.gz";
-    sha256 = "1pil2qa3v7x56zh9xvba8v96abnf9qgglbsdlrlv0kfjlhzl4jhr";
+    sha256 = "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ glib gtkmm2 ];
 
-  NIX_CXXFLAGS_COMPILE = "-std=c++11";
-
   patchPhase = ''
-    substituteInPlace data/Makefile.in --replace /usr/share $out/share
     patchShebangs data/icon-theme-installer
   '';
 

From e6fd2284f52d88f45a35d957e7a511aa4ef7596b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 20 Feb 2017 20:37:38 -0300
Subject: [PATCH 0827/3449] albert: 0.8.11 -> 0.9.3

---
 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 b339d8aeb7b3..8e79c09c2ad1 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.8.11";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner  = "manuelschneid3r";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "12ag30l3dd05hg0d08ax4c8dvp24lgd677szkq445xzvvhggxr37";
+    sha256 = "026vcnx893wrggx0v07x66vc179mpil2p90lzb16n070qn3jb58n";
   };
 
   nativeBuildInputs = [ cmake makeQtWrapper ];

From 85fba54bc65ffcf93a2dbed2ececd97af1593ae9 Mon Sep 17 00:00:00 2001
From: David James <davidcjames+xpe@gmail.com>
Date: Sat, 18 Feb 2017 16:42:12 -0800
Subject: [PATCH 0828/3449] Attempt to update RocksDB to 5.1.2.

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 10d77c9988c8..25aeb3a6da1b 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "4.13";
+  version = "5.1.2";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "v${version}";
-    sha256 = "1bxyykj13mw48yk108bkmxlfrp6bd95f27bysayax4lqxkgx0zzw";
+    sha256 = "1smahz67gcd86nkdqaml78lci89dza131mlj5472r4sxjdxsx277";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 malloc fixDarwinDylibNames ];

From 8f325eeeebdd255f4dc84f63a415f8dba67fb0ed Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 20 Feb 2017 12:28:05 +0100
Subject: [PATCH 0829/3449] pythonPackages.robotframework-requests: init at
 0.4.6

---
 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 de8605ed987e..184f77478ec3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22785,6 +22785,24 @@ in {
     };
   };
 
+  robotframework-requests = buildPythonPackage rec {
+    version = "0.4.6";
+    name = "robotframework-requests-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/ad/da/51359b11d2005ff425984205677890fafaf270a71b03df22c255501bc99d/robotframework-requests-0.4.6.tar.gz";
+      sha256 = "0416rxg7g0pfg77akljnkass0xz0id26v4saag2q2h1fgwrm7n4q";
+    };
+
+    buildInputs = with self; [ unittest2 ];
+    propagatedBuildInputs = with self; [ robotframework lxml requests2 ];
+
+    meta = {
+      description = "Robot Framework keyword library wrapper around the HTTP client library requests";
+      homepage = https://github.com/bulkan/robotframework-requests;
+    };
+  };
+
   rootpy = buildPythonPackage rec {
     version = "0.8.3";
     name = "rootpy-${version}";

From 85fe839caf6a162d3d2215f372294eafb29d9f31 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 20 Feb 2017 14:47:16 +0100
Subject: [PATCH 0830/3449] pythonPackages.robotframework: 2.8.7 -> 3.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 184f77478ec3..9ab7ebb9cf54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22667,18 +22667,15 @@ in {
   };
 
   robotframework = buildPythonPackage rec {
-    version = "2.8.7";
+    version = "3.0.2";
     name = "robotframework-${version}";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/robotframework/${name}.tar.gz";
-      sha256 = "0mfd0s989j3jrpl8q0lb4wsjy1x280chfr9r74m2dyi9c7rxzc58";
+      sha256 = "1xqzxv00lxf9xi4vdxdsyd1bfmx18gi96vrnijpzj9w2aqrz4610";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     meta = {
       description = "Generic test automation framework";
       homepage = http://robotframework.org/;

From da33c8a19d97711d213789cf49c8b7c483beb18f Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Fri, 27 Jan 2017 22:01:21 +0000
Subject: [PATCH 0831/3449] systemd: Properly escape environment options.

Using toJSON on a string value works because the allowed JSON escape
sequences is almost a subset of the systemd allowed escape sequences.
The only exception is `\/` which JSON allows but systemd doesn't.
Luckily this sequence isn't required and toJSON don't produce it making
the result valid for systemd consumption.

Examples of things that this fixes are environment variables with double
quotes or newlines.
---
 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 904404e1e472..de5fb3edd67e 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -329,7 +329,7 @@ let
           ${let env = cfg.globalEnvironment // def.environment;
             in concatMapStrings (n:
               let s = optionalString (env."${n}" != null)
-                "Environment=\"${n}=${env.${n}}\"\n";
+                "Environment=${builtins.toJSON "${n}=${env.${n}}"}\n";
               in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)}
           ${if def.reloadIfChanged then ''
             X-ReloadIfChanged=true

From 2d78767973aa98861cd87f423eb2b54ea1eb1659 Mon Sep 17 00:00:00 2001
From: Paul Kinsky <pkinsky@gmail.com>
Date: Thu, 26 Jan 2017 15:13:45 -0800
Subject: [PATCH 0832/3449] Add tips for resolving https issues in containers

I ran into some issues making HTTPS requests from a container built with buildImage. I've added notes with tips for resolving similar issues.
---
 doc/functions.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/functions.xml b/doc/functions.xml
index 5c654ffb9562..602d419a1803 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -523,6 +523,17 @@
   It is possible to inspect the arguments with which an image was built
   using its <varname>buildArgs</varname> attribute.
   </para>
+	
+	
+  <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>.
+  </para>
+	
+  <para>
+  If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal>
+  you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>.
+  </para>
 
 </section>
 

From b14dd0e6c38d93693dcdec1a78cc86fd56eda650 Mon Sep 17 00:00:00 2001
From: Paul Kinsky <pkinsky@gmail.com>
Date: Thu, 26 Jan 2017 15:21:15 -0800
Subject: [PATCH 0833/3449] wrap added notes in <note>

---
 doc/functions.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index 602d419a1803..efe2590ddfb4 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -133,7 +133,7 @@
       <varname>stdenv.mkDerivation</varname>, are defined using this
       function, which means most packages in the nixpkgs expression,
       <varname>pkgs</varname>, have this function.
-    </para> 
+    </para>
 
     <para>
       Example usage:
@@ -228,7 +228,7 @@
     ] name)</code> from the <literal>INI</literal> generator. It gets the name
     of a section and returns a sanitized name. The default
     <literal>mkSectionName</literal> escapes <literal>[</literal> and
-    <literal>]</literal> with a backslash. 
+    <literal>]</literal> with a backslash.
   </para>
 
   <note><para>Nix store paths can be converted to strings by enclosing a
@@ -523,17 +523,22 @@
   It is possible to inspect the arguments with which an image was built
   using its <varname>buildArgs</varname> attribute.
   </para>
-	
-	
+
+
+
+  <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>.
   </para>
-	
+  </note>
+
+  <note>
   <para>
   If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal>
   you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>.
   </para>
+  </note>
 
 </section>
 

From ae8c267320d9ba23fec44ef26c17f1559c14cddb Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 20 Feb 2017 21:15:38 -0300
Subject: [PATCH 0834/3449] efivar: 27 -> 31

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

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index bdc33ef749c6..744e34a9c60a 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "efivar-${version}";
-  version = "27";
+  version = "31";
 
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efivar";
     rev = version;
-    sha256 = "1vz3hzs9k7bjg2r5bsw1irnfq77lmq9819sg9a7w6w528bvzr4lx";
+    sha256 = "0dhycikylm87jmds4ii5ygwq59g4sa5sv9mzryjzgqlgppw5arli";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3d963c3e8f8678fd3c86564389c80b70cbeb3fd5 Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Sun, 19 Feb 2017 16:58:18 -0800
Subject: [PATCH 0835/3449] herbstluftwm module: add configFile option

based on the equivalent for i3
---
 .../x11/window-managers/herbstluftwm.nix      | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/nixos/modules/services/x11/window-managers/herbstluftwm.nix
index 829935fa432b..e3ea61cb9a6b 100644
--- a/nixos/modules/services/x11/window-managers/herbstluftwm.nix
+++ b/nixos/modules/services/x11/window-managers/herbstluftwm.nix
@@ -8,15 +8,30 @@ in
 
 {
   options = {
-    services.xserver.windowManager.herbstluftwm.enable = mkEnableOption "herbstluftwm";
+    services.xserver.windowManager.herbstluftwm = {
+      enable = mkEnableOption "herbstluftwm";
+
+      configFile = mkOption {
+        default     = null;
+        type        = with types; nullOr path;
+        description = ''
+          Path to the herbstluftwm configuration file.  If left at the
+          default value, $XDG_CONFIG_HOME/herbstluftwm/autostart will
+          be used.
+        '';
+      };
+    };
   };
 
   config = mkIf cfg.enable {
     services.xserver.windowManager.session = singleton {
       name = "herbstluftwm";
-      start = "
-        ${pkgs.herbstluftwm}/bin/herbstluftwm
-      ";
+      start =
+        let configFileClause = optionalString
+            (cfg.configFile != null)
+            ''-c "${cfg.configFile}"''
+            ;
+        in "${pkgs.herbstluftwm}/bin/herbstluftwm ${configFileClause}";
     };
     environment.systemPackages = [ pkgs.herbstluftwm ];
   };

From be30dcefb62890c09cd08a609d94fb197e3acfb5 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep@barricade.io>
Date: Tue, 21 Feb 2017 10:22:10 +0530
Subject: [PATCH 0836/3449] marathon: 1.3.6 -> 1.4.1 (#22935)

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

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index fa19c562e8cc..914ca259675c 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.3.6";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "12a6ah6qsx1ap6y7sps4vwkq8lyc08k1qnak2mnsa04ifrx9z0dy";
+    sha256 = "1wpzsvvmk19qrwzwj7k12rngry1qriiqnjzq2q2pbpv5w0zb1fz5";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = https://mesosphere.github.io/marathon;
     description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rushmorem kamilchm kevincox ];
+    maintainers = with maintainers; [ rushmorem kamilchm kevincox pradeepchhetri ];
     platforms = platforms.linux;
   };
 }

From 1f4940368ae5ce2bd61dcb1474c11e6803334987 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 15 Feb 2017 20:48:40 -0500
Subject: [PATCH 0837/3449] bins: fix permissions issue regenerating albums

since the template files in the nix store are read-only, they can't be
overwritten the second time the album is generated.  using cp's '-f'
option works around this.
---
 pkgs/tools/graphics/bins/cp-dash-f.patch | 11 +++++++++++
 pkgs/tools/graphics/bins/default.nix     |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/graphics/bins/cp-dash-f.patch

diff --git a/pkgs/tools/graphics/bins/cp-dash-f.patch b/pkgs/tools/graphics/bins/cp-dash-f.patch
new file mode 100644
index 000000000000..e280e5349c1f
--- /dev/null
+++ b/pkgs/tools/graphics/bins/cp-dash-f.patch
@@ -0,0 +1,11 @@
+--- a/bins	2016-05-18 20:45:49.513330005 -0400
++++ b/bins	2016-05-18 20:58:58.957830874 -0400
+@@ -1332,7 +1332,7 @@
+                 mkdir $destDir, 0755
+                     or die("\nCannot create $destDir: $?");
+             }
+-            system("cp", "-R", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
++            system("cp", "-Rf", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
+                 or die("\nCannot copy $staticDir directory content to $destDir: $?");
+         } else {
+             beVerboseN("  Cannot find any static template directory.", 4);
diff --git a/pkgs/tools/graphics/bins/default.nix b/pkgs/tools/graphics/bins/default.nix
index d41df87fb6d9..b43e99c42a14 100644
--- a/pkgs/tools/graphics/bins/default.nix
+++ b/pkgs/tools/graphics/bins/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation {
                                      DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui
 
   patches = [ ./bins_edit-isa.patch
-              ./hashref.patch ];
+              ./hashref.patch
+              ./cp-dash-f.patch ];
 
   installPhase = ''
     export DESTDIR=$out;

From 6fd27c7c3855425dd1194f3662453d7905ae6201 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 21 Feb 2017 08:24:35 +0100
Subject: [PATCH 0838/3449] linuxPackages.sch_cake: init at 2017-01-28

---
 pkgs/os-specific/linux/sch_cake/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/os-specific/linux/sch_cake/default.nix

diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix
new file mode 100644
index 000000000000..f459e5bf0b89
--- /dev/null
+++ b/pkgs/os-specific/linux/sch_cake/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, fetchFromGitHub, kernel }:
+
+stdenv.mkDerivation {
+  name = "sch_cake-2017-01-28";
+
+  src = fetchFromGitHub {
+    owner = "dtaht";
+    repo = "sch_cake";
+    rev = "9789742cfc596d48583ba4cdbc8f38d026121fa6";
+    sha256 = "03xgkqrv8d9q8rr21awbld0kvwglyinpm71nk16gvm4rd37c5h76";
+  };
+
+  hardeningDisable = [ "pic" ];
+
+  makeFlags = [
+    "KERNEL_VERSION=${kernel.version}"
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  installPhase = ''
+    install -v -m 644 -D sch_cake.ko \
+      $out/lib/modules/${kernel.modDirVersion}/kernel/net/sched/sch_cake.ko
+  '';
+
+  meta = with lib; {
+    description = "The cake qdisc scheduler";
+    homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/";
+    license = with licenses; [ bsd3 gpl2 ];
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7069d116ff1..41be021b15f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11484,6 +11484,8 @@ with pkgs;
 
     seturgent = callPackage ../os-specific/linux/seturgent { };
 
+    sch_cake = callPackage ../os-specific/linux/sch_cake { };
+
     inherit (callPackage ../os-specific/linux/spl {
       configFile = "kernel";
       inherit kernel;

From 0789a2a4d6d66a6c87308a596c61e5f34c81677c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 18 Feb 2017 11:35:58 +0800
Subject: [PATCH 0839/3449] usb-wwan: nixos module

---
 nixos/modules/hardware/usb-wwan.nix | 26 ++++++++++++++++++++++++++
 nixos/modules/module-list.nix       |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 nixos/modules/hardware/usb-wwan.nix

diff --git a/nixos/modules/hardware/usb-wwan.nix b/nixos/modules/hardware/usb-wwan.nix
new file mode 100644
index 000000000000..2d20421586a7
--- /dev/null
+++ b/nixos/modules/hardware/usb-wwan.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+
+  options = {
+
+    hardware.usbWwan = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable this option to support USB WWAN adapters.
+        '';
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf config.hardware.usbWwan.enable {
+    services.udev.packages = with pkgs; [ usb-modeswitch-data ];
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 81597d91d89a..175ba182b4b8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -38,6 +38,7 @@
   ./hardware/network/rtl8192c.nix
   ./hardware/opengl.nix
   ./hardware/pcmcia.nix
+  ./hardware/usb-wwan.nix
   ./hardware/video/amdgpu.nix
   ./hardware/video/amdgpu-pro.nix
   ./hardware/video/ati.nix

From 88cc35f1f470ff04db76517c40c67d4e9fd19690 Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Tue, 21 Feb 2017 08:21:06 +0000
Subject: [PATCH 0840/3449] wolfssl: 3.9.10b -> 3.10.3

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

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index e5e9bb008d4a..1d19b4417404 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.9.10b";
+  version = "3.10.3";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}";
-    sha256 = "1hx543kxi4fpxww0y2c05kaav99zmnxm81rq7v7d87qzmvw2g4gx";
+    sha256 = "05j3sg4vdzir89qy6y566wyfpqaz3mn53fiqg7ia4r7wjwhzbzrw";
   };
 
   outputs = [ "out" "dev" "doc" "lib" ];

From 4518b02c8b33c35ec0e483afa83777df69b2aa25 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:14:01 +0100
Subject: [PATCH 0841/3449] simpleeval: init at 0.9.5

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

diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
new file mode 100644
index 000000000000..cd77f66b56eb
--- /dev/null
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -0,0 +1,16 @@
+{ lib, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "simpleeval-${version}";
+  version = "0.9.5";
+  src = fetchurl {
+    url = "mirror://pypi/s/simpleeval/${name}.tar.gz";
+    sha256 = "0sda13bqg9l4j17iczmfanxbzsg6fm9aw8i3crzsjfxx51rwj1i3";
+  };
+  meta = {
+    homepage = "https://github.com/danthedeckie/simpleeval";
+    description = "A simple, safe single expression evaluator library";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e429ff4c2aa..09e9b1e23345 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -360,6 +360,8 @@ in {
 
   rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}";
 
+  simpleeval = callPackage ../development/python-modules/simpleeval { };
+
   sip = callPackage ../development/python-modules/sip { };
 
   tables = callPackage ../development/python-modules/tables {

From 402a6c6dde53f2997a5c6678c069fdf2c98b643f Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:31:51 +0100
Subject: [PATCH 0842/3449] PyWebDAV: init at 0.9.8

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

diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix
new file mode 100644
index 000000000000..27925a619f2f
--- /dev/null
+++ b/pkgs/development/python-modules/pywebdav/default.nix
@@ -0,0 +1,17 @@
+{ lib, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  name = "PyWebDAV-${version}";
+  version = "0.9.8";
+  disabled = isPy3k;
+  src = fetchurl {
+    url = "mirror://pypi/p/pywebdav/${name}.tar.gz";
+    sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji";
+  };
+  meta = {
+    homepage = http://code.google.com/p/pywebdav/;
+    description = "WebDAV library including a standalone server for python";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09e9b1e23345..99a939c9cce4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -354,6 +354,8 @@ in {
     };
   };
 
+  PyWebDAV = callPackage ../development/python-modules/pywebdav { };
+
   pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}";
 
   relatorio = callPackage ../development/python-modules/relatorio { };

From 96e1fd6a5a81b24e5f932ee1c2b9bcff17242987 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:24:18 +0100
Subject: [PATCH 0843/3449] python-stdnum: init at 1.5

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

diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
new file mode 100644
index 000000000000..fe85b7bb0d34
--- /dev/null
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -0,0 +1,18 @@
+{ lib, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  name = "python-stdnum-${version}";
+  version = "1.5";
+  # Failing tests and dependency issue on Py3k
+  disabled = isPy3k;
+  src = fetchurl {
+    url = "mirror://pypi/p/python-stdnum/${name}.tar.gz";
+    sha256 = "0zkkpjy4gc161dkyxjmingjw48glljlqqrl4fh2k5idf0frkvzhh";
+  };
+  meta = {
+    homepage = "http://arthurdejong.org/python-stdnum/";
+    description = "Python module to handle standardized numbers and codes";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a939c9cce4..57159eedd433 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -334,6 +334,8 @@ in {
 
   python-sql = callPackage ../development/python-modules/python-sql { };
 
+  python-stdnum = callPackage ../development/python-modules/python-stdnum { };
+
   pytimeparse = buildPythonPackage rec {
     pname = "pytimeparse";
     version = "1.1.6";

From c55649ce07848359e97c2ce9ce577b407ff25b8b Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 21:10:05 +0100
Subject: [PATCH 0844/3449] flake8-debugger: init at 1.4.0

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

diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix
new file mode 100644
index 000000000000..b383c5db0083
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -0,0 +1,18 @@
+{ lib, fetchurl, buildPythonPackage, flake8, nose }:
+
+buildPythonPackage rec {
+  name = "flake8-debugger-${version}";
+  version = "1.4.0";
+  src = fetchurl {
+    url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";
+    sha256 = "0chjfa6wvnqjnx778qzahhwvjx1j0rc8ax0ipp5bn70gf47lj62r";
+  };
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [ flake8 ];
+  meta = {
+    homepage = https://github.com/jbkahn/flake8-debugger;
+    description = "ipdb/pdb statement checker plugin for flake8";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 57159eedd433..1d0e5a525180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11337,6 +11337,8 @@ in {
     };
   };
 
+  flake8-debugger = callPackage ../development/python-modules/flake8-debugger { };
+
   flaky = buildPythonPackage rec {
     name = "flaky-${version}";
     version = "3.1.0";

From 87b9ee7680d1d991749377d4b76e15dfd01a0315 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 21:16:39 +0100
Subject: [PATCH 0845/3449] flake8-blind-except: init at 0.1.1

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

diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix
new file mode 100644
index 000000000000..88b4f811e944
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -0,0 +1,16 @@
+{ lib, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "flake8-blind-except-${version}";
+  version = "0.1.1";
+  src = fetchurl {
+    url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz";
+    sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc";
+  };
+  meta = {
+    homepage = https://github.com/elijahandrews/flake8-blind-except;
+    description = "A flake8 extension that checks for blind except: statements";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d0e5a525180..f881dea71a21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11337,6 +11337,8 @@ in {
     };
   };
 
+  flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { };
+
   flake8-debugger = callPackage ../development/python-modules/flake8-debugger { };
 
   flaky = buildPythonPackage rec {

From 3134afb814597c4dd25c6a3e5b84a066fd1d2700 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:59:32 +0100
Subject: [PATCH 0846/3449] requests_toolbelt: 0.6.2 -> 0.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 f881dea71a21..0ed5c5fbe3dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22181,12 +22181,12 @@ in {
   requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
 
   requests_toolbelt = buildPythonPackage rec {
-    version = "0.6.2";
+    version = "0.7.1";
     name = "requests-toolbelt-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz";
-      sha256 = "0ds1b2qx0nx9bqj1sqgr4lmanb4hpchmylp1hml1l0p71qi5ha0r";
+      sha256 = "16grklnbgcfwqj3f39gw7fc9afi7xlp9gm7x8w6mi81dzhdxf50y";
     };
 
     propagatedBuildInputs = with self; [ requests2 ];

From 2cc4703a2d73155fe3cacb776d13468f0b9898bf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 18 Feb 2017 20:06:09 +0300
Subject: [PATCH 0847/3449] wrappers service: make /run/wrappers a mountpoint

Also remove some compatibility code because the directory in question would be
shadowed by a mountpoint anyway.
---
 nixos/modules/security/wrappers/default.nix | 27 +++++++++------------
 nixos/modules/tasks/filesystems.nix         |  2 +-
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 52f251876605..65d875c3a375 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -3,6 +3,8 @@ let
 
   inherit (config.security) wrapperDir wrappers;
 
+  parentWrapperDir = dirOf wrapperDir;
+
   programs =
     (lib.mapAttrsToList
       (n: v: (if v ? "program" then v else v // {program=n;}))
@@ -15,8 +17,7 @@ let
     hardeningEnable = [ "pie" ];
     installPhase = ''
       mkdir -p $out/bin
-      parentWrapperDir=$(dirname ${wrapperDir})
-      gcc -Wall -O2 -DWRAPPER_DIR=\"$parentWrapperDir\" \
+      gcc -Wall -O2 -DWRAPPER_DIR=\"${parentWrapperDir}\" \
           -lcap-ng -lcap ${./wrapper.c} -o $out/bin/security-wrapper
     '';
   };
@@ -156,6 +157,11 @@ in
 
     security.wrappers.fusermount.source = "${pkgs.fuse}/bin/fusermount";
 
+    boot.specialFileSystems.${parentWrapperDir} = {
+      fsType = "tmpfs";
+      options = [ "nodev" ];
+    };
+
     # Make sure our wrapperDir exports to the PATH env variable when
     # initializing the shell
     environment.extraInit = ''
@@ -183,19 +189,15 @@ in
           # Remove the old /run/setuid-wrappers-dir path from the
           # system as well...
           #
-          # TDOO: this is only necessary for ugprades 16.09 => 17.x;
+          # TODO: this is only necessary for ugprades 16.09 => 17.x;
           # this conditional removal block needs to be removed after
           # the release.
           if [ -d /run/setuid-wrapper-dirs ]; then
             rm -rf /run/setuid-wrapper-dirs
           fi
 
-          # Get the "/run/wrappers" path, we want to place the tmpdirs
-          # for the wrappers there
-          parentWrapperDir="$(dirname ${wrapperDir})"
-
-          mkdir -p "$parentWrapperDir"
-          wrapperDir=$(mktemp --directory --tmpdir="$parentWrapperDir" wrappers.XXXXXXXXXX)
+          # We want to place the tmpdirs for the wrappers to the parent dir.
+          wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
           chmod a+rx $wrapperDir
 
           ${lib.concatStringsSep "\n" mkWrappedPrograms}
@@ -207,13 +209,6 @@ in
             ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp
             mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir}
             rm --force --recursive $old
-          elif [ -d ${wrapperDir} ]; then
-            # Compatibility with old state, just remove the folder and symlink
-            rm -f ${wrapperDir}/*
-            # if it happens to be a tmpfs
-            ${pkgs.utillinux}/bin/umount ${wrapperDir} || true
-            rm -d ${wrapperDir}
-            ln -d --symbolic $wrapperDir ${wrapperDir}
           else
             # For initial setup
             ln --symbolic $wrapperDir ${wrapperDir}
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index 8a4299113f2b..9f30eb611466 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -291,7 +291,7 @@ in
     # Sync mount options with systemd's src/core/mount-setup.c: mount_table.
     boot.specialFileSystems = {
       "/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; };
-      "/run" = { fsType = "tmpfs"; options = [ "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };
+      "/run" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; };
       "/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; };
       "/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; };
       "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; };

From 0338817f62ada4a90b155273c3efe2f340a3194f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 21 Feb 2017 09:24:56 +0000
Subject: [PATCH 0848/3449] vnstat: provide full path of "kill" in ExecReload

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

diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix
index f6be7c7fd34a..ca56e4a7b958 100644
--- a/nixos/modules/services/monitoring/vnstat.nix
+++ b/nixos/modules/services/monitoring/vnstat.nix
@@ -32,7 +32,7 @@ in {
       preStart = "chmod 755 /var/lib/vnstat";
       serviceConfig = {
         ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";
-        ExecReload = "kill -HUP $MAINPID";
+        ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID";
         ProtectHome = true;
         PrivateDevices = true;
         PrivateTmp = true;

From d35695e3e1435553d0d45a7ab22968d1a88fc660 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 21 Feb 2017 10:48:00 +0100
Subject: [PATCH 0849/3449] Revert "sqlitebrowser: 3.8.0 -> 3.9.1"

This reverts commit f9d7d29fa939eeba39d5aa497b9703e60a016eab.
---
 pkgs/development/tools/database/sqlitebrowser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 8290b57d41ba..338f3323d947 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, qt4, sqlite, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "3.9.1";
+  version = "3.8.0";
   name = "sqlitebrowser-${version}";
 
   src = fetchFromGitHub {
     repo   = "sqlitebrowser";
     owner  = "sqlitebrowser";
     rev    = "v${version}";
-    sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150";
+    sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp";
   };
 
   buildInputs = [ qt4 sqlite cmake ];

From ac346f4be6fed9f9a1da4621254c64a7ca06d1e3 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Tue, 21 Feb 2017 10:52:53 +0100
Subject: [PATCH 0850/3449] zope_configuration: Skip tests on py3

There is an open problem around namespace packages which prevents a successful
test run at the moment.
---
 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 0ed5c5fbe3dd..b3fbc26c3313 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27591,6 +27591,10 @@ EOF
 
     propagatedBuildInputs = with self; [ zope_i18nmessageid zope_schema ];
 
+    # Trouble with implicit namespace packages on Python3
+    # see https://github.com/pypa/setuptools/issues/912
+    doCheck = !isPy3k;
+
     meta = {
         maintainers = with maintainers; [ goibhniu ];
     };

From 88b8f38e71d954f6078b962eeb4b8d98d1672d73 Mon Sep 17 00:00:00 2001
From: asildnes <andsild@gmail.com>
Date: Sun, 5 Feb 2017 11:56:50 +0100
Subject: [PATCH 0851/3449] vint: init at 0.3.11

---
 pkgs/development/tools/vim-vint/default.nix | 38 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/tools/vim-vint/default.nix

diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix
new file mode 100644
index 000000000000..cf21804ddde2
--- /dev/null
+++ b/pkgs/development/tools/vim-vint/default.nix
@@ -0,0 +1,38 @@
+{ fetchFromGitHub, lib, python3Packages, stdenv }:
+
+with python3Packages;
+
+buildPythonApplication rec {
+  name = "vim-vint-${version}";
+  version = "0.3.11";
+
+  src = fetchFromGitHub {
+    owner = "kuniwak";
+    repo = "vint";
+    rev = "v${version}";
+    sha256 = "0xl166xs7sm404f1qz2s0xcry7fr1hgyvhqhyj1qj0dql9i3xx8v";
+  };
+
+  # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails.
+  disabled = ! pythonAtLeast "3.5";
+
+  # Prevent setup.py from adding dependencies in run-time and insisting on specific package versions
+  patchPhase = ''
+    substituteInPlace setup.py --replace "return requires" "return []"
+    '';
+  buildInputs = [ coverage pytest pytestcov ];
+  propagatedBuildInputs = [ ansicolor chardet pyyaml ] ;
+
+  # The acceptance tests check for stdout and location of binary files, which fails in nix-build.
+  checkPhase = ''
+    py.test -k "not acceptance"
+  '';
+
+  meta = with lib; {
+    description = "Fast and Highly Extensible Vim script Language Lint implemented by Python";
+    homepage = "https://github.com/Kuniwak/vint";
+    license = licenses.mit;
+    maintainers = with maintainers; [ andsild ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ba672c477d7..030486ca6773 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4215,6 +4215,8 @@ with pkgs;
     inherit (gnome3) gexiv2;
   };
 
+  vim-vint = callPackage ../development/tools/vim-vint { };
+
   vit = callPackage ../applications/misc/vit { };
 
   vnc2flv = callPackage ../tools/video/vnc2flv {};

From 3d04d470cdd0facb906473a47e8ab04a53351c39 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 Feb 2017 13:30:50 +0100
Subject: [PATCH 0852/3449] cjdns: fix build with glibc-2.25 via upstream patch

---
 pkgs/tools/networking/cjdns/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 1c91235652ae..3000aacafa38 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nodejs, which, python27, utillinux }:
+{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }:
 
 let version = "18"; in
 stdenv.mkDerivation {
@@ -9,6 +9,12 @@ stdenv.mkDerivation {
     sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap";
   };
 
+  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 4b7215368ac16b862ee523bdc193e69c174c4942 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 Feb 2017 14:19:07 +0100
Subject: [PATCH 0853/3449] glibc: fixup libm.a

Now it's not an actual archive but a linker script, and the absolute
paths in there were broken due to moving *.a into $static.
Let's fix this up in all *.a in case there are more in future.
---
 pkgs/development/libraries/glibc/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index a46f97e0e051..4f9eb2d0714f 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -91,6 +91,9 @@ in
       mkdir -p $static/lib
       mv $out/lib/*.a $static/lib
       mv $static/lib/lib*_nonshared.a $out/lib
+      # Some of *.a files are linker scripts where moving broke the paths.
+      sed "/^GROUP/s|$out/lib/lib|$static/lib/lib|g" \
+        -i "$static"/lib/*.a
 
       # Work around a Nix bug: hard links across outputs cause a build failure.
       cp $bin/bin/getconf $bin/bin/getconf_

From 361d730f35773764199cfe1e50980d7d209b3246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmi@gmail.com>
Date: Tue, 21 Feb 2017 14:56:26 +0100
Subject: [PATCH 0854/3449] nixos/manual/xserver: propose more alternatives

---
 nixos/doc/manual/configuration/x-windows.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 93d10d19b208..214eec9e1fc4 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -27,17 +27,21 @@ the following lines:
 <programlisting>
 services.xserver.desktopManager.kde5.enable = true;
 services.xserver.desktopManager.xfce.enable = true;
+services.xserver.desktopManager.gnome3.enable = true;
 services.xserver.windowManager.xmonad.enable = true;
 services.xserver.windowManager.twm.enable = true;
 services.xserver.windowManager.icewm.enable = true;
+services.xserver.windowManager.i3.enable = true;
 </programlisting>
 </para>
 
 <para>NixOS’s default <emphasis>display manager</emphasis> (the
 program that provides a graphical login prompt and manages the X
-server) is SLiM.  You can select KDE’s <command>sddm</command> instead:
+server) is SLiM. You can select an alternative one by picking one
+of the following lines:
 <programlisting>
 services.xserver.displayManager.sddm.enable = true;
+services.xserver.displayManager.lightdm.enable = true;
 </programlisting>
 </para>
 

From 012b5a5c45d2e5b0e690936cd71c8be727047914 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Feb 2017 13:42:18 +0100
Subject: [PATCH 0855/3449] Add Fedora 25

---
 pkgs/build-support/vm/default.nix | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 461bdd08fb57..5bac650215b1 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1154,6 +1154,32 @@ rec {
       unifiedSystemDir = true;
     };
 
+    fedora25i386 = {
+      name = "fedora-25-i386";
+      fullName = "Fedora 25 (i386)";
+      packagesList = fetchurl rec {
+        url = "mirror://fedora/linux/releases/25/Everything/i386/os/repodata/${sha256}-primary.xml.gz";
+        sha256 = "4d399e5eebb8d543d50e2da274348280fae07a6efcc469491784582b39d73bba";
+      };
+      urlPrefix = mirror://fedora/linux/releases/25/Everything/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
+    fedora25x86_64 = {
+      name = "fedora-25-x86_64";
+      fullName = "Fedora 25 (x86_64)";
+      packagesList = fetchurl rec {
+        url = "mirror://fedora/linux/releases/25/Everything/x86_64/os/repodata/${sha256}-primary.xml.gz";
+        sha256 = "eaea04bff7327c49d90240992dff2be6d451a1758ef83e94825f23d4ff27e868";
+      };
+      urlPrefix = mirror://fedora/linux/releases/25/Everything/x86_64/os;
+      archs = ["noarch" "x86_64"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
     opensuse103i386 = {
       name = "opensuse-10.3-i586";
       fullName = "openSUSE 10.3 (i586)";

From acb2acf1f5466f2db93fcab727b294b2eeb35844 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Feb 2017 14:53:16 +0100
Subject: [PATCH 0856/3449] VM builds: Use -smp when enableParallelBuilding is
 set

---
 pkgs/build-support/vm/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 5bac650215b1..203310f624e7 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -242,6 +242,14 @@ rec {
 
     eval "$preVM"
 
+    if [ "$enableParallelBuilding" = 1 ]; then
+      if [ ''${NIX_BUILD_CORES:-0} = 0 ]; then
+        QEMU_OPTS+=" -smp cpus=$(nproc)"
+      else
+        QEMU_OPTS+=" -smp cpus=$NIX_BUILD_CORES"
+      fi
+    fi
+
     # Write the command to start the VM to a file so that the user can
     # debug inside the VM if the build fails (when Nix is called with
     # the -K option to preserve the temporary build directory).

From 1fdb52ffcc797e582f8e174afd72a1d8a731b700 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Feb 2017 14:56:27 +0100
Subject: [PATCH 0857/3449] Add Ubuntu 16.10

---
 pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 203310f624e7..0e1f4f2d6eee 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1827,6 +1827,40 @@ rec {
       packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
     };
 
+    ubuntu1610i386 = {
+      name = "ubuntu-16.04-xenial-i386";
+      fullName = "Ubuntu 16.04 Xenial (i386)";
+      packagesLists =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz;
+            sha256 = "da811f582779a969f738f2366c17e075cf0da3c4f2a4ed1926093a2355fd72ba";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz;
+            sha256 = "5162b0a87173cd5dea7ce2273788befe36f38089d44a2379ed9dd92f76c6b2aa";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+    };
+
+    ubuntu1610x86_64 = {
+      name = "ubuntu-16.04-yakkety-amd64";
+      fullName = "Ubuntu 16.04 Yakkety (amd64)";
+      packagesList =
+        [ (fetchurl {
+            url = mirror://ubuntu/dists/yakkety/main/binary-amd64/Packages.xz;
+            sha256 = "356c4cfab0d7f77b75c473cd78b22ee7288f63b24c9739049924dc081dd2e3d1";
+          })
+          (fetchurl {
+            url = mirror://ubuntu/dists/yakkety/universe/binary-amd64/Packages.xz;
+            sha256 = "a72660f8feffd6978e3b9328c6259b5387ac0b4f33d1029e4a17091ceb5057e6";
+          })
+        ];
+      urlPrefix = mirror://ubuntu;
+      packages = commonDebPackages ++ [ "diffutils" "libc-bin" ];
+    };
+
     debian40i386 = {
       name = "debian-4.0r9-etch-i386";
       fullName = "Debian 4.0r9 Etch (i386)";

From 9c1399e476f98a68726bcd1792426300d388592c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 21 Feb 2017 14:09:29 +0000
Subject: [PATCH 0858/3449] packer: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index d7e6bbd0351c..5c0ea18cab32 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 buildGoPackage rec {
   name = "packer-${version}";
-  version = "0.12.1";
+  version = "0.12.2";
 
   goPackagePath = "github.com/mitchellh/packer";
 
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "mitchellh";
     repo = "packer";
     rev = "v${version}";
-    sha256 = "05wd8xf4nahpg96wzligk5av10p0xd2msnb3imk67qgbffrlvmvi";
+    sha256 = "1li141y7rfbn021h33dnryhms5xwzqz8d92djnprbh7ba9ff02zm";
   };
 
   meta = with stdenv.lib; {

From 0994d6af9d6eef9f2b8691423cd7ace255999e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= <theo.zimmi@gmail.com>
Date: Tue, 21 Feb 2017 15:20:10 +0100
Subject: [PATCH 0859/3449] nixos/manual/networkmanager: add info on nm-applet

---
 nixos/doc/manual/configuration/network-manager.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index dafbcfcb1e5b..b4808e74ff9d 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -27,7 +27,11 @@ users.extraUsers.youruser.extraGroups = [ "networkmanager" ];
 <para>NetworkManager is controlled using either <command>nmcli</command> or
 <command>nmtui</command> (curses-based terminal user interface). See their
 manual pages for details on their usage. Some desktop environments (GNOME, KDE)
-have their own configuration tools for NetworkManager.</para>
+have their own configuration tools for NetworkManager. On XFCE, there is no
+configuration tool for NetworkManager by default: by adding
+<code>networkmanagerapplet</code> to the list of system packages, the graphical
+applet will be installed and will launch automatically when XFCE is starting
+(and will show in the status tray).</para>
 
 <note><para><code>networking.networkmanager</code> and
 <code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same

From fac3438a969dd158d8eead669068090c2e068599 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Feb 2017 15:15:26 +0100
Subject: [PATCH 0860/3449] Fix Ubuntu 16.10 name

---
 pkgs/build-support/vm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 0e1f4f2d6eee..7d7a2756c9ef 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1828,8 +1828,8 @@ rec {
     };
 
     ubuntu1610i386 = {
-      name = "ubuntu-16.04-xenial-i386";
-      fullName = "Ubuntu 16.04 Xenial (i386)";
+      name = "ubuntu-16.10-yakkety-i386";
+      fullName = "Ubuntu 16.10 Yakkety (i386)";
       packagesLists =
         [ (fetchurl {
             url = mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz;
@@ -1845,8 +1845,8 @@ rec {
     };
 
     ubuntu1610x86_64 = {
-      name = "ubuntu-16.04-yakkety-amd64";
-      fullName = "Ubuntu 16.04 Yakkety (amd64)";
+      name = "ubuntu-16.10-yakkety-amd64";
+      fullName = "Ubuntu 16.10 Yakkety (amd64)";
       packagesList =
         [ (fetchurl {
             url = mirror://ubuntu/dists/yakkety/main/binary-amd64/Packages.xz;

From d0d5ea0cdfd56f95c5ec256f9583442bbc30f0fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Feb 2017 15:26:14 +0100
Subject: [PATCH 0861/3449] Grrr

---
 pkgs/build-support/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 7d7a2756c9ef..562344dfcf72 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1832,11 +1832,11 @@ rec {
       fullName = "Ubuntu 16.10 Yakkety (i386)";
       packagesLists =
         [ (fetchurl {
-            url = mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz;
+            url = mirror://ubuntu/dists/yakkety/main/binary-i386/Packages.xz;
             sha256 = "da811f582779a969f738f2366c17e075cf0da3c4f2a4ed1926093a2355fd72ba";
           })
           (fetchurl {
-            url = mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz;
+            url = mirror://ubuntu/dists/yakkety/universe/binary-i386/Packages.xz;
             sha256 = "5162b0a87173cd5dea7ce2273788befe36f38089d44a2379ed9dd92f76c6b2aa";
           })
         ];

From 0a840d4f41f6123fd205fa30a32580d0a87d5be0 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Tue, 21 Feb 2017 15:34:28 +0100
Subject: [PATCH 0862/3449] pijul: remove

This version is not working, and it is not even a release upstream
---
 .../version-management/pijul/default.nix      | 38 --------
 .../pijul/pijul.org.context                   | 92 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 132 deletions(-)
 delete mode 100644 pkgs/applications/version-management/pijul/default.nix
 delete mode 100644 pkgs/applications/version-management/pijul/pijul.org.context

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
deleted file mode 100644
index 04a91a6b4a44..000000000000
--- a/pkgs/applications/version-management/pijul/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchdarcs, rustPlatform, openssl, libssh }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  name = "pijul-${version}";
-  version = "0.2-6ab9ba";
-
-  src = fetchdarcs {
-    url = "http://pijul.org/";
-    context = ./pijul.org.context;
-    sha256 = "1cgkcr5wdkwj7s0rda90bfchbwmchgi60w5d637894w20hkplsr4";
-  };
-
-  sourceRoot = "fetchdarcs/pijul";
-
-  depsSha256 = "110bj2lava1xs75z6k34aip7zb7rcmnxk5hmiyi32i9hs0ddsdrz";
-
-  cargoUpdateHook = ''
-    cp -r ../libpijul src/
-  '';
-
-  setSourceRoot = ''
-    chmod -R u+w "$sourceRoot"
-    cp -r "$sourceRoot"/../libpijul "$sourceRoot"/src/
-  '';
-
-  buildInputs = [ openssl libssh ];
-
-  meta = with stdenv.lib; {
-    homepage = https://pijul.org/;
-    description = "Fast DVCS based on a categorical theory of patches";
-    license = licenses.gpl3;
-    platforms = stdenv.lib.platforms.x86_64;  # i686 builds fail due to lmdb
-    maintainers = with maintainers; [ puffnfresh ];
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/version-management/pijul/pijul.org.context b/pkgs/applications/version-management/pijul/pijul.org.context
deleted file mode 100644
index 03a3f0f9a7c1..000000000000
--- a/pkgs/applications/version-management/pijul/pijul.org.context
+++ /dev/null
@@ -1,92 +0,0 @@
-
-Context:
-
-[+libpijul/Cargo.lock
-pe@pijul.org**20160212063509
- Ignore-this: e5a696b13850b36668a41aedb7bd1b74
-] 
-
-[+pijul/Cargo.lock
-pe@pijul.org**20160212063451
- Ignore-this: a621a502d1701cb63e6b5c8fd0afbde8
-] 
-
-[Error detection, gnupg messages
-pe@pijul.org**20160210101417
- Ignore-this: 3c517e122c1eca1df9520aed8fd3b0ea
-] 
-
-[Login command
-pe@pijul.org**20160210055826
- Ignore-this: 7be5618dc418554a82c5f8a68cc8f515
-] 
-
-[Extra functions for the nest
-pe@pijul.org**20160208205519
- Ignore-this: 39c8cbed5517b31bc846493e6ffefc76
-] 
-
-[Timestamp in RFC3339
-pe@pijul.org**20160208145551
- Ignore-this: dd114fe418052570572d73e443683d85
-] 
-
-[Combined external_hash and contents in libpijul (makes it easier to print patches)
-pe@pijul.org**20160208145450
- Ignore-this: 69f588e1bab551bffd719fa05ad7080a
-] 
-
-[disentangle output in libpijul
-florent.becker@ens-lyon.org**20160208094544
- Ignore-this: 2dc35255cf48d77eb0c4ba2dde6d4f98
-] 
-
-[Disentangle libpijul::Repository::local_diff
-florent.becker@ens-lyon.org**20160207104631
- Ignore-this: 65b119358afa95eb013e84c0d7a250d9
-] 
-
-[remove redundant import
-florent.becker@ens-lyon.org**20160207104613
- Ignore-this: e3f7873ec678f62f4129be61238c2c0d
-] 
-
-[Disentangle add_lines and delete_lines in diff
-florent.becker@ens-lyon.org**20160207102456
- Ignore-this: 5e89908adf7a519bbe2b2ab399cf0a2
-] 
-
-[Disentangle libpijul::rec_delete
-florent.becker@ens-lyon.org**20160206214730
- Ignore-this: fb6a70c298a38724665c3d6452577649
-] 
-
-[Make InternalKey type be an array rather than a reference
-florent.becker@ens-lyon.org**20160205195638
- Ignore-this: f9b5d15049358b2d8e93322d25a50e58
-] 
-
-[Ask ssh known_hosts, and new file format
-pe@pijul.org**20160207120834
- Ignore-this: f7a7f2ae672a3f6f40a2ac85139d6e10
-] 
-
-[Handling HTTP errors (when cloning from HTTP)
-pe@pijul.org**20160204182444
- Ignore-this: 1805ae8d3b8a4ca49da06e18dd37b151
-] 
-
-[Small debugging assertions
-pe@pijul.org**20160203143007
- Ignore-this: e3d3dddc72511166d606e1751b19411b
-] 
-
-[Two unused functions back (used in the nest)
-pe@pijul.org**20160202075743
- Ignore-this: 8c6904b122c8a78bfa0b9cc5416c943
-] 
-
-[TAG 0.2
-pe@pijul.org**20160202073939
- Ignore-this: 1e9d04d5ffe231ffaccaf9c4ccb684d3
-] 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65a775bda9b9..28b8de1178cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14433,8 +14433,6 @@ with pkgs;
 
   pig = callPackage ../applications/networking/cluster/pig { };
 
-  pijul = callPackage ../applications/version-management/pijul { };
-
   planner = callPackage ../applications/office/planner { };
 
   playonlinux = callPackage ../applications/misc/playonlinux {

From f1e6dc8750642ec001999c80da8f921207043b92 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 21 Feb 2017 15:41:37 +0100
Subject: [PATCH 0863/3449] networking.defaultGateway{,6}: fix example

---
 nixos/modules/tasks/network-interfaces.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 898207ef7a3c..2841a221755e 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -358,7 +358,7 @@ in
       default = null;
       example = {
         address = "131.211.84.1";
-        device = "enp3s0";
+        interface = "enp3s0";
       };
       type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
       description = ''
@@ -371,7 +371,7 @@ in
       default = null;
       example = {
         address = "2001:4d0:1e04:895::1";
-        device = "enp3s0";
+        interface = "enp3s0";
       };
       type = types.nullOr (types.coercedTo types.str gatewayCoerce (types.submodule gatewayOpts));
       description = ''

From cab0b445be02665e2acd473a7c223f2293fb5580 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 Feb 2017 17:55:26 +0100
Subject: [PATCH 0864/3449] python-3.4: fixup with glibc-2.25 (/cc #22874)

Upstream won't support it, but let me trick the code into behaving
as if glibc was older.  It seems 3.3 branch should be unaffected.
---
 .../interpreters/python/cpython/3.4/default.nix          | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 66bdd2a42270..72419f8e1943 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -57,7 +57,14 @@ in stdenv.mkDerivation {
 
   postPatch = optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
-  '';
+  ''
+    # Avoid picking up getentropy() from glibc >= 2.25, as that would break
+    # on older kernels.  http://bugs.python.org/issue29157
+    + optionalString stdenv.isLinux
+      ''
+        substituteInPlace Python/random.c --replace 'defined(HAVE_GETENTROPY)' '0'
+        cat Python/random.c
+      '';
 
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity

From 723f23d29196ab6f816352d5247197d539207bf8 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 Feb 2017 18:20:06 +0100
Subject: [PATCH 0865/3449] dmd: fixup build with glibc-2.25

---
 pkgs/development/compilers/dmd/2.067.1.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix
index 66264346102c..4dbe922ce811 100644
--- a/pkgs/development/compilers/dmd/2.067.1.nix
+++ b/pkgs/development/compilers/dmd/2.067.1.nix
@@ -19,7 +19,11 @@ stdenv.mkDerivation {
       # Was not able to compile on darwin due to "__inline_isnanl"
       # being undefined.
       substituteInPlace src/dmd/root/port.c --replace __inline_isnanl __inline_isnan
-  '';
+  ''
+    + stdenv.lib.optionalString stdenv.isLinux ''
+        substituteInPlace src/dmd/root/port.c \
+          --replace "#include <bits/mathdef.h>" "#include <complex.h>"
+      '';
 
   # Buid and install are based on http://wiki.dlang.org/Building_DMD
   buildPhase = ''

From cbc343e5e7a9c7a73ce039c0d1be242f4f2437c8 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 Feb 2017 18:20:28 +0100
Subject: [PATCH 0866/3449] criu: fixup build with glibc-2.25

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

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index efca4c7bbb5b..f04f6f897602 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
     substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
     substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" ""
     ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
+
+    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+    sed 1i'#include <sys/sysmacros.h>' -i criu/include/util.h
   '';
 
   buildPhase = "make PREFIX=$out";

From 3d600726b31bc1d7721775097a03cc702f315c17 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 Feb 2017 18:26:52 +0100
Subject: [PATCH 0867/3449] xen: fixup build with glibc-2.25

---
 pkgs/applications/virtualization/xen/generic.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index a697e2aa7ef4..9943d70fa8cd 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -74,6 +74,11 @@ stdenv.mkDerivation {
       ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in ''
         cp ${src} xen_ext_files/${src.name}
       '')}
+
+      # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
+      sed 1i'#include <sys/sysmacros.h>' \
+        -i tools/blktap2/control/tap-ctl-allocate.c \
+        -i tools/libxl/libxl_device.c
   '';
 
   preConfigure = ''

From cc8104f9bbe2ff47d1b520d2671dc5724dc27dc2 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 Feb 2017 18:33:23 +0100
Subject: [PATCH 0868/3449] ekiga: mark as broken for now

/cc maintainer @7c6f434c.
---
 .../applications/networking/instant-messengers/ekiga/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index 9c7204b7fa10..575759ad4372 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     description = "VOIP/Videoconferencing app with full SIP and H.323 support";
     maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
+    broken = true; # because of glibc-2.25
   };
 
   passthru = {

From c986f4f8949213c636c4f632e31b2ef0e9278054 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 Feb 2017 18:35:57 +0100
Subject: [PATCH 0869/3449] fatrace: fixup build with glibc-2.25

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

diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 09da891a175d..f68856f6b86e 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace power-usage-report \
       --replace "'which'" "'${which}/bin/which'"
+
+    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+    sed 1i'#include <sys/sysmacros.h>' -i fatrace.c
   '';
 
   makeFlags = [ "PREFIX=$(out)" ];

From 9fe56e52dda8d99a91d56fbc420976a040c2de61 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 Feb 2017 18:52:29 +0100
Subject: [PATCH 0870/3449] dolphinEmu*: fixup build with glibc-2.25

---
 pkgs/misc/emulators/dolphin-emu/default.nix | 5 +++++
 pkgs/misc/emulators/dolphin-emu/master.nix  | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index bb5b12038f83..db510024241d 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6";
   };
 
+  postPatch = ''
+    substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \
+      --replace " CHAR_WIDTH " " CHARWIDTH "
+  '';
+
   cmakeFlags = ''
     -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
     -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 990870d35d69..499e1177c3ea 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
     fetchSubmodules = false;
   };
 
+  postPatch = ''
+    for f in Source/Core/VideoBackends/{Software,OGL}/RasterFont.{h,cpp}; do
+      substituteInPlace "$f" --replace " CHAR_WIDTH " " CHARWIDTH "
+    done
+  '';
+
   cmakeFlags = ''
     -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
     -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include

From 5f420c1ff583403d12f6af8905c9953f962dbdba 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 Feb 2017 18:52:53 +0100
Subject: [PATCH 0871/3449] gvolicon: fixup build with glibc-2.25

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

diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 87741cf0ac07..7354b92aaf94 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -13,7 +13,9 @@ stdenv.mkDerivation {
     librsvg wrapGAppsHook
   ];
 
-  makeFlags="PREFIX=$(out)";
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  NIX_CFLAGS_COMPILE = [ "-D_POSIX_C_SOURCE" ];
 
   meta = {
     description = "A simple and lightweight volume icon that sits in your system tray";

From 1d64f5f41b79e7698dfe4bb866a290643b3b60ad Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 21 Feb 2017 13:26:23 +0100
Subject: [PATCH 0872/3449] libvirt: expose libvirt qemu configuration file

fixes #22823
---
 nixos/modules/virtualisation/libvirtd.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 5f669dee7545..101ea9a4f51b 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -13,6 +13,9 @@ let
     auth_unix_rw = "none"
     ${cfg.extraConfig}
   '';
+  qemuConfigFile = pkgs.writeText "qemu.conf" ''
+    ${cfg.qemuVerbatimConfig}
+  '';
 
 in {
 
@@ -48,6 +51,18 @@ in {
       '';
     };
 
+    virtualisation.libvirtd.qemuVerbatimConfig = mkOption {
+      type = types.lines;
+      default = ''
+        namespaces = []
+      '';
+      description = ''
+        Contents written to the qemu configuration file, qemu.conf.
+        Make sure to include a proper namespace configuration when
+        supplying custom configuration.
+      '';
+    };
+
     virtualisation.libvirtd.extraOptions = mkOption {
       type = types.listOf types.str;
       default = [ ];
@@ -119,6 +134,9 @@ in {
             cp -npd ${pkgs.libvirt}/var/lib/$i /var/lib/$i
         done
 
+        # Copy generated qemu config to libvirt directory
+        cp -f ${qemuConfigFile} /var/lib/libvirt/qemu.conf
+
         # libvirtd puts the full path of the emulator binary in the machine
         # config file. But this path can unfortunately be garbage collected
         # while still being used by the virtual machine. So update the

From fd732dec888dc39f68e53114171789bbb913c33c Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 21 Feb 2017 14:15:44 -0500
Subject: [PATCH 0873/3449] zoom-us: bump

---
 .../networking/instant-messengers/zoom-us/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 4e9f00b03404..85dbd5f8d8f7 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
       platforms = stdenv.lib.platforms.linux;
     };
 
-    version = "2.0.70790.1031";
+    version = "2.0.81497.0116";
     src = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "0kkg3bqv8zwhpxgrssa7ds00dxhdimnq2vfklgrdqn5qzbij31hd";
+      sha256 = "1lq59l5vxirjgcsrl6r4nqgvjr519gkn69alffv1f1fwq5vzif7j";
     };
 
     phases = [ "unpackPhase" "installPhase" ];

From 45719174c3a82af6e0df27812d51edc323ccc897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 21 Feb 2017 23:18:30 +0100
Subject: [PATCH 0874/3449] nixos/release-notes: mention iputils changes

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

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 8f9694bad8bd..6e43949419dc 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -217,6 +217,18 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+    Iputils no longer provide ping6 and traceroute6. The functionality of
+    these tools have 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 incompabtibility is that
+    specifying an interface (for link-local ipv6 for instance) is no longer done
+    with the <literal>-I</literal> flag, but by encoding the interface into the
+    address (<literal>ping fe80::1%eth0</literal>).
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From 2805ac54d8a69a3c984049567f859f5ac1269e9d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 22 Feb 2017 07:33:31 +0800
Subject: [PATCH 0875/3449] utox: 0.12.2 -> 0.13.0

---
 .../networking/instant-messengers/utox/default.nix           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 0653558c940f..a5f0f5cef613 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,13 +3,14 @@
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
-  version = "0.12.2";
+  # > 0.13 should have unit tests and dbus support
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner  = "uTox";
     repo   = "uTox";
     rev    = "v${version}";
-    sha256 = "1y26dpx0qc01mhv2f325ymyc3r7ihayrr10rp25p1bs24010azwn";
+    sha256 = "0hdcbhmjwxhs3mr72w6x6yfnk8b0drsqyj40grg8dc0gb1x8y82j";
   };
 
   buildInputs = [

From b1c6a9bfcc79586bddb41e2b27f95e0299973d25 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 21 Feb 2017 18:47:33 -0500
Subject: [PATCH 0876/3449] curl: 7.52.1 -> 7.53.0

---
 pkgs/tools/networking/curl/default.nix      |  6 ++--
 pkgs/tools/networking/curl/issue-1174.patch | 34 ---------------------
 2 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/tools/networking/curl/issue-1174.patch

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index de841be3f052..48f8edf7c44c 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,14 +21,14 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.52.1";
+  name = "curl-7.53.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "16rqhyzlpnivifin8n7l2fr9ihay9v2nw2drsniinb6bcykqaqfi";
+    sha256 = "008833dd9w4l2277q9r0bsq1vqmm0fr7qqyzvqlw5d47xy5mld5j";
   };
 
-  patches = [ ./issue-1174.patch ];
+  patches = [ ];
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
 
diff --git a/pkgs/tools/networking/curl/issue-1174.patch b/pkgs/tools/networking/curl/issue-1174.patch
deleted file mode 100644
index eceeef8b001b..000000000000
--- a/pkgs/tools/networking/curl/issue-1174.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit a7b38c9dc98481e4a5fc37e51a8690337c674dfb
-Author: Daniel Stenberg <daniel@haxx.se>
-Date:   Mon Dec 26 00:06:33 2016 +0100
-
-    vtls: s/SSLEAY/OPENSSL
-    
-    Fixed an old leftover use of the USE_SSLEAY define which would make a
-    socket get removed from the applications sockets to monitor when the
-    multi_socket API was used, leading to timeouts.
-    
-    Bug: #1174
-
-diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c
-index b808e1c..707f24b 100644
---- a/lib/vtls/vtls.c
-+++ b/lib/vtls/vtls.c
-@@ -484,7 +484,7 @@ void Curl_ssl_close_all(struct Curl_easy *data)
-   curlssl_close_all(data);
- }
- 
--#if defined(USE_SSLEAY) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
-+#if defined(USE_OPENSSL) || defined(USE_GNUTLS) || defined(USE_SCHANNEL) || \
-     defined(USE_DARWINSSL) || defined(USE_NSS)
- /* This function is for OpenSSL, GnuTLS, darwinssl, and schannel only. */
- int Curl_ssl_getsock(struct connectdata *conn, curl_socket_t *socks,
-@@ -518,7 +518,7 @@ int Curl_ssl_getsock(struct connectdata *conn,
-   (void)numsocks;
-   return GETSOCK_BLANK;
- }
--/* USE_SSLEAY || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
-+/* USE_OPENSSL || USE_GNUTLS || USE_SCHANNEL || USE_DARWINSSL || USE_NSS */
- #endif
- 
- void Curl_ssl_close(struct connectdata *conn, int sockindex)

From 4ecaed783b447e00db1d9ade96400cff707fd1b7 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 22 Feb 2017 07:48:34 +0800
Subject: [PATCH 0877/3449] utox: remove unnecessary line

---
 .../applications/networking/instant-messengers/utox/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index a5f0f5cef613..ccb4244d6264 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  makeFlags = "PREFIX=$(out)";
-
   meta = with stdenv.lib; {
     description = "Lightweight Tox client";
     license = licenses.gpl3;

From 8b60413e9581736a13145d4ed87d0c4dbe9a9301 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 21 Feb 2017 18:51:34 -0500
Subject: [PATCH 0878/3449] rkt: 1.24.0 -> 1.25.0

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 7059b8606808..81e26f78528d 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -12,7 +12,7 @@ let
   stage1Dir = "lib/rkt/stage1-images";
 
 in stdenv.mkDerivation rec {
-  version = "1.24.0";
+  version = "1.25.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       owner = "coreos";
       repo = "rkt";
       rev = "v${version}";
-      sha256 = "11vp3pm00xsksdgdv67sgvrrpj3ayp7sx1wprn4aa579vbbr83bd";
+      sha256 = "0lcnhyaxq8z0ndwqg0svcc1gg0ahhcprxlf9gifm4mpxqimhaz8j";
   };
 
   stage1BaseImage = fetchurl {

From 83f29e9b99e352391f437d7ef1e970f787fde949 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 21 Feb 2017 19:02:42 -0500
Subject: [PATCH 0879/3449] gradle: 3.3 -> 3.4

---
 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 dbdcb6ba8ef5..8d119371aa86 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.3";
-    nativeVersion = "0.12";
+    name = "gradle-3.4";
+    nativeVersion = "0.13";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "14m2m5f5s2cpp6w0x3lkq6lyx5cd7jp0hldnrab0dkyqg31511n5";
+      sha256 = "0192yz1j59mvn6d3sch0yjx6i2fg4nyppkdpbqbbxqymrm6wvl3j";
     };
   };
 

From 7bb0611e2e27b3e5b7db7c93a3635fab5f7d3306 Mon Sep 17 00:00:00 2001
From: Nick Novitski <github@nicknovitski.com>
Date: Wed, 22 Feb 2017 13:06:34 +1300
Subject: [PATCH 0880/3449] vim_configurable: Add packPath option to
 vimrcConfig (#22776)

* vim_configurable: Add packages option to vimrcConfig

Version 8 of vim adds the concept of "vim packages": directories which
contain one or more vim plugins, in either "start" or "opt"
subdirectories. Those in "start" are to be loaded automatically, while
those in "opt" can be loaded manually. Vim detects any packages located
in one of its "packpaths".

The packages option takes a set of sets describing one or more vim
packages, and adds the derivation containing these packages to the
packpath.

* fix documentation.
---
 pkgs/misc/vim-plugins/vim-utils.nix | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index d714b290a905..4b754f15c0fa 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -17,6 +17,17 @@ vim-with-plugins in PATH:
       set hidden
     '';
 
+    # store your plugins in Vim packages
+    vimrcConfig.packages.myVimPackage = with pkgs.vimPlugins; {
+      # loaded on launch
+      start = [ youcompleteme fugitive ];
+      # manually loadable by calling `:packadd $plugin-name`
+      opt = [ phpCompletion elm-vim ];
+      # To automatically load a plugin when opening a filetype, add vimrc lines like:
+      # autocmd FileType php :packadd phpCompletion
+    };
+
+    # plugins can also be managed by VAM
     vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; # optional
     vimrcConfig.vam.pluginDictionaries = [
       # load always
@@ -154,6 +165,7 @@ let
     in lib.uniqList { inputList = recurseNames [] names; };
 
   vimrcFile = {
+    packages ? null,
     vam ? null,
     pathogen ? null,
     customRC ? ""
@@ -253,6 +265,31 @@ let
         call vam#Scripts(l, {})
       '');
 
+      nativeImpl = lib.optionalString (packages != null)
+      (let
+        link = (packageName: dir: pluginPath: "ln -sf ${pluginPath}/share/vim-plugins/* $out/pack/${packageName}/${dir}");
+        packageLinks = (packageName: {start ? [], opt ? []}:
+          ["mkdir -p $out/pack/${packageName}/start"]
+          ++ (builtins.map (link packageName "start") start)
+          ++ ["mkdir -p $out/pack/${packageName}/opt"]
+          ++ (builtins.map (link packageName "opt") opt)
+        );
+        packDir = (packages:
+          stdenv.mkDerivation rec {
+            name = "vim-pack-dir";
+            src = ./.;
+            installPhase = lib.concatStringsSep
+                             "\n"
+                             (lib.flatten (lib.mapAttrsToList packageLinks packages));
+          }
+        );
+      in
+      ''
+        set packpath-=~/.vim/after
+        set packpath+=${packDir packages}
+        set packpath+=~/.vim/after
+      '');
+
       # somebody else could provide these implementations
       vundleImpl = "";
 
@@ -267,6 +304,7 @@ let
   ${pathogenImpl}
   ${vundleImpl}
   ${neobundleImpl}
+  ${nativeImpl}
 
   filetype indent plugin on | syn on
 
@@ -385,4 +423,9 @@ rec {
     vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ];
   };
 
+  test_vim_with_vim_addon_nix = vim_configurable.customize {
+    name = "vim-with-vim-addon-nix";
+    vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ];
+  };
+
 }

From 61666724a6e46a38e32eca66ca90bf3c021b5a8f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 21 Feb 2017 19:07:59 -0500
Subject: [PATCH 0881/3449] oh-my-zsh: 2017-01-15 -> 2017-02-20

---
 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 732f831889e6..21e409b727b7 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-01-15";
+  version = "2017-02-20";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "d2725d44fce59ea7060b4d712c5739512a56882d";
-    sha256 = "064q10yc0n71nqh621nk88ch4wjwwq68wlaaacl5q3llcb4b5pff";
+    rev = "98d8d3429f8b9fc2c4c109fb199a31c8d1735699";
+    sha256 = "1zdjb5dsbr8n7jfmib4a6rhcx9wrp5lw4b8b9xrh164s97hza2d0";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From eb688ac0a70870174b2d1b47feac3080538616bf Mon Sep 17 00:00:00 2001
From: Mounium <muoniurn@gmail.com>
Date: Wed, 22 Feb 2017 01:35:09 +0100
Subject: [PATCH 0882/3449] pymol: init at 1.8.4 (#23007)

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

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
new file mode 100644
index 000000000000..a0cd51ce3c7f
--- /dev/null
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, python27Packages, glew, freeglut, libpng, libxml2, tk, freetype }:
+
+let
+  version = "1.8.4.0";
+in
+python27Packages.buildPythonApplication {
+  name = "pymol-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/project/pymol/pymol/1.8/pymol-v1.8.4.0.tar.bz2";
+    sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n";
+  };
+
+  buildInputs = [ python27Packages.numpy glew freeglut libpng libxml2 tk freetype ];
+  NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
+
+  installPhase = ''
+    python setup.py install --home=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Python-enhanced molecular graphics tool";
+    homepage = "https://www.pymol.org/";
+    license = licences.psfl;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28b8de1178cf..efe49567ea3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14776,6 +14776,8 @@ with pkgs;
 
   puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
 
+  pymol = callPackage ../applications/science/chemistry/pymol { };
+
   pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { };
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };

From a000ec038e5f3d76e04ed45b79f15f709a052d59 Mon Sep 17 00:00:00 2001
From: Luke Gorrie <luke@snabb.co>
Date: Wed, 22 Feb 2017 04:48:50 +0000
Subject: [PATCH 0883/3449] r-modules/README.md: mention generate-shell.nix

---
 pkgs/development/r-modules/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index cb962e138c50..0d9c1490d2b9 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -87,6 +87,8 @@ this into your user profile.
 ## Updating the package set
 
 ```bash
+nix-shell generate-shell.nix
+
 Rscript generate-r-packages.R cran  > cran-packages.nix.new
 mv cran-packages.nix.new cran-packages.nix
 

From bae3d0e49f945bbd71233c9c9bfe0de33dd0538e Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Wed, 15 Feb 2017 16:49:49 +0000
Subject: [PATCH 0884/3449] vowpalwabbit: init at 8.3.2

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

diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix
new file mode 100644
index 000000000000..4c343985c597
--- /dev/null
+++ b/pkgs/development/python-modules/vowpalwabbit/default.nix
@@ -0,0 +1,32 @@
+{ fetchurl, boost, zlib, clang, ncurses, pythonPackages, lib }:
+pythonPackages.buildPythonPackage rec {
+    name = "vowpalwabbit-${version}";
+    version = "8.3.2";
+
+    src = fetchurl{
+      url = "mirror://pypi/v/vowpalwabbit/${name}.tar.gz";
+      sha256 = "0qm8rlrs2gfgamqnpx4lapxakpzgh0yh3kp1lbd7lhb0r748m3k7";
+    };
+    # vw tries to write some explicit things to home
+    # python installed: The directory '/homeless-shelter/.cache/pip/http'
+    preInstall = ''
+      export HOME=$PWD
+    '';
+
+    buildInputs = with pythonPackages; [ boost.dev zlib.dev clang ncurses pytest docutils pygments ];
+    propagatedBuildInputs = with pythonPackages; [ numpy scipy scikitlearn ];
+
+    checkPhase = ''
+      # check-manifest requires a git clone, not a tarball
+      # check-manifest --ignore "Makefile,PACKAGE.rst,*.cc,tox.ini,tests*,examples*,src*"
+      python setup.py check -mrs
+    '';
+
+    meta = with lib; {
+      description = "Vowpal Wabbit is a fast machine learning library for online learning, and this is the python wrapper for the project.";
+      homepage    = https://github.com/JohnLangford/vowpal_wabbit;
+      license     = licenses.bsd3;
+      maintainers = with maintainers; [ teh ];
+    };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e429ff4c2aa..ea43ff18c73d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -71,6 +71,8 @@ in {
 
   setuptools = callPackage ../development/python-modules/setuptools { };
 
+  vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { pythonPackages = self; };
+
   acoustics = buildPythonPackage rec {
     pname = "acoustics";
     version = "0.1.2";

From 9b81dcfda2a4e4ebc94531767770f2c1406ea1e7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 22 Feb 2017 08:45:30 +0100
Subject: [PATCH 0885/3449] nixos/release-notes: fix typos

---
 nixos/doc/manual/release-notes/rl-1703.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 6e43949419dc..3758a3bf2aac 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -222,8 +222,8 @@ following incompatible changes:</para>
     Iputils no longer provide ping6 and traceroute6. The functionality of
     these tools have 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 incompabtibility is that
-    specifying an interface (for link-local ipv6 for instance) is no longer done
+    <literal>-6</literal> have been added. One notable incompatibility is that
+    specifying an interface (for link-local IPv6 for instance) is no longer done
     with the <literal>-I</literal> flag, but by encoding the interface into the
     address (<literal>ping fe80::1%eth0</literal>).
     </para>

From 67018e7759274c4cd80d4ec8be93be31329a53aa Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 22 Feb 2017 08:48:42 +0100
Subject: [PATCH 0886/3449] pymol: fix evaluation

cc #23007 @Mounium @Mic92
---
 pkgs/applications/science/chemistry/pymol/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index a0cd51ce3c7f..af0c2e855498 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -20,6 +20,6 @@ python27Packages.buildPythonApplication {
   meta = with stdenv.lib; {
     description = "A Python-enhanced molecular graphics tool";
     homepage = "https://www.pymol.org/";
-    license = licences.psfl;
+    license = licenses.psfl;
   };
 }

From 85fb29bb49869a69405cc9ad5658d7cb6b64434e Mon Sep 17 00:00:00 2001
From: Asumu Takikawa <asumu@igalia.com>
Date: Wed, 22 Feb 2017 00:19:47 -0800
Subject: [PATCH 0887/3449] ndpi: init at 1.8

---
 lib/maintainers.nix                         |  1 +
 pkgs/development/libraries/ndpi/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/ndpi/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index fba18ac75a72..8d2a07bd58c0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -478,6 +478,7 @@
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
+  takikawa = "Asumu Takikawa <asumu@igalia.com>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
   tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
   teh = "Tom Hunger <tehunger@gmail.com>";
diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
new file mode 100644
index 000000000000..f1232d7d253a
--- /dev/null
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:
+
+let version = "1.8"; in
+
+stdenv.mkDerivation rec {
+  name = "ndpi-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ntop";
+    repo = "nDPI";
+    rev = "${version}";
+    sha256 = "0kxp9dv4d1nmr2cxv6zsfy2j14wyb0q6am0qyxg0npjb08p7njf4";
+  };
+
+  configureScript = "./autogen.sh";
+
+  nativeBuildInputs = [which autoconf automake libtool];
+  buildInputs = [libpcap];
+
+  meta = with stdenv.lib; {
+    description = "A library for deep-packet inspection";
+    longDescription = ''
+      nDPI is a library for deep-packet inspection based on OpenDPI.
+    '';
+    homepage = http://www.ntop.org/products/deep-packet-inspection/ndpi/;
+    license = with licenses; lgpl3;
+    maintainers = with maintainers; [ takikawa ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efe49567ea3a..fb3e0fd34606 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8935,6 +8935,8 @@ with pkgs;
 
   nanomsg = callPackage ../development/libraries/nanomsg { };
 
+  ndpi = callPackage ../development/libraries/ndpi { };
+
   notify-sharp = callPackage ../development/libraries/notify-sharp { };
 
   ncurses5 = callPackage ../development/libraries/ncurses { abiVersion = "5"; };

From ea27b15d0e84e976feb99323a9031702290d9173 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Tue, 21 Feb 2017 23:24:55 +0100
Subject: [PATCH 0888/3449] ptask: init at 1.0.0

---
 pkgs/applications/misc/ptask/default.nix      | 29 +++++++++++++++++++
 pkgs/applications/misc/ptask/tw-version.patch | 11 +++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/misc/ptask/default.nix
 create mode 100644 pkgs/applications/misc/ptask/tw-version.patch

diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix
new file mode 100644
index 000000000000..abb1fb596fac
--- /dev/null
+++ b/pkgs/applications/misc/ptask/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }:
+
+stdenv.mkDerivation rec {
+  name = "ptask-1.0.0";
+
+  src = fetchurl {
+    url = "http://wpitchoune.net/ptask/files/${name}.tar.gz";
+    sha256 = "13nirr7b29bv3w2zc8zxphhmc9ayhs61i11jl4819nabk7vy1kdq";
+  };
+
+  buildInputs = [ gtk3 json_c ];
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  patches = [ ./tw-version.patch ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/ptask" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+      --prefix PATH : "${taskwarrior}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://wpitchoune.net/ptask/;
+    description = "GTK-based GUI for taskwarrior";
+    license = licenses.gpl2;
+    maintainer = [ maintainers.spacefrogg ];
+  };
+}
diff --git a/pkgs/applications/misc/ptask/tw-version.patch b/pkgs/applications/misc/ptask/tw-version.patch
new file mode 100644
index 000000000000..995fffeda2f8
--- /dev/null
+++ b/pkgs/applications/misc/ptask/tw-version.patch
@@ -0,0 +1,11 @@
+--- a/src/tw.c	2017-02-21 22:56:19.289037608 +0100
++++ b/src/tw.c	2017-02-21 22:57:04.726814256 +0100
+@@ -116,7 +116,7 @@
+ 	    || !strcmp(ver, "2.3.0")
+ 	    || !strcmp(ver, "2.4.0")
+ 	    || !strcmp(ver, "2.4.1")
+-	    || !strcmp(ver, "2.5.0"))
++	    || !strcmp(ver, "2.5.1"))
+ 		return 1;
+ 	else
+ 		return 0;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28b8de1178cf..2cbe487e669c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14769,6 +14769,8 @@ with pkgs;
 
   pstree = callPackage ../applications/misc/pstree { };
 
+  ptask = callPackage ../applications/misc/ptask { };
+
   pulseview = callPackage ../applications/science/electronics/pulseview { };
 
   puredata = callPackage ../applications/audio/puredata { };

From 494462e8573f4051d08634e852fbb003cb08b564 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 22 Feb 2017 20:12:25 +0800
Subject: [PATCH 0889/3449] terragrunt: 0.10.1 -> 0.10.2

---
 .../networking/cluster/terragrunt/default.nix             | 4 ++--
 pkgs/applications/networking/cluster/terragrunt/deps.nix  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index 4c5c6fe53ce8..a90cd832e115 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.10.1";
+  version = "0.10.2";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "04q9wm8dnbm1pcy9i3c7ral49k3z10a7gx7h6h4bsvjy1sdf58vz";
+    sha256 = "0xbg8kirdd4na7g1fk2xwh3rk07jrlmral6yhzzblpdyr4v26vlg";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index bb438ef4e326..6542e6b5beae 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "f85f603a3e5b4d0eb9516dddb33778918f3b45c6";
-      sha256 = "10frgavkbsqpfninrlgwh64qjx9rwyjzbdfrikciv75v1gljh6zv";
+      rev = "3d7773ac930d57ef4a59e0d10c5f65a0cfa5acd6";
+      sha256 = "0jgyybih4vhlja76x5wjsvdbvq3v14yllzfi36f2527bby18g1hc";
     };
   }
   {
@@ -50,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "372e8ddaa16fd67e371e9323807d056b799360af";
-      sha256 = "1hv8p1858k1b99p3yc2jj6h77bl0iv9ziyzyp4w3xlcci2s13hnr";
+      rev = "630949a3c5fa3c613328e1b8256052cbc2327c9b";
+      sha256 = "00lalg0gz7218gnw6zgn28gfizpcl8zw8jpkghn681vj7lfah5dh";
     };
   }
   {

From 026cfee6b0dce860841d85b8a50a00e944cf59a2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 13:38:02 +0100
Subject: [PATCH 0890/3449] Docs: update Python contributing guidelines

---
 doc/languages-frameworks/python.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 83d47b6f43a7..19f241fb185a 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -860,7 +860,8 @@ folder and not downloaded again.
 
 Following rules are desired to be respected:
 
-* Make sure package builds for all python interpreters. Use `disabled` argument to `buildPythonPackage` to set unsupported interpreters.
-* If tests need to be disabled for a package, make sure you leave a comment about reasoning.
-* Packages in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
-* Python libraries are supposed to be in `python-packages.nix` and packaged with `buildPythonPackage`. Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
+* Python libraries are supposed to be called from `python-packages.nix` and packaged with `buildPythonPackage`. The expression of a library should be in `pkgs/development/python-modules/<name>/default.nix`. Libraries in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
+* Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
+* Make sure libraries build for all Python interpreters.
+* By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be disabled individually. Try to avoid disabling the tests altogether. In any case, when you disable tests, leave a comment explaining why.
+* Commit names of Python libraries should include `pythonPackages`, for example `pythonPackages.numpy: 1.11 -> 1.12`.

From cc4919da8968ccdd2e4f76cbdde7e2ed6c385130 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 22 Feb 2017 07:59:26 -0500
Subject: [PATCH 0891/3449] xen: patch for XSAs: 197, 199, 207, 208, 209

XSA-197 Issue Description:

> The compiler can emit optimizations in qemu which can lead to double
> fetch vulnerabilities.  Specifically data on the rings shared
> between qemu and the hypervisor (which the guest under control can
> obtain mappings of) can be fetched twice (during which time the
> guest can alter the contents) possibly leading to arbitrary code
> execution in qemu.

More: https://xenbits.xen.org/xsa/advisory-197.html

XSA-199 Issue Description:

> The code in qemu which implements ioport read/write looks up the
> specified ioport address in a dispatch table.  The argument to the
> dispatch function is a uint32_t, and is used without a range check,
> even though the table has entries for only 2^16 ioports.
>
> When qemu is used as a standalone emulator, ioport accesses are
> generated only from cpu instructions emulated by qemu, and are
> therefore necessarily 16-bit, so there is no vulnerability.
>
> When qemu is used as a device model within Xen, io requests are
> generated by the hypervisor and read by qemu from a shared ring.  The
> entries in this ring use a common structure, including a 64-bit
> address field, for various accesses, including ioport addresses.
>
> Xen will write only 16-bit address ioport accesses.  However,
> depending on the Xen and qemu version, the ring may be writeable by
> the guest.  If so, the guest can generate out-of-range ioport
> accesses, resulting in wild pointer accesses within qemu.

More: https://xenbits.xen.org/xsa/advisory-199.html

XSA-207 Issue Description:

> Certain internal state is set up, during domain construction, in
> preparation for possible pass-through device assignment.  On ARM and
> AMD V-i hardware this setup includes memory allocation.  On guest
> teardown, cleanup was erroneously only performed when the guest
> actually had a pass-through device assigned.

More: https://xenbits.xen.org/xsa/advisory-207.html

XSA-209 Issue Description:

> When doing bitblt copy backwards, qemu should negate the blit width.
> This avoids an oob access before the start of video memory.

More: https://xenbits.xen.org/xsa/advisory-208.html

XSA-208 Issue Description:

> In CIRRUS_BLTMODE_MEMSYSSRC mode the bitblit copy routine
> cirrus_bitblt_cputovideo fails to check wethehr the specified memory
> region is safe.

More: https://xenbits.xen.org/xsa/advisory-209.html
---
 pkgs/applications/virtualization/xen/4.5.nix | 42 +++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index dc9d92534f00..bc8d89af5b2a 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -41,6 +41,20 @@ let
                   rev = "refs/tags/qemu-xen-${version}";
                   sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2";
                 };
+          patches = [
+            (xsaPatch {
+              name = "197-4.5-qemuu";
+              sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx";
+            })
+            (xsaPatch {
+              name = "208-qemuu-4.7";
+              sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb";
+            })
+            (xsaPatch {
+              name = "209-qemuu";
+              sha256 = "05df4165by6pzxrnizkw86n2f77k9i1g4fqqpws81ycb9ng4jzin";
+            })
+          ];
         }
         { git = { name = "qemu-xen-traditional";
                   url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
@@ -48,6 +62,24 @@ let
                   rev = "refs/tags/xen-${version}";
                   sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r";
                 };
+          patches = [
+            (xsaPatch {
+              name = "197-4.5-qemut";
+              sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79";
+            })
+            (xsaPatch {
+              name = "199-trad";
+              sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42";
+            })
+            (xsaPatch {
+              name = "208-qemut";
+              sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54";
+            })
+            (xsaPatch {
+              name = "209-qemut";
+              sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r";
+            })
+          ];
         }
         { git = { name = "xen-libhvm";
                   url = https://github.com/ts468/xen-libhvm;
@@ -63,12 +95,6 @@ let
         }
       ];
 
-      # Note this lacks patches for:
-      # XSA-201
-      # XSA-199
-      # XSA-197
-      # they didn't apply, and there are plenty of other patches here
-      # to get this deployed as-is.
       xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
                      ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
                      ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
@@ -116,6 +142,10 @@ let
                        name = "204-4.5";
                        sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
                      })
+                     (xsaPatch {
+                       name = "207";
+                       sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
+                     })
                    ];
   };
 

From 99754b2527073c2733541e9a578da7d32091c928 Mon Sep 17 00:00:00 2001
From: "Andrew R. M" <andrewmiller237@gmail.com>
Date: Tue, 21 Feb 2017 16:44:03 -0500
Subject: [PATCH 0892/3449] pythonPackages.snakeviz: init at 0.4.1

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

diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix
new file mode 100644
index 000000000000..be6f86dae545
--- /dev/null
+++ b/pkgs/development/python-modules/snakeviz/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, buildPythonPackage, tornado }:
+
+buildPythonPackage rec {
+  name = "snakeviz-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/s/snakeviz/${name}.tar.gz";
+    sha256 = "18vsaw1wmf903fg21zkk6a9b49gj47g52jm5h52g4iygngjhpx79";
+  };
+
+  # Upstream doesn't run tests from setup.py
+  doCheck = false;
+  propagatedBuildInputs = [ tornado ];
+
+  meta = with stdenv.lib; {
+    description = "Browser based viewer for profiling data";
+    homepage = "https://jiffyclub.github.io/snakeviz";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ nixy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e429ff4c2aa..bafaa96e5f2b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32086,6 +32086,8 @@ EOF
 
   treq = callPackage ../development/python-modules/treq { };
 
+  snakeviz = callPackage ../development/python-modules/snakeviz { };
+
 });
 
 in fix' (extends overrides packages)

From a8bf87681cfbbbe285facc4972baf89979f8cf81 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 20 Feb 2017 16:46:15 +0100
Subject: [PATCH 0893/3449] kde5.applications.kig: init at 16.12.2

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

diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 228d9443f6de..3284b2709c86 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -70,6 +70,7 @@ let
     kdf = callPackage ./kdf.nix {};
     kgpg = callPackage ./kgpg.nix {};
     khelpcenter = callPackage ./khelpcenter.nix {};
+    kig = callPackage ./kig.nix {};
     kio-extras = callPackage ./kio-extras.nix {};
     kmime = callPackage ./kmime.nix {};
     kmix = callPackage ./kmix.nix {};
diff --git a/pkgs/desktops/kde-5/applications/kig.nix b/pkgs/desktops/kde-5/applications/kig.nix
new file mode 100644
index 000000000000..9636f82974b3
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications/kig.nix
@@ -0,0 +1,26 @@
+{
+  kdeApp, lib, kdeWrapper
+  , ecm, kdoctools, kparts
+  , qtsvg, qtxmlpatterns, ktexteditor, boost
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "kig";
+      meta = {
+        license = with lib.licenses; [ gpl2 ];
+        maintainers = with lib.maintainers; [ raskin ];
+      };
+      nativeBuildInputs = [ ecm kdoctools ];
+      buildInputs = [
+        kparts qtsvg qtxmlpatterns ktexteditor boost
+      ];
+    };
+in
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kig" ];
+}
+
+

From 194d137bd3646b8e73901d5c01ee4e90d3dcf2a4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 22 Feb 2017 14:16:35 +0100
Subject: [PATCH 0894/3449] wireshark: patch for CVE-2017-6041

---
 .../networking/sniffers/wireshark/default.nix             | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index d3c3b2786070..7315b84d7f37 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -31,7 +31,13 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 
-  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
+  patches = [ ./wireshark-lookup-dumpcap-in-path.patch
+  (fetchurl {
+    url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9";
+    sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz";
+    name = "wireshark-CVE-2017-6014.patch";
+  })
+  ];
 
   postInstall = optionalString (withQt || withGtk) ''
     ${optionalString withGtk ''

From a04849502d1f7939148b1902791390219244437f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 15:03:21 +0100
Subject: [PATCH 0895/3449] fstrm: init at 0.3.1

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

diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
new file mode 100644
index 000000000000..3700b6f63551
--- /dev/null
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent }:
+
+stdenv.mkDerivation rec {
+  name = "fstrm-${version}";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "farsightsec";
+    repo = "fstrm";
+    rev = "v${version}";
+    sha256 = "1n8hpywjgkzm0xh0hvryf5r6v2sbpgr3qy0grxq9yha7kqcam4f3";
+  };
+
+  outputs = [ "bin" "out" "dev" ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libevent ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Frame Streams implementation in C";
+    homepage = https://github.com/farsightsec/fstrm;
+    license = licenses.asl20;
+    platforms = platforms.unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb3e0fd34606..00030f68f214 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7281,6 +7281,8 @@ with pkgs;
 
   freetts = callPackage ../development/libraries/freetts { };
 
+  fstrm = callPackage ../development/libraries/fstrm { };
+
   cfitsio = callPackage ../development/libraries/cfitsio { };
 
   fontconfig_210 = callPackage ../development/libraries/fontconfig/2.10.nix { };

From 51134cdbfeb1ec4cad9e5744baf5b6a4a8fd649e Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 22 Feb 2017 16:42:21 +0100
Subject: [PATCH 0896/3449] digikam5: Fix build after kde merge.

---
 .../0001-Disable-fno-operator-names.patch     | 25 +++++++++++++++++++
 pkgs/applications/graphics/digikam/5.nix      |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch

diff --git a/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch b/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch
new file mode 100644
index 000000000000..149a2b2b1aca
--- /dev/null
+++ b/pkgs/applications/graphics/digikam/0001-Disable-fno-operator-names.patch
@@ -0,0 +1,25 @@
+From beb9ad0149adfe448acfa650fb3e171d5fdd7e27 Mon Sep 17 00:00:00 2001
+From: Moritz Ulrich <moritz@tarn-vedra.de>
+Date: Wed, 22 Feb 2017 15:28:11 +0100
+Subject: [PATCH] Disable `-fno-operator-names`
+
+---
+ core/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 89e06827e6..01d0c88ea9 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -98,6 +98,8 @@ include(MacroOpenCV)
+ include(MacroJPEG)
+ include(MacroBoolTo01)
+ 
++string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++
+ # ==================================================================================================
+ 
+ option(ENABLE_OPENCV3               "Build digiKam with OpenCV3 instead OpenCV2 (default=OFF)"                           OFF)
+-- 
+2.11.1
+
diff --git a/pkgs/applications/graphics/digikam/5.nix b/pkgs/applications/graphics/digikam/5.nix
index ca7377c405c6..a9d7d357ad71 100644
--- a/pkgs/applications/graphics/digikam/5.nix
+++ b/pkgs/applications/graphics/digikam/5.nix
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ecm makeQtWrapper ];
 
+  patches = [ ./0001-Disable-fno-operator-names.patch ];
+
   buildInputs = [
     qtbase
     qtxmlpatterns

From 7ccaa9e652764f5652d071a46845296f2a8b64f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 16:45:08 +0100
Subject: [PATCH 0897/3449] solvespace: fixup build with glibc-2.25

---
 pkgs/applications/graphics/solvespace/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index d45001865023..ab5a81d6add6 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation {
     rev = "e587d0e";
   };
 
+  # Fixup build after glibc-2.25.
+  postPatch = ''
+    sed 's/\<CHAR_WIDTH\>/CHARWIDTH/g' \
+      -i src/{fltk/fltkmain.cpp,glhelper.cpp,textwin.cpp,toolbar.cpp,ui.h}
+  '';
+
   # e587d0e fails with undefined reference errors if make is called
   # twice. Ugly workaround: Build while installing.
   dontBuild = true;

From 1d1dc2dcc3e502149b578f2323441ae056155ef0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 16:54:07 +0100
Subject: [PATCH 0898/3449] open-vm-tools: fixup build with glibc-2.25

---
 pkgs/applications/virtualization/open-vm-tools/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index 78fa090f9254..4c0e0f11e7b3 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
      sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am
      sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am
      sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am
+
+     # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+     sed 1i'#include <sys/sysmacros.h>' -i lib/wiper/wiperPosix.c
   '';
 
   configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ]

From 7ccd6f25f0a71453dd2b6649999df2def955a4a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 16:54:19 +0100
Subject: [PATCH 0899/3449] reptyr: fixup build with glibc-2.25

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

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index 99f52dc5aed3..e017426aed0f 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -7,6 +7,12 @@ stdenv.mkDerivation rec {
     url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz";
     sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7";
   };
+
+  # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+  postPatch = ''
+    sed 1i'#include <sys/sysmacros.h>' -i platform/linux/linux.c
+  '';
+
   makeFlags = ["PREFIX=$(out)"];
   meta = {
     platforms = stdenv.lib.platforms.linux;

From fe8aa284c2399137df886a0b4b2d5f3e3083138d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 16:58:45 +0100
Subject: [PATCH 0900/3449] xcbuild: fixup build with glibc-2.25

---
 pkgs/development/tools/xcbuild/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 99859ed9640d..0fc56827de83 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -31,6 +31,12 @@ in stdenv.mkDerivation rec {
     cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
   '';
 
+  # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
+  postPatch = ''
+    sed 1i'#include <sys/sysmacros.h>' \
+      -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
+  '';
+
   enableParallelBuilding = true;
 
   # TODO: instruct cmake not to put it in /usr, rather than cleaning up

From 2f1945dcd3999a6f0313409337794dbd385e04a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 17:34:33 +0100
Subject: [PATCH 0901/3449] python-3.6: fix random numbers with glibc-2.25

I missed this upstream patch. /cc #22874.
---
 .../interpreters/python/cpython/3.6/default.nix        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 795bd7467253..42f8d109af2f 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , glibc
 , bzip2
 , gdbm
@@ -55,6 +55,14 @@ 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 = optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   '';

From b66ec6026cbbbd74902105b908e3f8f28431932c Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Wed, 22 Feb 2017 17:36:23 +0100
Subject: [PATCH 0902/3449] idris: jailbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1a7d928dbdd9..e1cf22155a58 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -724,7 +724,7 @@ self: super: {
   });
 
   # test suite cannot find its own "idris" binary
-  idris = dontCheck super.idris;
+  idris = doJailbreak (dontCheck super.idris);
 
   # https://github.com/bos/math-functions/issues/25
   math-functions = dontCheck super.math-functions;

From d6cff5783ec9f0536e1c19a82451987b4d2ecbe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 17:44:06 +0100
Subject: [PATCH 0903/3449] gnutls: drop -lunistring on Darwin as well

I didn't intend this substitution to be conditional; I looked wrong.
---
 pkgs/development/libraries/gnutls/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 42bc5d3da662..cf298baf48a3 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -58,6 +58,7 @@ stdenv.mkDerivation {
         -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \
         -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \
         -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc"
+  '' + ''
     # It seems only useful for static linking but basically noone does that.
     substituteInPlace "$out/lib/libgnutls.la" \
       --replace "-lunistring" ""

From f5eea8ba1d04c4b7f72bdd48f553585052f820f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 18:56:56 +0100
Subject: [PATCH 0904/3449] libevent: apply security patches from Debian

/cc #23072.  As with curl, it's nontrivial rebuild but security...
https://lwn.net/Alerts/714571/
---
 pkgs/development/libraries/libevent/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 17aeb1d4377f..4abd0b033757 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -9,6 +9,20 @@ stdenv.mkDerivation {
     sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
   };
 
+  prePatch = let
+      # https://lwn.net/Vulnerabilities/714581/
+      debian = fetchurl {
+        url = "http://http.debian.net/debian/pool/main/libe/libevent/"
+            + "libevent_2.0.21-stable-3.debian.tar.xz";
+        sha256 = "0b2syswiq3cvfbdvi4lbca15c31lilxnahax4a4b4qxi5fcab7h5";
+      };
+    in ''
+      tar xf '${debian}'
+      patches="$patches $(cat debian/patches/series | grep -v '^$\|^#' \
+                          | grep -v '^20d6d445.patch' \
+                          | grep -v '^dh-autoreconf' | sed 's|^|debian/patches/|')"
+    '';
+
   outputs = [ "out" "dev" ];
   outputBin = "dev";
 

From a43fd5af38582339edc357a4af21407a38848174 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 22 Feb 2017 19:03:48 +0100
Subject: [PATCH 0905/3449] graylog: 2.1.2 -> 2.2.1

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index ae26bad5bc81..68ee65159954 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.2";
+  version = "2.2.1";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0jwm1l3s00rh22gqvkg730h8xm4h1y1dr60m4s5xbz8qzdkk8rax";
+    sha256 = "19kwg6yn2bx9nk813d7z1mv5j375iy2qvpcvwm8hp242g13j5cy7";
   };
 
   dontBuild = true;

From de4643eb80ffa13b65c6e5e662235080c093b3e1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 19:45:17 +0100
Subject: [PATCH 0906/3449] diffoscope: 63 -> 77

---
 pkgs/tools/misc/diffoscope/default.nix | 20 +++++++-------------
 pkgs/top-level/all-packages.nix        |  1 -
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 22c9ea4872b5..6a9763666d3b 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,30 +1,24 @@
-{ lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
+{ lib, stdenv, fetchgit, fetchpatch, python3, docutils
 , acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
 , gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, sng, sqlite, squashfsTools, unzip, vim, xz
 , colordiff
 , enableBloat ? false
 }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "diffoscope-${version}";
-  version = "63";
-
-  namePrefix = "";
+python3.pkgs.buildPythonApplication rec {
+  pname = "diffoscope";
+  name = "${pname}-${version}";
+  version = "77";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "018c0xcgf6pgq493dib29pfyqpj7vb93a6qfmdh790fpxa2j1zyd";
+    sha256 = "0l5q24sqb88qkz62cz85bq65myfqig3z3m1lj2s92hdlqip9946b";
   };
 
   patches =
     [ # Ignore different link counts.
       ./ignore_links.patch
-
-      # Our Glibc doesn't have the C.UTF-8 locale yet
-      # (https://sourceware.org/glibc/wiki/Proposals/C.UTF-8), so use
-      # en_US.UTF-8 instead.
-      ./locale.patch
     ];
 
   postPatch = ''
@@ -35,7 +29,7 @@ pythonPackages.buildPythonApplication rec {
   # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh rpm ]) ++
+  propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++
     map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
     ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c793a481fe..875f4f00effd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1448,7 +1448,6 @@ with pkgs;
 
   diffoscope = callPackage ../tools/misc/diffoscope {
     jdk = jdk7;
-    pythonPackages = python3Packages;
   };
 
   diffstat = callPackage ../tools/text/diffstat { };

From cb6d15549a58e1eb4b7607e95faaaaa2e020b553 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Feb 2017 18:21:29 +0000
Subject: [PATCH 0907/3449] ocamlPackages.mparser: init at 1.2.1

MParser is a simple monadic parser combinator library for OCaml.

Homepage: https://github.com/cakeplus/mparser/
---
 .../ocaml-modules/mparser/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mparser/default.nix

diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix
new file mode 100644
index 000000000000..6490eeb2f38c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mparser/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-mparser-1.2.1";
+  src = fetchzip {
+    url = http://github.com/cakeplus/mparser/archive/1.2.1.tar.gz;
+    sha256 = "1g1r3p0inmm5xwh9i5mrc4s414b0j8l13a66hpvwhqcpp6qglfh3";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild ];
+
+  configurePhase = "ocaml setup.ml -configure";
+  buildPhase = "ocaml setup.ml -build";
+  installPhase = "ocaml setup.ml -install";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "A simple monadic parser combinator OCaml library";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    homepage = https://github.com/cakeplus/mparser;
+    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 b980e0530201..f7a91767326e 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -281,6 +281,8 @@ let
 
     mlgmpidl =  callPackage ../development/ocaml-modules/mlgmpidl { };
 
+    mparser =  callPackage ../development/ocaml-modules/mparser { };
+
     mtime =  callPackage ../development/ocaml-modules/mtime { };
 
     nocrypto =  callPackage ../development/ocaml-modules/nocrypto {

From edcdd4b7616cf8f03017655fb60ed048d951a462 Mon Sep 17 00:00:00 2001
From: Badi' Abdul-Wahid <abdulwahidc@gmail.com>
Date: Wed, 22 Feb 2017 14:47:29 -0500
Subject: [PATCH 0908/3449] super-user-spark: switch to haskellPackages LTS 8.x
 GHC 8.0.2

This updates super-user-spark to support the recent change in nixpkgs
of the haskellPackages to LTS 8.x using GHC 8.0.2 [1].

It also includes some recent changes to the super-user-spark package,
upgraded to commit ab86356 [2].

[1]: https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg31818.html
[2]: https://github.com/NorfairKing/super-user-spark/tree/ab8635682d67842b9e6d909cf3c618014e4157f2
---
 .../misc/super_user_spark/default.nix         | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix
index 1b6167c61962..dd1218282d85 100644
--- a/pkgs/applications/misc/super_user_spark/default.nix
+++ b/pkgs/applications/misc/super_user_spark/default.nix
@@ -1,27 +1,28 @@
-{ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-, directory, fetchgit, filepath, HTF, HUnit, mtl
-, optparse-applicative, parsec, process, shelly, stdenv, text
-, transformers, unix, zlib
+{ mkDerivation, fetchgit, aeson, aeson-pretty, base, bytestring, directory
+, filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative
+, parsec, process, pureMD5, QuickCheck, shelly, stdenv, text
+, transformers, unix
 }:
 mkDerivation {
   pname = "super-user-spark";
-  version = "0.2.0.3";
+  version = "0.3.2.0-dev";
   src = fetchgit {
     url = "https://github.com/NorfairKing/super-user-spark";
-    sha256 = "1w9c2b1fxqxp2q5jxsvnrfqvyvpk8q70qqsgzshmghx0yylx9cns";
-    rev = "a7d132f7631649c3a093ede286e66f78e9793fba";
+    sha256 = "0akyc51bghzkk8j75n0i8v8rrsklidwvljhx3aibxfbkqp33372g";
+    rev = "ab8635682d67842b9e6d909cf3c618014e4157f2";
   };
-  isLibrary = false;
+  isLibrary = true;
   isExecutable = true;
-  executableHaskellDepends = [
-    aeson aeson-pretty base binary bytestring directory filepath HTF
-    mtl optparse-applicative parsec process shelly text transformers
-    unix zlib
+  libraryHaskellDepends = [
+    aeson aeson-pretty base bytestring directory filepath mtl
+    optparse-applicative parsec process pureMD5 shelly text
+    transformers unix
   ];
+  executableHaskellDepends = [ base ];
   testHaskellDepends = [
-    aeson aeson-pretty base binary bytestring directory filepath HTF
-    HUnit mtl optparse-applicative parsec process shelly text
-    transformers unix zlib
+    aeson aeson-pretty base bytestring directory filepath hspec
+    hspec-core HUnit mtl optparse-applicative parsec process pureMD5
+    QuickCheck shelly text transformers unix
   ];
   jailbreak = true;
   description = "Configure your dotfile deployment with a DSL";

From 45588a7a7c97dba180cf9e189902594c29920e37 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sun, 19 Feb 2017 02:18:32 +0100
Subject: [PATCH 0909/3449] PyZufall: init at 0.13.2

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

diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix
new file mode 100644
index 000000000000..5777a6137ae4
--- /dev/null
+++ b/pkgs/development/python-modules/pyzufall/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python, buildPythonPackage, nose, future, coverage }:
+
+buildPythonPackage rec {
+  pname = "PyZufall";
+  version = "0.13.2";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
+    sha256 = "1jffhi20m82fdf78bjhncbdxkfzcskrlipxlrqq9741xdvrn14b5";
+  };
+
+  # disable tests due to problem with nose
+  # https://github.com/nose-devs/nose/issues/1037
+  doCheck = false;
+
+  buildInputs = [ nose coverage ];
+  propagatedBuildInputs = [ future ];
+
+  checkPhase = ''
+    ${python.interpreter} setup.py nosetests
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://pyzufall.readthedocs.io/de/latest/";
+    description = "Library for generating random data and sentences in german language";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6df45b3508f5..2ede0b37201e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -360,6 +360,8 @@ in {
 
   relatorio = callPackage ../development/python-modules/relatorio { };
 
+  pyzufall = callPackage ../development/python-modules/pyzufall { };
+
   rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}";
 
   sip = callPackage ../development/python-modules/sip { };

From 4509487e8227300c3aeab22a01c9fee7d6780b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Feb 2017 23:01:39 +0100
Subject: [PATCH 0910/3449] nixos polkit: fixup setuid wrapper of pkexec

Broken in 628e6a8.  Fixes #23083.
---
 nixos/modules/security/polkit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 419abb8b086d..8d9d53480630 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -84,7 +84,7 @@ in
     security.pam.services.polkit-1 = {};
 
     security.wrappers = {
-      pkexec.source = "${pkgs.polkit.out}/bin/pkexec";
+      pkexec.source = "${pkgs.polkit.bin}/bin/pkexec";
       "polkit-agent-helper-1".source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
     };
 

From 7803a696cd03486a3462f83120bf5088e9af6fd5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 23 Feb 2017 00:17:51 +0100
Subject: [PATCH 0911/3449] smartmontools: update drivedb.h to latest SVN
 version 4391

---
 pkgs/tools/system/smartmontools/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 1a9e2d3b5b9b..c3f05edd9adb 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,8 +1,20 @@
-{ stdenv, fetchurl,
-IOKit ? null , ApplicationServices ? null }:
+{ stdenv, fetchurl, IOKit ? null , ApplicationServices ? null }:
+
+let
+
+  version = "6.5";
+
+  dbrev = "4391";
+  drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
+  driverdb = fetchurl {
+    url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
+    sha256 = "1da99m81wr0rjdhcz2xx0sbbrqxkxffja2kllg4srmhih7fps5p1";
+    name = "smartmontools-drivedb.h";
+  };
+
+in
 
 stdenv.mkDerivation rec {
-  version = "6.5";
   name = "smartmontools-${version}";
 
   src = fetchurl {
@@ -13,6 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [IOKit ApplicationServices];
 
   patches = [ ./smartmontools.patch ];
+  postPatch = "cp -v ${driverdb} drivedb.h";
 
   meta = with stdenv.lib; {
     description = "Tools for monitoring the health of hard drives";

From a3bf71b76f28cb015a60805091b0367e16ab2408 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 23 Feb 2017 07:32:55 +0800
Subject: [PATCH 0912/3449] lynx: 2.8.8rel.2 -> 2.8.9dev.11

---
 .../networking/browsers/lynx/default.nix          | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 06c00bec7552..fb4b33ef71ab 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -6,26 +6,25 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "lynx-${version}";
-  version = "2.8.8rel.2";
-  
+  version = "2.8.9dev.11";
+
   src = fetchurl {
     url = "http://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2";
-    sha256 = "1rxysl08acqll5b87368f04kckl8sggy1qhnq59gsxyny1ffg039";
+    sha256 = "1cqm1i7d209brkrpzaqqf2x951ra3l67dw8x9yg10vz7rpr9441a";
   };
-  
+
   configureFlags = []
     ++ stdenv.lib.optionals sslSupport [ "--with-ssl=${openssl.dev}" ];
-  
+
   buildInputs = [ ncurses gzip ];
-  nativeBuildInputs = [ ncurses ];
 
   crossAttrs = {
     configureFlags = configureFlags ++ [ "--enable-widec" ];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://lynx.isc.org/;
     description = "A text-mode web browser";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

From df4c0aeff864f8d3308afc1f4386895fcd3e990d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 22 Feb 2017 23:21:27 +0100
Subject: [PATCH 0913/3449] shellcheck: reduce closure size

from 1.5GB to 20mb
---
 pkgs/top-level/all-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35fa5796807d..d7a4cce9468b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6708,7 +6708,12 @@ with pkgs;
 
   shards = callPackage ../development/tools/build-managers/shards { };
 
-  shellcheck = self.haskellPackages.ShellCheck;
+  shellcheck = haskell.lib.overrideCabal haskellPackages.ShellCheck (drv: {
+    isLibrary = false;
+    enableSharedExecutables = false;
+    doHaddock = false;
+    postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
+  });
 
   shncpd = callPackage ../tools/networking/shncpd { };
 

From 49641e0de006fdc5edd11292b1e94410c3bb8d79 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 22 Feb 2017 23:47:24 +0000
Subject: [PATCH 0914/3449] make-disk-image.nix: support additional filesystem
 contents

This makes make-disk-image.nix slightly more consistent with other image
builders we have. Unfortunately I duplicated some code in doing so, but
this is temporary duplication on the path to consolidating everything.
See https://github.com/NixOS/nixpkgs/issues/23052 for more details on that.

I'm also exposing the option in the amazon-image.nix maintainer module.
---
 nixos/lib/make-disk-image.nix                 | 47 ++++++++++++++++++-
 .../maintainers/scripts/ec2/amazon-image.nix  | 23 ++++++++-
 2 files changed, 67 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index e279803f2ea0..d9d76b5919a5 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -7,6 +7,12 @@
 , # The size of the disk, in megabytes.
   diskSize
 
+  # The files and directories to be placed in the target file system.
+  # This is a list of attribute sets {source, target} where `source'
+  # is the file system object (regular file or directory) to be
+  # grafted in the file system at path `target'.
+, contents ? []
+
 , # Whether the disk should be partitioned (with a single partition
   # containing the root filesystem) or contain the root filesystem
   # directly.
@@ -45,7 +51,14 @@ pkgs.vmTools.runInLinuxVM (
           ${pkgs.vmTools.qemu}/bin/qemu-img create -f ${format} $diskImage "${toString diskSize}M"
           mv closure xchg/
         '';
-      buildInputs = [ pkgs.utillinux pkgs.perl pkgs.e2fsprogs pkgs.parted ];
+      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;
@@ -98,6 +111,38 @@ pkgs.vmTools.runInLinuxVM (
       # Remove /etc/machine-id so that each machine cloning this image will get its own id
       rm -f /mnt/etc/machine-id
 
+      # 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
+
+      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 /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
 
       # Make sure resize2fs works
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index bfa4f4b3ca59..b4190df8335b 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -2,15 +2,34 @@
 
 with lib;
 
-{
+let
+  cfg = config.amazonImage;
+in {
 
   imports =
     [ ../../../modules/installer/cd-dvd/channel.nix
       ../../../modules/virtualisation/amazon-image.nix
     ];
 
-  system.build.amazonImage = import ../../../lib/make-disk-image.nix {
+  options.amazonImage = {
+    contents = mkOption {
+      example = literalExample ''
+        [ { source = pkgs.memtest86 + "/memtest.bin";
+            target = "boot/memtest.bin";
+          }
+        ]
+      '';
+      default = [];
+      description = ''
+        This option lists files to be copied to fixed locations in the
+        generated image. Glob patterns work.
+      '';
+    };
+  };
+
+  config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
     inherit lib config;
+    inherit (cfg) contents;
     pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
     partitioned = config.ec2.hvm;
     diskSize = if config.ec2.hvm then 2048 else 8192;

From 15c05ad21374f02c0b8de9c9f43ca9c143fb77d7 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 22 Feb 2017 23:51:57 +0000
Subject: [PATCH 0915/3449] google-compute-image.nix: fix evaluation failure

---
 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 0e6825c3f5da..556454c6b5f8 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -23,7 +23,7 @@ in
 
           postVM =
             ''
-              PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
+              PATH=$PATH:${pkgs.stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]}
               pushd $out
               mv $diskImageBase disk.raw
               tar -Szcf $diskImageBase.tar.gz disk.raw

From 4689dd2a794eae486ccca35600e5144cea6242bd Mon Sep 17 00:00:00 2001
From: Thomas Lotze <thomas@thomas-lotze.net>
Date: Thu, 23 Feb 2017 00:18:56 +0100
Subject: [PATCH 0916/3449] cmus: enable opus support (re #23051)

Opus support was enabled since it didn't work in the past; I found it to be
working when I gave it a try now.
---
 pkgs/applications/audio/cmus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index bb2deb71ba20..39774a76334c 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -29,11 +29,11 @@
 , tremorSupport ? false, tremor ? null
 , vorbisSupport ? true, libvorbis ? null
 , wavpackSupport ? true, wavpack ? null
+, opusSupport ? true, opusfile ? null
 
 # can't make these work, something is broken
 #, aacSupport ? true, faac ? null
 #, mp4Support ? true, mp4v2 ? null
-#, opusSupport ? true, opusfile ? null
 
 # not in nixpkgs
 #, vtxSupport ? true, libayemu ? null
@@ -82,8 +82,8 @@ let
     (mkFlag tremorSupport  "CONFIG_TREMOR=y"  tremor)
     (mkFlag vorbisSupport  "CONFIG_VORBIS=y"  libvorbis)
     (mkFlag wavpackSupport "CONFIG_WAVPACK=y" wavpack)
+    (mkFlag opusSupport   "CONFIG_OPUS=y"    opusfile)
 
-    #(mkFlag opusSupport   "CONFIG_OPUS=y"    opusfile)
     #(mkFlag mp4Support    "CONFIG_MP4=y"     mp4v2)
     #(mkFlag aacSupport    "CONFIG_AAC=y"     faac)
 

From 744ce7e8e2d85c301137c10ba6c6c73c88c3d3db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 23 Feb 2017 01:06:57 +0100
Subject: [PATCH 0917/3449] cmus: enable aac support

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

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 39774a76334c..398bb7d84880 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -32,8 +32,8 @@
 , opusSupport ? true, opusfile ? null
 
 # can't make these work, something is broken
-#, aacSupport ? true, faac ? null
 #, mp4Support ? true, mp4v2 ? null
+, aacSupport ? true, faad2 ? null
 
 # not in nixpkgs
 #, vtxSupport ? true, libayemu ? null
@@ -85,7 +85,7 @@ let
     (mkFlag opusSupport   "CONFIG_OPUS=y"    opusfile)
 
     #(mkFlag mp4Support    "CONFIG_MP4=y"     mp4v2)
-    #(mkFlag aacSupport    "CONFIG_AAC=y"     faac)
+    (mkFlag aacSupport    "CONFIG_AAC=y"     faad2)
 
     #(mkFlag vtxSupport    "CONFIG_VTX=y"     libayemu)
   ];

From e868669c4ae8cf4cd3fa69fe8c61373c4dac373e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 23 Feb 2017 01:07:18 +0100
Subject: [PATCH 0918/3449] cmus: mp4 support

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

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 398bb7d84880..2f3c2a28b30e 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -32,8 +32,8 @@
 , opusSupport ? true, opusfile ? null
 
 # can't make these work, something is broken
-#, mp4Support ? true, mp4v2 ? null
 , aacSupport ? true, faad2 ? null
+, mp4Support ? true, mp4v2 ? null
 
 # not in nixpkgs
 #, vtxSupport ? true, libayemu ? null
@@ -84,7 +84,7 @@ let
     (mkFlag wavpackSupport "CONFIG_WAVPACK=y" wavpack)
     (mkFlag opusSupport   "CONFIG_OPUS=y"    opusfile)
 
-    #(mkFlag mp4Support    "CONFIG_MP4=y"     mp4v2)
+    (mkFlag mp4Support    "CONFIG_MP4=y"     mp4v2)
     (mkFlag aacSupport    "CONFIG_AAC=y"     faad2)
 
     #(mkFlag vtxSupport    "CONFIG_VTX=y"     libayemu)

From ceac00d82b26a10b8572048bdd0a03216fc59ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 23 Feb 2017 01:04:26 +0100
Subject: [PATCH 0919/3449] mp4v2: 1.9.1p4 -> 2.0.0

---
 .../libraries/mp4v2/A00-nero-vobsub.patch     | 142 ------------------
 .../libraries/mp4v2/A01-divide-zero.patch     |  22 ---
 .../libraries/mp4v2/P00-mingw-dllimport.patch |  11 --
 pkgs/development/libraries/mp4v2/default.nix  |   9 +-
 4 files changed, 4 insertions(+), 180 deletions(-)
 delete mode 100644 pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch
 delete mode 100644 pkgs/development/libraries/mp4v2/A01-divide-zero.patch
 delete mode 100644 pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch

diff --git a/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch b/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch
deleted file mode 100644
index beb8be6d892d..000000000000
--- a/pkgs/development/libraries/mp4v2/A00-nero-vobsub.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff -Naur mp4v2-trunk-r355/include/mp4v2/general.h mp4v2-trunk-r355/include/mp4v2/general.h
---- mp4v2-trunk-r355/include/mp4v2/general.h	2009-05-23 06:09:58.000000000 -0700
-+++ mp4v2-trunk-r355/include/mp4v2/general.h	2010-05-23 14:22:21.949288657 -0700
-@@ -75,6 +75,7 @@
- #define MP4_CNTL_TRACK_TYPE     "cntl"  /**< Constant: control track. */
- #define MP4_TEXT_TRACK_TYPE     "text"  /**< Constant: text track. */
- #define MP4_SUBTITLE_TRACK_TYPE "sbtl"  /**< Constant: subtitle track. */
-+#define MP4_SUBPIC_TRACK_TYPE   "subp"  /**< Constant: subtitle track. */
- /*
-  * This second set of track types should be created
-  * via MP4AddSystemsTrack(type)
-diff -Naur mp4v2-trunk-r355/include/mp4v2/track.h mp4v2-trunk-r355/include/mp4v2/track.h
---- mp4v2-trunk-r355/include/mp4v2/track.h	2009-05-23 06:21:49.000000000 -0700
-+++ mp4v2-trunk-r355/include/mp4v2/track.h	2010-05-23 15:43:47.249286008 -0700
-@@ -310,6 +310,13 @@
-     uint16_t      height );
- 
- MP4V2_EXPORT
-+MP4TrackId MP4AddSubpicTrack(
-+    MP4FileHandle hFile,
-+    uint32_t      timescale,
-+    uint16_t      width,
-+    uint16_t      height );
-+
-+MP4V2_EXPORT
- MP4TrackId MP4AddPixelAspectRatio(
-     MP4FileHandle hFile,
-     MP4TrackId    refTrackId,
-diff -Naur mp4v2-trunk-r355/src/descriptors.h mp4v2-trunk-r355/src/descriptors.h
---- mp4v2-trunk-r355/src/descriptors.h	2009-05-20 19:52:32.000000000 -0700
-+++ mp4v2-trunk-r355/src/descriptors.h	2010-05-23 16:29:34.800935677 -0700
-@@ -119,6 +119,7 @@
- // ES objectTypeId
- const uint8_t MP4SystemsV1ObjectType            = 0x01;
- const uint8_t MP4SystemsV2ObjectType            = 0x02;
-+const uint8_t MP4SubpicObjectType               = 0xe0;
- 
- // ES streamType
- const uint8_t MP4ObjectDescriptionStreamType    = 0x01;
-@@ -131,6 +132,7 @@
- const uint8_t MP4OCIStreamType                  = 0x08;
- const uint8_t MP4MPEGJStreamType                = 0x09;
- const uint8_t MP4UserPrivateStreamType          = 0x20;
-+const uint8_t MP4NeroSubpicStreamType           = 0x38;
- 
- ///////////////////////////////////////////////////////////////////////////////
- 
-diff -Naur mp4v2-trunk-r355/src/mp4.cpp mp4v2-trunk-r355/src/mp4.cpp
---- mp4v2-trunk-r355/src/mp4.cpp	2009-05-23 06:29:37.000000000 -0700
-+++ mp4v2-trunk-r355/src/mp4.cpp	2010-05-23 15:45:28.852222074 -0700
-@@ -1174,6 +1174,23 @@
-         return MP4_INVALID_TRACK_ID;
-     }
- 
-+    MP4TrackId MP4AddSubpicTrack(MP4FileHandle hFile,
-+                                   uint32_t timescale,
-+                                   uint16_t width,
-+                                   uint16_t height)
-+    {
-+        if (MP4_IS_VALID_FILE_HANDLE(hFile)) {
-+            try {
-+                return ((MP4File*)hFile)->AddSubpicTrack(timescale, width, height);
-+            }
-+            catch (MP4Error* e) {
-+                PRINT_ERROR(e);
-+                delete e;
-+            }
-+        }
-+        return MP4_INVALID_TRACK_ID;
-+    }
-+
-     MP4TrackId MP4AddChapterTextTrack(
-         MP4FileHandle hFile, MP4TrackId refTrackId, uint32_t timescale)
-     {
-diff -Naur mp4v2-trunk-r355/src/mp4file.cpp mp4v2-trunk-r355/src/mp4file.cpp
---- mp4v2-trunk-r355/src/mp4file.cpp	2009-05-26 19:34:56.000000000 -0700
-+++ mp4v2-trunk-r355/src/mp4file.cpp	2010-05-23 16:32:52.654220633 -0700
-@@ -2095,6 +2095,50 @@
-     return trackId;
- }
- 
-+MP4TrackId MP4File::AddSubpicTrack(uint32_t timescale,
-+                                     uint16_t width,
-+                                     uint16_t height)
-+{
-+    MP4TrackId trackId =
-+        AddTrack(MP4_SUBPIC_TRACK_TYPE, timescale);
-+
-+    InsertChildAtom(MakeTrackName(trackId, "mdia.minf"), "nmhd", 0);
-+
-+    (void)AddChildAtom(MakeTrackName(trackId, "mdia.minf.stbl.stsd"), "mp4s");
-+
-+    SetTrackFloatProperty(trackId, "tkhd.width", width);
-+    SetTrackFloatProperty(trackId, "tkhd.height", height);
-+    SetTrackIntegerProperty(trackId, "tkhd.layer", 0);
-+
-+    // stsd is a unique beast in that it has a count of the number
-+    // of child atoms that needs to be incremented after we add the mp4s atom
-+    MP4Integer32Property* pStsdCountProperty;
-+    FindIntegerProperty(
-+        MakeTrackName(trackId, "mdia.minf.stbl.stsd.entryCount"),
-+        (MP4Property**)&pStsdCountProperty);
-+    pStsdCountProperty->IncrementValue();
-+
-+    SetTrackIntegerProperty(trackId,
-+                            "mdia.minf.stbl.stsd.mp4s.esds.ESID",
-+#if 0
-+                            // note - for a file, these values need to
-+                            // be 0 - wmay - 04/16/2003
-+                            trackId
-+#else
-+                            0
-+#endif
-+                           );
-+
-+    SetTrackIntegerProperty(trackId,
-+                            "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.objectTypeId",
-+                            MP4SubpicObjectType);
-+
-+    SetTrackIntegerProperty(trackId,
-+                            "mdia.minf.stbl.stsd.mp4s.esds.decConfigDescr.streamType",
-+                            MP4NeroSubpicStreamType);
-+    return trackId;
-+}
-+
- MP4TrackId MP4File::AddChapterTextTrack(MP4TrackId refTrackId, uint32_t timescale)
- {
-     // validate reference track id
-diff -Naur mp4v2-trunk-r355/src/mp4file.h mp4v2-trunk-r355/src/mp4file.h
---- mp4v2-trunk-r355/src/mp4file.h	2009-05-23 06:29:37.000000000 -0700
-+++ mp4v2-trunk-r355/src/mp4file.h	2010-05-23 15:44:57.568026299 -0700
-@@ -388,6 +388,10 @@
-                                 uint16_t width,
-                                 uint16_t height);
- 
-+    MP4TrackId AddSubpicTrack(uint32_t timescale,
-+                                uint16_t width,
-+                                uint16_t height);
-+
-     MP4TrackId AddPixelAspectRatio(MP4TrackId trackId, uint32_t hSpacing, uint32_t vSpacing);
-     MP4TrackId AddColr(MP4TrackId trackId, uint16_t pri, uint16_t tran, uint16_t mat);
- 
diff --git a/pkgs/development/libraries/mp4v2/A01-divide-zero.patch b/pkgs/development/libraries/mp4v2/A01-divide-zero.patch
deleted file mode 100644
index 4d6aa4d2a394..000000000000
--- a/pkgs/development/libraries/mp4v2/A01-divide-zero.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- mp4v2-r355/src/mp4track.cpp	2012-01-05 15:44:29.000000000 +0100
-+++ mp4v2-r355/src/mp4track.cpp	2012-01-05 15:47:34.000000000 +0100
-@@ -819,13 +819,14 @@
-                 (thisSecStart + timeScale) - lastSampleTime;
-             // calculate the duration of the last sample
-             MP4Duration lastSampleDur = sampleTime - lastSampleTime;
--            uint32_t overflow_bytes;
-             // now, calculate the number of bytes we overflowed.  Round up.
--            overflow_bytes =
--                ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur;
-+            if( lastSampleDur > 0 ) {
-+                uint32_t overflow_bytes = 0;
-+                overflow_bytes = ((lastSampleSize * overflow_dur) + (lastSampleDur - 1)) / lastSampleDur;
- 
--            if (bytesThisSec - overflow_bytes > maxBytesPerSec) {
--                maxBytesPerSec = bytesThisSec - overflow_bytes;
-+                if (bytesThisSec - overflow_bytes > maxBytesPerSec) {
-+                    maxBytesPerSec = bytesThisSec - overflow_bytes;
-+                }
-             }
- 
-             // now adjust the values for this sample.  Remove the bytes
diff --git a/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch b/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch
deleted file mode 100644
index 5b7f1a300bd8..000000000000
--- a/pkgs/development/libraries/mp4v2/P00-mingw-dllimport.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mp4v2-trunk-r355/include/mp4v2/platform.h	2009-05-20 19:52:26.000000000 -0700
-+++ xxx/include/mp4v2/platform.h	2010-09-11 09:36:20.881523832 -0700
-@@ -24,7 +24,7 @@
- #if defined( _WIN32 ) || defined( __MINGW32__ )
- #   if defined( _WINDLL ) || defined( DLL_EXPORT )
- #       define MP4V2_EXPORT __declspec(dllexport)
--#   elif defined( _DLL ) || defined( DLL_IMPORT ) 
-+#   elif defined( DLL_IMPORT ) 
- #       define MP4V2_EXPORT __declspec(dllimport)
- #   else
- #       define MP4V2_EXPORT
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index 642f93872eba..48abf2b61513 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -1,18 +1,17 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "mp4v2-1.9.1p4";
+  name = "mp4v2-2.0.0";
 
   src = fetchurl {
-    url = "http://mp4v2.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "1d73qbi0faqad3bpmjfr4kk0mfmqpl1f43ysrx4gq9i3mfp1qf2w";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/mp4v2/${name}.tar.bz2";
+    sha256 = "0f438bimimsvxjbdp4vsr8hjw2nwggmhaxgcw07g2z361fkbj683";
   };
 
   # From Handbrake
   # mp4v2 doesn't seem to be actively maintained any more :-/
   patches = [
-    ./A00-nero-vobsub.patch ./A01-divide-zero.patch ./A02-meaningful-4gb-warning.patch
-    ./P00-mingw-dllimport.patch
+    ./A02-meaningful-4gb-warning.patch
   ];
   # `faac' expects `mp4.h'.
   postInstall = "ln -s mp4v2/mp4v2.h $out/include/mp4.h";

From f25ff18c9858d78eb63c4fa56b41745aee9046f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Thu, 23 Feb 2017 01:31:07 +0100
Subject: [PATCH 0920/3449] cmus: let ffmpeg handle mp4/aac

---
 pkgs/applications/audio/cmus/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix
index 2f3c2a28b30e..c9346248438b 100644
--- a/pkgs/applications/audio/cmus/default.nix
+++ b/pkgs/applications/audio/cmus/default.nix
@@ -31,9 +31,8 @@
 , wavpackSupport ? true, wavpack ? null
 , opusSupport ? true, opusfile ? null
 
-# can't make these work, something is broken
-, aacSupport ? true, faad2 ? null
-, mp4Support ? true, mp4v2 ? null
+, aacSupport ? false, faad2 ? null # already handled by ffmpeg
+, mp4Support ? false, mp4v2 ? null # ffmpeg does support mp4 better
 
 # not in nixpkgs
 #, vtxSupport ? true, libayemu ? null

From 6c37a92b2bdb77465b9486e904b83895b2b45596 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 22 Feb 2017 20:52:15 -0500
Subject: [PATCH 0921/3449] firebird: 2.5.6.27020-0 -> 2.5.7.27050-0 for
 '2.5.7.27050-0' bypass

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

diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index 18d8bf5cd195..da54936092b3 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -38,7 +38,7 @@
 */
 
 stdenv.mkDerivation rec {
-  version = "2.5.6.27020-0";
+  version = "2.5.7.27050-0";
   name = "firebird-${version}";
 
   # enableParallelBuilding = false; build fails
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/firebird/Firebird-${version}.tar.bz2";
-    sha256 = "0887a813wffp44hnc2gmwbc4ylpqw3fh3hz3bf6q3648344a9fdv";
+    sha256 = "06hp6bq5irqvm3h03s79qjgcc3jsjpq150y9aq7anklx9v4nhfqa";
   };
 
   hardeningDisable = [ "format" ];

From c8859b7264ec8b3dc8c5e9750cf461ac20615e52 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 22 Feb 2017 21:09:14 -0500
Subject: [PATCH 0922/3449] libplist: mark as insecure

Patches currently available don't seem to apply.
---
 pkgs/development/libraries/libplist/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 4de5a23569e8..b98fdbdb470d 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -28,5 +28,12 @@ in stdenv.mkDerivation rec {
     homepage = http://github.com/JonathanBeck/libplist;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.urkud ];
+    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"
+      "CVE-2017-5834: A heap-buffer overflow in parse_dict_node"
+      "CVE-2017-5835: A memory allocation error leading to DoS"
+      "CVE-2017-5836: A type inconsistency in bplist.c"
+    ];
   };
 }

From 59bb3d1f3f490e5518db269c2b6383a8fe710072 Mon Sep 17 00:00:00 2001
From: Itai Zukerman <zukerman@math-hat.com>
Date: Wed, 15 Feb 2017 07:40:27 -0800
Subject: [PATCH 0923/3449] bazel: remove dependence on buildFHSUserEnv

---
 .../build-managers/bazel/bin_to_env.patch     | 207 ++++++++++++++++++
 .../tools/build-managers/bazel/default.nix    |  94 ++++----
 .../bazel/java_stub_template.patch            |  16 --
 3 files changed, 252 insertions(+), 65 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/bazel/bin_to_env.patch
 delete mode 100644 pkgs/development/tools/build-managers/bazel/java_stub_template.patch

diff --git a/pkgs/development/tools/build-managers/bazel/bin_to_env.patch b/pkgs/development/tools/build-managers/bazel/bin_to_env.patch
new file mode 100644
index 000000000000..b65bb681f235
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/bin_to_env.patch
@@ -0,0 +1,207 @@
+diff -ur a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
+--- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java	1980-01-01 00:00:00.000000000 -0800
++++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java	2017-02-19 15:37:06.021759347 -0800
+@@ -242,7 +242,7 @@
+   private static Artifact buildCommandLineArtifact(RuleContext ruleContext, String command,
+       String scriptPostFix) {
+     String scriptFileName = ruleContext.getTarget().getName() + scriptPostFix;
+-    String scriptFileContents = "#!/bin/bash\n" + command;
++    String scriptFileContents = "#!/usr/bin/env bash\n" + command;
+     Artifact scriptFileArtifact = FileWriteAction.createFile(
+         ruleContext, scriptFileName, scriptFileContents, /*executable=*/true);
+     return scriptFileArtifact;
+diff -ur a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
+--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java	1980-01-01 00:00:00.000000000 -0800
++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java	2017-02-19 15:37:06.022759356 -0800
+@@ -73,7 +73,7 @@
+         return new PathFragment("/usr/local/bin/bash");
+       }
+     }
+-    return new PathFragment("/bin/bash");
++    return new PathFragment("bash");
+   }
+ 
+   @Override
+diff -ur a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt
+--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt	1980-01-01 00:00:00.000000000 -0800
++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt	2017-02-19 15:37:06.022759356 -0800
+@@ -1,4 +1,4 @@
+-#!/bin/bash --posix
++#!/usr/bin/env bash
+ # Copyright 2014 The Bazel Authors. All rights reserved.
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+diff -ur a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java
+--- a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java	1980-01-01 00:00:00.000000000 -0800
++++ b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java	2017-02-19 15:37:06.022759356 -0800
+@@ -70,7 +70,7 @@
+     }
+ 
+     try {
+-      new Command(new String[] {"/bin/true", null}).execute();
++      new Command(new String[] {"/usr/bin/env", "true", null}).execute();
+       fail("Should have thrown NullPointerException");
+     } catch (NullPointerException npe) {
+       // good
+@@ -185,7 +185,7 @@
+ 
+   @Test
+   public void testNoStreamingInputForCat() throws Exception {
+-    final Command command = new Command(new String[]{"/bin/cat"});
++    final Command command = new Command(new String[]{"/usr/bin/env", "cat"});
+     ByteArrayInputStream emptyInput = new ByteArrayInputStream(new byte[0]);
+     ByteArrayOutputStream out = new ByteArrayOutputStream();
+     ByteArrayOutputStream err = new ByteArrayOutputStream();
+@@ -198,7 +198,7 @@
+ 
+   @Test
+   public void testNoInputForCat() throws Exception {
+-    final Command command = new Command(new String[]{"/bin/cat"});
++    final Command command = new Command(new String[]{"/usr/bin/env", "cat"});
+     CommandResult result = command.execute();
+     assertTrue(result.getTerminationStatus().success());
+     assertThat(new String(result.getStdout(), "UTF-8")).isEmpty();
+@@ -208,7 +208,7 @@
+   @Test
+   public void testProvidedOutputStreamCapturesHelloWorld() throws Exception {
+     String helloWorld = "Hello, world.";
+-    final Command command = new Command(new String[]{"/bin/echo", helloWorld});
++    final Command command = new Command(new String[]{"/usr/bin/env", "echo", helloWorld});
+     ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
+     ByteArrayOutputStream stdErr = new ByteArrayOutputStream();
+     command.execute(Command.NO_INPUT, Command.NO_OBSERVER, stdOut, stdErr);
+@@ -250,7 +250,7 @@
+   public void testAsynchronousWithOutputStreams() throws Exception {
+ 
+     final String helloWorld = "Hello, world.";
+-    final Command command = new Command(new String[]{"/bin/echo", helloWorld});
++    final Command command = new Command(new String[]{"/usr/bin/env", "echo", helloWorld});
+     final ByteArrayInputStream emptyInput =
+       new ByteArrayInputStream(new byte[0]);
+     final ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
+@@ -363,12 +363,12 @@
+     for (int exit : new int[] { -1, -2, -3 }) {
+       int expected = 256 + exit;
+       try {
+-        String args[] = { "/bin/bash", "-c", "exit " + exit };
++        String args[] = { "/usr/bin/env", "bash", "-c", "exit " + exit };
+         new Command(args).execute();
+         fail("Should have exited with status " + expected);
+       } catch (BadExitStatusException e) {
+         assertThat(e).hasMessage("Process exited with status " + expected);
+-        checkCommandElements(e, "/bin/bash", "-c", "exit " + exit);
++        checkCommandElements(e, "/usr/bin/env", "bash", "-c", "exit " + exit);
+         TerminationStatus status = e.getResult().getTerminationStatus();
+         assertFalse(status.success());
+         assertTrue(status.exited());
+@@ -471,7 +471,7 @@
+   public void testFlushing() throws Exception {
+     final Command command = new Command(
+         // On darwin, /bin/sh does not support -n for the echo builtin.
+-        new String[] {"/bin/bash", "-c", "echo -n Foo; sleep 0.1; echo Bar"});
++        new String[] {"/usr/bin/env", "bash", "-c", "echo -n Foo; sleep 0.1; echo Bar"});
+     // We run this command, passing in a special output stream
+     // that records when each flush() occurs.
+     // We test that a flush occurs after writing "Foo"
+@@ -541,13 +541,13 @@
+         throw new IOException();
+       }
+     };
+-    Command command = new Command(new String[] {"/bin/echo", "foo"});
++    Command command = new Command(new String[] {"/usr/bin/env", "echo", "foo"});
+     try {
+       command.execute(Command.NO_INPUT, Command.NO_OBSERVER, out, out);
+       fail();
+     } catch (AbnormalTerminationException e) {
+       // Good.
+-      checkCommandElements(e, "/bin/echo", "foo");
++      checkCommandElements(e, "/usr/bin/env", "echo", "foo");
+       assertThat(e).hasMessage("java.io.IOException");
+     }
+   }
+diff -ur a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java
+--- a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java	1980-01-01 00:00:00.000000000 -0800
++++ b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java	2017-02-19 16:17:42.973071187 -0800
+@@ -60,7 +60,7 @@
+ 
+     // We interrupt after 1 sec, so this gives us plenty of time for the library to notice the
+     // subprocess exit.
+-    this.command = new Command(new String[] { "/bin/sleep", "20" });
++    this.command = new Command(new String[] { "/usr/bin/env", "sleep", "20" });
+ 
+     interrupter.start();
+   }
+diff -ur a/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java b/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java
+--- a/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java	1980-01-01 00:00:00.000000000 -0800
++++ b/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java	2017-02-19 15:37:06.022759356 -0800
+@@ -66,7 +66,7 @@
+ 
+   @Test
+   public void testLoad() throws Throwable {
+-    final Command command = new Command(new String[] {"/bin/cat",
++    final Command command = new Command(new String[] {"/usr/bin/env", "cat",
+                                         tempFile.getAbsolutePath()});
+     Thread[] threads = new Thread[10];
+     List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<Throwable>());
+diff -ur a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
+--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java	1980-01-01 00:00:00.000000000 -0800
++++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java	2017-02-19 15:37:06.022759356 -0800
+@@ -523,7 +523,7 @@
+     @SuppressWarnings("unchecked")
+     List<String> argv = (List<String>) (List<?>) (MutableList) lookup("argv");
+     assertThat(argv).hasSize(3);
+-    assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0));
++    assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0));
+     assertThat(argv.get(1)).isEqualTo("-c");
+     assertThat(argv.get(2)).isEqualTo("I got the World on a string");
+   }
+@@ -558,7 +558,7 @@
+     @SuppressWarnings("unchecked")
+     List<String> argv = (List<String>) (List<?>) (MutableList) lookup("argv");
+     assertThat(argv).hasSize(3);
+-    assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0));
++    assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0));
+     assertThat(argv.get(1)).isEqualTo("-c");
+     assertMatches("argv[2]", "A.*/mytool .*/mytool.sh B.*file3.dat", argv.get(2));
+   }
+@@ -588,7 +588,7 @@
+     @SuppressWarnings("unchecked")
+     List<String> argv = (List<String>) (List<?>) (MutableList) lookup("argv");
+     assertThat(argv).hasSize(2);
+-    assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0));
++    assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0));
+     assertMatches("argv[1]", "^.*/resolve_me[.]script[.]sh$", argv.get(1));
+   }
+ 
+diff -ur a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+--- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java	1980-01-01 00:00:00.000000000 -0800
++++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java	2017-02-19 16:27:27.851399769 -0800
+@@ -162,16 +162,16 @@
+   }
+ 
+   private static String getFalseCommand() {
+-    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/false" : "/bin/false";
++    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/false" : "false";
+   }
+ 
+   private static String getTrueCommand() {
+-    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/true" : "/bin/true";
++    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/true" : "true";
+   }
+ 
+   @Test
+   public void testBinEchoPrintsArguments() throws Exception {
+-    Spawn spawn = createSpawn("/bin/echo", "Hello,", "world.");
++    Spawn spawn = createSpawn("/usr/bin/env", "echo", "Hello,", "world.");
+     run(spawn);
+     assertEquals("Hello, world.\n", out());
+     assertThat(err()).isEmpty();
+@@ -179,7 +179,7 @@
+ 
+   @Test
+   public void testCommandRunsInWorkingDir() throws Exception {
+-    Spawn spawn = createSpawn("/bin/pwd");
++    Spawn spawn = createSpawn("/usr/bin/env", "pwd");
+     run(spawn);
+     assertEquals(executor.getExecRoot() + "\n", out());
+   }
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 7b98ce7898af..195041f4b28a 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, buildFHSUserEnv, writeScript, jdk, zip, unzip,
-  which, makeWrapper, binutils }:
+{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, perl }:
 
-let
+stdenv.mkDerivation rec {
 
   version = "0.4.4";
 
@@ -13,60 +12,57 @@ let
     platforms = platforms.linux;
   };
 
-  bootstrapEnv = buildFHSUserEnv {
-    name = "bazel-bootstrap-env";
+  name = "bazel-${version}";
 
-    targetPkgs = pkgs: [ ];
-
-    inherit meta;
+  src = fetchurl {
+    url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
+    sha256 = "1fwfahkqi680zyxmdriqj603lpacyh6cg6ff25bn9bkilbfj2anm";
   };
 
-  bazelBinary = stdenv.mkDerivation rec {
+  sourceRoot = ".";
 
-    name = "bazel-${version}";
+  patches = [ ./bin_to_env.patch ];
 
-    src = fetchurl {
-      url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-      sha256 = "1fwfahkqi680zyxmdriqj603lpacyh6cg6ff25bn9bkilbfj2anm";
-    };
+  postPatch = ''
+    patchShebangs ./compile.sh
+    for d in scripts src/java_tools src/test src/tools third_party/ijar/test tools; do
+      patchShebangs $d
+    done
+  '';
 
-    sourceRoot = ".";
+  buildInputs = [
+    stdenv.cc
+    stdenv.cc.cc.lib
+    bash
+    jdk
+    zip
+    unzip
+    which
+    binutils
+  ];
 
-    patches = [ ./java_stub_template.patch ];
+  # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
+  # detector (see com.google.devtools.build.lib.skyframe.FileFunction).
+  # Change this to $(mktemp -d) as soon as we figure out why.
 
-    packagesNotFromEnv = [
-        stdenv.cc stdenv.cc.cc.lib jdk which zip unzip binutils ];
-    buildInputs = packagesNotFromEnv ++ [ bootstrapEnv makeWrapper ];
+  buildPhase = ''
+    export TMPDIR=/tmp
+    ./compile.sh
+  '';
 
-    buildTimeBinPath = stdenv.lib.makeBinPath packagesNotFromEnv;
-    buildTimeLibPath = stdenv.lib.makeLibraryPath packagesNotFromEnv;
+  # Build the CPP and Java examples to verify that Bazel works.
+  doCheck = true;
+  checkPhase = ''
+    export TEST_TMPDIR=$(pwd)
+    ./output/bazel test examples/cpp:hello-success_test
+    ./output/bazel test examples/java-native/src/test/java/com/example/myproject:hello
+  '';
 
-    runTimeBinPath = stdenv.lib.makeBinPath [ jdk stdenv.cc.cc ];
-    runTimeLibPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ];
+  installPhase = ''
+    mkdir -p $out/bin
+    mv output/bazel $out/bin
+  '';
 
-    buildWrapper = writeScript "build-wrapper.sh" ''
-      #! ${stdenv.shell} -e
-      export PATH="${buildTimeBinPath}:$PATH"
-      export LD_LIBRARY_PATH="${buildTimeLibPath}:$LD_LIBRARY_PATH"
-      ./compile.sh
-    '';
-
-    buildPhase = ''
-      bazel-bootstrap-env ${buildWrapper}
-    '';
-
-    installPhase = ''
-      mkdir -p $out/bin
-      cp output/bazel $out/bin/
-      wrapProgram $out/bin/bazel \
-          --suffix PATH ":" "${runTimeBinPath}" \
-          --suffix LD_LIBRARY_PATH ":" "${runTimeLibPath}"
-    '';
-
-    dontStrip = true;
-    dontPatchELF = true;
-
-    inherit meta;
-  };
-
-in bazelBinary
+  dontStrip = true;
+  dontPatchELF = true;
+}
diff --git a/pkgs/development/tools/build-managers/bazel/java_stub_template.patch b/pkgs/development/tools/build-managers/bazel/java_stub_template.patch
deleted file mode 100644
index 4e456a78d800..000000000000
--- a/pkgs/development/tools/build-managers/bazel/java_stub_template.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit 5525326e3287243e0e7417de96bf7d58d04b4c8b
-Author: Irene Knapp <ireneista@google.com>
-Date:   Sat Oct 8 19:36:12 2016 -0700
-
-    Change #!/bin/bash to #!/usr/bin/env bash.
-
-diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt
-index f77051f..fbf367a 100644
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt
-@@ -1,4 +1,4 @@
--#!/bin/bash --posix
-+#!/usr/bin/env bash
- # Copyright 2014 The Bazel Authors. All rights reserved.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");

From f4d188b37a8750a3d2dd28efbfb2a6aaf7d482e5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 23 Feb 2017 15:56:28 +0800
Subject: [PATCH 0924/3449] msmtp: 1.6.4 -> 1.6.6

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

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 0754d4f28151..8e3668a9823b 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.4";
+  version = "1.6.6";
   name = "msmtp-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/msmtp/${name}.tar.xz";
-    sha256 = "1kfihblm769s4hv8iah5mqynqd6hfwlyz5rcg2v423a4llic0jcv";
+    sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs";
   };
 
   buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]

From 1c466059d187b13665d258dbb4daafbcb4d557ec Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 23 Feb 2017 15:57:53 +0800
Subject: [PATCH 0925/3449] msmtp: clean up msmtpq

 - replace relative bin paths with absolute filenames in the nix store
 - make the log and queue paths configurable
 - log to the journal on linux
---
 .../applications/networking/msmtp/default.nix | 45 ++++++---
 .../applications/networking/msmtp/paths.patch | 96 +++++++++++++++++++
 2 files changed, 128 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/applications/networking/msmtp/paths.patch

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 8e3668a9823b..1eab140e1d7a 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,30 +1,49 @@
-{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
+{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
+, openssl, netcat, gnutls, gsasl, libidn, Security, systemd }:
 
-stdenv.mkDerivation rec {
-  version = "1.6.6";
+let
+  tester = "n"; # {x| |p|P|n|s}
+  journal = if stdenv.isLinux then "y" else "n";
+
+in stdenv.mkDerivation rec {
   name = "msmtp-${version}";
+  version = "1.6.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/msmtp/${name}.tar.xz";
     sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs";
   };
 
-  buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
+  patches = [
+    ./paths.patch
+  ];
+
+  buildInputs = [ openssl gnutls gsasl libidn ]
     ++ stdenv.lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   configureFlags =
     stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
 
   postInstall = ''
-    cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/
-    chmod +x $prefix/bin/msmtp-queue $prefix/bin/msmtpq
+    substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \
+      --replace @msmtp@      $out/bin/msmtp \
+      --replace @nc@         ${netcat}/bin/nc \
+      --replace @journal@    ${journal} \
+      ${lib.optionalString (journal == "y") "--replace @systemdcat@ ${systemd}/bin/systemd-cat" } \
+      --replace @test@       ${tester}
+
+    substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \
+      --replace @msmtpq@ $out/bin/msmtpq
+
+    chmod +x $out/bin/*
   '';
 
-  meta = {
-      description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
-      homepage = "http://msmtp.sourceforge.net/";
-      license = stdenv.lib.licenses.gpl3;
-      maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = stdenv.lib.platforms.unix;
-    };
+  meta = with stdenv.lib; {
+    description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
+    homepage = "http://msmtp.sourceforge.net/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ garbas peterhoeg ];
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/applications/networking/msmtp/paths.patch b/pkgs/applications/networking/msmtp/paths.patch
new file mode 100644
index 000000000000..38e4155a1137
--- /dev/null
+++ b/pkgs/applications/networking/msmtp/paths.patch
@@ -0,0 +1,96 @@
+diff --git a/scripts/msmtpq/msmtp-queue b/scripts/msmtpq/msmtp-queue
+index 1dc220d..d834241 100755
+--- a/scripts/msmtpq/msmtp-queue
++++ b/scripts/msmtpq/msmtp-queue
+@@ -27,4 +27,4 @@
+ ## change the below line to be
+ ##   exec /path/to/msmtpq --q-mgmt
+ 
+-exec msmtpq --q-mgmt "$1"
++exec @msmtpq@ --q-mgmt "$1"
+diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq
+index bdb4fb8..1363a67 100755
+--- a/scripts/msmtpq/msmtpq
++++ b/scripts/msmtpq/msmtpq
+@@ -59,7 +59,7 @@ err() { dsp '' "$@" '' ; exit 1 ; }
+ ##   enter the location of the msmtp executable  (no quotes !!)
+ ##   e.g. ( MSMTP=/path/to/msmtp )
+ ##   and uncomment the test for its existence
+-MSMTP=msmtp
++MSMTP=@msmtp@
+ #[ -x "$MSMTP" ] || \
+ #  log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]"   # if not found - complain ; quit
+ ##
+@@ -70,9 +70,8 @@ MSMTP=msmtp
+ ##            ( chmod 0700 msmtp.queue )
+ ##
+ ## the queue dir - modify this to reflect where you'd like it to be  (no quotes !!)
+-Q=~/.msmtp.queue
+-[ -d "$Q" ] || \
+-  err '' "msmtpq : can't find msmtp queue directory [ $Q ]" ''     # if not present - complain ; quit
++Q=${MSMTP_QUEUE:-~/.msmtp.queue}
++test -d "$Q" || mkdir -p "$Q"
+ ##
+ ## set the queue log file var to the location of the msmtp queue log file
+ ##   where it is or where you'd like it to be
+@@ -84,7 +83,10 @@ Q=~/.msmtp.queue
+ ##     (doing so would be inadvisable under most conditions, however)
+ ##
+ ## the queue log file - modify (or comment out) to taste  (but no quotes !!)
+-LOG=~/log/msmtp.queue.log
++LOG=${MSMTP_LOG:-~/log/msmtp.queue.log}
++test -d "$(dirname $LOG)" || mkdir -p "$(dirname $LOG)"
++
++JOURNAL=@journal@
+ ## ======================================================================================
+ 
+ ## msmtpq can use the following environment variables :
+@@ -108,7 +110,7 @@ LOG=~/log/msmtp.queue.log
+ ##
+ #EMAIL_CONN_NOTEST=y                 # deprecated ; use below var
+ #EMAIL_CONN_TEST={x| |p|P|n|s}       # see settings above for EMAIL_CONN_TEST
+-EMAIL_CONN_TEST=n
++EMAIL_CONN_TEST=@test@
+ #EMAIL_QUEUE_QUIET=t
+ ## ======================================================================================
+ 
+@@ -138,6 +140,7 @@ on_exit() {                          # unlock the queue on exit if the lock was
+ ## display msg to user, as well
+ ##
+ log() {
++  local NAME=msmtpq
+   local ARG RC PFX="$('date' +'%Y %d %b %H:%M:%S')"
+                                      # time stamp prefix - "2008 13 Mar 03:59:45 "
+   if [ "$1" = '-e' ] ; then          # there's an error exit code
+@@ -154,10 +157,19 @@ log() {
+     done
+   fi
+ 
++  if [ "$JOURNAL" == "y" ] ; then
++    for ARG ; do
++      [ -n "$ARG" ] && \
++        echo "$PFX : $ARG" | @systemdcat@ -t $NAME -p info
++    done
++  fi
++
+   if [ -n "$RC" ] ; then             # an error ; leave w/error return
+     [ -n "$LKD" ] && lock_queue -u   # unlock here (if locked)
+     [ -n "$LOG" ] && \
+       echo "    exit code = $RC" >> "$LOG" # logging ok ; send exit code to log
++    [ "$JOURNAL" == "y" ] && \
++      echo "exit code= $RC" | @systemdcat@ -t $NAME -p emerg
+     exit $RC                         # exit w/return code
+   fi
+ }
+@@ -207,10 +219,7 @@ connect_test() {
+     ping -qnc1 -w4 8.8.8.8 >/dev/null 2>&1 || return 1
+ 
+   elif [ "$EMAIL_CONN_TEST" = 'n' ] ; then                     # use netcat (nc) test
+-    # must, of course, have netcat (nc) installed
+-    which nc >/dev/null 2>&1 || \
+-      log -e 1 "msmtpq : can't find netcat executable [ nc ]"  # if not found - complain ; quit
+-    'nc' -vz www.debian.org 80 >/dev/null 2>&1 || return 1
++    @nc@ -vz www.debian.org 80 >/dev/null 2>&1 || return 1
+ 
+   elif [ "$EMAIL_CONN_TEST" = 's' ] ; then                     # use sh sockets test
+     # note that this does not work on debian systems

From 8352e0b38c65a736219619d8821ad50f787e58d1 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Sat, 18 Feb 2017 22:54:02 +0100
Subject: [PATCH 0926/3449] ocaml-ipaddr: 2.6.1 -> 2.7.2

Keeps the legacy version under attribute `ipaddr_p4`;
it is needed for OCaml < 4.02 and some libraries (eg `conduit`).
---
 .../ocaml-modules/conduit/default.nix         |  4 +--
 .../ocaml-modules/ipaddr/2.6.1.nix            | 32 +++++++++++++++++++
 .../ocaml-modules/ipaddr/default.nix          | 22 ++++---------
 .../ocaml-modules/ocsigen-server/default.nix  |  4 +--
 pkgs/top-level/ocaml-packages.nix             |  7 +++-
 5 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/ipaddr/2.6.1.nix

diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix
index 22c74d7f92e5..d1da95ffaa1c 100644
--- a/pkgs/development/ocaml-modules/conduit/default.nix
+++ b/pkgs/development/ocaml-modules/conduit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr
+{ stdenv, buildOcaml, fetchurl, ocaml, sexplib_p4, stringext, uri_p4, cstruct, ipaddr_p4
 , asyncSupport ? stdenv.lib.versionAtLeast ocaml.version "4.02"
 , async_p4 ? null, async_ssl_p4 ? null, lwt ? null
 }:
@@ -12,7 +12,7 @@ buildOcaml rec {
     sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1";
   };
 
-  propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr ];
+  propagatedBuildInputs = [ sexplib_p4 stringext uri_p4 cstruct ipaddr_p4 ];
   buildInputs = stdenv.lib.optional (lwt != null) lwt
              ++ stdenv.lib.optional (asyncSupport && async_p4 != null) async_p4
              ++ stdenv.lib.optional (asyncSupport && async_ssl_p4 != null) async_ssl_p4;
diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix
new file mode 100644
index 000000000000..cdc273d6ecfd
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix
@@ -0,0 +1,32 @@
+{stdenv, buildOcaml, fetchurl, sexplib_p4}:
+
+buildOcaml rec {
+  name = "ipaddr";
+  version = "2.6.1";
+
+  src = fetchurl {
+    url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz";
+    sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0";
+  };
+
+  propagatedBuildInputs = [ sexplib_p4 ];
+
+  configurePhase = ''
+   ocaml setup.ml -configure --prefix $out
+  '';
+
+  buildPhase =  ''
+  make build
+  '';
+
+  installPhase =  ''
+  make install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mirage/ocaml-ipaddr;
+    description = "A library for manipulation of IP (and MAC) address representations ";
+    license = licenses.mit;
+    maintainers = [ maintainers.ericbmerritt ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix
index cdc273d6ecfd..0b561ab6d695 100644
--- a/pkgs/development/ocaml-modules/ipaddr/default.nix
+++ b/pkgs/development/ocaml-modules/ipaddr/default.nix
@@ -1,27 +1,19 @@
-{stdenv, buildOcaml, fetchurl, sexplib_p4}:
+{ stdenv, buildOcaml, fetchurl, ocamlbuild, findlib
+, topkg, sexplib, ppx_sexp_conv, opam }:
 
 buildOcaml rec {
   name = "ipaddr";
-  version = "2.6.1";
+  version = "2.7.2";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz";
-    sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0";
+    sha256 = "0mnjw1xjr8vyn5x1nnbbxfxhs77znwrkz8c144w47zk2pc3xrh9d";
   };
 
-  propagatedBuildInputs = [ sexplib_p4 ];
+  buildInputs = [ findlib ocamlbuild topkg ppx_sexp_conv opam ];
+  propagatedBuildInputs = [ sexplib ];
 
-  configurePhase = ''
-   ocaml setup.ml -configure --prefix $out
-  '';
-
-  buildPhase =  ''
-  make build
-  '';
-
-  installPhase =  ''
-  make install
-  '';
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     homepage = https://github.com/mirage/ocaml-ipaddr;
diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 5c424cfe0599..8d949497b465 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
 ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
-libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper
+libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
 }:
 
 let mkpath = p: n:
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
-  ocaml_sqlite3 tree uutf makeWrapper ];
+  ocaml_sqlite3 tree uutf makeWrapper camlp4 ];
 
   configureFlags = "--root $(out) --prefix /";
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f7a91767326e..339f6eb84e38 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -202,7 +202,12 @@ let
 
     io-page = callPackage ../development/ocaml-modules/io-page { };
 
-    ipaddr = callPackage ../development/ocaml-modules/ipaddr { };
+    ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { };
+
+    ipaddr =
+      if lib.versionOlder "4.02" ocaml.version
+      then callPackage ../development/ocaml-modules/ipaddr { }
+      else ipaddr_p4;
 
     iso8601 = callPackage ../development/ocaml-modules/iso8601 { };
 

From 265a288beec961b1eda0e35ce2ed6d8e07d3242d Mon Sep 17 00:00:00 2001
From: Shaun Sharples <shaun.sharples@gmail.com>
Date: Thu, 23 Feb 2017 10:26:05 +0200
Subject: [PATCH 0927/3449] unifi: 5.2.9 -> 5.4.11

---
 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 0ea5dfd1a0d3..8a411f0c1a52 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.2.9";
+  version = "5.4.11";
 
   src = fetchurl {
     url = "https://dl.ubnt.com/unifi/${version}/UniFi.unix.zip";
-    sha256 = "1521c5jdk5s4r57i7ajzdfq2l4fmvylqlhvddnxllqm6s4yij7fk";
+    sha256 = "18hd0w1zif6x9yxmfpwm7vbd07n705lf36yhg3z8fy04an6njgv2";
   };
 
   buildInputs = [ unzip ];

From 84fd5daafc600f2e42b5e8c03d37e082e1640626 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 23 Feb 2017 08:07:47 +0800
Subject: [PATCH 0928/3449] terragrunt: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index a90cd832e115..b7845b177060 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.10.2";
+  version = "0.10.3";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "0xbg8kirdd4na7g1fk2xwh3rk07jrlmral6yhzzblpdyr4v26vlg";
+    sha256 = "1vyyal4m8qwmlsvd2hriwvgly17iava0siyx7gdhy6dcs8ivc4ng";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index 6542e6b5beae..dcc8ee66fb42 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "3d7773ac930d57ef4a59e0d10c5f65a0cfa5acd6";
-      sha256 = "0jgyybih4vhlja76x5wjsvdbvq3v14yllzfi36f2527bby18g1hc";
+      rev = "9350193373dc6d4bb4d6af55675c11ca7fc4230c";
+      sha256 = "0n9b1szwf69mjmf7dgl1b2hv3aqjhih2pvfcjxnv1xgbigm821w2";
     };
   }
   {

From 8103499e9d3444de8ebc9d9e0974cfc8b6344fce Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 20 Feb 2017 16:31:01 +0100
Subject: [PATCH 0929/3449] pythonPackages.channels: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
new file mode 100644
index 000000000000..c7466d242c75
--- /dev/null
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl,
+  asgiref, django, daphne
+}:
+buildPythonPackage rec {
+  name = "channels-${version}";
+  version = "1.0.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/c/channels/${name}.tar.gz";
+    sha256 = "1bwlqnfc27p1qnjmdl8jnr941gpl8ggnxxfy8anh9qgmg20q9pfd";
+  };
+
+  # Files are missing in the distribution
+  doCheck = false;
+
+  propagatedBuildInputs = [ asgiref django daphne ];
+
+  meta = with stdenv.lib; {
+    description = "Brings event-driven capabilities to Django with a channel system";
+    license = licenses.bsd3;
+    homepage = https://github.com/django/channels;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 224aae7b574a..659da2c66f58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2391,26 +2391,7 @@ in {
     };
   };
 
-  channels = buildPythonPackage rec {
-    name = "channels-${version}";
-    version = "1.0.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/channels/${name}.tar.gz";
-      sha256 = "0d8fywg416p851i8vz26pmz8b47akg5z10yw7xc7i51cpmp7y5zj";
-    };
-
-    # Files are missing in the distribution
-    doCheck = false;
-
-    propagatedBuildInputs = with self ; [ asgiref django daphne ];
-
-    meta = {
-      description = "Brings event-driven capabilities to Django with a channel system";
-      license = licenses.bsd3;
-      homepage = https://github.com/django/channels;
-    };
-  };
+  channels = callPackage ../development/python-modules/channels {};
 
   circus = buildPythonPackage rec {
     name = "circus-0.11.1";

From 4d5093f5e1bccd8d8762e7e88ba1749ec6aaee95 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 20 Feb 2017 16:31:36 +0100
Subject: [PATCH 0930/3449] pythonPackages.daphne: 1.0.1 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
new file mode 100644
index 000000000000..6e19d9d9e864
--- /dev/null
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchurl,
+  asgiref, autobahn, twisted
+}:
+buildPythonPackage rec {
+  name = "daphne-${version}";
+  version = "1.0.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/daphne/${name}.tar.gz";
+    sha256 = "1bpavq3sxr66mqwnnfg67pcchyaq7siqyin2r89aqadf6nab58d2";
+  };
+
+  propagatedBuildInputs = [ asgiref autobahn twisted ];
+
+  meta = with stdenv.lib; {
+    description = "Django ASGI (HTTP/WebSocket) server";
+    license = licenses.bsd3;
+    homepage = https://github.com/django/daphne;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 659da2c66f58..50a9e792dfd4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5895,23 +5895,7 @@ in {
     };
   });
 
-  daphne = buildPythonPackage rec {
-    name = "daphne-${version}";
-    version = "1.0.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/daphne/${name}.tar.gz";
-      sha256 = "0l62bd9swv0k9qcpl2s8kj4mgl6qayi0krwkkg1x73a9y48xpi9z";
-    };
-
-    propagatedBuildInputs = with self; [ asgiref autobahn ];
-
-    meta = {
-      description = "Django ASGI (HTTP/WebSocket) server";
-      license = licenses.bsd3;
-      homepage = https://github.com/django/daphne;
-    };
-  };
+  daphne = callPackage ../development/python-modules/daphne { };
 
   dateparser = buildPythonPackage rec {
     name = "dateparser-${version}";

From fd29b10606446e587afe4c52e3e343729ca5d747 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Feb 2017 13:01:23 +0300
Subject: [PATCH 0931/3449] linuxPackages.lttng-modules: 2.8.3 -> 2.9.1

---
 pkgs/os-specific/linux/lttng-modules/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 7e29aa0f67de..3bb61227fe41 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -3,25 +3,25 @@
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
   name = "${pname}-${kernel.version}";
-  version = "2.8.3";
+  version = "2.9.1";
 
   src = fetchurl {
     url = "http://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2";
-    sha256 = "018lqxbksj9hpjfp2a3yc6lkjkj4rgf2x147l1jjh7mfgqvcb53b";
+    sha256 = "0m0d8sp7fj1qha7qz1204yzpsyfd8a8fawjbvdlmk9jc4piqy1v2";
   };
 
   hardeningDisable = [ "pic" ];
 
-  NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ];
 
   preConfigure = ''
     export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
     export INSTALL_MOD_PATH="$out"
   '';
 
-  installPhase = ''
-    make modules_install
-  '';
+  installTargets = [ "modules_install" ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Linux kernel modules for LTTng tracing";

From ba43d6bdc9c8410b2915ce32551c2bc2ab373561 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Feb 2017 13:01:47 +0300
Subject: [PATCH 0932/3449] lttng-tools: 2.5.2 -> 2.9.3

---
 .../tools/misc/lttng-tools/default.nix            | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 827c1d0e67f8..733399ebf7d6 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
+{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "lttng-tools-2.5.2";
+  name = "lttng-tools-${version}";
+  version = "2.9.3";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "0g931f90pl9bfgsxihrj0zlw9ivyaplbiw28axkscmjvzd1d6lhz";
+    sha256 = "0kmj0ya5625mn2khbnghhsdmjr66xs0mhrvbrsdvrp3pm6mbmrm6";
   };
 
-  buildInputs = [ popt libuuid liburcu lttng-ust libxml2 ];
-
-  prePatch = ''
-    sed -e "s|/sbin/modprobe|${kmod}/bin/modprobe|g" \
-        -i src/bin/lttng-sessiond/modprobe.c
-  '';
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
 
   meta = with stdenv.lib; {
     description = "Tracing tools (kernel + user space) for Linux";

From a4353270c4d0558404e9f2840c48272553bdcf27 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Feb 2017 13:01:55 +0300
Subject: [PATCH 0933/3449] lttng-ust: 2.5.1 -> 2.9.0

---
 pkgs/development/tools/misc/lttng-ust/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
index 38fe4d47e062..2d3fc6560524 100644
--- a/pkgs/development/tools/misc/lttng-ust/default.nix
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -12,11 +12,12 @@
 # Debian builds with std.h (systemtap).
 
 stdenv.mkDerivation rec {
-  name = "lttng-ust-2.5.1";
+  name = "lttng-ust-${version}";
+  version = "2.9.0";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
-    sha256 = "0ij5p2j8q63zqnj3i3hgymgib717r2bq07ymy5cwdra1hvby5ngv";
+    sha256 = "1bsxxaqhkh9bwr1ll5acb41hvis2lhkl00h5ra2wdps27y31lm2d";
   };
 
   buildInputs = [ liburcu ];

From cf29810281df54a44f87b3805ab1b71d9d5e86a6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Feb 2017 13:13:22 +0300
Subject: [PATCH 0934/3449] haskellPackages.lambdabot: jailbreak

---
 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 e1cf22155a58..d9bdf46c0b66 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -859,6 +859,9 @@ self: super: {
   # https://github.com/lambdabot/lambdabot/issues/158
   lambdabot-core = doJailbreak super.lambdabot-core;
 
+  # https://github.com/lambdabot/lambdabot/issues/159
+  lambdabot = doJailbreak super.lambdabot;
+
   # https://github.com/jswebtools/language-ecmascript/pull/81
   language-ecmascript = doJailbreak super.language-ecmascript;
 }

From 0c50a629122c39b1f561b9e0a784b18b20287398 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 23 Feb 2017 13:15:58 +0300
Subject: [PATCH 0935/3449] octoprint: jailbreak Jinja2

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

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 9e287bf6fd5b..e5c35c5290d6 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -92,6 +92,7 @@ in pythonPackages.buildPythonApplication rec {
       -e 's,Click>=[^"]*,Click,g' \
       -e 's,websocket-client>=[^"]*,websocket-client,g' \
       -e 's,scandir>=[^"]*,scandir,g' \
+      -e 's,Jinja2>=[^"]*,Jinja2,g' \
       setup.py
   '';
 

From 0bfbd039f989df1994728ab21a451b0b9dc5211c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 Dec 2016 19:13:42 +0100
Subject: [PATCH 0936/3449] dnsperf: init at 2.1.0.0

---
 pkgs/tools/networking/dnsperf/default.nix | 32 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/networking/dnsperf/default.nix

diff --git a/pkgs/tools/networking/dnsperf/default.nix b/pkgs/tools/networking/dnsperf/default.nix
new file mode 100644
index 000000000000..c65e47a88b09
--- /dev/null
+++ b/pkgs/tools/networking/dnsperf/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, bind, libseccomp, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "dnsperf-${version}";
+  version = "2.1.0.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.nominum.com/pub/nominum/dnsperf/${version}/"
+        + "dnsperf-src-${version}-1.tar.gz";
+    sha256 = "03kfc65s5a9csa5i7xjsv0psq144k8d9yw7xlny61bg1h2kg1db4";
+  };
+
+  outputs = [ "out" "doc" ];
+
+  buildInputs = [ bind libseccomp zlib ];
+
+  postInstall = ''
+    mkdir -p "$out/share/doc/"
+    cp -r ./doc "$out/share/doc/dnsperf"
+  '';
+
+  meta = with stdenv.lib; {
+    outputsToInstall = outputs; # The man pages and PDFs are likely useful to most.
+
+    description = "Tools for DNS benchmaring";
+    homepage = https://nominum.com/measurement-tools/;
+    license = licenses.isc;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.vcunat ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7a4cce9468b..4512e210acb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1434,6 +1434,8 @@ with pkgs;
 
   dnsmasq = callPackage ../tools/networking/dnsmasq { };
 
+  dnsperf = callPackage ../tools/networking/dnsperf { };
+
   dnstop = callPackage ../tools/networking/dnstop { };
 
   dhcp = callPackage ../tools/networking/dhcp { };

From 2f303bc10e9a499c1f4839a9e0d9c495db804cab Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 23 Feb 2017 07:46:20 -0600
Subject: [PATCH 0937/3449] R/generate-shell: Use R from current tree, fix
 missing wget dep.

Without this change, the 'R' version used might be the wrong
one which changes the package lists used.

Fixes #19530.
---
 pkgs/development/r-modules/generate-shell.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/generate-shell.nix b/pkgs/development/r-modules/generate-shell.nix
index 43c97e009c7e..126ab7422925 100644
--- a/pkgs/development/r-modules/generate-shell.nix
+++ b/pkgs/development/r-modules/generate-shell.nix
@@ -1,10 +1,11 @@
-with import <nixpkgs> {};
+with import ../../.. {};
 
 stdenv.mkDerivation {
   name = "generate-r-packages-shell";
 
   buildCommand = "exit 1";
 
+  buildInputs = [ wget ];
   nativeBuildInputs = [ 
     (rWrapper.override {
       packages = with rPackages; [

From 11d86725df24e6b05e8a9b2bdbcff92b09570ac7 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Thu, 23 Feb 2017 15:07:35 +0100
Subject: [PATCH 0938/3449] idea-ultimate: 2016.3.3 -> 2016.3.4

---
 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 ef5022f58b3f..3136859cc684 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.3";
+    version = "2016.3.4";
     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 = "1bwy86rm0mifizmhkm9wxwc4nrrizk2zp4zl5ycxh6zdiad1r1wm";
+      sha256 = "1ichjrdmnhyqv9cr73d8kif9l53k3x36i8js8nf9cmkbhdsfckn3";
     };
     wmClass = "jetbrains-idea";
   };

From 742092280623b4f8413d48e8a24ef003a231d078 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Wed, 22 Feb 2017 19:07:11 +0100
Subject: [PATCH 0939/3449] graylog module: add plugin support

---
 nixos/modules/services/logging/graylog.nix |  23 ++++
 pkgs/tools/misc/graylog/plugins.nix        | 129 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   3 +
 3 files changed, 155 insertions(+)
 create mode 100644 pkgs/tools/misc/graylog/plugins.nix

diff --git a/nixos/modules/services/logging/graylog.nix b/nixos/modules/services/logging/graylog.nix
index a7785decd19a..95283096662e 100644
--- a/nixos/modules/services/logging/graylog.nix
+++ b/nixos/modules/services/logging/graylog.nix
@@ -17,9 +17,16 @@ let
     elasticsearch_discovery_zen_ping_unicast_hosts = ${cfg.elasticsearchDiscoveryZenPingUnicastHosts}
     message_journal_dir = ${cfg.messageJournalDir}
     mongodb_uri = ${cfg.mongodbUri}
+    plugin_dir = /var/lib/graylog/plugins
 
     ${cfg.extraConfig}
   '';
+
+  glPlugins = pkgs.buildEnv {
+    name = "graylog-plugins";
+    paths = cfg.plugins;
+  };
+
 in
 
 {
@@ -121,6 +128,12 @@ in
         description = "Any other configuration options you might want to add";
       };
 
+      plugins = mkOption {
+        description = "Extra graylog plugins";
+        default = [ ];
+        type = types.listOf types.package;
+      };
+
     };
   };
 
@@ -146,6 +159,16 @@ in
       path = [ pkgs.openjdk8 pkgs.which pkgs.procps ];
       preStart = ''
         mkdir -p /var/lib/graylog -m 755
+
+        rm -rf /var/lib/graylog/plugins || true
+        mkdir -p /var/lib/graylog/plugins -m 755
+
+        for declarativeplugin in `ls ${glPlugins}/bin/`; do
+          ln -sf ${glPlugins}/bin/$declarativeplugin /var/lib/graylog/plugins/$declarativeplugin
+        done
+        for includedplugin in `ls ${cfg.package}/plugin/`; do
+          ln -s ${cfg.package}/plugin/$includedplugin /var/lib/graylog/plugins/$includedplugin || true
+        done
         chown -R ${cfg.user} /var/lib/graylog
 
         mkdir -p ${cfg.messageJournalDir} -m 755
diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix
new file mode 100644
index 000000000000..979f409dde93
--- /dev/null
+++ b/pkgs/tools/misc/graylog/plugins.nix
@@ -0,0 +1,129 @@
+{ pkgs,  stdenv, fetchurl, fetchFromGitHub, unzip, graylog }:
+
+with pkgs.lib;
+
+let
+  glPlugin = a@{
+    pluginName,
+    version,
+    installPhase ? ''
+      mkdir -p $out/bin
+      cp $src $out/bin/${pluginName}-${version}.jar
+    '',
+    ...
+  }:
+    stdenv.mkDerivation (a // {
+      inherit installPhase;
+      unpackPhase = "true";
+      buildInputs = [ unzip ];
+      meta = a.meta // {
+        platforms = graylog.meta.platforms;
+        maintainers = (a.meta.maintainers or []) ++ [ maintainers.fadenb ];
+      };
+    });
+in {
+  auth_sso = glPlugin rec {
+    name = "graylog-auth-sso-${version}";
+    pluginName = "graylog-plugin-auth-sso";
+    version = "1.0.6";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "0wvdf2rnjrhdw1vp7bc7008s45rggzq57lh8k6s3q35rppligaqd";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-auth-sso";
+      description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies";
+    };
+  };
+  ipanonymizer = glPlugin rec {
+    name = "graylog-ipanonymizer-${version}";
+    pluginName = "graylog-plugin-ipanonymizer";
+    version = "1.1.2";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "0hd66751hp97ddkn29s1cmjmc2h1nrp431bq7d2wq16iyxxlygri";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-ipanonymizer";
+      description = "A graylog-server plugin that replaces the last octet of IP addresses in messages with xxx";
+    };
+  };
+  jabber = glPlugin rec {
+    name = "graylog-jabber-${version}";
+    pluginName = "graylog-plugin-jabber";
+    version = "1.2.1";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/v${version}/${pluginName}-${version}.jar";
+      sha256 = "1r12hpjp2ggmhsapgrk829va94aw44qi2kqqkgf1fj9ih4k0c837";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-jabber";
+      description = "Jabber Alarmcallback Plugin for Graylog";
+    };
+  };
+  netflow = glPlugin rec {
+    name = "graylog-netflow-${version}";
+    pluginName = "graylog-plugin-netflow";
+    version = "0.1.1";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "1pdv12f9dca1rxf62ds51n79cjhkkyj0gjny8kj1cq64vlayc9x9";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-netflow";
+      description = "Graylog NetFlow plugin";
+    };
+  };
+  redis = glPlugin rec {
+    name = "graylog-redis-${version}";
+    pluginName = "graylog-plugin-redis";
+    version = "0.1.0";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "0hwz83m9gwx0fdapc63v3lr1q6acbphssqwp4qqzz78wg2w79xgi";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-redis";
+      description = "Redis plugin for Graylog";
+    };
+  };
+  spaceweather = glPlugin rec {
+    name = "graylog-spaceweather-${version}";
+    pluginName = "graylog-plugin-spaceweather";
+    version = "1.0";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/spaceweather-input.jar";
+      sha256 = "1mwqy3fhyy4zdwyrzvbr565xwf96xs9d3l70l0khmrm848xf8wz4";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-spaceweather";
+      description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate.";
+    };
+  };
+  threatintel = glPlugin rec {
+    name = "graylog-threatintel-${version}";
+    pluginName = "graylog-plugin-threatintel";
+    version = "0.9.2";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "0d2cjcgjwfqp6b756n68zbslm1pq1z9dhn6iiskmv6jdpkffjw3l";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-threatintel";
+      description = "Graylog Processing Pipeline functions to enrich log messages with IoC information from threat intelligence databases";
+    };
+  };
+  twitter = glPlugin rec {
+    name = "graylog-twitter-${version}";
+    pluginName = "graylog-plugin-twitter";
+    version = "2.0.0";
+    src = fetchurl {
+      url = "https://github.com/Graylog2/${pluginName}/releases/download/${version}/${pluginName}-${version}.jar";
+      sha256 = "1pi34swy9nzq35a823zzvqrjhb6wsg302z31vk2y656sw6ljjxyh";
+    };
+    meta = {
+      homepage = "https://github.com/Graylog2/graylog-plugin-twitter";
+      description = "Graylog input plugin that reads Twitter messages based on keywords in realtime";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31c793a481fe..9c391d839179 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2008,6 +2008,9 @@ with pkgs;
   grails = callPackage ../development/web/grails { jdk = null; };
 
   graylog = callPackage ../tools/misc/graylog { };
+  graylogPlugins = recurseIntoAttrs (
+    callPackage ../tools/misc/graylog/plugins.nix { }
+  );
 
   gprof2dot = callPackage ../development/tools/profiling/gprof2dot {
     # Using pypy provides significant performance improvements (~2x)

From 274994785d9e5b1192e64af06f29d608f012c69a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Feb 2017 15:24:30 +0100
Subject: [PATCH 0940/3449] networking module: remove reference to removed
 ip-up.target

---
 nixos/modules/config/networking.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 426aaa34885c..4431dfb40859 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -251,11 +251,6 @@ in
     # Install the proxy environment variables
     environment.sessionVariables = cfg.proxy.envVars;
 
-    # The ‘ip-up’ target is kept for backwards compatibility.
-    # New services should use systemd upstream targets:
-    # See https://www.freedesktop.org/wiki/Software/systemd/NetworkTarget/
-    systemd.targets.ip-up.description = "Services Requiring IP Connectivity (deprecated)";
-
     # This is needed when /etc/resolv.conf is being overriden by networkd
     # and other configurations. If the file is destroyed by an environment
     # activation then it must be rebuilt so that applications which interface

From 2da2731045012dc4eb9c8e6a90bb66da3b4f8818 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 23 Feb 2017 08:19:30 -0600
Subject: [PATCH 0941/3449] neo4j: 3.0.6 -> 3.1.1

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

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index 287e92d99cac..f6fcca16081b 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.0.6";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
-    sha256 = "efeab41183e9e5fa94a2d396c65ea93a24e9f105cb3b5f0d0a8e42fb709f4660";
+    sha256 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cp -R * "$out/share/neo4j"
 
     mkdir -p "$out/bin"
-    for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import neo4j-shell
+    for NEO4J_SCRIPT in neo4j neo4j-admin neo4j-import neo4j-shell cypher-shell
     do
         makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \
             "$out/bin/$NEO4J_SCRIPT" \

From bc15b4222be805339d3acc451acc93622c92e070 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 23 Feb 2017 08:34:51 -0600
Subject: [PATCH 0942/3449] nixos/neo4j: Update to default JVM options from
 current release.

The options previously listed here were the defaults back in 2.1.x.
---
 nixos/modules/services/databases/neo4j.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 7b51f1af6899..cbba9c2a691c 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -30,9 +30,16 @@ let
   '';
 
   wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" ''
+    # Default JVM parameters from neo4j.conf
+    dbms.jvm.additional=-XX:+UseG1GC
+    dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow
+    dbms.jvm.additional=-XX:+AlwaysPreTouch
+    dbms.jvm.additional=-XX:+UnlockExperimentalVMOptions
+    dbms.jvm.additional=-XX:+TrustFinalNonStaticFields
+    dbms.jvm.additional=-XX:+DisableExplicitGC
+    dbms.jvm.additional=-Djdk.tls.ephemeralDHKeySize=2048
+
     dbms.jvm.additional=-Dunsupported.dbms.udc.source=tarball
-    dbms.jvm.additional=-XX:+UseConcMarkSweepGC
-    dbms.jvm.additional=-XX:+CMSClassUnloadingEnabled
   '';
 
 in {

From 59d61ef34aae47f9fae53c4a10cc9bc1b19a6db1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 23 Feb 2017 09:41:42 -0500
Subject: [PATCH 0943/3449] Revert "nixpkgs: allow packages to be marked
 insecure"

---
 .../libraries/libplist/default.nix            |  7 --
 pkgs/stdenv/generic/default.nix               | 72 ++++---------------
 2 files changed, 12 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index b98fdbdb470d..4de5a23569e8 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -28,12 +28,5 @@ in stdenv.mkDerivation rec {
     homepage = http://github.com/JonathanBeck/libplist;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    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"
-      "CVE-2017-5834: A heap-buffer overflow in parse_dict_node"
-      "CVE-2017-5835: A memory allocation error leading to DoS"
-      "CVE-2017-5836: A type inconsistency in bplist.c"
-    ];
   };
 }
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index cb94db48f4bd..34ba2fd8dd9c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -75,14 +75,6 @@ let
     isUnfree (lib.lists.toList attrs.meta.license) &&
     !allowUnfreePredicate attrs;
 
-  allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []);
-  allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x;
-
-  hasAllowedInsecure = attrs:
-    (attrs.meta.knownVulnerabilities or []) == [] ||
-    allowInsecurePredicate attrs ||
-    builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1";
-
   showLicense = license: license.shortName or "unknown";
 
   defaultNativeBuildInputs = extraBuildInputs ++
@@ -145,62 +137,24 @@ let
           builtins.unsafeGetAttrPos "name" attrs;
       pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»";
 
+      throwEvalHelp = { reason, errormsg }:
+        # uppercase the first character of string s
+        let up = s: with lib;
+          (toUpper (substring 0 1 s)) + (substring 1 (stringLength s) s);
+        in
+        assert builtins.elem reason ["unfree" "broken" "blacklisted"];
+
+        throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate."
+        + (lib.strings.optionalString (reason != "blacklisted") ''
 
-      remediation = {
-        unfree = remediate_whitelist "Unfree";
-        broken = remediate_whitelist "Broken";
-        blacklisted = x: "";
-        insecure = remediate_insecure;
-      };
-      remediate_whitelist = allow_attr: attrs:
-        ''
           a) For `nixos-rebuild` you can set
-            { nixpkgs.config.allow${allow_attr} = true; }
+            { nixpkgs.config.allow${up reason} = true; }
           in configuration.nix to override this.
 
           b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
-            { allow${allow_attr} = true; }
+            { allow${up reason} = true; }
           to ~/.config/nixpkgs/config.nix.
-        '';
-
-      remediate_insecure = attrs:
-        ''
-
-          Known issues:
-
-        '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + ''
-
-          You can install it anyway by whitelisting this package, using the
-          following methods:
-
-          a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to
-             `nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
-             like so:
-
-               {
-                 nixpkgs.config.permittedInsecurePackages = [
-                   "${attrs.name or "«name-missing»"}"
-                 ];
-               }
-
-          b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
-          ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in
-          ~/.config/nixpkgs/config.nix, like so:
-
-               {
-                 permittedInsecurePackages = [
-                   "${attrs.name or "«name-missing»"}"
-                 ];
-               }
-
-        '';
-
-
-      throwEvalHelp = { reason , errormsg ? "" }:
-        throw (''
-          Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate.
-
-          '' + ((builtins.getAttr reason remediation) attrs));
+        ''));
 
       # Check if a derivation is valid, that is whether it passes checks for
       # e.g brokenness or license.
@@ -217,8 +171,6 @@ let
           { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
           { 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 { valid = true; };
 
       outputs' =

From 66f553974b74378c524f08b3c7d745907927e6c4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Feb 2017 16:01:36 +0100
Subject: [PATCH 0944/3449] dhcpcd service: fix network-online.target
 integration

When dhcpcd instead of networkd is used, the network-online.target behaved
the same as network.target, resulting in broken services that need a working
network connectivity when being started.

This commit makes dhcpcd wait for a lease and makes it wanted by
network-online.target. In turn, network-online.target is now wanted by
multi-user.target, so it will be activated at every boot.
---
 nixos/modules/services/networking/dhcpcd.nix | 4 ++--
 nixos/modules/system/boot/systemd.nix        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 87c0aa50a1ff..7eeceb7407c6 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -157,7 +157,7 @@ in
     systemd.services.dhcpcd =
       { description = "DHCP Client";
 
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "network-online.target" ];
         after = [ "network.target" ];
         wants = [ "network.target" ];
 
@@ -173,7 +173,7 @@ in
         serviceConfig =
           { Type = "forking";
             PIDFile = "/run/dhcpcd.pid";
-            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}";
+            ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd -w --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}";
             ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind";
             Restart = "always";
           };
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index de5fb3edd67e..bff6739db616 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -842,6 +842,7 @@ in
     systemd.services.systemd-journald.stopIfChanged = false;
     systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
     systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
+    systemd.targets.network-online.wantedBy = [ "multi-user.target" ];
     systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ];
 
     # Don't bother with certain units in containers.

From 4905c1c54fce527624dc0e20b3a52e1dac6a6073 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Feb 2017 16:05:06 +0100
Subject: [PATCH 0945/3449] prosody service: needs working network connectivity

---
 nixos/modules/services/networking/prosody.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix
index 5682b506344c..feaa007de15e 100644
--- a/nixos/modules/services/networking/prosody.nix
+++ b/nixos/modules/services/networking/prosody.nix
@@ -265,7 +265,8 @@ in
     systemd.services.prosody = {
 
       description = "Prosody XMPP server";
-      after = [ "network.target" ];
+      after = [ "network-online.target" ];
+      wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         User = "prosody";

From a689c7c792e3fdb1f6bbc3a687a1f838271cbd1a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Feb 2017 16:05:24 +0100
Subject: [PATCH 0946/3449] pythonPackages.xdot: fix wrapper

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6df45b3508f5..5862289a2278 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27464,13 +27464,9 @@ EOF
       sha256 = "1q0f3pskb09saw1qkd2s6vmk80rq5zjhq8l93dfr2x6r04r0q46j";
     };
 
+    nativeBuildInputs = with pkgs; [ wrapGAppsHook ];
     propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.graphviz pkgs.gnome3.gtk ];
 
-    preFixup = ''
-        wrapProgram "$out/bin/"* \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-    '';
-
     meta = {
       description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot";
       homepage = https://github.com/jrfonseca/xdot.py;

From cb63a0b2dad24105618c7df1d0e0032dba96889f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Feb 2017 16:23:23 +0100
Subject: [PATCH 0947/3449] knot-resolver: maintenance 1.2.2 -> 1.2.3

Just tiny fixes for some rare circumstances.
https://lists.nic.cz/pipermail/knot-dns-users/2017-February/001066.html
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 323b0b500008..24960eb65eff 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.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "89ab2ac8058b297c1f73f1c12e0f16d6e160aa86363e99ffa590bee7fe307931";
+    sha256 = "81a773f182112b4e11935223f900cfbcca8624f2c382b1e39a68d7c3db81c921";
   };
 
   outputs = [ "out" "dev" ];

From db0316d8b23df296638529a86b589f64a194e87b Mon Sep 17 00:00:00 2001
From: Demin Dmitriy <demindf@gmail.com>
Date: Thu, 23 Feb 2017 19:25:20 +0300
Subject: [PATCH 0948/3449] opera: 42.0.2393.517 -> 43.0.2442.991

---
 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 7e9d4cd50b4a..47e82d06e0eb 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 = "42.0.2393.517";
+  version = "43.0.2442.991";
 
   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 = "1zdhg6lrnpn8f4rdibnagj3ps3i8s9ygm4dpj5h605rqk24xxpvs";
+        sha256 = "0gd30b5gs2n4ypyn2ky2dlz648akmss2kixb8dqsy4yfd0mz7xqr";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb";
-        sha256 = "04yklvxprl7kcnl43fmvk1qfj5ifvivj715n26ylzcf29pvcy1mp";
+        sha256 = "1pj2d3zhzyavv2gj3v5w07m14679k2vlbfk6sd9bjdy6g7fb5f7x";
       }
     else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 

From 2055d6cacf14f37633788aa1fbb1470abe804dc4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Feb 2017 18:36:18 +0100
Subject: [PATCH 0949/3449] pythonPackages.searx: works with pygments 2.2

---
 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 a44ec360ac7e..4654673adc15 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28950,7 +28950,8 @@ EOF
         --replace 'pyyaml==3.11' 'pyyaml' \
         --replace 'lxml==3.7.1' 'lxml' \
         --replace 'pyopenssl==16.2.0' 'pyopenssl' \
-        --replace 'requests[socks]==2.12.4' 'requests[socks]'
+        --replace 'requests[socks]==2.12.4' 'requests[socks]' \
+        --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0'
     '';
 
     propagatedBuildInputs = with self; [

From 70fea43bad580c45bc5eef45b5c799732b4b20ca Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 23 Feb 2017 18:42:48 +0100
Subject: [PATCH 0950/3449] xfce4-mailwatch-plugin: Add dependencies for
 encrypted server communication

---
 pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
index 9aa6593e2263..dd80259db5fa 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui,
-libxfcegui4, xfconf, gtk, exo}:
+libxfcegui4, xfconf, gtk, exo, gnutls, libgcrypt }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel
-    libxfcegui4 xfconf gtk exo ];
+    libxfcegui4 xfconf gtk exo gnutls libgcrypt ];
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";

From b707552b5ba853f2aefebb9c6ea8615933cdda44 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Feb 2017 18:49:49 +0100
Subject: [PATCH 0951/3449] phpPackages.xdebug: 2.4.0RC3 -> 2.5.0

fixes #23098
---
 pkgs/top-level/php-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index fb1cd63a4dce..5f1e9a5f24ce 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -85,7 +85,7 @@ let
     buildInputs = [ pkgs.spidermonkey_1_8_5 ];
   };
 
-  xdebug = if isPhp7 then xdebug24 else xdebug23;
+  xdebug = if isPhp7 then xdebug25 else xdebug23;
 
   xdebug23 = assert !isPhp7; buildPecl {
     name = "xdebug-2.3.1";
@@ -96,10 +96,10 @@ let
     checkTarget = "test";
   };
 
-  xdebug24 = buildPecl {
-    name = "xdebug-2.4.0RC3";
+  xdebug25 = buildPecl {
+    name = "xdebug-2.5.0";
 
-    sha256 = "06ppsihw4cl8kxmywvic6wsm4ps9pvsns2vbab9ivrfyp8b6h5dy";
+    sha256 = "03c9y25a3gc3kpav0cdgmhjixcaly6974hx7wgihi0wlchgavmlb";
 
     doCheck = true;
     checkTarget = "test";

From 8e54fced988e4227c34bfc21417ac41eda4448c6 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 23 Feb 2017 15:12:56 +0100
Subject: [PATCH 0952/3449] flpsed: ghostscript patch, fixes, new url

gs was called at runtime, fix the execvp call.
The url changed to its own domain.
A little face-lift for the package code.
---
 pkgs/applications/editors/flpsed/default.nix | 23 +++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index eb1daa3ac3b2..9334b7820faa 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,20 +1,27 @@
 {stdenv, fetchurl, fltk13, ghostscript}:
 
-stdenv.mkDerivation {
-  name = "flpsed-0.7.3";
+stdenv.mkDerivation rec {
+  name = "flpsed-${version}";
+  version = "0.7.3";
 
   src = fetchurl {
-    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.3.tar.gz";
+    url = "http://www.flpsed.org/${name}.tar.gz";
     sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp";
   };
 
-  buildInputs = [ fltk13 ghostscript ];
+  buildInputs = [ fltk13 ];
 
-  meta = {
+  postPatch = ''
+    # replace the execvp call to ghostscript
+    sed -e '/exec_gs/ {n; s|"gs"|"${stdenv.lib.getBin ghostscript}/bin/gs"|}' \
+        -i src/GsWidget.cxx
+  '';
+
+  meta = with stdenv.lib; {
     description = "WYSIWYG PostScript annotator";
     homepage = "http://http://flpsed.org/flpsed.html";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.gpl3;
+    platforms = platforms.mesaPlatforms;
+    maintainers = with maintainers; [ fuuzetsu ];
   };
 }

From 67b4f726c836e8dc6f012e56478fa24fafe7d737 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 23 Feb 2017 19:01:17 +0100
Subject: [PATCH 0953/3449] wireguard: 0.0.20170214 -> 0.0.20170223

Simple version bump.
---
 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 7b87c23789b0..59b9475160ef 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.20170214";
+  version = "0.0.20170223";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1e4ee213d2a5ac672c952c59e9c64d6d7d5dc3e21c003aee30d75208237e8bf5";
+    sha256 = "6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d";
   };
 
   meta = with stdenv.lib; {

From b92501f0d853eee13763abee0ad13688b058c380 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 23 Feb 2017 19:18:15 +0100
Subject: [PATCH 0954/3449] grsecurity: 4.9.11-201702181444 -> 201702222257

---
 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 824d685378c5..bb6bff1a1f07 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -96,8 +96,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.9.11";
-      grrev  = "201702181444";
-      sha512 = "22yfq0w2hdhn0mhw0m2knm368f69z0qsf7vsfid7sw4m9ylmxfwzlnl92vfz15vldfl10hk78y59dcf8nv6jljh8gb5ycv4q61qlph6";
+      grrev  = "201702222257";
+      sha512 = "3yla1fw6iykzb19rpyqg910qhizi3njcywxksxcylf2z2da02i7nkjia0n0qn8n16lwlj44d9f59ka5xsml5r4vha77c850b6w436ni";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From be427d6e51ecddd63424e02f6ddf68fa1d67fd3b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Feb 2017 18:21:42 +0000
Subject: [PATCH 0955/3449] ocamlPackages.sexplib: init at 113.33.00+4.03

---
 .../janestreet/sexplib-113_33_00.nix           | 18 ++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix              |  4 +++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
new file mode 100644
index 000000000000..93808a565626
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-sexplib-133.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/sexplib-113.33.00+4.03.tar.gz;
+    sha256 = "1dirdrags3z8m80z1vczfnpdfzgcvm2wyy7g61fxdr8h3jgixpl3";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 339f6eb84e38..ebc09ecc84f7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -613,7 +613,9 @@ let
       else fieldslib_p4;
 
     sexplib =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/sexplib-113_33_00.nix {}
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {}
       else sexplib_p4;
 

From 63796fd38faf78b749c0dd1321391601d0a2821a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Feb 2017 18:27:37 +0000
Subject: [PATCH 0956/3449] ocamlPackages.ppx_core: init at 113.33.01+4.03

---
 .../janestreet/ppx_core-113_33_01.nix         | 20 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
new file mode 100644
index 000000000000..71bc62937d4d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_core-113_33_01.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_tools
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_core-133.33.01+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_core-113.33.01+4.03.tar.gz;
+    sha256 = "0ibww4lx87lmn164mxczl3sa7ldwc7g1zi4m9c4vllsv004iyffl";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ebc09ecc84f7..d955f284914d 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -554,7 +554,10 @@ let
 
     buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {};
 
-    ppx_core = callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {};
+    ppx_core =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {};
 
     ppx_optcomp = callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {};
 

From d6bc0c92363abde154be0e091e54156dca8a69b2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Feb 2017 18:34:17 +0000
Subject: [PATCH 0957/3449] ocamlPackages.ppx_optcomp: init at
 113.33.0[01]+4.03

---
 .../janestreet/ppx_optcomp-113_33_01.nix      | 34 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
new file mode 100644
index 000000000000..05e7f40eb686
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, opam, topkg, oasis
+, ppx_core, ppx_tools
+}:
+
+let
+  param = {
+    "4.03" = {
+      version = "113.33.00+4.03";
+      sha256 = "1fkz6n40l4ck8bcr548d2yp08zc9fjv42zldlh0cj3ammhiz3gap";
+    };
+    "4.04" = {
+      version = "113.33.01+4.03";
+      sha256 = "1caw5dfgh5rw8mcgar0hdn485j1rqlnkbfb8wd0wdl5zhkg8jk3d";
+    };
+  }."${ocaml.meta.branch}";
+in
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_optcomp-${param.version}";
+  src = fetchzip {
+    url = "http://github.com/janestreet/ppx_optcomp/archive/${param.version}.tar.gz";
+    inherit (param) sha256;
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam oasis ppx_tools ];
+  propagatedBuildInputs = [ ppx_core ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d955f284914d..218cb12e69e7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -559,7 +559,11 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_core-113_33_01.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {};
 
-    ppx_optcomp = callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {};
+    ppx_optcomp =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_optcomp-113_33_01.nix {
+        oasis = ocaml_oasis; }
+      else callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {};
 
     ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
 

From 7ca9e6776d3c180cc3254b7d88b38ac1d991e9e5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Feb 2017 19:04:01 +0000
Subject: [PATCH 0958/3449] ocamlPackages.ppx_type_conv: init at 113.33.02+4.03

---
 .../janestreet/ppx_type_conv-113_33_02.nix    | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
new file mode 100644
index 000000000000..49cfc19321d6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_core, ppx_deriving, ppx_driver
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_type_conv-133.33.02+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_type_conv-113.33.02+4.03.tar.gz;
+    sha256 = "0y7hsh152gcj89i6cr3b9kxgdnb2sx8vhaq2bdvbcc9zrirwq4d2";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_deriving ];
+  propagatedBuildInputs = [ ppx_core ppx_driver ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 218cb12e69e7..09443b93db06 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -567,7 +567,10 @@ let
 
     ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {};
 
-    ppx_type_conv = callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {};
+    ppx_type_conv =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix { }
+      else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {};
 
     ppx_compare = callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {};
 

From a9b0c95ad43a6f44acf91294a4b097ccd50f91b8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Feb 2017 19:07:38 +0000
Subject: [PATCH 0959/3449] ocamlPackages.ppx_sexp_conv: init at 113.33.01+4.03

---
 .../janestreet/ppx_sexp_conv-113_33_01.nix    | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
new file mode 100644
index 000000000000..d8c9166585e1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, sexplib, ppx_deriving, ppx_tools, ppx_type_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_sexp_conv-133.33.01+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_conv-113.33.01+4.03.tar.gz;
+    sha256 = "176pydk5fs8m2md9v8v5b16gra90s4v0ssqq38ghfsbv1faca8d6";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ sexplib ppx_deriving ppx_type_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 09443b93db06..e9567a958595 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -576,7 +576,10 @@ let
 
     ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
 
-    ppx_sexp_conv = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {};
+    ppx_sexp_conv =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_conv-113_33_01.nix { }
+      else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {};
 
     ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
 

From 75b187b0f76cbee972ed33e17b8dab0433adb776 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Feb 2017 19:10:33 +0000
Subject: [PATCH 0960/3449] ocamlPackages.eliom: adds ocamlbuild as a
 dependency

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

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index f3c9f4cecefe..d7b0bbd3d48c 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -2,6 +2,7 @@
   js_of_ocaml, ocaml_react, ocaml_lwt, calendar, cryptokit, tyxml,
   ipaddr, ocamlnet, ocaml_ssl, ocaml_pcre, ocaml_optcomp,
   reactivedata, opam, ppx_tools, ppx_deriving, findlib
+, ocamlbuild
 }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "4.02";
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec
 
   patches = [ ./camlp4.patch ];
 
-  buildInputs = [ ocaml which findlib ocaml_optcomp opam ppx_tools ];
+  buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ];
 
   propagatedBuildInputs = [ ocaml_lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
                             ocsigen_deriving js_of_ocaml

From 6bbddcf7d1aa4f2365c2ac6383902080340c6ce2 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 23 Feb 2017 11:32:32 -0800
Subject: [PATCH 0961/3449] xcbuild: Guard a glibc-only postPatch with
 \!isDarwin

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

diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index 0fc56827de83..f2be61bd2139 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   '';
 
   # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-  postPatch = ''
+  postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed 1i'#include <sys/sysmacros.h>' \
       -i Libraries/xcassets/Headers/xcassets/Slot/SystemVersion.h
   '';

From f67a097488e6d12c9f276e9c76b49c74fe3e2e12 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Thu, 23 Feb 2017 16:54:54 -0300
Subject: [PATCH 0962/3449] idea.clion: 2016.3.2 -> 2016.3.3

---
 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 3136859cc684..c5f87d33f732 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -136,12 +136,12 @@ in
 {
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2016.3.2";
+    version = "2016.3.3";
     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 = "0ygnj3yszgd1si1qgx7m4n7smm583l5pww8xhx8n86mvz7ywdhbn";
+      sha256 = "1zziyg0y51lfybflq83qwd94wcypkv4gh0cdkwfybbk4yidpnz05";
     };
     wmClass = "jetbrains-clion";
   };

From 04dcda3da4f3816ee8d0106c96961000b0f8da2f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 23 Feb 2017 22:18:12 +0100
Subject: [PATCH 0963/3449] homebank: 5.1.3 -> 5.1.4

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

diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index b4df8fdd4606..ac2f71c872da 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -2,10 +2,10 @@
 , hicolor_icon_theme, libsoup, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "homebank-5.1.3";
+  name = "homebank-5.1.4";
   src = fetchurl {
     url = "http://homebank.free.fr/public/${name}.tar.gz";
-    sha256 = "0wzv2hkm30a1kqjldw02bzbh49bdmac041d6qybjzvkgwvrbmci2";
+    sha256 = "07zxb9n7d281nfv29gi09fsp7y73fx4w2s48hgdn9s4vij25zwqa";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From 52eab0376cdfb5282c5c0147f3286c36ffed88aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 23 Feb 2017 22:19:16 +0100
Subject: [PATCH 0964/3449] spotify: 1.0.49.125.g72ee7853-83 ->
 1.0.49.125.g72ee7853-111

---
 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 72514d7b67b0..affb574d60bd 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-83";
+  version = "1.0.49.125.g72ee7853-111";
 
   deps = [
     alsaLib
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "1sqi79yj503y4b7pfvr6xi0i8g7hj01hkhn0vpkc3y3jz5c0ih9g";
+      sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From afb7d04dd6c08e86bff7fca44d4a4832a29c47bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 23 Feb 2017 22:58:17 +0100
Subject: [PATCH 0965/3449] elmPackages: fix #22932

---
 pkgs/development/compilers/elm/default.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index e125a050b249..7cba0cab351f 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -40,7 +40,7 @@ let
       EOF
     '' + lib.concatStrings cmds;
 
-  hsPkgs = haskell.packages.ghc801.override {
+  hsPkgs = haskell.packages.ghc802.override {
     overrides = self: super:
       let hlib = haskell.lib;
           elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
@@ -77,6 +77,21 @@ let
       in elmPkgs // {
         inherit elmPkgs;
         elmVersion = elmRelease.version;
+        # needed for elm-package
+        http-client = hlib.overrideCabal super.http-client (drv: {
+          version = "0.4.31.2";
+          sha256 = "12yq2l6bvmxg5w6cw5ravdh39g8smwn1j44mv36pfmkhm5402h8n";
+        });
+        http-client-tls = hlib.overrideCabal super.http-client-tls (drv: {
+          version = "0.2.4.1";
+          sha256 = "18wbca7jg15p0ds3339f435nqv2ng0fqc4bylicjzlsww625ij4d";
+        });
+        # https://github.com/elm-lang/elm-compiler/issues/1566
+        indents = hlib.overrideCabal super.indents (drv: {
+          version = "0.3.3";
+          sha256 = "16lz21bp9j14xilnq8yym22p3saxvc9fsgfcf5awn2a6i6n527xn";
+          libraryHaskellDepends = drv.libraryHaskellDepends ++ [super.concatenative];
+        });
       };
   };
 in hsPkgs.elmPkgs // {

From e20575cf5f5ada1b185eec599b87c03c7b82d536 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 23 Feb 2017 23:38:35 +0100
Subject: [PATCH 0966/3449] nodejs: 7.2.1 -> 7.6.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 659aa47985aa..53ed893794c2 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.2.1";
+    version = "7.6.0";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "03fqv6k8y42ldnrz4iirhwg6wdyw8z95h9h40igiriicbnm072y0";
+      sha256 = "1adldbhza422951i9rk69x75apj9rdqlx1pm8ybb9w7zjqk09ybg";
     };
 
   })

From 18c2be286224c156d7cbf0ed0dd945f373140bc6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 23 Feb 2017 17:47:18 -0500
Subject: [PATCH 0967/3449] kernel: 4.9.11 -> 4.9.12

---
 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 09f0fd72eeeb..e31a2329c296 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.11";
+  version = "4.9.12";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1czj88bj27yaiikf88kz131ayivcqhkq9d5r863w1s3qj04c2bsi";
+    sha256 = "0fvq3gb80awkwsy0ir6njri2kvx52knmj86kjlm8lqwqis3m9bgw";
   };
 
   kernelPatches = args.kernelPatches;

From 82aae8f63170bafc0d0233aea147b0963ae7a559 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 23 Feb 2017 17:47:51 -0500
Subject: [PATCH 0968/3449] kernel: 4.4.50 -> 4.4.51

---
 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 0aac9b43f1e6..2366ffb7c9e5 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.50";
+  version = "4.4.51";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1dqnhajciy9vgcx4lz5mngc21j5w73fzpivxx6kn7pqbpfjlr574";
+    sha256 = "04drwi5pd8m2wqq1bxr17gq9cc32x5mgl0jhs8d8f246b0faslgf";
   };
 
   kernelPatches = args.kernelPatches;

From c71bae03304c5c3437c9cecb68f6aa6e8dbe01f9 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 23 Feb 2017 18:27:12 -0500
Subject: [PATCH 0969/3449] long-shebang: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix
index 2aac5556e2f5..1a064e8c627d 100644
--- a/pkgs/misc/long-shebang/default.nix
+++ b/pkgs/misc/long-shebang/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }: let
-  version = "1.1.0";
+  version = "1.2.0";
 in stdenv.mkDerivation {
   name = "long-shebang-${version}";
 
   src = fetchurl {
     url = "https://github.com/shlevy/long-shebang/releases/download/v${version}/long-shebang-${version}.tar.xz";
-    sha256 = "0rlyibf7pczjfsi91nl1n5vri2vqibmvyyy070jaw3wb0wjm565a";
+    sha256 = "10h29w1c5bm0rlscyjiz1kzb134rn92as6v4y7i8mhhmdh6mmf79";
   };
 
   meta = {

From 1d68edbef48f30a4cefc33a85636099582411957 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 23 Feb 2017 18:44:29 -0500
Subject: [PATCH 0970/3449] linux kernels: patch against DCCP double free
 (CVE-2017-6074)

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

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index bb6bff1a1f07..c5a6b999f855 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -174,4 +174,13 @@ rec {
         sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
       };
     };
+
+  DCCP_double_free_vulnerability_CVE-2017-6074 = rec
+    { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4";
+        sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
+      };
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1224593a2abb..9e1e6226f224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11273,6 +11273,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.packet_fix_race_condition_CVE_2016_8655
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11285,6 +11286,7 @@ with pkgs;
     kernelPatches = with kernelPatches; [
       bridge_stp_helper
       packet_fix_race_condition_CVE_2016_8655
+      DCCP_double_free_vulnerability_CVE-2017-6074
     ];
   };
 
@@ -11293,6 +11295,7 @@ with pkgs;
       [ bridge_stp_helper
         lguest_entry-linkage
         packet_fix_race_condition_CVE_2016_8655
+        DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11304,6 +11307,7 @@ with pkgs;
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
     kernelPatches = with kernelPatches;
       [ bridge_stp_helper
+        DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11315,6 +11319,7 @@ with pkgs;
   linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11327,6 +11332,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11343,6 +11349,7 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11371,6 +11378,7 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
+      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill
@@ -11383,6 +11391,7 @@ with pkgs;
                       kernelPatches.chromiumos_mfd_fix_dependency
                       kernelPatches.chromiumos_no_link_restrictions
                       kernelPatches.genksyms_fix_segfault
+                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
                     ];
   };
 
@@ -11390,6 +11399,7 @@ with pkgs;
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
                       kernelPatches.genksyms_fix_segfault
+                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
                     ];
   };
 

From 53a2baabbeb29ce0180b0353deb623139f1808bd Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 23 Feb 2017 18:47:16 -0500
Subject: [PATCH 0971/3449] Revert "linux kernels: patch against DCCP double
 free (CVE-2017-6074)"

This reverts commit 1d68edbef48f30a4cefc33a85636099582411957.
---
 pkgs/os-specific/linux/kernel/patches.nix |  9 ---------
 pkgs/top-level/all-packages.nix           | 10 ----------
 2 files changed, 19 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c5a6b999f855..bb6bff1a1f07 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -174,13 +174,4 @@ rec {
         sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
       };
     };
-
-  DCCP_double_free_vulnerability_CVE-2017-6074 = rec
-    { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
-      patch = fetchpatch {
-        inherit name;
-        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4";
-        sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
-      };
-    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e1e6226f224..1224593a2abb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11273,7 +11273,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.packet_fix_race_condition_CVE_2016_8655
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11286,7 +11285,6 @@ with pkgs;
     kernelPatches = with kernelPatches; [
       bridge_stp_helper
       packet_fix_race_condition_CVE_2016_8655
-      DCCP_double_free_vulnerability_CVE-2017-6074
     ];
   };
 
@@ -11295,7 +11293,6 @@ with pkgs;
       [ bridge_stp_helper
         lguest_entry-linkage
         packet_fix_race_condition_CVE_2016_8655
-        DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11307,7 +11304,6 @@ with pkgs;
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
     kernelPatches = with kernelPatches;
       [ bridge_stp_helper
-        DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11319,7 +11315,6 @@ with pkgs;
   linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11332,7 +11327,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11349,7 +11343,6 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11378,7 +11371,6 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill
@@ -11391,7 +11383,6 @@ with pkgs;
                       kernelPatches.chromiumos_mfd_fix_dependency
                       kernelPatches.chromiumos_no_link_restrictions
                       kernelPatches.genksyms_fix_segfault
-                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
                     ];
   };
 
@@ -11399,7 +11390,6 @@ with pkgs;
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
                       kernelPatches.genksyms_fix_segfault
-                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
                     ];
   };
 

From d36b1ccc135fd86dd228db735ce6ef54d69cd9a1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 23 Feb 2017 19:23:29 -0500
Subject: [PATCH 0972/3449] Revert "Revert "linux kernels: patch against DCCP
 double free (CVE-2017-6074)""

This reverts commit 53a2baabbeb29ce0180b0353deb623139f1808bd.
---
 pkgs/os-specific/linux/kernel/patches.nix |  9 +++++++++
 pkgs/top-level/all-packages.nix           | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index bb6bff1a1f07..c5a6b999f855 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -174,4 +174,13 @@ rec {
         sha256 = "0mps33r4mnwiy0bmgrzgqkrk59yya17v6kzpv9024g4xlz61rk8p";
       };
     };
+
+  DCCP_double_free_vulnerability_CVE-2017-6074 = rec
+    { name = "DCCP_double_free_vulnerability_CVE-2017-6074.patch";
+      patch = fetchpatch {
+        inherit name;
+        url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=5edabca9d4cff7f1f2b68f0bac55ef99d9798ba4";
+        sha256 = "10dmv3d3gj8rvj9h40js4jh8xbr5wyaqiy0kd819mya441mj8ll2";
+      };
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1224593a2abb..9e1e6226f224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11273,6 +11273,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.packet_fix_race_condition_CVE_2016_8655
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11285,6 +11286,7 @@ with pkgs;
     kernelPatches = with kernelPatches; [
       bridge_stp_helper
       packet_fix_race_condition_CVE_2016_8655
+      DCCP_double_free_vulnerability_CVE-2017-6074
     ];
   };
 
@@ -11293,6 +11295,7 @@ with pkgs;
       [ bridge_stp_helper
         lguest_entry-linkage
         packet_fix_race_condition_CVE_2016_8655
+        DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11304,6 +11307,7 @@ with pkgs;
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
     kernelPatches = with kernelPatches;
       [ bridge_stp_helper
+        DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11315,6 +11319,7 @@ with pkgs;
   linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11327,6 +11332,7 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11343,6 +11349,7 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
+        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
@@ -11371,6 +11378,7 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
+      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill
@@ -11383,6 +11391,7 @@ with pkgs;
                       kernelPatches.chromiumos_mfd_fix_dependency
                       kernelPatches.chromiumos_no_link_restrictions
                       kernelPatches.genksyms_fix_segfault
+                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
                     ];
   };
 
@@ -11390,6 +11399,7 @@ with pkgs;
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
                       kernelPatches.genksyms_fix_segfault
+                      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
                     ];
   };
 

From 8e3d0b83234bf301f1eba7a6cb1517c8b2f02a7a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 24 Feb 2017 11:13:29 +0800
Subject: [PATCH 0973/3449] awless: 0.0.13 -> 0.0.14

---
 pkgs/tools/virtualization/awless/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix
index afc45a2d5a75..549c830e8871 100644
--- a/pkgs/tools/virtualization/awless/default.nix
+++ b/pkgs/tools/virtualization/awless/default.nix
@@ -2,22 +2,21 @@
 
 buildGoPackage rec {
   name = "awless-${version}";
-  version = "0.0.13";
-  rev = "${version}";
+  version = "0.0.14";
 
   goPackagePath = "github.com/wallix/awless";
 
   src = fetchFromGitHub {
-    inherit rev;
-    owner = "wallix";
-    repo = "awless";
-    sha256 = "045n4r2mk40pjggsfcjlxni6q4arybs9x9raghqb9n8dyfg9v5kv";
+    owner  = "wallix";
+    repo   = "awless";
+    rev    = version;
+    sha256 = "1syxw8d9y1b4bdb1arsx05m5mxnd0dqp3nj7fk5j1v7cnnbja3hj";
   };
 
   meta = with stdenv.lib; {
     homepage = https://github.com/wallix/awless/;
     description = "A Mighty CLI for AWS";
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = with platforms; linux ++ darwin;
     license = licenses.asl20;
     maintainers = with maintainers; [ pradeepchhetri ];
   };

From 4bb87272847c9d8b8ac4397511fd091d2f273fc3 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Wed, 15 Feb 2017 13:54:55 +1100
Subject: [PATCH 0974/3449] R: 3.2.4 -> 3.3.2

---
 pkgs/applications/science/math/R/default.nix  |   12 +-
 .../science/math/R/zlib-version-check.patch   |   20 +
 .../r-modules/bioc-annotation-packages.nix    |  482 +-
 .../r-modules/bioc-experiment-packages.nix    |  552 +-
 pkgs/development/r-modules/bioc-packages.nix  | 2315 ++---
 pkgs/development/r-modules/cran-packages.nix  | 7689 +++++++++++------
 pkgs/development/r-modules/default.nix        |   12 -
 .../r-modules/generate-r-packages.R           |   10 +-
 8 files changed, 6662 insertions(+), 4430 deletions(-)
 create mode 100644 pkgs/applications/science/math/R/zlib-version-check.patch

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index dea095c834ff..d9bbda9512a7 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.2.4";
+  name = "R-3.3.2";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0l6k3l3cy6fa9xkn23zvz5ykpw10s45779x88yz3pzn2x5gl1zds";
+    sha256 = "0k2i9qdd83g09fcpls2198q4ykxkii5skczb514gnx7mx4hsv56j";
   };
 
   buildInputs = [ bzip2 gfortran libX11 libXmu libXt
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
 
-  patches = [ ./no-usr-local-search-paths.patch ];
+  patches = [ ./no-usr-local-search-paths.patch ./zlib-version-check.patch ];
 
   preConfigure = ''
     configureFlagsArray=(
@@ -35,10 +35,6 @@ stdenv.mkDerivation rec {
       --with-libpng
       --with-jpeglib
       --with-libtiff
-      --with-system-zlib
-      --with-system-bzlib
-      --with-system-pcre
-      --with-system-xz
       --with-ICU
       ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
       --enable-R-shlib
@@ -69,7 +65,7 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "install" "install-info" "install-pdf" ];
 
-  doCheck = true;
+  doCheck = withRecommendedPackages;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/science/math/R/zlib-version-check.patch b/pkgs/applications/science/math/R/zlib-version-check.patch
new file mode 100644
index 000000000000..83cfed2cac4c
--- /dev/null
+++ b/pkgs/applications/science/math/R/zlib-version-check.patch
@@ -0,0 +1,20 @@
+diff --git a/configure b/configure
+index cf368ce..dc528ff 100755
+--- a/configure
++++ b/configure
+@@ -35507,10 +35507,11 @@ else
+ #include <string.h>
+ #include <zlib.h>
+ int main() {
+-#ifdef ZLIB_VERSION
+-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
+-   version on the master site zlib.net */
+-  exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
++#ifdef ZLIB_VERNUM
++  if (ZLIB_VERNUM < 0x01250) {
++    exit(1);
++  }
++  exit(0);
+ #else
+   exit(1);
+ #endif
diff --git a/pkgs/development/r-modules/bioc-annotation-packages.nix b/pkgs/development/r-modules/bioc-annotation-packages.nix
index 4519953ad5ca..25a89d94ebaf 100644
--- a/pkgs/development/r-modules/bioc-annotation-packages.nix
+++ b/pkgs/development/r-modules/bioc-annotation-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R bioc-annotation >new && mv new bioc-annotation-packages.nix
 
 { self, derive }:
-let derive2 = derive { rVersion = "3.2"; };
+let derive2 = derive { rVersion = "3.3"; };
 in with self; {
   BSgenome_Alyrata_JGI_v1 = derive2 { name="BSgenome.Alyrata.JGI.v1"; version="1.0.0"; sha256="06549kkzy36n378zb61lrf9zardncp7i20r73rmmiq1pnfjp3gww"; depends=[BSgenome]; };
   BSgenome_Amellifera_BeeBase_assembly4 = derive2 { name="BSgenome.Amellifera.BeeBase.assembly4"; version="1.4.0"; sha256="02zs16q441zcbfp7xvv1gny5nn02ivfr8md1wh5s5rpnj6sdl6kj"; depends=[BSgenome]; };
@@ -20,6 +20,7 @@ in with self; {
   BSgenome_Btaurus_UCSC_bosTau6_masked = derive2 { name="BSgenome.Btaurus.UCSC.bosTau6.masked"; version="1.3.99"; sha256="07isv0lcvlsl0aha1p474l0pps0j7bsh455m33vfxwahivqsfy27"; depends=[BSgenome BSgenome_Btaurus_UCSC_bosTau6]; };
   BSgenome_Btaurus_UCSC_bosTau8 = derive2 { name="BSgenome.Btaurus.UCSC.bosTau8"; version="1.4.2"; sha256="16wjy1aw9nvx03r7w8yh5w7sw3pn8i9nczd0n0728l6nnyqxlsz6"; depends=[BSgenome]; };
   BSgenome_Celegans_UCSC_ce10 = derive2 { name="BSgenome.Celegans.UCSC.ce10"; version="1.4.0"; sha256="1zaym97jk4npxk14ifvwz2rvhm4zx9xgs33r9vvx9rlynp0gydrk"; depends=[BSgenome]; };
+  BSgenome_Celegans_UCSC_ce11 = derive2 { name="BSgenome.Celegans.UCSC.ce11"; version="1.4.2"; sha256="0d4bxfglpqiv1f0n6imdgz101g9383hfj3ra91268wryzlm0yk5w"; depends=[BSgenome]; };
   BSgenome_Celegans_UCSC_ce2 = derive2 { name="BSgenome.Celegans.UCSC.ce2"; version="1.4.0"; sha256="1x7nvisz7mjrpqlsiw4an04f8hksygzn96p5ld0388hljg78dax8"; depends=[BSgenome]; };
   BSgenome_Celegans_UCSC_ce6 = derive2 { name="BSgenome.Celegans.UCSC.ce6"; version="1.4.0"; sha256="0mqzb353xv2c3m3vkb315dkmnxkgczp7ndnknyhpgjlybyf715v9"; depends=[BSgenome]; };
   BSgenome_Cfamiliaris_UCSC_canFam2 = derive2 { name="BSgenome.Cfamiliaris.UCSC.canFam2"; version="1.4.0"; sha256="052p2lsm1ny0rjvhgd56w6z4nrqfc74vh0q7cmqz55xkhk01h7hm"; depends=[BSgenome]; };
@@ -45,7 +46,7 @@ in with self; {
   BSgenome_Ggallus_UCSC_galGal3_masked = derive2 { name="BSgenome.Ggallus.UCSC.galGal3.masked"; version="1.3.99"; sha256="0igi02g46h1j87hv9bk45nbqahyjd0k75jkg0s6m9a62jsssg63l"; depends=[BSgenome BSgenome_Ggallus_UCSC_galGal3]; };
   BSgenome_Ggallus_UCSC_galGal4 = derive2 { name="BSgenome.Ggallus.UCSC.galGal4"; version="1.4.0"; sha256="1qfl046akdf43azigprc13sssgbmxdz9dmlrvy13ag8fgfkjxign"; depends=[BSgenome]; };
   BSgenome_Ggallus_UCSC_galGal4_masked = derive2 { name="BSgenome.Ggallus.UCSC.galGal4.masked"; version="1.3.99"; sha256="0fvqimjf1xvgka4nw66nd0rbyb7r93v8cyw33776lhfv68ny058v"; depends=[BSgenome BSgenome_Ggallus_UCSC_galGal4]; };
-  BSgenome_Hsapiens_1000genomes_hs37d5 = derive2 { name="BSgenome.Hsapiens.1000genomes.hs37d5"; version="0.99.0"; sha256="0fnap8bxjn8xc38ihsbyi60q86cgvlznz9d1dl13q2ydb5bb1ryb"; depends=[BSgenome]; };
+  BSgenome_Hsapiens_1000genomes_hs37d5 = derive2 { name="BSgenome.Hsapiens.1000genomes.hs37d5"; version="0.99.1"; sha256="1cg0g5fqmsvwyw2p9hp2yy4ilk21jkbbrnpgqvb5c36ihjwvc7sr"; depends=[BSgenome]; };
   BSgenome_Hsapiens_NCBI_GRCh38 = derive2 { name="BSgenome.Hsapiens.NCBI.GRCh38"; version="1.3.1000"; sha256="0y75qdq578fh6420vbvsbwmdw8jvr3g06qli2h3vj3pxmjykh9c1"; depends=[BSgenome]; };
   BSgenome_Hsapiens_UCSC_hg17 = derive2 { name="BSgenome.Hsapiens.UCSC.hg17"; version="1.3.1000"; sha256="1q8p0zp5xpp22znwnygl3jhc159db4q3kkpj5wfij5a6z19zs1w3"; depends=[BSgenome]; };
   BSgenome_Hsapiens_UCSC_hg17_masked = derive2 { name="BSgenome.Hsapiens.UCSC.hg17.masked"; version="1.3.99"; sha256="1pg39kmbmnync0xxdbgsn6gpz78hfbzd7iffidpv8mfk734srwzn"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg17]; };
@@ -61,6 +62,7 @@ in with self; {
   BSgenome_Mmulatta_UCSC_rheMac2_masked = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac2.masked"; version="1.3.99"; sha256="1j4z4iy13n4qbi9a50qw1hn8z14xz0z8hbiwhy2bb9znykkf4chd"; depends=[BSgenome BSgenome_Mmulatta_UCSC_rheMac2]; };
   BSgenome_Mmulatta_UCSC_rheMac3 = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac3"; version="1.4.0"; sha256="0r3v4p567rxcczwqi7zdz7pmdiffgrq83j488libdb4s0hdg5jmi"; depends=[BSgenome]; };
   BSgenome_Mmulatta_UCSC_rheMac3_masked = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac3.masked"; version="1.3.99"; sha256="0k3j40hrys60qdij5rsxdzyx9bfmryaki5p7i4d5m0xmldlk9anr"; depends=[BSgenome BSgenome_Mmulatta_UCSC_rheMac3]; };
+  BSgenome_Mmulatta_UCSC_rheMac8 = derive2 { name="BSgenome.Mmulatta.UCSC.rheMac8"; version="1.4.2"; sha256="18z6vl89jkjzvppz3r93b2s32l17hz6pfp36wv5wvhm0c0rhnhmw"; depends=[BSgenome]; };
   BSgenome_Mmusculus_UCSC_mm10 = derive2 { name="BSgenome.Mmusculus.UCSC.mm10"; version="1.4.0"; sha256="12s0nm2na9brjad4rn9l7d3db2aj8qa1xvz0y1k7gk08wayb6bkf"; depends=[BSgenome]; };
   BSgenome_Mmusculus_UCSC_mm10_masked = derive2 { name="BSgenome.Mmusculus.UCSC.mm10.masked"; version="1.3.99"; sha256="12d7fkzh0b39b8f6qbgx07x5bmab91is4y846lp4zpbm3iya01g9"; depends=[BSgenome BSgenome_Mmusculus_UCSC_mm10]; };
   BSgenome_Mmusculus_UCSC_mm8 = derive2 { name="BSgenome.Mmusculus.UCSC.mm8"; version="1.4.0"; sha256="1al34aa11d6kr0cr4xrabix1xmqc96zzgik5p4yc8r0rba3n100a"; depends=[BSgenome]; };
@@ -88,7 +90,8 @@ in with self; {
   BSgenome_Tguttata_UCSC_taeGut2 = derive2 { name="BSgenome.Tguttata.UCSC.taeGut2"; version="1.4.2"; sha256="1ikbd5q77l2zmbmbm511s41h00627zi0gq31cm4qr3k1cvlz8617"; depends=[BSgenome]; };
   BSgenome_Vvinifera_URGI_IGGP12Xv0 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv0"; version="0.1"; sha256="1m8mqkiqs7291hccb8pfyf2yxpky45qr6j3d9wkvp9x3ra3h0yxf"; depends=[BSgenome]; };
   BSgenome_Vvinifera_URGI_IGGP12Xv2 = derive2 { name="BSgenome.Vvinifera.URGI.IGGP12Xv2"; version="0.1"; sha256="1saavsi75gw33jphhm3qb5psyfrv850ss4cmqr4i7aw1kc0fvs1j"; depends=[BSgenome]; };
-  ChemmineDrugs = derive2 { name="ChemmineDrugs"; version="0.99.3"; sha256="0m060izffk98p3jyv2k534nmz1labr69z9f8ns59pkwkwvjr00f8"; depends=[BiocGenerics ChemmineR RSQLite]; };
+  BSgenome_Vvinifera_URGI_IGGP8X = derive2 { name="BSgenome.Vvinifera.URGI.IGGP8X"; version="0.1"; sha256="0v0hi2pbbi5ynd92bvbv4bzr7bgv48kvyz62hdv7k9gh7s5pg0id"; depends=[BSgenome]; };
+  ChemmineDrugs = derive2 { name="ChemmineDrugs"; version="1.0.0"; sha256="0h4jxcb6vkf9ijljas7yvcx6vmrd5rpjgj202cf2jb9hx8h9497i"; depends=[BiocGenerics ChemmineR RSQLite]; };
   DO_db = derive2 { name="DO.db"; version="2.9"; sha256="10bqqa124l61ivzy4mdd3z3ar9a6537qbxw23pc4y9w8a6dwnavn"; depends=[AnnotationDbi]; };
   EnsDb_Hsapiens_v75 = derive2 { name="EnsDb.Hsapiens.v75"; version="0.99.12"; sha256="1yc912m6qvrqbmc9y4bxyr1l3vfq4pv751jagsqpvjlhgkdasn2p"; depends=[ensembldb GenomicFeatures]; };
   EnsDb_Hsapiens_v79 = derive2 { name="EnsDb.Hsapiens.v79"; version="0.99.12"; sha256="1r09wksknhsa42aq2xdwnyd0agsw46fnxijb5nkx1avhp82zlpp2"; depends=[ensembldb GenomicFeatures]; };
@@ -102,137 +105,144 @@ in with self; {
   FDb_UCSC_snp135common_hg19 = derive2 { name="FDb.UCSC.snp135common.hg19"; version="1.0.0"; sha256="1ykyixrbw86ajx65w1jwr068ma5cvzl4kypaw77kpggmf1qqgkxp"; depends=[AnnotationDbi GenomicFeatures]; };
   FDb_UCSC_snp137common_hg19 = derive2 { name="FDb.UCSC.snp137common.hg19"; version="1.0.0"; sha256="1q1r7rk29q0zlzxz6fvfy1kjfli6wxzvhvhhfnf3z4ksy5332q63"; depends=[AnnotationDbi GenomicFeatures]; };
   FDb_UCSC_tRNAs = derive2 { name="FDb.UCSC.tRNAs"; version="1.0.1"; sha256="1dymdalx9fzrplxyc0fd9faa4r5jimi7zyry9k65lyz1pabpkwqz"; depends=[AnnotationDbi GenomicFeatures]; };
+  FlowSorted_CordBloodNorway_450k = derive2 { name="FlowSorted.CordBloodNorway.450k"; version="0.99.1"; sha256="0sfnrcg5f99d65grlc7ds9i03yrgn8c0p87sp7cqnmr6f2h3y7i4"; depends=[minfi]; };
   GGHumanMethCancerPanelv1_db = derive2 { name="GGHumanMethCancerPanelv1.db"; version="1.4.1"; sha256="0ag1pkbh4mx4aplfrrz1q4f4cl05mczq9pcsfkd1071qk51dcwvx"; depends=[AnnotationDbi AnnotationForge org_Hs_eg_db]; };
-  GO_db = derive2 { name="GO.db"; version="3.2.2"; sha256="00gariag9ampz82dh0xllrc26r85d7vdcwc0vca5zdy147rwxr7f"; depends=[AnnotationDbi]; };
+  GO_db = derive2 { name="GO.db"; version="3.3.0"; sha256="0x2hkbhg9d8waw32hdn05887vv3zbs5aqff3mf5vfyzvl7xhgxy0"; depends=[AnnotationDbi]; };
   Homo_sapiens = derive2 { name="Homo.sapiens"; version="1.3.1"; sha256="151vj7h5p1c8yd5swrchk46z469p135wk50hvkl0nhgndvy0jj01"; depends=[AnnotationDbi GenomicFeatures GO_db org_Hs_eg_db OrganismDbi TxDb_Hsapiens_UCSC_hg19_knownGene]; };
-  Hs6UG171_db = derive2 { name="Hs6UG171.db"; version="3.2.2"; sha256="08m39vdmb0d93wlsianfnc284z0594szbjf68idazjnki7iy6mg4"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  HsAgilentDesign026652_db = derive2 { name="HsAgilentDesign026652.db"; version="3.2.2"; sha256="1hmnnjzh13jxvsbf7kzc01kzf527qpywr20q9j2smpljqva34jgj"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  Hs6UG171_db = derive2 { name="Hs6UG171.db"; version="3.2.3"; sha256="034aady3hy8j9bm7pbl8l8h0gcfnzmpyxg9l9s1ky0pj7ryzr93a"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  HsAgilentDesign026652_db = derive2 { name="HsAgilentDesign026652.db"; version="3.2.3"; sha256="0x6nxvzmc8k4qp382ca32y58awkxpg0b3kc7m1mz9iag6sq7c5vx"; depends=[AnnotationDbi org_Hs_eg_db]; };
   Hspec = derive2 { name="Hspec"; version="0.99.1"; sha256="18paxil1976g7c7zyh02wxqj55ndbnshl27z0jhlzc2dwzagx7mb"; depends=[AnnotationDbi]; };
   HuExExonProbesetLocation = derive2 { name="HuExExonProbesetLocation"; version="1.15.0"; sha256="0rpn9wh97gh9h795krfqnydxnliqnwgvp33xwqa4g8px3c34nmw1"; depends=[AnnotationDbi]; };
   HuExExonProbesetLocationHg18 = derive2 { name="HuExExonProbesetLocationHg18"; version="0.0.2"; sha256="14lbmcb0166rgv25d24g7kng5nvddynvmszfk5mq1yl1spbh7j9g"; depends=[AnnotationDbi]; };
   HuExExonProbesetLocationHg19 = derive2 { name="HuExExonProbesetLocationHg19"; version="0.0.3"; sha256="0h240v2wc2c935bxws6xpha4c0hw89bm821w1c1digwhd04kbyxh"; depends=[AnnotationDbi]; };
-  HuO22_db = derive2 { name="HuO22.db"; version="3.2.2"; sha256="06vk5i3l3204gznafkrfxxgbm448bxnigjwfk3z3pz7a4097nf2p"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  HuO22_db = derive2 { name="HuO22.db"; version="3.2.3"; sha256="159ml83s9r8kcb0phh2zalcmzacn6d5z7vq6bg5ygy9l85vkcqsf"; depends=[AnnotationDbi org_Hs_eg_db]; };
   IlluminaHumanMethylation27k_db = derive2 { name="IlluminaHumanMethylation27k.db"; version="1.4.8"; sha256="0zw0n4a9v42ifmvw2hfzzvl8jz1d7f00ia59ljhcvvw9aj12q4zs"; depends=[AnnotationDbi org_Hs_eg_db]; };
   IlluminaHumanMethylation27kmanifest = derive2 { name="IlluminaHumanMethylation27kmanifest"; version="0.4.0"; sha256="1kvz6z7g61zdrc1i93wsk1zv5mwcswfkxkl114644q09djwbz1fx"; depends=[minfi]; };
   IlluminaHumanMethylation450k_db = derive2 { name="IlluminaHumanMethylation450k.db"; version="2.0.9"; sha256="1zmm65qnm95w9c8z30c9vncca451npbhhnlkpkpp894svsakxziz"; depends=[AnnotationDbi org_Hs_eg_db]; };
   IlluminaHumanMethylation450kanno_ilmn12_hg19 = derive2 { name="IlluminaHumanMethylation450kanno.ilmn12.hg19"; version="0.2.1"; sha256="1agvivsji3ppd9qwmf99kzyg5jrz1wnz3f0w07715xywc6pavvxl"; depends=[minfi]; };
   IlluminaHumanMethylation450kmanifest = derive2 { name="IlluminaHumanMethylation450kmanifest"; version="0.4.0"; sha256="0qx75xwifrbkqmbkd8dhf44c34ibmbivqh7y8rvgrsizmi5ybcj1"; depends=[minfi]; };
   IlluminaHumanMethylation450kprobe = derive2 { name="IlluminaHumanMethylation450kprobe"; version="2.0.6"; sha256="1iah0rw7d8qvgwvn6n2l4cln39ky010gqpd9shml45m48m6whiia"; depends=[AnnotationDbi]; };
-  JazaeriMetaData_db = derive2 { name="JazaeriMetaData.db"; version="3.2.2"; sha256="08fvzg8zs0yyxqnjxbgqxfgphgyfm2yr21g1s414lkjixv16s6hd"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  KEGG_db = derive2 { name="KEGG.db"; version="3.2.2"; sha256="074dn5fy8b8p6mwb2l058sn9a3vy2j8isc5fv9vnmn0p9h0aqhi4"; depends=[AnnotationDbi]; };
-  LAPOINTE_db = derive2 { name="LAPOINTE.db"; version="3.2.2"; sha256="1pqgdgzqjfw96n8d8fwql6jg6gp407xca29jwmcyv4g59v1bx81d"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  IlluminaHumanMethylationEPICanno_ilm10b2_hg19 = derive2 { name="IlluminaHumanMethylationEPICanno.ilm10b2.hg19"; version="0.3.0"; sha256="1nz15bva44pag3c4l1z7d01r0jfgb9cirn3zard5i258v1ahg4q6"; depends=[minfi]; };
+  IlluminaHumanMethylationEPICmanifest = derive2 { name="IlluminaHumanMethylationEPICmanifest"; version="0.3.0"; sha256="0alhjda5g186z8b1nsmnpfswrlj7prdz8mkwx60wkkl6hkcnk6p3"; depends=[minfi]; };
+  JazaeriMetaData_db = derive2 { name="JazaeriMetaData.db"; version="3.2.3"; sha256="04lvcmm4ybxkfwgbiwcnpyj6kpbd0gd7jz6ijlbbvv6zdgdmvykb"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  KEGG_db = derive2 { name="KEGG.db"; version="3.2.3"; sha256="0qv9in1nmnqcbjxh0y45x33xyw9zdp4jf5hmlvcsh1pclcq4dsh2"; depends=[AnnotationDbi]; };
+  LAPOINTE_db = derive2 { name="LAPOINTE.db"; version="3.2.3"; sha256="0960gy5p4ybs5zs6251cgc3nk5a9gsh1nh23gkbkr3gc8jddinfm"; depends=[AnnotationDbi org_Hs_eg_db]; };
   LowMACAAnnotation = derive2 { name="LowMACAAnnotation"; version="0.99.3"; sha256="0ri301ci54s8wwkah1jccy5h44xg8yjk08j5b15qmdsm25hli4wm"; depends=[]; };
-  MafDb_ALL_wgs_phase1_release_v3_20101123 = derive2 { name="MafDb.ALL.wgs.phase1.release.v3.20101123"; version="3.2.0"; sha256="1zd2hpp9f4ilajsx6xpimgiqzkxhc3lyhanr4n4gv0d3cdkxa1mb"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
-  MafDb_ALL_wgs_phase3_release_v5a_20130502 = derive2 { name="MafDb.ALL.wgs.phase3.release.v5a.20130502"; version="3.2.0"; sha256="06bdbrjqh0gc7sypp94v0bwq4cfbz8vnq6z3g36w8906ziss6a8j"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
-  MafDb_ALL_wgs_phase3_release_v5b_20130502 = derive2 { name="MafDb.ALL.wgs.phase3.release.v5b.20130502"; version="3.2.0"; sha256="1cc2aphc98nip100jfxy39clknrnpn5z838f1b8fb542whypikn7"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
-  MafDb_ESP6500SI_V2_SSA137 = derive2 { name="MafDb.ESP6500SI.V2.SSA137"; version="3.2.0"; sha256="1dykp9bz1srb144yimkyagfhigr5dzg8ybxa5fsn3sr99p31va69"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
-  MafDb_ExAC_r0_3_sites = derive2 { name="MafDb.ExAC.r0.3.sites"; version="3.2.0"; sha256="1qb3zwlkqaw2p5faajjahpp6g8wp02gd733kw9kim9xddjvjba14"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
-  MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.5.0"; sha256="07mcj2lrrgnazzk4kgnzriyrny6mv1n0bpyi2s4vkv58xxm2n04k"; depends=[MeSHDbi]; };
-  MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.5.0"; sha256="0jp07lnlxmb05cs0j3zr4spnlnqbh846j08ic7nhcl1bgzh652dp"; depends=[MeSHDbi]; };
-  MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.5.0"; sha256="0rf2sr7sv2vpszi5wssznx25crx1ad4nbjj3w9whvhn2bzprksw3"; depends=[MeSHDbi]; };
-  MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.5.0"; sha256="0ggh4r8vrah8ln14hhvn3rxcv8xxjv8g72pw4l6rrxcwqbicy2pq"; depends=[MeSHDbi]; };
-  MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.5.0"; sha256="1x6rap57yzshli4vx4ljv3n8pmrd4xy3lblcpl4nd3319hnl9nfy"; depends=[MeSHDbi]; };
-  MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.5.0"; sha256="0iz8aq9sxy485csm3fib3p5mvsnv81kq5d6a1jsnqqhh629c6pf3"; depends=[MeSHDbi]; };
-  MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.5.0"; sha256="0dqnnmm668ahychvksbfsk21v7p51ac3qz8n9nff608z8nrry67p"; depends=[MeSHDbi]; };
-  MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.5.0"; sha256="0qka863lgsbyv4xny6h1d9xjgckyvbzw4hrd59ykk5j6bjar3zvq"; depends=[MeSHDbi]; };
-  MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.5.0"; sha256="0wbrqgxqzvv7s1ak4axkh5x7wl0wlgl9zds2xm1675w5li40j6dv"; depends=[MeSHDbi]; };
-  MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.5.0"; sha256="0va8mqhxq7r02bjyi2pyr0y4zhl6jn8lq8367qbzs4bfbj7y2w44"; depends=[MeSHDbi]; };
-  MeSH_Bsu_TUB10_eg_db = derive2 { name="MeSH.Bsu.TUB10.eg.db"; version="1.5.0"; sha256="1igsl86sgwmxwy4j1igp5a355rff4jm9pia1hv59s9c6nni5xdfc"; depends=[MeSHDbi]; };
-  MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.5.0"; sha256="1v8vmyhdw625s9gl6wfrfbq653mxjhsxayjgm0m9m0h3rkw6nadw"; depends=[MeSHDbi]; };
-  MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.5.0"; sha256="03lxs5hkbfqw6wdgdsdspblj6a7pwyqny8ypw72rl6gs0m1jha25"; depends=[MeSHDbi]; };
-  MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.5.0"; sha256="1jfn1qdx7dzqi5hwgcz02g5sc0wnqmgc1rm0n3d6mapzz286jl3q"; depends=[MeSHDbi]; };
-  MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.5.0"; sha256="171243fbgalpa5fjfqprj8gvg04wrcn1x8l465mzw8jj4y58pc60"; depends=[MeSHDbi]; };
-  MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.5.0"; sha256="1gcnrynfnjapwdk13xk2x5g2jphk16ycp04qhwxp2qn53pgrj15k"; depends=[MeSHDbi]; };
-  MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.5.0"; sha256="0fdfslzh69rln2yj8hvb0igg3hmvn58pmkzfg0wpr3cc2y51jjvq"; depends=[MeSHDbi]; };
-  MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.5.0"; sha256="0m1z665crgj2q00bcz9m9gb0i55fca19agfpdd1b3nyiqil5fwqs"; depends=[MeSHDbi]; };
-  MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.5.0"; sha256="1xxlvi78mwjgqigrbxg0zas39i6j9c8ih6yh2s1xvmfm9mdg8v0j"; depends=[MeSHDbi]; };
-  MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.5.0"; sha256="0s8w895f3l43v68s5wipggk4lq31cxsvlz7p6rfplj3chqkb4z2c"; depends=[MeSHDbi]; };
-  MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.5.0"; sha256="0ra8hqg6w6w8w5wib4qa3py6bk961v47bmr47c9f5zbmp2n4ghwn"; depends=[MeSHDbi]; };
-  MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.5.0"; sha256="0y1hcpbf3ddby76i19x933l4hz92a6v03k1cpyqipf1x8gdlkm1z"; depends=[MeSHDbi]; };
-  MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.5.0"; sha256="1dlnxpp0ad5n0k43sy3jaz8ak9qxrmy57zg5bsxp65c04fgr3j9j"; depends=[MeSHDbi]; };
-  MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.5.0"; sha256="0zllh66mbh20z402wv31993g06q4ap41f5fc7karkf17fbxz7nsl"; depends=[MeSHDbi]; };
-  MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.5.0"; sha256="1lhqac659i3hys4r90r5y9k5m48r6ai2f3kir5v2046b8y5gbdx9"; depends=[MeSHDbi]; };
-  MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.5.0"; sha256="03fq4zj3d8ag5k05g9jvfll99dir9cnl04lkaw9n3h0q28hrsjg2"; depends=[MeSHDbi]; };
-  MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.5.0"; sha256="0zh1awvf8v4axzqhazf8rqb8srp8sas3raiackw2z1niq89l0jw9"; depends=[MeSHDbi]; };
-  MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.5.0"; sha256="0myhby94b2i2sp4fzm5wa7j102admbp3lkdzyjwwbq6sw7hznb47"; depends=[MeSHDbi]; };
-  MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.5.0"; sha256="1bxrfqh2pwkxdqs9vzvcwh5k1whik45bsmnbkr5c9yaryz8g801y"; depends=[MeSHDbi]; };
-  MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.5.0"; sha256="0qp2zqm2z998sx3gzkam0h5f38bblkvwb0jsvxckdr1n7j0ld3bz"; depends=[MeSHDbi]; };
-  MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.5.0"; sha256="0l675bqgmk455jx2iwzc3rn3v3a125grc0w6g1j25agbar8fznln"; depends=[MeSHDbi]; };
-  MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.5.0"; sha256="190rfd5y5rrjphsc0dhnsms4bx2dkzs8m2ljv5rj1ygwhx78smz6"; depends=[MeSHDbi]; };
-  MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.5.0"; sha256="1ci0s1hklzaxc5h0wbfx21llqawi5n9bl0fddpiwwqma8mpy07k5"; depends=[MeSHDbi]; };
+  LymphoSeqDB = derive2 { name="LymphoSeqDB"; version="0.99.2"; sha256="1cdyn2imjh4zr23szndc4vwyiacxs1jsp14gil2dyq9aifa25qr7"; depends=[]; };
+  MafDb_1Kgenomes_phase1_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase1.hs37d5"; version="3.3.0"; sha256="0axbmmcqsy8hbxxn0q3q14whdjy8zvmd0xbqdlcb08nhs8j1jji0"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
+  MafDb_1Kgenomes_phase3_hs37d5 = derive2 { name="MafDb.1Kgenomes.phase3.hs37d5"; version="3.3.0"; sha256="1g1hi6fvz87im8xafk2jmkms463i2jakjjq8xdmb4zhk1ij6ck2f"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
+  MafDb_ALL_wgs_phase1_release_v3_20101123 = derive2 { name="MafDb.ALL.wgs.phase1.release.v3.20101123"; version="3.3.0"; sha256="1aj9w8kaymm9jmjani1nyw75akxprvm77rjddmrlkfdpfj4mnadn"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
+  MafDb_ALL_wgs_phase3_release_v5b_20130502 = derive2 { name="MafDb.ALL.wgs.phase3.release.v5b.20130502"; version="3.3.0"; sha256="0rjsj5423nksnk3dn8zyxa7j62ihni1ni9m7hr0fqcm4jixqbjmp"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
+  MafDb_ESP6500SI_V2_SSA137 = derive2 { name="MafDb.ESP6500SI.V2.SSA137"; version="3.3.0"; sha256="1yicrqh40pjgg4g7dm7xf26dz3hwp01n25k3m46ds7dyg20g6vln"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite VariantAnnotation VariantFiltering]; };
+  MafDb_ExAC_r0_3_1_nonTCGA_snvs_hs37d5 = derive2 { name="MafDb.ExAC.r0.3.1.nonTCGA.snvs.hs37d5"; version="3.3.0"; sha256="01l4ixcgpwi8prj91xag2r93dayprg6zi2w2pp0bhsw3cs8v9cfi"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
+  MafDb_ExAC_r0_3_1_snvs_hs37d5 = derive2 { name="MafDb.ExAC.r0.3.1.snvs.hs37d5"; version="3.3.0"; sha256="0csnsa6s08yc1mgi32h7pbmdn4h9wja96l2zdfvfwapmh3wmzm1a"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
+  MafDb_ExAC_r0_3_sites = derive2 { name="MafDb.ExAC.r0.3.sites"; version="3.3.0"; sha256="07a859ipwbk1il6fvb7mlpvc05r7gkglchx2qlc3xlpl8i9fb9qr"; depends=[AnnotationDbi Biobase Biostrings GenomicRanges IRanges Rsamtools RSQLite SummarizedExperiment VariantAnnotation VariantFiltering]; };
+  MeSH_AOR_db = derive2 { name="MeSH.AOR.db"; version="1.6.0"; sha256="0zia94rqj9kjf9cibppkhdb7qx086hkx6hd3dcn85x27di4ic12g"; depends=[MeSHDbi]; };
+  MeSH_Aca_eg_db = derive2 { name="MeSH.Aca.eg.db"; version="1.6.0"; sha256="1lq2a7l855xb482x97p4mwvgzbizjb6m0avswhm9snvipbkfb42q"; depends=[MeSHDbi]; };
+  MeSH_Aga_PEST_eg_db = derive2 { name="MeSH.Aga.PEST.eg.db"; version="1.6.0"; sha256="19nv4mpx15qgiixcvwlbq8v5plzpkzkikgpc5mp9mzf286nnh7vz"; depends=[MeSHDbi]; };
+  MeSH_Ame_eg_db = derive2 { name="MeSH.Ame.eg.db"; version="1.6.0"; sha256="05xfrgyvyljh9jh38f8fj4x2l0i7h55yn08gd0r4riiibsgrfwvz"; depends=[MeSHDbi]; };
+  MeSH_Aml_eg_db = derive2 { name="MeSH.Aml.eg.db"; version="1.6.0"; sha256="1fnz04qz5f8v20sr0zp9wd2dbqapww0lfb1c8lv099m5sanmwz35"; depends=[MeSHDbi]; };
+  MeSH_Ana_eg_db = derive2 { name="MeSH.Ana.eg.db"; version="1.6.0"; sha256="0jbsz97wrbj70pypj9xgvhwy4cgjapirnhsdiix6b1l0lpqahvzq"; depends=[MeSHDbi]; };
+  MeSH_Ani_FGSC_eg_db = derive2 { name="MeSH.Ani.FGSC.eg.db"; version="1.6.0"; sha256="13gdrcn4xmndly7ag15b7qnwl86aclqgi63fn682y12hdbd0r4d9"; depends=[MeSHDbi]; };
+  MeSH_Ath_eg_db = derive2 { name="MeSH.Ath.eg.db"; version="1.6.0"; sha256="1k7faw7vspx5fg5qqnlq29r7i5b01fv2zhin2b3r497g25pg2yqf"; depends=[MeSHDbi]; };
+  MeSH_Bfl_eg_db = derive2 { name="MeSH.Bfl.eg.db"; version="1.6.0"; sha256="1fs858m8hsipawrjm75nqsrcmkka5ynqxk0cw2vr8g7q9a3ash9s"; depends=[MeSHDbi]; };
+  MeSH_Bsu_168_eg_db = derive2 { name="MeSH.Bsu.168.eg.db"; version="1.6.0"; sha256="1pwg5p82jsqmjl0rf3vv6nk9f4k2l5smn2ksx4d1q8dbnrl6dxdi"; depends=[MeSHDbi]; };
+  MeSH_Bsu_TUB10_eg_db = derive2 { name="MeSH.Bsu.TUB10.eg.db"; version="1.6.0"; sha256="1s3i1g5smbcal6sfdraqaybi6cmw3aagjr90dbgbw0dzf1i3vjf5"; depends=[MeSHDbi]; };
+  MeSH_Bta_eg_db = derive2 { name="MeSH.Bta.eg.db"; version="1.6.0"; sha256="198l8ksvfnzz8cdzx0k6297zvms7m4a6v54c1j96p1brqyx3asc7"; depends=[MeSHDbi]; };
+  MeSH_Cal_SC5314_eg_db = derive2 { name="MeSH.Cal.SC5314.eg.db"; version="1.6.0"; sha256="1lcsfax1w6jpyj6k33l4l4iw7n87gm88pljamn584622i7xgz65q"; depends=[MeSHDbi]; };
+  MeSH_Cbr_eg_db = derive2 { name="MeSH.Cbr.eg.db"; version="1.6.0"; sha256="1m1wf195nipvy4ha3amdl1l8shya7308s087ixy8sgklzdfnrka7"; depends=[MeSHDbi]; };
+  MeSH_Cel_eg_db = derive2 { name="MeSH.Cel.eg.db"; version="1.6.0"; sha256="1192anip5ib95cai84q0lxcj4q9j05m7p91zxnyqgwy8hda13fc4"; depends=[MeSHDbi]; };
+  MeSH_Cfa_eg_db = derive2 { name="MeSH.Cfa.eg.db"; version="1.6.0"; sha256="1qis2wxmilv2yy6gi5318md57ybcl1jwd1ap2y6qpa8aa92jdmpn"; depends=[MeSHDbi]; };
+  MeSH_Cin_eg_db = derive2 { name="MeSH.Cin.eg.db"; version="1.6.0"; sha256="1gs2dvrpdkis46m72sw7rxj5x3wsbyvxyn81npw6af4zvsp1150n"; depends=[MeSHDbi]; };
+  MeSH_Cja_eg_db = derive2 { name="MeSH.Cja.eg.db"; version="1.6.0"; sha256="13zsdh0x572p06drb6jhmmr2flcsmdwndhpb844rwc9ycw5fxka5"; depends=[MeSHDbi]; };
+  MeSH_Cpo_eg_db = derive2 { name="MeSH.Cpo.eg.db"; version="1.6.0"; sha256="0321fb35vmajhpp5fj8g0ha28psbbbk81076zvpx84kf4pbmy4z7"; depends=[MeSHDbi]; };
+  MeSH_Cre_eg_db = derive2 { name="MeSH.Cre.eg.db"; version="1.6.0"; sha256="1k225nkxnlkrcjg44xb7f7f9h52hjy6b54zfmphkp8r06hqmmynz"; depends=[MeSHDbi]; };
+  MeSH_Dan_eg_db = derive2 { name="MeSH.Dan.eg.db"; version="1.6.0"; sha256="0z67vcgk9mbjfab5hwd8n2dga02v01b62h51wbajanf5zv8yclb3"; depends=[MeSHDbi]; };
+  MeSH_Dda_3937_eg_db = derive2 { name="MeSH.Dda.3937.eg.db"; version="1.6.0"; sha256="1xncfml5h36g5ldgvmrvdq1w3mb9b2d3zsw4935ybydw0239pm8f"; depends=[MeSHDbi]; };
+  MeSH_Ddi_AX4_eg_db = derive2 { name="MeSH.Ddi.AX4.eg.db"; version="1.6.0"; sha256="0alw1az6iwk7xlbji5ibd22kp2hkj4s7cgssvkp7m880bbimfw49"; depends=[MeSHDbi]; };
+  MeSH_Der_eg_db = derive2 { name="MeSH.Der.eg.db"; version="1.6.0"; sha256="02dhsprjfg1lb5kiwmflxsd6sdapkp5j9d42c59mgq5i8wp5fgxb"; depends=[MeSHDbi]; };
+  MeSH_Dgr_eg_db = derive2 { name="MeSH.Dgr.eg.db"; version="1.6.0"; sha256="036n8rkn51fg1a5n4drx9gxqc6px895f7iqblbkjfyxxg4ljgxvq"; depends=[MeSHDbi]; };
+  MeSH_Dme_eg_db = derive2 { name="MeSH.Dme.eg.db"; version="1.6.0"; sha256="14v6nm8ky41aq9vih24nyb2yvzx4g14zazc6f2g7ik8g027nvwdl"; depends=[MeSHDbi]; };
+  MeSH_Dmo_eg_db = derive2 { name="MeSH.Dmo.eg.db"; version="1.6.0"; sha256="0zr4i89rk4jz20yrh8ag8mb5kdhcf4psb1pplr62idj1h38yn645"; depends=[MeSHDbi]; };
+  MeSH_Dpe_eg_db = derive2 { name="MeSH.Dpe.eg.db"; version="1.6.0"; sha256="0yigpsc3j8d0fp390qyxlfm0lgqbbz0q0661nkpchqajfdd1hy7k"; depends=[MeSHDbi]; };
+  MeSH_Dre_eg_db = derive2 { name="MeSH.Dre.eg.db"; version="1.6.0"; sha256="1rgc176cgd1ciwkiwma6q8vj53fa1an2k7ivqsxiwx8dpiznwp3z"; depends=[MeSHDbi]; };
+  MeSH_Dse_eg_db = derive2 { name="MeSH.Dse.eg.db"; version="1.6.0"; sha256="12hznsnlpbgmwabli009vr57cqnk5w35r31zsvjfcs0qkmk87dq7"; depends=[MeSHDbi]; };
+  MeSH_Dsi_eg_db = derive2 { name="MeSH.Dsi.eg.db"; version="1.6.0"; sha256="0khbqcxj2hvmiknb1ycryv91i2iw028lhhzfwma18spwmqybn8s0"; depends=[MeSHDbi]; };
+  MeSH_Dvi_eg_db = derive2 { name="MeSH.Dvi.eg.db"; version="1.6.0"; sha256="0v5pkbzjyrvx8say1nx0aqak8hqpwl4g9hr57nnvbmj6akjqfg5f"; depends=[MeSHDbi]; };
+  MeSH_Dya_eg_db = derive2 { name="MeSH.Dya.eg.db"; version="1.6.0"; sha256="0dfm8cdl5s83iia8jn4830vxc7lh9l8yf25pd4851zwdz4m34gj7"; depends=[MeSHDbi]; };
   MeSH_Eco_55989_eg_db = derive2 { name="MeSH.Eco.55989.eg.db"; version="1.4.0"; sha256="1r9q1vk8p9ah28k6gc2dlglwyi1i0y5zaxmzcrkxyw04pfzn41f7"; depends=[MeSHDbi]; };
   MeSH_Eco_CFT073_eg_db = derive2 { name="MeSH.Eco.CFT073.eg.db"; version="1.4.0"; sha256="0r7hlxd5k9n9shq3wj5ldqj00apvx4bv8h38v2i4adv29s5x7973"; depends=[MeSHDbi]; };
-  MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.5.0"; sha256="0qaciqrisxq7nhib661ha3ixwl2gpc3040dxiw7n4hy87bxa17g4"; depends=[MeSHDbi]; };
+  MeSH_Eco_ED1a_eg_db = derive2 { name="MeSH.Eco.ED1a.eg.db"; version="1.6.0"; sha256="0wgc2c0ihn3qg2sbh3xs2x54igsf4w1pl71c9vcpx65n71xnzwwg"; depends=[MeSHDbi]; };
   MeSH_Eco_HS_eg_db = derive2 { name="MeSH.Eco.HS.eg.db"; version="1.4.0"; sha256="0gyrfjyp3k5jbcg92qzz4fjpmk9m4i0v7q2yvja73sni6976g9ca"; depends=[MeSHDbi]; };
   MeSH_Eco_IAI1_eg_db = derive2 { name="MeSH.Eco.IAI1.eg.db"; version="1.4.0"; sha256="16mxh182ij25qgfk14dzzpvaac7fqcnzx58j5m6hfrz3wvgh9jrq"; depends=[MeSHDbi]; };
-  MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.5.0"; sha256="0cgyb709k0894m5f8gzsfx0215mf058dwmpi41rm4xbv98ww9x2p"; depends=[MeSHDbi]; };
+  MeSH_Eco_IAI39_eg_db = derive2 { name="MeSH.Eco.IAI39.eg.db"; version="1.6.0"; sha256="18m2grrbjp73ymb25iv3krb495b7y0rqy7bgq3ramig119hxcmqp"; depends=[MeSHDbi]; };
   MeSH_Eco_K12_DH10B_eg_db = derive2 { name="MeSH.Eco.K12.DH10B.eg.db"; version="1.4.0"; sha256="00y5qlqrsjl941iaqln4m5jvskc2a6kildys881ml92f14cmgs07"; depends=[MeSHDbi]; };
-  MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.5.0"; sha256="1az1si0pkd9jngddvd5b37k0h5y5p2mkis9z1y6w9g3kp2z5b3wy"; depends=[MeSHDbi]; };
+  MeSH_Eco_K12_MG1655_eg_db = derive2 { name="MeSH.Eco.K12.MG1655.eg.db"; version="1.6.0"; sha256="1778f3bcll6zd4jing0nm8iydsyhbx68d78wh1dj68x9gky1rwd2"; depends=[MeSHDbi]; };
   MeSH_Eco_O127_H6_E2348_69_eg_db = derive2 { name="MeSH.Eco.O127.H6.E2348.69.eg.db"; version="1.4.0"; sha256="1as23bz0yylgf24sy84xm46bblvkacp84kjr2g8c9if1vll2x2dg"; depends=[MeSHDbi]; };
   MeSH_Eco_O157_H7_EDL933_eg_db = derive2 { name="MeSH.Eco.O157.H7.EDL933.eg.db"; version="1.4.0"; sha256="0qnnp2a2v3nv1br1lg2km0p96q1knwa1fx95cg4wp38nc5g0jcc9"; depends=[MeSHDbi]; };
-  MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.5.0"; sha256="12x6fp6h45ixxisib2x16rvx5xv57xfh9pcrwpprrj8sy2pv2gbb"; depends=[MeSHDbi]; };
+  MeSH_Eco_O157_H7_Sakai_eg_db = derive2 { name="MeSH.Eco.O157.H7.Sakai.eg.db"; version="1.6.0"; sha256="01lbrqjdyf8awzhypqmm5wja1ql08i4f8a6c9w5h9g4sziq24ck5"; depends=[MeSHDbi]; };
   MeSH_Eco_S88_eg_db = derive2 { name="MeSH.Eco.S88.eg.db"; version="1.4.0"; sha256="15k44ricv7vi7sbw5s2nckm6jwbfzrrjp8ck06ydjp9q70hfzmhy"; depends=[MeSHDbi]; };
-  MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.5.0"; sha256="1a6f5xz5zc609k27fivaav5dg9kmz9wyrmjm4cz194ac36zj57q7"; depends=[MeSHDbi]; };
-  MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.5.0"; sha256="02lp2sdgbz8a50l0s8mfw7halgdg2sc00sxc6k2dr7his3clhnby"; depends=[MeSHDbi]; };
-  MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.5.0"; sha256="1i8vlkis021cw5ym0f74rgpcml8x8wcsjvaynpadpvfkyra49946"; depends=[MeSHDbi]; };
-  MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.5.0"; sha256="1awwmbmrgi5jpsa6xys4aqd8c4vjcfy0d1fbs918v8dha9ksy202"; depends=[MeSHDbi]; };
-  MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.5.0"; sha256="13cpchm3lyc259r739k1kcljmjpr31l7wp9zgiliyqc1l7hw279k"; depends=[MeSHDbi]; };
-  MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.5.0"; sha256="09sbzwqh1bi0bbdxbin107nbqw9vch09vsr2d2pq3z5q3bdz52sh"; depends=[MeSHDbi]; };
-  MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.5.0"; sha256="0f71ywvjsc2ly8l7lrxm6nrkrnm2vlkbmnm0bi22yqwvr5q5gm4q"; depends=[MeSHDbi]; };
-  MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.5.0"; sha256="1l3yfi4vx3yzw8i85ymy0fj1k1q66gyv4fjl5mbq5nlz8g6r19y0"; depends=[MeSHDbi]; };
-  MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.5.0"; sha256="01mr5crin0ak57gdm1p36m3066a2x2m81g74minf2ijghpnb67q5"; depends=[MeSHDbi]; };
-  MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.5.0"; sha256="0icm9jnyi46bp5knsxmb1fv2fghimrmwskq9p5yzgm1jhr43qgjd"; depends=[MeSHDbi]; };
-  MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.5.0"; sha256="0d3y2837n0k74mn2bv75x3f3bm1xlzfh728221vfhyj9xzbs6131"; depends=[MeSHDbi]; };
-  MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.5.0"; sha256="04ba79mky8m6wiiwi0fkcz9c6gfk1c81pypz77258qwbi98p6y32"; depends=[MeSHDbi]; };
-  MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.5.0"; sha256="0ligmwg9f6qs99ngnk81imlp6n48cw5jjnqklaw8dcy8ph016vhf"; depends=[MeSHDbi]; };
-  MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.5.0"; sha256="187bw5svsbssyjm3rdy9lh5wp5r0wkspxska80hqf26swbjl4ymm"; depends=[MeSHDbi]; };
-  MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.5.0"; sha256="1gairkwy29jg949i270ndzsa6f9zwcs7i61lj6w26piz6hcjgv28"; depends=[MeSHDbi]; };
-  MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.5.0"; sha256="1wk2mfd1qg1ycfqsd0v5zp470cb49vczsarar8wfkly5mvl561m4"; depends=[MeSHDbi]; };
-  MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.5.0"; sha256="12xkw4s3ycr9fpz2q36rcg3mhvzplmg8fmigcigd5vg0g5029wi8"; depends=[MeSHDbi]; };
-  MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.5.0"; sha256="0jwrkhdfykm71cn1smzzp5wjph04v687lvk0hyazd1hb5wwhwkyi"; depends=[MeSHDbi]; };
-  MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.5.0"; sha256="105qz16b2l2sbr1r8if3bkc6w0cll7lhg67j09l8a9y9f4ddwa65"; depends=[MeSHDbi]; };
-  MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.5.0"; sha256="03hrggzl4j29k9fvvhzhbil506k02lmnpl3rm63m3x35416g7wsj"; depends=[MeSHDbi]; };
-  MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.5.0"; sha256="0kd4cz233y4kld8gb3qhnv5bjm9jpfngkc5d6y4bk91jkq1d4g3a"; depends=[MeSHDbi]; };
-  MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.5.0"; sha256="0cm5ja8l1mkvzpv68gg4aimy68kxzpppps50iwhxc191h2dxkl4r"; depends=[MeSHDbi]; };
-  MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.5.0"; sha256="1l793h8x3bhm8nydxf517gi8b9paf0plw6i3kmi84gwczvywffqq"; depends=[MeSHDbi]; };
-  MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.5.0"; sha256="1g131cjhlxjppvrjdcl1rwz8856f110a467lyp1kk0pvd2d0xhvz"; depends=[MeSHDbi]; };
-  MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.5.0"; sha256="0z7ypnmi68spzr4dv98lswj5wna0rwnwvmbw1g6ihi25vd26cd37"; depends=[MeSHDbi]; };
-  MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.5.0"; sha256="1hzwrc6l41psr1f3zjm71b87rf5bjzwskkanfv1rx87ynq1h2m81"; depends=[MeSHDbi]; };
+  MeSH_Eco_UMN026_eg_db = derive2 { name="MeSH.Eco.UMN026.eg.db"; version="1.6.0"; sha256="0j9jrfi1fin7siaqn3q06s1aqh84f2x15sr5vkd28wzxxiv12c58"; depends=[MeSHDbi]; };
+  MeSH_Eqc_eg_db = derive2 { name="MeSH.Eqc.eg.db"; version="1.6.0"; sha256="1ka55k5g7h8rzy6qab4q06k5h1mn5ryhhp28hvbb393yhslavgya"; depends=[MeSHDbi]; };
+  MeSH_Gga_eg_db = derive2 { name="MeSH.Gga.eg.db"; version="1.6.0"; sha256="12fwr628gn4mmp876j9lli637p1452hwqm8sa383jyf3hvj5a0c2"; depends=[MeSHDbi]; };
+  MeSH_Gma_eg_db = derive2 { name="MeSH.Gma.eg.db"; version="1.6.0"; sha256="1yznkpsdl9y560sh66q36ks5h1k0qzkc6crgrwfalpq6g4ik353w"; depends=[MeSHDbi]; };
+  MeSH_Hsa_eg_db = derive2 { name="MeSH.Hsa.eg.db"; version="1.6.0"; sha256="0nxk5s2gqa2gswhzmg8isxsraf06plcwhwj8k6s1hvr2lhiq4dmd"; depends=[MeSHDbi]; };
+  MeSH_Laf_eg_db = derive2 { name="MeSH.Laf.eg.db"; version="1.6.0"; sha256="1dqn7arsrrmwxznkal10cpzz2409i28b0n2jivkxnyfbkhvfpxrn"; depends=[MeSHDbi]; };
+  MeSH_Lma_eg_db = derive2 { name="MeSH.Lma.eg.db"; version="1.6.0"; sha256="1xn14fwbs2g60b5v6jagq0yjlywziv9ds7djz9pjaagsxpk9clip"; depends=[MeSHDbi]; };
+  MeSH_Mdo_eg_db = derive2 { name="MeSH.Mdo.eg.db"; version="1.6.0"; sha256="033q5j9q6nrkb8fingqhccg1qmka1j518pppz7lhgbjzskvlqkmj"; depends=[MeSHDbi]; };
+  MeSH_Mes_eg_db = derive2 { name="MeSH.Mes.eg.db"; version="1.6.0"; sha256="18qypw8l98gk71lxkffvip00qqn1kdhr4k3bgmv9r9j3k00imdf2"; depends=[MeSHDbi]; };
+  MeSH_Mga_eg_db = derive2 { name="MeSH.Mga.eg.db"; version="1.6.0"; sha256="02wx25mh7967ymqkapj4k4qh0f0xfxqkklmz8xyn1pkvk0mr1zr5"; depends=[MeSHDbi]; };
+  MeSH_Miy_eg_db = derive2 { name="MeSH.Miy.eg.db"; version="1.6.0"; sha256="0w9m7pbayp967pcx34f7a1snk72ww093w445gf5maagifzlffwak"; depends=[MeSHDbi]; };
+  MeSH_Mml_eg_db = derive2 { name="MeSH.Mml.eg.db"; version="1.6.0"; sha256="1s8vmdqnydla1psnbz0n1rrm9w987jy8j04a4av2cr4q5lciv551"; depends=[MeSHDbi]; };
+  MeSH_Mmu_eg_db = derive2 { name="MeSH.Mmu.eg.db"; version="1.6.0"; sha256="1wn365f0j5x19mwzycgkr3r5c73vmm509622p5jrmx83ndx2gk94"; depends=[MeSHDbi]; };
+  MeSH_Mtr_eg_db = derive2 { name="MeSH.Mtr.eg.db"; version="1.6.0"; sha256="1yinkkinzn9jhxmr1ri0cgcvlb08pvdrgz2fqnafxk55rihh5kg5"; depends=[MeSHDbi]; };
+  MeSH_Nle_eg_db = derive2 { name="MeSH.Nle.eg.db"; version="1.6.0"; sha256="1jni4l7ha3asjpg9nvwh17kmbfgkg2gvmp79wjdd7b3mpw1lrm1z"; depends=[MeSHDbi]; };
+  MeSH_Oan_eg_db = derive2 { name="MeSH.Oan.eg.db"; version="1.6.0"; sha256="1q46w0v4vni4b1qfx291xs0v5p7rgjsj5pwpfkrvkviy780c5nb9"; depends=[MeSHDbi]; };
+  MeSH_Ocu_eg_db = derive2 { name="MeSH.Ocu.eg.db"; version="1.6.0"; sha256="1d8j6sbx4n98yg3fygznrcczwimga96w7ibm1rw4jwg4nxsscizn"; depends=[MeSHDbi]; };
+  MeSH_Oni_eg_db = derive2 { name="MeSH.Oni.eg.db"; version="1.6.0"; sha256="1ycg7mh4pa7rb734x1swrfv8r0mxx6gxrlf5dnbwh0imdcxy1b5y"; depends=[MeSHDbi]; };
+  MeSH_Osa_eg_db = derive2 { name="MeSH.Osa.eg.db"; version="1.6.0"; sha256="0qvqs3vwbwc0bah348bmmhglvqmj9q7y7kk6zkrwc4337nfrbd2i"; depends=[MeSHDbi]; };
+  MeSH_PCR_db = derive2 { name="MeSH.PCR.db"; version="1.6.0"; sha256="0v84n2i71vdf71wj9yk7h89h1hvb5s0ixcdrzyhsi6a041bwq17m"; depends=[MeSHDbi]; };
+  MeSH_Pab_eg_db = derive2 { name="MeSH.Pab.eg.db"; version="1.6.0"; sha256="0wrngzyncgsrnl1ai98vaqzs2rmx3sk6ic9xdxkfkf8xb8hgdzjy"; depends=[MeSHDbi]; };
+  MeSH_Pae_PAO1_eg_db = derive2 { name="MeSH.Pae.PAO1.eg.db"; version="1.6.0"; sha256="0gvm30z9k7xnb98m3s3wk2f47kvb6h8318cjjhmbpniilfz0cl7g"; depends=[MeSHDbi]; };
+  MeSH_Pfa_3D7_eg_db = derive2 { name="MeSH.Pfa.3D7.eg.db"; version="1.6.0"; sha256="137267ibpcr159br33mqrvbnbr98rxc54l2wfl0hhfrgv1k25ccp"; depends=[MeSHDbi]; };
+  MeSH_Pto_eg_db = derive2 { name="MeSH.Pto.eg.db"; version="1.6.0"; sha256="01ghjn7fjhiy5pg27wl10kqcdlx5qnggzflrhs4kiyz5k8wa997h"; depends=[MeSHDbi]; };
+  MeSH_Ptr_eg_db = derive2 { name="MeSH.Ptr.eg.db"; version="1.6.0"; sha256="08hi6csc8lnfryg6jsjv8z1qz9md6ss6vd0f2szhanrq3j198f0z"; depends=[MeSHDbi]; };
+  MeSH_Rno_eg_db = derive2 { name="MeSH.Rno.eg.db"; version="1.6.0"; sha256="0wyrzfj5v1fgr7c61pdg0s3bpna24x50dzzvxv3bls0qzpn096hl"; depends=[MeSHDbi]; };
   MeSH_Sau_USA300TCH1516_eg_db = derive2 { name="MeSH.Sau.USA300TCH1516.eg.db"; version="1.4.0"; sha256="109kvsdqvra8x392l82djbd46l8z4hv4z92785ivgdcnchsdjq7p"; depends=[MeSHDbi]; };
-  MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.5.0"; sha256="07xvrvhyb0gfq2fx47prkcax46csrb3c2rmvik6lbm17h0ah55x4"; depends=[MeSHDbi]; };
-  MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.5.0"; sha256="0y9afs85yqgyz9701fpwkz3y3wabwks56m1ar3qv8zap6s124fh7"; depends=[MeSHDbi]; };
-  MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.5.0"; sha256="02p6g63rcfnx6db91njw33qrzbr4nra9ddwbwg23jz1vhqlxcv5a"; depends=[MeSHDbi]; };
-  MeSH_Spo_972h_eg_db = derive2 { name="MeSH.Spo.972h.eg.db"; version="1.5.0"; sha256="083pg2bc56s52rkv7mvbziq0hjrfndwja32jd31pxdd0cjdv3c3q"; depends=[MeSHDbi]; };
-  MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.5.0"; sha256="1vx6h5pv7hygmgrd5wjdcx576bvr23xfhh4aba3a2jzsjwvg0c9c"; depends=[MeSHDbi]; };
-  MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.5.0"; sha256="0c8ijwz4vcwcbf18jsf2z3wxis09h9wrsb9fki5wspgjc486lz9n"; depends=[MeSHDbi]; };
-  MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.5.0"; sha256="03sd73jipya5zqdzqxd6iwnmwmxkqp1mz9hg2bzmfnx3jz3fd5sv"; depends=[MeSHDbi]; };
-  MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.5.0"; sha256="05fandy9ig1arahaag0wa09gwz8g4g7bpyns0jchmw88044jvgqs"; depends=[MeSHDbi]; };
-  MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.5.0"; sha256="03bysvpymrq4n4xa48hksm9vayww6gvjpncnb4q5891azja3drpr"; depends=[MeSHDbi]; };
-  MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.5.0"; sha256="0vdxabqli7z2cpdq015jhaddzsxh23k7x0pzc28k8aqbp84czb89"; depends=[MeSHDbi]; };
-  MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.5.0"; sha256="0cyn8lflhb8n4fkh7sm0ky9q5n640cwxks22a54x16bvr7bb7f1k"; depends=[MeSHDbi]; };
-  MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.5.0"; sha256="04ihvbp7dlb4fb68snlq0imh3igfhacjsqjnjnwnm1xqgynzn6f6"; depends=[MeSHDbi]; };
-  MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.5.0"; sha256="09g6wh866n2xbdy4xmglbk361zwiyywgxwbzndm8yd1xdkzc4myw"; depends=[MeSHDbi]; };
-  MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.5.0"; sha256="00vm12fgmlw79bpkfbc4yrwvf8c6daw3fkxysag6qpjfsjrbdhlg"; depends=[MeSHDbi]; };
-  MeSH_db = derive2 { name="MeSH.db"; version="1.5.0"; sha256="1r6iyc1066g7bgil9d0dk5s23bz3bv7idn7k18kbgzm2j3dm9m5g"; depends=[MeSHDbi]; };
-  MmAgilentDesign026655_db = derive2 { name="MmAgilentDesign026655.db"; version="3.2.2"; sha256="0zynbckkdxwd90v4k2gv7cmwg0m80jqq5khrzxb73jf7bqn85d3n"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  MeSH_Sce_S288c_eg_db = derive2 { name="MeSH.Sce.S288c.eg.db"; version="1.6.0"; sha256="1yxhywyzzak1h13vb7dqnqn016l8zjafq2y5dg7gyja1njwln4sr"; depends=[MeSHDbi]; };
+  MeSH_Sco_A32_eg_db = derive2 { name="MeSH.Sco.A32.eg.db"; version="1.6.0"; sha256="137zvl1628jxrrn5n2pv4p9j00nrrqp3bxibxspx760hwrf72qah"; depends=[MeSHDbi]; };
+  MeSH_Sil_eg_db = derive2 { name="MeSH.Sil.eg.db"; version="1.6.0"; sha256="0w5r34mkmfllrgqcvnv51yi9d9qpy88w2xnff388qf101n3pr8zd"; depends=[MeSHDbi]; };
+  MeSH_Spo_972h_eg_db = derive2 { name="MeSH.Spo.972h.eg.db"; version="1.6.0"; sha256="1kqnms8zq7mspk1bp0in7c6rns0zp08jaji5a0dlryng6awirm2m"; depends=[MeSHDbi]; };
+  MeSH_Spu_eg_db = derive2 { name="MeSH.Spu.eg.db"; version="1.6.0"; sha256="0s4dw4hkgw9qkbcwp1pd7kvkjpbsiwnzmbp3x9448ljphi5x3fya"; depends=[MeSHDbi]; };
+  MeSH_Ssc_eg_db = derive2 { name="MeSH.Ssc.eg.db"; version="1.6.0"; sha256="1bb8cpb28amrxjdlq24vszg7nzp64crhsvckl9dgsw48mf4ijvlr"; depends=[MeSHDbi]; };
+  MeSH_Syn_eg_db = derive2 { name="MeSH.Syn.eg.db"; version="1.6.0"; sha256="0g09xgh4kzrqbaq1aif93bbbazkxggf36jsr4w2m5l7pdmbr9307"; depends=[MeSHDbi]; };
+  MeSH_Tbr_9274_eg_db = derive2 { name="MeSH.Tbr.9274.eg.db"; version="1.6.0"; sha256="11zcyybrwappblsbwylzmjvavmvr4p80q9308mgdc5wix9zzj1fy"; depends=[MeSHDbi]; };
+  MeSH_Tgo_ME49_eg_db = derive2 { name="MeSH.Tgo.ME49.eg.db"; version="1.6.0"; sha256="022c14njscb5d5146z3y85m2x5jxhq2lanj0nvba5jl0apzjxbb3"; depends=[MeSHDbi]; };
+  MeSH_Tgu_eg_db = derive2 { name="MeSH.Tgu.eg.db"; version="1.6.0"; sha256="123zq61pnb1fgm5w81ahdymb3fmyb3bassxqh3bzf592q5457sm0"; depends=[MeSHDbi]; };
+  MeSH_Vvi_eg_db = derive2 { name="MeSH.Vvi.eg.db"; version="1.6.0"; sha256="068qigbld4s7jj8001d21vi2k0ddqw74csn8xqhm245h31w8sr1v"; depends=[MeSHDbi]; };
+  MeSH_Xla_eg_db = derive2 { name="MeSH.Xla.eg.db"; version="1.6.0"; sha256="0is3w4snymmc8207lbwi8b1qi6kwm2v50k9aqd4x51acs292kyim"; depends=[MeSHDbi]; };
+  MeSH_Xtr_eg_db = derive2 { name="MeSH.Xtr.eg.db"; version="1.6.0"; sha256="0qdpw4s0brlmp6dvxdngzmflhvvz85x56mr1z72v3wf4991l41r8"; depends=[MeSHDbi]; };
+  MeSH_Zma_eg_db = derive2 { name="MeSH.Zma.eg.db"; version="1.6.0"; sha256="1al8lr6p7g0wpcjjkwl3sxwkgykc06mgmgm54y5bvrgdbqxydz1q"; depends=[MeSHDbi]; };
+  MeSH_db = derive2 { name="MeSH.db"; version="1.6.0"; sha256="0k366gpxn6kv9b8by516dqib3d5aclzf8475ci8vqrryaxh3ibsm"; depends=[MeSHDbi]; };
+  MmAgilentDesign026655_db = derive2 { name="MmAgilentDesign026655.db"; version="3.2.3"; sha256="00d0yjcb5id7zacx4bzdwy4q6f4qvnnx8ph4d4xz1fmcbspz2qiz"; depends=[AnnotationDbi org_Mm_eg_db]; };
   MoExExonProbesetLocation = derive2 { name="MoExExonProbesetLocation"; version="1.15.0"; sha256="0bvj3bji4bwwmxjz4b57n1aqypdibdmry30rfwmlxss1hav96sl7"; depends=[AnnotationDbi]; };
-  Mu15v1_db = derive2 { name="Mu15v1.db"; version="3.2.2"; sha256="0k6y8kk3xa0j76l23y8zh31xa6dvwq70b1akwzxlv4nikxdzc1m1"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  Mu22v3_db = derive2 { name="Mu22v3.db"; version="3.2.2"; sha256="0576rrlbh5ikik3wqrz83m3ah9dwmqi14fb52wjr31rrbw72qza6"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  Mu15v1_db = derive2 { name="Mu15v1.db"; version="3.2.3"; sha256="0qchqkbx6ybijab8qhflxj33kwksfll1d3d3917vydjac9fzw1lz"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  Mu22v3_db = derive2 { name="Mu22v3.db"; version="3.2.3"; sha256="016dfa1pz5valjnqh9z73b931wk184vykv9xmz60xp2kj9ccrjzc"; depends=[AnnotationDbi org_Mm_eg_db]; };
   Mus_musculus = derive2 { name="Mus.musculus"; version="1.3.1"; sha256="143zdf83gbfqhy8jm9df7gzhw5q3a64jrjrxrzjf0zd76j8s8j6y"; depends=[AnnotationDbi GenomicFeatures GO_db org_Mm_eg_db OrganismDbi TxDb_Mmusculus_UCSC_mm10_knownGene]; };
-  Norway981_db = derive2 { name="Norway981.db"; version="3.2.2"; sha256="16wn65n0yydba5mji4ysxwipl263kz2sv6zkj16i8ri5zvnk5343"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  OperonHumanV3_db = derive2 { name="OperonHumanV3.db"; version="3.2.2"; sha256="0h7pcpkz9fmqfam00a57g0dkwmmgd9fh54yz12hl23g2nhydswac"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  Norway981_db = derive2 { name="Norway981.db"; version="3.2.3"; sha256="04ngc2hilqi9m7933mnm7jcvkxlz68vqqh5b628db575vcxql9b9"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  OperonHumanV3_db = derive2 { name="OperonHumanV3.db"; version="3.2.3"; sha256="082gff88cwk2p50q8g9bixggacaclgqcvk6w5dc11h9fkgvd160i"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PANTHER_db = derive2 { name="PANTHER.db"; version="1.0.3"; sha256="1vsfhradfhk087vzi0jzkd7qab72g0v0x9s1rr7wblw7wjz48299"; depends=[AnnotationDbi RSQLite]; };
-  PFAM_db = derive2 { name="PFAM.db"; version="3.2.2"; sha256="14q62rr08nwr2a4y26f4lnhxfwb2bx5dw1x0jyzdwk72pdslpwh8"; depends=[AnnotationDbi]; };
-  POCRCannotation_db = derive2 { name="POCRCannotation.db"; version="3.2.2"; sha256="0rz7nvvw19z0hmpni7yhds30hvw2dcy9p7knhj074hv9a6l174bw"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  PartheenMetaData_db = derive2 { name="PartheenMetaData.db"; version="3.2.2"; sha256="1c89whi5iayjw3mqlw6793gr77y5kjs4j4fanl9waw9jxp0q2n5j"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  PFAM_db = derive2 { name="PFAM.db"; version="3.3.0"; sha256="11qd5mjqksvlsqsgljgaffrbzzbsnf8d1xx38a135fk3cgmk9vb4"; depends=[AnnotationDbi]; };
+  POCRCannotation_db = derive2 { name="POCRCannotation.db"; version="3.2.3"; sha256="0ybvs4hrxpivdkhm0fxpib11vlxqqdk8prlyj78vj5qzyb3iy89d"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  PartheenMetaData_db = derive2 { name="PartheenMetaData.db"; version="3.2.3"; sha256="0d37c5b7s3fgkkvg7sj7gl9ksrjk5pyyv54vkys8w3qwgsm8yrdz"; depends=[AnnotationDbi org_Hs_eg_db]; };
   PolyPhen_Hsapiens_dbSNP131 = derive2 { name="PolyPhen.Hsapiens.dbSNP131"; version="1.0.2"; sha256="1kikygkli41sn3rqihz0924prmqg2264ifj29vmg1a7qccm0kf7c"; depends=[AnnotationDbi RSQLite VariantAnnotation]; };
   RaExExonProbesetLocation = derive2 { name="RaExExonProbesetLocation"; version="1.15.0"; sha256="1vvcc5zlpgbnqak4y2xywyd82j3s61wvhhp2ap0nni14sdxrl3hd"; depends=[AnnotationDbi]; };
   Rattus_norvegicus = derive2 { name="Rattus.norvegicus"; version="1.3.1"; sha256="0bpd7i5jvl2jvf822mhxankx7cqqr4l70xp4f7hcknxw3lxia2f1"; depends=[AnnotationDbi GenomicFeatures GO_db org_Rn_eg_db OrganismDbi TxDb_Rnorvegicus_UCSC_rn5_refGene]; };
   RmiR_Hs_miRNA = derive2 { name="RmiR.Hs.miRNA"; version="1.0.7"; sha256="0pybw908mlfrskwhnhc0bfaaqw2z13kvr10apf68s74zs0ss57b4"; depends=[AnnotationDbi]; };
   RmiR_hsa = derive2 { name="RmiR.hsa"; version="1.0.5"; sha256="1c663vxjxgrs4p9wfbg0zli5qqbvq6hp11kzbqrn70ndkpsbnb3z"; depends=[AnnotationDbi]; };
-  RnAgilentDesign028282_db = derive2 { name="RnAgilentDesign028282.db"; version="3.2.2"; sha256="088bkg2j4rwg97q7n6v4abvvw5cfdfkr5kwzf75bbvv6nmzid7pd"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  Roberts2005Annotation_db = derive2 { name="Roberts2005Annotation.db"; version="3.2.2"; sha256="0i7baybh8rly2v09rla7x6n5x5rvyr2wvc14cjavb32wihg42jpb"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  SHDZ_db = derive2 { name="SHDZ.db"; version="3.2.2"; sha256="0rw33wa66fy00hbixgp78h6ykyxs8v9f9dp5dkp4c637cbplgvr5"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  RnAgilentDesign028282_db = derive2 { name="RnAgilentDesign028282.db"; version="3.2.3"; sha256="00qri74spbpym7krk1clx0kl429b1592afk5bfr3j8j3iw99g4af"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  Roberts2005Annotation_db = derive2 { name="Roberts2005Annotation.db"; version="3.2.3"; sha256="1fc95c6x36n7zbr5ca680hyffxngma26gz0bdzylbw0w4mqmj6ga"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  SHDZ_db = derive2 { name="SHDZ.db"; version="3.2.3"; sha256="077xy2zx3f4c01di18ki32xmrwgsc1qjci3wj33nmgsy5925zdxs"; depends=[AnnotationDbi org_Hs_eg_db]; };
   SIFT_Hsapiens_dbSNP132 = derive2 { name="SIFT.Hsapiens.dbSNP132"; version="1.0.2"; sha256="1akqhmv9hp41q2jrvz4xvpdi30c4c6v4xbz6ykn6pdf0217p7xry"; depends=[AnnotationDbi RSQLite VariantAnnotation]; };
   SIFT_Hsapiens_dbSNP137 = derive2 { name="SIFT.Hsapiens.dbSNP137"; version="1.0.0"; sha256="1472abqanbwziyynr851xzhg7ck8w1n98ymmggg7s46hzix5mlj8"; depends=[AnnotationDbi RSQLite VariantAnnotation]; };
   SNPlocs_Hsapiens_dbSNP_20090506 = derive2 { name="SNPlocs.Hsapiens.dbSNP.20090506"; version="0.99.9"; sha256="10943wbc56mz8ywcd71ndbdz7h3a9a17mzfdvj237wsgp62arfh6"; depends=[BSgenome GenomicRanges IRanges]; };
@@ -248,78 +258,88 @@ in with self; {
   TxDb_Athaliana_BioMart_plantsmart22 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart22"; version="3.0.1"; sha256="0j2zr4cddad7z1lxx9m9kfgyy7jajjnblpk9j8igd39ia3ixrpzc"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Athaliana_BioMart_plantsmart25 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart25"; version="3.1.3"; sha256="0a6v0l6p13zmiysi3k8dxzdlxng552qqj9rnlbdavdiidla0pvm3"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Athaliana_BioMart_plantsmart28 = derive2 { name="TxDb.Athaliana.BioMart.plantsmart28"; version="3.2.2"; sha256="1yjyvrbx55y024lqg3b2rlf8pngqw5xi3p83j5ipan05wf0aq6ir"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Btaurus_UCSC_bosTau8_refGene = derive2 { name="TxDb.Btaurus.UCSC.bosTau8.refGene"; version="3.3.0"; sha256="023n916nxmb1l42sbzlknfmg6y1ad2s27bfhhxpvwl2c8mbbi2ci"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Celegans_UCSC_ce11_refGene = derive2 { name="TxDb.Celegans.UCSC.ce11.refGene"; version="3.3.0"; sha256="06ax8wnqzi0jk0c4asxczvfcfg03b46vksfr3lfcnfij96ksb9mh"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Celegans_UCSC_ce6_ensGene = derive2 { name="TxDb.Celegans.UCSC.ce6.ensGene"; version="3.2.2"; sha256="1sgppva33cdy4isj2is8mfalj5gmmkpbkq9w1d83a4agcq31mi90"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Cfamiliaris_UCSC_canFam3_refGene = derive2 { name="TxDb.Cfamiliaris.UCSC.canFam3.refGene"; version="3.3.0"; sha256="0h0n3yqdzqip1ikqq396pziyn0l5651yg87bb0cgc3gy2ldsrl74"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Dmelanogaster_UCSC_dm3_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm3.ensGene"; version="3.2.2"; sha256="1337x23rdmiiza83ms225kri37h16q5hw1lw0m577abcgip3d7c7"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Dmelanogaster_UCSC_dm6_ensGene = derive2 { name="TxDb.Dmelanogaster.UCSC.dm6.ensGene"; version="3.3.0"; sha256="1kgwb63z37zq5mspqzf2rb09vl8b71kn8aa3fsmyn8phmhay98zw"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Drerio_UCSC_danRer10_refGene = derive2 { name="TxDb.Drerio.UCSC.danRer10.refGene"; version="3.3.0"; sha256="1wjzhbc6kqxdwbl1g1nc3ljvphqd7d9qx9dgfr31x100ddjgpkc6"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ggallus_UCSC_galGal4_refGene = derive2 { name="TxDb.Ggallus.UCSC.galGal4.refGene"; version="3.3.0"; sha256="0bmc3hi953dildf89in9njwpy32mddxynami04z903ijsm26nkvi"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_BioMart_igis = derive2 { name="TxDb.Hsapiens.BioMart.igis"; version="2.3.2"; sha256="0590a2hkrpm33hmjg5g0gm6sig3xvc09m0q6lwmafgaajf90h6ky"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg18_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg18.knownGene"; version="3.2.2"; sha256="1yk9ggclkqqfzrdp8gcqyplvif824pa7df54ck5gb1xb9q5s975w"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg19_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg19.knownGene"; version="3.2.2"; sha256="1sajhcqqwazgz2lqbik7rd935i7kpnh08zxbp2ra10j72yqy4g86"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg19_lincRNAsTranscripts = derive2 { name="TxDb.Hsapiens.UCSC.hg19.lincRNAsTranscripts"; version="3.2.2"; sha256="0bmbp7kydvviczw8axgxq2wdlwq6fdas90jk9bg56avjq5syws2g"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Hsapiens_UCSC_hg38_knownGene = derive2 { name="TxDb.Hsapiens.UCSC.hg38.knownGene"; version="3.1.3"; sha256="10250vgk5b9k7852n0ah47c4n535603mdm4swwlwbsh44438n544"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Mmulatta_UCSC_rheMac3_refGene = derive2 { name="TxDb.Mmulatta.UCSC.rheMac3.refGene"; version="3.3.0"; sha256="1gdmfi5v6cy22f7np2sn51l1vnq0v689iyg59sm7fhfggvlykndf"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm10_ensGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.ensGene"; version="3.2.2"; sha256="15p0n8snfsc3lml2zsmrsn5w4nq3h0pgvw82z0y6i43g0wg8fzl6"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm10_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm10.knownGene"; version="3.2.2"; sha256="0cvqp1pv632br5bd84g2ymb67hm4ijwqk43pycvwb2fvhzgx089c"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Mmusculus_UCSC_mm9_knownGene = derive2 { name="TxDb.Mmusculus.UCSC.mm9.knownGene"; version="3.2.2"; sha256="16bjxy00363hf91ik2mqlqls86i07gia72qh92xc3l1ncch61mx2"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Ptroglodytes_UCSC_panTro4_refGene = derive2 { name="TxDb.Ptroglodytes.UCSC.panTro4.refGene"; version="3.3.0"; sha256="08qf0n15hm0wacvp70gr5pcwn1y64zk0z0ya3cx5h1w6ci7cpdlf"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Rnorvegicus_BioMart_igis = derive2 { name="TxDb.Rnorvegicus.BioMart.igis"; version="2.3.2"; sha256="1099vkk8g3lxbgjxsm1p1m3mjj08nsw282mqxgzpnrxf7m6jll76"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Rnorvegicus_UCSC_rn4_ensGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn4.ensGene"; version="3.2.2"; sha256="0gv8bynfxxa471ap069mjvfrb1d7a0c4w5k8hxkr4hnsm44mschm"; depends=[AnnotationDbi GenomicFeatures]; };
-  TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.2.2"; sha256="07lhh3xk4n8nsq6an5hz4r2mgm3m05vx34nhxd7x4lvy224ar18h"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Rnorvegicus_UCSC_rn5_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn5.refGene"; version="3.3.0"; sha256="13qhwb5x4813binp8grl41rd07j1h9agld8zmnkiqw7c1sdz3q7b"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Rnorvegicus_UCSC_rn6_refGene = derive2 { name="TxDb.Rnorvegicus.UCSC.rn6.refGene"; version="3.3.0"; sha256="0jpvrn8wq4wl4d2kh4n133nla43f94ym2rjh5f45d4kikqk6xl2i"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Scerevisiae_UCSC_sacCer2_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer2.sgdGene"; version="3.2.2"; sha256="0l5gcwhbvzx60p9hjhd31angamb0hkgdg2avga7341j77rd5pwza"; depends=[AnnotationDbi GenomicFeatures]; };
   TxDb_Scerevisiae_UCSC_sacCer3_sgdGene = derive2 { name="TxDb.Scerevisiae.UCSC.sacCer3.sgdGene"; version="3.2.2"; sha256="1sjwl7fb3l3zxxbk8gkvzxwdsind0xjj7kmh7dachm6fi17hpb3d"; depends=[AnnotationDbi GenomicFeatures]; };
+  TxDb_Sscrofa_UCSC_susScr3_refGene = derive2 { name="TxDb.Sscrofa.UCSC.susScr3.refGene"; version="3.3.0"; sha256="18hbrp5agka35zhqh4d809yx16brri5hi08pcpw41v3q3pk1599c"; depends=[AnnotationDbi GenomicFeatures]; };
   XtraSNPlocs_Hsapiens_dbSNP141_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP141.GRCh38"; version="0.99.12"; sha256="0a27y0ngg760y5wwcja4dpd7cjd8h5zg1s2b3a1r54s21k65zny3"; depends=[BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   XtraSNPlocs_Hsapiens_dbSNP144_GRCh37 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh37"; version="0.99.12"; sha256="0k823fvqjmdkmd47m7wyra6jxmv8lnk2i1xl4pp0mh3zgb87hgfb"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   XtraSNPlocs_Hsapiens_dbSNP144_GRCh38 = derive2 { name="XtraSNPlocs.Hsapiens.dbSNP144.GRCh38"; version="0.99.12"; sha256="0d4q32ij2x4726wvw06sgmivid0n94vfdmszdyh607xlcahqxa5z"; depends=[BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   adme16cod_db = derive2 { name="adme16cod.db"; version="3.4.0"; sha256="1vn9s1lrl6zzs00madb111fdzqjfb45mprpjqap8bvib65942rvq"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  ag_db = derive2 { name="ag.db"; version="3.2.2"; sha256="1d0n0vn0jyr83dli5dsv4hk9l8szgk0lcnxgrlh49bh3bspdkghd"; depends=[AnnotationDbi org_At_tair_db]; };
+  ag_db = derive2 { name="ag.db"; version="3.2.3"; sha256="1h0nb5z742pbh7hc8bwqkk9vh16kac8m3h3bh4v5flqfqw6rn8d0"; depends=[AnnotationDbi org_At_tair_db]; };
   agcdf = derive2 { name="agcdf"; version="2.18.0"; sha256="07hq41dwqs7yy2sck8p7zl3v9x4bgl35kkycpazz5ql2g5zy6b7j"; depends=[AnnotationDbi]; };
   agprobe = derive2 { name="agprobe"; version="2.18.0"; sha256="1vnawamcpz16na8nmlq2czfxcr325fwdnngxl65mmnbd0f4lmy3k"; depends=[AnnotationDbi]; };
-  anopheles_db0 = derive2 { name="anopheles.db0"; version="3.2.3"; sha256="1x2ac300nhd2k7wi3677jflymhyqk5bcrpfrnv1qxpbkkghsng7x"; depends=[AnnotationDbi]; };
-  arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.2.3"; sha256="0pwc6i5v414ykrvhrh53c533g28l45hj0nldmvnz84gq9ppl3n6d"; depends=[AnnotationDbi]; };
-  ath1121501_db = derive2 { name="ath1121501.db"; version="3.2.2"; sha256="0780d3y44qf89yfvx6rk8sqf6f6h1m7b8vkv302p63qwanni3rwr"; depends=[AnnotationDbi org_At_tair_db]; };
+  anopheles_db0 = derive2 { name="anopheles.db0"; version="3.3.0"; sha256="1w8bylv1v1v4v51jwddvvq12j1gxm0p53s640w4h07p00d28szjv"; depends=[AnnotationDbi]; };
+  arabidopsis_db0 = derive2 { name="arabidopsis.db0"; version="3.3.0"; sha256="0jnkdy084zl3mpyhnxgfmc15sf6kb5hn47h3380s6w7chxz7c4as"; depends=[AnnotationDbi]; };
+  ath1121501_db = derive2 { name="ath1121501.db"; version="3.2.3"; sha256="1zrf26cfhlmrb5pyfawwk4v8l1mflx8c43zsxrwkbmxzc1jnc7dv"; depends=[AnnotationDbi org_At_tair_db]; };
   ath1121501cdf = derive2 { name="ath1121501cdf"; version="2.18.0"; sha256="1naq8f8dwgbmndx178nm2pw6hjx5ljx0w1wb4dfjifnl4bs5rqcc"; depends=[AnnotationDbi]; };
   ath1121501probe = derive2 { name="ath1121501probe"; version="2.18.0"; sha256="0a2nd8zhp3ybis780l3rrmwcxskbl3a111g8w6m8qfwsw5vnlqg1"; depends=[AnnotationDbi]; };
   barley1cdf = derive2 { name="barley1cdf"; version="2.18.0"; sha256="0rbij5cqr2sz33y5waybv85nrcgf70iwj5gk13g0xn9p1l1zxyn2"; depends=[AnnotationDbi]; };
   barley1probe = derive2 { name="barley1probe"; version="2.18.0"; sha256="1kh5r748b4vkmvlfaclmrh07ypbrzgxn90liqfz1rwkabh6rfk71"; depends=[AnnotationDbi]; };
-  bovine_db = derive2 { name="bovine.db"; version="3.2.2"; sha256="00rr0jihd5ch29phxsrij3l764m3aq154rhh5riz2x781dpmmms1"; depends=[AnnotationDbi org_Bt_eg_db]; };
-  bovine_db0 = derive2 { name="bovine.db0"; version="3.2.4"; sha256="1f8swzmr8z0m0c2xcfwn7iah8ws8pv851857rgn86xjqsfn7f39r"; depends=[AnnotationDbi]; };
+  bovine_db = derive2 { name="bovine.db"; version="3.2.3"; sha256="1i8mgk60hlmvngb4c727wajix9mca9gfg0pzxrnfcjwi87rpw7fy"; depends=[AnnotationDbi org_Bt_eg_db]; };
+  bovine_db0 = derive2 { name="bovine.db0"; version="3.3.0"; sha256="18206lazpa4xn82wfz17l2n51rkw3jisqbk04msb8s39fj6zfnkq"; depends=[AnnotationDbi]; };
   bovinecdf = derive2 { name="bovinecdf"; version="2.18.0"; sha256="13mf0yy0dypkm5n2ghl04xm6ayb9bn9qijqhgynksghi7s2k34mb"; depends=[AnnotationDbi]; };
   bovineprobe = derive2 { name="bovineprobe"; version="2.18.0"; sha256="0i4afa5dksnir2nfrfh2cynjm59sm6vfaqa9wyag8cxg7c2nlm1i"; depends=[AnnotationDbi]; };
   bsubtiliscdf = derive2 { name="bsubtiliscdf"; version="2.18.0"; sha256="1rihrjim37b49rhqr4nxga8sp67qri9xqlqc141mhbngh6cw3iyl"; depends=[AnnotationDbi]; };
   bsubtilisprobe = derive2 { name="bsubtilisprobe"; version="2.18.0"; sha256="0k99hvgaswn96x4yanvr9cy8bdy69sd5q7yp6dj9synxj7s1fcw9"; depends=[AnnotationDbi]; };
   cMAP = derive2 { name="cMAP"; version="1.15.1"; sha256="0pzizm27rgcaic7wsh52z30v1jwarmz4cwh1mksbygp63k54mwiv"; depends=[]; };
-  canine_db = derive2 { name="canine.db"; version="3.2.2"; sha256="03dmgi8v75vazxjx2p1flk41264vdj73m0k65plpbjybjpa7r72k"; depends=[AnnotationDbi org_Cf_eg_db]; };
-  canine_db0 = derive2 { name="canine.db0"; version="3.2.3"; sha256="0ng7prqkb65n4hrpssiza4l9m6k42ld6adap33jl48yih7lml8dy"; depends=[AnnotationDbi]; };
-  canine2_db = derive2 { name="canine2.db"; version="3.2.2"; sha256="15diwc2gvcaa79japppx6bfn086h8rrydpllmpvayj1ym7q3wljd"; depends=[AnnotationDbi org_Cf_eg_db]; };
+  canine_db = derive2 { name="canine.db"; version="3.2.3"; sha256="0wbyzhk827l49yxzimvznx9z6yag5nd4djm2hddysf5nk1ndapqs"; depends=[AnnotationDbi org_Cf_eg_db]; };
+  canine_db0 = derive2 { name="canine.db0"; version="3.3.0"; sha256="0d6vhp39i5f7mmv6n5hq4m9yk0yj3kdpgnbfdhnzi400apf53da1"; depends=[AnnotationDbi]; };
+  canine2_db = derive2 { name="canine2.db"; version="3.2.3"; sha256="1gzd2x23dkfiwnwqz9pdn5lp4l8aby525mhscn3xakw633si4dvz"; depends=[AnnotationDbi org_Cf_eg_db]; };
   canine2cdf = derive2 { name="canine2cdf"; version="2.18.0"; sha256="077cmmnhjdk0vxjzm1kqf3q5kgx6chwkm59dr4s5dy019rqb6sqr"; depends=[AnnotationDbi]; };
   canine2probe = derive2 { name="canine2probe"; version="2.18.0"; sha256="1l849a1dqy4kpcsxs0lvb48ag81i0f0ys0w4757rw4kp8ry59z4b"; depends=[AnnotationDbi]; };
   caninecdf = derive2 { name="caninecdf"; version="2.18.0"; sha256="1f7pf3y4ccmj6681haqk8ds3dlzkv99s22m2r462dnnf38n17l3p"; depends=[AnnotationDbi]; };
   canineprobe = derive2 { name="canineprobe"; version="2.18.0"; sha256="1y70rbxlbgx58vaxp1ry5jngvzz9prcbgd2ji00074ilx4k2cxn2"; depends=[AnnotationDbi]; };
-  celegans_db = derive2 { name="celegans.db"; version="3.2.2"; sha256="17lk9gbm6hb99l0akc9sfvak89va2h4gxi5mnklpws27w7s6jzrp"; depends=[AnnotationDbi org_Ce_eg_db]; };
+  celegans_db = derive2 { name="celegans.db"; version="3.2.3"; sha256="03ar84ji94a5v8s5ykcv4c72dxsmqkiyrz31dfc5ssvn7cgc9srv"; depends=[AnnotationDbi org_Ce_eg_db]; };
   celeganscdf = derive2 { name="celeganscdf"; version="2.18.0"; sha256="0a6w0a48azg0i21j3aqb7fnxck3ff9w3gsi89bnlfh0zx6pknx7p"; depends=[AnnotationDbi]; };
   celegansprobe = derive2 { name="celegansprobe"; version="2.18.0"; sha256="05k7si3f8pzkyb8jv0r2vkavbrqxsn4nawl92gcphfsylrwcddqb"; depends=[AnnotationDbi]; };
-  chicken_db = derive2 { name="chicken.db"; version="3.2.2"; sha256="19ypq7sadvjdggzp5w1nk1jhxn9vmxpvwcnwczdyxx7f0y3ai1mp"; depends=[AnnotationDbi org_Gg_eg_db]; };
-  chicken_db0 = derive2 { name="chicken.db0"; version="3.2.4"; sha256="0jp7264f83ss94m2i4r9kzcgcpq54344vqvjb51a11xf68hkcmj8"; depends=[AnnotationDbi]; };
+  chicken_db = derive2 { name="chicken.db"; version="3.2.3"; sha256="1rq9afkpcpv8qi75shvnsw8di3ycai4ylv7jq9zwj51zlwlw9cpq"; depends=[AnnotationDbi org_Gg_eg_db]; };
+  chicken_db0 = derive2 { name="chicken.db0"; version="3.3.0"; sha256="0zqaps2cf6c8zsra9x6z98dgpyp65hc7p1bx5qjn047v24swpgs5"; depends=[AnnotationDbi]; };
   chickencdf = derive2 { name="chickencdf"; version="2.18.0"; sha256="09hhim5s9xj7n2b5rhn1svf5qly2mn0rr2v2ls25hfzyrqcbxlz1"; depends=[AnnotationDbi]; };
   chickenprobe = derive2 { name="chickenprobe"; version="2.18.0"; sha256="1fdsiwfyg7fwslrr7xs3gny7sw24bzg5k1fvlyzb1477sgj0pid3"; depends=[AnnotationDbi]; };
-  chimp_db0 = derive2 { name="chimp.db0"; version="3.2.3"; sha256="0cj1m9xddrd1dk71x25dm72smwmvpab9z5q2lp8qj9cc1xxz1amw"; depends=[AnnotationDbi]; };
+  chimp_db0 = derive2 { name="chimp.db0"; version="3.3.0"; sha256="0n655psk47zvdgv4kfjr8ffqz78pimvqbhixlscfiwss01vaspa0"; depends=[AnnotationDbi]; };
   citruscdf = derive2 { name="citruscdf"; version="2.18.0"; sha256="1326mj1xf3k4v5iyyn46whx24qfng0x3cv6rvckdr1ycc1v887dn"; depends=[AnnotationDbi]; };
   citrusprobe = derive2 { name="citrusprobe"; version="2.18.0"; sha256="0bf1wic136cxwgs4j13wsyqasnyvr0jw1hzg6qizndmy7g8hrb87"; depends=[AnnotationDbi]; };
   cottoncdf = derive2 { name="cottoncdf"; version="2.18.0"; sha256="0xfwwla941fbxddykgizpar8dh8q459src7kc5wyrsd3swp3zyp5"; depends=[AnnotationDbi]; };
   cottonprobe = derive2 { name="cottonprobe"; version="2.18.0"; sha256="04mfjd3a7ikif4pv46s6h9dj2s912w8ihg4yyiii7s3jlmvy62ah"; depends=[AnnotationDbi]; };
   cyp450cdf = derive2 { name="cyp450cdf"; version="2.18.0"; sha256="1mbqn9940sxc0ksvykdk3i4jvnkv9q91igwn1rwmv2z18hz18qf0"; depends=[AnnotationDbi]; };
-  drosgenome1_db = derive2 { name="drosgenome1.db"; version="3.2.2"; sha256="13jwvbngrp45nn0a9x134n8y9fi4ibh7bqvnpz6am9sz7xz07lf0"; depends=[AnnotationDbi org_Dm_eg_db]; };
+  drosgenome1_db = derive2 { name="drosgenome1.db"; version="3.2.3"; sha256="1m9lpgy64a1wrlril8sy9vriq7l3nzw9yzmf5kis6lij6g8mk7nk"; depends=[AnnotationDbi org_Dm_eg_db]; };
   drosgenome1cdf = derive2 { name="drosgenome1cdf"; version="2.18.0"; sha256="02x6kcnzayx3adz5kjrmfcly36j6j5xwwknd16nskh9050g8xg1y"; depends=[AnnotationDbi]; };
   drosgenome1probe = derive2 { name="drosgenome1probe"; version="2.18.0"; sha256="1vzf8197nkbdqdpafpafxlkcy61d6mwd7wcbakdhq5493dwhdi98"; depends=[AnnotationDbi]; };
-  drosophila2_db = derive2 { name="drosophila2.db"; version="3.2.2"; sha256="1ih0icflafgvifmzzm57jaakd31wr91hs8fnkwbkmhah081llbkk"; depends=[AnnotationDbi org_Dm_eg_db]; };
+  drosophila2_db = derive2 { name="drosophila2.db"; version="3.2.3"; sha256="1k19q093b76yy18ynxma27zk4d5q71sa0gj9n8gvgzvnmlzimpjg"; depends=[AnnotationDbi org_Dm_eg_db]; };
   drosophila2cdf = derive2 { name="drosophila2cdf"; version="2.18.0"; sha256="1w8k5br8nl7m5l4r05af8nc2wwnlpxxl8ncvvhqx5annlb2ynrg3"; depends=[AnnotationDbi]; };
   drosophila2probe = derive2 { name="drosophila2probe"; version="2.18.0"; sha256="1b8wnkyg0p7cffs3ka7by295jsys1sx2gpbj2j63239f0dylpl0i"; depends=[AnnotationDbi]; };
-  ecoli2_db = derive2 { name="ecoli2.db"; version="3.2.2"; sha256="0r4ywlk2gicy3s3g5v070n51j0incc38g2p9hhx82sgbgah8pjgq"; depends=[AnnotationDbi org_EcK12_eg_db]; };
+  ecoli2_db = derive2 { name="ecoli2.db"; version="3.2.3"; sha256="07vc5fl2zq2f65ndcldyzvwfpl65snp6ygvw658j4036lbb7cpjl"; depends=[AnnotationDbi org_EcK12_eg_db]; };
   ecoli2cdf = derive2 { name="ecoli2cdf"; version="2.18.0"; sha256="1rkxrwadq9kg9685z9pg6rgc4bblkx5p3c6snsl4gv2k188dva9r"; depends=[AnnotationDbi]; };
   ecoli2probe = derive2 { name="ecoli2probe"; version="2.18.0"; sha256="11q4ka0ncjapahic49xdl9919vm9frrwlqgj101krgkg262lfm8n"; depends=[AnnotationDbi]; };
-  ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.2.3"; sha256="0svmbaiaabgrl1p4bwwsaxsa7x5s4sdyrqcwxrfsfsdzzgvjkaxj"; depends=[AnnotationDbi]; };
-  ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.2.3"; sha256="050ymh9jk2c21x4v56rbdigqp6ip6lv0sg7m6kr8sn8nqdl191mx"; depends=[AnnotationDbi]; };
+  ecoliK12_db0 = derive2 { name="ecoliK12.db0"; version="3.3.0"; sha256="00cjwrlkr2y6m4x30n39iykiwb4r36s7pp0qzg4v2xgq178n3jsv"; depends=[AnnotationDbi]; };
+  ecoliSakai_db0 = derive2 { name="ecoliSakai.db0"; version="3.3.0"; sha256="1p5br2s8wfrxa20kg800nn90qz29j8459wp90bkhprya2h8f2pf4"; depends=[AnnotationDbi]; };
   ecoliasv2cdf = derive2 { name="ecoliasv2cdf"; version="2.18.0"; sha256="16i6has9qgmzakcy24racc1h9j331wndv5c87qp5r1zrai61zyav"; depends=[AnnotationDbi]; };
   ecoliasv2probe = derive2 { name="ecoliasv2probe"; version="2.18.0"; sha256="1hfrnal170cdigc2fmnynb75jjsiq77p4x6ws9gah558hvx87nk3"; depends=[AnnotationDbi]; };
   ecolicdf = derive2 { name="ecolicdf"; version="2.18.0"; sha256="18g5prjykn356k35m131ifn128k5mhij2x26balqav0azigzjqsn"; depends=[AnnotationDbi]; };
   ecoliprobe = derive2 { name="ecoliprobe"; version="2.18.0"; sha256="17g5zxfzsak7a0w51irc0w1w2i5ngdkx9db6rhv1fyp8mfjgaphd"; depends=[AnnotationDbi]; };
-  fly_db0 = derive2 { name="fly.db0"; version="3.2.3"; sha256="1dgc6qlnr0cmc7xip945696nn5r6gx53fzgjjr80c0r2ql04a4fp"; depends=[AnnotationDbi]; };
+  fly_db0 = derive2 { name="fly.db0"; version="3.3.0"; sha256="00nk8rwnrl8j2k3pafppzaiipfmclhgdlbk54zj41jakrqd5cmk2"; depends=[AnnotationDbi]; };
   gahgu133a_db = derive2 { name="gahgu133a.db"; version="2.2.0"; sha256="1ikyvj1gi39qbakpn5wl0823ljavng1k33zvpf2k24jdhdw927qb"; depends=[AnnotationDbi]; };
   gahgu133acdf = derive2 { name="gahgu133acdf"; version="2.2.1"; sha256="0hvd4iwj2fjiqp1jzbz68i1w6jn77nrsih316jlj85bhb35f7cyv"; depends=[]; };
   gahgu133aprobe = derive2 { name="gahgu133aprobe"; version="2.2.1"; sha256="108lki2bg55ysh485shxxsz1imm26g5a3grgcmxbfs4pgna3g4h0"; depends=[AnnotationDbi]; };
@@ -347,18 +367,19 @@ in with self; {
   genomewidesnp5Crlmm = derive2 { name="genomewidesnp5Crlmm"; version="1.0.6"; sha256="06dmwnjy3gb53y6nr02dmp22qzfl5d63wppazrabcqbzwimhnvp8"; depends=[]; };
   genomewidesnp6Crlmm = derive2 { name="genomewidesnp6Crlmm"; version="1.0.7"; sha256="16qcxa32fmbdcv5dck0grsnqyfcqql7wpxa1l6andv9hrvabv2jx"; depends=[]; };
   gp53cdf = derive2 { name="gp53cdf"; version="2.18.0"; sha256="11p69rxia8bqajix3jg34vnhczyxgpq50k5kdh878h7bn0mpg6bj"; depends=[AnnotationDbi]; };
-  grasp2db = derive2 { name="grasp2db"; version="0.1.9"; sha256="1667hhk547fs8v7xsz2d0l19r2fksk1ymnpvag1jwspb2m10lq22"; depends=[AnnotationHub digest dplyr GenomeInfoDb RSQLite]; };
+  grasp2db = derive2 { name="grasp2db"; version="0.1.14"; sha256="14y25k1fwh0272ws83rcpi25wc97r4z5mpmck8q9i9nshd5dmym4"; depends=[AnnotationHub digest dplyr GenomeInfoDb RSQLite]; };
+  greengenes13_5MgDb = derive2 { name="greengenes13.5MgDb"; version="0.99.0"; sha256="1ssh015yspl470wq5rnkxkb7xid27gzvga3hx9a9vj08iqal3rbq"; depends=[metagenomeFeatures]; };
   h10kcod_db = derive2 { name="h10kcod.db"; version="3.4.0"; sha256="0f30n339ib8q478a7axjdh8hzrqws762m680ha0sxm3a0nxwapgg"; depends=[AnnotationDbi org_Hs_eg_db]; };
   h20kcod_db = derive2 { name="h20kcod.db"; version="3.4.0"; sha256="0csh59bgpn5xyaw6bfg7nvi9vcvjd4f66f0dr3xh7c6316835mnx"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hapmap370k = derive2 { name="hapmap370k"; version="1.0.1"; sha256="0n6rmrqcbl665a1l6jxk1gn6518x4gxadzy5dc9k9v01cbh3qzmw"; depends=[]; };
-  hcg110_db = derive2 { name="hcg110.db"; version="3.2.2"; sha256="06hbf6r86s5xvbn4l9hpikr504nb0wg680vvqflr3c9xpnaczfap"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hcg110_db = derive2 { name="hcg110.db"; version="3.2.3"; sha256="1rdm6fcfslcyx7hhl658pvgcyn8sl5d08mnp0hcdzx7j6p18ryin"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hcg110cdf = derive2 { name="hcg110cdf"; version="2.18.0"; sha256="1208b5sn9cdsvz4wa29ha5vp9mpvafkq0adj7nlzs4yav2z26van"; depends=[AnnotationDbi]; };
   hcg110probe = derive2 { name="hcg110probe"; version="2.18.0"; sha256="0avr5dmm86b81fli5zb2vp6ax8imqxvc5bzsksq574a8rn6xf1dq"; depends=[AnnotationDbi]; };
-  hgfocus_db = derive2 { name="hgfocus.db"; version="3.2.2"; sha256="0f9mr56mxs3abryhy19rz1kis4p1v9c595wvbmmk6d61gada2z7h"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgfocus_db = derive2 { name="hgfocus.db"; version="3.2.3"; sha256="03l9r1517varyl561s3x27fs3sasfkp2g5vwys8axqy7ixcllwcg"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgfocuscdf = derive2 { name="hgfocuscdf"; version="2.18.0"; sha256="0vxgz3wwjf4qqzpsa8d03s7p2az9xbzlkxkdj0czcj67nmq467ya"; depends=[AnnotationDbi]; };
   hgfocusprobe = derive2 { name="hgfocusprobe"; version="2.18.0"; sha256="0fizkj2g1imslxk43ibf52nj8jzsfryq7h2pzhvqw5n9vnpinrc2"; depends=[AnnotationDbi]; };
-  hgu133a_db = derive2 { name="hgu133a.db"; version="3.2.2"; sha256="18xcpbr3zd80fwx6ac99ng6wmv4r2my369gn559f936yganhnzsa"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hgu133a2_db = derive2 { name="hgu133a2.db"; version="3.2.2"; sha256="077dng6gwss73vaxakkmk8dzy78cfb7872r4v1qj5drxp68wz1li"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu133a_db = derive2 { name="hgu133a.db"; version="3.2.3"; sha256="16hl674id1c0y2gi6q5y7dfx7gacpdsxavw1ifar99h9pnigzskm"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu133a2_db = derive2 { name="hgu133a2.db"; version="3.2.3"; sha256="1swh2j95f9xkvhi0lyvk4a1gyj5d1lgrsnc2fj57fh4l9763nzk8"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu133a2cdf = derive2 { name="hgu133a2cdf"; version="2.18.0"; sha256="0lqllzvp0w3s46kjvpvjn1snz63im33m3hhvnkl3knb86k6pn3za"; depends=[AnnotationDbi]; };
   hgu133a2frmavecs = derive2 { name="hgu133a2frmavecs"; version="1.2.0"; sha256="1qy2z6z135q8xncjqn1n31xg8az9wnwrz78cis57lzav9r0fw853"; depends=[]; };
   hgu133a2probe = derive2 { name="hgu133a2probe"; version="2.18.0"; sha256="0ais6f92kmjmzywsdqvxcd5fs6y7kf0ip9wm62szhahyl9chwj9k"; depends=[AnnotationDbi]; };
@@ -367,45 +388,45 @@ in with self; {
   hgu133aprobe = derive2 { name="hgu133aprobe"; version="2.18.0"; sha256="15r9zy4g9p86344zf0w7m0vfln8js19kmr68vq670kncf6j6ypbn"; depends=[AnnotationDbi]; };
   hgu133atagcdf = derive2 { name="hgu133atagcdf"; version="2.18.0"; sha256="0rbnhzwbv6nbkssdgsibjpnqfads7x9rpgy2n7qy02mkr6kysndg"; depends=[AnnotationDbi]; };
   hgu133atagprobe = derive2 { name="hgu133atagprobe"; version="2.18.0"; sha256="1qxrdi0rjj8kcl8rl3lack5ky25n39hj5a91scd0fy32zvnazmk6"; depends=[AnnotationDbi]; };
-  hgu133b_db = derive2 { name="hgu133b.db"; version="3.2.2"; sha256="0s5h54fqfmc3k1cgcaq0skdlnd7yzzwh9gvfnv4prg3mwvmsvacy"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu133b_db = derive2 { name="hgu133b.db"; version="3.2.3"; sha256="1ia32fv32s6f0sdlvzz55ficivsrxyxwkavyrk435gfmnjy07xmv"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu133bcdf = derive2 { name="hgu133bcdf"; version="2.18.0"; sha256="0dlg45pf35cff48704laryrxgwr0p31njki6c74ibxacpxmvwzv3"; depends=[AnnotationDbi]; };
   hgu133bprobe = derive2 { name="hgu133bprobe"; version="2.18.0"; sha256="1i8v1fbjfnzv556551kbj13q9i0lvzjgvzq8xapmwph8y86bfcx3"; depends=[AnnotationDbi]; };
-  hgu133plus2_db = derive2 { name="hgu133plus2.db"; version="3.2.2"; sha256="0x21g8iwr9zj29xj5y16byg4nbnslgkh8l5hxhayckz3hirzns5f"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu133plus2_db = derive2 { name="hgu133plus2.db"; version="3.2.3"; sha256="0j855k58syb12pxhkpxf6g0yglzq8kprs3j14cfwif56d5xj8sx5"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu133plus2cdf = derive2 { name="hgu133plus2cdf"; version="2.18.0"; sha256="03n9vmclv2ri6n88lsz8yzgsrz33vfclj468jv01h3is2gq09x99"; depends=[AnnotationDbi]; };
   hgu133plus2frmavecs = derive2 { name="hgu133plus2frmavecs"; version="1.5.0"; sha256="1r3g4hqxxm3l054kx33bsl9qkd46mkd4d266pm0jgqih6mv5640c"; depends=[]; };
   hgu133plus2probe = derive2 { name="hgu133plus2probe"; version="2.18.0"; sha256="1xdg6x6iv9xi0vdlfl4c65zvqs2946yd2bhr9nqhhyqp6h8ghsdc"; depends=[AnnotationDbi]; };
-  hgu219_db = derive2 { name="hgu219.db"; version="3.2.2"; sha256="0im7537pfv25ayagbjvc5p83xkl4ppzr329q2qw4b3yknvj51fr7"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu219_db = derive2 { name="hgu219.db"; version="3.2.3"; sha256="1yv7wlz49pfjqwg5s9mzr31457imwn8cq97bg4m1ybib7787m134"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu219cdf = derive2 { name="hgu219cdf"; version="2.18.0"; sha256="14kbn7r84hp4vssxl8pfs7zlg34mdm4qf1m2dw7agrixmdblnz0d"; depends=[AnnotationDbi]; };
   hgu219probe = derive2 { name="hgu219probe"; version="2.18.0"; sha256="0sy5q95yppyg8bvwc6prznqzl01xrbl0ic22rj2s8wwsrppsm3m5"; depends=[AnnotationDbi]; };
-  hgu95a_db = derive2 { name="hgu95a.db"; version="3.2.2"; sha256="056wf0zqsnb0w3izwqwhk0fjnaxv1barp4ndlzyq9lzbp37skb2l"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu95a_db = derive2 { name="hgu95a.db"; version="3.2.3"; sha256="11zahda5frpfr5dqz5p635ki0pzd0h4k7rs7x9q5480794kfnyzc"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu95acdf = derive2 { name="hgu95acdf"; version="2.18.0"; sha256="1mxac5vd0vzn3k8357lf0j1476q3b7nx6nr54n6j84qi2nx1wknr"; depends=[AnnotationDbi]; };
   hgu95aprobe = derive2 { name="hgu95aprobe"; version="2.18.0"; sha256="0sig3g5qmigv7vgcr3rpkn2cmcn2ljp0arhilni7yqsnzqn1dbma"; depends=[AnnotationDbi]; };
   hgu95av2 = derive2 { name="hgu95av2"; version="2.2.0"; sha256="181bady90v89yx2gzwahhcl63aiypcx33pkfnjxkyq45qgb18bqi"; depends=[]; };
-  hgu95av2_db = derive2 { name="hgu95av2.db"; version="3.2.2"; sha256="0rh6lf3017cm1k805v4c7dq551vjgjxdwqawin5jc03smbpi67wi"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu95av2_db = derive2 { name="hgu95av2.db"; version="3.2.3"; sha256="12aiyg11pciwmlakn25k3rm0kskl0z8jv5brp8pshs6yfcsh4sn5"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu95av2cdf = derive2 { name="hgu95av2cdf"; version="2.18.0"; sha256="1zp1y5awnkprkmk01rmn881y50bslfi8s33i8bws39am5xma0jfl"; depends=[AnnotationDbi]; };
   hgu95av2probe = derive2 { name="hgu95av2probe"; version="2.18.0"; sha256="0hv0asd44b69h3n87j5ffi9i87w12iad74754wzxgfxihb0yn58g"; depends=[AnnotationDbi]; };
-  hgu95b_db = derive2 { name="hgu95b.db"; version="3.2.2"; sha256="1snz8khvppwlalphyid21a366vz2c8barbx7da32klblwmryiyqi"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu95b_db = derive2 { name="hgu95b.db"; version="3.2.3"; sha256="1ywjaxazqhij6g3qx1pad5w2xkjsm8gxxhhhlxvkjm8py4a3cacd"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu95bcdf = derive2 { name="hgu95bcdf"; version="2.18.0"; sha256="10inx0p0155ii4464la0amww91ynyqqh59zyl1lfhnvkl38k6ylj"; depends=[AnnotationDbi]; };
   hgu95bprobe = derive2 { name="hgu95bprobe"; version="2.18.0"; sha256="1y8i2cn0zh2jkyi9j8giv5i4dag2c7jd5zyaza72nsyj4qhgmccg"; depends=[AnnotationDbi]; };
-  hgu95c_db = derive2 { name="hgu95c.db"; version="3.2.2"; sha256="1ckfn7nww2bha9vvdghijzrzpkfc0bv5pr1ph20lkj5hvn6bra2f"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu95c_db = derive2 { name="hgu95c.db"; version="3.2.3"; sha256="15qp585208sssg21awccfgs5w13w5h108fgin43sva92v4j7jckv"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu95ccdf = derive2 { name="hgu95ccdf"; version="2.18.0"; sha256="1mai2l81mwg3irncvddlcbcx24nvfk0gcx4h1r3mfg47smx1n3rd"; depends=[AnnotationDbi]; };
   hgu95cprobe = derive2 { name="hgu95cprobe"; version="2.18.0"; sha256="0glbyjk0mfllfzwfj5hszmy4pwd5ghkb1lrzh215zzxyvnyb47fd"; depends=[AnnotationDbi]; };
-  hgu95d_db = derive2 { name="hgu95d.db"; version="3.2.2"; sha256="1vqn87vln1mk4bxbd01jq6660z1px8nkyagbkhp1vy26cqwrmg5w"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu95d_db = derive2 { name="hgu95d.db"; version="3.2.3"; sha256="0df03f5lhrrzcjfq3cv6746ay9yxdyd2zp5p6lnms6pb8mvbmix0"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu95dcdf = derive2 { name="hgu95dcdf"; version="2.18.0"; sha256="0s60ibk6qsfqibhns2kidglvxkigia31yzr49b03kcazmwm4xqc0"; depends=[AnnotationDbi]; };
   hgu95dprobe = derive2 { name="hgu95dprobe"; version="2.18.0"; sha256="0mlj28c82b21010rhj2pzpmv2wf3fis4dwsi7q7292bza2sxxi6g"; depends=[AnnotationDbi]; };
-  hgu95e_db = derive2 { name="hgu95e.db"; version="3.2.2"; sha256="1fzw86wycjlgi7vym47p1ningl2vhcyj6rwlp9l93ayg16lkq2fc"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgu95e_db = derive2 { name="hgu95e.db"; version="3.2.3"; sha256="1crxr6pa23sd3f8p5yf86p325nh4krdlwsiz7fpxml3i7a7ggsab"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgu95ecdf = derive2 { name="hgu95ecdf"; version="2.18.0"; sha256="02y97vbhxn3c31q1i2z5l6jv51z8bk8p7vp1kb2y8rkmsw171brv"; depends=[AnnotationDbi]; };
   hgu95eprobe = derive2 { name="hgu95eprobe"; version="2.18.0"; sha256="1daflz4s99xb0v91ckb96bzjqmgm334xsngz18l2bd6r8nkxhgzb"; depends=[AnnotationDbi]; };
-  hguDKFZ31_db = derive2 { name="hguDKFZ31.db"; version="3.2.2"; sha256="1biz5imp5z6nippz2g5ky1j1zd9ckz1c1yi57rffxa3gc2nm35rh"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hguatlas13k_db = derive2 { name="hguatlas13k.db"; version="3.2.2"; sha256="14a1annbrvkh05akivhbm7p8pdsv6lknrlhvj8n3m5bxlbrr6ii5"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hgubeta7_db = derive2 { name="hgubeta7.db"; version="3.2.2"; sha256="1g7wbbijj210w0g4cas6d7ig92ndsm6kfgs5jd7h55avsjjp7jcj"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hgug4100a_db = derive2 { name="hgug4100a.db"; version="3.2.2"; sha256="05wb186mrz9rrffiap2ck4k4x9r5liyd3j85zm59a4pqanvlm2a6"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hgug4101a_db = derive2 { name="hgug4101a.db"; version="3.2.2"; sha256="0l0p4c85p2fak8ip9jyas5g6axziq0jidkmz6baigg7cxrjl4m4m"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hgug4110b_db = derive2 { name="hgug4110b.db"; version="3.2.2"; sha256="10qclkkxs7hi0h5h30zqbz2yija9vrp482xahygrc55ihwgpqr3l"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hgug4111a_db = derive2 { name="hgug4111a.db"; version="3.2.2"; sha256="02sx9ph6n6z36q1a03dpld8lki9in082akiaf2g115inmcd7ss0h"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hgug4112a_db = derive2 { name="hgug4112a.db"; version="3.2.2"; sha256="07pclh2cabf5nmf631x8gs713mjz2w132ilmlr284s1m3667p94r"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hguDKFZ31_db = derive2 { name="hguDKFZ31.db"; version="3.2.3"; sha256="1pm0w9jdppd4xx9civh88b15nzyqv6rs7d8yljv6yf5sspxl8var"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hguatlas13k_db = derive2 { name="hguatlas13k.db"; version="3.2.3"; sha256="15psxwig9d836wdf410i093k0hbdxnzd9lix4d544yz160v93di0"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgubeta7_db = derive2 { name="hgubeta7.db"; version="3.2.3"; sha256="0dh1068ph7cq343df1csyc4j9jix9gcc4bfkvvc2whyq0a1kzr8h"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgug4100a_db = derive2 { name="hgug4100a.db"; version="3.2.3"; sha256="0crvsnrx58smj45115qb05hss1qkpwmydpdm6qbzh0j16ab7p59n"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgug4101a_db = derive2 { name="hgug4101a.db"; version="3.2.3"; sha256="1hnz2m9q52mw4mxykvaiilsq0d0jmkq666py8zjh94sy0gsnhsqx"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgug4110b_db = derive2 { name="hgug4110b.db"; version="3.2.3"; sha256="0qpiiy6dklf9alrmjmmv51q09p7hq4w8frn8zy12glcm65h2vfcy"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgug4111a_db = derive2 { name="hgug4111a.db"; version="3.2.3"; sha256="0bd897592q92cf8bvl0hqkcxid451lwm36s7mpsvgb5yzw3rb63n"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hgug4112a_db = derive2 { name="hgug4112a.db"; version="3.2.3"; sha256="0l80pblm047pvl5sqvasb6d45lazqhsff3w5lljiwzjhn0r7x5m3"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hgug4845a_db = derive2 { name="hgug4845a.db"; version="0.0.3"; sha256="1933n2n6yky40nxf1qlbpa6acjwfr07hbrpvvcick7m09al1wks6"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hguqiagenv3_db = derive2 { name="hguqiagenv3.db"; version="3.2.2"; sha256="0jbvggypg50wkcxyx7xxn87cnhvbyndfqkgdzrpcm8p1czw2gkvz"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hguqiagenv3_db = derive2 { name="hguqiagenv3.db"; version="3.2.3"; sha256="1ylji60m2zb8ialbl5wdrxy425sriq17z3bg8ikvc5b5gjsw6l7w"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hi16cod_db = derive2 { name="hi16cod.db"; version="3.4.0"; sha256="0ydi0jljx8igzrqaspr9yywv43h2zimm9fk7xc55nm6mnp5jl7kl"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hivprtplus2cdf = derive2 { name="hivprtplus2cdf"; version="2.18.0"; sha256="1jv4qzajikz7x4vq87wzn7hf6hx9r4c2gkjhfp93kqzwzddmigf4"; depends=[AnnotationDbi]; };
   hom_At_inp_db = derive2 { name="hom.At.inp.db"; version="3.1.2"; sha256="1ka9ssjfxml9sz9k83bs6icbkkyz581svh0pwpvpifzg79qapzwi"; depends=[AnnotationDbi]; };
@@ -420,11 +441,11 @@ in with self; {
   hspeccdf = derive2 { name="hspeccdf"; version="0.99.1"; sha256="07azl9zpg552ic7li14p6n09ba3jbqqclwffjfpd2vc249x0n4fw"; depends=[AnnotationDbi]; };
   hta20stprobeset_db = derive2 { name="hta20stprobeset.db"; version="8.3.0"; sha256="05blv54srnw7yrs8x32syzk1xdksrl8gswk837m7qjgciq8hazcn"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hta20sttranscriptcluster_db = derive2 { name="hta20sttranscriptcluster.db"; version="8.3.1"; sha256="0ana9fg3ms22m394w8qbfvfy663l0r163w0qfwh5ir59rs4bpalf"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  hthgu133a_db = derive2 { name="hthgu133a.db"; version="3.2.2"; sha256="0hkkpxh7737dv6msjkfir84sh85fgy9rz3h3mndsslsfjn7j17kk"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hthgu133a_db = derive2 { name="hthgu133a.db"; version="3.2.3"; sha256="0sgi7pbkndcpl775qn36rdlsm4j6ip2lfk0cmkh8zqryrj3yq6hh"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hthgu133acdf = derive2 { name="hthgu133acdf"; version="2.18.0"; sha256="1a5b421lx0nxy3mrrxjxifwjpnv289c5q2a89xhnkwlcfhqlzqrp"; depends=[AnnotationDbi]; };
   hthgu133afrmavecs = derive2 { name="hthgu133afrmavecs"; version="1.3.0"; sha256="0466xgi67r5rpp7cs06ib0cr6vvx8d881g5l96b8sh9948pbn4ss"; depends=[]; };
   hthgu133aprobe = derive2 { name="hthgu133aprobe"; version="2.18.0"; sha256="0fanrxa21h961zsgzjrv4mzv8psd3h9sjxrzr126ca8qfqghvkc3"; depends=[AnnotationDbi]; };
-  hthgu133b_db = derive2 { name="hthgu133b.db"; version="3.2.2"; sha256="1vzhjqf5qh5j7wpgrl8p12b1fn6cy5nk643p1bq26cz3xr4r593a"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hthgu133b_db = derive2 { name="hthgu133b.db"; version="3.2.3"; sha256="1iypcyzsiqria9svkiggjprscvriihp78rk6rwb9p2n58ij31axh"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hthgu133bcdf = derive2 { name="hthgu133bcdf"; version="2.18.0"; sha256="0v12g1xsmycxhapzl6i5m7jq683k05y9yaq1asxvwls0viph6dv0"; depends=[AnnotationDbi]; };
   hthgu133bprobe = derive2 { name="hthgu133bprobe"; version="2.18.0"; sha256="1cqv6zwdxgc27x1h6y6lqzdysx40bbiy1ywcxky4yc611l1lxbv5"; depends=[AnnotationDbi]; };
   hthgu133pluspmcdf = derive2 { name="hthgu133pluspmcdf"; version="2.18.0"; sha256="0bslylkmgrq9v1giz87kcikmxbs8yawpylxi0s1n6q4rcc2yg61y"; depends=[AnnotationDbi]; };
@@ -439,19 +460,19 @@ in with self; {
   htrat230pmprobe = derive2 { name="htrat230pmprobe"; version="2.18.0"; sha256="0xpyj6c8j4icx25yk570b4gnfqz8zrsp8wlsw8424xvkviz0wv4y"; depends=[AnnotationDbi]; };
   htratfocuscdf = derive2 { name="htratfocuscdf"; version="2.18.0"; sha256="0jqn7y17sjn2cg8lidsbyzwpjygjs553gaw72g6v2kxj7j0fhfx9"; depends=[AnnotationDbi]; };
   htratfocusprobe = derive2 { name="htratfocusprobe"; version="2.18.0"; sha256="1yxpb9pq4gbmq8s6szlbnc70ngqgi5gwqxx3far673gm5czdlfzi"; depends=[AnnotationDbi]; };
-  hu35ksuba_db = derive2 { name="hu35ksuba.db"; version="3.2.2"; sha256="0bbqjazg7441bm7s5giax43w5zl4k6yrwaxjwwxz9rmkq1vqs1j7"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hu35ksuba_db = derive2 { name="hu35ksuba.db"; version="3.2.3"; sha256="0cb7dki9j1j8q1d43b3943wnsja2y23dqfqdza3flc7wvrgiflds"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hu35ksubacdf = derive2 { name="hu35ksubacdf"; version="2.18.0"; sha256="1aw41anp99r0m0c54yibvh3nzswi5wnqv9z7dwi5396sd5sniy81"; depends=[AnnotationDbi]; };
   hu35ksubaprobe = derive2 { name="hu35ksubaprobe"; version="2.18.0"; sha256="0dnsch3wdcgffbg1ypnnmsxlrclk9wji11skcs1gih2f7wi4pk05"; depends=[AnnotationDbi]; };
-  hu35ksubb_db = derive2 { name="hu35ksubb.db"; version="3.2.2"; sha256="1gazpw4n0r4dmjvigljcci2wv656ccyvpsxczhhh43yfaskcxk55"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hu35ksubb_db = derive2 { name="hu35ksubb.db"; version="3.2.3"; sha256="1h8vry8ydlzlg1f7n3viwhlgaid1c2a9kkip9qhnvnszw1zc5xjq"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hu35ksubbcdf = derive2 { name="hu35ksubbcdf"; version="2.18.0"; sha256="0anzhbn7ad5yv3qd4vwxaag809yb9saqwx6575iwc9ha5w8hwv2m"; depends=[AnnotationDbi]; };
   hu35ksubbprobe = derive2 { name="hu35ksubbprobe"; version="2.18.0"; sha256="0wml8g7nizljjfxq6xbbld3b2lsl1p8rzdmdqg5h81ncg7xhxy7c"; depends=[AnnotationDbi]; };
-  hu35ksubc_db = derive2 { name="hu35ksubc.db"; version="3.2.2"; sha256="0xnhaqvgs0rdvn9prxkq2hi7wxb6z05446dlh2b365dsmvy87pwr"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hu35ksubc_db = derive2 { name="hu35ksubc.db"; version="3.2.3"; sha256="1hq2p8lall1yzm061f8arykgg3a2x31rn5hfkhwzxhs0jxdispah"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hu35ksubccdf = derive2 { name="hu35ksubccdf"; version="2.18.0"; sha256="0fycaw7sngcj50qh8vw594g7i0fw9nmfh1lw72bc3i8jd5y08npi"; depends=[AnnotationDbi]; };
   hu35ksubcprobe = derive2 { name="hu35ksubcprobe"; version="2.18.0"; sha256="1s22447qznyrlwpa98wric7xv2aj1qchd5wgq1zgwhg3gcj9lvmb"; depends=[AnnotationDbi]; };
-  hu35ksubd_db = derive2 { name="hu35ksubd.db"; version="3.2.2"; sha256="0af1dr9mqxkl8jkpbm9f6ifs7xrzjsrsv57sxfcm55h3p12fdw7n"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hu35ksubd_db = derive2 { name="hu35ksubd.db"; version="3.2.3"; sha256="0jp5mpvg0amxkbxla2p81a3zvdamzypgplf6dh246ak3wl9pdxai"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hu35ksubdcdf = derive2 { name="hu35ksubdcdf"; version="2.18.0"; sha256="1ws1mfgi1bndlwhr049bssj6cmd819klp1vwnqppklggs081y22v"; depends=[AnnotationDbi]; };
   hu35ksubdprobe = derive2 { name="hu35ksubdprobe"; version="2.18.0"; sha256="1vivxdpg6wn29jwfnw7brcqav1xbr62llqk13dgj10x0gvjmv26w"; depends=[AnnotationDbi]; };
-  hu6800_db = derive2 { name="hu6800.db"; version="3.2.2"; sha256="1dsjs3km0qr1y49r0m2vl04jqlcgnywvcv1kayn8i04rg568zsy4"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  hu6800_db = derive2 { name="hu6800.db"; version="3.2.3"; sha256="05v13rllfzjg2p35r21d58qxvcxg37ywpvr4ng23bvkrr0qrbx64"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hu6800cdf = derive2 { name="hu6800cdf"; version="2.18.0"; sha256="1anddmc7j8x79nrglzmyzdvpwhy8aq6b87hqh7gr40g3d6hxjg06"; depends=[AnnotationDbi]; };
   hu6800probe = derive2 { name="hu6800probe"; version="2.18.0"; sha256="1fnkwifpzv0rkb9f5b789f2r5vvz9riwiip5wmyanw2gzdyc2vr0"; depends=[AnnotationDbi]; };
   hu6800subacdf = derive2 { name="hu6800subacdf"; version="2.18.0"; sha256="0ckywgdz9n9xz162jw6phj3qwdkiwjb4ya86a3imgb71k3w181wz"; depends=[AnnotationDbi]; };
@@ -472,7 +493,7 @@ in with self; {
   hugene20sttranscriptcluster_db = derive2 { name="hugene20sttranscriptcluster.db"; version="8.4.0"; sha256="16ynwlnl5qkf3in7b08lf8k5v1q0sr0zd2hl52pl8yvpqxsm7sdz"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hugene21stprobeset_db = derive2 { name="hugene21stprobeset.db"; version="8.4.0"; sha256="07cza2h7r0ipc4c3z14gw2vca4zqx2l0s41hz5fj0g6ss2a7n2qj"; depends=[AnnotationDbi org_Hs_eg_db]; };
   hugene21sttranscriptcluster_db = derive2 { name="hugene21sttranscriptcluster.db"; version="8.4.0"; sha256="1xqwq17xvmfbhy89di2gwg8c7r52ihp50qckqiqi0qdv5w59vbfj"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  human_db0 = derive2 { name="human.db0"; version="3.2.4"; sha256="0yblrj9p4pihxdhgh649dlciwqhx7538ni4mk02wkrk66h3n6cpc"; depends=[AnnotationDbi]; };
+  human_db0 = derive2 { name="human.db0"; version="3.3.0"; sha256="18kfi5g4v2d15dkkn4nrm14cqaz47ihaj2w4c2bazq0qcyc4iy34"; depends=[AnnotationDbi]; };
   human1mduov3bCrlmm = derive2 { name="human1mduov3bCrlmm"; version="1.0.4"; sha256="1p7qpzk6svafgdafljhh4k0z7pcs78qmwwfd80r0a1yhkssmp0v9"; depends=[]; };
   human1mv1cCrlmm = derive2 { name="human1mv1cCrlmm"; version="1.0.3"; sha256="1qlph3qrjv52ddzlj8pwa93zzh70x4mbdrdr7q9pan427lpck9gx"; depends=[]; };
   human370quadv3cCrlmm = derive2 { name="human370quadv3cCrlmm"; version="1.0.3"; sha256="1chjx9vsmqz2whslw1l7jn7nfn7zx6pcjfmqqm9mh81i74rzrdik"; depends=[]; };
@@ -499,9 +520,9 @@ in with self; {
   illuminaMousev1p1_db = derive2 { name="illuminaMousev1p1.db"; version="1.26.0"; sha256="1sxqwrc3697361jp69xy9g8w5a699ifjvldqi9ks538h5yc157z1"; depends=[AnnotationDbi org_Mm_eg_db]; };
   illuminaMousev2_db = derive2 { name="illuminaMousev2.db"; version="1.26.0"; sha256="0vwi309ymhrbpa9dyk0fwqy7bfwvvp67q39xjav1s9npi3slv1h3"; depends=[AnnotationDbi org_Mm_eg_db]; };
   illuminaRatv1_db = derive2 { name="illuminaRatv1.db"; version="1.26.0"; sha256="1krpp3pb3h2nrk5jrx54a3v6473qsjnz5wksysy8p4zpisvnxyfb"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  indac_db = derive2 { name="indac.db"; version="3.2.2"; sha256="0zyfhq93csg0m58rfvgk42mdczhqgsbmazclcvnm405dka64p18c"; depends=[AnnotationDbi org_Dm_eg_db]; };
+  indac_db = derive2 { name="indac.db"; version="3.2.3"; sha256="0jjkiyhjcjgk9888a96g5w80k8a652cww5dhidbdiq5d8gakbnji"; depends=[AnnotationDbi org_Dm_eg_db]; };
   lumiHumanAll_db = derive2 { name="lumiHumanAll.db"; version="1.22.0"; sha256="0kn2m31b4q8r1lm4iwda9i62la4akj0c35pi3khbfvkmdrvbvhd2"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  lumiHumanIDMapping = derive2 { name="lumiHumanIDMapping"; version="1.10.0"; sha256="0xm58dggm2m3mb13v8avvji3prgbdxp7jd3lw7xj6hrnw2mghgg6"; depends=[AnnotationDbi lumi]; };
+  lumiHumanIDMapping = derive2 { name="lumiHumanIDMapping"; version="1.10.1"; sha256="0j29cd01z840jg4zq0yczjsqnya1vpx6hajqdq96msiy4i5fj534"; depends=[AnnotationDbi DBI lumi]; };
   lumiMouseAll_db = derive2 { name="lumiMouseAll.db"; version="1.22.0"; sha256="00iawk8wb1hnvmy898nl9hc85rfzzwi34lpnv2d37rw4wdn57z33"; depends=[AnnotationDbi org_Mm_eg_db]; };
   lumiMouseIDMapping = derive2 { name="lumiMouseIDMapping"; version="1.10.0"; sha256="18mc7vwp2p53ns2paa4glj570shmbq9lk318g3p9nl09mxyadim9"; depends=[AnnotationDbi lumi]; };
   lumiRatAll_db = derive2 { name="lumiRatAll.db"; version="1.22.0"; sha256="1yh0q8aw33xsn4phj04v0mhjn8xh3z06jrg7yfi9qz1c985z1gw6"; depends=[AnnotationDbi org_Rn_eg_db]; };
@@ -510,33 +531,34 @@ in with self; {
   m20kcod_db = derive2 { name="m20kcod.db"; version="3.4.0"; sha256="1p2sm5j4b50iqzwcb984qrh74c3hf6yml7b8mvxlhhhvxz4iy1np"; depends=[AnnotationDbi org_Mm_eg_db]; };
   maizecdf = derive2 { name="maizecdf"; version="2.18.0"; sha256="0yfz5gjhsq4wz6j63s1b1hxjz03gsmrlfs2cdc8smq6azp3zdid4"; depends=[AnnotationDbi]; };
   maizeprobe = derive2 { name="maizeprobe"; version="2.18.0"; sha256="01h5dv5i0zaqlphkii9ipxy9wswv1srgprrpr5vmi01c9d98qsk0"; depends=[AnnotationDbi]; };
-  malaria_db0 = derive2 { name="malaria.db0"; version="3.2.3"; sha256="0rgpifbwfk33h24i4a79968ppfnhfjqn4yfjrdnrzblmyysx9662"; depends=[AnnotationDbi]; };
+  malaria_db0 = derive2 { name="malaria.db0"; version="3.3.0"; sha256="17s27vzxlpzrz8hy9z91fl2azbg82519fy5j2mzrk3h6429v7289"; depends=[AnnotationDbi]; };
   medicagocdf = derive2 { name="medicagocdf"; version="2.18.0"; sha256="1clz679cc887x98c6jk93cphijkbg5r2nd9idrj5901yvh6p9n5q"; depends=[AnnotationDbi]; };
   medicagoprobe = derive2 { name="medicagoprobe"; version="2.18.0"; sha256="0w6j1pfkvb3npc8srpjifq2ywnqxhc9q090jqzmkx22x36cw9cl5"; depends=[AnnotationDbi]; };
-  mgu74a_db = derive2 { name="mgu74a.db"; version="3.2.2"; sha256="0p19wmdsxqvg5drgdkldnym2p44hyyqpzg8qrzc9d40r4dgdqhi5"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgu74a_db = derive2 { name="mgu74a.db"; version="3.2.3"; sha256="0xd2gbvry061409kiwq99i13641g8x6m9kbgg4yr0x6m9dh7hxa8"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mgu74acdf = derive2 { name="mgu74acdf"; version="2.18.0"; sha256="187k8y1dnnyw926h090gmkk1081sa91fn113lysll3460dqn3ylg"; depends=[AnnotationDbi]; };
   mgu74aprobe = derive2 { name="mgu74aprobe"; version="2.18.0"; sha256="0813s2w5s9ahaqn91mkwzfckclv5jdphq17j2qwyzd4xqyxrmsbi"; depends=[AnnotationDbi]; };
-  mgu74av2_db = derive2 { name="mgu74av2.db"; version="3.2.2"; sha256="12zn0wpbzx8bylfpwkfdmjrq8k80phgkv4408ria85vfv7bfakk2"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgu74av2_db = derive2 { name="mgu74av2.db"; version="3.2.3"; sha256="0680qygyrpr15yhs7r3670xl3a8v4jy1qxfqfyxnpp7h8z3kj6jd"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mgu74av2cdf = derive2 { name="mgu74av2cdf"; version="2.18.0"; sha256="1cw5q8vkmd80g0dxv38qdki39h255bssf27yf0lf0jig9ra5w34n"; depends=[AnnotationDbi]; };
   mgu74av2probe = derive2 { name="mgu74av2probe"; version="2.18.0"; sha256="02wf1xymaxd3hfyrbwxfw12klzf5c28md0h45rf41vzia0mkvr2z"; depends=[AnnotationDbi]; };
-  mgu74b_db = derive2 { name="mgu74b.db"; version="3.2.2"; sha256="0r64azjrahdigmgi08qnrcr2m01byp0ggdpbc95a88wvs82zkznb"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgu74b_db = derive2 { name="mgu74b.db"; version="3.2.3"; sha256="0z98k0f9ycha48jb56lda25rnjlayz7z6jr8icqabhp5sbh95kgh"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mgu74bcdf = derive2 { name="mgu74bcdf"; version="2.18.0"; sha256="0sivgn6srmak7k6p8sj382lsanc34xj5b6182ggnp872y8v6zx5b"; depends=[AnnotationDbi]; };
   mgu74bprobe = derive2 { name="mgu74bprobe"; version="2.18.0"; sha256="0igrdbp2hmn550rcfvrscmvykbpm9sbnfa29walv1v57jy6wl7fl"; depends=[AnnotationDbi]; };
-  mgu74bv2_db = derive2 { name="mgu74bv2.db"; version="3.2.2"; sha256="05k89p1wja6y7wjkivq6iwczmq60nm7jk51khksv8204a0vqzlgp"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgu74bv2_db = derive2 { name="mgu74bv2.db"; version="3.2.3"; sha256="0pzn86xmfv8yigk5fi1lf4zpg8a1bsqnm4x6jv6pasivs5lmpyya"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mgu74bv2cdf = derive2 { name="mgu74bv2cdf"; version="2.18.0"; sha256="05w0dh194lncda9qdkmg52znjrnlnjc15fzplw147nyablq5m109"; depends=[AnnotationDbi]; };
   mgu74bv2probe = derive2 { name="mgu74bv2probe"; version="2.18.0"; sha256="1kn4549s0kj0jpg7yx4lkc8gvxdfm7p21b6yy52ymhfgbv431sl6"; depends=[AnnotationDbi]; };
-  mgu74c_db = derive2 { name="mgu74c.db"; version="3.2.2"; sha256="1hsrvppcapjsdny1n9c2bx72zbn65c09dhfxaclglxdfiq9mlfj6"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgu74c_db = derive2 { name="mgu74c.db"; version="3.2.3"; sha256="10ba6lz5f2c3mqajrak0yl2c76lswx267jgmdhq3d3322cfd6n2y"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mgu74ccdf = derive2 { name="mgu74ccdf"; version="2.18.0"; sha256="01dbsxmv7r1r2n348gcdpkxqmciqyrf3s0handp3hl33s6pd8xbj"; depends=[AnnotationDbi]; };
   mgu74cprobe = derive2 { name="mgu74cprobe"; version="2.18.0"; sha256="0ib5iyyp6mms5cszarczs82y2779d3cssz7hih1wm0vddbby40km"; depends=[AnnotationDbi]; };
-  mgu74cv2_db = derive2 { name="mgu74cv2.db"; version="3.2.2"; sha256="0yxpcicqm1gj8mkbifmk773l7dp4256m3ms7qn6h13i13qximkqw"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgu74cv2_db = derive2 { name="mgu74cv2.db"; version="3.2.3"; sha256="131vj9z1hdhk86mgbay9rldw5czfpr7ag3fh58anrhdijkcyshcq"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mgu74cv2cdf = derive2 { name="mgu74cv2cdf"; version="2.18.0"; sha256="18k1kahfwix3cs6kh2aml2mi39l3vjr526ajksljjk46n0bsf1r2"; depends=[AnnotationDbi]; };
   mgu74cv2probe = derive2 { name="mgu74cv2probe"; version="2.18.0"; sha256="0rx2cigsi4bnm48vl0bbfh6k3k3cs8nv0x7k7j9vq5z9dniyzqf6"; depends=[AnnotationDbi]; };
-  mguatlas5k_db = derive2 { name="mguatlas5k.db"; version="3.2.2"; sha256="1pdz7c6z9c6zwwrkl2jbf8cpf5yi0gs68fa0rmf7hs51p89qp7dw"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mgug4104a_db = derive2 { name="mgug4104a.db"; version="3.2.2"; sha256="0idqd6w17qjc2krlbv58x63cpdan7w9vviaciy1kmmxg03dqcz2z"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mgug4120a_db = derive2 { name="mgug4120a.db"; version="3.2.2"; sha256="01nc39c3kv8rhw4fdwa5b9sa2fhp6hm155kf3sjr1ylas1y5ycf4"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mgug4121a_db = derive2 { name="mgug4121a.db"; version="3.2.2"; sha256="1avgvryyyqbghjwk3kiy86dbpn5p6kcdx8h1b3dxzscbyd4s6z1s"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mgug4122a_db = derive2 { name="mgug4122a.db"; version="3.2.2"; sha256="0cg0jg9kmly3kma79aljqxmldjqk35vcjx8yd2hkkip895xlkkcl"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mguatlas5k_db = derive2 { name="mguatlas5k.db"; version="3.2.3"; sha256="08lw02r9wpc06pq82934dlfsrjjsaqchrsyghc8pgk6iqq1c3f9r"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgug4104a_db = derive2 { name="mgug4104a.db"; version="3.2.3"; sha256="1aqs943lff3q1g2dfl9cyxfpm8swkjcb4spi5drgw39g9m8p3dp8"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgug4120a_db = derive2 { name="mgug4120a.db"; version="3.2.3"; sha256="1qnzpww4wy926j4i10rfddng8ygav86ig9c301qwvw0ly235f0vx"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgug4121a_db = derive2 { name="mgug4121a.db"; version="3.2.3"; sha256="0947crjk8nj4bzgwz7anran7y2qhd1v8bp9f59ja3628rgjx6cz5"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mgug4122a_db = derive2 { name="mgug4122a.db"; version="3.2.3"; sha256="0x4mrjqd9wnppkp757f3azllbjiilxfds3cpbcrfsi07l8lf4mxx"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mi16cod_db = derive2 { name="mi16cod.db"; version="3.4.0"; sha256="1v64plvn173hdvjyy491qh2wd4mgbpwr27iq7lab9b3w1g3b1a82"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  miRBaseVersions_db = derive2 { name="miRBaseVersions.db"; version="0.99.5"; sha256="0cxkxy42ybnls6396m4svm4iiw0x29fgg98dfwpgwfv5np85m0vh"; depends=[AnnotationDbi DBI gtools RSQLite]; };
   miRNAtap_db = derive2 { name="miRNAtap.db"; version="0.99.7"; sha256="0h7s83cqr8xwypizdhkgx4nl4pxbr3lhnjwgnwcdibrpq3mbq5cj"; depends=[AnnotationDbi DBI miRNAtap RSQLite]; };
   mirbase_db = derive2 { name="mirbase.db"; version="1.2.0"; sha256="0l7ah1ia7q1h16av2v1qa9nqpr0604z5dlrq37kd0aiz8dcxyddk"; depends=[AnnotationDbi]; };
   mirna102xgaincdf = derive2 { name="mirna102xgaincdf"; version="2.18.0"; sha256="03q71dq6b0plivj5bgpgx0pnqdwfgplakyk5ggj4w7kqwmr5k17i"; depends=[AnnotationDbi]; };
@@ -544,10 +566,10 @@ in with self; {
   mirna10probe = derive2 { name="mirna10probe"; version="2.18.0"; sha256="0f6jfzmj9h4g60lnkdi65grl3ncn19qnrwcxsdhqgiw3ll19cbj7"; depends=[AnnotationDbi]; };
   mirna20cdf = derive2 { name="mirna20cdf"; version="2.18.0"; sha256="05yvi7jibj8fiak7z03gjv07xagpda3gy19namyy4iiq3w7ya2fj"; depends=[AnnotationDbi]; };
   mm24kresogen_db = derive2 { name="mm24kresogen.db"; version="2.5.0"; sha256="0kf9cilhfpfl9cws1b08ic11fnqscdvbja4m16sm4xjyfd2kskfp"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  moe430a_db = derive2 { name="moe430a.db"; version="3.2.2"; sha256="14yfpv2ilpw1g4yq1y4bl35x61ldz3lb7m2g95a56fs4cn3149pn"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  moe430a_db = derive2 { name="moe430a.db"; version="3.2.3"; sha256="1j9ss80ndy4z3r7cszdkxsadhwj3avxrfp198kg156gsylcskpjn"; depends=[AnnotationDbi org_Mm_eg_db]; };
   moe430acdf = derive2 { name="moe430acdf"; version="2.18.0"; sha256="0n4dc2racw68nmfz6arl7f0yh9f3mlkvilsl694zrxw2ysbq1d70"; depends=[AnnotationDbi]; };
   moe430aprobe = derive2 { name="moe430aprobe"; version="2.18.0"; sha256="1paiwgjzlq4c04wy8fpnnxj7n5asiw6z2mz0rjrifja9lgyilq50"; depends=[AnnotationDbi]; };
-  moe430b_db = derive2 { name="moe430b.db"; version="3.2.2"; sha256="03wdfg0n66p8q0g1y75zs8aw3gyi756c1ghcw1d4i49qa8h986bq"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  moe430b_db = derive2 { name="moe430b.db"; version="3.2.3"; sha256="0hb6pa07j5hdirpprcm9vdszbh5bkgf38gyp3g0gqvlc32nklv58"; depends=[AnnotationDbi org_Mm_eg_db]; };
   moe430bcdf = derive2 { name="moe430bcdf"; version="2.18.0"; sha256="0yl5pkqj37188k2yvvsqhnhm2vx523r11sry976bwzcadlicfhvb"; depends=[AnnotationDbi]; };
   moe430bprobe = derive2 { name="moe430bprobe"; version="2.18.0"; sha256="1nziw3pj4picz0aazblpqkbw82wq3vdajh9i78yfvlz1bwb2vpfi"; depends=[AnnotationDbi]; };
   moex10stprobeset_db = derive2 { name="moex10stprobeset.db"; version="8.4.0"; sha256="0f7xxq0n5c5cp9axaxjmi9dhqfznjiifj98yxz1cgzkihgw7fwry"; depends=[AnnotationDbi org_Mm_eg_db]; };
@@ -563,30 +585,30 @@ in with self; {
   mogene20sttranscriptcluster_db = derive2 { name="mogene20sttranscriptcluster.db"; version="8.4.0"; sha256="0sbms5rld5x53cjk5yaxl9j37kni37j9drar4a1b94s6cxsh0ydf"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mogene21stprobeset_db = derive2 { name="mogene21stprobeset.db"; version="8.4.0"; sha256="1nbvq5v114ziqjiijxjji703c30h8fv7f1qvzj1bgr5cssv60bbl"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mogene21sttranscriptcluster_db = derive2 { name="mogene21sttranscriptcluster.db"; version="8.4.0"; sha256="111b5pvq4l25wghys2ba9f1g8n5d4y8dqvzi7iivdx17jy61jqm7"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mouse_db0 = derive2 { name="mouse.db0"; version="3.2.4"; sha256="0d0fnn7x9y479sglnjdc0kd5ldv8bgq3d9dd2qy7cw67z1dn7wsv"; depends=[AnnotationDbi]; };
-  mouse4302_db = derive2 { name="mouse4302.db"; version="3.2.2"; sha256="0xyzawc9ngwp1z9yzqybq4ywwyngk0c0blkkf5s40jypd77w79pq"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mouse_db0 = derive2 { name="mouse.db0"; version="3.3.0"; sha256="13vm1zi33glpkc0sl166gni542825f1pnbj2qqh5yqlp6i00whxf"; depends=[AnnotationDbi]; };
+  mouse4302_db = derive2 { name="mouse4302.db"; version="3.2.3"; sha256="1wdgqawqzkr39xwl32cap4ksr59p7r7i83g82h1ss4q3lm58gxpm"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mouse4302cdf = derive2 { name="mouse4302cdf"; version="2.18.0"; sha256="1mpyma4x8zfs2fmmx57xw4cfs2cf9lhw71nc3icl72d7vmwidswc"; depends=[AnnotationDbi]; };
   mouse4302frmavecs = derive2 { name="mouse4302frmavecs"; version="1.5.0"; sha256="04clwkfz1gqqwrnqbavkka3hv480w6vi6c4q947qqnhw8j5jjp7s"; depends=[]; };
   mouse4302probe = derive2 { name="mouse4302probe"; version="2.18.0"; sha256="11mn9j98m3xfk5sn9cb2r92zckm6acplc66c5xn44nazf29pf9n1"; depends=[AnnotationDbi]; };
-  mouse430a2_db = derive2 { name="mouse430a2.db"; version="3.2.2"; sha256="05mi6gxf4pzvl4rcdfxndykzx3563wq4kadhwc5k4zw9g34fllvm"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mouse430a2_db = derive2 { name="mouse430a2.db"; version="3.2.3"; sha256="15ikbwb4sv1nlc1is6zx959wamha0v7k21gdkmfjarjq3g0ydng8"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mouse430a2cdf = derive2 { name="mouse430a2cdf"; version="2.18.0"; sha256="0530znylp4xqld8kak84d6lnc8r62p413d4kkn4j99kmmvx3l9rn"; depends=[AnnotationDbi]; };
   mouse430a2frmavecs = derive2 { name="mouse430a2frmavecs"; version="1.3.0"; sha256="0bb9fqz4kkw78dw9mbkn1pp6wp7lmyqpcg8gdjg9j9aichbqbnh8"; depends=[]; };
   mouse430a2probe = derive2 { name="mouse430a2probe"; version="2.18.0"; sha256="1f7a6mvcpv57h7kfj1qzkcwh7mdl2w9z6ysmrgan9037rd0652sz"; depends=[AnnotationDbi]; };
   mouseCHRLOC = derive2 { name="mouseCHRLOC"; version="2.1.6"; sha256="0xylgnz43xmjnqdwv7pn034wfs61va21lvcpn9igdik2s42ykpp2"; depends=[]; };
-  mpedbarray_db = derive2 { name="mpedbarray.db"; version="3.2.2"; sha256="085cg6ap0j7inx5f1vzprlddhpv173sx8886b81fjlx2gq2f440q"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mpedbarray_db = derive2 { name="mpedbarray.db"; version="3.2.3"; sha256="04pwchivzb19awnnqr9an0nl49rgdva58ip1fkgbavp3vlirxv4i"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mta10stprobeset_db = derive2 { name="mta10stprobeset.db"; version="8.4.0"; sha256="1chc4ld5g8dmy33vrvprx08yp2vasmr4x6m8bswhfyigzf6n3d6w"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mta10sttranscriptcluster_db = derive2 { name="mta10sttranscriptcluster.db"; version="8.4.0"; sha256="0f890nbnc27hnfazdyyypb3k6sla1ipijb8fvfqfld40nm1is978"; depends=[AnnotationDbi org_Mm_eg_db]; };
-  mu11ksuba_db = derive2 { name="mu11ksuba.db"; version="3.2.2"; sha256="129zyknqp60whd6g5z85vknjx1h9rv1mdiwbr63rmb2blwcqnl64"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mu11ksuba_db = derive2 { name="mu11ksuba.db"; version="3.2.3"; sha256="188ld7awcgrbqxkwqyr98739x4ihmcawv3lv2ybrc0khqifylzj3"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mu11ksubacdf = derive2 { name="mu11ksubacdf"; version="2.18.0"; sha256="09xm3ah3zlssclblx663rlwrnmx3niabd5nf7zf7krhbpgcwhyim"; depends=[AnnotationDbi]; };
   mu11ksubaprobe = derive2 { name="mu11ksubaprobe"; version="2.18.0"; sha256="1p3kc06h83ivh06a8qqcbpgbsbdfp9nnwvqfxr6d1gdn15qcp96k"; depends=[AnnotationDbi]; };
-  mu11ksubb_db = derive2 { name="mu11ksubb.db"; version="3.2.2"; sha256="0dvajwxbna4q7jd7frrfwnj34mx3gz26b1fkv7a55adsgicfjsad"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mu11ksubb_db = derive2 { name="mu11ksubb.db"; version="3.2.3"; sha256="1ld2nbxxaz0vnq2gj1sv0qbgcrjg9959885y3l2wciszrs5nx3r2"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mu11ksubbcdf = derive2 { name="mu11ksubbcdf"; version="2.18.0"; sha256="1dajsq041pg3g9c5j3sd0w6gypqpdva91rb4a7ni990nk45mg23k"; depends=[AnnotationDbi]; };
   mu11ksubbprobe = derive2 { name="mu11ksubbprobe"; version="2.18.0"; sha256="139kbrlxlw0r4z2iyy4qqcc70sb6nmsn0h7v33k5j6r52qz4hjxh"; depends=[AnnotationDbi]; };
-  mu19ksuba_db = derive2 { name="mu19ksuba.db"; version="3.2.2"; sha256="1j2j5hdbhzmys464i35xxws0kkl5fz6ppl8c8win03a8wbkxvadx"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mu19ksuba_db = derive2 { name="mu19ksuba.db"; version="3.2.3"; sha256="1vivbv7ng58n1r2g5w5xrwml9jvfhb4v6qp9n4hi9y77526hm6sq"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mu19ksubacdf = derive2 { name="mu19ksubacdf"; version="2.18.0"; sha256="0c1nhvnnn8v07m6rci2cml6i86rs77b1xnw7jmyndfl458vjlp09"; depends=[AnnotationDbi]; };
-  mu19ksubb_db = derive2 { name="mu19ksubb.db"; version="3.2.2"; sha256="1l4ayfl6y3d3nsdnp05kzm3f0fqaa92ayvnnp0wd1idnp5r02dq5"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mu19ksubb_db = derive2 { name="mu19ksubb.db"; version="3.2.3"; sha256="1p5x8gl17nhynwm96ah20rpbj21n8l856bivy5slyn795vzy15sw"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mu19ksubbcdf = derive2 { name="mu19ksubbcdf"; version="2.18.0"; sha256="1waizab2dn74y8b1w27l1yg29gi00v16fij1jm2yhik5cnjhhhk4"; depends=[AnnotationDbi]; };
-  mu19ksubc_db = derive2 { name="mu19ksubc.db"; version="3.2.2"; sha256="1fsmkx29vki1g9jcd1hvjil90dhsl5yrxslil4z7xwlvcbzxsjp9"; depends=[AnnotationDbi org_Mm_eg_db]; };
+  mu19ksubc_db = derive2 { name="mu19ksubc.db"; version="3.2.3"; sha256="087ib49c61q2yrpqdhkgzcjmrv88wdwzzws67anx8bia97ck9zhz"; depends=[AnnotationDbi org_Mm_eg_db]; };
   mu19ksubccdf = derive2 { name="mu19ksubccdf"; version="2.18.0"; sha256="063v3fn06p1znwrdxn26lz7qz9sfzk10hgabimxw3rz5x0580d4l"; depends=[AnnotationDbi]; };
   mu6500subacdf = derive2 { name="mu6500subacdf"; version="2.18.0"; sha256="15y7x1jgzzc366dapa5gy44m98zpn8mfghjxh12k3k9ryd59lxn9"; depends=[AnnotationDbi]; };
   mu6500subbcdf = derive2 { name="mu6500subbcdf"; version="2.18.0"; sha256="0a0w5yldgjvj8pyw7ygn685pj95qdfm34c0sqvgqf7w7g5wm4jvk"; depends=[AnnotationDbi]; };
@@ -600,28 +622,28 @@ in with self; {
   nugomm1a520177cdf = derive2 { name="nugomm1a520177cdf"; version="3.4.0"; sha256="0skd5b76si0vydzk5qhg4f1a1j655alxflm9sqci8fi8safwj96a"; depends=[AnnotationDbi]; };
   nugomm1a520177probe = derive2 { name="nugomm1a520177probe"; version="3.4.0"; sha256="1n70k0mhv146983myjgk1cgkr9rmmcpqdv8wpkcr320qcvgf9bn7"; depends=[AnnotationDbi]; };
   oligoData = derive2 { name="oligoData"; version="1.8.0"; sha256="1d1yfms3jv2c4s255xnh8yxwijrj35skw3nxds7l46y88lg3qn8y"; depends=[oligo]; };
-  org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.2.3"; sha256="1zsh3bhnfczihl1bdn7f67bnyf0nm5fbxqxnk34wr4a6c09sb7v3"; depends=[AnnotationDbi]; };
-  org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.2.3"; sha256="15im5iv1ba5aqya4r6xjji1yvavklia5m6vam15vi5wniqmmjdr3"; depends=[AnnotationDbi]; };
-  org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.2.3"; sha256="0q0lhhx3ffzn32k34bwn4sq7ssjrbszjz5d0nyvw3jqn50fiqs6n"; depends=[AnnotationDbi]; };
-  org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.2.3"; sha256="1d0lx00ybq34yqs6mziaa0lrh77xm0ggsmi76g6k95f77gi7m1sw"; depends=[AnnotationDbi]; };
-  org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.2.3"; sha256="0a4aiwj1vxjciqqdyc7zmkzk2yxfrp6450hpv8qigb8k3y2l26in"; depends=[AnnotationDbi]; };
-  org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.2.3"; sha256="0mib46c7nr00l7mh290n383za9hyl91a1dc6jhjbk884jmxaxyz6"; depends=[AnnotationDbi]; };
-  org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.2.3"; sha256="18l8nh6lhprv5l1z3f5nrn6ilbpairmhq5vzql5jp1hs3b3vdnz5"; depends=[AnnotationDbi]; };
-  org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.2.3"; sha256="1h11402sg4whsp6xv6ys7yfllhddd1k9cq3q6kgs0c9qr69yx67p"; depends=[AnnotationDbi]; };
-  org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.2.3"; sha256="0bdg5k7j8lmr2pqkiz83w5ckk4vddk9kqjlfq0w5igfs6ilr5d4a"; depends=[AnnotationDbi]; };
-  org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.2.3"; sha256="1bfhksa7vrdfxqq2yl7a2hsg37qzj8vmaaf1g7vxjk89r3ib6fmq"; depends=[AnnotationDbi]; };
-  org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.2.3"; sha256="0xicgkbh6xkvs74s1piafqac63dyz2ycdyil4pj4ghhxx2sabm6p"; depends=[AnnotationDbi]; };
+  org_Ag_eg_db = derive2 { name="org.Ag.eg.db"; version="3.3.0"; sha256="0fsjivcmwdfhvq45dikfgpni7725snncrv33pbird09hwy6n10vc"; depends=[AnnotationDbi]; };
+  org_At_tair_db = derive2 { name="org.At.tair.db"; version="3.3.0"; sha256="1fhv5kvwwjfgnrrynala7bnjv0sxzr9isp32vhgx0gazl5krzyh7"; depends=[AnnotationDbi]; };
+  org_Bt_eg_db = derive2 { name="org.Bt.eg.db"; version="3.3.0"; sha256="0sl6kxkdisss5y0c50n9f3ccbbk4kdwj1afkkqr3aay75fzm78hs"; depends=[AnnotationDbi]; };
+  org_Ce_eg_db = derive2 { name="org.Ce.eg.db"; version="3.3.0"; sha256="17mvb2ci2jgac3zi420cbf70n4zswqinzxlk1v2fjnp8vvydl2fw"; depends=[AnnotationDbi]; };
+  org_Cf_eg_db = derive2 { name="org.Cf.eg.db"; version="3.3.0"; sha256="1d5ip9d0236kp6i7z2wy6xgfb1nf0sjc8qyggjfan6pb2lsx2m2y"; depends=[AnnotationDbi]; };
+  org_Dm_eg_db = derive2 { name="org.Dm.eg.db"; version="3.3.0"; sha256="15kzvw78xwa54yk1d69l6pmgny4726ydpdkk8lic26vr0yiwicla"; depends=[AnnotationDbi]; };
+  org_Dr_eg_db = derive2 { name="org.Dr.eg.db"; version="3.3.0"; sha256="1823101yjvyc8x4gbmz7bijm2s5bd0fz4nv62glmaczlfc4lcwp9"; depends=[AnnotationDbi]; };
+  org_EcK12_eg_db = derive2 { name="org.EcK12.eg.db"; version="3.3.0"; sha256="0hjffgii1pxmri7razxpilsk7scbdm8ingfwbgn6g51lyd5ygbj3"; depends=[AnnotationDbi]; };
+  org_EcSakai_eg_db = derive2 { name="org.EcSakai.eg.db"; version="3.3.0"; sha256="15pn6kdbx2pf07dfq4knxbx3s7hf8zyip1c8hfmnvs5ixajivgxz"; depends=[AnnotationDbi]; };
+  org_Gg_eg_db = derive2 { name="org.Gg.eg.db"; version="3.3.0"; sha256="0my3kjhfvzv6zwdaina7qcl7riqy2rj2z2v6x477plwbscixb9p7"; depends=[AnnotationDbi]; };
+  org_Hs_eg_db = derive2 { name="org.Hs.eg.db"; version="3.3.0"; sha256="09zb43yjd82ny210n5a0wsrji4w56l2r6ana6d9lx0nn9mzd7rzp"; depends=[AnnotationDbi]; };
   org_Hs_ipi_db = derive2 { name="org.Hs.ipi.db"; version="1.3.0"; sha256="06nkcjcavzwgnxzmbj05i4dapszf2wq7m5s0g8d6hm7kxz5wxddy"; depends=[AnnotationDbi PAnnBuilder]; };
-  org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.2.3"; sha256="0wh1pm3npdg7070875kfgiid3bqkz3q7rq6snhk6bxfvph00298y"; depends=[AnnotationDbi]; };
-  org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.2.3"; sha256="037ihry1dly6cb3fhrlfsmcdma6ia6wl9b39c27ayibp9ga6ps0a"; depends=[AnnotationDbi]; };
-  org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.2.3"; sha256="1m0adzg66a9rf0m5xf07hzjil0avindaq3wam233gsxwmj91462k"; depends=[AnnotationDbi]; };
-  org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.2.3"; sha256="09yf36k3xbzj59c4difik2gkzsxl2rql42g5f1y239j6bigh9mga"; depends=[AnnotationDbi]; };
-  org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.2.3"; sha256="1vd6dzz1h6y0znbnxc8ifk929qinr81cglrqbg607xmz87lz1r7i"; depends=[AnnotationDbi]; };
-  org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.2.3"; sha256="0cdfbz8qb19rmvzp8lm835waijvwlp7b8dgwkd34diqx4pad4y6f"; depends=[AnnotationDbi]; };
+  org_Mm_eg_db = derive2 { name="org.Mm.eg.db"; version="3.3.0"; sha256="0r939vfmsqqdwfimix1nv0bkhnixawy9c6avbclrncfanw3kgjax"; depends=[AnnotationDbi]; };
+  org_Mmu_eg_db = derive2 { name="org.Mmu.eg.db"; version="3.3.0"; sha256="0awqg374j99j5g8z2am3cy0p92y68rsxss5b9by7mblxra4sy7gm"; depends=[AnnotationDbi]; };
+  org_Pf_plasmo_db = derive2 { name="org.Pf.plasmo.db"; version="3.3.0"; sha256="0xydp19vacycxwkfc1r5z1sbhhmmg5kzv25jqrnm47lbvdsbzbnq"; depends=[AnnotationDbi]; };
+  org_Pt_eg_db = derive2 { name="org.Pt.eg.db"; version="3.3.0"; sha256="1d0rrcpq3md5lavl3c9ypcbrg19l69p8abcxlzbqyn4rims6hsbp"; depends=[AnnotationDbi]; };
+  org_Rn_eg_db = derive2 { name="org.Rn.eg.db"; version="3.3.0"; sha256="1d89gafdk0hra7c0rmkkbydvp23ayam186ydjcwydvpms4lpjssb"; depends=[AnnotationDbi]; };
+  org_Sc_sgd_db = derive2 { name="org.Sc.sgd.db"; version="3.3.0"; sha256="1n251ds1gikv9ksgzy9a0j1z21kf18zj8q5b19zc0lh2pvgghhfh"; depends=[AnnotationDbi]; };
   org_Sco_eg_db = derive2 { name="org.Sco.eg.db"; version="2.4.2"; sha256="1ppjl55059gk9jbh8c8xbsn2jlqz1hm650vm9gxnbd8hpnk63vgz"; depends=[AnnotationDbi]; };
-  org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.2.3"; sha256="0n2id4g5ikwlsr2c8qrdv5gmnjycyp40zgwg2xh9ml9ahpzx957s"; depends=[AnnotationDbi]; };
+  org_Ss_eg_db = derive2 { name="org.Ss.eg.db"; version="3.3.0"; sha256="1fcskfrq0r4iq4nv2rnpl6sb5xi53qqihnm1cjnfi00mgc767xw1"; depends=[AnnotationDbi]; };
   org_Tgondii_eg_db = derive2 { name="org.Tgondii.eg.db"; version="1.0"; sha256="1vq3qbk6jswfffj5lfwsic71h8ga7a6gqf6wfa7qcda3gvfhnwlc"; depends=[AnnotationDbi]; };
-  org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.2.3"; sha256="1l7i0wv89bd6f4var4qakjxz4frnrzm88frjcfac3kba98196pva"; depends=[AnnotationDbi]; };
+  org_Xl_eg_db = derive2 { name="org.Xl.eg.db"; version="3.3.0"; sha256="16k3c5ym289hsrg7qvsdz8l7saisyrf096d5nrxd92jw1ilzj31q"; depends=[AnnotationDbi]; };
   paeg1acdf = derive2 { name="paeg1acdf"; version="2.18.0"; sha256="127pgxxp5wp3hgmafbzdzsk4gqnllq1m1gcsfyzkvpkvmbn4aa9n"; depends=[AnnotationDbi]; };
   paeg1aprobe = derive2 { name="paeg1aprobe"; version="2.18.0"; sha256="0hbyd402wf9nzy2g93nhnf2zsi9jvhgfk0llxlyfk0kqxs0y4byy"; depends=[AnnotationDbi]; };
   pd_081229_hg18_promoter_medip_hx1 = derive2 { name="pd.081229.hg18.promoter.medip.hx1"; version="0.99.4"; sha256="1h4925dmw0vfsnhllg55gswq3sxfmx9rcjzifdvgs9y27399psrr"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite]; };
@@ -786,26 +808,26 @@ in with self; {
   pd_zebgene_1_0_st = derive2 { name="pd.zebgene.1.0.st"; version="3.12.0"; sha256="1vywph8shn23k0s8jmvx34rj34y1zxgwcssjnzbipm71f2sa15hw"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
   pd_zebgene_1_1_st = derive2 { name="pd.zebgene.1.1.st"; version="3.12.0"; sha256="0xs3kx7l78dfqkasgz8n5s8qjia5qhdcnj1l8al0ivy8mwvlpyxs"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
   pd_zebrafish = derive2 { name="pd.zebrafish"; version="3.12.0"; sha256="0gg7y7w51pv0vf39qzyaf09wl3vxy222nr69zgxg7cylwxmaky7v"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
-  pedbarrayv10_db = derive2 { name="pedbarrayv10.db"; version="3.2.2"; sha256="1rvzg08d6b04d21hx4xsa3qdgdp7xndkkyi3yd7k8ilanpidi8jb"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  pedbarrayv9_db = derive2 { name="pedbarrayv9.db"; version="3.2.2"; sha256="1f8p1zapw74afch0bmn7j96296d88qwxx6p0qa1xf7ir8q92fl3x"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.2.0"; sha256="07hpsghl8j4xs3601vd6vf1a1v1q5dn35kmih424cxwh1vhb5yyb"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
-  phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.2.0"; sha256="14isvvv22y040qj3lbal0vf15l0k7c1r7jql27rl98f4n11hl1pc"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
-  phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.2.0"; sha256="0vpally7hwh7snqcz005g9z0iabi545cqg8bgrg9970w29j4xrgk"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
-  pig_db0 = derive2 { name="pig.db0"; version="3.2.3"; sha256="0kn1l48pwfc2bgmxck90fq9n2dayjzmdsj6rz44q02a4c5c2m6kz"; depends=[AnnotationDbi]; };
+  pedbarrayv10_db = derive2 { name="pedbarrayv10.db"; version="3.2.3"; sha256="01sn7qh5r2c2ph7gqirlzlplxscsmczf7ajffd9rsx59932f71kx"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  pedbarrayv9_db = derive2 { name="pedbarrayv9.db"; version="3.2.3"; sha256="0x9m9m4nmdhc0j5244avmlfwljcpw0sh44l1b00cx05swi3vmjlp"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  phastCons100way_UCSC_hg19 = derive2 { name="phastCons100way.UCSC.hg19"; version="3.3.0"; sha256="1mdwkd75ljmshyprg5ns9880ck9hrq7015s413sp64d2fxj206z5"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
+  phastCons100way_UCSC_hg38 = derive2 { name="phastCons100way.UCSC.hg38"; version="3.3.0"; sha256="1f5nq7chb5k5ahgwbjl0d67c382hvn50g0yz56l4ny1gwbgyamk7"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
+  phastCons7way_UCSC_hg38 = derive2 { name="phastCons7way.UCSC.hg38"; version="3.3.0"; sha256="035zap0igcfvrncq7pc1y6f9whnik0izchqjidf6z0cdyhv3h088"; depends=[BSgenome GenomicRanges IRanges VariantFiltering]; };
+  pig_db0 = derive2 { name="pig.db0"; version="3.3.0"; sha256="00lk4i3cvq3z14fxkyj393aa8sq70c9icd2srwkpgxhw51w8l3wz"; depends=[AnnotationDbi]; };
   plasmodiumanophelescdf = derive2 { name="plasmodiumanophelescdf"; version="2.18.0"; sha256="1vs36091djinn3g6rjhmy9xfdyi58365zbcjc9mf50adnp2i5fq9"; depends=[AnnotationDbi]; };
   plasmodiumanophelesprobe = derive2 { name="plasmodiumanophelesprobe"; version="2.18.0"; sha256="03hfq51nrpmx8ihc48jiih6bk99irrgal9x7i7mgcv8xd508gcsy"; depends=[AnnotationDbi]; };
   poplarcdf = derive2 { name="poplarcdf"; version="2.18.0"; sha256="0j28czs936j2wgwp63qbwl1mjcflcrx7ir88jzxkkw7411ch1gl1"; depends=[AnnotationDbi]; };
   poplarprobe = derive2 { name="poplarprobe"; version="2.18.0"; sha256="1pi6lhkk3lr49qs0yfpxm80nm1zqn4syykydymah2208r6qnkgv2"; depends=[AnnotationDbi]; };
-  porcine_db = derive2 { name="porcine.db"; version="3.2.2"; sha256="1xbgvzhywv504xyd2kciixrcg9dr6c99czxclf0rwwl7dwyadwr1"; depends=[AnnotationDbi org_Ss_eg_db]; };
+  porcine_db = derive2 { name="porcine.db"; version="3.2.3"; sha256="0xp86g0sp4jj2shjzvwg64fpp381lkjm0p5y3zwalznnrq6xl3hk"; depends=[AnnotationDbi org_Ss_eg_db]; };
   porcinecdf = derive2 { name="porcinecdf"; version="2.18.0"; sha256="1ywbgh5nk3bba0mhmbbmvry0j9m9vk7qmsacl5nx1cjd7kp68csv"; depends=[AnnotationDbi]; };
   porcineprobe = derive2 { name="porcineprobe"; version="2.18.0"; sha256="16q865wjrfcm5ffqwjdk762yq1ixa93jlvfg7xbhsvajvvw5dxdy"; depends=[AnnotationDbi]; };
   primeviewcdf = derive2 { name="primeviewcdf"; version="2.18.0"; sha256="0qj3l2iabpl2d79pr258cbqar4hdpjkbwf829bnwrmabkaq92z48"; depends=[AnnotationDbi]; };
   primeviewprobe = derive2 { name="primeviewprobe"; version="2.18.0"; sha256="0kw04789ihxnw874qcdj5ypwj6npya2v3p893ahjwhys5wrivmqg"; depends=[AnnotationDbi]; };
   r10kcod_db = derive2 { name="r10kcod.db"; version="3.4.0"; sha256="073b5fb8dcqp5iq3h6p6250l91z6bzg72nzl7qva3jin33v96nmm"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rae230a_db = derive2 { name="rae230a.db"; version="3.2.2"; sha256="095d2jf1g89855y7fmv6v8fpwk6gir2b1v5s7sj4xdry8ax67l0v"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rae230a_db = derive2 { name="rae230a.db"; version="3.2.3"; sha256="1b2vj2dsihnj1h867z9biyxb3ai3lv47bhadim1z1gcyizkbll4x"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rae230acdf = derive2 { name="rae230acdf"; version="2.18.0"; sha256="1f62gw18mhmrm4sqc3kazsm5zd4m73f99xzxbakqhvr5sbdqh28k"; depends=[AnnotationDbi]; };
   rae230aprobe = derive2 { name="rae230aprobe"; version="2.18.0"; sha256="0gkpaa53znqsmi3366wfmqz6q3d1cq3ymag09gkpdmssrp1rh9qh"; depends=[AnnotationDbi]; };
-  rae230b_db = derive2 { name="rae230b.db"; version="3.2.2"; sha256="07nb27lhwabdh3yxirpnvgvym6wqal40xi105nmn5y6mr5a1q2yg"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rae230b_db = derive2 { name="rae230b.db"; version="3.2.3"; sha256="0rjs9lijabhxfrs6m9qri7a1c10zm1mxqx7bbip366cw069f5dx4"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rae230bcdf = derive2 { name="rae230bcdf"; version="2.18.0"; sha256="1j2i49cp042nk3rkf8q6gxcnwd5cihz1nyg8r6yndkja51r41pi8"; depends=[AnnotationDbi]; };
   rae230bprobe = derive2 { name="rae230bprobe"; version="2.18.0"; sha256="1smqs93fks4rd5g9kk7cacnpsnj4rjr0d6fl2i01mdiihfi3csny"; depends=[AnnotationDbi]; };
   raex10stprobeset_db = derive2 { name="raex10stprobeset.db"; version="8.4.0"; sha256="004h4z10x84w9bk71y1a22r51hh52xhpvdr1flr6crgxvhh0icis"; depends=[AnnotationDbi org_Rn_eg_db]; };
@@ -820,37 +842,37 @@ in with self; {
   ragene20sttranscriptcluster_db = derive2 { name="ragene20sttranscriptcluster.db"; version="8.4.0"; sha256="18v7f7i6r9byq5sjr9pxshqmbr6p2iym3gv95lqqfg4qlgiri991"; depends=[AnnotationDbi org_Rn_eg_db]; };
   ragene21stprobeset_db = derive2 { name="ragene21stprobeset.db"; version="8.4.0"; sha256="0qfhb9fpydfh9n0d41pky46zsjabg7cpmyg6m59v529s22xw1mhw"; depends=[AnnotationDbi org_Rn_eg_db]; };
   ragene21sttranscriptcluster_db = derive2 { name="ragene21sttranscriptcluster.db"; version="8.4.0"; sha256="04cm1248iphl4n7avjr29ac44kgvhj8fkwxvb5wsyrjdfs15swmm"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rat_db0 = derive2 { name="rat.db0"; version="3.2.4"; sha256="1yxamdcfgj0imjbj54hvwjyz0s5739654qf9c934ykrkfmfacrl0"; depends=[AnnotationDbi]; };
-  rat2302_db = derive2 { name="rat2302.db"; version="3.2.2"; sha256="1m9kn3lx1kydglk503ila814v9rrd2sphhhyqdvw9cp4jd4d22c0"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rat_db0 = derive2 { name="rat.db0"; version="3.3.0"; sha256="1dsb56lldvq8a75ryx7b1wvzaw9w8x0b1kjsnhd8jh2qj2rai2d5"; depends=[AnnotationDbi]; };
+  rat2302_db = derive2 { name="rat2302.db"; version="3.2.3"; sha256="0vj4vkx091m34xqjh6gv6m2iqszvn5rq3kvnpyq3fin5v42wrsr1"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rat2302cdf = derive2 { name="rat2302cdf"; version="2.18.0"; sha256="1748rc6yypd7y8wgr1qg632pcsxx0fkxjz6b3z4fhblgdllhy9wk"; depends=[AnnotationDbi]; };
   rat2302probe = derive2 { name="rat2302probe"; version="2.18.0"; sha256="1zwjgbcb9d4ib6z1iyjz8x11lq0b5gqs08y6j3idb5wf3i2p521v"; depends=[AnnotationDbi]; };
   ratCHRLOC = derive2 { name="ratCHRLOC"; version="2.1.6"; sha256="0mgk6lwvvdwjzjh4r1q1q6nfnx4vqx9iy6gmbrb9f31jf30hqnsb"; depends=[]; };
   rattoxfxcdf = derive2 { name="rattoxfxcdf"; version="2.18.0"; sha256="0q84lfaxnnj2zbm5q8xswa1md15fjj4i0djnqr835ixzn7px4yqn"; depends=[AnnotationDbi]; };
   rattoxfxprobe = derive2 { name="rattoxfxprobe"; version="2.18.0"; sha256="1kp159553rkcn9yh6x3yph3yjz2ja21wi9j5ax03qnhwlsl1x8ik"; depends=[AnnotationDbi]; };
-  reactome_db = derive2 { name="reactome.db"; version="1.54.1"; sha256="0nqv0yyhlnkn75zrj5chpmxcf2ak3bddffjkfwnm740hr7cn0491"; depends=[AnnotationDbi]; };
-  rgu34a_db = derive2 { name="rgu34a.db"; version="3.2.2"; sha256="03p2qfg1bxpc6hd3g3j4hpndcb89id8ygkkn3za4gbbc4xql6543"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  reactome_db = derive2 { name="reactome.db"; version="1.55.0"; sha256="1q3cikzvbywzcrihnw5hizb8fylf1mfbwyrlyxcnw5hb522f5x8n"; depends=[AnnotationDbi]; };
+  rgu34a_db = derive2 { name="rgu34a.db"; version="3.2.3"; sha256="1s2sd5bqlj4qhamhrnb9byxn8nc7z265mqy7zzkgxcd6a2k472vp"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgu34acdf = derive2 { name="rgu34acdf"; version="2.18.0"; sha256="08z9f16xp1m2mwl9vlmbffxl4zyyl8cgzf6wp66rrm32lvl0nbwq"; depends=[AnnotationDbi]; };
   rgu34aprobe = derive2 { name="rgu34aprobe"; version="2.18.0"; sha256="1gjxyq9128jgv3ic386f84rajgf3wz7yi2dja80y0ff4m0a48dlh"; depends=[AnnotationDbi]; };
-  rgu34b_db = derive2 { name="rgu34b.db"; version="3.2.2"; sha256="1gckh80vjabrhwxnzqxr885z6jzmpmvd1lqpa430b6nmjffgq0fn"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rgu34b_db = derive2 { name="rgu34b.db"; version="3.2.3"; sha256="1dpk9dyicqc8d4fypqcq2z4plq6iabd0g8f3bfvkp9qip3bi9np8"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgu34bcdf = derive2 { name="rgu34bcdf"; version="2.18.0"; sha256="1iw0jydcjizkxybpbimcc9m8rjl4xm3jx431nvr28h14948jhrg3"; depends=[AnnotationDbi]; };
   rgu34bprobe = derive2 { name="rgu34bprobe"; version="2.18.0"; sha256="097q0994fbn05b6iprncynpka9zm9ayh1pmjya44lj4ahfmflgiq"; depends=[AnnotationDbi]; };
-  rgu34c_db = derive2 { name="rgu34c.db"; version="3.2.2"; sha256="0rhiqkgpr5fkjndbqgibrg8kcxxav0ijz3cfd1gflk0530q816sk"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rgu34c_db = derive2 { name="rgu34c.db"; version="3.2.3"; sha256="0bc4b799hxxp108rkfr12c0v49vkfgq5p9hxk48p5a5b9h42g6s8"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rgu34ccdf = derive2 { name="rgu34ccdf"; version="2.18.0"; sha256="0v6glasybwg73synvlq6rf3fw4wckavp09waf3g3hya4qzy45r1x"; depends=[AnnotationDbi]; };
   rgu34cprobe = derive2 { name="rgu34cprobe"; version="2.18.0"; sha256="00v9hbq5vc6ah4gws196isglicxj1dpzp1a0vv4pkl2ph59hkf1q"; depends=[AnnotationDbi]; };
-  rguatlas4k_db = derive2 { name="rguatlas4k.db"; version="3.2.2"; sha256="02a3y3ysi7v9jlv2h22yj2lqy96x9szrliz0bvs5zz12jmmkv4rg"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rgug4105a_db = derive2 { name="rgug4105a.db"; version="3.2.2"; sha256="0kxlhh14v8ygscxaym56302fpnl91ski5hzrdz2cinsp71p9zm08"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rgug4130a_db = derive2 { name="rgug4130a.db"; version="3.2.2"; sha256="0z0cf5an7c6m5prkssyc5jsxxmsljpn71wgf2z54gdl8k5nq7gli"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rgug4131a_db = derive2 { name="rgug4131a.db"; version="3.2.2"; sha256="0fhq9wmq9r5h4hzv0d33xc6ld6grcmngvydnr3lm325x97fpyfjc"; depends=[AnnotationDbi org_Rn_eg_db]; };
-  rhesus_db0 = derive2 { name="rhesus.db0"; version="3.2.3"; sha256="0qfnhvn6v3ip6y10jcb7xnsv8v9y2madrynaga0giqxghdj87rki"; depends=[AnnotationDbi]; };
+  rguatlas4k_db = derive2 { name="rguatlas4k.db"; version="3.2.3"; sha256="0q8xryvqixqbfqc9lfkmy9zymdlyk76vy4l3a74haj7k1m72nhi2"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rgug4105a_db = derive2 { name="rgug4105a.db"; version="3.2.3"; sha256="0lq8k95qm0q7j65nf16p3f09dn9zs87n3k561wxrgi2lb0pf6j40"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rgug4130a_db = derive2 { name="rgug4130a.db"; version="3.2.3"; sha256="0zlcn9spw23bj3px9z1l2f5afn09zbr6rv0nbd2h6dd12wrvy1zk"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rgug4131a_db = derive2 { name="rgug4131a.db"; version="3.2.3"; sha256="1r272jf9cflf1yf4bznp4d59h7bd7adh1i3rf890h5ffc0xzf5cq"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rhesus_db0 = derive2 { name="rhesus.db0"; version="3.3.0"; sha256="0xq7bvargvwv06xzalshw7iz75incm6cz58w7h7hg66avyvrxyc9"; depends=[AnnotationDbi]; };
   rhesuscdf = derive2 { name="rhesuscdf"; version="2.18.0"; sha256="0q2alkxm80wkzaf0q80df27q30qkswybavz05x6ywsihbs9h0nb8"; depends=[AnnotationDbi]; };
   rhesusprobe = derive2 { name="rhesusprobe"; version="2.18.0"; sha256="0fd8pvwvpcmx41k80nbccjxllh39fvjf7l9dr8facisl1x7gsfil"; depends=[AnnotationDbi]; };
   ri16cod_db = derive2 { name="ri16cod.db"; version="3.4.0"; sha256="1xz533vxjdyxx1wkks0kgk6b90sxs44iqcsvyds0xcm573bx8c6q"; depends=[AnnotationDbi org_Rn_eg_db]; };
   ricecdf = derive2 { name="ricecdf"; version="2.18.0"; sha256="07lsw9rklk2rsvbkcj1ci8hg2x68k3qpkx9yw0cmd7rg5fvydgns"; depends=[AnnotationDbi]; };
   riceprobe = derive2 { name="riceprobe"; version="2.18.0"; sha256="0w6qvszdmnipn3v2bld46x7my2a9hni0jbxd0y1d6xcrrgs951ra"; depends=[AnnotationDbi]; };
-  rnu34_db = derive2 { name="rnu34.db"; version="3.2.2"; sha256="1mhnazgbczf9bkdx20hyyfzk5kc4a71g4i9b7b5rcw99jpaabs3b"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rnu34_db = derive2 { name="rnu34.db"; version="3.2.3"; sha256="0ahridq75rmjyaivmlhn428wg712zv3003cbzzrajm9w6nibbfgk"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rnu34cdf = derive2 { name="rnu34cdf"; version="2.18.0"; sha256="1snb89530zxdbsfs1vgw30b1wdc5sdr1q46bmvz5m9g57gyficr0"; depends=[AnnotationDbi]; };
   rnu34probe = derive2 { name="rnu34probe"; version="2.18.0"; sha256="1rzjha1v453fxiwqs2zgwcbrvz6w96biz2jny0hrh5s86d5f6xpb"; depends=[AnnotationDbi]; };
-  rtu34_db = derive2 { name="rtu34.db"; version="3.2.2"; sha256="16kf4h4dfhjk0m8ks3r76j9ca6qinzh2sh6258ba887gdy63rd78"; depends=[AnnotationDbi org_Rn_eg_db]; };
+  rtu34_db = derive2 { name="rtu34.db"; version="3.2.3"; sha256="119l36gbzdi52na2lkjbpb5r2d9pp5rz2zpzfj7isw07an6h8wmh"; depends=[AnnotationDbi org_Rn_eg_db]; };
   rtu34cdf = derive2 { name="rtu34cdf"; version="2.18.0"; sha256="10f5wnvk820c8brl2qqs7mv6jcn1v6pmz680kvlpyz9s2sz16936"; depends=[AnnotationDbi]; };
   rtu34probe = derive2 { name="rtu34probe"; version="2.18.0"; sha256="0mcp9lmc65j3ds73gyak72pkshnx6km0d2cm324yaxlp9bqzfchw"; depends=[AnnotationDbi]; };
   rwgcod_db = derive2 { name="rwgcod.db"; version="3.4.0"; sha256="1k0fpnv314lx2jf3mm6xfqa3jx353sp42awxqys9byzhg9zyj2j3"; depends=[AnnotationDbi org_Rn_eg_db]; };
@@ -869,18 +891,18 @@ in with self; {
   tomatocdf = derive2 { name="tomatocdf"; version="2.18.0"; sha256="1ldq5pxzh2vms5nbhn3aiy55hx2x3zbzy9wlbf2v2wczwlzbiinm"; depends=[AnnotationDbi]; };
   tomatoprobe = derive2 { name="tomatoprobe"; version="2.18.0"; sha256="1aj8zmpla9b9p7pj0qnp2jqrj7azp1nmfvjcbka5ns5vrnvfpf92"; depends=[AnnotationDbi]; };
   u133aaofav2cdf = derive2 { name="u133aaofav2cdf"; version="2.18.0"; sha256="052hs4lwllq0p0fsx5d1ixqhrdl889k14z10kahpsjn60746qarm"; depends=[AnnotationDbi]; };
-  u133x3p_db = derive2 { name="u133x3p.db"; version="3.2.2"; sha256="0inmx2ssi7iafgf5smhszplrq1d149vcd9ddpfqy14q84fpxm6yc"; depends=[AnnotationDbi org_Hs_eg_db]; };
+  u133x3p_db = derive2 { name="u133x3p.db"; version="3.2.3"; sha256="17wq16zhmpjpyxfhwr57kx61b4i87jkzza8qkqmcd6kcrhqkj92y"; depends=[AnnotationDbi org_Hs_eg_db]; };
   u133x3pcdf = derive2 { name="u133x3pcdf"; version="2.18.0"; sha256="05bdb5bz1ffv7dhbzn0s5ybygah72zvhz8zcj8bn9dg0k40yqsrb"; depends=[AnnotationDbi]; };
   u133x3pprobe = derive2 { name="u133x3pprobe"; version="2.18.0"; sha256="0xzm6dkf78mp1yhdl3w0hg36saxgb4sxnq0dsvzjmfaca74ir2qy"; depends=[AnnotationDbi]; };
   vitisviniferacdf = derive2 { name="vitisviniferacdf"; version="2.18.0"; sha256="027nn1fr5zixnlikw4pi704kdfrfm388j5qr30y9bsky445fn7g4"; depends=[AnnotationDbi]; };
   vitisviniferaprobe = derive2 { name="vitisviniferaprobe"; version="2.18.0"; sha256="1ggz1s37dwvrkhj4vx2civyhap7bgqsshy33lk14z4fjsayfi39a"; depends=[AnnotationDbi]; };
   wheatcdf = derive2 { name="wheatcdf"; version="2.18.0"; sha256="1gmbrdilqvm54h6nkb1cm01ki8aipiywd4qj8gpwlm2hqrimr8kr"; depends=[AnnotationDbi]; };
   wheatprobe = derive2 { name="wheatprobe"; version="2.18.0"; sha256="1fifi3pvzdrg356idwz0kx7qlf5mssdxlyvwpn3cjgw0z7n7cnw8"; depends=[AnnotationDbi]; };
-  worm_db0 = derive2 { name="worm.db0"; version="3.2.3"; sha256="1wq82jvax97w1aqr6la9arzrqw81jwkvzj2fmq5fj6l9bkizh5a4"; depends=[AnnotationDbi]; };
-  xenopus_db0 = derive2 { name="xenopus.db0"; version="3.2.3"; sha256="061nkbc90xa1hy26alshihs3gvl9qwqmfv05kc8gci9c15wp7k7k"; depends=[AnnotationDbi]; };
+  worm_db0 = derive2 { name="worm.db0"; version="3.3.0"; sha256="00g3cq605zgzq11lrc8fyp5qyqds1rwq3qzbpg82ja29ggbnkr6f"; depends=[AnnotationDbi]; };
+  xenopus_db0 = derive2 { name="xenopus.db0"; version="3.3.0"; sha256="1bxz80rg1kf9hawmbrawiswz8r8yb29ck7l8wwivi4n5cg3mfbkw"; depends=[AnnotationDbi]; };
   xenopuslaeviscdf = derive2 { name="xenopuslaeviscdf"; version="2.18.0"; sha256="1bcz1hr7gxw6ac4qvw0giph6hfcf5i9b11s274ypq512qc1d32iq"; depends=[AnnotationDbi]; };
   xenopuslaevisprobe = derive2 { name="xenopuslaevisprobe"; version="2.18.0"; sha256="0prb14zn2gvgxq8w0y21x1ng51cn3bgjhkppf7zkmnq1xkzvq0pw"; depends=[AnnotationDbi]; };
-  xlaevis_db = derive2 { name="xlaevis.db"; version="3.2.2"; sha256="0pak2v29wf0lns8n8nx04p15vcs351vr1sr0arybffp15maw3lya"; depends=[AnnotationDbi org_Xl_eg_db]; };
+  xlaevis_db = derive2 { name="xlaevis.db"; version="3.2.3"; sha256="0cdi71c8pflb8n4yfxc0wmfi51w6z0dlz7nw5hv0hkx547v79d53"; depends=[AnnotationDbi org_Xl_eg_db]; };
   xlaevis2cdf = derive2 { name="xlaevis2cdf"; version="2.18.0"; sha256="1w7f6z5f0mfgblfjy840dxj3y1l9zz8fp4s8q6zd580nwaa50g78"; depends=[AnnotationDbi]; };
   xlaevis2probe = derive2 { name="xlaevis2probe"; version="2.18.0"; sha256="0vrhbzi3myh10v7r5a6jqiinllns3n40nxs097px7g80x8ajkmb2"; depends=[AnnotationDbi]; };
   xtropicaliscdf = derive2 { name="xtropicaliscdf"; version="2.18.0"; sha256="03plnc0dya0dgmvay3hyw5yi91ris6gl643chmjil7p8vn9lb5as"; depends=[AnnotationDbi]; };
@@ -889,16 +911,16 @@ in with self; {
   ye6100subbcdf = derive2 { name="ye6100subbcdf"; version="2.18.0"; sha256="1169hv56981b915rlr5w5sn6ppyjd8as7f4k1hbjzadrdrl3glwp"; depends=[AnnotationDbi]; };
   ye6100subccdf = derive2 { name="ye6100subccdf"; version="2.18.0"; sha256="0mhr4zd33gfvvivc17k7fb6nvmhq6h3q0xbx2zl09zd6qk09kizm"; depends=[AnnotationDbi]; };
   ye6100subdcdf = derive2 { name="ye6100subdcdf"; version="2.18.0"; sha256="11b1fflgc34lrj4yf1p7way5n83cm9c7znsbxpzlwddwyy8qib30"; depends=[AnnotationDbi]; };
-  yeast_db0 = derive2 { name="yeast.db0"; version="3.2.4"; sha256="1y1p2987w480nr2mdvkyag8ixhxf15y5h5awk69kpq5qvpd73q2y"; depends=[AnnotationDbi]; };
-  yeast2_db = derive2 { name="yeast2.db"; version="3.2.2"; sha256="0wgfpnsc8mpizag8x2mpyf0hj00k3fwsfz6nws7fnrndqhc47ixb"; depends=[AnnotationDbi org_Sc_sgd_db]; };
+  yeast_db0 = derive2 { name="yeast.db0"; version="3.3.0"; sha256="0dpdqn22m5l78ck5shwpiw4qza63sddckzdq85fx4xskmnr0qhr2"; depends=[AnnotationDbi]; };
+  yeast2_db = derive2 { name="yeast2.db"; version="3.2.3"; sha256="1xns0129ifklipbardybkjyxfwnlklavq0k6s15wk2iwk7vxa33s"; depends=[AnnotationDbi org_Sc_sgd_db]; };
   yeast2cdf = derive2 { name="yeast2cdf"; version="2.18.0"; sha256="0c68val9x8bfnv4xx0vag9dxwsx5q8dzbj0dpha3nshh12jw48w9"; depends=[AnnotationDbi]; };
   yeast2probe = derive2 { name="yeast2probe"; version="2.18.0"; sha256="125nif693qcmxc0nnnz917f9avggcdr8g9rfvx2qdc54a2l7vdb7"; depends=[AnnotationDbi]; };
-  ygs98_db = derive2 { name="ygs98.db"; version="3.2.2"; sha256="07qkrv7c17h0h851402pf7rvlf00izm8f3s5bjpyagnjpzbxxyd4"; depends=[AnnotationDbi org_Sc_sgd_db]; };
+  ygs98_db = derive2 { name="ygs98.db"; version="3.2.3"; sha256="0py1xpqxsfvxk20knn4lj872mxw1ysqk2nvgsbh5l2rh1m2p8rdk"; depends=[AnnotationDbi org_Sc_sgd_db]; };
   ygs98cdf = derive2 { name="ygs98cdf"; version="2.18.0"; sha256="0j04biahbm2l31aayddp0z9rh3jq1ydxf3h8pxr3pvq2vjj1q2mh"; depends=[AnnotationDbi]; };
   ygs98frmavecs = derive2 { name="ygs98frmavecs"; version="1.3.0"; sha256="1xrm1209xnknwvad7nvg1a0mbxz15z12yd4x5bia3cq03zcmzf9m"; depends=[]; };
   ygs98probe = derive2 { name="ygs98probe"; version="2.18.0"; sha256="0awf6z4j2vb2jk9a9j2r512yd3m31660y68pasa9mp488m270a3q"; depends=[AnnotationDbi]; };
-  zebrafish_db = derive2 { name="zebrafish.db"; version="3.2.2"; sha256="1hx6x2ninchkyw4gmw4frzs0j7zj8lbh880q6wvvzf76a414lka2"; depends=[AnnotationDbi org_Dr_eg_db]; };
-  zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.2.4"; sha256="0y5i2rb5vskpal3kchk8c5wywynvaz9dacb9hggk03qkrbpz03bn"; depends=[AnnotationDbi]; };
+  zebrafish_db = derive2 { name="zebrafish.db"; version="3.2.3"; sha256="1n6p04hlm5c32fnficx294s7n7izy5460avagw8hx1g5xryhdzqk"; depends=[AnnotationDbi org_Dr_eg_db]; };
+  zebrafish_db0 = derive2 { name="zebrafish.db0"; version="3.3.0"; sha256="1x0pzppwlm2ad8b2amg3i4jcpkadr2x26nqdhjqyjag0kq5w72zl"; depends=[AnnotationDbi]; };
   zebrafishcdf = derive2 { name="zebrafishcdf"; version="2.18.0"; sha256="0sq1xqhblbilvaiabhqyl9gxdj3jg576vgq8v0cls1zvvx0isrx0"; depends=[AnnotationDbi]; };
   zebrafishprobe = derive2 { name="zebrafishprobe"; version="2.18.0"; sha256="1pb8z2rdhq11hq391xyi236scyafbp56kbhhwsnha36yygz5drw0"; depends=[AnnotationDbi]; };
 }
diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix
index 4ae4806a6836..93fc5a95482e 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.nix
+++ b/pkgs/development/r-modules/bioc-experiment-packages.nix
@@ -4,263 +4,299 @@
 # Rscript generate-r-packages.R bioc-experiment >new && mv new bioc-experiment-packages.nix
 
 { self, derive }:
-let derive2 = derive { rVersion = "3.2"; };
+let derive2 = derive { rVersion = "3.3"; };
 in with self; {
-  ABAData = derive2 { name="ABAData"; version="1.0.0"; sha256="1p2q03c87ilwfz7gbypkfi0n3m9m3c4z6ci9b5v4pr46q4ppl7s9"; depends=[]; };
-  ALL = derive2 { name="ALL"; version="1.12.0"; sha256="1k4sx1ras9g9zbx34r5nxyrik5c5jzb4b1zxf4551q5xfy97w354"; depends=[Biobase]; };
-  ALLMLL = derive2 { name="ALLMLL"; version="1.10.0"; sha256="0c1ma3lzh1dvmz7h1pw0r9vvq9y0xmc1hjm0lwr3ql509lim82aw"; depends=[affy]; };
-  ARRmData = derive2 { name="ARRmData"; version="1.6.0"; sha256="1bn41pmk7mfdncjnd103spfdcxrwz5jgdycb37kgq1hk36qzw3mj"; depends=[]; };
-  Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.6.0"; sha256="03gb68gw3q6aig3r510h9rwlhj4g40n1dsic2iyj5cs9fmj6gfq1"; depends=[]; };
-  Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.4.0"; sha256="1bzc53gcazsl3958nnq3igy4xrd693gl9gsrz48zaj47gwij2la0"; depends=[]; };
-  Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.8.0"; sha256="0cm5giv12p3cx3z0ync7pgj309n4xy630y9wr70pb7n9kr0f5gjf"; depends=[]; };
-  AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.8.0"; sha256="1cag2mc81qcqx8gwlg4xyvm4a6qayjajwdna8mcwki42gjdl15x4"; depends=[]; };
-  Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.8.0"; sha256="0ajxf81y3w6r60gj6ybkzqn7qcqrwch1s10nd2jcv7ki4w6vw6kb"; depends=[]; };
-  AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.10.0"; sha256="1xpkdllg9a86pc4fjfiv9a0n8mbiaxyz3ra40v9drwh29skkfpm2"; depends=[affy]; };
-  AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.0.0"; sha256="1jz69nxilwcs9h7hj366dl20fxlblrgvplnjjr091r5jy3a43cvj"; depends=[]; };
-  BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.8.0"; sha256="0vszzx44sppd0gka884fm53al9ljpjl4rrzq7li4w23ndf8sf5ak"; depends=[beadarray GEOquery limma]; };
-  CCl4 = derive2 { name="CCl4"; version="1.8.0"; sha256="0wmkkvxb2k0x921djf7x08svkm6lxfy00053ba572zk9rgb1pzqf"; depends=[Biobase limma]; };
-  CLL = derive2 { name="CLL"; version="1.10.0"; sha256="1r9iv4m993nz7rj6z23pclgd4c8j75d5raq2518vjkp1a4prhj4s"; depends=[affy Biobase]; };
-  COHCAPanno = derive2 { name="COHCAPanno"; version="1.6.0"; sha256="0dayg8p92ma2bwjn4c342q03z1cmb8xyazr4c8y8pzddrydwaizv"; depends=[]; };
-  COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.6.0"; sha256="045fh1g0m6z47q5smc2x7q3adfxs50fa3ph0k9b3qrkrzfq4dpcb"; depends=[]; };
-  COSMIC_67 = derive2 { name="COSMIC.67"; version="1.6.0"; sha256="0ixjr4r3rj4q0mhv3nkvl4f9h6a4p0zhb90byri9w9jwskzm41h1"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; };
-  CRCL18 = derive2 { name="CRCL18"; version="0.104.0"; sha256="1k3xk588a6jm4cifpaljciwfhwwgz1f7wigwlsi06mqnxic6d545"; depends=[Biobase]; };
-  CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.2.0"; sha256="0whrczwqlni05iifra614mi2s9a9byj8gzi9dzh85947nxvvky67"; depends=[Cardinal]; };
-  ChAMPdata = derive2 { name="ChAMPdata"; version="1.8.0"; sha256="0f8b7zf90avxl9siz4289m91yp21w4bk5hjw6rpkl2w2wvgcz6a1"; depends=[]; };
-  ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.8.0"; sha256="0n3v9d4dbdwbjr01sn4gbys521wmqsnfdg2hbfs0fhp9kajrh9ya"; depends=[bigmemory]; };
-  ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.8.0"; sha256="08p3n2ds4fxwbh0xp19z7p6qf7p07h87hxlcfnvsf0vzi8ifp146"; depends=[affy hexbin limma qvalue statmod]; };
-  ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.6.0"; sha256="05gbp5gnqmdpc3yk1mbd7vj3phy1kjyimvndrc7ijvnmcg7dzs9m"; depends=[]; };
-  CopyNumber450kData = derive2 { name="CopyNumber450kData"; version="1.6.0"; sha256="1scg0mij4rpgb4sfk7fzrd3yxryglnj94gv5dgj6k2gw1551xiyh"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; };
-  CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.2.0"; sha256="1snbk048xigzskajjcm3ihm0cj9yb57h79ac91cmlpqkac6bvpsg"; depends=[]; };
-  DLBCL = derive2 { name="DLBCL"; version="1.10.0"; sha256="0nmhm768cpfq8kzhc0x33yqdaw9zi7n0vzgaw2qb1f89dr0bwvm4"; depends=[Biobase]; };
-  DMRcatedata = derive2 { name="DMRcatedata"; version="1.6.1"; sha256="1fd6wsg7v89iknwnpf0ypxwvpz5kl6dzwm74dsrn179fm2wxjqjm"; depends=[GenomicRanges]; };
-  DREAM4 = derive2 { name="DREAM4"; version="1.6.0"; sha256="1plla7jzqarwcanyb2ss330y9ssmrr6ka6fa6040r1z0y64c12qj"; depends=[SummarizedExperiment]; };
-  DeSousa2013 = derive2 { name="DeSousa2013"; version="1.6.0"; sha256="18yanbz9nnaxsxgnydvr55xw95aymk2l32fad3xzh2fb1lb3wmqm"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; };
-  DmelSGI = derive2 { name="DmelSGI"; version="1.2.0"; sha256="0cxzw6fb3gwp46j3gc59ygiaghv4wi3dx2dbljbq9f5csnfwdr9y"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; };
-  DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.8.0"; sha256="1s50gkjvsradqrjz47xlpzxrl1xad52g07ww75vyrgk0pqdczcgr"; depends=[EBImage]; };
-  DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.6.0"; sha256="1n4nmcynm9g86n33x4ndgja8c1qkk940z9dgl15y47plyc4xx1mv"; depends=[]; };
-  DvDdata = derive2 { name="DvDdata"; version="1.6.0"; sha256="1vzxlaa5481w70cy9ihmm2xk9hn7l4hwvi663i6fgjc1dzramvql"; depends=[]; };
-  ELMER_data = derive2 { name="ELMER.data"; version="1.0.0"; sha256="19v1vy16ppz1nc9s4586qvsz70d1jq7cx5rj4ravnd6kwvnk12xr"; depends=[GenomicRanges]; };
-  EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.8.0"; sha256="0dh37fdd8y2fnr0mf7c8jxizmpgd4xb51l1wyvbrc47iqb068g33"; depends=[GenomicRanges rtracklayer ShortRead]; };
-  FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.6.0"; sha256="1s077sdz9szxzva3js1qcm5p64yy56bxjcxsf474k12n39ax5bx5"; depends=[]; };
-  Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.6.0"; sha256="1q020k3iaf74cipyj4dz3qqi1007nnjhpgqf143axqzl9p7cy9f1"; depends=[Biobase gplots limma VennDiagram]; };
-  Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.6.0"; sha256="0vwdklxshkpsv3wi69j7m1vdjl556zw6hxzak0jcnf60m4hmyxj2"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; };
-  FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.8.0"; sha256="1g3jd0wihx2nw5hfjmpv3vgragkgx0nwh3j2f2fl2zdbkiaawf7j"; depends=[minfi]; };
-  FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.6.0"; sha256="1xk67dxwmpiraidfmr1k6qqbfi1fnpzsr35rn4khiwh6frsyvw0d"; depends=[minfi]; };
-  FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.6.0"; sha256="15f3b6p5gr25pfrnzsd90w9dnajryia66scpd4jfrws8jagccszq"; depends=[IRanges rtracklayer]; };
-  GGdata = derive2 { name="GGdata"; version="1.8.0"; sha256="1r2kshwi8iajk0rwzkccdw389ffvkzivg82f4bri3xw0sq57fm50"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; };
-  GSBenchMark = derive2 { name="GSBenchMark"; version="0.104.0"; sha256="133myyzjs6ybj0p7vmrz6xbrc21xid50351pyrd2hm8xrry8h7sa"; depends=[]; };
-  GSVAdata = derive2 { name="GSVAdata"; version="1.6.0"; sha256="1aldm4mjzdfwnfplrr0nd115w9s877xq1glm1lv60y7dbcki0ghd"; depends=[Biobase GSEABase hgu95a_db]; };
-  GWASdata = derive2 { name="GWASdata"; version="1.8.0"; sha256="1spphp552kajq80q630bwq9ynjfb0abl97fhkfgqi312xiyz8hs8"; depends=[GWASTools]; };
-  HD2013SGI = derive2 { name="HD2013SGI"; version="1.10.0"; sha256="004d5j2pfrjll68qdswpla81vl6n91vq3jq5rqpc4dwsbgxwaziy"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; };
-  HEEBOdata = derive2 { name="HEEBOdata"; version="1.8.0"; sha256="04s7jdlhls5rzyaczdar8qzln008c97fh5a51mysxw8d53cj2qd9"; depends=[]; };
-  HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.10.0"; sha256="0smdnfvv8gmccxa648lh5smz2cb157bsh823kcwbb49hlm3m1mp9"; depends=[]; };
-  HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.104.0"; sha256="0d3vigzcrdx0jk9bb27xn7zkz61jgfwsljw0xgsncq1r34v3jrmm"; depends=[]; };
-  HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.104.0"; sha256="1l5xlfjlg619acc8sr8c3mm89cyqnkaicscmjbz6iir2zvprx0qm"; depends=[]; };
-  HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.6.0"; sha256="04a9mqs7xfvyk8604g936hrgpfrq26xhi717caf32jh8hl2aaq82"; depends=[]; };
-  Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.6.0"; sha256="1pqahziip8rxmnx2vpylxlfj7g21f051d13f7if4p5wgdkyy1n96"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; };
-  ITALICSData = derive2 { name="ITALICSData"; version="2.8.0"; sha256="042axcyf4g5m5b7yl97x36n69jr3rhir3bxghpxw0xc6cbxq047g"; depends=[]; };
-  Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.6.0"; sha256="10a082khw646qsqalijks35x7if997181phqw66p2gg9iy2pq0w3"; depends=[]; };
-  IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.8.0"; sha256="1p6wh8y51jnz61akk5n03aklph4gh5xbkzy30mnk2gassfgd7psp"; depends=[]; };
-  Iyer517 = derive2 { name="Iyer517"; version="1.12.0"; sha256="193q80789jd4afgij6pzw86pccwfg1hyyr88yc5vmvh922g94iw0"; depends=[Biobase]; };
-  JASPAR2014 = derive2 { name="JASPAR2014"; version="1.6.0"; sha256="17xnxqbwv073qsyimhrsssc32xcsi2v3kh4s2qzy8is3snv560ff"; depends=[Biostrings]; };
-  KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.104.0"; sha256="125bhkzjva7xw5zys3ahqr0qig67yms1w37zh86bcf7x2wm88ky2"; depends=[Biobase BiocGenerics]; };
-  KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.8.0"; sha256="05hzmszj7dpyb6ahkxic7ykxvc57zvdfv844yss4m0a217mymglz"; depends=[Biobase BiocGenerics]; };
-  LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.8.0"; sha256="0884yzyn79sfbr4wbv8vjq5ivvvk21l1r273w2sqbqay41kakrkj"; depends=[IRanges KernSmooth]; };
-  ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.2.0"; sha256="12ycbz6iiq0byfvc3f3y9vfafqpskys3wycmjsiym2xscmvhqdnw"; depends=[methylPipe]; };
-  LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.6.0"; sha256="04srfy56sb015iprc4r634dkabvq44fhhl7i8j9q9llg1bl43q06"; depends=[]; };
-  LungCancerLines = derive2 { name="LungCancerLines"; version="0.8.0"; sha256="18alyl6hlcnx5qwakssfwqkl2aigjmcbrvxax3k9h1pvi3hwp2vf"; depends=[Rsamtools]; };
-  MAQCsubset = derive2 { name="MAQCsubset"; version="1.8.0"; sha256="0dz9qnnnri2zx8iy1hshyssmq4ry16194n5gbq7j7db9c56i5ymb"; depends=[affy Biobase lumi]; };
-  MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.8.0"; sha256="0kp9p51v0c3025d74gx64qpyxhgc0rrdp5li0x2jvihyjgd1wz4r"; depends=[affy Biobase]; };
-  MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.8.0"; sha256="0a9mihv039f45n6h8isc834nmckcxhailah5lqmgca6lz7hclnpf"; depends=[Biobase lumi]; };
-  MEALData = derive2 { name="MEALData"; version="1.0.0"; sha256="19k7fppx41v3lwrbm13d9wni7z1hjaxms14aap00ffwpwzs6f0z5"; depends=[]; };
-  MEDIPSData = derive2 { name="MEDIPSData"; version="1.6.0"; sha256="1jq48li4m8ha4alfhqh7aqkrd18sk4fr1qb7vrhahqhb5q7s4vg9"; depends=[]; };
-  MEEBOdata = derive2 { name="MEEBOdata"; version="1.8.0"; sha256="140p9h1f3zg5dm8nqs9hqwydlw58qzs32my2d4zmzzk6g41bj5pc"; depends=[]; };
-  MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.6.0"; sha256="111830m6mzc0dlvqpq4ixi1zrfkp66vhj9i3433kyp9mw2d7mnc4"; depends=[]; };
-  MSBdata = derive2 { name="MSBdata"; version="0.8.0"; sha256="10yngdppq6706jmvd8i00l01mva8757aavfmz8mmvcyi5cggz200"; depends=[]; };
-  MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.104.0"; sha256="00j2sgljvqpimd574k1v8apbnsb7sja79alwxq2mk26y96zh76a9"; depends=[]; };
-  MethylAidData = derive2 { name="MethylAidData"; version="1.2.0"; sha256="0qyvppw5p0akqkxk26b955gjn15rikxyvxmkwd4qrv4pbxbc1crp"; depends=[MethylAid]; };
-  Mulder2012 = derive2 { name="Mulder2012"; version="0.10.0"; sha256="1dlk8nrvpfk4byii5yssss016yz3qc8ndldgj44p97bqs4nfnjb4"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; };
-  NCIgraphData = derive2 { name="NCIgraphData"; version="1.6.0"; sha256="1mg7rw32is8zp86rgypp0m4xv9s2phhl1z7dvdcz5knmh0c15rp8"; depends=[]; };
-  NGScopyData = derive2 { name="NGScopyData"; version="0.104.0"; sha256="0wrzkqs7171jq3h9pkphz0jb8zdr3qqvz6k3xylyd13mapjabx85"; depends=[]; };
-  Neve2006 = derive2 { name="Neve2006"; version="0.8.0"; sha256="0k7xqri4z3jqaqblplijddbcmaz0j1pkmzqxk13nrw501fa8cirr"; depends=[annotate Biobase hgu133a_db]; };
-  PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.10.0"; sha256="0bgcfpyhyx4dxfn54m3h9xi15xga6ckrjfr3yjmw73fyplz2bmlh"; depends=[affy annotate Biobase gahgu133plus2_db gahgu133plus2cdf PREDA]; };
-  PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.4.0"; sha256="00jdgz26ywqff7a216snj25kdd1dw0mh8y2qjscw9rii0mwxpg52"; depends=[PWMEnrich]; };
-  PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.4.0"; sha256="06mm7vp93g9jy5jxkcn2cmn8w1dq3k97aymi24hzgynnbzx4bcw2"; depends=[PWMEnrich]; };
-  PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.4.0"; sha256="0ivzysswnmj338fb4nmriw3hnslg4s8mqcskibgs42c2vm5c9ak1"; depends=[PWMEnrich]; };
-  PathNetData = derive2 { name="PathNetData"; version="1.6.0"; sha256="1wcwbkhr4m3y3yp8p4zqyjlf6gvidzfds967bflfmf6yfgfbfmf4"; depends=[]; };
-  ProData = derive2 { name="ProData"; version="1.8.0"; sha256="1lwa3cick6v4cdmb0das24vh8jpf9c5vnw2mpsckiaqzffx32n9j"; depends=[Biobase]; };
-  QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.0.0"; sha256="1iwaing44cknnx9bhfq7qq8xcw8zdhi73p111y9f9gk00g8kwkxs"; depends=[QDNAseq]; };
-  QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.0.0"; sha256="1kzr1w4kixxdd4nnz9ipkwqisx4r7wqr657qaa81axvsw71mawmy"; depends=[QDNAseq]; };
-  RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.6.0"; sha256="1z0dbjid7fj9zixi3nyx9cjzmxhc684wsfglkd937a248s7f402f"; depends=[RIPSeeker]; };
-  RMassBankData = derive2 { name="RMassBankData"; version="1.8.0"; sha256="121dxhy7grdx0qgnyn303isrj4pvm8h6370vgd5bidz6vp4fh0h0"; depends=[]; };
-  RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.8.0"; sha256="0gdphygdpkcsxagpc2ifyqwdbr3imcym3xjqqazr2lczwpdjaffh"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; };
-  RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.8.0"; sha256="17pr4y3y6dpiqnsz5z4178jmvvdx75175kh3in4gk9q1wwsc7d4z"; depends=[]; };
-  RRBSdata = derive2 { name="RRBSdata"; version="0.104.0"; sha256="1ln5jmwfxhjsqq51c02fa2s11kh2vmqgagllknimx32r105rg8mi"; depends=[BiSeq]; };
-  RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="1.0.0"; sha256="02c9id94m6wyrfk2s6rm5kbxzr22jmjlmv2xkay9c2k0032687aw"; depends=[RTCGA]; };
-  RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="1.0.0"; sha256="14b2rlka05vp1l91g37kbpff2cc9fy43wmr90xqh0ka6rp1yh9d3"; depends=[RTCGA]; };
-  RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="1.0.0"; sha256="16zz3g71y0v2zbca9iiv3p09nd9rg8nh0184q30gk44spfd7chcd"; depends=[RTCGA]; };
-  RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.104.0"; sha256="0nagj99fd99jamyhkqif10nib5d1l1v96j73psqk07205ivpgvfv"; depends=[Biobase]; };
-  RforProteomics = derive2 { name="RforProteomics"; version="1.8.0"; sha256="1hf9m7fayq6ld6ps2jzwgfv1pxj5lzxlnaybgmfcyk90nsilbmgd"; depends=[Biobase BiocInstaller biocViews interactiveDisplay MSnbase R_utils rpx shiny]; };
-  RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.2.1"; sha256="1lk91ma5431z9j0j7p5cvkg2bvwggddjfpxy8syd981lyjmpw2f3"; depends=[GenomicRanges]; };
-  RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.2.0"; sha256="0abwn5qckc5bha73msgcf2zn4v20lbyc3c7g3ag0lj6jl6n0hrb8"; depends=[GenomicRanges]; };
-  RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.2.0"; sha256="1q9dcjqwf6n5zld1wfcy0s1qjg0fgxvvxfjvxfmlialwxc0bq3wm"; depends=[GenomicRanges]; };
-  RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.2.0"; sha256="0ycy0a270vn0q0psa4ypdj6vwhfmwa15046dmi17xhw73rh3409k"; depends=[GenomicRanges]; };
-  RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.2.0"; sha256="0zih5n5jh0fwjyswdk7m2v0dyqxclsgd1plblgzsdmg9gk0xr99q"; depends=[GenomicRanges]; };
-  RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.2.0"; sha256="0xkhdxam57zshrx3x8iyqlx15iyfnb5zjpc51fzw286xx7qkwm12"; depends=[edgeR]; };
-  RnaSeqTutorial = derive2 { name="RnaSeqTutorial"; version="0.8.0"; sha256="0xqzzrgw759kh9had1iav2ffvvdbpf83f8wvpxwb3djpikaxh8s7"; depends=[easyRNASeq]; };
-  SCLCBam = derive2 { name="SCLCBam"; version="1.2.0"; sha256="0l8bh4zlrqzhp0gfqzjsqyl24i17r7mg834dq66815ziq3qxk1i0"; depends=[]; };
-  SNAData = derive2 { name="SNAData"; version="1.16.0"; sha256="1m84i5w4kmwlfxaa4y5l1jia0k4mv5jg1amyhakyyp5vgznc8j6d"; depends=[graph]; };
-  SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.6.0"; sha256="0jbmjc6bkqzi8m6vkr9lk88497b42bqbvjcjm43im9m28y6dacnb"; depends=[]; };
-  SNPhoodData = derive2 { name="SNPhoodData"; version="1.0.0"; sha256="1b784dvqahr36953km181m5fh6cp00v9yhqf2gpadgfzbxvfz2zr"; depends=[]; };
-  SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.2.0"; sha256="025zx7s86yry6j80n08cxai8if8wghvfbkx711ilgs480vd32j1v"; depends=[]; };
-  SomatiCAData = derive2 { name="SomatiCAData"; version="1.8.0"; sha256="0knq9122zj2mb1ivv5r2i5jzrj0xr70i7yxkv176rkp7avbvxjlg"; depends=[]; };
-  SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.6.0"; sha256="0rrw0ya3hpj020wif3hhnaqprcbjyw859mn70p0ncgjrz5rwrcs9"; depends=[exomeCopy GenomicRanges IRanges stringr]; };
-  SpikeIn = derive2 { name="SpikeIn"; version="1.12.0"; sha256="157a1ckrpx6n35w8c9ipv0dnx24y76bm1vpk7mkdlbc6wblw5lwx"; depends=[affy]; };
-  SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.10.0"; sha256="0bmwlc4zg2pf4da2gzys5sjbm3fzr6piw7jmbb44zxm0hgzjvx4g"; depends=[affy Biobase]; };
-  TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.6.0"; sha256="051iwkzynlqw5kncbkr92m4qim95h1gri0dymm1dw2b6xzni9kmr"; depends=[Rsamtools xtable]; };
-  TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.6.0"; sha256="1spgsvrlw63w04197s9a6hg7vxy3q1mjwvk649bzhi7d3y6fq055"; depends=[]; };
-  TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.104.0"; sha256="067hzawwylvh92hb6gg5wj6k4rlsmvz3n4i995g8kzxzwwirh8hp"; depends=[Biobase]; };
-  TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.104.0"; sha256="0dbmf3q5602fbp8jqkny33rnhvsvylhz2b5lfh6gkrqv33bc7frk"; depends=[Biobase]; };
-  TargetScoreData = derive2 { name="TargetScoreData"; version="1.6.0"; sha256="1lrywj4q3ama0qhrbx0ij2h79gn3syln6zrfl0cbjj1qc0gs622w"; depends=[]; };
-  TargetSearchData = derive2 { name="TargetSearchData"; version="1.8.0"; sha256="1f6lkhy2ykmd625cr0yiw7x4hzs1s00cygicl9bbpfg8bq5zd600"; depends=[TargetSearch]; };
-  TimerQuant = derive2 { name="TimerQuant"; version="1.0.0"; sha256="0fqw9md30q11zvqi02paas7kmwwvg882wx678yv2928cn5ba32p6"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; };
-  WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.2.0"; sha256="0zad0d17w85pam99ib5x4a5459d3ds8rm5l8q09zsg1x5xkx387j"; depends=[]; };
-  XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.8.0"; sha256="0xbnx3093xz3ifiaj3kjl3kcnl1qgbpnii7ypz5apldf8jhji15z"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; };
-  affycompData = derive2 { name="affycompData"; version="1.8.0"; sha256="0bzbnqz0f5vbi01hv7mjc7ajdd68hql046ly7vskma0wgrmqhqxj"; depends=[affycomp Biobase]; };
-  affydata = derive2 { name="affydata"; version="1.18.0"; sha256="0vcmpy73wzhgqj6fg7qqdng3x7mi1pvdj563przsb301mviyyqyh"; depends=[affy]; };
-  airway = derive2 { name="airway"; version="0.104.0"; sha256="14wc32azs9zcxw6q639xpxyzq6r1ws6c5zbf9fvisp4cfmma8z7f"; depends=[SummarizedExperiment]; };
-  antiProfilesData = derive2 { name="antiProfilesData"; version="1.6.0"; sha256="0j7rsxkl9wpp7hbgm8jkmc16m842839x5adnlrqikz64r292ihip"; depends=[Biobase]; };
-  bcellViper = derive2 { name="bcellViper"; version="1.6.0"; sha256="027cznns57mvqphkbw3z39lywv9f3cwyrc5cc5nr8271s9cxgvzq"; depends=[Biobase]; };
-  beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.8.0"; sha256="0xsz00i1rsm770fpx705bp0lhxq789i7fyrh6nxgb3dvymm6sfnl"; depends=[beadarray Biobase]; };
-  beta7 = derive2 { name="beta7"; version="1.8.0"; sha256="1ifrpg46dmxmaxr9vzff837skqwdb6672m9w238lnml4y2rmvxxh"; depends=[marray]; };
-  bladderbatch = derive2 { name="bladderbatch"; version="1.8.0"; sha256="0r5l091dnlh17k4a75dkwjkpq0rjwl2pkp5r4wk3qf34q6dg2lin"; depends=[Biobase]; };
-  blimaTestingData = derive2 { name="blimaTestingData"; version="0.104.0"; sha256="03v192y9b07h4jlj9vjfzwpnlk7xczcqlwrpjpgand633769hanz"; depends=[]; };
-  breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.8.0"; sha256="0zn7s7bppvynnch1fbd3g1hax5y0bw80bhnqwsksm2kjj6b7p4f9"; depends=[]; };
-  breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.8.0"; sha256="14pk3gi3xn14vs49ay5rxn5mjpc033h5rln8646lljyng7i5j137"; depends=[]; };
-  breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.8.0"; sha256="0gy90309nvwhhx8hvng4rf1nmvfkgljmvr6z2xd5j2j6l3waii2d"; depends=[]; };
-  breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.8.0"; sha256="1k8l3hgnnzw3qlyb57ys81w2v9hk1rr20p0w3bcd33nrhacr2nh0"; depends=[]; };
-  breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.8.0"; sha256="0w8nmly2gcvw3y628k3ckfkv19fq8vxhf15bqw8z5qq974rp2vis"; depends=[]; };
-  breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.8.0"; sha256="0vx2bqh5asjjdy1jnk0n22adanmmb4s3hdxg8645y121mprrg2jp"; depends=[]; };
-  bronchialIL13 = derive2 { name="bronchialIL13"; version="1.8.0"; sha256="0mbjpx0w5bqbb9vc0x7zl78m6y0gkcad1abfycjlpr7yhf3i1k76"; depends=[affy]; };
-  bsseqData = derive2 { name="bsseqData"; version="0.8.0"; sha256="0rlls31yyzkisx61y0i15qgkc5ixk0xkd2ix03cv4zz1fv0iyz2x"; depends=[bsseq]; };
-  cMap2data = derive2 { name="cMap2data"; version="1.6.0"; sha256="0zwzynw8i72g2zy9kfipz3rik1n7c590bxxniwxz884fafwgn5yw"; depends=[]; };
-  cancerdata = derive2 { name="cancerdata"; version="1.8.0"; sha256="1cdiqx8f5d2af46mnad5zjaazxw2qh68h0hg4sj8p8xxjf2l1d3f"; depends=[Biobase]; };
-  ccTutorial = derive2 { name="ccTutorial"; version="1.8.0"; sha256="0lvsl9127djdrkpk5c4n570sr06yj5x24lfbhrvy4jk8qa4g1qx3"; depends=[affy Biobase Ringo topGO]; };
-  ceu1kg = derive2 { name="ceu1kg"; version="0.8.0"; sha256="1cm2myjmrn2kiwgfjpkslz0s6l8qvs8g3y0jbfckp31sd1211kkh"; depends=[Biobase GGBase GGtools]; };
-  ceu1kgv = derive2 { name="ceu1kgv"; version="0.12.0"; sha256="165qp5cfs87ds7sx525fpj5cwisl4520b911l0xxmgcvhz6gjyi5"; depends=[Biobase GGBase]; };
-  ceuhm3 = derive2 { name="ceuhm3"; version="0.8.0"; sha256="10plz831m2vynwn5x4kh93iwcwkn6x39q9qg25lvlrj8j3mqgjmg"; depends=[Biobase GGBase GGtools]; };
-  cgdv17 = derive2 { name="cgdv17"; version="0.8.0"; sha256="0wjx4072gpsv6w1x7d5q0qya0ism5xw13zl8d1m49jhszk2kns1j"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; };
-  charmData = derive2 { name="charmData"; version="1.6.0"; sha256="0qy3dcx745diza5xy6f1qipnnawqx20vp6p0piy9wvwvgalcx886"; depends=[charm pd_charm_hg18_example]; };
-  cheung2010 = derive2 { name="cheung2010"; version="0.8.0"; sha256="0qrq5k8gpsvqv5vhq67lgql69x7gqsqyfrs87ih8jir1nhgyrmzy"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; };
-  chipenrich_data = derive2 { name="chipenrich.data"; version="1.6.0"; sha256="04v1zzn7balic5hxlxdgqxpgg0pbsyg5s0ivhn232c3qbidh480g"; depends=[BiocGenerics GenomicRanges IRanges]; };
-  cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.6.0"; sha256="1ys4sxp4biqb8bgqds9y22kiiwxhbv3p32vrbj1vm9fn3isphqr8"; depends=[cnvGSA]; };
-  colonCA = derive2 { name="colonCA"; version="1.12.0"; sha256="0nf4nfjymm0vw7zdi0wpcn8kc49kfangnsfajvarpwjikff2bcsl"; depends=[Biobase]; };
-  curatedBladderData = derive2 { name="curatedBladderData"; version="1.6.0"; sha256="0rs2fslz39nyxs4v0zjldlascc0rnpzzisxhrnb913y72wlk7fad"; depends=[affy]; };
-  curatedBreastData = derive2 { name="curatedBreastData"; version="1.2.0"; sha256="01q37mlxlh0sdnb8ilsr6s5k40awgcg0n5ggj056dcna9nfvqi74"; depends=[Biobase BiocStyle ggplot2 impute XML]; };
-  curatedCRCData = derive2 { name="curatedCRCData"; version="2.2.0"; sha256="0p4jgmg3234siglzf1klzq70vgrsnxcz4w2fw16h34m7jkrhiqas"; depends=[BiocGenerics nlme]; };
-  curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.8.0"; sha256="1fdwns0srpkvzvs87zq7wq6a3a324d6l8mjxncryxdcbgjfv3fb8"; depends=[affy BiocGenerics]; };
-  davidTiling = derive2 { name="davidTiling"; version="1.10.0"; sha256="06kjzkgqigfnd44yd9czccqn8nill4v3x3dfk7kmzbz7lmmrdhx1"; depends=[Biobase GO_db tilingArray]; };
-  derfinderData = derive2 { name="derfinderData"; version="0.104.0"; sha256="0biqbxm3fcqxsmv3bkxb66cpv54iswpsjizh7i6qmilw20fcrdm6"; depends=[]; };
-  diggitdata = derive2 { name="diggitdata"; version="1.2.0"; sha256="190ppd35dg559g557kwvd0kpl900x9jvarflhxq47p9zgg35yrvf"; depends=[Biobase viper]; };
-  dressCheck = derive2 { name="dressCheck"; version="0.8.0"; sha256="03k7m4fr6ac1pfjz86sgz8ywmvxdxjxpd4rrdgix8bn88mfw9qyi"; depends=[Biobase]; };
-  dsQTL = derive2 { name="dsQTL"; version="0.8.0"; sha256="0qh73b5xbrcdmp3kszykiqiha8s40r0npsajc1h0m7xh26b81d90"; depends=[Biobase GGBase SummarizedExperiment]; };
-  dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.8.0"; sha256="0rssxjpjb7aqkkm6mg1s7df8kzbxiww9yfdljif9ph7s0svi4b5v"; depends=[GEOquery marray]; };
-  ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.10.0"; sha256="0vv5ffk08kfqahsz9ib7144hywcqmvm30rpgff18kvqz2ri4391a"; depends=[affy ecolicdf]; };
-  encoDnaseI = derive2 { name="encoDnaseI"; version="0.8.0"; sha256="1n6n5jfaqh1gr19grvxkpbs30314s524wfy6ppfqczxw00yrsvqk"; depends=[Biobase GGBase GGtools lattice]; };
-  estrogen = derive2 { name="estrogen"; version="1.16.0"; sha256="0r4gb1vnq6nk97fqkhr9x7lq6jljpkmk7q95s0hwjnyavpwwi5qm"; depends=[affy]; };
-  faahKO = derive2 { name="faahKO"; version="1.10.0"; sha256="0dkpzkdlpi757h6kkv02j74nxwz770l7jfmdz6hh6np0c27yrlqk"; depends=[xcms]; };
-  fabiaData = derive2 { name="fabiaData"; version="1.8.0"; sha256="1syxcgmvb00a4k1l3c17rsmllsp4baxpqw85gvzlkix038bdwqcg"; depends=[Biobase]; };
-  facopy_annot = derive2 { name="facopy.annot"; version="0.104.0"; sha256="139wd2w7mmrwi69h5mlf73zs3zaqr0kcjv116pd2r7b1dryla9y5"; depends=[]; };
-  facsDorit = derive2 { name="facsDorit"; version="1.12.0"; sha256="0dlbjvzalixpxcxwls6wrlzz4lrmsxs23g1yvin940al9hli612d"; depends=[prada]; };
-  ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.8.0"; sha256="19vf4q4nqk937gvn8ca4kvisyxw375xlj9g238xmlh1z33bqak7y"; depends=[lumi]; };
-  fibroEset = derive2 { name="fibroEset"; version="1.12.0"; sha256="1brnc0vigpi711yc1yq69x39sksnqd26dzip174ih66hp0if3rsm"; depends=[Biobase]; };
-  fission = derive2 { name="fission"; version="0.104.0"; sha256="0lbzl0r66q8h9x41167zhx3zdmf6wq1f7z1hxmq8inpl0ydrynnm"; depends=[SummarizedExperiment]; };
-  flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.6.0"; sha256="0ngq0khy7f7w41mj89fdrrd5lpxznnxg53x6zfgc6mx0vm1q13ak"; depends=[flowCore]; };
-  flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.6.1"; sha256="1y97xym505rpgsyi1nbsazaqwfxrkmp664pmdlfvp8a3l963bs2n"; depends=[]; };
-  frmaExampleData = derive2 { name="frmaExampleData"; version="1.6.0"; sha256="172bvi6v824j82cr2y9y5zvdgzfwk4kdw0r54jqjgvp2kw4v55bx"; depends=[]; };
-  gageData = derive2 { name="gageData"; version="2.8.0"; sha256="1h2gyn9nn8198qd99bdpf7r9f71l76yzzcagbg9z9qjhpc1nwllq"; depends=[]; };
-  gaschYHS = derive2 { name="gaschYHS"; version="1.8.0"; sha256="0097vvw6z3ryiv11jvapih2r588ix7qdizmq5g3cc1s5dqrmaf02"; depends=[Biobase]; };
-  gatingMLData = derive2 { name="gatingMLData"; version="2.10.0"; sha256="1ql5s1p4phhcc9lh3knrgnazkpxlxhvwpvxi0d978g6mjlbbprs2"; depends=[]; };
-  gcspikelite = derive2 { name="gcspikelite"; version="1.8.0"; sha256="06k158hh3pyn9fw49njar3aj71f12pgkm2yaljnvlnabgv7r0a84"; depends=[]; };
-  geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.6.0"; sha256="0zijh0s2dp1rf7z4rs8afdx18gqgsll090vclckf30jy3jy7d0ri"; depends=[GenomicFeatures rtracklayer]; };
-  genomationData = derive2 { name="genomationData"; version="1.2.0"; sha256="08p1n2gp3csw7jvlkq5h3r64ix08n7kniq508w28nc0mms3pa4vn"; depends=[]; };
-  geuvPack = derive2 { name="geuvPack"; version="1.2.0"; sha256="17wy3fkwq16kg3zcm30b06p0a6xwpjbjqrd2rz42ypw7d7danc3h"; depends=[SummarizedExperiment]; };
-  geuvStore = derive2 { name="geuvStore"; version="1.2.0"; sha256="14xm3d808mzbvjliazn2rzz9l98b44h4x4s50ass2mfr470k79fs"; depends=[BatchJobs GenomicRanges gQTLBase]; };
-  ggtut = derive2 { name="ggtut"; version="0.7.0"; sha256="0vpqzanzx3mwaz0dz29s5k9l0nly004sn3f5rjx7z8ww67ka4ii6"; depends=[cheung2010 ChIPpeakAnno ff GenomicFeatures GenomicRanges GGdata GGtools hmyriB36 Rsamtools SNPlocs_Hsapiens_dbSNP_20120608 snpStats]; };
-  golubEsets = derive2 { name="golubEsets"; version="1.12.0"; sha256="0y861yr3b9c5rxi1x9796ka9bycpkwfpj7n10ikxkqggip02044j"; depends=[Biobase]; };
-  grndata = derive2 { name="grndata"; version="1.2.0"; sha256="042cm5imcb1fzmm7cn4lyd8isq9yddrnvdmqv7gzklrpplhlcfa5"; depends=[]; };
-  gskb = derive2 { name="gskb"; version="1.2.0"; sha256="0b2vd4vn1khk4cd3pdcxwbd26srk3w3zdlk864vhgha5n9wb89kb"; depends=[]; };
-  h5vcData = derive2 { name="h5vcData"; version="1.104.0"; sha256="1jhr6gijva7498hm2mzi94ag0wx8qx16nf7l454v631px12b2hra"; depends=[]; };
-  hapmap100khind = derive2 { name="hapmap100khind"; version="1.12.0"; sha256="19g5krckkxfnk2mbvlk2agwn2n1pwx6m343nngr07lysxjdddsz3"; depends=[]; };
-  hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.12.0"; sha256="038vf5xfkn266f5w0hffdn7f8xi4h4dg2fyq1lj7b8mw3hzsbd8s"; depends=[]; };
-  hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.12.0"; sha256="1xz4l3nj60z10n0ia6vi6b1sc5crkl6my0axjrlc0qq7jzxpvyf2"; depends=[]; };
-  hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.12.0"; sha256="1qip3qzri1ihms528wff1y9ci6zq0j3czbcs7hqiyz57yxi4phxl"; depends=[]; };
-  hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.12.0"; sha256="1xb9jv4viy1q1bvcz795j25fa9ss3xrrplz3rykbnis5h87n6lbj"; depends=[]; };
-  hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.12.0"; sha256="0a3qshi8024n7bc8g9h3qivp6xzkd40xsll948jldzid49scqdmi"; depends=[]; };
-  harbChIP = derive2 { name="harbChIP"; version="1.8.0"; sha256="08kr48nvrmphj7sj9nbj0mj1hyl97pp0g7qcnr6fb8vn5lvyriag"; depends=[Biobase Biostrings IRanges]; };
-  healthyFlowData = derive2 { name="healthyFlowData"; version="1.8.0"; sha256="1wj48wagn93g7w5apl4jxii34wxd7dhiya965bkbjj6h2yhwykfd"; depends=[flowCore]; };
-  hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.8.0"; sha256="0ccrqiw4348vg3pw0pl4bi846ax7spi0bxrs44gp4bsjp7amn1s9"; depends=[]; };
-  hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.8.0"; sha256="17lrqvdmqc363jqr5chp3yp452hi5592d33hznira1ra9xjdk30c"; depends=[]; };
-  hgu2beta7 = derive2 { name="hgu2beta7"; version="1.10.0"; sha256="0ylz3l54ip7rqiwlbzfnk65hhm4v5rd9mi5g1r97n9k6gyfd692d"; depends=[]; };
-  hmyriB36 = derive2 { name="hmyriB36"; version="1.6.0"; sha256="033afw26ng2vc0fj3ipljmrq8vm0q5nbr7gh78i5vmpnkh4d5wgp"; depends=[Biobase GGBase]; };
-  humanStemCell = derive2 { name="humanStemCell"; version="0.10.0"; sha256="18fwmsf2yh4q12ca7h78lk85rcf3a3l57v0hm72yw3zjdhhakfrp"; depends=[Biobase hgu133plus2_db]; };
-  ind1KG = derive2 { name="ind1KG"; version="0.8.0"; sha256="10yiqj0c4vclblblkr0hwair1hyyrlp5z81y72vcjgv4wkfmxsbk"; depends=[chopsticks]; };
-  iontreeData = derive2 { name="iontreeData"; version="1.6.0"; sha256="1bl2f2kk930bry8ibl3234s3ijszxfm0xhcqjay771xcfhf9c14q"; depends=[]; };
-  kidpack = derive2 { name="kidpack"; version="1.12.0"; sha256="0zvdm8xyn7xwaf1qrlaizh1aqdwbicnm0l7kr554k651plcazjd1"; depends=[Biobase]; };
-  leeBamViews = derive2 { name="leeBamViews"; version="1.6.0"; sha256="16g1nz8mxr31ww39y7aicvqrhlrxwbdvcnz6cl105md43f10h7v2"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; };
-  leukemiasEset = derive2 { name="leukemiasEset"; version="1.6.0"; sha256="1jfp6j60ic07jqmmcmp2cp0ha42xk8b6jldviq5463yf232mgkg3"; depends=[Biobase]; };
-  lumiBarnes = derive2 { name="lumiBarnes"; version="1.10.0"; sha256="0r189bh6ysarqicrsi2s5v3d0wpl0y3ycpa85igsx6yq2jsv1hlz"; depends=[Biobase lumi]; };
-  lungExpression = derive2 { name="lungExpression"; version="0.8.0"; sha256="14k7xk8817vwf6vnvc2fjk4jv876s4da8d3fi84cz3hgh51rl7rz"; depends=[Biobase]; };
-  mAPKLData = derive2 { name="mAPKLData"; version="1.2.0"; sha256="03x2yzpr6xr19k7kk52x6zlpjkfjhhfly1xsvdijrma6dc0rzg8a"; depends=[]; };
-  mammaPrintData = derive2 { name="mammaPrintData"; version="1.6.0"; sha256="1xdhww79aig0a792akwh8mgzl7qagncl26kwv8fn4hw5vrjyxmyg"; depends=[]; };
-  maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.14.0"; sha256="1h50zfm49rihda3agfb4ldlaaw651k82cfjranzp27h089glskns"; depends=[]; };
-  metaMSdata = derive2 { name="metaMSdata"; version="1.6.0"; sha256="1qs5z3pbb6y04fk633vlps54gr6vlkvwl4qzgx4g7jxmlnm6w5sl"; depends=[]; };
-  miRNATarget = derive2 { name="miRNATarget"; version="1.8.0"; sha256="1ahp2w6xcpav6virrzcb11df2wc5phhqarlwq03i2s284wx27bxa"; depends=[Biobase]; };
-  miRcompData = derive2 { name="miRcompData"; version="1.0.0"; sha256="06chd7drzqnpbwnkc22mii1k3bv6dk96nl0hm1fg7hv2bc83j1sn"; depends=[]; };
-  minfiData = derive2 { name="minfiData"; version="0.12.0"; sha256="10ny2i88w87zlizla2jx1bvrnhq9f245ggxdgvi6slrlp35l2s68"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; };
-  minionSummaryData = derive2 { name="minionSummaryData"; version="1.0.0"; sha256="0zk9xfyxbdzxpz36ly1nsqrw29zmxqs71x1q3iks0p9jd60iwwrv"; depends=[]; };
-  mitoODEdata = derive2 { name="mitoODEdata"; version="1.6.0"; sha256="07dpak6jdw7mz5jjnysyg82wikjxnk8z4wngfhdfzl0wxg23pbzx"; depends=[]; };
-  mosaicsExample = derive2 { name="mosaicsExample"; version="1.6.0"; sha256="02lcjb38gf0kr2s7ydpzh1slh6d1b9vfgdk4fab2nb1k6g6nd6fm"; depends=[]; };
-  mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.8.0"; sha256="0dxdg11shs4lj4vb9ja7i9v9xsdpw63ymhzlfq46claydmxgkcyz"; depends=[]; };
-  msd16s = derive2 { name="msd16s"; version="0.104.0"; sha256="0xh438ayq6pxxwmc79z4cr9mw8ribh09b9x43jcka1nn9g6vka46"; depends=[Biobase metagenomeSeq]; };
-  msdata = derive2 { name="msdata"; version="0.8.0"; sha256="0dl7q8r2bxqx130w0d3d860svdsnjwhsxq709xk3ir4zn6kdn2qz"; depends=[]; };
-  mtbls2 = derive2 { name="mtbls2"; version="1.0.0"; sha256="0fqmzvxznik2abrh12q4ifq3yxk6nvzf1lx2mnw0cwqgndma0vcn"; depends=[]; };
-  mvoutData = derive2 { name="mvoutData"; version="1.6.0"; sha256="0whmdrlnxcm4h03gh9xm386cjir6y86k1kzdl3z50y7ydzl0zkyy"; depends=[affy Biobase lumi]; };
-  pRolocdata = derive2 { name="pRolocdata"; version="1.8.0"; sha256="0ndwz3z7jzyr6ac1b8cq6j0qfm8s28hpv42w5bsgp2vp85prqa1d"; depends=[Biobase MSnbase]; };
-  parathyroidSE = derive2 { name="parathyroidSE"; version="1.8.0"; sha256="1g80lgbla7dpd1vcvsqgmwqcp71mwnsyps6qpgmyhyq8z5jxgkmb"; depends=[SummarizedExperiment]; };
-  pasilla = derive2 { name="pasilla"; version="0.10.0"; sha256="1ydiywvw8afs5j109dnbiq6dp5inm2al8rivfgdfiqbi7w0a4iqz"; depends=[]; };
-  pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.8.0"; sha256="0x4n9hqpfgnzpbsa7arzav027n0yyglljdaflzy0z8vvypp9skri"; depends=[]; };
-  pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.6.0"; sha256="1kzl95mw08162widlycg3g1230c2dsf3cbvai1pb6sc4s1sb5m1k"; depends=[]; };
-  pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.6.0"; sha256="0h6yg6glzsncq7k72vn3l8gxihs3r3kq7420c0sqbp2pljkcycn7"; depends=[]; };
-  pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.6.0"; sha256="087fq848yyq5vl1sv5984qwbjk7navdx82gqwq4446035cv409x5"; depends=[]; };
-  pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.8.0"; sha256="08f4chypg6hkgi7idq3709zij0xpw3k2rj8gkcyld4s141nzv115"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
-  pepDat = derive2 { name="pepDat"; version="0.104.0"; sha256="146wha2frjy8b9b6nkghp7aqzrilgircglpq1k0knzndnan4k4mq"; depends=[GenomicRanges]; };
-  ppiData = derive2 { name="ppiData"; version="0.8.0"; sha256="09f14jlrbc9pqna1a5lhd9l32m4jhjgghhdczlc7kni75mzsb7ii"; depends=[AnnotationDbi graph]; };
-  prebsdata = derive2 { name="prebsdata"; version="1.6.0"; sha256="0gfff1fafp5jyyfh71l7lvddm0xbx215hac92mwlkmksi8jz3f74"; depends=[]; };
-  pumadata = derive2 { name="pumadata"; version="2.6.0"; sha256="1lw6jii68pzrbr3cgb0zsfbjflz526l3r5qrpbnavz0szjca4h5y"; depends=[affy Biobase oligo puma]; };
-  rRDPData = derive2 { name="rRDPData"; version="0.104.0"; sha256="0700xlvfkgyrdgxyq5l0dlq2p3qf51jzamp28qqhs95440cyg26l"; depends=[rRDP]; };
-  rcellminerData = derive2 { name="rcellminerData"; version="1.2.2"; sha256="1xaq03x8qxbczq0g880vdgria93s5bq2hn2nx5gz3b1qkkwb1sx9"; depends=[Biobase]; };
-  rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.8.0"; sha256="161psq421pkdd9kzfk62633sj4cql2q0wjwzivjph9cm228238mp"; depends=[]; };
-  seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.2.0"; sha256="03x8v75s6v3yyycgk6zwsh4j2mnsxndgbxmcw8q2a57q13y58bwi"; depends=[]; };
-  seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.6.0"; sha256="1avgc0qm26r18pxrdm3fp2wrqzcapind4cb88d4z4v2gmp8y04sh"; depends=[]; };
-  seqc = derive2 { name="seqc"; version="1.4.0"; sha256="0vkw4ly21jx1lqn6hhdi43mbq7idsxb4a21inwdv5fzm7vdkplb3"; depends=[]; };
-  serumStimulation = derive2 { name="serumStimulation"; version="1.6.0"; sha256="14sncdp7zb0ddifr6bcy14nxp8h9dvy3gy354i74h86yvkwdv9s8"; depends=[]; };
-  seventyGeneData = derive2 { name="seventyGeneData"; version="1.6.0"; sha256="0l9nkprrvkdi764b9l3rckd7zqv13y55m4s37ls3xp63i9yddqm9"; depends=[]; };
-  shinyMethylData = derive2 { name="shinyMethylData"; version="0.104.0"; sha256="0w8r5g3925jy6pb5dm916lns9h7qgwy2vwnl87dwa5ff17rfmj81"; depends=[]; };
-  simpIntLists = derive2 { name="simpIntLists"; version="1.6.0"; sha256="014sx5jca37jb97wblc47vspxx7iwi6vpzwrgjl22fvv7p0claj7"; depends=[]; };
-  stemHypoxia = derive2 { name="stemHypoxia"; version="1.6.0"; sha256="0b25q1wni5yfjqxmhkjddnh2301rnx692n8n4ghv4l6sbq5x2kz1"; depends=[]; };
-  stjudem = derive2 { name="stjudem"; version="1.10.0"; sha256="18k39mj374c2lfvjkvnzmm2phnisq8dxmsg0jgarzwqxc6740xak"; depends=[]; };
-  synapterdata = derive2 { name="synapterdata"; version="1.8.0"; sha256="0ivs32fv6hfna124bmc5bbj1pj9jw15qays105djwidsik0q4ml2"; depends=[synapter]; };
-  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.0.1"; sha256="0zsqqsbln5isipr186af73084bn7yq6c4z7mni4pckwh63q45w2p"; depends=[BiocGenerics]; };
-  tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.8.0"; sha256="1wbnxqmr40iy6hcpks7fafmlwzi6q1nc87494kkcsxcg698317dk"; depends=[]; };
-  tinesath1probe = derive2 { name="tinesath1probe"; version="1.8.0"; sha256="0aynz111vj0zki74c5bp3f8rvmm7in52ww9aknfszgg6gi02a382"; depends=[AnnotationDbi]; };
-  tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.8.0"; sha256="042z8g1mb5hiziqqbjngca1vi5mvgjny7fhx6q1z0nxrymg4yay9"; depends=[Biobase]; };
-  waveTilingData = derive2 { name="waveTilingData"; version="1.6.0"; sha256="0xx60f6gvcqvj6m5wqh7mjcf0skbzz5w5bchcalmhgy56l7229a1"; depends=[]; };
-  yeastCC = derive2 { name="yeastCC"; version="1.10.0"; sha256="07nhfambydc613smwajcv8qiwg0rc8zvjmyfcvi91nz49xr3cygq"; depends=[Biobase]; };
-  yeastExpData = derive2 { name="yeastExpData"; version="0.16.0"; sha256="1lzz9kp9raihi3n5p05saz549kblx9k1hy9fwvh73l91gm2lmazx"; depends=[graph]; };
-  yeastGSData = derive2 { name="yeastGSData"; version="0.8.0"; sha256="1vzfl8ykwwvjs58w5h8myrqfj67qpaf1zaf714r70pzx9zc1slpp"; depends=[]; };
-  yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.6.0"; sha256="0d3ixzas7m4xdc20996di8x48z661i213rhkd4l6hqb4hdjb6mm8"; depends=[]; };
-  yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.8.0"; sha256="1nv31zdy2br27qskz5dwxnpz2zgi0mx2fp8ddhbffrkww8zcha4m"; depends=[]; };
-  yri1kgv = derive2 { name="yri1kgv"; version="0.12.0"; sha256="07lmji9sljscwqd96bcllwc3hqzrl8mwj9z7fc6kjaam491iz09f"; depends=[Biobase GGBase]; };
-  zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.104.0"; sha256="11z6p4f8nmgjas085dvb2fnlsfb8qbbfh0jzx650sfkb2fgqqr6l"; depends=[]; };
+  ABAData = derive2 { name="ABAData"; version="1.2.2"; sha256="0wp44a5i8qdg2jnxg1fvc9i79m6zdcr0027cp4fha11l1syj6dh7"; depends=[]; };
+  ALL = derive2 { name="ALL"; version="1.14.0"; sha256="07prs6q7qahv763ldwf9msyglbs0yrxpr0l95aykvflyyzlkdj04"; depends=[Biobase]; };
+  ALLMLL = derive2 { name="ALLMLL"; version="1.12.0"; sha256="1h4747m67sc7d6hif42dv62y7ffzv92rili95ajp208i7j4451jp"; depends=[affy]; };
+  ARRmData = derive2 { name="ARRmData"; version="1.8.0"; sha256="0jkzvn9kg2laxng4gkgpx7x30zx542y1z0ywvidy8w7xa99d1c6q"; depends=[]; };
+  Affyhgu133A2Expr = derive2 { name="Affyhgu133A2Expr"; version="1.8.0"; sha256="08r8cr8gddbsl0xgbvm9vrdazzg874vkglvy3ji5y88nph9gli5x"; depends=[]; };
+  Affyhgu133Plus2Expr = derive2 { name="Affyhgu133Plus2Expr"; version="1.6.0"; sha256="0wn61kslpxp50fih4hrciig5hf0ydafabf6lzn8nlpamkr54gcw8"; depends=[]; };
+  Affyhgu133aExpr = derive2 { name="Affyhgu133aExpr"; version="1.10.0"; sha256="1qp649gli32h6xffw1sfjsfpxmm3wfn870sx6sgfnyxkyhr4fa4y"; depends=[]; };
+  AffymetrixDataTestFiles = derive2 { name="AffymetrixDataTestFiles"; version="0.10.0"; sha256="1id05rc0q2nlazc4ndjmd8blwzd1xhk06rwc2sv755v0amprn4iy"; depends=[]; };
+  Affymoe4302Expr = derive2 { name="Affymoe4302Expr"; version="1.10.0"; sha256="0pqm0v6frq0xjkdjbxgyrcipjkyp47r652gn20wc0y5kpkqs0pqq"; depends=[]; };
+  AmpAffyExample = derive2 { name="AmpAffyExample"; version="1.12.0"; sha256="04ih81msr17zwl00n36xx2l180d6q6q4cbrr2mdwr6ppfxq60g3w"; depends=[affy]; };
+  AneuFinderData = derive2 { name="AneuFinderData"; version="1.0.2"; sha256="0n28m8x6kdkgqrzx468zrssy3a5qla294xs6mqxi5ghsppdasxwh"; depends=[]; };
+  AshkenazimSonChr21 = derive2 { name="AshkenazimSonChr21"; version="1.2.2"; sha256="032f48jq7qm94g45lv1kabjc6362xfhr63dr0spsh17vhipbj06n"; depends=[]; };
+  BeadArrayUseCases = derive2 { name="BeadArrayUseCases"; version="1.10.0"; sha256="026fgqgb5b7s09zjb93qpvn9lashvcmw4dabqi80vmcslw1qynrm"; depends=[beadarray GEOquery limma]; };
+  CCl4 = derive2 { name="CCl4"; version="1.9.0"; sha256="1byiayjf1jbqj1xfarblga5523gqnivr0m14pd1flrmx4d0z22kb"; depends=[Biobase limma]; };
+  CLL = derive2 { name="CLL"; version="1.12.0"; sha256="1ni36n8cadlwybg9crnw1kq6xp7l0l8y6mwnjqlqzykxn5x16w08"; depends=[affy Biobase]; };
+  COHCAPanno = derive2 { name="COHCAPanno"; version="1.8.0"; sha256="1wi4mg9q3kg0rglkz2i630y2w8p2hk35k013iav6r7k02n9pb4xz"; depends=[]; };
+  CONFESSdata = derive2 { name="CONFESSdata"; version="1.0.0"; sha256="12q519wik54dyw2svviib04w0z5c884iiskk0v7qyhx9kydkmkfc"; depends=[]; };
+  COPDSexualDimorphism_data = derive2 { name="COPDSexualDimorphism.data"; version="1.8.0"; sha256="00zhw6iyak3z38s1xgh3mdd1kb166r0vm0s5np4xkp93pg6bcj7i"; depends=[]; };
+  COSMIC_67 = derive2 { name="COSMIC.67"; version="1.8.2"; sha256="0x09csirjgsww38r339cpcg446xx4c5nfsifvfyvzdxxdfjq42xa"; depends=[GenomicRanges SummarizedExperiment VariantAnnotation]; };
+  CRCL18 = derive2 { name="CRCL18"; version="0.106.0"; sha256="1lfhb82hkv4ylgwdzpmlsk4rk66ingp3p2zd7c43w6rawald3s2y"; depends=[Biobase]; };
+  CardinalWorkflows = derive2 { name="CardinalWorkflows"; version="1.4.0"; sha256="042456sy3bikv66i2j6zidk9s9bjgd2hl481jy2jzcjg9jqzkrvr"; depends=[Cardinal]; };
+  ChAMPdata = derive2 { name="ChAMPdata"; version="1.10.0"; sha256="1i4ifwiim97ap0n7ccyy3w0yh8bf22bm1laif0vb1y8cibj5nwnc"; depends=[BiocGenerics GenomicRanges]; };
+  ChIPXpressData = derive2 { name="ChIPXpressData"; version="1.10.0"; sha256="1v0h5k7z3hvwkf56xx42s8y1dx4bmwxcnl16q0pmfnakimvbm1bc"; depends=[bigmemory]; };
+  ChimpHumanBrainData = derive2 { name="ChimpHumanBrainData"; version="1.10.0"; sha256="0vyvzdr6iznp82njz72vw7c5amw7pgiswv7a3yv4iiz6ilcp1lb2"; depends=[affy hexbin limma qvalue statmod]; };
+  ConnectivityMap = derive2 { name="ConnectivityMap"; version="1.8.0"; sha256="1b8x7g8vzd6dmfpg5rih41bpz1srp0ykwkiz6fvwqxcic3wwjhyr"; depends=[]; };
+  CopyNumber450kData = derive2 { name="CopyNumber450kData"; version="1.8.0"; sha256="1f7g07iks077b5wis4p960kf1smwwcqv8hbwqqkix5gan5hwy09g"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; };
+  CopyhelpeR = derive2 { name="CopyhelpeR"; version="1.4.0"; sha256="1z4bcakmi84jgiz1c46g2v6yqmxdzy9n02adhfzbh8jgzh2apq5h"; depends=[]; };
+  DAPARdata = derive2 { name="DAPARdata"; version="1.0.1"; sha256="078dcj8cjj7iqjc5i6q1d7bi1frvix8f8hhmb4x20670fynda3pr"; depends=[knitr MSnbase]; };
+  DLBCL = derive2 { name="DLBCL"; version="1.12.0"; sha256="04rg3c1mh5kl0dkm3wyxv5izm6910j6zin8lw21dbgnvnf7v4fg3"; depends=[Biobase]; };
+  DMRcatedata = derive2 { name="DMRcatedata"; version="1.8.2"; sha256="0pl3wj2nvjhp84cvvh2yqdqqsa4b61wyqmihw8xg4qkh78dnizqk"; depends=[GenomicRanges]; };
+  DREAM4 = derive2 { name="DREAM4"; version="1.8.0"; sha256="1qnq24lrpwrlcn3x1f54mb6j3qpa6rjcxn1r326dabryphg2j27d"; depends=[SummarizedExperiment]; };
+  DeSousa2013 = derive2 { name="DeSousa2013"; version="1.8.0"; sha256="0x8is94i2svw9hlrhypkc0b9fa5jdpnr8vbk0iywdg8fp3a2yis0"; depends=[affy AnnotationDbi Biobase cluster ConsensusClusterPlus frma frmaTools gplots hgu133plus2_db hgu133plus2frmavecs pamr rgl ROCR siggenes survival sva]; };
+  DmelSGI = derive2 { name="DmelSGI"; version="1.4.2"; sha256="11v1f4nh2r1p29dszwgq451l5cfhppylggg578xfn0i20dmwfrry"; depends=[abind gplots igraph knitr limma rhdf5 TSP]; };
+  DonaPLLP2013 = derive2 { name="DonaPLLP2013"; version="1.10.0"; sha256="0j22cb94h0sz17jdvfcc6ifig738qkx8rhlhyps42vjinslzh317"; depends=[EBImage]; };
+  DrugVsDiseasedata = derive2 { name="DrugVsDiseasedata"; version="1.8.0"; sha256="0qzm3zlsxhh3bq98wbwar1lmrdkjigxbw249l4l6fs6rkr89fjh7"; depends=[]; };
+  DvDdata = derive2 { name="DvDdata"; version="1.8.0"; sha256="0mfgcwjqmpbi0bqy0xav8bd6w5pasx10xmz3sk5qx17iw873n6j7"; depends=[]; };
+  EGSEAdata = derive2 { name="EGSEAdata"; version="1.0.1"; sha256="12294jrirm23sch7b84ylvsxg7njw9gj5h9spjh0s3mzp0iak3ac"; depends=[]; };
+  ELMER_data = derive2 { name="ELMER.data"; version="1.2.2"; sha256="1invnncdcqxv8iz0asj9nkgxrvjannqfhgmv23w2p7hpvnhfc18h"; depends=[GenomicRanges]; };
+  EatonEtAlChIPseq = derive2 { name="EatonEtAlChIPseq"; version="0.10.0"; sha256="1i9cm0way8g856h90rcgq6xh0w3qkv4cq8ac0k7b2gpnsa342m6w"; depends=[GenomicRanges rtracklayer ShortRead]; };
+  FANTOM3and4CAGE = derive2 { name="FANTOM3and4CAGE"; version="1.8.0"; sha256="1yvk3px2dcnld9maizb9l5xd82pr7y9j652gknn20kl6d70rqz90"; depends=[]; };
+  FIs = derive2 { name="FIs"; version="1.0.0"; sha256="0fd7yfzdyr7lrixaxji14012z2kqlyx5g9236r9hi5v1fcrxgi1v"; depends=[]; };
+  Fletcher2013a = derive2 { name="Fletcher2013a"; version="1.8.0"; sha256="0yk4aqi5j94m1n2d0ablmcc5czk44nyimi5wfagyb51187hvad8s"; depends=[Biobase gplots limma VennDiagram]; };
+  Fletcher2013b = derive2 { name="Fletcher2013b"; version="1.8.0"; sha256="11lfcbbmz5yk12j5yvn4y8ylf62i98h6y3b0mkd63lyswfkzknq9"; depends=[Fletcher2013a igraph RColorBrewer RedeR RTN]; };
+  FlowSorted_Blood_450k = derive2 { name="FlowSorted.Blood.450k"; version="1.10.0"; sha256="1i3f459rd7fnkqqpdshzxkilcm3m2mivw8hva3y7gb6734gpllyy"; depends=[minfi]; };
+  FlowSorted_CordBlood_450k = derive2 { name="FlowSorted.CordBlood.450k"; version="1.0.0"; sha256="0rq9b4xdvq6v1brjvn7qhin3s8jaakc4s5va87qnnr6hh41zlj2a"; depends=[minfi]; };
+  FlowSorted_DLPFC_450k = derive2 { name="FlowSorted.DLPFC.450k"; version="1.8.0"; sha256="13qr6a95vwbx3ilkbh2pbim6yb9hmz0f3gn2bkj3a3hgm1skbh5c"; depends=[minfi]; };
+  FunciSNP_data = derive2 { name="FunciSNP.data"; version="1.8.0"; sha256="07pdy0fpprs8ri1vrg3z97zdrifrgh9js25g2imb7f84fnzcl1gj"; depends=[IRanges rtracklayer]; };
+  GGdata = derive2 { name="GGdata"; version="1.10.0"; sha256="14y0vmzhf3afz1q3ydrl2pwdn42x2j58rmyj2rbidcj1l2dqg4gd"; depends=[AnnotationDbi Biobase GGBase illuminaHumanv1_db snpStats]; };
+  GSBenchMark = derive2 { name="GSBenchMark"; version="0.106.0"; sha256="028f0xfnmq5rn8z1q12rmd4wmcg4r7vncxkjbb589d5v7d7p73b0"; depends=[]; };
+  GSE62944 = derive2 { name="GSE62944"; version="1.0.0"; sha256="1j9gh4glqw3ip442m4rp2i174l9ql9kbxd0slm7d9qgfkpggzyki"; depends=[Biobase GEOquery]; };
+  GSVAdata = derive2 { name="GSVAdata"; version="1.8.0"; sha256="17azis177nwq34pn55mvz4clq32w2qn9m9rfbd2j99y7m0gcc63h"; depends=[Biobase GSEABase hgu95a_db]; };
+  GWASdata = derive2 { name="GWASdata"; version="1.10.0"; sha256="0xl7idhril2jfas34g7nr7b6qvnglkg6q7q9xh1damk166dpb49g"; depends=[GWASTools]; };
+  GeuvadisTranscriptExpr = derive2 { name="GeuvadisTranscriptExpr"; version="1.0.2"; sha256="1rxkg8wxpkv0rlldyfa01f8fvph35gy7awpsnw58qfj92bcsmkgg"; depends=[]; };
+  HD2013SGI = derive2 { name="HD2013SGI"; version="1.12.0"; sha256="0701nvh83q3r1mkzl6ywb91zhnmwshmsnl22zb2dhikbn1j4rzbc"; depends=[EBImage geneplotter gplots limma LSD RColorBrewer splots vcd]; };
+  HEEBOdata = derive2 { name="HEEBOdata"; version="1.10.0"; sha256="1rpvpgirbwmyc3ybh2z7h6z6a0bw4jfcm60c1kamnvj44nk9f32j"; depends=[]; };
+  HIVcDNAvantWout03 = derive2 { name="HIVcDNAvantWout03"; version="1.12.0"; sha256="073sb84gy804ipsdcrljxvizxp637zi9lxzc8zimxk91l35mcrnc"; depends=[]; };
+  HSMMSingleCell = derive2 { name="HSMMSingleCell"; version="0.106.2"; sha256="1lc0q6q2601z53fyxzfjzl4yg14pl0rz8j8jqzjjvb3c29an7wbb"; depends=[]; };
+  HarmanData = derive2 { name="HarmanData"; version="1.0.2"; sha256="1yd9np9diir65cndk2n8cdfilnxycl0fhd9kzdz8fh37inrfvli2"; depends=[]; };
+  HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.106.0"; sha256="1bh9ncz49gp25nj5cy4yr577lnzh6byrcps5aic71052xqw00a3a"; depends=[]; };
+  HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.8.0"; sha256="0mmvxi6ippljm2c1h7grhlr0qacyvq63w0mnm9n2g6bjkmwzmn0w"; depends=[]; };
+  Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.8.0"; sha256="0s0ynp1mc60ikhn20phw37happbdxi1gfgkikj51z0aryrf489wd"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; };
+  IHW = derive2 { name="IHW"; version="0.99.14"; sha256="1qh81nhvqg5pfxvd6ap7rlksbqk6wb041w1ba1s36gfrjr1ff1j0"; depends=[BiocGenerics fdrtool lpsymphony slam]; };
+  IHWpaper = derive2 { name="IHWpaper"; version="1.0.2"; sha256="0whaa0gdqx5c5l8ra6yjl9dx9nkg32fs16w095djk7jn9f140211"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; };
+  ITALICSData = derive2 { name="ITALICSData"; version="2.10.0"; sha256="1l31w7fgaizdglp8khnlzzpz1gwxmhzmpgfbkpnvl7wsdkfa20pn"; depends=[]; };
+  Illumina450ProbeVariants_db = derive2 { name="Illumina450ProbeVariants.db"; version="1.8.0"; sha256="1x8c897bj5bq9ifw4pyvq36rk6sqyqinr66hhxm0gcj0grhi8kpv"; depends=[]; };
+  IlluminaDataTestFiles = derive2 { name="IlluminaDataTestFiles"; version="1.10.0"; sha256="191a6vyd35ia7dcx7x9vcgizapnpzdyhcqygw4yhsf0z3pr5iv9b"; depends=[]; };
+  Iyer517 = derive2 { name="Iyer517"; version="1.14.0"; sha256="13p736wxx77qc4dg2bxl2crf193yj5jxx9p6m5mblqbrgvnr4g5g"; depends=[Biobase]; };
+  JASPAR2014 = derive2 { name="JASPAR2014"; version="1.8.0"; sha256="1wspjfij2h0x5i2lff0j24rx9v3ivp6s9plv61zrj34sbwibwwws"; depends=[Biostrings]; };
+  JASPAR2016 = derive2 { name="JASPAR2016"; version="1.0.0"; sha256="0i29a9qa68zxgvgmfx0wyhnbangvbqr2mbdgqh65a56mnjk2ay2q"; depends=[]; };
+  JctSeqData = derive2 { name="JctSeqData"; version="1.2.2"; sha256="17ld0vwk9dqyy6a6n386mzklx05azcwcfwbxrbm07z0d7f2fc73n"; depends=[]; };
+  KEGGandMetacoreDzPathwaysGEO = derive2 { name="KEGGandMetacoreDzPathwaysGEO"; version="0.106.0"; sha256="07pffi3ajklina1w35dn1dgj522djymp07dyillxyhm21g64qcn5"; depends=[Biobase BiocGenerics]; };
+  KEGGdzPathwaysGEO = derive2 { name="KEGGdzPathwaysGEO"; version="1.10.0"; sha256="0c7gdlxnwxlcfvydq93p9zklggk3cgrspshhjzzsmavm1dk917kk"; depends=[Biobase BiocGenerics]; };
+  LiebermanAidenHiC2009 = derive2 { name="LiebermanAidenHiC2009"; version="0.10.0"; sha256="1fqhs3kmxf3hjld6hmi1grn8j0a4z3s4wxy8nhmwc36c7asmcyhk"; depends=[IRanges KernSmooth]; };
+  ListerEtAlBSseq = derive2 { name="ListerEtAlBSseq"; version="1.4.2"; sha256="0kcwicjx327lpnxq1lcmxy061r6cxfz8q2csrxp74dddkyvljmr2"; depends=[methylPipe]; };
+  LungCancerACvsSCCGEO = derive2 { name="LungCancerACvsSCCGEO"; version="1.8.0"; sha256="0fwkqyh0zhihpp2wn98b0fk23cmh9q2xvxidskia618p69vkyvn3"; depends=[]; };
+  LungCancerLines = derive2 { name="LungCancerLines"; version="0.10.0"; sha256="0svawwn2xzgsd8a9k5ml5g8yll70nwpryfsqd98azrmy5jmnpmb4"; depends=[Rsamtools]; };
+  MAQCsubset = derive2 { name="MAQCsubset"; version="1.10.0"; sha256="1spiav4m5zfzkbbig0qf6clvzi6gin690gicl6pvfvnwxw9hvc3s"; depends=[affy Biobase lumi]; };
+  MAQCsubsetAFX = derive2 { name="MAQCsubsetAFX"; version="1.10.0"; sha256="07c6by6j3cc2pvj59vsaphnaccks6asgdy7rap05b18v3cv0d85x"; depends=[affy Biobase]; };
+  MAQCsubsetILM = derive2 { name="MAQCsubsetILM"; version="1.10.0"; sha256="0z7n1pjrx2wglxpwv8h03knff5ddhcka9jxi7y14jpmjh7k9qsdc"; depends=[Biobase lumi]; };
+  MEALData = derive2 { name="MEALData"; version="1.2.0"; sha256="075b5pm1xz7xm35lcbqghlhrb1srfkbdkm3f5h24cbq3qjdlnyyf"; depends=[]; };
+  MEDIPSData = derive2 { name="MEDIPSData"; version="1.8.0"; sha256="0yvrr3h57vfxiv2g1n6hiib15i6rl5zw73lic9aaihhz8vzq3hiq"; depends=[]; };
+  MEEBOdata = derive2 { name="MEEBOdata"; version="1.10.0"; sha256="1r7cr1fn2x372d2vx9rxz5dd53zc6256ii2laq53i9g558c4368q"; depends=[]; };
+  MMDiffBamSubset = derive2 { name="MMDiffBamSubset"; version="1.8.0"; sha256="04065hwj0ncczk4gv7zq9szp79xd90mp15a60rw8vayrh07cg563"; depends=[]; };
+  MSBdata = derive2 { name="MSBdata"; version="0.10.2"; sha256="1g4ai2vrbl3dvk53acwsdqy47lh2i6d9fmghclfb8jxnh20ab34j"; depends=[]; };
+  MUGAExampleData = derive2 { name="MUGAExampleData"; version="0.106.0"; sha256="1hsky35vancvwlsqky0d5liz5kfq6fhyqkvw243gjz4rakw090mh"; depends=[]; };
+  MethylAidData = derive2 { name="MethylAidData"; version="1.4.2"; sha256="1x42fhaaazcwzbx7s47ffzcpga0dg39wyy64956fm42ygbvykzm6"; depends=[MethylAid]; };
+  Mulder2012 = derive2 { name="Mulder2012"; version="0.12.0"; sha256="141ibn42qnv0dzzhbqgarzcvcbsqz4ckf0k4fpcgms23ky1js5s1"; depends=[HTSanalyzeR igraph KEGG_db MASS org_Hs_eg_db PANR pvclust RedeR]; };
+  NCIgraphData = derive2 { name="NCIgraphData"; version="1.8.0"; sha256="0v4v0z09rh31si29sm8bwjmc3lcjpqnpsx07wyir6kqv5kils7mb"; depends=[]; };
+  NGScopyData = derive2 { name="NGScopyData"; version="0.106.0"; sha256="0a9kx8d0aqv526kk26060afl5mydj8xdkh3vv1r1v820niqgyd32"; depends=[]; };
+  Neve2006 = derive2 { name="Neve2006"; version="0.10.0"; sha256="1z3hg18my8sv8q9x0k4kpcq75fm73id1ak30zq1rqrscdvysk2wn"; depends=[annotate Biobase hgu133a_db]; };
+  PCHiCdata = derive2 { name="PCHiCdata"; version="1.0.2"; sha256="15pdm6y6gaia5yv4xg1yjmyqwhak49fzl5v9y0mb2gsn6nb2ajs0"; depends=[Chicago]; };
+  PGPC = derive2 { name="PGPC"; version="1.0.2"; sha256="0q6s3km9d8sjzhbz1yxyadcnfq3gc8aav9hgp886ri7jcm5ddh14"; depends=[ChemmineR EBImage geneplotter ggplot2 gplots imageHTS limma plyr RColorBrewer reshape2 SearchTrees splots]; };
+  PREDAsampledata = derive2 { name="PREDAsampledata"; version="0.12.0"; sha256="0q4857a0i0a77ff139j57m6i5p71hg9gz24ln97hc4zrxcp3qbh6"; depends=[affy annotate Biobase gahgu133plus2_db gahgu133plus2cdf PREDA]; };
+  PWMEnrich_Dmelanogaster_background = derive2 { name="PWMEnrich.Dmelanogaster.background"; version="4.6.0"; sha256="0has8xd86qh5042c5kx63py8b2bqsxy1xmn12gr7wv0r1wlkzylh"; depends=[PWMEnrich]; };
+  PWMEnrich_Hsapiens_background = derive2 { name="PWMEnrich.Hsapiens.background"; version="4.6.0"; sha256="1l0806ihhba3rl6ck1xrb2jqx77jsl4c2ksph5a0dc8zccsdln94"; depends=[PWMEnrich]; };
+  PWMEnrich_Mmusculus_background = derive2 { name="PWMEnrich.Mmusculus.background"; version="4.6.0"; sha256="1j55797xdw1bwy0z0md4swyn87lki5y1qcnp7mcxfdvvq4371vm4"; depends=[PWMEnrich]; };
+  PasillaTranscriptExpr = derive2 { name="PasillaTranscriptExpr"; version="1.0.2"; sha256="0h867v5vrcwaibybqf8przk4d2l286bwbc0rg1863kdq63qhxpls"; depends=[]; };
+  PathNetData = derive2 { name="PathNetData"; version="1.8.0"; sha256="0wxixfjdskcqpy6nr2bfjggjd40jlzq31y50k5x0ccbhkkf60lrv"; depends=[]; };
+  ProData = derive2 { name="ProData"; version="1.10.0"; sha256="1fkh3arikrwzllqn83x5v71b5x0nm31fy1xr2sldln1qif583mcn"; depends=[Biobase]; };
+  QDNAseq_hg19 = derive2 { name="QDNAseq.hg19"; version="1.2.0"; sha256="13d8zwgwv22nhi96yypk87m35yhf256aslxhx682awi40lacljr1"; depends=[QDNAseq]; };
+  QDNAseq_mm10 = derive2 { name="QDNAseq.mm10"; version="1.2.0"; sha256="0v5j0nfy0k0jkgd2mxc7ya0bfagcrl7ck72crz3959bh70vglvdg"; depends=[QDNAseq]; };
+  QUBICdata = derive2 { name="QUBICdata"; version="1.0.2"; sha256="1q99mhlk08x9y68pyjv9wjrdvg58qzvfsxg1alrilyh243zr2nsn"; depends=[]; };
+  RIPSeekerData = derive2 { name="RIPSeekerData"; version="1.8.0"; sha256="1i5mwj837ppmildrbsq38iqbmhgphbz18vin7qj03axxg29lkwxm"; depends=[RIPSeeker]; };
+  RMassBankData = derive2 { name="RMassBankData"; version="1.10.0"; sha256="113x5dq02krdv3i1vlziqiwvvpnwg7mmmarsysjnjad539gklfvy"; depends=[]; };
+  RNAinteractMAPK = derive2 { name="RNAinteractMAPK"; version="1.10.0"; sha256="0b3gfhm5b4s044j78lq81jj3pq7w7ycxh466xnlxilaqyw7g0ydl"; depends=[fields gdata genefilter MASS RNAinteract sparseLDA]; };
+  RNAseqData_HNRNPC_bam_chr14 = derive2 { name="RNAseqData.HNRNPC.bam.chr14"; version="0.10.0"; sha256="016wrjr539an4hygb53schaypbsivnk6asrwywhjlxb0cjwszwvy"; depends=[]; };
+  RRBSdata = derive2 { name="RRBSdata"; version="0.106.0"; sha256="08knas04hnhm54ya6nqhzv86q12gfjfynjqpy3d63s13r25pn4xk"; depends=[BiSeq]; };
+  RTCGA_CNV = derive2 { name="RTCGA.CNV"; version="1.0.2"; sha256="0yq6yig0xx0lzcqz1adb78swmy1jwb18hqp1x1xvnqf7c9jffv2a"; depends=[RTCGA]; };
+  RTCGA_PANCAN12 = derive2 { name="RTCGA.PANCAN12"; version="1.0.2"; sha256="0mkwa1w6qzp1kzjg8y0vs09vq5yy0alf5v56cg64qg83yjb2153l"; depends=[RTCGA]; };
+  RTCGA_RPPA = derive2 { name="RTCGA.RPPA"; version="1.0.2"; sha256="0h95prind9ydyc2yj9m5ay6m7jx8fi3ay42j37px3gb0l4zmb1ph"; depends=[RTCGA]; };
+  RTCGA_clinical = derive2 { name="RTCGA.clinical"; version="20151101.2.2"; sha256="0dyr95s50cgw5xczczlaiba1hbc6x4gn03bq3zffcss3kwwzrhqy"; depends=[RTCGA]; };
+  RTCGA_mRNA = derive2 { name="RTCGA.mRNA"; version="1.0.2"; sha256="031g8pllcyyn7ayd2qy3yyq3ny39snnk86r6dy44n53a7wixvaap"; depends=[RTCGA]; };
+  RTCGA_methylation = derive2 { name="RTCGA.methylation"; version="1.0.2"; sha256="1nzyl6ny4vvgpxy891icy6smwi24li67k4nwzm7vwkbxq25lkgvy"; depends=[RTCGA]; };
+  RTCGA_miRNASeq = derive2 { name="RTCGA.miRNASeq"; version="1.0.2"; sha256="16yqlr2ml4hg6kz5740nxl10jkgs4d3mvm4gj2lb8qg3mji0xw77"; depends=[RTCGA]; };
+  RTCGA_mutations = derive2 { name="RTCGA.mutations"; version="20151101.2.2"; sha256="0mdj5aqxrhpwcxp2i6m9xxp808v73b3gr59ymnfsvh8pyf6929p8"; depends=[RTCGA]; };
+  RTCGA_rnaseq = derive2 { name="RTCGA.rnaseq"; version="20151101.2.2"; sha256="1wsvyrs738qz55x41byhsqrnxp3w18qibxwmmsymkgx065rlnn7p"; depends=[RTCGA]; };
+  RUVnormalizeData = derive2 { name="RUVnormalizeData"; version="0.106.0"; sha256="065vc1dhka15zzlpl84j4y619wifn7gh31i3yjqds0bgkzj5ppz8"; depends=[Biobase]; };
+  RforProteomics = derive2 { name="RforProteomics"; version="1.10.2"; sha256="07snpj844hbr1g9ciq06s75w6pcjr4j70ssg85wr3igas1zmkz85"; depends=[Biobase BiocInstaller biocViews interactiveDisplay MSnbase R_utils rpx shiny]; };
+  RnBeads_hg19 = derive2 { name="RnBeads.hg19"; version="1.4.0"; sha256="0k3k116ncw3l8fjkilbgydpp3wwj9341f7zmm67wv3mr06s43hdl"; depends=[GenomicRanges]; };
+  RnBeads_hg38 = derive2 { name="RnBeads.hg38"; version="1.4.0"; sha256="0jmyxbdw7jj16d9p2p5kf5bc1jgdcq4w7nfca2bdsmn7q3lyq0yp"; depends=[GenomicRanges]; };
+  RnBeads_mm10 = derive2 { name="RnBeads.mm10"; version="1.4.0"; sha256="00rj7kab8n32hxbw5682xxzrwrc91hdq1068z9bcvb52z0bsiyb2"; depends=[GenomicRanges]; };
+  RnBeads_mm9 = derive2 { name="RnBeads.mm9"; version="1.4.0"; sha256="1513z6xka9gx3gmykc40p0xh33i4jbpw8j4l6h0bs6h25fsarqhc"; depends=[GenomicRanges]; };
+  RnBeads_rn5 = derive2 { name="RnBeads.rn5"; version="1.4.0"; sha256="1f16sb6mazcs184wrpwkgbz6zkbk6k79pawn7ip1rsjma9p1sgqp"; depends=[GenomicRanges]; };
+  RnaSeqSampleSizeData = derive2 { name="RnaSeqSampleSizeData"; version="1.4.2"; sha256="127hc0wkpjssmnwqj4zzlbv7glznsc5g3qfsmx4slzf983i3hdbi"; depends=[edgeR]; };
+  RnaSeqTutorial = derive2 { name="RnaSeqTutorial"; version="0.10.0"; sha256="0ci771xdjyjxidkra0lcbpnnqghbk9ycvllpxla3lw5h608wgb4m"; depends=[easyRNASeq]; };
+  SCLCBam = derive2 { name="SCLCBam"; version="1.4.0"; sha256="0jpx7m38gl38r54b0652rxvbma61gzmki28j373g3ns4f4xxf7ph"; depends=[]; };
+  SNAData = derive2 { name="SNAData"; version="1.18.0"; sha256="11bvbzxcvg5s3f9cl44cpwnb2php8qkfmlvzpw829wb6k2pk5ha9"; depends=[graph]; };
+  SNAGEEdata = derive2 { name="SNAGEEdata"; version="1.8.0"; sha256="0qy6rwsggd4cyvci9ng1l8kjpcv79hhqndvv6zpwnvh7ng9f0x5d"; depends=[]; };
+  SNPhoodData = derive2 { name="SNPhoodData"; version="1.2.2"; sha256="0r4kanaq96xppyhjy2hnss42ckn8mac9gwpyak64ywwvq30wl12m"; depends=[]; };
+  SVM2CRMdata = derive2 { name="SVM2CRMdata"; version="1.4.0"; sha256="0lwdr0zpq3m0fqwijfgnm4jky8wg5pakrlpfgdhff01i9x4dh8bb"; depends=[]; };
+  Single_mTEC_Transcriptomes = derive2 { name="Single.mTEC.Transcriptomes"; version="1.0.2"; sha256="0vpa4a43h39hl8jx465kbypird4bh2ry5dyz3pyrf483j2wlmwjd"; depends=[]; };
+  SomatiCAData = derive2 { name="SomatiCAData"; version="1.10.0"; sha256="1f2m9rdfczlsn4nvyj5m5qhy1zg08y5ajblqc4r2r6gh8y8vpqyi"; depends=[]; };
+  SomaticCancerAlterations = derive2 { name="SomaticCancerAlterations"; version="1.8.2"; sha256="0kdngwd3b9vb698rpfmbirbi6wa70p3sp41z2q92fjlvv9lmv7b4"; depends=[exomeCopy GenomicRanges IRanges S4Vectors stringr]; };
+  SpikeIn = derive2 { name="SpikeIn"; version="1.14.0"; sha256="1wrfz7sl1gdqpps54k8dy2r5444jajbkg66br6pjf78s4qh555sg"; depends=[affy]; };
+  SpikeInSubset = derive2 { name="SpikeInSubset"; version="1.12.0"; sha256="0r9cknnazvp8rl7a0aynh5lpb1lq69d3s8jz84wafj2mdddr3m46"; depends=[affy Biobase]; };
+  TBX20BamSubset = derive2 { name="TBX20BamSubset"; version="1.8.0"; sha256="1950l0fwf23p62v0sgh0mjyisa9cnf0wjplx4x368l30jxgx8ag8"; depends=[Rsamtools xtable]; };
+  TCGAMethylation450k = derive2 { name="TCGAMethylation450k"; version="1.8.0"; sha256="18hzf0sz089dpay1c4abp1wwi680gbp1cnz32rm40fgadaxv60ga"; depends=[]; };
+  TCGAcrcmRNA = derive2 { name="TCGAcrcmRNA"; version="0.106.0"; sha256="0j87h53l2by6rx0r452s3vyf1987p23zgdybgyblwhdjgiddizc0"; depends=[Biobase]; };
+  TCGAcrcmiRNA = derive2 { name="TCGAcrcmiRNA"; version="0.106.0"; sha256="1207h52ccs7rv4dpp87xmsdgyl841zxrnzg4wh55v8kcqnk08ly9"; depends=[Biobase]; };
+  TargetScoreData = derive2 { name="TargetScoreData"; version="1.8.0"; sha256="1mb3b14qa4b0cbzxlkn4c5rihp1niz98qdd3kmmj9w3q0fllymxa"; depends=[]; };
+  TargetSearchData = derive2 { name="TargetSearchData"; version="1.10.0"; sha256="1vyphhfz6lnyh19qid7m5d1j8lmwzda89bq58r5anz2dk2m7rg2s"; depends=[TargetSearch]; };
+  TimerQuant = derive2 { name="TimerQuant"; version="1.2.2"; sha256="08i0qnp7fhpg1y5xdckrwxh2mzyxrv2s44z5vs1ldr2wlx4y244p"; depends=[deSolve dplyr ggplot2 gridExtra locfit shiny]; };
+  WES_1KG_WUGSC = derive2 { name="WES.1KG.WUGSC"; version="1.4.0"; sha256="07kh15dyqhb867y93g3ymcr346l69p30sikfm30dvhq16ckrg9jm"; depends=[]; };
+  XhybCasneuf = derive2 { name="XhybCasneuf"; version="1.10.0"; sha256="08zhxkg5h1g13l3p17idzcyz34qbpr6yvvl8qzkfgnm0ipcd35dv"; depends=[affy ath1121501cdf RColorBrewer tinesath1cdf]; };
+  affycompData = derive2 { name="affycompData"; version="1.10.0"; sha256="12dmv99m7iy0wrzsk9h2j8ibby0shfxlyk02kk9312rlnyf7qb6g"; depends=[affycomp Biobase]; };
+  affydata = derive2 { name="affydata"; version="1.20.0"; sha256="1wg3kxvlzqwf40wrkz69szrcyv4fr0fml42qqfcw7qy1m3skp1hi"; depends=[affy]; };
+  airway = derive2 { name="airway"; version="0.106.2"; sha256="1yidngcxv2sma29l5k9zpjhfbawk2wb62w7ik0gbjxw9sdacpk0v"; depends=[SummarizedExperiment]; };
+  antiProfilesData = derive2 { name="antiProfilesData"; version="1.8.0"; sha256="07kccp1qhhmskpymvllz9l5a4r1ml8wzww0ik82653pibsjr5zy7"; depends=[Biobase]; };
+  bcellViper = derive2 { name="bcellViper"; version="1.8.0"; sha256="05bvnx7ji27r115ih4k00pqb2zvfg9cj6hsr03yszp7cmhdjw752"; depends=[Biobase]; };
+  beadarrayExampleData = derive2 { name="beadarrayExampleData"; version="1.10.0"; sha256="1gvq1f95yy9x8nx5hj20c884xcl6zqhsmc39pdzhmdgclfr07p6i"; depends=[beadarray Biobase]; };
+  beta7 = derive2 { name="beta7"; version="1.10.0"; sha256="1vry0dbwjvzynb9bgxr8vnpaqby6kb8am2fc230hswqmwm6yjgkq"; depends=[marray]; };
+  bladderbatch = derive2 { name="bladderbatch"; version="1.10.0"; sha256="06f8gx1gmkn520ca17z5a03j9f5f4bz00ggy51ygl9zlb7ib56si"; depends=[Biobase]; };
+  blimaTestingData = derive2 { name="blimaTestingData"; version="0.106.0"; sha256="1d9x37wdnhcx6q5qipf4y74pr8585wwlz7xdq7dmfcrghsgd23qi"; depends=[]; };
+  breastCancerMAINZ = derive2 { name="breastCancerMAINZ"; version="1.10.0"; sha256="1ry4issbkfk761sc1mjhg46hk7j5yb4kidvpgh9nnid807zyqrfp"; depends=[]; };
+  breastCancerNKI = derive2 { name="breastCancerNKI"; version="1.10.0"; sha256="1wml4q5m83ak1zagpjlbwy7fzap7dli0rnpjanyk3dqrl79pp77c"; depends=[]; };
+  breastCancerTRANSBIG = derive2 { name="breastCancerTRANSBIG"; version="1.10.0"; sha256="0iyb8dvz4l7rvaam2xnyvgmg4n5zak5w6jhzqyc1dy29hhy55rjv"; depends=[]; };
+  breastCancerUNT = derive2 { name="breastCancerUNT"; version="1.10.0"; sha256="04av31c737ggq268rc84z89hhfv3pqrxkjlbbwhrl2qmcc0hh9fl"; depends=[]; };
+  breastCancerUPP = derive2 { name="breastCancerUPP"; version="1.10.0"; sha256="1cdx855ai6qrzq49l57x9nl58jpixnpp97cmfzys8n7kb2dn963h"; depends=[]; };
+  breastCancerVDX = derive2 { name="breastCancerVDX"; version="1.10.0"; sha256="0q1ann7mhgxlyikb4nprzhy2mm6g8fgfbb2kyczi7sshrh6h4qba"; depends=[]; };
+  bronchialIL13 = derive2 { name="bronchialIL13"; version="1.10.0"; sha256="1r6p4ysr6ahwlwi0hhla6fb8cmnmgbssbqhrizqsid1f7di77n6b"; depends=[affy]; };
+  bsseqData = derive2 { name="bsseqData"; version="0.10.0"; sha256="196bbxl1p31g9kpm448642a0gx8dyng8r98gn53pxmdpp2hq5yxl"; depends=[bsseq]; };
+  cMap2data = derive2 { name="cMap2data"; version="1.8.0"; sha256="0pnym9c0pipag2kr7j6b7c3dhhhav7z508avv4aj6f4wcagb4yrp"; depends=[]; };
+  cancerdata = derive2 { name="cancerdata"; version="1.10.0"; sha256="0388634p3j33vz8dw5i2j2y3n9w9h2diw3qsnqcar4w7d97grd9v"; depends=[Biobase]; };
+  ccTutorial = derive2 { name="ccTutorial"; version="1.10.0"; sha256="04h212d5j963xm5l1hpdb901njfrfkp1qdy12ndlrph010kpk6mv"; depends=[affy Biobase Ringo topGO]; };
+  ceu1kg = derive2 { name="ceu1kg"; version="0.10.0"; sha256="05dvfjpf93cl8g1caypzk84k73z6vmam91x3rh16r1fw4i3sj2i7"; depends=[Biobase GGBase GGtools]; };
+  ceu1kgv = derive2 { name="ceu1kgv"; version="0.14.0"; sha256="0ah88kr9rc6g4n7d800dxaarpliy443zpd7innbmrm02xq4yjn6g"; depends=[Biobase GGBase]; };
+  ceuhm3 = derive2 { name="ceuhm3"; version="0.10.0"; sha256="07pzhj9b4b4zpcfg8fjlzh53yr6pzwnfv7m7cks55x47l8bpv1d8"; depends=[Biobase GGBase GGtools]; };
+  cgdv17 = derive2 { name="cgdv17"; version="0.10.0"; sha256="0rjx8jn1m9h5p982c336bza9liyv5wymgigbr7dar91y89a0pmpg"; depends=[Biobase BiocGenerics GenomicRanges IRanges S4Vectors VariantAnnotation]; };
+  charmData = derive2 { name="charmData"; version="1.8.0"; sha256="0b8ka779s0p0byjn8vxbygwbr2w11g5mflgzyi4qh4dvjh84sri7"; depends=[charm pd_charm_hg18_example]; };
+  cheung2010 = derive2 { name="cheung2010"; version="0.10.0"; sha256="1ibwajsyggi14vscb27kr3zg8vnqrswsiphv5cdsfnapna9n5r5k"; depends=[AnnotationDbi Biobase GenomicRanges GGtools hgfocus_db]; };
+  chipenrich_data = derive2 { name="chipenrich.data"; version="1.8.0"; sha256="1nq7a4kf4nybwm9k2szccn5678agfc4zy38375f44ca8b40481x9"; depends=[BiocGenerics GenomicRanges IRanges]; };
+  cnvGSAdata = derive2 { name="cnvGSAdata"; version="1.8.0"; sha256="17kfdidwvj02kcf4pvkypmx7zhyl1dafxw1j32vzvb1rm50m770b"; depends=[cnvGSA]; };
+  colonCA = derive2 { name="colonCA"; version="1.14.0"; sha256="1zsk2p0q18l2nfbjgyp7h88ci3rqavnx18vkvgzp1sd4zfc2q7m4"; depends=[Biobase]; };
+  curatedBladderData = derive2 { name="curatedBladderData"; version="1.8.0"; sha256="0dvr1qzjknjaq4wicihdzdlk2scj43bx89p5vshvnx5238pc0ya7"; depends=[affy]; };
+  curatedBreastData = derive2 { name="curatedBreastData"; version="1.4.0"; sha256="0nm87q0x7jp2xzmw4lc3q4xa77nkjyfjzx7xnj72d9q1ph79rnyd"; depends=[Biobase BiocStyle ggplot2 impute XML]; };
+  curatedCRCData = derive2 { name="curatedCRCData"; version="2.4.0"; sha256="0xw2fda03sfh9x8qdqvp0r5g06jawidjvw2139kgn3lkh000mffb"; depends=[BiocGenerics nlme]; };
+  curatedOvarianData = derive2 { name="curatedOvarianData"; version="1.10.0"; sha256="1wgf366krp6zv950giw1s5am9wi54zyvh5qkyn5ff85s6nshx7xf"; depends=[affy BiocGenerics]; };
+  davidTiling = derive2 { name="davidTiling"; version="1.12.0"; sha256="0hw2im7in8h49w41k528lwzb1jvdj1q1pvdlsf5n3h4dm8j2yccv"; depends=[Biobase GO_db tilingArray]; };
+  derfinderData = derive2 { name="derfinderData"; version="0.106.2"; sha256="0drjk0gazg071z794d6hp88rgvl1913cchrbi23gkplrfvpqdka0"; depends=[]; };
+  diffloopdata = derive2 { name="diffloopdata"; version="1.0.2"; sha256="06vc1mgyq9bzx0bkadzzmh9qjfjpwi1hz7cjnzh78afkyn6xsm25"; depends=[]; };
+  diggitdata = derive2 { name="diggitdata"; version="1.4.0"; sha256="0rjjh8p58wcpvyliixnrjys4s6r6kriinrk3h0vjr1f7ljb2zci5"; depends=[Biobase viper]; };
+  dressCheck = derive2 { name="dressCheck"; version="0.10.0"; sha256="05vsyp4xmpi3374xlama9bi720hns0c0lfl2094pn720mwlzm784"; depends=[Biobase]; };
+  dsQTL = derive2 { name="dsQTL"; version="0.10.0"; sha256="1jkg3j8gclm7c8dc2620dvy91z0j7p02nswb4v52p377g3v90pw1"; depends=[Biobase GGBase SummarizedExperiment]; };
+  dyebiasexamples = derive2 { name="dyebiasexamples"; version="1.12.0"; sha256="1iqhbzx5dggch34h87g189ldppv3axjmi60vi5cmfl0ngwh7gkyv"; depends=[GEOquery marray]; };
+  ecoliLeucine = derive2 { name="ecoliLeucine"; version="1.12.0"; sha256="1g0diwj1ihqw10rfgw2rp7vfnjrknkgmqm9l5snxcsszkqn11ipl"; depends=[affy ecolicdf]; };
+  encoDnaseI = derive2 { name="encoDnaseI"; version="0.10.0"; sha256="1ka2m4i6f6wccfrkjzcjgygxmpkf9xfyh1cykzh9zrjc3305pyjd"; depends=[Biobase GGBase GGtools lattice]; };
+  estrogen = derive2 { name="estrogen"; version="1.18.0"; sha256="0kimcb33jsanysl60dhmyhz4201f33ni8ap3wk4ikplf3s619l8j"; depends=[affy]; };
+  etec16s = derive2 { name="etec16s"; version="1.0.0"; sha256="07ngasmbqiipkxy23kdpjbi72n3mjfk4wkad52sli48s3hh2xssa"; depends=[Biobase metagenomeSeq]; };
+  faahKO = derive2 { name="faahKO"; version="1.12.0"; sha256="1sx6jdkv8i1d4lpl4kv2d3c0gk2cycs0gzykngyvz8yap911i82y"; depends=[xcms]; };
+  fabiaData = derive2 { name="fabiaData"; version="1.10.0"; sha256="0m51rnsgh4wrq69rpc1i4cn69jvab4y0ib4sr6kpdh8mqrb17n0k"; depends=[Biobase]; };
+  facopy_annot = derive2 { name="facopy.annot"; version="0.106.0"; sha256="1bfsnqlcb8lq351anaq1bc2hgzpdsavzpsh81sr7pq0kpinkn35i"; depends=[]; };
+  facsDorit = derive2 { name="facsDorit"; version="1.14.0"; sha256="0am46a770gvm0qjb0ah2gbm28yjazg2dfrdagywvyiaadj68krrk"; depends=[prada]; };
+  ffpeExampleData = derive2 { name="ffpeExampleData"; version="1.10.0"; sha256="14mfsjgqxrmcf8y9n47yix9qgbi437636978nd2gxggahhvx45z8"; depends=[lumi]; };
+  fibroEset = derive2 { name="fibroEset"; version="1.14.0"; sha256="0h6dj4ypwvxi9137mzpzsymw0dkgral0d3fvh8via8l0vkzhxq81"; depends=[Biobase]; };
+  fission = derive2 { name="fission"; version="0.106.2"; sha256="0x43py9445w5hw4z9s2br7k2lqlr988bchaw7qjll6qhm5xrbip0"; depends=[SummarizedExperiment]; };
+  flowFitExampleData = derive2 { name="flowFitExampleData"; version="1.8.0"; sha256="02dlkyl9zxqy4cns9mrgf98zspzc5ks1qajbg8vy4fnrphykbp0v"; depends=[flowCore]; };
+  flowWorkspaceData = derive2 { name="flowWorkspaceData"; version="2.8.0"; sha256="063wq1nv9f3z014qhcq8a060q5n1yxc99knh12vd1kl8blbanjvn"; depends=[]; };
+  frmaExampleData = derive2 { name="frmaExampleData"; version="1.8.0"; sha256="1mwyx3xyz82xg9ymyqsiy2iqpcfgw471pmbfd489y15rb7jdl2rh"; depends=[]; };
+  furrowSeg = derive2 { name="furrowSeg"; version="1.0.2"; sha256="0j1zvdm7g3f0m8y58izbrkmpsjxi0sx4h24qlbmglj2xhhh34b9i"; depends=[abind dplyr EBImage locfit tiff]; };
+  gageData = derive2 { name="gageData"; version="2.10.0"; sha256="17nr1kfn2r5zhwd7sj01iv7wv3rw8bj3dpfm9x4bsg2pby93i2wl"; depends=[]; };
+  gaschYHS = derive2 { name="gaschYHS"; version="1.10.0"; sha256="1aaxy1iayi10k7pj4s3jfx7dss929ll11zvps1xcbiz1wfhk9163"; depends=[Biobase]; };
+  gatingMLData = derive2 { name="gatingMLData"; version="2.12.0"; sha256="14a2kvg95zvq4ij8adqihr7ajckgzg76y3r1c7bbyd4b46h96l1x"; depends=[]; };
+  gcspikelite = derive2 { name="gcspikelite"; version="1.10.0"; sha256="139ig58xnds081q8azkkzpp1mb22xx9cz0m38lpw0xl69ny1h8mv"; depends=[]; };
+  geneLenDataBase = derive2 { name="geneLenDataBase"; version="1.8.0"; sha256="10ynnx2r8snnffhwnj620z7blfy4af8rm1il6qy4g7dgs0cx7a4l"; depends=[GenomicFeatures rtracklayer]; };
+  genomationData = derive2 { name="genomationData"; version="1.4.2"; sha256="1zl7gg144fs7zfycsmq5492sm1bqy7l527xbc2zj04schd9wsan2"; depends=[]; };
+  geuvPack = derive2 { name="geuvPack"; version="1.4.0"; sha256="1jplp7fgcjayvxzrzxxgdwdb89k5jw4xflbjb71mrai11p8za546"; depends=[SummarizedExperiment]; };
+  geuvStore = derive2 { name="geuvStore"; version="1.4.2"; sha256="0svfj6axbfyyhwx1v8dpmla9a8f31pq3psqd72zkpgqh25q7zyrn"; depends=[BatchJobs BiocGenerics GenomicRanges gQTLBase]; };
+  geuvStore2 = derive2 { name="geuvStore2"; version="1.2.2"; sha256="0dhdf2a10la9vm5vcvdxrzh50va4343h57vvc8711wbris0hqfcr"; depends=[BatchJobs GenomicRanges gQTLBase]; };
+  golubEsets = derive2 { name="golubEsets"; version="1.14.0"; sha256="1a1ccsx7jfcgpjmhrdpnysrsa3b7r807vkgsrkri11pidf79kbc2"; depends=[Biobase]; };
+  grndata = derive2 { name="grndata"; version="1.4.2"; sha256="0ivddlxc2xd6ncwignrxkp2cy81k17wav42g8m0pjb7ck6qaak6l"; depends=[]; };
+  gskb = derive2 { name="gskb"; version="1.3.0"; sha256="16yisw86zhvanigcq9zlxk3wsqdln8cwslija5s8mq68srffc3q4"; depends=[]; };
+  h5vcData = derive2 { name="h5vcData"; version="1.106.0"; sha256="00m3l1wwvff3w3nxdbk7sn22i7p2ikdr1mrd5x6f7jbihzii5zdq"; depends=[]; };
+  hapmap100khind = derive2 { name="hapmap100khind"; version="1.14.0"; sha256="1rpglhfy3q1m5l54wjir1nsyzqxpp1h1112gyvdxkxdv4jsxfmd2"; depends=[]; };
+  hapmap100kxba = derive2 { name="hapmap100kxba"; version="1.14.0"; sha256="1lq1na4v1v2pd96nn59kppiaga9w8ib85qndbv5id0q8fh11xmsf"; depends=[]; };
+  hapmap500knsp = derive2 { name="hapmap500knsp"; version="1.14.0"; sha256="1b7pyp4nqp7qkjv5zjvn8q3ha7jn8fk410y50j9vhl147jwfir98"; depends=[]; };
+  hapmap500ksty = derive2 { name="hapmap500ksty"; version="1.14.0"; sha256="1cnkvc2miv4gw3gqg0avjdi19vhrpa7b24wm9fdz7ynasi164qqa"; depends=[]; };
+  hapmapsnp5 = derive2 { name="hapmapsnp5"; version="1.14.0"; sha256="0yylk76s1n9n9yj04726pzs9fx10gng146s4zpbpb2qk14kj0zfr"; depends=[]; };
+  hapmapsnp6 = derive2 { name="hapmapsnp6"; version="1.14.0"; sha256="0d06wzcrawssamh48ncvys1v0r1iqfg88vf8nx9hbjlyi8a8lw33"; depends=[]; };
+  harbChIP = derive2 { name="harbChIP"; version="1.10.0"; sha256="0rpbv423fp7scgkdws6s467a97mv2g4ami3zx0x8p5786ywiv42y"; depends=[Biobase Biostrings IRanges]; };
+  healthyFlowData = derive2 { name="healthyFlowData"; version="1.10.0"; sha256="1hmpvgapf75wiwvc4c68k1wglhg04zka51m3fyzsbqqg23g8a8zv"; depends=[flowCore]; };
+  hgu133abarcodevecs = derive2 { name="hgu133abarcodevecs"; version="1.10.0"; sha256="1zckhwi7wjns9plp3r7w5v0lv3syydlf0akzgarl5fz28nbjxy42"; depends=[]; };
+  hgu133plus2barcodevecs = derive2 { name="hgu133plus2barcodevecs"; version="1.10.0"; sha256="02kacr0qkvvh6bx69pmkp6n1y1q6jvizf8dqcdp72bxzav9m2pgc"; depends=[]; };
+  hgu2beta7 = derive2 { name="hgu2beta7"; version="1.12.0"; sha256="056p5lmqmady3yaif7flvd266i3a6b1z8vycjfq44zxd4dccdm8m"; depends=[]; };
+  hmyriB36 = derive2 { name="hmyriB36"; version="1.8.0"; sha256="1v1gbfg9sqpxlkk4qjrdh09yggqcq0xl32f845iiaxfizsj3xlh0"; depends=[Biobase GGBase]; };
+  humanStemCell = derive2 { name="humanStemCell"; version="0.12.0"; sha256="1l2q09i3pl49dp2wksmj8dh81lvly09ldm8ixzz89wz5f39d2bff"; depends=[Biobase hgu133plus2_db]; };
+  ind1KG = derive2 { name="ind1KG"; version="0.9.0"; sha256="02f25djy7zxh7d88v00jhpr1f5wa2ijskg5w9i90r2llwssjxx97"; depends=[chopsticks]; };
+  iontreeData = derive2 { name="iontreeData"; version="1.8.0"; sha256="1xmbs8vicz7p01bk4xh8lvgdflzhybwfblpx8pdsvbkv5vz3rhkb"; depends=[]; };
+  kidpack = derive2 { name="kidpack"; version="1.14.0"; sha256="0lxbi4sn4g68s23kcyaxpxdi6dpz7w3cz7i5n6x9ywa12mbnxzgs"; depends=[Biobase]; };
+  leeBamViews = derive2 { name="leeBamViews"; version="1.8.0"; sha256="0bkah146rpvw1kh1r9j8rqjwh07bv5vhy3pc8gca4ssvn1l77js4"; depends=[Biobase BSgenome GenomicAlignments GenomicRanges Rsamtools]; };
+  leukemiasEset = derive2 { name="leukemiasEset"; version="1.8.0"; sha256="1kvbk2j385c9jajdvgbpaq0rv8p9nid76fvjpkk2a4babbvbk5f0"; depends=[Biobase]; };
+  lumiBarnes = derive2 { name="lumiBarnes"; version="1.12.0"; sha256="07vbrzyd3ihc2b3s5rs538pbq3gm1mqm2xywclx2agm4n318dbbi"; depends=[Biobase lumi]; };
+  lungExpression = derive2 { name="lungExpression"; version="0.10.0"; sha256="1nhph1ljbj0z22rh9c0dcljrddgnydhhghpah9fp8qv0hbjlzl1x"; depends=[Biobase]; };
+  mAPKLData = derive2 { name="mAPKLData"; version="1.4.2"; sha256="0qn6j547i2d3rndpxb0rwvk9q5i0qkc3nm4gmmpipd34hz9g7yh1"; depends=[]; };
+  mammaPrintData = derive2 { name="mammaPrintData"; version="1.8.0"; sha256="1ybc3zrylvwlbzyl5nrzgsfrzfqx5yqhair3x5sansdhrsmc383d"; depends=[]; };
+  maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.16.0"; sha256="12v51x33dmj591yhnrgbpvp1v55gkkwmi1r12niprkkzdy5q3jn6"; depends=[]; };
+  metaMSdata = derive2 { name="metaMSdata"; version="1.8.0"; sha256="0d79080kmna8zckadbgjgfc4hyxnqsb6pirhjyf015z3qq3w7h3l"; depends=[]; };
+  miRNATarget = derive2 { name="miRNATarget"; version="1.10.0"; sha256="0hycvsh3m96aqr888vq14y38r9dj1gdn3nhmvl77rsn19bn7lryp"; depends=[Biobase]; };
+  miRcompData = derive2 { name="miRcompData"; version="1.2.0"; sha256="1zl65i127p04vlbx9wy7jmrvbdh679j8sz7qxlvmcbsmbxx43dm2"; depends=[]; };
+  minfiData = derive2 { name="minfiData"; version="0.14.0"; sha256="0w4gwk70ka6kic7dy7qfsb9nd791mf5gwr35x3cw7jqi6gdlh29q"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest minfi]; };
+  minionSummaryData = derive2 { name="minionSummaryData"; version="1.2.2"; sha256="0j0jygm9nnw6zjh99l21yncddnqp93pfjsikjv80vlap8bhdndcy"; depends=[]; };
+  mitoODEdata = derive2 { name="mitoODEdata"; version="1.8.0"; sha256="1ffjvsw4rj76fa39r51fvhh7xx12zsjxww9p5spg5b8alxd40f6h"; depends=[]; };
+  mosaicsExample = derive2 { name="mosaicsExample"; version="1.10.0"; sha256="1r99ig2w8006zzmckcwl9b1831qya1a33z3k1vw88nwakjib5had"; depends=[]; };
+  mouse4302barcodevecs = derive2 { name="mouse4302barcodevecs"; version="1.10.0"; sha256="0c8zzbqd4d70fw6xfmnmcs8wfxffy4q5jdibbv58wxyszvvs2215"; depends=[]; };
+  msd16s = derive2 { name="msd16s"; version="0.106.0"; sha256="0mii809mrh4h8whas47x32xn5xbslirhf28bi641k7c4yfay4bha"; depends=[Biobase metagenomeSeq]; };
+  msdata = derive2 { name="msdata"; version="0.10.0"; sha256="1m8mg19qqv5pmqchjgqk6vbljimg6iw8caz44vj6095pxzjs78cl"; depends=[]; };
+  msqc1 = derive2 { name="msqc1"; version="1.0.2"; sha256="1s27aasqy93iscdqla7jdfg12i8fwwq4gb30pnv8g9amrx3ag7a7"; depends=[lattice]; };
+  mtbls2 = derive2 { name="mtbls2"; version="1.2.2"; sha256="12l6f7k48ga1kq51svjgz1xw888bpqigm2ry774yv22pi01kq038"; depends=[]; };
+  mvoutData = derive2 { name="mvoutData"; version="1.8.0"; sha256="1d6kj8fjh401z0bbqbyy7r509aim63srh0xihhnf8k0v4hnxb2y4"; depends=[affy Biobase lumi]; };
+  pRolocdata = derive2 { name="pRolocdata"; version="1.10.0"; sha256="1v0chfpji5pjaq5pfca6d80nqq4rzfm4078i9jmcwzlbsdkpwh63"; depends=[Biobase MSnbase]; };
+  parathyroidSE = derive2 { name="parathyroidSE"; version="1.10.0"; sha256="1ynmw06cj2jy61vy6pfjxx2yfmbqh5ks449zg2an02algc7cmhk6"; depends=[SummarizedExperiment]; };
+  pasilla = derive2 { name="pasilla"; version="0.12.0"; sha256="128bq3gk8af8c6lyxbzisyqmal0s1vd73rzsf0w1cj46riwb81ya"; depends=[]; };
+  pasillaBamSubset = derive2 { name="pasillaBamSubset"; version="0.10.0"; sha256="071zjb0w6fqwaijkkj6g56wbf7xq2d1a7am4lzmfx1s4rrqlpxk3"; depends=[]; };
+  pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.8.1"; sha256="1q1wq5zff2qcqw5i86rrdvlf2y7n87xlcpf6grrahnh3dc8nf42z"; depends=[]; };
+  pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.8.1"; sha256="1ln4nnb92wvg84m3haczc390c7d1xm7qbiklvv1yp5f7saqglix9"; depends=[]; };
+  pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.8.1"; sha256="1d9sv8m4yi15zyjb3j3iva2530nzfwfb180qqm0v9zj3xqxfarnv"; depends=[]; };
+  pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.10.0"; sha256="11gj7mxx5k28ymdsf13132xy1bwablhp98wk5rx32833gx2cfafc"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
+  pepDat = derive2 { name="pepDat"; version="0.106.2"; sha256="0gipg8j40966wvqyk77xldfqlcs891g1m47vym63s878lzz87ifm"; depends=[GenomicRanges]; };
+  ppiData = derive2 { name="ppiData"; version="0.10.0"; sha256="1v6cgbdlp6dhb4vajp8ck7gpz2hbdzs8qc621xmiyslv7v03w5p8"; depends=[AnnotationDbi graph]; };
+  prebsdata = derive2 { name="prebsdata"; version="1.8.0"; sha256="1cx3f99z886c7z83w35pvcw98lq2zkw27qrd4mgsi95qh1z8yz5w"; depends=[]; };
+  prostateCancerCamcap = derive2 { name="prostateCancerCamcap"; version="1.0.0"; sha256="1d91m8mgq70s26lh3q9jdsa0fgv3p84wvbrvz2vd8r5z5vpph8jv"; depends=[Biobase]; };
+  prostateCancerGrasso = derive2 { name="prostateCancerGrasso"; version="1.0.0"; sha256="0kiy78nyk420055m81zdiv5m9iwrw1s7bpn4mwdkjfd45klzv9vh"; depends=[Biobase]; };
+  prostateCancerStockholm = derive2 { name="prostateCancerStockholm"; version="1.0.0"; sha256="13vcfyrl3958wkra6mp2w18q1d3yjcgb0ml8xasqnbicwiv3193y"; depends=[Biobase]; };
+  prostateCancerTaylor = derive2 { name="prostateCancerTaylor"; version="1.0.0"; sha256="0q0n2blq1d7x20d08621gvcc2s96n0a1h0nwl7lcdb3alk0a3vmd"; depends=[Biobase]; };
+  prostateCancerVarambally = derive2 { name="prostateCancerVarambally"; version="1.0.0"; sha256="0a94q06vfwmkq687gc4y3h974psq18f9rrpphldv7sscgx7dfniq"; depends=[Biobase]; };
+  pumadata = derive2 { name="pumadata"; version="2.8.0"; sha256="1gkfchlr4s8rlfqi6cc3l1n7ppzihlifc7jqvk15vhz6lsrsv0sx"; depends=[affy Biobase oligo puma]; };
+  rRDPData = derive2 { name="rRDPData"; version="0.106.0"; sha256="0pbn1aklw2x8yagj65436601drd81fklsgc7kwg8wrr519nb8mjq"; depends=[rRDP]; };
+  rcellminerData = derive2 { name="rcellminerData"; version="1.4.2"; sha256="1bsh3i6cfyvg6drl7jz3k53g3bqcr6iz3gc5wb9kcbnvfxa6rzg5"; depends=[Biobase]; };
+  rheumaticConditionWOLLBOLD = derive2 { name="rheumaticConditionWOLLBOLD"; version="1.10.0"; sha256="1c77rz7bir6rfsmry7f6bn4pzaqpwy178v8hkbkf9l6jskf29yy2"; depends=[]; };
+  seq2pathway_data = derive2 { name="seq2pathway.data"; version="1.4.0"; sha256="0ysc83rcciq8isb834wfvz3iwvwa7xky28b4nvyhskblgb7d0ahp"; depends=[]; };
+  seqCNA_annot = derive2 { name="seqCNA.annot"; version="1.8.0"; sha256="08d9by2grfpyl6xc137hax10nk8mjdpakg49richcr3g0yql719a"; depends=[]; };
+  seqc = derive2 { name="seqc"; version="1.6.0"; sha256="1715vwd5y4pbll271ka0vszj7b4sb0z6xpv2vpkqilw71axwsj7n"; depends=[]; };
+  serumStimulation = derive2 { name="serumStimulation"; version="1.8.1"; sha256="0h34yqcazpzh9scp0xpyil33fr10zx67slpn3c3m3vvi8g9aw2n1"; depends=[]; };
+  seventyGeneData = derive2 { name="seventyGeneData"; version="1.8.0"; sha256="16ymh2r6g0kficrg2dnlf5hlixbzmi83vz2djxn4w7ws0bm67dfa"; depends=[]; };
+  shinyMethylData = derive2 { name="shinyMethylData"; version="0.106.0"; sha256="18r8syb5glkaj6xdwqg1yqwg6lmz4w8z72394zkx58zcirpbdvnw"; depends=[]; };
+  simpIntLists = derive2 { name="simpIntLists"; version="1.8.0"; sha256="0l52c7ps0yi7wmjbnl5hf5blm5wizgk0j9qfsz5dli7xp88fhjq5"; depends=[]; };
+  stemHypoxia = derive2 { name="stemHypoxia"; version="1.8.0"; sha256="0llcpgp325hzjjhk05l9yhmfsksr6i4sxqvik7b80jd1978wklxm"; depends=[]; };
+  stjudem = derive2 { name="stjudem"; version="1.12.0"; sha256="1fya1ma1yi5426l6m4hgisyg54y1pa7j86q5kn0dzibhijn7is4d"; depends=[]; };
+  synapterdata = derive2 { name="synapterdata"; version="1.10.0"; sha256="0pnvl1bhfxa6s94csgzbnkfgbryd8yk4x8619794cdgvbxkfy11l"; depends=[synapter]; };
+  systemPipeRdata = derive2 { name="systemPipeRdata"; version="1.2.4"; sha256="00difbsafgzxw2n7k5d5rf50sjahrxxdqv65a1vl7ij5vkv1fg6f"; depends=[BiocGenerics]; };
+  tinesath1cdf = derive2 { name="tinesath1cdf"; version="1.10.0"; sha256="1ang51lcj9vm1jx2hxm1dmgpl9gii9gkjzcvy0kik5ljkzwp5m6b"; depends=[]; };
+  tinesath1probe = derive2 { name="tinesath1probe"; version="1.10.0"; sha256="018xp85f8k1m59vf6yymba5nx1cgq2v3jg029gj2i2k63d59iwx1"; depends=[AnnotationDbi]; };
+  tofsimsData = derive2 { name="tofsimsData"; version="1.0.2"; sha256="1kkl337qpipxbq99k2s84398pdfi1mmzddvwj5g3ni95ibgppipz"; depends=[]; };
+  tweeDEseqCountData = derive2 { name="tweeDEseqCountData"; version="1.10.0"; sha256="0hcg3d55lklfkqbrbir3q9qsbb3r9nqk3g2qmipjfa1s16vdbmvj"; depends=[Biobase]; };
+  tximportData = derive2 { name="tximportData"; version="1.0.2"; sha256="1my9afgaazmh8rif298iym9hw0ld9iy18fbz78p5qxxr016j1vqz"; depends=[]; };
+  waveTilingData = derive2 { name="waveTilingData"; version="1.8.0"; sha256="0qc512xw3mpmx3dchwlpp8wsapk9jghnfgpq7f6332592r9dsr5k"; depends=[]; };
+  yeastCC = derive2 { name="yeastCC"; version="1.12.0"; sha256="0j90r5mhx44x85n42a5ljyhk5xs7mpjjckrqgc5y5rlbas3922jm"; depends=[Biobase]; };
+  yeastExpData = derive2 { name="yeastExpData"; version="0.18.0"; sha256="1cpn0jwxlpzyv3fjg72z87wfc6l3l39yzdkyyaqkwk55fqgzgg24"; depends=[graph]; };
+  yeastGSData = derive2 { name="yeastGSData"; version="0.10.0"; sha256="1dfdi86qdpcx62hpmdrkhw4qcs9nnsyn3pf8535ky9g9x9004p2m"; depends=[]; };
+  yeastNagalakshmi = derive2 { name="yeastNagalakshmi"; version="1.8.0"; sha256="15cmh17lzmbby3z028wrd90aycd64r70i9r15lffvkbp7f443q63"; depends=[]; };
+  yeastRNASeq = derive2 { name="yeastRNASeq"; version="0.10.0"; sha256="1xj2bszfyzm440nf0w4gbskh1j0lbzqdhr0c88ilppmmbfmgv9nq"; depends=[]; };
+  yri1kgv = derive2 { name="yri1kgv"; version="0.14.0"; sha256="1a0811vzim9cv3p37s6hbd4pqvzf4xnzi53w0kc5wrc8mz1634aa"; depends=[Biobase GGBase]; };
+  yriMulti = derive2 { name="yriMulti"; version="0.0.9"; sha256="0v984z7bvqzpsj0d0zw1dqi6zavv3s5mgx7p2sbm433wfk1jjs0a"; depends=[dsQTL GenomicRanges geuvPack gQTLBase Homo_sapiens SummarizedExperiment]; };
+  zebrafishRNASeq = derive2 { name="zebrafishRNASeq"; version="0.106.2"; sha256="0v3j968815jwcxpj11hml5z6a06kcgvmh8lz539c2nryixr5dj53"; depends=[]; };
 }
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 391de183df66..7d5db5a744ac 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -4,1110 +4,1217 @@
 # Rscript generate-r-packages.R bioc >new && mv new bioc-packages.nix
 
 { self, derive }:
-let derive2 = derive { rVersion = "3.2"; };
+let derive2 = derive { rVersion = "3.3"; };
 in with self; {
-  ABAEnrichment = derive2 { name="ABAEnrichment"; version="1.0.0"; sha256="0mxw5s4cfh9dhlwm485n3x7wf81hww1353ilz1zy1wvjx0dacb99"; depends=[ABAData gplots Rcpp]; };
-  ABSSeq = derive2 { name="ABSSeq"; version="1.6.1"; sha256="0cqscx7mxady04k3f4s24rbx961sj95i2wwysxkcc0a9my25sqfg"; depends=[limma locfit]; };
-  ABarray = derive2 { name="ABarray"; version="1.38.0"; sha256="15zdfwpi3hgadydxlsksr7gh7wg577qcwp47zm8mxh28mcl9l048"; depends=[Biobase multtest]; };
-  ACME = derive2 { name="ACME"; version="2.26.0"; sha256="020cfccwkpk5w8xpg3xn2pcrksda67r4yg6im2qlljqrmaijjb9k"; depends=[Biobase BiocGenerics]; };
-  ADaCGH2 = derive2 { name="ADaCGH2"; version="2.10.0"; sha256="11hhmap9f8iqcxf4n4didb6isswjqdwwdc1yfm2056mcgny16r91"; depends=[aCGH bit cluster DNAcopy ff ffbase GLAD snapCGH tilingArray waveslim]; };
-  AGDEX = derive2 { name="AGDEX"; version="1.18.0"; sha256="0hy5kl6j8hx10a03x44lqij0j7bkg4rx5lf5aicx0mrd1g59b6w1"; depends=[Biobase GSEABase]; };
-  AIMS = derive2 { name="AIMS"; version="1.2.0"; sha256="14xpa2590rkqbmq8kfm356syas117342pn1wah67mb9r45klipb9"; depends=[Biobase e1071]; };
-  ALDEx2 = derive2 { name="ALDEx2"; version="1.2.0"; sha256="0p59g70472b11ab1ggzxb7l6rg5sxmb8nk47b5z4qb1lf0a0x576"; depends=[GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  ARRmNormalization = derive2 { name="ARRmNormalization"; version="1.10.0"; sha256="11qhbvgyimfnclmn7jyl9rsvkphh854a28d29rr6fc6gvmns7y40"; depends=[ARRmData]; };
-  ASEB = derive2 { name="ASEB"; version="1.14.0"; sha256="1wr7n250gv1xmnkp5xvbvc3ccwm3ffdj63bj5ifarphb4xs16kf6"; depends=[]; };
-  ASGSCA = derive2 { name="ASGSCA"; version="1.4.0"; sha256="1xp7g1vhvk4m3z88pnnchjxk03q5vadrvzrb1p5rys6svfk4z9vp"; depends=[MASS Matrix]; };
-  ASSET = derive2 { name="ASSET"; version="1.8.0"; sha256="17pswg3babj454rr6hcnk8k3bgm9rcw2zn8yvvd1jx79bairz47p"; depends=[MASS msm rmeta]; };
-  ASSIGN = derive2 { name="ASSIGN"; version="1.6.0"; sha256="1kmm72vlxlx8nk6xd1akm9bmkmqmmazxgixjjarwp2r8drhv8447"; depends=[gplots msm Rlab]; };
-  AffyCompatible = derive2 { name="AffyCompatible"; version="1.30.0"; sha256="1qw741j4d9b7bczjz3s72a9d0dcxbh5a2raak3ggwmz72p53axfz"; depends=[Biostrings RCurl XML]; };
-  AffyExpress = derive2 { name="AffyExpress"; version="1.36.0"; sha256="186gc8c3bj070zvwyy4vz44wx1r85bbmil78b6m9kvwp6q1856d7"; depends=[affy limma]; };
-  AffyRNADegradation = derive2 { name="AffyRNADegradation"; version="1.16.0"; sha256="122v40vq7pzl1qlycv8rvsq3r9ialkvsa8qm5drybf5f4nlk6wm8"; depends=[affy]; };
-  AffyTiling = derive2 { name="AffyTiling"; version="1.28.0"; sha256="08n1w64yk1pxb9d8dpa86y3mqxrsvyq0gsfzlsqg6fz8jz497fhr"; depends=[affxparser affy preprocessCore]; };
-  AgiMicroRna = derive2 { name="AgiMicroRna"; version="2.20.0"; sha256="1pb0491rgcjfnnv4xmf73bdawiggi4872w238qlf96i9a9r0gik2"; depends=[affy affycoretools Biobase limma preprocessCore]; };
-  AllelicImbalance = derive2 { name="AllelicImbalance"; version="1.8.1"; sha256="1410sr3xfjwz7szl9w17h9n03im3wd9w1q25cnlyg4ipmp2xc89h"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges lattice Rsamtools S4Vectors seqinr SummarizedExperiment VariantAnnotation]; };
-  AnalysisPageServer = derive2 { name="AnalysisPageServer"; version="1.4.1"; sha256="0zq0h9abswvhkpgb6f966rhgj7lh02aykq88fphxfv9zzkjfxbjp"; depends=[Biobase graph log4r rjson]; };
-  AnnotationDbi = derive2 { name="AnnotationDbi"; version="1.32.3"; sha256="1v6x62hgys5827yg2xayjrd9xawbayzm6wy0q4vxh1s6yxc9bklj"; depends=[Biobase BiocGenerics DBI IRanges RSQLite S4Vectors]; };
-  AnnotationForge = derive2 { name="AnnotationForge"; version="1.12.2"; sha256="0dybwq4v6f99w5v2hg519wc3y01i1hq1jd250dkj9976y8lhx0b8"; depends=[AnnotationDbi Biobase BiocGenerics DBI org_Hs_eg_db RSQLite S4Vectors]; };
-  AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.20.0"; sha256="03rznpbsgq3pdh0id35vp8984f57ws2jpb0cww1qxglf967gy028"; depends=[AnnotationDbi]; };
-  AnnotationHub = derive2 { name="AnnotationHub"; version="2.2.5"; sha256="11vyppg8zgfdd6s7457991l7j6l7jd4p2ah1m89bg226pakfi552"; depends=[AnnotationDbi BiocGenerics BiocInstaller httr interactiveDisplayBase RSQLite S4Vectors]; };
-  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.0.2"; sha256="1d2xisxzn0cic5p5412zks5chr16g9xj159kxpkkqk1wvif6im33"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery httr IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML xml2]; };
-  ArrayExpress = derive2 { name="ArrayExpress"; version="1.30.1"; sha256="09z680q1l8fp2y389n6ik8mjymqn688j333c5fgdpmdqg1z5acx4"; depends=[Biobase limma oligo XML]; };
-  ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.20.0"; sha256="00a5h3nwwhi9phrys2gj0ba8a24iqxk09licb0jn1qzdz9mrfxmq"; 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.8.0"; sha256="0ny5x2w0n3di5wzywfngsfdxaciczs24cnbvk75mv6hf4bdwfp74"; depends=[DNAcopy foreach oligoClasses]; };
-  ArrayTools = derive2 { name="ArrayTools"; version="1.30.0"; sha256="168llqk8w1b54xy0ijg0m8mzcwggawkdr4s7abi2fv4q5007s1jv"; depends=[affy Biobase limma xtable]; };
-  AtlasRDF = derive2 { name="AtlasRDF"; version="1.6.0"; sha256="16hgw47px7ig6hrm90y5nzy3dgdfm5my58bli20aj6dhnh2yvhxd"; depends=[hash SPARQL]; };
-  BAC = derive2 { name="BAC"; version="1.30.0"; sha256="1yrw01m8fd54v352pcb7904f8wi3il83nx8ywf6m968x33y2npxn"; depends=[]; };
-  BADER = derive2 { name="BADER"; version="1.8.0"; sha256="0zw02zrxl9587qkfy6ayhqx66rqk9i80g9zgcywa69npr439qrmh"; depends=[]; };
-  BAGS = derive2 { name="BAGS"; version="2.10.0"; sha256="00absrj8rlwcfa4pv3fhmb0561b2rxmr8c7lqq8jc5sncw8bay51"; depends=[Biobase breastCancerVDX]; };
-  BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.0.0"; sha256="12r0pn3nn6q725qrrwzmmzg6x58kqr89s3b536ld11jp4081yb6c"; depends=[Rsamtools VariantAnnotation]; };
-  BCRANK = derive2 { name="BCRANK"; version="1.32.0"; sha256="14akhngl88ywirpax984vwmzg5rp57034g2kdy0sz5x283mcmav6"; depends=[Biostrings]; };
-  BEAT = derive2 { name="BEAT"; version="1.8.0"; sha256="1amk6812hy56j22mdmjxjpiak60cv59plz9j7gar3nr9g6yl3c7p"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
-  BEclear = derive2 { name="BEclear"; version="1.2.0"; sha256="1s96gdgf54ijbsy29a4ac3y1z3d8y4iyv669mjiyx2qnnylb2gm9"; depends=[Matrix snowfall]; };
-  BGmix = derive2 { name="BGmix"; version="1.30.0"; sha256="1ii0cvqpz7ai779r4hx8yimsx69ln1f7qlw7jvp3k606z52kqkp2"; depends=[KernSmooth]; };
-  BHC = derive2 { name="BHC"; version="1.22.0"; sha256="0m8w4b3ihnmvccy32nwvgzwn7k9i018ydw8iz19b6kz5r5c89q17"; depends=[]; };
-  BRAIN = derive2 { name="BRAIN"; version="1.16.0"; sha256="09f82dppd9zb3qf5y507yrnv1xsp4cgbwiz068ib0qjfaygmvb02"; depends=[Biostrings lattice PolynomF]; };
-  BSgenome = derive2 { name="BSgenome"; version="1.38.0"; sha256="130w0m6q8kkca7gyz1aqj5jjhalwvwi6rk2yvbjrnj4gpnncyrd2"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools rtracklayer S4Vectors XVector]; };
-  BUS = derive2 { name="BUS"; version="1.26.0"; sha256="0sggag0n66n25h6g2hlk194p6fxjaapqf8bwnzw18bkpbldm3hwg"; depends=[infotheo minet]; };
-  BaseSpaceR = derive2 { name="BaseSpaceR"; version="1.14.0"; sha256="0a1ksw3i7fkp84pxki5d1pnw8zryq9qapv4vxf7sgpi0q9gl1dci"; depends=[RCurl RJSONIO]; };
-  Basic4Cseq = derive2 { name="Basic4Cseq"; version="1.6.0"; sha256="0z7l5xbc23ws7jdzgx58y8nia8a588hfi785aislw7gsnki3qyry"; depends=[Biostrings BSgenome_Ecoli_NCBI_20080805 caTools GenomicAlignments GenomicRanges RCircos]; };
-  BayesPeak = derive2 { name="BayesPeak"; version="1.22.0"; sha256="1jmn8p461rmgjarf4rlhyqzrjg8xkpq56rlrk6964kqxp6jkh8bi"; depends=[IRanges]; };
-  BeadDataPackR = derive2 { name="BeadDataPackR"; version="1.22.0"; sha256="04ww55171fbv9170aknl2gbc0mqlpcvwjl9146xamxskc5hxivnh"; depends=[]; };
-  BiGGR = derive2 { name="BiGGR"; version="1.6.0"; sha256="1bhjw46mwqyz67p82ag8y4jxvkhpd7d3a8flrs7h28d8srp9jvf8"; depends=[hyperdraw hypergraph LIM rsbml stringr]; };
-  BiRewire = derive2 { name="BiRewire"; version="2.4.2"; sha256="0xzdbh0didyk4wwr1ac9n1dj1473iqgn7s3i5spj2mrvqkj6jrgm"; depends=[igraph Matrix slam tsne]; };
-  BiSeq = derive2 { name="BiSeq"; version="1.10.0"; sha256="0vl0arr6chqvyysmajga91m5as54jsnx2z5a23pa7lzgvgv5xzij"; depends=[betareg Biobase BiocGenerics Formula GenomeInfoDb GenomicRanges globaltest IRanges lokern rtracklayer S4Vectors SummarizedExperiment]; };
-  BicARE = derive2 { name="BicARE"; version="1.28.0"; sha256="1bnwnrv6bb5va2l54y1c560s7fkmknaayf0vs4pm2s4mdamy0k2k"; depends=[Biobase GSEABase multtest]; };
-  BioMVCClass = derive2 { name="BioMVCClass"; version="1.38.0"; sha256="00dzbfq1rxwpp09cg2cl7rm989jidjnvw4rmmkiq8hkqv5r1mssn"; depends=[Biobase graph MVCClass Rgraphviz]; };
-  BioNet = derive2 { name="BioNet"; version="1.30.0"; sha256="0h6s83fd2y8x1l5vibj4y154ljlbjybm91l42h0yf6gyymqci5g6"; depends=[AnnotationDbi Biobase graph igraph RBGL]; };
-  BioSeqClass = derive2 { name="BioSeqClass"; version="1.28.0"; sha256="0pv63d57hck04dpha20pzyzz7przzvi536nmgnsig5zw16lis4f2"; depends=[Biobase Biostrings class e1071 foreign ipred klaR nnet party randomForest rpart scatterplot3d tree]; };
-  Biobase = derive2 { name="Biobase"; version="2.30.0"; sha256="1qasjpq3kw8h7qw8cin3bjvv1256hqr1mm24fq3v0ymxzlb66szi"; depends=[BiocGenerics]; };
-  BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.32.0"; sha256="0wn3a01l6d62prrncmy22dx4nqsgzq3lw24ybf676ghrmjaygmyc"; depends=[Biobase]; };
-  BiocCheck = derive2 { name="BiocCheck"; version="1.6.1"; sha256="1vkhriswlk3p0xynbj2pjs9zkg9v168g3sbi0ripcbn9v93mcp89"; depends=[BiocInstaller biocViews codetools devtools graph httr knitr optparse]; };
-  BiocGenerics = derive2 { name="BiocGenerics"; version="0.16.1"; sha256="0f16ryy5f012hvksrwlmm33bcl7lw97i2jvhbnwfwl03j4w7nhc1"; depends=[]; };
-  BiocInstaller = derive2 { name="BiocInstaller"; version="1.20.1"; sha256="0lsqkx8q98rix4g7wfx78fnkzmz2mjb7m9wc9zgm69m0iyp50aad"; depends=[]; };
-  BiocParallel = derive2 { name="BiocParallel"; version="1.4.3"; sha256="1f5mndx66vampcsq0n66afg6x851crl0h3nyv2nyp9bsgzj9cdzq"; depends=[futile_logger snow]; };
-  BiocStyle = derive2 { name="BiocStyle"; version="1.8.0"; sha256="03lmw649fch64kcwyps6ry9qmjz7f0ydwhc4yzkl7d6lffgfvihc"; depends=[]; };
-  Biostrings = derive2 { name="Biostrings"; version="2.38.4"; sha256="0cjd7i4bdwabzb02gm753aji5xaihkj5ak8nb0d32cclxbj0hp33"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
-  BitSeq = derive2 { name="BitSeq"; version="1.14.0"; sha256="1q58za8jd96bk2wxy7np0b7lar3v0pk6ll833k10x1b260rvpgbp"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
-  BrainStars = derive2 { name="BrainStars"; version="1.14.0"; sha256="0r6jd6h48c15sg655079lwr9v1gl79wk8773w2q9fyfmakhj15vx"; depends=[Biobase RCurl RJSONIO]; };
-  BridgeDbR = derive2 { name="BridgeDbR"; version="1.4.0"; sha256="0qb1xiyq993hfzdgjaw982hhvnd9lwwdzq6anr2r9dbpzsini136"; depends=[RCurl rJava]; };
-  BrowserViz = derive2 { name="BrowserViz"; version="1.2.3"; sha256="009bpkns2kbg77lpxzy3jship1yvrff72kacb8zcdyg7npn64jcz"; depends=[BiocGenerics httpuv jsonlite Rcpp]; };
-  BrowserVizDemo = derive2 { name="BrowserVizDemo"; version="1.2.3"; sha256="1pj9b0nhkrc3bcs36dpm2hy9lsfp2xwnrlf99b9v6n96ijki8bg9"; depends=[BiocGenerics BrowserViz httpuv jsonlite]; };
-  BubbleTree = derive2 { name="BubbleTree"; version="2.0.1"; sha256="1qkvmddd7l1xg5459gd9w86d4k4rjm40c93k6piwzv8hrzr4mjzc"; depends=[Biobase BiocGenerics BiocStyle biovizBase dplyr GenomicRanges ggplot2 gridExtra gtable gtools IRanges limma magrittr plyr RColorBrewer rgl scales WriteXLS]; };
-  BufferedMatrix = derive2 { name="BufferedMatrix"; version="1.34.0"; sha256="0f345lsj5khgys2apjid513psx79fdpzg6vm5ndn9iw1rkgafv9f"; depends=[]; };
-  BufferedMatrixMethods = derive2 { name="BufferedMatrixMethods"; version="1.34.0"; sha256="1i8b0s0g4yk8s99iw6bli494rbg169306b8idwl4sncjyl6mzj0c"; depends=[BufferedMatrix]; };
-  CAFE = derive2 { name="CAFE"; version="1.6.0"; sha256="0mmfjb93apnn39g3jrfan4zmxz7axlc6mnv6464n44kysdxyh5a4"; depends=[affy annotate Biobase biovizBase GenomicRanges ggbio ggplot2 gridExtra IRanges]; };
-  CAGEr = derive2 { name="CAGEr"; version="1.12.0"; sha256="05hv46dqvqrw4kn9975wdbvvrk8hm07qjvx8dsdb4smaq67139kx"; depends=[beanplot BSgenome data_table GenomicRanges IRanges Rsamtools rtracklayer som VGAM]; };
-  CALIB = derive2 { name="CALIB"; version="1.36.0"; sha256="1b21f0zg4czhk4pbd3c3vbl0p4qpw0l4wg17lm1gw4b6d6ml7jsb"; depends=[limma]; };
-  CAMERA = derive2 { name="CAMERA"; version="1.26.0"; sha256="0cjm98bzg5snpgd8kjj8nmk1j851rbdlidk2dbrjv373i31nf2gj"; depends=[Biobase graph Hmisc igraph RBGL xcms]; };
-  CAnD = derive2 { name="CAnD"; version="1.2.1"; sha256="0ncpa81ac6dzkhqnr56i4nzzipsmzy44n71z6sdhpa39rgdar2a7"; depends=[ggplot2 reshape]; };
-  CFAssay = derive2 { name="CFAssay"; version="1.4.0"; sha256="09bc40dck4xihksji1nmzls7qmlrgwqn2jav95x0i0461l20x2v9"; depends=[]; };
-  CGEN = derive2 { name="CGEN"; version="3.6.2"; sha256="13p2f92sh6l7bqrigqaqpcbyk3czby82r2wdr3gmz6xfwsjxkfmc"; depends=[mvtnorm survival]; };
-  CGHbase = derive2 { name="CGHbase"; version="1.30.0"; sha256="02q2yv7mbdjq1xby5bxydd0w6vzw9nim7ac6fb0rjpcnsxng0j82"; depends=[Biobase marray]; };
-  CGHcall = derive2 { name="CGHcall"; version="2.32.0"; sha256="13f3dyska147cl2q5kn42fz3d9dm8j06cmszc4ssc0i2256cp6q0"; depends=[Biobase CGHbase DNAcopy impute snowfall]; };
-  CGHnormaliter = derive2 { name="CGHnormaliter"; version="1.24.0"; sha256="08paz9ij387b8x6bg1931q553j69ajk6i3lmj2jriqjdjii8wkv1"; depends=[Biobase CGHbase CGHcall]; };
-  CGHregions = derive2 { name="CGHregions"; version="1.28.0"; sha256="1lnd6vwfdb1f6da4701f38vq8x4pqdp5f3p0m2j8g32qfj64vsz5"; depends=[Biobase CGHbase]; };
-  CMA = derive2 { name="CMA"; version="1.28.0"; sha256="1jpjfcjhxjw3ghwr7bgkwyx7lx07v0kn1pxkhb6hs2jc7fyc8jp8"; depends=[Biobase]; };
-  CNAnorm = derive2 { name="CNAnorm"; version="1.16.0"; sha256="06i4i4qbd0k0rs8l244igr6qrnfjsk5wqsxdc9vydxmnid15i7fk"; depends=[DNAcopy]; };
-  CNEr = derive2 { name="CNEr"; version="1.6.2"; sha256="1ch2pwjimgrld501lfx213mbaz8a467m7mmd78ci9p2lhwyhl8xm"; depends=[Biostrings DBI GenomeInfoDb GenomicAlignments GenomicRanges IRanges RSQLite rtracklayer S4Vectors XVector]; };
-  CNORdt = derive2 { name="CNORdt"; version="1.12.0"; sha256="1ral42sa8ha43g3bsk3f9v9lz9962rhyjpzxa5ciq9zc1s0ymwfq"; depends=[abind CellNOptR]; };
-  CNORfeeder = derive2 { name="CNORfeeder"; version="1.10.0"; sha256="1wgndfl1r21nrwr3gdrgz7qnnwcw5x6w55c3m5fjw6ypy8npsn1b"; depends=[CellNOptR graph]; };
-  CNORfuzzy = derive2 { name="CNORfuzzy"; version="1.12.0"; sha256="0636czqfy3jyhzi8xpplzxyxi9in9qysshld6pfqbx89l0nhagvm"; depends=[CellNOptR nloptr]; };
-  CNORode = derive2 { name="CNORode"; version="1.12.0"; sha256="0q65285v4szwaq87skga9xcxixg1hbm3jw4ydv1k2g84b40611qs"; depends=[CellNOptR genalg]; };
-  CNPBayes = derive2 { name="CNPBayes"; version="1.0.0"; sha256="06jw9xi0q5slh1xghgj1js5bn1gsmpag0w84cxa7qf5ls1bw4xp6"; depends=[BiocGenerics combinat foreach GenomeInfoDb GenomicRanges gtools IRanges matrixStats oligoClasses RColorBrewer Rcpp S4Vectors]; };
-  CNTools = derive2 { name="CNTools"; version="1.26.0"; sha256="1dc57fyi0mr8y0kx17m2cnhwzn9cyc7f4fpmn1yr34ngvaj3dw66"; depends=[genefilter]; };
-  CNVPanelizer = derive2 { name="CNVPanelizer"; version="1.0.0"; sha256="0m37asnrdm7zl70j2d477lpxydnliv1d9bgb0vn0hkfrwsky5fhy"; depends=[exomeCopy foreach GenomicRanges ggplot2 IRanges NOISeq plyr Rsamtools xlsx]; };
-  CNVrd2 = derive2 { name="CNVrd2"; version="1.8.1"; sha256="0xbibar60gm0jj5si1br26vkbw6kqf82796i3p5512wqvwfsbk8j"; depends=[DNAcopy ggplot2 gridExtra IRanges rjags Rsamtools VariantAnnotation]; };
-  CNVtools = derive2 { name="CNVtools"; version="1.64.0"; sha256="1sm28sl7ghcfrgjd0d741zfy21r6vxkhj8cn510z95aa49icpd8j"; depends=[survival]; };
-  CODEX = derive2 { name="CODEX"; version="1.2.0"; sha256="006dmjcd84gnagm2gfqdxwfnrq30sc3zfvqz67wl3vpg951hpjws"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb Rsamtools]; };
-  COHCAP = derive2 { name="COHCAP"; version="1.8.0"; sha256="1lak57k8b8jcd21wajr1ivi1sml73fsvb6jbdz6nxgjbq7al1hgk"; depends=[COHCAPanno WriteXLS]; };
-  COMPASS = derive2 { name="COMPASS"; version="1.8.1"; sha256="1gqly197m0r9c8zbj7673ns94q3x7cwjdajv5aj714j63vmnv6fz"; depends=[abind clue data_table knitr plyr RColorBrewer Rcpp scales]; };
-  CORREP = derive2 { name="CORREP"; version="1.36.0"; sha256="0hjkwl2mf173mfdrziiadf5hacz6j67skizch44rxc2kfj7sbhyb"; depends=[e1071]; };
-  COSNet = derive2 { name="COSNet"; version="1.4.1"; sha256="0myckn066xjdm8kikqjcv1sarr8hdls1js4ak2hc97cl8is20a1r"; depends=[]; };
-  CRISPRseek = derive2 { name="CRISPRseek"; version="1.10.1"; sha256="1pyif3a67z9fw3q2960sbbrb5si0xrdf04hahzm6vsqzryyvizkl"; depends=[BiocGenerics BiocParallel Biostrings BSgenome data_table IRanges S4Vectors seqinr]; };
-  CRImage = derive2 { name="CRImage"; version="1.18.0"; sha256="04nk7xx870hzvdnx5763v2rr82314zv6ydwhv8gmxpp2lg23hsdy"; depends=[aCGH DNAcopy e1071 EBImage foreach MASS sgeostat]; };
-  CSAR = derive2 { name="CSAR"; version="1.22.0"; sha256="0d6adk3mq7grf8dsx822d2qf5jrdhvm551z26injic8i7v4i0s3h"; depends=[GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
-  CSSP = derive2 { name="CSSP"; version="1.8.0"; sha256="05x0agbcpns8s3vmbs7ygdny249vcahzk7sqv50nz39ap2c7i309"; depends=[]; };
-  CancerMutationAnalysis = derive2 { name="CancerMutationAnalysis"; version="1.13.0"; sha256="0c3yjscd1jlgfl869vnv37qdb0y5gicnja1why9ws95qqgmij6zl"; depends=[AnnotationDbi limma qvalue]; };
-  Cardinal = derive2 { name="Cardinal"; version="1.2.1"; sha256="1r3plzx39d85ipihsflliiczig3329frmxzyd2bwnmd3l91jf5dh"; depends=[Biobase BiocGenerics irlba lattice ProtGenerics signal sp]; };
-  Category = derive2 { name="Category"; version="2.36.0"; sha256="0z6sj43y3wqfvkjvlk7hh08h5447bm3szcmd44y8s9lbkq954rxx"; depends=[annotate AnnotationDbi Biobase BiocGenerics genefilter GO_db graph GSEABase Matrix RBGL]; };
-  CausalR = derive2 { name="CausalR"; version="1.0.1"; sha256="0z1vv5j4q9ap54w2xf923gdjdix7xd16k6lqvk5s5vapcnyy7v3r"; depends=[igraph]; };
-  CellNOptR = derive2 { name="CellNOptR"; version="1.16.0"; sha256="1fig3brrc0hv48kx7lqbbykc9m2dzwy93cy70hlwqcs7b6phxq11"; depends=[ggplot2 graph hash RBGL RCurl Rgraphviz XML]; };
-  CexoR = derive2 { name="CexoR"; version="1.8.0"; sha256="0h0q2a9k084dycxnj5lvdqs31hqqi7iza732m7kdgsazjfk5fzxg"; depends=[genomation GenomeInfoDb GenomicRanges idr IRanges RColorBrewer Rsamtools rtracklayer S4Vectors]; };
-  ChAMP = derive2 { name="ChAMP"; version="1.8.0"; sha256="079ks6ds7k2mphfw73zqldi4s6zn961qkynhnqiw6fmph9gg785z"; depends=[ChAMPdata DNAcopy GenomicRanges Illumina450ProbeVariants_db IlluminaHumanMethylation450kmanifest impute IRanges limma marray minfi plyr preprocessCore RPMM sva wateRmelon]; };
-  ChIPComp = derive2 { name="ChIPComp"; version="1.0.0"; sha256="1ayg98kvh9yqj132r2fw9cdq38na64rw6rmrpqkgfj1csv4q7wiy"; depends=[BiocGenerics BSgenome_Hsapiens_UCSC_hg19 BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicRanges IRanges limma Rsamtools rtracklayer S4Vectors]; };
-  ChIPQC = derive2 { name="ChIPQC"; version="1.6.1"; sha256="1mw17flai6gk3sp08776sdl3mlmdq5xla7ghjq2rqk89qn5grpci"; depends=[Biobase BiocGenerics BiocParallel chipseq DiffBind GenomicAlignments GenomicRanges ggplot2 gtools IRanges Nozzle_R1 reshape2 Rsamtools S4Vectors]; };
-  ChIPXpress = derive2 { name="ChIPXpress"; version="1.12.0"; sha256="0k7z1ndjl869nqc0ajl437994qrfrfj5hi92h0z5qyv3vailfgsy"; depends=[affy biganalytics bigmemory Biobase ChIPXpressData frma GEOquery]; };
-  ChIPpeakAnno = derive2 { name="ChIPpeakAnno"; version="3.4.6"; sha256="0pgy2x80y7rxbarbczrz8ijacc1pv05c8y42a47zc4yaxg14pzfj"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller biomaRt Biostrings BSgenome DBI ensembldb GenomeInfoDb GenomicFeatures GenomicRanges GO_db graph IRanges limma matrixStats multtest RBGL regioneR S4Vectors VennDiagram]; };
-  ChIPseeker = derive2 { name="ChIPseeker"; version="1.6.7"; sha256="0ffs87i1kc8ckx29rdx173fzyaiqmpw1h5rgy39dk5r6mla4xj0k"; depends=[AnnotationDbi BiocGenerics boot dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gplots gridBase gtools IRanges magrittr plotrix plyr RColorBrewer rtracklayer S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene UpSetR]; };
-  ChIPseqR = derive2 { name="ChIPseqR"; version="1.24.1"; sha256="17v7wlkf4hblp499v90fxai710fn4syx1n3dbfa1kbiyr218gdbz"; depends=[BiocGenerics Biostrings fBasics GenomicRanges HilbertVis IRanges S4Vectors ShortRead timsac]; };
-  ChIPsim = derive2 { name="ChIPsim"; version="1.24.0"; sha256="0nazrzjpc1y88d1yj1qpmkcjnds4w6921ag7m6gypp8hwzzypqnn"; depends=[Biostrings IRanges ShortRead XVector]; };
-  ChemmineOB = derive2 { name="ChemmineOB"; version="1.8.2"; sha256="02bsf78skr7mi725h0qmjixlfjq456y23cyjjmkrk6wivkjd806d"; depends=[BH BiocGenerics Rcpp zlibbioc]; };
-  ChemmineR = derive2 { name="ChemmineR"; version="2.22.3"; sha256="0s1hwvfpf90j74gwj1hbd4mm84qf5l0hz5wd3l1fd2jnavv4z8x8"; depends=[BH BiocGenerics DBI digest ggplot2 Rcpp RCurl rjson]; };
-  ChromHeatMap = derive2 { name="ChromHeatMap"; version="1.24.0"; sha256="1pjw05ig4wyh455z0xwplfl12z8mbi25k5ylwmymgm41pqy5n2a6"; depends=[annotate AnnotationDbi Biobase BiocGenerics IRanges rtracklayer]; };
-  ClassifyR = derive2 { name="ClassifyR"; version="1.4.15"; sha256="0zxvk875y05z52mp8v09wvrxfxs8qacpcll4cg9px5pyx361fbkj"; depends=[Biobase BiocParallel locfit ROCR]; };
-  Clomial = derive2 { name="Clomial"; version="1.6.0"; sha256="0x6j3qjnwh31c11gq2fqyhapc5wrd9szk9bphcgsbf7n317gbf61"; depends=[matrixStats permute]; };
-  Clonality = derive2 { name="Clonality"; version="1.18.0"; sha256="0rx3k8c55q831dhfh5dpkl3px8jj6glx6i3la80r9krx68mbp947"; depends=[DNAcopy]; };
-  CoCiteStats = derive2 { name="CoCiteStats"; version="1.42.0"; sha256="08xg3583qx0v5agsq1im5f1sna32i58mhpgvvsa0ccfnbbh9klpw"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  CoGAPS = derive2 { name="CoGAPS"; version="2.4.0"; sha256="1dl3dmhfp2sjmqnvpgpqggnzrfg1w6yf5r34al2y4yngkg8s6cds"; depends=[BH gplots RColorBrewer Rcpp]; };
-  CoRegNet = derive2 { name="CoRegNet"; version="1.6.0"; sha256="0ynizawrygpka2isldbfmnlz1zqczx2fv1kbvz1lbm9qwbpj7rn4"; depends=[arules igraph shiny]; };
-  CompGO = derive2 { name="CompGO"; version="1.6.0"; sha256="0n84z3mhg6zb3yafz0803g6cggzpbw31fn933q9bg7pybij0nf1p"; depends=[GenomicFeatures ggplot2 pathview pcaMethods RDAVIDWebService reshape2 Rgraphviz rtracklayer TxDb_Mmusculus_UCSC_mm9_knownGene]; };
-  ComplexHeatmap = derive2 { name="ComplexHeatmap"; version="1.6.0"; sha256="113l7ykgxqnrbr4rz3cpa39k3n6i67zkxindcacpv35pncmasi6c"; depends=[circlize colorspace dendextend GetoptLong GlobalOptions RColorBrewer]; };
-  ConsensusClusterPlus = derive2 { name="ConsensusClusterPlus"; version="1.24.0"; sha256="13fy6qzqnph6xlbkshz2x8n20s5fhx6agawqb1wpvpvh4gcpa6g3"; depends=[ALL Biobase cluster]; };
-  CopyNumber450k = derive2 { name="CopyNumber450k"; version="1.6.0"; sha256="0z4v6x140gzaxf06a73d2qd6dp8gvq62l8xb7bii21r7n089m14i"; depends=[Biobase BiocGenerics DNAcopy minfi preprocessCore]; };
-  CopywriteR = derive2 { name="CopywriteR"; version="2.2.0"; sha256="0hmww433hyg4wgi2hx49mwrd4y65myyi00akys3mhdsxn3s0al13"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; };
-  CorMut = derive2 { name="CorMut"; version="1.12.0"; sha256="0ldqw4g15i4r1nv74msn97c75wcr1nvwk1ffnkafvnc8bwcfzfmy"; depends=[igraph seqinr]; };
-  Cormotif = derive2 { name="Cormotif"; version="1.16.0"; sha256="0kx4h5c3vqr0x7swgq7fbkfqpknkapvqwvfmk42yh26vlabaf9cr"; depends=[affy limma]; };
-  CoverageView = derive2 { name="CoverageView"; version="1.6.0"; sha256="0z3z2s5p1xrc04gzmmry3n9qqk4cam2p7pw7mak8kiswdraba7iz"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; };
-  DAPAR = derive2 { name="DAPAR"; version="1.0.0"; sha256="1fcsgrhs64dbr11bzi9zr4ddam5z0an26pfdd06v6i80yxx95zsq"; depends=[Cairo ggplot2 gplots impute imputeLCMD knitr lattice limma MSnbase norm pcaMethods png preprocessCore RColorBrewer reshape2 tmvtnorm XLConnect]; };
-  DART = derive2 { name="DART"; version="1.18.0"; sha256="0xghg36gfd6hyd8zd3l9c2ffk2s0c8jpgg8skvg7d70hzhm47ldb"; depends=[igraph]; };
-  DASiR = derive2 { name="DASiR"; version="1.10.0"; sha256="1by2655qvskzynvbh47vydm6nl2cmnfqqs25453k29n672a6yyw4"; depends=[Biostrings GenomicRanges IRanges XML]; };
-  DAVIDQuery = derive2 { name="DAVIDQuery"; version="1.29.0"; sha256="0gvm6qjx8y61nbnbz66md74pfc4awj4900pjr8q1m5sip5yzbxj2"; depends=[RCurl]; };
-  DBChIP = derive2 { name="DBChIP"; version="1.14.0"; sha256="1x876cv2j0bdb7jflm663bp7xk32rsxpf9jwwskbl8r4r1ffsapa"; depends=[DESeq edgeR]; };
-  DChIPRep = derive2 { name="DChIPRep"; version="1.0.4"; sha256="0cwggkpbza25r2yssyhs9zkwzncmxkd406k2sn2y0rq1kdi08hj2"; depends=[assertthat DESeq2 fdrtool GenomicRanges ggplot2 plyr reshape2 S4Vectors smoothmest tidyr]; };
-  DECIPHER = derive2 { name="DECIPHER"; version="1.16.1"; sha256="0bh3c0v3fpvb9k7n3d405615hgp08fq463xlc67wz9h3l47wjrh7"; depends=[Biostrings DBI IRanges RSQLite S4Vectors XVector]; };
-  DEDS = derive2 { name="DEDS"; version="1.44.0"; sha256="079c3in183ybp0c46hqh99grqmbshsnrcax3qz08z5xbc394azna"; depends=[]; };
-  DEGraph = derive2 { name="DEGraph"; version="1.22.0"; sha256="0bjyvw218f8z0qn655idvrhg79jshya9qprmlwy28h81cn548pm8"; depends=[graph KEGGgraph lattice mvtnorm NCIgraph R_methodsS3 R_utils RBGL Rgraphviz rrcov]; };
-  DEGreport = derive2 { name="DEGreport"; version="1.6.1"; sha256="09srzwgjqwbadxj7a7rs1dylyqm8k7f4hjrhsb3k06nsbjfbfyd0"; depends=[edgeR ggplot2 Nozzle_R1 plyr quantreg]; };
-  DEGseq = derive2 { name="DEGseq"; version="1.24.0"; sha256="0yzi6bil4qj85qxa843j3s6m6qb33gy73s6fyap94cjqj72v6809"; depends=[qvalue samr]; };
-  DESeq = derive2 { name="DESeq"; version="1.22.1"; sha256="14rc1zcn4a7hkm43ca9js5ffhcm3awjrpl5bx66fj3szibjnnzcb"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
-  DESeq2 = derive2 { name="DESeq2"; version="1.10.1"; sha256="0f3jz578z83bzlqv27vhbcrz4lab6qycf6dy4cdfgvybx1k35dn9"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-  DEXSeq = derive2 { name="DEXSeq"; version="1.16.10"; sha256="0rz2zvwwc13zjxlfqv38kx1kid6qqsii5gflhaaa4xgp8qk3y9f1"; depends=[Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools statmod stringr]; };
-  DFP = derive2 { name="DFP"; version="1.28.0"; sha256="186f8lkw7c37mxixp8qa0xg21c47yf6da1l80k7ngdan86q80cs2"; depends=[Biobase]; };
-  DMRcaller = derive2 { name="DMRcaller"; version="1.2.0"; sha256="1rkzbfaa7bx3bpfdppx3xzrpxinmgj1frzxird966xk2b40m4bd4"; depends=[GenomicRanges IRanges Rcpp RcppRoll S4Vectors]; };
-  DMRcate = derive2 { name="DMRcate"; version="1.6.52"; sha256="0nvwh7jd62yh5v12s1b71797zawkaj3x4ibmgmzisg8zkxpl8fwq"; depends=[DMRcatedata DSS GenomicRanges Gviz IRanges limma minfi plyr]; };
-  DMRforPairs = derive2 { name="DMRforPairs"; version="1.6.0"; sha256="0b5mkhb5gkvfccvpgvklb3ksnq9gv6napcvxzcrph46nmm11i8zc"; depends=[GenomicRanges Gviz R2HTML]; };
-  DNABarcodes = derive2 { name="DNABarcodes"; version="1.0.0"; sha256="1wc2rcd7bc2yawm20frnx6xrkflglkcc9l27l91l349pdgsidcpm"; depends=[BH Matrix Rcpp]; };
-  DNAcopy = derive2 { name="DNAcopy"; version="1.44.0"; sha256="1c1px4rbr36xx929hp59k7ca9k5ab66qmn8k63fk13278ncm6h66"; depends=[]; };
-  DOQTL = derive2 { name="DOQTL"; version="1.6.0"; sha256="0sl7a1hhszrfxn52iw7cz6sl38y7mwk4giw3a7kqj22f1p6bhc6y"; 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.8.2"; sha256="1mbp55swmnb8ag5c8cz30wxrr0xiwhrbl6z6r6ls20cvldzc2dfa"; depends=[AnnotationDbi DO_db ggplot2 GOSemSim igraph plyr qvalue reshape2 scales]; };
-  DSS = derive2 { name="DSS"; version="2.10.0"; sha256="06a7cs9i12p9zfv52hl4v3fll4dhaapjhq6fqc58mqlzfa8qlwdm"; depends=[Biobase bsseq]; };
-  DTA = derive2 { name="DTA"; version="2.16.0"; sha256="1j3dab7w9nqnbxyckwxhm733dvpdqyg22h60ipijyjwq2d1l8znc"; depends=[LSD scatterplot3d]; };
-  DeMAND = derive2 { name="DeMAND"; version="1.0.0"; sha256="1dcq5hvpdaihagg1rasbrhamaf938zh5b1lh7ynd0q52qpr5fm56"; depends=[KernSmooth]; };
-  DeconRNASeq = derive2 { name="DeconRNASeq"; version="1.12.0"; sha256="1dnq44l20b2n9skyz9kl4dck5vlir2jiyy265jgvgw4xji1gwi7l"; depends=[ggplot2 limSolve pcaMethods]; };
-  DiffBind = derive2 { name="DiffBind"; version="1.16.3"; sha256="1mgnjfd3k5d44lzlzs4wms7mljbfrpqcs50g7jj4wk8y7jb21qyx"; depends=[amap edgeR GenomicAlignments GenomicRanges gplots IRanges lattice limma locfit RColorBrewer Rsamtools SummarizedExperiment systemPipeR zlibbioc]; };
-  DiffLogo = derive2 { name="DiffLogo"; version="1.0.0"; sha256="10p93wwndvr2y4mfnh7y23gyr9i7lskgp1sa43261s4zjhynsp1k"; depends=[cba]; };
-  DirichletMultinomial = derive2 { name="DirichletMultinomial"; version="1.12.1"; sha256="1izxlcj4niyj2f4wqfjpajrki7lggr1xd8kvjmhmbqz1p932rryf"; depends=[IRanges S4Vectors]; };
-  DriverNet = derive2 { name="DriverNet"; version="1.10.0"; sha256="15iimcjdj28nbiksc9v6gw2i9mpkvbwkk8zcia1b7yklwb33assp"; depends=[]; };
-  DrugVsDisease = derive2 { name="DrugVsDisease"; version="2.10.2"; sha256="168dajb9ism63k4kgj37b6znkia3ch6p3rzbzzjy3qbyyazzd9b2"; 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.8.0"; sha256="0p75kq178mls765q2v22bj7a727hb1v5rj4wkcagxavcls92vg0p"; depends=[R_utils RCurl]; };
-  DynDoc = derive2 { name="DynDoc"; version="1.48.0"; sha256="098idkx8m01gy0rylh67v5qnbx8bplyymc9il5sfpdv1hpc9abm3"; depends=[]; };
-  EBImage = derive2 { name="EBImage"; version="4.12.2"; sha256="1p49dap5nn9nwpglssl7fmlgvi1a1k0cpzdxph6x82kcm346srn4"; depends=[abind BiocGenerics fftwtools jpeg locfit png tiff]; };
-  EBSeq = derive2 { name="EBSeq"; version="1.10.0"; sha256="19slkx8b9p54vg4d3895kjsz4gij9pag1i3f351ypn0yx19skb80"; depends=[blockmodeling gplots testthat]; };
-  EBSeqHMM = derive2 { name="EBSeqHMM"; version="1.4.0"; sha256="02ba8famhbp4nxkg8jkwzs63qkfi7hi03h6w1igl2xn2343fnla3"; depends=[EBSeq]; };
-  EBarrays = derive2 { name="EBarrays"; version="2.34.0"; sha256="06kh68i7fjbi99rl8jp9vhbpywsr0x0fmyny83gzkbr192c8dvdw"; depends=[Biobase cluster lattice]; };
-  EBcoexpress = derive2 { name="EBcoexpress"; version="1.14.1"; sha256="1xdgzw4pik02mzs6h4fv3x3z4kgmz2am7562b7q83ppv4hr2qjgq"; depends=[EBarrays mclust minqa]; };
-  EDASeq = derive2 { name="EDASeq"; version="2.4.1"; sha256="1jjk36sjbxs4sa2j87bayi5prgk3zmkc9vnm0grj9lgjdm6ficbb"; depends=[AnnotationDbi aroma_light Biobase BiocGenerics biomaRt Biostrings DESeq GenomicFeatures GenomicRanges IRanges Rsamtools ShortRead]; };
-  EDDA = derive2 { name="EDDA"; version="1.8.0"; sha256="0gqgq57a11k7iygjyf3bszx8gm90a8frabmzib7kk84k3wrvynqg"; depends=[baySeq DESeq edgeR Rcpp ROCR snow]; };
-  ELBOW = derive2 { name="ELBOW"; version="1.6.0"; sha256="1kpprsv1s08qks10raqdh82c9w8dg0saxa1ahhnk1a2whzxj0n3m"; depends=[]; };
-  ELMER = derive2 { name="ELMER"; version="1.2.1"; sha256="0ppr30l43fiak0x798w3i2w1as1gycxnd34iplm1i39lzsdni7z4"; depends=[BiocGenerics ELMER_data GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gridExtra Homo_sapiens IlluminaHumanMethylation450kanno_ilmn12_hg19 IRanges minfi reshape S4Vectors]; };
-  EMDomics = derive2 { name="EMDomics"; version="2.0.0"; sha256="13rcbkyyk1l6xqklmws1ilnzyhal7g99499rnh0wlxbrwsb9n51w"; depends=[BiocParallel CDFt emdist ggplot2 matrixStats preprocessCore]; };
-  ENCODExplorer = derive2 { name="ENCODExplorer"; version="1.2.1"; sha256="18m42w9amjxz3d50zx5p7nvjc4kjbqhlmrqcnxy4jfyzm7sm7qby"; depends=[jsonlite RSQLite]; };
-  ENVISIONQuery = derive2 { name="ENVISIONQuery"; version="1.18.0"; sha256="1fyp6qyvw5cbapnpjx1s86pss2xhv98s4lqxfxwrsng6p1jh5z89"; depends=[rJava XML]; };
-  ENmix = derive2 { name="ENmix"; version="1.4.1"; sha256="191mm9pn53sys62736qf8kn84jxr9x5r39j4qbwyqq32gsjvq6ji"; depends=[Biobase doParallel foreach geneplotter impute MASS minfi preprocessCore sva wateRmelon]; };
-  EasyqpcR = derive2 { name="EasyqpcR"; version="1.12.0"; sha256="0s0ir8bpj3fwg79mzqz57c0crkqqq7hywiwyihcz2cykhsm1r11g"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
-  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.0.0"; sha256="02mdn7isc58fznm55qxfp1an19wfl3kj509467c9r10b5zl5mglk"; depends=[ComplexHeatmap GenomicRanges IRanges locfit matrixStats]; };
-  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.0.14"; sha256="1sia76zmcpb8r3fq136ilcpnwpsa3myl385b3k2kc3hpqchi0rj1"; depends=[AnnotationDbi Biobase biocGraph biomaRt ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS mixtools neaGUI npGSEA PathNet pathview ReportingTools Rgraphviz S4Vectors safe SparseM SPIA stringr SummarizedExperiment topGO]; };
-  ExiMiR = derive2 { name="ExiMiR"; version="2.12.0"; sha256="0c37jkych7pgahfdbwqqffg6746cfxwv7q10pqpnjsdg075pw8q9"; depends=[affy affyio Biobase limma preprocessCore]; };
-  ExpressionView = derive2 { name="ExpressionView"; version="1.22.0"; sha256="1gwhz8q5kyi01jwlwpd39dp292pc6k4v1w0al4653151qb5m55ja"; depends=[AnnotationDbi bitops caTools eisa GO_db isa2 KEGG_db]; };
-  FEM = derive2 { name="FEM"; version="2.6.0"; sha256="1pwbn2igwrd50wn8402f3zwd22h4c8anjmbrls2i6h86ardl046f"; depends=[AnnotationDbi BiocGenerics corrplot graph igraph impute limma marray Matrix org_Hs_eg_db]; };
-  FGNet = derive2 { name="FGNet"; version="3.4.0"; sha256="0pvzy185wqd9rnzc2py92zmpxywi8ysk9a7dh3415m748knw4rz8"; depends=[hwriter igraph plotrix png R_utils RColorBrewer reshape2 XML]; };
-  FISHalyseR = derive2 { name="FISHalyseR"; version="1.4.0"; sha256="0vn83slaaphw9nxp7yp6v8xp5n6kqd2zzvv7v4bn9jfi4cskxbib"; depends=[abind EBImage]; };
-  FRGEpistasis = derive2 { name="FRGEpistasis"; version="1.6.0"; sha256="05q3cbm9v9wq0av607gx526989a88lsbdaaskgac4dcfwwb6s5xy"; depends=[fda MASS]; };
-  FindMyFriends = derive2 { name="FindMyFriends"; version="1.0.7"; sha256="0ga0iwscbcczysldizgp8g19gsyszfw4vgbgs45q9px95603z0cg"; depends=[Biobase BiocParallel Biostrings digest dplyr filehash ggdendro ggplot2 gtable igraph IRanges kebabs Matrix Rcpp reshape2 S4Vectors]; };
-  FlowRepositoryR = derive2 { name="FlowRepositoryR"; version="1.2.0"; sha256="1y1y7g9111z55cwi2ph44yqib41234g77xwsybk6irlq1anizz7p"; depends=[RCurl XML]; };
-  FlowSOM = derive2 { name="FlowSOM"; version="1.2.0"; sha256="019qzh7h0bygxi4b4si1zxavx99121has7jry7swkglwss2qx0ri"; depends=[BiocGenerics ConsensusClusterPlus flowCore igraph tsne]; };
-  FourCSeq = derive2 { name="FourCSeq"; version="1.4.0"; sha256="1xh0l90hp6jy9j0xkh78dm9kyk90zzlg04yfrzd4v12mwljs8r19"; depends=[Biobase Biostrings DESeq2 fda GenomicAlignments GenomicRanges ggbio ggplot2 gtools LSD Matrix reshape2 Rsamtools rtracklayer SummarizedExperiment]; };
-  FunciSNP = derive2 { name="FunciSNP"; version="1.12.0"; sha256="1125ismkp2sprshv4b39l6bycdlry3933jaliva17c0bgjr27jhm"; depends=[AnnotationDbi ChIPpeakAnno FunciSNP_data GenomicRanges ggplot2 IRanges org_Hs_eg_db plyr reshape Rsamtools rtracklayer scales snpStats TxDb_Hsapiens_UCSC_hg19_knownGene VariantAnnotation]; };
-  GENE_E = derive2 { name="GENE.E"; version="1.10.0"; sha256="1czm1j144i842d7lf01c9gmyifikp4a66sq49i7rgpzbiz3pndkf"; depends=[RCurl rhdf5]; };
-  GENESIS = derive2 { name="GENESIS"; version="2.0.1"; sha256="1v8d114z6sbqqvf4sbw3wzifzqrig2yjmppmq0jnjyrjag3ph1ab"; depends=[gdsfmt GWASTools]; };
-  GEOmetadb = derive2 { name="GEOmetadb"; version="1.30.0"; sha256="1jw4n5p7vd75qhz7r7ll6ydsdrgmrclb8p0sks4xz3l87cd03pb3"; depends=[GEOquery RSQLite]; };
-  GEOquery = derive2 { name="GEOquery"; version="2.36.0"; sha256="18scw6jx4z7zab653if686cn1kyy0v2i7dfvvxb05wsrj7blmai1"; depends=[Biobase RCurl XML]; };
-  GEOsearch = derive2 { name="GEOsearch"; version="1.0.1"; sha256="1zag3rg2cfs0zfh092rzwhshnkncrv2p88flz9hy2n350k1xnyc4"; depends=[org_Hs_eg_db org_Mm_eg_db]; };
-  GEOsubmission = derive2 { name="GEOsubmission"; version="1.22.0"; sha256="0djm7r2g2c0k5img45v9a56gfppx0qwfla8di01fvphlwag21gi1"; depends=[affy Biobase]; };
-  GEWIST = derive2 { name="GEWIST"; version="1.14.0"; sha256="0k6zk4g0rsfjvf30sx588xfrvi31vwnh5fysz9rigbkvrhayv12r"; depends=[car]; };
-  GGBase = derive2 { name="GGBase"; version="3.32.0"; sha256="15vvwigv9xy87dl2c795c3abpnrzr364m4sbslmns403rg8dpsiw"; depends=[AnnotationDbi Biobase BiocGenerics digest genefilter GenomicRanges IRanges limma Matrix S4Vectors snpStats SummarizedExperiment]; };
-  GGtools = derive2 { name="GGtools"; version="5.6.0"; sha256="1ndvlyfzjn519z9zh6kf5sdjaz3ckracgyf2lxp23nchm2311lf0"; depends=[AnnotationDbi biglm Biobase BiocGenerics Biostrings bit data_table ff GenomeInfoDb GenomicRanges GGBase ggplot2 Gviz hexbin IRanges iterators reshape2 ROCR Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
-  GLAD = derive2 { name="GLAD"; version="2.34.0"; sha256="18ahik48499j6yf6h7k8f05s7w50b5fzs2hcz33zz36mlppz4xnr"; depends=[]; };
-  GOFunction = derive2 { name="GOFunction"; version="1.18.0"; sha256="00pdxf24sxdnh31h69c5zjhl1j2jv1ag91ay3a9w62p07bcg82l6"; depends=[AnnotationDbi Biobase GO_db graph Rgraphviz SparseM]; };
-  GOSemSim = derive2 { name="GOSemSim"; version="1.28.2"; sha256="04qyxy9adqk37hwgnx4kqa8p8fsrl1d1cf0cc9y2mq6wxq0ilw27"; depends=[AnnotationDbi GO_db Rcpp]; };
-  GOSim = derive2 { name="GOSim"; version="1.8.0"; sha256="14dyazr7p9p7h1cckbmd5yjj76718lqgfnqbcrrz52qyk0dqz6wx"; depends=[annotate AnnotationDbi cluster corpcor flexmix GO_db graph Matrix org_Hs_eg_db RBGL Rcpp topGO]; };
-  GOTHiC = derive2 { name="GOTHiC"; version="1.6.0"; sha256="0fbrflqyfihks23mxmqn8v4mm5m1ff4zzg52lfxdz3an72mvznv6"; depends=[BiocGenerics Biostrings BSgenome data_table GenomicRanges ggplot2 IRanges rtracklayer S4Vectors ShortRead]; };
-  GOexpress = derive2 { name="GOexpress"; version="1.4.1"; sha256="16ckxdlzsx8p2qli55008j59xf88yf7b62z3nilxh5fvnr92900w"; depends=[Biobase biomaRt ggplot2 gplots randomForest RColorBrewer stringr VennDiagram]; };
-  GOstats = derive2 { name="GOstats"; version="2.36.0"; sha256="0jxzlipz27pm2iijgiczpnjlda9fj8y00sbbksyyr3i1rjx72vp5"; depends=[annotate AnnotationDbi AnnotationForge Biobase Category GO_db graph RBGL]; };
-  GOsummaries = derive2 { name="GOsummaries"; version="2.4.5"; sha256="0qbvgg1g17dxrn80smrd0ab0mk63xbzv8zrrdrlwd4fdvr0ysc96"; depends=[ggplot2 gProfileR gtable limma plyr Rcpp reshape2]; };
-  GRENITS = derive2 { name="GRENITS"; version="1.22.0"; sha256="1i1mbc7sd0irc0da0pz876dibvyx451h9475hlq9ydw6q04kfjzq"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; };
-  GSAR = derive2 { name="GSAR"; version="1.4.0"; sha256="0l0vid5ba3yj8ywdj904zvm6gyvig1drxvr1b4xidyd0g0fpl6a9"; depends=[igraph]; };
-  GSCA = derive2 { name="GSCA"; version="1.8.0"; sha256="06pjmi5xc8hld09pmw87lwk5wa7cyd9qb2h32qmblc56wai7qxny"; depends=[ggplot2 gplots RColorBrewer reshape2 rhdf5 shiny sp]; };
-  GSEABase = derive2 { name="GSEABase"; version="1.32.0"; sha256="1jjl5x7qrw83v0g0d6c27g5jk5zwjd31h0p4ghprr7y34cbddaas"; depends=[annotate AnnotationDbi Biobase BiocGenerics graph XML]; };
-  GSEAlm = derive2 { name="GSEAlm"; version="1.30.0"; sha256="1gxa973l3m3jdxmvx0y0fnhpxd81bg03j6p9b0dcbhw93pdnjhsv"; depends=[Biobase]; };
-  GSRI = derive2 { name="GSRI"; version="2.18.0"; sha256="1jjzkgaf2scnqasjd1nbxrfm5k97psyxy0d2grb23aznfviynmsy"; depends=[Biobase fdrtool genefilter GSEABase les]; };
-  GSReg = derive2 { name="GSReg"; version="1.4.0"; sha256="1qq0lrx2mvwzf7s4v8i162fpb68njm5sscz4h22hyskdxrjkk8vp"; depends=[]; };
-  GSVA = derive2 { name="GSVA"; version="1.18.0"; sha256="1w17a5d4vd4gibg88npbx86pmcg7wzqnih1a3g4mpvld0wf2xs8q"; depends=[Biobase BiocGenerics GSEABase]; };
-  GUIDEseq = derive2 { name="GUIDEseq"; version="1.0.4"; sha256="03hswcshnvb7pmacxnx6lrqqy6fxprjkv9sydjkca5nvd84i7bdz"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomicRanges IRanges matrixStats S4Vectors]; };
-  GWASTools = derive2 { name="GWASTools"; version="1.16.1"; sha256="09zkwh5zcrfss2kdj81jdcs6i9i123xis3myj73f4si74bd1dq83"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; };
-  GeneAnswers = derive2 { name="GeneAnswers"; version="2.12.0"; sha256="1gacvc1vd0sl6jn0r14w4n37hsrmx6m5k1l7d2a5m3qssyk6l6n3"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
-  GeneBreak = derive2 { name="GeneBreak"; version="1.0.0"; sha256="0bzb1wzj9jj069x6ikns4743h5kc4nmdf5j7mm2w2lrfa1x1v1dd"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
-  GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.16.0"; sha256="1vb7qj2pgg8s51c43y12r1ar68jdaf3xrmmwvq8r182ky3cs45j7"; depends=[Biobase PGSEA]; };
-  GeneGA = derive2 { name="GeneGA"; version="1.20.0"; sha256="1pnpcqrfvzff2fyakapkk48l76vx960617l2nbm0pbsv98sdygb2"; depends=[hash seqinr]; };
-  GeneMeta = derive2 { name="GeneMeta"; version="1.42.0"; sha256="0r6ch9xylv3zfcfm95fy6civcg322dw43vadlw9asv9pkd80fai9"; depends=[Biobase genefilter]; };
-  GeneNetworkBuilder = derive2 { name="GeneNetworkBuilder"; version="1.12.0"; sha256="00gqrsnfizf2gspqazjg6iyhvazgs67jsakx588643ss5fbdmxkv"; depends=[graph plyr Rcpp]; };
-  GeneOverlap = derive2 { name="GeneOverlap"; version="1.6.0"; sha256="0hc7khxgpic2h5s60gnjrr89i4lq4v3jb8d1333bvi5yqvj45qip"; depends=[gplots RColorBrewer]; };
-  GeneRegionScan = derive2 { name="GeneRegionScan"; version="1.26.0"; sha256="08wi95jgbf3ldylfhx78kc390bfj3wvl2ymvs9yqpjk57q8hjq8w"; depends=[affxparser Biobase Biostrings RColorBrewer]; };
-  GeneSelectMMD = derive2 { name="GeneSelectMMD"; version="2.14.0"; sha256="05wcx826932i78k1fnl1ifjwzdz95i4bq0picm44wb4s13pv31my"; depends=[Biobase limma MASS survival]; };
-  GeneSelector = derive2 { name="GeneSelector"; version="2.20.0"; sha256="179mjqk9w4zm33mhja7hmwphpnxsv32mh60avs2mqmq9fi9z6pdh"; depends=[Biobase limma multtest samr siggenes]; };
-  GeneticsDesign = derive2 { name="GeneticsDesign"; version="1.38.0"; sha256="1yh8s40fr0yqbch7ix9y4p22ih0008xpjy5nn5x37y575l41hhwh"; depends=[gmodels gtools mvtnorm]; };
-  GeneticsPed = derive2 { name="GeneticsPed"; version="1.32.0"; sha256="0ysrjrs30kqcfafjc5wzz2f4w59jhfk5ywyzn8rgagajvdzcg6z4"; depends=[gdata genetics MASS]; };
-  GenoView = derive2 { name="GenoView"; version="1.3.0"; sha256="09k9xjmx3qmsfr3a4vrfgs73r0xsymf5m4gl0zjjk4cnfk7bs41v"; depends=[biovizBase GenomicRanges ggbio ggplot2 gridExtra]; };
-  GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.30.0"; sha256="1wkjcg6w95wlrdgaskc3xndl0azmxhxnsipf9qrj057gf2rpx7zf"; depends=[biomaRt]; };
-  GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.6.3"; sha256="1ggp005n2rlkad00ilzn95y4rd484yr1chdhnd6fwg45rbi94d63"; depends=[BiocGenerics IRanges S4Vectors]; };
-  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.6.3"; sha256="02b9j1pfd39bkvb623k5k0ziq9rpw093hifqw65vb954dwj29jhd"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-  GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.22.13"; sha256="0n3rkj66la6wizgcsf2rmwcsyfxz9kv5zak337lmk1raqfnancz4"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RSQLite rtracklayer S4Vectors XVector]; };
-  GenomicFiles = derive2 { name="GenomicFiles"; version="1.6.2"; sha256="14f3zw2vxmb3b6gxxvdvfj34hxp3b3n4k6qx80ycw8kpdr5r73n4"; depends=[BiocGenerics BiocParallel GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  GenomicInteractions = derive2 { name="GenomicInteractions"; version="1.4.2"; sha256="1a8b57dxla9hqzdn22jxb3ivl3i2xz41abrb7mgkxphgv55jf190"; depends=[BiocGenerics data_table dplyr GenomeInfoDb GenomicRanges ggplot2 gridExtra Gviz igraph IRanges Rsamtools S4Vectors stringr]; };
-  GenomicRanges = derive2 { name="GenomicRanges"; version="1.22.4"; sha256="02df5683nrpn9d10ws8jz9b55nr9055hh882xp2i154xdddir0k0"; depends=[BiocGenerics GenomeInfoDb IRanges S4Vectors XVector]; };
-  GenomicTuples = derive2 { name="GenomicTuples"; version="1.4.5"; sha256="0aiyk5hd6i6j5f2lp72nyqh8arp41aadzamdgkghwmnxhipm3czs"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
-  Genominator = derive2 { name="Genominator"; version="1.24.0"; sha256="1rqzxbji5wh6dshjsprj1mzps08l07gxmjir9naj6lsj2q0xhn9p"; depends=[BiocGenerics DBI GenomeGraphs IRanges RSQLite]; };
-  GlobalAncova = derive2 { name="GlobalAncova"; version="3.38.0"; sha256="011yf2bng9qb7rgds670ranp9z5qm569405qpk5y6xb9rvnpnxy3"; depends=[annotate AnnotationDbi corpcor globaltest]; };
-  GoogleGenomics = derive2 { name="GoogleGenomics"; version="1.2.0"; sha256="1z87jmd5vzg5v93bv9k3998wqhnk5p2v9d2qr9g0xxjvxw2q78fm"; depends=[Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; };
-  GraphAT = derive2 { name="GraphAT"; version="1.42.0"; sha256="036g6cc9r96jgj7nhlgmq0jn553hajyalwibkdnw7qy88d45c8qz"; depends=[graph MCMCpack]; };
-  GraphAlignment = derive2 { name="GraphAlignment"; version="1.34.0"; sha256="0af3m51zs35v84h4vj02fwm50iw2rk32jrixdbcw033ispl7wrkv"; depends=[]; };
-  GraphPAC = derive2 { name="GraphPAC"; version="1.12.1"; sha256="1fa64jam3cl1khv8jspwjb9myifmgx0kwg0b601bia578bjcdj7d"; depends=[igraph iPAC RMallow TSP]; };
-  GreyListChIP = derive2 { name="GreyListChIP"; version="1.2.0"; sha256="0pnyk05fri2pgin9ppyq2lk5rsc4cays5za6vhgdsjvv08sxyykz"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer]; };
-  Guitar = derive2 { name="Guitar"; version="1.7.0"; sha256="0ld2ghyq3f02as01jzwkbc0wbly1g40bqy5mmvvrj87b8l235h10"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; };
-  Gviz = derive2 { name="Gviz"; version="1.14.4"; sha256="16vca86mrpl2m9w0456cj7wj6dhdg0iqxj3z9dlia5wh56p00ryp"; 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.10.0"; sha256="0x4lpx13bhr2w5yhrcsc89g0x4q1dy0j588h210ziizgh67qqcrs"; depends=[Biobase clusterRepro coin fpc impute randomForestSRC sigaR sm survival]; };
-  HDTD = derive2 { name="HDTD"; version="1.4.0"; sha256="0d3aycz0j34iqg8xqqnga8x6ynwn0b551qizpqby8j5whlrgdw76"; depends=[]; };
-  HELP = derive2 { name="HELP"; version="1.28.0"; sha256="0m5hk3215q2gr59agzjzdbqkxkf292injxrn1ji1n29vbfzjhd41"; depends=[Biobase]; };
-  HEM = derive2 { name="HEM"; version="1.42.0"; sha256="08xbpvw3bm3hsri7z8gvivffi99ai0b4a17jkah1siy5d3wnzvci"; depends=[Biobase]; };
-  HIBAG = derive2 { name="HIBAG"; version="1.6.0"; sha256="0haxbzylzprcylc90aw9637g7isdvrd1j9936rnzjv442qp6a0i0"; depends=[]; };
-  HMMcopy = derive2 { name="HMMcopy"; version="1.12.0"; sha256="1l0ynzk8cg9i1dcb2q724p0gk0gxcrcmr9ndlvjm1jq9f2cd9lma"; depends=[geneplotter IRanges]; };
-  HTSFilter = derive2 { name="HTSFilter"; version="1.10.0"; sha256="0yfmjn1hq2dr8bh3f77kl0i4md18q4l6sfpvlsi7bf12r9cg3677"; depends=[Biobase DESeq DESeq2 edgeR]; };
-  HTSanalyzeR = derive2 { name="HTSanalyzeR"; version="2.22.0"; sha256="01mb273v1i9k0d2gbl9mpmr4rrnx49s3srv0yh1znvmwx0hmfyq2"; depends=[AnnotationDbi biomaRt BioNet cellHTS2 graph GSEABase igraph RankProd]; };
-  HTSeqGenie = derive2 { name="HTSeqGenie"; version="3.20.1"; sha256="0bg86jiv45899gw9x4hhvqf525vfwkzj2b5jk7026cq5vmjc0k5j"; depends=[BiocGenerics BiocParallel Biostrings Cairo chipseq GenomicAlignments GenomicFeatures GenomicRanges gmapR hwriter IRanges Rsamtools rtracklayer S4Vectors ShortRead VariantAnnotation VariantTools]; };
-  HTqPCR = derive2 { name="HTqPCR"; version="1.24.0"; sha256="1bjnirp3ha5ymnv1xyh02d77w7gp36qk62gjfzkbsnhwbwajpdkx"; depends=[affy Biobase gplots limma RColorBrewer]; };
-  Harshlight = derive2 { name="Harshlight"; version="1.42.0"; sha256="1b2ggv680ckj0350a2y36vlm1dszk5gx3b60qf61cqb8a0mzcyb4"; depends=[affy altcdfenvs Biobase]; };
-  Heatplus = derive2 { name="Heatplus"; version="2.16.0"; sha256="1mp31d9gd313kzx2d6nymapqxhzpd8n15li5xl52wq10w574lpc0"; depends=[RColorBrewer]; };
-  HiTC = derive2 { name="HiTC"; version="1.14.0"; sha256="0vdlj9jslvqx73d766bn9zr8drnhd334n053xmc340s2vjs7s4nq"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
-  HilbertCurve = derive2 { name="HilbertCurve"; version="1.0.0"; sha256="03yb9w4qn7c1p4yvgkcf6bjq3ms52w9jydknjryzf65gciy9m2mj"; depends=[GenomicRanges HilbertVis IRanges png]; };
-  HilbertVis = derive2 { name="HilbertVis"; version="1.28.0"; sha256="1shs6frmbfvkl8pg1nbiqlm5i9ngq6pin67gkxs5v8xw5q9rk7ya"; depends=[lattice]; };
-  HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.28.1"; sha256="1hqfjy4c4vqyz62ycia8b696cglqxbav97cxbivd6f8a578a4d5f"; depends=[HilbertVis]; };
-  HybridMTest = derive2 { name="HybridMTest"; version="1.14.0"; sha256="0mgdqp6s7lfywxqymap27lbz6hgmq6rczmy2dnhdk2wwl96gp68k"; depends=[Biobase fdrtool MASS survival]; };
-  IMPCdata = derive2 { name="IMPCdata"; version="1.4.0"; sha256="06ch3cp15ffch82gdqiwnnlakshdl2mmvq99c9iq5prp89vk41d6"; depends=[rjson]; };
-  INPower = derive2 { name="INPower"; version="1.6.0"; sha256="1jdsvglgipmzjjaz972b7xbcykynck4326r8d5bxm8yh2hv7nshv"; depends=[mvtnorm]; };
-  INSPEcT = derive2 { name="INSPEcT"; version="1.0.0"; sha256="0a7jkw4wlp05aknzc9mf9r3kfrzgmhdjmykp796s3cyjjxksk74j"; depends=[Biobase BiocParallel deSolve GenomicFeatures GenomicRanges IRanges preprocessCore pROC rootSolve]; };
-  IONiseR = derive2 { name="IONiseR"; version="1.0.1"; sha256="0qfvrzc0ik868160zz7pwlcq1mycf9ax0mdx5gv2zvqmaxibjkiz"; depends=[BiocGenerics Biostrings data_table dplyr ggplot2 magrittr rhdf5 ShortRead tidyr XVector]; };
-  IPPD = derive2 { name="IPPD"; version="1.18.0"; sha256="1kl4rx6rdmpkm7bd2w8ncvz4sb8x6wljvxkif2l17yflsp1wjvp2"; depends=[bitops digest MASS Matrix XML]; };
-  IRanges = derive2 { name="IRanges"; version="2.4.8"; sha256="0hi5k1j5jm4xrg1l506g279qw1xkvp1gg1zgsjzpbng4vx4k4iyl"; depends=[BiocGenerics S4Vectors]; };
-  ITALICS = derive2 { name="ITALICS"; version="2.30.0"; sha256="0bm38swbkqnf6nq17p49bh1lvpdvyz4vqv645awmfb5h7sfkhc3v"; depends=[affxparser DBI GLAD ITALICSData oligo oligoClasses pd_mapping50k_xba240]; };
-  IVAS = derive2 { name="IVAS"; version="1.2.0"; sha256="05sm8zhjqm3b966s9hc9dmsxajzry60wcz1qbxn989nly270cnqh"; depends=[AnnotationDbi BiocGenerics doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges lme4 Matrix S4Vectors]; };
-  Icens = derive2 { name="Icens"; version="1.42.0"; sha256="14a2fsddq2vq7b5yaairxg2p3ivrfck1r91sc2izbiyvkqk5qjb4"; depends=[survival]; };
-  IdMappingAnalysis = derive2 { name="IdMappingAnalysis"; version="1.14.0"; sha256="11rn1b6665b64h3a4mb8qkg5kp5l9ha6aa14f512k7lzs1vcczpm"; depends=[Biobase boot mclust R_oo rChoiceDialogs RColorBrewer]; };
-  IdMappingRetrieval = derive2 { name="IdMappingRetrieval"; version="1.18.2"; sha256="0wl2ybv23z84rlq2szk46kvcdm0bmqy0mjga9n33wz1c04br2bxj"; depends=[AffyCompatible biomaRt ENVISIONQuery R_methodsS3 R_oo rChoiceDialogs RCurl XML]; };
-  IdeoViz = derive2 { name="IdeoViz"; version="1.4.0"; sha256="17rdvqim46q3lwm4c4k1xyayn8x76v9sj34x2xsr7day1r5kssq3"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges RColorBrewer rtracklayer]; };
-  Imetagene = derive2 { name="Imetagene"; version="1.0.0"; sha256="1di9nx5ad0wd17byn740azx9yb6hd12dzvlfl8s5iyas4z9qzwya"; depends=[d3heatmap ggplot2 metagene shiny shinyBS shinyFiles shinythemes]; };
-  InPAS = derive2 { name="InPAS"; version="1.2.1"; sha256="0vwzm9cf2zzc7pzw2xp7a7jpg9phzcskb6zm6jwx23p005pd8qv3"; depends=[AnnotationDbi Biobase BiocParallel BSgenome cleanUpdTSeq depmixS4 GenomeInfoDb GenomicFeatures GenomicRanges Gviz IRanges limma preprocessCore S4Vectors seqinr]; };
-  IsoGeneGUI = derive2 { name="IsoGeneGUI"; version="2.6.0"; sha256="1b7my9ri3kwi4rbdymcnwdjzv88pgdfjf2ax4gls0v4460hwg5az"; depends=[Biobase ff geneplotter goric Iso IsoGene jpeg multtest ORCME ORIClust orQA RColorBrewer Rcpp relimp tkrplot xlsx]; };
-  KCsmart = derive2 { name="KCsmart"; version="2.28.0"; sha256="1bkc3ih97g0sr53wi4r0hdi6c46a7iabdsb7qy04mz7a8pa1g5ja"; depends=[BiocGenerics KernSmooth multtest siggenes]; };
-  KEGGREST = derive2 { name="KEGGREST"; version="1.10.1"; sha256="05mn2wp5xg5xpwm8wdpzv4xhcrv08qmyqi5i3ssa46nj4yn8zcc4"; depends=[Biostrings httr png]; };
-  KEGGgraph = derive2 { name="KEGGgraph"; version="1.28.0"; sha256="03lvm6qjalqwbi9i84b3glwf0kkagl3zh7cxhjd0jn7xzr20iw7q"; depends=[graph XML]; };
-  KEGGprofile = derive2 { name="KEGGprofile"; version="1.12.0"; sha256="08yg0vn7d0yyamwj8s9bg9130y1dag34w5j9dhi00x7381jnrxwr"; depends=[AnnotationDbi biomaRt KEGG_db KEGGREST png TeachingDemos XML]; };
-  LBE = derive2 { name="LBE"; version="1.38.0"; sha256="0gsckpx2903pz55mjc8a3g3w4w3q58cly40mnjb82aqjc5vd8zzk"; depends=[]; };
-  LEA = derive2 { name="LEA"; version="1.2.0"; sha256="1mq5yhs9gq321ngrfqra3isfjp5isxz00f14ify4h7wjn2w5abnp"; depends=[]; };
-  LMGene = derive2 { name="LMGene"; version="2.26.0"; sha256="0mfs8kpirwkv8salg6aacy0hr0zwmmxr7pzh88sxj3x71k2dclzi"; depends=[affy Biobase multtest survival]; };
-  LOLA = derive2 { name="LOLA"; version="1.0.0"; sha256="0lr8rzgzimmnwz9q0yyxxpa8prc06rzy1agz4in6r2iqjwpb9dq9"; depends=[data_table GenomicRanges IRanges]; };
-  LPE = derive2 { name="LPE"; version="1.44.0"; sha256="16cynjjqzji4ys6k61p9wgrwz0bnvcrqadq32i49ppfyxnf248pd"; depends=[]; };
-  LPEadj = derive2 { name="LPEadj"; version="1.30.0"; sha256="0ll9n3wkaink16laj2y98hb0kx5dglz776zlwdfkw54l1fjvvj5h"; depends=[LPE]; };
-  LVSmiRNA = derive2 { name="LVSmiRNA"; version="1.20.0"; sha256="1q43harvk7q5wb8yjffhvzs4dxl8h5vp60ngym5vcvapxr8iym3w"; depends=[affy Biobase BiocGenerics limma MASS quantreg SparseM vsn zlibbioc]; };
-  LedPred = derive2 { name="LedPred"; version="1.2.0"; sha256="0zripgxpy0fr8d02k716frzbrrh1hdp85l7agk58yyhzw086b0bl"; depends=[akima e1071 GenomicRanges irr jsonlite plot3D plyr RCurl ROCR testthat]; };
-  LiquidAssociation = derive2 { name="LiquidAssociation"; version="1.24.0"; sha256="0h20asshxybng9apaqlvwfl30db7cwf2nqknwrd52rdh3b2x4025"; depends=[Biobase geepack org_Sc_sgd_db yeastCC]; };
-  LowMACA = derive2 { name="LowMACA"; version="1.2.0"; sha256="12jm8psg7rnrsxydcqzfgiryy6lk5mxyximfzn7hnqqvxbs3wc55"; depends=[BiocParallel Biostrings cgdsr data_table LowMACAAnnotation motifStack RColorBrewer reshape2 stringr]; };
-  M3D = derive2 { name="M3D"; version="1.4.0"; sha256="088ghd9r5jr51179cj9hbk1dpj4f9fkrbgyghlq29w2bbgzc57xx"; depends=[BiSeq GenomicRanges IRanges]; };
-  MAIT = derive2 { name="MAIT"; version="1.4.0"; sha256="0yhslwqij9b073if2zp7f9w4fcxx02w9qjp2sj29g9gj1xfyij5b"; depends=[agricolae CAMERA caret class e1071 gplots MASS pls plsgenomics Rcpp xcms]; };
-  MANOR = derive2 { name="MANOR"; version="1.42.0"; sha256="0k2mg4bchjaabbbxhnjgc0j3r10hngc1al06dp7077h1yqrcr9v2"; depends=[GLAD]; };
-  MBASED = derive2 { name="MBASED"; version="1.4.0"; sha256="0v56m2cdwq59drqxnpg3cg8cmwkq75wzrscyj7ajy1zp71m4kn4b"; depends=[BiocGenerics BiocParallel GenomicRanges RUnit SummarizedExperiment]; };
-  MBAmethyl = derive2 { name="MBAmethyl"; version="1.4.0"; sha256="0knn0fgrqmddwiyip49gchp5fzz77fb3fndhyddb0xw752nqvw8p"; depends=[]; };
-  MBCB = derive2 { name="MBCB"; version="1.24.0"; sha256="1qryzcjf3w138n12amch1zq2nl5nvagqqv422kcladapaq2lsgi2"; depends=[preprocessCore tcltk2]; };
-  MCRestimate = derive2 { name="MCRestimate"; version="2.26.0"; sha256="1igfffsgz6m4rl2a5fnkb92r5x4qjr2yl8gaj3ws8478q3aq0bgd"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; };
-  MEAL = derive2 { name="MEAL"; version="1.0.3"; sha256="1jrg6vw34hc8cg1ifyihrvya40x3f6ad77vp56wxdizr2wqp6h3q"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 IRanges limma minfi S4Vectors SNPassoc snpStats sva vegan]; };
-  MEDIPS = derive2 { name="MEDIPS"; version="1.20.1"; sha256="0p5cg0nak7b6dr6l3j2abpm45dg644gbwl4w50ksqc1ahjksh3ir"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
-  MEDME = derive2 { name="MEDME"; version="1.30.0"; sha256="0j2zgd9lx3cbbv2vyqb4nd9rk3lxk33az50n8b9sn4cab7yws54x"; depends=[Biostrings drc MASS]; };
-  MEIGOR = derive2 { name="MEIGOR"; version="1.4.0"; sha256="1nywi9cndvkabiryrq72vxgrhz9d8jvzjvzhz9i4mx6g8xvphjng"; depends=[CNORode deSolve Rsolnp snowfall]; };
-  MGFM = derive2 { name="MGFM"; version="1.4.0"; sha256="1ffmz1cbk0bhswrjkjg1mg3cslmx2k2sxhhggv9s2wavx2s4q3ba"; depends=[annotate AnnotationDbi]; };
-  MIMOSA = derive2 { name="MIMOSA"; version="1.8.0"; sha256="1kc7qszpcxp82f56yxa7s1bcs5wblm4ywj5izgdf981qq16d6s2h"; depends=[Biobase coda data_table Formula ggplot2 Kmisc MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
-  MLInterfaces = derive2 { name="MLInterfaces"; version="1.50.0"; sha256="16lf1hmjdmsh9r8qh9042k1rzvl8r39n71f2qs6ca79qcwpb9k6j"; 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.18.0"; sha256="1g45rnj58bkp7n6paz7713ny0lc6v7lxigqsnvq4w460sg9k060d"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
-  MLSeq = derive2 { name="MLSeq"; version="1.8.1"; sha256="0s324105s96jjasbbf9yri9bdkcwx8siwyg602fyrfkfh0888d3r"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
-  MMDiff = derive2 { name="MMDiff"; version="1.10.0"; sha256="0v000a87ciw83xj6p2443k1zs1w98ax38nzaf643wqmb8szwr6vf"; depends=[Biobase DiffBind GenomicRanges GMD IRanges Rsamtools]; };
-  MPFE = derive2 { name="MPFE"; version="1.6.0"; sha256="1n12bpb8jqddrcpdbbpfxzk4r44kg3p8bg8an5drzbv6rmyhdxwn"; depends=[]; };
-  MSGFgui = derive2 { name="MSGFgui"; version="1.4.0"; sha256="0pb9i81pqnz05jrwqh9myz5zchdn8ng5nrsv3cmdg4713yskqpcw"; depends=[MSGFplus mzID mzR shiny shinyFiles xlsx]; };
-  MSGFplus = derive2 { name="MSGFplus"; version="1.4.0"; sha256="1hw40kyhkxm0iy60n3y1cw2k52q5vjl47k4z5x34syq5d14iplva"; depends=[mzID]; };
-  MSnID = derive2 { name="MSnID"; version="1.4.0"; sha256="1my0kg8wi7f73sgy8brczkdxvjc2mslv3akk69bqw6j0lk1kaqir"; depends=[Biobase data_table doParallel foreach iterators MSnbase mzID ProtGenerics R_cache Rcpp reshape2]; };
-  MSnbase = derive2 { name="MSnbase"; version="1.18.1"; sha256="09gv73ykvi6fcaxwclfmg99qbqwkxg8sn5b5nnwlyzin3g11fyq6"; 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.2.1"; sha256="1zyxawn4zzfg6xdk2pawd5qdmfp9r98bvryb5qklbyqn0azakina"; depends=[data_table ggplot2 ggrepel gplots limma lme4 marray MSnbase preprocessCore Rcpp reshape reshape2 survival]; };
-  MVCClass = derive2 { name="MVCClass"; version="1.44.0"; sha256="04mk9mp6kfjdbb1i9ivj1f2h5hm3nzhzznyc8w2vcihkf48gl89d"; depends=[]; };
-  MantelCorr = derive2 { name="MantelCorr"; version="1.40.0"; sha256="00603yxak0c7pif6acccvzkhp0jsw2n22l7awc2v0za25xjwn3mr"; depends=[]; };
-  MassArray = derive2 { name="MassArray"; version="1.22.0"; sha256="0z7na1ylvga5c42s0lh5shr1y316nla8rfd6wc9amkabsprfngqm"; depends=[]; };
-  MassSpecWavelet = derive2 { name="MassSpecWavelet"; version="1.36.0"; sha256="0gprvc3fflfxflx0d65sja569lf41rrdlfyggf3b2pvqvd59pyfv"; depends=[waveslim]; };
-  MatrixRider = derive2 { name="MatrixRider"; version="1.2.0"; sha256="0ss39c235awrmqbkz3yzjly88dvp79bz4ycdz467rasd45wlvz64"; depends=[Biostrings IRanges S4Vectors TFBSTools XVector]; };
-  MeSHDbi = derive2 { name="MeSHDbi"; version="1.6.0"; sha256="19c0llv894mdx52nqf7flz4bpxid5f6nsg535031prqgd2bdslnq"; depends=[AnnotationDbi Biobase BiocGenerics RSQLite]; };
-  MeSHSim = derive2 { name="MeSHSim"; version="1.2.0"; sha256="1wgc2s1080sm2dn9ny4c1kpbcmbv4gv91h7jmgya9p8lk224aasr"; depends=[RCurl XML]; };
-  MeasurementError_cor = derive2 { name="MeasurementError.cor"; version="1.42.0"; sha256="0x6jlza4ip0zscmmxlmy9w6r6cgpdawpxw00cvyrw4pswzhsaz03"; depends=[]; };
-  MergeMaid = derive2 { name="MergeMaid"; version="2.42.0"; sha256="1ajmrcpvzfjk0bkm2v3yklry91w5cxpjhgjr9hfszzldfhh5sfw4"; depends=[Biobase MASS survival]; };
-  Metab = derive2 { name="Metab"; version="1.4.1"; sha256="0wi45k7lx7f7y8bfpa4d1lggnkxlwwyjgzw22xyfw9yj40ma5x9g"; depends=[pander svDialogs xcms]; };
-  MethTargetedNGS = derive2 { name="MethTargetedNGS"; version="1.2.0"; sha256="1pykrqvblmxwbxwyps3gn2vm6ch6cn9199g6a1fix2dwj26y66yf"; depends=[Biostrings gplots seqinr stringr]; };
-  MethylAid = derive2 { name="MethylAid"; version="1.4.0"; sha256="0k8vl8ijgdvci8j1nkq7d4j4naxgsz5wdac5zk093zzjfrq2xmmg"; depends=[Biobase BiocGenerics BiocParallel FDb_InfiniumMethylation_hg19 ggplot2 gridBase hexbin IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
-  MethylMix = derive2 { name="MethylMix"; version="1.4.0"; sha256="17f32y50aywvyhfm60rr7dyjq3y56i4bysdzmin5plqlyq0gmx30"; depends=[doParallel foreach optimx RColorBrewer RPMM]; };
-  MethylSeekR = derive2 { name="MethylSeekR"; version="1.10.0"; sha256="0aa3p5qmprka7v6v3alhnag6qr853wvcib9vj0nj803saa34hil8"; depends=[BSgenome geneplotter GenomicRanges IRanges mhsmm rtracklayer]; };
-  Mfuzz = derive2 { name="Mfuzz"; version="2.30.0"; sha256="02a3xrsd3nzr278zq8j7s9bq89v30v5yxcdmzcf480n1pqw66ayz"; depends=[Biobase e1071 tkWidgets]; };
-  MiChip = derive2 { name="MiChip"; version="1.24.0"; sha256="1jqhmrzi87g3fyfy0xbwcbkh5hhr9b1sa3lp9rxlxrijlxv35mb4"; depends=[Biobase]; };
-  MiPP = derive2 { name="MiPP"; version="1.42.0"; sha256="07flpzyr9jj50789ap78an6qygb3y9b87dkaami6aadpphp2ggn0"; depends=[Biobase e1071 MASS]; };
-  MiRaGE = derive2 { name="MiRaGE"; version="1.12.0"; sha256="0j8qip9sz4ifk7p6a41258lsw26i92qcrl72h4y43l2bln4r74ng"; depends=[AnnotationDbi Biobase BiocGenerics]; };
-  MineICA = derive2 { name="MineICA"; version="1.10.0"; sha256="1vdnc25wbbsdx4z9c8x0asar6a50hzwvlkxrgn10dlm96jihmgdf"; 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.14.0"; sha256="0i3iag5a705q33vxqyb7pqpgmc8whpvy96yvidk2gyfh6lwqjsmn"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
-  Mirsynergy = derive2 { name="Mirsynergy"; version="1.6.0"; sha256="0wb257fi5wygky6iqaxdhp8n3pxzknv1vy44ay55y0bal1nbkzwa"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
-  MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.20.0"; sha256="1salsb4askcv6xgzfwcwxkrr8qx7pjzqgljbw3ips2f4n6vqvyzj"; depends=[Biobase lattice limma statmod vsn xtable]; };
-  MoPS = derive2 { name="MoPS"; version="1.4.0"; sha256="07bylvhv1wnzj3z2ycw4rb29mlz34sbpksl0sdk47q9f5cjgvlnf"; depends=[Biobase]; };
-  MotIV = derive2 { name="MotIV"; version="1.26.0"; sha256="0s26dklw8kav8lz0245as7y9znj4yfiknpmcgrdmm62rq04c11mp"; depends=[BiocGenerics Biostrings IRanges lattice rGADEM S4Vectors]; };
-  MotifDb = derive2 { name="MotifDb"; version="1.12.1"; sha256="0n3kh8k0gbdc571bb45argxwsv6waaalgf9b6rzd3prnizkxzq4q"; depends=[BiocGenerics Biostrings IRanges rtracklayer S4Vectors]; };
-  Mulcom = derive2 { name="Mulcom"; version="1.20.0"; sha256="0rf5haxfmf0zs42b9pinngbr4clnm0h707zplmig8dpaq5myski9"; depends=[Biobase fields]; };
-  MultiMed = derive2 { name="MultiMed"; version="1.4.0"; sha256="0vd8akfy23rx37b98z9g7x7hz0xjba912kvkwcd9m0k6fv4n2s5g"; depends=[]; };
-  NCIgraph = derive2 { name="NCIgraph"; version="1.18.0"; sha256="0ip8ds4jafb7nhfbz81gs9fl83a6b88di1z3nmkh31aqd4awrgim"; depends=[graph KEGGgraph R_methodsS3 RBGL RCytoscape]; };
-  NGScopy = derive2 { name="NGScopy"; version="1.4.0"; sha256="1vs7mi0lb8jcm9yc0jz7rvdnj95fr06cf1jkb9p84pnm9vpn63d6"; depends=[changepoint rbamtools Xmisc]; };
-  NOISeq = derive2 { name="NOISeq"; version="2.14.1"; sha256="1z8ka9rbs6q267g3cjmgvdvp5ramk3dnlwry46wswifqihalhf9p"; depends=[Biobase Matrix]; };
-  NTW = derive2 { name="NTW"; version="1.20.0"; sha256="1p9hhjzh1mq907czbnjp7gg6n8ip4hzcq7x46bmmxpibi3wy64vp"; depends=[mvtnorm]; };
-  NanoStringDiff = derive2 { name="NanoStringDiff"; version="1.0.0"; sha256="11mdy4ms3fvia04njjxj35p1kgbl3i2wzgplzl42yymm61xgcar2"; depends=[Biobase matrixStats]; };
-  NanoStringQCPro = derive2 { name="NanoStringQCPro"; version="1.2.0"; sha256="1cbja0bi4sw3n4f1wkgbvmwh1hr49hhrybqxc6a7f8lvq11s28rf"; depends=[AnnotationDbi Biobase knitr NMF org_Hs_eg_db png RColorBrewer]; };
-  NarrowPeaks = derive2 { name="NarrowPeaks"; version="1.14.0"; sha256="08nhw2ira3amjs9zl134afjqwi0hniq0g3mgmljjp1l0277b8acg"; depends=[BiocGenerics CSAR fda GenomeInfoDb GenomicRanges ICSNP IRanges S4Vectors]; };
-  NetPathMiner = derive2 { name="NetPathMiner"; version="1.6.0"; sha256="0rvar97f22n2afy185521wqh2scmzgw5fj2pv5dzydn0ybfnpn3j"; depends=[igraph]; };
-  NetSAM = derive2 { name="NetSAM"; version="1.10.0"; sha256="001jdmc1qb2gcwkfy98az66b52hcp0cqvjqp0yzj598523983v5i"; depends=[graph igraph seriation]; };
-  NormqPCR = derive2 { name="NormqPCR"; version="1.16.0"; sha256="16mm6b656gamvlr3gj5l7957h5fvzz221vggfjvab92khp3p8c16"; depends=[Biobase qpcR RColorBrewer ReadqPCR]; };
-  NuPoP = derive2 { name="NuPoP"; version="1.20.0"; sha256="0wy63x8jdlldb8f28csm611fx7sahvkz1g0gcslp4babsm3368y6"; depends=[]; };
-  OCplus = derive2 { name="OCplus"; version="1.44.0"; sha256="05v5fdcgkigisrpfyka8k7caz739ys1ycy8lljqj6ivq94gmi44m"; depends=[akima multtest]; };
-  OGSA = derive2 { name="OGSA"; version="1.0.0"; sha256="058lfd60w905jvhq99dsdcvl1q6h9dnwhqdqn942yr54jlkc7fjy"; depends=[Biobase gplots limma]; };
-  OLIN = derive2 { name="OLIN"; version="1.48.0"; sha256="1qqvxl8xw02xawxgb82fnxjkss5cy813li4vp7wc70srcxyd1j63"; depends=[limma locfit marray]; };
-  OLINgui = derive2 { name="OLINgui"; version="1.44.0"; sha256="0477llp7g2bs7h4756qildpscllk5wdk303gkaaiv5ap6n8s8smj"; depends=[marray OLIN tkWidgets widgetTools]; };
-  OSAT = derive2 { name="OSAT"; version="1.18.0"; sha256="063jpwmhsnhi7al88mwcgbnd9azn2z3afxnjd2syf0mv156v86j0"; depends=[]; };
-  OTUbase = derive2 { name="OTUbase"; version="1.20.0"; sha256="0h9fgnc0saz8gsx6wgjigs4aiacbw03vzzxfc04wzfcdjgcm731p"; depends=[Biobase Biostrings IRanges S4Vectors ShortRead vegan]; };
-  OmicCircos = derive2 { name="OmicCircos"; version="1.8.1"; sha256="1xmf4wbij8lczj8jp1vj546gzv6210qcx30dpf4f3zqy083d583v"; depends=[GenomicRanges]; };
-  OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.2.0"; sha256="1r4qn2p5fxyi6r9l7zgbga1n5wcy18whcvyx0cwrr7lawbzjn6yg"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
-  OncoSimulR = derive2 { name="OncoSimulR"; version="2.0.0"; sha256="1q2kwszqf1ki8whchbx537sv6gah4ibclabhkgycd183rd0jv71r"; depends=[data_table graph gtools igraph Rcpp Rgraphviz]; };
-  OperaMate = derive2 { name="OperaMate"; version="1.2.3"; sha256="1zgqf2ywazrxc66l2x8280izrzanan51b8vz5jwy8i7gnrm4gaa0"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; };
-  OrderedList = derive2 { name="OrderedList"; version="1.42.0"; sha256="0jk753xfyksv3vcgxd3z7nwh9cnjfdljzma4vc7kkdsblx5mpjyi"; depends=[Biobase twilight]; };
-  OrganismDbi = derive2 { name="OrganismDbi"; version="1.12.1"; sha256="1rda35kjh3l5w5dz153x4p6adwm8apkljg5021a1rcs2x58q6z91"; depends=[AnnotationDbi Biobase BiocGenerics BiocInstaller GenomicFeatures GenomicRanges graph IRanges RBGL RSQLite S4Vectors]; };
-  Oscope = derive2 { name="Oscope"; version="1.0.0"; sha256="08gyfjkimv8fj54kfnalpy1v72sv8vr0pjxyj52sb0hh0xcj2jqk"; depends=[BiocParallel cluster EBSeq testthat]; };
-  OutlierD = derive2 { name="OutlierD"; version="1.34.0"; sha256="19wrakxv833r5jqcrk627kgn6pissna9xdfnhn389a0j50xb02is"; depends=[Biobase quantreg]; };
-  PAA = derive2 { name="PAA"; version="1.4.1"; sha256="1g1yv95p9i58c4w3nsg490mn4c5qh4q4lfx1jj1ff7h3w7i6ds9d"; depends=[e1071 gplots limma MASS mRMRe randomForest Rcpp ROCR sva]; };
-  PADOG = derive2 { name="PADOG"; version="1.12.0"; sha256="0qswjj0iskdinap0mdgh1vpsjx80hs5g1ikm7r3yrz3784577ji8"; depends=[AnnotationDbi Biobase doRNG foreach GSA hgu133a_db hgu133plus2_db KEGG_db KEGGdzPathwaysGEO limma nlme]; };
-  PANR = derive2 { name="PANR"; version="1.16.0"; sha256="19q7vxhq2kazjf3wxvzl0cvfyd49b00r0daf7vgzjv1smjq1czhq"; depends=[igraph MASS pvclust RedeR]; };
-  PAPi = derive2 { name="PAPi"; version="1.10.0"; sha256="0q90yi4s3jln713cpylgan7fzw7c536kw7bqlnkkaw6rjj1k6vvg"; depends=[KEGGREST svDialogs]; };
-  PAnnBuilder = derive2 { name="PAnnBuilder"; version="1.34.0"; sha256="086hgqx9svn1pfzcz6affj2p9kvjk5k4viqkmwknlk9smw53l40l"; depends=[AnnotationDbi Biobase DBI RSQLite]; };
-  PCpheno = derive2 { name="PCpheno"; version="1.32.0"; sha256="023dkbi3r1bs9wiihx3rcdc1dx5w21pfmk0n3n7zan4k5jkz4rwx"; depends=[annotate AnnotationDbi Biobase Category GO_db graph GSEABase KEGG_db ppiData ppiStats ScISI SLGI]; };
-  PECA = derive2 { name="PECA"; version="1.6.0"; sha256="00arj7ni6vdhsa3j9dvid997hqzw3kbznxgsfrjcda68gl28v8m0"; depends=[affy aroma_affymetrix aroma_core genefilter limma preprocessCore]; };
-  PGA = derive2 { name="PGA"; version="1.0.0"; sha256="1s4ddjlnxh1waw1sm428lnaq655qfzlmabcjgdm95fi2cg66vs86"; depends=[AnnotationDbi biomaRt Biostrings customProDB data_table GenomicFeatures GenomicRanges ggplot2 IRanges Nozzle_R1 pheatmap RCurl Rsamtools RSQLite rTANDEM rtracklayer stringr VariantAnnotation]; };
-  PGSEA = derive2 { name="PGSEA"; version="1.44.0"; sha256="0cfz479nlmbal4bs5ah12q6jpp7989xic59rml87i19bcbhz8z26"; depends=[annaffy AnnotationDbi Biobase GO_db KEGG_db]; };
-  PICS = derive2 { name="PICS"; version="2.14.0"; sha256="01pc4nayj4iyrm18clb66f6f1a7y2w56l2z976xca86fhv6qgp4x"; depends=[BiocGenerics GenomicAlignments GenomicRanges IRanges Rsamtools S4Vectors]; };
-  PING = derive2 { name="PING"; version="2.14.0"; sha256="0gpc9x9qn1m1rqdls54yfqlph84937fb3f5mf89yi6zcjh41yhlb"; depends=[BiocGenerics BSgenome chipseq fda GenomicRanges Gviz IRanges PICS S4Vectors]; };
-  PLPE = derive2 { name="PLPE"; version="1.30.0"; sha256="0j6x0c7aigq5n2qwvn0bzcbzi8xqi9szbqfk58jr7ppgaxl1ljyw"; depends=[Biobase LPE MASS]; };
-  PREDA = derive2 { name="PREDA"; version="1.16.0"; sha256="050a1a02ck11yklmd104b2hnal9q8g171nyq0qd1v1i2mhg02jyn"; depends=[annotate Biobase lokern multtest]; };
-  PROMISE = derive2 { name="PROMISE"; version="1.22.0"; sha256="12virpc3m8ikwkz600bfg1aycxxks6g8km6gd7y01yyxybsqjplq"; depends=[Biobase GSEABase]; };
-  PROPER = derive2 { name="PROPER"; version="1.2.0"; sha256="1xhq14wpd9j9g0zzb99mib46miciw6dhp4gvkpdvlfwhh3j8m8fb"; depends=[edgeR]; };
-  PROcess = derive2 { name="PROcess"; version="1.46.0"; sha256="0ysp2f2kx5p701ww81ip8n4617qs6rcjfrj62657j143ajz27py3"; depends=[Icens]; };
-  PSEA = derive2 { name="PSEA"; version="1.4.0"; sha256="1df2v472s2g4qcylvg9y5gahgjzq0m753j65736c8lc7g2zbpacp"; depends=[Biobase MASS]; };
-  PSICQUIC = derive2 { name="PSICQUIC"; version="1.8.3"; sha256="1g3xkbgr3by0gd8ngiavxyy14ixdhrwcf5ka329k3129d816425p"; depends=[BiocGenerics biomaRt httr IRanges plyr RCurl]; };
-  PWMEnrich = derive2 { name="PWMEnrich"; version="4.6.0"; sha256="0gvnky8k6v518g2a4lrvb5w7s1m3icckmlvyxcbvxdfyb5krdzh2"; depends=[BiocGenerics Biostrings evd gdata seqLogo]; };
-  Path2PPI = derive2 { name="Path2PPI"; version="1.0.0"; sha256="15cf7r1aswc1agdkc7k8dbazscqnyrbfg68ms248gri3qrplkq0k"; depends=[igraph]; };
-  PathNet = derive2 { name="PathNet"; version="1.10.0"; sha256="07b6c8ry6a0ni8c88wccv69ksk5c6w3wwwp6cl3gcm7kv7r2qd00"; depends=[]; };
-  Pbase = derive2 { name="Pbase"; version="0.10.0"; sha256="02b2vw63gwssy6bz8v6dvfmz2ak5pa7wzz341nrbr3mwv0k27j4q"; depends=[Biobase BiocGenerics biomaRt Biostrings cleaver GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
-  PhenStat = derive2 { name="PhenStat"; version="2.4.0"; sha256="02x8502j7c8jb9xpy01dlr89qwhlakzvn7rhl4mb8qd37lrvc3kf"; depends=[car logistf MASS nlme nortest]; };
-  Polyfit = derive2 { name="Polyfit"; version="1.4.0"; sha256="0rhs81hclz59nqirpp9y5n7qmg343s260n1gv8ma3c8j2jicb333"; depends=[DESeq]; };
-  Prize = derive2 { name="Prize"; version="1.0.0"; sha256="1a9hvhpa29ns7lhzmdqjlasp6rwrzng8klaw9cz54vdvc7al49wn"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
-  ProCoNA = derive2 { name="ProCoNA"; version="1.8.0"; sha256="0j0ld484cd98304fncyixi86qnxh72m8s83xxyk8c81kf7lzvhw1"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
-  Prostar = derive2 { name="Prostar"; version="1.0.1"; sha256="1rnbx41f07c9y6ba7p9lb6wi22kf3w5jg8h8di3grfgyq4dw3n39"; depends=[DAPAR data_table quantmod rhandsontable shiny shinyTree]; };
-  ProtGenerics = derive2 { name="ProtGenerics"; version="1.2.1"; sha256="1hrds64ijygmilig3l99aj5cqqp8cr74x1jfs5qfw9xkma0ggz3r"; depends=[BiocGenerics]; };
-  ProteomicsAnnotationHubData = derive2 { name="ProteomicsAnnotationHubData"; version="1.0.0"; sha256="1ss1kamy3djmxvr838bkh6jd93br8hql9a3aanqml7fzz3pvdq1p"; depends=[AnnotationHub AnnotationHubData Biobase BiocInstaller Biostrings GenomeInfoDb MSnbase mzR]; };
-  Pviz = derive2 { name="Pviz"; version="1.4.0"; sha256="02p4l8svrmh0jh1xlgngbdc0h96m2jw15x1ld05p23acj44sacgh"; depends=[Biostrings biovizBase data_table GenomicRanges Gviz IRanges]; };
-  QDNAseq = derive2 { name="QDNAseq"; version="1.6.1"; sha256="1jbnmvf3i4kimk7s558sbvkb0l6gb8hsbfvxdw93sfk4dwsi5c12"; depends=[Biobase CGHbase CGHcall DNAcopy matrixStats R_utils Rsamtools]; };
-  QUALIFIER = derive2 { name="QUALIFIER"; version="1.14.1"; sha256="1h87y2q8x4ri6sv7nbppzpqa96m99mijq1739h8cfab5wmi0bcl5"; depends=[Biobase data_table flowCore flowViz flowWorkspace hwriter lattice latticeExtra MASS ncdfFlow reshape XML]; };
-  QuartPAC = derive2 { name="QuartPAC"; version="1.2.0"; sha256="0nx3a9jsp2rq61jszm6kgpbqi9m5jkqfvk94npp7nk3qwhfi00j8"; depends=[data_table GraphPAC iPAC SpacePAC]; };
-  QuasR = derive2 { name="QuasR"; version="1.10.1"; sha256="1sdk1kh8365bp8w8xl06lhqdw0kprqj4gvwhw46lyiw1r3xapqd5"; depends=[Biobase BiocGenerics BiocInstaller BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges IRanges Rbowtie Rsamtools rtracklayer S4Vectors ShortRead zlibbioc]; };
-  R3CPET = derive2 { name="R3CPET"; version="1.2.0"; sha256="10ps9l6cc61m32a5b0b0y51sf8ci8drrpk02781p3i23jyamx8gz"; depends=[clues clValid data_table GenomicRanges ggbio ggplot2 Hmisc igraph IRanges pheatmap Rcpp RCurl reshape2 S4Vectors]; };
-  R453Plus1Toolbox = derive2 { name="R453Plus1Toolbox"; version="1.20.0"; sha256="118gdmlqgy6nn55vq7nvyqvlwbg2vca7fkw0gjvb63ymv8lhfm7p"; depends=[Biobase BiocGenerics biomaRt Biostrings BSgenome GenomicRanges IRanges R2HTML Rsamtools S4Vectors ShortRead SummarizedExperiment TeachingDemos VariantAnnotation xtable XVector]; };
-  RBGL = derive2 { name="RBGL"; version="1.46.0"; sha256="1zl2cvzhrm01hkqvzqrf37bnh0snm49594lk6ydiafn3s31rhk6f"; depends=[graph]; };
-  RBM = derive2 { name="RBM"; version="1.2.0"; sha256="148is7ddwj8siik6a6svghnyl3ix8yf6ywnp90fxb8x0c5yknvmm"; depends=[limma marray]; };
-  RBioinf = derive2 { name="RBioinf"; version="1.30.0"; sha256="038xqmbsajkcj5s0pjv0jb9lizq555kxabxjj3pgipjbqfjbj0xg"; depends=[graph]; };
-  RCASPAR = derive2 { name="RCASPAR"; version="1.16.0"; sha256="0rliirdsd89lzr4ych9r7x90d4nzz1p036cmj8k01lzs6nvckh05"; depends=[]; };
-  RCy3 = derive2 { name="RCy3"; version="1.0.1"; sha256="0bqn2k7k1007ih48inmdjnl0pan2q86p9p4c8hkbgv6r2alxc0d1"; depends=[graph httr RCurl RJSONIO]; };
-  RCyjs = derive2 { name="RCyjs"; version="1.2.3"; sha256="1z3a80j9wcr2jsv35chqqqc95dcjsmz48hylvc432p2jwy572phn"; depends=[BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
-  RCytoscape = derive2 { name="RCytoscape"; version="1.20.1"; sha256="1ymbj8xlny9bsbcxyvg9si7v2rlc7bw3sq0424bsfc92l3as0rjj"; depends=[BiocGenerics graph]; };
-  RDAVIDWebService = derive2 { name="RDAVIDWebService"; version="1.8.0"; sha256="1f92a80zksp90wlj2iymdf20hqkbp1aw7mdb7w5r19zckskcrg1m"; depends=[Category ggplot2 GO_db GOstats graph RBGL rJava]; };
-  RDRToolbox = derive2 { name="RDRToolbox"; version="1.20.0"; sha256="1an5sz2lcq9n0h0i8s6g9jqaskbi7drwib8a1zwlpim1f399h45d"; depends=[MASS rgl]; };
-  REDseq = derive2 { name="REDseq"; version="1.16.0"; sha256="13lglqabk3ij37i469s40gagb57z7mqcmdwahvf60rrgxvhbxkwz"; depends=[AnnotationDbi BiocGenerics Biostrings BSgenome BSgenome_Celegans_UCSC_ce2 ChIPpeakAnno IRanges multtest]; };
-  RGSEA = derive2 { name="RGSEA"; version="1.4.0"; sha256="1dqw1vppxsr14sr94sz4ca2vacky70r0ingkq8cghsbvwp73i6vp"; depends=[BiocGenerics]; };
-  RGalaxy = derive2 { name="RGalaxy"; version="1.14.0"; sha256="1g63kmfywmnjammifjkqiy8cnqvb77d2x4yff8bgz2ib60gyqm14"; depends=[Biobase BiocGenerics digest optparse roxygen2 XML]; };
-  RIPSeeker = derive2 { name="RIPSeeker"; version="1.10.0"; sha256="09pr25pf488vdim3k6mvbvqqyxhl2dfs4y699x8xyhym34c74xcj"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer SummarizedExperiment]; };
-  RLMM = derive2 { name="RLMM"; version="1.32.0"; sha256="15hkzfsr3qpyd72m5bf208ivcki1dkk5qigz6dxshqy803ax60ca"; depends=[MASS]; };
-  RMassBank = derive2 { name="RMassBank"; version="1.12.0"; sha256="1rsvdai5fhkx9pgj14mm2x1xr4h8l0ppakxp8j3aicih92cvdd55"; depends=[mzR rcdk Rcpp RCurl rjson XML yaml]; };
-  RNASeqPower = derive2 { name="RNASeqPower"; version="1.10.0"; sha256="16nhhmww8awf5rp6j8hrmz9riw4gppmvd4a2vlp57sr6y82krlsz"; depends=[]; };
-  RNAinteract = derive2 { name="RNAinteract"; version="1.18.0"; sha256="0v7hz20nsc2dkb4xjzdhib2rj8k9zkn2c71rhg46b6hy3jxrm7m1"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
-  RNAither = derive2 { name="RNAither"; version="2.18.4"; sha256="15kr629g5l6isa4069fibgdh9j5zkmjll5anpigfbmdb85dhwlbc"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
-  RNAprobR = derive2 { name="RNAprobR"; version="1.2.0"; sha256="017sc7ba5kw55rc74acv3i5i0mg7h5hblaqxy4j2ln6iqm1h38fi"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges plyr Rsamtools rtracklayer]; };
-  ROC = derive2 { name="ROC"; version="1.46.0"; sha256="15m52d3z10nrzh7slc6b7js1dybh0dg4pd6nnjbjkc2m5axra09g"; depends=[]; };
-  ROntoTools = derive2 { name="ROntoTools"; version="1.10.0"; sha256="0bsab4glgazf3x2rg96shks4vqkarqpls71699q7v7zaw7ay7hra"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
-  RPA = derive2 { name="RPA"; version="1.26.0"; sha256="09mjbxxx2ggf3c3v8d2wxvgpp14fmhp7yv9w1vxdj4kbzpdagpz0"; depends=[affy]; };
-  RRHO = derive2 { name="RRHO"; version="1.10.0"; sha256="11iarlljr6lrq6nf36pdxf7p54mk6xwsz8ssfsg8zmpcpvb8adgc"; depends=[VennDiagram]; };
-  RSVSim = derive2 { name="RSVSim"; version="1.10.0"; sha256="1ipzsgm7p2xf8v3asc6gcwvl6gnrn8nkg45iyl948kgys9izrng3"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
-  RTCA = derive2 { name="RTCA"; version="1.22.0"; sha256="1rwgrac92n7ghk417sj3p80ahlnn8c9nq8af999a825bjbi90qd5"; depends=[Biobase gtools RColorBrewer]; };
-  RTCGA = derive2 { name="RTCGA"; version="1.0.2"; sha256="14lxdzrii9xvpjvflqim2kasx2xd5pk9rijpad2pkm8yq5cs662p"; depends=[assertthat data_table knitr magrittr rvest stringi XML xml2]; };
-  RTCGAToolbox = derive2 { name="RTCGAToolbox"; version="2.0.0"; sha256="0bwdh52qsl2bawr8s4q92mrx1wn4yyc4qbag97w469ixlsr7fcx2"; depends=[data_table limma RCircos RCurl RJSONIO survival XML]; };
-  RTN = derive2 { name="RTN"; version="1.8.4"; sha256="17znp5k4jrxnl3iq5mlljkjzm5lhi5a5pw06gkd081zs6bwhi9v3"; depends=[car data_table ff igraph IRanges limma minet RedeR snow]; };
-  RTopper = derive2 { name="RTopper"; version="1.16.0"; sha256="0ikhlz9fa21ij9ikira4grc6fahjd8n2fwsdgkxr058zlzyw0c7b"; depends=[Biobase limma multtest]; };
-  RUVSeq = derive2 { name="RUVSeq"; version="1.4.0"; sha256="0xqma406k3sd47r830jc00al2xmx3wmfg5q0zk3b29bxiklj5w4f"; depends=[Biobase EDASeq edgeR MASS]; };
-  RUVcorr = derive2 { name="RUVcorr"; version="1.2.0"; sha256="1iaja7xcmih63vp9g4km8yx2rrafkybp3azrxw5i28sv1hl7187j"; depends=[BiocParallel bladderbatch corrplot gridExtra lattice MASS psych reshape2 snowfall]; };
-  RUVnormalize = derive2 { name="RUVnormalize"; version="1.4.1"; sha256="13ksgz1givgy3ws97xa1x8v96ikpia5s9675l3xkz1fzsm3wmbzi"; depends=[Biobase RUVnormalizeData]; };
-  RWebServices = derive2 { name="RWebServices"; version="1.34.0"; sha256="05czankzfvgsfrs2am8dkglzcix22s7gc4bgci0a66x8z31dlkx0"; depends=[RCurl SJava TypeInfo]; };
-  RamiGO = derive2 { name="RamiGO"; version="1.16.0"; sha256="12mwfcljw323aqpzc4z5hl2h5qy51bpi5z59x4hx8inw3vc3n55y"; depends=[graph gsubfn igraph png RCurl RCytoscape]; };
-  RankProd = derive2 { name="RankProd"; version="2.42.0"; sha256="0ma0mmj335v04bx96wssas81hx9apv6gv9y54cgac4n6v1ci9a9y"; depends=[]; };
-  RareVariantVis = derive2 { name="RareVariantVis"; version="1.2.0"; sha256="1azfhbb9hpahpglwal4qd8c91zkjhda42ljn2jjd8ylvl4mgzv96"; depends=[BiocGenerics GenomeInfoDb GenomicRanges googleVis IRanges S4Vectors VariantAnnotation]; };
-  Rariant = derive2 { name="Rariant"; version="1.6.1"; sha256="00q303w8gmp7p8s0k10l6w524d1yjjxhwckgg7g34hgvak75dqdg"; depends=[dplyr exomeCopy GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges reshape2 Rsamtools S4Vectors shiny SomaticSignatures VariantAnnotation VGAM]; };
-  RbcBook1 = derive2 { name="RbcBook1"; version="1.38.0"; sha256="1pg6bg2q9whz4g0483ll3l71w7jiy68xd8l71vgr8zy0nip1kmg1"; depends=[Biobase graph rpart]; };
-  Rbowtie = derive2 { name="Rbowtie"; version="1.10.0"; sha256="1pdkircilkk9cnb556jmmany1c1xjg29blrs0knribzn6h6bm76s"; depends=[]; };
-  Rcade = derive2 { name="Rcade"; version="1.12.0"; sha256="08q62agkyb810b0hfvs9vb9rh0ls8zrz83558xprijjizrkg9cg2"; depends=[baySeq GenomicRanges plotrix rgl Rsamtools S4Vectors]; };
-  Rchemcpp = derive2 { name="Rchemcpp"; version="2.8.0"; sha256="0zz9s3zvxgs6mpiq085zy20sqajyx1645cz3848h2l0w1w5m6lga"; depends=[ChemmineR Rcpp]; };
-  RchyOptimyx = derive2 { name="RchyOptimyx"; version="2.10.0"; sha256="0cmyjyr3dn8df9ss4zhhm6y1lhf68msl5br070x01i8kgh4dagky"; depends=[flowType graph Rgraphviz sfsmisc]; };
-  Rcpi = derive2 { name="Rcpi"; version="1.6.0"; sha256="19h9zxkb4zw9c46fvd0yn7bzy03a73glc4yyla0fzrngk1vs2s5q"; depends=[Biostrings ChemmineR doParallel fmcsR foreach GOSemSim rcdk RCurl rjson]; };
-  Rdisop = derive2 { name="Rdisop"; version="1.30.0"; sha256="0v9dm982y2f6gd4lxr2c123a4ijsa8sbn6mkcchwlli8hbxxvpcf"; depends=[Rcpp RcppClassic]; };
-  ReQON = derive2 { name="ReQON"; version="1.16.0"; sha256="1j79vmhk34argysbjyxcsmfjsplkxq4cn8gprm6min1v08xzryg0"; depends=[rJava Rsamtools seqbias]; };
-  ReactomePA = derive2 { name="ReactomePA"; version="1.14.4"; sha256="1dywrigxh29i50k607fi4p33dxjw2dlm5q86i0400l99lp0xj0di"; depends=[AnnotationDbi DOSE graphite igraph reactome_db]; };
-  ReadqPCR = derive2 { name="ReadqPCR"; version="1.16.0"; sha256="04d3gam21cia44w7wz1ai8a60igsbjslac25rb7z5i9ijbx8jk9q"; depends=[affy Biobase]; };
-  RedeR = derive2 { name="RedeR"; version="1.18.1"; sha256="0arhg8zav0h3ivinnyl6b4z85b4l3w9vlzxiixnwzdmnr2ch78dc"; depends=[igraph pvclust RCurl XML]; };
-  RefNet = derive2 { name="RefNet"; version="1.6.1"; sha256="0l0krjjk1jld7z5zy6k3z6m2qkqd86yj92xfck75q3bq3jm96h0j"; depends=[AnnotationHub BiocGenerics IRanges PSICQUIC RCurl shiny]; };
-  RefPlus = derive2 { name="RefPlus"; version="1.40.0"; sha256="13qlm4smaafx1x78wn959wc1rm4wns7l6qgdmh1lg5khkrrh3x19"; depends=[affy affyPLM Biobase preprocessCore]; };
-  Repitools = derive2 { name="Repitools"; version="1.16.0"; sha256="1jsimbrnfzvdydb4s6zvimj58gpxyydyngq2dflacg1gd7msq66a"; 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.10.0"; sha256="1zlxr7z7c3vlkbmpcmw88a9caaf1gwhh8jv31fg2njy60vysb0m0"; 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.14.0"; sha256="0lwg57kja3r7ij1d3yp5g3r0zbzn2nannlvsh029sd626yfp6fb6"; depends=[graph]; };
-  Rhtslib = derive2 { name="Rhtslib"; version="1.2.1"; sha256="0x7x8sbzjxssnnfa43kh38nlkqz6qvj41xdbgniyp7b6kyyr0na4"; depends=[zlibbioc]; };
-  RiboProfiling = derive2 { name="RiboProfiling"; version="1.0.3"; sha256="096lpmrdwbsw71k4qdx9d0zgs83r0ixphkg60p40vgvpmhq1c3dh"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape Rsamtools rtracklayer S4Vectors]; };
-  Ringo = derive2 { name="Ringo"; version="1.34.0"; sha256="0r549n840sq9whaz8nk7rz3wardxc8jvwdni4bd5f7zzrhj0ynhl"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
-  Risa = derive2 { name="Risa"; version="1.12.0"; sha256="0s23fbdk1v1cg0c67vhkz53wava1swjig8fz8jsv8av0pqb0rg17"; depends=[affy Biobase biocViews Rcpp xcms]; };
-  Rmagpie = derive2 { name="Rmagpie"; version="1.26.0"; sha256="1iwiy8d5cvrmk6jgwaplx980gzdgxp9k53zjwmzya8bar7386sgs"; depends=[Biobase e1071 kernlab pamr]; };
-  RmiR = derive2 { name="RmiR"; version="1.26.0"; sha256="1nnpr5jp5anbqbgyg53qqjhi49bibymc0l3yj6ar5d6csavrympb"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
-  RnBeads = derive2 { name="RnBeads"; version="1.2.2"; sha256="1nn64lqnzvvlms8m0i3rn5mrp12xxjra8wssabbbnbdg60a1g7i1"; depends=[BiocGenerics cluster ff fields GenomicRanges ggplot2 gplots gridExtra illuminaio IRanges limma MASS matrixStats methylumi plyr RColorBrewer]; };
-  RnaSeqSampleSize = derive2 { name="RnaSeqSampleSize"; version="1.2.0"; sha256="11zkq3i8pn9qfs8qynnrlfmr9fdnmqayqmgxzw54fzpj62b0y894"; depends=[biomaRt edgeR heatmap3 KEGGREST matlab Rcpp RnaSeqSampleSizeData]; };
-  Rnits = derive2 { name="Rnits"; version="1.4.0"; sha256="0igqimvync5sz1hsn3m9ijivw1vxi8vjpsdcjzf9dkyqhkand6r3"; depends=[affy Biobase boot ggplot2 impute limma qvalue reshape2]; };
-  Roleswitch = derive2 { name="Roleswitch"; version="1.8.0"; sha256="0libkpp9scrbakhzp030bx86f4np6ijn01r8xzn02f5106h23gz7"; depends=[Biobase biomaRt Biostrings DBI microRNA plotrix pracma reshape]; };
-  Rolexa = derive2 { name="Rolexa"; version="1.26.0"; sha256="184v27zycmqnj4fpjgrxl3vcxxfxwkbfqdzm6wsyxixm93rmz7v4"; depends=[Biostrings IRanges mclust ShortRead]; };
-  RpsiXML = derive2 { name="RpsiXML"; version="2.12.0"; sha256="0zlcr1f5sf98bwxakbmq33kniwlpxcc32z5fz7vqsasyv5vbz1ks"; depends=[annotate AnnotationDbi Biobase graph hypergraph RBGL XML]; };
-  Rqc = derive2 { name="Rqc"; version="1.4.2"; sha256="0kmp69c2hinfh5bn8ka5rsd4fl14gh4xjj24gw5kasjfbhy5l90x"; 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.22.0"; sha256="1yc3nzzms3igjwr4l9yd3wdac95glcs08b4cfp7disyly0wcskjd"; depends=[BiocGenerics BiocParallel Biostrings bitops GenomeInfoDb GenomicRanges IRanges S4Vectors XVector zlibbioc]; };
-  Rsubread = derive2 { name="Rsubread"; version="1.20.3"; sha256="0i0dns4392cflajx58x3wy8m6fbh4pb6vyiliisws1cxdq3yilk4"; depends=[]; };
-  Rtreemix = derive2 { name="Rtreemix"; version="1.32.0"; sha256="0snj644rc6cyjcswckz88fihd6ynjq3sj7qf733vbvqj8d12dqk8"; depends=[Biobase graph Hmisc]; };
-  S4Vectors = derive2 { name="S4Vectors"; version="0.8.11"; sha256="12iibcs63m9iy7f45wgjcqsna2dnqwckphk682389grshz0g4x66"; depends=[BiocGenerics]; };
-  SAGx = derive2 { name="SAGx"; version="1.44.0"; sha256="0rrw1y80ybpskwvcdbyqq8m4d17sz07bv9gpa27rvfq2sy4znsk6"; depends=[Biobase multtest]; };
-  SANTA = derive2 { name="SANTA"; version="2.8.0"; sha256="1dlc6m8lq9cyvxqrp0gnrfx1ksfl5p2hvgl5n67sag3z40vdhflc"; depends=[igraph Matrix snow]; };
-  SBMLR = derive2 { name="SBMLR"; version="1.66.0"; sha256="0xa9s382nd8gpkx2lp02iarjqqs2w4qp6xzg9sy654yg4iyjmnms"; depends=[deSolve XML]; };
-  SCAN_UPC = derive2 { name="SCAN.UPC"; version="2.12.1"; sha256="0z5qp738xwwnsiv5bygfyljxld0vw805xl3plh5wrwy9gsxn2c7v"; depends=[affy affyio Biobase Biostrings foreach GEOquery IRanges MASS oligo sva]; };
-  SELEX = derive2 { name="SELEX"; version="1.2.0"; sha256="019142j9x7p38mi3wvzxm138s9cmq8ljkb5i5lk5pj1z8cc3ci0d"; depends=[Biostrings rJava]; };
-  SEPA = derive2 { name="SEPA"; version="1.0.0"; sha256="1hvkz3pyp8qkq1mjw9wl426db6n3ay05bx2djkdpvpbai4fjwgvc"; depends=[ggplot2 org_Hs_eg_db org_Mm_eg_db reshape2 segmented shiny topGO]; };
-  SGSeq = derive2 { name="SGSeq"; version="1.4.3"; sha256="09x0mw1xil0p3742w031ljrh5ywr1axsakw7j6300v98j87l2ymv"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges igraph IRanges Rsamtools rtracklayer RUnit S4Vectors SummarizedExperiment]; };
-  SICtools = derive2 { name="SICtools"; version="1.0.0"; sha256="16yzykl4s1b2nkgarxsrgvk6cvjdfla3x3ijjn1yxj22wjdzfg9m"; depends=[Biostrings doMC foreach GenomicRanges IRanges matrixStats Rsamtools stringr]; };
-  SIM = derive2 { name="SIM"; version="1.40.0"; sha256="02v2fi0yw1sxj5f41h7lihs96y9crca2srwflpdjif8sx6pk6yvq"; depends=[globaltest quantreg quantsmooth]; };
-  SIMAT = derive2 { name="SIMAT"; version="1.2.0"; sha256="1qwird1yqwdh7085d4k7zgy1ld0c6215ks6i3d3d71pwg22agiw4"; depends=[ggplot2 mzR Rcpp reshape2]; };
-  SISPA = derive2 { name="SISPA"; version="1.0.0"; sha256="01kf83hlc7qyyxr4dx86m9vc16cydrkw4sajs2ikpn2fnrqkx6z1"; depends=[changepoint data_table ggplot2 GSVA plyr]; };
-  SJava = derive2 { name="SJava"; version="0.96.0"; sha256="17qvrd8n0vrn9fn9p31s2bhzf6064hnf89c54hbx3flzki73waaz"; depends=[]; };
-  SLGI = derive2 { name="SLGI"; version="1.30.0"; sha256="1pardqmvmi4877q09n3379wq57pyqla53s8gxvygrqny2drb5crj"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; };
-  SLqPCR = derive2 { name="SLqPCR"; version="1.36.0"; sha256="02i77a1rrz46sgrji57nm92d6w50wcwdagxa6y2a6rdcjcv2g66n"; depends=[]; };
-  SMAP = derive2 { name="SMAP"; version="1.34.0"; sha256="07mdnmirsbz8m5zky169q2mqdn1sdh1nlx8qsgdf8h0n0vcs2h3z"; depends=[]; };
-  SNAGEE = derive2 { name="SNAGEE"; version="1.10.0"; sha256="187xcsdpbjdiabzjg3gggnz1rcwgjzj4279i26h879ijs7hli19w"; depends=[SNAGEEdata]; };
-  SNPRelate = derive2 { name="SNPRelate"; version="1.4.2"; sha256="0iy4y58bhkr6ig1n2arw7pra29fsrxp10kzf9a479jrn3jdxxb0q"; depends=[gdsfmt]; };
-  SNPchip = derive2 { name="SNPchip"; version="2.16.0"; sha256="1fxskvkzn0mfcg2zjs2r2fr0pifrha54a15vbxxcawy4pggf7fdv"; depends=[Biobase foreach GenomeInfoDb GenomicRanges IRanges lattice oligoClasses SummarizedExperiment]; };
-  SNPhood = derive2 { name="SNPhood"; version="1.0.7"; sha256="1kr86xm2w6pmwbglhl97qpxyzsyqzrkzkjav6dm0zqn24f1q9579"; depends=[BiocGenerics BiocParallel Biostrings checkmate cluster data_table DESeq2 GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges lattice RColorBrewer reshape2 Rsamtools VariantAnnotation]; };
-  SPEM = derive2 { name="SPEM"; version="1.10.0"; sha256="1b6r9x5q06ai6fh99a0qcx3lnjdqip7vhy32i38s16ixw9g94rcf"; depends=[Biobase Rsolnp]; };
-  SPIA = derive2 { name="SPIA"; version="2.22.0"; sha256="0103aapq3p6il4acaa9fna1a5iri3fb656r60xg6ljyywcgy55yl"; depends=[KEGGgraph]; };
-  SQUADD = derive2 { name="SQUADD"; version="1.20.0"; sha256="1nxf68waqnm9jaj0r8z1499kw5c6l1sykj38wikcc39bsyy23kxm"; depends=[RColorBrewer]; };
-  SRAdb = derive2 { name="SRAdb"; version="1.28.0"; sha256="0savk9qi8x2vyrn2f29pzjd14ngczw3qidfggqwksayd2kx4nh1j"; depends=[GEOquery graph RCurl RSQLite]; };
-  SSPA = derive2 { name="SSPA"; version="2.10.0"; sha256="1835g6chjrl1kz5zc710jy0lx04b84khk2kx981ga6rmlihn5xyc"; depends=[lattice limma qvalue]; };
-  STAN = derive2 { name="STAN"; version="1.4.0"; sha256="0phrznzv3n9nvjbxb172ywxcc6dfjz2gw21w4nzxiwcjaf3kg841"; depends=[Rsolnp]; };
-  STATegRa = derive2 { name="STATegRa"; version="1.4.0"; sha256="1nw4r8h8gv8y8a6qhh8gnsdc7pyp3h762ayhgkjy844kmxn316ad"; depends=[affy Biobase calibrate edgeR foreach ggplot2 gplots gridExtra limma MASS]; };
-  STRINGdb = derive2 { name="STRINGdb"; version="1.10.1"; sha256="0wj8rrm7syvgisv6cn7zh81fpg33qbyzacv69d96wdwp8jsspdh2"; depends=[gplots hash igraph plotrix plyr png RColorBrewer RCurl sqldf]; };
-  SVM2CRM = derive2 { name="SVM2CRM"; version="1.2.0"; sha256="06jhyvq3j35skvkf57iqfphypsv43k12i0wybhhvx4wjsdrrhmwq"; depends=[AnnotationDbi GenomicRanges IRanges LiblineaR mclust pls ROCR rtracklayer squash SVM2CRMdata verification zoo]; };
-  SWATH2stats = derive2 { name="SWATH2stats"; version="1.0.3"; sha256="03p18b0kz33g7jldynxsk561xrrl547m3w7cb2gq766k56fv93m6"; depends=[data_table reshape2]; };
-  SamSPECTRAL = derive2 { name="SamSPECTRAL"; version="1.24.0"; sha256="1bpaz8vzk3iysbcsdky2vcwvkc38m66b4bh1jnxgh6ld318pkllz"; depends=[]; };
-  ScISI = derive2 { name="ScISI"; version="1.42.0"; sha256="0bmpl2zaalwxhhc9vj9v3x8ig6hbj4lrbfl2dxmivgsh1hqvbcli"; depends=[annotate AnnotationDbi apComplex GO_db org_Sc_sgd_db RpsiXML]; };
-  SemDist = derive2 { name="SemDist"; version="1.4.0"; sha256="13wazcicjss3ybj20n958qjxk34aylpza4nggk0np8bjs5460i6j"; depends=[annotate AnnotationDbi GO_db]; };
-  SeqArray = derive2 { name="SeqArray"; version="1.10.6"; sha256="1x9zf02h1x1sqypf5663hjl6xvq8d0q4h6ls1ndagkaqkrwqhgyd"; depends=[Biostrings gdsfmt GenomicRanges IRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
-  SeqGSEA = derive2 { name="SeqGSEA"; version="1.10.0"; sha256="02jbxncy2y2p7xg33xpv4hwcd8344qsfy3ibb9d4c8kf9b5wj9f1"; depends=[Biobase biomaRt DESeq doParallel]; };
-  SeqVarTools = derive2 { name="SeqVarTools"; version="1.8.1"; sha256="1sgkcqhqhrxzipwcwn5kvhsns08dh1fdpd8xzhmzylsr5yb9cbsy"; depends=[Biobase gdsfmt GenomicRanges GWASExactHW IRanges S4Vectors SeqArray stringr VariantAnnotation]; };
-  ShortRead = derive2 { name="ShortRead"; version="1.28.0"; sha256="00awzvdpd21shixcx03mjqz8bqww2z96ffkna2gpqh3f7d2pmhii"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
-  SigCheck = derive2 { name="SigCheck"; version="2.2.1"; sha256="001i9izz5g9p8ymxicx884gsqc53jq6pck4al3s2i0y0mhv9dw8m"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
-  SigFuge = derive2 { name="SigFuge"; version="1.8.0"; sha256="1bs55pc5z3x22708pdr551rxvq66i2xyi9l9j1i6vnl7h1433iy3"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
-  SimBindProfiles = derive2 { name="SimBindProfiles"; version="1.8.0"; sha256="1cyqlzb6vykxndslwvmj9sn7hzrq3lqjwsmvkvl7ivfigrslg142"; depends=[Biobase limma mclust Ringo]; };
-  SomatiCA = derive2 { name="SomatiCA"; version="1.14.0"; sha256="0a6l05zvc8jkckaznflrkknm144179hp77ck0pwrcp2065bglb1z"; depends=[DNAcopy doParallel foreach GenomicRanges IRanges lars rebmix sn]; };
-  SomaticSignatures = derive2 { name="SomaticSignatures"; version="2.6.0"; sha256="14w5p7vv8nyxmbfc9yxsc21xrzi8rfylw0dcpkv0p1l431qc8icg"; depends=[Biobase Biostrings GenomeInfoDb GenomicRanges ggbio ggplot2 IRanges NMF pcaMethods proxy reshape2 S4Vectors VariantAnnotation]; };
-  SpacePAC = derive2 { name="SpacePAC"; version="1.8.0"; sha256="11szjavnv8b3sdqdzda3vsx3rbzmnzdimm4b37lm3rfqzrs14qhc"; depends=[iPAC]; };
-  SpeCond = derive2 { name="SpeCond"; version="1.24.0"; sha256="1a9nxq2zdv1qvqk5byi8nrazkgqkdna8i4h2vibng33cjzjvxrdv"; depends=[Biobase fields hwriter mclust RColorBrewer]; };
-  SplicingGraphs = derive2 { name="SplicingGraphs"; version="1.10.0"; sha256="0p43f313qhhrpvkdsr7qzp825am6yv0cg1ypbw0kfbkgsysi7z5v"; depends=[BiocGenerics GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges graph igraph IRanges Rgraphviz Rsamtools S4Vectors]; };
-  Starr = derive2 { name="Starr"; version="1.26.0"; sha256="0ra9x1kzr0r2wa1ihapzmldq0fdr91rfbbglmzjnq92wrw6rvkd2"; depends=[affxparser affy MASS pspline Ringo zlibbioc]; };
-  Streamer = derive2 { name="Streamer"; version="1.16.0"; sha256="09bjwj9ynhjl1lgwh4444xjs4l1vj8sar5d1ph1b12fl48rb62zm"; depends=[BiocGenerics graph RBGL]; };
-  SummarizedExperiment = derive2 { name="SummarizedExperiment"; version="1.0.2"; sha256="1gpmh1mi70m5k5qnyjs1h0qn8ajrzalzic7k3762xchxsmmdvxn4"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
-  Sushi = derive2 { name="Sushi"; version="1.8.0"; sha256="1ldvv1028chnh8ng85534k924cgdmzqb3i18z6xpacsjgg5k7s7l"; depends=[biomaRt zoo]; };
-  SwimR = derive2 { name="SwimR"; version="1.8.0"; sha256="0vwjrpm4qbhc8afv0zj0al3rv06izp649kz8h3pb1yixw4bwrxg8"; depends=[gplots heatmap_plus R2HTML signal]; };
-  TCC = derive2 { name="TCC"; version="1.10.0"; sha256="1r56h2l2jcva4fi6yzch4rwllyp5hwvy93dn1rna9jjf8q5m4nkp"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
-  TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="1.0.9"; sha256="12rg49xqfbgh1djirlj9bs29c6iksjs7szrd62lwpi9ljdn1sqsc"; depends=[affy Biobase BiocGenerics biomaRt coin ConsensusClusterPlus data_table devtools dnet doParallel downloader dplyr EDASeq edgeR genefilter GenomicFeatures GenomicRanges GGally ggplot2 gplots heatmap_plus igraph IRanges limma plyr RColorBrewer RCurl rjson rvest S4Vectors scales stringr SummarizedExperiment supraHex survival TxDb_Hsapiens_UCSC_hg19_knownGene xlsx XML xml2 xtable]; };
-  TDARACNE = derive2 { name="TDARACNE"; version="1.20.0"; sha256="0jf89s2bnz8psd7vqh3l29ch5mb2ilky2jmv8db4kcqaw9157kn8"; depends=[Biobase GenKern Rgraphviz]; };
-  TEQC = derive2 { name="TEQC"; version="3.10.0"; sha256="1kpibmaqqrdshbrw94080zxjlscfssddzjaqlx3l9zvhrw9sbl38"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
-  TFBSTools = derive2 { name="TFBSTools"; version="1.8.2"; sha256="1fnfm3masx093p879ak193v2nf62rlncq1j6wbjkhq61imyr02pm"; 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.2.0"; sha256="051v518zyqz2lrp886hqapchngqxj2kz58dchjvafgaa2l5zyy9z"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
-  TPP = derive2 { name="TPP"; version="2.0.3"; sha256="152hay6h8nwjp2yfqz8wl7y6jv32h6aq9kn58vsyrjaay6kd9v2g"; depends=[Biobase doParallel foreach ggplot2 gridExtra nls2 openxlsx plyr RColorBrewer RCurl reshape2 VennDiagram VGAM]; };
-  TRONCO = derive2 { name="TRONCO"; version="2.2.0"; sha256="1ljciqm93iqr184pyyw1rdqdqllkk548zp68zpcvv91g7kdgf7ii"; depends=[bnlearn cgdsr doParallel ggplot2 gridExtra gtable igraph RColorBrewer reshape2 Rgraphviz scales xtable]; };
-  TSCAN = derive2 { name="TSCAN"; version="1.8.0"; sha256="1cp723wp4g4g42l25p313lyc7hv4lp8fg95k60kpnqql356b0c7p"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
-  TSSi = derive2 { name="TSSi"; version="1.16.0"; sha256="16cry226v35mjgw1w1sk4kgi8cjqwkls563y088mfz6fygfmg4ld"; depends=[Biobase BiocGenerics Hmisc IRanges minqa plyr S4Vectors]; };
-  TarSeqQC = derive2 { name="TarSeqQC"; version="1.0.2"; sha256="1k9wf8q82yx6ygvxl9vaj8ypwaljxjv76jk8xwf994hxn1sjx7v4"; depends=[BiocGenerics BiocParallel cowplot GenomeInfoDb GenomicRanges ggplot2 IRanges openxlsx plyr reshape2 Rsamtools S4Vectors]; };
-  TargetScore = derive2 { name="TargetScore"; version="1.8.0"; sha256="184n05p2c9g5yc53sx29dxq1pqa3appb2s7wr6n0271c08lkqc11"; depends=[Matrix pracma]; };
-  TargetSearch = derive2 { name="TargetSearch"; version="1.26.0"; sha256="1kk8qnrp8x4iijmkbqrvpyjvf7z8yd1jwp6mgjlqba5l09n65g29"; depends=[]; };
-  TitanCNA = derive2 { name="TitanCNA"; version="1.8.0"; sha256="06i4gbpw356m9qxl5kj0xgnr6kvcl85qnq1z6aqjhy2x5qdiw92n"; depends=[foreach GenomeInfoDb IRanges Rsamtools]; };
-  ToPASeq = derive2 { name="ToPASeq"; version="1.4.0"; sha256="18fwifmih7x4wr7s3nr8qwvxbp0a33qj39sfwkvhr97jqdggb78j"; depends=[AnnotationDbi Biobase clipper DESeq DESeq2 doParallel edgeR fields GenomicRanges graph graphite gRbase KEGGgraph limma locfit qpgraph R_utils RBGL Rcpp Rgraphviz TeachingDemos]; };
-  TransView = derive2 { name="TransView"; version="1.14.0"; sha256="02as66pzhgls2papji5mqpaczvdfpi6af0mafip8i9hj06z41wci"; depends=[GenomicRanges gplots IRanges Rsamtools zlibbioc]; };
-  TurboNorm = derive2 { name="TurboNorm"; version="1.18.0"; sha256="145fb32c5zi7rhnqxad6nq1vx61vc1f28qjxvnccxxb2ia3b8jcd"; depends=[affy convert lattice limma marray]; };
-  TypeInfo = derive2 { name="TypeInfo"; version="1.36.0"; sha256="0f0cllsf0pw2bgvq9fhfksqsxb2820js5y125vhcr0ns5kcvi07y"; depends=[]; };
-  UNDO = derive2 { name="UNDO"; version="1.12.0"; sha256="1qz9md9j8jhrgl7iap6im4y08nwnydzgxpanpnpsaad1irrlgcaq"; depends=[Biobase BiocGenerics boot MASS nnls]; };
-  UniProt_ws = derive2 { name="UniProt.ws"; version="2.10.4"; sha256="0wx5jd45b69id7ffhyc8py15kw8nl0ii0j528xfw7m2x1xzydn6w"; depends=[AnnotationDbi BiocGenerics RCurl RSQLite]; };
-  VanillaICE = derive2 { name="VanillaICE"; version="1.32.2"; sha256="0qbj7rqhwmyz7dgljx6f9viy3gxnb2hnmnp8pnrj454l2hn30yj6"; depends=[Biobase BiocGenerics crlmm data_table foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment]; };
-  VariantAnnotation = derive2 { name="VariantAnnotation"; version="1.16.4"; sha256="1z42j3p9b8h725inq8n0230llsdbav3gwcxy1nliypzfkxbzahsb"; depends=[AnnotationDbi Biobase BiocGenerics Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment XVector zlibbioc]; };
-  VariantFiltering = derive2 { name="VariantFiltering"; version="1.6.20"; sha256="1bfp9x4njgmzqc17c2mv5s9lvrzymjr2rjyhng5d8sq2ms7da9kp"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel Biostrings BSgenome DBI GenomeInfoDb GenomicFeatures GenomicRanges graph Gviz IRanges RBGL Rsamtools RSQLite S4Vectors shiny VariantAnnotation XVector]; };
-  VariantTools = derive2 { name="VariantTools"; version="1.12.0"; sha256="0c2sh4fda4gjxazxzd694a5cqj57mpa7f6hvafn6k40iz816x22f"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges gmapR IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  Vega = derive2 { name="Vega"; version="1.18.0"; sha256="0f7rzzckd69xbnism0v7jl0dly55lwj30nla7yj88qqalnb7ajzs"; depends=[]; };
-  VegaMC = derive2 { name="VegaMC"; version="3.8.0"; sha256="004zx8hihj503g5fiq5njk09fns6ra7qvzbzb44q2dpd0n02ifqc"; depends=[Biobase biomaRt genoset]; };
-  XBSeq = derive2 { name="XBSeq"; version="1.0.2"; sha256="01h3hj4mm7dr16vwbra5iazrgar9nbh2gs2gklyx0wqjfzm3gj49"; depends=[Biobase Delaporte DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma]; };
-  XDE = derive2 { name="XDE"; version="2.16.0"; sha256="0zwp1vqjp3bfxvnkik9k57djnyf29qm57wlldv3zgk65lqxrdm5n"; depends=[Biobase BiocGenerics genefilter gtools MergeMaid mvtnorm]; };
-  XVector = derive2 { name="XVector"; version="0.10.0"; sha256="0havwyr6xqk7w0rmbwfj9jq1djz7wzdz7w39adhklwzwz9l4ih3a"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
-  a4 = derive2 { name="a4"; version="1.18.0"; sha256="07969ixxf20i2xh8c29s6qgghk7qndlc8b30w9ydq5yfd8v1wdys"; depends=[a4Base a4Classif a4Core a4Preproc a4Reporting]; };
-  a4Base = derive2 { name="a4Base"; version="1.18.0"; sha256="1xqdkax03yqnzzyys3zdzndgzp5z52zpvbllqnnlhpf7j0wgqms4"; depends=[a4Core a4Preproc annaffy AnnotationDbi Biobase genefilter glmnet gplots limma mpm multtest]; };
-  a4Classif = derive2 { name="a4Classif"; version="1.18.0"; sha256="1bci0b09h5622xn195mrf3s2h7mngjvnx7h5z4smykja7fxn839p"; depends=[a4Core a4Preproc glmnet MLInterfaces pamr ROCR varSelRF]; };
-  a4Core = derive2 { name="a4Core"; version="1.18.0"; sha256="0zchs5rii0215x6vk3ma210l1j9m5hlmpfs973h3lia7qb2amjkp"; depends=[Biobase glmnet]; };
-  a4Preproc = derive2 { name="a4Preproc"; version="1.18.0"; sha256="1hil6m4mqjw6ppn13ljpji1vdinsc6lsibknm974ykjjh1nkx9sx"; depends=[AnnotationDbi]; };
-  a4Reporting = derive2 { name="a4Reporting"; version="1.18.0"; sha256="156l5qrhwlsr3vvxwpxzkgajb6pcz0ilfm4dw4jinm1kyy3k7fkr"; depends=[annaffy xtable]; };
-  aCGH = derive2 { name="aCGH"; version="1.48.0"; sha256="0pch06jwwdn6s6cphrn4qn0syc47crliw9s5ii3dm03nh4z6p668"; depends=[Biobase cluster multtest survival]; };
-  acde = derive2 { name="acde"; version="1.0.0"; sha256="039dy5ssrnf9i8ahjfmf18f3z8vk2x61zkx3snm27mr0vi7nw84n"; depends=[boot]; };
-  adSplit = derive2 { name="adSplit"; version="1.40.0"; sha256="1djrgfspgi5aijpplqcq61mc4sbnfjj3rk1w3q714y2qazm0675i"; depends=[AnnotationDbi Biobase cluster GO_db KEGG_db multtest]; };
-  affxparser = derive2 { name="affxparser"; version="1.42.0"; sha256="13asms378wid2kw0p2qz6q3bq6didpgkv58sbl6f8amcy5yxvkf9"; depends=[]; };
-  affy = derive2 { name="affy"; version="1.48.0"; sha256="1k26qw2iirhsgfmkii49azcfki5hk9lpz6v9glayq78j3rspn1sk"; depends=[affyio Biobase BiocGenerics BiocInstaller preprocessCore zlibbioc]; };
-  affyContam = derive2 { name="affyContam"; version="1.28.0"; sha256="04xq22z965pdh5sy5lgfh2asqjxydm4mzgkz6wqk479xfqdhny5k"; depends=[affy affydata Biobase]; };
-  affyILM = derive2 { name="affyILM"; version="1.22.0"; sha256="0a51ynrzhb2w2gkgnnnyi36xljmkjkw954541ah82x5hq14aj0wc"; depends=[affxparser affy Biobase gcrma]; };
-  affyPLM = derive2 { name="affyPLM"; version="1.46.0"; sha256="19ci6vc899j39s2w48f64wy9yl5ls8xmxv7gmdwk4dmp2xm6ys2h"; depends=[affy Biobase BiocGenerics gcrma preprocessCore zlibbioc]; };
-  affyPara = derive2 { name="affyPara"; version="1.30.0"; sha256="14g7xrzsqqsr2h20nv000dd3v71wq18bq78r345w29fs53kipxxd"; depends=[affy affyio aplpack snow vsn]; };
-  affyQCReport = derive2 { name="affyQCReport"; version="1.48.0"; sha256="0cw6z8idar5qa9y3svrm5fdimdamb2xjjj59d107h2in7bvgni7j"; depends=[affy affyPLM Biobase genefilter lattice RColorBrewer simpleaffy xtable]; };
-  affycomp = derive2 { name="affycomp"; version="1.46.0"; sha256="0irzcp3b070b4hm0x2cn8fxm9rn1nlgspjl3la37v4jpmvzldi90"; depends=[Biobase]; };
-  affycoretools = derive2 { name="affycoretools"; version="1.42.0"; sha256="0b2wsxd293p8l7q6gci6gnqb0vw4r52mixrwz2af8cj6gs28l3vc"; depends=[affy AnnotationDbi Biobase gcrma ggplot2 GOstats gplots hwriter lattice limma oligoClasses ReportingTools xtable]; };
-  affyio = derive2 { name="affyio"; version="1.40.0"; sha256="0xza3c9b5a3ibwif7dl92gcj44yv56m9mw7fv00ldx2pygw20nyv"; depends=[zlibbioc]; };
-  affylmGUI = derive2 { name="affylmGUI"; version="1.44.0"; sha256="0gs6yc9xfjcf9jp1kg1vc4qrxs9vjm1ddhw3x3v87ywmba03xivw"; depends=[affy affyio affyPLM AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
-  affypdnn = derive2 { name="affypdnn"; version="1.44.0"; sha256="1av7a8w86wcslbl3q2zbnga8rww3n7dmwdywq4fm86pbmwh1jz9v"; depends=[affy]; };
-  agilp = derive2 { name="agilp"; version="3.2.0"; sha256="1xfa6f78410fdggsp9mlj4102i3rzcxp78n37bkprk4sib3dvmgq"; depends=[]; };
-  alsace = derive2 { name="alsace"; version="1.6.0"; sha256="1vrwi2rkccgiwgshz5rxyr55dl7awbh1drbhhsrbpjsbzxwmiv4a"; depends=[ALS ptw]; };
-  altcdfenvs = derive2 { name="altcdfenvs"; version="2.32.0"; sha256="1sb516qazxvad2vayd7sai1vg6vq9g7vjy4cyx6c0mqw7sl0pagl"; depends=[affy Biobase BiocGenerics Biostrings hypergraph makecdfenv]; };
-  ampliQueso = derive2 { name="ampliQueso"; version="1.8.0"; sha256="0v21y2nd0qwnag0n6h0krr9c0vpv6ig89d0jsi58x3pi5m0mypip"; depends=[DESeq doParallel edgeR foreach genefilter ggplot2 gplots knitr rgl rnaSeqMap samr statmod VariantAnnotation xtable]; };
-  annaffy = derive2 { name="annaffy"; version="1.42.0"; sha256="1fygm19y0ixh5ir7pldx26xck3w9pz1r26ddkj6ffnp4bljd35lk"; depends=[AnnotationDbi Biobase GO_db KEGG_db]; };
-  annmap = derive2 { name="annmap"; version="1.12.0"; sha256="12ixjb9bg49wdzjl0dpxl7lv7yj63fzsjgw2pqjwcimvgamk0vdw"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
-  annotate = derive2 { name="annotate"; version="1.48.0"; sha256="1b9fm7b5j2vknf5bm1dj17g6wb3smzq8s02dhx4mlqnpif1av6dk"; depends=[AnnotationDbi Biobase BiocGenerics DBI XML xtable]; };
-  annotationTools = derive2 { name="annotationTools"; version="1.44.0"; sha256="0qqkvibnz9j8p0007zahcc07y2avgcrbsxpj5hsdn4q4qs4igjxa"; depends=[Biobase]; };
-  anota = derive2 { name="anota"; version="1.18.0"; sha256="0nqshv23gz2q8mqmakw0blbrynbxp2s09i120yhci4qrvay5in7w"; depends=[multtest qvalue]; };
-  antiProfiles = derive2 { name="antiProfiles"; version="1.10.0"; sha256="0a707qd525265am6sc8l1k9161cjm8vblkgyzmvgy14zdw4pk479"; depends=[locfit matrixStats]; };
-  apComplex = derive2 { name="apComplex"; version="2.36.0"; sha256="0y84hiyzc5i7l2k1nfjfkq5gfll8nli1bqci5jl13207zhhc8jnq"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; };
-  aroma_light = derive2 { name="aroma.light"; version="3.0.0"; sha256="1mdncg64h9d7ppg626q42xyimz1s6arj5774hxhc06hq2isb5isi"; depends=[matrixStats R_methodsS3 R_oo R_utils]; };
-  arrayMvout = derive2 { name="arrayMvout"; version="1.28.0"; sha256="09jvfpzc1hz07rbsgkxcwiib6ihipq75k9w95bv4fdgd9i3jz4yb"; depends=[affy affyContam Biobase lumi mdqc parody simpleaffy]; };
-  arrayQuality = derive2 { name="arrayQuality"; version="1.48.0"; sha256="0cqmbf47rxa2d3is999abwk7j4kakwlb7fhxv0qw8x2j2r33vsrl"; depends=[gridBase hexbin limma marray RColorBrewer]; };
-  arrayQualityMetrics = derive2 { name="arrayQualityMetrics"; version="3.26.1"; sha256="0wqxlpppysl9kwmbppnvl78rr7f8z9787yfmr02grqrly3ag83fl"; depends=[affy affyPLM beadarray Biobase Cairo genefilter gridSVG Hmisc hwriter lattice latticeExtra limma RColorBrewer setRNG vsn XML]; };
-  attract = derive2 { name="attract"; version="1.22.0"; sha256="09nizaqjnsqkxkyiyp0amyc04z2yf23gp3wqf4y1jy5x9y1kkyqz"; depends=[AnnotationDbi Biobase cluster GOstats KEGG_db limma]; };
-  ballgown = derive2 { name="ballgown"; version="2.2.0"; sha256="12j7y2ldnbawqyfxaybb1a9ndylvw09n0d3p001wd1inqnml4xns"; depends=[Biobase GenomeInfoDb GenomicRanges IRanges limma RColorBrewer rtracklayer S4Vectors sva]; };
-  bamsignals = derive2 { name="bamsignals"; version="1.2.0"; sha256="11yix7rzk54zy1mh49d96kvz6ka8rlb66whb6mdkd5lyx32w8lwf"; depends=[BiocGenerics GenomicRanges IRanges Rcpp Rhtslib zlibbioc]; };
-  baySeq = derive2 { name="baySeq"; version="2.4.1"; sha256="0q3gfdg9l1ipz67bcjaly6fl4pfgwd95cy2hpk4sck59lknh1jm4"; depends=[abind GenomicRanges perm]; };
-  beadarray = derive2 { name="beadarray"; version="2.20.1"; sha256="1kgabdnq20i5p0yyim0m2vcp3lkn39fzlghahj9nrvrl9i4n3gyn"; depends=[AnnotationDbi BeadDataPackR Biobase BiocGenerics GenomicRanges ggplot2 illuminaio IRanges limma reshape2]; };
-  beadarraySNP = derive2 { name="beadarraySNP"; version="1.36.0"; sha256="1dj5zi9lkyq5lgrcmr08cjdv3ysfa6p9zc8jza8mm6vy14qsl5ah"; depends=[Biobase quantsmooth]; };
-  betr = derive2 { name="betr"; version="1.26.0"; sha256="1rs2xajrac3a4sk88i7zq3v849969iw0k8wmpbc0ihw9m4ljb0sx"; depends=[Biobase limma mvtnorm]; };
-  bgafun = derive2 { name="bgafun"; version="1.32.0"; sha256="1wakjjdcgzl9snsa9i1f7kk0ppwiccxmznd93yawvjk74gqwnkp3"; depends=[ade4 made4 seqinr]; };
-  bgx = derive2 { name="bgx"; version="1.36.0"; sha256="1x0i4llp6yrfybp7lwqwc7kb1s12dl8a0nwymhjd3fkfv5lslfbx"; depends=[affy Biobase gcrma]; };
-  bigmemoryExtras = derive2 { name="bigmemoryExtras"; version="1.14.2"; sha256="05ksk3phvh4wc3vgfj5bl1jfxhndia90bkq9s91wfjzcfkrd41q8"; depends=[bigmemory Biobase]; };
-  bioDist = derive2 { name="bioDist"; version="1.42.0"; sha256="0l5f8yj76sdx7c2zf50h395a4hbqnycnzx5iw3by4rh45xs6pcxj"; depends=[Biobase KernSmooth]; };
-  bioassayR = derive2 { name="bioassayR"; version="1.8.25"; sha256="0fnqdkzpyk6zr5s2yb2sr5gp4vaga0qrdxcffcri39wvzpfny4h0"; depends=[BiocGenerics ChemmineR DBI Matrix rjson RSQLite XML]; };
-  biobroom = derive2 { name="biobroom"; version="1.2.0"; sha256="15v4s9cdvl4n5sx0n2sskhmq9xvs2cdrxxd7y4l59jgg421fzg7i"; depends=[Biobase broom dplyr tidyr]; };
-  biocGraph = derive2 { name="biocGraph"; version="1.32.0"; sha256="0sdnysj0dds74a7jb9qrpkix34d8ray5sp4v6c0kwzcqvax47a1s"; depends=[BiocGenerics geneplotter graph Rgraphviz]; };
-  biocViews = derive2 { name="biocViews"; version="1.38.1"; sha256="1ydgxnzkmdfydj6x1pi46qaf8l0nlvw9ycx91zwylwbpz37mss49"; depends=[Biobase graph knitr RBGL RCurl RUnit XML]; };
-  biomaRt = derive2 { name="biomaRt"; version="2.26.1"; sha256="1s709055abj2gd35g6nnk5d2ai5ii09iir270l2xika6pi62gj3f"; depends=[AnnotationDbi RCurl XML]; };
-  biomvRCNS = derive2 { name="biomvRCNS"; version="1.10.0"; sha256="1vma189z83hvq90g6vaaw87znpk7srl2s1vikicah40s72awywm6"; depends=[GenomicRanges Gviz IRanges mvtnorm]; };
-  biosvd = derive2 { name="biosvd"; version="2.6.0"; sha256="0mjkan7drib9v49dk3rnrkydm1dxfqimk5gk4jm9qv8kdfcjk0zh"; depends=[Biobase BiocGenerics NMF]; };
-  biovizBase = derive2 { name="biovizBase"; version="1.18.0"; sha256="1lp89grxfgkhc9h5jmqs2nr9gr8321nyzwimrszls9dcc787xf00"; depends=[AnnotationDbi BiocGenerics Biostrings dichromat GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges Hmisc IRanges RColorBrewer Rsamtools S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  birta = derive2 { name="birta"; version="1.14.0"; sha256="1pszpvmvjp1r0bwj7w9ws0y8xmb3yfmq5gifj9jwvgw2p7y718zr"; depends=[Biobase limma MASS]; };
-  birte = derive2 { name="birte"; version="1.6.1"; sha256="08jkjlkjswz3x4sxw80xr9ck6277ag1gzv5y1dxh7aa6i644w48p"; depends=[Biobase glmnet limma MASS nem Rcpp RcppArmadillo]; };
-  blima = derive2 { name="blima"; version="1.4.0"; sha256="1mv153f42x0pjva03gw8b064qmf2558p82xqzvxqycyn7ry3riyz"; depends=[beadarray Biobase BiocGenerics]; };
-  bridge = derive2 { name="bridge"; version="1.34.0"; sha256="08lfbczaj7hkgqfsm060z56anx1yvsfwknzw40gq919k0zm9vfcf"; depends=[rama]; };
-  bsseq = derive2 { name="bsseq"; version="1.6.0"; sha256="1bz3b79iiqz251nq54lybxd9bfyzm44p1dbb3nxmjdnf2n1gxs5w"; depends=[Biobase BiocGenerics data_table GenomeInfoDb GenomicRanges gtools IRanges locfit matrixStats R_utils S4Vectors scales SummarizedExperiment]; };
-  bumphunter = derive2 { name="bumphunter"; version="1.10.0"; sha256="086rin3gzzxf0lin5fymmsws1k7jhsy4psrkrcpajq09b2qy2s6b"; depends=[AnnotationDbi BiocGenerics doRNG foreach GenomeInfoDb GenomicFeatures GenomicRanges IRanges iterators limma locfit matrixStats S4Vectors]; };
-  caOmicsV = derive2 { name="caOmicsV"; version="1.0.0"; sha256="0162h17szpr98g4lgz5nypcrslk4103hdn5qdxfxv6frssn9l9g3"; depends=[bc3net igraph]; };
-  canceR = derive2 { name="canceR"; version="1.2.0"; sha256="1a9vd2mvz22ajgcxw0k57965gnx91lf7ki6cdc5gsqcfib7xj9n5"; depends=[Biobase cgdsr circlize Formula geNetClassifier GSEABase GSEAlm phenoTest plyr rpart RUnit survival tcltk2 tkrplot]; };
-  cancerclass = derive2 { name="cancerclass"; version="1.14.0"; sha256="0sgiy31h24wlz2q54ssygbdvikzlp8sqf4knkfxc7178a2aq41p4"; depends=[binom Biobase]; };
-  casper = derive2 { name="casper"; version="2.4.0"; sha256="19wx4h2pgvi3kdcr28spagjg9qy4g2n5pspv8jn7s9crydihq1v9"; 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.14.0"; sha256="12gqbmkh5rpbp2nqn8j1mhss3v67jiphqxw0cfgb97y6hh7bcfg6"; depends=[annotate AnnotationDbi Biobase BiocGenerics Category colorspace GOstats graph GSEABase hwriter RCytoscape]; };
-  ccrepe = derive2 { name="ccrepe"; version="1.6.0"; sha256="1h96ga660yp1bd20f5ykywybhiwzxrll2p0shkk7wqbn1x7rz1wj"; depends=[infotheo]; };
-  cellGrowth = derive2 { name="cellGrowth"; version="1.14.0"; sha256="0d40kll2rkzijyk0d0xb9rzyck5r0hkybv0j1ba72g9kk2mdmz7z"; depends=[lattice locfit]; };
-  cellHTS = derive2 { name="cellHTS"; version="1.40.1"; sha256="1pfvndkcmnq1jawijl7yd46jj92d6xlzhv717sd03a6skk11hwwi"; depends=[Biobase genefilter prada RColorBrewer]; };
-  cellHTS2 = derive2 { name="cellHTS2"; version="2.34.1"; sha256="068lqpxhy04fhpma8cbd79jwg0cifvg8qhav5a4p22dgmalvajw1"; depends=[Biobase Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; };
-  cghMCR = derive2 { name="cghMCR"; version="1.28.0"; sha256="02a5a2aj35n3y34gv1j6mk3ahm27i10ahj1msbzp62w8ph9lnasx"; depends=[BiocGenerics CNTools DNAcopy limma]; };
-  charm = derive2 { name="charm"; version="2.16.0"; sha256="14nlmii9rqgl6y0fk0gxk11dnjr33mavchp0iban0cr0hn44inm0"; depends=[Biobase Biostrings BSgenome ff fields genefilter gtools IRanges limma nor1mix oligo oligoClasses preprocessCore RColorBrewer siggenes SQN sva]; };
-  chimera = derive2 { name="chimera"; version="1.12.0"; sha256="11arbg6c76rx4zyylp6ga8ygx8890h0pkg4ciwhy4xc8x1smmq7r"; depends=[AnnotationDbi Biobase BSgenome_Hsapiens_UCSC_hg19 GenomicAlignments GenomicRanges Homo_sapiens Rsamtools TxDb_Hsapiens_UCSC_hg19_knownGene]; };
-  chipenrich = derive2 { name="chipenrich"; version="1.8.0"; sha256="0xzh3nrw62ars7xnnj9qkdsg9yaq1q3xx63l1bi91lxbfih7k9wr"; depends=[chipenrich_data GenomicRanges IRanges lattice latticeExtra mgcv plyr rms stringr]; };
-  chipseq = derive2 { name="chipseq"; version="1.20.0"; sha256="1j3kh5alahrqfp0sxkz9b9v8fm8p5gm3nyw1nbcj20ajiapi1gnp"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
-  chopsticks = derive2 { name="chopsticks"; version="1.34.0"; sha256="112d4r6ns916yjxzaakghwvbin4cadijpxanm6qs08lyap5imz4s"; depends=[survival]; };
-  chroGPS = derive2 { name="chroGPS"; version="1.14.0"; sha256="0i0hrf38sjsay6r6zh69cy6xki17cjw427szq4h7770jlphiq8n1"; depends=[Biobase changepoint cluster DPpackage ICSNP IRanges MASS]; };
-  chromDraw = derive2 { name="chromDraw"; version="1.2.0"; sha256="04zcx2y8x4s3rmfljxgm4h7p7gjrhfgqfhyx6h9f96l734l4f8hs"; depends=[GenomicRanges Rcpp]; };
-  cisPath = derive2 { name="cisPath"; version="1.10.0"; sha256="0wqbmqpm6qbrwfnl0s4dn569s74x8g9501ckx0h2g38w961z36k3"; depends=[]; };
-  cleanUpdTSeq = derive2 { name="cleanUpdTSeq"; version="1.8.0"; sha256="1ck58mxnx4q1y8wdi8mbp8ijbg30zmfbhp5ldp09zq2m0j746183"; depends=[BiocGenerics BSgenome BSgenome_Drerio_UCSC_danRer7 e1071 GenomicRanges seqinr]; };
-  cleaver = derive2 { name="cleaver"; version="1.8.0"; sha256="057nvg1cf0prbwarqwv53r651pc1i5sjj6x9nlnshxrgjrwa47ff"; depends=[Biostrings IRanges S4Vectors]; };
-  clippda = derive2 { name="clippda"; version="1.20.0"; sha256="1d76air1vf29b9bmycak9fx5silkx9d8k6cpding6pw50d63wcb1"; depends=[Biobase lattice limma rgl scatterplot3d statmod]; };
-  clipper = derive2 { name="clipper"; version="1.10.0"; sha256="1dyaazkwrrh6s3f2a0yj3i92jg16azf92az9lsjy3dbrwi8zhi7l"; depends=[Biobase corpcor graph gRbase igraph KEGGgraph Matrix qpgraph RBGL Rcpp]; };
-  clonotypeR = derive2 { name="clonotypeR"; version="1.8.0"; sha256="1fj00hrxijkn002ixa7kn07jq94mlsgz99xr3sapzg0jqacgp9q0"; depends=[]; };
-  clst = derive2 { name="clst"; version="1.18.0"; sha256="0zg3cdd8j46lm750q0ckin42pmvj0hddl1j2j4lh7x50gvqwyjyz"; depends=[lattice ROC]; };
-  clstutils = derive2 { name="clstutils"; version="1.18.0"; sha256="169pzadyhszaxc8r7z1qysmcsijp2x5pw9bizbkkw7i92r8gf4n7"; depends=[ape clst lattice rjson RSQLite]; };
-  clusterProfiler = derive2 { name="clusterProfiler"; version="2.4.3"; sha256="0fhi1dm8xifz5wzg756y12980a46cqk3mn32i7rg60f0iy2ax0s0"; depends=[AnnotationDbi DOSE ggplot2 GO_db GOSemSim KEGGREST magrittr plyr qvalue topGO]; };
-  clusterStab = derive2 { name="clusterStab"; version="1.42.0"; sha256="162kq03vs5d3rnmh9kh5djal6vgyr3pzmihjgq50dp04b89ha2d8"; depends=[Biobase]; };
-  cn_farms = derive2 { name="cn.farms"; version="1.18.0"; sha256="0d4xwdzccs5wk52ifqryj3cp60vf4yga6ddhs97p0znafh4gfsjv"; depends=[affxparser Biobase DBI DNAcopy ff lattice oligo oligoClasses preprocessCore snow]; };
-  cn_mops = derive2 { name="cn.mops"; version="1.16.2"; sha256="0c325s454rjiiyydf82vg72a7rfkj36s1dxbib42qvp1pc35rmj3"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools]; };
-  cnvGSA = derive2 { name="cnvGSA"; version="1.14.0"; sha256="1kw5161fnlc7b1b03a4kpqz4hlrknyj8dlm8wffjj1d45g1rpvwd"; depends=[brglm doParallel foreach GenomicRanges splitstackshape]; };
-  coGPS = derive2 { name="coGPS"; version="1.14.0"; sha256="1bylnhcvbrimjld5nar42kr577lzw97d2f4bibrbqysp332wi1iz"; depends=[]; };
-  coMET = derive2 { name="coMET"; version="1.2.0"; sha256="0nsz6ci6kcnanm465420sicbp84w2rg58j1550jhnrn4cx4pxm4j"; depends=[biomaRt colortools GenomicRanges ggbio ggplot2 gridExtra Gviz hash IRanges psych rtracklayer S4Vectors trackViewer]; };
-  coRNAi = derive2 { name="coRNAi"; version="1.20.0"; sha256="05jv85jbb5lz0x0cmg52sn6gnsscyq939yyk6ll9061bx51as7cv"; depends=[cellHTS2 gplots lattice limma locfit MASS]; };
-  cobindR = derive2 { name="cobindR"; version="1.8.0"; sha256="06nckxm5hz6c336p5fvfmccfzdri68qcmagkyjg7nnfsyl66fri1"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; };
-  codelink = derive2 { name="codelink"; version="1.38.0"; sha256="11rs0nr0nqfmy0v4yfzd7wgq9g0rqzr7r7jcr16z79lc6f5lqm9z"; depends=[annotate Biobase BiocGenerics limma]; };
-  cogena = derive2 { name="cogena"; version="1.4.0"; sha256="16imyy9y4jd71pnaf41isrmw711kp4ky61bljn8kmlm9kqf2lbm0"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; };
-  compEpiTools = derive2 { name="compEpiTools"; version="1.4.0"; sha256="0pygd78pi7h050fra41kvwcx5id9ivisdlnaqdxwk1xd07xb67ck"; depends=[AnnotationDbi BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges GO_db gplots IRanges methylPipe Rsamtools S4Vectors topGO XVector]; };
-  compcodeR = derive2 { name="compcodeR"; version="1.6.0"; sha256="1f84n01c83p5x72ws7a7cam0g0l7n2wjy5pyf06hbwgc0ziz57cs"; depends=[caTools edgeR gdata ggplot2 gplots gtools KernSmooth knitr lattice limma markdown MASS modeest ROCR sm stringr vioplot]; };
-  conumee = derive2 { name="conumee"; version="1.2.0"; sha256="1410a8sby4azkj14wqxrsi5i4kiyhgnpidj70ysygk5y2mlghs4x"; depends=[DNAcopy GenomeInfoDb GenomicRanges IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IRanges minfi rtracklayer]; };
-  convert = derive2 { name="convert"; version="1.46.0"; sha256="04zg65yylg3rifn49k015nf38v3ga0kwq4m9hykb8lfqiw63sxgq"; depends=[Biobase limma marray]; };
-  copa = derive2 { name="copa"; version="1.38.0"; sha256="0dmrmf60q83srilzxgwcknnd4wsx4xdlf6plfgz3wks6nyfwy256"; depends=[Biobase]; };
-  copynumber = derive2 { name="copynumber"; version="1.10.0"; sha256="1g03cy5inbhzhl5hj8vma34xm8lixilhalavjysp93bwg4dfskv6"; depends=[BiocGenerics GenomicRanges IRanges S4Vectors]; };
-  cosmiq = derive2 { name="cosmiq"; version="1.4.0"; sha256="079423bhmjk5c0x4xq8kxqbcvj8mvh30gy31zr5xn7m9lysmzglc"; depends=[faahKO MassSpecWavelet pracma Rcpp xcms]; };
-  cpvSNP = derive2 { name="cpvSNP"; version="1.2.0"; sha256="1wnbl6wgflfhjkrv8l5i182mpfxk440rzacpsij0xq0f823nxxgf"; depends=[BiocParallel corpcor GenomicFeatures ggplot2 GSEABase plyr]; };
-  cqn = derive2 { name="cqn"; version="1.16.0"; sha256="0cmi8nfk5yh4mma43kay8pglysd26kq17kxa98yirwgdj8cgq5rj"; depends=[mclust nor1mix preprocessCore quantreg]; };
-  crlmm = derive2 { name="crlmm"; version="1.28.2"; sha256="1acfd5w2h6z5ksclp7grb42p59jyjm2q4cx9pjc32y0cdvndqhy8"; depends=[affyio Biobase BiocGenerics ellipse ff foreach illuminaio lattice matrixStats mvtnorm oligoClasses preprocessCore RcppEigen SNPchip VGAM]; };
-  csaw = derive2 { name="csaw"; version="1.4.1"; sha256="1yl4ckh0289k633kj6msl6rj7rdvcd9h8gnscz6p63n4c6mfpy13"; depends=[AnnotationDbi edgeR GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges limma Rsamtools S4Vectors SummarizedExperiment]; };
-  ctc = derive2 { name="ctc"; version="1.44.0"; sha256="1wlk1skc6vg10gdcdqdwc5mnh5ags7f13sxmjc19gg6n7wfkjrqg"; depends=[amap]; };
-  cummeRbund = derive2 { name="cummeRbund"; version="2.12.1"; sha256="02d9g8rzwj47faijk26q6jg7p687gw87knyycxmljr9vn7157d20"; depends=[Biobase BiocGenerics fastcluster ggplot2 Gviz plyr reshape2 RSQLite rtracklayer]; };
-  customProDB = derive2 { name="customProDB"; version="1.10.0"; sha256="04iiwfvjavn3zz6fhf24wd3xy0svviqqklg64hnwza2m4w50awag"; depends=[AnnotationDbi biomaRt Biostrings GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr RCurl Rsamtools RSQLite rtracklayer stringr VariantAnnotation]; };
-  cycle = derive2 { name="cycle"; version="1.24.0"; sha256="14xzwlwkb93bhqwwy36bsqimabpmg5an6n6y8xkh5zsxw2c7m1qi"; depends=[Biobase Mfuzz]; };
-  cytofkit = derive2 { name="cytofkit"; version="1.2.2"; sha256="1sg6phm9lxw341rangllkiq81bz4073y6zg0d5qz0gyxywv2ycfs"; depends=[Biobase doParallel e1071 flowCore ggplot2 gplots igraph pdist plyr RANN Rcpp reshape reshape2 Rtsne shiny vegan VGAM]; };
-  daMA = derive2 { name="daMA"; version="1.42.0"; sha256="1qggz9hrgm2xb2dz9k9gqwygj1ywy0qwzv7lqpn58pz590mz1xds"; depends=[MASS]; };
-  dagLogo = derive2 { name="dagLogo"; version="1.8.0"; sha256="0knsvldhdmprqjdxcdi9ccva4fi8vx86mc257nbmj21ac72bynx3"; depends=[biomaRt Biostrings grImport motifStack pheatmap]; };
-  ddCt = derive2 { name="ddCt"; version="1.26.0"; sha256="1rqh6sgw7qlyrpyxgmg6xl7df2jicxzxzq6xnp7l40w6vnjc595a"; depends=[Biobase BiocGenerics lattice RColorBrewer xtable]; };
-  ddgraph = derive2 { name="ddgraph"; version="1.14.0"; sha256="0nmrz9cy7l31vym3fcc9m3dmgmbnd5r91p3fxpziaarphi27zszl"; depends=[bnlearn graph gtools MASS pcalg plotrix RColorBrewer Rcpp]; };
-  deepSNV = derive2 { name="deepSNV"; version="1.16.0"; sha256="1vzcyqvjzzjlm3np3yyazdvj7jdiwc2wnxghaz8rnxyzm42bmjha"; depends=[Biostrings GenomicRanges IRanges Rhtslib SummarizedExperiment VariantAnnotation VGAM]; };
-  deltaGseg = derive2 { name="deltaGseg"; version="1.10.1"; sha256="0dakvg2m99wm7zg84w3pzvpwi7sjdarib8bl14wyv2bh9lxq93s3"; depends=[changepoint fBasics ggplot2 pvclust reshape scales tseries wavethresh]; };
-  derfinder = derive2 { name="derfinder"; version="1.4.4"; sha256="0pjsah2rgxy4584p815zwacspjwx42wv5q1h9v1rywmsbhhfmrdr"; depends=[AnnotationDbi BiocParallel bumphunter derfinderHelper GenomeInfoDb GenomicAlignments GenomicFeatures GenomicFiles GenomicRanges Hmisc IRanges qvalue Rsamtools rtracklayer S4Vectors]; };
-  derfinderHelper = derive2 { name="derfinderHelper"; version="1.4.1"; sha256="1mbhr766vl8skcs74xdfx5p7812x5xbv9pgn9nl2s1d9ifcs8zf8"; depends=[IRanges Matrix S4Vectors]; };
-  derfinderPlot = derive2 { name="derfinderPlot"; version="1.4.1"; sha256="16zsq13v86h5zfngh8621ayw5dvb14r486dzak6lz59pqzmviw8g"; depends=[derfinder GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 IRanges limma plyr RColorBrewer reshape2 scales]; };
-  destiny = derive2 { name="destiny"; version="1.0.0"; sha256="1k8nf9gws6d60fp7mh43hjiaza7zxxfkpjzmi5qj2davjqbx1wn0"; depends=[Biobase BiocGenerics FNN igraph Matrix proxy Rcpp RcppEigen scatterplot3d VIM]; };
-  dexus = derive2 { name="dexus"; version="1.10.0"; sha256="0hc28mkmnr37fmw6xw2cywla946gm0cxa8k4hi32d12cm9c24xqx"; depends=[BiocGenerics]; };
-  diffGeneAnalysis = derive2 { name="diffGeneAnalysis"; version="1.52.0"; sha256="1w44iihckyjw8hpzwr0dsc558c3vzdiw2nbwysmqn0dn4w18xkj2"; depends=[minpack_lm]; };
-  diffHic = derive2 { name="diffHic"; version="1.2.2"; sha256="1qa21hqsmxi2f168z6r0qlv2453ljdnldc90c789dwi3067ysjnj"; depends=[BiocGenerics Biostrings BSgenome csaw edgeR GenomeInfoDb GenomicRanges IRanges limma locfit rhdf5 Rsamtools S4Vectors]; };
-  diggit = derive2 { name="diggit"; version="1.2.0"; sha256="1c83jhih9sg39n7sf83ddsxwjjcqklh0ssb9a4jfyvfahsqcghcb"; depends=[Biobase ks viper]; };
-  dks = derive2 { name="dks"; version="1.16.0"; sha256="1l98ya4f8mnzvpj1igzbn6s9yvmv3i31ll5l7hbipk4g7n1lyqal"; depends=[cubature]; };
-  domainsignatures = derive2 { name="domainsignatures"; version="1.30.0"; sha256="0rr5d57cjkp46qp2908vh3wyfdgiyaikdgbcxipizcv5a00nq0rx"; depends=[AnnotationDbi biomaRt KEGG_db prada]; };
-  dualKS = derive2 { name="dualKS"; version="1.30.0"; sha256="02j9l73brxa4fgsp9cbd3w7dxllvj744rby21dkfnw2c42rcxpvz"; depends=[affy Biobase]; };
-  dupRadar = derive2 { name="dupRadar"; version="1.0.0"; sha256="1fk58zdrw8nwjq1cq7k3rb6nx5fxhkj1p6b6mv32ha8bxwdl3dj0"; depends=[Rsubread]; };
-  dyebias = derive2 { name="dyebias"; version="1.28.0"; sha256="0vahrl947rf0wlz38v7jippdlvd5yhr02y554hs1ilcdz1czmyvn"; depends=[Biobase marray]; };
-  easyRNASeq = derive2 { name="easyRNASeq"; version="2.6.3"; sha256="1r6q3f8zril2l0a6l18yw0is85nh4xn759mv8mxc2cmh0d4f60d5"; 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.42.0"; sha256="0hcigc60k11s3ha0jwxlvw9zf66x8090yq5m72q6nzzjzr9rvv1r"; depends=[Biobase]; };
-  edge = derive2 { name="edge"; version="2.2.1"; sha256="1hmk7ncjgb0lwm7964b6c7c425jw3d8cd3zcvrv1k5359wxzfwmc"; depends=[Biobase jackstraw MASS qvalue snm sva]; };
-  edgeR = derive2 { name="edgeR"; version="3.12.0"; sha256="1n3fmrms48z7bh1sz64j242f08jg32dp0l25kba60abgypg2f2fw"; depends=[limma]; };
-  eiR = derive2 { name="eiR"; version="1.10.1"; sha256="0770rawqw6ys1594f8xpnjjh0p7fav5qmbbq64byzv4hb5ldl7p0"; depends=[BH BiocGenerics ChemmineR DBI digest RCurl RUnit snow snowfall]; };
-  eisa = derive2 { name="eisa"; version="1.22.0"; sha256="0p3s6z7s4d165h4w5g1h273626h5j255c0hyjv5dlrdhr4ign7v6"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
-  ensemblVEP = derive2 { name="ensemblVEP"; version="1.10.2"; sha256="0yhpqpjdr5z9m8khiyl8qh0sh6mqwalv6441qfmyq5wivv1nx2is"; depends=[BiocGenerics Biostrings GenomicRanges VariantAnnotation]; };
-  ensembldb = derive2 { name="ensembldb"; version="1.2.2"; sha256="08mj3ccskslwqbnk0yz7s5rdh9vvp2adi7hqbz76w7zbvflfsm1v"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges Rsamtools RSQLite rtracklayer S4Vectors]; };
-  epigenomix = derive2 { name="epigenomix"; version="1.10.0"; sha256="03nv36zldpjwbwassn5ca26ibdy7cd148ywp7wd6igqjg2lcgich"; depends=[beadarray Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
-  epivizr = derive2 { name="epivizr"; version="1.8.1"; sha256="1zgxmck5rry5h6jyi5kvbf4sf8902q21b172r25i1mzyiygqwpvn"; depends=[Biobase GenomeInfoDb GenomicFeatures GenomicRanges httpuv mime OrganismDbi R6 rjson rtracklayer S4Vectors SummarizedExperiment]; };
-  erccdashboard = derive2 { name="erccdashboard"; version="1.4.0"; sha256="1fj9wbm5sgshpnq855bq6cf13b9141p6r8gq2053k8p1gvb9gbxi"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr QuasiSeq qvalue reshape2 ROCR scales stringr]; };
-  erma = derive2 { name="erma"; version="0.2.0"; sha256="1pw5n5m0nis8crzpwd4wbfk7vija5r6r2g6jshc07vd2nya5fxsk"; depends=[Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny]; };
-  eudysbiome = derive2 { name="eudysbiome"; version="1.0.0"; sha256="10id5pcs29xsicr9ffpd8rd2fqvj776wgdbn80vvym87gyn3kxxh"; depends=[plyr]; };
-  exomeCopy = derive2 { name="exomeCopy"; version="1.16.0"; sha256="09awyyfgs0k639nqrcrbq1k875qlyac1146w4ay6nxgijqy7iv82"; depends=[GenomeInfoDb GenomicRanges IRanges Rsamtools]; };
-  exomePeak = derive2 { name="exomePeak"; version="2.2.2"; sha256="03xj0h1cgxzbp2fk830l771jmmcll1bq81xips8hjgng3ywz5m1a"; depends=[GenomicAlignments GenomicFeatures Rsamtools rtracklayer]; };
-  explorase = derive2 { name="explorase"; version="1.34.0"; sha256="108p864qq8zh4x7p765ygrdkj4r0vm3s2fmi3scswkhcv3vjcjg3"; depends=[limma rggobi RGtk2]; };
-  fCI = derive2 { name="fCI"; version="1.0.0"; sha256="17d592qmyia0j91sx8qlsv5xi3d4akd41rdqz0gsvnsbc5c494qn"; depends=[FNN gtools psych rgl VennDiagram zoo]; };
-  fabia = derive2 { name="fabia"; version="2.16.0"; sha256="0fm7bkqydks0qqfiifbkf5i7z8jb9l8bpbwkfy0kw4wfnzn4j7n8"; depends=[Biobase]; };
-  facopy = derive2 { name="facopy"; version="1.4.1"; sha256="07ggz86c48rz8asqvfglrvsimnzh3ii43kzpm8ji6sd43i141650"; depends=[annotate cgdsr coin data_table DOSE facopy_annot FactoMineR ggplot2 GO_db GOstats graphite gridExtra igraph IRanges MASS nnet reshape2 Rgraphviz scales]; };
-  factDesign = derive2 { name="factDesign"; version="1.46.0"; sha256="0i9aqf0asg0jzvb0ngdyfydgxgwwbxkhmzgc20r8ybjc3rgw0xk6"; depends=[Biobase]; };
-  farms = derive2 { name="farms"; version="1.22.0"; sha256="1jmx5rajm6fkhx5gfpwh8nsqw0plhfzy1bibvkdf83arxjjr6s59"; depends=[affy Biobase MASS]; };
-  fastLiquidAssociation = derive2 { name="fastLiquidAssociation"; version="1.6.1"; sha256="188jq7g1qy5m05aqsyq51cq56zwf6k3awk3285kx4w3328gr6s2m"; depends=[Hmisc LiquidAssociation WGCNA]; };
-  fastseg = derive2 { name="fastseg"; version="1.16.0"; sha256="0js8vf2s8vya0iwd8158agbhzppgicvsnvm5lhyhhg5zs49b71hb"; depends=[Biobase BiocGenerics GenomicRanges IRanges]; };
-  fdrame = derive2 { name="fdrame"; version="1.42.0"; sha256="1kqhryvy4wb0c3dj76crlxvgr0h41znh8kn624n51ipfp34n5fgi"; depends=[]; };
-  ffpe = derive2 { name="ffpe"; version="1.14.0"; sha256="0vdssf9ljk3x7zhx5x5af5wqhynkaz8pb6sr8zp6ihqfiw498r0q"; depends=[affy Biobase BiocGenerics lumi methylumi sfsmisc TTR]; };
-  flagme = derive2 { name="flagme"; version="1.26.0"; sha256="1h9aa6s1r2g6sr81aslqq6jydyn98j9bbcy5q7dp9zf4agfd2n8h"; depends=[CAMERA gcspikelite gplots MASS SparseM xcms]; };
-  flipflop = derive2 { name="flipflop"; version="1.8.0"; sha256="1blqi39kmyy2zq6lb42nk30dcc0ivgqf8hifvil2j4iv650i5476"; depends=[GenomicRanges IRanges Matrix]; };
-  flowBeads = derive2 { name="flowBeads"; version="1.8.0"; sha256="0nshbwv0wma33di9q1cih4kvfsfwvzwj0nd6qymq6zvxijl57231"; depends=[Biobase flowCore knitr rrcov xtable]; };
-  flowBin = derive2 { name="flowBin"; version="1.6.0"; sha256="0icz00h87gmwl04kbbjkrsr2k6d8migkcgcld8hag23bspdfphrl"; depends=[BiocGenerics class flowCore flowFP limma snow]; };
-  flowCHIC = derive2 { name="flowCHIC"; version="1.4.0"; sha256="0j7kvlc6l6cigz88r4jxws04xs628j272crvihh4fgklp83jqyr7"; depends=[EBImage flowCore ggplot2 hexbin vegan]; };
-  flowCL = derive2 { name="flowCL"; version="1.8.0"; sha256="064946w944gw7l0hizw974i21cahzvfj1xza8f7ay9rx2baz28sh"; depends=[Rgraphviz SPARQL]; };
-  flowClean = derive2 { name="flowClean"; version="1.6.0"; sha256="0ck0fqbx7zrj56nn4c30qgbn5rncqch8kcc6dra6nxib9p9hy0db"; depends=[bit changepoint flowCore sfsmisc]; };
-  flowClust = derive2 { name="flowClust"; version="3.8.0"; sha256="1w2a9ls1cyvfwx8b7vcmxxzyj1crdpyifqld99lcwcnz5g6cw9cj"; depends=[Biobase BiocGenerics clue corpcor ellipse flowCore flowViz graph MCMCpack mnormt RBGL]; };
-  flowCore = derive2 { name="flowCore"; version="1.36.9"; sha256="0fzjc76p6d7w4rl57qc7vqc6bn9f6xy8dvdgrdh6hksqxrdxgl3a"; depends=[BH Biobase BiocGenerics corpcor graph matrixStats Rcpp rrcov]; };
-  flowCyBar = derive2 { name="flowCyBar"; version="1.6.0"; sha256="0j9hdcgkh1glfyxa9wcwpdxrkn3vgfns7w15xp341m2c4lf7rq7s"; depends=[gplots vegan]; };
-  flowDensity = derive2 { name="flowDensity"; version="1.4.0"; sha256="1gr9rd3brxqpg3dzgsrvrz104lvzcs8kf50zbx2nh22viyv1kmfp"; depends=[car flowCore GEOmap gplots RFOC]; };
-  flowFP = derive2 { name="flowFP"; version="1.28.0"; sha256="0sa17dnn2x1wq4mk719nbfpabjslyv8aafc8i0g09dlb9zm303q7"; depends=[Biobase BiocGenerics flowCore flowViz]; };
-  flowFit = derive2 { name="flowFit"; version="1.8.0"; sha256="1fja1d5irh71a3rqdsbw5sb14ss2xmird6vxcps96r6s6rz2bra3"; depends=[flowCore flowViz gplots kza minpack_lm]; };
-  flowMap = derive2 { name="flowMap"; version="1.8.0"; sha256="0rkdspl9lnasc8axlsx076g14pkgwrlz9nbxy0f1z67w991d823p"; depends=[abind ade4 doParallel Matrix reshape2 scales]; };
-  flowMatch = derive2 { name="flowMatch"; version="1.6.0"; sha256="121a6khppgrdim1g5yi67s74npgvg73qb741x9gry5zz4q0z70fq"; depends=[Biobase flowCore Rcpp]; };
-  flowMeans = derive2 { name="flowMeans"; version="1.30.0"; sha256="08dvpfvpqp99lm1lj5fryqqmskgqpx58m62n96ff319wzxmf1ass"; depends=[Biobase feature flowCore rrcov]; };
-  flowMerge = derive2 { name="flowMerge"; version="2.18.0"; sha256="109rx6pyyvc451rl31lb6qxajmsml2jsp81dd2d3shv1zdc3jj2c"; depends=[feature flowClust flowCore foreach graph Rgraphviz rrcov snow]; };
-  flowPeaks = derive2 { name="flowPeaks"; version="1.12.0"; sha256="1wm24xdzlbrr1j676h5padc87b9qz8x54zp2lkfag4g6iqbgflyg"; depends=[]; };
-  flowPlots = derive2 { name="flowPlots"; version="1.18.0"; sha256="14mnkzyszmzl4wdc8g2b9m53h5k2b7mcm23xqldnxx88w4jqc66q"; depends=[]; };
-  flowQ = derive2 { name="flowQ"; version="1.30.0"; sha256="1yz0w0bpv98l319y8dw82qaykg6w70sxpzmhxdckwdqjpixq5sf5"; depends=[BiocGenerics bioDist flowCore flowViz geneplotter IRanges lattice latticeExtra mvoutlier outliers parody RColorBrewer]; };
-  flowQB = derive2 { name="flowQB"; version="1.14.0"; sha256="1swsdqra8w8z27p2mv1q37ydak7rjifxm78h5x6mhv1vfq4faz12"; depends=[Biobase flowCore MASS]; };
-  flowStats = derive2 { name="flowStats"; version="3.28.1"; sha256="1i9x94qk4cq1fkix9r2qn34k74v2i732ldj2s68ynqniyvsj6vdb"; depends=[Biobase BiocGenerics cluster fda flowCore flowViz flowWorkspace KernSmooth ks lattice MASS mvoutlier]; };
-  flowTrans = derive2 { name="flowTrans"; version="1.22.0"; sha256="0rqg12avmpr169i3jd1rd1ncpzkplm840nhv9h0gcqirai70pqhc"; depends=[flowClust flowCore flowViz]; };
-  flowType = derive2 { name="flowType"; version="2.8.1"; sha256="1ck940f18s89h8iqbkspibykr68473vb93graah3gqn7svw6970g"; depends=[BH Biobase flowClust flowCore flowMeans flowMerge Rcpp rrcov sfsmisc]; };
-  flowUtils = derive2 { name="flowUtils"; version="1.34.0"; sha256="0qba66cfsy8facvdpnl5jf71xwaqs3w6j2z0ph7c39zyng0nibwp"; depends=[Biobase corpcor flowCore flowViz graph RUnit XML]; };
-  flowVS = derive2 { name="flowVS"; version="1.2.0"; sha256="0hls6c9s3h470hzayfd1k9vn5v146cymfp2b20hzjyc6dg20fj2s"; depends=[flowCore flowStats flowViz]; };
-  flowViz = derive2 { name="flowViz"; version="1.34.1"; sha256="1ggy8lgkf2j00l8cg4mijg9yydxr4gmfnby0ngiynk94h3i68z94"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-  flowWorkspace = derive2 { name="flowWorkspace"; version="3.16.15"; sha256="1pydk53x2myb97lfyc5wkynbwxb23p519m0krcq3g77n2baa9567"; depends=[BH Biobase BiocGenerics data_table dplyr flowCore flowUtils flowViz graph gridExtra jsonlite lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz stringr XML]; };
-  flowcatchR = derive2 { name="flowcatchR"; version="1.4.0"; sha256="0rd9sg3d17ihrm4zz4jpvv3n4xcz4djcfnsvx6qzkri2vjmk7spj"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
-  fmcsR = derive2 { name="fmcsR"; version="1.12.2"; sha256="1mv6ds20m9b0b2326cxy486kri2fa40lm23ck2sx1vf6lsnfh6g6"; depends=[BiocGenerics ChemmineR RUnit]; };
-  focalCall = derive2 { name="focalCall"; version="1.4.0"; sha256="1dqk0lda24lkhfsid15c6n121s63zbk6658za5qxqkxdd82z7axf"; depends=[CGHcall]; };
-  frma = derive2 { name="frma"; version="1.22.0"; sha256="0j4zxxmmgd9jq9g7if7y0i7fkiynfikkll05p14h2jrmn2ywimdm"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
-  frmaTools = derive2 { name="frmaTools"; version="1.22.0"; sha256="1lxjr8yzi2hna5yygyaqxr5fqxfis4k3aczljlpm86mp8r6f80qa"; depends=[affy Biobase DBI preprocessCore]; };
-  gCMAP = derive2 { name="gCMAP"; version="1.14.0"; sha256="09dcaq0763kb399wh232n6r1s8qkj0c4zcmpjp6cz08w6n7lchgx"; depends=[annotate AnnotationDbi Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
-  gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.10.0"; sha256="00qx90gycqqca8b3brkl0bkckn7saqz9z38vinhjxlyaanc9v6ml"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
-  gQTLBase = derive2 { name="gQTLBase"; version="1.2.1"; sha256="1a1ndjjp2zn1lsfahpvi3xhkdgwl5wk0bdm7kc92aidq50a2db42"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors]; };
-  gQTLstats = derive2 { name="gQTLstats"; version="1.2.0"; sha256="1cwri36z85zyyr48dkkl7qkgbx9fpv7y38mbbm470adc7ac56zbv"; depends=[AnnotationDbi BatchJobs Biobase BiocGenerics doParallel dplyr ffbase foreach gam GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 gQTLBase IRanges limma reshape2 S4Vectors snpStats SummarizedExperiment VariantAnnotation]; };
-  gaga = derive2 { name="gaga"; version="2.16.0"; sha256="198521xnznvwg8k5l6pak3jcyp9ml3hbzjk10vdj926izslnfavw"; depends=[Biobase coda EBarrays mgcv]; };
-  gage = derive2 { name="gage"; version="2.20.1"; sha256="08lq8j07c855v54xia97ykkd81307xyh30lbcwv7by5grnkrxqbp"; depends=[AnnotationDbi graph KEGGREST]; };
-  gaggle = derive2 { name="gaggle"; version="1.38.0"; sha256="0bl60nca27rkij061h6g16ddlkq29rb1wh5pr2hz87y74pmb8m2w"; depends=[graph rJava RUnit]; };
-  gaia = derive2 { name="gaia"; version="2.14.0"; sha256="099imzsa7pghp7qbxjjnfrqc8zkn25wm5xj9jn40m9as11zxdrsx"; depends=[]; };
-  gaucho = derive2 { name="gaucho"; version="1.6.0"; sha256="1c1aaidhdv9rr2v3q6832q0ajc3g7l4gfx1rhf27kv4pn1j5s23s"; depends=[GA graph heatmap_plus png Rgraphviz]; };
-  gcatest = derive2 { name="gcatest"; version="1.0.0"; sha256="1kjz7msk59y4vdhm9wi25yia5d4glgpdrd7ykl3fb5sz83vggmw1"; depends=[lfa]; };
-  gcrma = derive2 { name="gcrma"; version="2.42.0"; sha256="1bzrr6q9m8i6316iamx10fk9y06yv628m8prsn5fhggjawyzp6di"; depends=[affy affyio Biobase BiocInstaller Biostrings XVector]; };
-  gdsfmt = derive2 { name="gdsfmt"; version="1.6.2"; sha256="104r6wl5vwncq38gd93sjzwkqlxqkr60qq300rmwk14p288fr9kh"; depends=[]; };
-  geNetClassifier = derive2 { name="geNetClassifier"; version="1.10.0"; sha256="183aa5mzdm97rxzpcy0m93ywm7p5xvv38lsly6mb6y0afc3slfb4"; depends=[Biobase e1071 EBarrays minet]; };
-  geecc = derive2 { name="geecc"; version="1.4.0"; sha256="00dkp4ldnpadvw6fdva0gg0m843j7i667r0i33c9dsrjfc7k7z8q"; depends=[gplots hypergea MASS]; };
-  genArise = derive2 { name="genArise"; version="1.46.0"; sha256="1a85r7lbbz090k2kiza97b18vh4gn01wqp7qs8a8skxina6qsig6"; depends=[locfit tkrplot xtable]; };
-  geneRecommender = derive2 { name="geneRecommender"; version="1.42.0"; sha256="0823w9haab5wc06rk9853l07vgwpzxpivh84y3av6mhfn36lz0id"; depends=[Biobase]; };
-  geneRxCluster = derive2 { name="geneRxCluster"; version="1.6.0"; sha256="1blkzf503bfdfvbagbk41167qkd05mdxd96lav5fz1ry780i8lb7"; depends=[GenomicRanges IRanges]; };
-  genefilter = derive2 { name="genefilter"; version="1.52.1"; sha256="1pl1vbxfajms26734iprqlb4w1ly2w5101z8d895znc4lfbp6mvs"; depends=[annotate AnnotationDbi Biobase survival]; };
-  genefu = derive2 { name="genefu"; version="2.2.0"; sha256="0q49hnxz59hack7j28haazia6qd5pkmgyq5jaypvaa3jnvcsfij7"; depends=[AIMS amap biomaRt iC10 mclust survcomp]; };
-  geneplotter = derive2 { name="geneplotter"; version="1.48.0"; sha256="13ivmp486m1ka0ww3kdg5k5czps9plnrn9p6maq2gdq8dlkgvdly"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
-  genoCN = derive2 { name="genoCN"; version="1.22.0"; sha256="0irc6cwlaf71g76vrijw6z499aiw0h8mll0521cc12hs4wq9060z"; depends=[]; };
-  genomation = derive2 { name="genomation"; version="1.2.2"; sha256="0kvzwc21zsh2c8d34yn935ncn38bfkpzmknycd8h7b0521x20mi9"; depends=[Biostrings BSgenome data_table GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridBase impute IRanges matrixStats plotrix plyr readr reshape2 Rsamtools rtracklayer seqPattern]; };
-  genomeIntervals = derive2 { name="genomeIntervals"; version="1.26.0"; sha256="0fnxrxb1lk59608kcpc19yxrz3all346qh7rs668f3kk7hj456gb"; depends=[BiocGenerics GenomeInfoDb GenomicRanges intervals IRanges S4Vectors]; };
-  genomes = derive2 { name="genomes"; version="2.16.1"; sha256="1wcb1x0srfk36r70xn80fka33942c4jn0qq1rhg375m9bqmrwj84"; depends=[Biostrings GenomicRanges IRanges RCurl XML]; };
-  genoset = derive2 { name="genoset"; version="1.24.0"; sha256="0xxh23sdb5qjfh97a2psp70zb54zx40x8501bpp7gzgqbfn1wf7w"; depends=[Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
-  genotypeeval = derive2 { name="genotypeeval"; version="1.0.0"; sha256="1clljhqy57yy0ss9700zfnsgnby3dism8z2682xjhzzprg049cx4"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer VariantAnnotation]; };
-  gespeR = derive2 { name="gespeR"; version="1.2.0"; sha256="0s8lndwwqkkkiyqzi8xpqz6clzjrkmkkrh2f1ch80hvfj83rb89d"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
-  ggbio = derive2 { name="ggbio"; version="1.18.5"; sha256="0pj0v4frj9dhyyq5mb8vls1dnlv1lvah9csrg9rz33x61px7iplq"; depends=[Biobase BiocGenerics Biostrings biovizBase BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  ggtree = derive2 { name="ggtree"; version="1.2.17"; sha256="1r0zxwab7pp5zhxgcpir24kzwv2vgw1fm04wqbfy2in3pj2phr64"; depends=[ape Biostrings ggplot2 jsonlite magrittr tidyr]; };
-  girafe = derive2 { name="girafe"; version="1.22.0"; sha256="1l7vdfrvr0y0l1lwnsyzkbx8p35rkmxnnclfqqqailhy5q5prjp2"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
-  globaltest = derive2 { name="globaltest"; version="5.24.0"; sha256="0a1q8r581vq4srpy57ixbcnb87ajiazj5dzyswyjfhs2l9z5zhdq"; depends=[annotate AnnotationDbi Biobase survival]; };
-  gmapR = derive2 { name="gmapR"; version="1.12.0"; sha256="1zzhy2cmqg0npyc6zilsjb8dn48dyva7xb8b7d6czgwb4rvyrsrr"; depends=[Biobase BiocParallel Biostrings BSgenome GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
-  goProfiles = derive2 { name="goProfiles"; version="1.32.0"; sha256="0knflwy6yarkp5r3l5q14pkcmbwpivgylfd33a8xwn3w87qk9gxw"; depends=[AnnotationDbi Biobase GO_db]; };
-  goTools = derive2 { name="goTools"; version="1.44.0"; sha256="0sq4l1ayh65x7b0spmffxqx68cll8wgbj30cp0ylnyb6s78whr6q"; depends=[AnnotationDbi GO_db]; };
-  goseq = derive2 { name="goseq"; version="1.22.0"; sha256="0zfly8fl77s59j6sdgn4c0gfwwsm1q8r57pf4h6zgxnbahll2b10"; depends=[AnnotationDbi BiasedUrn BiocGenerics geneLenDataBase GO_db mgcv]; };
-  gpls = derive2 { name="gpls"; version="1.42.0"; sha256="1a8qhyyidx3rnipjr42q2jzgcjljij2g6a22dlk9p350sf426i0f"; depends=[]; };
-  gprege = derive2 { name="gprege"; version="1.14.0"; sha256="0mc8x8faj8pf8zb3mywjscn2rzs7bc0ws507a32r7zl5j8p9rzag"; depends=[gptk]; };
-  graph = derive2 { name="graph"; version="1.48.0"; sha256="16w75rji3kv24gfv44w66y1a2y75ax26rl470y3ypna0ndc3rrcd"; depends=[BiocGenerics]; };
-  graphite = derive2 { name="graphite"; version="1.16.0"; sha256="19dzzmy3jm555iz3wn6m0izn7xpl66q1rfngfcyg3czz266x4kv4"; depends=[AnnotationDbi BiocGenerics graph rappdirs]; };
-  groHMM = derive2 { name="groHMM"; version="1.4.1"; sha256="0ndbdn2jqnyla7malppza9f92x7wybbg0n7lfl1ydwx53mwndpz6"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges MASS rtracklayer S4Vectors]; };
-  gtrellis = derive2 { name="gtrellis"; version="1.2.0"; sha256="00alv9amhwgcpzy8g2av46r183070nansvswai0m9ppd4rhc53zh"; depends=[circlize GetoptLong]; };
-  gwascat = derive2 { name="gwascat"; version="2.2.0"; sha256="06v3rc21riv53qpvaizsbrsi5zdmz1fzjhbjf741wkgbh280g6gl"; depends=[AnnotationDbi AnnotationHub BiocGenerics Biostrings GenomeInfoDb GenomicFeatures GenomicRanges ggbio ggplot2 gQTLstats graph Gviz Homo_sapiens IRanges Rsamtools rtracklayer S4Vectors snpStats VariantAnnotation]; };
-  h5vc = derive2 { name="h5vc"; version="2.4.1"; sha256="17d5y6hzwjmj9dayrdss0shjqkphv12p70s8g7052q6sljx8iwc2"; depends=[abind BatchJobs BiocParallel Biostrings GenomeInfoDb GenomicRanges ggplot2 gridExtra h5vcData IRanges reshape rhdf5 Rsamtools S4Vectors]; };
-  hapFabia = derive2 { name="hapFabia"; version="1.12.0"; sha256="019fsyc3a2myxapjk2wx978q9jkhsz2889rkvs7vb0aqf8bg0psr"; depends=[Biobase fabia]; };
-  hiAnnotator = derive2 { name="hiAnnotator"; version="1.4.0"; sha256="0i4bxzxvqll1n5ardclkfg70hijy3mv4la90g4y6ycl66q0mycrn"; depends=[BSgenome dplyr foreach GenomicRanges ggplot2 iterators rtracklayer scales]; };
-  hiReadsProcessor = derive2 { name="hiReadsProcessor"; version="1.6.0"; sha256="1cszyap1cngrfx59mf76826iiwahlhj2l6iv97470nmx5a9rymkh"; depends=[BiocGenerics BiocParallel Biostrings dplyr GenomicAlignments GenomicRanges hiAnnotator rSFFreader sonicLength xlsx]; };
-  hierGWAS = derive2 { name="hierGWAS"; version="1.0.0"; sha256="0hff1vi86mh0nqgld206bp18swzxnrkr5miagnmbr0v7ayh70lxb"; depends=[fastcluster fmsb glmnet]; };
-  hopach = derive2 { name="hopach"; version="2.30.0"; sha256="0yggs5f425g5q04lwischjilzl0q8dsnfaf5hk078h0fzpm4j3vs"; depends=[Biobase BiocGenerics cluster]; };
-  hpar = derive2 { name="hpar"; version="1.12.0"; sha256="0dmzn44lh6mfdpxfqvz3jp0q8xx9j6y8nqqp9xw3wp2ahf3p30k7"; depends=[]; };
-  htSeqTools = derive2 { name="htSeqTools"; version="1.16.0"; sha256="1bjbagx6s66fiia71n7ljg5rfc2v22bbp2sk718mf1i9i38c58lm"; depends=[Biobase BiocGenerics BSgenome GenomeInfoDb GenomicRanges IRanges MASS]; };
-  hyperdraw = derive2 { name="hyperdraw"; version="1.22.0"; sha256="1axxdll3mfnslgx6a1b6kfjvimbkgna73qmpvz8aslhihry7c7hi"; depends=[graph hypergraph Rgraphviz]; };
-  hypergraph = derive2 { name="hypergraph"; version="1.42.0"; sha256="1z2x22xm7609sjma54i48f5fax0fm56mjmzqk55p5x3jyq53j0jw"; depends=[graph]; };
-  iASeq = derive2 { name="iASeq"; version="1.14.0"; sha256="0l3vzbin04sb3z0zzgzbp68clp23cg3pyid9aj3p67z38gy42024"; depends=[]; };
-  iBBiG = derive2 { name="iBBiG"; version="1.14.0"; sha256="13z2i2yp7bxn8v8in3nrw3blj2dd4kcf1hjawww1yzl1q8zasxx2"; depends=[ade4 biclust xtable]; };
-  iBMQ = derive2 { name="iBMQ"; version="1.10.0"; sha256="1hdzqz19akdsmswspq13n99magn8v4r7zlb684hljnr05jbczrcp"; depends=[Biobase ggplot2]; };
-  iCheck = derive2 { name="iCheck"; version="1.0.0"; sha256="1bhnbiwihln9xbl0s4lp70y6qcc1i3hm4n34dndx5frwnm8g1zc2"; depends=[affy Biobase GeneSelectMMD gplots limma lmtest lumi MASS preprocessCore randomForest rgl scatterplot3d vsn]; };
-  iChip = derive2 { name="iChip"; version="1.24.0"; sha256="09vx2sz88gii3d0wi0sf3m1hi7i2737mp2xzawchdh9pr9i7p2qw"; depends=[limma]; };
-  iClusterPlus = derive2 { name="iClusterPlus"; version="1.6.0"; sha256="1a0a6pyv10fy7hhfsar14wrwqzj4dd1qlcvgkc4cs3sbrns2gjw2"; depends=[]; };
-  iGC = derive2 { name="iGC"; version="1.0.0"; sha256="091bm1qssl8ngiv9cbl6i7mdgi65l1ywk5a78jl01j414h190bra"; depends=[data_table plyr]; };
-  iPAC = derive2 { name="iPAC"; version="1.14.0"; sha256="1gzxv6jkn7crylklmnvhm86gczmsr80dmw1a7flaisiiy40k128g"; depends=[Biostrings gdata multtest scatterplot3d]; };
-  iSeq = derive2 { name="iSeq"; version="1.22.0"; sha256="1bh2s5cc7jsz1gdh0f5f09izm3b2pjmzbhmr0vyp1b9nc12i35v9"; depends=[]; };
-  ibh = derive2 { name="ibh"; version="1.18.0"; sha256="0damqv5bn9fyki7ghqflz8bzg42v3wf1gi173adk9hpj9glic73j"; depends=[simpIntLists]; };
-  idiogram = derive2 { name="idiogram"; version="1.46.0"; sha256="154hrvq86bm8f51mbgzfzg3gjyzzlnsl3yfmqglk78smj2a152lf"; depends=[annotate Biobase plotrix]; };
-  illuminaio = derive2 { name="illuminaio"; version="0.12.0"; sha256="1mjgs1kf4wzb3zvqyq4w81sqrb4nrf6qwdlg6hz471xh6c3b7avb"; depends=[base64]; };
-  imageHTS = derive2 { name="imageHTS"; version="1.20.0"; sha256="1dg8cmrnzlv2qm5lf9771fiir5l0cql6pmfmv0l3037wisdgz1jw"; depends=[Biobase cellHTS2 e1071 EBImage hwriter vsn]; };
-  immunoClust = derive2 { name="immunoClust"; version="1.2.0"; sha256="1hgla6chdpbc3yk8k5i8pzkxr17clirpcihp5gczr9xnqx9k8i2h"; depends=[flowCore lattice]; };
-  impute = derive2 { name="impute"; version="1.44.0"; sha256="0y4x5jk7gsf4xn56jrkdcdnxpcfll4h6ivncd7n4snmzixldvmvw"; depends=[]; };
-  inSilicoDb = derive2 { name="inSilicoDb"; version="2.6.0"; sha256="1avxm8qm9rblck94v0aq0na70jfl2cyr9xmbbk27n5hgp1cnaizf"; depends=[Biobase RCurl rjson]; };
-  inSilicoMerging = derive2 { name="inSilicoMerging"; version="1.14.0"; sha256="1xiq66b0vjrcxf4nbmk5mmn1dlxbpa879z04f00w3yz1k7rx6782"; depends=[Biobase]; };
+  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.8.0"; sha256="0gkjjdx20438hnbs6hhshkx0k4ja2xci0mcg2qcbgg0ajsi0zx86"; depends=[AnnotationDbi BiocGenerics Category ggplot2 gridSVG interactiveDisplayBase plyr RColorBrewer reshape2 shiny XML]; };
-  interactiveDisplayBase = derive2 { name="interactiveDisplayBase"; version="1.8.0"; sha256="1zibrbykz45w04xn9c0fc65jjqcg9dqzlpac248ry4hqfw21yxw8"; depends=[BiocGenerics shiny]; };
-  inveRsion = derive2 { name="inveRsion"; version="1.18.0"; sha256="05jwxwjyvkilfmygf16k3d55ma7s1ya7lyxh8v4pd8gql7v3kllq"; depends=[haplo_stats]; };
-  iontree = derive2 { name="iontree"; version="1.16.0"; sha256="1pamgkg85qi3iqqws7a3l8lph428alz1dzf08x309njqz8cbzw91"; depends=[rJava RSQLite XML]; };
-  isobar = derive2 { name="isobar"; version="1.16.0"; sha256="1awi1z5aljmagxyrj3xfw0j24r8acrq0vrq691jrfjx625aqq81n"; depends=[Biobase distr plyr]; };
-  iterativeBMA = derive2 { name="iterativeBMA"; version="1.28.0"; sha256="0y9api2dibn5n0yqvyc2xag4xlzxq0h9sdf29ri9v1kfvpgksn9y"; depends=[Biobase BMA leaps]; };
-  iterativeBMAsurv = derive2 { name="iterativeBMAsurv"; version="1.28.0"; sha256="02g355bmjf1lcdkgr62a8sf2vckmdziia45w5gh4mmyf5hk4w9fi"; depends=[BMA leaps survival]; };
-  jmosaics = derive2 { name="jmosaics"; version="1.10.0"; sha256="1q67ylrgc2abny2wxgsl1cni225inar1dhim0psrbrf5ik77kgmk"; depends=[mosaics]; };
-  joda = derive2 { name="joda"; version="1.18.0"; sha256="0fjbxczwkn8f4p0h8dgi3vfn4qf9a650wmp01q20j7f0jsmmb06x"; depends=[bgmm RBGL]; };
-  kebabs = derive2 { name="kebabs"; version="1.4.1"; sha256="1fqvp17x6z7hpgh4z71npvvskhd4j68g3p67ifc8phrmlqyaa84d"; depends=[Biostrings e1071 IRanges kernlab LiblineaR Matrix Rcpp S4Vectors XVector]; };
-  keggorthology = derive2 { name="keggorthology"; version="2.22.0"; sha256="1sl0h63f3vvydbbj90hp5arswr6mzj5xlhqa6wbj3jhyq169qi5x"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
-  lapmix = derive2 { name="lapmix"; version="1.36.0"; sha256="1ambwxc4j6y959ww48s09pyrf4v1fghv6grybmy41vhczqvqhkdx"; depends=[Biobase]; };
-  ldblock = derive2 { name="ldblock"; version="1.0.0"; sha256="1snzfyfvji26n5j9jl9ib9wj7m8aln187zchpv182szrivqd1yqc"; depends=[Matrix snpStats]; };
-  les = derive2 { name="les"; version="1.20.0"; sha256="0dgajsws35qg1x5i12hnp0p3qixq6nqsxm16qws93vhvgmnl540a"; depends=[boot fdrtool gplots RColorBrewer]; };
-  lfa = derive2 { name="lfa"; version="1.0.0"; sha256="1lxirjinq6r3g749li0m8llrv195q9kjcwmd9gyvk84i570nliy9"; depends=[corpcor]; };
-  limma = derive2 { name="limma"; version="3.26.8"; sha256="0pw91q8ahjzagyx7p564z812lczvbbc6m4mymwn30di8xv1vd3mv"; depends=[]; };
-  limmaGUI = derive2 { name="limmaGUI"; version="1.46.0"; sha256="14avwg48kf0m203yzlz69nbn2zcw65v70d6lkf65ahkl3rapij1h"; depends=[AnnotationDbi BiocInstaller gcrma limma R2HTML tkrplot xtable]; };
-  lmdme = derive2 { name="lmdme"; version="1.12.0"; sha256="102v67asih0czi8yrc9v859dwfb2c3s14qppcjdif6b04xs92pgv"; depends=[limma pls stemHypoxia]; };
-  logicFS = derive2 { name="logicFS"; version="1.40.0"; sha256="10c154jy6lrycsnk8912572m5hjv2ngf2q3gr1wmavyan4bsqwvd"; depends=[LogicReg mcbiopi]; };
-  logitT = derive2 { name="logitT"; version="1.28.0"; sha256="1qbimjjl5xv5h30r74bd86dg10djajb01qav6gp95l6f59fx2j1q"; depends=[affy]; };
-  lol = derive2 { name="lol"; version="1.18.0"; sha256="0dc3ga7yalzfngh3y33sa4bchhbxgndkls3vdxh4yzcsdvk60i1f"; depends=[Matrix penalized]; };
-  lpNet = derive2 { name="lpNet"; version="2.2.0"; sha256="0sscs69mwzsz8bifgkmaa08zms6vqqls727p8gz4zq79nlw726yj"; depends=[lpSolve nem]; };
-  lumi = derive2 { name="lumi"; version="2.22.1"; sha256="0c1vzplvjk6b9p81cj76vs5rp33swdp0m142hwbw4jfw46rx0aqq"; depends=[affy annotate AnnotationDbi Biobase DBI GenomicFeatures GenomicRanges KernSmooth lattice MASS methylumi mgcv nleqslv preprocessCore RSQLite]; };
-  mAPKL = derive2 { name="mAPKL"; version="1.2.0"; sha256="1k1yxxj6371sagiy63fl1dh8d71cqg6gvx8pkjy3ahp1hbh45b6l"; depends=[AnnotationDbi apcluster Biobase clusterSim e1071 igraph limma multtest parmigene reactome_db]; };
-  mBPCR = derive2 { name="mBPCR"; version="1.24.0"; sha256="1n9s75jx7pkq8vsq2ycyfgnk5mrfx3lr0ykp486ns8xmas3yyn3c"; depends=[Biobase oligoClasses SNPchip]; };
-  mQTL_NMR = derive2 { name="mQTL.NMR"; version="1.4.0"; sha256="0flb1lqsq7ldicidag20icnhmds2qr85yrbjsv4h06klggq2vjvg"; depends=[GenABEL MASS outliers qtl]; };
-  maCorrPlot = derive2 { name="maCorrPlot"; version="1.40.0"; sha256="1chv95b3fi1jiy7nbxfj4szhjqm1ycb3xarjrd20xln5msainf7h"; depends=[lattice]; };
-  maPredictDSC = derive2 { name="maPredictDSC"; version="1.8.0"; sha256="08wb622jp98xnqx8hh09n98ln8ifc21c0bc5gah5y68ldmg0x2iw"; depends=[affy AnnotationDbi caret class e1071 gcrma hgu133plus2_db limma LungCancerACvsSCCGEO MASS ROC ROCR]; };
-  maSigPro = derive2 { name="maSigPro"; version="1.42.0"; sha256="06a69r685qpjyi49yq7lw444533m9hhqb56fpki2w0067wh6a54m"; depends=[Biobase limma MASS Mfuzz]; };
-  maanova = derive2 { name="maanova"; version="1.40.0"; sha256="112hbyfw18dshshsmbaylwra169w6bbwwqql3d96s0in1fl20mdl"; depends=[Biobase]; };
-  macat = derive2 { name="macat"; version="1.44.1"; sha256="061y6a1q7c9r9a01hy6l86wc085f530y7hjw7asx506cf91ifwdk"; depends=[annotate Biobase]; };
-  made4 = derive2 { name="made4"; version="1.44.0"; sha256="161vs8jbc711n9x67i31818a3nzjp74rm3dw20aqrhfbikvi9r7g"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
-  maigesPack = derive2 { name="maigesPack"; version="1.34.0"; sha256="08pszyq03f1vjgirq0zcv31m4c0acdbfh622qiw0x0w1gz6plm0g"; depends=[convert graph limma marray]; };
-  makecdfenv = derive2 { name="makecdfenv"; version="1.46.0"; sha256="0ca7hc4apamg8i2b8fb56mchksw26jj139clq3vxw6nl4ny9ipvg"; depends=[affy affyio Biobase zlibbioc]; };
-  manta = derive2 { name="manta"; version="1.16.0"; sha256="0j6zll7b1qqdnydg59hywargw6bivry3cx5m2wpj79wn673kib3c"; depends=[caroline edgeR Hmisc]; };
-  marray = derive2 { name="marray"; version="1.48.0"; sha256="103nag8ygjyw8p9v94y2c6lgiynbz2x4s6i71l7ydv2ipfr6b2fb"; depends=[limma]; };
-  maskBAD = derive2 { name="maskBAD"; version="1.14.0"; sha256="18lvg85ss29wwxb60a2nwpc1v7d7cdl5al2wki1c0d770f7b232r"; depends=[affy gcrma]; };
-  massiR = derive2 { name="massiR"; version="1.6.0"; sha256="1wfvzx2ysl2hlcx4nlzfw5lb4bal6ysmyzf6gw3y4023dyrlzb64"; depends=[Biobase cluster diptest gplots]; };
-  matchBox = derive2 { name="matchBox"; version="1.12.0"; sha256="1p92c8vp9c65g8qzb3jlz7lniizpkymry1mh4p7izclf5mrrwk3s"; depends=[]; };
-  mcaGUI = derive2 { name="mcaGUI"; version="1.18.0"; sha256="0rxhs059z0l6lal33m78hkp73k46c2pdy0nn5lxwxr590fglvh0f"; depends=[bpca foreign gWidgets gWidgetsRGtk2 lattice MASS OTUbase proto vegan]; };
-  mdgsa = derive2 { name="mdgsa"; version="1.2.0"; sha256="05lqj7d4464z976w4rvnzpv1abihq1fpxhcl2zyg5izwqpq6ga9r"; depends=[AnnotationDbi cluster DBI GO_db KEGG_db Matrix]; };
-  mdqc = derive2 { name="mdqc"; version="1.32.0"; sha256="1aaria9nm9b4bl6r4lx0icjb20zrxcc0g8bj9jn2d04s8bzihmjw"; depends=[cluster MASS]; };
-  meshr = derive2 { name="meshr"; version="1.6.2"; sha256="1gpdfgzxcaz0m2a6aji7zmr7bymdh7h4cd5agcwl3ip3lzsj76nb"; 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.6.0"; sha256="039409wfdbv4hcj4zif581dy03l1wqg7nr1g8yc7ispqwpxnhwzf"; depends=[foreach ggplot2 plyr Rcpp survival]; };
-  metaArray = derive2 { name="metaArray"; version="1.48.0"; sha256="1zx9ymjqh851r33jv7fpyy4319fqi2kgjgxxbgpq1xl6cfkglr4h"; depends=[Biobase MergeMaid]; };
-  metaMS = derive2 { name="metaMS"; version="1.6.0"; sha256="1kkxx5hvjkljzrdq6g00dzw0k8y15h7q2fa9j8899jvq9p11yyiq"; depends=[BiocGenerics CAMERA Matrix robustbase xcms]; };
-  metaSeq = derive2 { name="metaSeq"; version="1.10.0"; sha256="10nx4jr2mwk5zw6mag0j6v2rnn6h0pnp97pdmmsz8fgkx6245ygm"; depends=[NOISeq Rcpp snow]; };
-  metaX = derive2 { name="metaX"; version="1.0.2"; sha256="1mqxwb4p1mw5821apyqb22vq2f091n95yar4x4h6cf1h3jxglj12"; 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 scatterplot3d SSPA stringr VennDiagram vsn xcms]; };
-  metabomxtr = derive2 { name="metabomxtr"; version="1.4.0"; sha256="1zwqz9yl154c3h7qhrmkf2zcvzi2azm1sdkvrpyxg7zjks3bmyz8"; depends=[Biobase Formula multtest optimx plyr]; };
-  metagene = derive2 { name="metagene"; version="2.2.1"; sha256="1l0zfhk4gnm3gvy24igismpb3j3m6vh4mb4q41cfrpkmxn2zlvaq"; depends=[BiocParallel DBChIP GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 gplots IRanges muStat R6 Rsamtools rtracklayer]; };
-  metagenomeFeatures = derive2 { name="metagenomeFeatures"; version="1.0.0"; sha256="1lbb505s976j2jxxi7snhd1yahcs0ca9qnicq12b5jmp3ki1br9k"; depends=[Biobase Biostrings dplyr lattice lazyeval magrittr RSQLite ShortRead stringr]; };
-  metagenomeSeq = derive2 { name="metagenomeSeq"; version="1.12.0"; sha256="0bqxm37ds9a5dibzlxnbdvvqcyzwxxnnw7i6a04g84k885zzxr3a"; depends=[Biobase foreach glmnet gplots limma Matrix matrixStats RColorBrewer]; };
-  metahdep = derive2 { name="metahdep"; version="1.28.0"; sha256="1vl87mc4yl3il9hmsybbwjga610p3lh5717n4csjyaywskqa1ixk"; depends=[]; };
-  metaseqR = derive2 { name="metaseqR"; version="1.10.0"; sha256="1gy5ywrxqwd8lizbj9lk6qck6zwk670j5y2f0ayz6xvkki4vab97"; depends=[baySeq biomaRt brew corrplot DESeq EDASeq edgeR gplots limma log4r NBPSeq NOISeq qvalue rjson vsn]; };
-  methVisual = derive2 { name="methVisual"; version="1.22.0"; sha256="1kcqhlv0lmr7wlkxjl9qqv2676pwna3i4w5xpm4inwgcb892zgjm"; depends=[Biostrings ca gridBase gsubfn IRanges plotrix sqldf]; };
-  methyAnalysis = derive2 { name="methyAnalysis"; version="1.12.1"; sha256="1fl07k42j292cjr6vgwra84zhwpkaygjr7pqbkiq0abi29ifgw7i"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt genefilter GenomeInfoDb GenomicFeatures GenomicRanges genoset Gviz IRanges lumi methylumi org_Hs_eg_db rtracklayer VariantAnnotation]; };
-  methylMnM = derive2 { name="methylMnM"; version="1.8.0"; sha256="1jj6s6pr3hih31n98jsgil3k7n19n5ab4rylfmfnzlbgsdmnw4kq"; depends=[edgeR statmod]; };
-  methylPipe = derive2 { name="methylPipe"; version="1.4.5"; sha256="013rrdm7nx9m9g0ym0j1cvzrgplw149ivsrfcjfylxdjgwvw61yz"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicRanges gplots Gviz IRanges marray Rsamtools S4Vectors SummarizedExperiment]; };
-  methylumi = derive2 { name="methylumi"; version="2.16.0"; sha256="1glp1p7jvnsqarpw92nha6hrrhalh5wm262imwmpbfiik7glp217"; 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.18.0"; sha256="1qdjl9cfyi2fmfm3nlzhp9wdpmvagddvb2cwy6j1pynbx03m55gl"; depends=[gplots]; };
-  miRLAB = derive2 { name="miRLAB"; version="1.0.1"; sha256="0mkhrzlpf65kc3vwxlc2ckymaziqwxdc0q2rxd77ajdblbccbg59"; depends=[energy entropy glmnet gplots Hmisc httr impute limma pcalg RCurl Roleswitch stringr]; };
-  miRNApath = derive2 { name="miRNApath"; version="1.30.0"; sha256="0syi2kc6m9zhqaxhzj9h9micnracjj3yfgs8r5zlhs9hdp14jspi"; depends=[]; };
-  miRNAtap = derive2 { name="miRNAtap"; version="1.4.0"; sha256="04ag91k3xa6gcmlgi2fr00p5247syn856n6jp3fhwhcn5pf5zd8y"; depends=[AnnotationDbi DBI plyr RSQLite sqldf stringr]; };
-  miRcomp = derive2 { name="miRcomp"; version="1.0.0"; sha256="1a0h7qx7b4ccry5xmgh6fwqandi9lhgnlf0gk1zj6dy9zbkiwhvl"; depends=[Biobase miRcompData]; };
-  microRNA = derive2 { name="microRNA"; version="1.28.0"; sha256="14l7fjvapswyk8y690xll3w1yalwl5sqqh8v8xp5xy9qvb3qgiiz"; depends=[Biostrings]; };
-  minet = derive2 { name="minet"; version="3.28.0"; sha256="16hddd2agqldpfjc4bxa1wm58pczni8b4d8kc09bx2dk5rr4bcg7"; depends=[infotheo]; };
-  minfi = derive2 { name="minfi"; version="1.16.1"; sha256="0ddqkbgxrfiijz5xzjb566xwvzrwljjhfhylqzhmz8fnrvqydid8"; depends=[beanplot Biobase BiocGenerics Biostrings bumphunter genefilter GenomeInfoDb GenomicRanges GEOquery illuminaio IRanges lattice limma MASS matrixStats mclust mixOmics nlme nor1mix preprocessCore quadprog RColorBrewer reshape S4Vectors siggenes SummarizedExperiment]; };
-  mirIntegrator = derive2 { name="mirIntegrator"; version="1.0.0"; sha256="004cy2l4li55nd8n4facfk30ndhm1vdxkdsk4zywg14hmn95ldgv"; depends=[AnnotationDbi ggplot2 graph org_Hs_eg_db Rgraphviz ROntoTools]; };
-  missMethyl = derive2 { name="missMethyl"; version="1.4.0"; sha256="1hbh99ix20909f4mpc3czh8jyj970gi4bj04fcvra6fd8n40w1b4"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
-  mitoODE = derive2 { name="mitoODE"; version="1.8.0"; sha256="1rbxppzwmlrfyzcsa5b0biqm79qyv9662dh16zzp3frz56325kzy"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
-  mmnet = derive2 { name="mmnet"; version="1.8.1"; sha256="0ppcy11xnn593xig8gwz79vsbkdi3f5aai58zdhr59w52y2dafia"; depends=[Biobase biom flexmix ggplot2 igraph KEGGREST Matrix plyr RCurl reshape2 RJSONIO stringr XML]; };
-  mogsa = derive2 { name="mogsa"; version="1.2.1"; sha256="07jm5avdhan9mn0pdaq6vhxx7xaibs0sylnc3hfpns84d8rsf65b"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
-  monocle = derive2 { name="monocle"; version="1.4.0"; sha256="1g1f5a433pq0zdjc9ymgbpdbxvixqjlkdm10vqs6gf4r511a3k76"; depends=[Biobase BiocGenerics cluster combinat fastICA ggplot2 HSMMSingleCell igraph irlba limma matrixStats plyr reshape2 VGAM]; };
-  mosaics = derive2 { name="mosaics"; version="2.4.0"; sha256="13vl1grn08qy64971wimmc1j117l7fzxpcwnvaz0j5020m5m8qq7"; depends=[IRanges lattice MASS Rcpp]; };
-  motifRG = derive2 { name="motifRG"; version="1.14.0"; sha256="1v9zm5629k2lcqbbgw8bwflvbircyxkfavbkvmbd212kgwcng8vn"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
-  motifStack = derive2 { name="motifStack"; version="1.14.0"; sha256="13s1y5xzkaapd53i33f8vdkdl5r4b8jzdyqrydanx35sgwn7fj1c"; depends=[ade4 Biostrings grImport MotIV scales XML]; };
-  motifbreakR = derive2 { name="motifbreakR"; version="1.0.4"; sha256="1mwa070iqvq6qc0igvy5aivnqbipai1grccf1vz80al44pfx1w2v"; depends=[BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicRanges grImport Gviz IRanges matrixStats MotifDb motifStack rtracklayer S4Vectors stringr TFMPvalue VariantAnnotation]; };
-  msa = derive2 { name="msa"; version="1.2.1"; sha256="0lj5x3zh5vp6j9s3h77iq0awy9v5n453hbqf3k8pasj6l5x0dmyj"; depends=[BiocGenerics Biostrings IRanges Rcpp S4Vectors]; };
-  msmsEDA = derive2 { name="msmsEDA"; version="1.8.0"; sha256="0y9k03mpq5i6sa8dngadgcxi02ggka7n1rz54mll012gs6fzvyra"; depends=[gplots MASS MSnbase RColorBrewer]; };
-  msmsTests = derive2 { name="msmsTests"; version="1.8.0"; sha256="1qkg7rhvfgpkq8v1avwffqc2v6afijwzw1myd17llmj6z8iyhy6j"; depends=[edgeR msmsEDA MSnbase qvalue]; };
-  multiscan = derive2 { name="multiscan"; version="1.30.0"; sha256="0nl1pjg1x1rdfhn09c9nk96swsw3gph7bnd1lfj87024b4w1r50p"; depends=[Biobase]; };
-  multtest = derive2 { name="multtest"; version="2.26.0"; sha256="1gpq2adj177fn8xf7gpiiq8khmcln90xif413j1fzpwjmjpzpb1v"; depends=[Biobase BiocGenerics MASS survival]; };
-  muscle = derive2 { name="muscle"; version="3.12.0"; sha256="1bcyi2n1mpnp7b54lxj8g03rbjrawyr3isn211rb5m7r8jzpdvyw"; depends=[Biostrings]; };
-  mvGST = derive2 { name="mvGST"; version="1.4.0"; sha256="1yi8558lkqfrmxgighb5v8q12gwqlbs2ds610fgf8ggrdn84bzq8"; depends=[annotate AnnotationDbi GO_db GOstats gProfileR graph Rgraphviz stringr topGO]; };
-  mygene = derive2 { name="mygene"; version="1.6.0"; sha256="0przfr6y9svkj9dbih43hpi69wzs07r15q7w233pnmm2qhxylkf4"; depends=[GenomicFeatures Hmisc httr jsonlite plyr S4Vectors sqldf]; };
-  myvariant = derive2 { name="myvariant"; version="1.0.1"; sha256="1xby50zw1250nvqbki1xccjcri8qz286mdzrm3fzfv63i8g4xwjq"; depends=[GenomeInfoDb Hmisc httr jsonlite magrittr plyr S4Vectors VariantAnnotation]; };
-  mzID = derive2 { name="mzID"; version="1.8.0"; sha256="1250kd8lrl4hnh8mvbl5hqbcszg3nynssdvjmy12wf0y0r9gjm8x"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
-  mzR = derive2 { name="mzR"; version="2.4.1"; sha256="189dsr69p0yxqm9lwhqxd9i24f45hqywp8ncx535znv2dhs8v1rw"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
-  ncdfFlow = derive2 { name="ncdfFlow"; version="2.16.1"; sha256="0r968wix53rwwqx60gl04a46c1pwfydi80gixbx147zv8lxmc5cx"; depends=[BH Biobase flowCore flowViz Rcpp RcppArmadillo zlibbioc]; };
-  neaGUI = derive2 { name="neaGUI"; version="1.8.0"; sha256="1xms5k8zzbk31sj0f92rsqjv40vcqy89pmy8z3j0336iascqbx9l"; depends=[hwriter]; };
-  nem = derive2 { name="nem"; version="2.44.0"; sha256="1bkq622jyrfn0v4wyw5ycxmri8kyils4wznsz26ki3awff34lq3h"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
-  netbenchmark = derive2 { name="netbenchmark"; version="1.2.0"; sha256="10s8xsisjp9sj9dl67bgn94ipm6a6kpqli3pvjdpxkmvjkg400kg"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; };
-  netbiov = derive2 { name="netbiov"; version="1.4.0"; sha256="1h3986kfi516xlw675cq901ls9v7rj5rr0ls5lny21wd439n2avf"; depends=[igraph]; };
-  nethet = derive2 { name="nethet"; version="1.2.0"; sha256="1p214bgjccigsvqcr0kv0ckv00zvkkpk2pfh9xvcb4kp6biqs94j"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; };
-  netresponse = derive2 { name="netresponse"; version="1.20.15"; sha256="1mh3b5gjyh6nqif9qc45yy703vi4a4hi0szl6y6aazxd6fjqy98s"; depends=[dmt ggplot2 graph igraph mclust minet plyr qvalue RColorBrewer reshape2 Rgraphviz]; };
-  networkBMA = derive2 { name="networkBMA"; version="1.12.0"; sha256="0zkf10iqiabsln1jxq0sypr43mrw6k82l3pdp5bg9kcv0bqqqy5k"; depends=[BMA Rcpp RcppArmadillo RcppEigen]; };
-  nnNorm = derive2 { name="nnNorm"; version="2.34.0"; sha256="1wb85z0r0rwgaf1yzzlj1pcbgclz2isz9whxsify9jx8gfqflanh"; depends=[marray nnet]; };
-  nondetects = derive2 { name="nondetects"; version="2.0.0"; sha256="0cyp7f90w9vcgwkg0mxrrpv28wihsgbynhq5kjk5hng9qfqjcyxg"; depends=[Biobase HTqPCR limma mvtnorm]; };
-  npGSEA = derive2 { name="npGSEA"; version="1.6.0"; sha256="1vd02qwqv5rdkixi5ncqsxxy7zvr8qi4d6cms11fzwcmhisi1s4c"; depends=[Biobase BiocGenerics GSEABase]; };
-  nucleR = derive2 { name="nucleR"; version="2.2.0"; sha256="0zhflv4nkn9dc2bdl81j9mjww6nh1mj6ffffy9cywvxzgpp2lc50"; depends=[Biobase BiocGenerics GenomicRanges IRanges Rsamtools S4Vectors ShortRead]; };
-  nudge = derive2 { name="nudge"; version="1.36.0"; sha256="1px6hnda7hp7yx9imkl8xq8m772csd2qic0kq5bqwshk5qdvfhw7"; depends=[]; };
-  occugene = derive2 { name="occugene"; version="1.30.0"; sha256="0p6pk7v75b4pbyxs1pglbsfprk4yi854d8aw41a1lwbmaphx5yyc"; depends=[]; };
-  oligo = derive2 { name="oligo"; version="1.34.2"; sha256="0cv0vl8cj9n3la6n55qqlncyaxv072n6sdx8gp65prm6myp3ycgw"; depends=[affxparser affyio Biobase BiocGenerics Biostrings DBI ff oligoClasses preprocessCore RSQLite zlibbioc]; };
-  oligoClasses = derive2 { name="oligoClasses"; version="1.32.0"; sha256="0gm4z4pa1hyrd9bdzncmkfhfywp3622wnyvhayhw7h17dw4gw94j"; depends=[affyio Biobase BiocGenerics BiocInstaller Biostrings ff foreach GenomicRanges IRanges RSQLite S4Vectors SummarizedExperiment]; };
-  omicade4 = derive2 { name="omicade4"; version="1.10.0"; sha256="1ay1jm0r8qyr9271l1aqnvm800pagd3j21m37qlv6xfjvv4j6w5f"; depends=[ade4 made4]; };
-  oneChannelGUI = derive2 { name="oneChannelGUI"; version="1.36.0"; sha256="0r5y531y4niy9gh64n7nk8a0xcj8lyg36axhcjx116ycsqa00x5h"; depends=[affylmGUI Biobase Biostrings chimera IRanges Rsamtools siggenes tkrplot tkWidgets]; };
-  ontoCAT = derive2 { name="ontoCAT"; version="1.22.0"; sha256="03vy4210m31jzhhhbhw3ixhm1lji4qil2zp0ckmyh3xb8m8s8fzl"; depends=[rJava]; };
-  openCyto = derive2 { name="openCyto"; version="1.8.4"; sha256="1g23qia1ah2rjvz6clc9jfpb1sql2g1298bd8lard293ryvwpnhv"; 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.6.0"; sha256="0wdh40477hn2875j0q4nj0l0h210jym4j642lkjlx8zvdx9jra29"; depends=[ape Biobase biomaRt fastICA fdrtool igraph KernSmooth pixmap scatterplot3d som]; };
-  pRoloc = derive2 { name="pRoloc"; version="1.10.1"; sha256="1k9249g46gf6ar3q44zrg8v1lqxl81rljmn0c107rxck0rvdwaxn"; 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.4.1"; sha256="14wmmhrdm5fgw8smxgdadd49ggaqnnqw7p65xn0kkj6yk87h3xrx"; depends=[DT MSnbase pRoloc pRolocdata scales shiny]; };
-  paircompviz = derive2 { name="paircompviz"; version="1.8.0"; sha256="0q5saqpyfjx37d6l6vqfiws8n4axarfvb1qr010a3davhdz4kzn8"; depends=[Rgraphviz]; };
-  pandaR = derive2 { name="pandaR"; version="1.2.0"; sha256="00wkzhkghzy04pg5qxgd2gmcmqgri20vgw8m08yfdymb918zgvyk"; depends=[igraph matrixStats]; };
-  panp = derive2 { name="panp"; version="1.40.0"; sha256="0fmi5j7xr2720548k36njjk4ad4szma3zbqig4ghd1x2gg94wh7n"; depends=[affy Biobase]; };
-  parglms = derive2 { name="parglms"; version="1.2.0"; sha256="1n1q838gv45daji04a0m0wc92a3xwhgf4asl7wbirk198ra3q7pj"; depends=[BatchJobs BiocGenerics doParallel foreach]; };
-  parody = derive2 { name="parody"; version="1.28.0"; sha256="1srs2qyp7lwq9w19izszg3n9q0mlj634zlksb796v7608yp0y643"; depends=[]; };
-  pathRender = derive2 { name="pathRender"; version="1.38.0"; sha256="0bc9xy1hka79bq0zw1faalsl89aibf7d77i7gv9jnmh66li9g1pa"; depends=[AnnotationDbi cMAP graph RColorBrewer Rgraphviz]; };
-  pathVar = derive2 { name="pathVar"; version="1.0.1"; sha256="1ixraifr8d86m9rdg38d6kfzmgghjxasgi3abb1i8knjyfwrc05v"; depends=[data_table EMT ggplot2 gridExtra Matching mclust]; };
-  pathifier = derive2 { name="pathifier"; version="1.8.0"; sha256="08ipv1xcmxdb9g8h4dh4c7icwfp4myd9gwacb3cbl48libl459wj"; depends=[princurve R_oo]; };
-  pathview = derive2 { name="pathview"; version="1.10.1"; sha256="0mpr9fqfp3ar927m6rvghn6ggbxp2ll2a9jfrz9ic44mbwpa1lb1"; depends=[AnnotationDbi graph KEGGgraph KEGGREST org_Hs_eg_db png Rgraphviz XML]; };
-  paxtoolsr = derive2 { name="paxtoolsr"; version="1.4.6"; sha256="170gm5qxlsz2dv249q16shpj0xm9y7rp3rpn9ij6r2c5d3xn8i21"; depends=[data_table httr igraph plyr R_utils rJava rjson XML]; };
-  pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.14.0"; sha256="1w0cpakxlm8dx6z3j844xmkz3dawiaschrjcjlkqjv9ay8vfkhz8"; depends=[AnnotationDbi Biostrings ellipse]; };
-  pcaMethods = derive2 { name="pcaMethods"; version="1.60.0"; sha256="090bgl178zxj89d0kshwl5jkz8qszgdbwrfdbbawg8ka48bilw2l"; depends=[Biobase BiocGenerics MASS Rcpp]; };
-  pcot2 = derive2 { name="pcot2"; version="1.38.0"; sha256="1ycsbry5srf1msq4vcvv0q34lgzkwadh7k1pgwv963i567i4lx3b"; depends=[amap Biobase]; };
-  pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.34.1"; sha256="0dp1723hfkx0pc76b5xglqkxgvsh2iqqmx3sy9kyv7qcqgida14r"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
-  pdmclass = derive2 { name="pdmclass"; version="1.42.0"; sha256="1f4zrxbyk49hm0cxp0g1786cwc7g1k5z6v3hn2z66m7rbapz8afy"; depends=[Biobase fibroEset mda]; };
-  pepStat = derive2 { name="pepStat"; version="1.4.0"; sha256="0ys8nq2f5ajir4k8gdm02p26vzbhhk88ys8zc7zsqim3v4pxgdis"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
-  pepXMLTab = derive2 { name="pepXMLTab"; version="1.4.0"; sha256="1fgq8x6c3lml12a92ihrkkvaph1xh90i01h15k42aadh3725a5nw"; depends=[XML]; };
-  phenoDist = derive2 { name="phenoDist"; version="1.18.0"; sha256="0kjsdgvr5kmrnn7mjzphk5r6irgjv5cfgmrd4yddprbmmln39avn"; depends=[e1071 imageHTS]; };
-  phenoTest = derive2 { name="phenoTest"; version="1.18.0"; sha256="1lgxacph4mv0z8c17lx4f82nvq151ggsfv5f9p35aw9z1pc10pwg"; 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.14.0"; sha256="0h34ac577d2lzh6rzbvwz04ngp3v4c728z0nzf646ab10nfk1i17"; depends=[ade4 ape Biobase BiocGenerics biom Biostrings cluster data_table foreach ggplot2 igraph multtest plyr reshape2 scales vegan]; };
-  piano = derive2 { name="piano"; version="1.10.2"; sha256="01ql6x020ai8aj6x89bsxixvv4q4fxsnyv87kxaw4p1hxcxqvybp"; depends=[Biobase BiocGenerics gplots igraph marray relations]; };
-  pickgene = derive2 { name="pickgene"; version="1.42.0"; sha256="1awm471s2mx4w7m2p2bdz67rbgyz0khsa85bbrjcb4lbvljqwdv7"; depends=[MASS]; };
-  pint = derive2 { name="pint"; version="1.20.0"; sha256="19q21b3zdn4adx49zn88z69xz3mqza58xdhig3zicn9s0g21bfz4"; depends=[dmt Matrix mvtnorm]; };
-  pkgDepTools = derive2 { name="pkgDepTools"; version="1.36.0"; sha256="1v2fsax49wklwdmgxp9pjyp18cbj2rsg7yd68mwr2amlihgvmsp1"; depends=[graph RBGL]; };
-  plateCore = derive2 { name="plateCore"; version="1.28.0"; sha256="1v7shvjnav930grswbixj8fyabmamsgry5g5is3sf9ymp9r8gh5x"; depends=[Biobase flowCore flowStats flowViz lattice latticeExtra MASS robustbase]; };
-  plethy = derive2 { name="plethy"; version="1.8.0"; sha256="1skaqws1yb8n8li4daprq4x8vrbyykm3fk6pzwx7iyr3nf2r2zz5"; depends=[Biobase BiocGenerics DBI ggplot2 IRanges plyr RColorBrewer reshape2 RSQLite S4Vectors Streamer]; };
-  plgem = derive2 { name="plgem"; version="1.42.0"; sha256="0nbiv4zbfiwa9mkpa2ldhnj3bi5nyrqcrzx1b54fcxsndrj9106i"; depends=[Biobase MASS]; };
-  plier = derive2 { name="plier"; version="1.40.0"; sha256="0jlrxv79yg9w8yqlqqmswcrpk0ddw811qg142vbpd1alib35wrxi"; depends=[affy Biobase]; };
-  plrs = derive2 { name="plrs"; version="1.10.0"; sha256="1f2dlgcbpfrn5za2z7nf1y8jzrcb5hzb3gix18nyqmz9syg57zha"; depends=[Biobase BiocGenerics CGHbase ic_infer marray quadprog Rcsdp]; };
-  plw = derive2 { name="plw"; version="1.30.0"; sha256="190bccvxhdgp3ah9vzdpjddb33ck38r5x4gw1f8vwxh0mw79vf9c"; depends=[affy MASS]; };
-  pmm = derive2 { name="pmm"; version="1.2.0"; sha256="1rsyh05w32gk2sip9hx1q93hwqwb1kmns47aq8qj2dw26ii0is3c"; depends=[lme4]; };
-  podkat = derive2 { name="podkat"; version="1.2.0"; sha256="168piyx6c6vif771adm4594h6dq2h14g3jfk8lj2fvvdwyms2dn8"; depends=[Biobase BiocGenerics Biostrings BSgenome GenomeInfoDb GenomicRanges IRanges Matrix Rcpp Rsamtools]; };
-  polyester = derive2 { name="polyester"; version="1.6.0"; sha256="0if2rbgbfc3ghz5mnmpmpv6rq63qjm3l16gmlr493vfrpxdzclnv"; depends=[Biostrings IRanges limma logspline S4Vectors]; };
-  ppiStats = derive2 { name="ppiStats"; version="1.36.0"; sha256="1s5xv565w924g71qaxgmhfszrkqs3arzi8l0vzcz446r2pgm6d32"; depends=[Biobase Category graph lattice ppiData RColorBrewer ScISI]; };
-  prada = derive2 { name="prada"; version="1.46.0"; sha256="0ak21586bbkbpwji1pcbr44dlwyhslscrqm2y172310xbxm0sqbg"; depends=[Biobase BiocGenerics MASS RColorBrewer rrcov]; };
-  prebs = derive2 { name="prebs"; version="1.10.0"; sha256="06rbsza5gdv9k9hcaxx0k65p9w61kfxiw0p4ah23dqfx0mldh5nx"; depends=[affy Biobase GenomeInfoDb GenomicAlignments GenomicRanges IRanges RPA S4Vectors]; };
-  predictionet = derive2 { name="predictionet"; version="1.16.0"; sha256="1q7nl11kvh2rl5rzb4qnq5ckdrdkna0arfnjmki35lr8hyh65id0"; depends=[catnet igraph MASS penalized RBGL]; };
-  preprocessCore = derive2 { name="preprocessCore"; version="1.32.0"; sha256="07isghjkqm91rg37l1fzpjrbq36b7w4pbsi95wwh6a8qq7r69z1n"; depends=[]; };
-  proBAMr = derive2 { name="proBAMr"; version="1.4.1"; sha256="1lk3jq113hpx315kmq0s9ll1m7x1s91gwdzm3db06509wp5ki881"; depends=[AnnotationDbi Biostrings GenomicFeatures GenomicRanges IRanges rtracklayer]; };
-  procoil = derive2 { name="procoil"; version="1.20.0"; sha256="11ss88jfk1j2b29l43qlvrlmhgxlfv1dw8wd9sqy3z3figspr3wz"; depends=[]; };
-  prot2D = derive2 { name="prot2D"; version="1.8.0"; sha256="0pmsl550wvxnqx5zbj8b6lhvlb2bcmvi3xxx66x8r1sz3cdy3l7h"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
-  proteinProfiles = derive2 { name="proteinProfiles"; version="1.10.0"; sha256="0hkimlq3v8hq3khinydm4m8v5fgld74vc6yg9yzhz71hv1yy2i2m"; depends=[]; };
-  proteoQC = derive2 { name="proteoQC"; version="1.6.0"; sha256="15raykmw19k4yn4jppw4lqwgarr8b7sfsvhcif49xvw7k1dwj5ys"; depends=[ggplot2 MSnbase Nozzle_R1 plyr Rcpp reshape2 rTANDEM seqinr VennDiagram XML]; };
-  puma = derive2 { name="puma"; version="3.12.0"; sha256="0in135rhfy5dx8q205rrcid63g5q6xh6w7rimz6a1brn89dviaba"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
-  pvac = derive2 { name="pvac"; version="1.18.0"; sha256="1m4iqss2v7llyb2c6dsgajavxj9wf5d51k6l07qhqd25znrvml2l"; depends=[affy Biobase]; };
-  pvca = derive2 { name="pvca"; version="1.10.0"; sha256="1lvd5l2lcw84hcmzzwgbii87s9xd6cvqxzbc78393jhmgi8aapk0"; depends=[Biobase lme4 Matrix vsn]; };
-  pwOmics = derive2 { name="pwOmics"; version="1.2.0"; sha256="0vlr71mhch716xl2i0366pxjkawci0g2imvfhsqinv5gd92m6hpq"; depends=[AnnotationDbi AnnotationHub Biobase BiocGenerics biomaRt data_table GenomicRanges gplots igraph rBiopaxParser STRINGdb]; };
-  qcmetrics = derive2 { name="qcmetrics"; version="1.8.0"; sha256="0y5bi4162b93d02ksg1hpqlfx4inl6bmal84lhrrzra5k6zzv72m"; depends=[Biobase knitr Nozzle_R1 pander S4Vectors xtable]; };
-  qpcrNorm = derive2 { name="qpcrNorm"; version="1.28.0"; sha256="0ywh6iq1bywcyw5v6iax1ngigii3s7d0f6gfj2xk9qwfxpavzjjf"; depends=[affy Biobase limma]; };
-  qpgraph = derive2 { name="qpgraph"; version="2.4.2"; sha256="0np8d7rw182zncyxcvn0sq0linl7aqy1aw2yysb5w29g8cgd8m82"; depends=[annotate AnnotationDbi Biobase BiocParallel GenomeInfoDb GenomicFeatures GenomicRanges graph IRanges Matrix mvtnorm qtl Rgraphviz S4Vectors]; };
-  qrqc = derive2 { name="qrqc"; version="1.24.0"; sha256="0850frx6fg9py2laav0yqavl9ckbn6y475xm9r6gxvyzp63smzdg"; depends=[Biostrings biovizBase brew ggplot2 plyr reshape Rsamtools testthat xtable]; };
-  quantro = derive2 { name="quantro"; version="1.4.0"; sha256="1vkm12h5b85h0db2sxv3c8hhxmgpdycllxr6d9zv2y4an1zhjkn5"; depends=[Biobase doParallel foreach ggplot2 iterators minfi RColorBrewer]; };
-  quantsmooth = derive2 { name="quantsmooth"; version="1.36.0"; sha256="0gfqvx6djy0sl0dz1la19wzc6nfbazrw28wrpf1b934gfbjii25d"; depends=[quantreg]; };
-  qusage = derive2 { name="qusage"; version="2.2.2"; sha256="1pc9n8nfxgdc5xw3jhpvv05yijwwk2f9i7ssjxwgnc8mczrzv8b9"; depends=[Biobase limma lsmeans nlme]; };
-  qvalue = derive2 { name="qvalue"; version="2.2.2"; sha256="0zfip08aacy80cc6xx04789k46nghzdxj8dbsgixvvhwhg2vxy1n"; depends=[ggplot2 reshape2]; };
-  r3Cseq = derive2 { name="r3Cseq"; version="1.16.0"; sha256="0zjxqmj1lblxcl73cisacjacdmw9aj4wvr5lxdn9b4kq6rcr7ljn"; depends=[Biostrings data_table GenomeInfoDb GenomicRanges IRanges qvalue RColorBrewer Rsamtools rtracklayer sqldf VGAM]; };
-  rBiopaxParser = derive2 { name="rBiopaxParser"; version="2.8.0"; sha256="1akmgiqgi53d1264mmhkizn0g1fvjvqdgzsrw9yx26xi9ysmq9kg"; depends=[data_table XML]; };
-  rCGH = derive2 { name="rCGH"; version="1.0.2"; sha256="07mbhgyjjmlyv0237gccd04hjxf22qw7nx5g71ijxj4mb22igign"; depends=[aCGH affy AnnotationDbi DNAcopy GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges lattice limma mclust org_Hs_eg_db plyr shiny TxDb_Hsapiens_UCSC_hg19_knownGene]; };
-  rGADEM = derive2 { name="rGADEM"; version="2.18.0"; sha256="1aib9qqvbq9myyngxlmv494i7pr96k4p9rmrnc4drxa9zhh0pp5a"; depends=[Biostrings BSgenome IRanges seqLogo]; };
-  rGREAT = derive2 { name="rGREAT"; version="1.2.0"; sha256="00gjlsgz3mac48qdpgxk0vvn5z454m2lcxm6lha8jby73pls9hh3"; depends=[GenomicRanges GetoptLong IRanges RCurl rjson]; };
-  rHVDM = derive2 { name="rHVDM"; version="1.36.0"; sha256="0k1gccnac59q54y2nypzgip2srs5yg3v2hhrz86ps50p2lx4pqd2"; depends=[affy Biobase minpack_lm R2HTML]; };
-  rMAT = derive2 { name="rMAT"; version="3.20.0"; sha256="0dq4ipz1j6qai8q8z038hjb5j0w67gp7449vj8psgca2854gxa7s"; depends=[affxparser Biobase BiocGenerics IRanges]; };
-  rRDP = derive2 { name="rRDP"; version="1.4.0"; sha256="101g3j8r8h0nc69k0srlwkxld4qd99ww8xf5b34sm015hvhfx55k"; depends=[Biostrings]; };
-  rSFFreader = derive2 { name="rSFFreader"; version="0.18.0"; sha256="0z2lkjbs3svx1b9zr4smjwrcd9xzxhfp98428vzaqq0k79h1v666"; depends=[Biostrings IRanges S4Vectors ShortRead XVector]; };
-  rTANDEM = derive2 { name="rTANDEM"; version="1.10.0"; sha256="1dmaqdjfmjkkrddf666hpp95s7s6x0ssinx9aybl6952ylfjgcd1"; depends=[data_table Rcpp XML]; };
-  rTRM = derive2 { name="rTRM"; version="1.8.1"; sha256="0hy2wxlclbgw48gizm6l2c65x81s17qh4l7751h00yw0995l4dsq"; depends=[AnnotationDbi DBI igraph RSQLite]; };
-  rTRMui = derive2 { name="rTRMui"; version="1.8.0"; sha256="1mbljb86k3vhiavcv4fvibj6fykg65p4nh7wrrm1nxz90k5hbznp"; depends=[MotifDb org_Hs_eg_db org_Mm_eg_db rTRM shiny]; };
-  rain = derive2 { name="rain"; version="1.4.0"; sha256="0nldnsy6x91nv3i24gj81yxmrr7d4j7iicqxy279gh1k5zh5l5r1"; depends=[gmp multtest]; };
-  rama = derive2 { name="rama"; version="1.44.0"; sha256="0nka6a2dk7jn4lk0i2p91hxwdgpny6y3j4dz709crrxlz3xjqflm"; depends=[]; };
-  randPack = derive2 { name="randPack"; version="1.16.0"; sha256="1i7rr4pid1yw5fjjlwcd0zy46z3c351vxqsj2z8mycl8cm29n8zn"; depends=[Biobase]; };
-  rbsurv = derive2 { name="rbsurv"; version="2.28.0"; sha256="0pz7rza3j7yrdjp1q35y7xxhmkq9cvfg4ippgqqkny8qyayhy7bm"; depends=[Biobase survival]; };
-  rcellminer = derive2 { name="rcellminer"; version="1.2.3"; sha256="1z91vk4bks47z2mypg8lg2qqxqwyggp7jykv7xl92msarqnz4izc"; depends=[Biobase fingerprint gplots rcdk rcellminerData shiny stringr]; };
-  reb = derive2 { name="reb"; version="1.48.0"; sha256="1bxijf91vdr6088459r29kvy691bjbscy170pc0739iqbg7z80zm"; depends=[Biobase idiogram]; };
-  regionReport = derive2 { name="regionReport"; version="1.4.1"; sha256="1sh6m6ly2r3lxvx6q6rb05ygd4c5ab7lzh4j6hpy5va3mg7prrgr"; depends=[bumphunter derfinder derfinderPlot devtools GenomeInfoDb GenomicRanges ggbio ggplot2 gridExtra IRanges knitcitations knitr knitrBootstrap mgcv RColorBrewer rmarkdown whisker]; };
-  regioneR = derive2 { name="regioneR"; version="1.2.3"; sha256="0sf2j51ibmv38v19wg4anawwnini442hd30k7yvi3byqhs598jpn"; depends=[BSgenome GenomicRanges memoise rtracklayer]; };
-  rfPred = derive2 { name="rfPred"; version="1.8.0"; sha256="09sc9y6pyw96piaqh33rzf94ryclknbhqig1fp36d3zabfj8a91i"; depends=[data_table GenomicRanges IRanges Rsamtools]; };
-  rgsepd = derive2 { name="rgsepd"; version="1.2.0"; sha256="0djx0fm44fj6k8dq4ysqag93icnymm2b38asgplds8y6fv9gp39b"; depends=[AnnotationDbi biomaRt DESeq2 GenomicRanges GO_db goseq gplots hash org_Hs_eg_db]; };
-  rhdf5 = derive2 { name="rhdf5"; version="2.14.0"; sha256="0cxg8w3244gcifvc27dm85wip776x5lnwkl7qhc7w92if57z7wcp"; depends=[zlibbioc]; };
-  riboSeqR = derive2 { name="riboSeqR"; version="1.4.0"; sha256="1i9p9hxh2sipgpa1wf59pfs3h0qprr473axlvzw7f0yx171qimfg"; depends=[abind GenomicRanges]; };
-  rnaSeqMap = derive2 { name="rnaSeqMap"; version="2.28.0"; sha256="0mfcy7l31g5z5yv12sv9imaf19p9vawnk7cqcm50x2sm032r8n7f"; depends=[Biobase DBI DESeq edgeR GenomicAlignments GenomicRanges IRanges Rsamtools]; };
-  rnaseqcomp = derive2 { name="rnaseqcomp"; version="1.0.2"; sha256="0m22q75fyzwyxn6s58sjyzqyzp5rb808fvvck8vljnqghcflbybc"; depends=[RColorBrewer]; };
-  roar = derive2 { name="roar"; version="1.6.1"; sha256="13730bs9k37brga57yy24m2q323i1676qlk7fnlg8c6hm151bq2q"; depends=[GenomicAlignments GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
-  rols = derive2 { name="rols"; version="1.12.2"; sha256="0bfgd346kxbb4wkhnhfpgkv33fm7p63pldvjj28sxal88g14n22r"; depends=[Biobase XML]; };
-  ropls = derive2 { name="ropls"; version="1.2.14"; sha256="1b6k2c9i263m83jhvhcv65daa1gjyrra5hvmm9fm26h829g16y4l"; depends=[]; };
-  rpx = derive2 { name="rpx"; version="1.6.0"; sha256="04kd9kn7k8fswpy03ccbaq6glwxiilvklyygj9gmi2sam06q9d6i"; depends=[RCurl XML]; };
-  rqubic = derive2 { name="rqubic"; version="1.16.0"; sha256="0gasrkxpbvhxig6n3k3n9hdid9cg4gnkffyi9xn2zl33zm8wyirf"; depends=[biclust Biobase BiocGenerics]; };
-  rsbml = derive2 { name="rsbml"; version="2.28.0"; sha256="0fzn7vpfsfb3k0j6mid0prrgdaqsv8b3945d0ynls8jgp02ma6hs"; depends=[BiocGenerics graph]; };
-  rtracklayer = derive2 { name="rtracklayer"; version="1.30.3"; sha256="0b1zkan1qv07bhbwrgsggg2zscqvrngi3j072pqfj1804b308xv4"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicAlignments GenomicRanges IRanges RCurl Rsamtools S4Vectors XML XVector zlibbioc]; };
-  sRAP = derive2 { name="sRAP"; version="1.10.0"; sha256="080s88l3a2fbgqnc8sy41kwzkm6skjazkirqini7n6xqcsqb9lih"; depends=[gplots pls qvalue ROCR WriteXLS]; };
-  sSeq = derive2 { name="sSeq"; version="1.8.0"; sha256="1l05qm3576fx9v5bxvc0xm4916bzfvh1f4nnjdm67z82qxbx4wnz"; depends=[caTools RColorBrewer]; };
-  safe = derive2 { name="safe"; version="3.10.0"; sha256="17ryzq2rc8hdmj1kzv62kzh1pn2nb454d73mdd5dk6qy0pgg4fan"; depends=[AnnotationDbi Biobase SparseM]; };
-  sagenhaft = derive2 { name="sagenhaft"; version="1.40.0"; sha256="1y2fa861k9b9rb6hr0slvf5pgqwggssx7ppn1ddrh0yw53vk7dwy"; depends=[SparseM]; };
-  sangerseqR = derive2 { name="sangerseqR"; version="1.6.0"; sha256="0jfh1jgvazi43bvj8m3546yh5vs0nhvnw7mmd68zndihm5agxhb1"; depends=[Biostrings shiny]; };
-  sapFinder = derive2 { name="sapFinder"; version="1.8.0"; sha256="12a0wcjxcz77b06bymhqcj5wxzm478mlj9vcvbbqhdfvj7214hy9"; depends=[pheatmap Rcpp rTANDEM]; };
-  saps = derive2 { name="saps"; version="2.2.0"; sha256="11v7nxlcnkslxl0giv3y2naxpfsmqmrj6b4y2g6zbp48zml45jgl"; depends=[piano reshape2 survcomp survival]; };
-  savR = derive2 { name="savR"; version="1.8.0"; sha256="1vxxmzr8k6fn9fqr0pbfvccqq30d8w3fwjcr5x0bh1d77mzgf9n1"; depends=[ggplot2 gridExtra reshape2 scales XML]; };
-  sbgr = derive2 { name="sbgr"; version="1.0.0"; sha256="0bvvxd0c4k4mmwkcb9w02i2kb6vwlq84w8vfqiamnwjy2vgjgka9"; depends=[httr jsonlite objectProperties]; };
-  scsR = derive2 { name="scsR"; version="1.6.0"; sha256="0g1vgx8wrdwbhlzmf0a11fg5jnbkvz402h8qj48vj4bq8j202bc1"; depends=[BiocGenerics Biostrings ggplot2 hash IRanges plyr RColorBrewer sqldf STRINGdb]; };
-  segmentSeq = derive2 { name="segmentSeq"; version="2.4.0"; sha256="0dbw8kssi2l6mnvjh7skbxc0akyha2wpa0r6ixw73p4g5qbaqafn"; depends=[baySeq GenomicRanges IRanges S4Vectors ShortRead]; };
-  seq2pathway = derive2 { name="seq2pathway"; version="1.2.0"; sha256="1xki7wsydgagsh3fx9gwdd2asrbm6q9gnh27bv2cyrmjpp0nkjg1"; depends=[biomaRt GenomicRanges GSA nnet seq2pathway_data WGCNA]; };
-  seqCNA = derive2 { name="seqCNA"; version="1.16.0"; sha256="1wq92wszv0x99l52lm3k0zc2ffin1sp78xlyfabxpwi1v0yrkifl"; depends=[adehabitatLT doSNOW GLAD seqCNA_annot]; };
-  seqLogo = derive2 { name="seqLogo"; version="1.36.0"; sha256="0kn1a1nf2j4v9c09vjkz9bmxlln7yhg87bnyrdsxy1m55x56rn5k"; depends=[]; };
-  seqPattern = derive2 { name="seqPattern"; version="1.2.0"; sha256="0p9zj6bic7sa0hb2bjm988kkk5n9r1kvlbqkzvy702f642n0j53i"; depends=[Biostrings GenomicRanges IRanges KernSmooth plotrix]; };
-  seqTools = derive2 { name="seqTools"; version="1.4.1"; sha256="19hxakskh3qa9ypp2nmly3mrlbjfrq2ya5f5gyhg4mv0vahm9yc8"; depends=[zlibbioc]; };
-  seqbias = derive2 { name="seqbias"; version="1.18.0"; sha256="1wwskcbl3wd8gl63jl4wl0xwzj8kbwbc8xhp12z3xximngkk7dgd"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
-  seqplots = derive2 { name="seqplots"; version="1.8.0"; sha256="1kk914pc462n37gmma6l1d0kcrw2qqgkd3sb67mrx053h1n0lz35"; depends=[Biostrings BSgenome Cairo class DBI digest DT fields GenomeInfoDb GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 RSQLite rtracklayer S4Vectors shiny]; };
-  shinyMethyl = derive2 { name="shinyMethyl"; version="1.4.0"; sha256="1db4g2sgfgr21hh3xcpv8lcnmrqgwfrj97dlpi8blqcs81mrhc3s"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
-  shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.8.0"; sha256="0dkgwfynznpq2q55d83w4x0nmal3dkgzxi1jpdcsasqlhsyqvmvx"; depends=[mixtools rTANDEM shiny xtable]; };
-  sigPathway = derive2 { name="sigPathway"; version="1.38.0"; sha256="126cyw88d6rxp3bzdqsmm2v0kvhn650qmi4zcs9v50n0hhwyrxrf"; depends=[]; };
-  sigaR = derive2 { name="sigaR"; version="1.14.0"; sha256="07ip468liyg9b6q9izd1wdp29p9f2icfs01nf0il4gc76h6d0rr5"; depends=[Biobase CGHbase corpcor igraph marray MASS mvtnorm penalized quadprog snowfall]; };
-  siggenes = derive2 { name="siggenes"; version="1.44.0"; sha256="18r1yqaq2ppa00vwgwdbla3sq4rcsr3d1jrjdbq0p17dan5f9dqz"; depends=[Biobase multtest]; };
-  sigsquared = derive2 { name="sigsquared"; version="1.2.0"; sha256="1mgm84fdkzjp7hp3kp98l8g64mc3dg1cih2z9svmpcryp5fyxjvc"; depends=[Biobase survival]; };
-  similaRpeak = derive2 { name="similaRpeak"; version="1.2.0"; sha256="024nr8imqp4vrrhfikn00kv9cx3sg1h862dmgvylbkmjmm4f2mr8"; depends=[GenomicAlignments R6 Rsamtools rtracklayer]; };
-  simpleaffy = derive2 { name="simpleaffy"; version="2.46.0"; sha256="1x3f7hm7w44yarq4irv791330zfamhsqqwnqz8xfwrpvjrkv6avn"; depends=[affy Biobase BiocGenerics gcrma genefilter]; };
-  simulatorZ = derive2 { name="simulatorZ"; version="1.4.0"; sha256="1sypvrwq6ay7lzmb9cmpix1zgzafzryvf4my5jky846bcpam91qj"; depends=[Biobase BiocGenerics CoxBoost gbm GenomicRanges Hmisc IRanges S4Vectors SummarizedExperiment survival]; };
-  sincell = derive2 { name="sincell"; version="1.2.0"; sha256="1qmjy9cwhnyg4s3jfzi0z0yfdza4dma0q6h73772mhh2l4q149h7"; depends=[cluster entropy fastICA fields ggplot2 igraph MASS proxy Rcpp reshape2 Rtsne scatterplot3d statmod TSP]; };
-  sizepower = derive2 { name="sizepower"; version="1.40.0"; sha256="0wl1fvldarg85gg4i6xmh2ssma2hdqddd3lp7x13r2322344gmxl"; depends=[]; };
-  skewr = derive2 { name="skewr"; version="1.2.0"; sha256="0kmlgv1j104dnlbvg00jsbcdhr60l83dabfrzggvx7s9aspwgp30"; depends=[IlluminaHumanMethylation450kmanifest IRanges methylumi minfi mixsmsn RColorBrewer wateRmelon]; };
-  snapCGH = derive2 { name="snapCGH"; version="1.40.0"; sha256="0fjqp0qhwk041pgwqp3av5ihkf4xb9li6zy6gmvk24hlj8sm600z"; depends=[aCGH cluster DNAcopy GLAD limma tilingArray]; };
-  snm = derive2 { name="snm"; version="1.18.0"; sha256="150lwwk6cyhwjypb4f3gsmhpiv4vcayip7gpl2vxfmvhg03yqbyl"; depends=[corpcor lme4]; };
-  snpStats = derive2 { name="snpStats"; version="1.20.0"; sha256="16j3qq9vqswgra5xkm1ykwzcf8gxy7f7xa0l0z08n36hv7d0zd6x"; depends=[BiocGenerics Matrix survival zlibbioc]; };
-  soGGi = derive2 { name="soGGi"; version="1.2.1"; sha256="11ksx2z9vkz1d39fhds7cadwr0mzicis5nizj6qyzmzlybyc8v72"; depends=[BiocGenerics BiocParallel Biostrings chipseq GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges preprocessCore reshape2 Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
-  spade = derive2 { name="spade"; version="1.18.2"; sha256="0m2784x2ysp4mc7m8n8scpr1h38m3p9glcc5jd6cix55bh3yzykk"; depends=[Biobase flowCore igraph Rclusterpp]; };
-  specL = derive2 { name="specL"; version="1.4.0"; sha256="0i7j5bzvlsyy72xg2gcxggrz25ln3287gcd433mwyiira4apz1il"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
-  spikeLI = derive2 { name="spikeLI"; version="2.30.0"; sha256="0xqqwxhb89ngfr9jz3z3wsmq8l6lky4hcjnqvf9qd1cwjkf51am9"; depends=[]; };
-  spkTools = derive2 { name="spkTools"; version="1.26.0"; sha256="0aznmn9si99x32kn2x5swhpahp96bsg71i1wizml0ni6lvmbxn0j"; depends=[Biobase gtools RColorBrewer]; };
-  spliceR = derive2 { name="spliceR"; version="1.12.0"; sha256="0r5j0ibl2ccsxb7rr2fxw4b07wbdiyfndxkl4pgd9h0ks4qyhyjy"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
-  spliceSites = derive2 { name="spliceSites"; version="1.8.3"; sha256="1jifh0nbqjhrc07jfc50hfk4wn1hv3a863rbr3fnqlg9rwg044w7"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
-  splicegear = derive2 { name="splicegear"; version="1.42.0"; sha256="1g2fqql1wqzwz1vx5cq03ckld0gccqk6rv9l99xsaa8mhf0rn1qa"; depends=[annotate Biobase XML]; };
-  splots = derive2 { name="splots"; version="1.36.0"; sha256="1cj8bygsv1g91cypdz2zbf2slirls7sqdxrvg6qka0n8las58sxd"; depends=[RColorBrewer]; };
-  spotSegmentation = derive2 { name="spotSegmentation"; version="1.44.0"; sha256="074nzh18pj6dpk9bqh8id0j2vpaxvhi2ddrz6hnza381wzdgxdr3"; depends=[mclust]; };
-  sscore = derive2 { name="sscore"; version="1.42.0"; sha256="0h86crb241vmaczp76wz4zv9ni1snmlkrdi1md3hgq1hqxnn9gzs"; depends=[affy affyio]; };
-  ssize = derive2 { name="ssize"; version="1.44.0"; sha256="1aaafnj114j2zwf88y2133md6b33dsl88rg1zq0ql2xs4cxvsgkz"; depends=[gdata xtable]; };
-  ssviz = derive2 { name="ssviz"; version="1.4.0"; sha256="0j4c5b2ivz6l6a3by9hgy59r9z4s854pgias6sabp4qzpqgc3655"; depends=[Biostrings ggplot2 RColorBrewer reshape Rsamtools]; };
-  staRank = derive2 { name="staRank"; version="1.12.0"; sha256="1vgc3mhxyhrgwkapnqx4061l9l0nyc012508hma14xbxml3f76sg"; depends=[cellHTS2]; };
-  stepNorm = derive2 { name="stepNorm"; version="1.42.0"; sha256="0kvpfiq6w1vksw6dqjx0kw46rrfafpfs9ii8bwp1kk3q84zmyrmm"; depends=[marray MASS]; };
-  stepwiseCM = derive2 { name="stepwiseCM"; version="1.16.0"; sha256="1ss79yr75kw7fsd8ihpivj9k5v32zxr3ymkl6prba0nyxdj5wyz9"; depends=[Biobase e1071 glmpath MAclinical pamr penalized randomForest snowfall tspair]; };
-  subSeq = derive2 { name="subSeq"; version="1.0.1"; sha256="1k7d3hdiqxdv3mn61gr9rxsqywh2xgj2l8r4806j8b05vyi1ybdk"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
-  supraHex = derive2 { name="supraHex"; version="1.8.0"; sha256="1g2zcarzi805y2933pyjdgg7l9imbhdf4pjhyr8bir0149li98cy"; depends=[ape hexbin MASS]; };
-  survcomp = derive2 { name="survcomp"; version="1.20.0"; sha256="174kh5cnbw1dg109wrzbf4xhslzn56fag4d3nxwswxinrdz360i9"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
-  sva = derive2 { name="sva"; version="3.18.0"; sha256="0jx4ar4nj8fgmrbhlaz6zm04zmcaacrakyzyy5hi2dgsy025c86c"; depends=[genefilter mgcv]; };
-  switchBox = derive2 { name="switchBox"; version="1.4.0"; sha256="0lmrg3ahjmz7x3ngjmhkb2w6n2zv0lw40xq1f9lhiyzqzj23rri0"; depends=[]; };
-  synapter = derive2 { name="synapter"; version="1.12.0"; sha256="0mrqbfg4kwwzm7g2sp1py715w52268kzlkhylqmr1cjqi20b0gb7"; depends=[Biobase BiocParallel Biostrings cleaver hwriter knitr lattice MSnbase multtest qvalue RColorBrewer]; };
-  synlet = derive2 { name="synlet"; version="1.0.0"; sha256="05vxkzafgri9ppscv5ark65s15fn3g4lfnkv25ryfddflcfkl1n2"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; };
-  systemPipeR = derive2 { name="systemPipeR"; version="1.4.8"; sha256="09f41q8bnznmrfqwfjfd6h6p6xx20qg1l06dxjajbc0did1fblfz"; 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.8.0"; sha256="0kblzs5x5bh2bqg5bd5c33b405r33aicba0x0ky02vvqsld64f6l"; depends=[anota Biobase DESeq edgeR GOSemSim gplots Heatplus limma org_Hs_eg_db plotrix RankProd samr sigPathway topGO]; };
-  ternarynet = derive2 { name="ternarynet"; version="1.14.0"; sha256="0c25xinnlvafwf1x08zmcm1agwflvs9jpckhq58dc5fs8jb4zi6y"; depends=[igraph]; };
-  tigre = derive2 { name="tigre"; version="1.24.2"; sha256="0fk73fmqf7d2pb6m5l78rslxh211zzsl9g3snn4507rfxvivcz11"; depends=[annotate AnnotationDbi Biobase BiocGenerics DBI gplots RSQLite]; };
-  tilingArray = derive2 { name="tilingArray"; version="1.48.0"; sha256="0ac78mqmjr8wv7zw6rk6q7bxwfmvycsmgybqg4xayja01qvmwkji"; depends=[affy Biobase genefilter pixmap RColorBrewer strucchange vsn]; };
-  timecourse = derive2 { name="timecourse"; version="1.42.0"; sha256="01awyngw9qalsvagn1f51kdhkqfvscnfhlp50xndr3s2zmmra5xg"; depends=[Biobase limma marray MASS]; };
-  tkWidgets = derive2 { name="tkWidgets"; version="1.48.0"; sha256="1a4j66pyhyns4mi5dfjqym4kd7dardhvhpr6r4ip34dc1b98hcg1"; depends=[DynDoc widgetTools]; };
-  topGO = derive2 { name="topGO"; version="2.22.0"; sha256="029j9nb39b8l9xlzsp83pmjr8ap247aia387yzaa1yyw8klapdaf"; depends=[AnnotationDbi Biobase BiocGenerics GO_db graph lattice SparseM]; };
-  trackViewer = derive2 { name="trackViewer"; version="1.6.1"; sha256="12n4rnph5viy0n45v6fl4b473dq71gqqz34hapnav13csy5nxc4i"; depends=[GenomicAlignments GenomicFeatures GenomicRanges Gviz IRanges pbapply Rsamtools rtracklayer scales]; };
-  tracktables = derive2 { name="tracktables"; version="1.4.2"; sha256="1zb51wll7p9kw1q0wnir3gggqxr9p5mc30kk59vjl14apfpbx1vp"; depends=[GenomicRanges IRanges ore RColorBrewer Rsamtools stringr XML XVector]; };
-  traseR = derive2 { name="traseR"; version="1.0.0"; sha256="03lqmnb2fann1fn42kr2k126ppgkb5rw7n25h908hmq200mfl122"; depends=[BSgenome_Hsapiens_UCSC_hg19 GenomicRanges IRanges]; };
-  triform = derive2 { name="triform"; version="1.12.0"; sha256="0pqfz6msalr2264iwi2hzam2sv8yl4fy1ri72pff5gh14rbxgiml"; depends=[BiocGenerics IRanges yaml]; };
-  trigger = derive2 { name="trigger"; version="1.16.0"; sha256="1lswb0zdxkc37xkpyp65md4bv81njl74y6cl3dp9ym5mf47l5azg"; depends=[corpcor qtl qvalue sva]; };
-  trio = derive2 { name="trio"; version="3.8.0"; sha256="066401wayzl09p9g10j8vl9nhk57351ll1rf28c8ix4kh50pszi5"; depends=[]; };
-  triplex = derive2 { name="triplex"; version="1.10.0"; sha256="1k9dr5bdrbqgxjs1dwha7xxaas3cfhpfi75pykq7hhmxip6bcsp5"; depends=[Biostrings GenomicRanges IRanges S4Vectors XVector]; };
-  tspair = derive2 { name="tspair"; version="1.28.0"; sha256="0m083g5z77n7dd4lnbhvbwjkykh7a4pl4v8j7ipr5w7f9dhdjk33"; depends=[Biobase]; };
-  tweeDEseq = derive2 { name="tweeDEseq"; version="1.16.0"; sha256="0dyhczzfbp99nd2ia78scyzw8d02hrwaqr1pqj1c038mm6vsldvb"; depends=[cqn edgeR limma MASS]; };
-  twilight = derive2 { name="twilight"; version="1.46.0"; sha256="1v3aghnmx1g8kn1z98fx8k71gh2g9q1x52x3lhx70wkzcn6phphd"; depends=[Biobase]; };
-  unifiedWMWqPCR = derive2 { name="unifiedWMWqPCR"; version="1.6.0"; sha256="0iiwaihywibrfkiayp9dciv9i5n1j13ildwhaxilrha2qdmmjxqm"; depends=[BiocGenerics HTqPCR]; };
-  variancePartition = derive2 { name="variancePartition"; version="1.0.7"; sha256="10hdxhl4bm1ky5cjiafgbc63aalh75d6ii16gllw0kd4agp2xxfx"; depends=[Biobase dendextend doParallel foreach ggplot2 iterators limma lme4 reshape2]; };
-  vbmp = derive2 { name="vbmp"; version="1.38.0"; sha256="075hp0bb66fjda8bzhgcmxjhlrncwfwqrzsm885ci928yrl4fyjw"; depends=[]; };
-  viper = derive2 { name="viper"; version="1.6.1"; sha256="1jmddpbfwnhc9spblr38qljhrzzkc8r2l26h58b996wjrh0x75gh"; depends=[Biobase e1071 KernSmooth mixtools]; };
-  vsn = derive2 { name="vsn"; version="3.38.0"; sha256="17l1wywbm99g4n08m6wasx59wfavjas0f03a87a1pdv8ff4i71ac"; depends=[affy Biobase ggplot2 hexbin lattice limma]; };
-  vtpnet = derive2 { name="vtpnet"; version="0.10.0"; sha256="1qvg9f8qa64rpdqv575b7zadf4j1hs5ijhpjk4qjb8h7z5xprr7s"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
-  wateRmelon = derive2 { name="wateRmelon"; version="1.10.0"; sha256="1hcfxiiwk0f7i59aj7v55403m755cwfldwniif8x9kkr1xm2n8jh"; depends=[IlluminaHumanMethylation450kanno_ilmn12_hg19 limma lumi matrixStats methylumi ROC]; };
-  wavClusteR = derive2 { name="wavClusteR"; version="2.4.1"; sha256="0j0cy5bi8pacc6bhy0prlv446m2kgxyjnd5r3vw2lxc1ygllxn6h"; depends=[Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer seqinr stringr wmtsa]; };
-  waveTiling = derive2 { name="waveTiling"; version="1.12.0"; sha256="0j866mgxj44mv4wp0yqnav83w8pfb47lmjhp1y0qqvxc6q9k80g8"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
-  weaver = derive2 { name="weaver"; version="1.36.0"; sha256="0ixs723mh9p1pq6za8xjqknbq1jq4ylcxsv08f40izmlp40mxjdx"; depends=[codetools digest]; };
-  webbioc = derive2 { name="webbioc"; version="1.42.0"; sha256="1xli6q0d9y2wikqxk3cf2am3plfk5c27w95q607brs6kl3ghlafl"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
-  widgetTools = derive2 { name="widgetTools"; version="1.48.0"; sha256="0gwx02bqpfppmk34vh5qfax9bid7854dbapgdnzz32xzhamk64a8"; depends=[]; };
-  xcms = derive2 { name="xcms"; version="1.46.0"; sha256="0hhw86xkd3z7liyivj1ssdd7z8q1m91jplni8ags1sify46fh57p"; depends=[Biobase BiocGenerics lattice mzR ProtGenerics RColorBrewer]; };
-  xmapbridge = derive2 { name="xmapbridge"; version="1.28.0"; sha256="0b7l9gr1qrjj8fg9mcb3xyaw3s3zk8k2d46l9bgsl6g0xz79j615"; depends=[]; };
-  xps = derive2 { name="xps"; version="1.30.0"; sha256="0wh98fsj3j368bxk4wa7rjd3acwl04r1dfiy13a89zv1fzv3wvky"; depends=[]; };
-  yaqcaffy = derive2 { name="yaqcaffy"; version="1.30.0"; sha256="1pj2ksqbj7dlc76s6qagi7iq35wa83gx5cp0hm42w3bj7mxprjbi"; depends=[simpleaffy]; };
-  zlibbioc = derive2 { name="zlibbioc"; version="1.16.0"; sha256="01wc26ndg4jsn1wyrl6zzq636gxaip5fci0xapym4lh9wryc4wnw"; depends=[]; };
+  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=[]; };
 }
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 92f79b7a36ac..b2cb8857db77 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,527 +4,675 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2016-03-23"; };
+let derive2 = derive { snapshot = "2017-02-23"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
-  ABCanalysis = derive2 { name="ABCanalysis"; version="1.1.0"; sha256="09s38xr6cig88v1nb8a192yc19rnhnqsfzazgfa257c7h84l0g9q"; depends=[Hmisc plotrix]; };
-  ABCoptim = derive2 { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9f7vg6wznsds8sn8dj3q2h5fhjcv58di3gjhl"; depends=[]; };
+  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]; };
+  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]; };
   ACA = derive2 { name="ACA"; version="1.0"; sha256="0z4wz85iv5k5vw29m6xfh2v96shv314nbxkv3v3yhl77br4bmj4q"; depends=[]; };
   ACCLMA = derive2 { name="ACCLMA"; version="1.0"; sha256="1na27sp18fq12gp6vxgqw1ffsz2yi1d8xvrxbrzx5g1kqxrayy0v"; depends=[]; };
   ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; };
-  ACDm = derive2 { name="ACDm"; version="1.0.3"; sha256="1gqqm9lyc9pmqxj21a1mnf29jpq5aqsfny5wzlp2d8g49dc5hqri"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; };
-  ACEt = derive2 { name="ACEt"; version="1.4"; sha256="1837jindb5bffp7gxp66ffx4z6ardm5g9axm3d42vvbm6m67klc4"; depends=[BH MASS Rcpp RcppArmadillo]; };
+  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]; };
   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.01.29"; sha256="1b1243wkncanm1blkqzicjgzb576vzcg4iwinsgn2xqr7f264amf"; depends=[ggplot2 gridExtra scales]; };
+  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]; };
-  ACTCD = derive2 { name="ACTCD"; version="1.0-0"; sha256="0zn8f6l5vmn4w1lqjnpcxvfbr2fhwbhdjx4144h3bk71bk9raavl"; depends=[R_methodsS3]; };
-  ADDT = derive2 { name="ADDT"; version="1.0"; sha256="1jx7rxi0yfn34pf3cf9zpf434rapgn5qn2mn5rkq5lysr3kwdw91"; depends=[]; };
+  ACTCD = derive2 { name="ACTCD"; version="1.1-0"; sha256="15l70diy1x2pfyv8miki76frnk3f33qfxcxafh6cp8zwc6gmr0m4"; depends=[R_methodsS3]; };
+  ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; };
+  ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; };
   ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; };
   ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
   ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; };
-  ADPclust = derive2 { name="ADPclust"; version="0.6.5"; sha256="0ni8hkpn11cqrm56w2l4x7fwhw7lls3msf0g8bd62nkwzygqzzrn"; depends=[cluster dplyr fields knitr]; };
-  AEDForecasting = derive2 { name="AEDForecasting"; version="0.10.0"; sha256="080qg8s616nx1pj7bdpg3ify2qm3l0gni40nx1xdh81920vj8n7y"; depends=[changepoint forecast signal]; };
-  AER = derive2 { name="AER"; version="1.2-4"; sha256="0cfhnh6ijwvbywk6falfq852jgx969v35j2l1q3cghwj9yggapbh"; depends=[car Formula lmtest sandwich survival zoo]; };
-  AF = derive2 { name="AF"; version="0.1.2"; sha256="18bw6c9nlcqcxib4mzhxsjqyjj29xqqvpw668jg2ssqkdphnvzkl"; depends=[data_table drgee survival]; };
+  ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; };
+  AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; };
+  AER = derive2 { name="AER"; version="1.2-5"; sha256="0qksj91h1c5kaci0w7q1n6780669di146ll5wnbjppnkz57z237g"; depends=[car Formula lmtest sandwich survival zoo]; };
+  AF = derive2 { name="AF"; version="0.1.4"; sha256="1ych5b2bin65lk415l8rhql2cpma3djnxvdi8ja1hgd9absm7j04"; depends=[data_table drgee stdReg survival]; };
   AFLPsim = derive2 { name="AFLPsim"; version="0.4-2"; sha256="0bbbvv81nxqp5gc4hdhk0hyhb4n8f9w83kf21cgmqhy9cqnyr4s8"; depends=[adegenet introgress]; };
-  AFM = derive2 { name="AFM"; version="1.2.0"; sha256="070jd8b8l4f94zp83i7w69fbym0p2sc4vdlfxzzp5ih438i1p0wi"; depends=[data_table fftwtools fractaldim ggplot2 gridExtra gstat igraph moments plyr png pracma rgl rglwidget shiny shinyjs sp stringr]; };
+  AFM = derive2 { name="AFM"; version="1.2.2"; sha256="132zbxim3cbyxhv27l9i3jyhf5c47ckzsg4qndpwbyjhd0p9x7qh"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph moments plyr png pracma rgl scales shiny shinyjs sp stringr]; };
   AGD = derive2 { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; };
-  AGSDest = derive2 { name="AGSDest"; version="2.3"; sha256="1g8z7ba70zs4i8cb48iwf4iy1q1l76cpiixiac8fixjf1c7a9hxz"; depends=[ldbounds]; };
-  AHR = derive2 { name="AHR"; version="1.3"; sha256="0i1dqv1prb8iir1rykbhfsl99x05cl582z47wqr7mwkkqf826x9g"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
-  AICcmodavg = derive2 { name="AICcmodavg"; version="2.0-4"; sha256="08ry3m4a464gw2j1n528p2fim4flnfy4gbyb1yald001499wdm5v"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
-  AID = derive2 { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS nortest tseries]; };
+  AGSDest = derive2 { name="AGSDest"; version="2.3.1"; sha256="10jakc2qs5gnbp0g4k05isy0ii73ric50gmwkbb1khf9x0b5v6dg"; depends=[ldbounds]; };
+  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]; };
   AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; };
-  ALDqr = derive2 { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; };
+  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]; };
   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.2"; sha256="1ljsb2p7f1cq6qkzcd88a43qcd61myf5xirqcjbjs8rkmj49mg4l"; depends=[]; };
+  AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; 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]; };
-  APSIM = derive2 { name="APSIM"; version="0.8.3"; sha256="0c4ywixbjc3bdckaqh3mcwb8p0jf65yyd8x0rdqwvj9j3b6d7kj3"; depends=[data_table lubridate plyr sirad stringr]; };
+  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=[]; };
+  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]; };
   ARPobservation = derive2 { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
   ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; };
   ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; };
   ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
-  ARTP2 = derive2 { name="ARTP2"; version="0.9.22"; sha256="0vhnhf72x1af77lq8rnqq98hpv5l57by2qm1zxpjvpgpqa5s49ak"; depends=[data_table Formula]; };
-  ARTool = derive2 { name="ARTool"; version="0.10.0"; sha256="0y36lghpnhz8fb0gsq4h8mq8y79b2k22wgr7rxj0n12y55xkj028"; depends=[car dplyr lme4 magrittr plyr]; };
-  ASMap = derive2 { name="ASMap"; version="0.4-5"; sha256="1hrvxkhmycqldah3j1wkja0g7mdx24lyc6gp2x1pnx9fqjanwfy2"; depends=[fields gtools lattice qtl RColorBrewer]; };
+  ARTP2 = derive2 { name="ARTP2"; version="0.9.30.1"; sha256="1jn1ai19s1jrrhl6nm7miw46l27jr0rgy7gy54ajbrrbdd4j70fy"; depends=[data_table Formula]; };
+  ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; };
+  ASMap = derive2 { name="ASMap"; version="0.4-7"; sha256="1xsgz05ck60aflnnbhwwbrnizwq92g5ickdnx39fqlj6mpxircw4"; depends=[fields gtools lattice qtl RColorBrewer]; };
   ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
+  ASSISTant = derive2 { name="ASSISTant"; version="1.2-3"; sha256="072lmvmdi5yfyfda42vs556ciwj2rnka02isnknk6czir3947nck"; depends=[mvtnorm R6]; };
   ATE = derive2 { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
   ATmet = derive2 { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
   AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; };
   AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; };
-  AbsFilterGSEA = derive2 { name="AbsFilterGSEA"; version="1.0"; sha256="0b6867rfac7kglgigr0gc237sizvbbhg3cymjsjrr2pklkqfp1bn"; depends=[Rcpp RcppArmadillo]; };
-  AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-4"; sha256="0nvbh4cx0vcsqzs7j6vs6pc6yxb4i0fbjfajdnq6fvnv12m9sz41"; depends=[]; };
+  AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; };
+  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]; };
+  AbSim = derive2 { name="AbSim"; version="0.1"; sha256="0z3ghz0wmf2z4s2mnadiacir5frzlw77gca8fkvdh8rv5pwyy38c"; 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=[]; };
+  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]; };
-  AdMit = derive2 { name="AdMit"; version="2.0.1"; sha256="0bqzq2pf5449qyr8ff5d3sq0lbsph29ppv6zzf1rbjz06sc5d6ff"; depends=[mvtnorm]; };
+  AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; };
   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.0"; sha256="18kqqhzy33ivz8g9yj465jb6ih12rzgq090w2n3pgsrckflz11zf"; depends=[caTools ggplot2 mclust shiny]; };
+  AdaptGauss = derive2 { name="AdaptGauss"; version="1.2.4"; sha256="0idqh1g4aypak1hm04vz2p3yklw6gbryjgm735gl46bzhlzlyyfv"; depends=[caTools ggplot2 mclust shiny]; };
   AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp RcppArmadillo]; };
-  AdequacyModel = derive2 { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; };
+  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]; };
+  AdvBinomApps = derive2 { name="AdvBinomApps"; version="1.0"; sha256="1cnmn6c2dyl8qfl7g5sqwbjb52psqxzrj1mbm06zak2y1j7j8f49"; depends=[GenBinomApps rootSolve]; };
   AggregateR = derive2 { name="AggregateR"; version="0.0.2"; sha256="15gxzs3baa6f1rqwv7s7k6zybx0za1mpzc7db1n47jy9rbh2yxb2"; depends=[dummy]; };
   Agreement = derive2 { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; };
+  AhoCorasickTrie = derive2 { name="AhoCorasickTrie"; version="0.1.0"; sha256="0k2lcyxfsavis9g1g5293f0mw7f6jakkr11wkkjvxdlnba9c80r8"; depends=[Rcpp]; };
   Ake = derive2 { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; };
   AlgDesign = derive2 { name="AlgDesign"; version="1.1-7.3"; sha256="0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz"; depends=[]; };
   AlgebraicHaploPackage = derive2 { name="AlgebraicHaploPackage"; version="1.2"; sha256="1krm5cx609sv2p0g3xm5jaiqs9li06v717lw7ywjvx7myc9x4c07"; depends=[]; };
-  AlignStat = derive2 { name="AlignStat"; version="1.1.3"; sha256="0zaykr7izpms59w6yhxzbjxrcvlq5028vnjqp2l7vy0767ivljci"; depends=[ggplot2 Rcpp reshape2 seqinr]; };
+  AlignStat = derive2 { name="AlignStat"; version="1.3.1"; sha256="1x9nlf3z6rpfca3k3cqm673sid418mnl44df9v93nyj5dpd70ylc"; depends=[ggplot2 Rcpp reshape2 seqinr]; };
   AllPossibleSpellings = derive2 { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
   AlleleRetain = derive2 { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; };
   Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
+  AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; };
+  AmostraBrasil = derive2 { name="AmostraBrasil"; version="1.2"; sha256="06y555gl9g89gygrv1rhg8j1bhb38m09mvvw67wvwhdl56j0fqbd"; depends=[foreign RCurl rgdal RJSONIO sp stringr]; };
   AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; depends=[ggplot2 xtable]; };
+  AmyloGram = derive2 { name="AmyloGram"; version="1.0"; sha256="0qifcx8i29il1lih6smd38cbxqf6rnkx1nncb1yplhyjmi6vdng3"; depends=[biogram ranger seqinr shiny]; };
   AnDE = derive2 { name="AnDE"; version="1.0"; sha256="1yil8ab50wvlqmdla9kmfba8vfgy5r694r6igb58s6vnmld78yf2"; depends=[discretization foreign functional stringr]; };
   AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; };
-  AnalyzeTS = derive2 { name="AnalyzeTS"; version="1.7"; sha256="0ssh8y854s8v833n8fl93nz8arkbj2ac6ihk65ahm7b89phcpd0z"; depends=[MASS TSA tseries TTR]; };
-  AncestryMapper = derive2 { name="AncestryMapper"; version="1.2"; sha256="0d47vkf59ysa58wnlqkshsvdzhcppb9xc1agwkxv37jv1asllb67"; depends=[]; };
+  AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; };
+  AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; };
   AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
+  AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
-  AnthropMMD = derive2 { name="AnthropMMD"; version="0.9.9"; sha256="10wn0fkcli5yz3fhngsz8sg1mfllqkvjrpjggd9qynay2zrpiw1n"; depends=[tcltk2]; };
+  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.1.5"; sha256="1xnx6syn365s4w4pks7xq6rng7hk30xln8hvszxwhwfnkzr8qqn2"; depends=[doParallel foreach]; };
+  ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.0"; sha256="04p1h2iahy6x65rdlrzcp18126dikrl2mapvrmh6jlwsg19b9sjc"; 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-3"; sha256="1hkygw09w70im9f6l6q5yxk86mdl5pkczqfqrwc4wl1yhz7z1gjb"; depends=[deSolve minpack_lm]; };
+  AquaEnv = derive2 { name="AquaEnv"; version="1.0-4"; sha256="07yx7mbslqgqg7ky67n3xfhskaj7s3w5mvl7xkih48xbsdlmxi4l"; depends=[minpack_lm]; };
   ArArRedux = derive2 { name="ArArRedux"; version="0.2"; sha256="0ql9yx46sgqkc3jd7yaw3vwg8rnykbsvpcahrgc66753kcxih04q"; depends=[]; };
   ArDec = derive2 { name="ArDec"; version="2.0"; sha256="14niggcq7xlvpdhxhy8j870gb11cpk4rwn9gwsfmcfvh49g58i80"; depends=[]; };
+  ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.0"; sha256="0q0j08ih9isd91wkm39x887fjb01481g9d7i5086zs5jyahlfdkw"; depends=[coda hdrcde shiny shinythemes]; };
   ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
-  ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.0"; sha256="0cq4yzayj3wc45pna59v55xfa6x98q5s62kxwmqs6q76d50z7mzp"; depends=[]; };
+  ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; };
   ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
   AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; };
+  AssayCorrector = derive2 { name="AssayCorrector"; version="1.1.3"; sha256="172zvyjim1w69d8v2ah8l56yj05vwypi77gkcz80xfyfmgcksgdk"; depends=[lattice latticeExtra RColorBrewer]; };
   AssetPricing = derive2 { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; };
   AssocTests = derive2 { name="AssocTests"; version="0.0-3"; sha256="0vin9jkyvmgwk3kjf32qd8q9cj8ibmvdggbh8ny6f413ldyd77qc"; depends=[cluster combinat fExtremes mvtnorm]; };
   AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
   AsynchLong = derive2 { name="AsynchLong"; version="2.0"; sha256="1wjby75rpypzyrxnv2lgl7h2fsvyni3bpiwclp0x7cl4sxic1x5c"; depends=[]; };
   AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; };
   AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
+  AutoDeskR = derive2 { name="AutoDeskR"; version="0.1.2"; sha256="16yzlrksi0fpdj1j845wbqznv1313a6npxa6a8jl5nac4sbqck27"; depends=[httr jsonlite shiny]; };
   AutoModel = derive2 { name="AutoModel"; version="0.4.9"; sha256="07wpdf5b1z6lk69nqybzx333zc57wbnga6dp0vkf1d50hxmpd9yc"; depends=[aod BaylorEdPsych broom car dplyr gtools lmtest MASS ROCR rowr]; };
   AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; };
   AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; };
-  AzureML = derive2 { name="AzureML"; version="0.2.10"; sha256="0a096pzpp1ij1lj0cj5gh6f3kskgjwhigd4bclkdhvqk07dxcqnv"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; };
+  AzureML = derive2 { name="AzureML"; version="0.2.13"; sha256="03b2s76dbzvpy32vj5kb030k1x64lll4bfv0ci92rii9l35653gc"; depends=[base64enc codetools curl foreign jsonlite miniCRAN uuid]; };
   B2Z = derive2 { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[coda mvtnorm numDeriv]; };
   BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; };
   BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; };
+  BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; };
   BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; };
   BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
-  BAMMtools = derive2 { name="BAMMtools"; version="2.1.1"; sha256="1r64n6ym5wjxc4p6pq92lwj7z6nlv33c5ikbimp0c9my7n9dlyby"; depends=[ape]; };
-  BANFF = derive2 { name="BANFF"; version="1.0"; sha256="0j6rv7p34i9bgl8iig4wg2qg495xskw8j1i3wwvzynz97xn2iyzf"; depends=[coda doParallel DPpackage foreach igraph mclust network pscl tmvtnorm]; };
-  BANOVA = derive2 { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[coda rjags runjags]; };
-  BAS = derive2 { name="BAS"; version="1.0.9"; sha256="0jhf9ijarvib924hfy1j39mifaraazzv8lp6fqvrj27fxndmhxw7"; depends=[]; };
+  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]; };
+  BANOVA = derive2 { name="BANOVA"; version="0.8"; sha256="0kjmhb1y3vkm8yw4z5fqmr1ripblk82svg2ik15ml2xnriwgdpwp"; depends=[coda rjags runjags]; };
+  BAS = derive2 { name="BAS"; version="1.4.3"; sha256="1ix277flarxp5xk3w3r715i1y30bx2d49c73s1xhjrwjlpj6jj74"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
-  BAT = derive2 { name="BAT"; version="1.4.0"; sha256="18152jd8k3pngnjgzjmbvsk5qhxsqsi3k1yfdrcb61n4hvqxgns1"; depends=[nls2 spatstat vegan]; };
+  BASS = derive2 { name="BASS"; version="0.2.0"; sha256="1sgz4clzbrbhj845nf1bbv16ww2j72vfvmb7n8hhnpv84r5q5dm9"; 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.9"; sha256="01ihbx6cfgqvz87kpy7yb9c7jlizdym3f0n16967x2imq73dazsb"; depends=[checkmate]; };
+  BBmisc = derive2 { name="BBmisc"; version="1.10"; sha256="0cw2mhw7qhdrx91zzd5iwyh7ch9fy4wxga8j63731q6sxr1airjl"; 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=[]; };
   BCDating = derive2 { name="BCDating"; version="0.9.7"; sha256="0z3a95sc481p0n33mhg7qlsf1jynbm1vbfds0n03bsjrwvqkzpb2"; depends=[]; };
   BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; };
-  BCEA = derive2 { name="BCEA"; version="2.2-2"; sha256="0nal906l60f6llv8dzfsa0367abdkch0gc13rb3jix3cn0iwfwlf"; depends=[MASS]; };
+  BCEA = derive2 { name="BCEA"; version="2.2-5"; sha256="0jiizwnxycbz9x8fmkcw3rcjkgg5b9fawyddf8swvx23cnfm6z8z"; depends=[MASS]; };
   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=[]; };
-  BDWreg = derive2 { name="BDWreg"; version="1.0.0"; sha256="0fv9w19ansrfil9lx7v32p392h9mfal1znj8p47p1n22jbk208x8"; depends=[coda doParallel foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.26"; sha256="0lbn7780pn55hm46ml7sgmcv3vvlwaa54hhks3z634hnyjk8f3b8"; depends=[igraph Matrix]; };
+  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]; };
+  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]; };
+  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.2.0"; sha256="1j80gdkir5p5wlfq7p3bnqcphm6fmxgya46ga0ifz1rxiwqhw5vf"; depends=[BH Rcpp]; };
+  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]; };
-  BGLR = derive2 { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; };
+  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]; };
+  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.60.0-1"; sha256="08gc3b0irgvpjl59irdxs8jhlbky4yp4fvs3zi4pq0wdwj43cfsk"; depends=[]; };
-  BHH2 = derive2 { name="BHH2"; version="2015.06.25"; sha256="19c8qjfvg4f3zlrqvrsdmc776f81ghv8w0l3bnbpdbyz7fivc1qw"; depends=[]; };
-  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.8-0"; sha256="1lizj7jyh8130y8b2ls912yfr2rf2pfnsmbm6vnfqrhj2xc6b33h"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
-  BIGDAWG = derive2 { name="BIGDAWG"; version="1.2.8"; sha256="0ahj2lwfd36lrqpaf2ywjq9i3603dydyw4c2hzx86czaanp2xcx6"; depends=[haplo_stats XML]; };
+  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]; };
+  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.12-0"; sha256="13bdv9wh5s5jz5hkl839hd9x13958r3p3zzkz6j0nd7z5xax47x6"; 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=[]; };
-  BIOdry = derive2 { name="BIOdry"; version="0.3"; sha256="0dn9nbh0h1wz351xba8g7i0g2jv0v5p1rrxpq842lbfibn2wn0q5"; depends=[ecodist nlme]; };
+  BIOMASS = derive2 { name="BIOMASS"; version="1.1"; sha256="1qawp10hw7xhqyg9bdwvgxbksiwhga7h6vwp8m7q30ibwfv5kamg"; depends=[httr jsonlite minpack_lm msm raster]; };
+  BIOdry = derive2 { name="BIOdry"; version="0.4"; sha256="00xv6qyrmfsyp2qfb8ffii0ifxx18wj7lxzb2svdmqbg8xz8pnbv"; depends=[ecodist nlme]; };
   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]; };
   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]; };
   BMN = derive2 { name="BMN"; version="1.02"; sha256="12gyq01cn6a9ixqgki1ihx5jrp2gw6jdj7q210rb12xlvj3p6x7w"; depends=[]; };
-  BMRV = derive2 { name="BMRV"; version="1.31"; sha256="02y589figv152mx7a9jra3vhjp7sjiljvpf24fhavnh0da3irg4z"; depends=[BH]; };
+  BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
   BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; };
   BMhyd = derive2 { name="BMhyd"; version="1.2-8"; sha256="14pv5f621zq5x9i408zjm8k80hcsabkjpdf86gk3ylgw5yqcivrx"; depends=[ape corpcor geiger mvtnorm numDeriv phylobase phytools TreeSim]; };
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
+  BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="0.2.0"; sha256="1w8p8fkiai2xqgf0w8imv55p8s1nvsfdfmyrq2cnc5b8m1gw457k"; depends=[MASS matrixcalc mvtnorm plyr truncnorm]; };
   BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
   BNPdensity = derive2 { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
-  BNSP = derive2 { name="BNSP"; version="1.1.0"; sha256="1l45x3h0jqszcp7zws6y4nbq2vzyv6aa60kwqfpkjw0kdbbcpw7m"; depends=[]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
-  BOIN = derive2 { name="BOIN"; version="2.1"; sha256="14xfjp1ir1mlg3wayn66rnwnjccdpnk7p0l59455v1wglbajnzb3"; depends=[Iso]; };
+  BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; };
+  BPEC = derive2 { name="BPEC"; version="1.0"; sha256="15ys0nzy6988yw1lf4lmv2h9i164cbl41x261gdyvmg0dy62qsnc"; depends=[ape coda fields igraph maps maptools mvtnorm phytools R2G2 sp]; };
   BRugs = derive2 { name="BRugs"; version="0.8-6"; sha256="0nvp3lwliq72qibvz4bg6c7ixxmhgwl87hyl2qvkgiavix3nkxk7"; depends=[coda]; };
   BSDA = derive2 { name="BSDA"; version="1.01"; sha256="06mgmwwh56bj27wdya8ln9mr3v5gb6fcca7v9s256k64i19z12yi"; depends=[e1071 lattice]; };
   BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
-  BSGW = derive2 { name="BSGW"; version="0.9.1"; sha256="1zp8352mgqpmyn63b5xfmq67rsf3cdy7yy5k1qihdlkw9bi5r3vc"; depends=[doParallel foreach MfUSampler survival]; };
-  BSSasymp = derive2 { name="BSSasymp"; version="1.1-2"; sha256="1c1s574ss7vm00hykv6ahlsw6yzsxdj96cfcj4f1khrmnakiv7z3"; depends=[fICA JADE]; };
+  BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; };
+  BSSasymp = derive2 { name="BSSasymp"; version="1.2-0"; sha256="1xs6gfvsla7h1sldckjfpw3qx7fhxiqzv849g3k6w1309r7pv75r"; depends=[fICA JADE]; };
   BSagri = derive2 { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
   BSquare = derive2 { name="BSquare"; version="1.1"; sha256="1s16307m5gj60nv4m652iisyqi3jw5pmnvar6f52rw1sypfp5n49"; depends=[quadprog quantreg VGAM]; };
-  BTLLasso = derive2 { name="BTLLasso"; version="0.1-2"; sha256="02zd0fp7km4l2ks50z37gqcbpq6fsvkiwqnccndszrwqhi41x7y5"; depends=[Matrix Rcpp RcppArmadillo stringr]; };
+  BTLLasso = derive2 { name="BTLLasso"; version="0.1-5"; sha256="1kvb6hvg3v81p9bkc8z3dqhmmfj1rxzzpx9n3lknmfrynq1a6748"; depends=[Matrix Rcpp RcppArmadillo stringr]; };
+  BTR = derive2 { name="BTR"; version="1.2.4"; sha256="0vf71a36id6zgx0phb0kyry7y9xcdhnincxh3fryzhdigxkahg4h"; depends=[diptest doParallel entropy foreach igraph infotheo poweRlaw Rcpp]; };
   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=[]; };
   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]; };
   BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
-  BaM = derive2 { name="BaM"; version="0.99"; sha256="1q04va2s876ydlmaalx63r520pfx1qzpjg6hbnl9pvn86b5grnf4"; depends=[bayesm coda foreign MASS mice nnet survival]; };
+  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]; };
-  BacArena = derive2 { name="BacArena"; version="1.0.1"; sha256="1hr454nyrd3cn901ppj5giimn7nyakv9fbc9lz4fvb7srw915lg2"; depends=[deSolve igraph Matrix Rcpp RcppArmadillo RcppEigen ReacTran sybil]; };
+  BaTFLED3D = derive2 { name="BaTFLED3D"; version="0.1.7"; sha256="06bvx2f094r4rkzpv517h81pjg211k7ajfcq0k3lxdar7ck1388a"; 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]; };
-  BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.1"; sha256="10km8xcaz1vrabdgbanajza0667w5l8ly7n7lgil2ip9cgfxyw2p"; depends=[Rcpp]; };
-  Barnard = derive2 { name="Barnard"; version="1.6"; sha256="1wk93yj4pl3mybyl2lvgbpq0chpm4akx3rqb29dk34fkfiwmvlhq"; depends=[]; };
+  BalanceCheck = derive2 { name="BalanceCheck"; version="0.1"; sha256="09mkssic173glgcn592cb6zmz80kndggqc4hc800f91xnfql0332"; depends=[ade4 mvtnorm]; };
+  BalancedSampling = derive2 { name="BalancedSampling"; version="1.5.2"; sha256="0a4mb5lwjcy5d3h0ypsqmqniqx3dm64mssj65apgl48wqbm6zvv0"; depends=[Rcpp]; };
+  BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; };
+  Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; };
+  Barycenter = derive2 { name="Barycenter"; version="1.0"; sha256="0dqa3fzrwcaqgkj883v9cn5v0zl3rl32zlqzx9lbqzbrlchxgc3k"; depends=[Rcpp RcppArmadillo]; };
   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]; };
   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=[]; };
   BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; };
-  BayesBD = derive2 { name="BayesBD"; version="0.1"; sha256="0m4y74ijbamqq2cxq7i7i5rkcbx1glbhwm01c1jxkff7m2f1892n"; depends=[plotrix]; };
+  BayesBD = derive2 { name="BayesBD"; version="1.1"; sha256="0wkkk69841vfbwc10s0kvcvx87pnafgx4lr4d2nvqq3v4sw1d2v2"; depends=[Rcpp RcppArmadillo shiny]; };
+  BayesBinMix = derive2 { name="BayesBinMix"; version="1.4"; sha256="09jb8g273xf72wmrgqmajypszl1dyqab9wldb08aqlqf3d3rp1lw"; depends=[coda doParallel foreach label_switching]; };
   BayesBridge = derive2 { name="BayesBridge"; version="0.6"; sha256="1j03m465pwq0lhbrfvddjglrzs6px7bc89yvfzj776amm7myqd0l"; depends=[]; };
   BayesCR = derive2 { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324hyfc6922fsxmjnvddb4mrhis54id2r4"; depends=[mnormt mvtnorm Rlab rootSolve truncdist]; };
+  BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; };
   BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; };
   BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
+  BayesFM = derive2 { name="BayesFM"; version="0.1.2"; sha256="0fiw2x29cpv3prywsbvs1m8a588s2wpi3bwzzjisi2rafbl619xd"; depends=[checkmate coda ggplot2 gridExtra plyr]; };
   BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-2"; sha256="17zfs8bmzp59zaxzcrzis2sxdnqxrv9h1kpb22112mp9l1alvwl4"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
   BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
+  BayesH = derive2 { name="BayesH"; version="1.0"; sha256="0mjd1i3rkhyq3qcalq0ing0ap0igbhyvczaihl4pcfidgs70bci3"; depends=[]; };
   BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; };
-  BayesLogit = derive2 { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; };
+  BayesLogit = derive2 { name="BayesLogit"; version="0.6"; sha256="0jygw6wkmb6887qglzhl525v56kb0y8ig0w56dywbd8dmsv967z7"; depends=[]; };
   BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; };
   BayesMed = derive2 { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline QRM R2jags]; };
-  BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; };
+  BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; };
   BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
+  BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; };
+  BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
+  BayesS5 = derive2 { name="BayesS5"; version="1.22"; sha256="18bs9kgpk7qg1hqdk7av0ygmrkn19nmrdprxf5syy0iqj5l3y13q"; depends=[abind Matrix snowfall]; };
   BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; };
   BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
+  BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
   BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; };
-  BayesTree = derive2 { name="BayesTree"; version="0.3-1.3"; sha256="1wa72mzy1mxw64r1hzadimz0ngi6ng7sbgak7g55rbgj8bmj02yk"; depends=[nnet]; };
+  BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; };
+  BayesTreePrior = derive2 { name="BayesTreePrior"; version="1.0.1"; sha256="13igmvw1wj8kzfijzsrhdqr52kv4vqrm91i71ay6f7jnkry3spaw"; depends=[]; };
   BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; };
-  BayesVarSel = derive2 { name="BayesVarSel"; version="1.6.2"; sha256="1sc26rwa1z1wf8qs21js8xbna51vknd4jcdhvikn8s0i5413l85y"; depends=[MASS]; };
+  BayesVarSel = derive2 { name="BayesVarSel"; version="1.7.0"; sha256="10w9l8jz7j72npl0z2smngrsmb4ga88gn37ps1xn3fyql999iz7d"; depends=[MASS mvtnorm]; };
   BayesX = derive2 { name="BayesX"; version="0.2-9"; sha256="0p170m8zkaspiah1fdyql9lj9yqg6sl525blzq7wwgx5wx4rvncs"; depends=[coda colorspace maptools shapefiles sp]; };
   BayesXsrc = derive2 { name="BayesXsrc"; version="2.1-2"; sha256="114804f6maak5dmwzw4cbigjcdw7c6sgx48af35yrvkspi1gsz3b"; depends=[]; };
   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]; };
   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=[]; };
   BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; };
-  Bchron = derive2 { name="Bchron"; version="4.1.2"; sha256="0pljizj3689mxvsj62mhcy1zvcx7s41vsr5fawz9hij91nq1b8yi"; depends=[coda ellipse hdrcde inline MASS mclust]; };
-  Bclim = derive2 { name="Bclim"; version="2.3.1"; sha256="160c9v83bpik73yjj45lr8sdgl8v4ymlkqw424ncc3lficyhvfjg"; depends=[hdrcde MASS mclust statmod]; };
+  Bchron = derive2 { name="Bchron"; version="4.2.6"; sha256="0i77a72cq6ddpfgs2p0f3bskb03428jxxyq8chjyirsws1amzp92"; depends=[coda ellipse inline MASS mclust]; };
+  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]; };
-  BerlinData = derive2 { name="BerlinData"; version="1.0.1"; sha256="1shhx4pisi139sc0siawa7gp9psfgxm58qijg5m65nihv7spki75"; depends=[rjson stringr XML]; };
   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="3.0"; sha256="0mm1n9lmx03cmwdm3nwj7x42sa24vnahhxizykfd1npcfm9zz5ij"; depends=[Rcpp]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
+  BiBitR = derive2 { name="BiBitR"; version="0.2.2"; sha256="13v8kwf8rnagf978v26a5qn19x44lzdz61n80rw8vxi2ydxbdbr9"; depends=[biclust foreign]; };
   BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
-  BiSEp = derive2 { name="BiSEp"; version="2.0.1"; sha256="15sn9kxs0mb98kclfpif90c808a1365gdj2j332sxi07f64pb87q"; depends=[AnnotationDbi GOSemSim mclust]; };
-  BiTrinA = derive2 { name="BiTrinA"; version="1.1"; sha256="1isq7dffzchllynj2pifjaw2vjkhclqjk2xh6kbnh9cxca16s0kq"; depends=[diptest]; };
+  BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; };
+  BiTrinA = derive2 { name="BiTrinA"; version="1.2"; sha256="0q2wqxj2ipmppilhvq80cnvhnhcp26h422i8ghx26nrkswhx378s"; depends=[diptest]; };
   BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; };
+  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]; };
-  BinNonNor = derive2 { name="BinNonNor"; version="1.2"; sha256="15bzpi2q2428661v8z9izp942ihffgq8dgh4fsnzllvdrpqcyc41"; depends=[BB corpcor Matrix mvtnorm]; };
-  BinNor = derive2 { name="BinNor"; version="2.0"; sha256="0c1qy93ccgzg8g25wm1j4ninsa0ck4y3jjh25za92w070cqhkd8m"; depends=[corpcor Matrix mvtnorm psych]; };
-  BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.0"; sha256="1x231xxdiyp6nwj2dx9w1shi5w6mdyzg43g5zc4r2bpvzccgj0l0"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
-  Binarize = derive2 { name="Binarize"; version="1.1"; sha256="07r41n5123pk6nwdwajgw6m3w38kprf4ksinx4rjldd8h1yd6rik"; depends=[diptest]; };
+  BigVAR = derive2 { name="BigVAR"; version="1.0.1"; sha256="1hsx6fl3zjxfhjr18h2gbhgh0zzh9mdmr3zh0jnbfk8wv3y1nhxv"; 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]; };
+  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="1.0"; sha256="088yg07966g09gv9hznhwfdka4yk0c9j0viy9x4ldmhxl9w9scv5"; depends=[expm Formula numDeriv]; };
-  BioFTF = derive2 { name="BioFTF"; version="1.0-0"; sha256="0k5n82g633gdnyp7rmmm0gvmkhfjgm3frw4shhy0v1jlcvlp9v6n"; 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]; };
   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]; };
   Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; };
-  BiodiversityR = derive2 { name="BiodiversityR"; version="2.6-1"; sha256="181pz4zjx0kvj5m688g8ffaywa60mssgmkl0w60r8195sj80c3y5"; depends=[Rcmdr vegan]; };
+  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]; };
+  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]; };
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; };
   BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
-  Blaunet = derive2 { name="Blaunet"; version="2.0.1"; sha256="0zpx4l5ig0xjnpsgw24b01nnf8w0aw6imjsg9715rm0qswa0jq5y"; depends=[network]; };
+  Blaunet = derive2 { name="Blaunet"; version="2.0.4"; sha256="195ijmn3y9rzcincvjwivaclbs0d9bglb83ss62yfjzw2jpfvc54"; depends=[network]; };
   BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
   Blossom = derive2 { name="Blossom"; version="1.4"; sha256="0002rvz0mlwl2clglzqldg0x5l8lj07qh74ifpdaf1lrdailh328"; depends=[]; };
   Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; };
-  BoSSA = derive2 { name="BoSSA"; version="1.2"; sha256="191hq0np9iadks4sflg360k64xnz8j956y30pqzwciinb4hgq1nr"; depends=[ape SoDA]; };
+  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]; };
   Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
   BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; };
-  BoolNet = derive2 { name="BoolNet"; version="2.1.1"; sha256="0g8f2pv8s8kj84qcp2fy3h8p91ja6ap2dgxkdaf5kjv7r3hfddg0"; depends=[igraph XML]; };
-  Boom = derive2 { name="Boom"; version="0.3"; sha256="0j5j4x77fqwgc6f6d91v02niq4mrdfi0x5id0mq9zdha0rnidcky"; depends=[BH MASS]; };
-  BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="0.5.3"; sha256="0932jwc7bz84lryzaxd4lncqbkc3d0v2yh22dvryz2hf59a2a5lj"; depends=[BH Boom]; };
+  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]; };
+  BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; };
   BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
-  Boruta = derive2 { name="Boruta"; version="5.0.0"; sha256="0sz9rbpxwjaz3l4kx4b616x2kfb2szv8s1qk4qv05smqf34hf8rw"; depends=[ranger]; };
+  BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; };
+  Boruta = derive2 { name="Boruta"; version="5.2.0"; sha256="111rp7lbq79p7c1w4dkzhb9wh32mns5p17xxq0qbjzaiv41377dy"; depends=[ranger]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[brglm gtools lme4]; };
-  BrailleR = derive2 { name="BrailleR"; version="0.24.1"; sha256="181s8rz5n9yvnsg3nj7n43giyjiabrk3j1bl64z7aq3x15cx0xqs"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest pander rmarkdown xtable]; };
+  BrailleR = derive2 { name="BrailleR"; version="0.24.2"; sha256="07kd9x176gd3ccpskv7vn22jam1pknsywcd09qj7l4zfbv9l0rqx"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest pander rmarkdown xtable]; };
+  Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
   Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
   BsMD = derive2 { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
   BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
-  BurStMisc = derive2 { name="BurStMisc"; version="1.00"; sha256="0718a1p7iiqkfhhmnzxggc6hd8sm847n1qh7rfbdl8b0k0bgvnj0"; depends=[]; };
+  BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; };
+  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]; };
-  CALF = derive2 { name="CALF"; version="0.1.1"; sha256="1ikmlf6fkma2q281m012ifbxfavx4cywvf0igs4fxpkd7jm9frff"; depends=[]; };
+  CADStat = derive2 { name="CADStat"; version="3.0.6"; sha256="1qzy93fzzj4b0x0m9rrlh1wmv44rd9kvjw6wkdd3m3l2qbqsbzn8"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart 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.73"; sha256="0acksmgi7g0nngq5wcyrxzplxk6h8yi0s1q1pdkqna8dyriw7ih1"; depends=[mvtnorm sp]; };
+  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.4"; sha256="0ab259mglhli6443mgxsgzfmi7wam6m1498lc5ihha4px05cbkl0"; depends=[CARBayesdata coda MASS Rcpp sp spam spdep truncdist]; };
-  CARBayesST = derive2 { name="CARBayesST"; version="2.2"; sha256="0kcx708g88hm70ss73cry4h4w2j32bj65rxn31sjfghgsnvd7fp6"; depends=[coda MASS Rcpp spam spdep truncdist]; };
-  CARBayesdata = derive2 { name="CARBayesdata"; version="1.0"; sha256="19dhgkqpdcq1y866arb3qm7wbl348w66yl85kwajkmqgplx2pvaq"; depends=[shapefiles sp]; };
+  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]; };
+  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=[]; };
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
-  CAvariants = derive2 { name="CAvariants"; version="3.1"; sha256="0plxkz8slvk824ziwxc27dricid3ddm18bsl3dvqprarh9l1r0ja"; depends=[]; };
-  CBPS = derive2 { name="CBPS"; version="0.10"; sha256="0k3mb97d49r870dm7ac1nwhy4kvh0936jmka7ib03154jmzsfyn7"; depends=[MASS MatchIt nnet numDeriv]; };
+  CATT = derive2 { name="CATT"; version="1.0"; sha256="1hnhzla14y0cii51pi53a42bmsxcqvylj88fyvgpfavmvz301f7d"; depends=[]; };
+  CATkit = derive2 { name="CATkit"; version="3.0.0.2"; sha256="1afaa1s8clynpna9hwgbgfdp5jciv0n5q9vb27cgyl9n69nla991"; depends=[magic MASS png rtf season signal]; };
+  CAvariants = derive2 { name="CAvariants"; version="3.3"; sha256="14ly5pyhvsbz08p0pk1ijwivz17jrnd0qqzn4n9jqzc9b8yml4dw"; depends=[]; };
+  CBPS = derive2 { name="CBPS"; version="0.13"; sha256="16g62pvxd2njawk2sfaznhicy1dfxab3v1k0bfrzj5a4l1501l2z"; depends=[MASS MatchIt nnet numDeriv]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
   CCM = derive2 { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
   CCMnet = derive2 { name="CCMnet"; version="0.0-3"; sha256="0mbw3yhlgnmq7q4wnwiff7rlmciq83cch7kkav3wll6nqvxcdiax"; depends=[ergm network sna]; };
   CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
-  CCTpack = derive2 { name="CCTpack"; version="1.4"; sha256="09s2ysqsz158lrah44rwvs3nlhyqlvwcj6aar2p79flf4xxdwsvk"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
+  CCTpack = derive2 { name="CCTpack"; version="1.5.1"; sha256="0j4c7w5jfixsjhpn460iai7q0dd9znchp1iv7dxvyqdm45149p36"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
   CCpop = derive2 { name="CCpop"; version="1.0"; sha256="10kgw3b98r0kn74w89znq6skgk8b3ldil6yb0hn5rlcf6lazjzca"; depends=[nloptr]; };
+  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="4.8-0"; sha256="0k99ppspr3k7lgjxqbnp2fwvpl3zidi1c0zzwwj7i4v29nbf4fiq"; depends=[lattice MASS mvtnorm plyr polycor psych Rcpp RcppArmadillo sfsmisc]; };
+  CDM = derive2 { name="CDM"; version="5.4-0"; sha256="1gbzk9iijn37njal6fq70y6hhl44zgi79yb3lwp3cxys1j2fp0kw"; 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.0"; sha256="0dnaviaw9zfkdss2mjk7mccgrfya70491hqzx6wdlpzspchzm9ni"; depends=[]; };
+  CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; };
   CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; };
-  CEC = derive2 { name="CEC"; version="0.9.3"; sha256="05cgd281p0hxkni4nqb0d4l71aah3f3s6jxdnzgw8lqxaxz4194i"; depends=[]; };
-  CEGO = derive2 { name="CEGO"; version="2.0.0"; sha256="1rsia7dnbc2hwrihdxdaspwm8xfvc7ryy3sgki801xv3la4nzk8p"; depends=[DEoptim MASS]; };
-  CEoptim = derive2 { name="CEoptim"; version="1.1"; sha256="130x215lwm8lsygxnkykhiv80ry7srs9n77rcyjgxag9f1hn223x"; depends=[MASS msm sna]; };
+  CEC = derive2 { name="CEC"; version="0.9.4"; sha256="194n190szwzxjxfdhiah1f50vp6n7f3q567yky7pq1x2hngna5rs"; depends=[]; };
+  CEGO = derive2 { name="CEGO"; version="2.1.0"; sha256="141gr1sin6sgvjasm6sczvq2za25ybw7wapdljdx2lx7qhgq77rk"; depends=[DEoptim expm MASS Matrix quadprog]; };
+  CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
   CFC = derive2 { name="CFC"; version="1.0.1"; sha256="0p4ijhks2jj9a417k9mp670q59d0wi3pfhqkx005cbsficynf0y2"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
   CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
   CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; };
   CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
-  CHNOSZ = derive2 { name="CHNOSZ"; version="1.0.7"; sha256="1kvw3fpimfcjf49kk9vf8bdjd76z7g54i7hn4d71swm3p9zfyb7a"; depends=[]; };
+  CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; };
+  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]; };
   CIDnetworks = derive2 { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[igraph MASS msm mvtnorm numDeriv pbivnorm Rcpp]; };
-  CIFsmry = derive2 { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
+  CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; };
   CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
   CINOEDV = derive2 { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
   CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
-  CLME = derive2 { name="CLME"; version="2.0-4"; sha256="1ymaqvmq0ji82kb4c84a6fdz15ri797k9n218kawz21xvx8ilr7w"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
+  CLME = derive2 { name="CLME"; version="2.0-6"; sha256="0cd3sn6amariap04lhc2kwsdcj4i4axrx95xr10spykr8py4skmc"; depends=[isotone lme4 MASS nlme openxlsx prettyR shiny stringr]; };
   CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; };
   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.0.3"; sha256="0j6flj176qy132xdj3jy1xpvb4qpwr5jbyxgp59diaqs5nnz33qy"; depends=[]; };
+  CMplot = derive2 { name="CMplot"; version="3.1.4"; sha256="0ph8pqmlbm2j40dq4lqyfy43hz5s958vvqaglzmcqdvkgpv1ni0a"; depends=[]; };
   CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; };
-  CNVassoc = derive2 { name="CNVassoc"; version="2.1"; sha256="0gwyhipkvvnivdahr9mkj1b8j9wzg6g8mcsvk5rq28xdzrskz0i8"; depends=[CNVassocData mclust mixdist survival]; };
+  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]; };
   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=[]; };
   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]; };
   CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
-  CORElearn = derive2 { name="CORElearn"; version="1.47.1"; sha256="0apsv6lam5a6miirhq6z0acm4xnynyskqp94cxvxpgkaaap2c55l"; depends=[cluster rpart]; };
+  CORElearn = derive2 { name="CORElearn"; version="1.48.0"; sha256="1pm2gqns1d7yxv4i5h110b6s6i6an7xnz379n1cm8rcfnlpndryz"; 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.2"; sha256="1lb67gwznva5p046f4gjjisip5a12icp7d2g1ipizixw99c5lll8"; depends=[MASS msme sandwich]; };
+  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.5"; sha256="0hzp4h7bhhxn336kkq27phplk7idwk27jjsp6zimwl8fq3ylh0dr"; depends=[survival]; };
+  CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; };
+  CPBayes = derive2 { name="CPBayes"; version="0.1.0"; sha256="004n2s09b8wfg8aj7j400hvkbwxsxd27fyk72x6nnc8lkrpwzs5b"; depends=[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]; };
   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-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Matrix Rglpk]; };
+  CRF = derive2 { name="CRF"; version="0.3-14"; sha256="0xhjj76730yjlpwbhcpdzqp7s37a9rhf4adk1s7hfb0jm8b76fgh"; depends=[Matrix Rglpk]; };
   CRM = derive2 { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
   CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
-  CRTgeeDR = derive2 { name="CRTgeeDR"; version="1.1"; sha256="10gm6dmn8hwg5kbfvzdjfdvsv6ii0hn00512jchfj1f6gxxq5ha2"; depends=[ggplot2 MASS Matrix]; };
+  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]; };
+  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]; };
-  CUB = derive2 { name="CUB"; version="0.0"; sha256="0a3iz90i0mshfxqykbfyrhmy45iyzh81r680hasvrbakqnm94a82"; depends=[]; };
-  CUMP = derive2 { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; };
-  CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.1"; sha256="0ng0k6bkvgsrsgx0qj9mhhll837j0vixa2p24fjmcpi1dyjahgi5"; depends=[]; };
+  CUB = derive2 { name="CUB"; version="1.0"; sha256="1csgsfxq80kh7s52f2658gs4c6nf1vpcmq0xizcjira2wnwpdzmv"; depends=[Formula]; };
+  CUFF = derive2 { name="CUFF"; version="1.2"; sha256="11sqd84sq8rmbvx4mqvmfajxzsj68n286dgmv7vm9lkmvc7765bs"; depends=[openxlsx xtable]; };
+  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=[]; };
   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]; };
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
-  Canopy = derive2 { name="Canopy"; version="1.0.0"; sha256="0bl9yjm8433nfx0k9vv2pyiv5zjnwsfi55q8pp10bv3b6v35g2vm"; depends=[ape fields]; };
-  CarletonStats = derive2 { name="CarletonStats"; version="1.2"; sha256="07jjdhrz0chcgx0ivd5b6ig2936fq2hdhrflqmifm2mqbc7cgqbh"; depends=[]; };
+  Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.1"; sha256="1wgksvfkpbr7sicfnv9g5w04kbrb9pwl40aqbflzy9kmqbjy5hhx"; 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]; };
+  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]; };
   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]; };
   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]; };
-  CensMixReg = derive2 { name="CensMixReg"; version="0.7"; sha256="0ricfbm1k7dvsj658sj9ava8xgwqzypi99ihn41llnfdgdnslifs"; depends=[mixsmsn]; };
+  CensMixReg = derive2 { name="CensMixReg"; version="1.0"; sha256="0plqirl6vhk2rx9q2kgniq7km9jl1g6xdn74sdjpdcm4srmr7074"; depends=[mixsmsn mnormt mvtnorm]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
+  CensSpatial = derive2 { name="CensSpatial"; version="1.2"; sha256="07zi8mxzrqfdcyrrgch9yn0dpmvj5aj2d10q26cnykifsdbaq12c"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
   CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; };
-  CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.0.8"; sha256="0n67y7ah496wck9hlrphya9k753gk44v7zgfz4s2a5ii49739zqi"; depends=[robustbase]; };
+  CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.5"; sha256="1q6dcikmk5la5msb4gml0llvbb9262bsgmdhxi75myv4jlb3b8p9"; depends=[robustbase]; };
   CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
-  ChainLadder = derive2 { name="ChainLadder"; version="0.2.2"; sha256="1lxcy7q02lgsi575z1l1bxhxrgc3qcf2ln09pf4rb4diw7fs6ply"; depends=[actuar cplm ggplot2 lattice Matrix reshape2 statmod systemfit tweedie]; };
-  ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.5"; sha256="0hgvcvqgqn22n874y268rchy88jgyp4lv5nbdyzgyay2arwsjjdy"; depends=[Rcpp RcppArmadillo]; };
+  ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; };
+  ChainLadder = derive2 { name="ChainLadder"; version="0.2.4"; sha256="0wp8cihvyrlbixzpp7fhr5qcsq46m54j0m4az97b0v6lwr5dfp4w"; depends=[actuar cplm ggplot2 lattice MASS Matrix reshape2 statmod systemfit tweedie]; };
+  ChangepointTesting = derive2 { name="ChangepointTesting"; version="1.0"; sha256="1nb78b1jpp0wpy9ah2fxkh53hlmb2f82b68msbfhancb8zp2lclv"; depends=[]; };
+  ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.10"; sha256="1a1fzlp5fc5l357gklya096cwry26hymxrlpqsy1xdr60fd7pfx5"; depends=[Rcpp RcppArmadillo]; };
   ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; };
+  Chaos01 = derive2 { name="Chaos01"; version="1.0.1"; sha256="061z1cm55d0vxf9ly8hdhqb0qapqkyvhnfg44nnfh43a6a6kv339"; depends=[]; };
   ChaosGame = derive2 { name="ChaosGame"; version="0.2"; sha256="1d6c2zjh7d5d1abi07d9akjjbpccvlnra96f2w58rdr87dy757zq"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; };
   ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; };
   CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; };
-  ChemoSpec = derive2 { name="ChemoSpec"; version="4.2.8"; sha256="1ym2fy6dg2v9z6bld99snnydmmd03sr5m6clf9m2xwnkm252wcr4"; depends=[plyr rgl]; };
+  ChemoSpec = derive2 { name="ChemoSpec"; version="4.4.17"; sha256="1v4mzkhr6y90nhxnq28aklh76f3imv1cxch50vj5k23d744djx8f"; depends=[plyr]; };
   ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.9"; sha256="095jahs7n591fam7s6i38h2iw5jbl005n040s1i489zzmsnj2n6d"; depends=[ChemometricsWithRData kohonen MASS pls]; };
   ChemometricsWithRData = derive2 { name="ChemometricsWithRData"; version="0.1.3"; sha256="14l1y4md8hxq8gvip5vgg07vcr0d9yyhm5ckhzk8zwprdabn9a10"; depends=[]; };
+  ChoR = derive2 { name="ChoR"; version="0.0-1"; sha256="1zxzgmww368zfdd3fq4wmj4v9prh8fqdb2d3wplqszxjf1irmb45"; depends=[rJava]; };
   ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
   CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; };
-  CircNNTSR = derive2 { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc4im12i2kqz4a3b11vzzlb6wfl5yck6iff5"; depends=[]; };
+  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]; };
+  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="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; };
+  Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.0.1"; sha256="148yfsz8di73iy81l2b97a7jcr3d3gs4a4jzjgybs7305ld1ngrq"; depends=[]; };
   ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; };
-  ClickClust = derive2 { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
-  ClimClass = derive2 { name="ClimClass"; version="2.0.1"; sha256="13h6qj7wda5n1vgfqpclp0n3ir4qqqm7f00zlnq7dfpifd7ci4vn"; depends=[geosphere ggplot2 reshape2]; };
-  CluMix = derive2 { name="CluMix"; version="0.3"; sha256="1yaznpv1aiqpg5ywqypharf8vigvgw0ihik7m8wfjbj2rzmlhj33"; depends=[ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; };
+  ClickClust = derive2 { name="ClickClust"; version="1.1.5"; sha256="0b46f453mffg4ym6yvmh7g3v05mc9gphwfra75j28y1425s87yvw"; depends=[]; };
+  ClimClass = derive2 { name="ClimClass"; version="2.1.0"; sha256="1r836md31z2r5d9xckkbalzbhm4kf5paljv71kxpy53q92k7yi91"; depends=[geosphere ggplot2 reshape2]; };
+  ClimDown = derive2 { name="ClimDown"; version="1.0.2"; sha256="0dbv5vn985bi9nqxhq7jcj6k38s8dlbqnln3adgd0ih2fwilvalg"; depends=[abind fields foreach ncdf4 PCICt seas udunits2]; };
+  CluMix = derive2 { name="CluMix"; version="1.3.1"; sha256="0kq0max4v9860dv76lprzq5wzdcbvzzjzqnzxrskic5r3yk6jf28"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; };
   ClueR = derive2 { name="ClueR"; version="1.1"; sha256="1pk8l1qsiaypj34kbc3ikznn16ndn1alf1kgx0cx6pkhn2fpan2l"; depends=[e1071]; };
   ClustGeo = derive2 { name="ClustGeo"; version="1.0"; sha256="0n7i6lwc86cizpn5ibd6k9i41w8fcbh1cdxqm7w52z024w0z40jh"; depends=[FactoMineR plyr rCarto]; };
-  ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.3"; sha256="1yvz5qpmagmld757nlc641imiv715mgwkni1d04zq99rf0bvxapf"; depends=[Rcpp]; };
+  ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; };
   ClustOfVar = derive2 { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
-  ClustVarLV = derive2 { name="ClustVarLV"; version="1.4.1"; sha256="02a3ljds8hlkmpa0hw2mm51abimw23dnvr8c08bx2671284nwzmc"; depends=[Rcpp]; };
+  ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; };
+  ClusterR = derive2 { name="ClusterR"; version="1.0.5"; sha256="1x4rkj4b8n8zirzzmkxa20n50msj6mw41j2gkr276pcs37paf772"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
+  ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
+  ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; };
   CoClust = derive2 { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; };
-  CoImp = derive2 { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula gtools locfit nnet]; };
+  CoFRA = derive2 { name="CoFRA"; version="0.1001"; sha256="1nb6054mb8md3i0108n6jgwc9ydn9vn82q01jlnynfq2r3j06drw"; depends=[gplots Rcpp]; };
+  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]; };
-  CollocInfer = derive2 { name="CollocInfer"; version="1.0.2"; sha256="0bs4ivnk394l7xjxyvg7fhlfi3vdscp1c27dpvilrlmfikbzpc33"; depends=[deSolve fda MASS Matrix spam]; };
+  CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; };
+  CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; };
   ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; };
   ComICS = derive2 { name="ComICS"; version="1.0.3"; sha256="1jfs0ygr88532jjw2ablyn2r3sg3hfsv5yrm4gkdgzakychj3dy2"; depends=[glmnet]; };
   CombMSC = derive2 { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
-  CombinS = derive2 { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; };
+  CombinS = derive2 { name="CombinS"; version="1.1-1"; sha256="06g41zbjl54cbhhs8q7l4bbvszclvbxn3m2dqg800d6ghs9vgl6v"; depends=[]; };
   Combine = derive2 { name="Combine"; version="1.0"; sha256="0n3jkxf4s778d6fzcanb2b09xhpv5sqzawpg17bbfngfhp0vfyrq"; depends=[]; };
   CombinePValue = derive2 { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; };
+  CombinePortfolio = derive2 { name="CombinePortfolio"; version="0.3"; sha256="0w4mw748ix7jyqfirr8bm93i742y7bpir7q5x1j3r9cqpi9h5zfv"; depends=[]; };
+  CommEcol = derive2 { name="CommEcol"; version="1.6.4"; sha256="02fmiil8sy5dwkpcdabcz5yhn7h9vlrsyyc9ilnmzb62z5447kdz"; depends=[ape gmp picante vegan]; };
   CommT = derive2 { name="CommT"; version="0.1.1"; sha256="1kimm8z3k7p5lxsjnkb203js2rqn09grywxs890fab1hhgssgv2r"; depends=[ape ggplot2 gridExtra phangorn reshape]; };
   CommonJavaJars = derive2 { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; };
   CommonTrend = derive2 { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
   CommunityCorrelogram = derive2 { name="CommunityCorrelogram"; version="1.0"; sha256="1wkrm5lil595sc4ih3qsf4sgvfipzlav0n7339ixqw9zxm2pg4nj"; depends=[vegan]; };
-  Comp2ROC = derive2 { name="Comp2ROC"; version="1.1"; sha256="0vhpw6k9barcx5fl3kw3r7152mcrlpr127i5b70bx64g8g9ffs1v"; depends=[boot ROCR]; };
+  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.1"; sha256="1kv4bdkwidkjw0hgn2krv42p9v1a03p47g0p03lja3flhfbmiifj"; depends=[]; };
+  CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.2"; sha256="0bsgbdblxpv57mbwnf51xyiydp2bqyxkg4zzwqki85cv5xqlrq1n"; 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.4"; sha256="0x5flqwx49ar18hg2790rr28glypx8xyxp0ncjg4v5v18l82qd9s"; depends=[Matrix]; };
-  CompareTests = derive2 { name="CompareTests"; version="1.1"; sha256="1assdqwr5qhwfqhc8gpfa53kcmd4dy5fb449pm4ng0n674qvra6c"; depends=[]; };
-  Compind = derive2 { name="Compind"; version="1.1"; sha256="1435b8g6dzim7hff6kvxgx00linx5gk9y7zidbmishsybv5r1mar"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
-  ComplexAnalysis = derive2 { name="ComplexAnalysis"; version="1.0"; sha256="1yk0r3iwxirjsksnpwpnrgq4yhni6in9kgxxrs7v51l35zn78kji"; depends=[]; };
-  Compositional = derive2 { name="Compositional"; version="1.1"; sha256="167823g2a3cnnkmvhdc5wnjic0ih1xz2xfymgh5dicfzr9inasb5"; depends=[BB doParallel foreach MASS mixture quantreg sn]; };
+  CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.5"; sha256="0z9fjd344wc5bisir7hf64abli7in8b5860y1012vmah4vz9knlr"; depends=[Matrix]; };
+  CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
+  Compind = derive2 { name="Compind"; version="1.1.2"; sha256="14y18vvj13f3wi5gzrwabmj908hh1c2mizw98a36xxzlxw79fipd"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
+  Compositional = derive2 { name="Compositional"; version="2.2"; sha256="06s101fa8iv1sdg6x5yz3fl08mjjw265ff9kj9dxds02h036b84s"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
   ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; };
+  ConR = derive2 { name="ConR"; version="1.1"; sha256="1jl6pp0g7qrp0h5771r03gjiy4g7xbqw12liiqd8cfyl045s07yr"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat]; };
   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]; };
   ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
-  ConnMatTools = derive2 { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; 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]; };
-  ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.0"; sha256="13j4d5l0if9qrdqcx0mn529bygilym9gya3ih66p8bki6bmda72v"; depends=[mclust mixture mnormt]; };
+  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]; };
-  Copula_Markov = derive2 { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; };
-  CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.2"; sha256="1k02r0i56fwwk155b7xy9dzxnmvnslzrcc90azixxhhc9rc1xsaq"; depends=[ggplot2 plyr reshape2 rstan]; };
-  CopulaREMADA = derive2 { name="CopulaREMADA"; version="0.9"; sha256="0fhd4g8157rmkda5dygvnvb50f8dz31wlg1x432g9ra8fw7bdq01"; depends=[matlab statmod tensor]; };
+  Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
+  CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.4"; sha256="087kyq6bmnv12cg1il2hb9x1wbac5a85khf8mgvcvy4f1f8hhckr"; depends=[ggplot2 plyr reshape2 rstan]; };
+  CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
-  CopyDetect = derive2 { name="CopyDetect"; version="1.1"; sha256="0h9bf7ay5yr6dwk7q28b6xxfzy6smljkq6qwjkzfscy5hnmwxkpa"; depends=[irtoys]; };
+  CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; };
   CopyNumber450kCancer = derive2 { name="CopyNumber450kCancer"; version="1.0.4"; sha256="0csmrv5n4lxd19q8q94sxs374lkqilp5x2dj8nxzs0x1v8hn0knm"; depends=[]; };
-  CorReg = derive2 { name="CorReg"; version="1.1.1"; sha256="1g12yrwx5j3db1j9q0j24z3q2j8a7m7ddkj9a4yznzzvjjdz2k0n"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
+  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]; };
   CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
-  CorrMixed = derive2 { name="CorrMixed"; version="0.1-12"; sha256="10wcg2rn4dcx87wv6h51rk31gdh7pc0bbgmdi1qvwd08nlqc3zsy"; depends=[nlme psych]; };
+  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]; };
+  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]; };
   CosmoPhotoz = derive2 { name="CosmoPhotoz"; version="0.1"; sha256="04girid6wvgyrk8ha81mdqjx2mmzifz57l1hzcgrdnzmjmm3vlmp"; depends=[arm COUNT ggplot2 ggthemes gridExtra mvtnorm pcaPP shiny]; };
+  Counterfactual = derive2 { name="Counterfactual"; version="1.0"; sha256="18ngh1p2lm16wb4sxpah0xfbsnpq0i03mkaxsia51lqwkfg57vdv"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; };
+  Countr = derive2 { name="Countr"; version="3.2.8"; sha256="0nx0xavpm3kkh6q9q4snqjs3dmp45b9dm2zqwg7lkrv0f32inkyp"; depends=[boot car flexsurv Formula MASS Matrix numDeriv optimx Rcpp RcppArmadillo VGAM]; };
   CountsEPPM = derive2 { name="CountsEPPM"; version="2.1"; sha256="1w1l4kbk8c2prq7f38maz0fc44j9za6cmj0vydmcgscb9s6f3mg7"; depends=[expm Formula numDeriv]; };
   CovSel = derive2 { name="CovSel"; version="1.2.1"; sha256="02fsiykbg96ynqw25vfyrams7fs39xjmfhvb23zjbqb7ql6d0xdk"; depends=[dr MASS np]; };
+  CovSelHigh = derive2 { name="CovSelHigh"; version="1.0.0"; sha256="186ji8qvjvm41i85qa2324rs59wvjb4gsjllza5d7db08gqia66z"; depends=[bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest xtable]; };
   CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
   CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
   Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; };
   CpGFilter = derive2 { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; };
   CpGassoc = derive2 { name="CpGassoc"; version="2.55"; sha256="0vnksx66z8rfm5s5hn49p9ps26jwn6w2216bqw2k9xv77rr68phn"; depends=[nlme]; };
-  Cprob = derive2 { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[geepack lattice lgtdl prodlim tpr]; };
+  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=[]; };
-  Crossover = derive2 { name="Crossover"; version="0.1-15"; sha256="1g9z4ssqyb3silaprcsjsdd1bk5rsih2hvqr6rm1qb8ayqjr1sp3"; depends=[CommonJavaJars crossdes digest ggplot2 JavaGD MASS Matrix multcomp Rcpp RcppArmadillo rJava xtable]; };
+  CrossClustering = derive2 { name="CrossClustering"; version="3.0"; sha256="0l9cdniqf63x4pfkf6y7c2qh056jwadqw45nz9jk78wamqq8hyqv"; depends=[cluster]; };
+  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]; };
   CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[car chopsticks ellipse rJPSGCS]; };
-  Cubist = derive2 { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
+  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]; };
   D2C = derive2 { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[corpcor foreach gRbase lazy MASS randomForest RBGL Rgraphviz]; };
-  D3M = derive2 { name="D3M"; version="0.41"; sha256="12yny4a6rggaz5zfjpacsmxcj805nbkw19n26m9vr58a7zg1iwa1"; depends=[beanplot Rcpp]; };
+  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]; };
   DAAG = derive2 { name="DAAG"; version="1.22"; sha256="16xp4qk09v9jwm4cs7b4mpn0kgl1va9rw86viwcjc54vjc32953f"; depends=[lattice latticeExtra]; };
-  DAAGbio = derive2 { name="DAAGbio"; version="0.62"; sha256="18m4vq8vv0yi79na62nrm0cy1nlk7bg0xbddzxv5gpkmzi1i6m9s"; depends=[limma]; };
+  DAAGbio = derive2 { name="DAAGbio"; version="0.63-1"; sha256="0f904cpyq140fbsxfqrm3wg41bncf6h2rkxfd37ij5m0qp067f0w"; 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.0.2"; sha256="1w5pdsfcalr86k1gj6qz9qdgx82n5lxcjdzvyf854prxaq5a5z0m"; depends=[deSolve]; };
-  DAKS = derive2 { name="DAKS"; version="2.1-2"; sha256="1817s7xd4h2zzaagmnw423qaxpa5fmxi3fh4h9hm2ra9w7nh6ljj"; depends=[relations sets]; };
-  DALY = derive2 { name="DALY"; version="1.4.0"; sha256="1gx4q24149q1ipsrinswrm37z1nf4swgq188zsc1xifmw9l28v11"; depends=[]; };
+  DAISIE = derive2 { name="DAISIE"; version="1.2"; sha256="0570q8bs2464516ink56a1ir4p5chdwnj1vygywn9lgc7n4dricd"; depends=[DDD deSolve subplex]; };
+  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.3"; sha256="0d6fkg0c5a2jx1khv013lmahx5clyzab9w2dsi5zwxnf0jz5m8fc"; depends=[car effects gdata lattice MASS nnet pscl sm xtable]; };
+  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]; };
   DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
-  DBI = derive2 { name="DBI"; version="0.3.1"; sha256="0xj5baxwnhl23rd5nskhjvranrwrc68f3xlyrklglipi41bm69hw"; depends=[]; };
+  DBI = derive2 { name="DBI"; version="0.5-1"; sha256="1idwm9lkmz6ns6h0vvgml18mg0k7vjqiv9p5svrdcmx7r1rirpdi"; 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]; };
+  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]; };
+  DCM = derive2 { name="DCM"; version="0.1.1"; sha256="191gwfv30hdr789jmdrimcc7aqisz635anydsw2v4s28a3zjbipw"; depends=[gWidgets pander readxl]; };
   DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; };
-  DCchoice = derive2 { name="DCchoice"; version="0.0.14"; sha256="0w2s4wqla39g8dbvnq01lmxl2zfg4znl37z8if6y00clynlnphxs"; depends=[Formula interval MASS]; };
+  DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; };
   DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
-  DDD = derive2 { name="DDD"; version="3.2"; sha256="1d1va8qpzii5538zg9j5kf7i3hh90a2gdndhj35qvdgldwqj4rhh"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; };
-  DDHFm = derive2 { name="DDHFm"; version="1.1.1"; sha256="03zs2zbrhjcb321baghva7b8y61c8p9z6bfj2vg9cvadpb0260nk"; depends=[]; };
+  DClusterm = derive2 { name="DClusterm"; version="0.1"; sha256="0xkl4677vqy4sdkm0fczscqszjxk1kfmlbzdgm88shcnjzjg71d8"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
+  DDD = derive2 { name="DDD"; version="3.3"; sha256="1rjk35gz8zq0xprzag9nzfs569pm7nhl7bfrvcnapigd2h7gw612"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; };
+  DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; };
   DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; };
-  DDRTree = derive2 { name="DDRTree"; version="0.1.3"; sha256="08h89pm1n8c8yvkm5qx2aqhz3c3x1ljy551gsq5waxjvmq06k8fy"; depends=[BH irlba Rcpp RcppEigen]; };
+  DDRTree = derive2 { name="DDRTree"; version="0.1.4"; sha256="02z4j777yxqp09gxwzmn6x5fjz4rbsp1lh4qj20vgdjp8wcn3pn0"; depends=[BH irlba Rcpp RcppEigen]; };
   DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; };
   DEEPR = derive2 { name="DEEPR"; version="0.1"; sha256="0q8970q3gpjxwxdf2bkhpnqrxpm00w27b20a9sn9vv314rn1n7s8"; depends=[dirmult]; };
   DEMEtics = derive2 { name="DEMEtics"; version="0.8-7"; sha256="1s59qim60d4gp5rxjacdbmxdbpdm7cy9samn088w8fs0q232vjjx"; depends=[]; };
   DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; };
-  DESP = derive2 { name="DESP"; version="0.1-6"; sha256="0gzhzchliwsjynsj9jrwrxdg5is3ph0inibfips7526ry1bfj93x"; depends=[graph MASS Matrix RBGL SparseM]; };
+  DESP = derive2 { name="DESP"; version="0.2-2"; sha256="1s5x6x36ra83izcyrgdzc26a02cbbgy3xxn32sl30z6srys1j3j3"; depends=[graph MASS Matrix RBGL SparseM]; };
   DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; };
-  DEoptim = derive2 { name="DEoptim"; version="2.2-3"; sha256="0pcs7kkhad139c3nhmg7bkac1av4siknfg59lpknwwrsxbz208dg"; depends=[]; };
-  DEoptimR = derive2 { name="DEoptimR"; version="1.0-4"; sha256="1cmyni2a4hfgfx0jfdxrkjlmhqb8rksk0vwnxsaz13k95pc473cv"; depends=[]; };
-  DFIT = derive2 { name="DFIT"; version="1.0-2"; sha256="1kn3av6pnkmf9703yp3cn0zbdzjzxrlm6nbbcg7lwv9550jw2c4n"; depends=[ggplot2 mvtnorm simex]; };
-  DIFboost = derive2 { name="DIFboost"; version="0.1"; sha256="1wms7k1h09an46zi0sx2qi83zhzhqc864abnxn5iybv5g72xj89k"; depends=[mboost penalized stabs]; };
-  DIFlasso = derive2 { name="DIFlasso"; version="1.0-1"; sha256="048d5x9nzksphsdk9lwfagl165bb40r0pvjq2ihvhqvxspgpar4b"; depends=[grplasso miscTools penalized]; };
-  DIFtree = derive2 { name="DIFtree"; version="2.0.1"; sha256="0mm9v1sg6n0mdrplnpxflhzg5diksdns3wd8h24drzb8ww9mvfri"; depends=[penalized plotrix]; };
+  DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; };
+  DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; };
+  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]; };
+  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]; };
   DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
-  DIRECT = derive2 { name="DIRECT"; version="1.0"; sha256="129bx45zmd6h7j6ilbzj2hjg4bcdc08dvm2igggi8ajndl1l5q9j"; depends=[]; };
-  DJL = derive2 { name="DJL"; version="2.0"; sha256="06m7r6qvphzjkpp83ync3666p7rac5p81c3hqk5mhr9iykfzrh0f"; depends=[car combinat lpSolveAPI]; };
-  DLMtool = derive2 { name="DLMtool"; version="3.1"; sha256="1ir04s2npgdy30550gbfccjv5jzsh54qm5g4pw97y24i6qag1qcq"; depends=[boot MASS snowfall]; };
+  DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; };
+  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]; };
   DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
+  DMRMark = derive2 { name="DMRMark"; version="1.0"; sha256="09bw1iyyc4hqy6cjbci736zh0qzdfzk1s90in93f7s967d73mj8w"; 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]; };
-  DNAtools = derive2 { name="DNAtools"; version="0.1-21"; sha256="1ncx2rmxb0ip804x6xznfv8brjpp518fhnm1653mlrsl3hpzrh88"; depends=[multicool Rcpp Rsolnp]; };
+  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]; };
   DNMF = derive2 { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; };
-  DOBAD = derive2 { name="DOBAD"; version="1.0.4"; sha256="1hslwgs4q05xm29my5cq6g3vvjc0arvdmlx734wardj9dy29p1v5"; depends=[lattice numDeriv]; };
+  DOBAD = derive2 { name="DOBAD"; version="1.0.5"; sha256="0nvjs4vsbl1db4g0yyrqyllawhvrzv1lgs6gmn49iqvajxyrpnvi"; depends=[lattice numDeriv]; };
+  DODR = derive2 { name="DODR"; version="0.99.2"; sha256="16ia9j8vab8n2i6a17wz8nfvkfgj2gsyhxvwgxvjg2cz99hsbhdj"; depends=[Matrix npsm Rfit]; };
+  DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; };
   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]; };
   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]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
   DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
-  DSsim = derive2 { name="DSsim"; version="1.0.4"; sha256="0mdz8m0s03cj4br8w7h493vaks37lr2qg7zjmf03qpnjdppnbnmb"; depends=[mgcv mrds shapefiles splancs]; };
+  DSsim = derive2 { name="DSsim"; version="1.1.1"; sha256="1av7dvzqarap1b21cq4mhv494yh1wdxa2vi5gkvb1f9mhlx0v70c"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; };
   DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; };
   DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; };
-  DT = derive2 { name="DT"; version="0.1"; sha256="0mj7iiy1gglw7kixybmb7kr1bcl5r006zcb3klkw7p6vvvzdm6qj"; depends=[htmltools htmlwidgets magrittr]; };
+  DT = derive2 { name="DT"; version="0.2"; sha256="1g86p0jcjqi2ph5rhm45jkzibsa6yfcj8n5cg3giy90sqgjzkdx1"; depends=[htmltools htmlwidgets magrittr]; };
   DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
   DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
   DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
   DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
+  DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
   DTRlearn = derive2 { name="DTRlearn"; version="1.2"; sha256="1dakwlafs27nkjsiknnwxnb2hgc2xdpi5mb6dmzpjig7hg2f8d3f"; depends=[ggplot2 glmnet kernlab MASS]; };
-  DTRreg = derive2 { name="DTRreg"; version="1.0"; sha256="0ry6n9hl5j1s4j8n9zqvh87qbm4vm8hvix61js1zfys42hnv10af"; depends=[]; };
-  DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.5"; sha256="0b8wv1vz1xr7czcnva9lg69gpsryx6n1g0s901vxdriycacmyhqg"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
-  DWreg = derive2 { name="DWreg"; version="1.0"; sha256="0nws1gr5w7rwl4agkmz98y5ljmbipwryg81kc8mn1y8ppnpx02m0"; depends=[DiscreteWeibull Ecdat maxLik]; };
+  DTRreg = derive2 { name="DTRreg"; version="1.1"; sha256="113m1zhhfyjxl1b0ibjamfcpfii3sp32im4mj8lk2ql2mqw7j9yd"; depends=[]; };
+  DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.6"; sha256="0r3wjkr6grrh4nybrg0rs9ialrppjsdjshb47m0knn48vi0iwm77"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
+  DWreg = derive2 { name="DWreg"; version="2.0"; sha256="0bgahzgcxz86n0ady97l48zyahv3p2iyc2ivbij1xrfx3wcx3b5n"; depends=[DiscreteWeibull Ecdat maxLik survival]; };
   DYM = derive2 { name="DYM"; version="0.2"; sha256="1rk0xs224xi68f0mrygny2rklggl4grk866q7y9xck38bwy7aw94"; depends=[]; };
   Daim = derive2 { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
-  Dark = derive2 { name="Dark"; version="0.9.4"; sha256="0paw34zhbi8k6pjgykxxqhpjgl8qr340dv091r9931q4mm215j2n"; depends=[]; };
+  DamiaNN = derive2 { name="DamiaNN"; version="1.0.0"; sha256="09viy1lilz0b29s3myky03981bfnhxjxxgfhdah33cn5x682rbp4"; depends=[caret testthat]; };
+  DandEFA = derive2 { name="DandEFA"; version="1.6"; sha256="1ir1z76c8742vqdlwv35l4rhr0x7lhghz24g35zn7b30671lypf8"; depends=[gplots polycor]; };
+  Dark = derive2 { name="Dark"; version="0.9.8"; sha256="1f01aq4g50f07005c8k91cfy9hvl3fmb4yl2924d7512m3884xlv"; depends=[]; };
   DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
-  DataCombine = derive2 { name="DataCombine"; version="0.2.19"; sha256="0y7rrpfv4c63cf3v68y9bnwcx450cj9v66k8a53x62d88096f5pb"; depends=[data_table dplyr]; };
-  DataExplorer = derive2 { name="DataExplorer"; version="0.2.4"; sha256="0dz2lyn67cak9ada1ghy33zk72i9j4xbz9mjbf8xffwmsrmspi04"; depends=[data_table ggplot2 gridExtra reshape2 rmarkdown scales]; };
+  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]; };
+  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]; };
-  Davies = derive2 { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
-  DecisionCurve = derive2 { name="DecisionCurve"; version="1.1"; sha256="18966kynlpagrxciks8bxy6s31qq6zxy4vw6y24fa1axg1gfbxd9"; depends=[caret MASS pander reshape]; };
+  Datasmith = derive2 { name="Datasmith"; version="1.0-1"; sha256="1ba23b8a931pvml2dzw0zkm40akcl2lb6rps6bffrl7lvxiy35y1"; depends=[igraph lbfgs MASS Matrix nloptr truncnorm vegan]; };
+  Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; };
+  DeLorean = derive2 { name="DeLorean"; version="1.2.4"; sha256="1ja3kgw4rynsaaybq77axzp1m7sbqnv1pc7s9qsm1c7k6v3zjhfg"; depends=[broom coda dplyr fastICA functional ggplot2 kernlab MASS memoise Rcpp reshape2 rstan seriation stringr]; };
+  DecisionCurve = derive2 { name="DecisionCurve"; version="1.3"; sha256="1sigxhm9d9k2kxap43kpnlb0r8iqphslb7wxcp44k1cdnk192311"; depends=[caret MASS pander reshape]; };
+  DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; };
   Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; };
   DeducerExtras = derive2 { name="DeducerExtras"; version="1.7"; sha256="0sngsq31469a74y7nhskl82fwy2i0ga68m9g6b1xyhxz1a8kgvlg"; depends=[Deducer irr rJava]; };
   DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; };
@@ -532,97 +680,118 @@ 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="2.2-3"; sha256="0iw9y4582rf736jpllw3lc24cqa4q07q9432xdxp4cl5qwgkk40l"; depends=[Rcpp]; };
-  Demerelate = derive2 { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmij5ldrmhcn12s9yxd0rargc5vzvkrwcqpkgylkn"; depends=[Formula fts mlogit sfsmisc vegan]; };
+  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]; };
   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.6.1"; sha256="06m0c0fxsn7yaw0z8l9bgcr6smw690wbvnk23iikkkshygp6jhrd"; depends=[]; };
-  DescTools = derive2 { name="DescTools"; version="0.99.16"; sha256="1k7r6vfcpgz93qpyqbczl40zb194nzhh3l4kng4fzpqr56wp3s7w"; depends=[BH boot foreign manipulate mvtnorm Rcpp]; };
+  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]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; };
-  DetMCD = derive2 { name="DetMCD"; version="0.0.3"; sha256="1rxc6d1m5i6a73cxf66kpk687b7dwk8bhji97vbzrz19r8hwqq2b"; depends=[pcaPP Rcpp RcppEigen robustbase]; };
+  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]; };
   DetSel = derive2 { name="DetSel"; version="1.0.2"; sha256="0igkccclmjwzk7sl414zlhiykym0qwaz5p76wf4i7yrpjgk7mhl9"; depends=[ash]; };
   Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; };
   DiagTest3Grp = derive2 { name="DiagTest3Grp"; version="1.6"; sha256="04dxyyqv333rkjf2vlfpal59m7klhw6y7qilym6nw78qb1kqqys7"; depends=[car gplots KernSmooth]; };
-  DiagrammeR = derive2 { name="DiagrammeR"; version="0.8.2"; sha256="0zjziph3xri9w277bi9b54n00mv7pmrygk155xzfcwvrix4g8868"; depends=[htmlwidgets rstudioapi scales stringr visNetwork]; };
+  DiagrammeR = derive2 { name="DiagrammeR"; version="0.9.0"; sha256="09j6h733wm0b9k8l8va2fav6h5cxz6z07kwp29hfxgsjd97rchlg"; depends=[dplyr htmlwidgets igraph influenceR magrittr RColorBrewer rgexf rstudioapi scales stringr tibble viridis visNetwork]; };
   DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; };
+  DiallelAnalysisR = derive2 { name="DiallelAnalysisR"; version="0.1.1"; sha256="1diwzckn0f2dv0vj2mdzy7k3md6j472xzj82ip23adwr27vlfsi3"; depends=[ggplot2]; };
   DiceDesign = derive2 { name="DiceDesign"; version="1.7"; sha256="05bmscy275077kmbmg75npnmw30kd5x5wmlizcfq771zixby3f7h"; depends=[]; };
   DiceEval = derive2 { name="DiceEval"; version="1.4"; sha256="06p3v161ig714k7z59iji64xhxw1a68kqhnlwhwpjpyrx7kn137b"; depends=[DiceKriging]; };
   DiceKriging = derive2 { name="DiceKriging"; version="1.5.5"; sha256="035kbk633v4kfb44wiyb556sayl73c24fc1w09r3f33shqgidzjm"; depends=[]; };
-  DiceOptim = derive2 { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging lhs MASS mnormt rgenoud]; };
+  DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; };
   DiceView = derive2 { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceEval DiceKriging rgl]; };
+  DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; };
   DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; };
-  DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.2"; sha256="19mzrsra290lapznlh9pvr4pzrapfa28pa10j8dyqnsfx3dc5r4c"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
-  DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.0"; sha256="0nha6hq3fa04ymxk8hplgff7fnlrc7hx0iyws1nkgih4va6mx815"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
+  DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
+  DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
+  DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
-  Directional = derive2 { name="Directional"; version="1.8"; sha256="1q1fpzp83980lg04mq90kcffh3jjfp2jx3x4bc5bj6mclhpymxam"; depends=[abind doParallel fields foreach MASS]; };
+  DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
+  Directional = derive2 { name="Directional"; version="2.4"; sha256="1yrk0x4dydsx82415kv6a2asbd1d06ac7vyqi5j6rm4sa5cp6qmb"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; };
   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.1"; sha256="0w0s2fixpcmcwids35xx91hll9rf9qbi7155sp90dxd3vr8c939v"; depends=[Rsolnp]; };
-  DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1"; sha256="1pcq4kggy1z88a0car53d0f69rx2qg7q104cr0bxi6yllrb3q0nr"; depends=[Rsolnp]; };
+  DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; };
+  DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; };
   DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; };
   DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; };
-  DisimForMixed = derive2 { name="DisimForMixed"; version="0.1"; sha256="1kl6n1i7si0r2rabxcfd78971p3ykxkq3w66ra1flzjn8gs6li38"; depends=[cluster dplyr]; };
-  Distance = derive2 { name="Distance"; version="0.9.4"; sha256="18iip9xny2vazpah96qziqwql4hnxg2m8hyjhh8b34w29jv0nsm5"; depends=[mrds]; };
+  DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; };
+  Distance = derive2 { name="Distance"; version="0.9.6"; sha256="165spw4hfyjpgfwg3z5wi69spfb1x3xzag4phwrqhsnp8wb4b619"; depends=[mrds]; };
   DistatisR = derive2 { name="DistatisR"; version="1.0"; sha256="1il00v26q68h5dd5c9lm2jblgn8hs6n0457r13mlw6r7pcj0158j"; depends=[car prettyGraphs]; };
   DistributionUtils = derive2 { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
   DivE = derive2 { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
   DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
-  DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.2"; sha256="0cv0cw24x00gfy7hx97fz82j6smcmc9w9vsig00bb3ip3ba1d4y8"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
+  DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.5"; sha256="009fy4c11w0p30jpd94vj020pnrzm8z2iwlhkdij1f14ifpamzv2"; 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.28"; sha256="0w68gg1829dhfm4valw66ld4ccapygpcpds7j2mnmlq9g4l847ca"; depends=[combinat conf_design MASS vcd]; };
+  DoE_base = derive2 { name="DoE.base"; version="0.29"; sha256="013p4y7imf6nb1mq7dx62c0nq5shf1yzdlfbri86icrdm00s63fd"; 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=[]; };
-  Dominance = derive2 { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[chron gdata igraph]; };
-  DoseFinding = derive2 { name="DoseFinding"; version="0.9-14"; sha256="04f0v3vcw0p10ahi2cyqndfwjqgvmp8ghxc3nmikhw7prp9yimzn"; depends=[lattice mvtnorm]; };
+  Dominance = derive2 { name="Dominance"; version="1.0.17"; sha256="07xsyadmq47szvp1vnf53ijq43pwd9g7554fgl803fhkwq6b3jgh"; depends=[chron gdata igraph XLConnect]; };
+  DoseFinding = derive2 { name="DoseFinding"; version="0.9-15"; sha256="0sc3z62jn2jh6kjacqpf9vnpv0wzihcln24m5ipspmz0n1b0nvz7"; depends=[lattice mvtnorm]; };
   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]; };
-  DrugClust = derive2 { name="DrugClust"; version="0.1"; sha256="1p3pxc1qxp26sxa52877dq1mf3nwx7vbvcr8d1i8ccmhmccayrdb"; depends=[cclust cluster e1071 MESS ROCR]; };
+  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]; };
   DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; };
-  DynNom = derive2 { name="DynNom"; version="2.0"; sha256="1ckdx2cn5ylsks65ydlhjcqsvpdbm6hwm67snqn9zj4isqb017sf"; depends=[compare ggplot2 shiny stargazer survival]; };
+  DynNom = derive2 { name="DynNom"; version="4.0"; sha256="16xsgm6nb8qdk5j0srh6w7jda807sh3m73p0sbvvb5h4rf8vdy06"; depends=[BBmisc compare ggplot2 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=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
   EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; };
-  EBS = derive2 { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk7wqwzqrbs589dkll24sn5b"; depends=[MASS]; };
+  EBS = derive2 { name="EBS"; version="3.1"; sha256="0flj62lcshrcn5n4fmssgb2qdvg0l6r71rsn3h0clfjhbg96pqz5"; depends=[MASS]; };
   EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; };
+  EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
   ECOSolveR = derive2 { name="ECOSolveR"; version="0.2"; sha256="1y9gl6gd8im7zhn5j4vhzk0ck620n4l9kwgxig2r27q6h652fqn9"; depends=[Matrix]; };
-  ECctmc = derive2 { name="ECctmc"; version="0.1.0"; sha256="09m0hfiji488nkk5b6dbylk5a06a27gzrzaa81v8gfb5mp7vy890"; depends=[Rcpp RcppArmadillo]; };
+  ECctmc = derive2 { name="ECctmc"; version="0.2.3"; sha256="1iplg647qs52007h4vx507s643h7knisravif3v6rfyp6fhfl7v2"; depends=[Rcpp RcppArmadillo]; };
+  ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.5"; sha256="0ml623q679id989gbr9k52719blgbhfcsrzi9xaqzvwcg5qq9bi5"; depends=[jsonlite shiny]; };
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
-  EDISON = derive2 { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
-  EDR = derive2 { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
-  EEM = derive2 { name="EEM"; version="1.0.4"; sha256="15rs8bfpfz97q133fas21ghgyppw1rl526fs1dxmhn64bvzsr37j"; depends=[colorRamps R_utils readxl reshape2 sp]; };
+  EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; };
+  EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; };
+  EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; };
+  EFAutilities = derive2 { name="EFAutilities"; version="0.1.0"; sha256="1kbbhwvqj6c5n2nknjy7kfm4i0zhil5x8rsl1k4xh1zcvnlj22bs"; depends=[GPArotation mvtnorm]; };
   EFDR = derive2 { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; };
-  EGRET = derive2 { name="EGRET"; version="2.4.3"; sha256="07b68jk2jakacdcs4siy4smq4d5afjckq5xas1aqq42nzwqlfz65"; depends=[dataRetrieval fields lubridate survival]; };
-  EGRETci = derive2 { name="EGRETci"; version="1.0.0"; sha256="1pz0l59hm7yy30p6albx3b4nm1qfbphj9jkz79a5mljk1fx8dbrz"; depends=[binom EGRET lubridate]; };
+  EFS = derive2 { name="EFS"; version="1.0.1"; sha256="0zjspy4myxi1z16pbs515c8zylkbykdadsqkgdd9k0pr0mb7cnck"; depends=[party pROC randomForest ROCR]; };
+  EGRET = derive2 { name="EGRET"; version="2.6.0"; sha256="0alr47pmq1ml64j500vkqwmvrqa3i1ccbf3w7w44fbbjy1vfp04a"; depends=[dataRetrieval fields lubridate survival truncnorm]; };
+  EGRETci = derive2 { name="EGRETci"; version="1.0.2"; sha256="15jf4bgxvqqz64y4i6ncfj0ymgwmhahxlhdnfps4zj7gwxgcbvqh"; depends=[binom EGRET lubridate]; };
   EIAdata = derive2 { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[plyr XML xts zoo]; };
   EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
   EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
   ELMR = derive2 { name="ELMR"; version="1.0"; sha256="0pd3drv485xbdyfwm28kjpd0nd0zv1khfwzki1gh5p1gz9ndwr2x"; depends=[]; };
-  ELT = derive2 { name="ELT"; version="1.5"; sha256="1nrq3dmlgh793ax12a1bm85h5kcrs99qjxiqa1qp9caq4zr3mzdg"; depends=[lattice latticeExtra locfit xlsx]; };
+  ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; };
   ELYP = derive2 { name="ELYP"; version="0.7-3"; sha256="1d91r59m85k91kcjjlvhvbsa9855fyd702bwj7drvk36ssfr8qb9"; depends=[survival]; };
-  EMA = derive2 { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[affy AnnotationDbi biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; };
+  EMA = derive2 { name="EMA"; version="1.4.5"; sha256="16iq5a3yrilchqmkyb4g5bmmgpw6psm88n52gmlax75xbiwk8261"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; };
   EMC = derive2 { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[MASS mvtnorm]; };
-  EMCluster = derive2 { name="EMCluster"; version="0.2-5"; sha256="0nzbpx5pl414bpdqhfr4zv3gkrd77ifl1ysb4acw4h7f92hcd4lh"; depends=[MASS Matrix]; };
+  EMCluster = derive2 { name="EMCluster"; version="0.2-6"; sha256="1sd6vlli7qr4859hydyshkzrrfkgb05k97y3vhx3dp2q5xz8s52b"; depends=[MASS Matrix]; };
   EMD = derive2 { name="EMD"; version="1.5.7"; sha256="0m2g7akg9h964d6qr1mj20h9pcb2fcmala3skhl0qpy8qz01w5ck"; depends=[fields locfit]; };
+  EML = derive2 { name="EML"; version="1.0.1"; sha256="0q5s4gwc3g49v43ffnn7lh5lyxg9bnhcigxwinc1gbry5j8crngv"; depends=[stringr XML]; };
   EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; };
   EMMIXcontrasts = derive2 { name="EMMIXcontrasts"; version="1.0.0"; sha256="1q7bwf7kkpraj38lz5s1lhhghp7a5lzyj5b9x8024g6rh2qlwp7v"; depends=[]; };
+  EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-4"; sha256="0gzy3nrqw880p4sr08qfbyyjqgq08brfm9pk7xkibdnvlrl6mld2"; depends=[MASS mnormt rgl]; };
   EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[KernSmooth lattice mvtnorm]; };
   EMMIXuskew = derive2 { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
+  EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; };
   EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; };
   EMP = derive2 { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; };
+  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=[]; };
-  EMbC = derive2 { name="EMbC"; version="1.9.4"; sha256="1an5585sfc0h5vxd964d28yz6awbx4bbfzaia0v90jmkf9k0apca"; depends=[maptools mnormt move RColorBrewer sp]; };
-  ENMeval = derive2 { name="ENMeval"; version="0.2.1"; sha256="1m0h0zi3bxyabj1lq4jh3sbfiy9lbzgxafmy9j4nii7n1f7pf3rq"; depends=[dismo doParallel foreach raster rJava]; };
-  ENiRG = derive2 { name="ENiRG"; version="0.1"; sha256="1cnl1mjl5y1rc6fv7c9jw2lkm898l3flfrj3idx9v1brjzyx5xlf"; depends=[ade4 fgui gdata miniGUI R_utils raster sp spgrass6]; };
+  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]; };
   ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; };
-  EPGLM = derive2 { name="EPGLM"; version="1.1.1"; sha256="1lbzp36lbk9gnbrqxyxgrdrn8rmi5vdxnqxpqdfd09dck263gy6p"; depends=[BH MASS Rcpp RcppArmadillo]; };
+  EPGLM = derive2 { name="EPGLM"; version="1.1.2"; sha256="1x7n16pjr38gh5llraszjwgm650zmcm14j6v1kc5k81g4ghgdsq6"; depends=[BH MASS Rcpp RcppArmadillo]; };
   EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
   ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; };
   ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
@@ -630,50 +799,58 @@ in with self; {
   ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
   ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; };
   ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; };
-  ETAS = derive2 { name="ETAS"; version="0.2"; sha256="0vj2ghxs43x81p0zmz2z52mlibs6rmqizd5ydhs382w689krhr80"; depends=[maps spatstat]; };
+  ETAS = derive2 { name="ETAS"; version="0.4.1"; sha256="1zaz75r4vp79szsa4la81jahci04iiv7kpqlka1zllgpg4qkg4bw"; depends=[fields maps Rcpp spatstat]; };
   ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
   ETLUtils = derive2 { name="ETLUtils"; version="1.3"; sha256="13xq9i9fr34kx1nym7nr02gynshzm4jjn4qzx6ydg044b7xl57jp"; depends=[bit ff]; };
   EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
   EWGoF = derive2 { name="EWGoF"; version="2.1"; sha256="10p392n003sxn8l9sfnksi789k1w191rmkah6gxhji5f41gib5rh"; depends=[Rcpp]; };
+  EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; };
   EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; };
   EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; };
   EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; };
   EasyStrata = derive2 { name="EasyStrata"; version="8.6"; sha256="0agmap9lmqbpfw8ijwxmjkcqjvc1ng0jsadkqpfz71a963nkqdcl"; depends=[Cairo plotrix]; };
   EbayesThresh = derive2 { name="EbayesThresh"; version="1.3.2"; sha256="0n7cr917jrvmgwfqki7shvz9g9zpmbz9z8hm5ax7s8nnfzphrh4g"; depends=[]; };
-  Ecdat = derive2 { name="Ecdat"; version="0.2-9"; sha256="076di40cvfzm7zkj5f08zlk1wizzi7syfp0ghsrr4q61n5c1r72b"; depends=[Ecfun]; };
-  Ecfun = derive2 { name="Ecfun"; version="0.1-6"; sha256="1mz2smbxyjzc6vf3vhycgvjwqq6hr22vxikrl0hx185qxgwbgrxn"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML]; };
-  EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.0-2"; sha256="1c2pz2a8f57fhq0sk4jgfi4v8jwznsjaqx4jnziz3lak7gmcrwql"; depends=[ggplot2 party raster reshape2 rgdal rkt SoDA sp]; };
+  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]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
   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="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; };
-  EditImputeCont = derive2 { name="EditImputeCont"; version="1.0.1"; sha256="0c2gagvih77a0k0lg42xipmd396fdpwjabc1syyb3i16b853xggm"; depends=[editrules Rcpp]; };
-  EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-1"; sha256="1lqgvs75airbmmwqhf6zfw1mpvy9dj51f92jx78mkp35ynnlny1i"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
-  EffectStars = derive2 { name="EffectStars"; version="1.6"; sha256="0chwbvsjfq6flxrbwfm141rnky9b8l1b0scqxxxijyrw4y0f4a8z"; depends=[VGAM]; };
-  EffectTreat = derive2 { name="EffectTreat"; version="0.2"; sha256="0az4ajqq98adxrr1wj8pkv16f2g4gg3dikizvp7qa1amcnpahjx3"; depends=[]; };
+  EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; };
+  EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; };
+  EditImputeCont = derive2 { name="EditImputeCont"; version="1.0.2"; sha256="1l847892grqp1zf8lbvhxcimw06xcmikyry0wn1wf3l4hw4hiamv"; depends=[editrules Rcpp]; };
+  EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-2"; sha256="1vkg5gi0gysnw0gz9ah8pdnnlkdfsz0jy53ps2jnnpy8lbr45zc9"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
+  EffectStars = derive2 { name="EffectStars"; version="1.7"; sha256="068hk7l7arnj7qrcsavvki06rwrivkmz82mddhndx9vzbiidiklm"; depends=[VGAM]; };
+  EffectStars2 = derive2 { name="EffectStars2"; version="0.1-1"; sha256="1yffwnr563vzdq0ph9xs3w0zg5c7l3ima6skn8cqiafr21w332ss"; depends=[miscTools VGAM]; };
+  EffectTreat = derive2 { name="EffectTreat"; version="0.3"; sha256="1y8b1867idjbd7i39hhryg4nyijlv6d828z0jspp80fka3sp8xpw"; depends=[]; };
   EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
+  EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.0"; sha256="07d1da73z16swz4dw2g1mcx1k80yghd6nb9818zax61f37wjmin1"; depends=[]; };
   ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26"; sha256="0r8d0fm4yx7iawcsikksd7i01kbyqz3xkdls74f3ngkvj4iq1rqc"; depends=[]; };
   EloChoice = derive2 { name="EloChoice"; version="0.29"; sha256="1r54laim7i8hzgyir47xq7qw8hxzsdw1ss10sljq1rm2lpsci6wk"; depends=[Rcpp RcppArmadillo]; };
   EloRating = derive2 { name="EloRating"; version="0.43"; sha256="0gzpi4qjiqn0lzjwy37pkz6fg7dkp2hv2dfqgzfk32wsj0bswgab"; depends=[zoo]; };
   ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; };
-  EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.1.0"; sha256="0l5xmsldc33v6y7f4s6a182axgm2p68nymx5hbj5bb09dxjbb9gg"; depends=[ggplot2 MASS]; };
+  EmiStatR = derive2 { name="EmiStatR"; version="1.2.0"; sha256="0g1bs8018vxgnwb578iz5nin13khk7wjj0in47y250j2kcz5nvgn"; depends=[doParallel foreach lattice shiny]; };
+  EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="1.2.0"; sha256="034rvdfvqqx4prdchdpl04iyd37h37j3gxfscm8idi35nannjph0"; depends=[ggplot2]; };
   EnQuireR = derive2 { name="EnQuireR"; version="0.10"; sha256="00kyclcr8da79lwpqa1vzkwn6pgf197h2biackwgphb0byhi8ssx"; depends=[FactoMineR MASS Rcmdr SensoMineR]; };
   EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; };
-  EnsembleBase = derive2 { name="EnsembleBase"; version="1.0.1"; sha256="0vyg4lhal05s0fjz21pdk144a3j06594jalcmic1y6adq7dc2inq"; depends=[bartMachine doParallel e1071 foreach gbm glmnet kknn nnet randomForest]; };
-  EnsembleCV = derive2 { name="EnsembleCV"; version="0.7.1"; sha256="14mvwfjbhsrq9q7k5ph5sf9zriazgfby376v1zjm82r93y4samsf"; depends=[EnsembleBase]; };
-  EnsemblePCReg = derive2 { name="EnsemblePCReg"; version="1.0.0"; sha256="16k7ki8qq9bci46dga6visrpccia5rhlv3zq4jj936wkl3q28288"; depends=[EnsembleBase]; };
-  EnsemblePenReg = derive2 { name="EnsemblePenReg"; version="0.6"; sha256="0fjp50jbnbhvyd7srvhy0ipysm192d8ikg9yra2vch33zrid2xbm"; depends=[EnsembleBase glmnet]; };
+  EnsCat = derive2 { name="EnsCat"; version="1.1"; sha256="1rp354fqq2ihjrmqw9j1qdy86md80xml5sgh2zbyabw3zddmgyn2"; depends=[dendextend ggdendro ggplot2 seqinr]; };
+  EnsembleBase = derive2 { name="EnsembleBase"; version="1.0.2"; sha256="1wbkh89gz6m2m9hxbcymsymz3b7pynhdwfyq4qg3h4wn8409anxy"; depends=[bartMachine doParallel e1071 foreach gbm glmnet kknn nnet randomForest]; };
+  EnsembleCV = derive2 { name="EnsembleCV"; version="0.8"; sha256="1r9nmi2278lrwp5lpxhi78k10x8a5f5rh9xf1z5gfkc0bmpkhkvz"; depends=[EnsembleBase]; };
+  EnsemblePCReg = derive2 { name="EnsemblePCReg"; version="1.1.1"; sha256="1x9n8wjr2cdmlc36c2g7sra7f0cjmgwiyxvll9byfm1lncni2kn9"; depends=[EnsembleBase]; };
+  EnsemblePenReg = derive2 { name="EnsemblePenReg"; version="0.7"; sha256="00218yh0vzlb5g94asq5nz4i8blppskdzz9fl4c0v3fld3kxz2md"; depends=[EnsembleBase glmnet]; };
   EntropyEstimation = derive2 { name="EntropyEstimation"; version="1.2"; sha256="13kb83lfpkw6yq687j0ci23yn5c9dqjibybyyaplk6jixy08lrvy"; depends=[]; };
   EntropyExplorer = derive2 { name="EntropyExplorer"; version="1.1"; sha256="02ljnq9ayxg4lrrnb6nlxr1k5ki8dd5i8hjb9fvvb19hwr2id5h4"; depends=[]; };
-  EnvNicheR = derive2 { name="EnvNicheR"; version="1.3"; sha256="1j5r6nv1m1jc76jz45snxc2cidm8cxcx11dv4k4hk46bmp60iq7p"; depends=[IDPmisc]; };
-  EnvStats = derive2 { name="EnvStats"; version="2.0.2"; sha256="0lr6znl1cz7a08h31r3r095mlhdgwknj469vd7mb1y95807y8g38"; depends=[MASS]; };
+  EnvCpt = derive2 { name="EnvCpt"; version="0.1.1"; sha256="052yz26lypcffwnxdqxm2d029rzcdkw5dvf2xyvyhi5lcnxjrn9r"; depends=[changepoint forecast MASS zoo]; };
+  EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; };
+  EnvStats = derive2 { name="EnvStats"; version="2.2.1"; sha256="0gjjw2pvqh4m18f7m0pkcr1lsryqmfai1kqc34146h1a4wv7gbdv"; depends=[ggplot2 MASS]; };
   EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; };
-  Epi = derive2 { name="Epi"; version="2.0"; sha256="04ahl3hvbzjx56c063crq52jmcp5vil5h95bk2vzf4xifhxalspm"; depends=[cmprsk etm MASS plyr survival]; };
+  Epi = derive2 { name="Epi"; version="2.7"; sha256="0pc1k9xr6ghm7v4cpi8qkz0b3xbq6yy4r3fqjlqly16rsvznnpcr"; 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.9.1"; sha256="10yd24xcydn03rq9kcqcxj5gn25v54ljsm9mgc206g9wf1xx0wjf"; depends=[]; };
+  EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.10.0"; sha256="0x0ah55nx68mq05hpp29g9h21is3kx9d84r82j4x4asyqjv92s7v"; depends=[]; };
   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.5"; sha256="1wydqifaw4kh6lfhapiar2xv2r1bcccb6j6kcmd5cppr2hsl2agc"; depends=[ape deSolve doParallel ergm foreach network networkDynamic RColorBrewer tergm]; };
+  EpiModel = derive2 { name="EpiModel"; version="1.2.8"; sha256="1h4mspa7yi2z7rj98nzs3ay2m7gccv7bp63p9sjnqp08pdwk3x5y"; 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]; };
@@ -681,31 +858,33 @@ in with self; {
   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]; };
-  Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.8"; sha256="135lsn8d5zwk7fljj9ccw7c0bnkddwdfdbjj8af21z5hnm3kl2lx"; depends=[zoo]; };
+  EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; };
+  Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.10"; sha256="0v8jjbmr9qqbn2k6jb7jcqmib89x2g7r8wkipxhb4bck0b0z5c0r"; depends=[zoo]; };
   EvoRAG = derive2 { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
   Evomorph = derive2 { name="Evomorph"; version="0.9"; sha256="1br2fyggwz2mxpic8sk384xq1lpbpv0j5gf6xyzhkn2n7kfpf6d5"; depends=[geomorph ggplot2 reshape2 stringr]; };
   ExPosition = derive2 { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
-  Exact = derive2 { name="Exact"; version="1.6"; sha256="0d5g5p98yrcd6v56iadsq448hl522shdqln2icmc3yfnya326as7"; depends=[]; };
+  Exact = derive2 { name="Exact"; version="1.7"; sha256="0d0h406w2l99gxq6pmh9crxxrvdidcajk7bqzmifl7nfb77vp1av"; depends=[]; };
   ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
   ExactPath = derive2 { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[lars ncvreg]; };
   ExceedanceTools = derive2 { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[SpatialTools splancs]; };
-  ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.8"; sha256="1vg5lqbk30gm3dq0hn6nihzxa7a1jqnfvm18r2w8dckc576ns6hf"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; };
+  ExomeDepth = derive2 { name="ExomeDepth"; version="1.1.10"; sha256="11lg1n9wls96cg1byj5bfircw4bsf0rbk37h8fl0hkh29m6gyy16"; depends=[aod Biostrings GenomicAlignments GenomicRanges IRanges Rsamtools VGAM]; };
+  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.0.2"; sha256="00hw95k64p7zwb9a9n89cyghb8l6rrh33xlciw6g2q1dcmdfxzqg"; depends=[CORElearn semiArtificial]; };
+  ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.1.4"; sha256="1n608qz2mj1x36kmbyi7lp0zp744bf9k1zq15yhdv8yy7pcdfl0d"; depends=[CORElearn semiArtificial]; };
   ExtDist = derive2 { name="ExtDist"; version="0.6-3"; sha256="1vsxm578bb70wnz3mxm7y1n5vs0x5pby99hvxg5y5ksh2g2ascwa"; depends=[numDeriv optimx]; };
-  ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.5.1"; sha256="0b67bap1ks3wq3m6wgr7splpn7wq635wslcks74xqzv0man4kh84"; depends=[Formula]; };
+  ExtremeBounds = derive2 { name="ExtremeBounds"; version="0.1.5.2"; sha256="010k2ddrrmrv4ayr009sm0vdgql5n1hy2b7rxyggj8iqsm8lkxim"; depends=[Formula]; };
   FACTMLE = derive2 { name="FACTMLE"; version="1.1"; sha256="0qz2i0hnn84bpps1h8jmfkgp5p59axr0wayj9dvl839radrvpqvy"; depends=[rARPACK]; };
   FACTscorer = derive2 { name="FACTscorer"; version="0.1.0"; sha256="1gbfpm5szi6w8iyp7ywpqrmdq0wrv5axj29sj9gxjwmjfh5qgqjx"; depends=[]; };
-  FADA = derive2 { name="FADA"; version="1.2"; sha256="1wpjqvhhgvirzcvl8r23iaw63wr8rys19mjy71mn24wg3zwnc2qz"; depends=[crossval elasticnet glmnet MASS mnormt sda sparseLDA]; };
+  FADA = derive2 { name="FADA"; version="1.3.2"; sha256="0093j4sgm1fv9bz9h9ldgaac0ggxwwk2qk46c7vxfh9zkmlm6zmb"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; };
   FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; };
   FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; };
   FAOSTAT = derive2 { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; };
   FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; };
   FAiR = derive2 { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[gWidgetsRGtk2 Matrix rgenoud rrcov]; };
   FAmle = derive2 { name="FAmle"; version="1.3.4"; sha256="0di9mmpsll7339cw1lss3jk4w1cyqhap6y72r793q8w3x14q0j9d"; depends=[mvtnorm]; };
-  FAwR = derive2 { name="FAwR"; version="1.1.0"; sha256="0566h9fgnnk8xankqkpvcshf8acr46lz84sf2pzlmasgvwh7xp19"; depends=[glpkAPI lattice MASS]; };
-  FBFsearch = derive2 { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo]; };
+  FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; };
+  FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; };
   FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
   FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; };
   FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; };
@@ -714,9 +893,10 @@ in with self; {
   FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; };
   FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; };
   FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; };
-  FDboost = derive2 { name="FDboost"; version="0.1-0"; sha256="01khx996wx0jk14dgzwy9ma38sdzxmspiw31rcqd6c26nzddsycs"; depends=[gamboostLSS MASS Matrix mboost mgcv refund zoo]; };
+  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]; };
   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=[]; };
@@ -724,97 +904,116 @@ in with self; {
   FHtest = derive2 { name="FHtest"; version="1.3"; sha256="1cay1cl1x4lias55vxc14caznggdw6j8vgqgkxfmvldnvjfljsq1"; depends=[interval KMsurv MASS perm survival]; };
   FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
   FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; };
-  FITSio = derive2 { name="FITSio"; version="2.0-0"; sha256="1gf3i1q9g81gydag2gj1wsy6wi5jj2v4j3lyrnh1n2g4kxd6s3cp"; depends=[]; };
+  FIT = derive2 { name="FIT"; version="0.0.4"; sha256="150lwqxzznmga5dbrxi12pjva7pvc7nsahs8w5wvibkasndxwxj9"; depends=[gglasso MASS Rcpp RcppEigen XML]; };
+  FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; };
   FKF = derive2 { name="FKF"; version="0.1.3"; sha256="01ibihca39zng4wrvhq8h28bmb2rnsjm21xy22b85kpn3mbnh7f1"; depends=[RUnit]; };
   FLIM = derive2 { name="FLIM"; version="1.2"; sha256="180az4zwmfcglmvismyacmh7ri4qg8jvhlisqpway0z5z6fsda6r"; depends=[MASS zoo]; };
   FLLat = derive2 { name="FLLat"; version="1.2"; sha256="0kdc269vsc94pi00n55196a20qiv6c5pxf2xrh34w4x2vkn5mbxz"; depends=[gplots]; };
   FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; };
-  FLSSS = derive2 { name="FLSSS"; version="3.1"; sha256="0cyrjq1b0s7x0dz3x2kvd7pr8v4lyw1324ik4rnbj9hv9mf1g0af"; depends=[Rcpp]; };
-  FME = derive2 { name="FME"; version="1.3.2"; sha256="1sjnsc8jbylb2bln5ic24s5bany3clzn44lqnymhsy81x88396ff"; depends=[coda deSolve MASS minpack_lm rootSolve]; };
+  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]; };
+  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=[]; };
+  FMsmsnReg = derive2 { name="FMsmsnReg"; version="1.0"; sha256="0d58n7lz8d6xgzvyznmhw1byshyiiwk8dc462qr18cl51p0lqnkv"; depends=[mvtnorm]; };
   FNN = derive2 { name="FNN"; version="1.1"; sha256="1kncmiaraq1mrykb9fj3fsxswabk3l71fnp1vks0x9aay5xfk8mj"; depends=[]; };
-  FPDclustering = derive2 { name="FPDclustering"; version="1.0"; sha256="078vvpn9lwza45l9k53m3yzhrkkyakm1ynm93x5yld4fgkrd3c33"; depends=[ThreeWay]; };
+  FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; };
+  FPDclustering = derive2 { name="FPDclustering"; version="1.1"; sha256="1zbf8y3b3scigqp7yiw0hq36lq6fzzvns331jxg5v62f4aj0g496"; depends=[ThreeWay]; };
   FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; };
-  FRAPO = derive2 { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qpd882cyjb0y0jl582fxd3a2ic7n14"; depends=[quadprog Rglpk timeSeries]; };
+  FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; };
   FRB = derive2 { name="FRB"; version="1.8"; sha256="13rp4gqldx84mngrdv5fa9xamkng7b3kgy30ywykcx46gmrym6ps"; depends=[corpcor rrcov]; };
   FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; };
-  FREGAT = derive2 { name="FREGAT"; version="1.0"; sha256="0fq431iclhp2jjfm3330sw0b73sl9bmzq35sa5nfyk19cg2s18z8"; depends=[Matrix]; };
+  FREGAT = derive2 { name="FREGAT"; version="1.0.2"; sha256="0axl2rgsq8n2p7c89gks3ipbgs2qpapypjdb1d1vb1ffph08fiik"; depends=[Matrix]; };
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
-  FRESA_CAD = derive2 { name="FRESA.CAD"; version="2.2.0"; sha256="18hgdxwfk59rd2pbkr0pxjb0d27x81sw7vwky66hvcdzywkdcia8"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
-  FSA = derive2 { name="FSA"; version="0.8.5"; sha256="1hnaq11i72zyq7v3d35v8m8ir59l5hmdws586c4dd8qykbzkqdlr"; depends=[car dplyr gdata gplots Hmisc plotrix plyr sciplot]; };
-  FSAdata = derive2 { name="FSAdata"; version="0.3.2"; sha256="1g682bj7xiaqcs6ax8jyg02lvx5c1qk0v6a6w0ma3f0qyk6ga7aq"; 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]; };
-  FSelector = derive2 { name="FSelector"; version="0.20"; sha256="0gbnm48x5myhxxw8gz7ck9sl41nj5rxq4gwifqk3l4kiqphywlpi"; depends=[digest entropy randomForest RWeka]; };
+  FSelector = derive2 { name="FSelector"; version="0.21"; sha256="0qk54b4svihwcmfdp5k8pcvy60568zlg4z2qqiawr7h4inzmvrlk"; depends=[digest entropy randomForest RWeka]; };
   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=[]; };
   FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; };
   FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; };
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
-  FactoClass = derive2 { name="FactoClass"; version="1.1.2"; sha256="0wg8n2vn586dj5g6js6c7rshsjibciyvg2j53mxgnn0f63xdb3ip"; depends=[ade4 xtable]; };
-  FactoMineR = derive2 { name="FactoMineR"; version="1.32"; sha256="1b7v350l2c3swlpqjsc9gh4aiahzqm8kkk9nhc8y4s591xn1rqdv"; depends=[car cluster data_table dplyr ellipse flashClust knitr lattice leaps MASS scatterplot3d]; };
-  Factoshiny = derive2 { name="Factoshiny"; version="1.0.2"; sha256="0wwsv0frn2d6a5l5lr9qzqglznaigc23bq7nhcbfy1wlvsmimnr3"; depends=[FactoMineR shiny]; };
-  Fahrmeir = derive2 { name="Fahrmeir"; version="2015.6.25"; sha256="1ca4m3m4jip7n489yywdfvh6nlhxspg5awxi23spgfnvhrcs9k3y"; depends=[]; };
-  FamEvent = derive2 { name="FamEvent"; version="1.1"; sha256="1z4dvsj0c07il6gj0nhdhy1ss07c0zbraf0gg0hz288k3j756c2v"; depends=[kinship2 MASS survival truncnorm]; };
+  FactoClass = derive2 { name="FactoClass"; version="1.1.3"; sha256="1vwjxzz8cdvshslx51vnvgybvmki2x3zfax2q6czxl8kacijdh9n"; depends=[ade4 xtable]; };
+  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]; };
+  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]; };
   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"; sha256="1x4qai8dycq5pk0q0s34yig30fxxw6vxw3cp87w361640ix95iqk"; depends=[]; };
+  FastImputation = derive2 { name="FastImputation"; version="1.3.1"; sha256="05rs5mzb7aww7x06zqn4q053jqxbrc185ra11brm0xkb02cc1dih"; depends=[]; };
   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]; };
   FastRCS = derive2 { name="FastRCS"; version="0.0.7"; sha256="1pszpmb5qki4cchd1pc0j6s4sfflaikbfrbisf6c2j9p8ssxxfgk"; depends=[matrixStats Rcpp RcppEigen]; };
   FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; };
-  FatTailsR = derive2 { name="FatTailsR"; version="1.6-0"; sha256="0713cgnwail2z404pn0fnpkbiw1fgc1ndh2krd0if2vnd2ibzgih"; depends=[minpack_lm timeSeries]; };
+  FatTailsR = derive2 { name="FatTailsR"; version="1.7-0"; sha256="0mywkrq929a0v20a1zaa9zc5l9k2kw5y1zz458iff3i56pzrcrsj"; depends=[minpack_lm timeSeries]; };
   FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; };
-  FedData = derive2 { name="FedData"; version="2.0.8"; sha256="14g9hqb6jwk3m9zyf05rzzbqfxzphb4vymjq6bz2j2ra598p7wyg"; depends=[curl data_table devtools Hmisc igraph raster rgdal soilDB sp]; };
-  FeedbackTS = derive2 { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[geoR mapdata maps proj4 sp]; };
-  Fgmutils = derive2 { name="Fgmutils"; version="0.4"; sha256="0cg2vivshwcqyzlahsirh9jax4nr8alwz7gf4qxcdmxvzjaln6lq"; depends=[data_table devEMF plyr png sqldf stringr]; };
+  FedData = derive2 { name="FedData"; version="2.4.0"; sha256="1rai3hgx10q6jcjpqd0jsqvp15am3i48n1ph6dl88mhwgiblvh9w"; depends=[curl data_table devtools doParallel dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; };
+  FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
+  Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
+  FinAna = derive2 { name="FinAna"; version="0.1.1"; sha256="092jw6y06r48dph4h0dnsv96bjh8knx91lrdlchb3q43dzfdz4i1"; depends=[]; };
   FinAsym = derive2 { name="FinAsym"; version="1.0"; sha256="0v15ydz4sq9djwcdcfp90mk8l951rry7h91d7asgg53mddbxjj6f"; depends=[]; };
-  FinCal = derive2 { name="FinCal"; version="0.6.2"; sha256="0hfmbg4ha6vr80nl1772cahjzqicak038d6dg6784fs2rqvzjhw2"; depends=[ggplot2 RCurl reshape2]; };
-  FinCovRegularization = derive2 { name="FinCovRegularization"; version="1.0.0"; sha256="0da7asm4mvbd4wvqll5gdvckb10ccfx7gy141xbxyaixdhgi6zl4"; depends=[quadprog]; };
+  FinCal = derive2 { name="FinCal"; version="0.6.3"; sha256="1clvnvhpf2krrf8flhmdxmys6ym3xw3v4v07kk1if4xb0dfk9wgy"; depends=[ggplot2 RCurl reshape2]; };
+  FinCovRegularization = derive2 { name="FinCovRegularization"; version="1.1.0"; sha256="0h3i46s0rpqvgnqgjwqrlrfa3vv5jn2hm6bqc0ijwmrr9f80g4ir"; depends=[quadprog]; };
   FinTS = derive2 { name="FinTS"; version="0.4-5"; sha256="16m57h6rk4344aalfwaz7hsyis30c1dirsyx8ih661ihgqn1ai1r"; depends=[zoo]; };
   FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.2.0"; sha256="0lx8gqmnapyizlg0qdcjy8xrkpbhj0f7nc95l86a6xy82hz62dzb"; depends=[quantmod TTR xts zoo]; };
+  FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; };
   FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
-  FindIt = derive2 { name="FindIt"; version="0.5"; sha256="0bj4al4b7na3w5y783nqyd2wc1pmwfmgf2p4q6n7vqbzqghy0a3q"; depends=[glmnet lars Matrix]; };
+  FindIt = derive2 { name="FindIt"; version="1.0"; sha256="00psd20j84vdjw2jyilkfb2z9kfs5c139rky8d8rpl8sz97szpf2"; depends=[arm ggplot2 glmnet lars Matrix quadprog]; };
   FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
+  FinePop = derive2 { name="FinePop"; version="1.3.0"; sha256="1ax07zcrgmbgpxcs8dyg91pnvqfix97vdiyy9zpc767q2286gpxq"; depends=[]; };
   FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; };
   FisherEM = derive2 { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[elasticnet MASS]; };
   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=[]; };
   FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; };
-  FlowScreen = derive2 { name="FlowScreen"; version="0.9"; sha256="165zhlnirkmmnmxq9wcikz1ray6fswlv3nba14vr9q8ba9z359wv"; depends=[changepoint evir zyp]; };
+  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=[]; };
   ForIT = derive2 { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
   ForImp = derive2 { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals mvtnorm sampling]; };
-  ForeCA = derive2 { name="ForeCA"; version="0.2.2"; sha256="1iszhiqn0vg3l2c8cgshk8qir0dqml4jsl942hdsmjm6raxlb6n9"; depends=[ifultools MASS sapa]; };
+  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]; };
   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]; };
   FourScores = derive2 { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
-  FrF2 = derive2 { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
+  FrF2 = derive2 { name="FrF2"; version="1.7-2"; sha256="1qjgx7zbnabbs4zq7hn3j1i1xyy4yjwnz7pn25kz9s3szqr1fk66"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; };
   FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
   FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.0"; sha256="12v72zn1san2kv82b9y1vd0gzd1fa800yscc63zlq8lfflz47xvz"; depends=[]; };
-  Fragman = derive2 { name="Fragman"; version="1.0.3"; sha256="0ar6nikfqcgv95xr0kbdwyiwc66a6rgrnnybhpk0fcrpkkjvzkm9"; depends=[]; };
+  Fragman = derive2 { name="Fragman"; version="1.0.7"; sha256="0dh1gk2arj7r6zd5dhkmxpr7a1hd3pl8x5klmlsg4n6rwsx2p4v8"; depends=[]; };
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
-  FreeSortR = derive2 { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[ellipse smacof vegan]; };
+  FreeSortR = derive2 { name="FreeSortR"; version="1.2"; sha256="01h29p9qhlkd2qmmmw23wh9lrsggvp1h3r2laqi2lln7d7srcwbj"; depends=[ellipse smacof vegan]; };
   FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; };
-  FunChisq = derive2 { name="FunChisq"; version="2.2.2"; sha256="1wfj42ibzk8riana50yv7r7fl78nggpgmgwn9q2qyrbr1413jj2b"; depends=[BH Rcpp RcppClassic]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.3.3"; sha256="0n4c6lfljp7mbl05r75rj31q0rkwnmj6gif3fmxmv1y5x7x2jrxj"; depends=[BH Rcpp]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; };
   Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
   FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; };
   FusedPCA = derive2 { name="FusedPCA"; version="0.2"; sha256="0z4kvm6mn11fmc8w62aky2binjdcgrw4ij5vg65sb55da9s8d2kd"; depends=[genlasso]; };
+  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=[]; };
   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=[]; };
-  FuzzyStatProb = derive2 { name="FuzzyStatProb"; version="2.0.1"; sha256="0cj6dqb5iy4gw7kkip9jvk9djf6dx20078kmb42br8sim1065j8m"; depends=[DEoptim FuzzyNumbers MultinomialCI]; };
+  FuzzyR = derive2 { name="FuzzyR"; version="2.0"; sha256="1li54ad0lqmmdsr9pcp56d2n8ki6hzdljy8l3lzhrsjmii7ycasw"; 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=[]; };
   G1DBN = derive2 { name="G1DBN"; version="3.1.1"; sha256="015rw3bpz32a8254janddgg1ip947qgcvmiwx5r3v7g8n854bwxn"; depends=[igraph MASS]; };
   G2Sd = derive2 { name="G2Sd"; version="2.1.5"; sha256="165i6x2k56vwhk5p2p5m9vjmp9flblsapjdlz7nw9b719l6xz5zk"; depends=[ggplot2 reshape2 rJava shiny xlsx xlsxjars]; };
-  GA = derive2 { name="GA"; version="2.2"; sha256="1pk80jwzvpmi61df0y331qvl8jkdizblg93s7gaspkbzy50wyfkp"; depends=[foreach iterators]; };
+  GA = derive2 { name="GA"; version="3.0.2"; sha256="0jpgbniyxvilnr1jv6vmrfgnar3qczvq819xjb70inp5f41zd6wx"; depends=[foreach iterators]; };
   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]; };
@@ -824,62 +1023,83 @@ in with self; {
   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]; };
-  GAabbreviate = derive2 { name="GAabbreviate"; version="1.2"; sha256="1q3m3srkh1zzrfxnl1hbhg4imml8zibd6vhshvwnbhz7pqyplzn9"; depends=[GA psych]; };
+  GAS = derive2 { name="GAS"; version="0.1.5"; sha256="14n973bks28chxxlidz578359nh8kd2jjp32k1fp2r8qfddsk21i"; 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=[]; };
   GCD = derive2 { name="GCD"; version="3.0.5"; sha256="1ami5xw5xx464pxr9y1z9bb3dvj46vx3wrbh19w4g7sk8yjvh5nl"; depends=[]; };
-  GCPM = derive2 { name="GCPM"; version="1.2"; sha256="034vsy9kjag7c3mzgswbm356cyay908dwnxj63gd93aakknm120x"; depends=[Rcpp RcppProgress]; };
+  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]; };
   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]; };
+  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.7.4"; sha256="02r5gkyhdqkcq1q1g9xg595riny77mdifx7maj0agby5jm49y3x0"; depends=[BH coda ggplot2 igraph plyr Rcpp RcppArmadillo stringr]; };
+  GERGM = derive2 { name="GERGM"; version="0.10.0"; sha256="0fg984d553zfnnv00flmlzib4zjvgp33lgmbczvr4wssj4rsbpj7"; depends=[BH coda ggplot2 igraph 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]; };
+  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]; };
-  GFD = derive2 { name="GFD"; version="0.1.4"; sha256="1id4c07b061sjkvigl88zk6bv10brclcsz32z43dbp49xjd5x6nl"; depends=[magic MASS Matrix plotrix plyr RGtk2]; };
+  GFA = derive2 { name="GFA"; version="1.0.0"; sha256="1mgcgdypfpd3i5n5kgk162p1jp9gfz1h7h3rlzrw9srsbc6dza97"; 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.2-2"; sha256="186yp8314ygsz5w3zrv76jswh79s5laglnw2lair69ib7d94bsh1"; depends=[]; };
+  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-10"; sha256="0ihxxih5fw470pnmnljsarahd4xim6ncx3w7fym5i5q86bqcyahb"; depends=[gtools lars mvtnorm]; };
-  GGally = derive2 { name="GGally"; version="1.0.1"; sha256="1wradjcphk6mr817lnk3q3rbingn8xrsrprsxh0mv4w8g0wcibif"; depends=[ggplot2 gtable plyr reshape]; };
+  GGMselect = derive2 { name="GGMselect"; version="0.1-11"; sha256="1ir3zyi9xxq9aq1zxl506x1fwxsv7rd350k461l9lc2r5338xrgh"; 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]; };
   GIGrvg = derive2 { name="GIGrvg"; version="0.4"; sha256="0sflklyzl2l5bcjhz7n75aww76ih93sq5mbgdc4v1p0vqhrbbg47"; depends=[]; };
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
-  GLDEX = derive2 { name="GLDEX"; version="2.0.0.3"; sha256="0ymarfwpm7gagq6wk40n0nsmd14r19pbqbrgigk6cvb8dc2zpbfz"; depends=[cluster]; };
-  GLDreg = derive2 { name="GLDreg"; version="1.0.3"; sha256="0d7cclmmhgaf95bw738d8hz166qsr9df33g73ihy8pla3sg5lr7q"; depends=[GLDEX]; };
-  GLMMRR = derive2 { name="GLMMRR"; version="0.1.2"; sha256="0mvldp1vf15pga0c7awf4xi431nh16rzcl0895pn728x30g2pk8d"; depends=[lme4]; };
+  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.6"; sha256="02g4g3w7dq5jjrir1fcxirbx36ci04fcadli921r6hz4xifhil7d"; depends=[ddst GLDEX]; };
+  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]; };
-  GMCM = derive2 { name="GMCM"; version="1.2.2"; sha256="1zvhbxz1bli460c9nh2p3vx7v3a5w2jwyyyd7r8dqgxpf3xr1pzw"; depends=[Rcpp RcppArmadillo]; };
+  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.3"; sha256="0a4n98247r5a7j8p63ih9845gwfik59j9qh604hjw16gwvb7g8n2"; depends=[MASS]; };
+  GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
   GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
   GOGANPA = derive2 { name="GOGANPA"; version="1.0"; sha256="1xbir21zvr5hv2y6nndzpsrpmnr7glrc7y6xgcyb856wx46ajan9"; depends=[GANPA WGCNA]; };
-  GORCure = derive2 { name="GORCure"; version="1.0"; sha256="0jkhhawbaihqb0kk6l4g5m65nfbww5fmr1hh7bgsnbsy0qv6hfp0"; depends=[ICsurv MASS pracma survival]; };
-  GOplot = derive2 { name="GOplot"; version="1.0.1"; sha256="0i4b26wkgf77z515027bmq5pqd21bhg0qrg6jbmwiv59nczr146b"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
+  GORCure = derive2 { name="GORCure"; version="2.0"; sha256="1hazin0q74hf16azxa5h08kfj7g1079q77n2fn4fahpfxb8hmvwm"; depends=[ICsurv MASS pracma survival]; };
+  GOplot = derive2 { name="GOplot"; version="1.0.2"; sha256="1y8dv0kbzpr9za91njw0x233vx5d13vqml9hmpddcyi9s6va5nix"; depends=[ggdendro ggplot2 gridExtra RColorBrewer]; };
   GPArotation = derive2 { name="GPArotation"; version="2014.11-1"; sha256="15jh5qqqwx47ara6glilzha87rnih0hs5fsz0jjqwv6wr1gw26rm"; depends=[]; };
+  GPB = derive2 { name="GPB"; version="1.0"; sha256="18cdgz00j0j1rchzn2l253rii3b0iv9ipnh5sk3yvmwrqiabmrf8"; depends=[]; };
   GPC = derive2 { name="GPC"; version="0.1"; sha256="1naqy5g6a0z65wssfic5s7cw9v0zjckk526nian3l98ci22sz0j7"; depends=[ks lars orthopolynom randtoolbox]; };
   GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
   GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; };
   GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; };
-  GPareto = derive2 { name="GPareto"; version="1.0.2"; sha256="05q2r51byzxj5jrxbpw1zicm3jc2vx4lqibhspbq61hxbsg6hy4m"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud]; };
+  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]; };
+  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]; };
+  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=[]; };
   GRTo = derive2 { name="GRTo"; version="1.3"; sha256="1xkcx2agvrpfnmplgaqx70vz303v8rhwnxdyr4hmdlf4h92lbv8i"; depends=[bootstrap]; };
   GRaF = derive2 { name="GRaF"; version="0.1-12"; sha256="1d7mr2z49v6ch4jbzh0dj2yjy2c5p51ws38xfz233sjz475snajr"; depends=[dismo]; };
   GSA = derive2 { name="GSA"; version="1.03"; sha256="1h1sbpn1rrdh44w4fx2avc7x24ba40mvpd8b2x5wfrc7a294zf6z"; depends=[]; };
+  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="3.3"; sha256="162k50lq7q4fs004d20x2fjnrfm21i33lmdqx6cc59xxpbwgcflx"; depends=[ggplot2 MASS Rcpp RcppArmadillo rrcov]; };
-  GSIF = derive2 { name="GSIF"; version="0.4-7"; sha256="1c2lk6yzacwrxvs5v0al8hwvi7ncqdvn4f7ngicy6g8iyi4p7z08"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA sp]; };
+  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]; };
+  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]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
-  GUIDE = derive2 { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
-  GUILDS = derive2 { name="GUILDS"; version="1.2.1"; sha256="1z90qjgrx16yk956phbifcr7jd3w59h7akzz7p6g5ymrcjzih4qf"; depends=[pracma Rcpp subplex]; };
+  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]; };
+  GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; };
   GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; };
   GUTS = derive2 { name="GUTS"; version="1.0.0"; sha256="0s64swhs7wpknvycca7qj36kj910anrh9qrbpyfjl9lw8cqa2058"; depends=[Rcpp]; };
   GUniFrac = derive2 { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[ape vegan]; };
@@ -887,84 +1107,108 @@ in with self; {
   GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
   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.1"; sha256="1hnnk2p0h8ssg5izqb8lplbpbcldqhfahxv0wkbw5cqyc7ydblak"; depends=[doParallel foreach]; };
-  GWmodel = derive2 { name="GWmodel"; version="1.2-5"; sha256="14pp1hy4bqr6kg9fy9nchjm6kb3l85f58rl2449b7wv7vsk3yfvk"; depends=[maptools robustbase sp]; };
-  GWsignif = derive2 { name="GWsignif"; version="1.0"; sha256="04663qgy3xmijrx8m1s5ql7zj70mgsd58dl08ci742l1fzmfya5f"; depends=[]; };
+  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]; };
+  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.0"; sha256="0p5zz1waffynnciq1mbjjlnmaif1fnr5799y6izk50ckhh07bgfs"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
+  GameTheory = derive2 { name="GameTheory"; version="2.5"; sha256="05isd08z7k52nvic52gnlmnqvvrxxipcn2njfiz3kp105wvdw1rp"; depends=[combinat gtools ineq kappalab lpSolveAPI]; };
+  GameTheoryAllocation = derive2 { name="GameTheoryAllocation"; version="1.0"; sha256="0733vmyr0d9scjd5ixpnggr548snd7nj70knf5hbzc59nmbc5y11"; depends=[e1071 lpSolveAPI]; };
   Gammareg = derive2 { name="Gammareg"; version="1.0"; sha256="1a5wibnbd8jg0v8577n1x9kc358qpd4jz7l8h7r541sdpprm6wb0"; depends=[]; };
+  GauPro = derive2 { name="GauPro"; version="0.1.0"; sha256="01f8f3adki3g0aiw2km60w8sf78yj68aaj86bj8nizslgkj3z8ln"; depends=[lbfgs R6 Rcpp RcppArmadillo]; };
   GeNetIt = derive2 { name="GeNetIt"; version="0.1-0"; sha256="102hq4w94gd7rz80cz1bll9kfblyacsk4h54yjflvqkmrs9x0d2b"; depends=[nlme raster rgeos sp spatialEco spdep]; };
   GenABEL = derive2 { name="GenABEL"; version="1.8-0"; sha256="0sd497qvik70iwv7wc8r50rhc5wx153pm8vif738wwqqp43chks3"; depends=[GenABEL_data MASS]; };
   GenABEL_data = derive2 { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gynjx3mnfvnlz45cbn6xf49gwx9mfyxf584xfcggxaa1c"; depends=[]; };
   GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
-  GenCAT = derive2 { name="GenCAT"; version="1.0.2"; sha256="1najc2261v7l1s2axax2cycz3x2b04hzxsnyq7877346z85sc5vc"; depends=[doParallel dplyr foreach ggplot2]; };
+  GenCAT = derive2 { name="GenCAT"; version="1.0.3"; sha256="1rzhp4aypdryr7hrqazax3lzfkxqhls5cf8zsjjip8jb701x46hf"; depends=[doParallel dplyr foreach ggplot2]; };
   GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
   GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
   GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; };
   GenSA = derive2 { name="GenSA"; version="1.1.6"; sha256="1llhjhg39fd2pnm6kn8zjhw6kkg88wn7y3yizr8fna7qc3ixlcii"; depends=[]; };
   GenWin = derive2 { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; };
+  GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; };
   GeneCycle = derive2 { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; };
   GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
   GeneFeST = derive2 { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
   GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; };
   GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
-  Geneland = derive2 { name="Geneland"; version="4.0.5"; sha256="1v2m8v4sy95rajjw8m9bg4yal5ay7x1k5kqjxrivm45ad546ykwh"; depends=[fields RandomFields]; };
+  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.6"; sha256="0y2wxpgrriyp4yighacszjd3k35j873z9cnqynjmcqi7l2li6rr4"; depends=[rrBLUP]; };
+  GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; };
   GeneticTools = derive2 { name="GeneticTools"; version="0.3.1"; sha256="033dwg94ns4mz2ixgn180h6qd783gm492p9qs2nf8498cb4ycg9m"; depends=[gMWT plotrix Rcpp RcppArmadillo snpStats]; };
+  GenomicTools = derive2 { name="GenomicTools"; version="0.2.3"; sha256="1ga2myi2y5rpab0v58y1ndfqrxmbl1wdr3d0s8215apwiax4rfm4"; 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]; };
+  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]; };
-  GetoptLong = derive2 { name="GetoptLong"; version="0.1.1"; sha256="05fwlzzjnl84rv6r2hlqkhhg1y0d4yxmk5w4fpxfc7lpz2zi3zcd"; depends=[GlobalOptions rjson]; };
+  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]; };
   GiANT = derive2 { name="GiANT"; version="1.2"; sha256="0h9jx2vpgpzlinf6v9mxj260r22nlqml8xnd2jknw36j5imim57w"; depends=[]; };
+  GiNA = derive2 { name="GiNA"; version="1.0.1"; sha256="0his7wsgnggyv9526blxzxa1ni8hwq2ws64wkmha45nvvnm3dsiw"; depends=[doParallel EBImage foreach png]; };
   GiRaF = derive2 { name="GiRaF"; version="1.0"; sha256="02356cq0g6v5m72fy5z83bw3nsb7kpc9sy7sykk97735n928z92n"; depends=[BH Rcpp RcppArmadillo]; };
   GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; };
   GillespieSSA = derive2 { name="GillespieSSA"; version="0.5-4"; sha256="0bs16g8vm9yrv74g94lj8fdfmf1rjj0f04lcnaya7gyak3jhk36q"; depends=[]; };
-  GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0"; sha256="0dd4w7b3l9i78c9qvw2akz3h8annknbpfd3f56bgyw3gcfdrrz0x"; depends=[]; };
+  GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; };
   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.0"; sha256="0cx4jpr5yhjdqbvnswqjwx7542mnmk73dy99klwg8bsz0c36ii5k"; depends=[sybil]; };
-  GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.9"; sha256="1c08rfy8vxay4zrf91r7cxf70w3g35c7mxc6k9wkc2y948jnpj7i"; depends=[]; };
-  Gmisc = derive2 { name="Gmisc"; version="1.3.1"; sha256="1gwg1600nyabrs6j721246cnrk9ishj7sc904mqxlbgcp5dxp4s1"; depends=[abind forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
+  GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; };
+  GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.10"; sha256="0vkfr29q92g02138g2iscn95g3dc3shvzlmrh502fw89asm7kh57"; 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]; };
-  Goslate = derive2 { name="Goslate"; version="1.0"; sha256="1pccrpvav5mbh52vdsqvdrshdaa4wvb7m0wc7lkd82k4661fa1qc"; depends=[PythonInR R6]; };
-  Grace = derive2 { name="Grace"; version="0.2"; sha256="1ra1k0mpzcss3n5npqlphr1vl69c6x4c47agc7qxrzarryhk973w"; depends=[glmnet scalreg]; };
+  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]; };
   GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
-  GrapheR = derive2 { name="GrapheR"; version="1.9-85"; sha256="16x1j3nfkcjszbfp9j3vg5sprdz5991f7j7v14cdwypcyl35yghh"; depends=[]; };
+  GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; };
+  GraphKit = derive2 { name="GraphKit"; version="0.4"; sha256="12h7p1ka4036d3c1vri014jci02zkjgira6rk8f1mcrv94sywinc"; 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]; };
-  Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[rgeos sp]; };
+  GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.0"; sha256="00a2lcqrj17ckw4npkvm3sxydfn2lyvs7pzpccy3xnzrr006ibsx"; depends=[rJava]; };
+  Greg = derive2 { name="Greg"; version="1.2"; sha256="19bzv2nknahzbdnl7n0pcnavsdlwgkprc0yk3ksqllfawnvi39f9"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
+  Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.1.6"; sha256="1dgyif5hgjk4jir01pbsmsffn2dhmcci2smvk6vryq0iii3ixwaf"; depends=[raster rgeos sp]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
-  GroupSeq = derive2 { name="GroupSeq"; version="1.3.3"; sha256="0abb18w9jylb1nf6yc6xic6b01f8zfxsm8hsmxk4whivn17ckfp9"; depends=[]; };
+  GroupSeq = derive2 { name="GroupSeq"; version="1.3.4"; sha256="0m127793gh00spj2ghapmysvf3dbxhpf2jlms3xxrflh7ajrmy5m"; depends=[]; };
   GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
-  GsymPoint = derive2 { name="GsymPoint"; version="1.0"; sha256="0wcscyrkxl1sxhzgm35x2zh94lmnhvj16x77k9vhscc7j8as5d90"; depends=[Rsolnp truncnorm]; };
-  GuardianR = derive2 { name="GuardianR"; version="0.6"; sha256="154fp4dx14v43c8ch6b7jaxwwnb0fgqiihm9m4qjywhqm8ask6na"; depends=[RCurl RJSONIO]; };
+  GrowingSOM = derive2 { name="GrowingSOM"; version="0.1.1"; sha256="0pzhf27kk9nc73w6wp0qd50i7hk7904y90l2ppdgy738z9gcbz4i"; depends=[plotrix]; };
+  GrpString = derive2 { name="GrpString"; version="0.1.1"; sha256="0kqz2m6ycj83s5kcgbf7l6cpfgfrza7b0y23cgljf952pys2ndys"; depends=[plyr]; };
+  GsymPoint = derive2 { name="GsymPoint"; version="1.1"; sha256="0dps7mwq17y4fd64if2d99pr38y2wn3mksv3nsijysj0bhiwzh11"; 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=[]; };
   GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
-  HAC = derive2 { name="HAC"; version="1.0-4"; sha256="1cywcrj1iz46p2l0f99msgbipicc53ly5j5mzpaspq8wn8f4fwf0"; depends=[copula numDeriv]; };
+  HAC = derive2 { name="HAC"; version="1.0-5"; sha256="0dc79qjhyydq0k4d8wvg970hs56i9yhxjrh5ky9a178ya61vw208"; depends=[copula numDeriv]; };
   HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; };
   HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; };
+  HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; };
   HBSTM = derive2 { name="HBSTM"; version="1.0.1"; sha256="0bx7dxcfj46k4kqpqb39w4qkm4hvr1ka8d8rws445vkyl31kr0q6"; depends=[fBasics maps MASS]; };
   HBglm = derive2 { name="HBglm"; version="0.1"; sha256="1sral7lh5qw5mn31n8459pk52frgw1bjq0z5ckpsnbc4qf3xxcjn"; depends=[bayesm Formula MfUSampler sns]; };
+  HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; };
   HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; };
-  HDInterval = derive2 { name="HDInterval"; version="0.1.2"; sha256="02rjqja2bcxc97hb6fg2xjxxkljsdv0g84qww39jq1pvgkswmm4g"; depends=[]; };
+  HDInterval = derive2 { name="HDInterval"; version="0.1.3"; sha256="1zjddw8s6xc2gsz6285g3dzzarnhb77sra1dbxghgn2nrgn2y0i5"; depends=[]; };
   HDMD = derive2 { name="HDMD"; version="1.2"; sha256="0na0z08fdf47ghfl2r3fp9qg5pi99kvp7liymwxym2wglkwl4chq"; depends=[MASS psych]; };
   HDPenReg = derive2 { name="HDPenReg"; version="0.93.1"; sha256="1av4x9xqf4y1qfdkh9f0msskj9fqimng1i9bdlgl2ycfn8a64cjp"; depends=[Matrix Rcpp rtkore]; };
-  HDclassif = derive2 { name="HDclassif"; version="1.3"; sha256="1b80dnaa6m4px0ijpd9yf45v8jl0b9srcmrdyar8fs7lxpc53k2l"; depends=[MASS]; };
+  HDclassif = derive2 { name="HDclassif"; version="2.0.2"; sha256="0gykjqqhrqz1x9xl867hxhrp197y3x4679zh9v84i1nd9yxlamah"; depends=[MASS rARPACK]; };
+  HDoutliers = derive2 { name="HDoutliers"; version="0.15"; sha256="01ylj4wnhqy8931lkhdgx552kv1h7hl4ngkpqbnhq75amyh34c46"; depends=[FactoMineR FNN mclust]; };
+  HDtest = derive2 { name="HDtest"; version="0.1"; sha256="0vlwpx9l6r0izfcf9fgna72w39w64b95s3q527mapjb6a3676avg"; depends=[checkmate doParallel expm foreach MASS mvtnorm]; };
   HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; };
   HEAT = derive2 { name="HEAT"; version="1.2"; sha256="1qifqd06ifl0f5l44mkxapnkwhpm0b82yq6dhfw4f8yhb27wd0z2"; depends=[]; };
-  HGNChelper = derive2 { name="HGNChelper"; version="0.3.1"; sha256="0vidw7gdvr0i4l175ic5ya8q2x2jj0v2vc7fagzrp2mcy7fn1y6a"; depends=[]; };
-  HH = derive2 { name="HH"; version="3.1-25"; sha256="0lrli7rci0m9xb3fx51m59mcikyfhzsjmjp5s59ilahz70gkxnnw"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
-  HHG = derive2 { name="HHG"; version="1.5.1"; sha256="111b3lqkp8z7m3g4vgmd0dcplkm4szfwa620sxy70084qad1jv4d"; depends=[]; };
+  HGNChelper = derive2 { name="HGNChelper"; version="0.3.4"; sha256="09wwhi8qwmzcwsivnms9zjl4xmbbg0dnx5aj9a2fqaa06m4kd6pk"; depends=[]; };
+  HH = derive2 { name="HH"; version="3.1-34"; sha256="1srr195ha8n4va30impm12p2kamkl36whl8g10pl80hwgg20pbqk"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
+  HHG = derive2 { name="HHG"; version="2.0"; sha256="1y6w62ivbhqpl6zgwpxq9r2w5nlc70zj8f7rnnhck162p6hyp778"; depends=[]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
+  HIBPwned = derive2 { name="HIBPwned"; version="0.1.3"; sha256="121rs767h9c7ngkbnbfv8zl7jjzimw68z9gwbz0dc0z8w3h3mq5y"; depends=[httr jsonlite urltools]; };
   HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
   HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
-  HK80 = derive2 { name="HK80"; version="0.0.1"; sha256="1qhknrqpspxrdxzf5kakans94db58bbhgpblvpwcyw4jrjmm0ng7"; depends=[]; };
+  HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; };
+  HKprocess = derive2 { name="HKprocess"; version="0.0-2"; sha256="1j2yhb7k8zf4nlzdf0p6x9ca7ak4lwwak8mcc60kpilw2fws27k5"; depends=[gtools MCMCpack]; };
   HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; };
-  HLSM = derive2 { name="HLSM"; version="0.5"; sha256="0j1jfnm5lydlcjdbb31jd514is5brvfzrx8h4ckw4p7xa4syg08s"; depends=[coda MASS]; };
+  HLSM = derive2 { name="HLSM"; version="0.7"; sha256="0cj4mbg7vamlabxynik59n5l3w5fiwa84qypprr8wr7ms2aimfa0"; depends=[coda igraph MASS]; };
   HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.1.8"; sha256="15z0war5isw9xnln7py3di8f45pwvdw6x6wljl18fcxpmanmlfcf"; depends=[RCurl XML]; };
   HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; };
   HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; };
@@ -972,100 +1216,127 @@ in with self; {
   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=[]; };
+  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.1"; sha256="12pjsy9hx0sz42czfwvsla6pyp85as4pf2hhvbh0yp07wwfs2f3i"; depends=[MASS matrixcalc]; };
-  HSAR = derive2 { name="HSAR"; version="0.3.6"; sha256="1f4n65gbql1kaqf1izbh4ngqsv36ccypy7n40rlc5fi0hjxsff23"; depends=[Rcpp RcppArmadillo spdep]; };
+  HRM = derive2 { name="HRM"; version="0.4.3"; sha256="1g6kka2havns39c2m3ynq3k2zfl5vjvrf2xhhr3xhfd1p4sl0c6g"; 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=[]; };
   HSAUR2 = derive2 { name="HSAUR2"; version="1.1-14"; sha256="0psykccxyqigkfzrszy7x3qhdw02kppzgz0bqr21q8zh51jb2y3v"; depends=[]; };
   HSAUR3 = derive2 { name="HSAUR3"; version="1.0-5"; sha256="0hjlkmxp1yhwkfcbx16nda96ysqddjrcvl4z52w2ab84prqn6196"; depends=[]; };
   HSROC = derive2 { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
-  HTSCluster = derive2 { name="HTSCluster"; version="2.0.4"; sha256="1kvq118hqxc81n88g4bq10lh84dydrqqhzig246wf3f97ajvq7y0"; depends=[capushe edgeR plotrix poisson_glm_mix]; };
+  HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; };
+  HTSSIP = derive2 { name="HTSSIP"; version="1.0.3"; sha256="09cid6zma00adxf03p0iydfpq9xrds72a174aa7dbwgvsbzqh4p0"; depends=[coenocliner DESeq2 dplyr ggplot2 lazyeval magrittr phyloseq plyr stringr tidyr]; };
   HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; };
   HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; };
   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=[]; };
   HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; };
-  HandTill2001 = derive2 { name="HandTill2001"; version="0.2-11"; sha256="1vv3vm1hlfibgw84y52nzb5a66jigbmx3611lf4kmqfl1y4wm3rg"; depends=[]; };
+  HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
   Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
   HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
-  Haplin = derive2 { name="Haplin"; version="5.5"; sha256="12wkj5x1s920xs0xzhxk0dswmwan7x20fw5sj6cx29n013h1gkam"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
+  Haplin = derive2 { name="Haplin"; version="6.0.1"; sha256="1hdni0ni7qbhcwg7ficv09dxj20cavyzijwdc2vk41smdsm9gg9i"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
-  HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
+  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.4"; sha256="1wi74b58ya9395wqk3hgs7nddd6mpamal9258gf2wy0s57wmcwr7"; depends=[coda]; };
-  HiCfeat = derive2 { name="HiCfeat"; version="1.0"; sha256="0azr6n792dmkg12ynr3nybmb33z8rv046lv0hfwpyybz6p8dj3zq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
+  HelpersMG = derive2 { name="HelpersMG"; version="1.8"; sha256="1lw0p02rzb4b9b66435w8dr058bfzpcygfgi75av28lrc75c6skv"; 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]; };
   HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; };
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
   HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; };
   HiDimMaxStable = derive2 { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; };
   HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
   HiPLARM = derive2 { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
-  HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-4"; sha256="1w3j4dnf6ay0a17kn8zdzy38wind4pqfnwlndf9m9fj8m2scaay8"; depends=[]; };
+  HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-7"; sha256="03fs51l3xxks0dqhl6w5m34djbpkly92bvbm23y3wj3zrxz3d2ml"; depends=[]; };
   HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
   HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
-  HistDAWass = derive2 { name="HistDAWass"; version="0.1.4"; sha256="00jdfv3ij9v431wm1grib9pcr9nfn42r2hjvjj12b61r2v7j2b1n"; depends=[class FactoMineR ggplot2 histogram]; };
-  HistData = derive2 { name="HistData"; version="0.7-6"; sha256="1wazqpgjzl5x2whn9v54yx83xw0pd0l03h6rqv6dp25xizxlxw0v"; depends=[]; };
+  HistDAWass = derive2 { name="HistDAWass"; version="0.1.6"; sha256="0i43zki95m47nm3yy7m7s66nvpmx6vl3df2bxkpyihc2xsqrsf3l"; depends=[class colorspace FactoMineR ggplot2 histogram]; };
+  HistData = derive2 { name="HistData"; version="0.8-1"; sha256="018v8wr95fssc5hzfwzk7x8pax2s41m22a7lvcpy0chy0nvh7dqh"; depends=[]; };
   HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
-  HiveR = derive2 { name="HiveR"; version="0.2.46"; sha256="1zc1vjb975y9icw9vq65f27nrj2n3c5lgms0alflj837b5zvbhqd"; depends=[jpeg plyr png RColorBrewer]; };
-  Hmisc = derive2 { name="Hmisc"; version="3.17-2"; sha256="110w5hbrl10isslqs0iq6w2ll0dafqyqznb50cdcallnlnvbvxrg"; depends=[acepack cluster foreign Formula ggplot2 gridExtra gtable lattice latticeExtra nnet rpart survival]; };
-  Holidays = derive2 { name="Holidays"; version="1.0-6"; sha256="031vddjf7s3pirv041y2mw694db63gjajlbczmmya8b1zp2f3vzk"; depends=[TimeWarp]; };
+  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]; };
+  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]; };
   HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; };
   Hotelling = derive2 { name="Hotelling"; version="1.0-2"; sha256="0dzsqnn4c4av23qjnmacwc78i0xg355p1xwfmgipr04ivym0mqn0"; depends=[corpcor]; };
   HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; };
   HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; };
-  HydeNet = derive2 { name="HydeNet"; version="0.10.3"; sha256="0v3mkpyw2qfi3kywlpvr01vdvi78xcq2v43g90jrihzqrvrd6lm3"; depends=[ArgumentCheck DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; };
+  HydeNet = derive2 { name="HydeNet"; version="0.10.5"; sha256="00h7lj347nag5m5nfyv1hgaml77kqlcxrl704mq6791fcjdchgp1"; depends=[checkmate DiagrammeR dplyr graph gRbase magrittr nnet pixiedust plyr rjags stringr]; };
   HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; };
   HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; };
+  IAPWS95 = derive2 { name="IAPWS95"; version="1.0.0"; sha256="1rw6i3a653m11fyza42jhbqi6607fiqgmq15qfn5bqhq8sdgmn9p"; depends=[ggplot2 pander Rcpp]; };
   IASD = derive2 { name="IASD"; version="1.1"; sha256="1slhd42k639mbyxccl7n69p7ng2qx6pqag8wz3kdwn479spkavzn"; depends=[]; };
-  IAT = derive2 { name="IAT"; version="0.2"; sha256="0byivq2298sjvpsz5z1w7r31h6z2jqpip40z8r2alygbgwwa48pd"; depends=[data_table ggplot2]; };
+  IAT = derive2 { name="IAT"; version="0.3"; sha256="110rn2q09gspfd4msyh30dllxdxdraffkr18h1nm72brzhmx9cfi"; depends=[dplyr ggplot2 lazyeval]; };
   IATscores = derive2 { name="IATscores"; version="0.1-2"; sha256="0grl5m4ccwaxvhg1bziy3vv5jffkvr24z268ws5m4ia20haif0dm"; depends=[dplyr nem qgraph reshape2 stringr]; };
   IBDLabels = derive2 { name="IBDLabels"; version="1.1"; sha256="1m9fd058yjxva6hin7i72i2nl285wfm0jkdn5xcng27yqlijyrm9"; depends=[]; };
   IBDhaploRtools = derive2 { name="IBDhaploRtools"; version="1.8"; sha256="1754239pdil6b383mpzyi8zb9l9hzg15dwgn5246v97g1y3mlp5r"; depends=[]; };
-  IBDsim = derive2 { name="IBDsim"; version="0.9-5"; sha256="0mhn1byrx98892gy30dar69pp3cnfwpzkl86gzqyjcxa2d9zpc77"; depends=[paramlink]; };
+  IBDsim = derive2 { name="IBDsim"; version="0.9-6"; sha256="19dq85qcvcjpfj7lh9h5ld6wm9xrz6zyl2nkpfvh1icwbcqncbxx"; depends=[paramlink]; };
   IBHM = derive2 { name="IBHM"; version="1.1-11"; sha256="1m0zxlybcak2v5c4spgaa39ngb2hryak4xd875jryk1dcnk9c702"; depends=[cmaes DEoptim Rcpp]; };
   IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; };
   IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; };
   ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; };
+  ICAOD = derive2 { name="ICAOD"; version="0.9.2"; sha256="12fkcc2ii3652n8ihzm29f9gip790wdmil7c1bzd5ma4l959w7hy"; depends=[nloptr Rcpp RcppEigen Rsolnp]; };
   ICBayes = derive2 { name="ICBayes"; version="1.0"; sha256="0z0z74yslhfjbh7188hzyxhwb7kn9raa0xsrr6n592ridpkhaih4"; depends=[HI survival]; };
   ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; };
   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.0"; sha256="1m3p0b93ksrcsp45m4gszcz01cwbfpj4ldar6l0q3c9lmyqsznx8"; depends=[sfsmisc]; };
+  ICEbox = derive2 { name="ICEbox"; version="1.1"; sha256="0yv9ybvk6s3lnyx5xfsnx19x32r9g9gk7klkpc8q672pl4fn4yp5"; 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="1.0"; sha256="1lgpgxi9ps0dnxllc1095lvdaq5p0dz6w4daw2b7q6jk3m6v5cla"; depends=[ICsurv MASS pracma survival]; };
-  ICS = derive2 { name="ICS"; version="1.2-5"; sha256="0q69rhb8an200yi564jzqbfb8b83l6xddqxhk8kw4g3y96jp82qx"; depends=[mvtnorm survey]; };
+  ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; };
+  ICS = derive2 { name="ICS"; version="1.3-0"; sha256="0r5lf8km77h29lcpi7z0hkmy4vh0p5m7p2xbxsxj6w9hsgyanv72"; depends=[mvtnorm survey]; };
   ICSNP = derive2 { name="ICSNP"; version="1.1-0"; sha256="1g7n8jlilg36hm989s5x18kf8jqn5wy98xi9jmnqkqpds4ff217y"; depends=[ICS mvtnorm]; };
+  ICSOutlier = derive2 { name="ICSOutlier"; version="0.2-0"; sha256="1dxbh3qhirr7f2bv68g1xlya5fprm230fdgxhccrzdc0wh0ijh3i"; depends=[ICS moments mvtnorm]; };
+  ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; };
   ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
-  IDPSurvival = derive2 { name="IDPSurvival"; version="1.0"; sha256="1v1w0i74b065b4qc302xbdl5df7qx9z8jmbc9cn46fqm1hh2b6d7"; depends=[gtools Rsolnp survival]; };
+  ICtest = derive2 { name="ICtest"; version="0.2"; sha256="0pd16cafhx7cfwasbdli0kin83wayn7hil8allpacv9yiinj2bq3"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; };
+  IDPSurvival = derive2 { name="IDPSurvival"; version="1.1"; sha256="0vd2dkspsq8aqihjs7dqpfb1xk5ydnwqwzhhg142mywgf0zg2fkh"; depends=[gtools Rsolnp survival]; };
   IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
+  IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; };
   IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
+  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.0"; sha256="1sxwccysmxv9cv34rgi3s777734a01hmxyr7x32bgykkhjq6wr25"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; };
+  IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.4.1"; sha256="093c7jx74hl41v6i75qlphshw6gbxn7cl9063f971ilxi4hmsd21"; 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]; };
+  IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; };
+  IMIFA = derive2 { name="IMIFA"; version="1.1.0"; sha256="0fxnyzh0403k97ka6ngwsbw9qnf0gnkq33xsb47vrlfx3558g57a"; depends=[abind corpcor e1071 gclus matrixcalc matrixStats mclust MCMCpack mvnfast plotrix Rfast slam viridis]; };
   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]; };
-  IMak = derive2 { name="IMak"; version="1.1.1"; sha256="0s1pwpy9538gz108q74ld5azqskix4rk60bmr5qllpcqqhbwhrva"; depends=[]; };
-  INLABMA = derive2 { name="INLABMA"; version="0.1-6"; sha256="0rij3y89yyj25xz8r9n8cnq7rg9b7hf0n9nxxrrnm86w3n4r66in"; depends=[Matrix sp spdep]; };
+  IMPACT = derive2 { name="IMPACT"; version="0.1.0"; sha256="17m2gqwaqam8wv7214x4hp93imgfzilgm42zx5z21ipypiq6rqfy"; depends=[]; };
+  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=[]; };
+  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]; };
-  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="1.0.1"; sha256="08jmkncz5nyjrcb07fgnv2siws6ihd1nzssq99bv5ab24v3krr0w"; depends=[IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
-  IRISSeismic = derive2 { name="IRISSeismic"; version="1.0.7"; sha256="00qqg97kkc7yas7qiv6280rbjjdvmrp4w62kj0fps727hfbr6r51"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
+  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]; };
+  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=[]; };
   ISDA_R = derive2 { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
   ISLR = derive2 { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
-  ISOcodes = derive2 { name="ISOcodes"; version="2016.03.15"; sha256="05dbmah7daxqmmljb4hx2f2pz2yii3k9mpg6p30fbs5rkn84pfkw"; depends=[]; };
-  ISOpureR = derive2 { name="ISOpureR"; version="1.0.18"; sha256="1hh23d4dzhkqli68466gs2n6zhlhwjl53dvrpqvl6ag6i4x974ag"; depends=[futile_logger Rcpp RcppEigen]; };
+  ISOcodes = derive2 { name="ISOcodes"; version="2016.12.09"; sha256="1xsazjipx468hyqivdkskcqiipmysdzzrswh4yh6p41qbf1ahp6a"; depends=[]; };
+  ISOpureR = derive2 { name="ISOpureR"; version="1.0.21"; sha256="093wvnh7fv9shvssgl8slfg394f0v0jazj4jpihhaqkfchq1vryy"; depends=[futile_logger Rcpp RcppEigen]; };
   ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
+  ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; };
   ISwR = derive2 { name="ISwR"; version="2.0-7"; sha256="1rd1wrvl8wlc8ya5lndk74gnfvj9wp29z8617v3kbf32gqhby7ng"; depends=[]; };
   ITEMAN = derive2 { name="ITEMAN"; version="1.0"; sha256="06blkqxdvdfynp8vl02rqbg7ya62bq1izlqjda1p8zpr689jinzk"; depends=[car ggplot2 polycor]; };
+  ITGM = derive2 { name="ITGM"; version="0.4"; sha256="0vsf3hnqfz029n1skm54s9ynd8alqag963bircqg0psgl9x6jhvi"; depends=[data_table Fgmutils gsubfn plyr sqldf]; };
   IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; };
   IalsaSynthesis = derive2 { name="IalsaSynthesis"; version="0.1.6"; sha256="15iwywvzhgiyigl8f488b7ra89rz0a7ymfsdgdlqfls3fmld7b4a"; depends=[testit]; };
   Iboot = derive2 { name="Iboot"; version="0.1-1"; sha256="1fahh86kgv2axj2qg14n87v888sc0kb567s6zr3fh5zv361phwkq"; depends=[]; };
@@ -1074,78 +1345,107 @@ in with self; {
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
-  InSilicoVA = derive2 { name="InSilicoVA"; version="1.1"; sha256="0zm0q82j5mdpjy7pa0dxx3291dh01q9c21gzjripmggb96fsg39d"; depends=[coda ggplot2 rJava]; };
+  InSilicoVA = derive2 { name="InSilicoVA"; version="1.1.4"; sha256="16978c1bdxbp3xxrcnx8yyar1dd292a5i43qhcymdp7nnprd6gc7"; depends=[coda ggplot2 rJava]; };
+  IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; };
+  IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
   InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
   InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
-  Information = derive2 { name="Information"; version="0.0.7"; sha256="1gri1szvwj4c27s7niz5ss8lws16q3sxxgaz7p9grcbhd5ky5apg"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; };
-  InformationValue = derive2 { name="InformationValue"; version="1.2.1"; sha256="0bbsix2w834jd64d1mgsjlbawrc73yykzd3zf5lwkfr5gka4k1ij"; depends=[ggplot2]; };
+  InfiniumPurify = derive2 { name="InfiniumPurify"; version="1.3.1"; sha256="0yqah4rwpishas0xyv5a7cn4v18brj33cd7f494g21b9brggafq1"; depends=[matrixStats]; };
+  InfoTrad = derive2 { name="InfoTrad"; version="1.1"; sha256="072280famiq6455mc3q00k9xw1jb534308am875ys1bplci63521"; depends=[]; };
+  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]; };
+  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]; };
-  InterSIM = derive2 { name="InterSIM"; version="2.0"; sha256="0vzhrm02m44ckxla0q868nwskkldd5p008xfi3mgp5mh5iqgqpxv"; depends=[MASS NMF]; };
-  InterVA4 = derive2 { name="InterVA4"; version="1.7.1"; sha256="0qdfbvh6ab5w3ym1mydfq0cjimj8ydnh01aw69grhc4is43vr667"; depends=[]; };
+  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]; };
   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]; };
-  InvariantCausalPrediction = derive2 { name="InvariantCausalPrediction"; version="0.4-1"; sha256="0gv1a78cxha6nvx1x234xpyc80wzl27650j79cs26m2pmg86z7kn"; depends=[glmnet mboost]; };
+  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]; };
   InventorymodelPackage = derive2 { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
-  IsingFit = derive2 { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[glmnet Matrix qgraph]; };
+  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]; };
   IsingSampler = derive2 { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; };
   Iso = derive2 { name="Iso"; version="0.0-17"; sha256="0lljc99sdzdqj6d56qbsggibr6pkdwkh821bj70ianikyvmdc1y0"; depends=[]; };
   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]; };
-  IsotopeR = derive2 { name="IsotopeR"; version="0.5.2"; sha256="1ny9drxhp547d9dhdlq78q3nqmril77x1ka6q809j9sklmpvx42q"; depends=[colorspace ellipse fgui plotrix runjags]; };
-  JADE = derive2 { name="JADE"; version="1.9-93"; sha256="0ryj7yiwgrz3cq8q5x6m2srlxxbm26gzs191gs4z9sbjk91vgcnp"; depends=[clue]; };
-  JAGUAR = derive2 { name="JAGUAR"; version="3.0.0"; sha256="0y4h2d4aw546ldwxs7rhpyb7hsby75h53b9vbkqz49105b8zai3j"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; };
+  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]; };
+  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]; };
   JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; };
   JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; };
   JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; };
   JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
   JGR = derive2 { name="JGR"; version="1.7-16"; sha256="0iv659mjsv7apzpzvmq23w514h6yq50hi70ym7jrv948qrzh64pg"; depends=[iplots JavaGD rJava]; };
-  JM = derive2 { name="JM"; version="1.4-2"; sha256="1rsfj7xm5g524xf6v2frkbn3l3bfxn0lrv0qjc81145qn626ybw2"; depends=[MASS nlme survival]; };
-  JMbayes = derive2 { name="JMbayes"; version="0.7-8"; sha256="0pmwlip6bc4757amdsx3j6lz0mkxgi42qvlkncwks2nyqq9nfhn2"; depends=[MASS nlme survival]; };
+  JM = derive2 { name="JM"; version="1.4-5"; sha256="1v3aiz5882kwg8iagmb309i212ndksi6l8bgdnq6j77lixc3a87b"; depends=[MASS nlme survival]; };
+  JMbayes = derive2 { name="JMbayes"; version="0.8-0"; sha256="1kay6na8mb7k2r4alpzm2lb8phjqr3a05qfpv4ydd16rbjrlfbph"; depends=[MASS nlme survival]; };
   JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
   JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
+  JOUSBoost = derive2 { name="JOUSBoost"; version="1.0.0"; sha256="1m4h0jsmnk1sr8h94s7kndmsl6l8rlq65fh17slbadppfgyb1nfd"; depends=[Rcpp rpart]; };
   JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; };
   JPSurv = derive2 { name="JPSurv"; version="1.0.1"; sha256="11hfji0nyfmw1d7y2cijpp7ivlv5s9k8g771kmgwy14wflkyf7g2"; depends=[]; };
-  JRF = derive2 { name="JRF"; version="0.1-3"; sha256="1ljgmvsq8mjl01kl82g5qzp857wjm2zlg9qz4zgjqbawbs4p4s72"; depends=[]; };
+  JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; };
+  JSM = derive2 { name="JSM"; version="0.1.0"; sha256="075zkh732cfrnjmd90pa84yxm8vg230b5r1m1j2b27xxrgng1lgv"; depends=[nlme Rcpp RcppEigen statmod survival]; };
+  JWileymisc = derive2 { name="JWileymisc"; version="0.2.1"; sha256="0cli204f1b5hj3qz62fycww12a6dv7xxxszkxgrxirw6mpdf858c"; depends=[cowplot data_table devtools foreach ggplot2 Hmisc lavaan MASS mgcv mice multcompView plyr]; };
   JacobiEigen = derive2 { name="JacobiEigen"; version="0.2-2"; sha256="1q6wqxlhslip14544px1aq446m77a8s0chvhpc19im014w4g930v"; depends=[Rcpp]; };
   JavaGD = derive2 { name="JavaGD"; version="0.6-1"; sha256="13n6xzbbjgd0bpwv2xgm3dlscg87wh32q6fcq50kk6byp6yv05sc"; depends=[]; };
+  Jdmbs = derive2 { name="Jdmbs"; version="1.0"; sha256="1mhr1z6427lcm018pmllmhhsbnxa7cbmp9a5bjxb5n2zy1j71623"; depends=[igraph rmarkdown]; };
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   JoSAE = derive2 { name="JoSAE"; version="0.2.3"; sha256="0b1jwplds5b7z15v6bvqj1rbn7zxpgvh2ykhqplxzv4mlaw6i0li"; depends=[nlme]; };
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
   JohnsonDistribution = derive2 { name="JohnsonDistribution"; version="0.24"; sha256="00211pa2wn4bsfj6wfl9q9g123cp8iz3kxc17pw9q65j9an4sr0m"; depends=[]; };
+  JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
   JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
   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]; };
   KERE = derive2 { name="KERE"; version="1.0.0"; sha256="1b16cb3ihcsp9jffmd45sd7ia4pibikmj62ad344wmq22q4fpliy"; depends=[]; };
-  KFAS = derive2 { name="KFAS"; version="1.2.2"; sha256="06bkmb6gsh4lxjvmb9p5d143f1xkr9r6nlh4jmf9l297xwv35b7w"; depends=[]; };
+  KFAS = derive2 { name="KFAS"; version="1.2.5"; sha256="144yiwww0vn309dikhj8irppg021qjy3zi6m6yna14payplnqyxr"; 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=[]; };
-  KODAMA = derive2 { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[class e1071 plsgenomics]; };
-  KOGMWU = derive2 { name="KOGMWU"; version="1.0"; sha256="0nk7vbppimrf01wnxsg2wjpagjrzs6gh3a6jlqy9bdfh0j4fm0kn"; depends=[pheatmap]; };
+  KODAMA = derive2 { name="KODAMA"; version="1.4"; sha256="0qzpgj6ljzd8n8vgmf53pmblsmypl86j7njd3pz0d370bxfchsqj"; depends=[Rcpp RcppArmadillo]; };
+  KOGMWU = derive2 { name="KOGMWU"; version="1.1"; sha256="0n07wrpmmvxflxpmhkp3gm40xz2w4j0l8dsljhmfiyxcf5y7kq2g"; depends=[pheatmap]; };
   KRLS = derive2 { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; };
+  KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; };
   KScorrect = derive2 { name="KScorrect"; version="1.2.0"; sha256="1rymzllm97z22xwsn5wbn02c0xp0kfdp73mk9jrk81hfdpd15p4i"; depends=[MASS mclust]; };
+  KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; };
   KappaGUI = derive2 { name="KappaGUI"; version="1.2"; sha256="014d3lshq3avrncd8ydjpn59zalq46v29jrlz3g76wzr96xf5ckr"; depends=[irr]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
   KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
   KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.1"; sha256="1hq4sykddh9sg24qrnccii89nqxmq7hnldhn8wl6y62aj0h1nrqm"; depends=[plotrix Rcpp rgl]; };
-  Kernelheaping = derive2 { name="Kernelheaping"; version="1.5"; sha256="0wzvc537nq0b7dx7wy41gx3sq7ghvniwhz41ldi59gkqcah7ax8m"; depends=[evmix ks MASS sp sparr]; };
+  KernelKnn = derive2 { name="KernelKnn"; version="1.0.5"; sha256="0qrrndmrpqszwdjn1np63g8inz5l98wzsjf7yx0bc8fp8i0lj4lg"; depends=[Rcpp RcppArmadillo]; };
+  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]; };
-  KoNLP = derive2 { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[hash rJava Sejong stringr tau]; };
-  KoulMde = derive2 { name="KoulMde"; version="1.0"; sha256="0dz13j24kyvr8kxs5lyvbjxj8l4i8h4il16qjn7hdnmi39g4khr4"; depends=[]; };
-  Kpart = derive2 { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
+  KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
+  KnowBR = derive2 { name="KnowBR"; version="1.1"; sha256="10cnnr110wyzxlmh8w3gfp53dx9jww0bv95rly8rvp5bhrava8y5"; 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]; };
+  KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.1.1"; sha256="1r9gs7k12djg56bifrpxbkj1kbcqgdpyqnjw5829gsx8881j2z9d"; depends=[dplyr ggplot2 tibble]; };
   KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; };
-  L1pack = derive2 { name="L1pack"; version="0.3"; sha256="0lhixnfb2ga830z91z51r970l5s5qpavbwcmk1pi80180n11kv4i"; depends=[]; };
-  LANDD = derive2 { name="LANDD"; version="1.0.0"; sha256="1w3y3dwq2rwf6arfgb8s70vzc3n7wbkkjanyn8iabk97f3i12r0i"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest Rcpp]; };
-  LARF = derive2 { name="LARF"; version="1.3"; sha256="0crg89d377wkga0bc42y8bfk6chg06afchhgnab6q4dirwv9360q"; depends=[]; };
+  L1pack = derive2 { name="L1pack"; version="0.38"; sha256="1my9fbqry1h3s1dwy8ia6rzkdp8map3n01vfwp0ddx4bw1mz2ffv"; depends=[]; };
+  LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; };
+  LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
+  LBSPR = derive2 { name="LBSPR"; version="0.1.0"; sha256="1wiv0y2cbvxxcm9ywklp874d2v5412xw1p2v2rx90zlaq55ln7gv"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp tidyr]; };
   LCA = derive2 { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
   LCAextend = derive2 { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot kinship2 mvtnorm rms]; };
+  LCF = derive2 { name="LCF"; version="1.6-6"; sha256="1pcm1fdf0s2ygd425h2yi3j4r41zwi2bq2xsc20ymzq8lxq7d4rb"; depends=[quadprog]; };
   LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; };
   LCMCR = derive2 { name="LCMCR"; version="0.4.1"; sha256="1pn11a0h4986wvllkpspymvh1qyi5vhpcz0qg7wa32jbla9is87s"; depends=[]; };
   LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; };
@@ -1153,9 +1453,12 @@ in with self; {
   LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
   LDRTools = derive2 { name="LDRTools"; version="0.2"; sha256="0k4j3l21n8b3nvhmfjhwhs3klw09a0dz6cl6gmi2yx7jr21ar6xc"; depends=[]; };
   LDcorSV = derive2 { name="LDcorSV"; version="1.3.1"; sha256="0i4npl90mkj8vry6ckq8bc4ydbl44vxichgsxyn80r6k9i71yl67"; depends=[MASS]; };
-  LDheatmap = derive2 { name="LDheatmap"; version="0.99-1"; sha256="1bj42chw1xyf8yg6cfv9p4yzsggng7zy6wrw6q22559pwm6c6vr0"; depends=[genetics]; };
+  LDheatmap = derive2 { name="LDheatmap"; version="0.99-2"; sha256="0n80l4wl9rs4ps8h2bjpar5nidq7bg05d6675wiwanx24q6fc0bs"; depends=[chopsticks genetics]; };
   LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
+  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]; };
   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]; };
@@ -1167,10 +1470,11 @@ in with self; {
   LIStest = derive2 { name="LIStest"; version="2.1"; sha256="1gk253v3f1jcr4z5ps8nrqf1n7isjhbynxsi9jq729w7h725806a"; depends=[]; };
   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.2"; sha256="0ivsqc89zi6dxhkjnqakvm4da3vpn03lbid9m2aklf9b5jk06247"; depends=[MASS MultiLCIRT]; };
+  LMest = derive2 { name="LMest"; version="2.3"; sha256="0jgfdkzx8zhfjsmx828j1x1dmikqhdpgpqzr7nq8zyr4805l67xx"; depends=[MASS MultiLCIRT]; };
+  LNIRT = derive2 { name="LNIRT"; version="0.1.0"; sha256="0szcdp9vl1mifb3ybwi836xif7b57vk2jqp0zcadkfardjpc7pd0"; 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.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[e1071 gdata MASS miscTools pcaMethods shapes]; };
+  LOST = derive2 { name="LOST"; version="1.2"; sha256="1ymdhd2iayqyf7kvvcc234bslxn1wdds54m1bi234g1f4ljj1qv8"; depends=[e1071 gdata MASS miscTools pcaMethods shapes]; };
   LPCM = derive2 { name="LPCM"; version="0.45-0"; sha256="15gpb59556s28npdsw1r821rld7b11y1m2m97m320n9k0z4vbk3i"; depends=[]; };
   LPM = derive2 { name="LPM"; version="2.6"; sha256="0fr84l4qxr1ckjafw0i8g6fn74g8qavcs218g3wa03ckab0y98ps"; depends=[fracdiff MASS QRM]; };
   LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; };
@@ -1182,31 +1486,39 @@ in with self; {
   LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; };
   LS2W = derive2 { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
   LS2Wstat = derive2 { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
-  LSAfun = derive2 { name="LSAfun"; version="0.5"; sha256="1f4bv7c7y0ydq2xddr1y4mhp8i9xnjbndvmqnpkvlj702dx63rdx"; depends=[lsa rgl]; };
+  LSAfun = derive2 { name="LSAfun"; version="0.5.1"; sha256="0wj2j53jizg014sppag9zbs5hzc3mvpg1fx1s7l4ff6rabhgvlff"; depends=[lsa rgl]; };
+  LSAmitR = derive2 { name="LSAmitR"; version="1.0-0"; sha256="18rpvbiq3vqdcxzbx15x16y4hwdk050fk0wpccwcdgzlf79fjv6f"; depends=[Hmisc lme4]; };
   LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; };
   LSD = derive2 { name="LSD"; version="3.0"; sha256="069p33aw6iwikp82b7b8wa77wlyjqwr4hcwvrgaxgwqdgn6jjg3k"; depends=[]; };
-  LSDinterface = derive2 { name="LSDinterface"; version="0.2.1"; sha256="1n8ynb99avn6nlhfnl1k8yn5qywhgin67fzk7b7c4b2dd3bhjd3w"; depends=[abind]; };
+  LSDinterface = derive2 { name="LSDinterface"; version="0.3.0"; sha256="146qahfqqk9nvi52dv0z3v8yy4zhs9y295hzaaczxa2kqii2wprb"; depends=[abind]; };
   LSMonteCarlo = derive2 { name="LSMonteCarlo"; version="1.0"; sha256="0w5042phkba5dw92r67ppp2s4khjpw5mm701dh9dya9lhj88bz6s"; depends=[fBasics mvtnorm]; };
+  LSPFP = derive2 { name="LSPFP"; version="1.0.0"; sha256="074qd7zxa54cawipmba1khb6hyrkg553vc25gf2z0ydyv14shm0w"; depends=[bit64 data_table R_utils RCurl seqinr tcltk2]; };
   LSTS = derive2 { name="LSTS"; version="1.0"; sha256="1vgdqyj6k50gqfffqfb4n3sw27jrq21nl2h8sz8942w4a8fn7sgv"; depends=[]; };
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
+  LTRCtrees = derive2 { name="LTRCtrees"; version="0.1.5"; sha256="08g6bb2fbjw7xssav1n2hgr3x7wdpczvbdz2kgrgv8bhl1f4k9yx"; depends=[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]; };
-  LaF = derive2 { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp]; };
-  Lahman = derive2 { name="Lahman"; version="4.0-1"; sha256="058rn595rnh2wl7qqrqd5smzzb486cn46lx2ifjc8nijm83lzhfx"; depends=[]; };
-  LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.4.1"; sha256="0bki7q1r3q80kg5kdxpig4lpzcy978zy9jx9mv40643idskrx2z3"; depends=[plyr rLakeAnalyzer]; };
+  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]; };
+  LakeMetabolizer = derive2 { name="LakeMetabolizer"; version="1.5.0"; sha256="06mvdrdyl0rh9rwd0jxww0sycadcp7cj08hq35q6vyzq0jkxn2xf"; depends=[plyr rLakeAnalyzer]; };
   Lambda4 = derive2 { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
-  LambertW = derive2 { name="LambertW"; version="0.6.2"; sha256="0sl47s82mkkn2yhdppnh37fb6kb38ilzp6gn16jvl24jzcr7mjkn"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; };
-  Langevin = derive2 { name="Langevin"; version="1.1.1"; sha256="0zkd3ifv8w1szxf22740qn7cv7b0bahq988lbr14smkrm3qyq37v"; depends=[Rcpp RcppArmadillo]; };
+  LambertW = derive2 { name="LambertW"; version="0.6.4"; sha256="09ygalklv0d767nwziqwaxa7h517rzqgaznmb04q43122x2gwb3k"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; };
+  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]; };
   Laterality = derive2 { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
-  LatticeKrig = derive2 { name="LatticeKrig"; version="5.4-1"; sha256="1lbnrjsfc9yirg18qx8jc20f9xhymf125p3g4bqp3kqa1mcjzvxs"; depends=[fields spam]; };
+  LatticeKrig = derive2 { name="LatticeKrig"; version="6.2"; sha256="1d3qphpydgrqkyk5y5pr6jjndaf9vnfcin447x4z0iczannhggbk"; depends=[fields spam]; };
   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.1"; sha256="0k085idzs2ka8pqlmii5xcmbv7wm3syicy36gc183wycibv3ii9f"; depends=[]; };
+  LeafArea = derive2 { name="LeafArea"; version="0.1.5"; sha256="1a3yygpnc160qkwp3fd6aksynd533z5slncvby06byngqb42ib4h"; depends=[]; };
   LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
-  LexisPlotR = derive2 { name="LexisPlotR"; version="0.2"; sha256="0l1cd32kl0690n07f27dmjp5975zgv57zi3km5g3xjiq3lnk8hqr"; depends=[ggplot2]; };
-  LiblineaR = derive2 { name="LiblineaR"; version="1.94-2"; sha256="11q3xydd4navpfcy9yx0fld8ixb6nvnkc7qxwrhvackiy810q86i"; 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]; };
+  LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
   LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; };
   Libra = derive2 { name="Libra"; version="1.5"; sha256="1kd3d06qjswqhwdsjkijixd4yijzks8xcdrkpyh99dwg045fg9h7"; depends=[nnls]; };
   LifeHist = derive2 { name="LifeHist"; version="1.0-1"; sha256="0q6l6rva5kxl8yzqa7ni4sdj6p4c61sdsjx8zhckzxb7xlwg2hh0"; depends=[BB Hmisc optimx]; };
@@ -1215,34 +1527,43 @@ in with self; {
   LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; };
   LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-1"; sha256="0w7s3i6i2wnydh88l8lnzrh6w5zqkcwvms91iizis0mwd9af2jdl"; depends=[rpanel xtable]; };
   LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.6"; sha256="10a1m4yqr02gg5akxknwmhrlbqxnza78z8rm0ym36c4vlz8b0hyi"; depends=[stringr]; };
+  LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; };
   LinearRegressionMDE = derive2 { name="LinearRegressionMDE"; version="1.0"; sha256="0nl29l10y5kpds1i4sv7jwizq61fmh5c0zpj8x64qfif4l6y4v0d"; depends=[]; };
   LinearizedSVR = derive2 { name="LinearizedSVR"; version="1.3"; sha256="0h3xmlnd5x37r5hdhcz90z5n1hsbr2ci3m939i89p1x9644i2l5g"; depends=[expectreg kernlab LiblineaR]; };
-  LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.1.0"; sha256="0dp4w8dk14vdrh3kgb6wqbc1j7nc86giajhfb1iv10mc72wplxm6"; depends=[]; };
+  LinkageMapView = derive2 { name="LinkageMapView"; version="1.0.0"; sha256="0139bnlfj66w1npiv6dh4y4aln65nsfwf2qfzkxypigcyvxxyjwd"; depends=[plotrix]; };
+  LinkedMatrix = derive2 { name="LinkedMatrix"; version="1.2.0"; sha256="14q8n0zqm21fwfyfqvxdacxj6mdipgi2143d8xksifk5ihhdj64v"; depends=[]; };
   Lmoments = derive2 { name="Lmoments"; version="1.2-3"; sha256="13p0r4w16jvjnyjmkhkp3dwdfr1gap2l0k4k5jy41m8nc5fvcx79"; depends=[]; };
+  LncFinder = derive2 { name="LncFinder"; version="1.0.0"; sha256="1ygbmazjm2jk0wrd13khpx8rkwd51cb50qxs2zdad0w09705mpsx"; depends=[caret e1071 seqinr]; };
   LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; };
+  LncPath = derive2 { name="LncPath"; version="1.0"; sha256="1cihwlj5sv000qg2wa931yx4ca6nixgihjna4g3fh7nr5aiv6cfn"; depends=[igraph samr]; };
+  LncPriCNet = derive2 { name="LncPriCNet"; version="1.0"; sha256="19cw3x97xv42kc4jag7axnmpd0nfnwg7vnwcn2bgcmm5gapmfn1h"; depends=[]; };
   LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.6"; sha256="0ckaac00ck5vyv0gv25l1zhgkm3char6ks1p4fl3vdl5gdyrc1pp"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
   LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
   LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
-  LogicReg = derive2 { name="LogicReg"; version="1.5.8"; sha256="0hjh4wk7dh1ryc75kipdgmkvhz15h46gr9qc5pk49286h11fbnsi"; depends=[survival]; };
+  LogicOpt = derive2 { name="LogicOpt"; version="1.0.0"; sha256="15wcc2655vn1yz9gwxmqm9n1lmybk2gf4nlwz4i02kk4gabdazz0"; depends=[]; };
+  LogicReg = derive2 { name="LogicReg"; version="1.5.9"; sha256="0rxzhbf51psdj7wb2dcah16y8f5q7y8p0yybz54rm00d1qagl6nq"; depends=[survival]; };
   LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; };
   LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; };
   LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
   LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-4"; sha256="02p46agsdbvw6dpgzahq9hfmy184jrkwa1hhnrcbrsmm54n3m2bx"; depends=[nlme]; };
   LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; };
   LowRankQP = derive2 { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.5.1"; sha256="0jxx2ldcm814qbdqzgqc7gbf4ymaqyvzykbxzp2cfqhvg20rkh7s"; depends=[bbmle data_table digest httr matrixStats minpack_lm raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  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]; };
   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=[]; };
-  MAINT_Data = derive2 { name="MAINT.Data"; version="0.5.1"; sha256="12vxy2l7mjp4dalg59zp0rd8cy3548vdqpzdkiq2rhvf9fvymxzr"; depends=[MASS miscTools]; };
-  MALDIquant = derive2 { name="MALDIquant"; version="1.14"; sha256="1f6g1ra2hvihdxqgydbh06azddx5m4rcvx2dzq9rh2fjnk1a0kpa"; 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=[]; };
   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="0.7"; sha256="0ggww2260qgf51329a9vp0386i5mn3772aw56qwxyhbxyh7bkayw"; depends=[mvtnorm]; };
-  MAMSE = derive2 { name="MAMSE"; version="0.1-3"; sha256="06q6raqbyi9zwg3wzaygqmfs3di55fh4bln3vscdw95kma4hz9km"; depends=[]; };
+  MAMS = derive2 { name="MAMS"; version="1.0"; sha256="1y322is7c60naaz4cb090wpavw71y7hvx6n3k41ig8rfh096f60b"; depends=[mvtnorm]; };
+  MAMSE = derive2 { name="MAMSE"; version="0.2-1"; sha256="0spi7fqkxjiw5j0nf7ambcr8kpzdhjzh9y3dk23y1mrk2dgc5dkw"; depends=[]; };
   MANCIE = derive2 { name="MANCIE"; version="1.4"; sha256="0940xl3z5bca6hcnj2bj341l79wajilxlxzmyz3dlgrz0b3bbdmm"; depends=[]; };
-  MAPA = derive2 { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv446pdw4gw5qzxp85hgvm8bvg"; depends=[forecast]; };
+  MANOVA_RM = derive2 { name="MANOVA.RM"; version="0.0.4"; sha256="1xw0wk2a14xwgay3vw7s1sxpwrmm01lqnfphcnhf1iyhdsxqnnnc"; depends=[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]; };
   MARSS = derive2 { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; };
@@ -1251,80 +1572,96 @@ in with self; {
   MAT = derive2 { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp RcppArmadillo]; };
   MATA = derive2 { name="MATA"; version="0.3"; sha256="006mnc4wqh9vdigfzrzx4csgczi0idvlwb6r23w5mmsfbn0ysdm5"; depends=[]; };
   MATTOOLS = derive2 { name="MATTOOLS"; version="1.1"; sha256="1nzrkm3a08rpsd9vplyf33rrkadlrd0ln70k95qxj98ndh2v97px"; depends=[]; };
-  MAVIS = derive2 { name="MAVIS"; version="1.1.1"; sha256="1ydmnf4nn1d0iik3ldkk8d4291fvzhrgsjm0qkzd242r0mm2ss2p"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS]; };
+  MAVE = derive2 { name="MAVE"; version="0.1.7"; sha256="10blz9axxnnjcdg796gr2y27f4mjb1b5daw23llzrclgg2fsykgf"; depends=[Rcpp RcppArmadillo]; };
+  MAVIS = derive2 { name="MAVIS"; version="1.1.2"; sha256="1ankgazqf368jhj8csmyyvlys27d61s41fcxq3s324gz69xh25ll"; depends=[compute_es ggplot2 MAc MAd metafor quantreg SCMA SCRT shiny shinyAce shinyBS weightr]; };
   MAVTgsa = derive2 { name="MAVTgsa"; version="1.3"; sha256="0rzal9nsi8y873cbf6hrdyzyxnpd4r1yr9fj66cn0s1c8g93ls0y"; depends=[corpcor foreach MASS multcomp randomForest]; };
   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]; };
   MBCluster_Seq = derive2 { name="MBCluster.Seq"; version="1.0"; sha256="0xbi2r0g0gzsy05qrq1ljr5f5s3glwxj204vk2f1lgwdx3fd116m"; depends=[]; };
-  MBESS = derive2 { name="MBESS"; version="4.0.0"; sha256="09sz3g78h584034v9xx8n03swnc01mabiavhryr0hcgsh2hdhz9i"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; };
+  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]; };
   MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
+  MBSGS = derive2 { name="MBSGS"; version="1.0.0"; sha256="1g13bjxmbnd7fwb3nv1s87ra7iwjkvid9pfwy7qxixy80pdrlfz5"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; };
   MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; };
   MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
   MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
-  MCAPS = derive2 { name="MCAPS"; version="0.3-2"; sha256="1jvxl9xi102pcs3swxlx4jk76i7i4fll88c92k7m379ik3r36alb"; depends=[stashR]; };
-  MCDA = derive2 { name="MCDA"; version="0.0.12"; sha256="1lvnsv4x35wh8gzdjqql9rpzxx0x6jyrgm5bdlmak38l6gg3r87w"; depends=[glpkAPI Rglpk]; };
-  MCDM = derive2 { name="MCDM"; version="1.0"; sha256="0lajn4kv6hjxkrac08wvviws8lv6nnr70ibclm5cnwmvvaxfvn4d"; depends=[]; };
-  MCI = derive2 { name="MCI"; version="1.0.0"; sha256="1p2qr9jf3zir7pccsw0fqy0f2ics177n4097r2wcwch86by47naq"; depends=[]; };
+  MCAvariants = derive2 { name="MCAvariants"; version="2.0"; sha256="0akff64v49d5r0wvspal0pz17jhz1ry4vdmj47m28gzjj69zcab0"; depends=[]; };
+  MCDA = derive2 { name="MCDA"; version="0.0.16"; sha256="1yxcpvapn9dv802z3fm0sfgf8lkpsniwb41qnb8lbvmqnyzmkqhw"; depends=[glpkAPI RColorBrewer Rglpk]; };
+  MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; };
+  MCI = derive2 { name="MCI"; version="1.3.0"; sha256="0256rxsjcrwyah4ixhfl3ba46sh02sq3rc1h0mx2jckycdf0nx9r"; depends=[]; };
   MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
   MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; };
-  MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.2"; sha256="1ii5ryb58z4xwg69mximdjmxamkwz6k2ydf6qkd1jcq50afjv0pp"; depends=[coda ggplot2 MCMCglmm]; };
-  MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; };
-  MCMCglmm = derive2 { name="MCMCglmm"; version="2.22.1"; sha256="045qxdqq58jf5rrx8jxp8db8s2i9hdi5abvkmcz0hjh146gpgimf"; depends=[ape coda corpcor cubature Matrix tensorA]; };
-  MCMCpack = derive2 { name="MCMCpack"; version="1.3-5"; sha256="1jjj6v1nhdwaf6g9w0npdn07s02m58vi3va8b2knwzb1z68cjrqq"; depends=[coda graph lattice MASS mcmc quantreg Rgraphviz]; };
+  MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; };
+  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]; };
+  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-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[lattice mvtnorm]; };
+  MCPMod = derive2 { name="MCPMod"; version="1.0-9"; sha256="03zqassvyqwllg1yjfdg2zxamkg2dy8cy19ki5srpn6clv5zy1rj"; depends=[lattice mvtnorm]; };
   MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
   MCS = derive2 { name="MCS"; version="0.1.1"; sha256="0fxc5ri4ci3r5w1hdicqm1j0g6fwrl3wng7qwc2c0isagrn3vp4n"; depends=[]; };
   MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; };
   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.3.0"; sha256="1135jvqbmh1811jw9ih0jvh7nv2d157yv7alwr8shlpx2vzlbbcw"; depends=[CompQuadForm]; };
+  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]; };
   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="0.3"; sha256="1p46ggriwjrjrkbv9xkhpjiivz1gml0c2anpfrm83y2y9is19z37"; depends=[gplots gtools MASS RColorBrewer]; };
+  MDplot = derive2 { name="MDplot"; version="0.3.1"; sha256="1d5gv47zaal6vsfi10vfjvawdm911pnhjradhkrd647w54iykl59"; 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.3-2"; sha256="0x518awi2mxjh3vq69n1jv4d4dxjxhqfx1py48dijgd6w674d3q8"; depends=[geepack glmnet kinship2 Matrix mvtnorm]; };
+  MESS = derive2 { name="MESS"; version="0.4-3"; sha256="0317nk2lbrrflg6gaz7nz413n4i79xvh6jndw0m4dzlwmcj6al2r"; depends=[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=[]; };
-  MFAg = derive2 { name="MFAg"; version="1.3"; sha256="1f5kd5zvk28jd8km4py4msyv69700knj20db5c528f2j8sd8qavc"; depends=[]; };
+  MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; };
   MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
+  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=[]; };
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
-  MGSDA = derive2 { name="MGSDA"; version="1.2"; sha256="0a465kali82x9c0hld8f1m285d7zw0cf93lps87amlj3ck0nhh8z"; depends=[MASS]; };
-  MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0"; sha256="1hp0v7w611b9a4k7zck3zx15b0298z1i2vrl2w35nw74iqpicrhh"; depends=[mgcv]; };
+  MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; };
+  MHTdiscrete = derive2 { name="MHTdiscrete"; version="0.1.3"; sha256="14qhrja5b2nxph3mda55y31jix41i6w884m9yl4c0f9g730ai7l6"; depends=[]; };
+  MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; };
   MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
-  MIICD = derive2 { name="MIICD"; version="2.2"; sha256="16r3ry27iki32f2y4ic6w15fgr21wrs0qbiiyx23nqivvw8x4017"; depends=[MASS mstate survival]; };
-  MIIVsem = derive2 { name="MIIVsem"; version="0.4.7"; sha256="1k0rfs5cm7n5xpk472mv74p3l2ic2y8vij6dfcv918jm5xsnz9sz"; depends=[lavaan Matrix]; };
+  MIAmaxent = derive2 { name="MIAmaxent"; version="0.4.0"; sha256="0i2bw9s9zm2bfi121aafaqf86zvimf4gzix50wdh2q96bn61bb2s"; depends=[dplyr e1071 raster]; };
+  MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; };
+  MIICD = derive2 { name="MIICD"; version="2.3"; sha256="08ygn2qqxzcnhs7rbd721i7h40l6n882xnmgi3li72vxyq64ndfa"; depends=[MASS mstate survival]; };
+  MIIVsem = derive2 { name="MIIVsem"; version="0.4.8"; sha256="1l0n4zgjg8nzapjs65dlirlr13sgzmk2750rwjghxzdcinjbjsmb"; depends=[lavaan Matrix]; };
   MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
   MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
   MIXFIM = derive2 { name="MIXFIM"; version="1.0"; sha256="0m4fnmdd8lsdxq629f87lzz1cdc1q0j3q9hqna85ncpflyfwlvg9"; depends=[ggplot2 mvtnorm rstan]; };
   MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
   MKLE = derive2 { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
-  MKmisc = derive2 { name="MKmisc"; version="0.991"; sha256="0zswd681rzhzaf51ij8szah1r8dix870k3rqajqbr60nw4ahnfip"; depends=[RColorBrewer robustbase]; };
-  MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="1.1"; sha256="1zp50y0628f69jn0bqi9lw9qrhh9rq275xl2nl6hakhc1z6mqkj0"; depends=[limSolve MASS MultiLCIRT]; };
+  MKmisc = derive2 { name="MKmisc"; version="0.993"; sha256="0zhscicwcppwhpylax69ablkfllgf6f4fmp1gb7yi2cm59f94ny1"; depends=[RColorBrewer robustbase]; };
+  MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1"; sha256="07fhbhfnlmllxxdpdqiaz6d72y4pj3vrz6lw5rnlb2m7vknx51ik"; depends=[limSolve MASS MultiLCIRT]; };
   MLCM = derive2 { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
   MLDS = derive2 { name="MLDS"; version="0.4.5"; sha256="1a5y031kd6zx0zqlk6dvxzsv3isbvg9jap4gqad2jwryh0a9x3c1"; depends=[MASS]; };
   MLEcens = derive2 { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
+  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.0.0"; sha256="05j8hwcvfrsslib5k4w3xwkllb3rxdxazsld26zpjf3dc643ag9a"; depends=[]; };
+  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.0"; sha256="0xrdynns2w3rgpf2hliyn80x3an17kpisbkpfhwsak87pbfamk9i"; 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=[]; };
-  MNM = derive2 { name="MNM"; version="1.0-1"; sha256="0fy43jfd7wak2rfdv5hdq7zc0zsxnbz9p69g6sla0zliibafg0q6"; depends=[ellipse ICS ICSNP SpatialNP]; };
+  MNM = derive2 { name="MNM"; version="1.0-2"; sha256="10ikn53filbl5qnwp9d54ds2wmzjgxp5xkkp694q75r5crl4wv65"; depends=[ellipse ICS ICSNP SpatialNP]; };
   MNP = derive2 { name="MNP"; version="2.6-4"; sha256="068lssg565dw673dm8f5k6dbxl2vblnszg8wibzy3ijf96hp03cw"; depends=[MASS]; };
   MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; };
   MOCCA = derive2 { name="MOCCA"; version="1.2"; sha256="04smpzn9x64w1vpw4szqa7dwnaak1ls6gpg7fgajs68mv5zivffa"; depends=[cclust clv]; };
-  MODISTools = derive2 { name="MODISTools"; version="0.94.6"; sha256="0jzs2dvhq48zjzb2rj6yxws8i2h7w2k00vg7xg5riad4v9j9jk0c"; depends=[RCurl XML]; };
+  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]; };
   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]; };
@@ -1335,301 +1672,365 @@ in with self; {
   MPSEM = derive2 { name="MPSEM"; version="0.3-1"; sha256="1c4788qvvn02hnihlz56h2nsj7qfdaw3x2i7jmkd9ll2jsszav3v"; depends=[ape MASS]; };
   MPTinR = derive2 { name="MPTinR"; version="1.10.3"; sha256="0281w5dhg8wmi1rz80xribq437shp4m890c504kggsacr28mbhkw"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; };
   MPV = derive2 { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
-  MRCE = derive2 { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
+  MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; };
   MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
   MRH = derive2 { name="MRH"; version="2.2"; sha256="1icwlq8js58g9fkiq7fwjg8r97ca47xl3dscnhnga99gkgsfgjwl"; depends=[coda KMsurv survival]; };
-  MRIaggr = derive2 { name="MRIaggr"; version="1.1.5"; sha256="0c0whxdwamli1m9xnhv9kdv7zcb0sprlhdxw3c7800s311xg0iq4"; depends=[Matrix oro_dicom oro_nifti RANN Rcpp RcppArmadillo RcppProgress ROCR spam]; };
-  MRMR = derive2 { name="MRMR"; version="0.1.3"; sha256="1b3a4bkpcncl4sh7d81nk6b2dzhzqn9zhqdxv31jgippsqm2s3k2"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
+  MRMR = derive2 { name="MRMR"; version="0.1.4"; sha256="0dgbhlynaaka7mdzl6igwgcdzvy6cm2y8mbxaf9pfla8w3z8y0lq"; depends=[ggplot2 lmtest lubridate plyr reshape2]; };
   MRQoL = derive2 { name="MRQoL"; version="1.0"; sha256="0isn4g3jpz7wm99ymrshl6zgkb7iancdzdxl2w98n8fbxsh5z6sw"; depends=[]; };
-  MRS = derive2 { name="MRS"; version="1.1"; sha256="1bzw36ba2nzic0vsr7ipmf6d5vrglf9fhlppnw4q8y81q5jla3q2"; depends=[igraph optimx Rcpp RcppArmadillo]; };
+  MRS = derive2 { name="MRS"; version="1.2.1"; sha256="07kpj5q1slplqm3907yj74dkfq348a9fwfr0dzhjzdbkhph2iwpi"; depends=[igraph optimx Rcpp RcppArmadillo]; };
   MRSP = derive2 { name="MRSP"; version="0.4.3"; sha256="0zv22xiq3qh9x3r2ckkvq1vv0vkcirh8y87053bqvw1m20j7q1by"; depends=[Formula matrixcalc]; };
   MRsurv = derive2 { name="MRsurv"; version="0.2"; sha256="148myzk6r8whkpv1yv59dmdlr2n8vdwmaww165aw696xfjxwq550"; depends=[mvtnorm survival]; };
   MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; };
-  MSBVAR = derive2 { name="MSBVAR"; version="0.9-2"; sha256="1p6n8vbrlqqq1vbqvxnn0ffmnr462gslb1jkaf4vcrndbln5cclq"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; };
+  MSBVAR = derive2 { name="MSBVAR"; version="0.9-3"; sha256="0ybkkl3hfff2jgz4a0z105bb0v6jl4dkkqmdg382and8w0mc496c"; depends=[bit coda KernSmooth lattice mvtnorm xtable]; };
+  MSCMT = derive2 { name="MSCMT"; version="1.2.0"; sha256="0ypysx3782nipz2zgvp2h183nhak47gnjh2xvfpzqmn49vd8x0fc"; depends=[ggplot2 lpSolve]; };
   MSG = derive2 { name="MSG"; version="0.3"; sha256="181kzkbw69bs3vir6dzgq7jzp8xcpg1p4isfb660vgnd1flb03ix"; depends=[RColorBrewer]; };
+  MSGARCH = derive2 { name="MSGARCH"; version="0.17.7"; sha256="01n8ngk0r2hfa5vrj0mbc09kq9dj0d4fjzhszcj80mzfr47jf5vf"; depends=[adaptMCMC DEoptim dfoptim expm fanplot ggplot2 nloptr Rcpp RcppArmadillo reshape2 stringr zoo]; };
+  MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; };
   MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
-  MSQC = derive2 { name="MSQC"; version="1.0.1"; sha256="1vs9kygjg9f4sr1m80hdn03gdhbdqfjamqxhbs9zha8smjrsgisw"; depends=[rgl]; };
-  MST = derive2 { name="MST"; version="1.2"; sha256="1zx5gs6c8qa5b56c4z8zc96kggy5qc3fff9q7ki58zg36rbhi0wm"; depends=[MASS survival]; };
+  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]; };
   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]; };
+  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.7.0"; sha256="0hs5qj4ngjpwgm0wjhkdf68cpyvvmf1d49za3mighqpqzib9z36w"; depends=[base64enc curl digest XML]; };
+  MTurkR = derive2 { name="MTurkR"; version="0.8.0"; sha256="0q498chr2s67ai7lfxi6kdficqbs5sxj9asyv69z2a37fmsr4va7"; depends=[base64enc curl digest XML]; };
   MTurkRGUI = derive2 { name="MTurkRGUI"; version="0.1.5"; sha256="1rlgz80na0v1nx70cda1fzyswlb1lg5kcx64zl9dcqy6accsrpmp"; depends=[curl MTurkR XML]; };
   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]; };
-  MVN = derive2 { name="MVN"; version="4.0"; sha256="1ql50ch6qig7r0xnfv5f74k3vc32k04jgmvjbndgyzbacn2ibrm7"; depends=[MASS moments mvoutlier nortest plyr psych robustbase]; };
-  MVR = derive2 { name="MVR"; version="1.30.3"; sha256="164q259c1j7da3mcc79zjyisxzr5p4rdaps4dcxfvpfbwg1wkdyj"; depends=[statmod]; };
+  MVLM = derive2 { name="MVLM"; version="0.0.1"; sha256="1vl6wn7ryn529bhx2l5frw89dqn79bnk4qfih4mj1dyycwh3h4fj"; 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.6"; sha256="09ln186nx713kp9kdi4zwxmg7kjzksh7skxkgf1mq8szvvzb1r8n"; depends=[]; };
-  MXM = derive2 { name="MXM"; version="0.8"; sha256="0929nk4h7vjs0fx7m9mvm5lrby5bp6jwjbzgv71h1vpgbm2sfqdm"; depends=[betareg doParallel foreach Hmisc lme4 MASS nnet ordinal pscl quantreg ROCR speedglm survival TunePareto]; };
+  MVar_pt = derive2 { name="MVar.pt"; version="1.9.6"; sha256="0gwprgf22lna4d8bifq381p5hv7ws3nnj08m6rrjnisgl158459w"; 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]; };
   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]; };
-  ManlyMix = derive2 { name="ManlyMix"; version="0.1.2"; sha256="0fa1wqz3fnq838azqd42937l5z1sk76cxbg8vpzx7sxxmn1v1a08"; depends=[]; };
-  ManyTests = derive2 { name="ManyTests"; version="1.1"; sha256="11xk3j2q7w6b6ljmp7b8gni0khpmpvcvzwxypy0w8ihi2gaczsxj"; depends=[]; };
+  Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; };
+  ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.2"; sha256="0ywkd4i9bxavxffh89sxcz995vfnk1czcvcjdwzbvrpxa5fwbx79"; 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=[]; };
-  MapGAM = derive2 { name="MapGAM"; version="0.7-5"; sha256="0bpswdi7iic7hsqrwcxwv27n4095m292nv5db6d4mj9gvp13h7i7"; depends=[gam maptools sp]; };
-  MareyMap = derive2 { name="MareyMap"; version="1.3.1"; sha256="1ql9mvmlw2m8b35dmv6c7338jzmnizdjwxf7m12m55cf6vf8lph8"; depends=[tkrplot]; };
-  MarkowitzR = derive2 { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04w5f6s6qs51db8jccpfj10sighsv1l7d056n2xjn"; depends=[gtools matrixcalc sandwich]; };
-  MasterBayes = derive2 { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
-  MatchIt = derive2 { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
+  MapGAM = derive2 { name="MapGAM"; version="1.0"; sha256="1hzv3sy2szxl4fhnnzlwagh3qm4z22cbhiwi8whgn5ymwlnw0pca"; depends=[gam maptools sp survival]; };
+  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]; };
+  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]; };
   MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
-  Matrix = derive2 { name="Matrix"; version="1.2-4"; sha256="1ikrzc17bi0b5ldz63cgyfjmgf7pp8xv7xnx131n3gigl31nz6wd"; depends=[lattice]; };
-  Matrix_utils = derive2 { name="Matrix.utils"; version="0.5"; sha256="04ss99wbpcm7ad5kkznppyf5fa869fgghk4rhv0nds1fdp17hrzl"; depends=[Matrix]; };
-  MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.8.0"; sha256="1xn21ngxyr3jj07whlclpikmp1hd59wp3i76ql2r8vwczx8nwxil"; depends=[plotrix pracma progress rARPACK Rcpp RcppArmadillo]; };
+  Matrix = derive2 { name="Matrix"; version="1.2-8"; sha256="1dyv42d7ranb85y8hvi57hbg5xnvhdzqn56wcq3qmhazqj3s3liw"; depends=[lattice]; };
+  Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.5"; sha256="057lms2xdp13wcglg8hg95blj60f5zhva26jlkm2z1vi11jiy728"; depends=[grr Matrix]; };
+  MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9"; sha256="0yax7ali6g8i5qwgrhg1m6f8vi0c2rlyfjc2l9ar0kj5zg1dix86"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; };
   MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
+  MatrixLDA = derive2 { name="MatrixLDA"; version="0.1"; sha256="19q6wl8fc6jzn7544qnlpzfh9v0xlg9cr78l6k8kx6kzjnbnyh9z"; depends=[glasso plyr Rcpp RcppArmadillo]; };
   MatrixModels = derive2 { name="MatrixModels"; version="0.4-1"; sha256="0cyfvhci2p1vr2x52ymkyqqs63x1qchn856dh2j94yb93r08x1zy"; depends=[Matrix]; };
   MaxPro = derive2 { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
-  MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-0"; sha256="0001kj0wnma4gmndxwz11dq6jq7kgcrvlw9iikf2w15lnmmihwzl"; depends=[ggplot2 raster]; };
-  MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.4.3"; sha256="0ysfs03as0h4d0nwk40fhm6v9rf1rr0mfwdc5d5y8iigagqzcj9s"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
+  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]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
   Mcomp = derive2 { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
-  MeanShift = derive2 { name="MeanShift"; version="1.0-2"; sha256="1dj3zgqyggl4vyz2j008c33600j7cjkqh20zs46wy95yfhjj6jf9"; depends=[]; };
+  MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; };
   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.2"; sha256="1q3i5j319gb8h3qvz2m1mds2a1042dzs8x5xln0v6fzc0k4nzyjr"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; };
+  Mediana = derive2 { name="Mediana"; version="1.0.4"; sha256="0kk9gv2dzhg1y8s68aws327ysx33cy622djbfd5isbr7ikv2h80v"; depends=[doParallel doRNG foreach MASS mvtnorm ReporteRs survival]; };
+  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]; };
   MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; };
+  MetFns = derive2 { name="MetFns"; version="2.2.0"; sha256="16l55wrbxhpyy97ihw606s41zbvmshygdfjxladhca0pf7zpj29y"; depends=[astroFns fBasics lubridate plotrix spatial]; };
   MetNorm = derive2 { name="MetNorm"; version="0.1"; sha256="0vfi3k0yp2dz47gwj1n1avs3ji0a2nlrrljz5d0l66zfh4474jb4"; depends=[]; };
+  MetProc = derive2 { name="MetProc"; version="1.0.1"; sha256="1z6538pij1rq5wv9s8rjcn0sck15y26asv4vamav8a6s4135ia3q"; depends=[fastcluster gplots]; };
   MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
   MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
+  MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaDE = derive2 { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
-  MetaLandSim = derive2 { name="MetaLandSim"; version="0.4.2"; sha256="00lx78ryrhqcd7p9nikmfs80ysid11b2cg4nnf857h3lgnms78rr"; depends=[Biobase e1071 fgui googleVis maptools minpack_lm raster rgeos rgrass7 sp spatstat]; };
+  MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; };
+  MetaLandSim = derive2 { name="MetaLandSim"; version="0.5.5"; sha256="11dwmhkka0yabgvcxys2w039xwd1brb4kd1g1ahs45cin7w79xvl"; depends=[Biobase e1071 fgui googleVis maptools minpack_lm raster rgeos rgrass7 sp spatstat]; };
   MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
   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]; };
+  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]; };
   Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; };
   Meth27QC = derive2 { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; };
   MethComp = derive2 { name="MethComp"; version="1.22.2"; sha256="0f9l36d00x054yqgbw0dckc7ldlgap6vnbb03n6n5yz47xxg0ic3"; depends=[nlme]; };
+  MethodCompare = derive2 { name="MethodCompare"; version="0.1.0"; sha256="0zl20v8k8bhn3skbpzdiglywrqghwf0r42q2jn8zmq4x0drvjzpl"; depends=[nlme]; };
   Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
+  MethyBayes = derive2 { name="MethyBayes"; version="0.1.0"; sha256="1ibjmnfx3d2hw6gjcyig6kv4q7p26am2xvj14ksjv9kglw2q4g1b"; depends=[]; };
   MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; };
   Metrics = derive2 { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; };
-  MfUSampler = derive2 { name="MfUSampler"; version="1.0.0"; sha256="0jl0vnjj0kyy49l51nh6xzp53h8wcb603v2p9wznplimskays2rh"; depends=[ars coda HI]; };
+  MfUSampler = derive2 { name="MfUSampler"; version="1.0.2"; sha256="0b79wm02p4k67pi0zmcs7bqwsgrnf2pqf2mbb2kylmgsjd0nj1gq"; depends=[ars coda HI]; };
+  MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; };
   MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; };
+  MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; };
   MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; };
-  MicSim = derive2 { name="MicSim"; version="1.0.11"; sha256="0g6rqdk6vxxymkg6c0yqhhv7za1sk30m4wpi954cvx50swszy4ps"; depends=[chron rlecuyer snowfall]; };
-  MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.7.1"; sha256="0avgp99krlcaava7m32gj7ffz2rrj8g1zvaipk7bgsadnnpljmsk"; depends=[Hmisc memisc]; };
+  MicSim = derive2 { name="MicSim"; version="1.0.12"; sha256="186m0p08h6x8zhk82sm1hsyrqdl3p872xn03ysv3g5bldglc9677"; depends=[chron rlecuyer snowfall]; };
+  MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; };
   MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; };
   MigClim = derive2 { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[raster SDMTools]; };
   MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
   Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
   MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
-  MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-4"; sha256="0ixlybm57r1pdsnibg429hzbwh70brl8j8gjfzx952c69znkkjwh"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
+  MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
   MitISEM = derive2 { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
-  MixAll = derive2 { name="MixAll"; version="1.1.1"; sha256="02vbxpgyh2lw2xw04k0pfjs682xzha2wpr6w7qdg42mg335l12h3"; depends=[Rcpp rtkpp]; };
-  MixGHD = derive2 { name="MixGHD"; version="1.8"; sha256="0m115ws1gh5mbjaql38piwjg7463mx32ridpbics3406g7p3ba6w"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
+  MixAll = derive2 { name="MixAll"; version="1.2.0"; sha256="09wwisdwgvcsnvb9jdr0p0gyai5ab06yjyqhac1i7jg6wa2r8m3g"; depends=[Rcpp rtkore]; };
+  MixGHD = derive2 { name="MixGHD"; version="2.1"; sha256="0f3ppj18acvr35dbgqibmpd58cymq3baw3jdrl4ranlk0nj6h26r"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
   MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; };
+  MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; };
+  MixSIAR = derive2 { name="MixSIAR"; version="3.1.7"; sha256="0myn50sdmp83bhzm66sa61xwxv3lka427mv1ynhqshaqrb5flj35"; depends=[coda compositions ggmcmc ggplot2 lattice MASS R2jags RColorBrewer reshape reshape2 rjags]; };
   MixSim = derive2 { name="MixSim"; version="1.1-2"; sha256="0p67x2q4rb7y5484gi4z8r3qxpav1hdmgw1wdxmiz363p6f8972v"; depends=[MASS]; };
   MixedDataImpute = derive2 { name="MixedDataImpute"; version="0.1"; sha256="123c9i3znv53ikfnga1z9gq5bdl4vyww89967255wg5dzb7w00cn"; depends=[BH gdata Rcpp RcppArmadillo]; };
-  MixedPoisson = derive2 { name="MixedPoisson"; version="1.0"; sha256="1w826s2icdflfgyb31dvf077b6fx35idajyqv7bln1fr8wfb7zyf"; depends=[gaussquad MASS]; };
+  MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; };
   MixedTS = derive2 { name="MixedTS"; version="1.0.4"; sha256="0gwcg115idbcm5llgzqsygvqgshq8dywawxkaddsmw4sbbhj4555"; depends=[MASS]; };
-  MixtureInf = derive2 { name="MixtureInf"; version="1.0-1"; sha256="1cq8zzhhb6vg545n9aw1b9fhx025zy75dd6pw161svsb5776py5d"; depends=[]; };
+  MixtureInf = derive2 { name="MixtureInf"; version="1.1"; sha256="12qcflmrpzh4w5b40xq5qicks6p0cwqpf5k84pwabkjb168afddv"; depends=[quadprog]; };
   MoTBFs = derive2 { name="MoTBFs"; version="1.0"; sha256="09ymfgw6psc1y0dczvsrsw5cki58wn0d8vj56ydfylrxn24g3jfq"; depends=[bnlearn lpSolve quadprog]; };
   Mobilize = derive2 { name="Mobilize"; version="2.16-4"; sha256="16vdvpwspa0igb52zvzyk0if9l4wq1hm8y42572i8sh1m82wyyfs"; depends=[ggplot2 Ohmage reshape2 wordcloud]; };
   Modalclust = derive2 { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla5627rva0yf69n0zib9z5fl3k5awlqfscz4fw26"; depends=[class mvtnorm zoo]; };
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
-  ModelMap = derive2 { name="ModelMap"; version="3.3.2"; sha256="04rnprv5xjk9l89pc7pvkvwpv0habd15ihl1ah792lwl44ibx84b"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
-  Momocs = derive2 { name="Momocs"; version="1.0.0"; sha256="03gqylk1a6sf4ypxp7gzsv91m6iarfak6rby0i1666wzi4nn5zjl"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; };
+  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]; };
   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.2.0"; sha256="1l6bkymssryw22m849wdcmza9abg0cwgasdq9hq4z1m9fkc5xais"; depends=[]; };
-  MonoPhy = derive2 { name="MonoPhy"; version="1.1"; sha256="0vif66c5lkn1mqfhnk4di5jd5k86wf545a8pi0wlamjy5828n9jx"; depends=[ape phangorn phytools RColorBrewer taxize]; };
-  MonoPoly = derive2 { name="MonoPoly"; version="0.2-10"; sha256="03gzn7gq1dryjhkzs9z5i7bc8k8i7ilri26ifw772w8688pya05k"; depends=[quadprog]; };
-  Morpho = derive2 { name="Morpho"; version="2.3.1.1"; sha256="02xmbkz5qm15k0skwqcgzjxwkv9aas5ygi4dchc656j8r7spw6wp"; depends=[colorRamps doParallel foreach Matrix Rcpp RcppArmadillo rgl Rvcg yaImpute]; };
+  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]; };
   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]; };
-  MotilityLab = derive2 { name="MotilityLab"; version="0.2-4"; sha256="0fgv3w1231r85jv7v59vvfz9bcb4yrdvx89pk9g6zcspxixmc0c8"; depends=[ellipse]; };
-  MplusAutomation = derive2 { name="MplusAutomation"; version="0.6-3"; sha256="1zb4drqaswzwssky1bp69p3p8inqfdvxg2ji9bjrzf3vf0b5fl4p"; depends=[boot coda gsubfn lattice plyr texreg xtable]; };
+  MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; };
+  MplusAutomation = derive2 { name="MplusAutomation"; version="0.6-4"; sha256="151d2iq9v8d584ascpkjp9wjldc7n25wma14nn2wgcxwdh2nglpi"; depends=[boot coda gsubfn lattice pander plyr texreg xtable]; };
   Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; };
   MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
   MuMIn = derive2 { name="MuMIn"; version="1.15.6"; sha256="08qac7d1w367wjsz7n9ydziacbf8np8w8mm9izbxd4pk3ibxwi5a"; depends=[Matrix]; };
   MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; };
+  MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; };
   MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; };
   MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; };
-  MultNonParam = derive2 { name="MultNonParam"; version="1.2.1"; sha256="0fakycqvc8kqavdxmwsfww21f6ndlr0zwwwgh6asjffpdji798bb"; depends=[]; };
+  MultNonParam = derive2 { name="MultNonParam"; version="1.2.5"; sha256="12jfpqs77qxzy7vj6adx9im3qmzqvgwk4bnxmr26k3z48css242l"; depends=[]; };
+  MultiBD = derive2 { name="MultiBD"; version="0.2.0"; sha256="1qjfr8hx8sr5m8370yzi09r8jnh3i6907wzj3v4h83vmjh81db71"; depends=[BH Rcpp RcppParallel]; };
   MultiCNVDetect = derive2 { name="MultiCNVDetect"; version="0.1-1"; sha256="0mfisblw3skm4y8phfg4wa0rdchl01wccarsq79hv63y78pfhh13"; depends=[]; };
-  MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.0"; sha256="1kkbwh9sinwnsc1qb2rsqdvhz1v0kg0av4m8av4dcmry2iq8kd3v"; depends=[fastGHQuad]; };
-  MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.9"; sha256="0anb041nd56rrryhv5w1pb0axxsfkqas177r6yf5h5gbc4vn3758"; depends=[limSolve MASS]; };
+  MultiGHQuad = derive2 { name="MultiGHQuad"; version="1.2.0"; sha256="00prkn5awxrh365j1jz312har1x4p8v52a0sqfy00pqr44ncmqqq"; depends=[fastGHQuad Matrix mvtnorm]; };
+  MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.10"; sha256="0p0m6kbpx761l54fblnxccjadrjgv50lg24adppnrda4dbai60v9"; depends=[limSolve MASS]; };
   MultiMeta = derive2 { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; };
-  MultiOrd = derive2 { name="MultiOrd"; version="2.1"; sha256="12y5cg06qyaz72gk3bi5pqkd55n72rz056y9va49znlsqph09x2x"; depends=[corpcor Matrix mvtnorm psych]; };
+  MultiOrd = derive2 { name="MultiOrd"; version="2.2"; sha256="0j7zl6a2yxiixxjrhwrp5z4wdi04fqc8qfq2hp0q02k28dzjg1g1"; depends=[corpcor Matrix mvtnorm psych]; };
   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]; };
   MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
-  MultivariateRandomForest = derive2 { name="MultivariateRandomForest"; version="1.0"; sha256="1q1dcrn4wghhn0ailyvhvv3j2n62x1x4sd3lj20j7w1ix9zgsk6l"; depends=[bootstrap]; };
-  MvBinary = derive2 { name="MvBinary"; version="1.0"; sha256="1r65kcx458b0y49035nd1sj7rm62fr2inc3qgg5k6saylqihncn9"; depends=[mgcv]; };
+  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]; };
-  NAM = derive2 { name="NAM"; version="1.4.4"; sha256="0410sxmqibw8iq398ha2ldf7p2vkqiryhfd176njjb8zxy9nixal"; depends=[randomForest Rcpp]; };
+  NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; };
+  NAM = derive2 { name="NAM"; version="1.5.0"; sha256="01p0xncaly7pxc9fpiqh77z0pq6cbbskj40r7rhhbiad5pdihb0r"; 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=[]; };
   NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; };
-  NCA = derive2 { name="NCA"; version="1.1"; sha256="11sx5y9i0y0c8r9z6lwjk4p9l4gmwj58i76z809l40mlld59igcz"; depends=[Benchmarking gplots quantreg sfa]; };
-  NCmisc = derive2 { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[dplyr proftools]; };
+  NCA = derive2 { name="NCA"; version="2.0"; sha256="08951mmmpziljclwzmbni1s5a62wr9s80iyfsr07gkdz4sx3cvqf"; depends=[gplots KernSmooth quantreg sfa]; };
+  NCmisc = derive2 { name="NCmisc"; version="1.1.5"; sha256="1dq38ac97l8b6ys3yxqnndbrp8fa8zfw0lr4nq2421sn91769w22"; depends=[proftools]; };
+  NEArender = derive2 { name="NEArender"; version="1.4"; sha256="1zdqil28j6jc6317dkpz5i1qj7b4i3lin4800n1kf14zg9nxjdyg"; depends=[MASS RColorBrewer ROCR]; };
   NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
-  NEpiC = derive2 { name="NEpiC"; version="1.0"; sha256="1pz6n8frf8ggivrsb6z5x7aq3k13l4ksdbkzk5ndm09whdn5fzn5"; depends=[igraph]; };
+  NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; };
+  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]; };
-  NHMM = derive2 { name="NHMM"; version="3.5"; sha256="03il5y6vz5zyadydhk3qg6sd6fmsw7md9if1igyy9643mxxm1g0f"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; };
-  NHMSAR = derive2 { name="NHMSAR"; version="1.1"; sha256="1qbgxb684qwcb29x95a48r6bndqwdi1drwzimkhkb2ldm98yga3z"; depends=[caTools glasso lars SIS ucminf]; };
+  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]; };
   NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; };
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
-  NISTunits = derive2 { name="NISTunits"; version="1.0.0"; sha256="156rk3wams52lw3inf55s9v7mi5x29mmb41p8kvryimnzgi904ca"; depends=[]; };
-  NLP = derive2 { name="NLP"; version="0.1-9"; sha256="0rszp2iakbaj4z76jdi9z996xxgyyp0pqkxgnva0jcfi5sq3ngxr"; depends=[]; };
-  NLPutils = derive2 { name="NLPutils"; version="0.0-3"; sha256="1j6y9z8d4ms6lxrz9wq9ydvsnkf4ca5qps8yxmglx81i152aq216"; depends=[NLP qdap SnowballC]; };
+  NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; };
+  NLP = derive2 { name="NLP"; version="0.1-10"; sha256="1jq9nhm2dzm0ppwlrxgbwk92dh1zwhcxjn13zaw8naiz8zffba63"; depends=[]; };
+  NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; };
   NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
   NMF = derive2 { name="NMF"; version="0.20.6"; sha256="0mmh9bz0zjwd8h9jplz4rq3g94npaqj8s4px51vcv47csssd9k6z"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; };
   NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; };
-  NMOF = derive2 { name="NMOF"; version="0.36-2"; sha256="0s3zd6wj249b2ppznw84cv4rzsgfl5lzdrmps47hzq3iv83q3d33"; depends=[]; };
+  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]; };
   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=[]; };
   NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
   NORTARA = derive2 { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
   NPBayesImpute = derive2 { name="NPBayesImpute"; version="0.6"; sha256="09cs6nj1pw4wv4w8bd1c4rilidzx12ymjzah9d0c412bwv0gmdyl"; depends=[Rcpp]; };
-  NPC = derive2 { name="NPC"; version="1.0.2"; sha256="1rlxzvq09l2i0w5p5c37g1s3cccjvzpirn14v8dw89acvg3617q1"; depends=[coin dplyr matlab permute]; };
-  NPCD = derive2 { name="NPCD"; version="1.0-9"; sha256="0d3fwbq7cnhwnndza4vl25jw6pahvy8zzicgy4pd6r6md7c9rbhm"; depends=[BB R_methodsS3 R_oo]; };
+  NPC = derive2 { name="NPC"; version="1.1.0"; sha256="06y6vdln5zyinq9bsp66yz6i1v5bkw9pa2hknl9brwc75z359apn"; depends=[coin dplyr matlab permute]; };
+  NPCD = derive2 { name="NPCD"; version="1.0-10"; sha256="1ag7j1r9j3piisg706hyhq8vaqfqvm1blxpkfxx7r1impjyqzyai"; depends=[BB R_methodsS3 R_oo]; };
   NPCirc = derive2 { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; };
   NPHMC = derive2 { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[smcure survival]; };
   NPMLEcmprsk = derive2 { name="NPMLEcmprsk"; version="2.1"; sha256="1v15ylgflbdr03pgh55fan1l6mymd1d5n6h9jhbcqahjlcsxkwq3"; depends=[]; };
   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]; };
   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.3"; sha256="0vmv7r499ig2fq2gwx78jdrflk5i55jy3vgjh87ygwlyhwj9cm8p"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
+  NSM3 = derive2 { name="NSM3"; version="1.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]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
-  NScluster = derive2 { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; };
+  NScluster = derive2 { name="NScluster"; version="1.1.1"; sha256="1w63abh4q0wgv3x7inl2xyp9qgr9m223r2p7nfiqnxk9y259kh04"; depends=[]; };
+  NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.2.1"; sha256="0vv2ksmwg7hn6h4p5k32kisnxcpqhc8adlw0559jlmqfq9gqaa3k"; depends=[snowfall]; };
   NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.1.21"; sha256="1rbmhk5kags3mm4znakfp1c7axdpv4gmh2h0sydvyc2dm1vds5k4"; depends=[gdata vsn]; };
   NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; };
   NeatMap = derive2 { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; };
+  NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; };
+  NestedCategBayesImpute = derive2 { name="NestedCategBayesImpute"; version="1.0.0"; sha256="1az32kqr5bl0mn9d69v21m80w4w3xm3pydwmr2awlfmdq674410i"; depends=[coda dplyr Rcpp]; };
   NestedCohort = derive2 { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[MASS survival]; };
   NetCluster = derive2 { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; };
   NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; };
   NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; };
   NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; };
+  NetOrigin = derive2 { name="NetOrigin"; version="1.0-2"; sha256="1ldlx4nmc5k756fmbm9vxn9rwzxmad84zpi6318pjr52izms6q2k"; depends=[colorspace Hmisc igraph]; };
   NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; };
+  NetRep = derive2 { name="NetRep"; version="1.0.4"; sha256="1a58wxmjhd2jm5n6bl5l2706fbvfvjksfaal65fy04ssw14nziw8"; depends=[abind BH foreach RColorBrewer Rcpp RcppArmadillo ref RhpcBLASctl statmod]; };
   NetSim = derive2 { name="NetSim"; version="0.9"; sha256="07h4qwz64k8zj8c2mx23cbnhg4rqrb4nfh20xw98kspz7cisdg6d"; depends=[Rcpp]; };
   NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; };
-  NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.4.0"; sha256="1lz8jdn8qrfhdp6sgfzy0bk7csz1v3sjwgbni235x2dz9p60p6n4"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
-  Newdistns = derive2 { name="Newdistns"; version="2.0"; sha256="1jgv9jl6pvsjgjsbjvmjg8qwjx4gsmp4kd27pbqxldp0qp0q9mjf"; depends=[AdequacyModel]; };
+  NetWeaver = derive2 { name="NetWeaver"; version="0.0.2"; sha256="0wsmz7db8q2fycz6rfbbfs67ccj857y9zs4d80k1gnqazgj5whkn"; depends=[]; };
+  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]; };
+  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]; };
-  Nippon = derive2 { name="Nippon"; version="0.6.3"; sha256="1r13n65nzz3fm46q3ddy9gn5vbdym2x1h8cr12ajp40qrmjf41zv"; depends=[maptools sp]; };
+  Nippon = derive2 { name="Nippon"; version="0.6.3-1"; sha256="0l7h2fxg87cgkb18b998fb954nfqsgchyikdfz1ysc7kjzpwdacp"; depends=[maptools sp]; };
   NlcOptim = derive2 { name="NlcOptim"; version="0.4"; sha256="0842qqn2wdhxzcj5l4ywxrm8qcavrgvkll6ns2d2lbniiczijpnw"; depends=[MASS]; };
-  NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.1"; sha256="08w0wkmj9s3sgrwq0icfmp7a1i29hq4594hjmlxqagc843p592r4"; depends=[lavaan]; };
+  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=[]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="2.0"; sha256="0i87v666i0fc1c4rwxl6zmal7dp4ph7l7ki5vck9wykm28qr6q5y"; depends=[dr]; };
-  NormPsy = derive2 { name="NormPsy"; version="1.0.3"; sha256="0lp6b7hh36ipmsv395xk671f7sczlfz5f9x0h88b2q6zvgbk081v"; depends=[lcmm]; };
+  NormPsy = derive2 { name="NormPsy"; version="1.0.4"; sha256="07xx3n9g8ka9k6zqkx1963nqbqi6qlnkxy0fary7l1arv7vjly4s"; 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-0"; sha256="1zpnf56kji14lrz6jm7saiw55yg7n62dk3r5qb21wx9qwzjggycp"; depends=[curl XML]; };
+  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=[]; };
+  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.1"; sha256="03m15vck01s6jqcpm5fl7mipki4grgywlb9mksr0l8wygmn8zkxs"; depends=[xlsx XML]; };
-  OData = derive2 { name="OData"; version="0.3"; sha256="0wd9z8k27vxblh1v95p3bx15i15yacqqfpwr15bnd0xnaw9sr0z7"; depends=[RJSONIO XML]; };
+  ODMconverter = derive2 { name="ODMconverter"; version="2.3"; sha256="07j9p2hfx3almd5n3j0clc1alj5wzrnzljd9w13bbd6nrvil1krm"; depends=[xlsx XML]; };
+  OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; };
   OECD = derive2 { name="OECD"; version="0.2.2"; sha256="07flhhca7734fffcqvxjl1hlhbbhn6lch868rlpps0r99jxy8m5q"; depends=[httr rsdmx xml2]; };
   OIdata = derive2 { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[maps RCurl]; };
   OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; };
   OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
   ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; };
+  OOR = derive2 { name="OOR"; version="0.1.1"; sha256="09c7c2inpnag3kckrg9lfzxd3giqkj9xm91ibjkgpfv68nf733qc"; depends=[]; };
   OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
   OPDOE = derive2 { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
-  OPI = derive2 { name="OPI"; version="2.3"; sha256="04g54iv43psfc8j5bz0rpks9mppx5fff683cxh36bsmbsl6rd1m9"; depends=[]; };
+  OPI = derive2 { name="OPI"; version="2.5"; sha256="1rdm0zn62i2m9hbnhy1jbj2l0n3a8qckf8iv5hpfkj7xq6zzams7"; depends=[]; };
   ORCI = derive2 { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
   ORCME = derive2 { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; };
   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]; };
   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=[]; };
-  OUwie = derive2 { name="OUwie"; version="1.49"; sha256="1hmbyqr0b9n6ng87adij59jyjkzwf8lw6lfxjqqzpz9mh9k1fkvy"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv phangorn phytools Rmpfr]; };
+  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="1.0.0"; sha256="0anw1ncbjjmlnhigcfwm9zqmp4ah5cfbmmm3588k95xxp6xq9vmv"; depends=[rgdal rgeos spdep]; };
-  OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D rgl shape]; };
+  OasisR = derive2 { name="OasisR"; version="2.0.1"; sha256="0knkq33yf0b5flbkmc5ng4ys4x840rzkfrr26jcp7ri3bqg87lqv"; depends=[birk rgdal rgeos spdep]; };
+  OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D plot3Drgl rgl shape]; };
   Ohmage = derive2 { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; };
-  OjaNP = derive2 { name="OjaNP"; version="0.9-8"; sha256="010l75irgj7nl8yq6crp8d00zjgpv9wg2maw99cj0frhqxvqzbfz"; depends=[ICS ICSNP]; };
+  OjaNP = derive2 { name="OjaNP"; version="0.9-9"; sha256="12a7zfrk3rdvfby5qa511w3nk5jpnsd5gg2z46b5s97rxb3qq7za"; depends=[ICS ICSNP Rcpp]; };
   OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; };
   OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; };
   Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; };
-  OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.4"; sha256="1g3yrrnrk4375wxzfdndsm963ma112k5njv18adh43vfzyzg5l2m"; depends=[Rcpp]; };
+  OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="0.1.6"; sha256="0whd5vwaqhvv5qmryzh7nh5skc4lv740ziha7vxfpb91ph0mgrz8"; depends=[Rcpp]; };
+  OneR = derive2 { name="OneR"; version="2.1"; sha256="1f9gr9bdwnlxlr0mv10f05pk9fznlgkdy0j5gcyfc1643826chfr"; depends=[]; };
   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]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.1-2"; sha256="1cpsbjmqql0fsjc1xv323pfkhfr9vrcv5g4j3p1qc5zn4z9pq7r6"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.5.2"; sha256="1ymh4im1d0ad6zjz4crrljvnb2g7aqisb2xqrxlsqljlbjbizmfv"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.7.4"; sha256="18zgypwjd37fcmsc3gzsa3ww6b7l9y9sm7jgj5x79hzqn0mfknfv"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
   OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
-  OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.2"; sha256="1cszyp4bvlypri9smd238r2bd05dwpcrsi6bs8yl5g2glfnv1zjn"; depends=[ggplot2 raster rgdal rJava sp]; };
+  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=[]; };
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
   OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
-  OptiQuantR = derive2 { name="OptiQuantR"; version="0.0.1"; sha256="1wgvz4n0qla4i5c24j0yanl7xz4f56951q8zb1593rf5kba1gg1k"; depends=[data_table lubridate]; };
+  OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; };
   OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; };
+  OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; };
   OptionPricing = derive2 { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; };
   OrdFacReg = derive2 { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; };
   OrdLogReg = derive2 { name="OrdLogReg"; version="1.1"; sha256="18s75pmz1g3yac2rfl41kj8sfflq298qkijnvqlybgxpq98ickxx"; depends=[LogicReg]; };
   OrdMonReg = derive2 { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; };
   OrdNor = derive2 { name="OrdNor"; version="2.0"; sha256="1zr8zzigrbf6r0zz4f0za6my6d67wxqzvmabl36pjxc3sq7jh83j"; depends=[corpcor GenOrd Matrix mvtnorm]; };
   OrdinalLogisticBiplot = derive2 { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[MASS mirt NominalLogisticBiplot]; };
-  OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; };
+  OrgMassSpecR = derive2 { name="OrgMassSpecR"; version="0.4-6"; sha256="1xihaq8vxc9s6b37bydavg3xxnzbn96l85b1bz2mq5m6snpp8ra0"; depends=[]; };
   OriGen = derive2 { name="OriGen"; version="1.4.3"; sha256="0a7mql87dqxrfx7phgy32hbanfwnjx8x52mj83xf2mgmqhrcikr6"; depends=[ggplot2 maps]; };
-  OrthoPanels = derive2 { name="OrthoPanels"; version="0.9-1"; sha256="1p8q0b9zm7dd84qh3mrz67lcd1r11z5rj0bp93nsl23q1m2998sc"; depends=[MASS]; };
+  OrthoPanels = derive2 { name="OrthoPanels"; version="1.1-0"; sha256="1g78abh9i3x0g34vjqz2ic9330rbgn8k0hgdcrznxgsfnlgnpx9x"; depends=[MASS]; };
   OutbreakTools = derive2 { name="OutbreakTools"; version="0.1-14"; sha256="03bdb7w5nsrjxz5kd5zvgwybgmv2mzsxyzdc7v3kpwi20yfb9ax8"; depends=[ape ggmap ggplot2 knitr network networkDynamic plyr RColorBrewer RCurl reshape2 rjson scales sna]; };
   OutlierDC = derive2 { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[Formula quantreg survival]; };
   OutlierDM = derive2 { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[MatrixModels outliers pcaPP quantreg]; };
   OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
-  OxyBS = derive2 { name="OxyBS"; version="1.0"; sha256="1h8jxiya6lz9ib53dm5wmhqg2y20p41mk6dqjx6k8zgjglqk8p9w"; depends=[]; };
+  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]; };
-  PACVB = derive2 { name="PACVB"; version="1.1"; sha256="1qkh9a904xd46295jxqyj1ka993ibd0hbm026hjs2ji9pw894040"; depends=[BH MASS Rcpp RcppArmadillo]; };
-  PAFit = derive2 { name="PAFit"; version="0.7.5"; sha256="1rczpgy1qrzc1p02nssx5gyi8m71w5jl97scqaddqyzg1c0zfvrp"; depends=[Rcpp]; };
+  PAC = derive2 { name="PAC"; version="1.0.6"; sha256="04jbyxgw8cpbjajlnal66y1kfjnxd4v6gp32wg7cdp7cmz0yxbii"; depends=[dplyr igraph 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]; };
   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]; };
-  PANICr = derive2 { name="PANICr"; version="0.0.0.5"; sha256="049ga5iiymqczvy51y52yk7yvv9xy0ibr64ly8ciqig84d5f4jjr"; depends=[MCMCpack]; };
+  PANICr = derive2 { name="PANICr"; version="1.0.0"; sha256="167s1p7y8mmhcdnng0s5i09kjfh088jhmxs74rkyda52l9hyx363"; depends=[coda MCMCpack xts]; };
+  PARSE = derive2 { name="PARSE"; version="0.1.0"; sha256="0y408va1rfn3j8cb1i0k8kypyg9mb6yfj513l54f23z31d3bi45m"; depends=[doParallel foreach gplots mvtnorm]; };
   PAS = derive2 { name="PAS"; version="1.2"; sha256="0q5g9j8xb9fl7r8f1w5gk5h83ll5w1r6m2gq9ilw8w8s96pm4xd8"; depends=[glmnet]; };
   PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; };
   PASWR2 = derive2 { name="PASWR2"; version="1.0.2"; sha256="04vwgmi56spjriwp2ls5zcgslfg1y4pvwa0m33f9izay0y6q2wfx"; depends=[e1071 ggplot2 lattice]; };
+  PASenseWear = derive2 { name="PASenseWear"; version="1.0"; sha256="0x84j1vdds4g08birmjxb0c2g1ahwv83bk11532jkmg32dnhmj58"; depends=[ggplot2]; };
+  PATHChange = derive2 { name="PATHChange"; version="1.0"; sha256="1pmxhaych01cywx9bb5z0p5lbxcma7x6nlprivpx3gnpg7m9srpg"; depends=[rlist stringr VennDiagram]; };
   PAWL = derive2 { name="PAWL"; version="0.5"; sha256="1sx4g4qycba2j1fm0bvhz3hk6ghhdc37rz5zi1njqxrpmbnkqg04"; depends=[foreach ggplot2 mvtnorm reshape]; };
-  PAactivPAL = derive2 { name="PAactivPAL"; version="1.0"; sha256="10whjaqfz50llv9ij4l4vadkxba038l31vpp27wgjli9kvl39a2k"; depends=[]; };
+  PAactivPAL = derive2 { name="PAactivPAL"; version="2.0"; sha256="1mjfxq0a9fql8bg5c6l5w1knjqq29cb4l10ppxnym9gnsjrk0kw1"; depends=[]; };
   PBD = derive2 { name="PBD"; version="1.2"; sha256="0pxm9pdmylg95v5pyppvyl64zx5vgypx5fksj18zvws6vpb60xab"; depends=[ade4 ape DDD deSolve phytools]; };
+  PBIBD = derive2 { name="PBIBD"; version="1.2"; sha256="1dbrd6qwczwk41zmh9ck9cgzqpry9kycygyk0ls8kc92p45cz3dh"; depends=[]; };
   PBImisc = derive2 { name="PBImisc"; version="1.0"; sha256="18gjp66q6l0w6vsgm6d5sjgpa906z1gyyp6yf58lq5vyg1bnfmcl"; depends=[lme4 Matrix]; };
+  PBNPA = derive2 { name="PBNPA"; version="0.0.1"; sha256="1a43kk7di5bqifa68lhrxx3p9vvfn0rr5nifx60c2y7j7cp63fk8"; depends=[metaRNASeq]; };
   PBSadmb = derive2 { name="PBSadmb"; version="0.68.104"; sha256="01akimdsp0bkvz3a5d75yyy3ph0mff85n8qsnr59fla5b5cm4qlj"; depends=[PBSmodelling]; };
-  PBSddesolve = derive2 { name="PBSddesolve"; version="1.11.29"; sha256="13vprr66hh5d19xambpyw7k7fvqxb8mj5s9ba19ls7xgypw22cmm"; depends=[]; };
+  PBSddesolve = derive2 { name="PBSddesolve"; version="1.12.2"; sha256="12pl95mcak88524s8zvk9dzib2g40fwaz6iz7igx9wg6vib9d1sj"; depends=[]; };
   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]; };
   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.2"; sha256="19bpnn1b8ihmf52zh9g9pc38130np1ki8l7wf0j5myw2cnw6fna8"; depends=[MASS RMTstat safe]; };
+  PCGSE = derive2 { name="PCGSE"; version="0.3"; sha256="1fb4in6b8d5n0zjfys33y35n3srqpzrnyk2qhzvpjsjf7jmn9898"; 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.2"; sha256="17gjj88zq123nxg4dh2w304sh9c1c4myad2g8x31wn1z7bmawv3y"; depends=[ape phylobase picante plotrix SYNCSA vegan]; };
+  PCPS = derive2 { name="PCPS"; version="1.0.3"; sha256="1ys3xp1nripy5zkq25byak9k6yf5rdbfnww8j13yc469428ip8q0"; depends=[ape phylobase picante SYNCSA vegan]; };
   PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; };
+  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]; };
-  PDQutils = derive2 { name="PDQutils"; version="0.1.4"; sha256="1wag65qgfbwr506c9jnwbd4drkqapy41sswy9g1j94qm1iwgwcvz"; depends=[moments orthopolynom]; };
+  PDM = derive2 { name="PDM"; version="0.1"; sha256="1pbdy13ji9c6krgh2r1qgrzmf4hdmrdzylsr71n3hh5jq4n9xg8x"; depends=[jpeg]; };
+  PDQutils = derive2 { name="PDQutils"; version="0.1.5"; sha256="1k9zfdsxyn384ymq920y0p0fps6svlq08sp13ayg0mindsswmp3k"; 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]; };
   PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; };
   PET = derive2 { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9yh16yc8nfp7c9837xbjigqq7f"; depends=[adimpro]; };
-  PGEE = derive2 { name="PGEE"; version="1.0"; sha256="10js28w629y145q9zcc42ydw03ll2dh7pfzdqx2mmli300w88mvr"; depends=[MASS mvtnorm]; };
+  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"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
-  PGRdup = derive2 { name="PGRdup"; version="0.2.2.1"; sha256="02xl20kiy0704pw3n72pk8bi1vxr30fz6n703p5j3f0f9n954sl6"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
-  PHENIX = derive2 { name="PHENIX"; version="1.2.2"; sha256="09x8x8izv4faal772zrz0n867wzp3s6gmmqpr7lln7ww07vlh4gx"; depends=[ppcor SuppDists]; };
+  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]; };
   PIGE = derive2 { name="PIGE"; version="0.9"; sha256="1x8ml25mm69dvlszm9p2ycph92nxcsgd52ydj7ha0dwrrpcv2law"; depends=[ARTP snowfall survival xtable]; };
@@ -1637,455 +2038,543 @@ in with self; {
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; };
-  PKNCA = derive2 { name="PKNCA"; version="0.6"; sha256="0k04xb0akkk3d4m66v66wisxk38mn13avxk6zlm30fivwqh8vzw9"; depends=[digest doBy lattice nlme plyr]; };
+  PKNCA = derive2 { name="PKNCA"; version="0.7.1"; sha256="170chkdh78xmcw2p1xm23x4q5kj0637i0nbrwz73cxg0yni4h3qa"; depends=[digest doBy lattice nlme plyr tidyr]; };
   PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
   PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; };
+  PLMIX = derive2 { name="PLMIX"; version="1.0"; sha256="1z59z7ynlfh7cskanj7drvry0fpzl5mq52as8adi2zxp2q8q032p"; depends=[abind combinat foreach FSA rcdd Rcpp]; };
   PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; };
   PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
   PLordprob = derive2 { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; };
   PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; };
   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=[]; };
   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="1.3.0"; sha256="1v5538mwmdfgwyqi6a72b4hkhwl0b8xz3ai81cv4q8cbvgwgq8fj"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; };
+  PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.1"; sha256="02073yxdwns9mnnjvw13ydw1s3vrxl53szcd9jy8ibj78vnm57r3"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
   PRIMsrc = derive2 { name="PRIMsrc"; version="0.6.3"; sha256="18vk968dz9508bnnyhq2wz7py72ld42c0ah22a7d8n3nwx26ldbd"; depends=[glmnet Hmisc MASS survival]; };
   PRISMA = derive2 { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[ggplot2 gplots Matrix]; };
+  PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.0.1"; sha256="1qk9cljk52m8rcasck8cl7gwzhcsx0p58jn31izy2j027w0rns7j"; depends=[DiagrammeR]; };
   PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
   PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
   PRROC = derive2 { name="PRROC"; version="1.1"; sha256="1v35z9inzb6x42fil8z7kfcrnfif93cj8974mfbqhhx0f9vi476a"; depends=[]; };
-  PReMiuM = derive2 { name="PReMiuM"; version="3.1.3"; sha256="0xlkk5r02kq6q8mgymbw6qmb6wdvxskx6jzyciv26wyd3rgis3al"; depends=[BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
+  PReMiuM = derive2 { name="PReMiuM"; version="3.1.4"; sha256="0x13bada1spf4wk8bwy9rdpjcfzd4s7ypfx88slpmg87gw4qc7s2"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
+  PResiduals = derive2 { name="PResiduals"; version="0.2-4"; sha256="1a4sbdz0p8mqhcvpd1zkkinihvkqj1jw8m510k1yifmb4aav7xiw"; depends=[Formula MASS rms SparseM]; };
   PSAboot = derive2 { name="PSAboot"; version="1.1.4"; sha256="1zfqpq0ibgazwppbxbmqvkvh9j5421xmj9132zghxki0xdy655ss"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; };
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
-  PSCBS = derive2 { name="PSCBS"; version="0.61.0"; sha256="04msj4rnrbdcjbm5aqbzm2sirb8q4wkag2fgsbdrca61v0lfg5q4"; depends=[DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
+  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.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[RColorBrewer TraMineR]; };
+  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]; };
   PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; };
-  PVR = derive2 { name="PVR"; version="0.2.1"; sha256="1p87pj9g0qlc8ja6xdj2amny9pbkaqb34x2y9nkl1nj1pkwjq2s5"; depends=[ape splancs]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
+  PWEALL = derive2 { name="PWEALL"; version="1.0.0"; sha256="1m2wg0fzmlf9xbynr7mw6izkjp3r32fm4l6njrfkcr9gqfz2dab8"; depends=[survival]; };
   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="0.1"; sha256="09jl3ny4wcz7kd9kvqp5rscl8amxhpibzhny9lnakck3jrwa20hr"; 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]; };
   ParallelForest = derive2 { name="ParallelForest"; version="1.1.0"; sha256="1xa9lfgrvzv7bvv1aaabcfk4372p8x5gxgj463h5ggf9x177lj5j"; depends=[]; };
   ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; };
-  ParamHelpers = derive2 { name="ParamHelpers"; version="1.7"; sha256="0ddb50c8xvs85422ig8chrrn0vaz9dsqn95409i1qdfg9rf916fr"; depends=[BBmisc checkmate]; };
+  ParallelTree = derive2 { name="ParallelTree"; version="0.1.2"; sha256="0x99x1iycx8ik8cih972awnxifvmhbrmjrf2csmnn9fw4rsqn0p5"; depends=[ggplot2]; };
+  ParamHelpers = derive2 { name="ParamHelpers"; version="1.10"; sha256="0nzsl3hby4dhnp7rw47zjmdrrfsgp5w1ai9fpw3bgc4k5sk9nql0"; depends=[BBmisc checkmate]; };
   ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; };
   ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; };
+  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]; };
-  PatternClass = derive2 { name="PatternClass"; version="1.5"; sha256="1paw39xm2rqjnc7pnbya7gyl160kzl56nys9g0y1sa6cqycy3y5x"; depends=[SDMTools]; };
+  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.97"; sha256="0bsdj4zir12zkv8yhq1z6dqjzhkb9l0f88jrr4iyclns1pcqvrvi"; depends=[]; };
+  PearsonDS = derive2 { name="PearsonDS"; version="0.98"; sha256="11y44j7js67k4kgg2rdc3y23ckaih63fvm5li7z6p6d8anlx1fcv"; 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]; };
-  PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.0"; sha256="1jcwk4vr73brkg4syrbybkfdhbrzs2y9qxd7286h27i67xn1s199"; depends=[Matrix Rcpp RcppArmadillo survival]; };
+  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]; };
-  Peptides = derive2 { name="Peptides"; version="1.1.1"; sha256="0a6806n7lpdyvmsbvrm0fd124dxd4q8ka0dxb22ri26n60vcyybr"; depends=[]; };
-  PerFit = derive2 { name="PerFit"; version="1.4"; sha256="1pjyns9qsqr7c3m5n8a12z3i2b0y98alq0fs84r909m4m5lb22k3"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
-  PerMallows = derive2 { name="PerMallows"; version="1.10"; sha256="1h3r4cpyc0fsxz4vr75jyah9gjwj6f7sbmm9yk7p8kk1wagp4a44"; depends=[Rcpp]; };
-  Perc = derive2 { name="Perc"; version="0.1.1"; sha256="0yckjgbapcja3qp718f48r1wfhc25dy5y8138x45w5vbdsj4jrrx"; depends=[]; };
+  PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; };
+  Peptides = derive2 { name="Peptides"; version="1.2.1"; sha256="0s6d3b9qgc38az11pa7r427dzcfhf2a2hl4c97av8c43hfvyrnzi"; 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=[]; };
   PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; };
   PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; };
+  PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.1"; sha256="0r14byi2pmgvmpl07dhqq4m00ddfaixnzqd5kgav1gxmsw6bk35l"; depends=[]; };
   PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
-  PhViD = derive2 { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[LBE MCMCpack]; };
+  PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; };
+  PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; };
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
-  PharmacoGx = derive2 { name="PharmacoGx"; version="1.1.4"; sha256="1xzirhj05gjl4jszz493g8r629jpllnkqk19yjyjj69gmnlalpdy"; depends=[Biobase caTools downloader magicaxis piano RColorBrewer]; };
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
-  PhyActBedRest = derive2 { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; };
-  PhySortR = derive2 { name="PhySortR"; version="1.0.6"; sha256="0v5d0klii1sfs43np18aj2587li3jawqirvabjf51lz2iciagcl9"; depends=[ape phytools]; };
-  PhyloMeasures = derive2 { name="PhyloMeasures"; version="1.1"; sha256="1wxm9yiplasxhqxs3qxys46k1i7n459frxxh275abczafq46l8if"; depends=[ape]; };
+  PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; };
+  PhySortR = derive2 { name="PhySortR"; version="1.0.7"; sha256="1xpxkd2bf3xdsfwa0bzkppr6y7p6v7s4iy0x0m8fiwj93n9jh0pz"; depends=[ape phytools]; };
+  PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; };
+  PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.0.0"; sha256="0xrvrfq28a9ivdrbc5s05bpxk4vsij1qqyv01md5c687bl45pj7a"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
+  PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; };
   PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
   Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; };
-  PivotalR = derive2 { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; };
+  PivotalR = derive2 { name="PivotalR"; version="0.1.18.3"; sha256="14l7y57zmfr7h4bq01j83am2plxx320kkhbsh0x2ypif9dni4rf2"; depends=[Matrix]; };
+  Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; };
+  PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.5.2"; sha256="0bhrz0c134ckfw8b8f0pwa5jkwjy1v7brqcsi6rjdywg0zw2qhxw"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
+  Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; };
   PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-1"; sha256="0fdk70vfxgmf2hy6j0djbksi5znvilsi74rrbqd0lfhi841j15qj"; depends=[]; };
   PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; };
   PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; };
+  PoSI = derive2 { name="PoSI"; version="1.0"; sha256="0c08czjvm09mcnkqnas4l22v22r9akgklnacx1j62smk4m546q2m"; depends=[]; };
   PogromcyDanych = derive2 { name="PogromcyDanych"; version="1.5"; sha256="1m6sycca44h8kdf9cd67annw6dxxwiscidzfnjrzqmqa4v6n7rsg"; depends=[dplyr SmarterPoland]; };
   PoiClaClu = derive2 { name="PoiClaClu"; version="1.0.2"; sha256="1j593sc344h9iy7if1ppihx2qd73dv32d77d8ckac43i7b2lig24"; depends=[]; };
-  PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.0"; sha256="0a2v5iwrglg4r6zj5qbbg66638kcf45mxw2gs3qv2zpnfkabadnq"; depends=[BB corpcor Matrix mvtnorm]; };
-  PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.1"; sha256="151qqxd2rgh6jxzpclxxa51apiif77j122r2w23bdijkb85sqy9z"; depends=[corpcor GenOrd Matrix mvtnorm]; };
-  PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.0"; sha256="1x41mwvdria48cjr3dyq4d0l8v8kp3v9aayfl6jfxy6dhjwdg4vz"; depends=[BB corpcor GenOrd MASS Matrix]; };
-  PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.1"; sha256="1d6bb2486g5llpbpljmvagw4jijwslqi52jnpkamgzwz6w9y9svy"; depends=[corpcor GenOrd Matrix mvtnorm psych]; };
-  PoisNonNor = derive2 { name="PoisNonNor"; version="1.0"; sha256="1i00knyv5m6p9rllkc440cg2agzs36am5b5w9n90506nq36xp8qm"; depends=[BB corpcor MASS Matrix]; };
-  PoisNor = derive2 { name="PoisNor"; version="1.0"; sha256="147ma6qg6nwxzp022jm5mpijhg3jz489qclr9g2mli5mhgm31f8j"; depends=[corpcor Matrix mvtnorm]; };
+  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]; };
+  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.1"; sha256="1j7pxkwjrhmgffrqpkykvsdvflqn93z6in2ysn1gs6qvk5vlrnbi"; depends=[gtools]; };
+  PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; };
+  PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; };
   PolynomF = derive2 { name="PolynomF"; version="0.94"; sha256="006ds50ivq91v2jyhgpm5rfaipxbzsnljrki6fjplcw07g0frz71"; depends=[]; };
-  Pomic = derive2 { name="Pomic"; version="1.0.2"; sha256="1i3zsz7gc4n4vid3yi3srrv04qk1678wqyyw303pfibiyfd4m80q"; depends=[]; };
-  PopED = derive2 { name="PopED"; version="0.3.0"; sha256="1ahgnrzjldiqj0a561x8phad62qb5ldrck1az3qcrqvm7n6h6icb"; depends=[codetools dplyr ggplot2 MASS mvtnorm nlme]; };
+  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="2.2"; sha256="0chpfgxpjbp0ci1h2q60gsbwdbqw14wa3pd7y6la3bz7pmsdbnwf"; 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.1.6"; sha256="1wk5k5f80l7k6haiaikhgaqn67q5n7gm632i3yz3frj1ph7bwjb7"; depends=[ff]; };
+  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]; };
   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.2"; sha256="0qf9h4gwq148m4q9x2avbzw9m07zbs4ljhlqf8glk50bs6vjpfi2"; depends=[PortfolioEffectHFT rJava]; };
-  PortfolioEffectHFT = derive2 { name="PortfolioEffectHFT"; version="1.5"; sha256="0mwwfsf6bngxdk10sya19k2mhy4pq9pgyzz59pd5zxgs0rx4hl6k"; depends=[ggplot2 rJava]; };
+  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]; };
   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-3"; sha256="1bad2r9kdpg5i9pqz6754xywwm1c1mbl16dxdnb92pjy2pkq1q7x"; depends=[mvtnorm PowerTOST]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.3-4"; sha256="0zjbnxd9l8m9bw7p3px0qxv8xjhm2w4fx0i1j0jpm95q5i01cgmm"; depends=[mvtnorm]; };
-  PracTools = derive2 { name="PracTools"; version="0.3"; sha256="1n9h28nzxy0fs27w1gwyrbaijr437xqiprmkal0i4dz6da7w4928"; depends=[]; };
+  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]; };
+  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]; };
+  PredPsych = derive2 { name="PredPsych"; version="0.1"; sha256="1nhaainpp9qr30l6g74vl2qcdy64amrn08m4fsjz3ahbvr908mkj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
+  PredictTestbench = derive2 { name="PredictTestbench"; version="1.1.3"; sha256="14np4zvr0labhqxzsv07iqzldfxmnsfk91qpfqz7vyiq0vwcymp4"; depends=[forecast ggplot2 imputeTestbench PSF reshape2]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
   PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
-  PrevMap = derive2 { name="PrevMap"; version="1.3.2"; sha256="0dy14cyzlnf33rw3f2imfiskblg833cp3fflpw28zr52m36crrd2"; depends=[geoR maxLik pdist raster splancs truncnorm]; };
+  PrevMap = derive2 { name="PrevMap"; version="1.4"; sha256="1yvq2lpylwkhhbz3ys06a6fyfcwcc9zq58ihgh3yhs6f79jcfv2m"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
   PrivateLR = derive2 { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
+  ProFit = derive2 { name="ProFit"; version="1.0.2"; sha256="0wqm5c3syrpkbb7rwkfgfbva52a0bjbl8fl8rxi624vc4rwicr87"; depends=[fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; };
   ProNet = derive2 { name="ProNet"; version="1.0.0"; sha256="10r0gcxv0djrw99nd6a1jrnwvqmidw10ll645gvkp8l39li0107n"; depends=[igraph linkcomm MCL Rcpp]; };
-  ProTrackR = derive2 { name="ProTrackR"; version="0.2.3"; sha256="0zdysy58s2prla07qfhlhsycmnnf7ydjz5dlhhng5da3bc1nlrq2"; depends=[audio lattice signal tuneR]; };
+  ProTrackR = derive2 { name="ProTrackR"; version="0.3.4"; sha256="10xwj1d7k1n85hjdwh7q7pkbmcb625y6fzcbyvnplin25v2b03qc"; depends=[audio lattice signal tuneR XML]; };
   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]; };
   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.6"; sha256="0ijsy49gghnki5l63vg5l2awy57kbxbih618j5i5lxs44g15sa5v"; depends=[]; };
+  ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.7"; sha256="0jf8r9lbczvjvnzf15lz6fm31naxm1fpqni88484yrd6vpxjacq6"; depends=[]; };
+  ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.0"; sha256="1baf4v9c2pqqmlgxs1jf7fhwqbsw0l1g7rdiia21acxix2j3b7wj"; depends=[]; };
   PropCIs = derive2 { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh6827f5r7gdhajx1iwp5fggdlm808hgq7"; depends=[]; };
   PropClust = derive2 { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[dynamicTreeCut flashClust]; };
   PropScrRand = derive2 { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
   ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; };
+  Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; };
   PsiHat = derive2 { name="PsiHat"; version="1.0"; sha256="0an71x75j6ih55alxp7kfwi0qf4z3y5bwswrjk01z2w4b9glacqh"; depends=[qvalue]; };
   PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; };
-  PtProcess = derive2 { name="PtProcess"; version="3.3-10"; sha256="175gdyvj1l1d3vm00p0z4sn1ggaf3hly383ngzx2l029nsrxz0zf"; depends=[]; };
+  PtProcess = derive2 { name="PtProcess"; version="3.3-12"; sha256="14d39xxgkqnqq79v9sp6g9csj2rp6pix2hzg9acjdmw1xyadn71h"; depends=[]; };
   PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
-  PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
+  PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.3"; sha256="1d9k5ilrxz9brv08nl2iqpalqjf4g0bv49qxywq970g66jyxjjij"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
   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.1"; sha256="0zdg2s0y1qgxyvrg5iims9il6cnsbf0hchj3l8z1b9w50gggdm8k"; depends=[lpSolve QCAGUI shiny venn]; };
-  QCA3 = derive2 { name="QCA3"; version="0.0-7"; sha256="0i9i2i633sjnzsywq51r2l7fkbd4ip217hp0vnkj78sfl7zf1270"; depends=[lpSolveAPI]; };
-  QCAGUI = derive2 { name="QCAGUI"; version="2.1"; sha256="1lbdx2hrj8im5z58x20l4sgihvc2njw8v1dgy3cmwcfka1l1dw3p"; depends=[lpSolve shiny venn]; };
+  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]; };
+  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.0-0"; sha256="1k7av1b8wmr91a6prvgkny65hvf185389shgxncywp51jqaxpikp"; depends=[lpSolve]; };
-  QCAtools = derive2 { name="QCAtools"; version="0.2.1"; sha256="167vjlh8b1a1wxvfnqbh4x429xvfhf789v8k6brlh7x5n6bmk114"; depends=[directlabels ggplot2 QCAGUI stringr]; };
+  QCApro = derive2 { name="QCApro"; version="1.1-1"; sha256="0rp1mcgp21m4wi301kwb7vzilb4z0pq78h9wavkpyxnq0ch6hnlh"; depends=[lpSolve]; };
+  QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; };
+  QCEWAS = derive2 { name="QCEWAS"; version="1.1-0"; sha256="0snqg1q9848g8gmxxlz1fhw4cnfxwp28qkfyrpc0yzmkswvysx6v"; depends=[]; };
   QCGWAS = derive2 { name="QCGWAS"; version="1.0-8"; sha256="1wn1kddgfmqv326pihnavbgsbd2yxrlq5s2xgi6kbprssxvj8bk1"; depends=[]; };
   QCSIS = derive2 { name="QCSIS"; version="0.1"; sha256="0ibh3060jxf426svdfxiryvfhr8pwk991xs653d50ip4f9290y3a"; depends=[]; };
+  QCSimulator = derive2 { name="QCSimulator"; version="0.0.1"; sha256="1ff7xagnzibhrwrmkqyky4ik3kx7rrlajrs1ypm210sl1d73jwvs"; depends=[ggplot2]; };
+  QFASA = derive2 { name="QFASA"; version="1.0.2"; sha256="1gfclbalcfcfmb8bq7rp8kpnaqblai9y7n7n7zh4a3qmia5vrz2b"; depends=[Rsolnp]; };
   QFRM = derive2 { name="QFRM"; version="1.0.1"; sha256="1k79sq9il4326q7ivwdwlzw7drjv4pwqra3fr8kyyqcpmxh9296h"; depends=[]; };
-  QICD = derive2 { name="QICD"; version="1.0.1"; sha256="136f7qv69x0a5bz5pa1jfawn7vikd90qv3fk8pjga9azpmfjj2wn"; depends=[]; };
-  QPot = derive2 { name="QPot"; version="1.0"; sha256="1dw2hzl6hif9g5kn37zyvd1gglqg67ki6ii42rl4vr5p3ar4f8pb"; depends=[MASS]; };
+  QGglmm = derive2 { name="QGglmm"; version="0.5.1"; sha256="1112w9dwbr9smxa869w4833iw1vclscr1zbjn2f0xklnpn3nb40d"; depends=[mvtnorm R2Cuba]; };
+  QICD = derive2 { name="QICD"; version="1.1.1"; sha256="0mg17w62yzgslifbc08vglsxwiczicgzilczidpjwlcrg3lq8jjc"; 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=[]; };
+  QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; };
   QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; };
+  QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; };
+  QRegVCM = derive2 { name="QRegVCM"; version="1.0"; sha256="15fgmgwp9b4bjk46c3myfvq7ipl0qyfqslmf4ha184vi7s600ymj"; depends=[quantreg SparseM truncSP]; };
   QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
   QTLRel = derive2 { name="QTLRel"; version="0.2-15"; sha256="15wli0mpcmp7vc4jwp393w0qfm5g5n8dj724j38s711ir98w660b"; depends=[gdata lattice]; };
   QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
-  QZ = derive2 { name="QZ"; version="0.1-4"; sha256="1k657i1rf6ayavn0lgfvlh8am3kzypgb1jhf2by147gv103izkrz"; depends=[]; };
+  QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; };
+  QZ = derive2 { name="QZ"; version="0.1-5"; sha256="1z531yhlmm7a4m63p84q9nsnsrsiwfqrq505xg6crfygkb5kircc"; depends=[]; };
   QoLR = derive2 { name="QoLR"; version="1.0.2"; sha256="1vvs5a4yl1isy0kqxzr2kcfg3y6bg3n2gsy7a2qgch92vjffd18a"; depends=[survival zoo]; };
-  Qtools = derive2 { name="Qtools"; version="1.0"; sha256="12ifrk0g63hmfwq17sl25bz2m256jzp6n3lycsm2izm7rc0rv2c8"; depends=[boot MASS mice quantreg]; };
+  Qtools = derive2 { name="Qtools"; version="1.2"; sha256="0432ip73aldblq3yyig8d47a56j12fs30fpz8sxvfj186ssawych"; depends=[boot MASS mice quantreg]; };
   QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
-  Quandl = derive2 { name="Quandl"; version="2.7.0"; sha256="15j8wgk067ixmcp70k7fi6wnyl7mz26ljdgrcgy6dwgfng6286h8"; depends=[httr jsonlite xts zoo]; };
+  Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; };
   QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
+  QuantTools = derive2 { name="QuantTools"; version="0.5.3"; sha256="01q71n9q9fqg6yn8mxnmd3j0mwp7ryxrkfw5cvpjwd1i9ld5d7jd"; depends=[data_table fasttime Rcpp RCurl readxl]; };
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
-  QuantumClone = derive2 { name="QuantumClone"; version="0.15.11"; sha256="1aaikqjcgbwz8wwi89b8aj6r0vzz2haj9wlv0ik1xbhsjlyvvcyz"; depends=[doParallel foreach fpc gridExtra rgl]; };
+  QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
+  QuantumClone = derive2 { name="QuantumClone"; version="0.16.8.19"; sha256="019rhpvc4by3pizy3i6sw04230hzhmq79mkhjin3777mn9gdnzfm"; depends=[doParallel foreach fpc ggplot2 gridExtra 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]; };
-  R_devices = derive2 { name="R.devices"; version="2.14.0"; sha256="1i40033w15q1nazm9ma0gfixb37mdy76yhcssgvaah1dx6p51xb4"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
+  R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
   R_filesets = derive2 { name="R.filesets"; version="2.10.0"; sha256="0wdqxskmamqygvxh9jmvkhkgm906yrqci6vivczr9la0j4zwnn0b"; depends=[digest future listenv R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
-  R_matlab = derive2 { name="R.matlab"; version="3.5.0"; sha256="1vpdv6ixcfl933r23l6v858ncs1x6gqsmr9nxjjsimx7q56mw6p9"; depends=[R_methodsS3 R_oo R_utils]; };
+  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.20.0"; sha256="1l1x4r69mdchjyi6sq52p580fz3b3bqv6dpn1706y9n4vq47qx24"; depends=[R_methodsS3]; };
-  R_rsp = derive2 { name="R.rsp"; version="0.21.0"; sha256="0snc6ps75s3ci6sy8mil1wg2i9xmlr1ygh9n244y1brdvp43dfsw"; depends=[R_cache R_methodsS3 R_oo R_utils]; };
-  R_utils = derive2 { name="R.utils"; version="2.2.0"; sha256="1340g3agi4w5ab0kkc85rnfy6q03f13x3i9c58vn2jaaq5lmvy90"; depends=[R_methodsS3 R_oo]; };
+  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_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=[]; };
-  R2BayesX = derive2 { name="R2BayesX"; version="1.0-0"; sha256="1p60n14gaqciskzah5haskflpms1g5lh4n57653yysa7fvmfgdhw"; depends=[BayesXsrc colorspace mgcv]; };
+  R2BayesX = derive2 { name="R2BayesX"; version="1.1-0"; sha256="043hrznc16j6mkr3h9vjvi9yn6xn497xz5pjp53ks48pzz54jp9p"; depends=[BayesXsrc colorspace mgcv]; };
   R2Cuba = derive2 { name="R2Cuba"; version="1.1-0"; sha256="1zmlsambajzxkc9dawlqb0png8s502hwblq0vyhqgc08yf29b43w"; depends=[]; };
   R2G2 = derive2 { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8sqszs9gaj2vhsx1jxxks8981na7"; depends=[]; };
   R2GUESS = derive2 { name="R2GUESS"; version="1.7"; sha256="07w54r5r9v7pa8aklmwbwdcc57j3a3b46b1a7mwmzcl11mcfwdph"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
-  R2HTML = derive2 { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; };
-  R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-1"; sha256="0gkp5jvvbf9rppxirs1s7vr5nbfkrlykaph3lv20xq8cc8nz9zzx"; depends=[coda digest foreign lattice Matrix rbugs]; };
-  R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[boot coda]; };
+  R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; };
+  R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-3"; sha256="1xxwj59f6mfl48jmwn8n5i6b86kkw8kaxpvirkh74gqan861hrpb"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; };
+  R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; };
   R2STATS = derive2 { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; };
   R2SWF = derive2 { name="R2SWF"; version="0.9-1"; sha256="0xhq4dyi1mj4n38zylgi6d17d5wp402wm3kic05vgssg4pyfda2d"; depends=[sysfonts]; };
   R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; };
-  R2admb = derive2 { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; };
+  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]; };
   R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
   R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; };
   R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
-  R6 = derive2 { name="R6"; version="2.1.2"; sha256="0yad91i9p4r8bbz6nq8zny39y767n9an7ak5p275ynx8km6v3yqv"; 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]; };
   RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; };
-  RADami = derive2 { name="RADami"; version="1.0-3"; sha256="0rg07dsh2rlldajcj0gq5sgsl1i3qa28bsrmq88xcljg5hnr4iqn"; depends=[ape Biostrings geiger phangorn]; };
+  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]; };
   RAHRS = derive2 { name="RAHRS"; version="1.0.2"; sha256="0s7vkmyc3yh62m2xbsvajgvi9xdw5x4irnp7rcllhqa7z9nj50c9"; depends=[pracma RSpincalc]; };
   RAM = derive2 { name="RAM"; version="1.2.1.3"; sha256="1p6rqqbp5q3pqy9m6npml52nkfh8pd4kc245kb22qjslbvl3rrkn"; depends=[ade4 ape data_table FD ggmap ggplot2 gplots gridExtra labdsv lattice MASS permute phangorn phytools plyr RColorBrewer reshape reshape2 RgoogleMaps scales vegan VennDiagram]; };
-  RAMP = derive2 { name="RAMP"; version="1.0"; sha256="18cz8gvb49j1hic71dzfcl17hz5gjdcabqvq84yr1h7iqkrq95cq"; depends=[]; };
-  RAMpath = derive2 { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyyz0r3ja4v05xb5a6aq9k26wsb5m42x85k"; depends=[ellipse lavaan]; };
+  RAMP = derive2 { name="RAMP"; version="1.9"; sha256="0fy74cj1hjlwsdpayv0mkh7cn829bd1c7z9mgng304vh5ga02nh2"; depends=[]; };
+  RAMpath = derive2 { name="RAMpath"; version="0.4"; sha256="0blixfmgiq22hd356hrp4vbhfkkgh0a58143nhirjx3sav9pxc1v"; depends=[ellipse lavaan MASS]; };
   RANKS = derive2 { name="RANKS"; version="1.0"; sha256="1lvaya9jlqrr9klqznw4fz5h5x0sw191ci74hpymb4gzhhxcbp27"; depends=[graph limma NetPreProc PerfMeas RBGL]; };
   RANN = derive2 { name="RANN"; version="2.5"; sha256="007cgqg9bybg2zlljbv5m6cmlm3r6i251018rpgjcn0xnm9sjsj7"; depends=[]; };
   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.6"; sha256="0rrkw3s0r7qp87ikphi8i8dq5j46h5708h9phqi3hc0qkmkld8i8"; depends=[RCurl rjson]; };
+  RAdwords = derive2 { name="RAdwords"; version="0.1.11"; sha256="069ik7irl68chwpfdpp06ng2w272kr0cx7fjd1c6zz4nrsw8zxrn"; depends=[RCurl rjson]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
-  RAppArmor = derive2 { name="RAppArmor"; version="2.0.1"; sha256="19545bblzplnqbkf6p23ap6b51ma8n30ivxrx57p1rmnnnj55vdz"; 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=[]; };
-  RBPcurve = derive2 { name="RBPcurve"; version="1.0-33"; sha256="0n49qiam8ydlhhqk2f1h0rqdsl4ivx2vmz9n11kf4yfrq06a02a7"; depends=[BBmisc checkmate mlr shape TeachingDemos]; };
+  RBMRB = derive2 { name="RBMRB"; version="2.0.2"; sha256="0znkw5n123xhn902nyv1p0bpm0djyscsyqdab3bpps0n35mfxlq5"; 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-15"; sha256="0w9807dyjghqy1rnv2c0k4kdjlwxzg5fk5r3rsqrmzjj4r8x9g9w"; depends=[splancs]; };
+  RCALI = derive2 { name="RCALI"; version="0.2-17"; sha256="1bic7dwxkvgxl3a26glxm6h6gmq4xad70dbrnrnb2d6n5v1dnniw"; depends=[splancs]; };
   RCEIM = derive2 { name="RCEIM"; version="0.2"; sha256="0l3lfx3zqxf310rhvjkn977xchxzi7cbzij3ks0nqlx55x5ica9w"; depends=[]; };
-  RCMIP5 = derive2 { name="RCMIP5"; version="1.1"; sha256="1aqcwxh2p4z7wn4p224xdiaharbr51rj51aa760rirs5s1ra7f6q"; depends=[abind digest dplyr reshape2]; };
-  RCPmod = derive2 { name="RCPmod"; version="1.4"; sha256="1psn1w8ws0n96jqvd98l0wl0l46w0691c5vm9aarql2pqnc73lw9"; depends=[gtools numDeriv]; };
+  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=[]; };
-  RCircos = derive2 { name="RCircos"; version="1.1.3"; sha256="1kskjli7q4cmppm7cm5w2d8ad7h3crcpay1iayas5wkc03fga4gw"; depends=[]; };
+  RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; };
+  RCircos = derive2 { name="RCircos"; version="1.2.0"; sha256="0jj4jj9qnj7pils99hzw9yx5bwi182q4afdsqh7w7d9kzhp6xl3z"; depends=[]; };
   RClimMAWGEN = derive2 { name="RClimMAWGEN"; version="1.1"; sha256="0icy560llfd10mxlq0xmc6lbg6a030za9sygw1rpz8sk5j0lvb84"; depends=[climdex_pcic RMAWGEN]; };
-  RClone = derive2 { name="RClone"; version="1.0"; sha256="0rbnac1xdpj6g8sq0dd6ja6mi5gl3nxjz3arnzmdwwh3qaqdx91i"; depends=[]; };
+  RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; };
   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.1"; sha256="1wlsp9idywgkcr2v68yj8gabyxd4ss6vzqr4z2id7fgvyqk8fyy4"; depends=[httr plyr RCurl XML]; };
+  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-1"; sha256="0ir8qp3k326gxy5f0hy144zi8xcgsk6svahz7lr5pjfj05czmxxm"; depends=[assertthat dplyr plyr R6 rlist tidyr XML]; };
-  RDS = derive2 { name="RDS"; version="0.7-5"; sha256="13zdan1riq5yzyixywr69svz42i5rp9n3fsz8zwmp2d64y8wsr3j"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
+  RDML = derive2 { name="RDML"; version="0.9-5"; sha256="08q1ixwnxx4j2nwdynswbdy6jw2r97c5a0zlwhaxr888c7hcv6ff"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
+  RDS = derive2 { name="RDS"; version="0.7-8"; sha256="0lxnb6zd5lphs9d42pfdzx607w7iz1mpj3z8pb2ri3s4h011g1vn"; depends=[ggplot2 gridExtra igraph reshape2 scales]; };
   RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
+  RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; };
   RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
   RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
-  RDota = derive2 { name="RDota"; version="1.2"; sha256="1r56s4ii37szmdwgbnlw2g9576kjvyc79nvnfrsgr5mys62pbrzs"; depends=[XML]; };
-  REBayes = derive2 { name="REBayes"; version="0.62"; sha256="03fzmj4illah6xa4j4qh8srzxlrda8i4j71sd3269rs6lf2n9bw7"; depends=[Matrix reliaR Rmosek]; };
-  RECA = derive2 { name="RECA"; version="1.1"; sha256="1wgcd53yy4xsi7i674n4255qvvv6988r43q7n7pjqrimp04g1qd0"; depends=[]; };
-  REDCapR = derive2 { name="REDCapR"; version="0.9.3"; sha256="0il1b1sc05kigl8937s853a73k54xdr16sr4g8c11qyv54iy8d9a"; depends=[httr plyr]; };
+  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=[]; };
+  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]; };
   REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
-  REPPlab = derive2 { name="REPPlab"; version="0.9.3"; sha256="1ildcmqpjxbmrjjvgq0wyg8gj9a8fl54fyxbsbkfxfg6lyfknm2g"; depends=[lattice LDRTools rJava]; };
+  REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; };
+  REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; };
   REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
+  REREFACT = derive2 { name="REREFACT"; version="1.0"; sha256="0nggva4qfqlcs58df3sgiigw0z75l5kg8c1yh0k5qsvjnhiq19vn"; depends=[combinat gdata Matrix psych]; };
   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.0"; sha256="0mla336jj1c17b2jvi4a10pgk5zpdhiif5f1c70pdhzvisiagmng"; depends=[AER e1071 mvtnorm optimx]; };
+  REndo = derive2 { name="REndo"; version="1.1"; sha256="1n168xxjxj9353chdgsj88as0dj7ylm207xk75rbfzv7bdi7rlj9"; 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]; };
+  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]; };
+  RFinfer = derive2 { name="RFinfer"; version="0.2.0"; sha256="1cgdrg7gm8hdaaycipn8wjx7s4652jyy664n1my9qynmc56qib4n"; depends=[Matrix party pbapply randomForest]; };
   RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0.1"; sha256="1zd0sbcji620pka5600ilj4bq9gzdnk5kf82qfd5k5dcx7q9x7rk"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; };
-  RForcecom = derive2 { name="RForcecom"; version="0.8"; sha256="1w3m6rdmycrjhigs4h9bqy5xqsjwkz2cb1idch397iwxrjzsx1ph"; depends=[httr plyr RCurl XML]; };
-  RFormatter = derive2 { name="RFormatter"; version="0.1.0"; sha256="01izxfnwhpy4wgp8ry0xasjjd63071gk1962dl2wzjycgcsig5p5"; depends=[formatR]; };
+  RForcecom = derive2 { name="RForcecom"; version="1.1"; sha256="1ch1pwpnqagzb9n4qbgr804bmnz819kp36r5a4zhijmq8xpv3qr2"; depends=[httr plyr RCurl XML]; };
+  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.1"; sha256="1zwkxm1xwgfdd5r4jkgzrfj4hgrdnzz8z0a75318fbpaw1cvaqwq"; depends=[httr jsonlite lubridate plyr]; };
-  RGCCA = derive2 { name="RGCCA"; version="2.0"; sha256="0mcp51z5jkn7yxmspp5cvmmvq0cwh7hj66g7wjmxsi74dwxcinvg"; depends=[MASS]; };
-  RGENERATE = derive2 { name="RGENERATE"; version="1.3"; sha256="16gkdwbigdsdvnplqhzs11kk4dhb2rlnf7vj6kbzxw9fb1b7818q"; depends=[RMAWGEN]; };
-  RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.0"; sha256="1f6y3i8r6a9cajbj127s0cd13ihbi8scgrsgizza1fjb7fg2g450"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
+  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]; };
+  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]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
   RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
   RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.1"; sha256="1049fyxl00izw92rm508p90asjp0agmv38b00yfbmasfzsp1r00s"; depends=[httr lubridate]; };
   RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; };
+  RGoogleFit = derive2 { name="RGoogleFit"; version="0.2.0"; sha256="1yxp2dflq4hihn8mknjxhsrf3dy4dr4bs4qkzi2zxm2mh9mn0lsl"; depends=[bit64 httr jsonlite RCurl]; };
   RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; };
   RGtk2 = derive2 { name="RGtk2"; version="2.20.31"; sha256="1ilnlmsk9fis61pc5bn9sf7z4b7vc7f0a0zcy77kk4bns6iqjvyp"; depends=[]; };
   RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; };
   RH2 = derive2 { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; };
-  RHRV = derive2 { name="RHRV"; version="4.0"; sha256="16xmmmw8gsqalbqf59xwpkd2bkfwxrdx8bwdn875bizx7mn0bql7"; depends=[nonlinearTseries tkrplot waveslim]; };
+  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.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; };
+  RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; };
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
-  RISmed = derive2 { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; 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=[]; };
   RInside = derive2 { name="RInside"; version="0.2.13"; sha256="0cfhljdai9kkw5m01mjaya0s02g4g1cy1g4i0qpjkhgqyihsh7dy"; depends=[Rcpp]; };
-  RItools = derive2 { name="RItools"; version="0.1-13"; sha256="1j7gwn1n3dn3xp0c9rwdlmkkw8arjvf9nq0glwc273nnyh4wg72k"; depends=[abind SparseM svd xtable]; };
+  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.5"; sha256="1dps81ni257j27dsfwpjz20r2q3q60myf29cdjphsmf7zwkrzpiz"; depends=[rJava zoo]; };
+  RJSDMX = derive2 { name="RJSDMX"; version="1.6-2"; sha256="0015r71fh2ynwvq4lzdq1h59kvsr04h82anznwz5ixrc3vz3abzj"; 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]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
-  RKEEL = derive2 { name="RKEEL"; version="1.1.6"; sha256="11yc31jswdzm5kr7j9b2cpzd9rhwkirfk02df7z5i8ry420jhm5y"; depends=[doParallel foreach gdata R6 RKEELdata RKEELjars XML]; };
-  RKEELdata = derive2 { name="RKEELdata"; version="1.0.2"; sha256="0wnzsf5mgal5cqdclfs1z396h47a7ikkf5raby8508yrv19czv5l"; depends=[]; };
-  RKEELjars = derive2 { name="RKEELjars"; version="1.0.11"; sha256="0kmdzvybj8jyiq95clc52jzrnmwk5ifanjjpz3bw4ypvqmj86xn2"; depends=[downloader]; };
+  RKEEL = derive2 { name="RKEEL"; version="1.1.21"; sha256="0rcbw4wbp1dg4hqrg6dmim7d4bsaa1j3rdffhkyz3in8hv76i0lq"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
+  RKEELdata = derive2 { name="RKEELdata"; version="1.0.3"; sha256="1imz5qsr04hkhblivax30jlvbvjxya6h0z9x7s0llgqssfxbawpy"; depends=[]; };
+  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-2"; sha256="0wwcn9ch4bndrw5sizsd4cqaq1nvqgykx28dzp05r6wsabixnhxh"; depends=[lme4 mgcv nlme Rcpp]; };
+  RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; };
   RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; };
-  RLumShiny = derive2 { name="RLumShiny"; version="0.1.0"; sha256="0j4w3h1j6dm5q98639am3xfixjdx2xhiiy3qghkb0z8lv5rbvvw5"; depends=[digest googleVis Luminescence RCurl shiny]; };
+  RLumModel = derive2 { name="RLumModel"; version="0.2.0"; sha256="164bg9smxllwwk93g3g08v3902p5bl0i278dyal71cxycayzc8y1"; 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]; };
-  RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.0"; sha256="19p8bxcfk802pdn6990ya0bd9ghbvg8vmk3z01x1v76w09j4bv38"; depends=[chron date vars]; };
+  RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; };
   RMC = derive2 { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
   RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; };
   RMOA = derive2 { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[rJava RMOAjars]; };
   RMOAjars = derive2 { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76cyjm27qq1clxppc5h16li2m8x68fvpjq"; depends=[rJava]; };
   RMRAINGEN = derive2 { name="RMRAINGEN"; version="1.0"; sha256="175kd803a44yblq2jw5mrn2qv4piiy249577lf684bmmajf4ird4"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN]; };
+  RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
   RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-  RMark = derive2 { name="RMark"; version="2.1.14"; sha256="15j50i05y8zpdawpk0x7ndhxwfcmxk3xajhh6lxzf81q1zg92hvd"; depends=[coda matrixcalc msm snowfall]; };
+  RMark = derive2 { name="RMark"; version="2.2.2"; sha256="10qinncbvfkc1n6w5i4pc7zr4llc6jskq6p2m5783chxwrwzyjlj"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
-  RMixpanel = derive2 { name="RMixpanel"; version="0.2-1"; sha256="196z6qvcsh8xvpjaiif4l4h0xkmjgz8q35v5pqky9dc856v0cl9a"; depends=[digest jsonlite RCurl uuid]; };
+  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.8"; sha256="1czy9ahsmh13djapcllh7dx93sfpz8hcfx5yzbnmwymhw5svkk96"; depends=[DBI]; };
+  RMySQL = derive2 { name="RMySQL"; version="0.10.9"; sha256="0hpxjvr6yh2093ci7dwrww8wv9zhclfjk3wbx86jxvn87ms9qa21"; depends=[DBI]; };
   RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
-  RNCEP = derive2 { name="RNCEP"; version="1.0.7"; sha256="0yvddsdpdrsg2dafmba081q4a34q15d7g2z5zr4qnzqb8wjwh6q2"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
-  RND = derive2 { name="RND"; version="1.1"; sha256="1rbnjkfrsvm68xp90l4awixbvpid9nxnhg6i6fndpdmqwly2fwdp"; depends=[]; };
+  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]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
-  RNeXML = derive2 { name="RNeXML"; version="2.0.6"; sha256="1ya628lhb6jidfwvl7dddsy9ww761zwznmg1m0snfqwggxc83y8g"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; };
-  RNeo4j = derive2 { name="RNeo4j"; version="1.6.3"; sha256="16lkick2swi60pbx1wy869286irv39xb4di5a2vlvbsqjdl0lnrc"; depends=[httr RJSONIO rstudioapi]; };
+  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-2"; sha256="1j0f14n91gks288sph40ki9wr21dg0bsdk9143f1wwhmwr3jm4wi"; depends=[igraph rJava]; };
-  RNewsflow = derive2 { name="RNewsflow"; version="1.0"; sha256="1lh9mnv1nvmpx8pqa3bqrv3zc2079hqzajdg73fbq5lfhdpb0rb3"; depends=[data_table igraph Matrix plyr scales slam tm wordcloud]; };
-  RNiftyReg = derive2 { name="RNiftyReg"; version="2.2.0"; sha256="0mik24n3qp8j8iy88ss642rgll7rrhxyyc86zh40b6n8y9qc37wq"; depends=[ore Rcpp RcppEigen]; };
+  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]; };
+  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]; };
   ROCR = derive2 { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; };
-  ROCS = derive2 { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqrm6ami94cq6y5kvm2qyv0jfah"; depends=[rgl]; };
-  ROCt = derive2 { name="ROCt"; version="0.9.4"; sha256="16kcq9dckwmn98izhnyzj9pcqb1ifs6b1hrx126gwb0zp3wdr8ym"; depends=[date relsurv survival timereg]; };
+  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-12"; sha256="042m7bwjhlzpq2hgzsq0zy4ri3s8ngw3w4qrqh1ag7fprpn55flj"; depends=[]; };
+  RODBC = derive2 { name="RODBC"; version="1.3-14"; sha256="12zjyhfclxj7k9lxhdlwxqh7ckmh916hh3ywmhzbvzvxvzymnkgd"; depends=[]; };
   RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; };
-  RODBCext = derive2 { name="RODBCext"; version="0.2.5"; sha256="18a0ajqrq3rcfcsyz0c9mwq6bi03prpg83z9jasbbc866gqs6fvq"; depends=[RODBC]; };
+  RODBCext = derive2 { name="RODBCext"; version="0.2.7"; sha256="0lklafxhs9s5gwd0jd7jmz7inalxc6967vl4r2faq7d07zxmsyd8"; depends=[RODBC]; };
   RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; };
-  ROI = derive2 { name="ROI"; version="0.1-0"; sha256="01za8cxjf721m2lxnw352k8g32pglmllk50l7b8yhjwc49k8rl66"; depends=[registry slam]; };
-  ROI_plugin_glpk = derive2 { name="ROI.plugin.glpk"; version="0.0-2"; sha256="10p3cq59app3xdv8dvqr24m937a36lzd274mdl2a9r4fwny2rssa"; depends=[Rglpk ROI]; };
-  ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.0-2"; sha256="0mkjq87rv1xf0bggpqd2r4gabv11spgcds2y94r3vpmh8krf71jf"; depends=[quadprog ROI slam]; };
-  ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.0-2"; sha256="1z4cahz0h38jw54p9363ca6i3qq7dwlm3568dr91gvpqf76b05wd"; depends=[ROI Rsymphony slam]; };
+  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_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]; };
+  ROI_plugin_ipop = derive2 { name="ROI.plugin.ipop"; version="0.2-1"; sha256="1v6imxx9215f7hlqzscppyl7n9f9811rx58dia0h5ydfnhv4alxd"; depends=[kernlab ROI slam]; };
+  ROI_plugin_lpsolve = derive2 { name="ROI.plugin.lpsolve"; version="0.0-1"; sha256="0k0308sgkac7z0d01sc9xcrd9pxjfb78gns4rp9mrxkz4k9yvm3h"; depends=[lpSolveAPI ROI]; };
+  ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.2-4"; sha256="1fyzpbljhkc15gmmsvr37hsmfr7fp7ffp9xylsnvy4zxlw060knp"; depends=[nloptr ROI]; };
+  ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-1"; sha256="0cb23xb56j0qn3v7zgqni1697s8bg256zr7dqm00i65f4zivws0j"; depends=[quadprog ROI slam]; };
+  ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.2-3"; sha256="1z039cnv75nk81b4qp1zwy09gvksaxlnxwgdg30mgzjd2mxcp5cf"; depends=[Matrix ROI scs slam]; };
+  ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-1"; sha256="0qvyindwcqiafq8k4m9plipdn5qrpycjk6mv90nmw644pnmip77l"; depends=[ROI Rsymphony slam]; };
   ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
   ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
-  RObsDat = derive2 { name="RObsDat"; version="15.08"; sha256="0n64jqba682rdy696yfpi5l5sw6g33421hg1rnb1dwdnvr7yd0y9"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
+  RObsDat = derive2 { name="RObsDat"; version="16.03"; sha256="06d4svg4crgscn3wyg1fi8v46wlhlrgdrbfiv8ak4a5k5z0gws94"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
+  ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; };
   ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; };
-  ROptEst = derive2 { name="ROptEst"; version="0.9"; sha256="0m5czyqcsz42dzrhm3vwfmn046n57cb7x5sqzf2nad1gqgxzxp1d"; depends=[distr distrEx distrMod RandVar RobAStBase]; };
+  ROptEst = derive2 { name="ROptEst"; version="1.0"; sha256="1hq21rc9ydkgxv54a0zfrlncy4798rjvfmyqx2p88j0swaipy6wp"; depends=[distr distrEx distrMod RandVar RobAStBase startupmsg]; };
   ROptEstOld = derive2 { name="ROptEstOld"; version="0.9.2"; sha256="0blf34xff9pjfy983xm7a27xqkh9173nk64ysas6f0g4h31gh8ax"; depends=[distr distrEx evd RandVar]; };
   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.2-2"; sha256="07ai4hmb9gjpx38l1jcdqlynpl5745m97lxvglrga6sv1z6q9cyb"; depends=[DBI]; };
-  RPANDA = derive2 { name="RPANDA"; version="1.1"; sha256="1sjzph00rxilgk4vxiklfdn6ji2f9b5jz7hd83pcsdinrwy6pjxg"; depends=[ape cluster deSolve fpc igraph picante pspline pvclust TESS]; };
+  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]; };
   RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; };
-  RPEnsemble = derive2 { name="RPEnsemble"; version="0.2"; sha256="1kbgpbk7gma0vhl0aybdj7bk2chhbggzh7h1w7snddgdvvj6cz10"; depends=[class MASS]; };
+  RPEnsemble = derive2 { name="RPEnsemble"; version="0.3"; sha256="052c9cnsrjxbk2yxj08psy3nw0mq3mdr75fhnxpz64n4cqzxbr2q"; depends=[class distr MASS]; };
   RPMG = derive2 { name="RPMG"; version="2.2-1"; sha256="03gqam7lp6ycrwm30gdwh2irqkcviwzk74ysyxff7b23ng4jkz1j"; depends=[]; };
   RPMM = derive2 { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; };
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   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"; sha256="0gpmbpiaiqvjzyl84l2l8v2jnz3h41v8jl99sp1qvvyrjrickra2"; depends=[DBI]; };
-  RPresto = derive2 { name="RPresto"; version="1.2.0"; sha256="0dv7yqxy0pj85dbpr1l6lh33rmmxw5g3fy7g3bvraaif3h3f1pv0"; depends=[DBI httr jsonlite RCurl stringi]; };
-  RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.3"; sha256="00sik2ri64bvvhrdpb91myrhzwwk3y67m214mi21q3b8710mmcaf"; depends=[Rcpp RCurl]; };
+  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]; };
   RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
-  RPushbullet = derive2 { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df0ijwhfc2bi29y61fl9zg3mp4xygx3fyr9mycjm7a"; depends=[RJSONIO]; };
-  RQDA = derive2 { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li24b6n11p5lcxf9xpy7sbmh5ig6g"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
-  RQuantLib = derive2 { name="RQuantLib"; version="0.4.2"; sha256="1sj77iw712jp3rcpmyw3b4x1sfsw7qmb56dbl13vwcxnh5jqs1is"; depends=[Rcpp]; };
-  RRF = derive2 { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
+  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]; };
+  RQGIS = derive2 { name="RQGIS"; version="0.2.0"; sha256="1c160nd33qncp7cjzx6dw3b1scx90czak8wqgf73jn903zynn2m4"; depends=[raster RCurl rgdal sp XML]; };
+  RQuantLib = derive2 { name="RQuantLib"; version="0.4.3"; sha256="1c0ilkrgkyf5x31c51rkszm4bnscyv7hy101dlk0cqkjril7mp7m"; depends=[Rcpp zoo]; };
+  RRF = derive2 { name="RRF"; version="1.7"; sha256="1nxwqb0ybia8cglqlrbwnm9xzab6ayrn5f3j3l0kqszq1rvkfw95"; depends=[]; };
   RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; };
   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]; };
   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]; };
   RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
+  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.5-2"; sha256="1mm4l6yymd564ahc189iaanw8j51jxdfpiif47zf4603irl1bglp"; depends=[RPMG Rwave]; };
+  RSEIS = derive2 { name="RSEIS"; version="3.6-8"; sha256="1jhxd1aq85abll5vrdbbyz52ch8xyaxzqf5r2nzvnc6953hv6jnf"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; };
-  RSKC = derive2 { name="RSKC"; version="2.4.1"; sha256="1dvzxf001a9dg71l4bh8z3aia7mymqy800268qf7qzy9n6552g59"; depends=[flexclust]; };
+  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]; };
   RSMET = derive2 { name="RSMET"; version="1.2.9"; sha256="1da7kck5g0vcd1ly7xaa1i8d9b1qjf6kwf35sq5d71hfbgx2fb4k"; depends=[stringr]; };
-  RSNNS = derive2 { name="RSNNS"; version="0.4-7"; sha256="15293a6lrihk407spv2ndpcf0r9xm5l8ggc1sagf5r2mvbfiv57c"; depends=[Rcpp]; };
-  RSNPset = derive2 { name="RSNPset"; version="0.5"; sha256="0jkibpimh61n869r260qilkacq64awcjgpz46wvqadxw330a3p8c"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
+  RSNNS = derive2 { name="RSNNS"; version="0.4-9"; sha256="08f2yyyc42jxqwyhvwakjkyillkc23chnk2b3bfzyxnb4pphbdfl"; depends=[Rcpp]; };
+  RSNPset = derive2 { name="RSNPset"; version="0.5.2"; sha256="11w2r1gfnzhqa5pwgy8nfs9s6lmln3cwkxxkid8fdg4b3ndwfl46"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
   RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
-  RSQLServer = derive2 { name="RSQLServer"; version="0.2.0"; sha256="1lxk4qw8kl0v7fjl9836arjyvqwwrmph5wyhcmmzg1i6ldn0rd7f"; depends=[assertthat DBI dplyr lubridate rJava RJDBC yaml]; };
-  RSQLite = derive2 { name="RSQLite"; version="1.0.0"; sha256="08b1syv8z887gxiw8i09dpqh0zisfb6ihq6qqr01zipvkahzq34f"; depends=[DBI]; };
-  RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-4"; sha256="1ybk5q4dhskrh7h1sy86ilchdwi6rivy3vv3lph6pms2virgm854"; depends=[]; };
+  RSQLite = derive2 { name="RSQLite"; version="1.1-2"; sha256="0mg9yhdvny3vjn72agai5ghqxd3vk8cd4x1lsc0gzc2b2dm2w0p4"; depends=[BH DBI memoise plogr Rcpp]; };
+  RSSL = derive2 { name="RSSL"; version="0.6.1"; sha256="03f0i0v0nygkcci42h4bh7jngxz15wsd78cn2zkzbrqadz1c61r5"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; };
+  RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; };
+  RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; };
+  RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; };
+  RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; };
   RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; };
-  RSeed = derive2 { name="RSeed"; version="0.1.31"; sha256="0wljchzkp8800v9zcgjapkbildkb3p2xnkh1m6m7q6qqc9aw8mws"; depends=[graph RBGL sybil]; };
-  RSelenium = derive2 { name="RSelenium"; version="1.3.5"; sha256="15pnmnljl4dm9gbcgnad5j58k6cgs6qm34829kdgyb0ygs9q7ya0"; depends=[caTools RCurl RJSONIO XML]; };
+  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"; sha256="0gcmgnczqhz8vzwj8img32z95si1ywbg2mvfd3rwlxzxqdkxg98v"; depends=[NLP openNLP plyr stringr]; };
   RSiena = derive2 { name="RSiena"; version="1.1-232"; sha256="0qp3bqq5p19bg47m37s2dw8m4q91hnkc2zxwhsgb076q0xvvv9xq"; depends=[Matrix]; };
-  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.7"; sha256="09g64ndfglpznjp39k4ry40rn7h6chjs3xfs9h3vh3wg7qy8q4vx"; depends=[base64enc digest httr jsonlite plyr stringr]; };
-  RSocrata = derive2 { name="RSocrata"; version="1.7.0-14"; sha256="1nw3ga1ff1vsgfljmqdwcmxv9w04nldjrish2226l3r8632iy4am"; depends=[httr jsonlite mime]; };
-  RSofia = derive2 { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqrzy4yqwh8hb1124nxg0bjbxvjbihn"; depends=[Rcpp]; };
-  RSpectra = derive2 { name="RSpectra"; version="0.11-0"; sha256="04r59jv0s7ji05d0q1yis8fljj7c5rj82sh7hhl8dfxzy4d6f8hb"; depends=[Matrix Rcpp RcppEigen]; };
+  RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.10"; sha256="1wi2rv5wwibw8m0xd37f284b14irg2gnm31yz73c3wpic2sbf3wf"; 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]; };
+  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.0.0"; sha256="07y9c1yk2kh37adsdn3vx2k8hqggffiipn5gl1qf6ai5ls5xmfg5"; depends=[foreign]; };
-  RStoolbox = derive2 { name="RStoolbox"; version="0.1.4"; sha256="0f6qr6zd2ajfvwxnsa09pdcr42fhg4wd07qr1a4yb7yk0jqawayy"; depends=[caret codetools doParallel foreach geosphere ggplot2 plyr raster Rcpp RcppArmadillo reshape2 rgeos sp XML]; };
+  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]; };
   RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
-  RSurveillance = derive2 { name="RSurveillance"; version="0.1.0"; sha256="1y17bfv0glzzb5rfniia0z4px810kgv2gns0igizw7w427zshnm0"; depends=[epiR epitools]; };
-  RSurvey = derive2 { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[MBA rgeos sp]; };
+  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]; };
+  RSurvey = derive2 { name="RSurvey"; version="0.9.0"; sha256="09ivilmwvjjbs3451cyxhcgq2w9rx6b8b5dsgg6y7l478k5bffrw"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
   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]; };
   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=[]; };
-  RTriangle = derive2 { name="RTriangle"; version="1.6-0.6"; sha256="1g4dp792awbvsl35nvyd8gkx99p2njdcafin16qysfrjl43f5i4s"; depends=[]; };
+  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-53"; sha256="0lapj54w0vr2v5qsnllq1p7nibqldqw1pi2qxlzzypl9lixznxw2"; depends=[ade4 boot car cramer lme4 MASS mixOmics multcompView nnet pls pspearman statmod vegan]; };
+  RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-62"; sha256="0b4g0ia5kawamm6mpzw04365j1cgf8py5dp18kdsqwgisxxm699f"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman statmod 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-1"; sha256="135wa3q954nrkwfs5q0x2z9q6izjxyz4wzk7wx4ncx56jqp038kz"; depends=[]; };
-  RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.6"; sha256="06f2lmls92qkbscss00c99xkzpx83mgjah6ds0sixv1b2qi216ap"; depends=[Rcpp]; };
-  RVsharing = derive2 { name="RVsharing"; version="1.4.0"; sha256="1csnmh3hhzbzp6cj7s8q41bjac26ng0p22vd696pqc0sl0fprppw"; depends=[kinship2]; };
+  RViennaCL = derive2 { name="RViennaCL"; version="1.7.1.4"; sha256="0g7ckda8a278zg5vpfgajpa17r4hknf5akn556afyhmigj8bdax1"; depends=[]; };
+  RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.8"; sha256="013mh8ghxccrhdcrcdfqll2jgf3z5zw7fsn0083bn3nkr19xbabz"; 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]; };
-  RWeather = derive2 { name="RWeather"; version="0.4"; sha256="1vm8w07gsxwxvg1gpdzn6mpnh8g9kp0ln9fxjw5rl2f1zz80bxpy"; depends=[XML]; };
   RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; };
-  RWeka = derive2 { name="RWeka"; version="0.4-25"; sha256="0bskypj9153593jq4l4rn9wibydv3py9pq2qmk803d3aqggbqzyg"; depends=[rJava RWekajars]; };
-  RWekajars = derive2 { name="RWekajars"; version="3.7.13-1"; sha256="0g8xddi654s4xih5mx6fr1ra7jha9hxhnbns688vqp7l75nv5xgf"; depends=[rJava]; };
-  RWiener = derive2 { name="RWiener"; version="1.2-0"; sha256="1ssh4xcyr4whgyd91p6bjsm9mq1ajqjqva0yyk13dnf5jfpsr0gs"; depends=[]; };
-  RXKCD = derive2 { name="RXKCD"; version="1.7-5"; sha256="0dsds1bv2vfq61gfppar2ai23dryh09ric5i6zaccms6q64z23md"; depends=[jpeg plyr png RJSONIO]; };
+  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]; };
+  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]; };
   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]; };
-  RadOnc = derive2 { name="RadOnc"; version="1.1.1"; sha256="05ba1yb37fzd2w3w69r4kyjnpgxjg5ssixxhh4iak6g9b3c0i5gq"; depends=[geometry oro_dicom ptinpoly rgl]; };
+  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]; };
   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]; };
+  Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; };
   Rambo = derive2 { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc49ixjjvfrafsgis2zh5w6rjwv8"; depends=[sna]; };
-  Ramd = derive2 { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
-  RandVar = derive2 { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
-  RandomFields = derive2 { name="RandomFields"; version="3.1.8"; sha256="1yaf7mzhi61n7s3n44fxwilry5s7wnqq7sbx09jarm1jkbn3gk6x"; depends=[RandomFieldsUtils sp]; };
-  RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.0.14"; sha256="1phnzmj9cbdaxp1v47irxk0c41fyh5qqs7m9y1gxvkpy2l8xkfr2"; depends=[]; };
+  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=[]; };
   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.93.1"; sha256="1ki0x8fkdzvycyqgx5z2wrdgcjmbj0c379f88k6hngvg7h1fq05k"; depends=[Rcpp RcppEigen]; };
+  Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; };
   RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[PBSmapping RANN RgoogleMaps sp]; };
-  Rarity = derive2 { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; };
+  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]; };
+  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]; };
-  Rblpapi = derive2 { name="Rblpapi"; version="0.3.3"; sha256="1w5dwza2ly38yz0cpazjibvfv147z86njrwxmdhw9msz2a7lj2gj"; depends=[BH Rcpp]; };
-  Rborist = derive2 { name="Rborist"; version="0.1-0"; sha256="1irb9scl68m7skqdwny9kvnzg7f1r0q1c0whzqyhhj9l4lw16hmr"; depends=[Rcpp RcppArmadillo]; };
+  Rblpapi = derive2 { name="Rblpapi"; version="0.3.5"; sha256="1ykwk3iv4ji8pmcm7kgppqg6sh5gw51n6sv039sfzapw6357i5vq"; depends=[BH Rcpp]; };
+  Rborist = derive2 { name="Rborist"; version="0.1-3"; sha256="034mn30in3y8pmwks3xp8qadgzfjslp01py8jwm4zqsb3icxcvi5"; depends=[Rcpp RcppArmadillo]; };
   Rcapture = derive2 { name="Rcapture"; version="1.4-2"; sha256="1nsxy5vpfv7fj03i6l5pgzjm0cldwqxxycnvqkfkshbryjcyl0ps"; depends=[]; };
   RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; };
-  Rcereal = derive2 { name="Rcereal"; version="1.1.2"; sha256="1cl2b96zk9kc01n7xp60z3855lscczf18yjyp0h3lgf57cr04gf5"; depends=[]; };
+  Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; };
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
-  Rchoice = derive2 { name="Rchoice"; version="0.3"; sha256="1ac2nw03g66z2rgxzv8jqad74cp4c9ry0hvnw77d57ddaxszkrva"; depends=[Formula maxLik msm plm plotrix]; };
+  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.2-3"; sha256="1mbd5m5gc3x9ndx3c8a4ra1zh8c7ppc6bir2f7i6bwcji5jr2jbm"; depends=[abind car RcmdrMisc tcltk2]; };
-  RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-3"; sha256="134yr2n0m61bw8rv1iar2l9dk9a178k2pxba0bsxrd1c9j3s1f0j"; depends=[abind car colorspace e1071 Hmisc MASS readxl sandwich]; };
+  Rcmdr = derive2 { name="Rcmdr"; version="2.3-2"; sha256="07p22b6kbx2md6h911jzgiin2rds76aizn9d7nd6l4lxp8a76c09"; depends=[abind car RcmdrMisc relimp tcltk2]; };
+  RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-5"; sha256="11y53wzxflpyq6p187yihs0xpa9nv2rkqhzl70k0mrchvv625bcr"; depends=[abind car colorspace e1071 Hmisc MASS readxl sandwich]; };
   RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
+  RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.0"; sha256="1gigmvzmndxnplsy9w3znj6x4qayka7flzpgj5nsxaqw8xp1z1ip"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
   RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
   RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; };
-  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.32"; sha256="1zd467z7ydlv9w9gr4qqs3yl4xbmxc8pfw55mqdn6zz11xjbxbpk"; depends=[Rcmdr]; };
-  RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="0.1"; sha256="00yk09c1d1frwpfq12zvhg4gnc3p63r61abnil623jpr6wh4b2x8"; depends=[EcoVirtual Rcmdr]; };
+  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.35"; sha256="1lppf84s9ymdmbyx6p7f2vvkrg7gbap5rf2yf759l0bqjcx954a7"; depends=[Rcmdr]; };
+  RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; };
   RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; };
   RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; };
+  RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; };
   RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.1"; sha256="1ib9lpvz0ns3f44in29cvh746zl101lrv29p1df1zcdfcjnq1qq1"; depends=[GWRM Rcmdr RcmdrMisc]; };
-  RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-43"; sha256="0bn94wcrzvcrzhixh8kyg5gkax762mskhm2wvdfz1sm3n6fc7281"; depends=[HH lattice mgcv Rcmdr]; };
+  RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-46"; sha256="0bl9nq89ga16rxlf411lbm5qsx28f1axxwchr5rp46n0h15d0d3f"; depends=[HH lattice mgcv Rcmdr]; };
   RcmdrPlugin_IPSUR = derive2 { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="1lk7divj5va74prsnchq8yx9fbyym7xcsyqzkf72w448fgvvvwlv"; depends=[Rcmdr]; };
-  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-3"; sha256="1nkpj36mxqlfnxk7q023vbcm202kcjhba5jjccqkpikmggbqx9jz"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
+  RcmdrPlugin_KMggplot2 = derive2 { name="RcmdrPlugin.KMggplot2"; version="0.2-4"; sha256="0lmsd76q31bg2j8jd5p0891wi8cxibpjqx0196177w3y9kgcj3s1"; depends=[ggplot2 ggthemes plyr Rcmdr RColorBrewer scales survival tcltk2]; };
   RcmdrPlugin_MA = derive2 { name="RcmdrPlugin.MA"; version="0.0-2"; sha256="1zivlc0r2mkxpx23ba76njmb2wnnjijysvza4f24dg4l47d0sr2p"; depends=[MAd metafor Rcmdr]; };
-  RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.0"; sha256="13nrgrxx2x76mq0xanhwdcadc82pd6i3q535nxn55jspabir6lqc"; depends=[ordinal Rcmdr]; };
-  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.5"; sha256="1sj2f7mhlny2wn5wp4ig9ivl3nlywscapxdy01vmq0fczv073hfp"; depends=[MASS mixlm pls Rcmdr xtable]; };
-  RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-1"; sha256="1hk8gmv74mngcx2pjgv1zkdh2csixxgd4yqz38bdn1l2zf243czq"; depends=[coda igraph Rcmdr rmeta runjags]; };
+  RcmdrPlugin_MPAStats = derive2 { name="RcmdrPlugin.MPAStats"; version="1.2.1"; sha256="0c3mcr8bmmbpxsqm8zfy07cbyglnq5466nafbglfs5m0z836yz9i"; depends=[ordinal Rcmdr]; };
+  RcmdrPlugin_NMBU = derive2 { name="RcmdrPlugin.NMBU"; version="1.8.7"; sha256="1pfv4ar3i9mkj6d4jv206dpwhbz5an1yd4g758pxsanliy5mi6cb"; depends=[MASS mixlm phia pls Rcmdr xtable]; };
+  RcmdrPlugin_PcaRobust = derive2 { name="RcmdrPlugin.PcaRobust"; version="1.1.4"; sha256="17rq3sv8payazjjn5j37cgd6df5b62d2y8al3grw6hw5nfba7lvn"; depends=[Rcmdr robustbase rrcov tkrplot]; };
+  RcmdrPlugin_RMTCJags = derive2 { name="RcmdrPlugin.RMTCJags"; version="1.0-2"; sha256="04g5a1dpch54k5ckfkrg4vsap1nc3af1i0i559qigv3hy8n7pm80"; depends=[coda igraph Rcmdr rjags rmeta runjags]; };
   RcmdrPlugin_ROC = derive2 { name="RcmdrPlugin.ROC"; version="1.0-18"; sha256="0alwsvwry4k65ps00zvdqky9rh663bbfaw15lhwydbgcpqdkn2n6"; depends=[pROC Rcmdr ResourceSelection ROCR]; };
   RcmdrPlugin_SCDA = derive2 { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[Rcmdr SCMA SCRT SCVA]; };
   RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
   RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; };
-  RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.0-7"; sha256="0d473p0df99x9a3jfwb49gxsrcvslcw9yandramwq82cwy3sdcxw"; depends=[Rcmdr rgl TeachingDemos]; };
-  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="2.0-5"; sha256="1ykfln99qh07v6n0xaawgckrbw4vsnamsyzz0d47sgg8ffdbxifr"; depends=[randtests Rcmdr tseries]; };
+  RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
+  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="3.1-2"; sha256="1zhfa376409hyz375qvjf55my47dps2x8mlqn5a4pdcasmz90brp"; depends=[car randtests Rcmdr tseries]; };
   RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
   RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
   RcmdrPlugin_doex = derive2 { name="RcmdrPlugin.doex"; version="0.2.0"; sha256="0l3c8vwifyl8a7qkfaqxm7cws2cg1g501qa93w5svcgp03yf98mj"; depends=[multcomp Rcmdr]; };
   RcmdrPlugin_epack = derive2 { name="RcmdrPlugin.epack"; version="1.2.5"; sha256="1577qhac4rldifax5x3l39cddan6dhq2dv4iv2n64nadgrl0259w"; depends=[abind forecast MASS Rcmdr TeachingDemos tseries xts]; };
-  RcmdrPlugin_lfstat = derive2 { name="RcmdrPlugin.lfstat"; version="0.7"; sha256="009yj9c5cr34k8qa16q19sp7c5iwv95g9swbm004nr18mfah8x9w"; depends=[lfstat Rcmdr]; };
+  RcmdrPlugin_lfstat = derive2 { name="RcmdrPlugin.lfstat"; version="0.8.1"; sha256="1ak2fvz1sdbdr1y1w7i15gibwdh4a3662kvr23pka4lfpbsyrah8"; depends=[lfstat Rcmdr]; };
   RcmdrPlugin_mosaic = derive2 { name="RcmdrPlugin.mosaic"; version="1.0-7"; sha256="0k6xaz2dfm9ch9lxqsh19jm8d4bbyjj2ffmjjxl57kanb3pvrrwv"; depends=[ENmisc Hmisc Rcmdr vcd]; };
   RcmdrPlugin_orloca = derive2 { name="RcmdrPlugin.orloca"; version="4.1"; sha256="19qj6llr5sfw267dgbn2jvrsisb54qbjhgaiigfzymk6px33wwmg"; depends=[orloca orloca_es Rcmdr]; };
   RcmdrPlugin_plotByGroup = derive2 { name="RcmdrPlugin.plotByGroup"; version="0.1-0"; sha256="10wc7lnihsrldsynq2s0syr1aqmvfnj9rhgwh1nkk7jlrwcgj0z6"; depends=[lattice Rcmdr]; };
@@ -2095,162 +2584,188 @@ in with self; {
   RcmdrPlugin_seeg = derive2 { name="RcmdrPlugin.seeg"; version="1.0"; sha256="105c2rl3mrcv7r3iqa9d2zs6cys7vfpyydylkg2cggfqkghxgr95"; depends=[Rcmdr seeg sgeostat spatstat]; };
   RcmdrPlugin_sos = derive2 { name="RcmdrPlugin.sos"; version="0.3-0"; sha256="1r9jxzmf5ks62b5jbw0pkf388i1lnld6i27xhfzysjqdxcnzdsdz"; depends=[Rcmdr sos tcltk2]; };
   RcmdrPlugin_steepness = derive2 { name="RcmdrPlugin.steepness"; version="0.3-2"; sha256="1na98sl42896y7yklaj07sn88lj6p6ik7gwy9ffaxzicqaa8plgf"; depends=[Rcmdr steepness]; };
-  RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.0-5"; sha256="1gcc9l1x0vmzmq7v09mzybig1js5jsgsq84096yk494w3dnzrr0a"; depends=[date Rcmdr survival]; };
-  RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.5"; sha256="07lzn84na59sibgmyrrn444klxqgqqw0zf88j0ycnn41152hb4yi"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
+  RcmdrPlugin_survival = derive2 { name="RcmdrPlugin.survival"; version="1.1-1"; sha256="0hgf52pk81wii2jfw69csapm4gw7xrp1cm08b9n2d29chgw0gww6"; depends=[date Rcmdr survival]; };
+  RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.8"; sha256="0sgh2nqmlxsa6nzwdcdpad1q1mwwm6nb4xqpx4wj5afyisq2fbwr"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
+  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-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
-  Rcpp = derive2 { name="Rcpp"; version="0.12.3"; sha256="11i3w6q5hwqq9mglyqdrj5fphb3iwrcp178kb4bjm95s2jzv5krr"; depends=[]; };
+  Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
+  Rcpp = derive2 { name="Rcpp"; version="0.12.9"; sha256="0pndpgmfmvkssvn9m3i4nbq2n6hxz3i4i8y2nlycn2gdipr0vggh"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
-  RcppAPT = derive2 { name="RcppAPT"; version="0.0.1"; sha256="0fyya80bd3w22qbsbznj9y21dwlj30a16d8a8kww4x8bpvmyil5z"; depends=[Rcpp]; };
-  RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.7"; sha256="0lhpnlrgdki8ljswi4yr2pfsm5lqx7ckfb09zlsjdw0lkz0vdb49"; depends=[Rcpp]; };
-  RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.6.600.4.0"; sha256="0h83rkv706r36lawi21d7pv030zv81sdqzygjca95d43gvz8ap4l"; depends=[Rcpp]; };
+  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]; };
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
-  RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.0.3"; sha256="0zsif6ijp806h3lrz5i3cfv84sb4mvc58mpb6iwrcfdwxagb3c8q"; depends=[Rcpp]; };
-  RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.4"; sha256="1cawaxghbliy7hgvqz3y69asl43bl9mxf46nwpbxc0vx3cq15fnk"; depends=[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]; };
+  RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.6"; sha256="0j2sj1yzpqmw6krjfyjklw4pmkdqdsnyvlfqbic0w1h8gs1mq6yb"; depends=[Rcpp]; };
   RcppClassic = derive2 { name="RcppClassic"; version="0.9.6"; sha256="1xhjama6f1iy7nagnx1y1pkqffrq8iyplllcar24vxr0zirgi1xi"; depends=[Rcpp]; };
   RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
   RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; };
   RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
-  RcppEigen = derive2 { name="RcppEigen"; version="0.3.2.8.1"; sha256="10fn13fvlip92n8pbv08988ll89c6zjr9d9jj8zw5i9iamwbik6f"; depends=[Matrix Rcpp]; };
-  RcppExamples = derive2 { name="RcppExamples"; version="0.1.7"; sha256="1dyw040cw8zvr2rryf2qw5jmvc3hpn292wk3iiagjgkibqx49af9"; depends=[Rcpp]; };
+  RcppEigen = derive2 { name="RcppEigen"; version="0.3.2.9.0"; sha256="0fy9kr03160f1ywzff3p380s8a59jz7d2d0rggb14g2y0slzpbr5"; 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.0"; sha256="1960sn9c3k1vp791c11srkid2nvvnhwl3hjrcaaljd590bxh4hz8"; depends=[Rcpp]; };
-  RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[BH Rcpp RcppArmadillo]; };
+  RcppGSL = derive2 { name="RcppGSL"; version="0.3.1"; sha256="00jqn1ix0qpv1zn8ciz161pq6gxq5had1afm194k6k7hahph3bip"; 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]; };
+  RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; };
+  RcppNumerical = derive2 { name="RcppNumerical"; version="0.3-1"; sha256="1b88iz0f13w148jrmd3qdkagycs7w3yr82y4zgn123kp17y7vvny"; depends=[Rcpp RcppEigen]; };
   RcppOctave = derive2 { name="RcppOctave"; version="0.18.1"; sha256="1b2mwnsx799a86hdpkqy6l1m048g8hqz57l70siybkxnlaib3z0f"; depends=[digest pkgmaker Rcpp stringr]; };
-  RcppParallel = derive2 { name="RcppParallel"; version="4.3.15"; sha256="03hyawm2zispknz157nn8rvf52kg15jdl0pv8282zjrq8xh8477x"; depends=[]; };
-  RcppProgress = derive2 { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp]; };
-  RcppRedis = derive2 { name="RcppRedis"; version="0.1.6"; sha256="1jslck903qi6i8vsb7a2svh887linak00ylmhabzkbbsjrjchp9h"; depends=[RApiSerialize Rcpp]; };
+  RcppParallel = derive2 { name="RcppParallel"; version="4.3.20"; sha256="1hc325hj214s61694iy4j3ly5zkya25h92hki29n3562qiirpb0g"; depends=[BH]; };
+  RcppProgress = derive2 { name="RcppProgress"; version="0.3"; sha256="0796g11w7iv3ix1wfm3fh09qq7jki4r4cp1mjagq77igri3xrr9x"; depends=[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="0.1"; sha256="04l70d51ww247q0irk6jyhy3csybb8bhrw9cidinb0b18dcqmbyq"; depends=[BH checkmate Rcpp]; };
-  RcppStreams = derive2 { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[BH Rcpp]; };
-  RcppTOML = derive2 { name="RcppTOML"; version="0.0.5"; sha256="0c4595ps1wawdx5f1ipsa4rg307rp4f0fivpl4qa1qhps6hn9h0f"; depends=[Rcpp]; };
+  RcppShark = derive2 { name="RcppShark"; version="3.1.0"; sha256="0fyf7ffv5hhxnandrrx9xg72zwrw8cp73bwmb48iy5514gdwg77a"; 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]; };
   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.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
-  Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[formatR roxygen2]; };
+  Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; };
+  Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.6.1"; sha256="1rvqb3lsn5br9cmj63c9ql4dkp0igdrag65sxgajpsyqkpyg17qn"; 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-18"; sha256="0s387gadr1bz5f5ix69z0r9hzcp5w4axbrn1iq9932kkincmg8qj"; depends=[bibtex gbRd]; };
-  Rdsdp = derive2 { name="Rdsdp"; version="1.0.4"; sha256="1cgfm2yyqak9hgyzb8k7c9rspbplcckwxnkq2wqapfgx2majxrip"; depends=[]; };
+  Rdpack = derive2 { name="Rdpack"; version="0.4-20"; sha256="1b1vikh8py4lvf6w90919y8f5aq9xyhv2pprfyzfx0671k99cz6z"; depends=[bibtex gbRd]; };
+  Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; };
   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]; };
   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]; };
   Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; };
-  RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-8"; sha256="0wjjrgmz7m11hhsw7dcg3745255xckdgrqp3xlqkyh2kzbyr9rp4"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; };
+  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=[]; };
   RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.2"; sha256="1113dm41rhyimn7jc3pkrdqz3biqg5m174vz24jchhmn9n38zsss"; depends=[igraph RJSONIO]; };
+  Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; };
   RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.0"; sha256="1mli7h3d4vw0sds6pav74fzpw4c3lmy7jrlp0dw47cmfxg2rhslg"; depends=[isva quadprog]; };
-  RefManageR = derive2 { name="RefManageR"; version="0.10.6"; sha256="0wghxrd3ijvbzr945nbqba2cpn4vrzpny4yqlhala7fbdrd0kbbf"; depends=[bibtex lubridate plyr RCurl RJSONIO stringr XML]; };
+  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.1"; sha256="1zx885x49ncp2cl1v8hxzc3r2njka9cjsadjykbvqp9pdbm4ga5l"; depends=[]; };
+  RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; };
   RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
-  Relatedness = derive2 { name="Relatedness"; version="1.3"; sha256="0ydfv8blqy7rfczh22cs704qsl3kzwfmw4pmbhci0m212y2dgm0y"; depends=[]; };
+  Relatedness = derive2 { name="Relatedness"; version="1.4"; sha256="0ahd053sbqwjq93l8m2gq7fqqc9vvgnndz4j8pmgswwcah8h77c8"; depends=[]; };
   Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
   ReliabilityTheory = derive2 { name="ReliabilityTheory"; version="0.1.5"; sha256="14k979b9baqnz1gbhbjnp76nvdg5z1sc6p29h3v9qgvwv4aanp4v"; depends=[actuar combinat FRACTION HI igraph mcmc PhaseType sfsmisc]; };
-  Renext = derive2 { name="Renext"; version="3.0-0"; sha256="0byjr9jf2wmcg9adcxfky544icj6fclyscjj2l93ynwpcs9lmjan"; depends=[evd numDeriv]; };
-  RenextGUI = derive2 { name="RenextGUI"; version="1.3-0"; sha256="0ydq57k5va1l10dxyh4hvk3r6d0wncqx9ncj5bkc5691lamqjmj4"; depends=[gWidgets gWidgetstcltk Renext]; };
+  Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; };
+  RenextGUI = derive2 { name="RenextGUI"; version="1.4-0"; sha256="0jfg4a85j06wxk8vq2q6j8md2kcss0s7k71218gfh9vybk7hl4h6"; depends=[gWidgets gWidgetstcltk R2HTML Renext]; };
   Reol = derive2 { name="Reol"; version="1.55"; sha256="0147x3fvafc47zd2chgv3b40k480pcjpji8vm1d741i1p6ml448p"; depends=[ape RCurl XML]; };
   ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; };
-  RepeatABEL = derive2 { name="RepeatABEL"; version="1.0"; sha256="0qd6ijqfm32h87hncndv2n47rmn16gnbnkr0dg89h96xc3miyn2p"; depends=[GenABEL hglm]; };
+  RepeatABEL = derive2 { name="RepeatABEL"; version="1.1"; sha256="00bq9ls4d0kczdv752xasqbavb11bjfvpriggfc8dw3g3i7pizpg"; depends=[GenABEL hglm]; };
   RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
-  ReporteRs = derive2 { name="ReporteRs"; version="0.8.6"; sha256="0j3945xgzvc9by623kfb1ds9xxsgax8yvvc78wv57lhlkzsb729l"; depends=[gdtools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
+  ReporteRs = derive2 { name="ReporteRs"; version="0.8.8"; sha256="1pw3hy3g0nc6amga59sb1nnwqc9asdpn6lh2zfh87y8nazrf1hf0"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
   ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
-  ResourceSelection = derive2 { name="ResourceSelection"; version="0.2-6"; sha256="0ysssac4f5xdpr3wk1d36dpqbzxabw49flm2yiifpfwzqgwz4r5c"; depends=[MASS pbapply]; };
-  RevEcoR = derive2 { name="RevEcoR"; version="0.99.2"; sha256="100sman51vvwg5xkypmksyyjqdb6g858z29vn7x4kvly8ncw4hfd"; depends=[gtools igraph magrittr Matrix plyr stringr XML]; };
-  Rfacebook = derive2 { name="Rfacebook"; version="0.6.3"; sha256="1whhrg2w7g1j6p5rhk3zqvigbjdwy3p7c094lmj1c42p4607nc52"; depends=[httpuv httr rjson]; };
-  Rfit = derive2 { name="Rfit"; version="0.22.0"; sha256="1qnfm2p8xqz45ma53fl9ddagj5spfl8i9sxvn3rq19dgkwbdhqw2"; depends=[quantreg]; };
+  ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-1"; sha256="1x7kc0zh22pqi7dw4iav9dac8wpj491lpqbnaqfncyhswpdkimvi"; depends=[MASS Matrix pbapply]; };
+  RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
+  Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
+  Rfacebook = derive2 { name="Rfacebook"; version="0.6.11"; sha256="1si21in7ykv4532xsz12v9nwzfj142bnbf14qc74fbp1p087k6c0"; depends=[httpuv httr rjson]; };
+  Rfast = derive2 { name="Rfast"; version="1.7.4"; sha256="1yrg3iflppbpjmw8rah4jdgwksnqplc0l3ds492s9zrw51vxz38c"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  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]; };
   Rgbp = derive2 { name="Rgbp"; version="1.1.1"; sha256="14xban9d182fhss9ppr13scih7hrbjd9s231avi4gkg79cz87s0s"; depends=[mnormt sn]; };
-  Rglpk = derive2 { name="Rglpk"; version="0.6-1"; sha256="011l60571zs6h8wmv4r834dg24knyjxhnmxc7yrld3y2qrhcl714"; depends=[slam]; };
+  Rglpk = derive2 { name="Rglpk"; version="0.6-2"; sha256="1dzcc9dwdvrs1g9mgk5z9qdxn3iq04s91ak881z3wrqvxhp42cgr"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
-  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.2.0.7"; sha256="04k7h8hgxvgsccdiysbblplwjvn8m7g8h3anzdlxmmjaamd8l9lw"; depends=[png RJSONIO]; };
+  RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.1"; sha256="0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq"; depends=[png]; };
   Rhpc = derive2 { name="Rhpc"; version="0.15-244"; sha256="1y83sshzsmsnm1m341x0ymmyz87dc5cjkbnr0v975p292rjqz3pd"; depends=[]; };
   RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.15-148"; sha256="1carylfz9gafradbdyg7fz2bypr7n72fbm8vhyiinmp0k4s5ipvc"; depends=[]; };
   RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
   Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
   Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; };
-  Ritc = derive2 { name="Ritc"; version="1.0.1"; sha256="1h41s4jihzj0yj8xyan0zhhyyiq8m5567vw4gvmmr81p1qfzvva8"; depends=[minpack_lm]; };
+  RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.1"; sha256="1kn0vb4nhm3bxlmk5y2nl5m7a7hdvz3nz0yp8rdigpl6b2dp79w1"; depends=[MASS nloptr quadprog]; };
+  Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; };
   Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
   Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
-  Rknots = derive2 { name="Rknots"; version="1.3.1"; sha256="0yv8k85jzviz3gafbwggn1y4vlcjnfdiyf93gi6yvygdnsnrq310"; depends=[bio3d rgl rSymPy]; };
+  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.129"; sha256="188h3j9hlx6ls0rs0f5n05l8d8l556dp49b93c77nw6bp7n4745l"; depends=[RCurl rjson]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.1.133"; sha256="1lvik88zfxlipr24qdj04faknfjsaiv6q75zllgz3v6rjbxvh4jz"; depends=[fasttime Rcpp RCurl rjson]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.3.7"; sha256="0k2snw8a6h4dvbpl97fklvvbbqma4g9r0ksvh5ndyk4vqwyxy1na"; depends=[Rcpp]; };
-  Rlinkedin = derive2 { name="Rlinkedin"; version="0.1"; sha256="0w30zv4a842vckk4yqsh8hhkdz2gy650a0x29aacp77p9y79g9yn"; depends=[httpuv httr XML]; };
+  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]; };
-  Rmalschains = derive2 { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4kk1cvbzrgzjdvw6kbdb7dmqglh6ws2nmr5b6a7fx"; depends=[Rcpp]; };
+  Rmalschains = derive2 { name="Rmalschains"; version="0.2-3"; sha256="1gh0f385s1nq12mk6a5l3nj1gd2mc6jzd66lisnxbcip25s4b8pb"; depends=[Rcpp]; };
+  RmarineHeatWaves = derive2 { name="RmarineHeatWaves"; version="0.15.1"; sha256="1r8hyvm680fcw0qq1k5i3wachy6xnl86vvaf3vz5hrq789x4xkh5"; depends=[dplyr ggplot2 lazyeval lubridate magrittr plyr raster tidyr zoo]; };
   Rmisc = derive2 { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
-  Rmixmod = derive2 { name="Rmixmod"; version="2.0.3"; sha256="0pxblg2si289599807hgcncq9jypabbrfpmv7fyg9hh7d8y19hd7"; depends=[Rcpp]; };
+  Rmixmod = derive2 { name="Rmixmod"; version="2.1.1"; sha256="1m5yab7wq343bzg8xszbrlif3cd4d1x7xcqh82czkxbfni1gz7j7"; depends=[Rcpp]; };
   RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
-  Rmonkey = derive2 { name="Rmonkey"; version="0.3.1"; sha256="14x076qhcbil7v1bh5x3zivqg04svcb7fvap47kcp3g95dk9jvxa"; depends=[curl httr jsonlite plyr]; };
   Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; };
-  Rmpfr = derive2 { name="Rmpfr"; version="0.6-0"; sha256="06i5jzsddvync284ql16vlk439jp7la6n6yfgyxpck818hidz8a3"; depends=[gmp]; };
-  Rmpi = derive2 { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; };
+  Rmpfr = derive2 { name="Rmpfr"; version="0.6-1"; sha256="073f01wga1ccxxgspsprjqdmb84iiap13mqhl7b6qcz9al89jl5z"; depends=[gmp]; };
+  Rmpi = derive2 { name="Rmpi"; version="0.6-6"; sha256="184skad8m4y4pzk8v98b7k7prqxm9mg1b2pfxbknyvzakq6aizv1"; depends=[]; };
   RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
-  RobAStBase = derive2 { name="RobAStBase"; version="0.9"; sha256="1428xaplcjq6r0migbaqncfj0iz8hzzfabmabm167p44wa2bwbwh"; depends=[distr distrEx distrMod RandVar rrcov]; };
-  RobLox = derive2 { name="RobLox"; version="0.9"; sha256="1ws6bkzvg1y1cwmls71das0lih6gncx5w3ncd2siznapd4n44p69"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
+  RndTexExams = derive2 { name="RndTexExams"; version="1.4"; sha256="18zmdfq234k4bjj5rz6zjlkiyndbj5v2irjfl3w66vz38lk8sf6v"; depends=[CopyDetect data_table stringi stringr]; };
+  RobAStBase = derive2 { name="RobAStBase"; version="1.0"; sha256="0s8hgvgqm6hf1nbhq1kj239f7zpchvzhds8281nfzlm5qzphylqj"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; };
+  RobAStRDA = derive2 { name="RobAStRDA"; version="1.0.2"; sha256="1lyp2y38jnwv8ggrv9pdzprpf2gs62w1mpzwcqcbrmy7fzjsym0b"; depends=[]; };
+  RobLox = derive2 { name="RobLox"; version="1.0"; sha256="0y193xai0mfwpm6zhxgy21h4yrlqrpvwx84bj4xnr8ql87wznh7q"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; };
   RobLoxBioC = derive2 { name="RobLoxBioC"; version="0.9"; sha256="0ia7vn8x8whyp8kl7mpwd6fd0yv0y3pb1mppnh2329x7xdvcs5j4"; depends=[affy beadarray Biobase BiocGenerics distr lattice RColorBrewer RobLox]; };
-  RobPer = derive2 { name="RobPer"; version="1.2.1"; sha256="1impcp2yfxxh439a70s2gqwfng6cgi123y20fd01b84jkp9gx3hi"; depends=[BB quantreg rgenoud robustbase]; };
+  RobPer = derive2 { name="RobPer"; version="1.2.2"; sha256="0631qfpz61606r50vzn7b3h7arfwxcs8j13q1hg779qx60kwrliy"; depends=[BB quantreg rgenoud robustbase]; };
   RobRSVD = derive2 { name="RobRSVD"; version="1.0"; sha256="07z5fw8j5lq7nyxgkvb9i4iwb5inddz2ib4m2bjx6q4c1ricpqz9"; depends=[]; };
   RobRex = derive2 { name="RobRex"; version="0.9"; sha256="0ii539mjq462n1lbnyv3whl8b1agvhvlz31wwyz911gb40isl639"; depends=[ROptRegTS]; };
   RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; };
   RobustEM = derive2 { name="RobustEM"; version="1.0"; sha256="1li9r3bk7zhpxljgqvr2zila8nb05nasvlzqlswwgi9443i740zi"; depends=[doParallel e1071 ellipse foreach ggplot2 mvtnorm]; };
+  RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.3"; sha256="1kzi5mvz78gxwrg1z822pkqzmqwvw73x2gh2yfsaxcwy2d7nr2mx"; depends=[Rcpp RcppEigen]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
+  Rodam = derive2 { name="Rodam"; version="0.1.2"; sha256="0fxsjzillr2v3sxbph13q3wrly6dx6m8rm276qzfvx1md044z14y"; depends=[RCurl]; };
   Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
   RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; };
-  Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA]; };
+  Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; };
   RoughSetKnowledgeReduction = derive2 { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; };
   RoughSets = derive2 { name="RoughSets"; version="1.3-0"; sha256="08yz19ngipqpzfam6ivwsfnbg8ps2wwyi6djprmd7kfj0n43ab62"; depends=[Rcpp]; };
   Rpdb = derive2 { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
+  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.1"; sha256="1407p6j6w41wg7apmjzl5xgjch97glqwn9pw0w95xz14ldnn8dk8"; depends=[ape doBy geiger Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
-  Rpoppler = derive2 { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; };
-  Rquake = derive2 { name="Rquake"; version="2.3-1"; sha256="0xb8j76jjv6k3r8nzjxdddic4rq1yj7qsh85asl38qwj7483cyc4"; depends=[cda GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
+  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=[]; };
+  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]; };
+  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]; };
   Rsolnp = derive2 { name="Rsolnp"; version="1.16"; sha256="0w7nkj6igr0gi7r7jg950lsx7dj6aipgxi6vbjsf5f5yc9h7fhii"; depends=[truncnorm]; };
-  Rsomoclu = derive2 { name="Rsomoclu"; version="1.6"; sha256="105isq1c1spwska886phi7dzp6qzifzvvy1r8gqlbv9v6lbgxshf"; depends=[class kohonen Rcpp]; };
-  Rssa = derive2 { name="Rssa"; version="0.13-1"; sha256="1v2gvk7pnzf2s2z0y7shjf0mz558lb6ian7vljkjcag06pyygmvi"; depends=[forecast lattice svd]; };
+  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="1.0"; sha256="0s7f86cf2b3mwzwpfpl8cd1g41c8g5hzkykj9qigy1grnf37crvf"; depends=[]; };
-  Rsymphony = derive2 { name="Rsymphony"; version="0.1-21"; sha256="0wjj1wlh45fhgbzfqh0rdxrahc68w1gkvzx6kx46m6ww7k6l3pqb"; depends=[]; };
-  Rtsne = derive2 { name="Rtsne"; version="0.10"; sha256="14270gg0fp3imq9rafqj56ld56kzby7yyf5rg9z0wlimm7s72hy5"; depends=[Rcpp]; };
-  Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; 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]; };
+  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.1"; sha256="1a27kmasrdy06m0gh11pggx46f049f268hn0s651zb1hr8n3h5mi"; depends=[dplyr DT ggplot2 rmarkdown shiny shinydashboard]; };
+  RtutoR = derive2 { name="RtutoR"; version="0.3"; sha256="0knqwk44di24x8w2pf794hk2raq7gcpl6cd6s9m0sr73rxh9sf11"; depends=[dplyr DT ggplot2 ggthemes plotly rmarkdown shiny shinyBS shinydashboard shinyjs]; };
   Rtwalk = derive2 { name="Rtwalk"; version="1.8.0"; sha256="0zxf66lsfq8by40flv34xzd5yy0wa1ah9li1d0h7f0yh9nbwhxl5"; depends=[]; };
   Ruchardet = derive2 { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
   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.13.1.2"; sha256="1xlf26qzp8x6shcvxa5ka5c0hgbmv2ma1raj2a25ginmq28ld4ms"; depends=[Rcpp RcppEigen]; };
+  Rvcg = derive2 { name="Rvcg"; version="0.15"; sha256="0h0gl6s7xa96g91d0df08ssgr1hnxgc1pqrlirvjdknr7jpkq04k"; 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=[]; };
   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-1"; sha256="00s9pb1gx61prbymxdq470s3lv2vd9xdpbp51b0gq3g9kpl7g21i"; depends=[]; };
+  RxODE = derive2 { name="RxODE"; version="0.5-5"; sha256="1rh25vjy8pnaavz9df6bcmk9b8d72hxm73n1hg3ha724cyxypzpa"; depends=[]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[data_table fingerprint rcdk rJava]; };
-  Ryacas = derive2 { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; };
+  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]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
-  SACCR = derive2 { name="SACCR"; version="1.5"; sha256="101rki50m7kb0h17nrhm5pwjcm1c6ldynili69my1hqkymzwd51x"; depends=[]; };
+  SACCR = derive2 { name="SACCR"; version="2.1"; sha256="184mw9q25b06zar4ii3na7c4x28ly922d5csfqkw9b07mdp81k3h"; depends=[data_tree jsonlite Trading]; };
   SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; };
+  SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; };
   SAENET = derive2 { name="SAENET"; version="1.1"; sha256="13mfmmjqbkdr6j48smdlqvb83dkb34kx3i16gx0gmmafk3avdaxx"; depends=[autoencoder neuralnet]; };
   SAFD = derive2 { name="SAFD"; version="1.0-1"; sha256="1h9hw66irq2c1ciz502r5h8h9hx32jwhrp9dwl91qlknlj6s1bxr"; depends=[]; };
   SAGA = derive2 { name="SAGA"; version="2.0.0"; sha256="022q8hagc38mfakh02cyvf49as2rps1my9iy2xcg8qhrr2czzmy8"; depends=[plotrix viridis]; };
   SALES = derive2 { name="SALES"; version="1.0.0"; sha256="1kjmlwa4v2i7hzm947xby9jr0irsf4c851f7jyqyhqna9c65rx0g"; depends=[Matrix]; };
   SALTSampler = derive2 { name="SALTSampler"; version="0.1"; sha256="1ys88fgsx92b50x5y8xb0gp03spj0d29nqgw91yl95qwkg0d6bsg"; depends=[lattice]; };
   SAM = derive2 { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
+  SAMM = derive2 { name="SAMM"; version="0.0.1"; sha256="1yyqci1c0xk5pqi09v3b7p5y0dwbrg1wlsyscfnw6qxwr707y23j"; depends=[Rcpp RcppArmadillo]; };
   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.4"; sha256="0a86vz390v2g5lz1r33qrmhgvak4rpfmpxy39shnivhagnrsarkl"; depends=[]; };
+  SAPP = derive2 { name="SAPP"; version="1.0.7"; sha256="0rms9kq87dypdfs248m4393lgpfx37qah0n1s109pfnjh3k64pm3"; depends=[]; };
+  SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.6"; sha256="0mm3dls9w9q060pylrkl3zwzix9zprpljajfm6z8k5bbhha1qsbc"; 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=[]; };
@@ -2258,45 +2773,51 @@ in with self; {
   SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; };
   SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; };
   SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; };
-  SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.1"; sha256="0pcyrnzlnlyn4v3lyv7pv01v2lh4vig1x4x8g98lpccpi1bimd4z"; depends=[boot KernSmooth]; };
+  SCBmeanfd = derive2 { name="SCBmeanfd"; version="1.2.2"; sha256="045498q71zqgcg8p3665vwd99a8ybf21y0sa7y8316zw66wb1caz"; depends=[boot KernSmooth]; };
   SCEPtER = derive2 { name="SCEPtER"; version="0.2-1"; sha256="19sphwcsj2z05dvpmz7vgxykzyghkfn79jwqvk6d66daman679mv"; depends=[MASS]; };
   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-1"; sha256="1m5a15a4n0zjqykq38pyw9133g2ih4ykbgak8c8khq8p0isnl8qb"; depends=[fitdistrplus lmomco]; };
+  SCI = derive2 { name="SCI"; version="1.0-2"; sha256="1jvzkdv15ifgf6a3zjfzzcgw2y2vg0wp7yhiamiaqp8xkm142w49"; depends=[fitdistrplus lmomco]; };
   SCMA = derive2 { name="SCMA"; version="1.1.1"; sha256="1jbx4fkixm31zdlfx65xxdzpf77dzpqazy1l6qyjz7q672s2vidd"; 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=[]; };
   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]; };
+  SDEFSR = derive2 { name="SDEFSR"; version="0.7.1.0"; sha256="1pknkda7iaq5247557b93kc3cf2ih7b3wpqpkqyfgfay3ci9kg16"; depends=[]; };
+  SDMPlay = derive2 { name="SDMPlay"; version="1.0"; sha256="0pmqn487lvaxbcbx5nz86xpxsbbbiin20havhw6h9j43ly4qic7q"; depends=[dismo gbm ncdf4 raster rgdal SDMTools sp]; };
   SDMTools = derive2 { name="SDMTools"; version="1.1-221"; sha256="1kacrpamshv7wz83yn45sfbw4m9c44xrrngzcklnwx8gcxx2knm6"; depends=[R_utils]; };
-  SDR = derive2 { name="SDR"; version="0.7.0.0"; sha256="181ify2yypcfqi1ayk1r0xq4xw4r74r6l2b11k0al9wwxa7gy3c5"; depends=[]; };
   SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; };
+  SDraw = derive2 { name="SDraw"; version="2.1.3"; sha256="179h5byh92dkycchalf875pwq1h4ryg3hba9fs7fbq4dshki5i7p"; depends=[deldir rgeos sp spsurvey]; };
   SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; };
   SECP = derive2 { name="SECP"; version="0.1-4"; sha256="0a4j0ggrbs0jzcph70hc4f5alln4kdn2mrkp3jbh321a6494kwl1"; depends=[SPSL]; };
   SEER2R = derive2 { name="SEER2R"; version="1.0"; sha256="0lk0kkp8sv3nl19zwqd7449mmjxsj3pqpzdmqf70qf8xh2pqyvzd"; depends=[]; };
-  SEERaBomb = derive2 { name="SEERaBomb"; version="2015.2"; sha256="1pm49icslhwd6j4xn6y9m7y7prjyn64bfvl5c12r2jkvq05sd6v8"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales XLConnect]; };
-  SEHmodel = derive2 { name="SEHmodel"; version="0.0.11"; sha256="06678bxy4kprzzr2q7pyc3dscar1554bb7fgcgamlkisdzc32q74"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
+  SEERaBomb = derive2 { name="SEERaBomb"; version="2016.2"; sha256="0fbgw1xyadqdl8bpf0hydrxjh43z4b0hjdk304fg6igg2v186fp5"; depends=[DBI dplyr ggplot2 LaF mgcv plyr Rcpp reshape2 rgl RSQLite scales XLConnect]; };
   SEL = derive2 { name="SEL"; version="1.0-2"; sha256="1nrk0fx6ff330abq8askvp0790xnfv00m3sraqcr32hciw6ks421"; depends=[lattice quadprog]; };
   SEMID = derive2 { name="SEMID"; version="0.2"; sha256="1897yjshcbidnrhr575sicsmhzyhjbagv0dp9g3nsv78syb6dr2p"; depends=[igraph]; };
   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.3"; sha256="1c917g03s50mp96lqhkjagsd2cq9rjbprlwf3h409dj59g6k2zx6"; depends=[spatstat]; };
+  SGCS = derive2 { name="SGCS"; version="2.5"; sha256="1245xqv8im457zdgcny66jnzv8kyfi8ddic9zdk94sr6jkwx6x17"; depends=[spatstat]; };
   SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
-  SGP = derive2 { name="SGP"; version="1.5-0.0"; sha256="0c5i28n6q41kksfskcd34199bk1abmwpy3md993aqbgf5bw54b4d"; depends=[Cairo colorspace data_table doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; };
-  SGPdata = derive2 { name="SGPdata"; version="13.0-0.0"; sha256="11dm2nw7wzd2fbfyjb6a2byyiq1wfnfmlsxys7li6yf3j95d9jw6"; depends=[]; };
-  SHELF = derive2 { name="SHELF"; version="1.1.0"; sha256="07r2r75rnlxkp0qxqzp4qcfddnjn2akyzr0v8vblcqrhcyd90y5l"; depends=[ggplot2 shiny]; };
+  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]; };
+  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=[]; };
-  SIBER = derive2 { name="SIBER"; version="2.0.2"; sha256="1jnrchwpvqk23vacn8dsh8mjqa5fdmvff1vqjc20xy42mdmkhr68"; depends=[hdrcde mnormt rjags]; };
+  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]; };
   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=[]; };
   SIMMS = derive2 { name="SIMMS"; version="1.0.2"; sha256="1phvphk7ir9zw77ycm27y4fin6wyxppsmb1cnm4xc83v1yq7lql4"; depends=[glmnet MASS survival xtable]; };
   SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
-  SIS = derive2 { name="SIS"; version="0.7-6"; sha256="0514fycicd1n3r86qw4blqv9bj23ak9s131yg5mfbk9q2fv3mx8k"; depends=[glmnet ncvreg survival]; };
-  SKAT = derive2 { name="SKAT"; version="1.1.2"; sha256="1q79szh5xf55ibx401gdga3il81h3hf6pi68mah8i8rqpxph2v8z"; depends=[]; };
+  SIS = derive2 { name="SIS"; version="0.8-3"; sha256="03hb5bldbpdm84viwx75vhh7zvh8nrn5nv155pb75v76rcsqx79m"; depends=[glmnet ncvreg survival]; };
+  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=[]; };
   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=[]; };
@@ -2305,11 +2826,13 @@ in with self; {
   SMFI5 = derive2 { name="SMFI5"; version="1.0"; sha256="10qp33l0dig00y9gfhpzqig6dbkjw76ch9pfq64dn4xrdkpq1kx5"; depends=[corpcor ggplot2 reshape]; };
   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=[]; };
   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=[]; };
   SMVar = derive2 { name="SMVar"; version="1.3.3"; sha256="17wr4lixy3p32gr4jq02d7zsr88yrbddjsvynzdsdrwbxf4mwqhp"; depends=[]; };
   SNFtool = derive2 { name="SNFtool"; version="2.2"; sha256="1d84ybsi91mr3ma4jzmr9606hg1q00yg0dn50vkjnyda50igcb1c"; depends=[heatmap_plus]; };
+  SNPMClust = derive2 { name="SNPMClust"; version="1.3"; sha256="1gad1jfla4qpczh8vpwyss5cckzgpffsyj0d71r8drbspr4i3r90"; depends=[MASS mclust]; };
   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]; };
@@ -2318,51 +2841,63 @@ in with self; {
   SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; };
   SOD = derive2 { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp]; };
   SODC = derive2 { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; };
+  SOFIA = derive2 { name="SOFIA"; version="1.0"; sha256="1jlaggxa2nz2r5yb2xmf0dh5wmxfdk6xwn0l3nwsqh82vyxhp7l9"; depends=[png]; };
+  SOIL = derive2 { name="SOIL"; version="1.0"; sha256="1bx399530cfh7k6p8jw4irar3q1zazvpiqcb0k4q02s2ygx3z5p6"; depends=[brglm glmnet MASS ncvreg]; };
   SOLOMON = derive2 { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; };
-  SOMbrero = derive2 { name="SOMbrero"; version="1.1"; sha256="0zl46da2qh290wfk6xgxn67r6da978gi9mlkq83pnzi5ch5dsp0z"; depends=[igraph knitr RColorBrewer scatterplot3d shiny wordcloud]; };
+  SOMbrero = derive2 { name="SOMbrero"; version="1.2"; sha256="1pvgxy22rha4nw0kcp8635hw5gl8l6j2c1ylbf5mvqb4c4pzpg09"; depends=[igraph knitr RColorBrewer scatterplot3d shiny wordcloud]; };
   SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; };
-  SOR = derive2 { name="SOR"; version="0.22"; sha256="1njwlsvdnwxidvwrx18h6h4dhrsdgy0fikkhn20pip42qqwd96gz"; depends=[Matrix]; };
+  SOR = derive2 { name="SOR"; version="0.23.0"; sha256="0djmz57g23xpzv6p8i71f3zrsc6xdgqkbcvn5cbx9m78n31ipkm5"; depends=[Matrix]; };
   SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
   SPA3G = derive2 { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
   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=[]; };
   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=[]; };
   SPEI = derive2 { name="SPEI"; version="1.6"; sha256="0mbz4nydnzwypfbi1d9fjy09x6133q096qbfrc913dbidzkvfpqv"; depends=[lmomco]; };
-  SPIAssay = derive2 { name="SPIAssay"; version="1.0.0"; sha256="1rwa2iicwdm7z8khlnly0ybrqiisw420anr2pcdd5chxa48h8apg"; depends=[]; };
+  SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; };
+  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.0.5543"; sha256="0y8rj0wxy8sdk7si9k11i4pb96vp1q78h48ihs4r7d383zykk827"; depends=[AlgDesign emoa MASS mco randomForest rgl rpart rsm twiddler]; };
+  SPOT = derive2 { name="SPOT"; version="1.1.0"; sha256="1f1nafp7v8k50s5x8m5bg6r9sb5ihr08f1x4643jqhxf7fcz2x10"; depends=[AlgDesign emoa MASS mco randomForest rpart rsm]; };
+  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=[]; };
   SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
   SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; };
+  SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
-  SQUAREM = derive2 { name="SQUAREM"; version="2014.8-1"; sha256="17fn37da4zslbfq5h4f3dfwyw1dxj5y2rgly3vjl2c4k5bnwxxqw"; depends=[]; };
+  SQUAREM = derive2 { name="SQUAREM"; version="2016.8-2"; sha256="1iywv8sj5v0qr5vc0zcs8yqwqrivp0jd45j1g4zkq332c68vvl0k"; depends=[]; };
   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.12"; sha256="19rgr69ygbiq1lv3jnm282xn6914gh0rk99vxbgsx8zkc0n6cksy"; depends=[MASS psych TSA TTR]; };
-  SSN = derive2 { name="SSN"; version="1.1.7"; sha256="04gc06ic7np50qfyymvn8v1kiiyqpvm2yjxm6zfwbilm90k7ag0c"; depends=[BH igraph lattice maptools MASS RSQLite sp]; };
+  SSDforR = derive2 { name="SSDforR"; version="1.4.14"; sha256="13xj3nq4rfi5yih7h5gp01mpjyj6090sy9835p41k89pfdd6g71p"; 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]; };
+  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]; };
   SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
   STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; };
   STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
-  STEPCAM = derive2 { name="STEPCAM"; version="1.1.1"; sha256="009hd59hwvkrqq5g4psw3aw7qbdrqdxglkg7iyxhb6mz3lxbzym3"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
+  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]; };
-  STPGA = derive2 { name="STPGA"; version="1.0"; sha256="1kqxzjrxf194n006dr3h5kprb4l7qy8bgm2n6251p0sswpvr70j1"; depends=[]; };
+  STPGA = derive2 { name="STPGA"; version="3.0"; sha256="093van0k48x7i7r6g2kzn59x58rpqizkkw99l67agndnij13kck9"; depends=[]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
-  SWMPr = derive2 { name="SWMPr"; version="2.1.4"; sha256="0i0cy29rk1n4kdrrb7pdj4l8rlxnsabl9iv1pxb06a0fkwpwwk22"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr maptools oce RColorBrewer reshape2 tictoc tidyr wq XML zoo]; };
+  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]; };
-  SafeQuant = derive2 { name="SafeQuant"; version="2.2.2"; sha256="1wlvrmn4v81zzk1apdyd8dmfrxrpciqp60m614sbkaymg268d4p4"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; };
+  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=[]; };
   SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; };
   SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; };
@@ -2371,160 +2906,203 @@ in with self; {
   Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; };
   SchemaOnRead = derive2 { name="SchemaOnRead"; version="1.0.2"; sha256="0xa53mqmv31gid6n82bnfmds6p8nkjlmkj15hyycxhja2j752knm"; depends=[caTools foreign haven ncdf4 network readbitmap readODS readxl tiff xml2]; };
   SciViews = derive2 { name="SciViews"; version="0.9-5"; sha256="199waafpn0ndg7szwfhw2jlgcx1f0pv7j0vix2vzz60knwm698xb"; depends=[ellipse MASS]; };
-  SciencesPo = derive2 { name="SciencesPo"; version="1.3.9"; sha256="1w3skni7q3nab1w09fms9gl3cwkr1dzw62iw2xxq21fm2ipawpc6"; depends=[data_table dplyr ggplot2 gridExtra lazyeval magrittr RSQLite shiny stringr vcd]; };
+  SciencesPo = derive2 { name="SciencesPo"; version="1.4.1"; sha256="1y9ymm5h6mmcx1ncl7yq2nn681gm0hd25fgxxwill9bzpy34pdnr"; depends=[data_table ggplot2 htmltools lubridate pander Rcpp rstudioapi shiny stringr xtable]; };
   ScoreGGUM = derive2 { name="ScoreGGUM"; version="1.0"; sha256="0f7sjfr3a8b8y1n9lrwyiyyljls3rbz84d9s93psi2fnmjj0kvgw"; depends=[]; };
   ScottKnott = derive2 { name="ScottKnott"; version="1.2-5"; sha256="1ywwhdghcy30mp2nhsk2yhgb37nrdmb9yan5vvzsg66bchc3xgll"; depends=[]; };
+  ScottKnottESD = derive2 { name="ScottKnottESD"; version="1.1"; sha256="135g575hbxlv4arw7l5miwc094z92ykx49aa3mia1spxj8ldly64"; depends=[effsize reshape2 ScottKnott]; };
   ScrabbleScore = derive2 { name="ScrabbleScore"; version="1.0"; sha256="19vgaxnhvqsbllqxfbnhnar2j4g0fkxi7rfsmkks2bd2py81x04m"; depends=[]; };
   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]; };
   SegCorr = derive2 { name="SegCorr"; version="1.1"; sha256="1hfkwfq4s3xm0wip82v000x5axkzkn4vkv6wima4mrnlvwi2yb9k"; depends=[cghseg]; };
-  Segmentor3IsBack = derive2 { name="Segmentor3IsBack"; version="1.8"; sha256="00m6fvx6s8mz477c8b4dmgdh52jf6jx1lcqzf84l90b1xw93qnv7"; depends=[]; };
+  Segmentor3IsBack = derive2 { name="Segmentor3IsBack"; version="2.0"; sha256="0c7ag9svd1xlm60padg41gvz7qnbcp41kg3cz2dvi9hy2yrqw0qd"; depends=[]; };
   Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
-  SeleMix = derive2 { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[Ecdat mvtnorm xtable]; };
-  SelvarMix = derive2 { name="SelvarMix"; version="1.1"; sha256="0rn6ahqg3yriaf32rn07mdd5aqyqb35xv7v4ydc7q1ym1wmc9zla"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
+  SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; };
+  Select = derive2 { name="Select"; version="1.1"; sha256="16ih65dfk6s8xkn1mqdn2391x40lzlmfsv46g01ngpsym4dry8dq"; depends=[lattice latticeExtra Rsolnp]; };
+  SelvarMix = derive2 { name="SelvarMix"; version="1.2"; sha256="03yhsrfnl32n2dk3gn63vsys5vm5j30zrar1kvhrmckl8qczhqr1"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
+  SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.6"; sha256="0dxr0jjj9fivbpwkknsxd8n2z4amszlkb240p66lj10i8bk5bd8f"; depends=[MASS survival]; };
   SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.3"; sha256="1qfsy88bd07xk3gy2r7cjcs6fhx9889aqn1494d92msxmc6zvcz7"; depends=[MASS numDeriv Rsolnp]; };
   SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
-  SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.7"; sha256="1wk8r8n957l47s4wa6b6xps87p1h5jylif9m1a16d7a5i0bxjj6m"; depends=[ggplot2 magic matrixStats mgcv survey trust VGAM VineCopula]; };
-  SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.3"; sha256="14m3ahhp8xfnm01a0knd7qw2lrd1z3kxfazw8kin8g4dhcvhxwj7"; depends=[copula gamlss_dist magic Matrix mgcv mvtnorm trust VGAM]; };
+  SemiParBIVProbit = derive2 { name="SemiParBIVProbit"; version="3.8-1"; sha256="0a69x24dd4chpag2abf1a0jwr3942d3ydb1i370ky6f4ky5w71q9"; depends=[gamlss_dist ggplot2 magic matrixStats mgcv mnormt Rmpfr survey trust VGAM VineCopula]; };
+  SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.4"; sha256="0b8dfjrjx7c409mid013wbp5s3wz4q5rh4dcgsla2vin2allv0az"; depends=[copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM VineCopula]; };
   SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
-  SensMixed = derive2 { name="SensMixed"; version="2.0-9"; sha256="15ak95pwnwshgjgp8xpv5y87hbhcx38g4ky7wcjx71pzj2kcxdzj"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; };
+  SensMixed = derive2 { name="SensMixed"; version="2.0-10"; sha256="0r2lga40xr782n1viyxc4wn9gzgm7g2ick45pfnkgq6m60wx9rfh"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; };
   SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
   SensoMineR = derive2 { name="SensoMineR"; version="1.20"; sha256="1qw97cixndg2h29bbpssl0rqag3w8im4nm9964lr7r012y5wdqhx"; depends=[cluster FactoMineR KernSmooth]; };
-  SensusR = derive2 { name="SensusR"; version="1.0"; sha256="1b5yrb3iiijr7x0r4ga5dlx6yqqk4bvmh1377655s6c7j36sn1xd"; depends=[jsonlite lubridate plyr rworldmap sp]; };
-  SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.0"; sha256="1ypf3gm29vr9vvjx62z96hpcfsygaia9nmi3s71cv22b8p8mxwlx"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags tcltk2 widgetTools]; };
+  SensusR = derive2 { name="SensusR"; version="2.0.0"; sha256="1897d9lh3srgg99lnjs77j2yrgskbzp68d04i4pkar6slc6xsmli"; depends=[ggmap ggplot2 jsonlite lubridate plyr sp]; };
+  SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; };
+  SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.4"; sha256="0wk40lhx2bjyfl8gcv9g1c3bm7kf3b12pfdb0zk22vcp2flr0mci"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
   SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
-  Sequential = derive2 { name="Sequential"; version="2.0.2"; sha256="1ljrhzr08ynng54szym03gggkw9f6pni54fbkqwgcqja23597f80"; depends=[]; };
-  SetMethods = derive2 { name="SetMethods"; version="1.0"; sha256="0zizvrzyk01w4ncazvifmjm4h5zrpsf6n68n11sc8f5kzny9ia48"; depends=[betareg lattice]; };
-  SetRank = derive2 { name="SetRank"; version="1.0.1"; sha256="0zh5j6ksaggz46d9j37xpajyxlx7r83bv64yn9gdc6z20slrbch7"; depends=[data_table igraph XML]; };
-  ShapeChange = derive2 { name="ShapeChange"; version="1.3"; sha256="0f18z489rmrqyrwlmmv8qra0m65zbbhqkd00zc8sxnmkjn3jlzvw"; depends=[coneproj quadprog]; };
-  ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.2"; sha256="0z2drcpnfq78wdcd4zbg4pi0jbfs8jkqqjcmm53bzy7mlm0xm2qj"; depends=[coneproj raster rgdal]; };
+  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]; };
+  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]; };
+  ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; };
+  ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
   SharpeR = derive2 { name="SharpeR"; version="1.1.0"; sha256="0qhvpwv81jznqfzm7xysm051ckv8ilq7zhsysxc7wripnlj01c4m"; depends=[matrixcalc sadists]; };
-  ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.1.1"; sha256="1vzsl6y57fri8q4455pbmiidfj91986mv67nr4ikck7f1z82mq38"; depends=[]; };
-  Shrinkage = derive2 { name="Shrinkage"; version="1.0"; sha256="1n338zj4a063c8b9wajccp156kwxzirb70j8rppnklkq497plfc5"; depends=[limma multtest PsiHat]; };
+  ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.1.0"; sha256="1njnfmysd16bl46wqynzgw32f84yy0vkf8i1flgy19jkrb7q9zy6"; depends=[corrplot CTT deltaPlotR difNLR difR DT ggplot2 gridExtra latticeExtra ltm mirt moments msm nnet psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap]; };
+  ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
+  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]; };
-  SigTree = derive2 { name="SigTree"; version="1.10.3"; sha256="1la63w8kv9q0ci302s0lxdabx70smxxn669blynkhip9r30zjx8h"; depends=[ape phyext2 phylobase phyloseq RColorBrewer]; };
+  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=[]; };
-  Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="3.2"; sha256="1rx7bpdcf8h1dn647cwx0j7ss3lajizsnxd0cc9dj37v4g14bgyl"; depends=[rgl scatterplot3d]; };
+  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]; };
   SimComp = derive2 { name="SimComp"; version="2.2"; sha256="07gmlbwvv07kq3z7gq2jxlank011c0cqh8zwwp4pzf061d3gjdm6"; depends=[mratios multcomp mvtnorm]; };
-  SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.4.0"; sha256="0hrkwim582cb22ipy5vv1gp9bszjsqyzyzrwqwgy4247brag26fm"; depends=[evd]; };
-  SimDesign = derive2 { name="SimDesign"; version="0.8"; sha256="0sf0ajwhkrq3awa6nig09slj5d0bc18jim7d4vg51i4mygs258mi"; depends=[foreach plyr]; };
+  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]; };
   SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; };
-  SimInf = derive2 { name="SimInf"; version="1.0.0"; sha256="0y7f6905k14y6rjz7lzx2s6q4l7fjl25dykha40vddcddc83spnd"; depends=[Matrix]; };
+  SimInf = derive2 { name="SimInf"; version="3.0.0"; sha256="0pj99jrkx898rnjijvzcw7xxz0hka767a1b2khwlk5kpja7zx5ax"; 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="1.4"; sha256="0lh2ra9k76zaffdn83an0xkff105iwn9ia3l2m6kijr3kl7ils38"; depends=[ontologyIndex ontologyPlot ontologySimilarity plotrix Rcpp]; };
+  SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; };
+  SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; };
   SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; };
   SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; };
   Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; };
   SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
-  SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.1"; sha256="1zxbrpsc96rhgnv5zcl2zgfmk7y6jshwnchh5dl1d3agqy36509r"; depends=[]; };
+  SimplicialCubature = derive2 { name="SimplicialCubature"; version="1.2"; sha256="1g7i31naczqf1hxmk1h5y9gq36rdfhf4al9xvwjgi9bj9zhfg3qp"; depends=[]; };
   Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
   SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
   SimultAnR = derive2 { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
-  SixSigma = derive2 { name="SixSigma"; version="0.9-2"; sha256="127q556amd40h636av71xv8vh7qn0kmax8yhvw1l5pfq2h3ms1s1"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
+  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]; };
+  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]; };
   Sky = derive2 { name="Sky"; version="1.0"; sha256="02vjdggvanzsjx7ihxskapp5d5dlyalj02122wmarj8qf1ha1i2m"; depends=[EBImage]; };
-  Sleuth2 = derive2 { name="Sleuth2"; version="2.0-3"; sha256="030wq178b7s9grdj3a65lplxv1p84m84yf9x4dild392p812199c"; depends=[]; };
-  Sleuth3 = derive2 { name="Sleuth3"; version="1.0-1"; sha256="0vy7b69f5y3ahbgi8c2lr42xhz4h0z7zcyrai42050snjmwrxb1l"; depends=[]; };
-  SmarterPoland = derive2 { name="SmarterPoland"; version="1.5"; sha256="0qa31z0wgl8bgc3ihgbfdmp1ang3wyy4qylj81zxh1yn2zxx5fr0"; depends=[ggplot2 htmltools httr rjson]; };
+  SkyWatchr = derive2 { name="SkyWatchr"; version="0.5-1"; sha256="0mza2r80wsa091ry0rcx9x29k9v0kfk4gnafmpw6pah3bgpd2lk8"; depends=[htmlTable httr sp]; };
+  Sleuth2 = derive2 { name="Sleuth2"; version="2.0-4"; sha256="18mh1svmb96hw3rjmgxlwzs7kdcvjkxf4zm8k4w0sxz94ks062i7"; depends=[]; };
+  Sleuth3 = derive2 { name="Sleuth3"; version="1.0-2"; sha256="0b4g7j8a204wyvh0q9n1l4zrl9rk7ibyfijd49mjjdyg9zz4kbna"; depends=[]; };
+  SmartSVA = derive2 { name="SmartSVA"; version="0.1.1"; sha256="1c35y20llycxs41pkjmb7b74cmspmcwwi98r8r5q6s1vgbzn96zr"; depends=[isva Rcpp RcppEigen sva]; };
+  SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; };
+  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]; };
   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.19.0"; sha256="1zskfncg3dqg7bcw7ck33xqz5w05sz0xi4ajfalzzsmr1sbmh6wj"; depends=[bitops data_table Hmisc httpuv httr igraph instaR plyr RCurl Rfacebook rjson stringr tm twitteR]; };
-  SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.3"; sha256="10208x0173glbb53997qa8fm57qpqzkwh0d42wk9izdb0k8l2fd1"; depends=[httr jsonlite RCurl]; };
+  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]; };
+  SocialMediaMineR = derive2 { name="SocialMediaMineR"; version="0.4"; sha256="0hd05rm7qn2w8rqx7pw996wpgb2rymcwzmns8xyczcyn81vjx8z8"; depends=[httr jsonlite RCurl]; };
   SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; };
   SocialPosition = derive2 { name="SocialPosition"; version="1.0.1"; sha256="1rrrjlq6czzhzipvkisbq024ca22v2vzx7wa4ddr9j7hnyyzzpic"; depends=[]; };
-  Sofi = derive2 { name="Sofi"; version="0.0.26"; sha256="0jcnwy308h8qdswapdqpphdx5757a4a6bmrdmyzh0ny52a4w07n1"; depends=[foreign sampling shiny]; };
+  Sofi = derive2 { name="Sofi"; version="0.16.4.8"; sha256="0h9ir0xrwmsabfhwsr9hbpwabh1fsb3p51y8qcgm92iyvc6dl3mf"; depends=[foreign sampling shiny]; };
   SoftClustering = derive2 { name="SoftClustering"; version="1.1502"; sha256="1pgg9mjpfw55m3ny726vx5wl8gwsdkrxv8xzgmy3aqdlwzhh4bwz"; depends=[]; };
   SoilR = derive2 { name="SoilR"; version="1.1-23"; sha256="1cryypgnbck5hvkc2izrd8r10q2b97f2p1s46x4dk8p099gck5wg"; depends=[deSolve RUnit]; };
   SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; };
   SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; };
-  SoyNAM = derive2 { name="SoyNAM"; version="1.2"; sha256="0y6iarjn1jiv5rscrszc1fg5m0jdhi5w5qwv4b0bvnh42hjb5rzb"; depends=[lme4 NAM reshape2]; };
-  SpaDES = derive2 { name="SpaDES"; version="1.1.1"; sha256="0d09z7plh1sc331b9r6klxq0k587x882sm9g6imdggzyq1m990l7"; depends=[archivist CircStats data_table DiagrammeR digest dplyr ff ffbase fpCompare ggplot2 gridBase httr igraph lazyeval lubridate R_utils RandomFields raster secr sp stringi stringr]; };
+  SoyNAM = derive2 { name="SoyNAM"; version="1.3"; sha256="128iq8rrj6nm8zdqrv17gsjxzdsfashgzk1k7lnw38w04a2g05zs"; depends=[lme4 NAM reshape2]; };
+  SpATS = derive2 { name="SpATS"; version="1.0-5"; sha256="0nxv6mnbwd1a9yh883dqhcz6qnjznqc7q6c43s23lggj9wmjlzwj"; depends=[data_table fields plot3Drgl spam]; };
+  SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; };
+  SpaDES = derive2 { name="SpaDES"; version="1.3.1"; sha256="0a2s0smd0m3dmrjl88hm7dnkv6src96v00bhllc42sq6vq81iwsf"; depends=[archivist chron CircStats data_table DEoptim DiagrammeR digest dplyr DT ff ffbase fpCompare ggplot2 gridBase httr igraph lazyeval lubridate miniUI R_utils RandomFields raster RColorBrewer rstudioapi shiny sp stringi stringr]; };
+  SpaTimeClus = derive2 { name="SpaTimeClus"; version="1.0"; sha256="1l204b8yd11pxwcb026xy39f4lps4sqk6mml8cybnjch8clk9djc"; depends=[Rcpp RcppArmadillo]; };
+  SpadeR = derive2 { name="SpadeR"; version="0.1.1"; sha256="0iy2rkq4vvps1a73kqq37zpsyl4pvl3vh07dwvpfhvp7f8nxbx99"; depends=[]; };
   SparseFactorAnalysis = derive2 { name="SparseFactorAnalysis"; version="1.0"; sha256="0lgfvydxb86r5hks1mf0p0yhgpx8s8fbkc3q6dimc728rw26qcv5"; depends=[directlabels ggplot2 MASS proto Rcpp RcppArmadillo truncnorm VGAM]; };
   SparseGrid = derive2 { name="SparseGrid"; version="0.8.2"; sha256="057xbj2bhjm9i32kn39iscnqqdsvsmq0b8c92l8hnf9avf1sx10x"; depends=[]; };
   SparseLearner = derive2 { name="SparseLearner"; version="1.0-2"; sha256="1qxycxpch2m2yyk97210gdzsizhlinc0hkhk5ak00rdgkrsxxc0k"; depends=[glmnet lqa mlbench qgraph RankAggreg SIS SiZer]; };
-  SparseM = derive2 { name="SparseM"; version="1.7"; sha256="0s9kab5khk7daqf6nfp1wm1qnhkssnnwnymisfwyk3kz4q5maqfz"; depends=[]; };
-  SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.2"; sha256="0a1iscn4l587hn582hx4v8fawn6d9gg1m173fc0bsfpkyckgq8hx"; depends=[abind flare glasso longitudinal MASS mvtnorm network]; };
-  SpatPCA = derive2 { name="SpatPCA"; version="1.1.1.0"; sha256="0k9y4lm8ixvb571vab9lj3yblqshyb0p848dcc1g7jxibxwv4245"; depends=[Rcpp RcppArmadillo RcppParallel]; };
+  SparseM = derive2 { name="SparseM"; version="1.74"; sha256="1fpfhld887y5lyb8jydprmv5krqm1fk6n53z942b4g4z1v4g04j7"; 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]; };
   SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.2"; sha256="172i4khjb2fh818bq7wdfdm79fwxjwi60nqfj69dgbgcaww55ffr"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; };
   SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-2"; sha256="0ywybk9gziy2hzb1ks88q4rzs3lzzy6y3fzhja2s39ngg195hi6l"; depends=[fields maps]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
-  SpatialPosition = derive2 { name="SpatialPosition"; version="1.1"; sha256="07lcn2xq6aan4n7kdldzy5sbdl1jsab7j4zz7fvplr1n2hh41m03"; depends=[raster sp]; };
+  SpatialPosition = derive2 { name="SpatialPosition"; version="1.1.1"; sha256="1fbch16qmp8xnlkl7crydn1rh5gj49zlii6c9va5l7zp5wf8cl87"; depends=[raster rgdal rgeos sp]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; };
-  SpatialVx = derive2 { name="SpatialVx"; version="0.4"; sha256="1kll0q9rkdwd4b003w2967jyz4yan1ypb0f9biwm2jjxxdqy058d"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
+  SpatialVx = derive2 { name="SpatialVx"; version="0.6"; sha256="1zjjdhfancjliz0pa0rdfbf26wdci1v3krb42bd99kb4crrk9291"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
   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.1"; sha256="0wl15k00d7n9pmnp1kr28p05z4vrziprcdndw77kwkcgv51cvllk"; depends=[MASS numDeriv]; };
-  SpecsVerification = derive2 { name="SpecsVerification"; version="0.4-1"; sha256="0ps1v5vp5ksi0xrykdizjkkylzsacdczbpncdj9d6khmbvvqi15p"; depends=[]; };
+  SpeciesMix = derive2 { name="SpeciesMix"; version="0.3.4"; sha256="0d6hfmzxqcvg4fcvpsfxx36k95fwkws4rlylrixikndj2fncgwb5"; depends=[MASS numDeriv]; };
+  SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-0"; sha256="02mwl7kv784wdf3v6f15vbjd8sa1mh8ms11k19bjj3qci9xnx4jw"; 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.0.1"; sha256="0j592zvs07yc6amahlxgdw0k1vqr89gvcq22vcwzkx62igvlf6pv"; depends=[cubature]; };
+  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]; };
   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]; };
   StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
-  StableEstim = derive2 { name="StableEstim"; version="2.0"; sha256="080khfix88j4656hmdy9l0xpbk9zzw7z7d7f6yvwsbalk3ag18i5"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
+  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]; };
-  StanHeaders = derive2 { name="StanHeaders"; version="2.9.0"; sha256="0hpshkf688qgrrclvpy23waa8ijlxzr51frpzhbj0igwykqjpwji"; depends=[]; };
+  StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; };
+  StanHeaders = derive2 { name="StanHeaders"; version="2.14.0-1"; sha256="18x23a7nmj5497g3i6a01cv5g34p0xdkb6srf9nwisbhshz25mxl"; 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.4"; sha256="0h5b26qqjpxr9bzrbhmbla24dh3ni4z531951aa1frjvi8krv18r"; depends=[clue lpSolve proxy RANN survey]; };
+  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]; };
   StatRank = derive2 { name="StatRank"; version="0.0.6"; sha256="14d8v3bp8vgksi6q0mxajwd9s8zi6lns3qwi1vcr5xp9rjp4n6iy"; depends=[ggplot2 plyr truncdist]; };
-  Statomica = derive2 { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[Biobase distr fBasics multtest]; };
   SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; };
   Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; };
-  StereoMorph = derive2 { name="StereoMorph"; version="1.5"; sha256="1y9mflfpysri4abghvp550m1p0r33k75n6q01wihbip157iqf9pz"; depends=[bezier jpeg png Rcpp rjson shiny svgViewR tiff]; };
+  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]; };
   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=[]; };
-  StratSel = derive2 { name="StratSel"; version="1.1"; sha256="0l08v71qmd170027y5vjnvgfm8kqvgaqrpms9msxhv8g5974kla8"; depends=[Formula MASS memisc mnormt]; };
-  StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.1"; sha256="1r9p6awf3a2d08w9rdlggkwlfhksn14xbhdhdnmxz79ym5mgdd8f"; depends=[chron maptools zoo]; };
-  StressStrength = derive2 { name="StressStrength"; version="1.0.1"; sha256="15sgdisgz8zcq4i9z4zm7isr5ckyd7bk6yl1g7a5kngams282ipx"; depends=[]; };
+  StratSel = derive2 { name="StratSel"; version="1.2"; sha256="11dkhyh0xgl23f9ksxcjl6bqfhwm6k6i1chgx23dvjifbm6s5s5p"; depends=[Formula MASS memisc mnormt pbivnorm]; };
+  Strategy = derive2 { name="Strategy"; version="1.0.0"; sha256="1s89rl6h68sn8px3g7bhhrwmn6k4kmdqhiz0d39xr3kgpfpvi5i2"; depends=[xts zoo]; };
+  StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.2.0"; sha256="0iwzvschncb2vrmsawb6i94shn2cjbkph854x1z4ykr6ddw411g2"; depends=[plyr]; };
+  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]; };
   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]; };
   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]; };
   SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
   SuperExactTest = derive2 { name="SuperExactTest"; version="0.99.2"; sha256="0z9yhaz81l30i7ahjz1gxl7x4c0dqyny8ynpckjm8vwsvpr9y9yf"; depends=[]; };
-  SuperLearner = derive2 { name="SuperLearner"; version="2.0-19"; sha256="0dp4gqhvksw83asnbf46yd4z1yr1x4yd6b9c8gqjxkwp7bd0kgwb"; depends=[cvAUC nnls]; };
-  SuppDists = derive2 { name="SuppDists"; version="1.1-9.2"; sha256="0pkn1jf94hpilpxh82g0llhk4kdrx0zgvczxx3k24z25m6f5kk7h"; depends=[]; };
-  Surrogate = derive2 { name="Surrogate"; version="0.1-69"; sha256="04r1zbw8zxbzwfh73s48hpvvbd34073xgmqkpsg2g9xyg9ispzn8"; depends=[lattice latticeExtra lme4 logistf MASS msm nlme OrdinalLogisticBiplot rgl rms survival]; };
+  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]; };
   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=[]; };
   SurvRank = derive2 { name="SurvRank"; version="0.1"; sha256="1i08yjprzd9irs46rifa5fsmmhwbsf4py0m8qp5rprznyr8504y3"; depends=[doParallel foreach ggplot2 glmnet gplots ipred mboost randomForestSRC reshape rpart sampling survAUC survival]; };
   SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.4"; sha256="0ipr7lajnrklk963lrlgx946l6r191q3bfif4njkdmw0x797nzm2"; depends=[numDeriv survival]; };
   Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
   SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
-  SwarmSVM = derive2 { name="SwarmSVM"; version="0.1"; sha256="10gsasllycnmgaf5xq44ph5x7ajh38cnfd97x4hyc6bk4wz7p42r"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
-  SweaveListingUtils = derive2 { name="SweaveListingUtils"; version="0.6.2"; sha256="0n15gkiil9rlb0dhnkfimhcs09av35b7qx79iba7bx3y7spvzaqy"; depends=[startupmsg]; };
+  SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-2"; sha256="1997nbczgf5xkvj257fa211wxl85lq4jpybjl2q4hajn05ahq7yp"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
+  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]; };
   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]; };
-  TAM = derive2 { name="TAM"; version="1.17-0"; sha256="1xi5i79s7wrsfds3pn1lzla82qnb8miw8jlb94h6iyy9qr1xgr95"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
+  T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
+  TAM = derive2 { name="TAM"; version="1.99993-0"; sha256="1n5xs7s1rkn4y0317pkzg1dwdf7r5fm8wkaf0d3jvrz80g6cqbin"; 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]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
-  TAQMNGR = derive2 { name="TAQMNGR"; version="2015.2-1"; sha256="0j7qb15xy4g4ff0cmyjyz4lsalaxxf6zdwbq49j3y80ld0pvwhbk"; depends=[Rcpp]; };
+  TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
-  TBSSurvival = derive2 { name="TBSSurvival"; version="1.2"; sha256="12ipgffympqjjg8l9gbich5pgz0pqr5g07b0il26rr721xiyxk5v"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
+  TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
-  TDA = derive2 { name="TDA"; version="1.4.1"; sha256="1nl7scnqb0qdpqjl259f6v3i8bqnh0a95a5navs7jlphlak0w6k9"; depends=[BH FNN igraph Rcpp scales]; };
+  TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; };
+  TDA = derive2 { name="TDA"; version="1.5"; sha256="0rp41v0ihwan34bgb8bgzva5nk7lra0agfr9201ww6687mwakk9z"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   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.3"; sha256="0bbd2an18ayxaxprsjqrybb877lkk74dpxbvbv7qdwc1ivqm8g96"; depends=[adabag SPOT testit twiddler]; };
-  TDboost = derive2 { name="TDboost"; version="1.1"; sha256="1pyqssqxkr9bwyz4h1l5isbb78asmvddy20vyxq8snxra2r06hbf"; depends=[lattice]; };
+  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]; };
-  TEEReg = derive2 { name="TEEReg"; version="1.0"; sha256="1xpr4m8yamifjx7njb7dyqv51rsbjym9c5avflf69r9sazf3n503"; depends=[]; };
+  TEEReg = derive2 { name="TEEReg"; version="1.1"; sha256="0v5qz3vvmcm3fh16kjb05j1r0yj23r7hrxf2www20ng3dmga5q0f"; depends=[]; };
+  TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; };
   TEQR = derive2 { name="TEQR"; version="6.0-0"; sha256="112znsz36jqh3krnr4j05xl70picih8qpmqky2gllgyr8nky39fr"; depends=[]; };
   TERAplusB = derive2 { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; };
   TESS = derive2 { name="TESS"; version="2.1.0"; sha256="05xsz2v847pwj4ja7hmg3zfbfqrwwzpf0ri0gjzb8snm2a7xm23y"; depends=[ape coda deSolve Rcpp]; };
@@ -2532,69 +3110,79 @@ in with self; {
   TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
   TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.6"; sha256="1892jmgqywm0jp5l5k88brp4h8szkbi9bxi0v1jni1929qnsmqyf"; depends=[Rcpp]; };
   TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
-  TH_data = derive2 { name="TH.data"; version="1.0-7"; sha256="03h7lr5nh8090w167y3pmpxa0na1mqq4g4k8vz3ypjxc9ls2dq99"; depends=[MASS survival]; };
+  TH_data = derive2 { name="TH.data"; version="1.0-8"; sha256="17csnwyk2f3d47nghkfy9wly5kff8zhdcfwfml7509hjrjgi13s7"; depends=[MASS survival]; };
   TIMP = derive2 { name="TIMP"; version="1.13.0"; sha256="0b6g2afwjz2m7bnfhx1pjmq6x1ghjxgrwi6hz1l867qa4i2yx5hx"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; };
   TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; };
   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]; };
-  TLdating = derive2 { name="TLdating"; version="0.1.1"; sha256="1c2879981fs7c5yvh0arpnlx1rb8pi9gvn3g71fv486dzd83gknm"; depends=[gplots Luminescence]; };
-  TMB = derive2 { name="TMB"; version="1.6.6"; sha256="0sxkzfdgjqy9pjkmmk1bxlsxfq25lqh5h3nd5ydv2rivnak2jp3g"; depends=[Matrix RcppEigen]; };
+  TLMoments = derive2 { name="TLMoments"; version="0.6.3.1"; sha256="1rcix93s70lwjpmlfxqjrdphkp3p84pmxjxxchsm05qif7y6iwn1"; depends=[evd 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]; };
   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]; };
-  TP_idm = derive2 { name="TP.idm"; version="1.0"; sha256="1dgcalzhkhj4cn1yjf23q6cm527fgf083n7nw7201824g78566n5"; depends=[]; };
+  TOSTER = derive2 { name="TOSTER"; version="0.1.3"; sha256="15a7g1ccxk9xjcs3gysq8h4p0gd7527yq5zy6k9ara68a8f2dz1r"; depends=[]; };
+  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.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[gdata gWidgets gWidgetstcltk plyr rappdirs RCurl taxize XML]; };
-  TRADER = derive2 { name="TRADER"; version="1.2-1"; sha256="01pv2bbz3w880pl15fspj22k7ji2lhk5xxav81j4aqm24hr4l0dp"; depends=[dplR]; };
-  TRAMPR = derive2 { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
+  TR8 = derive2 { name="TR8"; version="0.9.15"; sha256="16mijxxddvnr3ii4v0djx5l844bp36pypmqn2r6gp3jwp9jn8czx"; 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.1"; sha256="090m6l9x3q203mb6c454ign82zwcxk2appx0z3kr7bqrap245s7n"; depends=[AnnotationDbi GO_db gplots gtools lattice openxlsx RColorBrewer topGO]; };
+  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-3"; sha256="18ygg7bqwg1pdqi52l1lf33gcd277895rlf5853yzh7ln2ivssmi"; depends=[]; };
+  TSHRC = derive2 { name="TSHRC"; version="0.1-4"; sha256="04pvh3vhgx3pj3sgkbxsqdwjglqbmaaj0rsb8b4q162bh608d9zl"; 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-4"; sha256="17gv6kg0v8zirmgrmi61b3phjdb237z3jj5wxz1yn2m94halcnlj"; depends=[foreach]; };
+  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]; };
+  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]; };
   TSTutorial = derive2 { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; };
   TSclust = derive2 { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc wmtsa]; };
   TScompare = derive2 { name="TScompare"; version="2015.4-1"; sha256="0jmxnrbsdg368f29bp70rc9i88si5zjblbcn8rcjyn2k9vpd3q2f"; depends=[DBI tfplot tframe TSdbi]; };
-  TSdata = derive2 { name="TSdata"; version="2015.4-2"; sha256="1c0ly1gs6p3fspwvk1f6c2xgzvc7p7pkzakm44lisbyjklacnilp"; depends=[]; };
+  TSdata = derive2 { name="TSdata"; version="2016.8-1"; sha256="199dy4phc6z0kzbp4kks55519c3xgsx4dkwrypr9sg8xhprrwnib"; depends=[]; };
   TSdbi = derive2 { name="TSdbi"; version="2015.7-1"; sha256="00dasnkkxw9rg1wyx1i2sqjr0ys1ahp9z6rdr08f8wl7zw5r8x6w"; depends=[DBI tframe]; };
-  TSdist = derive2 { name="TSdist"; version="3.2"; sha256="085s7d4h777iifvfchsss41lhr7vrm5i0lmpvri6yaw3lsab4r90"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
+  TSdist = derive2 { name="TSdist"; version="3.3"; sha256="0n5y0816nyhn21ggyjhwlm8a21rzwynf27nh1vamkwzhqms11msm"; depends=[cluster dtw KernSmooth locpol longitudinalData pdc proxy TSclust xts zoo]; };
+  TSeriesMMA = derive2 { name="TSeriesMMA"; version="0.1.1"; sha256="0dkrz3m5lh872c0q9nw4h0p6g4j1j9fn92hz8xlifpsbsyzpz63b"; depends=[]; };
   TSfame = derive2 { name="TSfame"; version="2015.4-1"; sha256="197v123mkxr7qlksnb5iadms5zbc8xqbpgr2cspb8x1krz6phssz"; depends=[DBI fame tframe tframePlus tis TSdbi]; };
-  TSmisc = derive2 { name="TSmisc"; version="2015.1-3"; sha256="1hv1q9p7vp7pxx9s4s9w3vkif1w1xr4y656x3zaf48ijxf6c6a90"; depends=[DBI gdata its quantmod tframe tframePlus TSdbi tseries xts zoo]; };
+  TSmisc = derive2 { name="TSmisc"; version="2016.8-1"; sha256="0xvn6qlvvdc65l356r8b5ppddjd35k9fc4b5w5wn3j5wzxfllbk1"; depends=[DBI gdata quantmod tframe tframePlus TSdbi tseries zoo]; };
   TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; };
-  TSsdmx = derive2 { name="TSsdmx"; version="2015.12-1"; sha256="0vl2p1n6jmq4q17fdni1w5vrqyyf71b3g06nzgj03sbxiia20cz2"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
+  TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; };
   TSsql = derive2 { name="TSsql"; version="2015.1-2"; sha256="1hpi2cssnkzqgnaj91wrvb94fs8zpfg8hi4m1zwswzyl3az0l9sc"; depends=[DBI tframe tframePlus TSdbi zoo]; };
-  TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.2"; sha256="00lzzarnpvb5dl4wzch1ll42wzcd2hc3xdi6fkgyiznx0nljapmg"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape tcltk2 wq]; };
+  TTAinterfaceTrendAnalysis = derive2 { name="TTAinterfaceTrendAnalysis"; version="1.5.3"; sha256="0a1v0lsfcn32w5rwcjwmvh0rghamwr5a76rx3npa6kv0dymnvhxf"; depends=[e1071 lubridate multcomp mvtnorm nlme pastecs relimp reshape tcltk2 zoo]; };
+  TTCA = derive2 { name="TTCA"; version="0.1.1"; sha256="16slr4c2nwbchsg6fk5prq22p2v4cjxzk93wd3xggav2lzrf8a5h"; depends=[MASS Matrix quantreg RISmed tcltk2 VennDiagram]; };
   TTR = derive2 { name="TTR"; version="0.23-1"; sha256="1bmj0ngd3i3a9l2zsanifq3irz3rhsyd2rvvlhyndsgadkq9i5v9"; depends=[xts zoo]; };
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
-  TUWmodel = derive2 { name="TUWmodel"; version="0.1-6"; sha256="1i986ra0hdhr3nvh9izg6ym69sg2qp4x7b9kx4x86qgi8w43slvh"; depends=[]; };
+  TUWmodel = derive2 { name="TUWmodel"; version="0.1-8"; sha256="0c00jd2bq4i5fd55hj7l2grkpn990p0kmhbsh95b2zrzhbwgcjp6"; depends=[]; };
   Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
   TableMonster = derive2 { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; };
   TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; };
+  TanB = derive2 { name="TanB"; version="0.1"; sha256="05y9j1a5nzqfpsw48gix5c4ds1cm80liad9wnwmddhbx4fda6p32"; depends=[fdrtool pracma]; };
   TaoTeProgramming = derive2 { name="TaoTeProgramming"; version="1.0"; sha256="1b36s5mpm5vbhzcwmvm8g5pl7vpn6rsl5cnglfy8kgm1q9nnr7ff"; depends=[]; };
   TapeR = derive2 { name="TapeR"; version="0.3.3"; sha256="0q5j7pn05z7hinwl5ypnrgh9ibsw6hvdfszjbnvavzab3bx8l6nn"; depends=[nlme pracma]; };
-  Tariff = derive2 { name="Tariff"; version="1.0.1"; sha256="1jjg6qp6n9788w1snl7jsxdg168bbhskdp5wpqqbvcm651rb6d05"; depends=[]; };
+  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]; };
   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]; };
   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=[]; };
+  TestDataImputation = derive2 { name="TestDataImputation"; version="1.0"; sha256="07k4sgjda1gwdlx5rap5fhs5rww2ahzyf0fq98dsm99gvjajnmwn"; depends=[Amelia mice]; };
+  TestFunctions = derive2 { name="TestFunctions"; version="0.1.0"; sha256="0df69n004svbb8q0z57cfc59i7l8rxpq0c7krcn8mb03hp79fpwd"; depends=[]; };
   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]; };
-  TextoMineR = derive2 { name="TextoMineR"; version="1.1"; sha256="0pdf3zd1glbwqm1lwvv6mcn1pd9phrg5vdwxr2lhh22xsmggswjp"; depends=[FactoMineR gdata MASS stringr tm]; };
-  Thermimage = derive2 { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp4g5wpmgzf0ii2aa0gawcq74rfn4frfizzdy0ad"; depends=[]; };
+  Thermimage = derive2 { name="Thermimage"; version="2.2.3"; sha256="16pwykp33bwmca7dlcr4ia3sakfdazxxk501v4rcr735767fsvyh"; depends=[png tiff]; };
   Thinknum = derive2 { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
-  ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
+  ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-0"; sha256="075cn99k06lgdd0cwl1i9242fcxwmd5malcyks0mmwjf9kzw00z2"; depends=[MASS numDeriv]; };
   ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; };
   ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; };
   ThresholdROC = derive2 { name="ThresholdROC"; version="2.3"; sha256="08bmjsbwndb5i902plsy1wa5c1i5f96r3s6fdy0a16w9n6rvll1k"; depends=[MASS numDeriv pROC]; };
@@ -2603,29 +3191,38 @@ in with self; {
   TideCurves = derive2 { name="TideCurves"; version="0.0.1"; sha256="0xpb5xf7ipfnfrrc7j5gsvkn6njqz3ral9nim5gqqfgbnhxkvk1b"; depends=[chron data_table fields]; };
   TideHarmonics = derive2 { name="TideHarmonics"; version="0.1-0"; sha256="0inqwa2y4pqs1g9d5m5y6w9j1kgc9qil6gmcilhkjrk886whf622"; depends=[]; };
   TideTables = derive2 { name="TideTables"; version="0.0.1"; sha256="08c1fbwxc2kc3vicjdw8qg452y8jrsgyi6b4qbnpb8j6nj91qcx3"; depends=[chron data_table]; };
-  Tides = derive2 { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mfkn8hqdz6p155xm1kfqwvyb28qq"; depends=[]; };
+  Tides = derive2 { name="Tides"; version="1.2"; sha256="1bd5x5wx6dd7498dc8jl0hsflxvlya2b6rkwg39dpsxsigb4qc5n"; depends=[]; };
+  TileManager = derive2 { name="TileManager"; version="0.1.11"; sha256="11jlg99zfi00ss2a9qzmzxxdphdl3zy3pac0c7b0j2v2f529xwsw"; depends=[APfun raster rgeos sp]; };
   TilePlot = derive2 { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; };
   TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
   TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; };
-  TimeWarp = derive2 { name="TimeWarp"; version="1.0.12"; sha256="1qadaf8n8ym5nv1z328hd5wiw78f014imgd2ryvi70sh4dmzb16l"; depends=[]; };
+  TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; };
   Tinflex = derive2 { name="Tinflex"; version="1.1"; sha256="1wnb893x4gj1h3fpyblks07dln5ilpllpmmwp7wpqbvj7hzrj661"; depends=[]; };
-  TipDatingBeast = derive2 { name="TipDatingBeast"; version="0.1-6"; sha256="0yfm99j2b3k9har87qb675jxgfp5vq3aizqvxc1njnfyh5yjg89k"; depends=[mclust]; };
-  Tmisc = derive2 { name="Tmisc"; version="0.1.5"; sha256="17z3l8q86rd683ljiamc56a94ivbl6n4dyzxc3ppmnfy5m6ybv0p"; depends=[dplyr]; };
+  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]; };
   TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; };
-  TraMineR = derive2 { name="TraMineR"; version="1.8-11.1"; sha256="037l0857vv51n3046vrcsxrc24hljwr7ya1q3d6cbw9la1qv5f0d"; depends=[boot Hmisc RColorBrewer]; };
-  TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.4"; sha256="144s25ivq27f81dgh9x9h1fph1hdk86w9yac1hy6358kc8jnmi3q"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
+  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]; };
+  TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.5"; sha256="198yvnvw8yq321p2cdan1s47dy9vy4yxhqsnlp391lzykvan1qpc"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
+  Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
   TransModel = derive2 { name="TransModel"; version="1.0"; sha256="1cxvfmf304x8riwcnx6gp5fb5gkqa552zby2n6yxc0ic0m0w77kb"; depends=[survival]; };
   TransP = derive2 { name="TransP"; version="0.1"; sha256="0p6pfcp8qjdah0lfhx0a396nxjzp3ckpda9hl3snpppx79iyww55"; depends=[]; };
-  TransferEntropy = derive2 { name="TransferEntropy"; version="1.2"; sha256="11hwfbf53y88cpm693742hfzzpfwldwxag5860bv0h5r538aqini"; depends=[BH Rcpp]; };
-  TreatmentSelection = derive2 { name="TreatmentSelection"; version="1.2.0"; sha256="10b9saa15mcsmzsxmg79hs8kmdn6by1b1j889105qii62cd0pzdl"; depends=[ggplot2]; };
+  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]; };
   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]; };
   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.4.1"; sha256="028xvy3l72n1jhhfzv1fx1a51ya9bx008icz81ixjdwghzqr0wmi"; depends=[ggplot2 plyr reshape2]; };
+  TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; };
+  TropFishR = derive2 { name="TropFishR"; version="1.0.2"; sha256="0rkgjx3nnjyy46fbn4szvbsiz8awf6238h7br9kjwc06aaj935dp"; 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=[]; };
@@ -2635,77 +3232,94 @@ in with self; {
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
   TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; };
   UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
-  UNF = derive2 { name="UNF"; version="2.0.1"; sha256="1gnzj7lxfp0x5f2ws9aclzaq75gbmsqhjqi02llmihf05gq0kp23"; depends=[base64enc digest]; };
+  UBL = derive2 { name="UBL"; version="0.0.5"; sha256="13dvfpkyn9fc2lwlxzf5s47zjhgjnm7s9825w2brgq4l6x5afz9q"; depends=[]; };
+  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]; };
   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]; };
   UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; };
   UScensus2000tract = derive2 { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; };
   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]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
-  Unicode = derive2 { name="Unicode"; version="8.0.0-1"; sha256="0mhr0hirllcr55y92hywsx2xw0l4jyaq3dahlcpkypa3c19nx631"; depends=[]; };
-  UpSetR = derive2 { name="UpSetR"; version="1.1.1"; sha256="1ygrjim2r2ff98dmksrdzlhgyh64xm6ryl79g25v9mxa2pygpc3k"; depends=[ggplot2 gridExtra plyr]; };
+  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]; };
   UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; };
-  V8 = derive2 { name="V8"; version="1.0.0"; sha256="1d9smhmcmmc1mlkj8zx9nix7isd81589r3qdw4s2hqkjwvzdkcca"; depends=[curl jsonlite Rcpp]; };
+  V8 = derive2 { name="V8"; version="1.2"; sha256="1sdjmg3d8m0jmfs7zmz7cpw4ffar76nia2dzymnb373alm1gwlh6"; depends=[curl jsonlite Rcpp]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
-  VARSEDIG = derive2 { name="VARSEDIG"; version="1.1"; sha256="0fhn0r548k6xkm61bvl1bz81x284qycmc4ccql1g9770q68695va"; depends=[ade4 adehabitatHS car IDPmisc kulife MASS]; };
+  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]; };
-  VCA = derive2 { name="VCA"; version="1.2.1"; sha256="0jwqwrjl7wl4358yrz5ab9a5hp9vd9apsxi5is6rlkswlam33hls"; depends=[Matrix numDeriv]; };
+  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]; };
-  VGAM = derive2 { name="VGAM"; version="1.0-1"; sha256="1sh5gb4glnl84iiz33dnwmb37y1wpafjja1s70zy5kkg8178crn0"; depends=[]; };
-  VGAMdata = derive2 { name="VGAMdata"; version="1.0-0"; sha256="1ywqmfn469hpw9h07raxxrw2wc736i3wbxq2vq31qll4shqnc4q3"; depends=[]; };
+  VDAP = derive2 { name="VDAP"; version="2.0.0"; sha256="134x4aisaim72xkyzb1vb8vhl2m4i12yzh6cj858a1ag7b0ing3n"; depends=[drc ggplot2 reshape2 stringr]; };
+  VGAM = derive2 { name="VGAM"; version="1.0-3"; sha256="0wr6szcpj8r4a1rlzgd6iym7khin69fmvxcf37iyvs8mms86dfr3"; depends=[]; };
+  VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; };
   VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
   VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
-  VIFCP = derive2 { name="VIFCP"; version="1.1"; sha256="1xy9bsiz4ixsf7znlcaswcyryj8wf6r778wl11b1c33ip3ibq28x"; 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.4.1"; sha256="0kpf4rdcm69k742d8naphw10wdwicx3jfm159n2d1c3v6hfjmv0g"; depends=[car colorspace data_table e1071 MASS nnet Rcpp robustbase sp vcd]; };
-  VIMGUI = derive2 { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[Cairo foreign gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; };
+  VIM = derive2 { name="VIM"; version="4.6.0"; sha256="1yl6bsdigwjfkdn5mbfrw10ip1xr7scw1mvykdwgzkyfnlb8z86w"; 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.2"; sha256="1wrvgymwh2mgxrsciy62ib7lf9jyc5w9ga3s88cvcrvinagl21xs"; depends=[doParallel foreach randomForest rpart]; };
+  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=[]; };
   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.0.5"; sha256="1wni4ywwkqp1kd82prrzzxjw8ljacq5d7lb751gyg4jrpcsdclr5"; depends=[RCurl RISmed stringi stringr XML XML2R]; };
-  VariABEL = derive2 { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
+  VarfromPDB = derive2 { name="VarfromPDB"; version="2.1.11"; sha256="1pxv6f7bz7g75hk3y7ndc9qcf49fzl82xc8f165w18wgkqk0v6a4"; depends=[RCurl RISmed stringi stringr XML XML2R]; };
+  VariABEL = derive2 { name="VariABEL"; version="0.9-2.1"; sha256="00k08mvd09rpplakvid6qal1zdxaj1bxn4d2ivpnqihisf7nxqbs"; depends=[]; };
+  VariableScreening = derive2 { name="VariableScreening"; version="0.1.1"; sha256="03l929qhgr1bd721488xx0il1hlswv3zdad518ki94ghq9c4nmg3"; depends=[expm gee MASS]; };
   VarianceGamma = derive2 { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   VdgRsm = derive2 { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[AlgDesign permute]; };
   Vdgraph = derive2 { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
-  VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; };
+  VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; };
   VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; };
-  VennDiagram = derive2 { name="VennDiagram"; version="1.6.16"; sha256="180w0bbfzms12w5s23rbndk413ly5bmdia5qnj0025hicfbh9wvx"; depends=[futile_logger]; };
+  VennDiagram = derive2 { name="VennDiagram"; version="1.6.17"; sha256="14cahgxm5kq133j5wv6p7ivlmcmym5r39v4dpj69wnq6w9rjqki8"; depends=[futile_logger]; };
   VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; };
-  ViSiElse = derive2 { name="ViSiElse"; version="1.0.1"; sha256="1fqk9dcf1fkk7lk7b3iicvxd67q04mmqdf3zggj3cgw6jimx7ba7"; depends=[chron colorspace Matrix stringr]; };
+  VetResearchLMM = derive2 { name="VetResearchLMM"; version="0.1.0"; sha256="0k5mr9426v1b3kqnzrb1nizrsvjmm5qx6fybrnn0y1j2w7hk99jr"; 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="1.6-1"; sha256="1yxsn6n5fd6n155jpk72wn09fw6x85m0kpdm4gbng8jdz5x4b49d"; depends=[ADGofTest copula igraph lattice MASS mvtnorm]; };
+  VineCopula = derive2 { name="VineCopula"; version="2.1.1"; sha256="1cqfa7s3gqrbdhjy2v8yn44k6vlxpzi0bmlcpzf9kkzy36p3vz84"; depends=[ADGofTest copula doParallel foreach kdecopula lattice MASS mvtnorm network]; };
   VisuClust = derive2 { name="VisuClust"; version="1.2"; sha256="0hnjmrz352950rzky88q4nwvkx7zp6x3lsm7kff5dl4w05iq4wsl"; depends=[aplpack]; };
-  VizOR = derive2 { name="VizOR"; version="0.7-9"; sha256="1xw06y86nsrwpri6asrwh8kccjsqzzidgbpld6d6l7vrglp8m6sr"; depends=[lattice rms]; };
+  VizOR = derive2 { name="VizOR"; version="0.8-5"; sha256="1v76m67xdlg06w3dmp27mh3mv3lfqy6bd1iq907dynp2g4qf4ww0"; depends=[lattice rms]; };
   Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; };
   VoxR = derive2 { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; };
   W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; };
-  W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-5"; sha256="1d4qpz6a984jv3p0l1w4xdhfx5iz9njz3dxlp0llyfzqg1szbqzj"; depends=[curl xml2]; };
+  W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; };
   WACS = derive2 { name="WACS"; version="1.0"; sha256="1x6vn7xhrnaggrxkvap6si8gz7b6z2zpjpbb9zgag4vyq3s7nxgy"; depends=[mclust mnormt mvtnorm tmvtnorm]; };
-  WARN = derive2 { name="WARN"; version="1.2-0"; sha256="0iamg0jh11ydy04mp3vn6zjhr89454m78iz5mmyfywf0s5415san"; depends=[MASS]; };
+  WARN = derive2 { name="WARN"; version="1.2-2"; sha256="1kp0p9ax6k4y990j95q70dhd1r37hjw3i583c2f6ds8gpddqdi3v"; depends=[MASS]; };
   WCE = derive2 { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
   WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
   WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
+  WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
   WGCNA = derive2 { name="WGCNA"; version="1.51"; sha256="0hzvnhw76vwg8bl8x368f0c5szpwb8323bmrb3bir93i5bmfjsxx"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore survival]; };
-  WHO = derive2 { name="WHO"; version="0.1"; sha256="0szyzf8048czq8yh2wbck80qmnsgrzg7ik5zp7l71rzgjpcyf8hm"; depends=[dplyr httr]; };
+  WHO = derive2 { name="WHO"; version="0.2"; sha256="0rpk7ddpkjcqs0m7cgxs55k178js0d70ccfximp2vqrsw0igkmk9"; depends=[dplyr httr]; };
   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=[]; };
-  WRS2 = derive2 { name="WRS2"; version="0.4-0"; sha256="11yfq8jkr2f28zmshkvjv0ajslh0137mprn9clgala8y4xrpqv94"; depends=[MASS plyr reshape]; };
+  WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
+  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]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
+  WWR = derive2 { name="WWR"; version="1.0.0"; sha256="0nsgcasdgzxxlnpicmq9n9200gg2c2si3gfpwaxdy4ccwasgjq6p"; depends=[]; };
   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]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
@@ -2713,166 +3327,199 @@ in with self; {
   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.3"; sha256="1lalx3vr8n66nb84psjvc1mgi1rp7g1bylhxr93yyp5w4lwcfv77"; depends=[]; };
-  WiSEBoot = derive2 { name="WiSEBoot"; version="1.3.0"; sha256="0db7h357h3g7y5qw8f8lgjkv48nayc9p7alr468r9lpn2kk7z54j"; depends=[FAdist wavethresh]; };
+  WhopGenome = derive2 { name="WhopGenome"; version="0.9.4"; sha256="085jzpgd1wgbsj68n5cixq6q4hw2sz485d9lpmch9qakhbpm7849"; 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]; };
-  WikidataR = derive2 { name="WikidataR"; version="1.0.1"; sha256="1c1mckbfyya9i2xd2a46fwfqyydxb6ayrlzgic2l12m5gdkzbxnr"; depends=[httr jsonlite WikipediR]; };
-  WikipediR = derive2 { name="WikipediR"; version="1.3.0"; sha256="0ccxbz1vmfl73v6xcfpwnaxphdc7mcif09i4sk9nd58r1isbbhxn"; depends=[httr jsonlite]; };
+  WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.0"; sha256="17vnfarnqf5cqdldgwg505vcj2l0hji409zdyncks7xcq8myvswz"; depends=[dplyr httr jsonlite]; };
+  WikidataR = derive2 { name="WikidataR"; version="1.2.0"; sha256="053gyls7bv4xb34jifxm5040zml2cwznna3brckf0191cvd5jgws"; depends=[httr jsonlite WikipediR]; };
+  WikipediR = derive2 { name="WikipediR"; version="1.5.0"; sha256="1w4ggq42vlq7zbrz3v9ripz9yscbd8m8as60q7cplpxn9zqfdl7q"; depends=[httr jsonlite]; };
   WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; };
   WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
+  Wmisc = derive2 { name="Wmisc"; version="0.3.2"; sha256="1dyfpmsl1fdznnz79l8zkp6v4kxc9a260qp7g52mwxj9xw0jb0z7"; depends=[hash R6 Rcpp]; };
   WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
-  WrightMap = derive2 { name="WrightMap"; version="1.2"; sha256="0d57wq639wgbs1kpr3ilzw70c3rz1i055n3flbyzvy49z9ghvcyp"; depends=[]; };
+  Wrapped = derive2 { name="Wrapped"; version="1.0"; sha256="1c12yk0qw017ccdjr2hk6zxm93735hx7lwg2gp2cj15yb3rwnscf"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; };
+  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.16"; sha256="1wrcm8srn185qrba7rig3fvwjz1n2ab296i0jr71vhyp9417h40q"; depends=[Rcpp]; };
+  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]; };
   XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
-  XLConnect = derive2 { name="XLConnect"; version="0.2-11"; sha256="02wxnr6h06h125dqszs8mzq4av842g445ndr59xgscxr03fyvi8p"; depends=[rJava XLConnectJars]; };
-  XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-9"; sha256="0js79297himq628cwx5cc3pcq3iv6p16bn4bpd5diyjaya4x27g3"; depends=[rJava]; };
-  XML = derive2 { name="XML"; version="3.98-1.4"; sha256="09hiy5a875v2fhsgrsfymrwccn9249wnnsr6ck2slrig65svq2lw"; 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=[]; };
   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=[]; };
+  XR = derive2 { name="XR"; version="0.7"; sha256="1wvjvvwmp39i23v61x46b4cw90yf8khcn5c61icpms0rmxcbdc7n"; depends=[jsonlite]; };
+  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=[]; };
   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]; };
   YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
-  YplantQMC = derive2 { name="YplantQMC"; version="0.6-4"; sha256="09galr2bcjvfpcp84znsv45j2cfyn4yhdx31kxs062sylys6kxld"; depends=[geometry gplots LeafAngle rgl]; };
+  YplantQMC = derive2 { name="YplantQMC"; version="0.6-6"; sha256="153sznajgp4bjsjhn3xk6kbp68ihswdc48gn0y3wmg5xa15yrqlk"; depends=[geometry gplots LeafAngle maps rgl]; };
   YuGene = derive2 { name="YuGene"; version="1.1.5"; sha256="1f1bia1q1z2rzp4pw218zglf02x1m9zpz5gqllrd77ggw8ilqfjc"; depends=[mixOmics]; };
-  ZIM = derive2 { name="ZIM"; version="1.0.2"; sha256="1n4dc0as011gzaac153zq1dfbg1axvmf9znlmhl7xjj4dz4966qm"; depends=[MASS]; };
+  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-11"; sha256="134s2d3038b8j2j6xsh0a3parzpqsr50vi67nfjpsxm27qrih27y"; depends=[AER Amelia dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack plyr quantreg sandwich survey survival VGAM]; };
-  ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-0"; sha256="0mp59mkfbvayml3118kaxsvdqzh7mycnd27fy9dahapvb9qj408l"; depends=[dplyr jsonlite MASS VGAM Zelig]; };
+  Zelig = derive2 { name="Zelig"; version="5.0-15"; sha256="1a55v03znczpbwlxd70dy73lzq75ifmqfkhwmwn7vdz8pdcsmiqx"; depends=[AER Amelia coda dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
+  ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-3"; sha256="0wh10mzasl2mzn0afas2k9dqjsmdgnbjci9i9s1fqxgdil0jp09q"; 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]; };
-  aRpsDCA = derive2 { name="aRpsDCA"; version="1.0.2"; sha256="1h1gkk5i77f9dl77dgw2vlm0s7mkmpc4dhcw5mdggyxx944kg33s"; depends=[]; };
+  aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.0"; sha256="128f3ggnqpdv12d1f1hpkq5nb1wdwihifvvb2k2ixizmhw7vn6dy"; depends=[]; };
   aRxiv = derive2 { name="aRxiv"; version="0.5.10"; sha256="1q8nblb0kfdidcj1nwxn0fap87wpkg49z0bgmwayskwv1p860wrh"; depends=[httr XML]; };
-  aSPU = derive2 { name="aSPU"; version="1.41"; sha256="1p9rfph1s2gwgi5vf2clqgy3mnh19ffxmpgg09q8x46g62dg35yw"; depends=[gee MASS matrixStats mvtnorm Rcpp RcppArmadillo]; };
+  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=[]; };
-  abbyyR = derive2 { name="abbyyR"; version="0.3"; sha256="0x6c0ika129rgn4im1hhmfchqivdkfawi0sxkhkbxc9k1z41k95i"; depends=[curl httr readr RecordLinkage XML]; };
+  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]; };
   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]; };
-  abcrf = derive2 { name="abcrf"; version="1.2"; sha256="13kfp1v5qimz8raa004f929xaknphjkp5w4kkj008svca3lp3a61"; depends=[doParallel doRNG foreach MASS randomForest]; };
+  abcrf = derive2 { name="abcrf"; version="1.5"; sha256="1jfplr549cd6mpm694spc8ws0d56q3pa5wv1z57blayk4mxnczwv"; depends=[MASS ranger readr stringr]; };
   abctools = derive2 { name="abctools"; version="1.0.4"; sha256="0y03sql473ylwcbiayl7rn4psc7d8ck0z6vbimnwpx73l143jww2"; depends=[abc abind plyr]; };
   abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; };
   abf2 = derive2 { name="abf2"; version="0.7-1"; sha256="0d65mc1w4pbiv7xaqzdlw1bfsxf25587rv597hh41vs0j0zlfpxx"; depends=[]; };
-  abind = derive2 { name="abind"; version="1.4-3"; sha256="1km61qygl4g3f91ar15r55b13gl8dra387vhmq0igf0sij3mbhmn"; depends=[]; };
-  abn = derive2 { name="abn"; version="1.0"; sha256="1nv9ibk9d58njjz24mswhdv7v9bf0icnjvavqyzh1l0g16aw0ih5"; depends=[Cairo]; };
+  abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; };
+  abjutils = derive2 { name="abjutils"; version="0.0.1"; sha256="0bgk522jxj31crzg3pa4pghz1sjx6gr3jchh9cwqdslr9ydd0g0j"; depends=[devtools dplyr httr magrittr stringr tibble]; };
+  abn = derive2 { name="abn"; version="1.0.2"; sha256="0jxpw5mplnpc57jjg9w3zrik40g7va6s8m9zbfsyf0vqn645wfwq"; depends=[Cairo]; };
   abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; };
-  abundant = derive2 { name="abundant"; version="1.0"; sha256="0n2yvq057vq5idi7mynnp15cbsijyyipgbl4p7rqfbbgpk5hy3qb"; depends=[QUIC]; };
-  acc = derive2 { name="acc"; version="1.2.4"; sha256="17211jrpkn65p07x1547l650y33k3l8cmjj1jgk485kbr4kdzk99"; depends=[mhsmm nleqslv PhysicalActivity plyr zoo]; };
+  abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; };
+  acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; };
   accelerometry = derive2 { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
-  accrual = derive2 { name="accrual"; version="1.1"; sha256="12zlv34pgmhcvisqk3x09hjpmfj91pn56pkjyj483mcf634m9ha4"; depends=[fgui SMPracticals]; };
-  accrued = derive2 { name="accrued"; version="1.3.5"; sha256="10j8vrjgb43bggkf2gn518ccfard2f071mj6nwsxrzkm00pbx32v"; depends=[]; };
-  acepack = derive2 { name="acepack"; version="1.3-3.3"; sha256="13ry3vyys12iplb14jfhmkrl9g5fxg3iijiggq4s4zb5m5436b1y"; depends=[]; };
+  accelmissing = derive2 { name="accelmissing"; version="1.1"; sha256="0s2vy16zcpvbqyqz4ifdqccs6bfp8sf7azvfy8jjcm73xncv6ij3"; depends=[mice pscl]; };
+  accrual = derive2 { name="accrual"; version="1.2"; sha256="1d9jis7d2fihkmwlqqvjl2kh6dcinzbffc9c0m4aqwzaq7c6ngjx"; depends=[fgui SMPracticals tcltk2]; };
+  accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
+  acebayes = derive2 { name="acebayes"; version="1.3.4"; sha256="0zg2yzbmmbv8nfgvncgc1hxrswxpj786pljlpmkib0iw9zvpy48w"; depends=[compare lhs Rcpp RcppArmadillo]; };
+  acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; };
   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]; };
   acopula = derive2 { name="acopula"; version="0.9.2"; sha256="1z8bs4abbfsdxfpbczdrf1ma84bmh7akwx2ki9070zavrhbf00cf"; depends=[]; };
   acp = derive2 { name="acp"; version="2.1"; sha256="0lcwbjcyyr32m6qjmjqh25qjwrbyqj1n092xhgbhxzd8fslppnmn"; depends=[quantmod tseries]; };
+  acrt = derive2 { name="acrt"; version="1.0.1"; sha256="0y9ndcq8ffpfrv7w9rikm4zn68jpsj6baqisq9kp2433xrwzdb6s"; depends=[Rcpp RcppEigen sandwich]; };
   acs = derive2 { name="acs"; version="2.0"; sha256="0iddpjbswmxgqbly35gw1f9h3kv7yq3y72j9ngzq6xx00jarc3y7"; depends=[plyr RCurl stringr XML]; };
   acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; };
   acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; };
-  activity = derive2 { name="activity"; version="1.0"; sha256="1y1vy3kj9n21jvbyl3s5hllfkqp3z1rnn7701c5jxhay5dbdz3p2"; depends=[circular overlap pbapply]; };
-  activpalProcessing = derive2 { name="activpalProcessing"; version="1.0"; sha256="1s84z9h68lwfinnr747brwbn4iai1axn7kh5nmlc6h41rchf64ja"; depends=[chron]; };
-  actuar = derive2 { name="actuar"; version="1.2-0"; sha256="14zbp152wsrnflj08mj9hxr61lzb6lx4spxyw45l2rs65ahj8hd6"; depends=[]; };
-  ada = derive2 { name="ada"; version="2.0-3"; sha256="1c0nj9k628bcl4r8j0rmyp5f1igdjq6qhjxyif6575fvn2gdzmbw"; depends=[rpart]; };
+  activity = derive2 { name="activity"; version="1.1"; sha256="1lqajgxfps2h6amz1791vp3f52rs9ghmanq1nqfxqd2jmk3idkrx"; depends=[circular overlap pbapply]; };
+  activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; };
+  actuar = derive2 { name="actuar"; version="2.1-0"; sha256="0zmfhdii3k1bjcv7dk4ic21645j96z75mvrqgwhg926qfzifsick"; depends=[expint]; };
+  ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; };
   adabag = derive2 { name="adabag"; version="4.1"; sha256="0a6hwcr0fg0a99y91i3wxrk6k0f7ldwvz9jr3akmiprc28v8r4zz"; depends=[caret mlbench rpart]; };
-  adagio = derive2 { name="adagio"; version="0.6.3"; sha256="0f5sn25qx0zmwqphd06qppf9j7annqhqxax3jssg37yqjakbbln2"; depends=[quadprog]; };
+  adagio = derive2 { name="adagio"; version="0.6.5"; sha256="0jy8g5604alaqbi5ynj95ig07igzbgk8x03a4x1rzkvfwvydfflz"; depends=[]; };
+  adapr = derive2 { name="adapr"; version="1.0.2"; sha256="1mbl0b9njjf0zwddkylmwyvrridqqx69v9invxqhc5kc6fvk4f10"; depends=[devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard]; };
   adaptDA = derive2 { name="adaptDA"; version="1.0"; sha256="0nk7n628d30jz03a2rmpgzrwwd79rlpqvr6lwhilmkg1gblvz7r1"; depends=[MASS]; };
   adaptMCMC = derive2 { name="adaptMCMC"; version="1.1"; sha256="1y1qxn3qm59nyy9ld5x30p452yam7b2fyl236b14xvpm8g3xx1fa"; depends=[coda Matrix]; };
   adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
-  adaptivetau = derive2 { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmycpn0680q1l9s34kcmkjl812d7yrfxwm1bjfif5"; depends=[]; };
+  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.3"; sha256="1jkj5ldxlzz3cb87v2syzvzs0fwlc6dpjnapqkhfaqh1pvmwgnwi"; depends=[boot MASS Matrix]; };
+  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]; };
+  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-4"; sha256="17sbicash7z4b63dlrbaf8xx2pbwh62vykzvhdjs43h8jkl881y7"; depends=[]; };
+  ade4 = derive2 { name="ade4"; version="1.7-5"; sha256="0aaqbnydm5fb37nrvqj4bx6hxax7255j426cwh2lh88nyvznbq37"; 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-5"; sha256="023ii21r3abw78wl1xjmn40rz2dplk3a402618xpwjk93ah74kgc"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
+  adegraphics = derive2 { name="adegraphics"; version="1.0-6"; sha256="0qahc6ld5nz6z81jv9yhh2cd27vh9n02swdf787fr83jgig43hja"; 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.20"; sha256="0sxi4dzd34p61d8dskj92nw7n4x9iflyf9fx48jxwb19lvy5902m"; depends=[ade4 adehabitatMA CircStats sp]; };
-  adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.10"; sha256="0b8nxk8339chhmjqjwsdlmy9nf729p0fgyh2hd1q93grgds9p1rs"; depends=[sp]; };
-  adephylo = derive2 { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 adegenet ape phylobase]; };
+  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]; };
-  adimpro = derive2 { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
+  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]; };
   ads = derive2 { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; };
+  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.1.0"; sha256="1iik0rrqkkx9n1qb1pvq5iwxqmvs6vnx8z80hdzb5vqq0lvi1bsx"; depends=[assertthat dplyr lubridate stringr]; };
-  afex = derive2 { name="afex"; version="0.15-2"; sha256="0fcrl3lmrrdp1x4rxghfrmpa1v0pz87kwwmbqmg2qpvvzib8r9fa"; depends=[car coin lme4 lsmeans Matrix reshape2 stringr]; };
+  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]; };
+  after = derive2 { name="after"; version="1.0.0"; sha256="0r0cdb0jspqi5vmaighwwqc0636wc5m297nq1j3n84w7z2aglg2w"; depends=[]; };
   aftgee = derive2 { name="aftgee"; version="1.0-0"; sha256="0gfp05r6xvn9fcysbqyzkz916axpsc2d3lb5wmb1v92z1zw3037b"; depends=[BB geepack MASS survival]; };
-  agRee = derive2 { name="agRee"; version="0.4-0"; sha256="19nvn2hiijn81wgqhx7s6blr2ilzx6p2s2qx1lw9shmnsmyywmss"; depends=[coda lme4 miscF R2jags]; };
+  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]; };
-  agricolae = derive2 { name="agricolae"; version="1.2-3"; sha256="0lly0dpdmc2kk843mdpj7gawffysf2yc31shsyhqlnf0sibblmik"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
+  agricolae = derive2 { name="agricolae"; version="1.2-4"; sha256="115k72riidc2dmq6gz52vqv63ijwj6akdwp31k14qmlv3a28asiz"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
   agridat = derive2 { name="agridat"; version="1.12"; sha256="1b3dgrp6mkfpfaywqdm22sakadhnl1vlyj1n3rq6bc2f0gf8kcrw"; depends=[lattice reshape2]; };
-  agrmt = derive2 { name="agrmt"; version="1.40.1"; sha256="06pd9svpvw38x5skdqz6fhax92wgrxjkdpw5qfph4hgqx53dxz9p"; depends=[]; };
+  agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; };
   agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; };
   ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; };
-  ahp = derive2 { name="ahp"; version="0.2.8"; sha256="07h6z4qp0jhfmjavk18cc3j95wg4jyfclpz4rcj93j484qj0f1aa"; depends=[data_tree DiagrammeR formattable yaml]; };
+  ahp = derive2 { name="ahp"; version="0.2.11"; sha256="09n06k5dmmpw6h6s51x9xy6rkk54fswss8pflh3v9nprbx7vzx4i"; depends=[data_tree DiagrammeR formattable yaml]; };
   aidar = derive2 { name="aidar"; version="1.0.0"; sha256="01vs14bz4k504q5lx65b60kyi7hgvjdmib8igiipjmg4snwh8hdk"; depends=[XML]; };
-  akima = derive2 { name="akima"; version="0.5-12"; sha256="10lbx69val6ysy6gk5nn1nl0ldgg90xfnj5snf9kdixfapi8vxnk"; depends=[sp]; };
+  aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
+  airGR = derive2 { name="airGR"; version="1.0.5.12"; sha256="02nasl8qamvbggwwfpgjfgqazfs1bfv6h48r1kab9wynpgqknynm"; depends=[]; };
+  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.3"; sha256="0z2kmzv33qyb7iawzndynpl1n395sk05lx3a31qbin6f1yc55lrp"; depends=[dplyr ggplot2 igraph lazyeval scales seqinr stringi]; };
-  ald = derive2 { name="ald"; version="1.0"; sha256="1vphmqhx6wlzsz3s94jsa4mk6wpacp93wfgpj0vp9ljfb3aplhik"; depends=[]; };
+  alakazam = derive2 { name="alakazam"; version="0.2.5"; sha256="1mc6riwycizbmr7mx6r4fs513ij8g14fgs5ngg2rai7cp58796cc"; depends=[data_table dplyr ggplot2 igraph lazyeval Rcpp 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]; };
-  alineR = derive2 { name="alineR"; version="1.1.2"; sha256="11ddg93iaq4xpg5rfw8qi82qhnmw6qnbzzsahr80xc0qn3p94i7d"; depends=[]; };
+  alineR = derive2 { name="alineR"; version="1.1.3"; sha256="000rywvianwi0xm0ccsmc7g2hl9d0zjl3qplidrr7rz872f6snwm"; depends=[]; };
   allan = derive2 { name="allan"; version="1.01"; sha256="02bv9d5ywbq67achfjifb3i7iiaaxa8r9x3qvpri2jl1cxnlf27m"; depends=[biglm]; };
   allanvar = derive2 { name="allanvar"; version="1.1"; sha256="142wy1mf4jbp4hy756rz95w24f4j1dgf14f1n5sd09dg4w98j7xg"; depends=[gplots]; };
-  alleHap = derive2 { name="alleHap"; version="0.9.2"; sha256="1hi764kczvza6kkqdnw8rk30r8rf1zfj1lbjiq9xc2lnfminxwiv"; depends=[abind]; };
+  alleHap = derive2 { name="alleHap"; version="0.9.7"; sha256="1fpfi8d6fb1r41fq18b35ngzfmbm9qq0lvdbbgahlgjf9n0zbp30"; depends=[abind]; };
   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.1.0"; sha256="0agca8dbypp2r08x7b4pscyz280m4l27ckkcvg1plk412v0n8dq8"; depends=[nleqslv quantreg Rsolnp]; };
+  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]; };
-  altmeta = derive2 { name="altmeta"; version="1.0"; sha256="1rca3qkx8ba39qjf35wmshdgdx0wmkpcmid22fvjbkkl8vr2m4h3"; depends=[]; };
+  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.2"; sha256="1r2gnd4mq3vdil8igh5n50yldz0g8g3syv4xv757fymwg6w7lk7g"; depends=[]; };
+  ameco = derive2 { name="ameco"; version="0.2.6"; sha256="1jbkw79kv6b83kv1s2id2xrljzbz25bc7yqld3p8dfpngcpmgvq8"; depends=[]; };
   amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
   amen = derive2 { name="amen"; version="1.1"; sha256="084bl46sxn2sxslcpi9lm22k6x8cz1jld228l0iardy4vmh4cxdk"; depends=[]; };
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
+  ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
   anacor = derive2 { name="anacor"; version="1.0-6"; sha256="0nq3jhai586d3980y8raqmbhh8snd5bpx5z8mlwrxvkmr62hcrpl"; depends=[car colorspace fda rgl scatterplot3d]; };
-  analogsea = derive2 { name="analogsea"; version="0.3.0"; sha256="14mh9lbbzxv75aprm2gixz05pyy5lh46ysflkdnnnpj2c5mpj2k9"; depends=[httr jsonlite magrittr yaml]; };
+  analogsea = derive2 { name="analogsea"; version="0.5.0"; sha256="1lfa8vl42n2wjl8r4m0144sircrrdvcanjd85l5m54r4vack846p"; depends=[httr jsonlite magrittr yaml]; };
   analogue = derive2 { name="analogue"; version="0.17-0"; sha256="00wk4jnzif28ibx9s3m68qdx64ycdgg5yr6ybb0srlydikvf1sy8"; depends=[brglm lattice MASS mgcv princurve vegan]; };
-  analogueExtra = derive2 { name="analogueExtra"; version="0.1-0"; sha256="0hyl0vn2i594r5czzha7y9a1n4dpznfpmh2j46mci2r57p2s3qr2"; depends=[analogue rgl vegan3d]; };
+  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="1.6"; sha256="14xrrnvz7jn1jqds48l5pvzlx6hsaxrjc932lqnvv70sfypinjkm"; depends=[pastecs RCurl XML]; };
+  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=[]; };
-  anesrake = derive2 { name="anesrake"; version="0.70"; sha256="17127rmjfrdwnr2m6205cci3b0kd9girp82qranxwac4mgb7p7ld"; depends=[Hmisc]; };
+  anesrake = derive2 { name="anesrake"; version="0.75"; sha256="1blq1blyq122jlj2yp8l7gam49q6h1wg6c9v0kkfkmnh5dwgz3mm"; depends=[Hmisc weights]; };
   anfis = derive2 { name="anfis"; version="0.99.1"; sha256="1v8di5dzwb1g1ldi7idcmmr9nirp9kxvc8km1qq1i8zaw1bh8pqb"; depends=[]; };
+  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=[]; };
+  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]; };
   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=[]; };
   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]; };
   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]; };
-  aop = derive2 { name="aop"; version="0.99.5"; sha256="1mncia5m79m1nw2kwfsrf62i2dlmxdcwj0rrrs95s51b7c6d369h"; depends=[graph igraph Rgraphviz rjson]; };
+  aop = derive2 { name="aop"; version="1.0.0"; sha256="1i3mixiwcvqygbcvj6f9vm223plmydzmixpy6nhis2zv9d90vakd"; depends=[ggplot2 graph igraph plyr Rgraphviz rjson]; };
   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]; };
-  apaStyle = derive2 { name="apaStyle"; version="0.2"; sha256="1vkbjlqn36f51yn7vmrcm74airi3mc5i70h2848gcb87f7zcwbh9"; depends=[ReporteRs]; };
+  apa = derive2 { name="apa"; version="0.1.0"; sha256="1a5xhybx43xgwf68fkxrqwj6azj70jpsrp2fwi1m7gvn4klcv3wh"; 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]; };
-  apc = derive2 { name="apc"; version="1.2"; sha256="1977d17sxky256jdh0ikyrm3d7kdn4kl5170jxc63nwdfnmh2ns3"; depends=[lattice]; };
+  apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
   apcluster = derive2 { name="apcluster"; version="1.4.3"; sha256="1pqcxh83189388qqc6cngqnsygvpx4kjy0j2r8ykcgxvdwi8r58m"; depends=[Matrix Rcpp]; };
-  ape = derive2 { name="ape"; version="3.4"; sha256="11cfw02gm5i21p4k7c8sfg9xmzg57bn9n6zr2j1wryily31gifsz"; depends=[lattice nlme]; };
-  apex = derive2 { name="apex"; version="1.0.1"; sha256="188hczb39dqi6xq2hbwhgas9jj9y7bbcsdz0kczimkbqwd9rz7cp"; depends=[adegenet ape phangorn]; };
-  aplore3 = derive2 { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; };
+  apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
+  ape = derive2 { name="ape"; version="4.1"; sha256="0959fiiy11rzfzrzaknmgrx64bhszj02l0ycz79k5a6bmpfzanlk"; depends=[lattice nlme]; };
+  apex = derive2 { name="apex"; version="1.0.2"; sha256="0p2sjpjg3b6i0ya99hkx2vl40w97k34z0z6ccnz08sfg3fyjiv24"; depends=[adegenet ape phangorn]; };
+  aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
   aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
   apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
   appell = derive2 { name="appell"; version="0.0-4"; sha256="0g7pzhxqgscnyf07xycbrpyimp1z1hljgcr3nqigpx09w7zi5wlw"; depends=[]; };
@@ -2881,149 +3528,191 @@ in with self; {
   approximator = derive2 { name="approximator"; version="1.2-6"; sha256="165qvx5946wkv1qsgbmjhmwvik7m23r1vbpnp7claylflgj1ycnm"; depends=[emulator]; };
   aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; };
   apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; };
-  aprof = derive2 { name="aprof"; version="0.3.1"; sha256="1zlpx72lhrc0jwfr4qydh64gvmwy52krfym1slz51r51w31q84x9"; depends=[]; };
+  aprof = derive2 { name="aprof"; version="0.3.2"; sha256="1rv7nr1y7jdvj2p8c6p67sn11bvmif2kj70fb2029hnsjk7lm15b"; depends=[]; };
   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]; };
   aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-  aqp = derive2 { name="aqp"; version="1.9.3"; sha256="0805d05dvid7s67anlrw61bsdz21hii2c41ar9q8377rzvb4cfsd"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
+  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]; };
-  archdata = derive2 { name="archdata"; version="1.0"; sha256="1hs2pgdaixifqjnwcbrjxlrzng0r2vmv6pdzghsyvzlg28rnq2rk"; depends=[]; };
+  arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
+  arc = derive2 { name="arc"; version="1.0"; sha256="1arms8crr198i4niq1wvp8ig474hlgjx63q0m96f8w6fsz63knqy"; depends=[arules discretization Matrix R_utils]; };
+  archdata = derive2 { name="archdata"; version="1.1"; sha256="07ca51kl5imy6d9s0qi501xxl3zn4q3gbm0w8kvznfw8imclq17z"; depends=[]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="1.4"; sha256="1ymk56w07jj51p2r4g7qa4a3nyhnjrbn6igxgn6644mm0v118b8h"; depends=[XML]; };
-  archivist = derive2 { name="archivist"; version="2.0.3"; sha256="13yncsy3g213d9x6wsm05kaxkccfwwa6l9phc13asajw7dyiwirb"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; };
-  archivist_github = derive2 { name="archivist.github"; version="0.1"; sha256="0s6b5fcghm307n0z4pa6m1kg9a3w1cnlhy1hcs36pmbvlid6xva6"; depends=[archivist digest git2r httr jsonlite]; };
+  archivist = derive2 { name="archivist"; version="2.1.2"; sha256="1d6bm9hdaj1lfbismv50qdzz3v91pvw28ijjxvhnaa4yqq9qh967"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; };
+  archivist_github = derive2 { name="archivist.github"; version="0.2.2"; sha256="04xb2i47y12ic87gb2l30bldil0505h7s9601hq0afjg3npx6jq7"; depends=[archivist digest git2r httr jsonlite]; };
   arf3DS4 = derive2 { name="arf3DS4"; version="2.5-10"; sha256="12cbrk57c9m7fj1x7nfmcj1vp28wj0wymsjdz8ylxhm3jblbgmxc"; depends=[corpcor]; };
   arfima = derive2 { name="arfima"; version="1.3-4"; sha256="0348zkr8h5la1vh66fifl1fn21hp03k34zv5ga29crmwvvsvk8pi"; depends=[ltsa]; };
   argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
-  argparse = derive2 { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[findpython getopt proto rjson]; };
-  argparser = derive2 { name="argparser"; version="0.3"; sha256="1lwlkrh8hq4p02jmb76nss9qjrgyf5fqqzifv9z8ff1lk7szgmy4"; depends=[]; };
-  arm = derive2 { name="arm"; version="1.8-6"; sha256="1bdjzq1da9nwfll4ial74ln920f2i19n4mwc5f4a5lwqrk4c69c7"; depends=[abind coda lme4 MASS Matrix nlme]; };
+  argparse = derive2 { name="argparse"; version="1.0.4"; sha256="1qyca2kmvks338v48g7bqzg3gc6vn3cynwn77liqk42kwd327g8g"; depends=[findpython getopt proto rjson]; };
+  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_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]; };
-  arrApply = derive2 { name="arrApply"; version="1.0.4"; sha256="0sm0msprajh6mc36pjc8dkhiqmk6553gra43p5kg444lfw57yd57"; depends=[Rcpp RcppArmadillo]; };
-  arrayhelpers = derive2 { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
+  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=[]; };
-  artfima = derive2 { name="artfima"; version="1.2"; sha256="1a4kagi3lh8fbs75zy30hbd4jcm88a9ngrxj52l97hb910w20wz1"; depends=[gsl ltsa]; };
-  arules = derive2 { name="arules"; version="1.4-0"; sha256="1xgawdl3zb4hlydqwqwffjh9d8k1iwpcr43bkhz9v8hs7capn948"; depends=[Matrix]; };
+  arsenal = derive2 { name="arsenal"; version="0.2.0"; sha256="1rwzgza4dy1xyi0p157yfhwr1bwwk6bxbkb31752av34nvddl4cm"; 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]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
-  arulesViz = derive2 { name="arulesViz"; version="1.1-0"; sha256="0kapvhrbxsn8pw6gfabnswzzgwgs621riq54xrlswicn5p2ywgxy"; depends=[arules colorspace igraph scatterplot3d seriation vcd]; };
+  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]; };
+  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.44"; sha256="08f04vvd0v22l56mq1f0nmpi5qr085kc2lax3yd74jxcybn5nrnk"; depends=[]; };
-  asbio = derive2 { name="asbio"; version="1.3-1"; sha256="1avzy32fblvn977ciri96gr1b8iia3yc3546n69c8lvy3ybdp4fb"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
+  asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; };
+  asbio = derive2 { name="asbio"; version="1.3-4"; sha256="02jpbc4lsca6bvp8ljv7nb452diz7maas6y3kjg07v3hgmwrkwvy"; depends=[deSolve lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; };
   ascii = derive2 { name="ascii"; version="2.1"; sha256="19dfbp7k4bjxjn8wdzhbmz7g3za6gn8vcnd5qkm4dz7gg1fg7b8p"; depends=[]; };
-  asd = derive2 { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnls0s7y7r0g211b5zagq20z3"; depends=[mvtnorm]; };
+  asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; };
   asdreader = derive2 { name="asdreader"; version="0.1-2"; sha256="0lfm0c5nzm276zaaxxwkpkqca5xg9r6ysfpgl6wvdbbvs9s83x4a"; depends=[]; };
   ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; };
-  asht = derive2 { name="asht"; version="0.5"; sha256="04wlvn4j8c8c3sxsa9ydb1garb7px768xvrnr6ywhb722srwi5gy"; depends=[bpcp coin exact2x2 exactci ssanv]; };
-  asnipe = derive2 { name="asnipe"; version="0.85"; sha256="0mp8gbi0390hdrdyhsmyj100w1zzzj78cyilkr9fzp176qqy1b6c"; 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]; };
+  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=[]; };
-  asremlPlus = derive2 { name="asremlPlus"; version="2.0-3"; sha256="0by2d8inwgyi79gqiivgxkm1xxy58jzyp4n76q21kwzqxj8agjgk"; depends=[dae ggplot2]; };
-  assertive = derive2 { name="assertive"; version="0.3-2"; sha256="11zyia1pynr82zc98cdlv7zfpg7ncx0gg2a4ry7sy5n06l4nvcrs"; 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-5"; sha256="0w43pplkqc51cxpfhni7q4hiqy6pq5s7rhwi9ja73yfglrh1rnrk"; 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]; };
+  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]; };
   assertive_data = derive2 { name="assertive.data"; version="0.0-1"; sha256="0pjw7rf76d99awd8i4krmhbyks39lx89c9pb4j49nmz3w6x3z233"; depends=[assertive_base assertive_strings]; };
   assertive_data_uk = derive2 { name="assertive.data.uk"; version="0.0-1"; sha256="0z2hpvfl34zzy9sncmihcj1ir5nnm9d05j7ip7j83by2pfwsjdhf"; depends=[assertive_base assertive_strings]; };
   assertive_data_us = derive2 { name="assertive.data.us"; version="0.0-1"; sha256="0nfwfkaczbmxaj4bpyibcvsypigkn5j2syn2wb4d2grm7virk9bk"; depends=[assertive_base assertive_strings]; };
-  assertive_datetimes = derive2 { name="assertive.datetimes"; version="0.0-1"; sha256="1fm85kzpdfzg8f6c7janpk5p6s4llk9yghmiwwqm54d4dgjkav10"; depends=[assertive_base assertive_types]; };
-  assertive_files = derive2 { name="assertive.files"; version="0.0-1"; sha256="0fc0qki4kpdq0zw51s2xc9gxrzsngx4mb859m8x16k2phmy83z1z"; depends=[assertive_base assertive_numbers]; };
+  assertive_datetimes = derive2 { name="assertive.datetimes"; version="0.0-2"; sha256="00a98fx8p3pr3ckayh8wmxmm4rz01s67wah9697m92yci6pv3m78"; depends=[assertive_base assertive_types]; };
+  assertive_files = derive2 { name="assertive.files"; version="0.0-2"; sha256="02pfz8j5vwcj5kl6zca46894li7lxwnlrr29j922f14ay6kdssmy"; depends=[assertive_base assertive_numbers]; };
   assertive_matrices = derive2 { name="assertive.matrices"; version="0.0-1"; sha256="1vk0i860r87rc5x0navai8xx9ixqyp96waxlk6j5p8y8hrpiyyif"; depends=[assertive_base]; };
   assertive_models = derive2 { name="assertive.models"; version="0.0-1"; sha256="1pkyssavld57njmv545bfa3a7dmyrgpsvr9vdhqmrmcpc55w89cj"; depends=[assertive_base]; };
-  assertive_numbers = derive2 { name="assertive.numbers"; version="0.0-1"; sha256="0wsnk6nxcxhbq09gzrp3g7l4nzxyhkbxiyv4yzh1hqqqry066hsa"; depends=[assertive_base]; };
-  assertive_properties = derive2 { name="assertive.properties"; version="0.0-2"; sha256="1bh9h56zq6yrhvsjm9pzdz30f2hb1k51rvsn9y1ifhn8syvzvpnf"; depends=[assertive_base]; };
-  assertive_reflection = derive2 { name="assertive.reflection"; version="0.0-2"; sha256="1mr1fi3ij8srpgl812imi0jyi44gnyhrrr4x5s1lwn4mwzjw657r"; depends=[assertive_base]; };
-  assertive_sets = derive2 { name="assertive.sets"; version="0.0-2"; sha256="0azs5nqzm03m1f5yhci49y51phnw85yk2yk9a8qka3mcd0kin9rw"; depends=[assertive_base]; };
-  assertive_strings = derive2 { name="assertive.strings"; version="0.0-2"; sha256="0181mj61fjj3gz74zwr6cb4mq7fclsbyh1zdlnpfmy3vzpmcpsb5"; depends=[assertive_base assertive_types]; };
-  assertive_types = derive2 { name="assertive.types"; version="0.0-2"; sha256="0s2yq8ycrmpr5m35psz4546shrcp5q1rz28pmh3s5f5y7gvqidxa"; depends=[assertive_base assertive_properties]; };
-  assertr = derive2 { name="assertr"; version="1.0.0"; sha256="0z7cgksjc0a7niar9f26f0512ln0a7cifyqcfrbhar552dnkg33i"; depends=[dplyr lazyeval MASS]; };
+  assertive_numbers = derive2 { name="assertive.numbers"; version="0.0-2"; sha256="0jc3ss64j4m7bjydhagwwmka5n7c72vpw4kfcch0m5jvkq5qrqds"; depends=[assertive_base]; };
+  assertive_properties = derive2 { name="assertive.properties"; version="0.0-4"; sha256="0sqs54acs9qk9kvm32rxzfbzxz1l8mjahpfnw7r30z2brgz661jw"; depends=[assertive_base]; };
+  assertive_reflection = derive2 { name="assertive.reflection"; version="0.0-4"; sha256="19zmsbn00crfqm0kwd9ys5gv87xs3gi6wmlikrz9xiwzm7hp4dhj"; depends=[assertive_base]; };
+  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=[]; };
+  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=[]; };
   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.5"; sha256="16zgjc5x5dzscvb1cki65p23c3kp1rad2x82bjcr4i0hg8xqs4ig"; depends=[fields IDPmisc multitaper]; };
+  astrochron = derive2 { name="astrochron"; version="0.6.5"; sha256="141nw03ggxc4p297g799kvk15sa6n5apf733kg7w9bbfgqwm4aa5"; 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.3"; sha256="01bslr6hww029097244r5l4bz4v7z46gpihw39har8h0xicl6ywk"; depends=[]; };
+  astsa = derive2 { name="astsa"; version="1.7"; sha256="1rzl1ayzv8lnn2009j4v667pp8sxdbn7qbqqyjpq00c75f4wss6x"; depends=[MASS]; };
   asymLD = derive2 { name="asymLD"; version="0.1"; sha256="1q05pxwn6arpalspgf2m0cym4ivnwyv94i58k9kaihd37kvm5lgc"; depends=[]; };
+  asymmetry = derive2 { name="asymmetry"; version="1.2"; sha256="08xq0m3z0z8j875792hx6c3i7ssdxi62mbnpchsvwwa930nzdk3j"; depends=[gplots rJava smacof]; };
   asympTest = derive2 { name="asympTest"; version="0.1.3"; sha256="11nlkgws3y8xbz3yli55414a2rkk7367q9q5r2ssa61jaiimibhh"; depends=[]; };
   asypow = derive2 { name="asypow"; version="2015.6.25"; sha256="0il38djkmw5ka7czpalmhq6yycx7flpdpgbd7p5nx52rsjdv49mj"; depends=[]; };
   atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; };
   atsd = derive2 { name="atsd"; version="1.0.8441"; sha256="1jz2bdgvk1wamrm8r9ygprhyf0z3mdk9c1pwlb4bfmwvbnqd0yqa"; depends=[httr RCurl]; };
+  attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; };
   attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
   auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; };
   aucm = derive2 { name="aucm"; version="2016.1-2"; sha256="1nyxxyivs6inq8r18x7fl3zkpn75sczwnbzsv672nzdlqj5d2b5f"; depends=[kyotil]; };
   audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   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.1"; sha256="0yi6n60b72qw20bp2hchxn653c3a9x2yvgawkqs31xbkq0s50rbc"; depends=[fields ggplot2 mapproj maps viridis]; };
   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]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-0"; sha256="08h51bh1m3d47nprd5z7v3k3lkrixbxwinr73zd5442wskf4x82v"; depends=[Amelia jsonlite Rcpp urca vars]; };
-  averisk = derive2 { name="averisk"; version="1.0.1"; sha256="18gr7nv826sxh085rd8vqbg6isbhans47a2prff2rxwy9jjn8dvg"; depends=[MASS]; };
-  aws = derive2 { name="aws"; version="1.9-4"; sha256="11vbsg4yhnl4995m8gq5gykrlk61y3a618g2zxkc9wdf5z4xqdny"; depends=[awsMethods gsl]; };
-  aws_signature = derive2 { name="aws.signature"; version="0.2.0"; sha256="0g2cxhvf27h1in9iwb74y85rg3w4w4py608f2ybdjgix3lxk60ag"; depends=[digest]; };
-  awsMethods = derive2 { name="awsMethods"; version="1.0-3.1"; sha256="0iswk1ijnxwik66crcplldkbfp5flbgk15xap1ys2jp6nwhlw3qw"; depends=[]; };
+  averisk = derive2 { name="averisk"; version="1.0.2"; sha256="0k7f0l7bx76q5x8cam2z0q6akc9a6zj0pj0644v8gbr40n2y5snz"; 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]; };
+  aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; };
+  aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; };
+  aws_signature = derive2 { name="aws.signature"; version="0.2.6"; sha256="0cd92kymlmcm1940s57p025blckbvavwx9rsrrsn13p7b03xwakf"; depends=[base64enc digest]; };
+  aws_sns = derive2 { name="aws.sns"; version="0.1.5"; sha256="1l013yczlvgbi07xfdslfrwmnc39j58f6kfqwa8j4kdxb0h58lq4"; depends=[aws_signature httr jsonlite xml2]; };
+  aws_sqs = derive2 { name="aws.sqs"; version="0.1.8"; sha256="1qgq2jbm523jb4qhzjbpq2f04saanwarz6nnhyn4g3dliv3fhsf6"; depends=[aws_signature httr jsonlite xml2]; };
+  awsMethods = derive2 { name="awsMethods"; version="1.0-4"; sha256="0n4mxn9fkqkvv19mfaqhrmhwhmkxiahfnls47b5ki3a3gsr6cm8l"; depends=[]; };
+  awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; };
   aylmer = derive2 { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
   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.1"; sha256="0bfxizypi3nnkv2ycvlvsly9zhf0yyln2x10ayhgxgcj1abmg57y"; depends=[Rcpp]; };
+  bWGR = derive2 { name="bWGR"; version="1.3.2"; sha256="0c0fj8w6gzkcbpfw68hvdp3ihjdwpnplqgnxnj7zp5cxac996vs8"; depends=[Rcpp]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
-  babel = derive2 { name="babel"; version="0.2-6"; sha256="1dsxjnhr0cky7wlzz8pr8rn3cldfcyrh8v6gn2ba4abr0df7i4dd"; depends=[edgeR]; };
+  babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
   babynames = derive2 { name="babynames"; version="0.2.1"; sha256="1knzr0pn77k8krinp8pmlzf07v8597g2iby4mayig91cna1m0psx"; depends=[]; };
-  backShift = derive2 { name="backShift"; version="0.1.3"; sha256="0l4i3z7iwacr64g8n4gwjncxgmkcf5jz2w9l2xy3l90wlnfd15rp"; depends=[clue ggplot2 igraph jointDiag matrixcalc pcalg reshape2]; };
-  backpipe = derive2 { name="backpipe"; version="0.1.5"; sha256="0syna8mpv4cxx7q4yii14qvnn60mx8nvyjnq81h4ffpavjg6wi6c"; depends=[]; };
-  backports = derive2 { name="backports"; version="1.0.2"; sha256="136nyq06f4pincn85xqgqrf6lkhlqx0gynk4bz6d40va85iswwpp"; depends=[stringi]; };
+  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=[]; };
+  backports = derive2 { name="backports"; version="1.0.5"; sha256="1pn1ii8vbkgxcqvx52kzsbwf9gkn9fp33388087zky2hmdzdirn0"; depends=[]; };
   backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; };
   backtestGraphics = derive2 { name="backtestGraphics"; version="0.1.6"; sha256="14l9dbkbcx4kl45kpjbq4ihzf47j859khhd1db40vnp8x57g9xcx"; depends=[dplyr dygraphs scales shiny xts]; };
-  bacr = derive2 { name="bacr"; version="1.0"; sha256="1as9vfzwv8aix44mr0j3av0ghnqmmbcs6w0jpwbjrvxkb7bhxgdm"; depends=[MCMCpack]; };
+  bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; };
+  badgecreatr = derive2 { name="badgecreatr"; version="0.1.0"; sha256="070zb5jw817s9ykqc3dvzjqk48612gydkdc31svc0ji01s1y1545"; depends=[stringr]; };
   bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
-  bamdit = derive2 { name="bamdit"; version="2.0.1"; sha256="105y4cayymqhd3f7dk297syv966pba9cjg6dx9jabcximicdw4l9"; depends=[ggplot2 gridExtra R2jags rjags]; };
+  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]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
-  bapred = derive2 { name="bapred"; version="0.3"; sha256="0jfg5cz8ra289z5mym621231cm43472gkiss7j66dbm3i4n94ygj"; depends=[FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
+  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]; };
+  bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
   barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
-  bartMachine = derive2 { name="bartMachine"; version="1.2.1"; sha256="0r6gr608y0xb14nlq1smwny79hnij4dmi4jsqxvsf97v3nzbgd4r"; depends=[bartMachineJARs car missForest randomForest rJava]; };
+  bartMachine = derive2 { name="bartMachine"; version="1.2.3"; sha256="15bv7q64ifjdg5ppx7vp3i3agil6dwirk5cf02lc243hmlg5lk1i"; depends=[bartMachineJARs car missForest randomForest rJava]; };
   bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.0"; sha256="1vnicq9amayxh69jqgly8jm7hvgjr22kvm1g6y2n7vphz70p9cq9"; depends=[rJava]; };
-  base64 = derive2 { name="base64"; version="1.1"; sha256="1wn3zj1qlgybzid4nr6hvlyqg1rp2dwfh88vxrfby2fy2ba1nl5x"; depends=[]; };
+  base64 = derive2 { name="base64"; version="2.0"; sha256="1labh0ycdm2xcjssj8bhnyjvbk44mcdsi0rb2p8rfqa428mrq9cf"; depends=[openssl]; };
   base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
-  basefun = derive2 { name="basefun"; version="0.0-30"; sha256="149s2giv1nj2l85lxzalah0c7h441v2kngjv2mj13fl1k8nbxgfl"; depends=[Matrix orthopolynom polynom variables]; };
+  base64url = derive2 { name="base64url"; version="1.1"; sha256="1f0asnf5ri55q6mhjkv7lfhr2hncs65vrykmr80r5sxsha6bqndz"; depends=[backports]; };
+  basefun = derive2 { name="basefun"; version="0.0-35"; sha256="12sakwz9g3w0w4di2i0l12nk5lmdniqhiq2nvmzbdy3vs4n06m3i"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
-  basicspace = derive2 { name="basicspace"; version="0.17"; sha256="1aq2w3lk3ksb60x21cgwayf151nhfcwbcxskbxlgdzs3i2r00b48"; depends=[]; };
+  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]; };
   batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
   batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
-  batchmeans = derive2 { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb56pi0rv9hchlghjr95pflmmpwhblqfq27djss2"; depends=[]; };
+  batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; };
+  batchtools = derive2 { name="batchtools"; version="0.9.2"; sha256="0hi2bxfx2gvsr1vssydi39595kxwb0qwk8w9xvwbhc7n92gc9bwf"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi]; };
   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]; };
   bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; };
-  bayesDem = derive2 { name="bayesDem"; version="2.5-0"; sha256="0iz4cysiqkyia61mslgbiczsqxlmdism3vkwihm50xly5g1fvhhk"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; };
-  bayesGARCH = derive2 { name="bayesGARCH"; version="2.0.2"; sha256="1fl1sdila3b7a6ikmay1bxyx6am2mqa9nvf29b9r38002dj5ylz2"; depends=[coda mvtnorm]; };
-  bayesLife = derive2 { name="bayesLife"; version="3.0-0"; sha256="0ssmg5yrwyx53lj8iicpnrngpn8gjdxd47xvndb110k7cqzkfyf0"; depends=[bayesTFR car coda hett wpp2015]; };
+  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]; };
+  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-1"; sha256="0wkvvh7ad484cil736rg54ikcg9gdmpprz5y3ai91jjs7ri4mklw"; depends=[abind bayesLife bayesTFR fields googleVis plyr rworldmap wpp2012 wpp2015]; };
-  bayesQR = derive2 { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
+  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-1"; sha256="0zpjf2r48z9jsp97jml26ax57pc1mbbs2bvsih0b8j384npb95q8"; depends=[coda MASS mvtnorm wpp2015]; };
-  bayesboot = derive2 { name="bayesboot"; version="0.2.0"; sha256="0l2wlj8sar1p404ikrq5z4738757cwiq7l2rj8dvxir33v0gil0q"; depends=[HDInterval plyr]; };
+  bayesTFR = derive2 { name="bayesTFR"; version="5.0-5"; sha256="091yzazvj66g6l9997qgnybbhvidfd9gr1wj15b7r3ji0cigywkm"; 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]; };
+  bayesianETAS = derive2 { name="bayesianETAS"; version="1.0.3"; sha256="0nbif0b6lcik2kh948zg5ska5mvkdsfr0dg8ndnfpscm2mp7y1dg"; depends=[]; };
+  bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
   bayesm = derive2 { name="bayesm"; version="3.0-2"; sha256="014l14k8fraxjqfch2s6ydgp1mcljvj4cgrznjyz2l35fwj3rcf3"; depends=[Rcpp RcppArmadillo]; };
-  bayesmeta = derive2 { name="bayesmeta"; version="1.1"; sha256="15f81n8pnrq1s49gw0bzkc8gawn7m2rj5d24bbxak64jkxclgkd9"; depends=[]; };
+  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]; };
   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]; };
   bayou = derive2 { name="bayou"; version="1.1.0"; sha256="1ndd7lygphngvn4a432616f6anmhxbdzmkksrhpl76xvrw5agwkc"; depends=[ape coda denstrip fitdistrplus foreach geiger MASS mnormt phytools Rcpp RcppArmadillo]; };
+  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]; };
   bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; };
-  bc3net = derive2 { name="bc3net"; version="1.0.3"; sha256="0plzi5ncm3izw4k97rlyrvbnhc5zcd8mv2ldp3wy9zav0x168jda"; depends=[c3net igraph infotheo lattice Matrix]; };
-  bcRep = derive2 { name="bcRep"; version="1.3.2"; sha256="0n6pcmmzrl2mv2iw2n7hc32ms6b4gwniwgpmwf4kb92bgi0yjbk4"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; };
+  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]; };
+  bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; };
   bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; };
   bcp = derive2 { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; };
   bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
@@ -3033,144 +3722,185 @@ in with self; {
   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]; };
-  bdots = derive2 { name="bdots"; version="0.1.7"; sha256="053www3dydrzcakv6yb4ymwqhwzb88hxmgnnazzs19gpwmf7fkfm"; depends=[doParallel doRNG foreach mvtnorm nlme]; };
+  bdots = derive2 { name="bdots"; version="0.1.9"; sha256="0nwcwzrh7pdxsyqnhhgd2jb9icgi7y9irlzlpz97f61mrr9n18ry"; depends=[doParallel doRNG foreach mvtnorm nlme]; };
+  bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; };
   bdpv = derive2 { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
+  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.1.0"; sha256="1f837i48gmspx9xrnxzsgdbg6ykxmvkp8l20y19yd9iakhv7k3jy"; depends=[ggplot2 maps plotrix plyr sqldf taxize treemap]; };
+  bdvis = derive2 { name="bdvis"; version="0.2.9"; sha256="0qgxi9i2vblc219d0gn81mkqnpn9i6c84fczc5lrbcf9a2x0q88g"; 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]; };
   beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
   beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
-  bedr = derive2 { name="bedr"; version="1.0.2"; sha256="0sbhzbqmjr9x075dsv0vykfzswkqxy48baaas3n8g251lw9c5fmk"; depends=[data_table R_utils testthat VennDiagram yaml]; };
+  beanz = derive2 { name="beanz"; version="1.7.1"; sha256="1x810fwciw5ca9710z8km5ccq4dspz6c7jx0kx800k7w648lnvqq"; depends=[BH Rcpp RcppEigen rstan StanHeaders survival]; };
+  bedr = derive2 { name="bedr"; version="1.0.3"; sha256="1v1r5rndpd1wbwcsyzpqwag0dswicdppvs4qq28zr1acgi8cy722"; depends=[data_table R_utils testthat VennDiagram yaml]; };
   beepr = derive2 { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; };
-  beeswarm = derive2 { name="beeswarm"; version="0.2.1"; sha256="07fiapl7pl610h3662jx22914mfvdh4rmnmmzhk2adiyyymclnn2"; depends=[]; };
+  beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
+  belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
-  benchmarkme = derive2 { name="benchmarkme"; version="0.2.3"; sha256="05ncmgddq83v1ndcyfa30g367a4rv1zvsxh0sn640c6qx2q1q3xy"; depends=[benchmarkmeData httr Matrix]; };
-  benchmarkmeData = derive2 { name="benchmarkmeData"; version="0.2.2"; sha256="0b9m9w9948jga0cxrj9mcp6kxvgwnzr316jiyb988a901jmg04wn"; depends=[]; };
-  benford_analysis = derive2 { name="benford.analysis"; version="0.1.3"; sha256="0mhi1yf3p9lffl1mcjsjxn3cay1pcjvpgg39cxr9v0nqpkyycfbh"; depends=[data_table]; };
+  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]; };
   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.9.0"; sha256="0j3nfby1c54y3p66zwb7826z98x2b0isndabfm1ma90y9nbl2p1m"; depends=[]; };
-  bestglm = derive2 { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
+  berryFunctions = derive2 { name="berryFunctions"; version="1.14.0"; sha256="16332811v3ivddklif5n3mwjp02c2hzysbj4vc6z6v6sxd1jvjq2"; depends=[abind]; };
+  bestglm = derive2 { name="bestglm"; version="0.35"; sha256="047gb82hgivgafx5b267gpgq9y11m74rag5j05rprmv9nz43hdqj"; depends=[lattice leaps]; };
   betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; };
-  betalink = derive2 { name="betalink"; version="2.2.0"; sha256="0gqkrrak44ipnl2k4bb6a52c65csgnh4jha00yrh8cclbfsv75wf"; depends=[igraph plyr stringr]; };
-  betapart = derive2 { name="betapart"; version="1.3"; sha256="0h2y2c3q6njzh2rlxh8izgkrq9y7abkbb0b13f2iyj9pnalvdv52"; depends=[ape geometry picante rcdd]; };
+  betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; };
+  betapart = derive2 { name="betapart"; version="1.4-1"; sha256="1ldz6hr08vsgvz0h9ilsm5ab5fyppjpnz215lhri80x7biym3c0q"; depends=[ape geometry picante rcdd]; };
   betaper = derive2 { name="betaper"; version="1.1-0"; sha256="1gr533iw71n2sq8gga9kzlah7k28cnlwxb2yh562gw6mh1axmidm"; depends=[ellipse vegan]; };
-  betareg = derive2 { name="betareg"; version="3.0-5"; sha256="1zpj1x5jvkn7d8jln16vr4xziahng0f54vb4gc4vs03z7c853i4a"; depends=[flexmix Formula lmtest modeltools sandwich]; };
+  betareg = derive2 { name="betareg"; version="3.1-0"; sha256="05s5lszj22186xhvk0dxgz4vqfvmss40pbh147mwqkz1h48z5pf7"; depends=[flexmix Formula lmtest modeltools sandwich]; };
   betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; };
-  betategarch = derive2 { name="betategarch"; version="3.2"; sha256="0x3l1zvdp8r7mam7fvdlh1w3dwpjwj86n0ysfk8g824p4mn2wsgv"; depends=[zoo]; };
+  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]; };
   bezier = derive2 { name="bezier"; version="1.1"; sha256="1bhqf1zbshkf1x8mgqp4mkgdxk9jxi51xj6i47kqkyn9gbdzch0c"; depends=[]; };
-  bfa = derive2 { name="bfa"; version="0.3.1"; sha256="02vnbm77blllb74kll8w1i91k0llk43vq60aqjwpc5kqmzy652pk"; depends=[coda Rcpp RcppArmadillo]; };
+  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-30"; sha256="09im14hhykg9a3rfl4pr2af36whpxfh8dvqnsjz88jl0wzw77i3k"; depends=[Rcpp]; };
+  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]; };
   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.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[car combinat lattice mvtnorm]; };
+  bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; };
+  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]; };
+  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.1"; sha256="09pv4xll609y4nfgalssyfgqd8c74zc75bbyq4d8h94yyhw1d8d0"; depends=[Formula Rcpp RcppArmadillo]; };
+  bigFastlm = derive2 { name="bigFastlm"; version="0.0.1"; sha256="00i5hq3i837hj5kszm9rqax86g273aklxwikrabzwnyai9ziz8qa"; depends=[BH bigmemory Rcpp RcppEigen]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
+  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]; };
   bigalgebra = derive2 { name="bigalgebra"; version="0.8.4"; sha256="19rv552ac0q9djc1yvpldkc0lipdf6q143m9dnndpsqs7ayqlr4g"; depends=[BH bigmemory]; };
   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.0-1"; sha256="09yahcklcnrf03rsr2j01gh4n3mlnzjsvv13nlhg48r88r6wizmy"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
+  biglasso = derive2 { name="biglasso"; version="1.3-3"; sha256="1mv9zildvkq8a5rvhr8hr1d7v3zn58j5bjc17wz75mqk0dsfwdjs"; 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.18"; sha256="1yl4izrq00pcsnzji4qx2yfrfk15iwf0v4r8rdm62lbaj0vx3haf"; depends=[BH bigmemory_sri Rcpp]; };
+  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=[]; };
   bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; };
   bigpca = derive2 { name="bigpca"; version="1.0.3"; sha256="0hqkaamj5fyp2jw5727pkvmnqr194ngh4hlja14qmj81nr26a88p"; depends=[biganalytics bigmemory bigmemory_sri irlba NCmisc reader]; };
-  bigrquery = derive2 { name="bigrquery"; version="0.2.0"; sha256="15hwi4n574j03nh2brr6qyfigkg25mj4pq4fm0igyg45cm3ixdw8"; depends=[assertthat dplyr httr jsonlite R6]; };
-  bigsplines = derive2 { name="bigsplines"; version="1.0-8"; sha256="00w8jv5nlkm12djry69w11dzpg85x4ygriq9g9d3x0saisii5x12"; depends=[]; };
+  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]; };
   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=[]; };
   bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
   bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
   bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; };
   binGroup = derive2 { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
   binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
-  binaryLogic = derive2 { name="binaryLogic"; version="0.3.2"; sha256="04ghil0h560zm2q4rndyxsxgp9jzh6xx3apx2m8y84p4c9h2q695"; depends=[]; };
+  binaryLogic = derive2 { name="binaryLogic"; version="0.3.5"; sha256="1zaqwkrr1dyxsbfa3zvz1ciipmqddl932jkw9r00qmnhdh3ybpa6"; depends=[]; };
   binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; };
   bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
-  binequality = derive2 { name="binequality"; version="0.6.1"; sha256="18pcz5b65zk6fwh597pcbpyy0j7gkxp5swwadxvsa3cainvyd07n"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
+  bindr = derive2 { name="bindr"; version="0.1"; sha256="0d95ifm0x4mrfzi20xf39f5pzd7rfzqsld0vjqf6xzga5rhnd8fc"; depends=[]; };
+  bindrcpp = derive2 { name="bindrcpp"; version="0.1"; sha256="0djmmvkkf9z291r1h41g542v81qccqqh50xdn5y7za1kaxmh9pj1"; depends=[bindr plogr Rcpp]; };
+  binequality = derive2 { name="binequality"; version="1.0.1"; sha256="0an73s9nj96hm83va4p5zfv2sv8vnp1fwjwx4ls5carg8f5pmfv5"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
+  binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; };
   bingat = derive2 { name="bingat"; version="1.2.2"; sha256="1vx6zm6vvv7nzp781fa6mb2iq6hmndi5f3yml15ydw4cx3f8r0xd"; depends=[doParallel foreach genalg gplots matrixStats network]; };
   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-3"; sha256="0hryaf0y3yjxp84c0k80mhxj8zzlad697bv2yrvcjvllkzdvzbm7"; depends=[binom]; };
+  binomSamSize = derive2 { name="binomSamSize"; version="0.1-4"; sha256="0m7g4fagw44l23ancisnp41928pwkr0cwyi1015nbccqbgrw2g3n"; 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=[]; };
   binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; };
   binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; };
-  binseqtest = derive2 { name="binseqtest"; version="1.0.1"; sha256="0snlrwmmmwrl3fj8652rllgays737m020qc3fqv4sfp1vn6aayng"; depends=[clinfun]; };
+  binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; };
+  binsmooth = derive2 { name="binsmooth"; version="0.1.0"; sha256="1zlw4zmkckg7rwf4hx8wyr2yl644xkdkazayysy99saysr9pk2c9"; depends=[ineq pracma triangle]; };
+  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.2-4"; sha256="0kzbg4rzpbs3qicbg9cfqggm9fzy81waw6b0n1kn2yc9azlqwgvz"; depends=[]; };
+  bio3d = derive2 { name="bio3d"; version="2.3-1"; sha256="0dm582jam4ll5q82vfxf1gjrmv1qzl60kws6vmxjx91d5jwf1fqy"; depends=[Rcpp]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-  biogas = derive2 { name="biogas"; version="1.2.1"; sha256="0prp9s60d133s94n78m2rvlaph98j1xpsw2ykwkp33mq4sgjqbkq"; depends=[]; };
-  biogram = derive2 { name="biogram"; version="1.2"; sha256="1kklidp1nm9jb0nvlhlhxklh4fp86plfsslp4ajnv8i4rc6h0v19"; depends=[bit entropy slam]; };
-  bioinactivation = derive2 { name="bioinactivation"; version="1.1.2"; sha256="1hcn29nvq9sf3ayc5nlyxiihqacccbqikcxlypxxq5x7kv20ml9a"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS]; };
-  biom = derive2 { name="biom"; version="0.3.12"; sha256="18fmzp2zqjk7wm39yjlln7mpw5vw01m5kmivjb26sd6725w7zlaa"; depends=[Matrix plyr RJSONIO]; };
-  biomartr = derive2 { name="biomartr"; version="0.0.3"; sha256="15ds9518kanr7ifc6xnswmj28asmqh7qm2nz8ll6ak1c97gwllmg"; depends=[biomaRt Biostrings data_table downloader dplyr httr RCurl readr stringr XML]; };
+  biogas = derive2 { name="biogas"; version="1.6.0"; sha256="100593ddrsl82hhpq289vs0gdasrm9fmwf6vhd530rp8k7y07j4a"; 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]; };
   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=[]; };
-  biorxivr = derive2 { name="biorxivr"; version="0.1.2"; sha256="1715i1wp9ja7ipw3awh9mw5whdnwjygf2m73z4pr2f57wyb11n7f"; depends=[XML]; };
+  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]; };
+  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.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[fields igraph MASS permute sna vegan]; };
+  bipartite = derive2 { name="bipartite"; version="2.07"; sha256="10gpmcnlnhv55ffff23xsmwbq58r2wvg54wyv1isa0jp4vh0b67x"; 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]; };
-  birk = derive2 { name="birk"; version="2.1.0"; sha256="00hzhv209wzgmngaq699f1sr003vwsk9s42s8pkli4qjlwzwqk12"; depends=[]; };
+  birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; };
   bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
   bisoreg = derive2 { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; };
   bit = derive2 { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; };
   bit64 = derive2 { name="bit64"; version="0.9-5"; sha256="0fz5m3fhvxgwjl76maag7yn0zdw24rx34gy6v77378fajag9yllg"; depends=[bit]; };
   bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; };
+  bitrugs = derive2 { name="bitrugs"; version="0.1"; sha256="0sqgp05b902mdldr4ckz4knmkbsqvgl1vx0l792cn2r437yqlgp3"; depends=[]; };
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
-  biwavelet = derive2 { name="biwavelet"; version="0.17.10"; sha256="0rvlpqfrgajaw5bifc3103ixj2akdhpcxqhgw9fv0r1c5kv98qz0"; depends=[fields]; };
+  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="0.2.2"; sha256="1n2bh7vy0fhxq20s4lnbhgig1012di34kfl61i0ap7pc6464kg8d"; depends=[]; };
-  blavaan = derive2 { name="blavaan"; version="0.1-2"; sha256="0g04554s11v2nybawvv635dgf3dajh12h2hlxlccjz5rslg27hb8"; depends=[lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
+  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]; };
+  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-2"; sha256="1jiicy21zhrnk04b74nxs4yp3g0mzcxxb6zn5wks12b1791ykrm6"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
+  blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blighty = derive2 { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
+  blkbox = derive2 { name="blkbox"; version="1.0"; sha256="14bl0b5w46gb7v8p94df5r56nj849r7jqisajagvd1irda3vkc7z"; depends=[bartMachine caret dplyr e1071 ggplot2 glmnet gtools kknn knitr magrittr nnet pamr party plyr pROC randomForest reshape reshape2 rJava rmarkdown shiny shinyjs stringr tibble tidyr xgboost]; };
   blkergm = derive2 { name="blkergm"; version="1.1"; sha256="0giknhcl14b4djn5k5v5n33b7bc3f8x6lx2h4jr25kpd89aynhq5"; depends=[ergm network statnet_common]; };
   blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
   blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; };
   blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; };
-  blockTools = derive2 { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs69rg73p5h09fi3vzagh845r00ivw4iv18anq40"; depends=[MASS]; };
-  blockcluster = derive2 { name="blockcluster"; version="4.0.2"; sha256="0pvsi56v2dm9mz9a2h401z5h07ln5hfrgch2r6jmgnyg26kxa72r"; depends=[Rcpp rtkore]; };
+  blob = derive2 { name="blob"; version="1.0.0"; sha256="0zjb3sbx4q36d69p2164im1nvpsdjz5mqa5rmncjziipgz6aix38"; depends=[tibble]; };
+  blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
+  blockcluster = derive2 { name="blockcluster"; version="4.2.1"; sha256="05fy6l0q0q0jmvyfph3wmlkniz4njkrzmhyy14hamzsiwn23cpiw"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
   blockmodeling = derive2 { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
   blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-  blocksdesign = derive2 { name="blocksdesign"; version="2.0"; sha256="0d99dp7wci89gc2iacq830ibvfx0qa90ds9l7h2zwr4knam4brzz"; depends=[crossdes]; };
+  blocksdesign = derive2 { name="blocksdesign"; version="2.4"; sha256="0nwcayxrp829599hlz860xkrm49ij1l6anxrf4gsvfgs4rlm380j"; depends=[crossdes]; };
   blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
-  blsAPI = derive2 { name="blsAPI"; version="0.1.3"; sha256="10jkfrl4xa3vzvh5rk3jdn5ix3hhqgbdg6h0wcijmgqhj8v9gj0j"; depends=[RCurl rjson]; };
+  blsAPI = derive2 { name="blsAPI"; version="0.1.7"; sha256="0q04vsmhxz5galdjcqrbabghfn747pi6zdpchj3xavcf6wx8xs5s"; depends=[RCurl rjson]; };
+  blscrapeR = derive2 { name="blscrapeR"; version="2.1.2"; sha256="0qyj1fnhb5cb425y3ws1rwpv6sm2bqx9j3gyk3l8m2yn5z6qmjns"; depends=[ggplot2 httr jsonlite magrittr]; };
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
   bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
   bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; };
+  bmixture = derive2 { name="bmixture"; version="0.3"; sha256="1q22wdg3909krdqg0vgkny9lq9l7j0cs99ay68aggqjd9kcgrl4g"; depends=[]; };
   bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
+  bmlm = derive2 { name="bmlm"; version="1.2.10"; sha256="1kng958v08vv54y3wbvf65rlpq6iwwfnr2gj0j3n05nq3c3qdm9n"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   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]; };
-  bnclassify = derive2 { name="bnclassify"; version="0.3.2"; sha256="0nbbna2qr57xvc7paqxaahff0r6gk92hz3gyk8v5kdb3hpcw8ph6"; depends=[assertthat entropy graph matrixStats RBGL rpart]; };
-  bnlearn = derive2 { name="bnlearn"; version="3.9"; sha256="19c3qda4lkzasgrjra0y3w8bg3jf9cp4lgaal7p43nlfani8y2xw"; depends=[]; };
+  bnlearn = derive2 { name="bnlearn"; version="4.1"; sha256="0ywj94m9jvwci3q1abld2yfpz0h48x4lbfqyqyg43pbzs3p7p6r0"; 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=[]; };
-  bnstruct = derive2 { name="bnstruct"; version="1.0"; sha256="1bc4q5gk56xmmsiglg8434hpl3lvbyg9hgv5xx5b8law6hn5znz4"; depends=[bitops igraph Matrix]; };
-  boa = derive2 { name="boa"; version="1.1.8-1"; sha256="15nkr24hgv1286h9b6sdhlpljnm98fi5mmpsygl76h24dayy3854"; depends=[]; };
+  bnspatial = derive2 { name="bnspatial"; version="1.0.1"; sha256="0cm4kqidjlb64rnjmiwsbjay8fjzwbmpm8k1bl1kz6nj4y532v6d"; depends=[doParallel foreach gRain gRbase raster]; };
+  bnstruct = derive2 { name="bnstruct"; version="1.0.2"; sha256="0n4gn1vhka694wdzignawyaca0rx2l0wjgw09fw42bkrswfjvxy1"; depends=[bitops igraph Matrix]; };
+  boa = derive2 { name="boa"; version="1.1.8-2"; sha256="04lhqk5qfvaz1jk90glr2yi5vq7cdy0w8m6g2lnzk359l9y41zhp"; depends=[]; };
   bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
-  bold = derive2 { name="bold"; version="0.3.0"; sha256="11b5zqyhvg3cc47mk8r7h219abj12paxcdb23gxqgkyrhlykkbks"; depends=[assertthat httr jsonlite plyr reshape stringr XML]; };
+  bold = derive2 { name="bold"; version="0.4.0"; sha256="09ib3h9a3cjcysf5503qh1vrxd79dycsd0rg0xkikrxljzmfmv4b"; depends=[assertthat data_table httr jsonlite plyr reshape stringr tibble xml2]; };
+  bookdown = derive2 { name="bookdown"; version="0.3"; sha256="0r9bchzg7im6psc3jphvshzbidc5bv5xaih1qg7b5518jy4iyvb9"; depends=[htmltools knitr rmarkdown yaml]; };
   boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; };
   boostSeq = derive2 { name="boostSeq"; version="1.0"; sha256="0sikyzhn1i6f6n7jnk1kb82j0x72rj8g5cimp2qx3fxz33i0asx6"; depends=[genetics lpSolveAPI]; };
-  boostmtree = derive2 { name="boostmtree"; version="1.0.0"; sha256="1fkr7r1y7hsd1iv2qshy13p2kqy9hl08q66vfb96ma3ipf7cnw1n"; depends=[nlme randomForestSRC]; };
+  boostmtree = derive2 { name="boostmtree"; version="1.1.0"; sha256="1k6cwiz6354xgmqyadm4vfrl4szcr2c9mgxgmmngdc28p7sm50i7"; depends=[nlme randomForestSRC]; };
   boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; };
   boot = derive2 { name="boot"; version="1.3-18"; sha256="0pi348vvgzn1ny54yxhw6kq6nl7rx9bpr9ji1a6wqs8ah5zj7z8j"; depends=[]; };
   bootES = derive2 { name="bootES"; version="1.2"; sha256="0hcaw1v80zspdsy4wr464lmgq33807i2f6n2dc3r7qqwa80g4zz0"; depends=[boot]; };
@@ -3178,107 +3908,137 @@ 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]; };
-  bootnet = derive2 { name="bootnet"; version="0.2"; sha256="1ij4hjgp4nnc6x0l38xvkv5i06r7rdddrfjhjsaipkdkrxdjki9z"; depends=[abind corpcor dplyr ggplot2 gtools IsingFit IsingSampler Matrix mvtnorm qgraph]; };
-  bootruin = derive2 { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
+  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="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
   boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
-  boral = derive2 { name="boral"; version="0.9.1"; sha256="1ls6is60d7h4zg5dhbgksjznfsffgim2pn6zgcvln7l6zl5di52s"; depends=[coda fishMod MASS mvtnorm R2jags]; };
+  boral = derive2 { name="boral"; version="1.2"; sha256="1xd9g3ll6ax363ip0wh5zpk8yw23pcv4wxlm2xxshmxyx0k9gqfk"; 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]; };
   boxplotdbl = derive2 { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
-  boxr = derive2 { name="boxr"; version="0.3.2"; sha256="0inwyvnx1846ng6b72y52ndx601ic4iw23ha499rj6ivrjm726ki"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; };
+  boxr = derive2 { name="boxr"; version="0.3.4"; sha256="0wx3x65rk1ma8bw5h4yskr7ii95ynkm7il22l1bj34kv9f4bfyj3"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; };
+  bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; };
   bpca = derive2 { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[rgl scatterplot3d]; };
-  bpcp = derive2 { name="bpcp"; version="1.3.1"; sha256="136wwxgs0cq1wk48r3xvh7ga2w5qmswbnxw9vg756imdzm1w6lnr"; depends=[]; };
+  bpcp = derive2 { name="bpcp"; version="1.3.4"; sha256="0l4x3n7lcwinnrh2sy386grisj1x7k1d5hll1k4bljg01p7lb475"; depends=[]; };
   bpkde = derive2 { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
+  bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; };
   bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; };
+  braQCA = derive2 { name="braQCA"; version="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.55.0"; sha256="11swjhpnnb6a2bq0xa0ai9jgzv0c481hc92rq1vpg1wzrlzz12rc"; depends=[abind ade4 boot cairoDevice data_table foreach ggplot2 Hmisc igraph oro_nifti plyr RGtk2 scales]; };
+  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]; };
   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]; };
+  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="2.0"; sha256="0x4hrvx6nd0k2gv7xvi9z8pl3cr94glm9s6fcna7ml8ag19dqwny"; depends=[]; };
+  breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; };
   breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; };
   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]; };
   bride = derive2 { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
-  brms = derive2 { name="brms"; version="0.8.0"; sha256="04dvfvpq0pb30gpiz9mzr799sd2irlqv1v9f7fjmfj19gildyhj9"; depends=[abind coda ggplot2 gridExtra lme4 loo Matrix rstan shinystan statmod]; };
+  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]; };
+  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.0"; sha256="1rjrf88wfbq1zzyxkrrajis6mrsv3zi4kdf7y8992bwfx53pwpph"; depends=[abind bayesplot coda evd ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan statmod]; };
   brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; };
-  broman = derive2 { name="broman"; version="0.62-1"; sha256="1hcwrzagm78gkllfz6jplwzirr082prsiykydfc90ai9m0in3wjk"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.4.0"; sha256="0k9sbb4c4ncgnrsdr9bcl8nr57xdygjhh19mm8c7ymnsr56xcvxp"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
-  brotli = derive2 { name="brotli"; version="0.6"; sha256="01v2y8mwzcw7sfaqbq26528fpwmpprbd7lnn3prs5rwm3d9mafaa"; depends=[]; };
+  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=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
-  brranching = derive2 { name="brranching"; version="0.1.0"; sha256="17n11i2wq16jzs1lk3wwyzfgacbm692g99vlakdqnr2a1c1vpfah"; depends=[ape httr taxize]; };
+  brranching = derive2 { name="brranching"; version="0.2.0"; sha256="0y99px2m02rl60qgf6pjbjv6isp8v1w9sny6p2icgsx4bwxjxmns"; depends=[ape curl httr phytools taxize]; };
+  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]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
+  bsplus = derive2 { name="bsplus"; version="0.1.0"; sha256="1hpjrmsn66brf1hpwfmg55jbpwbhvkz7sbr160z1cgq3hdhqm7r8"; depends=[htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
-  bst = derive2 { name="bst"; version="0.3-13"; sha256="1jpjwmwchhlqx2li26xh0n88647nnjz58vmjxsq0kp7jaigy0xbn"; depends=[doParallel foreach gbm rpart]; };
-  bsts = derive2 { name="bsts"; version="0.6.3"; sha256="1psr14nv20h1hzki32wsgyp23lbimbrchfbfaj1biwnl5xhhmrjm"; depends=[BH Boom BoomSpikeSlab xts zoo]; };
-  btergm = derive2 { name="btergm"; version="1.7.0"; sha256="1xip1cr8j9blq4xnkj05f7c4alhij1i1k48ywhqr0bq09pi4rylc"; depends=[boot coda ergm igraph Matrix network ROCR sna speedglm statnet statnet_common texreg xergm_common]; };
+  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]; };
   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=[]; };
+  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]; };
   bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; };
   bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; };
-  bvpSolve = derive2 { name="bvpSolve"; version="1.3.2"; sha256="1y6axzpbk7vnm2hsvihhci3cbbl61rlfc4kmfr335l77l6q2sd55"; depends=[deSolve rootSolve]; };
+  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]; };
   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.1.0"; sha256="0gp3mmw1s57wg6rvh78261l4nwqg0zpr98q27v389fz2scab637d"; depends=[Rcpp RcppArmadillo]; };
-  cOde = derive2 { name="cOde"; version="0.2.1"; sha256="1zbc4armnzjbf0n4a5vby4m2ls9xpf6dhllzm3f3d02cbywacijr"; depends=[]; };
+  cIRT = derive2 { name="cIRT"; version="1.2.0"; sha256="1qgcga9rk4xqz1i2rzwwf11sip3s3gni44czg9d8sjd725hx1pmz"; depends=[Rcpp RcppArmadillo]; };
+  cOde = derive2 { name="cOde"; version="0.2.2"; sha256="0v26ilbkg2af4mgn639mnslvvwlsq6il3pxx5brwdsd4816saav4"; depends=[]; };
   cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; };
-  ca = derive2 { name="ca"; version="0.64"; sha256="09496pzm7cms8v38vbyspsd2kvff3s31xpqlq4mf04sjh0vdahjs"; depends=[]; };
+  ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; };
   caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
   caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
+  cablecuttr = derive2 { name="cablecuttr"; version="0.1.1"; sha256="1v3zhaxkp1h6lack2qk0v4zxh6fd0ymjnikw6bs7k540w2vrbs1g"; depends=[httr jsonlite]; };
   cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
-  cairoDevice = derive2 { name="cairoDevice"; version="2.23"; sha256="0l83ssravr0jx6clvm8ppyh1hvyf8zkkl509hafphzfp29nkiamh"; depends=[]; };
-  calACS = derive2 { name="calACS"; version="2.2.1"; sha256="16vzkvcdx0ppf6q03j93g4lgzn3an9dcpj9c5d8k3z9dspvim5vq"; depends=[]; };
+  caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; depends=[binhf]; };
+  cairoDevice = derive2 { name="cairoDevice"; version="2.24"; sha256="1xbjxz1cxnwzvb6hjns2kk97krmx24chpyvjaa25xwmvy4x6qcps"; depends=[]; };
+  calACS = derive2 { name="calACS"; version="2.2.2"; sha256="0a53k2rzyjksb0ypr5zrask4a6mgiyrqx0l2z3lm218y8pk2jf1w"; depends=[]; };
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
   calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
   calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
+  callr = derive2 { name="callr"; version="1.0.0"; sha256="05gp4y69ixajvmhrh1qrn5cnzj9jhfdxrfxnm2l2xfisfa680mic"; depends=[]; };
   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]; };
-  camtrapR = derive2 { name="camtrapR"; version="0.98.0"; sha256="08hx3h4348hw3y230371pgvlw3q77srhang3mhlim7b48s38dmbf"; depends=[overlap rgdal secr sp]; };
-  cancerTiming = derive2 { name="cancerTiming"; version="3.1.5"; sha256="1hs93brw5cnk2fk114aqvdcf020wq6dmnhcirw93y4xm79bqyjx5"; depends=[gplots LearnBayes]; };
-  candisc = derive2 { name="candisc"; version="0.6-7"; sha256="1g2vypcniy94h462kylmzraa6q3ys9m0r1cn21dm8rzzjxid9g3g"; depends=[car heplots]; };
-  cape = derive2 { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd fdrtool igraph Matrix qpcR shape]; };
+  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]; };
+  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]; };
+  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.1.5"; sha256="1z3l3wgvxylnjsybnvcl7aphkp60xpx43xs0n9nnan07fcb2n7bd"; depends=[curl jsonlite]; };
-  capushe = derive2 { name="capushe"; version="1.1"; sha256="00rbsir00ibxa9r6b17sa1jryjxjjygzsan08pl9wa65r0gxzrkm"; depends=[MASS]; };
+  captr = derive2 { name="captr"; version="0.2.0"; sha256="04bg1d22n2h24w4j46fg30p1n85qvy5868sllrcwybrv4j15xh1f"; 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-1"; sha256="1wzgy2pcylhvgrlly8v3gi29gc3gimrhmjvhrr93b1cy0wwjj0wx"; depends=[MASS mgcv nnet quantreg]; };
+  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.3"; sha256="1r52pjywp2x5mm2hg296q893djkhlzh8d7vq9pg76qdpi0m9ralg"; depends=[lubridate nlme]; };
+  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-64"; sha256="1pgbqzivks6vpaw2pq72yv81a98dm264hmj2vnk4vhyvdi91ihq9"; depends=[car foreach ggplot2 lattice nlme plyr reshape2]; };
+  caret = derive2 { name="caret"; version="6.0-73"; sha256="1jzaqwv4glyqqnfbpalgajd0ag866247vvdh5i83ffqs1yhs984h"; 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=[]; };
-  cartography = derive2 { name="cartography"; version="1.2"; sha256="03p95vx3qhcf8kkb265229ki1njmhw3d56hypm9gq9wpnvk4gw6b"; depends=[classInt sp]; };
+  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]; };
   carx = derive2 { name="carx"; version="0.6.2"; sha256="1wijkpbv2x75ay9pba4sjazjpalrd31zclnnansmhghf1wiizciq"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; };
-  caschrono = derive2 { name="caschrono"; version="1.4"; sha256="1l9hmsacynh73kh14jrp7a42385v78znn9ll1jchzgkyz2x4dibw"; depends=[forecast Hmisc its timeSeries]; };
-  caseMatch = derive2 { name="caseMatch"; version="1.0.6"; sha256="0ak5q7pijmq359sm2vy5rr1szxv0kzg6ydka3ny24vsx2lx3fdrs"; depends=[]; };
+  caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; };
+  caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
-  catR = derive2 { name="catR"; version="3.6"; sha256="1a5wfi944x0a8bgknlgrdxqj5h2zz15lq8k0iavd1k8bifir3pdi"; depends=[]; };
-  catdap = derive2 { name="catdap"; version="1.2.2"; sha256="02rz5wqbbvh73gjfh4bg31qcpfa48b4bm3h1i19r3siajvqaxkkb"; depends=[]; };
+  catR = derive2 { name="catR"; version="3.12"; sha256="15db9mfpnrrghiksfrfqqwfhw6fwlqlabc12xq1szg010k343dvb"; depends=[]; };
+  catdap = derive2 { name="catdap"; version="1.2.4"; sha256="0vvrlbdjml1cxf6jafjycv0k3kzd2xy1zcwjv0rh3cswxmvpnh3a"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
   catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; };
   cati = derive2 { name="cati"; version="0.99.1"; sha256="0sg6qagv1wiygylgygjfn7v4n99ifaaa34qvaspmm9b4fyfcxqa5"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
-  catnet = derive2 { name="catnet"; version="1.14.8"; sha256="03y7ddjyra3cjq7savdgickmw82ncx4k01rn752sks6rpl6bjslc"; depends=[]; };
+  catlearn = derive2 { name="catlearn"; version="0.3"; sha256="1bqcv58g4111yjschzdikb130as4wv08pxppzwpjh4k2pg929jmk"; depends=[Rcpp]; };
+  catnet = derive2 { name="catnet"; version="1.15.0"; sha256="0z2ps2wb33hc0dg08v70gvpy2zibr6kqjjv90g07hkmrhp6zjk5n"; depends=[]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
-  causaleffect = derive2 { name="causaleffect"; version="1.2.4"; sha256="10hn2wy47n4j7d43bvzj1rdi8fjrg2p3czcf50631smg8a2rarf0"; depends=[ggm igraph XML]; };
+  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-15"; sha256="1qw1r5drxip4y1a59hwz92iw50nj3vkxynsisv28srnwr58imnaj"; depends=[proxy]; };
+  cba = derive2 { name="cba"; version="0.2-18"; sha256="15fjnc9mg30fhm9rfsgz7d24hx83ra8bgyc2s1sz5gda4ppq53pr"; depends=[proxy]; };
+  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]; };
   ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
@@ -3286,330 +4046,415 @@ 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]; };
   ccgarch = derive2 { name="ccgarch"; version="0.2.3"; sha256="0angffla3sk9i86v6bbsav95fp3mz5yvq7qfv0fx2v0nd2cx116w"; depends=[]; };
-  cchs = derive2 { name="cchs"; version="0.2.0"; sha256="15bihlpw2q7mcna9200hlzvvbbyr3rrc0xbxyjca1n9dbgsqpibp"; depends=[survival]; };
-  cclust = derive2 { name="cclust"; version="0.6-20"; sha256="1davlnrikfriczdwlprqd46axs9acvz30hhni134cisy11snlq7s"; depends=[]; };
-  cda = derive2 { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric plyr randtoolbox Rcpp RcppArmadillo reshape2 statmod]; };
+  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]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
-  cdcfluview = derive2 { name="cdcfluview"; version="0.4.0"; sha256="1b0l6vqhks9mqpx3c94qip3dd8031rl4jjqjnmdpcvmfhg335yjf"; depends=[dplyr httr pbapply xml2]; };
+  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]; };
-  cdfquantreg = derive2 { name="cdfquantreg"; version="1.0.3"; sha256="1czb9v2naxzxfyga2npfljlgx15k1mspqksn6jql5faksbgfqb0v"; depends=[Formula MASS pracma]; };
+  cdfquantreg = derive2 { name="cdfquantreg"; version="1.1.1"; sha256="17ghqcxnaz25n0qrar1bs2i4hcpn1gdzdv53r4krivdzkbi9p90a"; depends=[Formula MASS pracma]; };
+  cdlTools = derive2 { name="cdlTools"; version="0.11"; sha256="0jqr0j6hwqwx574659i3mfzf4hcmmxfd3x28d52dwgpwsv0r10gn"; depends=[raster RCurl rgdal XML]; };
   cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; };
+  cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; };
   cec2005benchmark = derive2 { name="cec2005benchmark"; version="1.0.4"; sha256="0bwv63l31hiy63372nvnyfkpqp61cqjag0gczd2v2iwsy3hyivpd"; depends=[]; };
   cec2013 = derive2 { name="cec2013"; version="0.1-5"; sha256="07i2vp1x3qaw5di5vr5z70d47hh9174pjckjlhgv0f2w97slwc1i"; depends=[]; };
   celestial = derive2 { name="celestial"; version="1.3"; sha256="0icsrpw8y7r0ls8ch5b25fl4rnvs6x5y2wscmcmpp4fa4x64qqg6"; depends=[RANN]; };
   cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
-  cellranger = derive2 { name="cellranger"; version="1.0.0"; sha256="1zyf9hxhj1s660xyqp3klc11plfhyzv4fi03p7j2p5grw280cm2x"; depends=[]; };
+  cellWise = derive2 { name="cellWise"; version="1.0.0"; sha256="1cpkz256z6ngqdd1wa0ajyjcl0j1xln2f0hwsw24wfzgb8sdj6ac"; depends=[ggplot2 gridExtra matrixStats reshape2 scales]; };
+  cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; };
   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-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[glmmML maxLik miscTools sandwich]; };
-  censorcopula = derive2 { name="censorcopula"; version="1.0"; sha256="1y2vh6k6v5j5k3w4mk4mglv92103bz1mihf41jd55ky39dyr0gmr"; depends=[copula]; };
+  censReg = derive2 { name="censReg"; version="0.5-22"; sha256="0s955gzd40nwl2qq20ss1yqjfpdrhv6bwbiksvd1smg4ip038w5q"; 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]; };
+  censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; };
   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.3"; sha256="1v2iwphw468lpw2im50vf2h762sq8fj84fakqr96zb7im9890zw1"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
+  cffdrs = derive2 { name="cffdrs"; version="1.7.5"; sha256="1v5acbp8469b2mbv3x6986f8rw6hh34jqkwdm6fp50dx1r8x9p1x"; 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.3"; sha256="0lyhgiwskvcbbzd6y9ryndk4m3hjcwhd2ysnlhx7vkazp8936y87"; depends=[coneproj]; };
+  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]; };
   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=[]; };
   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.1"; sha256="1ifqv2qv8lwsfwia14dn53hs29xc027ap397l2wpmmmrzx0v6vrf"; depends=[zoo]; };
+  changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; };
+  changepoint_np = derive2 { name="changepoint.np"; version="0.0.2"; sha256="03i4l59h8cr6bizbqn288x9r85kvaz1dyhkv5fsj1189qpdi9m88"; depends=[changepoint zoo]; };
   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.7.3"; sha256="11xwdvpi6i9cm3fp44fgish0vxpb6jqbcd24hmppm39ixf28ajg2"; depends=[backports]; };
-  checkpoint = derive2 { name="checkpoint"; version="0.3.15"; sha256="1mzf5d2mxwc7l9149a0sbxamxnmq4xc1ia8n5sd412sv5gmzxw89"; depends=[]; };
-  cheddar = derive2 { name="cheddar"; version="0.1-630"; sha256="15hx9pm4pwmzwb82qgbf4ryy7zbsv64zw4qm6v7xkkaw27rjl4vg"; depends=[]; };
+  checkmate = derive2 { name="checkmate"; version="1.8.2"; sha256="1zqcggl9m7slvc0q6zyhssdypb7jzf3l9byl5vxh1qdwjiw2y64g"; depends=[backports]; };
+  checkpoint = derive2 { name="checkpoint"; version="0.3.18"; sha256="17r3hamj66hx1w050yim21b8kp1mbfkjh6rsdmd0z3s04wash7bi"; 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.3.9"; sha256="089zlp4ba6yyxjh2p7fcph29lnxyk1gifb44fw7lsslvg19xlgjm"; depends=[class e1071 lars MASS mclust nnet pcaPP pls robustbase rpart som]; };
+  chemometrics = derive2 { name="chemometrics"; version="1.4.1"; sha256="019r0n4s6lzzjyp94zv12gn113p69c4s4ji0aqinfzb5fw0dlikn"; 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.62"; sha256="0fj7kymwdhi4svqarkljln01d78bspflh910s53r2sj78l9sv53g"; depends=[fields httr Kendall pls readxl sp XML]; };
+  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]; };
   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="2015.9-5"; sha256="0yqapf9fq0arh1hgwd5lklp6fklia926n0h1980731hqxd362bpq"; depends=[kyotil MASS survival]; };
+  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.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; };
-  choroplethr = derive2 { name="choroplethr"; version="3.5.0"; sha256="0askw7flbh3yd6ycmymzqxxgad7hzlp294dw7dijxyv0z5051d2y"; depends=[acs dplyr ggmap ggplot2 Hmisc R6 RgoogleMaps scales stringr WDI]; };
-  choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.0"; sha256="0xfqw7spjali13sdq0jp3p62fgzvfm2ixbbcay8iwjm5plh5p5sw"; depends=[ggplot2]; };
-  choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0"; sha256="00dgwikfxm1p1dqz1ybsxj1j8jcmrwa08m2d3zsww2invd55pk7g"; depends=[]; };
+  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]; };
+  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]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
-  chron = derive2 { name="chron"; version="2.3-47"; sha256="1xj50kk8b8mbjpszp8i0wbripb5a4b36jcscwlbyap8n4487g34s"; depends=[]; };
-  chunked = derive2 { name="chunked"; version="0.2.0"; sha256="13fi56dpvvf1shchvyank31xmb8wh9rszb74p2bfh3b5shwygx97"; depends=[dplyr LaF lazyeval]; };
+  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.4"; sha256="02d2di0v6cqmp5rszrmynrnyg00p6wd7d000ghbwsjw2679ysr13"; depends=[colorspace GlobalOptions shape]; };
+  circlize = derive2 { name="circlize"; version="0.3.9"; sha256="0zaqisklz28y262lwh11m4fi5x6rr6hzw4fzibgsx4x34nxxavlb"; depends=[colorspace GlobalOptions shape]; };
   circular = derive2 { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
-  cit = derive2 { name="cit"; version="2.0"; sha256="16i3riv5fnaih240hkr8q9zpgxjr26abv9mg6spi6cs95ny2rybs"; depends=[]; };
+  cit = derive2 { name="cit"; version="2.1"; sha256="1kiph7znr9fiq704wfbms6hsl4shxfqijrlh4dhmik9x9m8sj538"; depends=[]; };
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
+  citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; };
   cjoint = derive2 { name="cjoint"; version="2.0.4"; sha256="0c2vs5zbw83r7jlm6kwjylyd5yjnyz5qaqnk0lh9x54jd0f3nqwv"; depends=[ggplot2 lmtest sandwich survey]; };
   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.2"; sha256="10mbgdg5hpdx6v84zn1j2gfl7rj2cl0dizxplf764qrc6rfhvsxm"; depends=[curl jsonlite]; };
+  clarifai = derive2 { name="clarifai"; version="0.4.0"; sha256="0qlv4aj5vlrrc0h6gyryly33rfz5jz7cahw5l6qdbba4dibrkajm"; 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]; };
   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]; };
-  cleangeo = derive2 { name="cleangeo"; version="0.1-1"; sha256="1bahj4lf7fvf8qlbl7g2jh9a4vqr62llg43yklm380fky23n04r1"; depends=[maptools rgeos sp]; };
+  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]; };
+  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-5"; sha256="0p1w5sb27qk609azywzz17c4f2cgdkrl88gckgrd3lg1cfa9vl7d"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
-  clickstream = derive2 { name="clickstream"; version="1.1.7"; sha256="0j87209pir852djga5dr1rdj6i554v4bpvhkk1i843lkfsfz4v12"; depends=[arules data_table igraph linprog plyr Rsolnp]; };
-  clifro = derive2 { name="clifro"; version="2.4-1"; sha256="0yi8kgw4l2pxaa340avwfswfjsngdkfp3kv4cnnw9gr7y57pjaz1"; depends=[ggplot2 lubridate RColorBrewer RCurl reshape2 scales selectr XML]; };
+  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]; };
+  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]; };
   climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-6"; sha256="0dyhqxrma8g4ny4afv6drr885m88q2b8g1n19yy3yjbrbddyz8yl"; depends=[caTools PCICt Rcpp]; };
   clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
-  climtrends = derive2 { name="climtrends"; version="1.0.5"; sha256="0pgdx0hhrqpnj3qf37ms7z9fhy4vvgichrpi4vvmin5xksmaczxa"; depends=[]; };
-  climwin = derive2 { name="climwin"; version="0.1.2"; sha256="0nin43pi0q62ga710k1b6y5llrmf8aw4xhw5vrl6w01iqmz25v0g"; depends=[evd ggplot2 gridExtra lme4 lubridate MuMIn reshape]; };
+  climextRemes = derive2 { name="climextRemes"; version="0.1.2"; sha256="1m9jb8n7df9v4yakgh2ncmaqnhdw1vkhfcg3k6cib07nz69wx98j"; depends=[extRemes]; };
+  climtrends = derive2 { name="climtrends"; version="1.0.6"; sha256="01007b0av9kv6rx2kkp5y39xkk5nqsyqbxa5z43qdq5zgf5pwvd9"; depends=[]; };
+  climwin = derive2 { name="climwin"; version="1.1.0"; sha256="10dpdv1nm5sxagac6vb2slqkxvpwa6q0jl2fwwkpr9pdmvacp4h4"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn numDeriv plyr RcppRoll reshape]; };
   clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
-  clinfun = derive2 { name="clinfun"; version="1.0.11"; sha256="13qc1kxbxbj9zpxb823vx0nl54pznyna8y0i167h43nvya2lf41l"; depends=[mvtnorm]; };
-  clinsig = derive2 { name="clinsig"; version="1.1"; sha256="09h43psdwpd1d9pzl0r7rj08jzahmy4myc06066rdrnqyrjmvr99"; depends=[]; };
-  clipr = derive2 { name="clipr"; version="0.2.0"; sha256="0y27k2s562cpva3a19yv5b9p99iympdx3084v59i3478ih9qw23r"; depends=[]; };
-  clisymbols = derive2 { name="clisymbols"; version="1.0.0"; sha256="1g68kh1js6nssyzw4lpxp4d2h4rhlayhahaykxw4a4bd67fkw20p"; depends=[]; };
+  clinfun = derive2 { name="clinfun"; version="1.0.13"; sha256="0l4brcfr960yplgx63hy6imszk1zy8my6issilx839hvs4d5z7l9"; depends=[mvtnorm]; };
+  clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; };
+  clipr = derive2 { name="clipr"; version="0.3.2"; sha256="13g1iwld4xijn5raip71a88vdn51dc056nnqaasb7g00zbbb8jwl"; depends=[]; };
+  clisymbols = derive2 { name="clisymbols"; version="1.1.0"; sha256="0idnlx29ps4njiwf4afqzahkpjzz6lam93hxjrr67756k1lw1xjj"; depends=[]; };
   clogitL1 = derive2 { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; };
+  clogitLasso = derive2 { name="clogitLasso"; version="1.0.1"; sha256="1mm815w31n0jvbh2rwq15ja1mzvjaz1x846xq1949aj4pb692zrl"; depends=[foreach lassoshooting]; };
   clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; };
-  cloudUtil = derive2 { name="cloudUtil"; version="0.1.10"; sha256="1j86vpd4ngrdpfjk44wb1mp0l88dxia64pjd2idfcd276giplh6s"; depends=[]; };
-  clpAPI = derive2 { name="clpAPI"; version="1.2.6"; sha256="1kgzmzf87b0j43ch21anmm2d73bj2d16slmyavpbkdwg72dg1sjb"; depends=[]; };
+  cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
+  clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; depends=[]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
-  clue = derive2 { name="clue"; version="0.3-51"; sha256="1lhjd27lmwfsb7ffnbybv3yvw2mfca3hm03nb6mkk3alh2ncam2g"; depends=[cluster]; };
-  clues = derive2 { name="clues"; version="0.5.6"; sha256="1g0pjj4as5wfc7qr3nwkzgxxxp3mrdq7djn8p8qjba6kcdjxak1i"; depends=[]; };
-  clusrank = derive2 { name="clusrank"; version="0.1-1"; sha256="0p14lflhg3kjrdsyva2gnx5frs0fpnsn3fnda49paf29ynm3x7w4"; depends=[]; };
+  clubSandwich = derive2 { name="clubSandwich"; version="0.2.2"; sha256="1ib6p58w8ax00cpgxcl6hhpig02d0lay9d2abdx084dbiyb45pad"; depends=[sandwich]; };
+  clue = derive2 { name="clue"; version="0.3-53"; sha256="1wj23bjsrcn7b74vaqara6vwd6qz0wznyfk9zicm627cxcix7n3x"; depends=[cluster]; };
+  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]; };
-  clustMixType = derive2 { name="clustMixType"; version="0.1-16"; sha256="1p3i83wrbgs1qpirmmckmpnbbs3p73dl7mh8f724qll761phm8v5"; depends=[]; };
-  cluster = derive2 { name="cluster"; version="2.0.3"; sha256="03jfczb3dwg57f164pya0b762xgyswyb9a7s33lw9i0s5dq72ri8"; depends=[]; };
+  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_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
-  clusterCrit = derive2 { name="clusterCrit"; version="1.2.6"; sha256="1jy2xxh9i4dsdiqmkl35xpdmq6vyf3alh4d0npzgrwmjl7516pd3"; 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.1"; sha256="1r1cwnx7kdisq6v9ssr0z270yhfkkq3jyg2rq81l43dx7a6yv04y"; depends=[AER Formula lmtest mlogit plm sandwich]; };
-  clusterSim = derive2 { name="clusterSim"; version="0.44-2"; sha256="1xf3byri6mwlf89n896bxffmf3c6yqqh992npg9sqznx955hcggv"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; };
+  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]; };
   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]; };
   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="0.1.2"; sha256="022lzp1wvbaa20d8hribgq9miy6i7jxm5m1p3p52h9b7bzga3q6g"; depends=[corpcor e1071 ggplot2 irlba]; };
+  clustrd = derive2 { name="clustrd"; version="1.1.0"; sha256="0l1mllgqqlkywhhp1a24hlvsiwkk26k58c9rg9m5pagb623w73p4"; depends=[cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
   clustvarsel = derive2 { name="clustvarsel"; version="2.2"; sha256="1b38y9zn4xbiddm5m5ki307i5yih2nadhnpnsizz91jkcqdnjhw1"; depends=[BMA foreach iterators mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
-  cmaesr = derive2 { name="cmaesr"; version="1.0.1"; sha256="1apka7891agpz2v3smv7m5sa09myjrxq3w3jzj28j2fn4cgfxn47"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
+  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.1.2"; sha256="0iqr4fxjhi243ccb2kbs75pgxr66zlbp5005d5qsvzyn0qxnaa62"; depends=[]; };
+  cmna = derive2 { name="cmna"; version="0.3.0"; sha256="0ax27y1h0pz8i5ckjcrbgpav6m1srym6av94bvy02mv26ida0l8c"; depends=[]; };
   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.6.1"; sha256="0wsl37i7vwfh1mqrll4ff7qr8wc0mr5f8m6w4r41qihda1bs4y0c"; depends=[fields ncdf4 raster sp]; };
+  cmsaf = derive2 { name="cmsaf"; version="1.7.1"; sha256="0q954akb9myb64p7x2zplfljkzqnakx74w93h1n2kfzx7bbh482h"; 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=[]; };
   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]; };
-  coala = derive2 { name="coala"; version="0.4.0"; sha256="1ssh0fg4h6v4p4f9184qpwbn8830b9mlvjq73aq67my46sx7i2jh"; depends=[assertthat R6 Rcpp RcppArmadillo rehh scrm]; };
+  coRanking = derive2 { name="coRanking"; version="0.1.3"; sha256="1ss00l0c99fi9p6gcimb31nrl5iflps6lvplnjjqwcqjkb2pjh9p"; depends=[Rtsne scatterplot3d]; };
+  coala = derive2 { name="coala"; version="0.5.0"; sha256="1yk2cfv73wng1bm00v1xfd208lvc9r7nx1w2rgdgw9m9yv0mw89f"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; };
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; };
-  cobs = derive2 { name="cobs"; version="1.3-1"; sha256="18dfc767zfipp4h4q7lgk5yp1c63lb9myc6bg3jkzr1v1xwbhwqk"; depends=[quantreg SparseM]; };
-  cocor = derive2 { name="cocor"; version="1.1-2"; sha256="0lkj4rjny2sv4sbvrh159zw66h99rkl1zvncb3g8f17zizmvvfsm"; depends=[]; };
+  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]; };
+  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]; };
   cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; };
-  coda = derive2 { name="coda"; version="0.18-1"; sha256="03sc780734zj2kqcm8lkyvf76fql0jbfhkblpn8l58zmb6cqi958"; depends=[lattice]; };
+  coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; };
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
-  codep = derive2 { name="codep"; version="0.5-1"; sha256="1ral0f2yb7fa5j216r4hlssijim26q4mr2kdfllf4xn66pssf32y"; depends=[]; };
-  codetools = derive2 { name="codetools"; version="0.2-14"; sha256="0y9r4m2b8xgavr89sc179knzwpz54xljbc1dinpq2q07i4xn0397"; depends=[]; };
-  codingMatrices = derive2 { name="codingMatrices"; version="0.2.0"; sha256="0gysa26nzrcf9zhlc2vb2banh3yhv53hdbx1an9rjb3rd3n7xh4y"; depends=[fractional Matrix]; };
-  codyn = derive2 { name="codyn"; version="1.0.1"; sha256="1r3plblrpdsfx9ng468zjr6imhra5x2xxqivrnw3nmnfiipmik68"; depends=[assertthat]; };
+  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.1"; sha256="00kvvsz1l603v36clsz7jm1yiwl07vcyhv4ghy0pjlz8hcfaqmna"; 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]; };
-  coenocliner = derive2 { name="coenocliner"; version="0.2-1"; sha256="0y756x8c4psv972wgi6alfn5sd5zybkp2pf68kglcn6w9xd62b0k"; depends=[]; };
-  coenoflex = derive2 { name="coenoflex"; version="2.1-0"; sha256="0gh4pr5h3kp5v7bx1gif0j4wj98aqs1wm4mcmv7z7q66c007q50m"; depends=[mgcv]; };
+  coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; };
+  coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; };
   coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
   cofeatureR = derive2 { name="cofeatureR"; version="1.0.1"; sha256="1nxdi97b37pw5xr6cib8hjgziazmy9lfbjgixn9ayacvdhkjs7ib"; depends=[dplyr ggplot2 lazyeval]; };
-  coin = derive2 { name="coin"; version="1.1-2"; sha256="0wwkw0sslfp8ass83rh2d9qhzz2p69gv0c6wi778nanjvaj533x5"; depends=[modeltools multcomp mvtnorm survival]; };
+  coin = derive2 { name="coin"; version="1.1-3"; sha256="0db000pks4vr5jr765zagd5amqk0l4qxqg67vwwkbj03b71fr24b"; depends=[modeltools multcomp mvtnorm survival]; };
+  cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; };
+  cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; };
   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]; };
   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]; };
   coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
   colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; };
   colorhcplot = derive2 { name="colorhcplot"; version="1.0"; sha256="1hxh09sg9mdbfz4vx2z9wyx9xs5a82l8sw1wbwaa717a6q3ayjyj"; depends=[]; };
-  colorscience = derive2 { name="colorscience"; version="1.0.2"; sha256="0d4bn1s7jmywh528nm3fpra3557v6nxr594q42phw2nq58gscf3z"; depends=[Hmisc munsellinterpol pracma sp]; };
-  colorspace = derive2 { name="colorspace"; version="1.2-6"; sha256="0y8n4ljwhbdvkysdwgqzcnpv107pb3px1jip3k6svv86p72nacds"; depends=[]; };
+  colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; };
+  colorplaner = derive2 { name="colorplaner"; version="0.1.3"; sha256="0mqqk59yjklbc7a0n7jgyhj458622dfdsa1101a5w6kwppbjvnfg"; depends=[digest ggplot2 gtable scales]; };
+  colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; };
+  colorscience = derive2 { name="colorscience"; version="1.0.4"; sha256="19943gnzszh13mg74clbkhbc6xg4259ilqk19mrv8d6ml6f6wspl"; depends=[Hmisc munsellinterpol pracma sp]; };
+  colorspace = derive2 { name="colorspace"; version="1.3-2"; sha256="0d1ya7hx4y58n5ivwmdmq2zgh0g2sbv7ykh13n85c1355csd57yx"; depends=[]; };
   colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
-  colourlovers = derive2 { name="colourlovers"; version="0.2.0"; sha256="17macf5nby286n80pfsha54r3q3idpfhkm2w1c8hbsh2rxfh6r1d"; depends=[jsonlite png XML]; };
+  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]; };
+  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=[]; };
+  combiter = derive2 { name="combiter"; version="0.1.0"; sha256="1wzrz2wc4j4inn078id6jr1585pl62r8ym8cc3vmg4acq2klm93c"; depends=[iterators itertools Rcpp]; };
   comclim = derive2 { name="comclim"; version="0.9.4"; sha256="0m6ynccscsrrq70p0drwrwxp4skc630kv1l5smh48pi8kagahj1g"; depends=[]; };
   cometExactTest = derive2 { name="cometExactTest"; version="0.1.3"; sha256="08ck1cv5apzn379j6mm2gmhm4qj18418crmqbbp46d80waf0ghxq"; depends=[dplyr]; };
-  comf = derive2 { name="comf"; version="0.1.1"; sha256="0ynqyfzj9nnslyi5h4mciyrk8mlf0zg1j9z6liqjld4f2c1zm0al"; depends=[]; };
+  comf = derive2 { name="comf"; version="0.1.6"; sha256="1dfba8i08gc319ybqhfs96wa2mp0ndh4rrkv9i432gc56p4kgapr"; depends=[plyr]; };
   commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
-  commonmark = derive2 { name="commonmark"; version="0.7"; sha256="11a6v8dsrhb2c5ydy6qsvdhn9vwjm4q8y9wjmbp6sc6zngfqqk6a"; depends=[]; };
+  commonmark = derive2 { name="commonmark"; version="1.1"; sha256="0dh56cspy8wkvbz0602vp050qxd70wm063lqflfk2zddcrv9lhc2"; depends=[]; };
   compHclust = derive2 { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   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.0.0"; sha256="1dxqj3zd8a7261q1692sj11gxnizd82wgc24j73b94xkfk0iiv74"; depends=[dplyr tidyr]; };
-  compareGroups = derive2 { name="compareGroups"; version="3.2"; sha256="0p4xaxjxyld5a0i0z1bzrbqz9zzlk0pz0qy0pkpfcq4czpyfv4sz"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
+  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]; };
   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]; };
+  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="2.0"; sha256="1mid09h3xp7p33g371gbghr665qnny1rvi20ha8rv04d928l2r7a"; depends=[numDeriv survival]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.2"; sha256="028mpal6gdrxgw08hxhsl4yvc9plj0bvndb48fyrzpj8kmk5dibv"; depends=[numDeriv survival]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
+  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=[]; };
   concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; };
-  concreg = derive2 { name="concreg"; version="0.5"; sha256="0psvnirl5rqicyzxs9sivh23bzzwdgviqczdl2in2gnrvdiw7m6f"; depends=[survival]; };
+  concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; };
   cond = derive2 { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; };
   condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
   condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; };
-  condformat = derive2 { name="condformat"; version="0.2.0"; sha256="07d79l0m6cbvxrj0p8fi8v7blpapanl7hzhkvg4npyz2xjvy6bjk"; depends=[assertthat dplyr htmlTable knitr lazyeval scales]; };
+  condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; };
+  condformat = derive2 { name="condformat"; version="0.5.0"; sha256="0cxayvw5is3b2bwfyjd2465q45dx1w1dqhaa10gld0b2336i7hkz"; depends=[dplyr gplots htmlTable knitr lazyeval rmarkdown scales]; };
+  condir = derive2 { name="condir"; version="0.1.1"; sha256="133598h1ga4jyr77lchnby6m8bh3adq6s38cgw45q4fyvzad4qds"; depends=[BayesFactor effsize knitr psych shiny xtable]; };
+  conditions = derive2 { name="conditions"; version="0.1"; sha256="0vhqkbsil3qfvrz7924i3wvjknw69cp27g7ayapf6w94bbggx4x8"; depends=[]; };
   condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
-  condvis = derive2 { name="condvis"; version="0.2-1"; sha256="1gbfzgim9dp79244m2550slgd365aafmcy75klh4z32s6dl4rnvd"; depends=[MASS]; };
-  coneproj = derive2 { name="coneproj"; version="1.9"; sha256="17qwix8k7agbxs8g4psyivlr4w4k8v2w0qfhs8a4vsg28z88kr6d"; depends=[Rcpp RcppArmadillo]; };
+  condvis = derive2 { name="condvis"; version="0.4-1"; sha256="1fqwybfw5sv4g8kg1yk41ixm5bmzcx7dry1a7ijca5wakchghvya"; depends=[MASS]; };
+  coneproj = derive2 { name="coneproj"; version="1.11"; sha256="11hz6xk7b53c1j2c1l0j8c3gh310b59nhr6ln0vibfp30dzxq7xq"; depends=[Rcpp RcppArmadillo]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
+  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]; };
   conformal = derive2 { name="conformal"; version="0.2"; sha256="13d8yv8l333n3m8kl2sdnd0m5b7gjixkqjlpfj312fk9nxvqdbcg"; depends=[caret e1071 ggplot2 randomForest]; };
-  confreq = derive2 { name="confreq"; version="1.4"; sha256="0cbhisw3yhg71081a2f40jgbdjcvx36xrrnbhwcyhxd43qn2dp0q"; depends=[gmp]; };
+  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.1"; sha256="0dvxrm1hqzlkzhmp3p6qackjpwwvl812h63skwqiwh70sc7xifd0"; depends=[]; };
+  conover_test = derive2 { name="conover.test"; version="1.1.2"; sha256="063a43v6f8hknaph78b92aqhwv6nfzsd029j4gqs2087lyqdk2ap"; depends=[]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
-  contfrac = derive2 { name="contfrac"; version="1.1-9"; sha256="16yl96bmr16a18qfz6y5zf7p02ky1jy2iimcb1wp50g7imlcq840"; depends=[]; };
-  conting = derive2 { name="conting"; version="1.5"; sha256="02vkpzdcwsny40jdcxgjfrx89lw1gq864s3fgswa9bfxfps9p58h"; depends=[BMS coda gtools mvtnorm tseries]; };
+  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]; };
   contoureR = derive2 { name="contoureR"; version="1.0.5"; sha256="1izq1alkf24zd2sf2ir2adyrkwhdj7n89cv6z0dfh5mfqld5bkdn"; depends=[geometry plyr Rcpp reshape]; };
-  contrast = derive2 { name="contrast"; version="0.19"; sha256="1kc3scz3msa52lplc79mmn4z99kq1p2vlb18wqxa9q2ma133x6pl"; depends=[rms]; };
+  contrast = derive2 { name="contrast"; version="0.21"; sha256="1fgm6qm3svqg8ryq2kd1h9z6f3ni8kki7gl3izvjw6wir97ph8nw"; depends=[geepack Hmisc MASS nlme rms sandwich]; };
   controlTest = derive2 { name="controlTest"; version="1.0"; sha256="0gzhd92qy3dykwdfwckw6x46bd9m044hcn4bqwpv16af1xbrj963"; depends=[survival]; };
+  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]; };
-  convoSPAT = derive2 { name="convoSPAT"; version="1.0"; sha256="0awax173csyj705nh48nfk1f4w00yjkm00xfglkphccpny1bkqyq"; depends=[ellipse fields geoR MASS plotrix StatMatch]; };
+  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]; };
   cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; };
-  coop = derive2 { name="coop"; version="0.3-0"; sha256="0mcxfhik6dd8knlnf9m34gf9ili6i3n9wq752dy66mx1z59kcvl6"; depends=[]; };
+  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.1"; sha256="1jmjyz70hw8sbihxf74ir6sxrlcxwv0c1fhw1ph0raasbyxrxml6"; depends=[lmomco]; };
-  copCAR = derive2 { name="copCAR"; version="1.0-1"; sha256="173jv69n4g68yfrz03sg23qzlyvvlw988axgj5knq3l2cq6pjpb2"; depends=[numDeriv Rcpp RcppArmadillo spam]; };
-  cope = derive2 { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[fields maps MASS mvtnorm]; };
-  copula = derive2 { name="copula"; version="0.999-14"; sha256="08mas18knyz3laxrg9hx9i6rwhmksyi43wni2ydlrlp2cflq4ipz"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm pspline stabledist]; };
+  copBasic = derive2 { name="copBasic"; version="2.0.4"; sha256="0vc1rk0njcmd501jpsrpgqzrcqyplnycfaidn9qwns84cswx0hxs"; depends=[lmomco randtoolbox]; };
+  copCAR = derive2 { name="copCAR"; version="2.0-1"; sha256="1mvbarzq409lkf7sd6s4adf2cgvmby7f1yg35x83bp1sc8529kz8"; 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]; };
   copulaedas = derive2 { name="copulaedas"; version="1.4.2"; sha256="09w6b1m1lnlnsx0qp2mzlp0z9rxzz90qs9jqzwwjl56lzdad3vpr"; depends=[copula mvtnorm truncnorm vines]; };
-  corHMM = derive2 { name="corHMM"; version="1.18"; sha256="1x1hrhb10rln4jhx03gx5ap1qbdk2xcknlnr3xmb6aawqsx0h4cq"; depends=[ape corpcor expm GenSA nloptr numDeriv phangorn]; };
+  corHMM = derive2 { name="corHMM"; version="1.20"; sha256="1amfy419m8y9w6swa1avvjdyk2rjymsa280qsdy9zbq0izrgf9dr"; depends=[ape corpcor expm GenSA nloptr numDeriv phangorn]; };
   corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
   corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; };
   corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
   cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; };
-  coreNLP = derive2 { name="coreNLP"; version="0.4-1"; sha256="0a6pc588ddi9qyi5gsnzzvm4k0p5sp5bnjrlsskaymzdq4rp6miz"; depends=[plotrix rJava XML]; };
+  coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; };
+  coreSim = derive2 { name="coreSim"; version="0.2.3"; sha256="00hrhiml3g0jld6pllpgjfrlpm2lqcdb01l6k9gkjyh3lab827fg"; depends=[dplyr MASS]; };
   coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
+  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=[]; };
   corpora = derive2 { name="corpora"; version="0.4-3"; sha256="0zh8mabfy9yqgx7asi4yqv4c0kj59yvyxxaxjgdjy5kkr17zd4g4"; 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.8"; sha256="0myaf0j2sa895xiczhn6r97j988jxc1bv8wnh9cw2ppxzxqly4rg"; depends=[seriation]; };
-  corrplot = derive2 { name="corrplot"; version="0.73"; sha256="0xnlkb8lhdjcc10drym9ymqzvfwa3kvf955y0k66z5jvabzyjkck"; depends=[]; };
+  corrgram = derive2 { name="corrgram"; version="1.10"; sha256="065l93pdz3bms1b9qkcqhyi0j2bh4firl35rnfkajqbz5i3v8q55"; 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=[]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
-  cosmosR = derive2 { name="cosmosR"; version="1.0"; sha256="0w4qywnkgcybgyyhnvvg33amqi2vnkry6iajakyqr1x2hzfpf9sv"; depends=[xlsx]; };
   cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
   costat = derive2 { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; };
   cotrend = derive2 { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; };
-  couchDB = derive2 { name="couchDB"; version="1.3.0"; sha256="153zxi2liv932r7mphhzgxw4wyizh5iyk62ad6x64av31kd2qzsn"; depends=[bitops httr RCurl rjson]; };
-  countrycode = derive2 { name="countrycode"; version="0.18"; sha256="1by3xws2c43ryz4fnlq85yvgnwnvzmvjbd18cafirlwpl6liy2ic"; depends=[]; };
+  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=[]; };
+  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]; };
   covLCA = derive2 { name="covLCA"; version="1.0"; sha256="15jsjrlaws1cqyrwvh4lzbhxkb11jmgpmddg98nfrzmjpczn2iw3"; depends=[Matrix mlogit poLCA]; };
   covRobust = derive2 { name="covRobust"; version="1.1-0"; sha256="1nvy5cqs4g565qj2hhgk5spr58ps2bhas3i752rf7wvrskb89fk7"; depends=[]; };
   covTest = derive2 { name="covTest"; version="1.02"; sha256="0p4di8bdjghsq5jd678dprlhiwnxr5piqlx2z7hi2bjjpvvl5657"; depends=[glmnet glmpath lars MASS]; };
-  covafillr = derive2 { name="covafillr"; version="0.2.1"; sha256="1mn7jnhimp1bspsl8rq8br8z4r2nb7izbvykbzz5zpmgg2204pl5"; depends=[RcppEigen]; };
+  covafillr = derive2 { name="covafillr"; version="0.4.0"; sha256="0q6zzgpgwzmdwpz9lzhprhyy9nsrzwk35g35ighayd8d6c7ih44f"; depends=[ggplot2 RcppEigen]; };
   covmat = derive2 { name="covmat"; version="1.0"; sha256="00y966897x83v471yarfikpr794b7adhgn5c9hgh0j1j4yfdc3b8"; depends=[DEoptim doParallel fGarch foreach ggplot2 gridExtra lhs Matrix mvtnorm optimx reshape2 RMTstat robust robustbase scales VIM xts zoo]; };
-  covr = derive2 { name="covr"; version="1.2.0"; sha256="1gavcqqbg211sv52sicrh87vif71dl6n9xfcb6b3giqw897w7vrc"; depends=[crayon devtools htmltools httr jsonlite rex]; };
+  covr = derive2 { name="covr"; version="2.2.2"; sha256="0bx2fjaxqigiic2fndpn1y0whag6b2j733dn1cq4qd601sfca1w3"; depends=[crayon httr jsonlite rex withr]; };
   covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; };
-  cowplot = derive2 { name="cowplot"; version="0.6.1"; sha256="1lfqs19l0xs87lnm06f8cy1vkl8hhmwp1g6zl9k1ar60h7kg0y4l"; depends=[ggplot2 gtable plyr]; };
-  cowsay = derive2 { name="cowsay"; version="0.4.0"; sha256="0lbamjvngj1s0jv8ybbfddx52yqf3h7zkjixl9qr0ha8xkidg7r3"; depends=[fortunes]; };
+  covsep = derive2 { name="covsep"; version="1.0.0"; sha256="1i6ygzzf2s0f7a42q2pb1v0gn369wxdyxvbk4k891irq352sf18r"; depends=[mvtnorm]; };
+  cowplot = derive2 { name="cowplot"; version="0.7.0"; sha256="03iimcsh1pk7iqzjdlfcj43b8khijdk4hg00j4jdllv19xsfb0hx"; depends=[ggplot2 gtable plyr]; };
+  cowsay = derive2 { name="cowsay"; version="0.5.0"; sha256="16rlpyfiwk2f04p49inf5m3pb5nvb45xs6sdfjszihm1hxl09x7x"; depends=[fortunes rmsfact]; };
   coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; };
   coxme = derive2 { name="coxme"; version="2.2-5"; sha256="0lpdwpvsgjgmbf55qqhflw4q40xmqm422inkssgn3ladcp68gb1s"; depends=[bdsmatrix Matrix nlme survival]; };
-  coxphf = derive2 { name="coxphf"; version="1.11"; sha256="0494szmhc7qp1qynrqf3kmna26h4ams40qr6w7qj4al54mkp0346"; depends=[survival]; };
-  coxphw = derive2 { name="coxphw"; version="3.0.0"; sha256="11pyd09dwkbixjz1riv8rz3jrp1ix6cbn1fw9nm8vnrc19x5lkz5"; depends=[survival]; };
+  coxphf = derive2 { name="coxphf"; version="1.12"; sha256="0vsdpbpc18fm6dwiqjwclgimwng34xqzy2mqbcijs6p7h1j124a0"; depends=[survival]; };
+  coxphw = derive2 { name="coxphw"; version="4.0.0"; sha256="02xiwrvc3gbwwjcz9kwy2g91jrjpawch5r4pq6l4lyvl556w296l"; depends=[survival]; };
   coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
   coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
-  cp4p = derive2 { name="cp4p"; version="0.3.4"; sha256="03g4fn7ih6nmi9xsn7b10ljfdmcv8svyiwcpd5l3yzl3ylbwf2gh"; depends=[limma MESS multtest qvalue]; };
+  cp4p = derive2 { name="cp4p"; version="0.3.5"; sha256="16pkl0brm415v153ln41nyy13fsp4i0jy8349lsffkv5mvp7vklc"; depends=[limma MESS multtest qvalue]; };
   cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; };
   cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; };
   cpgen = derive2 { name="cpgen"; version="0.1"; sha256="1cp3d6riy65lc1mfrxh92lc6f1qal7amhjilfzz0r529j5fipd2v"; depends=[Matrix pedigreemm Rcpp RcppEigen RcppProgress]; };
   cpk = derive2 { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
-  cplexAPI = derive2 { name="cplexAPI"; version="1.3.1"; sha256="0idh2fjc6lkpk24d476rsgn2w7nskiclbbfy1pwh8m49wj70h4ix"; depends=[]; };
-  cplm = derive2 { name="cplm"; version="0.7-4"; sha256="156w3yiazx79133rmxmgz9v4im8g7h37fj4gq5ymy5255ws07m8m"; depends=[biglm coda ggplot2 Matrix minqa nlme reshape2 statmod tweedie]; };
+  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=[]; };
   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.3"; sha256="0yz16ilmy0cilsb9f61bs3y48xi614i4l5qw6fh8hinsqnhzyv0l"; depends=[]; };
+  crandatapkgs = derive2 { name="crandatapkgs"; version="0.1.5"; sha256="113apslycwdgyx18gxbamz235267h2v9b4r2d3pakw38sh74z3qz"; 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=[]; };
-  crawl = derive2 { name="crawl"; version="2.0"; sha256="1brk2xpa623x58rf98bkyq1fqz0mqavg55pj2xifs481iz70w294"; depends=[mvtnorm Rcpp RcppArmadillo shiny]; };
-  crayon = derive2 { name="crayon"; version="1.3.1"; sha256="0d38fm06h272a8iqlc0d45m2rh36giwqw7mwq4z8hkp4vs975fmm"; depends=[memoise]; };
+  crawl = derive2 { name="crawl"; version="2.0.1"; sha256="0jmkbcpf681v00z7p36cni5wrh0y3mbxjia6bnajqjpaqdqzz8la"; depends=[mvtnorm Rcpp RcppArmadillo shiny]; };
+  crayon = derive2 { name="crayon"; version="1.3.2"; sha256="0s2yam18slph7xsw4pyc9f92gdyf609r5w92yax69zh57kb7asws"; depends=[]; };
   crblocks = derive2 { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
-  crch = derive2 { name="crch"; version="0.9-2"; sha256="0i3gli7l4p4xmwq7xzalpq2l140wj36wbggwh3k3jbn0avxpbi56"; depends=[Formula ordinal]; };
+  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.12"; sha256="0v6g3kkf9a8qvmfis1xdhja5j1impmi6mm5dmlq04s8qj4khnnqi"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; };
+  cricketr = derive2 { name="cricketr"; version="0.0.13"; sha256="1nj72avz1m12nn3kyiy4msrvrwhdxl0mywc22wwc6j9dq7v7gh18"; 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]; };
-  crmPack = derive2 { name="crmPack"; version="0.1.9"; sha256="0kr2vqmi4bk5dmbi44xvg3rqnfmhj69qcqwbll0qqxd5x36jpkbq"; depends=[BayesLogit GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
+  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]; };
   crop = derive2 { name="crop"; version="0.0-2"; sha256="1yjpk7584wrz9hjqs21irjnrlnahjg8lajra9yfdp6r927iimg1l"; depends=[]; };
   crossReg = derive2 { name="crossReg"; version="1.0"; sha256="1866jhfnksv9rk89vw7w4gaxi76bxfjvqxx7cfa8nlrcsmaqd7rf"; depends=[]; };
   crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
   crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
+  crosstalk = derive2 { name="crosstalk"; version="1.0.0"; sha256="0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"; depends=[ggplot2 htmltools jsonlite lazyeval R6 shiny]; };
   crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; };
-  crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.1"; sha256="0l2fwdawfbx7971q7jg7604w2ys056rfywiw0myfgc0z864saz0n"; depends=[MASS]; };
+  crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; };
   crqa = derive2 { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
   crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
   crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
   crs = derive2 { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
-  crskdiag = derive2 { name="crskdiag"; version="1.0"; sha256="18qx8i069c7xck7rfgfkrnw409ikv1jx375vlq7vqp61qx91lqic"; depends=[cmprsk]; };
-  crunch = derive2 { name="crunch"; version="1.8.0"; sha256="0z0035bv70b13xjxbqa97bpjkr44dw7k3fca96xhjkwn83vjm62f"; depends=[curl digest httr jsonlite]; };
-  cruts = derive2 { name="cruts"; version="0.2"; sha256="1qxhkikym2f775zf4zg0pd960lcdd183fpnmd7afm75lm2xpzccv"; depends=[lubridate ncdf4 raster sp stringr]; };
+  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.14.4"; sha256="11pj3pbb9hs7bwdmgr10jlir95rq4xdn4qmyklqjls2kgh9r9sfn"; 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=[]; };
   csampling = derive2 { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
-  cshapes = derive2 { name="cshapes"; version="0.5-1"; sha256="1mdg0yjp3jplj2jr5kqs2n4j9l2419n5xp3xnjv8kc8a8anc2asg"; depends=[maptools plyr sp]; };
+  cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; };
   cslogistic = derive2 { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; };
   csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; };
+  csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; };
   csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
+  cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; };
+  cstab = derive2 { name="cstab"; version="0.2"; sha256="0wvcsxfbrw9p1y0l81m4i5p2x8alrzrq30lmprmx2hgazv038b4g"; depends=[cluster fastcluster Rcpp]; };
   cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
+  csv = derive2 { name="csv"; version="0.4"; sha256="00nvxr9q8sphmb44vhwszknpd77gzmp8r87r5imd3rwdmql8vs31"; depends=[]; };
   csvread = derive2 { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
-  ctmcmove = derive2 { name="ctmcmove"; version="1.2.1"; sha256="0hca63bsqk0jymmcpn6f76mp0s90jm9c03min40svlfriapqb5f4"; depends=[crawl Matrix raster]; };
-  ctmm = derive2 { name="ctmm"; version="0.3.1"; sha256="0y8mmc09q5gsanddwxivynwpvwa9hwafayqqk57xjh1xsnsdbxn5"; depends=[expm manipulate MASS Matrix numDeriv pbivnorm raster rgdal scales sp]; };
+  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]; };
+  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="1.1.5.2"; sha256="0rh4ikkkmzz2nrd62zbky6chxkx9hfdjr65iqp38b4pw0wdkvnvp"; depends=[MASS Matrix OpenMx]; };
-  ctv = derive2 { name="ctv"; version="0.8-1"; sha256="1fmjhh4vr4vcvqg76dzp1avqappsap5piki1ixahikwbwirxcwvw"; depends=[]; };
-  cubature = derive2 { name="cubature"; version="1.1-2"; sha256="1vgyvygg37b6yhy8nkly4w6p01jsqg2kyam4cn0vvml5vjdlc18a"; depends=[]; };
+  ctsem = derive2 { name="ctsem"; version="2.2.0"; sha256="0gi2lh9wyl0bl1dhlmifciyj4f0xffxqswhhcrybff5dv7bip3nv"; depends=[Matrix OpenMx plyr 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]; };
   cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; };
   cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
   cudia = derive2 { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
   cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
-  curl = derive2 { name="curl"; version="0.9.6"; sha256="0zlpa7ilxdcf3754xgnsiipqsjv896wimgay4lk3ddadplrh76wc"; 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]; };
   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]; };
   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.0"; sha256="0ywyn5jqlhizvsa19xs89xs5bl1sbismjajdk78w1py1s97z9k8w"; depends=[FNN glmnet]; };
+  customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; };
   cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
   cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
   cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; };
   cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; };
+  cvequality = derive2 { name="cvequality"; version="0.1.1"; sha256="0pqvaz8vfwd0x433rrdwdwjp3hgsw1nb5nzsxci5zibjksk14kgp"; depends=[]; };
   cvplogistic = derive2 { name="cvplogistic"; version="3.1-0"; sha256="1lm66nn0q7665r64rdslxp35b7drdss4mys42ks54xdydcminns9"; depends=[]; };
   cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
   cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
@@ -3618,54 +4463,69 @@ in with self; {
   cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; };
   cxxfunplus = derive2 { name="cxxfunplus"; version="1.0"; sha256="0kyy5shgkn7wikjdqrxlbpfl3zkkv4v1p8a1vv0xkncwarjs4n8d"; depends=[inline]; };
   cycleRtools = derive2 { name="cycleRtools"; version="1.1.1"; sha256="1l7w2lm4s149ndd85v41pkdrdig6l3nmhl14bdx56aw8q57fxmb0"; depends=[Rcpp xml2]; };
-  cyclocomp = derive2 { name="cyclocomp"; version="1.0.0"; sha256="0a8xg5ivkswbmrmz7zby2ja3l0zdnpz3dlkwq1m4nbpjbyhkvlw5"; depends=[]; };
+  cyclocomp = derive2 { name="cyclocomp"; version="1.1.0"; sha256="0gky3svk02wiajw7nfjh30684h3qxili4bvsab0m7b6cggw6bgyd"; depends=[callr crayon desc remotes withr]; };
   cycloids = derive2 { name="cycloids"; version="1.0"; sha256="00pdxny11mhfi8hf76bfyhd1d53557wcbl2bqwjzlpw5x3vdnsan"; depends=[]; };
   cymruservices = derive2 { name="cymruservices"; version="0.2.0"; sha256="1pgk9llaz0glhgf3n60nq3xb8kp4jkk8paz4scxff3whyksxv4yn"; depends=[purrr stringr]; };
   cyphid = derive2 { name="cyphid"; version="1.1"; sha256="0ya9w8aw27n0mvvjvni4hxsr4xc8dd08pjxx7zkfl1ynfn5b08am"; depends=[fda]; };
+  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]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; };
+  d3r = derive2 { name="d3r"; version="0.6.1"; sha256="1j69rm37j4q6dwhqprr9cmcl2x9qlmjas025kzl5fagb554dkgy8"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
-  dCovTS = derive2 { name="dCovTS"; version="1.0"; sha256="0lw4xdab231q83nmw2sx2abdwwqa0g7smzw14h6dabbzcdjw8h99"; depends=[doParallel energy foreach]; };
+  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]; };
   dHSIC = derive2 { name="dHSIC"; version="1.0"; sha256="1vyrfzgb0mjddy89jagf9zqkw18b83yn6v2amhb333vnd56644fk"; depends=[]; };
-  dMod = derive2 { name="dMod"; version="0.1"; sha256="0170hvgngwxr0qfl7knmj0l2gg053xj5yfd5hkfyjnl6ivcsw3c9"; depends=[cOde ggplot2 trust]; };
-  dad = derive2 { name="dad"; version="1.0.2"; sha256="06zgvspmq7vj23ir1yjxhavai282lxx14m8h18qjgwvw7q5c993y"; depends=[e1071 lattice]; };
-  dae = derive2 { name="dae"; version="2.7-6"; sha256="1mh4kprzzi3s6n9lfz1gq0djm9inlkydq43qpvm7wljk2hbcdqnr"; depends=[ggplot2]; };
-  daewr = derive2 { name="daewr"; version="1.1-6"; sha256="1gk7hs7m4ma505i6n8wf3c9ifzz93w8qljmb03xf13c9qchrqi61"; depends=[BsMD FrF2 lattice]; };
-  daff = derive2 { name="daff"; version="0.1.4"; sha256="1g08m9qyrlwxdy9w18132dc9klz6ayw5jbn700vkzvqibfc1l7cx"; depends=[jsonlite V8]; };
+  dMod = derive2 { name="dMod"; version="0.3.2"; sha256="1m0rpq78h2vhgl07jsk94hf03zj42wjc08hi6q5lqj77czwpaxfg"; depends=[cOde ggplot2 stringr trust]; };
+  dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; };
+  dad = derive2 { name="dad"; version="2.0.0"; sha256="0s9x8h6d3vy0y9in54abcm7y80qnywxbyh5l8ds4sv35y6j5j4pz"; depends=[e1071 lattice]; };
+  dae = derive2 { name="dae"; version="2.7-20"; sha256="13nw3q0r17g1xsnnlggf4x6pd5ycg6vy34gy7pk5509mh0hfj38w"; depends=[ggplot2]; };
+  daewr = derive2 { name="daewr"; version="1.1-7"; sha256="01n9g3adjk66wx9lm9gl6wa3y9ba5w0w0p5ayj8rx5ywxnm8fnvi"; depends=[BsMD FrF2 lattice]; };
+  daff = derive2 { name="daff"; version="0.2.0"; sha256="1yfydnfghh8943sa206jps55par4nzghqvd7xqi8xm0zimn0p7rn"; depends=[jsonlite V8]; };
   dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; };
   dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; };
   dagbag = derive2 { name="dagbag"; version="1.1"; sha256="1hpg7fs1yhnycziahscymkr0s3a2lyasfpj0cg677va73nrpdz12"; depends=[]; };
-  dagitty = derive2 { name="dagitty"; version="0.1-9"; sha256="077dnhg6wwi82ncn369mygdam0a5db1521kfng68aba2h540zm1a"; depends=[boot jsonlite MASS V8]; };
-  dams = derive2 { name="dams"; version="0.1"; sha256="0h0chh9ahsfvqhv1a0dfw88q7gdl1d0w11qcw0w4qmc2ipsl52i6"; depends=[RCurl]; };
-  darch = derive2 { name="darch"; version="0.10.0"; sha256="0hs7w4p4azmbiif5b3fi4pngl33v16afwm2lnv8yhykh94y6y96q"; depends=[ff futile_logger]; };
+  dagitty = derive2 { name="dagitty"; version="0.2-2"; sha256="11jpjr2l89glr9962mbhy4dfbdjs80nf603w90xx16s4qcmcsghc"; depends=[boot jsonlite MASS V8]; };
+  dam = derive2 { name="dam"; version="0.0.1"; sha256="1b0fi3l8jxgpr9fwvi03giq7wm39msbh0c82ffgkh54a3bbf5blc"; depends=[]; };
+  dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; };
+  darch = derive2 { name="darch"; version="0.12.0"; sha256="17nvxqxbbdv4qdallld5f2c6nhhszsz7ja04rhz5g3844s87bv2f"; depends=[caret futile_logger ggplot2 Rcpp reshape2]; };
+  darksky = derive2 { name="darksky"; version="1.0.0"; sha256="03vdzxz5wxwsjz08rg18zsmrg4n7dpgrrm70zrqa5pmyq1swhh2n"; depends=[dplyr ggplot2 gridExtra gtable httr]; };
   darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
   dashboard = derive2 { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
-  data_table = derive2 { name="data.table"; version="1.9.6"; sha256="0vi3zplpxqbg78z9ifjfs1kl2i8qhkqxr7l9ysp2663kq54w6x3g"; depends=[chron]; };
-  data_tree = derive2 { name="data.tree"; version="0.3.0"; sha256="0imji1kvh9749sz3mqd9avqkcb73svw0vd9i8q5bwzqniqnkpzwi"; depends=[DiagrammeR R6 stringr]; };
+  dat = derive2 { name="dat"; version="0.1.0"; sha256="1gpanrwgj7qgp4r033qfpk0a3xjk4ww1fa1bz80k9g4a0dizlcw0"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
+  data_table = derive2 { name="data.table"; version="1.10.4"; sha256="0ykbjr1x50ajxbri385vi3mnxj7zg1dcgh9y0snp341qmmmdypw6"; depends=[]; };
+  data_tree = derive2 { name="data.tree"; version="0.7.0"; sha256="0rgpapxsqnbzjcifnz3p41b6j8h9x2yfixr5ryd03v8vzgikyf9b"; depends=[DiagrammeR R6 stringr]; };
+  dataMaid = derive2 { name="dataMaid"; version="0.9.2"; sha256="13wim5375vlhaba2gawjb7lykzfj4py89cdhip44xaq19agg5675"; depends=[ggplot2 gridExtra haven pander rmarkdown robustbase]; };
   dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
-  dataRetrieval = derive2 { name="dataRetrieval"; version="2.5.2"; sha256="0j8jjzillxagyrm55ymm7xi502cigyzfidrq732rih56904lww2y"; depends=[curl dplyr httr lubridate readr reshape2 XML]; };
+  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.1"; sha256="0b5abanxk5l2vigchw8ir7akl2n4lbjxqndkkkf2c1sh7sx5hs4i"; depends=[dplyr magrittr]; };
-  datadr = derive2 { name="datadr"; version="0.8.5"; sha256="1nlwfaidpypznc0yqfwx2z040pl40fm2l2dm8qzb68klvabgd0kn"; depends=[codetools data_table digest dplyr hexbin magrittr]; };
-  dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.6"; sha256="18m4cbr3pxdn5ynxwd8klwwli3cyfjcn83pl17sn1rbavqlnkq5c"; depends=[]; };
-  datafsm = derive2 { name="datafsm"; version="0.1.0"; sha256="1xnv55ls64b7b0ipr2zn5g6kg7f50bb5pnaxh3nz79yhawdr74fz"; depends=[caret GA Rcpp]; };
+  datacheckr = derive2 { name="datacheckr"; version="0.1.2"; sha256="1z9r7f82rl6x63bl6mcvdvb0pbc6n0202vn9hh0lqf86qz30q7dp"; depends=[dplyr magrittr]; };
+  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]; };
-  datastepr = derive2 { name="datastepr"; version="0.0.1"; sha256="1dzx7mw9hl2f8q638m3vwva7mdlb59bgjc5rmpcjb5nxmylpx0vk"; depends=[dplyr lazyeval magrittr R6 rlist]; };
+  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]; };
+  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]; };
   dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
-  date = derive2 { name="date"; version="1.2-34"; sha256="066zsddpw87x1bhl3479k6fd1wrl3x91n5rd454diwmwq2s8i5qb"; depends=[]; };
+  date = derive2 { name="date"; version="1.2-37"; sha256="0321kqvpy5cvl8hmm6pd0pyjpi30glm8hvw60mrql6y28sn6pqhl"; depends=[]; };
   dave = derive2 { name="dave"; version="1.5"; sha256="0sw9hc4y9wdfbnnk6isg7z7sky6ni68pkjxdlrph5m7jcyqphz96"; depends=[labdsv vegan]; };
   dawai = derive2 { name="dawai"; version="1.2.1"; sha256="0i0vgd4kia2hgx88rjdyi0y8hikzii4mwgal46c9iiqb6gmf8vrj"; depends=[boot ibdreg mvtnorm]; };
   dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
   dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
-  dbarts = derive2 { name="dbarts"; version="0.8-5"; sha256="1w170mdfl5qz7dv1p2kqx0wnkmbz2gxh2a4p7vak1nckhz2sgpgn"; depends=[]; };
+  dbarts = derive2 { name="dbarts"; version="0.8-7"; sha256="0wmwg8g8xy83yv4wpdpas3jjs5jxx258wh9463q30a8hnr3izc0l"; depends=[]; };
+  dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
+  dbhydroR = derive2 { name="dbhydroR"; version="0.2-2"; sha256="06m1llg1il0v4v8yi62z26hglzrhzw009y81xpb9zaphcviqp2qr"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
-  dbmss = derive2 { name="dbmss"; version="2.2-4"; sha256="13dvdylra6ladpvgm3imad6wqqb1gaqhbb3s5l2lywx58kxrpnl8"; depends=[cubature Rcpp RcppParallel spatstat]; };
-  dbscan = derive2 { name="dbscan"; version="0.9-6"; sha256="1a7x190lsz53p5n54zcmv02940ikpnc3jw8irybcal79yf0nqmb9"; depends=[Rcpp]; };
+  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]; };
   dbstats = derive2 { name="dbstats"; version="1.0.4"; sha256="1miba5h5hkpb79kv9v9hqb5p66sinxpqvrw9hy9l5z4li6849yy1"; depends=[cluster pls]; };
   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]; };
@@ -3674,23 +4534,29 @@ in with self; {
   dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
   dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
   ddR = derive2 { name="ddR"; version="0.1.2"; sha256="00mb9xq69dvl50v5429nw0mjazgjwh2sp98w8n2cwhhamjgp42k9"; depends=[Rcpp]; };
-  ddalpha = derive2 { name="ddalpha"; version="1.1.3.1"; sha256="0vi7crw30mfpllmspicilz1vwhbsmlzx2mfs53kv2hs8vj7r1in8"; depends=[BH class MASS Rcpp robustbase]; };
+  ddalpha = derive2 { name="ddalpha"; version="1.2.1"; sha256="0nsd515x6bap1qpfyx141hyldmpmyasnhv0f8s9dj6zcklp89af4"; depends=[BH class MASS Rcpp robustbase]; };
   ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
-  ddpcr = derive2 { name="ddpcr"; version="1.1.2"; sha256="0xz8ms77k24k47scs9x4vipdj370id783dxk30rdi94xcg8hns6m"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
-  ddst = derive2 { name="ddst"; version="1.03"; sha256="0zbqw4qmrh80jjgn8jzbnq3kykj1v5bsg6k751vircc0x9vnig3j"; depends=[evd orthopolynom]; };
-  deSolve = derive2 { name="deSolve"; version="1.13"; sha256="1amxkzakk5ipz06z50wm61i5p4a5kfvjqad5whwp6n5xq5msx621"; depends=[]; };
-  deTestSet = derive2 { name="deTestSet"; version="1.1.2"; sha256="142261xjlz6h9vakiks04rz7hgv9b5j6s77acavd5s5mpi51ysh7"; depends=[deSolve]; };
+  ddpcr = derive2 { name="ddpcr"; version="1.6"; sha256="1jwrggj9cbq31z8qcfhfm3zb4z7jir8kkmjg7yqs5nmpl41pv5jn"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
+  ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; };
+  deBInfer = derive2 { name="deBInfer"; version="0.4.1"; sha256="05khyjpyxwrm9q8jsysffgsjpjbw76w9rrl7i8ia0yc9lv0bzjc9"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
+  deSolve = derive2 { name="deSolve"; version="1.14"; sha256="1c4yv5xjk36xwjs0ywxfas1f2xcg05ppf4380s0l3k7gl7vx44g4"; depends=[]; };
+  deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; };
+  deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; };
   deal = derive2 { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
   deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
   debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
-  decisionSupport = derive2 { name="decisionSupport"; version="1.101.1"; sha256="08qcvdwp0wgspnfnlhkpxz3p6y43pjf32p185knw8g81wr1950ip"; depends=[msm mvtnorm]; };
+  debugme = derive2 { name="debugme"; version="1.0.1"; sha256="14yhkvh05748jfn2dsdllflsjnjljhjm8kkzzqb7zcp6qjylwcys"; depends=[crayon]; };
+  decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; };
+  decisionSupport = derive2 { name="decisionSupport"; version="1.101.2"; sha256="0zmf87wjrpkg12ix8dz3asrwldwvclj1ifvzff46zgipdm3viqr0"; depends=[msm mvtnorm]; };
   decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
-  decompr = derive2 { name="decompr"; version="4.1.0"; sha256="1agzfy7iyyzh71pb56l7438bvpsx0q2z9mxh16fc8mfnywcl2jr2"; depends=[]; };
+  decoder = derive2 { name="decoder"; version="1.1.12"; sha256="0jacp5fqi3l87a86kzhivwd7bl9ndcpymw1vkzmr9r5my8d119pk"; depends=[backports]; };
+  decompr = derive2 { name="decompr"; version="4.5.0"; sha256="1kbk4z1pr1j4i1sgfkjxzjy2j2fcmrf3vacnrpv1fba2ib10619k"; depends=[]; };
   decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
-  deconstructSigs = derive2 { name="deconstructSigs"; version="1.6.0"; sha256="1gs8ym0h99zh0ccd8akl72sj5lbangadh3fn5vwb6al7qgzpflfz"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 reshape2]; };
+  deconstructSigs = derive2 { name="deconstructSigs"; version="1.8.0"; sha256="014x0nb23jb98666kaav2phkvmkr38pi38jv0dqd4jv7zp0gdf1a"; depends=[BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb reshape2]; };
+  deconvolveR = derive2 { name="deconvolveR"; version="1.0-3"; sha256="1b6ghds0mj9nv4nypfx0w6sm6q9k83mbprk546ird3pza6ncjqbi"; depends=[]; };
   deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; };
-  deductive = derive2 { name="deductive"; version="0.1.0"; sha256="1ivjn7v92v64gkbij5yqsr1090gnxjxxvnvmns1dwvycz32va6dp"; depends=[lintools stringdist validate]; };
-  deepboost = derive2 { name="deepboost"; version="0.1.4"; sha256="08h1r9ganbcy2bljs7kccws16zs9ns0n0qspj8qczf87ya93vhfj"; depends=[Rcpp]; };
+  deductive = derive2 { name="deductive"; version="0.1.1"; sha256="09illy2zxbn7xi3vl4m0d40h1dsci3qfwhyd3wqdkb89grbysacq"; depends=[lintools stringdist validate]; };
+  deepboost = derive2 { name="deepboost"; version="0.1.5"; sha256="1varzk3dlsxl8y1p4cblw3ivk5h088agsxar02jbl9hs3r6pj17l"; depends=[Rcpp]; };
   deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
   deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; };
   degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
@@ -3700,52 +4566,66 @@ in with self; {
   deltaPlotR = derive2 { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; };
   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-3"; sha256="1nkvsjms1gfvjz5l7zza0cgx4yqmn2kgnax44pysn0zqmhfny8bw"; depends=[]; };
-  demography = derive2 { name="demography"; version="1.18"; sha256="17r7sz5ikngc4qg495wmn99xawmllpx7rw2gpv8q8bypbc47wlfv"; depends=[cobs forecast mgcv RCurl strucchange]; };
-  dendextend = derive2 { name="dendextend"; version="1.1.8"; sha256="0ssf0fzs1h2jc4p8p2z9fyf4f0p9942z3zrkawyafddbixkkz7vh"; depends=[magrittr whisker]; };
+  demoKde = derive2 { name="demoKde"; version="0.9-4"; sha256="0p4v808m42wbv8ibdfqzm43cbbg0yl452wnm1mzqq2n37z6yljkr"; 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]; };
   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=[]; };
-  denovolyzeR = derive2 { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cvywsnh07wldv6vcb8sn7f1divpaw8f6gnw7mnhimd"; depends=[dplyr reshape]; };
+  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=[]; };
   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=[]; };
-  depend_truncation = derive2 { name="depend.truncation"; version="2.4"; sha256="09jcg6gr4dy0ayayn8qvbgncnw6v76xzif90c7v64a09snhh8qv6"; depends=[mvtnorm]; };
+  depend_truncation = derive2 { name="depend.truncation"; version="2.5"; sha256="0g9p7a6p15shd1cl5rwxzi2m5llmj22hk94f2d9g693j3gccfzfa"; depends=[mvtnorm]; };
   depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; };
-  depth = derive2 { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind circular rgl]; };
+  depth = derive2 { name="depth"; version="2.1-1"; sha256="17fxv4a5fbb65p7kmb4iakik5ng6401y7gmknkfr66fmjq65i1sm"; depends=[abind circular rgl]; };
   depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; };
   depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
-  dequer = derive2 { name="dequer"; version="1.0"; sha256="1xf2kl6ppgsplqwhxxyak39575bjijh81snq534yndf31pdqqhd7"; depends=[]; };
+  dequer = derive2 { name="dequer"; version="2.0-0"; sha256="1cvc201g6jc0y09vccswsvvwlmxi7w8raffpald4b3pin10zfr6q"; depends=[]; };
+  derivmkts = derive2 { name="derivmkts"; version="0.2.2"; sha256="00bcffqzzsm2h4gfwri772q8i7h40xhv07wl8xj682fnlk246ggs"; depends=[mnormt]; };
+  desc = derive2 { name="desc"; version="1.1.0"; sha256="0mc1jmiwqyj7s6gzxz6fyamzjpmdn3rpfpllby2fq11ml30c6jpr"; depends=[assertthat crayon R6 rprojroot]; };
   descomponer = derive2 { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
-  descr = derive2 { name="descr"; version="1.1.2"; sha256="1bqr63s2w0gak117506f5v7k9wfj08cn6jy6idw5ii7x6jjh6xx7"; depends=[xtable]; };
+  descr = derive2 { name="descr"; version="1.1.3"; sha256="0fp91gbxxxvn2hqdyddhb3x85031wgq7gnqrhzjr956prlv086r6"; depends=[xtable]; };
   describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; };
+  descriptr = derive2 { name="descriptr"; version="0.1.0"; sha256="11fq98zpzvjgzihh4431javsznvhqgfrhf86m33j6fnxh3gg4d0z"; depends=[dplyr magrittr]; };
   deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
-  desiR = derive2 { name="desiR"; version="1.2"; sha256="0hznl6qf5np797j7a63sgggxrkz483fcfp42525vswgw3qsjvxlp"; depends=[]; };
+  desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; };
   designGG = derive2 { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
   designGLMM = derive2 { name="designGLMM"; version="0.1.0"; sha256="0ya246mqclkhg8cq6f5mzqn67qks22f3fribyjcvhrx395n0f21v"; depends=[]; };
-  designmatch = derive2 { name="designmatch"; version="0.1.1"; sha256="0s0mlisczf15zdw7jcl6lc4rhbzhfbpjjp2k64sjlvykcmzx5f04"; depends=[lattice MASS Rglpk slam]; };
-  desirability = derive2 { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; };
+  designmatch = derive2 { name="designmatch"; version="0.2.0"; sha256="1l6504yfrlx24n7r0dd6g66rzjg35yz3s4niyg25mc8biwqags6y"; depends=[lattice MASS Rglpk slam]; };
+  desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
-  desplot = derive2 { name="desplot"; version="1.0"; sha256="1x8x0nqmirmx4l8cdl5fqy01j5ljlnldjh5yz06qwjv4ykqd41dc"; depends=[lattice reshape2]; };
+  desplot = derive2 { name="desplot"; version="1.1"; sha256="0lqamq90hajrz43crych8a1k5m645ljhy1rmxjk9vyl4hwrbk5dc"; depends=[lattice reshape2]; };
   detect = derive2 { name="detect"; version="0.4-0"; sha256="119kvkgpgd12v31ps1bg5dmc9djkaqzls548nlrvn1pbmahfnfx5"; depends=[Formula pbapply]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
-  devEMF = derive2 { name="devEMF"; version="2.0"; sha256="19wraakvf7xsf1i108dz3ipl1hdixgwa6h0bizxfyajw5yqmw8mw"; depends=[]; };
-  devtools = derive2 { name="devtools"; version="1.10.0"; sha256="11x51bqhjwypbxv5sfnrnxx06b92k8kzmmx7zrwk3537r072b6pa"; depends=[digest git2r httr jsonlite memoise rstudioapi whisker withr]; };
+  detzrcr = derive2 { name="detzrcr"; version="0.1.2"; sha256="0hw88kizz0kcz4i1lqz30gixiq7im91875p2wpvbnzyxhs3n04vi"; depends=[ggplot2 MASS shiny]; };
+  devEMF = derive2 { name="devEMF"; version="3.3-1"; sha256="1s0rmw3gsyj28ywlkfdjr98fr7cjhmzb0fq5qn9s91dw9a3fx8zf"; 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-5"; sha256="1dswkx3wqcpil6xs6xifr596iqy15ld473hdlrb6p760alqzx13s"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
+  dfcomb = derive2 { name="dfcomb"; version="2.1-6"; sha256="14jyagnrsbzdwcfy0z6c9gwbv40xrnany43ylpks6qgnq4rya7a2"; 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-3"; sha256="0rmgjwqn4qwhs0yfzq417k1w0cgya903a8g3zm6p3fksmvyz4hyk"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
-  dfoptim = derive2 { name="dfoptim"; version="2011.8-1"; sha256="19j0h5xdrbmykz2nrjrwqwaw7466zvqaiwafrm1jc12mk5azfcqx"; depends=[]; };
+  dfmta = derive2 { name="dfmta"; version="1.3-4"; sha256="18lmgpv6jhjs15difiq0jck6kf898ngr2g13wrf3y5s5xc70iwkp"; 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]; };
   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="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; };
-  dglm = derive2 { name="dglm"; version="1.8.2"; sha256="1bxdvalwinn814rdsy7pjrx87wpz7kl67w1136rnf1sc8yly6j5f"; depends=[statmod]; };
+  dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
+  dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; };
   dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
-  dhglm = derive2 { name="dhglm"; version="1.5"; sha256="0n3878bx8vwf7na6plvdg9m1rd9qg7450g6mpx955d3s2bg320x0"; depends=[boot Matrix numDeriv]; };
+  dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; };
+  dhglm = derive2 { name="dhglm"; version="1.6"; sha256="0xb9kn87zv4xc9rwq0w6hxsc47vhdx59akjp4nv1ffz69y03h5wv"; depends=[boot MASS Matrix numDeriv]; };
+  diagis = derive2 { name="diagis"; version="0.1.0"; sha256="12k4z0j5nmacy8ddi8ddyn8fabg6k728hms6x1sjnghr2wwns5cw"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo]; };
   diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; };
   diagram = derive2 { name="diagram"; version="1.6.3"; sha256="1iga574r31hz7g50nmicbah4rj4l46w6lgw3sz1b69iv6hpp7sq1"; depends=[shape]; };
   diaplt = derive2 { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
@@ -3754,105 +4634,126 @@ in with self; {
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
   diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; };
-  difR = derive2 { name="difR"; version="4.6"; sha256="1803j0ql1g8gdy9i0wy4sz9sbl52dqjqcwbnknyrb34r51jmij5k"; depends=[lme4 ltm]; };
+  difNLR = derive2 { name="difNLR"; version="1.0.0"; sha256="123r6r3n90x87p2pzsfbrcmfqjv4vb9jm0s4bq6byk1pbhsrw2ah"; depends=[CTT ggplot2 nnet reshape2]; };
+  difR = derive2 { name="difR"; version="4.7"; sha256="17i8l4z7dw8nfr4b5pc72l1qm7byjcflh58kasafx9kxyvfgz258"; depends=[lme4 ltm]; };
   diffEq = derive2 { name="diffEq"; version="1.0-1"; sha256="1xmb19hs0x913g45szmm26xx5xp85v182wqf0lnl4raxaf47yhkm"; depends=[bvpSolve deSolve deTestSet ReacTran rootSolve shape]; };
   diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; };
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
   diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
+  diffobj = derive2 { name="diffobj"; version="0.1.6"; sha256="0f6wskh3nl8ngh195x8wiv1g0fc690r4zh4ypkraqd2c6x1iskg7"; depends=[crayon]; };
   diffr = derive2 { name="diffr"; version="0.0.1"; sha256="0lhk9vm9gp0pwzsniy49dgq9vd4c1bxf8c8w8ib4b4fg5jq3hfwj"; depends=[htmlwidgets]; };
   diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
+  diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
+  diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; };
   diffusionMap = derive2 { name="diffusionMap"; version="1.1-0"; sha256="1l985q2hfc8ss5afajik4p25dx628yikvhdimz5s0pql800q2yv3"; depends=[igraph Matrix scatterplot3d]; };
-  digest = derive2 { name="digest"; version="0.6.9"; sha256="0ixy1mb7kfl20lkckqiilpw03g1ip4ibihs03gicz7w625hc7zcm"; depends=[]; };
+  diffusr = derive2 { name="diffusr"; version="0.1.0"; sha256="14fzfr2i2qwbgc2rihqz4p8id6wrlvn0b5cvfrrvks6d62fk3zn2"; depends=[Rcpp RcppEigen]; };
+  digest = derive2 { name="digest"; version="0.6.12"; sha256="1awy9phxdvqnadby7rvwy2hkbrj210bqf4xvi27asdq028zlcyd4"; depends=[]; };
   digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; };
+  digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; };
   dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; };
+  dimRed = derive2 { name="dimRed"; version="0.0.3"; sha256="0rmw55g0vmvpk26akxjqp7d4wlkfrjz1j28azmwc5vmhimffl3vx"; depends=[DRR]; };
   dina = derive2 { name="dina"; version="1.0.1"; sha256="1wjnpmjwvji41afp5pqx28w36a8jmszlcw0d3b8j82j681a5h882"; depends=[Rcpp RcppArmadillo]; };
   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.2"; sha256="0wzmlahqcrb5f3hrlym5gs5wizmgvhndky7zvc98324bq645b56m"; depends=[calibrate rgl]; };
+  directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; };
   directlabels = derive2 { name="directlabels"; version="2015.12.16"; sha256="0vi9zbc2sa8fpi2n2ax1ni9f8s9w1hc0f6gahk8fcrmnagj4g089"; depends=[quadprog]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
-  discSurv = derive2 { name="discSurv"; version="1.1.2"; sha256="02jk2qz029i3rxikbfq66g9246gangmbzhq1cl8hxib0891j535b"; depends=[functional mgcv mvtnorm]; };
+  discSurv = derive2 { name="discSurv"; version="1.1.5"; sha256="0lbzaalh1jack49px47sqsmpwmv14w4h1y2r9k294921d02zl0w5"; 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]; };
   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]; };
   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.0"; sha256="0hypk2y92x2q5jxm5qyjkzvqldz5037gclnxa6qx64bwylv2viam"; depends=[sp]; };
-  dismo = derive2 { name="dismo"; version="1.0-15"; sha256="0ahm80dp839wfx04f9qkc4wwydidhqaiajba7jynqk60kw8hhl7g"; depends=[raster sp]; };
+  diseasemapping = derive2 { name="diseasemapping"; version="1.4.2"; sha256="065ndvpx3q9ycxfjl1f2iy3s23d7qf27s1qz31ppx0n929jynn6n"; depends=[sp]; };
+  diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; };
+  dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; };
   disp2D = derive2 { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
-  disparityfilter = derive2 { name="disparityfilter"; version="2.1"; sha256="0ld43hd4dr389pd8sncslp707jyfgbx7w1larq75gkzjykc29aqw"; depends=[igraph]; };
+  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=[]; };
   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]; };
   distcomp = derive2 { name="distcomp"; version="0.25.4"; sha256="0drh7a79nvc6l6c0q2k9hva6kpb8ik6q2aiynp8ab8pf0dh84h6d"; 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]; };
-  distr = derive2 { name="distr"; version="2.5.3"; sha256="13ssdidbh4x534f0vvhfpi5cdrhlpmrz8s0y33q7ccf3dfmdsyan"; depends=[sfsmisc startupmsg SweaveListingUtils]; };
-  distrDoc = derive2 { name="distrDoc"; version="2.5.1"; sha256="02wcqy9z36lxkpxy42vj1yv7x2v3i57rngpw58s7immzp5j3dlam"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg SweaveListingUtils]; };
-  distrEllipse = derive2 { name="distrEllipse"; version="2.5"; sha256="1slzzmcf09mqqba287rpgpwbsq6j5lprjgxda5lrc21znvrgfxn3"; depends=[distr distrEx distrSim mvtnorm setRNG]; };
-  distrEx = derive2 { name="distrEx"; version="2.5"; sha256="0mbccd53r9wl875i702j14wlrv7pjgrwzlnyc511cqa5pg3mn81i"; depends=[distr]; };
-  distrMod = derive2 { name="distrMod"; version="2.5.3"; sha256="1xa6a8fxhb87z4bimvnrylm63q9m90kmm49w2dik79a9d5x5q29b"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; };
-  distrRmetrics = derive2 { name="distrRmetrics"; version="2.5"; sha256="0c7fhckw7hav68gag8ymgicywl2vbnvqpjxca0x24wpdi1gs4jf6"; depends=[distr fBasics fGarch]; };
-  distrSim = derive2 { name="distrSim"; version="2.5.2"; sha256="0ipg4l2vyifaj1r9a4cc8kg32s65jpz5wxrlnrix95xk5wasdpbh"; depends=[distr setRNG]; };
-  distrTEst = derive2 { name="distrTEst"; version="2.5"; sha256="1swl4v70gkkpidddsgqf0dqz9j0xz5j1wk44bhpi4ficim7hap3l"; depends=[distrSim setRNG startupmsg]; };
-  distrTeach = derive2 { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dvcvmprhhj2j1yl3lpizsi8mdqr19zcp6dw21k"; depends=[distr distrEx]; };
+  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]; };
+  distrEx = derive2 { name="distrEx"; version="2.6"; sha256="10gx646xg2rysj9p3pf1a13fqibs84i2nlvxppf3vc5z74vjxk4a"; depends=[distr startupmsg]; };
+  distrMod = derive2 { name="distrMod"; version="2.6.1"; sha256="1i7b08i8zjv2k4p2j1nlqbyjrcapf52k2my83i75hcrjqdy8r3sv"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; };
+  distrRmetrics = derive2 { name="distrRmetrics"; version="2.6"; sha256="077ryxl6l6fql81nsl7dm16pawsqd0l6ljfpkrnzjab4mljqaxgp"; depends=[distr fBasics fGarch startupmsg]; };
+  distrSim = derive2 { name="distrSim"; version="2.6"; sha256="1kq85ivnw4mplpr2jmc2w19kvk0d1wffz6laypay2j5gyd8fm44x"; depends=[distr setRNG startupmsg]; };
+  distrTEst = derive2 { name="distrTEst"; version="2.6"; sha256="1c0xwpyr5gs89psiflcz5dplsb1g9r651jiqg8nxcqa05r9kyhkr"; depends=[distrSim setRNG startupmsg]; };
+  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.1"; sha256="13vgnjifvjsrhh3ns5l2gxwf80bg3a3j3n9ycblzjyjpl7i1960i"; depends=[caTools geosphere KernSmooth quantreg]; };
   diveRsity = derive2 { name="diveRsity"; version="1.9.89"; sha256="0f75dak14x9x9xs6ql9686n6w1f0w5g6h5ya983mg547f1zzbw9m"; depends=[ggplot2 qgraph Rcpp shiny]; };
-  diverse = derive2 { name="diverse"; version="0.1.1"; sha256="1k4fxaizasv47cnlijm8dhdb5lagqrmhn6g0nk6mhca21n3qdjsd"; depends=[foreign proxy reshape2]; };
-  diversitree = derive2 { name="diversitree"; version="0.9-8"; sha256="02cr8wrahm3kljj7gpmfwadjlca04a8gvm0i65436yj2lh4vxqa8"; depends=[ape deSolve Rcpp subplex]; };
+  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]; };
   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=[]; };
+  dlib = derive2 { name="dlib"; version="1.0"; sha256="0d6p28r86jq7gwqh3njnsfgl6mmgx7famqx7p1xmra91cdlp3hqj"; depends=[Rcpp]; };
   dlm = derive2 { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; };
   dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
   dlmodeler = derive2 { name="dlmodeler"; version="1.4-2"; sha256="06gqvk2wrzz4kpsh4vyrbqwmxirsvg78qj7clvcxdac0sfqn4gl7"; depends=[KFAS]; };
-  dlnm = derive2 { name="dlnm"; version="2.2.3"; sha256="0b9gicyhdkx0pd0l883qr1sxmxi0qpwjk4allwp0dpr5y1nnrkzg"; depends=[mgcv nlme tsModel]; };
+  dlnm = derive2 { name="dlnm"; version="2.3.2"; sha256="1gkpdy1mgnhiabfrfi41p3n8kzh2l480qrf3v50n8p3xcjamiagp"; depends=[mgcv nlme tsModel]; };
+  dlsem = derive2 { name="dlsem"; version="1.7"; sha256="087yb5psc0yklpa5fpfazi1y5ngl8hmibfm9yfyvw652z6ykyvka"; depends=[graph gRbase nnet Rgraphviz]; };
+  dlstats = derive2 { name="dlstats"; version="0.0.9"; sha256="0dgd4f8whk94whk9larvsp5axwijcdv5ib33akdysf25zf191mi2"; depends=[jsonlite magrittr]; };
   dma = derive2 { name="dma"; version="1.2-3"; sha256="00nwx0835i4njlqxzizs9v29d3xkq2i7rdd24xzc9bzd0c4naq4d"; depends=[MASS mnormt]; };
   dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; };
-  dmm = derive2 { name="dmm"; version="1.6-3"; sha256="15c5hvjjnr9c4sg34jx31abldjladls73rsszkqsdpd95li334xg"; depends=[MASS Matrix nadiv pls robustbase]; };
+  dmm = derive2 { name="dmm"; version="1.7-1"; sha256="0ihzbv2vlymyr1l0xi0jmx0xgpbj46azd7gwr3m9qsgnjp7wc1p8"; depends=[MASS Matrix nadiv pls robustbase]; };
   dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; };
+  dmutate = derive2 { name="dmutate"; version="0.1.1"; sha256="14lv16lqvlccf84s1g1qrz88y732qzb9545skg6fjrldcr8b0hl4"; depends=[dplyr]; };
   dna = derive2 { name="dna"; version="1.1-1"; sha256="0gw70h1j67h401hdvd38d6jz71x1a6xlz6ziba6961zy6m3k5xbm"; depends=[]; };
-  dnet = derive2 { name="dnet"; version="1.0.7"; sha256="0aa64y7mm1xan34h1pimajm7hvlm7z3r9rikysc2dw5dskkhli40"; depends=[Biobase graph igraph Matrix Rgraphviz supraHex]; };
-  doBy = derive2 { name="doBy"; version="4.5-14"; sha256="01dhigi6qj0lmhas2d06ysm7ph71rfk5kj5sbivxi8a2dx8f73yl"; depends=[MASS Matrix survival]; };
+  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]; };
   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]; };
   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.3.3"; sha256="1vpq5q3kfgwijrgblvfipxqkw0m75rahnlmddpiyfgziyszbmidm"; depends=[stringr]; };
-  docopulae = derive2 { name="docopulae"; version="0.3.2"; sha256="1r5kva5z15nw1mdb3jma722ajj5mic9jrfj9x993nf8mz7lvsc19"; depends=[]; };
+  docopt = derive2 { name="docopt"; version="0.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; };
+  docopulae = derive2 { name="docopulae"; version="0.3.3"; sha256="13889sj509gbl9zs7jqdvslp6sc81jv54cbqh1wpp834jp5s1q3x"; depends=[]; };
   documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-  docxtractr = derive2 { name="docxtractr"; version="0.1.0.9000"; sha256="1g59xbg86qh871q8cphjp7jzd1g1dglx4h2n7f48m9vj1ha87h02"; depends=[dplyr xml2]; };
-  domino = derive2 { name="domino"; version="0.2-7"; sha256="1wp2rikyggjvqpg29qjn3zcydyplmzhmbgq3xxrlq92swdyzmyy5"; depends=[]; };
-  dosresmeta = derive2 { name="dosresmeta"; version="1.3.2"; sha256="1v0hf8x0qjzhxwa60ri2vhjv05z9iaf90dvhpmjjjrgskb7qpcd9"; depends=[aod Matrix mvmeta]; };
+  docxtools = derive2 { name="docxtools"; version="0.1.0"; sha256="109fv2sg4dw6s10b4fx44npwvyr5yr69y7m701irqpc0bbwssh55"; depends=[dplyr ggplot2 pander stringr tibble 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=[]; };
-  dotenv = derive2 { name="dotenv"; version="1.0"; sha256="1lxwvrhqcwj9q24x30xzrw8qqhxgyr88ja3fajm5hf3pwbw85yls"; depends=[falsy magrittr]; };
-  dotwhisker = derive2 { name="dotwhisker"; version="0.2.0.5"; sha256="1sigvyymyw7ayjg984zmwzsa45ywarjfczbxki8vj04sgkns0ss4"; depends=[broom dplyr ggplot2 gridExtra gtable plyr stringr]; };
+  dotCall64 = derive2 { name="dotCall64"; version="0.9-04"; sha256="0qp6magpp0jaa0b9sfkbxd91afayl24kj0yrh0ix1v3ahdnaar8f"; depends=[]; };
+  dotenv = derive2 { name="dotenv"; version="1.0.1"; sha256="1xvzsnb6v904829lqxmypn56jkm98lw4wpcvljn8620w2wipark5"; depends=[]; };
+  dotwhisker = derive2 { name="dotwhisker"; version="0.2.3"; sha256="0q5l7vkypnh1rxlh5yd8jq4kql62wqf60gdpf7cds437w8fs8c01"; 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-1"; sha256="10lri6k4w1jm2d8r2vj8qdjpdyr33al1vbd9s3s02lh48v8qgzif"; depends=[cubature minpack_lm raster Rmpfr sp]; };
+  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]; };
   dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; };
-  dpcR = derive2 { name="dpcR"; version="0.3"; sha256="1k9gz1j1b25lhzw7ism7klahs1q8xfyq1wagj90j3nps9agn9chd"; depends=[binom chipPCR dgof e1071 multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; };
+  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=[]; };
-  dplR = derive2 { name="dplR"; version="1.6.4"; sha256="08h2l6af64g37fbaqx8y0phzca6x1ppvmk6mmqy73k03467jq6mk"; depends=[digest gmp lattice Matrix matrixStats png R_utils stringi stringr XML]; };
+  dplR = derive2 { name="dplR"; version="1.6.5"; sha256="0npprzn8jz57192d4mblzx3hcibbas085mvhhy69cz5n2rdj78jr"; depends=[digest gmp lattice Matrix matrixStats plyr png R_utils stringi stringr XML]; };
   dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
-  dplyr = derive2 { name="dplyr"; version="0.4.3"; sha256="1p8rbn4p4yrx2840dapwiahf9iqa8gnvd35nyc200wfhmrxlqdlc"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp]; };
+  dplyr = derive2 { name="dplyr"; version="0.5.0"; sha256="0ks5cklb03laqf5ygcw986g1lv7wk1ipvypjlha8xly2y4lvilwk"; depends=[assertthat BH DBI lazyeval magrittr R6 Rcpp tibble]; };
   dpmixsim = derive2 { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[cluster oro_nifti]; };
   dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; };
   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]; };
-  drat = derive2 { name="drat"; version="0.1.0"; sha256="0pcmgzgvkdlfh8nriqy2nvs3wqv3p072y9152g1k5xl71drbrdg6"; depends=[]; };
+  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="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[car gtools MASS multcomp plotrix scales]; };
-  drfit = derive2 { name="drfit"; version="0.6.4"; sha256="0n2dclq7y9npnhpx6nmidr4d6f3mn5z9ysjqp61yw1iwa4ymw3ks"; depends=[drc MASS]; };
-  drgee = derive2 { name="drgee"; version="1.1.4"; sha256="1hfaaan7yxnznrwn5f866kp70r37gzml455vmplynrhx6ddd3rwy"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
+  drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
+  drfit = derive2 { name="drfit"; version="0.6.7"; sha256="0sh447qfx310wb19xcr1sbpap3jbi1nhmdzdrd5695zh2zcav2p7"; depends=[drc MASS]; };
+  drgee = derive2 { name="drgee"; version="1.1.6"; sha256="01404mqvkvndn5gybq8dgkfc1cy9wk94p7k7i64h47w3zbkcwsax"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; };
   drm = derive2 { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
   drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; };
   dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; };
@@ -3860,98 +4761,129 @@ in with self; {
   ds = derive2 { name="ds"; version="3.0"; sha256="10xp575l0wh85wg32k3as02kgqm9ax9nx9i5kd5bkimfwg4qv745"; depends=[]; };
   dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; };
   dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; };
+  dslabs = derive2 { name="dslabs"; version="0.0.1"; sha256="1v47w75h9m911smg25w0bmxzjfc3yyig2npp9sfyfx61h6jdh5a2"; depends=[]; };
   dslice = derive2 { name="dslice"; version="1.1.5"; sha256="0qwz9rlgpgx0k28hca2m40ab0qad9rfp1gxswygchv7rcnl4f6ml"; depends=[ggplot2 Rcpp scales]; };
-  dsm = derive2 { name="dsm"; version="2.2.9"; sha256="147c94bk73ss7bcliz4a65zx0lhf3gap9ygcc82yvf7sibpasnqd"; depends=[ggplot2 mgcv mrds nlme statmod]; };
+  dsm = derive2 { name="dsm"; version="2.2.14"; sha256="1zcm4111qzl7mf160z7ax9gvvs627nig4zimxagzm2jdp004w10r"; depends=[ggplot2 mgcv mrds nlme numDeriv statmod]; };
+  dsmodels = derive2 { name="dsmodels"; version="1.0.0"; sha256="094kif1ffbqlznsfig1rqkpgjd6r7dnlwwmjnlhwax05xvv3dl92"; depends=[shape]; };
   dst = derive2 { name="dst"; version="0.3"; sha256="1gdf4sjk2svywx2m6z22d383xppsm6dm108w93pcwfs8fpcdwxb9"; depends=[]; };
-  dti = derive2 { name="dti"; version="1.2-4.1"; sha256="0wn5hksv8szxslf1v5z2wnkscj3igl76swrapp1i6zlf5j9cjqp7"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
+  dtables = derive2 { name="dtables"; version="0.2.0"; sha256="0ikgip3p4b7q97b2dshlx0fq09xsk304gfk5prw4rk95w9wck3qs"; depends=[psych]; };
+  dti = derive2 { name="dti"; version="1.2-6.1"; sha256="1p88k7qkmas49niq618jhddc0h4mwh5gd267v6rlzzpmv5f98fkb"; depends=[adimpro awsMethods gsl oro_dicom oro_nifti quadprog rgl]; };
+  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.1.0"; sha256="1897ns6f8hg6s8k710yvx48f5m0zai0ifnsan6iva749c0nmrvv3"; depends=[dtw ggplot2 proxy reshape2 scales waveslim zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="2.1.1"; sha256="160r5n02z5kswy6y9i62qmm3n390q7xrkbb7plshvksy1d024zn3"; depends=[caTools dtw flexclust foreach ggplot2 proxy reshape2 rngtools]; };
+  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]; };
   dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
   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.2"; sha256="1w2hhv1fajxc4mxdzl4fnaxw7qz5lg9kr0jj1sdbjcfzs5v1sfl4"; depends=[]; };
+  dunn_test = derive2 { name="dunn.test"; version="1.3.3"; sha256="1hkfv9p06gfv0j4fh299x0cm9rrvsbqv89kqddqf6fablxmqm7vh"; 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.3"; sha256="14ncna67qgknh20xdvxqddjhagj61niwpvz4ava9k0z68rgzmk5h"; depends=[RCurl XML]; };
-  dygraphs = derive2 { name="dygraphs"; version="0.8"; sha256="0jqwa021h6cgzgjcg0qg1j9wvszna64vin8cn2cd0pla57xbrdxp"; depends=[htmlwidgets magrittr xts zoo]; };
-  dyn = derive2 { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
-  dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.3"; sha256="1wgxxn0nlmza7npvjbkfq6nmp30n719yqrav6jzxcp00dk3ymg6g"; depends=[tcltk2 tkrplot]; };
+  dvn = derive2 { name="dvn"; version="0.3.5"; sha256="04di2gpdacivvd9bi96w6145k280s8blavdhi1w3rw4c7sc3hag2"; depends=[RCurl XML]; };
+  dygraphs = derive2 { name="dygraphs"; version="1.1.1.4"; sha256="0vwg9q7xrwxkm92d55ik9gdky42bj3jlh6fi4jzwyl5nfdswklb9"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
+  dyn = derive2 { name="dyn"; version="0.2-9.3"; sha256="00h75kqfpr77jhppnpxvykbdcmsmsb2vl2527xzq10wkvm7gfpvv"; depends=[zoo]; };
+  dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; };
   dynCorr = derive2 { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
-  dynRB = derive2 { name="dynRB"; version="0.6"; sha256="0kdbfhisw2ybqw1c7xcnlaqpsnj8vzh16iid69ajkvzxrm1qcwim"; depends=[caTools corrplot]; };
-  dynaTree = derive2 { name="dynaTree"; version="1.2-7"; sha256="06pw78j6wwx7yc175bns1m2p5kg5400vg8x14v4hbrz3ydagx4dn"; depends=[]; };
+  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=[]; };
   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]; };
   dynatopmodel = derive2 { name="dynatopmodel"; version="1.1"; sha256="100g131jmgb3by9j3v2n7f7jh9623vd7xf5frjkwrxvwzf0q1i3k"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; };
+  dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; };
   dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; };
-  dynlm = derive2 { name="dynlm"; version="0.3-3"; sha256="0ym23gv2vkvvnxvzk5kh6xy4gb5wbnpdbgkb5s6zx24lh81whvcs"; depends=[car lmtest zoo]; };
+  dynlm = derive2 { name="dynlm"; version="0.3-5"; sha256="1sjhhlvvcgmayb9dfwacv1g75c4lhbpzyczj6h7gkd19bcfbdhqp"; depends=[car lmtest zoo]; };
+  dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
+  dynr = derive2 { name="dynr"; version="0.1.8-17"; sha256="1q2rag00haniv2ffp6k7kr00zy11rpksa55sp8wymcb96x8m64mw"; depends=[ggplot2 latex2exp MASS Matrix numDeriv plyr reshape2 xtable]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
-  dynsurv = derive2 { name="dynsurv"; version="0.2-2"; sha256="0418r7adki48pg3h7i1mgv3xpbryi520va3jpd03dx15zrq8zaqg"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
-  e1071 = derive2 { name="e1071"; version="1.6-7"; sha256="1069qwj9gsjq6par2cgfah8nn5x2w38830761x1f7mqpmk0gnj3h"; depends=[class]; };
-  eHOF = derive2 { name="eHOF"; version="1.7"; sha256="1xjn36qx12nplzvqxfcdl8brh0897abvvmsw6x7zsdsl4m88q0pa"; depends=[lattice mgcv]; };
-  eRm = derive2 { name="eRm"; version="0.15-6"; sha256="0kdcdddyxp345bs5g9lipdy3s6c97bcrkgj4cd4c78s7gx4mk7ra"; depends=[lattice MASS Matrix]; };
-  eVenn = derive2 { name="eVenn"; version="2.2.3"; sha256="0qliicql4yx9rih8f9ywhv40sqzgy21sdd8rg2ly0nwqlyii3537"; depends=[]; };
+  dynsurv = derive2 { name="dynsurv"; version="0.3-5"; sha256="0rvwnssg876sng53viiqfcm7mxvilpds9yahj6bwgs90chnkjz4g"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
+  e1071 = derive2 { name="e1071"; version="1.6-8"; sha256="08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn"; depends=[class]; };
+  eAnalytics = derive2 { name="eAnalytics"; version="0.1.3"; sha256="1lrkmfs2sq9p2n7g528jf6wxixqk08w468nckkij2mprhrccjjj6"; depends=[dplyr DT energyr googleVis leaflet plotly shiny shinydashboard]; };
+  eDMA = derive2 { name="eDMA"; version="1.4-0"; sha256="1nkbl6yywffb8q0x6ajymh1hpmkq038dc3a7xvw9szcjfrfbhw9v"; depends=[Rcpp RcppArmadillo xts zoo]; };
+  eHOF = derive2 { name="eHOF"; version="1.8"; sha256="0g0sb98mlgvhs27s0a1x0ysj3r4p3r7i382fqzfv29kn1ayw0r5c"; depends=[lattice mgcv]; };
+  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.4"; sha256="1i8lbn8brza7ggrrd8fkj24kj99lra47xbibv723hk0yxh4fgdpx"; depends=[plotmo TeachingDemos]; };
-  easyPubMed = derive2 { name="easyPubMed"; version="1.5"; sha256="0s0c2iqqpiffch5pi2kkkrxymrhgys2iydpzci30x77knqx3cjba"; depends=[XML]; };
-  easyVerification = derive2 { name="easyVerification"; version="0.2.0"; sha256="1az91skkkkg82sv287lkfmrhlwkrb235cghmrwgij1szx1askcvx"; depends=[pbapply Rcpp RCurl SpecsVerification]; };
+  earth = derive2 { name="earth"; version="4.4.9"; sha256="1dyz2ac754scg474x9ksrwrqflmh9wi7qwgm494fpfi9ndd9ycig"; 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]; };
+  easyPubMed = derive2 { name="easyPubMed"; version="1.7"; sha256="1gkd95ady6wqm3v89rf5k3axz3g4gv67bvr2kgci3zf3xvqzva7a"; 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]; };
   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=[]; };
   easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; };
   easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; };
-  ebGenotyping = derive2 { name="ebGenotyping"; version="1.0"; sha256="07dpvxl9xspkzvzkywclg8whgcw7vyakls38pshfypjpyd6iv8ga"; depends=[]; };
+  easyreg = derive2 { name="easyreg"; version="1.0"; sha256="01wpqr2vfa245xln1zmqr1a9bibj0cnx60bw24l1q1li7r13wjyy"; depends=[car nlme]; };
+  ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; };
   ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; };
-  eba = derive2 { name="eba"; version="1.7-1"; sha256="0kxdhl7bc4f570m9rbxxzg748zvq0q7a0slvfr4w1f45vfzhyh17"; depends=[nlme]; };
+  eba = derive2 { name="eba"; version="1.7-2"; sha256="00hlmnknif9yr4wzw0n1fzkrgbciv7ljc0gkfq34v3vvy3dmdsvq"; depends=[nlme]; };
   ebal = derive2 { name="ebal"; version="0.1-6"; sha256="1cpinmbrgxxv0fzi9qi2inv4hw2lz7iq4b0ggp316rdqqb5bj9r0"; depends=[]; };
-  ebdbNet = derive2 { name="ebdbNet"; version="1.2.3"; sha256="123iqp8rnm3pac5fvpzq5sqbf8nyfpf05g23nawanid6yv23ba9a"; depends=[igraph]; };
+  ebdbNet = derive2 { name="ebdbNet"; version="1.2.5"; sha256="0kal4sqx12y04696ilwnwkmss4rn16dkbnalgqimz6i4jhz8n23h"; depends=[igraph]; };
+  ebimetagenomics = derive2 { name="ebimetagenomics"; version="0.2"; sha256="1jbb1h2wp3fpmjivy09165qn72ign2pbss4bw9xcn2dlxaddgh1c"; depends=[sads]; };
   ecb = derive2 { name="ecb"; version="0.2"; sha256="17hj4d48j6rran64ajzlgkgz17mab51fa3lz8rm3mw0qhahkjlmc"; depends=[curl httr rsdmx xml2]; };
-  ecd = derive2 { name="ecd"; version="0.6.4"; sha256="16jlgwyb6rmxsas6p1dgxpmfdinm422v4y1f62kh7ai0sjcf8hjm"; depends=[moments optimx polynom Rmpfr RSQLite xts yaml zoo]; };
+  ecd = derive2 { name="ecd"; version="0.8.3"; sha256="0ksr5yixg4psgx4nf3y061k2fj5843f6f3xwbfl0nyfly8595s1x"; depends=[digest gsl moments optimx polynom Rmpfr RSQLite xts yaml zoo]; };
+  ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; };
   ecespa = derive2 { name="ecespa"; version="1.1-8"; sha256="0rdjr0ss7a1n66dmvykbs3x944r88l08md2rfkg9w7bxm361ib8p"; depends=[spatstat splancs]; };
+  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.6.0"; sha256="0swkaimm1nfrnb5niiihwx5i0b5l4cg8b6bmy0aipawpgpphn1yh"; 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.9.1"; sha256="0y1f8ylyk9jny48z5grf4r9jcdin6clhy0vg1wkg3alsqn4iiqlg"; depends=[assertthat dplyr httr jsonlite leafletR lubridate plyr whisker]; };
+  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=[]; };
-  ecosim = derive2 { name="ecosim"; version="1.2"; sha256="1lzjd6kl2864ngyiqyfnnra5ag9bj42pxb793gwp45r7z95k32rf"; depends=[deSolve stoichcalc]; };
-  ecospace = derive2 { name="ecospace"; version="1.0.0"; sha256="18v7hclrn9s9fi1s9v6zzras2ka7gnma214w0qdmxrgkygn9a926"; depends=[FD]; };
-  ecospat = derive2 { name="ecospat"; version="1.1"; sha256="070vvx00gm36rwjz2g188jn7bkljs1c7j6ap6ssrl3ihzqvc1zdz"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 dismo ecodist gam gbm maptools randomForest raster rms sp spatstat]; };
+  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]; };
+  ecospat = derive2 { name="ecospat"; version="2.1.1"; sha256="1b0bmqvspg2qxnr07lj2qlwp2i90q1bjym9rjc8jdzqbmaz9gxyr"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
-  ecoval = derive2 { name="ecoval"; version="1.0"; sha256="1szvr2ipb7bd0cyslhwwwyx5kw7yx3kpqcyzxfd9pk263bny323g"; depends=[rivernet utility]; };
-  ecp = derive2 { name="ecp"; version="2.0.0"; sha256="0cr3rzvd4bahg5idd857mgp005n075xql5kvjw0smsjbjh4p84wq"; depends=[Rcpp]; };
+  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]; };
   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.3.2"; sha256="1z4df1i3fk40n6jzzwdldb00k6zbsf3k64np3b35k0fk1ij04cvq"; depends=[dplyr ggplot2 lubridate tidyr XML]; };
+  edeaR = derive2 { name="edeaR"; version="0.4.7"; sha256="1fgngqd9qi798v435cax3kvwczq536jac6fhj5nsjbach1jlmm2y"; depends=[data_table dplyr ggplot2 lubridate magrittr tidyr XML xml2]; };
   edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; };
-  edfReader = derive2 { name="edfReader"; version="1.0.0"; sha256="0c2yhhfh779x5laicx11dgrxrr65wf85n29va9q55g8agrq5bfa4"; depends=[]; };
-  edgar = derive2 { name="edgar"; version="1.0.4"; sha256="1rj6dfyg76c0p5im1qag4xpv4v98r5slkhvyxy9r1ibnyga22ica"; depends=[ggplot2 R_utils rChoiceDialogs RColorBrewer shiny shinydashboard tm wordcloud XML]; };
+  edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; };
+  edfReader = derive2 { name="edfReader"; version="1.1.1"; sha256="1si123kn66z2h8rrp5ck6hbjp11q0p3ja2h7xim4sqglbwca3fjw"; depends=[]; };
+  edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; };
+  edgar = derive2 { name="edgar"; version="1.0.8"; sha256="1sy4v3nw66z96mbgqfx2bkk085virilyrx03sqjp8p37v08x9yg1"; depends=[ggplot2 R_utils RColorBrewer tm wordcloud XML]; };
   edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; };
   edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; };
   edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; };
   editrules = derive2 { name="editrules"; version="2.9.0"; sha256="14mfa8flkym2rx9n7bq9icc9fsrk3szib3amx5l0008rxll9qnxm"; depends=[igraph lpSolveAPI]; };
-  edmr = derive2 { name="edmr"; version="0.6.3.1"; sha256="1avb4gnw8s635yyn3sh20pmppsnz39s7r1pr8ggdc61ca1mkh2mk"; depends=[data_table GenomicRanges IRanges mixtools S4Vectors]; };
   edrGraphicalTools = derive2 { name="edrGraphicalTools"; version="2.1"; sha256="09y63xj3gqrz66mym20g4pmfwrb0wnc2n67692hnqq8dz31q7p3i"; depends=[lasso2 MASS mvtnorm rgl]; };
-  eegAnalysis = derive2 { name="eegAnalysis"; version="0.0"; sha256="1lrwjbhm5fnf5fhyyga2b21j2snnmj3zfvfxfkvgsbdnzr3qxaxb"; depends=[e1071 fields splus2R wmtsa]; };
+  edstan = derive2 { name="edstan"; version="1.0.6"; sha256="1gm1rxwywigyfdlcm2yj1m9qjb4s6w7chr1ck7b32x1pdxdl3ns5"; depends=[ggplot2 rstan]; };
+  educineq = derive2 { name="educineq"; version="0.1.0"; sha256="0qd6kvcy280glv3q6lcrawmnsfvp90as95chgi3hav0yj2dpakn6"; depends=[flexsurv ineq]; };
+  eechidna = derive2 { name="eechidna"; version="0.1"; sha256="17z3nay7dcys5hwfmm7wgsidz6pim97xlw8hlyh5bns57s10nwx7"; depends=[dplyr ggplot2 ggthemes plotly shiny shinyjs tidyr]; };
+  eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.6"; sha256="07wpz8zlgkbzkhmv569w7rnz3i830391arrh17sg2gc4fx9h1559"; depends=[geoR lme4 metafor mvtnorm]; };
   eegkit = derive2 { name="eegkit"; version="1.0-2"; sha256="10dksmc5lrl0ypifvmmv96xnndl2zx191sl79qif0gfs3wq3w4s0"; depends=[bigsplines eegkitdata ica rgl]; };
   eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; };
   eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; };
-  eemR = derive2 { name="eemR"; version="0.1.2"; sha256="1mcvn5hjqwr8hgp3rdyxr7lh7x35rjza530grd3ys9vfnsn4k44q"; depends=[dplyr fields ggplot2 pracma R_matlab readr stringr tidyr]; };
-  eeptools = derive2 { name="eeptools"; version="0.9.1"; sha256="0rgal6a5jjl572dqzc4zwmcqjsa12x8mv99c63bfmczp11f5hjmn"; depends=[arm data_table ggplot2 maptools memisc vcd]; };
-  effects = derive2 { name="effects"; version="3.0-7"; sha256="055ws22k10vkcrbqvchdjnpmnklnk77wqx3rn7lyyry38bfn6xwn"; depends=[colorspace lattice lme4 nnet]; };
+  eemR = derive2 { name="eemR"; version="0.1.4"; sha256="15b612z3h4alqv34wz28mgkg9m31r872pxbxayzqinf0pam8x08y"; depends=[dplyr fields pracma R_matlab readr rlist stringr viridis]; };
+  eeptools = derive2 { name="eeptools"; version="1.0.0"; sha256="009ygzdqlvff4gichigy38878x60iqs4gr31ddrgildbrpq38hrd"; depends=[arm data_table ggplot2 maptools memisc vcd]; };
+  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.6.1"; sha256="1b26ngy5n1yh2ry3vwkz3x497xw5wxbv7iywlk5j368rlb97sjbj"; depends=[]; };
+  effsize = derive2 { name="effsize"; version="0.7.0"; sha256="113afdf1w1q75alc4i5i8l3ljsdsfn22l8cszljrpgp420csbzhv"; 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]; };
   egcm = derive2 { name="egcm"; version="1.0.8"; sha256="1mrbm0yzqw344fzgcbwc6bgdn8fv8id80jnfp3jaqjfslfhlpzx7"; depends=[fArma ggplot2 MASS tseries TTR urca xts zoo]; };
-  eggCounts = derive2 { name="eggCounts"; version="0.4-1"; sha256="16prkcmpfjl1lab8m9hm0sfbdlh94ds3wi6ra9n2wnrpdn32fl20"; depends=[actuar boot coda]; };
+  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-3"; sha256="1dfilgw9m4m78ny3fd89nl8f9c9y5z5bnj912hpbfff3v5yfm3iq"; depends=[survival]; };
-  ei = derive2 { name="ei"; version="1.3"; sha256="1vx34mwh0hf9nbkzw4kw35z88bdp4mbgnylj6vcy4jql1q8i4yxf"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix rgl sp tmvtnorm ucminf]; };
-  eiCompare = derive2 { name="eiCompare"; version="1.6"; sha256="0fn4mgjhlc8ys7xjwmv2awwwbr963p0d685rfpmvxbszzbfkb06s"; depends=[cubature data_table eiPack ellipse foreach mnormt msm mvtnorm plotrix plyr R_utils tmvtnorm ucminf]; };
+  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.7"; sha256="128wvfsvzf84rkvk3bnailn2k4qf5iq5r7hnrxlamajia526ky31"; depends=[cubature data_table eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils 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=[]; };
@@ -3959,142 +4891,198 @@ in with self; {
   eive = derive2 { name="eive"; version="2.1"; sha256="1vazl5dnrvljd07csy9rjs4302w09h94i411gffg9fvxn70km7qg"; depends=[Rcpp]; };
   eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; };
   elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; };
-  elastic = derive2 { name="elastic"; version="0.6.0"; sha256="1la9099ddhhnv713nhjlia9mali36y6xznbciqn3k91bml3b1am0"; depends=[curl httr jsonlite]; };
+  elastic = derive2 { name="elastic"; version="0.7.8"; sha256="0cji7nh6ghjx6di9mw103hyj2am5x75f2lpi0csswbv4r3mslirr"; depends=[curl httr jsonlite]; };
+  elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; };
   elasticnet = derive2 { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
+  elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.0"; sha256="0hw2pwfh6k8q1646cprg3d84acwgw5bi7vmp7wrnxkxg7npz5pyz"; depends=[httr jsonlite]; };
   elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
   elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
+  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]; };
   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=[]; };
   ellipse = derive2 { name="ellipse"; version="0.3-8"; sha256="0ibz1qvf1qbb5sigyhpxb8hgip69z3wcimk3az1701rg2i64g3ah"; depends=[]; };
-  elliptic = derive2 { name="elliptic"; version="1.3-5"; sha256="0hi0r3z6f5yq53v6ii4z35nws2gc00xkk0dncll0sf5nshcj8fl5"; depends=[MASS]; };
+  elliptic = derive2 { name="elliptic"; version="1.3-7"; sha256="1bzd5x0yph76jh59ljl875grm52s8xpnmbgww1jjxx0hgkv7938g"; depends=[MASS]; };
   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.6"; sha256="1nl7xri4dv8vxpfckkk0j1xlipacjkkd2n8hklb11fjjmmwm6rhd"; depends=[pscl Rcpp RcppArmadillo]; };
-  embryogrowth = derive2 { name="embryogrowth"; version="6.2"; sha256="1l4xh7ay8jwf0qpp37171hmx06l2lwmy0x2gj8gzwdf30b29ldm5"; depends=[deSolve HelpersMG polynom]; };
+  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]; };
   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=[]; };
   emg = derive2 { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
-  emil = derive2 { name="emil"; version="2.2.3"; sha256="004s1l5fv6cjrp7l10hx57yfsbfx3lj6km58idmj18yqy9j194a1"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
+  emil = derive2 { name="emil"; version="2.2.6"; sha256="182grlb90nsqs17mi09srzlrflf3kzaj5swcgfdyalhlmsgrfrnd"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
-  emojifont = derive2 { name="emojifont"; version="0.3.2"; sha256="0jb08mhxn3b060dnncbmn4lwd0xawbaj5laskpc9sr3i26cicxk8"; depends=[proto showtext sysfonts]; };
-  emov = derive2 { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; 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]; };
+  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-2"; sha256="1sx8hsvv36idraji2vic6x025wp41bg4p73zqp2d716wmhgdkwgj"; depends=[quantreg]; };
+  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]; };
   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=[]; };
   endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
-  endorse = derive2 { name="endorse"; version="1.4.1"; sha256="0xyi2cq4k4xa8kr717i4njl6rgjf5z99056jbhp2rbzfyy4sw61d"; depends=[coda]; };
-  energy = derive2 { name="energy"; version="1.6.2"; sha256="008yf4r6546mzk9q515zliqxyjx6w0z19g5wlarg7f4lrzsmqiaw"; depends=[boot]; };
-  english = derive2 { name="english"; version="1.0-1"; sha256="1413axjp2icj9wwnkz3vl4gvrwlgmjpc2djzv5bllbnc4a4dgj24"; depends=[]; };
-  enigma = derive2 { name="enigma"; version="0.2.0"; sha256="0a45fp9lmxrdwpa7y3sfbgcijw5ss2fz7j2r7qnc0ask1x4yfqr4"; depends=[httr jsonlite plyr]; };
-  enpls = derive2 { name="enpls"; version="1.1"; sha256="0vwl714w441c6wv9jnmyfzjd055ydia6qvwv6vrmnfasv3q5ny7z"; depends=[doParallel foreach pls]; };
+  endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
+  endorse = derive2 { name="endorse"; version="1.5.0"; sha256="0nyrcbrq8c5q2h45g1iz4n845kf3lvcwsj9j9ngkma17vbqf91hl"; 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=[]; };
+  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]; };
   enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; };
-  ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.2"; sha256="0cfasrs1paz60na8by9zk0c5jc48l9djvn6c64ygjl1rapz389d4"; depends=[chron]; };
+  enrichwith = derive2 { name="enrichwith"; version="0.0.2"; sha256="08kzj805mnxg23b3q5ayj8fp66qf5maiky1prv8mgxyays8yv4dl"; depends=[]; };
+  ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.3"; sha256="1iscg03v691cyfma3fs6xnj9chf5arlg61bggg2wmkczp7gnsi3g"; 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-5"; sha256="0fmwzwydqb9g4qyd7inp9v6vfwrziqp31720vxincq39lka187w2"; depends=[ade4 ape EntropyEstimation geiger vegan]; };
+  entropart = derive2 { name="entropart"; version="1.4-6"; sha256="0qvxwqg8fypc2q7a75s7ngqx5ga409p1iw1fdxp84xwdvgdcw07l"; 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.0.1"; sha256="0p8zh45fvprx7zc6yc2c0k5n8ycsxcm052zlnyambw89g3dr6ix4"; depends=[fitdistrplus modeest sn]; };
-  enviPat = derive2 { name="enviPat"; version="2.1"; sha256="1fy0afpvbv55bvbw2isaywi11svwag78007dr28xypd6lm4hfwym"; depends=[]; };
-  enviPick = derive2 { name="enviPick"; version="1.4"; sha256="1jcjaa1kx6c3775k11ydn6sww0jg7kmmi8ikrk56q8j3wsbdhgyi"; depends=[readMzXmlData shiny]; };
+  enveomics_R = derive2 { name="enveomics.R"; version="1.1.1"; sha256="0vz4cz52dx8r7zkgb3d8w2716g0g23rb638sf2b6asbfp2h2w5f6"; 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]; };
+  envirem = derive2 { name="envirem"; version="1.1"; sha256="07mlyaqjwwrh9dbc78ik61wrrpg344fg3rb12l6v6hzn04yp26pz"; depends=[raster RSAGA]; };
   envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; };
   epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
-  epanetReader = derive2 { name="epanetReader"; version="0.3.1"; sha256="01f9q8i57ym5dvhn2jqkdlr1id8cv63yasbzmbhgl03bfgsibaya"; 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-74"; sha256="1k5095lp7sby0xsdwki16g0yd22k06aiqr2xrgwss5i1vc08laid"; depends=[BiasedUrn survival]; };
+  epiR = derive2 { name="epiR"; version="0.9-79"; sha256="08gfy4ri4haxi82zs4xngrabimvajlrbw1s1dqwl0gfjz4zdklby"; depends=[BiasedUrn survival]; };
   epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
-  epifit = derive2 { name="epifit"; version="0.0.6"; sha256="0k72w9x81l7a6wn4syz0qjaijlhfaflkffd1cjz7szv6cfnl97s2"; depends=[MASS]; };
+  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]; };
   epinet = derive2 { name="epinet"; version="2.1.7"; sha256="10mqc3xy24mjbk9np5mp41216hj6yc9jqxl3ybgysmd80y3qgf39"; depends=[network]; };
+  episensr = derive2 { name="episensr"; version="0.8.0"; sha256="0ryn3p7vg4dq976ncm48i1kx42sanmzyyslvq0wiqijkl0172x19"; depends=[boot ggplot2 gridExtra plyr reshape trapezoid triangle]; };
+  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=[]; };
+  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]; };
   eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; };
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
-  equate = derive2 { name="equate"; version="2.0-3"; sha256="0y37nxily7zjx00z7h4vmpn8cs7bl3aravhjkjz9l6y0fv0rc5vv"; depends=[]; };
-  equateIRT = derive2 { name="equateIRT"; version="1.2-3"; sha256="1v8hk50b132j5r2wg508cdww7slgwcik7y2zn7dy56qq2plb4mkz"; depends=[mirt statmod]; };
-  equivalence = derive2 { name="equivalence"; version="0.7.1"; sha256="1nm4s92acin5c2qnvgsafx7c10jyxmqgh33ciq271ycciwc4idy3"; depends=[boot lattice PairedData]; };
+  equSA = derive2 { name="equSA"; version="1.0.0"; sha256="1yq8f1svh8cg9pgharnb5ijxf692rm2avjvd6xabsv8jid25618l"; depends=[huge igraph mvtnorm 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]; };
+  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.5.1"; sha256="1myn7vhvwvf443im58f2vwnq26asmybhwjk9fv77qs5ac5y594x6"; depends=[coda lpSolve Matrix network robustbase statnet_common trust]; };
-  ergm_count = derive2 { name="ergm.count"; version="3.2.0"; sha256="0qrldigkygr8k8v3njy0pclgv7z64dazknpf0m567i1nz8715yhy"; depends=[ergm network statnet_common]; };
+  ergm = derive2 { name="ergm"; version="3.6.1"; sha256="1gjl1gil4vkcwrbb1fcri3jkdqy1m3bqqinw2g3fnv69m2k38szh"; 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]; };
+  ergm_rank = derive2 { name="ergm.rank"; version="1.0.1"; sha256="0k5ffqxn9fspbg82j2cmrcyav3nqjk7cnsq48xwy9i3z3vaq704k"; depends=[ergm network statnet_common]; };
   ergm_userterms = derive2 { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; };
   ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
   erp_easy = derive2 { name="erp.easy"; version="1.0.0"; sha256="0md4l48qb2z6c527ir1dwc51z8yw1jq7yx85fxzzg0wh1vzafp1z"; depends=[plyr signal]; };
   erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
-  errint = derive2 { name="errint"; version="0.1"; sha256="1qv997cb1ndny9k74gg996yyl11dkk5wxklpnh9qr5wdkdc77hhk"; depends=[rootSolve VGAM]; };
+  errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
+  errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; };
+  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]; };
-  estimability = derive2 { name="estimability"; version="1.1-1"; sha256="049adh8i0ad0m0qln2ylqdxcs5v2q9zfignn2a50r5f93ip2ay6w"; depends=[]; };
+  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]; };
+  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=[]; };
   estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
   etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
-  etasFLP = derive2 { name="etasFLP"; version="1.3.0"; sha256="1qh8s9ikd2lpchpp4h9z4zvcd9l2gi15dg0i54nxg9acn92yn3hi"; depends=[fields mapdata maps rgl]; };
+  etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; };
+  etl = derive2 { name="etl"; version="0.3.5"; sha256="1qxzfcfpa50k6n70nii0qh6lr4rsbc3f2vhp6hj720pc8yg3r0mb"; depends=[DBI downloader dplyr lubridate readr stringr]; };
   etm = derive2 { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[lattice survival]; };
-  etma = derive2 { name="etma"; version="1.0-8"; sha256="07vixcanjfwbgf0sv6fs7hsl7qhr171lwhkb0hs2j9mvx3f3by9l"; depends=[]; };
+  etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; };
+  etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; };
+  etseed = derive2 { name="etseed"; version="0.1.0"; sha256="1kqbhvryqzmckk91ynn68yd7msqdsl6h818r164180f10flszr37"; depends=[httr jsonlite R6]; };
   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]; };
-  eurostat = derive2 { name="eurostat"; version="1.2.21"; sha256="1fjknxmf6jzhnrckmldy8gzxlyvy8p3cy9lv2ky8l10ln1ccfbjl"; depends=[httr jsonlite tidyr]; };
-  eva = derive2 { name="eva"; version="0.1.3"; sha256="0w425qf1k4h0dif1aav6kid58fyc7v71hz03xb9fbwrqpghwj7xb"; depends=[]; };
-  evaluate = derive2 { name="evaluate"; version="0.8.3"; sha256="08d6164m9wqf9qq6yh1s9a0qxwqzqpsq7312hilzy79gxf9gixzr"; depends=[stringr]; };
+  europepmc = derive2 { name="europepmc"; version="0.1.2"; sha256="1wdxmhcq7zz0x9rrddp7pswj6pbsfdgwrrlm6lgsv7cvs6cmh1na"; depends=[dplyr httr jsonlite plyr urltools xml2]; };
+  europop = derive2 { name="europop"; version="0.3"; sha256="01c31p82r1paxqq209078av9fzkvrl3wp9hz8s79iwf4hlqxbiw6"; depends=[]; };
+  eurostat = derive2 { name="eurostat"; version="2.2.43"; sha256="1h3vx0lf6kqvvhcj1ichzsvqhjmskcpvxd37hym6cwwgkkmxrzk3"; 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]; };
+  evclass = derive2 { name="evclass"; version="1.1.0"; sha256="1h0lqf6wixsbcs4hnpzsjhsj8fifh9z5r90zcwscj1vk7aqf9cwg"; 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=[]; };
+  event = derive2 { name="event"; version="1.1.0"; sha256="1nq34bz9dsixidym3n255vmap3gjx9nfk8pc5s7w026faf96dr2v"; depends=[rmutil]; };
   eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; };
   events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
   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]; };
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
-  evolqg = derive2 { name="evolqg"; version="0.2-2"; sha256="1s2zifbzk1mxydbhfw0b4bwhaqqryxdkgnhygd9nyr82physrn8h"; depends=[ape coda depth ggplot2 magrittr Matrix mvtnorm phytools plyr Rcpp reshape2 tidyr vegan]; };
+  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]; };
   evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; };
-  evtree = derive2 { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5wzxs7y11sxf9mh6pqpqgwif05p4z3i"; depends=[partykit]; };
-  exCon = derive2 { name="exCon"; version="0.1.14"; sha256="0wm111hy2i3ipf48826r2r5a61s5sjz96p54hwipwpy3j0ahzdsv"; depends=[jsonlite]; };
-  exact2x2 = derive2 { name="exact2x2"; version="1.4.1"; sha256="1a4cg8j8kdgwkj27qza6xm5x16m9sb2vczb1b9im8k4pas6v6jpk"; depends=[exactci ssanv]; };
+  evtree = derive2 { name="evtree"; version="1.0-2"; sha256="1izcv93irbi5zffyyzag2gcaf8zrhp2lkf3h68gb2jpf5x6wdw64"; 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-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; 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.1-0"; sha256="13ca4r151424fprc1km58dxbhssvnjn6y6pa2m7wl95v796k20z9"; depends=[]; };
-  excursions = derive2 { name="excursions"; version="2.1.1"; sha256="1snrfy1m03mf54v3k9r51zhbjsx05zhzf94rnf4mzyq15fdp22lq"; depends=[Matrix sp spam]; };
+  exams = derive2 { name="exams"; version="2.2-0"; sha256="14w0m8jnnpbg153l0gq5lixw68ml3qvnnjyl4dbaiccm2as9spbn"; 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]; };
-  expands = derive2 { name="expands"; version="1.6.1"; sha256="0hx7ggfxlb96dglm1290nn95hhrjjnjc8w39g0s9wq4lrdwfz8a7"; depends=[ape flexmix matlab mclust moments permute rJava]; };
+  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]; };
   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=[]; };
-  explor = derive2 { name="explor"; version="0.2"; sha256="0xlsbj6slp0i4nynhdy2c6vnc8phxkgswg32s0w7cm79v8aag3z1"; depends=[dplyr DT ggplot2 scatterD3 shiny shinyBS tidyr]; };
-  expm = derive2 { name="expm"; version="0.999-0"; sha256="1mlkp5d0hbm9nw0lmm7fbwl4b00633bpsg0yshwv0w3fw6dh75xb"; depends=[Matrix]; };
+  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]; };
   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]; };
   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]; };
-  extRemes = derive2 { name="extRemes"; version="2.0-7"; sha256="1dghhmwph65vhq2pnn461cxs1qrfm3kq8dqsilpfkm30jvblv8dv"; depends=[car distillery Lmoments]; };
+  extRemes = derive2 { name="extRemes"; version="2.0-8"; sha256="0pnpib3g2r9x8hfqhvq23j8m3jh62lp28ipnqir5yadnzv850gfm"; depends=[car distillery Lmoments]; };
   extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
+  exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; };
   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]; };
   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=[]; };
   extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; };
-  extremogram = derive2 { name="extremogram"; version="1.0.0"; sha256="196y63q9hnkf3hgizcz8a40wcmwmrm5yfail9sjh3kb40sb3nipi"; depends=[boot MASS]; };
+  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]; };
   eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; };
   eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.6"; sha256="0azfakn5kh80bvywqf52wy3c0q5k13zcasniggjf273f5z1415pn"; depends=[broom dplyr ggplot2 lazyeval tidyr zoo]; };
-  ez = derive2 { name="ez"; version="4.3"; sha256="1ypdp52fy382p14hri7my98wpjpl13lp9mdfk5lndiafmd20zl3j"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
-  ezec = derive2 { name="ezec"; version="0.1.0"; sha256="157gnwikr1w5zfh2nbnvnhw7wq62b56yjhx5i63y8ds86vzhngvy"; depends=[dplyr drc]; };
+  ez = derive2 { name="ez"; version="4.4-0"; sha256="0a58s94x576dfz7wcbivrr2hmdh5x1vy16zwkqp9fmdzqx38pagq"; depends=[car ggplot2 lme4 MASS Matrix mgcv plyr reshape2 scales stringr]; };
+  ezec = derive2 { name="ezec"; version="1.0.1"; sha256="0lpx55a8fhy6fqdv3zvzx9mh75q34r71v5kp96hkm9jzl4yvrpd2"; depends=[dplyr drc]; };
   ezglm = derive2 { name="ezglm"; version="1.0"; sha256="0x7ffk3ipzbdr9ddqzv0skmpj5zwazkabibhs74faxnld7pcxhps"; depends=[]; };
-  ezknitr = derive2 { name="ezknitr"; version="0.3.1"; sha256="0786bp8k3jpzdk7a98m7203cghavs9zh114418fkwnlrjnwkhsna"; depends=[knitr markdown R_utils]; };
+  ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; };
   ezsim = derive2 { name="ezsim"; version="0.5.5"; sha256="03x75vmf75qsmk4zb09j7xrb11w31rpfwd3dvv12nwjgndh9bnld"; depends=[digest foreach ggplot2 Jmisc plyr reshape]; };
-  ezsummary = derive2 { name="ezsummary"; version="0.1.9"; sha256="0fqg0slxg760km2gfd534xkl3g19p8imi7a8k2nmzac6lp92irj7"; depends=[dplyr reshape2 tidyr]; };
+  ezsummary = derive2 { name="ezsummary"; version="0.2.1"; sha256="16rwg1h7gs7mnkmbwfb273fy1pwdq9ng6l4ad00anpmilqcck5ng"; depends=[dplyr tidyr]; };
   fANCOVA = derive2 { name="fANCOVA"; version="0.5-1"; sha256="034m2mmm6wmsjd41sg82m9ppqjf4b1kgw5vl2w7kzqfx0lypaiwv"; depends=[]; };
   fArma = derive2 { name="fArma"; version="3010.79"; sha256="1byxyy4afl1gq58r1cmc5p6frdr9rljr1x3pdnc8nj8rr65lkg72"; depends=[fBasics timeDate timeSeries]; };
   fAsianOptions = derive2 { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3rz6cd7g275flzsnqxwd3r5xin6pkini8pbsi9s8hbqv3vl"; depends=[fBasics fOptions timeDate timeSeries]; };
@@ -4106,7 +5094,7 @@ in with self; {
   fExoticOptions = derive2 { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[fBasics fOptions timeDate timeSeries]; };
   fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[fCertificates Matrix mvtnorm tmvtnorm]; };
   fExtremes = derive2 { name="fExtremes"; version="3010.81"; sha256="0bzgnn0wf7lqhj7b2dbbhi61s8fi2kmi87gg9hzqqi6p7krnz1n5"; depends=[fBasics fGarch fTrading timeDate timeSeries]; };
-  fGarch = derive2 { name="fGarch"; version="3010.82"; sha256="08q452pasvjhsg2ks6c52lqg276hlbdwk0vh25xya2bw2bgbqy99"; depends=[fBasics timeDate timeSeries]; };
+  fGarch = derive2 { name="fGarch"; version="3010.82.1"; sha256="0n5mzqc7lj7h63rf4nw4w3mics02gaf049c7m3bjfbp5cwwnf9pf"; depends=[fBasics timeDate timeSeries]; };
   fICA = derive2 { name="fICA"; version="1.0-3"; sha256="0gbmjg1az3v413xgdzkjinfy5wri8963w38jnk0p0h2zd8gdkpfs"; depends=[JADE Rcpp RcppArmadillo]; };
   fImport = derive2 { name="fImport"; version="3000.82"; sha256="07yqppl8sbfa0x9k4n7hh6hcgyxpcvlk74hhylib4nzqm70bn0sq"; depends=[timeDate timeSeries]; };
   fMultivar = derive2 { name="fMultivar"; version="3011.78"; sha256="115hqbbxsdjs5v2rhalg8vz0m5lyg8ppjjqmbq1x21jdnbg6l0fl"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; };
@@ -4117,67 +5105,89 @@ in with self; {
   fSRM = derive2 { name="fSRM"; version="0.6.4"; sha256="1n91gzjx9r3r3xl400w38miva0b69c0f23h2056kq9p1bax2nm86"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; };
   fTrading = derive2 { name="fTrading"; version="3010.78"; sha256="0qakjxnr5nslw06ywlj65m3w7pjgn5hixxc2rnqhvvvmjpdxybz7"; depends=[fBasics timeDate timeSeries]; };
   fUnitRoots = derive2 { name="fUnitRoots"; version="3010.78"; sha256="04nwwazd8jvzds6p4njzq4wpcsrvvvs0y9z8v8r402myd4856ssm"; depends=[fBasics timeDate timeSeries urca]; };
+  fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; };
+  face = derive2 { name="face"; version="0.1-2"; sha256="06rpjr588yh5v4z33j4lc1m5r1jj2zsaxfmx1h6h2z4cqlgrvxax"; depends=[Matrix matrixcalc mgcv]; };
+  factoextra = derive2 { name="factoextra"; version="1.0.4"; sha256="1lzf99184sbc9x3skp8hp8cjlj0w8mvm4vnwj03smfgm9sh01874"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
   factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
-  factorplot = derive2 { name="factorplot"; version="1.1-1"; sha256="1l8pabf32dr12l7b4dgv5jaxpsjymgdxc51miv72zczrx8adc7da"; depends=[multcomp nnet]; };
+  factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; };
+  factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
+  factorstochvol = derive2 { name="factorstochvol"; version="0.8.3"; sha256="0dcasii1dfkmng29a7d4k6kyy9lyrbcr06gqyg61h07xf2j3qwla"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; };
   factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; };
   fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; };
   faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
-  falcon = derive2 { name="falcon"; version="0.1"; sha256="0yas8a8nqdp03s77k5z1xlyz59gapyx68pz0mf6i2snjwpgai59v"; depends=[]; };
-  falsy = derive2 { name="falsy"; version="1.0.1"; sha256="1n2b2h7w7p3vib4vgb9vadd3c07dx12vz5gm8bawbdx7llh2pr24"; depends=[]; };
+  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.1"; sha256="0sxsvx6nppys9sgmrxi79f709kfhafckd22nmn4ql7vf7p0z1fs7"; depends=[]; };
   fame = derive2 { name="fame"; version="2.21"; sha256="15pcgc67qcg6qkgssbfissicic317v60jsybp86ryqvzqg70cqx3"; depends=[tis]; };
-  fanc = derive2 { name="fanc"; version="1.25"; sha256="12isxkrrkph1jk88q3bnc27alixjgxjnfkcyx3rmc6s2hqw9vyiv"; depends=[Matrix]; };
-  fancycut = derive2 { name="fancycut"; version="0.1.0"; sha256="1l81jk0jskawzy6q4li6awznq4rqs281b449zccfh0992qy45lk1"; depends=[]; };
+  fanc = derive2 { name="fanc"; version="2.2"; sha256="1gdkxb2ay0lyldjpg4s2fbavjxl4q1bf9q438csqa4vzl5ywv2w8"; depends=[Matrix]; };
+  fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; };
   fanovaGraph = derive2 { name="fanovaGraph"; version="1.4.8"; sha256="1da7yskh2gn4arrrnalkl3izqyyrm0yf0il4v2izs7di7qlw3m6v"; depends=[DiceKriging igraph sensitivity]; };
   fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; };
   faoutlier = derive2 { name="faoutlier"; version="0.6.1"; sha256="02a93jswrq10r09kawxzvdb795bs0sym0yllb30697f9gd7bvyqz"; depends=[lattice lavaan MASS mirt mvtnorm sem]; };
   far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
   faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; };
+  farff = derive2 { name="farff"; version="1.0"; sha256="1w3mi0vsw7mpqznaf3rnzf7va7ax07n5rrpm2hnjh0q25lsv55hk"; depends=[BBmisc checkmate readr stringi]; };
   farsi = derive2 { name="farsi"; version="1.0"; sha256="0y14f86bccwjirdx33383wa605y7l7lr0w7ygvg8r7f7izkv7r3n"; depends=[]; };
   fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; };
   fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; };
   fastGHQuad = derive2 { name="fastGHQuad"; version="0.2"; sha256="0yv3wdyj7hs1gr3rq08k520v0ldmv5zzng709xjx2kchhwhmy8ah"; depends=[Rcpp]; };
-  fastGraph = derive2 { name="fastGraph"; version="1.0"; sha256="05qbysc3arwg4hh0hxw84n4c004mndz8mgzbgsky4cb035bp99fa"; depends=[]; };
+  fastGraph = derive2 { name="fastGraph"; version="1.1"; sha256="1vbi5yssnh8hcbmrq1r437vpvj8hqd3vc8wmcy0nbyvnmyjaxkvb"; depends=[]; };
   fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; };
+  fastHorseshoe = derive2 { name="fastHorseshoe"; version="0.1.0"; sha256="1f9glz7zcarn4jdr6ssy41d2g6b6cqcry9mqchcq6zx576qn2irs"; depends=[lars Rcpp RcppArmadillo]; };
   fastICA = derive2 { name="fastICA"; version="1.2-0"; sha256="0ykk78fsk5da2g16i4wji85bvji7nayjvkfp07hyaxq9d15jmf0r"; depends=[]; };
+  fastJT = derive2 { name="fastJT"; version="1.0.2"; sha256="1k59qvc43adh07lyz1dznghqd6nbmnx5pciyg8da89yy3zw2dvgx"; depends=[Rcpp]; };
+  fastLSU = derive2 { name="fastLSU"; version="0.1.0"; sha256="0clsd4kphlw62n7skqd0ralz3ymgxyvzn8bn06ljiwjqalzyhzhz"; depends=[]; };
   fastM = derive2 { name="fastM"; version="0.0-2"; sha256="0q5dz47sqj6d4r3k6l6q34l5ajb8fjbf7xam75scp0mg3czswnfn"; depends=[Rcpp RcppArmadillo]; };
   fastR = derive2 { name="fastR"; version="0.10.2"; sha256="0xh3pfcln8xp42zvq3kv03xf9kc5gqafnhdnq6r4rx7xhl9n5dw0"; depends=[lattice mosaic mosaicData]; };
-  fastSOM = derive2 { name="fastSOM"; version="0.9"; sha256="03501d5289lrlr4qcgxciz160hqc6nhqb9ab266fr132fkbiv4id"; depends=[]; };
-  fastclime = derive2 { name="fastclime"; version="1.2.5"; sha256="12k7bkq4gkkyh8lr2whmi73mzcy7wmfzwgi20kli7r4g39n3a1kv"; depends=[igraph lattice MASS Matrix]; };
-  fastcluster = derive2 { name="fastcluster"; version="1.1.16"; sha256="0x2prrsnqi5iqx23ki6y2agndjq8058ph6s703i4avrqi1q1w1q8"; depends=[]; };
+  fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; };
+  fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; };
+  fastcluster = derive2 { name="fastcluster"; version="1.1.22"; sha256="006k9isra5biyavqwci61avladw19mhp6kmkjj3777rl1r4r8b9z"; depends=[]; };
+  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=[]; };
-  fastmatch = derive2 { name="fastmatch"; version="1.0-4"; sha256="16gfizfb1p7rjybrfm57nb6hdm30iirbppva8p8xf8pndz35fjbs"; depends=[]; };
+  fasteraster = derive2 { name="fasteraster"; version="1.0.4"; sha256="0xxfwgzf6xbk4sajchaz7wjppg6cs1vkb00wiwsqmjm2yr48yp0m"; depends=[Rcpp]; };
+  fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
+  fastnet = derive2 { name="fastnet"; version="0.1.1"; sha256="1rqr9cc5xnz3pqjhakp52xk0m8c8dld50vm29blr8s6gw0spp7j8"; depends=[doParallel foreach igraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
-  fasttime = derive2 { name="fasttime"; version="1.0-1"; sha256="1yfxj7k781ks4bx45bmmg1zkfzz7s027h393a0l5h6i5g1z7b81d"; depends=[]; };
+  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]; };
   favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
+  fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; };
   fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
-  fbati = derive2 { name="fbati"; version="1.0-1"; sha256="1ia67dg9b61kc14mjg7065v0c6n6agdp8cjdviasyzga00wzsyxj"; depends=[fgui pbatR rootSolve]; };
-  fbroc = derive2 { name="fbroc"; version="0.3.1"; sha256="0a03b1cawi57qc1hjll4ja23hdxng7a633v5i29sdfwwggl1x6f8"; depends=[ggplot2 Rcpp]; };
+  fbar = derive2 { name="fbar"; version="0.1.23"; sha256="1s23wiwyi9fj99zz8m8lhfz91cr8cnl92gb5wl2im691jvhvsr3s"; depends=[assertthat dplyr magrittr Matrix purrr ROI stringr tibble tidyr]; };
+  fbati = derive2 { name="fbati"; version="1.0-1.1"; sha256="18k8a1m2znzzwmm25dbqnqzwbjxqz4rbjaw3z9affky7lzqgbg6l"; depends=[fgui pbatR rootSolve]; };
+  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.4.1"; sha256="1q0mra1rkksbvavbrh4fp6knmmzwxgkwq9pikafp2m95ll9n4xii"; depends=[]; };
+  fcros = derive2 { name="fcros"; version="1.5.2"; sha256="0ggg8jyzdsy5ihhs4hqjjj5v0sh1ln4n7380b1z1rafjfr9j2hwv"; depends=[]; };
   fda = derive2 { name="fda"; version="2.4.4"; sha256="05rvrp29ip1wrk2wly06wdry2a2riynkx677nx5lg240lz12d6yw"; depends=[Matrix]; };
-  fda_usc = derive2 { name="fda.usc"; version="1.2.2"; sha256="0xmfx40ibpb29rq7w4wrwhk5v16dj690qh7lv0gjigvnah1x8ih8"; depends=[fda MASS mgcv rpart]; };
+  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]; };
-  fdaPDE = derive2 { name="fdaPDE"; version="0.1-2"; sha256="1bbrpricxrsixc0na4bgxclrzw6px0n2k05v1rbvbhsf2v1985jj"; depends=[RcppEigen rgl]; };
+  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.1.1"; sha256="102rhycn0yqkhkai1gdjc7jcf14im7hcvwa8xprffx5pkjigrydg"; depends=[Hmisc Matrix numDeriv plot3D pracma Rcpp RcppEigen]; };
-  fdasrvf = derive2 { name="fdasrvf"; version="1.6.0"; sha256="1gzm862nbadrqamfyfdkynxdprrapkvc5n9jvp2vi6xxr6mm35ck"; depends=[doParallel fields foreach matrixcalc mvtnorm Rcpp]; };
+  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]; };
   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]; };
   fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9hjbgblmhx5f3ddk16kigzsik9bvw179d1szk33kadfq2vp"; depends=[edgeR MCMCpack]; };
-  fdrci = derive2 { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; };
+  fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; };
   fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; };
-  fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[RCurl]; };
+  fds = derive2 { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; };
   fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
+  feather = derive2 { name="feather"; version="0.3.1"; sha256="1q6dbkfnkpnabq8lb6bm9ma44cfcghx2lm23pyk3vg7943wrn1pi"; depends=[hms Rcpp tibble]; };
   feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
   features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; };
-  fechner = derive2 { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; };
+  fecR = derive2 { name="fecR"; version="0.0.1"; sha256="0w31hr2j80ppzwgpnbalkgrxz7ijfr43yw7xk9rjkl8gw2nq4kg6"; depends=[lubridate plyr]; };
+  fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; };
   federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; };
+  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=[]; };
   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=[]; };
   fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; };
@@ -4185,70 +5195,106 @@ in with self; {
   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.3-6"; sha256="0gnjwzi6rbvlhk0ragq12f0wzva25ncfy4llipmfl4zxz91px4dk"; depends=[maps spam]; };
-  fifer = derive2 { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[MASS xtable]; };
+  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=[]; };
   filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; };
-  filematrix = derive2 { name="filematrix"; version="1.0"; sha256="17rkf9izhpz3nljv9s56fannd4v7dzsgk6igl7s9mkzmzn4fyp0g"; depends=[]; };
-  filenamer = derive2 { name="filenamer"; version="0.2"; sha256="0f2xvqp75b8v59707z26y746vvag3f2mcykafqp5cy8cqrf7x61j"; depends=[]; };
+  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=[]; };
   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=[]; };
-  fingerprint = derive2 { name="fingerprint"; version="3.5.2"; sha256="042aycxs00rglqh2y27bjlwkk6z312gavli7g8xvqfx1lisijrjk"; depends=[]; };
-  finiteruinprob = derive2 { name="finiteruinprob"; version="0.4"; sha256="0wcllbqkryll3v3fjb6k210pcgkskzrpa78gg8nda0jvkij11zb7"; depends=[numDeriv sdprisk]; };
-  fishMod = derive2 { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; 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]; };
+  finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; };
+  fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; };
   fisheyeR = derive2 { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
-  fishmethods = derive2 { name="fishmethods"; version="1.9-0"; sha256="118w9zacrrvx0qgr4626kkw2v1kgmb644a518j9w4fqhvfiwd4mk"; depends=[boot bootstrap lme4 MASS]; };
+  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]; };
   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]; };
   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.5"; sha256="0qdsk4zb5xrqpaba2j76iarh5jdpij4vl97b3z7v3yijx7w4fsgl"; depends=[httr RJSONIO stringr]; };
-  fitdistrplus = derive2 { name="fitdistrplus"; version="1.0-6"; sha256="17ip3qh07jgcklacv89r1g8a27cp7xpk4f61ps5v9affsn1vjmcg"; depends=[MASS survival]; };
-  flacco = derive2 { name="flacco"; version="1.2"; sha256="0lwy9cl8xd11vr18hhyyq6kxcgsdqp7mvmvizw2rq2fkyw3k5nfa"; depends=[BBmisc checkmate]; };
-  flam = derive2 { name="flam"; version="3.0"; sha256="0c3j382sa7szqrpd0j8vcg19p6yn18jphd55cbvl0g6z0z76y53p"; depends=[MASS Rcpp]; };
+  fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.7"; sha256="1bam6hj3cqi5bw1zx4gkl62lzdy40pr3g7f6v36bwkczccasxrwr"; 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]; };
+  fitplc = derive2 { name="fitplc"; version="1.1-3"; sha256="1l7s5adzindq24slbygmkyk17jh37hgv1pwa7bphsb997k5qk4fm"; 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=[]; };
+  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.3"; sha256="1kqr8a311d2kh4rgy176813vcai63qkz4x7snynj82jgmqfz2llq"; depends=[BBmisc checkmate]; };
+  flam = derive2 { name="flam"; version="3.1"; sha256="12dkxisi56fg5720mh58jqrjvkqllqgzynafd44xalswkk4ahaak"; depends=[MASS Rcpp]; };
+  flan = derive2 { name="flan"; version="0.3"; sha256="1ayba6gifxmvwn5mfh0zqgl1hbp5d9spl1bxc8w8zxvih4khw7w4"; depends=[lbfgsb3 Rcpp]; };
   flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
+  flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
-  flexCWM = derive2 { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[adehabitat ellipse Flury MASS mclust mixture mnormt numDeriv statmod]; };
+  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]; };
   flexmix = derive2 { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; };
-  flexsurv = derive2 { name="flexsurv"; version="0.7"; sha256="1mwqbp89mhmplyii7if5jmlv8593i48pv5i2l15javh2p0rqdzz6"; depends=[deSolve mstate muhaz mvtnorm quadprog survival]; };
+  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]; };
+  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]; };
-  flora = derive2 { name="flora"; version="0.2.7"; sha256="0kr8gx9ckklvfifbchiyzxvby0aww7gwvh4bfd0fh6svdrin6dly"; depends=[dplyr httr shiny]; };
+  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]; };
+  flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; };
+  flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; };
+  flora = derive2 { name="flora"; version="0.2.8"; sha256="1asggrfp7i6z9p7lp1ab9i9i6xzz0qafxs03irpqig4pqw0qwm7d"; depends=[dplyr httr jsonlite]; };
   flowDiv = derive2 { name="flowDiv"; version="1.0"; sha256="1xgg73gbhysss82faqxn25l494sjbi3j0ls0dj6znzll8bhlrkb1"; depends=[flowCore flowWorkspace vegan]; };
   flower = derive2 { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
   flowfield = derive2 { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
-  flowr = derive2 { name="flowr"; version="0.9.9.5"; sha256="02ilcx5kswk7c1f1sd2g5av0m0amzl3g9yhqrl0khpiighsybciy"; depends=[diagram params whisker]; };
-  flows = derive2 { name="flows"; version="1.1"; sha256="05h4s0g9vcjwli96zlajkpi61bvdxcnzy7lcskn8z7qss3kl8wi8"; depends=[igraph reshape2 sp]; };
+  flowr = derive2 { name="flowr"; version="0.9.10"; sha256="18mjshfg3827b26b8nz52pl04ph7n887vw0ym5fybjm8gy5wwpdg"; depends=[diagram params whisker]; };
+  flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; };
   flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
   flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
-  fma = derive2 { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[forecast tseries]; };
-  fmri = derive2 { name="fmri"; version="1.5-1"; sha256="0dla5w8x4njw2njryb35nqh4r31wdps9bl5wzab2grzl546wwmwm"; depends=[]; };
+  fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
+  fmbasics = derive2 { name="fmbasics"; version="0.1.0"; sha256="1nf3s59qjiylrr293dzrnrza6q7xywsgczyb1d07x85bb9gcxkih"; depends=[assertthat fmdates lubridate]; };
+  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=[]; };
   fmt = derive2 { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; };
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
+  foghorn = derive2 { name="foghorn"; version="0.4.2"; sha256="0wskaky1jb9yqz0ds1hjrvdfdxdsmbfx730257z9xsyip1fwlic4"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; };
+  fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
+  fontLiberation = derive2 { name="fontLiberation"; version="0.1.0"; sha256="1w1rl0g4ayyp8lwppmz9yzj9cizg7i50g07216jkm1q5w0is9pmc"; depends=[]; };
   fontcm = derive2 { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; };
+  fontquiver = derive2 { name="fontquiver"; version="0.2.1"; sha256="0qv3i9hch7cygl9983s3w68wfh5qvym2jkm52pp06p6mq8a1i1wm"; depends=[fontBitstreamVera fontLiberation]; };
   foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
   forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; };
+  forcats = derive2 { name="forcats"; version="0.2.0"; sha256="1mvwkynvvgz2vi8dyz11x7xrp53kadjawjcja34hwk1d89qf7g5m"; depends=[magrittr tibble]; };
   foreach = derive2 { name="foreach"; version="1.4.3"; sha256="10aqsd3rxz03s1qdb6gsb1cj89mj4vmh491zfpin4skj1xvkzw0y"; depends=[codetools iterators]; };
-  forecTheta = derive2 { name="forecTheta"; version="2.1"; sha256="04kmhf0f27v6fajly81xyp8lrrvz1l69kx9gdxgdki8vm0zcnx2z"; depends=[forecast]; };
-  forecast = derive2 { name="forecast"; version="6.2"; sha256="0j4agcw11dzlwy90qqr2is0rhws73hphqsjfb4glw0min5vsw00v"; depends=[colorspace fracdiff nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
+  forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
+  forecast = derive2 { name="forecast"; version="7.3"; sha256="02zckbxwb4b83kadk7nd5ybxanswq1ws4z5xzdyiss626pgzljp1"; depends=[colorspace fracdiff ggplot2 nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
+  forecastHybrid = derive2 { name="forecastHybrid"; version="0.3.0"; sha256="1j5mfmdi6ky6ssai3lv2x7n09i93hpl5r1068qlm32mijf4yylbs"; depends=[forecast ggplot2 reshape2]; };
+  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-66"; sha256="19278jm85728zb20800w6hq9q8jy8ywdn81mgmlnxkmrr9giwh6p"; depends=[]; };
+  foreign = derive2 { name="foreign"; version="0.8-67"; sha256="1mcrm2pydimbyjhkrw5h380bifj1jhwzifph1xgh90asf3lvd1xd"; depends=[]; };
   forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
-  forestFloor = derive2 { name="forestFloor"; version="1.9.1"; sha256="1kg7w75a1l9sfp1bq1srlc11dp19znb1nk2lw64yab7hwna5zknr"; depends=[kknn Rcpp rgl]; };
+  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]; };
-  forestplot = derive2 { name="forestplot"; version="1.4"; sha256="0m6wrk2adfj82ggjigzisarzqlz59ffzdbiz1irf76wybivzggx6"; depends=[magrittr]; };
-  formatR = derive2 { name="formatR"; version="1.3"; sha256="09fsd0z6nhksc1h921h8q28f87hr6d1q8d6dmpxphjylb9r5xmj4"; depends=[]; };
-  formattable = derive2 { name="formattable"; version="0.1.5"; sha256="0kh3npzj42d0b21bbv9jidlkn9a8wldhg36ql5mgiiqyhva76qab"; depends=[htmltools htmlwidgets knitr markdown shiny]; };
+  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]; };
   formula_tools = derive2 { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; };
-  fortunes = derive2 { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
+  fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
   fourPNO = derive2 { name="fourPNO"; version="1.0.3"; sha256="1354rlrq7a748430v9kp7m896z1xz43fggy0nzsh9wq5r9kc9az2"; depends=[Rcpp RcppArmadillo]; };
+  fourierin = derive2 { name="fourierin"; version="0.1.2"; sha256="0pr7207w7hv6wjmmzfxwf584nnymg2jyxjb7003ljh2bdiqp1y7z"; depends=[Rcpp RcppArmadillo]; };
   fpCompare = derive2 { name="fpCompare"; version="0.2.1"; sha256="0vva60xixlx6l8623qvj2sdn5w3gjscrv5g8hqmgir4f211lzg38"; depends=[]; };
+  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]; };
   fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
@@ -4256,126 +5302,156 @@ in with self; {
   fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; };
   fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
   fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
-  fractal = derive2 { name="fractal"; version="2.0-0"; sha256="17wz3c9f1l1rphzdn7j27j5nb1ll6j84f9ihk0z6fni41050szv7"; depends=[ifultools sapa scatterplot3d splus2R wmtsa]; };
+  fractal = derive2 { name="fractal"; version="2.0-1"; sha256="1varigsw5chwz88dgipdg55fqfarvll3s7kcyqmhfm0wc7vvmz2q"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; };
   fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; };
   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]; };
   frailtyHL = derive2 { name="frailtyHL"; version="1.1"; sha256="1xjdph0ixanf9w4b6hx6igfhkcp8h93sclrg0pgqgmbvm41lhb1x"; depends=[Matrix numDeriv survival]; };
-  frailtySurv = derive2 { name="frailtySurv"; version="1.2.2"; sha256="00zi4lslcwgf5b8piaig6vh4gb8cnr4xcl425x0bw9hj9b1zsmq1"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; };
-  frailtypack = derive2 { name="frailtypack"; version="2.8.3"; sha256="1kjqq8mhd85q6c2hnxljqphc0ksq6cnbrksnis4c1rx1wcwrwqdf"; depends=[boot MASS nlme survC1 survival]; };
-  frair = derive2 { name="frair"; version="0.4"; sha256="1g52ykj1m9znpp0pvry7dnmhg4m73nbkw0bp31zl6pcsdgmxxqjr"; depends=[bbmle boot emdbook]; };
+  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]; };
   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=[]; };
   freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; };
+  freesurfer = derive2 { name="freesurfer"; version="1.0"; sha256="0wsj5px7apfia55kajxhh5717sp6n1lh8wr1bdbk6v29cq4svvd6"; depends=[neurobase R_utils reshape2]; };
   freqMAP = derive2 { name="freqMAP"; version="0.2"; sha256="02hpkqqrxifrr1cxn5brp166jwa8lgl1mcgmq7s8csrbbd900ziv"; depends=[]; };
+  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]; };
   frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; };
-  frmhet = derive2 { name="frmhet"; version="1.1.2"; sha256="1a6q5qz22b4sx5l1jz50x1q3bz8sj91dj2cahq28h6ss5b8vfn0y"; depends=[]; };
-  frmpd = derive2 { name="frmpd"; version="1.0.1"; sha256="104frdraawj8g76589kz4csbgzkvs4rgdhgwmb77srhqp5nc8v96"; 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]; };
   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"; sha256="0cna1cixq021lka7c8jgfqr6h8vvyvylckkbfay10ng7cxpqa44c"; depends=[caret gsubfn hmeasure]; };
-  fsia = derive2 { name="fsia"; version="1.0"; sha256="0qa4avd1xiwh1ih1cj067r7vipab2ngspq7hfd0xbapwx87fggrg"; depends=[]; };
-  fslr = derive2 { name="fslr"; version="1.5.0"; sha256="0ks2g21f8zkf72y3rlhj7c54np9jadgf0nir2pyn2vcy6f0w85ai"; depends=[matrixStats oro_nifti R_utils scales stringr]; };
+  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]; };
   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=[]; };
   fts = derive2 { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; };
+  ftsa = derive2 { name="ftsa"; version="4.7"; sha256="0n31vd73r2zm7mzlkd4bjpz9p61qq35jld06bv9p9dg0y883xnig"; depends=[colorspace fda forecast MASS pcaPP rainbow sde]; };
   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.0"; sha256="1yda1fkpzzgzcm5m2iflvay9w3zbc31yx2sy30swjy92a2z4abm4"; depends=[afex lme4]; };
-  fulltext = derive2 { name="fulltext"; version="0.1.6"; sha256="1k415wzcxbgbh3p38q61wymjy7a5dicy7k7q3d6syk3pc9nx1cmr"; depends=[aRxiv digest httr jsonlite magrittr R_cache rcrossref rentrez rplos rredis tm whisker xml2]; };
+  fullfact = derive2 { name="fullfact"; version="1.1"; sha256="1pnz1gykmvxdwf1a3n1z4v9md6kjlai4fvzqjzcyshw5nq81dciw"; 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.1"; sha256="1zdc6x75ksdm030pw8ldb00x5prlci29d6p6dbxiavwh9z4081z3"; depends=[ggplot2 gridExtra Hmisc pander plyr reshape2 ROCR scales]; };
+  funModeling = derive2 { name="funModeling"; version="1.6"; sha256="1h0qzdx6yk10snhx6apriz3al52wqrisffqvanhpznsvk8yg3wvd"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander reshape2 ROCR scales]; };
   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.4"; sha256="1rgdldjjpy8zvll6lhx6al70iazg4vfd86jhyx1c50hpnnl0yajb"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
-  fungible = derive2 { name="fungible"; version="1.3"; sha256="0rzvib56p7sbiqk0ac36fdfrsavivdw5123gkklw33qny3jzzvhp"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
-  funr = derive2 { name="funr"; version="0.2.0"; sha256="0fmqrjvzpc7jbs85fznw723k9xmpxvbj65nkfc9qrvskgmja4mjn"; depends=[]; };
-  funreg = derive2 { name="funreg"; version="1.1"; sha256="1sxr4mylcpbya197d55yi6d7g5pfspaf59xxbwjgmwgjw06rl76r"; depends=[MASS mgcv mvtnorm]; };
-  funtimes = derive2 { name="funtimes"; version="2.1"; sha256="1h8d2x683a1s4inlbh5y4zijzyny1q902xa5any9hcb6svjfqr6z"; depends=[Jmisc]; };
+  funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
+  fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
+  funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
+  funrar = derive2 { name="funrar"; version="1.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="3.0"; sha256="017qad38q5zpbzpsln0cns7y1wf5q5xm7kll4knqrfa6zwaijl92"; depends=[Jmisc]; };
+  furniture = derive2 { name="furniture"; version="1.4.1"; sha256="1bziqav2y7h7fkv84ci3p483zbn2rw0wr0cz6jc5a9h8g1gz80cl"; 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.1"; sha256="1plld1icxrcay7llplbd4i8inpg97crpnczk58mbk26j8glqbr51"; depends=[futile_options lambda_r]; };
-  futile_matrix = derive2 { name="futile.matrix"; version="1.2.2"; sha256="1cb975n93ck5fma0gvvbzainp7hv3nr8fc6b3qi8gnxy0d2i029m"; depends=[futile_logger lambda_r lambda_tools RMTstat]; };
+  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="0.12.0"; sha256="0cr8xddwkn9pwcrjvfd0z000sx233p3zafrp3b8waz6sh6zs1k7k"; depends=[digest globals listenv]; };
+  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]; };
+  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=[]; };
+  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]; };
   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]; };
   fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; };
   g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
+  g2f = derive2 { name="g2f"; version="0.1"; sha256="1njx03hnfvzqyzhyjg5zwikv36xggss2vc82vpfybg6rqkx3rqbd"; depends=[KEGGREST minval sybil]; };
   gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
   gIPFrm = derive2 { name="gIPFrm"; version="2.0"; sha256="1syjsnna7b7y27yf7zsxjwq8z5f4wxf2hfadhgjaw898gvfcnrbc"; depends=[]; };
+  gLRTH = derive2 { name="gLRTH"; version="0.1.0"; sha256="0a4vcfb54sqbk43gp397dwc02701wzsf4sxq2r121m2amad79nl5"; depends=[]; };
   gMCP = derive2 { name="gMCP"; version="0.8-10"; sha256="1alfy91mk6zx0k49w5ksa77qg5iqbav20ydfl1w7bh8dzp4xxxqk"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; };
-  gMWT = derive2 { name="gMWT"; version="1.0"; sha256="12ryjpq0k3brw4xy4f6j89zm94j6phbzn9ga0nr9bzfvslhqjhna"; depends=[clinfun Rcpp RcppArmadillo]; };
+  gMOIP = derive2 { name="gMOIP"; version="1.1.0"; sha256="122yzwicsq7q98x5dxk1mmf148v2w64jz3pd3535himx85gy9zy3"; depends=[ggplot2 ggrepel]; };
+  gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; };
   gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
   gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-  gProfileR = derive2 { name="gProfileR"; version="0.5.3"; sha256="0kv01b1ihwggzjd9plznz3il3b97pja11nqki3378zvpgfy5wzdn"; depends=[plyr RCurl]; };
-  gRain = derive2 { name="gRain"; version="1.2-5"; sha256="1rzg8w36qhpar1kn1dvjw54j1i0anpqr9iv51i9gf4dm6s3afylq"; depends=[graph gRbase igraph Rcpp RcppArmadillo RcppEigen]; };
+  gProfileR = derive2 { name="gProfileR"; version="0.6.1"; sha256="1qix15d0wa9nspdclcawml94mng4qmr2jciv7d24py315wfsvv8p"; depends=[plyr RCurl]; };
+  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.7-5"; sha256="1bl53dgv4n1hfy1ckp5wn9k5xnd97pdy07q8grd84vpi2fbdc454"; depends=[graph igraph Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
-  gRc = derive2 { name="gRc"; version="0.4-1"; sha256="1a6q24yj7js1sk0lfqbm7kdv605cby6i711w4dlygsxdvwxbrsdr"; depends=[graph gRbase Rgraphviz]; };
+  gRbase = derive2 { name="gRbase"; version="1.8-1"; sha256="07b5vl55v04ycwwh92xp86c12kxvhrlbakjrlxrlq8i8drs3bpcj"; 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]; };
   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=[]; };
+  gWQS = derive2 { name="gWQS"; version="1.0.0"; sha256="0n0zwfqz5g4js5y3ss64dv5842jypr6sqacs32ax37immd34slhq"; depends=[ggplot2 Rsolnp tableHTML ztable]; };
   gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
-  gWidgets2 = derive2 { name="gWidgets2"; version="1.0-6"; sha256="0xh1f9j1y3zifz8xrvyp41c8zdgqx8lx0cg1sdqhxv8j3mxibcsg"; depends=[digest]; };
-  gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-4"; sha256="0vyms79ysmami1gfgjmvlqp62gbnxgwckdrbwhjkmlg9rdmbi9y7"; depends=[gWidgets2 memoise RGtk2]; };
-  gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-4"; sha256="1c9vfnr6j4lvshvdzp88a45pjrdl0dfhr1rxlpz95d3cks9rfq1f"; depends=[digest gWidgets2 memoise]; };
+  gWidgets2 = derive2 { name="gWidgets2"; version="1.0-7"; sha256="02jrv5x7s3jm2ajpdvgsp4zkn65gjy96rvgdxhf9smp1kb6llzg0"; depends=[digest]; };
+  gWidgets2RGtk2 = derive2 { name="gWidgets2RGtk2"; version="1.0-5"; sha256="0x6b05gag705mhp30wspamjrcx588gblgy839nv2j2w3n9k4vz98"; depends=[gWidgets2 memoise RGtk2]; };
+  gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-5"; sha256="1g0p7bl76rkkrixzw4b1s99gyvi8b5a4vbnsj2wmy7y9grbzndkm"; depends=[digest gWidgets2 memoise]; };
   gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[cairoDevice gWidgets RGtk2]; };
   gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; };
+  gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; };
   gains = derive2 { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
   galts = derive2 { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; };
-  gam = derive2 { name="gam"; version="1.12"; sha256="00rx8y7pcxabwjvg0ch6c76xqs43drjg3ih3kflqxdcl2rmaapnd"; depends=[foreach]; };
-  gamair = derive2 { name="gamair"; version="0.0-9"; sha256="014fkysiyd49q9j0rrqh6wlp4pqz1q8lqgrqjxbp59x2mfhgxhsg"; depends=[]; };
-  gambin = derive2 { name="gambin"; version="1.3"; sha256="1gxlg7rngryxhixpvq6xswq7i5wm31ya6zllx5zdbh65b925hmxf"; depends=[]; };
-  gamboostLSS = derive2 { name="gamboostLSS"; version="1.2-1"; sha256="0571wqxxpb1h0dd6fw6vz2f3n2id78k8zbc9zclzdhk5798y784c"; depends=[mboost]; };
+  gam = derive2 { name="gam"; version="1.14"; sha256="1z31anm8c4aly7wd9j4zl34pfc0i8cr3p2yjhhf4x3850a1sjlv6"; depends=[foreach]; };
+  gamCopula = derive2 { name="gamCopula"; version="0.0-2"; sha256="19sx0n9mavjwdzi5ii7n2mcrcrm1k1pbsdmvwnrsqvbvaz9r8vbg"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
+  gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; };
+  gambin = derive2 { name="gambin"; version="1.4"; sha256="11k5y400d8ghaagvd1wrisjsid5zn4qgv07qf60a6f4ynsfbigca"; depends=[]; };
+  gamboostLSS = derive2 { name="gamboostLSS"; version="1.2-2"; sha256="1np2pb47pv1jgg1gl9k728bfxaq10yghnmgx2ahi2a86b6pzff2s"; depends=[mboost]; };
   gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
   gamclass = derive2 { name="gamclass"; version="0.56"; sha256="13gy8ys69dkhm54x3vcpqblq4j2hkbsnaswzcq0v0saqd9b1shcs"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
   games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
   gamlr = derive2 { name="gamlr"; version="1.13-3"; sha256="05hxmhmgs83q6d5jhq9y5b5llk1pi2jf61286pmnwbzmdwdhrbr2"; depends=[Matrix]; };
-  gamlss = derive2 { name="gamlss"; version="4.3-8"; sha256="1vgw5j8vw731my76z8xdcb1clg4hsim4gfkzv38w49hw64vijhlr"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
-  gamlss_add = derive2 { name="gamlss.add"; version="4.3-4"; sha256="1sbs6jc7ashmkv8qz953v8paq4783rzw3m82b8ils4qm53ni8m01"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
-  gamlss_cens = derive2 { name="gamlss.cens"; version="4.3-2"; sha256="0kakgvlx7g8v6wdlnjyganmvpnv8zqr1ml6n2saz913ykn3mkc77"; depends=[gamlss gamlss_dist survival]; };
-  gamlss_data = derive2 { name="gamlss.data"; version="4.3-2"; sha256="056s441i25gxg52669nqvjc2xryaw5izbh5f8lcjgkflynhb102z"; depends=[]; };
+  gamlss = derive2 { name="gamlss"; version="5.0-1"; sha256="1ai7zgsbxx7hdz4qq87dwk94zwzvzpjkmvlzi4hwwjpk350xpwcj"; depends=[gamlss_data gamlss_dist MASS nlme survival]; };
+  gamlss_add = derive2 { name="gamlss.add"; version="5.0-1"; sha256="1agk6pfm04hf9dp5r6dvxqkj1hykx23a16q7vch2sg752z0dadgk"; depends=[gamlss gamlss_dist mgcv nnet rpart]; };
+  gamlss_cens = derive2 { name="gamlss.cens"; version="4.3-5"; sha256="06baf94kpprj03dggnyvvmi4nw3qa23cyy1crsa0zfnaqj915ypv"; depends=[gamlss gamlss_dist survival]; };
+  gamlss_data = derive2 { name="gamlss.data"; version="5.0-0"; sha256="1mqz7m4iksmx939bz1lq05cxz3bfcksn2ggw3cv7b0k98cykgg1s"; depends=[]; };
   gamlss_demo = derive2 { name="gamlss.demo"; version="4.3-3"; sha256="01p6abppwbnh2a2ks1g08z4iwq2fxf125y9s4qzssybsn76a3gf3"; depends=[gamlss_dist gamlss_tr rpanel]; };
-  gamlss_dist = derive2 { name="gamlss.dist"; version="4.3-5"; sha256="0qq4nvcbh7s675bk3afv3wm0xdnzcbabdsbln8n16xgyvsiyr4pl"; depends=[MASS]; };
-  gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-2"; sha256="1hq0nv4l8z1iwbldf9vhdsgr0sd6jans90dvjgdvf2z66bvmc9i0"; depends=[gamlss gamlss_dist nnet]; };
+  gamlss_dist = derive2 { name="gamlss.dist"; version="5.0-0"; sha256="1k1bn7a3kiasab27p21bgwacrz5z7ha3prl8m2gfnqx1i3z2kmci"; depends=[MASS]; };
+  gamlss_mx = derive2 { name="gamlss.mx"; version="4.3-5"; sha256="1jfs3ib2imwgazf8v23fa12iaflv0pm944bkqklx8qcljxp1lcs7"; depends=[gamlss gamlss_dist nnet]; };
   gamlss_nl = derive2 { name="gamlss.nl"; version="4.1-0"; sha256="083l5lsb0csxcp4vffvdv2nr7jk3s2gkcavx66m8inzw16j7xilz"; depends=[gamlss survival]; };
-  gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3"; sha256="0mbvllgr5szrxwrr40jbn2c57hplkgpbnbr2v6pszjjygjcys6ga"; depends=[gamlss gamlss_dist mgcv spam]; };
-  gamlss_tr = derive2 { name="gamlss.tr"; version="4.3-1"; sha256="1fdy61i2dmz2qafk92kl9acjbxx5gm8s9kkc8k9nnx6230qg8iq6"; depends=[gamlss gamlss_dist]; };
-  gamlss_util = derive2 { name="gamlss.util"; version="4.3-2"; sha256="13facgyd14jl4j09d446jjzs91zwmv85g22gkyyi1hl4i5v5nfc4"; depends=[gamlss gamlss_dist zoo]; };
-  gamm4 = derive2 { name="gamm4"; version="0.2-3"; sha256="19vy5wik9nh77cm25gp3j3j8w8vinwzx5pv90nzdzvx84yvvf0y3"; depends=[lme4 Matrix mgcv]; };
+  gamlss_spatial = derive2 { name="gamlss.spatial"; version="1.3.1"; sha256="0gfayygwqiahmcpnwdpiaj8p323624cclcrpkip6gc08ddfbr377"; depends=[gamlss gamlss_dist mgcv spam]; };
+  gamlss_tr = derive2 { name="gamlss.tr"; version="5.0-0"; sha256="02akydpvwl1qkhxpr72lv9qp4z2ra69abyq51b57rh4p60g78vhm"; depends=[gamlss gamlss_dist]; };
+  gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; };
+  gamm4 = derive2 { name="gamm4"; version="0.2-4"; sha256="0jssi97kmad1fmnjlymx6sjv1qcfyslhwfcx8bfzl8x15fqj1v9v"; depends=[lme4 Matrix mgcv]; };
   gammSlice = derive2 { name="gammSlice"; version="1.3"; sha256="1vw8d0v0awyflh4gmbcf1g9nfx52cys8gpqvag5djri59p0y945a"; depends=[KernSmooth lattice mgcv]; };
+  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=[]; };
+  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]; };
-  gaston = derive2 { name="gaston"; version="1.4"; sha256="1bq2b8mdgs4a8mjs137i0rry82dqm4sdrydlhqs7f2maqb28j4zm"; depends=[LDheatmap Rcpp RcppEigen RcppParallel WhopGenome]; };
+  gasfluxes = derive2 { name="gasfluxes"; version="0.2"; sha256="01mqqj49p8z1m580a9fjrifyd7q2nl2qh8p3bxi2qqw38jxaccql"; 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=[]; };
   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.0"; sha256="00k6617wra9pcvyr94mr48c21l7z6grlpgf9g02lh23p6900fjxq"; depends=[]; };
+  gazepath = derive2 { name="gazepath"; version="1.1"; sha256="0zq7bcld41737qk94gjbcphpirrnnf8k6z3f8l3jay2n47yn4gji"; 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]; };
   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.0.1"; sha256="1n6180sfr5m7vms8rk8pwsg7nxyw3pmq05bh72462ygyfykivifm"; depends=[doParallel doRNG earth foreach gbm xgboost]; };
   gbutils = derive2 { name="gbutils"; version="0.2-0"; sha256="1hi2kq4m7lrhd9yikf4qb0xccr6v1pp7kmly5j68xd3m95fi86rc"; depends=[]; };
-  gcbd = derive2 { name="gcbd"; version="0.2.5"; sha256="0fkg6vk0jkl6680n1hljyv783j4hd84mql0k4pfblvqafwv4nhm3"; depends=[lattice plyr reshape RSQLite]; };
+  gcKrig = derive2 { name="gcKrig"; version="1.0.1"; sha256="1iqbhfw4ib3lgjbaspjdh2qxif1inwly9fi8hyf4x6a153f20502"; 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.2"; sha256="0i8h10yllxdl0az7byqisfx5x3s1nrp3xzp7myawmp4a0d11h1zc"; depends=[cmprsk ggplot2 survival]; };
+  gcerisk = derive2 { name="gcerisk"; version="16.1.3"; sha256="0bjd3paxf1jrirv2grq20rk40l7izbw2y2dnj687hwcgah5021gv"; depends=[cmprsk ggplot2 survival]; };
   gclus = derive2 { name="gclus"; version="1.3.1"; sha256="02ba6zj9bjwrzykamjp40ajynx9xjx9h2i85n0ym0r5lcki4x6fn"; depends=[cluster]; };
   gcmr = derive2 { name="gcmr"; version="0.7.5"; sha256="1z1hdgdasmw3drld8nmkw6cc1xls1gaaym1mlr8lyida4gb3giv8"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; };
   gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; };
@@ -4384,138 +5460,184 @@ 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.1-9"; sha256="174ngm0xg993gkmf70yaln98d2rpjvdx5ngf2aga1jzph6xxdj6d"; depends=[igraph Matrix raster sp]; };
-  gdm = derive2 { name="gdm"; version="1.1.7"; sha256="1yqjg57ghrbn38i2llna1jppjfasrgxp696afzr9hgw1hlmyknsa"; depends=[plyr raster Rcpp reshape2 vegan]; };
-  gdtools = derive2 { name="gdtools"; version="0.0.7"; sha256="1bmnf9d677f2jy8jnb9ymjz1qzm4yrd0qp6k5qrrly06jfffyx7g"; depends=[Rcpp]; };
+  gdm = derive2 { name="gdm"; version="1.3.0"; sha256="185vsf8cvazk3865ds1vxwaaf3y8g7x52r5kp8rxkmnjavw6x24q"; 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]; };
   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=[]; };
-  geeM = derive2 { name="geeM"; version="0.8.0"; sha256="1glnzv06wsrxb1rp4p38w1hmnk4jvd78wymvffhkklwsrmg8jgw5"; depends=[Matrix]; };
-  geepack = derive2 { name="geepack"; version="1.2-0.1"; sha256="0jipq3ylkvpg2qnwmfxlra6ad8lpsm8hllvqaiiddbhppqn9pj92"; depends=[]; };
+  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]; };
-  geigen = derive2 { name="geigen"; version="1.9"; sha256="1klglmhfrfys7kn89wjkg7gk4sjsz538xkw5k8sk039wr0qxk8yj"; depends=[]; };
+  geigen = derive2 { name="geigen"; version="2.0"; sha256="00l4d512w2r2yc1naqfapfxv1l4v6ccww6hqzchf4zhkqmfr3mgd"; depends=[]; };
   geiger = derive2 { name="geiger"; version="2.0.6"; sha256="1zry3iclj7yciiiysbq6z0kn759c7hdy5fq0dcszkskqcd92qfz1"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; };
-  gelnet = derive2 { name="gelnet"; version="1.2"; sha256="1npzgbwpsbd0rpyp46njyhwhas0k28nj8b5rz1jmhgn4xf156wkn"; depends=[]; };
-  gems = derive2 { name="gems"; version="1.0.0"; sha256="0h8z3ih24hxdv8bah4xf8f797pnwihby8hj93z6zw5sq9dyszxwa"; depends=[data_table MASS msm plyr]; };
-  gemtc = derive2 { name="gemtc"; version="0.8"; sha256="00pjr9pcjvmlfbmssqwq2qh6cffgg7ach9nikjd5w086z0qnngis"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; };
+  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]; };
+  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]; };
   genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
   genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; };
   genalg = derive2 { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; };
   genasis = derive2 { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; };
+  gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; };
   gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
   gender = derive2 { name="gender"; version="0.5.1"; sha256="0qiwqnpk2pzwvvvnnny0wmmrix1aq3kwnk6n9jyvqzh0v9bzd65g"; depends=[dplyr httr jsonlite]; };
-  genderizeR = derive2 { name="genderizeR"; version="1.2.0"; sha256="1a7vafspdd64wr47k1z391ff1ri5f8bynlgn876khcxzhm2vwdva"; depends=[data_table httr magrittr stringr tm]; };
+  genderizeR = derive2 { name="genderizeR"; version="2.0.0"; sha256="0r9r5x93zr58sfrww3l2vyvjyj8lir2yds08y6dzf88rs9v15w3c"; depends=[data_table httr magrittr stringr tm]; };
   gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; };
   geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
-  geneNetBP = derive2 { name="geneNetBP"; version="1.0.0"; sha256="0xvri7h4ka3rf5cghwpz7ci7hdqrwrqfnxvwb7jkba73y3rmpri9"; depends=[graph Rgraphviz scales]; };
-  geneSLOPE = derive2 { name="geneSLOPE"; version="0.36.6"; sha256="0c2b42j39yz85rffh0a9iqvb5fk5my7a6354dcxjz9fwh0irfdxf"; depends=[bigmemory ggplot2 SLOPE]; };
+  geneNetBP = derive2 { name="geneNetBP"; version="2.0.1"; sha256="0sp1chyln5k2zsq7cdhvrqxwr2nhrll1pdl1l5g6fd4gjl2m1nwk"; depends=[bnlearn ggm gRain graph igraph Rgraphviz scales]; };
+  geneSLOPE = derive2 { name="geneSLOPE"; version="0.37.0"; sha256="1pw6y0n1xnprz2d4hyhlp1m9grki7s9hi2f4nqxa34wynqkp4bx8"; depends=[bigmemory ggplot2 SLOPE]; };
   geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; };
+  genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; };
   genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; };
+  generalCorr = derive2 { name="generalCorr"; version="1.0.3"; sha256="10gg89b423dncmcvk6ysifb26m99ywsbwb6x8injghgnjjibjq1k"; depends=[meboot np psych xtable]; };
+  generalhoslem = derive2 { name="generalhoslem"; version="1.2.4"; sha256="043p40kldfs1r4p140cq7pzshv6y6adipfsfg8vyr1s2bd16ffvs"; depends=[epiR MASS reshape]; };
   generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; };
   genetics = derive2 { name="genetics"; version="1.3.8.1"; sha256="0gfbrpz0zp5bgw3s21wrhjfy70laif47wcrjrm6mjgs6xapiw790"; depends=[combinat gdata gtools MASS mvtnorm]; };
-  genie = derive2 { name="genie"; version="1.0.0"; sha256="1g8iyls6fm6a7b08j1wc7qa5aksnfnarricwpl3csp9x8k5qifap"; depends=[Rcpp]; };
+  genie = derive2 { name="genie"; version="1.0.2"; sha256="1sh6xlj347fqrgsxn5xgn4h8wfr58xd20idsfzhlywabkhkfbf6i"; depends=[Rcpp]; };
   genlasso = derive2 { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; };
   genoPlotR = derive2 { name="genoPlotR"; version="0.8.4"; sha256="06c4flddv83nwjagnszl0sv92mbxf91qml8awhhxnrs1bna04f1p"; depends=[ade4]; };
+  genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; };
+  genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; };
   genpathmox = derive2 { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[diagram mice plspm quantreg]; };
   genridge = derive2 { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; };
   gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
+  gensphere = derive2 { name="gensphere"; version="1.0"; sha256="184ky31l42k6x2di21hr2x1l35ksvr5yq8sr35mn642zckxx2y6g"; depends=[geometry mvmesh rgl SphericalCubature]; };
   geo = derive2 { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; };
   geoBayes = derive2 { name="geoBayes"; version="0.3.3"; sha256="1jw0fj39gzf4cislc889ndgj34svcdxk0jz85ssk936g9gp0mm0c"; depends=[coda sp]; };
   geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
-  geoR = derive2 { name="geoR"; version="1.7-5.1"; sha256="10rxlvlsg2avrf63p03a22lnq4ysyc4zq06mxidkjpviwk1kvzqy"; depends=[MASS RandomFields sp splancs]; };
+  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]; };
   geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; };
-  geocodeHERE = derive2 { name="geocodeHERE"; version="0.1.3"; sha256="10b1fgclv3199cglnip5xy0kgi3gi41q9npv7w3kajkrdknnxms4"; depends=[httr]; };
   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]; };
-  geojsonio = derive2 { name="geojsonio"; version="0.1.6"; sha256="1wksx97djj6s9fh580j414icn9ava58gix3bnikm94m9bv7yj32f"; depends=[httr jsonlite magrittr maptools rgdal rgeos sp V8]; };
-  geoknife = derive2 { name="geoknife"; version="1.2.1"; sha256="1azrprrcah2szc0nk0a3dsh87qlm9jbhm9lc8qbrjp5wary0bkdc"; depends=[curl httr sp XML]; };
+  geohash = derive2 { name="geohash"; version="0.1.2"; sha256="1vwalnf5cbpbq5b68zc6qa8mm84v5zlb8s2pwg7j2f7s43y0mgwz"; depends=[Rcpp]; };
+  geojson = derive2 { name="geojson"; version="0.1.0"; sha256="0br2vp9lzqmz84scscclcd3d7ysvrdk68fxbc05ywnlsimdp5fxd"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
+  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]; };
   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.0.1"; sha256="0yrlyhvqaab7y9ifrwmg93vq4fxp1lc87xxqhnkhp7qj9mhrpr7p"; depends=[ggplot2 network sna]; };
-  geomorph = derive2 { name="geomorph"; version="3.0.0"; sha256="0yy4ln0g7wirbjzzh8c0cpnl6wsb0c0q82ic7kwjj0i213jxp2xd"; depends=[ape geiger jpeg Matrix phytools rgl]; };
+  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]; };
-  georob = derive2 { name="georob"; version="0.2-3"; sha256="1amasfxjv3gd7199i3smk8dhgadw730l8cbj2pdpfwxwvwf2jlav"; depends=[constrainedKriging lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
+  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=[]; };
   geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; };
-  geosphere = derive2 { name="geosphere"; version="1.5-1"; sha256="06qwpaahpj2czs7rwv0rwnwlqjb4xanxyi00ci13b4imwb3w51q8"; depends=[sp]; };
+  geosphere = derive2 { name="geosphere"; version="1.5-5"; sha256="0vffppnyxp7ryg7rvsb1ww9z0ghh1vk20vzgw245pi2gfh9f0vwb"; depends=[sp]; };
   geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
   geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; };
-  geostatsp = derive2 { name="geostatsp"; version="1.4.0"; sha256="0anwqdwpsnivk421gaq4hpkx8m47m7jwll7qr7lnnssyljld7djc"; depends=[abind Matrix numDeriv raster sp]; };
+  geostatsp = derive2 { name="geostatsp"; version="1.4.4"; sha256="0gvxbrr52v8g0a2mbzc8754z5ycpgz7hjfgi7xirn10iv99kwgjz"; depends=[abind Matrix numDeriv raster sp]; };
   geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; };
   geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
-  geotopbricks = derive2 { name="geotopbricks"; version="1.3.7.2"; sha256="15z4969vgh0jwksqrjsd5m598xbz2ppf1ymvf80id4h0grzh08l5"; depends=[raster rgdal stringr zoo]; };
-  geozoo = derive2 { name="geozoo"; version="0.5.0"; sha256="1a91x4mdmha40xs2pgwbycni10yhavwmb2mwm0pjj1gg5j2d82ri"; depends=[bitops]; };
-  gesca = derive2 { name="gesca"; version="1.0.1"; sha256="08yprp486gw6vgh5rc7nl1myx57fs1y7a36g01i7vd0g1ikcpqwj"; depends=[]; };
-  gesis = derive2 { name="gesis"; version="0.1"; sha256="0kvmlkq2cgxrjdq2dyjqs1pv875hdbapsygxrp0i8ab0fqirbrip"; depends=[RSelenium]; };
+  geotopbricks = derive2 { name="geotopbricks"; version="1.4"; sha256="1jqkdhljf0syfvkcy7wgaccrhp3hfx0kymw3vyckhmf1dkwbjvyj"; depends=[raster rgdal stringr zoo]; };
+  geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; };
+  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]; };
   getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; };
-  getPass = derive2 { name="getPass"; version="0.1-0"; sha256="0jqlf4hl7g7jrwjm2y0syxm0csya2q3g2jlgsq9xfnyg56wa86qw"; depends=[rstudioapi]; };
+  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]; };
   getopt = derive2 { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz1556xqcmx8nhrlbbhaq4w7gl2ibl87r"; depends=[]; };
-  gets = derive2 { name="gets"; version="0.6"; sha256="0x6f7nh4a5yzdwh9pfpx2gzqng1lpappa2m0729419v11rzwmrp8"; depends=[zoo]; };
+  gets = derive2 { name="gets"; version="0.12"; sha256="0prq1w5z2cfkg0k8hj2i660yrky8l74rrf7bcjpivc5ml2ssh9z7"; depends=[zoo]; };
   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]; };
-  ggExtra = derive2 { name="ggExtra"; version="0.3.4"; sha256="1lbwxmvxhfybywpzyh9h4qg962xckckfplv37w587fxa66kvs5xb"; depends=[ggplot2 gridExtra]; };
+  gfer = derive2 { name="gfer"; version="0.1.3"; sha256="1s6s0ng940spj1056z8jd0p3i34kzr1skzjr8w64x20kps1rvl9l"; depends=[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]; };
   ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
-  ggRandomForests = derive2 { name="ggRandomForests"; version="1.2.1"; sha256="023badp3frvdmdq5acny4k6vq5xl78hsvr429060g9a8alrz51qy"; depends=[ggplot2 randomForestSRC survival tidyr]; };
-  ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.0"; sha256="18pmqwyk8sbbj1j55ixfda4hfss83lcvcgz2nkppjdvaifad2lyh"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; };
-  ggalt = derive2 { name="ggalt"; version="0.1.1"; sha256="05jpvyl19ppyzprzprsp66aardn90fyw7q837vb56s49ivim7sk1"; depends=[ash dplyr ggplot2 gtable KernSmooth maps MASS proj4 RColorBrewer scales]; };
-  ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.5.0"; sha256="0h8nl56pld7rlhw381pzngx8mznxr9d5vs0lwcz2j6sy9db2y53i"; depends=[beeswarm ggplot2 vipor]; };
+  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]; };
+  ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; };
+  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-18"; sha256="13a807zgjjr4808h5bk2wkwmvx9v8nzl3zibd19gd5ah4mhmfx2z"; depends=[ggplot2 MASS]; };
-  gge = derive2 { name="gge"; version="1.0"; sha256="06a9czn3r76rg85z84177j3pd4mhsrskim1bxj3phc866chwj1wb"; depends=[reshape2]; };
-  ggenealogy = derive2 { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49yccyydhahqk1nnljqgf1cm11fl4cmb44la5zd3wjn"; depends=[ggplot2 igraph plyr reshape2]; };
-  ggfortify = derive2 { name="ggfortify"; version="0.1.0"; sha256="0q4crp4syk2b48m2q38pc852y2bdy97spqrcjnl2q7yb3il1r90z"; depends=[dplyr ggplot2 gridExtra proto scales tidyr]; };
-  ggiraph = derive2 { name="ggiraph"; version="0.2.0"; sha256="0z8gvqphww24w70hkvqvjh4afn5nk6blmvsvhghjhzgqgdwk1yyx"; depends=[ggplot2 htmltools htmlwidgets plyr rvg xml2]; };
+  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]; };
+  gge = derive2 { name="gge"; version="1.1"; sha256="04212spczyr2vqxki0n82ml26mgiq29i6mxyh06v42lqpg39sx19"; depends=[reshape2]; };
+  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]; };
+  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]; };
+  ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; };
   ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; };
   ggmap = derive2 { name="ggmap"; version="2.6.1"; sha256="0mssb09w818jv58h7mly9y181pzv22sgcd4a079cfpq04bs0wigw"; depends=[digest geosphere ggplot2 jpeg mapproj plyr png proto reshape2 RgoogleMaps rjson scales]; };
-  ggmcmc = derive2 { name="ggmcmc"; version="0.8"; sha256="12dhhvqbmj20fk3c7h7qdvgc2hn83kb4gqwflsvgs7s8dmcdgy4i"; depends=[dplyr GGally ggplot2 tidyr]; };
-  ggparallel = derive2 { name="ggparallel"; version="0.1.2"; sha256="05l58qr5mxkkmwl444n0v27r527z64hxkh106am3aj7ml916z0qc"; depends=[ggplot2 plyr reshape2]; };
-  ggplot2 = derive2 { name="ggplot2"; version="2.1.0"; sha256="0s9rvp0f736ji6p9xpxq54agxf95pjkql4sj7ag0hv2xhnp27hzj"; depends=[digest gtable MASS plyr reshape2 scales]; };
+  ggmcmc = derive2 { name="ggmcmc"; version="1.1"; sha256="09b89cnmdmiwy18igzxjiq60l1xqjh022fw3rhd5kx7lnh02yza3"; depends=[dplyr GGally ggplot2 tidyr]; };
+  ggmosaic = derive2 { name="ggmosaic"; version="0.1.2"; sha256="1mxa09914j9i8b14brl70a7j7ngycj8wkil3sqkd4jwplaszvhsn"; depends=[dplyr ggplot2 gridExtra NHANES plotly productplots purrr tidyr]; };
+  ggnetwork = derive2 { name="ggnetwork"; version="0.5.1"; sha256="13qisn4msjzkpcmn7rh2c4ymqfxp9bayrvqngp9pysfmr6wvc6ia"; depends=[ggplot2 ggrepel network sna]; };
+  ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; };
+  ggplot2 = derive2 { name="ggplot2"; version="2.2.1"; sha256="0543782ddv2hp6s0l702mnxfg8n7a6qlbm8bm55x22hnqgz8kg2z"; depends=[digest gtable lazyeval MASS plyr reshape2 scales tibble]; };
   ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; };
-  ggpmisc = derive2 { name="ggpmisc"; version="0.2.7"; sha256="0m1fbxcizmnp0mild77ldfycz9yiq9d5zvyk1vvpx5ng79lf6lz9"; depends=[dplyr ggplot2 lubridate polynom splus2R xts zoo]; };
+  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]; };
   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.5"; sha256="04kqmvr122lhb79y2wnwfx249sh8hkfd0p4gx13mb52qgzzd1f4r"; depends=[ggplot2 Rcpp]; };
-  ggseas = derive2 { name="ggseas"; version="0.3.0"; sha256="08536kp45alhdm6r3vl7zc62by2q0rfmr67av9f664x6fx4q8xdi"; depends=[ggplot2 seasonal zoo]; };
-  ggsn = derive2 { name="ggsn"; version="0.3.0"; sha256="02a4p15mqvfjxicwimp00nmd4bm7ydqxppxkxr11n2aqng9fjyrn"; depends=[ggplot2 maptools png]; };
-  ggspectra = derive2 { name="ggspectra"; version="0.1.6"; sha256="1wvw9yjdb3jysg0nc6nfvhdbfzqh9i88rzin0bdw93gfq6fv969j"; depends=[dplyr ggplot2 lubridate photobiology photobiologyWavebands scales tidyr]; };
-  ggswissmaps = derive2 { name="ggswissmaps"; version="0.0.8"; sha256="1y61xdhb67w0dmjmxa40pbzfjj6bpik477jf3dm61qjnfp4a1l4l"; depends=[ggplot2]; };
-  ggtern = derive2 { name="ggtern"; version="2.1.0"; sha256="0icmw8cfm0ciay7vw7gfifq7mvccfq00qx167dh9nai12kkgnr0c"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
-  ggthemes = derive2 { name="ggthemes"; version="3.0.2"; sha256="0nx4sswvzr8qr54pmxk7qqj85ayajpiakzz33sf27s622bh0gndd"; depends=[assertthat colorspace ggplot2 scales]; };
-  ggvis = derive2 { name="ggvis"; version="0.4.2"; sha256="07arzhczvh2sgqv9h30n32s6l2a3rc98rid2fpz6kp7vlin2pk1g"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
-  ghit = derive2 { name="ghit"; version="0.2.5"; sha256="1164j18hh1jaziirvlrc0prmib0ph4dw16krpksxxymy6xxsvi9s"; depends=[git2r]; };
-  ghyp = derive2 { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[gplots numDeriv]; };
+  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]; };
+  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]; };
+  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]; };
+  ggthemes = derive2 { name="ggthemes"; version="3.4.0"; sha256="1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"; depends=[assertthat colorspace ggplot2 scales]; };
+  ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
+  ghit = derive2 { name="ghit"; version="0.2.15"; sha256="07f7bz0n2bzs3m3q1hsld15n10nkk7ziwl37lxsf2gh9yv7xvfb3"; depends=[git2r]; };
+  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.1-6"; sha256="164ayfhf532iv0ja87z5aigrbfngxs8naxdnh041lw431mchvrp6"; depends=[doParallel doSNOW foreach gWidgets2 igraph lavaan MASS qgraph snow]; };
-  gimms = derive2 { name="gimms"; version="0.5.1"; sha256="149jk2j2vzvcn4pk78ha2vbjwq24kd42mvhkhw1ihmnjg6yjw7j3"; depends=[doParallel foreach Kendall raster zyp]; };
+  gimme = derive2 { name="gimme"; version="0.2-0"; sha256="0x2j4041rah6bi99z8syypg3w8zzkdkxymmdz33rgc7azx799cps"; depends=[gWidgets igraph lavaan qgraph]; };
+  gimms = derive2 { name="gimms"; version="1.0.0"; sha256="0f959gr4nzf9p2gpvdrzlndp24g2hhzc0wbkgpbs056wp8ij0mws"; depends=[Kendall raster RCurl zyp]; };
   gistr = derive2 { name="gistr"; version="0.3.6"; sha256="1rajdfb8zkx444v89iapzrdad8y81rhd9q9nwcxw03jig4xm48mb"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
-  git2r = derive2 { name="git2r"; version="0.14.0"; sha256="0jkkrggffpflaaw0gn2hnm1wz83xs31amriim481g73zf30g2bpr"; depends=[]; };
+  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]; };
   gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
-  gjam = derive2 { name="gjam"; version="1.0"; sha256="1g85syk4cjrgvqwfjh63wzib9h7qpfg4l5qfa8lq9qz6m6g36gvb"; depends=[Rcpp RcppArmadillo]; };
-  gkmSVM = derive2 { name="gkmSVM"; version="0.65"; sha256="0k51mpcrddvxbvisn8aiwyh3iy1kwy7h0x1zl46wldy7s33d3576"; depends=[kernlab Rcpp ROCR seqinr]; };
-  glamlasso = derive2 { name="glamlasso"; version="1.0"; sha256="050xa2s60zm59p7ydxm3gkm2k6lhkdqkby212f5f1dd89q53gdxp"; depends=[Rcpp RcppArmadillo]; };
-  glarma = derive2 { name="glarma"; version="1.4-0"; sha256="1fwygp3baj4a5kfla0phaama81ry5s3i4vdx9hfj4y9m5wzg87dv"; depends=[MASS]; };
+  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]; };
+  gk = derive2 { name="gk"; version="0.4.0"; sha256="0nm7aam78mn0a7mvqk1cy7kw4aps7rbx26c85jlklknjyic99cav"; depends=[]; };
+  gkmSVM = derive2 { name="gkmSVM"; version="0.71.0"; sha256="1zpxgxmf2nd5j5wn00ps6kfxr8wxh7d1swr1rr4spq7sj5z5z0k0"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; };
+  glamlasso = derive2 { name="glamlasso"; version="2.0.1"; sha256="1x87nv29r309l539qccbcll4kn889sdds6gvrhyvw68rs370pn2l"; depends=[Rcpp RcppArmadillo]; };
+  glarma = derive2 { name="glarma"; version="1.5-0"; sha256="1afcccjayz6sj39mcg9h54d7dd1as8l63nxfw17bdh18zidr6ghi"; depends=[MASS]; };
   glasso = derive2 { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
   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.3.2"; sha256="15l6lg49rypasglc1y8mjp5a6s7blymbyclavhyjs0nkaq5flrb7"; depends=[e1071]; };
+  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.0"; sha256="0aa75xq2w64iknbyl6qw9ckk8v64a96xz0ar1mbqd8zhx0xvibyy"; 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.0"; sha256="0siwy8jx0r0135sm8gyf8g7w05r3zlq6bns5f2s348njk19da9mn"; depends=[ddR Matrix]; };
+  glm_predict = derive2 { name="glm.predict"; version="2.4-0"; sha256="10cpbl25csfs2ng7jj7hcfwl58akbx5dsdv1qlgbnvhf9rmlblww"; depends=[iterpc MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
+  glmBfp = derive2 { name="glmBfp"; version="0.0-48"; sha256="1r8mc55v717g4666f07hkc13v9vhj96n7xvn2r3crjndq3w5x3yn"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
+  glmbb = derive2 { name="glmbb"; version="0.2"; sha256="1ifiiixj2ip8mqdk3riaf1y60sv1asr0kmcmbjnhpwxd46k8kkpw"; depends=[digest]; };
   glmc = derive2 { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
   glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
   glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; };
   glmlep = derive2 { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
-  glmm = derive2 { name="glmm"; version="1.0.4"; sha256="0mcdy8aa5dlscrdahnd7jn9ip28jzipp4imv6cyk8fkkmiy60qhx"; depends=[Matrix mvtnorm trust]; };
-  glmmBUGS = derive2 { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[abind MASS]; };
-  glmmGS = derive2 { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
-  glmmLasso = derive2 { name="glmmLasso"; version="1.4.1"; sha256="162b3mmx6997hlx4fpd3wpvwq5axzx2fvywljsn05a10c6cfszvc"; depends=[Matrix minqa]; };
-  glmmML = derive2 { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; };
+  glmm = derive2 { name="glmm"; version="1.1.1"; sha256="0jswwrdc2k99kcqnbh1dg5j3z98l4x8v5kfdlxk5yxfi1ik6r3p5"; depends=[Matrix mvtnorm trust]; };
+  glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; };
+  glmmLasso = derive2 { name="glmmLasso"; version="1.4.4"; sha256="0f03zj1hbxp4cpn0ffwisf52gcfdyp7sbm49zxi7g7xpv7v87pja"; depends=[Matrix minqa]; };
+  glmmML = derive2 { name="glmmML"; version="1.0.1"; sha256="0lfxhx0mr0ph8fg28nnb37p2lndjayzhv07wksx9ic8gpi0cm6my"; depends=[]; };
+  glmmTMB = derive2 { name="glmmTMB"; version="0.1.1"; sha256="1ckij5jrqijwljqkj624q6li0bv8vxb3aglwbfi034zc0iwiba1b"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
   glmmsr = derive2 { name="glmmsr"; version="0.1.1"; sha256="07z4j7845hz3hcv438njnqf1yfp8prqby03h3s1ql1w8d342670i"; depends=[BH lme4 Matrix R6 Rcpp RcppEigen]; };
   glmnet = derive2 { name="glmnet"; version="2.0-5"; sha256="1cbpzmbv837fvq88rgn6mgzgr9f1wqp9fg8gh2kkmngvr1957a9c"; depends=[foreach Matrix]; };
   glmnetcr = derive2 { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
@@ -4527,62 +5649,80 @@ 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.6.1"; sha256="0bwkk574b44ndm1frv16rhv5c200q1f6402k97d19gwh6rihw2h1"; depends=[codetools]; };
+  globals = derive2 { name="globals"; version="0.8.0"; sha256="0882vpjsl9f5jld3bldgl6y1kdncl9gk3m6amigmpgcd9a6v7pm2"; 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]; };
-  glycanr = derive2 { name="glycanr"; version="0.2.0"; sha256="09v4xs1fxl9iiqcw66wz09ap3nbmr76f8mihjy06byrqxqjy07j9"; depends=[coin dplyr ggplot2 tidyr]; };
-  gmailr = derive2 { name="gmailr"; version="0.6.0"; sha256="1l0lnlq5vrxrab8d9b5hwm8krg8zgx8f8m0kfnryyyrqkjrksky5"; depends=[base64enc httr jsonlite magrittr mime]; };
-  gmapsdistance = derive2 { name="gmapsdistance"; version="1.0"; sha256="14hwwnzx5jd8r2v34066pa59ngvxbmzhni0nc9hg7i3p0gzbfw4b"; depends=[RCurl XML]; };
+  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]; };
+  gmapsdistance = derive2 { name="gmapsdistance"; version="3.1"; sha256="1hsijd1ahsppmxpnx690s27lry1w3c8r9jynhj0rsr4w6jmxikc2"; depends=[RCurl XML]; };
   gmatrix = derive2 { name="gmatrix"; version="0.3"; sha256="0ni5scx48m99jg9a5l93qvfkz6v5m7d5c0fwhp14mgiw32ff1s1r"; depends=[]; };
   gmeta = derive2 { name="gmeta"; version="2.2-6"; sha256="1zq5prig4mq6i8gkaynv8p786dbwh670bv0mapwmyns1r0yarzkm"; depends=[BiasedUrn binom]; };
   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-12"; sha256="10fpvcli526a8j6jaryn0mwk78c24xy7whdpcvqzzvb41l6nnkma"; depends=[]; };
+  gmp = derive2 { name="gmp"; version="0.5-13"; sha256="0gng529l8nkazrlypsmc50gd0sn8zgkw7xc2ymrwkykiv1lcwdv2"; 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"; sha256="00y1dx1c66gv769yiwnb91xbr77wpidf36x0n0dzaqfn7s9yh6xq"; depends=[]; };
-  gnumeric = derive2 { name="gnumeric"; version="0.7-4"; sha256="0q9qrwwkrwcdh5c1prh7d8j4raca59vgaxx7rjh36cml372vkrai"; depends=[XML]; };
+  gnmf = derive2 { name="gnmf"; version="0.7.1"; sha256="1vbcsxg61mlsdir8szd0rdxfswr7kr6a07750ar2l9b4rkg3yfqz"; depends=[]; };
+  gnumeric = derive2 { name="gnumeric"; version="0.7-6"; sha256="0d8igplypw40kshg9skij0cymc6j5hmbmqhbfpm0v2q3kw5r9d3p"; 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=[]; };
-  gofCopula = derive2 { name="gofCopula"; version="0.1-2"; sha256="09yczngqw6y9gx0fkwq5r80w44w8zng0mcxlman16mnlk6qcb0f7"; depends=[copula numDeriv SparseGrid VineCopula]; };
-  goft = derive2 { name="goft"; version="1.2"; sha256="1ic3dw287rkpnj7farsj44fy21q3a46krnvaq6clmqqlgwinwajv"; depends=[gPdtest mvShapiroTest]; };
-  goftest = derive2 { name="goftest"; version="1.0-3"; sha256="0rwz8y23dsklwvmd4sxq0bcklsa7l47lbs5lkcdn58jsdzm7bfrq"; depends=[]; };
+  gofCopula = derive2 { name="gofCopula"; version="0.2-3"; sha256="1xigbv9mc0c1j3qc0nay0fjwmqvw91cy3x1z6m56bgkgfli7gp2l"; depends=[copula doParallel foreach MASS numDeriv R_utils SparseGrid VineCopula]; };
+  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=[]; };
+  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]; };
-  googleAuthR = derive2 { name="googleAuthR"; version="0.2.0"; sha256="1wbysvm8lafyjwva68hjggphb1i4nzp2mr00ywj42zlk30n17skk"; depends=[httr jsonlite R6]; };
+  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.4.0"; sha256="00dm7ccfm2sk3qmgffs3dx809ihwfhw49f6fsgnllm19qyxf5hl0"; depends=[devtools formatR httr jsonlite miniUI R6 roxygen2 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]; };
-  googleVis = derive2 { name="googleVis"; version="0.5.10"; sha256="00lh8nx8qims9zrb664m7g4psw2p5qwmmkb7gxlizmp1fccwvlq5"; depends=[RJSONIO]; };
-  googleformr = derive2 { name="googleformr"; version="0.0.1"; sha256="17v82njhnzp8p3lbd17dyxcv7p5vs0ivwq30asgv1mzpm19jm074"; depends=[httr magrittr rvest xml2]; };
-  googlesheets = derive2 { name="googlesheets"; version="0.2.0"; sha256="07lyxjn2iqxwgngj3rfddq08d8ip8iyfs32kf7f4ncy4swk91lmp"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tidyr XML xml2]; };
-  goric = derive2 { name="goric"; version="0.0-8"; sha256="0ayac0yfkxrl13ckc2pwfqnmsrhmbg5bi6iwzx0fmh81vrlp0zrm"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
+  googleVis = derive2 { name="googleVis"; version="0.6.2"; sha256="1idnp9ndgg2dwybdpw7q3pkaw9kw2vy2xkls9qykrpz1p6nf3mn1"; depends=[jsonlite]; };
+  googleformr = derive2 { name="googleformr"; version="0.0.3"; sha256="0smykcjyqmk61ws5jk462l8x5hg0h9nwq55q5pqfgcq1j3yfniqh"; depends=[httr rvest xml2]; };
+  googlesheets = derive2 { name="googlesheets"; version="0.2.1"; sha256="0ps13h1cv7fj5dh8s4nvwi64wnnyqdsadcaa4iizq1c5s615cwk3"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tidyr xml2]; };
+  googleway = derive2 { name="googleway"; version="1.0.0"; sha256="01gzpb48iffir57cqw9hs2s4rxdllvdjf5hkmrf5zkjxhbzw7w14"; depends=[curl jsonlite Rcpp]; };
+  goric = derive2 { name="goric"; version="0.0-95"; sha256="05sbsnjjlpy1z0mfbsrihrp2gp4d66cvprhgzxy76lipgm5mmvqi"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
+  gower = derive2 { name="gower"; version="0.1.1"; sha256="04k1c9h27wknp5bvzxq6gzv3yccmfhs3whnaic1phz4f9vx5g6bz"; depends=[]; };
   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]; };
   gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; };
-  gplm = derive2 { name="gplm"; version="0.7-2"; sha256="0pr39fbkv61iwd110lq76p2fi4dvx9qz6mjsvg6bpja9pfbb6wc0"; depends=[AER]; };
-  gplots = derive2 { name="gplots"; version="2.17.0"; sha256="0dyysysl595khv00m4h68s7zx7xlfnpxzfkc49av1s3fc58bvmr5"; depends=[caTools gdata gtools KernSmooth]; };
+  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]; };
   gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; };
   gpr = derive2 { name="gpr"; version="1.1"; sha256="03ywik11kc6cnaqrzzzi94jkrdbd378m3sf26f2vpb7d834nl728"; depends=[]; };
   gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
-  gpuR = derive2 { name="gpuR"; version="1.1.0"; sha256="1a5x9yy5iyyrvrzbiwnzlcr9ykd3cn6y29n9c5zlky1q8ivagsxy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; };
-  gputools = derive2 { name="gputools"; version="1.0"; sha256="0zaib7f7mnx0pa7kxkza7m097d1zfn1ci8x9i8q4syfi06cs3s6n"; depends=[]; };
-  gquad = derive2 { name="gquad"; version="1.0-0"; sha256="0rfhcc7c0lfn4hqwcbly1kdpna9kr5ryvan279iydysv5iha96rr"; depends=[ape seqinr]; };
+  gpuR = derive2 { name="gpuR"; version="1.2.1"; sha256="1k9nxsz4grjl8lyf9108vj94g2gpi6h0pbf5l63y2h5rn0lmpw8s"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; };
+  gputools = derive2 { name="gputools"; version="1.1"; sha256="0np1lndvppdi409a1kfbbl0z5hr8wg2q473jch58zd16d2ickwkb"; depends=[]; };
+  gquad = derive2 { name="gquad"; version="2.0-0"; sha256="0d2mg21ix1a08lk43mz0r84q49yhgh7w9jyxa89lmx9ihzl42nhx"; 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=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
-  gramEvol = derive2 { name="gramEvol"; version="2.1-2"; sha256="18i97pj58scqpxhphn1cnb0n9a94ki0i6fgi1f99mrk17w2jwmi8"; 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]; };
-  graphTweets = derive2 { name="graphTweets"; version="0.3"; sha256="0kfj02pwg5jpq5barw7yr4ym3jhm6b2shk4a47yw7841rv93pdiz"; depends=[dplyr igraph reshape2]; };
-  graphicalVAR = derive2 { name="graphicalVAR"; version="0.1.3"; sha256="0awbcx8qb77r4qb90xinp49glwbkvyfb5f5y2qrjk8rr2jd62j0s"; depends=[glasso glmnet Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
-  graphicsQC = derive2 { name="graphicsQC"; version="1.0-7"; sha256="14xpczrxaxzm02figrnzgz4a7g4r4rd1j9mfh0lw6xnbj2wf0p13"; depends=[XML]; };
-  graphscan = derive2 { name="graphscan"; version="1.1"; sha256="1v56g1gzlls78mdad9wllyq7zywmjzamrcxw0pk655nwjbqfiyw5"; depends=[ape rgl snowfall sp]; };
+  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]; };
+  graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; };
+  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]; };
-  greport = derive2 { name="greport"; version="0.5-3"; sha256="0cd7rqzrk1yb22ksbmva1fl9k388bxxm586c20j8k8z5zympi9g1"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
+  grattan = derive2 { name="grattan"; version="1.3.0.3"; sha256="1k8ynf6wazjhsr0m3wy39s6833cd5j906awxkr2yhy5dfwy4jfhr"; 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=[]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
@@ -4590,74 +5730,93 @@ 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]; };
+  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]; };
   grofit = derive2 { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
   gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; };
   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]; };
-  growcurves = derive2 { name="growcurves"; version="0.2.4.0"; sha256="1ybhcw3kjsgpssilsg1kdg0az61s16mi1cbk4qgcvsb291f3m4i3"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; };
-  growfunctions = derive2 { name="growfunctions"; version="0.12"; sha256="08ip90k36hq2c6zp1ys27xb9n5d2aafw8carj6vjszb057khmnxh"; depends=[ggplot2 Matrix mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
-  growthcurver = derive2 { name="growthcurver"; version="0.2.0"; sha256="062azq7fix1cpbx779636zv404z75niz40grxfqsh02afabg5ki4"; depends=[caTools minpack_lm]; };
+  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]; };
+  growth = derive2 { name="growth"; version="1.1.0"; sha256="0d1hc56ybp5chckqv5q5jvpgbl7xn9dkbc4dd4sz5gawn1hngbxm"; depends=[rmutil]; };
+  growthcurver = derive2 { name="growthcurver"; version="0.2.1"; sha256="0q70g940ggpwnx2cpq2j8ambfbj9sqw6ivyp9cya1nbn05bah9ds"; depends=[caTools minpack_lm]; };
   growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
   growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; };
   growthrates = derive2 { name="growthrates"; version="0.6.5"; sha256="1bnp51hlcb2gpm7j9llbnxjgimbrdsshjxl19ka9w1ba423v2ja2"; depends=[deSolve FME lattice]; };
+  grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; };
   grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; };
   grppenalty = derive2 { name="grppenalty"; version="2.1-0"; sha256="12hbghmg96dwlscjy6nspgkmqqj4vwq2qcwcz1gp50a08qbmdcrk"; depends=[]; };
-  grpreg = derive2 { name="grpreg"; version="2.8-1"; sha256="0n6j4mx2f0khdqz7c7yhmsh6gcxha2ypknqa421qir1nvp0x57c9"; depends=[Matrix]; };
-  grpregOverlap = derive2 { name="grpregOverlap"; version="1.0-1"; sha256="09s3gp59z703zqhpnqzqhkd454b5rlq1cgdhcvql2ad4csxxs03x"; depends=[grpreg Matrix]; };
+  grpreg = derive2 { name="grpreg"; version="3.0-2"; sha256="1w6q7n1z585abs7kb2yq95dr6rycan0rkiial9q415s5rf71s48j"; depends=[Matrix]; };
+  grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; };
   grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; };
-  grr = derive2 { name="grr"; version="0.9.2"; sha256="07vw0m1ynjanx6520zx8nycmgxj53p3a5bdznaj9zjfqmy9qyjgm"; depends=[]; };
+  grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; };
   grt = derive2 { name="grt"; version="0.2"; sha256="0cqjk7yqk2ryx1pgvjd3x8l25hqv92p8rvdr7xw4jkzillllwmhz"; depends=[MASS misc3d rgl]; };
   gsDesign = derive2 { name="gsDesign"; version="3.0-1"; sha256="0cixg176ihbkwkcllabr2klc15cssdnfzwklf0q1wd23lmv6aj43"; depends=[ggplot2 plyr xtable]; };
-  gsEasy = derive2 { name="gsEasy"; version="1.0"; sha256="0fbcajnczgmf8gr080rmkg2wxfinjyv6wwznism4m4jlycq4cbjj"; depends=[ontologyIndex Rcpp]; };
+  gsEasy = derive2 { name="gsEasy"; version="1.1"; sha256="1g68v51wpgb0fq4nb3q4b9hv34f12dlcp6115css7748imz9p99q"; depends=[ontologyIndex Rcpp]; };
   gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
   gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
-  gsbDesign = derive2 { name="gsbDesign"; version="0.96-3"; sha256="03q2lxz6x4zpwnn15a7mda2qv0d5xrsz563y7103gnmdxnxqqsbc"; depends=[gsDesign lattice]; };
+  gsbDesign = derive2 { name="gsbDesign"; version="1.00"; sha256="1kbwlpxbr70aagx9jkap9xlw13r1k3y630b08wmmny421sv4zhxl"; depends=[gsDesign lattice]; };
   gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; };
   gsg = derive2 { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; };
-  gsheet = derive2 { name="gsheet"; version="0.2.1"; sha256="02fz7yvav3cl1cdjb6iqbgaiz25r6xnc92kz0b30qlkvv70995cs"; depends=[magrittr rvest stringr xml2]; };
+  gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; };
   gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; };
-  gsl = derive2 { name="gsl"; version="1.9-10.1"; sha256="0pbxzn5zkaskaqn308bj8s78v65fngmqkzxms3ji5x6azgcgfzvp"; depends=[]; };
+  gsl = derive2 { name="gsl"; version="1.9-10.3"; sha256="00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg"; depends=[]; };
   gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
-  gss = derive2 { name="gss"; version="2.1-5"; sha256="19bysbh6n04psv0mgvlhkpkc463f6zfiwbdsvd28fakbzcwwm8h2"; depends=[]; };
+  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-6"; sha256="1vkdhji8xpnq9j2ah3vnfvhyjnkgk406grws4q3gj4csbpkkzh86"; depends=[]; };
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
-  gstat = derive2 { name="gstat"; version="1.1-2"; sha256="1b7364g38s3w2h958cbvyk94cry1y0k32z5mr5r290yygr2nzqyn"; depends=[FNN lattice sp spacetime zoo]; };
+  gstat = derive2 { name="gstat"; version="1.1-4"; sha256="138v8accqwf95a3i980x57wd2j8vmdg1ga44rx9nbjcpyxc5x6mf"; 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=[]; };
   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]; };
+  gtheory = derive2 { name="gtheory"; version="0.1.2"; sha256="1xc1jl69z5csalqk3hx83s53awcl1fjq6p0x2pczhs7dsvwd6lks"; depends=[lme4]; };
   gtools = derive2 { name="gtools"; version="3.5.0"; sha256="1xknwk9xlsj027pg0nwiizigcrsc84hdrig0jn0cgcyxj8dabdl6"; depends=[]; };
   gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; };
-  gtrendsR = derive2 { name="gtrendsR"; version="1.3.3"; sha256="06z58av7fkmnvb0jmz8g5xffdnpm11iz3lvnvq4az7lq33r2vmah"; depends=[ggplot2 googleVis RCurl zoo]; };
+  gtrendsR = derive2 { name="gtrendsR"; version="1.3.5"; sha256="0jfriygsgi1pm8kvnnydf7ahqs9m6n4j093am076pc9sfxafjj13"; depends=[ggplot2 googleVis rvest zoo]; };
   gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
   guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; };
   gumbel = derive2 { name="gumbel"; version="1.10-1"; sha256="12rkri8bvgjn0ylf1i4k9vpb8mvbasidvx2479kmis2rc1p07qq7"; depends=[]; };
-  gunsales = derive2 { name="gunsales"; version="0.1.1"; sha256="112rir0jsfifp0hwhcnahfyz5fbz6nk8hz7mwz4xfj7jy04m0cbx"; depends=[data_table dplyr ggplot2 readr seasonal stringr x13binary zoo]; };
+  gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; };
+  gutenbergr = derive2 { name="gutenbergr"; version="0.1.2"; sha256="0agzc3ry8bm5fsn3pikr6hsmhdjrf8sln56c2wwl0vlm7p2gjca8"; depends=[dplyr lazyeval purrr readr rvest stringr urltools]; };
   gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; };
   gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; };
   gvlma = derive2 { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
+  gwdegree = derive2 { name="gwdegree"; version="0.1.1"; sha256="0p06hjp7vay83kbpqsgfr1d8z3ayv483rxbv86fdka94gvi1sjyc"; depends=[dplyr ergm ggplot2 gtools magrittr network scales shiny shinydashboard sna tidyr]; };
   gwerAM = derive2 { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
+  gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; };
   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.8.1.3"; sha256="1cp2h7n3na4cwysw8di7lig0gbldji2s7f1r7d8a8a11wikvz6zy"; depends=[jsonlite RCurl statmod]; };
-  h5 = derive2 { name="h5"; version="0.9.5"; sha256="1awp1pwfcdss3gd8jxps2ki4j0a2m8y5703jm1dfycgp5blkwqz4"; depends=[Rcpp]; };
+  h2o = derive2 { name="h2o"; version="3.10.3.6"; sha256="1jpliv63dpqmq635gxjar19z70ciyw76yxvcg505rgryk2nf3m1h"; 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]; };
   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.0"; sha256="1i76hjfiad0l8vpjslnglp1irdzs419ad7q6clnbs3gganbszipy"; depends=[]; };
-  hamlet = derive2 { name="hamlet"; version="0.9.4-2"; sha256="01zy6afiy7n28bbx5cwdy6hs82l1rakbwx2gn04kk6famqgmklwp"; depends=[]; };
+  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]; };
   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.6"; sha256="16ll5a8w85yjqy9as5hyg59sbhwmfcf9wcnjl7v7s3qf9zz86211"; depends=[rms]; };
+  haplo_stats = derive2 { name="haplo.stats"; version="1.7.7"; sha256="1rag22sqy8r87w5a1dww5cxknacm6975bpp74vw9zr04ldx4c64k"; depends=[rms]; };
+  haploR = derive2 { name="haploR"; version="1.4.2"; sha256="1fiv8ybarna79xyhsbpql4l462g7q9x1mg37m4dgpmzp7xvzwx21"; depends=[httr XML]; };
+  haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; };
+  haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; };
   haplotypes = derive2 { name="haplotypes"; version="1.0"; sha256="0pwihfi6g4jrnkha9s9rksq0fc8j04mlrwf0295rmy49y19rg84s"; depends=[network]; };
-  harvestr = derive2 { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hliayqrazq43sa9kd9ynpaid6x4ld3mz5y8mlq"; depends=[digest plyr]; };
+  harrietr = derive2 { name="harrietr"; version="0.2.2"; sha256="1h6i9ls33h0dgncq6i33ig04yq7i1wy1cl1xx2nvbp78ig02klng"; depends=[ape dplyr ggplot2 ggtree lazyeval magrittr tidyr]; };
+  harvestr = derive2 { name="harvestr"; version="0.7.1"; sha256="0xgxzbfbc33asfm8sl2y60ki6bwgd6vdh9nz466crkx7m9lsvll8"; depends=[digest foreach plyr]; };
   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]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
-  hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5ijqakxx4vwvwpz7y76jbgcgm76vfg4cnxvndf7sf4l"; depends=[Rgraphviz]; };
-  haven = derive2 { name="haven"; version="0.2.0"; sha256="1ww55ciibq62bix3pdwabpycxv1dh01zsrf0vb6jxxh1idxbm5hg"; depends=[BH Rcpp]; };
+  hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.2"; sha256="0rh5kl9ivv9ckv5j5fqwdcflbfzkjicmqrddgxnzbv1iwyph4c0w"; depends=[graph Rgraphviz]; };
+  haven = derive2 { name="haven"; version="1.0.0"; sha256="15ynk1qm4g9m6ng4lc1x3hwjb2xak6b795ifh5q1k4mmx07xz6dl"; depends=[BH hms Rcpp readr tibble]; };
   hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
   hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
   hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
@@ -4668,79 +5827,97 @@ in with self; {
   hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; };
   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.56"; sha256="0s9iijwq8zfvavqq2bkqm2884sg0957ppkggsv6mmm3cbdi2xrlc"; depends=[MASS multtest]; };
-  hddtools = derive2 { name="hddtools"; version="0.2.4"; sha256="001cm07jvbxzsp64mkjymnsncyrd6r1nxwhjqkk2mb5ldz0541ir"; depends=[raster RCurl rgdal sp XML zoo]; };
+  hddplot = derive2 { name="hddplot"; version="0.57-2"; sha256="1mckgd99wvxbqvpyx231r97kysppnn1xggy8jvnc31sxq8m9gfr7"; depends=[MASS multtest]; };
+  hddtools = derive2 { name="hddtools"; version="0.5"; sha256="1cihc3kn8nvcj0z314b7md02xb108xkrnz1j4svr6hcxwxvv97c5"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr 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.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3rkkb0zn03kh3d7h8250wg9fax"; depends=[foreach glmnet iterators MASS]; };
-  hdm = derive2 { name="hdm"; version="0.1.0"; sha256="10iy6k9gkqm1lx0clin3a5fb1sjxbgrcfx1y6mzkr7kms1a3amdp"; depends=[checkmate ggplot2 glmnet MASS]; };
-  hdnom = derive2 { name="hdnom"; version="3.0"; sha256="1cp5104ck7cb4gsqfqnafza87rfd8zylwns2yz0cv4z1mw1z7p7j"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
+  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]; };
+  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]; };
+  hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; };
+  healthcareai = derive2 { name="healthcareai"; version="0.1.11"; sha256="05vh4ny7nb3fzfvs46hff4d2ay6q44bzgwx3s81dvdvkha2bmq4q"; depends=[caret data_table doParallel e1071 grpreg lme4 lubridate pROC R6 ranger ROCR RODBC]; };
   heatex = derive2 { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
   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.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; };
-  heavy = derive2 { name="heavy"; version="0.3"; sha256="0vghk0f1h7qvjs2k41vwh0zq54njdh99gz8cpsbp8pk17xsmv3lv"; depends=[]; };
-  heemod = derive2 { name="heemod"; version="0.3.0"; sha256="1m90b3mgjfxfnicjxwszhg3zl496sq12wzldarj2ah8pjhkx7xlz"; depends=[diagram dplyr DT ggplot2 lazyeval logitnorm memoise mvnfast rgho tidyr]; };
+  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]; };
   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.27"; sha256="1vhzlxjkk2hgzjlin9ksvjk3bi2ly5nm4361777m49lb84ncs7dr"; depends=[maptools RCurl rjson sp]; };
-  heplots = derive2 { name="heplots"; version="1.0-16"; sha256="00aj3x864zlzyj52yya7wajjnpwmpgicqvgyx71gnxdkqmv64x40"; depends=[car MASS]; };
-  hergm = derive2 { name="hergm"; version="2.2-2"; sha256="0jshhf57kybrayk94vv7p1sjvhlfcdya6jllaj9kgn46kkvci54p"; depends=[ergm latentnet network sna]; };
-  heritability = derive2 { name="heritability"; version="1.1"; sha256="05vcprf3rk65197njnhw7n5l19hvy7hfp4fdigkwzvch4rnicidf"; depends=[MASS]; };
+  helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; };
+  heplots = derive2 { name="heplots"; version="1.3-3"; sha256="0j644a0r4ycfg57p9ymlb3jb9bd797vwlw1ps24injsz71wbhnh0"; depends=[car MASS]; };
+  hergm = derive2 { name="hergm"; version="3.1-0"; sha256="17mxn2ff7yzj95vjsppvz7c9a5g6a2z9zyf34xvvxp9031zhrf46"; depends=[ergm latentnet mcgibbsit network sna]; };
+  heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; };
   hermite = derive2 { name="hermite"; version="1.1.1"; sha256="0ns8l1rf346qxalfdwc7ny0kjp212f6qnnlgillpyvd8k29kg8iy"; depends=[maxLik]; };
   het_test = derive2 { name="het.test"; version="0.1"; sha256="08kxp81dx32anh0k5b65x7w7madwnn9hiabdrk6ck6b6mx37x26v"; depends=[vars]; };
+  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]; };
   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]; };
   hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; };
   hgam = derive2 { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1x935zbp305y0gdmkc8vpkiwpcf"; depends=[grplasso lattice rgl]; };
   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.11"; sha256="1p6391bcvsgf2mvkdrwc3fj3h6hkzshqmzb6f31kmpiihjwv3392"; depends=[deSolve]; };
-  hht = derive2 { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4apxdic971nd68cn3pql6fssdn"; depends=[EMD fields spatstat]; };
+  hgm = derive2 { name="hgm"; version="1.16"; sha256="1jgci5fg5fk867qvjgdlqr20spymjqxrypyp58jkfkjjrx1jpjsa"; 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=[]; };
   hier_part = derive2 { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; };
   hierDiversity = derive2 { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; };
   hierNet = derive2 { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
   hierarchicalDS = derive2 { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; };
+  hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; };
   hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; };
+  hierformR = derive2 { name="hierformR"; version="0.1.0"; sha256="0ym6i5ajp55mmk085slmma3g5xqgdk0d0gba28fdg3csxsxl9w1r"; depends=[igraph]; };
   hierfstat = derive2 { name="hierfstat"; version="0.04-22"; sha256="1fav2v2996v5kb1ffa6v5wxfm921syxg6as034vd3j4jfhdibyfx"; depends=[ade4 adegenet gtools]; };
   hiertest = derive2 { name="hiertest"; version="1.1"; sha256="17maf1w4vkqknxff3f00fzv136j3dbbigyzl4vq4sln9j27w10r3"; depends=[]; };
   highD2pop = derive2 { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
+  highSCREEN = derive2 { name="highSCREEN"; version="0.1"; sha256="0g2pcxdg5fix63jqpddqnldalg95x7ghvmbfr1ijjwi9m3ki2bby"; depends=[gplots]; };
   highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
-  highcharter = derive2 { name="highcharter"; version="0.2.0"; sha256="114ds4lxqgxcv1lhbk01brk9mzs7jc6c0lmcr9pl1kwff5qj9zgz"; depends=[assertthat dplyr htmlwidgets magrittr purrr quantmod rlist stringr tidyr viridisLite xts zoo]; };
-  highfrequency = derive2 { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; };
+  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=[]; };
-  highmean = derive2 { name="highmean"; version="2.0"; sha256="126kh0bql0yjakacm0wxxjrfz0x8x9hlyb9j0mrjb4dnggji21j3"; depends=[MASS mnormt mvtnorm]; };
-  highr = derive2 { name="highr"; version="0.5.1"; sha256="11hyawzhaw3ph5y5xphi7alx6df1d0i6wh0a2n5m4sxxhdrzswnb"; 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=[]; };
   highriskzone = derive2 { name="highriskzone"; version="1.3-1"; sha256="1jw2kf9i81h1chgbdhzw1hh3aq2hfiay58jkyzn4rdwmw21jkgs5"; depends=[deldir fields ks Matrix rgeos spatstat]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   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.5"; sha256="14vyzc3dg5bdq17762kl1dqlh20ldnzv27ml0i9s5hrgk5235v44"; depends=[ape data_table deSolve GenSA phytools subplex]; };
-  histmdl = derive2 { name="histmdl"; version="0.5-1"; sha256="085m6g7ykg3n89pwvagdjhpgcxy68wdq7jmmc2aja1qigq9kjhri"; depends=[]; };
-  histogram = derive2 { name="histogram"; version="0.0-23"; sha256="0hrhk423wdybqbvgsjn7dxgb95bkvmbh573q1696634hvzfdm68c"; depends=[]; };
+  hisse = derive2 { name="hisse"; version="1.8.1"; sha256="0vdl61ylnv4f77hrpv68xf2ssjczynpmyla4pgsxhyp1r65l6in8"; 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=[]; };
-  hit = derive2 { name="hit"; version="0.2-1"; sha256="17dry6ha261z9a2v6iwfsij8wgivhfg991pfkjwv6ysjfiwy8wds"; depends=[glmnet Rcpp speedglm]; };
-  hitandrun = derive2 { name="hitandrun"; version="0.5-2"; sha256="0451rdnp3b4fcdv4wwdxv3wplkxqmidxh4v5n1jjxinnzvl5dv9a"; depends=[rcdd]; };
+  hit = derive2 { name="hit"; version="0.4.0"; sha256="1vyla7jlg61rlrmqjb1wya404xj90xys175h12qy30paxsl5icqz"; depends=[glmnet Rcpp speedglm]; };
+  hitandrun = derive2 { name="hitandrun"; version="0.5-3"; sha256="0cmn8rzgksnygqwa5pngbdc6pds3kxx4y7mq3mg3xk1vys9b6r4n"; depends=[rcdd]; };
   hive = derive2 { name="hive"; version="0.2-0"; sha256="0ywakjphy67c4hwbh6prs4pgq5ifd8x8inxjkigjiqz6jx3z852v"; depends=[rJava XML]; };
+  hkclustering = derive2 { name="hkclustering"; version="1.0"; sha256="1xzzrvm847n1k2q2sg5dir5wgnix76arq4my211y8l0n1d5b2q38"; depends=[cluster]; };
+  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=[]; };
-  hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-3"; sha256="1r9xxgsqh5pw9incldaxnsqhyanhd4jwm6w0ix1k43i53dw4diyr"; depends=[]; };
+  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]; };
-  hnp = derive2 { name="hnp"; version="1.2"; sha256="1qpvdhyp62mrr5cldpnh0qlfjfkilpzqdzqq9r9rjnm4q7241r7q"; depends=[MASS]; };
+  hms = derive2 { name="hms"; version="0.3"; sha256="127znf522r5mn3k6frhdd7pqh063bs3l85gn9h7cx50hpjf2as4k"; depends=[]; };
+  hnp = derive2 { name="hnp"; version="1.2-2"; sha256="0wcr472a6iq3zwzddqpjv649rx9c5ssrlj0qhbv4pn4sjfjv0pfx"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; };
-  hoardeR = derive2 { name="hoardeR"; version="0.1"; sha256="1a3kf676mchrla9g0b619dx09ihxvlmahgwlbwqny6zwr49w7vzl"; depends=[httr MASS R_utils stringr XML]; };
+  hoardeR = derive2 { name="hoardeR"; version="0.9.2"; sha256="0sss3ki2w0aqyp084pprycw8d8vgm60z41iq6g9nxhqhr9xy5kdw"; depends=[bamsignals Biostrings data_table GenomicRanges GenomicTools httr IRanges MASS R_utils RCurl Rsamtools seqinr stringr XML]; };
   holdem = derive2 { name="holdem"; version="1.1"; sha256="07h4cbg7hx91hc6ypi6hbalzdd9qz9rfhjgk5sq1srnangwwnxlw"; depends=[]; };
   homals = derive2 { name="homals"; version="1.0-6"; sha256="1xfpb6mxfk18ad2fggljr2g01gy4c290axc3vgwngmmimmcvh4cy"; depends=[ape rgl scatterplot3d]; };
-  homeR = derive2 { name="homeR"; version="0.1"; sha256="0yq93b3wkgbnwzpyhx9c73sb9xgz7m3z4p5rflk3lmc0p53h81g5"; depends=[]; };
+  homeR = derive2 { name="homeR"; version="0.3.0"; sha256="0gi383392rs7snb2l9760vkws5hqfikyaj3i7cyby9g1sc2s6yx8"; depends=[]; };
   homomorpheR = derive2 { name="homomorpheR"; version="0.1-1"; sha256="0bisbaglv6l8nzcvl9arly9ns2hwyjj6bwplaf6ynyac7fgmmd6j"; depends=[gmp R6 sodium]; };
   homtest = derive2 { name="homtest"; version="1.0-5"; sha256="1lnqlg3dwq174ic6dbjllysw5fjy5kvvgbl6gvabjmcs66z27fp0"; depends=[]; };
-  hopbyhop = derive2 { name="hopbyhop"; version="1.0"; sha256="1nr4g9nz9lkkxi4glyi1ka0k4pz9vapv0k10k1ngqm0cqy64xsgn"; depends=[]; };
+  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=[]; };
+  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=[]; };
   hotspots = derive2 { name="hotspots"; version="1.0.2"; sha256="1cwcwin86y7afjhs8jwlz1m63hh70dcjag0msds4ngksvjh9gj2q"; depends=[ineq lattice]; };
@@ -4749,64 +5926,79 @@ in with self; {
   hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; };
   hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; };
   hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
-  hqreg = derive2 { name="hqreg"; version="1.2"; sha256="1rcna9brzyzxhg50f5g1pjhyd9c8s2pvzajzavh9f81lyfjfzpyd"; depends=[]; };
+  hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; };
   hrr = derive2 { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
-  hsdar = derive2 { name="hsdar"; version="0.4.1"; sha256="10x8488alik3yy09v0slr9lrgymxwnd9w9q7zyxx7ir1p0ijgjgr"; depends=[caret raster rgdal rootSolve signal]; };
+  hsdar = derive2 { name="hsdar"; version="0.5.1"; sha256="0n5d05f7bh9zsjipfzf07yx71ccqdkarmmm4a1ryah7sjlg0zpil"; depends=[caret raster rgdal rootSolve signal]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
+  hsm = derive2 { name="hsm"; version="0.1"; sha256="1dacsq2f23bz94rh4s3477hs38pbrpz2lis4s1l9im894bcbny1x"; depends=[]; };
   hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
   hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
-  htmlTable = derive2 { name="htmlTable"; version="1.5"; sha256="1pjmxh3w0iarfzm9krhdqc1931mvcfq4262rmdmpfmq0r1is7qgi"; depends=[knitr magrittr stringr]; };
-  htmltab = derive2 { name="htmltab"; version="0.6.0"; sha256="00171fsdgv3rks6j4i5w8rbk2kar2rbmqqpqrr2xdxkjqxsf6k4b"; depends=[httr XML]; };
+  htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; };
+  htmlTable = derive2 { name="htmlTable"; version="1.9"; sha256="0ciic1f4iczq14j81fg7kxibn65sy8z1zxkvk1yxnxxg6dzplj2v"; depends=[checkmate htmlwidgets knitr magrittr stringr]; };
+  htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; };
+  htmltidy = derive2 { name="htmltidy"; version="0.3.1"; sha256="004a2wwsnx3mnm6v1mjlaq08gcgm60xahh520vfyrsp56b7j29ky"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.3.5"; sha256="0j9bf80grd6gwh7116m575pycv87c0wcwkxsz3gzzfs4aw3pxyr9"; depends=[digest Rcpp]; };
-  htmlwidgets = derive2 { name="htmlwidgets"; version="0.6"; sha256="1sljs7zajzj1lsrrvqv7anpma4plzs79mqwmw7b2c5d7mn9py8lw"; depends=[htmltools jsonlite yaml]; };
-  hts = derive2 { name="hts"; version="4.5"; sha256="1bjribmfczkx139z73b0cl3lzlw5n2byyyc5inqv9qgayz0dc6cp"; depends=[forecast Matrix Rcpp RcppEigen SparseM]; };
+  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]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
-  httpcache = derive2 { name="httpcache"; version="0.1.2"; sha256="1xphdicgw3zli6naprvn09vh8a0jpsg3nhlwhpwji00p222rnjc4"; depends=[digest httr]; };
-  httpcode = derive2 { name="httpcode"; version="0.1.0"; sha256="08x3jnvra833kp625bys04b5np9rrlhqf5gp127df80c289vabwx"; 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]; };
   httpuv = derive2 { name="httpuv"; version="1.3.3"; sha256="0aibs0hf38n8f6xxx4g2i2lzd6l5h92m5pscx2z834sdvhnladxv"; depends=[Rcpp]; };
-  httr = derive2 { name="httr"; version="1.1.0"; sha256="08sq34pknsfcy8lm06nydi12mbaxpqpgb025ahr33v9d3g0wvh6p"; depends=[curl jsonlite mime openssl R6]; };
+  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]; };
   humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
-  humaniformat = derive2 { name="humaniformat"; version="0.5.0"; sha256="18094zlvhd44vg2rg4731f84imrjp69gzay3gnm5yp1scbiqbd82"; depends=[Rcpp]; };
-  humarray = derive2 { name="humarray"; version="1.0.0"; sha256="1zza4q8cwcvpy1fgw89zchq7hccdy56phyab2f8x8vsph0gr7kc9"; depends=[BiocGenerics BiocInstaller biomaRt GenomeInfoDb GenomicFeatures GenomicRanges genoset IRanges NCmisc Rcpp reader rtracklayer S4Vectors]; };
-  hunspell = derive2 { name="hunspell"; version="1.2"; sha256="0yibb9ic9kkl2h0vwwim0qanhsm0c6xck48i3r158agrqzc49s5x"; depends=[Rcpp]; };
+  humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; };
+  humarray = derive2 { name="humarray"; version="1.1"; sha256="1rzx53620nkicnkc41p6pzsiny8kfpw6n3y0mwvckz6ba6iyfl4w"; depends=[BiocGenerics BiocInstaller biomaRt GenomeInfoDb GenomicFeatures GenomicRanges genoset IRanges NCmisc Rcpp reader rtracklayer S4Vectors]; };
+  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]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
   hwriterPlus = derive2 { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
   hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
   hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
+  hybridModels = derive2 { name="hybridModels"; version="0.2.9"; sha256="1y8793wqd22w042pgz8fnd83pl2jcr6afr6ss600qhphm5h6cig5"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; };
   hydroApps = derive2 { name="hydroApps"; version="0.1-1"; sha256="1ycv7l2ywwnx2mgklg6rry7n24jyhi4spvp1xl345yvyn9kf15dz"; depends=[nsRFA]; };
   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.2-3"; sha256="1kvzpdjrzbxy4rbfhjqmxdipaamd2rjdyxjv6vfxv1ixs1bm8cwm"; depends=[]; };
-  hydrostats = derive2 { name="hydrostats"; version="0.2.4"; sha256="16h9gchfrppn5n77bld8b5lhwk45dncfwxxibrmb6m6iclqiadgy"; depends=[]; };
+  hydrogeo = derive2 { name="hydrogeo"; version="0.5-1"; sha256="05766n82r6cvk4gnpnfrq28248awzm3y06dnybaymydjh6n1dn73"; 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]; };
-  hyperSpec = derive2 { name="hyperSpec"; version="0.98-20150304"; sha256="0fjww2h6vlm53dsnaxb3i11cmary1w8l0jr9c5dy16y7n9cc3hqb"; depends=[ggplot2 lattice latticeExtra mvtnorm svUnit]; };
+  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]; };
-  hypergea = derive2 { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jrg29mn573njzi1rwna0ch9sj8sdy8w26r6w"; depends=[]; };
-  hypergeo = derive2 { name="hypergeo"; version="1.2-11"; sha256="0kg7yimgrrcqdzxackslf2zxpdrl3xx3a88irkxlwhf36znwfrdj"; depends=[contfrac deSolve elliptic]; };
+  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]; };
   hyphenatr = derive2 { name="hyphenatr"; version="0.3.0"; sha256="0mv77njy0ha7bj3kw620fk9r8cdzqd0v3ipikihqxq47fr57ml0v"; depends=[Rcpp stringi]; };
+  hypoparsr = derive2 { name="hypoparsr"; version="0.1.0"; sha256="1bldiz5j6h9z499wwz8cbg5vshdmxgcd8qfxkz1a45q8b6nsd4vf"; depends=[data_tree readr RecordLinkage tibble]; };
   hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
+  hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; };
   hysteresis = derive2 { name="hysteresis"; version="2.5"; sha256="1b1dd2367pjbg4jnn65l2jcj38ljz7adpdg8f5b9rj1rw7qgikfl"; depends=[car MASS msm]; };
   hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; };
   iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; };
+  iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; };
   iBUGS = derive2 { name="iBUGS"; version="0.1.4"; sha256="0vsxy8pnbix0rg7ksgywx7kypqb5ngkxhldh3cisjkvdv638ybps"; depends=[gWidgetsRGtk2 R2WinBUGS]; };
   iC10 = derive2 { name="iC10"; version="1.1.3"; sha256="19dlrwj47zmdgmvzjfs5qa9fqq8g9ywhgy5mqbp99n7d9hg4ybxh"; depends=[iC10TrainingData pamr]; };
   iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
   iClick = derive2 { name="iClick"; version="1.2"; sha256="04d82wbddvj73cw6ys492nasvxcj8m5594zf9r41y72i5yha11pa"; depends=[fBasics forecast lattice lubridate openair rugarch timeDate timeSeries]; };
   iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; };
+  iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; };
   iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; };
   iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; };
-  iGasso = derive2 { name="iGasso"; version="1.3"; sha256="17j29jj767wy5zhgbnznlj0jb4azzrl0qdijc11bpwb7apkmyvz8"; depends=[CompQuadForm lattice]; };
-  iLaplace = derive2 { name="iLaplace"; version="1.0.0"; sha256="1fwsfx3y44k8xsp1l1n51vqa767ahvk462plgkljdcq4nxa0idvc"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
-  iRafNet = derive2 { name="iRafNet"; version="0.1-1"; sha256="1lcrsii4cmbih67wwvndnbbm023n001qy1phg6k76zsm9sizd7a1"; depends=[]; };
+  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]; };
+  iNEXT = derive2 { name="iNEXT"; version="2.0.12"; sha256="1041r5k0k3kzik5vwyd62s4yc85lnnxbg5gbbl0kl629kikymb6y"; depends=[ggplot2 reshape2]; };
+  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"; sha256="1fn25xnrvgx2ayhss136rxn1h3c9pvq2gmb5kbp92vsf07klvh6v"; depends=[mgcv]; };
+  iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; };
   iRepro = derive2 { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
   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]; };
@@ -4814,36 +6006,49 @@ in with self; {
   ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; };
   ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; };
   ibelief = derive2 { name="ibelief"; version="1.2"; sha256="1zh6bpg0gaybslr1p05qd5p2y5kxbgyhgha4j4v5d69d78jwgah9"; depends=[]; };
-  ibmdbR = derive2 { name="ibmdbR"; version="1.47.1"; sha256="0xxhx0dbz9y4lhnwb0ic14dny0md59izicn12nbsv8040v56kwky"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
+  ibm = derive2 { name="ibm"; version="0.1.0"; sha256="0g6wg2qpa4q142xw2vq5pca4ll6pb8hyll5g0c93kk8crddk51s7"; depends=[Rcpp]; };
+  ibmcraftr = derive2 { name="ibmcraftr"; version="1.0.0"; sha256="0zm5j0a1wjj5agibp38h73qxpq0njvrhfq3077xhhfizcb3v24sb"; depends=[Rcpp]; };
+  ibmdbR = derive2 { name="ibmdbR"; version="1.48.0"; sha256="0kz08p61v12kgv1k1zrgh8mimhvnffy2fgck21gxbsa03sdi144i"; depends=[arules ggplot2 MASS Matrix RODBC rpart rpart_plot]; };
   ibr = derive2 { name="ibr"; version="2.0-2"; sha256="1v4jn1izdc0cvm0yhr0anz2zjz66i25rg9039327kw8yrx8a34wx"; depends=[mgcv]; };
   ic_infer = derive2 { name="ic.infer"; version="1.1-5"; sha256="0nmx7ijczzvrv1j4321g5g5nawzll8srf302grc39npvv1q17jyz"; depends=[boot kappalab mvtnorm quadprog]; };
   ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
   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.4"; sha256="17yag996m8gn4vfr6a8gcsrancdhjla5bm7fi23p1ln8i4hdz5v5"; depends=[Rcpp RcppArmadillo]; };
+  icamix = derive2 { name="icamix"; version="1.0.5"; sha256="1r6rrjha8c1cy7qf682yzkw7i1qxzrcvs8g20vb77mzhzjq6d073"; depends=[Rcpp RcppArmadillo]; };
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
-  icarus = derive2 { name="icarus"; version="0.2.0"; sha256="1qj0g4inl76128rjhn6g4w499y1yy75yvq31c408jz6akv8p2921"; depends=[]; };
+  icarus = derive2 { name="icarus"; version="0.2.2"; sha256="1bs04j0xdf6b0mvczi8v3jyjdf2g99vfqr9by83a7gl9vpsar4kn"; depends=[]; };
   iccbeta = derive2 { name="iccbeta"; version="1.0"; sha256="0zsf2b5nrv39pssi5walf82892fr8p1f802c96hjjknh78q7gh0h"; depends=[lme4 Rcpp RcppArmadillo]; };
-  icd9 = derive2 { name="icd9"; version="1.3"; sha256="1k34s7zys2c6v6i7843yh8i5bh3j7axdv9xdlampdfx5pn5g29as"; depends=[checkmate fastmatch Rcpp]; };
-  icenReg = derive2 { name="icenReg"; version="1.3.4"; sha256="0s3amjz8vz4y256wj85dg01vxhsyy1njgrsrw3l35z7ka9hxmcdf"; depends=[foreach MLEcens RcppEigen survival]; };
+  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]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
+  icesAdvice = derive2 { name="icesAdvice"; version="1.2-0"; sha256="0z3b31qj0wggd2yayvgivrpg9435bi8pmsp11rg2vwz4vfsqvlkb"; depends=[]; };
+  icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; };
+  icesSAG = derive2 { name="icesSAG"; version="1.2-0"; sha256="05fj1sx9fbpyhmng7llmayc2m0gvfyak6ispjkwrx55hms17i5p9"; depends=[png]; };
+  icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
+  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=[]; };
-  idbr = derive2 { name="idbr"; version="0.1.2"; sha256="1j9qjh5121aaasqd05qi0gw3cglfq355cq8wg23k3m3jcfm7ihh9"; depends=[dplyr httr jsonlite]; };
-  idendr0 = derive2 { name="idendr0"; version="1.5.2"; sha256="18fblymbdl1i0sxfv911ls090hkhmwlk0q1dx4fhi54h16qqzjhf"; depends=[tkrplot]; };
-  identifyr = derive2 { name="identifyr"; version="0.1"; sha256="011i6s7w7ss6vlyhwdj67hw4pwyvnn3vga89d3ykd3j3h1k615zp"; depends=[magrittr stringr]; };
+  idbr = derive2 { name="idbr"; version="0.2"; sha256="1hhwn93arkzqs5ns9ll7rwqq5gyngixbicly9asw0dgjn12n5p7x"; depends=[countrycode dplyr httr jsonlite]; };
+  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.3.1"; sha256="1mysvkdkzwdggb081zbjb9bm8jxdygd4q3w50js1x26pr69kvzni"; depends=[animation ca corpcor dummies ggplot2]; };
+  idm = derive2 { name="idm"; version="1.7.1"; sha256="1pn8iyfwcpp3zj51jjf0dvfc0rbh8f5smnbswxf186fqs9fkjpmy"; 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.5.0"; sha256="1xy6nyk5bw9lx9bhfk5l2k3lp9b46anzamfbvhd3cgv94xh03vv2"; depends=[data_table pracma zoo]; };
-  iemiscdata = derive2 { name="iemiscdata"; version="0.5.0"; sha256="0xvv5yva2swmr7nziik838wznk30j2j032s6m71xrvdbngr4cpnd"; 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.8"; sha256="1nmim5dw42wkzjw85g5raz899xa2whlyvz36jcpli69cx0zq3kqq"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; };
+  ifaTools = derive2 { name="ifaTools"; version="0.13"; sha256="1mffvlzm4flz7n26vllm28s1iib66gbqq7nl4yfwbdljrpp4ph23"; 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-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[MASS splus2R]; };
+  ifultools = derive2 { name="ifultools"; version="2.0-4"; sha256="0pv2msaa1rmj8csxdclzi2jwg9pfdvh87blj9j3xa3myisglq092"; depends=[MASS splus2R]; };
   ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; };
   igraph = derive2 { name="igraph"; version="1.0.1"; sha256="00jnm8v3kvxpxav5klld2z2nnkcpj4sdwv4ksipddy5mp04ysr6w"; depends=[irlba magrittr Matrix NMF]; };
   igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; };
@@ -4851,175 +6056,225 @@ in with self; {
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
   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 survival]; };
+  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]; };
-  imager = derive2 { name="imager"; version="0.15"; sha256="0np23g1p097iv9qwbbrk69v2v025f91b30jaqh3621csv7hll095"; depends=[jpeg magrittr plyr png Rcpp stringr]; };
-  imguR = derive2 { name="imguR"; version="1.0.1"; sha256="1pabgp1s3gkirxh5a95lmnrzgfdh04s9r63y9v9x43hmqg77jkw3"; depends=[httr jpeg png]; };
-  immer = derive2 { name="immer"; version="0.4-0"; sha256="0g757149rmq5v1hwmd2q5fafz09dz5mcg29v5cx4n3p719xzpp8w"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; };
-  import = derive2 { name="import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
+  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]; };
+  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]; };
+  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]; };
   imputeMDR = derive2 { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
-  imputeMissings = derive2 { name="imputeMissings"; version="0.0.1"; sha256="1xcgv725xs1vqg5b6psbmsgh7xikb8iasd9n7f8dxrlq3d1p5khv"; depends=[randomForest]; };
-  imputeTS = derive2 { name="imputeTS"; version="0.4"; sha256="0prd7wcbikyzzfphqmrhxwgrpvpd129m3hvr217xmclr4gqrknsb"; depends=[stinepack]; };
+  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]; };
+  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-2"; sha256="10ngxv4zsh78gm3xwb22m681nhl2qbnzi4fkqwgjj2iz46ychzvy"; depends=[extRemes]; };
+  in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; };
   inTrees = derive2 { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
   inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
-  inbreedR = derive2 { name="inbreedR"; version="0.3.1"; sha256="1a5iz5hkwa32nrc205ybjzm6nijr6b38ipyvcivsdz4maz3rlmhf"; depends=[data_table]; };
-  indicspecies = derive2 { name="indicspecies"; version="1.7.5"; sha256="16m4pnfnmaskin4aaalm2cmv3vwzg94045max8nhkgw02kpskz1r"; depends=[permute]; };
+  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]; };
+  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]; };
   ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
   inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
   inferference = derive2 { name="inferference"; version="0.4.62"; sha256="12iag6l2digxb056qc765xi27ayc4qyqdqzbhxscr8a5lxfkdn4p"; depends=[Formula lme4 numDeriv]; };
-  inflection = derive2 { name="inflection"; version="1.1"; sha256="1nb1pf07c371vwgplfyjs3q1iqgb5hyk9czxqrjiy18g8p7zdln2"; depends=[]; };
-  influence_ME = derive2 { name="influence.ME"; version="0.9-6"; sha256="1pfp26dmqs6abb2djf9yn5jk4249vi8ldahpc2xrr0mr3l17g06g"; depends=[lattice lme4 Matrix]; };
-  influence_SEM = derive2 { name="influence.SEM"; version="1.5"; sha256="0h920pxa3sk6y7ipkihxm78i06alm5rmlmn5pr937j7abgypkk3p"; depends=[lavaan]; };
+  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]; };
   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]; };
   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=[]; };
-  infuser = derive2 { name="infuser"; version="0.2.2"; sha256="0hpy8s0090d7khkqlb733fa55n2g41fcx19dsjpazlk1j7bqrvxk"; 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=[]; };
   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=[]; };
-  inpdfr = derive2 { name="inpdfr"; version="0.1.2"; sha256="0bsfyfpxps59nfyx21lh9n15gc1szikjmlqq5mvwnvwd61fly058"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.2.4"; sha256="1j2wxzm45zzykm29swvqj6hdscgxq6094s4wwj6rr7nwpp9v3qni"; depends=[dplyr igraph knitr raster rgdal rgeos sp]; };
+  inpdfr = derive2 { name="inpdfr"; version="0.1.3"; sha256="1qdnh4bcwhg587y4s1r27vqmx3i4fsg8gvnrl4gx1nk7r2fhsqxc"; 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=[]; };
-  instaR = derive2 { name="instaR"; version="0.2.2"; sha256="13p6j24c8yw3rqjac2q1s6s765bg8022wkhlbqh543lf7zx92rm0"; depends=[httr rjson]; };
-  install_load = derive2 { name="install.load"; version="1.0.4"; sha256="18il5134halv8j5p6hks04i97aam3gcwgbss5yj1hmpf71dhqr4p"; depends=[]; };
+  inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; };
+  instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; };
+  install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; };
   insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; };
   intReg = derive2 { name="intReg"; version="0.2-8"; sha256="0cqf6lbn8aiyj5j7gg1qz80i477bfxbmxp7fjs25ish4bcdsbjja"; depends=[maxLik miscTools sets]; };
   intRegGOF = derive2 { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfbimsq61dhixlz9h9jxk4yjvwbx2vl8d9fnnr54"; depends=[]; };
-  intamap = derive2 { name="intamap"; version="1.3-37"; sha256="17l1bifks0vsk0a3bj2g4w8qrvhmdh0p145kmd09223x9yc4mc9v"; depends=[automap evd gstat MASS mvtnorm sp]; };
+  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]; };
-  intcox = derive2 { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; };
   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=[]; };
   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]; };
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
-  internetarchive = derive2 { name="internetarchive"; version="0.1.5"; sha256="0zaf7nzdjr0wlvzrb6wr2nr42nq7l113i2zv9d7220wp75a5cwvd"; depends=[dplyr httr]; };
-  interplot = derive2 { name="interplot"; version="0.1.2.0"; sha256="1m9zh028j9nr5by26qw5bihwxj7ys39xqk82fwwkd37yqfxybsnc"; depends=[abind arm ggplot2]; };
+  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]; };
   interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; };
   interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
   intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; };
   interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
   intpoint = derive2 { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97q1w5ddrv227846gy9a68h6sgwc0ps88b"; depends=[]; };
   introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; };
-  intsvy = derive2 { name="intsvy"; version="1.8"; sha256="0w8xyrmj35664pl9f9nmc2mqcds9l8g4y7nbjkmbqpx3nlfx5vxm"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
+  intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; };
+  intsvy = derive2 { name="intsvy"; version="1.9"; sha256="080vklwfrnm5gfcympwi1llipkk5a3qh2xw6m91k9p6xyvnl3rrz"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
+  intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; };
+  inum = derive2 { name="inum"; version="0.9-1"; sha256="11aks7y41298rqdbawg016akam99qxf2f6rwwkkvzp62syp2ip6g"; depends=[]; };
   invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
   invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; };
-  investr = derive2 { name="investr"; version="1.3.0"; sha256="057wq6c5r7hrg1nz7460alsjsk83cvac2d1d4mjjx160q3m0zcvj"; depends=[nlme]; };
-  io = derive2 { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; };
+  investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; };
+  invgamma = derive2 { name="invgamma"; version="1.0"; sha256="1himzbglmf0w5a4bz62qq26z7kd07ljz98ybgcqxsmdagdd9jl55"; depends=[]; };
+  io = derive2 { name="io"; version="0.2.4"; sha256="1y2va6hcsdzsak6ljgj4sxin5zfr4azrqc8b9qlxcaajyyji2crx"; depends=[filenamer stringr]; };
   ioncopy = derive2 { name="ioncopy"; version="1.0"; sha256="1idk899zxvpvnswdwlpkhy5v8id6xmrbp6hg4rmrlpp3wfxw3ad5"; depends=[multtest]; };
   ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
+  ionicons = derive2 { name="ionicons"; version="0.1.1"; sha256="0v7icjx2bpb0hd3j8a14lijklyjkmw7qgp336z66wzscm6f411ip"; depends=[png rsvg xml2]; };
   ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; };
-  iosmooth = derive2 { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; };
+  iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; };
+  iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; };
   iotools = derive2 { name="iotools"; version="0.1-12"; sha256="1b2crnhx84h1gp10sy2mkhi9vylp9z97ld16jijddzlf4v23bmlx"; depends=[]; };
   ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; };
-  ipdw = derive2 { name="ipdw"; version="0.2-4"; sha256="0dlj8bfgqjf6yam11c74yhz1yj553a15sf1wgqdvf9912jpi3j54"; depends=[gdistance raster sp]; };
+  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.2"; sha256="1wncz4plz8gziv33yvwkdiw7shpbhs357ag0i9350yn5h9zhhp9b"; 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-5"; sha256="193bdx5y4xlb5as5h59lkakrsp9m0xs5faqgrp3c85wfh0bn8iis"; depends=[class MASS nnet prodlim rpart survival]; };
+  iprior = derive2 { name="iprior"; version="0.6.4"; sha256="1cpp0cp6cfdrh23wjjqvng9dszjmp5a90bgd6sbgcfckn2si0ly1"; depends=[RColorBrewer Rcpp RcppEigen]; };
   ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
-  iptools = derive2 { name="iptools"; version="0.3.0"; sha256="03i3n3v75vdlfk1z4pq6256pmb907mm60hl2gzhf7dyjvfzrm9p0"; depends=[AsioHeaders BH Rcpp]; };
+  iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; };
   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=[]; };
-  irace = derive2 { name="irace"; version="1.07"; sha256="187lwi19qcq2kqxca0233qs6k36n9fsnnh9xqwjga15snn4vlrlq"; depends=[]; };
-  irlba = derive2 { name="irlba"; version="2.0.0"; sha256="1gms3rxrm24ri4vjvnpl4v47m7bx0zk63z8y85rbhsvx230xdy0m"; depends=[Matrix]; };
+  iqspr = derive2 { name="iqspr"; version="1.0"; sha256="18kld8w1qwgyvs61irk80n56lj6mcy0mlrnvsq3940hhbcpmx61k"; depends=[rcdk]; };
+  irace = derive2 { name="irace"; version="2.1"; sha256="0q3k8jd2s7m20vdx8bfjh3kwgqjyymkfwdfgmbflmlj8q1km8iqc"; 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]; };
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
-  irtoys = derive2 { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[ltm sm]; };
+  irtoys = derive2 { name="irtoys"; version="0.2.0"; sha256="1rjw7f8r7kg4yrlkv6cwiiggm6hgx3gqc4jzcmvvmv0ycyi2w3pw"; depends=[ltm sm]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
   isa2 = derive2 { name="isa2"; version="0.3.4"; sha256="12qbfvcj8whhy7d68l7ra5wnkpx87ldl6mir7r5n8afb3fkww0kp"; depends=[lattice]; };
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
-  isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.3"; sha256="1rkry39yhxvq3ypnnxgdv15kd5w0l5w56ywmkcsgkwlxdfrvlyn2"; depends=[]; };
-  ismev = derive2 { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfgwsj6c2wnx2sm3ncxzlqml0ih6jn"; depends=[mgcv]; };
-  isocir = derive2 { name="isocir"; version="1.1-3"; sha256="1bx68n9wyfs2dcgph66rsy0jw8hjkl5kw212l0563kz3m1nik9sr"; depends=[circular combinat]; };
+  isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; };
+  isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
+  island = derive2 { name="island"; version="0.1.2"; sha256="0b7i1j7prb5v5392cl1n0w9migx4dl6f1ys4d2g82hd9l0y1m6nm"; depends=[]; };
+  ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; };
+  isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
   isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; };
   isoph = derive2 { name="isoph"; version="0.5"; sha256="1a3brp8w3xs3l25x1nn5213jj5mrzzfl4fm34l7ry97g4s9d8sh3"; depends=[Iso Rcpp survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
-  isva = derive2 { name="isva"; version="1.8"; sha256="09mrvvk09j460dzi45z8hwdpmibfshsii5dcp38g13czr40d48na"; depends=[fastICA qvalue]; };
-  itcSegment = derive2 { name="itcSegment"; version="0.1"; sha256="1x6hxr55d7ny9mmm4zhadnx5rvli8nwbh9cjqlzl1lpa7w5sfiri"; depends=[maptools raster rgeos sp]; };
+  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]; };
   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=[]; };
-  iterpc = derive2 { name="iterpc"; version="0.2.8"; sha256="096x2q8bx95ilyq5zpkqgzpfyrbj0j4fwvdivc4zf3ybd2fm4fjp"; depends=[iterators polynom Rcpp]; };
+  iterpc = derive2 { name="iterpc"; version="0.3.0"; sha256="1l1qsjmqwabbmrvl4rx50fynn1p62f0g48hkx71p3gv9asr4zifz"; depends=[gmp iterators Rcpp]; };
   itertools = derive2 { name="itertools"; version="0.1-3"; sha256="1ls5biiva10pb1dj3ph4griykb9vam02hkrdmlr5a5wf660hg6xn"; depends=[iterators]; };
   itertools2 = derive2 { name="itertools2"; version="0.1.1"; sha256="0yra3x9ddvn5pp3jibm69205zazv81bz0cflw4mdvxpqadaf9f96"; depends=[iterators]; };
   itree = derive2 { name="itree"; version="0.1"; sha256="164zgr142hcp9plnbccs6m823p4m0prk73bvp54bc7bqnqmc3d9a"; depends=[]; };
-  its = derive2 { name="its"; version="1.1.8"; sha256="1g9qmdrw7qiw0xiryf7bf5m9prrba7r11jyzprzdglc1akizav8a"; depends=[Hmisc]; };
-  itsadug = derive2 { name="itsadug"; version="2.0"; sha256="0s77f060xb2lkddd116snpvsbs73wz8kwv4hkd6yv0m2fpamvpvx"; depends=[mgcv]; };
+  itsadug = derive2 { name="itsadug"; version="2.2"; sha256="01a80a6vni3g4xph3p8i0jrlqgqhdyswhv7w6vbxhbmawbzffxyx"; depends=[mgcv plotfunctions]; };
   itsmr = derive2 { name="itsmr"; version="1.5"; sha256="0l9m5is6d6pkpfkihx0jir5iv8zmqqav8vh9bkkpqv5iz61p4kxb"; depends=[]; };
   ivbma = derive2 { name="ivbma"; version="1.05"; sha256="0d7kg6pkdx1aj1i6kqs2r7j1klxxwymml63qnrq6a6fia3ck9kk9"; depends=[]; };
   ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; };
   ivlewbel = derive2 { name="ivlewbel"; version="1.1"; sha256="0ykcfikm2i28s3fm6zzx8cjvpwhksg8an0rfr0b35gf7p69brgag"; depends=[gmm lmtest plyr]; };
-  ivmodel = derive2 { name="ivmodel"; version="1.1"; sha256="18hq667ls552vq59dhirx5q9ky252p3cjvkhm3d017bdpi3m1hq5"; depends=[Matrix]; };
+  ivmodel = derive2 { name="ivmodel"; version="1.2"; sha256="0jpvkk33ihxsla2j4b4spp2dv7b7rq49x46m9lc9zp6020w91b3a"; depends=[Formula Matrix]; };
   ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; };
   ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; };
   ivprobit = derive2 { name="ivprobit"; version="1.0"; sha256="1kijq7k6iv2ybaxb08kqzm2s2k6wp2z50r01kxcq023pmyfjczwy"; depends=[]; };
   jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; };
-  jaatha = derive2 { name="jaatha"; version="3.1.1"; sha256="017iysn4g196q36b9d7dw19hahvh2ngv872nmx36a84rxs3ymnav"; depends=[assertthat R6]; };
+  jaatha = derive2 { name="jaatha"; version="3.2.0"; sha256="00886j0cabrq6a69w8s1gsfkmx1wqs1vpxjafpm71msk54r0dj55"; depends=[assertthat R6]; };
   jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; };
   jackstraw = derive2 { name="jackstraw"; version="1.1"; sha256="0p79b8vgjspi3hjqqrhrfvf0k9rzg7ycn7azax3pk28j2cvi30j2"; depends=[corpcor lfa]; };
-  jagsUI = derive2 { name="jagsUI"; version="1.4.2"; sha256="0c8sg3zc40imircnkk5f8wbvqb2jz5li87m3wxcdr8djcs7yasx8"; depends=[coda lattice rjags]; };
+  jacpop = derive2 { name="jacpop"; version="0.5"; sha256="056c82d4a10rgq0p4p63y9i94dy1kqp3yh7xms9nx9q2xb940xb5"; depends=[]; };
+  jagsUI = derive2 { name="jagsUI"; version="1.4.4"; sha256="0jfziaxxrlf1izp7s61d7xckdx33hnbq1cs2zlp7c9bcpp4mdkzv"; depends=[coda lattice rjags]; };
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
-  jetset = derive2 { name="jetset"; version="3.1.3"; sha256="1m19p99ghh3rb0kgbwnyg0aaq011xcsrcf0llnbs9j5l2ziwvg4x"; depends=[AnnotationDbi org_Hs_eg_db]; };
-  jiebaR = derive2 { name="jiebaR"; version="0.8"; sha256="1qf27lrz02w94vxqjqbp94xxi38jzhjblcg4c1n82ngpzmfb44qc"; depends=[jiebaRD Rcpp]; };
+  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]; };
+  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.1.0"; sha256="1mijj7c5n48jkka162rd2297gq8lijhrwg6r5wd1b7dq5r1ahgby"; depends=[Formula Rcpp RcppArmadillo]; };
+  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"; sha256="0m3zz0xr2f6y8igwcg8a3rbyl3a6m8viyp0pcjbdwyj2400dbf3m"; depends=[Rcpp RcppArmadillo]; };
-  jmuOutlier = derive2 { name="jmuOutlier"; version="1.1"; sha256="17mg2aa2mn25448yky647xrvm3dmsjhl751j8ywcd8af2wf8vyrn"; depends=[]; };
-  joineR = derive2 { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66jhlg7hv5x7wyzcvjc6zkr6ffvrl8xj7"; depends=[boot gdata lattice MASS nlme statmod survival]; };
-  joint_Cox = derive2 { name="joint.Cox"; version="2.4"; sha256="18r1h9spcjg6yc37nqralf6ac04hgvfhqfviv8ldc7fl5nw8ws5q"; 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]; };
+  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]; };
   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=[]; };
-  jomo = derive2 { name="jomo"; version="2.1-1"; sha256="1wxisjskjnm0y48amn0zwb1ih7jvbjcfihs7az1vvgmlz2y2vc7n"; depends=[]; };
+  jomo = derive2 { name="jomo"; version="2.3-1"; sha256="0qwg5aank84w2jwlni470v9s7x0xnnpb1bib9r2y6j32fikyd09a"; depends=[]; };
+  jose = derive2 { name="jose"; version="0.1"; sha256="1cvrjcx902pbh9xryph1kilmyf0rmbk671jvqd19a2kfwpcw7gqc"; depends=[jsonlite openssl]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
+  jpmesh = derive2 { name="jpmesh"; version="0.3.0"; sha256="0sv199f72l5wczqlvyykpcjap68lw11pdv6lwl47ynz350vxdzlm"; depends=[broom dplyr foreach geojsonio leaflet magrittr miniUI purrr readr rgdal shiny sp tibble tidyr]; };
+  jqr = derive2 { name="jqr"; version="0.2.4"; sha256="1w4832pymnavgrlhldqg1mdf0bkd3rwfywgd98hxik51yadfszjb"; depends=[BH lazyeval magrittr Rcpp]; };
   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]; };
-  jsonlite = derive2 { name="jsonlite"; version="0.9.19"; sha256="1hbdraj3xv2l2gs9f205j8z054ycy0bfdvwdhvpa9qlji588sz7g"; depends=[]; };
+  jsonld = derive2 { name="jsonld"; version="1.1"; sha256="1bmfdcyjcz3cgy0vkliwvd97kww8djdib08bsq99v485gspl2x87"; depends=[curl jsonlite V8]; };
+  jsonlite = derive2 { name="jsonlite"; version="1.2"; sha256="0k966hzp3qnwck7fgd76w49zrz39s7pqyywws17bhbcd8rh4csyb"; depends=[]; };
+  jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; };
+  jtGWAS = derive2 { name="jtGWAS"; version="1.5"; sha256="01f1wrbgj7v6pzrx5vd8pgpm78fanyx59s84m5a5732q5g39shlk"; depends=[Rcpp]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
-  jug = derive2 { name="jug"; version="0.1.1"; sha256="0dv6v8nxrbvlyhchzjq0m4x5v88ayrrw5xgrphx865ywsxllrb85"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 stringi]; };
+  jug = derive2 { name="jug"; version="0.1.4"; sha256="1rf3akm9w5sbp59w1070ygqz1b9krq6lilbxp9r4w234c8k81a27"; 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=[]; };
-  kSamples = derive2 { name="kSamples"; version="1.2-3"; sha256="0pb32pdh23qm1svfayk50bv75mbz50rc62013sdx1h9zmrcz5f37"; depends=[SuppDists]; };
-  kantorovich = derive2 { name="kantorovich"; version="1.1.0"; sha256="06c1w6wqhlsx30lyy4126llbvaalppsibwwikw2dn316898vslg4"; depends=[gmp rcdd]; };
+  jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; };
+  kSamples = derive2 { name="kSamples"; version="1.2-4"; sha256="1k026wbzcrzzr3ji3gdnhbj13nrmbp6ybbcki3v3gk6s0xk6f2rx"; depends=[SuppDists]; };
+  kamila = derive2 { name="kamila"; version="0.1.1.1"; sha256="06jl868i8a6zg3pyaf1r6ccd33ya5f83apc5w6d3m111dzdqqlcy"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; };
+  kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; };
   kappaSize = derive2 { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
   kappalab = derive2 { name="kappalab"; version="0.4-7"; sha256="16bwbwwqmq2w7vy8p3wg0y80wfgc8q5l1ly1mqh51xi240z1qmq0"; depends=[kernlab lpSolve quadprog]; };
   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.5.0"; sha256="1cwd81fhjzdzmsn9mnj71bzqf1s5hwlaq4sijww0d81i6nwcafjl"; depends=[cubature lattice locfit qrng Rcpp RcppArmadillo VineCopula]; };
+  kdecopula = derive2 { name="kdecopula"; version="0.8.0"; sha256="1s116d6qh4zc7gazhylhzcwiifkd2xmaqi58r4ns82d7rv54gkaf"; 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.5.0"; sha256="0yalh3j5kcz3zxk1afny7v22n7y5xzbifqifrr1sjm8czi8hdi01"; depends=[equateIRT ltm mirt]; };
+  kequate = derive2 { name="kequate"; version="1.6.0"; sha256="0m8l1d43gb25zdwbv0ymnazm02m2qxg5pcir37n55sl08dh0zyby"; depends=[equateIRT ltm mirt]; };
   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="1.0.1"; sha256="03viwv4fsdby10pqimhgfjv8l654gvggrw4xxikc81w2iyachar8"; depends=[DiceKriging glmnet globalOptTests lhs mvtnorm Rcpp RcppEigen]; };
+  kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.1"; sha256="1ypyb6i64jskq2agbpb6wc6y3fn4i7z4fjjfpl97q8f0rif1lpfj"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; };
   kerndwd = derive2 { name="kerndwd"; version="1.1.2"; sha256="1d55qrayay3d5p7lxj50mv1yj3l1xh10i3j937lmjn83ffhdq40a"; depends=[]; };
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
-  kernlab = derive2 { name="kernlab"; version="0.9-23"; sha256="01y1vy1798wspg5qczvgr1k2fmp8pv2y9h8x5kqf0pp73qba9lpg"; depends=[]; };
-  keyplayer = derive2 { name="keyplayer"; version="1.0.1"; sha256="0ms5zvb3shhhzry2aab749dyiklj8bf55mzlkvsy1as8f7mpf6ar"; depends=[matpow sna]; };
+  kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; };
+  kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; };
+  keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
   keypress = derive2 { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
+  keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; };
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
   kimisc = derive2 { name="kimisc"; version="0.3"; sha256="1cdjhfdfidilvz0w92xfjwwnp2h73y8l1n7fxnh5jsv6wnx491l4"; depends=[plyr pryr]; };
   kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; };
   kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; };
   kinfit = derive2 { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; };
+  kinn = derive2 { name="kinn"; version="0.2"; sha256="14vckrk3sppxswccy4qiyc7pbzkwncwag4acbkbqfnm84pxblh3m"; depends=[caret caTools igraph KRLS mclust stringr]; };
   kinship2 = derive2 { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; };
   kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
   kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
-  kknn = derive2 { name="kknn"; version="1.3.0"; sha256="17lg3dy5b4vs7g6d83ai9chz94sm6bla9rk42gzyqlf9n341cji4"; depends=[igraph Matrix]; };
+  kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; };
   klaR = derive2 { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[combinat MASS]; };
   klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
   klin = derive2 { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
@@ -5027,7 +6282,7 @@ in with self; {
   kmc = derive2 { name="kmc"; version="0.2-2"; sha256="0ldyhlqdrbygvhpy4b9xp52zjvjmb0gaph0v9fhla707f63i21m5"; depends=[emplik Rcpp rootSolve]; };
   kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
   kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; };
-  kmi = derive2 { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qwf8xkd0n7cwj02c8d119bk9sa"; depends=[mitools survival]; };
+  kmi = derive2 { name="kmi"; version="0.5.2"; sha256="0w440r3daksghvimbm0avp6c3rjvxaxsawvn7ig5bwnw60kry9il"; depends=[mitools survival]; };
   kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; };
   kml3d = derive2 { name="kml3d"; version="2.4.1"; sha256="1xp95fm7ncmf5mpcc9zkqf6h89g4a7qdgc2snrsy16znsjmncssq"; depends=[clv kml longitudinalData misc3d rgl]; };
   kmlShape = derive2 { name="kmlShape"; version="0.9.5"; sha256="1p35ihjq84jnzq78yksdblc0c1qcn13f8n4khddsxcqvk3a44xb1"; depends=[class kml lattice longitudinalData]; };
@@ -5035,165 +6290,204 @@ in with self; {
   kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
   knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; };
   knitcitations = derive2 { name="knitcitations"; version="1.0.7"; sha256="0sx7sxrmm9x01sh3bcp9qqpvljfss9f1hr6h4dcfns8x6f60s5v6"; depends=[digest httr RefManageR]; };
-  knitr = derive2 { name="knitr"; version="1.12.3"; sha256="1v3rzv6wq8mvpdrljsaqk4z3f8323jnv385js24wmn4fglqly6dz"; depends=[digest evaluate formatR highr markdown stringr yaml]; };
+  knitr = derive2 { name="knitr"; version="1.15.1"; sha256="1pbxd3k7kv5sa1a5gxm0zc2bhjxdgx2nfch9xap5k85djmgsfqc1"; depends=[digest evaluate highr markdown stringr yaml]; };
   knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.0"; sha256="0pshn2slzqwpryklslsxwh1dmqcnwv6bwi7yfm6m342wjybpk0wl"; depends=[knitr markdown rmarkdown]; };
   knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
   knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
   knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
   knockoff = derive2 { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
-  koRpus = derive2 { name="koRpus"; version="0.06-4"; sha256="16pc52a63zyn68hfgqb9yim5wcmmyd8w1qfhg5skcf1v4lvs8yjl"; depends=[]; };
+  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.06-5"; sha256="0anip3m7shp8lj2xd2gks7cbwxfkhp3pz9hn7ijf7b5q5r4gvl15"; depends=[]; };
   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]; };
+  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]; };
   kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; };
   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="2015.3-4"; sha256="0zm2d3naprvv10ac28k4h2r6f1ygi8wic0gwbm6mvgwpb530gga1"; depends=[kyotil]; };
-  ks = derive2 { name="ks"; version="1.10.2"; sha256="0fjnnwlf60hdipw0aqbi0w6szhg4dswdim9fbfq56wkj68ax4003"; depends=[KernSmooth misc3d multicool mvtnorm rgl]; };
+  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]; };
   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]; };
   ktsolve = derive2 { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
   ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
   kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
+  kutils = derive2 { name="kutils"; version="0.93"; sha256="18p6cxvzfp3vq4058g6kjf0zgavs4yx69ppx6mxbazaqkjq2vysg"; depends=[lavaan openxlsx plyr xtable]; };
   kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; };
-  kyotil = derive2 { name="kyotil"; version="2015.11-13"; sha256="0q1xw1dhs02d6fjf6vjns15b1y11h34g4m7scsyvp9dch260bljf"; depends=[]; };
-  kza = derive2 { name="kza"; version="3.2.0"; sha256="0h2ri3cvg2x0xd7z4nmxf9f5yiaznfrripmv4h4jhs719xbmlcxk"; depends=[]; };
+  kyotil = derive2 { name="kyotil"; version="2016.11-9"; sha256="02lcnljpj9yvxmk5drxgz94m6kw8nx8bh6n1wzivplw8cfqh6d5s"; depends=[]; };
+  kza = derive2 { name="kza"; version="4.0.0"; sha256="0yfn6ijbskdkcgbgk4fwhgiiy34cw9k9vy1psi779mqd9kyjf56j"; depends=[]; };
+  kzfs = derive2 { name="kzfs"; version="1.0.1.5"; sha256="041cwg3sz5zfngm7qj9v2cx2023n8r8by08541573261ihca1inl"; depends=[digest kzft]; };
   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]; };
   l2boost = derive2 { name="l2boost"; version="1.0"; sha256="1p0sbvlnax4ba4wjkh3r0bmjs601k590g7bdfk6wxvlj42jxcnkl"; depends=[MASS]; };
-  laGP = derive2 { name="laGP"; version="1.2-1"; sha256="0b614bl87kyfd19a3gznmlgzf9v3mwscxrylgc0s08s0mg6411p8"; depends=[tgp]; };
+  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]; };
-  label_switching = derive2 { name="label.switching"; version="1.5"; sha256="0hkz5ncmkp4687xz24bk4ypmvp65lahaf23b07jwis2i7wvmldg2"; depends=[combinat lpSolve]; };
+  label_switching = derive2 { name="label.switching"; version="1.6"; sha256="0k6f31gwcjfncsgd5cm9zygplif2wr8zjqrw4gmrnxcgp2z58a9w"; depends=[combinat lpSolve]; };
   labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; };
   labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
+  labelled = derive2 { name="labelled"; version="1.0.0"; sha256="02jg7zq52wfq2dw8a26vmp28bv88v651ysbqfqf7jv3dr9xgim4f"; depends=[haven]; };
   labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; };
   labeltodendro = derive2 { name="labeltodendro"; version="1.3"; sha256="13kpmv26zzjf5iwpr4vs797irplmaixp1agx5v80wr4lvd2hirvg"; depends=[]; };
   labstatR = derive2 { name="labstatR"; version="1.0.8"; sha256="1qs76vhw6ihsriq5v0s980fxbb0pbvgwqm0a97b226cpqqabkpfm"; depends=[]; };
-  labstats = derive2 { name="labstats"; version="1.0"; sha256="1cij8dibbmixbg3mf87rdypypl1rsy5wlgfsyhg7l8zg1i2gql1z"; depends=[]; };
+  labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; };
   laeken = derive2 { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; };
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
-  lakemorpho = derive2 { name="lakemorpho"; version="1.0"; sha256="0kxd493cccs24qqyw58110d2v5w8560qfnbm6qz7aki0xa7kaqrg"; depends=[geosphere maptools raster rgdal rgeos sp]; };
+  lakemorpho = derive2 { name="lakemorpho"; version="1.1.0"; sha256="1qdh67a6a6iibvvba12z763xf989qfh08b3xgk1hy1irgc8myvll"; depends=[cluster geosphere maptools raster rgdal rgeos sp]; };
   laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; };
-  lamW = derive2 { name="lamW"; version="1.1.0"; sha256="0kxp16riyj4gvzigx1dg3hl1jjd9w6d9mzbsf67wqdcml38wn4c6"; depends=[Rcpp]; };
-  lambda_r = derive2 { name="lambda.r"; version="1.1.7"; sha256="1lxzrwyminc3dfb07pbn1rmj45kplxgsb17b06pzflj728knbqwa"; depends=[]; };
-  lambda_tools = derive2 { name="lambda.tools"; version="1.0.7"; sha256="1hskmsd51lvfc634r6bb23vfz1vdkpbs9zac3a022cgqvhvnbmxb"; depends=[lambda_r]; };
+  lamW = derive2 { name="lamW"; version="1.2.0"; sha256="06kznvlrbllizw1byf5nrnpdk2hjjp0bf84wr9dcb5pph4pmnarl"; depends=[Rcpp RcppParallel]; };
+  lambda_r = derive2 { name="lambda.r"; version="1.1.9"; sha256="1j6287iqvs3ill6r5g6ksf5809qp0l0nf20ib8266m1r09lc9j14"; depends=[]; };
+  lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; };
   landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; };
   landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; };
   landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
-  landsat8 = derive2 { name="landsat8"; version="0.1-9"; sha256="027p4cpxnx25m77z0n5kl4rs0zywwskv7ncfky0fldffg7mqaq42"; depends=[rgdal sp]; };
+  landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
+  landscapeR = derive2 { name="landscapeR"; version="1.1.3"; sha256="0mgnm1gq19ybq7dwv5agxyrldiv4743np8b9r2ql2h6gwk8rp5f7"; depends=[raster]; };
   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]; };
   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]; };
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
   lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; };
-  latdiag = derive2 { name="latdiag"; version="0.2-2"; sha256="1893xcwpvpv3d3pnkzxjqgbbn9cw8gqg9pbg8vaas39785jq29sp"; depends=[]; };
+  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-33"; sha256="0car12x5vl9k180i9pc86lq3cvwqakdpqn3lgdf98k9n2h52cilg"; depends=[]; };
+  lattice = derive2 { name="lattice"; version="0.20-34"; sha256="0615h69czr73k47whhzimf1qxv5qk0cabcrkljwhyrn6m6piq6ja"; 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.1"; sha256="1xwyfn31nr8sppxy25a7p8yhf5isq4ah0dd45plhfclnlwrycr1l"; depends=[numDeriv]; };
+  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]; };
-  lavaan = derive2 { name="lavaan"; version="0.5-20"; sha256="0vkgx0qg1xw6z89rb0lqc42pbiid4n7zhwa3zn61x9hn16y7avza"; depends=[MASS mnormt pbivnorm quadprog]; };
-  lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.0"; sha256="0g8snpfnz7r9ckjhjaggdh1rbxrzvm63qkrx1zp30x7i32f52bzd"; depends=[lavaan psych semPlot shiny shinyAce]; };
-  lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3"; sha256="1rjh0dk2rphn3aphnghpls0sckch889p5nddpwqqbqmbbzcvfgpi"; depends=[lavaan MASS survey]; };
-  lawn = derive2 { name="lawn"; version="0.1.6"; sha256="1v1f6jpz5zwfhvpwjyyqlm57rfxd38hg6bq9h2aayx2lgq5spfam"; depends=[jsonlite magrittr V8]; };
-  lawstat = derive2 { name="lawstat"; version="3.0"; sha256="0398bf4jv0gnq54v6m7zl5sixspnvfwc3x3z492i38l215pc38kx"; depends=[Hmisc Kendall mvtnorm VGAM]; };
+  lavaan = derive2 { name="lavaan"; version="0.5-22"; sha256="1z6b4xf9zymyikmi8q4kj0cn6xy8m2p31yc6zah539jk9cxpi304"; depends=[MASS mnormt pbivnorm quadprog]; };
+  lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.1"; sha256="06k9myq33p9jz7rz6ffansgi27ang4gq0s179vgsrdi10krxxg1b"; 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]; };
   lazy = derive2 { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
-  lazyData = derive2 { name="lazyData"; version="1.0.3"; sha256="1i4jry54id8hhfla77pwk3rj2cci6na36hxj7k35k8lx666fdam2"; depends=[]; };
+  lazyData = derive2 { name="lazyData"; version="1.1.0"; sha256="0mbmmx6dh8ph4lrx1b4gxbwz3jwxv4nqi0xvfzpzrm3bwbsjc634"; depends=[]; };
   lazyWeave = derive2 { name="lazyWeave"; version="3.0.1"; sha256="02c3z479y6xxng2x6vp6m0rvf3jsb9n26h00l93djxads8717i1x"; depends=[Hmisc]; };
-  lazyeval = derive2 { name="lazyeval"; version="0.1.10"; sha256="02qfpn2fmy78vx4jxr7g7rhqzcm1kcivfwai7lbh0vvpawia0qwh"; depends=[]; };
+  lazyeval = derive2 { name="lazyeval"; version="0.2.0"; sha256="1jwdz40nznlc44hpjli7h98gnpa4d98ifggmj7z88h84n9aqywqk"; depends=[]; };
+  lazyrmd = derive2 { name="lazyrmd"; version="0.2.0"; sha256="0ahm1wspvm625lx7y2zz05bvv66rlswphs84vpkcqb0dqfcn3s48"; depends=[digest htmltools htmlwidgets knitr rmarkdown]; };
   lazysql = derive2 { name="lazysql"; version="0.1.3"; sha256="18vff80rl8ckjwfqi9dhzs1q35a1wrxvynidji6dy2kvvk38xnpa"; depends=[checkmate magrittr plyr]; };
-  lba = derive2 { name="lba"; version="1.2"; sha256="0zfln5dc4v3yaqgdbg22nq3z2by7jnbbi9mwwwvkr4j1z70knpqg"; depends=[alabama ca MASS plotrix]; };
+  lba = derive2 { name="lba"; version="2.4.1"; sha256="15ipqv6jxmiypxkzfx2gwz770nqhcp81a0ci0fzw39g2ayjs5sr3"; depends=[alabama MASS plotrix rgl scatterplot3d]; };
   lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; };
   lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13"; sha256="1jpy0j52w8kc8qnwcavjp3smvdwm1qgmswa9jyljpf72ln237vqw"; depends=[numDeriv]; };
   lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; };
+  lbreg = derive2 { name="lbreg"; version="1.0"; sha256="03pr5mjk3pfnlfafx6gk9xjsy4m5m7lj4zzvsngl95rr8hnnvvlf"; depends=[MASS]; };
   lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
-  lcmm = derive2 { name="lcmm"; version="1.7.5"; sha256="0xw411vhrh7l72wwc114rm0qiaxzl2gi8sm32qy9i8mry4623cj2"; depends=[survival]; };
-  lcopula = derive2 { name="lcopula"; version="0.205"; sha256="0ni8q5cdzrkcjxjj1z6kyzd0sp592vnrh3yxnwh2vl9wc41v59i9"; depends=[copula pcaPP Rcpp]; };
-  lctools = derive2 { name="lctools"; version="0.2-4"; sha256="0sfb26j0mgnnzql2ylj2d3cll67j7axyr1n20sv3zgx7nblkzkjj"; depends=[MASS pscl reshape weights]; };
+  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]; };
+  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=[]; };
-  ldamatch = derive2 { name="ldamatch"; version="0.6.3"; sha256="0pq62rsbvhn506n1qz8nvyl0lfkqyl80k6jq2g5c4iqf8vpcjasz"; depends=[data_table entropy foreach iterators iterpc kSamples MASS RUnit]; };
-  ldatuning = derive2 { name="ldatuning"; version="0.1.0"; sha256="04313zyz5mk652hb7vqklg8ibdgf41bcr85whc2rfcxfwq0jpwpi"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; };
+  ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; };
+  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]; };
   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.0.1"; sha256="1hwv3aay1pl48kzd8wz073jbfky47d9lr1xv0iawnv31r488wnpj"; depends=[base64enc htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp]; };
-  leafletR = derive2 { name="leafletR"; version="0.3-3"; sha256="00xdmlv6wc47lzlm43d2klyzcqljsgrfrmd5cv8brkvvcsyj57kq"; depends=[brew jsonlite]; };
+  leaflet = derive2 { name="leaflet"; version="1.1.0"; sha256="05faikqdlbsj9lvl1lvhmagys71597jvgah8b9f1fqhgyj0bwx7l"; depends=[base64enc crosstalk htmltools htmlwidgets magrittr markdown png raster RColorBrewer scales sp viridis]; };
+  leafletCN = derive2 { name="leafletCN"; version="0.2"; sha256="10kkclna64jwfmmn5rw91rb4f0cxqr62027vp1699iqm553dvhhd"; depends=[htmltools jsonlite leaflet magrittr 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="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
+  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]; };
   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.4.4"; sha256="1z59hhf4g9dv9pyk51166v26lfrih2rb4xh46zwa4jdxg0scmarm"; depends=[ellipse foreign leaps MBESS readxl sas7bdat triangle]; };
+  lessR = derive2 { name="lessR"; version="3.5.5"; sha256="05pf0l4irsv71c7ywdq92gwl58caphjxlxkls6vs89prib2bj4sf"; depends=[ellipse foreign leaps png readxl sas7bdat triangle]; };
   lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
-  letsR = derive2 { name="letsR"; version="2.4"; sha256="12jazq54rn1mxh7ff7hd88mqwn0n85dn0mhdbli81sr4kdnd37sl"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
+  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]; };
-  lfactors = derive2 { name="lfactors"; version="0.7.0"; sha256="0kcn8l3k33q43mpgp862p3vfh2j58mdp3bixryyys76hhqfghqsw"; depends=[]; };
-  lfda = derive2 { name="lfda"; version="1.1.1"; sha256="1af4yl1k0p1wr3zar0syyjk0bc0nkng01afp5vchh7h5bb7nza8k"; depends=[plyr rARPACK]; };
-  lfe = derive2 { name="lfe"; version="2.4-1788"; sha256="1f4b8s7n40j23hab4jn6crrwagwj68vb7c31k68i748zwwnf0xjc"; depends=[Formula Matrix sandwich xtable]; };
-  lfl = derive2 { name="lfl"; version="1.2"; sha256="0l922sjpdiy4ifhizl1l2azzwg83j8fy8j5bvwx6yd3fvxas51ns"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
-  lfstat = derive2 { name="lfstat"; version="0.8.0"; sha256="00vjkn5q4k3bqd1xfvi2s15csc126v4x0y1iiipdvs9pqwy9hc63"; depends=[dygraphs lattice latticeExtra lmom lmomRFA xts zoo]; };
+  lexRankr = derive2 { name="lexRankr"; version="0.3.0"; sha256="0afgjzcmhnrq30n1mkzx51f0yk369ds5sh47a4z8z56w2w5sb8ik"; 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=[]; };
+  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-14"; sha256="1n9nmxgyzw6f27lx47bfz3cp62yxhdx07dh8b3wlf7b2nyx8jgjz"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat]; };
-  lgtdl = derive2 { name="lgtdl"; version="1.1.3"; sha256="00lffc60aq1qjyy66nygaypdky9rypy607mr8brwimjn8k1f0gx4"; depends=[]; };
-  lhs = derive2 { name="lhs"; version="0.13"; sha256="1wi21iyzsr6z3ina2iplqzymg9rspr6im0aik4gmh9qdbw1lj258"; depends=[]; };
+  lgcp = derive2 { name="lgcp"; version="1.3-15"; sha256="16a8bg40pravg7jxnqxp74rnncgwxy5jki27038497ask5yxzpdd"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat]; };
+  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=[]; };
-  lifecontingencies = derive2 { name="lifecontingencies"; version="1.1.10"; sha256="1j1m5s8bsxl21rjy3jy12babd69kkd1c4awpi14wh09w45d3pvfr"; depends=[markovchain Rcpp]; };
+  libcoin = derive2 { name="libcoin"; version="0.9-1"; sha256="0whxgylcrhm03yln8k11cxr3bcjkvhyqhgj0yc8wc4avaq6gl1dh"; 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]; };
+  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=[]; };
-  liftr = derive2 { name="liftr"; version="0.3"; sha256="0piy10syyli14xd71ynlxxsdfhs7i531kymvw2psz0ridv7ang1j"; depends=[knitr rmarkdown stringr yaml]; };
-  lightsout = derive2 { name="lightsout"; version="0.2.1"; sha256="12249kjfmrybwq7s3biai0f2pcv30556a4w9q63drm4aqpc6v5q8"; depends=[magrittr shiny shinyjs]; };
-  likeLTD = derive2 { name="likeLTD"; version="6.0.4"; sha256="1czwcr5d8i1xwll92m4302fjm76w6ss9b0ndpjm5vwk1492h285a"; depends=[DEoptim gdata ggplot2 gtools rtf]; };
+  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]; };
+  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]; };
   likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; };
-  likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.40"; sha256="1zgqs9pcsb45s414kqbhvsb9cxag0imla682981lqvrbli13p2kg"; depends=[alabama cond nleqslv pracma Rsolnp]; };
-  likert = derive2 { name="likert"; version="1.3.3"; sha256="0vdm0ggki9lyxm7b477v1ja23d73p7iys3as98vjwymgkakrbb8b"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; };
-  limSolve = derive2 { name="limSolve"; version="1.5.5.1"; sha256="0anrbhw07mird9fj96x1p0gynjnjcj07gpwlq0ffjlqq2qmkzgqs"; depends=[lpSolve MASS quadprog]; };
+  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]; };
+  limSolve = derive2 { name="limSolve"; version="1.5.5.2"; sha256="01vc6as0mr6fmz8vzlnziv4sy302amwwvn7nsnmfrhslqyps4vx1"; depends=[lpSolve MASS quadprog]; };
   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=[]; };
+  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]; };
-  linkR = derive2 { name="linkR"; version="1.0.1"; sha256="0ayscl0i4flh31l5j8730h5lpqi30p8f2l3nvbd3i2mhp54gpcdx"; depends=[svgViewR]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.1"; sha256="1k56x651c84sc60fmz1yf0x5436dnh6v3vxh8yq9hk5qpmkgz8h9"; 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]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
-  lint = derive2 { name="lint"; version="0.3"; sha256="0lkrn5nsizyixhdp5njxgrgwmygwr663jxv5k9a22a63x1qbwpiq"; depends=[dostats foreach harvestr plyr stringr]; };
   lintools = derive2 { name="lintools"; version="0.1.1.1"; sha256="1rsya48abvr5zijd10bh5g03hjviyack2gh0waawqhv29lhiy9f1"; depends=[]; };
-  lintr = derive2 { name="lintr"; version="0.3.3"; sha256="04h05y678xx65sd3cx23yzkdmghk47ikg52w4ii110jjq0s53p9d"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
+  lintr = derive2 { name="lintr"; version="1.0.0"; sha256="0d03lwr96pdvkdxgjlrzj591dkaxm2rbdk2n3jgr1k428v6jkzy0"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
+  liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
   lira = derive2 { name="lira"; version="1.2.0"; sha256="1n4vjq5v0qj26bq56w5vchwdv10ysc94aizblwm1wl9ss8lpsc0a"; depends=[coda rjags]; };
   liso = derive2 { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
   lisrelToR = derive2 { name="lisrelToR"; version="0.1.4"; sha256="0zicq0z3hhixan1p1apybnf3v5s6v6ysll4pcz8ivygwr2swv3p5"; depends=[]; };
-  list = derive2 { name="list"; version="8.0"; sha256="09qpcsygs2clbgd42v6klgh1vjhv64s56ixxqlcpg9v7xqnms56j"; depends=[coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
-  listWithDefaults = derive2 { name="listWithDefaults"; version="1.0.0"; sha256="1l7q5v7nf2z1six66lvqflnc77q0f7n1acdbmla695myv246aj6d"; depends=[assertthat]; };
+  list = derive2 { name="list"; version="8.3"; sha256="1wffh7xmhdf4hqbpz4ij0759zk0y0zsm160kzfcr2n8s9wdgm5gj"; depends=[coda corpcor gamlss_dist magic MASS mvtnorm quadprog sandwich VGAM]; };
+  listWithDefaults = derive2 { name="listWithDefaults"; version="1.1.0"; sha256="1fbip2rs82l4s85ag147clkwb5spwr07dyh2c7n6vw1i4h1w0v5x"; depends=[assertthat]; };
+  listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; };
   listenv = derive2 { name="listenv"; version="0.6.0"; sha256="0kyq90mf7wv9qgw3s81iv0b8ah0ncc5kv15r7fv6ggdq4f0z0dx7"; depends=[]; };
-  littler = derive2 { name="littler"; version="0.3.0"; sha256="1n3kmfl4kazab0yxwgdri24179w6pbkx96pgn8j3alj6ixrn5wdy"; depends=[]; };
+  listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; };
+  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=[]; };
   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]; };
   lle = derive2 { name="lle"; version="1.1"; sha256="09wq7mzw48czp5k0b4ij399cflc1jz876fqv0mfvlrydc9igmjhk"; depends=[MASS scatterplot3d snowfall]; };
   lllcrc = derive2 { name="lllcrc"; version="1.2"; sha256="06n1fcd3g3z5rl2cyx8jhyscq9fb52mmh0cxg81cnbmai3sliccb"; depends=[combinat data_table plyr VGAM]; };
   lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
   lm_br = derive2 { name="lm.br"; version="2.8"; sha256="019j0ypl4cdnl29r9x17m62jnpp1p174zmy3zdy8bvp52kz4008r"; depends=[Rcpp]; };
-  lmSupport = derive2 { name="lmSupport"; version="2.9.2"; sha256="0mdl5ih7zzxynawxx4prh08nq451x74bfw4ga7cygl2ahi6vqq50"; depends=[AICcmodavg car gvlma lme4 psych]; };
-  lme4 = derive2 { name="lme4"; version="1.1-11"; sha256="1ji3nkw46ryr8gsam5fbwfbc0pf9s224yfzrs11yb91i89jza93r"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
+  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]; };
   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]; };
   lmeVarComp = derive2 { name="lmeVarComp"; version="1.0"; sha256="17zrl33h4lcd8lpdv3d12h5afj8nxr2lyw6699zq4fds2chbq66l"; depends=[]; };
   lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; };
-  lmenssp = derive2 { name="lmenssp"; version="1.1"; sha256="1s0v5fmzmiq271d3x8l83ni7rl7ikw40mqwhhd2xh21a3nrcdw6l"; depends=[geoR MASS mvtnorm nlme]; };
-  lmerTest = derive2 { name="lmerTest"; version="2.0-30"; sha256="16kxk8wiad5w5x81jlr2v6422b5wyi2ay4bkl8s2vq3szrbxl3k9"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
+  lmem_gwaser = derive2 { name="lmem.gwaser"; version="0.1.0"; sha256="0i315plqq1c8d7nvzk7jj9b3n4pgy27673pgdbii4c5bccwm12vn"; depends=[fdrtool genetics lattice LDheatmap lme4 pastecs qtl stringr]; };
+  lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; };
+  lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; };
+  lmerTest = derive2 { name="lmerTest"; version="2.0-33"; sha256="1r4bwxq36hn41hwjph2nrn4jhh0y2kwc746374ng5jd480gkgl8m"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
+  lmeresampler = derive2 { name="lmeresampler"; version="0.1.0"; sha256="00v3qg5vyjjb0pcbrknzxy80kkwsypkhwkv3nsck5rscaf86y3aq"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; };
   lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
-  lmfor = derive2 { name="lmfor"; version="1.1"; sha256="0bbcgpcx0xjla128w80xlxp6i6hnrk4wjwqih66zvyjaf5sz7wx9"; depends=[MASS nlme]; };
+  lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; };
   lmm = derive2 { name="lmm"; version="1.0"; sha256="0x5ikb1db99dsn476mf4253dlznlxa1cwnykg1nwnm2vy5qym2fq"; depends=[]; };
   lmmlasso = derive2 { name="lmmlasso"; version="0.1-2"; sha256="1mvd38k9npyc05a2x7z0908qz9x4srqgzq9yjyyggplqfrl4dgsz"; depends=[emulator miscTools penalized]; };
   lmmot = derive2 { name="lmmot"; version="0.1.3"; sha256="1wpqcyscbqv9l8kl4lg5xg6cs3vc496jwpyj5y4iqmks88hgi6il"; depends=[MASS maxLik]; };
@@ -5201,87 +6495,96 @@ 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.2"; sha256="1ha77bvd7gb6150mkah62v2vgazifj8as19ry4ivm0kdzlbxc0jz"; depends=[Lmoments MASS]; };
-  lmtest = derive2 { name="lmtest"; version="0.9-34"; sha256="0bhdfwrrwjkmlw0wwx7rh6lhdjp68p7db5zfzginnv3dxmksvvl6"; depends=[zoo]; };
+  lmomco = derive2 { name="lmomco"; version="2.2.5"; sha256="0xk114vc9pz0f2nfzfyh43idz0hrn0w4g1j3kidlqhnd96g576vs"; 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]; };
   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.35"; sha256="1b8zx2kv1yyazw1sq0c91q11mk3pc7ig2q93qm6lv75nlakyp7da"; depends=[foreach ggplot2 MASS matrixStats]; };
+  localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; };
   localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; };
   locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; };
   locfit = derive2 { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; };
-  locits = derive2 { name="locits"; version="1.4"; sha256="1q9vsf5h4n7r4gy1dwdhfyq3n0rn33akb3nx6yzinncj4w4cqq0h"; depends=[igraph wavethresh]; };
+  locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; };
   locpol = derive2 { name="locpol"; version="0.6-0"; sha256="1zpdh3g7yx3rcn3rhlc3dm19c4b9kx2k8wy8vkwh744a1kysvdga"; depends=[]; };
   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="1.2"; sha256="1jfkg5rx51hm2skwwafqiw6ajdijdm0cniral3j5flidinsbsbcm"; depends=[glm2]; };
+  logbin = derive2 { name="logbin"; version="2.0.1"; sha256="13fxq3lslsmial52ih80ziagbkm00a8681dnnn3s8kykqg1m8v7f"; 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.4"; sha256="0y1x0bvalrhrl329l9a0mssc8kc060ml2hgz18qyw3chd24x3dmz"; depends=[ks]; };
+  logcondens = derive2 { name="logcondens"; version="2.1.5"; sha256="1sq27klnphp74hq0l0460m9bb7lrl06mpgkg4qq8iciy3yy1mrkj"; depends=[ks]; };
   logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; };
   logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; };
   logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
-  logistf = derive2 { name="logistf"; version="1.21"; sha256="0cwbmd0mvj4wywpx7p4lhs70nhab7bfl6fzz2c4snn3ma6sy7x8c"; depends=[mgcv mice]; };
+  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.29"; sha256="0wbdxh3n44nzb6c0ahyd8gndfql1y56fns2bkmzqi3nxy9blhx18"; depends=[]; };
+  logitnorm = derive2 { name="logitnorm"; version="0.8.33"; sha256="1arsgc57vr77m9ygy0rbqkayj587k9k5k8nrr6k30v63qapc2irv"; 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]; };
   logspline = derive2 { name="logspline"; version="2.1.9"; sha256="1kd7ricaxbcjl6d9hx7bb5mlkr7x2h7gc8vrmfvlzxppbcghb6vw"; depends=[]; };
-  lokern = derive2 { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; };
+  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.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; };
+  longCatEDA = derive2 { name="longCatEDA"; version="0.30"; sha256="1xj1lfwnsl864c0wycpwg8ibns6447l5988132p79a2rpd30rw3r"; 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-11"; sha256="1l1icy653d67wlvigcya8glhqh2746cr1vh1khx36qjhfjz6wgyf"; depends=[lme4 Matrix nlme]; };
-  longurl = derive2 { name="longurl"; version="0.1.1"; sha256="06xyxn641nsw3zl2mllsvm1r4g82ddnc3vvscp6bdw8l7a13w4a5"; depends=[dplyr httr pbapply]; };
-  loo = derive2 { name="loo"; version="0.1.5"; sha256="0d5lnc8a9939g3mvh28ymvsabgfkq9fqljskvqj5v9rb4ps1b9xd"; depends=[matrixStats]; };
+  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]; };
   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]; };
   lordif = derive2 { name="lordif"; version="0.3-3"; sha256="1yby9fvzdi1dzvzp6d6h144k1p9nfacd8l5bd66dmhnc8sp2nlx5"; depends=[mirt rms]; };
   lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
+  lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; };
   lpSolve = derive2 { name="lpSolve"; version="5.6.13"; sha256="13a9ry8xf5j1f2j6imqrxdgxqz3nqp9sj9b4ivyx9sid459irm6m"; depends=[]; };
   lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17"; sha256="1gfxnjkhhyybhyg29qdrdqzwq569b6pgwjgacmw3q7aldc724cyz"; depends=[]; };
   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=[]; };
   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]; };
   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=[]; };
   lqmm = derive2 { name="lqmm"; version="1.5.3"; sha256="1gl609irhxk7qi4x8as2xylc6iybm9jyrnm7dvb92nxl0ksp44v7"; depends=[nlme SparseGrid]; };
-  lqr = derive2 { name="lqr"; version="1.1"; sha256="1ljxvq6vbqzb8p6krv0k2d4fjv7y0l7m5dvbzw6rg82zfa66mlhk"; depends=[ghyp spatstat]; };
+  lqr = derive2 { name="lqr"; version="1.5"; sha256="1rcs6p8jx86r40ys8qiz5gynkfqyg3lkv7wsv551w9c5m3s1z2gy"; depends=[ghyp spatstat]; };
   lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; };
-  lrgs = derive2 { name="lrgs"; version="0.4.2"; sha256="04blq49sxc0shny0yfv19az66k8xb8bwdqznqajzr3cbsnpvh5bk"; depends=[mvtnorm]; };
-  lrmest = derive2 { name="lrmest"; version="1.0"; sha256="1gdj8pmmzvs1li05pwhad63blhibq45xd1acajxsx06k7k21ajs7"; depends=[MASS]; };
+  lrgs = derive2 { name="lrgs"; version="0.5.1"; sha256="1hzcmrvax03bzrljnqskmnnpsw6amnwcfygnls727369h0dbzc4a"; depends=[mvtnorm]; };
+  lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; };
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
   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.2.0"; sha256="18dmm6slf0ilikz9hr3j8p554h5w9jaypfdmva7d2s0mhlv6nx5y"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
+  lsgl = derive2 { name="lsgl"; version="1.3.5"; sha256="0afg1n03zl00b0w87j4v8afp1q6h5d8kx8xgciy52dki4yvb1c3r"; 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.1"; sha256="0y6lqmjiah33j66hxwxx9b6qx42sv0bqqgic39nkil1zppkk3b4h"; depends=[ggplot2 reshape2]; };
-  lsmeans = derive2 { name="lsmeans"; version="2.23"; sha256="0f3i2415nd6s80lcw0cbksz2g360ws6yvvc0c3rw47z95zi599fj"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
+  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]; };
   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]; };
-  ltbayes = derive2 { name="ltbayes"; version="0.3"; sha256="1b35bwli08yzgv3idg86wz8fzpx7r5sx0ryr950rdh0n2jdml09q"; depends=[mcmc MHadaptive numDeriv]; };
+  ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; };
   ltm = derive2 { name="ltm"; version="1.0-0"; sha256="1igkgb0jy3mzlnp9s6avhcpplwijz5g3x26a3lavyy3d9fjpmfpa"; depends=[MASS msm polycor]; };
-  ltmle = derive2 { name="ltmle"; version="0.9-7"; sha256="18nybicfy7sp4rvnyckd9wgsb4hqsgmwijh2id9d6kyvkcinxaw2"; depends=[Matrix]; };
+  ltmle = derive2 { name="ltmle"; version="0.9-9"; sha256="1fnlnj6r1pvisgain1wvv0yb69wckz31lbxyfvw2xxq6c658ifn8"; depends=[Matrix matrixStats speedglm]; };
   ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; };
   ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
   ltsk = derive2 { name="ltsk"; version="1.0.4"; sha256="1p026ryq31iw7d8mbi4m2q43g5frj47387w8g46j50bcv11hh2zm"; depends=[fields gstat sp]; };
-  lubridate = derive2 { name="lubridate"; version="1.5.0"; sha256="12x286z8m4rqwvsf0gkbkyzw2znj560xsxbczfz9qxz7k26jp640"; depends=[stringr]; };
+  ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; };
+  lubridate = derive2 { name="lubridate"; version="1.6.0"; sha256="0ci6rwij9i1inn840m0mlh1nqgh6vm2lada9kdnjpcjp5kyfv1qs"; depends=[stringr]; };
   luca = derive2 { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
-  lucid = derive2 { name="lucid"; version="1.3"; sha256="018vp4xibxr7aanffcvhmppsh7vjsjrqqc41iavyasjbamj3hyck"; depends=[nlme]; };
-  lucr = derive2 { name="lucr"; version="0.1.1"; sha256="0igh1wfdl67yincqj284h6kkpp1d9vmv1a4ljkd98vlshwfyi74f"; depends=[httr Rcpp]; };
+  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]; };
-  lumendb = derive2 { name="lumendb"; version="0.2.0"; sha256="0j0bcg0nrp6ckd2vr81jqx9k8q6fsnfpi3n1c5nyjasspb746q2i"; depends=[httr]; };
+  lumendb = derive2 { name="lumendb"; version="0.2.1"; sha256="0cmbiiixvf6c33vxzcn4q48asinlsplmc5xpj5h84xnysa6zs3xv"; 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]; };
+  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]; };
   m4fe = derive2 { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; };
@@ -5292,162 +6595,216 @@ in with self; {
   mHG = derive2 { name="mHG"; version="1.0"; sha256="18hj9chp9dy6nmi5w0808nivqbyni117darvdpf03kzq5ym8dlm6"; 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]; };
-  mRm = derive2 { name="mRm"; version="1.1.5"; sha256="0sbpk7z4ij917nw8wyvnm87iav95ybqrzvmsjy3r8nyq55bjzyn7"; depends=[]; };
-  maGUI = derive2 { name="maGUI"; version="1.0"; sha256="0vlaxdq2fw9bpz4wd4ir4gy6pas0hp01xlkbnvwrv297zzhndrr6"; depends=[affy annotate beadarray Biobase BiocInstaller Biostrings convert genefilter GEOmetadb GEOquery globaltest GOstats graph gWidgets gWidgetsRGtk2 impute limma lumi marray oligo pdInfoBuilder RBGL Rgraphviz RGtk2 RSQLite simpleaffy ssize WGCNA]; };
+  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]; };
   maRketSim = derive2 { name="maRketSim"; version="0.9.2"; sha256="1cq17zjwyf4i5lcqgxqkw805s4mr6qp89blgpmpxy8gdrbfj93m4"; depends=[]; };
-  maSAE = derive2 { name="maSAE"; version="0.1-4"; sha256="0287x5n41hl6p2s9f62zmjq87dklfyvb41fd9q3s1m2sjspgd6vc"; 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]; };
+  macc = derive2 { name="macc"; version="1.0.0"; sha256="1d6acnp9k0al4nwggf5dqjiazasnika4899gb5j4rp2aihd8yly9"; depends=[car lme4 MASS nlme optimx]; };
+  machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; };
+  machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; };
+  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]; };
-  mads = derive2 { name="mads"; version="0.1.3"; sha256="1nq17r9k2wg9v5nis0c0z4qf5pcmw93smxf7lra7vsiqgzgzhaad"; depends=[mrds]; };
-  madsim = derive2 { name="madsim"; version="1.1"; sha256="1d9mv769zia43krdfl43hp22cp5mdi3ycwj3kxyfcjrg23bjnyc0"; depends=[]; };
-  magclass = derive2 { name="magclass"; version="3.74"; sha256="0ikhh50k4i9d4h36yq0ccps4smqr0igrgxzfy23rg57dwcfzz3yz"; depends=[abind maptools ncdf4 reshape2 sp]; };
+  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=[]; };
+  mafs = derive2 { name="mafs"; version="0.0.2"; sha256="1yx4y73hnd30x6cad7md07aiikhdsa6bsbha72j9vlncaj8d504m"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; };
+  magclass = derive2 { name="magclass"; version="3.85"; sha256="1l3s6j19yvyhprxk2817xmgr64xwkknvq53bfhjdbn2jqh5nx40x"; depends=[abind maptools ncdf4 reshape2 sp]; };
   magic = derive2 { name="magic"; version="1.5-6"; sha256="1399w1zhz79nj8cdhslybncd9h6rylfhb548nv22ip0dxxdkyv0v"; depends=[abind]; };
-  magicaxis = derive2 { name="magicaxis"; version="1.9.4"; sha256="0kgr29q4v9aq10l6zkddgv93zl66yzwxx9jsnskkx3r0kk3rlxa3"; depends=[MASS plotrix sm]; };
+  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]; };
+  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=[]; };
   mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; };
+  makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; };
   makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
+  makedummies = derive2 { name="makedummies"; version="1.0"; sha256="1kyx0n620pnaaxi136f81kr55v94zlw2bikrky1sq9bhrvdlf7yh"; depends=[]; };
+  malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
   mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
   managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
-  mangoTraining = derive2 { name="mangoTraining"; version="1.0-6"; sha256="1g5qwc09whrsxlp2wvgx79p5mrjw5jj0q0k1bv08pq31djr7c3r3"; depends=[]; };
-  manifestoR = derive2 { name="manifestoR"; version="1.2"; sha256="069nfhafqaqb4amkc40bcqc0qij1nl9h433l97q4vxq55aqr2hz0"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tm zoo]; };
+  mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; };
+  manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; };
+  manifestoR = derive2 { name="manifestoR"; version="1.2.3"; sha256="0m9xgprm7w68ncm7qpqdcnrl409i4x33lrpwzap2za5r5bb5wv1n"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; };
   manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
+  manipulateWidget = derive2 { name="manipulateWidget"; version="0.5.1"; sha256="1i69y4gjm35xf3nd6bf031nkw91b0whbd7yd2a1fq5msv0mjqrss"; depends=[base64enc htmlwidgets knitr miniUI shiny]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
   mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
-  mapmisc = derive2 { name="mapmisc"; version="1.4.6"; sha256="00v7jwjvw942xr1bd05n8i3abbzbcnbjzpm3mxb2sh32s4w1hifj"; depends=[raster sp]; };
+  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.2.0"; sha256="1lfi6hrbifp4mfxnqn4qbnicjfnrg9pc73kdrk7hf3dfhgi5269n"; depends=[ggplot2 gistr httr leaflet RColorBrewer rworldmap sp spocc]; };
-  maps = derive2 { name="maps"; version="3.1.0"; sha256="16hsw1vzkxm0rhfsryj1zsiywxaa5hn5dbyxvnb42grqgl6wrdkn"; depends=[]; };
-  maptools = derive2 { name="maptools"; version="0.8-39"; sha256="1lkxlvk8h9v37cl87r39asm4mhyihllv105izgh7bfsxwh9y70ab"; depends=[foreign lattice sp]; };
+  mapr = derive2 { name="mapr"; version="0.3.0"; sha256="0xgbc4zpjdd6lncccdd85ar909z7bv8yqrv5s1xrp2j2j1gv97z1"; depends=[ggplot2 gistr httr leaflet RColorBrewer rworldmap sp spocc]; };
+  maps = derive2 { name="maps"; version="3.1.1"; sha256="0ajdrd4z66jpdjqdgk6vz89x7gh1isidgr8qkg0fq6cmrvjn08lp"; depends=[]; };
+  maptools = derive2 { name="maptools"; version="0.8-41"; sha256="0niz4qssvd8g43z4a85mq5p7cs3s169sgc3p3rzviqqgcc0i6z7n"; 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.0.0"; sha256="1kk3slizi78qjnfwnv8jjhwb6x89w7ly11l7fxk4fny3zjzj1spa"; depends=[brew data_table gdalUtils htmltools htmlwidgets lattice latticeExtra leaflet OpenStreetMap png raster rasterVis Rcpp rgdal satellite scales sp]; };
+  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]; };
-  marelac = derive2 { name="marelac"; version="2.1.5"; sha256="1lzgcl6y4dmy3radzr49smy0cwdbd930dvah9rs50x637yqc7p14"; depends=[seacarb shape]; };
+  march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; };
+  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]; };
+  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.11"; sha256="12wh8djc0j7x4ywn7x57f93wyl05p6yv7808g6s5pn2v5j0v66q6"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp truncnorm]; };
-  markmyassignment = derive2 { name="markmyassignment"; version="0.5.0"; sha256="17xw5hn0bg1w7vbs8d8kr6y0drrmkmpwfvr6dy3zndagzsb2sdw0"; depends=[codetools httr testthat yaml]; };
+  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.4.3.1"; sha256="0ik8wkg8cj6z5ys3lm15jkslsxq2j2ahzw2nc7q0qrvgzbmfck6w"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
+  markovchain = derive2 { name="markovchain"; version="0.6.6"; sha256="165zh185fjgr61ah4y763816fai6g6phj64afdlklbsj5an1mvr9"; 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.5"; sha256="0avdi55b43nrkryygs7g3l62g48m1b2zhjf7xcwx7q166k7lb7ax"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
+  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]; };
-  matchingMarkets = derive2 { name="matchingMarkets"; version="0.2-1"; sha256="14y1sigmi3rv8rpvcyc2d7j4dlzr85mhsqrgdjfszxz26rahkx6k"; depends=[lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
+  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]; };
   matchingR = derive2 { name="matchingR"; version="1.2.1"; sha256="09vx3yqaq0pq341v8rm2hjxx0aza0bnh9iffrygwbhls7fi7kn7y"; depends=[Rcpp RcppArmadillo]; };
-  matconv = derive2 { name="matconv"; version="0.3.0"; sha256="19b03ks2pqsz7wk3wm7iaj5z5aidsd6hn0s0x46r2iv13x67fjkd"; depends=[]; };
-  mateable = derive2 { name="mateable"; version="0.3.0"; sha256="0jbdfijf9iq5ik5pri0iricip9hglp75jask65iyf1k8n82hippb"; depends=[FNN Rcpp sn]; };
+  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]; };
   mathgraph = derive2 { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
   matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
   matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
-  matlabr = derive2 { name="matlabr"; version="1.1"; sha256="0h9h805569dxnrrzgmxmhvmx7l8kg53lq1nksdrr7p9f8jglha6s"; depends=[stringr]; };
-  matlib = derive2 { name="matlib"; version="0.7.2"; sha256="1832i9c9cp2klblwf6wbpigpzsnlli912dzkabjp5zlzkngbfym5"; depends=[rgl]; };
+  matlabr = derive2 { name="matlabr"; version="1.1.3"; sha256="0kbfvc83ccyg3dzviz0xz2jn7n3zcjlp4g3qwi623b5f2pvw7qq4"; depends=[stringr]; };
+  matlib = derive2 { name="matlib"; version="0.8.1"; sha256="080mbmr1lb5ha5ql40hv0idcnnbyaai46c42z756kdyq9pdzcabf"; depends=[car rgl]; };
   matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
-  matrixStats = derive2 { name="matrixStats"; version="0.50.1"; sha256="08l32abp7dfnsc49ca4hzznh934y60n5z01x5ga2ixky5961s57c"; depends=[]; };
+  matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; };
+  matrixStats = derive2 { name="matrixStats"; version="0.51.0"; sha256="0bsalx605kgb9nl7mfnq1qinkyd9s97p8plymsyfja1gmcnjrcpj"; depends=[]; };
   matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; };
-  matrixpls = derive2 { name="matrixpls"; version="0.7.0"; sha256="1bzgw5lghi3q9qgjcs87w2b0slvxy4cppr9p378p44hqzf00na4h"; depends=[assertive lavaan MASS matrixcalc psych]; };
+  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]; };
   maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; };
-  maxlike = derive2 { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
-  maxstat = derive2 { name="maxstat"; version="0.7-23"; sha256="1dp2gp0zsf3l5vd43ixxx7039ybcw84x9zf526pk1p2j7pxwsbay"; depends=[exactRankTests mvtnorm]; };
-  mbbefd = derive2 { name="mbbefd"; version="0.8-0"; sha256="1vpbclkbfw8cas4474sbmnnvab3vrqivmgby95prm40p3xdy9xl4"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; };
+  maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; };
+  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-24"; sha256="1l7q83233jbxsly081mnc7lf20nn894hcynq3sm3hjxkvrplzsm9"; depends=[exactRankTests mvtnorm]; };
+  mazeGen = derive2 { name="mazeGen"; version="0.1.1"; sha256="1vqhcypxbw15prc77i1jl8vnb1q3lr9bb9s6ql2pcadv3i02ybnb"; 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]; };
   mblm = derive2 { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
   mbmdr = derive2 { name="mbmdr"; version="2.6"; sha256="0ss5w66hcgd8v8j9bbbp12a720sblhr2hy9kidqfr8hgjaqlch86"; depends=[logistf]; };
-  mboost = derive2 { name="mboost"; version="2.6-0"; sha256="0ldg293nv4i8541w4il7hrw9hqgdk4q204dvrbmsrdb8i9cpm3s5"; depends=[lattice Matrix nnls party quadprog stabs survival]; };
-  mc2d = derive2 { name="mc2d"; version="0.1-16"; sha256="0pw89pqmwlavb2bhhshv68fzf6s16a3rwj52prylv9clr07rw7pa"; depends=[mvtnorm]; };
+  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]; };
   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]; };
   mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
   mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
   mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; };
-  mcga = derive2 { name="mcga"; version="2.0.9"; sha256="197yldx03c634f3x0mpxxvqrys93n7z7n3x0alvqa42z3vdkrz7b"; depends=[]; };
+  mcga = derive2 { name="mcga"; version="3.0.1"; sha256="0q0nn881lii8wfw28k8jh9z0kbi5ljcwi2wpq460k2w3agsjzw5n"; depends=[GA Rcpp]; };
+  mcgfa = derive2 { name="mcgfa"; version="1.0.0"; sha256="19q6lmrmbl3sh844n7mnl1r01bs8kgf0gghy4p4xmba1la0cb67k"; depends=[pgmm]; };
   mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; };
+  mcglm = derive2 { name="mcglm"; version="0.3.0"; sha256="1q2zc0xn4inp9inadb52yc0svbh581qxxjzc08pgrm9l3xms4a14"; depends=[assertthat Matrix]; };
   mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
+  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.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; };
-  mclust = derive2 { name="mclust"; version="5.1"; sha256="11hn3bdp6sl1l39v9c5afp6my11w2wxgqrbq0ahhll254va88sgd"; depends=[]; };
+  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=[]; };
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
-  mcmcse = derive2 { name="mcmcse"; version="1.1-2"; sha256="1nvq1phv9ldp928yh7n97lsak26ycj717sic1cc1s46wv2rhjx0h"; depends=[ellipse Rcpp RcppArmadillo]; };
+  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=[]; };
-  mcparallelDo = derive2 { name="mcparallelDo"; version="1.0.0"; sha256="17k284siffaslgijldl0j0civjhgnfzpxrahlvj22p8rf2vspdhs"; depends=[ArgumentCheck R_utils R6]; };
-  mcprofile = derive2 { name="mcprofile"; version="0.2-1"; sha256="0q1d236mcmgp5p5gl474myp1zz8cbxffd0kvsd8338jijalj05p0"; depends=[ggplot2 mvtnorm quadprog]; };
+  mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; };
+  mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; };
   mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; };
   mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; };
+  mctest = derive2 { name="mctest"; version="1.1"; sha256="0ck41xkrhfznzqqxk5yx5467ayd7wxqcjb6dzizbyz6dyjxbwm0n"; depends=[]; };
   md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; };
-  mda = derive2 { name="mda"; version="0.4-8"; sha256="1vb98zi0narqh2bwnjm33jnfzvgnaf1chh263xkgkpjb3ph0lvpd"; depends=[class]; };
-  mdatools = derive2 { name="mdatools"; version="0.7.0"; sha256="0b010nmldafb5ibm0wzn4hxsyhwkx5f0g79mbcfh8lsq9zprq9am"; depends=[]; };
+  mda = derive2 { name="mda"; version="0.4-9"; sha256="11gxgy4f3k03c4z6jpkzb4ynv0zl3k93b5s88ib8jjavzb95c95p"; depends=[class]; };
+  mdatools = derive2 { name="mdatools"; version="0.8.2"; sha256="11xlfgcn8gb19alfjp268mlid9g2rl69s1nlm5plwyy5h8x0hvcj"; depends=[]; };
   mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; };
-  mdhglm = derive2 { name="mdhglm"; version="1.2"; sha256="0k7y5j03i49m791m99vy0cal9w5nc38w18j1zq1zqdccpcndz9pj"; depends=[boot Matrix mvtnorm numDeriv]; };
-  mdscore = derive2 { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; };
+  mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; };
+  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]; };
+  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]; };
+  meanShiftR = derive2 { name="meanShiftR"; version="0.50"; sha256="0wb08x9vanwfzs7ijskl53118jvy3z48gqda7gn33aq82dkablza"; depends=[]; };
   measuRing = derive2 { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; };
-  meboot = derive2 { name="meboot"; version="1.4-6"; sha256="17wjvc375vnya1lhkj10nsn68k1j3zy036031qca3wxx6wqw9kzx"; depends=[dynlm nlme]; };
+  measurements = derive2 { name="measurements"; version="1.1.0"; sha256="1zi6mpwyxycbphq48s7vfc8gm76nidpa2gafp0jxiv56rwpv3jc3"; depends=[]; };
+  meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; };
   medSTC = derive2 { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
-  medflex = derive2 { name="medflex"; version="0.6-0"; sha256="1qwjs418i2wxmszgax4l859ihk2avlxwm5w0a772zi6gj0kqwk3d"; depends=[boot car Matrix multcomp sandwich]; };
+  medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; };
+  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=[]; };
   mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; };
-  mefa4 = derive2 { name="mefa4"; version="0.3-3"; sha256="1bb5m6hqs79jbs51crl8h73lwvfqnj99jqgagb0whpxg9yviffrn"; depends=[Matrix pbapply]; };
+  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]; };
   memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
-  memisc = derive2 { name="memisc"; version="0.99.6"; sha256="0pjcg0z4m1kr12cj1x1lm8snjldb2f1xp2sx0v6k7c1xdzmsxnmc"; depends=[lattice MASS]; };
+  memisc = derive2 { name="memisc"; version="0.99.8"; sha256="1wdh8qsf6n3zg5hkgjngnabbabi0kq31prcscm39kfiv3jmvh7pk"; depends=[lattice MASS]; };
+  memo = derive2 { name="memo"; version="1.0"; sha256="1pqlsn79gpm0d5bxnjg1c1gjaqdrdvcjvr84zpfk6nmsb2862w48"; depends=[digest]; };
   memoise = derive2 { name="memoise"; version="1.0.0"; sha256="0sq2dhpvxy17v1baj256r0jnygdy3m5a8x4zh6vhv29957qnq6zx"; depends=[digest]; };
-  memuse = derive2 { name="memuse"; version="2.5"; sha256="1a34803k41644yw1h3msywslsfjvnxi5c9yjw0b73znzy76wh6wv"; depends=[]; };
-  merTools = derive2 { name="merTools"; version="0.2.0"; sha256="146rskqzvmkvra5kvnfmn8r0g1jbbw16w9hxgzpa91xvq3bwz6qa"; depends=[abind arm blme broom DT ggplot2 lme4 mvtnorm plyr shiny]; };
+  memuse = derive2 { name="memuse"; version="3.0-1"; sha256="1fxjw209sjk9cfbbfw1ixnf2s8zzc73gnksxa9qax4mp6145i1w5"; depends=[]; };
+  merDeriv = derive2 { name="merDeriv"; version="0.1-1"; sha256="1bkpn4a4g9ps0wzrw77w0lj14h6rdpz1bicwqvv98316ggv0zkxw"; depends=[lme4 Matrix nonnest2 sandwich]; };
+  merTools = derive2 { name="merTools"; version="0.3.0"; sha256="1kc32zm1wmmivf1qfs6vi7y8kwibj6sr540is82dyh7xdmbc5mx3"; depends=[abind arm blme broom dplyr DT ggplot2 lme4 mvtnorm shiny]; };
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
-  metRology = derive2 { name="metRology"; version="0.9-17"; sha256="1g4gv3mpii71i6imfwqg9d5iwfx03bq4lizzhx7dy39b2mj7jd4q"; depends=[MASS numDeriv]; };
-  meta = derive2 { name="meta"; version="4.3-2"; sha256="0970snzclh83rz446m1r2bkfiylxx444z6bp7ah6lka488wmyck6"; depends=[]; };
-  meta4diag = derive2 { name="meta4diag"; version="1.0.20"; sha256="1x0s5jz1wnk7h9skxnyha8p0b77mfffn2y4i9sl7nr6rmkn7caj9"; depends=[cairoDevice RGtk2]; };
+  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=[]; };
+  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]; };
   metaMix = derive2 { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
   metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
-  metaSEM = derive2 { name="metaSEM"; version="0.9.6"; sha256="18ghgvpm915l5g0gq45r29zbh5k0gi8ygr4dcv7xn36r8b0zgc0r"; depends=[ellipse MASS Matrix OpenMx]; };
+  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]; };
-  metacom = derive2 { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools lattice vegan]; };
+  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.4"; sha256="14snpgdl8lwfh3fy63728jpxp6yjchq7i5sqfhzkfmrmy3kwgl22"; 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-8"; sha256="1wcryg32ln8prcxc0x1r0ms01c4mxd6vzhpb9bv9r2qpjjc7ixm7"; depends=[Matrix]; };
-  metafuse = derive2 { name="metafuse"; version="1.0-1"; sha256="0r64s0nqc75knk378ffhgk1y3i0j3k4ff0scya2p925ra18vfn9p"; depends=[glmnet MASS Matrix]; };
-  metagear = derive2 { name="metagear"; version="0.2"; sha256="02h7bzhijb9glzayin1wby4pkskfdav4m3grvrkz8iq9srnxskc5"; depends=[EBImage gWidgets gWidgetsRGtk2 MASS Matrix metafor stringr]; };
+  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]; };
   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.1.0"; sha256="0bdvfa6y6w8ybdnr0h414bzikkrdp4g5mrcsprzhxwim96j8imh6"; depends=[ggplot2 preprocomb reshape2]; };
+  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]; };
-  metansue = derive2 { name="metansue"; version="1.0"; sha256="1vcyvvysfz9frdy35g3p2hvndcdd4dk7kccwsgwzl7sl6ag73596"; depends=[]; };
-  metap = derive2 { name="metap"; version="0.6-2"; sha256="1j0k3pxr7qsmn4ldnl650nqv0si6l67gm4shx9mpswgsbpg3wkx4"; depends=[]; };
-  metaplus = derive2 { name="metaplus"; version="0.7-6"; sha256="15rngr7ckrykdzad46vanpmgsid14q574357i02pq8rqylk4s4h5"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
-  metasens = derive2 { name="metasens"; version="0.3-0"; sha256="1j955p5i116ggvd6nk0dp6r8qc0nh7v1iv48vaz7dds4m951lzyv"; depends=[meta]; };
+  metansue = derive2 { name="metansue"; version="1.2"; sha256="0gcysmi4lvl4496vygc7v58pd4sgz013mr8nqb870s861jwjj31v"; depends=[]; };
+  metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; };
+  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=[]; };
-  meteR = derive2 { name="meteR"; version="1.1"; sha256="0b41a6v7w3n06dyz81v5zhh1ncqx3lascdl5lrwbdjxypcdjv0cf"; depends=[distr nleqslv]; };
+  metavcov = derive2 { name="metavcov"; version="0.1"; sha256="0d57gn802cnpmvyxkczmqafllglzgw17jn4rpj659s16qh0fz4j2"; 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.49"; sha256="0h3qb7srfmv4bl207arz6x3q64bh5pb0pc49lgrnplcjwwxk78bs"; depends=[raster sp XML zoo]; };
+  meteoForecast = derive2 { name="meteoForecast"; version="0.50"; sha256="19yzfvaj4h5l70j54nlivq5dvp5psp43y5d2l978ai6pwvmi291a"; 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]; };
+  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.1.1"; sha256="1myqcds9glsy3fwzr7v711xzk7gmvy2cb4x3qgj1kxa90d1d50hz"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
-  mev = derive2 { name="mev"; version="1.6.1"; sha256="09n6vhga6h4k3iqwxrbr9ba2jh8rwnydsnrgq61iwndz0bqd24ig"; depends=[evd ismev Rcpp RcppArmadillo]; };
+  mets = derive2 { name="mets"; version="1.2"; sha256="078g04bj3ipwz3cw5wkz0gvj1dmd5vxygkwpz4pymg0r9svy2yf2"; 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]; };
+  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]; };
-  mgcv = derive2 { name="mgcv"; version="1.8-12"; sha256="1khzy36nn6xbnzqfc2953ng0sv8w91mns1ymhibaqn1150x1qid0"; depends=[Matrix nlme]; };
+  mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
+  mgcv = derive2 { name="mgcv"; version="1.8-17"; sha256="1zj223l4a3j15d3c01wv7dkzn9w6084gxrq5600ck9rvr0lfpwwg"; depends=[Matrix nlme]; };
+  mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; };
   mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
-  mgm = derive2 { name="mgm"; version="1.1-4"; sha256="02m1ihi9m9x9m0jqwgp67k9f9lnq76cskx77wxzy69nbl1d91xh7"; depends=[glmnet matrixcalc Rcpp]; };
+  mgm = derive2 { name="mgm"; version="1.1-7"; sha256="01srb1fb3ndfh1jimrdvf35g3f25jddij0sdi3n2d7gm4x8s0h24"; depends=[glmnet matrixcalc Rcpp]; };
   mgpd = derive2 { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[corpcor evd fields numDeriv]; };
   mgraph = derive2 { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
   mhde = derive2 { name="mhde"; version="1.0-1"; sha256="1q7lbj2is024f5rmfpdn3a0hsb78bf62ddal3chhnh3bi1z3jrjk"; depends=[]; };
-  mhsmm = derive2 { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; };
+  mhsmm = derive2 { name="mhsmm"; version="0.4.16"; sha256="009dj0zkj1zry7jr9hf4cknb686z50a2l967if64xm0dvjmp7dgs"; depends=[mvtnorm]; };
   mht = derive2 { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
-  mhurdle = derive2 { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula maxLik pbivnorm truncreg]; };
+  mhtboot = derive2 { name="mhtboot"; version="1.3.3"; sha256="1z0p8ny9lpnrshgas7cad2lv7j0blw0n6ihiimw600n70h73jwrn"; depends=[ggplot2 reshape2]; };
+  mhurdle = derive2 { name="mhurdle"; version="1.1-7"; sha256="06ph0vbm7yk5388v2aww6nmi2rhjhfjj1hl506a41m5k6hf746pk"; depends=[Formula maxLik survival texreg truncreg]; };
   mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; };
   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=[]; };
@@ -5456,95 +6813,113 @@ in with self; {
   micEconAids = derive2 { name="micEconAids"; version="0.6-16"; sha256="07hsabrlkwpdaalh0b7izraz2q5dlxn373ccijc5c4zsrkgk7kij"; depends=[lmtest micEcon miscTools systemfit]; };
   micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; };
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
-  mice = derive2 { name="mice"; version="2.25"; sha256="1c6xjvqy3w5lqbs4k22vb3x3an4ss22zpp2zigwhnm1y9mphg06x"; depends=[lattice MASS nnet Rcpp rpart survival]; };
-  miceadds = derive2 { name="miceadds"; version="1.7-8"; sha256="0f7vh96q9xp9v5hbb15bvm3825kl51zz582rd98d4kgd7nk4896a"; depends=[bayesm car foreign grouped Hmisc inline lme4 MASS MBESS MCMCglmm mice mitools multiwayvcov mvtnorm pls Rcpp RcppArmadillo sirt sjmisc TAM]; };
+  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]; };
+  micompr = derive2 { name="micompr"; version="1.0.1"; sha256="1380x9jp5lpc6n6bjvhmkwlb59ch7q59r3bc6f0i5j2kpaairbc4"; depends=[]; };
   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]; };
+  microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; };
   micromap = derive2 { name="micromap"; version="1.9.2"; sha256="1x4v0ibbpfz471dp46agib27i4svs8wyy93ldriryvhpa2w5948y"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
-  micromapST = derive2 { name="micromapST"; version="1.0.5"; sha256="1n9mzyl5dj21165j0j99brkqq7c54j3cg6r21ifdzffj2dx29wh0"; depends=[RColorBrewer]; };
-  micropan = derive2 { name="micropan"; version="1.0"; sha256="0qnxm6z2pk1wibchj6rhn3hld77dzl5qgvzl4v9n16ywlgdv09ai"; depends=[igraph]; };
-  midasr = derive2 { name="midasr"; version="0.5"; sha256="1w3rxsxkcjy30sjxv4cxvqzfw7k278s6mrrjm4pbz7cydbiws2vp"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
+  micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; };
+  micropan = derive2 { name="micropan"; version="1.1.2"; sha256="0rvaampr5vlpz253lhy330380646g2vqj1hqp6gsk0gp0hdlkd7g"; depends=[igraph microseq]; };
+  microplot = derive2 { name="microplot"; version="1.0-16"; sha256="144rj86lkjkmwlqwlwmnagvlknhg0wg92kabpfpz2w0swfhfa742"; depends=[Hmisc]; };
+  microseq = derive2 { name="microseq"; version="1.2"; sha256="14w1fycw0jgrc5g0ygks9j28hy37li057qf097qnp18w05jk3hws"; depends=[Rcpp]; };
+  midasr = derive2 { name="midasr"; version="0.6"; sha256="1sg6m36jg3b6znfg97ln5a6b4z36xkyjvgxk7wmqdq3h528z8613"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
   midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; };
-  midrangeMCP = derive2 { name="midrangeMCP"; version="1.1"; sha256="0ripx7ydvbs3b5g6k2q7nnmrzq9i1wfa6whc536q5wimfd0gzlkg"; depends=[SMR WriteXLS xtable]; };
-  migest = derive2 { name="migest"; version="1.7.1"; sha256="0xxca4ww13ml4pvdc688pp7vikwgyp8mz5czw896mh37z8lhdvvj"; depends=[]; };
+  midrangeMCP = derive2 { name="midrangeMCP"; version="1.3"; sha256="1733dlhzbgrjdzd88rh9dkqhxh05gr078sbmihab7whbrpsq8068"; depends=[SMR WriteXLS xtable]; };
+  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]; };
-  mime = derive2 { name="mime"; version="0.4"; sha256="145cdcg252w2zsq67dmvmsqka60msfp7agymlxs3gl3ihgiwg46p"; depends=[]; };
+  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]; };
   minerva = derive2 { name="minerva"; version="1.4.5"; sha256="0k6hyfh1lr345718vl1ssqgm5567nylk158awygmbjgkv8g8v2av"; depends=[]; };
-  miniCRAN = derive2 { name="miniCRAN"; version="0.2.4"; sha256="1p8kypq0r4sckvdq7qfznfjp3mpjy3cvm9dnwpdfn4dnl4n377z0"; depends=[httr XML]; };
+  miniCRAN = derive2 { name="miniCRAN"; version="0.2.7"; sha256="0ijvsc0aqhcyy5fmxjh7ks4f40l5hm3p485x80a475bmjrh9g15w"; depends=[httr XML]; };
   miniGUI = derive2 { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
   miniUI = derive2 { name="miniUI"; version="0.1.1"; sha256="1qfca55phw6614qh5ligvqawpyvpb08x7ky44sffwxgff4h074lw"; depends=[htmltools shiny]; };
+  minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; };
   minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; };
   minimax = derive2 { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
+  minimaxdesign = derive2 { name="minimaxdesign"; version="0.1.1"; sha256="0rclwfqpj262krghjcmq79fb2m2syb39jxk048ll98a58bz103dp"; depends=[DiceDesign doParallel doSNOW foreach gtools MaxPro nloptr randtoolbox Rcpp RcppArmadillo]; };
   minimist = derive2 { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; };
-  minpack_lm = derive2 { name="minpack.lm"; version="1.2-0"; sha256="0h8grkwkm2w0jl9fl5kma3b6p1n76gm42qbsyrnhr7pwsxx4qwgr"; depends=[]; };
+  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.2"; sha256="1hjj24vpnva130bfxn8dczhfn30rcgichi25y77rgaw3z58hm39n"; depends=[]; };
+  minval = derive2 { name="minval"; version="0.5"; sha256="1pbcfcaysaicppkzvnllvvx2jykc17nk3331n0rl41x56jxcjsgd"; depends=[gdata XML]; };
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-  mipfp = derive2 { name="mipfp"; version="2.2.1"; sha256="0i69pbwszwqgc7wyfvnwgbp73dw0vg0pf692wyiwjkqvyfdrqa40"; depends=[cmm numDeriv Rsolnp]; };
-  mirt = derive2 { name="mirt"; version="1.16"; sha256="1lafpm7fizvvyv2f5gyabj1chl0vdf3q0bv77swz2cxjvlznc9aw"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
-  mirtCAT = derive2 { name="mirtCAT"; version="0.8"; sha256="077pcirvvvqh0fsgna5r4dhqvyfv8hp7bfn6c8cgfi8wgbisa634"; depends=[lattice markdown mirt Rcpp RcppArmadillo shiny]; };
+  mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; };
+  mirt = derive2 { name="mirt"; version="1.22"; sha256="0jzxmj2a0kq0xylsxrkd6j9rzvy3y0qkl823pb84mc3zv2jwnjrx"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
+  mirtCAT = derive2 { name="mirtCAT"; version="1.3"; sha256="00zmli79ll313qjjl0j28ibxdjn41zfgwx43cg9mzzm6ayiz26ci"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
-  miscF = derive2 { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo]; };
-  miscFuncs = derive2 { name="miscFuncs"; version="1.2-7"; sha256="1cnhd23fi6akr3fsr2b85s5cn36ksy4h3c4iyyjqcpc49wa819d0"; depends=[mvtnorm roxygen2]; };
-  miscTools = derive2 { name="miscTools"; version="0.6-16"; sha256="19mslb64lm8srrmml1v40rfkxhqw02bplw0yjv7qnkqj44hcqfw1"; depends=[]; };
+  miscF = derive2 { name="miscF"; version="0.1-3"; sha256="1djmsffwkicj25ndg07dnid6qj66b1rdw0yrv79jakjfbv71c13i"; depends=[BayesBridge BRugs MASS MCMCpack mvtnorm R2jags Rcpp RcppArmadillo]; };
+  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]; };
   miscset = derive2 { name="miscset"; version="1.0.0"; sha256="0m6gv2w8fj1604wrmcdgz6dpmpkz7j3sppda11klsx0hv1xqr2af"; depends=[ggplot2 gridExtra Rcpp xtable]; };
-  missDeaths = derive2 { name="missDeaths"; version="1.2"; sha256="0lamxws1qqafz1mqdrzmq6jjn490z8zd63w4mzyb5nwwlxbmy6v8"; depends=[cmprsk mitools Rcpp relsurv rms survival]; };
+  mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; };
+  misreport = derive2 { name="misreport"; version="0.1.0"; sha256="1nys59bik6cnrpdh1azp2y9k201y326hbf5jzv2kilh34p57ilfs"; 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.9"; sha256="1g8b37cjaya1g5hkqwjgamnh4jfsqw90453yxh3jnvdw7irl4vsm"; depends=[FactoMineR mice mvtnorm]; };
-  mistat = derive2 { name="mistat"; version="1.0-3"; sha256="12fykqkcqfxn8m8wwpw69f7h2f24c5yhg4fw50jsifhcj40kk29q"; depends=[]; };
-  mistral = derive2 { name="mistral"; version="2.0.1"; sha256="037jp2p8h29by5a1gmm6irlsgz72rqi4zfbfjhk1c1gfk2fr3dfb"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
-  mitml = derive2 { name="mitml"; version="0.3-0"; sha256="1vk2y48mcvm6f7vr4m8y726ygi8d1zf70jz6yy8i91gzakmsrr4x"; depends=[haven jomo pan]; };
+  missMDA = derive2 { name="missMDA"; version="1.10"; sha256="1wqb5badqcs6yj2c7llbhbssdzg0irjzfcjasfrq1zg0lk82zafj"; 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]; };
   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.2"; sha256="0z96ddlvkpr4y2chi929ik81snsr0f03a0k4cnh0q1lx0lr51p1z"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
-  mixOmics = derive2 { name="mixOmics"; version="5.2.0"; sha256="0s7g09b0pdfzc255sicpvkac2c28yhvipf6284qbpgrr80qc9s5p"; depends=[corpcor ellipse ggplot2 igraph lattice MASS rgl]; };
+  mixAK = derive2 { name="mixAK"; version="4.4"; sha256="0aj1x80kxwksn7as6lfncl6ar218hnbcs8vbxwiqp1lh4il74iiq"; depends=[coda colorspace fastGHQuad lme4 mnormt]; };
+  mixOmics = derive2 { name="mixOmics"; version="6.1.1"; sha256="0wdl5g0455whlf331j77c0d9vk6qyb03basy5b7svz3zrg15q2qa"; 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]; };
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
   mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
   mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
   mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; };
+  mixedsde = derive2 { name="mixedsde"; version="2.0"; sha256="04ljpy2vyqyin9b1zn0awp43c33ch6zsgdrp6whii1ql9pcinkcl"; depends=[MASS moments plot3D sde]; };
   mixer = derive2 { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
-  mixexp = derive2 { name="mixexp"; version="1.2.3"; sha256="1cywqqiap4czni2jlcfyh6l6sn6v6wb2bzkfavbg2h6f5xc3ljnn"; depends=[daewr gdata lattice]; };
-  mixlm = derive2 { name="mixlm"; version="1.1.1"; sha256="1ffrkfksli9zwk5cdjc1q7xqvmwbpkxjbzrbpvj1ays9yrhvgkxb"; depends=[car leaps lme4 multcomp pls pracma]; };
+  mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; };
+  mixlink = derive2 { name="mixlink"; version="0.1.4"; sha256="138q48k9bz7dc18fdi6g7ra10b08avwa7xnvw7i8f1fdjk6h2zpc"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
+  mixlm = derive2 { name="mixlm"; version="1.1.5"; sha256="17ph8a7p9jq7529vvbxb77m6hwscwgamzsm6a9v71cvqkvc5lkmr"; depends=[car leaps lme4 multcomp pls pracma]; };
   mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; };
-  mixpack = derive2 { name="mixpack"; version="0.3.4"; sha256="0d28yxxm8rcb8l9nzpaviz4gxm690f88d3z21sc3qg02qdh3xqk0"; depends=[mvtnorm Rcpp RcppArmadillo]; };
+  mixpack = derive2 { name="mixpack"; version="0.3.6"; sha256="0q19mal86qlriwilabgy3sn33iymi5hl3wa33kvb8cd1dgdmjr7a"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   mixreg = derive2 { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
-  mixsmsn = derive2 { name="mixsmsn"; version="1.1-1"; sha256="0n2iib0kpnsgz2k761myjqy2zsw0yrygpamxgm90cvngvxvkmkhc"; depends=[mvtnorm]; };
+  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]; };
-  mixtox = derive2 { name="mixtox"; version="1.2"; sha256="0yw3zvgxmrwcnps9zws87z9p4jk8gblr0giwh9298ngpcv4dd3rs"; depends=[nls2]; };
+  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]; };
   mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
-  mkin = derive2 { name="mkin"; version="0.9-41"; sha256="02vndwaypvc61zry3w7s8av53ha1bkb19rgkm235znh16sgjdwbd"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
+  mkin = derive2 { name="mkin"; version="0.9.45"; sha256="0p47xaxyakah4qwkymzc4qvs9i9g764laikw9vlmjyjv0j0zn9cx"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
   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.1.0"; sha256="0xychak3xdqnsl9z1ifi0niqsrdc10f6frl6zg162mzpil33wp3g"; depends=[arm lme4 plyr qgraph]; };
+  mlVAR = derive2 { name="mlVAR"; version="0.3.2"; sha256="07jxggh5qds0b7by61m1xiyx3lxffpgzl3knk97q8fafw46dg1r4"; 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=[]; };
+  mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
   mlegp = derive2 { name="mlegp"; version="3.1.4"; sha256="1932544irhzhf6a8rjyh66j57h9awlhwd6xam603bamfg106cmg2"; depends=[]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
   mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
   mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
   mlmRev = derive2 { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; };
-  mlma = derive2 { name="mlma"; version="2.0-0"; sha256="1wkkvbix1sycaxss4hy1y6k8r5wm1s38fbjis07slr8hpkvskmv6"; depends=[lme4]; };
+  mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; };
+  mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; };
   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.8"; sha256="1826lvnz5z9j7im66m8hg6dzrjipyygylhj0whyrskjsgz98wili"; depends=[BBmisc checkmate ggplot2 ggvis parallelMap ParamHelpers plyr reshape2 shiny survival]; };
+  mlr = derive2 { name="mlr"; version="2.10"; sha256="1brylz7x10wyi0k4cdh9qkjv73yz8g67ib8flzw9dcd9i15ppgbv"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
-  mlt = derive2 { name="mlt"; version="0.0-30"; sha256="0r4xfjlyrixs9mjbgag72qkv7nqf9vq2qy8drdfybwg69d763wap"; depends=[basefun BB numDeriv quadprog sandwich variables]; };
-  mlt_docreg = derive2 { name="mlt.docreg"; version="0.0-30"; sha256="1gbidyjq0bdg5mmlx6aivlm1j22ddwlc1q6r7h3pq6ri7yzmmaxw"; depends=[mlt numDeriv]; };
-  mlxR = derive2 { name="mlxR"; version="2.2.0"; sha256="1ca0vfky45gvr2rqbgli79v1mqhi0d8mpd220xxs1p6xlwbyvn0m"; depends=[ggplot2 Rcpp XML]; };
-  mma = derive2 { name="mma"; version="2.0-4"; sha256="1c8jbgb3nsrfrdbbj85qkabz497qrwvk6ddzxm985hq50kfpbxv0"; depends=[gbm]; };
-  mmand = derive2 { name="mmand"; version="1.3.0"; sha256="134fqkdysxdg7r7syv0d3yffvmgdjhm91ywh39i955ldprbh4qbv"; depends=[Rcpp RcppEigen reportr]; };
+  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]; };
+  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]; };
+  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]; };
   mmcm = derive2 { name="mmcm"; version="1.2-6"; sha256="0lk2lk8j4hq6shw3vpq53gvh2w1gwkayvgfny4i04k5fglbwivg7"; depends=[mvtnorm]; };
@@ -5554,13 +6929,18 @@ in with self; {
   mmeta = derive2 { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4kxs9ylhscd06j31h504c1w96ddf"; depends=[aod HI]; };
   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.1"; sha256="1srk46m95kh0y25nw53z671dd7zbmrfnfn7gmhnzxvc6dq0wvshh"; depends=[adegenet pegas]; };
+  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]; };
   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]; };
-  mnlogit = derive2 { name="mnlogit"; version="1.2.4"; sha256="0s7pp3qflnscs0z9fjvnl6rh5j92jnpksqli65gmrqwbqp3md8i8"; depends=[Formula lmtest mlogit]; };
+  mnis = derive2 { name="mnis"; version="0.2.1"; sha256="0jacjwz68667k5066v6lv1dhw946mjnvff53j2l8vdsxzm34hbc6"; depends=[httr jsonlite plyr]; };
+  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-4"; sha256="0dr8lm1yjh5rwfjn8bjpxaklcym7alqda0nwrjmp6pvqf09wmvl8"; depends=[]; };
+  mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; };
+  mockery = derive2 { name="mockery"; version="0.3.0"; sha256="1ydgxqdzwn68b84a7557nasgm1r5jk2mivzwq9x71p7zwqf4c8vd"; depends=[testthat]; };
+  mod09nrt = derive2 { name="mod09nrt"; version="0.14"; sha256="1wn1y33bj9r712l0f063j5gcl423anjzmvgfy0ddihcrbpz4l7a0"; depends=[]; };
+  modEvA = derive2 { name="modEvA"; version="1.3.2"; sha256="0p41fl0k780rx1vmq9laknz01ar6507sj8ss8kphrqkjnymsi2a0"; depends=[]; };
   modMax = derive2 { name="modMax"; version="1.1"; sha256="1mx4623az7vzaqf530pklx7j92qwwq93pa2416lnr24jjcxgva2h"; depends=[gtools igraph]; };
   modQR = derive2 { name="modQR"; version="0.1.1"; sha256="1dc04wrax73f6fzkl6ycsa3wzf5347h79ah3vy3m24f4hjncnffw"; depends=[geometry lpSolve]; };
   modTempEff = derive2 { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
@@ -5568,116 +6948,141 @@ in with self; {
   modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; };
   modelObj = derive2 { name="modelObj"; version="1.0"; sha256="0r4smak9hni9pzih4nzkpv3bq18acrsmmxs1a13wq3pgjfvkwa63"; depends=[]; };
   modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; };
+  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=[]; };
   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.3.0"; sha256="0xbkzjs2960p92k0qx7gi7wgiwqvr76bwa75csxghjr79w41yr4q"; depends=[aoos stringr]; };
+  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]; };
   mogavs = derive2 { name="mogavs"; version="1.0.1"; sha256="1bzjrcisbg0fb8kj8x9ngd9i1nrhif1rdacz6nrny6xrmw0m3ckp"; depends=[cvTools]; };
-  mokken = derive2 { name="mokken"; version="2.7.7"; sha256="1v0khh1bb2h7j2x54mdw8vqlimhw25r2ps89hw4l88qfaz05ir77"; depends=[poLCA]; };
-  molaR = derive2 { name="molaR"; version="2.1"; sha256="1425m138vsx42hp8kfa93ac5y0hs7zzb8lr4nmxx9jbbrva11lfp"; depends=[alphahull geomorph psych rgl Rvcg]; };
-  mombf = derive2 { name="mombf"; version="1.6.1"; sha256="16agh7lclkx3709cll3mgnm4bby8m5sscizblw1m5hjmld4d4mjm"; depends=[actuar mgcv mvtnorm ncvreg survival]; };
-  momentchi2 = derive2 { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; };
+  mokken = derive2 { name="mokken"; version="2.8.4"; sha256="1c3jjsbs8wp2z701y9qmr6v6q90achlchpbfwf31skj6bg2y85zm"; 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]; };
+  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="0.8.1"; sha256="103flzk27vb69m02d7v7xp67yvzprffqmz7kha07vb9wya5xrlrr"; depends=[jsonlite]; };
-  monitoR = derive2 { name="monitoR"; version="1.0.4"; sha256="1ai99lim84nc14ls2jlfflvqm67bgaqb373k9wah83gpq35wdksc"; depends=[tuneR]; };
+  mongolite = derive2 { name="mongolite"; version="0.9.1"; sha256="1hy36bh9klhdj2yxr3b2rl101lsgfgw61l5zn08brvvh04zvfv31"; 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=[]; };
   monogeneaGM = derive2 { name="monogeneaGM"; version="1.1"; sha256="0fbz26jx05xmna799s086khy6j8xbvv91vh544npd49isnag1v6v"; depends=[ape circular cluster geomorph gplots phytools rgl]; };
-  monographaR = derive2 { name="monographaR"; version="1.01"; sha256="1qrgdbwj9y0glhb74l6smhf1g387dq0n3hf06irysxb7a3ypvkki"; depends=[circular maptools png raster rmarkdown sp]; };
-  monomvn = derive2 { name="monomvn"; version="1.9-6"; sha256="1iisnwgqkh2svrmzd8r4qh8jm4l664ws795jkp3dgx0dadxjqhj6"; depends=[lars MASS mvtnorm pls quadprog]; };
+  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]; };
   monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
   moonBook = derive2 { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; };
   moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
   mopsocd = derive2 { name="mopsocd"; version="0.5.1"; sha256="10hssnm1afqmxa9kw6ifqnz3p3yyjrmxgi98zlj31a5g4nis8wb1"; depends=[]; };
   morgenstemning = derive2 { name="morgenstemning"; version="1.0"; sha256="17y90cf8ajmkfwla0hm4jgkbkd1mxnym63ph2468sfxkhn0r3v88"; depends=[]; };
-  morse = derive2 { name="morse"; version="2.1.1"; sha256="1l2rgkjvpdsz8cqqppgd5565mz4dgl7w5wcdgrkm1hy493989069"; depends=[coda dplyr ggplot2 gridExtra rjags stringr]; };
-  mosaic = derive2 { name="mosaic"; version="0.13.0"; sha256="0rf88124rcc191rr9y3kawakh0b9f94203nllxyr3a4mb4lkk4vk"; depends=[car dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS mosaicData readr reshape2]; };
-  mosaicData = derive2 { name="mosaicData"; version="0.13.0"; sha256="19f35674accaqs6yqqyn9y8ggj1qhz5w3na0815768mlb91gy2j8"; depends=[]; };
-  moult = derive2 { name="moult"; version="1.4"; sha256="0nglf7wijp2v66fpyh88glbn1glp8vvkbvpc1g6136bg6ahbbkkl"; depends=[Formula Matrix]; };
+  morse = derive2 { name="morse"; version="2.2.0"; sha256="0l52hwhbspf1d6wi0qnwgwjjc1kkixkfdsf81jvwshnxbci4s3kw"; depends=[coda dplyr epitools ggplot2 gridExtra reshape2 rjags stringr]; };
+  mosaic = derive2 { name="mosaic"; version="0.14.4"; sha256="0dvlykr05jjpnjcvkffmjpc83bnbvg7i5zkjr2y1c7h16hy9d5wz"; depends=[dplyr ggdendro ggplot2 gridExtra lattice latticeExtra lazyeval MASS Matrix mosaicData readr tidyr]; };
+  mosaicData = derive2 { name="mosaicData"; version="0.14.0"; sha256="0f092wp2lpj8rk6r2bd5mxp4q3n7ia9h838z8prrz56vwh3gbpw0"; depends=[]; };
+  mosaicQA = derive2 { name="mosaicQA"; version="1.2.0"; sha256="0ddgvvw679pg7lixyxqxqi8pzyy03w6h4z5cas09m2m16nz2nr2f"; depends=[gplots psych]; };
+  moult = derive2 { name="moult"; version="2.0.0"; sha256="177fhi3f5qsg2k4qb1cgviq96aln80qwri1hf9yym6wrzn8crj7r"; depends=[Formula Matrix]; };
   mountainplot = derive2 { name="mountainplot"; version="1.1"; sha256="1l3m7jgq70g83mmfhlwzj5gkdnwgl14g9ljpk6j7z7qxapzva3bb"; depends=[lattice]; };
   mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; };
-  mousetrap = derive2 { name="mousetrap"; version="1.0.0"; sha256="1zmgf2adhzrdpmh5hx44z8wyjrkg9s3qjcwh18ljiivn8i7fgs7n"; depends=[diptest ggplot2 pracma psych reshape2 scales]; };
-  movMF = derive2 { name="movMF"; version="0.2-0"; sha256="1p9ay7w93gyx4janw23iwg2j0wkvnvzalaa20n1rlahhmh327g7i"; depends=[clue skmeans slam]; };
-  move = derive2 { name="move"; version="1.6.541"; sha256="13dil2avb7mf45qxrgwbl56ll0zbz007hz74crjlc045x24b0nlx"; depends=[geosphere httr raster rgdal sp]; };
-  moveHMM = derive2 { name="moveHMM"; version="1.1"; sha256="05za2lb7s0kvvzm8a85qm3wf0qi3wvs9x5mwir8k5bhj1kav2imp"; depends=[boot CircStats MASS Rcpp RcppArmadillo sp]; };
-  mp = derive2 { name="mp"; version="0.3.1"; sha256="0hwn0dg0k7nhl0jv680q5z9v46mfknndp5xswyl5chkw4ppmnyf2"; depends=[Rcpp RcppArmadillo]; };
+  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]; };
+  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]; };
   mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; };
-  mpath = derive2 { name="mpath"; version="0.2-1"; sha256="1419grr2baqw0m5fv17pcrxxwbax91savnzrg98b7xrs9cqnq97y"; depends=[doParallel foreach glmnet MASS numDeriv pscl]; };
+  mpath = derive2 { name="mpath"; version="0.2-4"; sha256="0razmc8cvalcv6ibkfh2snc6vyiwl20zpawx0yp261qhn8gkr5js"; depends=[doParallel foreach glmnet MASS numDeriv pscl]; };
   mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; };
   mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; };
+  mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; };
   mph = derive2 { name="mph"; version="0.9"; sha256="11wcy23sv8x7aq6ky8wi0cq55yhjkkm9hn672qy803dwzzxv5y61"; depends=[]; };
-  mplot = derive2 { name="mplot"; version="0.7.7"; sha256="052idykpv2362mmqvf9zcr1s383hjfgigwhhdxn9a4azdf8djzh0"; depends=[bestglm doParallel foreach glmnet googleVis leaps plyr shiny shinydashboard]; };
+  mplot = derive2 { name="mplot"; version="0.7.9"; sha256="10syv0wibqyzgjhkya2chpb2izhk2b6aibj5wvgypvr7zyjhd5f8"; depends=[bestglm doParallel dplyr foreach ggplot2 glmnet glmulti googleVis leaps plyr reshape2 scales shiny shinydashboard]; };
   mpm = derive2 { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; };
   mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-3"; sha256="0qgzsh744002whh3v1hrxs1i0xnk9zgfgkdgx2f0ffj00vvnwr97"; depends=[vegan]; };
-  mpmi = derive2 { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd4ffrddafdlbw16kr8jy0c8fdn"; depends=[KernSmooth]; };
-  mpoly = derive2 { name="mpoly"; version="1.0.0"; sha256="1y8hx97hxhfsik4sikdlmrp2p05xywjqw1fx77rb1s6j97k3kbnk"; depends=[ggplot2 orthopolynom partitions plyr polynom reshape2 rJava rjson rJython rSymPy stringr]; };
+  mpmi = derive2 { name="mpmi"; version="0.42"; sha256="1j7xsgz3pgbb7a4ykrcj22isbi5svqsxcckai05q7b401h1ppsnh"; depends=[KernSmooth]; };
+  mpoly = derive2 { name="mpoly"; version="1.0.3"; sha256="1wcpr7dps1cnl3x46703an9cjb3srz62wvafdsj2i0dazs6dq4sa"; depends=[ggplot2 orthopolynom partitions plyr polynom stringr tidyr]; };
   mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; };
-  mpt = derive2 { name="mpt"; version="0.5-2"; sha256="16rrcy8hy9fw603pbi9wybnql11w0bxlxi1kxx482khg9fj7lwn0"; depends=[]; };
+  mpr = derive2 { name="mpr"; version="1.0.4"; sha256="13fqvndwxzqa1safa43ad90pkiqnpqmgr0pkwp8lwmnxqmrmj0jb"; depends=[survival]; };
+  mpt = derive2 { name="mpt"; version="0.5-4"; sha256="01akz72z6z5ybzika120v4v6ah13hfynh98rzbmqgbchijxbbkz6"; depends=[]; };
   mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; };
-  mrMLM = derive2 { name="mrMLM"; version="1.1"; sha256="0gcn43vjy4mjchklwpmda1r2pbnga6gadcw3fllv7483jjrk4g80"; depends=[gWidgets gWidgetsRGtk2 qqman RGtk2 RGtk2Extras]; };
+  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]; };
-  mrds = derive2 { name="mrds"; version="2.1.14"; sha256="0lvr9zqyi45a100w31k228b03plna24rzgamsvfa34inyd8q4y9m"; depends=[mgcv numDeriv optimx Rsolnp]; };
+  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]; };
   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]; };
-  ms_sev = derive2 { name="ms.sev"; version="1.0.2"; sha256="169z9x8jv06rv1b3qh4nynzwq5zhqq3j5r6k1azygsc2wzpzm039"; depends=[]; };
-  msBP = derive2 { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; };
+  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.1.0"; sha256="0krfass51686ki4wv8nj3kipgsv1v3rs5n6wcdyyqyd1ni8j7mr2"; depends=[ape htmlwidgets]; };
+  msaenet = derive2 { name="msaenet"; version="2.4"; sha256="045f38fzlxsawsssyvp7122dc44hvzyha05js7xzb5zg1pq0i1qv"; 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.2.0"; sha256="1k1kmgz8h5irdfjja0gcig2z6icwzcnzv1z9l0halcpfb1b2n36f"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
+  msgl = derive2 { name="msgl"; version="2.3.5"; sha256="0lihvgh86r3swfma6msjbsmfc14b1p1h16v6pkd53v5q3dp4asld"; 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=[]; };
-  msir = derive2 { name="msir"; version="1.3"; sha256="0d7zxjmhr1ri3qz3fdkf56fi5dz2p9lb2vyqccrpn7js2ibkqhpl"; depends=[mclust]; };
+  msgtools = derive2 { name="msgtools"; version="0.2.4"; sha256="1m0a6f2q23jm4nl6sp1ympqkiv478q8hgdn5wjfg6gx0nij29jmk"; depends=[devtools digest hunspell poio tibble]; };
+  msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
-  msm = derive2 { name="msm"; version="1.6.1"; sha256="192s01amh5q0z65ik2vsika9x81iqjjqabr3jczm5app0phx9i72"; depends=[expm mvtnorm survival]; };
+  msm = derive2 { name="msm"; version="1.6.4"; sha256="0h0h9cgavpylbj9692750if1hw7qylhsad549fqjx5l0zqbh3zhy"; depends=[expm mvtnorm survival]; };
   msma = derive2 { name="msma"; version="0.7"; sha256="0rrxxva71j8gk25hi6hycnyrhrdc0skcaj1bnmh029cqhjl3qma5"; depends=[mvtnorm]; };
   msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; };
+  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]; };
-  mstate = derive2 { name="mstate"; version="0.2.9"; sha256="0yp7dfbp711if1n32hmz56ycn0f1bblhajf0w04mw8yicad7ri7n"; depends=[RColorBrewer survival]; };
-  mtconnectR = derive2 { name="mtconnectR"; version="0.2.0"; sha256="0gznqcgm5zrmww3zwb09rgfn3fhzj62a4q8c1jd3833vnlikbalj"; depends=[data_table dplyr plyr stringr XML]; };
+  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]; };
   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=[]; };
   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-4"; sha256="0mrsnppljxrh5myjh41ba0yvr0yq7dlrcm9xk0b4gk4v7m3b50rx"; depends=[codetools mvtnorm sandwich survival TH_data]; };
+  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=[]; };
   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]; };
+  multiDimBio = derive2 { name="multiDimBio"; version="1.1.1"; sha256="0b0lymnli7w91bfd67dsvzbj3flxsrsmbg4a18mzch0j9y6a40x0"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; };
   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-9"; sha256="0afk95ymvz21klxgf51iw6g0k0w65flralqm5nalkdpirrqjbydx"; depends=[Rcpp]; };
+  multicool = derive2 { name="multicool"; version="0.1-10"; sha256="1ybg9piya9psqg42w9i3zsnavbxhkfklfwl7cb420i5nkq6wpc2v"; depends=[Rcpp]; };
   multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; };
+  multigraph = derive2 { name="multigraph"; version="0.50"; sha256="033cxgl1gixrdyyyp7i1hsgf7jjhrn2lnxhp4rq0bnlxg5hgqx8h"; depends=[multiplex]; };
   multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
-  multilevel = derive2 { name="multilevel"; version="2.5"; sha256="0pzv5xc8p6cpzzv9iq3a3ib1dcan445mm12whf3d6qkz2k4778g6"; depends=[MASS nlme]; };
+  multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; };
   multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
-  multimark = derive2 { name="multimark"; version="1.3.2"; sha256="1x2k7nm46mllja8pcf41gws0xfyj27m2fsli5zwk2s2i0c7jwqnj"; depends=[Brobdingnag coda Matrix mvtnorm RMark statmod]; };
+  multimark = derive2 { name="multimark"; version="2.0.0"; sha256="0pz0qd1dbblnbazlrkarqbw3y7qhvrrvdi6g3ch8qgkxjkmdxlwj"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; };
   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]; };
-  multipleNCC = derive2 { name="multipleNCC"; version="1.2"; sha256="12lakxnmcsrrxc52f9p9yrszn7l2iqs6sacf5mz3hpm6h04vlrlp"; depends=[mgcv survival]; };
+  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]; };
+  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]; };
   multipol = derive2 { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
   multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; };
-  multisensi = derive2 { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; };
-  multisom = derive2 { name="multisom"; version="1.0"; sha256="057gvajkdiiavngg8a140mx97n11czvx7776wbb3ba1bqx3kr887"; depends=[class kohonen]; };
+  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=[]; };
-  multitable = derive2 { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; };
-  multitaper = derive2 { name="multitaper"; version="1.0-11"; sha256="1s0lmjzpyd7zmc2p1ywv5fm7qkq357p70b76gw9wjlms6d81j1n4"; depends=[]; };
+  multitaper = derive2 { name="multitaper"; version="1.0-12"; sha256="011qpkwpjclfc24y2qqigmdnikqwdnanflfhihigh5b5k7qwgm5j"; depends=[]; };
   multivator = derive2 { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; };
-  multiwave = derive2 { name="multiwave"; version="1.0"; sha256="1gag8pw12ksinymxig8sa8wvsd4amaqmzm4ngxmfvci0y4kckx0h"; depends=[]; };
+  multiwave = derive2 { name="multiwave"; version="1.2"; sha256="1bw071izjxrsk5gx8s49nrlryabpgpg7k2z1ghmk8p6i9m5apnl8"; depends=[]; };
   multiway = derive2 { name="multiway"; version="1.0-2"; sha256="03cj4767xd1918vb4jkp7xk2l4gq340c0kc24h40zq4c3gsxwmbw"; depends=[]; };
-  multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.2"; sha256="13a8w87wq7jv9y654qvlik01q4v0j0mrina2xmvrzqlm25f2rj3w"; depends=[boot sandwich]; };
+  multiwayvcov = derive2 { name="multiwayvcov"; version="1.2.3"; sha256="1znsmca16jac8s5z0j64cck27pvf88anm1mfblabqchqqcz1ykfc"; depends=[boot sandwich]; };
   multxpert = derive2 { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
   muma = derive2 { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[bitops car caTools gplots gtools mvtnorm pcaPP pdist pls robustbase rrcov]; };
   munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; };
@@ -5685,112 +7090,136 @@ in with self; {
   munsellinterpol = derive2 { name="munsellinterpol"; version="1.0.2"; sha256="1c4m9fhggczy3wk51m8qxiahkic1f1lq3r8b0x0mk34pd5wap48a"; depends=[geometry]; };
   murphydiagram = derive2 { name="murphydiagram"; version="0.11"; sha256="0wax9gjhzz8nphzwijqzllz4y25jksf1vqfcbnfb7zafsfv40rib"; depends=[]; };
   musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
+  musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; };
+  mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
   mutoss = derive2 { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-10"; sha256="16fgmpnym9nhiywqimjgv10swrvs3whp0nlzsw573vv0k6qjmwd2"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
-  mvMORPH = derive2 { name="mvMORPH"; version="1.0.6"; sha256="15cy480x3xrwsm3wpcsam24034vd1ga119k4800ga8l70k8gw8cw"; depends=[ape corpcor phytools spam subplex]; };
+  mvLSW = derive2 { name="mvLSW"; version="1.0"; sha256="0sbiq7ynilbnwggfl4n9s43cvzgavxq9vi4q09cz3v8wf8xjj3kf"; depends=[fields wavethresh]; };
+  mvMORPH = derive2 { name="mvMORPH"; version="1.0.8"; sha256="1psjlqx7xb5zlrwcd2q2by8y8ykffxdcskbzb12f643iimlp1l4m"; depends=[ape corpcor phytools spam subplex]; };
+  mvPot = derive2 { name="mvPot"; version="0.1.2"; sha256="0ni953ncm8h4ap0gjimlxjypgjaj2crlx4vscqi7a158hphahj2g"; depends=[evd gmp MASS numbers]; };
   mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
-  mvQuad = derive2 { name="mvQuad"; version="1.0-5"; sha256="0byxp30s5pc7mqwza6x8czqgvqbk2xhb9mq0lmkwhk78y80954jv"; depends=[data_table rgl statmod]; };
-  mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3"; sha256="079iqb4rgh0r0q7hg7fw9wqv8jhfd7789izy8wa9hjilmgq8rbba"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
+  mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; };
+  mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.2"; sha256="142ldrd3y335z9dsgk9g8fd9ikg0wqfgmr45by39f44gnxsmbvzi"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
   mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
-  mvabund = derive2 { name="mvabund"; version="3.11.5"; sha256="1l7icsivywjqmwndqhq0d28wbim68y4y8dkb17pw308n9kn5p7d4"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
+  mvabund = derive2 { name="mvabund"; version="3.12"; sha256="1njszq4fh7ffbr18yd1r23gya33klk5kpzaj414ijp3hwj24wppm"; depends=[MASS Rcpp RcppGSL statmod tweedie]; };
   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]; };
   mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
+  mvdalab = derive2 { name="mvdalab"; version="1.1"; sha256="18lwhplwp87dcvxzvyah3g98b5jrs91ifwk2hwn5a1gs733va989"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
   mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; };
-  mvinfluence = derive2 { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
-  mvmesh = derive2 { name="mvmesh"; version="1.2"; sha256="0461yd21fpgc8ibzg6x7b2lv2zy42wx8w4w6r4h8hgsav68vilzm"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
+  mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; };
+  mvmesh = derive2 { name="mvmesh"; version="1.4"; sha256="14yk09s1ym4p9nijxqasd3060hncmr1br7lv9rk9vm96bgi6l1rc"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
   mvmeta = derive2 { name="mvmeta"; version="0.4.7"; sha256="1yadaviq66wdfs0dipn6gxk7jqvzwzjdr8lkfggdsl4vyyi9pwip"; depends=[]; };
   mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; };
-  mvna = derive2 { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; };
-  mvnfast = derive2 { name="mvnfast"; version="0.1.4"; sha256="0bhm1g8wnq389ca75lc6hs2g1xin83smwhc8qwik8gria7r2zymf"; depends=[BH Rcpp RcppArmadillo]; };
+  mvna = derive2 { name="mvna"; version="2.0"; sha256="0qy4s8v20ccjdgqj3lgnl903b7m1rgc5lq8w66d5dl41s0jlnmx6"; depends=[lattice]; };
+  mvnfast = derive2 { name="mvnfast"; version="0.2.0"; sha256="0r33jigwbj01isrc40rgisjy3nqn7yynmlwdxn7k8z06pg7mbxrm"; depends=[BH Rcpp RcppArmadillo]; };
   mvngGrAd = derive2 { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; };
   mvnmle = derive2 { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
   mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
   mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; };
-  mvoutlier = derive2 { name="mvoutlier"; version="2.0.6"; sha256="00kim5i8xdbaqc0l16w1pif5yfqf741x686lq6drb243jl89rfjv"; depends=[robCompositions robustbase sgeostat]; };
+  mvoutlier = derive2 { name="mvoutlier"; version="2.0.8"; sha256="07a2pv8bw5k0faiy0skdchg7c0n236saq5d8plqq7234n3rjl8pg"; depends=[robCompositions robustbase sgeostat]; };
   mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; };
   mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; };
   mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; };
-  mvtboost = derive2 { name="mvtboost"; version="0.4.1"; sha256="1sxbldbcy3md4bni5lgs8v9sl67hjphlhglzbq4nx48iclvixcq6"; depends=[gbm RColorBrewer]; };
+  mvst = derive2 { name="mvst"; version="1.0.1"; sha256="0sv8pd1524pr3xpxplq468dxfd0wipdr41awqwvcljpw5wgl34qa"; depends=[MCMCpack mnormt mvtnorm]; };
+  mvtboost = derive2 { name="mvtboost"; version="0.5.0"; sha256="06zgx1c2470bh3x6s2awzkxbyij6bvzv23xbvamg77v5pz5bjj6h"; depends=[gbm RColorBrewer]; };
   mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
   mvtnorm = derive2 { name="mvtnorm"; version="1.0-5"; sha256="1pc1mi2h063gh4a40009xk5j6pf5bm4274i5kycln38dixsry3yh"; depends=[]; };
   mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
   mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
-  mwaved = derive2 { name="mwaved"; version="1.1.2"; sha256="0z9p4756azl506lg3583a5zrjz0dl55lhmjml1xifnk868gld6xs"; depends=[Rcpp shiny]; };
+  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.3.0"; sha256="0j0wdc7p98h14l51f0mgl6k7ns8fb93y12z7mjik4dpakzsanl68"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 nortest RColorBrewer Rcpp reshape2 taxize]; };
+  myTAI = derive2 { name="myTAI"; version="0.4.0"; sha256="15ax5hwgqqyf5qmpmnjqvszwxyvvasmmxc03m53f7gdnpmv2wpg8"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 nortest RColorBrewer Rcpp readr reshape2 taxize]; };
   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]; };
   mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; };
   nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; };
-  nCal = derive2 { name="nCal"; version="2015.3-3"; sha256="0vj6l8w29ymj1v18mb4qyw6w1xpmwx5bvil4kjb82gccsb95ir10"; depends=[drc gdata gWidgets kyotil]; };
+  nCal = derive2 { name="nCal"; version="2016.7-31"; sha256="12zj22myfxqxyq7bl669ngyk6yb3i9gsg00qqw5a5x2w95imwv20"; depends=[drc gdata gWidgets kyotil]; };
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
   nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
-  nLTT = derive2 { name="nLTT"; version="1.1.1"; sha256="0z3d61s6dfkvjv60qyx2mv5f0w1jg0qh5kb3vch3m2am5rbg9fq3"; depends=[ape coda deSolve]; };
+  nLTT = derive2 { name="nLTT"; version="1.3.1"; sha256="1wha26lcgk2kw48vyiws1ciyp8x6d7nmkrahh5b8w23ns6bqpngf"; depends=[ape coda deSolve]; };
   nabor = derive2 { name="nabor"; version="0.4.6"; sha256="0kd0h8n5yrn16vrfdchdiqzws05q0fm8z577p20dm18gdcs2vbxv"; depends=[BH Rcpp RcppEigen]; };
-  nadiv = derive2 { name="nadiv"; version="2.14.2"; sha256="1w3mvid500jcxj79q3104cb40akchpgdfchwljvabv3q4wlj1kzj"; depends=[Matrix]; };
+  nadiv = derive2 { name="nadiv"; version="2.14.3.1"; sha256="08276bakyrn9d9vh08yzan60kigsihwfhgx788gwp6pk8v6m25wa"; depends=[Matrix]; };
+  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]; };
+  naptime = derive2 { name="naptime"; version="1.2.2"; sha256="0jzzs7iphcan6vf1bc3h82gpplnlkw9vhg6366izr2b7vycxafi5"; depends=[anytime lubridate]; };
+  narray = derive2 { name="narray"; version="0.1.1"; sha256="0n620wzhmlyjkbbwr0py2xfk0vj59a5zyr4d93iyplcrjg91n6zg"; 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.1"; sha256="0w6gsq4vcn8xh05yxb4ipgn69n8lba9ia56ahx2q7dw8mj9mpk9v"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
-  nat_nblast = derive2 { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[dendroextras nabor nat plyr rgl spam]; };
+  nat = derive2 { name="nat"; version="1.8.7"; sha256="14mfjlhf08ypbml8zqz90z80dljqk9ns7mk1h0s0fma308xwab7m"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; };
+  nat_nblast = derive2 { name="nat.nblast"; version="1.6.2"; sha256="0b2gzyzszj2v5girxyv31nvds0837lzvim7x7bs9h897yrxs57k8"; depends=[dendroextras nabor nat plyr rgl spam]; };
   nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.6.2"; sha256="1yc0k5nsg6nmxf3wmhr5prbz2l820z62xjayi83mz3jpzwilz4by"; depends=[digest igraph nat rappdirs rgl]; };
   nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; };
-  naturalsort = derive2 { name="naturalsort"; version="0.1.2"; sha256="0m8a8z0n5zmmgpmpn5w87j2jfsz1igz3x133z3q25h8jlyaxy750"; depends=[]; };
+  natserv = derive2 { name="natserv"; version="0.1.4"; sha256="0qwf7lapx5gchk8xmdnmxr10j5dnkp52mqnh1ja216z7l841cl07"; depends=[crul data_table tibble xml2]; };
+  naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; };
+  nbc4va = derive2 { name="nbc4va"; version="1.0"; sha256="0y1qpkzjr327qyvmqf129m400rvn6gwk72ccnly6cqq53icrarn4"; depends=[]; };
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
-  nbpMatching = derive2 { name="nbpMatching"; version="1.5.0"; sha256="16g45yzia748qhmd4imib33qs8i1b1qy5h6gmlr9rr6dwbnv2fig"; depends=[Hmisc MASS]; };
+  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]; };
   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_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
-  ncf = derive2 { name="ncf"; version="1.1-6"; sha256="1c0ia6lv36lvqsl16s0a450adkab366k28bcdhff3g31i04xh8mk"; depends=[]; };
+  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.5-1"; sha256="0dmg8kskihy71j0di4xy2q17bxhyl5803fm6lmsnayziz6fpis6d"; depends=[]; };
+  ncvreg = derive2 { name="ncvreg"; version="3.8-0"; sha256="19yir4bwinpd6rgk6ncg3x42qpx3d884f91qq9gl16y9kc4blp87"; 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.9.0"; sha256="1b35xladdldy801w05d9n40k8vnrzai4a3jywhkbmg448n2q8xy8"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
+  ndtv = derive2 { name="ndtv"; version="0.10.0"; sha256="1j4g5qclfbw7fkykaclrsb2d70vy40fd1rgr1n73qyrkx0fyym44"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
+  nearfar = derive2 { name="nearfar"; version="1.0"; sha256="1fafsb392dm16388a17sfwfgnxwbr8y8v7sdvbfv46sdndwaif1z"; depends=[AER GenSA MASS nbpMatching sem]; };
   neariso = derive2 { name="neariso"; version="1.0"; sha256="1npfd5g5xqjpsm5hvhwy7y84sj5lqw9yzbnxk6aqi80gfxhfml4c"; depends=[]; };
-  needs = derive2 { name="needs"; version="0.0.2"; sha256="1w24jxkm456by9fm5wmdxv8gspd78p95jar9b22x1r9jry4nfmhk"; depends=[]; };
+  neat = derive2 { name="neat"; version="1.0"; sha256="191bx96cmrzy4jd5x96h1vw01ii60jy7mlmcl5lzwkxrbv4zr6k7"; depends=[]; };
+  needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
-  negenes = derive2 { name="negenes"; version="1.0-3"; sha256="19xlw3l90gwan0p40r0s2xy0yv8id32h1i56496spgi02vh3pnsl"; depends=[]; };
+  negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
-  neotoma = derive2 { name="neotoma"; version="1.5.0"; sha256="13xc9sp25diw8y0fsasgl6aq34fzv4xlnrdfg4dch9zr3dnwc92h"; depends=[httr jsonlite plyr reshape2 xml2]; };
+  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=[]; };
   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]; };
   netassoc = derive2 { name="netassoc"; version="0.6.2"; sha256="01h0nnyrgv08bxyl01lqsqnj69bhkwci692h77vfa7cf8rsm67kg"; depends=[corpcor huge igraph infotheo rags2ridges vegan]; };
-  netcoh = derive2 { name="netcoh"; version="0.1"; sha256="0id86wvws213695sv81mrmf4chz9xfyhaf58q1vfhq8yxfhw1fnd"; depends=[Matrix Rcpp RcppArmadillo]; };
-  netdiffuseR = derive2 { name="netdiffuseR"; version="1.16.2"; sha256="1ck5sxmwsraggznf1i2z8q2kmjs75nf63y6s2zik14ini5dd5qyw"; depends=[boot Matrix Rcpp RcppArmadillo sna SparseM]; };
+  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="2.0"; sha256="04id2wcrmi0lqvn4a8qhqkc3z076b8xd7jhw9hsmaz21g9cxdfx8"; depends=[corpcor cvTools glasso glmnet igraph]; };
-  netmeta = derive2 { name="netmeta"; version="0.8-0"; sha256="0qadg3h9aa3qx51hvqikzb5s087r5ihmp6ffxg5x1bmw86yfi2bq"; depends=[magic meta]; };
+  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]; };
   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.2.8"; sha256="0w3wax4sfi67k9qjfkz5xfkqzr7ssmkm912snvfbxyynclkzbdrj"; depends=[htmlwidgets]; };
+  networkD3 = derive2 { name="networkD3"; version="0.3"; sha256="0g1l8a6qlpxylxnnavjcwdjx6v8nxkxzigilywyqhqhmpcsnp7bg"; 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.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; };
+  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]; };
   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.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; };
+  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]; };
   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]; };
-  ngram = derive2 { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; };
+  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=[]; };
   ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; };
-  ngspatial = derive2 { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054ndj2gykz4nnfqfq3wbivg6fmlkdnn18kbckkk"; depends=[batchmeans Rcpp RcppArmadillo]; };
-  nhanesA = derive2 { name="nhanesA"; version="0.6.3"; sha256="0g4nhm1y6wqdvc1vf8r7m0yhvfmzj3hl4xil6m9vi2h8yp2sblv0"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
+  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]; };
-  nice = derive2 { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
+  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]; };
+  nima = derive2 { name="nima"; version="0.3.0"; sha256="10g0a8qa64sk16xrya3qhrlrjbjyq7ndv208xz36knp5az2n27ak"; depends=[assertthat ggplot2 gridExtra plyr survival]; };
+  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.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[numDeriv stringr]; };
-  nleqslv = derive2 { name="nleqslv"; version="3.0"; sha256="0f5cnpz4kmpli7haczhv1qkp2f386n1yq7bdwgaxy0xa96cyyzmc"; depends=[]; };
-  nlme = derive2 { name="nlme"; version="3.1-126"; sha256="1vvyzypr88sp2c12nngfzsc1m8w5a416ph28cawzji25m0b1py6i"; depends=[lattice]; };
+  nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; };
+  nleqslv = derive2 { name="nleqslv"; version="3.1"; sha256="0vvyyafighfck8f9imcpqlr1b5v3znsr5czgl5k4b02jymdwrhvs"; 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]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
@@ -5800,12 +7229,16 @@ in with self; {
   nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; };
   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.6"; sha256="18x3mw8p297b2yq2m3m8fjxs50v9drllkrj4vqni9w4c6v70gz63"; depends=[gaussquad mvtnorm nlme]; };
+  nlsem = derive2 { name="nlsem"; version="0.7"; sha256="1g5vnqmqq4swnid3601f1cm0q9w9k802394jd3yac95n8sm05i5g"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; };
+  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.12"; sha256="1fzyfqi6nfzxg0vjlqcvrf6p7qjgvg9qvf4icy13vqs1k70y5v4x"; depends=[digest]; };
+  nlstimedist = derive2 { name="nlstimedist"; version="1.0.4"; sha256="10wbkngcx02cjyv188ascrw7aaqg8vvwbr7rgy6q87ch5g7ih35g"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; };
   nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
   nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
   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]; };
   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=[]; };
@@ -5813,69 +7246,90 @@ in with self; {
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
   nodiv = derive2 { name="nodiv"; version="1.1.4"; sha256="0m12pw4l7lmqn796ac6yn3f9h5h59cv84swb8fk559aw258kpr4s"; depends=[ape picante raster sp vegan]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
-  nomclust = derive2 { name="nomclust"; version="0.91.1010"; sha256="02jpzcjclm22bjg59wj4490vh2rp9ma1vqxdnwmppyb478558fz1"; depends=[cluster dummies]; };
+  noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
+  nomclust = derive2 { name="nomclust"; version="1.00.1011"; sha256="1mzz1bc8gg9lw5aacmicfzjak212hrbq2wchblljcxxjvkkn87w5"; depends=[cluster dummies]; };
+  nomogramEx = derive2 { name="nomogramEx"; version="2.0"; sha256="1as0hbmb37z9izz95x9rd98a0fs4b6zbhzjpgnyq5c1j4219vzs3"; depends=[pracma rms]; };
   noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
   noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; };
   nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; };
-  nonnest2 = derive2 { name="nonnest2"; version="0.3"; sha256="01j336lms0cinyzjhdgzqlh9hhvxx3lpri195cj2h0ssfzvy4z0z"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
+  nonmem2R = derive2 { name="nonmem2R"; version="0.1.5"; sha256="07ky2s8bfk6qiayj9vv9plwkd4615nkk9vb0aa4bq54m0191zd18"; depends=[lattice latticeExtra MASS mvtnorm xpose4]; };
+  nonnest2 = derive2 { name="nonnest2"; version="0.4-1"; sha256="0lgcrxvyyw789hw80lqbxvvxl6z95qxzq9k5lphl5435xqzpfj6f"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
+  nonpar = derive2 { name="nonpar"; version="1.0.0"; sha256="0baavlsnh5hjgmhx42v0vn4c11bcrbssxxc7971g0rk93cgnk5nj"; depends=[]; };
   nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
   nonrandom = derive2 { name="nonrandom"; version="1.42"; sha256="0icm23hw593322z41wmjkwxqknh2pa9kpzbrch7xw1mhp93sd5ll"; depends=[lme4]; };
-  nontarget = derive2 { name="nontarget"; version="1.8"; sha256="01prm3lixr3qai3m8d83nmgx501mmrj45kx1k2xg1cy1n2c2ik17"; depends=[enviPat mgcv nontargetData]; };
+  nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; };
   nontargetData = derive2 { name="nontargetData"; version="1.1"; sha256="07cdbpmn64sg4jfhljdcx503d55azyz58x7nkji044z3jmdryzqw"; depends=[]; };
-  nopp = derive2 { name="nopp"; version="1.0.6"; sha256="0qcj3bci3iwq88vgbhxavvrkz8n276rx4q16f2vcqszzf6zajfr5"; depends=[mlogit]; };
-  nor1mix = derive2 { name="nor1mix"; version="1.2-1"; sha256="1sh7373w8z1mqkk8wvwzxab57pg1s3wcs6y6sx0sng7pf429x2m3"; depends=[]; };
+  nopaco = derive2 { name="nopaco"; version="0.99.8"; sha256="07pff53nzilbl0ww6jzxw0m8z6x4ssb1xajzgi8bck2bsdd8bhid"; 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=[]; };
   norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
+  norm2 = derive2 { name="norm2"; version="2.0.1"; sha256="09447dng9px1ynfp382vjmh5iqdnhc7kxg28cbmqx7ncj1z5a2bm"; depends=[]; };
   normalp = derive2 { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; };
+  normalr = derive2 { name="normalr"; version="0.0.3"; sha256="1ydlp6nbldq7sq60zdlvqah43xdfvx5nyiqaq2m5vgma6yny930x"; depends=[ddR magrittr MASS purrr shiny]; };
   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]; };
   nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
+  not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; };
+  notifier = derive2 { name="notifier"; version="1.0.0"; sha256="1yi99ja8xdg771fn0brz5qz5p9kcbspwjx272lvjvw26lw7gaw3f"; depends=[]; };
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
+  notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
   novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
   noweb = derive2 { name="noweb"; version="1.0-4"; sha256="17s65m1m8bj286l9m2h54a8j799xaqadwfrml11732f8vyrzb191"; depends=[]; };
   np = derive2 { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6f9mv7abb0b9b2an23y6gmi5"; depends=[boot cubature]; };
   npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; };
-  nparACT = derive2 { name="nparACT"; version="0.3"; sha256="0984s2fb989z94x8jzmmp4zh0hy8ji74hzqqiv4145s9fb4rvn64"; depends=[ggplot2 stringr zoo]; };
+  npROCRegression = derive2 { name="npROCRegression"; version="1.0-4"; sha256="1w635wqkkbw5csrzjdyim6qxp5rvrlik260wp9iarh97rs5jgm53"; depends=[lattice]; };
+  nparACT = derive2 { name="nparACT"; version="0.7"; sha256="0ia7s4gcqvcx02gybzizf6dsv75graknsjq7m74iplb2v6rzyywj"; depends=[ggplot2 stringr zoo]; };
   nparLD = derive2 { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
   nparcomp = derive2 { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
-  npbr = derive2 { name="npbr"; version="1.2"; sha256="0l6r9cwrhbi37p8prrjcli7rpvlxgzma2m1wqck5y97wx1fnh4h3"; depends=[Benchmarking np quadprog Rglpk]; };
+  nparsurv = derive2 { name="nparsurv"; version="0.1.0"; sha256="1qy9qkkpqrk49vjxbyvl25i4kfk0py6v64izd8lmaw38dynybpy2"; depends=[survival TH_data]; };
+  npbr = derive2 { name="npbr"; version="1.4"; sha256="0h2lrjls89ivd3v1jksiq5jh57n20xgxaxcpwx8vqcvbpsdvfkd4"; depends=[Benchmarking np quadprog Rglpk]; };
+  npcopTest = derive2 { name="npcopTest"; version="1.02"; sha256="1avjhm6rzyawwaabch6cxc7w2if4631jwrd2l8lyd3nk39kpr8ch"; depends=[]; };
   npcp = derive2 { name="npcp"; version="0.1-6"; sha256="1ki9q49nyw21c6x3iwpd8aa152jc30idl0xx8f803j72yl21j47c"; depends=[]; };
   npde = derive2 { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
   nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
-  nplr = derive2 { name="nplr"; version="0.1-4"; sha256="03yq8f2bfdyi21d8kqcca0byjrw9a7pgp0c6fwpk1lnniaabzn2d"; depends=[]; };
+  nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; };
   npmlreg = derive2 { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
-  npmr = derive2 { name="npmr"; version="1.0"; sha256="1467zjd56p5b23am40gzr1vly7v8hhqiybfvgbxw1mnrvxzlvfj2"; depends=[]; };
-  npmv = derive2 { name="npmv"; version="2.3.0"; sha256="0719p38fh37lz7yclqp1l03pn8j051jm8hfzvxjd7m5kg0p083rh"; depends=[Formula]; };
+  npmr = derive2 { name="npmr"; version="1.1"; sha256="1ss8ypvv6qcdxv7l3szivliwmhidmzi3572p3nz96ysndf56akl4"; depends=[]; };
+  npmv = derive2 { name="npmv"; version="2.4.0"; sha256="04lfks2rlax59gxdnbgkpmk2vaax718z6hkgsvmyxf52iby6rvlr"; depends=[Formula]; };
   nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
-  npregfast = derive2 { name="npregfast"; version="1.2.1"; sha256="0ydxz4if5i54b45qsymzk5zl3ym0q08brvia4czx9h2r78db2v0g"; depends=[ggplot2 gridExtra shiny]; };
-  nproc = derive2 { name="nproc"; version="0.1"; sha256="0ddj4iarmm2wk56rlb9ifzip8j7cwfja1p8jsn2769x0b2mz2n1n"; depends=[ada e1071 glmnet MASS randomForest]; };
-  npsf = derive2 { name="npsf"; version="0.1.6"; sha256="0zaz7yxb39x8c04bx5gzrryp9jn3sylk4gyv1nlrgqig8v7020qy"; depends=[Formula]; };
+  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]; };
+  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.3-6"; sha256="1wiv4gp3y1c26xaq8zssias3j3h8mpb6izcmcarghvnfhj32l8jb"; depends=[quadprog]; };
+  npsp = derive2 { name="npsp"; version="0.5-3"; sha256="0ck6iymfc73bzrifdc2sagcliz1yakqk1yv67a3ykha996jsrx99"; depends=[quadprog]; };
   npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
   npsurv = derive2 { name="npsurv"; version="0.3-4"; sha256="1z456q3vi9pndr2x8byq95hh4dv95hpgj1an6vxhnwlhbfwjdjlx"; depends=[lsei]; };
+  nricens = derive2 { name="nricens"; version="1.3"; sha256="0wyr6bh8vhvvixqa8z2pmav94frskv5kvsf2y4yk2064ra65kjiz"; depends=[survival]; };
   nsRFA = derive2 { name="nsRFA"; version="0.7-12"; sha256="182zshwyg0l6shb5wcwibqygxs8qmgma9c4s683za8q3f9l94aqj"; depends=[]; };
   nscancor = derive2 { name="nscancor"; version="0.6"; sha256="1wkk08h8yz2mzgvmq0vr30iiczpbp0304vjwxqgsa3h240m4awsm"; depends=[]; };
+  nse = derive2 { name="nse"; version="1-00.17"; sha256="16zam539ir29m9ixyim9bqnf3sdy8aaaaly3wf96i3csgysf8pjc"; depends=[coda mcmc mcmcse np Rcpp sandwich sapa]; };
   nsga2R = derive2 { name="nsga2R"; version="1.0"; sha256="04jj0a3isfc348vg46il5x9l33cr7xawz5w0mm4pwr6djhd8nfhx"; depends=[mco]; };
   nsgp = derive2 { name="nsgp"; version="1.0.5"; sha256="0piajjz3r71dnjw7lwpjhbaygxcrbbxfvhf8p3n2izyr2pw5fml9"; depends=[MASS]; };
   nsprcomp = derive2 { name="nsprcomp"; version="0.5"; sha256="1rrjiwkpiaqlp27s5xfd6jwmmpzgxm5d7874gp33511wa0vrhnnf"; depends=[]; };
+  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="2014.2-1"; sha256="114wd0hwn2mwlyh84hh3yd2bvcy63f166ihbpnp6xn6fqp019skd"; depends=[]; };
-  numOSL = derive2 { name="numOSL"; version="1.9"; sha256="1vz7hvd79v4iydhq3jmpigsymd2disdkkw28svzb68zdiccbxfnd"; depends=[]; };
-  numbers = derive2 { name="numbers"; version="0.6-1"; sha256="1mqcps33az5a7vd2czx7nll87yciwmxngnilf16iz4yf9p59gny5"; depends=[]; };
+  numDeriv = derive2 { name="numDeriv"; version="2016.8-1"; sha256="07ni52rwiap4wilfz94w5mrqaxr59axxmgn57857ip4p6qkiss0v"; depends=[]; };
+  numOSL = derive2 { name="numOSL"; version="2.1"; sha256="1my1pb23qafh96kk5vyjgks06g8pk9pkhk9rnqx76y5fdb5m8yy1"; 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.1"; sha256="15bqaphxwqpdzr4bkn6qgbjb3knja5hk34qxjd6xhpjzkgfs5c0b"; depends=[]; };
+  nycflights13 = derive2 { name="nycflights13"; version="0.2.2"; sha256="1857pwyhb5gvbdxv934nlc50n4ai7njm89js7b7ywfg7mhgha4yc"; depends=[tibble]; };
+  nzelect = derive2 { name="nzelect"; version="0.2.0"; sha256="1ijyvqm8yz3wib8wyibcxqx6p848xgxjrl84ppwq0nx0ic0vizbm"; 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]; };
   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.0"; sha256="14vimvaba5fxcfl2n8dqa78jw51ra3nvqmw8js5x0d81yp47yaga"; depends=[httr plyr stringr xml2]; };
+  oai = derive2 { name="oai"; version="0.2.2"; sha256="0q1w29wrppi5sfabdw8px7zr92bgri3jhy0y7dhi46xggxfg9vm1"; depends=[httr plyr stringr tibble xml2]; };
   oapackage = derive2 { name="oapackage"; version="2.0.23"; sha256="1kkwxwgb23i4m8dlh1ybskardwf8ql0m18cv9c5zi1qd2vkk5dx0"; depends=[RcppEigen]; };
-  oasis = derive2 { name="oasis"; version="0.99.5"; sha256="03jcy766bj3z9km2jlf2wpjkfvkryffkjlvchpyh5hgfkm4vs2cv"; depends=[fslr oro_nifti]; };
+  oasis = derive2 { name="oasis"; version="2.1"; sha256="0yh54vip2bx1ifpc3d7acr9488i3w9iyh3gl209fivnrn555plqf"; depends=[fslr mmand neurobase oro_nifti]; };
   oaxaca = derive2 { name="oaxaca"; version="0.1.3"; sha256="0pi3lrvx5cjl35hww9w8bwh0720zibph636c2ay38k83lzf3kcb8"; depends=[Formula ggplot2 reshape2]; };
-  obAnalytics = derive2 { name="obAnalytics"; version="0.1.0"; sha256="0k8zb81wf51kcrnlw9616vfbm150x17ggxhd23fm71a1n3292xvc"; depends=[ggplot2 reshape2 zoo]; };
+  obAnalytics = derive2 { name="obAnalytics"; version="0.1.1"; sha256="1l4ld120qk0adycmvqrkzada10kb7z03lj2njzqagmacl1z8598f"; depends=[ggplot2 reshape2 zoo]; };
   objectProperties = derive2 { name="objectProperties"; version="0.6.5"; sha256="0wn19byb1ia5gsfmdi6cj05pnlxbr3zcrjabjg3g1d7b58nz7wlh"; depends=[objectSignals]; };
   objectSignals = derive2 { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
   obliclus = derive2 { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; };
@@ -5883,122 +7337,159 @@ in with self; {
   obliqueRF = derive2 { name="obliqueRF"; version="0.3"; sha256="1bwlgv820mmpc6vg26bsdlfy2p78586i3y42hkzbw3z1fmwq3pz5"; depends=[e1071 mda pls ROCR]; };
   obs_agree = derive2 { name="obs.agree"; version="1.0"; sha256="191xshnrncjqzwd2rdq334vsx0338q3y3k1nbm04hdaysbnla9jv"; depends=[]; };
   obsSens = derive2 { name="obsSens"; version="1.3"; sha256="1vfm1mzsycwkqa39vf3fcdv1s6adps9hw1rxlvl8v9kq746hcabw"; depends=[]; };
-  oc = derive2 { name="oc"; version="0.95"; sha256="1zmy34fsqcd4rq0v72r514k6gm3jmf9a5zv4m6kj09hl89xvqsci"; depends=[pscl]; };
+  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-18"; sha256="1vqfw1y6dj094cn9jy0pq39r1v2przqdrl1add6amssgxyh3bak1"; depends=[gsw]; };
+  oce = derive2 { name="oce"; version="0.9-20"; sha256="1pckxrkkgb22rrm1q9j2xijnbhk6j260rq8pvmi02l8mdx6l99l5"; depends=[gsw]; };
   ocean = derive2 { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
+  oceanmap = derive2 { name="oceanmap"; version="0.0.2"; sha256="0pbwja7m0ng2j2147sgc07v3q80xmj3bwidvqksigklka4zx822q"; 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]; };
-  odds_converter = derive2 { name="odds.converter"; version="1.3"; sha256="0pa0figal4p42iy83lfj9fmnlakac7blfbmcic67qd19bdn88jz2"; depends=[]; };
-  odeintr = derive2 { name="odeintr"; version="1.3"; sha256="12y5hr6f7bj3aqj4gd0hlj495c5163jn0liksspk5jpqcmpsgdg3"; depends=[BH Rcpp]; };
+  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]; };
   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]; };
-  oem = derive2 { name="oem"; version="1.02.1"; sha256="0z9k0jhpp5dayyin6v8p26rgl8s983hnpsk195c9z458i7nbmrpd"; depends=[Rcpp RcppArmadillo]; };
-  oglmx = derive2 { name="oglmx"; version="1.0.3"; sha256="01r0j7d2l4pf61x2q4pa6pnkv2yzsk2jb62cvh0jz2rhkpvqjniq"; depends=[maxLik]; };
+  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]; };
+  oglmx = derive2 { name="oglmx"; version="2.0.0.1"; sha256="03lsgdz2pjykzcv7k9r940rgh7qh7vn651nrshx1r0b63mh9cqsj"; 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.2.1"; sha256="0hnsv5b283lscj3b3pygjzyghc0glpavpijl7drv59ka9914ixl6"; depends=[Rcpp]; };
+  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-4"; sha256="1klzh431lcw2r8ylvqzl7xcyvr7bqapk3v15slfn9n27bbaljicp"; depends=[lme4 pheatmap]; };
+  omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; };
   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.1"; sha256="13d2jcj8sb3gvv0k73bcaplsf2i2hf8fswcnvykpnps9lb6kvn0v"; depends=[]; };
+  onewaytests = derive2 { name="onewaytests"; version="1.2"; sha256="1fscyffmvlasx56hxlk2b60fk0scfjbb3yk5q74ffszk4xvqbrzg"; depends=[]; };
   onion = derive2 { name="onion"; version="1.2-4"; sha256="0x3n9mwknxjwhpdg8an0ilix5cb8dyy5fqnb6nxx7ww885k0381a"; depends=[]; };
-  onlinePCA = derive2 { name="onlinePCA"; version="1.3"; sha256="11dp1fxb26rzv2743wgwyrc35bslm57yi3a57r7wjixkp9vf9kkb"; depends=[rARPACK Rcpp RcppArmadillo]; };
+  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="1.0"; sha256="1x7x5smfxprlpsd5jjzh7rqcpiih2plmlnjjl9ww6vbkcdlk783d"; depends=[]; };
-  ontologyPlot = derive2 { name="ontologyPlot"; version="1.0"; sha256="0z8bppcpc8d9rzk3h3c5c9pa1hnhdymx77d00lji2nldrlnsil89"; depends=[functional magrittr ontologyIndex Rgraphviz]; };
-  ontologySimilarity = derive2 { name="ontologySimilarity"; version="1.0"; sha256="0wqdsss43xfsm90jr7j07yrmpcj3xm0ax8jaad6cqlq60ywm2a8n"; depends=[ontologyIndex Rcpp]; };
+  ontologyIndex = derive2 { name="ontologyIndex"; version="2.4"; sha256="168m4jdwbzv8lpimx9063306691hnfdjmdhb5y8195d9vcq049jr"; depends=[]; };
+  ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; };
+  ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
   opefimor = derive2 { name="opefimor"; version="1.2"; sha256="06j5diwp42x7yrhclwyiimfwmx66y23dkwlnkd2lj2zcsgam9s8w"; depends=[]; };
   openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-2"; sha256="1472gg651cdd5d9xjxrzl3k7np77liqnh6ysv1kjrf4sfx13pp9q"; depends=[rJava]; };
-  openVA = derive2 { name="openVA"; version="1.0"; sha256="1bqfysxx5qjdz0p7kmvjjbivnh384zq7z1nxidn33kr1wnsnvmcq"; depends=[ggplot2 InSilicoVA InterVA4 Tariff]; };
-  openair = derive2 { name="openair"; version="1.7-3"; sha256="1g63jjsdi4658qkjwzdhdd11s45fm0y5xp975i0sd9vkxgiffxg4"; depends=[cluster dplyr hexbin lattice latticeExtra lazyeval lubridate mapdata mapproj maps mgcv plyr RColorBrewer Rcpp reshape2 RgoogleMaps]; };
-  opencpu = derive2 { name="opencpu"; version="1.5.4"; sha256="1sn8hvq0bwlrb3bd7ril1mynhfjbfkgrgx5f515767gav9hv1v4m"; depends=[brew devtools evaluate httpuv httr jsonlite knitr openssl]; };
+  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]; };
+  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.2"; sha256="1dbsaciz39zvsmcyxkmpfm5yxzrpw2iv2nb86525wn80q0cyv0cb"; 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="3.0.0"; sha256="1vx5qmhlyrlwrswbhd95jjcsldcdpdp7gs341dmham26sdzdx658"; depends=[Rcpp]; };
+  openxlsx = derive2 { name="openxlsx"; version="4.0.0"; sha256="1jz75kxpbbdw3bf9a49fih4wlk36nki3nr8yq7v9n31qzyb5k3qy"; depends=[Rcpp]; };
+  opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
   operator_tools = derive2 { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; 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.0.1"; sha256="13vph76wmhr7rg036fvn7i9nfanhxg3y5rnycrniybz3ny1q5paf"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; };
-  optR = derive2 { name="optR"; version="1.1.1"; sha256="1lr5n0g21jayb27b2j8zh16f1k28avzg7k2mwyc7rjhhxv8k9w1j"; depends=[]; };
-  optextras = derive2 { name="optextras"; version="2013-10.28"; sha256="1sm025xwrpm5c63l4kiqfndxb7rwq2bcmidy4k2b24g5a8x7cpfv"; depends=[numDeriv]; };
+  optCluster = derive2 { name="optCluster"; version="1.1.0"; sha256="1p4mwnarai1kakyb0w8z46c3lwnwcndvfxspywh72mj35wfrdbc8"; 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.1"; sha256="0jr1gi31la8lnz1s7xyk4bc650kf374v2bha638fzg2cx2zqkiif"; depends=[alabama cccp GENLIB kinship2 MASS Matrix nadiv nloptr pedigree pspline 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]; };
   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]; };
   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-5"; sha256="1dgsxd6w2fgy07yzihbrg30ya0lmy146m70cfaaxr6pnr8d0rszr"; depends=[digest Rcpp RItools survival]; };
+  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.2-0"; sha256="1v90lfma06q10h6g43fh7pq1dpgdgcqsgwd73zf4z1ksq3pcx6wh"; depends=[cluster labdsv MASS plotrix]; };
+  optpart = derive2 { name="optpart"; version="2.3-0"; sha256="125b9sfdk4bdcj1vq5rxlrskv1zra31x8d96pdxnqvcnkmwxm4zh"; depends=[cluster labdsv MASS plotrix]; };
   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"; sha256="138qqjklwd3g4dfg9j2438kzpsdc7sf8qdl8ha4kd276n71vkfrh"; depends=[]; };
+  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="1.1"; sha256="0hz7aw4jpf4l7ihj4bjnjv1m8ynr71n4l12x046qj8y7mrnl9p4k"; depends=[]; };
+  orcutt = derive2 { name="orcutt"; version="2.0"; sha256="07190v3llnpkvrgsd33bbdywlvmqqgysn0p4y8krb3wgxx2dv6kg"; 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]; };
+  ordcrm = derive2 { name="ordcrm"; version="1.0.0"; sha256="1hy24s23l099b21w5j3p2f0748s8xmhxhslfp65fg7ycwda5qsyw"; depends=[rms]; };
   orddom = derive2 { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; };
   orderbook = derive2 { name="orderbook"; version="1.03"; sha256="0dlvjrzdhhh8js4g1lvxs46q7fdxfxavxnb4nj6xlwca75i51675"; depends=[hash lattice]; };
   orderedLasso = derive2 { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
   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="0.4"; sha256="1inms74l4zx6r526xd0v79v18bcqa76xwsgfvap0fizyv2dvgpim"; depends=[boot fastGHQuad ucminf]; };
-  ordinalNet = derive2 { name="ordinalNet"; version="1.4"; sha256="06sbb7x46f9cp1dhvf0x3kzpy05766yi15kw7cpzpmfz1pvk9ixs"; depends=[]; };
-  ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.2"; sha256="1rbn2mb516hdr0chny1849m1aq0vb0vmr636b4fp914l5zh75vgi"; depends=[]; };
-  ore = derive2 { name="ore"; version="1.3.0"; sha256="08fdqppf2nm5h367zr2v9323p1v5qm8vby5y1ygjrwqgankpjcjg"; depends=[]; };
-  ores = derive2 { name="ores"; version="0.1.0"; sha256="1k5qcdd92vnx2vclpgk64kkfi389bl1nvwafffgdy7jbgyp65rh4"; depends=[httr]; };
+  ordinalCont = derive2 { name="ordinalCont"; version="1.0.2"; sha256="0dj98ziwaka1a2bra6zzqqwmw9f0ki5iyzibslix0brk9v8lq3km"; depends=[boot]; };
+  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=[]; };
+  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]; };
   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=[]; };
   orloca_es = derive2 { name="orloca.es"; version="4.1"; sha256="0nzhg7vzfxlmryw5ijww8z2b1g9cmgcgzi3gsgigsgn4shnc2hni"; depends=[orloca]; };
   oro_dicom = derive2 { name="oro.dicom"; version="0.5.0"; sha256="05dmhfglp76apyilwicf3n2ylyjhp1gq6b9bnzsiiblpjnfpia43"; depends=[oro_nifti]; };
-  oro_nifti = derive2 { name="oro.nifti"; version="0.5.2"; sha256="0zf5lb51b81602lwg118x3j2myrbrm6wjaflbpxxzqigz4q60rkg"; depends=[abind bitops]; };
+  oro_nifti = derive2 { name="oro.nifti"; version="0.7.2"; sha256="00s5ml1wmxly6mjnhkxjigivjnylyxq39p2zwzhk8vaj5llk2x1q"; depends=[abind bitops RNifti]; };
   oro_pet = derive2 { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; };
   orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; };
   orsk = derive2 { name="orsk"; version="1.0-2"; sha256="0h0h1z8ddn2nkc7c6c4s39sxwvav562p0lcwy13441rrlibywbhq"; depends=[BB BHH2]; };
   orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
   orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
   osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
+  osc = derive2 { name="osc"; version="1.0.0"; sha256="08ac64xqq3diw9xkialvxjvqk5khd3kjdxdi3zic2if05i3rb4ns"; depends=[raster]; };
   osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; };
+  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]; };
-  osrm = derive2 { name="osrm"; version="2.0.0"; sha256="0sapp03i3dbvsfwvnzj3pwqbkrx73qgdaikpnjl4k8bv424p0xc0"; depends=[jsonlite RCurl sp]; };
+  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]; };
+  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=[]; };
   overlap = derive2 { name="overlap"; version="0.2.6"; sha256="066zf4i6anklqqmxf06lyfr9w4scw0djqgp8rabgpzwkvk9xgxmb"; depends=[]; };
-  overlapping = derive2 { name="overlapping"; version="1.2"; sha256="0rcil0925lj166mpgc8xvy3fnp9y84mc902jqd2lyxkqrpc0zv1s"; depends=[lattice]; };
-  oz = derive2 { name="oz"; version="1.0-20"; sha256="1d420606ldyw2rhl8dh5hpscvjx6vanbq0hrg81m7b6v0q5rkfri"; 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]; };
+  oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; };
   p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; };
   p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; };
   pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; };
   pBrackets = derive2 { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; };
+  pETM = derive2 { name="pETM"; version="0.1.5"; sha256="0a677jbaxhvcjz6846cd1y867srgrmxm78k06xva3hds7hbycm3w"; depends=[Matrix]; };
   pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; };
+  pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; };
+  pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; };
   pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; };
-  pROC = derive2 { name="pROC"; version="1.8"; sha256="0rva08hnaah9qv6hapzgfsdy2g06fdvnjmw0l733wm5j2g44ps8m"; depends=[plyr Rcpp]; };
-  pRSR = derive2 { name="pRSR"; version="3.0.2"; sha256="1s81mi172mwxhp786c1fl579cg87valppr0z958ssvxsvg5hbfxy"; depends=[]; };
+  pROC = derive2 { name="pROC"; version="1.9.1"; sha256="1fc5wq4skry52jjwldp4dyxwvss1g93ji5915zv9zz3c9nxd3hpq"; depends=[plyr Rcpp]; };
+  pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; };
   pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
   pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
   pacbpred = derive2 { name="pacbpred"; version="0.92.2"; sha256="13p405vh9rf1r5idxl5payc85vwlzcd87wm15163vc9gmil1ncsf"; depends=[]; };
   pack = derive2 { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; };
   packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; };
-  packHV = derive2 { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3n4jpyillpzi9cg7yc2cymxnrgvyg"; depends=[survival WriteXLS]; };
+  packHV = derive2 { name="packHV"; version="2.1"; sha256="1phwcm1m9in0nkyk3hminbm60iw9jp7vyd7gn871g8shfdm8ixyw"; depends=[survival WriteXLS]; };
   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]; };
-  packrat = derive2 { name="packrat"; version="0.4.7"; sha256="0160ani3zlvffc2ap0cjhw8d727vxs80k2xh59mj04swiy115g48"; depends=[]; };
-  pacman = derive2 { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb96swxizhdqhvzgb5crymrafxqvg00c7"; depends=[devtools]; };
-  paco = derive2 { name="paco"; version="0.2.3"; sha256="1qdaqy3m105wrafxjld6qhrvwcyrjb7ryrh782zpvy9m8yhy0p4j"; depends=[plyr vegan]; };
+  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]; };
+  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]; };
   pagenum = derive2 { name="pagenum"; version="1.0"; sha256="0iqx6lgbzcz5girw8cl934jcah7l32zdrbs70cxx8gs2x5rbfwkz"; depends=[]; };
-  pageviews = derive2 { name="pageviews"; version="0.2.0"; sha256="1pfv7nfj4s51dawq6z9vwhs92wdl7hjq6pi6rsv0qh6pp9adl7sk"; depends=[httr jsonlite]; };
+  pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; };
+  paintmap = derive2 { name="paintmap"; version="1.0"; sha256="1qw5725yjymxmfhffqjx4lbmzj437c7qwr8xrzmf52f0m28nl3vk"; depends=[]; };
   pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
   pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
@@ -6007,114 +7498,135 @@ in with self; {
   palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
   paleoTS = derive2 { name="paleoTS"; version="0.5-1"; sha256="18f5lkgzvndc8s7w7d7dfdlqf37adrmzabpwkavjw1zkpb1dga8c"; depends=[doParallel foreach iterators mnormt]; };
-  paleobioDB = derive2 { name="paleobioDB"; version="0.3"; sha256="1vcfssi6w0m2wd2smyjxp1zf0y48y95386kkb8qdndqw99g089w8"; depends=[gtools maps plyr raster RCurl rjson scales]; };
-  paleofire = derive2 { name="paleofire"; version="1.1.8"; sha256="1g3m1chdqbivq5s7p1n53cfzq1cm5v0wkj4f4s0dih6pcid44si7"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; };
-  paleotree = derive2 { name="paleotree"; version="2.6"; sha256="08861pvr86dbynx687vbxziq3v08ii6hx0g8h5zcskz87x32q2lc"; depends=[ape phangorn phytools]; };
-  palettetown = derive2 { name="palettetown"; version="0.1.0"; sha256="0zpqbd9g50vyidd0chhk2xqlzx7mnzyilr4c84lci1xw3r3avxp0"; depends=[]; };
+  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=[]; };
+  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]; };
-  palr = derive2 { name="palr"; version="0.0-4"; sha256="0rcb01lpi8zapnml1spx4ixxwbq9qh42sisqzrg7gxrkcjrbqxgl"; depends=[]; };
-  pamctdp = derive2 { name="pamctdp"; version="0.3.1"; sha256="1fnadgfd2ikis49j9zl2ijj8gim8lpbygwxjj6ri9jyrc1qmj9jb"; depends=[ade4 FactoClass xtable]; };
+  palm = derive2 { name="palm"; version="1.0.0"; sha256="0cjg5qal2bakl9v1qgs598rcvaa7qpwpqwxbbazfwy3yhmfrdd8v"; depends=[gsl mvtnorm R6 Rcpp spatstat]; };
+  palr = derive2 { name="palr"; version="0.0.6"; sha256="163c0kcsl0k3fp5q9afv3pb8246j2b3jzmd6g2vcgxb8nhs8wr2f"; depends=[]; };
+  pals = derive2 { name="pals"; version="1.0"; sha256="06wfa6dbqir9353rx2yph4s8n8d14gf6bvl907c07z9i9ml719sj"; depends=[colorspace dichromat mapproj maps rgl]; };
+  pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; };
   pamm = derive2 { name="pamm"; version="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; };
   pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; };
   pamr = derive2 { name="pamr"; version="1.55"; sha256="1hy3khb0gikdr3vpjz0s245m5zang1vq8k93g7n9fq3sjfa034gd"; depends=[cluster survival]; };
   pan = derive2 { name="pan"; version="1.4"; sha256="1p3nigmhrnlch86g89hn7l0wvkifx3k9n59g0psi95yck43kza76"; depends=[]; };
   pander = derive2 { name="pander"; version="0.6.0"; sha256="0jgylffc4ymvppaqsflxaj1l18c4x49jbz0b86jjsa00xqdyk4cn"; depends=[digest Rcpp]; };
+  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"; sha256="19426hab4rvgn8k2c7x327k4ymihas59jbys0nmrfgg074x0xdnm"; depends=[data_table]; };
-  pangaear = derive2 { name="pangaear"; version="0.1.0"; sha256="0g5wgm1g3hbxwmlpra70zir9sl0zhd4xm6rj9bv98bszpzl3x6l6"; depends=[httr oai XML]; };
-  papeR = derive2 { name="papeR"; version="1.0-0"; sha256="0c8zljbw0pzaqx7j76245wpmk2104n0cvvddm6rf7v6cfvw72jws"; depends=[car gmodels xtable]; };
+  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]; };
+  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=[]; };
   parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; };
   parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; };
   parallelMap = derive2 { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; };
   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=[]; };
-  paramlink = derive2 { name="paramlink"; version="0.9-7"; sha256="02h7znac93v8ibra3ni2psxc9lpfhiiw4q8asfyrx400345ifk5b"; depends=[kinship2 maxLik]; };
-  params = derive2 { name="params"; version="0.5.0"; sha256="0i2fb305gkjq8j2n3bfphv0zirv2qxl61rcpnci1qvg2cy44qnzn"; depends=[whisker]; };
+  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]; };
+  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]; };
   parcor = derive2 { name="parcor"; version="0.2-6"; sha256="10bhw50g8c4ln5gapa7wghhb050a3jmd1sw1d1k8yljibwcbbx36"; depends=[Epi GeneNet glmnet MASS ppls]; };
-  parfm = derive2 { name="parfm"; version="2.5.10"; sha256="0mk5y7rvfn873lfbscrp8dqgdsracx59dnp6dzr5rha86k4bn097"; depends=[eha msm survival]; };
+  parfm = derive2 { name="parfm"; version="2.7.1"; sha256="0a1fv89vzrziavsy23as6j6hyg4xn7swjrsgax8vpi2rbscy3g5x"; depends=[msm optimx sn survival]; };
   parfossil = derive2 { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq5j0r3jnnrzw1q412dbvmakipyw2yx2l2s7jn"; depends=[foreach fossil]; };
-  parma = derive2 { name="parma"; version="1.5-2"; sha256="1yvk0wfcc1mgz2bif6hvw5l7zclbv4pz1cki0ymslrmxapjqnsz8"; depends=[corpcor FRAPO nloptr quadprog Rglpk slam truncnorm]; };
+  parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; };
   parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
-  parsec = derive2 { name="parsec"; version="1.1"; sha256="02sj2n34n4c6db5s15hbprcx1appasyj8vh2c8my2mppfrk7cnc7"; depends=[]; };
+  parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; };
   parsedate = derive2 { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; };
-  partDSA = derive2 { name="partDSA"; version="0.9.10"; sha256="1j6ihgyjiy8dnr89xkqvl1dkmdswvknffq7zc15civy0h781azv6"; depends=[survival]; };
+  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]; };
   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.3"; sha256="07bvhs6a53cm0gvmxbibg8rhzvjxrhjgl65ib348a4q43pgap2v1"; depends=[]; };
+  partools = derive2 { name="partools"; version="1.1.5"; sha256="062rnq35cbzyr6mdpq4w88bxd6c2pzbghxan6j11pipyzvv7qsj3"; depends=[data_table pdist]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-  party = derive2 { name="party"; version="1.0-25"; sha256="08arvh7bhc67ih1mm6faslw7jgh86f9n9qgswav0mjkg9icny86l"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
-  partykit = derive2 { name="partykit"; version="1.0-5"; sha256="13x668b7vq49jrpdk0ja7lnrv335xx50g21d7jlv0g5s8laa392d"; depends=[survival]; };
+  party = derive2 { name="party"; version="1.2-1"; sha256="1vi0hisph0xscj80ch8gcdp9vrh2k8z5msd2j9p5mvr0f5i5hr7d"; 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]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
+  pasta = derive2 { name="pasta"; version="0.1.0"; sha256="12ps5bhyk3hllfa9smyw8vxglr45xz9kvhkx2v65pb86iqm0r0kg"; depends=[]; };
   pastecs = derive2 { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
   pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; };
   patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; };
   patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
-  patchSynctex = derive2 { name="patchSynctex"; version="0.1-3"; sha256="0gbbdszrprshcpnpbnvqmx0wlij2d36fw94ssfbx11d7fmjpaj37"; depends=[stringr]; };
+  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]; };
   pathmox = derive2 { name="pathmox"; version="0.2.0"; sha256="0hcllnpjjays35yngz309f1gcx9qg5z9h302kg9mhxs90470x4w0"; depends=[plspm tester]; };
-  pathological = derive2 { name="pathological"; version="0.0-7"; sha256="0ki8a7i03c4hq7af1zq7n7z1glq15jh03zr4l4m05dblyn0nfsm7"; depends=[assertive_base assertive_files assertive_properties assertive_reflection assertive_strings assertive_types plyr stringr]; };
+  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]; };
+  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="0.5-5"; sha256="02xxmblp9k2hrv1ya0sxddd710hhsz5s7kh9xbg7m47h9fkvqy22"; depends=[geometry mapproj rcdd rgl]; };
-  pawacc = derive2 { name="pawacc"; version="1.2.1"; sha256="1l2wn69ynr5mza04a5mmzwzigqac8k9xkiaw7sdqv5hn9y7x3sj9"; depends=[SparseM]; };
-  pbapply = derive2 { name="pbapply"; version="1.2-0"; sha256="1sr5nr5ljdah2cs2wcfgfd0bzd4y4nk9kgp1wym1v4s9wxcbjc6x"; depends=[]; };
+  pavo = derive2 { name="pavo"; version="1.0.0"; sha256="0xi9sb36xc6h8j4h4b46imwy936wi8vlqsv4mfkjka34bn0q7afr"; depends=[geometry mapproj rcdd scatterplot3d]; };
+  pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
+  pbapply = derive2 { name="pbapply"; version="1.3-1"; sha256="053i92j0ch3msywapdia08mmk1w8bhcs6x7cl0han2r9sfliwkzw"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
-  pbdBASE = derive2 { name="pbdBASE"; version="0.4-3"; sha256="1jj2bhb0l8cyai3scb73lqf6dl8vq8c16yfmdll11z2zhvpkwdd9"; depends=[pbdMPI pbdSLAP]; };
-  pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-0"; sha256="1rrmixpr9zc6dmhif4lmpxfc1zpwy8hfwph31yn1pz5dipmaay88"; depends=[pbdBASE pbdDMAT pbdMPI]; };
-  pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-0"; sha256="16039jvm8n4lx82jw5p1i5yylm5fcb9rh39law41wq845a318ihd"; depends=[pbdBASE pbdMPI]; };
-  pbdMPI = derive2 { name="pbdMPI"; version="0.3-1"; sha256="0rk38v1iwkzd119xyb18vprc08yvdx1bs55vv1j519zscpppbqfq"; depends=[rlecuyer]; };
+  pbdBASE = derive2 { name="pbdBASE"; version="0.4-5"; sha256="0i7rav197787snhw2l5pyb2x0i9d1gl9d7lks2bk0dcxr0ndy9gm"; depends=[pbdMPI pbdSLAP]; };
+  pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
+  pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-2"; sha256="1xiwfpi8r0l8jlfrc35aknm09y4qbn0hvvkscdpcxv9q7zifvl3v"; depends=[pbdBASE pbdMPI]; };
+  pbdMPI = derive2 { name="pbdMPI"; version="0.3-3"; sha256="0bgnx2d7ykfzq85jkiggwakqz2ngmvf7d4lx8qp95w272bkpm779"; depends=[rlecuyer]; };
   pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
-  pbdPROF = derive2 { name="pbdPROF"; version="0.3-0"; sha256="0k3d70r01zlldqvz638fgizndfcaczjq79hr3ran3a6mm6jfn5z9"; depends=[]; };
-  pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-1"; sha256="1yl7hk7h285nkgf4ayprjgm0gai848igvhgym5y0bqnnlir8kdqx"; depends=[pbdMPI rlecuyer]; };
-  pbdZMQ = derive2 { name="pbdZMQ"; version="0.2-1"; sha256="1afav138zkc4m0qymyprh20fgkc225v5yb966058jphzvm21n6rb"; depends=[R6]; };
+  pbdPROF = derive2 { name="pbdPROF"; version="0.3-1"; sha256="0a7c31605si062vbwcwngv770axlwyhh00cvdfqw3hv421p61sj8"; depends=[]; };
+  pbdRPC = derive2 { name="pbdRPC"; version="0.1-1"; sha256="0ddn6ba9nvrh90jii2z9jx4graqaa985ja2q4h3q5q2d6dpm7j7r"; depends=[]; };
+  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]; };
+  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"; sha256="18rqyhkzjaqjvsyh3vr3dv9jwqvsa28d0vhnnzj72na6h6rx31w4"; depends=[combinat Rcpp]; };
-  pca3d = derive2 { name="pca3d"; version="0.8"; sha256="03ghncfpma1fwby8kxm0v90l795mknz8s4y81l24f3n7mmhighn6"; depends=[ellipse rgl]; };
+  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.3"; sha256="026cgi812kvbkmaryd3lyqnb1m78i3ql2phlvsd2r691y1j8w532"; depends=[]; };
-  pcaPP = derive2 { name="pcaPP"; version="1.9-60"; sha256="1rqq4zgik7cgnnnm8il1rxamp6q9isznac8fhryfsfdcawclfjws"; depends=[mvtnorm]; };
-  pcadapt = derive2 { name="pcadapt"; version="2.2"; sha256="0nlm1wmkcrdacfaixhna42z9vdcb3j1nczkd2qcsx6kklkrjhvik"; depends=[MASS robust]; };
-  pcalg = derive2 { name="pcalg"; version="2.2-4"; sha256="0qx0impxh6pzbgdhpkbl13qfql4zpsa3xiy4hc640d15zxprv6zw"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+  pcaL1 = derive2 { name="pcaL1"; version="1.4.1"; sha256="07qsi3k6l9ga1ixqmz8sw1hmjqg0l3rv1czwwgb6izsmjkcxfyzd"; 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]; };
+  pcalg = derive2 { name="pcalg"; version="2.4-5"; sha256="1gfwx26r76d5arqhs03wldaycx1yj55bdwlaam4w42g7hi5bzdbm"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm gmp graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; };
+  pcdpca = derive2 { name="pcdpca"; version="0.2.1"; sha256="0vl661pjlfcgqmnw3c1032aci4akld1pqxchb2fh8y5wap1nhypa"; depends=[fda freqdom]; };
   pcev = derive2 { name="pcev"; version="1.1.1"; sha256="0vhn5514dnmhv98bchvsfd6pfjmvbc7hhb9zabgf8syk9rh8y9h8"; depends=[RMTstat]; };
   pcg = derive2 { name="pcg"; version="1.1"; sha256="194j72hcp7ywq1q3dd493pwkn1fmdg647gmhxcd1jm6xgijhvv87"; depends=[]; };
-  pch = derive2 { name="pch"; version="1.1"; sha256="1vwdp4j66p2vj47psdazbaq7g0n4ldl0295z0v0k5d9q8j719ww2"; depends=[survival]; };
-  pcnetmeta = derive2 { name="pcnetmeta"; version="2.3"; sha256="1qcz18cac59i1c6limwknzwsl7svplls9i45jvvfqz91p8q68cgl"; depends=[coda rjags]; };
+  pch = derive2 { name="pch"; version="1.3"; sha256="13pfrvp539fz4hxp08yil93caw3cjdna7xnky5fqd0lhc84fwq76"; depends=[survival]; };
+  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]; };
   pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
-  pdR = derive2 { name="pdR"; version="1.3"; sha256="0y81nlvq5vwf6021m5ns6j4l44c5456jkbs2x9y7jfkw6r3v2ddf"; 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.7"; sha256="12ddf3kyw9pppjn6haq7a3k27vl17016s4h2mc31mbb9fn6h4cjz"; depends=[httr jsonlite lubridate reshape2 XML xts zoo]; };
+  pdfetch = derive2 { name="pdfetch"; version="0.1.8"; sha256="0yg5s7nxfbsffi3v1layi7w7y3bcyb1lkyinr0ygnjz5cmqf3df0"; 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="0.2"; sha256="0ys3g18gx8ibwj4srcjp37s7fb5ls392knm36jqbbgrl638jglkd"; depends=[Rcpp]; };
+  pdftools = derive2 { name="pdftools"; version="1.0"; sha256="1ziflvvzwk3g21s67b09qx023i2chvx09b0675nskvbxssnsc5r5"; 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]; };
-  peacots = derive2 { name="peacots"; version="1.2"; sha256="1qrg6rzdnj0ba6igj4k9m1kc2q7gbwg8kwnmzhkjfza8jl8fqkf2"; depends=[]; };
+  pdp = derive2 { name="pdp"; version="0.4.0"; sha256="19kijpz0davv8359a0x623zjbq1jn5agp6wfx36yi87l2dlh254y"; depends=[gridExtra lattice magrittr mgcv plyr 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-1"; sha256="0li32my02gv5yaf4q1w48pjbmij2njkpd15135n9mzjc5ibvf5kh"; depends=[]; };
-  pec = derive2 { name="pec"; version="2.4.7"; sha256="1ra8gp46f99z291cbdaln0b5k9w124vi45ncwcvaf5lgxv7c8c74"; depends=[foreach prodlim rms survival]; };
+  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]; };
   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]; };
   pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
   pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; };
-  pegas = derive2 { name="pegas"; version="0.8-2"; sha256="1sci4m7vvxi8p8lwqkqng04pajrby0c4l91sav3ahvfgj6xldp9q"; depends=[adegenet ape]; };
+  pegas = derive2 { name="pegas"; version="0.9"; sha256="0vll6b4ha5l1mf3vpxrwz99m1fzgxwh6xn3z4jg9ggd9sh8jd2wd"; depends=[adegenet ape]; };
   pems_utils = derive2 { name="pems.utils"; version="0.2.17.8"; sha256="1qxsjzxb8gdw1hyxgd923s609k98pjdaxs6wm3pg4bl1w8sxqi8d"; depends=[ggplot2 lattice latticeExtra loa plyr RColorBrewer]; };
   penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; };
   penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; };
-  penalized = derive2 { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571jyhk73zd9slcd6xnp3p0l1ijab9gl2rjhlzz5"; depends=[survival]; };
+  penalized = derive2 { name="penalized"; version="0.9-50"; sha256="0q60pgmx2wbnc7i1zf1i0sxn1zy257hl73ii0abx83zpcywq9vb6"; depends=[Rcpp RcppArmadillo survival]; };
   penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; };
   penalizedSVM = derive2 { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; };
   pencopula = derive2 { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[fda lattice latticeExtra quadprog]; };
@@ -6125,28 +7637,39 @@ in with self; {
   peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; };
   pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; };
   perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; };
-  performanceEstimation = derive2 { name="performanceEstimation"; version="1.0.2"; sha256="027bcr4ipjwmm1hni2mg7n4hz4mgs1dh2npqmfp8b5kqmccyxpx6"; depends=[doParallel foreach ggplot2]; };
+  perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; };
+  performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; };
+  pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; };
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
   permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; };
+  permGS = derive2 { name="permGS"; version="0.2.3"; sha256="0738jg5k370hjgychv7b93rhwb66xz10hlspbglcgb5w3p1r1rpl"; depends=[coin survival]; };
+  permPATH = derive2 { name="permPATH"; version="1.0"; sha256="0893aanh39dw2hqwwhm9c3d30faidg6sa4srsr2f2gs1jin3nqkq"; depends=[R2HTML xtable]; };
   permubiome = derive2 { name="permubiome"; version="1.1"; sha256="02fg1g96pg6a87n8mhrls54xp0vnqqsgg39nnjirxr7hd74l71x9"; depends=[ggplot2]; };
-  permutations = derive2 { name="permutations"; version="1.0-0"; sha256="0k6y57ya9bk57l6wq4zz8rnsj02vcfhkl5giw30dxdnv4lxqf73s"; depends=[magic numbers partitions]; };
-  permute = derive2 { name="permute"; version="0.9-0"; sha256="0w68cqw6s4pixix8bh1qzsy1pm64jqh1cjznw74h82ygp8sj7p73"; depends=[]; };
+  permutations = derive2 { name="permutations"; version="1.0-2"; sha256="04lak21x0z1cskgm5w4xdyq59kmyrz64bwfpf332vfka54aiv8lk"; depends=[magic numbers partitions]; };
+  permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; };
   perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
   persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
   personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; };
   perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; };
   perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
   pesticides = derive2 { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; };
+  petrinetR = derive2 { name="petrinetR"; version="0.1.0"; sha256="0na8srzwi933bva9j3hrn4ji8s58dm28jpxw9q13mpahzch4r454"; depends=[dplyr visNetwork]; };
+  pewdata = derive2 { name="pewdata"; version="0.2.0"; sha256="17j8fdn9x6hannr91zyccya523z3zm03gr517xfcyrd0m486xnqb"; depends=[httr magrittr purrr rvest]; };
   pez = derive2 { name="pez"; version="1.1-1"; sha256="14n9s604wwh07kjir5kw6sra6bbmnpg00h3zvli3zqd8lx892hm8"; depends=[ade4 ape apTreeshape caper FD Matrix mvtnorm picante quantreg vegan]; };
+  pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; };
   pgam = derive2 { name="pgam"; version="0.4.12"; sha256="0vhac2mysd053bswy3xwpiz0q0qh260hziw6bygpf83vkj94qf2v"; depends=[]; };
-  pgirmess = derive2 { name="pgirmess"; version="1.6.4"; sha256="1180dbxy392g06j9n2r0dlbr8rrhf0w1n273pawl8mblmf29vwz2"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
+  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]; };
   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=[]; };
+  pgraph = derive2 { name="pgraph"; version="0.8"; sha256="1r784snci5m81qljfh1r3w8qzszmy0476zvsd1alh43afzg9zpr5"; depends=[energy glasso glmnet SAM]; };
   pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
   ph2bayes = derive2 { name="ph2bayes"; version="0.0.1"; sha256="09ns3i5dgbn8573g4sism6d3y8jp26icy21l8d8px91jfhlx7kxv"; depends=[Rcpp]; };
+  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.0.2"; sha256="1ywyd5ljkm7b8qfis2d7nzz4q04b0pfkscwf6vmbb31cziks2d1j"; depends=[ape igraph Matrix nnls quadprog]; };
+  phangorn = derive2 { name="phangorn"; version="2.1.1"; sha256="1klc2s6crwmg30psgf1xkchyjqbksl7cdlnk3b0ypdw7pd3js5im"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; };
   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]; };
@@ -6155,115 +7678,154 @@ 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="4.2.4"; sha256="1074sr1p3bjz4f2zsswp5m60qs7axp9ngsk1l76gi2zpv95xay6s"; depends=[coda fields HelpersMG shiny zoo]; };
+  phenology = derive2 { name="phenology"; version="5.3"; sha256="1lw4blnv06w0czliqwpz34nz7nanfihcv04l72sxma7jjmjpn4w8"; depends=[coda fields HelpersMG zoo]; };
   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-3"; sha256="09wzsq92jkxy6cd89czshpj1hsp56v9jbgqr5a06rm6bv3spa31i"; depends=[deldir plotrix splancs]; };
+  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.6.3"; sha256="12ysjbpap9nkgg1kybgxq3f4qc54qpiqzf1dj4izmkgagqxms5xy"; depends=[BH Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.5"; sha256="1fdpn9r1mg0l6ckw73ihh6gl8z6vswxqidb6fk76kvb5c1saldlq"; depends=[caTools dplyr lubridate plyr splus2R]; };
-  photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.0"; sha256="038rsszxvja5kcm87w5vpk1hwcl6r68lyv15w1w449xcphb3c4ky"; depends=[photobiology]; };
-  phreeqc = derive2 { name="phreeqc"; version="3.3.1"; sha256="0jzzzmijlmrwmpv9xfj9lq9kppxgk6hmfbp90wj2bpnhyyhkchqi"; 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]; };
+  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]; };
+  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]; };
-  phyclust = derive2 { name="phyclust"; version="0.1-16"; sha256="19i5cpiss2k94zg03m00j9yc7zr0xsx3c8v8b7hkgv0kf9p40vjn"; depends=[ape]; };
+  phuassess = derive2 { name="phuassess"; version="1.1"; sha256="0jplj9gih32dllx2hw5aqvc9b94sbrbv66s3a5r8mdbpjh93rhng"; depends=[]; };
+  phybreak = derive2 { name="phybreak"; version="0.1.1"; sha256="14dn5q4knqb1ijbspnvyggdjrplbhxmyqj5jix8a74bk01xwl9nj"; depends=[ape phangorn Rcpp]; };
+  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]; };
   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]; };
-  phylocurve = derive2 { name="phylocurve"; version="2.0.2"; sha256="0wbsl3mcrjjbq0aihnam2raxmk1895x5wy4x0jnzic4mpxfjwnnd"; depends=[ape doParallel doSNOW drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
+  phylocurve = derive2 { name="phylocurve"; version="2.0.7"; sha256="0nffrhydz6jykph75nqciphsz3y8a5fq2hr1plbcl0lbfc60yjzx"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
-  phylolm = derive2 { name="phylolm"; version="2.4"; sha256="0smgdfqb0kg3ka6g5azshlw1ig1djk9j01pc7hqzf6rymy9wkxxg"; 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]; };
   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=[]; };
   phylotools = derive2 { name="phylotools"; version="0.1.2"; sha256="19w7xzk6sk1g9br7vwv338nvszzh0lk5rdzf0khiywka31bbsjyb"; depends=[ape fields picante seqRFLP spaa]; };
   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-20"; sha256="1k43pf04mb1lsj5vhbj1rx4jadanrdsxfbl2j57wvxswk6fxihpz"; depends=[animation ape clusterGeneration maps mnormt msm numDeriv phangorn plotrix scatterplot3d]; };
+  phytools = derive2 { name="phytools"; version="0.5-64"; sha256="0vamljghwxrdgncwzg0217cw65f0gzn0bx72xxlmdw69wshhrj3m"; depends=[animation ape clusterGeneration coda combinat maps mnormt msm 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]; };
-  picasso = derive2 { name="picasso"; version="0.5.0"; sha256="1m9fjpg6nx0c8fnh0m5g29gfrnprhzgzx5162r9sjf8i1xspawn4"; depends=[igraph lattice MASS Matrix]; };
+  picasso = derive2 { name="picasso"; version="0.5.4"; sha256="0y6d0wmgv4nhyxyp0nz2hmfwvm4laagr1jzvngw3h4na1sw10l6i"; depends=[igraph lattice MASS Matrix]; };
   pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
-  piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.1"; sha256="09x0nb6qbpikaxn2n7dq71dk25miv6rq96kpm24927l72dgx82gj"; depends=[ggm lavaan lme4 nlme]; };
-  pinfsc50 = derive2 { name="pinfsc50"; version="1.0.0"; sha256="15zliybiw6mwyvcyi3n55jn996h2yl6j2m02yfns72g8p6sg89gk"; depends=[]; };
+  piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.2.1"; sha256="0c705ngyj2pf24vvqdld5rnf875pw64gs64l9f7nylbfrax39kbv"; depends=[lavaan lme4 nlme pbkrtest]; };
+  pim = derive2 { name="pim"; version="2.0.0.2"; sha256="1fjnll2lfgdfak9427rh343y80awjzwpy46v33kpd6niz41zmra8"; depends=[BB nleqslv]; };
+  pinbasic = derive2 { name="pinbasic"; version="1.0.1"; sha256="16sja6f8ivixrqj83xjgfxrvql6rzhkr0kd9li9spzhs20r4yshl"; depends=[doParallel fastcluster foreach ggplot2 iterators lubridate reshape2 scales]; };
+  pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
   pingr = derive2 { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
-  pinnacle_API = derive2 { name="pinnacle.API"; version="1.90"; sha256="10fpb7zsl22y61dsgxh2yphf5yn5b2dv42xd441q53xbpxsdhw7f"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; };
-  pipe_design = derive2 { name="pipe.design"; version="0.3"; sha256="1idgy7s6fnydcda51yj1rjil2pd1r2y6g0m5dmn8sw7wmaq2n3h6"; depends=[ggplot2 gtools]; };
-  pipeR = derive2 { name="pipeR"; version="0.6.0.6"; sha256="1d7vmccvh5ir26cv26mk0ay69rqmwmp0mgwjal9avfn9vrxq1fq3"; depends=[]; };
+  pinnacle_API = derive2 { name="pinnacle.API"; version="1.92"; sha256="1a2s33sizg9q6iml56hbbs1c7hx5lz7v7hplhs0nv05vrh8cg9zm"; depends=[dplyr httr jsonlite RCurl rjson uuid XML]; };
+  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=[]; };
+  pipefittr = derive2 { name="pipefittr"; version="0.1.2"; sha256="0pzd7f0rhn0rydncki666zlajdwyiay3apa17cb0xy5454d99mvh"; depends=[magrittr miniUI rstudioapi shiny stringr]; };
+  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]; };
-  pixiedust = derive2 { name="pixiedust"; version="0.6.1"; sha256="170550dsmc1c5qk288d6qw9xhxn415fgncyf4gqdsl6b5h632c11"; depends=[ArgumentCheck broom dplyr Hmisc htmltools knitr lazyWeave magrittr stringr tidyr]; };
+  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.3"; sha256="1f7jkriib1f19mc5mdrymg5xzdcyclfvh1220agy4lpyprxgza0f"; depends=[]; };
+  pkgKitten = derive2 { name="pkgKitten"; version="0.1.4"; sha256="0c44zrvpyz87s5mjhsqdrkyrvyzhyldnq371bwnn9crbpbac3wnd"; depends=[]; };
   pkgconfig = derive2 { name="pkgconfig"; version="2.0.0"; sha256="1wdi86qyaxq1mwkr3nrax3ab7hhj2gp1lbsyqnbcc9vzg230nh0r"; 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]; };
-  pks = derive2 { name="pks"; version="0.3-1"; sha256="1nr36k960yv71yfxkzchjk814sf921hdiiakxvv5f9dxpf00hxp4"; depends=[sets]; };
+  pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; };
+  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=[]; };
+  plac = derive2 { name="plac"; version="0.1.1"; sha256="08kqnjzbfygnbqvqg5wyw148kfhjqxy46y4vaiq9zzwzj58w8vzn"; depends=[Rcpp RcppEigen survival]; };
+  placement = derive2 { name="placement"; version="0.1.1"; sha256="1narjb90sb5prvzfv2x30bz8y9aq8hqggza91ghwi47m99vm1dg6"; depends=[base64enc digest jsonlite RCurl stringi urltools]; };
   plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
   planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; };
-  planor = derive2 { name="planor"; version="0.2-4"; sha256="0k5rhrnv2spsj2a94msgw03yyv0hzrf8kvlnbhfj1dl7sb1l92a1"; depends=[conf_design]; };
-  plantecophys = derive2 { name="plantecophys"; version="1.0-2"; sha256="1lb5jzigwabqdcb11chlkv4xdbazlnda70scj49x13hmgk7j8lz5"; depends=[]; };
-  plaqr = derive2 { name="plaqr"; version="1.0"; sha256="1vv15zqnmir5hi9ivyifzrc1rkn1sn5qj61by66iczmlmhqh17h8"; depends=[quantreg]; };
+  planor = derive2 { name="planor"; version="1.0-1"; sha256="1wi1s41wwk4zi5sqzm5flaphrpffqv8bhsgzdpknmnhp1nn0hllv"; depends=[conf_design]; };
+  plantecophys = derive2 { name="plantecophys"; version="1.1-8"; sha256="02425j4pgwqadg2zn7vyl4741panif236m89zm36p580chp23wir"; depends=[]; };
+  plaqr = derive2 { name="plaqr"; version="1.1"; sha256="0hkzfxph2lacrd4npqvf4pyaldr1z56hlfbj3gi7qjlflxqnv3xp"; depends=[quantreg]; };
+  plater = derive2 { name="plater"; version="1.0.0"; sha256="0nbkfqrz78zgf06lsfzmwj50lfbq3dvi01j4rlbb6dwamx2cn3sf"; depends=[dplyr]; };
+  platetools = derive2 { name="platetools"; version="0.0.2"; sha256="0xan3h3djhgjbqn8f7yzlkm25l0fzq86zhb5xwfib4yajnb2dspa"; depends=[dplyr ggplot2 plyr RColorBrewer]; };
   playwith = derive2 { name="playwith"; version="0.9-54"; sha256="1zmm8sskchim3ba3l0zqfvxnrqfmiv94a8l6slcf3if3cf9kkzal"; depends=[cairoDevice gridBase gWidgets gWidgetsRGtk2 lattice RGtk2]; };
-  plfMA = derive2 { name="plfMA"; version="1.0.2"; sha256="0ji3070hwyiqikpmlw7pn16mbfpgqpn6mgf4836r0vk6j3bd3fd0"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma]; };
+  pleiades = derive2 { name="pleiades"; version="0.1.0"; sha256="0y7y6c4605nx70xabwfqzmz7piqmvczzcf56y8skvr7qpx7iwhbp"; depends=[crul dplyr gistr jsonlite rappdirs RSQLite]; };
+  pleio = derive2 { name="pleio"; version="1.1"; sha256="01w1z5m65z0wrlsdbs7jc9l5sp73jr55xwqdaqp76cf6kvbd6yb8"; depends=[Matrix]; };
+  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]; };
-  plm = derive2 { name="plm"; version="1.5-12"; sha256="0zsdm0d6vvyliz7k3l2b8xzp1qp8yahibczzhnrmm9py6sp8m7jz"; depends=[bdsmatrix car Formula lattice lmtest MASS nlme sandwich zoo]; };
+  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]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
+  plogr = derive2 { name="plogr"; version="0.1-1"; sha256="13zliqlbkl8b04k9ga0sx5jsh7k867gracgl84l2a9kcqy9mqx92"; depends=[]; };
   plot3D = derive2 { name="plot3D"; version="1.1"; sha256="1xy4h9k1ddz040ns7dfqqckkmb165f2h4xfz44h8lfwazr59dzgg"; depends=[misc3d]; };
+  plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; };
   plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
-  plotKML = derive2 { name="plotKML"; version="0.5-5"; sha256="15gdn2dq6jy6rd1xiahqnkg7l7j033906vg5qp8myjxqmlcqk7h4"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
+  plotKML = derive2 { name="plotKML"; version="0.5-6"; sha256="091zzk30bsdxqzfh2p3xvk6fhijcw1143ccrkyd5srp8vc97bxhz"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; };
   plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; };
+  plotMElm = derive2 { name="plotMElm"; version="0.1.4"; sha256="17fif2rqsf4f9jr4s7nr7wikwg63nibz6yjkldf7yh1qqqfikd2g"; depends=[ggplot2 interactionTest]; };
   plotROC = derive2 { name="plotROC"; version="2.0.1"; sha256="1r80712svlm8kfbnymv27wrn60bckxnmq1rva3caln5b58swzcdk"; depends=[ggplot2 gridSVG plyr shiny]; };
-  plotSEMM = derive2 { name="plotSEMM"; version="2.1"; sha256="0xpq8h7xm9p25wcfp9av0vwz4hdm4ibrwy68pff8fdf7bb1fy49w"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
-  plotly = derive2 { name="plotly"; version="3.4.1"; sha256="0krx2gnji6fr5gw46yva1dir32z2m50qlnh7h6mhs7w89cbfqwvp"; depends=[base64enc digest ggplot2 htmlwidgets httr jsonlite magrittr plyr scales tidyr viridis]; };
-  plotmo = derive2 { name="plotmo"; version="3.1.4"; sha256="0b12w6sg317vgmhyn4gh9jcnyps1pyqnh5ai15y1dfajsf2zjhca"; depends=[plotrix TeachingDemos]; };
+  plotSEMM = derive2 { name="plotSEMM"; version="2.2"; sha256="08px2ng2lxhfkjmr6w26rxqzpqa18adjn59g14c29jqzx6s2m5h2"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; };
+  plotfunctions = derive2 { name="plotfunctions"; version="1.0"; sha256="16q5qzfkia4lhmx8wkajxcj6vn9nb6388fi8mr33g2n2pv721yax"; depends=[]; };
+  plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
+  plotly = derive2 { name="plotly"; version="4.5.6"; sha256="09yw977yxlcxv57kni3q899zrxyxa6pznr06cylr9lqkyr7llfhx"; depends=[base64enc digest dplyr ggplot2 hexbin htmlwidgets httr jsonlite lazyeval magrittr purrr scales tibble tidyr viridisLite]; };
+  plotmo = derive2 { name="plotmo"; version="3.3.2"; sha256="030ba2c1g61a9wd4994pk8c32amj23ar7vghynkqz6ppb2nfzx8i"; depends=[plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
-  plotrix = derive2 { name="plotrix"; version="3.6-1"; sha256="1y8xnlpy4zba70af9lwj2sshvfdfcmfdh92wamyzj8z9gciailfr"; depends=[]; };
-  pls = derive2 { name="pls"; version="2.5-0"; sha256="135pqb6frjldv86fs00p2mgrc9vjna3jvns3slj5a300drajja1w"; depends=[]; };
+  plotrix = derive2 { name="plotrix"; version="3.6-4"; sha256="1wxzjnzvkl3aga51ad2xhv4s7v46kvnp4z0nz4cb9cn10057sfw8"; depends=[]; };
+  plotrr = derive2 { name="plotrr"; version="0.2.0"; sha256="12kab7w32hcdqmwh3nfpk1zqkgnvpx3p0292w47643ahl26s9whj"; depends=[dplyr ggplot2]; };
+  plotwidgets = derive2 { name="plotwidgets"; version="0.4"; sha256="1w7c9grw4pyyra230196yq32snr4wdg6xi8vh4dx5df2v500wz22"; depends=[]; };
+  pls = derive2 { name="pls"; version="2.6-0"; sha256="15j59p5x0rkdrk7iqzkipsy50rsyjl31w8zxc4w3v1j5gzxhi1rx"; depends=[]; };
   plsRbeta = derive2 { name="plsRbeta"; version="0.2.0"; sha256="1b8yldz5nzw3gilv9wk79bxcqb0hrgsxi2cn6qlby5nf9b4zmzv8"; depends=[betareg boot Formula MASS mvtnorm plsdof plsRglm]; };
   plsRcox = derive2 { name="plsRcox"; version="1.7.2"; sha256="1c3ll13m27ndwlc9r79ilzl0i6cyp870x66swlbg6387whf7wn2r"; depends=[kernlab lars mixOmics pls plsRglm risksetROC rms survAUC survcomp survival]; };
   plsRglm = derive2 { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd97j10v2h8jqiybcqbm3kvqhgqydm07rp"; depends=[bipartite boot car mvtnorm]; };
+  plsVarSel = derive2 { name="plsVarSel"; version="0.9.1"; sha256="0jwhdcrr68562q83528h7x3kjadfzn6j5l02axyfvflzgdnxwcnc"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; };
   plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; };
   plsdof = derive2 { name="plsdof"; version="0.2-7"; sha256="1z8z9m0nsnyy1fipzvm1srpxn3q6wjrlivmmki1f8plwkixkyc5y"; depends=[MASS]; };
   plsgenomics = derive2 { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[boot MASS]; };
   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-0"; sha256="1qq0f95ndpiykbizyivjcbjbbmqqns08i1dkjn3n7k2r9130z8rx"; depends=[lhs MASS]; };
   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]; };
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
   plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
-  plyr = derive2 { name="plyr"; version="1.8.3"; sha256="06v4zxawpjz37rp2q2ii5q43g664z9s29j4ydn0cz3crn7lzl6pk"; depends=[Rcpp]; };
-  pmc = derive2 { name="pmc"; version="1.0.1"; sha256="19yphb0834qriq7w2y287750rrc0kqibx76yx95qwyh6ymzcvha2"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
+  plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; };
+  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-7"; sha256="1k6lllhx8ki9c8kkl6al75zqy50h570j49242wb39h50s78bxp00"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
+  pmclust = derive2 { name="pmclust"; version="0.1-9"; sha256="1p506d3gs0i46zjdia0pc71wwfv6nrfkmk5qaan5sdz6vn24zjhj"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
   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=[]; };
-  pmml = derive2 { name="pmml"; version="1.5.0"; sha256="192jffh9xb7zfvx4crpynrbdrx1fpiq303c2xz1wjqnq7wjmb3qw"; depends=[survival XML]; };
+  pmml = derive2 { name="pmml"; version="1.5.1"; sha256="1w53lkzsgi8d3h89zpr4la3r52mhqxr6a7hazhsmvwhjfkz874ki"; depends=[survival XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.0"; sha256="17dhgpldwadsvm25p8xwqsamcn1ypsqdijy2jia048qqmsy4ky86"; depends=[]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
-  pnea = derive2 { name="pnea"; version="1.2.4"; sha256="1yfh1z09x822zzila6kq82s5cn4sgnbprwmim251y61k3xw0ad9m"; depends=[]; };
-  pnf = derive2 { name="pnf"; version="0.1.1"; sha256="0kasq27dnjwqzlzybc8m3wv9jwyag6z38ayv88msa7lxcnibr34i"; depends=[]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
   poLCA = derive2 { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[MASS scatterplot3d]; };
   pocrm = derive2 { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; };
-  pogit = derive2 { name="pogit"; version="1.0.1"; sha256="19sawm7j5fa9s1nlz4hvhpgjj7n3rrnsh2m5a6scxis4brnaa98n"; depends=[BayesLogit ggplot2 logistf plyr]; };
+  pogit = derive2 { name="pogit"; version="1.1.0"; sha256="145dh48scxx4wcdr2g7548vg4g03w1ji7hz91752im9a27v7s4pa"; depends=[BayesLogit ggplot2 logistf plyr]; };
   poibin = derive2 { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
-  pointRes = derive2 { name="pointRes"; version="1.1.1"; sha256="1l1rn3siz1rgwx41vgknjxsiklkk2q1sycnlgd394j62v0pl23am"; depends=[ggplot2 gridExtra plyr TripleR]; };
+  pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
   pointdensityP = derive2 { name="pointdensityP"; version="0.2.1"; sha256="013vamdh987w56bmz0m6j2xas4ycv1zwxs860rs5z4i55dhgf9kh"; depends=[]; };
+  poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; };
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
   poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; };
   poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; };
   poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; };
   polidata = derive2 { name="polidata"; version="0.1.0"; sha256="07641v0dnn161kyxx7viplkf8c3r51hd4hd5pzmcph4y4387r01i"; depends=[jsonlite RCurl]; };
-  pollstR = derive2 { name="pollstR"; version="1.2.2"; sha256="1ii832gil8ppwf8hd8simnbqbc4yq75myb2zin9wmimm5zaqzn2s"; depends=[httr jsonlite plyr]; };
+  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]; };
+  pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; };
+  polmineR = derive2 { name="polmineR"; version="0.7.0"; sha256="13ncdqn1wh5rcad79l0d388qnyi3171djfbz3qjkzw05n3q8rk57"; 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]; };
@@ -6271,39 +7833,45 @@ in with self; {
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
   polyapost = derive2 { name="polyapost"; version="1.4-2"; sha256="0nr8mw0k79kz5zd1k81kz0i940vmlzqqscn1z1yaik0rx8i7mhs7"; depends=[boot rcdd]; };
   polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-0"; sha256="0yb119y0a2xjsijxbrxgksnhf3m997dgp9d57wghq68dsfjp3hf3"; depends=[lhs MASS]; };
-  polyclip = derive2 { name="polyclip"; version="1.4-1"; sha256="0aaqakzxba9xqnr3wd7x3r7qkk16gb9d6kgbgrnxd1vn15p449j6"; depends=[]; };
-  polycor = derive2 { name="polycor"; version="0.7-8"; sha256="0hvww5grl68dff23069smfk3isysyi5n2jm4qmaynrk0m3yvhxwn"; depends=[mvtnorm sfsmisc]; };
-  polyfreqs = derive2 { name="polyfreqs"; version="1.0.0"; sha256="01rl3s7dav1i643fq3r9x8brff48xi49jqiv3hsh8rlifny8wf0z"; depends=[Rcpp RcppArmadillo]; };
-  polynom = derive2 { name="polynom"; version="1.3-8"; sha256="05lng88c8cwj65cav31hsrca9nbrqn5rmcz79b17issyk2j0g86p"; depends=[]; };
-  polysat = derive2 { name="polysat"; version="1.4-1"; sha256="0n44l66x270biigwf8lwbzsqd3p4zv40firrw07sfbf779cbwd3h"; depends=[]; };
+  polyclip = derive2 { name="polyclip"; version="1.5-6"; sha256="1ypwvgd5z61md539z7ndmpl8vaifsjbm231n08zsxskskj1fid7y"; 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.3.1.1"; sha256="1jy20h9qk80plizsqjbynvadphxz7hnji3pgl6ln48cddgn26qjf"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
+  pomp = derive2 { name="pomp"; version="1.10"; sha256="1v4mkgn0vn83kgl2la94gnc5g1xxkk1h5gxvjyzkqgkakaigwmsx"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
   pooh = derive2 { name="pooh"; version="0.3-1"; sha256="0fn711jyn18byfc2nq3y154k8rb39vpnfw1a0xw73pqp1cwd2i73"; depends=[]; };
-  popEpi = derive2 { name="popEpi"; version="0.2.1"; sha256="0xna95gqqbqlfxaarzvyq4c724sxqw0fh9kn46sf674lr13n0jj2"; depends=[data_table Epi]; };
+  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]; };
   popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; };
   popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
   popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; };
-  popbio = derive2 { name="popbio"; version="2.4.2"; sha256="1p0699hvc0qbp5sgxh812rbmkiqxbm8c9zrv4m9iq9dq5ad53zrc"; depends=[]; };
-  popdemo = derive2 { name="popdemo"; version="0.1-4"; sha256="0syhmm8fnxbsdzj75y7dpahmpf453a6gwp3yljkvmfl0bfv1g1ng"; depends=[expm]; };
+  popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; };
+  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.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
-  poppr = derive2 { name="poppr"; version="2.1.1"; sha256="1sav268n00h56ppc4adda4qpbmx3wsjyiz4q784qwzf6i6f46faa"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph pegas phangorn reshape2 shiny vegan]; };
-  popprxl = derive2 { name="popprxl"; version="0.1.1"; sha256="0zcl4kbb9yrrkkky9qx30g42qphibi7mq1bwkncw2dn5gjkx4zf8"; depends=[poppr readxl]; };
-  popsom = derive2 { name="popsom"; version="3.0.1"; sha256="0qj4l5cdzrhiaq1q6q7wv75jnbfvw1rrms2v6ffw34wz4fs1w6is"; depends=[fields som]; };
+  poppr = derive2 { name="poppr"; version="2.3.0"; sha256="0zhmsx23fjjl8zy7s0gyzd0br4imdl2hfgk0g9v9p2ff72xg046d"; 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]; };
   population = derive2 { name="population"; version="0.1"; sha256="1xcm38hipasf6x5grsn7dqayy2g5mwppx2dvi5lwax5a6dqjk792"; depends=[abind]; };
   portes = derive2 { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5inkv2cwgzd0zi6ky0vvrc3abchqsjm2ck"; depends=[]; };
   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=[]; };
-  poweRlaw = derive2 { name="poweRlaw"; version="0.50.0"; sha256="1y9f21sl601rb1qsljgkbnsb9jd76k1k91n7cbz7iyzy8n345jgm"; depends=[VGAM]; };
+  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"; sha256="15ff3wnn37sjkiyycgh16g7gwl3l321fbw12kv621dad5bki14jl"; depends=[]; };
+  powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; };
+  powerEQTL = derive2 { name="powerEQTL"; version="0.1.3"; sha256="1045vkzl5p20mqlsm0j6vnyyvfz5v6jyy443c38sw1cps0a09i1n"; depends=[powerMediation]; };
   powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; };
-  powerMediation = derive2 { name="powerMediation"; version="0.2.4"; sha256="1b4hzai52fb0kk04az3rdbfk2vldfkhsa4gx7g98lbsvw4gh9imb"; depends=[]; };
+  powerMediation = derive2 { name="powerMediation"; version="0.2.7"; sha256="1zqkwwlv57k5b86lcqjbdn11xgxayhsdqrq64n5pai8n4jxrkr5g"; depends=[]; };
   powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.0.9"; sha256="0f8i867zc1yjdp66rjb1cp92fcfrlq167z3d0c4iv355wv4s35az"; depends=[survival]; };
+  powerbydesign = derive2 { name="powerbydesign"; version="1.0.3"; sha256="0dv4j0kwdzvxnq587vs1dsy2yci3v3q2smncpscpcsalp38rvx4i"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; };
   powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
-  powerplus = derive2 { name="powerplus"; version="1.0"; sha256="0k8kir2lcr8036phfnhgw573nhfqijlh56p3pzgzbchwzrj9z10r"; depends=[expm MASS Matrix phonTools]; };
+  powerplus = derive2 { name="powerplus"; version="3.0"; sha256="0gm2iw6d7rpaxzpp66si9ra7vhw4gpwjm4b2dzf9fvq67bzdvcc6"; depends=[complexplus expm MASS Matrix phonTools]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
   ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GO_db GOSemSim igraph]; };
   ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
@@ -6312,30 +7880,42 @@ 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.8.8"; sha256="0ans9l5rrb7a38gyi4qx4258sd5r5668vyrk02yzjpg9k3h8l165"; depends=[]; };
+  pracma = derive2 { name="pracma"; version="1.9.9"; sha256="1g062d9lsjkqrd5m91h55pc3zcqha9drmdi4zqic4hx6qyyhy2q1"; 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=[]; };
   praktikum = derive2 { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
   prc = derive2 { name="prc"; version="2015.6-24"; sha256="0sf664zqcq6xylhd7rvm2l2xj3f4j6llaj7j4b4847wfxnas2j02"; depends=[kyotil nlme]; };
-  prclust = derive2 { name="prclust"; version="1.1"; sha256="0dm7qjvwyrym3sff24k5zz87835dhldrm3qiyyx6xq92p0wn89jz"; depends=[Rcpp]; };
-  precintcon = derive2 { name="precintcon"; version="2.2.1"; sha256="1z63aa8i2jyc0a8n5q1ny2p3mzxadyk1kk94rz8dp6j6kp2hxnf8"; depends=[ggplot2 scales]; };
-  precrec = derive2 { name="precrec"; version="0.3.1"; sha256="0i131qzmvv1sscl6ngh4gd6i39whph697pwv2sycwr480cqw07pq"; depends=[assertthat ggplot2 gridExtra Rcpp]; };
-  predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme plyr]; };
+  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]; };
+  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]; };
+  predatory = derive2 { name="predatory"; version="1.1"; sha256="18nv8riw380acvgb8iz771wzdgrmkrwcvdxbxhkbczcdhgw1p0ig"; depends=[readr stringr]; };
+  prediction = derive2 { name="prediction"; version="0.1.1"; sha256="0ys0pds2x8nhkf45dp5f0pmp64al670w7xgr5hbifmykn2ivdiqr"; 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=[]; };
   prefmod = derive2 { name="prefmod"; version="0.8-33"; sha256="0wklp3djy3z8lq0vrjrzqha6r8z00jwdm6d9ffyq5vhimmbirzj8"; depends=[colorspace gnm]; };
-  prepdat = derive2 { name="prepdat"; version="1.0.7"; sha256="05i6iv4vk83lcmpsqcn85vq62p3irfmbf1zjs5prl2d88xlqj7w9"; depends=[dplyr psych reshape2]; };
-  preprocomb = derive2 { name="preprocomb"; version="0.2.0"; sha256="0kfmdz926ianvy016hb6ba20qkh9pbgnzi1dali4bc4h8qhnjz5y"; depends=[arules caret clustertend DMwR e1071 randomForest zoo]; };
-  preproviz = derive2 { name="preproviz"; version="0.1.1"; sha256="0k2jap204zqwbbq53vdvzks8kivyp7myg1s9srfd8x6jqcy045yi"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; };
-  presens = derive2 { name="presens"; version="2.0.0"; sha256="1srrb1d2f5bszkcpi2xdq7ccjhsyp3dihfr0zqhn0m71whnzhi7z"; depends=[birk marelac]; };
-  preseqR = derive2 { name="preseqR"; version="2.0.0"; sha256="06jxd7vndvf63bwlsyc3ydwiw5z88y1i87iqd32gchfrg4iaw6xl"; depends=[polynom]; };
+  prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; };
+  preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; };
+  preprosim = derive2 { name="preprosim"; version="0.2.0"; sha256="1z10ranfal51vzsnndfaw5aqddh2w1xx8h50j1p7gx4fi90d0waq"; depends=[caret DMwR doParallel e1071 foreach ggplot2 reshape2]; };
+  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]; };
   prettyGraphs = derive2 { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
   prettyR = derive2 { name="prettyR"; version="2.2"; sha256="026cgbrqs799lg06qlwx1r9ramil790qxrb1cyl4w7mzf8sfpgn9"; depends=[]; };
-  prettymapr = derive2 { name="prettymapr"; version="0.1.4"; sha256="02ha33fppxj4hp7xicpzjri50cbvgzx0mi3nlxc60zvb5gm0zgkk"; depends=[digest foreach rgdal rjson sp]; };
+  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]; };
   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]; };
   prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; };
+  primefactr = derive2 { name="primefactr"; version="0.1.0"; sha256="1p0hlf0llyfccg0pa2fccxp8zzhwsyrpd18d8ih1z7mx88kyrhwm"; depends=[]; };
   primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
   primerTree = derive2 { name="primerTree"; version="1.0.3"; sha256="0k81h6ln9yjg3r4j8n5f8g8xlrq1pvrr5ywrw16s4mjjhx3r1ylg"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr scales stringr XML]; };
   primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; };
@@ -6343,831 +7923,1066 @@ in with self; {
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   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="0.9-5"; sha256="05skjqimzhnk99z864466dc8qx58pavrky320il91yqyr8b98j8b"; depends=[combinat fAsianOptions hypergeo VGAM]; };
+  prob = derive2 { name="prob"; version="1.0-0"; sha256="0gnp3q3dm176c1n7vdgisv3p11m2jk1hiza1yi8qaqyd9mfh86bg"; depends=[combinat fAsianOptions]; };
   probFDA = derive2 { name="probFDA"; version="1.0.1"; sha256="093k50kyady54rkrz0n9x9z98z5ws36phlj42j25yip7pzhfd6sv"; depends=[MASS]; };
   probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; };
   probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
-  prodlim = derive2 { name="prodlim"; version="1.5.7"; sha256="11dhzfw3daanmpnwyynx2q2mwkn8fihi4rsikl1f7rmzadis4ixd"; depends=[KernSmooth lava Rcpp survival]; };
+  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]; };
+  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]; };
   profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
   profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
-  profileR = derive2 { name="profileR"; version="0.3-2"; sha256="0mr8gzw8055bmqla3kz8g996mnwdki1m3dlxhyrig8h2fy1gmx5a"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
+  profileR = derive2 { name="profileR"; version="0.3-3"; sha256="0yc0bgcv8g4qm777l8czvwcw4gsrsgc1f2qgllyid6wsnvw25x6v"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
   profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; };
+  profmem = derive2 { name="profmem"; version="0.4.0"; sha256="1nnk145hzr447z9frk3c58xks3jp0cdl7cv8schqnyjxqlv967g9"; depends=[]; };
   profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
   proftools = derive2 { name="proftools"; version="0.99-2"; sha256="1vx0270sgx15dl6x3nnx13v5y4c0m18yvrhiycl429zky0jzxfr0"; depends=[]; };
-  progenyClust = derive2 { name="progenyClust"; version="1.1"; sha256="0d3p38mb0vg7ymzi751wkdcpkfqzf45li6zsvm8rvma41ky06w63"; depends=[Hmisc]; };
+  profvis = derive2 { name="profvis"; version="0.3.3"; sha256="0lj4cr9jkbnvb4876kzkwy8gzrw2flbbwb0gw744f4q0240zybs6"; depends=[htmlwidgets stringr]; };
+  progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; };
   prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; };
-  progress = derive2 { name="progress"; version="1.0.2"; sha256="1dpcfvdg1rf0fd4whcn7k09x70s7jhz8p7nqkm9p13b4nhil76sj"; depends=[prettyunits R6]; };
+  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]; };
   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=[]; };
-  proportion = derive2 { name="proportion"; version="1.2.0"; sha256="12f4jddr99bv306m6rdvzc1l1xpl7zgg84ka7b691m4s957faxcv"; depends=[ggplot2 TeachingDemos]; };
+  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]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
-  protViz = derive2 { name="protViz"; version="0.2.9"; sha256="0kn2dd3za8mmb6476v3wqnymhihyavw2qsh98i4q3xdiz1g77vql"; depends=[Rcpp]; };
+  protViz = derive2 { name="protViz"; version="0.2.28"; sha256="1jnc2picmip1681pw9g9l1p7di65mvr10dybqdl0l9gidchn5p0n"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
   proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; };
   protiq = derive2 { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[graph mvtnorm RBGL]; };
-  proto = derive2 { name="proto"; version="0.3-10"; sha256="03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"; depends=[]; };
+  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]; };
   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.1-1"; sha256="09iwyfvscz0ajgadfd69hhsnhkaqwpjnly9g6jjrdcqnaj4lw77l"; depends=[]; };
-  provenance = derive2 { name="provenance"; version="1.4"; sha256="0kcqa4my4ccbnwp30ir3yxlds8r54kf46s3f0fq7q4dnyajwn4pk"; depends=[MASS]; };
-  proxy = derive2 { name="proxy"; version="0.4-15"; sha256="17qnrihxyyyj0lx6hka4mwkgy764ha4jx00a822xjnnbygk81iqv"; depends=[]; };
+  protr = derive2 { name="protr"; version="1.2-1"; sha256="08431v94p6c4sw2yqm6jc2v20kdgp5gn8kbl40am875z4a9q7c76"; depends=[]; };
+  provenance = derive2 { name="provenance"; version="1.5"; sha256="16hy0wbksa85jvv13ksq9qhsv03vr45qsl0l20b33yapgj358v4z"; depends=[MASS]; };
+  proxy = derive2 { name="proxy"; version="0.4-17"; sha256="0bg1fn96qrj8whmnl7c3gv244ksm2ykxxsd0zrmw4lb6465pizl2"; depends=[]; };
   prozor = derive2 { name="prozor"; version="0.1.1"; sha256="0yv9yzp8ldn888v2sg62qaq0vjg5xwjq9274x68idrlywzgplfgv"; depends=[doParallel foreach Matrix seqinr]; };
   pryr = derive2 { name="pryr"; version="0.1.2"; sha256="1in350a8hxwf580afavasvn3jc7x2p1b7nlwmj1scakfz74vghk5"; depends=[codetools Rcpp stringr]; };
-  psData = derive2 { name="psData"; version="0.2"; sha256="0a663giyi0si7pck3zsn0bzl0w1r1g60mp3x8vqzazivccjxc1lf"; depends=[countrycode DataCombine reshape2 rio xlsx]; };
+  psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; };
+  psbcGroup = derive2 { name="psbcGroup"; version="1.3"; sha256="02h9ghmnmiyg46mi5c9fyz62psyp0l0rbh0pdvn9y0xyagrj7wln"; depends=[LearnBayes mvtnorm SuppDists]; };
   pscl = derive2 { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[lattice MASS]; };
   pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; };
   psd = derive2 { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; };
-  pse = derive2 { name="pse"; version="0.4.5"; sha256="0yy6y3xlhqpm8csslv5g8xbnq168and9qxp3xvcl84kif9p064nh"; depends=[boot Hmisc]; };
+  pse = derive2 { name="pse"; version="0.4.6"; sha256="155s9ccns1i1nkfmx8112rx16i94f9kv9bak5gcnmi55r5wj7wmj"; depends=[boot Hmisc]; };
   pseudo = derive2 { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[geepack KMsurv]; };
-  pseval = derive2 { name="pseval"; version="1.0.0"; sha256="17w98qda2h6as2g02fqv6vvrw8m90zsdcfa0i5ss8c546fzchzxl"; depends=[survival]; };
+  pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; };
   psgp = derive2 { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[automap gstat intamap Rcpp RcppArmadillo]; };
-  psidR = derive2 { name="psidR"; version="1.3"; sha256="1jdxbjvc309b1bs81v57kc1g7lgfdz84bfakh9qwh8wgjqbjr06i"; depends=[data_table foreign RCurl SAScii]; };
+  psidR = derive2 { name="psidR"; version="1.4"; sha256="1whdjsab5cihlq4gp06xafl3zg7z0cjb4622d23v24igz7kr0ic2"; depends=[data_table foreign RCurl SAScii]; };
   pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
   psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; };
   pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
   pspline = derive2 { name="pspline"; version="1.0-17"; sha256="1n3mhj6q7a1v2k8xkbwji27dihcy3845wp50sx14hy4nbay5kf1r"; depends=[]; };
   pssm = derive2 { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; 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.5.8"; sha256="0bdc49kqbv0yw68rhhgn9by3rqcc9bdg28hdn6wazrg8qvgc3c5h"; depends=[mnormt]; };
+  psych = derive2 { name="psych"; version="1.6.12"; sha256="0ijz9gcc52byzmrw4iz976lgayp1wmn5b9v36bras14fwlwri0ky"; depends=[foreign mnormt]; };
   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]; };
-  psychotools = derive2 { name="psychotools"; version="0.4-0"; sha256="17qwlxj00i0aqwf39hwr6mmxa6jy0j6dxfrp9p1xskbgi5cnvslk"; depends=[]; };
-  psychotree = derive2 { name="psychotree"; version="0.15-0"; sha256="08mq4gssrhydn106zm6xxwb1kk43hdzw6jqclx1ya0g8xfri2rrd"; depends=[Formula partykit 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=[]; };
-  psytabs = derive2 { name="psytabs"; version="0.5"; sha256="0jcsv771ndf0fv76982rbv099ii4l55a8bj1mhgr54838ins0gg7"; depends=[lavaan mokken plyr psych R2HTML rtf semTools]; };
+  psytabs = derive2 { name="psytabs"; version="1.0"; sha256="0dgp5h0jxmqbkkjvd39w1ds9hcggd27fc7pfarwa3iivphf35dim"; depends=[lavaan mokken plyr psych R2HTML rtf]; };
+  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]; };
+  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.5"; sha256="0993sx2zhrjl9maqrapl3hmy4g4gfm0m1x1vasi4rfdb5rqk5387"; depends=[boot R2HTML RCurl XML]; };
-  pubprint = derive2 { name="pubprint"; version="0.1.1"; sha256="0zfbl5xmn0f5dwh8wanvnwfdswjjv9vjnhkfjlsymmwchkxm6b1j"; depends=[stringr]; };
-  pullword = derive2 { name="pullword"; version="0.1"; sha256="1mxv63q2nfnhxcn8m17d40w792l1i7diykg6h0i42pj0rsa4ww36"; depends=[RCurl]; };
-  pumilioR = derive2 { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[RCurl XML]; };
-  purge = derive2 { name="purge"; version="0.2.0"; sha256="1kv65as811x53jwg8b26cf9mhhicyn8ncnlsbd9zc0qlg61h00q2"; depends=[]; };
-  purrr = derive2 { name="purrr"; version="0.2.1"; sha256="01pms115c0jjb5gsm1l3bxj116cqm8g3zkgn020l384nbmdafzsr"; depends=[BH dplyr lazyeval magrittr Rcpp]; };
-  pushoverr = derive2 { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; };
-  pvar = derive2 { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp]; };
+  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.8"; sha256="0vr7r63i7xq6iqik4zdxjf78pfmsppnp4d9lmc6p1c19l9fcgljy"; depends=[boot R2HTML RCurl XML]; };
+  pubprint = derive2 { name="pubprint"; version="0.2.1"; sha256="0lcav93i4lw0j491q8ga47iyski2kvmqvppq0jwa3144zfb3hnic"; depends=[stringr]; };
+  pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
+  pulsar = derive2 { name="pulsar"; version="0.2.5"; sha256="1qmyhj32dygnvqvjysvlhlxv9y8lyfnm8hzaycmh8g3lhymk2k9c"; depends=[Matrix]; };
+  pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
+  purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
+  purrr = derive2 { name="purrr"; version="0.2.2"; sha256="0lss8q733nv7s154wargm6vnxq55qygnxakib8xdj4jv0y86sxc3"; depends=[BH dplyr lazyeval magrittr Rcpp]; };
+  pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; };
+  pvar = derive2 { name="pvar"; version="2.2.2"; sha256="0a84nap9rwlfvhi4yj6mh7wrmzsi06w1zpmshw84lkm2h2ch02gy"; depends=[Rcpp]; };
   pvclass = derive2 { name="pvclass"; version="1.3"; sha256="1mlzvcbv1zvciz3hp01pwwanq3q8bapgn2dl90syhj15q5pzb4f7"; depends=[Matrix]; };
   pvclust = derive2 { name="pvclust"; version="2.0-0"; sha256="0hfpf257k5f1w59m0zq6sk0gaamflc3ldkw6qzbpyc4j94hiaihs"; depends=[]; };
-  pvrank = derive2 { name="pvrank"; version="1.1"; sha256="12yqnhh1y7sz3pb40736vrhhyza12h8iffjm7f9mimnjzpmi5k8i"; depends=[EnvStats Rmpfr]; };
+  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.1-3"; sha256="0ng0n5qn9im9fdpyv2i2g80kzfa7dk3knfjf4xdpypfdw2gjrf02"; depends=[]; };
+  pwr = derive2 { name="pwr"; version="1.2-0"; sha256="1zpyd8ij93w0c27v4i68y869sj8hw30prppaxq0iprgf3d72qf6r"; 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-0"; sha256="0jvskkn3c4m2lfxm9ivm8g96kcd7ynlmjpjqbrd6sqivas0z46r2"; depends=[]; };
-  pxR = derive2 { name="pxR"; version="0.40.0"; sha256="08s62kzdgak7mjzyhd32qn93q5l7sj01vhsk7fjg9nxjvm78xxka"; depends=[plyr reshape2 RJSONIO stringr]; };
-  pxweb = derive2 { name="pxweb"; version="0.6.0"; sha256="0jxw70wm6rla2v4k6aqzbj6kmxbdj8rqhshmsgmm9vqhpwj2mvkd"; depends=[data_table httr plyr RJSONIO stringr]; };
+  pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; };
+  pwt9 = derive2 { name="pwt9"; version="9.0-0"; sha256="1y8zildqnagrp8vf6d8ips0896yp0qcvwy600yv1bqdnglvmn62b"; depends=[]; };
+  pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; };
+  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="1.0.0"; sha256="1my0prvil8l2lqc9x8qi0j1zfzxl0ism5v2581himp5n5bcv8gkk"; depends=[]; };
+  pystr = derive2 { name="pystr"; version="2.0.0"; sha256="08a20ii7h97qvyzqndbf3rdmnyr04g8h9lrs6qw193p1p41dl94w"; depends=[Rcpp]; };
   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-0"; sha256="0fc6c3pzlm79nqs9qkngs8m0y8y9syhgilfsav9bbi6ylfhlmdh0"; depends=[]; };
+  qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; };
   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="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
-  qdap = derive2 { name="qdap"; version="2.2.4"; sha256="193jzm87qb4ivs325xg6wnrm19izdl06hlmkcp3m2bxp9wnmdqs1"; 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]; };
+  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]; };
   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=[]; };
-  qgraph = derive2 { name="qgraph"; version="1.3.2"; sha256="0bziwpdqgx1pmj61jn7ydri0zfmphf77lxhgm873cllb4czgrl74"; depends=[colorspace corpcor d3Network ellipse fdrtool ggm ggplot2 glasso gtools Hmisc huge igraph jpeg lavaan Matrix plyr png psych reshape2 sem sna]; };
+  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]; };
   qgtools = derive2 { name="qgtools"; version="1.0"; sha256="0irqfaj2qqx7n1jfc0kmfpgzqrhwwlj0qizsmya94zk9d27bcpn5"; depends=[MASS Matrix]; };
-  qicharts = derive2 { name="qicharts"; version="0.5.0"; sha256="09wxw995hxfb8235pi532q3gclmyidh8m6arfszyrd6hbkf0bjv5"; depends=[ggplot2 ggrepel lattice latticeExtra scales]; };
+  qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; };
+  qicharts = derive2 { name="qicharts"; version="0.5.3"; sha256="1mqlj8350i7llp76qhpzzisd6vryrnx9wmdazj7xbdg5666qdz45"; depends=[ggplot2 ggrepel lattice latticeExtra scales]; };
   qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
+  qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; };
   qlcData = derive2 { name="qlcData"; version="0.1.0"; sha256="00xfr7dywvadyhs2z32za06fzdzmm20sn31grin0b3xw5qndai0f"; depends=[stringi yaml]; };
   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-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
-  qmethod = derive2 { name="qmethod"; version="1.4.1"; sha256="0m52xq903v91mw2aqqnvqivlgs39zmcy274ph5zgj3gsz71sq1l4"; depends=[digest GPArotation knitr MCMCpack psych xtable]; };
+  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]; };
   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=[]; };
   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.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
+  qrNLMM = derive2 { name="qrNLMM"; version="1.3"; sha256="046xzzyrjaqa8sa7pxf4mhi1q5pdhvsn5z8gid0cypb0z140ia85"; depends=[ald ghyp matrixcalc mvtnorm psych quantreg]; };
   qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; };
-  qrcm = derive2 { name="qrcm"; version="1.0"; sha256="0xjxb2z1h63azbs7gqvqf4a2sk9syzjqkfrvfdcmliv2bv7zf70l"; depends=[pch survival]; };
+  qrcm = derive2 { name="qrcm"; version="2.0"; sha256="09awa82qvxhdif9g6w36d89wyhfm55z39dw063lasa7pp7dd3gcl"; 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]; };
   qrjoint = derive2 { name="qrjoint"; version="1.0-0"; sha256="18jmxb5wv16gy4vf0cgp4x885s53i3z3qmc46bdr4md513mc980w"; depends=[coda kernlab Matrix quantreg]; };
-  qrmtools = derive2 { name="qrmtools"; version="0.0-5"; sha256="0p245mh7qwv1fm9wi7wk2jm9pdy7r6jkhnqvcpzf6cnhcl0s6hs5"; depends=[Quandl quantmod zoo]; };
-  qrng = derive2 { name="qrng"; version="0.0-2"; sha256="0rs4dggvrlc3bi0wgkjw8lhv4b3jpckcfkqzsaz0j46kf6vfgfw1"; depends=[]; };
+  qrmdata = derive2 { name="qrmdata"; version="2016-01-03-1"; sha256="192dcsmvl3xbzlk658cfp2sk5fkgbjhjd4g1mrcs8s63hmzbwdzc"; depends=[xts]; };
+  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=[]; };
   qte = derive2 { name="qte"; version="1.0.1"; sha256="15y6n0c9jinfz7hmm107palgy8fl15bc71gw0bcd3bawpydkrq2w"; depends=[]; };
-  qtl = derive2 { name="qtl"; version="1.39-5"; sha256="1grwgvyv7x0dgay1858bg7qf4wk47gpnq7qkqpcda9cn0h970d6f"; depends=[]; };
+  qtl = derive2 { name="qtl"; version="1.40-8"; sha256="05bj1x2ry0i7yqiydlswb3d2h4pxg70z8w1072az1mrv1m54k8sp"; depends=[]; };
   qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; };
-  qtlbook = derive2 { name="qtlbook"; version="0.18-3"; sha256="0b0kv5nipdavify4vslwhq9p7nmhwk71q3xmnkj66b780605mvr6"; depends=[qtl]; };
+  qtlbook = derive2 { name="qtlbook"; version="0.18-5"; sha256="0qvfi8q92n9pa3zbinkk54404m0awhxla9ccflczgaq0vij2n7wf"; depends=[qtl]; };
   qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; };
-  qtlcharts = derive2 { name="qtlcharts"; version="0.5-25"; sha256="132v2cqi23m1pb7yz7859snsxjj7dmv6gpv5p9lzb5dpa2n8aha6"; depends=[htmlwidgets jsonlite qtl]; };
+  qtlcharts = derive2 { name="qtlcharts"; version="0.7-8"; sha256="144f2v97d60z381cnwmbpizig548cw29cqz5csqrk3vrr7j59l99"; depends=[htmlwidgets qtl]; };
   qtlhot = derive2 { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; };
   qtlmt = derive2 { name="qtlmt"; version="0.1-4"; sha256="1kx4iajhnjilciz9vda0s1mxqxa0h69vm3gpwdpbghgc5cj8d8kh"; depends=[]; };
   qtlnet = derive2 { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[graph igraph pcalg qtl sem]; };
   qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; };
   qtutils = derive2 { name="qtutils"; version="0.1-3"; sha256="018k9v3mab1mfcjh4mv1a1iish50fwdhb51mqn17k6fyrrrv7vs5"; depends=[qtbase]; };
   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]; };
   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]; };
+  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.1"; sha256="0q1m971fk9i2qdyps745g89x34anw0g2hxqf5p8ggfvvr32k635r"; depends=[gplots RColorBrewer scales]; };
+  quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; };
   quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-  quanteda = derive2 { name="quanteda"; version="0.9.4"; sha256="1mmhs4f2ps6fa66pszmbj828mi5ypaa8nlwbw5fv0kh0vqfy83kf"; depends=[ca data_table Matrix proxy Rcpp RcppArmadillo SnowballC stringi wordcloud]; };
-  quantification = derive2 { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
+  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-5"; sha256="14y8xra36cg5zam2cmxzvkb8n2jafdpc8hhjv9xnwa91basrx267"; depends=[TTR xts zoo]; };
-  quantreg = derive2 { name="quantreg"; version="5.21"; sha256="1cx1axadmd768m6hg4hgnnihyphkrxlmj2dg04k91466wypbxh6l"; depends=[Matrix MatrixModels SparseM]; };
-  quantregForest = derive2 { name="quantregForest"; version="1.2"; sha256="0bgqdmicz0diffgb6hcqm7zgxckjrp5gpph2hnxsicsv8qfr6jsm"; depends=[randomForest]; };
-  quantregGrowth = derive2 { name="quantregGrowth"; version="0.3-1"; sha256="0cm4ac9rn5vhqhi7f5qiilym1vp7x6bglwghw22b70nf9zvcap9h"; depends=[quantreg]; };
-  quantspec = derive2 { name="quantspec"; version="1.2-0"; sha256="029k1klbcvwprvjggrm0i1hzpybw05r4bsm0awcyjzzrgd8hdmp9"; depends=[abind quantreg Rcpp snowfall zoo]; };
+  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]; };
+  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]; };
-  queueing = derive2 { name="queueing"; version="0.2.6"; sha256="0w6fnjql9ap5vlhiv6syphrkhnp4qp7f4clw2jn155vqqmj5ii6a"; depends=[]; };
-  quickReg = derive2 { name="quickReg"; version="0.0.1"; sha256="0lnbhqx7kf1hc7xa6ikk2khqrngqg22rph9zkj6z8f7zlsbpspxh"; depends=[ggplot2 psych survival]; };
-  quickmapr = derive2 { name="quickmapr"; version="0.1.1"; sha256="0wqkn8svpi6m9f04kl0vivg2j9ydhq488a9m36s7br7n4zyvc5vm"; depends=[httr raster rgdal rgeos sp]; };
-  quickpsy = derive2 { name="quickpsy"; version="0.1.2"; sha256="0nvx7zcmfpfsr94k0wdmpcyyqjwilx8ciy12l8s22y9psz5ripsz"; depends=[boot DEoptim dplyr ggplot2 MPDiR tidyr]; };
-  quint = derive2 { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[Formula partykit rpart]; };
+  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=[]; };
+  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.0.1"; sha256="174zwwznfrpzzqfigzlr39y5gq6xsb8n3h8w6idx52y6psnag22z"; depends=[glmnet lars Matrix]; };
-  qvcalc = derive2 { name="qvcalc"; version="0.8-9"; sha256="1ysbsm65n05vypvvpsbdfbrb60gij50vsmybzi4405g5z2ds1j72"; depends=[]; };
-  qwraps2 = derive2 { name="qwraps2"; version="0.1.2"; sha256="1xr3bcigaxb72bk90xv0spd6l4d3l8wlpzvf3gnj2r9rqmr867zv"; depends=[dplyr ggplot2 knitr]; };
-  r_jive = derive2 { name="r.jive"; version="1.2"; sha256="16g0r527c90j4xcyj8fjb8nq2n2bxkjl56wb57mkhvvcgy15r55f"; depends=[gplots SpatioTemporal]; };
+  qut = derive2 { name="qut"; version="1.1"; sha256="0d9gap5jp69y9r7zip4r1kp79lq2wfrxpjka225pxjgj59rj3xls"; 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]; };
   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]; };
   r2lh = derive2 { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
   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]; };
-  rAmCharts = derive2 { name="rAmCharts"; version="1.1.2"; sha256="1c9mrzi0bd2fpv2jvhabb243k2z36k6cxffgcykxi8f62rpvhmq9"; depends=[data_table htmltools htmlwidgets 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=[]; };
   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=[]; };
+  rCAT = derive2 { name="rCAT"; version="0.1.5"; sha256="03nbhcfgawz0a8h5fr51aqn1n9v7kprwvafxzjb2pb8751rica2d"; depends=[pracma rgdal sp]; };
   rCBA = derive2 { name="rCBA"; version="0.0.1"; sha256="0mfd4jn5bcn4kqnfmycm5x7kcvll60dp1nma3l1bfj0v2hybxm5d"; depends=[arules rJava]; };
   rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; };
   rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; };
   rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; };
   rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
   rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; };
-  rDEA = derive2 { name="rDEA"; version="1.2-3"; sha256="1xhrgglnidpzqwkvwnwnnpcx23il0jgfp394rsc74pwdsbv1ifz9"; depends=[maxLik slam truncnorm truncreg]; };
-  rDNA = derive2 { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
+  rDEA = derive2 { name="rDEA"; version="1.2-5"; sha256="1wsi2dkq9izvbhdqmd4qk8i277r1j38dk59fcmnxnwqvk6ar6nrb"; depends=[maxLik slam truncnorm truncreg]; };
+  rDNA = derive2 { name="rDNA"; version="1.31"; sha256="051000q3wb9bjcwm3v60yfy1gpr6amvciy5sh498kl5vq7nv5wlv"; depends=[rJava]; };
+  rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; };
   rDVR = derive2 { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
-  rEDM = derive2 { name="rEDM"; version="0.4.7"; sha256="1d1ylm5rmbrrknmc82vlbhqqkl62drs25gwqid4adflpj2gxczhz"; depends=[Rcpp]; };
+  rEDM = derive2 { name="rEDM"; version="0.5.4"; sha256="1vhhc1yfswvba6qfff5y9l96g8xjw0szshzs4hd4yxh6rq1bnjlr"; depends=[Rcpp RcppEigen]; };
   rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
   rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
-  rFerns = derive2 { name="rFerns"; version="2.0.0"; sha256="0mfwlypakk409p17cmj8q9g99aq8z8gzg54dhpw351ixblvnil98"; depends=[]; };
+  rFSA = derive2 { name="rFSA"; version="0.1.0"; sha256="14drlivamb818dgh808h6j81ww1zlwil42whpclz7ayfddna5rg4"; depends=[]; };
+  rFTRLProximal = derive2 { name="rFTRLProximal"; version="1.0.0"; sha256="1458gqy2zbaa62vaimawdr1nk0lsgwz1j4pgw21fkw7bskcszz0f"; depends=[data_table FeatureHashing foreach magrittr Matrix Rcpp RcppArmadillo RcppProgress]; };
+  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]; };
   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]; };
+  rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; };
   rJPSGCS = derive2 { name="rJPSGCS"; version="0.2-7"; sha256="1j8lc56q20b0qkl20r8mqa6q822rpfphj00dlmj50rgwk02pfc69"; depends=[chopsticks rJava]; };
   rJava = derive2 { name="rJava"; version="0.9-8"; sha256="12mxajy300gyi5bsd3fn84nvj83chr8ls0mrh3mm9nhl2h1mxnns"; depends=[]; };
   rJython = derive2 { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
+  rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; };
+  rLDCP = derive2 { name="rLDCP"; version="1.0.1"; sha256="0ldw6ybyyxhfsxbbjs8qzcf8dmha3q04h6mcxk90q1wlmlanqwf0"; depends=[XML]; };
   rLTP = derive2 { name="rLTP"; version="0.1.2"; sha256="1cr0r3v7d09bss16fxls341l71i9wkg91hr2hiyr4cl5fg35zzgb"; depends=[RCurl]; };
-  rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.7.6"; sha256="03gdr4swy3dq6vkq4q44sdn7slgjzcqzd2pmhac4bghgzgk3zgj8"; depends=[plyr]; };
+  rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.8.3"; sha256="1rc8x6xqygfnr7sb2115g92djsjjjdwk5vssq3q3n9x7jzj878v5"; depends=[plyr]; };
   rLiDAR = derive2 { name="rLiDAR"; version="0.1"; sha256="1zm3c3xpxk1ll0cq589k1kf69wgn93qmaqkvpgcjib0ay35q7c7f"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
   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.2.0"; sha256="0ihrg88rklgn4fa2b7zcs9bxfawhxgxdxlwslkh4ngcz2v72cfnp"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
-  rPlant = derive2 { name="rPlant"; version="2.12"; sha256="12aclndwijnaw14iqb2q7m5c2zh2bgdpfzmf11sgiwv5680qhdmh"; depends=[RCurl rjson seqinr]; };
+  rNOMADS = derive2 { name="rNOMADS"; version="2.3.2"; sha256="1dklyda8xagg643c67ii9hx2lvwkc9xaxlkvigs9dv1bkzbrw9gs"; 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="0.7"; sha256="005qphrcwnkfi2wmm7ba0swykq17q9ab7c7khqyixb0y9gyrwing"; depends=[dplyr igraph Rcpp RcppParallel]; };
+  rPref = derive2 { name="rPref"; version="1.2"; sha256="19b6rycz73rz3nxymb52gfddqsxprkxazwa8pb75vckk13q1cmj0"; depends=[dplyr igraph lazyeval Rcpp RcppParallel]; };
   rPython = derive2 { name="rPython"; version="0.0-6"; sha256="1aw9jn45mw891cskr51yil60i55xv5x6akjvfdsbb9nwgdwwrqdp"; depends=[RJSONIO]; };
+  rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; };
+  rSARP = derive2 { name="rSARP"; version="1.0.0"; sha256="0gg6qs7jgn2qvzdwbz0xyfpfzjwa2dwi0j0hal7glc5qlhrrynwl"; depends=[ggplot2 lattice qcc]; };
   rSCA = derive2 { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; };
   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]; };
   rTensor = derive2 { name="rTensor"; version="1.3"; sha256="0ra34sn4g92r6asrn4la2wbsi2y0hnyx163wwi4v0j6f57bslhdw"; depends=[]; };
-  rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[choroplethr rvest stringr]; };
+  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]; };
-  rYoutheria = derive2 { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RCurl reshape2 RJSONIO]; };
+  rWind = derive2 { name="rWind"; version="0.1.3"; sha256="15a9x1arfc6pfcn6z87mlnnds38zl8nb5b5ix081mssp0s0anm26"; depends=[raster shape]; };
+  rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; };
   race = derive2 { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
   radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
-  radarchart = derive2 { name="radarchart"; version="0.1.2"; sha256="1zhkzc1x411q14drdkhwrivsz818hvqrv1zyvcyq3a3dl65xavqr"; depends=[htmltools htmlwidgets]; };
-  radiomics = derive2 { name="radiomics"; version="0.1.1"; sha256="0rw1xvp7nq8h5g4yqqcwrv706zssa0kvkhm6ncdb9y7gmpidhyj5"; depends=[reshape2 spatstat]; };
-  radir = derive2 { name="radir"; version="1.0.1"; sha256="1i37ynxl85yzh5pyxykjn64p5qph1w9b1gappmlhql9z04095ryk"; depends=[hermite]; };
+  radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; };
+  radiant = derive2 { name="radiant"; version="0.6.0"; sha256="037xskigyisr5sgsrr8xbgvqidl775vdw7vllwpsq4akyz9i6amc"; depends=[AlgDesign psych r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; };
+  radiant_basics = derive2 { name="radiant.basics"; version="0.6.0"; sha256="00i78hxafp7s5hpv54frfsjsj690jn5awsj0k4hdaiphiqb4gmmp"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; };
+  radiant_data = derive2 { name="radiant.data"; version="0.6.0"; sha256="1iiby1472p8j2fprryvj0ifl6z7y2hpwhdb10krd3ywxv476z2cd"; depends=[base64enc broom car curl dplyr DT ggplot2 gridExtra jsonlite knitr lubridate magrittr markdown pryr psych r_import readr rmarkdown rstudioapi scales shiny shinyAce tibble tidyr]; };
+  radiant_design = derive2 { name="radiant.design"; version="0.6.0"; sha256="0434zn42bkb2q01p63iw7imjkc45agnj909x3bfwm6y2kmgkvga9"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data shiny]; };
+  radiant_model = derive2 { name="radiant.model"; version="0.6.0"; sha256="04jnbhmvwfkf80xz2r3mimzdyr1yw80l9sq9pr52vcf7r98j13gq"; depends=[car data_tree DiagrammeR dplyr ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet pryr r_import radiant_basics radiant_data sandwich shiny stringr tidyr yaml]; };
+  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]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
-  rags2ridges = derive2 { name="rags2ridges"; version="2.0"; sha256="0qc93a1bf63iwgmpz9bz62j20p4v77bvbjmy4rqchj7z6h573njd"; depends=[expm fdrtool ggplot2 Hmisc igraph Rcpp RcppArmadillo reshape sfsmisc snowfall]; };
+  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]; };
+  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]; };
   rainfreq = derive2 { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
-  ramify = derive2 { name="ramify"; version="0.3.2"; sha256="0fqspa1nlf0969g3lvvwg65zimwfdj5c2bahxvafggn832sb54k9"; depends=[]; };
-  ramps = derive2 { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda fields maps Matrix nlme]; };
+  rakeR = derive2 { name="rakeR"; version="0.1.2"; sha256="064vprqrsing372hhkp6a7jfihbbik2i40i7mp9l79n816szpgm7"; depends=[ipfp]; };
+  ramcmc = derive2 { name="ramcmc"; version="0.1.0"; sha256="0s5jgjqkschr64srblppv9lbvhynlpfiy8cy12fywpmnbv8viazq"; depends=[Rcpp RcppArmadillo]; };
+  ramidst = derive2 { name="ramidst"; version="0.1.0"; sha256="1q4lvq2c2vj9xrm2p2w2qjsl4qvwcl6y54y68mmbd6cw7wqpffjj"; depends=[rJava]; };
+  ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; };
+  ramps = derive2 { name="ramps"; version="0.6-14"; sha256="09chbqh13h8b10dlcka07y954ga129lamg0fr38iwj4lqb6a2fvy"; depends=[coda fields maps Matrix nlme]; };
   ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; };
-  randNames = derive2 { name="randNames"; version="0.2.1"; sha256="177xdgrikvfcgjag382v5d1j72322ihnbggzxp9ip6p48ib4p3qg"; depends=[dplyr httr jsonlite]; };
+  randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; };
   randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
-  random = derive2 { name="random"; version="0.2.5"; sha256="0n96zv3b95msahpzdwfqsd9i9bq2z94flxxm8ghnqb0b75qcsdg0"; depends=[curl]; };
-  random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-1"; sha256="1051v7krrawdqnhz9q01rsknp2i7iv82d370q7m9i9d9i8wfnpk5"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
+  randgeo = derive2 { name="randgeo"; version="0.1.0"; sha256="1jjblzqm45yxz5pvkg2mhv891vxlw0c3ii8y6gah680g09xgwjxx"; depends=[]; };
+  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.1.0"; sha256="1x9xlf808gs25wqpa0a7gfxf0fdgf6jgj8237g61s1yx3vninhnn"; depends=[]; };
+  randomForestSRC = derive2 { name="randomForestSRC"; version="2.4.1"; sha256="17a59jc8h7bfgz9gpisc144fyas7da1c1lab1x8wasfilgkg08z2"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
-  randomLCA = derive2 { name="randomLCA"; version="1.0-6"; sha256="1l343p9a6z2ld3z2kqwldmn3wxf8yvjqr4nfhyjwp4y5d2ic9r11"; depends=[boot fastGHQuad lattice Matrix SciencesPo]; };
-  randomNames = derive2 { name="randomNames"; version="0.1-0"; sha256="0v92w0z0dsdp6hhyyq764nlky8vmbs6vcnrna5ls47fj80f9cqa4"; depends=[data_table]; };
+  randomLCA = derive2 { name="randomLCA"; version="1.0-10"; sha256="1h1fxymdiycxn90lipzb190xakf7hlbn6nwxsbfwcz8278xkcn4g"; 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=[]; };
-  randomizr = derive2 { name="randomizr"; version="0.3.0"; sha256="1zi8rldmgjcjnnx3qcpr555c4g713nh6wrdh5gr77z2qagbljb1i"; 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]; };
   randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
   randtoolbox = derive2 { name="randtoolbox"; version="1.17"; sha256="107kckva43xpqncak8ll4h0mjm8lcks4jpf7dffgw5ggcc77ycrb"; depends=[rngWELL]; };
-  rangeBuilder = derive2 { name="rangeBuilder"; version="1.1"; sha256="1a2cjpl3hxynwpzc4rz5g0g5gq2h15jvbcvkdqv59j905rhaikg1"; depends=[alphahull raster rgdal rgeos sp stringi]; };
-  rangeMapper = derive2 { name="rangeMapper"; version="0.3-0"; sha256="0r8nf2y4drdfldfr1rv1ll4176w3hzd9qf36glzjdsm0g1fcixba"; depends=[classInt data_table foreach ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; };
-  rangemodelR = derive2 { name="rangemodelR"; version="1.0"; sha256="19wbzrim0mjngdfsrmfidk1csh7fzqv6cwh4hxvjgjl2ps99cank"; depends=[]; };
-  ranger = derive2 { name="ranger"; version="0.3.0"; sha256="1vi0wkks5rzn6mc6k2lh0rdbb5awvcfww68kk0wndng45mk7hrq2"; depends=[Rcpp]; };
+  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]; };
+  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.0-2"; sha256="1gx30ak5vjgbgnx920789d38y16rl8w7hbxfk9yb8xjl1azgfaqx"; depends=[survival]; };
-  rappdirs = derive2 { name="rappdirs"; version="0.3"; sha256="1yjd91h1knagri5m4djal25p7925162zz5g6005h1fgcvwz3sszd"; depends=[]; };
+  rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; };
+  rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; };
+  rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; };
   rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; };
   rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; };
+  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]; };
-  rasclass = derive2 { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car e1071 nnet randomForest RSNNS]; };
+  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]; };
-  raster = derive2 { name="raster"; version="2.5-2"; sha256="0x6rmd4mcvivkisxpjlp7myf8crz58md2ngz6qsz37i8aw1hn3jb"; depends=[Rcpp sp]; };
-  rasterVis = derive2 { name="rasterVis"; version="0.37"; sha256="1pfpjrjgcy5d4jzkf7sm427y0b6v0ipxr9p8z9sr6djhzcs3gfn0"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp zoo]; };
+  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]; };
+  rasterVis = derive2 { name="rasterVis"; version="0.41"; sha256="0dsg8ypsxxa7qagy5yjcyqyjqqyy7xgfbmiijr3xbn2n1wp090n9"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
+  ratelimitr = derive2 { name="ratelimitr"; version="0.3.7"; sha256="19j43xz1arn8h7pni5797ds7hmcj7llbgaiw514qpwnsp0qx24f6"; depends=[assertthat]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
   raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
+  ratesci = derive2 { name="ratesci"; version="0.1-0"; sha256="15ar1jx026qn01yk1lnmn40wqkf8ngpjlqiqizi16mxz28rrgr6n"; depends=[]; };
   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]; };
-  rbamtools = derive2 { name="rbamtools"; version="2.14.3"; sha256="1sdnz52vd5gfwc194y6ilrd8dkawv86xcd37100giz1525wf929i"; depends=[]; };
+  raw = derive2 { name="raw"; version="0.1.4"; sha256="112fw1si708qrj6r91b1i8cwhxa20amri5838rc5azn6d5b9wcks"; depends=[]; };
+  rbamtools = derive2 { name="rbamtools"; version="2.16.0"; sha256="0a3862923wn9mxpbhsq7sxd0q306xnzphsn2p0zxsx1ixw7ksy4j"; depends=[refGenome]; };
   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=[]; };
-  rbhl = derive2 { name="rbhl"; version="0.2.0"; sha256="169nrbpi9ijzb5qk1b1dwjayfnsjq8r67dc7bis9aicyp4hpjyzw"; depends=[httr jsonlite plyr XML]; };
+  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]; };
+  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.4.8"; sha256="10kwlf7vrzw2rhsdwih5lcvjw0bz0n88mp74ayc9331d8j226214"; depends=[dplyr ggplot2 httr jsonlite mapproj plyr sp]; };
+  rbison = derive2 { name="rbison"; version="0.5.0"; sha256="01j8jnfhikaggsvcnxamchvgabp8rbpmi1q18s1bcn5vc55fi12f"; depends=[dplyr ggplot2 httr 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.4.2"; sha256="05v3ry6mhbwl903rn2941qam2pvfkr0fnp7qzhgn9z12dxjmpl8i"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; };
+  rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; };
   rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
   rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
   rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
   rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; };
-  rcanvec = derive2 { name="rcanvec"; version="0.1.4"; sha256="0mnrnwxk14i9yarrq4vhflkhqfdqz8vpn2z10c3rlyrx849xh7zi"; depends=[rgdal sp]; };
-  rcbalance = derive2 { name="rcbalance"; version="1.8.2"; sha256="0jd6brswpm2ymvk3z72kzfg2axd4wan70dbcgvldjjaz2mvhz56z"; depends=[MASS plyr]; };
+  rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; };
+  rcbalance = derive2 { name="rcbalance"; version="1.8.3"; sha256="0bksyjbxdllgaqkhpz29isslqkpp3y4xl3wqhpjy881lhlw40y1j"; depends=[MASS plyr]; };
   rcbsubset = derive2 { name="rcbsubset"; version="1.1.2"; sha256="0izvxbkjmhyp8jz4mlwa5grdgcd8q9pdc3jwrccby0xz0f5gw2x0"; depends=[MASS plyr]; };
-  rcdd = derive2 { name="rcdd"; version="1.1-9"; sha256="1mwg9prf7196b7r262ggdqsfq1i7czm1a0apk4j5014cxzyb6j5s"; depends=[]; };
-  rcdk = derive2 { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint iterators png rcdklibs rJava]; };
-  rcdklibs = derive2 { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
-  rchallenge = derive2 { name="rchallenge"; version="1.1.1"; sha256="0ksbqsz6q7ri3xknzh6sl39lq9wqrqqv5bmirybglf48q0prszf5"; depends=[knitr rmarkdown]; };
+  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=[]; };
+  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]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
-  rcicr = derive2 { name="rcicr"; version="0.3.2.1"; sha256="0svr869x5sbzymk95g4lm0kbdi0f7dlbgk88i8jhp4wa3g98pwyv"; depends=[aspace dplyr jpeg matlab]; };
-  rclinicaltrials = derive2 { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr plyr XML]; };
-  rcorpora = derive2 { name="rcorpora"; version="1.1.1"; sha256="14lnfn9armb6rz1wcs7hdrb4j2vzh6b8pi9lsj83l3zixkxx5izk"; depends=[jsonlite]; };
-  rcppbugs = derive2 { name="rcppbugs"; version="0.1.4.2"; sha256="0b057hgw0g9i83l18przjziq5sakjsz7m8vif3lprzs1d91c2xn1"; depends=[BH Rcpp RcppArmadillo]; };
-  rcrossref = derive2 { name="rcrossref"; version="0.5.2"; sha256="0a4xz43y40kl97yxc1hbsf84pyvkpz1l0p26nls8wm28x2wafb3b"; depends=[bibtex dplyr httr jsonlite plyr R6 xml2]; };
+  rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
+  rclimateca = derive2 { name="rclimateca"; version="0.1"; sha256="0pnmazi33lvmccb1x2rkac0cwp8rf1p0659dfx9718vkdlgkvlgz"; 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]; };
+  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]; };
   rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; };
+  rcss = derive2 { name="rcss"; version="1.2"; sha256="08hiprjcjvc138laqrvlvrmn664b63x829ammzgrwjqcsj4kpmds"; depends=[Rcpp RcppArmadillo rflann]; };
+  rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; };
   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]; };
   rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; };
   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]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
-  rdrobust = derive2 { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
+  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=[]; };
   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]; };
-  readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
-  readGenalex = derive2 { name="readGenalex"; version="1.0"; sha256="1lhfw8xbwnjhslriaxziw4dskmjfawz5g31h2yl9ds2nwvwhmdwi"; depends=[pegas]; };
+  reactR = derive2 { name="reactR"; version="0.1.0"; sha256="1fw6rdi231blr416hq881pc3glv7pnn3fhc496cnj0dzwg0b32v6"; 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=[]; };
+  readJDX = derive2 { name="readJDX"; version="0.2.3"; sha256="0qqzplyhpyhf24111y12r0h299wz86scjymfrym2ycxm04116vw5"; depends=[stringr]; };
   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.2"; sha256="07c223cjn29mldhs9xs343b0i2xpcpps5pk65a1jsmjabd9k69zl"; depends=[cellranger readr xml2]; };
+  readODS = derive2 { name="readODS"; version="1.6.4"; sha256="1kj648phxvpg480fdhr2sj4l8q306gjdl886zqnkwxif5mw1aq7g"; depends=[cellranger readr 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.0.0"; sha256="0gsw1f8ycfg2jn2mp6dk203g0avpb4820f37pl5kn7mm7fn5w7bg"; depends=[plyr]; };
-  reader = derive2 { name="reader"; version="1.0.5"; sha256="1g22pnlfr2c974s6rqnyixknhgy2crqbxg2cg2s3ja1sk29v4gr0"; depends=[NCmisc]; };
-  readr = derive2 { name="readr"; version="0.2.2"; sha256="156422xwvskynna5kjc8h1qqnn50kxgjrihl2h2b7vm9sxxdyr2m"; depends=[BH curl Rcpp]; };
-  readstata13 = derive2 { name="readstata13"; version="0.8.2"; sha256="1gp56wfyfcj1p1kix7iz0qr445ych3f0jkyjn5m7qkn7d43fimvd"; depends=[Rcpp]; };
-  readxl = derive2 { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp]; };
+  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]; };
+  readstata13 = derive2 { name="readstata13"; version="0.8.5"; sha256="1hkbh7kia7bgshhlq2n683s0gs4rw4wzyfwrbp0hq1xirqnypj0a"; depends=[Rcpp]; };
+  readxl = derive2 { name="readxl"; version="0.1.1"; sha256="0ypmxp1xl2a27vlx7dj6kszbbr8fbs6lcc1ibhw1ln1p053xmlrr"; depends=[Rcpp]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
-  rebird = derive2 { name="rebird"; version="0.2"; sha256="11x8db6gq9qkv9skslda4j6zgzmkmiap78rlwnlvkjvk1gzz13bf"; depends=[dplyr httr jsonlite]; };
-  rebmix = derive2 { name="rebmix"; version="2.7.2"; sha256="1m71kvd7yska5iwgn0vzrhcbz8qmiwqrda201xqjxvvs8faqj66j"; depends=[]; };
-  rebus = derive2 { name="rebus"; version="0.1-0"; sha256="00s11bskcmrqfb378nh9irc1x6kp9vq578jlj6pz6cvfw8hgc5lk"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
-  rebus_base = derive2 { name="rebus.base"; version="0.0-1"; sha256="13z8zdr09kc14zhf1yf0r8m5h5zr5bjr8jagv9mam335b7ddgbjq"; depends=[]; };
+  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]; };
+  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]; };
   rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; };
-  rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-1"; sha256="0xkb5lp6798220cqy571rxj98cy673wn8kp0im3mcnpjx6p1q3n2"; depends=[rebus_base]; };
+  rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
+  recexcavAAR = derive2 { name="recexcavAAR"; version="0.2.2"; sha256="050klwldr8jzn0dwwh7yb0yzjckbdc4z7phd0rp8y8d5ah0n8bn2"; 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]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
-  recommenderlab = derive2 { name="recommenderlab"; version="0.1-8"; sha256="17bab1irh7q9kznf1qz6jh81b4c98wcx323hq666dk23rc2kg7zx"; depends=[arules bcv Matrix proxy registry]; };
+  recommenderlab = derive2 { name="recommenderlab"; version="0.2-1"; sha256="03gyz6davjimrbbnjglj41hysvvd2hnxsi166san1877ibblgw4c"; 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-1"; sha256="1ygdq7wd970yi7298i62r22fg657bswwkmqjabph7if6b13fjyfb"; depends=[recommenderlab]; };
-  reconstructr = derive2 { name="reconstructr"; version="1.1.0"; sha256="1kswvpmhk3zzwm4nv6pjb80ww95n9bd4q9j7bhk9kql8v5mnfg5m"; depends=[Rcpp]; };
-  recosystem = derive2 { name="recosystem"; version="0.3"; sha256="064rnnz4m85mwq3084m0ldj8sb5z6jwzqzkh22fagsq2xyqri15l"; depends=[Rcpp]; };
-  reda = derive2 { name="reda"; version="0.2.1"; sha256="0c96vs8h0g551gb5vxrlw2q1yzca4nwg579nwysxm7z16zn7p05k"; depends=[ggplot2 plyr]; };
+  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="0.2.0"; sha256="0vpwx8lv0jhddcw2cypdhvchgrrkxx8l70yhsp5415mgdkmpp5x2"; depends=[BAT dismo geosphere igraph maptools raster rgdal rgeos rJava 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.2"; sha256="1s4xs98d7zkkgsvdyyck3ra7yhc1sg6pq89rf4rskmj9jp6h5x0d"; depends=[snowfall]; };
-  redist = derive2 { name="redist"; version="1.2"; sha256="1169dh4v8mq1ag1crqmn9apyd0280qf2l0df6xwy7263gvmnqdmy"; depends=[coda Rcpp RcppArmadillo sp spdep]; };
-  redland = derive2 { name="redland"; version="1.0.17-7"; sha256="1frn3gxzs9v1k0hlw0r0ckgjynanmrx63njlgh085i5bw4n9bzbg"; depends=[roxygen2]; };
+  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]; };
+  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.6.0"; sha256="0pn27m38x6xjpxrfvg92wwkx3syvvssy9dzn2djbq3lagvrz3k3z"; depends=[DBI doBy RSQLite]; };
+  refGenome = derive2 { name="refGenome"; version="1.7.0"; sha256="0xj5mqk7i4bl6ffdx346q558sn8hmqlkfpiv7ggrfhaqg02f6war"; 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=[]; };
   refset = derive2 { name="refset"; version="0.1.0"; sha256="0yj87sp6ghxv20hz5knmw3d7way1hsggk759wqxsbfprd38y6khd"; depends=[]; };
-  refund = derive2 { name="refund"; version="0.1-14"; sha256="17hig8zr8sj5jjxxrfr3bhvhhbimns92dzf3b7ybf94vzvrm8wg8"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix MCMCpack mgcv nlme pbs RLRsim]; };
-  refund_shiny = derive2 { name="refund.shiny"; version="0.2.0"; sha256="1m7s9xnh7p7z7lc0dyizdmfnq3ksc782d3vavqrcakswjrkk3rir"; depends=[dplyr ggplot2 gridExtra lme4 refund reshape2 shiny]; };
+  refund = derive2 { name="refund"; version="0.1-16"; sha256="0npq12bf3qmcbgwdxilwvzvf5x2m3qrxljlsx1sz9xczms2dz7kg"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; };
+  refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; };
   refund_wave = derive2 { name="refund.wave"; version="0.1"; sha256="1vnhg7gi5r8scwivqjwhrv72sq8asnm4whx3jk39saphdxpk5hxv"; depends=[glmnet wavethresh]; };
   regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; };
+  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=[]; };
   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]; };
   regress = derive2 { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
   regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; };
+  regsem = derive2 { name="regsem"; version="0.5.0"; sha256="0ajva492a0z0q1ixdh24w10vbq7fknn66cyjzla5aqcmc5gggp7g"; depends=[lavaan Rcpp RcppArmadillo]; };
+  regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; };
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
-  rehh = derive2 { name="rehh"; version="1.13"; sha256="0hi9bfclai1b948yq9fp1q7rxb8nwvdm368l09la8ghlgxi5lnm8"; depends=[gplots]; };
-  relMix = derive2 { name="relMix"; version="1.0"; sha256="1p6zpbilfyfsaa39a54xm4yvqapamlxydzzcr0g6m60abrsdwhg5"; depends=[Familias paramlink]; };
+  regtools = derive2 { name="regtools"; version="1.0.1"; sha256="0807r8721qmdl8ahvlzcvqaq2rfvlvhblwbwdpi79fm7dk8vvq1i"; depends=[car dummies FNN mvtnorm]; };
+  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]; };
   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=[]; };
   relaimpo = derive2 { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[boot corpcor MASS mitools survey]; };
   relations = derive2 { name="relations"; version="0.6-6"; sha256="1sl22wmnxh957dyw6rwv50ihrf27k7ak66w7avvf9llm0a0d6gsf"; depends=[cluster sets slam]; };
   relax = derive2 { name="relax"; version="1.3.15"; sha256="0cgvxw3pmy9kx8p81bb5n5nnbn6l9hm07k6hdy7p2j2gl15xxnpq"; depends=[]; };
   relaxnet = derive2 { name="relaxnet"; version="0.3-2"; sha256="1l83rk7r4vkcxbfljmibzm8lzpx0vf406hv4h5cy9x0k3rz2bfh0"; depends=[glmnet]; };
   relaxo = derive2 { name="relaxo"; version="0.1-2"; sha256="1rzmq7q3j271s6qwwrmwidv0vxcjpgjhyiqgr6fkczkai2lbnd8x"; depends=[lars]; };
-  reldist = derive2 { name="reldist"; version="1.6-4"; sha256="0v86wws29zy67jidrvfxkfwhpxppqrpq5h3b22cjif5qjqz3kk8f"; depends=[mgcv]; };
+  reldist = derive2 { name="reldist"; version="1.6-6"; sha256="09vips7spcz0fahrpy0bl15hk43zgnq74h189hmygyi41l95aywa"; depends=[Hmisc mgcv]; };
   relen = derive2 { name="relen"; version="1.0.1"; sha256="0br7c3j30a1yc61pyinmk5lvk8zw9rivd0z2096g6crgmbzix8ml"; depends=[]; };
   relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; };
   reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
-  relimp = derive2 { name="relimp"; version="1.0-4"; sha256="1i9j218b6lh6ag4a8x4vwhmqqclbzx46mpwd36s8hdqayzs6lmad"; depends=[]; };
-  relsurv = derive2 { name="relsurv"; version="2.0-7"; sha256="107xn5an8ggwpsp5dhk88xglfkd90d06f63akd09vwaax92rws1y"; depends=[date survival]; };
+  relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; };
+  relsurv = derive2 { name="relsurv"; version="2.0-9"; sha256="1laykfmzv4yfkj406iag0s8cdms662y9fdrxfd29spj47zniy9ym"; depends=[date survival]; };
   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=[]; };
   remix = derive2 { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[ascii Hmisc plyr survival]; };
-  remote = derive2 { name="remote"; version="1.0.0"; sha256="09840z50x5i8bsi49s3asqhcz84z16pyq9w50yay4h8x82w3hfh3"; depends=[foreach raster Rcpp]; };
-  remoter = derive2 { name="remoter"; version="0.2-0"; sha256="08wn0p95rj39s0df38jqs9bf52fw5a6m92sbn7kfspb81q1fzx8k"; depends=[assertthat pbdZMQ sodium]; };
-  rentrez = derive2 { name="rentrez"; version="1.0.1"; sha256="1viw6lcjl26yq8yna8mfhriphvdjq8nnkbds0yq66fmah44l493v"; depends=[httr jsonlite XML]; };
+  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]; };
+  remotes = derive2 { name="remotes"; version="1.0.0"; sha256="03qwh7wb5zn08r1n5bylnb9615p0qsbx1ca644b528mf0pm7i7yc"; depends=[]; };
+  rentrez = derive2 { name="rentrez"; version="1.0.4"; sha256="03gfq6d0vs3np1x292lzdahhc70npqvzbg9aj9c80amiyhs7c1ad"; depends=[httr jsonlite XML]; };
+  repeated = derive2 { name="repeated"; version="1.1.0"; sha256="0cdyzhhv89186q5nwablcjbqvm7ncq2w5d09iidbajrac9wd1y60"; depends=[rmutil]; };
   repfdr = derive2 { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; };
   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="1.0.0"; sha256="1ll6gyibd41kasc3sn6hvydc6xaacx6h5q5nhj09ha36x4lgr0gb"; depends=[MBESS]; };
+  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]; };
   repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; };
-  repo = derive2 { name="repo"; version="1.0"; sha256="103bjd880hd76qpipryl17l9972hwj5c3dxicjq0dcbdfmdk7q7h"; depends=[digest]; };
+  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]; };
   reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; };
-  reportr = derive2 { name="reportr"; version="1.2.0"; sha256="00nbkv6s7lydxq1gd532gkfl96dbrdq4p6bmqxnbjhrwx8c3kx6h"; depends=[ore]; };
+  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=[]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
-  reproducer = derive2 { name="reproducer"; version="0.1.4"; sha256="1iraq2aria3sgs63cm4508775y7qnaz1lxrs630nma0ndmjsp2ml"; depends=[ggplot2 gridExtra metafor openxlsx RColorBrewer tm wordcloud xtable]; };
+  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]; };
+  reproducer = derive2 { name="reproducer"; version="0.1.8"; sha256="1yw6d81xg8zqc91x737z0mfx10xcfvd0sr0vs8afvhbqnxbjk3jg"; depends=[ggplot2 gridExtra lme4 MASS metafor openxlsx xtable]; };
   request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; };
+  requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; };
   rerddap = derive2 { name="rerddap"; version="0.3.4"; sha256="1rfcql21kd39q5r1827scqxs124x3vkvxazdqp13g5qyalmdvb30"; depends=[data_table digest dplyr httr jsonlite ncdf4 xml2]; };
   resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
+  resampledata = derive2 { name="resampledata"; version="0.2.0"; sha256="1s683jhrpkhcn7cxjx5cipgkrbmhk5jr7hxniwc8ka7cbq3y22wl"; depends=[]; };
   resemble = derive2 { name="resemble"; version="1.2.2"; sha256="189a6b1y720w9ff8cyqazd2d3v1msbfw8zdqr5rmilxvxmnspccs"; depends=[foreach iterators Rcpp RcppArmadillo]; };
-  reservoir = derive2 { name="reservoir"; version="1.1.4"; sha256="0c7ankmwph38nny24rw9ysqmwhszp8wivpawpf3qdy2wxhm1ygfv"; depends=[gtools]; };
-  reshape = derive2 { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
-  reshape2 = derive2 { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr Rcpp stringr]; };
+  reservoir = derive2 { name="reservoir"; version="1.1.5"; sha256="1qvjq8j2gxp6b8m3k3822f9na8a1kbwzzsmq70m763dcq293rgiz"; depends=[gtools]; };
+  reshape = derive2 { name="reshape"; version="0.8.6"; sha256="1f1ngalc22knhdm9djv1m6abnjqpv1frdzxfkpakhph2l67bk7fq"; depends=[plyr]; };
+  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=[]; };
-  resumer = derive2 { name="resumer"; version="0.0.1"; sha256="1xl1jl6bvjlx2djfm8k0za1wcrimsfc77qk6zybbxls0srayh7c4"; depends=[dplyr rmarkdown useful]; };
+  restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; };
+  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]; };
   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]; };
-  retrosheet = derive2 { name="retrosheet"; version="1.0.2"; sha256="079rfc55sy315i7zhv1a8r6drgpiglbf3b4gwyria2mfbn94a5qb"; depends=[data_table RCurl stringi XML]; };
-  reutils = derive2 { name="reutils"; version="0.2.2"; sha256="0byp2kh1g7zi391y55b2y34gbg5x459xn6ydz8ns2qah2aqciqwk"; depends=[assertthat jsonlite RCurl XML]; };
+  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]; };
   revealedPrefs = derive2 { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp RcppArmadillo]; };
-  revealjs = derive2 { name="revealjs"; version="0.6"; sha256="1pyl20zbsy9m3g0shfv4d4cv7019zxz4329c3l8v3jaqbd1rmlas"; depends=[rmarkdown]; };
+  revealjs = derive2 { name="revealjs"; version="0.8"; sha256="0cv410k7nflzkwz7g7zvc86wsmqz0kxlciz7mms7bixrwvqq2w0a"; 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.0"; sha256="166zcpz7zdl7rh5dkl1bbsfnpllk7k83r7pkhmfnk92mwn94sx4v"; depends=[abind ggplot2 gridExtra randomForest]; };
-  rfUtilities = derive2 { name="rfUtilities"; version="1.0-2"; sha256="1hhiyrvz25pf1fxzcmaf8m5c3v57hxv8qvmrk2a87wdsrklh073c"; depends=[randomForest]; };
+  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]; };
   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.0"; sha256="00q5r3h7s7m6x9vajm1j194g38h6z1c54ndc3044xjp2zkk7l5lp"; depends=[dplyr httr lazyeval tidyr]; };
+  rfishbase = derive2 { name="rfishbase"; version="2.1.1"; sha256="17xkbn930vczxc8b9bljambzhc5j14b7fjswbrl8c8ygdhcd436n"; 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]; };
-  rfoaas = derive2 { name="rfoaas"; version="0.1.8"; sha256="1q4c93isdv1cjwb66rr3krpw69anhr5z2pw2z1fgq4v94nr69mf8"; depends=[httr]; };
-  rfordummies = derive2 { name="rfordummies"; version="0.1.2"; sha256="1x4qmjvnzsj0wkzyl1pzaf3b66lhyb4bk72j33bxgr8gb8bzrhp1"; depends=[]; };
+  rfoaas = derive2 { name="rfoaas"; version="1.1.0"; sha256="15a49s84xyyv324gf15avgxa4cj7dpbmlxcgsrnddxy661yd3bg5"; depends=[httr]; };
+  rfordummies = derive2 { name="rfordummies"; version="0.1.3"; sha256="13jqvww65wzac1c8ajkljz89vi4j76y9ga52w3ygajjzg0rn15l5"; depends=[]; };
   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.2"; sha256="1lacxm2dyhqvcvkmfxfzg02wiyp7hmkfi8c4xizxsfv29kr2xphh"; depends=[data_table ggplot2 httr jsonlite magrittr oai V8 whisker xml2]; };
+  rgbif = derive2 { name="rgbif"; version="0.9.7"; sha256="1ajwmxk8pgmgba2vv4pw424zzsjbx0z5ppsavmiy6zjxns7l5rbn"; depends=[data_table geoaxe ggplot2 httr jsonlite magrittr oai tibble V8 whisker xml2]; };
   rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive2 { name="rgdal"; version="1.1-3"; sha256="0ah2qsrz050pbkyijasqc22xvfgsyh0djb8ma3ixfsyrfrflnbpa"; depends=[sp]; };
+  rgdal = derive2 { name="rgdal"; version="1.2-5"; sha256="03bi89n2n80lr0v99s130yl256nf3ww5hr02kpb2lawzz8d3rb7v"; depends=[sp]; };
   rgenoud = derive2 { name="rgenoud"; version="5.7-12.4"; sha256="19y0297fsxggjrdjv8n3a5klbqf8y3mq4mmdz6xx28cz3k65dk4n"; depends=[]; };
-  rgeolocate = derive2 { name="rgeolocate"; version="0.5.0"; sha256="0n680a9wnw2xvql0584kqrs22ymj9rr1lbr670j55y6far9pwa0m"; depends=[httr Rcpp]; };
-  rgeos = derive2 { name="rgeos"; version="0.3-17"; sha256="0m05cc7wdswy0p2qdh4zz1p5zm6lwyhdqrkvws0s86zcl4l1z96c"; depends=[sp]; };
+  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]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
-  rggobi = derive2 { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
-  rgho = derive2 { name="rgho"; version="0.0.1"; sha256="0zdxq24jrvgl933ww5n0pp9psri99364ibxrvawc42rnv8220gjr"; depends=[curl dplyr httr lazyeval magrittr memoise readr tidyr xml2]; };
-  rgl = derive2 { name="rgl"; version="0.95.1441"; sha256="1ryqz7pn9ag35lkpnfhm4w3zahm2j47dyd03h7bcrg535ilr4afn"; depends=[]; };
+  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]; };
   rglobi = derive2 { name="rglobi"; version="0.2.9"; sha256="15kc3gb998ryrnpw6nn87vsg63xknchs0hbl33g9napyj5wjmmiw"; depends=[RCurl rjson]; };
-  rglwidget = derive2 { name="rglwidget"; version="0.1.1434"; sha256="1483l8gfxnmdps22aiqxnxginc383sj0105bj8d620q9y041625z"; depends=[htmltools htmlwidgets jsonlite knitr magrittr rgl shiny]; };
+  rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
   rgp = derive2 { name="rgp"; version="0.4-1"; sha256="1p5qa46v0sli7ccyp39iysn04yvq80dy2w1hk4c80pfwrxc6n03g"; depends=[emoa]; };
   rgpui = derive2 { name="rgpui"; version="0.1-2"; sha256="0sh5wj4f2wj6g3r7xaq95q89n0qjavchi5kfi6sj1j34ykybbs3g"; depends=[emoa rgp shiny]; };
   rgr = derive2 { name="rgr"; version="1.1.13"; sha256="1l6cf3hmi6mzsqg6dpnw90a6ljhvwar4rjjkamx4mc9hlfsrkggq"; depends=[fastICA MASS]; };
-  rgrass7 = derive2 { name="rgrass7"; version="0.1-4"; sha256="0ify8djj3q63xl6d1v4wa7s92rvmraanl8z9l4nd4a59ga09c3s1"; depends=[sp XML]; };
-  rhandsontable = derive2 { name="rhandsontable"; version="0.3.1"; sha256="0mwzy5l86fg7wmjd94a4bx8gsqrqyczkx558ggw5izbcj6n44g3k"; depends=[htmlwidgets jsonlite magrittr]; };
+  rgrass7 = derive2 { name="rgrass7"; version="0.1-9"; sha256="079rkzxpp6l9gppnag83sq87y5l6pby3k0dg32065sr758yr3vx0"; depends=[sp XML]; };
+  rgw = derive2 { name="rgw"; version="0.1.0"; sha256="12f7bsfg24cld9y47jyqxswgc1bk4adbhhdpycapinbcfhyzc91p"; depends=[]; };
+  rhandsontable = derive2 { name="rhandsontable"; version="0.3.4"; sha256="1ng97l2x9hyqv3cckis81p5bxm4wndv6sipyxy26x9pnyw9lq3kp"; depends=[htmlwidgets jsonlite magrittr]; };
+  rhnerm = derive2 { name="rhnerm"; version="1.1"; sha256="1fkh2pr4kzvqvagdyjlyab7p591s913104gyq05q170gmvlpmiww"; depends=[]; };
+  rhoR = derive2 { name="rhoR"; version="1.1.0.0"; sha256="00djh16s144a9cl2z8zm3za1bsnpzd3i5b9nyqad10xlkgll36li"; depends=[]; };
   rhosp = derive2 { name="rhosp"; version="1.07"; sha256="09wq96micv9wpr3sx8ir7frkanpy3zi3mwn6rbixw2kxvn5wkkfn"; depends=[]; };
   ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
   riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
-  rich = derive2 { name="rich"; version="0.3"; sha256="122xb729xlm8gyb7b3glw4sdvrh98wh89528kcbibpx83bp3frc0"; depends=[boot permute vegan]; };
-  ridigbio = derive2 { name="ridigbio"; version="0.3.3"; sha256="02cxjnvlr9pk3dyc89xvgppw1mjbi3jahddcsqck4dl6ifb6cj2v"; depends=[httr jsonlite plyr]; };
+  rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; };
+  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]; };
   rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
-  rio = derive2 { name="rio"; version="0.3.0"; sha256="1drgy70mxy7jn68587h4fwxapjps7iw6d41z02qbq09a4m05py3p"; depends=[curl data_table foreign haven jsonlite openxlsx readODS readxl urltools XML yaml]; };
-  rioja = derive2 { name="rioja"; version="0.9-5"; sha256="0bi80d8ffn1kgs0b45ia8rj057id8l3mnph16y5wc5nr8fndxrm4"; depends=[gdata lattice mgcv vegan]; };
+  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]; };
   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]; };
   rivernet = derive2 { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; };
-  riverplot = derive2 { name="riverplot"; version="0.5"; sha256="024i1w08c51bflmw608zizif6419xx40sk6pibnqyjnk74p6y7sm"; depends=[]; };
+  riverplot = derive2 { name="riverplot"; version="0.6"; sha256="0q1icpny8nkxyjhawyjzwrw8qlz0ayn2xyrsqrm4vkxyv6c9xk8z"; depends=[]; };
   rivervis = derive2 { name="rivervis"; version="0.46.0"; sha256="19jsl5g46jcbc0kg47bsif1wrw9z9brgvwdcxqjc89shnx3hzzfv"; depends=[]; };
   rivr = derive2 { name="rivr"; version="1.2"; sha256="0ankpfixggwdv17ba8i5iln0zzmngqrhvh3dg8lis9kqg6wa89yr"; depends=[Rcpp]; };
   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=[]; };
   rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
-  rjstat = derive2 { name="rjstat"; version="0.2.1"; sha256="0chb3mypmgqz7wncl01yy93xpz1mmlcc6x1cib37zxc8dy79jm1s"; depends=[assertthat jsonlite]; };
+  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=[]; };
   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]; };
+  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=[]; };
-  rlist = derive2 { name="rlist"; version="0.4.6"; sha256="135zh1nrzlsk1rbzjj8al6zf6im9c7zy081ab0igrxlzsjlrama8"; depends=[data_table jsonlite XML yaml]; };
+  rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; };
   rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; };
+  rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; };
+  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=[]; };
-  rmarkdown = derive2 { name="rmarkdown"; version="0.9.5"; sha256="1zz98jxvw3lzva5kkj1n37gbhjwqd96gjs04y6h37pqy6qmkhk8c"; depends=[caTools htmltools knitr yaml]; };
+  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]; };
   rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
-  rmdformats = derive2 { name="rmdformats"; version="0.2"; sha256="1rnc9zz5yl0g3085g9akr410f7bwmyban98gr71kj71zabc5vwgq"; depends=[htmltools knitr questionr rmarkdown]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.2.2"; sha256="1fx50z8pb5z1i1gzs4v194k9fdiq40ny5ridxym9ykgqf82ncvsa"; 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]; };
+  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="2.0.4.1"; sha256="03dndby95gvx3qfr2fhgar8vvls3ia2hc2xqlmgh977rgaqs7xd1"; depends=[ade4 ape gtools]; };
+  rmetasim = derive2 { name="rmetasim"; version="3.0.5"; sha256="0a5pn146ds4biswh59kaddzryd80l54rhcaqsryhmv6pp4ywg5a1"; depends=[ade4 adegenet gtools pegas]; };
   rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
-  rminer = derive2 { name="rminer"; version="1.4.1"; sha256="1rbs5k3jxjbxr3pdlg03591h8yy9nrg8zjq1kcnvmzgza2a25613"; depends=[adabag Cubist e1071 kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart]; };
+  rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
   rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
-  rmongodb = derive2 { name="rmongodb"; version="1.8.0"; sha256="035a76ak6wi21hdvgzzbggz0qnb53rrr2wfx97ngc8ijwhw8hjh7"; depends=[jsonlite plyr]; };
   rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; };
-  rms = derive2 { name="rms"; version="4.4-2"; sha256="18k7k5k4cy7l76wpdid1lkyjrfg7hs9v6vl6sz3r5y8iag0jklmg"; depends=[ggplot2 Hmisc lattice multcomp nlme polspline quantreg rpart SparseM survival]; };
+  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=[]; };
-  rmumps = derive2 { name="rmumps"; version="5.0.1.8"; sha256="0awhrb29n8xib9hs6xhy5faz8rndrf29bxldxrwj8hnk2rr4bwvr"; depends=[Rcpp]; };
+  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]; };
+  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]; };
-  rnbn = derive2 { name="rnbn"; version="1.0.3"; sha256="05amrx12b7p4pca1wbysn1n2rxbg5r54mpmga4i3xlpijx9baj80"; depends=[httr]; };
-  rncl = derive2 { name="rncl"; version="0.6.0"; sha256="067x05xg7bs271zjhylz3dcd9zan1ycmsh771gn06k9905rr2y71"; depends=[Rcpp]; };
-  rneos = derive2 { name="rneos"; version="0.3-1"; sha256="00hyaq034d9rf03nwv0myryj3a6is08zn24d3i65kmv9aqicv569"; depends=[RCurl XML]; };
+  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=[]; };
   rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; };
   rngWELL = derive2 { name="rngWELL"; version="0.10-4"; sha256="0ayrkd2yllsgl7iqqbhiyrnyyqk13f4wh1np23iz0zj650yjqdq8"; depends=[]; };
   rngtools = derive2 { name="rngtools"; version="1.2.4"; sha256="1fcgfqrrb48z37xgy8sffx91p9irp39yqzxv7nqp1x2hnwsrh097"; depends=[digest pkgmaker stringr]; };
   rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; };
-  rnn = derive2 { name="rnn"; version="0.2.0"; sha256="1c8yx4604fdp9w1l3mcscig2206rwgbp43a1h753jpr8cqwdl75l"; depends=[]; };
-  rnoaa = derive2 { name="rnoaa"; version="0.5.2"; sha256="08fr1d3nxiy3x1i1kb183nsl6ss5w75crykm54728dkij80jrrm2"; depends=[dplyr ggplot2 httr jsonlite lubridate scales tidyr XML]; };
-  rnrfa = derive2 { name="rnrfa"; version="0.5.1"; sha256="0fr8yb5v0grcc55fc3i5sr80b0rm3vbicsy33g6pykgrzdrcppw4"; depends=[plyr RCurl rgdal rjson sp stringr XML2R zoo]; };
-  robCompositions = derive2 { name="robCompositions"; version="2.0.0"; sha256="1y7jhvkj6wq4dkjfsl6f5la7kv3fshb02h8diyz4b4wv4yvkzis6"; depends=[cvTools data_table e1071 GGally ggplot2 MASS pls robustbase rrcov sROC VIM]; };
+  rnn = derive2 { name="rnn"; version="0.8.0"; sha256="04924zn448x9rc3z9vh033l4rv9lz0hxv1bhfl0gn6gvd5wavlc7"; depends=[shiny sigmoid]; };
+  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]; };
+  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=[]; };
   robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
+  robets = derive2 { name="robets"; version="1.1"; sha256="1wpgjw31il231am8bka6636rnlsk6kjly4v8755x191lywip6ck2"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; };
-  robotstxt = derive2 { name="robotstxt"; version="0.1.2"; sha256="15a5k78mc5fpij3cvx8b0qyfglh2x357njm4ryxi230bwvszmqdw"; depends=[httr R6 stringr]; };
+  robmed = derive2 { name="robmed"; version="0.1.1"; sha256="1716vzci0lmim4n28bc2pjky1shjxqrclgllj3hc4dzf8j22dxbz"; depends=[boot ggplot2]; };
+  robotstxt = derive2 { name="robotstxt"; version="0.3.2"; sha256="01nff1m1hs30rzm6y92pi97cp33k2k8a1k11kqms54wkpkglyr55"; depends=[httr stringr]; };
   robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; };
-  robumeta = derive2 { name="robumeta"; version="1.6"; sha256="13hwbl4pym3pkxxfbffhv22nn3f4spc6lb4gz1wxi9iha1s9ywi5"; depends=[]; };
+  robumeta = derive2 { name="robumeta"; version="1.8"; sha256="0fqwif0rwrcfzzid8md2p9b04p7w2bk7asqjxnnag5ywf8f3aj6n"; depends=[]; };
   robust = derive2 { name="robust"; version="0.4-16"; sha256="0psai9d6w7yi0wfm57cc7b2jd5i7wbk2xagrhnvhxknw0dwzf2jh"; depends=[fit_models lattice MASS robustbase rrcov]; };
   robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; };
+  robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; };
   robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
-  robustX = derive2 { name="robustX"; version="1.1-4"; sha256="1s2aav2jr22dgrl7xzk09yn9909k76kpiz271w5r1id6hpfprjwc"; depends=[robustbase]; };
-  robustbase = derive2 { name="robustbase"; version="0.92-5"; sha256="0wsdgqbkr0amid71q52cij9wnyss2sh1fm75g8cp4d6dndh327rl"; depends=[DEoptimR]; };
+  robustX = derive2 { name="robustX"; version="1.2-2"; sha256="0pgfq78qd8s40ciqval01bwajy6zfdjms1lbh0b5g0rww6920s6f"; depends=[robustbase]; };
+  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="1.8"; sha256="0i6h5kndj53p0hcwyx0bp2h6d2hiajf2ycyvq00ajx5jspi8kv48"; depends=[ggplot2 lattice lme4 Matrix nlme robustbase xtable]; };
-  robustloggamma = derive2 { name="robustloggamma"; version="0.4-31"; sha256="19ycdvpzns46gjnkddwznnszs0941blpss7l0cqligv91cz7bkjc"; depends=[robustbase]; };
+  robustlmm = derive2 { name="robustlmm"; version="2.1-2"; sha256="0vgrbvjaix44rixmgd8ljjzvx669gdk5il0f2p8y37ak4s4d2n09"; 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]; };
   robustreg = derive2 { name="robustreg"; version="0.1-9"; sha256="1jjydpiz7wwyvivq7vbyrlyf6y9pd036p2xls0kkq7w1d3vpzjwk"; depends=[Matrix Rcpp RcppArmadillo]; };
+  robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; };
   robustvarComp = derive2 { name="robustvarComp"; version="0.1-2"; sha256="187mcpih509hx15wjjr7z2h6h76mz2v0d8xgsxjd8wz7l3dnlp2f"; depends=[GSE numDeriv plyr robust robustbase]; };
+  rocNIT = derive2 { name="rocNIT"; version="1.0"; sha256="18vxyh1wcq6dv62xf2dyl4226cd00n4hlbaqnynl9j5gnrmmsvi1"; depends=[]; };
   rocc = derive2 { name="rocc"; version="1.2"; sha256="00yxbbphhwkg4sj2h7pd9vw86yavl711nk8yylwmjd3qv39qjml0"; depends=[ROCR]; };
+  roccv = derive2 { name="roccv"; version="1.0"; sha256="13pycz05x0d1azc28yc7569awikd9lidzhhsgljqgsxvazr8fg0i"; depends=[glmnet pROC]; };
   rockchalk = derive2 { name="rockchalk"; version="1.8.101"; sha256="1aa0m3whvb190cyfl4177pfd2l1i1a0dz9rn2fxkvls393cssfmb"; depends=[car lme4 MASS]; };
-  rococo = derive2 { name="rococo"; version="1.1.2"; sha256="08204y3g3xd2srpcpnbkq1laqfr3wrhy73whlxf83gffw8j0iyv8"; depends=[Rcpp]; };
+  rococo = derive2 { name="rococo"; version="1.1.4"; sha256="08s21hhhzdaxbls2akd7sjyfl2nqpvpygpbj563584b399zfgxg2"; depends=[Rcpp]; };
   rodd = derive2 { name="rodd"; version="0.2-1"; sha256="01zrkw4lr21vxk2grfc37iyrcipfdcj5m0i7gnxsvs435y9fqagd"; depends=[Matrix matrixcalc numDeriv quadprog rootSolve]; };
-  rollply = derive2 { name="rollply"; version="0.4.2"; sha256="122c41rqc88ikxws251ddppah18ficir7p00x7wiynqplmhps3nl"; depends=[plyr Rcpp scales stringr]; };
-  rootSolve = derive2 { name="rootSolve"; version="1.6.6"; sha256="0mn7nxdw1klfay7z12vl3k0ffq3i9p930fyiksjjgy4yz6hljxqx"; depends=[]; };
+  rodeo = derive2 { name="rodeo"; version="0.7.1"; sha256="0q76dnwc5bixbl2wh6km7085rivfzjpzl6c3w48wq5b23k1v7pfr"; depends=[deSolve R6]; };
+  rodham = derive2 { name="rodham"; version="0.0.3"; sha256="1rc3k2qsa1rb11fk0va635czslqk1nxpcykrqc5p225makisaxv1"; depends=[jsonlite plyr splitstackshape]; };
+  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]; };
+  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]; };
   ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; };
-  ror = derive2 { name="ror"; version="1.2"; sha256="0n8mk35rm3rp0c7a3i961kij21a177znh9hkq4snqqlw9vf50hdg"; depends=[igraph rJava ROI ROI_plugin_glpk]; };
-  rorcid = derive2 { name="rorcid"; version="0.2.2"; sha256="0jnvc04br702027y3dhhjckd94lidvsj937cv5lvpb7fd8ahmx7z"; depends=[httr jsonlite]; };
-  rorutadis = derive2 { name="rorutadis"; version="0.3.1"; sha256="06s2cnfhs4hffd2bzqp6542fqw37ha63d5sc25j9ch3ih42ja3cg"; depends=[ggplot2 gridExtra hitandrun Rglpk]; };
-  rosm = derive2 { name="rosm"; version="0.1.3"; sha256="0a9shin62zlpc752jhyg72cshc7wwz6cp4br64ra4h86xdlwi3c4"; depends=[abind digest jpeg png rgdal rjson sp]; };
+  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.0"; sha256="09rlkzajgs7sqdj5lwb0bs0vx6676qwqcwx1wawvg40npfw40l0h"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1"; sha256="07my0i84jvmjxvg2ifvsrbc0r5z4s32xi0vfdwrkhhdzdn87h527"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
-  rotl = derive2 { name="rotl"; version="0.5.0"; sha256="0na3x13d2n5fahyxj5jp4v3j3clrcr6m9g4cig9d5dk6dhp3iv9d"; depends=[ape assertthat httr jsonlite rncl]; };
+  rotl = derive2 { name="rotl"; version="3.0.1"; sha256="18dzg3ysy6aphwbj1c4hzr1qn8q3vvr5r0qnpmidr5rwyhc78phb"; 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.2"; sha256="1hvj17n3fy1jaaz551s1icjv1kgr2s22xvg4fllzs8hpgdsybp1j"; depends=[]; };
-  roxygen2 = derive2 { name="roxygen2"; version="5.0.1"; sha256="19gblyrrn29msbpawcb1hn5m1rshiqwxy0lby0vf92rm13fmsxcz"; depends=[brew digest Rcpp stringi stringr]; };
+  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]; };
   royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; };
   rpanel = derive2 { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
   rpart = derive2 { name="rpart"; version="4.1-10"; sha256="119dvh2cpab4vq9blvbkil5hgq6w018amiwlda3ii0fki39axpf5"; depends=[]; };
-  rpart_plot = derive2 { name="rpart.plot"; version="1.5.3"; sha256="18kif26aviyd217dlq5sajfa13acn8nqccrwnl1wy731hsnfv4gf"; depends=[rpart]; };
+  rpart_plot = derive2 { name="rpart.plot"; version="2.1.1"; sha256="0bxn67an7xkg2cml32kll3gwzbs87hzia1jkx0dwg7vmkkvm1ab3"; depends=[rpart]; };
   rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; };
   rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; };
   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.1.1"; sha256="0kq53mlr6i65s8lqj5nk8nvadqxd8hw4rx1vg8c6p5kvnl6pmawn"; depends=[]; };
-  rpf = derive2 { name="rpf"; version="0.51"; sha256="0hsghv26jbv3alvyrh9bkgx97mjbvd21zjv9n1q63d6d3drxc6rc"; depends=[mvtnorm RcppEigen]; };
-  rpg = derive2 { name="rpg"; version="1.4"; sha256="0sisn5l1qxlqg6jq4lzr7w3axkaw5jlpz8vl9gp2hs0spxsjhcyn"; depends=[RApiSerialize Rcpp uuid]; };
-  rphast = derive2 { name="rphast"; version="1.6"; sha256="0ni8969bj3pv0wl8l0v352pqw2d5mlshsdw1rb6wlxk7qzfi5cl2"; depends=[]; };
-  rpivotTable = derive2 { name="rpivotTable"; version="0.1.5.7"; sha256="1qqx417bgf5dcbvssp7y8b5zz66ipwdpv18pgndj92rx53h81g18"; depends=[htmlwidgets]; };
-  rplexos = derive2 { name="rplexos"; version="1.1.4"; sha256="1q9vlxhglmrwxh9g4wq98nc321kq7jhgkykp9hwl3bd26a1jcfjp"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
-  rplos = derive2 { name="rplos"; version="0.5.6"; sha256="0h8k2di868h49hxwww8nz093viqfd48q3jhmlk33yfgs44sm20hj"; depends=[dplyr ggplot2 httr jsonlite lubridate plyr reshape2 solr whisker]; };
-  rplotengine = derive2 { name="rplotengine"; version="1.0-5"; sha256="1wwpfnr5vi8z26alm8y5gply0y4iniagimldzy2z696djzz8p8p8"; depends=[xtable]; };
-  rpnf = derive2 { name="rpnf"; version="1.0.4"; sha256="0cpn23qngjx6m33f3kwflabxdhs06r2mnlh9a6adw4fvvizxnki4"; depends=[]; };
-  rportfolios = derive2 { name="rportfolios"; version="1.0"; sha256="1zcv5ddmk15l0p03nlffimlhhpcc7l1c05xl2d1xlfk58rkvqns6"; depends=[]; };
+  rpdo = derive2 { name="rpdo"; version="0.2.1"; sha256="0n2lpnphnb5h7y9jszq4m15wymwgv7v2pw5fwbflr0ihvx3i3iac"; 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]; };
+  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]; };
+  rplexos = derive2 { name="rplexos"; version="1.1.11"; sha256="0i0yiiy84d6qgx70ib0rf0hr0jb6naw6d6w8lvsl104c3m23sf4q"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
+  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]; };
+  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]; };
   rpsychi = derive2 { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j22zhav3yyfbbhqahs1whwjkksnam4w"; depends=[gtools]; };
-  rpubchem = derive2 { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[car RCurl RJSONIO XML]; };
-  rqPen = derive2 { name="rqPen"; version="1.3"; sha256="1hm4nh9afjwa601qysbjl6ipbal5rmmr8z5nn3f9bxd5nlgwzm0r"; depends=[quantreg regpro]; };
-  rr = derive2 { name="rr"; version="1.3"; sha256="00m5h01j3qb83s7bcjp4xx6pf16hjjhl0qryb929cnxn1ln0ddns"; depends=[arm coda MASS]; };
+  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]; };
+  rqPen = derive2 { name="rqPen"; version="1.5.1"; sha256="10lmbxz5wsfczxr1n8hclvschqm9mfzdgdac5r0b87a2xglqrizv"; depends=[quantreg regpro]; };
+  rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.4"; sha256="0h0mqfb524kglaibgj4d0g05lrnzgz6x87irs31dwl28j4kxcz4w"; depends=[]; };
   rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
-  rrcov = derive2 { name="rrcov"; version="1.3-11"; sha256="0ixn2ly8p5wkdbd1fmpa0p22jxvmxiigpii4ia8vnhjnclm7jmin"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
-  rrcovHD = derive2 { name="rrcovHD"; version="0.2-4"; sha256="020d9ip91azprr4hf5k2gyhlv6g6zkzmaa22fysq3hyacxymksib"; depends=[pcaPP pls robustbase rrcov spls]; };
-  rrcovNA = derive2 { name="rrcovNA"; version="0.4-8"; sha256="1xhzy0gyiwhaklq1b9arxqpljfz08bwlhjw7xsjz7zjb650y3rw8"; depends=[cluster lattice norm robustbase rrcov]; };
+  rrcov = derive2 { name="rrcov"; version="1.4-3"; sha256="0kagqggi634mvrhd67ia7mpjrj5v6w2wq0z3kyppg5xkvzh335nq"; depends=[cluster lattice mvtnorm pcaPP robustbase]; };
+  rrcovHD = derive2 { name="rrcovHD"; version="0.2-5"; sha256="1wv50lcjf0fsxb1zagxbrcx68ilfmnmkc8ccpy9hw3qql5p368ij"; depends=[pcaPP pls robustbase robustHD rrcov spls]; };
+  rrcovNA = derive2 { name="rrcovNA"; version="0.4-9"; sha256="1qc9xqm5x55dqjx1y7s4a2nwc07v32rygicbb8469knxasf92cs3"; depends=[cluster lattice norm robustbase rrcov]; };
+  rrecsys = derive2 { name="rrecsys"; version="0.9.5.4"; sha256="0g3mz5k1ya72qc32wwh8hy809yzxigz8rkcp9rnxdr71fk604a04"; depends=[knitr MASS proxy registry]; };
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
-  rredlist = derive2 { name="rredlist"; version="0.1.0"; sha256="1ivxmb0jwwip7s4gglw4v4wsfzird7gvll8zcgpvwsi3mj5jqibp"; depends=[httr jsonlite]; };
-  rrepast = derive2 { name="rrepast"; version="0.3"; sha256="133ip1fxj8z76v0ny02mw7wbqjsmqsxbha6zsi4db4cxnilq8hai"; depends=[digest lhs rJava xlsx]; };
-  rriskDistributions = derive2 { name="rriskDistributions"; version="2.1"; sha256="1sc0bj5sivclbq0grif99vclnlhg1k9dz4xdvng6vv392xkwbmfd"; depends=[eha mc2d msm tkrplot]; };
+  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]; };
   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=[]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="1.0.9"; sha256="024k3jivl2zvwnlamlsc34bqw7v0rj1psvypykq6lls60frr9cg8"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="1.0.15"; sha256="1gx3xqz505l5kw5hwgkjbsm0aj5p3ycghjmfqcihsxpvai7hzlza"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
-  rsconnect = derive2 { name="rsconnect"; version="0.4.2"; sha256="04j2826264nvgwlbi68827cn3gah97bwmxn6yxrdpa4j1khmnj7g"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
-  rscopus = derive2 { name="rscopus"; version="0.1.2"; sha256="178ymgywq7fmv8gicrkhcqw40f6wxiqq6zhlc1zilcr0rf6lvx6x"; depends=[httr]; };
+  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-3"; sha256="13wdzpyv15p4a92lclb6jg3lm1hnyaa8wqnngm1qyam3dhwfi9k0"; depends=[plyr RCurl XML]; };
+  rsdmx = derive2 { name="rsdmx"; version="0.5-8"; sha256="0f0hc2v9g7gxqcfhx3m7fawsvlba3jx666f675263d8vhdc9f311"; depends=[plyr RCurl XML]; };
   rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; };
   rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; };
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
   rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; };
   rsig = derive2 { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; };
-  rsm = derive2 { name="rsm"; version="2.7-4"; sha256="0j520dhklfbd9mh90181lxjsvasgyc0zzi6z6ahybwhffwqczz42"; depends=[]; };
+  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]; };
+  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.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[httr jsonlite plyr RCurl stringr XML]; };
+  rsnps = derive2 { name="rsnps"; version="0.2.0"; sha256="10g1b2i2mp0b4p78iiy83sz2jwz73xfjkhc6ih4ag2wmbdmwf9pb"; depends=[httr jsonlite plyr stringr XML]; };
   rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.1.0"; sha256="15yz4z96hbl18l2n3vz7mcamwvh7zkqbhlhdmyi002bsc1jd97s9"; depends=[h2o sparklyr]; };
+  rsq = derive2 { name="rsq"; version="0.6"; sha256="0qc5mkz7b68al3iahsbv45imkzabbsykd95w1yd7gfcrw0qk592m"; depends=[]; };
+  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.9.0-3"; sha256="0ps6a9fqvrm6p8s5g10373hfqrx58vmvg1w4rghz5v8wshjc9ij4"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
-  rstanarm = derive2 { name="rstanarm"; version="2.9.0-3"; sha256="0sh1xv0848c0sil1qrjdn8hgv2hr40nmz4knz63mnr3i5j8fzy00"; depends=[BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan shinystan StanHeaders]; };
-  rstatscn = derive2 { name="rstatscn"; version="1.0.2"; sha256="0gq4ybymlpvzr5gkxlc877jwczh034b5gxmzhy8pcqhai6jsq42y"; depends=[httr jsonlite]; };
+  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=[]; };
+  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.1"; sha256="0fflgp17gfav7q7yv3x1g74s9r5fhzr52mrmjl9p6hc7q6m2frzl"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
+  rstpm2 = derive2 { name="rstpm2"; version="1.3.4"; sha256="0vm5w597lz3zzklm21avxm88lqgrn9k2hlfh4yvmqk4vmwp4qkcc"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
   rstream = derive2 { name="rstream"; version="1.3.4"; sha256="1sgwk9mh3v3vv8gm537hfng6p2sqafd9ykraiw00s0z60fa80jnx"; depends=[]; };
-  rstudioapi = derive2 { name="rstudioapi"; version="0.5"; sha256="0sgnqfx0m3hzh57k10s7ndrbw7yqjjjcgfikafya98jcc7wmpwym"; depends=[]; };
+  rstudioapi = derive2 { name="rstudioapi"; version="0.6"; sha256="1zkvz72z6nw0xc8bhb21y5x1nk6avijs0w8n4vsbvw9sn76wc96s"; depends=[]; };
   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.3"; sha256="0439s19fn01iihsapzzbmq72v4brsmqypxgdhxswhj9qq3y8ikhc"; depends=[]; };
-  rsvg = derive2 { name="rsvg"; version="0.5"; sha256="0db0s3flyl1w1wzr9pbnpakz1zi1ssh4mgjpspkjphpqahix27qa"; depends=[]; };
+  rsvd = derive2 { name="rsvd"; version="0.6"; sha256="0vrsgxbbk5n51i1s80bixcxph2ws86zpbdqs81yfvnzghrc99nas"; depends=[]; };
+  rsvg = derive2 { name="rsvg"; version="1.0"; sha256="1584g43jx21d2di6zn4ra5j916a5bqzpni223prwn3nii5244f3x"; 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=[]; };
-  rtdists = derive2 { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd gsl msm]; };
+  rtdists = derive2 { name="rtdists"; version="0.6-6"; sha256="173yzgvzcfdhkk4zf1d8cxnk707dbr6n5fpwzhcn4qx35sgq26jd"; depends=[evd gsl msm pracma]; };
   rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; };
+  rtext = derive2 { name="rtext"; version="0.1.20"; sha256="0455rwfxmpgb4qb925ildqr4km4ndgqjxgvk90x2dhfivgmmn60k"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; };
   rtf = derive2 { name="rtf"; version="0.4-11"; sha256="04z0s5l9qjlbqahmqdaqv7mkqavsz4yz25swahh99xfwp9plknfl"; depends=[R_methodsS3 R_oo]; };
-  rtfbs = derive2 { name="rtfbs"; version="0.3.4"; sha256="1z5rhxgi44xdv07g3l18ricxdmp1p59jl8fxawrh5jr83qpcxsks"; depends=[rphast]; };
-  rticles = derive2 { name="rticles"; version="0.1"; sha256="17fbwarchnxvbk2fsb2hyifdhnaj05pl5ia32j5yd7pyi848mpvv"; depends=[knitr rmarkdown yaml]; };
+  rtfbs = derive2 { name="rtfbs"; version="0.3.5"; sha256="0sdxlw1pkwwlzz2zcw4v8zhlm97lw2j5hbkqssialpa53jwyibyc"; depends=[rphast]; };
+  rticles = derive2 { name="rticles"; version="0.2"; sha256="09cc0xfsvraw2vxl3icql8060nw4136cbp2iicm0bhhrvyxpvl5r"; depends=[knitr rmarkdown yaml]; };
+  rtide = derive2 { name="rtide"; version="0.0.3"; sha256="0zbm4mza5093ixwaiza16lr1wd92fpgrl9ixxsmp0whnl4g2mwl2"; depends=[abind datacheckr dplyr lubridate magrittr plyr stringr tibble tidyr]; };
   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]; };
-  rtkore = derive2 { name="rtkore"; version="1.0.1"; sha256="0wk3v7xzmkmmag09dc08812g75a129ycn1107hvzqcpqlwma3n2n"; depends=[Rcpp]; };
-  rtkpp = derive2 { name="rtkpp"; version="0.9.2"; sha256="09x98mgbz3a9vn59qarzsfml5qaw9mz2hg36sn8z1pgpjq7a75sp"; depends=[Rcpp]; };
-  rtop = derive2 { name="rtop"; version="0.5-5"; sha256="05yygg85f981x2amf9y8nr4ymya3pkwlig8i1rf9b49jx11h5w8j"; depends=[gstat sp]; };
-  rts = derive2 { name="rts"; version="1.0-10"; sha256="0fvs82n8lxbm4n8w22ahx7j38xhaafwvr3sqr3lrfni2cs346pzs"; depends=[raster sp xts zoo]; };
-  rtson = derive2 { name="rtson"; version="1.1"; sha256="158dzs9wzb12k3hpkpz7jjhjdbr23j05rfyav1zn18hg43i5wbv3"; depends=[R6]; };
+  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]; };
+  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=[]; };
+  rtrim = derive2 { name="rtrim"; version="1.0.1"; sha256="134j5sv9dvcq1n37rry7615nr3pa54by6r7ss7fagcmy4lnma2ps"; depends=[]; };
+  rts = derive2 { name="rts"; version="1.0-18"; sha256="1dryx7pb86b6d0z271girvl3k9ahxv0llxcmaypk9x077gzyxx94"; depends=[raster sp xts zoo]; };
+  rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; };
+  rtweet = derive2 { name="rtweet"; version="0.4.0"; sha256="19sb8l7xllicagy8i1rwxkfbbl9klv3m9kkxvlc3slg1j3aprvpz"; depends=[httr jsonlite magrittr openssl]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
+  rtypeform = derive2 { name="rtypeform"; version="0.2.0"; sha256="08hrhdd7zabga7338pvkkcy47kkvc2nbqb2v0sp3r4jqg7438a07"; depends=[httr jsonlite]; };
   rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; };
+  rucrdtw = derive2 { name="rucrdtw"; version="0.1.1"; sha256="1531i3n3a0hj6smi6lbhqx9zk4rf3zyi6nhaihcgp3sb9vk7zdlf"; depends=[Rcpp]; };
   rugarch = derive2 { name="rugarch"; version="1.3-6"; sha256="0ysycv0qldp4dnj8yh22v860d40ycp2c0la87zblgl86r7g4f03b"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; };
   runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; };
-  runjags = derive2 { name="runjags"; version="2.0.2-8"; sha256="00jqaz68mr3jmi7ifklwyjsh7jaxbk6pc1fxprgz29nbc1r7hi0r"; depends=[coda lattice]; };
-  rusda = derive2 { name="rusda"; version="1.0.6"; sha256="1ziinga40jxnh7c8yd6vmryl7kpk62fr87p3ilv41rvfgw3rsl3v"; depends=[foreach httr plyr stringr testthat XML]; };
+  runjags = derive2 { name="runjags"; version="2.0.4-2"; sha256="035sxmh0b0m6dwz8qbpsmw2p7ihkx3cxgkhj27i0j6dsjryl3x4p"; depends=[coda lattice]; };
+  rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; };
+  rust = derive2 { name="rust"; version="1.1.0"; sha256="0ii7a4cygzx5ww064papwxcby0j9maw4rjf40z1jgr6xr5x0dfny"; depends=[spatstat]; };
   ruv = derive2 { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; };
   rv = derive2 { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
   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=[]; };
-  rversions = derive2 { name="rversions"; version="1.0.2"; sha256="0xmi461g1rf5ngb7r1sri798jn6icld1xq25wj9jii2ca8j8xv68"; depends=[curl xml2]; };
-  rvertnet = derive2 { name="rvertnet"; version="0.4.1"; sha256="1x24l83m00rd10hcy2mnzpwlkpk92zfw3gcxiwghpijy04azkiy9"; depends=[dplyr ggplot2 httr jsonlite maps plyr]; };
-  rvest = derive2 { name="rvest"; version="0.3.1"; sha256="12mh9jbfy6ykx89kb475gk99i0jaxja6jk7pd6d9iz0kbfywnm7f"; depends=[httr magrittr selectr xml2]; };
-  rvg = derive2 { name="rvg"; version="0.0.8"; sha256="0dbqzaxhabq0qn6clj46mb6a9cawz3pkmnksrhqbslq7x2y5wcp8"; depends=[gdtools R_utils Rcpp xml2]; };
+  rvcheck = derive2 { name="rvcheck"; version="0.0.5"; sha256="045anzzp3laavxm3sqnyfnnc13nhryv15w63qawr9y81alg91397"; depends=[devtools]; };
+  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]; };
   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.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
-  s20x = derive2 { name="s20x"; version="3.1-16"; sha256="10z19q28wv3jnrs8lhban4a6hxqxgivcalq633p3hpa4zhw7nsj7"; depends=[]; };
-  s2dverification = derive2 { name="s2dverification"; version="2.5.0"; sha256="1d8ydjgrrqxg29f5sdngch1l1zlg7bsrv04702v46x8x98521mc4"; depends=[abind bigmemory GEOmap geomapdata mapproj maps ncdf4 plyr SpecsVerification]; };
+  rzmq = derive2 { name="rzmq"; version="0.9.0"; sha256="01fw6xpjq3h1ss38swivnp3rv7sh2lrdp0qcxz1ff7yln9sm5qsm"; 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]; };
   s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; };
+  sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; };
   sBF = derive2 { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
+  sBIC = derive2 { name="sBIC"; version="0.2.0"; sha256="1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11"; depends=[combinat flexmix hash igraph mclust poLCA R_methodsS3 R_oo Rcpp]; };
+  sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; };
   sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
+  sFFLHD = derive2 { name="sFFLHD"; version="0.1.1"; sha256="19zhx0rc6h44301a5q68r9jbxzh12ci3387d1c319vdiw05nschy"; depends=[conf_design DoE_base]; };
   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]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
-  sSDR = derive2 { name="sSDR"; version="1.1.0"; sha256="0f8j1m4j6y8pppaw05naharfqlzb5y8d9db29fi86pm7w1x49511"; depends=[MASS Matrix]; };
+  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]; };
-  sads = derive2 { name="sads"; version="0.2.4"; sha256="15kszjlqz3rzxfmsfd8zbl6hx40z9j5drzyvac1h244dhrms6lal"; depends=[bbmle GUILDS MASS poilog VGAM]; };
+  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]; };
-  saeSim = derive2 { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
+  saeRobust = derive2 { name="saeRobust"; version="0.1.0"; sha256="1zin9ix4wx3qbx2mfjyn61l0g1k4dgn4ps79qn21y6l9r647ya9q"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules Rcpp RcppArmadillo spdep]; };
+  saeSim = derive2 { name="saeSim"; version="0.8.0"; sha256="1yabhhrmp0d9vzs7cn7ngdilmyli10zqyv5ys2sx9s5pqqlvgbij"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
   saemix = derive2 { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; };
   saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; };
   safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
   safi = derive2 { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-3"; sha256="165y2z9bhf7cyrh177fk87apqpgzyn69gf53f9mmii931cyykihw"; depends=[boot raster rasterVis sp]; };
   sampleSelection = derive2 { name="sampleSelection"; version="1.0-4"; sha256="0by6l20hsaqvkcxpvn7lr6p2g78lb1464dygp7x4h8sq1fc4j4av"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
-  samplesize = derive2 { name="samplesize"; version="0.2-2"; sha256="1sfyzrws6zy3m5dqyp1hqs6y5znkxfpayznz59a54s03r8c7xizk"; depends=[]; };
-  samplesize4surveys = derive2 { name="samplesize4surveys"; version="2.4.0.900"; sha256="199g2gsbv1w1acn7nnlv2wbrhq7lc1mx8vvs1w9a9a8dkxdmml0g"; depends=[TeachingSampling]; };
-  sampling = derive2 { name="sampling"; version="2.7"; sha256="0xp0djpgns2lbgshrpxcmqa7c180ds3ymqa5asyxxl74yiric7xi"; depends=[lpSolve MASS]; };
+  samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; };
+  samplesize4surveys = derive2 { name="samplesize4surveys"; version="3.1.2.400"; sha256="16q8pird6ic7001i3gkwqb2rlak9l853bf2m1y9njmdprsjs82yl"; depends=[TeachingSampling timeDate]; };
+  samplesizelogisticcasecontrol = derive2 { name="samplesizelogisticcasecontrol"; version="0.0.6"; sha256="1xznql86r6snkkmk9g05jhdam06pr0qmg40mdzasl291nc50v5aa"; depends=[mvtnorm]; };
+  sampling = derive2 { name="sampling"; version="2.8"; sha256="06pj7dan0mknpsblmlnk7am78qrnwgnql5vvx7vmbfvib7rj6s9m"; depends=[lpSolve MASS]; };
+  samplingDataCRT = derive2 { name="samplingDataCRT"; version="1.0"; sha256="0ah3fi2sn642c8nicikhjhl1hdsjzshrf1j02swq0jaqggcqjdvk"; depends=[mvtnorm]; };
   samplingEstimates = derive2 { name="samplingEstimates"; version="0.1-3"; sha256="1srdchlpxksfdqhf5qdvl7nz0qsxkxww7hzqj0q71asbzlq3am3p"; depends=[samplingVarEst]; };
-  samplingVarEst = derive2 { name="samplingVarEst"; version="1.0-1"; sha256="049a964g6720p14fndvr68s7lypc0pac2bfdkm6fp278j8l34x7i"; depends=[]; };
-  samplingbook = derive2 { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; };
+  samplingVarEst = derive2 { name="samplingVarEst"; version="1.0-2"; sha256="182y1srz2cs6rn8kh6nns5v29q0ww2jmv0yfp8b110qq23wd5mnd"; depends=[]; };
+  samplingbook = derive2 { name="samplingbook"; version="1.2.1"; sha256="0xjsmsqj3ik2ffih8f2cpq6m5rpk603y697mh5m42frg20cqa87w"; depends=[pps sampling survey]; };
   samr = derive2 { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; };
   sand = derive2 { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
   sandwich = derive2 { name="sandwich"; version="2.3-4"; sha256="0kbdfkqc8h3jpnlkil0c89z1192q207lii92yirc61css7izfli0"; depends=[zoo]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sankey = derive2 { name="sankey"; version="1.0.0"; sha256="0wm10f514sg3gfrz291k720kznnyssznyvr49c15i26bhb82m0q0"; depends=[simplegraph]; };
   sanon = derive2 { name="sanon"; version="1.5"; sha256="1iikm7ivlz87kbq0ax9r1dz29zdq1kmhxd2imzc4hkvr1rwgciv6"; depends=[]; };
-  sapa = derive2 { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; };
+  sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; };
+  sarima = derive2 { name="sarima"; version="0.4-3"; sha256="1y4wz4c27lmxkwc87diy5fvj25jzmflfji5b4ajx6pql3d3ral4s"; depends=[FitAR FitARMA ltsa PolynomF portes]; };
   sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
   satellite = derive2 { name="satellite"; version="0.2.0"; sha256="00znkb9wsg7yqxykb5bhl1chqir26h4ixhcqzxg6j1c4hpd2sakk"; depends=[plyr raster Rcpp]; };
   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]; };
+  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=[]; };
   sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; };
+  sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; };
+  sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; };
   sca = derive2 { name="sca"; version="0.9-0"; sha256="1xqdcxxsrsl8v2i8ifqcgb38vayz8ymay2sw4m9hmpma54a6r9j5"; depends=[]; };
   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.0"; sha256="19y6q4j8vpmc73dnn4ncp5wj44gri7m77ys3z2rn3crrcc9zc7l5"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; };
+  scales = derive2 { name="scales"; version="0.4.1"; sha256="1lqccfmqdwrw0cjyqvw2zvgpk2jvnqrfb303l1raqyyf3zxqhav4"; depends=[dichromat labeling munsell plyr RColorBrewer Rcpp]; };
   scalreg = derive2 { name="scalreg"; version="1.0"; sha256="06iqij1cyiw55ijzk2byrwh3m5iwsra7clx8l4v69rc236q8zbdi"; depends=[lars MASS]; };
-  scam = derive2 { name="scam"; version="1.1-9"; sha256="1hx8y324bgwvv888d34wq0nnmqalfh5f26b5n36saaizm4a12wyf"; depends=[Matrix mgcv]; };
+  scam = derive2 { name="scam"; version="1.2-1"; sha256="039iym85khym5m6g712lbd5s0c6dfw9xlpvlj29rwlcl1dkr1g7v"; depends=[Matrix mgcv]; };
+  scan = derive2 { name="scan"; version="0.20"; sha256="1xyng9dlfmp7n2h91n4xy9lx3jm205gjiizdqk1yj1qw8mmahvqc"; depends=[nlme]; };
+  scanstatistics = derive2 { name="scanstatistics"; version="0.1.0"; sha256="0snscxaw2j406bi29ns0z34lb3q39fq3wikkdnps6gkvxg97614i"; depends=[data_table gamlss_dist magrittr plyr sets]; };
   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.6.1"; sha256="1d42fd2rzk5vgz7d971zv5f2yxm5zsy4awax9qzm9hdm5mf241c5"; depends=[digest ellipse htmlwidgets]; };
-  scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-36"; sha256="0bdxfdw23921h3rbpq0y4aixplzpkk95wgm2932kh0x7a4bnhswh"; 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=[]; };
+  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.2"; sha256="1dz4mws227a5h3kkmpnz06liy9n3k01ihvcxxwnj8283w3b23bci"; depends=[]; };
+  schoRsch = derive2 { name="schoRsch"; version="1.4"; sha256="19k34i74ira71v0r5gz9rfnbadnjzi0wpxcm4zqqn7y6jpmfbd11"; depends=[]; };
   scholar = derive2 { name="scholar"; version="0.1.4"; sha256="088clkpllpjv9rjb45v46dga4ig11ifvfyclgfgcgqvxy5cn92jr"; depends=[dplyr httr R_cache rvest stringr xml2]; };
   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]; };
+  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=[]; };
   sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; };
-  scmamp = derive2 { name="scmamp"; version="0.2.5"; sha256="1i0fkmpkdjbjwvh1y4synplafvcx9bjyf8i856sm5i3kjyh6vx46"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
+  scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
+  scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
+  scoringRules = derive2 { name="scoringRules"; version="0.9.2"; sha256="04vkw2azyj1xsnyr58cgagajcd2f7r0843i9v77p4wvzv96rl851"; depends=[MASS Rcpp RcppArmadillo]; };
   scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; };
+  scphaser = derive2 { name="scphaser"; version="1.0.0"; sha256="1n5ihdpjclpiwg2i6v8m46ysjg53fzsr0j60ijnvrq328y0iqis4"; depends=[BiocParallel cluster Hmisc R_utils]; };
   scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
   scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
-  scriptests = derive2 { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; };
-  scrm = derive2 { name="scrm"; version="1.6.0-2"; sha256="1a3m56j4ca526mjhc7h0967k5bja336dw1bpna119l5yic6hkc1n"; depends=[Rcpp]; };
+  scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; };
+  scrm = derive2 { name="scrm"; version="1.7.2-0"; sha256="1i4mdymds8xmxcxzc7a9lcmy2q11gmdgnfbm2hircf07j5pbb2d8"; depends=[Rcpp]; };
   scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; };
-  scrypt = derive2 { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp]; };
+  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=[]; };
+  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]; };
-  sdcMicro = derive2 { name="sdcMicro"; version="4.6.0"; sha256="0j6adz04smp8pbg62w7hyqp2wl1cqazmxf4vnvb4jxcqw69qxd74"; depends=[car cluster data_table e1071 ggplot2 knitr MASS Rcpp rmarkdown robustbase sets xtable]; };
-  sdcMicroGUI = derive2 { name="sdcMicroGUI"; version="1.2.0"; sha256="0bhrpric17y1ljm18a00i6bkxfq1cpljfkib8qbb4jyj5s50f3ps"; depends=[cairoDevice foreign gWidgets gWidgetsRGtk2 Hmisc sdcMicro vcd]; };
-  sdcTable = derive2 { name="sdcTable"; version="0.20.3"; sha256="03ljsk1y1l0771ika013qgdm3zd3q60lxc2a11dnaglnz4pmvyx1"; depends=[data_table lpSolveAPI Rcpp Rglpk stringr]; };
+  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.21.6"; sha256="17vi1mzr1kiq47dv1zskg63cpsqwxraj01g6sp6lx9vmw2cax74r"; 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.14"; sha256="1j4lvbc4f78dkz7fkwb07498a0xnnz0xrszgmhz80s2fvc1c5djs"; depends=[fda MASS zoo]; };
+  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]; };
   sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; };
-  sdnet = derive2 { name="sdnet"; version="2.03.3"; sha256="1884pil3brm7llczacxda6gki501ddyc5m8ggqjix64kbvw37slv"; depends=[]; };
-  sdprisk = derive2 { name="sdprisk"; version="1.1-3"; sha256="1rwzi112fjckzxmhagpg60qm9a35fqx8g8xaypxsmnml6q00ysiq"; depends=[numDeriv PolynomF rootSolve]; };
+  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]; };
   sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; };
   sdwd = derive2 { name="sdwd"; version="1.0.2"; sha256="0l0w4jn2p9b7acp8gmlv4w8n662l397kbrm4glslik0vnmjv151w"; depends=[Matrix]; };
-  seacarb = derive2 { name="seacarb"; version="3.0.11"; sha256="07kw9b8v73sz6nxpr0lb9f0ckkb6pgyw05nwpg43fkwc0qvykbvw"; depends=[oce]; };
+  seacarb = derive2 { name="seacarb"; version="3.1.1"; sha256="1q7r9b6f38lnabfifyjvhc0aiphdp9z2lbh02da1vgpz538bv5zj"; depends=[oce]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
-  searchConsoleR = derive2 { name="searchConsoleR"; version="0.1.2"; sha256="02a28ism9kgfdmn00pdv9p6xg24c5kr5n0shghg5fq9yhxap59iv"; depends=[googleAuthR stringr]; };
+  searchConsoleR = derive2 { name="searchConsoleR"; version="0.2.1"; sha256="1hf87x3jfwl12d1gspnrgpzh90hpci5gh54hasi6bx6z8xw44ssb"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
   seas = derive2 { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
   season = derive2 { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[coda ggplot2 MASS mgcv survival]; };
-  seasonal = derive2 { name="seasonal"; version="1.2.1"; sha256="0y85z9rgqyzfry8ak5bi565jhkfks1xd2zhjyh63p823cyjln6cf"; depends=[x13binary]; };
+  seasonal = derive2 { name="seasonal"; version="1.5.1"; sha256="0gwjzp7syg20qbv7jp97ibd51905fkxdsfvpjmvk4zgxd5p69cfm"; depends=[x13binary]; };
+  seasonalview = derive2 { name="seasonalview"; version="0.2"; sha256="1gmg9641niazf3vs4ranqyi9i4bv23msxp11r6dyhcm9apxqlyxs"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; };
   seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; };
-  secr = derive2 { name="secr"; version="2.10.2"; sha256="14l284qhnic7ng6zpnnfxqk4gxlmx9xlfb675k5691x2bdy4z8gx"; depends=[abind MASS mgcv nlme raster sp]; };
-  secrdesign = derive2 { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[abind secr]; };
+  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]; };
-  seeclickfixr = derive2 { name="seeclickfixr"; version="1.0.0"; sha256="15dgq7bc71y5jykvpzpwbjxcw3jjh9vf12pwyaizhkb5fkyrjjmf"; depends=[jsonlite RCurl]; };
+  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]; };
   seem = derive2 { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqicc1qfnzsair0gvsk3cxsrw6bf"; depends=[]; };
-  seewave = derive2 { name="seewave"; version="2.0.2"; sha256="1dr2kldx85fbzawy5lp5z3044hsh72vdyirl15b12w8nrh2p1a5z"; depends=[tuneR]; };
+  seewave = derive2 { name="seewave"; version="2.0.5"; sha256="1ml0jcqb6i6v0xgarvzg51rgax6lsf6y2255jq1kfz4v8n39vnh0"; depends=[tuneR]; };
   seg = derive2 { name="seg"; version="0.5-1"; sha256="0gsdbq7b5wpknhlilrw771japr63snvx4vpirvzph4fjyby1c7rg"; depends=[sp splancs]; };
-  segmag = derive2 { name="segmag"; version="1.2.2"; sha256="130saznhssg0qsc34fcw80x92mmqhjgizrb4fxpjsg7a8jjrclp8"; depends=[Rcpp]; };
+  segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   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.0.1"; sha256="1lls2gbx994j7y3kwpf00ngga5qlzqxwc3cy9x21gy9iq2s8hn0x"; depends=[Rcpp]; };
+  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]; };
   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.50.1"; sha256="025y0g5jj416k1a71jxwyr69cza6xvfq3gv3lv3m7i3sbd4bsmaj"; depends=[mvtnorm]; };
-  selectiveInference = derive2 { name="selectiveInference"; version="1.1.3"; sha256="0f173mzijw34f9m7xqljv1pczk8pvqlwmi30p6i0zld6amg6h76s"; depends=[glmnet intervals]; };
-  selectr = derive2 { name="selectr"; version="0.2-3"; sha256="1ppm1f6mwfwbq92iwacyjn46k1d8148j4zykmjvw8as6c8blgap1"; depends=[stringr XML]; };
+  selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; };
+  selectiveInference = derive2 { name="selectiveInference"; version="1.2.2"; sha256="1rmrvwa54xj3rxmfnhr2vwdxv9s3xlv35pqf08iiy525nqd2hsy5"; depends=[glmnet intervals survival]; };
+  selectr = derive2 { name="selectr"; version="0.3-1"; sha256="0jc946456qp3g2icaifrqn4z7z5pn23rfw77796aa8mmlkp7qkyv"; depends=[stringr]; };
   selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; };
+  seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; };
   selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
   selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; };
-  sem = derive2 { name="sem"; version="3.1-6"; sha256="1gx0j3ignpmgy3qvnp0qjmhlzbxj0wjfr6jfs9d29cnq8b38p73c"; depends=[boot DiagrammeR MASS matrixcalc mi]; };
+  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]; };
-  semTools = derive2 { name="semTools"; version="0.4-11"; sha256="00b695ylgx9r5rxaq6zg05nk99kzr00sw379dxr6mar0kpazy4qn"; depends=[lavaan]; };
+  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]; };
   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]; };
+  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]; };
-  sensR = derive2 { name="sensR"; version="1.4-6"; sha256="1nw8kkk70nrw8i95v52ncg4zrmkq84w94d5d1c474ap0pfg8rfpj"; depends=[MASS multcomp numDeriv]; };
-  sensitivity = derive2 { name="sensitivity"; version="1.11.1"; sha256="1v4lzy687r66jmxgm0fy81wgj70ak58hd13h1jn60wb5j3p91qki"; depends=[boot]; };
+  sensR = derive2 { name="sensR"; version="1.4-7"; sha256="06dzb1sid7wq9i0x6pnsb5srk9z9pv9y8y5br6bkcbm6k3iv5jsv"; depends=[MASS multcomp numDeriv]; };
+  sensiPhy = derive2 { name="sensiPhy"; version="0.6.0"; sha256="00fw8fm3n4jlz5v9fvni4ff3x2fv0ixpjddk2mn6cac7yqfsha6p"; depends=[ape caper ggplot2 phylolm]; };
+  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=[]; };
   sensitivitymv = derive2 { name="sensitivitymv"; version="1.3"; sha256="1bxf85q91smnsl2lsig43vk0c63c805d8ry1xh3w6q675djj14ad"; depends=[]; };
   sensitivitymw = derive2 { name="sensitivitymw"; version="1.1"; sha256="1bknnfkkqgmchabcjdfikm37sn5k41ar8lpnjw58i8qh7yzq237i"; depends=[]; };
   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]; };
   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.5"; sha256="0dy0iiijfnsq7i49hj2vc7j8n1d823laa63q6pkrjni9fb4xw9v8"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
-  seqMeta = derive2 { name="seqMeta"; version="1.6.5"; sha256="0ws6xa1bcibg49vax4in9gc1pvf19ggf95nfy0qr3pp5fpbqw29d"; depends=[CompQuadForm coxme Matrix survival]; };
+  seqHMM = derive2 { name="seqHMM"; version="1.0.6"; sha256="04cfii5i337g11qdrhq3sflas2vv8avy4qylxvridxqibvk70pjz"; 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.1-3"; sha256="0bbjfwbqg74wsamb3iz01g0ssdpdpg65gh00y9xlnpk4wb990n4n"; depends=[ade4]; };
-  seqminer = derive2 { name="seqminer"; version="5.0"; sha256="1v9z0ip5jcmpbw4a5lmf4nll7d3khblcrqcjk7k1zplwj6xnbqfx"; depends=[]; };
-  seqmon = derive2 { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mkkg9q601jsqxm9hk9yagyvvd7d78w"; depends=[]; };
+  seqinr = derive2 { name="seqinr"; version="3.3-3"; sha256="1n1a2zqv1s5415fz2vgqys3nm282d6lkglbd1vprx4k76lp55gfn"; depends=[ade4 segmented]; };
+  seqminer = derive2 { name="seqminer"; version="5.7"; sha256="0p75wyl70cvp36mwg5y74nv573j1gdqi15ac2a7xf61jmsq7ycpy"; 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]; };
-  serial = derive2 { name="serial"; version="1.1"; sha256="06qmvkmgp04izq8dr6ky44dfr3z3cv1c9dxkalv57qxccshkc1xq"; depends=[]; };
-  seriation = derive2 { name="seriation"; version="1.2-0"; sha256="0krbrv9f0lw5vjcfjnak541c4hmyvqwkvqdlrgiapmwhl6lp6z9s"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
+  sequoia = derive2 { name="sequoia"; version="0.7.2"; sha256="0qvy9bmaai85gnhhrw1r59vzxll1r8r0h51cn88d6n7801yi9r3r"; 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=[]; };
-  servr = derive2 { name="servr"; version="0.3"; sha256="1p85ii0w3fydsjqg8mrrg972qmrdrw1a1kbgpikq4w40vxp33szl"; depends=[httpuv jsonlite mime]; };
-  sesem = derive2 { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[gplots lavaan mgcv]; };
+  servr = derive2 { name="servr"; version="0.5"; sha256="1ixcl9xjc1k9zvl6v6bsw4kpramr1h53b4s46qg8kahkqy6kqd8a"; depends=[httpuv jsonlite mime]; };
+  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=[]; };
+  setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
-  setwidth = derive2 { name="setwidth"; version="1.0-4"; sha256="0i565phbfj0rff13nyz6sy8cn4cch4fcjfgkns3z6c94w11b4703"; 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]; };
   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=[]; };
   sfsmisc = derive2 { name="sfsmisc"; version="1.1-0"; sha256="0580piv4n1nispl3pa8nfjjfnb8iwaqky2dzdy0aqnxrxgrhqhvz"; depends=[]; };
   sft = derive2 { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7kgans6dwh1bmawaqkchyab3jr"; depends=[fda]; };
   sgPLS = derive2 { name="sgPLS"; version="1.4"; sha256="0yx3vg9rfm6jvrgfaky2dlbrbksa5475gx3g11x6i35nd2nb2p5z"; depends=[mixOmics]; };
   sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
   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.2.0"; sha256="06a70q7i93pyyadqngg1qd0kz52m73fpqlji6jxsiyixajcqn2q5"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress]; };
+  sglOptim = derive2 { name="sglOptim"; version="1.3.5"; sha256="1ys4hlpfsyc0iwhr1gpwzf47snpmmyxv0clb2vbcfm0lr272h25l"; 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.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; };
+  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.1.0"; sha256="164m4xm63swp1b1kr86i4nnja79kfhzd3pyc1qwyby838brkm5aj"; depends=[colorspace]; };
+  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]; };
   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]; };
-  shapes = derive2 { name="shapes"; version="1.1-11"; sha256="1zxckrl4pc6ppdbhp5h5ib4yp7iw7z3kciqibrijvbvjpkl1fl35"; depends=[MASS rgl scatterplot3d]; };
-  sharpshootR = derive2 { name="sharpshootR"; version="0.9.1"; sha256="01qczwyh6gpw26qg77r5f9nrmfjd1glcbdxwvx0bdfa5j6m31iq4"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
+  shapes = derive2 { name="shapes"; version="1.2.0"; sha256="0fnwcxnrhy5iqzzmrkbbpr4rirg4ixl96656ywcc1mhwv6d6iw0z"; depends=[MASS rgl scatterplot3d]; };
+  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.2"; sha256="16n7l02sm9jyvag43y048ga7p3zpsfhmh7ar4759r68zc14sgj9k"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 iterators lazyeval scales SDMTools seqinr stringi tidyr]; };
-  shiny = derive2 { name="shiny"; version="0.13.1"; sha256="0lz57iv0xv8j2iczwznkypb5syjh5rk6lnyp92icphz4qmbcpkaa"; depends=[digest htmltools httpuv jsonlite mime R6 xtable]; };
+  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]; };
   shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
-  shinyFiles = derive2 { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[htmltools RJSONIO 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]; };
+  shinyFiles = derive2 { name="shinyFiles"; version="0.6.2"; sha256="1lphzqbzg482lv0xiamfv28n5nyjppss9zzcpx1cd5fsz0xg1282"; depends=[htmltools RJSONIO shiny]; };
+  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]; };
+  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]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
-  shinydashboard = derive2 { name="shinydashboard"; version="0.5.1"; sha256="1p417ngxw9bk90kgz6n8f23w360knjdg6kkvrbarf7s91wfc8wcb"; depends=[htmltools shiny]; };
-  shinyjs = derive2 { name="shinyjs"; version="0.5.0"; sha256="1p3l58cggf0cpdp7brsqz5ailk8w50d0v8z3zy5rm7351mzj3l07"; depends=[digest htmltools miniUI shiny]; };
-  shinystan = derive2 { name="shinystan"; version="2.1.0"; sha256="1z97sjc4414rvxyghl30501bc60dshn8msj8k9wxaz5mby7yafbh"; depends=[DT dygraphs ggplot2 gridExtra gtools markdown reshape2 shiny shinyjs shinythemes threejs xtable xts]; };
-  shinythemes = derive2 { name="shinythemes"; version="1.0.1"; sha256="0wv579cxjlnd7wkfqzy2x3qk7d1abql1nhw10rx1c4c808vsylkw"; depends=[shiny]; };
+  shinydashboard = derive2 { name="shinydashboard"; version="0.5.3"; sha256="0anw22qxbis69zm0ls6alsc3ann27hvgs5mv1wvr4ppk7q8cg4l2"; depends=[htmltools shiny]; };
+  shinyjs = derive2 { name="shinyjs"; version="0.9"; sha256="1hh9djpcq80srxxy6ysy3pnwiyc5mx1xmhvs0jacbr3cszq1m6kk"; depends=[digest htmltools jsonlite miniUI 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]; };
   shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; };
   shopifyr = derive2 { name="shopifyr"; version="0.28"; sha256="1ypqgiqimdwj9fjy9ykk42rnkipb4cvdxy5m9z9jklvk5a7cgrml"; depends=[R6 RCurl RJSONIO]; };
-  shotGroups = derive2 { name="shotGroups"; version="0.7"; sha256="0zvwf87xm9dmi10i700nx8qgg314iy6dwd5kv0ziinprma7ivvjv"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
-  showtext = derive2 { name="showtext"; version="0.4-4"; sha256="14xvbvch354dwbhr36ih4av9b7f3z2zw2bsbnn5fxxh15lm26wz3"; depends=[showtextdb sysfonts]; };
+  shotGroups = derive2 { name="shotGroups"; version="0.7.3"; sha256="0h6c4fz2b4gpbfqykic6apflvp11bcafqm87gzl0zv8b03ydylxk"; depends=[boot coin CompQuadForm KernSmooth robustbase]; };
+  showtext = derive2 { name="showtext"; version="0.4-6"; sha256="17qx9zlmp440p4a9mkba89k1rdx11hdl5px33m1766hlsv1x7sf8"; depends=[showtextdb sysfonts]; };
   showtextdb = derive2 { name="showtextdb"; version="1.0"; sha256="14iv5nyc9wszy1yhbggk7zs042kv10lwk92pn9751hfws53yq6hf"; depends=[sysfonts]; };
   shp2graph = derive2 { name="shp2graph"; version="0-2"; sha256="09gbb7f9h3q2p56dwb2813mr36115ah70szq47jimpymzkd2x08m"; depends=[igraph maptools]; };
   shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; };
-  shuffle = derive2 { name="shuffle"; version="1.0"; sha256="037i45mfys1nr9sqmmsfb2yd3ba3aa22hc701f5j2zp8jx57qn3k"; depends=[]; };
+  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]; };
   sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; };
@@ -7176,71 +8991,89 @@ in with self; {
   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=[]; };
   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=[]; };
   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]; };
-  simPH = derive2 { name="simPH"; version="1.3.5"; sha256="1k2gs8lls287g3zy94h231sf9nljygmb82m4yjc05xglsi8ab0dr"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
-  simPop = derive2 { name="simPop"; version="0.3.0"; sha256="0rxlabgdjcbqldk06lzl81fi35qg6s9dw73h3bbwd7x89cbj5q8x"; depends=[colorspace data_table doParallel e1071 foreach laeken lattice MASS nnet party plyr Rcpp vcd VIM]; };
+  simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
+  simPH = derive2 { name="simPH"; version="1.3.9"; sha256="0hvg8m0d57x9s8ix7j7v0zdcxxww7bmd2mh8n059da3mph8hf288"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
+  simPop = derive2 { name="simPop"; version="0.6.0"; sha256="0ndcwg3yj0n7wyhgs3n02jr7m4sks9n8bjbcgkzrxkqfg6696b62"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp vcd VIM]; };
   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]; };
-  simcausal = derive2 { name="simcausal"; version="0.5.0"; sha256="0aqgz09l3ixhmz8k1cfy6185pybxl5ickvz0d3r7il7izsyrwnmv"; depends=[assertthat data_table igraph Matrix R6 stringr]; };
+  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=[]; };
   simecol = derive2 { name="simecol"; version="0.8-7"; sha256="0p6kmv65k3zy5q4v8casc2cp3c2ckblmycd1y1nnn7z7fnd57g8h"; depends=[deSolve minqa]; };
-  simest = derive2 { name="simest"; version="0.2"; sha256="15cgm8nk41fnva2camq26dwb1xy8qyk68v4918xszkj25lxb01m3"; depends=[nnls]; };
+  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.1.2"; sha256="0zxvczxvpi20d4q6vpyiwz4xh5akwlbris5m86nq2s6wzccnmsjb"; depends=[BH magrittr R6 Rcpp]; };
+  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]; };
   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]; };
+  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=[]; };
-  simplexreg = derive2 { name="simplexreg"; version="1.1"; sha256="0iyrkynhrkdix27r105wv0yn5yc8cgrf6hlv4byi9mz6y05f9i7p"; depends=[Formula plotrix]; };
+  simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; };
   simplr = derive2 { name="simplr"; version="0.1-1"; sha256="14gv2cwygjjfc9yjdrcn68scgyh469kypmf4mqy5p18gsxfj3h1c"; depends=[]; };
-  simr = derive2 { name="simr"; version="1.0.1"; sha256="1n7x5q6bwpw7k3bfmc736f37flg5xmiwmaz52w3ayabwljkirbrn"; depends=[binom iterators lme4 plotrix plyr RLRsim stringr]; };
+  simputation = derive2 { name="simputation"; version="0.2.1"; sha256="1a0kcwg4jl7xnp9b0hrj2m5mcrvqgxi0283fvw17b11bl7mkh43m"; depends=[gower MASS rpart]; };
+  simr = derive2 { name="simr"; version="1.0.2"; sha256="03rbq16x91y79xp1cw8z1b01pv6w0h344g4a9na5xipfm1x97kqf"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; };
   simrel = derive2 { name="simrel"; version="1.0-1"; sha256="0905rjqh8c08vyg090h0i7sx89vdryignslldzfz2r5yrszl4ga8"; depends=[FrF2 sfsmisc]; };
   simsalapar = derive2 { name="simsalapar"; version="1.0-9"; sha256="0h46acf797lp1hvs8x91nzll3zxiiczfl6vdxxrwizr109jzggcj"; depends=[colorspace gridBase sfsmisc]; };
-  simsem = derive2 { name="simsem"; version="0.5-12"; sha256="12zwc7h2rmj0nbrrwd1s70iicf0vs3ld7dn3aq6wda71vgplgc14"; depends=[lavaan]; };
-  sinaplot = derive2 { name="sinaplot"; version="0.1.3"; sha256="007f7zqyg48n8v2lwa6ff8cwbvi332cg40fmzlvr3jjms0gsrzbr"; depends=[ggplot2]; };
+  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]; };
+  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-1"; sha256="12gnlfbnis5972p4v5ad16srfsfrr0kji40y8jbygcd43f8ka70r"; depends=[raster zoo]; };
-  sirt = derive2 { name="sirt"; version="1.10-0"; sha256="0s3bkvxc7liclggwcbmr28smh6lbcp8zd2c4qad6f8sbi30bj4l2"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
-  sisVIVE = derive2 { name="sisVIVE"; version="1.2"; sha256="03lnk0p97nf4a8rw8ypy3xfzj4idwm00a0gfrkiwb7xq606sl0vb"; depends=[lars]; };
+  sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
+  sirt = derive2 { name="sirt"; version="1.14-0"; sha256="1dbv1wg16hd34hhsah0bf4rk3jqrr31rmsysjsbhall6mqlkprxz"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix MCMCpack mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
+  sisVIVE = derive2 { name="sisVIVE"; version="1.3"; sha256="17q6dl8wiwf01g6jm93w72jvp1madd0fww1yiazjcbkmz0j3kdbl"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
-  sitar = derive2 { name="sitar"; version="1.0.4"; sha256="1kppy6ryzf0mbdwnxwg1syjbnbymbpldcwxki6h213h7pd1gjbn9"; depends=[nlme quantreg]; };
+  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]; };
   sivipm = derive2 { name="sivipm"; version="1.1-3"; sha256="1l0j1bi38s09ax4kwikk615lyd074gzg1aa1j2jfmhr3igannm3z"; depends=[seqinr]; };
-  sjPlot = derive2 { name="sjPlot"; version="1.9.2"; sha256="15nsaxflpkh5njzn6j0hwsrg1ar0zjjwksvwlm4cf33c3a9zgk9v"; depends=[car dplyr effects ggplot2 lme4 magrittr MASS nlme psych scales sjmisc tidyr]; };
-  sjdbc = derive2 { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
-  sjmisc = derive2 { name="sjmisc"; version="1.6"; sha256="0h1w4il1bj9kw0lx1hjlz60d1m92d9bhrgwg3sz4arizh88j83mf"; depends=[coin dplyr haven lme4 MASS Matrix nlme stringdist tidyr]; };
-  skatMeta = derive2 { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[CompQuadForm coxme Matrix survival]; };
+  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]; };
+  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]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
-  skellam = derive2 { name="skellam"; version="0.1.3"; sha256="1w46ri4k8xg07phl7j4cb5b3qndplr027n047wzc15xcjliggg89"; 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=[]; };
+  skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; };
   skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
-  skmeans = derive2 { name="skmeans"; version="0.2-8"; sha256="0g5hyb1zwjp45j4wqbssdr0mw9fr19b6a35bmsf6xsgbf5asqx6w"; depends=[clue cluster slam]; };
+  skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
+  skmeans = derive2 { name="skmeans"; version="0.2-10"; sha256="014di97bcrx7lkvpixcy7idgfxaay4sjn7xvvj683a45pkk58h5c"; depends=[clue cluster slam]; };
   sla = derive2 { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; };
-  slackr = derive2 { name="slackr"; version="1.2"; sha256="1ymj3x52wyp0mp41xnnycg0vhdmv8whimwk1hzfsqr30pccnvn9j"; depends=[data_table ggplot2 httr jsonlite]; };
-  slam = derive2 { name="slam"; version="0.1-32"; sha256="000636dwj4kmj5w1w5s6bqixh78m7262y3fgizj7rfhcnc2gz7ad"; depends=[]; };
-  sld = derive2 { name="sld"; version="0.3"; sha256="18xj57v9gg78d894cr1h6wp10i05hrnmwhmq6yh6211kdyj9ljp1"; depends=[lmom]; };
+  slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
+  slam = derive2 { name="slam"; version="0.1-40"; sha256="1di5qs8sz4bh47653kmjcdbdxir03k3nin8mh817ga9af7aa3b5g"; depends=[]; };
+  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]; };
-  slp = derive2 { name="slp"; version="1.0-3"; sha256="09jyrp6y3rigy043d8s5i7nh89pgpvn3cv51mr729c9ccr6jdjb1"; depends=[mgcv]; };
+  slim = derive2 { name="slim"; version="0.1.0"; sha256="1d39hcsb6qxi36x7fkl67vy7r8n7ij275z7jnrb2n3pjnqkzjmzi"; depends=[data_table MASS]; };
+  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-4"; sha256="1rp0hib79x1rf2v5h1d2gp6ixq7r8v33qy5bz5sfphi94xwasm7l"; depends=[]; };
+  smaa = derive2 { name="smaa"; version="0.2-5"; sha256="1mwahjgslk82f8bl6qcjs1yadhbnqrxxhvkffkgc2fv3s6lh5d9m"; depends=[]; };
   smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
-  smacof = derive2 { name="smacof"; version="1.8-10"; sha256="1wb9rnj39lxa1mcrsgniyrysdzspgcspql3bfaiqsyyqybbp0z1b"; depends=[colorspace Hmisc MASS nnls polynom]; };
+  smacof = derive2 { name="smacof"; version="1.8-13"; sha256="0b9kf8z1ll0ak5b9ms2pkv7fl9qhc1nb5cxaarfjc2xi7zkyanyi"; depends=[colorspace Hmisc MASS nnls polynom weights]; };
   smacpod = derive2 { name="smacpod"; version="1.4.1"; sha256="17f28nax92nkfgs972gqcjnnz6sw4p8n36rrhx00dy19vr569kp5"; depends=[plotrix SpatialTools spatstat]; };
   smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; };
-  smam = derive2 { name="smam"; version="0.2-2"; sha256="1p6bzk4b9kpmfs4nxmcgc46hgdpldqg0pzpc0zhvs187z2nrfw75"; depends=[Matrix]; };
+  smam = derive2 { name="smam"; version="0.3-0"; sha256="1sdr0ki2y9smiwfglgh97kj6y0n1z3blyyxk823xp3467byk1rnb"; depends=[Matrix numDeriv Rcpp]; };
+  smapr = derive2 { name="smapr"; version="0.1.0"; sha256="01nhmr40vivshysq6fjixjaddr7nmimlyim26qf6knvphpl6hrdd"; depends=[httr rappdirs raster rgdal rhdf5 rvest xml2]; };
   smart = derive2 { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; };
   smatr = derive2 { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; };
-  smbinning = derive2 { name="smbinning"; version="0.2"; sha256="1zps1gdn5s7ynbkxmxp5s3xvzixdkcrfyvz5qrv77s4825lkj57x"; depends=[Formula gsubfn partykit sqldf]; };
+  smbinning = derive2 { name="smbinning"; version="0.3"; sha256="0993lnp7iks39z4mshh4gdrbvig6pnsc2jag58cbqfh40ignx748"; depends=[Formula gsubfn partykit sqldf]; };
   smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
   smcfcs = derive2 { name="smcfcs"; version="1.2.1"; sha256="1v143di0y8c0dcsjham1dmsyh1k0583nhw4qzlignxpg8nf6n4xc"; depends=[MASS survival VGAM]; };
   smco = derive2 { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh5xl4vw08hsa8kfcxhh2r0s99"; depends=[]; };
@@ -7253,320 +9086,403 @@ 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.0"; sha256="0jd574cjkylcrlnlnw859f4vwadi1v955m2lb5z3w3gdpv0lbx3p"; depends=[DBI igraph RSQLite spam SSN]; };
-  smoof = derive2 { name="smoof"; version="1.3"; sha256="0b8hs12xvqkr5kkzlbc8rq4zmm6ndmzxhm07zzapsnqckp55g8v7"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D RColorBrewer Rcpp RcppArmadillo]; };
+  smnet = derive2 { name="smnet"; version="2.1"; sha256="1jqcgm098kdsrgwrpjry0l6rg8ql7cigxk54svs3170x1fvxa3il"; 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.6.3"; sha256="0b7gdy0bjnaqn4djflxzkjx036jqn8izlc344yvsvybw5gysavl8"; depends=[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]; };
   smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
   smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
   smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
-  smoothtail = derive2 { name="smoothtail"; version="2.0.4"; sha256="0wbz9r9a7a3pjkdrsxhkjfm2qrbz4jrpsx4s1vm3kz7czkh55yg7"; depends=[logcondens]; };
+  smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; };
+  smotefamily = derive2 { name="smotefamily"; version="1.0"; sha256="0jh8fmhn8c9v3c4lb3nniiagy1d4shfix4fr7jpyw4q69mh0vn0h"; depends=[]; };
   sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; };
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
-  sn = derive2 { name="sn"; version="1.3-0"; sha256="00q58zssf32581m8ni5qazqy3wq36p4fya985ibn1607w76w8vwj"; depends=[mnormt numDeriv]; };
-  sna = derive2 { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
+  sn = derive2 { name="sn"; version="1.5-0"; sha256="0fh7xjsfd2x8d9lbnss7raldh24b72b3pvcv7zqa1qprzg7zfr01"; depends=[mnormt numDeriv]; };
+  sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
-  snht = derive2 { name="snht"; version="1.0.3"; sha256="1yc4c9liaali0p6k5m30l0lavbcc0wdf0wrmxwcvsh1rzc16p8iv"; depends=[ggplot2 gridExtra mgcv mvtnorm plyr reshape2 zoo]; };
+  snht = derive2 { name="snht"; version="1.0.4"; sha256="01gdqicvazfd27f992j4ngv60sqywwplilqxwrsw21wi7y7c6cfv"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; };
   snipEM = derive2 { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[GSE MASS mvtnorm Rcpp RcppArmadillo]; };
   snn = derive2 { name="snn"; version="1.1"; sha256="0yywn3v1iz9xizwli3gmzprkx66b5a813mbp8hq2vsj8n4lfj8r5"; depends=[]; };
-  snow = derive2 { name="snow"; version="0.4-1"; sha256="19r2yq8aqw99vwyx81p6ay4afsfqffal1wzvizk3dj882s2n4j8w"; depends=[]; };
+  snow = derive2 { name="snow"; version="0.4-2"; sha256="1mxbrkpnmq32x4wd0194d541661yvfrrjlr3lsf7qq53ms3h21zf"; depends=[]; };
   snowFT = derive2 { name="snowFT"; version="1.4-0"; sha256="0gw2kn80jh1a6sg6ni9kj6ikvyq29c9dmx52k9m6gzcfpa7l0qbk"; depends=[rlecuyer snow]; };
-  snowboot = derive2 { name="snowboot"; version="0.5.0"; sha256="1fwvgqx5d54libaf13w9szbh471zi0krc03knp0sz99j0i6nwy20"; depends=[igraph VGAM]; };
+  snowboot = derive2 { name="snowboot"; version="0.5.2"; sha256="07mly89x9mj5cvpmi45xmlr4d1l1d2fdcagmniviqqqhmllc50pi"; depends=[igraph Rcpp VGAM]; };
   snowfall = derive2 { name="snowfall"; version="1.84-6.1"; sha256="13941rlw1jsdjsndp1plzj1cq5aqravizkrqn6l25r9im7rnsi2w"; depends=[snow]; };
   snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
   snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; };
   snpRF = derive2 { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; };
   snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; };
   snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
-  snplist = derive2 { name="snplist"; version="0.15"; sha256="1xak7j6cbp8wapa99v38nzlhdc31ywfqjn4a7s9ibh2nb0plbjla"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
-  sns = derive2 { name="sns"; version="1.1.0"; sha256="1pppf1h39kv8jjngkcrq091ldzz3knjgcn81gfg7y54yndb2mapr"; depends=[coda mvtnorm numDeriv]; };
+  snplist = derive2 { name="snplist"; version="0.17"; sha256="0h419r4b62wdf63z12ai1n9zd3n36l9vgrbvlg1m72bbzrj5k8yz"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
+  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.2"; sha256="0y8piyjp09b2d9b3w7csikxrrf9aa8rdyi9awd73sxh9dj8l4452"; depends=[]; };
+  sodium = derive2 { name="sodium"; version="0.4"; sha256="09xfla0227dx3354nm0pgkwa6322ifnxydxwmlc25s1vb7mjkk1s"; 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-20150416"; sha256="1zrf0nmyy4pfs4dzardghzznw1ahl21w4nykfh2pp8il4dpi21fs"; depends=[arrayhelpers svUnit]; };
+  softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; };
+  softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; };
   soil_spec = derive2 { name="soil.spec"; version="2.1.4"; sha256="129iqr6fdvlchq56jmy34s6qc2j5fcfir6pa5as5prw0djyvbdv0"; depends=[GSIF hexView KernSmooth pls sp wavelets]; };
-  soilDB = derive2 { name="soilDB"; version="1.7"; sha256="1wyawqwab4y3xg6bz7180xflxrwzr27bgsjnni7lpsjsa65mqid1"; depends=[aqp Hmisc plyr reshape sp XML]; };
+  soilDB = derive2 { name="soilDB"; version="1.8-7"; sha256="0v0f9yngqjsagk5dw734aigwhld7fpadj6521bdk49j74ha0girr"; depends=[aqp Hmisc plyr raster reshape2 sp XML]; };
   soilphysics = derive2 { name="soilphysics"; version="3.0"; sha256="1b6wzdb63qq0h1aaw08i2qg7410997i2cszr012g5f4dnmrwamln"; depends=[boot MASS rpanel tkrplot]; };
   soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
-  soiltexture = derive2 { name="soiltexture"; version="1.3.3"; sha256="1a0j10f6mxwrslqd4fvc1nqvsh47ly1nyhc6l0qq1iz6ffqd37mx"; depends=[MASS sp]; };
+  soiltexture = derive2 { name="soiltexture"; version="1.4.1"; sha256="1rvrji3xrs6smxcgggl6phnbx595wl1s2d8djnvzfca20k9q6a1q"; depends=[MASS sp]; };
   soilwater = derive2 { name="soilwater"; version="1.0.2"; sha256="0rkyh7rcaapp1bxih88ivbaqnrig9jy32694jbg8z04b115hmdpm"; depends=[]; };
-  solaR = derive2 { name="solaR"; version="0.41"; sha256="003f8dka0jqlfshzc3d4z9frq5jb5nq6sw3sm44x7rj79w3ynpyg"; depends=[lattice latticeExtra RColorBrewer zoo]; };
+  solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; };
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
   solidearthtide = derive2 { name="solidearthtide"; version="1.0.2"; sha256="0274f7vyjymx6hd7ik68hznip57ni4cxp1bw7z91v1jzp3ch17rv"; depends=[]; };
   solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; };
-  solrium = derive2 { name="solrium"; version="0.3.0"; sha256="0y70qkj9wyrvfc8a9c1936ibbjcpic2wib2a2jc094cigf6wgz5r"; depends=[dplyr httr jsonlite plyr XML]; };
-  som = derive2 { name="som"; version="0.3-5"; sha256="01xsysmqj0zhzifqpwcrs0mflh56ndv4q3nm5n5imx7wmzx2lrzp"; depends=[]; };
+  solrium = derive2 { name="solrium"; version="0.4.0"; sha256="1jjvwwgyq335mhc4pff2l604x1k2260zwxl6k6k9lfzgcgqylbbw"; depends=[dplyr httr jsonlite plyr tibble xml2]; };
+  solvebio = derive2 { name="solvebio"; version="0.3.0"; sha256="1y3raw38888jii2c4x1mvdwscyss8qc9fpyl96y0hpmxj4yg1d4l"; depends=[httr jsonlite]; };
+  som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
+  som_nn = derive2 { name="som.nn"; version="1.0.3"; sha256="1viyw7gyfglnpqxamzqxsph876006bx0hbkjb8psi3v71wi014i2"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   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="1.3"; sha256="06rzsq1f3s4kpsyx7dl1459r4b5h1nqp085f8z3m0arkn7qpv7jk"; depends=[MASS Matrix matrixcalc plotrix RColorBrewer]; };
+  sommer = derive2 { name="sommer"; version="2.5"; sha256="02a2j43nppzpbh0zqkq79yqys79jsmwql7nsijxlz27b847wf3pz"; 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=[]; };
+  sonify = derive2 { name="sonify"; version="0.0-1"; sha256="1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15"; depends=[tuneR]; };
   soobench = derive2 { name="soobench"; version="1.0-73"; sha256="1y2r061pd4kr0kdgp8db3qy2aj07jdiyvy2py4fmwg6b8pcf9y0l"; depends=[]; };
-  soql = derive2 { name="soql"; version="0.1"; sha256="0i6vawsdbnbxsxh5la1yr895a21sgp02fr1nvc7mawfv54and7x0"; depends=[]; };
+  sophisthse = derive2 { name="sophisthse"; version="0.7.0"; sha256="08vr5y5cvn2q7410krg7620cqv7jmprh96bv43yhh3mk6ixd21dl"; depends=[dplyr RCurl stringr XML zoo]; };
+  soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; };
   sortinghat = derive2 { name="sortinghat"; version="0.1"; sha256="1wrxwhdp3gj1ra0rgldnmc0w019bnjb6z9j20c5p1ab09x4dmlny"; depends=[bdsmatrix MASS mvtnorm]; };
   sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; };
-  sos = derive2 { name="sos"; version="1.3-8"; sha256="0vcgq8hpgdnlmkxc7qh1jqigr0gvm9x3w4ijbhma7x4i5fx3c2il"; depends=[brew]; };
+  sos = derive2 { name="sos"; version="1.4-1"; sha256="13swys0bzcxsbr4vg0svs6ans7jdyphcyjix70brmmk6l309y8c0"; depends=[brew]; };
   sos4R = derive2 { name="sos4R"; version="0.2-11"; sha256="0r4lficx8wr0bsd510z4cp6la32xf928rsiznbywpxghnypsrcgg"; depends=[RCurl sp XML]; };
   sotkanet = derive2 { name="sotkanet"; version="0.9.21"; sha256="0x3dg38i2naf270qjc7dzmvf32ziihsa6m8yv1wh0l7sbk78h7cv"; depends=[RCurl rjson]; };
-  soundecology = derive2 { name="soundecology"; version="1.3.1"; sha256="07ncas8rn55pfqgj66qdwp28wh1v9yb8rkr36anc55a6svqx6g89"; depends=[ineq oce pracma seewave tuneR vegan]; };
+  sound = derive2 { name="sound"; version="1.4.4"; sha256="1mxwcr978k11p0dznv1gbvb894nixkl4gvhgj015gcl1s63ar5n4"; depends=[]; };
+  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]; };
-  sourcetools = derive2 { name="sourcetools"; version="0.1.2"; sha256="03jzag3xd68vp0d3mh5wc6ihx6710wrprf5952h1lannj6zj4cks"; depends=[]; };
-  sp = derive2 { name="sp"; version="1.2-2"; sha256="0104xibkj78522rg0h2wkckfgzswxngqkpzi6vfpjm60c8n6m872"; depends=[lattice]; };
+  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=[]; };
+  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.3"; sha256="1vglfqqk4pg8kc6jnnw7br2lvwmz7szcpfqms95ij3bmawhazhrw"; depends=[coda Rcpp RcppArmadillo survival]; };
-  spMC = derive2 { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4qw5f3kx2qizwi10jlybwggqv0m"; depends=[]; };
+  spBayesSurv = derive2 { name="spBayesSurv"; version="1.0.6"; sha256="1k9d8saab2isj60z5kffb7i8f1ymp7327m15gpinw0wv1m9wn11p"; 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.3"; sha256="0pbmwm5k59vk0fg0qyirdn94v3x4k984bvifamaplr68s0x13i4b"; depends=[fields]; };
+  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.7.2"; sha256="07rwsk1yviphiw7jipx045y6806vzadx9ddzrm6mhhx879dn1j2q"; depends=[geometry lpSolveAPI MASS Matrix mvtnorm nlme proxy Rcpp RcppEigen]; };
-  spaa = derive2 { name="spaa"; version="0.2.1"; sha256="0qlfbfvv97avbnixm5dz9il3dmd40wnpvv33jh7fa0mh740bircy"; depends=[]; };
+  spaMM = derive2 { name="spaMM"; version="1.10.0"; sha256="1lr2y1pcbwpggq5fkfnbz76q0iixy9vj23akj2s9a7d6hxs01ya3"; depends=[geometry lpSolveAPI MASS Matrix mvtnorm 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]; };
   spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
-  spacetime = derive2 { name="spacetime"; version="1.1-5"; sha256="0r6ycr0apm12dahw9x00jrxjdwp3888wnbdi02dr3s3imxlfxkrz"; depends=[intervals lattice sp xts zoo]; };
+  spacetime = derive2 { name="spacetime"; version="1.2-0"; sha256="1qd9bvnqknw8kaqz7xr5gkkhi3h1f2dvd70zax44g912nha13f7h"; depends=[intervals lattice sp xts zoo]; };
   spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; };
   spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
-  spam = derive2 { name="spam"; version="1.3-0"; sha256="1zw3c26dj3pj61mnb2xdfzvvlsiandfqax1zacg0cc4pd1d1g342"; depends=[]; };
+  spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; };
+  spam = derive2 { name="spam"; version="1.4-0"; sha256="0c278q2rmrxwhax58n8987j3rlg7c8bnxnn8r96y9kv4hjj1pjsk"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanr = derive2 { name="spanr"; version="1.0"; sha256="1x29hky347kvmk9q75884vf6msgcmfi3w4lyarq99aasi442n1ps"; depends=[plyr stringr survival]; };
   sparc = derive2 { name="sparc"; version="0.9.0"; sha256="0jsirrkmvrfxav9sphk8a4n52fg0d1vnk3i8m804i4xl0s7lrg8s"; depends=[]; };
   sparcl = derive2 { name="sparcl"; version="1.0.3"; sha256="1348pi8akx1k6b7cf4bhpm4jqr5v8l5k086c7s6rbi5p6qlpsrvz"; depends=[]; };
   spareserver = derive2 { name="spareserver"; version="1.0.1"; sha256="094q5i6v4v37hzfdyps8zni394z312r802hl04jw0xzzps922rq4"; depends=[assertthat httr pingr]; };
   spark = derive2 { name="spark"; version="1.0.1"; sha256="03viih0r7bpv6zkm5ckk0c99lf2iv0fkgrzkbs1gg7ki9qyxji8c"; depends=[magrittr]; };
-  sparkTable = derive2 { name="sparkTable"; version="1.2.0"; sha256="0hmdri8738gqn1dd9flqh1icd0r5mwnx4wnww0nwyr4anzxz2say"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; };
+  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]; };
   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]; };
-  sparseLDA = derive2 { name="sparseLDA"; version="0.1-7"; sha256="1rjjkvs9s25v85rdaxln8gnb88jhdj8s8lw8qxrjsgcgms7nvlqx"; depends=[elasticnet MASS mda]; };
+  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]; };
+  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=[]; };
-  sparsediscrim = derive2 { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[bdsmatrix corpcor mvtnorm]; };
+  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]; };
+  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=[]; };
   sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
+  sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; };
+  sparsesvd = derive2 { name="sparsesvd"; version="0.1-1"; sha256="09qpky8vxkpycj6c4vn3nqlidhblgksh3n6w8sww4yhn0pm3rzn5"; depends=[Matrix]; };
+  sparsevar = derive2 { name="sparsevar"; version="0.0.10"; sha256="069r0kbypmx7pw3z2v9l17qidw3d73rzf5zs6yn1adyvpsddjxi8"; depends=[doParallel flare ggplot2 glmnet Matrix mvtnorm ncvreg picasso reshape2]; };
   spartan = derive2 { name="spartan"; version="2.3"; sha256="09j5f9f068m83279ncfxpyg8bnk25qjz20a9xlap8dpm50iidr24"; depends=[]; };
+  spass = derive2 { name="spass"; version="1.0"; sha256="1pgv4yzbdv475gp53qz40ys731v9960cyxbp84gff6y5f2y4axah"; depends=[geepack MASS multcomp mvtnorm Rcpp]; };
   spatcounts = derive2 { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
-  spate = derive2 { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; };
+  spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; };
   spatgraphs = derive2 { name="spatgraphs"; version="3.0"; sha256="04p2hlwb9rwck2v2j4hlf87wlqx1vz1czmljpk3xw3f0b1pf26sc"; depends=[Matrix Rcpp rgl]; };
   spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; };
   spatial_gev_bma = derive2 { name="spatial.gev.bma"; version="1.0"; sha256="1rjn0gsbgiv69brhnm0zj25ya3nyfh4yf6jizng85mvss3viv3hj"; depends=[coda msm SpatialExtremes]; };
   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-4"; sha256="086qf081gkwm507qqqiklwbj2jk8kqgnijhd7wi8mdvz3ilam0j3"; depends=[cluster RANN raster RCurl rgeos rms SDMTools sp spatstat spdep yaImpute]; };
+  spatialEco = derive2 { name="spatialEco"; version="0.1-5"; sha256="04d6dqmayfs19922s1pg1rsi5b4hdj50665qkp02p0wbbnnkhvs4"; depends=[cluster RANN raster RCurl 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.40"; sha256="0kpna2198nrj93bjsdgvj85wnjfj18psdq919fjnnhbzgzdkxs7l"; depends=[spatstat]; };
-  spatstat = derive2 { name="spatstat"; version="1.45-0"; sha256="0ilvj3kskrxy93wrl3a883r3x25mqzsy834hzqrq9cqmgnaryw1r"; depends=[abind deldir goftest Matrix mgcv nlme polyclip tensor]; };
-  spatsurv = derive2 { name="spatsurv"; version="0.9-11"; sha256="0wmjzccrx2k88i7kbxlxv8ig602b1k9pqb2hn3wxq1l4d8m4izw9"; depends=[fields geostatsp iterators Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
+  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]; };
+  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.0"; sha256="1p011x3g1awb2sajg19fhkyrf5d8w4h9qwckxxl1i23jk3kpkyjh"; depends=[]; };
+  spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; };
   spcosa = derive2 { name="spcosa"; version="0.3-6"; sha256="0zj5yr0by1pbixs4z6w3c6yr1k55k5gqmvjkwiq2gsgq00vs7q94"; depends=[ggplot2 rJava sp]; };
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
-  spcr = derive2 { name="spcr"; version="1.2.1"; sha256="0cm59cfw3c24i1br08fdzsz426ldljxb41pdrmbmma4a69jkv1sb"; 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.5-92"; sha256="1b5l6sfscnamfh957n3srgwc50f98az3071dcpqrhk4g4n2ws6yg"; depends=[boot coda deldir LearnBayes MASS Matrix nlme sp]; };
-  spduration = derive2 { name="spduration"; version="0.15.0"; sha256="1kziinnmn119s43brjpraw5vbsjv41gf031iaq9nhln1qbd2kv5j"; depends=[corpcor MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
+  spdep = derive2 { name="spdep"; version="0.6-10"; sha256="0d94irvrpwlxsc7rw56lj8h72wigpxrsk3gsy6n37zr5l1yc2k5k"; 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]; };
   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.1"; sha256="0glvw1jdyc8w8b8m7l74d0rl74xfs4zmanmx4i41l7ynswhmqm01"; depends=[MassSpecWavelet]; };
+  speaq = derive2 { name="speaq"; version="1.2.2"; sha256="03f6w575n8c8whi2hcxwspfs65112ykbwyn5nhx3r7x3dyqpk9v1"; depends=[MassSpecWavelet]; };
+  speaq2 = derive2 { name="speaq2"; version="0.1.0"; sha256="0rrqh90vqi7l1nbwivzvygd292nnkgk26nyh2kw71pl3gfakmnml"; depends=[cluster data_table doSNOW foreach MassSpecWavelet mQTL]; };
   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]; };
   specmine = derive2 { name="specmine"; version="1.0"; sha256="1dd8ymyq3894br2fv54r1z93aifh2iiz94a3r4xj1qq07005hr29"; depends=[baseline caret ChemoSpec compare ellipse genefilter GGally ggdendro ggplot2 hyperSpec impute MAIT MASS Metrics pcaPP pls qdap RColorBrewer rgl scatterplot3d xcms]; };
+  spectral = derive2 { name="spectral"; version="1.0.1"; sha256="0mawgxz1gbzgb3lxm6gfbv3wan0ykziprqym8ajvdjsdq4fwkk2m"; depends=[rasterImage Rcpp]; };
   spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; };
   spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; };
-  speedglm = derive2 { name="speedglm"; version="0.3-1"; sha256="0zkzy17fjxcchh48dapjf856vn3la7sx1ki4v1w8cwapz634wz2j"; depends=[MASS Matrix]; };
+  speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; };
+  spef = derive2 { name="spef"; version="1.0-1"; sha256="0nf6kw5w6ifv2xp515cmd7p8l2dd224vzhh3fzcvykibqk49fdsp"; depends=[ggplot2 nleqslv plyr survival]; };
   speff2trial = derive2 { name="speff2trial"; version="1.0.4"; sha256="0dj5mh2sdp6j4ijgv14hjr39rasab8g83lx1d9y50av11yhbf2pw"; depends=[leaps survival]; };
+  spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; };
   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]; };
-  spfrontier = derive2 { name="spfrontier"; version="0.1.12"; sha256="1jy1604gppis7vbn55pv13bywy1aqwzshwj03bbfln0qxikzqzi0"; depends=[ezsim maxLik moments mvtnorm spdep tmvtnorm]; };
+  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-28"; sha256="1gwyfwsz9n7bz0n6sp6qd8qcl23r2i2kb38csxsh3pkrinnxy181"; depends=[sp]; };
+  spgwr = derive2 { name="spgwr"; version="0.6-29"; sha256="05rw1ck2gf5c0aqpagcfijxghslppa6xdz7pnwanfclwq8ri1xqa"; 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]; };
   spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; };
-  splancs = derive2 { name="splancs"; version="2.01-38"; sha256="12x68i5yjq9526rsf2awp97yg19izkhcc8iha0ys65bmhzjc5hwf"; depends=[sp]; };
+  splancs = derive2 { name="splancs"; version="2.01-39"; sha256="1lyzs7lbhw1pqmb4mr46ncm39wwrmin7qgshsr384j4023qwfqwd"; 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]; };
   splitstackshape = derive2 { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
-  splm = derive2 { name="splm"; version="1.3-7"; sha256="1bfi80vg129v8d0vp7sigbhskl227lmbry1vmklvcczrjqf2bh45"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
+  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-0"; sha256="0kmyr1azyh0m518kzwvvgz7hv1x5myj37xn7w2gfn0vbn5xl8pv1"; depends=[]; };
-  splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-135"; sha256="0hghggdcr70vfjx4npj37nmd96qvgrp1gpwa9bznvjkvyfawwy6i"; depends=[]; };
-  splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-73"; sha256="1csk0ffgg1bi2k1m2bbxl6aqqqxf6i8sc8d4azip8ck7rn8vya46"; depends=[splusTimeDate]; };
-  spm12r = derive2 { name="spm12r"; version="1.1.1"; sha256="1zvf05jfqnimxqj39cmg35hjhnqc5hvkirai11silyiy5aya8ka4"; depends=[fslr git2r matlabr oro_nifti R_utils stringr]; };
+  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]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
-  spocc = derive2 { name="spocc"; version="0.4.5"; sha256="1lzs3x3dvjava2bylc0q0isavkh2sk1a85nswmj8rapfa261fzza"; depends=[data_table httr jsonlite lubridate rbison rebird rgbif ridigbio rvertnet V8 whisker]; };
-  spoccutils = derive2 { name="spoccutils"; version="0.1.0"; sha256="1al7hydwwzqd8ky91ggklf7lk42g79cx24i47gapd84jnwmmkq56"; depends=[ggmap ggplot2 gistr httr leafletR RColorBrewer rworldmap sp spocc]; };
+  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=[]; };
   spray = derive2 { name="spray"; version="1.0"; sha256="12iv1sksxmac2ykrb8psfnaa9lzq6djv0a7a1x73jr3nflvrx9bh"; depends=[magic partitions Rcpp]; };
-  sprex = derive2 { name="sprex"; version="1.1"; sha256="1lwkdi8g1dlfdnxxvspgpz6f5h2gml176xhfrcxa9gcy3y9rlcpm"; depends=[]; };
+  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]; };
   sprinter = derive2 { name="sprinter"; version="1.1.0"; sha256="12v4l4fxijh2d46yzs0w4235a8raip5rfbxskl0dw7701ryh7n8g"; depends=[CoxBoost GAMBoost LogicReg randomForestSRC survival]; };
-  sprintfr = derive2 { name="sprintfr"; version="0.1.0"; sha256="1jkrgvnybd2799alfrrd91bb7rdm8w0snx45brgrzlmwfvdrbfc7"; depends=[dplyr lazyeval magrittr stringi tidyr]; };
   sprm = derive2 { name="sprm"; version="1.2.2"; sha256="0iyijkjnyz4yx2cmazlnhkk0f5ls0c2q2aikwlzl13w6zbj040a8"; depends=[cvTools ggplot2 pcaPP reshape2 robustbase]; };
   sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; };
   spsann = derive2 { name="spsann"; version="2.0-0"; sha256="1if86d9qm9b2798284axlkp35zxgzmzvp2816i5fqxn50j8fcqy3"; depends=[pedometrics Rcpp sp SpatialTools]; };
+  spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; };
   spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; };
   spsmooth = derive2 { name="spsmooth"; version="1.1-3"; sha256="09b740586zyi8npq0bmy8qifs9rq0rzhs9c300fr6pjpc7134xn4"; depends=[mgcv]; };
-  spsurvey = derive2 { name="spsurvey"; version="3.1"; sha256="1dgrrar6k87xgcxhj3xi0zap5shr26d4hv6k3pfjihbwvygf82z8"; depends=[deldir foreign MASS rgeos sp]; };
+  spsurvey = derive2 { name="spsurvey"; version="3.3"; sha256="1xpjimqkrwm77amqza4713psmg86bvz08gxdi35advq4w614f2w1"; depends=[deldir foreign Hmisc MASS rgeos sp]; };
   spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
-  sptm = derive2 { name="sptm"; version="14.10-11"; sha256="1g7dqfsyy0cvv3idx16bpny9z4f638aprbc50x8kk4zfk3km7wnr"; depends=[kyotil survey survival]; };
+  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]; };
   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]; };
   sqlutils = derive2 { name="sqlutils"; version="1.2"; sha256="0dq4idg8i4hv9xg8jllllizqf3s75pdfm1wgncdjj52xhxh169pf"; depends=[DBI roxygen2 stringr]; };
   squash = derive2 { name="squash"; version="1.0.7"; sha256="1wdnzagibh9fz7a3x6m4ixckh7493shvwxg7cn5kpnfzf8m1imyj"; depends=[]; };
+  squid = derive2 { name="squid"; version="0.1.1"; sha256="0qv9lazgiqazhq096ybmllalm2l2h794ry4p1r93c10msxg37sdp"; depends=[arm data_table ggplot2 lme4 MASS shiny]; };
   sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; };
   srd = derive2 { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5lln439d07m9g4c020kqqsr3"; depends=[animation colorspace plyr stringr survival]; };
-  srvyr = derive2 { name="srvyr"; version="0.1.0"; sha256="0ppa8h4k49gmn0gmlmh7zn1lqpirh9p4zrj19vhw9x3fgca1klsc"; depends=[dplyr lazyeval magrittr survey]; };
-  ss3sim = derive2 { name="ss3sim"; version="0.9.0"; sha256="1fnjrxjcb76g9xwa05lwhwkwxaxp03zfgzq9dy7jbibcclblh7a1"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
-  ssa = derive2 { name="ssa"; version="1.1.0"; sha256="0jmnm7vhdz0v2shhcibfajpdzh23jpq4snjkdz7kgfh8g4yr0r2f"; depends=[]; };
+  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]; };
+  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]; };
   sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; };
   ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
   ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; };
   ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; };
   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.4"; sha256="0v7ca1xsnpx7zbgwx8196y13wdnlbxdrc4nv2r7m797anj9sjj6a"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
+  ssizeRNA = derive2 { name="ssizeRNA"; version="1.2.9"; sha256="1916r0hmhpfa0p1s8myqk8g4i8fgjqkm4wvpb4nf3sl69kfdva95"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; };
+  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-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
+  sss = derive2 { name="sss"; version="0.0-14"; sha256="19xq1pj4lrlh68fi2vy8cjg9xhmykwibm9rcg9snfc1qc6kp062x"; depends=[XML]; };
   ssvd = derive2 { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
-  ssym = derive2 { name="ssym"; version="1.5.5"; sha256="1j2dm2q3bcg8r9nxhmdrsi3azwhyv3q8nsj1bvz8507hzg3qvnxf"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; };
+  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]; };
+  stR = derive2 { name="stR"; version="0.3"; sha256="0zad25s9wp4lapkww3rdbqsd4y7p8xhz9is7avq400srxakinx7n"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
-  stabledist = derive2 { name="stabledist"; version="0.7-0"; sha256="06xd3kkyand0gzyj5phxlfjyygn5jlsq7gbwh62pc390by7ld2c7"; depends=[]; };
-  stabs = derive2 { name="stabs"; version="0.5-1"; sha256="0mlwbf8wf38mr39si31i4iz00hpsmchbhgagwgsf3x9422zpq92p"; depends=[]; };
+  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]; };
+  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.3"; sha256="1lbbnvmilf3j3hyhvpkyjd4b4sf3zwygilb8x0kjn2jfhkxnx4c1"; depends=[RODBC xtable]; };
+  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]; };
   stargazer = derive2 { name="stargazer"; version="5.2"; sha256="0nikfkzjr44piv8hng5ak4f8d7q78f2znw2df0gy223kis8q2hsd"; depends=[]; };
   starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; };
-  startupmsg = derive2 { name="startupmsg"; version="0.9"; sha256="1l75w4v1cf4kkb05akhgzk5n77zsj6h20ds8y0aa6kd2208zxd9f"; depends=[]; };
-  stashR = derive2 { name="stashR"; version="0.3-5"; sha256="1lnpi1vb043aj4b9vmmy56anj4344709986b27hqaqk5ajzq9c3w"; depends=[digest filehash]; };
-  statar = derive2 { name="statar"; version="0.6.0"; sha256="08pkjhn8g6f6jjx8gilmb9k2jdrkd8n17dgk2q7x5yjiviib1h00"; depends=[data_table dplyr ggplot2 lazyeval matrixStats stargazer stringr tidyr]; };
-  statcheck = derive2 { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; };
+  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]; };
+  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]; };
-  statfi = derive2 { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
   stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
-  statmod = derive2 { name="statmod"; version="1.4.24"; sha256="0vvjj5qgykk8abkj25g92kvm9sx5s10ysm5dh4ywlmz2lzfi3ilf"; depends=[]; };
-  statnet = derive2 { name="statnet"; version="2015.11.0"; sha256="0blrf7ag309d5h00w0zvcwbzif6s3nz5flazqrgkkykscn99kjxl"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
+  statip = derive2 { name="statip"; version="0.1.4"; sha256="1vy3433rrifcix1m28lizbik3qrl2krdldbvmqfyp046xxf2inc1"; depends=[bazar dplyr]; };
+  statisticalModeling = derive2 { name="statisticalModeling"; version="0.3.0"; sha256="018ap1hbv4m6y0c71f807apbb9bhr64kcfrn4w8ahhb2520l4mf8"; depends=[ggplot2 lazyeval magrittr mosaic rpart]; };
+  statmod = derive2 { name="statmod"; version="1.4.27"; sha256="14yilq9d3z20hig4rs8bjqyydw3dfx90mhmzvw9w8p16h0s595sn"; depends=[]; };
+  statnet = derive2 { name="statnet"; version="2016.9"; sha256="1j5z7awvac3sb66ma1lrc9j23m6hmzqfnqxc0znsm36h324y3y6s"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
   statnet_common = derive2 { name="statnet.common"; version="3.3.0"; sha256="190gwkbzd1qh3d7v1xi13snp83jkpvsl7x4ac9x1pxybn3kw856p"; depends=[]; };
   statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
-  stdReg = derive2 { name="stdReg"; version="1.0"; sha256="1rixqpbbqcqfjm8nn3plypzhz38fcw9ryyvr0aq10vbymbxjx0jv"; depends=[data_table survival]; };
+  statprograms = derive2 { name="statprograms"; version="0.1.0"; sha256="1jm8vnzccx34rhypkc5brx52k0f0g4z9cckzib43i5fcqd4skib6"; depends=[]; };
+  statquotes = derive2 { name="statquotes"; version="0.2"; sha256="05qsffbgpgzrhk2nbyfa4a63ad06aj09bzcc11h9dl3sdz6jj7gr"; depends=[stringr tidytext wordcloud]; };
+  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=[]; };
+  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=[]; };
   stellaR = derive2 { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
+  stepPenal = derive2 { name="stepPenal"; version="0.1"; sha256="09viapb4846g91jzf9364rdyd865b19v83pwcdm3p3xsjry9ffxk"; depends=[caret dfoptim glmnet mvtnorm pROC]; };
   stepPlr = derive2 { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
-  stepR = derive2 { name="stepR"; version="1.0-3"; sha256="0c35bb6ba507cgjhzz7dnzidsjxd9r01r355b85j2fcsvcj4agwg"; depends=[]; };
+  stepR = derive2 { name="stepR"; version="1.0-6"; sha256="1ywczjidcw1f7318rn3y73b12c1ck0947m6npn6k41y3i47dgh4i"; depends=[]; };
   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=[]; };
   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]; };
   stmBrowser = derive2 { name="stmBrowser"; version="1.0"; sha256="0jfh0c835a2sxn2cqlmwdlzj2g2dmkfl2z3pkv4fc1ajggw2n7g2"; depends=[httr jsonlite rjson stm]; };
-  stmCorrViz = derive2 { name="stmCorrViz"; version="1.2"; sha256="0mhwl64hv4hjq72mqnvc5ii94aibmc0fw5rmdrvsad4bj6gg67p3"; depends=[jsonlite stm]; };
+  stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; };
+  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]; };
-  stochvol = derive2 { name="stochvol"; version="1.2.3"; sha256="122jw21qx44rpmrr5dbi4f98951b25ifj6277pfr4s4l4rsdkypz"; depends=[coda Rcpp RcppArmadillo]; };
+  stochvol = derive2 { name="stochvol"; version="1.3.2"; sha256="08vn2ifbb7yc3b7c5pgklp9wr98vx1gv60gpsqba32xr6ijn49vd"; depends=[coda Rcpp RcppArmadillo]; };
   stockPortfolio = derive2 { name="stockPortfolio"; version="1.2"; sha256="0k5ss6lf9yhcvc4hwqmcfpdn6qkbq5kaw0arldkl46391kac3bd1"; depends=[]; };
   stocks = derive2 { name="stocks"; version="1.1.1"; sha256="1qwd16bw40w2ns7b0n9wm8l344r4vyk27rmg0vr5512zsrcjkcfb"; depends=[rbenchmark Rcpp]; };
   stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; };
-  storr = derive2 { name="storr"; version="1.0.0"; sha256="0q10g2x0g3jrvdv49bbjw5qaf9gmsrl5x7fws2liflqf3k2f5kfj"; depends=[digest R6]; };
+  stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.0"; sha256="1pxkb0ijx04c4bk6szxhj8lxq6x76m8pyhxpf8xq63h4gh57fxh3"; depends=[dplyr ggplot2 lubridate maps plyr stringr tidyr weathermetrics]; };
+  storr = derive2 { name="storr"; version="1.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.1"; sha256="0fcyirhx4lxlwizrl9spblnqp8nv11xzjk90kbq3k0i7gpvrrbh8"; depends=[dplyr geosphere httr igraph jsonlite leaflet lubridate magrittr maptools openxlsx R_utils raster Rcpp RcppArmadillo RCurl readr rgdal rgeos RgoogleMaps sp stringi stringr]; };
-  stpm = derive2 { name="stpm"; version="1.1.2"; sha256="0n875h6x31wcslqnqwwwl4gf18v4wgm18alw7fsdgwjjz5wdj3yx"; depends=[mice nloptr Rcpp RcppArmadillo sas7bdat survival]; };
+  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]; };
   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]; };
-  strataG = derive2 { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19fbx6w8am3islv02iyyixi94xbwphpcqf3"; depends=[ape MASS pegas Rcpp reshape2]; };
+  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]; };
+  strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; };
   stratification = derive2 { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; 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-2"; sha256="1gkbgggdvmm2vimy2kffib3ca0z36fyy1x91anfg692xznb2qrrs"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
+  stream = derive2 { name="stream"; version="1.2-3"; sha256="0ngsbnm8zy2nzvsdbbqg1lyd9l0k537ql7y8ck85hmwxj7nxna4b"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamMOA = derive2 { name="streamMOA"; version="1.1-2"; sha256="0mg113v8zy6kh67hm91xfd9kd1x8vvvx03svhz70nz9npw00pvlz"; depends=[rJava stream]; };
   streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
-  stremo = derive2 { name="stremo"; version="0.2"; sha256="13b9xnd8ykxrm8gnakh0ixbsb7yppqv3isga8dsz473wzy82y6h1"; depends=[lavaan MASS numDeriv]; };
+  stremr = derive2 { name="stremr"; version="0.4"; sha256="0n8ickmzjqlxwrz8dsphh1nsbnsgp4mnwm52i5ji099ps5292f65"; depends=[assertthat data_table pander R6 Rcpp rmarkdown speedglm stringr zoo]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
-  stringdist = derive2 { name="stringdist"; version="0.9.4.1"; sha256="0a2j1h5kf0p14d117rq8fv6qbk8nwsianmkb73d0f6cb1ikadnmg"; depends=[]; };
+  stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; };
+  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.0-1"; sha256="1ld38536sswyywp6pyys3v8vkngbk5cksrhdxp8jyr6bz7qf8j77"; depends=[]; };
-  stringr = derive2 { name="stringr"; version="1.0.0"; sha256="0jnz6r9yqyf7dschr2fnn1slg4wn6b4ik5q00j4zrh43bfw7s9pq"; depends=[magrittr stringi]; };
-  stripless = derive2 { name="stripless"; version="1.0-1"; sha256="0r5vi6hybw3z7lrsmnjnrjl1gj9b7zf2iqfk2nqwxw4cky17i4cd"; depends=[lattice]; };
-  strptimer = derive2 { name="strptimer"; version="0.1.0"; sha256="0fyrapai58rarf6xy9vlg3lmkzgdcpfchrkdlqj69jkiz7ngh4qv"; depends=[dplyr lazyeval magrittr stringi tidyr]; };
+  stringi = derive2 { name="stringi"; version="1.1.2"; sha256="13i1p6j8mx31hsw2s4c2phm2llrrdakzixkm6i0axsxprri722z5"; 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]; };
   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.6.0"; sha256="0hy673c1dgxvkplph9g4iihn78diw98lchfhp5inzr2a8w5syyq3"; depends=[data_table ggplot2 gridExtra gtable gWidgets gWidgetsRGtk2 plyr RGtk2 scales]; };
-  stsm = derive2 { name="stsm"; version="1.7"; sha256="080xakf7rf53vzv64g338hz87sk4cqfwd6ly4f122sxvn4xypq3n"; depends=[KFKSDS]; };
+  strvalidator = derive2 { name="strvalidator"; version="1.8.0"; sha256="0c87256m6zx0m7qkkcdzfrb2x7gbl364499pj5xnfm274ib9l39x"; 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="0.1.0"; sha256="1k6s3sn3swm6pxbv81kw8p2m60q9m1nw64jgimf08qwsrsbfx11h"; depends=[]; };
-  stylo = derive2 { name="stylo"; version="0.6.3"; sha256="18fp9m4sn63icyh5bn2f7xjjjk5c0a55i1b76vc1ydxkxipy9nvc"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
+  stubthat = derive2 { name="stubthat"; version="1.1.0"; sha256="0x4sy808pq7nqnprqrcpss0v3r8sa1z8bbs759jmybqs1b0ihnqf"; depends=[testthat]; };
+  stylo = derive2 { name="stylo"; version="0.6.4"; sha256="1z4db5p83b3fb3cfy4y8a4pi5hybda283988ri7215fk7rifg1jk"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
   suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
+  subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; };
+  subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; };
   subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
-  subplex = derive2 { name="subplex"; version="1.1-6"; sha256="0camqd0n468h93jxvvcnclki66glr39rb87nvrkrbiklbqd0s1fp"; depends=[]; };
-  subrank = derive2 { name="subrank"; version="0.9.6"; sha256="0a467lihs9njf7sx032cip1r1g7x2rlwk7220c499kl0h3zg9p0j"; depends=[]; };
-  subscore = derive2 { name="subscore"; version="1.2"; sha256="0q96n7bplzb8hhaq48bnkq7wvgryf815qc5iql5780jsixwhgn04"; depends=[CTT]; };
-  subselect = derive2 { name="subselect"; version="0.12-5"; sha256="00wlkj6p0p2x057zwwk1xdvji25yakgagf98ggixmvfrk1m1saa4"; 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]; };
+  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=[]; };
+  subscore = derive2 { name="subscore"; version="2.0"; sha256="1vscmzw6ama2kc7ic6b2rfbbczcpyhp0m4dd5khg9vkyihww5b5h"; depends=[CTT irtoys]; };
+  subselect = derive2 { name="subselect"; version="0.12-6"; sha256="157vkfxy570sl1q9nylpw0vs51h39zjx0m2yxiwdgvzvd6h4s3kr"; depends=[corpcor ISwR MASS]; };
   subsemble = derive2 { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
   subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; };
+  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-6"; sha256="1x3h6si0g4k5xc327daa85k74qh3dqbql7b4ynmasrb5xpcnb92b"; depends=[]; };
-  summarytools = derive2 { name="summarytools"; version="0.4"; sha256="1hf20fddi128jv083ljylwqg1ij39hyf6kdnzfxalczl9572wih9"; depends=[htmltools pander pryr rapportools rstudioapi xtable]; };
+  sudokuAlt = derive2 { name="sudokuAlt"; version="0.1-9"; sha256="1m4ggvg1nyx3l96zfg826sarfmwxcbjwpipqk5q2qsnhd12wymbd"; depends=[]; };
+  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]; };
   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=[]; };
   superbiclust = derive2 { name="superbiclust"; version="1.1"; sha256="1gzjbzbl8y1nzdfhyd6dlrwjq8mwj43a26qav84s1bdzwx6dra48"; depends=[biclust fabia Matrix]; };
   superdiag = derive2 { name="superdiag"; version="1.1"; sha256="0pa3mv74riabpm7j4587zww2364fszzlw48ijj1apcgz8y6pyqbw"; depends=[boa coda]; };
+  superheat = derive2 { name="superheat"; version="0.1.0"; sha256="01v8s6px1k5fajlm6py3ksr1i853kwwlky1yryzhy3p1cxhwgg83"; depends=[dplyr ggdendro ggplot2 gtable magrittr plyr scales]; };
   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_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]; };
+  surrosurv = derive2 { name="surrosurv"; version="1.1.5"; sha256="1mga3xi41rhnpci7zb224j1jdzf4nli4mbr7jy8nibjyjw4ccdz9"; depends=[copula eha lme4 MASS msm mvmeta optextras optimx parfm SurvCorr survival]; };
   surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[flexsurv plotrix survC1 survival]; };
   survAUC = derive2 { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
+  survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; };
   survAccuracyMeasures = derive2 { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[Rcpp RcppArmadillo survival]; };
   survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; };
   survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; };
   survJamda = derive2 { name="survJamda"; version="1.1.4"; sha256="14ly1g548ysm8jgsyrhj12zmd6i2lca7rsgby3jbwikyqyk1mx5q"; depends=[ecodist survcomp survival survivalROC survJamda_data]; };
   survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; };
-  survMisc = derive2 { name="survMisc"; version="0.5.0"; sha256="1dkjbxlnad77awb0cj2qkw7n6i55rfc56v5aa3yb3fmixk6qw73v"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival zoo]; };
+  survMisc = derive2 { name="survMisc"; version="0.5.4"; sha256="1m24vnhxk410h117mz056j8xkhp1ivjn5wvpprc0rqnd374z6c84"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; };
   survPresmooth = derive2 { name="survPresmooth"; version="1.1-9"; sha256="146ni0xnqd4kfxfxm8nkrgk6v4nrf2hpbb957zh10kmvaa5f9mij"; depends=[]; };
-  survRM2 = derive2 { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; };
-  survSNP = derive2 { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[foreach lattice Rcpp survival xtable]; };
-  surveillance = derive2 { name="surveillance"; version="1.11.0"; sha256="0mnnr3cq4ksa9jrqmky96byxag8vv0ak95x2sfm7ppfcymcpb2ya"; depends=[MASS Matrix polyCub Rcpp sp spatstat xtable]; };
+  survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; };
+  survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; };
+  surveillance = derive2 { name="surveillance"; version="1.13.0"; sha256="1451lcw4hr1np0hmghvkb7q3iwm7jfn8zfi85fr5qdkwsvkivsd1"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
-  survey = derive2 { name="survey"; version="3.30-3"; sha256="0vcyph1vpnl4xaqd85ffh1gm0dqhvgr3343q0mlycmyq485x0idy"; depends=[]; };
+  survey = derive2 { name="survey"; version="3.31-5"; sha256="1ijlxcslzpy9aqgj1hkr4axhyga6ll4ybzqdw2y07adyz1fwvkpj"; depends=[lattice Matrix survival]; };
+  surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; };
   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="1.2"; sha256="0ha0q1d47iwdfxlgjs13ahhghwsmq4xqiiqk8ynkgdq7bfp88a7z"; depends=[data_table]; };
-  survival = derive2 { name="survival"; version="2.38-3"; sha256="1hkji557sz4q86pp7xj3h4cdwsnfl1mlj4c6c917mnbijj3bm215"; 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]; };
   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.0"; sha256="1id65p2q963an9lfp6pb9bm6h213hpa40pmar4h6x982a3dbjfzl"; depends=[ggplot2 gridExtra scales survival]; };
+  survminer = derive2 { name="survminer"; version="0.2.4"; sha256="083hja5zid3ndfpx77vxm7vyqnjrq8c18vil8mch721fafhajrcd"; depends=[ggplot2 ggpubr gridExtra magrittr maxstat scales survival 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]; };
   svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; };
@@ -7586,493 +9502,636 @@ in with self; {
   svd = derive2 { name="svd"; version="0.4"; sha256="06bw4nypj9p57py2vw26yhzn3gw7clvby1mxbg2s2wj3jyay47p5"; depends=[]; };
   svdvis = derive2 { name="svdvis"; version="0.1"; sha256="1z3z86izl2gpxllpx56vn6kkdg9cjjikfd90hdjnfi4bmmpx50dn"; depends=[GGally ggplot2 gridExtra RColorBrewer reshape2 scales]; };
   svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; };
-  svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.2"; sha256="0hj4z6znp02p7gwadrqh9sagn8ydcwl52cckhinlycawjinzqcgs"; depends=[htmlwidgets]; };
-  svgViewR = derive2 { name="svgViewR"; version="1.0.1"; sha256="1ggw5w5xjqp33z6nzszimcab3vkv4rliiilhcqbhppqlnhjb8nab"; depends=[]; };
-  svglite = derive2 { name="svglite"; version="1.1.0"; sha256="11ryicjglfi6jvkk4jgg5kra42qbs5z2zid7jjhlslpjcljfwc70"; depends=[BH gdtools Rcpp]; };
-  svmadmm = derive2 { name="svmadmm"; version="0.2"; sha256="0g4q96gzd4h6ykc6ny1v06zabyyw6vm2slsfbsnnkxk4gah46zyj"; depends=[kernlab]; };
-  svmpath = derive2 { name="svmpath"; version="0.953"; sha256="0hqga4cwy1az8cckh3nkknbq1ag67f4m5xdg271f2jxvnmhdv6wv"; depends=[]; };
+  svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; };
+  svgViewR = derive2 { name="svgViewR"; version="1.2"; sha256="0h3smaplnkkvbl9c6lwl67jbk34m6sygkh2d82xz66hbyw2i6q7k"; depends=[]; };
+  svglite = derive2 { name="svglite"; version="1.2.0"; sha256="1s1gvmlmmna5y4jsn9h6438pg5b86fl4nwfvkgm6n4h6ljfgqyx3"; depends=[BH gdtools Rcpp]; };
+  svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; };
+  svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; };
   svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; };
   svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
+  swCRTdesign = derive2 { name="swCRTdesign"; version="2.1"; sha256="0c5pya5jgpj5ncrvpzahhrbhl7b39w19f3vl06r8q0nandbn7rwq"; depends=[]; };
   swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
-  sweidnumbr = derive2 { name="sweidnumbr"; version="1.1.0"; sha256="0ym7rnfd8wcab1vwpm64yh6day3ypzrlpvdrw5agc1nckhl9xp1p"; depends=[lubridate stringr]; };
-  swirl = derive2 { name="swirl"; version="2.2.21"; sha256="0lpin7frm1a6y9lz0nyykhvydr1qbx85iqy24sm52r1vxycv2r8h"; depends=[digest httr RCurl stringr testthat yaml]; };
-  swirlify = derive2 { name="swirlify"; version="0.4.1"; sha256="15xd18jgrqsq9w0qa64qxfcinrsy87mjbwc0s22x06yzhpcvcmdk"; depends=[rmarkdown stringr swirl whisker yaml]; };
+  sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
+  swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
+  swirl = derive2 { name="swirl"; version="2.4.2"; sha256="1dmjpjyk1a76vyya2x47sakj7xspma0i20zhryraf52mavb5qnw9"; depends=[digest httr RCurl stringr testthat yaml]; };
+  swirlify = derive2 { name="swirlify"; version="0.5.0"; sha256="1j5xrv9nbfxmwxr77qa545fcm0vg76zwv1l5msgykq2g6cc9vc4z"; depends=[base64enc rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
-  switchr = derive2 { name="switchr"; version="0.9.19"; sha256="1x8vf6nmy1rsy25ijl2ycxcpwzwkmhffvlmmg5p30m7y4zmcm200"; depends=[]; };
+  switchr = derive2 { name="switchr"; version="0.11.2"; sha256="0kwkadw1hfkjvlpgr8lfx9qknlml3alk8ka2yhbga019y7ifbm7y"; depends=[RCurl RJSONIO]; };
   switchrGist = derive2 { name="switchrGist"; version="0.2.1"; sha256="0n8fzzsxm0m4yic133q07vki803zywhijadymrgyq7qlx3d1m97d"; depends=[gistr httpuv RJSONIO switchr]; };
-  sybil = derive2 { name="sybil"; version="1.3.2"; sha256="1wpn5dmvhr6va3bh0pgrlv9sg8fmiy3h39jrm1391h5pkc65g0f1"; depends=[lattice Matrix]; };
-  sybilDynFBA = derive2 { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
+  sybil = derive2 { name="sybil"; version="2.0.0"; sha256="0nb5k5mpqpk1i83s0a8k4npi72imsywwm1jn1hh2vr5bx3sjwflw"; depends=[lattice Matrix]; };
+  sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; };
   sybilEFBA = derive2 { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
-  sybilSBML = derive2 { name="sybilSBML"; version="2.0.10"; sha256="0zw41lcq3b1qbs4ik7v3jjjqgm3hhi35mmxvq9vm78rrz1cz59b5"; depends=[Matrix sybil]; };
+  sybilSBML = derive2 { name="sybilSBML"; version="3.0.1"; sha256="1dzx1cdvi4fvdqf5hliwwk3gn5ig2wzzxv2gr92760p9c84hmmrj"; depends=[Matrix sybil]; };
   sybilccFBA = derive2 { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[Matrix sybil]; };
-  sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[MASS Matrix sybil]; };
+  sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.0"; sha256="0p3w7ipyrqrh7nf52h8qmr4fikyinm8an7npmcb7kwjd59rcy554"; depends=[MASS Matrix sybil]; };
+  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-29"; sha256="05f690d3gyr6zmp3s8ld5vy4a0ng8ikxpr28xi9l7m62j9c4pcic"; depends=[abind BGLR doBy igraph lattice LDheatmap MASS regress]; };
+  synbreed = derive2 { name="synbreed"; version="0.11-41"; sha256="077ixxfipc7msrmg0p4v5nhqwn276bj2766h6y5m9gj208xz5d91"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS 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]; };
-  synthpop = derive2 { name="synthpop"; version="1.2-1"; sha256="0siwgg16zky0dlw0wvl3n20y4pr94q3was8gw4llrla7jkh0g4pj"; depends=[foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
+  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=[]; };
   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]; };
-  systemicrisk = derive2 { name="systemicrisk"; version="0.3"; sha256="07i3pjghx2v8brx0k6xy5bk1d263wwyh5mbg7bzs4vwn4dh5k08f"; depends=[lpSolve Rcpp]; };
-  syuzhet = derive2 { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[NLP openNLP]; };
+  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]; };
   taRifx = derive2 { name="taRifx"; version="1.0.6"; sha256="10kp06hkdx1qrzh2zs9mkrgcnn6d31cldjczmk5h9n98r34hmirx"; depends=[plyr reshape2]; };
-  taRifx_geo = derive2 { name="taRifx.geo"; version="1.0.6"; sha256="0w7nwp3kvidqhwaxaiq267h99akkrj6xgkviwj0w01511m2lzghs"; depends=[RCurl rgdal rgeos RJSONIO sp taRifx]; };
-  tab = derive2 { name="tab"; version="3.1.1"; sha256="05wypi4v9r2qlgwafd9f58vnxn2c4fnz18l8xpb24nhdgm35adqy"; depends=[gee survey survival]; };
+  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]; };
-  tablaxlsx = derive2 { name="tablaxlsx"; version="1.0.8"; sha256="06l4rw6snhpkx6i74hh7i34mp9p1y7dwkpsmkq4083cm94hz308d"; depends=[openxlsx]; };
-  table1xls = derive2 { name="table1xls"; version="0.3.1"; sha256="0zd93wrdj4q0ph375qlgdhpqm3n8s941vks5h07ks9gc8id1bnx5"; depends=[XLConnect]; };
+  tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.0"; sha256="1wrjasa4bdcv9pcfardm3v3k5f2lm7hrbm7xpyz0gy2ibm3b15pk"; depends=[openxlsx]; };
+  table1xls = derive2 { name="table1xls"; version="0.3.2"; sha256="0b8j4gl4w3jz8hg89ja90sjvigjkqnrh4hpmky5q4a9swgwhmgf6"; depends=[XLConnect]; };
+  tableHTML = derive2 { name="tableHTML"; version="0.2.12"; sha256="02a0j75d6praxp44m9idv116grzw6k9lhhgdjcxl2r9ci9cak1bn"; depends=[htmltools magrittr shiny]; };
+  tableMatrix = derive2 { name="tableMatrix"; version="0.8"; sha256="00l03blrrkwdrihqnwz8afx6s3d7a19laj44584546yd3prqx5dy"; depends=[data_table]; };
   tableone = derive2 { name="tableone"; version="0.7.3"; sha256="0ffir00gzrx4fxci018vra7m8hfiqmvlib52wlxikksna2ha51qv"; depends=[e1071 gmodels MASS survey zoo]; };
   tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; };
-  tables = derive2 { name="tables"; version="0.7.79"; sha256="05f23y5ff961ksx4fnmwpf6zvc9573if8s2cmz9bwki66h2g9xb7"; depends=[Hmisc]; };
-  tabplot = derive2 { name="tabplot"; version="1.1"; sha256="0vyc6b6h540sqwhrza2ijg7ghw2x8rla827b8qy2sh0ckm0ybjrx"; depends=[ffbase]; };
+  tables = derive2 { name="tables"; version="0.8"; sha256="0a8ks6gs4n25khs51dr55z1665zbsyzv2849h7h9xwz8izv8l6za"; depends=[Hmisc]; };
+  tabplot = derive2 { name="tabplot"; version="1.3-1"; sha256="0yz3npn36q93gr0k9a4x5swap5fwxfc22b131kif3dfxkgklna06"; depends=[bit ff ffbase]; };
   tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; };
   tabuSearch = derive2 { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; };
-  tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.9.0"; sha256="0p0bnmycqkbg2zq0hlanap09pn7jl90l4pmmkfs2i7l58pql3cr9"; depends=[broom car dplyr ggplot2 haven lazyeval pixiedust pwr ryouready sjmisc vcd]; };
+  tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.10.0"; sha256="1n3fq68gk20bivkybdls3c6vdwlyxqg8rfsksskv0i4aj1vdvbdw"; depends=[broom car cowplot dplyr ggplot2 haven lazyeval nortest pixiedust pwr ryouready sjmisc vcd]; };
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
+  tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
-  tau = derive2 { name="tau"; version="0.0-18"; sha256="04rj3jrcz4h60dqm1xmnmpr52csz1s7rf2wv6ivybgyvbq0w2ijf"; depends=[]; };
-  tawny = derive2 { name="tawny"; version="2.1.2"; sha256="0ihg3qlng8swak1dfpbnlx5xc45d1i9rgqawmqa97v5m91smfa71"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
+  tau = derive2 { name="tau"; version="0.0-19"; sha256="0z7ylw590r7jrw4rlmhahxiwqrnw3124fssnzqs36qa7pa3zqhq2"; depends=[]; };
+  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.7.4"; sha256="17gpd471awjr798q4973kj4xgrdqlgjdxp7fzpr9sf969vaz1jq8"; depends=[ape bold data_table foreach httr jsonlite plyr reshape2 rredlist stringr xml2]; };
+  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]; };
   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.7"; sha256="1m37ndk73y267q6byzpf8kfx8vsd5j2xdspcgkz6743fkaj1myam"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
+  tcR = derive2 { name="tcR"; version="2.2.1.11"; sha256="1wyxjwyba08m80g2c40sdg3d5brs3qmq8azb6vzwh2wmgqlb5400"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; };
+  tcgsaseq = derive2 { name="tcgsaseq"; version="1.4.1"; sha256="09hswqmj7svyiqdbbg7shimhkgxmz0m8w6bknx9qd987hik9asx8"; depends=[CompQuadForm ggplot2 GSA KernSmooth]; };
   tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; };
   tclust = derive2 { name="tclust"; version="1.2-3"; sha256="0a1b7yp4l9wf6ic5czizyl2cnxrc1virj0icr8i6m1vv23jd8jfp"; depends=[cluster mclust mvtnorm sn]; };
+  tcpl = derive2 { name="tcpl"; version="1.2.2"; sha256="1f32qq5816qkyx3n16vgf13g2piv2pqn2nki3c91vg51bwfap7z1"; depends=[data_table DBI numDeriv RColorBrewer RMySQL RSQLite]; };
+  tdROC = derive2 { name="tdROC"; version="1.0"; sha256="137j1m9pysjcz1gsfcym0438by3c7na21ccjlqf7xfccr1y8k2k6"; depends=[survival]; };
   tdr = derive2 { name="tdr"; version="0.11"; sha256="1ga1lczqj5pka2yz7igxfm83xmkx7lla8pz6ryij0ybn284agszs"; depends=[ggplot2 lattice RColorBrewer]; };
   tdthap = derive2 { name="tdthap"; version="1.1-7"; sha256="0lqcw4bzjd995pwn2yrmzay82gnkxnmxxsqplpbn5gg8p6sf5qqk"; depends=[]; };
-  teigen = derive2 { name="teigen"; version="2.1.0"; sha256="1b9vkz812jsvzxs4751q8zmkvbc1bh4zbi4pd0550b181vxnn8wa"; depends=[]; };
+  tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; };
+  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=[]; };
   tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; };
-  tempdisagg = derive2 { name="tempdisagg"; version="0.24.0"; sha256="02ld14mppyyqvgz537sypr3mqc758cchfcmpj46b7wswwa2y7fyz"; 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]; };
   tensor = derive2 { name="tensor"; version="1.5"; sha256="19mfsgr6vz4lgwidm80i4yw0y1dr3n8i6qz7g4n2xa0k74zc5pp1"; depends=[]; };
   tensorA = derive2 { name="tensorA"; version="0.36"; sha256="1xpczn94a6vfkfibfvr71a7wccksg16pc22h0inpafna4qpygcwp"; depends=[]; };
+  tensorBF = derive2 { name="tensorBF"; version="1.0.1"; sha256="1rnsff1ypwhn5z0xsxyk2z7jl6igscma1a0w613i81qf37iy81ba"; depends=[tensor]; };
+  tensorBSS = derive2 { name="tensorBSS"; version="0.2"; sha256="0bwqv5cxr5lf2p6xa2p03kwhanrzskz8k3xif1myfjhdw1vzyqib"; depends=[JADE Rcpp RcppArmadillo tensor tsBSS]; };
   tensr = derive2 { name="tensr"; version="1.0.0"; sha256="05gclhljflkz98hgiq5bgbqjz8icxbdq6b84bn2995cx7v0x85ds"; depends=[]; };
-  tergm = derive2 { name="tergm"; version="3.3.1"; sha256="1k10pmm3b62naw4mcy7318yzjq1j1s5qqjsmz90vnh0dajfhvhbw"; depends=[coda ergm network networkDynamic nlme robustbase statnet_common]; };
+  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]; };
+  testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; };
   tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; };
-  testit = derive2 { name="testit"; version="0.5"; sha256="1v39mz4qrcml90p5d1z9x0cs2llj2pgfpymdwndh9r94ndlzs5hl"; depends=[]; };
-  testthat = derive2 { name="testthat"; version="0.11.0"; sha256="1fks5d4sbh4ya1va1p2815kwrklflm8ifplp6kjx1d1y09hrx9i4"; depends=[crayon digest praise]; };
-  testthatsomemore = derive2 { name="testthatsomemore"; version="0.1"; sha256="0j9sszm4l0mn7nqz47li6fq5ycb3yawc2yrad9ngb75cvp47ikkk"; depends=[testthat]; };
-  texmex = derive2 { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3gf4rf81b29hg2g3gq6a6nrxsj8sy"; depends=[mvtnorm]; };
-  texmexseq = derive2 { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; };
-  texreg = derive2 { name="texreg"; version="1.36.4"; sha256="11iivv5pslwqd0nbi533jyigwd16yx2mx1gl22ip8ghqvllfzxmk"; depends=[]; };
-  text2vec = derive2 { name="text2vec"; version="0.2.0"; sha256="0s73phk4dzm1f9wcj5b1iha1g6rv3hvd6iwy97kgwxqd308cas48"; depends=[digest iterators magrittr Matrix Rcpp RcppParallel readr stringr]; };
-  textcat = derive2 { name="textcat"; version="1.0-4"; sha256="0mxxs2zq6zijh954r7zxvh2l416k49jghzbdzwcm55mf133lb07z"; depends=[slam tau]; };
+  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]; };
+  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=[]; };
+  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]; };
+  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="1.6.0"; sha256="1cgpy0hk73jigag4x48ygkvks8k2x3m1amf34li2ffbx2g6066jb"; depends=[lda Matrix Rcpp RcppArmadillo RcppProgress RWeka tm]; };
+  textmineR = derive2 { name="textmineR"; version="2.0.4"; sha256="127ngmzvzsb8pbwv6f4k76jv3aqrmpwpbx29cic39m05zxjxxm7k"; 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]; };
-  textreuse = derive2 { name="textreuse"; version="0.1.2"; sha256="174gh9f4bfgpf8vnwcciq2y70rnzwln5yygzif28x5h960yckv5x"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
+  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]; };
+  textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
   tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; };
   tframe = derive2 { name="tframe"; version="2015.12-1"; sha256="0k0favda3z6zdg7ykc2nnl28gxz7sfzbyr5pcifiyi984pa2zgfx"; depends=[]; };
-  tframePlus = derive2 { name="tframePlus"; version="2015.1-2"; sha256="043ay79x520lbh4jm2nb3331pwd7dvwfw20k1kc9cxbplxiy8pnb"; depends=[tframe timeSeries]; };
-  tgcd = derive2 { name="tgcd"; version="1.8"; sha256="0bq2swfz29dl1d745pprx9c3b8nplpb7d64v24nzxrj7yvjfwj90"; depends=[]; };
+  tframePlus = derive2 { name="tframePlus"; version="2016.7-1"; sha256="12xi2xw4pr78n3cppfknpxmjp2263pb4kqj9v412yxwp82rgb6yk"; depends=[tframe timeSeries]; };
+  tgcd = derive2 { name="tgcd"; version="2.0"; sha256="1553f464jpmngdj8fmbjn9cpmrcp4ysgsfx4w7q4pm4csslsqvlr"; depends=[]; };
   tggd = derive2 { name="tggd"; version="0.1.1"; sha256="1izar1b3w148vp2r8gv3vpwfndib8ilxcjxgbfzbxn7q5mr73mwa"; depends=[gsl]; };
   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]; };
   thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
-  thgenetics = derive2 { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; 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]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
-  threejs = derive2 { name="threejs"; version="0.2.1"; sha256="01zfv5lm11i2nkb876f3fg8vsff2wk271jqs6xw1njjdhbnnihs1"; depends=[base64enc htmlwidgets]; };
+  threejs = derive2 { name="threejs"; version="0.2.2"; sha256="1i8ca99ys0m0njf5f9yhc5rvs9x43mwl98dh74gggq7vj2a99zj1"; depends=[base64enc htmlwidgets jsonlite Matrix]; };
   threewords = derive2 { name="threewords"; version="0.1.0"; sha256="083y5i4qyl1wj017wy5ywl2yx9wvrpjl9g9k9clvnrbwzbycx2cg"; depends=[httr]; };
   threg = derive2 { name="threg"; version="1.0.3"; sha256="1ja0w4hhdkw3b1cipbpw8ym27k5lh2m7gibd74mj6gij7rpixrnb"; depends=[Formula survival]; };
-  thregI = derive2 { name="thregI"; version="1.0.1"; sha256="1ng13f08zj0sglh99ixr0afzwj1fag8b88046bzdzq4vf3vq5v36"; 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.0"; sha256="105iammxmhm2mlv3fq0gvrglz6gqyvm4iiiilsvq54fw0z68a4n6"; depends=[assertthat lazyeval Rcpp]; };
-  tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
+  tibble = derive2 { name="tibble"; version="1.2"; sha256="011i352ylq9b4xfcj7h10h7qsqd9qkc1rzc0pr1gf8qjb788p2pd"; depends=[assertthat 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=[]; };
   tidyjson = derive2 { name="tidyjson"; version="0.2.1"; sha256="178lc4ii4vjzvrkxfdf5cd9ryxva9h2vv4wl6xgxgaixkab9yv9w"; depends=[assertthat dplyr jsonlite]; };
-  tidyr = derive2 { name="tidyr"; version="0.4.1"; sha256="0xp6lyr2l4ix2mrilx4qmca7wm5qmbhvi24m4nf7qsgwp54gnv2h"; depends=[dplyr lazyeval magrittr Rcpp stringi]; };
+  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]; };
+  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]; };
+  tidyxl = derive2 { name="tidyxl"; version="0.2.1"; sha256="10b6bl2yr11mzajkzj6xzfyfb0mgglzxm8hpsqxkmd9dp4x96035"; depends=[Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
   tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
-  tigerstats = derive2 { name="tigerstats"; version="0.2.7"; sha256="1jgglgdv1xjyyc376ggydvna26lb4f7l7lv82xn56fa8asdssd91"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; };
+  tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; };
+  tigerstats = derive2 { name="tigerstats"; version="0.3"; sha256="12wrghipgypkhwwkmaxb6n0qx9fgxk82dc6wlh56rblsvciv2hj0"; depends=[abd ggplot2 lattice manipulate MASS mosaic mosaicData]; };
+  tigger = derive2 { name="tigger"; version="0.2.8"; sha256="1qck72fnsivmc8gq8n5c18b6nzxp2kn3vs9kfziqr04hpwhz4266"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators tidyr]; };
   tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
-  tigris = derive2 { name="tigris"; version="0.2.2"; sha256="0pc9fg6p7qsdmq1pjp0mqaxmdqxcskp3hcn6sgabpa40q37gb77z"; depends=[httr magrittr maptools rappdirs rgdal rgeos sp stringr uuid]; };
+  tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; };
+  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]; };
+  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.1"; sha256="054r5lnvl3wj92sx78qwh0mgrcncwqn94ph941knjwnbds4g2arj"; depends=[doParallel edgeR foreach gss lattice pheatmap reshape]; };
+  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.2"; sha256="15hmby937zf7gs8lhbaxkpdjbg6vrfz7jg41p25mik1d5q8qf2v0"; depends=[mnormt]; };
+  timedelay = derive2 { name="timedelay"; version="1.0.5"; sha256="1b3qm46xyrssla11kcxmy9j5bhy9bzcqfvalwny3cgbjmzsc0pa9"; depends=[mnormt]; };
   timeit = derive2 { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
   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.8.9"; sha256="12l8sz10ic8d34jd7ik8szg2d51pr949nsss20c5l5g3kfnvqkkh"; depends=[lava numDeriv survival]; };
+  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.7.3"; sha256="0mdj2sm72wv3mswfib8svpyai735z59917bk33pzb7rz246g3hb8"; depends=[]; };
+  timetools = derive2 { name="timetools"; version="1.9.1"; sha256="12q3lbma8w3961apsifikngm17lw9vj2xl29rygdiizmk61ll4ha"; 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]; };
-  timsac = derive2 { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
+  timsac = derive2 { name="timsac"; version="1.3.5"; sha256="1p2fwizq95fhbw0jk23sy0qgkkkab0iy37sw71krpm0dzrgi6lj0"; depends=[]; };
+  tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; };
+  tint = derive2 { name="tint"; version="0.0.3"; sha256="1ffysnp2q4g123lgyhjw92j9dwh8b1yfqsrpqfv4s9qnjb6bqr7z"; depends=[htmltools knitr rmarkdown]; };
   tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
-  tis = derive2 { name="tis"; version="1.30"; sha256="0bqvnaxqqq4962wfw4s9rf0qil613mplqcjwjlq1s9yfxl78gzzw"; depends=[]; };
+  tis = derive2 { name="tis"; version="1.32"; sha256="1qiywhsqgshs5v7780wlyic9ykxdpf26rsywakmb4y6fc3pjrhi7"; depends=[]; };
   titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; };
   titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; };
   titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; };
   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.3"; sha256="1jj8yihq4b13wavflkkv91m9ba2l5ar3vcwp1ss6iymyf3hzdgiv"; depends=[boot]; };
+  tlm = derive2 { name="tlm"; version="0.1.4"; sha256="041ydlbsn0dxggrvfjfpg2jmns3c4z021f64cl2k1lwmxvqrp265"; depends=[boot]; };
   tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
-  tlnise = derive2 { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rsivb7nlbdfgzf20pgh2sndm3rh8qz"; depends=[]; };
   tm = derive2 { name="tm"; version="0.6-2"; sha256="0q7plaqgc2ypihnz3dyjv2pwa0aimd4kv5i2z6m7aycc4wkmc7j4"; depends=[NLP slam]; };
   tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
   tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; };
-  tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.3"; sha256="04sqaqmi00xm85732sk5iqv6ywfqh52qkkk0wv8xzqxwsixf3hyc"; depends=[NLP tm XML]; };
-  tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; };
-  tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[ISOcodes NLP tm XML]; };
+  tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; };
+  tm_plugin_factiva = derive2 { name="tm.plugin.factiva"; version="1.6"; sha256="1g4gqhha4936whnir1j31jlcbg9x6jhay7yl1c2pzhldldqj98ih"; depends=[NLP tm XML]; };
+  tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3"; sha256="056fvhd7m1z7pqmllq2l36v1zm2iwrmii3andhr22894qk99kck1"; depends=[ISOcodes NLP tm XML]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
-  tmap = derive2 { name="tmap"; version="1.4"; sha256="1krdp213j26xr6a5pdb6a5d2pgx521a718kp2rcrrbw9ifgh4j1q"; depends=[classInt geosphere htmltools htmlwidgets KernSmooth leaflet osmar raster RColorBrewer rgdal rgeos sp spdep XML]; };
+  tmap = derive2 { name="tmap"; version="1.8-1"; sha256="193mkyby2rwx917b4bh0fg1ds6hc67ml1ch6wva1dssnkasn2x5i"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; };
+  tmaptools = derive2 { name="tmaptools"; version="1.2"; sha256="1ljqrajzjl2qcxp55awy79p4d8z4phlkj2kmlqd8fk00lfbig2qp"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
-  tmle = derive2 { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
+  tmle = derive2 { name="tmle"; version="1.2.0-5"; sha256="06pan7kf1ffs587kayrscqcp4d613ismpzxp8fhfzga02vzvc3a2"; depends=[SuperLearner]; };
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
   tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; };
-  tmod = derive2 { name="tmod"; version="0.24"; sha256="1v3yc2x9kchj8mg3h9111g55j2vzz484qx2k3kydsa1a77lv0rdf"; depends=[beeswarm pca3d tagcloud XML]; };
+  tmod = derive2 { name="tmod"; version="0.31"; sha256="1qqzngqnj4vk170ild34fpzsnpb1125zisf6xx5hp8q899z88q81"; depends=[beeswarm pca3d plotwidgets tagcloud XML]; };
   tmpm = derive2 { name="tmpm"; version="1.0.3"; sha256="1fqk39zyc07gh0ygi7pfljlnj6ih37jsb7bcxm05zcd4796wil8j"; depends=[reshape2]; };
-  tmvnsim = derive2 { name="tmvnsim"; version="1.0-1"; sha256="1zl1adx5klhg33j87kx8hqvn7mdyfqi12xxljf29abdqmr4pkp95"; depends=[]; };
+  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"; sha256="138jn4qdhk1c0mk43b8n5rr2zb20svli82kj1vkl75gxri0d5i26"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; };
+  tnam = derive2 { name="tnam"; version="1.6.2"; sha256="09wqsqjssnzirx387y2mdd6qa38hlbf1d8s0dwzsz2jxx4w8xp01"; 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.4.2"; sha256="0jz3gi8cblwqgl6kq6glhf2cb6r16davm850gz9s2i5synk4p2v7"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; };
+  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.2.0"; sha256="0qvbmv4pq4mczr0ikhha52l0wc6rsb4h9mggsv8dg7g6snrrjb0h"; depends=[rgl]; };
-  topicmodels = derive2 { name="topicmodels"; version="0.2-3"; sha256="1jhz4455p1bnw8cm11xnj5w3v1v9dgmzq9zmxl6a4l6x4v12di88"; depends=[modeltools slam tm]; };
+  tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; };
+  topicmodels = derive2 { name="topicmodels"; version="0.2-4"; sha256="0hqgq8lkaj5p4lvjgyyw8vh8j85khqvvrm8vw172dbj997x2izi4"; depends=[modeltools slam tm]; };
   topmodel = derive2 { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
-  topologyGSA = derive2 { name="topologyGSA"; version="1.4.5"; sha256="1v6plj7v0i5fr6khl0ls34xc0hfd61cpabqpw5s1z3mqmqnma56a"; depends=[fields graph gRbase qpgraph]; };
+  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=[]; };
   tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; };
+  touch = derive2 { name="touch"; version="0.1-3"; sha256="1zzc4h6y0xmr3p7jl0vlvn4yswxz5akgvz8laxgmjgqzk926g9jl"; depends=[stringr]; };
   tourr = derive2 { name="tourr"; version="0.5.4"; sha256="11xg5slvx7rgyzrc0lzandw7vr7wzk3w2pplsnyrqq3d990qp40d"; depends=[]; };
   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]; };
   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]; };
   tracheideR = derive2 { name="tracheideR"; version="0.1.1"; sha256="1x1jwzgs2aqb3k17mm9mhfhnbwcmilhkjaz9rl40rcg84xjqdrpl"; depends=[tgram]; };
-  track = derive2 { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbzblxnd9f7lp2w24hyp0zbbf1nxs68"; depends=[]; };
-  trackeR = derive2 { name="trackeR"; version="0.0.1"; sha256="06c5k7c12nnhy00xly4j0f2hn4wl8i9gm1fiy3q9j6g7hyyrgvx5"; depends=[ggplot2 zoo]; };
-  tractor_base = derive2 { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; };
+  track = derive2 { name="track"; version="1.1.9"; sha256="1d0hab7xyayyhyyrbv8nvpka1kzry4yx10fg8aqwkca3nm7n2q3c"; depends=[]; };
+  trackeR = derive2 { name="trackeR"; version="0.0.5"; sha256="0c1wfc41a0n9ldz7mmcss3m2c7lz5wjmv5ifwn9h6ih7wng9d707"; depends=[colorspace fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; };
+  tractor_base = derive2 { name="tractor.base"; version="3.0.7"; sha256="19rnsk0v34zlic12839zfp1rrmv7dq4pl1wq5c6hcnsjrbw731wn"; depends=[ore reportr]; };
   traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
   traits = derive2 { name="traits"; version="0.2.0"; sha256="0qsnlp96ilwmaimph0bvkjw4kaqd3wpfy6knd7k5s321b68hqaam"; depends=[data_table dplyr httr jsonlite readr rvest taxize xml2]; };
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
   trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; };
+  tranSurv = derive2 { name="tranSurv"; version="1.1-4"; sha256="1vsp12x4h0s1lba1kf7n0v71kgm1dz6cjfp8lffm4ps80nahs63l"; depends=[rootSolve SQUAREM survival]; };
   transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
   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.7-3"; sha256="1rgbpj8n88fqw2ivdjhfl9jggazhh7hpalnpfv1rmf96khm76cc0"; depends=[]; };
+  transport = derive2 { name="transport"; version="0.8-1"; sha256="1lz5gn9rrg1lyxl6l0r2b0vj4756xq0gb41mfg2darww6b4ifx5v"; depends=[]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
   treatSens = derive2 { name="treatSens"; version="2.0.1"; sha256="0gb14f9dfa9slppl2a2bchkli51rprw6wzyzrkxlfqlski0piymf"; depends=[dbarts]; };
   tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; };
-  treeClust = derive2 { name="treeClust"; version="1.1-1"; sha256="06293w4r1h845jqzdqfnh7w5nsvyz4d0h6nn0w2aj4addj3sbp9y"; depends=[cluster rpart]; };
-  treebase = derive2 { name="treebase"; version="0.1.2"; sha256="0rn47gd1kggwwgzxqkjq364l1dcnw8ilqzmnr2cnkyzlx1afk5f3"; depends=[ape RCurl XML]; };
-  treeclim = derive2 { name="treeclim"; version="1.0.16"; sha256="0fn79hmn266473ygi0pdkqgcycs7wy2fmvh974xl8bv1rh42sml0"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
+  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]; };
+  treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; };
+  treeclim = derive2 { name="treeclim"; version="2.0.0"; sha256="0hiba5xc6rp5zzka31k5klmlllpgbnla4pm920zk12jxn796953l"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
   treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; };
   treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
-  treemap = derive2 { name="treemap"; version="2.4"; sha256="097w7zn1dkv0whs2hsysvk7c05aj1a862sxnpk8ackdi2rmdj4xa"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
+  treeman = derive2 { name="treeman"; version="1.0"; sha256="0nbcvyqqd75vvms1bvalm7bq59wfg4fdcql7ydhkrjdv0mf0753m"; depends=[plyr]; };
+  treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
-  treeplyr = derive2 { name="treeplyr"; version="0.1"; sha256="0y13m5ky3wyxf2d8np1xrd2ffrh814apyqkhd637mqwj58nnwbgy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; };
-  treescape = derive2 { name="treescape"; version="1.8.15"; sha256="12lhv1qlpj5c8k76zh7mvz3h6xqjp6ri7rfsawz4wzmhzfmagllz"; depends=[ade4 adegenet adegraphics adephylo ape combinat phangorn Rcpp RLumShiny shiny shinyBS shinyRGL]; };
-  treethresh = derive2 { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; };
-  trend = derive2 { name="trend"; version="0.1.0"; sha256="0nxayjs542lszl2vj1xi54fbl8h72rm0k7d92l7w7h7ldvqksiiz"; 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]; };
+  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]; };
+  trend = derive2 { name="trend"; version="0.2.0"; sha256="0kq2j9rky8kad3rfkwqys2s9hivrqy4yb03q80dvgz856bsh5fiw"; depends=[]; };
   triangle = derive2 { name="triangle"; version="0.10"; sha256="02s7iblk3fdrjhz0sns76bqrfwi0y0l6vbjfsb5mzq6pn45n0nkv"; depends=[]; };
+  triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; };
   trib = derive2 { name="trib"; version="1.2.0"; sha256="0bvz1cvi2fx40b5rdv4gfama11dn20rz4506k4fjsny32yswpqyw"; depends=[zoo]; };
+  triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; };
   trifield = derive2 { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
   trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; };
   trimcluster = derive2 { name="trimcluster"; version="0.1-2"; sha256="0lsgbg93hm0w1rdb813ry0ks2l0jfpyqzqkf3h3bj6fch0avcbv2"; depends=[]; };
   trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; };
   trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; };
-  trip = derive2 { name="trip"; version="1.1-21"; sha256="0rawckw3xd8kz2jn6xgspgl5axabjcp4xh4kp93n3h41xlarv9xa"; depends=[maptools MASS raster sp spatstat]; };
+  trip = derive2 { name="trip"; version="1.5.0"; sha256="1qdq3hbqqaa0cmb47ssg3pr3jksni7g4xsc7bsj6wwdw62d9wzf6"; depends=[maptools MASS raster sp spatstat]; };
   tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; };
-  tripack = derive2 { name="tripack"; version="1.3-7"; sha256="1kp3zxs1b6mjbrk0bbsz3jjvkxwm97jb0vvr66dpm57abyl1snly"; depends=[]; };
+  tripack = derive2 { name="tripack"; version="1.3-8"; sha256="0pf707z6xysxvcs508nadga3mglpvmfk6r061qda8acn58ll1cvb"; depends=[]; };
   trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; };
   trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; };
   truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; };
-  truncdist = derive2 { name="truncdist"; version="1.0-1"; sha256="0aszs6rz8nydyf2dw1m4fj9fclb0r4vpgqywyaqjkdnhzmyn593g"; depends=[evd]; };
+  truncdist = derive2 { name="truncdist"; version="1.0-2"; sha256="02ihw4ixhadwr3sqm6r264i8vpcaz8pn69vkzabd8fwqvn5vcj5q"; depends=[evd]; };
   truncgof = derive2 { name="truncgof"; version="0.6-0"; sha256="0b499i9zjwvva5jfl9fj02jjrgy8myxqfjwa0cjg0jrpgxczgwg8"; depends=[MASS]; };
   truncnorm = derive2 { name="truncnorm"; version="1.0-7"; sha256="1qac05z50618y4bw1d7yznsli1bv82s0g8h37iacrjrdkv87bmy7"; depends=[]; };
-  truncreg = derive2 { name="truncreg"; version="0.2-1"; sha256="0qvdfj93phk1s2p4n0rmpf8x9gj5n1j75h4z424mrg10r24699rd"; depends=[maxLik]; };
+  truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
   trustOptim = derive2 { name="trustOptim"; version="0.8.5"; sha256="1y9krw2z5skkwgfdjagl8l04l9sbiqbk1fbxp30wrf4qj3pba5w6"; depends=[Matrix Rcpp RcppEigen]; };
-  tsBSS = derive2 { name="tsBSS"; version="0.1"; sha256="1r2hcfki53kvngm1vp209z1aqp082a98jr42bzvxgix62wmh2cfj"; depends=[JADE Rcpp RcppArmadillo]; };
-  tsDyn = derive2 { name="tsDyn"; version="0.9-43"; sha256="0fhqfwhac1ac1vakwll41m54l88b1c5y34hln5i1y2ngvhy277l1"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
+  tsBSS = derive2 { name="tsBSS"; version="0.2"; sha256="1rnfkrmfmha6pjcsl5zicafj5s2agr048j1rmqficyh3km0kz3i7"; depends=[JADE Rcpp RcppArmadillo]; };
+  tsDyn = derive2 { name="tsDyn"; version="0.9-44"; sha256="09vxp2zir0vidzfm57j4cgkigsiyqwvr6ssy15ydfjxha30523a7"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
   tsPI = derive2 { name="tsPI"; version="1.0.1"; sha256="0sdlcymhljw0di7mi5n4jmgqhfgvqix0jpp07f6wgjbqxkas4wr5"; depends=[KFAS]; };
+  tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; };
   tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-2"; sha256="19535zlr6gjg45f8z6hm98pamgn20z19m8qb63997vbj4azsrjfv"; depends=[]; };
   tsbridge = derive2 { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8asrq1ldj70gnpb5dqzj51w0jiyps2zlw6f"; depends=[mvtnorm tsbugs]; };
   tsbugs = derive2 { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
   tsc = derive2 { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
-  tscount = derive2 { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; };
-  tseries = derive2 { name="tseries"; version="0.10-34"; sha256="068mjgjcsvgpynkvga8lv430cg8zhlr9frj5yapsxni2vj534pqj"; depends=[quadprog zoo]; };
+  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]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.5-12"; sha256="0z9354mlj0nh829ccwwhs53q5myfp31x9n6kv1k8gmvz5xma40kh"; depends=[cubature]; };
   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]; };
-  tsna = derive2 { name="tsna"; version="0.1.3"; sha256="10iflkmc1ym01pvj42gxqsdj3ph44jnqc0j4c42c6xl3365xgdfy"; depends=[ergm network networkDynamic statnet_common]; };
-  tsne = derive2 { name="tsne"; version="0.1-2"; sha256="12q5s79r2949zhm61byd4dbgw6sz3bmxzcwr8b0wlp8g1xg4bhy6"; depends=[]; };
-  tsoutliers = derive2 { name="tsoutliers"; version="0.6"; sha256="1cyh56i7dsnclphi81fab6k8vkdqv8ing2zmpfsjq4gvq76p7piw"; depends=[forecast KFKSDS polynom stsm]; };
+  tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; };
+  tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
+  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]; };
+  tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; };
   ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; };
-  tth = derive2 { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7x2da58a46b5x01g08i0j8h1d"; depends=[]; };
-  tttplot = derive2 { name="tttplot"; version="1.0"; sha256="0kiahy9f4d6cwzj2k3agrgn12z1fkwmy06ldrl064pbx57ky0wnw"; depends=[]; };
+  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.2"; sha256="1frxjk1yzzcn7sza21qn2905z60vpi9b142jxnslncm2dpd2fh65"; depends=[httr]; };
+  tuber = derive2 { name="tuber"; version="0.7.0"; sha256="1fcls8q4ihz50wnar87047i8il32a1nrxw67nv9wjqfi02z74c2p"; depends=[httr plyr]; };
   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.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; };
+  tuneR = derive2 { name="tuneR"; version="1.3.1"; sha256="0m0fc8bx7645ddbcsvgwamfsd7rklz05wi8yc9p0kf2k5sbn48r3"; 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]; };
   turner = derive2 { name="turner"; version="0.1.7"; sha256="1xckb750hbfmzhvabj0lzrsscib7g187b44ag831z58zvawwh772"; depends=[tester]; };
-  tutorial = derive2 { name="tutorial"; version="0.2.2"; sha256="0594pgjkx2y14gy54vfccwn30w2szdq1q4l85frjbjf7k2z88x4b"; depends=[markdown rmarkdown]; };
+  tutorial = derive2 { name="tutorial"; version="0.4.3"; sha256="0sxdlpw0w4azlaxdlk36ycrric6pbj2zi4nyv26pgsp0cr1hrx6r"; depends=[base64enc knitr markdown rjson]; };
   tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; };
   tvm = derive2 { name="tvm"; version="0.3.0"; sha256="1iv0qrks1zdiq8jaqr1h46snq8wc3g3q017hxc8zc6fqnsz1whf6"; depends=[ggplot2 reshape2]; };
-  twang = derive2 { name="twang"; version="1.4-9.3"; sha256="06lgawzq3b2jg84rvg24582ndlk8qji4gcbvxz5acf302cvdnmji"; depends=[gbm lattice latticeExtra survey xtable]; };
-  tweedie = derive2 { name="tweedie"; version="2.2.1"; sha256="1fsi0qf901bvvwa8bb6qvp90fkx1svzswljlvw4zirdavy65w0iq"; depends=[]; };
-  tweenr = derive2 { name="tweenr"; version="0.1.2"; sha256="1s1q9adqdff79bpr2ypfzbsh51kmzqxk2082s49pw5kmina6bacs"; depends=[Rcpp]; };
-  tweet2r = derive2 { name="tweet2r"; version="0.4.1"; sha256="0g2y6bs9211wrn8gaqxcrzka27aqh2wcxi00faqkw61pypy4fyxg"; depends=[ggmap ggplot2 plyr rgdal ROAuth RPostgreSQL RSQLite sp streamR]; };
+  twang = derive2 { name="twang"; version="1.4-9.5"; sha256="1haj2aj14n0bk2gf00afrqan67986c8l75ps6ig505c2i0z4ivqd"; depends=[gbm lattice latticeExtra survey xtable]; };
+  tweedie = derive2 { name="tweedie"; version="2.2.5"; sha256="1n08xdkqklh020zwgkkj6wbf7gyjghjl5wbs0xj83zi9jcmn08sn"; depends=[]; };
+  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=[]; };
   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]; };
   txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
+  types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
+  uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; };
+  uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; };
+  ubeR = derive2 { name="ubeR"; version="0.1.4"; sha256="1ilclna04hd1ykcp2b3gcj0v4qznwx0d24yavxnf2yh5d91wr6z2"; depends=[dplyr ggmap ggplot2 ggthemes googleway httpuv httr jsonlite]; };
   ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
-  ucminf = derive2 { name="ucminf"; version="1.1-3"; sha256="19gmbz32rhrdagvhf2s901lvi1r6273wzznry5daryq6w1jx5z3v"; depends=[]; };
-  udunits2 = derive2 { name="udunits2"; version="0.8.1"; sha256="0nind45v0ispwz0fgksw64w4y5y6za0r3cx07j02zwg911n32r7c"; depends=[]; };
+  ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; };
+  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]; };
   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.1.5"; sha256="13diwb8p51vh14pb705sbdn2994ha4dfx20s45aj38sqz7igz2x4"; depends=[knitr MASS Matrix mvtnorm numDeriv OpenMx polycor R2HTML RCurl]; };
+  umx = derive2 { name="umx"; version="1.5.0"; sha256="0b011ym5hai9c7r1lgr9y3yhscrwq77h6q6llkhklkz35qbz4056"; 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.3"; sha256="1zc2a4c228lhflsiypn8z6yn3fl0hr3dpmpzdxfrrijzbfai9215"; depends=[]; };
+  unfoldr = derive2 { name="unfoldr"; version="0.6"; sha256="1chxd6b353s56rl78wxr8zzh2vvnj7wbjl6xnakhcchcfqr4zjqd"; depends=[]; };
+  ungeneanno = derive2 { name="ungeneanno"; version="0.1.6"; sha256="0fm47vmzn4z73pn37p94r84lbkg5amk0sl78304ibwz0rhlda0y5"; depends=[httr XML]; };
   uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
-  uniReg = derive2 { name="uniReg"; version="1.0"; sha256="1xl19dqnxxibgiiny9ysll2z8j1i70qrszf4xbacq1a6z31vm840"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
-  uniah = derive2 { name="uniah"; version="0.4"; sha256="1ryfqkry06xhvjls6hrnggd43x4kbah38xxgrb7bjcwl1r25y2n0"; depends=[ahaz Iso survival]; };
+  uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; };
+  uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; };
   uniftest = derive2 { name="uniftest"; version="1.1"; sha256="0a37m7l3lc6rznx10w9h9krnn5paim2i2wvw47ckwag7bv0d4pm4"; depends=[orthopolynom]; };
   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]; };
   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]; };
+  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]; };
+  unvotes = derive2 { name="unvotes"; version="0.1.0"; sha256="128jp2iin0xb7xr21s4sd6yprgzc0qssjbhz3vcslbwfl3jp2ch0"; depends=[]; };
   upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
   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]; };
-  urca = derive2 { name="urca"; version="1.2-9"; sha256="0x4mrqqr3hfgf3vy60wz4dngy188di8xccryhck9jqjryzj35i6g"; depends=[nlme]; };
-  urltools = derive2 { name="urltools"; version="1.3.2"; sha256="0kzjvvllzp51jnvxh70hilh843shi73jxjq2cg8sq6zbp22wv75q"; depends=[Rcpp]; };
-  uroot = derive2 { name="uroot"; version="2.0-5"; sha256="1402s52924vas3h37sb6q3qqff9kk79ynq6s3hgz200klxlbvyxk"; depends=[]; };
+  uqr = derive2 { name="uqr"; version="0.2.0"; sha256="03v12w1ssfpp3h2aja4wlv6f2x1rplpm3dpmrq78bpyanban2gwf"; 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.0"; sha256="0k701namh9svdb9ag33vr44af9g07nnd8mqrcd8zm512a6clmyx9"; depends=[dplyr ggplot2 magrittr plyr scales]; };
-  userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.4-1"; sha256="1nfj7rydrjwpxvqxxa4996957r2d618h49jy6554f2k3ih0bryaj"; depends=[car fBasics foreign GGally ggplot2 GPArotation gridExtra knitr lavaan MASS MBESS mosaic plyr psych pwr SCRT SuppDists xtable]; };
-  uskewFactors = derive2 { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
-  usl = derive2 { name="usl"; version="1.5.0"; sha256="09gv2r44nnyvf2pvdqmk7whqvivvs67w5lk8kw72zb8y6gsjag57"; depends=[nlmrt]; };
+  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]; };
+  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]; };
-  utility = derive2 { name="utility"; version="1.3"; sha256="0ng7jc45k9rgj9055ndmgl308zjvxd2cjsk2pn57x44rl1lldcj5"; depends=[]; };
+  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]; };
   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]; };
-  validate = derive2 { name="validate"; version="0.1.3"; sha256="1bnxqi9af807g8y81sdgag27c206kgl1f3kmsbdaxigch61472sw"; depends=[settings yaml]; };
+  vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
+  vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; };
+  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]; };
   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]; };
+  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]; };
-  varbvs = derive2 { name="varbvs"; version="1.0"; sha256="0ywgb6ibijffjjzqqb5lvh1lk5qznwwiq7kbsyzkwcxbp8xkabjw"; depends=[]; };
+  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]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  varhandle = derive2 { name="varhandle"; version="1.0.0"; sha256="1bpnzgx7gz95pgn13w7z5gq2lyhm549mc5697kx0625hpk13gddj"; depends=[]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.8.4"; sha256="1w2l3pz4qwsx376wd4vzkfs1xajsy10fkkhmn7gmvrvi899afmh3"; 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]; };
   vars = derive2 { name="vars"; version="1.5-2"; sha256="1q45z5b07ww4nafrvjl48z0w1zpck3cd8fssgwgh4pw84id3dyjh"; depends=[lmtest MASS sandwich strucchange urca]; };
-  vartors = derive2 { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyynh3dr7msxn5rr5jmw6ql86ppd5w3da0rl"; depends=[]; };
   vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
   vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
-  vcd = derive2 { name="vcd"; version="1.4-1"; sha256="1529q8gysqzpgphsnqdwqqr630i4k1kr0zdbmxqq5wpy5r97fk5g"; depends=[colorspace lmtest MASS]; };
+  vcd = derive2 { name="vcd"; version="1.4-3"; sha256="05azric2w8mrsdk7y0484cjygcgcmbp96q2v500wvn91fj98kkhp"; depends=[colorspace lmtest MASS]; };
   vcdExtra = derive2 { name="vcdExtra"; version="0.7-0"; sha256="0ggkv0khn9h6b787dnmkk38fkxgp84k4nn1c3gm12i7n47r58ygr"; depends=[ca gnm MASS vcd]; };
-  vcfR = derive2 { name="vcfR"; version="1.0.0"; sha256="0dlypblqa966lgcib3w6sw357w1mdq3nlp9f0c6846alh952j4v4"; depends=[ape memuse Rcpp]; };
-  vcrpart = derive2 { name="vcrpart"; version="0.4-1"; sha256="1wrbjxh4kvz6yll9d002y3vpz9p8fa1lmqqvyz3w2nnwq4s9r4hc"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
-  vdg = derive2 { name="vdg"; version="1.1.3"; sha256="07lk6q0iqszwcxzbkkyk9ywcs4lxi14w6j3crgd0xvr5x6kh3qcz"; depends=[ggplot2 gridExtra proxy quantreg]; };
-  vdmR = derive2 { name="vdmR"; version="0.2.2"; sha256="1z7m7myv6wpmd8i7v5b1r7n4zmjawbj5i5r27jiqw9id33xn1qpi"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook]; };
+  vcfR = derive2 { name="vcfR"; version="1.4.0"; sha256="18mgkk8msysb1xahcyp9slj7lvr3xaiwchr8y6sxrvmn1a940wvf"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tidyr vegan viridisLite]; };
+  vcrpart = derive2 { name="vcrpart"; version="0.4-2"; sha256="16ai6x9x068s91013k980svarpkr310a4mihmcl00mx7bf5lsww3"; depends=[nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
+  vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; };
+  vdiffr = derive2 { name="vdiffr"; version="0.1.1"; sha256="1aqmawwhz67j7rzrd6cabxvma532mndk3iy3wq2xdm9liwpn9yq4"; depends=[devtools fontquiver gdtools htmlwidgets purrr R6 Rcpp shiny svglite testthat xml2]; };
+  vdmR = derive2 { name="vdmR"; version="0.2.3"; sha256="1bvll48lc609zdq0y1d2s95ihzj9a14wkg67i4h87d4akd280k6z"; depends=[broom dplyr GGally ggplot2 gridSVG maptools plyr rjson Rook sp]; };
   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.3-4"; sha256="1nggyj8nmm9vf3cj4ldyjand5qmpqbkqypwdrk00lrr18ilfpvxr"; depends=[cluster lattice MASS mgcv permute]; };
-  vegan3d = derive2 { name="vegan3d"; version="1.0-0"; sha256="0g9plc9ba51qva5vaa82xkn0izrha44pvsvkh2ppcwgqyaiv9xsd"; depends=[rgl scatterplot3d vegan]; };
-  vegclust = derive2 { name="vegclust"; version="1.6.3"; sha256="0l6j4sgzfqvcypx2dszpnsd1sivk33pixlgf9abqifp45skpkwfg"; depends=[sp vegan]; };
-  vegdata = derive2 { name="vegdata"; version="0.8.9"; sha256="1hv8l2ynzxmpjq438zqhk59sgiwkvgvqdgp7z0dpx24x6q5rzw6s"; depends=[foreign httr jsonlite XML]; };
+  vegan = derive2 { name="vegan"; version="2.4-2"; sha256="12wf64izrpq9z3ix7mgm5421mq0xsm8dw5qblvcrz452nfhjf5w9"; 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]; };
   vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; };
-  venn = derive2 { name="venn"; version="1.1"; sha256="0anpzavc1pppxb95186v7plr3skv2achhpkc1yav2nx0jhsd5i9h"; depends=[]; };
+  velociraptr = derive2 { name="velociraptr"; version="1.0"; sha256="1n7q08i37qbbh5cjq6jb4gmpzzip3wx2wx8xx5wpkln8n3nyiqki"; depends=[RCurl rgdal]; };
+  velox = derive2 { name="velox"; version="0.1.0"; sha256="0jiza6myx4fj26agzbqjllr34f5kpmgcidrrv1r8jasljsbqf0n1"; depends=[raster Rcpp rgdal rgeos sp]; };
+  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]; };
   verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
-  versions = derive2 { name="versions"; version="0.2"; sha256="0kfbsl2wzwaw7v3vd407zaahkslpm51mp68w87m72nvsqlbhiixw"; depends=[]; };
+  versions = derive2 { name="versions"; version="0.3"; sha256="0zm49j785dgv7fyr1yl9q5f0dsk8hhpim5q5bpkgrkzv7pwjribd"; depends=[]; };
   vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; };
   vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
-  vines = derive2 { name="vines"; version="1.1.4"; sha256="18nsxbi8s325l1bbhqn1y5nx1zdbbfwdlb6bv1xxnc1504sf5xz2"; depends=[ADGofTest copula cubature TSP]; };
+  vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
+  vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
+  vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; };
   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.3.2"; sha256="12c4f2f5h6na24dra4sj3p8jssswnx6mx60a9ir8mh584npqjhmp"; 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=[]; };
-  virtualspecies = derive2 { name="virtualspecies"; version="1.1"; sha256="0znrb6xqyzddd1r999rhx6ix6wgpj1laf5bcns7zgmq6zb39j74s"; depends=[ade4 dismo raster rworldmap]; };
-  visNetwork = derive2 { name="visNetwork"; version="0.2.1"; sha256="1jyxkl0d1r7iqw180xb82nykix4w035pxgbvvvl3x5d0bg1892p6"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
-  visreg = derive2 { name="visreg"; version="2.2-2"; sha256="04i7908cqjwqlcggp5fv6w21kp4bhkn0ggy0qw3ff7pfs6dz66x4"; depends=[lattice]; };
+  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]; };
+  visreg = derive2 { name="visreg"; version="2.3-0"; sha256="05vs3zs8dpdqgk004lc2dnhqjgbfjh1ak17y5c8gni6wkp27hl7y"; depends=[lattice]; };
+  vistime = derive2 { name="vistime"; version="0.3.0"; sha256="07vri3n3wkcng793hcy414x0n2hhjwak98ra9sxh36p969m26h1q"; depends=[plotly RColorBrewer]; };
   visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; };
   visualize = derive2 { name="visualize"; version="4.2"; sha256="1jgk7j0f3p72wbqnmplrgpy7hlh7k2cmvx83gr2zfnbhygdi22mk"; depends=[]; };
   vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; };
   vitality = derive2 { name="vitality"; version="1.2"; sha256="0vjbf39i7qm3857gyidg2j5hfimpydav1sx2d07n12b8q1cs8k4p"; depends=[]; };
-  vmsbase = derive2 { name="vmsbase"; version="2.1"; sha256="0fz4hv08w7bpg906624d5gasd6cnqdsx9pp4194xqvsiygzl4zc4"; 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]; };
+  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]; };
+  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=[]; };
-  vows = derive2 { name="vows"; version="0.4"; sha256="0cc0znrnzhfgp47dsyncjh7b072mbwk568n2pshxwdfxzh3kj65q"; depends=[fda gamm4 mgcv oro_nifti RLRsim rpanel shape stringr]; };
+  vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; };
+  voxel = derive2 { name="voxel"; version="1.2.1"; sha256="00r8diza4frwhizsjg5hfmdkikrbcg598sp09m81vg92nmjni41g"; depends=[gamm4 ggplot2 lmerTest mgcv oro_nifti]; };
   vqtl = derive2 { name="vqtl"; version="1.0"; sha256="0zlli79rhcbbjkkf4kjjkscx7vk6kspma5qgywxdiyhkxiq8j2x5"; depends=[dglm dplyr evd gtools plyr qtl RColorBrewer scales stringr]; };
   vrcp = derive2 { name="vrcp"; version="0.1.1"; sha256="1wrch1dqy752gkj24h1dgi2x3kf1797xj4pf1s9mszf3x3ic905d"; depends=[ggplot2]; };
   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.22"; sha256="0wgr7k025iylvv3l4pdwsqrblqimmgf5m7lmmb2ns0lg9m62anrp"; depends=[]; };
+  vtreat = derive2 { name="vtreat"; version="0.5.30"; sha256="1i61sv47y3g9hs9bkx9wcirapy30hs66013w5k7116wqsp0dy3b2"; 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]; };
+  wCorr = derive2 { name="wCorr"; version="1.8.0"; sha256="0s4nlkjqn85mhxynyk5k1l8yb80af728drq2v4yk0dn7v36a5mzx"; depends=[doBy minqa mnormt Rcpp RcppArmadillo]; };
   wPerm = derive2 { name="wPerm"; version="1.0.1"; sha256="0f3v0kba87wkwyii0pzvs6a8ja897aifpvwkvryl2hzxxxaml7z4"; depends=[]; };
   wSVM = derive2 { name="wSVM"; version="0.1-7"; sha256="0c7rblzgagwfb8mmddkc0nd0f9rv6kapw8znpwapv3fv0j2qzq7h"; depends=[MASS quadprog]; };
   waffect = derive2 { name="waffect"; version="1.2"; sha256="0r5dvm0ggyxyv81hxdr1an658wkqkhqq2xaqzqpnh4sh4wbak35a"; depends=[Rcpp]; };
-  waffle = derive2 { name="waffle"; version="0.5.0"; sha256="0f5gw487vjpaa9rl6x9p1qxvp9rn4s8p4x58y5azalya6v4hyw6y"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
+  waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
-  wakefield = derive2 { name="wakefield"; version="0.2.1"; sha256="08277iwxgykxbcp1c7ys03vm0amfba7pki0ss69zl0ljv92bgsj9"; depends=[chron dplyr ggplot2 stringi]; };
-  walkr = derive2 { name="walkr"; version="0.3.3"; sha256="0gyfhpar667ni5g8g0fwq4zgia3xkf5k9knhgvycq8jf554yxyl6"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
+  wakefield = derive2 { name="wakefield"; version="0.3.0"; sha256="1f74503ar4hw48j13npgzybvwc631xndldidqnyfk72wb11fzi4z"; depends=[chron dplyr ggplot2 stringi]; };
   walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; };
-  warbleR = derive2 { name="warbleR"; version="1.1.0"; sha256="1zzv9s6i1884j2iybn5bwlyrnzw4ry1s9mvcpq10608nv6bg68pb"; depends=[fftw maps pbapply RCurl rjson seewave tuneR]; };
+  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]; };
+  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.3"; sha256="1f75564l6ai69541rcdmbhq7zp1fnprif09k7fvbzapi7hy4aia3"; depends=[raster rgdal sp]; };
-  waterData = derive2 { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
+  water = derive2 { name="water"; version="0.5"; sha256="0g7h1xgij107l5n3551m3ql5m3hn79a7ajv6grk05xf507fy1bb3"; 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]; };
   waveband = derive2 { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
   waved = derive2 { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
   wavelets = derive2 { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; };
   wavemulcor = derive2 { name="wavemulcor"; version="1.2"; sha256="1039y5rakjkx2mvfmykg2z4jpkpbcj7rclyg7ab19wnxmdm8ls81"; depends=[waveslim]; };
+  waver = derive2 { name="waver"; version="0.2.0"; sha256="0zxhnrxc68i5jvkc0k2gk11wf0hj92slhb40qiddryx3i7m2yrli"; depends=[geosphere rgdal rgeos sp]; };
   waveslim = derive2 { name="waveslim"; version="1.7.5"; sha256="0lqslkihgrd7rbihqhhk57m9vkbnfsznkvk8430cvbcsn7vridii"; depends=[]; };
-  wavethresh = derive2 { name="wavethresh"; version="4.6.6"; sha256="1ykhfw1bdibvq2b3rrgqszvwqmzkd3fgxqg7p36ms1cxph68g2r9"; depends=[MASS]; };
+  wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; };
   wbs = derive2 { name="wbs"; version="1.3"; sha256="1fdf3dj23n63nfnzafq88sxqvi15cbrzsvc8wrljw1raq5z012yv"; depends=[]; };
+  wbstats = derive2 { name="wbstats"; version="0.1.1"; sha256="18yws6zgvs773mhml5hn6aqyc2xyas10cg5jvnk4l50wir2qknxq"; depends=[httr jsonlite]; };
   wbsts = derive2 { name="wbsts"; version="0.3"; sha256="1h749j20q30lrn3b4ffcap3mvxjpih1gchvv8yag0gbzcs0wc1fm"; depends=[mvtnorm wmtsa]; };
   wccsom = derive2 { name="wccsom"; version="1.2.11"; sha256="0f2p7sllp3916lcf02k179pnl17fdmk8s7bjnkwb93kh513rs1yj"; depends=[class kohonen MASS]; };
+  wdman = derive2 { name="wdman"; version="0.2.2"; sha256="1a6zav82w0krk0ncm5b79ahy2hc0xakg9i1m2143ih5p6zvcm5m0"; depends=[assertthat binman semver subprocess yaml]; };
   weatherData = derive2 { name="weatherData"; version="0.4.1"; sha256="19ynb9w52ay15awaf4bqm9lj2w6pk70lyaipn46jrspwxqsvfhlc"; depends=[plyr]; };
-  weathermetrics = derive2 { name="weathermetrics"; version="1.2.0"; sha256="1zhcgpr9r5bhg88mk13k5bskm2q4kw88dh3gphlha5j6yf2zsq6r"; depends=[]; };
+  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.0.0"; sha256="04w827a3n91avqvnh28dmi5p13ijnmr43qx13p2z1zkr3ashqrnm"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
+  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=[]; };
   webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; };
-  webshot = derive2 { name="webshot"; version="0.3"; sha256="12gp81kr96hal8wqh6afc01g9sk36m18j00c093z15sxhgd4wgkn"; depends=[magrittr]; };
+  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]; };
   webutils = derive2 { name="webutils"; version="0.4"; sha256="1y8xs2kyf8g4mqpxp0kwb47cidmaqs4n3ysiy7p4s35imhzi16dc"; depends=[jsonlite]; };
   webvis = derive2 { name="webvis"; version="0.0.2"; sha256="1cdn9jrpg2sbx4dsj0xf7m0daqr7fqiw3xy1lg0i0qn9cpvi348f"; depends=[]; };
-  wec = derive2 { name="wec"; version="0.1"; sha256="0mg310v066k52g3isxmsgda44sys4pdl9365470z61c7dz2smy5q"; depends=[]; };
+  wec = derive2 { name="wec"; version="0.4"; sha256="05mqz7784x0vl6yj79a0ii9l7jzn2s321dk0mrzq766an1s7w7hc"; depends=[dplyr]; };
+  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=[]; };
   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]; };
   wesanderson = derive2 { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; };
   wfe = derive2 { name="wfe"; version="1.3"; sha256="16b39i60x10kw6yz44ff19h638s9lsgnz8azc76zl9b8s64jliya"; depends=[arm MASS Matrix]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
-  wgaim = derive2 { name="wgaim"; version="1.4-10"; sha256="0wf6j7f7hn2cnsb9yi28rjl7sa60zjggg62i00039b7gxcznxj1r"; depends=[lattice qtl]; };
+  wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; };
+  wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; };
   wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
   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.1"; sha256="0f4szsb30hzihwc5p48f3pi5lvdbchbkynj49drjcdhzds5hwma7"; depends=[httr]; };
+  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]; };
   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]; };
   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]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr 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]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
-  withr = derive2 { name="withr"; version="1.0.1"; sha256="0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"; depends=[]; };
-  wkb = derive2 { name="wkb"; version="0.2-0"; sha256="04mljw7mw6cgmvzhcqw15pmqbmm61w8ylgh9f4r4k23c4qcpbmjl"; depends=[sp]; };
+  wiqid = derive2 { name="wiqid"; version="0.1.0"; sha256="0vnwalknb2w6fhgbm3iqvniajy31if0rilzd16sms0qr3i1wk7xj"; depends=[coda HDInterval MASS truncnorm]; };
+  withr = derive2 { name="withr"; version="1.0.2"; sha256="042z8nmqqilgrvhmbqrjc05qys3gzwq1rqy2wxp2bi5d41859493"; depends=[]; };
+  wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; };
   wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; };
   wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
-  wmtsa = derive2 { name="wmtsa"; version="2.0-0"; sha256="0y2bv166xwwpb1wf6897qybyf84f34qjsmygdbv90r637c050yk5"; depends=[ifultools MASS splus2R]; };
-  wnominate = derive2 { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f93p4ff7l1hvcdr7m3hrv4bzmm9nd8iy8mk1"; depends=[pscl]; };
+  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=[]; };
-  wordbankr = derive2 { name="wordbankr"; version="0.1"; sha256="0r2wv2vpf4xpalhpnfkyg4qznd83m8nz105xiq5dhwfx78wzvsyr"; depends=[assertthat dplyr magrittr RMySQL stringr tidyr]; };
+  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]; };
+  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]; };
   wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
   wordnet = derive2 { name="wordnet"; version="0.1-11"; sha256="0c04wda7im5jzvsb3bhql2krlpvbsv7cc5gdw3dshfqz33knyy9i"; depends=[rJava]; };
+  wordspace = derive2 { name="wordspace"; version="0.2-0"; sha256="0rrnbimf68ax1qxsyn7g0kd76abijzxg5i11h93l0fnzi2g2a9xn"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; };
+  worldmet = derive2 { name="worldmet"; version="0.7.5"; sha256="08mj3m0r9rnljlsk3x25cp4da3bdv9qc1jgy1wrd1zg5908j6dis"; depends=[dplyr leaflet openair plyr RCurl readr zoo]; };
+  worrms = derive2 { name="worrms"; version="0.1.0"; sha256="0wxdn960gqqbilg2xs9jjks8z1j6rslb8qwj1s9678hw3h8ymfgx"; depends=[crul jsonlite tibble]; };
   wpp2008 = derive2 { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
   wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
   wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
-  wpp2015 = derive2 { name="wpp2015"; version="1.0-1"; sha256="1vm194b4zccg9sldsmjaf5a95zr5lrdbbg1iwby5a6w06v7g5762"; depends=[]; };
-  wppExplorer = derive2 { name="wppExplorer"; version="1.7-1"; sha256="1scxvx0kl1s9yhwrynd65c73b6q3lrz9n26kxcw2zwfzb0c5i1j7"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny wpp2015]; };
-  wq = derive2 { name="wq"; version="0.4.6"; sha256="1j5ghd40dzai647v44kxinqc5wx7bsc93sgxd9f3hb6h4ggfj1ka"; depends=[ggplot2 knitr reshape2 zoo]; };
+  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]; };
-  wrassp = derive2 { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
+  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=[]; };
+  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.0-2"; sha256="0k8dsih952jkigl1b0f1gbc475jm9926k4gx8sjnx433asda1maa"; depends=[devtools]; };
+  wru = derive2 { name="wru"; version="0.1-1"; sha256="103i3a741ik61jzp5zbhf0f6lfchlafq1gyjyy98jgw0cxc6ckcv"; depends=[devtools]; };
   wskm = derive2 { name="wskm"; version="1.4.28"; sha256="0d9hcriakg6fxzc8wjsahc4zkyjza31mb9dv2h4xcf8298xa96i4"; depends=[clv lattice latticeExtra]; };
-  wsrf = derive2 { name="wsrf"; version="1.5.29"; sha256="1lp1yv5p2c0yq8znwzwj76gri02ip3zh0vzidlzi2fz4vh3z5ck3"; depends=[Rcpp]; };
+  wsrf = derive2 { name="wsrf"; version="1.7.0"; sha256="1q4slnwn690z6ham0b2vy1rc0vkbrlj9bf0wkd6v86jag7wjr4fw"; depends=[Rcpp]; };
   wtcrsk = derive2 { name="wtcrsk"; version="1.6"; sha256="048gs469rdj85sid1gfj6yhh37w7zf9xv4fj8pd48c8ww3v7f61p"; depends=[]; };
-  wux = derive2 { name="wux"; version="2.2-0"; sha256="1sfx1mh4pb5xxkij5738r69cr8h32h1g6004k3s5lk6s8s0rs349"; depends=[abind class corpcor fields gdata Hmisc ncdf4 reshape rgdal rgeos rworldmap sp stringr]; };
-  x_ent = derive2 { name="x.ent"; version="1.1.2"; sha256="0wbbhsnlm5yln72h648nz3y5w83kq9qvpw0pk56lsc1bafps712p"; depends=[ggplot2 jsonlite opencpu rJava statmod stringr venneuler xtable]; };
+  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=[]; };
+  x_ent = derive2 { name="x.ent"; version="1.1.6"; sha256="1b4skjai9rivkb86md4k8qmwqbqy8adq9c31d1jq8x04dsm3z0j7"; depends=[ggplot2 jsonlite opencpu rJava statmod stringr venneuler xtable]; };
   x12 = derive2 { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; };
   x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
   x13binary = derive2 { name="x13binary"; version="0.1.2"; sha256="1cvbqbg9bck9dlsj929wysg8frkc70p0hwpwy1rj4qwyw8czi4bs"; depends=[]; };
-  xVA = derive2 { name="xVA"; version="0.8"; sha256="05hw886pdi0gqvv3x3nn4a757nfc6cc6p3z8p4lp5f72ynbrlia8"; depends=[SACCR]; };
-  xergm = derive2 { name="xergm"; version="1.7.0"; sha256="04ng0mdlzc182ijn0c7ln7zscm9w4631vhzqzhfayjf3ik264nns"; depends=[btergm rem tnam xergm_common]; };
-  xergm_common = derive2 { name="xergm.common"; version="1.7.1"; sha256="0l8jjz883358w704lw7rrr1z8pxk5fj78rgamsh942d0m9yp4lls"; depends=[ergm network]; };
-  xgboost = derive2 { name="xgboost"; version="0.4-3"; sha256="1gq8h03hpvm2w7ninb4qpbyl9h1gvwjzcz9jnnwi0dnqknm5b26q"; depends=[data_table magrittr Matrix stringr]; };
+  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]; };
+  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]; };
   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]; };
-  xmeta = derive2 { name="xmeta"; version="1.0-2"; sha256="0b6swqlhiyhkwh5d0rvn1r9bslhnxx34yfw37l1m0bx9cndcalkz"; depends=[aod glmmML metafor mvmeta numDeriv]; };
-  xml2 = derive2 { name="xml2"; version="0.1.2"; sha256="0jjilz36h7vbdbkpvjnja1vgjf6d1imql3z4glqn2m2b74w5qm4c"; depends=[BH Rcpp]; };
+  xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; };
+  xmeta = derive2 { name="xmeta"; version="1.1-3"; sha256="18m28zf4rg0czxagqp2f0c36qkan7s17414vkrknc6s1xja44gaq"; depends=[aod glmmML metafor mvmeta numDeriv]; };
+  xml2 = derive2 { name="xml2"; version="1.1.1"; sha256="05iifrcgzx53w5ciw8bbm4vdwc3giv4xsvazv8chqxkndfvf7wq0"; depends=[BH Rcpp]; };
+  xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.1"; sha256="0q9d4l3p4ypc0qswnjwrd3as9bx9f1niixsc19y1msva51sg5h39"; depends=[]; };
   xoi = derive2 { name="xoi"; version="0.66-9"; sha256="1kd9s9afq5shsaqhrxai9yz60a9imyy5np76fjpkjgyz56kbk6nr"; depends=[qtl]; };
   xpose4 = derive2 { name="xpose4"; version="4.5.3"; sha256="02m3ad4287ljsi4qrzwd84lfj1y6rz9nias2zk4cbqm14gf19pdf"; depends=[gam Hmisc lattice survival]; };
   xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; };
+  xslt = derive2 { name="xslt"; version="1.0"; sha256="0qsllagbib1a5ahxsk4s1fib4lyw45axi2c2d187mnpzpsy3pzfn"; depends=[Rcpp xml2]; };
   xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; };
   xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
   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]; };
+  xyloplot = derive2 { name="xyloplot"; version="1.3"; sha256="1pgxsmghpy9am1smdfc0d8hi2l9gb15ssfpf4z84cc2chhaghc7w"; depends=[]; };
+  xyz = derive2 { name="xyz"; version="0.1"; sha256="0hynmrbi1f0ijv2g0va8bnr84ls2d8prl32f76mmfq6a3laqrj9i"; 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.13"; sha256="18kz5mfn7qpif5pn91w4vbrc5bkycsj85vwm5wxwzjlb02i9mxi6"; depends=[]; };
+  yaml = derive2 { name="yaml"; version="2.1.14"; sha256="0x88xicrf7vwp77xgan27mnpdljhpkn0pz5kphnwqi3ddy25k9a1"; depends=[]; };
+  yarrr = derive2 { name="yarrr"; version="0.1.4"; sha256="171z69jgva1afzmcjk62g9mr18z9r955rizvsp46bcljj74vfq39"; depends=[BayesFactor 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]; };
-  yhatr = derive2 { name="yhatr"; version="0.13.10"; sha256="1hlab1x44xld634ha36y66znfpl3a8v77281c07i954d9sqm893p"; depends=[httr jsonlite rjson stringr]; };
+  yhatr = derive2 { name="yhatr"; version="0.15.0"; sha256="0irgc26ds8fs8lwgghkhzrvx9drx338vxsphwia4wspd2i0yyzsk"; depends=[httr jsonlite stringr]; };
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
-  yuima = derive2 { name="yuima"; version="1.0.81"; sha256="171ma8j8x7adwfiixihjp6bwg7w5xij38fvmkazsxd39aw7gkz7z"; depends=[cubature expm mvtnorm zoo]; };
+  yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
+  yuima = derive2 { name="yuima"; version="1.5.9"; sha256="04s96zkyccb2nkgzh07jxa8lpyrvzigyiynis2ifiql12yw5c960"; depends=[cubature expm mvtnorm Rcpp zoo]; };
+  yuimaGUI = derive2 { name="yuimaGUI"; version="1.0.0"; sha256="12mr9icngrrghn0j1dpyx2njr7sn9zc5nm3imrqq3qxz7wv45fg8"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
-  zCompositions = derive2 { name="zCompositions"; version="1.0.3"; sha256="0lxy201ys9dvv8c09q8wbks1c2jkjyd1bbrxhjr7zi9j7m0parl7"; depends=[MASS NADA truncnorm]; };
+  zCompositions = derive2 { name="zCompositions"; version="1.0.3-1"; sha256="1408bb5nfipsxskgpjzixnxndg7hf48nq27k0pwrcxx16wykmlcy"; depends=[MASS NADA truncnorm]; };
+  zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; };
+  zeallot = derive2 { name="zeallot"; version="0.0.2"; sha256="0rksacqasiq9xxxmkdqi5c844xhbnda6f6hr8mz37vg9zxqzfbdj"; depends=[]; };
+  zebu = derive2 { name="zebu"; version="0.1.0"; sha256="1s9lm90yhyhflikvrwpbx94gysc7wazpi4v3vh3fibiyna0a9sgj"; depends=[ggplot2 pbapply plyr reshape2]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
-  zetadiv = derive2 { name="zetadiv"; version="0.1"; sha256="1p9mxy70mgqxjn7szh44217nvhjh90237kp5znli1r01ch64mx6b"; depends=[car mgcv vegan]; };
+  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]; };
   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=[]; };
-  zoib = derive2 { name="zoib"; version="1.3.3"; sha256="0j183jyx9qirdyg03rpv6q30rxbb68cs6g2qpi53arpfk2v9f445"; depends=[abind coda Formula matrixcalc rjags]; };
-  zoo = derive2 { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; };
+  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]; };
   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]; };
   zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
-  zoon = derive2 { name="zoon"; version="0.4.23"; sha256="0y8jmlqfdnf5j7dzcz2y4dspxlzl6nvsa9ly97myg461ypicm8sc"; depends=[dismo raster RCurl rfigshare]; };
+  zoon = derive2 { name="zoon"; version="0.6"; sha256="0dyl8fnzjncxb9q322xsdmvbm0wwzl1w9750vmvndpd8c05qi1n0"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 SDMTools sp testthat]; };
   ztable = derive2 { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };
+  ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; };
   zyp = derive2 { name="zyp"; version="0.10-1"; sha256="0f1fqqxysf3psnvn08s5qly2c958h1hhznjjj8mvpjr5g6hqlr1k"; depends=[Kendall]; };
 }
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 49273e34c7e8..494cffb86f7d 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -245,7 +245,6 @@ let
     BiocCheck = [ pkgs.which ];
     Biostrings = [ pkgs.zlib ];
     bnpmr = [ pkgs.gsl_1 ];
-    BNSP = [ pkgs.gsl_1 ];
     cairoDevice = [ pkgs.gtk2.dev ];
     Cairo = [ pkgs.libtiff pkgs.libjpeg pkgs.cairo.dev pkgs.x11 pkgs.fontconfig.lib ];
     Cardinal = [ pkgs.which ];
@@ -642,7 +641,6 @@ let
     "rsgcc"
     "RSurvey"
     "RunuranGUI"
-    "sdcMicroGUI"
     "sharpshootR"
     "simba"
     "Simile"
@@ -766,7 +764,6 @@ let
     "Metab" # broken build
     "Crossover" # broken build
     "CardinalWorkflows" # broken build
-    "spoccutils" # depends on broken package spocc
     "mapr" # depends on broken package spocc
     "vmsbase" # broken build
     "vcfR" # broken build
@@ -833,7 +830,6 @@ let
     "SQDA" # depends on broken package limma
     "ADaCGH2" # depends on broken package limma
     "snapCGH" # depends on broken package limma
-    "Shrinkage" # depends on broken package limma
     "SafeQuant" # depends on broken package limma
     "RTopper" # depends on broken package limma
     "RTCGAToolbox" # depends on broken package limma
@@ -875,7 +871,6 @@ let
     "stepNorm" # depends on broken package limma
     "RBM" # depends on broken package limma
     "saps" # depends on broken package limma
-    "PharmacoGx" # depends on broken package limma
     "piano" # depends on broken package limma
     "OLINgui" # depends on broken package limma
     "OLIN" # depends on broken package limma
@@ -993,7 +988,6 @@ let
     "clippda" # depends on broken package limma
     "REDseq" # depends on broken package limma
     "GUIDEseq" # depends on broken package limma
-    "ggtut" # depends on broken package limma
     "FunciSNP" # depends on broken package limma
     "ChIPpeakAnno" # depends on broken package limma
     "ChIPComp" # depends on broken package limma
@@ -1161,7 +1155,6 @@ let
     "tadaatoolbox" # depends on broken package car
     "lavaan_shiny" # depends on broken package car
     "RcmdrPlugin_GWRM" # depends on broken package car
-    "TextoMineR" # depends on broken package car
     "pcaBootPlot" # depends on broken package car
     "ClustGeo" # depends on broken package car
     "preproviz" # depends on broken package car
@@ -1278,7 +1271,6 @@ let
     "daff" # depends on broken package V8
     "dagbag" # build is broken
     "DAMisc" # depends on broken package nlopt
-    "datafsm" # depends on broken package caret
     "dbConnect" # broken build
     "DBKGrad" # depends on broken package rpanel
     #"dcmle" # broken build
@@ -1367,7 +1359,6 @@ let
     "gmatrix" # depends on broken package cudatoolkit
     "gMCP" # build is broken
     "gmum_r" # broken build
-    "Goslate" # depends on broken package PythonInR
     "GPC" # broken build
     "gplm" # depends on broken package nlopt
     "gpuR" # depends on GPU-specific header files
@@ -1687,7 +1678,6 @@ let
     "sampleSelection" # depends on broken package nlopt
     "sapFinder" # depends on broken package rTANDEM
     "sdcMicro" # depends on broken package nlopt
-    "sdcMicroGUI" # depends on broken package nlopt
     "SDD" # depends on broken package rpanel
     "seeg" # depends on broken package nlopt
     "Sejong" # broken build
@@ -1723,7 +1713,6 @@ let
     "specmine" # depends on broken package caret
     "splm" # depends on broken package car
     "spocc" # depends on broken package V8
-    "spoccutils" # depends on broken spocc
     "ssmrob" # depends on broken package nlopt
     "StatMethRank" # broken build
     "stepp" # depends on broken package nlopt
@@ -1734,7 +1723,6 @@ let
     "systemfit" # depends on broken package nlopt
     "TcGSA" # depends on broken package nlopt
     "TDMR" # depends on broken package nlopt
-    "TextoMineR"  # depends on broken package FactoMineR
     "TFBSTools" # depends on broken package DirichletMultinomial
     "tigerstats" # depends on broken package nlopt
     "TLBC" # depends on broken package caret
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index 4d6a69b27aa0..9aec419c0f8d 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -4,7 +4,7 @@ library(parallel)
 cl <- makeCluster(10)
 
 rVersion <- paste(R.Version()$major, strsplit(R.Version()$minor, ".", fixed=TRUE)[[1]][1], sep=".")
-snapshotDate <- Sys.Date()
+snapshotDate <- Sys.Date()-1
 
 mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/bioc/src/contrib/")
                   , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/annotation/src/contrib/")
@@ -45,16 +45,20 @@ nixPrefetch <- function(name, version) {
 }
 
 formatPackage <- function(name, version, sha256, depends, imports, linkingTo) {
+    name <- ifelse(name == "import", "r_import", name)
     attr <- gsub(".", "_", name, fixed=TRUE)
+    options(warn=5)
     depends <- paste( if (is.na(depends)) "" else gsub("[ \t\n]+", "", depends)
                     , if (is.na(imports)) "" else gsub("[ \t\n]+", "", imports)
                     , if (is.na(linkingTo)) "" else gsub("[ \t\n]+", "", linkingTo)
                     , sep=","
                     )
     depends <- unlist(strsplit(depends, split=",", fixed=TRUE))
-    depends <- sapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1")
-    depends <- sapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE)
+    depends <- lapply(depends, gsub, pattern="([^ \t\n(]+).*", replacement="\\1")
+    depends <- lapply(depends, gsub, pattern=".", replacement="_", fixed=TRUE)
     depends <- depends[depends %in% knownPackages]
+    depends <- lapply(depends, function(d) ifelse(d == "import", "r_import", d))
+    depends <- paste(depends)
     depends <- paste(sort(unique(depends)), collapse=" ")
     paste0("  ", attr, " = derive2 { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
 }

From 4c2d75f58c8e0133e8148ea1191e52f70d88dc4d Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Fri, 24 Feb 2017 15:52:10 +1100
Subject: [PATCH 0975/3449] R: unmark edgeR and limma as broken

---
 pkgs/development/r-modules/default.nix | 268 -------------------------
 1 file changed, 268 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 494cffb86f7d..24b1a8df1235 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -801,272 +801,6 @@ let
     "AnthropMMD" # depends on broken package euroMix
     "ilc" # depends on broken package demography
     "demography" # broken build
-    "webbioc" # depends on broken package limma
-    "davidTiling" # depends on broken package limma
-    "tilingArray" # depends on broken package limma
-    "NAPPA" # depends on broken package limma
-    "NanoStringNorm" # depends on broken package limma
-    "synapterdata" # depends on broken package limma
-    "synapter" # depends on broken package limma
-    "RforProteomics" # depends on broken package limma
-    "pRolocdata" # depends on broken package limma
-    "ProCoNA" # depends on broken package limma
-    "Pbase" # depends on broken package limma
-    "MSnID" # depends on broken package limma
-    "msmsEDA" # depends on broken package limma
-    "MSnbase" # depends on broken package limma
-    "staRank" # depends on broken package limma
-    "phenoDist" # depends on broken package limma
-    "imageHTS" # depends on broken package limma
-    "Mulder2012" # depends on broken package limma
-    "HTSanalyzeR" # depends on broken package limma
-    "gespeR" # depends on broken package limma
-    "cellHTS2" # depends on broken package limma
-    "affyPara" # depends on broken package limma
-    "vsn" # depends on broken package limma
-    "ttScreening" # depends on broken package limma
-    "metaX" # depends on broken package limma
-    "SSPA" # depends on broken package limma
-    "SQDA" # depends on broken package limma
-    "ADaCGH2" # depends on broken package limma
-    "snapCGH" # depends on broken package limma
-    "SafeQuant" # depends on broken package limma
-    "RTopper" # depends on broken package limma
-    "RTCGAToolbox" # depends on broken package limma
-    "RPPanalyzer" # depends on broken package limma
-    "Rnits" # depends on broken package limma
-    "RNAinteractMAPK" # depends on broken package limma
-    "RNAinteract" # depends on broken package limma
-    "SimBindProfiles" # depends on broken package limma
-    "ccTutorial" # depends on broken package limma
-    "Ringo" # depends on broken package limma
-    "rCGH" # depends on broken package limma
-    "qusage" # depends on broken package limma
-    "qpcrNorm" # depends on broken package limma
-    "prot2D" # depends on broken package limma
-    "polyester" # depends on broken package limma
-    "plmDE" # depends on broken package limma
-    "phenoTest" # depends on broken package limma
-    "RANKS" # depends on broken package limma
-    "PerfMeas" # depends on broken package limma
-    "pepStat" # depends on broken package limma
-    "PECA" # depends on broken package limma
-    "PADOG" # depends on broken package limma
-    "OGSA" # depends on broken package limma
-    "nethet" # depends on broken package limma
-    "lpNet" # depends on broken package limma
-    "nem" # depends on broken package limma
-    "monocle" # depends on broken package limma
-    "MmPalateMiRNA" # depends on broken package limma
-    "miRtest" # depends on broken package limma
-    "miRLAB" # depends on broken package limma
-    "mGSZ" # depends on broken package limma
-    "MAMA" # depends on broken package limma
-    "metaMA" # depends on broken package limma
-    "msd16s" # depends on broken package limma
-    "metagenomeSeq" # depends on broken package limma
-    "metabolomics" # depends on broken package limma
-    "maSigPro" # depends on broken package limma
-    "timecourse" # depends on broken package limma
-    "stepNorm" # depends on broken package limma
-    "RBM" # depends on broken package limma
-    "saps" # depends on broken package limma
-    "piano" # depends on broken package limma
-    "OLINgui" # depends on broken package limma
-    "OLIN" # depends on broken package limma
-    "nnNorm" # depends on broken package limma
-    "ListerEtAlBSseq" # depends on broken package limma
-    "compEpiTools" # depends on broken package limma
-    "methylPipe" # depends on broken package limma
-    "dyebiasexamples" # depends on broken package limma
-    "dyebias" # depends on broken package limma
-    "CluMix" # depends on broken package limma
-    "HCsnip" # depends on broken package limma
-    "sigaR" # depends on broken package limma
-    "plrs" # depends on broken package limma
-    "CGHregions" # depends on broken package limma
-    "QDNAseq_mm10" # depends on broken package limma
-    "QDNAseq_hg19" # depends on broken package limma
-    "QDNAseq" # depends on broken package limma
-    "GeneBreak" # depends on broken package limma
-    "focalCall" # depends on broken package limma
-    "CGHnormaliter" # depends on broken package limma
-    "CGHcall" # depends on broken package limma
-    "CGHbase" # depends on broken package limma
-    "beta7" # depends on broken package limma
-    "marray" # depends on broken package limma
-    "LVSmiRNA" # depends on broken package limma
-    "lmdme" # depends on broken package limma
-    "limmaGUI" # depends on broken package limma
-    "InPAS" # depends on broken package limma
-    "iChip" # depends on broken package limma
-    "unifiedWMWqPCR" # depends on broken package limma
-    "nondetects" # depends on broken package limma
-    "HTqPCR" # depends on broken package limma
-    "HD2013SGI" # depends on broken package limma
-    "vtpnet" # depends on broken package limma
-    "gwascat" # depends on broken package limma
-    "gQTLstats" # depends on broken package limma
-    "GOsummaries" # depends on broken package limma
-    "yri1kgv" # depends on broken package limma
-    "hmyriB36" # depends on broken package limma
-    "cheung2010" # depends on broken package limma
-    "GGtools" # depends on broken package limma
-    "GGdata" # depends on broken package limma
-    "encoDnaseI" # depends on broken package limma
-    "dsQTL" # depends on broken package limma
-    "ceuhm3" # depends on broken package limma
-    "ceu1kgv" # depends on broken package limma
-    "ceu1kg" # depends on broken package limma
-    "GGBase" # depends on broken package limma
-    "GeneSelector" # depends on broken package limma
-    "GeneSelectMMD" # depends on broken package limma
-    "gCMAPWeb" # depends on broken package limma
-    "gCMAP" # depends on broken package limma
-    "flowBin" # depends on broken package limma
-    "Fletcher2013a" # depends on broken package limma
-    "FEM" # depends on broken package limma
-    "explorase" # depends on broken package limma
-    "ExiMiR" # depends on broken package limma
-    "tweeDEseq" # depends on broken package limma
-    "tRanslatome" # depends on broken package limma
-    "ToPASeq" # depends on broken package limma
-    "timeSeq" # depends on broken package limma
-    "TCGAbiolinks" # depends on broken package limma
-    "TCC" # depends on broken package limma
-    "systemPipeR" # depends on broken package limma
-    "STATegRa" # depends on broken package limma
-    "ssizeRNA" # depends on broken package limma
-    "RUVSeq" # depends on broken package limma
-    "RnaSeqSampleSizeData" # depends on broken package limma
-    "RnaSeqSampleSize" # depends on broken package limma
-    "rnaSeqMap" # depends on broken package limma
-    "ReportingTools" # depends on broken package limma
-    "QuasiSeq" # depends on broken package limma
-    "PROPER" # depends on broken package limma
-    "myTAI" # depends on broken package limma
-    "msmsTests" # depends on broken package limma
-    "methylMnM" # depends on broken package limma
-    "metaseqR" # depends on broken package limma
-    "MEDIPS" # depends on broken package limma
-    "manta" # depends on broken package limma
-    "HTSFilter" # depends on broken package limma
-    "HTSCluster" # depends on broken package limma
-    "GSAgm" # depends on broken package limma
-    "fdrDiscreteNull" # depends on broken package limma
-    "erccdashboard" # depends on broken package limma
-    "EnrichmentBrowser" # depends on broken package limma
-    "edgeRun" # depends on broken package limma
-    "EDDA" # depends on broken package limma
-    "RnaSeqTutorial" # depends on broken package limma
-    "easyRNASeq" # depends on broken package limma
-    "DEGreport" # depends on broken package limma
-    "Imetagene" # depends on broken package limma
-    "metagene" # depends on broken package limma
-    "DBChIP" # depends on broken package limma
-    "babel" # depends on broken package limma
-    "apmsWAPP" # depends on broken package limma
-    "ampliQueso" # depends on broken package limma
-    "edgeR" # depends on broken package limma
-    "MMDiff" # depends on broken package limma
-    "ChIPQC" # depends on broken package limma
-    "DiffBind" # depends on broken package limma
-    "DCGL" # depends on broken package limma
-    "Prostar" # depends on broken package limma
-    "DAPAR" # depends on broken package limma
-    "DAAGbio" # depends on broken package limma
-    "csaw" # depends on broken package limma
-    "cp4p" # depends on broken package limma
-    "coRNAi" # depends on broken package limma
-    "Cormotif" # depends on broken package limma
-    "CORM" # depends on broken package limma
-    "TurboNorm" # depends on broken package limma
-    "maigesPack" # depends on broken package limma
-    "convert" # depends on broken package limma
-    "compcodeR" # depends on broken package limma
-    "codelink" # depends on broken package limma
-    "clippda" # depends on broken package limma
-    "REDseq" # depends on broken package limma
-    "GUIDEseq" # depends on broken package limma
-    "FunciSNP" # depends on broken package limma
-    "ChIPpeakAnno" # depends on broken package limma
-    "ChIPComp" # depends on broken package limma
-    "ChimpHumanBrainData" # depends on broken package limma
-    "charmData" # depends on broken package limma
-    "charm" # depends on broken package limma
-    "cghMCR" # depends on broken package limma
-    "CCl4" # depends on broken package limma
-    "casper" # depends on broken package limma
-    "CancerMutationAnalysis" # depends on broken package limma
-    "CALIB" # depends on broken package limma
-    "quantro" # depends on broken package limma
-    "RnBeads" # depends on broken package limma
-    "mvoutData" # depends on broken package limma
-    "MineICA" # depends on broken package limma
-    "methyAnalysis" # depends on broken package limma
-    "MAQCsubsetILM" # depends on broken package limma
-    "MAQCsubset" # depends on broken package limma
-    "lumiRatIDMapping" # depends on broken package limma
-    "lumiMouseIDMapping" # depends on broken package limma
-    "lumiHumanIDMapping" # depends on broken package limma
-    "lumiBarnes" # depends on broken package limma
-    "iCheck" # depends on broken package limma
-    "ffpeExampleData" # depends on broken package limma
-    "arrayMvout" # depends on broken package limma
-    "lumi" # depends on broken package limma
-    "ffpe" # depends on broken package limma
-    "methylumi" # depends on broken package limma
-    "shinyMethyl" # depends on broken package limma
-    "MethylAidData" # depends on broken package limma
-    "MethylAid" # depends on broken package limma
-    "IlluminaHumanMethylation450kmanifest" # depends on broken package limma
-    "skewr" # depends on broken package limma
-    "wateRmelon" # depends on broken package limma
-    "missMethyl" # depends on broken package limma
-    "minfiData" # depends on broken package limma
-    "IlluminaHumanMethylation450kanno_ilmn12_hg19" # depends on broken package limma
-    "IlluminaHumanMethylation27kmanifest" # depends on broken package limma
-    "FlowSorted_DLPFC_450k" # depends on broken package limma
-    "FlowSorted_Blood_450k" # depends on broken package limma
-    "ENmix" # depends on broken package limma
-    "ELMER" # depends on broken package limma
-    "MEAL" # depends on broken package limma
-    "DMRcate" # depends on broken package limma
-    "CopyNumber450kData" # depends on broken package limma
-    "CopyNumber450k" # depends on broken package limma
-    "conumee" # depends on broken package limma
-    "ChAMP" # depends on broken package limma
-    "minfi" # depends on broken package limma
-    "regionReport" # depends on broken package limma
-    "derfinderPlot" # depends on broken package limma
-    "derfinder" # depends on broken package limma
-    "bumphunter" # depends on broken package limma
-    "birta" # depends on broken package limma
-    "betr" # depends on broken package limma
-    "beadarrayMSV" # depends on broken package limma
-    "RobLoxBioC" # depends on broken package limma
-    "maGUI" # depends on broken package limma
-    "epigenomix" # depends on broken package limma
-    "blima" # depends on broken package limma
-    "BeadArrayUseCases" # depends on broken package limma
-    "beadarrayFilter" # depends on broken package limma
-    "beadarrayExampleData" # depends on broken package limma
-    "beadarray" # depends on broken package limma
-    "ballgown" # depends on broken package limma
-    "attract" # depends on broken package limma
-    "ArrayTools" # depends on broken package limma
-    "arrayQuality" # depends on broken package limma
-    "DrugVsDisease" # depends on broken package limma
-    "ArrayExpress" # depends on broken package limma
-    "oneChannelGUI" # depends on broken package limma
-    "affylmGUI" # depends on broken package limma
-    "AffyExpress" # depends on broken package limma
-    "AgiMicroRna" # depends on broken package limma
-    "affycoretools" # depends on broken package limma
-    "ABSSeq" # depends on broken package limma
-    "a4" # depends on broken package limma
-    "a4Base" # depends on broken package limma
-    "limma" # broken build
     "TransView" # broken build
     "Starr" # broken build
     "SICtools" # broken build
@@ -1285,7 +1019,6 @@ let
     "DEGraph" # depends on broken package RCytoscape
     "destiny" # depends on broken package VIM
     "DiagTest3Grp" # depends on broken package nlopt
-    "diffHic" # depends on broken package edgeR
     "difR" # depends on broken package nlopt
     "DirichletMultinomial" # Build Is Broken
     "DistatisR" # depends on broken package nlopt
@@ -1300,7 +1033,6 @@ let
     "easyanova" # depends on broken package nlopt
     "ecd" # depends on broken package polynom
     "edge" # depends on broken package nlopt
-    "edgeR" # broken url
     "eeptools" # depends on broken package nlopt
     "EffectLiteR" # depends on broken package nlopt
     "effects" # depends on broken package nlopt

From 1eaf76ac7aaac27324bd2ce3b41f48b9d641930e Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Fri, 24 Feb 2017 00:23:01 +0100
Subject: [PATCH 0976/3449] wlc: 0.0.5 -> 0.0.8

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

diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index 144e9c091801..cd13fa8dbb4a 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,16 +1,17 @@
-{ lib, stdenv, fetchurl, fetchgit, cmake, pkgconfig, fetchFromGitHub
+{ lib, stdenv, fetchgit, cmake, pkgconfig
 , glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
 , libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm
+, wayland-protocols
 }:
 
 stdenv.mkDerivation rec {
   name = "wlc-${version}";
-  version = "0.0.5";
+  version = "0.0.8";
 
   src = fetchgit {
     url = "https://github.com/Cloudef/wlc";
     rev = "refs/tags/v${version}";
-    sha256 = "0pg95n488fjlkc8n8x1h2dh4mxb7qln6mrq906lwwqv94aks9b43";
+    sha256 = "1lkxbqnxfmbk9j9k8wq2fl5z0a9ihzalad3x1pp8w2riz41j3by6";
     fetchSubmodules = true;
    };
 
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev
-    libX11 libXdamage systemd dbus_libs
+    libX11 libXdamage systemd dbus_libs wayland-protocols
   ];
 
 

From 3211ff1b5026c041779c8bcfc68da34d61b27369 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 18 Jul 2016 21:16:00 +0200
Subject: [PATCH 0977/3449] global: support universal-ctags

---
 pkgs/development/tools/misc/global/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 664b83b7e7c4..bd111c4ffbbd 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, libtool, makeWrapper
-, coreutils, ctags, ncurses, pythonPackages, sqlite, pkgconfig
+, coreutils, ctags, ncurses, pythonPackages, sqlite, universal-ctags, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
     "--with-ncurses=${ncurses.dev}"
     "--with-sqlite3=${sqlite.dev}"
     "--with-exuberant-ctags=${ctags}/bin/ctags"
+    "--with-universal-ctags=${universal-ctags}/bin/ctags"
     "--with-posix-sort=${coreutils}/bin/sort"
   ];
 

From 5abc164e2d9a178a2e6948bbdb3b63ca4f281910 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Fri, 24 Feb 2017 06:31:23 +0100
Subject: [PATCH 0978/3449] earlyoom: init at 0.11

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

diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix
new file mode 100644
index 000000000000..081996dfd42b
--- /dev/null
+++ b/pkgs/os-specific/linux/earlyoom/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "earlyoom-${version}";
+  version = "0.11";
+
+  src = fetchFromGitHub {
+    owner = "rfjakob";
+    repo = "earlyoom";
+    rev = "08b7ed8e72feed2eec2e558ba2cfacbf6d469594";
+    sha256 = "1k3xslb70fzk80wlka32l0k2v45qn1xgwyjkjiz85gv6v4mv92vl";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp earlyoom $out/bin
+  '';
+
+  meta = {
+    description = "Early OOM Daemon for Linux";
+    homepage    = https://github.com/rfjakob/earlyoom;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e1e6226f224..d72f374b65d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -851,6 +851,8 @@ with pkgs;
 
   dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
 
+  earlyoom = callPackage ../os-specific/linux/earlyoom { };
+
   ecasound = callPackage ../applications/audio/ecasound { };
 
   edac-utils = callPackage ../os-specific/linux/edac-utils { };

From d556f53517b397241f004f14f6fadfdedb80db0e Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Tue, 23 Aug 2016 14:37:49 +0200
Subject: [PATCH 0979/3449] rnv: init at 1.7.11

---
 pkgs/tools/text/xml/rnv/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/text/xml/rnv/default.nix

diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix
new file mode 100644
index 000000000000..97dbd6029686
--- /dev/null
+++ b/pkgs/tools/text/xml/rnv/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, expat }:
+
+stdenv.mkDerivation {
+  name = "rnv-${version}";
+  version = "1.7.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/rnv/rnv-${version}.tar.xz";
+    sha256 = "1rlxrkkkp8b5j6lyvnd9z1d85grmwwmdggkxq6yl226nwkqj1faa";
+  };
+
+  buildInputs = [ expat ];
+
+  meta = with stdenv.lib; {
+    description = "Relax NG Compact Syntax validator";
+    homepage = http://www.davidashen.net/rnv.html;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e1e6226f224..266a264bac0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3686,6 +3686,8 @@ with pkgs;
 
   rng_tools = callPackage ../tools/security/rng-tools { };
 
+  rnv = callPackage ../tools/text/xml/rnv { };
+
   rq = callPackage ../development/tools/rq {
     v8 = v8_static;
   };

From 4588f94396c72334ed40a2c3eda51f18a33f03c4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 22 Feb 2017 20:18:05 +0800
Subject: [PATCH 0980/3449] sensu: 0.17.1 -> 0.28.0

---
 pkgs/servers/monitoring/sensu/Gemfile.lock | 120 ++++----
 pkgs/servers/monitoring/sensu/default.nix  |  27 +-
 pkgs/servers/monitoring/sensu/gemset.nix   | 310 +++++++++------------
 3 files changed, 203 insertions(+), 254 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock
index 9f58be03b621..ee425b6edf97 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/pkgs/servers/monitoring/sensu/Gemfile.lock
@@ -1,75 +1,79 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (1.9.2)
-    amqp (1.5.0)
-      amq-protocol (>= 1.9.2)
+    amq-protocol (2.0.1)
+    amqp (1.6.0)
+      amq-protocol (>= 2.0.1)
       eventmachine
-    async_sinatra (1.0.0)
-      rack (>= 1.4.1)
-      sinatra (>= 1.3.2)
-    childprocess (0.5.3)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
-    daemons (1.2.2)
-    em-redis-unified (0.6.0)
-      eventmachine (>= 0.12.10)
+    em-http-server (0.1.8)
+      eventmachine
     em-worker (0.0.2)
       eventmachine
-    eventmachine (1.0.3)
-    ffi (1.9.8)
-    multi_json (1.11.0)
-    rack (1.6.0)
-    rack-protection (1.5.3)
-      rack
-    sensu (0.17.1)
-      async_sinatra (= 1.0.0)
-      em-redis-unified (= 0.6.0)
-      eventmachine (= 1.0.3)
-      multi_json (= 1.11.0)
-      sensu-em (= 2.4.1)
-      sensu-extension (= 1.1.2)
-      sensu-extensions (= 1.2.0)
-      sensu-logger (= 1.0.0)
-      sensu-settings (= 1.3.0)
-      sensu-spawn (= 1.1.0)
-      sensu-transport (= 2.4.0)
-      sinatra (= 1.3.5)
-      thin (= 1.5.0)
-      uuidtools (= 2.1.4)
-    sensu-em (2.4.1)
-    sensu-extension (1.1.2)
-      sensu-em
-    sensu-extensions (1.2.0)
-      multi_json
-      sensu-em
+    eventmachine (1.2.2)
+    ffi (1.9.17)
+    oj (2.14.6)
+    parse-cron (0.1.4)
+    sensu (0.28.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-logger (= 1.2.1)
+      sensu-redis (= 2.1.0)
+      sensu-settings (= 9.9.0)
+      sensu-spawn (= 2.2.1)
+      sensu-transport (= 7.0.2)
+    sensu-extension (1.5.1)
+      eventmachine
+    sensu-extensions (1.7.1)
       sensu-extension
+      sensu-extensions-debug (= 1.0.0)
+      sensu-extensions-json (= 1.0.0)
+      sensu-extensions-occurrences (= 1.1.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-logger (1.0.0)
-      multi_json
-      sensu-em
-    sensu-settings (1.3.0)
-      multi_json
-    sensu-spawn (1.1.0)
-      childprocess (= 0.5.3)
+    sensu-extensions-debug (1.0.0)
+      sensu-extension
+    sensu-extensions-json (1.0.0)
+      sensu-extension
+    sensu-extensions-occurrences (1.1.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-logger (1.2.1)
+      eventmachine
+      sensu-json
+    sensu-redis (2.1.0)
+      eventmachine
+    sensu-settings (9.9.0)
+      parse-cron
+      sensu-json (>= 1.1.0)
+    sensu-spawn (2.2.1)
+      childprocess (= 0.5.8)
       em-worker (= 0.0.2)
-      sensu-em
-    sensu-transport (2.4.0)
-      amqp (= 1.5.0)
-      sensu-em
-    sinatra (1.3.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    thin (1.5.0)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    tilt (1.4.1)
-    uuidtools (2.1.4)
+      eventmachine
+    sensu-transport (7.0.2)
+      amq-protocol (= 2.0.1)
+      amqp (= 1.6.0)
+      eventmachine
+      sensu-redis (>= 1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   sensu
+
+BUNDLED WITH
+   1.14.4
diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix
index ecc1d4109843..ab896766272c 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/pkgs/servers/monitoring/sensu/default.nix
@@ -1,16 +1,17 @@
-  { lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
-  bundlerEnv {
-    name = "sensu-0.17.1";
+bundlerEnv {
+  name = "sensu-${version}";
+  version = (import gemset).sensu.version;
 
-    inherit ruby;
-    gemdir = ./.;
+  inherit ruby;
+  gemdir = ./.;
 
-    meta = with lib; {
-      description = "A monitoring framework that aims to be simple, malleable, and scalable";
-      homepage    = http://sensuapp.org/;
-      license     = licenses.mit;
-      maintainers = with maintainers; [ theuni ];
-      platforms   = platforms.unix;
-    };
-  }
+  meta = with lib; {
+    description = "A monitoring framework that aims to be simple, malleable, and scalable";
+    homepage    = http://sensuapp.org/;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ theuni peterhoeg ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix
index 116bce9c4b53..273496e2fb42 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/pkgs/servers/monitoring/sensu/gemset.nix
@@ -1,242 +1,186 @@
 {
-  "amq-protocol" = {
-    version = "1.9.2";
+  amq-protocol = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x";
       type = "gem";
-      sha256 = "1gl479j003vixfph5jmdskl20il8816y0flp4msrc8im3b5iiq3r";
     };
+    version = "2.0.1";
   };
-  "amqp" = {
-    version = "1.5.0";
+  amqp = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9";
       type = "gem";
-      sha256 = "0jlcwyvjz0b28wxdabkyhdqyqp5ji56ckfywsy9mgp0m4wfbrh8c";
     };
-    dependencies = [
-      "amq-protocol"
-      "eventmachine"
-    ];
-  };
-  "async_sinatra" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "02yi9qfsi8kk4a4p1c4sx4pgism05m18kwlc9dd23zzdy9jdgq1a";
-    };
-    dependencies = [
-      "rack"
-      "sinatra"
-    ];
-  };
-  "childprocess" = {
-    version = "0.5.3";
-    source = {
-      type = "gem";
-      sha256 = "12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww";
-    };
-    dependencies = [
-      "ffi"
-    ];
-  };
-  "daemons" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "121c7vkimg3baxga69xvdkwxiq8wkmxqvdbyqi5i82vhih5d3cn3";
-    };
-  };
-  "em-redis-unified" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "1hf7dv6qmxfilpd7crcqlyqk6jp5z8md76bpg3n0163ps4ra73p0";
-    };
-    dependencies = [
-      "eventmachine"
-    ];
-  };
-  "em-worker" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
-    };
-    dependencies = [
-      "eventmachine"
-    ];
-  };
-  "eventmachine" = {
-    version = "1.0.3";
-    source = {
-      type = "gem";
-      sha256 = "09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil";
-    };
-  };
-  "ffi" = {
-    version = "1.9.8";
-    source = {
-      type = "gem";
-      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
-    };
-  };
-  "multi_json" = {
-    version = "1.11.0";
-    source = {
-      type = "gem";
-      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
-    };
-  };
-  "rack" = {
     version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb";
-    };
   };
-  "rack-protection" = {
-    version = "1.5.3";
+  childprocess = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0";
       type = "gem";
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
     };
-    dependencies = [
-      "rack"
-    ];
+    version = "0.5.8";
   };
-  "sensu" = {
-    version = "0.17.1";
+  em-http-server = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5";
       type = "gem";
-      sha256 = "1fqpypins1zhind0in0ax0y97a6pf3z85gwjz4bjm6cjrkarb5zj";
     };
-    dependencies = [
-      "async_sinatra"
-      "em-redis-unified"
-      "eventmachine"
-      "multi_json"
-      "sensu-em"
-      "sensu-extension"
-      "sensu-extensions"
-      "sensu-logger"
-      "sensu-settings"
-      "sensu-spawn"
-      "sensu-transport"
-      "sinatra"
-      "thin"
-      "uuidtools"
-    ];
+    version = "0.1.8";
   };
-  "sensu-em" = {
-    version = "2.4.1";
+  em-worker = {
+    dependencies = ["eventmachine"];
     source = {
+      sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
       type = "gem";
-      sha256 = "08jz47lfnv55c9yl2dhyv1si6zl8h4xj8y1sjy2h2fqy48prfgmy";
     };
+    version = "0.0.2";
   };
-  "sensu-extension" = {
-    version = "1.1.2";
+  eventmachine = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00mlcq33q104spkb5c997lwallpilhj0d6fzsbd4lr9s8lmjga5f";
       type = "gem";
-      sha256 = "19qz22fcb3xjz9p5npghlcvxkf8h1rsfws3j988ybnimmmmiqm24";
     };
-    dependencies = [
-      "sensu-em"
-    ];
+    version = "1.2.2";
   };
-  "sensu-extensions" = {
-    version = "1.2.0";
+  ffi = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7";
       type = "gem";
-      sha256 = "1b8978g1ww7vdrsw7zvba6qvc56s4vfm1hw3szw3j1gsk6j0vb81";
     };
-    dependencies = [
-      "multi_json"
-      "sensu-em"
-      "sensu-extension"
-      "sensu-logger"
-      "sensu-settings"
-    ];
+    version = "1.9.17";
   };
-  "sensu-logger" = {
+  oj = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk";
+      type = "gem";
+    };
+    version = "2.14.6";
+  };
+  parse-cron = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  sensu = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx";
+      type = "gem";
+    };
+    version = "0.28.0";
+  };
+  sensu-extension = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
+  sensu-extensions = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g";
+      type = "gem";
+    };
+    version = "1.7.1";
+  };
+  sensu-extensions-debug = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp";
+      type = "gem";
+    };
     version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0vwa2b5wa9xqzb9lmhma49171iabwbnnnyhhhaii8n6j4axvar93";
-    };
-    dependencies = [
-      "multi_json"
-      "sensu-em"
-    ];
   };
-  "sensu-settings" = {
-    version = "1.3.0";
+  sensu-extensions-json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g";
       type = "gem";
-      sha256 = "0s9fyqhq5vf9m9937n3wczlr4z62rn1ydc6m53vn4156fpim6yga";
     };
-    dependencies = [
-      "multi_json"
-    ];
+    version = "1.0.0";
   };
-  "sensu-spawn" = {
+  sensu-extensions-occurrences = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja";
+      type = "gem";
+    };
     version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0w9z6hpr27lq02y6c2mnrdl9xpsjfg77kzsfsp2f2w4swdwmiv0v";
-    };
-    dependencies = [
-      "childprocess"
-      "em-worker"
-      "sensu-em"
-    ];
   };
-  "sensu-transport" = {
-    version = "2.4.0";
+  sensu-extensions-only-check-output = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3";
       type = "gem";
-      sha256 = "0gh8rcl22daax7qng93kj2jydql1jhhskd37kj7sgz0rr8wy2x06";
     };
-    dependencies = [
-      "amqp"
-      "sensu-em"
-    ];
+    version = "1.0.0";
   };
-  "sinatra" = {
-    version = "1.3.5";
+  sensu-extensions-ruby-hash = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3";
       type = "gem";
-      sha256 = "1mn6nzfyirfqr7prhsn4nr3k481c6nzsad2p9s1xnsbvxa1vkqwr";
     };
-    dependencies = [
-      "rack"
-      "rack-protection"
-      "tilt"
-    ];
+    version = "1.0.0";
   };
-  "thin" = {
-    version = "1.5.0";
+  sensu-json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4";
       type = "gem";
-      sha256 = "14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1";
     };
-    dependencies = [
-      "daemons"
-      "eventmachine"
-      "rack"
-    ];
+    version = "2.0.1";
   };
-  "tilt" = {
-    version = "1.4.1";
+  sensu-logger = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0";
       type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
     };
+    version = "1.2.1";
   };
-  "uuidtools" = {
-    version = "2.1.4";
+  sensu-redis = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg";
       type = "gem";
-      sha256 = "1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3";
     };
+    version = "2.1.0";
+  };
+  sensu-settings = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i";
+      type = "gem";
+    };
+    version = "9.9.0";
+  };
+  sensu-spawn = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  sensu-transport = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr";
+      type = "gem";
+    };
+    version = "7.0.2";
   };
 }
\ No newline at end of file

From 5b2199fcc678bc7948033dadce0547ae5a8face9 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 05:45:11 -0300
Subject: [PATCH 0981/3449] blackbird: 2016-07-04 -> 2017-02-20

---
 pkgs/misc/themes/blackbird/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/themes/blackbird/default.nix b/pkgs/misc/themes/blackbird/default.nix
index 5c2d68dfd96e..17aa60162ad6 100644
--- a/pkgs/misc/themes/blackbird/default.nix
+++ b/pkgs/misc/themes/blackbird/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "Blackbird";
-  version = "2016-07-04";
+  version = "2017-02-20";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     repo = "${pname}";
     owner = "shimmerproject";
-    rev = "ab4a30ee5110c59241b739e7c54956c3244e5b2a";
-    sha256 = "1qy32n21bqq3zwn9di01fbiqv67cqr9n7jmbpcmn9v8yb5p572w3";
+    rev = "51eaa1853675866e2e4bd026876162b35ab1a196";
+    sha256 = "06d040s5jmw9v6fkif6zjcd3lp56dmvwchcwflinc165iazbp5n2";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "Dark Desktop Suite for Gtk, Xfce and Metacity";
     homepage = http://github.com/shimmerproject/Blackbird;
     license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ];
-    maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
   };
 }

From 29d64600846b8713d4175719630102bf4de65a95 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Fri, 24 Feb 2017 10:02:13 +0100
Subject: [PATCH 0982/3449] quickder: 1.0-RC1 -> 1.0-RC2

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

diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix
index 2ee3a61aacfc..73bd9e863cde 100644
--- a/pkgs/development/libraries/quickder/default.nix
+++ b/pkgs/development/libraries/quickder/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
   pname = "quickder";
   name = "${pname}-${version}";
-  version = "1.0-RC1";
+  version = "1.0-RC2";
 
   src = fetchFromGitHub {
-    sha256 = "05gw5dqkw3l8kwwm0044zpxhcp7sxicx9wxbfyr49c91403p870w";
+    sha256 = "1nzk8x6qzpvli8bf74dc2qya63nlppqjrnkaxvjxr2dbqb8qcrqd";
     rev = "version-${version}";
     owner = "vanrein";
     repo = "quick-der";

From e4ab4a733c7c1928c7acc47d0c9ad59b0f1f11f2 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 06:10:52 -0300
Subject: [PATCH 0983/3449] moka-icon-theme: 2016-10-06 -> 2017-02-13

---
 pkgs/data/icons/moka-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 0ffe2411c4fa..57dfe0797fac 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
   package-name = "moka-icon-theme";
-  version = "2016-10-06";
+  version = "2017-02-13";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = package-name;
-    rev = "50894ee9411721649019cd168b8ae2c85f4b5cf0";
-    sha256 = "1dlpsgqsn731ra5drkx72wljcgv1zydgldy4nn5bbia9s5w8mfgs";
+    rev = "5ac530d2394574bdbd5360de46391d0dfc7aa2ab";
+    sha256 = "1zw1jm03706086gnplkkrdlrcyhgwm9kp4qax57wwc1s27bhc90n";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 9e599453834596cdf1eb621f75dbd30cfd1611d5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 24 Feb 2017 17:20:18 +0800
Subject: [PATCH 0984/3449] calibre: 2.79.1 -> 2.80.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 16ac38b3263f..fc0374985cd7 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.79.1";
+  version = "2.80.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0slk3cili50a8kwwsk6syqqrcz0yx8yjvhm8gyggn2k2kpqjax15";
+    sha256 = "1cgj30b0imv4gl12y1lcd07w3bx10sapclvjr78z78n7g32xp9ik";
   };
 
   patches = [

From e27a7a36860cd725fb4ede9c2b4edd3e0f43b9a6 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 06:22:42 -0300
Subject: [PATCH 0985/3449] greybird: 2016-11-15 -> 2017-02-17

---
 pkgs/misc/themes/greybird/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix
index 43e5a3210f57..634ea743e322 100644
--- a/pkgs/misc/themes/greybird/default.nix
+++ b/pkgs/misc/themes/greybird/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  pname = "Greybird";
-  version = "2016-11-15";
+  pname = "greybird";
+  version = "2017-02-17";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
-    rev = "0a0853fa1de7545392f32aff33d95a8a1f6dca9e";
-    sha256 = "0i9yvd265783pqij6rjh7pllw0l28v975mrahykcwvn9chq8rrqf";
+    rev = "46afa0f1566207c07ce15633d3a4ca12075afcb7";
+    sha256 = "0sxpj8k0dlgh1k1w1hnpy94rvh7h6mj9vrhldmhc128kncdcxk3j";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];

From 1872f24c1bfd03b048e828e0e098a17ffd30775e Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 06:29:24 -0300
Subject: [PATCH 0986/3449] jwm: 1580 -> 1582

---
 pkgs/applications/window-managers/jwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index c670dc52e52d..2082f48d2577 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1580";
+  version = "1582";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "098m54mn8f1vzdb7j6zmlflid7a4yjinbdh7avg2a0z45nl1znb4";
+    sha256 = "1z6cxf18n69sjd20bbyxrnd19hhy955ddvakgpfyhiprpfjkkv70";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From aaa93d32aa6e278bb73e9acab777ac2b09161711 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 06:37:46 -0300
Subject: [PATCH 0987/3449] numix-icon-theme: 2016-11-13 -> 2017-01-25

---
 pkgs/data/icons/numix-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 8732172ead4c..7f6a3fe48d79 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2016-11-13";
+  version = "2017-01-25";
 
   package-name = "numix-icon-theme";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
-    rev = "45878a1195abd997341c91d51381625644f9a356";
-    sha256 = "0in7vx8mdwbfkgylh9p95kcsnn7dnv2vpmv788n0bbgldxmrldga";
+    rev = "271471c7944d592a1d666910de0adce82a393d31";
+    sha256 = "1yc9jk1233ybk6cd7q4x3q87rwgq9nkcgkn9fw9si422dkvnwd7h";
   };
 
   dontBuild = true;

From 9ae7fb4b60acf9777acefd10e8463307e6f45c2b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 06:46:21 -0300
Subject: [PATCH 0988/3449] numix-gtk-theme: 2016-11-19 -> 2017-02-15

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

diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index 740bafe8bd44..c2f6fb210586 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2016-11-19";
+  version = "2017-02-15";
   name = "numix-gtk-theme-${version}";
 
   src = fetchFromGitHub {
     repo = "numix-gtk-theme";
     owner = "numixproject";
-    rev = "0e4a840bd1ec434ba660418caaa59ada05d8660e";
-    sha256 = "09nacjwrl5k3dgji2smdv6q5v23qjzfayic044bnjfm5d3p3yf6n";
+    rev = "f25d7e04353543e03fd155f4d9dfa80fc6b551f2";
+    sha256 = "0n57airi1kgg754099sdq40bb0mbp4my385fvslnsjv5d4h8jhvq";
   };
 
   nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];

From 08749dd231ded8b48595e41d8808fb3a8eaaf5ad Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 06:57:19 -0300
Subject: [PATCH 0989/3449] paper-icon-theme: 2016-11-05 -> 2017-02-13

---
 pkgs/data/icons/paper-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix
index 13adb7efaafc..e0ea56831b4d 100644
--- a/pkgs/data/icons/paper-icon-theme/default.nix
+++ b/pkgs/data/icons/paper-icon-theme/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${package-name}-${version}";
   package-name = "paper-icon-theme";
-  version = "2016-11-05";
+  version = "2017-02-13";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = package-name;
-    rev = "2a1f25a47fe8fb92e9d4db5537bbddb539586602";
-    sha256 = "0v956wrfraaj5qznz86q7s3zi55xd3gxmg7pzcfsw2ghgfv13swd";
+    rev = "fcaf8bb2aacdd1bb7dcde3d45ef92d0751567e8e";
+    sha256 = "1l1w99411jrv4l7jr5dvwszghrncsir23c7lpc26gh2f0ydf3d0d";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 767e50867c7d9011505d512d42d6cfe734860d54 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 07:24:16 -0300
Subject: [PATCH 0990/3449] xdgmenumaker: 1.1 -> 1.4

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

diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix
index 8155c1ca4148..01782d18b12b 100644
--- a/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/pkgs/applications/misc/xdgmenumaker/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xdgmenumaker-${version}";
-  version = "1.1";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "gapan";
     repo = "xdgmenumaker";
     rev = version;
-    sha256 = "11mqafpgfnz0h0d6fxd1xsfsjxzg1abvwqgwy9jmm5xhcjx3c3l7";
+    sha256 = "0i909dk9chdsc7njp5llgm5xlag4lr0nkxkwl1g5lf8cvdjrawh2";
   };
 
   nativeBuildInputs = [

From b474c5cd30ce7ecc0238725954d0ee0532306efe Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Fri, 24 Feb 2017 07:49:15 -0300
Subject: [PATCH 0991/3449] zuki-themes: 2016-10-20 -> 2017-02-17

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

diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index 6da6d24902ed..491885a14b3f 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -4,20 +4,20 @@ stdenv.mkDerivation rec {
   name = "zuki-themes-${version}";
   version = "${gnome3.version}.${date}";
   date = {
-    "3.20" = "2016-07-01";
-    "3.22" = "2016-10-20";
+    "3.20" = "2017-02-09";
+    "3.22" = "2017-02-17";
   }."${gnome3.version}";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
     rev = {
-      "3.20" = "dda1726ac7b556df2ef9696e530f8c2eaa0aed37";
-      "3.22" = "a48f0f12f81c49b480f82369ae45cfa49d78b143";
+      "3.20" = "b9106c3c05012b7e91394819ca550def3357d2eb";
+      "3.22" = "fc3cf7c372bcc439870c4785f91b8ea7af73e1cc";
     }."${gnome3.version}";
     sha256 = {
-      "3.20" = "0p7db8a2ni494vwp3b7av7d214fnynf6gr976qma6h9x4ck3phiz";
-      "3.22" = "05sa5ighq01krbgfd4lddxvbhfqk5x5kgw6jnxwvx9rmmff713s1";
+      "3.20" = "03k18p25gsscv05934vs0py26vpcrx93wi5bj6di277c6kwgjzxg";
+      "3.22" = "02ppk8wsx0k7j3zgmcb1l8jgij0m5rdkrahfv884jxkyjr6wwgs5";
     }."${gnome3.version}";
   };
 

From cbe765043f2c4a6042b0bb6b42022a16c06a8bf2 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Mon, 13 Feb 2017 23:39:29 +0000
Subject: [PATCH 0992/3449] fdr: init at 4.2.0

---
 lib/maintainers.nix                           |  1 +
 .../science/programming/fdr/default.nix       | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/science/programming/fdr/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3753a6955c80..3296b1c3d28d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -340,6 +340,7 @@
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
   nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
   nhooyr = "Anmol Sethi <anmol@aubble.com>";
+  nickhu = "Nick Hu <me@nickhu.co.uk>";
   nicknovitski = "Nick Novitski <nixpkgs@nicknovitski.com>";
   nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   NikolaMandic = "Ratko Mladic <nikola@mandic.email>";
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
new file mode 100644
index 000000000000..a82027a628f3
--- /dev/null
+++ b/pkgs/applications/science/programming/fdr/default.nix
@@ -0,0 +1,69 @@
+{stdenv, fetchurl, qtbase, qtx11extras, ncurses, xorg, zlib, python27Packages}:
+stdenv.mkDerivation {
+  name = "fdr-4.2.0";
+  src = fetchurl {
+    url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3754-linux-x86_64.tar.gz;
+    sha256 = "d24492485db9b8b95c62c53a6396094f836ee079cfc743688a397503c3ec9bf8";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc
+    python27Packages.python
+    qtbase
+    qtx11extras
+    ncurses
+    xorg.libX11
+    xorg.libXft
+    zlib
+  ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+  installPhase = ''
+    mkdir -p "$out"
+
+    # shipped Qt is buggy
+    rm lib/libQt*
+    rm -r lib/qt_plugins
+
+    cp -r * "$out"
+    # Hack around lack of libtinfo in NixOS
+    ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
+    ln -s ${qtbase.out}/lib/qt5/plugins $out/lib/qt_plugins
+    ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
+
+    for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
+    do
+      patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        --set-rpath "$libPath:$out/lib" \
+        "$out/bin/$b"
+    done
+
+    for l in corei7/librefines.so \
+      libcspm_process_compiler.so \
+      libcsp_operators.so \
+      _fdr.so \
+      libfdr.so \
+      libfdr_java.so \
+      libprocess_compiler.so \
+      librefines_gui.so \
+      librefines_licensing.so  \
+      libboost_date_time.so.1.60.0 \
+      libboost_filesystem.so.1.60.0 \
+      libboost_iostreams.so.1.60.0 \
+      libboost_program_options.so.1.60.0 \
+      libboost_serialization.so.1.60.0 \
+      libboost_system.so.1.60.0
+    do
+      patchelf --set-rpath "$libPath:$out/lib" \
+        "$out/lib/$l"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.cs.ox.ac.uk/projects/fdr/;
+    description = "The CSP refinement checker";
+    license = licenses.unfreeRedistributable;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nickhu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96b56479d57d..5ce7ebf857d6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13207,6 +13207,8 @@ with pkgs;
 
   fbreader = callPackage ../applications/misc/fbreader { };
 
+  fdr = qt57.callPackage ../applications/science/programming/fdr { };
+
   fehlstart = callPackage ../applications/misc/fehlstart { };
 
   fetchmail = callPackage ../applications/misc/fetchmail { };

From e44a7cdfd45d1df84dc6d5afa7e28b627d6479fc Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:19:19 -0300
Subject: [PATCH 0993/3449] perlPackages.FileFindObject: init at 0.3.2

---
 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 4b58e8d20a73..0f45f79fc85e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5121,6 +5121,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FileFindObject = buildPerlPackage rec {
+    name = "File-Find-Object-v0.3.2";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "7c467b6b7752bff46b7b8b84c9aabeac45bbfdab1e2224108a2e2170adb9f2b7";
+    };
+    buildInputs = [ ModuleBuild perl ];
+    propagatedBuildInputs = [ ClassXSAccessor ];
+    meta = {
+      description = "An object oriented File::Find replacement";
+      license = stdenv.lib.licenses.artistic2;
+    };
+  };
+
   FileFindRule = buildPerlPackage rec {
     name = "File-Find-Rule-0.33";
     src = fetchurl {

From 3bbc824a7211943018b111a9dbfafe3ef688f45f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:28:00 -0300
Subject: [PATCH 0994/3449] perlPackages.FindFileObjectRule: init at 0.306

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0f45f79fc85e..af83a2ff233a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5135,6 +5135,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FileFindObjectRule = buildPerlModule rec {
+    name = "File-Find-Object-Rule-0.0306";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "2ce55766b25fb8799d37b95bca61e8a71d8a437e28541e1cd06b7eb89f7739d1";
+    };
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ ClassXSAccessor FileFindObject NumberCompare TextGlob ];
+    meta = {
+      homepage = http://www.shlomifish.org/open-source/projects/File-Find-Object/;
+      description = "Alternative interface to File::Find::Object";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   FileFindRule = buildPerlPackage rec {
     name = "File-Find-Rule-0.33";
     src = fetchurl {

From c1735418ebf4f37d1479fd8cad48ad58c973bd9c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:33:04 -0300
Subject: [PATCH 0995/3449] perlPackages.FileFinder: init at 0.53

---
 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 af83a2ff233a..03be1b5a731f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5172,6 +5172,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  FileFinder = buildPerlPackage rec {
+    name = "File-Finder-0.53";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/ME/MERLYN/${name}.tar.gz";
+      sha256 = "2ecbc19ac67a9e635c872a807a8d3eaaff5babc054f15a191d47cdfc5f176a74";
+    };
+    propagatedBuildInputs = [ TextGlob ];
+    meta = {
+      license = stdenv.lib.licenses.unknown;
+    };
+  };
+
   FileHandleUnget = buildPerlPackage rec {
     name = "FileHandle-Unget-0.1628";
     src = fetchurl {

From 92d71857f231dc8dfcb0be6fd71ec36ae951be9b Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:35:01 -0300
Subject: [PATCH 0996/3449] perlPackages.MooX: init at 0.101

---
 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 03be1b5a731f..4cb6b5dc9874 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8734,6 +8734,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  MooX = buildPerlPackage rec {
+    name = "MooX-0.101";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/G/GE/GETTY/${name}.tar.gz";
+      sha256 = "2ff91a656e78aae0aca42293829d7a7e5acb9bf22b0401635b2ab6c870de32d5";
+    };
+    propagatedBuildInputs = [ DataOptList ImportInto ModuleRuntime Moo ];
+    meta = {
+      homepage = https://github.com/Getty/p5-moox;
+      description = "Using Moo and MooX:: packages the most lazy way";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   MooXlate = buildPerlPackage {
     name = "MooX-late-0.015";
     src = fetchurl {

From 216de4e910bd9ea8c167ea513646e48b3e6ca42e Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:37:46 -0300
Subject: [PATCH 0997/3449] perlPackages.PathTiny: 0.052 -> 0.104

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4cb6b5dc9874..0d91be8cbd71 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10219,10 +10219,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   PathTiny = buildPerlPackage {
-    name = "Path-Tiny-0.052";
+    name = "Path-Tiny-0.104";
     src = fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.052.tar.gz;
-      sha256 = "1b70yhbdww9k5m4a4lhdd71jrxdxhi10533slmxynxa04nyn2f0a";
+      url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.104.tar.gz;
+      sha256 = "c69f1dcfeb4aa004086deb9bc14c7d79f45798b947f1efbd634a3442e267aaef";
     };
     buildInputs = [ DevelHide Filepushd TestDeep TestFailWarnings TestFatal perl ];
     propagatedBuildInputs = [ autodie ];

From 7221a3055f9b91f54ae2cf1ac9dfaa9c2b546aba Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:40:19 -0300
Subject: [PATCH 0998/3449] perlPackages.TestDataSplit: init at 0.2.0

---
 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 0d91be8cbd71..48920d689cd3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12627,6 +12627,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestDataSplit = buildPerlModule rec {
+    name = "Test-Data-Split-0.2.0";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "90811c2af56750bf08eeff39e1e30f2ff8f625e809ed838b5ccb56a256c4b595";
+    };
+    buildInputs = [ ModuleBuild TestDifferences perl ];
+    propagatedBuildInputs = [ IOAll ListMoreUtils MooX MooXlate ];
+    meta = {
+      description = "Split data-driven tests into several test scripts";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestDeep = buildPerlPackage {
     name = "Test-Deep-0.112";
     src = fetchurl {

From 3e137dc5d2670f6aac229c1ea31297e649e152d6 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:41:57 -0300
Subject: [PATCH 0999/3449] perlPackages.TestPerlTidy: init at 20130104

---
 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 48920d689cd3..d9042c96dea1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13039,6 +13039,18 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ PerlCritic ];
   };
 
+  TestPerlTidy = buildPerlPackage rec {
+    name = "Test-PerlTidy-20130104";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/L/LA/LARRYL/${name}.tar.gz";
+      sha256 = "3f15d9f3f4811e348594620312258d75095237925b491ada623fa73ac9d2b9c8";
+    };
+    propagatedBuildInputs = [ FileFinder FileSlurp PerlTidy TextDiff ];
+    meta = {
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TestPod = buildPerlPackage rec {
     name = "Test-Pod-1.51";
     src = fetchurl {

From 978d910f8c532d07ab23a1877cd8decf05704b09 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:43:24 -0300
Subject: [PATCH 1000/3449] perlPackages.TestRun: init at 0.304

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d9042c96dea1..47c11112d898 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13140,6 +13140,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestRun = buildPerlPackage rec {
+    name = "Test-Run-0.0304";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323";
+    };
+    buildInputs = [ ModuleBuild TestTrap ];
+    propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MROCompat Moose MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ];
+    meta = {
+      homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
+      description = "Base class to run standard TAP scripts";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestScript = buildPerlPackage rec {
     name = "Test-Script-1.10";
     src = fetchurl {

From 2085b43430783253299968530493b8f3b8aa4845 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:45:04 -0300
Subject: [PATCH 1001/3449] perlPackages.TestRunCmdLine: init at 0.0131

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 47c11112d898..3f2ff8c7a5e3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13155,6 +13155,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestRunCmdLine = buildPerlPackage rec {
+    name = "Test-Run-CmdLine-0.0131";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18";
+    };
+    buildInputs = [ ModuleBuild TestTrap ];
+    propagatedBuildInputs = [ Moose MooseXGetopt TestRun UNIVERSALrequire YAMLLibYAML ];
+    meta = {
+      homepage = http://web-cpan.berlios.de/modules/Test-Run/;
+      description = "Analyze tests from the command line using Test::Run";
+      license = stdenv.lib.licenses.mit;
+    };
+   };
+
   TestScript = buildPerlPackage rec {
     name = "Test-Script-1.10";
     src = fetchurl {

From 93f7e0a6d90208e08c44ee0cdb46e38889631b77 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:46:26 -0300
Subject: [PATCH 1002/3449] perlPackages.TestRunValgrind: init at 0.0.1

---
 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 3f2ff8c7a5e3..1927b5dcdeb0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13170,6 +13170,20 @@ let self = _self // overrides; _self = with self; {
     };
    };
 
+  TestRunValgrind = buildPerlModule rec {
+    name = "Test-RunValgrind-0.0.1";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "67bf3cf3e7d5d23ec33e592f8b0dbcccfa01205d5bf0a3d73d8c8358d167e83f";
+    };
+    buildInputs = [ ModuleBuild perl ];
+    propagatedBuildInputs = [ PathTiny ];
+    meta = {
+      description = "Tests that an external program is valgrind-clean";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestScript = buildPerlPackage rec {
     name = "Test-Script-1.10";
     src = fetchurl {

From 8c169299bbb42e82603564f87c4f012753fd202f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:50:19 -0300
Subject: [PATCH 1003/3449] perlPackages.TestRunPluginTrimDisplayedFilenames:
 init at 0.0125

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1927b5dcdeb0..30b2e9462270 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13170,6 +13170,21 @@ let self = _self // overrides; _self = with self; {
     };
    };
 
+  TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec {
+    name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5";
+    };
+    buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ];
+    propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ];
+    meta = {
+      homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
+      description = "Trim the first components";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestRunValgrind = buildPerlModule rec {
     name = "Test-RunValgrind-0.0.1";
     src = fetchurl {

From 559abb2604fe85ee558fea45f507d735d950fd7d Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:51:40 -0300
Subject: [PATCH 1004/3449] perlPackages.TestRunPluginAlternateInterpreters:
 init at 0.0124

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 30b2e9462270..31e6c785e8ac 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13170,6 +13170,21 @@ let self = _self // overrides; _self = with self; {
     };
    };
 
+  TestRunPluginAlternateInterpreters = buildPerlPackage rec {
+    name = "Test-Run-Plugin-AlternateInterpreters-0.0124";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3";
+    };
+    buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ];
+    propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ];
+    meta = {
+      homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
+      description = "Define different interpreters for different test scripts with Test::Run";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec {
     name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125";
     src = fetchurl {

From e85504af2581c5852dbd9ed308546d5703b5bd8c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:53:26 -0300
Subject: [PATCH 1005/3449] perlPackages.TestRunPluginBreakOnFailure: init at
 v0.0.5

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 31e6c785e8ac..b90a93ca1882 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13185,6 +13185,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestRunPluginBreakOnFailure = buildPerlPackage rec {
+    name = "Test-Run-Plugin-BreakOnFailure-v0.0.5";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430";
+    };
+    buildInputs = [ ModuleBuild TestTrap YAMLLibYAML ];
+    propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ];
+    meta = {
+      homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
+      description = "Stop processing the entire test suite";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec {
     name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125";
     src = fetchurl {

From 416de9233b76e080d5a6f619a633327d7d4123b2 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:55:27 -0300
Subject: [PATCH 1006/3449] perlPackages.TestRunPluginColorFileVerdicts: init
 at 0.0124

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b90a93ca1882..97f079279dbb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13200,6 +13200,23 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestRunPluginColorFileVerdicts = buildPerlPackage rec {
+    name = "Test-Run-Plugin-ColorFileVerdicts-0.0124";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302";
+    };
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]  moreInputs;
+    moreInputs = [ TestTrap ]; # Added because tests were failing without it
+    doCheck=true;
+    meta = {
+      homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
+      description = "Make the file verdict ("ok", "NOT OK")";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec {
     name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125";
     src = fetchurl {

From 6e5097be992a4e955f58b5918d4a349d075d784f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:56:29 -0300
Subject: [PATCH 1007/3449] perlPackages.TestRunPluginColorSummary: init at
 0.0202

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 97f079279dbb..8c7560bb91eb 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13217,6 +13217,23 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestRunPluginColorSummary = buildPerlModule rec {
+    name = "Test-Run-Plugin-ColorSummary-0.0202";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a";
+    };
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ TestRun TestRunCmdLine ]  moreInputs;
+    moreInputs = [ TestTrap ]; # Added because tests were failing without it
+    doCheck=true;
+    meta = {
+      homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
+      description = "A Test::Run plugin that";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TestRunPluginTrimDisplayedFilenames = buildPerlPackage rec {
     name = "Test-Run-Plugin-TrimDisplayedFilenames-0.0125";
     src = fetchurl {

From d9a8d11bc1fd5d3b49831bd5885e2954e1f5d723 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:58:12 -0300
Subject: [PATCH 1008/3449] perlPackages.TestTrailingSpace: init at 0.301

---
 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 8c7560bb91eb..feb709a273e2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13385,6 +13385,20 @@ let self = _self // overrides; _self = with self; {
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
   };
+ 
+  TestTrailingSpace = buildPerlPackage rec {
+    name = "Test-TrailingSpace-0.0301";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "a28875747adb7a0e7d1ae8a4ffe71869e7ceb3a85d0cb30172959dada7de5970";
+    };
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ FileFindObjectRule ];
+    meta = {
+      description = "Test for trailing space in source files";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
 
   TestUnitLite = buildPerlPackage {
     name = "Test-Unit-Lite-0.1202";

From c7690b3a8db7f48416c8d445d5d61ad248db0dab Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 07:59:54 -0300
Subject: [PATCH 1009/3449] perlPackages.TestSprintfNamed: init at 0.402

---
 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 feb709a273e2..12329fb9b647 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13893,6 +13893,19 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ if_ ];
   };
 
+  TextSprintfNamed = buildPerlPackage rec {
+    name = "Text-Sprintf-Named-0.0402";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "951317fce8fa5dd08190ba760182bc71f2b4346fa21df55c76155e6353e2864f";
+    };
+    buildInputs = [ ModuleBuild TestWarn ];
+    meta = {
+      description = "Sprintf-like function with named conversions";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TextTable = buildPerlPackage rec {
     name = "Text-Table-1.130";
     src = fetchurl {

From a53f1c0f74ee868aa7e7d317a72410e99af1fe04 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 08:03:35 -0300
Subject: [PATCH 1010/3449] perlPackages.TaskTestRunAllPlugins: init at 0.0105

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 12329fb9b647..4b607c1501c4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12203,6 +12203,21 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ Plack PSGI ModuleBuildTiny ];
   };
 
+  TaskTestRunAllPlugins = buildPerlPackage rec {
+    name = "Task-Test-Run-AllPlugins-0.0105";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9";
+    };
+    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ];
+    meta = {
+      homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
+      description = "Specifications for installing all the Test::Run";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   TaskWeaken = buildPerlPackage {
     name = "Task-Weaken-1.04";
     src = fetchurl {

From f62f94e19ff1274fb3efd3bd4e7dea751d4a739c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 08:06:29 -0300
Subject: [PATCH 1011/3449] perlPackages.TaskFreecellSolverTesting: init at
 v0.0.10

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4b607c1501c4..075c5d0c2bc0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12193,6 +12193,21 @@ 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 {
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/${name}.tar.gz";
+      sha256 = "ce8960c0250a9947ae5b4485e8a3e807bb2d87b1120096464b3d2247d2c194ff";
+    };
+    buildInputs = [ ModuleBuild perl ];
+    propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify Inline InlineC ListMoreUtils Moo MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace YAMLLibYAML ];
+    meta = {
+      homepage = http://metacpan.org/release/Task-FreecellSolver-Testing;
+      description = "Install the CPAN dependencies of the Freecell Solver test suite";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
 
   TaskPlack = buildPerlModule rec {
     name = "Task-Plack-0.28";

From a20dd466893abd0b9c7d9f56007d30dcc01798b3 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Fri, 24 Feb 2017 08:35:48 -0300
Subject: [PATCH 1012/3449] freecell-solver: 3.26.0 -> 4.8.0

---
 pkgs/games/freecell-solver/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
index de245913861f..466cfda7c4a5 100644
--- a/pkgs/games/freecell-solver/default.nix
+++ b/pkgs/games/freecell-solver/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, cmake, perl, gmp, libtap, perlPackages }:
+{ stdenv, fetchurl, pkgconfig, cmake
+, perl, gmp, libtap, gperf
+, perlPackages, python3Packages }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "freecell-solver-${version}";
-  version = "3.26.0";
+  version = "4.8.0";
 
   src = fetchurl {
-    url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.bz2";
-    sha256 = "0pm6xk4fmwgzva70qxb0pqymdfvpasnvqiwwmm8hpx7g37y11wqk";
+    url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz";
+    sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3";
   };
 
-  buildInputs = [ pkgconfig cmake perl gmp libtap
+  buildInputs = [ pkgconfig cmake perl gmp libtap gperf
     perlPackages.TemplateToolkit perlPackages.StringShellQuote
-    perlPackages.GamesSolitaireVerify ];
+    perlPackages.GamesSolitaireVerify perlPackages.TaskFreecellSolverTesting
+    python3Packages.python python3Packages.random2 ];
 
   meta = {
     description = "A FreeCell automatic solver";
@@ -26,6 +29,6 @@ stdenv.mkDerivation rec{
     homepage = http://fc-solve.shlomifish.org/;
     license = licenses.mit;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

From 8e1fa01f3a727aa496353a0a0bf505a68678af99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Feb 2017 12:53:53 +0100
Subject: [PATCH 1013/3449] nix: 1.11.6 -> 1.11.7

---
 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 d73d67ef4728..07623fd591de 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/qdkzm17csr24snk247a1s0c47ikq5sl6-nix-1.11.6";
-  i686-linux = "/nix/store/hiwp53747lxlniqy5wpbql5izjrs8z0z-nix-1.11.6";
-  x86_64-darwin = "/nix/store/hca2hqcvwncf23hiqyqgwbsdy8vvl9xv-nix-1.11.6";
+  x86_64-linux = "/nix/store/4ssykr786d0wp7y6m4xd4qwqs4nrry1z-nix-1.11.7";
+  i686-linux = "/nix/store/61ggxx2072y2g877m01asy0lsn7xpn06-nix-1.11.7";
+  x86_64-darwin = "/nix/store/pxf5ri5kdbfqkhd10sw4lpj8sn385ks5-nix-1.11.7";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 49b23fec4ecf..94cc7b9d2c48 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -103,10 +103,10 @@ in rec {
   nix = nixStable;
 
   nixStable = common rec {
-    name = "nix-1.11.6";
+    name = "nix-1.11.7";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3";
+      sha256 = "1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d";
     };
   };
 

From a9c875fc2e65e80324ce1e624abd2a765ae815f8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 16 Feb 2017 21:02:13 -0500
Subject: [PATCH 1014/3449] nixpkgs: allow packages to be marked insecure
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

If a package's meta has `knownVulnerabilities`, like so:

    stdenv.mkDerivation {
      name = "foobar-1.2.3";

      ...

      meta.knownVulnerabilities = [
        "CVE-0000-00000: remote code execution"
        "CVE-0000-00001: local privilege escalation"
      ];
    }

and a user attempts to install the package, they will be greeted with
a warning indicating that maybe they don't want to install it:

    error: Package ‘foobar-1.2.3’ in ‘...default.nix:20’ is marked as insecure, refusing to evaluate.

    Known issues:

     - CVE-0000-00000: remote code execution
     - CVE-0000-00001: local privilege escalation

    You can install it anyway by whitelisting this package, using the
    following methods:

    a) for `nixos-rebuild` you can add ‘foobar-1.2.3’ to
       `nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
       like so:

         {
           nixpkgs.config.permittedInsecurePackages = [
             "foobar-1.2.3"
           ];
         }

    b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
    ‘foobar-1.2.3’ to `permittedInsecurePackages` in
    ~/.config/nixpkgs/config.nix, like so:

         {
           permittedInsecurePackages = [
             "foobar-1.2.3"
           ];
         }

Adding either of these configurations will permit this specific
version to be installed. A third option also exists:

  NIXPKGS_ALLOW_INSECURE=1 nix-build ...

though I specifically avoided having a global file-based toggle to
disable this check. This way, users don't disable it once in order to
get a single package, and then don't realize future packages are
insecure.
---
 doc/configuration.xml                      | 224 ++++++++++++++++-----
 nixos/doc/manual/release-notes/rl-1703.xml |   8 +
 pkgs/stdenv/generic/default.nix            |  72 +++++--
 3 files changed, 245 insertions(+), 59 deletions(-)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index 12e3b8ae851a..064c72a76301 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -4,83 +4,213 @@
 
 <title>Global configuration</title>
 
-<para>Nix packages can be configured to allow or deny certain options.</para>
+<para>Nix comes with certain defaults about what packages can and
+cannot be installed, based on a package's metadata. By default, Nix
+will prevent installation if any of the following criteria are
+true:</para>
 
-<para>To apply the configuration edit
-<filename>~/.config/nixpkgs/config.nix</filename> and set it like
+<itemizedlist>
+  <listitem><para>The packages is thought to be broken, and has had
+  its <literal>meta.broken</literal> set to
+  <literal>true</literal>.</para></listitem>
 
+  <listitem><para>The package's <literal>meta.license</literal> is set
+  to a license which is considered to be unfree.</para></listitem>
+
+  <listitem><para>The package has known security vulnerabilities but
+  has not or can not be updated for some reason, and a list of issues
+  has been entered in to the package's
+  <literal>meta.knownVulnerabilities</literal>.</para></listitem>
+</itemizedlist>
+
+<para>Each of these criteria can be altering the nixpkgs
+configuration.</para>
+
+<para>The nixpkgs configuration for a NixOS system is set in the
+<literal>configuration.nix</literal>, as in the following example:
+<programlisting>
+{
+  nixpkgs.config = {
+    allowUnfree = true;
+  };
+}
+</programlisting>
+However, this does not allow unfree software for individual users.
+Their configurations are managed separately.</para>
+
+<para>A user's of nixpkgs configuration is stored in a user-specific
+configuration file located at
+<filename>~/.config/nixpkgs/config.nix</filename>. For example:
 <programlisting>
 {
   allowUnfree = true;
 }
 </programlisting>
+</para>
 
-and will allow the Nix package manager to install unfree licensed packages.</para>
+<section xml:id="sec-allow-broken">
+  <title>Installing broken packages</title>
 
-<para>The configuration as listed also applies to NixOS under
-<option>nixpkgs.config</option> set.</para>
 
-<itemizedlist>
+  <para>There are two ways to try compiling a package which has been
+  marked as broken.</para>
 
-  <listitem>
-    <para>Allow installing of packages that are distributed under
-    unfree license by setting <programlisting>allowUnfree =
-    true;</programlisting> or deny them by setting it to
-    <literal>false</literal>.</para>
+  <itemizedlist>
+    <listitem><para>
+      For allowing the build of a broken package once, you can use an
+      environment variable for a single invocation of the nix tools:
 
-    <para>Same can be achieved by setting the environment variable:
+      <programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>
+    </para></listitem>
+
+    <listitem><para>
+      For permanently allowing broken packages to be built, you may
+      add <literal>allowBroken = true;</literal> to your user's
+      configuration file, like this:
+
+      <programlisting>
+{
+  allowBroken = true;
+}</programlisting>
+    </para></listitem>
+  </itemizedlist>
+</section>
+
+<section xml:id="sec-allow-unfree">
+  <title>Installing unfree packages</title>
+
+  <para>There are several ways to tweak how Nix handles a package
+  which has been marked as unfree.</para>
+
+  <itemizedlist>
+    <listitem><para>
+      To temporarily allow all unfree packages, you can use an
+      environment variable for a single invocation of the nix tools:
+
+      <programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
+    </para></listitem>
+
+    <listitem><para>
+      It is possible to permanently allow individual unfree packages,
+      while still blocking unfree packages by default using the
+      <literal>allowUnfreePredicate</literal> configuration
+      option in the user configuration file.</para>
+
+      <para>This option is a function which accepts a package as a
+      parameter, and returns a boolean. The following example
+      configuration accepts a package and always returns false:
+<programlisting>
+{
+  allowUnfreePredicate = (pkg: false);
+}
+</programlisting>
+      </para>
+
+      <para>A more useful example, the following configuration allows
+      only allows flash player and visual studio code:
 
 <programlisting>
-$ export NIXPKGS_ALLOW_UNFREE=1
+{
+  allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
+}
 </programlisting>
+    </para></listitem>
 
-    </para>
-  </listitem>
+    <listitem>
+      <para>It is also possible to whitelist and blacklist licenses
+      that are specifically acceptable or not acceptable, using
+      <literal>whitelistedLicenses</literal> and
+      <literal>blacklistedLicenses</literal>, respectively.
+      </para>
 
-  <listitem>
-    <para>Whenever unfree packages are not allowed, single packages
-    can still be allowed by a predicate function that accepts package
-    as an argument and should return a boolean:
+      <para>The following example configuration whitelists the
+      licenses <literal>amd</literal> and <literal>wtfpl</literal>:
 
 <programlisting>
-allowUnfreePredicate = (pkg: ...);
+{
+  whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
+}
 </programlisting>
+      </para>
 
-    Example to allow flash player and visual studio code only:
+      <para>The following example configuration blacklists the
+      <literal>gpl3</literal> and <literal>agpl3</literal> licenses:
 
 <programlisting>
-allowUnfreePredicate = with builtins; (pkg: elem (parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
+{
+  blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
+}
 </programlisting>
+      </para>
+    </listitem>
+  </itemizedlist>
 
-    </para>
-  </listitem>
+  <para>A complete list of licenses can be found in the file
+  <filename>lib/licenses.nix</filename> of the nixpkgs tree.</para>
+</section>
 
-  <listitem>
-    <para>Whenever unfree packages are not allowed, packages can still
-    be whitelisted by their license:
+
+<section xml:id="sec-allow-insecure">
+  <title>
+    Installing insecure packages
+  </title>
+
+  <para>There are several ways to tweak how Nix handles a package
+  which has been marked as unfree.</para>
+
+  <itemizedlist>
+    <listitem><para>
+      To temporarily allow all insecure packages, you can use an
+      environment variable for a single invocation of the nix tools:
+
+      <programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>
+    </para></listitem>
+
+    <listitem><para>
+      It is possible to permanently allow individual insecure
+      packages, while still blocking other insecure packages by
+      default using the <literal>permittedInsecurePackages</literal>
+      configuration option in the user configuration file.</para>
+
+      <para>The following example configuration permits the
+      installation of the hypothetically insecure package
+      <literal>hello</literal>, version <literal>1.2.3</literal>:
+<programlisting>
+{
+  permittedInsecurePackages = [
+    "hello-1.2.3"
+  ];
+}
+</programlisting>
+      </para>
+    </listitem>
+
+    <listitem><para>
+      It is also possible to create a custom policy around which
+      insecure packages to allow and deny, by overriding the
+      <literal>allowInsecurePredicate</literal> configuration
+      option.</para>
+
+      <para>The <literal>allowInsecurePredicate</literal> option is a
+      function which accepts a package and returns a boolean, much
+      like <literal>allowUnfreePredicate</literal>.</para>
+
+      <para>The following configuration example only allows insecure
+      packages with very short names:
 
 <programlisting>
-whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
+{
+  allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) &lt;= 5);
+}
 </programlisting>
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>In addition to whitelisting licenses which are denied by the
-    <literal>allowUnfree</literal> setting, you can also explicitely
-    deny installation of packages which have a certain license:
-
-<programlisting>
-blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
-</programlisting>
-    </para>
-  </listitem>
-
-</itemizedlist>
-
-<para>A complete list of licenses can be found in the file
-<filename>lib/licenses.nix</filename> of the nix package tree.</para>
+      </para>
 
+      <para>Note that <literal>permittedInsecurePackages</literal> is
+      only checked if <literal>allowInsecurePredicate</literal> is not
+      specified.
+    </para></listitem>
+  </itemizedlist>
+</section>
 
 <!--============================================================-->
 
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 3758a3bf2aac..38693437059b 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -30,6 +30,14 @@ has the following highlights: </para>
   <listitem>
     <para>PHP now defaults to PHP 7.1</para>
   </listitem>
+
+  <listitem>
+    <para>Packages in nixpkgs can be marked as insecure through listed
+    vulnerabilities. See the <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs
+    manual</link> for more information.</para>
+  </listitem>
+
 </itemizedlist>
 
 <para>The following new services were added since the last release:</para>
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 34ba2fd8dd9c..cb94db48f4bd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -75,6 +75,14 @@ let
     isUnfree (lib.lists.toList attrs.meta.license) &&
     !allowUnfreePredicate attrs;
 
+  allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []);
+  allowInsecurePredicate = x: (config.allowUnfreePredicate or allowInsecureDefaultPredicate) x;
+
+  hasAllowedInsecure = attrs:
+    (attrs.meta.knownVulnerabilities or []) == [] ||
+    allowInsecurePredicate attrs ||
+    builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1";
+
   showLicense = license: license.shortName or "unknown";
 
   defaultNativeBuildInputs = extraBuildInputs ++
@@ -137,24 +145,62 @@ let
           builtins.unsafeGetAttrPos "name" attrs;
       pos'' = if pos' != null then "‘" + pos'.file + ":" + toString pos'.line + "’" else "«unknown-file»";
 
-      throwEvalHelp = { reason, errormsg }:
-        # uppercase the first character of string s
-        let up = s: with lib;
-          (toUpper (substring 0 1 s)) + (substring 1 (stringLength s) s);
-        in
-        assert builtins.elem reason ["unfree" "broken" "blacklisted"];
-
-        throw ("Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate."
-        + (lib.strings.optionalString (reason != "blacklisted") ''
 
+      remediation = {
+        unfree = remediate_whitelist "Unfree";
+        broken = remediate_whitelist "Broken";
+        blacklisted = x: "";
+        insecure = remediate_insecure;
+      };
+      remediate_whitelist = allow_attr: attrs:
+        ''
           a) For `nixos-rebuild` you can set
-            { nixpkgs.config.allow${up reason} = true; }
+            { nixpkgs.config.allow${allow_attr} = true; }
           in configuration.nix to override this.
 
           b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
-            { allow${up reason} = true; }
+            { allow${allow_attr} = true; }
           to ~/.config/nixpkgs/config.nix.
-        ''));
+        '';
+
+      remediate_insecure = attrs:
+        ''
+
+          Known issues:
+
+        '' + (lib.fold (issue: default: "${default} - ${issue}\n") "" attrs.meta.knownVulnerabilities) + ''
+
+          You can install it anyway by whitelisting this package, using the
+          following methods:
+
+          a) for `nixos-rebuild` you can add ‘${attrs.name or "«name-missing»"}’ to
+             `nixpkgs.config.permittedInsecurePackages` in the configuration.nix,
+             like so:
+
+               {
+                 nixpkgs.config.permittedInsecurePackages = [
+                   "${attrs.name or "«name-missing»"}"
+                 ];
+               }
+
+          b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
+          ‘${attrs.name or "«name-missing»"}’ to `permittedInsecurePackages` in
+          ~/.config/nixpkgs/config.nix, like so:
+
+               {
+                 permittedInsecurePackages = [
+                   "${attrs.name or "«name-missing»"}"
+                 ];
+               }
+
+        '';
+
+
+      throwEvalHelp = { reason , errormsg ? "" }:
+        throw (''
+          Package ‘${attrs.name or "«name-missing»"}’ in ${pos''} ${errormsg}, refusing to evaluate.
+
+          '' + ((builtins.getAttr reason remediation) attrs));
 
       # Check if a derivation is valid, that is whether it passes checks for
       # e.g brokenness or license.
@@ -171,6 +217,8 @@ let
           { valid = false; reason = "broken"; errormsg = "is marked as broken"; }
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
           { 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 { valid = true; };
 
       outputs' =

From 30cea5f02245a20022ea93f8eec2f4fe053ad97a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 22 Feb 2017 21:09:14 -0500
Subject: [PATCH 1015/3449] libplist: mark as insecure

Patches currently available don't seem to apply.
---
 pkgs/development/libraries/libplist/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 4de5a23569e8..b98fdbdb470d 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -28,5 +28,12 @@ in stdenv.mkDerivation rec {
     homepage = http://github.com/JonathanBeck/libplist;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.urkud ];
+    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"
+      "CVE-2017-5834: A heap-buffer overflow in parse_dict_node"
+      "CVE-2017-5835: A memory allocation error leading to DoS"
+      "CVE-2017-5836: A type inconsistency in bplist.c"
+    ];
   };
 }

From 0eefe9bc629388f60eaad99d0841cf1aae8592a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 24 Feb 2017 12:39:19 +0000
Subject: [PATCH 1016/3449] lxc: fix glibc 2.25 incompatibility

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index ccee2a18a907..bf3a05f11161 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -33,6 +33,14 @@ stdenv.mkDerivation rec {
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
+  # FIXME
+  # glibc 2.25 moved major()/minor() to <sys/sysmacros.h>.
+  # this commit should detect this: https://github.com/lxc/lxc/pull/1388/commits/af6824fce9c9536fbcabef8d5547f6c486f55fdf
+  # However autotools checks if mkdev is still defined in <sys/types.h> runs before
+  # checking if major()/minor() is defined there. The mkdev check succeeds with
+  # a warning and the check which should set MAJOR_IN_SYSMACROS is skipped.
+  NIX_CFLAGS_COMPILE = [ "-DMAJOR_IN_SYSMACROS" ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"

From 64d058f472b80477330b7f658a6bdae7670d6d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 24 Feb 2017 15:11:57 +0100
Subject: [PATCH 1017/3449] Revert "sensu: 0.17.1 -> 0.28.0"

This reverts commit 4588f94396c72334ed40a2c3eda51f18a33f03c4.

Because it breaks nixpkgs evaluation.
---
 pkgs/servers/monitoring/sensu/Gemfile.lock | 120 +++++----
 pkgs/servers/monitoring/sensu/default.nix  |  27 +--
 pkgs/servers/monitoring/sensu/gemset.nix   | 270 +++++++++++++--------
 3 files changed, 234 insertions(+), 183 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock
index ee425b6edf97..9f58be03b621 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/pkgs/servers/monitoring/sensu/Gemfile.lock
@@ -1,79 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (2.0.1)
-    amqp (1.6.0)
-      amq-protocol (>= 2.0.1)
+    amq-protocol (1.9.2)
+    amqp (1.5.0)
+      amq-protocol (>= 1.9.2)
       eventmachine
-    childprocess (0.5.8)
+    async_sinatra (1.0.0)
+      rack (>= 1.4.1)
+      sinatra (>= 1.3.2)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
-    em-http-server (0.1.8)
-      eventmachine
+    daemons (1.2.2)
+    em-redis-unified (0.6.0)
+      eventmachine (>= 0.12.10)
     em-worker (0.0.2)
       eventmachine
-    eventmachine (1.2.2)
-    ffi (1.9.17)
-    oj (2.14.6)
-    parse-cron (0.1.4)
-    sensu (0.28.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-logger (= 1.2.1)
-      sensu-redis (= 2.1.0)
-      sensu-settings (= 9.9.0)
-      sensu-spawn (= 2.2.1)
-      sensu-transport (= 7.0.2)
-    sensu-extension (1.5.1)
-      eventmachine
-    sensu-extensions (1.7.1)
+    eventmachine (1.0.3)
+    ffi (1.9.8)
+    multi_json (1.11.0)
+    rack (1.6.0)
+    rack-protection (1.5.3)
+      rack
+    sensu (0.17.1)
+      async_sinatra (= 1.0.0)
+      em-redis-unified (= 0.6.0)
+      eventmachine (= 1.0.3)
+      multi_json (= 1.11.0)
+      sensu-em (= 2.4.1)
+      sensu-extension (= 1.1.2)
+      sensu-extensions (= 1.2.0)
+      sensu-logger (= 1.0.0)
+      sensu-settings (= 1.3.0)
+      sensu-spawn (= 1.1.0)
+      sensu-transport (= 2.4.0)
+      sinatra (= 1.3.5)
+      thin (= 1.5.0)
+      uuidtools (= 2.1.4)
+    sensu-em (2.4.1)
+    sensu-extension (1.1.2)
+      sensu-em
+    sensu-extensions (1.2.0)
+      multi_json
+      sensu-em
       sensu-extension
-      sensu-extensions-debug (= 1.0.0)
-      sensu-extensions-json (= 1.0.0)
-      sensu-extensions-occurrences (= 1.1.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-debug (1.0.0)
-      sensu-extension
-    sensu-extensions-json (1.0.0)
-      sensu-extension
-    sensu-extensions-occurrences (1.1.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-logger (1.2.1)
-      eventmachine
-      sensu-json
-    sensu-redis (2.1.0)
-      eventmachine
-    sensu-settings (9.9.0)
-      parse-cron
-      sensu-json (>= 1.1.0)
-    sensu-spawn (2.2.1)
-      childprocess (= 0.5.8)
+    sensu-logger (1.0.0)
+      multi_json
+      sensu-em
+    sensu-settings (1.3.0)
+      multi_json
+    sensu-spawn (1.1.0)
+      childprocess (= 0.5.3)
       em-worker (= 0.0.2)
-      eventmachine
-    sensu-transport (7.0.2)
-      amq-protocol (= 2.0.1)
-      amqp (= 1.6.0)
-      eventmachine
-      sensu-redis (>= 1.0.0)
+      sensu-em
+    sensu-transport (2.4.0)
+      amqp (= 1.5.0)
+      sensu-em
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    thin (1.5.0)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    tilt (1.4.1)
+    uuidtools (2.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   sensu
-
-BUNDLED WITH
-   1.14.4
diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix
index ab896766272c..ecc1d4109843 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/pkgs/servers/monitoring/sensu/default.nix
@@ -1,17 +1,16 @@
-{ lib, bundlerEnv, ruby }:
+  { lib, bundlerEnv, ruby }:
 
-bundlerEnv {
-  name = "sensu-${version}";
-  version = (import gemset).sensu.version;
+  bundlerEnv {
+    name = "sensu-0.17.1";
 
-  inherit ruby;
-  gemdir = ./.;
+    inherit ruby;
+    gemdir = ./.;
 
-  meta = with lib; {
-    description = "A monitoring framework that aims to be simple, malleable, and scalable";
-    homepage    = http://sensuapp.org/;
-    license     = licenses.mit;
-    maintainers = with maintainers; [ theuni peterhoeg ];
-    platforms   = platforms.unix;
-  };
-}
+    meta = with lib; {
+      description = "A monitoring framework that aims to be simple, malleable, and scalable";
+      homepage    = http://sensuapp.org/;
+      license     = licenses.mit;
+      maintainers = with maintainers; [ theuni ];
+      platforms   = platforms.unix;
+    };
+  }
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix
index 273496e2fb42..116bce9c4b53 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/pkgs/servers/monitoring/sensu/gemset.nix
@@ -1,186 +1,242 @@
 {
-  amq-protocol = {
+  "amq-protocol" = {
+    version = "1.9.2";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x";
       type = "gem";
+      sha256 = "1gl479j003vixfph5jmdskl20il8816y0flp4msrc8im3b5iiq3r";
     };
-    version = "2.0.1";
   };
-  amqp = {
+  "amqp" = {
+    version = "1.5.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9";
       type = "gem";
+      sha256 = "0jlcwyvjz0b28wxdabkyhdqyqp5ji56ckfywsy9mgp0m4wfbrh8c";
     };
-    version = "1.6.0";
+    dependencies = [
+      "amq-protocol"
+      "eventmachine"
+    ];
   };
-  childprocess = {
+  "async_sinatra" = {
+    version = "1.0.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0";
       type = "gem";
+      sha256 = "02yi9qfsi8kk4a4p1c4sx4pgism05m18kwlc9dd23zzdy9jdgq1a";
     };
-    version = "0.5.8";
+    dependencies = [
+      "rack"
+      "sinatra"
+    ];
   };
-  em-http-server = {
+  "childprocess" = {
+    version = "0.5.3";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5";
       type = "gem";
+      sha256 = "12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww";
     };
-    version = "0.1.8";
+    dependencies = [
+      "ffi"
+    ];
   };
-  em-worker = {
-    dependencies = ["eventmachine"];
-    source = {
-      sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
-  eventmachine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00mlcq33q104spkb5c997lwallpilhj0d6fzsbd4lr9s8lmjga5f";
-      type = "gem";
-    };
+  "daemons" = {
     version = "1.2.2";
-  };
-  ffi = {
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7";
       type = "gem";
+      sha256 = "121c7vkimg3baxga69xvdkwxiq8wkmxqvdbyqi5i82vhih5d3cn3";
     };
-    version = "1.9.17";
   };
-  oj = {
+  "em-redis-unified" = {
+    version = "0.6.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk";
       type = "gem";
+      sha256 = "1hf7dv6qmxfilpd7crcqlyqk6jp5z8md76bpg3n0163ps4ra73p0";
     };
-    version = "2.14.6";
+    dependencies = [
+      "eventmachine"
+    ];
   };
-  parse-cron = {
+  "em-worker" = {
+    version = "0.0.2";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg";
       type = "gem";
+      sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
     };
-    version = "0.1.4";
+    dependencies = [
+      "eventmachine"
+    ];
   };
-  sensu = {
+  "eventmachine" = {
+    version = "1.0.3";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx";
       type = "gem";
+      sha256 = "09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil";
     };
-    version = "0.28.0";
   };
-  sensu-extension = {
+  "ffi" = {
+    version = "1.9.8";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3";
       type = "gem";
+      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
     };
-    version = "1.5.1";
   };
-  sensu-extensions = {
+  "multi_json" = {
+    version = "1.11.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g";
       type = "gem";
+      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
     };
-    version = "1.7.1";
   };
-  sensu-extensions-debug = {
+  "rack" = {
+    version = "1.6.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp";
       type = "gem";
+      sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb";
     };
+  };
+  "rack-protection" = {
+    version = "1.5.3";
+    source = {
+      type = "gem";
+      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+    };
+    dependencies = [
+      "rack"
+    ];
+  };
+  "sensu" = {
+    version = "0.17.1";
+    source = {
+      type = "gem";
+      sha256 = "1fqpypins1zhind0in0ax0y97a6pf3z85gwjz4bjm6cjrkarb5zj";
+    };
+    dependencies = [
+      "async_sinatra"
+      "em-redis-unified"
+      "eventmachine"
+      "multi_json"
+      "sensu-em"
+      "sensu-extension"
+      "sensu-extensions"
+      "sensu-logger"
+      "sensu-settings"
+      "sensu-spawn"
+      "sensu-transport"
+      "sinatra"
+      "thin"
+      "uuidtools"
+    ];
+  };
+  "sensu-em" = {
+    version = "2.4.1";
+    source = {
+      type = "gem";
+      sha256 = "08jz47lfnv55c9yl2dhyv1si6zl8h4xj8y1sjy2h2fqy48prfgmy";
+    };
+  };
+  "sensu-extension" = {
+    version = "1.1.2";
+    source = {
+      type = "gem";
+      sha256 = "19qz22fcb3xjz9p5npghlcvxkf8h1rsfws3j988ybnimmmmiqm24";
+    };
+    dependencies = [
+      "sensu-em"
+    ];
+  };
+  "sensu-extensions" = {
+    version = "1.2.0";
+    source = {
+      type = "gem";
+      sha256 = "1b8978g1ww7vdrsw7zvba6qvc56s4vfm1hw3szw3j1gsk6j0vb81";
+    };
+    dependencies = [
+      "multi_json"
+      "sensu-em"
+      "sensu-extension"
+      "sensu-logger"
+      "sensu-settings"
+    ];
+  };
+  "sensu-logger" = {
     version = "1.0.0";
-  };
-  sensu-extensions-json = {
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g";
       type = "gem";
+      sha256 = "0vwa2b5wa9xqzb9lmhma49171iabwbnnnyhhhaii8n6j4axvar93";
     };
-    version = "1.0.0";
+    dependencies = [
+      "multi_json"
+      "sensu-em"
+    ];
   };
-  sensu-extensions-occurrences = {
+  "sensu-settings" = {
+    version = "1.3.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja";
       type = "gem";
+      sha256 = "0s9fyqhq5vf9m9937n3wczlr4z62rn1ydc6m53vn4156fpim6yga";
     };
+    dependencies = [
+      "multi_json"
+    ];
+  };
+  "sensu-spawn" = {
     version = "1.1.0";
-  };
-  sensu-extensions-only-check-output = {
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3";
       type = "gem";
+      sha256 = "0w9z6hpr27lq02y6c2mnrdl9xpsjfg77kzsfsp2f2w4swdwmiv0v";
     };
-    version = "1.0.0";
+    dependencies = [
+      "childprocess"
+      "em-worker"
+      "sensu-em"
+    ];
   };
-  sensu-extensions-ruby-hash = {
+  "sensu-transport" = {
+    version = "2.4.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3";
       type = "gem";
+      sha256 = "0gh8rcl22daax7qng93kj2jydql1jhhskd37kj7sgz0rr8wy2x06";
     };
-    version = "1.0.0";
+    dependencies = [
+      "amqp"
+      "sensu-em"
+    ];
   };
-  sensu-json = {
+  "sinatra" = {
+    version = "1.3.5";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4";
       type = "gem";
+      sha256 = "1mn6nzfyirfqr7prhsn4nr3k481c6nzsad2p9s1xnsbvxa1vkqwr";
     };
-    version = "2.0.1";
+    dependencies = [
+      "rack"
+      "rack-protection"
+      "tilt"
+    ];
   };
-  sensu-logger = {
+  "thin" = {
+    version = "1.5.0";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0";
       type = "gem";
+      sha256 = "14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1";
     };
-    version = "1.2.1";
+    dependencies = [
+      "daemons"
+      "eventmachine"
+      "rack"
+    ];
   };
-  sensu-redis = {
+  "tilt" = {
+    version = "1.4.1";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg";
       type = "gem";
+      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
     };
-    version = "2.1.0";
   };
-  sensu-settings = {
+  "uuidtools" = {
+    version = "2.1.4";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i";
       type = "gem";
+      sha256 = "1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3";
     };
-    version = "9.9.0";
-  };
-  sensu-spawn = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7";
-      type = "gem";
-    };
-    version = "2.2.1";
-  };
-  sensu-transport = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr";
-      type = "gem";
-    };
-    version = "7.0.2";
   };
 }
\ No newline at end of file

From 417dbaf6a34552f0c7d959e5a63e6672ff85c4d7 Mon Sep 17 00:00:00 2001
From: Mogria <m0gr14@gmail.com>
Date: Fri, 24 Feb 2017 16:36:58 +0100
Subject: [PATCH 1018/3449] findutils: updatedb now uses writable database
 outside of /nix/store by default

updatedb could only be run by providing the --output parameter,
because it would use a path inside the nix store as it's database.
The default for --output is now /var/cache/locatedb (the same
as in the NixOS locate service)
---
 pkgs/tools/misc/findutils/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 8bedbeb12fef..8906564ade5b 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "info" ];
 
+  configureFlags = [ "--localstatedir=/var/cache" ];
+
   crossAttrs = {
     # http://osdir.com/ml/bug-findutils-gnu/2009-08/msg00026.html
     configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];

From eae1866c28424be02cb1244a36010d776517f727 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 22 Feb 2017 20:18:05 +0800
Subject: [PATCH 1019/3449] sensu: 0.17.1 -> 0.28.0

---
 pkgs/servers/monitoring/sensu/Gemfile.lock | 120 ++++----
 pkgs/servers/monitoring/sensu/default.nix  |  27 +-
 pkgs/servers/monitoring/sensu/gemset.nix   | 310 +++++++++------------
 3 files changed, 203 insertions(+), 254 deletions(-)

diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock
index 9f58be03b621..ee425b6edf97 100644
--- a/pkgs/servers/monitoring/sensu/Gemfile.lock
+++ b/pkgs/servers/monitoring/sensu/Gemfile.lock
@@ -1,75 +1,79 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-protocol (1.9.2)
-    amqp (1.5.0)
-      amq-protocol (>= 1.9.2)
+    amq-protocol (2.0.1)
+    amqp (1.6.0)
+      amq-protocol (>= 2.0.1)
       eventmachine
-    async_sinatra (1.0.0)
-      rack (>= 1.4.1)
-      sinatra (>= 1.3.2)
-    childprocess (0.5.3)
+    childprocess (0.5.8)
       ffi (~> 1.0, >= 1.0.11)
-    daemons (1.2.2)
-    em-redis-unified (0.6.0)
-      eventmachine (>= 0.12.10)
+    em-http-server (0.1.8)
+      eventmachine
     em-worker (0.0.2)
       eventmachine
-    eventmachine (1.0.3)
-    ffi (1.9.8)
-    multi_json (1.11.0)
-    rack (1.6.0)
-    rack-protection (1.5.3)
-      rack
-    sensu (0.17.1)
-      async_sinatra (= 1.0.0)
-      em-redis-unified (= 0.6.0)
-      eventmachine (= 1.0.3)
-      multi_json (= 1.11.0)
-      sensu-em (= 2.4.1)
-      sensu-extension (= 1.1.2)
-      sensu-extensions (= 1.2.0)
-      sensu-logger (= 1.0.0)
-      sensu-settings (= 1.3.0)
-      sensu-spawn (= 1.1.0)
-      sensu-transport (= 2.4.0)
-      sinatra (= 1.3.5)
-      thin (= 1.5.0)
-      uuidtools (= 2.1.4)
-    sensu-em (2.4.1)
-    sensu-extension (1.1.2)
-      sensu-em
-    sensu-extensions (1.2.0)
-      multi_json
-      sensu-em
+    eventmachine (1.2.2)
+    ffi (1.9.17)
+    oj (2.14.6)
+    parse-cron (0.1.4)
+    sensu (0.28.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-logger (= 1.2.1)
+      sensu-redis (= 2.1.0)
+      sensu-settings (= 9.9.0)
+      sensu-spawn (= 2.2.1)
+      sensu-transport (= 7.0.2)
+    sensu-extension (1.5.1)
+      eventmachine
+    sensu-extensions (1.7.1)
       sensu-extension
+      sensu-extensions-debug (= 1.0.0)
+      sensu-extensions-json (= 1.0.0)
+      sensu-extensions-occurrences (= 1.1.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-logger (1.0.0)
-      multi_json
-      sensu-em
-    sensu-settings (1.3.0)
-      multi_json
-    sensu-spawn (1.1.0)
-      childprocess (= 0.5.3)
+    sensu-extensions-debug (1.0.0)
+      sensu-extension
+    sensu-extensions-json (1.0.0)
+      sensu-extension
+    sensu-extensions-occurrences (1.1.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-logger (1.2.1)
+      eventmachine
+      sensu-json
+    sensu-redis (2.1.0)
+      eventmachine
+    sensu-settings (9.9.0)
+      parse-cron
+      sensu-json (>= 1.1.0)
+    sensu-spawn (2.2.1)
+      childprocess (= 0.5.8)
       em-worker (= 0.0.2)
-      sensu-em
-    sensu-transport (2.4.0)
-      amqp (= 1.5.0)
-      sensu-em
-    sinatra (1.3.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    thin (1.5.0)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    tilt (1.4.1)
-    uuidtools (2.1.4)
+      eventmachine
+    sensu-transport (7.0.2)
+      amq-protocol (= 2.0.1)
+      amqp (= 1.6.0)
+      eventmachine
+      sensu-redis (>= 1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   sensu
+
+BUNDLED WITH
+   1.14.4
diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix
index ecc1d4109843..c0a2c3ca49e5 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/pkgs/servers/monitoring/sensu/default.nix
@@ -1,16 +1,17 @@
-  { lib, bundlerEnv, ruby }:
+{ lib, bundlerEnv, ruby }:
 
-  bundlerEnv {
-    name = "sensu-0.17.1";
+bundlerEnv rec {
+  name = "sensu-${version}";
+  version = (import ./gemset.nix).sensu.version;
 
-    inherit ruby;
-    gemdir = ./.;
+  inherit ruby;
+  gemdir = ./.;
 
-    meta = with lib; {
-      description = "A monitoring framework that aims to be simple, malleable, and scalable";
-      homepage    = http://sensuapp.org/;
-      license     = licenses.mit;
-      maintainers = with maintainers; [ theuni ];
-      platforms   = platforms.unix;
-    };
-  }
+  meta = with lib; {
+    description = "A monitoring framework that aims to be simple, malleable, and scalable";
+    homepage    = http://sensuapp.org/;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ theuni peterhoeg ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/sensu/gemset.nix b/pkgs/servers/monitoring/sensu/gemset.nix
index 116bce9c4b53..273496e2fb42 100644
--- a/pkgs/servers/monitoring/sensu/gemset.nix
+++ b/pkgs/servers/monitoring/sensu/gemset.nix
@@ -1,242 +1,186 @@
 {
-  "amq-protocol" = {
-    version = "1.9.2";
+  amq-protocol = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x";
       type = "gem";
-      sha256 = "1gl479j003vixfph5jmdskl20il8816y0flp4msrc8im3b5iiq3r";
     };
+    version = "2.0.1";
   };
-  "amqp" = {
-    version = "1.5.0";
+  amqp = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9";
       type = "gem";
-      sha256 = "0jlcwyvjz0b28wxdabkyhdqyqp5ji56ckfywsy9mgp0m4wfbrh8c";
     };
-    dependencies = [
-      "amq-protocol"
-      "eventmachine"
-    ];
-  };
-  "async_sinatra" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "02yi9qfsi8kk4a4p1c4sx4pgism05m18kwlc9dd23zzdy9jdgq1a";
-    };
-    dependencies = [
-      "rack"
-      "sinatra"
-    ];
-  };
-  "childprocess" = {
-    version = "0.5.3";
-    source = {
-      type = "gem";
-      sha256 = "12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww";
-    };
-    dependencies = [
-      "ffi"
-    ];
-  };
-  "daemons" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "121c7vkimg3baxga69xvdkwxiq8wkmxqvdbyqi5i82vhih5d3cn3";
-    };
-  };
-  "em-redis-unified" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "1hf7dv6qmxfilpd7crcqlyqk6jp5z8md76bpg3n0163ps4ra73p0";
-    };
-    dependencies = [
-      "eventmachine"
-    ];
-  };
-  "em-worker" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
-    };
-    dependencies = [
-      "eventmachine"
-    ];
-  };
-  "eventmachine" = {
-    version = "1.0.3";
-    source = {
-      type = "gem";
-      sha256 = "09sqlsb6x9ddlgfw5gsw7z0yjg5m2qfjiqkz2fx70zsizj3lqhil";
-    };
-  };
-  "ffi" = {
-    version = "1.9.8";
-    source = {
-      type = "gem";
-      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
-    };
-  };
-  "multi_json" = {
-    version = "1.11.0";
-    source = {
-      type = "gem";
-      sha256 = "1mg3hp17ch8bkf3ndj40s50yjs0vrqbfh3aq5r02jkpjkh23wgxl";
-    };
-  };
-  "rack" = {
     version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "1f57f8xmrgfgd76s6mq7vx6i266zm4330igw71an1g0kh3a42sbb";
-    };
   };
-  "rack-protection" = {
-    version = "1.5.3";
+  childprocess = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0";
       type = "gem";
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
     };
-    dependencies = [
-      "rack"
-    ];
+    version = "0.5.8";
   };
-  "sensu" = {
-    version = "0.17.1";
+  em-http-server = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5";
       type = "gem";
-      sha256 = "1fqpypins1zhind0in0ax0y97a6pf3z85gwjz4bjm6cjrkarb5zj";
     };
-    dependencies = [
-      "async_sinatra"
-      "em-redis-unified"
-      "eventmachine"
-      "multi_json"
-      "sensu-em"
-      "sensu-extension"
-      "sensu-extensions"
-      "sensu-logger"
-      "sensu-settings"
-      "sensu-spawn"
-      "sensu-transport"
-      "sinatra"
-      "thin"
-      "uuidtools"
-    ];
+    version = "0.1.8";
   };
-  "sensu-em" = {
-    version = "2.4.1";
+  em-worker = {
+    dependencies = ["eventmachine"];
     source = {
+      sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk";
       type = "gem";
-      sha256 = "08jz47lfnv55c9yl2dhyv1si6zl8h4xj8y1sjy2h2fqy48prfgmy";
     };
+    version = "0.0.2";
   };
-  "sensu-extension" = {
-    version = "1.1.2";
+  eventmachine = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00mlcq33q104spkb5c997lwallpilhj0d6fzsbd4lr9s8lmjga5f";
       type = "gem";
-      sha256 = "19qz22fcb3xjz9p5npghlcvxkf8h1rsfws3j988ybnimmmmiqm24";
     };
-    dependencies = [
-      "sensu-em"
-    ];
+    version = "1.2.2";
   };
-  "sensu-extensions" = {
-    version = "1.2.0";
+  ffi = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07hnyr47mndsjfanzh348wm3fxjx9nx68mdb3cpsdvfqrxnz97s7";
       type = "gem";
-      sha256 = "1b8978g1ww7vdrsw7zvba6qvc56s4vfm1hw3szw3j1gsk6j0vb81";
     };
-    dependencies = [
-      "multi_json"
-      "sensu-em"
-      "sensu-extension"
-      "sensu-logger"
-      "sensu-settings"
-    ];
+    version = "1.9.17";
   };
-  "sensu-logger" = {
+  oj = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pa9vmbxivplphad4ddjy30ylbb3bi61y13vmwx4llz3svl8r8kk";
+      type = "gem";
+    };
+    version = "2.14.6";
+  };
+  parse-cron = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  sensu = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dbyc1wylg9ligr1slv60myhbzdbja96v3srb3xrirv6vl33npqx";
+      type = "gem";
+    };
+    version = "0.28.0";
+  };
+  sensu-extension = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lgmjxfbq11v4yi3qanf1qxv0sgm1a8a7wj7qyn1nkva6zmimss3";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
+  sensu-extensions = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0axjqak7yhhznhs9f4q8km7ikha5khglwqsc33scck13hsvw9l6g";
+      type = "gem";
+    };
+    version = "1.7.1";
+  };
+  sensu-extensions-debug = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp";
+      type = "gem";
+    };
     version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0vwa2b5wa9xqzb9lmhma49171iabwbnnnyhhhaii8n6j4axvar93";
-    };
-    dependencies = [
-      "multi_json"
-      "sensu-em"
-    ];
   };
-  "sensu-settings" = {
-    version = "1.3.0";
+  sensu-extensions-json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g";
       type = "gem";
-      sha256 = "0s9fyqhq5vf9m9937n3wczlr4z62rn1ydc6m53vn4156fpim6yga";
     };
-    dependencies = [
-      "multi_json"
-    ];
+    version = "1.0.0";
   };
-  "sensu-spawn" = {
+  sensu-extensions-occurrences = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xi9888gp3lz5fik1k32bc1c6sjp7rr551p8dr5i3hsm5ii7blja";
+      type = "gem";
+    };
     version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0w9z6hpr27lq02y6c2mnrdl9xpsjfg77kzsfsp2f2w4swdwmiv0v";
-    };
-    dependencies = [
-      "childprocess"
-      "em-worker"
-      "sensu-em"
-    ];
   };
-  "sensu-transport" = {
-    version = "2.4.0";
+  sensu-extensions-only-check-output = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3";
       type = "gem";
-      sha256 = "0gh8rcl22daax7qng93kj2jydql1jhhskd37kj7sgz0rr8wy2x06";
     };
-    dependencies = [
-      "amqp"
-      "sensu-em"
-    ];
+    version = "1.0.0";
   };
-  "sinatra" = {
-    version = "1.3.5";
+  sensu-extensions-ruby-hash = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3";
       type = "gem";
-      sha256 = "1mn6nzfyirfqr7prhsn4nr3k481c6nzsad2p9s1xnsbvxa1vkqwr";
     };
-    dependencies = [
-      "rack"
-      "rack-protection"
-      "tilt"
-    ];
+    version = "1.0.0";
   };
-  "thin" = {
-    version = "1.5.0";
+  sensu-json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08bn8a5fscbhc9mcjg5avwjjbwxn28b48336bdxx87yng0wyafm4";
       type = "gem";
-      sha256 = "14sd2qbbk6y108z6v723mh3f1mk8s4fwxmmn9f8dk4xkhk4rwvq1";
     };
-    dependencies = [
-      "daemons"
-      "eventmachine"
-      "rack"
-    ];
+    version = "2.0.1";
   };
-  "tilt" = {
-    version = "1.4.1";
+  sensu-logger = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03kicjqz8a594bxnwyg6bcd4fipy2vxjl1gbaip4gpixxki32dx0";
       type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
     };
+    version = "1.2.1";
   };
-  "uuidtools" = {
-    version = "2.1.4";
+  sensu-redis = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10axrjg2q569bjdchpjsdillzszifkgkayaz390hnf876mssqwcg";
       type = "gem";
-      sha256 = "1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3";
     };
+    version = "2.1.0";
+  };
+  sensu-settings = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bs66zmhs7yrwywvfhbld051d83f3nypmk2rf8dfn19ijzk4ch9i";
+      type = "gem";
+    };
+    version = "9.9.0";
+  };
+  sensu-spawn = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vz5kbqk3ld0s16zjl8m38l1m1xwcvjlfc1g4nfm45qxdyfn7la7";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  sensu-transport = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15yib92hwyd8v04wcc0kaw0p8w2c2mwvi4ldya2jh3dqgs31mvhr";
+      type = "gem";
+    };
+    version = "7.0.2";
   };
 }
\ No newline at end of file

From 1fe6ed53925f316752f78638e4d0c920a5909295 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Fri, 24 Feb 2017 10:12:24 +0100
Subject: [PATCH 1020/3449] hexio: unstable -> 1.0-RC1

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

diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix
index 6d75c7256ee0..7078e2a37271 100644
--- a/pkgs/development/tools/hexio/default.nix
+++ b/pkgs/development/tools/hexio/default.nix
@@ -1,18 +1,19 @@
-{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth, glibc }:
+{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth }:
 
 stdenv.mkDerivation rec {
   pname = "hexio";
   name = "${pname}-${version}";
-  version = "201605";
+  version = "1.0-RC1";
 
   src = fetchFromGitHub {
     sha256 = "08jxkdi0gjsi8s793f9kdlad0a58a0xpsaayrsnpn9bpmm5cgihq";
-    rev = "f6f963bd0fcd2808977e0ad82dcb3100691cdd7c";
+    rev = "version-${version}";
     owner = "vanrein";
     repo = "hexio";
   };
 
-  buildInputs = [ python pcsclite pth glibc ];
+  propagatedBuildInputs = [ python ];
+  buildInputs = [ pcsclite pth ];
 
   patchPhase = ''
     substituteInPlace Makefile \

From 7cc86f79b4de77c34100f331e6326ac942aee2c4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Feb 2017 23:28:06 +0100
Subject: [PATCH 1021/3449] mumble: 1.2.17 -> 1.2.19

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

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 92fe9c9d01be..7c773b0db8ba 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -108,12 +108,12 @@ let
   };
 
   stableSource = rec {
-    version = "1.2.17";
+    version = "1.2.19";
     qtVersion = 4;
 
     src = fetchurl {
       url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
-      sha256 = "176br3b0pv5sz3zvgzsz9rxr3n79irlm902h7n1wh4f6vbph2dhw";
+      sha256 = "1s60vaici3v034jzzi20x23hsj6mkjlc0glipjq4hffrg9qgnizh";
     };
   };
 

From 114ae6baab5dc4baaf2f88c9f222513df48b49be Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 24 Feb 2017 17:34:45 +0100
Subject: [PATCH 1022/3449] unbound: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 83d3d88729df..6cbd505103bf 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb";
+    sha256 = "000lylg5qgriaxh6k78l2inb905qshx01kxgmqj89zn08gvn7ps2";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

From f15cebd28cd010549f4331cbd9968d3ac22cc146 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 24 Feb 2017 17:49:32 +0100
Subject: [PATCH 1023/3449] jool: 3.5.0 -> 3.5.2

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

diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
index 0f2038fb2e39..ee47ee118551 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.0";
+  version = "3.5.2";
   src = fetchzip {
     url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip";
-    sha256 = "06jp6gpfryn66q0z4w3gwkvfr17bcrjvys597nj49pxfiz4vczb2";
+    sha256 = "0gmjdi50c9wfapikniy2i1cfhz124pp7q02a0vbwxw7f21llcv8x";
   };
 }

From 76ae7e19a9fa95b7111e244eeb3b8083a333477a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 24 Feb 2017 17:43:58 +0100
Subject: [PATCH 1024/3449] lxc: fix build for glibc-2.25

---
 pkgs/os-specific/linux/lxc/default.nix        |  1 +
 .../linux/lxc/fix-glibc-2.25.patch            | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index bf3a05f11161..1f0cd69e5949 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./support-db2x.patch
+    ./fix-glibc-2.25.patch
   ];
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
diff --git a/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch b/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch
new file mode 100644
index 000000000000..3896813a58e9
--- /dev/null
+++ b/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch
@@ -0,0 +1,36 @@
+diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
+index 75de17f..d6d98e4 100644
+--- a/src/lxc/bdev/lxclvm.c
++++ b/src/lxc/bdev/lxclvm.c
+@@ -30,6 +30,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/wait.h>
++#include <sys/sysmacros.h>
+ 
+ #include "bdev.h"
+ #include "config.h"
+diff --git a/src/lxc/conf.c b/src/lxc/conf.c
+index a93124b..948d716 100644
+--- a/src/lxc/conf.c
++++ b/src/lxc/conf.c
+@@ -48,6 +48,7 @@
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+ #include <sys/syscall.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/utsname.h>
+ #include <sys/wait.h>
+diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
+index 0dbbf2c..7135222 100644
+--- a/src/lxc/lxccontainer.c
++++ b/src/lxc/lxccontainer.c
+@@ -34,6 +34,7 @@
+ #include <sys/mman.h>
+ #include <sys/mount.h>
+ #include <sys/syscall.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 

From 41b56b4b8abe10ee1a191c336ac90e1dd5081c0a Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 22 Feb 2017 16:13:11 -0800
Subject: [PATCH 1025/3449] f2fs module: add crc32 dependency to initrd kernel
 modules, closes #23093

f2fs.fsck depends on crc32 module being present in the initrd system,
otherwise, if f2fs is used as the root disk, the system is unbootable.
---
 nixos/modules/tasks/filesystems/f2fs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems/f2fs.nix b/nixos/modules/tasks/filesystems/f2fs.nix
index 430ac630a885..d103ff1a57b5 100644
--- a/nixos/modules/tasks/filesystems/f2fs.nix
+++ b/nixos/modules/tasks/filesystems/f2fs.nix
@@ -10,7 +10,7 @@ in
 
     system.fsPackages = [ pkgs.f2fs-tools ];
 
-    boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" ];
+    boot.initrd.availableKernelModules = mkIf inInitrd [ "f2fs" "crc32" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd ''
       copy_bin_and_libs ${pkgs.f2fs-tools}/sbin/fsck.f2fs

From 71739f348e5d1e277d737f990b4836d119d149f4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 24 Feb 2017 06:47:05 +0000
Subject: [PATCH 1026/3449] Revert "ocamlPackages.spacetime: only build with
 ocaml-4.04"

This reverts commit f18ac15dcad7d07f6c9c31b049a45bba9cd77b2a.
---
 pkgs/top-level/ocaml-packages.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e9567a958595..5ad601af15da 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -399,10 +399,7 @@ let
 
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
-    spacetime_lib = if lib.versionOlder "4.04" ocaml.version then
-    callPackage ../development/tools/ocaml/ocamlbuild { }
-    else
-    null;
+    spacetime_lib = callPackage ../development/ocaml-modules/spacetime_lib { };
 
     sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { };
 

From 9493ced9f7b03d7c5868c2f0442f9d91f232c226 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 24 Feb 2017 07:15:21 +0000
Subject: [PATCH 1027/3449] ocamlPackages.{ojquery,tuntap,uri}: adds ocamlbuild
 as dependency

---
 pkgs/development/ocaml-modules/ojquery/default.nix | 4 ++--
 pkgs/development/ocaml-modules/tuntap/default.nix  | 4 ++--
 pkgs/development/ocaml-modules/uri/default.nix     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix
index 93da2ed693aa..ec4a6114810b 100644
--- a/pkgs/development/ocaml-modules/ojquery/default.nix
+++ b/pkgs/development/ocaml-modules/ojquery/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, ocaml, findlib, js_of_ocaml, camlp4 }:
+{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, camlp4 }:
 
 stdenv.mkDerivation rec {
   version = "0.1";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1n01bsk4car40p94fk1ssvww0inqapwwhdylmrb7vv40drsdldp1";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ js_of_ocaml camlp4 ];
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix
index de520c643fe2..3a3e90c9d0fa 100644
--- a/pkgs/development/ocaml-modules/tuntap/default.nix
+++ b/pkgs/development/ocaml-modules/tuntap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, ipaddr }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ipaddr }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ ipaddr ];
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix
index c7d991504ec9..ae41c8729607 100644
--- a/pkgs/development/ocaml-modules/uri/default.nix
+++ b/pkgs/development/ocaml-modules/uri/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, re, stringext, ounit
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit
 , sexplib, ppx_sexp_conv
 , legacyVersion ? false
 , sexplib_p4
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     inherit sha256;
   };
 
-  buildInputs = [ ocaml findlib ounit ]
+  buildInputs = [ ocaml findlib ocamlbuild ounit ]
   ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv;
   propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ];
 

From 690968df54612b41c7104095cfa23fd40aaf30df Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 24 Feb 2017 19:21:29 +0000
Subject: [PATCH 1028/3449] ocamlPackages.utop: 1.19.2 -> 1.19.3

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

diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix
index b8740bc37932..9b41a06c9355 100644
--- a/pkgs/development/tools/ocaml/utop/default.nix
+++ b/pkgs/development/tools/ocaml/utop/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.19.2";
+  version = "1.19.3";
   name = "utop-${version}";
 
   src = fetchurl {
     url = "https://github.com/diml/utop/archive/${version}.tar.gz";
-    sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh";
+    sha256 = "16z02vp9n97iax4fqpbi7v86r75vbabxvnd1rirh8w2miixs1g4x";
   };
 
   buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   createFindlibDestdir = true;
 
   configureFlags = [ "--enable-camlp4" ]
-  ++ stdenv.lib.optional (ppx_tools != null) "--enable-interact";
+  ++ stdenv.lib.optional (ppx_tools != null && !stdenv.lib.versionAtLeast ocaml.version "4.04") "--enable-interact";
 
   buildPhase = ''
     make

From b846ce524325f4cfea688b41661e5caea18a2dcf Mon Sep 17 00:00:00 2001
From: Tanner Doshier <git@doshitan.com>
Date: Tue, 14 Feb 2017 13:45:00 -0600
Subject: [PATCH 1029/3449] prometheus service: fix basic auth option

If some configuration is provided, we need to filter out the `_module` key or
else it breaks prometheus.
---
 nixos/modules/services/monitoring/prometheus/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix
index a07445ce167c..cf9deccbffe2 100644
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@@ -134,6 +134,7 @@ let
           };
         });
         default = null;
+        apply = x: if x == null then null else _filter x;
         description = ''
           Optional http login credentials for metrics scraping.
         '';

From 7eb7126f5a1dedae8ea637f9c5e9910ba3be5fc5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 24 Feb 2017 21:45:29 +0100
Subject: [PATCH 1030/3449] Revert "lxc: fix build for glibc-2.25"

This reverts commit 76ae7e19a9fa95b7111e244eeb3b8083a333477a.
---
 pkgs/os-specific/linux/lxc/default.nix        |  1 -
 .../linux/lxc/fix-glibc-2.25.patch            | 36 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 1f0cd69e5949..bf3a05f11161 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./support-db2x.patch
-    ./fix-glibc-2.25.patch
   ];
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
diff --git a/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch b/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch
deleted file mode 100644
index 3896813a58e9..000000000000
--- a/pkgs/os-specific/linux/lxc/fix-glibc-2.25.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/src/lxc/bdev/lxclvm.c b/src/lxc/bdev/lxclvm.c
-index 75de17f..d6d98e4 100644
---- a/src/lxc/bdev/lxclvm.c
-+++ b/src/lxc/bdev/lxclvm.c
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <sys/wait.h>
-+#include <sys/sysmacros.h>
- 
- #include "bdev.h"
- #include "config.h"
-diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index a93124b..948d716 100644
---- a/src/lxc/conf.c
-+++ b/src/lxc/conf.c
-@@ -48,6 +48,7 @@
- #include <sys/stat.h>
- #include <sys/socket.h>
- #include <sys/syscall.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/utsname.h>
- #include <sys/wait.h>
-diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
-index 0dbbf2c..7135222 100644
---- a/src/lxc/lxccontainer.c
-+++ b/src/lxc/lxccontainer.c
-@@ -34,6 +34,7 @@
- #include <sys/mman.h>
- #include <sys/mount.h>
- #include <sys/syscall.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/wait.h>
- 

From dec7ecbbbcc5f68ab8c96d39ba3c62eaf0326242 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 24 Feb 2017 22:17:52 +0100
Subject: [PATCH 1031/3449] nova-image: refactoring

The nova image configuration is separated from the image build.
---
 .../scripts/openstack/nova-image.nix          | 24 +++++++
 nixos/modules/virtualisation/nova-config.nix  | 51 +++++++++++++++
 nixos/modules/virtualisation/nova-image.nix   | 65 -------------------
 3 files changed, 75 insertions(+), 65 deletions(-)
 create mode 100644 nixos/maintainers/scripts/openstack/nova-image.nix
 create mode 100644 nixos/modules/virtualisation/nova-config.nix
 delete mode 100644 nixos/modules/virtualisation/nova-image.nix

diff --git a/nixos/maintainers/scripts/openstack/nova-image.nix b/nixos/maintainers/scripts/openstack/nova-image.nix
new file mode 100644
index 000000000000..fa9cfb74bd6c
--- /dev/null
+++ b/nixos/maintainers/scripts/openstack/nova-image.nix
@@ -0,0 +1,24 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports =
+    [ ../../../modules/installer/cd-dvd/channel.nix
+      ../../../modules/virtualisation/nova-config.nix
+    ];
+
+  system.build.novaImage = import ../../../lib/make-disk-image.nix {
+    inherit lib config;
+    pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
+    diskSize = 8192;
+    format = "qcow2";
+    configFile = pkgs.writeText "configuration.nix"
+      ''
+        {
+          imports = [ <nixpkgs/nixos/modules/virtualisation/nova-config.nix> ];
+        }
+      '';
+  };
+
+}
diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
new file mode 100644
index 000000000000..6bcc05d3c1e7
--- /dev/null
+++ b/nixos/modules/virtualisation/nova-config.nix
@@ -0,0 +1,51 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports = [
+    ../profiles/qemu-guest.nix
+    ../profiles/headless.nix
+  ];
+
+  config = {
+    fileSystems."/".device = "/dev/disk/by-label/nixos";
+
+    boot.kernelParams = [ "console=ttyS0" ];
+    boot.loader.grub.device = "/dev/vda";
+    boot.loader.timeout = 0;
+
+    # Allow root logins
+    services.openssh.enable = true;
+    services.openssh.permitRootLogin = "prohibit-password";
+
+    # Put /tmp and /var on /ephemeral0, which has a lot more space.
+    # Unfortunately we can't do this with the `fileSystems' option
+    # because it has no support for creating the source of a bind
+    # mount.  Also, "move" /nix to /ephemeral0 by layering a unionfs-fuse
+    # mount on top of it so we have a lot more space for Nix operations.
+
+    /*
+    boot.initrd.postMountCommands =
+      ''
+        mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
+        mkdir -m 1777 -p $targetRoot/tmp
+        mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
+
+        mkdir -m 755 -p $targetRoot/ephemeral0/var
+        mkdir -m 755 -p $targetRoot/var
+        mount --bind $targetRoot/ephemeral0/var $targetRoot/var
+
+        mkdir -p /unionfs-chroot/ro-nix
+        mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
+
+        mkdir -p /unionfs-chroot/rw-nix
+        mkdir -m 755 -p $targetRoot/ephemeral0/nix
+        mount --rbind $targetRoot/ephemeral0/nix /unionfs-chroot/rw-nix
+        unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
+      '';
+
+      boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
+    */
+  };
+}
diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix
deleted file mode 100644
index e253c77ebb4f..000000000000
--- a/nixos/modules/virtualisation/nova-image.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-# Usage:
-# $ NIXOS_CONFIG=`pwd`/nixos/modules/virtualisation/nova-image.nix nix-build '<nixpkgs/nixos>' -A config.system.build.novaImage
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-{
-  system.build.novaImage = import ../../lib/make-disk-image.nix {
-    inherit pkgs lib config;
-    partitioned = true;
-    diskSize = 1 * 1024;
-    configFile = pkgs.writeText "configuration.nix"
-      ''
-        {
-          imports = [ <nixpkgs/nixos/modules/virtualisation/nova-image.nix> ];
-        }
-      '';
-  };
-
-  imports = [
-    ../profiles/qemu-guest.nix
-    ../profiles/headless.nix
-  ];
-
-  fileSystems."/".device = "/dev/disk/by-label/nixos";
-
-  boot.kernelParams = [ "console=ttyS0" ];
-  boot.loader.grub.device = "/dev/vda";
-  boot.loader.timeout = 0;
-
-  # Allow root logins
-  services.openssh.enable = true;
-  services.openssh.permitRootLogin = "prohibit-password";
-
-  # Put /tmp and /var on /ephemeral0, which has a lot more space.
-  # Unfortunately we can't do this with the `fileSystems' option
-  # because it has no support for creating the source of a bind
-  # mount.  Also, "move" /nix to /ephemeral0 by layering a unionfs-fuse
-  # mount on top of it so we have a lot more space for Nix operations.
-
-  /*
-  boot.initrd.postMountCommands =
-    ''
-      mkdir -m 1777 -p $targetRoot/ephemeral0/tmp
-      mkdir -m 1777 -p $targetRoot/tmp
-      mount --bind $targetRoot/ephemeral0/tmp $targetRoot/tmp
-
-      mkdir -m 755 -p $targetRoot/ephemeral0/var
-      mkdir -m 755 -p $targetRoot/var
-      mount --bind $targetRoot/ephemeral0/var $targetRoot/var
-
-      mkdir -p /unionfs-chroot/ro-nix
-      mount --rbind $targetRoot/nix /unionfs-chroot/ro-nix
-
-      mkdir -p /unionfs-chroot/rw-nix
-      mkdir -m 755 -p $targetRoot/ephemeral0/nix
-      mount --rbind $targetRoot/ephemeral0/nix /unionfs-chroot/rw-nix
-      unionfs -o allow_other,cow,nonempty,chroot=/unionfs-chroot,max_files=32768 /rw-nix=RW:/ro-nix=RO $targetRoot/nix
-    '';
-
-    boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
-  */
-
-}

From 386c19a224b12c3ed0c6150c5a1d39dd69cdc532 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 24 Feb 2017 22:19:53 +0100
Subject: [PATCH 1032/3449] nova-image: support partition resizing

---
 nixos/modules/virtualisation/nova-config.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix
index 6bcc05d3c1e7..aac11ec8a178 100644
--- a/nixos/modules/virtualisation/nova-config.nix
+++ b/nixos/modules/virtualisation/nova-config.nix
@@ -6,10 +6,16 @@ with lib;
   imports = [
     ../profiles/qemu-guest.nix
     ../profiles/headless.nix
+    ./grow-partition.nix
   ];
 
   config = {
-    fileSystems."/".device = "/dev/disk/by-label/nixos";
+    fileSystems."/" = {
+      device = "/dev/disk/by-label/nixos";
+      autoResize = true;
+    };
+
+    virtualisation.growPartition = true;
 
     boot.kernelParams = [ "console=ttyS0" ];
     boot.loader.grub.device = "/dev/vda";

From 4abbe3c5fc5edd8b1edf42a3c1513178050cfa04 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Fri, 24 Feb 2017 17:11:25 -0500
Subject: [PATCH 1033/3449] gocode: 20150904 -> 20170219

Go completion wasn't working (at least from youcompleteme); this fixes
that.
---
 pkgs/development/tools/gocode/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix
index 8485a2c346b4..5ec93462dec2 100644
--- a/pkgs/development/tools/gocode/default.nix
+++ b/pkgs/development/tools/gocode/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "gocode-${version}";
-  version = "20150904-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "680a0fbae5119fb0dbea5dca1d89e02747a80de0";
+  version = "20170219-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc";
   
   goPackagePath = "github.com/nsf/gocode";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/nsf/gocode";
-    sha256 = "1ay2xakz4bcn8r3ylicbj753gjljvv4cj9l4wfly55cj1vjybjpv";
+    sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks";
   };
 }

From 68baf639a1967693df57c8239ead77e9036b2dcf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 11:54:07 -0600
Subject: [PATCH 1034/3449] kde4: Use lib.makeScope

---
 pkgs/top-level/all-packages.nix | 363 +++++++++++++++-----------------
 1 file changed, 174 insertions(+), 189 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1224593a2abb..fe22c848ab18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16674,212 +16674,197 @@ with pkgs;
 
   kakasi = callPackage ../tools/text/kakasi { };
 
-  kde4 = recurseIntoAttrs pkgs.kde414;
-
-  kde414 =
-    kdePackagesFor
-      {
+  kde4 =
+    let
+      deps = lib.makeScope newScope (self: {
         libusb = libusb1;
         python2Packages = python2Packages;
         inherit (python2Packages) python;
-        libcanberra = libcanberra_kde;
-        boost = boost155;
         kdelibs = kde5.kdelibs;
-        subversionClient = pkgs.subversion18.override {
+        boost = boost155;
+        subversionClient = subversion18.override {
           bdbSupport = false;
           perlBindings = true;
           pythonBindings = true;
         };
         ruby = ruby_2_2; # see https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473
         ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise
-      }
-      ../desktops/kde-4.14;
+      });
 
+      self = lib.makeScope deps.newScope (self: with self;
+        (deps.callPackage ../desktops/kde-4.14 {
+          callPackageOrig = pkgs.callPackage;
+          inherit (self) callPackage;
+        }) // {
 
-  kdePackagesFor = extra: dir:
-    let
-      # list of extra packages not included in KDE
-      # the real work in this function is done below this list
-      extraPackages = callPackage:
-        rec {
-          amarok = callPackage ../applications/audio/amarok {
-            ffmpeg = ffmpeg_2;
-          };
+        libcanberra = libcanberra_kde;
 
-          bangarang = callPackage ../applications/video/bangarang { };
-
-          basket = callPackage ../applications/office/basket { };
-
-          bluedevil = callPackage ../tools/bluetooth/bluedevil { };
-
-          calligra = callPackage ../applications/office/calligra {
-            vc = vc_0_7;
-          };
-
-          choqok = callPackage ../applications/networking/instant-messengers/choqok { };
-
-          colord-kde = callPackage ../tools/misc/colord-kde { };
-
-          digikam = callPackage ../applications/graphics/digikam { };
-
-          eventlist = callPackage ../applications/office/eventlist {};
-
-          k3b-original = lowPrio (callPackage ../applications/misc/k3b { });
-
-          k3b = callPackage ../applications/misc/k3b/wrapper.nix { };
-
-          kadu = callPackage ../applications/networking/instant-messengers/kadu { };
-
-          kbibtex = callPackage ../applications/office/kbibtex { };
-
-          kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
-
-          kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
-
-          kdeconnect = callPackage ../applications/misc/kdeconnect/0.7.nix { };
-
-          kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
-
-          kdesvn = callPackage ../applications/version-management/kdesvn { };
-
-          kdevelop = callPackage ../applications/editors/kdevelop { };
-
-          kdevplatform = callPackage ../development/libraries/kdevplatform {
-            boost = boost155;
-          };
-
-          kdiff3 = callPackage ../tools/text/kdiff3 { };
-
-          kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
-
-          kile = callPackage ../applications/editors/kile { };
-
-          kmplayer = callPackage ../applications/video/kmplayer { };
-
-          kmymoney = callPackage ../applications/office/kmymoney { };
-
-          kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
-
-          konversation = callPackage ../applications/networking/irc/konversation { };
-
-          kvirc = callPackage ../applications/networking/irc/kvirc { };
-
-          krename = callPackage ../applications/misc/krename/kde4.nix {
-            taglib = taglib_1_9;
-          };
-
-          krusader = callPackage ../applications/misc/krusader { };
-
-          ksshaskpass = callPackage ../tools/security/ksshaskpass {};
-
-          ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
-
-          kuickshow = callPackage ../applications/graphics/kuickshow { };
-
-          libalkimia = callPackage ../development/libraries/libalkimia { };
-
-          libktorrent = callPackage ../development/libraries/libktorrent {
-            boost = boost155;
-          };
-
-          libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
-
-          liblikeback = callPackage ../development/libraries/liblikeback { };
-
-          libmm-qt = callPackage ../development/libraries/libmm-qt { };
-
-          libnm-qt = callPackage ../development/libraries/libnm-qt { };
-
-          massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
-
-          partitionManager = callPackage ../tools/misc/partition-manager { };
-
-          plasma-nm = callPackage ../tools/networking/plasma-nm { };
-
-          polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
-
-          qtcurve = callPackage ../misc/themes/qtcurve { };
-
-          quassel = callPackage ../applications/networking/irc/quassel rec {
-            monolithic = true;
-            daemon = false;
-            client = false;
-            withKDE = stdenv.isLinux;
-            qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0)
-            dconf = gnome3.dconf;
-          };
-
-          quasselWithoutKDE = (quassel.override {
-            monolithic = true;
-            daemon = false;
-            client = false;
-            withKDE = false;
-            #qt = qt5;
-            tag = "-without-kde";
-          });
-
-          quasselDaemon = (quassel.override {
-            monolithic = false;
-            daemon = true;
-            client = false;
-            withKDE = false;
-            #qt = qt5;
-            tag = "-daemon";
-          });
-
-          quasselClient = (quassel.override {
-            monolithic = false;
-            daemon = false;
-            client = true;
-            tag = "-client";
-          });
-
-          quasselClientWithoutKDE = (quasselClient.override {
-            monolithic = false;
-            daemon = false;
-            client = true;
-            withKDE = false;
-            #qt = qt5;
-            tag = "-client-without-kde";
-          });
-
-          rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
-          rekonq = wrapFirefox rekonq-unwrapped { };
-
-          kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
-
-          rsibreak = callPackage ../applications/misc/rsibreak { };
-
-          semnotes = callPackage ../applications/misc/semnotes { };
-
-          skrooge = callPackage ../applications/office/skrooge { };
-
-          telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
-
-          yakuake = callPackage ../applications/misc/yakuake { };
-
-          zanshin = callPackage ../applications/office/zanshin { };
-
-          kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
+        amarok = callPackage ../applications/audio/amarok {
+          ffmpeg = ffmpeg_2;
         };
 
-      callPackageOrig = newScope extra;
+        bangarang = callPackage ../applications/video/bangarang { };
 
-      makePackages = extra:
-        let
-          callPackage = newScope (extra // self);
-          kde4 = callPackageOrig dir { inherit callPackage callPackageOrig; };
-          self =
-            kde4
-            // extraPackages callPackage
-            // {
-              inherit kde4;
-              wrapper = callPackage ../build-support/kdewrapper {};
-              recurseForRelease = true;
-            };
-        in self;
+        basket = callPackage ../applications/office/basket { };
 
-    in makeOverridable makePackages extra;
+        bluedevil = callPackage ../tools/bluetooth/bluedevil { };
+
+        calligra = callPackage ../applications/office/calligra {
+          vc = vc_0_7;
+        };
+
+        choqok = callPackage ../applications/networking/instant-messengers/choqok { };
+
+        colord-kde = callPackage ../tools/misc/colord-kde { };
+
+        digikam = callPackage ../applications/graphics/digikam { };
+
+        eventlist = callPackage ../applications/office/eventlist {};
+
+        k3b-original = lowPrio (callPackage ../applications/misc/k3b { });
+
+        k3b = callPackage ../applications/misc/k3b/wrapper.nix { };
+
+        kadu = callPackage ../applications/networking/instant-messengers/kadu { };
+
+        kbibtex = callPackage ../applications/office/kbibtex { };
+
+        kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
+
+        kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
+
+        kdeconnect = callPackage ../applications/misc/kdeconnect/0.7.nix { };
+
+        kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
+
+        kdesvn = callPackage ../applications/version-management/kdesvn { };
+
+        kdevelop = callPackage ../applications/editors/kdevelop { };
+
+        kdevplatform = callPackage ../development/libraries/kdevplatform {
+          boost = boost155;
+        };
+
+        kdiff3 = callPackage ../tools/text/kdiff3 { };
+
+        kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
+
+        kile = callPackage ../applications/editors/kile { };
+
+        kmplayer = callPackage ../applications/video/kmplayer { };
+
+        kmymoney = callPackage ../applications/office/kmymoney { };
+
+        kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
+
+        konversation = callPackage ../applications/networking/irc/konversation { };
+
+        ktikz = callPackage ../applications/graphics/ktikz { };
+
+        kvirc = callPackage ../applications/networking/irc/kvirc { };
+
+        krename = callPackage ../applications/misc/krename/kde4.nix {
+          taglib = taglib_1_9;
+        };
+
+        krusader = callPackage ../applications/misc/krusader { };
+
+        ksshaskpass = callPackage ../tools/security/ksshaskpass {};
+
+        ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
+
+        kuickshow = callPackage ../applications/graphics/kuickshow { };
+
+        libalkimia = callPackage ../development/libraries/libalkimia { };
+
+        libktorrent = callPackage ../development/libraries/libktorrent {
+          boost = boost155;
+        };
+
+        libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
+
+        liblikeback = callPackage ../development/libraries/liblikeback { };
+
+        libmm-qt = callPackage ../development/libraries/libmm-qt { };
+
+        libnm-qt = callPackage ../development/libraries/libnm-qt { };
+
+        massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
+
+        partitionManager = callPackage ../tools/misc/partition-manager { };
+
+        plasma-nm = callPackage ../tools/networking/plasma-nm { };
+
+        polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
+
+        psi = callPackage ../applications/networking/instant-messengers/psi { };
+
+        qtcurve = callPackage ../misc/themes/qtcurve { };
+
+        quassel = callPackage ../applications/networking/irc/quassel rec {
+          monolithic = true;
+          daemon = false;
+          client = false;
+          withKDE = stdenv.isLinux;
+          qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0)
+          dconf = gnome3.dconf;
+        };
+
+        quasselWithoutKDE = (quassel.override {
+          monolithic = true;
+          daemon = false;
+          client = false;
+          withKDE = false;
+          #qt = qt5;
+          tag = "-without-kde";
+        });
+
+        quasselDaemon = (quassel.override {
+          monolithic = false;
+          daemon = true;
+          client = false;
+          withKDE = false;
+          #qt = qt5;
+          tag = "-daemon";
+        });
+
+        quasselClient = (quassel.override {
+          monolithic = false;
+          daemon = false;
+          client = true;
+          tag = "-client";
+        });
+
+        quasselClientWithoutKDE = (quasselClient.override {
+          monolithic = false;
+          daemon = false;
+          client = true;
+          withKDE = false;
+          #qt = qt5;
+          tag = "-client-without-kde";
+        });
+
+        rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
+        rekonq = wrapFirefox rekonq-unwrapped { };
+
+        kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
+
+        rsibreak = callPackage ../applications/misc/rsibreak { };
+
+        semnotes = callPackage ../applications/misc/semnotes { };
+
+        skrooge = callPackage ../applications/office/skrooge { };
+
+        telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
+
+        yakuake = callPackage ../applications/misc/yakuake { };
+
+        zanshin = callPackage ../applications/office/zanshin { };
+
+        kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
+      });
+
+    in recurseIntoAttrs self;
 
   lumina = callPackage ../desktops/lumina { };
 

From 855690ba1d31dfe8bbda01e4b581bc3d4e112473 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 11:55:57 -0600
Subject: [PATCH 1035/3449] Remove kde4.digikam

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/applications/graphics/digikam/5.nix      | 122 -------
 .../applications/graphics/digikam/default.nix | 309 ++++++------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   4 +-
 4 files changed, 100 insertions(+), 336 deletions(-)
 delete mode 100644 pkgs/applications/graphics/digikam/5.nix

diff --git a/pkgs/applications/graphics/digikam/5.nix b/pkgs/applications/graphics/digikam/5.nix
deleted file mode 100644
index a9d7d357ad71..000000000000
--- a/pkgs/applications/graphics/digikam/5.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ stdenv, fetchurl, cmake, ecm, makeQtWrapper
-
-# For `digitaglinktree`
-, perl, sqlite
-
-, qtbase
-, qtxmlpatterns
-, qtsvg
-, qtwebkit
-
-, kconfigwidgets
-, kcoreaddons
-, kdoctools
-, kfilemetadata
-, knotifications
-, knotifyconfig
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-
-, bison
-, boost
-, eigen
-, exiv2
-, flex
-, jasper
-, lcms2
-, lensfun
-, libgphoto2
-, libkipi
-, liblqr1
-, libusb1
-, marble
-, mysql
-, opencv
-, threadweaver
-
-# For panorama and focus stacking
-, enblend-enfuse
-, hugin
-, gnumake
-
-, oxygen
-}:
-
-stdenv.mkDerivation rec {
-  name    = "digikam-${version}";
-  version = "5.4.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
-    sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
-  };
-
-  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
-
-  patches = [ ./0001-Disable-fno-operator-names.patch ];
-
-  buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qtsvg
-    qtwebkit
-
-    kconfigwidgets
-    kcoreaddons
-    kdoctools
-    kfilemetadata
-    knotifications
-    knotifyconfig
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-
-    bison
-    boost
-    eigen
-    exiv2
-    flex
-    jasper
-    lcms2
-    lensfun
-    libgphoto2
-    libkipi
-    liblqr1
-    libusb1
-    marble.unwrapped
-    mysql
-    opencv
-    threadweaver
-
-    oxygen
-  ];
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = [
-    "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
-    "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
-    "-DENABLE_MYSQLSUPPORT=1"
-    "-DENABLE_INTERNALMYSQL=1"
-  ];
-
-  fixupPhase = ''
-    substituteInPlace $out/bin/digitaglinktree \
-      --replace "/usr/bin/perl" "${perl}/bin/perl" \
-      --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
-
-    wrapQtProgram $out/bin/digikam \
-      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
-
-    wrapQtProgram $out/bin/showfoto
-  '';
-
-  meta = {
-    description = "Photo Management Program";
-    license = stdenv.lib.licenses.gpl2;
-    homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 9a9c0ff1d7f7..a9d7d357ad71 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,235 +1,122 @@
-{ stdenv, fetchurl, fetchpatch, automoc4, boost, shared_desktop_ontologies
-, cmake, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun
-, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff
-, libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig
-, qca2, qimageblitz, qjson, qt4, soprano
+{ stdenv, fetchurl, cmake, ecm, makeQtWrapper
 
-# Optional build time dependencies
-, baloo, doxygen, kfilemetadata
+# For `digitaglinktree`
+, perl, sqlite
+
+, qtbase
+, qtxmlpatterns
+, qtsvg
+, qtwebkit
+
+, kconfigwidgets
+, kcoreaddons
+, kdoctools
+, kfilemetadata
+, knotifications
+, knotifyconfig
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+
+, bison
+, boost
+, eigen
+, exiv2
+, flex
+, jasper
 , lcms2
-, kfaceSupport ? true, libkface ? null
-, kgeomapSupport ? true, libkgeomap ? null
-, libxslt
+, lensfun
+, libgphoto2
+, libkipi
+, liblqr1
+, libusb1
+, marble
+, mysql
+, opencv
+, threadweaver
 
-# Plugins optional build time dependencies
-, gdk_pixbuf, imagemagick
-, libgpod, libksane, libkvkontakte
-, qt_gstreamer1 /*qt_soap, <https://github.com/commontk/QtSOAP>  herqq <http://www.herqq.org> -> is missing its av part.*/
-  /*qt_koauth <http://gitorious.org/kqoauth>*/
+# For panorama and focus stacking
+, enblend-enfuse
+, hugin
+, gnumake
 
-# Supplementary packages required only by the wrapper.
-, bash, kde_runtime, kde_baseapps, makeWrapper, oxygen_icons
-, phonon-backend-vlc /*phonon-backend-gstreamer,*/
-, ffmpegthumbs /*mplayerthumbs*/
-, runCommand, shared_mime_info, writeScriptBin
+, oxygen
 }:
 
-let 
-  version = "4.12.0";
-  pName = "digikam-${version}";
+stdenv.mkDerivation rec {
+  name    = "digikam-${version}";
+  version = "5.4.0";
 
-  build = stdenv.mkDerivation rec {
-    name = "digikam-build-${version}";
-
-    src = fetchurl {
-      url = "http://download.kde.org/stable/digikam/${pName}.tar.bz2";
-      sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m";
-    };
-
-    patches = [
-      (fetchpatch {
-        # Fix compilation against Lensfun 0.3.2
-        url = "http://cgit.kde.org/digikam.git/patch/?id=0f159981176faa6da701f112bfe557b79804d468";
-        sha256 = "1c8bg7s84vg4v620gbs16cjcbpml749018gy5dpvfacx5vl24wza";
-      })
-    ];
-
-    patchFlags = ["-p1" "-dcore"];
-
-    nativeBuildInputs = [ 
-      automoc4 cmake gettext perl pkgconfig
-    ] ++ [
-      # Optional
-      doxygen 
-    ];
-
-    buildInputs = [
-      boost eigen jasper kdelibs kdepimlibs lcms lensfun
-      libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf
-      libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4
-      shared_desktop_ontologies soprano ]
-    # Optional build time dependencies
-    ++ [
-      baloo 
-      kfilemetadata 
-      lcms2 ] 
-    ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ]
-    ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] ++ 
-    [ libxslt ]
-    # Plugins optional build time dependencies
-    ++ [
-      gdk_pixbuf imagemagick libgpod libksane
-      libkvkontakte
-      qt_gstreamer1 ];
-
-    # Make digikam find some FindXXXX.cmake
-    KDEDIRS="${marble}:${qjson}";
-
-    # Find kdepimlibs's upper case headers under `include/KDE`.
-    NIX_CFLAGS_COMPILE = "-I${kdepimlibs}/include/KDE";
-
-    # Help digiKam find libusb, otherwise gphoto2 support is disabled
-    cmakeFlags = [
-      "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
-      "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
-      "-DENABLE_BALOOSUPPORT=ON"
-      "-DENABLE_KDEPIMLIBSSUPPORT=ON"
-      "-DENABLE_LCMS2=ON" ] 
-    ++ stdenv.lib.optional (kfaceSupport && null == libkface) [ "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" ]
-    ++ stdenv.lib.optional (kgeomapSupport && null == libkgeomap) [ "-DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON" ];
-
-    enableParallelBuilding = true;
-
-    meta = {
-      description = "Photo Management Program";
-      license = stdenv.lib.licenses.gpl2;
-      homepage = http://www.digikam.org;
-      maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ];
-      inherit (kdelibs.meta) platforms;
-    };
+  src = fetchurl {
+    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
+    sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
   };
 
+  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
 
-  kdePkgs = [
-    build # digikam's own build
-    kdelibs kdepimlibs kde_runtime kde_baseapps libkdcraw oxygen_icons
-    /*phonon-backend-gstreamer*/ phonon-backend-vlc
-    ffmpegthumbs /*mplayerthumbs*/ shared_mime_info ]
-  # Optional build time dependencies
-  ++ [
+  patches = [ ./0001-Disable-fno-operator-names.patch ];
 
-    baloo kfilemetadata ] 
-  ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ]
-  ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] 
-  ++ [ 
-    libkipi ] 
-  # Plugins optional build time dependencies
-  ++ [
-    libksane libkvkontakte
+  buildInputs = [
+    qtbase
+    qtxmlpatterns
+    qtsvg
+    qtwebkit
+
+    kconfigwidgets
+    kcoreaddons
+    kdoctools
+    kfilemetadata
+    knotifications
+    knotifyconfig
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+
+    bison
+    boost
+    eigen
+    exiv2
+    flex
+    jasper
+    lcms2
+    lensfun
+    libgphoto2
+    libkipi
+    liblqr1
+    libusb1
+    marble.unwrapped
+    mysql
+    opencv
+    threadweaver
+
+    oxygen
   ];
 
+  enableParallelBuilding = true;
 
-  # TODO: It should be the responsability of these packages to add themselves to `KDEDIRS`. See
-  # <https://github.com/ttuegel/nixpkgs/commit/a0efeacc0ef2cf63bbb768bfb172a483307d080b> for
-  # a practical example.
-  # IMPORTANT: Note that using `XDG_DATA_DIRS` here instead of `KDEDIRS` won't work properly.
-  KDEDIRS = with stdenv.lib; concatStrings (intersperse ":" (map (x: "${x}") kdePkgs));
+  cmakeFlags = [
+    "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
+    "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
+    "-DENABLE_MYSQLSUPPORT=1"
+    "-DENABLE_INTERNALMYSQL=1"
+  ];
 
-  sycocaDirRelPath = "var/lib/kdesycoca";
-  sycocaFileRelPath = "${sycocaDirRelPath}/${pName}.sycoca";
+  fixupPhase = ''
+    substituteInPlace $out/bin/digitaglinktree \
+      --replace "/usr/bin/perl" "${perl}/bin/perl" \
+      --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
 
-  sycoca = runCommand "${pName}" {
+    wrapQtProgram $out/bin/digikam \
+      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
 
-    name = "digikam-sycoca-${version}";
-
-    nativeBuildInputs = [ kdelibs ];
-
-    dontPatchELF = true;
-    dontStrip = true;
-
-  } ''
-    # Make sure kbuildsycoca4 does not attempt to write to user home directory.
-    export HOME=$PWD
-
-    export KDESYCOCA="$out/${sycocaFileRelPath}"
-
-    mkdir -p $out/${sycocaDirRelPath}
-    export XDG_DATA_DIRS=""
-    export KDEDIRS="${KDEDIRS}"
-    kbuildsycoca4 --noincremental --nosignal
+    wrapQtProgram $out/bin/showfoto
   '';
 
-
-  replaceExeListWithWrapped = 
-    let f = exeName: ''
-        rm -f "$out/bin/${exeName}"
-        makeWrapper "${build}/bin/${exeName}" "$out/bin/${exeName}" \
-          --set XDG_DATA_DIRS "" \
-          --set KDEDIRS "${KDEDIRS}" \
-          --set KDESYCOCA "${sycoca}/${sycocaFileRelPath}"
-      '';
-    in 
-      with stdenv.lib; exeNameList: concatStrings (intersperse "\n" (map f exeNameList));
-
-in
-
-
-with stdenv.lib;
-
-/*
-  Final derivation
-  ----------------
-
-   -  Create symlinks to our original build derivation items.
-   -  Wrap specific executables so that they know of the appropriate
-      sycoca database, `KDEDIRS` to use and block any interference
-      from `XDG_DATA_DIRS` (only `dnginfo` is not wrapped).
-*/
-runCommand "${pName}" {
-  inherit build;
-  inherit sycoca;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildInputs = kdePkgs;
-
-  dontPatchELF = true;
-  dontStrip = true;
-
   meta = {
     description = "Photo Management Program";
     license = stdenv.lib.licenses.gpl2;
     homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ /*jraygauthier*/ ];
-    inherit (kdelibs.meta) platforms;
-    broken = true;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    platforms = stdenv.lib.platforms.linux;
   };
-
-} ''
-  pushd $build > /dev/null
-  for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
-    mkdir -p $out/$d
-    for f in `find $d -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
-        ln -s "$build/$d/$f" "$out/$d/$f"
-    done
-  done
-  popd > /dev/null
-  
-  ${replaceExeListWithWrapped [ "cleanup_digikamdb" "digitaglinktree" "digikam" "dngconverter" 
-                                "expoblending" "photolayoutseditor" "scangui" "showfoto" ]}
-''
-
-/*
-  
-TODO
-----
-
-### Useful ###
-
- -  Per lib `KDELIBS` environment variable export. See above in-code TODO comment.
- -  Missing optional `qt_soap` or `herqq` (av + normal package) dependencies. Those are not
-    yet (or not fully) packaged in nix. Mainly required for upnp export.
- -  Possibility to use the `phonon-backend-gstreamer` with its own user specified set of backend.
- -  Allow user to disable optional features or dependencies reacting properly.
- -  Compile `kipiplugins` as a separate package (so that it can be used by other kde packages
-    and so that this package's build time is reduced).
-
-### Not so useful ###
-
- -  Missing optional `qt_koauth` (not packaged in nix).
- -  Missing optional `libmediawiki` (not packaged in nix)..
- -  For some reason the cmake build does not detect `libkvkontakte`. Fix this.
- -  Possibility to use `mplayerthumbs` thumbnail creator backend. In digikam dev docs,
-    it is however suggested to use `ffmpegthumbs`. Maybe we should stick to it.
-
-*/
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 57242e2a7422..d6d32e59d2b7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -38,6 +38,7 @@ doNotDisplayTwice rec {
   cups_filters = cups-filters; # added 2016-08
   cv = progress; # added 2015-09-06
   debian_devscripts = debian-devscripts; # added 2016-03-23
+  digikam5 = digikam; # added 2017-02-18
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
   dwbWrapper = dwb; # added 2015-01
   enblendenfuse = enblend-enfuse; # 2015-09-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe22c848ab18..c7c5fe43f24f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16125,7 +16125,7 @@ with pkgs;
 
   dhewm3 = callPackage ../games/dhewm3 {};
 
-  digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix {
+  digikam = kde5.callPackage ../applications/graphics/digikam {
     boost = boost160;
   };
 
@@ -16717,8 +16717,6 @@ with pkgs;
 
         colord-kde = callPackage ../tools/misc/colord-kde { };
 
-        digikam = callPackage ../applications/graphics/digikam { };
-
         eventlist = callPackage ../applications/office/eventlist {};
 
         k3b-original = lowPrio (callPackage ../applications/misc/k3b { });

From e5e0f8961204caa3de9b2e7a76774061e7a5d76c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 11:58:55 -0600
Subject: [PATCH 1036/3449] Remove kde4.kdeconnect

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/applications/misc/kdeconnect/0.7.nix | 36 -----------------------
 pkgs/top-level/all-packages.nix           |  2 --
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/applications/misc/kdeconnect/0.7.nix

diff --git a/pkgs/applications/misc/kdeconnect/0.7.nix b/pkgs/applications/misc/kdeconnect/0.7.nix
deleted file mode 100644
index 551d7c06468a..000000000000
--- a/pkgs/applications/misc/kdeconnect/0.7.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson
-}:
-
-stdenv.mkDerivation rec {
-  name = "kdeconnect-${version}";
-  version = "0.7.3";
-
-  src = fetchurl {
-    url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
-    sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
-  };
-
-  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "A tool to connect and sync your devices with KDE";
-    longDescription = ''
-        The corresponding Android app, "KDE Connect", is available in
-        F-Droid and Google play and has the following features:
-
-        - Share files and URLs to KDE from any app
-        - Clipboard share: copy from or to your desktop
-        - Notifications sync (4.3+): Read your Android notifications from KDE
-        - Multimedia remote control: Use your phone as a remote control
-        - WiFi connection: no usb wire or bluetooth needed
-        - RSA Encryption: your information is safe 
-    '';
-    license = licenses.gpl2;
-    homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7c5fe43f24f..20144d6df410 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16731,8 +16731,6 @@ with pkgs;
 
         kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
 
-        kdeconnect = callPackage ../applications/misc/kdeconnect/0.7.nix { };
-
         kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
 
         kdesvn = callPackage ../applications/version-management/kdesvn { };

From 0757d49800154b1936cb4c89c578b2ca3c380e71 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:00:27 -0600
Subject: [PATCH 1037/3449] Remove kde4.kdevelop

- Already updated to KDE 5 in Nixpkgs
---
 .../applications/editors/kdevelop/default.nix | 38 -------------------
 .../editors/kdevelop/gettext.patch            |  8 ----
 .../libraries/kdevplatform/default.nix        | 35 -----------------
 .../libraries/kdevplatform/dependency.patch   | 12 ------
 .../libraries/kdevplatform/gettext.patch      |  8 ----
 pkgs/top-level/all-packages.nix               |  6 ---
 6 files changed, 107 deletions(-)
 delete mode 100644 pkgs/applications/editors/kdevelop/default.nix
 delete mode 100644 pkgs/applications/editors/kdevelop/gettext.patch
 delete mode 100644 pkgs/development/libraries/kdevplatform/default.nix
 delete mode 100644 pkgs/development/libraries/kdevplatform/dependency.patch
 delete mode 100644 pkgs/development/libraries/kdevplatform/gettext.patch

diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
deleted file mode 100644
index 938a56518d5f..000000000000
--- a/pkgs/applications/editors/kdevelop/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
-  kdebase_workspace, gettext, perl, okteta, qjson, kate, konsole, kde_runtime, oxygen_icons }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "4.7.3";
-  pname = "kdevelop";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35";
-  };
-
-  buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
-
-  nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
-
-  propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ];
-
-  patches = [ ./gettext.patch ];
-
-  NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
-
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.urkud ];
-    platforms = platforms.linux;
-    description = "KDE official IDE";
-    longDescription =
-      ''
-        A free, opensource IDE (Integrated Development Environment)
-        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
-        feature-full, plugin extendable IDE for C/C++ and other
-        programing languages. It is based on KDevPlatform, KDE and Qt
-        libraries and is under development since 1998.
-      '';
-    homepage = https://www.kdevelop.org;
-  };
-}
diff --git a/pkgs/applications/editors/kdevelop/gettext.patch b/pkgs/applications/editors/kdevelop/gettext.patch
deleted file mode 100644
index cefbc743fc3e..000000000000
--- a/pkgs/applications/editors/kdevelop/gettext.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urN kdevelop-4.7.3.orig/po/CMakeLists.txt kdevelop-4.7.3/po/CMakeLists.txt
---- kdevelop-4.7.3.orig/po/CMakeLists.txt	2016-03-04 23:29:09.411886565 +0100
-+++ kdevelop-4.7.3/po/CMakeLists.txt	2016-03-04 23:28:35.108451713 +0100
-@@ -1,3 +1,4 @@
-+cmake_policy(SET CMP0002 OLD)
- find_package(Gettext REQUIRED)
- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
deleted file mode 100644
index 549be9a71f50..000000000000
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, subversion, qt4, automoc4, phonon,
-  gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
-
-stdenv.mkDerivation rec {
-  name = "kdevplatform-1.7.3";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.7.3/src/${name}.tar.bz2";
-    sha256 = "195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b";
-  };
-
-  patches = [
-    ./gettext.patch     # build error caused by CMake update
-    ./dependency.patch  # build error: https://phabricator.kde.org/D1160
-  ];
-
-  propagatedBuildInputs = [ kdelibs qt4 phonon ];
-  buildInputs = [ apr aprutil subversion boost qjson grantlee ];
-
-  nativeBuildInputs = [ cmake automoc4 gettext pkgconfig ];
-
-  enableParallelBuilding = false;
-
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.ambrop72 ];
-    platforms = platforms.linux;
-    description = "KDE libraries for IDE-like programs";
-    longDescription = ''
-      A free, opensource set of libraries that can be used as a foundation for
-      IDE-like programs. It is programing-language independent, and is planned
-      to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc."
-    '';
-    homepage = https://www.kdevelop.org;
-  };
-}
diff --git a/pkgs/development/libraries/kdevplatform/dependency.patch b/pkgs/development/libraries/kdevplatform/dependency.patch
deleted file mode 100644
index 3205b4cab675..000000000000
--- a/pkgs/development/libraries/kdevplatform/dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt
---- a/plugins/filetemplates/CMakeLists.txt
-+++ b/plugins/filetemplates/CMakeLists.txt
-@@ -81,6 +81,7 @@
- )
- 
- kde4_add_executable(testfiletemplates ${test_srcs})
-+add_dependencies(testfiletemplates kdevfiletemplates)
- 
- target_link_libraries(testfiletemplates
-     ${KDE4_KDECORE_LIBS}
-
diff --git a/pkgs/development/libraries/kdevplatform/gettext.patch b/pkgs/development/libraries/kdevplatform/gettext.patch
deleted file mode 100644
index 733a542e0c8b..000000000000
--- a/pkgs/development/libraries/kdevplatform/gettext.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -urN kdevplatform-1.7.3.orig/po/CMakeLists.txt kdevplatform-1.7.3/po/CMakeLists.txt
---- kdevplatform-1.7.3.orig/po/CMakeLists.txt	2016-03-04 23:25:30.102112596 +0100
-+++ kdevplatform-1.7.3/po/CMakeLists.txt	2016-03-04 23:26:06.242570024 +0100
-@@ -1,3 +1,4 @@
-+cmake_policy(SET CMP0002 OLD)
- find_package(Gettext REQUIRED)
- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20144d6df410..84229ed4e3a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16735,12 +16735,6 @@ with pkgs;
 
         kdesvn = callPackage ../applications/version-management/kdesvn { };
 
-        kdevelop = callPackage ../applications/editors/kdevelop { };
-
-        kdevplatform = callPackage ../development/libraries/kdevplatform {
-          boost = boost155;
-        };
-
         kdiff3 = callPackage ../tools/text/kdiff3 { };
 
         kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };

From c9de5eca0f67ef5b56f2cce6f992ebbaf453404d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:02:15 -0600
Subject: [PATCH 1038/3449] Remove kde4.kdiff3

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/tools/text/kdiff3/default.nix | 49 +++++++++++++++++++-----------
 pkgs/tools/text/kdiff3/kde5.nix    | 37 ----------------------
 pkgs/top-level/aliases.nix         |  1 +
 pkgs/top-level/all-packages.nix    |  4 +--
 4 files changed, 34 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/tools/text/kdiff3/kde5.nix

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 664fb87b5205..f1ae958ed637 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,22 +1,37 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, gettext
+{
+  kdeDerivation, kdeWrapper, lib, fetchgit,
+  ecm, kdoctools, kconfig, kinit, kparts
 }:
 
-stdenv.mkDerivation rec {
-  name = "kdiff3-0.9.98";
-  src = fetchurl {
-    url = "mirror://sourceforge/kdiff3/${name}.tar.gz";
-    sha256 = "0s6n1whkf5ck2r8782a9l8b736cj2p05and1vjjh7d02pax1lb40";
+let
+  rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
+
+  unwrapped = kdeDerivation rec {
+    name = "kdiff3-${version}";
+    version = "1.7.0-${lib.strings.substring 0 7 rev}";
+
+    src = fetchgit {
+      url = "https://gitlab.com/tfischer/kdiff3";
+      sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
+      inherit rev;
+    };
+
+    preConfigure = "cd kdiff3";
+
+    nativeBuildInputs = [ ecm kdoctools ];
+
+    propagatedBuildInputs = [ kconfig kinit kparts ];
+
+    meta = with lib; {
+      homepage = http://kdiff3.sourceforge.net/;
+      license = licenses.gpl2Plus;
+      description = "Compares and merges 2 or 3 files or directories";
+      maintainers = with maintainers; [ viric urkud peterhoeg ];
+      platforms = with platforms; linux;
+    };
   };
 
-  buildInputs = [ kdelibs ];
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    homepage = http://kdiff3.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    description = "Compares and merges 2 or 3 files or directories";
-    maintainers = with stdenv.lib.maintainers; [viric urkud];
-    platforms = with stdenv.lib.platforms; linux;
-  };
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/kdiff3" ];
 }
diff --git a/pkgs/tools/text/kdiff3/kde5.nix b/pkgs/tools/text/kdiff3/kde5.nix
deleted file mode 100644
index f1ae958ed637..000000000000
--- a/pkgs/tools/text/kdiff3/kde5.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  kdeDerivation, kdeWrapper, lib, fetchgit,
-  ecm, kdoctools, kconfig, kinit, kparts
-}:
-
-let
-  rev = "468652ce70b1214842cef0a021c81d056ec6aa01";
-
-  unwrapped = kdeDerivation rec {
-    name = "kdiff3-${version}";
-    version = "1.7.0-${lib.strings.substring 0 7 rev}";
-
-    src = fetchgit {
-      url = "https://gitlab.com/tfischer/kdiff3";
-      sha256 = "126xl7jbb26v2970ba1rw1d6clhd14p1f2avcwvj8wzqmniq5y5m";
-      inherit rev;
-    };
-
-    preConfigure = "cd kdiff3";
-
-    nativeBuildInputs = [ ecm kdoctools ];
-
-    propagatedBuildInputs = [ kconfig kinit kparts ];
-
-    meta = with lib; {
-      homepage = http://kdiff3.sourceforge.net/;
-      license = licenses.gpl2Plus;
-      description = "Compares and merges 2 or 3 files or directories";
-      maintainers = with maintainers; [ viric urkud peterhoeg ];
-      platforms = with platforms; linux;
-    };
-  };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdiff3" ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d6d32e59d2b7..4d721bfdad09 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -59,6 +59,7 @@ doNotDisplayTwice rec {
   inotifyTools = inotify-tools;
   joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
+  kdiff3-qt5 = kdiff3; # added 2017-02-18
   keepassx2-http = keepassx-reboot; # added 2016-10-17
   keepassx-reboot = keepassx-community; # added 2017-02-01
   keybase-go = keybase;  # added 2016-08-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84229ed4e3a2..204881c49983 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2455,7 +2455,7 @@ with pkgs;
 
   kronometer = qt5.callPackage ../tools/misc/kronometer { };
 
-  kdiff3-qt5 = qt5.callPackage ../tools/text/kdiff3/kde5.nix { };
+  kdiff3 = qt5.callPackage ../tools/text/kdiff3 { };
 
   peruse = qt5.callPackage ../tools/misc/peruse { };
 
@@ -16735,8 +16735,6 @@ with pkgs;
 
         kdesvn = callPackage ../applications/version-management/kdesvn { };
 
-        kdiff3 = callPackage ../tools/text/kdiff3 { };
-
         kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
 
         kile = callPackage ../applications/editors/kile { };

From 14b8fa701750c94a28f2c1632e0a12469593fc22 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:04:57 -0600
Subject: [PATCH 1039/3449] Remove kde4.krename

- Already updated to KDE 5 in Nixpkgs
---
 .../misc/krename/{kde5.nix => default.nix}    |  0
 pkgs/applications/misc/krename/kde4.nix       | 22 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  6 +----
 4 files changed, 2 insertions(+), 27 deletions(-)
 rename pkgs/applications/misc/krename/{kde5.nix => default.nix} (100%)
 delete mode 100644 pkgs/applications/misc/krename/kde4.nix

diff --git a/pkgs/applications/misc/krename/kde5.nix b/pkgs/applications/misc/krename/default.nix
similarity index 100%
rename from pkgs/applications/misc/krename/kde5.nix
rename to pkgs/applications/misc/krename/default.nix
diff --git a/pkgs/applications/misc/krename/kde4.nix b/pkgs/applications/misc/krename/kde4.nix
deleted file mode 100644
index 1e4da7fa11f7..000000000000
--- a/pkgs/applications/misc/krename/kde4.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, taglib, exiv2, podofo, qt4, phonon
-}:
-
-stdenv.mkDerivation rec {
-  name = "krename-4.0.9";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/krename/${name}.tar.bz2";
-    sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds";
-  };
-
-  buildInputs = [ kdelibs taglib exiv2 podofo qt4 phonon ];
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    homepage = http://www.krename.net;
-    description = "A powerful batch renamer for KDE";
-    inherit (kdelibs.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4d721bfdad09..14ef7a1cf472 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -63,6 +63,7 @@ doNotDisplayTwice rec {
   keepassx2-http = keepassx-reboot; # added 2016-10-17
   keepassx-reboot = keepassx-community; # added 2017-02-01
   keybase-go = keybase;  # added 2016-08-24
+  krename-qt5 = krename; # added 2017-02-18
   letsencrypt = certbot; # added 2016-05-16
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
   libcap_manpages = libcap.doc; # added 2016-04-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 204881c49983..b2b40d142cb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2451,7 +2451,7 @@ with pkgs;
 
   kpcli = callPackage ../tools/security/kpcli { };
 
-  krename-qt5 = qt5.callPackage ../applications/misc/krename/kde5.nix { };
+  krename = qt5.callPackage ../applications/misc/krename { };
 
   kronometer = qt5.callPackage ../tools/misc/kronometer { };
 
@@ -16751,10 +16751,6 @@ with pkgs;
 
         kvirc = callPackage ../applications/networking/irc/kvirc { };
 
-        krename = callPackage ../applications/misc/krename/kde4.nix {
-          taglib = taglib_1_9;
-        };
-
         krusader = callPackage ../applications/misc/krusader { };
 
         ksshaskpass = callPackage ../tools/security/ksshaskpass {};

From 545e675cefe39479d7e910d02b85c94dc2c5ebd9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:06:07 -0600
Subject: [PATCH 1040/3449] Remove kde4.konversation

- Already updated to KDE 5 in Nixpkgs
---
 .../networking/irc/konversation/1.6.nix       | 82 ----------------
 .../networking/irc/konversation/default.nix   | 96 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 77 insertions(+), 105 deletions(-)
 delete mode 100644 pkgs/applications/networking/irc/konversation/1.6.nix

diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix
deleted file mode 100644
index 9724ae5f4bf0..000000000000
--- a/pkgs/applications/networking/irc/konversation/1.6.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchurl
-, ecm
-, kbookmarks
-, karchive
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdeWrapper
-, kdoctools
-, kemoticons
-, kglobalaccel
-, ki18n
-, kiconthemes
-, kidletime
-, kitemviews
-, knotifications
-, knotifyconfig
-, kio
-, kparts
-, kwallet
-, makeQtWrapper
-, solid
-, sonnet
-, phonon
-}:
-
-let
-  unwrapped = let
-    pname = "konversation";
-    version = "1.6.2";
-  in kdeDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
-    };
-
-    buildInputs = [
-      kbookmarks
-      karchive
-      kconfig
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdoctools
-      kemoticons
-      kglobalaccel
-      ki18n
-      kiconthemes
-      kidletime
-      kitemviews
-      knotifications
-      knotifyconfig
-      kio
-      kparts
-      kwallet
-      solid
-      sonnet
-      phonon
-    ];
-
-    nativeBuildInputs = [
-      ecm
-      kdoctools
-    ];
-
-    meta = {
-      description = "Integrated IRC client for KDE";
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ fridh ];
-      homepage = https://konversation.kde.org;
-    };
-  };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konversation" ];
-}
-
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index cbe4e3be28d4..9724ae5f4bf0 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,26 +1,82 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
+{ kdeDerivation
+, lib
+, fetchurl
+, ecm
+, kbookmarks
+, karchive
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdeWrapper
+, kdoctools
+, kemoticons
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kidletime
+, kitemviews
+, knotifications
+, knotifyconfig
+, kio
+, kparts
+, kwallet
+, makeQtWrapper
+, solid
+, sonnet
+, phonon
+}:
 
 let
-  pn = "konversation";
-  v = "1.5.1";
-in
+  unwrapped = let
+    pname = "konversation";
+    version = "1.6.2";
+  in kdeDerivation rec {
+    name = "${pname}-${version}";
 
-stdenv.mkDerivation rec {
-  name = "${pn}-${v}";
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
+    };
 
-  src = fetchurl {
-    url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
-    sha256 = "11hrjrq4r6v1v14ybx9llgzmrl3a45z26n292nb0q887rg1qv0wp";
-  };
-
-  buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
-    automoc4 phonon qca2 ];
-
-  meta = with stdenv.lib; {
-    description = "Integrated IRC client for KDE";
-    repositories.git = git://anongit.kde.org/konversation;
-    license = "GPL";
-    inherit (kdelibs.meta) maintainers platforms;
+    buildInputs = [
+      kbookmarks
+      karchive
+      kconfig
+      kconfigwidgets
+      kcoreaddons
+      kdbusaddons
+      kdoctools
+      kemoticons
+      kglobalaccel
+      ki18n
+      kiconthemes
+      kidletime
+      kitemviews
+      knotifications
+      knotifyconfig
+      kio
+      kparts
+      kwallet
+      solid
+      sonnet
+      phonon
+    ];
+
+    nativeBuildInputs = [
+      ecm
+      kdoctools
+    ];
+
+    meta = {
+      description = "Integrated IRC client for KDE";
+      license = with lib.licenses; [ gpl2 ];
+      maintainers = with lib.maintainers; [ fridh ];
+      homepage = https://konversation.kde.org;
+    };
   };
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/konversation" ];
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2b40d142cb5..89ef5f5e4f78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14020,7 +14020,7 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
-  konversation = qt5.callPackage ../applications/networking/irc/konversation/1.6.nix { };
+  konversation = qt5.callPackage ../applications/networking/irc/konversation { };
 
   krita = qt5.callPackage ../applications/graphics/krita {
     vc = vc_0_7;
@@ -16745,8 +16745,6 @@ with pkgs;
 
         kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
 
-        konversation = callPackage ../applications/networking/irc/konversation { };
-
         ktikz = callPackage ../applications/graphics/ktikz { };
 
         kvirc = callPackage ../applications/networking/irc/kvirc { };

From a8c58cf6abb39fd06bd4e0a033e99c8d25e8f215 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:07:27 -0600
Subject: [PATCH 1041/3449] Remove kde4.quassel

- Already updated to KDE 5 in Nixpkgs
---
 .../networking/irc/quassel/default.nix        | 47 ++++++----
 .../networking/irc/quassel/qt-5.nix           | 88 -------------------
 pkgs/top-level/all-packages.nix               | 45 +---------
 3 files changed, 33 insertions(+), 147 deletions(-)
 delete mode 100644 pkgs/applications/networking/irc/quassel/qt-5.nix

diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index f48309d0b049..d631f4aa2146 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -1,15 +1,26 @@
 { monolithic ? true # build monolithic Quassel
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
-, previews ? false # enable webpage previews on hovering over URLs
 , tag ? "" # tag added to the package name
-, withKDE ? stdenv.isLinux # enable KDE integration
-, kdelibs ? null
 , static ? false # link statically
 
-, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }:
+, stdenv, fetchurl, cmake, makeWrapper, dconf
+, qtbase, qtscript
+, phonon, libdbusmenu, qca-qt5
 
-let buildClient = monolithic || client;
+, withKDE ? stdenv.isLinux # enable KDE integration
+, extra-cmake-modules
+, kconfigwidgets
+, kcoreaddons
+, knotifications
+, knotifyconfig
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+}:
+
+let
+    buildClient = monolithic || client;
     buildCore = monolithic || daemon;
 in
 
@@ -17,7 +28,6 @@ assert stdenv.isLinux;
 
 assert monolithic -> !client && !daemon;
 assert client || daemon -> !monolithic;
-assert withKDE -> kdelibs != null;
 assert !buildClient -> !withKDE; # KDE is used by the client only
 
 let
@@ -31,21 +41,28 @@ in with stdenv; mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs =
-       [ cmake makeWrapper qt ]
-    ++ lib.optionals buildCore [qca2]
-    ++ lib.optionals withKDE [automoc4 kdelibs phonon];
+  # Prevent ``undefined reference to `qt_version_tag''' in SSL check
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];
 
-  NIX_CFLAGS_COMPILE = "-fPIC";
+  buildInputs =
+       [ cmake makeWrapper qtbase ]
+    ++ lib.optionals buildCore [qtscript qca-qt5]
+    ++ lib.optionals buildClient [libdbusmenu phonon]
+    ++ lib.optionals (buildClient && withKDE) [
+      extra-cmake-modules kconfigwidgets kcoreaddons
+      knotifications knotifyconfig ktextwidgets kwidgetsaddons
+      kxmlgui
+    ];
 
   cmakeFlags = [
-    "-DEMBED_DATA=OFF" ]
+    "-DEMBED_DATA=OFF"
+    "-DUSE_QT5=ON"
+  ]
     ++ edf static "STATIC"
     ++ edf monolithic "WANT_MONO"
     ++ edf daemon "WANT_CORE"
     ++ edf client "WANT_QTCLIENT"
-    ++ edf withKDE "WITH_KDE"
-    ++ edf previews "WITH_WEBKIT";
+    ++ edf withKDE "WITH_KDE";
 
   preFixup =
     lib.optionalString buildClient ''
@@ -66,6 +83,6 @@ in with stdenv; mkDerivation rec {
     license = stdenv.lib.licenses.gpl3;
     maintainers = with maintainers; [ phreedom ttuegel ];
     repositories.git = https://github.com/quassel/quassel.git;
-    inherit (qt.meta) platforms;
+    inherit (qtbase.meta) platforms;
   };
 }
diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix
deleted file mode 100644
index d631f4aa2146..000000000000
--- a/pkgs/applications/networking/irc/quassel/qt-5.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{ monolithic ? true # build monolithic Quassel
-, daemon ? false # build Quassel daemon
-, client ? false # build Quassel client
-, tag ? "" # tag added to the package name
-, static ? false # link statically
-
-, stdenv, fetchurl, cmake, makeWrapper, dconf
-, qtbase, qtscript
-, phonon, libdbusmenu, qca-qt5
-
-, withKDE ? stdenv.isLinux # enable KDE integration
-, extra-cmake-modules
-, kconfigwidgets
-, kcoreaddons
-, knotifications
-, knotifyconfig
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-}:
-
-let
-    buildClient = monolithic || client;
-    buildCore = monolithic || daemon;
-in
-
-assert stdenv.isLinux;
-
-assert monolithic -> !client && !daemon;
-assert client || daemon -> !monolithic;
-assert !buildClient -> !withKDE; # KDE is used by the client only
-
-let
-  edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
-  source = import ./source.nix { inherit fetchurl; };
-
-in with stdenv; mkDerivation rec {
-  inherit (source) src version;
-
-  name = "quassel${tag}-${version}";
-
-  enableParallelBuilding = true;
-
-  # Prevent ``undefined reference to `qt_version_tag''' in SSL check
-  NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];
-
-  buildInputs =
-       [ cmake makeWrapper qtbase ]
-    ++ lib.optionals buildCore [qtscript qca-qt5]
-    ++ lib.optionals buildClient [libdbusmenu phonon]
-    ++ lib.optionals (buildClient && withKDE) [
-      extra-cmake-modules kconfigwidgets kcoreaddons
-      knotifications knotifyconfig ktextwidgets kwidgetsaddons
-      kxmlgui
-    ];
-
-  cmakeFlags = [
-    "-DEMBED_DATA=OFF"
-    "-DUSE_QT5=ON"
-  ]
-    ++ edf static "STATIC"
-    ++ edf monolithic "WANT_MONO"
-    ++ edf daemon "WANT_CORE"
-    ++ edf client "WANT_QTCLIENT"
-    ++ edf withKDE "WITH_KDE";
-
-  preFixup =
-    lib.optionalString buildClient ''
-        wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
-          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = http://quassel-irc.org/;
-    description = "Qt/KDE distributed IRC client suppporting a remote daemon";
-    longDescription = ''
-      Quassel IRC is a cross-platform, distributed IRC client,
-      meaning that one (or multiple) client(s) can attach to
-      and detach from a central core -- much like the popular
-      combination of screen and a text-based IRC client such
-      as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5).
-    '';
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with maintainers; [ phreedom ttuegel ];
-    repositories.git = https://github.com/quassel/quassel.git;
-    inherit (qtbase.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89ef5f5e4f78..880fa138b9c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14843,7 +14843,7 @@ with pkgs;
 
   qtscrobbler = callPackage ../applications/audio/qtscrobbler { };
 
-  quassel = qt5.callPackage ../applications/networking/irc/quassel/qt-5.nix {
+  quassel = qt5.callPackage ../applications/networking/irc/quassel {
     monolithic = true;
     daemon = false;
     client = false;
@@ -16783,49 +16783,6 @@ with pkgs;
 
         qtcurve = callPackage ../misc/themes/qtcurve { };
 
-        quassel = callPackage ../applications/networking/irc/quassel rec {
-          monolithic = true;
-          daemon = false;
-          client = false;
-          withKDE = stdenv.isLinux;
-          qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0)
-          dconf = gnome3.dconf;
-        };
-
-        quasselWithoutKDE = (quassel.override {
-          monolithic = true;
-          daemon = false;
-          client = false;
-          withKDE = false;
-          #qt = qt5;
-          tag = "-without-kde";
-        });
-
-        quasselDaemon = (quassel.override {
-          monolithic = false;
-          daemon = true;
-          client = false;
-          withKDE = false;
-          #qt = qt5;
-          tag = "-daemon";
-        });
-
-        quasselClient = (quassel.override {
-          monolithic = false;
-          daemon = false;
-          client = true;
-          tag = "-client";
-        });
-
-        quasselClientWithoutKDE = (quasselClient.override {
-          monolithic = false;
-          daemon = false;
-          client = true;
-          withKDE = false;
-          #qt = qt5;
-          tag = "-client-without-kde";
-        });
-
         rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
         rekonq = wrapFirefox rekonq-unwrapped { };
 

From d768dcd4f3a8eb1340a3935c4694a032d1564e22 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:08:57 -0600
Subject: [PATCH 1042/3449] Remove kde4.skrooge

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/applications/office/skrooge/2.nix       | 35 --------------------
 pkgs/applications/office/skrooge/default.nix | 35 ++++++++++++++------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  4 +--
 4 files changed, 26 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/office/skrooge/2.nix

diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix
deleted file mode 100644
index 42cc9b0c6eb1..000000000000
--- a/pkgs/applications/office/skrooge/2.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee,
-  kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
-  kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
-  knotifyconfig, krunner, libofx }:
-
-stdenv.mkDerivation rec {
-  name = "skrooge-${version}";
-  version = "2.7.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
-  };
-
-  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
-
-  buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
-    kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
-    kdelibs4support kactivities knotifyconfig krunner libofx
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/skrooge"
-    wrapQtProgram "$out/bin/skroogeconvert"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A personal finances manager, powered by KDE";
-    license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [ joko ];
-    homepage = https://skrooge.org/;
-  };
-}
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index b0d7f1399376..42cc9b0c6eb1 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -1,22 +1,35 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig, shared_mime_info
-, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }:
+{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee,
+  kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
+  kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
+  knotifyconfig, krunner, libofx }:
 
 stdenv.mkDerivation rec {
-  name = "skrooge-1.12.5";
+  name = "skrooge-${version}";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "1mnkm0367knh0a65gifr20p42ql9zndw7d6kmbvfshvpfsmghl40";
+    sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
   };
 
-  buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ];
+  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
 
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig shared_mime_info ];
+  buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
+    kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
+    kdelibs4support kactivities knotifyconfig krunner libofx
+  ];
 
-  meta = {
-    inherit (kdelibs.meta) platforms;
-    description = "A personal finance manager for KDE";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    license = stdenv.lib.licenses.gpl3;
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/skrooge"
+    wrapQtProgram "$out/bin/skroogeconvert"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A personal finances manager, powered by KDE";
+    license = with licenses; [ gpl3 ];
+    maintainers = with maintainers; [ joko ];
+    homepage = https://skrooge.org/;
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 14ef7a1cf472..db48e0769b3d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -106,6 +106,7 @@ doNotDisplayTwice rec {
   saneBackendsGit = sane-backends-git; # added 2016-01-02
   saneFrontends = sane-frontends; # added 2016-01-02
   scim = sc-im; # added 2016-01-22
+  skrooge2 = skrooge; # added 2017-02-18
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 880fa138b9c5..d6a3dc34d724 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15150,7 +15150,7 @@ with pkgs;
     themes = [];  # extra themes, etc.
   };
 
-  skrooge2 = qt5.callPackage ../applications/office/skrooge/2.nix {};
+  skrooge = qt5.callPackage ../applications/office/skrooge {};
 
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
@@ -16792,8 +16792,6 @@ with pkgs;
 
         semnotes = callPackage ../applications/misc/semnotes { };
 
-        skrooge = callPackage ../applications/office/skrooge { };
-
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
         yakuake = callPackage ../applications/misc/yakuake { };

From fabce0c4a8b73f1123c8020d8a471bb7fe632a88 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:10:10 -0600
Subject: [PATCH 1043/3449] Remove kde4.yakuake

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/applications/misc/yakuake/3.0.nix     | 63 ----------------
 pkgs/applications/misc/yakuake/default.nix | 83 +++++++++++++++-------
 pkgs/top-level/all-packages.nix            |  4 +-
 3 files changed, 60 insertions(+), 90 deletions(-)
 delete mode 100644 pkgs/applications/misc/yakuake/3.0.nix

diff --git a/pkgs/applications/misc/yakuake/3.0.nix b/pkgs/applications/misc/yakuake/3.0.nix
deleted file mode 100644
index 8bce26deefc3..000000000000
--- a/pkgs/applications/misc/yakuake/3.0.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchurl
-, kdoctools
-, kdeWrapper
-, ecm
-, karchive
-, kcrash
-, kdbusaddons
-, ki18n
-, kiconthemes
-, knewstuff
-, knotifications
-, knotifyconfig
-, konsole
-, kparts
-, kwindowsystem
-}:
-
-let
-  unwrapped = let
-    pname = "yakuake";
-    version = "3.0.2";
-  in kdeDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5";
-    };
-
-    buildInputs = [
-      karchive
-      kcrash
-      kdbusaddons
-      ki18n
-      kiconthemes
-      knewstuff
-      knotifications
-      knotifyconfig
-      kparts
-      kwindowsystem
-    ];
-
-    nativeBuildInputs = [
-      ecm kdoctools
-    ];
-
-    meta = {
-      homepage = https://yakuake.kde.org;
-      description = "Quad-style terminal emulator for KDE";
-      maintainers = with lib.maintainers; [ fridh ];
-    };
-  };
-
-
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/yakuake" ];
-  paths = [ konsole.unwrapped ];
-}
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index e48201b914c5..8bce26deefc3 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -1,28 +1,63 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, konsole }:
+{ kdeDerivation
+, lib
+, fetchurl
+, kdoctools
+, kdeWrapper
+, ecm
+, karchive
+, kcrash
+, kdbusaddons
+, ki18n
+, kiconthemes
+, knewstuff
+, knotifications
+, knotifyconfig
+, konsole
+, kparts
+, kwindowsystem
+}:
 
 let
-  pname = "yakuake";
-  version = "2.9.9";
+  unwrapped = let
+    pname = "yakuake";
+    version = "3.0.2";
+  in kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchurl {
+      url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5";
+    };
+
+    buildInputs = [
+      karchive
+      kcrash
+      kdbusaddons
+      ki18n
+      kiconthemes
+      knewstuff
+      knotifications
+      knotifyconfig
+      kparts
+      kwindowsystem
+    ];
+
+    nativeBuildInputs = [
+      ecm kdoctools
+    ];
+
+    meta = {
+      homepage = https://yakuake.kde.org;
+      description = "Quad-style terminal emulator for KDE";
+      maintainers = with lib.maintainers; [ fridh ];
+    };
+  };
+
+
 in
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce";
-  };
-
-  buildInputs = [ kdelibs ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  propagatedUserEnvPkgs = [ konsole ];
-
-  meta = {
-    homepage = http://yakuake.kde.org;
-    description = "Quad-style terminal emulator for KDE";
-    inherit (kdelibs.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
+kdeWrapper
+{
+  inherit unwrapped;
+  targets = [ "bin/yakuake" ];
+  paths = [ konsole.unwrapped ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6a3dc34d724..eafb3541c556 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15967,7 +15967,7 @@ with pkgs;
 
   yabar = callPackage ../applications/window-managers/yabar { };
 
-  yakuake = kde5.callPackage ../applications/misc/yakuake/3.0.nix {};
+  yakuake = kde5.callPackage ../applications/misc/yakuake {};
 
   yarp = callPackage ../applications/science/robotics/yarp {};
 
@@ -16794,8 +16794,6 @@ with pkgs;
 
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
-        yakuake = callPackage ../applications/misc/yakuake { };
-
         zanshin = callPackage ../applications/office/zanshin { };
 
         kwooty = callPackage ../applications/networking/newsreaders/kwooty { };

From d237f44928e8e7a6bec3d6efca0cd36de7870c9f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:53:53 -0600
Subject: [PATCH 1044/3449] Remove kde4.bluedevil

- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
---
 pkgs/tools/bluetooth/bluedevil/default.nix | 24 ----------------------
 pkgs/top-level/all-packages.nix            |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/tools/bluetooth/bluedevil/default.nix

diff --git a/pkgs/tools/bluetooth/bluedevil/default.nix b/pkgs/tools/bluetooth/bluedevil/default.nix
deleted file mode 100644
index e018972d2aaf..000000000000
--- a/pkgs/tools/bluetooth/bluedevil/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, automoc4, kdelibs, libbluedevil, shared_mime_info, gettext }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  pname = "bluedevil";
-  # bluedevil must have the same major version (x.y) as libbluedevil!
-  # do not update this package without checking libbluedevil
-  version = "2.1.1";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "1rcx1dfm6sm90pvwyq224a1pph96chrmyiv1rry7zpb3hf2c73gi";
-  };
-
-  buildInputs = [ cmake kdelibs libbluedevil shared_mime_info automoc4 gettext ];
-
-  meta = with stdenv.lib; {
-    description = "Bluetooth manager for KDE";
-    license = stdenv.lib.licenses.gpl2;
-    inherit (kdelibs.meta) platforms;
-    maintainers = [ maintainers.phreedom ];
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eafb3541c556..6235aa96a53b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16707,8 +16707,6 @@ with pkgs;
 
         basket = callPackage ../applications/office/basket { };
 
-        bluedevil = callPackage ../tools/bluetooth/bluedevil { };
-
         calligra = callPackage ../applications/office/calligra {
           vc = vc_0_7;
         };

From eedbb61eb3a48bc4a3ceeb3e688291d3fc168ecc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:55:19 -0600
Subject: [PATCH 1045/3449] Remove kde4.colord-kde4

- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
---
 pkgs/tools/misc/colord-kde/0.5.nix            | 30 ----------------
 pkgs/tools/misc/colord-kde/default.nix        | 36 ++++++++++---------
 .../colord-kde/fix_check_include_files.patch  |  9 -----
 pkgs/top-level/all-packages.nix               |  4 +--
 4 files changed, 21 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/tools/misc/colord-kde/0.5.nix
 delete mode 100644 pkgs/tools/misc/colord-kde/fix_check_include_files.patch

diff --git a/pkgs/tools/misc/colord-kde/0.5.nix b/pkgs/tools/misc/colord-kde/0.5.nix
deleted file mode 100644
index 0c8e9d6bceef..000000000000
--- a/pkgs/tools/misc/colord-kde/0.5.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, lib, fetchurl
-, extra-cmake-modules, ki18n
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
-, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
-, kitemviews, lcms2, libXrandr, qtx11extras
-}:
-
-stdenv.mkDerivation rec {
-  name = "colord-kde-${version}";
-  version = "0.5.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
-    sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
-  };
-
-  nativeBuildInputs = [ extra-cmake-modules ki18n ];
-
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kcmutils kio knotifications plasma-framework kwidgetsaddons
-    kwindowsystem kitemviews lcms2 libXrandr qtx11extras
-  ];
-
-  meta = with lib; {
-    homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 52e1845b300f..0c8e9d6bceef 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, colord, libX11, libXrandr, lcms2, kdelibs
+{ stdenv, lib, fetchurl
+, extra-cmake-modules, ki18n
+, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
+, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
+, kitemviews, lcms2, libXrandr, qtx11extras
 }:
 
-stdenv.mkDerivation {
-  name = "colord-kde-0.3.0";
+stdenv.mkDerivation rec {
+  name = "colord-kde-${version}";
+  version = "0.5.0";
 
   src = fetchurl {
-    url = http://download.kde.org/stable/colord-kde/0.3.0/src/colord-kde-0.3.0.tar.bz2;
-    sha256 = "ab3cdb7c8c98aa2ee8de32a92f87770e1fbd58eade6471f3f24d932b50b4cf09";
+    url = "http://download.kde.org/stable/colord-kde/${version}/src/${name}.tar.xz";
+    sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
   };
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  nativeBuildInputs = [ extra-cmake-modules ki18n ];
 
-  buildInputs = [ colord libX11 libXrandr lcms2 kdelibs ];
+  buildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kcmutils kio knotifications plasma-framework kwidgetsaddons
+    kwindowsystem kitemviews lcms2 libXrandr qtx11extras
+  ];
 
-  patches = [ ./fix_check_include_files.patch ];
-  patchFlags = [ "-p0" ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "A colord front-end for KDE";
-    license = stdenv.lib.licenses.gpl2Plus;
+  meta = with lib; {
+    homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch b/pkgs/tools/misc/colord-kde/fix_check_include_files.patch
deleted file mode 100644
index 16d14a6a647a..000000000000
--- a/pkgs/tools/misc/colord-kde/fix_check_include_files.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- CMakeLists.txt.orig	2013-05-01 05:04:34.000000000 +1000
-+++ CMakeLists.txt	2015-12-10 20:43:51.351800988 +1100
-@@ -9,6 +9,7 @@
- include(FindPkgConfig)
- include(KDE4Defaults)
-+include(CheckIncludeFiles)
- include(ConfigureChecks.cmake)
- 
- message(STATUS "X randr is required, found: " ${XRANDR_1_3_FOUND})
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6235aa96a53b..7e0bd2562505 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -746,7 +746,7 @@ with pkgs;
 
   clib = callPackage ../tools/package-management/clib { };
 
-  colord-kde = qt5.callPackage ../tools/misc/colord-kde/0.5.nix {};
+  colord-kde = qt5.callPackage ../tools/misc/colord-kde {};
 
   consul = callPackage ../servers/consul { };
 
@@ -16713,8 +16713,6 @@ with pkgs;
 
         choqok = callPackage ../applications/networking/instant-messengers/choqok { };
 
-        colord-kde = callPackage ../tools/misc/colord-kde { };
-
         eventlist = callPackage ../applications/office/eventlist {};
 
         k3b-original = lowPrio (callPackage ../applications/misc/k3b { });

From db5ab73ec89c5221936e992aac9445ba8c68de38 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:56:38 -0600
Subject: [PATCH 1046/3449] Remove kde4.eventlist

- Not useful without the KDE 4 desktop
---
 .../applications/office/eventlist/default.nix | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/office/eventlist/default.nix

diff --git a/pkgs/applications/office/eventlist/default.nix b/pkgs/applications/office/eventlist/default.nix
deleted file mode 100644
index 395cb3d0a914..000000000000
--- a/pkgs/applications/office/eventlist/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kdepimlibs, akonadi, boost }:
-
-stdenv.mkDerivation rec {
-  name = "plasmoid-eventlist-0.6.96";
-
-  src = fetchurl {
-    url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2";
-    sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-  buildInputs = [ kdelibs kdepimlibs akonadi boost ];
-
-  meta = {
-    inherit (kdelibs.meta) platforms;
-    description = "KDE Plasmoid to show events and todos on the desktop";
-    longDescription = ''
-      This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.).
-      With a google resource also Google calendar items can be shown.
-      Also possible with a CalDAV resource.
-      A facebook resource is also available.
-
-      Incidences can be filtered, added, edited, deleted via context menu.
-    '';
-    homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779";
-    license = stdenv.lib.licenses.gpl3Plus;
-
-	  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e0bd2562505..919d6c80d7c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16713,8 +16713,6 @@ with pkgs;
 
         choqok = callPackage ../applications/networking/instant-messengers/choqok { };
 
-        eventlist = callPackage ../applications/office/eventlist {};
-
         k3b-original = lowPrio (callPackage ../applications/misc/k3b { });
 
         k3b = callPackage ../applications/misc/k3b/wrapper.nix { };

From 00dce4e29f2195b49a19b9c44a93f44244e7664e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:57:18 -0600
Subject: [PATCH 1047/3449] Remove kde4.kde_gtk_config

- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
---
 pkgs/tools/misc/kde-gtk-config/default.nix    | 47 -------------------
 .../kde-gtk-config-2.2.1-install-paths.patch  | 28 -----------
 .../kde-gtk-config-follow-symlinks.patch      | 13 -----
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 90 deletions(-)
 delete mode 100644 pkgs/tools/misc/kde-gtk-config/default.nix
 delete mode 100644 pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch
 delete mode 100644 pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch

diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix
deleted file mode 100644
index 41aaad553463..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, gtk2, gtk3, kdelibs, libxcb, libpthreadstubs, libXdmcp
-, glib, gdk_pixbuf
-}:
-
-stdenv.mkDerivation {
-  name = "kde-gtk-config-2.2.1";
-  src = fetchurl {
-    url = "mirror://kde/stable/kde-gtk-config/2.2.1/src/kde-gtk-config-2.2.1.tar.xz";
-    sha256 = "11aw86jcjcg3ywnzrxy9x8dvd73my18k0if52fnvyvmb75z0v2cw";
-  };
-
-  buildInputs = [
-    gdk_pixbuf glib gtk2 gtk3 kdelibs libxcb libpthreadstubs libXdmcp
-  ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  patches = [
-    ./kde-gtk-config-2.2.1-install-paths.patch
-    ./kde-gtk-config-follow-symlinks.patch
-  ];
-
-  cmakeFlags = ''
-    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
-    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
-    -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0
-    -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://projects.kde.org/projects/extragear/base/kde-gtk-config;
-    description = "GTK configuration module for KDE System Settings";
-    longDescription = ''
-      Configuration dialog to adapt GTK applications appearance to your taste under KDE.
-      Among its many features, it lets you:
-      - Choose which theme is used for GTK2 and GTK3 applications.
-      - Tweak some GTK applications behaviour.
-      - Select what icon theme to use in GTK applications.
-      - Select GTK applications default fonts.
-      - Easily browse and install new GTK2 and GTK3 themes.
-    '';
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch
deleted file mode 100644
index e6596ef0dcc7..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-2.2.1-install-paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt
---- kde-gtk-config-2.2.1-a/gtk3proxies/CMakeLists.txt	2013-03-18 06:02:39.000000000 -0500
-+++ kde-gtk-config-2.2.1-b/gtk3proxies/CMakeLists.txt	2013-12-24 18:57:59.854264894 -0600
-@@ -6,4 +6,4 @@
- 
- add_executable(gtk3_preview preview3.c)
- target_link_libraries(gtk3_preview ${GTK3_LIBRARY} ${GOBJECT2_LIBRARY} ${GLIB2_LIBRARY})
--install(TARGETS gtk3_preview  RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
-+install(TARGETS gtk3_preview  RUNTIME DESTINATION bin)
-diff -ur kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt
---- kde-gtk-config-2.2.1-a/gtkproxies/CMakeLists.txt	2013-03-18 06:02:39.000000000 -0500
-+++ kde-gtk-config-2.2.1-b/gtkproxies/CMakeLists.txt	2013-12-24 18:57:40.967781611 -0600
-@@ -4,13 +4,13 @@
- 
- add_executable(reload_gtk_apps reload.c)
- target_link_libraries(reload_gtk_apps ${GTK2_LIBRARIES})
--install(TARGETS reload_gtk_apps RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
-+install(TARGETS reload_gtk_apps RUNTIME DESTINATION bin)
- 
- add_definitions("-DDATA_DIR=\\\"${DATA_INSTALL_DIR}/kcm-gtk-module/\\\"")
- 
- add_executable(gtk_preview preview.c)
- target_link_libraries(gtk_preview ${GTK2_LIBRARIES} ${GTK2_GIOMM_LIBRARY})
--install(TARGETS gtk_preview RUNTIME DESTINATION "${KDE4_LIBEXEC_INSTALL_DIR}")
-+install(TARGETS gtk_preview RUNTIME DESTINATION bin)
- 
- # preview file used for the gtk3 version too
- install(FILES preview.ui
diff --git a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch b/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
deleted file mode 100644
index e291589e82e3..000000000000
--- a/pkgs/tools/misc/kde-gtk-config/kde-gtk-config-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
-index 3d89c82..4dcce69 100644
---- a/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
-@@ -56,7 +56,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
-     QStringList themes=installedThemes();
-     themes=themes.filter(QRegExp("/"+themeName+"/?$"));
-     if(themes.size()==1) {
--        QDirIterator it(themes.first(), QDirIterator::Subdirectories);
-+        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while(it.hasNext()) {
-             it.next();
-             if(it.fileName()=="gtkrc") {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 919d6c80d7c9..fd0919ca3d4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16721,8 +16721,6 @@ with pkgs;
 
         kbibtex = callPackage ../applications/office/kbibtex { };
 
-        kde_gtk_config = callPackage ../tools/misc/kde-gtk-config { };
-
         kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
 
         kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };

From b12f87beb8cac7c5785f5a971a9f279a9c0f1bef Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:58:31 -0600
Subject: [PATCH 1048/3449] Remove kde4.kde_wacomtablet

- Not useful without the KDE 4 desktop
---
 .../misc/kde-wacomtablet/default.nix          | 23 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/applications/misc/kde-wacomtablet/default.nix

diff --git a/pkgs/applications/misc/kde-wacomtablet/default.nix b/pkgs/applications/misc/kde-wacomtablet/default.nix
deleted file mode 100644
index 013efee8ec91..000000000000
--- a/pkgs/applications/misc/kde-wacomtablet/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, xf86_input_wacom }:
-
-stdenv.mkDerivation rec {
-  name = "wacomtablet-2.1.0";
-
-  src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz";
-    sha256 = "17n1p5v2yx517hkqd13pyl3wnrdnh6pfzwf2y2csrfckyndhwk8w";
-  };
-
-  buildInputs = [ kdelibs xf86_input_wacom ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "KDE Wacom graphic tablet configuration tool";
-    license = licenses.gpl2Plus;
-    homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu maintainers.urkud ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fd0919ca3d4d..2cfcbe961f93 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16721,8 +16721,6 @@ with pkgs;
 
         kbibtex = callPackage ../applications/office/kbibtex { };
 
-        kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
-
         kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
 
         kdesvn = callPackage ../applications/version-management/kdesvn { };

From 2d7f5586615c7ae75f3b0be95190bbf0be160712 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 12:59:05 -0600
Subject: [PATCH 1049/3449] Remove kde4.ksshaskpass

- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
---
 pkgs/tools/security/ksshaskpass/default.nix | 27 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 2 files changed, 29 deletions(-)
 delete mode 100644 pkgs/tools/security/ksshaskpass/default.nix

diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix
deleted file mode 100644
index a668f57c5bbe..000000000000
--- a/pkgs/tools/security/ksshaskpass/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, kdelibs
-, automoc4, cmake, perl, pkgconfig
-}:
-
-stdenv.mkDerivation {
-  name = "ksshaskpass-0.5.3";
-
-  src = fetchurl {
-    url = http://kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz;
-    sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  buildInputs = [ kdelibs ];
-
-  patchPhase = ''
-    sed -i 's@/usr/bin/@@' src/ksshaskpass.desktop
-  '';
-
-  meta = {
-    homepage = http://kde-apps.org/content/show.php?content=50971;
-    description = "A KDE 4 version of ssh-askpass with KWallet support";
-    license = stdenv.lib.licenses.gpl2Plus;
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cfcbe961f93..3790c9f775b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16741,8 +16741,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        ksshaskpass = callPackage ../tools/security/ksshaskpass {};
-
         ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
 
         kuickshow = callPackage ../applications/graphics/kuickshow { };

From 9be791656fa85b2ef4fbfda3b8ad7fd26c695760 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:00:07 -0600
Subject: [PATCH 1050/3449] Remove kde4.plasma-nm and its dependencies

- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
---
 .../libraries/libmm-qt/default.nix            | 31 -----------------
 .../libraries/libnm-qt/default.nix            | 33 -------------------
 pkgs/tools/networking/plasma-nm/default.nix   | 29 ----------------
 pkgs/top-level/all-packages.nix               |  6 ----
 4 files changed, 99 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmm-qt/default.nix
 delete mode 100644 pkgs/development/libraries/libnm-qt/default.nix
 delete mode 100644 pkgs/tools/networking/plasma-nm/default.nix

diff --git a/pkgs/development/libraries/libmm-qt/default.nix b/pkgs/development/libraries/libmm-qt/default.nix
deleted file mode 100644
index 3515d8388a27..000000000000
--- a/pkgs/development/libraries/libmm-qt/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qt4, doxygen, modemmanager }:
-
-let
-  pname = "libmm-qt";
-  version = "1.0.1";
-  name = "${pname}-${version}";
-in
-stdenv.mkDerivation {
-  inherit name;
-
-  buildInputs = [
-    cmake
-    pkgconfig
-    qt4
-    doxygen
-  ];
-
-  propagatedBuildInputs = [ modemmanager ];
-
-  src = fetchurl {
-    url = "mirror://kde/unstable/modemmanager-qt/${version}/src/${name}-1.tar.xz";
-    sha256 = "0ad57815a904ddb2660a7327c0bda5da47a2a60ce57b2b12f4aaff99b174f74a";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = "https://projects.kde.org/projects/extragear/libs/libmm-qt";
-    description = "Qt wrapper for ModemManager DBus API";
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libnm-qt/default.nix b/pkgs/development/libraries/libnm-qt/default.nix
deleted file mode 100644
index b9d033235cb4..000000000000
--- a/pkgs/development/libraries/libnm-qt/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, qt4, networkmanager, libmm-qt }:
-
-let
-  pname = "libnm-qt";
-  version = "0.9.8.2";
-  name = "${pname}-${version}";
-in
-stdenv.mkDerivation {
-  inherit name;
-
-  buildInputs = [
-    cmake
-    pkgconfig
-    qt4
-    networkmanager
-  ];
-
-  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
-
-  propagatedBuildInputs = [ libmm-qt ];
-
-  src = fetchurl {
-    url = "mirror://kde/unstable/networkmanager-qt/${version}/src/${name}.tar.xz";
-    sha256 = "118fa4732536677f889b2776ec45bd0c726f26abcb8e8b6f8dfcaee265475f33";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = "https://projects.kde.org/projects/extragear/libs/libnm-qt";
-    description = "Qt wrapper for NetworkManager DBus API";
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix
deleted file mode 100644
index f0f379d38295..000000000000
--- a/pkgs/tools/networking/plasma-nm/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, networkmanager, libnm-qt, glib }:
-
-let
-  pname = "plasma-nm";
-  version = "0.9.3.4";
-  name = "${pname}-${version}";
-in
-stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-    sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  buildInputs = [ kdelibs networkmanager libnm-qt ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://projects.kde.org/projects/kde/workspace/plasma-nm";
-    description = "Plasma applet written in QML for managing network connections";
-    license = licenses.lgpl21;
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3790c9f775b2..8b5cc63cc8db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16755,16 +16755,10 @@ with pkgs;
 
         liblikeback = callPackage ../development/libraries/liblikeback { };
 
-        libmm-qt = callPackage ../development/libraries/libmm-qt { };
-
-        libnm-qt = callPackage ../development/libraries/libnm-qt { };
-
         massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
 
         partitionManager = callPackage ../tools/misc/partition-manager { };
 
-        plasma-nm = callPackage ../tools/networking/plasma-nm { };
-
         polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
 
         psi = callPackage ../applications/networking/instant-messengers/psi { };

From dab94220faff4ed8c4e90d74fce80087880d3fdc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:00:50 -0600
Subject: [PATCH 1051/3449] Remove kde4.polkit_kde_agent

- Already updated to KDE 5 in Nixpkgs
- Not useful without the KDE 4 desktop
---
 .../security/polkit-kde-agent/default.nix     | 22 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/tools/security/polkit-kde-agent/default.nix

diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix
deleted file mode 100644
index 6b4bcf7ad637..000000000000
--- a/pkgs/tools/security/polkit-kde-agent/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, polkit_qt4 }:
-
-stdenv.mkDerivation rec {
-  name = "polkit-kde-agent-1-0.99.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
-    sha256 = "0rxlq6x0vhvha8i6w109zpzzacp4imins55v4p4fq7a3k0kgywg3";
-  };
-
-  buildInputs = [ kdelibs polkit_qt4 ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt";
-
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
-    description = "PolicyKit authentication agent for KDE";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b5cc63cc8db..9c935b400aea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16759,8 +16759,6 @@ with pkgs;
 
         partitionManager = callPackage ../tools/misc/partition-manager { };
 
-        polkit_kde_agent = callPackage ../tools/security/polkit-kde-agent { };
-
         psi = callPackage ../applications/networking/instant-messengers/psi { };
 
         qtcurve = callPackage ../misc/themes/qtcurve { };

From 25378a6aa0b8601044175b4648bb3db83971659b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:01:32 -0600
Subject: [PATCH 1052/3449] Remove kde4.qtcurve

- Not useful without the KDE 4 desktop
---
 pkgs/misc/themes/qtcurve/default.nix          | 43 -------------------
 .../qtcurve-1.8.18-install-paths.patch        | 24 -----------
 .../qtcurve-1.8.18-toolbar-alpha.patch        | 34 ---------------
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 103 deletions(-)
 delete mode 100644 pkgs/misc/themes/qtcurve/default.nix
 delete mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch
 delete mode 100644 pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch

diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix
deleted file mode 100644
index cc11aab81cd8..000000000000
--- a/pkgs/misc/themes/qtcurve/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, gtk2, kde_workspace, kdelibs # Toolkit dependencies
-, libpthreadstubs, libXdmcp, libxcb, xorg # X11 dependencies
-}:
-
-stdenv.mkDerivation {
-  name = "qtcurve-1.8.18";
-  src = fetchurl {
-    url = "https://github.com/QtCurve/qtcurve/archive/1.8.18.tar.gz";
-    sha256 = "19kk11hgi6md1cl0hr0pklcczbl66jczahlkf5fr8j59ljgpr6c5";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  buildInputs = [
-    gtk2
-    kde_workspace
-    kdelibs
-    libpthreadstubs
-    libXdmcp
-    libxcb
-    pkgconfig
-    xorg.libxshmfence
-  ];
-
-  patches = [
-    ./qtcurve-1.8.18-install-paths.patch
-    ./qtcurve-1.8.18-toolbar-alpha.patch
-  ];
-
-  cmakeFlags = ''
-    -DENABLE_QT5=OFF
-    -DQTC_QT4_ENABLE_KWIN=ON
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/QtCurve/qtcurve;
-    description = "Widget styles for Qt4/KDE4 and gtk2";
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch
deleted file mode 100644
index 345ac25bbbb0..000000000000
--- a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-install-paths.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2be588..4cb9115 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -116,6 +116,7 @@ if(ENABLE_GTK2)
-   find_package(PkgConfig REQUIRED)
-   unset(__pkg_config_checked_GTK2 CACHE)
-   pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
-+  set(GTK2_THEME_PREFIX "${CMAKE_INSTALL_PREFIX}")
-   if(GTK2_THEME_PREFIX)
-     set(GTK2_PREFIX "${GTK2_THEME_PREFIX}")
-   elseif(NOT GTK2_PREFIX)
-diff --git a/gtk2/style/CMakeLists.txt b/gtk2/style/CMakeLists.txt
-index 01e8891..a2c767e 100644
---- a/gtk2/style/CMakeLists.txt
-+++ b/gtk2/style/CMakeLists.txt
-@@ -88,6 +88,6 @@ target_link_libraries(qtcurve-gtk2
-   qtcurve-utils qtcurve-cairo m)
- 
- install(TARGETS qtcurve-gtk2 LIBRARY DESTINATION
--  ${GTK2_LIBDIR}/gtk-2.0/${GTK2_BIN_VERSION}/engines)
-+  lib/gtk-2.0/${GTK2_BIN_VERSION}/engines)
- install(FILES gtkrc icons3 icons4 map_kde_icons.pl kdeglobals
-   DESTINATION ${GTK2_THEME_DIR}/gtk-2.0)
diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch
deleted file mode 100644
index 85400e6f0f67..000000000000
--- a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/qt4/style/qtcurve.cpp b/qt4/style/qtcurve.cpp
-index d7659f5..aede882 100644
---- a/qt4/style/qtcurve.cpp
-+++ b/qt4/style/qtcurve.cpp
-@@ -12436,7 +12436,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p,
-     if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) ||
-         (menu && SHADE_NONE != opts.shadeMenubars)) {
-         p->save();
-+#if 0
-+        // Revert for now
-+        // This is necessary for correct opacity on the menubar but may
-+        // break transparent gradient.
-         p->setCompositionMode(QPainter::CompositionMode_Source);
-+#endif
-         QRect rx(r);
-         QColor col(menu && (option->state & State_Enabled ||
-                             SHADE_NONE != opts.shadeMenubars) ?
-diff --git a/qt5/style/qtcurve.cpp b/qt5/style/qtcurve.cpp
-index c43b8a3..135eddc 100644
---- a/qt5/style/qtcurve.cpp
-+++ b/qt5/style/qtcurve.cpp
-@@ -3398,7 +3398,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p,
-     if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) ||
-         (menu && opts.shadeMenubars != SHADE_NONE)) {
-         p->save();
-+#if 0
-+        // Revert for now
-+        // This is necessary for correct opacity on the menubar but may
-+        // break transparent gradient.
-         p->setCompositionMode(QPainter::CompositionMode_Source);
-+#endif
-         QRect rx(r);
-         QColor col(menu && (option->state & State_Enabled ||
-                             opts.shadeMenubars != SHADE_NONE) ?
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c935b400aea..ed2d9c99d06a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16761,8 +16761,6 @@ with pkgs;
 
         psi = callPackage ../applications/networking/instant-messengers/psi { };
 
-        qtcurve = callPackage ../misc/themes/qtcurve { };
-
         rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
         rekonq = wrapFirefox rekonq-unwrapped { };
 

From f344817a3ece8284826fe6852e80c161644f340b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:02:26 -0600
Subject: [PATCH 1053/3449] Remove Oxygen GTK themes

- Not useful without the KDE 4 desktop
---
 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix  | 24 -------------------
 pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix | 23 ------------------
 pkgs/top-level/all-packages.nix               |  6 -----
 3 files changed, 53 deletions(-)
 delete mode 100644 pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
 delete mode 100644 pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix

diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
deleted file mode 100644
index ad13b5f17ab6..000000000000
--- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl,
-  cmake, dbus_glib, glib, gtk2, gdk_pixbuf, pkgconfig, xorg }:
-
-stdenv.mkDerivation rec {
-  version = "1.4.6";
-  name = "oxygen-gtk2-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/oxygen-gtk2/${version}/src/${name}.tar.bz2";
-    sha256 = "09mz4szsz3yswbj0nbw6qzlc5bc4id0f9r6ifm60b5nc8x1l72d2";
-  };
-
-  buildInputs = [ cmake dbus_glib glib gtk2 gdk_pixbuf
-   pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs
-   xorg.libxcb xorg.pixman ];
-
-  meta = with stdenv.lib; {
-    description = "Port of the default KDE widget theme (Oxygen), to gtk";
-    homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk;
-    license = licenses.lgpl2;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix b/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix
deleted file mode 100644
index 2cceee62447d..000000000000
--- a/pkgs/misc/themes/gtk3/oxygen-gtk3/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl
-, cmake, dbus_glib, glib, gtk3, gdk_pixbuf, pkgconfig, xorg }:
-
-stdenv.mkDerivation rec {
-  version = "1.4.1";
-  name = "oxygen-gtk3-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/oxygen-gtk3/${version}/src/${name}.tar.bz2";
-    sha256 = "0pd7wjzh5xgd24yg6b2avaiz1aq6rmh13d7c0jclffkmhmy24r0f";
-  };
-
-  buildInputs = [ cmake dbus_glib glib gtk3 gdk_pixbuf
-   pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs
-   xorg.libxcb xorg.pixman ];
-
-  meta = with stdenv.lib; {
-    description = "Port of the default KDE widget theme (Oxygen), to gtk 3";
-    homepage = https://projects.kde.org/projects/playground/artwork/oxygen-gtk;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed2d9c99d06a..f5ce3e6a8760 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16802,12 +16802,6 @@ with pkgs;
 
   albatross = callPackage ../misc/themes/albatross { };
 
-  oxygen-gtk2 = callPackage ../misc/themes/gtk2/oxygen-gtk { };
-
-  oxygen-gtk3 = callPackage ../misc/themes/gtk3/oxygen-gtk3 { };
-
-  oxygen_gtk = oxygen-gtk2; # backwards compatibility
-
   gtk_engines = callPackage ../misc/themes/gtk2/gtk-engines { };
 
   gtk-engine-murrine = callPackage ../misc/themes/gtk2/gtk-engine-murrine { };

From b1d78393bd08e8f024471f61e3915143638494b8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:24:52 -0600
Subject: [PATCH 1054/3449] Remove kde4.ktorrent

- Already updated to KDE 5 in Nixpkgs
---
 .../networking/p2p/ktorrent/5.nix             | 41 -------------------
 .../networking/p2p/ktorrent/default.nix       | 33 +++++++++------
 .../p2p/ktorrent/find-workspace.diff          | 29 -------------
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 22 insertions(+), 85 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/ktorrent/5.nix
 delete mode 100644 pkgs/applications/networking/p2p/ktorrent/find-workspace.diff

diff --git a/pkgs/applications/networking/p2p/ktorrent/5.nix b/pkgs/applications/networking/p2p/ktorrent/5.nix
deleted file mode 100644
index 7e47838c4f98..000000000000
--- a/pkgs/applications/networking/p2p/ktorrent/5.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, cmake
-, ecm, qtbase, qtscript
-, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
-, libktorrent, boost, taglib
-}:
-
-stdenv.mkDerivation rec {
-  name = pname + "-" + version;
-
-  pname = "ktorrent";
-  version = "5.0.1";
-
-  src = fetchurl {
-    url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
-    sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
-  };
-
-  patches =
-    [ (fetchurl {
-        url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
-        sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
-      })
-    ];
-
-  nativeBuildInputs = [ kdoctools ecm ];
-
-  buildInputs =
-    [ cmake qtbase qtscript
-      ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
-      libktorrent taglib
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "KDE integrated BtTorrent client";
-    homepage = https://www.kde.org/applications/internet/ktorrent/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index e53fda089111..7e47838c4f98 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -1,32 +1,41 @@
-{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost
-, gettext, kdebase_workspace, qt4, kdelibs, phonon }:
+{ stdenv, fetchurl, cmake
+, ecm, qtbase, qtscript
+, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
+, libktorrent, boost, taglib
+}:
 
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
 
   pname = "ktorrent";
-  version = "4.3.1";
+  version = "5.0.1";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
-    sha256 = "66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1";
+    url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
+    sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
   };
 
-  patches = [ ./find-workspace.diff ];
+  patches =
+    [ (fetchurl {
+        url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
+        sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
+      })
+    ];
 
-  KDEDIRS = libktorrent;
+  nativeBuildInputs = [ kdoctools ecm ];
 
   buildInputs =
-    [ cmake qt4 kdelibs automoc4 phonon libktorrent boost taglib kdepimlibs
-      gettext kdebase_workspace
+    [ cmake qtbase qtscript
+      ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
+      libktorrent taglib
     ];
 
   enableParallelBuilding = true;
 
   meta = {
     description = "KDE integrated BtTorrent client";
-    homepage = http://ktorrent.pwsp.net;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (libktorrent.meta) platforms;
+    homepage = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff b/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
deleted file mode 100644
index b07c1ca1b83c..000000000000
--- a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix finding kworkspace.h
-diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
-index 59e5470..5b932ff 100644
---- a/plugins/shutdown/CMakeLists.txt
-+++ b/plugins/shutdown/CMakeLists.txt
-@@ -1,6 +1,8 @@
- set(KWORKSPACE_FOUND FALSE)
--FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h  PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h)
--FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-+FIND_PATH(KWORKSPACE_INCLUDE_DIR
-+	NAMES kworkspace/kworkspace.h
-+	HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
-+FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
- 
- if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY)
- 	set(KWORKSPACE_FOUND TRUE)
-diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
-index e233353..1efc20b 100644
---- a/plugins/shutdown/shutdownplugin.cpp
-+++ b/plugins/shutdown/shutdownplugin.cpp
-@@ -19,7 +19,7 @@
- ***************************************************************************/
- #include <kjob.h>
- #include <kgenericfactory.h>
--#include <kworkspace.h>
-+#include <kworkspace/kworkspace.h>
- #include <ktoggleaction.h>
- #include <kactioncollection.h>
- #include <kmessagebox.h>
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5ce3e6a8760..74b85117a810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14029,7 +14029,7 @@ with pkgs;
 
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 
-  ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent/5.nix { };
+  ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent { };
 
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {
     go = go_1_6;
@@ -16741,8 +16741,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        ktorrent = callPackage ../applications/networking/p2p/ktorrent { };
-
         kuickshow = callPackage ../applications/graphics/kuickshow { };
 
         libalkimia = callPackage ../development/libraries/libalkimia { };

From 7e77aaf221b8e50c51ccf91f777d0f0e07052a73 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:25:38 -0600
Subject: [PATCH 1055/3449] Remove kde4.kwooty

- No maintainer in Nixpkgs
- No upstream activity
---
 .../kwooty/0001-search-paths.patch            | 33 ----------------
 .../networking/newsreaders/kwooty/default.nix | 39 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 73 deletions(-)
 delete mode 100644 pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch
 delete mode 100644 pkgs/applications/networking/newsreaders/kwooty/default.nix

diff --git a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch
deleted file mode 100644
index 6d1d2bac409b..000000000000
--- a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 12 Sep 2015 16:14:10 -0500
-Subject: [PATCH] search paths
-
----
- src/utilities/utility.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp
-index 2e322aa..2e9e4d2 100644
---- a/src/utilities/utility.cpp
-+++ b/src/utilities/utility.cpp
-@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr
- 
-     QString programPathName;
-     QStringList searchPathList = Settings::searchPathList();
-+    searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z";
- 
-     QStringList programsWithDifferentNames = programToSearch.split(";");
- 
-@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int
-     QStringList niceProcessArgs;
- 
-     // look for 'nice' location :
--    QString nicePath = KStandardDirs::findExe("nice");
-+    QString nicePath = QString("/usr/bin/nice");
-     niceProcessArgs.append(nicePath);
-     niceProcessArgs.append("-n");
- 
--- 
-2.5.0
-
diff --git a/pkgs/applications/networking/newsreaders/kwooty/default.nix b/pkgs/applications/networking/newsreaders/kwooty/default.nix
deleted file mode 100644
index f4bd04e8a2d1..000000000000
--- a/pkgs/applications/networking/newsreaders/kwooty/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, gettext
-, kdelibs, kdebase_workspace, perl
-, openssl, phonon, automoc4
-, libX11, libXext, libXft
-, unrar, p7zip, par2cmdline, coreutils
-}:
-
-let version = "1.1.0";
-    name = "kwooty-${version}";
-in stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz";
-    sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap";
-  };
-
-  patches = [ ./0001-search-paths.patch ];
-
-  postPatch = ''
-    echo "Changing paths to archive utilities to the nix store";
-    substituteInPlace "src/utility.cpp" \
-      --replace "/usr/bin/unrar" "${unrar}/bin" \
-      --replace "/usr/bin/unpar" "${par2cmdline}/bin" \
-      --replace "/usr/bin/7z" "${p7zip}/bin" \
-      --replace "/usr/bin/nice" "${coreutils}/bin/nice"
-  '';
-
-  buildInputs =
-    [ stdenv perl cmake qt4 gettext automoc4 openssl
-      kdelibs kdebase_workspace phonon
-      libX11 libXext libXft
-    ];
-
-  meta = {
-    description = "Binary news reader of KDE";
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74b85117a810..7e22cd2b9c00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16772,7 +16772,6 @@ with pkgs;
 
         zanshin = callPackage ../applications/office/zanshin { };
 
-        kwooty = callPackage ../applications/networking/newsreaders/kwooty { };
       });
 
     in recurseIntoAttrs self;

From f9272765133e6a24bd3af03a7c763519de2fd5cf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:28:07 -0600
Subject: [PATCH 1056/3449] Remove kde4.rsibreak

- No maintainer in Nixpkgs
- No upstream activity
- Original source unavailable
---
 pkgs/applications/misc/rsibreak/default.nix | 23 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/applications/misc/rsibreak/default.nix

diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix
deleted file mode 100644
index 42247572c246..000000000000
--- a/pkgs/applications/misc/rsibreak/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kdebase_workspace }:
-
-let version = "0.11";
-in
-stdenv.mkDerivation rec {
-  name = "rsibreak-${version}";
-
-  src = fetchurl {
-    url = "mirror://debian/pool/main/r/rsibreak/rsibreak_${version}.orig.tar.gz";
-    sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  buildInputs = [ kdelibs kdebase_workspace ];
-
-  meta = {
-    homepage = http://userbase.kde.org/RSIBreak; # http://www.rsibreak.org/ is down since 2011
-    description = "Utility to help prevent repetitive strain injury for KDE 4";
-    inherit (kdelibs.meta) platforms maintainers;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e22cd2b9c00..26e480c24db4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16764,8 +16764,6 @@ with pkgs;
 
         kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
 
-        rsibreak = callPackage ../applications/misc/rsibreak { };
-
         semnotes = callPackage ../applications/misc/semnotes { };
 
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};

From 9d6bfacc850114ca1bbdedc2630c72f59acad767 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:39:34 -0600
Subject: [PATCH 1057/3449] kde4: remove inessential KDE 4 modules

---
 pkgs/applications/misc/k3b/default.nix        |   4 +-
 pkgs/desktops/kde-4.14/applications/kate.nix  |  11 -
 .../kde-4.14/applications/konsole.nix         |  11 -
 pkgs/desktops/kde-4.14/default.nix            |   6 -
 .../files/kde-wallpapers-buildsystem.patch    |  17 -
 .../files/rocs-0001-duplicate-add_test.patch  |  62 --
 pkgs/desktops/kde-4.14/kactivities.nix        |   4 +-
 pkgs/desktops/kde-4.14/kde-base-artwork.nix   |  14 -
 .../kde-4.14/kde-baseapps/kde-baseapps.nix    |   5 +-
 pkgs/desktops/kde-4.14/kde-package/4.14.3.nix | 541 +-----------------
 .../desktops/kde-4.14/kde-package/default.nix |   8 +-
 pkgs/desktops/kde-4.14/kde-runtime.nix        |  24 -
 pkgs/desktops/kde-4.14/kde-wallpapers.nix     |  17 -
 .../kde-4.14/kdeaccessibility/jovie.nix       |   9 -
 .../kde-4.14/kdeaccessibility/kaccessible.nix |   9 -
 .../kde-4.14/kdeaccessibility/kmag.nix        |  10 -
 .../kde-4.14/kdeaccessibility/kmousetool.nix  |   9 -
 .../kde-4.14/kdeaccessibility/kmouth.nix      |   9 -
 pkgs/desktops/kde-4.14/kdeadmin/kcron.nix     |   9 -
 .../desktops/kde-4.14/kdeadmin/ksystemlog.nix |   9 -
 pkgs/desktops/kde-4.14/kdeadmin/kuser.nix     |   9 -
 .../kde-4.14/kdeartwork/ColorSchemes.nix      |  11 -
 .../kdeartwork/FindXscreensaver.cmake         |  73 ---
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 -
 .../kde-4.14/kdeartwork/IconThemes.nix        |  13 -
 .../kde-4.14/kdeartwork/WeatherWallpapers.nix |  11 -
 .../kde-4.14/kdeartwork/desktopthemes.nix     |  11 -
 .../kde-4.14/kdeartwork/emoticons.nix         |  11 -
 .../kde-4.14/kdeartwork/kscreensaver.nix      |  15 -
 .../kde-4.14/kdeartwork/kwin-styles.nix       |   9 -
 pkgs/desktops/kde-4.14/kdeartwork/styles.nix  |  11 -
 .../kde-4.14/kdeartwork/wallpapers.nix        |  11 -
 pkgs/desktops/kde-4.14/kdebindings/perlqt.nix |  14 -
 .../kdebindings/qtruby-install-prefix.patch   |  15 -
 pkgs/desktops/kde-4.14/kdebindings/qtruby.nix |  22 -
 .../smokegen-CMakeLists.txt-nix.patch         |  16 -
 .../kde-4.14/kdebindings/smokegen-nix.patch   |  13 -
 .../kde-4.14/kdebindings/smokegen.nix         |  13 -
 .../kde-4.14/kdebindings/smokekde.nix         |  19 -
 .../desktops/kde-4.14/kdebindings/smokeqt.nix |  15 -
 pkgs/desktops/kde-4.14/kdeedu/analitza.nix    |   8 -
 pkgs/desktops/kde-4.14/kdeedu/artikulate.nix  |   8 -
 pkgs/desktops/kde-4.14/kdeedu/blinken.nix     |   8 -
 pkgs/desktops/kde-4.14/kdeedu/cantor.nix      |  15 -
 pkgs/desktops/kde-4.14/kdeedu/commit-846cf02  |  42 --
 pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix    |   8 -
 pkgs/desktops/kde-4.14/kdeedu/kalzium.nix     |  13 -
 pkgs/desktops/kde-4.14/kdeedu/kanagram.nix    |   8 -
 pkgs/desktops/kde-4.14/kdeedu/kbruch.nix      |   8 -
 pkgs/desktops/kde-4.14/kdeedu/kgeography.nix  |   8 -
 pkgs/desktops/kde-4.14/kdeedu/khangman.nix    |   8 -
 pkgs/desktops/kde-4.14/kdeedu/kig.nix         |   9 -
 pkgs/desktops/kde-4.14/kdeedu/kiten.nix       |   9 -
 pkgs/desktops/kde-4.14/kdeedu/klettres.nix    |   9 -
 pkgs/desktops/kde-4.14/kdeedu/kmplot.nix      |   9 -
 .../kde-4.14/kdeedu/kqtquickcharts.nix        |   8 -
 pkgs/desktops/kde-4.14/kdeedu/ktouch.nix      |   9 -
 pkgs/desktops/kde-4.14/kdeedu/kturtle.nix     |   9 -
 pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix   |   9 -
 pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix   |   8 -
 pkgs/desktops/kde-4.14/kdeedu/pairs.nix       |   9 -
 pkgs/desktops/kde-4.14/kdeedu/parley.nix      |   9 -
 pkgs/desktops/kde-4.14/kdeedu/rocs.nix        |  16 -
 pkgs/desktops/kde-4.14/kdeedu/step.nix        |  12 -
 pkgs/desktops/kde-4.14/kdegames/bomber.nix    |   7 -
 pkgs/desktops/kde-4.14/kdegames/bovo.nix      |   8 -
 pkgs/desktops/kde-4.14/kdegames/granatier.nix |   7 -
 pkgs/desktops/kde-4.14/kdegames/kajongg.nix   |  13 -
 pkgs/desktops/kde-4.14/kdegames/kapman.nix    |   7 -
 pkgs/desktops/kde-4.14/kdegames/katomic.nix   |   7 -
 pkgs/desktops/kde-4.14/kdegames/kblackbox.nix |   7 -
 pkgs/desktops/kde-4.14/kdegames/kblocks.nix   |   7 -
 pkgs/desktops/kde-4.14/kdegames/kbounce.nix   |   7 -
 pkgs/desktops/kde-4.14/kdegames/kbreakout.nix |   7 -
 pkgs/desktops/kde-4.14/kdegames/kdiamond.nix  |   7 -
 .../kde-4.14/kdegames/kfourinline.nix         |   7 -
 .../kde-4.14/kdegames/kgoldrunner.nix         |   7 -
 pkgs/desktops/kde-4.14/kdegames/kigo.nix      |   7 -
 pkgs/desktops/kde-4.14/kdegames/killbots.nix  |   7 -
 pkgs/desktops/kde-4.14/kdegames/kiriki.nix    |   7 -
 .../kde-4.14/kdegames/kjumpingcube.nix        |   7 -
 pkgs/desktops/kde-4.14/kdegames/klickety.nix  |   7 -
 pkgs/desktops/kde-4.14/kdegames/klines.nix    |   7 -
 pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix |   7 -
 pkgs/desktops/kde-4.14/kdegames/kmines.nix    |   7 -
 .../kde-4.14/kdegames/knavalbattle.nix        |   7 -
 pkgs/desktops/kde-4.14/kdegames/knetwalk.nix  |   7 -
 pkgs/desktops/kde-4.14/kdegames/kolf.nix      |   7 -
 pkgs/desktops/kde-4.14/kdegames/kollision.nix |   7 -
 pkgs/desktops/kde-4.14/kdegames/konquest.nix  |   7 -
 pkgs/desktops/kde-4.14/kdegames/kpat.nix      |   8 -
 pkgs/desktops/kde-4.14/kdegames/kreversi.nix  |   7 -
 pkgs/desktops/kde-4.14/kdegames/kshisen.nix   |   7 -
 pkgs/desktops/kde-4.14/kdegames/ksirk.nix     |   7 -
 .../desktops/kde-4.14/kdegames/ksnakeduel.nix |   7 -
 .../desktops/kde-4.14/kdegames/kspaceduel.nix |   7 -
 pkgs/desktops/kde-4.14/kdegames/ksquares.nix  |   7 -
 pkgs/desktops/kde-4.14/kdegames/ksudoku.nix   |   7 -
 .../desktops/kde-4.14/kdegames/ktuberling.nix |   7 -
 pkgs/desktops/kde-4.14/kdegames/kubrick.nix   |   7 -
 .../kde-4.14/kdegames/libkdegames.nix         |   7 -
 .../kde-4.14/kdegames/libkmahjongg.nix        |   7 -
 pkgs/desktops/kde-4.14/kdegames/lskat.nix     |   7 -
 pkgs/desktops/kde-4.14/kdegames/palapeli.nix  |  13 -
 pkgs/desktops/kde-4.14/kdegames/picmi.nix     |   7 -
 .../kde-4.14/kdegraphics/gwenview.nix         |  16 -
 pkgs/desktops/kde-4.14/kdegraphics/kamera.nix |  10 -
 .../kde-4.14/kdegraphics/kcolorchooser.nix    |  10 -
 .../kdegraphics/kdegraphics-mobipocket.nix    |  10 -
 .../kdegraphics-strigi-analyzer.nix           |  10 -
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  13 -
 pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix |  10 -
 .../kde-4.14/kdegraphics/kolourpaint.nix      |  10 -
 pkgs/desktops/kde-4.14/kdegraphics/kruler.nix |  10 -
 .../kde-4.14/kdegraphics/ksaneplugin.nix      |  10 -
 .../kde-4.14/kdegraphics/ksnapshot.nix        |  10 -
 .../desktops/kde-4.14/kdegraphics/libkipi.nix |  10 -
 .../kde-4.14/kdegraphics/libksane.nix         |  10 -
 .../kde-4.14/kdelibs/baloo-widgets.nix        |  11 -
 .../kde-4.14/kdelibs/nepomuk-core.nix         |  20 -
 .../kde-4.14/kdelibs/nepomuk-widgets.nix      |  11 -
 .../kde-4.14/kdemultimedia/audiocd-kio.nix    |   7 -
 .../kde-4.14/kdemultimedia/dragon.nix         |   7 -
 .../kde-4.14/kdemultimedia/ffmpegthumbs.nix   |   7 -
 pkgs/desktops/kde-4.14/kdemultimedia/juk.nix  |  10 -
 pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix |   7 -
 pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix |   7 -
 .../kdemultimedia/libkcompactdisc.nix         |   7 -
 .../kde-4.14/kdemultimedia/mplayerthumbs.nix  |   7 -
 .../kdenetwork/kdenetwork-filesharing.nix     |   9 -
 .../kdenetwork-strigi-analyzers.nix           |   9 -
 pkgs/desktops/kde-4.14/kdenetwork/kget.nix    |  20 -
 pkgs/desktops/kde-4.14/kdenetwork/kopete.nix  |  34 --
 pkgs/desktops/kde-4.14/kdenetwork/kppp.nix    |   9 -
 pkgs/desktops/kde-4.14/kdenetwork/krdc.nix    |   9 -
 pkgs/desktops/kde-4.14/kdenetwork/krfb.nix    |   9 -
 .../kde-4.14/kdenetwork/zeroconf-ioslave.nix  |   9 -
 pkgs/desktops/kde-4.14/kdepim-runtime.nix     |  19 -
 pkgs/desktops/kde-4.14/kdepim.nix             |  28 -
 pkgs/desktops/kde-4.14/kdepimlibs.nix         |   4 +-
 pkgs/desktops/kde-4.14/kdeplasma-addons.nix   |  23 -
 pkgs/desktops/kde-4.14/kdesdk/cervisia.nix    |   9 -
 .../kde-4.14/kdesdk/dolphin-plugins.nix       |  11 -
 .../desktops/kde-4.14/kdesdk/kapptemplate.nix |   9 -
 pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix |   9 -
 .../kde-4.14/kdesdk/kde-dev-scripts.nix       |   9 -
 .../kde-4.14/kdesdk/kde-dev-utils.nix         |  11 -
 .../kde-4.14/kdesdk/kdesdk-kioslaves.nix      |  12 -
 .../kdesdk/kdesdk-strigi-analyzers.nix        |   9 -
 .../kde-4.14/kdesdk/kdesdk-thumbnailers.nix   |  10 -
 pkgs/desktops/kde-4.14/kdesdk/kompare.nix     |   9 -
 .../kde-4.14/kdesdk/libkomparediff2.nix       |   9 -
 pkgs/desktops/kde-4.14/kdesdk/lokalize.nix    |  13 -
 pkgs/desktops/kde-4.14/kdesdk/okteta.nix      |  15 -
 pkgs/desktops/kde-4.14/kdesdk/poxml.nix       |   9 -
 pkgs/desktops/kde-4.14/kdesdk/umbrello.nix    |   9 -
 pkgs/desktops/kde-4.14/kdetoys/amor.nix       |   9 -
 pkgs/desktops/kde-4.14/kdetoys/kteatime.nix   |   9 -
 pkgs/desktops/kde-4.14/kdetoys/ktux.nix       |   9 -
 pkgs/desktops/kde-4.14/kdeutils/ark.nix       |  17 -
 pkgs/desktops/kde-4.14/kdeutils/filelight.nix |   9 -
 pkgs/desktops/kde-4.14/kdeutils/kcalc.nix     |   9 -
 .../kde-4.14/kdeutils/kcharselect.nix         |   9 -
 pkgs/desktops/kde-4.14/kdeutils/kdf.nix       |   9 -
 pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix   |   9 -
 pkgs/desktops/kde-4.14/kdeutils/kgpg.nix      |  10 -
 .../kde-4.14/kdeutils/kremotecontrol.nix      |   9 -
 pkgs/desktops/kde-4.14/kdeutils/ktimer.nix    |   9 -
 .../kde-4.14/kdeutils/kwalletmanager.nix      |   9 -
 .../kde-4.14/kdeutils/print-manager.nix       |  21 -
 .../kde-4.14/kdeutils/superkaramba.nix        |  11 -
 pkgs/desktops/kde-4.14/kdeutils/sweeper.nix   |   9 -
 .../kde-4.14/kdewebdev/kfilereplace.nix       |  10 -
 .../kde-4.14/kdewebdev/kimagemapeditor.nix    |  10 -
 .../kde-4.14/kdewebdev/klinkstatus.nix        |  18 -
 .../desktops/kde-4.14/kdewebdev/kommander.nix |   9 -
 pkgs/desktops/kde-4.14/oxygen-icons.nix       |  15 -
 pkgs/top-level/all-packages.nix               |   5 +-
 178 files changed, 18 insertions(+), 2462 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.14/applications/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.14/applications/konsole.nix
 delete mode 100644 pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
 delete mode 100644 pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
 delete mode 100644 pkgs/desktops/kde-4.14/kde-base-artwork.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kde-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kde-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/styles.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/analitza.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/blinken.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/cantor.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kanagram.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kbruch.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kgeography.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/khangman.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kig.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kiten.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/klettres.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kmplot.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/ktouch.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kturtle.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/pairs.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/parley.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/rocs.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/step.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/bomber.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/bovo.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/granatier.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kajongg.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kapman.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/katomic.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kblocks.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kbounce.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kigo.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/killbots.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kiriki.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/klickety.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/klines.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kmines.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kolf.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kollision.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/konquest.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kpat.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kreversi.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kshisen.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/ksirk.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/ksquares.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/kubrick.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/libkdegames.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/lskat.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/palapeli.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegames/picmi.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kamera.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/kruler.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/kget.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/kppp.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/krfb.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdepim-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdepim.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/kompare.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/lokalize.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/okteta.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/poxml.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdesdk/umbrello.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdetoys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdetoys/kteatime.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdetoys/ktux.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/ark.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/filelight.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/kdf.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/ktimer.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdeutils/sweeper.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
 delete mode 100644 pkgs/desktops/kde-4.14/kdewebdev/kommander.nix
 delete mode 100644 pkgs/desktops/kde-4.14/oxygen-icons.nix

diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index 8c69e36a4e49..e8f87e4d290d 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -2,7 +2,7 @@
 , shared_mime_info, libvorbis, taglib, flac, libsamplerate
 , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
 , dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg
-, kdemultimedia, phonon, libkcddb ? null
+, libkcddb, phonon
 }:
 
 let
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     shared_mime_info libvorbis taglib flac libsamplerate libdvdread
     lame libsndfile libmad stdenv.cc.libc kdelibs
-    kdemultimedia phonon libkcddb makeWrapper cdparanoia
+    phonon libkcddb makeWrapper cdparanoia
     libdvdcss ffmpeg
   ];
 
diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix
deleted file mode 100644
index ddeb89063e50..000000000000
--- a/pkgs/desktops/kde-4.14/applications/kate.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}:
-
-kde {
-
-  buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/applications/konsole.nix b/pkgs/desktops/kde-4.14/applications/konsole.nix
deleted file mode 100644
index bd4e9e58cd05..000000000000
--- a/pkgs/desktops/kde-4.14/applications/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix
index f11a139aec72..d65f38b8cd11 100644
--- a/pkgs/desktops/kde-4.14/default.nix
+++ b/pkgs/desktops/kde-4.14/default.nix
@@ -25,20 +25,14 @@ in
 
 kde.modules // kde.individual //
 {
-  inherit (kde) manifest modules individual splittedModuleList;
-
   inherit kdelibs;
 
   akonadi = callPackage ./support/akonadi { };
 
   qt4 = qt48;
 
-  kdebase_workspace = kde.modules.kde_workspace;
-
   inherit release;
 
-  full = stdenv.lib.attrValues kde.modules;
-
   l10n = callPackage ./l10n {
     inherit release branch;
     inherit (kde.manifest) stable;
diff --git a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb646940..000000000000
--- a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d3e247..f78db67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,10 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+project(kde-wallpapers NONE)
-+if( WALLPAPER_INSTALL_DIR )
-+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
-+else()
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
- 
diff --git a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
deleted file mode 100644
index 4127b16d5f6d..000000000000
--- a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Thu, 10 Sep 2015 18:41:57 -0500
-Subject: [PATCH] duplicate add_test
-
----
- RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 -
- 5 files changed, 5 deletions(-)
-
-diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-index 32a2504..4fbb838 100644
---- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
--add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-index 615004c..6383bd8 100644
---- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
--add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-index f9cdbfa..842d14b 100644
---- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
--add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-index 33c0da8..70cab8d 100644
---- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
--add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-index b52736e..58ee40e 100644
---- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
--add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin)
- 
--- 
-2.5.0
-
diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix
index a1f9d0d81719..dd14e0429ddb 100644
--- a/pkgs/desktops/kde-4.14/kactivities.nix
+++ b/pkgs/desktops/kde-4.14/kactivities.nix
@@ -1,4 +1,4 @@
-{ fetchurl, kde, kdelibs, nepomuk_core }:
+{ fetchurl, kde, kdelibs }:
 
 kde {
 
@@ -13,7 +13,7 @@ kde {
 
   setOutputFlags = false;
 
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+  propagatedBuildInputs = [ kdelibs ];
 
   meta = {
     description = "KDE activities library and daemon";
diff --git a/pkgs/desktops/kde-4.14/kde-base-artwork.nix b/pkgs/desktops/kde-4.14/kde-base-artwork.nix
deleted file mode 100644
index 3f416cebddc4..000000000000
--- a/pkgs/desktops/kde-4.14/kde-base-artwork.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Base artwork";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
index 98fab7d25592..df211f491993 100644
--- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
+++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
@@ -1,5 +1,4 @@
-{ stdenv, kde, kdelibs, html-tidy, kactivities
-, nepomuk_core, nepomuk_widgets, libXt }:
+{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }:
 
 kde {
   postPatch = ''
@@ -7,7 +6,7 @@ kde {
       --replace buffio.h tidybuffio.h
   '';
 
-  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ];
+  buildInputs = [ kdelibs html-tidy kactivities libXt ];
 
   meta = {
     description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
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 a78041c5a0cc..a05e6d0c62a2 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
@@ -1,380 +1,48 @@
 {stable=true;
 hashes=builtins.listToAttrs[
-  {name="amor";value="1n9qhy7pcprhh7a5v5i9xi5pr3a3lbg08j315kbahn89py2wqk6x";}
-  {name="analitza";value="08p4rky4q4c1r5mkw087s31k38xvc8k50fyahf6y0bkc03v7q8h0";}
-  {name="ark";value="1p5q96i7hxp80c3hzxaqfixc3rn16cdnhhhjdaqz7k5zkgmgfbnb";}
-  {name="artikulate";value="1spb3qwf62agc76vnji7hgm1xsahb7i2fg818gmqwd9ndd4rf0fk";}
-  {name="audiocd-kio";value="0572hwlzn4l53d3xi2w20pgdf6wsyankr49q4522ckfjw9zh2p33";}
   {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
-  {name="baloo-widgets";value="1lxwm8cb1f1dy91zr1d54alw0f67d30kixhr7hnbpqlanfw44sbv";}
-  {name="blinken";value="0zmfvj64xzgi9mmdx92csknm6nrgq57z458dmqr82glvdq6sy53w";}
-  {name="bomber";value="09bwp2fnyhi2jq6j36ssvcd02gxihd162b14hj4h76p50q9142ly";}
-  {name="bovo";value="0pflfpnxni01nfmljrb356bvb9sq7xg1yx7ylli8ws591s1wjv2f";}
-  {name="cantor";value="1qb58pnrpn23qr94j1nrdyj87yxc6gr9drra76mq583acra19j4g";}
-  {name="cervisia";value="1dgg0m8l2vb1ypkzq2lvp8d5faxn005z9fylf4pg6yczgj51y2m0";}
-  {name="dolphin-plugins";value="1vb5q9xwxplwxwfs57fqy1bi2hsq96cy1z705lbyiy1pq1g0xw5p";}
-  {name="dragon";value="195hv0l3w6n32qghdbqj3jzl4833lkbw90q53rnay56ia3azd7nk";}
-  {name="ffmpegthumbs";value="1waj02snh48qk8h021p1agy9pifpb7k7848ni9cyr1q76xmqbw3r";}
-  {name="filelight";value="16pp16zdvm8l6aaywj0cvvmpc1fgwr1ik1nf9s3vnj6pnqw91mc1";}
-  {name="granatier";value="08fs7nvhgg33cr54v2ib5p64lc9kmzshl12swsa88sp1fzakpdlj";}
-  {name="gwenview";value="1817nhd3qwghimbh4v57nxpbk9y2z9gh33i9s7rr190fqa5x2ci0";}
-  {name="jovie";value="06cvnycbab5w1vgws6fyfbpdnps63mvss2gnsv6ig1gm18pq8kh4";}
-  {name="juk";value="02dv0v34dbac9wpfj0p1kh438b380025qg0mpnhdisw9ng4igx83";}
-  {name="kaccessible";value="0blkyalm45c1q670wp9jn6mmqq4igw16hlsa39bv1dj82m5f0bkb";}
-  {name="kajongg";value="1f4fv1s1x2bg9ghf317br0kl6lgj9nacmck6fv1g3r14j60z5sfn";}
-  {name="kalgebra";value="0zgnppmnm2g0anq4yldlyd4bncjabr72b66h4s9ns6wd7kk9z6rs";}
-  {name="kalzium";value="1r8phdshq9whcglb7nyjcg8qjqnqya8rj1rm91mwax18jin0i3ab";}
-  {name="kamera";value="09n11d1hvl6xxfsp9j72q6ja103vda54gmrl7lqscnp5nvlfl2vg";}
-  {name="kanagram";value="0ns95365rdzx4v7akrsnbz1vgyl10d5h4jnavg1x08yrq7sm3rcm";}
-  {name="kapman";value="1c27dlpdnnmvxqwsr5359ixl386z54ijs5ysb5vd7f0nw980kjk0";}
-  {name="kapptemplate";value="089znigfd0c4gb318qjbxhyk3gc6j9z4vb4lw76g3nwjkk52s35s";}
-  {name="kate";value="0zbhgrhpa3f9zaf8a9b0s69p05m17rg6harvmyfbb9kgqgi4lgai";}
-  {name="katomic";value="1j3y0zfwcms2wfv2v3jpn6lisl2qw5zhvwswhyc2k44wq934vwq6";}
-  {name="kblackbox";value="1vlc37il59xh6k4zcap7cs25b1r70cbzi0b6jybpwhxrq2zh1zmz";}
-  {name="kblocks";value="16k8j3h8dvjz2yqdb22dkb9z6mi3k28c4wkhpa1l5q151kb8q6ba";}
-  {name="kbounce";value="16g2f6vvax74gqz3jn1b9rfwcdaia7dphnwg37d03ayflp2s7mji";}
-  {name="kbreakout";value="1011gcbajlk4h5z16nyr8xxkqz5k86vwgn1h5k4fqqpbl2g9aryr";}
-  {name="kbruch";value="0jrd0hqqiaghyhj1rw66j0skqs1f7p21czx3adiy2v50ni70i84z";}
-  {name="kcachegrind";value="0954zvzzhfc76msbs7pc10c9nqd4ganqwqdyn051n4204np1fyd6";}
-  {name="kcalc";value="03px8j0ga6bbla6bxbj3ahcw4jxwb4kkqhls0rxldbfkjwz2q1wz";}
-  {name="kcharselect";value="0js5wxdjmzg2yq83m0kpil9mdjwb1bschh8d9hsk044327i9wmz7";}
-  {name="kcolorchooser";value="1z5snm4vxn6whdhxh64kd18bvl58i65qb4p4xdznrc0gyrgnl92a";}
-  {name="kcron";value="1d685808rya0fjysn2smh0d1p6xqcg7a1r3ah54hnj58y4r3rxyc";}
-  {name="kdeartwork";value="1x0fz21xi54gxz4dkk7qhpv9a5j3nc0crgvygpq32jrkvv5ygp4k";}
   {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
-  {name="kde-base-artwork";value="14l83fd6drwpl9j4v876afp3k7na3dirpjwh03c1a7lcn27grzkn";}
-  {name="kde-dev-scripts";value="17zw6ckbvq5iqykc3ijdnp7j0nh4k06jgqwfsrnqnvp5fqqcf1vn";}
-  {name="kde-dev-utils";value="16kdr5i48jlflzdv1y5n2xca2kws5whwlymliqdqy7wlcgy0lh7q";}
-  {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";}
-  {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";}
-  {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";}
-  {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";}
-  {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";}
-  {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";}
   {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
-  {name="kdepim-runtime";value="03xmm9c5whr96bwrdrdmaq8w53qg251g0kd479g02x3br20yi3rd";}
-  {name="kdeplasma-addons";value="094gj8z1xx4d5vlkq8izifpgvh6sfq36bh08n8ylfa976qq8xm8j";}
-  {name="kde-runtime";value="01c6pjsq4xp75yma8wbfpg92lrvvppp9ighlxvy7z2afkd8lx9vq";}
-  {name="kdesdk-kioslaves";value="0k0ff1nq10z0gajr3rnrbhm1rml42d2fi9ahwxdjnxyaav31ml24";}
-  {name="kdesdk-strigi-analyzers";value="12r17q7mg74prir52h80prc61bn5rq1031cbp3xswh658srf1lg0";}
-  {name="kdesdk-thumbnailers";value="1kmdpb52kg04smgp9v5a51bjjrw6fsh347ajnxhr8ygg7d8zw763";}
-  {name="kde-wallpapers";value="05jb5ry6ziz64lqxrmi7c53n8j5hpgrz3lii4y1wnr204342ln6k";}
-  {name="kdewebdev";value="0sclb72i6nbrsz4a5jlxf7mgngdn7wbd669fqa7xw6axrsjj1cgn";}
   {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";}
-  {name="kdf";value="0y5d6d6wl5ycmcswrkgwc301jbj77jnb46sgl38i9q4nf7b3ham0";}
-  {name="kdiamond";value="0z8c07vx3k466ysri1syka0wm0bkz581kb72d5sns86np0rg0wmp";}
   {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
-  {name="kfloppy";value="02sv0k6cqvd9zf7hwsjxgb6l3jawx5fkg1siffbb62cgp49y8fw0";}
-  {name="kfourinline";value="0zhvpbgmk89cn7pjzgdzc4kah8rkjj3w97yym205phc8fc36nwa4";}
-  {name="kgamma";value="1cpm1d0sr3zphkqpfg11farqal2h2hl6gcdnf8p1b10np1b8rxwk";}
-  {name="kgeography";value="125772x1kbh136ymja903w2k7vgahs2d1nw471nr8fx511pnxcj4";}
-  {name="kget";value="1v1j5sfsym1sz8w6ll23il0n4qq74sjx9c9ij29zhdwxy21xasv9";}
-  {name="kgoldrunner";value="1mc93hwl1diygjlpalf2wdzhdnhcjq1mj9srlxhr5f1w0687pzar";}
-  {name="kgpg";value="0ihc5pp1mxsa67ynrvf2mpxwhyni6lkcdarj1xmvpcf56nlkfzdw";}
-  {name="khangman";value="0wddflgsfslbhdpkl39qipnc2xx6b23ci1gr19ipyiyif8d74zix";}
-  {name="kig";value="1kp3rhsfprp9c9f0wp264x9d6n454ff26ysfnli9gl5l2imxhw9f";}
-  {name="kigo";value="1gdsr31ybc07bkcyfrrm4fz081l3l5h5rv46ld0f6rfmxm3xv01j";}
-  {name="killbots";value="1d31pxvjls5a9m521a9n7rynl317585ald1nn4bpk2f138475d12";}
-  {name="kimono";value="17n1nx66kqcc2wfp6ql7xpn8lq9y3b6djf6y1n3ajvyjh8m357jf";}
-  {name="kiriki";value="00iis3vx95nlcarysy9mrbz4jnw4rbxgmjpy48z85imdd7yydd8x";}
-  {name="kiten";value="17n6q1kan8dlxqhnhk73nzn4jg39yw1hh88vsndswmx1s4k68x7r";}
-  {name="kjumpingcube";value="0p9kswv2wnxqgmlvwbcwxrb27b0h6by1zx91k5vmv16qm789gfk9";}
-  {name="klettres";value="01vf6cdiafncv0n35cp5v44azxkjjzn1rp1r8rw05vlmh2296p0l";}
-  {name="klickety";value="0c156fkchcpfybmvc3qkvdqizc62b758drkdqc8pawal8766ff27";}
-  {name="klines";value="1w8k18azfqsb0q90aijn7xfkkfrbnrnfwn6w66wc8xn2b6hibahl";}
-  {name="kmag";value="091h7vb3wcp5zg06mp240a2vdhj18xqw40i25djkl7a861xxhpb8";}
-  {name="kmahjongg";value="0qb933kjv205narrkgr83ha516pldpfxi65l8yhm7801nhljhpsg";}
-  {name="kmines";value="103lzgr7p2ic29afn8imk6mh7ab0pfpcrdwlsg21zkvrrbrcaq6k";}
-  {name="kmix";value="153fif25m7w94g8g20ahg5fjppkf3bi8rn4njq1zl1g0bsnrgpfp";}
-  {name="kmousetool";value="1z62h71mcxdrp4y2dl497x89295m6mlilaqnvp9ijpw6fm4b9czd";}
-  {name="kmouth";value="06n6srd6011bk29w5xnqihvs6pbhmg0sf5h7mwfwp4szvm167hc4";}
-  {name="kmplot";value="1xajighandffidp85rjjch4si0gb3mfjks3yh5i8sig8j4797b86";}
-  {name="knavalbattle";value="1fmh6qds3ql5w3nsw6zk18ia0z4immpwj8sl35qq2kkx1g0hbv0c";}
-  {name="knetwalk";value="0h17ck55fdwipvsdqfdhmn612jb1nrq6vkj0g9i3qchvw9qz0hcs";}
-  {name="kolf";value="006h7iqwn55bjrgsc9p6316lgvxvda0kvcdxxfd4sqg2ain64h7q";}
-  {name="kollision";value="1hc07r3z4w8gqby0pyb5m1ylp8izmvx0ib3dlpmh2jd5khp0qyhj";}
-  {name="kolourpaint";value="0kf6wjxcd80mc4hxb4nhpksxj0bm9339i835iwpsbjfn8xs1s55h";}
-  {name="kompare";value="0zhpw7kz1c9hcmqfhnvsg39xw4zhi36q39bgifcbyfvjs0ymbvi4";}
-  {name="konquest";value="125ciy00h77y7byrlnqv0zhw3pxp9a5i5clz12dlc1z251z3l588";}
-  {name="konsole";value="0mgi0fw5sc216cy8j45g4zd733d02l2d6z4wjcxqm7rh61lhwx9g";}
-  {name="kopete";value="0i9qq7k19vyss1k22ppr6xq3y3bb6mndg8b5323f0cvjlpgcc8xs";}
-  {name="korundum";value="0zapd60frhq652p1xnpaj680vpaqr595dqbhha552c4dfabvgv4j";}
-  {name="kpat";value="0kfvhkwamrfllgmd8yl6p3xlc0jmivxy0rsdrxpabvpb0vcqh9ml";}
-  {name="kppp";value="01pj8q1m3gwww6wvgwnd24lgbyvzfm6gskv2c802lzjcj7p9218m";}
-  {name="kqtquickcharts";value="1vml9scxva9gr8bb6rkxl8gaaghx3lyvwcwcifq5hz0154q875d5";}
-  {name="krdc";value="07p67z8gh9xnnr71kjy8g6ki07w22c767qbrk2fzar2zvc8dgnw6";}
-  {name="kremotecontrol";value="06nkg9chkimmzs1ww0sbxglssibby3157jkw6bncg661yfbsd48r";}
-  {name="kreversi";value="1pjjw3vim3pjazcxggs9axglkl7l1g0fpzqgjdxxn0p8vfh84jgg";}
-  {name="krfb";value="08qpw93slflx7whp9jbq1bsq1ikm0pgdvys11idvhmzl2lg86j1d";}
-  {name="kross-interpreters";value="1v6xjdpflzx3gi12vaf6ywzhb4ycrnawb839pjbpw3cy83p1m6pa";}
-  {name="kruler";value="08b54gimg0z4hl9lgndsbl797r5h88mjlamzzv10k0rf7rsd0924";}
-  {name="ksaneplugin";value="1rcmjkzr3yxanpvkfvbvf06dg57m1mmfmmy4n6ixy51ir0mh1v5j";}
-  {name="kscd";value="01nchy6pb4spvbhgmkfqglmrm8jgkslg6k1q1vzvahyns4lv8b6d";}
-  {name="kshisen";value="0i9imqb4zz2yvc80dgvbz08s3pxncm8dnvvwxjaw674nks0jxlh8";}
-  {name="ksirk";value="1lnsz5fg86vqdks3d5dfsxzkdxs8kzakjrwx4ixpab5xhq05vzls";}
-  {name="ksnakeduel";value="0721xwg3rjwib3aazgzhdmph0bpl2p5zkha8jbmq7aqr5i8ddkx0";}
-  {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";}
-  {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";}
-  {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";}
-  {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";}
-  {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";}
-  {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";}
-  {name="ktimer";value="02yw6zgp5wbgfvq38adbnn8mqpjc69chz4rndphmyskvflszz6n4";}
-  {name="ktouch";value="110haqrk8ixq7hmsb8hymkbqw7jygybxh467p4ag0pczr09gr3d3";}
-  {name="ktuberling";value="1jpnzb6dbmcv2f0hb7y3alqn9jqq589jzz2chbvlsm7p7xnpv2h2";}
-  {name="kturtle";value="1z6mx1ls5ymh5biyzf5f99q6qapr4a2jgxdi2za0qclqjsla4hrf";}
-  {name="ktux";value="1n854lccqs540c0lsg6794g0ir25zli1h6z92vyccsvranjb6k9r";}
-  {name="kubrick";value="1sa53z2bdk4rnvr5fs73nazl1aisbcg9yyianazggqshhy0l6w8k";}
-  {name="kuser";value="1rkjah60cwpkp355ldcbvb7cwap9ib1mvj1aska9zn2kad0dg8n1";}
-  {name="kwalletmanager";value="1w3csapcddpzn7l7v4a2802wwh6d1zm8vqx9lz3wmajczpx6xjab";}
-  {name="kwordquiz";value="0zvxzva65cvqin64v105zh9hwbv0yi8mx9lll4ybbp915dw8701q";}
   {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
-  {name="libkcompactdisc";value="14hjlql1vzzszfpxhz0rzvjpi0q7f20ry5857lpdbqhnrc0p3bmg";}
   {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
-  {name="libkdeedu";value="1i2sfby6ya8cfkdk28a9ia5zixwbixy56ql488v41w29mf1jnvzx";}
-  {name="libkdegames";value="0rd24v67fg09h5ilr4r7g9q21z165q1pm37y17l2qgjzr04czwn4";}
   {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
-  {name="libkipi";value="0fjm96pwird4km4wlhag1b67czwi03vsc2anng9iw3l4avavmvfw";}
-  {name="libkmahjongg";value="1ab66zgxya23yi7l3ga78yrm1kkr0l6hl709khyyk667kgzfqf16";}
-  {name="libkomparediff2";value="0bx672rysz78y2322lmm8a0i1k9v755wx8vmh538amk5smq936mz";}
-  {name="libksane";value="18nd90hrfmrgwmm6p5hgdr9dwc7z9978v2ibmjiim8dv44myk2is";}
-  {name="lokalize";value="1ig5mvzcspyz6ihr43fmwnhw560pby2kij0bz598xjkvb5hwfn8g";}
-  {name="lskat";value="01vgf40apf9x322k4f3i78n9ha01maga3xh3zvw4kmbs8kd662bi";}
   {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
-  {name="mplayerthumbs";value="0zin10mah7wm7f5v3hqffbwq2pqs7v39i2qhdizrijp85wsp925v";}
-  {name="nepomuk-core";value="0gdb7vk3qjvv04a5xqwlv0f4bjn391a3k3hkgibkql9ggxbjbrvl";}
-  {name="nepomuk-widgets";value="1qbrs56af9zdzhfb8964p44706gdf4j0bmj378xy5jva7km9cypx";}
-  {name="okteta";value="1vgs9kwp1bb5fvp1ja5hzvgll1s7n3ds5gg4500khy47k2z2cvmx";}
   {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
-  {name="oxygen-icons";value="1nwjjcm0isjnn3i8xf75nk6mhbg1zm20farlmyrzx261r2cj68lv";}
-  {name="pairs";value="124rpv22cx6bi65ixz5889zk46q17913w4l80d94pp9l6aypn4fm";}
-  {name="palapeli";value="08rklllik0zsrw19ff6b6l0ijxkyxy8wn5mxm3i07h9pbzv1ga5k";}
-  {name="parley";value="1mx0s7dmcmprrr44iim3pzr782cacndqiqiy7zz1zdw41mif3q16";}
-  {name="perlkde";value="0aiv8wmv08yp19rk228m7wirh43dagz4yapp3f7bgg50f4c6rpkb";}
-  {name="perlqt";value="0villxkgqwscx0sipfqnacxdyi3kzkmma4p9fkjq0hvqzq1b4pd0";}
-  {name="picmi";value="0x6nv6ahgsb90brckgv97grsmdb4za5m9izrkcyz6rg5gnn848c4";}
-  {name="poxml";value="020lf3wc7vn9d01pqqn1ygvvx7699vxkk5n9hq8zw7rf6n25gifx";}
-  {name="print-manager";value="0df1zca0cdk3qdyjfsymhghdadixz3fwm5w4h833iwf7fgr3c5q8";}
   {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";}
-  {name="qtruby";value="179wjl7w8vdm1606m1dzphhmcqxynfbdrcnrjzpyyvhibsdyfl10";}
-  {name="qyoto";value="0inwdnwhmi3cf82z0ni1abf621l6322r84kq447cqia6rkmf59j4";}
-  {name="rocs";value="1z6lk3xzbrw6581gy8hd3lm3ry4vkphg9wcdl8l03az1nyk2xp61";}
-  {name="smokegen";value="1if43r4icp7fz8ngmfw8i5wdylak48j79pp3bdvizfwn4pazl2s3";}
-  {name="smokekde";value="099c4qkpwwhbj9yibsm5zkgczv22qs4vd6s84v1p347kxr5in1hd";}
-  {name="smokeqt";value="02drfr1bnhac27a4c8pvbvvag250pmg71iz7ig968bp2gqvxcf99";}
-  {name="step";value="14f4a2k2al21ynkmwqrh5c33fgn6bhw3g461yhvmnq2sf8fwg8wb";}
-  {name="superkaramba";value="1jf3dck707svpbnbpwv46mlcgf5x52djnix5wjsg3wmkipgs4w88";}
   {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
-  {name="sweeper";value="0fhq9n1ffhcka37j6m9gs0rdxs0dzfn7lnl66v9wpgw075lfiaxx";}
-  {name="umbrello";value="0cvks49ij449grh3ldbpmmagz3yx61zq1g0fsg2ii9pqzbd6hn3x";}
-  {name="zeroconf-ioslave";value="0hhm5jj0kbi1y18m4x50hnpnfi1cjgh6mglggbscp8xr32jgmgjm";}
 ];
 versions=builtins.listToAttrs[
-  {name="amor";value="4.14.3";}
-  {name="analitza";value="4.14.3";}
-  {name="ark";value="4.14.3";}
-  {name="artikulate";value="4.14.3";}
-  {name="audiocd-kio";value="4.14.3";}
   {name="baloo";value="4.14.3";}
-  {name="baloo-widgets";value="4.14.3";}
-  {name="blinken";value="4.14.3";}
-  {name="bomber";value="4.14.3";}
-  {name="bovo";value="4.14.3";}
-  {name="cantor";value="4.14.3";}
-  {name="cervisia";value="4.14.3";}
-  {name="dolphin-plugins";value="4.14.3";}
-  {name="dragon";value="4.14.3";}
-  {name="ffmpegthumbs";value="4.14.3";}
-  {name="filelight";value="4.14.3";}
-  {name="granatier";value="4.14.3";}
-  {name="gwenview";value="4.14.3";}
-  {name="jovie";value="4.14.3";}
-  {name="juk";value="4.14.3";}
-  {name="kaccessible";value="4.14.3";}
   {name="kactivities";value="4.13.3";}
-  {name="kajongg";value="4.14.3";}
-  {name="kalgebra";value="4.14.3";}
-  {name="kalzium";value="4.14.3";}
-  {name="kamera";value="4.14.3";}
-  {name="kanagram";value="4.14.3";}
-  {name="kapman";value="4.14.3";}
-  {name="kapptemplate";value="4.14.3";}
-  {name="kate";value="4.14.3";}
-  {name="katomic";value="4.14.3";}
-  {name="kblackbox";value="4.14.3";}
-  {name="kblocks";value="4.14.3";}
-  {name="kbounce";value="4.14.3";}
-  {name="kbreakout";value="4.14.3";}
-  {name="kbruch";value="4.14.3";}
-  {name="kcachegrind";value="4.14.3";}
-  {name="kcalc";value="4.14.3";}
-  {name="kcharselect";value="4.14.3";}
-  {name="kcolorchooser";value="4.14.3";}
-  {name="kcron";value="4.14.3";}
-  {name="kdeartwork";value="4.14.3";}
   {name="kde-baseapps";value="4.14.3";}
-  {name="kde-base-artwork";value="4.14.3";}
-  {name="kde-dev-scripts";value="4.14.3";}
-  {name="kde-dev-utils";value="4.14.3";}
-  {name="kdegraphics-mobipocket";value="4.14.3";}
-  {name="kdegraphics-strigi-analyzer";value="4.14.3";}
-  {name="kdegraphics-thumbnailers";value="4.14.3";}
-  {name="kdenetwork-filesharing";value="4.14.3";}
-  {name="kdenetwork-strigi-analyzers";value="4.14.3";}
-  {name="kdepim";value="4.14.3";}
   {name="kdepimlibs";value="4.14.3";}
-  {name="kdepim-runtime";value="4.14.3";}
-  {name="kdeplasma-addons";value="4.14.3";}
   {name="kde-runtime";value="4.14.3";}
-  {name="kdesdk-kioslaves";value="4.14.3";}
-  {name="kdesdk-strigi-analyzers";value="4.14.3";}
-  {name="kdesdk-thumbnailers";value="4.14.3";}
-  {name="kde-wallpapers";value="4.14.3";}
-  {name="kdewebdev";value="4.14.3";}
   {name="kde-workspace";value="4.11.14";}
-  {name="kdf";value="4.14.3";}
-  {name="kdiamond";value="4.14.3";}
   {name="kfilemetadata";value="4.14.3";}
-  {name="kfloppy";value="4.14.3";}
-  {name="kfourinline";value="4.14.3";}
-  {name="kgamma";value="4.14.3";}
-  {name="kgeography";value="4.14.3";}
-  {name="kget";value="4.14.3";}
-  {name="kgoldrunner";value="4.14.3";}
-  {name="kgpg";value="4.14.3";}
-  {name="khangman";value="4.14.3";}
-  {name="kig";value="4.14.3";}
-  {name="kigo";value="4.14.3";}
-  {name="killbots";value="4.14.3";}
-  {name="kimono";value="4.14.3";}
-  {name="kiriki";value="4.14.3";}
-  {name="kiten";value="4.14.3";}
-  {name="kjumpingcube";value="4.14.3";}
-  {name="klettres";value="4.14.3";}
-  {name="klickety";value="4.14.3";}
-  {name="klines";value="4.14.3";}
-  {name="kmag";value="4.14.3";}
-  {name="kmahjongg";value="4.14.3";}
-  {name="kmines";value="4.14.3";}
-  {name="kmix";value="4.14.3";}
-  {name="kmousetool";value="4.14.3";}
-  {name="kmouth";value="4.14.3";}
-  {name="kmplot";value="4.14.3";}
-  {name="knavalbattle";value="4.14.3";}
-  {name="knetwalk";value="4.14.3";}
-  {name="kolf";value="4.14.3";}
-  {name="kollision";value="4.14.3";}
-  {name="kolourpaint";value="4.14.3";}
-  {name="kompare";value="4.14.3";}
-  {name="konquest";value="4.14.3";}
-  {name="konsole";value="4.14.3";}
-  {name="kopete";value="4.14.3";}
-  {name="korundum";value="4.14.3";}
-  {name="kpat";value="4.14.3";}
-  {name="kppp";value="4.14.3";}
-  {name="kqtquickcharts";value="4.14.3";}
-  {name="krdc";value="4.14.3";}
-  {name="kremotecontrol";value="4.14.3";}
-  {name="kreversi";value="4.14.3";}
-  {name="krfb";value="4.14.3";}
-  {name="kross-interpreters";value="4.14.3";}
-  {name="kruler";value="4.14.3";}
-  {name="ksaneplugin";value="4.14.3";}
-  {name="kscd";value="4.14.3";}
-  {name="kshisen";value="4.14.3";}
-  {name="ksirk";value="4.14.3";}
-  {name="ksnakeduel";value="4.14.3";}
-  {name="ksnapshot";value="4.14.3";}
-  {name="kspaceduel";value="4.14.3";}
-  {name="ksquares";value="4.14.3";}
-  {name="ksudoku";value="4.14.3";}
-  {name="ksystemlog";value="4.14.3";}
-  {name="kteatime";value="4.14.3";}
-  {name="ktimer";value="4.14.3";}
-  {name="ktouch";value="4.14.3";}
-  {name="ktuberling";value="4.14.3";}
-  {name="kturtle";value="4.14.3";}
-  {name="ktux";value="4.14.3";}
-  {name="kubrick";value="4.14.3";}
-  {name="kuser";value="4.14.3";}
-  {name="kwalletmanager";value="4.14.3";}
-  {name="kwordquiz";value="4.14.3";}
   {name="libkcddb";value="4.14.3";}
-  {name="libkcompactdisc";value="4.14.3";}
   {name="libkdcraw";value="4.14.3";}
-  {name="libkdeedu";value="4.14.3";}
-  {name="libkdegames";value="4.14.3";}
   {name="libkexiv2";value="4.14.3";}
-  {name="libkipi";value="4.14.3";}
-  {name="libkmahjongg";value="4.14.3";}
-  {name="libkomparediff2";value="4.14.3";}
-  {name="libksane";value="4.14.3";}
-  {name="lokalize";value="4.14.3";}
-  {name="lskat";value="4.14.3";}
   {name="marble";value="4.14.3";}
-  {name="mplayerthumbs";value="4.14.3";}
-  {name="nepomuk-core";value="4.14.3";}
-  {name="nepomuk-widgets";value="4.14.3";}
-  {name="okteta";value="4.14.3";}
   {name="okular";value="4.14.3";}
-  {name="oxygen-icons";value="4.14.3";}
-  {name="pairs";value="4.14.3";}
-  {name="palapeli";value="4.14.3";}
-  {name="parley";value="4.14.3";}
-  {name="perlkde";value="4.14.3";}
-  {name="perlqt";value="4.14.3";}
-  {name="picmi";value="4.14.3";}
-  {name="poxml";value="4.14.3";}
-  {name="print-manager";value="4.14.3";}
   {name="pykde4";value="4.14.3";}
-  {name="qtruby";value="4.14.3";}
-  {name="qyoto";value="4.14.3";}
-  {name="rocs";value="4.14.3";}
-  {name="smokegen";value="4.14.3";}
-  {name="smokekde";value="4.14.3";}
-  {name="smokeqt";value="4.14.3";}
-  {name="step";value="4.14.3";}
-  {name="superkaramba";value="4.14.3";}
   {name="svgpart";value="4.14.3";}
-  {name="sweeper";value="4.14.3";}
-  {name="umbrello";value="4.14.3";}
-  {name="zeroconf-ioslave";value="4.14.3";}
 ];
 modules=[
 {
   module="kdemultimedia";
   split=true;
   pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
     { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
   ];
 }
 {
   module="kdegraphics";
   split=true;
   pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
     { name="libkdcraw";  }
     { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
     { name="okular";  }
     { name="svgpart";  }
   ];
@@ -383,196 +51,22 @@ modules=[
   module="kdelibs";
   split=true;
   pkgs=[
-    { name="baloo";  }
-    { name="baloo-widgets"; sane="baloo_widgets"; }
-    { name="kfilemetadata";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-    { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwalletmanager";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="libkomparediff2";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
+    { name = "baloo";  }
+    { name = "kfilemetadata";  }
   ];
 }
 {
   module="kdeedu";
   split=true;
   pkgs=[
-    { name="analitza";  }
-    { name="artikulate";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kqtquickcharts";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
     { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
   ];
 }
 {
   module="kdebindings";
   split=true;
   pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
     { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
   ];
 }
 {
@@ -583,38 +77,7 @@ sane="kde_baseapps";  split=true;
   ];
 }
 { module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdepim";  split=false;}
 { module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
 { module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
 ];
 }
diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix
index 4bb961b8d2e7..d5de6f5f6bc1 100644
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@@ -113,14 +113,18 @@ rec {
   removeNames = subst: big:
     fold (s: out: filter (x: x.name != s) out) big subst;
 
-  modules = listToAttrs (map kdeModuleNV manifest.modules);
+  allModules = listToAttrs (map kdeModuleNV manifest.modules);
+
+  modules =
+    let unsplit = filter (a: ! (a ? pkgs)) manifest.modules;
+    in listToAttrs (map kdeModuleNV unsplit);
 
   splittedModuleList =
     let
       splitted = filter (a: a ? pkgs) manifest.modules;
       names = map ({module, sane ? module, ...}: sane) splitted;
     in
-    map (m: m.projects) (stdenv.lib.attrVals names modules);
+    map (m: m.projects) (stdenv.lib.attrVals names allModules);
 
   individual =
     stdenv.lib.zipAttrsWith
diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix
deleted file mode 100644
index a66d189a6007..000000000000
--- a/pkgs/desktops/kde-4.14/kde-runtime.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info
-, libcanberra, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib
-}:
-
-kde {
-  patches = [ ./CVE-2014-8600.diff ];
-
-  buildInputs = [
-    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba libcanberra libpulseaudio gpgme
-    networkmanager kactivities kdepimlibs openexr
-#todo: add openslp
-#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
-  ];
-
-  nativeBuildInputs = [ shared_mime_info ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
-
-  meta = {
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kde-wallpapers.nix b/pkgs/desktops/kde-4.14/kde-wallpapers.nix
deleted file mode 100644
index 875eb6769c0e..000000000000
--- a/pkgs/desktops/kde-4.14/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
-  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1mzj7jk0ag7yas2wm2x60z3ymv64g9jrjsz3nwlr719b4bhmgwjj";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36a..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
deleted file mode 100644
index 606c61cddb63..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-#todo: package qaccessibilityclient
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9c..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967cd..000000000000
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
deleted file mode 100644
index f585461af381..000000000000
--- a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Configure and schedule tasks";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
deleted file mode 100644
index 88757a6b91c7..000000000000
--- a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "System log viewer tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
deleted file mode 100644
index 6118cf558bbd..000000000000
--- a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "User management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976fc..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e9..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e1..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd142..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kdeartwork-icon-themes";
-
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE nuvola and mono icon themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0c..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af738..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a7195..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 84cb008056e4..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-
-  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
-
-  meta = {
-    description = "KDE screensavers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216db..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix b/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c37100..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
deleted file mode 100644
index 7c9846fbf9e8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kdeartwork-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
deleted file mode 100644
index 48eed141ce64..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, cmake, smokeqt, perl }:
-
-kde {
-
-  # TODO: qscintilla2, qwt5
-
-  buildInputs = [ smokeqt perl ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Perl bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
deleted file mode 100644
index bd95a0d8bd3d..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..30aec0e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
-     return()
- endif (NOT COMPILE_RUBY)
- 
--SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
--SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
- 
- # compute an overall version number which can be compared at once
- MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
deleted file mode 100644
index ed83dd03eca1..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kde, cmake, smokeqt, ruby_2_2 }:
-
-kde {
-
- # TODO: scintilla2, qwt5
-
-  buildInputs = [ smokeqt ruby_2_2 ];
-
-  nativeBuildInputs = [ cmake ];
-
-  hardeningDisable = [ "all" ];
-
-  # The patch is not ready for upstream submmission.
-  # I should add an option() instead.
-  patches = [ ./qtruby-install-prefix.patch ];
-
-  cmakeFlags="-DRUBY_ROOT_DIR=${ruby_2_2}";
-
-  meta = {
-    description = "Ruby bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
deleted file mode 100644
index 7436b6112d57..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt
---- smokegen-4.14.3-upstream/CMakeLists.txt	2014-09-15 13:23:01.000000000 -0430
-+++ smokegen-4.14.3/CMakeLists.txt	2015-03-29 16:41:59.295598992 -0430
-@@ -32,9 +32,9 @@
-     type.cpp
- )
- 
--# force RPATH so that the binary is usable from within the build tree
--set (CMAKE_SKIP_BUILD_RPATH FALSE)
--set (CMAKE_SKIP_RPATH FALSE)
-+# add the automatically determined parts of the RPATH
-+# which point to directories outside the build tree to the install RPATH
-+set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- 
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
- 
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
deleted file mode 100644
index 53257e836e04..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
-@@ -80,8 +80,7 @@
- set(SMOKE_API_BIN "@SMOKE_API_BIN@")
- 
- find_library(SMOKE_BASE_LIBRARY smokebase 
--              PATHS "@SMOKE_LIBRARY_PREFIX@"
--              NO_DEFAULT_PATH)
-+              PATHS "@SMOKE_LIBRARY_PREFIX@")
- 
- if (NOT SMOKE_BASE_LIBRARY)
-     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
deleted file mode 100644
index 5708d0f96eb2..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, kde, qt4, cmake }:
-
-kde {
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
deleted file mode 100644
index 4474c1d9731e..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
-, shared_desktop_ontologies, attica, pkgconfig }:
-
-kde {
-
-  # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash
-  # okular is disabled because the code generated is broken
-  buildInputs = [
-    smokeqt kdelibs shared_desktop_ontologies
-  ];
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  LD_LIBRARY_PATH = "${smokeqt}/lib/";
-
-  meta = {
-    description = "SMOKE bindings for kdelibs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
deleted file mode 100644
index 494bc85e6465..000000000000
--- a/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ stdenv, kde, qt4, cmake, phonon, qimageblitz, smokegen }:
-
-kde {
-
-# TODO: Qwt5, QScintilla2
-
-  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
-  nativeBuildInputs = [ cmake ];
-  propagatedNativeBuildInputs = [ smokegen ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix b/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
deleted file mode 100644
index 74c3a1ebb200..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, readline }:
-kde {
-  buildInputs = [ kdelibs readline ];
-
-  meta = {
-    description = "Library part of KAlgebra";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
deleted file mode 100644
index 8674a774443f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, qt_gstreamer1 }:
-kde {
-  buildInputs = [ kdelibs qt_gstreamer1 ];
-
-  meta = {
-    description = "A pronunciation learning program for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix b/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix b/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
deleted file mode 100644
index 625a2678e48b..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/cantor.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }:
-kde {
-
-# TODO: R is not found
-
-  buildInputs = [ kdelibs libspectre analitza R libqalculate python ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  patches = [ ./commit-846cf02 ];
-
-  meta = {
-    description = "KDE Frontend to Mathematical Software";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02 b/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
deleted file mode 100644
index 66e756e21bb8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/commit-846cf02
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/src/backends/R/rserver/rcallbacks.h b/src/backends/R/rserver/rcallbacks.h
-index 8f4752c..6d0e9a2 100644
---- a/src/backends/R/rserver/rcallbacks.h
-+++ b/src/backends/R/rserver/rcallbacks.h
-@@ -30,7 +30,6 @@ class Expression;
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
- 
- //This File implements the necessary callbacks for R
-commit 846cf02ab1618b9322b83eafc18dff3264988b72
-Author: Raymond Wooninck <tittiatcoke@gmail.com>
-Date:   Mon Apr 27 16:08:51 2015 +0200
-
-    Also build against R >= 3.2.
-
-diff --git a/src/backends/R/rserver/rcallbacks.cpp b/src/backends/R/rserver/rcallbacks.cpp
-index 2c86531..492f270 100644
---- a/src/backends/R/rserver/rcallbacks.cpp
-+++ b/src/backends/R/rserver/rcallbacks.cpp
-@@ -26,6 +26,7 @@
- #include <QStringList>
- 
- #include <stdio.h>
-+#include <Rinterface.h>
- 
- RServer* server;
- Expression* currentExpression;
-diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp
-index 30cdb70..f689f42 100644
---- a/src/backends/R/rserver/rserver.cpp
-+++ b/src/backends/R/rserver/rserver.cpp
-@@ -42,7 +42,6 @@
- #include <Rversion.h>
- #include <Rdefines.h>
- #define R_INTERFACE_PTRS
--#include <Rinterface.h>
- #include <R_ext/Parse.h>
- 
- // Not making a member to prevent pulling R headers into rserver.h
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix
deleted file mode 100644
index 3675c3a225f4..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, analitza }:
-kde {
-  buildInputs = [ kdelibs libkdeedu analitza ];
-
-  meta = {
-    description = "2D and 3D Graph Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
deleted file mode 100644
index 8338eee55110..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen2, eigen, openbabel, avogadro, pkgconfig }:
-kde {
-
-# TODO: chemical mime data
-
-  buildInputs = [ kdelibs facile ocaml eigen2 eigen openbabel avogadro ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Periodic Table of Elements";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c4..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Letter Order Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a37..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Practice Fractions";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Geography Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/khangman.nix b/pkgs/desktops/kde-4.14/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE hangman game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kig.nix b/pkgs/desktops/kde-4.14/kdeedu/kig.nix
deleted file mode 100644
index 37906c32bcb2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kig.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, boost, python}:
-kde {
-  buildInputs = [ kdelibs boost python ];
-
-  cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
-  meta = {
-    description = "KDE Interactive Geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kiten.nix b/pkgs/desktops/kde-4.14/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Japanese Reference/Study Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/klettres.nix b/pkgs/desktops/kde-4.14/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e3..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix
deleted file mode 100644
index fc7b0578c27b..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE mathematical function plotter";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix b/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix
deleted file mode 100644
index 3e243b8c4032..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kqtquickcharts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Qt Quick 1 plugin for beautiful and interactive charts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix
deleted file mode 100644
index 9e606adde336..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxkbfile }:
-
-kde {
-  buildInputs = [ kdelibs libxkbfile ];
-
-  meta = {
-    description = "Touch Typing Tutor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Educational Programming Environment";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Flash Card Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe2..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Libraries used by KDE Education applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/pairs.nix b/pkgs/desktops/kde-4.14/kdeedu/pairs.nix
deleted file mode 100644
index 36c4aba9604b..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/pairs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A memory and pairs game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/parley.nix b/pkgs/desktops/kde-4.14/kdeedu/parley.nix
deleted file mode 100644
index f9f86dde150d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, attica }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu attica ];
-
-  meta = {
-    description = "Vocabulary Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix b/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
deleted file mode 100644
index 76131d8f0f0f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/rocs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, kdelibs, boost, grantlee }:
-
-kde {
-  patches = [ ../files/rocs-0001-duplicate-add_test.patch ];
-
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
-
-  NIX_CFLAGS_COMPILE = "-fexceptions";
-
-  meta = {
-    description = "A KDE graph theory viewer";
-    kde = {
-      name = "rocs";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeedu/step.nix b/pkgs/desktops/kde-4.14/kdeedu/step.nix
deleted file mode 100644
index 95e991e84815..000000000000
--- a/pkgs/desktops/kde-4.14/kdeedu/step.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }:
-
-kde {
-
-  buildInputs = [ kdelibs gsl libqalculate eigen2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/bomber.nix b/pkgs/desktops/kde-4.14/kdegames/bomber.nix
deleted file mode 100644
index 542ff24f5e65..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/bomber.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A single player arcade game. The player is invading various cities in a plane that is decreasing in height";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/bovo.nix b/pkgs/desktops/kde-4.14/kdegames/bovo.nix
deleted file mode 100644
index 89dff46129b6..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/bovo.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
-  };
-
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/granatier.nix b/pkgs/desktops/kde-4.14/kdegames/granatier.nix
deleted file mode 100644
index 50c3bf985b5b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/granatier.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix b/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
deleted file mode 100644
index cea4fb38b4fb..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kajongg.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkdegames, pythonPackages, sqlite,  pykde4 }:
-kde rec {
-
-  buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
-
-  pythonPath = [ pythonPackages.twisted pykde4 ];
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "An ancient Chinese board game for 4 players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kapman.nix b/pkgs/desktops/kde-4.14/kdegames/kapman.nix
deleted file mode 100644
index 616533911ff8..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kapman.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A clone of the well known game Pac-Man";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/katomic.nix b/pkgs/desktops/kde-4.14/kdegames/katomic.nix
deleted file mode 100644
index 3f7c1343289a..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/katomic.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A fun and educational puzzle game built around molecular geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
deleted file mode 100644
index 1e20cf0051ea..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kblackbox.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix b/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
deleted file mode 100644
index 08e8c62d2629..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kblocks.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A classic single player falling blocks puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix b/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
deleted file mode 100644
index 291e4c65a43a..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kbounce.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A single player arcade game with the elements of puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
deleted file mode 100644
index 4c5b2f62852f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kbreakout.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
deleted file mode 100644
index b21a945a64b9..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kdiamond.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A single player puzzle game. The object of the game is to build lines of three similar diamonds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
deleted file mode 100644
index 6504d069660b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kfourinline.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A board game for two players based on the Connect-Four game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
deleted file mode 100644
index 86aff7e77ace..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kgoldrunner.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "An action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kigo.nix b/pkgs/desktops/kde-4.14/kdegames/kigo.nix
deleted file mode 100644
index e417e89a0078..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kigo.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "An open-source implementation of the popular Go game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/killbots.nix b/pkgs/desktops/kde-4.14/kdegames/killbots.nix
deleted file mode 100644
index 9d8b307be756..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/killbots.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A simple game of evading killer robots";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix b/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
deleted file mode 100644
index 433991abd75b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kiriki.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "An addictive and fun dice game, designed to be played by as many as six players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
deleted file mode 100644
index 888dba71b662..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kjumpingcube.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A simple dice driven tactical game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/klickety.nix b/pkgs/desktops/kde-4.14/kdegames/klickety.nix
deleted file mode 100644
index 87415f9a4f81..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/klickety.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A puzzle game where the player removes groups of colored marbles to clear the board";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/klines.nix b/pkgs/desktops/kde-4.14/kdegames/klines.nix
deleted file mode 100644
index e5c32d3fa9ab..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/klines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
deleted file mode 100644
index 6aca3c229946..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "The tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kmines.nix b/pkgs/desktops/kde-4.14/kdegames/kmines.nix
deleted file mode 100644
index c02a61506d75..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kmines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A classic Minesweeper game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
deleted file mode 100644
index aed9b48511ac..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/knavalbattle.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A Battle Ship game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
deleted file mode 100644
index d7a80f133168..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/knetwalk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kolf.nix b/pkgs/desktops/kde-4.14/kdegames/kolf.nix
deleted file mode 100644
index 67a75cb9a36f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kolf.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A miniature golf game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kollision.nix b/pkgs/desktops/kde-4.14/kdegames/kollision.nix
deleted file mode 100644
index b0911d093ddd..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kollision.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A simple ball dodging game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/konquest.nix b/pkgs/desktops/kde-4.14/kdegames/konquest.nix
deleted file mode 100644
index 974730a46d0b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/konquest.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "The KDE version of Gnu-Lactic Konquest";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kpat.nix b/pkgs/desktops/kde-4.14/kdegames/kpat.nix
deleted file mode 100644
index f33ddfb8570c..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kpat.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdegames, shared_mime_info }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  nativeBuildInputs = [ shared_mime_info ];
-  meta = {
-    description = "A relaxing card sorting game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix b/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
deleted file mode 100644
index 065ee4bb657c..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kreversi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix b/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
deleted file mode 100644
index 085b91584c70..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kshisen.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "A solitaire-like game played using the standard set of Mahjong tiles";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix b/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
deleted file mode 100644
index bfdd8f358dd1..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksirk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, qca2 }:
-kde {
-  buildInputs = [ kdelibs libkdegames qca2 ];
-  meta = {
-    description = "A computerized version of the well known strategic board game Risk";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
deleted file mode 100644
index ce5e75336c97..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksnakeduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A simple Tron-Clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
deleted file mode 100644
index 692eb1c085af..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kspaceduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "Each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix b/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
deleted file mode 100644
index 7cad6bf0e5ae..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksquares.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A game modeled after the well known pen and paper based game of Dots and Boxes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
deleted file mode 100644
index 72a6a72b66d5..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ksudoku.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A logic-based symbol placement puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
deleted file mode 100644
index a4480864fd8b..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/ktuberling.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A simple constructor game suitable for children and adults alike";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix b/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
deleted file mode 100644
index f80cf4a8b356..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/kubrick.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A game based on the Rubik's Cube™ puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix
deleted file mode 100644
index 3819dcdc9ae2..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/libkdegames.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, openal, libsndfile }:
-kde {
-  buildInputs = [ kdelibs openal libsndfile ];
-  meta = {
-    description = "KDE games library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
deleted file mode 100644
index d7687c1435f7..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/libkmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A library for KMahjongg game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/lskat.nix b/pkgs/desktops/kde-4.14/kdegames/lskat.nix
deleted file mode 100644
index d3e8268784bb..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/lskat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix b/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
deleted file mode 100644
index a73fcf100eb7..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/palapeli.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkdegames, shared_mime_info }:
-kde {
-
-# TODO: package qvoronoi
-
-  nativeBuildInputs = [ shared_mime_info ];
-
-  buildInputs = [ kdelibs libkdegames ];
-
-  meta = {
-    description = "A single-player jigsaw puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegames/picmi.nix b/pkgs/desktops/kde-4.14/kdegames/picmi.nix
deleted file mode 100644
index 77dcdcf48dce..000000000000
--- a/pkgs/desktops/kde-4.14/kdegames/picmi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "A single player logic-based puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
deleted file mode 100644
index 66a7c79a42bc..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
-, libjpeg, pkgconfig, kactivities, lcms2, baloo, kfilemetadata, libkdcraw }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2
-      baloo kfilemetadata libkdcraw ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix
deleted file mode 100644
index d9aa11c54afa..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libgphoto2 }:
-
-kde {
-  buildInputs = [ kdelibs libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index e06c1b5d307c..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A small utility to select a color";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix
deleted file mode 100644
index e834762feb52..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, okular }:
-
-kde {
-  buildInputs = [ kdelibs okular ];
-
-  meta = {
-    description = "A collection of plugins to handle mobipocket files";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index d9d35808ac50..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libtiff }:
-
-kde {
-  buildInputs = [ kdelibs libtiff ];
-
-  meta = {
-    description = "Strigi analyzers for various graphics file formats";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index d6207689512f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ stdenv, kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
-
-kde {
-
-  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Thumbnailers for various graphics file formats";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix
deleted file mode 100644
index 016312c199e5..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libXxf86vm }:
-
-kde {
-  buildInputs = [ kdelibs libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix
deleted file mode 100644
index ecf34e5ae9e5..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  meta = {
-    description = "KDE paint program";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix
deleted file mode 100644
index 209331d9e83d..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index f541c4bdb4df..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libksane }:
-
-kde {
-  buildInputs = [ kdelibs libksane ];
-
-  meta = {
-    description = "A KScan plugin that implements the scanning through libksane";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix
deleted file mode 100644
index a9897d270bb6..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, libkipi }:
-
-kde {
-  buildInputs = [ kdelibs libkipi ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix
deleted file mode 100644
index 65e6c52bd44f..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Interface library to kipi-plugins";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
deleted file mode 100644
index d55419f02c75..000000000000
--- a/pkgs/desktops/kde-4.14/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, sane-backends }:
-
-kde {
-  buildInputs = [ kdelibs sane-backends ];
-
-  meta = {
-    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
deleted file mode 100644
index 46567b5e2a71..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/baloo-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, baloo, kfilemetadata, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs baloo kfilemetadata ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Baloo Widgets";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
deleted file mode 100644
index b990628889b6..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-core.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, poppler_qt4
-, pkgconfig, doxygen, ebook_tools, automoc4, cmake, perl
-}:
-
-kde {
-
-# TODO: qmobipocket
-
-  buildInputs = [
-    kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
-    poppler_qt4 ebook_tools
-  ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig doxygen ];
-
-  meta = {
-    description = "NEPOMUK core";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix
deleted file mode 100644
index b0fc5ad8900d..000000000000
--- a/pkgs/desktops/kde-4.14/kdelibs/nepomuk-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, nepomuk_core }:
-
-kde {
-
-  buildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "NEPOMUK Widgets";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
deleted file mode 100644
index 20e63baf723f..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/audiocd-kio.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
-kde {
-  buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
-  meta = {
-    description = "Transparent audio CD access for applications using the KDE Platform";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
deleted file mode 100644
index bb44c3b7234e..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/dragon.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "A multimedia player with the focus on simplicity";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
deleted file mode 100644
index 2311b1dda589..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/ffmpegthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, ffmpeg }:
-kde {
-  buildInputs = [ kdelibs ffmpeg ];
-  meta = {
-    description = "A video thumbnail generator for KDE file managers like Dolphin and Konqueror";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
deleted file mode 100644
index 1bf5584de2fa..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/juk.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, taglib_1_9, libtunepimp }:
-kde {
-
-# TODO: opusfile
-
-  buildInputs = [ kdelibs taglib_1_9 libtunepimp ];
-  meta = {
-    description = "An audio jukebox application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
deleted file mode 100644
index 4d36aaf4f68a..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/kmix.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libcanberra, libpulseaudio }:
-kde {
-  buildInputs = [ kdelibs libcanberra libpulseaudio ];
-  meta = {
-    description = "Sound mixer, an application to allow you to change the volume of your sound card";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix
deleted file mode 100644
index e99ae53935b9..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/kscd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libmusicbrainz }:
-kde {
-  buildInputs = [ kdelibs libmusicbrainz ];
-  meta = {
-    description = "KDE CD player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix
deleted file mode 100644
index 6ed08af89f33..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/libkcompactdisc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "KDE library for playing & ripping CDs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
deleted file mode 100644
index c34b849f4c92..000000000000
--- a/pkgs/desktops/kde-4.14/kdemultimedia/mplayerthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "A video thumbnail generator for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix
deleted file mode 100644
index 0330511a258b..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-filesharing.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE properties dialog plugin to share a directory with the local network";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix
deleted file mode 100644
index e838d84fc5eb..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  buildInputs = [ kdelibs boost ];
-
-  meta = {
-    description = "Strigi analyzers for various network protocols";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kget.nix b/pkgs/desktops/kde-4.14/kdenetwork/kget.nix
deleted file mode 100644
index f986da2de214..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kget.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost
-, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets
-, pkgconfig }:
-
-kde {
-
-# TODO: QGpgME
-
-  buildInputs =
-    [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
-      libmms kde_baseapps kde_workspace boost ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  meta = {
-    description = "KDE download manager";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
deleted file mode 100644
index f5750d60045f..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
-  jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
-  libgadu, boost, qca2, sqlite, jsoncpp,
-  ortp, srtp, libv4l, fetchurl }:
-
-kde {
-
-# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
-
-  patches = [
-    (fetchurl {
-      name = "kopete.patch";
-      url = "https://bugs.kde.org/attachment.cgi?id=91567";
-      sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1";
-    })
-  ];
-
-  buildInputs = [
-    kdelibs qca2 mediastreamer libgadu jsoncpp
-    kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
-    libidn libxslt boost
-    ortp srtp libv4l
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-
-  meta = {
-    description = "A KDE multi-protocol IM client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix
deleted file mode 100644
index 4c6bd65769f7..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "PPP(Dial-Up) client tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
deleted file mode 100644
index 12cdd4a569c3..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libvncserver, freerdp_legacy, telepathy_qt }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver freerdp_legacy telepathy_qt ];
-
-  meta = {
-    description = "KDE remote desktop client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix
deleted file mode 100644
index cb4857965a34..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ];
-
-  meta = {
-    description = "KDE desktop sharing";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix
deleted file mode 100644
index f65960cc337b..000000000000
--- a/pkgs/desktops/kde-4.14/kdenetwork/zeroconf-ioslave.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE tool that monitors the network for DNS-SD services";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdepim-runtime.nix b/pkgs/desktops/kde-4.14/kdepim-runtime.nix
deleted file mode 100644
index e5061a8790af..000000000000
--- a/pkgs/desktops/kde-4.14/kdepim-runtime.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies
-, shared_mime_info }:
-
-kde {
-
-# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
-
-  buildInputs = [
-    kdepimlibs akonadi boost shared_desktop_ontologies
-    libxslt
-  ];
-
-  nativeBuildInputs = [ shared_mime_info ];
-
-  meta = {
-    description = "KDE PIM runtime";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdepim.nix b/pkgs/desktops/kde-4.14/kdepim.nix
deleted file mode 100644
index df41c85c8ac6..000000000000
--- a/pkgs/desktops/kde-4.14/kdepim.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
-, nepomuk_widgets, kactivities, libXScrnSaver, qjson, baloo
-, pkgconfig }:
-
-kde {
-
-# TODO: LinkGrammar
-
-  buildInputs =
-    [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
-      libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
-      libXScrnSaver qjson baloo
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedUserEnvPkgs = [ akonadi kdepimlibs kdepim_runtime ];
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer.
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix
index 554d6acd9eb4..5e7643469b64 100644
--- a/pkgs/desktops/kde-4.14/kdepimlibs.nix
+++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix
@@ -1,5 +1,5 @@
 { kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
-, kdelibs, akonadi, libxslt, nepomuk_core
+, kdelibs, akonadi, libxslt
 , shared_mime_info, shared_desktop_ontologies, qjson
 , automoc4, cmake, perl
 }:
@@ -23,7 +23,7 @@ kde {
       shared_mime_info
     ];
 
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+  propagatedBuildInputs = [ kdelibs ];
 
   # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev.
   postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake";
diff --git a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix b/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
deleted file mode 100644
index b4d24f47e490..000000000000
--- a/pkgs/desktops/kde-4.14/kdeplasma-addons.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen2, kde_workspace, attica, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth, shared_mime_info }:
-
-kde {
-
-# TODO: qwt, scim, ibus
-
-  KDEDIRS=marble;
-
-  buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
-                  eigen2 qca2 libXtst qimageblitz libqalculate 
-                  shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
-  ];
-
-  nativeBuildInputs = [ shared_mime_info ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd429..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix
deleted file mode 100644
index ad8132a850e5..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/dolphin-plugins.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn, mercurial, git and bazaar plugins for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd3..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE 4 project template generator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48d..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix
deleted file mode 100644
index df81145e5d60..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Various scripts to ease KDE development";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
deleted file mode 100644
index 5d4f83e26562..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc, libtool }:
-
-kde {
-  buildInputs = [ kdelibs libtool ];
-
-  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}";
-
-  meta = {
-    description = "Various KDE development utilities";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix
deleted file mode 100644
index 98bbce35a97c..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-kioslaves.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, subversionClient, apr, aprutil,perl }:
-
-kde {
-
-  buildInputs = [ kdelibs subversionClient apr aprutil perl ];
-
-  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
-
-  meta = {
-    description = "Subversion and perldoc kioslaves";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix
deleted file mode 100644
index 4d579b88ba8a..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for diff, po and ts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix
deleted file mode 100644
index d707fe9038fe..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kdesdk-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, gettext }:
-
-kde {
-
-  buildInputs = [ kdelibs gettext ];
-
-  meta = {
-    description = "PO file format thumbnailer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/kompare.nix b/pkgs/desktops/kde-4.14/kdesdk/kompare.nix
deleted file mode 100644
index 644c7c48dc97..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkomparediff2 }:
-
-kde {
-  buildInputs = [ kdelibs libkomparediff2 ];
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix
deleted file mode 100644
index 5933682c70a0..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/libkomparediff2.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A library to compare files and strings";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1fc..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, hunspell }:
-
-kde {
-  buildInputs = [ kdelibs hunspell ];
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.
-    '';
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix b/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
deleted file mode 100644
index 77108c76adc3..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/okteta.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, qca2, shared_mime_info }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-  nativeBuildInputs = [ shared_mime_info ];
-
-# TODO: Look what does -DBUILD_mobile add
-
-  enableParallelBuilding = false;
-
-  meta = {
-    description = "KDE byte editor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/poxml.nix b/pkgs/desktops/kde-4.14/kdesdk/poxml.nix
deleted file mode 100644
index 6e46c3e3ab4f..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr, gettext }:
-
-kde {
-  buildInputs = [ kdelibs antlr gettext ];
-
-  meta = {
-    description = "Po<->xml tools";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901b..000000000000
--- a/pkgs/desktops/kde-4.14/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
-
-  meta = {
-    description = "Umbrello UML modeller";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/amor.nix b/pkgs/desktops/kde-4.14/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a9..000000000000
--- a/pkgs/desktops/kde-4.14/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b0..000000000000
--- a/pkgs/desktops/kde-4.14/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdetoys/ktux.nix b/pkgs/desktops/kde-4.14/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c722..000000000000
--- a/pkgs/desktops/kde-4.14/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/ark.nix b/pkgs/desktops/kde-4.14/kdeutils/ark.nix
deleted file mode 100644
index 99844b909fd7..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/ark.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson
-, unzip }:
-
-kde {
-  buildInputs = [
-    makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson
-  ];
-
-  postInstall = ''
-    wrapProgram $out/bin/ark \
-      --prefix PATH ":" "${unzip}/bin"
-  '';
-
-  meta = {
-    description = "KDE Archiving Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/filelight.nix b/pkgs/desktops/kde-4.14/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27ce..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Tool to visualise file and directory sizes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e8..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
-  buildInputs = [ kdelibs gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE character selection utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kdf.nix b/pkgs/desktops/kde-4.14/kdeutils/kdf.nix
deleted file mode 100644
index 3f9da58d0a62..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kdf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE free disk space utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671f..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Floppy disk formatting utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
deleted file mode 100644
index b3f95356d132..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kdepimlibs, boost, gpgme }:
-
-kde {
-
-  buildInputs = [ kdelibs kdepimlibs boost gpgme ];
-
-  meta = {
-    description = "Simple KDE GUI for GPG";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix
deleted file mode 100644
index 70311a789f99..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs libXtst ];
-
-  meta = {
-    description = "KDE remote control";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e3..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Timer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix
deleted file mode 100644
index 9ec0e6c0396c..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/kwalletmanager.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
deleted file mode 100644
index b53946fae25d..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, cups, pykde4, system-config-printer }:
-
-let s_c_p = system-config-printer.override { withGUI = false; }; in
-
-kde rec {
-  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath = [ cups pythonPackages.pyqt4 pykde4 pythonPackages.pycups s_c_p ];
-
-  # system-config-printer supplies some D-Bus policy that we need.
-  propagatedUserEnvPkgs = [ s_c_p ];
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "KDE printer manager";
-    longDescription = "Applet to view current print jobs and configure new printers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix
deleted file mode 100644
index cbe7a2856062..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qimageblitz, python }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz python ];
-
-  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30e..000000000000
--- a/pkgs/desktops/kde-4.14/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix
deleted file mode 100644
index 55e37809e07b..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index 6d22f72461f9..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
deleted file mode 100644
index b593c952219c..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, html-tidy, boost }:
-
-kde {
-
-# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
-
-  postPatch = ''
-    substituteInPlace klinkstatus/src/tidy/tidyx.h \
-      --replace buffio.h tidybuffio.h
-  '';
-
-  buildInputs = [ kdelibs kdepimlibs html-tidy boost ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix
deleted file mode 100644
index d5f4337f714d..000000000000
--- a/pkgs/desktops/kde-4.14/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A graphical editor of scripted dialogs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.14/oxygen-icons.nix b/pkgs/desktops/kde-4.14/oxygen-icons.nix
deleted file mode 100644
index 270707f84928..000000000000
--- a/pkgs/desktops/kde-4.14/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "156ghknzdrlf48602lcap5vpp691cyba0igdbw53wfqfpaqkap28";
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Icons for KDE's default theme";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26e480c24db4..97082218feed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4368,9 +4368,7 @@ with pkgs;
 
   uhttpmock = callPackage ../development/libraries/uhttpmock { };
 
-  uim = callPackage ../tools/inputmethods/uim {
-    inherit (pkgs.kde4) kdelibs;
-  };
+  uim = kde4.callPackage ../tools/inputmethods/uim { };
 
   uhub = callPackage ../servers/uhub { };
 
@@ -16709,6 +16707,7 @@ with pkgs;
 
         calligra = callPackage ../applications/office/calligra {
           vc = vc_0_7;
+          oxygen_icons = kde5.oxygen-icons5;
         };
 
         choqok = callPackage ../applications/networking/instant-messengers/choqok { };

From 43d306c2f5fe7338e030f6283b4186fbb7c53672 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:40:22 -0600
Subject: [PATCH 1058/3449] Remove kde4.rekonq and dependencies

- No upstream activity
- Known vulnerabilities
---
 .../browsers/kwebkitpart/CVE-2014-8600.diff   | 33 -------------------
 .../browsers/kwebkitpart/default.nix          | 25 --------------
 .../networking/browsers/rekonq/default.nix    | 26 ---------------
 pkgs/top-level/aliases.nix                    |  1 -
 pkgs/top-level/all-packages.nix               |  7 ----
 5 files changed, 92 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
 delete mode 100644 pkgs/applications/networking/browsers/kwebkitpart/default.nix
 delete mode 100644 pkgs/applications/networking/browsers/rekonq/default.nix

diff --git a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
deleted file mode 100644
index 0c65e68f2167..000000000000
--- a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/webpage.cpp
-+++ b/src/webpage.cpp
-@@ -226,23 +226,26 @@
-     doc += QL1S( "<h3>" );
-     doc += i18n( "Details of the Request:" );
-     doc += QL1S( "</h3><ul><li>" );
--    doc += i18n( "URL: %1", reqUrl.url() );
-+    // escape URL twice: once for i18n, and once for HTML.
-+    doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
-     doc += QL1S( "</li><li>" );
- 
-     const QString protocol (reqUrl.protocol());
-     if ( !protocol.isNull() ) {
--        doc += i18n( "Protocol: %1", protocol );
-+        // escape protocol twice: once for i18n, and once for HTML.
-+        doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
-         doc += QL1S( "</li><li>" );
-     }
- 
-     doc += i18n( "Date and Time: %1",
-                  KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
-     doc += QL1S( "</li><li>" );
--    doc += i18n( "Additional Information: %1" ,  text );
-+    // escape text twice: once for i18n, and once for HTML.
-+    doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
-     doc += QL1S( "</li></ul><h3>" );
-     doc += i18n( "Description:" );
-     doc += QL1S( "</h3><p>" );
--    doc += description;
-+    doc += Qt::escape( description );
-     doc += QL1S( "</p>" );
- 
-     if ( causes.count() ) {
diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
deleted file mode 100644
index 1cbffdd25446..000000000000
--- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }:
-
-stdenv.mkDerivation rec {
-  name = "kwebkitpart-${version}";
-  version = "1.3.3";
-
-  src = fetchgit {
-    url = git://anongit.kde.org/kwebkitpart;
-    rev = "refs/tags/v${version}";
-    sha256 = "13vfv88njml7x67a37ymmlv9qs30fkmvkq0278lp7llmvp5qnxcj";
-  };
-
-  patches = [ ./CVE-2014-8600.diff ];
-
-  buildInputs = [ kdelibs ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.phreedom ];
-    description = "A WebKit KPart for Konqueror, Akregator and other KDE applications";
-    homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
deleted file mode 100644
index 70aa648ccc50..000000000000
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kde4, shared_desktop_ontologies, qca2, qoauth }:
-
-assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
-
-stdenv.mkDerivation rec {
-  name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
-
-  src = fetchurl {
-    url = "mirror://sourceforge/rekonq/${name}.tar.xz";
-    sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
-  };
-
-  buildInputs = [ kde4.kdelibs qca2 qoauth ];
-
-  nativeBuildInputs = [
-    automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies
-  ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.urkud ];
-    description = "KDE Webkit browser";
-    homepage = https://rekonq.kde.org/;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index db48e0769b3d..841eb75e905f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -96,7 +96,6 @@ doNotDisplayTwice rec {
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = qt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
-  rekonqWrapper = rekonq; # added 2015-01
   rssglx = rss-glx; #added 2015-03-25
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
   rustUnstable = rustNightly; # added 2016-11-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97082218feed..62da5f8bbe58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16758,11 +16758,6 @@ with pkgs;
 
         psi = callPackage ../applications/networking/instant-messengers/psi { };
 
-        rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
-        rekonq = wrapFirefox rekonq-unwrapped { };
-
-        kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
-
         semnotes = callPackage ../applications/misc/semnotes { };
 
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
@@ -17884,8 +17879,6 @@ with pkgs;
   };
   vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
-  inherit (kde4) rekonq;
-
   vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
     webkit = webkitgtk2;
   };

From 6e1d64a3c050d0ce7b2dea6b81064c37cfc77a04 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:42:15 -0600
Subject: [PATCH 1059/3449] Remove kde4.bangarang

- No upstream activity
---
 pkgs/applications/video/bangarang/default.nix | 34 --------------
 .../video/bangarang/gcc-4.7.patch             | 45 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 81 deletions(-)
 delete mode 100644 pkgs/applications/video/bangarang/default.nix
 delete mode 100644 pkgs/applications/video/bangarang/gcc-4.7.patch

diff --git a/pkgs/applications/video/bangarang/default.nix b/pkgs/applications/video/bangarang/default.nix
deleted file mode 100644
index ceece8879dcb..000000000000
--- a/pkgs/applications/video/bangarang/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, phonon, soprano, shared_desktop_ontologies
-, kdemultimedia, taglib, glibc, gettext
-}:
-
-stdenv.mkDerivation rec {
-  name = "bangarang-2.1";
-
-  src = fetchurl {
-    url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1";
-  };
-
-  buildInputs = [
-    kdelibs phonon soprano shared_desktop_ontologies kdemultimedia
-    taglib gettext
-  ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  patches = [ ./gcc-4.7.patch ];
-
-  meta = with stdenv.lib; {
-    description = "A media player for KDE based on Nepomuk and Phonon";
-    longDescription = ''
-      Bangarang offers a minimalistic media center user interface,
-      media collection management, playlists and statistics.
-    '';
-    homepage = http://bangarangkde.wordpress.com/;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ maintainers.phreedom maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/video/bangarang/gcc-4.7.patch b/pkgs/applications/video/bangarang/gcc-4.7.patch
deleted file mode 100644
index d4f650b9caf5..000000000000
--- a/pkgs/applications/video/bangarang/gcc-4.7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1
-Author: Alex Fiestas <afiestas@kde.org>
-Date:   Thu Mar 29 10:09:22 2012 +0200
-
-    Build fix: Add unistd.h include since sleep is defined there
-
-diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp
-index 0c49d69..fcc4cd3 100644
---- a/src/platform/infofetchers/lastfminfofetcher.cpp
-+++ b/src/platform/infofetchers/lastfminfofetcher.cpp
-@@ -32,6 +32,8 @@
- #include <QFile>
- #include <QTextEdit>
- 
-+#include <unistd.h>
-+
- LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp
-index 7801644..3c01960 100644
---- a/src/platform/infofetchers/tmdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tmdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include <QDomDocument>
- #include <QFile>
- 
-+#include <unistd.h>
-+
- TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp
-index ff351b0..670ed18 100644
---- a/src/platform/infofetchers/tvdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tvdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include <QDomDocument>
- #include <QFile>
- 
-+#include <unistd.h>
-+
- TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 62da5f8bbe58..926ebc1d0dce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16701,8 +16701,6 @@ with pkgs;
           ffmpeg = ffmpeg_2;
         };
 
-        bangarang = callPackage ../applications/video/bangarang { };
-
         basket = callPackage ../applications/office/basket { };
 
         calligra = callPackage ../applications/office/calligra {

From 388d58f568d9f963a7914e3ef2bcbbd118ec0e25 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:43:16 -0600
Subject: [PATCH 1060/3449] Remove kde4.basket

- No upstream activity
---
 pkgs/applications/office/basket/default.nix | 25 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/applications/office/basket/default.nix

diff --git a/pkgs/applications/office/basket/default.nix b/pkgs/applications/office/basket/default.nix
deleted file mode 100644
index 2417e263d442..000000000000
--- a/pkgs/applications/office/basket/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, qimageblitz, kdepimlibs, gpgme
-}:
-
-stdenv.mkDerivation rec {
-  name = "basket-1.81";
-
-  src = fetchurl {
-    url = "http://basket.kde.org/downloads/${name}.tar.bz2";
-    sha256 = "10zxlgz96iwmqz30sw6f20pzjmnjvqhx7b5ihfwz47agyfdb98v0";
-  };
-
-  KDEDIRS = kdepimlibs;
-
-  buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    description = "A multi-purpose note-taking application";
-    homepage = http://basket.kde.org/;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 926ebc1d0dce..c822b66e08c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16701,8 +16701,6 @@ with pkgs;
           ffmpeg = ffmpeg_2;
         };
 
-        basket = callPackage ../applications/office/basket { };
-
         calligra = callPackage ../applications/office/calligra {
           vc = vc_0_7;
           oxygen_icons = kde5.oxygen-icons5;

From b4bdaeb38c1322cdbd9b3fce78686ba45247c3a1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:44:01 -0600
Subject: [PATCH 1061/3449] Remove kde4.choqok

- No maintainer in Nixpkgs
---
 .../instant-messengers/choqok/default.nix     | 26 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/choqok/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix
deleted file mode 100644
index a50779f53dd0..000000000000
--- a/pkgs/applications/networking/instant-messengers/choqok/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, pkgconfig, phonon, qca2, qjson, qoauth }:
-
-let
-  pn = "choqok";
-  v = "1.5";
-in
-
-stdenv.mkDerivation rec {
-  name = "${pn}-${v}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz";
-    sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4";
-  };
-
-  buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
-    automoc4 pkgconfig phonon qca2 qjson qoauth ];
-
-  meta = with stdenv.lib; {
-    description = "A KDE microblogging client";
-    repositories.git = git://anongit.kde.org/choqok;
-    license = "GPL";
-    inherit (kdelibs.meta) maintainers platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c822b66e08c8..91fe876f4d1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16706,8 +16706,6 @@ with pkgs;
           oxygen_icons = kde5.oxygen-icons5;
         };
 
-        choqok = callPackage ../applications/networking/instant-messengers/choqok { };
-
         k3b-original = lowPrio (callPackage ../applications/misc/k3b { });
 
         k3b = callPackage ../applications/misc/k3b/wrapper.nix { };

From 767787cb36469946a0099ce88858313d53d94459 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:47:45 -0600
Subject: [PATCH 1062/3449] Remove kde4.kbibtex

- No maintainer in Nixpkgs
---
 pkgs/applications/office/kbibtex/default.nix | 21 --------------------
 pkgs/top-level/all-packages.nix              |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/applications/office/kbibtex/default.nix

diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix
deleted file mode 100644
index a18ba50cabe2..000000000000
--- a/pkgs/applications/office/kbibtex/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, libxslt, poppler_qt4
-}:
-
-stdenv.mkDerivation rec {
-  pname = "kbibtex";
-  version = "0.4";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://download.gna.org/${pname}/${version}/${name}.tar.bz2";
-    sha256 = "1hq0az0dp96195z26wjfwj9ynd57pfv13f1xcl5vbsswcjfrczws";
-  };
-
-  patchPhase = ''
-    sed -e '25i#include <QModelIndex>' -i src/gui/preferences/settingsabstractwidget.h
-    '';
-
-  buildInputs = [ kdelibs libxslt poppler_qt4 ];
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91fe876f4d1c..8d3ad1ef3814 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16712,8 +16712,6 @@ with pkgs;
 
         kadu = callPackage ../applications/networking/instant-messengers/kadu { };
 
-        kbibtex = callPackage ../applications/office/kbibtex { };
-
         kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
 
         kdesvn = callPackage ../applications/version-management/kdesvn { };

From 9af7f6b9d4f1bd9cbf06999a9a063f2189f6c4ac Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:49:58 -0600
Subject: [PATCH 1063/3449] Remove kde4.kdenlive and dependencies

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/applications/video/kdenlive/default.nix | 41 --------------------
 pkgs/development/libraries/mlt/qt-4.nix      | 39 -------------------
 pkgs/top-level/all-packages.nix              |  7 ----
 3 files changed, 87 deletions(-)
 delete mode 100644 pkgs/applications/video/kdenlive/default.nix
 delete mode 100644 pkgs/development/libraries/mlt/qt-4.nix

diff --git a/pkgs/applications/video/kdenlive/default.nix b/pkgs/applications/video/kdenlive/default.nix
deleted file mode 100644
index 3da5180352c6..000000000000
--- a/pkgs/applications/video/kdenlive/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4
-, phonon , makeWrapper, mlt, gettext , qimageblitz, qjson
-, shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies
-, libv4l, oxygen_icons
-}:
-
-stdenv.mkDerivation rec {
-  name = "kdenlive-${version}";
-  version = "0.9.10";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
-    sha256 = "0qxpxnfbr8g6xq0h32skgqqi2xylrv2bnmyx5x1cws9y2wwxp3zn";
-  };
-
-  buildInputs = [
-    frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4
-    shared_desktop_ontologies soprano
-  ];
-
-  nativeBuildInputs = [
-    automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info
-  ];
-
-  propagatedUserEnvPkgs = [ oxygen_icons ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapProgram $out/bin/kdenlive --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
-    wrapProgram $out/bin/kdenlive_render  --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
-  '';
-
-  meta = {
-    description = "Free and open source video editor";
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://www.kdenlive.org/;
-    maintainers = with stdenv.lib.maintainers; [ goibhniu viric ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/development/libraries/mlt/qt-4.nix b/pkgs/development/libraries/mlt/qt-4.nix
deleted file mode 100644
index 2bb709612b44..000000000000
--- a/pkgs/development/libraries/mlt/qt-4.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate
-, libvorbis, libxml2, makeWrapper, movit, pkgconfig, qt, sox
-}:
-
-stdenv.mkDerivation rec {
-  name = "mlt-${version}";
-  version = "0.9.6";
-
-  src = fetchurl {
-    url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz";
-    sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh";
-  };
-
-  buildInputs = [
-    SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2
-    makeWrapper movit pkgconfig qt sox
-  ];
-
-  # Mostly taken from:
-  # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
-  configureFlags = [
-    "--avformat-swscale" "--enable-gpl" "--enable-gpl" "--enable-gpl3"
-    "--enable-opengl"
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapProgram $out/bin/melt --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Open source multimedia framework, designed for television broadcasting";
-    homepage = http://www.mltframework.org/;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.goibhniu ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d3ad1ef3814..e15f2dc37a02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8889,11 +8889,6 @@ with pkgs;
 
   mlt = callPackage ../development/libraries/mlt {};
 
-  mlt-qt4 = callPackage ../development/libraries/mlt/qt-4.nix {
-    ffmpeg = ffmpeg_2;
-    qt = qt4;
-  };
-
   mono-addins = callPackage ../development/libraries/mono-addins { };
 
   mono-zeroconf = callPackage ../development/libraries/mono-zeroconf { };
@@ -16712,8 +16707,6 @@ with pkgs;
 
         kadu = callPackage ../applications/networking/instant-messengers/kadu { };
 
-        kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
-
         kdesvn = callPackage ../applications/version-management/kdesvn { };
 
         kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };

From 1336b8dcc99b1882361867e69ab322dee5c1342c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 13:51:11 -0600
Subject: [PATCH 1064/3449] Remove kde4.kdesvn

- No upstream activity
---
 .../version-management/kdesvn/default.nix     | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/version-management/kdesvn/default.nix

diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix
deleted file mode 100644
index d4c67776b529..000000000000
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, apr, aprutil, subversion, db, kdelibs, expat
-}:
-
-# the homepage mentions this is the final release.
-# from now on, kdesvn will be part of the official kde software distribution
-stdenv.mkDerivation rec {
-  name = "kdesvn-1.6.0";
-
-  src = fetchurl rec {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/7e6adc98ff4777a06d5752d3f2b58fa3/${name}.tar.bz2";
-    sha256 = "15hg6xyx5rqldfhi1yhq5ss15y6crm2is3zqm680z0bndcj6ys05";
-  };
-
-  prePatch = ''
-    sed -i -e "s|/usr|${subversion.dev}|g" src/svnqt/cmakemodules/FindSubversion.cmake
-  '';
-
-  buildInputs = [ apr aprutil subversion db kdelibs expat ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    description = "KDE SVN front-end";
-    license = "GPL";
-    homepage = http://kdesvn.alwins-world.de;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e15f2dc37a02..797788166536 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16707,8 +16707,6 @@ with pkgs;
 
         kadu = callPackage ../applications/networking/instant-messengers/kadu { };
 
-        kdesvn = callPackage ../applications/version-management/kdesvn { };
-
         kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
 
         kile = callPackage ../applications/editors/kile { };

From 412b2b18599e11e69abd95375d0e7f62dc92f456 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:06:52 -0600
Subject: [PATCH 1065/3449] Remove kde4.kmymoney

- No maintainer in Nixpkgs
---
 pkgs/applications/office/kmymoney/default.nix | 34 -------------------
 .../applications/office/kmymoney/qgpgme.patch | 17 ----------
 .../office/kmymoney/seqaccessmgrtest.patch    | 26 --------------
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 79 deletions(-)
 delete mode 100644 pkgs/applications/office/kmymoney/default.nix
 delete mode 100644 pkgs/applications/office/kmymoney/qgpgme.patch
 delete mode 100644 pkgs/applications/office/kmymoney/seqaccessmgrtest.patch

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
deleted file mode 100644
index f375da175044..000000000000
--- a/pkgs/applications/office/kmymoney/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
-, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
-, doxygen, aqbanking, gwenhywfar }:
-
-stdenv.mkDerivation rec {
-  name = "kmymoney-${version}";
-  version = "4.8.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
-    sha256 = "1hlayhcmdfayma4hchv2bfyg82ry0h74hg4095d959mg19qkb9n2";
-  };
-
-  cmakeFlags = [
-    "-DENABLE_KBANKING='true'"
-  ];
-
-  buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
-                  doxygen aqbanking gwenhywfar ];
-  nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
-
-  KDEDIRS = libalkimia;
-
-  patches = [
-    ./qgpgme.patch
-    ./seqaccessmgrtest.patch
-  ];
-
-  meta = {
-    homepage = http://kmymoney2.sourceforge.net/;
-    description = "KDE personal money manager";
-    inherit (kdelibs.meta) platforms maintainers;
-  };
-}
diff --git a/pkgs/applications/office/kmymoney/qgpgme.patch b/pkgs/applications/office/kmymoney/qgpgme.patch
deleted file mode 100644
index 59ed37edaf8e..000000000000
--- a/pkgs/applications/office/kmymoney/qgpgme.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-KMymoney tries to find qgpgme before kdepimlibs. This is wrong because
-FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs
-found.
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f6d7305..88bac67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,8 +59,8 @@ else (WIN32)
-   find_package(Boost "1.33.1" COMPONENTS graph)
- endif (WIN32)
- # needed by libkgpgfile
--find_package(QGpgme REQUIRED)
- find_package(KdepimLibs REQUIRED)
-+find_package(QGpgme REQUIRED)
- find_package(SharedMimeInfo REQUIRED)
- 
- add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
diff --git a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch
deleted file mode 100644
index d01a433ba09a..000000000000
--- a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix tests for 32bit builds until we can bring these upstream
-diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-index dcb4b4a..e803203 100644
---- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-+++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor()
-   QCOMPARE(m->m_nextPayeeID, 0ul);
-   QCOMPARE(m->m_nextScheduleID, 0ul);
-   QCOMPARE(m->m_nextReportID, 0ul);
--  QCOMPARE(m->m_institutionList.count(), 0ul);
--  QCOMPARE(m->m_accountList.count(), 5ul);
--  QCOMPARE(m->m_transactionList.count(), 0ul);
--  QCOMPARE(m->m_transactionKeys.count(), 0ul);
--  QCOMPARE(m->m_payeeList.count(), 0ul);
--  QCOMPARE(m->m_tagList.count(), 0ul);
--  QCOMPARE(m->m_scheduleList.count(), 0ul);
-+  QCOMPARE(m->m_institutionList.count(), (size_t)0);
-+  QCOMPARE(m->m_accountList.count(), (size_t)5);
-+  QCOMPARE(m->m_transactionList.count(), (size_t)0);
-+  QCOMPARE(m->m_transactionKeys.count(), (size_t)0);
-+  QCOMPARE(m->m_payeeList.count(), (size_t)0);
-+  QCOMPARE(m->m_tagList.count(), (size_t)0);
-+  QCOMPARE(m->m_scheduleList.count(), (size_t)0);
- 
-   QCOMPARE(m->m_dirty, false);
-   QCOMPARE(m->m_creationDate, QDate::currentDate());
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 797788166536..7273ba75c509 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16713,8 +16713,6 @@ with pkgs;
 
         kmplayer = callPackage ../applications/video/kmplayer { };
 
-        kmymoney = callPackage ../applications/office/kmymoney { };
-
         kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
 
         ktikz = callPackage ../applications/graphics/ktikz { };

From f9a9d3d007086e059a44e49ce31ef6a375fc57f9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:08:26 -0600
Subject: [PATCH 1066/3449] Remove kde4.kipi_plugins

- Already updated to KDE 5 in Nixpkgs
---
 .../graphics/kipi-plugins/5.x.nix             | 34 ---------------
 .../graphics/kipi-plugins/default.nix         | 42 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  5 +--
 3 files changed, 25 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/applications/graphics/kipi-plugins/5.x.nix

diff --git a/pkgs/applications/graphics/kipi-plugins/5.x.nix b/pkgs/applications/graphics/kipi-plugins/5.x.nix
deleted file mode 100644
index 2f6cc8e4ece0..000000000000
--- a/pkgs/applications/graphics/kipi-plugins/5.x.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  stdenv, fetchurl,
-  ecm,
-  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
-  libkipi, qtbase, qtsvg, qtxmlpatterns
-}:
-
-stdenv.mkDerivation rec {
-  name    = "kipi-plugins-${version}";
-  version = "5.2.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
-    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
-  };
-
-  prePatch = ''
-    cd extra/kipi-plugins
-  '';
-
-  nativeBuildInputs = [ ecm ];
-  buildInputs = [
-    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
-    qtbase qtsvg qtxmlpatterns
-  ];
-
-  meta = {
-    description = "Plugins for KDE-based image applications";
-    license = stdenv.lib.licenses.gpl2;
-    homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index b69105fba7c8..2f6cc8e4ece0 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -1,30 +1,34 @@
-{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt
-, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig
-, cmake, automoc4
-, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics
-, libkipi ? kdegraphics, libksane ? kdegraphics }:
+{
+  stdenv, fetchurl,
+  ecm,
+  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+  libkipi, qtbase, qtsvg, qtxmlpatterns
+}:
 
 stdenv.mkDerivation rec {
-  name = "kipi-plugins-1.9.0";
+  name    = "kipi-plugins-${version}";
+  version = "5.2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
-    sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
+    url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
+    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
   };
 
-  buildInputs =
-    [ kdelibs libkexiv2 libkdcraw libkipi qimageblitz qca2 kdepimlibs libxml2
-      libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
-    ];
+  prePatch = ''
+    cd extra/kipi-plugins
+  '';
 
-  nativeBuildInputs = [ pkgconfig cmake automoc4 ];
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [
+    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+    qtbase qtsvg qtxmlpatterns
+  ];
 
   meta = {
-    description = "Photo Management Program";
-    license = "GPL";
-    homepage = http://www.kipi-plugins.org;
-    inherit (kdelibs.meta) platforms;
-    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
-    broken = true; # it should be built from digikam sources, perhaps together
+    description = "Plugins for KDE-based image applications";
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://www.digikam.org;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7273ba75c509..e776a41ee686 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14009,6 +14009,8 @@ with pkgs;
     ffmpeg = ffmpeg_2;
   };
 
+  kipi-plugins = kde5.callPackage ../applications/graphics/kipi-plugins {};
+
   kiwix = callPackage ../applications/misc/kiwix {
     stdenv = overrideCC stdenv gcc49;
   };
@@ -16713,8 +16715,6 @@ with pkgs;
 
         kmplayer = callPackage ../applications/video/kmplayer { };
 
-        kipi_plugins = callPackage ../applications/graphics/kipi-plugins { };
-
         ktikz = callPackage ../applications/graphics/ktikz { };
 
         kvirc = callPackage ../applications/networking/irc/kvirc { };
@@ -16789,7 +16789,6 @@ with pkgs;
           plasma = plasma self;
           frameworks = qt5.kdeFrameworks;
           applications = applications self;
-          kipi-plugins = self.callPackage ../applications/graphics/kipi-plugins/5.x.nix {};
         }
         // qt5.kdeFrameworks
         // plasma self

From 72263bdd748419b456d79ec2ff13c82feb8d3ea3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:13:16 -0600
Subject: [PATCH 1067/3449] Remove kde4.kvirc

- No maintainer in Nixpkgs
---
 .../networking/irc/kvirc/default.nix          | 24 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/applications/networking/irc/kvirc/default.nix

diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix
deleted file mode 100644
index f4b451e66e07..000000000000
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, openssl, zlib}:
-
-let
-  pn = "kvirc";
-  v = "4.2.0";
-in
-
-stdenv.mkDerivation {
-  name = "${pn}-${v}";
-
-  src = fetchurl {
-    url = "ftp://ftp.kvirc.de/pub/${pn}/${v}/source/${pn}-${v}.tar.bz2";
-    sha256 = "9a547d52d804e39c9635c8dc58bccaf4d34341ef16a9a652a5eb5568d4d762cb";
-  };
-
-  buildInputs = [ cmake qt4 perl gettext kdelibs openssl zlib ];
-
-  meta = with stdenv.lib; {
-    description = "Graphic IRC client with Qt";
-    license = licenses.gpl3;
-    homepage = http://www.kvirc.net/;
-    platforms   = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e776a41ee686..2eab7fc0bda0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16717,8 +16717,6 @@ with pkgs;
 
         ktikz = callPackage ../applications/graphics/ktikz { };
 
-        kvirc = callPackage ../applications/networking/irc/kvirc { };
-
         krusader = callPackage ../applications/misc/krusader { };
 
         kuickshow = callPackage ../applications/graphics/kuickshow { };

From 5dc57166349bd8c2160c153a4dc5e7f5c8734987 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:13:52 -0600
Subject: [PATCH 1068/3449] Remove kde4.kuickshow

- No maintainer in Nixpkgs
---
 pkgs/applications/graphics/kuickshow/default.nix | 14 --------------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 16 deletions(-)
 delete mode 100644 pkgs/applications/graphics/kuickshow/default.nix

diff --git a/pkgs/applications/graphics/kuickshow/default.nix b/pkgs/applications/graphics/kuickshow/default.nix
deleted file mode 100644
index cfecd19df46d..000000000000
--- a/pkgs/applications/graphics/kuickshow/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ stdenv, fetchurl, automoc4, kdelibs, imlib, cmake, pkgconfig, gettext }:
-
-stdenv.mkDerivation rec {
-  name = "kuickshow-0.9.1";
-
-  src = fetchurl {
-    url = "http://hosti.leonde.de/~gis/${name}.tar.bz2";
-    sha256 = "0l488a6p0ligbhv6p1lnx5k2d00x9bkkvms30winifa8rmisa9wl";
-  };
-
-  buildInputs = [ kdelibs imlib ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext pkgconfig ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2eab7fc0bda0..2b1e96e4330a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16719,8 +16719,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        kuickshow = callPackage ../applications/graphics/kuickshow { };
-
         libalkimia = callPackage ../development/libraries/libalkimia { };
 
         libktorrent = callPackage ../development/libraries/libktorrent {

From 33e62902a0ebc77302475fe93b9f89337c76b123 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:14:49 -0600
Subject: [PATCH 1069/3449] Remove kde4.libalkimia

- No longer used
---
 .../libraries/libalkimia/default.nix          | 19 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 21 deletions(-)
 delete mode 100644 pkgs/development/libraries/libalkimia/default.nix

diff --git a/pkgs/development/libraries/libalkimia/default.nix b/pkgs/development/libraries/libalkimia/default.nix
deleted file mode 100644
index bcb699da828f..000000000000
--- a/pkgs/development/libraries/libalkimia/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, gmpxx }:
-
-stdenv.mkDerivation rec {
-  name = "libalkimia-4.3.2";
-
-  src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/137323-${name}.tar.bz2";
-    sha256 = "1p7bzi6mz5ymsfsxikk8m1cvi35zirb4fps9axkqlm6mjbwrldv4";
-  };
-
-  patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt";
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-  buildInputs = [ kdelibs gmpxx ];
-
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b1e96e4330a..b8db8eb099d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16719,8 +16719,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        libalkimia = callPackage ../development/libraries/libalkimia { };
-
         libktorrent = callPackage ../development/libraries/libktorrent {
           boost = boost155;
         };

From 314a4de1eec4230b1581d7abc97dc6795c97d8b1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:15:30 -0600
Subject: [PATCH 1070/3449] Remove kde4.libktorrent

- Already updated to KDE 5 in Nixpkgs
---
 pkgs/development/libraries/libktorrent/5.nix  | 29 -----------------
 .../libraries/libktorrent/default.nix         | 31 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  6 +---
 3 files changed, 17 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/libraries/libktorrent/5.nix

diff --git a/pkgs/development/libraries/libktorrent/5.nix b/pkgs/development/libraries/libktorrent/5.nix
deleted file mode 100644
index e5406d3a2a58..000000000000
--- a/pkgs/development/libraries/libktorrent/5.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, cmake, ecm
-, karchive, kcrash, ki18n, kio, solid
-, boost, gmp, qca-qt5, libgcrypt
-}:
-
-stdenv.mkDerivation rec {
-  name = "libktorrent-2.0.1";
-
-  src = fetchurl {
-    url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz;
-    sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ cmake ecm ];
-  buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
-
-  propagatedBuildInputs = [ gmp boost ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "A BitTorrent library used by KTorrent";
-    homepage = https://www.kde.org/applications/internet/ktorrent/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index 9e7fb0a0b3d5..e5406d3a2a58 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -1,28 +1,29 @@
-{ stdenv, fetchurl, kdelibs, cmake, gmp, qca2, boost, gettext, qt4, automoc4
-, phonon, libgcrypt }:
+{ stdenv, fetchurl, cmake, ecm
+, karchive, kcrash, ki18n, kio, solid
+, boost, gmp, qca-qt5, libgcrypt
+}:
 
-let
-  mp_ = "3.1";
-  version = "1.${mp_}";
-  version4 = "4.${mp_}";
-in
 stdenv.mkDerivation rec {
-  name = pname + "-" + version;
-  pname = "libktorrent";
+  name = "libktorrent-2.0.1";
 
   src = fetchurl {
-    url = "${meta.homepage}/downloads/${version4}/${name}.tar.bz2";
-    sha256 = "2fe11ccb4bf2028c3da11e52cde890f1b3a90560e548eac89a4f8e1558b09725";
+    url = http://download.kde.org/stable/ktorrent/5.0/libktorrent-2.0.1.tar.xz;
+    sha256 = "0hiz4wm8jkymp24r6f1g8svj3pw9qspbjajf512m3j8s3bhrw3f7";
   };
 
-  nativeBuildInputs = [ cmake automoc4 gettext ];
-  buildInputs = [ kdelibs phonon gmp qca2 boost libgcrypt ];
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ cmake ecm ];
+  buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
+
+  propagatedBuildInputs = [ gmp boost ];
 
   enableParallelBuilding = true;
 
   meta = {
     description = "A BitTorrent library used by KTorrent";
-    homepage = http://ktorrent.pwsp.net;
-    inherit (kdelibs.meta) platforms;
+    homepage = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8db8eb099d8..d5689d255164 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9319,7 +9319,7 @@ with pkgs;
 
     libkeyfinder = callPackage ../development/libraries/libkeyfinder { };
 
-    libktorrent = callPackage ../development/libraries/libktorrent/5.nix { };
+    libktorrent = callPackage ../development/libraries/libktorrent { };
 
     mlt = callPackage ../development/libraries/mlt/qt-5.nix {
       ffmpeg = ffmpeg_2;
@@ -16719,10 +16719,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        libktorrent = callPackage ../development/libraries/libktorrent {
-          boost = boost155;
-        };
-
         libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
 
         liblikeback = callPackage ../development/libraries/liblikeback { };

From 82a5ddd4c321b3e621de0d961b1ea5565bff1542 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:18:00 -0600
Subject: [PATCH 1071/3449] Remove kde4.libkvkontakte

- No longer used
---
 .../libraries/libkvkontakte/default.nix       | 21 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/development/libraries/libkvkontakte/default.nix

diff --git a/pkgs/development/libraries/libkvkontakte/default.nix b/pkgs/development/libraries/libkvkontakte/default.nix
deleted file mode 100644
index e43116aebc19..000000000000
--- a/pkgs/development/libraries/libkvkontakte/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchgit, automoc4, cmake, pkgconfig, qjson, kdelibs }:
-
-stdenv.mkDerivation {
-  name = "libkvkontakte-1.0-pre20120103";
-
-  src = fetchgit {
-    url = git://anongit.kde.org/libkvkontakte;
-    rev = "4024f69cf54625dbe5dc2e2d811a996774a669ff";
-    sha256 = "1ly95bc72a4zjqhr03liciqpi2hp8x4gqzm4gzr8alfysv2jvxbb";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake pkgconfig ];
-  buildInputs = [ qjson kdelibs ];
-
-  meta = {
-    homepage = https://projects.kde.org/projects/extragear/libs/libkvkontakte;
-    description = "KDE library for interaction with vkontakte.ru social network via its open API";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5689d255164..37eab1e3b1d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16719,8 +16719,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
-
         liblikeback = callPackage ../development/libraries/liblikeback { };
 
         massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };

From 16d22f153637f552b203588477f545df0dd85ee2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:19:05 -0600
Subject: [PATCH 1072/3449] Remove kde4.liblikeback

- No longer used
---
 .../libraries/liblikeback/default.nix         | 20 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/liblikeback/default.nix

diff --git a/pkgs/development/libraries/liblikeback/default.nix b/pkgs/development/libraries/liblikeback/default.nix
deleted file mode 100644
index 46f389ec7ada..000000000000
--- a/pkgs/development/libraries/liblikeback/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchgit, cmake, kdelibs, automoc4 }:
-
-stdenv.mkDerivation rec {
-  name = "liblikeback-20110103";
-
-  src = fetchgit {
-    url = git://anongit.kde.org/liblikeback.git;
-    rev = "eeb037ae16b6aad8d73cbd6f57198aa111a88628";
-    sha256 = "1p3c8hqfcbhjfyn1kj636kq52nb3vapfakmqvp2wklpljyq38f3z";
-  };
-
-  buildInputs = [ cmake kdelibs automoc4 ];
-
-  meta = {
-    description = "Simple feedback button/dialog for KDE 4.x applications";
-    homepage = https://projects.kde.org/projects/playground/libs/liblikeback;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37eab1e3b1d4..b48e53abcad9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16719,8 +16719,6 @@ with pkgs;
 
         krusader = callPackage ../applications/misc/krusader { };
 
-        liblikeback = callPackage ../development/libraries/liblikeback { };
-
         massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
 
         partitionManager = callPackage ../tools/misc/partition-manager { };

From c5227f93f36b6852e287ba4a2c6d7d3b8d38ffed Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:23:58 -0600
Subject: [PATCH 1073/3449] Remove kde4.partition-manager

- No maintainer in Nixpkgs
- No upstream activity
- Original source unavailable
---
 pkgs/tools/misc/partition-manager/default.nix | 39 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 41 deletions(-)
 delete mode 100644 pkgs/tools/misc/partition-manager/default.nix

diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
deleted file mode 100644
index 156f03dad876..000000000000
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cmake, gettext, automoc4, perl
-, parted, libuuid, qt4, kdelibs, kde_baseapps, phonon, libatasmart
-}:
-
-stdenv.mkDerivation rec {
-  name = "partitionmanager-1.0.3_p20120804";
-
-  src = fetchurl {
-    #url = "mirror://sourceforge/partitionman/${name}.tar.bz2";
-    # the upstream version is old and doesn't build
-    url = "http://dev.gentoo.org/~kensington/distfiles/${name}.tar.bz2";
-    sha256 = "1j6zpgj8xs98alzxvcibwch9yj8jsx0s7y864gbdx280jmj8c1np";
-  };
-
-  buildInputs = [
-    pkgconfig cmake gettext automoc4 perl
-    parted libuuid qt4 kdelibs kde_baseapps phonon libatasmart
-  ];
-
-  preConfigure = ''
-    export VERBOSE=1
-    cmakeFlagsArray=($cmakeFlagsArray -DGETTEXT_INCLUDE_DIR=${gettext}/include -DCMAKE_INCLUDE_PATH=${qt4}/include/QtGui )
-  '';
-
-  postInstall = ''
-    set -x
-    rpath=`patchelf --print-rpath $out/bin/partitionmanager-bin`:${qt4}/lib
-    for p in $out/bin/partitionmanager-bin; do
-      patchelf --set-rpath $rpath $p
-    done
-  '';
-
-  meta = {
-    description = "Utility program to help you manage the disk devices";
-    homepage = http://www.kde-apps.org/content/show.php/KDE+Partition+Manager?content=89595; # ?
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b48e53abcad9..ebb2e9b81d18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16721,8 +16721,6 @@ with pkgs;
 
         massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
 
-        partitionManager = callPackage ../tools/misc/partition-manager { };
-
         psi = callPackage ../applications/networking/instant-messengers/psi { };
 
         semnotes = callPackage ../applications/misc/semnotes { };

From 41d8b3646111784040537f330f303ec9969bcd7d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:25:40 -0600
Subject: [PATCH 1074/3449] Remove kde4.psi

- No activity upstream
- Known vulnerabilities
---
 .../instant-messengers/psi/default.nix        | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/psi/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
deleted file mode 100644
index 7fabfa5f7722..000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM
-, libICE, qca2, pkgconfig, callPackage, which, glib
-, libXScrnSaver, scrnsaverproto
-}:
-
-stdenv.mkDerivation rec {
-  name = "psi-0.15";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/psi/${name}.tar.bz2";
-    sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6";
-  };
-
-  buildInputs =
-    [ enchant qt4 zlib sox libX11 xproto libSM libICE
-      qca2 pkgconfig which glib scrnsaverproto libXScrnSaver
-    ];
-
-  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
-
-  NIX_LDFLAGS="-lqca";
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Psi, an XMPP (Jabber) client";
-    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 ebb2e9b81d18..b467f95b58d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16721,8 +16721,6 @@ with pkgs;
 
         massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
 
-        psi = callPackage ../applications/networking/instant-messengers/psi { };
-
         semnotes = callPackage ../applications/misc/semnotes { };
 
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};

From 7b17c83cbedcd53daa2aace5cd0d184adf364260 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:26:57 -0600
Subject: [PATCH 1075/3449] Remove kde4.semnotes

- No activity upstream
---
 pkgs/applications/misc/semnotes/default.nix | 26 ---------------------
 pkgs/top-level/all-packages.nix             |  2 --
 2 files changed, 28 deletions(-)
 delete mode 100644 pkgs/applications/misc/semnotes/default.nix

diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix
deleted file mode 100644
index 52a575130c0e..000000000000
--- a/pkgs/applications/misc/semnotes/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, kdelibs, soprano, automoc4, phonon, shared_desktop_ontologies }:
-stdenv.mkDerivation {
-  name = "semnotes-0.4.0-1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
-    sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m";
-  };
-
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies ];
-
-  meta = with stdenv.lib; {
-    description = "Semantic note-taking tool for KDE based on Nepomuk-KDE";
-    longDescription = ''
-      SemNotes links notes to the data that is available on the user's desktop.
-      The data stored about a note consists of: a title, content, tags, creation
-      and last modification time. The notes and all the information about them
-      are stored as RDF resources in the Nepomuk repository. They are
-      automatically linked to the resources they reference.
-    '';
-    license = "GPL";
-    homepage = http://smile.deri.ie/projects/semn;
-    maintainers = [ maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b467f95b58d1..99b4176596b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16721,8 +16721,6 @@ with pkgs;
 
         massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
 
-        semnotes = callPackage ../applications/misc/semnotes { };
-
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
         zanshin = callPackage ../applications/office/zanshin { };

From b4ba042924ca1ac14ac694c12d182f29efdc3aa9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 14:59:45 -0600
Subject: [PATCH 1076/3449] qt4: Don't pass top-level attribute through kde4

---
 pkgs/applications/audio/jackmix/default.nix           | 10 +++++-----
 pkgs/applications/science/robotics/gazebo/default.nix |  4 ++--
 pkgs/desktops/kde-4.14/default.nix                    |  2 --
 pkgs/top-level/all-packages.nix                       |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix
index 8176a3404702..e9e3fd53e546 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }:
+{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }:
 
 stdenv.mkDerivation rec {
   name = "jackmix-0.5.2";
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgs.pkgconfig
-    pkgs.scons
-    pkgs.kde4.qt4
-    pkgs.lash
+    pkgconfig
+    scons
+    qt4
+    lash
     jack
   ];
 
diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix
index e8b3bcb16a26..6cefb156d1df 100644
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@@ -5,7 +5,7 @@
   , pythonPackages, utillinux
 
   # these deps are hidden; cmake doesn't catch them
-  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, kde4, x11
+  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11
   , withIgnitionTransport ? true
   , libav, withLibAvSupport ? true
   , openal, withAudioSupport ? false
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     curl
     tinyxml
     x11
-    kde4.qt4
+    qt4
   ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
     ++ optional withDocs doxygen
     ++ optional withLibAvSupport libav  #TODO: package rubygem-ronn and put it here
diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix
index d65f38b8cd11..9c730ef39cf7 100644
--- a/pkgs/desktops/kde-4.14/default.nix
+++ b/pkgs/desktops/kde-4.14/default.nix
@@ -29,8 +29,6 @@ kde.modules // kde.individual //
 
   akonadi = callPackage ./support/akonadi { };
 
-  qt4 = qt48;
-
   inherit release;
 
   l10n = callPackage ./l10n {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99b4176596b0..6c4221a51509 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9242,7 +9242,7 @@ with pkgs;
     libpng = libpng12;
   };
 
-  qt4 = pkgs.kde4.qt4;
+  qt4 = qt48;
 
   qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
     # GNOME dependencies are not used unless gtkStyle == true

From e02de9e0176a6f550ba861598c2c2a0628f14c65 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 18 Feb 2017 18:15:43 -0600
Subject: [PATCH 1077/3449] kde4: Remove kdewrapper

- Not useful without the KDE 4 desktop
---
 pkgs/build-support/kdewrapper/default.nix | 44 -----------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 pkgs/build-support/kdewrapper/default.nix

diff --git a/pkgs/build-support/kdewrapper/default.nix b/pkgs/build-support/kdewrapper/default.nix
deleted file mode 100644
index 64dfd7d0ca6b..000000000000
--- a/pkgs/build-support/kdewrapper/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, kde4, shared_mime_info, extraLibs ? [] }:
-
-/* Supply a KDE program, and it will have the necessary KDE vars to
-  get icons, mime types, etc. working.
-  For example:
-  
-  packageOverrides = pkgs : {
-    kdenliveWrapped = kde4.wrapper kde4.kdenlive;
-  };
-  */
-program:
-
-let
-  libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ]
-    ++ extraLibs;
-in
-stdenv.mkDerivation {
-  name = program.name + "-wrapped";
-
-  inherit libs;
-
-  buildCommand = ''
-    mkdir -p $out/bin
-
-    KDEDIRS=${program}
-    QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins
-    for a in $libs; do
-      KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS
-      QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
-    done
-    for a in ${program}/bin/*; do 
-      PROG=$out/bin/`basename $a` 
-    cat > $PROG << END
-    #!/bin/sh
-    export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
-    export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
-    exec $a "\$@"
-    END
-    chmod +x $PROG
-    done
-  '';
-
-  preferLocalBuild = true;
-}

From 0f5dbc3854974c8a89b1f6f86d357781e5d99bca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 20 Feb 2017 08:34:25 -0600
Subject: [PATCH 1078/3449] Revert "Remove kde4.psi"

This reverts commit c2fcc909cb42d9aaa456d211f9c68cc24f4ef804.

- Upstream development is ongoing; we will keep psi for now to preserve
  continuity.
---
 .../instant-messengers/psi/default.nix        | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/psi/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
new file mode 100644
index 000000000000..7fabfa5f7722
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM
+, libICE, qca2, pkgconfig, callPackage, which, glib
+, libXScrnSaver, scrnsaverproto
+}:
+
+stdenv.mkDerivation rec {
+  name = "psi-0.15";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/psi/${name}.tar.bz2";
+    sha256 = "593b5ddd7934af69c245afb0e7290047fd7dedcfd8765baca5a3a024c569c7e6";
+  };
+
+  buildInputs =
+    [ enchant qt4 zlib sox libX11 xproto libSM libICE
+      qca2 pkgconfig which glib scrnsaverproto libXScrnSaver
+    ];
+
+  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
+
+  NIX_LDFLAGS="-lqca";
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Psi, an XMPP (Jabber) client";
+    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 6c4221a51509..4959cc0b53e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16720,6 +16720,7 @@ with pkgs;
         krusader = callPackage ../applications/misc/krusader { };
 
         massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
+        psi = callPackage ../applications/networking/instant-messengers/psi { };
 
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 

From ea6355f2c5054543b7eb9d6981101579f3ac60f9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Feb 2017 17:14:06 -0600
Subject: [PATCH 1079/3449] cantata: Remove KDE 4 support

It was permanently disabled anyway.
---
 pkgs/applications/audio/cantata/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index f4e1fe8b151c..89aadf49fb84 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -2,10 +2,6 @@
 , withQt4 ? false, qt4
 , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
 
-# I'm unable to make KDE work here, crashes at runtime so I simply
-# make Qt4 the default until someone who wants KDE can figure it out.
-, withKDE4 ? false, kde4
-
 # Cantata doesn't build with cdparanoia enabled so we disable that
 # default for now until I (or someone else) figure it out.
 , withCdda ? false, cdparanoia
@@ -24,10 +20,9 @@
 }:
 
 # One and only one front-end.
-assert withQt5 -> withQt4 == false && withKDE4 == false;
-assert withQt4 -> withQt5 == false && withKDE4 == false;
-assert withKDE4 -> withQt4 == false && withQt5 == false;
-assert withQt4 || withQt5 || withKDE4;
+assert withQt5 -> withQt4 == false;
+assert withQt4 -> withQt5 == false;
+assert withQt4 || withQt5;
 
 # Inter-dependencies.
 assert withCddb -> withCdda && withTaglib;
@@ -58,7 +53,6 @@ stdenv.mkDerivation rec {
     [ cmake ]
     ++ stdenv.lib.optional withQt4 qt4
     ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
-    ++ stdenv.lib.optional withKDE4 kde4.kdelibs
     ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
     ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
     ++ stdenv.lib.optional withCdda cdparanoia
@@ -66,16 +60,14 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional withLame lame
     ++ stdenv.lib.optional withMtp libmtp
     ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
-    ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
+    ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
 
   nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
 
   unpackPhase = "tar -xvf $src";
   sourceRoot = "${name}";
 
-  # Qt4 is implicit when KDE is switched off.
   cmakeFlags = stdenv.lib.flatten [
-    (fstats withKDE4 [ "KDE" "KWALLET" ])
     (fstat withQt5 "QT5")
     (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
     (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])

From f28848cb4ddad85e82b5ad4e53e6b5a7da24600c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Feb 2017 17:16:28 -0600
Subject: [PATCH 1080/3449] kde4.kdelibs -> kdelibs4

Our kdelibs4 package does not come from KDE 4, so per upstream's request I am
moving it out of the kde4 set.
---
 pkgs/applications/audio/amarok/default.nix          |  6 +++---
 pkgs/applications/audio/tomahawk/default.nix        |  6 +++---
 pkgs/applications/graphics/kgraphviewer/default.nix |  4 ++--
 pkgs/applications/misc/dfilemanager/default.nix     |  2 +-
 pkgs/applications/misc/k3b/default.nix              |  4 ++--
 pkgs/applications/misc/kgocode/default.nix          |  4 ++--
 pkgs/applications/misc/krusader/default.nix         |  6 +++---
 .../instant-messengers/telepathy/kde/default.nix    |  6 +++---
 pkgs/applications/office/calligra/default.nix       |  6 +++---
 pkgs/applications/office/libreoffice/default.nix    |  4 ++--
 pkgs/applications/office/libreoffice/still.nix      |  4 ++--
 pkgs/applications/office/zanshin/default.nix        |  6 +++---
 pkgs/applications/video/kmplayer/default.nix        |  4 ++--
 pkgs/desktops/kde-4.14/default.nix                  |  2 --
 .../tools/analysis/massif-visualizer/default.nix    |  4 ++--
 pkgs/tools/inputmethods/uim/default.nix             |  4 ++--
 pkgs/top-level/all-packages.nix                     | 13 +++++--------
 17 files changed, 40 insertions(+), 45 deletions(-)

diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index af796f7490a8..3b675cd9020b 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
 , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
-, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod
+, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod
 , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
 , lz4, lzo, snappy, libaio, pcre
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
-    taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
+    taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2
     libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
     lz4 lzo snappy libaio pcre
   ];
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     description = "Popular music player for KDE";
     license = "GPL";
     homepage = http://amarok.kde.org;
-    inherit (kdelibs.meta) platforms maintainers;
+    inherit (kdelibs4.meta) platforms;
   };
 }
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 7021cd165cfd..ca9f514eace1 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -3,12 +3,12 @@
 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper
 
 , enableXMPP      ? true,  libjreen     ? null
-, enableKDE       ? false, kdelibs      ? null
+, enableKDE       ? false, kdelibs4     ? null
 , enableTelepathy ? false, telepathy_qt ? null
 }:
 
 assert enableXMPP      -> libjreen     != null;
-assert enableKDE       -> kdelibs      != null;
+assert enableKDE       -> kdelibs4     != null;
 assert enableTelepathy -> telepathy_qt != null;
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
     makeWrapper
   ] ++ stdenv.lib.optional enableXMPP      libjreen
-    ++ stdenv.lib.optional enableKDE       kdelibs
+    ++ stdenv.lib.optional enableKDE       kdelibs4
     ++ stdenv.lib.optional enableTelepathy telepathy_qt;
 
   postInstall = let
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index 6eb57c3dd5f1..ea0fe51cc85a 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, boost, graphviz
+, kdelibs4, boost, graphviz
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
   };
 
-  buildInputs = [ kdelibs boost graphviz ];
+  buildInputs = [ kdelibs4 boost graphviz ];
   nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index ce35593d91d1..907c9d612b85 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://dfilemanager.sourceforge.net/";
-    description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling";
+    description = "File manager written in Qt/C++";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.eduarrrd ];
diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix
index e8f87e4d290d..bda647659416 100644
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
 , shared_mime_info, libvorbis, taglib, flac, libsamplerate
 , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
-, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg
+, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg
 , libkcddb, phonon
 }:
 
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     shared_mime_info libvorbis taglib flac libsamplerate libdvdread
-    lame libsndfile libmad stdenv.cc.libc kdelibs
+    lame libsndfile libmad stdenv.cc.libc kdelibs4
     phonon libkcddb makeWrapper cdparanoia
     libdvdcss ffmpeg
   ];
diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
index 3088b5b3c653..b12c9fe25510 100644
--- a/pkgs/applications/misc/kgocode/default.nix
+++ b/pkgs/applications/misc/kgocode/default.nix
@@ -1,9 +1,9 @@
-{ fetchgit, stdenv, cmake, kdelibs, automoc4 } :
+{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } :
 
 stdenv.mkDerivation rec {
   name = "kgocode-0.0.1";
 
-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs4 automoc4 ];
 
   src = fetchgit {
     url = https://bitbucket.org/lucashnegri/kgocode.git;
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index 2a9c6305d42e..75b2da6e8a25 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kde_baseapps
+, kdelibs4, kde_baseapps
 }:
 
 stdenv.mkDerivation rec {
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     url = "mirror://sourceforge/krusader/${name}.tar.bz2";
     sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
   };
-  buildInputs = [ kdelibs kde_baseapps ];
+  buildInputs = [ kdelibs4 kde_baseapps ];
   nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
   NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
   meta = {
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     license = "GPL";
     homepage = http://www.krusader.org;
     maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index 84ced8f62c6e..c79f939dc73c 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
-, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream
+, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
 , qt_gstreamer1, telepathy_glib, telepathy_logger
 , qjson, flex, bison, qca2 }:
 
@@ -48,12 +48,12 @@ let
         nativeBuildInputs =
           [ automoc4 cmake gettext perl pkgconfig ]
           ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
-        buildInputs = [ kdelibs telepathy_qt ]
+        buildInputs = [ kdelibs4 telepathy_qt ]
           ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
           ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);
 
         meta = {
-          inherit (kdelibs.meta) platforms;
+          inherit (kdelibs4.meta) platforms;
           maintainers = [ stdenv.lib.maintainers.urkud ];
         };
       }
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 99107787493f..ad9cb9e5ff01 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
 , exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
 , libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
 , freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
 
   buildInputs = [
-    kdelibs lcms2 libpng eigen
+    kdelibs4 lcms2 libpng eigen
     exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
     libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
     freetds fftw glew libkdcraw opencolorio kdepimlibs
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://calligra.org;
     maintainers = with maintainers; [ urkud phreedom ebzzry ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 989cf17e2761..f583660c6232 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
@@ -252,7 +252,7 @@ in stdenv.mkDerivation rec {
       libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
       gdb
     ]
-    ++ lib.optional kdeIntegration kde4.kdelibs;
+    ++ lib.optional kdeIntegration kdelibs4;
 
   passthru = {
     inherit srcs;
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 26bb53c9b389..329b292da27c 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
@@ -247,7 +247,7 @@ in stdenv.mkDerivation rec {
       librevenge libe-book libmwaw glm glew ncurses
       libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
     ]
-    ++ lib.optional kdeIntegration kde4.kdelibs;
+    ++ lib.optional kdeIntegration kdelibs4;
 
   passthru = {
     inherit srcs;
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
index a16ab1baef4e..71f38bb8d3cc 100644
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, kdepimlibs, boost, baloo }:
+, kdelibs4, kdepimlibs, boost, baloo }:
 
 stdenv.mkDerivation rec {
   name = "zanshin-0.3.1";
@@ -11,11 +11,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
 
-  buildInputs = [ kdelibs kdepimlibs boost baloo ];
+  buildInputs = [ kdelibs4 kdepimlibs boost baloo ];
 
   meta = {
     description = "GTD for KDE";
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix
index cbd0347078ef..59b9893ded14 100644
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
-, kdelibs, cairo, dbus_glib, mplayer
+, kdelibs4, cairo, dbus_glib, mplayer
 }:
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
   };
 
-  buildInputs = [ kdelibs cairo dbus_glib ];
+  buildInputs = [ kdelibs4 cairo dbus_glib ];
 
   nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix
index 9c730ef39cf7..02cd509537d1 100644
--- a/pkgs/desktops/kde-4.14/default.nix
+++ b/pkgs/desktops/kde-4.14/default.nix
@@ -25,8 +25,6 @@ in
 
 kde.modules // kde.individual //
 {
-  inherit kdelibs;
-
   akonadi = callPackage ./support/akonadi { };
 
   inherit release;
diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
index 7342b866a48f..79c826c08fef 100644
--- a/pkgs/development/tools/analysis/massif-visualizer/default.nix
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kgraphviewer }:
+, kdelibs4, kgraphviewer }:
 
 stdenv.mkDerivation rec {
   name = "massif-visualizer-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-  buildInputs = [ kdelibs kgraphviewer ];
+  buildInputs = [ kdelibs4 kgraphviewer ];
 
   meta = with stdenv.lib; {
     description = "Tool that visualizes massif data generated by valgrind";
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 4cab54d0b706..9af5de0476a7 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, ncurses,
+{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs4, ncurses,
  cmake, anthy, automoc4, m17n_lib, m17n_db}:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     qt4
     gtk2
     gtk3
-    kdelibs
+    kdelibs4
     ncurses
     cmake
     anthy
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4959cc0b53e6..a0248cfe9f9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7829,6 +7829,8 @@ with pkgs;
 
   judy = callPackage ../development/libraries/judy { };
 
+  kdelibs4 = kde5.applications.kdelibs;
+
   keybinder = callPackage ../development/libraries/keybinder {
     automake = automake111x;
     lua = lua5_1;
@@ -11697,9 +11699,7 @@ with pkgs;
 
   gocode = callPackage ../development/tools/gocode { };
 
-  kgocode = callPackage ../applications/misc/kgocode {
-    inherit (pkgs.kde4) kdelibs;
-  };
+  kgocode = callPackage ../applications/misc/kgocode { };
 
   gotags = callPackage ../development/tools/gotags { };
 
@@ -14002,7 +14002,7 @@ with pkgs;
     qt = qt4;
   };
 
-  kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { };
+  kile = kde5.callPackage ../applications/editors/kile { };
 
   kino = callPackage ../applications/video/kino {
     inherit (gnome2) libglade;
@@ -15373,7 +15373,6 @@ with pkgs;
   todo-txt-cli = callPackage ../applications/office/todo.txt-cli { };
 
   tomahawk = callPackage ../applications/audio/tomahawk {
-    inherit (pkgs.kde4) kdelibs;
     taglib = taglib_1_9;
     enableXMPP      = config.tomahawk.enableXMPP      or true;
     enableKDE       = config.tomahawk.enableKDE       or false;
@@ -16675,7 +16674,7 @@ with pkgs;
         libusb = libusb1;
         python2Packages = python2Packages;
         inherit (python2Packages) python;
-        kdelibs = kde5.kdelibs;
+        kdelibs = kdelibs4;
         boost = boost155;
         subversionClient = subversion18.override {
           bdbSupport = false;
@@ -16711,8 +16710,6 @@ with pkgs;
 
         kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
 
-        kile = callPackage ../applications/editors/kile { };
-
         kmplayer = callPackage ../applications/video/kmplayer { };
 
         ktikz = callPackage ../applications/graphics/ktikz { };

From 682ae7e893ddad1ec7cad3cd1ff8077244380007 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Feb 2017 17:18:39 -0600
Subject: [PATCH 1081/3449] kde4: Remove unused pinned dependencies

---
 pkgs/top-level/all-packages.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a0248cfe9f9c..ff7d7995bb18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16671,17 +16671,9 @@ with pkgs;
   kde4 =
     let
       deps = lib.makeScope newScope (self: {
-        libusb = libusb1;
-        python2Packages = python2Packages;
         inherit (python2Packages) python;
         kdelibs = kdelibs4;
         boost = boost155;
-        subversionClient = subversion18.override {
-          bdbSupport = false;
-          perlBindings = true;
-          pythonBindings = true;
-        };
-        ruby = ruby_2_2; # see https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473
         ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise
       });
 

From 6a51739f59e58a4dbcd1b2bb5f72149f73e9e912 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Feb 2017 17:28:02 -0600
Subject: [PATCH 1082/3449] kde4: Move packages not part of KDE 4

To comply with upstream's request, only packages released as part of KDE 4 will
be in the kde4 set.
---
 pkgs/top-level/all-packages.nix | 71 +++++++++++++++------------------
 1 file changed, 32 insertions(+), 39 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff7d7995bb18..d1eb612123a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3508,8 +3508,6 @@ with pkgs;
 
   ps3netsrv = callPackage ../servers/ps3netsrv { };
 
-  psi = callPackage ../applications/networking/instant-messengers/psi { };
-
   psmisc = callPackage ../os-specific/linux/psmisc { };
 
   pssh = callPackage ../tools/networking/pssh { };
@@ -6543,6 +6541,8 @@ with pkgs;
 
   lttv = callPackage ../development/tools/misc/lttv { };
 
+  massif-visualizer = kde4.callPackage ../development/tools/analysis/massif-visualizer { };
+
   maven = maven3;
   maven3 = callPackage ../development/tools/build-managers/apache-maven { };
 
@@ -12519,6 +12519,10 @@ with pkgs;
     tcl = tcl-8_5;
   };
 
+  amarok = kde4.callPackage ../applications/audio/amarok {
+    ffmpeg = ffmpeg_2;
+  };
+
   AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
 
   ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
@@ -12728,6 +12732,11 @@ with pkgs;
 
   calibre = qt5.callPackage ../applications/misc/calibre { };
 
+  calligra = kde4.callPackage ../applications/office/calligra {
+    vc = vc_0_7;
+    oxygen_icons = kde5.oxygen-icons5;
+  };
+
   camlistore = callPackage ../applications/misc/camlistore { };
 
   canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { };
@@ -13970,8 +13979,16 @@ with pkgs;
     boost = boost155;
   };
 
+  k3b-original = lowPrio (kde4.callPackage ../applications/misc/k3b { });
+
+  k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { };
+
   k9copy = qt5.callPackage ../applications/video/k9copy {};
 
+  kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { };
+
+  kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
+
   kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { };
 
   kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {};
@@ -13994,6 +14011,8 @@ with pkgs;
 
   keymon = callPackage ../applications/video/key-mon { };
 
+  kgraphviewer = kde4.callPackage ../applications/graphics/kgraphviewer { };
+
   khal = callPackage ../applications/misc/khal { };
 
   khard = callPackage ../applications/misc/khard { };
@@ -14015,6 +14034,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
+  kmplayer = kde4.callPackage ../applications/video/kmplayer { };
+
   konversation = qt5.callPackage ../applications/networking/irc/konversation { };
 
   krita = qt5.callPackage ../applications/graphics/krita {
@@ -14022,6 +14043,8 @@ with pkgs;
     openjpeg = openjpeg_1;
   };
 
+  krusader = kde4.callPackage ../applications/misc/krusader { };
+
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 
   ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent { };
@@ -14771,6 +14794,8 @@ with pkgs;
     autoAwaySupport = config.profanity.autoAwaySupport or true;
   };
 
+  psi = kde4.callPackage ../applications/networking/instant-messengers/psi { };
+
   psol = callPackage ../development/libraries/psol/default.nix { };
 
   pstree = callPackage ../applications/misc/pstree { };
@@ -15981,6 +16006,8 @@ with pkgs;
 
   zam-plugins = callPackage ../applications/audio/zam-plugins { };
 
+  zanshin = kde4.callPackage ../applications/office/zanshin { };
+
   zathura = callPackage ../applications/misc/zathura {
     useMupdf = config.zathura.useMupdf or true;
   };
@@ -16678,45 +16705,11 @@ with pkgs;
       });
 
       self = lib.makeScope deps.newScope (self: with self;
-        (deps.callPackage ../desktops/kde-4.14 {
+        deps.callPackage ../desktops/kde-4.14 {
           callPackageOrig = pkgs.callPackage;
           inherit (self) callPackage;
-        }) // {
-
-        libcanberra = libcanberra_kde;
-
-        amarok = callPackage ../applications/audio/amarok {
-          ffmpeg = ffmpeg_2;
-        };
-
-        calligra = callPackage ../applications/office/calligra {
-          vc = vc_0_7;
-          oxygen_icons = kde5.oxygen-icons5;
-        };
-
-        k3b-original = lowPrio (callPackage ../applications/misc/k3b { });
-
-        k3b = callPackage ../applications/misc/k3b/wrapper.nix { };
-
-        kadu = callPackage ../applications/networking/instant-messengers/kadu { };
-
-        kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
-
-        kmplayer = callPackage ../applications/video/kmplayer { };
-
-        ktikz = callPackage ../applications/graphics/ktikz { };
-
-        krusader = callPackage ../applications/misc/krusader { };
-
-        massif-visualizer = callPackage ../development/tools/analysis/massif-visualizer { };
-        psi = callPackage ../applications/networking/instant-messengers/psi { };
-
-        telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
-
-        zanshin = callPackage ../applications/office/zanshin { };
-
-      });
-
+        }
+      );
     in recurseIntoAttrs self;
 
   lumina = callPackage ../desktops/lumina { };

From fbf12d9f702bc3d994af9de8eb4ded99e55ea75e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 24 Feb 2017 17:30:39 -0600
Subject: [PATCH 1083/3449] kde4: Don't use callPackage on something that isn't
 a package

---
 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 d1eb612123a6..78d71cc3dfaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16705,9 +16705,10 @@ with pkgs;
       });
 
       self = lib.makeScope deps.newScope (self: with self;
-        deps.callPackage ../desktops/kde-4.14 {
+        import ../desktops/kde-4.14 {
           callPackageOrig = pkgs.callPackage;
           inherit (self) callPackage;
+          inherit stdenv qt48 kdelibs;
         }
       );
     in recurseIntoAttrs self;

From b65cc5c59ed39338d764e00e13a79a953a85004a Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Sat, 25 Feb 2017 00:35:59 +0100
Subject: [PATCH 1084/3449] kde5: add hack font dependency (fix #22975)

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 1b44b9e42c81..12408abd20ad 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -209,7 +209,10 @@ in
             then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
             else { });
 
-      fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
+      fonts.fonts = [
+        (kde5.oxygen-fonts or pkgs.noto-fonts)
+        pkgs.hack-font
+      ];
 
       programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
 

From 447ba918588604d2a5da9e4f1573e89df086a747 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 25 Feb 2017 01:40:02 +0100
Subject: [PATCH 1085/3449] rnv: fix missing `rec` (#23162)

---
 pkgs/tools/text/xml/rnv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix
index 97dbd6029686..fef8b9db2ffd 100644
--- a/pkgs/tools/text/xml/rnv/default.nix
+++ b/pkgs/tools/text/xml/rnv/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, expat }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "rnv-${version}";
   version = "1.7.11";
 

From 19e65c4c46d1464488fe1fab6265803ba279d5d5 Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Wed, 22 Feb 2017 21:39:29 +0800
Subject: [PATCH 1086/3449] crystal: 0.20.5 -> 0.21.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 6202a8e968b3..b8cbceb97678 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.20.5";
+  version = "0.21.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" = "fd077c0a727419e131b1be6198a5aa5820ecbdaafd2d2bb38be5716ba75b5100";
-        "i686-linux" = "e3a890f11833c57c9004655d108f981c7c630cd7a939f828d9a6c571705bc3e7";
-        "x86_64-darwin" = "79462c8ff994b36cff219c356967844a17e8cb2817bb24a196a960a08b8c9e47";
+        "x86_64-linux" = "0a44539df3813baea4381c314ad5f782b13cf1596e478851c52cd84193cc7a1f";
+        "i686-linux" = "9a45287f94d329f5ebe77f5a0d71cd0e09c3db79b0b56f6fe4a5166beed707ef";
+        "x86_64-darwin" = "e92abb33a9a592febb4e629ad68375b2577acd791a71220b8dc407904be469ee";
       }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   };
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "ee1e5948c6e662ccb1e62671cf2c91458775b559b23d74ab226dc2a2d23f7707";
+    sha256 = "4dd01703f5304a0eda7f02fc362fba27ba069666097c0f921f8a3ee58808779c";
   };
 
   # crystal on Darwin needs libiconv to build

From e4d8cb8dabb0b7ec7b5f785a5cebd34909df0603 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 27 Jul 2016 21:37:39 +0800
Subject: [PATCH 1087/3449] iio-sensor-proxy: init at 2.2 and nixos module

This PR adds support for ```iio-sensor-proxy``` used by GNOME v3 and
others for reading data from the accelerometer, gps, compass and similar sensors
built into some relatively recent laptops.

Additionally, there is a NixOS module exposed via hardware.sensor.iio
for enabling services, udev rules and dbus services.
---
 nixos/modules/hardware/sensor/iio.nix         | 30 ++++++++++++
 nixos/modules/module-list.nix                 |  1 +
 .../linux/iio-sensor-proxy/default.nix        | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/hardware/sensor/iio.nix
 create mode 100644 pkgs/os-specific/linux/iio-sensor-proxy/default.nix

diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix
new file mode 100644
index 000000000000..a8bc18800021
--- /dev/null
+++ b/nixos/modules/hardware/sensor/iio.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+
+  options = {
+    hardware.sensor.iio = {
+      enable = mkOption {
+        description = "Enable this option to support IIO sensors.";
+        type = types.bool;
+        default = false;
+      };
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf config.hardware.sensor.iio.enable {
+
+    boot.initrd.availableKernelModules = [ "hid-sensor-hub" ];
+
+    environment.systemPackages = with pkgs; [ iio-sensor-proxy ];
+
+    services.dbus.packages = with pkgs; [ iio-sensor-proxy ];
+    services.udev.packages = with pkgs; [ iio-sensor-proxy ];
+    systemd.packages = with pkgs; [ iio-sensor-proxy ];
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ec985acae3b..ee43e538f6d5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -29,6 +29,7 @@
   ./hardware/ckb.nix
   ./hardware/cpu/amd-microcode.nix
   ./hardware/cpu/intel-microcode.nix
+  ./hardware/sensor/iio.nix
   ./hardware/ksm.nix
   ./hardware/network/b43.nix
   ./hardware/network/intel-2100bg.nix
diff --git a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
new file mode 100644
index 000000000000..cdcae22a18e9
--- /dev/null
+++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, autoconf-archive, gettext, libtool, intltool, autoconf, automake
+, glib, gtk3, gtk_doc, libgudev, pkgconfig, systemd }:
+
+stdenv.mkDerivation rec {
+  name = "iio-sensor-proxy-${version}";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner  = "hadess";
+    repo   = "iio-sensor-proxy";
+    rev    = version;
+    sha256 = "1x0whwm2r9g50hq5px0bgsrigy8naihqgi6qm0x5q87jz5lkhrnv";
+  };
+
+  configurePhase = ''
+    ./autogen.sh --prefix=$out \
+      --with-udevrulesdir=$out/lib/udev/rules.d \
+      --with-systemdsystemunitdir=$out/lib/systemd/system
+  '';
+
+  buildInputs = [
+    glib
+    gtk3
+    gtk_doc
+    libgudev
+    systemd
+  ];
+
+  nativeBuildInputs = [
+    autoconf
+    autoconf-archive
+    automake
+    gettext
+    intltool
+    libtool
+    pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Proxy for sending IIO sensor data to D-Bus";
+    homepage = https://github.com/hadess/iio-sensor-proxy;
+    license = licenses.gpl3 ;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+    inherit version;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1224593a2abb..30cf7582ba61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -932,6 +932,8 @@ with pkgs;
 
   long-shebang = callPackage ../misc/long-shebang {};
 
+  iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { };
+
   mathics = pythonPackages.mathics;
 
   meson = callPackage ../development/tools/build-managers/meson { };

From 4a524cf66246212fb2e6d96ee57a65c911d8860e Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 23 Feb 2017 09:09:47 +0000
Subject: [PATCH 1088/3449] Allow directories with a default.nix to be imported
 as an overlay. Closes #23016.

Note that ${} substitution doesn't work because of the "cannot refer
to other paths" constraint. The paranthesis are needed to enforce
right-first evaluation.
---
 pkgs/top-level/impure.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 61ef729fa104..c0f4e0fa089e 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -45,7 +45,7 @@ in
       overlays = dir:
         let content = readDir dir; in
         map (n: import (dir + ("/" + n)))
-          (builtins.filter (n: builtins.match ".*\.nix" n != null)
+          (builtins.filter (n: builtins.match ".*\.nix" n != null || pathExists (dir + ("/" + n + "/default.nix")))
             (attrNames content));
     in
       if dirPath != "" then

From 3a4dd97c550bf01bba09c00f36203e5ac105a07f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Feb 2017 08:03:14 +0100
Subject: [PATCH 1089/3449] nginx module: fix acme if vhost name != serverName

cc #21931 @bobvanderlinden
---
 nixos/modules/services/web-servers/nginx/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 9e93e56b9c2c..1150459d40e1 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -5,13 +5,16 @@ with lib;
 let
   cfg = config.services.nginx;
   virtualHosts = mapAttrs (vhostName: vhostConfig:
-    vhostConfig // {
+    let
       serverName = if vhostConfig.serverName != null
         then vhostConfig.serverName
         else vhostName;
+    in
+    vhostConfig // {
+      inherit serverName;
     } // (optionalAttrs vhostConfig.enableACME {
-      sslCertificate = "/var/lib/acme/${vhostName}/fullchain.pem";
-      sslCertificateKey = "/var/lib/acme/${vhostName}/key.pem";
+      sslCertificate = "/var/lib/acme/${serverName}/fullchain.pem";
+      sslCertificateKey = "/var/lib/acme/${serverName}/key.pem";
     })
   ) cfg.virtualHosts;
   enableIPv6 = config.networking.enableIPv6;

From a6dffeecfaba1377cb4f272a43e2462d12cadba4 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Fri, 24 Feb 2017 18:20:12 -0500
Subject: [PATCH 1090/3449] libcec: 3.1.0 -> 4.0.2

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

diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix
index 7811eff6fe2d..115ea6636394 100644
--- a/pkgs/development/libraries/libcec/default.nix
+++ b/pkgs/development/libraries/libcec/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform }:
 
-let version = "3.1.0"; in
+let version = "4.0.2"; in
 
 stdenv.mkDerivation {
   name = "libcec-${version}";
 
   src = fetchurl {
     url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz";
-    sha256 = "08gr4rhx7qh8ajkry9j0sqw11i74y802dla1wg4l4gxhl4hrs409";
+    sha256 = "09xsw9hfymzl9fi9r2r8n5cxk80fc00x9drsy1r59pgbycqxvf5q";
   };
 
   buildInputs = [ cmake pkgconfig udev libcec_platform ];

From 87d294fcddd88942ecbf60d705a210c85709af78 Mon Sep 17 00:00:00 2001
From: Jonathan Rudenberg <jonathan@titanous.com>
Date: Fri, 24 Feb 2017 18:22:28 -0500
Subject: [PATCH 1091/3449] kodi: Explicitly compile in libcec support

Adding this flag prevents silent breakage of CEC support.
---
 pkgs/applications/video/kodi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index ee0be6419aa0..d7625b8ebacc 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -100,7 +100,7 @@ in stdenv.mkDerivation rec {
       ./bootstrap
     '';
 
-    configureFlags = [ ]
+    configureFlags = [ "--enable-libcec" ]
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
     ++ lib.optional pulseSupport "--enable-pulse"

From 9f184ac5a1d254abb46ba2f057c4e6c857e92141 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 25 Feb 2017 15:50:52 +0800
Subject: [PATCH 1092/3449] utox: 0.13.0 -> 0.13.1

---
 .../networking/instant-messengers/utox/default.nix    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index ccb4244d6264..d74d3fe38657 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
-  # > 0.13 should have unit tests and dbus support
-  version = "0.13.0";
+  # >= 0.14 should have unit tests and dbus support
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner  = "uTox";
     repo   = "uTox";
     rev    = "v${version}";
-    sha256 = "0hdcbhmjwxhs3mr72w6x6yfnk8b0drsqyj40grg8dc0gb1x8y82j";
+    sha256 = "07aa92isknxf7531jr9kgk89wl5rvv34jrvir043fs9xvim5zq99";
   };
 
   buildInputs = [
@@ -23,10 +23,15 @@ stdenv.mkDerivation rec {
     cmake git pkgconfig
   ];
 
+  cmakeFlags = [
+    "-DENABLE_UPDATER=OFF"
+  ];
+
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Lightweight Tox client";
+    homepage = https://github.com/uTox/uTox;
     license = licenses.gpl3;
     maintainers = with maintainers; [ domenkozar jgeerds ];
     platforms = platforms.all;

From 9d14ea4295d935dce73c16f3ceb025cbb2443c5a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 23 Feb 2017 14:57:50 +0100
Subject: [PATCH 1093/3449] utillinux: 2.29 -> 2.29.2 for CVE-2017-2616

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

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 6c3aacbef297..872a1897457c 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
   majorVersion = "2.29";
-  patchVersion = "";
+  patchVersion = "2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
+    sha256 = "1qz81w8vzrmy8xn9yx7ls4amkbgwx6vr62pl6kv9g7r0g3ba9kmc";
   };
 
   patches = [ ./rtcwake-search-PATH-for-shutdown.patch ];

From 6bafe64a20228a8e1986a0d4bdec087c4ae4ba1f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 22 Feb 2017 09:06:49 +0100
Subject: [PATCH 1094/3449] qemu: apply patches for multiple CVEs

Fixes:

  * CVE-2017-2615
  * CVE-2017-5667
  * CVE-2017-5898
  * CVE-2017-5931
  * CVE-2017-5973

We are vulnerable to even more CVEs but those are either not severe like
memory leaks in obscure situations or upstream hasn't acknowledged the
patch yet.

cc #23072
---
 .../virtualization/qemu/default.nix           | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index d7910eb938fc..b201e2299310 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -51,7 +51,39 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./no-etc-install.patch
+
+    (fetchurl {
+      name = "CVE-2017-2615.patch";
+      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=62d4c6bd5263bb8413a06c80144fc678df6dfb64";
+      sha256 = "0miph2x4d474issa44hmc542zxmkc7lsr4ncb7pwarq6j7v52l8h";
+    })
+
+    (fetchurl {
+      name = "CVE-2017-5667.patch";
+      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=42922105beb14c2fc58185ea022b9f72fb5465e9";
+      sha256 = "049vq70is3fj9bf4ysfj3s44iz93qhyqn6xijck32w1x6yyzqyx4";
+     })
+
+    (fetchurl {
+      name = "CVE-2017-5898.patch";
+      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=c7dfbf322595ded4e70b626bf83158a9f3807c6a";
+      sha256 = "1y2j0qw04s8fl0cs8i619y08kj75lxn3c0y19g710fzpk3rq8dvn";
+     })
+
+    (fetchurl {
+      name = "CVE-2017-5931.patch";
+      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=a08aaff811fb194950f79711d2afe5a892ae03a4";
+      sha256 = "0hlih9jhbb1mb174hvxs7pf7lgcs7s9g705ri9rliw7wrhqdpja5";
+     })
+
+    (fetchurl {
+      name = "CVE-2017-5973.patch";
+      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=f89b60f6e5fee3923bedf80e82b4e5efc1bb156b";
+      sha256 = "06niyighjxb4p5z2as3mqfmrwrzn4sq47j7raipbq9gnda7x9sw6";
+     })
+
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+
   hardeningDisable = [ "stackprotector" ];
 
   configureFlags =

From 6dfbb070fbfa48986c05c334996b8c3c47432cdd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Feb 2017 09:58:51 +0100
Subject: [PATCH 1095/3449] mupdf: add patch to fix CVE-2017-5896

---
 pkgs/applications/misc/mupdf/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index ba2313fc7b5a..a4687c385c65 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation rec {
       url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=5a28ad0a8999a9234aa7848096041992cc988099";
       sha256 = "1i24qr4xagyapx4bijjfksj4g3bxz8vs5c2mn61nkm29c63knp75";
     })
+
+    (fetchurl {
+      name = "CVE-2017-5896.patch";
+      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2c4e5867ee699b1081527bc6c6ea0e99a35a5c27";
+      sha256 = "14k7x47ifx82sds1c06ibzbmcparfg80719jhgwjk6w1vkh4r693";
+    })
   ];
 
   makeFlags = [ "prefix=$(out)" ];

From b9418091f4649dbc44b0a7238493dac714224433 Mon Sep 17 00:00:00 2001
From: Matthew Robbetts <mrobbetts@gmail.com>
Date: Tue, 21 Feb 2017 12:33:55 -0800
Subject: [PATCH 1096/3449] hostapd: libressl patches.

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

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 0fef297ea5f6..6822d7cba5a7 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -10,6 +10,21 @@ stdenv.mkDerivation rec {
     sha256 = "0z8ilypad82q3l6q6kbv6hczvhjn8k63j8051x5yqfyjq686nlh1";
   };
 
+  patches = [
+    (fetchurl {
+      url = "http://w1.fi/cgit/hostap/patch/?id=0d42179e1246f996d334c8bd18deca469fdb1add";
+      sha256 = "0w5n3ypwavq5zlyfxpcyvbaf96g59xkwbw9xwpjyzb7h5j264615";
+    })
+    (fetchurl {
+      url = "http://w1.fi/cgit/hostap/patch/?id=df426738fb212d62b132d9bb447f0128194e00ab";
+      sha256 = "0ps2prjijlcgv1i97xb5ypw840dhkc7ja1aw8zhlbrap7pbgi1mm";
+    })
+    (fetchurl {
+      url = "http://w1.fi/cgit/hostap/patch/?id=b70d508c50e8e2d2b8fb96ae44ae10f84cf0c1ae";
+      sha256 = "0pslmsbay2cy1k07w1mdcr0b8w059jkrqrr9zi1aljvkm3vbwhj1";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libnl openssl sqlite ];
 

From e1656bc46da6c2001cfb992735a7daeb75f00bc0 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 24 Feb 2017 16:38:10 +0100
Subject: [PATCH 1097/3449] git-dit: init at 0.1.0

---
 .../git-and-tools/default.nix                 |  2 +
 .../git-and-tools/git-dit/default.nix         | 46 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-dit/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 d68b1e41c8d5..b9b7f2e543ff 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -58,6 +58,8 @@ rec {
 
   git-crypt = callPackage ./git-crypt { };
 
+  git-dit = callPackage ./git-dit { };
+
   git-extras = callPackage ./git-extras { };
 
   git-hub = callPackage ./git-hub { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
new file mode 100644
index 000000000000..18ad363281ad
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, pandoc }:
+
+stdenv.mkDerivation rec {
+  name = "git-dit-${version}";
+  version = "0.1.0";
+
+  buildInputs = [ pandoc ];
+
+  src = fetchFromGitHub {
+    owner = "neithernut";
+    repo = "git-dit";
+    rev = "v${version}";
+    sha256 = "1rvp2dhnb8yqrracvfpvf8z1vz4fs0rii18hhrskr6n1sfd7x9kd";
+  };
+
+  # the Makefile doesn’t work, we emulate it below
+  dontBuild = true;
+
+  postPatch = ''
+    # resolve binaries to the right path
+    sed -e "s|exec git-dit-|exec $out/bin/git-dit-|" -i git-dit
+
+    # we change every git dit command to the local subcommand path
+    # (git dit foo -> /nix/store/…-git-dit/bin/git-dit-foo)
+    for script in git-dit-*; do
+      sed -e "s|git dit |$out/bin/git-dit-|g" -i "$script"
+    done
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/man/man1}
+    # from the Makefile
+    ${stdenv.lib.getBin pandoc}/bin/pandoc -s -t man git-dit.1.md \
+                                           -o $out/share/man/man1/git-dit.1
+    cp git-dit* $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Decentralized Issue Tracking for git";
+    inherit (src) homepage;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ profpatsch matthiasbeyer ];
+  };
+
+
+}

From ae1c0add81845807172155ca9c22fe3ed47dfc54 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Feb 2017 11:48:22 +0100
Subject: [PATCH 1098/3449] git-dit: fix evaluation

cc @Profpatsch
---
 .../version-management/git-and-tools/git-dit/default.nix        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 18ad363281ad..a4b552bcca37 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
     description = "Decentralized Issue Tracking for git";
-    inherit (src) homepage;
     license = licenses.gpl2;
     maintainers = with maintainers; [ profpatsch matthiasbeyer ];
   };

From 05706869a810fe02249c5cd17b6a54d2301b7b1c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Feb 2017 13:47:42 +0100
Subject: [PATCH 1099/3449] mpd: 0.20.4 -> 0.20.5

Fixes buffer overflows and a memleak.
---
 pkgs/servers/mpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index e2ec4a7617d2..87a477ab057d 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -33,13 +33,13 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.20";
-  minor = "4";
+  minor = "5";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${major}${if minor == "" then "" else "." + minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi";
+    sha256 = "11w9v0l9lf504nkxlb91y5r9x403ikl626mjd1lf4fj44yz76maj";
   };
 
   patches = [ ./i386.patch ];

From 56a4640b0c77db1b87962298f6feecb7410b05e7 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Sat, 25 Feb 2017 13:58:32 +0100
Subject: [PATCH 1100/3449] iana-etc: fixed source URL and homepage (#23167)

The homepage has moved years ago.
---
 pkgs/data/misc/iana-etc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index 6adb45758392..f20b992ab727 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -4,14 +4,14 @@ stdenv.mkDerivation rec {
   name = "iana-etc-2.30";
 
   src = fetchurl {
-    url = "http://sethwklein.net/projects/iana-etc/downloads/${name}.tar.bz2";
+    url = "http://sethwklein.net/${name}.tar.bz2";
     sha256 = "03gjlg5zlwsdk6qyw3v85l129rna5bpm4m7pzrp864h0n97qg9mr";
   };
 
   preInstall = "installFlags=\"PREFIX=$out\"";
 
   meta = {
-    homepage = http://sethwklein.net/projects/iana-etc/;
+    homepage = http://sethwklein.net/iana-etc;
     description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
     platforms = stdenv.lib.platforms.unix;
   };

From 46e44222d6b656cc9830df0ae38a04c941d56f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 25 Feb 2017 14:10:09 +0100
Subject: [PATCH 1101/3449] munin: add 'bc' (needed by 'acpi' and 'snort_pkts'
 plugins)

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

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 3e4e778e238b..5d7d2e787735 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, makeWrapper, which, coreutils, rrdtool, perl, perlPackages
-, python, ruby, jre, nettools
+, python, ruby, jre, nettools, bc
 }:
 
 stdenv.mkDerivation rec {
@@ -99,7 +99,8 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     echo "Removing references to /usr/{bin,sbin}/ from munin plugins..."
-    find "$out/lib/plugins" -type f -print0 | xargs -0 -L1 sed -i -e "s|/usr/bin/||g" -e "s|/usr/sbin/||g"
+    find "$out/lib/plugins" -type f -print0 | xargs -0 -L1 \
+        sed -i -e "s|/usr/bin/||g" -e "s|/usr/sbin/||g" -e "s|\<bc\>|${bc}/bin/bc|g"
 
     if test -e $out/nix-support/propagated-native-build-inputs; then
         ln -s $out/nix-support/propagated-native-build-inputs $out/nix-support/propagated-user-env-packages

From 870914fc41932c8833e6904f7fb4c79db594941b Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Sat, 25 Feb 2017 14:22:16 +0100
Subject: [PATCH 1102/3449] yarn: 0.19.1 -> 0.20.3

---
 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 7d93ea1fcab4..4af3ab5c4b93 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.19.1";
+  version = "0.20.3";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1006ijhig9pcmrlsqfwxhn4i78bcji2grvkl4hz64fmqv6rh783s";
+    sha256 = "1w4n05155rlkyv9k43fs0zrl04pri89vbi7rzpwmcg6zfxz273lw";
   };
 
   buildInputs = [makeWrapper nodejs];

From d95dd3df281af72c86985acc9260b67a4f4ce114 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 25 Feb 2017 14:44:16 +0100
Subject: [PATCH 1103/3449] vimPlugins.argtextobj: init at 2010-10-17

---
 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 0f1c8e9a2010..16e2409c4309 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -622,6 +622,17 @@ rec {
 
   };
 
+  argtextobj = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "argtextobj-vim-2010-10-17";
+    src = fetchgit {
+      url = "git://github.com/vim-scripts/argtextobj.vim";
+      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
+      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
+    };
+    dependencies = [];
+
+  };
+
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-elixir-2017-01-24";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b8fb32db0948..3ff57be5d4cf 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -121,6 +121,7 @@
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/Rename"
 "github:vim-scripts/a.vim"
+"github:vim-scripts/argtextobj.vim"
 "github:vim-scripts/align"
 "github:vim-scripts/changeColorScheme.vim"
 "github:vim-scripts/random.vim"

From ac59309f69d000e6f808a8fc2b8c2d1b8e54404e Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 25 Feb 2017 14:57:41 +0100
Subject: [PATCH 1104/3449] vimPlugins.vim-indent-object: init at 2015-08-11

---
 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 16e2409c4309..c8872a40e561 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -399,6 +399,17 @@ rec {
 
   };
 
+  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-indent-object-2015-08-11";
+    src = fetchgit {
+      url = "git://github.com/michaeljsmith/vim-indent-object";
+      rev = "1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b";
+      sha256 = "1xxl5pwbz56qjfxw6l686m1qc4a3q0r7afa9r5gjhgd1jy67z7d7";
+    };
+    dependencies = [];
+
+  };
+
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-nix-2016-11-02";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 3ff57be5d4cf..b12983b4bc09 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -80,6 +80,7 @@
 "github:lyokha/vim-xkbswitch"
 "github:machakann/vim-highlightedyank"
 "github:mhinz/vim-startify"
+"github:michaeljsmith/vim-indent-object"
 "github:mkasa/lushtags"
 "github:mpickering/hlint-refactor-vim"
 "github:nathanaelkane/vim-indent-guides"

From 6988d2d456dd5f2175d2b99a64501e46a31f2181 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 25 Feb 2017 09:03:22 -0500
Subject: [PATCH 1105/3449] curl: 7.53.0 -> 7.53.1

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 48f8edf7c44c..e9b438a6037b 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.53.0";
+  name = "curl-7.53.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "008833dd9w4l2277q9r0bsq1vqmm0fr7qqyzvqlw5d47xy5mld5j";
+    sha256 = "1s1hyndva0yp62xy96pcp4anzrvw6cl0abjajim17sbmdp00fwhw";
   };
 
   patches = [ ];

From e4d1b3fbfabede1a3598d6b1707fef57a75763b7 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 24 Feb 2017 20:01:42 +0100
Subject: [PATCH 1106/3449] scalafmt: 0.5.6 -> 0.5.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 af7854b33dcb..0e8c656fbb8b 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.5.6";
+  version = "0.5.7";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "17fwli6jlsh4q7nqgqmqmhb368hpmj1yg9fdsybk8yq57hb24bwq";
+    sha256 = "1jg2yhnzlyxg735b6qcj3pgnr5q2i361ql27qmxk977al24v5w8i";
   };
 
   unpackPhase = "tar xvzf $src";

From 1aaf2be2a022f7cc2dcced364b8725da544f6ff7 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 25 Feb 2017 16:14:35 +0100
Subject: [PATCH 1107/3449] retroarch: libretro-mednafen-* -> libretro-beetle-*

Rename all mednafen-* libretro ports to beetle-* due #23163.

Closes #23163.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
---
 pkgs/misc/emulators/retroarch/cores.nix | 75 +++++++++++++------------
 pkgs/top-level/all-packages.nix         | 14 ++++-
 2 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 50f73d6f4e6e..8d02fbfc9bd3 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -62,6 +62,45 @@ in
     buildPhase = "make";
   };
 
+  beetle-pce-fast = (mkLibRetroCore rec {
+    core = "mednafen-pce-fast";
+    src = fetchRetro {
+      repo = "beetle-pce-fast-libretro";
+      rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885";
+      sha256 = "0m946108wzawg0c4xvqpv6yzfmjngz6lji5hn4swgk0z5f2bj5a5";
+    };
+    description = "Port of Mednafen's PC Engine core to libretro";
+  }).override {
+    buildPhase = "make";
+    name = "beetle-pce-fast";
+  };
+
+  beetle-psx = (mkLibRetroCore rec {
+    core = "mednafen-psx";
+    src = fetchRetro {
+      repo = "beetle-psx-libretro";
+      rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2";
+      sha256 = "192xzvdbjjqlxrnxxn45hmrr6yjpxw3gapkbax6nhrabnxhva43k";
+    };
+    description = "Port of Mednafen's PSX Engine core to libretro";
+  }).override {
+    buildPhase = "make";
+    name = "beetle-psx";
+  };
+
+  beetle-saturn = (mkLibRetroCore rec {
+    core = "mednafen-saturn";
+    src = fetchRetro {
+      repo = "beetle-saturn-libretro";
+      rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab";
+      sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b";
+    };
+    description = "Port of Mednafen's Saturn core to libretro";
+  }).override {
+    buildPhase = "make";
+    name = "beetle-saturn";
+  };
+
   bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec {
     core = bname + "-accuracy";
     src = fetchRetro {
@@ -146,42 +185,6 @@ in
     extraBuildInputs = [ alsaLib portaudio python27 ];
   };
 
-  mednafen-pce-fast = (mkLibRetroCore rec {
-    core = "mednafen-pce-fast";
-    src = fetchRetro {
-      repo = "beetle-pce-fast-libretro";
-      rev = "6e2eaf75da2eb3dfcf2fd64413f471c8c90cf885";
-      sha256 = "0m946108wzawg0c4xvqpv6yzfmjngz6lji5hn4swgk0z5f2bj5a5";
-    };
-    description = "Port of Mednafen's PC Engine core to libretro";
-  }).override {
-    buildPhase = "make";
-  };
-
-  mednafen-psx = (mkLibRetroCore rec {
-    core = "mednafen-psx";
-    src = fetchRetro {
-      repo = "beetle-psx-libretro";
-      rev = "20c9b0eb0062b8768cc40aca0e2b2d626f1002a2";
-      sha256 = "192xzvdbjjqlxrnxxn45hmrr6yjpxw3gapkbax6nhrabnxhva43k";
-    };
-    description = "Port of Mednafen's PSX Engine core to libretro";
-  }).override {
-    buildPhase = "make";
-  };
-
-  mednafen-saturn = (mkLibRetroCore rec {
-    core = "mednafen-saturn";
-    src = fetchRetro {
-      repo = "beetle-saturn-libretro";
-      rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab";
-      sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b";
-    };
-    description = "Port of Mednafen's Saturn core to libretro";
-  }).override {
-    buildPhase = "make";
-  };
-
   mgba = mkLibRetroCore rec {
     core = "mgba";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ca20f74b269..186cc7dddd50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15719,6 +15719,9 @@ with pkgs;
     in with libretro;
       ([ ]
       ++ optional (cfg.enable4do or false) _4do
+      ++ optional (cfg.enableBeetlePCEFast or false) beetle-pce-fast
+      ++ optional (cfg.enableBeetlePSX or false) beetle-psx
+      ++ optional (cfg.enableBeetleSaturn or false) beetle-saturn
       ++ optional (cfg.enableBsnesMercury or false) bsnes-mercury
       ++ optional (cfg.enableDesmume or false) desmume
       ++ optional (cfg.enableFBA or false) fba
@@ -15726,9 +15729,6 @@ with pkgs;
       ++ optional (cfg.enableGambatte or false) gambatte
       ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
       ++ optional (cfg.enableMAME or false) mame
-      ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast
-      ++ optional (cfg.enableMednafenPSX or false) mednafen-psx
-      ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn
       ++ optional (cfg.enableMGBA or false) mgba
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia
@@ -15743,6 +15743,14 @@ with pkgs;
       ++ optional (cfg.enableStella or false) stella
       ++ optional (cfg.enableVbaNext or false) vba-next
       ++ optional (cfg.enableVbaM or false) vba-m
+
+      # added on 2017-02-25 due #23163
+      ++ optional (cfg.enableMednafenPCEFast or false)
+          (throw "nix config option enableMednafenPCEFast has been renamed to enableBeetlePCEFast")
+      ++ optional (cfg.enableMednafenPSX or false)
+          (throw "nix config option enableMednafenPSX has been renamed to enableBeetlePSX")
+      ++ optional (cfg.enableMednafenSaturn or false)
+          (throw "nix config option enableMednafenSaturn has been renamed to enableBeetleSaturn")
       );
 
   wrapRetroArch = { retroarch }: callPackage ../misc/emulators/retroarch/wrapper.nix {

From 09e191c22bbfad965a9b5469d5e0ac25b693036f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 25 Feb 2017 17:09:09 +0100
Subject: [PATCH 1108/3449] sabnzbd: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index f685d8b24d6b..b754807dc9bd 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -4,7 +4,7 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]);
   path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
 in stdenv.mkDerivation rec {
-  version = "1.2.0";
+  version = "1.2.1";
   pname = "sabnzbd";
   name = "${pname}-${version}";
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "1g1zf0zrlqgparg6hws6agpr414dw2q4xq9l8nh720rn6m7fv4vb";
+    sha256 = "1rw6f455p0n8qigzkvnlr0d6rzkx2mpzhcp7m0j8fwqdbq831q8y";
   };
 
   buildInputs = [ pythonEnv makeWrapper ];

From 26a2822cf0ffc286d10c11c6a59c1e2152848d62 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 25 Feb 2017 15:55:56 +0100
Subject: [PATCH 1109/3449] nginx service: restart instead of stop to reduce
 downtime

cc #23127
---
 nixos/modules/services/web-servers/nginx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 1150459d40e1..6bc7192963d1 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -385,6 +385,7 @@ in
       description = "Nginx Web Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      stopIfChanged = false;
       preStart =
         ''
         mkdir -p ${cfg.stateDir}/logs

From 5af221e6f33cc2fd727d7936750b8693b35d4484 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 25 Feb 2017 20:25:51 +0100
Subject: [PATCH 1110/3449] opusfile: enable on darwin

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

diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index f840ba278cfc..8a7ab8889a66 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
   patches = [ ./include-multistream.patch ];
   configureFlags = [ "--disable-examples" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "High-level API for decoding and seeking in .opus files";
     homepage = http://www.opus-codec.org/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.bsd3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ fuuzetsu ];
   };
 }

From 64cf52ad5591662965afba3ac835dc074de816f2 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 25 Feb 2017 18:20:30 +0100
Subject: [PATCH 1111/3449] clipster: 2017-01-12 -> 2017-02-17

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

diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix
index 445b486c8510..05cc33f8bce1 100644
--- a/pkgs/tools/misc/clipster/default.nix
+++ b/pkgs/tools/misc/clipster/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation  rec {
   name = "clipster-unstable-${version}";
-  version = "2017-01-12";
+  version = "2017-02-17";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    rev = "d66fbb098149bef687f062bfa111a21c9121851f";
-    sha256 = "0yncjfl0822v2b7f9g7a6ihb99g5hd1s8bfpr2r9nqga6m11k90q";
+    rev = "8c4732d7c26ddec6faac295d3ddb2278c6ed5647";
+    sha256 = "00ki3srdjh96ghan1z4zd8w5cahgvnpa8hccnxmn0im1xrgpkh3b";
   };
 
   pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]);

From 77064ceb35d01440020d5f543c15762557154885 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 25 Feb 2017 18:36:00 +0100
Subject: [PATCH 1112/3449] mutt: 1.7.2 -> 1.8.0

From the Changelog:

The keys used are:
  !: modified feature, -: deleted feature, +: new feature

1.8.0 (2017-02-24):

  - $locale has been removed.  Mutt now respects the LC_TIME setting
    instead.  See also $attribution_locale.
  + $attribution_locale can be used to override the date formatting in
    attribution strings.  When unset, Mutt will use the locale
    environment, but note the default value of $date_format has a
    leading '!' which says to use the C-locale.
  ! Message-id and mail-followup-to headers are now preserved for recalled
    messages.
  + <unsidebar_whitelist> added to complement <sidebar_whitelist>.
  ! The pager position is reset to the top when toggling header-weed.
  ! IMAP messages moved to $trash via server-side copy are marked as read.
  + <root-message> jumps to the root message of a thread.
  ! Piped text attachments are charset converted.
  + Added %F to $attach_format, to show the content-disposition filename.
    %d will fall back to %F which will fall back to %f.
  + <rename-attachment> allows an attachment name to be changed, without
    modifying the underlying file's name.
  ! Mutt will look for the user's muttrc additionally in
    $XDG_CONFIG_HOME/mutt/.
  + Compressed mbox and mmdf files are now supported via open-hook,
    close-hook, and append-hook.  See contrib/sample.muttrc-compress
    for suggested settings.  Note this is a compile-time option:
    --enable-compressed.
  + When $flag_safe is set, flagged messages cannot be deleted.
  + The '@' pattern modifier can be used to limit matches to known aliases.
  + <mark-message> creates a hotkey binding to a specific message.  The hotkey
    prefix is specified via $mark_macro_prefix.
  + <setenv> and <unsetenv> can be used to add/remove environment variables
    passed to children.
  ! Mutt will now use the built-in OpenSSL SSL_set_verify() callback
    to verify certificates.  This allows better support for verifying
    chains, including alternative chain support.
  + $uncollapse_new controls whether a thread will be uncollapsed when a new
    message arrives.
  ! $to_chars and $status_chars now accept multibyte characters.
  + <subjectrx> allows replacing matching subjects with something else.
    This can be used to declutter subject lines in the index.
  + <edit-label> can be used to add, change, or delete a message's X-Label.
  ! Pattern expressions with ~y support label tab completion.
  + The header cache now also supports Kyoto Cabinet and LMDB as
    backend databases.
---
 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 195cf13e4c29..e5cb54723d3e 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.7.2";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "1yazrl82s9fxmamnlvwmsxhwrxnwv6kwakgfmawda8ndhwb50lqm";
+    sha256 = "1axdcylyv0p194y6lj1jx127g5yc74zqzzxdc014cjw02bd1x125";
   };
 
   patchPhase = optionalString (openssl != null) ''

From 9d37470caefbc530b560f287c0a13018d618c401 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 25 Feb 2017 21:23:08 +0100
Subject: [PATCH 1113/3449] ardour: 5.5 -> 5.6

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

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 6745109d7d04..90ab110bf198 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -16,7 +16,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "5.5";
+  tag = "5.6";
 
 in
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = "bb3312c3bb9c6ed9b75ac6739a6ee720ddf86c86";
-    sha256 = "1yrg0d86k9fqw7lmzjglilbadb4cjqxqkf6ii4bjs6rihj6b0qrf";
+    rev = "08353095dfee421f299d30d5d91259bc2df7e19d";
+    sha256 = "1fgvjmvdyh61qn8azpmh19ac58ps5sl2dywwshr56v0svakhwwh9";
   };
 
   buildInputs =

From bbc9b1ab2c92c7d695ac70068ac8bbf433790a36 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 25 Feb 2017 21:34:54 +0100
Subject: [PATCH 1114/3449] mpv: disable drmSupport on darwin

---
 pkgs/applications/video/mpv/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 960dabd75695..021c09a47e68 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -31,7 +31,7 @@
 , libpngSupport      ? true,  libpng        ? null
 , youtubeSupport     ? true,  youtube-dl    ? null
 , vaapiSupport       ? true,  libva         ? null
-, drmSupport         ? true,  libdrm        ? null
+, drmSupport         ? !stdenv.isDarwin,  libdrm        ? null
 , vapoursynthSupport ? false, vapoursynth   ? null
 , jackaudioSupport   ? false, libjack2      ? null
 
@@ -114,7 +114,9 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     ffmpeg_3_2 freetype libass libpthreadstubs
     lua lua5_sockets libuchardet
-  ] ++ optional alsaSupport        alsaLib
+  ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+       libiconv Cocoa CoreAudio ])
+    ++ optional alsaSupport        alsaLib
     ++ optional xvSupport          libXv
     ++ optional theoraSupport      libtheora
     ++ optional xineramaSupport    libXinerama
@@ -122,9 +124,6 @@ in stdenv.mkDerivation rec {
     ++ optional bluraySupport      libbluray
     ++ optional jackaudioSupport   libjack2
     ++ optional pulseSupport       libpulseaudio
-    ++ optional stdenv.isDarwin    libiconv
-    ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
-       Cocoa CoreAudio ])
     ++ optional rubberbandSupport  rubberband
     ++ optional screenSaverSupport libXScrnSaver
     ++ optional vdpauSupport       libvdpau

From 7e97cbe5a4cc9f89dd2060eb8791bc7bf032ac29 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 25 Feb 2017 22:15:45 +0100
Subject: [PATCH 1115/3449] version: Extend /etc/os-release

- Provide additional link for support and bug reporting.
- Use HTTPS links (related: "The IAB encourages all web servers to
employ TLS to protect their content, and use OCSP stapling to improve
the efficiency and privacy of revocation checking." [0].
- Add VERSION_CODENAME

[0]: https://www.iab.org/documents/correspondence-reports-documents/2017-2/iab-statement-on-ocsp-stapling/
---
 nixos/modules/misc/version.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 70cd3fb9766a..bf20e801f61b 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -106,9 +106,12 @@ in
         NAME=NixOS
         ID=nixos
         VERSION="${config.system.nixosVersion} (${config.system.nixosCodeName})"
+        VERSION_CODENAME=${toLower config.system.nixosCodeName}
         VERSION_ID="${config.system.nixosVersion}"
         PRETTY_NAME="NixOS ${config.system.nixosVersion} (${config.system.nixosCodeName})"
-        HOME_URL="http://nixos.org/"
+        HOME_URL="https://nixos.org/"
+        SUPPORT_URL="https://nixos.org/nixos/support.html"
+        BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"
       '';
 
   };

From 65a228a2b1b74c2132e629534303bcb8deecddb5 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Sat, 25 Feb 2017 17:38:38 -0500
Subject: [PATCH 1116/3449] haskellPackages: use makeExtensible

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

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index d2ecc3381287..2ee01bf9e112 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -6,7 +6,7 @@
 
 let
 
-  inherit (stdenv.lib) fix' extends;
+  inherit (stdenv.lib) fix' extends makeExtensible;
 
   haskellPackages = self:
     let
@@ -109,7 +109,7 @@ let
 
 in
 
-  fix'
+  makeExtensible
     (extends overrides
       (extends packageSetConfig
         (extends compilerConfig

From e798f573f07bfb4b88973496e2292558c3c7b405 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 26 Feb 2017 02:02:22 +0000
Subject: [PATCH 1117/3449] make-disk-image.nix: set last fsck time on ext4
 images to enable resize-on-startup

---
 nixos/lib/make-disk-image.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index d9d76b5919a5..8c5de22f30ff 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -145,9 +145,11 @@ pkgs.vmTools.runInLinuxVM (
 
       umount /mnt
 
-      # Make sure resize2fs works
+      # 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
+      # output, of course, but we can fix that when/if we start making images deterministic.
       ${optionalString (fsType == "ext4") ''
-        tune2fs -c 0 -i 0 $rootDisk
+        tune2fs -T now -c 0 -i 0 $rootDisk
       ''}
     ''
 )

From cc647804f10aedc2a61ce344ab8bf336f55fdd27 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 26 Feb 2017 08:50:15 +0100
Subject: [PATCH 1118/3449] lean: 3.0.0 -> 3.1.0

---
 pkgs/applications/science/logic/lean/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index b6de57951cae..a863b01f43ae 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, cmake, gmp, mpfr, gperftools }:
+{ stdenv, fetchFromGitHub, cmake, gmp }:
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "1ds25213vir8llans7na3laqs8rgr06clgp9xzq8akiwfy87b74i";
+    sha256 = "0w4cdai6mzx4wr7gscv4sl5q4mxx1agjbpp4smvrslav7gpbz025";
   };
 
-  buildInputs = [ gmp mpfr cmake gperftools ];
+  buildInputs = [ gmp cmake ];
   enableParallelBuilding = true;
 
   preConfigure = ''

From 2f726fed9f6266cfdb1c0eabdecf0b603d904432 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Feb 2017 09:26:22 +0100
Subject: [PATCH 1119/3449] findutils: fixup sandboxed build after #23152

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

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 8906564ade5b..30716146ec59 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y";
   };
 
-  patches = [ ./memory-leak.patch ];
+  patches = [ ./memory-leak.patch ./no-install-statedir.patch ];
 
   buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
 

From e55b829c6925421f732d30d622da4af0681a56ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Feb 2017 09:35:38 +0100
Subject: [PATCH 1120/3449] llvmPackages: mark 4.0 as lowPrio

For example, "nix-env -i clang" should not install the RC version.
/cc #22970.
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95a19240a0a8..31f898fb9228 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4730,7 +4730,7 @@ with pkgs;
 
   clang = llvmPackages.clang;
 
-  clang_40 = llvmPackages_40.clang;
+  clang_40 = lowPrio llvmPackages_40.clang;
   clang_39 = llvmPackages_39.clang;
   clang_38 = llvmPackages_38.clang;
   clang_37 = llvmPackages_37.clang;
@@ -5278,13 +5278,13 @@ with pkgs;
 
   lizardfs = callPackage ../tools/filesystems/lizardfs { };
 
-  lld = llvmPackages_40.lld;
+  lld = lowPrio llvmPackages_40.lld;
 
   lldb = llvmPackages.lldb;
 
   llvm = llvmPackages.llvm;
 
-  llvm_40 = llvmPackages_40.llvm;
+  llvm_40 = lowPrio llvmPackages_40.llvm;
   llvm_39 = llvmPackages_39.llvm;
   llvm_38 = llvmPackages_38.llvm;
   llvm_37 = llvmPackages_37.llvm;

From bfe1d74eb83ff2fca1db158d0e08b404bc9a60e6 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 26 Feb 2017 09:43:39 +0100
Subject: [PATCH 1121/3449] mwic: init at 0.7.2 (#23183)

* mwic: init at 0.7.2

* mwic: use makefile instead
---
 pkgs/applications/misc/mwic/default.nix | 31 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/misc/mwic/default.nix

diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
new file mode 100644
index 000000000000..7b9b04c66c8d
--- /dev/null
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.2";
+  name = "mwic-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
+    sha256 = "1linpagf0i0ggicq02fcvz4rpx7xdpy80ys49wx7fnmz7f3jc6jy";
+  };
+
+  makeFlags=["PREFIX=\${out}"];
+
+  nativeBuildInputs = [
+    pythonPackages.wrapPython
+  ];
+
+  propagatedBuildInputs = with pythonPackages; [ pyenchant regex ];
+
+  postFixup = ''
+    buildPythonPath "$out"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://jwilk.net/software/mwic;
+    description = "spell-checker that groups possible misspellings and shows them in their contexts";
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 110d22d345c2..e91132586951 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14449,6 +14449,10 @@ with pkgs;
     withSidebar = true;
   };
 
+  mwic = callPackage ../applications/misc/mwic {
+    pythonPackages = python3Packages;
+  };
+
   neomutt = callPackage ../applications/networking/mailreaders/neomutt { };
 
   natron = callPackage ../applications/video/natron { };

From f157956266457581dbe62ba872d37420a529924c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Feb 2017 09:44:27 +0100
Subject: [PATCH 1122/3449] findutils: add the forgotten file (I'm sorry)

/cc #23152.
---
 pkgs/tools/misc/findutils/no-install-statedir.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 pkgs/tools/misc/findutils/no-install-statedir.patch

diff --git a/pkgs/tools/misc/findutils/no-install-statedir.patch b/pkgs/tools/misc/findutils/no-install-statedir.patch
new file mode 100644
index 000000000000..a7a48038a3aa
--- /dev/null
+++ b/pkgs/tools/misc/findutils/no-install-statedir.patch
@@ -0,0 +1,11 @@
+--- a/locate/Makefile.in
++++ b/locate/Makefile.in
+@@ -2357,7 +2357,7 @@ updatedb: updatedb.sh Makefile
+ 	chmod +x $@
+ 
+ install-data-hook:
+-	$(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(localstatedir)
++	#$(top_srcdir)/build-aux/mkinstalldirs $(DESTDIR)$(localstatedir)
+ 
+ dblocation.texi:
+ 	echo '@set LOCATE_DB $(LOCATE_DB)' > $@.tmp

From f8cb022feb1dbb19318ad86adbace1d54804dfef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:27:06 +0100
Subject: [PATCH 1123/3449] build-support/vm: replace sha256 with sha1

---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 562344dfcf72..19a3f24a470d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -866,7 +866,7 @@ rec {
       fullName = "Fedora 10 (i386)";
       packagesList = fetchurl {
         url = mirror://fedora/linux/releases/10/Everything/i386/os/repodata/beeea88d162e76993c25b9dd8139868274ee7fa1-primary.xml.gz;
-        sha1 = "beeea88d162e76993c25b9dd8139868274ee7fa1";
+        sha256 = "17lyvzqjsxw3ll7726dpg14f9jc2p3fz5cr5cwd8hp3rkm5nfclv";
       };
       urlPrefix = mirror://fedora/linux/releases/10/Everything/i386/os;
       packages = commonFedoraPackages ++ [ "cronie" "util-linux-ng" ];
@@ -877,7 +877,7 @@ rec {
       fullName = "Fedora 10 (x86_64)";
       packagesList = fetchurl {
         url = mirror://fedora/linux/releases/10/Everything/x86_64/os/repodata/7958210175e86b5cc843cf4bd0bc8659e445e261-primary.xml.gz;
-        sha1 = "7958210175e86b5cc843cf4bd0bc8659e445e261";
+        sha256 = "02pzqmb26zmmzdni11dip3bar4kr54ddsrq9z4vda7ldwwkqd3py";
       };
       urlPrefix = mirror://fedora/linux/releases/10/Everything/x86_64/os;
       archs = ["noarch" "x86_64"];
@@ -1325,7 +1325,7 @@ rec {
       fullName = "Ubuntu 7.10 Gutsy (i386)";
       packagesList = fetchurl {
         url = mirror://ubuntu/dists/gutsy/main/binary-i386/Packages.bz2;
-        sha1 = "8b52ee3d417700e2b2ee951517fa25a8792cabfd";
+        sha256 = "0fmac8svxq86a4w878g6syczvy5ff4jrdc1gajd3xd8z0dypnw27";
       };
       urlPrefix = mirror://ubuntu;
       packages = commonDebianPackages;
@@ -1336,7 +1336,7 @@ rec {
       fullName = "Ubuntu 8.04 Hardy (i386)";
       packagesList = fetchurl {
         url = mirror://ubuntu/dists/hardy/main/binary-i386/Packages.bz2;
-        sha1 = "db74581ee75cb3bee2a8ae62364e97956c723259";
+        sha256 = "19132nc9fhdfmgmvn834lk0d8c0n3jv0ndz9inyynh9k6pc8b5hd";
       };
       urlPrefix = mirror://ubuntu;
       packages = commonDebianPackages;
@@ -1347,7 +1347,7 @@ rec {
       fullName = "Ubuntu 8.04 Hardy (amd64)";
       packagesList = fetchurl {
         url = mirror://ubuntu/dists/hardy/main/binary-amd64/Packages.bz2;
-        sha1 = "d1f1d2b3cc62533d6e4337f2696a5d27235d1f28";
+        sha256 = "1xjcgh0ydixmim7kgxss0mhfw0sibpgygvgsyac4bdz9m503sj3h";
       };
       urlPrefix = mirror://ubuntu;
       packages = commonDebianPackages;
@@ -1411,7 +1411,7 @@ rec {
     ubuntu910x86_64 = {
       name = "ubuntu-9.10-karmic-amd64";
       fullName = "Ubuntu 9.10 Karmic (amd64)";
-     packagesList = fetchurl {
+      packagesList = fetchurl {
         url = mirror://ubuntu/dists/karmic/main/binary-amd64/Packages.bz2;
         sha256 = "3a604fcb0c135eeb8b95da3e90a8fd4cfeff519b858cd3c9e62ea808cb9fec40";
       };

From 4c11d5fe831106f5ed6f1b93802d6b1f22ff5c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:30:03 +0100
Subject: [PATCH 1124/3449] dtrx: replace sha1 with sha256

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

diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 4e3f7d3d0dbd..5198cb15a60d 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec {
 
   src = fetchurl {
     url = "http://brettcsmith.org/2007/dtrx/dtrx-${version}.tar.gz";
-    sha1 = "05cfe705a04a8b84571b0a5647cd2648720791a4";
+    sha256 = "15yf4n27zbhvv0byfv3i89wl5zn6jc2wbc69lk5a3m6rx54gx6hw";
   };
 
   postInstall = ''

From fc2a42b40e431d7104e34ea85e2c246abe627a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:31:01 +0100
Subject: [PATCH 1125/3449] zsync: replace sha1 with sha256

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

diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix
index 4606d5bf79bd..89016b3ff40f 100644
--- a/pkgs/tools/compression/zsync/default.nix
+++ b/pkgs/tools/compression/zsync/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://zsync.moria.org.uk/download/${name}.tar.bz2";
-    sha1 = "5e69f084c8adaad6a677b68f7388ae0f9507617a";
+    sha256 = "1wjslvfy76szf0mgg2i9y9q30858xyjn6v2acc24zal76d1m778b";
   };
 
   meta = {

From def0c868eaf7c969968a77b53b637a220662a410 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:37:27 +0100
Subject: [PATCH 1126/3449] pythonPackages: remove sha1 comment

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5862289a2278..3561a93a2b65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28879,7 +28879,6 @@ EOF
 
     src = pkgs.fetchurl {
       url = "https://gdata-python-client.googlecode.com/files/${name}.tar.gz";
-      # sha1 = "d2d9f60699611f95dd8c328691a2555e76191c0c";
       sha256 = "1dpxl5hwyyqd71avpm5vkvw8fhlvf9liizmhrq9jphhrx0nx5rsn";
     };
 

From 7f5cfd3ec5b7ee5efd894b86a2b82c2ae1744435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:36:39 +0100
Subject: [PATCH 1127/3449] samplicator: 1.3.7-beta6 -> 1.3.8rc1

---
 pkgs/tools/networking/samplicator/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix
index 3daea665929b..1b537870b09d 100644
--- a/pkgs/tools/networking/samplicator/default.nix
+++ b/pkgs/tools/networking/samplicator/default.nix
@@ -1,17 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "samplicator-${version}";
-  version = "1.3.7-beta6";
+  version = "1.3.8rc1";
 
-  src = fetchurl {
-    url = "http://samplicator.googlecode.com/files/${name}.tar.gz";
-    sha1 = "2091af1898d6508ad9fd338a07e352e2387522d4";
+  buildInputs = [ autoreconfHook ];
+
+  src = fetchFromGitHub {
+    owner = "sleinen";
+    repo = "samplicator";
+    rev = version;
+    sha256 = "0fv5vldmwd6qrdv2wkk946dk9rn9nrv3c84ldvvqqn1spxfzgirm";
   };
 
   meta = {
     description = "Send copies of (UDP) datagrams to multiple receivers";
-    homepage = "http://code.google.com/p/samplicator/";
+    homepage = https://github.com/sleinen/samplicator/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
   };

From f4c253ff2f68fbe3e302f944e8347233d9dc8c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:28:47 +0100
Subject: [PATCH 1128/3449] jfsutils: replace sha1 with sha256

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

diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix
index 16d95bd19336..244f3e294a86 100644
--- a/pkgs/tools/filesystems/jfsutils/default.nix
+++ b/pkgs/tools/filesystems/jfsutils/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://jfs.sourceforge.net/project/pub/${name}.tar.gz";
-    sha1 = "291e8bd9d615cf3d27e4000117c81a3602484a50";
+    sha256 = "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4";
   };
 
   patches = [ ./types.patch ./hardening-format.patch ];

From d66aec8237438ecb0aa57a3e0910e844a0f28fa1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Feb 2017 00:58:45 +0100
Subject: [PATCH 1129/3449] zam-plugins: 3.7 -> 3.8

---
 pkgs/applications/audio/zam-plugins/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index b79083ee402c..ecb7d9bceec6 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zam-plugins-${version}";
-  version = "3.7";
+  version = "3.8";
 
   src = fetchgit {
     url = "https://github.com/zamaudio/zam-plugins.git";
     deepClone = true;
-    rev = "932046905a57f698406318765a60807a1f81257d";
-    sha256 = "0zgkmq3jgysrsb6cm6sfbgqpgfpwv8nxlgkqm29zzvb97j56bm7z";
+    rev = "830ab2e9dd1db8cf56d12c71057157e5d8e9fd74";
+    sha256 = "1hyly5inis59cvh0r7lyi203h8v5jh84ca9jpaljm53cvw6d93px";
   };
 
   buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ];

From 8bdeca0c15b69626328bfe97545841be50bc5f21 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 25 Feb 2017 21:53:11 +0100
Subject: [PATCH 1130/3449] x42-plugins: 20160825 -> 20161230

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

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 64ffeced13de..69288880cb2a 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
 , mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  version = "20160825";
+  version = "20161230";
   name = "x42-plugins-${version}";
 
   src = fetchurl {
     url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
-    sha256 = "13ln5ccmrrc07ykfp040389av60dlgqz1kh6vfjkga6sq7z51msr";
+    sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5";
   };
 
   buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig  zita-convolver];

From 6992824ec107f555326b08b3db8e667c317bd700 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Feb 2017 00:59:38 +0100
Subject: [PATCH 1131/3449] jack2-unstable: 2016-08-18 -> 2017-02-23

---
 pkgs/misc/jackaudio/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/jackaudio/unstable.nix b/pkgs/misc/jackaudio/unstable.nix
index deda40e7cba2..a2026dacc93a 100644
--- a/pkgs/misc/jackaudio/unstable.nix
+++ b/pkgs/misc/jackaudio/unstable.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}jack2-unstable-${version}";
-  version = "2016-08-18";
+  version = "2017-02-23";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
-    rev = "f2ece2418c875eb7e7ac3d25fbb484ddda47ab46";
-    sha256 = "0cvb0m6qz3k8a5njwyw65l4y3izi2rsh512hv5va97kjc6wzzx4j";
+    rev = "4cf826c82c8f865c281833f92f8182d457277b3a";
+    sha256 = "100pkc324m57ci3fb99d3api6wh6g58lya6ssly9hxyhdsa3i7bk";
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];

From 242f6caac6e4033d0ff2827d87da807a629bc7b4 Mon Sep 17 00:00:00 2001
From: Christopher League <league@contrapunctus.net>
Date: Wed, 22 Feb 2017 08:13:01 -0500
Subject: [PATCH 1132/3449] logisim: use better jar wrapper, closes #23068

---
 .../science/logic/logisim/default.nix             | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix
index 27c8947b8cc2..50ef1edf63e2 100644
--- a/pkgs/applications/science/logic/logisim/default.nix
+++ b/pkgs/applications/science/logic/logisim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jre }:
+{ stdenv, fetchurl, jre, makeWrapper }:
 
 let version = "2.7.1"; in
 
@@ -11,17 +11,12 @@ stdenv.mkDerivation {
   };
   
   phases = [ "installPhase" ];
-  
+
+  nativeBuildInputs = [makeWrapper];
+
   installPhase = ''
     mkdir -pv $out/bin
-    cp -v $src $out/logisim.jar
-    
-    cat > $out/bin/logisim << EOF
-    #!${stdenv.shell}
-    ${jre}/bin/java -jar $out/logisim.jar
-    EOF
-    
-    chmod +x $out/bin/logisim
+    makeWrapper ${jre}/bin/java $out/bin/logisim --add-flags "-jar $src"
   '';
   
   meta = {

From 78d3a11384185bcaeaae195cf8bc757d9ac0a130 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 10:15:30 +0100
Subject: [PATCH 1133/3449] mpv: 0.23.0 -> 0.24.0

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 021c09a47e68..3a5313b78279 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.23.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "02k8p4z1mwxxlg9spwwrlcciia80kyrpp09hpl60g22h85jj1ng9";
+    sha256 = "1aq1lvhw4l0i2gc9x6ijaaj2h3894jbcpd4j055n0y9vg9vqm6yy";
   };
 
   patchPhase = ''
@@ -170,7 +170,7 @@ in stdenv.mkDerivation rec {
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = http://mpv.io;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ AndersonTorres fuuzetsu ];
+    maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ];
     platforms = platforms.darwin ++ platforms.linux;
 
     longDescription = ''

From a50222b1a33360c693be5ff558757bc06f339c0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Feb 2017 10:31:55 +0100
Subject: [PATCH 1134/3449] doc/configuration: tidy up text around #23130
 changes

---
 doc/configuration.xml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index 064c72a76301..56950e07ab5c 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -10,7 +10,7 @@ will prevent installation if any of the following criteria are
 true:</para>
 
 <itemizedlist>
-  <listitem><para>The packages is thought to be broken, and has had
+  <listitem><para>The package is thought to be broken, and has had
   its <literal>meta.broken</literal> set to
   <literal>true</literal>.</para></listitem>
 
@@ -23,7 +23,14 @@ true:</para>
   <literal>meta.knownVulnerabilities</literal>.</para></listitem>
 </itemizedlist>
 
-<para>Each of these criteria can be altering the nixpkgs
+<para>Note that all this is checked during evaluation already,
+and the check includes any package that is evaluated.
+In particular, all build-time dependencies are checked.
+<literal>nix-env -qa</literal> will (attempt to) hide any packages
+that would be refused.
+</para>
+
+<para>Each of these criteria can be altered in the nixpkgs
 configuration.</para>
 
 <para>The nixpkgs configuration for a NixOS system is set in the
@@ -68,10 +75,11 @@ configuration file located at
       add <literal>allowBroken = true;</literal> to your user's
       configuration file, like this:
 
-      <programlisting>
+<programlisting>
 {
   allowBroken = true;
-}</programlisting>
+}
+</programlisting>
     </para></listitem>
   </itemizedlist>
 </section>
@@ -156,7 +164,7 @@ configuration file located at
   </title>
 
   <para>There are several ways to tweak how Nix handles a package
-  which has been marked as unfree.</para>
+  which has been marked as insecure.</para>
 
   <itemizedlist>
     <listitem><para>

From de597b03f7953c9740a4c8615b0ab50b94c5e7c9 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 15 Jan 2017 02:16:07 -0600
Subject: [PATCH 1135/3449] lilypond-unstable: init at 2.19.24

---
 pkgs/misc/lilypond/unstable.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/misc/lilypond/unstable.nix

diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
new file mode 100644
index 000000000000..d16102df9278
--- /dev/null
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, guile, rsync, lilypond }:
+
+with stdenv.lib;
+
+overrideDerivation lilypond (p: rec {
+  majorVersion = "2.19";
+  minorVersion = "24";
+  version="${majorVersion}.${minorVersion}";
+  name = "lilypond-${version}";
+
+  src = fetchurl {
+    url = "http://download.linuxaudio.org/lilypond/sources/v${majorVersion}/lilypond-${version}.tar.gz";
+    sha256 = "0wd57swrfc2nvkj10ipdbhq6gpnckiafg2b2kpd8aydsyp248iln";
+  };
+
+  configureFlags = [ "--disable-documentation" "--with-fonts-dir=${p.urwfonts}"];
+
+  buildInputs = p.buildInputs ++ [ rsync ];
+
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e91132586951..4c5c10bc3f60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17569,6 +17569,7 @@ with pkgs;
   kops = callPackage ../applications/networking/cluster/kops { };
 
   lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
+  lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; };
 
   mailcore2 = callPackage ../development/libraries/mailcore2 { };
 

From 57212c947b5a289fe4ee12e58a1246b608ef3fee Mon Sep 17 00:00:00 2001
From: Gavin Rogers <gavinskigavarno@gmail.com>
Date: Sun, 26 Feb 2017 04:49:56 -0500
Subject: [PATCH 1136/3449] e2fsprogs: fix on Darwin (#22973)

util-linux cowardly refuses to install on all platforms. Therefore we
cannot rely on it for external dependancies, in particular luuid.
e2fsprogs won't configure without the luuid dependancy being satisfied.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index c44c92efae00..739b7e7c9757 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libuuid }:
+{ stdenv, fetchurl, pkgconfig, libuuid, gettext }:
 
 stdenv.mkDerivation rec {
   name = "e2fsprogs-1.43.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "man" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libuuid ];
+  buildInputs = [ libuuid gettext ];
 
   crossAttrs = {
     preConfigure = ''
@@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  configureFlags = [
-    "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
+  configureFlags = 
+    if stdenv.isLinux then ["--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
     # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
-    "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"
-  ];
+    "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"]
+    else ["--enable-libuuid --disable-e2initrd-helper"]
+  ;
 
   # hacky way to make it install *.pc
   postInstall = ''

From 6afdc516b58ce04cea38debbdc816641651f405d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Feb 2017 10:56:11 +0100
Subject: [PATCH 1137/3449] e2fsprogs: style nitpicks, add meta.license

---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 739b7e7c9757..270637f7d37c 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -19,11 +19,14 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  configureFlags = 
-    if stdenv.isLinux then ["--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
-    # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
-    "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"]
-    else ["--enable-libuuid --disable-e2initrd-helper"]
+  configureFlags =
+    if stdenv.isLinux then [
+      "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
+      # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
+      "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"
+    ] else [
+      "--enable-libuuid --disable-e2initrd-helper"
+    ]
   ;
 
   # hacky way to make it install *.pc
@@ -34,10 +37,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://e2fsprogs.sourceforge.net/;
     description = "Tools for creating and checking ext2/ext3/ext4 filesystems";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }

From 716c964b216020b65bae5831fd833de3964199dd Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 26 Feb 2017 10:59:40 +0100
Subject: [PATCH 1138/3449] luakit: remove

There was no release for luakit in the last 5 years, so I suggest to
remove it. Also because there are alternatives for vi-like browsers.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 .../networking/browsers/luakit/default.nix    | 55 -------------------
 pkgs/top-level/all-packages.nix               |  7 ---
 2 files changed, 62 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/luakit/default.nix

diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
deleted file mode 100644
index 163eb8cf5890..000000000000
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv , fetchurl , git , glib_networking , gsettings_desktop_schemas , gtk,
-help2man , libunique , lua5 , luafilesystem , luajit , luasqlite3, makeWrapper,
-pkgconfig , sqlite , webkit }:
-
-let
-  lualibs       = [ luafilesystem luasqlite3 ];
-  getPath       = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}";
-  getLuaPath    = lib : getPath lib "lua";
-  getLuaCPath   = lib : getPath lib "so";
-  luaPath       = stdenv.lib.concatStringsSep ";" (map getLuaPath lualibs);
-  luaCPath      = stdenv.lib.concatStringsSep ";" (map getLuaCPath lualibs);
-in
-stdenv.mkDerivation {
-
-  name = "luakit-2012.09.13";
-
-  meta = with stdenv.lib; {
-    description = "Fast, small, webkit based browser framework extensible in Lua";
-    homepage    = "http://luakit.org";
-    license     = licenses.gpl3;
-    maintainers = with maintainers; [ matthiasbeyer ];
-    platforms   = platforms.linux; # I only tested linux
-  };
-
-  src = fetchurl {
-    url = "https://github.com/mason-larobina/luakit/archive/2012.09.13-r1.tar.gz";
-    sha256 = "067g3bp5w20jypc8rx54dpbn3ysbgxzchgpq7sld5yh2z36s1l52";
-  };
-
-  buildInputs = [ git gsettings_desktop_schemas gtk help2man libunique lua5
-    luafilesystem luajit luasqlite3 makeWrapper pkgconfig sqlite webkit ];
-
-  postPatch = ''
-    sed -i -e "s/DESTDIR/INSTALLDIR/" ./Makefile
-    sed -i -e "s|/etc/xdg/luakit/|$out/etc/xdg/luakit/|" lib/lousy/util.lua
-    patchShebangs ./build-utils
-  '';
-
-  buildPhase = ''
-    make DEVELOPMENT_PATHS=0 USE_LUAJIT=1 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1
-  '';
-
-  installPhase = let
-    luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
-  in ''
-    make DEVELOPMENT_PATHS=0 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1 install
-    wrapProgram $out/bin/luakit                                         \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/usr/share/:$out/share/:$GSETTINGS_SCHEMAS_PATH"     \
-      --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"                         \
-      --set LUA_PATH '${luaKitPath};${luaPath};'                      \
-      --set LUA_CPATH '${luaCPath};'
-  '';
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a5d95916ee2..2fb30f3b406a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14193,13 +14193,6 @@ with pkgs;
 
   lrzsz = callPackage ../tools/misc/lrzsz { };
 
-  luakit = callPackage ../applications/networking/browsers/luakit {
-      inherit (lua51Packages) luafilesystem luasqlite3;
-      lua5 = lua5_1;
-      gtk = gtk3;
-      webkit = webkitgtk2;
-  };
-
   luminanceHDR = qt55.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };

From 488ece816949bbb92462071255c1c56cdbd74ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Feb 2017 11:01:44 +0100
Subject: [PATCH 1139/3449] e2fsprogs: avoid larger rebuild on Linux

I didn't notice this.  Perhaps it's through libarchive.
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 270637f7d37c..8703e81fb1dc 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" "man" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libuuid gettext ];
+  buildInputs = [ libuuid ] ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
 
   crossAttrs = {
     preConfigure = ''

From 0b27c74eb2517d307b1c1bbd04567157fba7cb63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Czy=C5=BC?= <tomasz.czyz@gmail.com>
Date: Sun, 26 Feb 2017 10:14:32 +0000
Subject: [PATCH 1140/3449] pgjwt: init at 0.0.1 (#22644)

---
 nixos/release.nix                             |  1 +
 nixos/tests/pgjwt.nix                         | 42 +++++++++++++++++++
 pkgs/servers/sql/postgresql/pgjwt/default.nix | 25 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 70 insertions(+)
 create mode 100644 nixos/tests/pgjwt.nix
 create mode 100644 pkgs/servers/sql/postgresql/pgjwt/default.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 0f93deddf263..2bfe8eada0b8 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -286,6 +286,7 @@ in rec {
   tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
   #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
   tests.peerflix = callTest tests/peerflix.nix {};
+  tests.pgjwt = callTest tests/pgjwt.nix {};
   tests.postgresql = callTest tests/postgresql.nix {};
   tests.printing = callTest tests/printing.nix {};
   tests.proxy = callTest tests/proxy.nix {};
diff --git a/nixos/tests/pgjwt.nix b/nixos/tests/pgjwt.nix
new file mode 100644
index 000000000000..2cf2963ae316
--- /dev/null
+++ b/nixos/tests/pgjwt.nix
@@ -0,0 +1,42 @@
+import ./make-test.nix ({ pkgs, ...} : 
+let
+  test = pkgs.writeText "test.sql" ''
+    CREATE EXTENSION pgcrypto;
+    CREATE EXTENSION pgjwt;
+    select sign('{"sub":"1234567890","name":"John Doe","admin":true}', 'secret');
+    select * from verify('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWV9.TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ', 'secret');
+  '';
+in
+{
+  name = "pgjwt";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ spinus ];
+  };
+
+  nodes = {
+    master =
+      { pkgs, config, ... }:
+
+      {
+        services.postgresql = let mypg = pkgs.postgresql95; in {
+            enable = true;
+            package = mypg;
+            extraPlugins =[pkgs.pgjwt];
+            initialScript =  pkgs.writeText "postgresql-init.sql"
+          ''
+          CREATE ROLE postgres WITH superuser login createdb;
+          '';
+          };
+      };
+  };
+
+  testScript = ''
+    startAll;
+    $master->waitForUnit("postgresql");
+    $master->succeed("timeout 10 bash -c 'while ! psql postgres -c \"SELECT 1;\";do sleep 1;done;'");
+    $master->succeed("cat ${test} | psql postgres");
+    # I can't make original test working :[
+    # $master->succeed("${pkgs.perlPackages.TAPParserSourceHandlerpgTAP}/bin/pg_prove -d postgres ${pkgs.pgjwt.src}/test.sql");
+
+  '';
+})
diff --git a/pkgs/servers/sql/postgresql/pgjwt/default.nix b/pkgs/servers/sql/postgresql/pgjwt/default.nix
new file mode 100644
index 000000000000..b4955f8184c2
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/pgjwt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name = "pgjwt-${version}";
+  version = "0.0.1";
+  src = fetchFromGitHub {
+    owner = "michelp";
+    repo = "pgjwt";
+    rev = "12a41eef15e6d3a22399e03178560d5174d496a3";
+    sha256 = "1dgx7kqkf9d7j5qj3xykx238xm8jg0s6c8h7zyl4lx8dmbz9sgsv";
+  };
+  dontBuild = true;
+  installPhase = ''
+    mkdir -p $out/bin  # current postgresql extension mechanism in nixos requires bin directory
+    mkdir -p $out/share/extension
+    cp pg*sql *.control $out/share/extension
+  '';
+  meta = with stdenv.lib; {
+    description = "PostgreSQL implementation of JSON Web Tokens";
+    longDescription = ''
+      sign() and verify() functions to create and verify JSON Web Tokens.
+    '';
+    license = licenses.mit;
+    maintainers = with maintainers; [spinus];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a5d95916ee2..a02327d81852 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2141,6 +2141,8 @@ with pkgs;
 
   pgf_graphics = callPackage ../tools/graphics/pgf { };
 
+  pgjwt = callPackage ../servers/sql/postgresql/pgjwt {};
+
   pigz = callPackage ../tools/compression/pigz { };
 
   pixz = callPackage ../tools/compression/pixz { };

From 289d808dcf811342312091e1a1eb543a3aac1b0d Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sun, 26 Feb 2017 11:16:36 +0100
Subject: [PATCH 1141/3449] pythonPackages.publicsuffix: 1.0.2 -> 1.1.0
 (#23164)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3561a93a2b65..bdc70e8f8d42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19389,13 +19389,22 @@ in {
 
   publicsuffix = buildPythonPackage rec {
     name = "publicsuffix-${version}";
-    version = "1.0.2";
+    version = "1.1.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/publicsuffix/${name}.tar.gz";
-      sha256 = "f6dfcb8a33fb3ac4f09e644cd26f8af6a09d1a45a019d105c8da58e289ca0096";
+      sha256 = "1adx520249z2cy7ykwjr1k190mn2888wqn9jf8qm27ly4qymjxxf";
     };
 
+    # fix the ASCII-mode LICENSE file read
+    # disable test_fetch and the doctests (which also invoke fetch)
+    patchPhase = optionalString isPy3k ''
+      sed -i "s/)\.read(/,encoding='utf-8'\0/" setup.py
+    '' + ''
+      sed -i -e "/def test_fetch/i\\
+      \\t@unittest.skip('requires internet')" -e "/def additional_tests():/,+1d" tests.py
+    '';
+
     meta = {
       description = "Allows to get the public suffix of a domain name";
       homepage = "http://pypi.python.org/pypi/publicsuffix/";

From a85b55e4cddb4ab5eee9af50ea5da973b426b333 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 30 Jan 2017 18:35:51 +0800
Subject: [PATCH 1142/3449] microcode-intel: 20160714 -> 20161104

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

diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 6fa947fea17a..ee9d25dfe206 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "microcode-intel-${version}";
-  version = "20160714";
+  version = "20161104";
 
   src = fetchurl {
-    url = "http://downloadmirror.intel.com/26156/eng/microcode-${version}.tgz";
-    sha256 = "03l4pkymrgbd5y9m5ys7kq85zvckmjbw7xr6pkzg2nr7jgycdagk";
+    url = "http://downloadmirror.intel.com/26400/eng/microcode-${version}.tgz";
+    sha256 = "1lg3bvznvwcxf66k038c57brkcxfva8crpnzj5idmczr5yk4q5bh";
   };
 
   buildInputs = [ libarchive ];

From 189e7add9ba012e2eee268c9b12595d852f7fd2b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 15 Feb 2017 04:00:28 +0100
Subject: [PATCH 1143/3449] ja2-stracciatella: init 0.15.1

This is the open-source version of the venerable Jagged Alliance 2.

Stracciatella means almost vanilla. This version is only changed for
fixes, stability improvements and to host mods.

The original data files are non-free and have to be provided by the user.
---
 pkgs/games/ja2-stracciatella/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/games/ja2-stracciatella/default.nix

diff --git a/pkgs/games/ja2-stracciatella/default.nix b/pkgs/games/ja2-stracciatella/default.nix
new file mode 100644
index 000000000000..682021eee699
--- /dev/null
+++ b/pkgs/games/ja2-stracciatella/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchFromGitHub, SDL }:
+
+stdenv.mkDerivation rec {
+  version = "0.15.1";
+  name = "ja2-stracciatella-${version}";
+  src = fetchFromGitHub {
+    owner = "ja2-stracciatella";
+    repo = "ja2-stracciatella";
+    rev = "v${version}";
+    sha256 = "0r7j6k7412b3qfb1rnh80s55zhnriw0v03zn5bp3spcqjxh4xhv1";
+  };
+  enableParallelBuilding = true;
+  buildInputs = [ SDL ];
+  meta = {
+    description = "Jagged Alliance 2, with community fixes";
+    license = "SFI Source Code license agreement";
+    homepage = "https://ja2-stracciatella.github.io/";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16ec2896a9fe..68356d1f247a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16301,6 +16301,8 @@ with pkgs;
     lua = lua5;
   };
 
+  ja2-stracciatella = callPackage ../games/ja2-stracciatella { };
+
   klavaro = callPackage ../games/klavaro {};
 
   kobodeluxe = callPackage ../games/kobodeluxe { };

From e3f18ec9a39cfec367d9340a89d3e0081c97f9e3 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sun, 26 Feb 2017 19:37:17 +0900
Subject: [PATCH 1144/3449] parsimonious: 0.6.2 -> 0.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bdc70e8f8d42..240dc484545f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29698,21 +29698,20 @@ EOF
   };
 
   parsimonious = buildPythonPackage rec {
-    version = "0.6.2";
+    version = "0.7.0";
     name = "parsimonious-${version}";
-    disabled = ! isPy27;
     src = pkgs.fetchFromGitHub {
       repo = "parsimonious";
       owner = "erikrose";
       rev = version;
-      sha256 = "1wf12adzhqjibbhy2m9abfqdgbb6z97s7wydhasir70307rqf9rj";
+      sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a";
     };
 
-    propagatedBuildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ nose six ];
 
     meta = {
       homepage = "https://github.com/erikrose/parsimonious";
-      description = "Fast arbitrary-lookahead packrat parser written in pure Python";
+      description = "Fast arbitrary-lookahead parser written in pure Python";
       license = licenses.mit;
     };
   };

From b4d8eddf48b471008822a033624ef59f8bfaa495 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sun, 26 Feb 2017 20:21:24 +0900
Subject: [PATCH 1145/3449] linkchecker: fix darwin build

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

diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix
index 59699076a3ac..d6906fdc554f 100644
--- a/pkgs/tools/networking/linkchecker/default.nix
+++ b/pkgs/tools/networking/linkchecker/default.nix
@@ -26,6 +26,10 @@ python2Packages.buildPythonApplication rec {
   checkPhase = ''
     # the mime test fails for me...
     rm tests/test_mimeutil.py
+    ${lib.optionalString stdenv.isDarwin ''
+    # network tests fails on darwin
+    rm tests/test_network.py
+    ''}
     make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py"
   '';
 

From 45f3a17785bc3a2effecb36de90d7d6a125d1b9a Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sun, 26 Feb 2017 17:35:55 +0900
Subject: [PATCH 1146/3449] styx and themes: 0.5.0 -> 0.6.0

---
 pkgs/applications/misc/styx/default.nix | 16 +++++++---
 pkgs/applications/misc/styx/themes.nix  | 40 ++++++++++++-------------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index 23761feb0ec2..8e3b0e747ae1 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -1,20 +1,22 @@
 { stdenv, fetchFromGitHub, caddy, asciidoctor
-, file, lessc, sass, multimarkdown }:
+, file, lessc, sass, multimarkdown, linkchecker
+, perlPackages, python27 }:
 
 stdenv.mkDerivation rec {
   name    = "styx-${version}";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner  = "styx-static";
     repo   = "styx";
     rev    = "v${version}";
-    sha256 = "0v36i40cwrajsd02xjfdldih5g493m28lhzgjg1gd3pwk2yd6rm1";
+    sha256 = "1dl6zmic8bv17f3ib8by66c2fj7izlnv9dh2cfa2m0ipkxk930vk";
   };
 
   setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`";
 
   server = "${caddy.bin}/bin/caddy";
+  linkcheck = "${linkchecker}/bin/linkchecker";
 
   nativeBuildInputs = [ asciidoctor ];
 
@@ -24,6 +26,8 @@ stdenv.mkDerivation rec {
     sass
     asciidoctor
     multimarkdown
+    perlPackages.ImageExifTool
+    (python27.withPackages (ps: [ ps.parsimonious ]))
   ];
 
   outputs = [ "out" "lib" ];
@@ -34,16 +38,20 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/share/styx
     cp -r scaffold $out/share/styx
-    cp    builder.nix $out/share/styx
+    cp -r nix $out/share/styx
 
     mkdir -p $out/share/doc/styx
     asciidoctor doc/index.adoc       -o $out/share/doc/styx/index.html
     asciidoctor doc/styx-themes.adoc -o $out/share/doc/styx/styx-themes.html
+    asciidoctor doc/library.adoc     -o $out/share/doc/styx/library.html
+    cp -r doc/highlight $out/share/doc/styx/
     cp -r doc/imgs $out/share/doc/styx/
+    cp -r tools $out/share
 
     substituteAllInPlace $out/bin/styx
     substituteAllInPlace $out/share/doc/styx/index.html
     substituteAllInPlace $out/share/doc/styx/styx-themes.html
+    substituteAllInPlace $out/share/doc/styx/library.html
 
     mkdir $lib
     cp -r lib/* $lib
diff --git a/pkgs/applications/misc/styx/themes.nix b/pkgs/applications/misc/styx/themes.nix
index 86904a73584d..e0bea3b23b6b 100644
--- a/pkgs/applications/misc/styx/themes.nix
+++ b/pkgs/applications/misc/styx/themes.nix
@@ -26,12 +26,12 @@ let
 
 in
 {
-  agency = mkThemeDrv {
+  agency = mkThemeDrv rec {
     themeName = "agency";
-    version   = "2017-01-17";
+    version   = "0.6.0";
     src = {
-      rev    = "3201f65841c9e7f97cc0ab0264cafb01b1620ed7";
-      sha256 = "1b3547lzmhs1lmr9gln1yvh5xrsg92m8ngrjwf0ny91y81x04da6";
+      rev    = "v${version}";
+      sha256 = "1i9bajzgmxd3ffvgic6wwnqijsgkfr2mfdijkgw9yf3bxcdq5cb6";
     };
     meta = {
       license = stdenv.lib.licenses.asl20;
@@ -44,24 +44,24 @@ in
     };
   };
 
-  generic-templates = mkThemeDrv {
+  generic-templates = mkThemeDrv rec {
     themeName = "generic-templates";
-    version   = "2017-01-18";
+    version   = "0.6.0";
     src = {
-      rev    = "af7cd527584322d8731a306a137a1794b18ad71a";
-      sha256 = "18zk4qihi8iw5dxkm9sf6cjai1mf22l6q1ykkrgaxjd5709is0li";
+      rev    = "v${version}";
+      sha256 = "0wr2687pffczn0sns1xvqxr2gpf5v9j64zbj6q9f7km6bq0zpiiy";
     };
     meta = {
       license = stdenv.lib.licenses.mit;
     };
   };
 
-  hyde = mkThemeDrv {
+  hyde = mkThemeDrv rec {
     themeName = "hyde";
-    version   = "2017-01-17";
+    version   = "0.6.0";
     src = {
-      rev    = "22caf4edc738f399bb1013d8e968d111c7fa2a59";
-      sha256 = "1a2j3m941vc2pyb1dz341ww5l3xblg527szfrfqh588lmsrkdqb6";
+      rev    = "v${version}";
+      sha256 = "0yca76p297ymxd049fkcpw8bca5b9yvv36707z31jbijriy50zxb";
     };
     meta = {
       license = stdenv.lib.licenses.mit;
@@ -72,12 +72,12 @@ in
     };
   };
 
-  orbit = mkThemeDrv {
+  orbit = mkThemeDrv rec {
     themeName = "orbit";
-    version   = "2017-01-17";
+    version   = "0.6.0";
     src = {
-      rev    = "b5896e25561f05e026b34d04ad95a647ddfc3d03";
-      sha256 = "11p11f2d0swgjil5hfx153yw13p7pcp6fwx1bnvxrlfmmx9x2yj5";
+      rev    = "v${version}";
+      sha256 = "0qdx1r7dcycr5hzl9ix70pl4xf0426ghpi1lgh61zdpdhcch0xfi";
     };
     meta = {
       license = stdenv.lib.licenses.cc-by-30;
@@ -87,12 +87,12 @@ in
     };
   };
 
-  showcase = mkThemeDrv {
+  showcase = mkThemeDrv rec {
     themeName = "showcase";
-    version   = "2017-01-17";
+    version   = "0.6.0";
     src = {
-      rev    = "1b4b9d4af29c05aaadfd58233f0e3f61fac726af";
-      sha256 = "0mwd1ycwvlv15y431336wwlv8mdv0ikz1aymh3yxhjyxqllc2snk";
+      rev    = "v${version}";
+      sha256 = "1jfhw49yag8l1zr69l01y1p4p88waig3xv3b6c3mfxc8jrchp7pb";
     };
     meta = {
       license = stdenv.lib.licenses.mit;

From 9c2ac51006db5b74f72f7958de80b0e3d7b2947e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 12:54:11 +0100
Subject: [PATCH 1147/3449] youtubeDL: 2017.02.17 -> 2017.02.24.1

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 175281d2a48f..b3104d6629d7 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.02.17";
+  version = "2017.02.24.1";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "06k0g3s0c27f0kwhvm2gpk01q0q0cbhqh09zvh19svl1zc2ky72b";
+    sha256 = "1m2mmnjf7zw0vsbw6vjl8b4p8wa3jdmdzli970cp26awgkq5c15v";
   };
 
   buildInputs = [ zip makeWrapper ] ++ optional generateManPage pandoc;

From a0cfe05ebb856de685ee621a388d12a553eb7de3 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 21 Feb 2017 15:52:43 -0600
Subject: [PATCH 1148/3449] hiawatha: init at 10.5

Removed un-needed phase; re-enabled SSL as default

Hiawatha: fix indentation

Hiawatha: Removed 'pkgs'

fixes #23060
---
 pkgs/servers/http/hiawatha/default.nix | 51 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/servers/http/hiawatha/default.nix

diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
new file mode 100644
index 000000000000..26566b2281cc
--- /dev/null
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, cmake,
+  libxslt, zlib, libxml2, openssl,
+  enableSSL ? true,
+  enableMonitor ? false,
+  enableRproxy ? true,
+  enableTomahawk ? false,
+  enableXSLT ? true,
+  enableToolkit ? true
+}:
+
+assert enableSSL -> openssl !=null;
+
+stdenv.mkDerivation rec {
+  name = "hiawatha-${version}";
+  version = "10.5";
+
+  src = fetchurl {
+    url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz";
+    sha256 = "11nqdmmhq1glgsiza8pfh69wmpgwl51vb3xijmpcxv63a7ywp4fj";
+  };
+
+  buildInputs =  [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ;
+
+  cmakeFlags = [
+    ( if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" )
+    ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" )
+    ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" )
+    ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" )
+    ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" )
+    ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" )
+    "-DWEBROOT_DIR=/var/www/hiawatha"
+    "-DPID_DIR=/run"
+    "-DWORK_DIR=/var/lib/hiawatha"
+    "-DLOG_DIR=/var/log/hiawatha"
+  ];
+
+  # workaround because cmake tries installs stuff outside of nix store
+  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+  postInstall = ''
+    mv $out/$out/* $out
+    rm -rf $out/{var,run}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An advanced and secure webserver";
+    license = licenses.gpl2;
+    homepage = "https://www.hiawatha-webserver.org";
+    maintainer = [ maintainers.ndowens ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68356d1f247a..540198d3b042 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10431,6 +10431,8 @@ with pkgs;
 
   hbase = callPackage ../servers/hbase {};
 
+  hiawatha = callPackage ../servers/http/hiawatha {};
+  
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
   jboss = callPackage ../servers/http/jboss { };

From 6edbf0ffa6fde6e4616a2e84aefa4e106a57f4a0 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sun, 26 Feb 2017 13:05:30 +0100
Subject: [PATCH 1149/3449] sonarr: 2.0.0.4472 -> 2.0.0.4613

---
 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 6f553f707124..1e7ddb53e23a 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.4472";
+  version = "2.0.0.4613";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "0sz03z057pyai151lxsdsgxlv6kvrnd1xxw7i1ss7b79l6xgmpw8";
+    sha256 = "1a8wm50aw7yyigvywx7hgy58w60mi4s60dqvwwlgrbavl4z5jphl";
   };
 
   buildInputs = [

From b508c1b7926bc8f63c70ca696dcb4e9dcddbd6ee Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sun, 26 Feb 2017 13:22:15 +0100
Subject: [PATCH 1150/3449] nzbget: 17.1 -> 18.0

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

diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index 18995553d0a3..5cffb6c5c0e4 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "nzbget-${version}";
-  version = "17.1";
+  version = "18.0";
 
   src = fetchurl {
     url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
-    sha256 = "0fcw43bigjmgxcz1jvqpd01sz4vciqsm311cbfv9lvmvv40gag2b";
+    sha256 = "0nzm2qbhwrbq02ynfl2vgs6k58bk5fk45d3547a4g1lqhri3dijb";
   };
 
   buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls

From e2c95b46e5fbd9f28cc7714802f9cd3b632fd979 Mon Sep 17 00:00:00 2001
From: Jookia <166291@gmail.com>
Date: Thu, 22 Sep 2016 15:45:42 +1000
Subject: [PATCH 1151/3449] nftables module: Add new module for nftables
 firewall settings

fixes #18842
---
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/nftables.nix  | 174 ++++++++++++++++++
 2 files changed, 175 insertions(+)
 create mode 100644 nixos/modules/services/networking/nftables.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ec985acae3b..3df3e9012ef4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -427,6 +427,7 @@
   ./services/networking/namecoind.nix
   ./services/networking/nat.nix
   ./services/networking/networkmanager.nix
+  ./services/networking/nftables.nix
   ./services/networking/ngircd.nix
   ./services/networking/nix-serve.nix
   ./services/networking/nntp-proxy.nix
diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
new file mode 100644
index 000000000000..54cbba4937cc
--- /dev/null
+++ b/nixos/modules/services/networking/nftables.nix
@@ -0,0 +1,174 @@
+{ config, pkgs, lib, ... }:
+with lib;
+let
+  cfg = config.networking.nftables;
+in
+{
+  ###### interface
+
+  options = {
+    networking.nftables.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description =
+        ''
+          Whether to enable nftables.  nftables is a Linux-based packet
+          filtering framework intended to replace frameworks like iptables.
+
+          This conflicts with the standard networking firewall, so make sure to
+          disable it before using nftables.
+        '';
+    };
+    networking.nftables.ruleset = mkOption {
+      type = types.lines;
+      default =
+        ''
+          table inet filter {
+            # Block all IPv4/IPv6 input traffic except SSH.
+            chain input {
+              type filter hook input priority 0;
+              ct state invalid reject
+              ct state {established, related} accept
+              iifname lo accept
+              tcp dport 22 accept
+              reject
+            }
+
+            # Allow anything in.
+            chain output {
+              type filter hook output priority 0;
+              ct state invalid reject
+              ct state {established, related} accept
+              oifname lo accept
+              accept
+            }
+
+            chain forward {
+              type filter hook forward priority 0;
+              accept
+            }
+          }
+        '';
+      example =
+        ''
+          # Check out http://wiki.nftables.org/ for better documentation.
+
+          define LAN = 192.168.0.1/24
+
+          # Handle IPv4 traffic.
+          table ip filter {
+            chain input {
+              type filter hook input priority 0;
+              # Handle existing connections.
+              ct state invalid reject
+              ct state {established, related} accept
+              # Allow loopback for applications.
+              iifname lo accept
+              # Allow people to ping us on LAN.
+              ip protocol icmp ip daddr $LAN accept
+              # Allow SSH over LAN.
+              tcp dport 22 ip daddr $LAN accept
+              # Reject all other output traffic.
+              reject
+            }
+
+            chain output {
+              type filter hook output priority 0;
+              # Handle existing connections.
+              ct state invalid reject
+              ct state {established, related} accept
+              # Allow loopback for applications.
+              oifname lo accept
+              # Allow the Tor user to run its daemon,
+              # but only on WAN in case of compromise.
+              skuid tor ip daddr != $LAN accept
+              # Allowing pinging others on LAN.
+              ip protocol icmp ip daddr $LAN accept
+              # Reject all other output traffic.
+              reject
+            }
+
+            chain forward {
+              type filter hook forward priority 0;
+              reject
+            }
+          }
+
+          # Block all IPv6 traffic.
+          table ip6 filter {
+            chain input {
+              type filter hook input priority 0;
+              reject
+            }
+
+            chain output {
+              type filter hook output priority 0;
+              reject
+            }
+
+            chain forward {
+              type filter hook forward priority 0;
+              reject
+            }
+          }
+        '';
+      description =
+        ''
+          The ruleset to be used with nftables.  Should be in a format that
+          can be loaded using "/bin/nft -f".  The ruleset is updated atomically.
+        '';
+    };
+    networking.nftables.rulesetFile = mkOption {
+      type = types.path;
+      default = pkgs.writeTextFile {
+        name = "nftables-rules";
+        text = cfg.ruleset;
+      };
+      description =
+        ''
+          The ruleset file to be used with nftables.  Should be in a format that
+          can be loaded using "nft -f".  The ruleset is updated atomically.
+        '';
+    };
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+    assertions = [{
+      assertion = config.networking.firewall.enable == false;
+      message = "You can not use nftables with services.networking.firewall.";
+    }];
+    boot.blacklistedKernelModules = [ "ip_tables" ];
+    environment.systemPackages = [ pkgs.nftables ];
+    systemd.services.nftables = {
+      description = "nftables firewall";
+      before = [ "network-pre.target" ];
+      wants = [ "network-pre.target" ];
+      wantedBy = [ "multi-user.target" ];
+      reloadIfChanged = true;
+      serviceConfig = let
+        rulesScript = pkgs.writeScript "nftables-rules" ''
+          #! ${pkgs.nftables}/bin/nft -f
+          flush ruleset
+          include "${cfg.rulesetFile}"
+        '';
+        checkScript = pkgs.writeScript "nftables-check" ''
+          #! ${pkgs.stdenv.shell} -e
+          if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then
+            echo "Unload ip_tables before using nftables!" 1>&2
+            exit 1
+          else
+            ${rulesScript}
+          fi
+        '';
+      in {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = checkScript;
+        ExecReload = checkScript;
+        ExecStop = "${pkgs.nftables}/bin/nft flush ruleset";
+      };
+    };
+  };
+}

From 0150d9a95cbca2b317cba9bb3c7acd48bd625209 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Feb 2017 14:01:44 +0100
Subject: [PATCH 1152/3449] grsecurity: 4.9.11-201702222257 ->
 4.9.12-201702231830

---
 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 c185442c772a..ad26b399a94b 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.11";
+  version = "4.9.12";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "3lh2nrkq3254diqdjry857gmh39ijxxhd7h8563jdzv9i8awv564zajpdcr6bjpf5swyicjsylifym2b5ww41b0fp6z4pkns9mmppny";
+    sha512 = "37riipfdm8xw53598w15l3x0gy06rmp22j1yf5wql2d1fzhgf29x007axdi7swq4jnpihd934mvpfb1sy42srkinps0x5gvv65n00bs";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c5a6b999f855..8ea41ff59372 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.11";
-      grrev  = "201702222257";
-      sha512 = "3yla1fw6iykzb19rpyqg910qhizi3njcywxksxcylf2z2da02i7nkjia0n0qn8n16lwlj44d9f59ka5xsml5r4vha77c850b6w436ni";
+    { kver   = "4.9.12";
+      grrev  = "201702231830";
+      sha512 = "1455wpdy5lizdibs86llaxf087vggl921dn83pf4cnc9fbzc5mwa46vazahv9g8467bb335vgg5fcba2i0026s1h9vcsvyy6470m4i3";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 4bb14b23ab971eb4bc607e122d4eaf36dab4f649 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Feb 2017 13:18:09 +0100
Subject: [PATCH 1153/3449] supercollider: 3.7.2 -> 3.8.0

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

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index dcb1f8e7062e..f32cb9db02a8 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -9,12 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "supercollider-${version}";
-  version = "3.7.2";
+  version = "3.8.0";
 
 
   src = fetchurl {
     url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
-    sha256 = "1mybxcnl7flliz74kdfnvh18v5dwd9zbdsw2kc7wpl4idcly1n0s";
+    sha256 = "053b2xc2x1sczvlb41w6iciqlwy0zyfiv3jrynx4f8jgd6mizsm6";
   };
 
   hardeningDisable = [ "stackprotector" ];

From d579b8c88e6a85127ce64e04b9bc1c37f6cce788 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sun, 26 Feb 2017 13:45:53 +0100
Subject: [PATCH 1154/3449] emby: 3.1.5 -> 3.2.4

---
 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 9fc0a303ad0e..340e376e9ed6 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.1.5";
+  version = "3.2.4";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0s0m456rxdrj58zbaby6mdgc1ndc3zx2c07n94hn3hdlgralgwaa";
+    sha256 = "0a14wr2yal9q5vlwadyki9w35bn4f3r7r5w3zynp4f7460lfapmf";
   };
 
   buildInputs = with pkgs; [

From 09f6b03b2e15d267303d4086f85b21fe498f3267 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 8 Feb 2017 23:54:44 +0100
Subject: [PATCH 1155/3449] Python 2.7: improve determinism

There is some randomness in the Windows installers. Since we don't need
them, we delete them.
---
 .../interpreters/python/cpython/2.7/default.nix       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index ccf9296e0bcb..0f09bf7650bf 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -178,6 +178,17 @@ in stdenv.mkDerivation {
         echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py
 
         rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
+
+        # Determinism: Windows installers were not deterministic.
+        # We're also not interested in building Windows installers.
+        find "$out" -name 'wininst*.exe' | xargs -r rm -f
+
+        # 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

From 8970a9c86e0fe0935ed5c53897874f38ba497fac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 9 Feb 2017 10:14:21 +0100
Subject: [PATCH 1156/3449] Python 3.5: improve determinism

- Windows installers are indeterministic and we don't need them.
- since Python 3 ensurepip is installed by default. pip is indeteministic and we don't need it.
- rebuild bytecode to ensure its deterministic
---
 .../python/cpython/3.5/default.nix            | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 215229086b75..10f2029e064c 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -50,6 +50,12 @@ in stdenv.mkDerivation {
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
 
+  # 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;
+
   prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
@@ -63,10 +69,25 @@ in stdenv.mkDerivation {
     })
   ];
 
-  postPatch = optionalString (x11Support && (tix != null)) ''
+  postPatch = ''
+    # Determinism
+    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
+    # Determinism. This is done unconditionally
+    substituteInPlace "Lib/importlib/_bootstrap_external.py" --replace "source_mtime = int(st['mtime'])" "source_mtime = 1"
+  '' + optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   '';
 
+  CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
+  LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
+  LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
+
+  configureFlags = [
+    "--enable-shared"
+    "--with-threads"
+    "--without-ensurepip"
+  ];
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
@@ -75,12 +96,6 @@ in stdenv.mkDerivation {
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
      ''}
-
-    configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
-                          LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
-                        )
   '';
 
   setupHook = ./setup-hook.sh;
@@ -103,6 +118,10 @@ in stdenv.mkDerivation {
     # 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"
@@ -110,6 +129,13 @@ 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"
+
+    # 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 -
   '';
 
   postFixup = ''

From dd3a501a4ba29c2e929928981dcac3768b44c77b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 9 Feb 2017 16:30:15 +0100
Subject: [PATCH 1157/3449] Python: mkPythonDerivation: use PYTHONHASHSEED=0

---
 .../interpreters/python/mk-python-derivation.nix           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index c8fedaf75fc9..69eea056c763 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -57,9 +57,12 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
 
   inherit pythonPath;
 
-  # patch python interpreter to write null timestamps when compiling python files
-  # this way python doesn't try to update them when we freeze timestamps in nix store
+
+  # 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;
 
   buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath
     ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]

From 14a88e76cf3009b00e7cd57050101a7291a042ed Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 19 Feb 2017 11:36:05 +0100
Subject: [PATCH 1158/3449] Python 3.5: use system expat and ffi

---
 .../development/interpreters/python/cpython/3.5/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 10f2029e064c..082f6ff67897 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, fetchpatch
 , bzip2
+, expat
+, libffi
 , gdbm
 , lzma
 , ncurses
@@ -32,7 +34,7 @@ let
   sitePackages = "lib/${libPrefix}/site-packages";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
+    zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
     ++ optionals x11Support [ tcl tk libX11 xproto ]
     ++ optionals stdenv.isDarwin [ CF configd ];
 
@@ -86,6 +88,8 @@ in stdenv.mkDerivation {
     "--enable-shared"
     "--with-threads"
     "--without-ensurepip"
+    "--with-system-expat"
+    "--with-system-ffi"
   ];
 
   preConfigure = ''

From 1531b5edd254fbc3a2d2eae869979045918cb29c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 15:03:24 +0100
Subject: [PATCH 1159/3449] Python 3.6: improve determinism

---
 .../python/cpython/3.6/default.nix            | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 42f8d109af2f..7ccd4fcede68 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -50,6 +50,12 @@ in stdenv.mkDerivation {
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
 
+  # 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;
+
   prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
@@ -63,10 +69,25 @@ in stdenv.mkDerivation {
     })
   ];
 
-  postPatch = optionalString (x11Support && (tix != null)) ''
+  postPatch = ''
+    # Determinism
+    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
+    # Determinism. This is done unconditionally
+    substituteInPlace "Lib/importlib/_bootstrap_external.py" --replace "source_mtime = int(st['mtime'])" "source_mtime = 1"
+  '' + optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   '';
 
+  CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
+  LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
+  LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
+
+  configureFlags = [
+    "--enable-shared"
+    "--with-threads"
+    "--without-ensurepip"
+  ];
+
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
       substituteInPlace ./setup.py --replace $i /no-such-path
@@ -75,12 +96,6 @@ in stdenv.mkDerivation {
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
      ''}
-
-    configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
-                          LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
-                        )
   '';
 
   setupHook = ./setup-hook.sh;
@@ -103,6 +118,10 @@ in stdenv.mkDerivation {
     # 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"
@@ -110,6 +129,13 @@ 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"
+
+    # 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

From d33f6f40321d98c58c32feb3faa943e7745623e1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 15:03:40 +0100
Subject: [PATCH 1160/3449] Python 3.6: use system expat and ffi

---
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 7ccd4fcede68..ebf621d50576 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -1,6 +1,8 @@
 { stdenv, fetchurl, fetchpatch
 , glibc
 , bzip2
+, expat
+, libffi
 , gdbm
 , lzma
 , ncurses
@@ -86,6 +88,8 @@ in stdenv.mkDerivation {
     "--enable-shared"
     "--with-threads"
     "--without-ensurepip"
+    "--with-system-expat"
+    "--with-system-ffi"
   ];
 
   preConfigure = ''

From 1bbf249befb19fd477613b278d012757e02c69ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 15:07:21 +0100
Subject: [PATCH 1161/3449] Python 3.4: improve determinism

---
 .../python/cpython/3.4/default.nix            | 45 ++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 72419f8e1943..7508c39319e2 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -50,21 +50,41 @@ in stdenv.mkDerivation {
 
   NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
 
+  # 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;
+
   prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
-  postPatch = optionalString (x11Support && (tix != null)) ''
+  postPatch = ''
+    # Determinism
+    substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
+    # Determinism. This is done unconditionally
+    substituteInPlace "Lib/importlib/_bootstrap_external.py" --replace "source_mtime = int(st['mtime'])" "source_mtime = 1"
+  '' + optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   ''
     # Avoid picking up getentropy() from glibc >= 2.25, as that would break
     # on older kernels.  http://bugs.python.org/issue29157
-    + optionalString stdenv.isLinux
-      ''
+    + optionalString stdenv.isLinux ''
         substituteInPlace Python/random.c --replace 'defined(HAVE_GETENTROPY)' '0'
         cat Python/random.c
-      '';
+  '';
+
+  CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}";
+  LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}";
+  LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}";
+
+  configureFlags = [
+    "--enable-shared"
+    "--with-threads"
+    "--without-ensurepip"
+  ];
 
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
@@ -74,12 +94,6 @@ in stdenv.mkDerivation {
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
      ''}
-
-    configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
-                          LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
-                        )
   '';
 
   setupHook = ./setup-hook.sh;
@@ -102,6 +116,10 @@ in stdenv.mkDerivation {
     # 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"
@@ -109,6 +127,13 @@ 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"
+
+    # 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 -
   '';
 
   postFixup = ''

From 57ded03833df30d15fbfe9238f02ddf1a88d2c65 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 15:07:35 +0100
Subject: [PATCH 1162/3449] Python 3.4: use system expat and ffi

---
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 7508c39319e2..44ee739fd394 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl
 , bzip2
+, expat
+, libffi
 , gdbm
 , lzma
 , ncurses
@@ -84,6 +86,8 @@ in stdenv.mkDerivation {
     "--enable-shared"
     "--with-threads"
     "--without-ensurepip"
+    "--with-system-expat"
+    "--with-system-ffi"
   ];
 
   preConfigure = ''

From 04b7a2791e50614fb36eb3dfc0c080c3617c9178 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 15:42:34 +0100
Subject: [PATCH 1163/3449] Python 3.4: improve determinism

---
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 44ee739fd394..143dbcd5686e 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -67,7 +67,7 @@ in stdenv.mkDerivation {
     # Determinism
     substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
     # Determinism. This is done unconditionally
-    substituteInPlace "Lib/importlib/_bootstrap_external.py" --replace "source_mtime = int(st['mtime'])" "source_mtime = 1"
+    substituteInPlace "Lib/importlib/_bootstrap.py" --replace "source_mtime = int(source_stats['mtime'])" "source_mtime = 1"
   '' + optionalString (x11Support && (tix != null)) ''
     substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'"
   ''

From 37704e90e29893121837b662eb0a34af2b8acf48 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 15:55:58 +0100
Subject: [PATCH 1164/3449] Python: explain deterministic build in docs

---
 doc/languages-frameworks/python.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 19f241fb185a..0c7e521b11ee 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -641,6 +641,19 @@ community to help save time. No tool is preferred at the moment.
 - [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas
 - [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin
 
+### Deterministic builds
+
+Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
+Minor modifications had to be made to the interpreters in order to generate
+deterministic bytecode. This has security implications and is relevant for
+those using Python in a `nix-shell`.
+
+When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1.
+The `buildPythonPackage` function sets `DETERMINISTIC_BUILD` as well as
+[PYTHONHASHSEED](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
+Both are also exported in `nix-shell`.
+
+
 ## FAQ
 
 ### How can I install a working Python environment?

From f69292ddc019d222a5c458c7095ccc8815abce53 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 22 Feb 2017 15:56:16 +0100
Subject: [PATCH 1165/3449] Python: explain deterministic builds in release
 notes

---
 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 3758a3bf2aac..aa9dc455ba22 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -253,6 +253,17 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+      <para>
+      Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
+      Minor modifications had to be made to the interpreters in order to generate
+      deterministic bytecode. This has security implications and is relevant for
+      those using Python in a <literal>nix-shell</literal>. See the Nixpkgs manual
+      for details.
+    </para>
+
+  </listitem>
+
 </itemizedlist>
 
 

From 8b40d2e305e861c4f18a96af943fa927125b9537 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 26 Feb 2017 09:16:01 -0500
Subject: [PATCH 1166/3449] mcelog: 144 -> 148

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

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index dee201c17783..64b937390f16 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "144";
+  version = "148";
 
   src = fetchFromGitHub {
-    sha256 = "05b1x9z6x9yz3xmb93qvwwssjbvp28bawy8as9bfm29pyhzdxx6k";
+    sha256 = "04mzscvr38r2q9da9wmv3cxb99vrkxks1mzgvwsxk753xan3p42c";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From ec47fac2c3d1a7e30cf403b88c3b6e34f83a7a68 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Feb 2017 15:34:49 +0100
Subject: [PATCH 1167/3449] ir.lv2: 1.2.2 -> 1.2.3

---
 pkgs/applications/audio/ir.lv2/default.nix | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index d6dbc4c55a98..cc613541a256 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchurl, fftw, gtk, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
+{ stdenv, fetchFromGitHub, fftw, gtk2, lv2, libsamplerate, libsndfile, pkgconfig, zita-convolver }:
 
 stdenv.mkDerivation rec {
   name = "ir.lv2-${version}";
-  version = "1.2.2";
+  version = "1.2.3";
 
-  src = fetchurl {
-    url = "http://factorial.hu/system/files/${name}.tar.gz";
-    sha256 = "17a6h2mv9xv41jpbx6bdakkngin4kqzh2v67l4076ddq609k5a7v";
+  src = fetchFromGitHub {
+    owner = "tomszilagyi";
+    repo = "ir.lv2";
+    rev = "${version}";
+    sha256 = "16vy06qb0vgwg4yx15grzh5m2q3cbzm3jd0p37g2qb8rgvjhladg";
   };
 
-  buildInputs = [ fftw gtk lv2 libsamplerate libsndfile pkgconfig zita-convolver ];
+  buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ];
 
-  buildPhase = ''
-    make
-    make convert4chan
-  '';
+  nativeBuildInputs = [  pkgconfig ];
+
+  postBuild = "make convert4chan";
 
   installPhase = ''
     mkdir -p "$out/bin"
@@ -23,10 +24,6 @@ stdenv.mkDerivation rec {
 
     make PREFIX="$out" install
     install -Dm755 convert4chan "$out/bin/convert4chan"
-    # fixed location
-    sed -i 's/, but seem like its gone://' README
-    sed -i  's@rhythminmind.net/1313@rhythminmind.net/STN@' README
-    install -Dm644 README "$out/share/doc/README"
   '';
 
   meta = with stdenv.lib; {

From 4bc1d02698967b4f0ced8b7a6a43b9244d0591b1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 26 Feb 2017 15:57:01 +0100
Subject: [PATCH 1168/3449] Python 2.7: increase priority

Higher priority than Python 3.x so that `/bin/python` points to
`/bin/python2` in case both 2 and 3 are installed.
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 0f09bf7650bf..c5306fe7891c 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -221,5 +221,8 @@ in stdenv.mkDerivation {
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
       maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
+      # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2`
+      # in case both 2 and 3 are installed.
+      priority = 5;
     };
   }

From 1b66b6a5ff018b231d26be205fd4d3947fb00ac0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 26 Feb 2017 15:57:16 +0100
Subject: [PATCH 1169/3449] pythonPackages.pyparsing: 2.1.8 -> 2.1.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8b49b2401f22..836fa10d5edc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20819,11 +20819,11 @@ in {
 
   pyparsing = buildPythonPackage rec {
     name = "pyparsing-${version}";
-    version = "2.1.8";
+    version = "2.1.10";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pyparsing/${name}.tar.gz";
-      sha256 = "0sy5fxhsvhf0fwk9h6nqlhn1lsjpdmg41jziw5z814rlkydqd903";
+      sha256 = "811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188";
     };
 
     # Not everything necessary to run the tests is included in the distribution

From 57afc0f5ef43774695482faa8765488c97287b42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 26 Feb 2017 15:57:27 +0100
Subject: [PATCH 1170/3449] pythonPackages.packaging: 16.7 -> 16.8

---
 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 836fa10d5edc..d093cb035392 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31908,10 +31908,10 @@ EOF
   };
 
   packaging = buildPythonPackage rec {
-    name = "packaging-16.7";
+    name = "packaging-16.8";
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/packaging/${name}.tar.gz";
-      sha256 = "07h18mrpqs0lv2x4fl43pqi0xj6hdrmrnm6v9q634yliagg6q91f";
+      sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e";
     };
     propagatedBuildInputs = with self; [ pyparsing six ];
     buildInputs = with self; [ pytest pretend ];

From 6c36d9fa208ac1b03966e4349f4850b2ec4301be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 26 Feb 2017 15:23:01 +0100
Subject: [PATCH 1171/3449] nftables: make default configuration null

reason:
 - We currently have an open discussion regarding a more modular
   firewall (https://github.com/NixOS/nixpkgs/issues/23181) and
   leaving null makes future extension easier.
 - the current default might not cover all use cases (different ssh port)
   and might break setups, if applied blindly
---
 .../modules/services/networking/nftables.nix  | 115 +++++-------------
 1 file changed, 33 insertions(+), 82 deletions(-)

diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 54cbba4937cc..029c3df89932 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -21,97 +21,48 @@ in
     };
     networking.nftables.ruleset = mkOption {
       type = types.lines;
-      default =
-        ''
-          table inet filter {
-            # Block all IPv4/IPv6 input traffic except SSH.
-            chain input {
-              type filter hook input priority 0;
-              ct state invalid reject
-              ct state {established, related} accept
-              iifname lo accept
-              tcp dport 22 accept
-              reject
-            }
+      example = ''
+        # Check out https://wiki.nftables.org/ for better documentation.
+        # Table for both IPv4 and IPv6.
+        table inet filter {
+          # Block all incomming connections traffic except SSH and "ping".
+          chain input {
+            type filter hook input priority 0;
 
-            # Allow anything in.
-            chain output {
-              type filter hook output priority 0;
-              ct state invalid reject
-              ct state {established, related} accept
-              oifname lo accept
-              accept
-            }
+            # accept any localhost traffic
+            iifname lo accept
 
-            chain forward {
-              type filter hook forward priority 0;
-              accept
-            }
-          }
-        '';
-      example =
-        ''
-          # Check out http://wiki.nftables.org/ for better documentation.
+            # accept traffic originated from us
+            ct state {established, related} accept
 
-          define LAN = 192.168.0.1/24
+            # ICMP
+            # routers may also want: mld-listener-query, nd-router-solicit
+            ip6 nexthdr icmpv6 icmpv6 type { destination-unreachable, packet-too-big, time-exceeded, parameter-problem, nd-router-advert, nd-neighbor-solicit, nd-neighbor-advert } accept
+            ip protocol icmp icmp type { destination-unreachable, router-advertisement, time-exceeded, parameter-problem } accept
 
-          # Handle IPv4 traffic.
-          table ip filter {
-            chain input {
-              type filter hook input priority 0;
-              # Handle existing connections.
-              ct state invalid reject
-              ct state {established, related} accept
-              # Allow loopback for applications.
-              iifname lo accept
-              # Allow people to ping us on LAN.
-              ip protocol icmp ip daddr $LAN accept
-              # Allow SSH over LAN.
-              tcp dport 22 ip daddr $LAN accept
-              # Reject all other output traffic.
-              reject
-            }
+            # allow "ping"
+            ip6 nexthdr icmp icmpv6 type echo-request accept
+            ip protocol icmp icmp type echo-request accept
 
-            chain output {
-              type filter hook output priority 0;
-              # Handle existing connections.
-              ct state invalid reject
-              ct state {established, related} accept
-              # Allow loopback for applications.
-              oifname lo accept
-              # Allow the Tor user to run its daemon,
-              # but only on WAN in case of compromise.
-              skuid tor ip daddr != $LAN accept
-              # Allowing pinging others on LAN.
-              ip protocol icmp ip daddr $LAN accept
-              # Reject all other output traffic.
-              reject
-            }
+            # accept SSH connections (required for a server)
+            tcp dport 22 accept
 
-            chain forward {
-              type filter hook forward priority 0;
-              reject
-            }
+            # count and drop any other traffic
+            counter drop
           }
 
-          # Block all IPv6 traffic.
-          table ip6 filter {
-            chain input {
-              type filter hook input priority 0;
-              reject
-            }
-
-            chain output {
-              type filter hook output priority 0;
-              reject
-            }
-
-            chain forward {
-              type filter hook forward priority 0;
-              reject
-            }
+          # Allow all outgoing connections.
+          chain output {
+            type filter hook output priority 0;
+            accept
           }
-        '';
+
+          chain forward {
+            type filter hook forward priority 0;
+            accept
+          }
+        }
+      '';
       description =
         ''
           The ruleset to be used with nftables.  Should be in a format that

From 079353e20851073e9b5de183ab24414d7cd54ccb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 26 Feb 2017 16:27:45 +0100
Subject: [PATCH 1172/3449] Python 2.7: increase priority - fixup

From the manual:

> This attribute should be a number, with a higher value denoting a
lower priority. The default priority is 0.

Just passing -5 or -10 wasn't sufficient, so let's make it -100.
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index c5306fe7891c..8426902414a7 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -223,6 +223,6 @@ in stdenv.mkDerivation {
       maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
       # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2`
       # in case both 2 and 3 are installed.
-      priority = 5;
+      priority = -100;
     };
   }

From 4b6f021251e60af9f61311e116eef043a2ed0d5d Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 26 Feb 2017 16:22:21 +0000
Subject: [PATCH 1173/3449] Revert "lightdm: obbey
 services.xserver.{window/desktop}Manager.default"

This reverts commit 29caa185a7e4aaa0d621a4f117f3e8f653261fda.

Not clear what the proper thing to do is. cf94cdb59b renders this
question mostly moot. Reverting before 17.03 branch to avoid a repeat
of #19054.
---
 nixos/modules/services/x11/display-managers/lightdm.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 4afef32aaa47..82b9a2fce5ab 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -46,15 +46,13 @@ let
       [Seat:*]
       xserver-command = ${xserverWrapper}
       session-wrapper = ${dmcfg.session.script}
-      ${optionalString (elem defaultSessionName dmcfg.session.names) ''
-        user-session = ${defaultSessionName}
-      ''}
       ${optionalString cfg.greeter.enable ''
         greeter-session = ${cfg.greeter.name}
       ''}
       ${optionalString cfg.autoLogin.enable ''
         autologin-user = ${cfg.autoLogin.user}
         autologin-user-timeout = ${toString cfg.autoLogin.timeout}
+        autologin-session = ${defaultSessionName}
       ''}
       ${cfg.extraSeatDefaults}
     '';

From 3a4c851b89040bb9d728659c7090a65b6e7659ea Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Sun, 26 Feb 2017 17:24:52 +0100
Subject: [PATCH 1174/3449] mysql57: Add developer_cmds as build input on
 darwin

---
 pkgs/servers/sql/mysql/5.7.x.nix | 4 ++--
 pkgs/top-level/all-packages.nix  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 71867a94ef25..be4ab80f7052 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl
-, boost, cctools, CoreServices }:
+, boost, cctools, CoreServices, developer_cmds }:
 
 # Note: zlib is not required; MySQL can use an internal zlib.
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ cmake bison ncurses openssl readline zlib boost ]
-     ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ];
+     ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 540198d3b042..b031c2019481 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10620,7 +10620,7 @@ with pkgs;
   };
 
   mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix {
-    inherit (darwin) cctools;
+    inherit (darwin) cctools developer_cmds;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     boost = boost159;
   };

From 14305066667a59f8b809274182fe7ae120b099bf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 26 Feb 2017 09:50:01 -0500
Subject: [PATCH 1175/3449] mcelog: init Machine Check Exception Logging Daemon
 service

---
 nixos/modules/hardware/mcelog.nix | 37 +++++++++++++++++++++++++++++++
 nixos/modules/module-list.nix     |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 nixos/modules/hardware/mcelog.nix

diff --git a/nixos/modules/hardware/mcelog.nix b/nixos/modules/hardware/mcelog.nix
new file mode 100644
index 000000000000..e4ac7d39053f
--- /dev/null
+++ b/nixos/modules/hardware/mcelog.nix
@@ -0,0 +1,37 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  meta.maintainers = [ maintainers.grahamc ];
+  options = {
+
+    hardware.mcelog = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the Machine Check Exception logger.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf config.hardware.mcelog.enable {
+    systemd.services.mcelog = {
+      description = "Machine Check Exception Logging Daemon";
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.mcelog}/bin/mcelog --daemon --foreground";
+        SuccessExitStatus = [ 0 15 ];
+
+        ProtectHome = true;
+        PrivateNetwork = true;
+        PrivateTmp = true;
+      };
+    };
+  };
+
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3df3e9012ef4..ca4b04be7ad8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -30,6 +30,7 @@
   ./hardware/cpu/amd-microcode.nix
   ./hardware/cpu/intel-microcode.nix
   ./hardware/ksm.nix
+  ./hardware/mcelog.nix
   ./hardware/network/b43.nix
   ./hardware/network/intel-2100bg.nix
   ./hardware/network/intel-2200bg.nix

From 1d9fa60df014129629eb3b0661d566af10ee09ae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 25 Feb 2017 17:05:47 +0100
Subject: [PATCH 1176/3449] wavefunctioncollapse: 0.0pre20160930 ->
 0.0pre20170130

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

diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
index 32c2104c0f9e..20d07e52f6c7 100644
--- a/pkgs/tools/graphics/wavefunctioncollapse/default.nix
+++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchFromGitHub, mono}:
 stdenv.mkDerivation rec {
   name = "wavefunctioncollapse-${version}";
-  version = "0.0pre20160930";
+  version = "0.0pre20170130";
   src = fetchFromGitHub {
     owner = "mxgmn";
     repo = "WaveFunctionCollapse";
-    rev = "333f592b6612da43ec475c988c09325378c662e9";
-    sha256 = "1cpwn52ka1zsi2yc7rfg5r9ll2kjgzabx4a5axcp9c4ph5qzsza6";
+    rev = "ef660c037b1d7c4ebce66efc625af2bb2f2111c0";
+    sha256 = "1dr5fvdgn1jqqacby6rrqm951adx3jw0j70r5i8pmrqnnw482l8m";
   };
   buildPhase = ''
     mcs *.cs -out:wavefunctioncollapse.exe -r:System.Drawing

From a872e222807f11b1ec47d3289eca5bc39953525c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 26 Feb 2017 18:09:51 +0100
Subject: [PATCH 1177/3449] speed_dreams: 2.0.0-a3 -> 2.2.1

---
 pkgs/games/speed-dreams/default.nix | 63 ++++++++++++++++++++++-------
 1 file changed, 48 insertions(+), 15 deletions(-)

diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix
index e6105eab95b9..cb7a345900af 100644
--- a/pkgs/games/speed-dreams/default.nix
+++ b/pkgs/games/speed-dreams/default.nix
@@ -1,29 +1,62 @@
 { fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto,
-libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm,
-libpng, zlib, bash, p7zip, SDL, enet, libjpeg, cmake}:
+libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat,
+libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-a3-r3412";
+  version = "2.2.1-r6404";
   name = "speed-dreams-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/speed-dreams/2.0.0/${name}-src.tar.7z";
-    sha256 = "0hn5fgn90wmd1xha1la133harx47qc647f4zj8hfdvd7wb3kpjab";
+    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-base-${version}.tar.xz";
+    sha256 = "0347sk8xbdsyvl48qybbycd7hvzsx5b37zzjx1yx73nzddhmlpbx";
   };
 
-  unpackPhase = ''
-    7z e -so ${src} | tar -x 
-    cd */
+  cars-and-tracks = fetchurl {
+    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-hq-cars-and-tracks-${version}.tar.xz";
+    sha256 = "1h50l110n42nrq6j3kcyhi3swgmrjcg979vb6h0zsf46afwv0z3q";
+  };
+
+  more-cars-and-tracks = fetchurl {
+    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-more-hq-cars-and-tracks-${version}.tar.xz";
+    sha256 = "03m3gwd03jqgsfjdglzmrv613cp4gh50i63fwmnwl282zhxydcwd";
+  };
+
+  wip-cars-and-tracks = fetchurl {
+    url = "mirror://sourceforge/speed-dreams/2.2.1/speed-dreams-src-wip-cars-and-tracks-${version}.tar.xz";
+    sha256 = "0ysk756rd294xzpwvmjh0mb229ngzrc4ry9lpyhyak98rbcp9hxm";
+  };
+
+  sourceRoot = ".";
+
+  postUnpack = ''
+    echo Unpacking data
+    tar -xf ${cars-and-tracks}
+    tar -xf ${more-cars-and-tracks}
+    tar -xf ${wip-cars-and-tracks}
   '';
 
-  # Order important; it wants libpng12 and some x libs propagate libpng15
+  preBuild = ''
+    make -C src/libs/portability
+    make -C src/libs/portability portability.o
+    ar -rv "$(echo lib*/games/speed-dreams*/lib)"/libportability_static.a src/libs/portability/CMakeFiles/portability.dir/portability.cpp.o
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L$(echo $PWD/lib*/games/speed-dreams*/lib) -lexpat"
+    echo "libportability_static.a built"
+  '';
+
+  postInstall = ''
+    mkdir "$out/bin"
+    for i in "$out"/games/*; do
+      echo '#!${stdenv.shell}' >> "$out/bin/$(basename "$i")"
+      echo "$i"' "$@"' >> "$out/bin/$(basename "$i")"
+      chmod a+x "$out/bin/$(basename "$i")"
+    done
+  '';
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+
   buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto
-    libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash 
-    p7zip SDL enet libjpeg cmake ];
-
-  installTargets = "install";
-
-  dontUseCmakeBuildDir=true;
+    libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat
+    SDL2 enet libjpeg openscenegraph libvorbis ];
 
   meta = {
     description = "Car racing game - TORCS fork with more experimental approach";

From 5e937b173d4f6b9e90784e65c886e7e0f3798817 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 16:21:52 +0100
Subject: [PATCH 1178/3449] gstreamer: 1.10.3 -> 1.10.4 for multiple CVEs

See https://gstreamer.freedesktop.org/releases/1.10/#1.10.4.

Fixes:

  * CVE-2017-5847
  * CVE-2017-5848

cc #23072
---
 pkgs/development/libraries/gstreamer/bad/default.nix      | 4 ++--
 pkgs/development/libraries/gstreamer/base/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/core/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/ges/default.nix      | 4 ++--
 pkgs/development/libraries/gstreamer/good/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/libav/default.nix    | 4 ++--
 pkgs/development/libraries/gstreamer/python/default.nix   | 4 ++--
 pkgs/development/libraries/gstreamer/ugly/default.nix     | 4 ++--
 pkgs/development/libraries/gstreamer/vaapi/default.nix    | 4 ++--
 pkgs/development/libraries/gstreamer/validate/default.nix | 4 ++--
 10 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index f0e88551169d..1125bb7bb8ab 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -14,7 +14,7 @@ let
   inherit (stdenv.lib) optional optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-bad-1.10.3";
+  name = "gst-plugins-bad-1.10.4";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Bad Plugins";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
-    sha256 = "1rwla1p57yzygb68z2xk5l5kvqzj5w3nxq0davkwk139zd8r6294";
+    sha256 = "0rk9rlzf2b0hjw5hwbadz53yh4ls7vm3w3cshsa3n8isdd8axp93";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index ecb431091adf..960805cdcfc9 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-base-1.10.3";
+  name = "gst-plugins-base-1.10.4";
 
   meta = {
     description = "Base plugins and helper libraries";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
-    sha256 = "040pifl4cgsqqz2si4s1y5khj3zwm39w21siagxwp805swbrcag6";
+    sha256 = "1dsyjf6rncsbg4rfj40cvf1wwpjj9h3j3c7bh4zp7jylnfv4blpn";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 72a519ab34fe..54ff189caeff 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-1.10.3";
+  name = "gstreamer-1.10.4";
 
   meta = {
     description = "Open source multimedia framework";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
-    sha256 = "0gdnxg5igbhnpjhrzp31w1ww95j805byqd6mj3x29wli54dxrfc5";
+    sha256 = "062jidnw17hkpva6ddygp80gyasyigfkpm1y7w56rk56a2pzbhjh";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index ab3a0c00e03c..cf69fa943a27 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gstreamer-editing-services-1.10.3";
+  name = "gstreamer-editing-services-1.10.4";
 
   meta = with stdenv.lib; {
     description = "Library for creation of audio/video non-linear editors";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-editing-services/${name}.tar.xz";
-    sha256 = "0ax3qbi1m4wcii03ysln3lm8nhw3fr2rd35ndfy4mr4vg2nm5gxw";
+    sha256 = "0i11b1rwkjsy9gxrf9vk9lgg8qm60ggfi5lp0ncyh4lxvh16vbgj";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index c0d017fcaead..4d9582d13812 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -10,7 +10,7 @@ let
   inherit (stdenv.lib) optionals optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "gst-plugins-good-1.10.3";
+  name = "gst-plugins-good-1.10.4";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Good Plugins";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
-    sha256 = "0mar8ss8bvpz699ql4kgndvna8qsv7kj372py4435ffl6hzfj1sf";
+    sha256 = "0zjdwxn83sp9wjp9rxjbyk8kf284g9av7l2v6rjldi586hacd1la";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index 32000bb89a02..c67a3c708b32 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -9,7 +9,7 @@
 assert withSystemLibav -> libav != null;
 
 stdenv.mkDerivation rec {
-  name = "gst-libav-1.10.3";
+  name = "gst-libav-1.10.4";
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
-    sha256 = "1aajayv63ardkbmcg7pnh2d87r067325a5wzinwihaw6n5jw2sws";
+    sha256 = "12r68ri03mgbbwsxyn6yklgfsq32rwvyq83zw0aq7m73fp5gx83c";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 7db887e36beb..09c11282058a 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -6,14 +6,14 @@
 let
   inherit (pythonPackages) python pygobject3;
 in stdenv.mkDerivation rec {
-  name = "gst-python-1.10.3";
+  name = "gst-python-1.10.4";
 
   src = fetchurl {
     urls = [
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "bdfa2d06dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8";
+    sha256 = "bdfa2d07dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 7220acf2d4d5..bd034ac13a15 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-plugins-ugly-1.10.3";
+  name = "gst-plugins-ugly-1.10.4";
 
   meta = with stdenv.lib; {
     description = "Gstreamer Ugly Plugins";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
-    sha256 = "1lkb8kznc9wxmhbp7k67b50y27nz8jp2x2flb91xzydz7b89f5f9";
+    sha256 = "0ngsiwcsz3jd08id4mc0qiy2q1n7h2kkvdnh3r1vm725m1ycg1k3";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index ec882a2863ab..ae32c8f95aec 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gst-vaapi-${version}";
-  version = "1.10.3";
+  version = "1.10.4";
 
   src = fetchurl {
     url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
-    sha256 = "07ing6z7n0ylz5vknk3d2lw54a6szd6m8hqc3px6lahmd832ga6f";
+    sha256 = "0xfyf1mgcxnwf380wxv20hakl2srp34dmiw6bm4zkncl2mi91rh3";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 6677926eaa99..d973bc1f3b61 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gst-validate-1.10.3";
+  name = "gst-validate-1.10.4";
 
   meta = {
     description = "Integration testing infrastructure for the GStreamer framework";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/src/gst-validate/${name}.tar.xz";
-    sha256 = "00icav26pj81cxdykf86rp3jw6lb178ydrqhcck43i94jdb4hsxy";
+    sha256 = "0g6px08x4kq5xqlbyxvxn6cm9b1s1gfvhkmlrmvw9afccjzh1775";
   };
 
   outputs = [ "out" "dev" ];

From 8a7556961956a77a07886576fa324437c00fcb96 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 16:23:27 +0100
Subject: [PATCH 1179/3449] linux: 4.10 -> 4.10.1

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.10.nix b/pkgs/os-specific/linux/kernel/linux-4.10.nix
index ff6fac2ac6d3..01ee7211ba6f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.10.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10";
+  version = "4.10.1";
   extraMeta.branch = "4.10";
-  modDirVersion = "4.10.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b";
+    sha256 = "0hrmph137q4j2xfsv1fyayig47g4v8ivd2rqsw03dy7mzasnp83c";
   };
 
   kernelPatches = args.kernelPatches;

From 62857b1f21b44c1d5686871c41cb06a706e7bfb4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 16:24:49 +0100
Subject: [PATCH 1180/3449] linux: 4.4.51 -> 4.4.52

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 2366ffb7c9e5..fba52eeaee5b 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.51";
+  version = "4.4.52";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "04drwi5pd8m2wqq1bxr17gq9cc32x5mgl0jhs8d8f246b0faslgf";
+    sha256 = "01hz3g7j1m8dis6pyy9p8pi5ixl32g6cvgav0i7a7qbkrspdvlp8";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 540198d3b042..2ed964c1d491 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11341,7 +11341,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 701544d0a785274a6d38ee894b3251b2632c2317 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 16:25:09 +0100
Subject: [PATCH 1181/3449] linux: 4.9.12 -> 4.9.13

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index e31a2329c296..9290bb125f50 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.12";
+  version = "4.9.13";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0fvq3gb80awkwsy0ir6njri2kvx52knmj86kjlm8lqwqis3m9bgw";
+    sha256 = "0s52hrs3wrsa1chzgcqpxwgb5kjmpfd82i964n9d2bmk9zn4liin";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ed964c1d491..2b12a1d2752c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11357,7 +11357,6 @@ with pkgs;
         # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking
         # kernelPatches.cpu-cgroup-v2."4.7"
         kernelPatches.modinst_arg_list_too_long
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From 8b5e8b3cdbd3de74cc7e7391c095c066cdda12d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 26 Feb 2017 18:14:33 +0100
Subject: [PATCH 1182/3449] mod-distortion: fix package (empty $out before)

`$out` wasn't expanded, so the install phase was installing to `ut/lib/v2` (because make expanded `$o` to empty).

cc: @magnetophon
---
 pkgs/applications/audio/mod-distortion/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix
index 7b17f21b613c..a18372870795 100644
--- a/pkgs/applications/audio/mod-distortion/default.nix
+++ b/pkgs/applications/audio/mod-distortion/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ lv2 ];
 
-  installFlags = [ "LV2_PATH=$out/lib/lv2" ];
+  installFlags = [ "LV2_PATH=$(out)/lib/lv2"  ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/portalmod/mod-distortion;

From f3a6991f3d33b9876a255b019784c0790331f728 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Feb 2017 18:20:42 +0100
Subject: [PATCH 1183/3449] grsecurity: 4.9.12-201702231830 ->
 4.9.13-201702261126

---
 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 ad26b399a94b..859385c4e994 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.12";
+  version = "4.9.13";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "37riipfdm8xw53598w15l3x0gy06rmp22j1yf5wql2d1fzhgf29x007axdi7swq4jnpihd934mvpfb1sy42srkinps0x5gvv65n00bs";
+    sha512 = "2mszr7n212ryaw5q2lj92766aqnjznkfr7ly04g2ggzk7cyiirrf1w37d9arzg3smn5695fb1frikacnbrmz2hsaia48kjhwgjbxn2h";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 8ea41ff59372..a61a6c9e18aa 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.12";
-      grrev  = "201702231830";
-      sha512 = "1455wpdy5lizdibs86llaxf087vggl921dn83pf4cnc9fbzc5mwa46vazahv9g8467bb335vgg5fcba2i0026s1h9vcsvyy6470m4i3";
+    { kver   = "4.9.13";
+      grrev  = "201702261126";
+      sha512 = "18snigndkyw372mp65v3sp9cpz8w4n3d3lzls50a3gl1qgnpp65g0vbf7vsm3spr9a5p5f17n7hl7lxgm0pqnjcgg0xr5ghkwx20z6b";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 785d303c64c8ab71b947b51e2c168db1386c95ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 26 Feb 2017 18:23:31 +0100
Subject: [PATCH 1184/3449] sic: fix empty $out

Make needs () around variable names, or it'll interpret $out as $o followed by `ut`
---
 pkgs/applications/networking/irc/sic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix
index 7c13b04e670f..6f48f44214cc 100644
--- a/pkgs/applications/networking/irc/sic/default.nix
+++ b/pkgs/applications/networking/irc/sic/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "sic-${version}";
   version = "1.2";
 
-  makeFlags = "PREFIX=$out";
+  makeFlags = "PREFIX=$(out)";
   src = fetchurl {
     url = "http://dl.suckless.org/tools/sic-${version}.tar.gz";
     sha256 = "ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185";

From 0e06c903b51b9319609786803bbe3877a549149f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 12:53:14 +0000
Subject: [PATCH 1185/3449] ocamlPackages.sexplib-113.33.00+4.03: fix version
 number

---
 pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
index 93808a565626..4f86f080738a 100644
--- a/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
+++ b/pkgs/development/ocaml-modules/janestreet/sexplib-113_33_00.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
 
 stdenv.mkDerivation {
-  name = "ocaml${ocaml.version}-sexplib-133.33.00+4.03";
+  name = "ocaml${ocaml.version}-sexplib-113.33.00+4.03";
   src = fetchurl {
     url = http://ocaml.janestreet.com/ocaml-core/113.33/files/sexplib-113.33.00+4.03.tar.gz;
     sha256 = "1dirdrags3z8m80z1vczfnpdfzgcvm2wyy7g61fxdr8h3jgixpl3";

From 3a9ae7e367d23f255c4dde4da7a10db69a9e8b3f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 25 Feb 2017 21:31:14 +0000
Subject: [PATCH 1186/3449] ocamlPackages.ppx_compare: init at 113.33.00+4.03

---
 .../janestreet/ppx_compare-113_33_00.nix      | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
new file mode 100644
index 000000000000..794570402025
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_tools, ppx_deriving, ppx_type_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_compare-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_compare-113.33.00+4.03.tar.gz;
+    sha256 = "07drgg6c857lsvxdjscdcb1ncdr5p3183spw32sbfcrbnr12nzys";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ ppx_type_conv ppx_deriving ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5ad601af15da..e7354b92343b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -569,7 +569,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_type_conv-113_33_02.nix { }
       else callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {};
 
-    ppx_compare = callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {};
+    ppx_compare =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_compare-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {};
 
     ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {};
 

From b4abe046d7cb33a58a5b85d1ad5d09de496f6f00 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 11:07:24 +0000
Subject: [PATCH 1187/3449] ocamlPackages.ppx_inline_test: init at
 113.33.00+4.03

---
 .../janestreet/ppx_inline_test-113_33_00.nix  | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
new file mode 100644
index 000000000000..7b9414353a9e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_tools, ppx_driver
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_inline_test-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_inline_test-113.33.00+4.03.tar.gz;
+    sha256 = "1sw71wnwznia1spicilj4bzspgdk1dhp0j4hp57a9xmsscg44i4k";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ ppx_driver ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e7354b92343b..e5d5b77d2993 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -583,7 +583,10 @@ let
 
     ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {};
 
-    ppx_inline_test = callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {};
+    ppx_inline_test =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {};
 
     ppx_bench = callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
 

From 654dd0aa9614e352d438c4d27d586b4be8ab71d8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 11:55:52 +0000
Subject: [PATCH 1188/3449] ocamlPackages.ppx_bench: init at 113.33.00+4.03

---
 .../janestreet/ppx_bench-113_33_00.nix        | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
new file mode 100644
index 000000000000..3414324a5c81
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_tools, ppx_inline_test
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_bench-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bench-113.33.00+4.03.tar.gz;
+    sha256 = "00iv0p3cni4r7iimwm04bjg2hzvlvdb0b1kynjw2xav64xc29q01";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ ppx_inline_test ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e5d5b77d2993..9630973aec95 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -588,7 +588,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_inline_test-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {};
 
-    ppx_bench = callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
+    ppx_bench =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
 
     ppx_bin_prot = callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
 

From c4e5f1863147042bd10c5136156029d7fdd283ff Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 12:12:58 +0000
Subject: [PATCH 1189/3449] ocamlPackages.ppx_custom_printf: init at
 113.33.00+4.03

---
 .../ppx_custom_printf-113_33_00.nix           | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
new file mode 100644
index 000000000000..d75c7f811286
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_sexp_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_custom_printf-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_custom_printf-113.33.00+4.03.tar.gz;
+    sha256 = "1hw8q4x0hzyg3brlqpdm0bc7z6lnj6qymzw123cf51q9dq0386jb";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  propagatedBuildInputs = [ ppx_sexp_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9630973aec95..d4df47200bf9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -595,7 +595,10 @@ let
 
     ppx_bin_prot = callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
 
-    ppx_custom_printf = callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {};
+    ppx_custom_printf =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {};
 
     ppx_enumerate = callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
 

From ecc5dd55718ddab061fea93a491000fb5dc8ff84 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 12:48:16 +0000
Subject: [PATCH 1190/3449] ocamlPackages.ppx_enumerate: init at 113.33.00+4.03

---
 .../janestreet/ppx_enumerate-113_33_00.nix    | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
new file mode 100644
index 000000000000..77fde21e8d79
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_tools, ppx_deriving, ppx_type_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_enumerate-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_enumerate-113.33.00+4.03.tar.gz;
+    sha256 = "0b0kvdw6kids4yrzqq2h82gmnx1zfiahr82rrdbwiwkk4g0pxl93";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ ppx_deriving ppx_type_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d4df47200bf9..e94b3fc5994a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -600,7 +600,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_custom_printf-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {};
 
-    ppx_enumerate = callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
+    ppx_enumerate =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
 
     ppx_fail = callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
 

From 1aab9f884d690744d69746192e5f7f1499296ad6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 13:05:04 +0000
Subject: [PATCH 1191/3449] ocamlpackages.ppx_fields_conv: init at
 113.33.00+4.03

---
 .../janestreet/ppx_fields_conv-113_33_00.nix  | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
new file mode 100644
index 000000000000..70d6ec61b0ea
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, fieldslib, ppx_deriving, ppx_type_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_fields_conv-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fields_conv-113.33.00+4.03.tar.gz;
+    sha256 = "1wfi8pc0y7wjiscvawhfgbcfx7ypmikmyyagwhzw7jhnldljwrkg";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  propagatedBuildInputs = [ fieldslib ppx_deriving ppx_type_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e94b3fc5994a..3bfb194e20a2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -607,7 +607,10 @@ let
 
     ppx_fail = callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
 
-    ppx_fields_conv = callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {};
+    ppx_fields_conv =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {};
 
     ppx_let = callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
 

From 0e6e2af219934432cda971a10a1c5db88c174b68 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 13:16:03 +0000
Subject: [PATCH 1192/3449] ocamlPackages.ppx_variants_conv: init at
 113.33.00+4.03

---
 .../ppx_variants_conv-113_33_00.nix           | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
new file mode 100644
index 000000000000..fb8a994790cb
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, variantslib, ppx_deriving, ppx_type_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_variants_conv-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_variants_conv-113.33.00+4.03.tar.gz;
+    sha256 = "0il0nkdwwsc1ymshj4q9nzw5ixm12ls0jj7z3q16k48bg3z5ibc0";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  propagatedBuildInputs = [ variantslib ppx_deriving ppx_type_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 3bfb194e20a2..d393233181d2 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -622,7 +622,10 @@ let
 
     ppx_typerep_conv = callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
 
-    ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
+    ppx_variants_conv =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
 
     ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
 

From 8f74b9024fc741b4a1f1d18a486b385f71650883 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 13:43:30 +0000
Subject: [PATCH 1193/3449] ocamlPackages.ppx_expect: init at 113.33.01+4.03

---
 .../janestreet/ppx_expect-113_33_01.nix       | 22 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
new file mode 100644
index 000000000000..32133dfb6894
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_driver, ppx_assert, ppx_custom_printf, ppx_inline_test
+, ppx_fields_conv, ppx_variants_conv, re, sexplib, fieldslib
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_expect-113.33.01+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_expect-113.33.01+4.03.tar.gz;
+    sha256 = "1r358vx3wnkzq8kwgi49400l1fx2bnl6gds4hl7s67lxsqxki2z7";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_assert ppx_custom_printf ppx_fields_conv ppx_variants_conv re ];
+  propagatedBuildInputs = [ ppx_driver ppx_inline_test fieldslib sexplib ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d393233181d2..2dff5031f6f7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -627,7 +627,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_variants_conv-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {};
 
-    ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
+    ppx_expect =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
 
     ppx_jane = callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
 

From cf39dba1d8293c9ba005456fb2e35c3e61c7e8f4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 14:10:02 +0000
Subject: [PATCH 1194/3449] ocamlPackages.ppx_fail: init at 113.33.00+4.03

---
 .../janestreet/ppx_fail-113_33_00.nix         | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
new file mode 100644
index 000000000000..ba098b9294f6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_tools, ppx_here
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_fail-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_fail-113.33.00+4.03.tar.gz;
+    sha256 = "1fy1aqsylf6yk527w13rm2b20il9vy026c5ww65pj3ks5zykfvx9";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ ppx_here ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 2dff5031f6f7..8cf09dc6ad34 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -605,7 +605,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_enumerate-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {};
 
-    ppx_fail = callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
+    ppx_fail =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_fail-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {};
 
     ppx_fields_conv =
       if lib.versionOlder "4.03" ocaml.version

From 3615c47c22846ca63ff99e3cde65f87a0dc63396 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 14:18:59 +0000
Subject: [PATCH 1195/3449] ocamlPackages.ppx_let: init at 113.33.00+4.03

---
 .../janestreet/ppx_let-113_33_00.nix          | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
new file mode 100644
index 000000000000..b5f0bd4c9324
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_let-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_driver
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_let-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_let-113.33.00+4.03.tar.gz;
+    sha256 = "012yzayknm9qv8ap9rbwf4fwnmx935mfy7c75ifagbnfl4lh7dmp";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  propagatedBuildInputs = [ ppx_driver ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 8cf09dc6ad34..d8659335d2e5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -615,7 +615,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_fields_conv-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {};
 
-    ppx_let = callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
+    ppx_let =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_let-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
 
     ppx_pipebang = callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
 

From 758d052990c668fee6fe0d681fd3e6c41e34f74d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 15:02:35 +0000
Subject: [PATCH 1196/3449] ocamlPackages.ppx_pipebang: init at 113.33.00+4.03

---
 .../janestreet/ppx_pipebang-113_33_00.nix     | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
new file mode 100644
index 000000000000..5aa589e250c1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_tools, ppx_driver
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_pipebang-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_pipebang-113.33.00+4.03.tar.gz;
+    sha256 = "1rjrpbncy8vzwnmc5n0qs4dd40dmg4h75dvd7h7lm8cpxalifivc";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ ppx_driver ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d8659335d2e5..abdf50dfa481 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -620,7 +620,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_let-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {};
 
-    ppx_pipebang = callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
+    ppx_pipebang =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
 
     ppx_sexp_message = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
 

From 03be79a01872621fd36844d4958b780730643abc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 15:15:01 +0000
Subject: [PATCH 1197/3449] ocamlPackages.ppx_sexp_message: init at
 113.33.00+4.03

---
 .../janestreet/ppx_sexp_message-113_33_00.nix | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
new file mode 100644
index 000000000000..ddf66364b305
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_sexp_conv, ppx_here
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_sexp_message-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_message-113.33.00+4.03.tar.gz;
+    sha256 = "01vrm8dk413gh19i2y6ffpsmscjhayp3asn5hcbcflxsvlaf4klx";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  propagatedBuildInputs = [ ppx_here ppx_sexp_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index abdf50dfa481..41cf91388681 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -625,7 +625,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_pipebang-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {};
 
-    ppx_sexp_message = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
+    ppx_sexp_message =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
 
     ppx_sexp_value = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
 

From 3c2c608c2eaa6f61b4d7a6f169f24ded0d69caf6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 15:29:29 +0000
Subject: [PATCH 1198/3449] ocamlPackages.ppx_sexp_value: init at
 113.33.00+4.03

---
 .../janestreet/ppx_sexp_value-113_33_00.nix   | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
new file mode 100644
index 000000000000..21b67b9cce73
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_here, ppx_sexp_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_sexp_value-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_sexp_value-113.33.00+4.03.tar.gz;
+    sha256 = "0pn2v1m479lbdgprv4w9czyv5nim0hz6ailmy1xxlxlhazwbqzwm";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  propagatedBuildInputs = [ ppx_sexp_conv ppx_here ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 41cf91388681..cc46350a6494 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -630,7 +630,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_message-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {};
 
-    ppx_sexp_value = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
+    ppx_sexp_value =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
 
     ppx_typerep_conv = callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
 

From ceabe0d3ddc0743da81c7a81697b55f13a597212 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 15:55:06 +0000
Subject: [PATCH 1199/3449] ocamlPackages.ppx_typerep_conv: init at
 113.33.00+4.03

---
 .../janestreet/ppx_typerep_conv-113_33_00.nix | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
new file mode 100644
index 000000000000..69a4ad7e69a4
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, typerep, ppx_tools, ppx_type_conv, ppx_deriving
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_typerep_conv-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_typerep_conv-113.33.00+4.03.tar.gz;
+    sha256 = "0k03wp07jvv3zpsm8n5hvskd5iagjvpcpxj9rpj012nia5iqfaj6";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ ppx_type_conv typerep ppx_deriving ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index cc46350a6494..9b38985c7af9 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -635,7 +635,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_sexp_value-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {};
 
-    ppx_typerep_conv = callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
+    ppx_typerep_conv =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_typerep_conv-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {};
 
     ppx_variants_conv =
       if lib.versionOlder "4.03" ocaml.version

From 68998dca58900a89eb63ce3931227cfa5a0eccf0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 16:03:43 +0000
Subject: [PATCH 1200/3449] ocamlPackages.ppx_bin_prot: init at 113.33.00+4.03

---
 .../janestreet/ppx_bin_prot-113_33_00.nix     | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 ++++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
new file mode 100644
index 000000000000..43517a82d3b2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, bin_prot, ppx_deriving, ppx_tools, ppx_type_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_bin_prot-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_bin_prot-113.33.00+4.03.tar.gz;
+    sha256 = "1xw1yjgnd5ny1cq0n6rbsdaywyzq2n0jwg4gjsxv14dhv0alav36";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_tools ];
+  propagatedBuildInputs = [ bin_prot ppx_deriving ppx_type_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 9b38985c7af9..b27609553262 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -593,7 +593,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_bench-113_33_00.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {};
 
-    ppx_bin_prot = callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
+    ppx_bin_prot =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_bin_prot-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {};
 
     ppx_custom_printf =
       if lib.versionOlder "4.03" ocaml.version

From 1f1a950cb072c7f01f6bcc4fb47cf81f1552747c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 16:43:23 +0000
Subject: [PATCH 1201/3449] ocamlPackages.ppx_jane: init at 113.33.00

---
 .../janestreet/ppx_jane-113_33_00.nix         | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  5 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
new file mode 100644
index 000000000000..0a5b19051fc2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_assert, ppx_bench, ppx_bin_prot, ppx_custom_printf, ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_let, ppx_pipebang, ppx_sexp_message, ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-ppx_jane-113.33.00";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/ppx_jane-113.33.00.tar.gz;
+    sha256 = "15lbrc9jj83k208gv7knz7mk9xh9mdb657jdjb1006gdsskfmra6";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  propagatedBuildInputs = [ ppx_assert ppx_bench ppx_bin_prot
+    ppx_custom_printf ppx_enumerate ppx_expect ppx_fail ppx_fields_conv
+    ppx_let ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv
+    ppx_variants_conv ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b27609553262..da4d631013f3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -653,7 +653,10 @@ let
       then callPackage ../development/ocaml-modules/janestreet/ppx_expect-113_33_01.nix {}
       else callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {};
 
-    ppx_jane = callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
+    ppx_jane =
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/ppx_jane-113_33_00.nix {}
+      else callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {};
 
 
     # Core sublibs

From 0a768bd6c8d19f8f3ed02772ed11cda0e8f91320 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 17:29:01 +0000
Subject: [PATCH 1202/3449] ocamlPackages.core_kernel: init at 113.33.01+4.03

---
 .../janestreet/core_kernel-113_33_01.nix      | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 ++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
new file mode 100644
index 000000000000..d6da9caed7d7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/core_kernel-113_33_01.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ppx_jane
+, bin_prot, fieldslib, typerep, variantslib
+, ppx_assert, ppx_bench, ppx_expect, ppx_inline_test
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-core_kernel-113.33.01+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core_kernel-113.33.01+4.03.tar.gz;
+    sha256 = "0ra2frspqjqk1wbb58lrb0anrgsyhja00zsybka85qy71lblamfs";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
+  propagatedBuildInputs = [
+    bin_prot fieldslib typerep variantslib
+    ppx_assert ppx_bench ppx_expect ppx_inline_test
+  ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index da4d631013f3..5bd8c9557364 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -688,7 +688,9 @@ let
       else bin_prot_p4;
 
     core_kernel =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/core_kernel-113_33_01.nix {}
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {}
       else core_kernel_p4;
 

From 8e1b4b3c4c372c07347eb9106615c8791bcc753b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 17:42:02 +0000
Subject: [PATCH 1203/3449] ocamlPackages.core: init at 113.33.02+4.03

---
 .../janestreet/core-113_33_02.nix             | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix b/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
new file mode 100644
index 000000000000..48bafd5c3c5a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/core-113_33_02.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, ppx_jane, core_kernel
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-core-113.33.02+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/core-113.33.02+4.03.tar.gz;
+    sha256 = "1gvd5saa0sdgyv9w09imqlkw0c21v2ixic8fxx14jxrwck0zn4bc";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
+  propagatedBuildInputs = [ core_kernel ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 5bd8c9557364..4f5d29295620 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -695,7 +695,9 @@ let
       else core_kernel_p4;
 
     core =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/core-113_33_02.nix {}
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/core.nix {}
       else core_p4;
 

From 8fcd1a063e2564d0f337a41a7db3cd49f5fb031f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 19:09:29 +0100
Subject: [PATCH 1204/3449] faac: fix build with glibc-2.25

Use patches from Arch to really build against the provided external
mp4v2 library.
---
 pkgs/development/libraries/faac/default.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix
index 1ab01033f4df..abbe07224b56 100644
--- a/pkgs/development/libraries/faac/default.nix
+++ b/pkgs/development/libraries/faac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch, autoreconfHook
 , mp4v2Support ? true, mp4v2 ? null
 , drmSupport ? false # Digital Radio Mondiale
 }:
@@ -15,12 +15,28 @@ stdenv.mkDerivation rec {
     sha256 = "1pqr7nf6p2r283n0yby2czd3iy159gz8rfinkis7vcfgyjci2565";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "faac-mp4v2-1.9.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-1.9.patch?h=packages/faac";
+      sha256 = "1pja822zw9q3cg8bjkw5z0bpxsk4q92qix26zpiqbvi7vg314hyc";
+    })
+    (fetchpatch {
+      name = "faac-mp4v2-2.0.0.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mp4v2-2.0.0.patch?h=packages/faac";
+      sha256 = "07kmkrl0600rs01xqpkkw9n8p1215n485xqf8hwimp60dw3vc0wn";
+      addPrefixes = true;
+    })
+  ];
+
   configureFlags = [ ]
-    ++ optional mp4v2Support "--with-mp4v2"
+    ++ optional mp4v2Support "--with-external-mp4v2"
     ++ optional drmSupport "--enable-drm";
 
   hardeningDisable = [ "format" ];
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   buildInputs = [ ]
     ++ optional mp4v2Support mp4v2;
 

From daaf8179246705fbfbfe47e5aca3d75a57bd4b2f Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 26 Feb 2017 18:27:52 +0000
Subject: [PATCH 1205/3449] SpaceFM: (optionally) remove dependency on ifuse
 due to broken dep

CVEs in libplist prevent ifuse from building (see 30cea5f022)
---
 pkgs/applications/misc/spacefm/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix
index 74466d667b3c..f4e1eef28363 100644
--- a/pkgs/applications/misc/spacefm/default.nix
+++ b/pkgs/applications/misc/spacefm/default.nix
@@ -1,6 +1,6 @@
 { pkgs, fetchFromGitHub, stdenv, gtk3, udev, desktop_file_utils
 , shared_mime_info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer
-, jmtpfs, ifuse, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }:
+, jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks, hicolor_icon_theme, adwaita-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "spacefm-${version}";
@@ -28,8 +28,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3 udev desktop_file_utils shared_mime_info intltool pkgconfig
-    wrapGAppsHook ffmpegthumbnailer jmtpfs ifuse lsof udisks
-  ];
+    wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks
+  ] ++ (if ifuseSupport then [ ifuse ] else []);
+  # Introduced because ifuse doesn't build due to CVEs in libplist
+  # Revert when libplist builds again…
 
   meta = with stdenv.lib;  {
     description = "A multi-panel tabbed file manager";

From edcbb6da11f5dc608aecc2c0ae81c27bf0c0f1d0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 19:36:04 +0100
Subject: [PATCH 1206/3449] pass: 1.6.5 -> 1.7

---
 pkgs/tools/security/pass/default.nix          | 27 +++++++--------
 pkgs/tools/security/pass/program-name.patch   | 13 --------
 .../set-correct-program-name-for-sleep.patch  | 33 -------------------
 3 files changed, 12 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/tools/security/pass/program-name.patch
 delete 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 b0137619f0c1..58a7cc30059a 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,28 +1,27 @@
-{ stdenv, fetchurl
-, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which, procps
+{ stdenv, lib, fetchurl
+, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
 , makeWrapper
 
 , xclip ? null, xdotool ? null, dmenu ? null
 , x11Support ? !stdenv.isDarwin
 }:
 
+with lib;
+
 assert x11Support -> xclip != null
                   && xdotool != null
                   && dmenu != null;
 
 stdenv.mkDerivation rec {
-  version = "1.6.5";
+  version = "1.7";
   name    = "password-store-${version}";
 
   src = fetchurl {
     url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "05bk3lrp5jwg0v338lvylp7glpliydzz4jf5pjr6k3kagrv3jyik";
+    sha256 = "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn";
   };
 
-  patches =
-    [ ./program-name.patch
-      ./set-correct-program-name-for-sleep.patch
-    ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
+  patches = stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
 
   buildInputs = [ makeWrapper ];
 
@@ -30,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Stores, retrieves, generates, and synchronizes passwords securely";
     homepage    = http://www.passwordstore.org/;
     license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 the-kenny ];
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz ];
     platforms   = platforms.unix;
 
     longDescription = ''
@@ -56,10 +55,8 @@ stdenv.mkDerivation rec {
     # himself.
     mkdir -p "$out/share/emacs/site-lisp"
     cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
-
-    ${if x11Support then ''
-      cp "contrib/dmenu/passmenu" "$out/bin/"
-    '' else ""}
+  '' + optionalString x11Support ''
+    cp "contrib/dmenu/passmenu" "$out/bin/"
   '';
 
   wrapperPath = with stdenv.lib; makeBinPath ([
@@ -68,16 +65,16 @@ stdenv.mkDerivation rec {
     git
     gnupg
     gnused
-    pwgen
     tree
     which
+    qrencode
   ] ++ stdenv.lib.optional stdenv.isLinux procps
     ++ ifEnable x11Support [ dmenu xclip xdotool ]);
 
   postFixup = ''
     # Fix program name in --help
     substituteInPlace $out/bin/pass \
-      --replace "\$program" "pass"
+      --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
 
     # Ensure all dependencies are in PATH
     wrapProgram $out/bin/pass \
diff --git a/pkgs/tools/security/pass/program-name.patch b/pkgs/tools/security/pass/program-name.patch
deleted file mode 100644
index db01942f638d..000000000000
--- a/pkgs/tools/security/pass/program-name.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/password-store.sh b/src/password-store.sh
-index 6313384..6607a98 100755
---- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -573,7 +573,7 @@ cmd_git() {
- # END subcommand functions
- #
- 
--PROGRAM="${0##*/}"
-+PROGRAM="pass"
- COMMAND="$1"
- 
- case "$1" in
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
deleted file mode 100644
index f00307307eb5..000000000000
--- a/pkgs/tools/security/pass/set-correct-program-name-for-sleep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6ad29ae97263060c9ec95856e0d8ab18409108c0 Mon Sep 17 00:00:00 2001
-From: Franz Pletz <fpletz@fnordicwalking.de>
-Date: Sat, 3 Sep 2016 05:45:36 +0200
-Subject: [PATCH] Set correct program name for sleep
-
----
- src/password-store.sh | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/password-store.sh b/src/password-store.sh
-index 63be840..ca47df3 100755
---- a/src/password-store.sh
-+++ b/src/password-store.sh
-@@ -133,11 +133,14 @@ 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" sleep "$CLIP_TIME" )
-+		# Execute sleep as a child process of bash because it may be
-+		# a symlink to a single binary version of coreutils or busybox
-+		# which depends on argv0 correctly set to "sleep"
-+		( exec -a "$sleep_argv0" bash <(echo sleep "$CLIP_TIME") )
- 		local now="$(xclip -o -selection "$X_SELECTION" | base64)"
- 		[[ $now != $(echo -n "$1" | base64) ]] && before="$now"
- 
--- 
-2.9.3
-

From 6cc50b29763a6afdbd4e375256a08be1d40765be Mon Sep 17 00:00:00 2001
From: Benjamin Herr <ben@0x539.de>
Date: Sun, 26 Feb 2017 19:26:16 +0100
Subject: [PATCH 1207/3449] obconf: add libSM to fix build

---
 pkgs/tools/X11/obconf/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix
index cb3749efb445..49bab143fc22 100644
--- a/pkgs/tools/X11/obconf/default.nix
+++ b/pkgs/tools/X11/obconf/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox,
-  imlib2, libstartup_notification, makeWrapper }:
+  imlib2, libstartup_notification, makeWrapper, libSM }:
 
 stdenv.mkDerivation rec {
   name = "obconf-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig gtk2 libglade openbox imlib2 libstartup_notification makeWrapper
+    pkgconfig gtk2 libglade libSM openbox imlib2 libstartup_notification
+    makeWrapper
   ];
 
   postInstall = ''

From 9dbeca2240591bf690b5bce6b8fb57a2521b6c80 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 20:54:58 +0100
Subject: [PATCH 1208/3449] pass: refactor, fix completions install

cc #23223
---
 pkgs/tools/security/pass/default.nix | 42 ++++++++++++----------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 58a7cc30059a..62f1a3a05dd0 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -23,31 +23,9 @@ stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  meta = with stdenv.lib; {
-    description = "Stores, retrieves, generates, and synchronizes passwords securely";
-    homepage    = http://www.passwordstore.org/;
-    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 the-kenny fpletz ];
-    platforms   = platforms.unix;
-
-    longDescription = ''
-      pass is a very simple password store that keeps passwords inside gpg2
-      encrypted files inside a simple directory tree residing at
-      ~/.password-store. The pass utility provides a series of commands for
-      manipulating the password store, allowing the user to add, remove, edit,
-      synchronize, generate, and manipulate passwords.
-    '';
-  };
-
-  preInstall = ''
-    mkdir -p "$out/share/bash-completion/completions"
-    mkdir -p "$out/share/zsh/site-functions"
-    mkdir -p "$out/share/fish/vendor_completions.d"
-  '';
-
-  installFlags = [ "PREFIX=$(out)" ];
+  installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
 
   postInstall = ''
     # Install Emacs Mode. NOTE: We can't install the necessary
@@ -85,4 +63,20 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/passmenu \
       --prefix PATH : "$out/bin:${wrapperPath}"
   '';
+
+  meta = with stdenv.lib; {
+    description = "Stores, retrieves, generates, and synchronizes passwords securely";
+    homepage    = http://www.passwordstore.org/;
+    license     = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz ];
+    platforms   = platforms.unix;
+
+    longDescription = ''
+      pass is a very simple password store that keeps passwords inside gpg2
+      encrypted files inside a simple directory tree residing at
+      ~/.password-store. The pass utility provides a series of commands for
+      manipulating the password store, allowing the user to add, remove, edit,
+      synchronize, generate, and manipulate passwords.
+    '';
+  };
 }

From b2a4eb839a530f84a0b522840a6a4cac51adcba1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 26 Feb 2017 21:18:02 +0100
Subject: [PATCH 1209/3449] =?UTF-8?q?ppx=5Ftools,=20camlp4,=20ocamlify,=20?=
 =?UTF-8?q?ocamlmod:=20don=E2=80=99t=20strip=20binaries?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/ppx_tools/default.nix | 2 ++
 pkgs/development/tools/ocaml/camlp4/default.nix      | 2 ++
 pkgs/development/tools/ocaml/ocamlify/default.nix    | 2 ++
 pkgs/development/tools/ocaml/ocamlmod/default.nix    | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 62aa97de5fa6..ddc3dec898dc 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -26,6 +26,8 @@ in
 
     createFindlibDestdir = true;
 
+    dontStrip = true;
+
     meta = with stdenv.lib; {
       description = "Tools for authors of ppx rewriters";
       homepage = http://www.lexifi.com/ppx_tools;
diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index a257a88287cd..cedd35ae6ade 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
 
   installTargets = "install install-META";
 
+  dontStrip = true;
+
   meta = with stdenv.lib; {
     description = "A software system for writing extensible parsers for programming languages";
     homepage = https://github.com/ocaml/camlp4;
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index d5dd0c19d987..2876464ab502 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";
 
+  dontStrip = true;
+
   meta = {
     homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod;
     description = "Generate OCaml modules from source files";
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 0b92a45153c1..b24be7ba6285 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   buildPhase     = "ocaml setup.ml -build";
   installPhase   = "ocaml setup.ml -install";
 
+  dontStrip = true;
+
   meta = {
     homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod;
     description = "Generate OCaml modules from source files";

From 5670d96bbc871ebfd20cb2fa3cfa4d72e0c84717 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 26 Feb 2017 21:25:40 +0100
Subject: [PATCH 1210/3449] pythonPackages.libasyncns: fix build with
 glibc-2.25

---
 .../{libasyncns.nix => libasyncns/default.nix}     |  2 ++
 .../libasyncns/libasyncns-fix-res-consts.patch     | 14 ++++++++++++++
 pkgs/top-level/python-packages.nix                 |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)
 rename pkgs/development/python-modules/{libasyncns.nix => libasyncns/default.nix} (93%)
 create mode 100644 pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch

diff --git a/pkgs/development/python-modules/libasyncns.nix b/pkgs/development/python-modules/libasyncns/default.nix
similarity index 93%
rename from pkgs/development/python-modules/libasyncns.nix
rename to pkgs/development/python-modules/libasyncns/default.nix
index de0d6ea610d8..63bcad285c4e 100644
--- a/pkgs/development/python-modules/libasyncns.nix
+++ b/pkgs/development/python-modules/libasyncns/default.nix
@@ -10,6 +10,8 @@ buildPythonPackage rec {
     sha256 = "1q4l71b2h9q756x4pjynp6kczr2d8c1jvbdp982hf7xzv7w5gxqg";
   };
 
+  patches = [ ./libasyncns-fix-res-consts.patch ];
+
   buildInputs = [ libasyncns ];
   nativeBuildInputs = [ pkgconfig ];
   doCheck = false; # requires network access
diff --git a/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch b/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch
new file mode 100644
index 000000000000..62877300a276
--- /dev/null
+++ b/pkgs/development/python-modules/libasyncns/libasyncns-fix-res-consts.patch
@@ -0,0 +1,14 @@
+diff --git a/libasyncns.c b/libasyncns.c
+index 99a73de..85709b0 100644
+--- a/libasyncns.c
++++ b/libasyncns.c
+@@ -134,9 +134,8 @@ PyMODINIT_FUNC initlibasyncns(void)
+ 	ADDNSCONST(ns_t_mailb);
+ 	ADDNSCONST(ns_t_maila);
+ 	ADDNSCONST(ns_t_any);
+-	ADDNSCONST(ns_t_zxfr);
+ 	ADDNSCONST(ns_t_max);
+ 	
+ 	ADDNSCONST(ns_c_invalid);
+ 	ADDNSCONST(ns_c_in);
+ 	ADDNSCONST(ns_c_2);
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5c8c2c50d21..3944e48607c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28176,7 +28176,7 @@ EOF
     buildInputs = with self; [ pytest pkgs.glibcLocales ];
   };
 
-  libasyncns = callPackage ../development/python-modules/libasyncns.nix {
+  libasyncns = callPackage ../development/python-modules/libasyncns {
     inherit (pkgs) libasyncns pkgconfig;
   };
 

From 392331ad58a6b5f9164ca59e3e70f3c56d476e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 21:17:43 +0100
Subject: [PATCH 1211/3449] pythonPackages.gst-python: fix source hash

Commit 5e937b173d4f6b9e90784e65c886e7e0f3798817
("gstreamer: 1.10.3 -> 1.10.4 for multiple CVEs") bumped the version but not
the hash.
---
 pkgs/development/libraries/gstreamer/python/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 09c11282058a..4c3cdd901276 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
       "${meta.homepage}/src/gst-python/${name}.tar.xz"
       "mirror://gentoo/distfiles/${name}.tar.xz"
       ];
-    sha256 = "bdfa2d07dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8";
+    sha256 = "04l2hvvz9b0f3nyds1k3yfk5di8a91fpr6maj19c11mwp1s82l2r";
   };
 
   patches = [ ./different-path-with-pygobject.patch ];

From 7611525c008408be64b99e5b0517820cc578bde8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 25 Feb 2017 08:56:58 -0500
Subject: [PATCH 1212/3449] git: 2.11.1 -> 2.12.0

---
 .../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 c93015678e27..af5fc8a8be46 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -11,7 +11,7 @@
 }:
 
 let
-  version = "2.11.1";
+  version = "2.12.0";
   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 = "05b4jw86w77c3pyh3nm6aw31vhxwzvhnx2x0bcfqmm15wg57k9y0";
+    sha256 = "09r0lcjj5v2apj39f0ziqzjq2bi1jpnhszc9q4n0ab86g5j7c88q";
   };
 
   hardeningDisable = [ "format" ];

From 8beee1ec2d4103452025efca43e4eb84688786bb Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <gabriel@awakenetworks.com>
Date: Sun, 26 Feb 2017 13:21:35 -0800
Subject: [PATCH 1213/3449] Fix `pkgs.haskellPackages.gtk` build

Haskell's `gtk` package requires the `have-quartz-gtk` flag to be built on OS X
when using the Quartz backend
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d9bdf46c0b66..fc0edb9e6f3f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -689,6 +689,10 @@ self: super: {
   # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza
   cairo = addBuildTool super.cairo self.gtk2hs-buildtools;
   pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"];
+  gtk =
+    if pkgs.stdenv.isDarwin
+    then appendConfigureFlag super.gtk "-fhave-quartz-gtk"
+    else super.gtk;
 
   # https://github.com/commercialhaskell/stack/issues/3001
   stack = doJailbreak super.stack;

From 442b589b71132f593de9ec5725c1b4cca2cab065 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 26 Feb 2017 21:04:58 +0100
Subject: [PATCH 1214/3449] webkitgtk24x: mark as insecure

See https://github.com/NixOS/nixpkgs/issues/18312
---
 pkgs/development/libraries/webkitgtk/2.4.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 1db47827abe5..33f8fa64a0f3 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -23,6 +23,13 @@ stdenv.mkDerivation rec {
     license = licenses.bsd2;
     platforms = with platforms; linux ++ darwin;
     maintainers = [];
+    knownVulnerabilities = [
+      "WSA-2016-0004"
+      "WSA-2016-0005"
+      "WSA-2016-0006"
+      "WSA-2017-0001"
+      "WSA-2017-0002"
+    ];
   };
 
   src = fetchurl {

From 78d9414ce534e570853fa3b7920c0906db9f169b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 27 Feb 2017 00:04:29 +0200
Subject: [PATCH 1215/3449] findutils: Fix cross compilation

Yes, setting crossAttrs.propagatedBuildInputs is the correct value to
set to override a buildInputs from the native drv!
---
 pkgs/tools/misc/findutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 8bedbeb12fef..f1090bcf457f 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "info" ];
 
   crossAttrs = {
-    # http://osdir.com/ml/bug-findutils-gnu/2009-08/msg00026.html
-    configureFlags = [ "gl_cv_func_wcwidth_works=yes" ];
+    # Fix the 'buildInputs = [ coreutils ]' above - that adds the cross coreutils to PATH :(
+    propagatedBuildInputs = [ ];
   };
 
   enableParallelBuilding = true;

From ae67f060f28028c31b091460167bb598bd8d3e6d Mon Sep 17 00:00:00 2001
From: Fabian Schmitthenner <github.fabian@schmitthenner.eu>
Date: Sun, 26 Feb 2017 13:29:46 +0100
Subject: [PATCH 1216/3449] phpfpm: eliminate build at evaluation time

phpfpm currently uses `readFile` to read the php.ini file from the
phpPackage. This causes php to be build at evaluation time.

This eliminates the use of readFile and builds the php.ini at build
time.
---
 nixos/modules/services/web-servers/phpfpm/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index ed537e7122a2..2471a06a3b07 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -24,10 +24,11 @@ let
     ${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)}
   '';
 
-  phpIni = pkgs.writeText "php.ini" ''
-    ${readFile "${cfg.phpPackage}/etc/php.ini"}
-
-    ${cfg.phpOptions}
+  phpIni = pkgs.runCommand "php.ini" {
+    inherit (cfg) phpPackage phpOptions;
+    passAsFile = [ "phpOptions" ];
+  } ''
+    cat $phpPackage/etc/php.ini $phpOptionsFile > $out
   '';
 
 in {

From 1ba97d6ee9795b8c9c6ff25b0baaf988be561781 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Mon, 27 Feb 2017 02:10:34 -0500
Subject: [PATCH 1217/3449] ghcjsHEAD: unbreak

---
 pkgs/development/compilers/ghcjs/base.nix    | 3 ++-
 pkgs/development/compilers/ghcjs/default.nix | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 393278be49ef..130c9995c8de 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, broken ? false
 , test-framework
 , test-framework-hunit
 , test-framework-quickcheck2
@@ -183,5 +184,5 @@ in mkDerivation (rec {
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-  broken = true;  # http://hydra.nixos.org/build/45110274
+  inherit broken;
 })
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 7400057b128f..eda724e5947b 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -1,3 +1,6 @@
 { bootPkgs }:
 
-bootPkgs.callPackage ./base.nix { inherit bootPkgs; }
+bootPkgs.callPackage ./base.nix {
+  inherit bootPkgs;
+  broken = true; # http://hydra.nixos.org/build/45110274
+}

From 0680289ef8e3d81198d89a4ff6c89a04901cac92 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Fri, 24 Feb 2017 08:10:12 -0900
Subject: [PATCH 1218/3449] qsyncthingtray: 0.5.5rc2 -> 0.5.7

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

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index 96d2aa0c85b7..ba8b946f3fbb 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -3,14 +3,14 @@
 , qmakeHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.5rc2";
+  version = "0.5.7";
   name = "qsyncthingtray-${version}";
 
   src = fetchFromGitHub {
     owner = "sieren";
     repo = "QSyncthingTray";
     rev = "${version}";
-    sha256 = "1x7j7ylgm4ih06m7gb5ls3c9bdjwbra675489caq2f04kgw4yxq2";
+    sha256 = "0crrdpdmlc4ahkvp5znzc4zhfwsdih655q1kfjf0g231mmynxhvq";
   };
 
   buildInputs = [ qtbase qtwebengine ];
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin
     cp binary/QSyncthingTray $out/bin
-    cat > $out/bin/qt.conf <<EOF
-    [Paths]
-    Prefix = ${qtwebengine.out}
-    EOF
   '';
 
   meta = with stdenv.lib; {

From 2cc06f0203670ffee55212059632f0a02b675db0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 27 Feb 2017 08:42:44 +0100
Subject: [PATCH 1219/3449] hr: init at 1.2 (#23153)

* hr: init at 1.2

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

diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix
new file mode 100644
index 000000000000..2fd56e3c5552
--- /dev/null
+++ b/pkgs/applications/misc/hr/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "hr-${version}";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "LuRsT";
+    repo = "hr";
+    rev = version;
+    sha256 = "162vkip2772jl59lschpinimpg4ssiyg7fq0va5cx4d7wldpqmks";
+  };
+
+  dontBuild = true;
+  installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share" ];
+
+  preInstall = ''
+    mkdir -p $out/{bin,share}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/LuRsT/hr;
+    description = "A horizontal bar for your terminal";
+    license = licenses.mit;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c99f9587186..9b7fc534b59c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -924,6 +924,8 @@ with pkgs;
 
   hexio = callPackage ../development/tools/hexio { };
 
+  hr = callPackage ../applications/misc/hr { };
+
   interlock = callPackage ../servers/interlock {};
 
   kapacitor = callPackage ../servers/monitoring/kapacitor { };

From 90690e71b0021549dd503bc1f48e02f69ef64cdf Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 27 Feb 2017 09:22:32 +0100
Subject: [PATCH 1220/3449] fftw: 3.3.5 -> 3.3.6-pl1 (#23226)

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

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index e6c55ed15755..4bbc515831e6 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -4,14 +4,14 @@ with lib;
 
 assert elem precision [ "single" "double" "long-double" "quad-precision" ];
 
-let version = "3.3.5"; in
+let version = "3.3.6-pl1"; in
 
 stdenv.mkDerivation rec {
   name = "fftw-${precision}-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
-    sha256 = "1kwbx92ps0r7s2mqy7lxbxanslxdzj7dp7r7gmdkzv1j8yqf3kwf";
+    sha256 = "0g8qk98lgq770ixdf7n36yd5xjsgm2v3wzvnphwmhy6r4y2amx0y";
   };
 
   outputs = [ "out" "dev" "doc" ]; # it's dev-doc only

From f54b52f962bf85da7495113f12f265e985364f89 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Sun, 26 Feb 2017 22:27:31 +0100
Subject: [PATCH 1221/3449] gede: init at 2.0.3

---
 pkgs/development/tools/misc/gede/build.patch | 11 +++++++
 pkgs/development/tools/misc/gede/default.nix | 31 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/tools/misc/gede/build.patch
 create mode 100644 pkgs/development/tools/misc/gede/default.nix

diff --git a/pkgs/development/tools/misc/gede/build.patch b/pkgs/development/tools/misc/gede/build.patch
new file mode 100644
index 000000000000..bdd8b7ff5f96
--- /dev/null
+++ b/pkgs/development/tools/misc/gede/build.patch
@@ -0,0 +1,11 @@
+--- a/build.py	2017-01-16 21:12:43.000000000 +0100
++++ b/build.py	2017-02-26 22:03:11.394625315 +0100
+@@ -71,7 +71,7 @@
+         if do_build:
+             if not os.path.exists("Makefile"):
+                 print("Generating makefile")
+-                if subprocess.call(['qmake-qt4']):
++                if subprocess.call(['qmake']):
+                     exit(1)
+ 
+             print("Compiling (please wait)")
diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix
new file mode 100644
index 000000000000..5667e496a70a
--- /dev/null
+++ b/pkgs/development/tools/misc/gede/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, ctags, qt4, python}:
+
+stdenv.mkDerivation rec {
+
+  version = "2.0.3";
+  name = "gede-${version}";
+  src = fetchurl {
+    url = "http://gede.acidron.com/uploads/source/${name}.tar.xz";
+    sha256 = "1znlmkjgrmjl79q73xaa9ybp1xdc3k4h4ynv3jj5z8f92gjnj3kk";
+  };
+
+  buildInputs = [ ctags qt4 python ];
+  patches = [ ./build.patch ];
+
+  unpackPhase = ''
+    tar xf ${src}
+    cd ${name}
+  '';
+  configurePhase = "";
+  buildPhase = "";
+  installPhase = "./build.py install --prefix=$out";
+
+  meta = with stdenv.lib; {
+    description = "Graphical frontend (GUI) to GDB";
+    homepage = "http://gede.acidron.com";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ juliendehos ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68356d1f247a..52c6c408e0aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6414,6 +6414,8 @@ with pkgs;
 
   funnelweb = callPackage ../development/tools/literate-programming/funnelweb { };
 
+  gede = callPackage ../development/tools/misc/gede { };
+
   pmd = callPackage ../development/tools/analysis/pmd { };
 
   jdepend = callPackage ../development/tools/analysis/jdepend { };

From b52fa7b6229535f15afcdbd521e32297aa76ec55 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 24 Feb 2017 22:51:17 +0800
Subject: [PATCH 1222/3449] uchiwa: 0.21.1

Include script to upgrade.
---
 .../monitoring/uchiwa/bower-packages.nix      | 23 +++++++++
 pkgs/servers/monitoring/uchiwa/bower.json     |  6 +++
 pkgs/servers/monitoring/uchiwa/default.nix    | 50 +++++++++++++++++++
 pkgs/servers/monitoring/uchiwa/src.nix        |  4 ++
 pkgs/servers/monitoring/uchiwa/update.sh      | 31 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 116 insertions(+)
 create mode 100644 pkgs/servers/monitoring/uchiwa/bower-packages.nix
 create mode 100644 pkgs/servers/monitoring/uchiwa/bower.json
 create mode 100644 pkgs/servers/monitoring/uchiwa/default.nix
 create mode 100644 pkgs/servers/monitoring/uchiwa/src.nix
 create mode 100755 pkgs/servers/monitoring/uchiwa/update.sh

diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
new file mode 100644
index 000000000000..80e73d632357
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -0,0 +1,23 @@
+# Generated by bower2nix v3.1.1 (https://github.com/rvl/bower2nix)
+{ fetchbower, buildEnv }:
+buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
+  (fetchbower "uchiwa-web" "0.22.1" "0.22.1" "09rhssb5bpwdahdl2fxkjmax8cqg2m51bbf0m3lhkcrcjfc2w8kj")
+  (fetchbower "angular" "1.4.14" "~1.4" "1j5d80bxqh9lgcbmd661bsk8xrhnf43ym77jsk9n845gqr02bdkl")
+  (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "0zbimxmrmgbz60xg5rnkhv4gd0zvp5fdjdx5407r6a942irfy2x7")
+  (fetchbower "angular-cookies" "1.4.14" "~1.4" "10z9azpd228jwdn8p767a93xhb5nrypwa0j6491kbcvm2q1k0g6a")
+  (fetchbower "angular-gravatar" "0.3.2" "~0.3.1" "17d2sc828dsnlkjc4b9irandpimqwan8hlvk9wlmlv8yiyi685p6")
+  (fetchbower "angular-mass-autocomplete-uchiwa" "0.4.1" "0.4.1" "1h2ypg35f6nd6gy6yznpiadql13lk1gyccq6qd4mvksbyb5va6l5")
+  (fetchbower "angular-moment" "0.9.2" "~0.9.0" "143vivplxqd03vg23ynad2yrlgn6dmad7avjmzh0ina2qx7zslgf")
+  (fetchbower "angular-resource" "1.4.14" "~1.4" "1ll2qd0kn39fl5aa49894n1bfcl8dgrfk0w154rkhg7k732q18bk")
+  (fetchbower "angular-route" "1.4.14" "~1.4" "0wfdgvvldgzf7c4lba3x8mw38l9zwkm0i9fg8ad7pvjkqz133sqs")
+  (fetchbower "angular-sanitize" "1.4.14" "~1.4" "072b8dcxjp4cjvcjqxsd0bxa8xd2nqvjb1v878qgfkhf0wz44x32")
+  (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1yksx3a4c3cva5liq087z4j196p0vxp1mzhbr27qr9wmyy6z84z1")
+  (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0z24747b0sywjyzl5chcwr96mpmyr595bry63c4d35mp186ail5z")
+  (fetchbower "bootstrap" "3.1.1" "3.1.1" "036xbjpv4621p5r2l9vfm9zys6h1mhkvb0zhvk3irrmkzsl77hwh")
+  (fetchbower "bootstrap-sass-official" "3.1.1" "3.1.1" "0rfmja15p8kxz6i3liwyqrmbm82azq61d3882w2vmp08vvv2c371")
+  (fetchbower "fontawesome" "4.4.0" "~4.4.0" "1mbs0vhixvg11vj3n0l3jn3pb6s839rcs416zq2wzfqkbvsc3sf5")
+  (fetchbower "highlightjs" "9.1.0" "~9.1.0" "1gz4q922sylbbqw1sawmjjq8nw0mk90wq0qq95ap0f31px7bfm3f")
+  (fetchbower "moment" "2.8.4" "~2.8.3" "1h30g5an2m9dja09m1s93hsfb25pzl0iah8mmab7nispl3mb585z")
+  (fetchbower "ua-parser-js" "0.7.12" "~0.7.12" "1hrhi7cdf5zd86jz7ipbb23qvkfplghfa92wa3aysca1rpg5zgpd")
+  (fetchbower "jquery" "3.1.1" ">= 1.9.0" "0rkp1hakimnjh3rvlzi30w7qx9x1j0gzjpaajgljn79kd082sgpd")
+]; }
diff --git a/pkgs/servers/monitoring/uchiwa/bower.json b/pkgs/servers/monitoring/uchiwa/bower.json
new file mode 100644
index 000000000000..1eb94f73e6b8
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/bower.json
@@ -0,0 +1,6 @@
+{
+  "name": "uchiwa",
+  "dependencies": {
+    "uchiwa-web": "0.21.0"
+  }
+}
diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix
new file mode 100644
index 000000000000..e7cf3e8f70e4
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, buildBowerComponents, buildGoPackage, makeWrapper }:
+
+let
+  inherit (import ./src.nix) version sha256;
+  owner = "sensu";
+  repo = "uchiwa";
+
+  src = fetchFromGitHub {
+    inherit owner repo sha256;
+    rev    = "${version}";
+  };
+
+  backend = buildGoPackage {
+    name = "uchiwa-backend-${version}";
+    goPackagePath = "github.com/${owner}/${repo}";
+    inherit src;
+    postInstall = ''
+      cp go/src/github.com/sensu/uchiwa/public/index.html $out/
+    '';
+  };
+
+  frontend = buildBowerComponents {
+    name = "uchiwa-frontend-${version}";
+    generated = ./bower-packages.nix;
+    inherit src;
+  };
+
+in stdenv.mkDerivation rec {
+  name = "uchiwa-${version}";
+
+  inherit src;
+
+  buildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin $out/public
+    makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \
+      --add-flags "-p $out/public"
+    ln -s ${backend.out}/index.html $out/public/index.html
+    ln -s ${frontend.out}/bower_components $out/public/bower_components
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Dashboard for the sensu monitoring framework";
+    homepage    = http://sensuapp.org/;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
new file mode 100644
index 000000000000..68aaa4a5249b
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -0,0 +1,4 @@
+{
+  version = "0.22.1";
+  sha256  = "15wa7zhchis2rh6jcqkindlidmbf3mryr3apnqnr27ydi2vlqn3g";
+}
diff --git a/pkgs/servers/monitoring/uchiwa/update.sh b/pkgs/servers/monitoring/uchiwa/update.sh
new file mode 100755
index 000000000000..2802037a4f52
--- /dev/null
+++ b/pkgs/servers/monitoring/uchiwa/update.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nodePackages.bower2nix curl.bin git.out jq.out
+
+set -euo pipefail
+IFS=$'\n\t'
+
+# set -x
+
+REPO=sensu/uchiwa
+
+VERSION=$(curl https://api.github.com/repos/${REPO}/tags -s | jq '.[0]' -r | jq .name -r)
+
+t=$(mktemp)
+
+echo "Updating to: ${VERSION}"
+
+curl https://raw.githubusercontent.com/${REPO}/${VERSION}/bower.json -s > $t
+bower2nix $t bower-packages.nix
+
+pushd $(git rev-parse --show-toplevel)
+sha=$(nix-prefetch-url -A uchiwa.src)
+popd
+
+cat <<_EOF > src.nix
+{
+  version = "${VERSION}";
+  sha256  = "${sha}";
+}
+_EOF
+
+rm $t
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b7fc534b59c..bd0a1da85469 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10806,6 +10806,8 @@ with pkgs;
     ruby = ruby_2_1;
   };
 
+  uchiwa = callPackage ../servers/monitoring/uchiwa { };
+
   shishi = callPackage ../servers/shishi {
       pam = if stdenv.isLinux then pam else null;
       # see also openssl, which has/had this same trick

From 136c249e0ba8890c71216373d79274b78e167d06 Mon Sep 17 00:00:00 2001
From: Thomas Strobel
 <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>
Date: Mon, 27 Feb 2017 10:47:36 +0100
Subject: [PATCH 1223/3449] init: moneyplex at 16.0.22424

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

diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
new file mode 100644
index 000000000000..866fda59d713
--- /dev/null
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -0,0 +1,117 @@
+{ stdenv, requireFile, writeScript, patchelf, libredirect, coreutils, pcsclite
+, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }:
+
+let
+  libPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc zlib glib gdk_pixbuf gtk2 cairo pango libX11 atk openssl
+  ];
+in
+
+stdenv.mkDerivation rec {
+  name = "moneyplex-${version}";
+  version = "1.0";
+
+  src = requireFile {
+    message = ''
+      Unfortunately, Matrica does not provide an installable version of moneyplex.
+      To work around, install moneyplex on another system, und delete the following files
+      from the moneyplex installation directory: backups, mdaten, rup, Lnx\ Global.ali, Lnx\ Local ...ali
+      and settings.ini, and then pack the folder into moneyplex-${version}.tar.gz.
+    '';
+    name = "moneyplex-${version}.tar.gz";
+    sha256 = "0wpzwvhybjbqvqi8bpvkvcs3mikvl68gk1hzawihi0xnm28lcxw0";
+  };
+
+  phases = [ "unpackPhase" "installPhase" "postInstall" ];
+
+  buildInputs = [ ];
+
+  installPhase =
+  ''
+    mkdir -p "$out/opt/moneyplex"
+    cp -r . $out/opt/moneyplex
+
+    mkdir "$out/bin"
+
+    cat > $out/bin/moneyplex <<EOF
+    #!${stdenv.shell}
+
+    if [ -z "\$XDG_DATA_HOME" ]; then
+        MDIR=\$HOME/.local/share/moneyplex
+    else
+        MDIR=\$XDG_DATA_HOME/moneyplex
+    fi
+
+    if [ ! -d "\$MDIR" ]; then
+        ${coreutils}/bin/mkdir -p \$MDIR
+        ${coreutils}/bin/cp -r $out/opt/moneyplex/* \$MDIR
+        ${coreutils}/bin/chmod 0644 \$MDIR/*
+        ${coreutils}/bin/chmod 0755 \$MDIR/system
+        ${coreutils}/bin/chmod 0644 \$MDIR/system/*
+        ${coreutils}/bin/chmod 0755 \$MDIR/reports
+        ${coreutils}/bin/chmod 0644 \$MDIR/reports/*
+        ${coreutils}/bin/chmod 0755 \$MDIR/moneyplex
+        ${coreutils}/bin/chmod 0755 \$MDIR/prestart
+        ${coreutils}/bin/chmod 0755 \$MDIR/mpxalarm
+    fi
+
+    if [ ! -d "\$MDIR/pcsc" ]; then
+        ${coreutils}/bin/mkdir -p \$MDIR/pcsc
+    fi
+    if [ ! -e "\$MDIR/pcsc/libpcsclite.so.1" ] || [ ! \`${coreutils}/bin/readlink -f "\$MDIR/pcsc/libpcsclite.so.1"\` -ef "${pcsclite}/lib/libpcsclite.so.1" ]; then
+        ${coreutils}/bin/ln -sf "${pcsclite}/lib/libpcsclite.so.1" "\$MDIR/pcsc/libpcsclite.so.1"
+    fi
+
+
+    if [ -e "\$MDIR/rup/rupremote.lst" ]; then
+      for i in \`${coreutils}/bin/cat "\$MDIR/rup/rupremote.lst"\`; do
+        ${coreutils}/bin/mv "\$MDIR/rup/"\`${coreutils}/bin/basename \$i\` "\$MDIR/\$i" 
+      done
+      rm -r "\$MDIR/rup/rupremote.lst"
+    fi
+
+    if [ ! -e "\$MDIR/moneyplex.patched" ] || [ "\$MDIR/moneyplex" -nt "\$MDIR/moneyplex.patched" ]; then
+        ${coreutils}/bin/cp "\$MDIR/moneyplex" "\$MDIR/moneyplex.patched"
+        ${coreutils}/bin/chmod 0755 "\$MDIR/moneyplex.patched"
+    fi
+    if [ ! \`${patchelf}/bin/patchelf --print-interpreter \$MDIR/moneyplex.patched\` = $(cat $NIX_CC/nix-support/dynamic-linker) ] ||
+       [ ! \`${patchelf}/bin/patchelf --print-rpath \$MDIR/moneyplex.patched\` = "${libPath}" ]; then
+        ${patchelf}/bin/patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath "${libPath}" "\$MDIR/moneyplex.patched"
+    fi
+
+    exec \$MDIR/moneyplex.patched
+    EOF
+
+    chmod +x $out/bin/moneyplex
+    '';
+
+  postInstall = ''
+    mkdir -p $out/share/icons
+    cp -r $out/opt/moneyplex/system/mpx256.png $out/share/icons/moneyplex.png
+
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/moneyplex.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Encoding=UTF-8
+    Name=Moneyplex
+    GenericName=Moneyplex online banking software
+    Comment=Online banking software
+    Icon=$out/share/icons/moneyplex.png
+    Exec=$out/bin/moneyplex
+    Terminal=false
+    Categories=Application;
+    StartupNotify=true
+    EOF
+    '';
+
+
+  meta = with stdenv.lib; {
+    description = "Moneyplex online banking software";
+    maintainers = with maintainers; [ tstrobel ];
+    platforms = platforms.linux;
+    license = licenses.unfree;
+    downloadPage = http://matrica.de/download/download.html;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd0a1da85469..f2fe4d47947d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2910,6 +2910,8 @@ with pkgs;
 
   molly-guard = callPackage ../os-specific/linux/molly-guard { };
 
+  moneyplex = callPackage ../applications/office/moneyplex { };
+
   monit = callPackage ../tools/system/monit { };
 
   moreutils = callPackage ../tools/misc/moreutils {

From fa367c2d028a4f63c4fba9fe498f55288c98cea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 27 Feb 2017 10:47:37 +0100
Subject: [PATCH 1224/3449] nixos, dhcpd: make machines assignable

---
 nixos/modules/services/networking/dhcpd.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix
index 86bcaa96f345..2eac6dfec5b7 100644
--- a/nixos/modules/services/networking/dhcpd.nix
+++ b/nixos/modules/services/networking/dhcpd.nix
@@ -60,8 +60,9 @@ let
     };
   };
 
-  machineOpts = {...}: {
-    config = {
+  machineOpts = { ... }: {
+
+    options = {
 
       hostName = mkOption {
         type = types.str;
@@ -156,7 +157,7 @@ let
     };
 
     machines = mkOption {
-      type = types.listOf (types.submodule machineOpts);
+      type = with types; listOf (submodule machineOpts);
       default = [];
       example = [
         { hostName = "foo";

From 5e44b5e2997925ab4c5d9ba1e5880115370107c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Feb 2017 11:03:27 +0100
Subject: [PATCH 1225/3449] protobuf3_2: init at 3.2

---
 pkgs/development/libraries/protobuf/3.2.nix | 6 ++++++
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/protobuf/3.2.nix

diff --git a/pkgs/development/libraries/protobuf/3.2.nix b/pkgs/development/libraries/protobuf/3.2.nix
new file mode 100644
index 000000000000..338156bbdf98
--- /dev/null
+++ b/pkgs/development/libraries/protobuf/3.2.nix
@@ -0,0 +1,6 @@
+{ callPackage, lib, ... }:
+
+lib.overrideDerivation (callPackage ./generic-v3.nix {
+  version = "3.2.0";
+  sha256 = "120g0bg7ichry74allgmqnh7k0z2sdnrrfklb58b7szzn4zcdz14";
+}) (attrs: { NIX_CFLAGS_COMPILE = "-Wno-error"; })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2fe4d47947d..6de7c892d879 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9229,6 +9229,7 @@ with pkgs;
   # 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0.
   protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { });
   protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { };
+  protobuf3_2 = callPackage ../development/libraries/protobuf/3.2.nix { };
   protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { };
   protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { };
 

From 421db29915d0db88144f0de374f7f2c784c49b37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Feb 2017 11:03:27 +0100
Subject: [PATCH 1226/3449] pythonPackages.pyext: init at 0.7

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

diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix
new file mode 100644
index 000000000000..6f03a2edf797
--- /dev/null
+++ b/pkgs/development/python-modules/pyext/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+    name = pname + "-" + version;
+    pname = "pyext";
+    version = "0.7";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1pvwjkrjqajzh4wiiw1mzqp0bb81cqc2gk23nj24m32fpqssc676";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Simple Python extensions.";
+      homepage = "https://github.com/kirbyfan64/PyExt";
+      license = licenses.mit;
+      maintainers = with maintainers; [ edwtjo ];
+    };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1488740bc7b..acb9cd141e9f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20185,6 +20185,8 @@ in {
     };
   };
 
+  pyext = callPackage ../development/python-modules/pyext { };
+
   pyfantom = buildPythonPackage rec {
      name = "pyfantom-${version}";
      version = "unstable-2013-12-18";

From a331662930f45f9ca4684dee6748696c57a68601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Feb 2017 11:03:27 +0100
Subject: [PATCH 1227/3449] pythonPackages.protobuf: add pyext dependency

---
 pkgs/development/python-modules/protobuf.nix | 4 ++--
 pkgs/top-level/python-packages.nix           | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix
index 8b9d1ddb03c4..f2f0f5025d11 100644
--- a/pkgs/development/python-modules/protobuf.nix
+++ b/pkgs/development/python-modules/protobuf.nix
@@ -1,5 +1,5 @@
 { stdenv, python, buildPythonPackage
-, protobuf, google_apputils
+, protobuf, google_apputils, pyext
 , disabled, doCheck ? true }:
 
 with stdenv.lib;
@@ -9,7 +9,7 @@ buildPythonPackage rec {
   inherit disabled doCheck;
 
   propagatedBuildInputs = [ protobuf google_apputils ];
-  buildInputs = [ google_apputils ];
+  buildInputs = [ google_apputils pyext ];
 
   prePatch = ''
     while [ ! -d python ]; do
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index acb9cd141e9f..dbec6e2dc795 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19316,12 +19316,11 @@ in {
 
   protobuf = self.protobuf2_6;
   # only required by tensorflow
-  protobuf3_0_0b2 = callPackage ../development/python-modules/protobuf.nix {
-    disabled = isPyPy || isPy3k;
-    doCheck = isPy3k;
-    protobuf = pkgs.protobuf3_0_0b2;
+  protobuf3_2 = callPackage ../development/python-modules/protobuf.nix {
+    disabled = isPyPy;
+    doCheck = !isPy3k;
+    protobuf = pkgs.protobuf3_2;
   };
-
   protobuf3_0 = callPackage ../development/python-modules/protobuf.nix {
     disabled = isPyPy;
     doCheck = isPy3k;

From 7864782d71b3653b7c50da492f5548b3cf3dc0ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 26 Feb 2017 11:03:27 +0100
Subject: [PATCH 1228/3449] pythonPackages.tensorflow: 0.10.0 -> 1.0.0

---
 .../python-modules/tensorflow/cuda.nix        |  52 ---------
 .../python-modules/tensorflow/default.nix     | 110 +++++++++++++++---
 pkgs/top-level/python-packages.nix            |   4 +-
 3 files changed, 97 insertions(+), 69 deletions(-)
 delete mode 100644 pkgs/development/python-modules/tensorflow/cuda.nix

diff --git a/pkgs/development/python-modules/tensorflow/cuda.nix b/pkgs/development/python-modules/tensorflow/cuda.nix
deleted file mode 100644
index 05a4cc3e4c18..000000000000
--- a/pkgs/development/python-modules/tensorflow/cuda.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv
-, fetchurl
-, buildPythonPackage
-, swig
-, numpy
-, six
-, protobuf3_0
-, cudatoolkit75
-, cudnn5_cudatoolkit75
-, gcc49
-, zlib
-, linuxPackages
-, mock
-}:
-
-buildPythonPackage rec {
-  pname = "tensorflow";
-  version = "0.11.0rc0";
-  name = "${pname}-${version}";
-  format = "wheel";
-
-  src = fetchurl {
-    url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
-    sha256 = "1r8zlz95sw7bnjzg5zdbpa9dj8wmp8cvvgyl9sv3amsscagnnfj5";
-  };
-
-  buildInputs = [ swig ];
-  propagatedBuildInputs = [ numpy six protobuf3_0 cudatoolkit75 cudnn5_cudatoolkit75 gcc49 mock ];
-
-  # Note that we need to run *after* the fixup phase because the
-  # libraries are loaded at runtime. If we run in preFixup then
-  # patchelf --shrink-rpath will remove the cuda libraries.
-  postFixup = let
-    rpath = stdenv.lib.makeLibraryPath [
-      gcc49.cc.lib
-      zlib cudatoolkit75
-      cudnn5_cudatoolkit75
-      linuxPackages.nvidia_x11
-    ];
-  in ''
-    find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
-  '';
-
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    description = "TensorFlow helps the tensors flow (no gpu support)";
-    homepage = http://tensorflow.org;
-    license = licenses.asl20;
-    platforms   = platforms.linux;
-  };
-}
diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index f8bc35eb5684..9357ea90b405 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -1,15 +1,29 @@
 { stdenv
 , fetchurl
 , buildPythonPackage
+, isPy35, isPy27
+, cudaSupport ? false
+, cudatoolkit75 ? null
+, cudnn5_cudatoolkit75 ? null
+, gcc49 ? null
+, linuxPackages ? null
 , numpy
 , six
-, protobuf3_0_0b2
+, protobuf3_2
 , swig
 , mock
 , gcc
 , zlib
 }:
 
+assert cudaSupport -> cudatoolkit75 != null
+                   && cudnn5_cudatoolkit75 != null
+                   && gcc49 != null
+                   && linuxPackages != null;
+
+# unsupported combination
+assert ! (stdenv.isDarwin && cudaSupport);
+
 # tensorflow is built from a downloaded wheel, because the upstream
 # project's build system is an arcane beast based on
 # bazel. Untangling it and building the wheel from source is an open
@@ -17,32 +31,96 @@
 
 buildPythonPackage rec {
   pname = "tensorflow";
-  version = "0.10.0";
+  version = "1.0.0";
   name = "${pname}-${version}";
   format = "wheel";
+  disabled = ! (isPy35 || isPy27);
 
-  src = fetchurl {
-    url = if stdenv.isDarwin then
-      "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py2-none-any.whl" else
-      "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-${version}-cp27-none-linux_x86_64.whl";
-    sha256 = if stdenv.isDarwin then
-      "1gjybh3j3rn34bzhsxsfdbqgsr4jh50qyx2wqywvcb24fkvy40j9" else
-      "0g05pa4z6kdy0giz7hjgjgwf4zzr5l8cf1zh247ymixlikn3fnpx";
-  };
+  src = let
+      tfurl = sys: proc: pykind:
+        let
+          tfpref = if proc == "gpu"
+            then "gpu/tensorflow_gpu"
+            else "cpu/tensorflow";
+        in
+        "https://storage.googleapis.com/tensorflow/${sys}/${tfpref}-${version}-${pykind}.whl";
+      dls =
+        {
+        darwin.cpu = {
+          py2 = {
+            url = tfurl "mac" "cpu" "py2-none-any" ;
+            sha256 = "15ayil28p20wkgpwkr4mz0imjxnf049xx4117jspg1qkjg2bn1b2";
+          };
+          py3 = {
+            url = tfurl "mac" "cpu" "py3-none-any" ;
+            sha256 = "1ynyhbm7yrp421364s49a1r3p83zxy74iiy5c4hx2xm5c4gs29an";
+          };
+        };
+        linux-x86_64.cpu = {
+          py2 = {
+            url = tfurl "linux" "cpu" "cp27-none-linux_x86_64";
+            sha256 = "1hwhq1qhjrfkqfkxpsrq6mdmdibnqr3n7xvzkxp6gaqj73vn5ch2";
+          };
+          py3 = {
+            url = tfurl "linux" "cpu" "cp35-cp35m-linux_x86_64";
+            sha256 = "0jx2mmlw0nxah9l25r46i7diqiv31qcz7855n250lsxfwcppy7y3";
+          };
+        };
+        linux-x86_64.cuda = {
+          py2 = {
+            url = tfurl "linux" "gpu" "cp27-none-linux_x86_64";
+            sha256 = "0l8f71x3ama5a6idj05jrswlmp4yg37fxhz8lx2xmgk14aszbcy5";
+          };
+          py3 = {
+            url = tfurl "linux" "gpu" "cp35-cp35m-linux_x86_64";
+            sha256 = "12q7s0yk0h3r4glh0fhl1fcdx7jl8xikwwp04a1lcagasr51s36m";
+          };
+        };
+      };
+    in
+    fetchurl (
+      if stdenv.isDarwin then
+        if isPy35 then
+          dls.darwin.cpu.py3
+        else
+          dls.darwin.cpu.py2
+      else if isPy35 then
+        if cudaSupport then
+          dls.linux-x86_64.cuda.py3
+        else dls.linux-x86_64.cpu.py3
+      else
+        if cudaSupport then
+          dls.linux-x86_64.cuda.py2
+        else
+          dls.linux-x86_64.cpu.py2
+    );
 
-  propagatedBuildInputs = [ numpy six protobuf3_0_0b2 swig mock];
+  propagatedBuildInputs = with stdenv.lib;
+    [ numpy six protobuf3_2 swig mock ]
+    ++ optionals cudaSupport [ cudatoolkit75 cudnn5_cudatoolkit75 gcc49 ];
 
-  preFixup = ''
-    RPATH="${stdenv.lib.makeLibraryPath [ gcc.cc.lib zlib ]}"
-    find $out -name '*.so' -exec patchelf --set-rpath "$RPATH" {} \;
+  # Note that we need to run *after* the fixup phase because the
+  # libraries are loaded at runtime. If we run in preFixup then
+  # patchelf --shrink-rpath will remove the cuda libraries.
+  postFixup = let
+    rpath = stdenv.lib.makeLibraryPath
+      (if cudaSupport then
+        [ gcc49.cc.lib zlib cudatoolkit75 cudnn5_cudatoolkit75
+          linuxPackages.nvidia_x11 ]
+      else
+        [ gcc.cc.lib zlib ]
+      );
+  in
+  ''
+    find $out -name '*.so' -exec patchelf --set-rpath "${rpath}" {} \;
   '';
 
   doCheck = false;
 
   meta = with stdenv.lib; {
-    description = "TensorFlow helps the tensors flow (no gpu support)";
+    description = "TensorFlow helps the tensors flow";
     homepage = http://tensorflow.org;
     license = licenses.asl20;
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; if cudaSupport then linux else linux ++ darwin;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dbec6e2dc795..6a51e40d1233 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31254,7 +31254,9 @@ EOF
 
   tensorflowWithoutCuda = callPackage ../development/python-modules/tensorflow { };
 
-  tensorflowWithCuda = callPackage ../development/python-modules/tensorflow/cuda.nix { };
+  tensorflowWithCuda = callPackage ../development/python-modules/tensorflow {
+    cudaSupport = true;
+  };
 
   tflearn = buildPythonPackage rec {
     name = "tflearn-0.2.1";

From eb073e9cd9c0a8b8d6f7f1901def14afc89341e3 Mon Sep 17 00:00:00 2001
From: Thomas Strobel
 <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>
Date: Mon, 27 Feb 2017 11:03:39 +0100
Subject: [PATCH 1229/3449] moneyplex: fix: add download link

---
 .../applications/office/moneyplex/default.nix | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index 866fda59d713..4530305ee12e 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, requireFile, writeScript, patchelf, libredirect, coreutils, pcsclite
+{ stdenv, fetchurl, patchelf, libredirect, coreutils, pcsclite
 , zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc zlib glib gdk_pixbuf gtk2 cairo pango libX11 atk openssl
   ];
+
+  src_i686 = {
+    url = "http://www.matrica.com/download/distribution/moneyplex_16_install32_22424.tar.gz";
+    sha256 = "0yfpc6s85r08g796dycl378kagkma865vp7j72npia3hjc4vwamr";
+  };
+
+  src_x86_64 = {
+    url = "http://www.matrica.com/download/distribution/moneyplex_16_install64_22424.tar.gz";
+    sha256 = "03vxbg1yp8qyvcn6bw2a5s134nxzq9cn0vqbmlld7hh4knbsfqzw";
+  };
 in
 
 stdenv.mkDerivation rec {
   name = "moneyplex-${version}";
-  version = "1.0";
+  version = "16.0.22424";
+
+  src = fetchurl (if stdenv.system == "i686-linux" then src_i686
+                  else if stdenv.system == "x86_64-linux" then src_x86_64
+                  else throw "moneyplex requires i686-linux or x86_64-linux");
 
-  src = requireFile {
-    message = ''
-      Unfortunately, Matrica does not provide an installable version of moneyplex.
-      To work around, install moneyplex on another system, und delete the following files
-      from the moneyplex installation directory: backups, mdaten, rup, Lnx\ Global.ali, Lnx\ Local ...ali
-      and settings.ini, and then pack the folder into moneyplex-${version}.tar.gz.
-    '';
-    name = "moneyplex-${version}.tar.gz";
-    sha256 = "0wpzwvhybjbqvqi8bpvkvcs3mikvl68gk1hzawihi0xnm28lcxw0";
-  };
 
   phases = [ "unpackPhase" "installPhase" "postInstall" ];
 

From 60b9948229b3bb9e0c6c9c3a2a868b88e8bdd14f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 27 Feb 2017 11:03:17 +0100
Subject: [PATCH 1230/3449] pythonPackages.djangorestframework: 3.2.3 -> 3.5.4

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

diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
new file mode 100644
index 000000000000..5ad026a8255a
--- /dev/null
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchurl, django }:
+buildPythonPackage rec {
+  name = "djangorestframework-${version}";
+  version = "3.5.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
+    sha256 = "1rays9d8jxqng13fv18ldf11y44w0ln6vvj2k8m4sd9gw9da75gr";
+  };
+
+  # Test settings are missing
+  doCheck = false;
+
+  propagatedBuildInputs = [ django ];
+
+  meta = with stdenv.lib; {
+    description = "Web APIs for Django, made easy";
+    homepage = http://www.django-rest-framework.org/;
+    maintainers = with maintainers; [ desiderius ];
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1488740bc7b..99c3e1b09ed1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10617,26 +10617,7 @@ in {
     };
   };
 
-  djangorestframework = buildPythonPackage rec {
-    name = "djangorestframework-${version}";
-    version = "3.2.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
-      sha256 = "06kp4hg3y4bqy2ixlb1q6bw81gwgsb86l4lanbav7bp1grrbbnj1";
-    };
-
-    doCheck = false;
-
-    propagatedBuildInputs = with self; [ django ];
-
-    meta = {
-      description = "Web APIs for Django, made easy";
-      homepage = http://www.django-rest-framework.org/;
-      maintainers = with maintainers; [ desiderius ];
-      license = licenses.bsd2;
-    };
-  };
+  djangorestframework = callPackage ../development/python-modules/djangorestframework { };
 
   django_raster = buildPythonPackage rec {
     name = "django-raster-${version}";

From 9e21b2c5e99a76379d5993b88f2de645ab2a390c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 20:30:00 +0100
Subject: [PATCH 1231/3449] gst-python: align attrname with pkgname

---
 pkgs/applications/audio/morituri/default.nix     | 4 ++--
 pkgs/applications/audio/quodlibet/default.nix    | 4 ++--
 pkgs/applications/video/miro/default.nix         | 4 ++--
 pkgs/development/libraries/farsight2/default.nix | 4 ++--
 pkgs/top-level/aliases.nix                       | 1 +
 pkgs/top-level/all-packages.nix                  | 7 +++----
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix
index 0ab0d24c2726..44d10957ca64 100644
--- a/pkgs/applications/audio/morituri/default.nix
+++ b/pkgs/applications/audio/morituri/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao
-, gst_python, gst_plugins_base, gst_plugins_good
+, gst-python, gst_plugins_base, gst_plugins_good
 , utillinux, makeWrapper, substituteAll, autoreconfHook }:
 
 let
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   };
 
   pythonPath = with pythonPackages; [
-    pygobject2 gst_python musicbrainzngs
+    pygobject2 gst-python musicbrainzngs
     pycdio pyxdg setuptools
     CDDB
   ];
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 0546f9a0ad2e..1c6bd7783eb4 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python2Packages, intltool
-, gst_python, withGstPlugins ? false, gst_plugins_base ? null
+, gst-python, withGstPlugins ? false, gst_plugins_base ? null
 , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
 
 assert withGstPlugins -> gst_plugins_base != null
@@ -48,7 +48,7 @@ in buildPythonApplication {
   ];
 
   propagatedBuildInputs = [
-    mutagen pygtk pygobject2 dbus-python gst_python intltool
+    mutagen pygtk pygobject2 dbus-python gst-python intltool
   ];
 
   postInstall = stdenv.lib.optionalString withGstPlugins ''
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 0652ac7e6642..b0a793dc1056 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -2,7 +2,7 @@
 , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
 , taglib, sqlite
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
-, gst_python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
+, gst-python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
 , enableBonjour ? false, avahi ? null
 }:
 
@@ -77,7 +77,7 @@ in buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     pygobject2 pygtk pycurl mutagen pycairo dbus-python
     pywebkitgtk] ++ [ libtorrentRasterbar
-    gst_python gst_plugins_base gst_plugins_good gst_ffmpeg
+    gst-python gst_plugins_base gst_plugins_good gst_ffmpeg
   ] ++ optional enableBonjour avahi;
 
   meta = {
diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix
index b7a17c82bebd..da6c799ae8b9 100644
--- a/pkgs/development/libraries/farsight2/default.nix
+++ b/pkgs/development/libraries/farsight2/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base
-, gst_python, gupnp_igd }:
+, gst-python, gupnp_igd }:
 
 let
   inherit (python2Packages) python pygobject2;
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm";
   };
 
-  buildInputs = [ libnice python pygobject2 gst_python gupnp_igd ];
+  buildInputs = [ libnice python pygobject2 gst-python gupnp_igd ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 841eb75e905f..97a93c17ac43 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -52,6 +52,7 @@ doNotDisplayTwice rec {
   git-hub = gitAndTools.git-hub; # added 2016-04-29
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = qt5.grantlee;  # added 2015-12-19
+  gst_python = gst-python;  # added 2017-02
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
   htmlTidy = html-tidy;  # added 2014-12-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6de7c892d879..bdc712153763 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7518,7 +7518,7 @@ with pkgs;
   });
 
   gst_all = {
-    inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
+    inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer;
     gstPluginsBase = pkgs.gst_plugins_base;
     gstPluginsBad = pkgs.gst_plugins_bad;
     gstPluginsGood = pkgs.gst_plugins_good;
@@ -7530,8 +7530,7 @@ with pkgs;
     gst-plugins-bad = pkgs.gst_plugins_bad;
     gst-plugins-good = pkgs.gst_plugins_good;
     gst-plugins-ugly = pkgs.gst_plugins_ugly;
-    gst-ffmpeg = pkgs.gst_ffmpeg;
-    gst-python = pkgs.gst_python;
+    gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 
   gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
@@ -7552,7 +7551,7 @@ with pkgs;
     ffmpeg = ffmpeg_0;
   };
 
-  gst_python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
+  gst-python = callPackage ../development/libraries/gstreamer/legacy/gst-python {};
 
   gstreamermm = callPackage ../development/libraries/gstreamer/legacy/gstreamermm { };
 

From 4b2c7fe3d1c6f46d5829db0e4b9dab1bdbfd8c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 20:31:29 +0100
Subject: [PATCH 1232/3449] gst-ffmpeg: align attrname with pkgname

---
 pkgs/applications/audio/banshee/default.nix                 | 4 ++--
 pkgs/applications/audio/transcribe/default.nix              | 4 ++--
 .../networking/instant-messengers/baresip/default.nix       | 4 ++--
 pkgs/applications/video/miro/default.nix                    | 4 ++--
 pkgs/tools/security/tor/torbrowser.nix                      | 4 ++--
 pkgs/top-level/aliases.nix                                  | 1 +
 pkgs/top-level/all-packages.nix                             | 6 +++---
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index 4e5086bdb26d..a8669dc957c9 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base
-, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst_ffmpeg, glib
+, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
 , libmtp, libgpod, mono-zeroconf }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
     gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst_plugins_good
-    gst_plugins_bad gst_plugins_ugly gst_ffmpeg
+    gst_plugins_bad gst_plugins_ugly gst-ffmpeg
     mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
     gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
     gio-sharp libmtp libgpod mono-zeroconf
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 55e4b8e00b65..2f1ebfb470ad 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf
-, glib, gst_ffmpeg, gst_plugins_bad, gst_plugins_base
+, glib, gst-ffmpeg, gst_plugins_bad, gst_plugins_base
 , gst_plugins_good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11
 , libpng12, pango, zlib }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [ gst_plugins_base gst_plugins_good
-    gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
+    gst_plugins_bad gst_plugins_ugly gst-ffmpeg ];
 
   dontPatchELF = true;
 
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 3ce638e6b58a..0ed65b72bfa0 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst_ffmpeg, gst_plugins_base, gst_plugins_bad
+, 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
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
-    cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
+    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
     ];
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index b0a793dc1056..443726ecb853 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -2,7 +2,7 @@
 , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
 , taglib, sqlite
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
-, gst-python, gst_plugins_base, gst_plugins_good, gst_ffmpeg
+, gst-python, gst_plugins_base, gst_plugins_good, gst-ffmpeg
 , enableBonjour ? false, avahi ? null
 }:
 
@@ -77,7 +77,7 @@ in buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     pygobject2 pygtk pycurl mutagen pycairo dbus-python
     pywebkitgtk] ++ [ libtorrentRasterbar
-    gst-python gst_plugins_base gst_plugins_good gst_ffmpeg
+    gst-python gst_plugins_base gst_plugins_good gst-ffmpeg
   ] ++ optional enableBonjour avahi;
 
   meta = {
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 490864ee2d59..1073fd1cbad2 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -1,7 +1,7 @@
 { 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
+, gstreamer, gst_plugins_base, gst_plugins_good, gst-ffmpeg, gmp, ffmpeg
 , libpulseaudio
 , mediaSupport ? false
 }:
@@ -16,7 +16,7 @@ let
   ]);
 
   # Ignored if !mediaSupport
-  gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg ];
+  gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst-ffmpeg ];
 
   gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
     "${x}/lib/gstreamer-0.10") gstPlugins;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 97a93c17ac43..759d92cd05f8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -52,6 +52,7 @@ doNotDisplayTwice rec {
   git-hub = gitAndTools.git-hub; # added 2016-04-29
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = qt5.grantlee;  # added 2015-12-19
+  gst_ffmpeg = gst-ffmpeg;  # added 2017-02
   gst_python = gst-python;  # added 2017-02
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bdc712153763..6ff7cb0beba3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1151,7 +1151,7 @@ with pkgs;
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
-    gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ];
+    gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst-ffmpeg ];
   };
 
   clementineFree = clementine.free;
@@ -7523,7 +7523,7 @@ with pkgs;
     gstPluginsBad = pkgs.gst_plugins_bad;
     gstPluginsGood = pkgs.gst_plugins_good;
     gstPluginsUgly = pkgs.gst_plugins_ugly;
-    gstFfmpeg = pkgs.gst_ffmpeg;
+    gstFfmpeg = pkgs.gst-ffmpeg;
 
     # aliases with the dashed naming, same as in gst_all_1
     gst-plugins-base = pkgs.gst_plugins_base;
@@ -7547,7 +7547,7 @@ with pkgs;
 
   gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
 
-  gst_ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
+  gst-ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
     ffmpeg = ffmpeg_0;
   };
 

From 0591cd607b3bcb2af298d978c1cedf8c5d9a1328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 20:36:20 +0100
Subject: [PATCH 1233/3449] gst-plugins-good: align attrname with pkgname

---
 pkgs/applications/audio/banshee/default.nix               | 4 ++--
 pkgs/applications/audio/morituri/default.nix              | 4 ++--
 pkgs/applications/audio/quodlibet/default.nix             | 6 +++---
 pkgs/applications/audio/transcribe/default.nix            | 4 ++--
 .../networking/instant-messengers/baresip/default.nix     | 4 ++--
 pkgs/applications/video/miro/default.nix                  | 4 ++--
 pkgs/desktops/xfce/applications/xfce4-mixer.nix           | 4 ++--
 pkgs/tools/networking/uget/default.nix                    | 4 ++--
 pkgs/tools/security/tor/torbrowser.nix                    | 4 ++--
 pkgs/top-level/aliases.nix                                | 1 +
 pkgs/top-level/all-packages.nix                           | 8 ++++----
 11 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index a8669dc957c9..ca723e61e06a 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base
-, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly, gst-ffmpeg, glib
+, gst-plugins-good, gst_plugins_bad, gst_plugins_ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
 , libmtp, libgpod, mono-zeroconf }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
-    gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst_plugins_good
+    gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst-plugins-good
     gst_plugins_bad gst_plugins_ugly gst-ffmpeg
     mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
     gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix
index 44d10957ca64..053c295be52f 100644
--- a/pkgs/applications/audio/morituri/default.nix
+++ b/pkgs/applications/audio/morituri/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao
-, gst-python, gst_plugins_base, gst_plugins_good
+, gst-python, gst_plugins_base, gst-plugins-good
 , utillinux, makeWrapper, substituteAll, autoreconfHook }:
 
 let
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [
     python cdparanoia cdrdao utillinux makeWrapper
-    gst_plugins_base gst_plugins_good
+    gst_plugins_base gst-plugins-good
   ] ++ pythonPath;
 
   patches = [
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 1c6bd7783eb4..f243d0c15ed2 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, python2Packages, intltool
 , gst-python, withGstPlugins ? false, gst_plugins_base ? null
-, gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
+, gst-plugins-good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
 
 assert withGstPlugins -> gst_plugins_base != null
-                         || gst_plugins_good != null
+                         || gst-plugins-good != null
                          || gst_plugins_ugly != null
                          || gst_plugins_bad != null;
 
@@ -44,7 +44,7 @@ in buildPythonApplication {
   patches = [ ./quodlibet-package-plugins.patch ];
 
   buildInputs = stdenv.lib.optionals withGstPlugins [
-    gst_plugins_base gst_plugins_good gst_plugins_ugly gst_plugins_bad
+    gst_plugins_base gst-plugins-good gst_plugins_ugly gst_plugins_bad
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 2f1ebfb470ad..50c022ec0045 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf
 , glib, gst-ffmpeg, gst_plugins_bad, gst_plugins_base
-, gst_plugins_good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11
+, gst-plugins-good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11
 , libpng12, pango, zlib }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = [ gst_plugins_base gst_plugins_good
+  buildInputs = [ gst_plugins_base gst-plugins-good
     gst_plugins_bad gst_plugins_ugly gst-ffmpeg ];
 
   dontPatchELF = true;
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 0ed65b72bfa0..eb8aff405285 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,6 +1,6 @@
 {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
+, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
 , gsm, speex, portaudio, spandsp, libuuid, ccache
 }:
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
-    cairo mpg123 gstreamer gst-ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
+    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
     ];
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 443726ecb853..8a033d7761a9 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -2,7 +2,7 @@
 , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
 , taglib, sqlite
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
-, gst-python, gst_plugins_base, gst_plugins_good, gst-ffmpeg
+, gst-python, gst_plugins_base, gst-plugins-good, gst-ffmpeg
 , enableBonjour ? false, avahi ? null
 }:
 
@@ -77,7 +77,7 @@ in buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     pygobject2 pygtk pycurl mutagen pycairo dbus-python
     pywebkitgtk] ++ [ libtorrentRasterbar
-    gst-python gst_plugins_base gst_plugins_good gst-ffmpeg
+    gst-python gst_plugins_base gst-plugins-good gst-ffmpeg
   ] ++ optional enableBonjour avahi;
 
   meta = {
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
index 78c37771811b..f14a2037184c 100644
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, makeWrapper
 , glib, gstreamer, gst_plugins_base, gtk
 , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
-, pulseaudioSupport ? false, gst_plugins_good
+, pulseaudioSupport ? false, gst-plugins-good
 }:
 
 let
@@ -10,7 +10,7 @@ let
   gst_plugins_minimal = gst_plugins_base.override {
     minimalDeps = true;
   };
-  gst_plugins_pulse = gst_plugins_good.override {
+  gst_plugins_pulse = gst-plugins-good.override {
     minimalDeps = true;
   };
   gst_plugins = [ gst_plugins_minimal ] ++ stdenv.lib.optional pulseaudioSupport gst_plugins_pulse;
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index 2408337d819e..8a60858526ee 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer,
-  gst_plugins_base, gst_plugins_good, gnome3, makeWrapper, aria2 ? null }:
+  gst_plugins_base, gst-plugins-good, gnome3, makeWrapper, aria2 ? null }:
 
 stdenv.mkDerivation rec {
   name = "uget-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool makeWrapper ];
   
   buildInputs = [
-    openssl curl libnotify gstreamer gst_plugins_base gst_plugins_good
+    openssl curl libnotify gstreamer gst_plugins_base gst-plugins-good
     gnome3.gtk gnome3.dconf
   ]
   ++ (stdenv.lib.optional (aria2 != null) aria2);
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 1073fd1cbad2..12df8db832c1 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -1,7 +1,7 @@
 { 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
+, gstreamer, gst_plugins_base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg
 , libpulseaudio
 , mediaSupport ? false
 }:
@@ -16,7 +16,7 @@ let
   ]);
 
   # Ignored if !mediaSupport
-  gstPlugins = [ gstreamer gst_plugins_base gst_plugins_good gst-ffmpeg ];
+  gstPlugins = [ gstreamer gst_plugins_base gst-plugins-good gst-ffmpeg ];
 
   gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
     "${x}/lib/gstreamer-0.10") gstPlugins;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 759d92cd05f8..630053463f66 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -53,6 +53,7 @@ doNotDisplayTwice rec {
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gst_ffmpeg = gst-ffmpeg;  # added 2017-02
+  gst_plugins_good = gst-plugins-good;  # added 2017-02
   gst_python = gst-python;  # added 2017-02
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ff7cb0beba3..57b17b46f11b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1151,7 +1151,7 @@ with pkgs;
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
-    gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst-ffmpeg ];
+    gst_plugins = [ gst_plugins_base gst-plugins-good gst_plugins_ugly gst-ffmpeg ];
   };
 
   clementineFree = clementine.free;
@@ -7521,14 +7521,14 @@ with pkgs;
     inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer;
     gstPluginsBase = pkgs.gst_plugins_base;
     gstPluginsBad = pkgs.gst_plugins_bad;
-    gstPluginsGood = pkgs.gst_plugins_good;
+    gstPluginsGood = pkgs.gst-plugins-good;
     gstPluginsUgly = pkgs.gst_plugins_ugly;
     gstFfmpeg = pkgs.gst-ffmpeg;
 
     # aliases with the dashed naming, same as in gst_all_1
     gst-plugins-base = pkgs.gst_plugins_base;
     gst-plugins-bad = pkgs.gst_plugins_bad;
-    gst-plugins-good = pkgs.gst_plugins_good;
+    gst-plugins-good = pkgs.gst-plugins-good;
     gst-plugins-ugly = pkgs.gst_plugins_ugly;
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
@@ -7541,7 +7541,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
 
-  gst_plugins_good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
+  gst-plugins-good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
 
   gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {};
 

From 1ea4146f66b7751f3bbabc351b18d37f0228a241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 20:36:54 +0100
Subject: [PATCH 1234/3449] gst-plugins-bad: align attrname with pkgname

---
 pkgs/applications/audio/banshee/default.nix               | 4 ++--
 pkgs/applications/audio/quodlibet/default.nix             | 6 +++---
 pkgs/applications/audio/transcribe/default.nix            | 4 ++--
 .../networking/instant-messengers/baresip/default.nix     | 4 ++--
 .../networking/instant-messengers/gajim/default.nix       | 6 +++---
 pkgs/top-level/aliases.nix                                | 1 +
 pkgs/top-level/all-packages.nix                           | 8 ++++----
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index ca723e61e06a..a1f00ace174e 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base
-, gst-plugins-good, gst_plugins_bad, gst_plugins_ugly, gst-ffmpeg, glib
+, gst-plugins-good, gst-plugins-bad, gst_plugins_ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
 , libmtp, libgpod, mono-zeroconf }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
     gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst-plugins-good
-    gst_plugins_bad gst_plugins_ugly gst-ffmpeg
+    gst-plugins-bad gst_plugins_ugly gst-ffmpeg
     mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
     gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
     gio-sharp libmtp libgpod mono-zeroconf
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index f243d0c15ed2..ff151eca1497 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python2Packages, intltool
 , gst-python, withGstPlugins ? false, gst_plugins_base ? null
-, gst-plugins-good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
+, gst-plugins-good ? null, gst_plugins_ugly ? null, gst-plugins-bad ? null }:
 
 assert withGstPlugins -> gst_plugins_base != null
                          || gst-plugins-good != null
                          || gst_plugins_ugly != null
-                         || gst_plugins_bad != null;
+                         || gst-plugins-bad != null;
 
 let
   version = "2.6.3";
@@ -44,7 +44,7 @@ in buildPythonApplication {
   patches = [ ./quodlibet-package-plugins.patch ];
 
   buildInputs = stdenv.lib.optionals withGstPlugins [
-    gst_plugins_base gst-plugins-good gst_plugins_ugly gst_plugins_bad
+    gst_plugins_base gst-plugins-good gst_plugins_ugly gst-plugins-bad
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 50c022ec0045..8bd07df063da 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf
-, glib, gst-ffmpeg, gst_plugins_bad, gst_plugins_base
+, glib, gst-ffmpeg, gst-plugins-bad, gst_plugins_base
 , gst-plugins-good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11
 , libpng12, pango, zlib }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [ gst_plugins_base gst-plugins-good
-    gst_plugins_bad gst_plugins_ugly gst-ffmpeg ];
+    gst-plugins-bad gst_plugins_ugly gst-ffmpeg ];
 
   dontPatchELF = true;
 
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index eb8aff405285..a7ddfd1ae418 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst-ffmpeg, gst_plugins_base, gst_plugins_bad
+, 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
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
-    cairo mpg123 gstreamer gst-ffmpeg gst_plugins_base gst_plugins_bad gst-plugins-good
+    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
     ];
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index d78bd759ea6e..ae318e644243 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -4,7 +4,7 @@
 # Test requirements
 , xvfb_run
 
-, enableJingle ? true, farstream ? null, gst_plugins_bad ? null
+, enableJingle ? true, farstream ? null, gst-plugins-bad ? null
 ,                      libnice ? null
 , enableE2E ? true
 , enableRST ? true
@@ -14,7 +14,7 @@
 , extraPythonPackages ? pkgs: []
 }:
 
-assert enableJingle -> farstream != null && gst_plugins_bad != null
+assert enableJingle -> farstream != null && gst-plugins-bad != null
                     && libnice != null;
 assert enableE2E -> pythonPackages.pycrypto != null;
 assert enableRST -> pythonPackages.docutils != null;
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     python libX11
-  ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ];
+  ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ];
 
   nativeBuildInputs = [
     autoreconfHook pythonPackages.wrapPython intltool pkgconfig
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 630053463f66..2518bff1d78b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -54,6 +54,7 @@ doNotDisplayTwice rec {
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gst_ffmpeg = gst-ffmpeg;  # added 2017-02
   gst_plugins_good = gst-plugins-good;  # added 2017-02
+  gst_plugins_bad = gst-plugins-bad;  # added 2017-02
   gst_python = gst-python;  # added 2017-02
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57b17b46f11b..e21f413f1d0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7520,14 +7520,14 @@ with pkgs;
   gst_all = {
     inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer;
     gstPluginsBase = pkgs.gst_plugins_base;
-    gstPluginsBad = pkgs.gst_plugins_bad;
+    gstPluginsBad = pkgs.gst-plugins-bad;
     gstPluginsGood = pkgs.gst-plugins-good;
     gstPluginsUgly = pkgs.gst_plugins_ugly;
     gstFfmpeg = pkgs.gst-ffmpeg;
 
     # aliases with the dashed naming, same as in gst_all_1
     gst-plugins-base = pkgs.gst_plugins_base;
-    gst-plugins-bad = pkgs.gst_plugins_bad;
+    gst-plugins-bad = pkgs.gst-plugins-bad;
     gst-plugins-good = pkgs.gst-plugins-good;
     gst-plugins-ugly = pkgs.gst_plugins_ugly;
     gst-ffmpeg = pkgs.gst-ffmpeg;
@@ -7543,7 +7543,7 @@ with pkgs;
 
   gst-plugins-good = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-good {};
 
-  gst_plugins_bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {};
+  gst-plugins-bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {};
 
   gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
 
@@ -14922,7 +14922,7 @@ with pkgs;
 
   quodlibet = callPackage ../applications/audio/quodlibet {
     withGstPlugins = true;
-    gst_plugins_bad = null;
+    gst-plugins-bad = null;
   };
 
   qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {

From 6b73e57e561ad5da21cd93b82674a5249ee6a391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 20:37:41 +0100
Subject: [PATCH 1235/3449] gst-plugins-ugly: align attrname with pkgname

---
 pkgs/applications/audio/banshee/default.nix    | 4 ++--
 pkgs/applications/audio/quodlibet/default.nix  | 6 +++---
 pkgs/applications/audio/transcribe/default.nix | 4 ++--
 pkgs/top-level/aliases.nix                     | 1 +
 pkgs/top-level/all-packages.nix                | 8 ++++----
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index a1f00ace174e..1907d621e49f 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,5 +1,5 @@
 { pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base
-, gst-plugins-good, gst-plugins-bad, gst_plugins_ugly, gst-ffmpeg, glib
+, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
 , libmtp, libgpod, mono-zeroconf }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
     gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst-plugins-good
-    gst-plugins-bad gst_plugins_ugly gst-ffmpeg
+    gst-plugins-bad gst-plugins-ugly gst-ffmpeg
     mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
     gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
     gio-sharp libmtp libgpod mono-zeroconf
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index ff151eca1497..2d97ba1d7639 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, python2Packages, intltool
 , gst-python, withGstPlugins ? false, gst_plugins_base ? null
-, gst-plugins-good ? null, gst_plugins_ugly ? null, gst-plugins-bad ? null }:
+, gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }:
 
 assert withGstPlugins -> gst_plugins_base != null
                          || gst-plugins-good != null
-                         || gst_plugins_ugly != null
+                         || gst-plugins-ugly != null
                          || gst-plugins-bad != null;
 
 let
@@ -44,7 +44,7 @@ in buildPythonApplication {
   patches = [ ./quodlibet-package-plugins.patch ];
 
   buildInputs = stdenv.lib.optionals withGstPlugins [
-    gst_plugins_base gst-plugins-good gst_plugins_ugly gst-plugins-bad
+    gst_plugins_base gst-plugins-good gst-plugins-ugly gst-plugins-bad
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 8bd07df063da..3eca141ee62f 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf
 , glib, gst-ffmpeg, gst-plugins-bad, gst_plugins_base
-, gst-plugins-good, gst_plugins_ugly, gstreamer, gtk2, libSM, libX11
+, gst-plugins-good, gst-plugins-ugly, gstreamer, gtk2, libSM, libX11
 , libpng12, pango, zlib }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
 
   buildInputs = [ gst_plugins_base gst-plugins-good
-    gst-plugins-bad gst_plugins_ugly gst-ffmpeg ];
+    gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
 
   dontPatchELF = true;
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2518bff1d78b..3ed1a721af5a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -55,6 +55,7 @@ doNotDisplayTwice rec {
   gst_ffmpeg = gst-ffmpeg;  # added 2017-02
   gst_plugins_good = gst-plugins-good;  # added 2017-02
   gst_plugins_bad = gst-plugins-bad;  # added 2017-02
+  gst_plugins_ugly = gst-plugins-ugly;  # added 2017-02
   gst_python = gst-python;  # added 2017-02
   gupnptools = gupnp-tools;  # added 2015-12-19
   gnustep-make = gnustep.make; # added 2016-7-6
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e21f413f1d0e..80127160a216 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1151,7 +1151,7 @@ with pkgs;
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
-    gst_plugins = [ gst_plugins_base gst-plugins-good gst_plugins_ugly gst-ffmpeg ];
+    gst_plugins = [ gst_plugins_base gst-plugins-good gst-plugins-ugly gst-ffmpeg ];
   };
 
   clementineFree = clementine.free;
@@ -7522,14 +7522,14 @@ with pkgs;
     gstPluginsBase = pkgs.gst_plugins_base;
     gstPluginsBad = pkgs.gst-plugins-bad;
     gstPluginsGood = pkgs.gst-plugins-good;
-    gstPluginsUgly = pkgs.gst_plugins_ugly;
+    gstPluginsUgly = pkgs.gst-plugins-ugly;
     gstFfmpeg = pkgs.gst-ffmpeg;
 
     # aliases with the dashed naming, same as in gst_all_1
     gst-plugins-base = pkgs.gst_plugins_base;
     gst-plugins-bad = pkgs.gst-plugins-bad;
     gst-plugins-good = pkgs.gst-plugins-good;
-    gst-plugins-ugly = pkgs.gst_plugins_ugly;
+    gst-plugins-ugly = pkgs.gst-plugins-ugly;
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 
@@ -7545,7 +7545,7 @@ with pkgs;
 
   gst-plugins-bad = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-bad {};
 
-  gst_plugins_ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
+  gst-plugins-ugly = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-ugly {};
 
   gst-ffmpeg = callPackage ../development/libraries/gstreamer/legacy/gst-ffmpeg {
     ffmpeg = ffmpeg_0;

From 512bd7c52248b7a7a10d256c3ac68bd3aa9fc9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 20:39:32 +0100
Subject: [PATCH 1236/3449] qt-gstreamer: align attrname with pkgname

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3ed1a721af5a..cf30289a126d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -98,6 +98,7 @@ doNotDisplayTwice rec {
   poppler_qt5 = qt5.poppler;  # added 2015-12-19
   qca-qt5 = qt5.qca-qt5;  # added 2015-12-19
   QmidiNet = qmidinet;  # added 2016-05-22
+  qt_gstreamer = qt-gstreamer;  # added 2017-02
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = qt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 80127160a216..028068a95440 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7518,7 +7518,7 @@ with pkgs;
   });
 
   gst_all = {
-    inherit (pkgs) gstreamer gnonlin gst-python qt_gstreamer;
+    inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
     gstPluginsBase = pkgs.gst_plugins_base;
     gstPluginsBad = pkgs.gst-plugins-bad;
     gstPluginsGood = pkgs.gst-plugins-good;
@@ -7563,7 +7563,7 @@ with pkgs;
 
   qt-mobility = callPackage ../development/libraries/qt-mobility {};
 
-  qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
+  qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
 
   qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
 

From c49533a4949b5fc7d3511dce7df4c27f811df4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 20:40:56 +0100
Subject: [PATCH 1237/3449] qt-gstreamer1: align attrname with pkgname

---
 .../instant-messengers/telepathy/kde/default.nix          | 8 ++++----
 .../science/robotics/qgroundcontrol/default.nix           | 2 +-
 pkgs/top-level/aliases.nix                                | 1 +
 pkgs/top-level/all-packages.nix                           | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index c79f939dc73c..592fc2b5934d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
 , telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
-, qt_gstreamer1, telepathy_glib, telepathy_logger
+, qt-gstreamer1, telepathy_glib, telepathy_logger
 , qjson, flex, bison, qca2 }:
 
 let
@@ -21,10 +21,10 @@ let
 
   extraBuildInputs = {
     auth_handler = [ qjson qca2 ];
-    call_ui = [ qt_gstreamer1 telepathy_glib farstream ];
+    call_ui = [ qt-gstreamer1 telepathy_glib farstream ];
     contact_applet = [ kde_workspace ];
-    telepathy_logger_qt = [ telepathy_logger qt_gstreamer1 ];
-    text_ui = [ qt_gstreamer1 telepathy_logger qjson ];
+    telepathy_logger_qt = [ telepathy_logger qt-gstreamer1 ];
+    text_ui = [ qt-gstreamer1 telepathy_logger qjson ];
     common_internals = [ telepathy_qt ];
   };
 
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 4222336fe9b2..98567c340bc4 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -2,7 +2,7 @@
   , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
   , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
   , makeQtWrapper, lndir
-  , gst_all_1, qt_gstreamer1, pkgconfig, glibc
+  , gst_all_1, qt-gstreamer1, pkgconfig, glibc
   , version ? "2.9.4"
 }:
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cf30289a126d..efeb14eb4174 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -99,6 +99,7 @@ doNotDisplayTwice rec {
   qca-qt5 = qt5.qca-qt5;  # added 2015-12-19
   QmidiNet = qmidinet;  # added 2016-05-22
   qt_gstreamer = qt-gstreamer;  # added 2017-02
+  qt_gstreamer1 = qt-gstreamer1;  # added 2017-02
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = qt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 028068a95440..acd872768a2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7565,7 +7565,7 @@ with pkgs;
 
   qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
 
-  qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
+  qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
 
   gnet = callPackage ../development/libraries/gnet { };
 

From 3d104ab2b3e578cb4599b6fffbcc019b09547521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Feb 2017 21:25:29 +0100
Subject: [PATCH 1238/3449] gst-plugins-base: align attrname with pkgname

---
 pkgs/applications/audio/banshee/default.nix   |  4 ++--
 .../applications/audio/clementine/default.nix |  4 ++--
 pkgs/applications/audio/morituri/default.nix  |  4 ++--
 pkgs/applications/audio/quodlibet/default.nix |  6 ++---
 .../applications/audio/transcribe/default.nix |  6 ++---
 .../browsers/firefox-bin/default.nix          |  4 ++--
 .../networking/browsers/firefox/default.nix   |  4 ++--
 .../networking/browsers/palemoon/default.nix  |  4 ++--
 .../networking/browsers/vivaldi/default.nix   |  4 ++--
 .../instant-messengers/baresip/default.nix    |  4 ++--
 .../instant-messengers/zoom-us/default.nix    |  4 ++--
 .../mailreaders/thunderbird-bin/default.nix   |  4 ++--
 .../mailreaders/thunderbird/default.nix       |  2 +-
 pkgs/applications/video/miro/default.nix      |  4 ++--
 .../gnome-3/3.22/misc/pomodoro/default.nix    |  2 +-
 .../xfce/applications/xfce4-mixer.nix         |  4 ++--
 .../xfce/applications/xfce4-volumed.nix       |  4 ++--
 .../haskell-modules/hackage-packages.nix      | 24 +++++++++----------
 .../libraries/farsight2/default.nix           |  4 ++--
 .../gstreamer/legacy/gnonlin/default.nix      |  4 ++--
 .../gstreamer/legacy/gst-ffmpeg/default.nix   |  4 ++--
 .../legacy/gst-plugins-bad/default.nix        |  4 ++--
 .../legacy/gst-plugins-good/default.nix       |  4 ++--
 .../legacy/gst-plugins-ugly/default.nix       |  4 ++--
 .../gstreamer/legacy/gst-python/default.nix   |  4 ++--
 .../gstreamer/legacy/gstreamermm/default.nix  |  4 ++--
 .../gstreamer/legacy/qt-gstreamer/default.nix |  4 ++--
 .../libraries/libcanberra/default.nix         |  4 ++--
 .../libraries/qt-4.x/4.8/default.nix          |  4 ++--
 .../libraries/wxGTK-2.8/default.nix           |  4 ++--
 .../libraries/wxGTK-2.9/default.nix           |  4 ++--
 .../libraries/wxGTK-3.0/default.nix           |  4 ++--
 pkgs/games/steam/runtime-wrapped.nix          |  2 +-
 pkgs/os-specific/linux/bluez/bluez5.nix       |  2 +-
 pkgs/os-specific/linux/bluez/bluez5_28.nix    |  2 +-
 pkgs/os-specific/linux/bluez/default.nix      |  2 +-
 pkgs/tools/networking/uget/default.nix        |  4 ++--
 pkgs/tools/security/tor/torbrowser.nix        |  6 ++---
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  8 +++----
 40 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/pkgs/applications/audio/banshee/default.nix b/pkgs/applications/audio/banshee/default.nix
index 1907d621e49f..d1c0c2afa83b 100644
--- a/pkgs/applications/audio/banshee/default.nix
+++ b/pkgs/applications/audio/banshee/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst_plugins_base
+{ pkgs, stdenv, lib, fetchurl, intltool, pkgconfig, gstreamer, gst-plugins-base
 , gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-ffmpeg, glib
 , mono, mono-addins, dbus-sharp-1_0, dbus-sharp-glib-1_0, notify-sharp, gtk-sharp-2_0
 , boo, gdata-sharp, taglib-sharp, sqlite, gnome-sharp, gconf, gtk-sharp-beans, gio-sharp
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs = [
-    gtk-sharp-2_0.gtk gstreamer gst_plugins_base gst-plugins-good
+    gtk-sharp-2_0.gtk gstreamer gst-plugins-base gst-plugins-good
     gst-plugins-bad gst-plugins-ugly gst-ffmpeg
     mono dbus-sharp-1_0 dbus-sharp-glib-1_0 mono-addins notify-sharp
     gtk-sharp-2_0 boo gdata-sharp taglib-sharp sqlite gnome-sharp gconf gtk-sharp-beans
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index cf58dffef02c..01c8ecaced0d 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst_plugins_base
+{ stdenv, fetchurl, boost, cmake, gettext, gstreamer, gst-plugins-base
 , liblastfm, qt4, taglib, fftw, glew, qjson, sqlite, libgpod, libplist
 , usbmuxd, libmtp, gvfs, libcdio, libspotify, protobuf, qca2, pkgconfig
 , sparsehash, config, makeWrapper, runCommand, gst_plugins }:
@@ -27,7 +27,7 @@ let
     fftw
     gettext
     glew
-    gst_plugins_base
+    gst-plugins-base
     gstreamer
     gvfs
     libcdio
diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix
index 053c295be52f..d4c67bb5622c 100644
--- a/pkgs/applications/audio/morituri/default.nix
+++ b/pkgs/applications/audio/morituri/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, pythonPackages, cdparanoia, cdrdao
-, gst-python, gst_plugins_base, gst-plugins-good
+, gst-python, gst-plugins-base, gst-plugins-good
 , utillinux, makeWrapper, substituteAll, autoreconfHook }:
 
 let
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [
     python cdparanoia cdrdao utillinux makeWrapper
-    gst_plugins_base gst-plugins-good
+    gst-plugins-base gst-plugins-good
   ] ++ pythonPath;
 
   patches = [
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 2d97ba1d7639..fa582d852157 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, python2Packages, intltool
-, gst-python, withGstPlugins ? false, gst_plugins_base ? null
+, gst-python, withGstPlugins ? false, gst-plugins-base ? null
 , gst-plugins-good ? null, gst-plugins-ugly ? null, gst-plugins-bad ? null }:
 
-assert withGstPlugins -> gst_plugins_base != null
+assert withGstPlugins -> gst-plugins-base != null
                          || gst-plugins-good != null
                          || gst-plugins-ugly != null
                          || gst-plugins-bad != null;
@@ -44,7 +44,7 @@ in buildPythonApplication {
   patches = [ ./quodlibet-package-plugins.patch ];
 
   buildInputs = stdenv.lib.optionals withGstPlugins [
-    gst_plugins_base gst-plugins-good gst-plugins-ugly gst-plugins-bad
+    gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 3eca141ee62f..5ec5087b9f26 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, lib, makeWrapper, alsaLib, atk, cairo, gdk_pixbuf
-, glib, gst-ffmpeg, gst-plugins-bad, gst_plugins_base
+, glib, gst-ffmpeg, gst-plugins-bad, gst-plugins-base
 , gst-plugins-good, gst-plugins-ugly, gstreamer, gtk2, libSM, libX11
 , libpng12, pango, zlib }:
 
@@ -21,14 +21,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  buildInputs = [ gst_plugins_base gst-plugins-good
+  buildInputs = [ gst-plugins-base gst-plugins-good
     gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
 
   dontPatchELF = true;
 
   libPath = lib.makeLibraryPath [
     stdenv.cc.cc glib gtk2 atk pango cairo gdk_pixbuf alsaLib
-    libX11 libSM libpng12 gstreamer gst_plugins_base zlib
+    libX11 libSM libpng12 gstreamer gst-plugins-base zlib
   ];
 
   installPhase = ''
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 80197999f5a3..01cd7a1df380 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -12,7 +12,7 @@
 , gdk_pixbuf
 , glib
 , glibc
-, gst_plugins_base
+, gst-plugins-base
 , gstreamer
 , gtk2
 , gtk3
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
       gdk_pixbuf
       glib
       glibc
-      gst_plugins_base
+      gst-plugins-base
       gstreamer
       gtk2
       gtk3
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index a01cde4d6de6..f2da6257efd1 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio
+, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc, libpulseaudio
 , autoconf213, which
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , enableGTK3 ? false
@@ -42,7 +42,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
       libpulseaudio # only headers are needed
     ]
     ++ lib.optional enableGTK3 gtk3
-    ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst_plugins_base ];
+    ++ lib.optionals (!passthru.ffmpegSupport) [ gstreamer gst-plugins-base ];
 
   nativeBuildInputs = [ autoconf213 which gnused ];
 
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index de21c37bc79e..73a828413600 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeDesktopItem
 , pkgconfig, autoconf213, alsaLib, bzip2, cairo
 , dbus, dbus_glib, file, fontconfig, freetype
-, gstreamer, gst_plugins_base, gst_all_1
+, 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 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype
-    gst_plugins_base gstreamer gst_all_1.gst-plugins-base gtk2
+    gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
     hunspell icu libevent libjpeg libnotify libstartup_notification
     libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
     libpulseaudio sqlite unzip which yasm zip zlib
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 0531a58f0a23..ab010653c644 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -3,7 +3,7 @@
 , alsaLib, dbus_libs, cups, libexif, ffmpeg, systemd
 , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
 , libuuid, xz
-, gstreamer, gst_plugins_base, libxml2
+, gstreamer, gst-plugins-base, libxml2
 , glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3
 , nss, nspr
 , patchelf
@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
       libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
       atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd
       freetype fontconfig libXrender libuuid expat glib nss nspr
-      gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf
+      gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
       patchelf
     ];
 
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index a7ddfd1ae418..2b831cdcaaf8 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,5 +1,5 @@
 {stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst-ffmpeg, gst_plugins_base, gst-plugins-bad
+, 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
 }:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
-    cairo mpg123 gstreamer gst-ffmpeg gst_plugins_base gst-plugins-bad gst-plugins-good
+    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
     ];
diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 85dbd5f8d8f7..067b1c7884a7 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -2,7 +2,7 @@
 , fetchurl
 , gcc
 , glib
-, gst_plugins_base
+, gst-plugins-base
 , gstreamer
 , icu
 , libpulseaudio
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       alsaLib
       gcc.cc
       glib
-      gst_plugins_base
+      gst-plugins-base
       gstreamer
       icu
       libpulseaudio
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 2bc65226c5fc..1b9c1ac1622f 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -13,7 +13,7 @@
 , gdk_pixbuf
 , glib
 , glibc
-, gst_plugins_base
+, gst-plugins-base
 , gstreamer
 , gtk2
 , kerberos
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
       gdk_pixbuf
       glib
       glibc
-      gst_plugins_base
+      gst-plugins-base
       gstreamer
       gtk2
       kerberos
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index f71a6dff37c5..d4ddfcfc4a69 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -3,7 +3,7 @@
 , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
 , yasm, mesa, sqlite, unzip, makeWrapper
 , hunspell, libevent, libstartup_notification, libvpx
-, cairo, gstreamer, gst_plugins_base, icu
+, cairo, gstreamer, gst-plugins-base, icu
 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl
 , debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird"
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 8a033d7761a9..0efa4aba2767 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -2,7 +2,7 @@
 , pythonPackages, pyrex096, ffmpeg, boost, glib, gtk2, webkitgtk2, libsoup
 , taglib, sqlite
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
-, gst-python, gst_plugins_base, gst-plugins-good, gst-ffmpeg
+, gst-python, gst-plugins-base, gst-plugins-good, gst-ffmpeg
 , enableBonjour ? false, avahi ? null
 }:
 
@@ -77,7 +77,7 @@ in buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     pygobject2 pygtk pycurl mutagen pycairo dbus-python
     pywebkitgtk] ++ [ libtorrentRasterbar
-    gst-python gst_plugins_base gst-plugins-good gst-ffmpeg
+    gst-python gst-plugins-base gst-plugins-good gst-ffmpeg
   ] ++ optional enableBonjour avahi;
 
   meta = {
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
index 8c1ab41de520..3ceabe70ad80 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base,
+  dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst-plugins-base,
   glib, gobjectIntrospection, telepathy_glib
 }:
 
diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
index f14a2037184c..05a5fa4a6fcc 100644
--- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, makeWrapper
-, glib, gstreamer, gst_plugins_base, gtk
+, glib, gstreamer, gst-plugins-base, gtk
 , libxfce4util, libxfce4ui, xfce4panel, xfconf, libunique ? null
 , pulseaudioSupport ? false, gst-plugins-good
 }:
@@ -7,7 +7,7 @@
 let
   # The usual Gstreamer plugins package has a zillion dependencies
   # that we don't need for a simple mixer, so build a minimal package.
-  gst_plugins_minimal = gst_plugins_base.override {
+  gst_plugins_minimal = gst-plugins-base.override {
     minimalDeps = true;
   };
   gst_plugins_pulse = gst-plugins-good.override {
diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed.nix b/pkgs/desktops/xfce/applications/xfce4-volumed.nix
index b603229e938d..8e4f952438fe 100644
--- a/pkgs/desktops/xfce/applications/xfce4-volumed.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-volumed.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, makeWrapper
-, gstreamer, gtk2, gst_plugins_base, libnotify
+, gstreamer, gtk2, gst-plugins-base, libnotify
 , keybinder, xfconf
 }:
 
 let
   # The usual Gstreamer plugins package has a zillion dependencies
   # that we don't need for a simple mixer, so build a minimal package.
-  gst_plugins_minimal = gst_plugins_base.override {
+  gst_plugins_minimal = gst-plugins-base.override {
     minimalDeps = true;
   };
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6feed8f5c987..d31dc82822cb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -69335,7 +69335,7 @@ self: {
   "gi-gstaudio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
+     , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstaudio";
@@ -69347,18 +69347,18 @@ self: {
          haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst_plugins_base ];
+       libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gobjectIntrospection; 
-         gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
+         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
 
   "gi-gstbase" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base
+     , gi-gobject, gi-gst, gobjectIntrospection, gst-plugins-base
      , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
@@ -69371,19 +69371,19 @@ self: {
          haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst_plugins_base ];
+       libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gobjectIntrospection; 
-         gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
+         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
 
   "gi-gstvideo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
+     , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstvideo";
@@ -69395,14 +69395,14 @@ self: {
          haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst_plugins_base ];
+       libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gobjectIntrospection; 
-         gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;};
+         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
 
   "gi-gtk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -76588,7 +76588,7 @@ self: {
 
   "gstreamer" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, directory, glib
-     , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
+     , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gstreamer";
@@ -76598,11 +76598,11 @@ self: {
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
        ];
-       libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
+       libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;};
+     }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, haskeline
diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix
index da6c799ae8b9..9ff57257e03b 100644
--- a/pkgs/development/libraries/farsight2/default.nix
+++ b/pkgs/development/libraries/farsight2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst_plugins_base
+{ stdenv, fetchurl, libnice, pkgconfig, python2Packages, gstreamer, gst-plugins-base
 , gst-python, gupnp_igd }:
 
 let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ gstreamer gst_plugins_base ];
+  propagatedBuildInputs = [ gstreamer gst-plugins-base ];
 
   meta = {
     homepage = http://farsight.freedesktop.org/wiki/;
diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
index 2e30782f44bb..0e8dfec65f4b 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gst_plugins_base, gstreamer }:
+{ stdenv, fetchurl, pkgconfig, gst-plugins-base, gstreamer }:
 
 stdenv.mkDerivation rec {
   name = "gnonlin-0.10.17";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dc9kvr6i7sh91cyhzlbx2bchwg84rfa4679ccppzjf0y65dv8p4";
   };
 
-  buildInputs = [ gst_plugins_base gstreamer pkgconfig ];
+  buildInputs = [ gst-plugins-base gstreamer pkgconfig ];
 
   meta = {
     homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html";
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
index 18d483594efb..484075f73f75 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-ffmpeg/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, gst_plugins_base, bzip2, yasm, orc
+{ fetchurl, stdenv, pkgconfig, gst-plugins-base, bzip2, yasm, orc
 , useInternalFfmpeg ? false, ffmpeg ? null }:
 
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optionalString (!useInternalFfmpeg) "--with-system-ffmpeg";
 
   buildInputs =
-    [ pkgconfig bzip2 gst_plugins_base orc ]
+    [ pkgconfig bzip2 gst-plugins-base orc ]
     ++ (if useInternalFfmpeg then [ yasm ] else [ ffmpeg ]);
 
   meta = {
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
index 988d1bba258a..fecc77b2a544 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base
 , libdvdnav, libdvdread, orc }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libdvdnav libdvdread orc ];
+    [ pkgconfig glib gstreamer gst-plugins-base libdvdnav libdvdread orc ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index af6e3be401b0..9339de3d9ed4 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, lib, pkgconfig, gst_plugins_base, aalib, cairo
+{ fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
 , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
 , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-experimental" "--disable-oss" ];
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base ]
+    [ pkgconfig glib gstreamer gst-plugins-base ]
     ++ lib.optional stdenv.isLinux libpulseaudio
     ++ libintlOrEmpty
     ++ lib.optionals (!minimalDeps)
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index 8e4e662dc3b3..9863b3e01285 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
+{ fetchurl, stdenv, pkgconfig, glib, gstreamer, gst-plugins-base
 , libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, lame, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty;
+    [ pkgconfig glib gstreamer gst-plugins-base libmad libdvdread a52dec x264 orc lame ] ++ libintlOrEmpty;
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
index d78b50a7821a..fd01aa5c1dce 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst_plugins_base
+{ fetchurl, stdenv, pkgconfig, python2Packages, gstreamer, gst-plugins-base
 }:
 
 let
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   patches = [ ./disable-testFake.patch ];
 
   buildInputs =
-    [ pkgconfig gst_plugins_base pygobject2 ]
+    [ pkgconfig gst-plugins-base pygobject2 ]
     ;
 
   propagatedBuildInputs = [ gstreamer python ];
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index ce6ae9318363..f181aa029bd7 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glibmm, gstreamer, gst_plugins_base, libsigcxx, libxmlxx, pkgconfig }:
+{ stdenv, fetchurl, glibmm, gstreamer, gst-plugins-base, libsigcxx, libxmlxx, pkgconfig }:
 
 let
   ver_maj = "0.10";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   doCheck = false; # Tests require pulseaudio in /homeless-shelter
 
   propagatedBuildInputs = [
-    glibmm gstreamer gst_plugins_base libsigcxx libxmlxx
+    glibmm gstreamer gst-plugins-base libsigcxx libxmlxx
   ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/qt-gstreamer/default.nix
index c0cab607062d..d298fbd7fc33 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, boost, glib, qt4, cmake
 , automoc4, flex, bison, pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pqg9sxzk8sdrf7pazb5v21hasqai9i4l203gbdqz29w2ll1ybsl";
   };
 
-  buildInputs = [ gstreamer gst_plugins_base glib qt4 ];
+  buildInputs = [ gstreamer gst-plugins-base glib qt4 ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
 
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 8e3523a27e9f..25be48026992 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
-, alsaLib, libpulseaudio, gstreamer, gst_plugins_base, libvorbis }:
+, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }:
 
 stdenv.mkDerivation rec {
   name = "libcanberra-0.30";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libtool alsaLib libpulseaudio libvorbis gtk libcap
-    /*gstreamer gst_plugins_base*/      # ToDo: gstreamer not found (why?), add (g)udev?
+    /*gstreamer gst-plugins-base*/      # ToDo: gstreamer not found (why?), add (g)udev?
   ];
 
   configureFlags = "--disable-oss";
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 8c8e311a93ed..0860a90192f0 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -3,7 +3,7 @@
 , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
 , libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig
 , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
-, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base
+, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , flashplayerFix ? false, gdk_pixbuf
 , gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
         # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used
     ++ optional mesaSupported mesa_glu
     ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
-    ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];
+    ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ];
 
   # The following libraries are only used in plugins
   buildInputs =
diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index 6b9aa4587350..cbfdf876dbaf 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, libX11, cairo
+, gstreamer, gst-plugins-base, GConf, libX11, cairo
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true,
 }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz";
   };
 
-  buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ]
+  buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ]
     ++ optional withMesa mesa;
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix
index b2f40978f51b..e19f0bc3a765 100644
--- a/pkgs/development/libraries/wxGTK-2.9/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.9/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
-, gstreamer, gst_plugins_base, GConf, setfile
+, gstreamer, gst-plugins-base, GConf, setfile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
 , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
-      gst_plugins_base GConf ]
+      gst-plugins-base GConf ]
     ++ optional withMesa mesa
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
 
diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix
index ed9372725146..f40595d4eacb 100644
--- a/pkgs/development/libraries/wxGTK-3.0/default.nix
+++ b/pkgs/development/libraries/wxGTK-3.0/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm
-, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile
+, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile
 , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
 , withWebKit ? false, webkitgtk2 ? null
 , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
-      gst_plugins_base GConf ]
+      gst-plugins-base GConf ]
     ++ optional withMesa mesa
     ++ optional withWebKit webkitgtk2
     ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index d9d6e0ecf0d0..1988463d61a6 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -78,7 +78,7 @@ let
     SDL2_ttf
     SDL2_mixer
     gstreamer
-    gst_plugins_base
+    gst-plugins-base
   ] ++ lib.optional (!newStdcpp) gcc48.cc;
 
   overridePkgs = with pkgs; [
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index b54298124415..6185e22fb875 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gstreamer gst_plugins_base
+      # gstreamer gst-plugins-base
     ];
 
   outputs = [ "out" "dev" "test" ];
diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix
index 8cd5e064e1ea..11aee0d88f2c 100644
--- a/pkgs/os-specific/linux/bluez/bluez5_28.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gstreamer gst_plugins_base 
+      # gstreamer gst-plugins-base 
     ];
 
   preConfigure = ''
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index d0a875516fa3..20b8d01db2d3 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
       readline libsndfile
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gstreamer gst_plugins_base 
+      # gstreamer gst-plugins-base 
     ];
 
   configureFlags = [
diff --git a/pkgs/tools/networking/uget/default.nix b/pkgs/tools/networking/uget/default.nix
index 8a60858526ee..b5119bc594b7 100644
--- a/pkgs/tools/networking/uget/default.nix
+++ b/pkgs/tools/networking/uget/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, openssl, curl, libnotify, gstreamer,
-  gst_plugins_base, gst-plugins-good, gnome3, makeWrapper, aria2 ? null }:
+  gst-plugins-base, gst-plugins-good, gnome3, makeWrapper, aria2 ? null }:
 
 stdenv.mkDerivation rec {
   name = "uget-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool makeWrapper ];
   
   buildInputs = [
-    openssl curl libnotify gstreamer gst_plugins_base gst-plugins-good
+    openssl curl libnotify gstreamer gst-plugins-base gst-plugins-good
     gnome3.gtk gnome3.dconf
   ]
   ++ (stdenv.lib.optional (aria2 != null) aria2);
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index 12df8db832c1..fc77628a3c60 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -1,7 +1,7 @@
 { 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
+, gstreamer, gst-plugins-base, gst-plugins-good, gst-ffmpeg, gmp, ffmpeg
 , libpulseaudio
 , mediaSupport ? false
 }:
@@ -11,12 +11,12 @@ let
     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
+    gstreamer gst-plugins-base gmp ffmpeg
     libpulseaudio
   ]);
 
   # Ignored if !mediaSupport
-  gstPlugins = [ gstreamer gst_plugins_base gst-plugins-good gst-ffmpeg ];
+  gstPlugins = [ gstreamer gst-plugins-base gst-plugins-good gst-ffmpeg ];
 
   gstPluginsPath = stdenv.lib.concatMapStringsSep ":" (x:
     "${x}/lib/gstreamer-0.10") gstPlugins;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index efeb14eb4174..eaf6813263af 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -53,6 +53,7 @@ doNotDisplayTwice rec {
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gst_ffmpeg = gst-ffmpeg;  # added 2017-02
+  gst_plugins_base = gst-plugins-base;  # added 2017-02
   gst_plugins_good = gst-plugins-good;  # added 2017-02
   gst_plugins_bad = gst-plugins-bad;  # added 2017-02
   gst_plugins_ugly = gst-plugins-ugly;  # added 2017-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acd872768a2a..61949c9b4d98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1151,7 +1151,7 @@ with pkgs;
 
   clementine = callPackage ../applications/audio/clementine {
     boost = boost155;
-    gst_plugins = [ gst_plugins_base gst-plugins-good gst-plugins-ugly gst-ffmpeg ];
+    gst_plugins = [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-ffmpeg ];
   };
 
   clementineFree = clementine.free;
@@ -7519,14 +7519,14 @@ with pkgs;
 
   gst_all = {
     inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
-    gstPluginsBase = pkgs.gst_plugins_base;
+    gstPluginsBase = pkgs.gst-plugins-base;
     gstPluginsBad = pkgs.gst-plugins-bad;
     gstPluginsGood = pkgs.gst-plugins-good;
     gstPluginsUgly = pkgs.gst-plugins-ugly;
     gstFfmpeg = pkgs.gst-ffmpeg;
 
     # aliases with the dashed naming, same as in gst_all_1
-    gst-plugins-base = pkgs.gst_plugins_base;
+    gst-plugins-base = pkgs.gst-plugins-base;
     gst-plugins-bad = pkgs.gst-plugins-bad;
     gst-plugins-good = pkgs.gst-plugins-good;
     gst-plugins-ugly = pkgs.gst-plugins-ugly;
@@ -7537,7 +7537,7 @@ with pkgs;
     bison = bison2;
   };
 
-  gst_plugins_base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
+  gst-plugins-base = callPackage ../development/libraries/gstreamer/legacy/gst-plugins-base {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;
   };
 

From 5dde5ded099969e0e75a9ee0f1d4b5bcd5301245 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 12:37:42 +0100
Subject: [PATCH 1239/3449] zkfuse: remove applied patch

---
 pkgs/servers/zookeeper/default.nix                |  3 ++-
 pkgs/tools/filesystems/zkfuse/default.nix         | 11 +++--------
 .../tools/filesystems/zkfuse/zookeeper-1929.patch | 15 ---------------
 3 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch

diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index 4eecfa418104..16807a6571cd 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, jre, makeWrapper, bash }:
 
 stdenv.mkDerivation rec {
-  name = "zookeeper-3.4.9";
+  name = "zookeeper-${version}";
+  version = "3.4.9";
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 04755108bc06..0738ee84cab7 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,15 +1,10 @@
 { stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }:
 
 stdenv.mkDerivation rec {
-  name = "zkfuse";
+  name = "zkfuse-${version}";
+  inherit (zookeeper) version src;
 
-  src = zookeeper.src;
-  patches = [
-    # see: https://issues.apache.org/jira/browse/ZOOKEEPER-1929
-    ./zookeeper-1929.patch
-  ];
-
-  setSourceRoot = "export sourceRoot=${zookeeper.name}/src/contrib/zkfuse";
+  sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
 
   buildInputs = [ autoreconfHook zookeeper_mt log4cxx boost fuse ];
 
diff --git a/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch b/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch
deleted file mode 100644
index e99dbdf33e03..000000000000
--- a/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/contrib/zkfuse/src/zkadapter.cc b/src/contrib/zkfuse/src/zkadapter.cc
-index 886051d..93dbef5 100644
---- a/src/zkadapter.cc
-+++ b/src/zkadapter.cc
-@@ -845,7 +845,10 @@ ZooKeeperAdapter::getNodeData(const string &path,
-             string("Unable to get data of node ") + path, rc 
-         );
-     } else {
--        return string( buffer, buffer + len );
-+        if (len == -1) {
-+            len = 0;
-+        };
-+        return string( buffer, len );
-     }
- }

From aadc5abb6ec34265bd52f4f80b17de789fd5570b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 27 Feb 2017 12:41:51 +0100
Subject: [PATCH 1240/3449] httpie: 0.9.8 -> 0.9.9

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

diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index fe30fd949675..09200f40c934 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "httpie-0.9.8";
+  name = "httpie-0.9.9";
   namePrefix = "";
 
   src = fetchurl {
     url = "mirror://pypi/h/httpie/${name}.tar.gz";
-    sha256 = "1qgn1mpkk8wxxhvgxw3fnscqg3klh42ijr11zrb0ylriaaqp0n2i";
+    sha256 = "1jsgfkyzzizgfy1b0aicb4cp34d5pwskz9c4a8kf4rq3lrpjw87i";
   };
 
   propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];

From 56e624b155fd3eb7116af140b844aecfdda24f57 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 12:43:58 +0100
Subject: [PATCH 1241/3449] xorg.xf86videoxgi: fix build with upstream patch

---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0afbb21ea228..310bebd382ad 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -568,6 +568,10 @@ in
         url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=bd94c475035739b42294477cff108e0c5f15ef67";
         sha256 = "0myfry07655adhrpypa9rqigd6rfx57pqagcwibxw7ab3wjay9f6";
       })
+      (args.fetchpatch {
+        url = "https://cgit.freedesktop.org/xorg/driver/xf86-video-xgi/patch/?id=78d1138dd6e214a200ca66fa9e439ee3c9270ec8";
+        sha256 = "0z3643afgrync280zrp531ija0hqxc5mrwjif9nh9lcnzgnz2d6d";
+      })
     ];
   };
 

From 20372739d246f03565781c47fe5013dc9014adbc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 12:51:26 +0100
Subject: [PATCH 1242/3449] xfce4_windowck_plugin: fix build

---
 pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
index 523283b453a7..37ad643930ab 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig intltool python3 imagemagick libwnck gtk2
     exo libxfce4ui libxfce4util xfce4panel xfconf xfce4_dev_tools ];
 
-  preConfigure = "./autogen.sh";
+  preConfigure = ''
+    ./autogen.sh
+    patchShebangs .
+  '';
 
   enableParallelBuilding = true;
 

From fdd9d7fe4c184a94de50b9ecfee74be0295f4a1b Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Mon, 27 Feb 2017 11:47:00 +0000
Subject: [PATCH 1243/3449] haskell-packages: Add minimal benchDepends support

See also: https://github.com/NixOS/cabal2nix/pull/262
---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1998b090687d..a75392bef747 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -13,6 +13,7 @@
 , configureFlags ? []
 , description ? ""
 , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
+, doBench ? false
 , doHoogle ? true
 , editedCabalFile ? null
 , enableLibraryProfiling ? false
@@ -38,6 +39,7 @@
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
+, benchDepends ? []
 , testTarget ? ""
 , broken ? false
 , preCompileBuildDriver ? "", postCompileBuildDriver ? ""
@@ -145,7 +147,8 @@ let
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
-                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends);
+                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
+                     optionals doBench benchDepends;
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
@@ -341,6 +344,7 @@ stdenv.mkDerivation ({
 // optionalAttrs (preBuild != "")       { inherit preBuild; }
 // optionalAttrs (postBuild != "")      { inherit postBuild; }
 // optionalAttrs (doCheck)              { inherit doCheck; }
+// optionalAttrs (doBench)              { inherit doBench; }
 // optionalAttrs (checkPhase != "")     { inherit checkPhase; }
 // optionalAttrs (preCheck != "")       { inherit preCheck; }
 // optionalAttrs (postCheck != "")      { inherit postCheck; }

From 4ab570a6d0be024a89febe6834e6a02061b3ce27 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Mon, 27 Feb 2017 11:47:00 +0000
Subject: [PATCH 1244/3449] haskell-packages: Add minimal benchDepends support

See also: https://github.com/NixOS/cabal2nix/pull/262
---
 pkgs/development/haskell-modules/generic-builder.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a75392bef747..a22d2c67dfda 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -9,7 +9,7 @@
 , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
 , buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? []
 , buildTarget ? ""
-, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? []
+, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchToolDepends ? []
 , configureFlags ? []
 , description ? ""
 , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
@@ -37,9 +37,9 @@
 # TODO Do we care about haddock when cross-compiling?
 , doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
 , passthru ? {}
-, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? []
+, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
-, benchDepends ? []
+, benchDepends ? [], benchHaskellDepends ? [], benchSystemDepends ? []
 , testTarget ? ""
 , broken ? false
 , preCompileBuildDriver ? "", postCompileBuildDriver ? ""
@@ -141,14 +141,14 @@ let
   isSystemPkg = x: !isHaskellPkg x;
 
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
-                        optionals doCheck testPkgconfigDepends;
+                        optionals doCheck testPkgconfigDepends ++ optionals doBench benchPkgconfigDepends;
 
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
-                     optionals doBench benchDepends;
+                     optionals doBench (benchDepends ++ benchHaskellDepends ++ benchSystemDepends ++ benchToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;

From 8d95889fe67777859b1af1579e0a26a32c28a7df Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 13:16:33 +0100
Subject: [PATCH 1245/3449] xf86_input_multitouch: fix build

---
 pkgs/os-specific/linux/xf86-input-multitouch/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix                          | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
index 80ff99228457..e1bafa93ea6f 100644
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
@@ -7,6 +7,7 @@
 , xextproto
 , inputproto
 , randrproto
+, xorg
 , libpciaccess
 }:
 
@@ -30,7 +31,11 @@ stdenv.mkDerivation {
     EndSection
   '';
 
-  buildInputs = [ mtdev xproto xextproto inputproto libpciaccess randrproto ];
+  buildInputs = with xorg; [
+    mtdev xproto xextproto inputproto libpciaccess randrproto renderproto
+    xineramaproto resourceproto scrnsaverproto kbproto libxcb videoproto
+    dri3proto presentproto
+  ];
 
   buildPhase = ''
     make INCLUDE="$NIX_CFLAGS_COMPILE -I${xorgserver.dev}/include/xorg -I${pixman}/include/pixman-1 -Iinclude"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61949c9b4d98..c7d9be8a1852 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12065,8 +12065,7 @@ with pkgs;
 
   xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };
 
-  xf86_input_multitouch =
-    callPackage ../os-specific/linux/xf86-input-multitouch { };
+  xf86_input_multitouch = callPackage ../os-specific/linux/xf86-input-multitouch { };
 
   xf86_input_wacom = callPackage ../os-specific/linux/xf86-input-wacom { };
 

From e001b729e1db5c3dcb683ca725c757dcbb6e2aa0 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 13:34:16 +0100
Subject: [PATCH 1246/3449] wv2: fix build

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

diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix
index 1c2c94ff89ca..f39eaf0b047b 100644
--- a/pkgs/tools/misc/wv2/default.nix
+++ b/pkgs/tools/misc/wv2/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig cmake libgsf glib libxml2 ];
 
+  NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
+
   meta = {
     description = "Excellent MS Word filter lib, used in most Office suites";
     license = stdenv.lib.licenses.lgpl2;

From bbefb5d06a087e495104b1c385ba06b69c3f5504 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 13:39:11 +0100
Subject: [PATCH 1247/3449] warmux: fix build

---
 pkgs/games/warmux/gcc-fix.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/warmux/gcc-fix.patch b/pkgs/games/warmux/gcc-fix.patch
index 913b912af7d4..6b683aa782f4 100644
--- a/pkgs/games/warmux/gcc-fix.patch
+++ b/pkgs/games/warmux/gcc-fix.patch
@@ -45,7 +45,7 @@ Author: Robin Gloster <mail@glob.in>
  {
    if (!show)
 -    return false;
-+    return nullptr;
++    return NULL;
    const std::vector<PolygonItem *>& items = poly->GetItem();
    WeaponMenuItem * tmp;
    Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);

From 7ed28a0b78f07eff2dba32bbc84ee4de9870f4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 27 Feb 2017 13:51:55 +0100
Subject: [PATCH 1248/3449] R: fix bio3d build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 49273e34c7e8..ec01d65bf37b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -242,6 +242,7 @@ let
     BayesVarSel = [ pkgs.gsl_1 ];
     BayesXsrc = [ pkgs.readline.dev pkgs.ncurses ];
     bigGP = [ pkgs.openmpi ];
+    bio3d = [ pkgs.zlib ];
     BiocCheck = [ pkgs.which ];
     Biostrings = [ pkgs.zlib ];
     bnpmr = [ pkgs.gsl_1 ];

From 0c2f96a81f848b28fd343e2fe9e0e7cb397cbbc8 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 08:29:58 -0500
Subject: [PATCH 1249/3449] appstream-glib: propagate gtk3

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

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index caaa826ae67d..03853192531e 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool autoconf-archive ];
   buildInputs = [ glib gtk_doc gettext sqlite libsoup
                   gcab attr acl docbook_xsl libuuid json_glib
-                  libarchive libyaml gtk3 gobjectIntrospection ];
-
+                  libarchive libyaml gobjectIntrospection ];
+  propagatedBuildInputs = [ gtk3 ];
   configureScript = "./autogen.sh";
 
   meta = with stdenv.lib; {

From fa84ad2593cde6494a8212078bd971237e5981a5 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 08:30:20 -0500
Subject: [PATCH 1250/3449] gusb: 0.2.4 -> 0.2.9

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

diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index ac0425b54ad8..5116e39562c8 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -4,22 +4,23 @@
 }:
 stdenv.mkDerivation rec {
   name = "gusb-${version}";
-  version = "0.2.4";
+  version = "0.2.9";
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~hughsient/releases/libgusb-${version}.tar.xz";
-    sha256 = "10w0sdq7505iwd8y305aylmx4zafbnphs81cgdsqw2z38pxncya3";
+    sha256 = "056yxlppgycsfw1l8c9j6givk1n15jylhvx89wqhsxdi1b6vs83k";
   };
 
   preConfigure = "./autogen.sh";
 
   buildInputs = [
     pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt
-    systemd libusb1 vala_0_23
-    glib
+    systemd vala_0_23 glib
   ];
 
+  propagatedBuildInputs = [ libusb1 ];
+
   meta = {
     description = "GLib libusb wrapper";
     homepage = http://people.freedesktop.org/~hughsient/releases/;

From 72ff466de351b1689fcb140f9d5251439144d394 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 08:30:46 -0500
Subject: [PATCH 1251/3449] libsmbios: 2.2.28 -> 2.3.2

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

diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index a3d212dda53b..e2b675fb4ffa 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, perl }:
+{ stdenv, fetchurl, pkgconfig, libxml2, perl, autoreconfHook, doxygen }:
 
 let
-  name = "libsmbios-2.2.28";
+  version = "2.3.2";
 in
 stdenv.mkDerivation {
-  inherit name;
+  name = "libsmbios-${version}";
 
   src = fetchurl {
-    url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz";
-    sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91";
+    url = "https://github.com/dell/libsmbios/archive/v${version}.tar.gz";
+    sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j";
   };
 
-  buildInputs = [ pkgconfig libxml2 perl ];
+  buildInputs = [ pkgconfig libxml2 perl autoreconfHook doxygen ];
 
   # It tries to install some Python stuff even when Python is disabled.
   installFlags = "pkgpythondir=$(TMPDIR)/python";
 
-  # It forgets to install headers.
   postInstall =
     ''
+      mkdir -p $out/include
       cp -va "src/include/"* "$out/include/"
       cp -va "out/public-include/"* "$out/include/"
     '';

From 40e136542ecce03ce23ae1c8c35fa69ff075922d Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 08:35:08 -0500
Subject: [PATCH 1252/3449] fwupdate: init at 8

---
 .../linux/firmware/fwupdate/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/fwupdate/default.nix

diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
new file mode 100644
index 000000000000..3fc7af916368
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, gnu-efi, efivar, libsmbios, popt, pkgconfig
+, gettext }:
+let version = "8"; in
+  stdenv.mkDerivation
+    { name = "fwupdate-${version}";
+      src = fetchurl
+        { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2";
+          sha256 = "10q8k1kghvbcb5fwcl2smzp8vqdfzimx9dkk0c3hz39py1phy4n8";
+        };
+      makeFlags =
+        [ "EFIDIR=nixos"
+          "LIBDIR=$(out)/lib"
+          "GNUEFIDIR=${gnu-efi}/lib"
+          "TARGETDIR=$(out)/boot/efi/nixos/"
+          "prefix=$(out)/"
+        ];
+      buildInputs = [ gnu-efi libsmbios popt pkgconfig gettext ];
+      propagatedBuildInputs = [ efivar ];
+      # TODO: Just apply the disable to the efi subdir
+      hardeningDisable = "all";
+      patchPhase = ''
+        sed -i 's|/usr/include/smbios_c/token.h|smbios_c/token.h|' \
+          linux/libfwup.c
+        sed -i 's|/usr/share|$(prefix)share|' linux/Makefile
+        sed -i "s|/usr/include|$out/include|" linux/fwup.pc.in
+      '';
+      configurePhase = ''
+        arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' )
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi -I${efivar}/include/efivar -I${gnu-efi}/include/efi/$arch"
+      '';
+      meta =
+        { license = [ stdenv.lib.licenses.gpl2 ];
+          platforms = stdenv.lib.platforms.linux;
+        };
+    }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7d9be8a1852..d625c0cb3f7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11089,6 +11089,8 @@ with pkgs;
 
   dstat = callPackage ../os-specific/linux/dstat { };
 
+  fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { };
+
   libossp_uuid = callPackage ../development/libraries/libossp-uuid { };
 
   libuuid =

From 8307307e4e96c7947efdb1b337071df30ac7bfe6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 08:38:49 -0500
Subject: [PATCH 1253/3449] fwupd: Init at 0.8.0

---
 .../linux/firmware/fwupd/default.nix          | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/fwupd/default.nix

diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
new file mode 100644
index 000000000000..610d12b551d4
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
+, libgudev, polkit, gcab, appstream-glib, gusb, sqlite, libarchive
+, libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar
+, fwupdate, libgpgerror, libyaml
+}:
+let version = "0.8.0"; in
+  stdenv.mkDerivation
+    { name = "fwupd-${version}";
+      src = fetchurl
+        { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
+          sha256 = "1irr7xr0slfpm7pvlc9ysy85d51fv0gss6cv0w4sc5p7rhvjx69g";
+        };
+      buildInputs =
+        [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev
+          polkit gcab appstream-glib gusb sqlite libarchive libsoup
+          docbook2x libxslt libelf libsmbios fwupdate libyaml
+        ];
+      patchPhase = ''
+        sed -i -e \
+          's|/usr/bin/gpgme-config|${gpgme.dev}/bin/gpgme-config|' -e \
+          's|/usr/bin/gpg-error-config|${libgpgerror.dev}/bin/gpg-error-config|' \
+          ./configure
+      '';
+      preConfigure = ''
+        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar"
+      '';
+      configureFlags =
+        [ "--with-systemdunitdir=$out/lib/systemd/system"
+          "--with-udevrulesdir=$out/lib/udev/rules.d"
+        ];
+      enableParallelBuilding = true;
+      meta =
+        { license = [ stdenv.lib.licenses.gpl2 ];
+          platforms = stdenv.lib.platforms.linux;
+        };
+    }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d625c0cb3f7b..73d418355ff4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11089,6 +11089,8 @@ with pkgs;
 
   dstat = callPackage ../os-specific/linux/dstat { };
 
+  fwupd = callPackage ../os-specific/linux/firmware/fwupd { inherit (gnome2) gtk_doc; };
+
   fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { };
 
   libossp_uuid = callPackage ../development/libraries/libossp-uuid { };

From 1230330b141fef3ab37b2c15507f4e277ff9872f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 08:45:14 -0500
Subject: [PATCH 1254/3449] fwupd: Fix systemd/udev install

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

diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 610d12b551d4..36002d7f37d9 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -25,8 +25,8 @@ let version = "0.8.0"; in
         export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${efivar}/include/efivar"
       '';
       configureFlags =
-        [ "--with-systemdunitdir=$out/lib/systemd/system"
-          "--with-udevrulesdir=$out/lib/udev/rules.d"
+        [ "--with-systemdunitdir=$(out)/lib/systemd/system"
+          "--with-udevrulesdir=$(out)/lib/udev/rules.d"
         ];
       enableParallelBuilding = true;
       meta =

From 65a2e307f0fb19874ae591c72195b7b301464848 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 14:38:57 +0100
Subject: [PATCH 1255/3449] varnish: fix i686 build

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

diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index fc5a744ad46d..e1376a6c59f5 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
 
   buildFlags = "localstatedir=/var/spool";
 
+  # https://github.com/varnishcache/varnish-cache/issues/1875
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-fexcess-precision=standard";
+
   outputs = [ "out" "dev" "man" ];
 
   meta = with stdenv.lib; {

From 4df663a9a2ad2e38b6db9966461dffbeae6a5888 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 15:00:25 +0100
Subject: [PATCH 1256/3449] verilator: 3.884 -> 3.900

---
 .../science/electronics/verilator/default.nix             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 5c1cd75fd569..3c01f8f37498 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, perl, flex, bison }:
+{ stdenv, fetchurl, perl, flex_2_6_1, bison }:
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "3.884";
+  version = "3.900";
 
   src = fetchurl {
     url    = "http://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "1j159dg7m2ych5lwglb1qq1fgqh3kwhaa1r3jx84qdisg0icln2y";
+    sha256 = "0yvbibcysdiw6mphda0lfs56wz6v450px2420x0hbd3rc7k53s2b";
   };
 
   enableParallelBuilding = true;
-  buildInputs = [ perl flex bison ];
+  buildInputs = [ perl flex_2_6_1 bison ];
 
   meta = {
     description = "Fast and robust (System)Verilog simulator/compiler";

From b55c259a7208e691050f341d8296ee044606a858 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 15:04:40 +0100
Subject: [PATCH 1257/3449] vfdecrypt: fix build

---
 pkgs/tools/misc/vfdecrypt/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix
index 552fa0c763dd..83b91f6203ed 100644
--- a/pkgs/tools/misc/vfdecrypt/default.nix
+++ b/pkgs/tools/misc/vfdecrypt/default.nix
@@ -1,17 +1,26 @@
-{ stdenv, fetchgit, openssl }:
+{ stdenv, fetchFromGitHub, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "vfdecrypt";
+  name = "vfdecrypt-${version}";
+  version = "unstable-2010-08-13";
 
-  src = fetchgit {
-    url = git://github.com/drakealleg/VFDecrypt.git;
+  src = fetchFromGitHub {
+    owner = "Tomer1510";
+    repo = "VFDecrypt";
     rev = "4e2fa32816254907e82886b936afcae9859a876c";
     sha256 = "0b945805f7f60bf48556c2db45c9ab26485fb05acbc6160a563d529b20cb56a3";
   };
+
   buildInputs = [ openssl ];
-  broken = true; # No such repo
+
   installPhase = ''
     mkdir -p $out/bin
     cp vfdecrypt $out/bin
   '';
+
+  meta = with stdenv.lib; {
+    description = "A cross platform dmg decryption tool";
+    license = licenses.mit;
+    inherit (src.meta) homepage;
+  };
 }

From f37b34fe7ced3c7a865a06668d7dbc45c85fe9bf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Mon, 27 Feb 2017 15:23:23 +0100
Subject: [PATCH 1258/3449] tensorflow: depend on cudatoolkit 8 and cudnn 5.1

---
 .../python-modules/tensorflow/default.nix            | 12 ++++++------
 pkgs/top-level/python-packages.nix                   |  2 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix
index 9357ea90b405..04e820307a48 100644
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -3,8 +3,8 @@
 , buildPythonPackage
 , isPy35, isPy27
 , cudaSupport ? false
-, cudatoolkit75 ? null
-, cudnn5_cudatoolkit75 ? null
+, cudatoolkit ? null
+, cudnn ? null
 , gcc49 ? null
 , linuxPackages ? null
 , numpy
@@ -16,8 +16,8 @@
 , zlib
 }:
 
-assert cudaSupport -> cudatoolkit75 != null
-                   && cudnn5_cudatoolkit75 != null
+assert cudaSupport -> cudatoolkit != null
+                   && cudnn != null
                    && gcc49 != null
                    && linuxPackages != null;
 
@@ -97,7 +97,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = with stdenv.lib;
     [ numpy six protobuf3_2 swig mock ]
-    ++ optionals cudaSupport [ cudatoolkit75 cudnn5_cudatoolkit75 gcc49 ];
+    ++ optionals cudaSupport [ cudatoolkit cudnn gcc49 ];
 
   # Note that we need to run *after* the fixup phase because the
   # libraries are loaded at runtime. If we run in preFixup then
@@ -105,7 +105,7 @@ buildPythonPackage rec {
   postFixup = let
     rpath = stdenv.lib.makeLibraryPath
       (if cudaSupport then
-        [ gcc49.cc.lib zlib cudatoolkit75 cudnn5_cudatoolkit75
+        [ gcc49.cc.lib zlib cudatoolkit cudnn
           linuxPackages.nvidia_x11 ]
       else
         [ gcc.cc.lib zlib ]
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6a51e40d1233..a268c811c526 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31256,6 +31256,8 @@ EOF
 
   tensorflowWithCuda = callPackage ../development/python-modules/tensorflow {
     cudaSupport = true;
+    cudatoolkit = pkgs.cudatoolkit8;
+    cudnn = pkgs.cudnn51_cudatoolkit80;
   };
 
   tflearn = buildPythonPackage rec {

From a20a53300d9741d0c8dedfb994b358b0896c55d3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 27 Feb 2017 16:02:33 +0100
Subject: [PATCH 1259/3449] grsecurity: 4.9.13-201702261126 -> 201702270729

---
 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 a61a6c9e18aa..1f5c07f9b094 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -96,8 +96,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.9.13";
-      grrev  = "201702261126";
-      sha512 = "18snigndkyw372mp65v3sp9cpz8w4n3d3lzls50a3gl1qgnpp65g0vbf7vsm3spr9a5p5f17n7hl7lxgm0pqnjcgg0xr5ghkwx20z6b";
+      grrev  = "201702270729";
+      sha512 = "07sbgvksjrvawisq4knjq34022blgg8f14blv22d37siplyamydarsykai5dks5573k61dv9q027jigxyamy50h0fd5ic8qpdp0y30c";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 2edb8ffa14e04e77ee5041cccd82e0b083353572 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 10:07:57 -0500
Subject: [PATCH 1260/3449] fwupd: 0.8.0 -> 0.8.1.

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

diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 36002d7f37d9..4c88e9c68079 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, gtk_doc, pkgconfig, gobjectIntrospection, intltool
 , libgudev, polkit, gcab, appstream-glib, gusb, sqlite, libarchive
 , libsoup, docbook2x, gpgme, libxslt, libelf, libsmbios, efivar
-, fwupdate, libgpgerror, libyaml
+, fwupdate, libgpgerror, libyaml, valgrind
 }:
-let version = "0.8.0"; in
+let version = "0.8.1"; in
   stdenv.mkDerivation
     { name = "fwupd-${version}";
       src = fetchurl
         { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz";
-          sha256 = "1irr7xr0slfpm7pvlc9ysy85d51fv0gss6cv0w4sc5p7rhvjx69g";
+          sha256 = "0sq0aay5d6b0vgr7j7y4i58flbxmcbpwyw6vfwrd29fim21j6ac8";
         };
       buildInputs =
         [ gtk_doc pkgconfig gobjectIntrospection intltool libgudev
           polkit gcab appstream-glib gusb sqlite libarchive libsoup
-          docbook2x libxslt libelf libsmbios fwupdate libyaml
+          docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
         ];
       patchPhase = ''
         sed -i -e \

From bccac381b27592bdc22d151c744814716eb4f7ec Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 27 Feb 2017 17:12:33 +0100
Subject: [PATCH 1261/3449] microcode updates: prepend first in initrd

Prevents crashing the kernel on boot if other blobs are prepended
before the microkernel update image.

Fixes #22674.
---
 nixos/modules/hardware/cpu/amd-microcode.nix   | 3 ++-
 nixos/modules/hardware/cpu/intel-microcode.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/hardware/cpu/amd-microcode.nix b/nixos/modules/hardware/cpu/amd-microcode.nix
index d44f01a49590..621c7066bfe1 100644
--- a/nixos/modules/hardware/cpu/amd-microcode.nix
+++ b/nixos/modules/hardware/cpu/amd-microcode.nix
@@ -22,7 +22,8 @@ with lib;
   ###### implementation
 
   config = mkIf config.hardware.cpu.amd.updateMicrocode {
-    boot.initrd.prepend = [ "${pkgs.microcodeAmd}/amd-ucode.img" ];
+    # Microcode updates must be the first item prepended in the initrd
+    boot.initrd.prepend = mkOrder 1 [ "${pkgs.microcodeAmd}/amd-ucode.img" ];
   };
 
 }
diff --git a/nixos/modules/hardware/cpu/intel-microcode.nix b/nixos/modules/hardware/cpu/intel-microcode.nix
index 89ae4f45806c..acce565fd808 100644
--- a/nixos/modules/hardware/cpu/intel-microcode.nix
+++ b/nixos/modules/hardware/cpu/intel-microcode.nix
@@ -22,7 +22,8 @@ with lib;
   ###### implementation
 
   config = mkIf config.hardware.cpu.intel.updateMicrocode {
-    boot.initrd.prepend = [ "${pkgs.microcodeIntel}/intel-ucode.img" ];
+    # Microcode updates must be the first item prepended in the initrd
+    boot.initrd.prepend = mkOrder 1 [ "${pkgs.microcodeIntel}/intel-ucode.img" ];
   };
 
 }

From 6018cf4a692b5e12e433cc332f8d8f79ccd57ba1 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 27 Feb 2017 16:51:36 +0000
Subject: [PATCH 1262/3449] amazon-init.service: fix starting services at
 startup

We now make it happen later in the boot process so that multi-user
has already activated, so as to not run afoul of the logic in
switch-to-configuration.pl. It's not my favorite solution, but at
least it works. Also added a check to the VM test to catch the failure
so we don't break in future.

Fixes #23121
---
 nixos/modules/virtualisation/amazon-init.nix |  5 ++---
 nixos/tests/ec2.nix                          | 21 ++++++++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 5797d9db4362..a7362423eb46 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -45,9 +45,8 @@ in {
     inherit script;
     description = "Reconfigure the system from EC2 userdata on startup";
 
-    wantedBy = [ "sshd.service" ];
-    before = [ "sshd.service" ];
-    after = [ "network-online.target" ];
+    wantedBy = [ "multi-user.target" ];
+    after = [ "multi-user.target" ];
     requires = [ "network-online.target" ];
  
     restartIfChanged = false;
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index e1f7143e3a95..4ec7e56cc6cb 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -25,8 +25,13 @@ let
           # access. Mostly copied from
           # modules/profiles/installation-device.nix.
           system.extraDependencies =
-            [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio
-              pkgs.unionfs-fuse pkgs.mkinitcpio-nfs-utils
+            with pkgs; [
+              stdenv busybox perlPackages.ArchiveCpio unionfs-fuse mkinitcpio-nfs-utils
+
+              # These are used in the configure-from-userdata tests for EC2. Httpd and valgrind are requested
+              # directly by the configuration we set, and libxslt.bin is used indirectly as a build dependency
+              # of the derivation for dbus configuration files.
+              apacheHttpd valgrind.doc libxslt.bin
             ];
         }
       ];
@@ -137,6 +142,8 @@ in {
 
     # ### http://nixos.org/channels/nixos-unstable nixos
     userData = ''
+      { pkgs, ... }:
+
       {
         imports = [
           <nixpkgs/nixos/modules/virtualisation/amazon-image.nix>
@@ -146,12 +153,22 @@ in {
         environment.etc.testFile = {
           text = "whoa";
         };
+
+        services.httpd = {
+          enable = true;
+          adminAddr = "test@example.org";
+          documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
+        };
+        networking.firewall.allowedTCPPorts = [ 80 ];
       }
     '';
     script = ''
       $machine->start;
       $machine->waitForFile("/etc/testFile");
       $machine->succeed("cat /etc/testFile | grep -q 'whoa'");
+
+      $machine->waitForUnit("httpd.service");
+      $machine->succeed("curl http://localhost | grep Valgrind");
     '';
   };
 }

From 78e4f9d8d7f6124713a7694140e44713fe70e209 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 Feb 2017 18:03:34 +0100
Subject: [PATCH 1263/3449] libevent: split _openssl into a separate output

... to save ~3.4 MB of openssl from the default closure.
---
 pkgs/development/libraries/libevent/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 4abd0b033757..d2ba84bb5dd9 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -23,11 +23,21 @@ stdenv.mkDerivation {
                           | grep -v '^dh-autoreconf' | sed 's|^|debian/patches/|')"
     '';
 
-  outputs = [ "out" "dev" ];
+  # libevent_openssl is moved into its own output, so that openssl isn't present
+  # in the default closure.
+  outputs = [ "out" "dev" "openssl" ];
   outputBin = "dev";
+  propagatedBuildOutputs = [ "out" "openssl" ];
 
   buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
 
+  postInstall = ''
+    moveToOutput "lib/libevent_openssl*" "$openssl"
+    substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \
+      --replace "$out" "$openssl"
+    sed "/^libdir=/s|$out|$openssl|" -i "$openssl"/lib/libevent_openssl.la
+  '';
+
   meta = with stdenv.lib; {
     description = "Event notification library";
     longDescription = ''

From d00c26a59570d7cd93470808cc38def83a523762 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 Feb 2017 17:41:35 +0100
Subject: [PATCH 1264/3449] unbound: lighten direct security deps of libunbound

Unfortunately, it seems easiest to build all twice.
Debian testing does this in a very similar way.

Tested briefly some individual queries and resperf :-)
---
 pkgs/tools/networking/unbound/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 83d3d88729df..f32a90a871ae 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, expat, libevent }:
+{ stdenv, fetchurl, openssl, nettle, expat, libevent }:
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
 
-  buildInputs = [ openssl expat libevent ];
+  buildInputs = [ openssl nettle expat libevent ];
 
   configureFlags = [
     "--with-ssl=${openssl.dev}"
@@ -26,11 +26,20 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
-  # get rid of runtime dependencies on $dev outputs
-  postInstall = ''substituteInPlace "$lib/lib/libunbound.la" ''
+  preFixup =
+    # Build libunbound again, but only against nettle instead of openssl.
+    # This avoids gnutls.out -> unbound.lib -> openssl.out.
+    ''
+      configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only"
+      configurePhase
+      buildPhase
+      installPhase
+    ''
+    # get rid of runtime dependencies on $dev outputs
+  + ''substituteInPlace "$lib/lib/libunbound.la" ''
     + stdenv.lib.concatMapStrings
       (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ")
-      [ openssl expat libevent ];
+      buildInputs;
 
   meta = with stdenv.lib; {
     description = "Validating, recursive, and caching DNS resolver";

From dcab4279083a4c04c5d64d40eda3a98e903085b9 Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Mon, 27 Feb 2017 12:27:45 -0500
Subject: [PATCH 1265/3449] vim-plugins: Add infrastructure for
 python[3]Dependencies.

This allows vim plugins to specify python dependencies required at
runtime, and they will be added to the python environment.
---
 pkgs/applications/editors/neovim/default.nix | 10 +++++++--
 pkgs/misc/vim-plugins/default.nix            |  1 +
 pkgs/misc/vim-plugins/vim-utils.nix          | 23 +++++++++++++++-----
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index cbaf14cee603..6d5a37509fc5 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -53,18 +53,24 @@ let
   rubyWrapper = ''--suffix PATH : \"${rubyEnv}/bin\" '' +
                 ''--suffix GEM_HOME : \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';
 
+  pluginPythonPackages = builtins.concatLists
+    (map ({ pythonDependencies ? [], ...}: pythonDependencies)
+         (vimUtils.requiredPlugins configure));
   pythonEnv = pythonPackages.python.buildEnv.override {
     extraLibs = (
         if withPyGUI
           then [ pythonPackages.neovim_gui ]
           else [ pythonPackages.neovim ]
-      ) ++ extraPythonPackages;
+      ) ++ extraPythonPackages ++ pluginPythonPackages;
     ignoreCollisions = true;
   };
   pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '';
 
+  pluginPython3Packages = builtins.concatLists
+    (map ({ python3Dependencies ? [], ...}: python3Dependencies)
+         (vimUtils.requiredPlugins configure));
   python3Env = python3Packages.python.buildEnv.override {
-    extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages;
+    extraLibs = [ python3Packages.neovim ] ++ extraPython3Packages ++ pluginPython3Packages;
     ignoreCollisions = true;
   };
   python3Wrapper = ''--cmd \"let g:python3_host_prog='$out/bin/nvim-python3'\" '';
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c8872a40e561..01ed0d4d5f07 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -4,6 +4,7 @@
 , xkb_switch, rustracerd, fzf
 , python3, boost, icu
 , ycmd
+, pythonPackages, python3Packages
 , Cocoa ? null
 }:
 
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 4b754f15c0fa..6fad58269c0d 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -150,6 +150,10 @@ vim_with_plugins can be installed like any other application within Nix.
 let
   inherit (stdenv) lib;
 
+  toNames = x:
+      if builtins.isString x then [x]
+      else (lib.optional (x ? name) x.name)
+            ++ (x.names or []);
   findDependenciesRecursively = {knownPlugins, names}:
 
     let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or [];
@@ -211,11 +215,6 @@ let
       (let
         knownPlugins = vam.knownPlugins or vimPlugins;
 
-        toNames = x:
-            if builtins.isString x then [x]
-            else (lib.optional (x ? name) x.name)
-                  ++ (x.names or []);
-
         names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; };
 
         # Vim almost reads JSON, so eventually JSON support should be added to Nix
@@ -412,6 +411,19 @@ rec {
     configurePhase =":";
   } // a);
 
+  requiredPlugins = {
+    knownPlugins ? vimPlugins,
+    vam ? null,
+    pathogen ? null, ...
+  }:
+    let
+      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) ++
+              (lib.optionals (vam != null) vamNames);
+    in
+      map (name: knownPlugins.${name}) names;
+
   # test cases:
   test_vim_with_vim_addon_nix_using_vam = vim_configurable.customize {
    name = "vim-with-vim-addon-nix-using-vam";
@@ -427,5 +439,4 @@ rec {
     name = "vim-with-vim-addon-nix";
     vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-addon-nix ];
   };
-
 }

From 4b9ec73288288a693576795494705f42a626fadd Mon Sep 17 00:00:00 2001
From: Evan Danaher <github@edanaher.net>
Date: Mon, 27 Feb 2017 12:28:42 -0500
Subject: [PATCH 1266/3449] vim-plugins: Add ensime-vim and dependencies.

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 01ed0d4d5f07..e6946d348e5e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -345,6 +345,18 @@ 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 {
@@ -356,6 +368,17 @@ 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-10";
     src = fetchgit {
@@ -1166,6 +1189,17 @@ 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 {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b12983b4bc09..8840114fee11 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -46,6 +46,7 @@
 "github:elmcast/elm-vim"
 "github:embear/vim-localvimrc"
 "github:enomsg/vim-haskellConcealPlus"
+"github:ensime/ensime-vim"
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
 "github:flazz/vim-colorschemes"

From 4f2e7a0424a51f7462f219fa5691be1d3ae6a082 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 09:44:01 -0600
Subject: [PATCH 1267/3449] Separate Qt 5 packages from dependent libraries

---
 pkgs/applications/editors/kile/default.nix    |  82 ++++--
 pkgs/applications/editors/kile/frameworks.nix |  68 -----
 .../libraries/kde-frameworks/default.nix      |   5 +-
 pkgs/development/libraries/phonon/default.nix |   4 +-
 .../libraries/qt-5/5.5/default.nix            |  30 +-
 .../libraries/qt-5/5.6/default.nix            |  29 +-
 .../libraries/qt-5/5.7/default.nix            |  30 +-
 pkgs/development/libraries/quazip/default.nix |   4 +-
 pkgs/tools/misc/colord-kde/default.nix        |   4 +-
 pkgs/top-level/aliases.nix                    |  16 +-
 pkgs/top-level/all-packages.nix               | 277 ++++++++++--------
 11 files changed, 272 insertions(+), 277 deletions(-)
 delete mode 100644 pkgs/applications/editors/kile/frameworks.nix

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 7f7b22dfa134..ad3300b9221f 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,28 +1,68 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, shared_mime_info, kdelibs
+{ kdeDerivation
+, lib
+, fetchgit
+, ecm
+, kdoctools
+, kdeWrapper
+, qtscript
+, kconfig
+, kcrash
+, kdbusaddons
+, kdelibs4support
+, kguiaddons
+, kiconthemes
+, kinit
+, khtml
+, konsole
+, kparts
+, ktexteditor
+, kwindowsystem
+, poppler
 }:
 
-stdenv.mkDerivation rec {
-  name = "kile-2.1.3";
+let
+  unwrapped =
+    kdeDerivation rec {
+      name = "kile-${version}";
+      version = "2017-02-09";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/kile/${name}.tar.bz2";
-    sha256 = "18nfi37s46v9xav7vyki3phasddgcy4m7nywzxis198vr97yqqx0";
-  };
+      src = fetchgit {
+        url = git://anongit.kde.org/kile.git;
+        rev = "f77f6e627487c152f111e307ad6dc71699ade746";
+        sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
 
-  nativeBuildInputs = [
-    automoc4 cmake gettext perl pkgconfig shared_mime_info
-  ];
-  buildInputs = [ kdelibs ];
+      };
 
-  # for KDE 4.7 the nl translations fail since kile-2.1.2
-  preConfigure = "rm -r translations/nl";
+      nativeBuildInputs = [ ecm kdoctools ];
 
-  meta = {
-    description = "An integrated LaTeX editor for KDE";
-    homepage = http://kile.sourceforge.net;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    license = stdenv.lib.licenses.gpl2Plus;
-    inherit (kdelibs.meta) platforms;
-  };
+      buildInputs = [
+        kconfig
+        kcrash
+        kdbusaddons
+        kdelibs4support
+        kdoctools
+        kguiaddons
+        kiconthemes
+        kinit
+        khtml
+        kparts
+        ktexteditor
+        kwindowsystem
+        poppler
+        qtscript
+      ];
+
+      meta = {
+        description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
+        homepage = https://www.kde.org/applications/office/kile/;
+        maintainers = with lib.maintainers; [ fridh ];
+        license = lib.licenses.gpl2Plus;
+      };
+    };
+in
+kdeWrapper
+{
+  inherit unwrapped;
+  targets = [ "bin/kile" ];
+  paths = [ konsole.unwrapped ];
 }
diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
deleted file mode 100644
index ad3300b9221f..000000000000
--- a/pkgs/applications/editors/kile/frameworks.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchgit
-, ecm
-, kdoctools
-, kdeWrapper
-, qtscript
-, kconfig
-, kcrash
-, kdbusaddons
-, kdelibs4support
-, kguiaddons
-, kiconthemes
-, kinit
-, khtml
-, konsole
-, kparts
-, ktexteditor
-, kwindowsystem
-, poppler
-}:
-
-let
-  unwrapped =
-    kdeDerivation rec {
-      name = "kile-${version}";
-      version = "2017-02-09";
-
-      src = fetchgit {
-        url = git://anongit.kde.org/kile.git;
-        rev = "f77f6e627487c152f111e307ad6dc71699ade746";
-        sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
-
-      };
-
-      nativeBuildInputs = [ ecm kdoctools ];
-
-      buildInputs = [
-        kconfig
-        kcrash
-        kdbusaddons
-        kdelibs4support
-        kdoctools
-        kguiaddons
-        kiconthemes
-        kinit
-        khtml
-        kparts
-        ktexteditor
-        kwindowsystem
-        poppler
-        qtscript
-      ];
-
-      meta = {
-        description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
-        homepage = https://www.kde.org/applications/office/kile/;
-        maintainers = with lib.maintainers; [ fridh ];
-        license = lib.licenses.gpl2Plus;
-      };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kile" ];
-  paths = [ konsole.unwrapped ];
-}
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ee7614bbcf10..ac6b319a0ddd 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -51,9 +51,7 @@ let
 
       });
 
-    kdeFramework = let
-      broken = builtins.compareVersions self.qtbase.version "5.6.0" < 0;
-    in args:
+    kdeFramework = args:
       let
         inherit (args) name;
         inherit (srcs."${name}") src version;
@@ -67,7 +65,6 @@ let
           ];
           platforms = lib.platforms.linux;
           homepage = "http://www.kde.org";
-          inherit broken;
         } // (args.meta or {});
       });
 
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 4bbe05fea6ee..31d8b7d7c8e0 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
-, qt4 ? null, extra-cmake-modules, qtbase ? null, qttools ? null
+, qt4 ? null, ecm ? null, qtbase ? null, qttools ? null
 , withQt5 ? false
 , debug ? false }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     [ mesa libpulseaudio ]
     ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]);
 
-  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
+  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 ecm;
 
   NIX_CFLAGS_COMPILE = "-fPIC";
 
diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 6d27ed5a0d32..607696dc562a 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -16,27 +16,30 @@
 
 */
 
-{ pkgs
+{
+  newScope,
+  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  bison, cups ? null, harfbuzz, mesa, perl,
+  libgnomeui, GConf, gnome_vfs,
+  gstreamer, gst-plugins-base,
 
-# options
-, developerBuild ? false
-, decryptSslTraffic ? false
+  # options
+  developerBuild ? false,
+  decryptSslTraffic ? false,
 }:
 
-let inherit (pkgs) makeSetupHook makeWrapper stdenv; in
-
 with stdenv.lib;
 
 let
 
   mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; };
+  srcs = import ./srcs.nix { inherit mirror; inherit fetchurl; };
 
   qtSubmodule = args:
     let
       inherit (args) name;
       inherit (srcs."${args.name}") version src;
-      inherit (pkgs.stdenv) mkDerivation;
+      inherit (stdenv) mkDerivation;
     in mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
@@ -62,12 +65,9 @@ let
     in {
 
       qtbase = callPackage ./qtbase {
-        mesa = pkgs.mesa_noglu;
-        harfbuzz = pkgs.harfbuzz-icu;
-        cups = if stdenv.isLinux then pkgs.cups else null;
+        inherit bison cups harfbuzz mesa;
         # GNOME dependencies are not used unless gtkStyle == true
-        inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs;
-        bison = pkgs.bison2; # error: too few arguments to function 'int yylex(...
+        inherit libgnomeui GConf gnome_vfs;
         inherit developerBuild decryptSslTraffic;
       };
 
@@ -84,7 +84,7 @@ let
       qtlocation = callPackage ./qtlocation.nix {};
       /* qtmacextras = not packaged */
       qtmultimedia = callPackage ./qtmultimedia.nix {
-        inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
+        inherit gstreamer gst-plugins-base;
       };
       qtquick1 = callPackage ./qtquick1 {};
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
@@ -124,6 +124,6 @@ let
 
     };
 
-   self = makeScope pkgs.newScope addPackages;
+   self = makeScope newScope addPackages;
 
 in self
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 687708d98efa..542bf41d5874 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -14,28 +14,30 @@ top-level attribute to `top-level/all-packages.nix`.
 
 */
 
-{ pkgs
+{
+  newScope,
+  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  bison, cups ? null, harfbuzz, mesa, perl,
+  gstreamer, gst-plugins-base,
 
-# options
-, developerBuild ? false
-, decryptSslTraffic ? false
+  # options
+  developerBuild ? false,
+  decryptSslTraffic ? false,
 }:
 
-let inherit (pkgs) makeSetupHook makeWrapper stdenv; in
-
 with stdenv.lib;
 
 let
 
   mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  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 (pkgs.stdenv) mkDerivation;
+      inherit (stdenv) mkDerivation;
     in mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
@@ -43,7 +45,7 @@ let
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
       nativeBuildInputs =
         (args.nativeBuildInputs or [])
-        ++ [ pkgs.perl self.qmakeHook ];
+        ++ [ perl self.qmakeHook ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -63,10 +65,7 @@ let
     in {
 
       qtbase = callPackage ./qtbase {
-        mesa = pkgs.mesa_noglu;
-        harfbuzz = pkgs.harfbuzz-icu;
-        cups = if stdenv.isLinux then pkgs.cups else null;
-        bison = pkgs.bison2; # error: too few arguments to function 'int yylex(...
+        inherit bison cups harfbuzz mesa;
         inherit developerBuild decryptSslTraffic;
       };
 
@@ -83,7 +82,7 @@ let
       qtlocation = callPackage ./qtlocation.nix {};
       /* qtmacextras = not packaged */
       qtmultimedia = callPackage ./qtmultimedia.nix {
-        inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
+        inherit gstreamer gst-plugins-base;
       };
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
       qtscript = callPackage ./qtscript {};
@@ -120,6 +119,6 @@ let
         (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
     };
 
-   self = makeScope pkgs.newScope addPackages;
+   self = makeScope newScope addPackages;
 
 in self
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index d62bd3d1b51d..0fbcdfd9ebd8 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -14,28 +14,30 @@ top-level attribute to `top-level/all-packages.nix`.
 
 */
 
-{ pkgs
+{
+  newScope,
+  stdenv, fetchurl, makeSetupHook, makeWrapper,
+  bison, cups ? null, harfbuzz, mesa, perl,
+  gstreamer, gst-plugins-base,
 
-# options
-, developerBuild ? false
-, decryptSslTraffic ? false
+  # options
+  developerBuild ? false,
+  decryptSslTraffic ? false,
 }:
 
-let inherit (pkgs) makeSetupHook makeWrapper stdenv; in
-
 with stdenv.lib;
 
 let
 
   mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  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 (pkgs.stdenv) mkDerivation;
+      inherit (stdenv) mkDerivation;
     in mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
@@ -43,7 +45,7 @@ let
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
       nativeBuildInputs =
         (args.nativeBuildInputs or [])
-        ++ [ pkgs.perl self.qmakeHook ];
+        ++ [ perl self.qmakeHook ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -64,11 +66,7 @@ let
 
       qtbase = callPackage ./qtbase {
         inherit (srcs.qtbase) src version;
-        mesa = pkgs.mesa_noglu;
-        harfbuzz = pkgs.harfbuzz-icu;
-        cups = if stdenv.isLinux then pkgs.cups else null;
-        # GNOME dependencies are not used unless gtkStyle == true
-        bison = pkgs.bison2; # error: too few arguments to function 'int yylex(...
+        inherit bison cups harfbuzz mesa;
         inherit developerBuild decryptSslTraffic;
       };
 
@@ -79,7 +77,7 @@ let
       qtimageformats = callPackage ./qtimageformats.nix {};
       qtlocation = callPackage ./qtlocation.nix {};
       qtmultimedia = callPackage ./qtmultimedia.nix {
-        inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
+        inherit gstreamer gst-plugins-base;
       };
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
       qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
@@ -117,6 +115,6 @@ let
 
     };
 
-   self = makeScope pkgs.newScope addPackages;
+   self = makeScope newScope addPackages;
 
 in self
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index a1eb2ad7084c..7fbbf27c8eba 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zip, zlib, qt, qmakeHook }:
+{ fetchurl, stdenv, zip, zlib, qtbase, qmakeHook }:
 
 stdenv.mkDerivation rec {
   name = "quazip-0.7.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "cd quazip";
 
-  buildInputs = [ zlib qt ];
+  buildInputs = [ zlib qtbase ];
   nativeBuildInputs = [ qmakeHook ];
 
   meta = {
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 0c8e9d6bceef..7dc48db104c9 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl
-, extra-cmake-modules, ki18n
+, ecm, ki18n
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
 , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
 , kitemviews, lcms2, libXrandr, qtx11extras
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
   };
 
-  nativeBuildInputs = [ extra-cmake-modules ki18n ];
+  nativeBuildInputs = [ ecm ki18n ];
 
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index eaf6813263af..318415b7512f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -17,7 +17,7 @@ in
   ### Deprecated aliases - for backward compatibility
 
 doNotDisplayTwice rec {
-  accounts-qt = qt5.accounts-qt;  # added 2015-12-19
+  accounts-qt = libsForQt5.accounts-qt;  # added 2015-12-19
   adobeReader = adobe-reader;
   aircrackng = aircrack-ng; # added 2016-01-14
   arduino_core = arduino-core;  # added 2015-02-04
@@ -51,7 +51,7 @@ doNotDisplayTwice rec {
   gettextWithExpat = gettext; # 2016-02-19
   git-hub = gitAndTools.git-hub; # added 2016-04-29
   googleAuthenticator = google-authenticator; # added 2016-10-16
-  grantlee5 = qt5.grantlee;  # added 2015-12-19
+  grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
   gst_ffmpeg = gst-ffmpeg;  # added 2017-02
   gst_plugins_base = gst-plugins-base;  # added 2017-02
   gst_plugins_good = gst-plugins-good;  # added 2017-02
@@ -71,7 +71,7 @@ doNotDisplayTwice rec {
   keybase-go = keybase;  # added 2016-08-24
   krename-qt5 = krename; # added 2017-02-18
   letsencrypt = certbot; # added 2016-05-16
-  libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
+  libdbusmenu_qt5 = libsForQt5.libdbusmenu;  # added 2015-12-19
   libcap_manpages = libcap.doc; # added 2016-04-29
   libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
   libcap_progs = libcap.out; # added 2016-04-29
@@ -83,7 +83,7 @@ doNotDisplayTwice rec {
   manpages = man-pages; # added 2015-12-06
   man_db = man-db; # added 2016-05
   midoriWrapper = midori; # added 2015-01
-  mlt-qt5 = qt5.mlt;  # added 2015-12-19
+  mlt-qt5 = libsForQt5.mlt;  # added 2015-12-19
   module_init_tools = kmod; # added 2016-04-22
   mssys = ms-sys; # added 2015-12-13
   multipath_tools = multipath-tools;  # added 2016-01-21
@@ -96,13 +96,13 @@ doNotDisplayTwice rec {
   owncloudclient = owncloud-client;  # added 2016-08
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidginlatex; # added 2014-11-02
-  poppler_qt5 = qt5.poppler;  # added 2015-12-19
-  qca-qt5 = qt5.qca-qt5;  # added 2015-12-19
+  poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
+  qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
   QmidiNet = qmidinet;  # added 2016-05-22
   qt_gstreamer = qt-gstreamer;  # added 2017-02
   qt_gstreamer1 = qt-gstreamer1;  # added 2017-02
   quake3game = ioquake3; # added 2016-01-14
-  qwt6 = qt5.qwt;  # added 2015-12-19
+  qwt6 = libsForQt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rssglx = rss-glx; #added 2015-03-25
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
@@ -119,7 +119,7 @@ doNotDisplayTwice rec {
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   sshfsFuse = sshfs-fuse; # added 2016-09
   system_config_printer = system-config-printer;  # added 2016-01-03
-  telepathy_qt5 = qt5.telepathy;  # added 2015-12-19
+  telepathy_qt5 = libsForQt5.telepathy;  # added 2015-12-19
   tftp_hpa = tftp-hpa; # added 2015-04-03
   ucsFonts = ucs-fonts; # added 2016-07-15
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73d418355ff4..7395a60bf8b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -381,7 +381,7 @@ with pkgs;
 
   aj-snapshot  = callPackage ../applications/audio/aj-snapshot { };
 
-  albert = qt5.callPackage ../applications/misc/albert {};
+  albert = libsForQt5.callPackage ../applications/misc/albert {};
 
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
 
@@ -420,7 +420,7 @@ with pkgs;
     withGui = false;
   };
 
-  apitrace = qt55.callPackage ../applications/graphics/apitrace {};
+  apitrace = libsForQt55.callPackage ../applications/graphics/apitrace {};
 
   argus = callPackage ../tools/networking/argus {};
 
@@ -746,7 +746,7 @@ with pkgs;
 
   clib = callPackage ../tools/package-management/clib { };
 
-  colord-kde = qt5.callPackage ../tools/misc/colord-kde {};
+  colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {};
 
   consul = callPackage ../servers/consul { };
 
@@ -1094,7 +1094,7 @@ with pkgs;
 
   davix = callPackage ../tools/networking/davix { };
 
-  cantata = qt5.callPackage ../applications/audio/cantata {
+  cantata = libsForQt5.callPackage ../applications/audio/cantata {
     ffmpeg = ffmpeg_2;
   };
 
@@ -1160,7 +1160,7 @@ with pkgs;
 
   citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
 
-  cmst = qt5.callPackage ../tools/networking/cmst { };
+  cmst = libsForQt5.callPackage ../tools/networking/cmst { };
 
   colord = callPackage ../tools/misc/colord { };
 
@@ -1291,7 +1291,7 @@ with pkgs;
 
   cloud-utils = callPackage ../tools/misc/cloud-utils { };
 
-  ckb = qt5.callPackage ../tools/misc/ckb { };
+  ckb = libsForQt5.callPackage ../tools/misc/ckb { };
 
   compass = callPackage ../development/tools/compass { };
 
@@ -1299,7 +1299,7 @@ with pkgs;
 
   convoy = callPackage ../tools/filesystems/convoy { };
 
-  cool-retro-term = qt55.callPackage ../applications/misc/cool-retro-term { };
+  cool-retro-term = libsForQt55.callPackage ../applications/misc/cool-retro-term { };
 
   coreutils = callPackage ../tools/misc/coreutils {
     aclSupport = stdenv.isLinux;
@@ -2202,7 +2202,7 @@ with pkgs;
 
   hecate = callPackage ../applications/editors/hecate { };
 
-  heaptrack = callPackage ../development/tools/profiling/heaptrack {};
+  heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {};
 
   heimdall = callPackage ../tools/misc/heimdall { };
 
@@ -2252,11 +2252,11 @@ with pkgs;
 
   i2pd = callPackage ../tools/networking/i2pd {};
 
-  i-score = qt5.callPackage ../applications/audio/i-score { };
+  i-score = libsForQt5.callPackage ../applications/audio/i-score { };
 
   iasl = callPackage ../development/compilers/iasl { };
 
-  iannix = qt5.callPackage ../applications/audio/iannix { };
+  iannix = libsForQt5.callPackage ../applications/audio/iannix { };
 
   icecast = callPackage ../servers/icecast { };
 
@@ -2455,15 +2455,15 @@ with pkgs;
 
   kpcli = callPackage ../tools/security/kpcli { };
 
-  krename = qt5.callPackage ../applications/misc/krename { };
+  krename = libsForQt5.callPackage ../applications/misc/krename { };
 
-  kronometer = qt5.callPackage ../tools/misc/kronometer { };
+  kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
 
-  kdiff3 = qt5.callPackage ../tools/text/kdiff3 { };
+  kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { };
 
-  peruse = qt5.callPackage ../tools/misc/peruse { };
+  peruse = libsForQt5.callPackage ../tools/misc/peruse { };
 
-  kst = qt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
+  kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; };
 
   kytea = callPackage ../tools/text/kytea { };
 
@@ -2862,7 +2862,7 @@ with pkgs;
 
   mfoc = callPackage ../tools/security/mfoc { };
 
-  mgba = qt5.callPackage ../misc/emulators/mgba { };
+  mgba = libsForQt5.callPackage ../misc/emulators/mgba { };
 
   mimeo = callPackage ../tools/misc/mimeo { };
 
@@ -3409,7 +3409,7 @@ with pkgs;
     inherit qt4;
   };
 
-  pinentry_qt5 = qt5.callPackage ../tools/security/pinentry/qt5.nix {
+  pinentry_qt5 = libsForQt5.callPackage ../tools/security/pinentry/qt5.nix {
     libcap = if stdenv.isDarwin then null else libcap;
   };
 
@@ -3558,10 +3558,10 @@ with pkgs;
 
   qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { };
 
-  qastools = qt5.callPackage ../tools/audio/qastools { };
+  qastools = libsForQt5.callPackage ../tools/audio/qastools { };
 
-  qesteidutil = qt5.callPackage ../tools/security/qesteidutil { } ;
-  qdigidoc = qt5.callPackage ../tools/security/qdigidoc { } ;
+  qesteidutil = libsForQt5.callPackage ../tools/security/qesteidutil { } ;
+  qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ;
   esteidfirefoxplugin = callPackage ../applications/networking/browsers/mozilla-plugins/esteidfirefoxplugin { };
 
 
@@ -3778,7 +3778,9 @@ with pkgs;
     quazip = quazip_qt4;
   };
 
-  quazip_qt4 = self.qt5.quazip.override { qt = qt4; qmakeHook = qmake4Hook; };
+  quazip_qt4 = libsForQt5.quazip.override {
+    qtbase = qt4; qmakeHook = qmake4Hook;
+  };
 
   scrot = callPackage ../tools/graphics/scrot { };
 
@@ -3820,7 +3822,7 @@ with pkgs;
 
   siege = callPackage ../tools/networking/siege {};
 
-  sigil = qt55.callPackage ../applications/editors/sigil { };
+  sigil = libsForQt55.callPackage ../applications/editors/sigil { };
 
   # aka., gpg-tools
   signing-party = callPackage ../tools/security/signing-party { };
@@ -3928,7 +3930,7 @@ with pkgs;
 
   su-exec = callPackage ../tools/security/su-exec {};
 
-  subsurface = qt5.callPackage ../applications/misc/subsurface { };
+  subsurface = libsForQt5.callPackage ../applications/misc/subsurface { };
 
   sudo = callPackage ../tools/security/sudo { };
 
@@ -4060,7 +4062,7 @@ with pkgs;
 
   thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools {  };
 
-  tiled = qt5.callPackage ../applications/editors/tiled { };
+  tiled = libsForQt5.callPackage ../applications/editors/tiled { };
 
   timemachine = callPackage ../applications/audio/timemachine { };
 
@@ -6284,7 +6286,7 @@ with pkgs;
   cmakeWithGui = cmakeCurses.override { useQt4 = true; };
 
   # Does not actually depend on Qt 5
-  extra-cmake-modules = qt5.ecmNoHooks;
+  extra-cmake-modules = libsForQt5.ecmNoHooks;
 
   coccinelle = callPackage ../development/tools/misc/coccinelle {
     ocamlPackages = ocamlPackages_4_01_0;
@@ -6663,7 +6665,7 @@ with pkgs;
 
   premake = premake4;
 
-  qtcreator = qt5.callPackage ../development/qtcreator { };
+  qtcreator = libsForQt5.callPackage ../development/qtcreator { };
 
   r10k = callPackage ../tools/system/r10k { };
 
@@ -9288,28 +9290,52 @@ with pkgs;
     developerBuild = true;
   });
 
-  qt55 =
-    let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; };
-        # Libraries that cannot be built with newer versions of Qt 5
-        qt55Only = self: with self; {
-          # Requires Qt Quick (deprecated in Qt 5.5, removed from Qt 5.6)
-          qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
-        };
-    in recurseIntoAttrs (imported.override (super: self: qt5LibsFun self // qt55Only self));
+  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;
+  });
 
-  qt56 =
-    let imported = import ../development/libraries/qt-5/5.6 { inherit pkgs; };
-    in recurseIntoAttrs (imported.override (super: qt5LibsFun));
+  libsForQt55 = recurseIntoAttrs (lib.makeScope qt55.newScope mkLibsForQt5);
 
-  qt57 =
-    let imported = import ../development/libraries/qt-5/5.7 { inherit pkgs; };
-    in recurseIntoAttrs (imported.override (super: qt5LibsFun));
+  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(...
+    cups = if stdenv.isLinux then cups else null;
+    harfbuzz = harfbuzz-icu;
+    mesa = mesa_noglu;
+    inherit perl;
+    inherit (gst_all_1) gstreamer gst-plugins-base;
+  });
+
+  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;
+  });
+
+  libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5);
 
   qt5 = qt56;
+  libsForQt5 = libsForQt56;
 
-  qt5ct = qt5.callPackage ../tools/misc/qt5ct { };
+  qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 
-  qt5LibsFun = self: with self;
+  mkLibsForQt5 = self: with self;
     let kdeFrameworks =
           import ../development/libraries/kde-frameworks { inherit pkgs; } self;
     in {
@@ -9367,6 +9393,8 @@ with pkgs;
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
+    qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
+
     qscintilla = callPackage ../development/libraries/qscintilla {
       withQt5 = true;
     };
@@ -9377,9 +9405,7 @@ with pkgs;
 
     qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { };
 
-    quazip = callPackage ../development/libraries/quazip {
-      qt = qtbase;
-    };
+    quazip = callPackage ../development/libraries/quazip { };
 
     qwt = callPackage ../development/libraries/qwt/6.nix { };
 
@@ -12474,7 +12500,7 @@ with pkgs;
 
   xlsx2csv = pythonPackages.xlsx2csv;
 
-  zeal = qt5.callPackage ../data/documentation/zeal { };
+  zeal = libsForQt5.callPackage ../data/documentation/zeal { };
 
 
   ### APPLICATIONS
@@ -12568,13 +12594,13 @@ with pkgs;
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};
 
-  antimony = qt5.callPackage ../applications/graphics/antimony {};
+  antimony = libsForQt5.callPackage ../applications/graphics/antimony {};
 
   antiword = callPackage ../applications/office/antiword {};
 
   ao = callPackage ../applications/graphics/ao {};
 
-  aqemu = qt5.callPackage ../applications/virtualization/aqemu { };
+  aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { };
 
   ardour = callPackage ../applications/audio/ardour {
     inherit (gnome2) libgnomecanvas libgnomecanvasmm;
@@ -12600,7 +12626,7 @@ with pkgs;
   astroid = callPackage ../applications/networking/mailreaders/astroid { };
 
   audacious = callPackage ../applications/audio/audacious { };
-  audaciousQt5 = qt5.callPackage ../applications/audio/audacious/qt-5.nix { };
+  audaciousQt5 = libsForQt5.callPackage ../applications/audio/audacious/qt-5.nix { };
 
   audacity = callPackage ../applications/audio/audacity { };
 
@@ -12662,7 +12688,7 @@ with pkgs;
   };
   awesome = awesome-4-0;
 
-  awesomebump = qt5.callPackage ../applications/graphics/awesomebump { };
+  awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { };
 
   inherit (gnome3) baobab;
 
@@ -12733,7 +12759,7 @@ with pkgs;
 
   bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { };
 
-  bomi = qt5.callPackage ../applications/video/bomi {
+  bomi = libsForQt5.callPackage ../applications/video/bomi {
     youtube-dl = pythonPackages.youtube-dl;
     pulseSupport = config.pulseaudio or true;
     ffmpeg = ffmpeg_2;
@@ -12761,7 +12787,7 @@ with pkgs;
 
   calcurse = callPackage ../applications/misc/calcurse { };
 
-  calibre = qt5.callPackage ../applications/misc/calibre { };
+  calibre = libsForQt5.callPackage ../applications/misc/calibre { };
 
   calligra = kde4.callPackage ../applications/office/calligra {
     vc = vc_0_7;
@@ -12782,7 +12808,7 @@ with pkgs;
 
   cava = callPackage ../applications/audio/cava { };
 
-  cb2bib = qt5.callPackage ../applications/office/cb2bib { };
+  cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
   cbatticon = callPackage ../applications/misc/cbatticon { };
 
@@ -12857,7 +12883,7 @@ with pkgs;
 
   cni = callPackage ../applications/networking/cluster/cni {};
 
-  communi = qt5.callPackage ../applications/networking/irc/communi { };
+  communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
 
   compiz = callPackage ../applications/window-managers/compiz {
     inherit (gnome2) GConf ORBit2 metacity;
@@ -12904,7 +12930,7 @@ with pkgs;
   cutecom = callPackage ../tools/misc/cutecom { };
 
   cutegram =
-    let callpkg = qt55.callPackage;
+    let callpkg = libsForQt55.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 {
@@ -12954,9 +12980,9 @@ with pkgs;
     plugins = [];
   };
 
-  dfasma = qt5.callPackage ../applications/audio/dfasma { };
+  dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
 
-  dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { };
+  dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { };
 
   dia = callPackage ../applications/graphics/dia {
     inherit (pkgs.gnome2) libart_lgpl libgnomeui;
@@ -13304,7 +13330,7 @@ with pkgs;
 
   keepassx = callPackage ../applications/misc/keepassx { };
   keepassx2 = callPackage ../applications/misc/keepassx/2.0.nix { };
-  keepassx-community = qt5.callPackage ../applications/misc/keepassx/community.nix { };
+  keepassx-community = libsForQt5.callPackage ../applications/misc/keepassx/community.nix { };
 
   inherit (gnome3) evince;
   evolution_data_server = gnome3.evolution_data_server;
@@ -13339,7 +13365,7 @@ with pkgs;
      inherit (darwin.apple_sdk.frameworks) CoreServices CoreAudio AudioUnit;
   };
 
-  fmit = qt5.callPackage ../applications/audio/fmit { };
+  fmit = libsForQt5.callPackage ../applications/audio/fmit { };
 
   fmsynth = callPackage ../applications/audio/fmsynth { };
 
@@ -13357,7 +13383,7 @@ with pkgs;
 
   fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { };
 
-  fritzing = qt5.callPackage ../applications/science/electronics/fritzing { };
+  fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { };
 
   fvwm = callPackage ../applications/window-managers/fvwm { };
 
@@ -13388,7 +13414,7 @@ with pkgs;
 
   gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { };
 
-  goldendict = qt55.callPackage ../applications/misc/goldendict { };
+  goldendict = libsForQt55.callPackage ../applications/misc/goldendict { };
 
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
@@ -13496,7 +13522,7 @@ with pkgs;
     desktopName = "Firefox Beta";
   };
 
-  firestr = qt5.callPackage ../applications/networking/p2p/firestr
+  firestr = libsForQt5.callPackage ../applications/networking/p2p/firestr
     { boost = boost155;
     };
 
@@ -13647,7 +13673,7 @@ with pkgs;
 
   libquvi = callPackage ../applications/video/quvi/library.nix { };
 
-  linssid = qt5.callPackage ../applications/networking/linssid { };
+  linssid = libsForQt5.callPackage ../applications/networking/linssid { };
 
   manuskript = callPackage ../applications/editors/manuskript { };
 
@@ -13734,7 +13760,7 @@ with pkgs;
 
   gosmore = callPackage ../applications/misc/gosmore { };
 
-  gpsbabel = qt5.callPackage ../applications/misc/gpsbabel { };
+  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
 
   gpscorrelate = callPackage ../applications/misc/gpscorrelate { };
 
@@ -13742,7 +13768,7 @@ with pkgs;
 
   gpsprune = callPackage ../applications/misc/gpsprune { };
 
-  gpxsee = qt5.callPackage ../applications/misc/gpxsee { };
+  gpxsee = libsForQt5.callPackage ../applications/misc/gpxsee { };
 
   gtk2fontsel = callPackage ../applications/misc/gtk2fontsel {
     inherit (gnome2) gtk;
@@ -13948,7 +13974,7 @@ with pkgs;
     lua = lua5_1;
   };
 
-  ipe = qt5.callPackage ../applications/graphics/ipe {
+  ipe = libsForQt5.callPackage ../applications/graphics/ipe {
     ghostscript = ghostscriptX;
     texlive = texlive.combine { inherit (texlive) scheme-small; };
   };
@@ -14016,13 +14042,13 @@ with pkgs;
 
   k3b = kde4.callPackage ../applications/misc/k3b/wrapper.nix { };
 
-  k9copy = qt5.callPackage ../applications/video/k9copy {};
+  k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
 
   kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { };
 
   kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
-  kdeconnect = qt5.callPackage ../applications/misc/kdeconnect { };
+  kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
   kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {};
 
@@ -14038,9 +14064,9 @@ with pkgs;
 
   kermit = callPackage ../tools/misc/kermit { };
 
-  keyfinder = qt5.callPackage ../applications/audio/keyfinder { };
+  keyfinder = libsForQt5.callPackage ../applications/audio/keyfinder { };
 
-  keyfinder-cli = qt5.callPackage ../applications/audio/keyfinder-cli { };
+  keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { };
 
   keymon = callPackage ../applications/video/key-mon { };
 
@@ -14069,9 +14095,9 @@ with pkgs;
 
   kmplayer = kde4.callPackage ../applications/video/kmplayer { };
 
-  konversation = qt5.callPackage ../applications/networking/irc/konversation { };
+  konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
 
-  krita = qt5.callPackage ../applications/graphics/krita {
+  krita = libsForQt5.callPackage ../applications/graphics/krita {
     vc = vc_0_7;
     openjpeg = openjpeg_1;
   };
@@ -14080,7 +14106,7 @@ with pkgs;
 
   ksuperkey = callPackage ../tools/X11/ksuperkey { };
 
-  ktorrent = qt5.callPackage ../applications/networking/p2p/ktorrent { };
+  ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
 
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {
     go = go_1_6;
@@ -14204,7 +14230,7 @@ with pkgs;
 
   lrzsz = callPackage ../tools/misc/lrzsz { };
 
-  luminanceHDR = qt55.callPackage ../applications/graphics/luminance-hdr { };
+  luminanceHDR = libsForQt55.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
@@ -14223,7 +14249,7 @@ with pkgs;
 
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
-  lyx = qt5.callPackage ../applications/misc/lyx { };
+  lyx = libsForQt5.callPackage ../applications/misc/lyx { };
 
   mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
 
@@ -14454,7 +14480,7 @@ with pkgs;
       else null;
   };
 
-  musescore = qt55.callPackage ../applications/audio/musescore { };
+  musescore = libsForQt55.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
@@ -14502,11 +14528,11 @@ with pkgs;
 
   scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { };
 
-  shotcut = qt5.callPackage ../applications/video/shotcut { };
+  shotcut = libsForQt5.callPackage ../applications/video/shotcut { };
 
-  smplayer = qt5.callPackage ../applications/video/smplayer { };
+  smplayer = libsForQt5.callPackage ../applications/video/smplayer { };
 
-  smtube = qt55.callPackage ../applications/video/smtube {};
+  smtube = libsForQt55.callPackage ../applications/video/smtube {};
 
   sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
 
@@ -14609,7 +14635,7 @@ with pkgs;
 
   oblogout = callPackage ../tools/X11/oblogout { };
 
-  obs-studio = qt5.callPackage ../applications/video/obs-studio {
+  obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
     alsaSupport = stdenv.isLinux;
     pulseaudioSupport = config.pulseaudio or true;
   };
@@ -14709,9 +14735,9 @@ with pkgs;
 
   pflask = callPackage ../os-specific/linux/pflask {};
 
-  photoqt = qt5.callPackage ../applications/graphics/photoqt { };
+  photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { };
 
-  phototonic = qt5.callPackage ../applications/graphics/phototonic { };
+  phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
 
   phrasendrescher = callPackage ../tools/security/phrasendrescher { };
 
@@ -14843,7 +14869,7 @@ with pkgs;
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
 
-  qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent {
+  qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent {
     boost = boost;
     libtorrentRasterbar = libtorrentRasterbar_1_0;
   };
@@ -14857,15 +14883,15 @@ with pkgs;
 
   qgis = callPackage ../applications/gis/qgis {};
 
-  qgroundcontrol = qt55.callPackage ../applications/science/robotics/qgroundcontrol { };
+  qgroundcontrol = libsForQt55.callPackage ../applications/science/robotics/qgroundcontrol { };
 
-  qjackctl = qt5.callPackage ../applications/audio/qjackctl { };
+  qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
 
   qmidinet = callPackage ../applications/audio/qmidinet { };
 
   qmidiroute = callPackage ../applications/audio/qmidiroute { };
 
-  qmmp = qt5.callPackage ../applications/audio/qmmp { };
+  qmmp = libsForQt5.callPackage ../applications/audio/qmmp { };
 
   qnotero = callPackage ../applications/office/qnotero { };
 
@@ -14877,15 +14903,15 @@ with pkgs;
     qt = qt4;
   };
 
-  qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
+  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
 
-  qtox = qt5.callPackage ../applications/networking/instant-messengers/qtox { };
+  qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
 
-  qtpass = qt5.callPackage ../applications/misc/qtpass { };
+  qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
 
   qtpfsgui = callPackage ../applications/graphics/qtpfsgui { };
 
@@ -14893,7 +14919,7 @@ with pkgs;
 
   qtscrobbler = callPackage ../applications/audio/qtscrobbler { };
 
-  quassel = qt5.callPackage ../applications/networking/irc/quassel {
+  quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
     monolithic = true;
     daemon = false;
     client = false;
@@ -14919,7 +14945,7 @@ with pkgs;
 
   quirc = callPackage ../tools/graphics/quirc {};
 
-  quiterss = qt5.callPackage ../applications/networking/newsreaders/quiterss {};
+  quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {};
 
   quodlibet-without-gst-plugins = callPackage ../applications/audio/quodlibet { };
 
@@ -14928,7 +14954,7 @@ with pkgs;
     gst-plugins-bad = null;
   };
 
-  qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {
+  qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {
     inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils;
     inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
   };
@@ -14947,7 +14973,7 @@ with pkgs;
     demo = false;
   };
 
-  rapcad = qt55.callPackage ../applications/graphics/rapcad { boost = boost159; };
+  rapcad = libsForQt55.callPackage ../applications/graphics/rapcad { boost = boost159; };
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
 
@@ -14989,7 +15015,7 @@ with pkgs;
 
   retroshare06 = lowPrio (callPackage ../applications/networking/p2p/retroshare/0.6.nix { });
 
-  ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { };
+  ricochet = libsForQt55.callPackage ../applications/networking/instant-messengers/ricochet { };
 
   ripser = callPackage ../applications/science/math/ripser { };
 
@@ -15169,13 +15195,13 @@ with pkgs;
   bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { };
   bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { };
 
-  dropbox = qt5.callPackage ../applications/networking/dropbox { };
+  dropbox = libsForQt5.callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 
   insync = callPackage ../applications/networking/insync { };
 
-  lightdm = qt5.callPackage ../applications/display-managers/lightdm {
+  lightdm = libsForQt5.callPackage ../applications/display-managers/lightdm {
     qt4 = null;
     withQt5 = false;
   };
@@ -15196,11 +15222,11 @@ with pkgs;
 
   printrun = callPackage ../applications/misc/printrun { };
 
-  sddm = qt5.callPackage ../applications/display-managers/sddm {
+  sddm = libsForQt5.callPackage ../applications/display-managers/sddm {
     themes = [];  # extra themes, etc.
   };
 
-  skrooge = qt5.callPackage ../applications/office/skrooge {};
+  skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
 
   slim = callPackage ../applications/display-managers/slim {
     libpng = libpng12;
@@ -15222,7 +15248,7 @@ with pkgs;
 
   sipp = callPackage ../development/tools/misc/sipp { };
 
-  sonic-visualiser = qt5.callPackage ../applications/audio/sonic-visualiser {
+  sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser {
     inherit (pkgs.vamp) vampSDK;
   };
 
@@ -15337,7 +15363,7 @@ with pkgs;
     gconf = gnome2.GConf;
   };
 
-  teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { };
@@ -15482,7 +15508,7 @@ with pkgs;
     boost = boost160;
   };
 
-  twmn = qt5.callPackage ../applications/misc/twmn { };
+  twmn = libsForQt5.callPackage ../applications/misc/twmn { };
 
   umurmur = callPackage ../applications/networking/umurmur { };
 
@@ -15560,7 +15586,7 @@ with pkgs;
 
   neovim = callPackage ../applications/editors/neovim { };
 
-  neovim-qt = qt5.callPackage ../applications/editors/neovim/qt.nix { };
+  neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
 
   neovim-pygui = pythonPackages.neovim_gui;
 
@@ -15648,7 +15674,7 @@ with pkgs;
     gtk = gtk2;
   };
 
-  vlc_qt5 = qt5.vlc;
+  vlc_qt5 = libsForQt5.vlc;
 
   vmpk = callPackage ../applications/audio/vmpk { };
 
@@ -15861,7 +15887,7 @@ with pkgs;
   };
   xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers;
 
-  xca = qt5.callPackage ../applications/misc/xca { };
+  xca = libsForQt5.callPackage ../applications/misc/xca { };
 
   xcalib = callPackage ../tools/X11/xcalib { };
 
@@ -16147,13 +16173,13 @@ with pkgs;
 
   chessdb = callPackage ../games/chessdb { };
 
-  chessx = qt5.callPackage ../games/chessx { };
+  chessx = libsForQt5.callPackage ../games/chessx { };
 
   chocolateDoom = callPackage ../games/chocolate-doom { };
 
   ckan = callPackage ../games/ckan { };
 
-  cockatrice = qt5.callPackage ../games/cockatrice {  };
+  cockatrice = libsForQt5.callPackage ../games/cockatrice {  };
 
   commandergenius = callPackage ../games/commandergenius { };
 
@@ -16232,7 +16258,7 @@ with pkgs;
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};
 
-  flightgear = qt5.callPackage ../games/flightgear { };
+  flightgear = libsForQt5.callPackage ../games/flightgear { };
 
   freecell-solver = callPackage ../games/freecell-solver { };
 
@@ -16347,7 +16373,7 @@ with pkgs;
 
   minecraft-server = callPackage ../games/minecraft-server { };
 
-  multimc = qt5.callPackage ../games/multimc { };
+  multimc = libsForQt5.callPackage ../games/multimc { };
 
   minetest = callPackage ../games/minetest {
     libpng = libpng12;
@@ -16357,7 +16383,7 @@ with pkgs;
 
   mrrescue = callPackage ../games/mrrescue { };
 
-  mudlet = qt5.callPackage ../games/mudlet {
+  mudlet = libsForQt5.callPackage ../games/mudlet {
     inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
   };
 
@@ -16500,7 +16526,7 @@ with pkgs;
 
   solarus = callPackage ../games/solarus { };
 
-  solarus-quest-editor = qt5.callPackage ../development/tools/solarus-quest-editor { };
+  solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { };
 
   # You still can override by passing more arguments.
   space-orbit = callPackage ../games/space-orbit { };
@@ -16633,7 +16659,7 @@ with pkgs;
 
   warsow = callPackage ../games/warsow { };
 
-  warzone2100 = qt5.callPackage ../games/warzone2100 { };
+  warzone2100 = libsForQt5.callPackage ../games/warzone2100 { };
 
   wesnoth = callPackage ../games/wesnoth { };
 
@@ -16755,7 +16781,10 @@ with pkgs;
 
   lumina = callPackage ../desktops/lumina { };
 
-  lxqt = recurseIntoAttrs (callPackage ../desktops/lxqt { });
+  lxqt = recurseIntoAttrs (import ../desktops/lxqt {
+    inherit pkgs libsForQt5 fetchFromGitHub;
+    inherit (lib) makeScope;
+  });
 
   mate = recurseIntoAttrs (callPackage ../desktops/mate {
     callPackage = newScope pkgs.mate;
@@ -16791,14 +16820,14 @@ with pkgs;
       merged = self:
         {
           plasma = plasma self;
-          frameworks = qt5.kdeFrameworks;
+          frameworks = libsForQt5.kdeFrameworks;
           applications = applications self;
         }
-        // qt5.kdeFrameworks
+        // libsForQt5.kdeFrameworks
         // plasma self
         // applications self;
     in
-      recurseIntoAttrs (lib.makeScope qt5.newScope merged);
+      recurseIntoAttrs (lib.makeScope libsForQt5.newScope merged);
 
   theme-vertex = callPackage ../misc/themes/vertex { };
 
@@ -17305,7 +17334,7 @@ with pkgs;
 
   yacas = callPackage ../applications/science/math/yacas { };
 
-  speedcrunch = qt5.callPackage ../applications/science/math/speedcrunch { };
+  speedcrunch = libsForQt5.callPackage ../applications/science/math/speedcrunch { };
 
   ### SCIENCE / MISC
 
@@ -17336,7 +17365,7 @@ with pkgs;
 
   spyder = pythonPackages.spyder;
 
-  stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { };
+  stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { };
 
   tulip = callPackage ../applications/science/misc/tulip {
     cmake = cmake_2_8;
@@ -17398,7 +17427,7 @@ with pkgs;
 
   ### MISC
 
-  antimicro = qt5.callPackage ../tools/misc/antimicro { };
+  antimicro = libsForQt5.callPackage ../tools/misc/antimicro { };
 
   atari800 = callPackage ../misc/emulators/atari800 { };
 
@@ -17668,9 +17697,9 @@ with pkgs;
     pcre = pcre-cpp;
   });
 
-  redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { };
+  redis-desktop-manager = libsForQt55.callPackage ../applications/misc/redis-desktop-manager { };
 
-  robomongo = qt5.callPackage ../applications/misc/robomongo { };
+  robomongo = libsForQt5.callPackage ../applications/misc/robomongo { };
 
   rucksack = callPackage ../development/tools/rucksack { };
 
@@ -17872,7 +17901,7 @@ with pkgs;
   vips = callPackage ../tools/graphics/vips { };
   nip2 = callPackage ../tools/graphics/nip2 { };
 
-  vokoscreen = qt5.callPackage ../applications/video/vokoscreen { };
+  vokoscreen = libsForQt5.callPackage ../applications/video/vokoscreen { };
 
   wavegain = callPackage ../applications/audio/wavegain { };
 
@@ -18035,7 +18064,7 @@ with pkgs;
 
   discord = callPackage ../applications/networking/instant-messengers/discord { };
 
-  golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
+  golden-cheetah = libsForQt5.callPackage ../applications/misc/golden-cheetah {};
 
   linkchecker = callPackage ../tools/networking/linkchecker { };
 
@@ -18057,9 +18086,9 @@ with pkgs;
 
   zuki-themes = callPackage ../misc/themes/zuki { };
 
-  zoom-us = qt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
+  zoom-us = libsForQt55.callPackage ../applications/networking/instant-messengers/zoom-us {};
 
-  tora = qt5.callPackage ../development/tools/tora {};
+  tora = libsForQt5.callPackage ../development/tools/tora {};
 
   xulrunner = firefox-unwrapped;
 

From c1fc4af9ae25998888495cdc8b6d98fc2ec9474d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 11:16:31 -0600
Subject: [PATCH 1268/3449] Update Qt and KDE documentation

- Describe the new `libsForQt5.callPackage` interface
- Emphasize that Qt dependencies must be imported unqualified
- Describe the new `kdeWrapper` wrapper generator
---
 doc/languages-frameworks/qt.xml | 56 ++++++---------------------------
 1 file changed, 10 insertions(+), 46 deletions(-)

diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index 093c33c25a17..b6c8f0e899e6 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -2,67 +2,31 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-qt">
 
-<title>Qt</title>
+<title>Qt and KDE</title>
 
-<para>The information in this section applies to Qt 5.5 and later.</para>
-
-<para>Qt is an application development toolkit for C++. Although it is
-not a distinct programming language, there are special considerations
-for packaging Qt-based programs and libraries. A small set of tools
-and conventions has grown out of these considerations.</para>
+<para>Qt is a comprehensive desktop and mobile application development toolkit for C++. Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, but older versions are typically retained to support packages that may not be compatible with the latest version. When packaging applications and libraries for Nixpkgs, it is important to ensure that compatible versions of Qt 5 are used throughout; this consideration motivates the tools described below.</para>
 
 <section xml:id="ssec-qt-libraries"><title>Libraries</title>
 
-<para>Packages that provide libraries should be listed in
-<varname>qt5LibsFun</varname> so that the library is built with each
-Qt version. A set of packages is provided for each version of Qt; for
-example, <varname>qt5Libs</varname> always provides libraries built
-with the latest version, <varname>qt55Libs</varname> provides
-libraries built with Qt 5.5, and so on. To avoid version conflicts, no
-top-level attributes are created for these packages.</para>
+<para>Libraries that depend on Qt 5 should be built with each available version to avoid linking a dependent package against incompatible versions of Qt 5. (Although Qt 5 maintains backward ABI compatibility, linking against multiple versions at once is generally not possible; at best it will lead to runtime faults.) Packages that provide libraries should be added to the top-level function <varname>mkLibsForQt5</varname>, which is used to build a set of libraries for every Qt 5 version. The <varname>callPackage</varname> provided in this scope will ensure that only one Qt version will be used throughout the dependency tree. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>, so that <varname>callPackage</varname> can do its work. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
+
+<para>If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute. A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.</para>
 
 </section>
 
-<section xml:id="ssec-qt-programs"><title>Programs</title>
+<section xml:id="ssec-qt-applications"><title>Applications</title>
 
-<para>Application packages do not need to be built with every Qt
-version. To ensure consistency between the package's dependencies,
-call the package with <literal>qt5Libs.callPackage</literal> instead
-of the usual <literal>callPackage</literal>. An older version may be
-selected in case of incompatibility. For example, to build with Qt
-5.5, call the package with
-<literal>qt55Libs.callPackage</literal>.</para>
+<para>Applications generally do not need to be built with every Qt version because they do not provide any libraries for dependent packages to link against. The primary consideration is merely ensuring that the application itself and its dependencies are linked against only one version of Qt. To call your application expression, use <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
 
-<para>Several environment variables must be set at runtime for Qt
-applications to function correctly, including:</para>
+<para>It is generally best to build an application package against the <varname>libsForQt5</varname> library set. In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.</para>
 
-<itemizedlist>
-  <listitem><para><envar>QT_PLUGIN_PATH</envar></para></listitem>
-  <listitem><para><envar>QML_IMPORT_PATH</envar></para></listitem>
-  <listitem><para><envar>QML2_IMPORT_PATH</envar></para></listitem>
-  <listitem><para><envar>XDG_DATA_DIRS</envar></para></listitem>
-</itemizedlist>
-
-<para>To ensure that these are set correctly, the program must be wrapped by
-invoking <literal>wrapQtProgram <replaceable>program</replaceable></literal>
-during installation (for example, during
-<literal>fixupPhase</literal>). <literal>wrapQtProgram</literal>
-accepts the same options as <literal>makeWrapper</literal>.
-</para>
+<para>Qt-based applications require that several paths be set at runtime. This is accomplished by wrapping the provided executables in a package with <literal>wrapQtProgram</literal> or <literal>makeQtWrapper</literal> during the <literal>postFixup</literal> phase. To use the wrapper generators, add <literal>makeQtWrapper</literal> to <literal>nativeBuildInputs</literal>. The wrapper generators support the same options as <literal>wrapProgram</literal> and <literal>makeWrapper</literal> respectively. It is usually only necessary to generate wrappers for programs intended to be invoked by the user.</para>
 
 </section>
 
 <section xml:id="ssec-qt-kde"><title>KDE</title>
 
-<para>Many of the considerations above also apply to KDE packages,
-especially the need to set the correct environment variables at
-runtime. To ensure that this is done, invoke <literal>wrapKDEProgram
-<replaceable>program</replaceable></literal> during
-installation. <literal>wrapKDEProgram</literal> also generates a
-<literal>ksycoca</literal> database so that required data and services
-can be found. Like its Qt counterpart,
-<literal>wrapKDEProgram</literal> accepts the same options as
-<literal>makeWrapper</literal>.</para>
+<para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based library does not require any steps beyond those described above for general Qt-based libraries. Frameworks-based applications should not use <literal>makeQtWrapper</literal>; instead, use <literal>kdeWrapper</literal> to create the necessary wrappers: <literal>kdeWrapper { unwrapped = <replaceable>expr</replaceable>; targets = <replaceable>exes</replaceable>; }</literal>, where <replaceable>expr</replaceable> is the un-wrapped package expression and <replaceable>exes</replaceable> is a list of strings giving the relative paths to programs in the package which should be wrapped.</para>
 
 </section>
 

From 4e36b374d080285f3512a90b079da2b28fa800f5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 09:44:19 -0600
Subject: [PATCH 1269/3449] heaptrack: Fix packaging errors

---
 .../tools/profiling/heaptrack/default.nix         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 378073d16c00..5d151b9c9a3e 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchFromGitHub, cmake, zlib, boost162, libunwind,
-  elfutils, qt5, kde5, sparsehash }:
+{
+  stdenv, fetchFromGitHub, cmake, ecm,
+  zlib, boost162, libunwind, elfutils, sparsehash,
+  qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons,
+}:
 
 stdenv.mkDerivation rec {
   name = "heaptrack-${version}";
@@ -12,9 +15,11 @@ stdenv.mkDerivation rec {
     sha256 = "0dqchd2r4khv9gzj4n0qjii2nqygkj5jclkji8jbvivx5qwsqznc";
   };
 
-  buildInputs = [ cmake zlib boost162 libunwind elfutils sparsehash
-                  qt5.ecm qt5.qtbase kde5.kio kde5.kitemmodels
-                  kde5.threadweaver kde5.kconfigwidgets kde5.kcoreaddons ];
+  nativeBuildInputs = [ cmake ecm ];
+  buildInputs = [
+    zlib boost162 libunwind elfutils sparsehash
+    qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons
+  ];
 
   meta = with stdenv.lib; {
     description = "Heap memory profiler for Linux";

From 055c0f4405cf72af40f063919a04590a893ba782 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 09:44:29 -0600
Subject: [PATCH 1270/3449] lxqt: Fix packaging errors

---
 pkgs/desktops/lxqt/base/liblxqt/default.nix   | 15 +++----
 pkgs/desktops/lxqt/core/libfm-qt/default.nix  | 15 ++++---
 .../desktops/lxqt/core/lxqt-about/default.nix | 18 ++++----
 .../desktops/lxqt/core/lxqt-admin/default.nix | 18 ++++----
 .../lxqt/core/lxqt-config/default.nix         | 22 +++++-----
 .../lxqt/core/lxqt-globalkeys/default.nix     | 20 ++++-----
 .../lxqt/core/lxqt-notificationd/default.nix  | 18 ++++----
 .../core/lxqt-openssh-askpass/default.nix     | 18 ++++----
 .../desktops/lxqt/core/lxqt-panel/default.nix | 41 +++++++++++--------
 .../lxqt/core/lxqt-policykit/default.nix      | 24 ++++++-----
 .../core/lxqt-powermanagement/default.nix     | 22 +++++-----
 .../lxqt/core/lxqt-qtplugin/default.nix       | 22 ++++++----
 .../lxqt/core/lxqt-runner/default.nix         | 20 ++++-----
 .../lxqt/core/lxqt-session/default.nix        | 18 ++++----
 pkgs/desktops/lxqt/core/lxqt-sudo/default.nix | 18 ++++----
 pkgs/desktops/lxqt/default.nix                | 24 +++++------
 .../lxqt/optional/compton-conf/default.nix    |  6 +--
 .../lxqt/optional/screengrab/default.nix      | 14 +++----
 18 files changed, 185 insertions(+), 168 deletions(-)

diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix
index 2d4faee5cf33..9363dba86699 100644
--- a/pkgs/desktops/lxqt/base/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools,
+  qtx11extras, qttools, qtsvg, libqtxdg, kwindowsystem, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,15 +15,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtx11extras
-    qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.libqtxdg
+    qtx11extras
+    qttools
+    qtsvg
+    kwindowsystem
+    libqtxdg
     xorg.libXScrnSaver
   ];
 
diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
index 4c7ecbc1804d..78c0a926b9c8 100644
--- a/pkgs/desktops/lxqt/core/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
-libfm, menu-cache }:
+{
+  stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+  xorg, libfm, menu-cache,
+  qtx11extras, qttools
+}:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -16,18 +19,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkgconfig
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtx11extras
-    qt5.qttools
+    qtx11extras
+    qttools
     libfm
     menu-cache
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
-   
+
   meta = with stdenv.lib; {
     description = "Core library of PCManFM-Qt (Qt binding for libfm)";
     homepage = https://github.com/lxde/libfm-qt;
diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
index 34491d0414bc..ac81391af1d9 100644
--- a/pkgs/desktops/lxqt/core/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,21 +14,21 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtx11extras
-    qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtx11extras
+    qttools
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = lxqt.standardPatch;
+  postPatch = standardPatch;
 
   meta = with stdenv.lib; {
     description = "Dialogue window providing information about LXQt and the system it's running on";
diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
index 2e6ae9858ad3..23b142f352f0 100644
--- a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, polkit }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,22 +14,22 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtx11extras
-    qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtx11extras
+    qttools
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
     polkit
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = lxqt.standardPatch;
+  postPatch = standardPatch;
 
   meta = with stdenv.lib; {
     description = "LXQt system administration tool";
diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
index a16fcd21f68f..7b38d2eec6fd 100644
--- a/pkgs/desktops/lxqt/core/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, standardPatch, qtbase, qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, libqtxdg, libpthreadstubs, xorg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -15,18 +15,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkgconfig
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qtx11extras
-    qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    kde5.libkscreen
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtbase
+    qtx11extras
+    qttools
+    qtsvg
+    kwindowsystem
+    libkscreen
+    liblxqt
+    libqtxdg
     xorg.libpthreadstubs
     xorg.libXdmcp
     xorg.libXScrnSaver
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = lxqt.standardPatch;
+  postPatch = standardPatch;
 
   meta = with stdenv.lib; {
     description = "Tools to configure LXQt and the underlying operating system";
diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
index a23bff6e8d1d..73248da1ef80 100644
--- a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, standardPatch, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,22 +14,22 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtbase
+    qttools
+    qtx11extras
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = lxqt.standardPatch;
+  postPatch = standardPatch;
 
   meta = with stdenv.lib; {
     description = "Daemon used to register global keyboard shortcuts";
diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
index 3646a461c830..cb10df5a1b72 100644
--- a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
-    lxqt.lxqt-common
+    qtbase
+    qttools
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
+    lxqt-common
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
index 9190718fde4f..a52ce02cd14b 100644
--- a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtbase
+    qttools
+    qtx11extras
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
index 0c899c67dad5..dfbd39acaa35 100644
--- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix
@@ -1,6 +1,11 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg,
-libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
-lxmenu-data }:
+{
+  stdenv, fetchFromGitHub, standardPatch,
+  cmake, pkgconfig, lxqt-build-tools,
+  qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid,
+  kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat,
+  xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache,
+  lxmenu-data
+}:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -17,23 +22,23 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkgconfig
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    qt5.libdbusmenu
-    kde5.kwindowsystem
-    kde5.solid
-    kde5.kguiaddons
-    lxqt.liblxqt
-    lxqt.libqtxdg
-    lxqt.lxqt-common
-    lxqt.lxqt-globalkeys
-    lxqt.libsysstat
+    qtbase
+    qttools
+    qtx11extras
+    qtsvg
+    libdbusmenu
+    kwindowsystem
+    solid
+    kguiaddons
+    liblxqt
+    libqtxdg
+    lxqt-common
+    lxqt-globalkeys
+    libsysstat
     xorg.libpthreadstubs
     xorg.libXdmcp
     libstatgrab
@@ -46,7 +51,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = lxqt.standardPatch;
+  postPatch = standardPatch;
 
   meta = with stdenv.lib; {
     description = "The LXQt desktop panel";
diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
index f4351a9598d7..bdcc0a4d606e 100644
--- a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt }:
+{
+  stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools,
+  qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt,
+  libqtxdg,
+}:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -15,18 +19,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkgconfig
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    qt5.polkit-qt
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtbase
+    qttools
+    qtx11extras
+    qtsvg
+    polkit-qt
+    kwindowsystem
+    liblxqt
+    libqtxdg
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
index b7321c646686..d3793a9d9286 100644
--- a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    kde5.solid
-    kde5.kidletime
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtbase
+    qttools
+    qtx11extras
+    qtsvg
+    kwindowsystem
+    solid
+    kidletime
+    liblxqt
+    libqtxdg
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
index 49fa7c616335..d5b8987bbb82 100644
--- a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, lxqt }:
+{
+  stdenv, fetchFromGitHub, standardPatch,
+  cmake, lxqt-build-tools,
+  qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg,
+}:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,21 +18,21 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qtx11extras
-    qt5.qttools
-    qt5.qtsvg
-    qt5.libdbusmenu
-    lxqt.libqtxdg
+    qtbase
+    qtx11extras
+    qttools
+    qtsvg
+    libdbusmenu
+    libqtxdg
   ];
 
   cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ];
 
-  postPatch = lxqt.standardPatch;
+  postPatch = standardPatch;
 
   meta = with stdenv.lib; {
     description = "LXQt Qt platform integration plugin";
diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
index f420e9e410ae..550025f8e87b 100644
--- a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt,
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys,
 menu-cache, muparser }:
 
 stdenv.mkDerivation rec {
@@ -16,18 +16,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkgconfig
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
-    lxqt.lxqt-common
-    lxqt.lxqt-globalkeys
+    qtbase
+    qttools
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
+    lxqt-common
+    lxqt-globalkeys
     menu-cache
     muparser
   ];
diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
index 1dfdd303a720..35879af28e88 100644
--- a/pkgs/desktops/lxqt/core/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, xdg-user-dirs }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-common, xorg, xdg-user-dirs }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -15,17 +15,17 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkgconfig
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
-    lxqt.lxqt-common
+    qtbase
+    qttools
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
+    lxqt-common
     xorg.libpthreadstubs
     xorg.libXdmcp
     xdg-user-dirs
diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
index 83b16587523d..1e235af3c900 100644
--- a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, sudo }:
+{ stdenv, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    lxqt.lxqt-build-tools
+    lxqt-build-tools
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.liblxqt
-    lxqt.libqtxdg
+    qtbase
+    qttools
+    qtx11extras
+    qtsvg
+    kwindowsystem
+    liblxqt
+    libqtxdg
     sudo
   ];
 
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 3cd8fdf22123..00e36e342fac 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -1,13 +1,11 @@
-{ pkgs, newScope, fetchFromGitHub }:
+{ pkgs, makeScope, libsForQt5, fetchFromGitHub }:
 
 let
-  callPackage = newScope self;
-
-  self = rec {
+  packages = self: with self; {
 
     # For compiling information, see:
     # - https://github.com/lxde/lxqt/wiki/Building-from-source
-  
+
     standardPatch = ''
       for file in $(find . -name CMakeLists.txt); do
         substituteInPlace $file \
@@ -37,7 +35,9 @@ let
     lxqt-about = callPackage ./core/lxqt-about { };
     lxqt-admin = callPackage ./core/lxqt-admin { };
     lxqt-common = callPackage ./core/lxqt-common { };
-    lxqt-config = callPackage ./core/lxqt-config { };
+    lxqt-config = callPackage ./core/lxqt-config {
+      inherit (pkgs.plasma5) libkscreen;
+    };
     lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
     lxqt-l10n = callPackage ./core/lxqt-l10n { };
     lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
@@ -57,7 +57,7 @@ let
 
     ### OPTIONAL
     qterminal = callPackage ./optional/qterminal { };
-    compton-conf = callPackage ./optional/compton-conf { };
+    compton-conf = pkgs.qt5.callPackage ./optional/compton-conf { };
     obconf-qt = callPackage ./optional/obconf-qt { };
     lximage-qt = callPackage ./optional/lximage-qt { };
     qps = callPackage ./optional/qps { };
@@ -66,14 +66,14 @@ let
 
     preRequisitePackages = [
       pkgs.gvfs # virtual file systems support for PCManFM-QT
-      pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
-      pkgs.kde5.libkscreen # provides plugins for screen management software
+      pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
+      pkgs.plasma5.libkscreen # provides plugins for screen management software
       pkgs.libfm
       pkgs.libfm-extra
       pkgs.lxmenu-data
       pkgs.menu-cache
       pkgs.openbox # default window manager
-      pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
+      qt5.qtsvg # provides QT5 plugins for svg icons
     ];
 
     corePackages = [
@@ -120,7 +120,7 @@ let
       qlipper
 
       ### Default icon theme
-      pkgs.kde5.oxygen-icons5
+      qt5.oxygen-icons5
 
       ### Screen saver
       pkgs.xscreensaver
@@ -128,4 +128,4 @@ let
 
   };
 
-in self
+in makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
index c25ee10bd255..6e1ea1288539 100644
--- a/pkgs/desktops/lxqt/optional/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, libconfig }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, libconfig }:
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
+    qtbase
+    qttools
     libconfig
   ];
 
diff --git a/pkgs/desktops/lxqt/optional/screengrab/default.nix b/pkgs/desktops/lxqt/optional/screengrab/default.nix
index b3524d36777c..e8cc7c30fa15 100644
--- a/pkgs/desktops/lxqt/optional/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/optional/screengrab/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg }:
 
 stdenv.mkDerivation rec {
   name = "screengrab-unstable-2017-02-18";
@@ -13,12 +13,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
-    qt5.qtbase
-    qt5.qttools
-    qt5.qtx11extras
-    qt5.qtsvg
-    kde5.kwindowsystem
-    lxqt.libqtxdg
+    qtbase
+    qttools
+    qtx11extras
+    qtsvg
+    kwindowsystem
+    libqtxdg
     xorg.libpthreadstubs
     xorg.libXdmcp
   ];

From c1ddd2353bbf3085a3b82e12edaee01d27c9e45a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 07:15:21 -0600
Subject: [PATCH 1271/3449] lumina: Fix packaging errors

---
 pkgs/desktops/lumina/default.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index f593bd144374..2c80f5157b66 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils,
-  numlockx, xorg, qt5, kde5
+{ stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
+  xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
 }:
 
 stdenv.mkDerivation rec {
@@ -14,19 +14,19 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qt5.qmakeHook
-    qt5.qttools
+    qmakeHook
+    qttools
   ];
 
   buildInputs = [
     xorg.libxcb
     xorg.xcbutilwm
     xorg.xcbutilimage
-    qt5.qtbase
-    qt5.qtsvg
-    qt5.qtmultimedia
-    qt5.qtx11extras
-    kde5.oxygen-icons5
+    qtbase
+    qtsvg
+    qtmultimedia
+    qtx11extras
+    oxygen-icons5
     fluxbox
     xscreensaver
     desktop_file_utils
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7395a60bf8b1..28bfd94d119f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16779,7 +16779,7 @@ with pkgs;
       );
     in recurseIntoAttrs self;
 
-  lumina = callPackage ../desktops/lumina { };
+  lumina = qt5.callPackage ../desktops/lumina { };
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
     inherit pkgs libsForQt5 fetchFromGitHub;

From 8eb4d2afbc1d61d316073f25f5885a46ccb37ea2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 12:25:44 -0600
Subject: [PATCH 1272/3449] Remove top-level kde5 attribute

- There is no such thing as KDE 5
---
 nixos/modules/i18n/input-method/ibus.nix      |   2 +-
 .../cd-dvd/installation-cd-graphical-kde.nix  |   2 +-
 nixos/modules/security/pam.nix                |   8 +-
 .../services/x11/desktop-managers/kde5.nix    | 245 ++++++++----------
 .../services/x11/desktop-managers/lumina.nix  |   4 +-
 pkgs/applications/audio/i-score/default.nix   |   4 +-
 .../misc/redshift-plasma-applet/default.nix   |   4 +-
 pkgs/desktops/kde-5/applications/default.nix  |  27 +-
 pkgs/desktops/kde-5/plasma/default.nix        |  18 +-
 .../libraries/kde-frameworks/default.nix      |   2 +-
 pkgs/top-level/all-packages.nix               |  65 +++--
 11 files changed, 189 insertions(+), 192 deletions(-)

diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index a5bbe6bcb559..f8e021f551e8 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -44,7 +44,7 @@ in
       panel = mkOption {
         type = with types; nullOr path;
         default = null;
-        example = literalExample "''${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
+        example = literalExample "''${pkgs.plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
         description = "Replace the IBus panel with another panel.";
       };
     };
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index c44dff3bb60d..b15aef885369 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -66,7 +66,7 @@ with lib;
   in ''
     mkdir -p /root/Desktop
     ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
-    ln -sfT ${pkgs.kde5.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
+    ln -sfT ${pkgs.kdeApplications.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
     ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
   '';
 
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index b51c8b4996be..5632500df2e0 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -280,8 +280,8 @@ let
               ${optionalString cfg.pamMount
                 "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
               ${optionalString cfg.enableKwallet
-                ("auth optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
-                 " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
+                ("auth optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+                 " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
             '') + ''
           ${optionalString cfg.unixAuth
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
@@ -349,8 +349,8 @@ let
           ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable)
               "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"}
           ${optionalString (cfg.enableKwallet)
-              ("session optional ${pkgs.kde5.kwallet-pam}/lib/security/pam_kwallet5.so" +
-               " kwalletd=${pkgs.kde5.kwallet}/bin/kwalletd5")}
+              ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
+               " kwalletd=${pkgs.libsForQt5.kwallet}/bin/kwalletd5")}
         '');
     };
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 12408abd20ad..57924a73949c 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -6,9 +6,8 @@ let
 
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.kde5;
-  xorg = pkgs.xorg;
 
-  kde5 = pkgs.kde5;
+  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
 
 in
 
@@ -46,12 +45,12 @@ in
 
   config = mkMerge [
     (mkIf (cfg.extraPackages != []) {
-      environment.systemPackages = [ (kde5.kdeWrapper cfg.extraPackages) ];
+      environment.systemPackages = [ (libsForQt5.kdeWrapper cfg.extraPackages) ];
     })
 
     (mkIf (xcfg.enable && cfg.enable) {
       services.xserver.desktopManager.session = singleton {
-        name = "kde5";
+        name = "Plasma 5";
         bgSupport = true;
         start = ''
           # Load PulseAudio module for routing support.
@@ -60,128 +59,118 @@ in
             ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
           ''}
 
-          exec "${kde5.startkde}"
+          exec "${plasma5.startkde}"
         '';
       };
 
       security.wrappers = {
-        kcheckpass.source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
-        "start_kdeinit".source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit";
+        kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
+        "start_kdeinit".source = "${libsForQt5.kinit.out}/lib/libexec/kf5/start_kdeinit";
       };
 
-      environment.systemPackages =
+      environment.systemPackages = with qt5; with libsForQt5; with plasma5; with kdeApplications;
         [
-          kde5.frameworkintegration
-          kde5.kactivities
-          kde5.kauth
-          kde5.kcmutils
-          kde5.kconfig
-          kde5.kconfigwidgets
-          kde5.kcoreaddons
-          kde5.kdbusaddons
-          kde5.kdeclarative
-          kde5.kded
-          kde5.kdesu
-          kde5.kdnssd
-          kde5.kemoticons
-          kde5.kfilemetadata
-          kde5.kglobalaccel
-          kde5.kguiaddons
-          kde5.kiconthemes
-          kde5.kidletime
-          kde5.kimageformats
-          kde5.kinit
-          kde5.kio
-          kde5.kjobwidgets
-          kde5.knewstuff
-          kde5.knotifications
-          kde5.knotifyconfig
-          kde5.kpackage
-          kde5.kparts
-          kde5.kpeople
-          kde5.krunner
-          kde5.kservice
-          kde5.ktextwidgets
-          kde5.kwallet
-          kde5.kwallet-pam
-          kde5.kwalletmanager
-          kde5.kwayland
-          kde5.kwidgetsaddons
-          kde5.kxmlgui
-          kde5.kxmlrpcclient
-          kde5.plasma-framework
-          kde5.solid
-          kde5.sonnet
-          kde5.threadweaver
+          frameworkintegration
+          kactivities
+          kauth
+          kcmutils
+          kconfig
+          kconfigwidgets
+          kcoreaddons
+          kdbusaddons
+          kdeclarative
+          kded
+          kdesu
+          kdnssd
+          kemoticons
+          kfilemetadata
+          kglobalaccel
+          kguiaddons
+          kiconthemes
+          kidletime
+          kimageformats
+          kinit
+          kio
+          kjobwidgets
+          knewstuff
+          knotifications
+          knotifyconfig
+          kpackage
+          kparts
+          kpeople
+          krunner
+          kservice
+          ktextwidgets
+          kwallet
+          kwallet-pam
+          kwalletmanager
+          kwayland
+          kwidgetsaddons
+          kxmlgui
+          kxmlrpcclient
+          plasma-framework
+          solid
+          sonnet
+          threadweaver
 
-          kde5.breeze-qt5
-          kde5.kactivitymanagerd
-          kde5.kde-cli-tools
-          kde5.kdecoration
-          kde5.kdeplasma-addons
-          kde5.kgamma5
-          kde5.khotkeys
-          kde5.kinfocenter
-          kde5.kmenuedit
-          kde5.kscreen
-          kde5.kscreenlocker
-          kde5.ksysguard
-          kde5.kwayland
-          kde5.kwin
-          kde5.kwrited
-          kde5.libkscreen
-          kde5.libksysguard
-          kde5.milou
-          kde5.plasma-integration
-          kde5.polkit-kde-agent
-          kde5.systemsettings
+          breeze-qt5
+          kactivitymanagerd
+          kde-cli-tools
+          kdecoration
+          kdeplasma-addons
+          kgamma5
+          khotkeys
+          kinfocenter
+          kmenuedit
+          kscreen
+          kscreenlocker
+          ksysguard
+          kwayland
+          kwin
+          kwrited
+          libkscreen
+          libksysguard
+          milou
+          plasma-integration
+          polkit-kde-agent
+          systemsettings
 
-          kde5.plasma-desktop
-          kde5.plasma-workspace
-          kde5.plasma-workspace-wallpapers
+          plasma-desktop
+          plasma-workspace
+          plasma-workspace-wallpapers
 
-          kde5.dolphin-plugins
-          kde5.ffmpegthumbs
-          kde5.kdegraphics-thumbnailers
-          kde5.kio-extras
-          kde5.print-manager
+          dolphin-plugins
+          ffmpegthumbs
+          kdegraphics-thumbnailers
+          kio-extras
+          print-manager
 
-          # Install Breeze icons if available
-          (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons)
+          breeze-icons
           pkgs.hicolor_icon_theme
 
-          kde5.kde-gtk-config kde5.breeze-gtk
+          kde-gtk-config breeze-gtk
 
-          pkgs.qt5.phonon-backend-gstreamer
+          phonon-backend-gstreamer
         ]
 
-        # Plasma 5.5 and later has a Breeze GTK theme.
-        # If it is not available, Orion is very similar to Breeze.
-        ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion
-
-        # Install activity manager if available
-        ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd
-
-        # frameworkintegration was split with plasma-integration in Plasma 5.6
-        ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration
-
-        ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ]
+        ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
 
         # Optional hardware support features
-        ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
-        ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
-        ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
-        ++ lib.optional config.powerManagement.enable kde5.powerdevil
-        ++ lib.optional config.services.colord.enable pkgs.colord-kde
-        ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
+        ++ lib.optional config.hardware.bluetooth.enable bluedevil
+        ++ lib.optional config.networking.networkmanager.enable plasma-nm
+        ++ lib.optional config.hardware.pulseaudio.enable plasma-pa
+        ++ lib.optional config.powerManagement.enable powerdevil
+        ++ lib.optional config.services.colord.enable colord-kde
+        ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
 
       services.xserver.desktopManager.kde5.extraPackages =
+        with kdeApplications; with plasma5;
         [
-          kde5.khelpcenter
-          kde5.oxygen
+          khelpcenter
+          oxygen
 
-          kde5.dolphin
-          kde5.konsole
+          dolphin
+          konsole
         ];
 
       environment.pathsToLink = [ "/share" ];
@@ -191,30 +180,24 @@ in
         target = "X11/xkb";
       };
 
-      environment.variables =
-        {
-          # Enable GTK applications to load SVG icons
-          GST_PLUGIN_SYSTEM_PATH_1_0 =
-            lib.makeSearchPath "/lib/gstreamer-1.0"
-            (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
-              gstreamer
-              gst-plugins-base
-              gst-plugins-good
-              gst-plugins-ugly
-              gst-plugins-bad
-              gst-libav # for mp3 playback
-            ]));
-        }
-        // (if (lib.hasAttr "breeze-icons" kde5)
-            then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
-            else { });
+      environment.variables = {
+        # Enable GTK applications to load SVG icons
+        GST_PLUGIN_SYSTEM_PATH_1_0 =
+          lib.makeSearchPath "/lib/gstreamer-1.0"
+          (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
+            gstreamer
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-bad
+            gst-libav # for mp3 playback
+          ]));
+        GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
+      };
 
-      fonts.fonts = [
-        (kde5.oxygen-fonts or pkgs.noto-fonts)
-        pkgs.hack-font
-      ];
+      fonts.fonts = with pkgs; [ noto-fonts hack-font ];
 
-      programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
+      programs.ssh.askPassword = "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
 
       # Enable helpful DBus services.
       services.udisks2.enable = true;
@@ -230,10 +213,10 @@ in
 
       services.xserver.displayManager.sddm = {
         theme = "breeze";
-        themes = [
-          kde5.ecm # for the setup-hook
-          kde5.plasma-workspace
-          kde5.breeze-icons
+        themes = with libsForQt5; with plasma5; [
+          ecm # for the setup-hook
+          plasma-workspace
+          breeze-icons
         ];
       };
 
@@ -250,7 +233,7 @@ in
       # use kimpanel as the default IBus panel
       i18n.inputMethod.ibus.panel =
         lib.mkDefault
-        "${pkgs.kde5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
+        "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
 
     })
   ];
diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index f0b31a2acb01..ed5ad4a2a001 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -32,8 +32,8 @@ in
 
     environment.systemPackages = [
       pkgs.fluxbox
-      pkgs.kde5.kwindowsystem
-      pkgs.kde5.oxygen-icons5
+      pkgs.qt5.kwindowsystem
+      pkgs.qt5.oxygen-icons5
       pkgs.lumina
       pkgs.numlockx
       pkgs.qt5.qtsvg
diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix
index e3ebc5fde08e..1a47b74e21c7 100644
--- a/pkgs/applications/audio/i-score/default.nix
+++ b/pkgs/applications/audio/i-score/default.nix
@@ -6,7 +6,7 @@
   gcc,
   ginac,
   jamomacore,
-  kde5,
+  kdnssd,
   libsndfile,
   ninja,
   portaudio,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     ginac
     gcc
     jamomacore
-    kde5.kdnssd
+    kdnssd
     libsndfile
     ninja
     portaudio
diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix
index 3cf6f7d754be..fe09f7ff16ea 100644
--- a/pkgs/applications/misc/redshift-plasma-applet/default.nix
+++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, cmake, kde5, redshift, fetchFromGitHub, ... }:
+{ stdenv, cmake, plasma-framework, redshift, fetchFromGitHub, }:
 
 let version = "1.0.17"; in
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     cmake
-    kde5.plasma-framework
+    plasma-framework
   ];
 
 
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index 3284b2709c86..a53bbedc2c54 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -20,31 +20,34 @@ still shows most of the available features is in `./gwenview.nix`.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
    from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, libsForQt5, fetchurl,
+  plasma5,
+  attica, phonon,
+  debug ? false,
+}:
 
 let
 
-  inherit (pkgs) lib stdenv;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
   packages = self: with self; {
 
     kdeApp = import ./kde-app.nix {
       inherit lib;
       inherit debug srcs;
-      inherit kdeDerivation;
+      inherit (libsForQt5) kdeDerivation;
     };
 
     kdelibs = callPackage ./kdelibs {
       inherit (srcs.kdelibs) src version;
-      inherit (pkgs) attica phonon;
+      inherit attica phonon;
     };
 
     akonadi = callPackage ./akonadi.nix {};
@@ -54,9 +57,7 @@ let
     baloo-widgets = callPackage ./baloo-widgets.nix {};
     dolphin = callPackage ./dolphin.nix {};
     dolphin-plugins = callPackage ./dolphin-plugins.nix {};
-    ffmpegthumbs = callPackage ./ffmpegthumbs.nix {
-      ffmpeg = pkgs.ffmpeg_2;
-    };
+    ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
     filelight = callPackage ./filelight.nix {};
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
@@ -85,9 +86,11 @@ let
     okteta = callPackage ./okteta.nix {};
     okular = callPackage ./okular.nix {};
     print-manager = callPackage ./print-manager.nix {};
-    spectacle = callPackage ./spectacle.nix {};
+    spectacle = callPackage ./spectacle.nix {
+      inherit (plasma5) kscreen;
+    };
 
     l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
   };
 
-in packages
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index 3ac1c51848e9..e42a543ea23d 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -19,19 +19,21 @@ existing packages here and modify it as necessary.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
    from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
+  gconf,
+  debug ? false,
+}:
 
 let
 
-  inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
   packages = self: with self; {
     plasmaPackage = args:
@@ -39,7 +41,7 @@ let
         inherit (args) name;
         sname = args.sname or name;
         inherit (srcs."${sname}") src version;
-      in kdeDerivation (args // {
+      in libsForQt5.kdeDerivation (args // {
         name = "${name}-${version}";
         inherit src;
 
@@ -86,7 +88,7 @@ let
     plasma-integration = callPackage ./plasma-integration.nix {};
     plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {
-      inherit (pkgs.gnome3) gconf;
+      inherit gconf;
     };
     plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
@@ -96,4 +98,4 @@ let
     systemsettings = callPackage ./systemsettings.nix {};
   };
 
-in packages
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ac6b319a0ddd..a4e64aaee41e 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -19,7 +19,7 @@ existing packages here and modify it as necessary.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks`
    from the top of the Nixpkgs tree.
-3. Invoke `nix-build -A kde5` and ensure that everything builds.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28bfd94d119f..27f6dce1cde1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7846,7 +7846,7 @@ with pkgs;
 
   judy = callPackage ../development/libraries/judy { };
 
-  kdelibs4 = kde5.applications.kdelibs;
+  kdelibs4 = kdeApplications.kdelibs;
 
   keybinder = callPackage ../development/libraries/keybinder {
     automake = automake111x;
@@ -12791,7 +12791,7 @@ with pkgs;
 
   calligra = kde4.callPackage ../applications/office/calligra {
     vc = vc_0_7;
-    oxygen_icons = kde5.oxygen-icons5;
+    oxygen_icons = libsForQt5.oxygen-icons5;
   };
 
   camlistore = callPackage ../applications/misc/camlistore { };
@@ -14048,17 +14048,29 @@ with pkgs;
 
   kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
+  kdeApplications = import ../desktops/kde-5/applications {
+    inherit stdenv lib libsForQt5 fetchurl;
+    inherit plasma5;
+    inherit attica phonon;
+  };
+
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
-  kdecoration-viewer = kde5.callPackage ../tools/misc/kdecoration-viewer {};
+  kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer {
+    inherit (plasma5) kdecoration;
+  };
 
-  kdevelop-pg-qt = kde5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
+  kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
 
-  kdevelop = kde5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
+  kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
+    inherit (kdeApplications) konsole;
+    inherit (plasma5) libksysguard;
     llvmPackages = llvmPackages_38;
   };
 
-  kdevplatform = kde5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {};
+  kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {
+    inherit (kdeApplications) libkomparediff2;
+  };
 
   keepnote = callPackage ../applications/office/keepnote { };
 
@@ -14080,14 +14092,18 @@ with pkgs;
     qt = qt4;
   };
 
-  kile = kde5.callPackage ../applications/editors/kile { };
+  kile = libsForQt5.callPackage ../applications/editors/kile {
+    inherit (kdeApplications) konsole;
+  };
 
   kino = callPackage ../applications/video/kino {
     inherit (gnome2) libglade;
     ffmpeg = ffmpeg_2;
   };
 
-  kipi-plugins = kde5.callPackage ../applications/graphics/kipi-plugins {};
+  kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins {
+    inherit (kdeApplications) libkipi;
+  };
 
   kiwix = callPackage ../applications/misc/kiwix {
     stdenv = overrideCC stdenv gcc49;
@@ -16050,7 +16066,9 @@ with pkgs;
 
   yabar = callPackage ../applications/window-managers/yabar { };
 
-  yakuake = kde5.callPackage ../applications/misc/yakuake {};
+  yakuake = libsForQt5.callPackage ../applications/misc/yakuake {
+    inherit (kdeApplications) konsole;
+  };
 
   yarp = callPackage ../applications/science/robotics/yarp {};
 
@@ -16210,7 +16228,9 @@ with pkgs;
 
   dhewm3 = callPackage ../games/dhewm3 {};
 
-  digikam = kde5.callPackage ../applications/graphics/digikam {
+  digikam = libsForQt5.callPackage ../applications/graphics/digikam {
+    inherit (kdeApplications) libkipi marble;
+    inherit (plasma5) oxygen;
     boost = boost160;
   };
 
@@ -16779,7 +16799,7 @@ with pkgs;
       );
     in recurseIntoAttrs self;
 
-  lumina = qt5.callPackage ../desktops/lumina { };
+  lumina = libsForQt5.callPackage ../desktops/lumina { };
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
     inherit pkgs libsForQt5 fetchFromGitHub;
@@ -16795,11 +16815,16 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
+  plasma5 = import ../desktops/kde-5/plasma {
+    inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
+    inherit (gnome3) gconf;
+  };
+
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg;
   };
 
-  redshift-plasma-applet = callPackage ../applications/misc/redshift-plasma-applet { };
+  redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };
 
   orion = callPackage ../misc/themes/orion {};
 
@@ -16813,22 +16838,6 @@ with pkgs;
 
   numix-gtk-theme = callPackage ../misc/themes/numix { };
 
-  kde5 =
-    let
-      plasma = import ../desktops/kde-5/plasma { inherit pkgs; };
-      applications = import ../desktops/kde-5/applications { inherit pkgs; };
-      merged = self:
-        {
-          plasma = plasma self;
-          frameworks = libsForQt5.kdeFrameworks;
-          applications = applications self;
-        }
-        // libsForQt5.kdeFrameworks
-        // plasma self
-        // applications self;
-    in
-      recurseIntoAttrs (lib.makeScope libsForQt5.newScope merged);
-
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {

From 7f84ad5f4c4a2aac98ebb2f4a37a02915e357939 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 13:35:00 -0600
Subject: [PATCH 1273/3449] plasma5: Move to desktops/plasma-5

---
 pkgs/desktops/{kde-5/plasma => plasma-5}/bluedevil.nix        | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-grub.nix      | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-gtk.nix       | 0
 .../{kde-5/plasma => plasma-5}/breeze-plymouth/default.nix    | 0
 .../plasma => plasma-5}/breeze-plymouth/install-paths.patch   | 0
 .../{kde-5/plasma => plasma-5}/breeze-plymouth/series         | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt4.nix       | 4 ++--
 pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt5.nix       | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/default.nix          | 2 +-
 pkgs/desktops/{kde-5/plasma => plasma-5}/fetch.sh             | 0
 .../desktops/{kde-5/plasma => plasma-5}/kactivitymanagerd.nix | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kde-cli-tools.nix    | 0
 .../kde-gtk-config/0001-follow-symlinks.patch                 | 0
 .../{kde-5/plasma => plasma-5}/kde-gtk-config/default.nix     | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kdecoration.nix      | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kdeplasma-addons.nix | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kgamma5.nix          | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/khotkeys.nix         | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kinfocenter.nix      | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kmenuedit.nix        | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kscreen.nix          | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kscreenlocker.nix    | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/ksshaskpass.nix      | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/ksysguard.nix        | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kwallet-pam.nix      | 0
 .../{kde-5/plasma => plasma-5}/kwayland-integration.nix       | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/default.nix     | 0
 .../{kde-5/plasma => plasma-5}/kwin/follow-symlinks.patch     | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/series          | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/xwayland.patch  | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/kwrited.nix          | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/libkscreen.nix       | 0
 .../libksysguard/0001-qdiriterator-follow-symlinks.patch      | 0
 .../{kde-5/plasma => plasma-5}/libksysguard/default.nix       | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/milou.nix            | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/oxygen.nix           | 0
 .../{kde-5/plasma => plasma-5}/plasma-desktop/default.nix     | 0
 .../plasma => plasma-5}/plasma-desktop/hwclock-path.patch     | 0
 .../{kde-5/plasma => plasma-5}/plasma-desktop/ibus.patch      | 0
 .../plasma => plasma-5}/plasma-desktop/qml-import-paths.patch | 0
 .../desktops/{kde-5/plasma => plasma-5}/plasma-desktop/series | 0
 .../{kde-5/plasma => plasma-5}/plasma-desktop/tzdir.patch     | 0
 .../{kde-5/plasma => plasma-5}/plasma-integration.nix         | 0
 .../plasma-nm/0001-mobile-broadband-provider-info-path.patch  | 0
 .../desktops/{kde-5/plasma => plasma-5}/plasma-nm/default.nix | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-pa.nix        | 0
 .../plasma => plasma-5}/plasma-workspace-wallpapers.nix       | 0
 .../{kde-5/plasma => plasma-5}/plasma-workspace/default.nix   | 0
 .../plasma-workspace/qml-import-path.patch                    | 0
 .../{kde-5/plasma => plasma-5}/plasma-workspace/series        | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/polkit-kde-agent.nix | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/powerdevil.nix       | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/srcs.nix             | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/default.nix | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/startkde.sh | 0
 pkgs/desktops/{kde-5/plasma => plasma-5}/systemsettings.nix   | 0
 pkgs/top-level/all-packages.nix                               | 2 +-
 57 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/bluedevil.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-grub.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-gtk.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-plymouth/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-plymouth/install-paths.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-plymouth/series (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt4.nix (89%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt5.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/default.nix (97%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/fetch.sh (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kactivitymanagerd.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kde-cli-tools.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kde-gtk-config/0001-follow-symlinks.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kde-gtk-config/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kdecoration.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kdeplasma-addons.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kgamma5.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/khotkeys.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kinfocenter.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kmenuedit.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kscreen.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kscreenlocker.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/ksshaskpass.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/ksysguard.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwallet-pam.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwayland-integration.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/follow-symlinks.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/series (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/xwayland.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwrited.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/libkscreen.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/libksysguard/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/milou.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/oxygen.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/hwclock-path.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/ibus.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/qml-import-paths.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/series (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/tzdir.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-integration.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-nm/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-pa.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace-wallpapers.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace/qml-import-path.patch (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace/series (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/polkit-kde-agent.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/powerdevil.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/srcs.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/default.nix (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/startkde.sh (100%)
 rename pkgs/desktops/{kde-5/plasma => plasma-5}/systemsettings.nix (100%)

diff --git a/pkgs/desktops/kde-5/plasma/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/bluedevil.nix
rename to pkgs/desktops/plasma-5/bluedevil.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-grub.nix
rename to pkgs/desktops/plasma-5/breeze-grub.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-gtk.nix
rename to pkgs/desktops/plasma-5/breeze-gtk.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix
rename to pkgs/desktops/plasma-5/breeze-plymouth/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch b/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch
rename to pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series b/pkgs/desktops/plasma-5/breeze-plymouth/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/series
rename to pkgs/desktops/plasma-5/breeze-plymouth/series
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
similarity index 89%
rename from pkgs/desktops/kde-5/plasma/breeze-qt4.nix
rename to pkgs/desktops/plasma-5/breeze-qt4.nix
index ad98a41e81dd..b97554cd4044 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -1,7 +1,7 @@
 {
   stdenv, lib, src, version,
   automoc4, cmake, perl, pkgconfig,
-  kdelibs, qt4, xproto
+  kdelibs4, qt4, xproto
 }:
 
 stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     homepage = "http://www.kde.org";
   };
   inherit src;
-  buildInputs = [ kdelibs qt4 xproto ];
+  buildInputs = [ kdelibs4 qt4 xproto ];
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
   cmakeFlags = [
     "-DUSE_KDE4=ON"
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/breeze-qt5.nix
rename to pkgs/desktops/plasma-5/breeze-qt5.nix
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/plasma-5/default.nix
similarity index 97%
rename from pkgs/desktops/kde-5/plasma/default.nix
rename to pkgs/desktops/plasma-5/default.nix
index e42a543ea23d..683154273ae6 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -17,7 +17,7 @@ existing packages here and modify it as necessary.
 # Updates
 
 1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
    from the top of the Nixpkgs tree.
 3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/fetch.sh
rename to pkgs/desktops/plasma-5/fetch.sh
diff --git a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
rename to pkgs/desktops/plasma-5/kactivitymanagerd.nix
diff --git a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
rename to pkgs/desktops/plasma-5/kde-cli-tools.nix
diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
rename to pkgs/desktops/plasma-5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kdecoration.nix
rename to pkgs/desktops/plasma-5/kdecoration.nix
diff --git a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
rename to pkgs/desktops/plasma-5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/kde-5/plasma/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kgamma5.nix
rename to pkgs/desktops/plasma-5/kgamma5.nix
diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/khotkeys.nix
rename to pkgs/desktops/plasma-5/khotkeys.nix
diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kinfocenter.nix
rename to pkgs/desktops/plasma-5/kinfocenter.nix
diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kmenuedit.nix
rename to pkgs/desktops/plasma-5/kmenuedit.nix
diff --git a/pkgs/desktops/kde-5/plasma/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kscreen.nix
rename to pkgs/desktops/plasma-5/kscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kscreenlocker.nix
rename to pkgs/desktops/plasma-5/kscreenlocker.nix
diff --git a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/ksshaskpass.nix
rename to pkgs/desktops/plasma-5/ksshaskpass.nix
diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/ksysguard.nix
rename to pkgs/desktops/plasma-5/ksysguard.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwallet-pam.nix
rename to pkgs/desktops/plasma-5/kwallet-pam.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwayland-integration.nix
rename to pkgs/desktops/plasma-5/kwayland-integration.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwin/default.nix
rename to pkgs/desktops/plasma-5/kwin/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch
rename to pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/kwin/series b/pkgs/desktops/plasma-5/kwin/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwin/series
rename to pkgs/desktops/plasma-5/kwin/series
diff --git a/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwin/xwayland.patch
rename to pkgs/desktops/plasma-5/kwin/xwayland.patch
diff --git a/pkgs/desktops/kde-5/plasma/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/kwrited.nix
rename to pkgs/desktops/plasma-5/kwrited.nix
diff --git a/pkgs/desktops/kde-5/plasma/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/libkscreen.nix
rename to pkgs/desktops/plasma-5/libkscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/libksysguard/default.nix
rename to pkgs/desktops/plasma-5/libksysguard/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/milou.nix b/pkgs/desktops/plasma-5/milou.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/milou.nix
rename to pkgs/desktops/plasma-5/milou.nix
diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/oxygen.nix
rename to pkgs/desktops/plasma-5/oxygen.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
rename to pkgs/desktops/plasma-5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/series
rename to pkgs/desktops/plasma-5/plasma-desktop/series
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch b/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch
rename to pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-integration.nix
rename to pkgs/desktops/plasma-5/plasma-integration.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
rename to pkgs/desktops/plasma-5/plasma-nm/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-pa.nix
rename to pkgs/desktops/plasma-5/plasma-pa.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
rename to pkgs/desktops/plasma-5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/series b/pkgs/desktops/plasma-5/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/plasma-workspace/series
rename to pkgs/desktops/plasma-5/plasma-workspace/series
diff --git a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
rename to pkgs/desktops/plasma-5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/kde-5/plasma/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/powerdevil.nix
rename to pkgs/desktops/plasma-5/powerdevil.nix
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/srcs.nix
rename to pkgs/desktops/plasma-5/srcs.nix
diff --git a/pkgs/desktops/kde-5/plasma/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/startkde/default.nix
rename to pkgs/desktops/plasma-5/startkde/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/startkde/startkde.sh
rename to pkgs/desktops/plasma-5/startkde/startkde.sh
diff --git a/pkgs/desktops/kde-5/plasma/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma/systemsettings.nix
rename to pkgs/desktops/plasma-5/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27f6dce1cde1..76bca8050525 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16815,7 +16815,7 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
-  plasma5 = import ../desktops/kde-5/plasma {
+  plasma5 = import ../desktops/plasma-5 {
     inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
     inherit (gnome3) gconf;
   };

From e39a4597ce3eb209b1d3672cc0433785df93db88 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 13:44:57 -0600
Subject: [PATCH 1274/3449] mkLibsForQt5: remove kdeFrameworks attribute

---
 .../libraries/kde-frameworks/default.nix           | 14 ++++++++------
 pkgs/top-level/all-packages.nix                    |  8 ++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index a4e64aaee41e..cb73bbddda7e 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,16 +24,18 @@ existing packages here and modify it as necessary.
 
 */
 
-{ pkgs, debug ? false }:
+{
+  stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
+  callPackage,
+  debug ? false
+}:
 
 let
 
-  inherit (pkgs) lib makeSetupHook stdenv;
-
   mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
 
-  packages = self: with self; {
+  packages = rec {
 
     kdeDerivation = args:
       let
@@ -69,7 +71,7 @@ let
       });
 
     kdeWrapper = import ./kde-wrapper.nix {
-      inherit (pkgs) stdenv lib makeWrapper buildEnv;
+      inherit stdenv lib makeWrapper buildEnv;
     };
 
     attica = callPackage ./attica.nix {};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76bca8050525..bb9f348e87ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9336,12 +9336,12 @@ with pkgs;
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 
   mkLibsForQt5 = self: with self;
-    let kdeFrameworks =
-          import ../development/libraries/kde-frameworks { inherit pkgs; } self;
+    let kdeFrameworks = import ../development/libraries/kde-frameworks {
+          inherit stdenv lib makeSetupHook makeWrapper fetchurl buildEnv;
+          inherit (self) callPackage;
+        };
     in {
 
-    inherit kdeFrameworks;
-
     accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };

From c650dc8bd7b62bcbeb640657a9408f152b278f3e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 13:47:52 -0600
Subject: [PATCH 1275/3449] kirigami_2: Do not mix Qt versions!

---
 pkgs/development/libraries/kirigami/v2.nix | 1 +
 pkgs/top-level/all-packages.nix            | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix
index 8476eebfd501..7dc6e799bcf8 100644
--- a/pkgs/development/libraries/kirigami/v2.nix
+++ b/pkgs/development/libraries/kirigami/v2.nix
@@ -19,5 +19,6 @@ stdenv.mkDerivation rec {
     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 bb9f348e87ea..c3e02816e498 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9350,10 +9350,7 @@ with pkgs;
 
     kirigami_1 = callPackage ../development/libraries/kirigami { };
 
-    kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix {
-      # kirigami v2 requires qt 5.7 and above
-      inherit (qt57) qtbase qtquickcontrols2;
-    };
+    kirigami_2 = callPackage ../development/libraries/kirigami/v2.nix { };
 
     kirigami = kirigami_1;
 

From a33ab04d1b7ab4e8df867e8e05cb5b55222d5fe5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 13:54:09 -0600
Subject: [PATCH 1276/3449] Clean up KDE Frameworks

---
 .../libraries/kde-frameworks/default.nix      | 12 ++--------
 .../extra-cmake-modules/default.nix           | 22 ++++---------------
 .../extra-cmake-modules/no-hooks.nix          | 18 +++++++++++++++
 .../{ => extra-cmake-modules}/setup-hook.sh   |  0
 4 files changed, 24 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix
 rename pkgs/development/libraries/kde-frameworks/{ => extra-cmake-modules}/setup-hook.sh (100%)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index cb73bbddda7e..ffb8fb04078b 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -78,16 +78,8 @@ let
     baloo = callPackage ./baloo.nix {};
     bluez-qt = callPackage ./bluez-qt.nix {};
     breeze-icons = callPackage ./breeze-icons.nix {};
-    # FIXME: this collides with the "ecm" package.
-    ecm =
-      let drv = { cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
-            makeSetupHook
-            { deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ]; }
-            ./setup-hook.sh;
-      in callPackage drv {};
-    ecmNoHooks = callPackage ./extra-cmake-modules {
-      inherit (srcs.extra-cmake-modules) src version;
-    };
+    ecm = callPackage ./extra-cmake-modules {};
+    ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix {};
     frameworkintegration = callPackage ./frameworkintegration.nix {};
     kactivities = callPackage ./kactivities.nix {};
     kactivities-stats = callPackage ./kactivities-stats.nix {};
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 d2f1688e330b..6c0919a23619 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -1,20 +1,6 @@
-{ stdenv, lib, copyPathsToStore, src, version, cmake }:
+{ makeSetupHook, lib, cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
 
-stdenv.mkDerivation {
-  name = "extra-cmake-modules-${version}";
-
-  inherit src;
-
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
-  outputs = [ "out" ];  # this package has no runtime components
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.ttuegel ];
-  };
+makeSetupHook {
+  deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ];
 }
+./setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix
new file mode 100644
index 000000000000..855d6bdb3d25
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, copyPathsToStore, cmake }:
+
+kdeFramework {
+  name = "extra-cmake-modules";
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with lib; {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks/setup-hook.sh
rename to pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh

From d446303d0bab3675d1d30fc9a75f17904780c360 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 14:03:43 -0600
Subject: [PATCH 1277/3449] Move kdeDerivation out of kdeFrameworks

---
 pkgs/build-support/kde/derivation.nix          | 17 +++++++++++++++++
 pkgs/desktops/kde-5/applications/default.nix   |  5 ++---
 pkgs/desktops/plasma-5/default.nix             |  4 ++--
 .../libraries/kde-frameworks/default.nix       | 18 +-----------------
 pkgs/top-level/all-packages.nix                | 11 +++++++++--
 5 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/build-support/kde/derivation.nix

diff --git a/pkgs/build-support/kde/derivation.nix b/pkgs/build-support/kde/derivation.nix
new file mode 100644
index 000000000000..2e29a0a661e1
--- /dev/null
+++ b/pkgs/build-support/kde/derivation.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, debug ? false }:
+
+args:
+
+stdenv.mkDerivation (args // {
+
+  outputs = args.outputs or [ "out" "dev" ];
+
+  propagatedUserEnvPkgs =
+    builtins.map lib.getBin (args.propagatedBuildInputs or []);
+
+  cmakeFlags =
+    (args.cmakeFlags or [])
+    ++ [ "-DBUILD_TESTING=OFF" ]
+    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+})
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index a53bbedc2c54..832b88c7e803 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -27,7 +27,7 @@ still shows most of the available features is in `./gwenview.nix`.
 
 {
   stdenv, lib, libsForQt5, fetchurl,
-  plasma5,
+  kdeDerivation, plasma5,
   attica, phonon,
   debug ? false,
 }:
@@ -40,9 +40,8 @@ let
   packages = self: with self; {
 
     kdeApp = import ./kde-app.nix {
-      inherit lib;
+      inherit lib kdeDerivation;
       inherit debug srcs;
-      inherit (libsForQt5) kdeDerivation;
     };
 
     kdelibs = callPackage ./kdelibs {
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 683154273ae6..b240ef7496c6 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -26,7 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
-  gconf,
+  gconf, kdeDerivation,
   debug ? false,
 }:
 
@@ -41,7 +41,7 @@ let
         inherit (args) name;
         sname = args.sname or name;
         inherit (srcs."${sname}") src version;
-      in libsForQt5.kdeDerivation (args // {
+      in kdeDerivation (args // {
         name = "${name}-${version}";
         inherit src;
 
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index ffb8fb04078b..1ce3d62cf169 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -26,7 +26,7 @@ existing packages here and modify it as necessary.
 
 {
   stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
-  callPackage,
+  kdeDerivation, callPackage,
   debug ? false
 }:
 
@@ -37,22 +37,6 @@ let
 
   packages = rec {
 
-    kdeDerivation = args:
-      let
-      in stdenv.mkDerivation (args // {
-
-        outputs = args.outputs or [ "out" "dev" ];
-
-        propagatedUserEnvPkgs =
-          builtins.map lib.getBin (args.propagatedBuildInputs or []);
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-      });
-
     kdeFramework = args:
       let
         inherit (args) name;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3e02816e498..7edbbf3b1f7f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -269,6 +269,8 @@ with pkgs;
       inherit kernel rootModules allowMissing;
     };
 
+  kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; };
+
   nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;
@@ -9337,11 +9339,15 @@ with pkgs;
 
   mkLibsForQt5 = self: with self;
     let kdeFrameworks = import ../development/libraries/kde-frameworks {
-          inherit stdenv lib makeSetupHook makeWrapper fetchurl buildEnv;
+          inherit stdenv lib kdeDerivation makeSetupHook makeWrapper fetchurl buildEnv;
           inherit (self) callPackage;
         };
     in {
 
+    ### BUILD SUPPORT
+
+    ### LIBRARIES
+
     accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
@@ -14047,7 +14053,7 @@ with pkgs;
 
   kdeApplications = import ../desktops/kde-5/applications {
     inherit stdenv lib libsForQt5 fetchurl;
-    inherit plasma5;
+    inherit kdeDerivation plasma5;
     inherit attica phonon;
   };
 
@@ -16814,6 +16820,7 @@ with pkgs;
 
   plasma5 = import ../desktops/plasma-5 {
     inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
+    inherit kdeDerivation;
     inherit (gnome3) gconf;
   };
 

From 68e0bc38a2cc09985ef5dde22c200010349ed731 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 14:05:22 -0600
Subject: [PATCH 1278/3449] Move kdeWrapper out of kdeFrameworks

---
 .../kde-wrapper.nix => build-support/kde/wrapper.nix}         | 0
 pkgs/development/libraries/kde-frameworks/default.nix         | 4 ----
 pkgs/top-level/all-packages.nix                               | 4 ++++
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/{development/libraries/kde-frameworks/kde-wrapper.nix => build-support/kde/wrapper.nix} (100%)

diff --git a/pkgs/development/libraries/kde-frameworks/kde-wrapper.nix b/pkgs/build-support/kde/wrapper.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks/kde-wrapper.nix
rename to pkgs/build-support/kde/wrapper.nix
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 1ce3d62cf169..c5484dd6e8d4 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -54,10 +54,6 @@ let
         } // (args.meta or {});
       });
 
-    kdeWrapper = import ./kde-wrapper.nix {
-      inherit stdenv lib makeWrapper buildEnv;
-    };
-
     attica = callPackage ./attica.nix {};
     baloo = callPackage ./baloo.nix {};
     bluez-qt = callPackage ./bluez-qt.nix {};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7edbbf3b1f7f..15db1a7d7a6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -271,6 +271,10 @@ with pkgs;
 
   kdeDerivation = import ../build-support/kde/derivation.nix { inherit stdenv lib; };
 
+  kdeWrapper = import ../build-support/kde/wrapper.nix {
+    inherit stdenv lib makeWrapper buildEnv;
+  };
+
   nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;

From fca3f2e661fa659dc9008338b19531ad6d67c17a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 14:22:26 -0600
Subject: [PATCH 1279/3449] kdeFrameworks: Hide internal kdeFramework deriver

---
 .../build-support/framework.nix               |  24 +++
 .../libraries/kde-frameworks/default.nix      | 184 ++++++++----------
 pkgs/top-level/all-packages.nix               |   4 +-
 3 files changed, 107 insertions(+), 105 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/build-support/framework.nix

diff --git a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
new file mode 100644
index 000000000000..5b6f2cc4b26d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
@@ -0,0 +1,24 @@
+{ kdeDerivation, lib, fetchurl }:
+
+let
+  mirror = "mirror://kde";
+  srcs = import ../srcs.nix { inherit fetchurl mirror; };
+in
+
+args:
+
+let
+  inherit (args) name;
+  inherit (srcs."${name}") src version;
+in kdeDerivation (args // {
+  name = "${name}-${version}";
+  inherit src;
+
+  meta = {
+    license = with lib.licenses; [
+      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+    ];
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+  } // (args.meta or {});
+})
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index c5484dd6e8d4..00965bd0a582 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,109 +24,87 @@ existing packages here and modify it as necessary.
 
 */
 
-{
-  stdenv, lib, makeSetupHook, makeWrapper, fetchurl, buildEnv,
-  kdeDerivation, callPackage,
-  debug ? false
-}:
+{ newScope, kdeDerivation, lib, fetchurl }:
 
 let
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  packages = rec {
-
-    kdeFramework = args:
-      let
-        inherit (args) name;
-        inherit (srcs."${name}") src version;
-      in kdeDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    attica = callPackage ./attica.nix {};
-    baloo = callPackage ./baloo.nix {};
-    bluez-qt = callPackage ./bluez-qt.nix {};
-    breeze-icons = callPackage ./breeze-icons.nix {};
-    ecm = callPackage ./extra-cmake-modules {};
-    ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix {};
-    frameworkintegration = callPackage ./frameworkintegration.nix {};
-    kactivities = callPackage ./kactivities.nix {};
-    kactivities-stats = callPackage ./kactivities-stats.nix {};
-    kapidox = callPackage ./kapidox.nix {};
-    karchive = callPackage ./karchive.nix {};
-    kauth = callPackage ./kauth {};
-    kbookmarks = callPackage ./kbookmarks.nix {};
-    kcmutils = callPackage ./kcmutils {};
-    kcodecs = callPackage ./kcodecs.nix {};
-    kcompletion = callPackage ./kcompletion.nix {};
-    kconfig = callPackage ./kconfig.nix {};
-    kconfigwidgets = callPackage ./kconfigwidgets {};
-    kcoreaddons = callPackage ./kcoreaddons.nix {};
-    kcrash = callPackage ./kcrash.nix {};
-    kdbusaddons = callPackage ./kdbusaddons.nix {};
-    kdeclarative = callPackage ./kdeclarative.nix {};
-    kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support {};
-    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-    kdesu = callPackage ./kdesu.nix {};
-    kdnssd = callPackage ./kdnssd.nix {};
-    kdoctools = callPackage ./kdoctools {};
-    kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata {};
-    kglobalaccel = callPackage ./kglobalaccel.nix {};
-    kguiaddons = callPackage ./kguiaddons.nix {};
-    khtml = callPackage ./khtml.nix {};
-    ki18n = callPackage ./ki18n.nix {};
-    kiconthemes = callPackage ./kiconthemes {};
-    kidletime = callPackage ./kidletime.nix {};
-    kimageformats = callPackage ./kimageformats.nix {};
-    kinit = callPackage ./kinit {};
-    kio = callPackage ./kio {};
-    kitemmodels = callPackage ./kitemmodels.nix {};
-    kitemviews = callPackage ./kitemviews.nix {};
-    kjobwidgets = callPackage ./kjobwidgets.nix {};
-    kjs = callPackage ./kjs.nix {};
-    kjsembed = callPackage ./kjsembed.nix {};
-    kmediaplayer = callPackage ./kmediaplayer.nix {};
-    knewstuff = callPackage ./knewstuff.nix {};
-    knotifications = callPackage ./knotifications.nix {};
-    knotifyconfig = callPackage ./knotifyconfig.nix {};
-    kpackage = callPackage ./kpackage {};
-    kparts = callPackage ./kparts.nix {};
-    kpeople = callPackage ./kpeople.nix {};
-    kplotting = callPackage ./kplotting.nix {};
-    kpty = callPackage ./kpty.nix {};
-    kross = callPackage ./kross.nix {};
-    krunner = callPackage ./krunner.nix {};
-    kservice = callPackage ./kservice {};
-    ktexteditor = callPackage ./ktexteditor.nix {};
-    ktextwidgets = callPackage ./ktextwidgets.nix {};
-    kunitconversion = callPackage ./kunitconversion.nix {};
-    kwallet = callPackage ./kwallet.nix {};
-    kwayland = callPackage ./kwayland.nix {};
-    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-    kwindowsystem = callPackage ./kwindowsystem.nix {};
-    kxmlgui = callPackage ./kxmlgui.nix {};
-    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework.nix {};
-    solid = callPackage ./solid.nix {};
-    sonnet = callPackage ./sonnet.nix {};
-    syntax-highlighting = callPackage ./syntax-highlighting.nix {};
-    threadweaver = callPackage ./threadweaver.nix {};
+  callPackage = newScope {
+    kdeFramework = import ./build-support/framework.nix {
+      inherit kdeDerivation lib fetchurl;
+    };
   };
-
-in packages
+in
+{
+  attica = callPackage ./attica.nix {};
+  baloo = callPackage ./baloo.nix {};
+  bluez-qt = callPackage ./bluez-qt.nix {};
+  breeze-icons = callPackage ./breeze-icons.nix {};
+  ecm = callPackage ./extra-cmake-modules {};
+  ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix { };
+  frameworkintegration = callPackage ./frameworkintegration.nix {};
+  kactivities = callPackage ./kactivities.nix {};
+  kactivities-stats = callPackage ./kactivities-stats.nix {};
+  kapidox = callPackage ./kapidox.nix {};
+  karchive = callPackage ./karchive.nix {};
+  kauth = callPackage ./kauth {};
+  kbookmarks = callPackage ./kbookmarks.nix {};
+  kcmutils = callPackage ./kcmutils {};
+  kcodecs = callPackage ./kcodecs.nix {};
+  kcompletion = callPackage ./kcompletion.nix {};
+  kconfig = callPackage ./kconfig.nix {};
+  kconfigwidgets = callPackage ./kconfigwidgets {};
+  kcoreaddons = callPackage ./kcoreaddons.nix {};
+  kcrash = callPackage ./kcrash.nix {};
+  kdbusaddons = callPackage ./kdbusaddons.nix {};
+  kdeclarative = callPackage ./kdeclarative.nix {};
+  kded = callPackage ./kded.nix {};
+  kdelibs4support = callPackage ./kdelibs4support {};
+  kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+  kdesu = callPackage ./kdesu.nix {};
+  kdnssd = callPackage ./kdnssd.nix {};
+  kdoctools = callPackage ./kdoctools {};
+  kemoticons = callPackage ./kemoticons.nix {};
+  kfilemetadata = callPackage ./kfilemetadata {};
+  kglobalaccel = callPackage ./kglobalaccel.nix {};
+  kguiaddons = callPackage ./kguiaddons.nix {};
+  khtml = callPackage ./khtml.nix {};
+  ki18n = callPackage ./ki18n.nix {};
+  kiconthemes = callPackage ./kiconthemes {};
+  kidletime = callPackage ./kidletime.nix {};
+  kimageformats = callPackage ./kimageformats.nix {};
+  kinit = callPackage ./kinit {};
+  kio = callPackage ./kio {};
+  kitemmodels = callPackage ./kitemmodels.nix {};
+  kitemviews = callPackage ./kitemviews.nix {};
+  kjobwidgets = callPackage ./kjobwidgets.nix {};
+  kjs = callPackage ./kjs.nix {};
+  kjsembed = callPackage ./kjsembed.nix {};
+  kmediaplayer = callPackage ./kmediaplayer.nix {};
+  knewstuff = callPackage ./knewstuff.nix {};
+  knotifications = callPackage ./knotifications.nix {};
+  knotifyconfig = callPackage ./knotifyconfig.nix {};
+  kpackage = callPackage ./kpackage {};
+  kparts = callPackage ./kparts.nix {};
+  kpeople = callPackage ./kpeople.nix {};
+  kplotting = callPackage ./kplotting.nix {};
+  kpty = callPackage ./kpty.nix {};
+  kross = callPackage ./kross.nix {};
+  krunner = callPackage ./krunner.nix {};
+  kservice = callPackage ./kservice {};
+  ktexteditor = callPackage ./ktexteditor.nix {};
+  ktextwidgets = callPackage ./ktextwidgets.nix {};
+  kunitconversion = callPackage ./kunitconversion.nix {};
+  kwallet = callPackage ./kwallet.nix {};
+  kwayland = callPackage ./kwayland.nix {};
+  kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+  kwindowsystem = callPackage ./kwindowsystem.nix {};
+  kxmlgui = callPackage ./kxmlgui.nix {};
+  kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+  modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+  networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+  oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
+  plasma-framework = callPackage ./plasma-framework.nix {};
+  solid = callPackage ./solid.nix {};
+  sonnet = callPackage ./sonnet.nix {};
+  syntax-highlighting = callPackage ./syntax-highlighting.nix {};
+  threadweaver = callPackage ./threadweaver.nix {};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15db1a7d7a6b..6204602e96a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9343,8 +9343,8 @@ with pkgs;
 
   mkLibsForQt5 = self: with self;
     let kdeFrameworks = import ../development/libraries/kde-frameworks {
-          inherit stdenv lib kdeDerivation makeSetupHook makeWrapper fetchurl buildEnv;
-          inherit (self) callPackage;
+          inherit (self) newScope;
+          inherit kdeDerivation lib fetchurl;
         };
     in {
 

From e50ba7041126a5a4fbc81192739e36076010beeb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 14:32:46 -0600
Subject: [PATCH 1280/3449] plasma5: Hide internal plasmaPackage deriver

---
 pkgs/desktops/plasma-5/breeze-qt4.nix         |  16 +--
 .../plasma-5/build-support/package.nix        |  27 ++++
 pkgs/desktops/plasma-5/default.nix            | 118 ++++++++----------
 pkgs/top-level/all-packages.nix               |   7 +-
 4 files changed, 83 insertions(+), 85 deletions(-)
 create mode 100644 pkgs/desktops/plasma-5/build-support/package.nix

diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
index b97554cd4044..adcc6110c4d7 100644
--- a/pkgs/desktops/plasma-5/breeze-qt4.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -1,20 +1,12 @@
 {
-  stdenv, lib, src, version,
+  plasmaPackage, lib,
   automoc4, cmake, perl, pkgconfig,
   kdelibs4, qt4, xproto
 }:
 
-stdenv.mkDerivation {
-  name = "breeze-qt4-${version}";
-  meta = {
-    license = with lib.licenses; [
-      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-    ];
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ttuegel ];
-    homepage = "http://www.kde.org";
-  };
-  inherit src;
+plasmaPackage {
+  name = "breeze-qt4";
+  sname = "breeze";
   buildInputs = [ kdelibs4 qt4 xproto ];
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
   cmakeFlags = [
diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix
new file mode 100644
index 000000000000..1e9ba016c471
--- /dev/null
+++ b/pkgs/desktops/plasma-5/build-support/package.nix
@@ -0,0 +1,27 @@
+{ kdeDerivation, lib, fetchurl }:
+
+let
+  mirror = "mirror://kde";
+  srcs = import ../srcs.nix { inherit fetchurl mirror; };
+in
+
+args:
+
+let
+  inherit (args) name;
+  sname = args.sname or name;
+  inherit (srcs."${sname}") src version;
+in
+kdeDerivation (args // {
+  name = "${name}-${version}";
+  inherit src;
+
+  meta = {
+    license = with lib.licenses; [
+      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ttuegel ];
+    homepage = "http://www.kde.org";
+  } // (args.meta or {});
+})
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index b240ef7496c6..0cb25a315d6e 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -25,77 +25,57 @@ existing packages here and modify it as necessary.
 */
 
 {
-  stdenv, lib, libsForQt5, makeSetupHook, symlinkJoin, fetchurl,
-  gconf, kdeDerivation,
+  libsForQt5, kdeDerivation, lib, fetchurl,
+  gconf,
   debug ? false,
 }:
 
 let
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  packages = self: with self; {
-    plasmaPackage = args:
-      let
-        inherit (args) name;
-        sname = args.sname or name;
-        inherit (srcs."${sname}") src version;
-      in kdeDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          maintainers = with lib.maintainers; [ ttuegel ];
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    bluedevil = callPackage ./bluedevil.nix {};
-    breeze-gtk = callPackage ./breeze-gtk.nix {};
-    breeze-qt4 = callPackage ./breeze-qt4.nix {
-      inherit (srcs.breeze) src version;
+  packages = self: with self;
+    let
+      callPackage = self.newScope {
+        plasmaPackage = import ./build-support/package.nix {
+          inherit kdeDerivation lib fetchurl;
+        };
+      };
+    in {
+      bluedevil = callPackage ./bluedevil.nix {};
+      breeze-gtk = callPackage ./breeze-gtk.nix {};
+      breeze-qt4 = callPackage ./breeze-qt4.nix {};
+      breeze-qt5 = callPackage ./breeze-qt5.nix {};
+      breeze-grub = callPackage ./breeze-grub.nix {};
+      breeze-plymouth = callPackage ./breeze-plymouth {};
+      kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
+      kde-cli-tools = callPackage ./kde-cli-tools.nix {};
+      kde-gtk-config = callPackage ./kde-gtk-config {};
+      kdecoration = callPackage ./kdecoration.nix {};
+      kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
+      kgamma5 = callPackage ./kgamma5.nix {};
+      khotkeys = callPackage ./khotkeys.nix {};
+      kinfocenter = callPackage ./kinfocenter.nix {};
+      kmenuedit = callPackage ./kmenuedit.nix {};
+      kscreen = callPackage ./kscreen.nix {};
+      kscreenlocker = callPackage ./kscreenlocker.nix {};
+      ksshaskpass = callPackage ./ksshaskpass.nix {};
+      ksysguard = callPackage ./ksysguard.nix {};
+      kwallet-pam = callPackage ./kwallet-pam.nix {};
+      kwayland-integration = callPackage ./kwayland-integration.nix {};
+      kwin = callPackage ./kwin {};
+      kwrited = callPackage ./kwrited.nix {};
+      libkscreen = callPackage ./libkscreen.nix {};
+      libksysguard = callPackage ./libksysguard {};
+      milou = callPackage ./milou.nix {};
+      oxygen = callPackage ./oxygen.nix {};
+      plasma-desktop = callPackage ./plasma-desktop {};
+      plasma-integration = callPackage ./plasma-integration.nix {};
+      plasma-nm = callPackage ./plasma-nm {};
+      plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+      plasma-workspace = callPackage ./plasma-workspace {};
+      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
+      polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
+      powerdevil = callPackage ./powerdevil.nix {};
+      startkde = callPackage ./startkde {};
+      systemsettings = callPackage ./systemsettings.nix {};
     };
-    breeze-qt5 = callPackage ./breeze-qt5.nix {};
-    breeze-grub = callPackage ./breeze-grub.nix {};
-    breeze-plymouth = callPackage ./breeze-plymouth {};
-    kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
-    kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-    kde-gtk-config = callPackage ./kde-gtk-config {};
-    kdecoration = callPackage ./kdecoration.nix {};
-    kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
-    kgamma5 = callPackage ./kgamma5.nix {};
-    khotkeys = callPackage ./khotkeys.nix {};
-    kinfocenter = callPackage ./kinfocenter.nix {};
-    kmenuedit = callPackage ./kmenuedit.nix {};
-    kscreen = callPackage ./kscreen.nix {};
-    kscreenlocker = callPackage ./kscreenlocker.nix {};
-    ksshaskpass = callPackage ./ksshaskpass.nix {};
-    ksysguard = callPackage ./ksysguard.nix {};
-    kwallet-pam = callPackage ./kwallet-pam.nix {};
-    kwayland-integration = callPackage ./kwayland-integration.nix {};
-    kwin = callPackage ./kwin {};
-    kwrited = callPackage ./kwrited.nix {};
-    libkscreen = callPackage ./libkscreen.nix {};
-    libksysguard = callPackage ./libksysguard {};
-    milou = callPackage ./milou.nix {};
-    oxygen = callPackage ./oxygen.nix {};
-    plasma-desktop = callPackage ./plasma-desktop {};
-    plasma-integration = callPackage ./plasma-integration.nix {};
-    plasma-nm = callPackage ./plasma-nm {};
-    plasma-pa = callPackage ./plasma-pa.nix {
-      inherit gconf;
-    };
-    plasma-workspace = callPackage ./plasma-workspace {};
-    plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
-    polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
-    powerdevil = callPackage ./powerdevil.nix {};
-    startkde = callPackage ./startkde {};
-    systemsettings = callPackage ./systemsettings.nix {};
-  };
-
-in lib.makeScope libsForQt5.newScope packages
+in
+lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6204602e96a1..d310c50e0352 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16822,11 +16822,10 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
-  plasma5 = import ../desktops/plasma-5 {
-    inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
-    inherit kdeDerivation;
+  plasma5 = recurseIntoAttrs (import ../desktops/plasma-5 {
+    inherit libsForQt5 kdeDerivation lib fetchurl;
     inherit (gnome3) gconf;
-  };
+  });
 
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg;

From 8be4bd7416ca977a6b8513957513355f01c397cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 14:34:51 -0600
Subject: [PATCH 1281/3449] kdeApplications: Move out of desktops/kde-5

- There is no such thing as KDE 5
---
 .../kde}/akonadi-contacts.nix                 |  0
 .../kde}/akonadi-mime.nix                     |  0
 .../kde}/akonadi.nix                          |  0
 .../kde}/ark/default.nix                      |  0
 .../kde}/baloo-widgets.nix                    |  0
 .../kde/build-support/application.nix}        |  0
 pkgs/applications/kde/default.nix             | 95 +++++++++++++++++++
 .../kde}/dolphin-plugins.nix                  |  0
 .../kde}/dolphin.nix                          |  0
 .../kde}/fetch.sh                             |  0
 .../kde}/ffmpegthumbs.nix                     |  0
 .../kde}/filelight.nix                        |  0
 .../kde}/gwenview.nix                         |  0
 .../kde}/kate.nix                             |  0
 .../kde}/kcalc.nix                            |  0
 .../kde}/kcolorchooser.nix                    |  0
 .../kde}/kcontacts.nix                        |  0
 .../kde}/kde-locale-4.nix                     |  0
 .../kde}/kde-locale-5.nix                     |  0
 .../kde}/kdegraphics-mobipocket.nix           |  0
 .../kde}/kdegraphics-thumbnailers.nix         |  0
 .../0001-old-kde4-cmake-policies.patch        |  0
 .../kdelibs/0002-polkit-install-path.patch    |  0
 .../kdelibs/0003-remove_xdg_impurities.patch  |  0
 .../kde}/kdelibs/default.nix                  |  2 +-
 .../kde}/kdenetwork-filesharing.nix           |  0
 .../kde}/kdenlive.nix                         |  0
 .../applications => applications/kde}/kdf.nix |  0
 .../kde}/kgpg.nix                             |  0
 .../kde}/khelpcenter.nix                      |  0
 .../applications => applications/kde}/kig.nix |  0
 .../kde}/kio-extras.nix                       |  0
 .../kde}/kmime.nix                            |  0
 .../kde}/kmix.nix                             |  0
 .../kde}/kompare.nix                          |  0
 .../kde}/konsole.nix                          |  0
 .../kde}/kwalletmanager.nix                   |  0
 .../kde}/l10n.nix                             |  4 +-
 .../kde}/libkdcraw.nix                        |  0
 .../kde}/libkexiv2.nix                        |  0
 .../kde}/libkipi.nix                          |  0
 .../kde}/libkomparediff2.nix                  |  0
 .../kde}/marble.nix                           |  0
 .../kde}/okteta.nix                           |  0
 .../kde}/okular.nix                           |  0
 .../kde}/print-manager.nix                    |  0
 .../kde}/spectacle.nix                        |  0
 .../kde}/srcs.nix                             |  0
 pkgs/desktops/kde-5/applications/default.nix  | 95 -------------------
 pkgs/top-level/all-packages.nix               |  6 +-
 50 files changed, 101 insertions(+), 101 deletions(-)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/akonadi-contacts.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/akonadi-mime.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/akonadi.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/ark/default.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/baloo-widgets.nix (100%)
 rename pkgs/{desktops/kde-5/applications/kde-app.nix => applications/kde/build-support/application.nix} (100%)
 create mode 100644 pkgs/applications/kde/default.nix
 rename pkgs/{desktops/kde-5/applications => applications/kde}/dolphin-plugins.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/dolphin.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/fetch.sh (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/ffmpegthumbs.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/filelight.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/gwenview.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kate.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kcalc.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kcolorchooser.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kcontacts.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kde-locale-4.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kde-locale-5.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdegraphics-mobipocket.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdegraphics-thumbnailers.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdelibs/0001-old-kde4-cmake-policies.patch (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdelibs/0002-polkit-install-path.patch (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdelibs/0003-remove_xdg_impurities.patch (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdelibs/default.nix (97%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdenetwork-filesharing.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdenlive.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kdf.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kgpg.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/khelpcenter.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kig.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kio-extras.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kmime.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kmix.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kompare.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/konsole.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/kwalletmanager.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/l10n.nix (98%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/libkdcraw.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/libkexiv2.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/libkipi.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/libkomparediff2.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/marble.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/okteta.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/okular.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/print-manager.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/spectacle.nix (100%)
 rename pkgs/{desktops/kde-5/applications => applications/kde}/srcs.nix (100%)
 delete mode 100644 pkgs/desktops/kde-5/applications/default.nix

diff --git a/pkgs/desktops/kde-5/applications/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/akonadi-contacts.nix
rename to pkgs/applications/kde/akonadi-contacts.nix
diff --git a/pkgs/desktops/kde-5/applications/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/akonadi-mime.nix
rename to pkgs/applications/kde/akonadi-mime.nix
diff --git a/pkgs/desktops/kde-5/applications/akonadi.nix b/pkgs/applications/kde/akonadi.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/akonadi.nix
rename to pkgs/applications/kde/akonadi.nix
diff --git a/pkgs/desktops/kde-5/applications/ark/default.nix b/pkgs/applications/kde/ark/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/ark/default.nix
rename to pkgs/applications/kde/ark/default.nix
diff --git a/pkgs/desktops/kde-5/applications/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/baloo-widgets.nix
rename to pkgs/applications/kde/baloo-widgets.nix
diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/applications/kde/build-support/application.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kde-app.nix
rename to pkgs/applications/kde/build-support/application.nix
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
new file mode 100644
index 000000000000..e638378ddbb4
--- /dev/null
+++ b/pkgs/applications/kde/default.nix
@@ -0,0 +1,95 @@
+/*
+
+# New packages
+
+READ THIS FIRST
+
+This module is for official packages in the KDE Applications Bundle. All
+available packages are listed in `./srcs.nix`, although some are not yet
+packaged in Nixpkgs (see below).
+
+IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+
+Many of the packages released upstream are not yet built in Nixpkgs due to lack
+of demand. To add a Nixpkgs build for an upstream package, copy one of the
+existing packages here and modify it as necessary. A simple example package that
+still shows most of the available features is in `./gwenview.nix`.
+
+# Updates
+
+1. Update the URL in `./fetch.sh`.
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
+   from the top of the Nixpkgs tree.
+3. Use `nox-review wip` to check that everything builds.
+4. Commit the changes and open a pull request.
+
+*/
+
+{
+  stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
+  kdeDerivation, plasma5,
+  attica, phonon,
+  debug ? false,
+}:
+
+let
+  mirror = "mirror://kde";
+  srcs = import ./srcs.nix { inherit fetchurl mirror; };
+in
+
+let
+
+  packages = self: with self;
+    let
+      callPackage = self.newScope {
+        kdeApp = import ./build-support/application.nix {
+          inherit lib kdeDerivation;
+          inherit debug srcs;
+        };
+      };
+    in {
+      kdelibs = callPackage ./kdelibs { inherit attica phonon; };
+      akonadi = callPackage ./akonadi.nix {};
+      akonadi-contacts = callPackage ./akonadi-contacts.nix {};
+      akonadi-mime = callPackage ./akonadi-mime.nix {};
+      ark = callPackage ./ark/default.nix {};
+      baloo-widgets = callPackage ./baloo-widgets.nix {};
+      dolphin = callPackage ./dolphin.nix {};
+      dolphin-plugins = callPackage ./dolphin-plugins.nix {};
+      ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
+      filelight = callPackage ./filelight.nix {};
+      gwenview = callPackage ./gwenview.nix {};
+      kate = callPackage ./kate.nix {};
+      kdenlive = callPackage ./kdenlive.nix {};
+      kcalc = callPackage ./kcalc.nix {};
+      kcolorchooser = callPackage ./kcolorchooser.nix {};
+      kcontacts = callPackage ./kcontacts.nix {};
+      kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
+      kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
+      kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
+      kdf = callPackage ./kdf.nix {};
+      kgpg = callPackage ./kgpg.nix {};
+      khelpcenter = callPackage ./khelpcenter.nix {};
+      kig = callPackage ./kig.nix {};
+      kio-extras = callPackage ./kio-extras.nix {};
+      kmime = callPackage ./kmime.nix {};
+      kmix = callPackage ./kmix.nix {};
+      kompare = callPackage ./kompare.nix {};
+      konsole = callPackage ./konsole.nix {};
+      kwalletmanager = callPackage ./kwalletmanager.nix {};
+      libkdcraw = callPackage ./libkdcraw.nix {};
+      libkexiv2 = callPackage ./libkexiv2.nix {};
+      libkipi = callPackage ./libkipi.nix {};
+      libkomparediff2 = callPackage ./libkomparediff2.nix {};
+      marble = callPackage ./marble.nix {};
+      okteta = callPackage ./okteta.nix {};
+      okular = callPackage ./okular.nix {};
+      print-manager = callPackage ./print-manager.nix {};
+      spectacle = callPackage ./spectacle.nix {
+        inherit (plasma5) kscreen;
+      };
+
+      l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
+    };
+
+in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/desktops/kde-5/applications/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/dolphin-plugins.nix
rename to pkgs/applications/kde/dolphin-plugins.nix
diff --git a/pkgs/desktops/kde-5/applications/dolphin.nix b/pkgs/applications/kde/dolphin.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/dolphin.nix
rename to pkgs/applications/kde/dolphin.nix
diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/applications/kde/fetch.sh
similarity index 100%
rename from pkgs/desktops/kde-5/applications/fetch.sh
rename to pkgs/applications/kde/fetch.sh
diff --git a/pkgs/desktops/kde-5/applications/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/ffmpegthumbs.nix
rename to pkgs/applications/kde/ffmpegthumbs.nix
diff --git a/pkgs/desktops/kde-5/applications/filelight.nix b/pkgs/applications/kde/filelight.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/filelight.nix
rename to pkgs/applications/kde/filelight.nix
diff --git a/pkgs/desktops/kde-5/applications/gwenview.nix b/pkgs/applications/kde/gwenview.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/gwenview.nix
rename to pkgs/applications/kde/gwenview.nix
diff --git a/pkgs/desktops/kde-5/applications/kate.nix b/pkgs/applications/kde/kate.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kate.nix
rename to pkgs/applications/kde/kate.nix
diff --git a/pkgs/desktops/kde-5/applications/kcalc.nix b/pkgs/applications/kde/kcalc.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kcalc.nix
rename to pkgs/applications/kde/kcalc.nix
diff --git a/pkgs/desktops/kde-5/applications/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kcolorchooser.nix
rename to pkgs/applications/kde/kcolorchooser.nix
diff --git a/pkgs/desktops/kde-5/applications/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kcontacts.nix
rename to pkgs/applications/kde/kcontacts.nix
diff --git a/pkgs/desktops/kde-5/applications/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kde-locale-4.nix
rename to pkgs/applications/kde/kde-locale-4.nix
diff --git a/pkgs/desktops/kde-5/applications/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kde-locale-5.nix
rename to pkgs/applications/kde/kde-locale-5.nix
diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdegraphics-mobipocket.nix
rename to pkgs/applications/kde/kdegraphics-mobipocket.nix
diff --git a/pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdegraphics-thumbnailers.nix
rename to pkgs/applications/kde/kdegraphics-thumbnailers.nix
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdelibs/0001-old-kde4-cmake-policies.patch
rename to pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0002-polkit-install-path.patch b/pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdelibs/0002-polkit-install-path.patch
rename to pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdelibs/0003-remove_xdg_impurities.patch
rename to pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch
diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
similarity index 97%
rename from pkgs/desktops/kde-5/applications/kdelibs/default.nix
rename to pkgs/applications/kde/kdelibs/default.nix
index c7c8c250a838..0292b51a48d4 100644
--- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, src, version,
+  kdeApp, lib,
   automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
   attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
   libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
diff --git a/pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdenetwork-filesharing.nix
rename to pkgs/applications/kde/kdenetwork-filesharing.nix
diff --git a/pkgs/desktops/kde-5/applications/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdenlive.nix
rename to pkgs/applications/kde/kdenlive.nix
diff --git a/pkgs/desktops/kde-5/applications/kdf.nix b/pkgs/applications/kde/kdf.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kdf.nix
rename to pkgs/applications/kde/kdf.nix
diff --git a/pkgs/desktops/kde-5/applications/kgpg.nix b/pkgs/applications/kde/kgpg.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kgpg.nix
rename to pkgs/applications/kde/kgpg.nix
diff --git a/pkgs/desktops/kde-5/applications/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/khelpcenter.nix
rename to pkgs/applications/kde/khelpcenter.nix
diff --git a/pkgs/desktops/kde-5/applications/kig.nix b/pkgs/applications/kde/kig.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kig.nix
rename to pkgs/applications/kde/kig.nix
diff --git a/pkgs/desktops/kde-5/applications/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kio-extras.nix
rename to pkgs/applications/kde/kio-extras.nix
diff --git a/pkgs/desktops/kde-5/applications/kmime.nix b/pkgs/applications/kde/kmime.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kmime.nix
rename to pkgs/applications/kde/kmime.nix
diff --git a/pkgs/desktops/kde-5/applications/kmix.nix b/pkgs/applications/kde/kmix.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kmix.nix
rename to pkgs/applications/kde/kmix.nix
diff --git a/pkgs/desktops/kde-5/applications/kompare.nix b/pkgs/applications/kde/kompare.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kompare.nix
rename to pkgs/applications/kde/kompare.nix
diff --git a/pkgs/desktops/kde-5/applications/konsole.nix b/pkgs/applications/kde/konsole.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/konsole.nix
rename to pkgs/applications/kde/konsole.nix
diff --git a/pkgs/desktops/kde-5/applications/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/kwalletmanager.nix
rename to pkgs/applications/kde/kwalletmanager.nix
diff --git a/pkgs/desktops/kde-5/applications/l10n.nix b/pkgs/applications/kde/l10n.nix
similarity index 98%
rename from pkgs/desktops/kde-5/applications/l10n.nix
rename to pkgs/applications/kde/l10n.nix
index f2e5f843b5d9..87e7a82ce466 100644
--- a/pkgs/desktops/kde-5/applications/l10n.nix
+++ b/pkgs/applications/kde/l10n.nix
@@ -1,4 +1,4 @@
-{ callPackage, pkgs, lib }:
+{ callPackage, recurseIntoAttrs, lib }:
 
 let
 
@@ -7,7 +7,7 @@ let
 
 in
 
-lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
+lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
   ar = {
     qt4 = callPackage (kdeLocale4 "ar" {}) {};
     qt5 = callPackage (kdeLocale5 "ar" {}) {};
diff --git a/pkgs/desktops/kde-5/applications/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/libkdcraw.nix
rename to pkgs/applications/kde/libkdcraw.nix
diff --git a/pkgs/desktops/kde-5/applications/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/libkexiv2.nix
rename to pkgs/applications/kde/libkexiv2.nix
diff --git a/pkgs/desktops/kde-5/applications/libkipi.nix b/pkgs/applications/kde/libkipi.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/libkipi.nix
rename to pkgs/applications/kde/libkipi.nix
diff --git a/pkgs/desktops/kde-5/applications/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/libkomparediff2.nix
rename to pkgs/applications/kde/libkomparediff2.nix
diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/applications/kde/marble.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/marble.nix
rename to pkgs/applications/kde/marble.nix
diff --git a/pkgs/desktops/kde-5/applications/okteta.nix b/pkgs/applications/kde/okteta.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/okteta.nix
rename to pkgs/applications/kde/okteta.nix
diff --git a/pkgs/desktops/kde-5/applications/okular.nix b/pkgs/applications/kde/okular.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/okular.nix
rename to pkgs/applications/kde/okular.nix
diff --git a/pkgs/desktops/kde-5/applications/print-manager.nix b/pkgs/applications/kde/print-manager.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/print-manager.nix
rename to pkgs/applications/kde/print-manager.nix
diff --git a/pkgs/desktops/kde-5/applications/spectacle.nix b/pkgs/applications/kde/spectacle.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/spectacle.nix
rename to pkgs/applications/kde/spectacle.nix
diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/applications/kde/srcs.nix
similarity index 100%
rename from pkgs/desktops/kde-5/applications/srcs.nix
rename to pkgs/applications/kde/srcs.nix
diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
deleted file mode 100644
index 832b88c7e803..000000000000
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-
-# New packages
-
-READ THIS FIRST
-
-This module is for official packages in the KDE Applications Bundle. All
-available packages are listed in `./srcs.nix`, although some are not yet
-packaged in Nixpkgs (see below).
-
-IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
-
-Many of the packages released upstream are not yet built in Nixpkgs due to lack
-of demand. To add a Nixpkgs build for an upstream package, copy one of the
-existing packages here and modify it as necessary. A simple example package that
-still shows most of the available features is in `./gwenview.nix`.
-
-# Updates
-
-1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
-   from the top of the Nixpkgs tree.
-3. Use `nox-review wip` to check that everything builds.
-4. Commit the changes and open a pull request.
-
-*/
-
-{
-  stdenv, lib, libsForQt5, fetchurl,
-  kdeDerivation, plasma5,
-  attica, phonon,
-  debug ? false,
-}:
-
-let
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit fetchurl mirror; };
-
-  packages = self: with self; {
-
-    kdeApp = import ./kde-app.nix {
-      inherit lib kdeDerivation;
-      inherit debug srcs;
-    };
-
-    kdelibs = callPackage ./kdelibs {
-      inherit (srcs.kdelibs) src version;
-      inherit attica phonon;
-    };
-
-    akonadi = callPackage ./akonadi.nix {};
-    akonadi-contacts = callPackage ./akonadi-contacts.nix {};
-    akonadi-mime = callPackage ./akonadi-mime.nix {};
-    ark = callPackage ./ark/default.nix {};
-    baloo-widgets = callPackage ./baloo-widgets.nix {};
-    dolphin = callPackage ./dolphin.nix {};
-    dolphin-plugins = callPackage ./dolphin-plugins.nix {};
-    ffmpegthumbs = callPackage ./ffmpegthumbs.nix { };
-    filelight = callPackage ./filelight.nix {};
-    gwenview = callPackage ./gwenview.nix {};
-    kate = callPackage ./kate.nix {};
-    kdenlive = callPackage ./kdenlive.nix {};
-    kcalc = callPackage ./kcalc.nix {};
-    kcolorchooser = callPackage ./kcolorchooser.nix {};
-    kcontacts = callPackage ./kcontacts.nix {};
-    kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
-    kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
-    kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
-    kdf = callPackage ./kdf.nix {};
-    kgpg = callPackage ./kgpg.nix {};
-    khelpcenter = callPackage ./khelpcenter.nix {};
-    kig = callPackage ./kig.nix {};
-    kio-extras = callPackage ./kio-extras.nix {};
-    kmime = callPackage ./kmime.nix {};
-    kmix = callPackage ./kmix.nix {};
-    kompare = callPackage ./kompare.nix {};
-    konsole = callPackage ./konsole.nix {};
-    kwalletmanager = callPackage ./kwalletmanager.nix {};
-    libkdcraw = callPackage ./libkdcraw.nix {};
-    libkexiv2 = callPackage ./libkexiv2.nix {};
-    libkipi = callPackage ./libkipi.nix {};
-    libkomparediff2 = callPackage ./libkomparediff2.nix {};
-    marble = callPackage ./marble.nix {};
-    okteta = callPackage ./okteta.nix {};
-    okular = callPackage ./okular.nix {};
-    print-manager = callPackage ./print-manager.nix {};
-    spectacle = callPackage ./spectacle.nix {
-      inherit (plasma5) kscreen;
-    };
-
-    l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
-  };
-
-in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d310c50e0352..297aae6147e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14055,11 +14055,11 @@ with pkgs;
 
   kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
-  kdeApplications = import ../desktops/kde-5/applications {
-    inherit stdenv lib libsForQt5 fetchurl;
+  kdeApplications = recurseIntoAttrs (import ../applications/kde {
+    inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
     inherit kdeDerivation plasma5;
     inherit attica phonon;
-  };
+  });
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 

From f21d4d00152726c02f870cb20faba4aca18ef49a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 14:43:13 -0600
Subject: [PATCH 1282/3449] nixos/plasma5: Rename Plasma 5 desktop

- There is no such thing as KDE 5
---
 nixos/modules/rename.nix                             |  3 +++
 .../services/x11/desktop-managers/default.nix        |  4 ++--
 .../x11/desktop-managers/{kde5.nix => plasma5.nix}   | 12 ++++++------
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename nixos/modules/services/x11/desktop-managers/{kde5.nix => plasma5.nix} (95%)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ee68f8bff81a..ff3654737afd 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -178,6 +178,9 @@ with lib;
     (mkRenamedOptionModule [ "services" "nfs" "lockdPort" ] [ "services" "nfs" "server" "lockdPort" ])
     (mkRenamedOptionModule [ "services" "nfs" "statdPort" ] [ "services" "nfs" "server" "statdPort" ])
 
+    # KDE Plasma 5
+    (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")
diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 1f7a925ed054..af01f6acad18 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -16,9 +16,9 @@ in
 {
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
-  # E.g., if KDE is enabled, it supersedes xterm.
+  # E.g., if Plasma 5 is enabled, it supersedes xterm.
   imports = [
-    ./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix
+    ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix
     ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix
   ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
similarity index 95%
rename from nixos/modules/services/x11/desktop-managers/kde5.nix
rename to nixos/modules/services/x11/desktop-managers/plasma5.nix
index 57924a73949c..4dbd8d7a2c03 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -5,16 +5,16 @@ with lib;
 let
 
   xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.kde5;
+  cfg = xcfg.desktopManager.plasma5;
 
-  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
+  inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg;
 
 in
 
 {
   options = {
 
-    services.xserver.desktopManager.kde5 = {
+    services.xserver.desktopManager.plasma5 = {
       enable = mkOption {
         type = types.bool;
         default = false;
@@ -45,12 +45,12 @@ in
 
   config = mkMerge [
     (mkIf (cfg.extraPackages != []) {
-      environment.systemPackages = [ (libsForQt5.kdeWrapper cfg.extraPackages) ];
+      environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
     })
 
     (mkIf (xcfg.enable && cfg.enable) {
       services.xserver.desktopManager.session = singleton {
-        name = "Plasma 5";
+        name = "plasma5";
         bgSupport = true;
         start = ''
           # Load PulseAudio module for routing support.
@@ -163,7 +163,7 @@ in
         ++ lib.optional config.services.colord.enable colord-kde
         ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
 
-      services.xserver.desktopManager.kde5.extraPackages =
+      services.xserver.desktopManager.plasma5.extraPackages =
         with kdeApplications; with plasma5;
         [
           khelpcenter

From 490bbb288e1bba612d9aeccec1edec51de1ae19f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 18:24:13 -0600
Subject: [PATCH 1283/3449] qt56: Update instructions

---
 .../libraries/qt-5/5.6/default.nix            | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 542bf41d5874..710cf6bd139f 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -1,15 +1,24 @@
 /*
 
+# New packages
+
+READ THIS FIRST
+
+This module is for official packages in Qt 5. All available packages are listed
+in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see below).
+
+IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+
+Many of the packages released upstream are not yet built in Nixpkgs due to lack
+of demand. To add a Nixpkgs build for an upstream package, copy one of the
+existing packages here and modify it as necessary.
+
 # 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.
+1. Update the URL in `./fetch.sh`.
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/`
+   from the top of the Nixpkgs tree.
+3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
 
 */

From e21b5da6305ec15b65ad398106efe39f290a4095 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 18:27:49 -0600
Subject: [PATCH 1284/3449] qt56.qtquickcontrols2: init at 5.6.2

---
 pkgs/development/libraries/qt-5/5.6/default.nix          | 1 +
 pkgs/development/libraries/qt-5/5.6/qtquickcontrols2.nix | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtquickcontrols2.nix

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 710cf6bd139f..fd6b622344ac 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -94,6 +94,7 @@ let
         inherit gstreamer gst-plugins-base;
       };
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
+      qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
       qtscript = callPackage ./qtscript {};
       qtsensors = callPackage ./qtsensors.nix {};
       qtserialport = callPackage ./qtserialport {};
diff --git a/pkgs/development/libraries/qt-5/5.6/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.6/qtquickcontrols2.nix
new file mode 100644
index 000000000000..19750f2fd99d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtquickcontrols2.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtquickcontrols2";
+  qtInputs = [ qtdeclarative ];
+}

From b39e491eb521d93ae983bc63b10efad3d147a9cd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 25 Feb 2017 18:58:53 -0600
Subject: [PATCH 1285/3449] lib.makeScope: Save package set function

---
 lib/customisation.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index bedb91af7735..a6c24f083a5b 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -177,9 +177,10 @@ rec {
     let self = f self // {
           newScope = scope: newScope (self // scope);
           callPackage = self.newScope {};
-          override = g: makeScope newScope (self_:
-            let super = f self_;
-            in super // g super self_);
+          override = g:
+            makeScope newScope
+            (self_: let super = f self_; in super // g super self_);
+          packages = f;
         };
     in self;
 

From 127bf18a350afa562cad3f8cb3b2f626edd23de0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 06:49:15 -0600
Subject: [PATCH 1286/3449] extra-cmake-modules: Lift Qt dependency

---
 .../services/x11/desktop-managers/plasma5.nix |  12 +-
 pkgs/applications/editors/kile/default.nix    |   4 +-
 .../applications/graphics/digikam/default.nix |   4 +-
 .../graphics/kipi-plugins/default.nix         |   4 +-
 pkgs/applications/kde/akonadi-contacts.nix    |   4 +-
 pkgs/applications/kde/akonadi-mime.nix        |   4 +-
 pkgs/applications/kde/akonadi.nix             |   4 +-
 pkgs/applications/kde/ark/default.nix         |   4 +-
 pkgs/applications/kde/baloo-widgets.nix       |   4 +-
 pkgs/applications/kde/dolphin-plugins.nix     |   4 +-
 pkgs/applications/kde/dolphin.nix             |   4 +-
 pkgs/applications/kde/ffmpegthumbs.nix        |   4 +-
 pkgs/applications/kde/filelight.nix           |   4 +-
 pkgs/applications/kde/gwenview.nix            |   4 +-
 pkgs/applications/kde/kate.nix                |   4 +-
 pkgs/applications/kde/kcalc.nix               |   4 +-
 pkgs/applications/kde/kcolorchooser.nix       |   4 +-
 pkgs/applications/kde/kcontacts.nix           |   4 +-
 pkgs/applications/kde/kde-locale-5.nix        |   4 +-
 .../kde/kdegraphics-mobipocket.nix            |   4 +-
 .../kde/kdegraphics-thumbnailers.nix          |   4 +-
 .../kde/kdenetwork-filesharing.nix            |   4 +-
 pkgs/applications/kde/kdf.nix                 |   4 +-
 pkgs/applications/kde/kgpg.nix                |   4 +-
 pkgs/applications/kde/khelpcenter.nix         |   4 +-
 pkgs/applications/kde/kig.nix                 |   4 +-
 pkgs/applications/kde/kio-extras.nix          |   4 +-
 pkgs/applications/kde/kmime.nix               |   4 +-
 pkgs/applications/kde/kmix.nix                |   4 +-
 pkgs/applications/kde/kompare.nix             |   4 +-
 pkgs/applications/kde/konsole.nix             |   4 +-
 pkgs/applications/kde/kwalletmanager.nix      |   4 +-
 pkgs/applications/kde/libkdcraw.nix           |   5 +-
 pkgs/applications/kde/libkexiv2.nix           |   5 +-
 pkgs/applications/kde/libkipi.nix             |   4 +-
 pkgs/applications/kde/libkomparediff2.nix     |   4 +-
 pkgs/applications/kde/marble.nix              |   4 +-
 pkgs/applications/kde/okteta.nix              |   4 +-
 pkgs/applications/kde/okular.nix              |   4 +-
 pkgs/applications/kde/print-manager.nix       |   4 +-
 pkgs/applications/kde/spectacle.nix           |   4 +-
 pkgs/applications/misc/krename/default.nix    |   4 +-
 pkgs/applications/misc/yakuake/default.nix    |   4 +-
 .../networking/irc/konversation/default.nix   |   4 +-
 .../networking/p2p/ktorrent/default.nix       |   4 +-
 .../networking/sniffers/wireshark/default.nix |   4 +-
 pkgs/applications/office/skrooge/default.nix  |   4 +-
 pkgs/desktops/plasma-5/bluedevil.nix          |   4 +-
 pkgs/desktops/plasma-5/breeze-gtk.nix         |   6 +-
 .../plasma-5/breeze-plymouth/default.nix      |   4 +-
 pkgs/desktops/plasma-5/breeze-qt5.nix         |   4 +-
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |   4 +-
 pkgs/desktops/plasma-5/kde-cli-tools.nix      |   4 +-
 .../plasma-5/kde-gtk-config/default.nix       |   4 +-
 pkgs/desktops/plasma-5/kdecoration.nix        |   5 +-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   |   4 +-
 pkgs/desktops/plasma-5/kgamma5.nix            |   4 +-
 pkgs/desktops/plasma-5/khotkeys.nix           |   4 +-
 pkgs/desktops/plasma-5/kinfocenter.nix        |   4 +-
 pkgs/desktops/plasma-5/kmenuedit.nix          |   4 +-
 pkgs/desktops/plasma-5/kscreen.nix            |   4 +-
 pkgs/desktops/plasma-5/kscreenlocker.nix      |   4 +-
 pkgs/desktops/plasma-5/ksshaskpass.nix        |   4 +-
 pkgs/desktops/plasma-5/ksysguard.nix          |   4 +-
 pkgs/desktops/plasma-5/kwallet-pam.nix        |   4 +-
 .../plasma-5/kwayland-integration.nix         |   4 +-
 pkgs/desktops/plasma-5/kwin/default.nix       |   4 +-
 pkgs/desktops/plasma-5/kwrited.nix            |   4 +-
 pkgs/desktops/plasma-5/libkscreen.nix         |   4 +-
 .../plasma-5/libksysguard/default.nix         |   4 +-
 pkgs/desktops/plasma-5/milou.nix              |   4 +-
 pkgs/desktops/plasma-5/oxygen.nix             |   4 +-
 .../plasma-5/plasma-desktop/default.nix       |   4 +-
 pkgs/desktops/plasma-5/plasma-integration.nix |   4 +-
 pkgs/desktops/plasma-5/plasma-nm/default.nix  |   4 +-
 pkgs/desktops/plasma-5/plasma-pa.nix          |   4 +-
 .../plasma-5/plasma-workspace-wallpapers.nix  |   4 +-
 .../plasma-5/plasma-workspace/default.nix     |   4 +-
 pkgs/desktops/plasma-5/polkit-kde-agent.nix   |   4 +-
 pkgs/desktops/plasma-5/powerdevil.nix         |   4 +-
 pkgs/desktops/plasma-5/systemsettings.nix     |   4 +-
 .../libraries/kde-frameworks/attica.nix       |   5 +-
 .../libraries/kde-frameworks/baloo.nix        |   4 +-
 .../libraries/kde-frameworks/bluez-qt.nix     |   4 +-
 .../libraries/kde-frameworks/breeze-icons.nix |   4 +-
 .../libraries/kde-frameworks/default.nix      | 164 +++++++++---------
 .../extra-cmake-modules/default.nix           |  22 ++-
 .../extra-cmake-modules/no-hooks.nix          |  18 --
 .../extra-cmake-modules/setup-hook.sh         |   4 +-
 .../kde-frameworks/frameworkintegration.nix   |   4 +-
 .../kde-frameworks/kactivities-stats.nix      |   4 +-
 .../libraries/kde-frameworks/kactivities.nix  |   4 +-
 .../libraries/kde-frameworks/kapidox.nix      |   4 +-
 .../libraries/kde-frameworks/karchive.nix     |   5 +-
 .../kde-frameworks/kauth/default.nix          |   4 +-
 .../libraries/kde-frameworks/kbookmarks.nix   |   4 +-
 .../kde-frameworks/kcmutils/default.nix       |   4 +-
 .../libraries/kde-frameworks/kcodecs.nix      |   5 +-
 .../libraries/kde-frameworks/kcompletion.nix  |   5 +-
 .../libraries/kde-frameworks/kconfig.nix      |   5 +-
 .../kde-frameworks/kconfigwidgets/default.nix |   4 +-
 .../libraries/kde-frameworks/kcoreaddons.nix  |   5 +-
 .../libraries/kde-frameworks/kcrash.nix       |   4 +-
 .../libraries/kde-frameworks/kdbusaddons.nix  |   4 +-
 .../libraries/kde-frameworks/kdeclarative.nix |   4 +-
 .../libraries/kde-frameworks/kded.nix         |   4 +-
 .../kdelibs4support/default.nix               |   4 +-
 .../kde-frameworks/kdesignerplugin.nix        |   4 +-
 .../libraries/kde-frameworks/kdesu.nix        |   4 +-
 .../libraries/kde-frameworks/kdnssd.nix       |   7 +-
 .../kde-frameworks/kdoctools/default.nix      |   4 +-
 .../libraries/kde-frameworks/kemoticons.nix   |   4 +-
 .../kde-frameworks/kfilemetadata/default.nix  |   4 +-
 .../libraries/kde-frameworks/kglobalaccel.nix |   4 +-
 .../libraries/kde-frameworks/kguiaddons.nix   |   4 +-
 .../libraries/kde-frameworks/khtml.nix        |   4 +-
 .../libraries/kde-frameworks/ki18n.nix        |   4 +-
 .../kde-frameworks/kiconthemes/default.nix    |   4 +-
 .../libraries/kde-frameworks/kidletime.nix    |   4 +-
 .../kde-frameworks/kimageformats.nix          |   8 +-
 .../kde-frameworks/kinit/default.nix          |   4 +-
 .../libraries/kde-frameworks/kio/default.nix  |   4 +-
 .../libraries/kde-frameworks/kitemmodels.nix  |   5 +-
 .../libraries/kde-frameworks/kitemviews.nix   |   5 +-
 .../libraries/kde-frameworks/kjobwidgets.nix  |   6 +-
 .../libraries/kde-frameworks/kjs.nix          |   4 +-
 .../libraries/kde-frameworks/kjsembed.nix     |   4 +-
 .../libraries/kde-frameworks/kmediaplayer.nix |   4 +-
 .../libraries/kde-frameworks/knewstuff.nix    |   4 +-
 .../kde-frameworks/knotifications.nix         |   6 +-
 .../kde-frameworks/knotifyconfig.nix          |   4 +-
 .../kde-frameworks/kpackage/default.nix       |   4 +-
 .../libraries/kde-frameworks/kparts.nix       |   4 +-
 .../libraries/kde-frameworks/kpeople.nix      |   4 +-
 .../libraries/kde-frameworks/kplotting.nix    |   5 +-
 .../libraries/kde-frameworks/kpty.nix         |   4 +-
 .../libraries/kde-frameworks/kross.nix        |   4 +-
 .../libraries/kde-frameworks/krunner.nix      |   4 +-
 .../kde-frameworks/kservice/default.nix       |   4 +-
 .../libraries/kde-frameworks/ktexteditor.nix  |   4 +-
 .../libraries/kde-frameworks/ktextwidgets.nix |   4 +-
 .../kde-frameworks/kunitconversion.nix        |   4 +-
 .../libraries/kde-frameworks/kwallet.nix      |   4 +-
 .../libraries/kde-frameworks/kwayland.nix     |   7 +-
 .../kde-frameworks/kwidgetsaddons.nix         |   5 +-
 .../kde-frameworks/kwindowsystem.nix          |   6 +-
 .../libraries/kde-frameworks/kxmlgui.nix      |   4 +-
 .../kde-frameworks/kxmlrpcclient.nix          |   4 +-
 .../kde-frameworks/modemmanager-qt.nix        |   7 +-
 .../kde-frameworks/networkmanager-qt.nix      |   7 +-
 .../kde-frameworks/oxygen-icons5.nix          |   5 +-
 .../kde-frameworks/plasma-framework.nix       |   4 +-
 .../libraries/kde-frameworks/solid.nix        |   6 +-
 .../libraries/kde-frameworks/sonnet.nix       |   8 +-
 .../kde-frameworks/syntax-highlighting.nix    |   5 +-
 .../libraries/kde-frameworks/threadweaver.nix |   5 +-
 .../libraries/kirigami/default.nix            |   4 +-
 pkgs/development/libraries/kirigami/v2.nix    |   4 +-
 .../libraries/libktorrent/default.nix         |   4 +-
 pkgs/development/libraries/phonon/default.nix |   6 +-
 .../tools/profiling/heaptrack/default.nix     |   4 +-
 pkgs/development/tools/tora/default.nix       |   4 +-
 pkgs/tools/misc/colord-kde/default.nix        |   4 +-
 .../tools/misc/kdecoration-viewer/default.nix |   4 +-
 pkgs/tools/misc/kronometer/default.nix        |   4 +-
 pkgs/tools/misc/peruse/default.nix            |   4 +-
 pkgs/tools/text/kdiff3/default.nix            |   4 +-
 pkgs/top-level/all-packages.nix               |  32 +++-
 168 files changed, 493 insertions(+), 455 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 4dbd8d7a2c03..24225308ffb3 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -65,10 +65,10 @@ in
 
       security.wrappers = {
         kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
-        "start_kdeinit".source = "${libsForQt5.kinit.out}/lib/libexec/kf5/start_kdeinit";
+        "start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit";
       };
 
-      environment.systemPackages = with qt5; with libsForQt5; with plasma5; with kdeApplications;
+      environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;
         [
           frameworkintegration
           kactivities
@@ -213,10 +213,10 @@ in
 
       services.xserver.displayManager.sddm = {
         theme = "breeze";
-        themes = with libsForQt5; with plasma5; [
-          ecm # for the setup-hook
-          plasma-workspace
-          breeze-icons
+        themes = [
+          pkgs.extra-cmake-modules # for the setup-hook
+          plasma5.plasma-workspace
+          pkgs.breeze-icons
         ];
       };
 
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index ad3300b9221f..a5914c92e8f9 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,7 +1,7 @@
 { kdeDerivation
 , lib
 , fetchgit
-, ecm
+, extra-cmake-modules
 , kdoctools
 , kdeWrapper
 , qtscript
@@ -33,7 +33,7 @@ let
 
       };
 
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
 
       buildInputs = [
         kconfig
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index a9d7d357ad71..00c0da7a78e3 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ecm, makeQtWrapper
+{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
   };
 
-  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
 
   patches = [ ./0001-Disable-fno-operator-names.patch ];
 
diff --git a/pkgs/applications/graphics/kipi-plugins/default.nix b/pkgs/applications/graphics/kipi-plugins/default.nix
index 2f6cc8e4ece0..d27fdb8b53be 100644
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@@ -1,6 +1,6 @@
 {
   stdenv, fetchurl,
-  ecm,
+  extra-cmake-modules,
   karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
   libkipi, qtbase, qtsvg, qtxmlpatterns
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     cd extra/kipi-plugins
   '';
 
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
     qtbase qtsvg qtxmlpatterns
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 7acfa3a230b3..830c9e6899ea 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm,
+  extra-cmake-modules,
   akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
   akonadi
 }:
@@ -11,7 +11,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
   ];
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 26e1559c779e..ba4b4b50242c 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm,
+  extra-cmake-modules,
   akonadi, kdbusaddons, kio, kitemmodels, kmime
 }:
 
@@ -10,6 +10,6 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
 }
diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix
index 03483e5ec0d1..284ed60a9cbd 100644
--- a/pkgs/applications/kde/akonadi.nix
+++ b/pkgs/applications/kde/akonadi.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm,
+  extra-cmake-modules,
   kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
   kio,
   boost, kitemmodels
@@ -12,7 +12,7 @@ kdeApp {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
   ];
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 6b471614f5a6..f3adf1828de9 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,7 +1,7 @@
 {
   kdeApp, lib, kdeWrapper,
 
-  ecm, kdoctools, makeWrapper,
+  extra-cmake-modules, kdoctools, makeWrapper,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
   kservice, kpty, kwidgetsaddons, libarchive,
@@ -15,7 +15,7 @@ let
     kdeApp {
       name = "ark";
       nativeBuildInputs = [
-        ecm kdoctools makeWrapper
+        extra-cmake-modules kdoctools makeWrapper
       ];
       propagatedBuildInputs = [
         khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
index f6f3a7ce14ea..bb6803057096 100644
--- a/pkgs/applications/kde/baloo-widgets.nix
+++ b/pkgs/applications/kde/baloo-widgets.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
 }:
 
@@ -10,7 +10,7 @@ kdeApp {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
   ];
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index e9932adc5dca..7f436c7a55a9 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   dolphin, kdelibs4support, ki18n, kio, kxmlgui
 }:
 
@@ -10,7 +10,7 @@ kdeApp {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     dolphin.unwrapped kdelibs4support ki18n kio kxmlgui
   ];
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 9be40e9439b6..6515c230c284 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools, makeQtWrapper,
+  extra-cmake-modules, kdoctools, makeQtWrapper,
   baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
   kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
@@ -15,7 +15,7 @@ let
         license = with lib.licenses; [ gpl2 fdl12 ];
         maintainers = [ lib.maintainers.ttuegel ];
       };
-      nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
       propagatedBuildInputs = [
         baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
         kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
index c063b1e6035b..5dde6d8a64ea 100644
--- a/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/pkgs/applications/kde/ffmpegthumbs.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm,
+  extra-cmake-modules,
   ffmpeg, kio
 }:
 
@@ -10,6 +10,6 @@ kdeApp {
     license = with lib.licenses; [ gpl2 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ffmpeg kio ];
 }
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index e3d9172145c8..71ab51320ab1 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
@@ -12,7 +12,7 @@ let
         license = with lib.licenses; [ gpl2 ];
         maintainers = with lib.maintainers; [ fridh vcunat ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         kio kparts kxmlgui qtscript solid
       ];
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 37a1605fe70a..0fa06ed0fbe2 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
   libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
 }:
@@ -13,7 +13,7 @@ let
         license = with lib.licenses; [ gpl2 fdl12 ];
         maintainers = [ lib.maintainers.ttuegel ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
         libkipi phonon qtimageformats qtsvg qtx11extras
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 03cc0e1fe33b..cd320afd8d3b 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
@@ -15,7 +15,7 @@ let
         license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
         maintainers = [ lib.maintainers.ttuegel ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
         qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 10164692f770..8ec7591460e7 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
@@ -12,7 +12,7 @@ let
         license = with lib.licenses; [ gpl2 ];
         maintainers = [ lib.maintainers.fridh ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         gmp kconfig kconfigwidgets kguiaddons kinit knotifications
       ];
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index 1dc6ccbc44c4..c1266009b686 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, ki18n, kwidgetsaddons, kxmlgui
+  extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
 }:
 
 let
@@ -11,7 +11,7 @@ let
         license = with lib.licenses; [ mit ];
         maintainers = [ lib.maintainers.ttuegel ];
       };
-      nativeBuildInputs = [ ecm ];
+      nativeBuildInputs = [ extra-cmake-modules ];
       propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
     };
 in
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index 441d73d363d9..5143df60ef44 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm, ki18n,
+  extra-cmake-modules, ki18n,
   kcoreaddons, kconfig, kcodecs
 }:
 
@@ -10,6 +10,6 @@ kdeApp {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules ki18n ];
   buildInputs = [ kcoreaddons kconfig kcodecs ];
 }
diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
index 2b9cc0e35eb0..772ebe37e44f 100644
--- a/pkgs/applications/kde/kde-locale-5.nix
+++ b/pkgs/applications/kde/kde-locale-5.nix
@@ -1,6 +1,6 @@
 name: args:
 
-{ kdeApp, cmake, ecm, gettext, kdoctools }:
+{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
 
 kdeApp (args // {
   sname = "kde-l10n-${name}";
@@ -9,7 +9,7 @@ kdeApp (args // {
   outputs = [ "out" ];
 
   nativeBuildInputs =
-    [ cmake ecm gettext kdoctools ]
+    [ cmake extra-cmake-modules gettext kdoctools ]
     ++ (args.nativeBuildInputs or []);
 
   preConfigure = ''
diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
index 984524dc1b2b..e50c92f88848 100644
--- a/pkgs/applications/kde/kdegraphics-mobipocket.nix
+++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm,
+  extra-cmake-modules,
   kio
 }:
 
@@ -10,6 +10,6 @@ kdeApp {
     license = [ lib.licenses.gpl2Plus ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ kio ];
 }
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
index c3947226690f..5aa974a9c960 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm, kio, libkexiv2, libkdcraw
+  extra-cmake-modules, kio, libkexiv2, libkdcraw
 }:
 
 kdeApp {
@@ -9,6 +9,6 @@ kdeApp {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kio libkexiv2 libkdcraw ];
 }
diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
index 4aa119675285..20f81563c3b4 100644
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kcoreaddons, ki18n, kio, kwidgetsaddons, samba
 }:
 
@@ -10,6 +10,6 @@ kdeApp {
     license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kcoreaddons ki18n kio kwidgetsaddons samba ];
 }
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index c73eadc1df44..97e74eb2e125 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kcmutils
 }:
 
@@ -12,7 +12,7 @@ let
         license = with lib.licenses; [ gpl2 ];
         maintainers = [ lib.maintainers.peterhoeg ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         kcmutils
       ];
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index cd462acdf2b0..c44285982293 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm, kdoctools, ki18n,
+  extra-cmake-modules, kdoctools, ki18n,
   akonadi-contacts, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
   kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
@@ -8,7 +8,7 @@
 
 kdeApp {
   name = "kgpg";
-  nativeBuildInputs = [ ecm kdoctools ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
   buildInputs = [
     akonadi-contacts gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
     kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 3f13d131c77a..0579faa72a01 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
 }:
@@ -9,7 +9,7 @@ let
   unwrapped =
     kdeApp {
       name = "khelpcenter";
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       buildInputs = [
         grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
         kinit kcmutils kservice xapian
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 9636f82974b3..9f38079316fa 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper
-  , ecm, kdoctools, kparts
+  , extra-cmake-modules, kdoctools, kparts
   , qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
@@ -12,7 +12,7 @@ let
         license = with lib.licenses; [ gpl2 ];
         maintainers = with lib.maintainers; [ raskin ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       buildInputs = [
         kparts qtsvg qtxmlpatterns ktexteditor boost
       ];
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index fe3e3fad200b..77f795167fc0 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, ecm, kdoctools, shared_mime_info,
+  kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info,
   exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kguiaddons, kdnssd, kiconthemes, ki18n, kio, khtml,
   kdelibs4support, kpty, libmtp, libssh, openexr, ilmbase, openslp, phonon,
@@ -12,7 +12,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm kdoctools shared_mime_info ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ];
   propagatedBuildInputs = [
     exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
     kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index d60909ec7bc9..c17b3fdcd8e9 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib,
-  ecm, ki18n,
+  extra-cmake-modules, ki18n,
   kcodecs
 }:
 
@@ -10,6 +10,6 @@ kdeApp {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules ki18n ];
   buildInputs = [ kcodecs ];
 }
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index 46a67e06ee0b..6ab653cfce06 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
 }:
@@ -13,7 +13,7 @@ let
         license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
         maintainers = [ lib.maintainers.rongcuid ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
       propagatedBuildInputs = [
         kglobalaccel kxmlgui kcoreaddons kdelibs4support
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index 45789edbfcc8..660090dc84ae 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
@@ -9,7 +9,7 @@ let
     kdeApp {
       name = "kompare";
       meta = { license = with lib.licenses; [ gpl2 ]; };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         kparts ktexteditor kwidgetsaddons libkomparediff2
       ];
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 2dfd305b46b2..15b6373bdb02 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
@@ -15,7 +15,7 @@ let
         license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
         maintainers = [ lib.maintainers.ttuegel ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
         kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index 03c2ab3853a1..afa870d90a54 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -1,7 +1,7 @@
 { lib
 , kdeApp
 , kdeWrapper
-, ecm
+, extra-cmake-modules
 , kdoctools
 , kauth
 , kcmutils
@@ -19,7 +19,7 @@ let
       license = with lib.licenses; [ gpl2 ];
       maintainers = with lib.maintainers; [ fridh ];
     };
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [
       kauth
       kcmutils
diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
index 421f7dbb4cfe..179e9f414dc3 100644
--- a/pkgs/applications/kde/libkdcraw.nix
+++ b/pkgs/applications/kde/libkdcraw.nix
@@ -1,4 +1,4 @@
-{ kdeApp, lib, ecm, libraw }:
+{ kdeApp, lib, extra-cmake-modules, libraw, qtbase }:
 
 kdeApp {
   name = "libkdcraw";
@@ -6,6 +6,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ libraw ];
 }
diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
index 0fac0759ab6b..0991c5df5ab4 100644
--- a/pkgs/applications/kde/libkexiv2.nix
+++ b/pkgs/applications/kde/libkexiv2.nix
@@ -1,4 +1,4 @@
-{ kdeApp, lib, exiv2, ecm }:
+{ kdeApp, lib, exiv2, extra-cmake-modules, qtbase }:
 
 kdeApp {
   name = "libkexiv2";
@@ -6,6 +6,7 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ exiv2 ];
 }
diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix
index fa9dcc8323d1..32eeb171ff89 100644
--- a/pkgs/applications/kde/libkipi.nix
+++ b/pkgs/applications/kde/libkipi.nix
@@ -1,4 +1,4 @@
-{ kdeApp, lib, ecm, kconfig, ki18n, kservice, kxmlgui }:
+{ kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
 
 kdeApp {
   name = "libkipi";
@@ -6,6 +6,6 @@ kdeApp {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ];
 }
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
index 91b469fed3c7..aacc89a0efe3 100644
--- a/pkgs/applications/kde/libkomparediff2.nix
+++ b/pkgs/applications/kde/libkomparediff2.nix
@@ -1,7 +1,7 @@
-{ kdeApp, lib, ecm, ki18n, kxmlgui, kcodecs, kio }:
+{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
 
 kdeApp {
   name = "libkomparediff2";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
 }
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 5b8a82dbf098..c151396f2476 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,5 +1,5 @@
 { kdeApp, lib, kdeWrapper
-, ecm, qtscript, qtsvg, qtquickcontrols
+, extra-cmake-modules, qtscript, qtsvg, qtquickcontrols
 , gpsd
 }:
 
@@ -9,7 +9,7 @@ let
       name = "marble";
       meta.license = with lib.licenses; [ lgpl21 gpl3 ];
 
-      nativeBuildInputs = [ ecm ];
+      nativeBuildInputs = [ extra-cmake-modules ];
       propagatedBuildInputs = [
         qtscript qtsvg qtquickcontrols
         gpsd
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 6683b9876fcb..59520e285327 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
 }:
@@ -13,7 +13,7 @@ let
         license = with lib.licenses; [ gpl2 ];
         maintainers = with lib.maintainers; [ peterhoeg ];
       };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         kconfig kinit
         kcmutils kconfigwidgets knewstuff kparts qca-qt5
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 499e8cc93681..f5b3e38ca7c7 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
@@ -10,7 +10,7 @@
 let
   unwrapped = kdeApp {
     name = "okular";
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [
       djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
       kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index c4a82780b448..0a3d311eb27a 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, ecm,
+  kdeApp, lib, extra-cmake-modules,
   cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
@@ -11,7 +11,7 @@ kdeApp {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
     kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 4c3a5246b2e7..30abfc23e834 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,6 +1,6 @@
 {
   kdeApp, lib, kdeWrapper,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
   xcb-util-cursor
@@ -11,7 +11,7 @@ let
     kdeApp {
       name = "spectacle";
       meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
-      nativeBuildInputs = [ ecm kdoctools ];
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
         kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
         kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index a2137060ef64..8ce74850e1a4 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,6 +1,6 @@
 {
   kdeDerivation, kdeWrapper, fetchFromGitHub, lib,
-  ecm, kdoctools, kconfig, kinit, kjsembed,
+  extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed,
   taglib, exiv2, podofo
 }:
 
@@ -25,7 +25,7 @@ let
     };
 
     buildInputs = [ taglib exiv2 podofo ];
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [ kconfig kinit kjsembed ];
   };
 
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 8bce26deefc3..0d9f3834c615 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 , kdoctools
 , kdeWrapper
-, ecm
+, extra-cmake-modules
 , karchive
 , kcrash
 , kdbusaddons
@@ -43,7 +43,7 @@ let
     ];
 
     nativeBuildInputs = [
-      ecm kdoctools
+      extra-cmake-modules kdoctools
     ];
 
     meta = {
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 9724ae5f4bf0..6f4bc2af79f2 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,7 +1,7 @@
 { kdeDerivation
 , lib
 , fetchurl
-, ecm
+, extra-cmake-modules
 , kbookmarks
 , karchive
 , kconfig
@@ -64,7 +64,7 @@ let
     ];
 
     nativeBuildInputs = [
-      ecm
+      extra-cmake-modules
       kdoctools
     ];
 
diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix
index 7e47838c4f98..73cd26b2a6e8 100644
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake
-, ecm, qtbase, qtscript
+, extra-cmake-modules, qtbase, qtscript
 , ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
 , libktorrent, boost, taglib
 }:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       })
     ];
 
-  nativeBuildInputs = [ kdoctools ecm ];
+  nativeBuildInputs = [ kdoctools extra-cmake-modules ];
 
   buildInputs =
     [ cmake qtbase qtscript
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 7315b84d7f37..fd709aa76603 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
 , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, libssh, zlib, cmake, ecm
+, libssh, zlib, cmake, extra-cmake-modules
 , withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
 , withQt ? false, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
@@ -24,7 +24,7 @@ in stdenv.mkDerivation {
   };
 
   buildInputs = [
-    bison cmake ecm flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
+    bison cmake extra-cmake-modules flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
     geoip c-ares python glib zlib
   ] ++ (optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
     ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 42cc9b0c6eb1..acf60bd03755 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee,
+{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper, qtwebkit, qtscript, grantlee,
   kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
   kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
   knotifyconfig, krunner, libofx }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
   };
 
-  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
 
   buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
     kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 1deef241a62f..d0e784998132 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, ecm, shared_mime_info,
+  plasmaPackage, extra-cmake-modules, shared_mime_info,
   bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
   knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
 }:
 
 plasmaPackage {
   name = "bluedevil";
-  nativeBuildInputs = [ ecm shared_mime_info ];
+  nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
   propagatedBuildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 57de2fa2d474..4048d98431db 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -1,9 +1,11 @@
 { plasmaPackage
-, ecm
+, extra-cmake-modules
+, qtbase
 }:
 
 plasmaPackage {
   name = "breeze-gtk";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 0de1ca1f6802..dfbdf48165aa 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -1,12 +1,12 @@
 {
   plasmaPackage, lib, copyPathsToStore,
-  ecm,
+  extra-cmake-modules,
   plymouth
 }:
 
 plasmaPackage {
   name = "breeze-plymouth";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ plymouth ];
   outputs = [ "out" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index ea2776a13c59..a1b64a4656cb 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage,
-  ecm,
+  extra-cmake-modules,
   frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
   kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
 }:
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "breeze-qt5";
   sname = "breeze";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
     kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index bb90fd6d3ab0..282e58ecf9e6 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,12 +1,12 @@
 { plasmaPackage
-, ecm
+, extra-cmake-modules
 , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
 , kwindowsystem, kxmlgui
 }:
 
 plasmaPackage {
   name = "kactivitymanagerd";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
     kxmlgui
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 33a7340cb85f..87a46703997a 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, ecm,
+  plasmaPackage, extra-cmake-modules,
   kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
   kwindowsystem, qtsvg, qtx11extras
 }:
 
 plasmaPackage {
   name = "kde-cli-tools";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
     qtx11extras
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 10e55f0d6980..f482f2a6a3f3 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,5 +1,5 @@
 { plasmaPackage
-, ecm
+, extra-cmake-modules
 , glib
 , gtk2
 , gtk3
@@ -15,7 +15,7 @@
 plasmaPackage {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index a0f9d93e60b0..546f72c3f384 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -1,6 +1,7 @@
-{ plasmaPackage, ecm }:
+{ plasmaPackage, extra-cmake-modules, qtbase }:
 
 plasmaPackage {
   name = "kdecoration";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index a2805f5d804b..3371e17beaf8 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm, kdoctools
+{ plasmaPackage, extra-cmake-modules, kdoctools
 , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
 , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
 , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "kdeplasma-addons";
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
     kdoctools
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
index 70d7cc17a1ca..965c33e6eef8 100644
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, ecm, kdoctools, kdelibs4support
+{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
 , qtx11extras
 }:
 
 plasmaPackage {
   name = "kgamma5";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kdelibs4support qtx11extras ];
 }
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index f23a17e5479e..5360f6cf0b7c 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm, kdoctools, kcmutils
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
 , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
 , plasma-framework, plasma-workspace, qtx11extras
 , fetchpatch
@@ -6,7 +6,7 @@
 
 plasmaPackage {
   name = "khotkeys";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
 
   patches = [
     # Patch is in 5.9 and up.
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index 939e4fa62a9c..b4c8dc99adcb 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
   kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid
@@ -8,7 +8,7 @@
 
 plasmaPackage {
   name = "kinfocenter";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
index f10bf6bb3cdd..a27dc5dd92a8 100644
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -1,13 +1,13 @@
 {
   plasmaPackage,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
   sonnet
 }:
 
 plasmaPackage {
   name = "kmenuedit";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet
   ];
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index ecbd88c2146d..e0fbea5d7467 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -1,11 +1,11 @@
-{ plasmaPackage, ecm, kconfig, kconfigwidgets
+{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
 , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
 , libkscreen, qtdeclarative, qtgraphicaleffects
 }:
 
 plasmaPackage {
   name = "kscreen";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
     kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 3c5d7b374724..3551feab76fc 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -1,13 +1,13 @@
 {
   plasmaPackage,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
   kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
 }:
 
 plasmaPackage {
   name = "kscreenlocker";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
     libXcursor pam plasma-framework qtdeclarative wayland
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
index 80b529a66685..f1a6b82ae93c 100644
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, ecm, kdoctools, kcoreaddons
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
 , ki18n, kwallet, kwidgetsaddons
 }:
 
 plasmaPackage {
   name = "ksshaskpass";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
 }
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index f7e5cced708a..366b154cae70 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   lm_sensors,
   kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
   knewstuff, libksysguard, qtwebkit
@@ -8,7 +8,7 @@
 
 plasmaPackage {
   name = "ksysguard";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ lm_sensors ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index 86ba52292f9e..2789499c50a2 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,10 +1,10 @@
-{ plasmaPackage, ecm, pam, socat, libgcrypt
+{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt
 }:
 
 plasmaPackage {
   name = "kwallet-pam";
 
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
 
   buildInputs = [ pam socat libgcrypt ];
 
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
index 376e8ed7cbda..9045227a51a9 100644
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,5 +1,5 @@
 { plasmaPackage
-, ecm
+, extra-cmake-modules
 , kidletime
 , kwayland
 , kwindowsystem
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "kwayland-integration";
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
   ];
   propagatedBuildInputs = [
     kidletime kwindowsystem kwayland
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 73e40cdb114c..3555cf91e005 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage, lib, copyPathsToStore,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
   kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
   ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications,
@@ -12,7 +12,7 @@
 plasmaPackage {
   name = "kwin";
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
     kdoctools
   ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
index 8dd814f783d0..29498e93404d 100644
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, ecm, kcoreaddons, ki18n, kpty
+{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
 , knotifications, kdbusaddons
 }:
 
 plasmaPackage {
   name = "kwrited";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
 }
diff --git a/pkgs/desktops/plasma-5/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix
index 838ab6ef0e5c..4e04fd5ed1d9 100644
--- a/pkgs/desktops/plasma-5/libkscreen.nix
+++ b/pkgs/desktops/plasma-5/libkscreen.nix
@@ -1,5 +1,5 @@
 { plasmaPackage
-, ecm
+, extra-cmake-modules
 , kwayland, libXrandr
 , qtx11extras
 }:
@@ -7,7 +7,7 @@
 plasmaPackage {
   name = "libkscreen";
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
   ];
   propagatedBuildInputs = [
     kwayland libXrandr qtx11extras
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index 2d81d061f4c7..b67e041a7821 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage,
-  ecm,
+  extra-cmake-modules,
   kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
   kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
   qtx11extras
@@ -11,7 +11,7 @@ plasmaPackage {
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
   ];
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
     kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index dbf9d0b9e537..43f78d9e2a97 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm, qtscript, qtdeclarative
+{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
 , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
 , krunner
 }:
@@ -6,7 +6,7 @@
 plasmaPackage {
   name = "milou";
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
   ];
   propagatedBuildInputs = [
     kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index ca63c8d7a377..b4ff775264f8 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage, kdeWrapper,
-  ecm,
+  extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
   ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
 }:
@@ -8,7 +8,7 @@
 let
   unwrapped = plasmaPackage {
     name = "oxygen";
-    nativeBuildInputs = [ ecm ];
+    nativeBuildInputs = [ extra-cmake-modules ];
     propagatedBuildInputs = [
       frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
       ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 21ceec25d53f..1ac257057309 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage, lib, copyPathsToStore,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
   kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
   kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
@@ -13,7 +13,7 @@
 
 plasmaPackage rec {
   name = "plasma-desktop";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff
     knotifications knotifyconfig kwallet libcanberra_kde libXcursor
diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
index e8680fea930a..97d30dcd7732 100644
--- a/pkgs/desktops/plasma-5/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm
+{ plasmaPackage, extra-cmake-modules
 , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
 , libXcursor
 }:
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "plasma-integration";
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
   ];
   buildInputs = [
     breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index b6d18dbf91d9..da57653bb083 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, substituteAll, ecm, kdoctools
+{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
 , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
 , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
@@ -15,7 +15,7 @@ plasmaPackage {
       inherit mobile_broadband_provider_info;
     })
   ];
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
     qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index 7bf97d745fe4..f398e1a9efc0 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,6 +1,6 @@
 {
   plasmaPackage,
-  ecm,
+  extra-cmake-modules,
   gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
   ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
 }:
@@ -8,7 +8,7 @@
 plasmaPackage {
   name = "plasma-pa";
   nativeBuildInputs = [
-    ecm kdoctools
+    extra-cmake-modules kdoctools
   ];
   propagatedBuildInputs = [
     gconf glib kconfigwidgets kcoreaddons kdeclarative
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index 6ffdb17cbeab..8af9caaa5795 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,11 +1,11 @@
 { plasmaPackage
-, ecm
+, extra-cmake-modules
 }:
 
 plasmaPackage {
   name = "plasma-workspace-wallpapers";
   outputs = [ "out" ];
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
   ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 1e38c0c74dd4..19d530da1a60 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,7 +1,7 @@
 {
   plasmaPackage, lib, copyPathsToStore,
 
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
 
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
@@ -14,7 +14,7 @@
 plasmaPackage {
   name = "plasma-workspace";
 
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index 002c2bb10ff3..1d7d20a7ffbf 100644
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, ecm,
+  plasmaPackage, extra-cmake-modules,
   kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
   kwidgetsaddons, kwindowsystem, polkit-qt
 }:
 
 plasmaPackage {
   name = "polkit-kde-agent";
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
     knotifications kwindowsystem polkit-qt
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index c0c18a6eae6c..c3469cc2ebc8 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, ecm, kdoctools, bluez-qt, kactivities
+{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities
 , kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
 , kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
 , plasma-workspace, qtx11extras, solid, udev
@@ -6,7 +6,7 @@
 
 plasmaPackage {
   name = "powerdevil";
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
     kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 407d0e916264..32ea83d9d507 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, ecm, kdoctools, makeQtWrapper,
+  plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
   kservice, kwindowsystem, kxmlgui, qtquickcontrols
 }:
 
 plasmaPackage {
   name = "systemsettings";
-  nativeBuildInputs = [ ecm kdoctools makeQtWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index d34b3f3a2c5f..6533a05b1602 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -1,7 +1,8 @@
-{ kdeFramework, lib, ecm }:
+{ kdeFramework, lib, extra-cmake-modules, qtbase }:
 
 kdeFramework {
   name = "attica";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index 9c803fdc7176..dc7b6af193bc 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kauth, kconfig
+{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
 , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
 , kio, lmdb, qtbase, solid
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "baloo";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
     kidletime lmdb qtbase solid
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 7ab82bdc1ef5..93c945b58ca4 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -1,12 +1,12 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , qtdeclarative
 }:
 
 kdeFramework {
   name = "bluez-qt";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtdeclarative ];
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index c87ba75b2b46..9a18ade96a80 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib, ecm, qtsvg }:
+{ kdeFramework, lib, extra-cmake-modules, qtsvg }:
 
 kdeFramework {
   name = "breeze-icons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   outputs = [ "out" ];
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtsvg ];
   propagatedUserEnvPkgs = [ qtsvg.out ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 00965bd0a582..2906dc788865 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,87 +24,89 @@ existing packages here and modify it as necessary.
 
 */
 
-{ newScope, kdeDerivation, lib, fetchurl }:
+{ libsForQt5, kdeDerivation, lib, fetchurl }:
 
 let
-  callPackage = newScope {
-    kdeFramework = import ./build-support/framework.nix {
-      inherit kdeDerivation lib fetchurl;
+  packages = self: with self;
+    let
+      callPackage = self.newScope {
+        kdeFramework = import ./build-support/framework.nix {
+          inherit kdeDerivation lib fetchurl;
+        };
+      };
+    in {
+      attica = callPackage ./attica.nix {};
+      baloo = callPackage ./baloo.nix {};
+      bluez-qt = callPackage ./bluez-qt.nix {};
+      breeze-icons = callPackage ./breeze-icons.nix {};
+      extra-cmake-modules = callPackage ./extra-cmake-modules {};
+      frameworkintegration = callPackage ./frameworkintegration.nix {};
+      kactivities = callPackage ./kactivities.nix {};
+      kactivities-stats = callPackage ./kactivities-stats.nix {};
+      kapidox = callPackage ./kapidox.nix {};
+      karchive = callPackage ./karchive.nix {};
+      kauth = callPackage ./kauth {};
+      kbookmarks = callPackage ./kbookmarks.nix {};
+      kcmutils = callPackage ./kcmutils {};
+      kcodecs = callPackage ./kcodecs.nix {};
+      kcompletion = callPackage ./kcompletion.nix {};
+      kconfig = callPackage ./kconfig.nix {};
+      kconfigwidgets = callPackage ./kconfigwidgets {};
+      kcoreaddons = callPackage ./kcoreaddons.nix {};
+      kcrash = callPackage ./kcrash.nix {};
+      kdbusaddons = callPackage ./kdbusaddons.nix {};
+      kdeclarative = callPackage ./kdeclarative.nix {};
+      kded = callPackage ./kded.nix {};
+      kdelibs4support = callPackage ./kdelibs4support {};
+      kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+      kdesu = callPackage ./kdesu.nix {};
+      kdnssd = callPackage ./kdnssd.nix {};
+      kdoctools = callPackage ./kdoctools {};
+      kemoticons = callPackage ./kemoticons.nix {};
+      kfilemetadata = callPackage ./kfilemetadata {};
+      kglobalaccel = callPackage ./kglobalaccel.nix {};
+      kguiaddons = callPackage ./kguiaddons.nix {};
+      khtml = callPackage ./khtml.nix {};
+      ki18n = callPackage ./ki18n.nix {};
+      kiconthemes = callPackage ./kiconthemes {};
+      kidletime = callPackage ./kidletime.nix {};
+      kimageformats = callPackage ./kimageformats.nix {};
+      kinit = callPackage ./kinit {};
+      kio = callPackage ./kio {};
+      kitemmodels = callPackage ./kitemmodels.nix {};
+      kitemviews = callPackage ./kitemviews.nix {};
+      kjobwidgets = callPackage ./kjobwidgets.nix {};
+      kjs = callPackage ./kjs.nix {};
+      kjsembed = callPackage ./kjsembed.nix {};
+      kmediaplayer = callPackage ./kmediaplayer.nix {};
+      knewstuff = callPackage ./knewstuff.nix {};
+      knotifications = callPackage ./knotifications.nix {};
+      knotifyconfig = callPackage ./knotifyconfig.nix {};
+      kpackage = callPackage ./kpackage {};
+      kparts = callPackage ./kparts.nix {};
+      kpeople = callPackage ./kpeople.nix {};
+      kplotting = callPackage ./kplotting.nix {};
+      kpty = callPackage ./kpty.nix {};
+      kross = callPackage ./kross.nix {};
+      krunner = callPackage ./krunner.nix {};
+      kservice = callPackage ./kservice {};
+      ktexteditor = callPackage ./ktexteditor.nix {};
+      ktextwidgets = callPackage ./ktextwidgets.nix {};
+      kunitconversion = callPackage ./kunitconversion.nix {};
+      kwallet = callPackage ./kwallet.nix {};
+      kwayland = callPackage ./kwayland.nix {};
+      kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+      kwindowsystem = callPackage ./kwindowsystem.nix {};
+      kxmlgui = callPackage ./kxmlgui.nix {};
+      kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+      modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+      networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+      oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
+      plasma-framework = callPackage ./plasma-framework.nix {};
+      solid = callPackage ./solid.nix {};
+      sonnet = callPackage ./sonnet.nix {};
+      syntax-highlighting = callPackage ./syntax-highlighting.nix {};
+      threadweaver = callPackage ./threadweaver.nix {};
     };
-  };
-in
-{
-  attica = callPackage ./attica.nix {};
-  baloo = callPackage ./baloo.nix {};
-  bluez-qt = callPackage ./bluez-qt.nix {};
-  breeze-icons = callPackage ./breeze-icons.nix {};
-  ecm = callPackage ./extra-cmake-modules {};
-  ecmNoHooks = callPackage ./extra-cmake-modules/no-hooks.nix { };
-  frameworkintegration = callPackage ./frameworkintegration.nix {};
-  kactivities = callPackage ./kactivities.nix {};
-  kactivities-stats = callPackage ./kactivities-stats.nix {};
-  kapidox = callPackage ./kapidox.nix {};
-  karchive = callPackage ./karchive.nix {};
-  kauth = callPackage ./kauth {};
-  kbookmarks = callPackage ./kbookmarks.nix {};
-  kcmutils = callPackage ./kcmutils {};
-  kcodecs = callPackage ./kcodecs.nix {};
-  kcompletion = callPackage ./kcompletion.nix {};
-  kconfig = callPackage ./kconfig.nix {};
-  kconfigwidgets = callPackage ./kconfigwidgets {};
-  kcoreaddons = callPackage ./kcoreaddons.nix {};
-  kcrash = callPackage ./kcrash.nix {};
-  kdbusaddons = callPackage ./kdbusaddons.nix {};
-  kdeclarative = callPackage ./kdeclarative.nix {};
-  kded = callPackage ./kded.nix {};
-  kdelibs4support = callPackage ./kdelibs4support {};
-  kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-  kdesu = callPackage ./kdesu.nix {};
-  kdnssd = callPackage ./kdnssd.nix {};
-  kdoctools = callPackage ./kdoctools {};
-  kemoticons = callPackage ./kemoticons.nix {};
-  kfilemetadata = callPackage ./kfilemetadata {};
-  kglobalaccel = callPackage ./kglobalaccel.nix {};
-  kguiaddons = callPackage ./kguiaddons.nix {};
-  khtml = callPackage ./khtml.nix {};
-  ki18n = callPackage ./ki18n.nix {};
-  kiconthemes = callPackage ./kiconthemes {};
-  kidletime = callPackage ./kidletime.nix {};
-  kimageformats = callPackage ./kimageformats.nix {};
-  kinit = callPackage ./kinit {};
-  kio = callPackage ./kio {};
-  kitemmodels = callPackage ./kitemmodels.nix {};
-  kitemviews = callPackage ./kitemviews.nix {};
-  kjobwidgets = callPackage ./kjobwidgets.nix {};
-  kjs = callPackage ./kjs.nix {};
-  kjsembed = callPackage ./kjsembed.nix {};
-  kmediaplayer = callPackage ./kmediaplayer.nix {};
-  knewstuff = callPackage ./knewstuff.nix {};
-  knotifications = callPackage ./knotifications.nix {};
-  knotifyconfig = callPackage ./knotifyconfig.nix {};
-  kpackage = callPackage ./kpackage {};
-  kparts = callPackage ./kparts.nix {};
-  kpeople = callPackage ./kpeople.nix {};
-  kplotting = callPackage ./kplotting.nix {};
-  kpty = callPackage ./kpty.nix {};
-  kross = callPackage ./kross.nix {};
-  krunner = callPackage ./krunner.nix {};
-  kservice = callPackage ./kservice {};
-  ktexteditor = callPackage ./ktexteditor.nix {};
-  ktextwidgets = callPackage ./ktextwidgets.nix {};
-  kunitconversion = callPackage ./kunitconversion.nix {};
-  kwallet = callPackage ./kwallet.nix {};
-  kwayland = callPackage ./kwayland.nix {};
-  kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-  kwindowsystem = callPackage ./kwindowsystem.nix {};
-  kxmlgui = callPackage ./kxmlgui.nix {};
-  kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-  modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-  networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-  oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-  plasma-framework = callPackage ./plasma-framework.nix {};
-  solid = callPackage ./solid.nix {};
-  sonnet = callPackage ./sonnet.nix {};
-  syntax-highlighting = callPackage ./syntax-highlighting.nix {};
-  threadweaver = callPackage ./threadweaver.nix {};
-}
+
+in lib.makeScope libsForQt5.newScope packages
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 6c0919a23619..b2e3a371e965 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -1,6 +1,20 @@
-{ makeSetupHook, lib, cmake, ecmNoHooks, pkgconfig, qtbase, qttools }:
+{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig }:
 
-makeSetupHook {
-  deps = lib.chooseDevOutputs [ cmake ecmNoHooks pkgconfig qtbase qttools ];
+kdeFramework {
+  name = "extra-cmake-modules";
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
+
+  propagatedNativeBuildInputs = [ cmake pkgconfig ];
+
+  setupHook = ./setup-hook.sh;
+
+  meta = with lib; {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
+  };
 }
-./setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix
deleted file mode 100644
index 855d6bdb3d25..000000000000
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/no-hooks.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, cmake }:
-
-kdeFramework {
-  name = "extra-cmake-modules";
-
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
-  outputs = [ "out" ];  # this package has no runtime components
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
-    license = licenses.bsd2;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index a1638ca541be..9ee9ef90a44b 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -1,6 +1,6 @@
 _ecmSetXdgDirs() {
-    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
+    addToSearchPath XDG_DATA_DIRS "$1/share"
+    addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
 }
 
 envHooks+=(_ecmSetXdgDirs)
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 029a661601df..325758bf91db 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -1,6 +1,6 @@
 {
   kdeFramework, lib,
-  ecm,
+  extra-cmake-modules,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio,
   knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras
 }:
@@ -8,7 +8,7 @@
 kdeFramework {
   name = "frameworkintegration";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
     knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index 4f406376faa7..25188b009b62 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, ecm, boost, kactivities, kconfig }:
+{ kdeFramework, lib, extra-cmake-modules, boost, kactivities, kconfig }:
 
 kdeFramework {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ boost kactivities kconfig ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix
index a2cacd4b257d..167c3f15bbda 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, boost, kcmutils, kconfig
+{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
 , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
 , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kactivities";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
     ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix
index f6c60b7731e1..749cf9b29709 100644
--- a/pkgs/development/libraries/kde-frameworks/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix
@@ -1,7 +1,7 @@
-{ kdeFramework, lib, ecm, python }:
+{ kdeFramework, lib, extra-cmake-modules, python }:
 
 kdeFramework {
   name = "kapidox";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm python ];
+  nativeBuildInputs = [ extra-cmake-modules python ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 265df45800f1..ca3321bef849 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -1,7 +1,8 @@
-{ kdeFramework, lib, ecm }:
+{ kdeFramework, lib, extra-cmake-modules, qtbase }:
 
 kdeFramework {
   name = "karchive";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index f2a1c7717d5d..7561575ae84e 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, copyPathsToStore, ecm, kcoreaddons, polkit-qt }:
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }:
 
 kdeFramework {
   name = "kauth";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ kcoreaddons polkit-qt ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index 50cec5a39c86..36ea74058429 100644
--- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
@@ -1,12 +1,12 @@
 {
-  kdeFramework, lib, ecm,
+  kdeFramework, lib, extra-cmake-modules,
   kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
 }:
 
 kdeFramework {
   name = "kbookmarks";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index dd1af737d68e..fdf55174548e 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kconfigwidgets
+{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
 , kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
 , kpackage, kservice, kxmlgui
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kcmutils";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
     kpackage kservice kxmlgui
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index a3fcd3023f52..482c30b7b57e 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -1,7 +1,8 @@
-{ kdeFramework, lib, ecm }:
+{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
 
 kdeFramework {
   name = "kcodecs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index 893f374933ea..f143524889ad 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -1,8 +1,9 @@
-{ kdeFramework, lib, ecm, kconfig, kwidgetsaddons }:
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }:
 
 kdeFramework {
   name = "kcompletion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ kconfig kwidgetsaddons ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index 0f003f8ea97e..981256e75bf6 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -1,7 +1,8 @@
-{ kdeFramework, lib, ecm }:
+{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
 
 kdeFramework {
   name = "kconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index b88308b634c0..c44473bb915e 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
@@ -1,12 +1,12 @@
 {
-  kdeFramework, lib, ecm,
+  kdeFramework, lib, extra-cmake-modules,
   kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
 }:
 
 kdeFramework {
   name = "kconfigwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index ca8c521894bd..f5d04a30b1ae 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,8 +1,9 @@
-{ kdeFramework, lib, fetchurl, ecm, shared_mime_info }:
+{ kdeFramework, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
 
 kdeFramework {
   name = "kcoreaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ shared_mime_info ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix
index 2fcadc828cf4..bd008c732af7 100644
--- a/pkgs/development/libraries/kde-frameworks/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, ecm, kcoreaddons, kwindowsystem, qtx11extras }:
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
 
 kdeFramework {
   name = "kcrash";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index 663200516604..bc5aeff556d8 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, ecm, qtx11extras }:
+{ kdeFramework, lib, extra-cmake-modules, qttools, qtx11extras }:
 
 kdeFramework {
   name = "kdbusaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index a90a419d9b84..05eaffb9fbf6 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -1,5 +1,5 @@
 {
-  kdeFramework, lib, ecm,
+  kdeFramework, lib, extra-cmake-modules,
   epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
   kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
 }:
@@ -7,7 +7,7 @@
 kdeFramework {
   name = "kdeclarative";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
     kwidgetsaddons kwindowsystem qtdeclarative
diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix
index d8fe820518d3..2da1bac8f39c 100644
--- a/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks/kded.nix
@@ -1,12 +1,12 @@
 {
-  kdeFramework, lib, ecm,
+  kdeFramework, lib, extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
 }:
 
 kdeFramework {
   name = "kded";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kcrash kdbusaddons kinit kservice
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index f3fd315e5500..1174972917e4 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, ecm, docbook_xml_dtd_45, kauth
+, extra-cmake-modules, docbook_xml_dtd_45, kauth
 , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
 , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
@@ -15,7 +15,7 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
     kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index e87bb5bf9d01..8e17a1a60c8d 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , kcompletion
 , kconfig
 , kconfigwidgets
@@ -18,7 +18,7 @@
 kdeFramework {
   name = "kdesignerplugin";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
     kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix
index 0c5cb85cc494..fcccea9161f1 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib, ecm, kcoreaddons, ki18n, kpty
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
 , kservice
 }:
 
 kdeFramework {
   name = "kdesu";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 49fd368fccbf..ad86b660c747 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -1,11 +1,12 @@
 { kdeFramework, lib
-, ecm
-, avahi
+, extra-cmake-modules, qttools
+, avahi, qtbase
 }:
 
 kdeFramework {
   name = "kdnssd";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ avahi ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 4a31ea5396df..99fc4c7d023c 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -1,11 +1,11 @@
-{ kdeFramework, lib, ecm, docbook_xml_dtd_45
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
 , docbook5_xsl, karchive, ki18n, perl, perlPackages
 }:
 
 kdeFramework {
   name = "kdoctools";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ karchive ki18n ];
   propagatedNativeBuildInputs = [ perl perlPackages.URI ];
   cmakeFlags = [
diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index cdffbd503576..1e31277172d7 100644
--- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , karchive
 , kconfig
 , kcoreaddons
@@ -9,6 +9,6 @@
 kdeFramework {
   name = "kemoticons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index 31f692deca64..bc7349e7453f 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, copyPathsToStore, ecm
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
 , attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
 }:
 
@@ -6,7 +6,7 @@ kdeFramework {
   name = "kfilemetadata";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index bbb480c31658..1c1336dd4d0f 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -1,5 +1,5 @@
 {
-  kdeFramework, lib, ecm,
+  kdeFramework, lib, extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
   qtx11extras
 }:
@@ -7,7 +7,7 @@
 kdeFramework {
   name = "kglobalaccel";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 9f20ecd598a4..6ebfd1104f70 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , qtx11extras
 }:
 
 kdeFramework {
   name = "kguiaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index be1094b7cf5a..99f6fe31e0d7 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, giflib, karchive
+{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
 , kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
 , knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
 , kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
@@ -7,7 +7,7 @@
 kdeFramework {
   name = "khtml";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm perl ];
+  nativeBuildInputs = [ extra-cmake-modules perl ];
   propagatedBuildInputs = [
     giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
     knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index cf2212413bd2..2698a97fd33f 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , gettext
 , python
 , qtdeclarative
@@ -9,7 +9,7 @@
 kdeFramework {
   name = "ki18n";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtdeclarative qtscript ];
   propagatedNativeBuildInputs = [ gettext python ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index 6141db849efe..6102bb0d4b56 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, ecm
+, extra-cmake-modules
 , karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
 }:
 
@@ -7,6 +7,6 @@ kdeFramework {
   name = "kiconthemes";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index d3f46512db23..758260517e7d 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , qtbase
 , qtx11extras
 }:
@@ -7,6 +7,6 @@
 kdeFramework {
   name = "kidletime";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 631cac4217c8..2a8e825893bf 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,14 +1,14 @@
 {
   kdeFramework, lib,
-  ecm,
-  ilmbase, karchive
+  extra-cmake-modules,
+  ilmbase, karchive, qtbase
 }:
 
 kdeFramework {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
-  buildInputs = [ ilmbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ ilmbase qtbase ];
   propagatedBuildInputs = [ karchive ];
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index 032bdd30d9ec..b965f761e922 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -1,13 +1,13 @@
 {
   kdeFramework, lib, copyPathsToStore,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kconfig, kcrash, ki18n, kio, kservice, kwindowsystem
 }:
 
 kdeFramework {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kconfig kcrash ki18n kio kservice kwindowsystem
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 7623e44a0761..cb67c8459034 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, ecm, acl, karchive
+, extra-cmake-modules, acl, karchive
 , kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
 , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
@@ -10,7 +10,7 @@
 kdeFramework {
   name = "kio";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
     kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index 0a474dfdb7d7..d6538e57698c 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -1,9 +1,10 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules, qtbase
 }:
 
 kdeFramework {
   name = "kitemmodels";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 0af3de5770a9..f114c007038b 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -1,9 +1,10 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules, qtbase, qttools
 }:
 
 kdeFramework {
   name = "kitemviews";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index 1337f4109c2d..ddc66d2eb20a 100644
--- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
@@ -1,13 +1,13 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , kcoreaddons
 , kwidgetsaddons
-, qtx11extras
+, qttools, qtx11extras
 }:
 
 kdeFramework {
   name = "kjobwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index 12852e6a1e77..abdc15ce8df6 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
@@ -1,10 +1,10 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , kdoctools
 }:
 
 kdeFramework {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index 20c8b2eea162..95bc02422f1b 100644
--- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib, ecm, kdoctools, ki18n, kjs
+{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
 , qtsvg
 }:
 
 kdeFramework {
   name = "kjsembed";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ ki18n kjs qtsvg ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index 360d8e90daf2..93a6b450f762 100644
--- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , kparts
 , kxmlgui
 }:
@@ -7,6 +7,6 @@
 kdeFramework {
   name = "kmediaplayer";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kparts kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
index b6a84e2539d2..002418c65ad0 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, attica, karchive
+{ kdeFramework, lib, extra-cmake-modules, attica, karchive
 , kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
 , kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "knewstuff";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
     kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index 061a5d8d142a..c1c079578725 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
@@ -1,15 +1,15 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules
 , kcodecs, kconfig, kcoreaddons, kwindowsystem
 , libdbusmenu
 , phonon
-, qtx11extras
+, qttools, qtx11extras
 }:
 
 kdeFramework {
   name = "knotifications";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [
     kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index b64f109f08b1..0e357aecb999 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib, ecm, kcompletion, kconfig
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
 , ki18n, kio, phonon
 }:
 
 kdeFramework {
   name = "knotifyconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index 86ca5935a75d..2953aea9a557 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,13 +1,13 @@
 {
   kdeFramework, fetchurl, lib, copyPathsToStore,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   karchive, kconfig, kcoreaddons, ki18n
 }:
 
 kdeFramework {
   name = "kpackage";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix
index a46fa210b276..ad6ea2dbc305 100644
--- a/pkgs/development/libraries/kde-frameworks/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kparts.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kconfig, kcoreaddons
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
 , ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
 , ktextwidgets, kwidgetsaddons, kxmlgui
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kparts";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
     kservice ktextwidgets kwidgetsaddons kxmlgui
diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix
index 4ca9bc7fdbf9..6acb5e2eed51 100644
--- a/pkgs/development/libraries/kde-frameworks/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix
@@ -1,11 +1,11 @@
-{ kdeFramework, lib, ecm, kcoreaddons, ki18n
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
 , kitemviews, kservice, kwidgetsaddons, qtdeclarative
 }:
 
 kdeFramework {
   name = "kpeople";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 6eda06445dc5..3fa8283d06c4 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -1,9 +1,10 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules, qtbase
 }:
 
 kdeFramework {
   name = "kplotting";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix
index d42f96fb92c5..8bdaacb85f82 100644
--- a/pkgs/development/libraries/kde-frameworks/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpty.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, ecm, kcoreaddons, ki18n }:
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
 
 kdeFramework {
   name = "kpty";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix
index ae098654eb11..0e66d95b5cce 100644
--- a/pkgs/development/libraries/kde-frameworks/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks/kross.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kcompletion, kcoreaddons
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
 , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
 , kxmlgui, qtscript
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kross";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
     qtscript
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index 064a89e08067..ec9ab7abe9f9 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kconfig, kcoreaddons
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
 , ki18n, kio, kservice, plasma-framework, solid
 , threadweaver
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "krunner";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kconfig kcoreaddons ki18n kio kservice plasma-framework solid
     threadweaver
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index ca840fc8b71a..2751a7f5d6e0 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -1,13 +1,13 @@
 {
   kdeFramework, lib, copyPathsToStore,
-  bison, ecm, flex,
+  bison, extra-cmake-modules, flex,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
 }:
 
 kdeFramework {
   name = "kservice";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  propagatedNativeBuildInputs = [ bison ecm flex ];
+  propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ];
   nativeBuildInputs = [ kdoctools ];
   propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index 0e444cc8db68..fbd73c65eff6 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib, copyPathsToStore
-, ecm, perl
+, extra-cmake-modules, perl
 , karchive, kconfig, kguiaddons, kiconthemes, kparts
 , libgit2
 , qtscript, qtxmlpatterns
@@ -9,7 +9,7 @@
 kdeFramework {
   name = "ktexteditor";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm perl ];
+  nativeBuildInputs = [ extra-cmake-modules perl ];
   propagatedBuildInputs = [
     karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
     qtxmlpatterns sonnet syntax-highlighting
diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 3a1258e9a37b..25954c603971 100644
--- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kcompletion, kconfig
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
 , kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
 , sonnet
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "ktextwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
     sonnet
diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index 136587cc682e..c04ded722aa4 100644
--- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, ecm, ki18n }:
+{ kdeFramework, lib, extra-cmake-modules, ki18n }:
 
 kdeFramework {
   name = "kunitconversion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index fb801f48b119..f02c6138df77 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, kconfig, kconfigwidgets
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
 , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
 , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kwallet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
     knotifications kservice kwidgetsaddons kwindowsystem libgcrypt
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index c530bf80a90e..b5255022a86d 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,13 +1,14 @@
 { kdeFramework
-, ecm
-, wayland
+, extra-cmake-modules
+, qtbase, wayland
 }:
 
 kdeFramework {
   name = "kwayland";
   nativeBuildInputs = [
-    ecm
+    extra-cmake-modules
   ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [
     wayland
   ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index ae34e60c4c12..c5c0063c4634 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -1,9 +1,10 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules, qtbase, qttools
 }:
 
 kdeFramework {
   name = "kwidgetsaddons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
index 64186a30eadc..e55c4021b9ed 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, ecm
-, qtx11extras
+, extra-cmake-modules
+, qttools, qtx11extras
 }:
 
 kdeFramework {
   name = "kwindowsystem";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index c48fc9efdfad..ea800bf58ae0 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, ecm, attica, kconfig
+{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
 , kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
 , ktextwidgets, kwindowsystem, sonnet
 }:
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "kxmlgui";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
     ktextwidgets kwindowsystem sonnet
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index 31301875351f..f20f4a223945 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, ecm, ki18n, kio }:
+{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
 
 kdeFramework {
   name = "kxmlrpcclient";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n kio ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index bf3487dcb391..b4d05678dc2f 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -1,11 +1,12 @@
 { kdeFramework, lib
-, ecm
-, modemmanager
+, extra-cmake-modules
+, modemmanager, qtbase
 }:
 
 kdeFramework {
   name = "modemmanager-qt";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ modemmanager ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index bb5968635388..9d765eac95cc 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -1,11 +1,12 @@
 { kdeFramework, lib
-, ecm
-, networkmanager
+, extra-cmake-modules
+, qtbase, networkmanager
 }:
 
 kdeFramework {
   name = "networkmanager-qt";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
   propagatedBuildInputs = [ networkmanager ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 42978b46992d..1d45b51274c5 100644
--- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
+++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
@@ -1,6 +1,6 @@
 { kdeFramework
 , lib
-, ecm
+, extra-cmake-modules, qtbase
 }:
 
 kdeFramework {
@@ -10,5 +10,6 @@ kdeFramework {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   outputs = [ "out" ];
-  nativeBuildInputs = [ ecm ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 963e93227279..2fd667af0dc1 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, fetchurl, ecm, kactivities, karchive
+{ kdeFramework, lib, fetchurl, extra-cmake-modules, kactivities, karchive
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
 , knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui
@@ -8,7 +8,7 @@
 kdeFramework {
   name = "plasma-framework";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index de10a7345581..330b64035a12 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -1,12 +1,12 @@
 {
   kdeFramework, lib,
-  bison, ecm, flex,
-  qtdeclarative
+  bison, extra-cmake-modules, flex,
+  qtdeclarative, qttools
 }:
 
 kdeFramework {
   name = "solid";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ bison ecm flex ];
+  nativeBuildInputs = [ bison extra-cmake-modules flex qttools ];
   propagatedBuildInputs = [ qtdeclarative ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 8b1cf6a2cd11..190f2bae1b82 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -1,11 +1,11 @@
 { kdeFramework, lib
-, ecm
-, hunspell
+, extra-cmake-modules
+, hunspell, qtbase, qttools
 }:
 
 kdeFramework {
   name = "sonnet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm ];
-  buildInputs = [ hunspell ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [ hunspell qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index 24b1bbc4f674..155e9fb8961b 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -1,9 +1,10 @@
 { kdeFramework, lib
-, ecm, perl
+, extra-cmake-modules, perl, qtbase, qttools
 }:
 
 kdeFramework {
   name = "syntax-highlighting";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ ecm perl ];
+  nativeBuildInputs = [ extra-cmake-modules perl qttools ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index 6d3dff604132..bf36a21e9ec6 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -1,9 +1,10 @@
 { kdeFramework, lib
-, ecm
+, extra-cmake-modules, qtbase
 }:
 
 kdeFramework {
   name = "threadweaver";
-  nativeBuildInputs = [ ecm ];
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kirigami/default.nix b/pkgs/development/libraries/kirigami/default.nix
index 0fd80d7fa538..66e67e6b8538 100644
--- a/pkgs/development/libraries/kirigami/default.nix
+++ b/pkgs/development/libraries/kirigami/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols }:
+{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols }:
 
 stdenv.mkDerivation rec {
   pname = "kirigami";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtquickcontrols plasma-framework ];
 
-  nativeBuildInputs = [ cmake pkgconfig ecm ];
+  nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
 
   meta = with stdenv.lib; {
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/kirigami/v2.nix b/pkgs/development/libraries/kirigami/v2.nix
index 7dc6e799bcf8..0b332d40329d 100644
--- a/pkgs/development/libraries/kirigami/v2.nix
+++ b/pkgs/development/libraries/kirigami/v2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ecm, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }:
+{ stdenv, fetchurl, cmake, extra-cmake-modules, pkgconfig, plasma-framework, qtbase, qtquickcontrols2 }:
 
 stdenv.mkDerivation rec {
   pname = "kirigami";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtquickcontrols2 plasma-framework ];
 
-  nativeBuildInputs = [ cmake pkgconfig ecm ];
+  nativeBuildInputs = [ cmake pkgconfig extra-cmake-modules ];
 
   meta = with stdenv.lib; {
     license = licenses.lgpl2;
diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix
index e5406d3a2a58..8b9778b269d1 100644
--- a/pkgs/development/libraries/libktorrent/default.nix
+++ b/pkgs/development/libraries/libktorrent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ecm
+{ stdenv, fetchurl, cmake, extra-cmake-modules
 , karchive, kcrash, ki18n, kio, solid
 , boost, gmp, qca-qt5, libgcrypt
 }:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ cmake ecm ];
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
   buildInputs = [ karchive kcrash ki18n kio solid qca-qt5 libgcrypt ];
 
   propagatedBuildInputs = [ gmp boost ];
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 31d8b7d7c8e0..defeb8db490f 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
-, qt4 ? null, ecm ? null, qtbase ? null, qttools ? null
+, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null
 , withQt5 ? false
 , debug ? false }:
 
@@ -32,7 +32,9 @@ stdenv.mkDerivation rec {
     [ mesa libpulseaudio ]
     ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]);
 
-  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 ecm;
+  nativeBuildInputs =
+    [ cmake pkgconfig ]
+    ++ optional withQt5 extra-cmake-modules;
 
   NIX_CFLAGS_COMPILE = "-fPIC";
 
diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index 5d151b9c9a3e..69aa84951a4e 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -1,5 +1,5 @@
 {
-  stdenv, fetchFromGitHub, cmake, ecm,
+  stdenv, fetchFromGitHub, cmake, extra-cmake-modules,
   zlib, boost162, libunwind, elfutils, sparsehash,
   qtbase, kio, kitemmodels, threadweaver, kconfigwidgets, kcoreaddons,
 }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dqchd2r4khv9gzj4n0qjii2nqygkj5jclkji8jbvivx5qwsqznc";
   };
 
-  nativeBuildInputs = [ cmake ecm ];
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
   buildInputs = [
     zlib boost162 libunwind elfutils sparsehash
     qtbase kio kitemmodels threadweaver kconfigwidgets kcoreaddons
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 9f8f2df358a5..350cda4e2630 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, ecm, makeQtWrapper
+{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeQtWrapper
 , boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
 
 let
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [
-    cmake ecm makeQtWrapper
+    cmake extra-cmake-modules makeQtWrapper
     boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
   ];
 
diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix
index 7dc48db104c9..0c8e9d6bceef 100644
--- a/pkgs/tools/misc/colord-kde/default.nix
+++ b/pkgs/tools/misc/colord-kde/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl
-, ecm, ki18n
+, extra-cmake-modules, ki18n
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils
 , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem
 , kitemviews, lcms2, libXrandr, qtx11extras
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0brdnpflm95vf4l41clrqxwvjrdwhs859n7401wxcykkmw4m0m3c";
   };
 
-  nativeBuildInputs = [ ecm ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules ki18n ];
 
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix
index c32a814f2328..33ccf28cb0da 100644
--- a/pkgs/tools/misc/kdecoration-viewer/default.nix
+++ b/pkgs/tools/misc/kdecoration-viewer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, cmake, ecm, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
+, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
 
 stdenv.mkDerivation rec {
   name = "kdecoration-viewer-2015-08-20";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1cc4xxv72a82p1w9r76090xba7g069r41bi4zx32k4gz3vyl1am6";
   };
 
-  buildInputs = [ cmake ecm qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
+  buildInputs = [ cmake extra-cmake-modules qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
 
   meta = with stdenv.lib; {
     description = "Allows to preview a KDecoration plugin";
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 598d01266233..5ba2543e273d 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,6 +1,6 @@
 {
   kdeDerivation, kdeWrapper, fetchurl, lib,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   kconfig, kinit
 }:
 
@@ -19,7 +19,7 @@ let
       license = licenses.gpl2;
       maintainers = with maintainers; [ peterhoeg ];
     };
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [ kconfig kinit ];
   };
 in
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 61e9fae906b5..1c7a28e29756 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,6 +1,6 @@
 {
   kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
-  ecm, kdoctools,
+  extra-cmake-modules, kdoctools,
   baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
@@ -21,7 +21,7 @@ let
       sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
     };
 
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
 
     propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
 
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index f1ae958ed637..b53d619d837c 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,6 +1,6 @@
 {
   kdeDerivation, kdeWrapper, lib, fetchgit,
-  ecm, kdoctools, kconfig, kinit, kparts
+  extra-cmake-modules, kdoctools, kconfig, kinit, kparts
 }:
 
 let
@@ -18,7 +18,7 @@ let
 
     preConfigure = "cd kdiff3";
 
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
 
     propagatedBuildInputs = [ kconfig kinit kparts ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 297aae6147e1..0571966d15b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6292,7 +6292,7 @@ with pkgs;
   cmakeWithGui = cmakeCurses.override { useQt4 = true; };
 
   # Does not actually depend on Qt 5
-  extra-cmake-modules = libsForQt5.ecmNoHooks;
+  inherit (kdeFrameworks) extra-cmake-modules;
 
   coccinelle = callPackage ../development/tools/misc/coccinelle {
     ocamlPackages = ocamlPackages_4_01_0;
@@ -7852,6 +7852,16 @@ with pkgs;
 
   judy = callPackage ../development/libraries/judy { };
 
+  kdeFrameworks =
+    let
+      mkFrameworks = import ../development/libraries/kde-frameworks;
+      attrs = {
+        inherit libsForQt5;
+        inherit kdeDerivation lib fetchurl;
+      };
+    in
+      recurseIntoAttrs (makeOverridable mkFrameworks attrs);
+
   kdelibs4 = kdeApplications.kdelibs;
 
   keybinder = callPackage ../development/libraries/keybinder {
@@ -9341,12 +9351,14 @@ with pkgs;
 
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 
-  mkLibsForQt5 = self: with self;
-    let kdeFrameworks = import ../development/libraries/kde-frameworks {
-          inherit (self) newScope;
-          inherit kdeDerivation lib fetchurl;
-        };
-    in {
+  mkLibsForQt5 = self: with self; {
+
+    ### KDE FRAMEWORKS
+
+    inherit (kdeFrameworks.override { libsForQt5 = self; })
+      attica;
+
+    ### LIBRARIES
 
     ### BUILD SUPPORT
 
@@ -9426,7 +9438,7 @@ with pkgs;
 
     qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
 
-  } // kdeFrameworks;
+  };
 
   qtEnv = qt5.env;
   qt5Full = qt5.full;
@@ -12140,6 +12152,8 @@ with pkgs;
 
   bgnet = callPackage ../data/documentation/bgnet { };
 
+  inherit (kdeFrameworks) breeze-icons;
+
   cacert = callPackage ../data/misc/cacert { };
 
   caladea = callPackage ../data/fonts/caladea {};
@@ -12376,6 +12390,8 @@ with pkgs;
 
   oxygenfonts = callPackage ../data/fonts/oxygenfonts { };
 
+  inherit (kdeFrameworks) oxygen-icons5;
+
   paper-icon-theme = callPackage ../data/icons/paper-icon-theme { };
 
   pecita = callPackage ../data/fonts/pecita {};

From e8ad7f057031118a89e305473ca60c59e3464a50 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 14:59:00 -0600
Subject: [PATCH 1287/3449] qt5: Add compatibility attribute for qtquick1

---
 pkgs/development/libraries/qt-5/5.6/default.nix | 1 +
 pkgs/development/libraries/qt-5/5.7/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index fd6b622344ac..37b6eb7f3d3c 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -93,6 +93,7 @@ let
       qtmultimedia = callPackage ./qtmultimedia.nix {
         inherit gstreamer gst-plugins-base;
       };
+      qtquick1 = null;
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
       qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
       qtscript = callPackage ./qtscript {};
diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index 0fbcdfd9ebd8..85b38c6fc6ce 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -79,6 +79,7 @@ let
       qtmultimedia = callPackage ./qtmultimedia.nix {
         inherit gstreamer gst-plugins-base;
       };
+      qtquick1 = null;
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
       qtquickcontrols2 = callPackage ./qtquickcontrols2.nix {};
       qtscript = callPackage ./qtscript {};

From ef36b2ecbf1d8398a8e2bb6548a2c192513894f1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 14:59:55 -0600
Subject: [PATCH 1288/3449] calligra: Rename oxygen-icons5 dependency

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

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index ad9cb9e5ff01..154ff33c8449 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -2,7 +2,7 @@
 , exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
 , libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
 , freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
-, kactivities, okular, git, oxygen_icons, makeWrapper
+, kactivities, okular, git, oxygen-icons5, makeWrapper
 # TODO: not found
 #, xbase, openjpeg
 # TODO: package libWPS, Spnav, m2mml, LibEtonyek
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     for i in $out/bin/*; do
       wrapProgram $i \
         --prefix PATH ':' "${pstoedit.out}/bin" \
-        --prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share"
+        --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
     done
   '';
 

From 1d710276323497e8267137be94825251fcc96248 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 15:00:36 -0600
Subject: [PATCH 1289/3449] qt55: Add compatibility attribute for
 qtquickcontrols2

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

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 607696dc562a..b7e8fb33387e 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -88,6 +88,7 @@ let
       };
       qtquick1 = callPackage ./qtquick1 {};
       qtquickcontrols = callPackage ./qtquickcontrols.nix {};
+      qtquickcontrols2 = null;
       qtscript = callPackage ./qtscript {};
       qtsensors = callPackage ./qtsensors.nix {};
       qtserialport = callPackage ./qtserialport {};

From b58b07f903853c0de2db001c25f3a83a27d603ab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 15:02:32 -0600
Subject: [PATCH 1290/3449] mkLibsForQt5: Inherit libraries from Plasma 5 and
 KDE Applications

---
 pkgs/desktops/lxqt/default.nix  |  8 ++--
 pkgs/top-level/all-packages.nix | 79 +++++++++++++++++++++------------
 2 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 00e36e342fac..71eff8a1b0fa 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -35,9 +35,7 @@ let
     lxqt-about = callPackage ./core/lxqt-about { };
     lxqt-admin = callPackage ./core/lxqt-admin { };
     lxqt-common = callPackage ./core/lxqt-common { };
-    lxqt-config = callPackage ./core/lxqt-config {
-      inherit (pkgs.plasma5) libkscreen;
-    };
+    lxqt-config = callPackage ./core/lxqt-config { };
     lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { };
     lxqt-l10n = callPackage ./core/lxqt-l10n { };
     lxqt-notificationd = callPackage ./core/lxqt-notificationd { };
@@ -67,7 +65,7 @@ let
     preRequisitePackages = [
       pkgs.gvfs # virtual file systems support for PCManFM-QT
       pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel
-      pkgs.plasma5.libkscreen # provides plugins for screen management software
+      pkgs.libsForQt5.libkscreen # provides plugins for screen management software
       pkgs.libfm
       pkgs.libfm-extra
       pkgs.lxmenu-data
@@ -120,7 +118,7 @@ let
       qlipper
 
       ### Default icon theme
-      qt5.oxygen-icons5
+      pkgs.oxygen-icons5
 
       ### Screen saver
       pkgs.xscreensaver
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0571966d15b4..9cc37f01069e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6292,7 +6292,7 @@ with pkgs;
   cmakeWithGui = cmakeCurses.override { useQt4 = true; };
 
   # Does not actually depend on Qt 5
-  inherit (kdeFrameworks) extra-cmake-modules;
+  inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;
 
   coccinelle = callPackage ../development/tools/misc/coccinelle {
     ocamlPackages = ocamlPackages_4_01_0;
@@ -9356,11 +9356,27 @@ with pkgs;
     ### KDE FRAMEWORKS
 
     inherit (kdeFrameworks.override { libsForQt5 = self; })
-      attica;
+      attica baloo bluez-qt frameworkintegration kactivities kactivities-stats
+      karchive kauth kbookmarks kcmutils kcodecs kcompletion kconfig
+      kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support
+      kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons
+      khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews
+      kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications
+      knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner
+      kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
+      kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
+      networkmanager-qt plasma-framework solid sonnet syntax-highlighting
+      threadweaver;
 
-    ### LIBRARIES
+    ### KDE PLASMA 5
 
-    ### BUILD SUPPORT
+    inherit (plasma5.override { libsForQt5 = self; })
+      kdecoration libkscreen libksysguard plasma-integration;
+
+    ### KDE APPLICATIONS
+
+    inherit (kdeApplications.override { libsForQt5 = self; })
+      libkdcraw libkexiv2 libkipi libkomparediff2;
 
     ### LIBRARIES
 
@@ -12814,7 +12830,6 @@ with pkgs;
 
   calligra = kde4.callPackage ../applications/office/calligra {
     vc = vc_0_7;
-    oxygen_icons = libsForQt5.oxygen-icons5;
   };
 
   camlistore = callPackage ../applications/misc/camlistore { };
@@ -14071,29 +14086,34 @@ with pkgs;
 
   kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
-  kdeApplications = recurseIntoAttrs (import ../applications/kde {
-    inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
-    inherit kdeDerivation plasma5;
-    inherit attica phonon;
-  });
+  kdeApplications =
+    let
+      mkApplications = import ../applications/kde;
+      attrs = {
+        inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
+        inherit kdeDerivation plasma5;
+        inherit attica phonon;
+      };
+    in
+      recurseIntoAttrs (makeOverridable mkApplications attrs);
+
+  inherit (kdeApplications)
+    ark dolphin filelight gwenview kate kdenlive kcalc kcolorchooser kgpg
+    khelpcenter kig konsole marble okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
-  kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer {
-    inherit (plasma5) kdecoration;
-  };
+  kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { };
+
+  inherit (kdeFrameworks) kdesu;
 
   kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix {};
 
   kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
-    inherit (kdeApplications) konsole;
-    inherit (plasma5) libksysguard;
     llvmPackages = llvmPackages_38;
   };
 
-  kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {
-    inherit (kdeApplications) libkomparediff2;
-  };
+  kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix { };
 
   keepnote = callPackage ../applications/office/keepnote { };
 
@@ -14115,18 +14135,14 @@ with pkgs;
     qt = qt4;
   };
 
-  kile = libsForQt5.callPackage ../applications/editors/kile {
-    inherit (kdeApplications) konsole;
-  };
+  kile = libsForQt5.callPackage ../applications/editors/kile { };
 
   kino = callPackage ../applications/video/kino {
     inherit (gnome2) libglade;
     ffmpeg = ffmpeg_2;
   };
 
-  kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins {
-    inherit (kdeApplications) libkipi;
-  };
+  kipi-plugins = libsForQt5.callPackage ../applications/graphics/kipi-plugins { };
 
   kiwix = callPackage ../applications/misc/kiwix {
     stdenv = overrideCC stdenv gcc49;
@@ -16838,10 +16854,17 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
-  plasma5 = recurseIntoAttrs (import ../desktops/plasma-5 {
-    inherit libsForQt5 kdeDerivation lib fetchurl;
-    inherit (gnome3) gconf;
-  });
+  inherit (kdeFrameworks) kded kinit;
+
+  plasma5 =
+    let
+      mkPlasma5 = import ../desktops/plasma-5;
+      attrs = {
+        inherit libsForQt5 kdeDerivation lib fetchurl;
+        inherit (gnome3) gconf;
+      };
+    in
+      recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
 
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg;

From 6a115a247c7f0a1283a1787cbd4554face376d94 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 18:44:35 -0600
Subject: [PATCH 1291/3449] Export KDE packages at top level

---
 pkgs/applications/kde/default.nix |  4 +--
 pkgs/top-level/all-packages.nix   | 45 +++++++++++++++++++------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index e638378ddbb4..fff0df35d052 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -85,9 +85,7 @@ let
       okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       print-manager = callPackage ./print-manager.nix {};
-      spectacle = callPackage ./spectacle.nix {
-        inherit (plasma5) kscreen;
-      };
+      spectacle = callPackage ./spectacle.nix {};
 
       l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
     };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9cc37f01069e..b46121b8c3e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9356,7 +9356,7 @@ with pkgs;
     ### KDE FRAMEWORKS
 
     inherit (kdeFrameworks.override { libsForQt5 = self; })
-      attica baloo bluez-qt frameworkintegration kactivities kactivities-stats
+      attica baloo bluez-qt kactivities kactivities-stats
       karchive kauth kbookmarks kcmutils kcodecs kcompletion kconfig
       kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support
       kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons
@@ -9371,7 +9371,7 @@ with pkgs;
     ### KDE PLASMA 5
 
     inherit (plasma5.override { libsForQt5 = self; })
-      kdecoration libkscreen libksysguard plasma-integration;
+      kdecoration khotkeys libkscreen libksysguard;
 
     ### KDE APPLICATIONS
 
@@ -14098,8 +14098,9 @@ with pkgs;
       recurseIntoAttrs (makeOverridable mkApplications attrs);
 
   inherit (kdeApplications)
-    ark dolphin filelight gwenview kate kdenlive kcalc kcolorchooser kgpg
-    khelpcenter kig konsole marble okteta okular spectacle;
+    akonadi ark dolphin ffmpegthumbs filelight gwenview kate
+    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole marble
+    okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
@@ -16268,7 +16269,6 @@ with pkgs;
   dhewm3 = callPackage ../games/dhewm3 {};
 
   digikam = libsForQt5.callPackage ../applications/graphics/digikam {
-    inherit (kdeApplications) libkipi marble;
     inherit (plasma5) oxygen;
     boost = boost160;
   };
@@ -16854,18 +16854,6 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
-  inherit (kdeFrameworks) kded kinit;
-
-  plasma5 =
-    let
-      mkPlasma5 = import ../desktops/plasma-5;
-      attrs = {
-        inherit libsForQt5 kdeDerivation lib fetchurl;
-        inherit (gnome3) gconf;
-      };
-    in
-      recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
-
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg;
   };
@@ -16895,6 +16883,29 @@ with pkgs;
 
   xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
 
+  ### DESKTOP ENVIRONMENTS / PLASMA 5
+
+  plasma5 =
+    let
+      mkPlasma5 = import ../desktops/plasma-5;
+      attrs = {
+        inherit libsForQt5 kdeDerivation lib fetchurl;
+        inherit (gnome3) gconf;
+      };
+    in
+      recurseIntoAttrs (makeOverridable mkPlasma5 attrs);
+
+  inherit (kdeFrameworks) kded kinit frameworkintegration;
+
+  inherit (plasma5)
+    bluedevil breeze-gtk breeze-qt4 breeze-qt5 breeze-grub breeze-plymouth
+    kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
+    kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
+    kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop
+    plasma-integration plasma-nm plasma-pa plasma-workspace
+    plasma-workspace-wallpapers polkit-kde-agent powerdevil startkde
+    systemsettings;
+
   ### SCIENCE
 
   ### SCIENCE/GEOMETRY

From 6542ea7f3102dcde476b102cb5cb7fb99f75e852 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 26 Feb 2017 18:50:09 -0600
Subject: [PATCH 1292/3449] qt5: 5.6.2 -> 5.7.1

---
 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 b46121b8c3e6..b477a9df8320 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9346,8 +9346,8 @@ with pkgs;
 
   libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5);
 
-  qt5 = qt56;
-  libsForQt5 = libsForQt56;
+  qt5 = qt57;
+  libsForQt5 = libsForQt57;
 
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 

From 1d14e19fd436081f4568d3701ed53f0b4ab19261 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 27 Feb 2017 08:22:33 -0600
Subject: [PATCH 1293/3449] plasma5: 5.8.5 -> 5.8.6

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

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 76f05bad0a77..7d127211956b 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.8.5/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.6/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index 5360f6cf0b7c..2b02e5916b9f 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -7,14 +7,6 @@
 plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-
-  patches = [
-    # Patch is in 5.9 and up.
-    (fetchpatch {
-      url = "https://cgit.kde.org/khotkeys.git/patch/?id=f8f7eaaf41e2b95ebfa4b2e35c6ee252524a471b";
-      sha256 = "1wxx3qv16jd623jh728xcda8i4y1daq25skwilhv4cfvqxyzk7nn";
-    })
-  ];
   propagatedBuildInputs = [
     kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
     qtx11extras kcmutils kdbusaddons kxmlgui
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 03ee867453b6..aaaea8708ae6 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/bluedevil-5.8.5.tar.xz";
-      sha256 = "07gj3m5f0rk26n0xm4yddsfny6l2sh0airm45hb33p7m5inaqzgv";
-      name = "bluedevil-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/bluedevil-5.8.6.tar.xz";
+      sha256 = "0qz9v5wrx72s3r1shi3m77931kl7sx7p89dk3h9w1hy61bx0azlj";
+      name = "bluedevil-5.8.6.tar.xz";
     };
   };
   breeze = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/breeze-5.8.5.tar.xz";
-      sha256 = "1gcns00iq7a5f1a0w6vf8zck669gzcd785fiybnvc6s6q8x4bp61";
-      name = "breeze-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/breeze-5.8.6.tar.xz";
+      sha256 = "16wxrmnlk359kapa6zj8hfcjjdffvmqc7ibzdxdd8xpdva01p7sm";
+      name = "breeze-5.8.6.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/breeze-grub-5.8.5.tar.xz";
-      sha256 = "12ynrxdfcraphbwv9yrfhvwf3xkzrw0raqvgi7ksz5cvh78kl5qf";
-      name = "breeze-grub-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/breeze-grub-5.8.6.tar.xz";
+      sha256 = "1ywlczid32a8z4rrjxc6c3b8q3l02a3b7scbxyljgfv7xzggj1fm";
+      name = "breeze-grub-5.8.6.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/breeze-gtk-5.8.5.tar.xz";
-      sha256 = "15dx5hl9w9fiash30vgkbww6h7hck0dr42hh8gzysn0xyf0fzpgd";
-      name = "breeze-gtk-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/breeze-gtk-5.8.6.tar.xz";
+      sha256 = "1ppxsf868d2v9kmdz18hnbdwwqbs0xhpn7pc3bdxxj4gk87dpxpl";
+      name = "breeze-gtk-5.8.6.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/breeze-plymouth-5.8.5.tar.xz";
-      sha256 = "1ryb2jrzw0bzpi7ig4h5k0i33d2qviqsjxw7mnqxcb9q49a4ziq1";
-      name = "breeze-plymouth-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/breeze-plymouth-5.8.6.tar.xz";
+      sha256 = "0cdrl0ri4b5zbld8wb3hkmsncac6qn3mswvb7zp63br3jiqfg7v8";
+      name = "breeze-plymouth-5.8.6.tar.xz";
     };
   };
   discover = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/discover-5.8.5.tar.xz";
-      sha256 = "0fr6mksqw46aghfzj78nlq3f89xd63vq2hr4c3gb4vkl5y8v08hg";
-      name = "discover-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/discover-5.8.6.tar.xz";
+      sha256 = "04smq3n0prs2bjq6sn5kd5mp4aay58nr2fg10yq39sgyp2qkls0r";
+      name = "discover-5.8.6.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kactivitymanagerd-5.8.5.tar.xz";
-      sha256 = "07cqnbyznn5wy7vrqyid8h5ah7h3sb3pb30qlm83b4m29bkhggwh";
-      name = "kactivitymanagerd-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kactivitymanagerd-5.8.6.tar.xz";
+      sha256 = "0cxpf3aj22ap6m24gm1ybjykwv10ryqhpd4bv6wr748ckj5zsgh4";
+      name = "kactivitymanagerd-5.8.6.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kde-cli-tools-5.8.5.tar.xz";
-      sha256 = "1ig9x5h9xkzis9izggkjpiiy4sm77pk347jdngx01qpacz68iyp7";
-      name = "kde-cli-tools-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kde-cli-tools-5.8.6.tar.xz";
+      sha256 = "08j6mpn6g4mrdwiljfm5rqvyfjgd3wd4kpwmpmvrprqrd755m0cs";
+      name = "kde-cli-tools-5.8.6.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kdecoration-5.8.5.tar.xz";
-      sha256 = "1vhw57pj9i5224i9irk4qmingvkg5bip11vsqiwhmn5307bpnfiq";
-      name = "kdecoration-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kdecoration-5.8.6.tar.xz";
+      sha256 = "0nbh0phgfzc5j1l1adnq3gn5fkazgk2pg2iiqjkfbax6a7r9wwny";
+      name = "kdecoration-5.8.6.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kde-gtk-config-5.8.5.tar.xz";
-      sha256 = "1j0mzmmdhqd3a8papps6cad0gqn081mc4kqzi2hjai7038l6951r";
-      name = "kde-gtk-config-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kde-gtk-config-5.8.6.tar.xz";
+      sha256 = "07in78awn7kqg47zbypj5lb2i9yibrmpzkljjy67wwcwax5zlm2d";
+      name = "kde-gtk-config-5.8.6.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kdeplasma-addons-5.8.5.tar.xz";
-      sha256 = "181kagb4nbl9a7akk79slwkb7m2j4vyhabagih0z8l45wl5wrz9d";
-      name = "kdeplasma-addons-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kdeplasma-addons-5.8.6.tar.xz";
+      sha256 = "0yvh2n736apbfzqc5kdf3b0a9jyvlzcaamall1paa8jb8cg706px";
+      name = "kdeplasma-addons-5.8.6.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kgamma5-5.8.5.tar.xz";
-      sha256 = "073z4w4i2hwsqqgxcfl0w8d57nhzc069h9zwp7fv93aaw4mgzci2";
-      name = "kgamma5-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kgamma5-5.8.6.tar.xz";
+      sha256 = "1kk9bygihnggm4kmgxf1bbd0wc92ijmzvm9k5cmkm3v0pc975viz";
+      name = "kgamma5-5.8.6.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/khotkeys-5.8.5.tar.xz";
-      sha256 = "1fh0z9vfb908nbwj3snkf9z55jbcb5id87k5sa0v8dhazmp91ylh";
-      name = "khotkeys-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/khotkeys-5.8.6.tar.xz";
+      sha256 = "0x6z025vzpccz0yql7nafcarq6rpw3p7d7wjffdck3lym8vkalxj";
+      name = "khotkeys-5.8.6.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kinfocenter-5.8.5.tar.xz";
-      sha256 = "1fksnb9klbcrr9ly6dd2yx5y1ngcwcln43zykpc76pr4i49jpggp";
-      name = "kinfocenter-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kinfocenter-5.8.6.tar.xz";
+      sha256 = "1d8h5h01dy7s1yaapamcz4dzf0pjdykf7jn8y34hc0djxww29k4b";
+      name = "kinfocenter-5.8.6.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kmenuedit-5.8.5.tar.xz";
-      sha256 = "1vq5f69w75lj81nz75db88lqxc4zvhicd5w7r6k7amggnwxm9f3m";
-      name = "kmenuedit-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kmenuedit-5.8.6.tar.xz";
+      sha256 = "0zvircfmggc4vwz6520i67s1yfv34zkx8ydj1vfhaabpsn7nqn1w";
+      name = "kmenuedit-5.8.6.tar.xz";
     };
   };
   kscreen = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kscreen-5.8.5.tar.xz";
-      sha256 = "069x3vsfqirmq8r7yfa68srhjvygdwsxcj0b4vvb7zivs29zn1mh";
-      name = "kscreen-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kscreen-5.8.6.tar.xz";
+      sha256 = "15k8pm1k2ylxqb3x4b75zi68firsxq56qfn39xddxnzncbsqp54r";
+      name = "kscreen-5.8.6.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kscreenlocker-5.8.5.tar.xz";
-      sha256 = "11b2v3chhk1ma5kjbmf35qahfr8gbaw78mcqs8vw5m9x74vlimkj";
-      name = "kscreenlocker-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kscreenlocker-5.8.6.tar.xz";
+      sha256 = "1cql5wq4zh8sdwlgwibnyyx169g79948nhdqslw08ddw61f9llgd";
+      name = "kscreenlocker-5.8.6.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/ksshaskpass-5.8.5.tar.xz";
-      sha256 = "1gr48f4akrn0yhlnjw4yaas6ah5z40fb8iz06gi1dzry5axfmaxh";
-      name = "ksshaskpass-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/ksshaskpass-5.8.6.tar.xz";
+      sha256 = "0y912dcvdx6gih0brnxnd3cysw0rj5pw7684xswaqz5i8iimw68g";
+      name = "ksshaskpass-5.8.6.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/ksysguard-5.8.5.tar.xz";
-      sha256 = "1gd81y2a459j5k1mpikfrvwcz7v09m526nrl7kpr4l4a1ps8zfy9";
-      name = "ksysguard-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/ksysguard-5.8.6.tar.xz";
+      sha256 = "0c0bxv5m0kziyqzwr6x46g4x2kahmq6n95kgcbihv74yvnn6v049";
+      name = "ksysguard-5.8.6.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kwallet-pam-5.8.5.tar.xz";
-      sha256 = "0310vr3p9fxl3vwdgklk0acx6w31pcpq8mi9yldahg1mkjqf7l44";
-      name = "kwallet-pam-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kwallet-pam-5.8.6.tar.xz";
+      sha256 = "1ii1035w8xqvkbm0ckj5iq4qq7fnbix7vyvwmdjm8m4xm0rr7g33";
+      name = "kwallet-pam-5.8.6.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kwayland-integration-5.8.5.tar.xz";
-      sha256 = "11f63mq7crsbrpdib16q8xg0hk8jr5x1cyv43q8qdqm0591cglli";
-      name = "kwayland-integration-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kwayland-integration-5.8.6.tar.xz";
+      sha256 = "0bd8hnqr6sqlzk0qrymk6jdxnl2niamb1a08m8d27qdybm0ga56v";
+      name = "kwayland-integration-5.8.6.tar.xz";
     };
   };
   kwin = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kwin-5.8.5.tar.xz";
-      sha256 = "182z17d4sad9j15qagx9yz13wwzcyy6hlgpy5nlx6dlfcb8s00x7";
-      name = "kwin-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kwin-5.8.6.tar.xz";
+      sha256 = "1p9dgh6d25h41bgnx9jiyb9qg7jyc61kbzh9j9vy9j5kd97dsjg5";
+      name = "kwin-5.8.6.tar.xz";
     };
   };
   kwrited = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/kwrited-5.8.5.tar.xz";
-      sha256 = "1nsr244niyq2bk29s0cqq1p2qj0h1hx4nl13nc3x3aycfhfkjfkr";
-      name = "kwrited-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/kwrited-5.8.6.tar.xz";
+      sha256 = "08frbgzfzqhi4si3v024lx4dypxvm60mdz2xzyyx482iqjny97d5";
+      name = "kwrited-5.8.6.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/libkscreen-5.8.5.tar.xz";
-      sha256 = "1zj2nzyl0nmg5za3iwr4q4nzfv69f35f0394b6k0g3dgh1zxmby9";
-      name = "libkscreen-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/libkscreen-5.8.6.tar.xz";
+      sha256 = "0210lyvsk9wm7svj3bkaa9j0n57lfzs56jplasdqdia1450n7dmf";
+      name = "libkscreen-5.8.6.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/libksysguard-5.8.5.tar.xz";
-      sha256 = "1acp4kzdjhipsqw90n3rc1ydbkqhb12afwdsfl25fibv0c39avwp";
-      name = "libksysguard-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/libksysguard-5.8.6.tar.xz";
+      sha256 = "0i325hzl9zsknkr1dcdg64r4msrnvbb4b9rmjysygnpyll6n9bm8";
+      name = "libksysguard-5.8.6.tar.xz";
     };
   };
   milou = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/milou-5.8.5.tar.xz";
-      sha256 = "0lj5cb43jkqs8qg2acs39dkfwskbw135ap65vxiv27ivxscyvz3d";
-      name = "milou-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/milou-5.8.6.tar.xz";
+      sha256 = "00svi7f9pa1m6gxkkf8vngyf4jzv7k88pbcnlvik38zws17j4vbs";
+      name = "milou-5.8.6.tar.xz";
     };
   };
   oxygen = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/oxygen-5.8.5.tar.xz";
-      sha256 = "199jcn6qzyihxmw38b1cl0ah0rzn7f574khx72n9x5y9143p9lh7";
-      name = "oxygen-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/oxygen-5.8.6.tar.xz";
+      sha256 = "1dspmzjmymnnv6blz2sfw0ynpqbw6cqzvhlnmzakf3xq8jd99k0m";
+      name = "oxygen-5.8.6.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-desktop-5.8.5.tar.xz";
-      sha256 = "045990fvhqpwhfi6jqpkzhgbhc3lwvwhkia1y77m12n1djbynpnr";
-      name = "plasma-desktop-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-desktop-5.8.6.tar.xz";
+      sha256 = "10qz1r777wr8wdr5lb7fph8ny8sxbm9vlq6njpn9rxxwr0nhlp6y";
+      name = "plasma-desktop-5.8.6.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-integration-5.8.5.tar.xz";
-      sha256 = "1sm7027ywz8xxqfsjv6jvk8zx11kx83rx88bb8cy31qfjipsakfb";
-      name = "plasma-integration-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-integration-5.8.6.tar.xz";
+      sha256 = "0v07i95xxv5rp0lis2xm0p66qicbigqjlx3sxyvcj3llf73jpcnc";
+      name = "plasma-integration-5.8.6.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-nm-5.8.5.tar.xz";
-      sha256 = "1g1yyzc8y2hsgycficvavpl5yizd54ns93cdky9cgsrnxlkfwbvc";
-      name = "plasma-nm-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-nm-5.8.6.tar.xz";
+      sha256 = "162756r2rif415w8x6x67h8bwjvvmfv56s84p7a4k5zisyr1j678";
+      name = "plasma-nm-5.8.6.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-pa-5.8.5.tar.xz";
-      sha256 = "0vg1dyxfg8rxzyh0xnk41c95zp8rdbx1w462llrwchzp29p3xg1b";
-      name = "plasma-pa-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-pa-5.8.6.tar.xz";
+      sha256 = "173w2ks2nm4sp96vj3pkax1d8asshd9y39m5cwq8mgzgpz6ldjp8";
+      name = "plasma-pa-5.8.6.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-sdk-5.8.5.tar.xz";
-      sha256 = "13lyb5x4a8aq4fykvdv1137yvc4s4q31fdxhxppza1wkw8lvbvpd";
-      name = "plasma-sdk-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-sdk-5.8.6.tar.xz";
+      sha256 = "1vadfwv23r33f5byaf3zj8m12a84r4qk24ak7qyq869m9gznyw8r";
+      name = "plasma-sdk-5.8.6.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-tests-5.8.5.tar.xz";
-      sha256 = "0wgqyqlqygi3z0cccpfrpi259jp4yhh2g4x3mqcxisv58mbjrj1b";
-      name = "plasma-tests-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-tests-5.8.6.tar.xz";
+      sha256 = "0baqfn861jy7kmaqka79k6nkr7vivzymk8jy3glkh21rm4yl8gvh";
+      name = "plasma-tests-5.8.6.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-5.8.5.tar.xz";
-      sha256 = "18bf5wmyb198jnbpivjjwsk65sksrvzlvykx3mr3wvj30mr0f9bd";
-      name = "plasma-workspace-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-5.8.6.tar.xz";
+      sha256 = "14h1lmyyb4rxnww7vyn9wnsi56v9ydhpbwmk9sv3zj1k9igqpasi";
+      name = "plasma-workspace-5.8.6.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/plasma-workspace-wallpapers-5.8.5.tar.xz";
-      sha256 = "116s9qw888lbgxc9ggxf7fa99vggixr2ig1715xb5zmqm14yznyz";
-      name = "plasma-workspace-wallpapers-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-wallpapers-5.8.6.tar.xz";
+      sha256 = "11s2sc37xni78fyb0yvnhlkw6ahhx4pkynqr06bmd9vq6c3133id";
+      name = "plasma-workspace-wallpapers-5.8.6.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.8.5";
+    version = "1-5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/polkit-kde-agent-1-5.8.5.tar.xz";
-      sha256 = "1dwk848wljcd9bi0h58h0ljnjlz1qq50rd7i38f3cb848iipisw7";
-      name = "polkit-kde-agent-1-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/polkit-kde-agent-1-5.8.6.tar.xz";
+      sha256 = "10bglbr7svm9bfl4a5kfyvj5zpyk46hsyh2rq9z9qy9ds76fh9w2";
+      name = "polkit-kde-agent-1-5.8.6.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/powerdevil-5.8.5.tar.xz";
-      sha256 = "0lj7jcaqfsipiwi7x4q684p4pfsqzflvddr7hrhirfl1p62bc704";
-      name = "powerdevil-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/powerdevil-5.8.6.tar.xz";
+      sha256 = "0cmyx267z917qqpndpzqzlgzx1hf54430644rhr7cf9iqqilvnv4";
+      name = "powerdevil-5.8.6.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/sddm-kcm-5.8.5.tar.xz";
-      sha256 = "0dcvk3f3cqq4z5hc63ccpxyl3kknjvd8jsnx7r2hfrwsw0y90fqc";
-      name = "sddm-kcm-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/sddm-kcm-5.8.6.tar.xz";
+      sha256 = "0xd8137pb0409vfiwv5n1vzzwa1vcvf3rgc36fid5hnlrdc15ilc";
+      name = "sddm-kcm-5.8.6.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/systemsettings-5.8.5.tar.xz";
-      sha256 = "0pkwmgbjglbyc8i22hivh5gnaj742df3ff3f998k66k81mfjkwga";
-      name = "systemsettings-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/systemsettings-5.8.6.tar.xz";
+      sha256 = "1zy037pb8w9xbzg316hbqfmfm39aylqngb5v08yn5hcnvxcll71v";
+      name = "systemsettings-5.8.6.tar.xz";
     };
   };
   user-manager = {
-    version = "5.8.5";
+    version = "5.8.6";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.5/user-manager-5.8.5.tar.xz";
-      sha256 = "1ck8x860q3aqgbbgiwfdhs0i0bs2nhqqva19kl9x1b015p64gl5z";
-      name = "user-manager-5.8.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.8.6/user-manager-5.8.6.tar.xz";
+      sha256 = "1z0aj5cvl5rxikbbvrvg0dq6y68jxm34ssf3gvhkd0jqlyqdl7ip";
+      name = "user-manager-5.8.6.tar.xz";
     };
   };
 }

From e02b544e4d131d0f8223a84b56b146361d4be838 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 27 Feb 2017 11:01:51 -0600
Subject: [PATCH 1294/3449] ark: Make free by default

---
 pkgs/applications/kde/ark/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index f3adf1828de9..e1e25b2acf24 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  kdeApp, lib, config, kdeWrapper,
 
   extra-cmake-modules, kdoctools, makeWrapper,
 
@@ -7,7 +7,10 @@
   kservice, kpty, kwidgetsaddons, libarchive,
 
   # Archive tools
-  p7zip, unrar, unzipNLS, zip
+  p7zip, unzipNLS, zip,
+
+  # Unfree tools
+  unfreeEnableUnrar ? false, unrar,
 }:
 
 let
@@ -23,15 +26,16 @@ let
       ];
       postInstall =
         let
-          PATH = lib.makeBinPath [
-            p7zip unrar unzipNLS zip
-          ];
+          PATH =
+            lib.makeBinPath
+            ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
         in ''
           wrapProgram "$out/bin/ark" \
               --prefix PATH : "${PATH}"
         '';
       meta = {
-        license = with lib.licenses; [ gpl2 lgpl3 ];
+        license = with lib.licenses;
+          [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
         maintainers = [ lib.maintainers.ttuegel ];
       };
     };

From 8def08a56cf304fbc55090b280e35b798b72055a Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 27 Feb 2017 18:32:09 +0000
Subject: [PATCH 1295/3449] apache-kafka.service: pass in log4j config more
 explicitly

The implicit behavior of pulling it out of the classpath seemed not
to work properly and could be thrown off by other things on the
classpath also providing the properties file. This guarantees that
our settings stick.
---
 nixos/modules/services/misc/apache-kafka.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix
index cff053396885..82fa1cc2e7e5 100644
--- a/nixos/modules/services/misc/apache-kafka.nix
+++ b/nixos/modules/services/misc/apache-kafka.nix
@@ -19,13 +19,8 @@ let
         ${toString cfg.extraProperties}
       '';
 
-  configDir = pkgs.buildEnv {
-    name = "apache-kafka-conf";
-    paths = [
-      (pkgs.writeTextDir "server.properties" serverProperties)
-      (pkgs.writeTextDir "log4j.properties" cfg.log4jProperties)
-    ];
-  };
+  serverConfig = pkgs.writeText "server.properties" serverProperties;
+  logConfig = pkgs.writeText "log4j.properties" cfg.log4jProperties;
 
 in {
 
@@ -143,10 +138,11 @@ in {
       serviceConfig = {
         ExecStart = ''
           ${pkgs.jre}/bin/java \
-            -cp "${cfg.package}/libs/*:${configDir}" \
+            -cp "${cfg.package}/libs/*" \
+            -Dlog4j.configuration=file:${logConfig} \
             ${toString cfg.jvmOptions} \
             kafka.Kafka \
-            ${configDir}/server.properties
+            ${serverConfig}
         '';
         User = "apache-kafka";
         PermissionsStartOnly = true;

From c1f8c0879cb9e4d21f18b2332111ef1191753c41 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 27 Feb 2017 19:36:30 +0100
Subject: [PATCH 1296/3449] nodePackages.yo: init at 1.8.5

---
 .../node-packages/node-packages-v4.nix        | 3588 +++++++++++++----
 .../node-packages/node-packages-v6.nix        | 2677 ++++++++----
 .../node-packages/node-packages.json          |    1 +
 3 files changed, 4574 insertions(+), 1692 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix
index ceebd52b61c3..af5e09054e29 100644
--- a/pkgs/development/node-packages/node-packages-v4.nix
+++ b/pkgs/development/node-packages/node-packages-v4.nix
@@ -67,22 +67,22 @@ let
         sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6";
       };
     };
-    "uglify-js-2.4.15" = {
+    "uglify-js-2.6.1" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.4.15";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz";
-        sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
+        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
-    "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";
       };
     };
     "global-paths-0.1.2" = {
@@ -112,13 +112,13 @@ let
         sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e";
       };
     };
-    "moment-2.10.6" = {
+    "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.10.6";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz";
-        sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
     "node.extend-1.0.10" = {
@@ -202,22 +202,13 @@ let
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "source-map-0.1.34" = {
+    "source-map-0.5.6" = {
       name = "source-map";
       packageName = "source-map";
-      version = "0.1.34";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
-        sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
-      };
-    };
-    "optimist-0.3.7" = {
-      name = "optimist";
-      packageName = "optimist";
-      version = "0.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
-        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
+        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -229,22 +220,139 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "wordwrap-0.0.3" = {
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
+    "wordwrap-0.0.2" = {
       name = "wordwrap";
       packageName = "wordwrap";
-      version = "0.0.3";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
-        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
+    "kind-of-3.1.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
+      };
+    };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "repeat-string-1.6.1" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    };
+    "is-buffer-1.1.4" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
+        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+      };
+    };
+    "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";
       };
     };
     "array-unique-0.2.1" = {
@@ -337,6 +445,15 @@ let
         sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
       };
     };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
     "xml2js-0.2.8" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -490,13 +607,13 @@ let
         sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
       };
     };
-    "azure-arm-network-0.17.0" = {
+    "azure-arm-network-0.18.0" = {
       name = "azure-arm-network";
       packageName = "azure-arm-network";
-      version = "0.17.0";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz";
-        sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6";
+        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz";
+        sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f";
       };
     };
     "azure-arm-powerbiembedded-0.1.0" = {
@@ -643,13 +760,13 @@ let
         sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
-    "azure-arm-storage-0.13.1-preview" = {
+    "azure-arm-storage-0.15.0-preview" = {
       name = "azure-arm-storage";
       packageName = "azure-arm-storage";
-      version = "0.13.1-preview";
+      version = "0.15.0-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.13.1-preview.tgz";
-        sha1 = "9342515a44e632c48f1d0d9c7a98214ed563d8f7";
+        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz";
+        sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e";
       };
     };
     "azure-asm-sb-0.10.1" = {
@@ -697,13 +814,13 @@ let
         sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650";
       };
     };
-    "azure-storage-1.3.0" = {
+    "azure-storage-2.0.0" = {
       name = "azure-storage";
       packageName = "azure-storage";
-      version = "1.3.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz";
-        sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce";
+        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz";
+        sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0";
       };
     };
     "azure-arm-batch-0.3.0" = {
@@ -850,40 +967,31 @@ let
         sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
       };
     };
-    "kuduscript-1.0.9" = {
+    "kuduscript-1.0.13" = {
       name = "kuduscript";
       packageName = "kuduscript";
-      version = "1.0.9";
+      version = "1.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.9.tgz";
-        sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
+        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz";
+        sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e";
       };
     };
-    "moment-2.17.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.17.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
-        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
-      };
-    };
-    "ms-rest-1.15.4" = {
+    "ms-rest-1.15.5" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "1.15.4";
+      version = "1.15.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz";
-        sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz";
+        sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d";
       };
     };
-    "ms-rest-azure-1.15.4" = {
+    "ms-rest-azure-1.15.5" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.4";
+      version = "1.15.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz";
-        sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz";
+        sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611";
       };
     };
     "node-forge-0.6.23" = {
@@ -895,13 +1003,13 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "omelette-0.1.0" = {
+    "omelette-0.3.2" = {
       name = "omelette";
       packageName = "omelette";
-      version = "0.1.0";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/omelette/-/omelette-0.1.0.tgz";
-        sha1 = "31cc7eb472a513c07483d24d3e1bf164cb0d23b8";
+        url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz";
+        sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
       };
     };
     "openssl-wrapper-0.2.1" = {
@@ -1048,15 +1156,6 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "wordwrap-0.0.2" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
-      };
-    };
     "xml2js-0.1.14" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -1246,15 +1345,6 @@ let
         sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c";
       };
     };
-    "extend-1.2.1" = {
-      name = "extend";
-      packageName = "extend";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
-        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
-      };
-    };
     "browserify-mime-1.2.9" = {
       name = "browserify-mime";
       packageName = "browserify-mime";
@@ -1264,6 +1354,15 @@ let
         sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f";
       };
     };
+    "extend-1.2.1" = {
+      name = "extend";
+      packageName = "extend";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+      };
+    };
     "json-edm-parser-0.1.2" = {
       name = "json-edm-parser";
       packageName = "json-edm-parser";
@@ -1273,6 +1372,15 @@ let
         sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4";
       };
     };
+    "md5.js-1.3.4" = {
+      name = "md5.js";
+      packageName = "md5.js";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
+        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+      };
+    };
     "readable-stream-2.0.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -1291,13 +1399,13 @@ let
         sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
       };
     };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
+    "hash-base-3.0.3" = {
+      name = "hash-base";
+      packageName = "hash-base";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.3.tgz";
+        sha1 = "87ec48734bfe354275535150b14821566b083807";
       };
     };
     "inherits-2.0.3" = {
@@ -1309,6 +1417,15 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
     "isarray-1.0.0" = {
       name = "isarray";
       packageName = "isarray";
@@ -1525,13 +1642,13 @@ let
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
-    "rimraf-2.5.4" = {
+    "rimraf-2.6.1" = {
       name = "rimraf";
       packageName = "rimraf";
-      version = "2.5.4";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz";
-        sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz";
+        sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d";
       };
     };
     "minimist-0.0.8" = {
@@ -1813,13 +1930,13 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
-    "qs-6.2.1" = {
+    "qs-6.2.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz";
-        sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625";
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz";
+        sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586";
       };
     };
     "stringstream-0.0.5" = {
@@ -1858,13 +1975,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.1.4" = {
+    "async-2.1.5" = {
       name = "async";
       packageName = "async";
-      version = "2.1.4";
+      version = "2.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
-        sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
+        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
+        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
     "lodash-4.17.4" = {
@@ -1894,13 +2011,13 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
-    "is-my-json-valid-2.15.0" = {
+    "is-my-json-valid-2.16.0" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.15.0";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz";
-        sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz";
+        sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693";
       };
     };
     "pinkie-promise-2.0.1" = {
@@ -2299,13 +2416,13 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.2" = {
+    "readable-stream-2.2.3" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.2";
+      version = "2.2.3";
       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.3.tgz";
+        sha1 = "9cf49463985df016c8ae8813097a9293a9b33729";
       };
     };
     "buffer-shims-1.0.0" = {
@@ -2335,13 +2452,13 @@ let
         sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
       };
     };
-    "qs-6.3.0" = {
+    "qs-6.3.1" = {
       name = "qs";
       packageName = "qs";
-      version = "6.3.0";
+      version = "6.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz";
-        sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz";
+        sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d";
       };
     };
     "asap-2.0.5" = {
@@ -2713,15 +2830,6 @@ let
         sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
       };
     };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
-      };
-    };
     "loud-rejection-1.6.0" = {
       name = "loud-rejection";
       packageName = "loud-rejection";
@@ -3145,13 +3253,13 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "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" = {
@@ -3199,13 +3307,13 @@ let
         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" = {
@@ -3334,13 +3442,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" = {
@@ -3568,15 +3676,6 @@ let
         sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
       };
     };
-    "source-map-0.5.6" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
-        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
-      };
-    };
     "resolve-1.1.7" = {
       name = "resolve";
       packageName = "resolve";
@@ -3784,13 +3883,13 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.3" = {
+    "elliptic-6.4.0" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.3";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz";
-        sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz";
+        sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
     "parse-asn1-5.0.0" = {
@@ -3802,13 +3901,13 @@ let
         sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
       };
     };
-    "brorand-1.0.7" = {
+    "brorand-1.1.0" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.7";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz";
-        sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz";
+        sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
     "hash.js-1.0.3" = {
@@ -3820,6 +3919,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";
@@ -3865,15 +3982,6 @@ let
         sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
       };
     };
-    "is-buffer-1.1.4" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
-        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
-      };
-    };
     "lexical-scope-1.2.0" = {
       name = "lexical-scope";
       packageName = "lexical-scope";
@@ -4684,6 +4792,15 @@ let
         sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
       };
     };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
     "minimist-0.0.10" = {
       name = "minimist";
       packageName = "minimist";
@@ -5215,22 +5332,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.2.2" = {
+    "simple-peer-6.4.3" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.2.2";
+      version = "6.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz";
-        sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz";
+        sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a";
       };
     };
-    "simple-websocket-4.3.0" = {
+    "simple-websocket-4.3.1" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.3.0";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz";
-        sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz";
+        sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d";
       };
     };
     "string2compact-1.2.2" = {
@@ -5242,13 +5359,13 @@ let
         sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b";
       };
     };
-    "ws-1.1.1" = {
+    "ws-1.1.2" = {
       name = "ws";
       packageName = "ws";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
-        sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
+        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
       };
     };
     "ipaddr.js-1.2.0" = {
@@ -5269,13 +5386,13 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
-    "ws-2.0.3" = {
+    "ws-2.1.0" = {
       name = "ws";
       packageName = "ws";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz";
-        sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb";
+        url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz";
+        sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92";
       };
     };
     "ultron-1.1.0" = {
@@ -6493,6 +6610,15 @@ let
         sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
       };
     };
+    "abbrev-1.1.0" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
+        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
+      };
+    };
     "abbrev-1.0.9" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -6826,6 +6952,15 @@ let
         sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
+    "rimraf-2.5.4" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz";
+        sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04";
+      };
+    };
     "sha-2.0.1" = {
       name = "sha";
       packageName = "sha";
@@ -7645,22 +7780,22 @@ let
         sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
-    "rc-1.1.6" = {
+    "rc-1.1.7" = {
       name = "rc";
       packageName = "rc";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
-        sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
+        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
+        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
       };
     };
-    "strip-json-comments-1.0.4" = {
+    "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
-      version = "1.0.4";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
     "clone-2.1.0" = {
@@ -9080,22 +9215,22 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.14.0" = {
+    "globals-9.16.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.14.0";
+      version = "9.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz";
-        sha1 = "8859936af0038741263053b39d0e76ca241e4034";
+        url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz";
+        sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80";
       };
     };
-    "ignore-3.2.2" = {
+    "ignore-3.2.4" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.2";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz";
-        sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz";
+        sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8";
       };
     };
     "inquirer-0.12.0" = {
@@ -9188,15 +9323,6 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
-    "strip-json-comments-2.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
-      };
-    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9773,13 +9899,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.17" = {
+    "fsevents-1.1.1" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.17";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
-        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz";
+        sha1 = "f19fd28f43eeaf761680e519a203c4d0b3d31aff";
       };
     };
     "micromatch-2.3.11" = {
@@ -9845,15 +9971,6 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.1.0" = {
-      name = "kind-of";
-      packageName = "kind-of";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
-        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
-      };
-    };
     "normalize-path-2.0.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -9962,15 +10079,6 @@ let
         sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
       };
     };
-    "repeat-string-1.6.1" = {
-      name = "repeat-string";
-      packageName = "repeat-string";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
-        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
-      };
-    };
     "is-posix-bracket-0.1.1" = {
       name = "is-posix-bracket";
       packageName = "is-posix-bracket";
@@ -9980,13 +10088,13 @@ let
         sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
       };
     };
-    "for-own-0.1.4" = {
+    "for-own-0.1.5" = {
       name = "for-own";
       packageName = "for-own";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz";
-        sha1 = "0149b41a39088c7515f51ebe1c1386d45f935072";
+        url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz";
+        sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce";
       };
     };
     "is-extendable-0.1.1" = {
@@ -9998,13 +10106,13 @@ let
         sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
       };
     };
-    "for-in-0.1.6" = {
+    "for-in-1.0.1" = {
       name = "for-in";
       packageName = "for-in";
-      version = "0.1.6";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz";
-        sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8";
+        url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz";
+        sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa";
       };
     };
     "glob-base-0.3.0" = {
@@ -10260,13 +10368,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.3" = {
+    "coffee-script-1.12.4" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.3";
+      version = "1.12.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
-        sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
+        sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
       };
     };
     "jade-1.11.0" = {
@@ -10305,13 +10413,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.24" = {
+    "clean-css-3.4.25" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.24";
+      version = "3.4.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz";
-        sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz";
+        sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede";
       };
     };
     "commander-2.6.0" = {
@@ -10476,85 +10584,13 @@ let
         sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
       };
     };
-    "yargs-3.10.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.10.0";
+    "optimist-0.3.7" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
-        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
-      };
-    };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
-      };
-    };
-    "cliui-2.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
-        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
-      };
-    };
-    "window-size-0.1.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
-        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
-      };
-    };
-    "center-align-0.1.3" = {
-      name = "center-align";
-      packageName = "center-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
-        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
-      };
-    };
-    "right-align-0.1.3" = {
-      name = "right-align";
-      packageName = "right-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
-        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
-      };
-    };
-    "align-text-0.1.4" = {
-      name = "align-text";
-      packageName = "align-text";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
-        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
-      };
-    };
-    "lazy-cache-1.0.4" = {
-      name = "lazy-cache";
-      packageName = "lazy-cache";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
-        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
-      };
-    };
-    "longest-1.0.1" = {
-      name = "longest";
-      packageName = "longest";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
-        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
       };
     };
     "acorn-globals-1.0.9" = {
@@ -11358,6 +11394,15 @@ let
         sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44";
       };
     };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
     "xml-1.0.0" = {
       name = "xml";
       packageName = "xml";
@@ -11583,13 +11628,13 @@ let
         sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6";
       };
     };
-    "connect-3.5.0" = {
+    "connect-3.6.0" = {
       name = "connect";
       packageName = "connect";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz";
-        sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198";
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz";
+        sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e";
       };
     };
     "core-js-2.4.1" = {
@@ -11664,22 +11709,22 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.7.2" = {
+    "socket.io-1.7.3" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.7.2";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
-        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz";
+        sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
       };
     };
-    "tmp-0.0.28" = {
+    "tmp-0.0.31" = {
       name = "tmp";
       packageName = "tmp";
-      version = "0.0.28";
+      version = "0.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz";
-        sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
     "useragent-2.1.12" = {
@@ -11709,6 +11754,15 @@ 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";
@@ -11718,13 +11772,13 @@ let
         sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
-    "finalhandler-0.5.0" = {
+    "finalhandler-1.0.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.5.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
-        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz";
+        sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755";
       };
     };
     "custom-event-1.0.1" = {
@@ -11817,13 +11871,13 @@ let
         sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
-    "engine.io-1.8.2" = {
+    "engine.io-1.8.3" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.8.2";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
-        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz";
+        sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4";
       };
     };
     "has-binary-0.1.7" = {
@@ -11853,13 +11907,13 @@ let
         sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
       };
     };
-    "socket.io-client-1.7.2" = {
+    "socket.io-client-1.7.3" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
-      version = "1.7.2";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
-        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz";
+        sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377";
       };
     };
     "socket.io-parser-2.3.1" = {
@@ -11961,13 +12015,13 @@ let
         sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
       };
     };
-    "engine.io-client-1.8.2" = {
+    "engine.io-client-1.8.3" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
-      version = "1.8.2";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
-        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz";
+        sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab";
       };
     };
     "object-component-0.0.3" = {
@@ -12753,13 +12807,13 @@ let
         sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
-    "convert-source-map-1.3.0" = {
+    "convert-source-map-1.4.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz";
-        sha1 = "e9f3e9c6e2728efc2676696a70eb382f73106a67";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz";
+        sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3";
       };
     };
     "express-2.5.11" = {
@@ -13113,6 +13167,15 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
+    "serve-favicon-2.4.0" = {
+      name = "serve-favicon";
+      packageName = "serve-favicon";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz";
+        sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0";
+      };
+    };
     "strong-data-uri-1.0.4" = {
       name = "strong-data-uri";
       packageName = "strong-data-uri";
@@ -13221,6 +13284,24 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
+    "etag-1.8.0" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.8.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";
+      };
+    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -13563,6 +13644,15 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
+    "ws-1.1.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
+        sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
+      };
+    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13572,13 +13662,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.16" = {
+    "node-red-node-email-0.1.21" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.16";
+      version = "0.1.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz";
-        sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz";
+        sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13770,6 +13860,15 @@ let
         sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
       };
     };
+    "finalhandler-0.5.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
+        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+      };
+    };
     "send-0.14.1" = {
       name = "send";
       packageName = "send";
@@ -13788,13 +13887,13 @@ let
         sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
       };
     };
-    "cookies-0.6.2" = {
+    "cookies-0.7.0" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.6.2";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz";
-        sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.0.tgz";
+        sha1 = "0bc961d910c35254980fc7c9eff5da12011bbf00";
       };
     };
     "i18next-client-1.10.3" = {
@@ -14733,15 +14832,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "aproba-1.0.4" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
-      };
-    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14751,6 +14841,15 @@ let
         sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
       };
     };
+    "lazy-property-1.0.0" = {
+      name = "lazy-property";
+      packageName = "lazy-property";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz";
+        sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
+      };
+    };
     "lodash._baseuniq-4.6.0" = {
       name = "lodash._baseuniq";
       packageName = "lodash._baseuniq";
@@ -14841,13 +14940,13 @@ let
         sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
       };
     };
-    "opener-1.4.2" = {
+    "opener-1.4.3" = {
       name = "opener";
       packageName = "opener";
-      version = "1.4.2";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz";
-        sha1 = "b32582080042af8680c389a499175b4c54fff523";
+        url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz";
+        sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
     "read-cmd-shim-1.0.1" = {
@@ -15255,6 +15354,15 @@ let
         sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
       };
     };
+    "aproba-1.0.4" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
+        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+      };
+    };
     "request-2.75.0" = {
       name = "request";
       packageName = "request";
@@ -15519,13 +15627,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.15" = {
+    "service-runner-2.2.4" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.15";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz";
-        sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz";
+        sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c";
       };
     };
     "simplediff-0.1.1" = {
@@ -15645,13 +15753,13 @@ let
         sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
       };
     };
-    "limitation-0.1.9" = {
+    "limitation-0.2.0" = {
       name = "limitation";
       packageName = "limitation";
-      version = "0.1.9";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz";
-        sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
+        url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz";
+        sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62";
       };
     };
     "yargs-6.6.0" = {
@@ -15663,6 +15771,15 @@ let
         sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
+    "dnscache-1.0.1" = {
+      name = "dnscache";
+      packageName = "dnscache";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz";
+        sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31";
+      };
+    };
     "dtrace-provider-0.8.0" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
@@ -15844,6 +15961,24 @@ let
         sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
+    "lodash.clone-4.3.2" = {
+      name = "lodash.clone";
+      packageName = "lodash.clone";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz";
+        sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9";
+      };
+    };
+    "lodash._baseclone-4.5.7" = {
+      name = "lodash._baseclone";
+      packageName = "lodash._baseclone";
+      version = "4.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
+        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
+      };
+    };
     "lodash.assign-4.2.0" = {
       name = "lodash.assign";
       packageName = "lodash.assign";
@@ -16807,13 +16942,13 @@ let
         sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.21" = {
+    "recast-0.11.22" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.21";
+      version = "0.11.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz";
-        sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz";
+        sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa";
       };
     };
     "ast-types-0.9.5" = {
@@ -17177,6 +17312,15 @@ 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" = {
       name = "fs-ext";
       packageName = "fs-ext";
@@ -17294,6 +17438,15 @@ let
         sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
       };
     };
+    "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";
+      };
+    };
     "lru-cache-2.2.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -17681,6 +17834,15 @@ let
         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";
+      };
+    };
     "enhanced-resolve-2.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
@@ -17870,15 +18032,6 @@ let
         sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
       };
     };
-    "uglify-js-2.6.1" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
-        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
-      };
-    };
     "xmldom-0.1.22" = {
       name = "xmldom";
       packageName = "xmldom";
@@ -17888,13 +18041,13 @@ let
         sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
       };
     };
-    "qs-6.0.2" = {
+    "qs-6.0.3" = {
       name = "qs";
       packageName = "qs";
-      version = "6.0.2";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
-        sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
+        url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz";
+        sha1 = "95f870b23e70268fba18704e80667515905af06c";
       };
     };
     "blueimp-md5-2.6.0" = {
@@ -17987,6 +18140,15 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
+    "node-cache-4.1.1" = {
+      name = "node-cache";
+      packageName = "node-cache";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz";
+        sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44";
+      };
+    };
     "npm-4.1.2" = {
       name = "npm";
       packageName = "npm";
@@ -18059,13 +18221,13 @@ let
         sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "color-string-1.4.0" = {
+    "color-string-1.5.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
-        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz";
+        sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce";
       };
     };
     "color-name-1.1.1" = {
@@ -18320,15 +18482,6 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
-    "tmp-0.0.31" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
-        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
-      };
-    };
     "follow-redirects-0.0.3" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -18338,15 +18491,6 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "acorn-4.0.11" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "4.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
-        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
-      };
-    };
     "acorn-dynamic-import-2.0.1" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
@@ -18383,13 +18527,13 @@ let
         sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
       };
     };
-    "loader-utils-0.2.16" = {
+    "loader-utils-0.2.17" = {
       name = "loader-utils";
       packageName = "loader-utils";
-      version = "0.2.16";
+      version = "0.2.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz";
-        sha1 = "f08632066ed8282835dff88dfb52704765adee6d";
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz";
+        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
       };
     };
     "memory-fs-0.4.1" = {
@@ -18410,13 +18554,13 @@ let
         sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
-    "watchpack-1.2.0" = {
+    "watchpack-1.3.1" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "1.2.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz";
-        sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz";
+        sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
       };
     };
     "webpack-sources-0.1.4" = {
@@ -18491,13 +18635,13 @@ let
         sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
       };
     };
-    "babel-runtime-6.22.0" = {
+    "babel-runtime-6.23.0" = {
       name = "babel-runtime";
       packageName = "babel-runtime";
-      version = "6.22.0";
+      version = "6.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz";
-        sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611";
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz";
+        sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
       };
     };
     "death-1.1.0" = {
@@ -18509,13 +18653,13 @@ let
         sha1 = "01aa9c401edd92750514470b8266390c66c67318";
       };
     };
-    "detect-indent-4.0.0" = {
+    "detect-indent-5.0.0" = {
       name = "detect-indent";
       packageName = "detect-indent";
-      version = "4.0.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
-        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
+        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
       };
     };
     "diff-2.2.3" = {
@@ -18527,6 +18671,15 @@ let
         sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
       };
     };
+    "inquirer-3.0.5" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz";
+        sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65";
+      };
+    };
     "invariant-2.2.2" = {
       name = "invariant";
       packageName = "invariant";
@@ -18545,13 +18698,13 @@ let
         sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
       };
     };
-    "leven-2.0.0" = {
+    "leven-2.1.0" = {
       name = "leven";
       packageName = "leven";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
-        sha1 = "74c45744439550da185801912829f61d22071bc1";
+        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
       };
     };
     "node-emoji-1.5.1" = {
@@ -18563,13 +18716,13 @@ let
         sha1 = "fd918e412769bf8c448051238233840b2aff16a1";
       };
     };
-    "object-path-0.11.3" = {
+    "object-path-0.11.4" = {
       name = "object-path";
       packageName = "object-path";
-      version = "0.11.3";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
-        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
+        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz";
+        sha1 = "370ae752fbf37de3ea70a861c23bba8915691949";
       };
     };
     "proper-lockfile-2.0.0" = {
@@ -18599,13 +18752,58 @@ let
         sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
       };
     };
-    "regenerator-runtime-0.10.1" = {
+    "regenerator-runtime-0.10.3" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
-      version = "0.10.1";
+      version = "0.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz";
-        sha1 = "257f41961ce44558b18f7814af48c17559f9faeb";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz";
+        sha1 = "8c4367a904b51ea62a908ac310bf99ff90a82a3e";
+      };
+    };
+    "cli-cursor-2.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    };
+    "external-editor-2.0.1" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.1.tgz";
+        sha1 = "4c597c6c88fa6410e41dbbaa7b1be2336aa31095";
+      };
+    };
+    "figures-2.0.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
+        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
+      };
+    };
+    "restore-cursor-2.0.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    };
+    "onetime-2.0.0" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz";
+        sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6";
       };
     };
     "loose-envify-1.3.1" = {
@@ -18635,16 +18833,439 @@ let
         sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
       };
     };
+    "cli-list-0.1.8" = {
+      name = "cli-list";
+      packageName = "cli-list";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz";
+        sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a";
+      };
+    };
+    "cross-spawn-3.0.1" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz";
+        sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
+      };
+    };
+    "fullname-2.1.0" = {
+      name = "fullname";
+      packageName = "fullname";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz";
+        sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350";
+      };
+    };
+    "humanize-string-1.0.1" = {
+      name = "humanize-string";
+      packageName = "humanize-string";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz";
+        sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42";
+      };
+    };
+    "inquirer-0.11.4" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.11.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz";
+        sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d";
+      };
+    };
+    "insight-0.7.0" = {
+      name = "insight";
+      packageName = "insight";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz";
+        sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6";
+      };
+    };
+    "npm-keyword-4.2.0" = {
+      name = "npm-keyword";
+      packageName = "npm-keyword";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz";
+        sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0";
+      };
+    };
+    "opn-3.0.3" = {
+      name = "opn";
+      packageName = "opn";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz";
+        sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a";
+      };
+    };
+    "parse-help-0.1.1" = {
+      name = "parse-help";
+      packageName = "parse-help";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz";
+        sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda";
+      };
+    };
+    "root-check-1.0.0" = {
+      name = "root-check";
+      packageName = "root-check";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz";
+        sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697";
+      };
+    };
+    "sort-on-1.3.0" = {
+      name = "sort-on";
+      packageName = "sort-on";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz";
+        sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840";
+      };
+    };
+    "tabtab-1.3.2" = {
+      name = "tabtab";
+      packageName = "tabtab";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz";
+        sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7";
+      };
+    };
+    "titleize-1.0.0" = {
+      name = "titleize";
+      packageName = "titleize";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz";
+        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";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz";
+        sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7";
+      };
+    };
+    "yeoman-doctor-2.1.0" = {
+      name = "yeoman-doctor";
+      packageName = "yeoman-doctor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz";
+        sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
+      };
+    };
+    "yeoman-environment-1.6.6" = {
+      name = "yeoman-environment";
+      packageName = "yeoman-environment";
+      version = "1.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz";
+        sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671";
+      };
+    };
+    "yosay-1.2.1" = {
+      name = "yosay";
+      packageName = "yosay";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz";
+        sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b";
+      };
+    };
+    "npmconf-2.1.2" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
+        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
+      };
+    };
+    "execall-1.0.0" = {
+      name = "execall";
+      packageName = "execall";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz";
+        sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73";
+      };
+    };
+    "clone-regexp-1.0.0" = {
+      name = "clone-regexp";
+      packageName = "clone-regexp";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz";
+        sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c";
+      };
+    };
+    "is-regexp-1.0.0" = {
+      name = "is-regexp";
+      packageName = "is-regexp";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz";
+        sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
+      };
+    };
+    "is-supported-regexp-flag-1.0.0" = {
+      name = "is-supported-regexp-flag";
+      packageName = "is-supported-regexp-flag";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz";
+        sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8";
+      };
+    };
+    "downgrade-root-1.2.2" = {
+      name = "downgrade-root";
+      packageName = "downgrade-root";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz";
+        sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c";
+      };
+    };
+    "sudo-block-1.2.0" = {
+      name = "sudo-block";
+      packageName = "sudo-block";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz";
+        sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463";
+      };
+    };
+    "default-uid-1.0.0" = {
+      name = "default-uid";
+      packageName = "default-uid";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz";
+        sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e";
+      };
+    };
+    "is-root-1.0.0" = {
+      name = "is-root";
+      packageName = "is-root";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
+        sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5";
+      };
+    };
+    "is-docker-1.1.0" = {
+      name = "is-docker";
+      packageName = "is-docker";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz";
+        sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1";
+      };
+    };
+    "dot-prop-2.4.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz";
+        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";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz";
+        sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0";
+      };
+    };
+    "each-async-1.1.1" = {
+      name = "each-async";
+      packageName = "each-async";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
+        sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
+      };
+    };
+    "log-symbols-1.0.2" = {
+      name = "log-symbols";
+      packageName = "log-symbols";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
+        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
+      };
+    };
+    "object-values-1.0.0" = {
+      name = "object-values";
+      packageName = "object-values";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz";
+        sha1 = "72af839630119e5b98c3b02bb8c27e3237158105";
+      };
+    };
+    "twig-0.8.9" = {
+      name = "twig";
+      packageName = "twig";
+      version = "0.8.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz";
+        sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2";
+      };
+    };
+    "bin-version-1.0.4" = {
+      name = "bin-version";
+      packageName = "bin-version";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz";
+        sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e";
+      };
+    };
+    "semver-truncate-1.1.2" = {
+      name = "semver-truncate";
+      packageName = "semver-truncate";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz";
+        sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8";
+      };
+    };
+    "find-versions-1.2.1" = {
+      name = "find-versions";
+      packageName = "find-versions";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz";
+        sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62";
+      };
+    };
+    "semver-regex-1.0.0" = {
+      name = "semver-regex";
+      packageName = "semver-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz";
+        sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
+      };
+    };
+    "globby-4.1.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
+        sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
+      };
+    };
+    "grouped-queue-0.3.3" = {
+      name = "grouped-queue";
+      packageName = "grouped-queue";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz";
+        sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c";
+      };
+    };
+    "mem-fs-1.1.3" = {
+      name = "mem-fs";
+      packageName = "mem-fs";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz";
+        sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc";
+      };
+    };
+    "vinyl-file-2.0.0" = {
+      name = "vinyl-file";
+      packageName = "vinyl-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz";
+        sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a";
+      };
+    };
+    "strip-bom-stream-2.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz";
+        sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca";
+      };
+    };
+    "first-chunk-stream-2.0.0" = {
+      name = "first-chunk-stream";
+      packageName = "first-chunk-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
+        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
+      };
+    };
+    "pad-component-0.0.1" = {
+      name = "pad-component";
+      packageName = "pad-component";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz";
+        sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
+      };
+    };
+    "taketalk-1.0.0" = {
+      name = "taketalk";
+      packageName = "taketalk";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz";
+        sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd";
+      };
+    };
   };
 in
 {
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.6";
+    version = "1.9.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz";
-      sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz";
+      sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18670,23 +19291,61 @@ in
           sources."JSV-4.0.2"
         ];
       })
-      (sources."uglify-js-2.4.15" // {
+      (sources."uglify-js-2.6.1" // {
         dependencies = [
           sources."async-0.2.10"
-          (sources."source-map-0.1.34" // {
-            dependencies = [
-              sources."amdefine-1.0.1"
-            ];
-          })
-          (sources."optimist-0.3.7" // {
-            dependencies = [
-              sources."wordwrap-0.0.3"
-            ];
-          })
+          sources."source-map-0.5.6"
           sources."uglify-to-browserify-1.0.2"
+          (sources."yargs-3.10.0" // {
+            dependencies = [
+              sources."camelcase-1.2.1"
+              (sources."cliui-2.1.0" // {
+                dependencies = [
+                  (sources."center-align-0.1.3" // {
+                    dependencies = [
+                      (sources."align-text-0.1.4" // {
+                        dependencies = [
+                          (sources."kind-of-3.1.0" // {
+                            dependencies = [
+                              sources."is-buffer-1.1.4"
+                            ];
+                          })
+                          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.4"
+                            ];
+                          })
+                          sources."longest-1.0.1"
+                          sources."repeat-string-1.6.1"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."wordwrap-0.0.2"
+                ];
+              })
+              sources."decamelize-1.2.0"
+              sources."window-size-0.1.0"
+            ];
+          })
+        ];
+      })
+      (sources."resolve-1.3.2" // {
+        dependencies = [
+          sources."path-parse-1.0.5"
         ];
       })
-      sources."resolve-1.2.0"
       (sources."global-paths-0.1.2" // {
         dependencies = [
           sources."array-unique-0.2.1"
@@ -18727,7 +19386,7 @@ in
           })
         ];
       })
-      sources."moment-2.10.6"
+      sources."moment-2.17.1"
       (sources."node.extend-1.0.10" // {
         dependencies = [
           sources."is-0.3.0"
@@ -18745,10 +19404,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.9";
+    version = "0.10.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz";
-      sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz";
+      sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4";
     };
     dependencies = [
       (sources."adal-node-0.1.21" // {
@@ -18796,7 +19455,7 @@ in
       sources."azure-arm-insights-0.11.3"
       sources."azure-arm-iothub-0.1.4"
       sources."azure-arm-servermanagement-0.1.2"
-      sources."azure-arm-network-0.17.0"
+      sources."azure-arm-network-0.18.0"
       sources."azure-arm-powerbiembedded-0.1.0"
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
@@ -18817,7 +19476,7 @@ in
       })
       sources."azure-asm-network-0.13.0"
       sources."azure-arm-resource-1.6.1-preview"
-      sources."azure-arm-storage-0.13.1-preview"
+      sources."azure-arm-storage-0.15.0-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
       sources."azure-asm-storage-0.12.0"
@@ -18827,15 +19486,21 @@ in
           sources."moment-2.14.1"
         ];
       })
-      (sources."azure-storage-1.3.0" // {
+      (sources."azure-storage-2.0.0" // {
         dependencies = [
-          sources."extend-1.2.1"
           sources."browserify-mime-1.2.9"
+          sources."extend-1.2.1"
           (sources."json-edm-parser-0.1.2" // {
             dependencies = [
               sources."jsonparse-1.2.0"
             ];
           })
+          (sources."md5.js-1.3.4" // {
+            dependencies = [
+              sources."hash-base-3.0.3"
+              sources."inherits-2.0.3"
+            ];
+          })
           sources."node-uuid-1.4.7"
           (sources."readable-stream-2.0.6" // {
             dependencies = [
@@ -18904,7 +19569,7 @@ in
       })
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
-      (sources."kuduscript-1.0.9" // {
+      (sources."kuduscript-1.0.13" // {
         dependencies = [
           (sources."commander-1.1.1" // {
             dependencies = [
@@ -18915,18 +19580,18 @@ in
         ];
       })
       sources."moment-2.17.1"
-      (sources."ms-rest-1.15.4" // {
+      (sources."ms-rest-1.15.5" // {
         dependencies = [
           sources."duplexer-0.1.1"
         ];
       })
-      (sources."ms-rest-azure-1.15.4" // {
+      (sources."ms-rest-azure-1.15.5" // {
         dependencies = [
           sources."async-0.2.7"
         ];
       })
       sources."node-forge-0.6.23"
-      sources."omelette-0.1.0"
+      sources."omelette-0.3.2"
       (sources."openssl-wrapper-0.2.1" // {
         dependencies = [
           sources."debug-0.7.4"
@@ -18949,7 +19614,7 @@ in
                 ];
               })
               sources."ncp-0.4.2"
-              (sources."rimraf-2.5.4" // {
+              (sources."rimraf-2.6.1" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -19030,7 +19695,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.1.4" // {
+              (sources."async-2.1.5" // {
                 dependencies = [
                   sources."lodash-4.17.4"
                 ];
@@ -19061,7 +19726,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -19123,7 +19788,7 @@ in
           })
           sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.2.1"
+          sources."qs-6.2.2"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -19157,7 +19822,7 @@ in
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -19179,7 +19844,7 @@ in
                   sources."asap-2.0.5"
                 ];
               })
-              sources."qs-6.3.0"
+              sources."qs-6.3.1"
             ];
           })
         ];
@@ -19279,7 +19944,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -19304,7 +19969,7 @@ in
                       sources."prepend-http-1.0.4"
                       (sources."read-all-stream-2.2.0" // {
                         dependencies = [
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -19469,7 +20134,7 @@ in
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
-          (sources."rimraf-2.5.4" // {
+          (sources."rimraf-2.6.1" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -19562,13 +20227,13 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "14.0.0";
+    version = "14.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz";
-      sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38";
+      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"
@@ -19604,7 +20269,7 @@ in
           sources."ieee754-1.1.8"
         ];
       })
-      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"
@@ -19651,10 +20316,13 @@ in
             dependencies = [
               sources."bn.js-4.11.6"
               sources."browserify-rsa-4.0.1"
-              (sources."elliptic-6.3.3" // {
+              (sources."elliptic-6.4.0" // {
                 dependencies = [
-                  sources."brorand-1.0.7"
+                  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" // {
@@ -19678,10 +20346,13 @@ in
           (sources."create-ecdh-4.0.0" // {
             dependencies = [
               sources."bn.js-4.11.6"
-              (sources."elliptic-6.3.3" // {
+              (sources."elliptic-6.4.0" // {
                 dependencies = [
-                  sources."brorand-1.0.7"
+                  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"
                 ];
               })
             ];
@@ -19699,7 +20370,7 @@ in
               sources."bn.js-4.11.6"
               (sources."miller-rabin-4.0.0" // {
                 dependencies = [
-                  sources."brorand-1.0.7"
+                  sources."brorand-1.1.0"
                 ];
               })
             ];
@@ -19797,7 +20468,7 @@ 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" // {
             dependencies = [
@@ -19818,7 +20489,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.3" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -19827,7 +20498,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" // {
@@ -20312,7 +20987,7 @@ in
                   })
                 ];
               })
-              (sources."rimraf-2.5.4" // {
+              (sources."rimraf-2.6.1" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -20395,11 +21070,11 @@ in
                           sources."unzip-response-2.0.1"
                         ];
                       })
-                      (sources."simple-peer-6.2.2" // {
+                      (sources."simple-peer-6.4.3" // {
                         dependencies = [
                           sources."get-browser-rtc-1.0.2"
                           sources."randombytes-2.0.3"
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -20411,9 +21086,10 @@ in
                           })
                         ];
                       })
-                      (sources."simple-websocket-4.3.0" // {
+                      (sources."simple-websocket-4.3.1" // {
                         dependencies = [
-                          (sources."readable-stream-2.2.2" // {
+                          sources."randombytes-2.0.3"
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -20423,7 +21099,7 @@ in
                               sources."util-deprecate-1.0.2"
                             ];
                           })
-                          (sources."ws-2.0.3" // {
+                          (sources."ws-2.1.0" // {
                             dependencies = [
                               sources."ultron-1.1.0"
                             ];
@@ -20437,7 +21113,7 @@ in
                         ];
                       })
                       sources."uniq-1.0.1"
-                      (sources."ws-1.1.1" // {
+                      (sources."ws-1.1.2" // {
                         dependencies = [
                           sources."options-0.0.6"
                           sources."ultron-1.0.2"
@@ -20551,7 +21227,7 @@ in
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -20603,10 +21279,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.3";
+    version = "1.12.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
-      sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
+      sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -20751,7 +21427,11 @@ in
                   sources."interpret-1.0.1"
                   (sources."rechoir-0.6.2" // {
                     dependencies = [
-                      sources."resolve-1.2.0"
+                      (sources."resolve-1.3.2" // {
+                        dependencies = [
+                          sources."path-parse-1.0.5"
+                        ];
+                      })
                     ];
                   })
                 ];
@@ -20762,7 +21442,7 @@ in
             dependencies = [
               (sources."browserify-13.3.0" // {
                 dependencies = [
-                  (sources."JSONStream-1.3.0" // {
+                  (sources."JSONStream-1.3.1" // {
                     dependencies = [
                       sources."jsonparse-1.3.0"
                       sources."through-2.3.8"
@@ -20799,7 +21479,7 @@ in
                       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"
@@ -20846,10 +21526,13 @@ in
                         dependencies = [
                           sources."bn.js-4.11.6"
                           sources."browserify-rsa-4.0.1"
-                          (sources."elliptic-6.3.3" // {
+                          (sources."elliptic-6.4.0" // {
                             dependencies = [
-                              sources."brorand-1.0.7"
+                              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" // {
@@ -20873,10 +21556,13 @@ in
                       (sources."create-ecdh-4.0.0" // {
                         dependencies = [
                           sources."bn.js-4.11.6"
-                          (sources."elliptic-6.3.3" // {
+                          (sources."elliptic-6.4.0" // {
                             dependencies = [
-                              sources."brorand-1.0.7"
+                              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"
                             ];
                           })
                         ];
@@ -20894,7 +21580,7 @@ in
                           sources."bn.js-4.11.6"
                           (sources."miller-rabin-4.0.0" // {
                             dependencies = [
-                              sources."brorand-1.0.7"
+                              sources."brorand-1.1.0"
                             ];
                           })
                         ];
@@ -20992,7 +21678,7 @@ 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" // {
                         dependencies = [
@@ -21013,7 +21699,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.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -21022,7 +21708,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" // {
@@ -21327,7 +22017,7 @@ in
           })
           (sources."nopt-3.0.6" // {
             dependencies = [
-              sources."abbrev-1.0.9"
+              sources."abbrev-1.1.0"
             ];
           })
           (sources."npm-2.15.11" // {
@@ -21459,7 +22149,7 @@ in
                   (sources."concat-stream-1.6.0" // {
                     dependencies = [
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -21563,7 +22253,7 @@ in
                   sources."forever-agent-0.6.1"
                   (sources."form-data-1.0.1" // {
                     dependencies = [
-                      (sources."async-2.1.4" // {
+                      (sources."async-2.1.5" // {
                         dependencies = [
                           sources."lodash-4.17.4"
                         ];
@@ -21585,7 +22275,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.15.0" // {
+                      (sources."is-my-json-valid-2.16.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -21647,7 +22337,7 @@ in
                   })
                   sources."node-uuid-1.4.7"
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.2.1"
+                  sources."qs-6.2.2"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -21775,7 +22465,7 @@ in
                       sources."minimist-0.0.8"
                     ];
                   })
-                  (sources."rimraf-2.5.4" // {
+                  (sources."rimraf-2.6.1" // {
                     dependencies = [
                       (sources."glob-7.1.1" // {
                         dependencies = [
@@ -21968,7 +22658,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -22029,7 +22719,7 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."qs-6.3.1"
               sources."stringstream-0.0.5"
               sources."tunnel-agent-0.4.3"
             ];
@@ -22044,7 +22734,7 @@ in
       })
       (sources."nopt-3.0.1" // {
         dependencies = [
-          sources."abbrev-1.0.9"
+          sources."abbrev-1.1.0"
         ];
       })
       sources."q-1.0.1"
@@ -22116,7 +22806,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -22147,7 +22837,7 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -22165,12 +22855,12 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.6" // {
+                      (sources."rc-1.1.7" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
                           sources."minimist-1.2.0"
-                          sources."strip-json-comments-1.0.4"
+                          sources."strip-json-comments-2.0.1"
                         ];
                       })
                     ];
@@ -22538,7 +23228,7 @@ in
                 ];
               })
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -22673,7 +23363,7 @@ in
           sources."split2-2.1.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -22710,7 +23400,7 @@ in
                   })
                 ];
               })
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -22759,7 +23449,7 @@ in
       (sources."tar-stream-1.5.2" // {
         dependencies = [
           sources."bl-1.2.0"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -22804,13 +23494,13 @@ in
       sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d";
     };
     dependencies = [
-      (sources."JSONStream-1.3.0" // {
+      (sources."JSONStream-1.3.1" // {
         dependencies = [
           sources."jsonparse-1.3.0"
           sources."through-2.3.8"
         ];
       })
-      (sources."async-2.1.4" // {
+      (sources."async-2.1.5" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -22864,7 +23554,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -22925,7 +23615,7 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -23190,10 +23880,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.15.0";
+    version = "3.16.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz";
-      sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz";
+      sha1 = "9bc31fc7341692cf772e80607508f67d711c5609";
     };
     dependencies = [
       (sources."babel-code-frame-6.22.0" // {
@@ -23222,7 +23912,7 @@ in
         dependencies = [
           sources."inherits-2.0.3"
           sources."typedarray-0.0.6"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -23313,7 +24003,7 @@ in
                       sources."pinkie-2.0.4"
                     ];
                   })
-                  sources."rimraf-2.5.4"
+                  sources."rimraf-2.6.1"
                 ];
               })
               sources."graceful-fs-4.1.11"
@@ -23350,8 +24040,8 @@ in
           sources."path-is-absolute-1.0.1"
         ];
       })
-      sources."globals-9.14.0"
-      sources."ignore-3.2.2"
+      sources."globals-9.16.0"
+      sources."ignore-3.2.4"
       sources."imurmurhash-0.1.4"
       (sources."inquirer-0.12.0" // {
         dependencies = [
@@ -23409,7 +24099,7 @@ in
           sources."through-2.3.8"
         ];
       })
-      (sources."is-my-json-valid-2.15.0" // {
+      (sources."is-my-json-valid-2.16.0" // {
         dependencies = [
           sources."generate-function-2.0.0"
           (sources."generate-object-property-1.2.0" // {
@@ -23481,7 +24171,11 @@ in
           sources."interpret-1.0.1"
           (sources."rechoir-0.6.2" // {
             dependencies = [
-              sources."resolve-1.2.0"
+              (sources."resolve-1.3.2" // {
+                dependencies = [
+                  sources."path-parse-1.0.5"
+                ];
+              })
             ];
           })
         ];
@@ -23700,9 +24394,9 @@ in
                       sources."normalize-path-2.0.1"
                       (sources."object.omit-2.0.1" // {
                         dependencies = [
-                          (sources."for-own-0.1.4" // {
+                          (sources."for-own-0.1.5" // {
                             dependencies = [
-                              sources."for-in-0.1.6"
+                              sources."for-in-1.0.1"
                             ];
                           })
                           sources."is-extendable-0.1.1"
@@ -23740,7 +24434,7 @@ in
               (sources."readdirp-2.1.0" // {
                 dependencies = [
                   sources."graceful-fs-4.1.11"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -23753,7 +24447,7 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.17" // {
+              (sources."fsevents-1.1.1" // {
                 dependencies = [
                   sources."nan-2.5.1"
                   (sources."node-pre-gyp-0.6.33" // {
@@ -23765,7 +24459,7 @@ in
                       })
                       (sources."nopt-3.0.6" // {
                         dependencies = [
-                          sources."abbrev-1.0.9"
+                          sources."abbrev-1.1.0"
                         ];
                       })
                       (sources."npmlog-4.0.2" // {
@@ -23773,7 +24467,7 @@ in
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.2.2" // {
+                              (sources."readable-stream-2.2.3" // {
                                 dependencies = [
                                   sources."buffer-shims-1.0.0"
                                   sources."core-util-is-1.0.2"
@@ -23813,12 +24507,12 @@ in
                           sources."set-blocking-2.0.0"
                         ];
                       })
-                      (sources."rc-1.1.6" // {
+                      (sources."rc-1.1.7" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
                           sources."minimist-1.2.0"
-                          sources."strip-json-comments-1.0.4"
+                          sources."strip-json-comments-2.0.1"
                         ];
                       })
                       (sources."request-2.79.0" // {
@@ -23862,7 +24556,7 @@ in
                                   sources."graceful-readlink-1.0.1"
                                 ];
                               })
-                              (sources."is-my-json-valid-2.15.0" // {
+                              (sources."is-my-json-valid-2.16.0" // {
                                 dependencies = [
                                   sources."generate-function-2.0.0"
                                   (sources."generate-object-property-1.2.0" // {
@@ -23923,7 +24617,7 @@ in
                             ];
                           })
                           sources."oauth-sign-0.8.2"
-                          sources."qs-6.3.0"
+                          sources."qs-6.3.1"
                           sources."stringstream-0.0.5"
                           (sources."tough-cookie-2.3.2" // {
                             dependencies = [
@@ -24089,7 +24783,7 @@ in
             ];
           })
           sources."ncp-0.4.2"
-          (sources."rimraf-2.5.4" // {
+          (sources."rimraf-2.6.1" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -24206,7 +24900,7 @@ in
       sources."grunt-known-options-1.1.0"
       (sources."nopt-3.0.6" // {
         dependencies = [
-          sources."abbrev-1.0.9"
+          sources."abbrev-1.1.0"
         ];
       })
       sources."resolve-1.1.7"
@@ -24229,11 +24923,11 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.3"
+      sources."coffee-script-1.12.4"
       (sources."jade-1.11.0" // {
         dependencies = [
           sources."character-parser-1.2.1"
-          (sources."clean-css-3.4.24" // {
+          (sources."clean-css-3.4.25" // {
             dependencies = [
               (sources."commander-2.8.1" // {
                 dependencies = [
@@ -24488,7 +25182,7 @@ in
           sources."replace-ext-0.0.1"
           (sources."through2-2.0.3" // {
             dependencies = [
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -24572,9 +25266,9 @@ in
                   sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
-                      (sources."for-own-0.1.4" // {
+                      (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-0.1.6"
+                          sources."for-in-1.0.1"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -24670,7 +25364,11 @@ in
           sources."lodash.isstring-4.0.1"
           sources."lodash.mapvalues-4.6.0"
           sources."rechoir-0.6.2"
-          sources."resolve-1.2.0"
+          (sources."resolve-1.3.2" // {
+            dependencies = [
+              sources."path-parse-1.0.5"
+            ];
+          })
         ];
       })
       sources."minimist-1.2.0"
@@ -25304,10 +26002,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.4.1";
+    version = "1.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz";
-      sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e";
+      url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz";
+      sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -25403,9 +26101,9 @@ in
                   sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
-                      (sources."for-own-0.1.4" // {
+                      (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-0.1.6"
+                          sources."for-in-1.0.1"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -25443,7 +26141,7 @@ in
           sources."path-is-absolute-1.0.1"
           (sources."readdirp-2.1.0" // {
             dependencies = [
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -25456,7 +26154,7 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.17" // {
+          (sources."fsevents-1.1.1" // {
             dependencies = [
               sources."nan-2.5.1"
               (sources."node-pre-gyp-0.6.33" // {
@@ -25468,7 +26166,7 @@ in
                   })
                   (sources."nopt-3.0.6" // {
                     dependencies = [
-                      sources."abbrev-1.0.9"
+                      sources."abbrev-1.1.0"
                     ];
                   })
                   (sources."npmlog-4.0.2" // {
@@ -25476,7 +26174,7 @@ in
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -25516,12 +26214,12 @@ in
                       sources."set-blocking-2.0.0"
                     ];
                   })
-                  (sources."rc-1.1.6" // {
+                  (sources."rc-1.1.7" // {
                     dependencies = [
                       sources."deep-extend-0.4.1"
                       sources."ini-1.3.4"
                       sources."minimist-1.2.0"
-                      sources."strip-json-comments-1.0.4"
+                      sources."strip-json-comments-2.0.1"
                     ];
                   })
                   (sources."request-2.79.0" // {
@@ -25565,7 +26263,7 @@ in
                               sources."graceful-readlink-1.0.1"
                             ];
                           })
-                          (sources."is-my-json-valid-2.15.0" // {
+                          (sources."is-my-json-valid-2.16.0" // {
                             dependencies = [
                               sources."generate-function-2.0.0"
                               (sources."generate-object-property-1.2.0" // {
@@ -25626,7 +26324,7 @@ in
                         ];
                       })
                       sources."oauth-sign-0.8.2"
-                      sources."qs-6.3.0"
+                      sources."qs-6.3.1"
                       sources."stringstream-0.0.5"
                       (sources."tough-cookie-2.3.2" // {
                         dependencies = [
@@ -25637,6 +26335,7 @@ in
                       sources."uuid-3.0.1"
                     ];
                   })
+                  sources."rimraf-2.5.4"
                   sources."semver-5.3.0"
                   (sources."tar-2.2.1" // {
                     dependencies = [
@@ -25683,15 +26382,16 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      (sources."connect-3.5.0" // {
+      (sources."connect-3.6.0" // {
         dependencies = [
-          (sources."debug-2.2.0" // {
+          (sources."debug-2.6.1" // {
             dependencies = [
-              sources."ms-0.7.1"
+              sources."ms-0.7.2"
             ];
           })
-          (sources."finalhandler-0.5.0" // {
+          (sources."finalhandler-1.0.0" // {
             dependencies = [
+              sources."encodeurl-1.0.1"
               sources."escape-html-1.0.3"
               (sources."on-finished-2.3.0" // {
                 dependencies = [
@@ -25790,16 +26490,16 @@ in
       })
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."safe-buffer-5.0.1"
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.7.3" // {
         dependencies = [
           (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."engine.io-1.8.2" // {
+          (sources."engine.io-1.8.3" // {
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
@@ -25821,7 +26521,7 @@ in
                   sources."wtf-8-1.0.0"
                 ];
               })
-              (sources."ws-1.1.1" // {
+              (sources."ws-1.1.2" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
@@ -25837,12 +26537,12 @@ in
           })
           sources."object-assign-4.1.0"
           sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.7.2" // {
+          (sources."socket.io-client-1.7.3" // {
             dependencies = [
               sources."backo2-1.0.2"
               sources."component-bind-1.0.0"
               sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.2" // {
+              (sources."engine.io-client-1.8.3" // {
                 dependencies = [
                   sources."component-inherit-0.0.3"
                   (sources."engine.io-parser-1.3.2" // {
@@ -25873,7 +26573,7 @@ in
                       })
                     ];
                   })
-                  (sources."ws-1.1.1" // {
+                  (sources."ws-1.1.2" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
@@ -25912,7 +26612,7 @@ in
         ];
       })
       sources."source-map-0.5.6"
-      (sources."tmp-0.0.28" // {
+      (sources."tmp-0.0.31" // {
         dependencies = [
           sources."os-tmpdir-1.0.2"
         ];
@@ -26254,7 +26954,7 @@ in
     dependencies = [
       (sources."through2-2.0.3" // {
         dependencies = [
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -26378,9 +27078,9 @@ in
                   sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
-                      (sources."for-own-0.1.4" // {
+                      (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-0.1.6"
+                          sources."for-in-1.0.1"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -26445,7 +27145,7 @@ in
           sources."graceful-fs-4.1.11"
           (sources."gulp-sourcemaps-1.6.0" // {
             dependencies = [
-              sources."convert-source-map-1.3.0"
+              sources."convert-source-map-1.4.0"
             ];
           })
           sources."is-valid-glob-0.3.0"
@@ -26458,7 +27158,7 @@ in
             ];
           })
           sources."object-assign-4.1.1"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -26669,7 +27369,7 @@ in
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -26758,7 +27458,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -26819,7 +27519,7 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."qs-6.3.1"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -26831,7 +27531,7 @@ in
             ];
           })
           sources."retry-0.8.0"
-          (sources."rimraf-2.5.4" // {
+          (sources."rimraf-2.6.1" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -26863,7 +27563,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -26923,7 +27623,7 @@ in
           })
           (sources."nopt-3.0.6" // {
             dependencies = [
-              sources."abbrev-1.0.9"
+              sources."abbrev-1.1.0"
             ];
           })
           (sources."once-1.3.3" // {
@@ -26952,7 +27652,7 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."rimraf-2.5.4" // {
+              (sources."rimraf-2.6.1" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -27074,7 +27774,7 @@ in
       })
       (sources."nopt-3.0.6" // {
         dependencies = [
-          sources."abbrev-1.0.9"
+          sources."abbrev-1.1.0"
         ];
       })
       (sources."npmlog-4.0.2" // {
@@ -27082,7 +27782,7 @@ in
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -27170,7 +27870,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -27231,7 +27931,7 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -27242,7 +27942,7 @@ in
           sources."uuid-3.0.1"
         ];
       })
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       (sources."tar-2.2.1" // {
         dependencies = [
@@ -27564,19 +28264,19 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
           sources."minimist-1.2.0"
-          sources."strip-json-comments-1.0.4"
+          sources."strip-json-comments-2.0.1"
         ];
       })
       sources."semver-4.3.6"
-      (sources."serve-favicon-2.3.2" // {
+      (sources."serve-favicon-2.4.0" // {
         dependencies = [
-          sources."etag-1.7.0"
-          sources."fresh-0.3.0"
+          sources."etag-1.8.0"
+          sources."fresh-0.4.0"
           sources."ms-0.7.2"
           sources."parseurl-1.3.1"
         ];
@@ -27598,7 +28298,7 @@ in
               })
               (sources."nopt-3.0.6" // {
                 dependencies = [
-                  sources."abbrev-1.0.9"
+                  sources."abbrev-1.1.0"
                 ];
               })
               (sources."npmlog-4.0.2" // {
@@ -27606,7 +28306,7 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -27688,7 +28388,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.15.0" // {
+                      (sources."is-my-json-valid-2.16.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -27749,7 +28449,7 @@ in
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.0"
+                  sources."qs-6.3.1"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -27865,7 +28565,7 @@ in
               })
               (sources."nopt-3.0.6" // {
                 dependencies = [
-                  sources."abbrev-1.0.9"
+                  sources."abbrev-1.1.0"
                 ];
               })
               (sources."npmlog-4.0.2" // {
@@ -27873,7 +28573,7 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -27955,7 +28655,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.15.0" // {
+                      (sources."is-my-json-valid-2.16.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -28016,7 +28716,7 @@ in
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.0"
+                  sources."qs-6.3.1"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -28125,7 +28825,7 @@ in
           sources."isexe-1.1.2"
         ];
       })
-      (sources."ws-1.1.1" // {
+      (sources."ws-1.1.2" // {
         dependencies = [
           sources."options-0.0.6"
           sources."ultron-1.0.2"
@@ -28197,7 +28897,7 @@ in
       })
       (sources."nopt-3.0.6" // {
         dependencies = [
-          sources."abbrev-1.0.9"
+          sources."abbrev-1.1.0"
         ];
       })
       (sources."npmlog-4.0.2" // {
@@ -28205,7 +28905,7 @@ in
           (sources."are-we-there-yet-1.1.2" // {
             dependencies = [
               sources."delegates-1.0.0"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -28246,12 +28946,12 @@ in
           sources."set-blocking-2.0.0"
         ];
       })
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
           sources."minimist-1.2.0"
-          sources."strip-json-comments-1.0.4"
+          sources."strip-json-comments-2.0.1"
         ];
       })
       (sources."request-2.79.0" // {
@@ -28295,7 +28995,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -28356,7 +29056,7 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -28526,9 +29226,9 @@ in
                   sources."normalize-path-2.0.1"
                   (sources."object.omit-2.0.1" // {
                     dependencies = [
-                      (sources."for-own-0.1.4" // {
+                      (sources."for-own-0.1.5" // {
                         dependencies = [
-                          sources."for-in-0.1.6"
+                          sources."for-in-1.0.1"
                         ];
                       })
                       sources."is-extendable-0.1.1"
@@ -28567,7 +29267,7 @@ in
           (sources."readdirp-2.1.0" // {
             dependencies = [
               sources."graceful-fs-4.1.11"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -28580,7 +29280,7 @@ in
               sources."set-immediate-shim-1.0.1"
             ];
           })
-          (sources."fsevents-1.0.17" // {
+          (sources."fsevents-1.1.1" // {
             dependencies = [
               sources."nan-2.5.1"
               (sources."node-pre-gyp-0.6.33" // {
@@ -28592,7 +29292,7 @@ in
                   })
                   (sources."nopt-3.0.6" // {
                     dependencies = [
-                      sources."abbrev-1.0.9"
+                      sources."abbrev-1.1.0"
                     ];
                   })
                   (sources."npmlog-4.0.2" // {
@@ -28600,7 +29300,7 @@ in
                       (sources."are-we-there-yet-1.1.2" // {
                         dependencies = [
                           sources."delegates-1.0.0"
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -28640,12 +29340,12 @@ in
                       sources."set-blocking-2.0.0"
                     ];
                   })
-                  (sources."rc-1.1.6" // {
+                  (sources."rc-1.1.7" // {
                     dependencies = [
                       sources."deep-extend-0.4.1"
                       sources."ini-1.3.4"
                       sources."minimist-1.2.0"
-                      sources."strip-json-comments-1.0.4"
+                      sources."strip-json-comments-2.0.1"
                     ];
                   })
                   (sources."request-2.79.0" // {
@@ -28689,7 +29389,7 @@ in
                               sources."graceful-readlink-1.0.1"
                             ];
                           })
-                          (sources."is-my-json-valid-2.15.0" // {
+                          (sources."is-my-json-valid-2.16.0" // {
                             dependencies = [
                               sources."generate-function-2.0.0"
                               (sources."generate-object-property-1.2.0" // {
@@ -28750,7 +29450,7 @@ in
                         ];
                       })
                       sources."oauth-sign-0.8.2"
-                      sources."qs-6.3.0"
+                      sources."qs-6.3.1"
                       sources."stringstream-0.0.5"
                       (sources."tough-cookie-2.3.2" // {
                         dependencies = [
@@ -28891,7 +29591,7 @@ in
         dependencies = [
           (sources."nopt-1.0.10" // {
             dependencies = [
-              sources."abbrev-1.0.9"
+              sources."abbrev-1.1.0"
             ];
           })
         ];
@@ -28964,7 +29664,7 @@ in
                             ];
                           })
                           sources."inherits-2.0.3"
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -28995,7 +29695,7 @@ in
                               sources."pinkie-2.0.4"
                             ];
                           })
-                          (sources."readable-stream-2.2.2" // {
+                          (sources."readable-stream-2.2.3" // {
                             dependencies = [
                               sources."buffer-shims-1.0.0"
                               sources."core-util-is-1.0.2"
@@ -29013,12 +29713,12 @@ in
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.6" // {
+                      (sources."rc-1.1.7" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
                           sources."minimist-1.2.0"
-                          sources."strip-json-comments-1.0.4"
+                          sources."strip-json-comments-2.0.1"
                         ];
                       })
                     ];
@@ -29138,7 +29838,7 @@ in
               sources."domhandler-2.3.0"
               sources."domutils-1.5.1"
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -29304,7 +30004,7 @@ in
       })
       (sources."i18next-1.10.6" // {
         dependencies = [
-          (sources."cookies-0.6.2" // {
+          (sources."cookies-0.7.0" // {
             dependencies = [
               sources."depd-1.1.0"
               sources."keygrip-1.0.1"
@@ -29437,9 +30137,9 @@ in
                       sources."normalize-path-2.0.1"
                       (sources."object.omit-2.0.1" // {
                         dependencies = [
-                          (sources."for-own-0.1.4" // {
+                          (sources."for-own-0.1.5" // {
                             dependencies = [
-                              sources."for-in-0.1.6"
+                              sources."for-in-1.0.1"
                             ];
                           })
                           sources."is-extendable-0.1.1"
@@ -29515,7 +30215,7 @@ in
               sources."process-nextick-args-1.0.7"
             ];
           })
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -29565,7 +30265,7 @@ in
       sources."mustache-2.3.0"
       (sources."nopt-3.0.6" // {
         dependencies = [
-          sources."abbrev-1.0.9"
+          sources."abbrev-1.1.0"
         ];
       })
       (sources."oauth2orize-1.7.0" // {
@@ -29717,7 +30417,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.4" // {
+                  (sources."async-2.1.5" // {
                     dependencies = [
                       sources."lodash-4.17.4"
                     ];
@@ -29748,7 +30448,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -29809,7 +30509,7 @@ in
               })
               sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.1"
+              sources."qs-6.2.2"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -29821,7 +30521,7 @@ in
           })
         ];
       })
-      (sources."node-red-node-email-0.1.16" // {
+      (sources."node-red-node-email-0.1.21" // {
         dependencies = [
           (sources."nodemailer-1.11.0" // {
             dependencies = [
@@ -29967,7 +30667,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -30027,7 +30727,7 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."qs-6.3.1"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -30057,7 +30757,7 @@ in
                   (sources."are-we-there-yet-1.1.2" // {
                     dependencies = [
                       sources."delegates-1.0.0"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -30098,12 +30798,12 @@ in
                   sources."set-blocking-2.0.0"
                 ];
               })
-              (sources."rc-1.1.6" // {
+              (sources."rc-1.1.7" // {
                 dependencies = [
                   sources."deep-extend-0.4.1"
                   sources."ini-1.3.4"
                   sources."minimist-1.2.0"
-                  sources."strip-json-comments-1.0.4"
+                  sources."strip-json-comments-2.0.1"
                 ];
               })
               (sources."request-2.79.0" // {
@@ -30147,7 +30847,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.15.0" // {
+                      (sources."is-my-json-valid-2.16.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -30207,7 +30907,7 @@ in
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.0"
+                  sources."qs-6.3.1"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -30387,7 +31087,7 @@ in
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
-          sources."coffee-script-1.12.3"
+          sources."coffee-script-1.12.4"
           (sources."vows-0.8.1" // {
             dependencies = [
               sources."eyes-0.1.8"
@@ -30514,13 +31214,13 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.2.0";
+    version = "4.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz";
-      sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a";
+      url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz";
+      sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28";
     };
     dependencies = [
-      (sources."JSONStream-1.3.0" // {
+      (sources."JSONStream-1.3.1" // {
         dependencies = [
           sources."jsonparse-1.3.0"
           sources."through-2.3.8"
@@ -30530,7 +31230,7 @@ in
       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."chownr-1.0.1"
@@ -30594,7 +31294,7 @@ 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.2.0"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -30619,6 +31319,7 @@ in
           sources."promzard-0.3.0"
         ];
       })
+      sources."lazy-property-1.0.0"
       sources."lockfile-1.0.3"
       (sources."lodash._baseuniq-4.6.0" // {
         dependencies = [
@@ -30746,7 +31447,7 @@ in
         ];
       })
       sources."once-1.4.0"
-      sources."opener-1.4.2"
+      sources."opener-1.4.3"
       (sources."osenv-0.1.4" // {
         dependencies = [
           sources."os-homedir-1.0.2"
@@ -30790,7 +31491,7 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      (sources."readable-stream-2.2.2" // {
+      (sources."readable-stream-2.2.3" // {
         dependencies = [
           sources."buffer-shims-1.0.0"
           sources."core-util-is-1.0.2"
@@ -30833,7 +31534,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -30894,7 +31595,7 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -31046,7 +31747,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -31107,7 +31808,7 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."qs-6.3.1"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -31123,7 +31824,7 @@ in
           sources."slide-1.1.6"
           sources."chownr-0.0.2"
           sources."mkdirp-0.3.5"
-          (sources."rimraf-2.5.4" // {
+          (sources."rimraf-2.6.1" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -31161,7 +31862,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -31218,7 +31919,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-2.3.2"
@@ -31246,7 +31947,7 @@ in
                   sources."minimist-0.0.8"
                 ];
               })
-              (sources."rimraf-2.5.4" // {
+              (sources."rimraf-2.6.1" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -31308,7 +32009,7 @@ in
         ];
       })
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.3"
+      sources."coffee-script-1.12.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -31320,10 +32021,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.10.2";
+    version = "2.10.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz";
-      sha1 = "9614c58ec84d31702a85881c844c3fb93611a585";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz";
+      sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -31569,7 +32270,7 @@ in
               (sources."concat-stream-1.6.0" // {
                 dependencies = [
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -31642,7 +32343,7 @@ in
             ];
           })
           sources."once-1.4.0"
-          sources."opener-1.4.2"
+          sources."opener-1.4.3"
           (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-homedir-1.0.2"
@@ -31724,7 +32425,7 @@ in
               })
               (sources."har-validator-2.0.6" // {
                 dependencies = [
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -31786,7 +32487,7 @@ in
               })
               sources."node-uuid-1.4.7"
               sources."oauth-sign-0.8.2"
-              sources."qs-6.2.1"
+              sources."qs-6.2.2"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -31958,7 +32659,7 @@ in
                         ];
                       })
                       sources."read-all-stream-3.1.0"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -31980,24 +32681,24 @@ in
                   })
                   (sources."registry-auth-token-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.6" // {
+                      (sources."rc-1.1.7" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
                           sources."minimist-1.2.0"
-                          sources."strip-json-comments-1.0.4"
+                          sources."strip-json-comments-2.0.1"
                         ];
                       })
                     ];
                   })
                   (sources."registry-url-3.1.0" // {
                     dependencies = [
-                      (sources."rc-1.1.6" // {
+                      (sources."rc-1.1.7" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
                           sources."minimist-1.2.0"
-                          sources."strip-json-comments-1.0.4"
+                          sources."strip-json-comments-2.0.1"
                         ];
                       })
                     ];
@@ -32396,7 +33097,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -32457,7 +33158,7 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -32469,15 +33170,15 @@ in
         ];
       })
       sources."semver-5.3.0"
-      (sources."serve-favicon-2.3.2" // {
+      (sources."serve-favicon-2.4.0" // {
         dependencies = [
-          sources."etag-1.7.0"
-          sources."fresh-0.3.0"
+          sources."etag-1.8.0"
+          sources."fresh-0.4.0"
           sources."ms-0.7.2"
           sources."parseurl-1.3.1"
         ];
       })
-      (sources."service-runner-2.1.15" // {
+      (sources."service-runner-2.2.4" // {
         dependencies = [
           sources."bluebird-3.4.7"
           (sources."bunyan-1.8.5" // {
@@ -32539,7 +33240,7 @@ in
             ];
           })
           sources."hot-shots-4.3.1"
-          (sources."limitation-0.1.9" // {
+          (sources."limitation-0.2.0" // {
             dependencies = [
               (sources."kad-git+https://github.com/gwicke/kad.git#master" // {
                 dependencies = [
@@ -32564,7 +33265,7 @@ in
                   })
                 ];
               })
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -32698,6 +33399,16 @@ in
               sources."yargs-parser-4.2.1"
             ];
           })
+          (sources."dnscache-1.0.1" // {
+            dependencies = [
+              sources."asap-2.0.5"
+              (sources."lodash.clone-4.3.2" // {
+                dependencies = [
+                  sources."lodash._baseclone-4.5.7"
+                ];
+              })
+            ];
+          })
         ];
       })
       sources."simplediff-0.1.1"
@@ -32863,7 +33574,7 @@ in
                 dependencies = [
                   sources."inherits-2.0.3"
                   sources."typedarray-0.0.6"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -33140,7 +33851,7 @@ in
                     dependencies = [
                       sources."inherits-2.0.3"
                       sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -33263,12 +33974,12 @@ in
         ];
       })
       sources."range-parser-1.2.0"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
           sources."minimist-1.2.0"
-          sources."strip-json-comments-1.0.4"
+          sources."strip-json-comments-2.0.1"
         ];
       })
       (sources."torrent-stream-1.0.3" // {
@@ -33363,7 +34074,7 @@ in
               })
             ];
           })
-          (sources."rimraf-2.5.4" // {
+          (sources."rimraf-2.6.1" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -33447,11 +34158,11 @@ in
                       sources."unzip-response-2.0.1"
                     ];
                   })
-                  (sources."simple-peer-6.2.2" // {
+                  (sources."simple-peer-6.4.3" // {
                     dependencies = [
                       sources."get-browser-rtc-1.0.2"
                       sources."randombytes-2.0.3"
-                      (sources."readable-stream-2.2.2" // {
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -33463,9 +34174,10 @@ in
                       })
                     ];
                   })
-                  (sources."simple-websocket-4.3.0" // {
+                  (sources."simple-websocket-4.3.1" // {
                     dependencies = [
-                      (sources."readable-stream-2.2.2" // {
+                      sources."randombytes-2.0.3"
+                      (sources."readable-stream-2.2.3" // {
                         dependencies = [
                           sources."buffer-shims-1.0.0"
                           sources."core-util-is-1.0.2"
@@ -33475,7 +34187,7 @@ in
                           sources."util-deprecate-1.0.2"
                         ];
                       })
-                      (sources."ws-2.0.3" // {
+                      (sources."ws-2.1.0" // {
                         dependencies = [
                           sources."ultron-1.1.0"
                         ];
@@ -33489,7 +34201,7 @@ in
                     ];
                   })
                   sources."uniq-1.0.1"
-                  (sources."ws-1.1.1" // {
+                  (sources."ws-1.1.2" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
@@ -33744,14 +34456,14 @@ in
           sources."xtend-4.0.1"
         ];
       })
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.7.3" // {
         dependencies = [
           (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."engine.io-1.8.2" // {
+          (sources."engine.io-1.8.3" // {
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
@@ -33773,7 +34485,7 @@ in
                   sources."wtf-8-1.0.0"
                 ];
               })
-              (sources."ws-1.1.1" // {
+              (sources."ws-1.1.2" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
@@ -33789,12 +34501,12 @@ in
           })
           sources."object-assign-4.1.0"
           sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.7.2" // {
+          (sources."socket.io-client-1.7.3" // {
             dependencies = [
               sources."backo2-1.0.2"
               sources."component-bind-1.0.0"
               sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.2" // {
+              (sources."engine.io-client-1.8.3" // {
                 dependencies = [
                   sources."component-inherit-0.0.3"
                   (sources."engine.io-parser-1.3.2" // {
@@ -33825,7 +34537,7 @@ in
                       })
                     ];
                   })
-                  (sources."ws-1.1.1" // {
+                  (sources."ws-1.1.2" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
@@ -34014,7 +34726,7 @@ in
             ];
           })
           sources."random-access-file-0.3.2"
-          (sources."rimraf-2.5.4" // {
+          (sources."rimraf-2.6.1" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -34050,7 +34762,7 @@ in
       })
       (sources."fluent-ffmpeg-2.1.0" // {
         dependencies = [
-          (sources."async-2.1.4" // {
+          (sources."async-2.1.5" // {
             dependencies = [
               sources."lodash-4.17.4"
             ];
@@ -34120,7 +34832,7 @@ in
           sources."jsonfile-2.4.0"
           sources."klaw-1.3.1"
           sources."path-is-absolute-1.0.1"
-          (sources."rimraf-2.5.4" // {
+          (sources."rimraf-2.6.1" // {
             dependencies = [
               (sources."glob-7.1.1" // {
                 dependencies = [
@@ -34185,7 +34897,7 @@ in
           sources."forever-agent-0.6.1"
           (sources."form-data-1.0.1" // {
             dependencies = [
-              (sources."async-2.1.4" // {
+              (sources."async-2.1.5" // {
                 dependencies = [
                   sources."lodash-4.17.4"
                 ];
@@ -34269,7 +34981,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -34366,7 +35078,7 @@ in
           })
           sources."private-0.1.7"
           sources."q-1.4.1"
-          (sources."recast-0.11.21" // {
+          (sources."recast-0.11.22" // {
             dependencies = [
               sources."ast-types-0.9.5"
               sources."esprima-3.1.3"
@@ -34534,7 +35246,7 @@ in
                           sources."graceful-readlink-1.0.1"
                         ];
                       })
-                      (sources."is-my-json-valid-2.15.0" // {
+                      (sources."is-my-json-valid-2.16.0" // {
                         dependencies = [
                           sources."generate-function-2.0.0"
                           (sources."generate-object-property-1.2.0" // {
@@ -34595,7 +35307,7 @@ in
                     ];
                   })
                   sources."oauth-sign-0.8.2"
-                  sources."qs-6.3.0"
+                  sources."qs-6.3.1"
                   sources."stringstream-0.0.5"
                   (sources."tough-cookie-2.3.2" // {
                     dependencies = [
@@ -34720,6 +35432,12 @@ in
           (sources."send-0.14.2" // {
             dependencies = [
               sources."destroy-1.0.4"
+              (sources."http-errors-1.5.1" // {
+                dependencies = [
+                  sources."inherits-2.0.3"
+                  sources."setprototypeof-1.0.2"
+                ];
+              })
               sources."mime-1.3.4"
               sources."ms-0.7.2"
               sources."statuses-1.3.1"
@@ -34760,6 +35478,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 = [
@@ -34826,7 +35551,7 @@ in
           sources."esprima-3.1.3"
         ];
       })
-      (sources."cookies-0.6.2" // {
+      (sources."cookies-0.7.0" // {
         dependencies = [
           sources."depd-1.1.0"
           sources."keygrip-1.0.1"
@@ -34868,7 +35593,7 @@ in
                   sources."supports-color-2.0.0"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -34929,7 +35654,7 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -35048,7 +35773,7 @@ in
                   })
                   sources."entities-1.1.1"
                   sources."inherits-2.0.3"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -35067,7 +35792,7 @@ in
         ];
       })
       sources."jju-1.3.0"
-      (sources."JSONStream-1.3.0" // {
+      (sources."JSONStream-1.3.1" // {
         dependencies = [
           sources."jsonparse-1.3.0"
           sources."through-2.3.8"
@@ -35079,10 +35804,11 @@ in
         ];
       })
       sources."sinopia-htpasswd-0.4.5"
-      (sources."http-errors-1.5.1" // {
+      (sources."http-errors-1.6.1" // {
         dependencies = [
+          sources."depd-1.1.0"
           sources."inherits-2.0.3"
-          sources."setprototypeof-1.0.2"
+          sources."setprototypeof-1.0.3"
           sources."statuses-1.3.1"
         ];
       })
@@ -35125,7 +35851,7 @@ in
       sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c";
     };
     dependencies = [
-      (sources."async-2.1.4" // {
+      (sources."async-2.1.5" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -35153,7 +35879,7 @@ in
               })
             ];
           })
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -35189,7 +35915,7 @@ in
       sources."lru-cache-2.2.0"
       (sources."nopt-2.0.0" // {
         dependencies = [
-          sources."abbrev-1.0.9"
+          sources."abbrev-1.1.0"
         ];
       })
       (sources."restify-4.0.3" // {
@@ -35324,7 +36050,7 @@ in
           (sources."sshpk-agent-1.2.1" // {
             dependencies = [
               sources."assert-plus-0.1.5"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -35526,13 +36252,13 @@ in
   tern = nodeEnv.buildNodePackage {
     name = "tern";
     packageName = "tern";
-    version = "0.20.0";
+    version = "0.21.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz";
-      sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34";
+      url = "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz";
+      sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7";
     };
     dependencies = [
-      sources."acorn-3.3.0"
+      sources."acorn-4.0.11"
       (sources."enhanced-resolve-2.3.0" // {
         dependencies = [
           sources."tapable-0.2.6"
@@ -35543,7 +36269,7 @@ in
                   sources."prr-0.0.0"
                 ];
               })
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -35560,21 +36286,31 @@ in
           sources."object-assign-4.1.1"
         ];
       })
-      (sources."glob-3.2.11" // {
+      (sources."glob-7.1.1" // {
         dependencies = [
-          sources."inherits-2.0.3"
-          (sources."minimatch-0.3.0" // {
+          sources."fs.realpath-1.0.0"
+          (sources."inflight-1.0.6" // {
             dependencies = [
-              sources."lru-cache-2.7.3"
-              sources."sigmund-1.0.1"
+              sources."wrappy-1.0.2"
             ];
           })
+          sources."inherits-2.0.3"
+          (sources."once-1.4.0" // {
+            dependencies = [
+              sources."wrappy-1.0.2"
+            ];
+          })
+          sources."path-is-absolute-1.0.1"
         ];
       })
-      (sources."minimatch-0.2.14" // {
+      (sources."minimatch-3.0.3" // {
         dependencies = [
-          sources."lru-cache-2.7.3"
-          sources."sigmund-1.0.1"
+          (sources."brace-expansion-1.1.6" // {
+            dependencies = [
+              sources."balanced-match-0.4.2"
+              sources."concat-map-0.0.1"
+            ];
+          })
         ];
       })
       sources."resolve-from-2.0.0"
@@ -35663,7 +36399,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.4" // {
+                  (sources."async-2.1.5" // {
                     dependencies = [
                       sources."lodash-4.17.4"
                     ];
@@ -35694,7 +36430,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -35755,7 +36491,7 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.0.2"
+              sources."qs-6.0.3"
               sources."stringstream-0.0.5"
               sources."tough-cookie-2.2.2"
               sources."tunnel-agent-0.4.3"
@@ -35857,7 +36593,7 @@ in
                   sources."graceful-readlink-1.0.1"
                 ];
               })
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -35919,7 +36655,7 @@ in
           })
           sources."node-uuid-1.4.7"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -35961,10 +36697,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.6";
+    version = "2.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz";
-      sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz";
+      sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -36041,13 +36777,13 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.7";
+    version = "1.1.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz";
-      sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz";
+      sha1 = "1519b78475ef5162ef3342c2046889b396add651";
     };
     dependencies = [
-      sources."async-2.1.4"
+      sources."async-2.1.5"
       sources."bluebird-3.4.7"
       sources."blueimp-md5-2.6.0"
       (sources."body-parser-1.15.2" // {
@@ -36098,7 +36834,7 @@ in
               sources."color-name-1.1.1"
             ];
           })
-          (sources."color-string-1.4.0" // {
+          (sources."color-string-1.5.0" // {
             dependencies = [
               sources."color-name-1.1.1"
               (sources."simple-swizzle-0.2.2" // {
@@ -36124,7 +36860,7 @@ in
             dependencies = [
               (sources."nopt-1.0.10" // {
                 dependencies = [
-                  sources."abbrev-1.0.9"
+                  sources."abbrev-1.1.0"
                 ];
               })
               sources."mkdirp-0.3.0"
@@ -36358,7 +37094,7 @@ in
         ];
       })
       sources."hasher-1.2.0"
-      sources."ignore-3.2.2"
+      sources."ignore-3.2.4"
       (sources."keen.io-0.1.3" // {
         dependencies = [
           sources."underscore-1.5.2"
@@ -36372,9 +37108,14 @@ in
         ];
       })
       sources."moment-2.17.1"
+      (sources."node-cache-4.1.1" // {
+        dependencies = [
+          sources."clone-2.1.0"
+        ];
+      })
       (sources."npm-4.1.2" // {
         dependencies = [
-          (sources."JSONStream-1.3.0" // {
+          (sources."JSONStream-1.3.1" // {
             dependencies = [
               sources."jsonparse-1.3.0"
               sources."through-2.3.8"
@@ -36580,7 +37321,7 @@ in
             ];
           })
           sources."once-1.4.0"
-          sources."opener-1.4.2"
+          sources."opener-1.4.3"
           (sources."osenv-0.1.4" // {
             dependencies = [
               sources."os-tmpdir-1.0.2"
@@ -36623,7 +37364,7 @@ in
             ];
           })
           sources."read-package-tree-5.1.5"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -36666,7 +37407,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -36727,7 +37468,7 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."qs-6.3.1"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -36817,7 +37558,7 @@ in
             dependencies = [
               sources."inherits-2.0.3"
               sources."typedarray-0.0.6"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -36901,7 +37642,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -36962,7 +37703,7 @@ in
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."qs-6.3.1"
               sources."stringstream-0.0.5"
               (sources."tough-cookie-2.3.2" // {
                 dependencies = [
@@ -36980,7 +37721,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -37046,12 +37787,12 @@ in
           sources."stack-trace-0.0.9"
         ];
       })
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."deep-extend-0.4.1"
           sources."ini-1.3.4"
           sources."minimist-1.2.0"
-          sources."strip-json-comments-1.0.4"
+          sources."strip-json-comments-2.0.1"
         ];
       })
       (sources."rimraf-2.5.4" // {
@@ -37127,14 +37868,14 @@ in
           sources."eve-0.4.2"
         ];
       })
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.7.3" // {
         dependencies = [
           (sources."debug-2.3.3" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."engine.io-1.8.2" // {
+          (sources."engine.io-1.8.3" // {
             dependencies = [
               (sources."accepts-1.3.3" // {
                 dependencies = [
@@ -37156,7 +37897,7 @@ in
                   sources."wtf-8-1.0.0"
                 ];
               })
-              (sources."ws-1.1.1" // {
+              (sources."ws-1.1.2" // {
                 dependencies = [
                   sources."options-0.0.6"
                   sources."ultron-1.0.2"
@@ -37172,12 +37913,12 @@ in
           })
           sources."object-assign-4.1.0"
           sources."socket.io-adapter-0.5.0"
-          (sources."socket.io-client-1.7.2" // {
+          (sources."socket.io-client-1.7.3" // {
             dependencies = [
               sources."backo2-1.0.2"
               sources."component-bind-1.0.0"
               sources."component-emitter-1.2.1"
-              (sources."engine.io-client-1.8.2" // {
+              (sources."engine.io-client-1.8.3" // {
                 dependencies = [
                   sources."component-inherit-0.0.3"
                   (sources."engine.io-parser-1.3.2" // {
@@ -37208,7 +37949,7 @@ in
                       })
                     ];
                   })
-                  (sources."ws-1.1.1" // {
+                  (sources."ws-1.1.2" // {
                     dependencies = [
                       sources."options-0.0.6"
                       sources."ultron-1.0.2"
@@ -37456,7 +38197,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-2.3.2"
@@ -37505,7 +38246,7 @@ in
               sources."jsonfile-2.4.0"
               sources."klaw-1.3.1"
               sources."path-is-absolute-1.0.1"
-              (sources."rimraf-2.5.4" // {
+              (sources."rimraf-2.6.1" // {
                 dependencies = [
                   (sources."glob-7.1.1" // {
                     dependencies = [
@@ -37570,7 +38311,7 @@ in
               sources."forever-agent-0.6.1"
               (sources."form-data-1.0.1" // {
                 dependencies = [
-                  (sources."async-2.1.4" // {
+                  (sources."async-2.1.5" // {
                     dependencies = [
                       sources."lodash-4.17.4"
                     ];
@@ -37654,7 +38395,7 @@ in
                       sources."graceful-readlink-1.0.1"
                     ];
                   })
-                  (sources."is-my-json-valid-2.15.0" // {
+                  (sources."is-my-json-valid-2.16.0" // {
                     dependencies = [
                       sources."generate-function-2.0.0"
                       (sources."generate-object-property-1.2.0" // {
@@ -37728,7 +38469,7 @@ in
         ];
       })
       sources."ajv-keywords-1.5.1"
-      (sources."async-2.1.4" // {
+      (sources."async-2.1.5" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -37742,7 +38483,7 @@ in
       sources."interpret-1.0.1"
       sources."json-loader-0.5.4"
       sources."loader-runner-2.3.0"
-      (sources."loader-utils-0.2.16" // {
+      (sources."loader-utils-0.2.17" // {
         dependencies = [
           sources."big.js-3.1.3"
           sources."emojis-list-2.1.0"
@@ -37757,7 +38498,7 @@ in
               sources."prr-0.0.0"
             ];
           })
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -37823,10 +38564,13 @@ in
                 dependencies = [
                   sources."bn.js-4.11.6"
                   sources."browserify-rsa-4.0.1"
-                  (sources."elliptic-6.3.3" // {
+                  (sources."elliptic-6.4.0" // {
                     dependencies = [
-                      sources."brorand-1.0.7"
+                      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" // {
@@ -37850,10 +38594,13 @@ in
               (sources."create-ecdh-4.0.0" // {
                 dependencies = [
                   sources."bn.js-4.11.6"
-                  (sources."elliptic-6.3.3" // {
+                  (sources."elliptic-6.4.0" // {
                     dependencies = [
-                      sources."brorand-1.0.7"
+                      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"
                     ];
                   })
                 ];
@@ -37871,7 +38618,7 @@ in
                   sources."bn.js-4.11.6"
                   (sources."miller-rabin-4.0.0" // {
                     dependencies = [
-                      sources."brorand-1.0.7"
+                      sources."brorand-1.1.0"
                     ];
                   })
                 ];
@@ -37911,7 +38658,7 @@ in
           sources."process-0.11.9"
           sources."punycode-1.4.1"
           sources."querystring-es3-0.2.1"
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -38015,7 +38762,7 @@ in
           })
         ];
       })
-      (sources."watchpack-1.2.0" // {
+      (sources."watchpack-1.3.1" // {
         dependencies = [
           (sources."chokidar-1.6.1" // {
             dependencies = [
@@ -38068,9 +38815,9 @@ in
                       sources."normalize-path-2.0.1"
                       (sources."object.omit-2.0.1" // {
                         dependencies = [
-                          (sources."for-own-0.1.4" // {
+                          (sources."for-own-0.1.5" // {
                             dependencies = [
-                              sources."for-in-0.1.6"
+                              sources."for-in-1.0.1"
                             ];
                           })
                           sources."is-extendable-0.1.1"
@@ -38118,7 +38865,7 @@ in
                       })
                     ];
                   })
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -38131,14 +38878,14 @@ in
                   sources."set-immediate-shim-1.0.1"
                 ];
               })
-              (sources."fsevents-1.0.17" // {
+              (sources."fsevents-1.1.1" // {
                 dependencies = [
                   sources."nan-2.5.1"
                   (sources."node-pre-gyp-0.6.33" // {
                     dependencies = [
                       (sources."nopt-3.0.6" // {
                         dependencies = [
-                          sources."abbrev-1.0.9"
+                          sources."abbrev-1.1.0"
                         ];
                       })
                       (sources."npmlog-4.0.2" // {
@@ -38146,7 +38893,7 @@ in
                           (sources."are-we-there-yet-1.1.2" // {
                             dependencies = [
                               sources."delegates-1.0.0"
-                              (sources."readable-stream-2.2.2" // {
+                              (sources."readable-stream-2.2.3" // {
                                 dependencies = [
                                   sources."buffer-shims-1.0.0"
                                   sources."core-util-is-1.0.2"
@@ -38186,12 +38933,12 @@ in
                           sources."set-blocking-2.0.0"
                         ];
                       })
-                      (sources."rc-1.1.6" // {
+                      (sources."rc-1.1.7" // {
                         dependencies = [
                           sources."deep-extend-0.4.1"
                           sources."ini-1.3.4"
                           sources."minimist-1.2.0"
-                          sources."strip-json-comments-1.0.4"
+                          sources."strip-json-comments-2.0.1"
                         ];
                       })
                       (sources."request-2.79.0" // {
@@ -38235,7 +38982,7 @@ in
                                   sources."graceful-readlink-1.0.1"
                                 ];
                               })
-                              (sources."is-my-json-valid-2.15.0" // {
+                              (sources."is-my-json-valid-2.16.0" // {
                                 dependencies = [
                                   sources."generate-function-2.0.0"
                                   (sources."generate-object-property-1.2.0" // {
@@ -38296,7 +39043,7 @@ in
                             ];
                           })
                           sources."oauth-sign-0.8.2"
-                          sources."qs-6.3.0"
+                          sources."qs-6.3.1"
                           sources."stringstream-0.0.5"
                           (sources."tough-cookie-2.3.2" // {
                             dependencies = [
@@ -38547,16 +39294,16 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.19.1";
+    version = "0.20.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz";
-      sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz";
+      sha1 = "575190fee60a27a54d4125a0f7579fc702f01229";
     };
     dependencies = [
-      (sources."babel-runtime-6.22.0" // {
+      (sources."babel-runtime-6.23.0" // {
         dependencies = [
           sources."core-js-2.4.1"
-          sources."regenerator-runtime-0.10.1"
+          sources."regenerator-runtime-0.10.3"
         ];
       })
       sources."bytes-2.4.0"
@@ -38599,81 +39346,52 @@ in
           sources."clone-1.0.2"
         ];
       })
-      sources."detect-indent-4.0.0"
+      sources."detect-indent-5.0.0"
       sources."diff-2.2.3"
       sources."ini-1.3.4"
-      (sources."inquirer-1.2.3" // {
+      (sources."inquirer-3.0.5" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
-          (sources."cli-cursor-1.0.2" // {
+          (sources."cli-cursor-2.1.0" // {
             dependencies = [
-              (sources."restore-cursor-1.0.1" // {
+              (sources."restore-cursor-2.0.0" // {
                 dependencies = [
-                  sources."exit-hook-1.1.1"
-                  sources."onetime-1.1.0"
+                  (sources."onetime-2.0.0" // {
+                    dependencies = [
+                      sources."mimic-fn-1.1.0"
+                    ];
+                  })
+                  sources."signal-exit-3.0.2"
                 ];
               })
             ];
           })
           sources."cli-width-2.1.0"
-          (sources."external-editor-1.1.1" // {
+          (sources."external-editor-2.0.1" // {
             dependencies = [
-              sources."extend-3.0.0"
-              (sources."spawn-sync-1.0.15" // {
-                dependencies = [
-                  (sources."concat-stream-1.6.0" // {
-                    dependencies = [
-                      sources."inherits-2.0.3"
-                      sources."typedarray-0.0.6"
-                      (sources."readable-stream-2.2.2" // {
-                        dependencies = [
-                          sources."buffer-shims-1.0.0"
-                          sources."core-util-is-1.0.2"
-                          sources."isarray-1.0.0"
-                          sources."process-nextick-args-1.0.7"
-                          sources."string_decoder-0.10.31"
-                          sources."util-deprecate-1.0.2"
-                        ];
-                      })
-                    ];
-                  })
-                  sources."os-shim-0.1.3"
-                ];
-              })
-              (sources."tmp-0.0.29" // {
+              (sources."tmp-0.0.31" // {
                 dependencies = [
                   sources."os-tmpdir-1.0.2"
                 ];
               })
             ];
           })
-          (sources."figures-1.7.0" // {
+          (sources."figures-2.0.0" // {
             dependencies = [
               sources."escape-string-regexp-1.0.5"
-              sources."object-assign-4.1.1"
             ];
           })
           sources."lodash-4.17.4"
-          sources."mute-stream-0.0.6"
-          (sources."pinkie-promise-2.0.1" // {
-            dependencies = [
-              sources."pinkie-2.0.4"
-            ];
-          })
+          sources."mute-stream-0.0.7"
           (sources."run-async-2.3.0" // {
             dependencies = [
               sources."is-promise-2.1.0"
             ];
           })
           sources."rx-4.1.0"
-          (sources."string-width-1.0.2" // {
+          (sources."string-width-2.0.0" // {
             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."is-fullwidth-code-point-2.0.0"
             ];
           })
           (sources."strip-ansi-3.0.1" // {
@@ -38703,7 +39421,7 @@ in
           sources."ci-info-1.0.0"
         ];
       })
-      sources."leven-2.0.0"
+      sources."leven-2.1.0"
       (sources."loud-rejection-1.6.0" // {
         dependencies = [
           (sources."currently-unhandled-0.4.1" // {
@@ -38761,7 +39479,7 @@ in
           sources."graceful-fs-4.1.11"
           (sources."nopt-3.0.6" // {
             dependencies = [
-              sources."abbrev-1.0.9"
+              sources."abbrev-1.1.0"
             ];
           })
           (sources."npmlog-4.0.2" // {
@@ -38769,7 +39487,7 @@ in
               (sources."are-we-there-yet-1.1.2" // {
                 dependencies = [
                   sources."delegates-1.0.0"
-                  (sources."readable-stream-2.2.2" // {
+                  (sources."readable-stream-2.2.3" // {
                     dependencies = [
                       sources."buffer-shims-1.0.0"
                       sources."core-util-is-1.0.2"
@@ -38823,7 +39541,7 @@ in
           })
         ];
       })
-      sources."object-path-0.11.3"
+      sources."object-path-0.11.4"
       (sources."proper-lockfile-2.0.0" // {
         dependencies = [
           sources."graceful-fs-4.1.11"
@@ -38835,15 +39553,6 @@ in
           sources."mute-stream-0.0.7"
         ];
       })
-      (sources."repeating-2.0.1" // {
-        dependencies = [
-          (sources."is-finite-1.0.2" // {
-            dependencies = [
-              sources."number-is-nan-1.0.1"
-            ];
-          })
-        ];
-      })
       (sources."request-2.79.0" // {
         dependencies = [
           sources."aws-sign2-0.6.0"
@@ -38863,7 +39572,7 @@ in
           })
           (sources."har-validator-2.0.6" // {
             dependencies = [
-              (sources."is-my-json-valid-2.15.0" // {
+              (sources."is-my-json-valid-2.16.0" // {
                 dependencies = [
                   sources."generate-function-2.0.0"
                   (sources."generate-object-property-1.2.0" // {
@@ -38924,7 +39633,7 @@ in
             ];
           })
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."stringstream-0.0.5"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
@@ -38936,7 +39645,7 @@ in
         ];
       })
       sources."request-capture-har-1.1.4"
-      (sources."rimraf-2.5.4" // {
+      (sources."rimraf-2.6.1" // {
         dependencies = [
           (sources."glob-7.1.1" // {
             dependencies = [
@@ -38959,11 +39668,7 @@ in
       })
       sources."roadrunner-1.1.0"
       sources."semver-5.3.0"
-      (sources."strip-bom-2.0.0" // {
-        dependencies = [
-          sources."is-utf8-0.2.1"
-        ];
-      })
+      sources."strip-bom-3.0.0"
       (sources."tar-2.2.1" // {
         dependencies = [
           sources."block-stream-0.0.9"
@@ -38987,7 +39692,7 @@ in
               })
             ];
           })
-          (sources."readable-stream-2.2.2" // {
+          (sources."readable-stream-2.2.3" // {
             dependencies = [
               sources."buffer-shims-1.0.0"
               sources."core-util-is-1.0.2"
@@ -39025,4 +39730,1127 @@ in
     };
     production = true;
   };
+  yo = nodeEnv.buildNodePackage {
+    name = "yo";
+    packageName = "yo";
+    version = "1.8.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz";
+      sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928";
+    };
+    dependencies = [
+      sources."async-1.5.2"
+      (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."cli-list-0.1.8"
+      (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."cross-spawn-3.0.1" // {
+        dependencies = [
+          (sources."lru-cache-4.0.2" // {
+            dependencies = [
+              sources."pseudomap-1.0.2"
+              sources."yallist-2.0.0"
+            ];
+          })
+          (sources."which-1.2.12" // {
+            dependencies = [
+              sources."isexe-1.1.2"
+            ];
+          })
+        ];
+      })
+      (sources."figures-1.7.0" // {
+        dependencies = [
+          sources."escape-string-regexp-1.0.5"
+          sources."object-assign-4.1.1"
+        ];
+      })
+      (sources."fullname-2.1.0" // {
+        dependencies = [
+          (sources."npmconf-2.1.2" // {
+            dependencies = [
+              (sources."config-chain-1.1.11" // {
+                dependencies = [
+                  sources."proto-list-1.2.4"
+                ];
+              })
+              sources."inherits-2.0.3"
+              sources."ini-1.3.4"
+              (sources."mkdirp-0.5.1" // {
+                dependencies = [
+                  sources."minimist-0.0.8"
+                ];
+              })
+              (sources."nopt-3.0.6" // {
+                dependencies = [
+                  sources."abbrev-1.1.0"
+                ];
+              })
+              (sources."once-1.3.3" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+              (sources."osenv-0.1.4" // {
+                dependencies = [
+                  sources."os-homedir-1.0.2"
+                  sources."os-tmpdir-1.0.2"
+                ];
+              })
+              sources."semver-4.3.6"
+              sources."uid-number-0.0.5"
+            ];
+          })
+          sources."pify-2.3.0"
+          (sources."pinkie-promise-2.0.1" // {
+            dependencies = [
+              sources."pinkie-2.0.4"
+            ];
+          })
+        ];
+      })
+      (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.0" // {
+                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.3" // {
+            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."humanize-string-1.0.1" // {
+        dependencies = [
+          sources."decamelize-1.2.0"
+        ];
+      })
+      (sources."inquirer-0.11.4" // {
+        dependencies = [
+          sources."ansi-escapes-1.4.0"
+          sources."ansi-regex-2.1.1"
+          (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-1.1.1"
+          (sources."readline2-1.0.1" // {
+            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."mute-stream-0.0.5"
+            ];
+          })
+          (sources."run-async-0.1.0" // {
+            dependencies = [
+              (sources."once-1.4.0" // {
+                dependencies = [
+                  sources."wrappy-1.0.2"
+                ];
+              })
+            ];
+          })
+          sources."rx-lite-3.1.2"
+          (sources."string-width-1.0.2" // {
+            dependencies = [
+              sources."code-point-at-1.1.0"
+              (sources."is-fullwidth-code-point-1.0.0" // {
+                dependencies = [
+                  sources."number-is-nan-1.0.1"
+                ];
+              })
+            ];
+          })
+          sources."strip-ansi-3.0.1"
+          sources."through-2.3.8"
+        ];
+      })
+      (sources."insight-0.7.0" // {
+        dependencies = [
+          (sources."inquirer-0.10.1" // {
+            dependencies = [
+              sources."ansi-escapes-1.4.0"
+              sources."ansi-regex-2.1.1"
+              (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-1.1.1"
+              (sources."readline2-1.0.1" // {
+                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."mute-stream-0.0.5"
+                ];
+              })
+              (sources."run-async-0.1.0" // {
+                dependencies = [
+                  (sources."once-1.4.0" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              sources."rx-lite-3.1.2"
+              sources."strip-ansi-3.0.1"
+              sources."through-2.3.8"
+            ];
+          })
+          (sources."lodash.debounce-3.1.1" // {
+            dependencies = [
+              sources."lodash._getnative-3.9.1"
+            ];
+          })
+          sources."object-assign-4.1.1"
+          (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" // {
+                dependencies = [
+                  sources."semver-5.3.0"
+                ];
+              })
+            ];
+          })
+          (sources."request-2.79.0" // {
+            dependencies = [
+              sources."aws-sign2-0.6.0"
+              sources."aws4-1.6.0"
+              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-2.1.2" // {
+                dependencies = [
+                  sources."asynckit-0.4.0"
+                ];
+              })
+              (sources."har-validator-2.0.6" // {
+                dependencies = [
+                  (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.3.1"
+              sources."stringstream-0.0.5"
+              sources."tunnel-agent-0.4.3"
+              sources."uuid-3.0.1"
+            ];
+          })
+          (sources."tough-cookie-2.3.2" // {
+            dependencies = [
+              sources."punycode-1.4.1"
+            ];
+          })
+        ];
+      })
+      sources."lodash-3.10.1"
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          (sources."camelcase-keys-2.1.0" // {
+            dependencies = [
+              sources."camelcase-2.1.1"
+            ];
+          })
+          sources."decamelize-1.2.0"
+          (sources."loud-rejection-1.6.0" // {
+            dependencies = [
+              (sources."currently-unhandled-0.4.1" // {
+                dependencies = [
+                  sources."array-find-index-1.0.2"
+                ];
+              })
+              sources."signal-exit-3.0.2"
+            ];
+          })
+          sources."map-obj-1.0.1"
+          sources."minimist-1.2.0"
+          (sources."normalize-package-data-2.3.5" // {
+            dependencies = [
+              sources."hosted-git-info-2.2.0"
+              (sources."is-builtin-module-1.0.0" // {
+                dependencies = [
+                  sources."builtin-modules-1.1.1"
+                ];
+              })
+              sources."semver-5.3.0"
+              (sources."validate-npm-package-license-3.0.1" // {
+                dependencies = [
+                  (sources."spdx-correct-1.0.2" // {
+                    dependencies = [
+                      sources."spdx-license-ids-1.2.2"
+                    ];
+                  })
+                  sources."spdx-expression-parse-1.0.4"
+                ];
+              })
+            ];
+          })
+          sources."object-assign-4.1.1"
+          (sources."redent-1.0.0" // {
+            dependencies = [
+              sources."indent-string-2.1.0"
+              (sources."strip-indent-1.0.1" // {
+                dependencies = [
+                  sources."get-stdin-4.0.1"
+                ];
+              })
+            ];
+          })
+          sources."trim-newlines-1.0.0"
+        ];
+      })
+      (sources."npm-keyword-4.2.0" // {
+        dependencies = [
+          sources."object-assign-4.1.1"
+          (sources."pinkie-promise-2.0.1" // {
+            dependencies = [
+              sources."pinkie-2.0.4"
+            ];
+          })
+          (sources."registry-url-3.1.0" // {
+            dependencies = [
+              (sources."rc-1.1.7" // {
+                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."opn-3.0.3" // {
+        dependencies = [
+          sources."object-assign-4.1.1"
+        ];
+      })
+      (sources."package-json-2.4.0" // {
+        dependencies = [
+          (sources."registry-auth-token-3.1.0" // {
+            dependencies = [
+              (sources."rc-1.1.7" // {
+                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."registry-url-3.1.0" // {
+            dependencies = [
+              (sources."rc-1.1.7" // {
+                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."semver-5.3.0"
+        ];
+      })
+      (sources."parse-help-0.1.1" // {
+        dependencies = [
+          (sources."execall-1.0.0" // {
+            dependencies = [
+              (sources."clone-regexp-1.0.0" // {
+                dependencies = [
+                  sources."is-regexp-1.0.0"
+                  sources."is-supported-regexp-flag-1.0.0"
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      (sources."read-pkg-up-1.0.1" // {
+        dependencies = [
+          (sources."find-up-1.1.2" // {
+            dependencies = [
+              sources."path-exists-2.1.0"
+              (sources."pinkie-promise-2.0.1" // {
+                dependencies = [
+                  sources."pinkie-2.0.4"
+                ];
+              })
+            ];
+          })
+          (sources."read-pkg-1.1.0" // {
+            dependencies = [
+              (sources."load-json-file-1.1.0" // {
+                dependencies = [
+                  sources."graceful-fs-4.1.11"
+                  (sources."parse-json-2.2.0" // {
+                    dependencies = [
+                      (sources."error-ex-1.3.0" // {
+                        dependencies = [
+                          sources."is-arrayish-0.2.1"
+                        ];
+                      })
+                    ];
+                  })
+                  sources."pify-2.3.0"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                  (sources."strip-bom-2.0.0" // {
+                    dependencies = [
+                      sources."is-utf8-0.2.1"
+                    ];
+                  })
+                ];
+              })
+              (sources."normalize-package-data-2.3.5" // {
+                dependencies = [
+                  sources."hosted-git-info-2.2.0"
+                  (sources."is-builtin-module-1.0.0" // {
+                    dependencies = [
+                      sources."builtin-modules-1.1.1"
+                    ];
+                  })
+                  sources."semver-5.3.0"
+                  (sources."validate-npm-package-license-3.0.1" // {
+                    dependencies = [
+                      (sources."spdx-correct-1.0.2" // {
+                        dependencies = [
+                          sources."spdx-license-ids-1.2.2"
+                        ];
+                      })
+                      sources."spdx-expression-parse-1.0.4"
+                    ];
+                  })
+                ];
+              })
+              (sources."path-type-1.1.0" // {
+                dependencies = [
+                  sources."graceful-fs-4.1.11"
+                  sources."pify-2.3.0"
+                  (sources."pinkie-promise-2.0.1" // {
+                    dependencies = [
+                      sources."pinkie-2.0.4"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      (sources."repeating-2.0.1" // {
+        dependencies = [
+          (sources."is-finite-1.0.2" // {
+            dependencies = [
+              sources."number-is-nan-1.0.1"
+            ];
+          })
+        ];
+      })
+      (sources."root-check-1.0.0" // {
+        dependencies = [
+          (sources."downgrade-root-1.2.2" // {
+            dependencies = [
+              sources."default-uid-1.0.0"
+              sources."is-root-1.0.0"
+            ];
+          })
+          (sources."sudo-block-1.2.0" // {
+            dependencies = [
+              sources."is-docker-1.1.0"
+              sources."is-root-1.0.0"
+            ];
+          })
+        ];
+      })
+      (sources."sort-on-1.3.0" // {
+        dependencies = [
+          sources."arrify-1.0.1"
+          (sources."dot-prop-2.4.0" // {
+            dependencies = [
+              sources."is-obj-1.0.1"
+            ];
+          })
+        ];
+      })
+      (sources."string-length-1.0.1" // {
+        dependencies = [
+          (sources."strip-ansi-3.0.1" // {
+            dependencies = [
+              sources."ansi-regex-2.1.1"
+            ];
+          })
+        ];
+      })
+      (sources."tabtab-1.3.2" // {
+        dependencies = [
+          (sources."debug-2.6.1" // {
+            dependencies = [
+              sources."ms-0.7.2"
+            ];
+          })
+          (sources."inquirer-1.2.3" // {
+            dependencies = [
+              sources."ansi-escapes-1.4.0"
+              (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."external-editor-1.1.1" // {
+                dependencies = [
+                  sources."extend-3.0.0"
+                  (sources."spawn-sync-1.0.15" // {
+                    dependencies = [
+                      (sources."concat-stream-1.6.0" // {
+                        dependencies = [
+                          sources."inherits-2.0.3"
+                          sources."typedarray-0.0.6"
+                          (sources."readable-stream-2.2.3" // {
+                            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."os-shim-0.1.3"
+                    ];
+                  })
+                  (sources."tmp-0.0.29" // {
+                    dependencies = [
+                      sources."os-tmpdir-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              sources."lodash-4.17.4"
+              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."minimist-1.2.0"
+          (sources."mkdirp-0.5.1" // {
+            dependencies = [
+              sources."minimist-0.0.8"
+            ];
+          })
+          (sources."npmlog-2.0.4" // {
+            dependencies = [
+              sources."ansi-0.3.1"
+              (sources."are-we-there-yet-1.1.2" // {
+                dependencies = [
+                  sources."delegates-1.0.0"
+                  (sources."readable-stream-2.2.3" // {
+                    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."gauge-1.2.7" // {
+                dependencies = [
+                  sources."has-unicode-2.0.1"
+                  sources."lodash.pad-4.5.1"
+                  sources."lodash.padend-4.6.1"
+                  sources."lodash.padstart-4.6.1"
+                ];
+              })
+            ];
+          })
+          sources."object-assign-4.1.1"
+        ];
+      })
+      sources."titleize-1.0.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."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"
+          (sources."semver-diff-2.1.0" // {
+            dependencies = [
+              sources."semver-5.3.0"
+            ];
+          })
+        ];
+      })
+      (sources."user-home-2.0.0" // {
+        dependencies = [
+          sources."os-homedir-1.0.2"
+        ];
+      })
+      (sources."yeoman-character-1.1.0" // {
+        dependencies = [
+          (sources."supports-color-3.2.3" // {
+            dependencies = [
+              sources."has-flag-1.0.0"
+            ];
+          })
+        ];
+      })
+      (sources."yeoman-doctor-2.1.0" // {
+        dependencies = [
+          (sources."bin-version-check-2.1.0" // {
+            dependencies = [
+              (sources."bin-version-1.0.4" // {
+                dependencies = [
+                  (sources."find-versions-1.2.1" // {
+                    dependencies = [
+                      sources."array-uniq-1.0.3"
+                      sources."get-stdin-4.0.1"
+                      sources."semver-regex-1.0.0"
+                    ];
+                  })
+                ];
+              })
+              sources."minimist-1.2.0"
+              sources."semver-4.3.6"
+              (sources."semver-truncate-1.1.2" // {
+                dependencies = [
+                  sources."semver-5.3.0"
+                ];
+              })
+            ];
+          })
+          (sources."each-async-1.1.1" // {
+            dependencies = [
+              sources."onetime-1.1.0"
+              sources."set-immediate-shim-1.0.1"
+            ];
+          })
+          sources."log-symbols-1.0.2"
+          sources."object-values-1.0.0"
+          sources."semver-5.3.0"
+          (sources."twig-0.8.9" // {
+            dependencies = [
+              (sources."walk-2.3.9" // {
+                dependencies = [
+                  sources."foreachasync-3.0.0"
+                ];
+              })
+              (sources."minimatch-3.0.3" // {
+                dependencies = [
+                  (sources."brace-expansion-1.1.6" // {
+                    dependencies = [
+                      sources."balanced-match-0.4.2"
+                      sources."concat-map-0.0.1"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      (sources."yeoman-environment-1.6.6" // {
+        dependencies = [
+          (sources."debug-2.6.1" // {
+            dependencies = [
+              sources."ms-0.7.2"
+            ];
+          })
+          sources."diff-2.2.3"
+          sources."escape-string-regexp-1.0.5"
+          (sources."globby-4.1.0" // {
+            dependencies = [
+              (sources."array-union-1.0.2" // {
+                dependencies = [
+                  sources."array-uniq-1.0.3"
+                ];
+              })
+              sources."arrify-1.0.1"
+              (sources."glob-6.0.4" // {
+                dependencies = [
+                  (sources."inflight-1.0.6" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                  sources."inherits-2.0.3"
+                  (sources."minimatch-3.0.3" // {
+                    dependencies = [
+                      (sources."brace-expansion-1.1.6" // {
+                        dependencies = [
+                          sources."balanced-match-0.4.2"
+                          sources."concat-map-0.0.1"
+                        ];
+                      })
+                    ];
+                  })
+                  (sources."once-1.4.0" // {
+                    dependencies = [
+                      sources."wrappy-1.0.2"
+                    ];
+                  })
+                  sources."path-is-absolute-1.0.1"
+                ];
+              })
+              sources."object-assign-4.1.1"
+              sources."pify-2.3.0"
+              (sources."pinkie-promise-2.0.1" // {
+                dependencies = [
+                  sources."pinkie-2.0.4"
+                ];
+              })
+            ];
+          })
+          sources."grouped-queue-0.3.3"
+          (sources."inquirer-1.2.3" // {
+            dependencies = [
+              sources."ansi-escapes-1.4.0"
+              (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."external-editor-1.1.1" // {
+                dependencies = [
+                  sources."extend-3.0.0"
+                  (sources."spawn-sync-1.0.15" // {
+                    dependencies = [
+                      (sources."concat-stream-1.6.0" // {
+                        dependencies = [
+                          sources."inherits-2.0.3"
+                          sources."typedarray-0.0.6"
+                          (sources."readable-stream-2.2.3" // {
+                            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."os-shim-0.1.3"
+                    ];
+                  })
+                  (sources."tmp-0.0.29" // {
+                    dependencies = [
+                      sources."os-tmpdir-1.0.2"
+                    ];
+                  })
+                ];
+              })
+              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."lodash-4.17.4"
+          sources."log-symbols-1.0.2"
+          (sources."mem-fs-1.1.3" // {
+            dependencies = [
+              (sources."through2-2.0.3" // {
+                dependencies = [
+                  (sources."readable-stream-2.2.3" // {
+                    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."xtend-4.0.1"
+                ];
+              })
+              (sources."vinyl-1.2.0" // {
+                dependencies = [
+                  sources."clone-1.0.2"
+                  sources."clone-stats-0.0.1"
+                  sources."replace-ext-0.0.1"
+                ];
+              })
+              (sources."vinyl-file-2.0.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."strip-bom-2.0.0" // {
+                    dependencies = [
+                      sources."is-utf8-0.2.1"
+                    ];
+                  })
+                  (sources."strip-bom-stream-2.0.0" // {
+                    dependencies = [
+                      (sources."first-chunk-stream-2.0.0" // {
+                        dependencies = [
+                          (sources."readable-stream-2.2.3" // {
+                            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."text-table-0.2.0"
+          (sources."untildify-2.1.0" // {
+            dependencies = [
+              sources."os-homedir-1.0.2"
+            ];
+          })
+        ];
+      })
+      (sources."yosay-1.2.1" // {
+        dependencies = [
+          sources."ansi-regex-2.1.1"
+          sources."ansi-styles-2.2.1"
+          sources."cli-boxes-1.0.0"
+          sources."pad-component-0.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"
+          (sources."taketalk-1.0.0" // {
+            dependencies = [
+              sources."get-stdin-4.0.1"
+              sources."minimist-1.2.0"
+            ];
+          })
+          sources."wrap-ansi-2.1.0"
+        ];
+      })
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "CLI tool for running Yeoman generators";
+      homepage = http://yeoman.io/;
+      license = "BSD-2-Clause";
+    };
+    production = true;
+  };
 }
\ No newline at end of file
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index fd7a6ed52fc1..dba0e9d82c20 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -67,22 +67,22 @@ let
         sha1 = "3cf436dcc9f3477ef3d7fa55a5bdf6d893f1c6c6";
       };
     };
-    "uglify-js-2.4.15" = {
+    "uglify-js-2.6.1" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "2.4.15";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz";
-        sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
+        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
       };
     };
-    "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";
       };
     };
     "global-paths-0.1.2" = {
@@ -112,13 +112,13 @@ let
         sha1 = "d76a310d6b8a7ba9e4825bb3d43f5427e9fe8f6e";
       };
     };
-    "moment-2.10.6" = {
+    "moment-2.17.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.10.6";
+      version = "2.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz";
-        sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77";
+        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
+        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
     "node.extend-1.0.10" = {
@@ -202,22 +202,13 @@ let
         sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
       };
     };
-    "source-map-0.1.34" = {
+    "source-map-0.5.6" = {
       name = "source-map";
       packageName = "source-map";
-      version = "0.1.34";
+      version = "0.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
-        sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
-      };
-    };
-    "optimist-0.3.7" = {
-      name = "optimist";
-      packageName = "optimist";
-      version = "0.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
-        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
+        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -229,22 +220,139 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
+    "yargs-3.10.0" = {
+      name = "yargs";
+      packageName = "yargs";
+      version = "3.10.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "wordwrap-0.0.3" = {
+    "camelcase-1.2.1" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "decamelize-1.2.0" = {
+      name = "decamelize";
+      packageName = "decamelize";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
+    "wordwrap-0.0.2" = {
       name = "wordwrap";
       packageName = "wordwrap";
-      version = "0.0.3";
+      version = "0.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
-        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
+    "kind-of-3.1.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
+      };
+    };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "repeat-string-1.6.1" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    };
+    "is-buffer-1.1.4" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
+        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+      };
+    };
+    "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";
       };
     };
     "array-unique-0.2.1" = {
@@ -337,6 +445,15 @@ let
         sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
       };
     };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
+      };
+    };
     "xml2js-0.2.8" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -490,13 +607,13 @@ let
         sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47";
       };
     };
-    "azure-arm-network-0.17.0" = {
+    "azure-arm-network-0.18.0" = {
       name = "azure-arm-network";
       packageName = "azure-arm-network";
-      version = "0.17.0";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz";
-        sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6";
+        url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.18.0.tgz";
+        sha1 = "0ebfe1adbdfdc535d6c95e3713a5c54b5144932f";
       };
     };
     "azure-arm-powerbiembedded-0.1.0" = {
@@ -643,13 +760,13 @@ let
         sha1 = "aa9a49fb9081a210f2f4cc6596ca4653b68306e6";
       };
     };
-    "azure-arm-storage-0.13.1-preview" = {
+    "azure-arm-storage-0.15.0-preview" = {
       name = "azure-arm-storage";
       packageName = "azure-arm-storage";
-      version = "0.13.1-preview";
+      version = "0.15.0-preview";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.13.1-preview.tgz";
-        sha1 = "9342515a44e632c48f1d0d9c7a98214ed563d8f7";
+        url = "https://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.15.0-preview.tgz";
+        sha1 = "e25c13a1e716656caa019a7bc9fabe05c5062b7e";
       };
     };
     "azure-asm-sb-0.10.1" = {
@@ -697,13 +814,13 @@ let
         sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650";
       };
     };
-    "azure-storage-1.3.0" = {
+    "azure-storage-2.0.0" = {
       name = "azure-storage";
       packageName = "azure-storage";
-      version = "1.3.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz";
-        sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce";
+        url = "https://registry.npmjs.org/azure-storage/-/azure-storage-2.0.0.tgz";
+        sha1 = "581ed1245ee105e818806efd5cc5cc4c14eab7c0";
       };
     };
     "azure-arm-batch-0.3.0" = {
@@ -850,40 +967,31 @@ let
         sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9";
       };
     };
-    "kuduscript-1.0.9" = {
+    "kuduscript-1.0.13" = {
       name = "kuduscript";
       packageName = "kuduscript";
-      version = "1.0.9";
+      version = "1.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.9.tgz";
-        sha1 = "28e039af12be00c4d1d890dc243afcfe2b25298a";
+        url = "https://registry.npmjs.org/kuduscript/-/kuduscript-1.0.13.tgz";
+        sha1 = "c74349b2092608bb0f3dc827c516ef2fddb8238e";
       };
     };
-    "moment-2.17.1" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.17.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.17.1.tgz";
-        sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
-      };
-    };
-    "ms-rest-1.15.4" = {
+    "ms-rest-1.15.5" = {
       name = "ms-rest";
       packageName = "ms-rest";
-      version = "1.15.4";
+      version = "1.15.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.4.tgz";
-        sha1 = "7af7038fe843fd89d407fec346320db6b010ef8c";
+        url = "https://registry.npmjs.org/ms-rest/-/ms-rest-1.15.5.tgz";
+        sha1 = "b207a9c447f7fca3adca701feccc2c1907b1431d";
       };
     };
-    "ms-rest-azure-1.15.4" = {
+    "ms-rest-azure-1.15.5" = {
       name = "ms-rest-azure";
       packageName = "ms-rest-azure";
-      version = "1.15.4";
+      version = "1.15.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.4.tgz";
-        sha1 = "ea89bce23c6ddd4593db1e86f6557cc6374e3492";
+        url = "https://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.15.5.tgz";
+        sha1 = "8fbb1366ecca18ce59010473dc0228b5a32c5611";
       };
     };
     "node-forge-0.6.23" = {
@@ -895,13 +1003,13 @@ let
         sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf";
       };
     };
-    "omelette-0.1.0" = {
+    "omelette-0.3.2" = {
       name = "omelette";
       packageName = "omelette";
-      version = "0.1.0";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/omelette/-/omelette-0.1.0.tgz";
-        sha1 = "31cc7eb472a513c07483d24d3e1bf164cb0d23b8";
+        url = "https://registry.npmjs.org/omelette/-/omelette-0.3.2.tgz";
+        sha1 = "68c1b3c57ced778b4e67d8637d2559b2c1b3ec26";
       };
     };
     "openssl-wrapper-0.2.1" = {
@@ -1048,15 +1156,6 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "wordwrap-0.0.2" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
-      };
-    };
     "xml2js-0.1.14" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -1246,15 +1345,6 @@ let
         sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c";
       };
     };
-    "extend-1.2.1" = {
-      name = "extend";
-      packageName = "extend";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
-        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
-      };
-    };
     "browserify-mime-1.2.9" = {
       name = "browserify-mime";
       packageName = "browserify-mime";
@@ -1264,6 +1354,15 @@ let
         sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f";
       };
     };
+    "extend-1.2.1" = {
+      name = "extend";
+      packageName = "extend";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+        sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+      };
+    };
     "json-edm-parser-0.1.2" = {
       name = "json-edm-parser";
       packageName = "json-edm-parser";
@@ -1273,6 +1372,15 @@ let
         sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4";
       };
     };
+    "md5.js-1.3.4" = {
+      name = "md5.js";
+      packageName = "md5.js";
+      version = "1.3.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz";
+        sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
+      };
+    };
     "readable-stream-2.0.6" = {
       name = "readable-stream";
       packageName = "readable-stream";
@@ -1291,13 +1399,13 @@ let
         sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
       };
     };
-    "core-util-is-1.0.2" = {
-      name = "core-util-is";
-      packageName = "core-util-is";
-      version = "1.0.2";
+    "hash-base-3.0.3" = {
+      name = "hash-base";
+      packageName = "hash-base";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.3.tgz";
+        sha1 = "87ec48734bfe354275535150b14821566b083807";
       };
     };
     "inherits-2.0.3" = {
@@ -1309,6 +1417,15 @@ let
         sha1 = "633c2c83e3da42a502f52466022480f4208261de";
       };
     };
+    "core-util-is-1.0.2" = {
+      name = "core-util-is";
+      packageName = "core-util-is";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+        sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+      };
+    };
     "isarray-1.0.0" = {
       name = "isarray";
       packageName = "isarray";
@@ -1525,13 +1642,13 @@ let
         sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
       };
     };
-    "rimraf-2.5.4" = {
+    "rimraf-2.6.1" = {
       name = "rimraf";
       packageName = "rimraf";
-      version = "2.5.4";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz";
-        sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz";
+        sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d";
       };
     };
     "minimist-0.0.8" = {
@@ -1813,13 +1930,13 @@ let
         sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
       };
     };
-    "qs-6.2.1" = {
+    "qs-6.2.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.2.1";
+      version = "6.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz";
-        sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625";
+        url = "https://registry.npmjs.org/qs/-/qs-6.2.2.tgz";
+        sha1 = "d506a5ad5b2cae1fd35c4f54ec182e267e3ef586";
       };
     };
     "stringstream-0.0.5" = {
@@ -1858,13 +1975,13 @@ let
         sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
       };
     };
-    "async-2.1.4" = {
+    "async-2.1.5" = {
       name = "async";
       packageName = "async";
-      version = "2.1.4";
+      version = "2.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-2.1.4.tgz";
-        sha1 = "2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4";
+        url = "https://registry.npmjs.org/async/-/async-2.1.5.tgz";
+        sha1 = "e587c68580994ac67fc56ff86d3ac56bdbe810bc";
       };
     };
     "lodash-4.17.4" = {
@@ -1894,13 +2011,13 @@ let
         sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
       };
     };
-    "is-my-json-valid-2.15.0" = {
+    "is-my-json-valid-2.16.0" = {
       name = "is-my-json-valid";
       packageName = "is-my-json-valid";
-      version = "2.15.0";
+      version = "2.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz";
-        sha1 = "936edda3ca3c211fd98f3b2d3e08da43f7b2915b";
+        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz";
+        sha1 = "f079dd9bfdae65ee2038aae8acbc86ab109e3693";
       };
     };
     "pinkie-promise-2.0.1" = {
@@ -2299,13 +2416,13 @@ let
         sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
       };
     };
-    "readable-stream-2.2.2" = {
+    "readable-stream-2.2.3" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.2";
+      version = "2.2.3";
       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.3.tgz";
+        sha1 = "9cf49463985df016c8ae8813097a9293a9b33729";
       };
     };
     "buffer-shims-1.0.0" = {
@@ -2695,15 +2812,6 @@ let
         sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
       };
     };
-    "decamelize-1.2.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-        sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
-      };
-    };
     "loud-rejection-1.6.0" = {
       name = "loud-rejection";
       packageName = "loud-rejection";
@@ -3127,13 +3235,13 @@ let
         sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
       };
     };
-    "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" = {
@@ -3181,13 +3289,13 @@ let
         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" = {
@@ -3316,13 +3424,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" = {
@@ -3550,15 +3658,6 @@ let
         sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
       };
     };
-    "source-map-0.5.6" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
-        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
-      };
-    };
     "resolve-1.1.7" = {
       name = "resolve";
       packageName = "resolve";
@@ -3766,13 +3865,13 @@ let
         sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
       };
     };
-    "elliptic-6.3.3" = {
+    "elliptic-6.4.0" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.3.3";
+      version = "6.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz";
-        sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz";
+        sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
     "parse-asn1-5.0.0" = {
@@ -3784,13 +3883,13 @@ let
         sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
       };
     };
-    "brorand-1.0.7" = {
+    "brorand-1.1.0" = {
       name = "brorand";
       packageName = "brorand";
-      version = "1.0.7";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz";
-        sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc";
+        url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz";
+        sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f";
       };
     };
     "hash.js-1.0.3" = {
@@ -3802,6 +3901,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";
@@ -3847,15 +3964,6 @@ let
         sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
       };
     };
-    "is-buffer-1.1.4" = {
-      name = "is-buffer";
-      packageName = "is-buffer";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
-        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
-      };
-    };
     "lexical-scope-1.2.0" = {
       name = "lexical-scope";
       packageName = "lexical-scope";
@@ -4666,6 +4774,15 @@ let
         sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
       };
     };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
     "minimist-0.0.10" = {
       name = "minimist";
       packageName = "minimist";
@@ -5197,22 +5314,22 @@ let
         sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
       };
     };
-    "simple-peer-6.2.2" = {
+    "simple-peer-6.4.3" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "6.2.2";
+      version = "6.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz";
-        sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.4.3.tgz";
+        sha1 = "f487b381e0fe0874bff1020026001bbf4579c20a";
       };
     };
-    "simple-websocket-4.3.0" = {
+    "simple-websocket-4.3.1" = {
       name = "simple-websocket";
       packageName = "simple-websocket";
-      version = "4.3.0";
+      version = "4.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz";
-        sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea";
+        url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.1.tgz";
+        sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d";
       };
     };
     "string2compact-1.2.2" = {
@@ -5224,13 +5341,13 @@ let
         sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b";
       };
     };
-    "ws-1.1.1" = {
+    "ws-1.1.2" = {
       name = "ws";
       packageName = "ws";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
-        sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.2.tgz";
+        sha1 = "8a244fa052401e08c9886cf44a85189e1fd4067f";
       };
     };
     "ipaddr.js-1.2.0" = {
@@ -5251,13 +5368,13 @@ let
         sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
       };
     };
-    "ws-2.0.3" = {
+    "ws-2.1.0" = {
       name = "ws";
       packageName = "ws";
-      version = "2.0.3";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz";
-        sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb";
+        url = "https://registry.npmjs.org/ws/-/ws-2.1.0.tgz";
+        sha1 = "b24eaed9609f8632dd51e3f7698619a90fddcc92";
       };
     };
     "ultron-1.1.0" = {
@@ -6484,6 +6601,15 @@ let
         sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
       };
     };
+    "abbrev-1.1.0" = {
+      name = "abbrev";
+      packageName = "abbrev";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz";
+        sha1 = "d0554c2256636e2f56e7c2e5ad183f859428d81f";
+      };
+    };
     "abbrev-1.0.9" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -6817,6 +6943,15 @@ let
         sha1 = "e76388d217992c252750241d3d3956fed98d8ff4";
       };
     };
+    "rimraf-2.5.4" = {
+      name = "rimraf";
+      packageName = "rimraf";
+      version = "2.5.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz";
+        sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04";
+      };
+    };
     "sha-2.0.1" = {
       name = "sha";
       packageName = "sha";
@@ -7042,13 +7177,13 @@ let
         sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4";
       };
     };
-    "qs-6.3.0" = {
+    "qs-6.3.1" = {
       name = "qs";
       packageName = "qs";
-      version = "6.3.0";
+      version = "6.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz";
-        sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.1.tgz";
+        sha1 = "918c0b3bcd36679772baf135b1acb4c1651ed79d";
       };
     };
     "asynckit-0.4.0" = {
@@ -7636,22 +7771,22 @@ let
         sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
       };
     };
-    "rc-1.1.6" = {
+    "rc-1.1.7" = {
       name = "rc";
       packageName = "rc";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
-        sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
+        url = "https://registry.npmjs.org/rc/-/rc-1.1.7.tgz";
+        sha1 = "c5ea564bb07aff9fd3a5b32e906c1d3a65940fea";
       };
     };
-    "strip-json-comments-1.0.4" = {
+    "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
-      version = "1.0.4";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
+        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
       };
     };
     "clone-2.1.0" = {
@@ -9071,22 +9206,22 @@ let
         sha1 = "c392990c3e684783d838b8c84a45d8a048458361";
       };
     };
-    "globals-9.14.0" = {
+    "globals-9.16.0" = {
       name = "globals";
       packageName = "globals";
-      version = "9.14.0";
+      version = "9.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz";
-        sha1 = "8859936af0038741263053b39d0e76ca241e4034";
+        url = "https://registry.npmjs.org/globals/-/globals-9.16.0.tgz";
+        sha1 = "63e903658171ec2d9f51b1d31de5e2b8dc01fb80";
       };
     };
-    "ignore-3.2.2" = {
+    "ignore-3.2.4" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.2.2";
+      version = "3.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.2.tgz";
-        sha1 = "1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.2.4.tgz";
+        sha1 = "4055e03596729a8fabe45a43c100ad5ed815c4e8";
       };
     };
     "inquirer-0.12.0" = {
@@ -9179,15 +9314,6 @@ let
         sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3";
       };
     };
-    "strip-json-comments-2.0.1" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz";
-        sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a";
-      };
-    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -9764,13 +9890,13 @@ let
         sha1 = "4ed0ad060df3073300c48440373f72d1cc642d78";
       };
     };
-    "fsevents-1.0.17" = {
+    "fsevents-1.1.1" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.0.17";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.17.tgz";
-        sha1 = "8537f3f12272678765b4fd6528c0f1f66f8f4558";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.1.tgz";
+        sha1 = "f19fd28f43eeaf761680e519a203c4d0b3d31aff";
       };
     };
     "micromatch-2.3.11" = {
@@ -9836,15 +9962,6 @@ let
         sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
       };
     };
-    "kind-of-3.1.0" = {
-      name = "kind-of";
-      packageName = "kind-of";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
-        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
-      };
-    };
     "normalize-path-2.0.1" = {
       name = "normalize-path";
       packageName = "normalize-path";
@@ -9953,15 +10070,6 @@ let
         sha1 = "110dcabff397e9dcff7c0789ccc0a49adf1ec5bb";
       };
     };
-    "repeat-string-1.6.1" = {
-      name = "repeat-string";
-      packageName = "repeat-string";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
-        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
-      };
-    };
     "is-posix-bracket-0.1.1" = {
       name = "is-posix-bracket";
       packageName = "is-posix-bracket";
@@ -9971,13 +10079,13 @@ let
         sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
       };
     };
-    "for-own-0.1.4" = {
+    "for-own-0.1.5" = {
       name = "for-own";
       packageName = "for-own";
-      version = "0.1.4";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz";
-        sha1 = "0149b41a39088c7515f51ebe1c1386d45f935072";
+        url = "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz";
+        sha1 = "5265c681a4f294dabbf17c9509b6763aa84510ce";
       };
     };
     "is-extendable-0.1.1" = {
@@ -9989,13 +10097,13 @@ let
         sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
       };
     };
-    "for-in-0.1.6" = {
+    "for-in-1.0.1" = {
       name = "for-in";
       packageName = "for-in";
-      version = "0.1.6";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz";
-        sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8";
+        url = "https://registry.npmjs.org/for-in/-/for-in-1.0.1.tgz";
+        sha1 = "d6c3e3798ceaaa301047b109dedf1b1ae37a0efa";
       };
     };
     "glob-base-0.3.0" = {
@@ -10251,13 +10359,13 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
-    "coffee-script-1.12.3" = {
+    "coffee-script-1.12.4" = {
       name = "coffee-script";
       packageName = "coffee-script";
-      version = "1.12.3";
+      version = "1.12.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
-        sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
+        url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
+        sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
       };
     };
     "jade-1.11.0" = {
@@ -10296,13 +10404,13 @@ let
         sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
       };
     };
-    "clean-css-3.4.24" = {
+    "clean-css-3.4.25" = {
       name = "clean-css";
       packageName = "clean-css";
-      version = "3.4.24";
+      version = "3.4.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.24.tgz";
-        sha1 = "89f5a5e9da37ae02394fe049a41388abbe72c3b5";
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz";
+        sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede";
       };
     };
     "commander-2.6.0" = {
@@ -10467,85 +10575,13 @@ let
         sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
       };
     };
-    "yargs-3.10.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.10.0";
+    "optimist-0.3.7" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
-        sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
-      };
-    };
-    "camelcase-1.2.1" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
-        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
-      };
-    };
-    "cliui-2.1.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
-        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
-      };
-    };
-    "window-size-0.1.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
-        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
-      };
-    };
-    "center-align-0.1.3" = {
-      name = "center-align";
-      packageName = "center-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
-        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
-      };
-    };
-    "right-align-0.1.3" = {
-      name = "right-align";
-      packageName = "right-align";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
-        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
-      };
-    };
-    "align-text-0.1.4" = {
-      name = "align-text";
-      packageName = "align-text";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
-        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
-      };
-    };
-    "lazy-cache-1.0.4" = {
-      name = "lazy-cache";
-      packageName = "lazy-cache";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
-        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
-      };
-    };
-    "longest-1.0.1" = {
-      name = "longest";
-      packageName = "longest";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
-        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
       };
     };
     "acorn-globals-1.0.9" = {
@@ -11349,6 +11385,15 @@ let
         sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44";
       };
     };
+    "strip-json-comments-1.0.4" = {
+      name = "strip-json-comments";
+      packageName = "strip-json-comments";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+        sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
+      };
+    };
     "xml-1.0.0" = {
       name = "xml";
       packageName = "xml";
@@ -11574,13 +11619,13 @@ let
         sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6";
       };
     };
-    "connect-3.5.0" = {
+    "connect-3.6.0" = {
       name = "connect";
       packageName = "connect";
-      version = "3.5.0";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz";
-        sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198";
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz";
+        sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e";
       };
     };
     "core-js-2.4.1" = {
@@ -11655,22 +11700,22 @@ let
         sha1 = "659de9f2cf8dcc27a1481276f205377272382e73";
       };
     };
-    "socket.io-1.7.2" = {
+    "socket.io-1.7.3" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "1.7.2";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.2.tgz";
-        sha1 = "83bbbdf2e79263b378900da403e7843e05dc3b71";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-1.7.3.tgz";
+        sha1 = "b8af9caba00949e568e369f1327ea9be9ea2461b";
       };
     };
-    "tmp-0.0.28" = {
+    "tmp-0.0.31" = {
       name = "tmp";
       packageName = "tmp";
-      version = "0.0.28";
+      version = "0.0.31";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz";
-        sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
+        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
+        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
       };
     };
     "useragent-2.1.12" = {
@@ -11700,6 +11745,15 @@ 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";
@@ -11709,13 +11763,13 @@ let
         sha1 = "994976cf6a5096a41162840492f0bdc5d6e7fb96";
       };
     };
-    "finalhandler-0.5.0" = {
+    "finalhandler-1.0.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.5.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
-        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz";
+        sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755";
       };
     };
     "custom-event-1.0.1" = {
@@ -11808,13 +11862,13 @@ let
         sha1 = "40c453e67e6e13c901ddec317af8986cda9eff8c";
       };
     };
-    "engine.io-1.8.2" = {
+    "engine.io-1.8.3" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "1.8.2";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.2.tgz";
-        sha1 = "6b59be730b348c0125b0a4589de1c355abcf7a7e";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-1.8.3.tgz";
+        sha1 = "8de7f97895d20d39b85f88eeee777b2bd42b13d4";
       };
     };
     "has-binary-0.1.7" = {
@@ -11844,13 +11898,13 @@ let
         sha1 = "cb6d4bb8bec81e1078b99677f9ced0046066bb8b";
       };
     };
-    "socket.io-client-1.7.2" = {
+    "socket.io-client-1.7.3" = {
       name = "socket.io-client";
       packageName = "socket.io-client";
-      version = "1.7.2";
+      version = "1.7.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.2.tgz";
-        sha1 = "39fdb0c3dd450e321b7e40cfd83612ec533dd644";
+        url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.7.3.tgz";
+        sha1 = "b30e86aa10d5ef3546601c09cde4765e381da377";
       };
     };
     "socket.io-parser-2.3.1" = {
@@ -11952,13 +12006,13 @@ let
         sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6";
       };
     };
-    "engine.io-client-1.8.2" = {
+    "engine.io-client-1.8.3" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
-      version = "1.8.2";
+      version = "1.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.2.tgz";
-        sha1 = "c38767547f2a7d184f5752f6f0ad501006703766";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.8.3.tgz";
+        sha1 = "1798ed93451246453d4c6f635d7a201fe940d5ab";
       };
     };
     "object-component-0.0.3" = {
@@ -12744,13 +12798,13 @@ let
         sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f";
       };
     };
-    "convert-source-map-1.3.0" = {
+    "convert-source-map-1.4.0" = {
       name = "convert-source-map";
       packageName = "convert-source-map";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz";
-        sha1 = "e9f3e9c6e2728efc2676696a70eb382f73106a67";
+        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.4.0.tgz";
+        sha1 = "e3dad195bf61bfe13a7a3c73e9876ec14a0268f3";
       };
     };
     "express-2.5.11" = {
@@ -13104,6 +13158,15 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
+    "serve-favicon-2.4.0" = {
+      name = "serve-favicon";
+      packageName = "serve-favicon";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.4.0.tgz";
+        sha1 = "064dcdfdb0f250ae3b148eb18c8bbf3d185e3dd0";
+      };
+    };
     "strong-data-uri-1.0.4" = {
       name = "strong-data-uri";
       packageName = "strong-data-uri";
@@ -13212,6 +13275,24 @@ let
         sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
       };
     };
+    "etag-1.8.0" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.8.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";
+      };
+    };
     "truncate-1.0.5" = {
       name = "truncate";
       packageName = "truncate";
@@ -13563,6 +13644,15 @@ let
         sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
       };
     };
+    "ws-1.1.1" = {
+      name = "ws";
+      packageName = "ws";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz";
+        sha1 = "082ddb6c641e85d4bb451f03d52f06eabdb1f018";
+      };
+    };
     "node-red-node-feedparser-0.1.7" = {
       name = "node-red-node-feedparser";
       packageName = "node-red-node-feedparser";
@@ -13572,13 +13662,13 @@ let
         sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f";
       };
     };
-    "node-red-node-email-0.1.16" = {
+    "node-red-node-email-0.1.21" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.16";
+      version = "0.1.21";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz";
-        sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.21.tgz";
+        sha1 = "63baed16d538e786ddadc169b23552d9eb9abc30";
       };
     };
     "node-red-node-twitter-0.1.9" = {
@@ -13770,6 +13860,15 @@ let
         sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
       };
     };
+    "finalhandler-0.5.0" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz";
+        sha1 = "e9508abece9b6dba871a6942a1d7911b91911ac7";
+      };
+    };
     "send-0.14.1" = {
       name = "send";
       packageName = "send";
@@ -13788,13 +13887,13 @@ let
         sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
       };
     };
-    "cookies-0.6.2" = {
+    "cookies-0.7.0" = {
       name = "cookies";
       packageName = "cookies";
-      version = "0.6.2";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookies/-/cookies-0.6.2.tgz";
-        sha1 = "6ac1b052895208e8fc4c4f5f86a9ed31b9cb5ccf";
+        url = "https://registry.npmjs.org/cookies/-/cookies-0.7.0.tgz";
+        sha1 = "0bc961d910c35254980fc7c9eff5da12011bbf00";
       };
     };
     "i18next-client-1.10.3" = {
@@ -14733,15 +14832,6 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "aproba-1.0.4" = {
-      name = "aproba";
-      packageName = "aproba";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
-        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
-      };
-    };
     "fstream-npm-1.2.0" = {
       name = "fstream-npm";
       packageName = "fstream-npm";
@@ -14751,6 +14841,15 @@ let
         sha1 = "d2c3c89101346982d64e57091c38487bda916fce";
       };
     };
+    "lazy-property-1.0.0" = {
+      name = "lazy-property";
+      packageName = "lazy-property";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-property/-/lazy-property-1.0.0.tgz";
+        sha1 = "84ddc4b370679ba8bd4cdcfa4c06b43d57111147";
+      };
+    };
     "lodash._baseuniq-4.6.0" = {
       name = "lodash._baseuniq";
       packageName = "lodash._baseuniq";
@@ -14841,13 +14940,13 @@ let
         sha1 = "1ef61851bb7231db53e397aaf76ddf1cb645c3df";
       };
     };
-    "opener-1.4.2" = {
+    "opener-1.4.3" = {
       name = "opener";
       packageName = "opener";
-      version = "1.4.2";
+      version = "1.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz";
-        sha1 = "b32582080042af8680c389a499175b4c54fff523";
+        url = "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz";
+        sha1 = "5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8";
       };
     };
     "read-cmd-shim-1.0.1" = {
@@ -15255,6 +15354,15 @@ let
         sha1 = "8f92c515482bd6831b7c93013e70f87552c7cf5a";
       };
     };
+    "aproba-1.0.4" = {
+      name = "aproba";
+      packageName = "aproba";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz";
+        sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0";
+      };
+    };
     "request-2.75.0" = {
       name = "request";
       packageName = "request";
@@ -15519,13 +15627,13 @@ let
         sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0";
       };
     };
-    "service-runner-2.1.15" = {
+    "service-runner-2.2.4" = {
       name = "service-runner";
       packageName = "service-runner";
-      version = "2.1.15";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz";
-        sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb";
+        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.2.4.tgz";
+        sha1 = "75cc51113d31d4bb287130880b38f82d7bb4c42c";
       };
     };
     "simplediff-0.1.1" = {
@@ -15645,13 +15753,13 @@ let
         sha1 = "58a6c1ff717f25673be4d2f736d1c94d5d79e239";
       };
     };
-    "limitation-0.1.9" = {
+    "limitation-0.2.0" = {
       name = "limitation";
       packageName = "limitation";
-      version = "0.1.9";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/limitation/-/limitation-0.1.9.tgz";
-        sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03";
+        url = "https://registry.npmjs.org/limitation/-/limitation-0.2.0.tgz";
+        sha1 = "70ce102a972a0b79d4ca13a3ab62b8e6fe682a62";
       };
     };
     "yargs-6.6.0" = {
@@ -15663,6 +15771,15 @@ let
         sha1 = "782ec21ef403345f830a808ca3d513af56065208";
       };
     };
+    "dnscache-1.0.1" = {
+      name = "dnscache";
+      packageName = "dnscache";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.1.tgz";
+        sha1 = "42cb2b9bfb5e8fbdfa395aac74e127fc05074d31";
+      };
+    };
     "dtrace-provider-0.8.0" = {
       name = "dtrace-provider";
       packageName = "dtrace-provider";
@@ -15844,6 +15961,24 @@ let
         sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
+    "lodash.clone-4.3.2" = {
+      name = "lodash.clone";
+      packageName = "lodash.clone";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.3.2.tgz";
+        sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9";
+      };
+    };
+    "lodash._baseclone-4.5.7" = {
+      name = "lodash._baseclone";
+      packageName = "lodash._baseclone";
+      version = "4.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz";
+        sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434";
+      };
+    };
     "lodash.assign-4.2.0" = {
       name = "lodash.assign";
       packageName = "lodash.assign";
@@ -16807,13 +16942,13 @@ let
         sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1";
       };
     };
-    "recast-0.11.21" = {
+    "recast-0.11.22" = {
       name = "recast";
       packageName = "recast";
-      version = "0.11.21";
+      version = "0.11.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz";
-        sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9";
+        url = "https://registry.npmjs.org/recast/-/recast-0.11.22.tgz";
+        sha1 = "dedeb18fb001a2bbc6ac34475fda53dfe3d47dfa";
       };
     };
     "ast-types-0.9.5" = {
@@ -17177,6 +17312,15 @@ 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" = {
       name = "fs-ext";
       packageName = "fs-ext";
@@ -17294,6 +17438,15 @@ let
         sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
       };
     };
+    "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";
+      };
+    };
     "lru-cache-2.2.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -17681,6 +17834,15 @@ let
         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";
+      };
+    };
     "enhanced-resolve-2.3.0" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
@@ -17870,15 +18032,6 @@ let
         sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
       };
     };
-    "uglify-js-2.6.1" = {
-      name = "uglify-js";
-      packageName = "uglify-js";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz";
-        sha1 = "edbbe1888ba3525ded3a7bf836b30b3405d3161b";
-      };
-    };
     "xmldom-0.1.22" = {
       name = "xmldom";
       packageName = "xmldom";
@@ -17888,13 +18041,13 @@ let
         sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
       };
     };
-    "qs-6.0.2" = {
+    "qs-6.0.3" = {
       name = "qs";
       packageName = "qs";
-      version = "6.0.2";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
-        sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
+        url = "https://registry.npmjs.org/qs/-/qs-6.0.3.tgz";
+        sha1 = "95f870b23e70268fba18704e80667515905af06c";
       };
     };
     "blueimp-md5-2.6.0" = {
@@ -17987,6 +18140,15 @@ let
         sha1 = "8bd057bde8f7d0a02b93dda433c2a8d942d8a9a0";
       };
     };
+    "node-cache-4.1.1" = {
+      name = "node-cache";
+      packageName = "node-cache";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-cache/-/node-cache-4.1.1.tgz";
+        sha1 = "08524645ee4039dedc3dcc1dd7c6b979e0619e44";
+      };
+    };
     "npm-4.1.2" = {
       name = "npm";
       packageName = "npm";
@@ -18059,13 +18221,13 @@ let
         sha1 = "1accf97dd739b983bf994d56fec8f95853641b7a";
       };
     };
-    "color-string-1.4.0" = {
+    "color-string-1.5.0" = {
       name = "color-string";
       packageName = "color-string";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/color-string/-/color-string-1.4.0.tgz";
-        sha1 = "2b47f8565fb0eb52f9f77c801992b8ca55d6e898";
+        url = "https://registry.npmjs.org/color-string/-/color-string-1.5.0.tgz";
+        sha1 = "f9a7a0553e55b34d18a463c06f13e3384dd960ce";
       };
     };
     "color-name-1.1.1" = {
@@ -18320,15 +18482,6 @@ let
         sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
       };
     };
-    "tmp-0.0.31" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.0.31";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz";
-        sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7";
-      };
-    };
     "follow-redirects-0.0.3" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -18338,15 +18491,6 @@ let
         sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
       };
     };
-    "acorn-4.0.11" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "4.0.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz";
-        sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0";
-      };
-    };
     "acorn-dynamic-import-2.0.1" = {
       name = "acorn-dynamic-import";
       packageName = "acorn-dynamic-import";
@@ -18383,13 +18527,13 @@ let
         sha1 = "f482aea82d543e07921700d5a46ef26fdac6b8a2";
       };
     };
-    "loader-utils-0.2.16" = {
+    "loader-utils-0.2.17" = {
       name = "loader-utils";
       packageName = "loader-utils";
-      version = "0.2.16";
+      version = "0.2.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz";
-        sha1 = "f08632066ed8282835dff88dfb52704765adee6d";
+        url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz";
+        sha1 = "f86e6374d43205a6e6c60e9196f17c0299bfb348";
       };
     };
     "memory-fs-0.4.1" = {
@@ -18410,13 +18554,13 @@ let
         sha1 = "a3a59ec97024985b46e958379646f96c4b616646";
       };
     };
-    "watchpack-1.2.0" = {
+    "watchpack-1.3.1" = {
       name = "watchpack";
       packageName = "watchpack";
-      version = "1.2.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz";
-        sha1 = "15d4620f1e7471f13fcb551d5c030d2c3eb42dbb";
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.3.1.tgz";
+        sha1 = "7d8693907b28ce6013e7f3610aa2a1acf07dad87";
       };
     };
     "webpack-sources-0.1.4" = {
@@ -18491,13 +18635,13 @@ let
         sha1 = "c550b2ab5427f6b3f21f5afead88c4f5587b2106";
       };
     };
-    "babel-runtime-6.22.0" = {
+    "babel-runtime-6.23.0" = {
       name = "babel-runtime";
       packageName = "babel-runtime";
-      version = "6.22.0";
+      version = "6.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.22.0.tgz";
-        sha1 = "1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611";
+        url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz";
+        sha1 = "0a9489f144de70efb3ce4300accdb329e2fc543b";
       };
     };
     "death-1.1.0" = {
@@ -18509,13 +18653,13 @@ let
         sha1 = "01aa9c401edd92750514470b8266390c66c67318";
       };
     };
-    "detect-indent-4.0.0" = {
+    "detect-indent-5.0.0" = {
       name = "detect-indent";
       packageName = "detect-indent";
-      version = "4.0.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz";
-        sha1 = "f76d064352cdf43a1cb6ce619c4ee3a9475de208";
+        url = "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz";
+        sha1 = "3871cc0a6a002e8c3e5b3cf7f336264675f06b9d";
       };
     };
     "diff-2.2.3" = {
@@ -18527,6 +18671,15 @@ let
         sha1 = "60eafd0d28ee906e4e8ff0a52c1229521033bf99";
       };
     };
+    "inquirer-3.0.5" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "3.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.0.5.tgz";
+        sha1 = "172cabc8eacbfb91d595f5d7c354b446b8141f65";
+      };
+    };
     "invariant-2.2.2" = {
       name = "invariant";
       packageName = "invariant";
@@ -18545,13 +18698,13 @@ let
         sha1 = "f739336b2632365061a9d48270cd56ae3369318e";
       };
     };
-    "leven-2.0.0" = {
+    "leven-2.1.0" = {
       name = "leven";
       packageName = "leven";
-      version = "2.0.0";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/leven/-/leven-2.0.0.tgz";
-        sha1 = "74c45744439550da185801912829f61d22071bc1";
+        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
       };
     };
     "node-emoji-1.5.1" = {
@@ -18563,13 +18716,13 @@ let
         sha1 = "fd918e412769bf8c448051238233840b2aff16a1";
       };
     };
-    "object-path-0.11.3" = {
+    "object-path-0.11.4" = {
       name = "object-path";
       packageName = "object-path";
-      version = "0.11.3";
+      version = "0.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.3.tgz";
-        sha1 = "3e21a42ad07234d815429ae9e15c1c5f38050554";
+        url = "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz";
+        sha1 = "370ae752fbf37de3ea70a861c23bba8915691949";
       };
     };
     "proper-lockfile-2.0.0" = {
@@ -18599,13 +18752,58 @@ let
         sha1 = "1180a30d64e1970d8f55dd8cb0da8ffccecad71e";
       };
     };
-    "regenerator-runtime-0.10.1" = {
+    "regenerator-runtime-0.10.3" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
-      version = "0.10.1";
+      version = "0.10.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz";
-        sha1 = "257f41961ce44558b18f7814af48c17559f9faeb";
+        url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz";
+        sha1 = "8c4367a904b51ea62a908ac310bf99ff90a82a3e";
+      };
+    };
+    "cli-cursor-2.1.0" = {
+      name = "cli-cursor";
+      packageName = "cli-cursor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz";
+        sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5";
+      };
+    };
+    "external-editor-2.0.1" = {
+      name = "external-editor";
+      packageName = "external-editor";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/external-editor/-/external-editor-2.0.1.tgz";
+        sha1 = "4c597c6c88fa6410e41dbbaa7b1be2336aa31095";
+      };
+    };
+    "figures-2.0.0" = {
+      name = "figures";
+      packageName = "figures";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz";
+        sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962";
+      };
+    };
+    "restore-cursor-2.0.0" = {
+      name = "restore-cursor";
+      packageName = "restore-cursor";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz";
+        sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf";
+      };
+    };
+    "onetime-2.0.0" = {
+      name = "onetime";
+      packageName = "onetime";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/onetime/-/onetime-2.0.0.tgz";
+        sha1 = "52aa8110e52fc5126ffc667bd8ec21c2ed209ce6";
       };
     };
     "loose-envify-1.3.1" = {
@@ -18635,16 +18833,439 @@ let
         sha1 = "6b26e9bd3afcaa7be3b4269b526de1b82000ac78";
       };
     };
+    "cli-list-0.1.8" = {
+      name = "cli-list";
+      packageName = "cli-list";
+      version = "0.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cli-list/-/cli-list-0.1.8.tgz";
+        sha1 = "aee6d45c4c59bf80068bb968089fb06f1aeddc0a";
+      };
+    };
+    "cross-spawn-3.0.1" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz";
+        sha1 = "1256037ecb9f0c5f79e3d6ef135e30770184b982";
+      };
+    };
+    "fullname-2.1.0" = {
+      name = "fullname";
+      packageName = "fullname";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fullname/-/fullname-2.1.0.tgz";
+        sha1 = "c46bf0f7c3f24fd5b3358d00e4a41380eef87350";
+      };
+    };
+    "humanize-string-1.0.1" = {
+      name = "humanize-string";
+      packageName = "humanize-string";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/humanize-string/-/humanize-string-1.0.1.tgz";
+        sha1 = "fce2d6c545efc25dea1f23235182c98da0180b42";
+      };
+    };
+    "inquirer-0.11.4" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "0.11.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz";
+        sha1 = "81e3374e8361beaff2d97016206d359d0b32fa4d";
+      };
+    };
+    "insight-0.7.0" = {
+      name = "insight";
+      packageName = "insight";
+      version = "0.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/insight/-/insight-0.7.0.tgz";
+        sha1 = "061f9189835bd38a97a60c2b76ea0c6b30099ff6";
+      };
+    };
+    "npm-keyword-4.2.0" = {
+      name = "npm-keyword";
+      packageName = "npm-keyword";
+      version = "4.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-keyword/-/npm-keyword-4.2.0.tgz";
+        sha1 = "98ffebfdbb1336f27ef5fe1baca0dcacd0acf6c0";
+      };
+    };
+    "opn-3.0.3" = {
+      name = "opn";
+      packageName = "opn";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz";
+        sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a";
+      };
+    };
+    "parse-help-0.1.1" = {
+      name = "parse-help";
+      packageName = "parse-help";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-help/-/parse-help-0.1.1.tgz";
+        sha1 = "2f4df942e77a5581bba9967c0c3f48e4c66d7dda";
+      };
+    };
+    "root-check-1.0.0" = {
+      name = "root-check";
+      packageName = "root-check";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/root-check/-/root-check-1.0.0.tgz";
+        sha1 = "c52a794bf0db9fad567536e41898f0c9e0a86697";
+      };
+    };
+    "sort-on-1.3.0" = {
+      name = "sort-on";
+      packageName = "sort-on";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sort-on/-/sort-on-1.3.0.tgz";
+        sha1 = "0dfd5b364b23df7f2acd86985daeb889e1a7c840";
+      };
+    };
+    "tabtab-1.3.2" = {
+      name = "tabtab";
+      packageName = "tabtab";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tabtab/-/tabtab-1.3.2.tgz";
+        sha1 = "bb9c2ca6324f659fde7634c2caf3c096e1187ca7";
+      };
+    };
+    "titleize-1.0.0" = {
+      name = "titleize";
+      packageName = "titleize";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/titleize/-/titleize-1.0.0.tgz";
+        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";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yeoman-character/-/yeoman-character-1.1.0.tgz";
+        sha1 = "90d4b5beaf92759086177015b2fdfa2e0684d7c7";
+      };
+    };
+    "yeoman-doctor-2.1.0" = {
+      name = "yeoman-doctor";
+      packageName = "yeoman-doctor";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yeoman-doctor/-/yeoman-doctor-2.1.0.tgz";
+        sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
+      };
+    };
+    "yeoman-environment-1.6.6" = {
+      name = "yeoman-environment";
+      packageName = "yeoman-environment";
+      version = "1.6.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-1.6.6.tgz";
+        sha1 = "cd85fa67d156060e440d7807d7ef7cf0d2d1d671";
+      };
+    };
+    "yosay-1.2.1" = {
+      name = "yosay";
+      packageName = "yosay";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yosay/-/yosay-1.2.1.tgz";
+        sha1 = "9466ef969830e85b474e267b50f7688693ed3b5b";
+      };
+    };
+    "npmconf-2.1.2" = {
+      name = "npmconf";
+      packageName = "npmconf";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
+        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
+      };
+    };
+    "execall-1.0.0" = {
+      name = "execall";
+      packageName = "execall";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz";
+        sha1 = "73d0904e395b3cab0658b08d09ec25307f29bb73";
+      };
+    };
+    "clone-regexp-1.0.0" = {
+      name = "clone-regexp";
+      packageName = "clone-regexp";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz";
+        sha1 = "eae0a2413f55c0942f818c229fefce845d7f3b1c";
+      };
+    };
+    "is-regexp-1.0.0" = {
+      name = "is-regexp";
+      packageName = "is-regexp";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz";
+        sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069";
+      };
+    };
+    "is-supported-regexp-flag-1.0.0" = {
+      name = "is-supported-regexp-flag";
+      packageName = "is-supported-regexp-flag";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz";
+        sha1 = "8b520c85fae7a253382d4b02652e045576e13bb8";
+      };
+    };
+    "downgrade-root-1.2.2" = {
+      name = "downgrade-root";
+      packageName = "downgrade-root";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/downgrade-root/-/downgrade-root-1.2.2.tgz";
+        sha1 = "531319715b0e81ffcc22eb28478ba27643e12c6c";
+      };
+    };
+    "sudo-block-1.2.0" = {
+      name = "sudo-block";
+      packageName = "sudo-block";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sudo-block/-/sudo-block-1.2.0.tgz";
+        sha1 = "cc539bf8191624d4f507d83eeb45b4cea27f3463";
+      };
+    };
+    "default-uid-1.0.0" = {
+      name = "default-uid";
+      packageName = "default-uid";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/default-uid/-/default-uid-1.0.0.tgz";
+        sha1 = "fcefa9df9f5ac40c8916d912dd1fe1146aa3c59e";
+      };
+    };
+    "is-root-1.0.0" = {
+      name = "is-root";
+      packageName = "is-root";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
+        sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5";
+      };
+    };
+    "is-docker-1.1.0" = {
+      name = "is-docker";
+      packageName = "is-docker";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-docker/-/is-docker-1.1.0.tgz";
+        sha1 = "f04374d4eee5310e9a8e113bf1495411e46176a1";
+      };
+    };
+    "dot-prop-2.4.0" = {
+      name = "dot-prop";
+      packageName = "dot-prop";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-2.4.0.tgz";
+        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";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz";
+        sha1 = "e4e5df290b9069f7d111324031efc13fdd11a5b0";
+      };
+    };
+    "each-async-1.1.1" = {
+      name = "each-async";
+      packageName = "each-async";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
+        sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
+      };
+    };
+    "log-symbols-1.0.2" = {
+      name = "log-symbols";
+      packageName = "log-symbols";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz";
+        sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18";
+      };
+    };
+    "object-values-1.0.0" = {
+      name = "object-values";
+      packageName = "object-values";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/object-values/-/object-values-1.0.0.tgz";
+        sha1 = "72af839630119e5b98c3b02bb8c27e3237158105";
+      };
+    };
+    "twig-0.8.9" = {
+      name = "twig";
+      packageName = "twig";
+      version = "0.8.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/twig/-/twig-0.8.9.tgz";
+        sha1 = "b1594f002b684e5f029de3e54e87bec4f084b6c2";
+      };
+    };
+    "bin-version-1.0.4" = {
+      name = "bin-version";
+      packageName = "bin-version";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz";
+        sha1 = "9eb498ee6fd76f7ab9a7c160436f89579435d78e";
+      };
+    };
+    "semver-truncate-1.1.2" = {
+      name = "semver-truncate";
+      packageName = "semver-truncate";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz";
+        sha1 = "57f41de69707a62709a7e0104ba2117109ea47e8";
+      };
+    };
+    "find-versions-1.2.1" = {
+      name = "find-versions";
+      packageName = "find-versions";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz";
+        sha1 = "cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62";
+      };
+    };
+    "semver-regex-1.0.0" = {
+      name = "semver-regex";
+      packageName = "semver-regex";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz";
+        sha1 = "92a4969065f9c70c694753d55248fc68f8f652c9";
+      };
+    };
+    "globby-4.1.0" = {
+      name = "globby";
+      packageName = "globby";
+      version = "4.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz";
+        sha1 = "080f54549ec1b82a6c60e631fc82e1211dbe95f8";
+      };
+    };
+    "grouped-queue-0.3.3" = {
+      name = "grouped-queue";
+      packageName = "grouped-queue";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz";
+        sha1 = "c167d2a5319c5a0e0964ef6a25b7c2df8996c85c";
+      };
+    };
+    "mem-fs-1.1.3" = {
+      name = "mem-fs";
+      packageName = "mem-fs";
+      version = "1.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mem-fs/-/mem-fs-1.1.3.tgz";
+        sha1 = "b8ae8d2e3fcb6f5d3f9165c12d4551a065d989cc";
+      };
+    };
+    "vinyl-file-2.0.0" = {
+      name = "vinyl-file";
+      packageName = "vinyl-file";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl-file/-/vinyl-file-2.0.0.tgz";
+        sha1 = "a7ebf5ffbefda1b7d18d140fcb07b223efb6751a";
+      };
+    };
+    "strip-bom-stream-2.0.0" = {
+      name = "strip-bom-stream";
+      packageName = "strip-bom-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz";
+        sha1 = "f87db5ef2613f6968aa545abfe1ec728b6a829ca";
+      };
+    };
+    "first-chunk-stream-2.0.0" = {
+      name = "first-chunk-stream";
+      packageName = "first-chunk-stream";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz";
+        sha1 = "1bdecdb8e083c0664b91945581577a43a9f31d70";
+      };
+    };
+    "pad-component-0.0.1" = {
+      name = "pad-component";
+      packageName = "pad-component";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pad-component/-/pad-component-0.0.1.tgz";
+        sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac";
+      };
+    };
+    "taketalk-1.0.0" = {
+      name = "taketalk";
+      packageName = "taketalk";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/taketalk/-/taketalk-1.0.0.tgz";
+        sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd";
+      };
+    };
   };
 in
 {
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.9.6";
+    version = "1.9.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.6.tgz";
-      sha1 = "550505b1a9133189e98276952ad845b8cbcfdc9e";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.9.8.tgz";
+      sha1 = "17294e9828a1f11ef241d59f5eb040e6a5b4ed13";
     };
     dependencies = [
       sources."colors-0.6.0-1"
@@ -18654,16 +19275,16 @@ in
       sources."wrench-1.3.9"
       sources."xmldom-0.1.19"
       sources."jsonlint-1.5.1"
-      (sources."uglify-js-2.4.15" // {
+      (sources."uglify-js-2.6.1" // {
         dependencies = [
-          sources."source-map-0.1.34"
+          sources."source-map-0.5.6"
         ];
       })
-      sources."resolve-1.2.0"
+      sources."resolve-1.3.2"
       sources."global-paths-0.1.2"
       sources."source-map-0.1.9"
       sources."xml2tss-0.0.5"
-      sources."moment-2.10.6"
+      sources."moment-2.17.1"
       sources."node.extend-1.0.10"
       sources."nomnom-1.8.1"
       sources."JSV-4.0.2"
@@ -18673,10 +19294,22 @@ in
       sources."ansi-styles-1.0.0"
       sources."strip-ansi-0.1.1"
       sources."async-0.2.10"
-      sources."optimist-0.3.7"
       sources."uglify-to-browserify-1.0.2"
-      sources."amdefine-1.0.1"
-      sources."wordwrap-0.0.3"
+      sources."yargs-3.10.0"
+      sources."camelcase-1.2.1"
+      sources."cliui-2.1.0"
+      sources."decamelize-1.2.0"
+      sources."window-size-0.1.0"
+      sources."center-align-0.1.3"
+      sources."right-align-0.1.3"
+      sources."wordwrap-0.0.2"
+      sources."align-text-0.1.4"
+      sources."lazy-cache-1.0.4"
+      sources."kind-of-3.1.0"
+      sources."longest-1.0.1"
+      sources."repeat-string-1.6.1"
+      sources."is-buffer-1.1.4"
+      sources."path-parse-1.0.5"
       sources."array-unique-0.2.1"
       (sources."global-modules-0.2.3" // {
         dependencies = [
@@ -18694,6 +19327,7 @@ in
       sources."which-1.2.12"
       sources."parse-passwd-1.0.0"
       sources."isexe-1.1.2"
+      sources."amdefine-1.0.1"
       sources."xml2js-0.2.8"
       sources."sax-0.5.8"
       sources."is-0.3.0"
@@ -18709,10 +19343,10 @@ in
   azure-cli = nodeEnv.buildNodePackage {
     name = "azure-cli";
     packageName = "azure-cli";
-    version = "0.10.9";
+    version = "0.10.10";
     src = fetchurl {
-      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz";
-      sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df";
+      url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.10.tgz";
+      sha1 = "f50fe398f935d7e8751b7e84dcf02616553fcfa4";
     };
     dependencies = [
       sources."adal-node-0.1.21"
@@ -18734,7 +19368,7 @@ in
       sources."azure-arm-insights-0.11.3"
       sources."azure-arm-iothub-0.1.4"
       sources."azure-arm-servermanagement-0.1.2"
-      sources."azure-arm-network-0.17.0"
+      sources."azure-arm-network-0.18.0"
       sources."azure-arm-powerbiembedded-0.1.0"
       sources."azure-arm-trafficmanager-0.10.5"
       sources."azure-arm-dns-0.11.1"
@@ -18755,7 +19389,7 @@ in
       })
       sources."azure-asm-network-0.13.0"
       sources."azure-arm-resource-1.6.1-preview"
-      sources."azure-arm-storage-0.13.1-preview"
+      sources."azure-arm-storage-0.15.0-preview"
       sources."azure-asm-sb-0.10.1"
       sources."azure-asm-sql-0.10.1"
       sources."azure-asm-storage-0.12.0"
@@ -18765,7 +19399,7 @@ in
           sources."moment-2.14.1"
         ];
       })
-      (sources."azure-storage-1.3.0" // {
+      (sources."azure-storage-2.0.0" // {
         dependencies = [
           sources."readable-stream-2.0.6"
           sources."validator-3.22.2"
@@ -18788,21 +19422,21 @@ in
       sources."jsonlint-1.6.2"
       sources."jsonminify-0.4.1"
       sources."jsrsasign-4.8.2"
-      (sources."kuduscript-1.0.9" // {
+      (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.4"
-      (sources."ms-rest-azure-1.15.4" // {
+      sources."ms-rest-1.15.5"
+      (sources."ms-rest-azure-1.15.5" // {
         dependencies = [
           sources."async-0.2.7"
         ];
       })
       sources."node-forge-0.6.23"
-      sources."omelette-0.1.0"
+      sources."omelette-0.3.2"
       sources."openssl-wrapper-0.2.1"
       sources."progress-1.1.8"
       (sources."prompt-0.2.14" // {
@@ -18865,12 +19499,14 @@ in
       sources."envconf-0.0.4"
       sources."duplexer-0.1.1"
       sources."sax-0.5.2"
-      sources."extend-1.2.1"
       sources."browserify-mime-1.2.9"
+      sources."extend-1.2.1"
       sources."json-edm-parser-0.1.2"
+      sources."md5.js-1.3.4"
       sources."jsonparse-1.2.0"
-      sources."core-util-is-1.0.2"
+      sources."hash-base-3.0.3"
       sources."inherits-2.0.3"
+      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"
@@ -18905,7 +19541,7 @@ in
       sources."i-0.3.5"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."minimist-0.0.8"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
@@ -18931,7 +19567,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.1.4"
+          sources."async-2.1.5"
         ];
       })
       (sources."har-validator-2.0.6" // {
@@ -18948,13 +19584,13 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.2.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."lodash-4.17.4"
-      sources."is-my-json-valid-2.15.0"
+      sources."is-my-json-valid-2.16.0"
       sources."pinkie-promise-2.0.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -19006,7 +19642,7 @@ in
       sources."amdefine-1.0.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
         ];
       })
       sources."http-response-object-1.1.0"
@@ -19097,7 +19733,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.2"
+      sources."readable-stream-2.2.3"
       sources."stream-shift-1.0.0"
       sources."once-1.3.3"
       sources."wrappy-1.0.2"
@@ -19168,7 +19804,7 @@ in
         ];
       })
       sources."path-is-absolute-1.0.1"
-      (sources."rimraf-2.5.4" // {
+      (sources."rimraf-2.6.1" // {
         dependencies = [
           sources."glob-7.1.1"
         ];
@@ -19200,13 +19836,13 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "14.0.0";
+    version = "14.1.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-14.0.0.tgz";
-      sha1 = "67e6cfe7acb2fb1a1908e8a763452306de0bcf38";
+      url = "https://registry.npmjs.org/browserify/-/browserify-14.1.0.tgz";
+      sha1 = "0508cc1e7bf4c152312c2fa523e676c0b0b92311";
     };
     dependencies = [
-      sources."JSONStream-1.3.0"
+      sources."JSONStream-1.3.1"
       sources."assert-1.4.1"
       sources."browser-pack-6.0.2"
       (sources."browser-resolve-1.11.2" // {
@@ -19216,7 +19852,7 @@ in
       })
       sources."browserify-zlib-0.1.4"
       sources."buffer-5.0.5"
-      sources."cached-path-relative-1.0.0"
+      sources."cached-path-relative-1.0.1"
       (sources."concat-stream-1.5.2" // {
         dependencies = [
           sources."readable-stream-2.0.6"
@@ -19241,7 +19877,7 @@ in
           sources."isarray-0.0.1"
         ];
       })
-      sources."module-deps-4.0.8"
+      sources."module-deps-4.1.1"
       sources."os-browserify-0.1.2"
       sources."parents-1.0.1"
       sources."path-browserify-0.0.0"
@@ -19249,8 +19885,8 @@ 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."resolve-1.2.0"
+      sources."readable-stream-2.2.3"
+      sources."resolve-1.3.2"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
       sources."stream-browserify-2.0.1"
@@ -19312,10 +19948,12 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.3"
+      sources."elliptic-6.4.0"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.7"
+      sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
+      sources."hmac-drbg-1.0.0"
+      sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
@@ -19343,6 +19981,7 @@ in
       sources."stream-combiner2-1.1.1"
       sources."path-platform-0.11.15"
       sources."buffer-shims-1.0.0"
+      sources."path-parse-1.0.5"
       sources."json-stable-stringify-0.0.1"
       sources."jsonify-0.0.0"
       sources."array-filter-0.0.1"
@@ -19589,7 +20228,7 @@ in
       sources."ip-set-1.0.1"
       sources."mkdirp-0.3.5"
       sources."peer-wire-swarm-0.12.1"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
       (sources."random-access-file-1.5.0" // {
@@ -19650,21 +20289,21 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      (sources."simple-peer-6.2.2" // {
+      (sources."simple-peer-6.4.3" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
-      (sources."simple-websocket-4.3.0" // {
+      (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
-          sources."ws-2.0.3"
+          sources."readable-stream-2.2.3"
+          sources."ws-2.1.0"
           sources."isarray-1.0.0"
         ];
       })
       sources."string2compact-1.2.2"
-      (sources."ws-1.1.1" // {
+      (sources."ws-1.1.2" // {
         dependencies = [
           sources."ultron-1.0.2"
         ];
@@ -19710,7 +20349,7 @@ in
       sources."voc-0.5.0"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -19732,10 +20371,10 @@ in
   coffee-script = nodeEnv.buildNodePackage {
     name = "coffee-script";
     packageName = "coffee-script";
-    version = "1.12.3";
+    version = "1.12.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.3.tgz";
-      sha1 = "de5f4b1b934a4e9f915c57acd7ad323f68f715db";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz";
+      sha1 = "fe1bced97fe1fb3927b998f2b45616e0658be1ff";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -19774,7 +20413,7 @@ in
         dependencies = [
           sources."async-1.5.2"
           sources."request-2.79.0"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."nopt-3.0.1"
@@ -19840,6 +20479,7 @@ in
       })
       (sources."npm-2.15.11" // {
         dependencies = [
+          sources."abbrev-1.0.9"
           sources."glob-7.0.6"
           sources."hosted-git-info-2.1.5"
           sources."nopt-3.0.6"
@@ -19899,13 +20539,14 @@ in
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
       sources."fs.realpath-1.0.0"
-      sources."resolve-1.2.0"
+      sources."resolve-1.3.2"
+      sources."path-parse-1.0.5"
       (sources."browserify-13.3.0" // {
         dependencies = [
           sources."glob-7.1.1"
         ];
       })
-      sources."JSONStream-1.3.0"
+      sources."JSONStream-1.3.1"
       sources."assert-1.4.1"
       sources."browser-pack-6.0.2"
       (sources."browser-resolve-1.11.2" // {
@@ -19920,7 +20561,7 @@ in
           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."readable-stream-2.0.6"
@@ -19940,7 +20581,7 @@ in
       sources."https-browserify-0.0.1"
       sources."insert-module-globals-7.0.1"
       sources."labeled-stream-splicer-2.0.0"
-      sources."module-deps-4.0.8"
+      sources."module-deps-4.1.1"
       sources."os-browserify-0.1.2"
       sources."parents-1.0.1"
       sources."path-browserify-0.0.0"
@@ -19948,7 +20589,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.3" // {
         dependencies = [
           sources."isarray-1.0.0"
         ];
@@ -20010,10 +20651,12 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.3"
+      sources."elliptic-6.4.0"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.7"
+      sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
+      sources."hmac-drbg-1.0.0"
+      sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
@@ -20119,7 +20762,7 @@ in
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
       sources."builtins-0.0.7"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."archy-1.0.0"
@@ -20159,7 +20802,7 @@ in
       (sources."npm-registry-client-7.2.1" // {
         dependencies = [
           sources."request-2.79.0"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."npm-user-validate-0.1.5"
@@ -20218,7 +20861,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -20273,7 +20916,7 @@ in
         ];
       })
       sources."node-uuid-1.4.7"
-      (sources."async-2.1.4" // {
+      (sources."async-2.1.5" // {
         dependencies = [
           sources."lodash-4.17.4"
         ];
@@ -20345,9 +20988,9 @@ in
         ];
       })
       sources."stream-shift-1.0.0"
-      sources."rc-1.1.6"
+      sources."rc-1.1.7"
       sources."deep-extend-0.4.1"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."is-finite-1.0.2"
     ];
     buildInputs = globalBuildInputs;
@@ -20570,7 +21213,7 @@ in
           sources."minimist-1.2.0"
           sources."split2-2.1.1"
           sources."through2-2.0.3"
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -20584,7 +21227,7 @@ in
       (sources."tar-stream-1.5.2" // {
         dependencies = [
           sources."bl-1.2.0"
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -20608,7 +21251,7 @@ in
       (sources."duplexify-3.5.0" // {
         dependencies = [
           sources."end-of-stream-1.0.0"
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -20675,8 +21318,8 @@ in
       sha1 = "4bec1f64f7931b84884306fb5b37a0d269d81e8d";
     };
     dependencies = [
-      sources."JSONStream-1.3.0"
-      sources."async-2.1.4"
+      sources."JSONStream-1.3.1"
+      sources."async-2.1.5"
       sources."aws4-1.6.0"
       sources."awscred-1.2.0"
       sources."ini-1.3.4"
@@ -20701,7 +21344,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -20710,7 +21353,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -20876,10 +21519,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "3.15.0";
+    version = "3.16.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz";
-      sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2";
+      url = "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz";
+      sha1 = "9bc31fc7341692cf772e80607508f67d711c5609";
     };
     dependencies = [
       sources."babel-code-frame-6.22.0"
@@ -20893,11 +21536,11 @@ in
       sources."esutils-2.0.2"
       sources."file-entry-cache-2.0.0"
       sources."glob-7.1.1"
-      sources."globals-9.14.0"
-      sources."ignore-3.2.2"
+      sources."globals-9.16.0"
+      sources."ignore-3.2.4"
       sources."imurmurhash-0.1.4"
       sources."inquirer-0.12.0"
-      sources."is-my-json-valid-2.15.0"
+      sources."is-my-json-valid-2.16.0"
       sources."is-resolvable-1.0.0"
       sources."js-yaml-3.8.1"
       sources."json-stable-stringify-1.0.1"
@@ -20930,7 +21573,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -20968,7 +21611,7 @@ in
       sources."is-path-in-cwd-1.0.0"
       sources."pify-2.3.0"
       sources."pinkie-promise-2.0.1"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."array-union-1.0.2"
       sources."arrify-1.0.1"
       sources."array-uniq-1.0.3"
@@ -21020,7 +21663,8 @@ in
       sources."callsites-0.2.0"
       sources."interpret-1.0.1"
       sources."rechoir-0.6.2"
-      sources."resolve-1.2.0"
+      sources."resolve-1.3.2"
+      sources."path-parse-1.0.5"
       sources."ajv-4.11.3"
       sources."ajv-keywords-1.5.1"
       sources."slice-ansi-0.0.4"
@@ -21150,7 +21794,7 @@ in
       sources."is-binary-path-1.0.1"
       sources."is-glob-2.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.1.1"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -21177,16 +21821,16 @@ in
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
-      sources."for-own-0.1.4"
+      sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-0.1.6"
+      sources."for-in-1.0.1"
       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.2"
+      sources."readable-stream-2.2.3"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -21202,7 +21846,7 @@ in
       })
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -21217,7 +21861,7 @@ in
           sources."readable-stream-2.1.5"
         ];
       })
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       (sources."gauge-2.7.3" // {
@@ -21239,7 +21883,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.11.0"
@@ -21255,7 +21899,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -21264,7 +21908,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -21391,7 +22035,7 @@ in
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -21411,7 +22055,7 @@ in
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     dependencies = [
-      sources."coffee-script-1.12.3"
+      sources."coffee-script-1.12.4"
       sources."jade-1.11.0"
       (sources."q-2.0.3" // {
         dependencies = [
@@ -21421,7 +22065,7 @@ in
       sources."xml2js-0.4.17"
       sources."msgpack-1.0.2"
       sources."character-parser-1.2.1"
-      (sources."clean-css-3.4.24" // {
+      (sources."clean-css-3.4.25" // {
         dependencies = [
           sources."commander-2.8.1"
         ];
@@ -21547,7 +22191,7 @@ in
       sources."replace-ext-0.0.1"
       (sources."through2-2.0.3" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -21587,7 +22231,7 @@ in
       sources."lodash.isstring-4.0.1"
       sources."lodash.mapvalues-4.6.0"
       sources."rechoir-0.6.2"
-      sources."resolve-1.2.0"
+      sources."resolve-1.3.2"
       sources."detect-file-0.1.0"
       sources."is-glob-2.0.1"
       sources."micromatch-2.3.11"
@@ -21620,9 +22264,9 @@ in
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
-      sources."for-own-0.1.4"
+      sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-0.1.6"
+      sources."for-in-1.0.1"
       sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.2"
       sources."glob-parent-2.0.0"
@@ -21649,6 +22293,7 @@ in
       sources."is-unc-path-0.1.2"
       sources."unc-path-regex-0.1.2"
       sources."path-root-regex-0.1.2"
+      sources."path-parse-1.0.5"
       sources."end-of-stream-0.1.5"
       sources."sequencify-0.0.7"
       sources."stream-consume-0.1.0"
@@ -22037,10 +22682,10 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "1.4.1";
+    version = "1.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-1.4.1.tgz";
-      sha1 = "41981a71d54237606b0a3ea8c58c90773f41650e";
+      url = "https://registry.npmjs.org/karma/-/karma-1.5.0.tgz";
+      sha1 = "9c4c14f0400bef2c04c8e8e6bff59371025cc009";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -22052,12 +22697,7 @@ in
           sources."lodash-4.17.4"
         ];
       })
-      (sources."connect-3.5.0" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."connect-3.6.0"
       sources."core-js-2.4.1"
       sources."di-0.0.1"
       sources."dom-serialize-2.2.1"
@@ -22086,16 +22726,16 @@ in
       sources."optimist-0.6.1"
       sources."qjobs-1.1.5"
       sources."range-parser-1.2.0"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."safe-buffer-5.0.1"
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."object-assign-4.1.0"
         ];
       })
       sources."source-map-0.5.6"
-      sources."tmp-0.0.28"
+      sources."tmp-0.0.31"
       sources."useragent-2.1.12"
       sources."bytes-2.4.0"
       sources."content-type-1.0.2"
@@ -22123,7 +22763,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.1.1"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -22150,15 +22790,15 @@ in
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
-      sources."for-own-0.1.4"
+      sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-0.1.6"
+      sources."for-in-1.0.1"
       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.2"
+      sources."readable-stream-2.2.3"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -22166,18 +22806,22 @@ 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.33" // {
+        dependencies = [
+          sources."rimraf-2.5.4"
+        ];
+      })
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       (sources."request-2.79.0" // {
         dependencies = [
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."semver-5.3.0"
@@ -22186,11 +22830,12 @@ in
         dependencies = [
           sources."debug-2.2.0"
           sources."readable-stream-2.1.5"
+          sources."rimraf-2.5.4"
           sources."ms-0.7.1"
         ];
       })
       sources."minimist-0.0.8"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.3"
@@ -22209,7 +22854,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.11.0"
@@ -22232,7 +22877,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -22282,14 +22927,10 @@ in
       sources."once-1.3.3"
       sources."uid-number-0.0.6"
       sources."wrappy-1.0.2"
-      (sources."finalhandler-0.5.0" // {
-        dependencies = [
-          sources."debug-2.2.0"
-          sources."ms-0.7.1"
-        ];
-      })
+      sources."finalhandler-1.0.0"
       sources."parseurl-1.3.1"
       sources."utils-merge-1.0.0"
+      sources."encodeurl-1.0.1"
       sources."escape-html-1.0.3"
       sources."custom-event-1.0.1"
       sources."ent-2.2.0"
@@ -22303,7 +22944,7 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."wordwrap-0.0.3"
-      (sources."engine.io-1.8.2" // {
+      (sources."engine.io-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -22318,7 +22959,7 @@ in
           sources."debug-2.3.3"
         ];
       })
-      (sources."socket.io-client-1.7.2" // {
+      (sources."socket.io-client-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -22334,7 +22975,7 @@ in
       sources."accepts-1.3.3"
       sources."base64id-1.0.0"
       sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.1"
+      sources."ws-1.1.2"
       sources."cookie-0.3.1"
       sources."negotiator-0.6.1"
       sources."after-0.8.2"
@@ -22347,7 +22988,7 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.2" // {
+      (sources."engine.io-client-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -22547,7 +23188,7 @@ in
       sources."through2-2.0.3"
       sources."vinyl-1.2.0"
       sources."vinyl-fs-2.4.4"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."xtend-4.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -22635,9 +23276,9 @@ in
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
-      sources."for-own-0.1.4"
+      sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-0.1.6"
+      sources."for-in-1.0.1"
       (sources."glob-base-0.3.0" // {
         dependencies = [
           sources."glob-parent-2.0.0"
@@ -22652,7 +23293,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.3.0"
+      sources."convert-source-map-1.4.0"
       sources."minimist-0.0.8"
       sources."is-utf8-0.2.1"
       sources."first-chunk-stream-1.0.0"
@@ -22812,12 +23453,12 @@ in
       sources."once-1.4.0"
       sources."request-2.79.0"
       sources."retry-0.8.0"
-      sources."rimraf-2.5.4"
+      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.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -22848,7 +23489,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -22857,7 +23498,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -22933,7 +23574,7 @@ in
       sources."osenv-0.1.4"
       sources."uid-number-0.0.5"
       sources."proto-list-1.2.4"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."block-stream-0.0.9"
@@ -22975,7 +23616,7 @@ in
       sources."npmlog-4.0.2"
       sources."osenv-0.1.4"
       sources."request-2.79.0"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."semver-5.3.0"
       sources."tar-2.2.1"
       sources."which-1.2.12"
@@ -22989,13 +23630,13 @@ in
       sources."balanced-match-0.4.2"
       sources."concat-map-0.0.1"
       sources."minimist-0.0.8"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       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.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23030,7 +23671,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -23039,7 +23680,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -23115,14 +23756,19 @@ in
       })
       sources."glob-5.0.15"
       sources."path-is-absolute-1.0.1"
-      sources."rc-1.1.6"
+      sources."rc-1.1.7"
       sources."semver-4.3.6"
-      sources."serve-favicon-2.3.2"
+      (sources."serve-favicon-2.4.0" // {
+        dependencies = [
+          sources."etag-1.8.0"
+          sources."fresh-0.4.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.1"
+      sources."ws-1.1.2"
       sources."yargs-3.32.0"
       sources."browser-launcher2-0.4.6"
       sources."minimist-1.2.0"
@@ -23262,7 +23908,7 @@ in
       sources."concat-map-0.0.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."truncate-1.0.5"
       sources."nan-2.5.1"
       (sources."node-pre-gyp-0.6.33" // {
@@ -23276,7 +23922,7 @@ in
       sources."npmlog-4.0.2"
       (sources."request-2.79.0" // {
         dependencies = [
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."tar-2.2.1"
@@ -23290,13 +23936,13 @@ in
           sources."glob-7.1.1"
         ];
       })
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       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.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23332,7 +23978,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -23408,7 +24054,7 @@ in
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -23424,13 +24070,13 @@ in
         ];
       })
       sources."minimist-0.0.8"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       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.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23451,7 +24097,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.11.0"
@@ -23467,7 +24113,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -23476,7 +24122,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -23582,7 +24228,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.1.1"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -23609,16 +24255,16 @@ in
       sources."isarray-1.0.0"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
-      sources."for-own-0.1.4"
+      sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-0.1.6"
+      sources."for-in-1.0.1"
       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.2"
+      sources."readable-stream-2.2.3"
       sources."set-immediate-shim-1.0.1"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -23630,7 +24276,7 @@ in
       sources."mkdirp-0.5.1"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -23647,7 +24293,7 @@ in
         ];
       })
       sources."minimist-0.0.8"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.3"
@@ -23666,7 +24312,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.11.0"
@@ -23682,7 +24328,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -23691,7 +24337,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -23877,12 +24523,12 @@ 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.16"
+      sources."node-red-node-email-0.1.21"
       (sources."node-red-node-twitter-0.1.9" // {
         dependencies = [
           sources."request-2.79.0"
           sources."form-data-2.1.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."node-red-node-rbe-0.1.6"
@@ -23930,7 +24576,7 @@ in
       sources."nth-check-1.0.1"
       sources."domelementtype-1.3.0"
       sources."domhandler-2.3.0"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -23974,7 +24620,7 @@ in
       sources."klaw-1.3.1"
       sources."async-0.1.22"
       sources."retry-0.6.1"
-      sources."cookies-0.6.2"
+      sources."cookies-0.7.0"
       sources."i18next-client-1.10.3"
       sources."json5-0.2.0"
       sources."keygrip-1.0.1"
@@ -24057,9 +24703,9 @@ in
       sources."repeat-string-1.6.1"
       sources."is-posix-bracket-0.1.1"
       sources."is-buffer-1.1.4"
-      sources."for-own-0.1.4"
+      sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-0.1.6"
+      sources."for-in-1.0.1"
       (sources."glob-base-0.3.0" // {
         dependencies = [
           sources."glob-parent-2.0.0"
@@ -24082,7 +24728,7 @@ in
         ];
       })
       sources."stream-shift-1.0.0"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."uid2-0.0.3"
       sources."passport-strategy-1.0.0"
       sources."pause-0.0.1"
@@ -24126,7 +24772,7 @@ in
       sources."forever-agent-0.6.1"
       (sources."form-data-1.0.1" // {
         dependencies = [
-          sources."async-2.1.4"
+          sources."async-2.1.5"
         ];
       })
       sources."har-validator-2.0.6"
@@ -24142,7 +24788,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -24238,7 +24884,7 @@ in
         dependencies = [
           sources."request-2.79.0"
           sources."form-data-2.1.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       (sources."mkdirp-0.5.1" // {
@@ -24247,7 +24893,7 @@ in
         ];
       })
       sources."npmlog-4.0.2"
-      sources."rc-1.1.6"
+      sources."rc-1.1.7"
       (sources."rimraf-2.5.4" // {
         dependencies = [
           sources."glob-7.1.1"
@@ -24275,7 +24921,7 @@ in
       sources."number-is-nan-1.0.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."fs.realpath-1.0.0"
       sources."block-stream-0.0.9"
       sources."fstream-1.0.10"
@@ -24354,7 +25000,7 @@ in
       sources."bytes-0.2.0"
       sources."pause-0.0.1"
       sources."mime-1.2.6"
-      sources."coffee-script-1.12.3"
+      sources."coffee-script-1.12.4"
       sources."vows-0.8.1"
       sources."eyes-0.1.8"
       sources."diff-1.0.8"
@@ -24419,18 +25065,18 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "4.2.0";
+    version = "4.3.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz";
-      sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a";
+      url = "https://registry.npmjs.org/npm/-/npm-4.3.0.tgz";
+      sha1 = "78e97142408c8383bff10a0e4036e9f77f00ce28";
     };
     dependencies = [
-      sources."JSONStream-1.3.0"
+      sources."JSONStream-1.3.1"
       sources."abbrev-1.0.9"
       sources."ansi-regex-2.1.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
-      sources."aproba-1.0.4"
+      sources."aproba-1.1.1"
       sources."archy-1.0.0"
       sources."asap-2.0.5"
       sources."chownr-1.0.1"
@@ -24446,7 +25092,7 @@ in
       sources."glob-7.1.1"
       sources."graceful-fs-4.1.11"
       sources."has-unicode-2.0.1"
-      sources."hosted-git-info-2.1.5"
+      sources."hosted-git-info-2.2.0"
       sources."iferr-0.1.5"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -24456,6 +25102,7 @@ in
           sources."glob-6.0.4"
         ];
       })
+      sources."lazy-property-1.0.0"
       sources."lockfile-1.0.3"
       sources."lodash._baseuniq-4.6.0"
       sources."lodash.clonedeep-4.5.0"
@@ -24479,7 +25126,7 @@ in
       sources."npm-user-validate-0.1.5"
       sources."npmlog-4.0.2"
       sources."once-1.4.0"
-      sources."opener-1.4.2"
+      sources."opener-1.4.3"
       sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
@@ -24491,7 +25138,7 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."realize-package-specifier-3.0.3"
       sources."request-2.79.0"
       sources."retry-0.10.1"
@@ -24610,7 +25257,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -24618,7 +25265,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -24716,7 +25363,7 @@ in
       })
       sources."fs.extra-1.3.2"
       sources."findit-1.2.0"
-      sources."coffee-script-1.12.3"
+      sources."coffee-script-1.12.4"
       sources."underscore-1.4.4"
       sources."underscore.string-2.3.3"
       sources."request-2.79.0"
@@ -24724,7 +25371,7 @@ in
       sources."slide-1.1.6"
       sources."chownr-0.0.2"
       sources."mkdirp-0.3.5"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."retry-0.6.0"
       sources."couch-login-0.1.20"
       sources."npmlog-4.0.2"
@@ -24743,7 +25390,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -24752,7 +25399,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -24815,7 +25462,7 @@ in
       sources."gauge-2.7.3"
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -24840,7 +25487,7 @@ in
       sources."nopt-2.2.1"
       sources."ini-1.1.0"
       sources."proto-list-1.2.4"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."block-stream-0.0.9"
       (sources."fstream-0.1.31" // {
         dependencies = [
@@ -24870,10 +25517,10 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.10.2";
+    version = "2.10.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz";
-      sha1 = "9614c58ec84d31702a85881c844c3fb93611a585";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.3.tgz";
+      sha1 = "40540278e81e60e2f28df3bc79bf77e157f95555";
     };
     dependencies = [
       sources."bluebird-3.4.7"
@@ -24969,7 +25616,7 @@ in
         ];
       })
       sources."once-1.4.0"
-      sources."opener-1.4.2"
+      sources."opener-1.4.3"
       sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
@@ -25049,7 +25696,7 @@ in
       sources."builtin-modules-1.1.1"
       (sources."concat-stream-1.6.0" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
         ];
       })
       sources."typedarray-0.0.6"
@@ -25084,13 +25731,13 @@ in
       sources."mime-types-2.1.14"
       sources."node-uuid-1.4.7"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.2.1"
+      sources."qs-6.2.2"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."is-my-json-valid-2.15.0"
+      sources."is-my-json-valid-2.16.0"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
       sources."jsonpointer-4.0.1"
@@ -25172,13 +25819,13 @@ in
       sources."error-ex-1.3.0"
       sources."is-arrayish-0.2.1"
       sources."prepend-http-1.0.4"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."deep-extend-0.4.1"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -25241,12 +25888,17 @@ in
       sources."prfun-2.1.4"
       (sources."request-2.79.0" // {
         dependencies = [
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."semver-5.3.0"
-      sources."serve-favicon-2.3.2"
-      (sources."service-runner-2.1.15" // {
+      (sources."serve-favicon-2.4.0" // {
+        dependencies = [
+          sources."etag-1.8.0"
+          sources."fresh-0.4.0"
+        ];
+      })
+      (sources."service-runner-2.2.4" // {
         dependencies = [
           sources."gelf-stream-1.1.1"
           sources."yargs-6.6.0"
@@ -25400,7 +26052,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -25450,12 +26102,13 @@ in
       sources."bunyan-1.8.5"
       sources."bunyan-syslog-udp-0.1.0"
       sources."hot-shots-4.3.1"
-      (sources."limitation-0.1.9" // {
+      (sources."limitation-0.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
+      sources."dnscache-1.0.1"
       sources."dtrace-provider-0.8.0"
       sources."mv-2.1.1"
       sources."safe-json-stringify-1.0.3"
@@ -25474,14 +26127,14 @@ in
       sources."hat-0.0.3"
       (sources."kad-fs-0.0.4" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
       sources."kad-localstorage-0.0.7"
       (sources."kad-memstore-0.0.1" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -25489,7 +26142,7 @@ in
       sources."merge-1.2.0"
       (sources."msgpack5-3.4.1" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -25499,7 +26152,7 @@ in
       sources."dom-storage-2.0.2"
       (sources."bl-1.2.0" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
           sources."isarray-1.0.0"
         ];
       })
@@ -25542,6 +26195,8 @@ in
       sources."code-point-at-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."number-is-nan-1.0.1"
+      sources."lodash.clone-4.3.2"
+      sources."lodash._baseclone-4.5.7"
       sources."lodash.assign-4.2.0"
     ];
     buildInputs = globalBuildInputs;
@@ -25585,7 +26240,7 @@ in
       })
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
-      sources."rc-1.1.6"
+      sources."rc-1.1.7"
       (sources."torrent-stream-1.0.3" // {
         dependencies = [
           sources."end-of-stream-0.1.5"
@@ -25614,7 +26269,7 @@ in
       sources."big-integer-1.6.17"
       sources."inherits-2.0.3"
       sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
       sources."isarray-1.0.0"
@@ -25732,7 +26387,7 @@ in
       })
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."bitfield-0.1.0"
       sources."bncode-0.5.3"
       (sources."fs-chunk-store-1.6.4" // {
@@ -25747,7 +26402,7 @@ in
       sources."ip-set-1.0.1"
       sources."mkdirp-0.3.5"
       sources."peer-wire-swarm-0.12.1"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."torrent-discovery-5.4.0"
       sources."torrent-piece-1.1.0"
       (sources."random-access-file-1.5.0" // {
@@ -25806,14 +26461,14 @@ in
       sources."compact2string-1.4.0"
       sources."random-iterate-1.0.1"
       sources."run-series-1.1.4"
-      sources."simple-peer-6.2.2"
-      (sources."simple-websocket-4.3.0" // {
+      sources."simple-peer-6.4.3"
+      (sources."simple-websocket-4.3.1" // {
         dependencies = [
-          sources."ws-2.0.3"
+          sources."ws-2.1.0"
         ];
       })
       sources."string2compact-1.2.2"
-      (sources."ws-1.1.1" // {
+      (sources."ws-1.1.2" // {
         dependencies = [
           sources."ultron-1.0.2"
         ];
@@ -25853,7 +26508,7 @@ in
       sources."pump-1.0.2"
       sources."range-parser-1.2.0"
       sources."read-torrent-1.3.0"
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -25990,7 +26645,7 @@ in
       sources."boom-0.3.8"
       sources."cryptiles-0.1.3"
       sources."sntp-0.1.4"
-      (sources."engine.io-1.8.2" // {
+      (sources."engine.io-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."cookie-0.3.1"
@@ -26003,7 +26658,7 @@ in
           sources."debug-2.3.3"
         ];
       })
-      (sources."socket.io-client-1.7.2" // {
+      (sources."socket.io-client-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26025,7 +26680,7 @@ in
       })
       sources."base64id-1.0.0"
       sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.1"
+      sources."ws-1.1.2"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
@@ -26036,7 +26691,7 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.2" // {
+      (sources."engine.io-client-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
         ];
@@ -26077,7 +26732,7 @@ in
       })
       sources."peer-wire-swarm-0.9.2"
       sources."random-access-file-0.3.2"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."thunky-0.1.0"
       sources."addr-to-ip-port-1.4.2"
       sources."buffer-equal-0.0.1"
@@ -26160,7 +26815,7 @@ in
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -26193,7 +26848,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.1.4"
+      sources."async-2.1.5"
       sources."lodash-4.17.4"
       sources."mime-db-1.26.0"
       sources."assert-plus-0.2.0"
@@ -26229,7 +26884,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -26276,7 +26931,7 @@ in
       sources."mkdirp-0.5.1"
       sources."private-0.1.7"
       sources."q-1.4.1"
-      sources."recast-0.11.21"
+      sources."recast-0.11.22"
       sources."graceful-readlink-1.0.1"
       sources."acorn-3.3.0"
       sources."defined-1.0.0"
@@ -26377,7 +27032,7 @@ in
       (sources."openid-2.0.6" // {
         dependencies = [
           sources."request-2.79.0"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."node-swt-0.1.1"
@@ -26410,7 +27065,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
-      sources."is-my-json-valid-2.15.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"
@@ -26495,6 +27150,7 @@ in
         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"
@@ -26508,10 +27164,10 @@ in
       })
       sources."commander-2.9.0"
       sources."js-yaml-3.8.1"
-      sources."cookies-0.6.2"
+      sources."cookies-0.7.0"
       (sources."request-2.79.0" // {
         dependencies = [
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
         ];
       })
       sources."async-0.9.2"
@@ -26524,10 +27180,14 @@ in
       sources."lunr-0.7.2"
       sources."render-readme-1.3.1"
       sources."jju-1.3.0"
-      sources."JSONStream-1.3.0"
+      sources."JSONStream-1.3.1"
       sources."mkdirp-0.5.1"
       sources."sinopia-htpasswd-0.4.5"
-      sources."http-errors-1.5.1"
+      (sources."http-errors-1.6.1" // {
+        dependencies = [
+          sources."setprototypeof-1.0.3"
+        ];
+      })
       (sources."readable-stream-1.1.14" // {
         dependencies = [
           sources."isarray-0.0.1"
@@ -26560,6 +27220,7 @@ in
       sources."router-1.1.5"
       (sources."send-0.14.2" // {
         dependencies = [
+          sources."http-errors-1.5.1"
           sources."ms-0.7.2"
         ];
       })
@@ -26579,6 +27240,7 @@ in
       sources."setprototypeof-1.0.2"
       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"
@@ -26611,7 +27273,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
-      sources."is-my-json-valid-2.15.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"
@@ -26671,7 +27333,6 @@ 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"
@@ -26694,7 +27355,7 @@ in
       sources."uc.micro-1.0.3"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
-          sources."readable-stream-2.2.2"
+          sources."readable-stream-2.2.3"
         ];
       })
       sources."regexp-quote-0.0.0"
@@ -26736,7 +27397,7 @@ in
       sha1 = "b42d3da1a442a489f454c32c628e8ebf0007875c";
     };
     dependencies = [
-      sources."async-2.1.4"
+      sources."async-2.1.5"
       sources."cli-table-0.3.1"
       sources."commander-2.9.0"
       sources."readdirp-2.1.0"
@@ -26745,7 +27406,7 @@ in
       sources."graceful-readlink-1.0.1"
       sources."graceful-fs-4.1.11"
       sources."minimatch-3.0.3"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."set-immediate-shim-1.0.1"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
@@ -26823,7 +27484,7 @@ in
           sources."extsprintf-1.0.0"
         ];
       })
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."backoff-2.5.0"
       sources."csv-0.4.6"
       sources."escape-regexp-component-1.0.2"
@@ -26888,7 +27549,7 @@ in
         ];
       })
       sources."json-schema-0.2.3"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."buffer-shims-1.0.0"
       sources."isarray-1.0.0"
       sources."process-nextick-args-1.0.7"
@@ -26985,27 +27646,23 @@ in
   tern = nodeEnv.buildNodePackage {
     name = "tern";
     packageName = "tern";
-    version = "0.20.0";
+    version = "0.21.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/tern/-/tern-0.20.0.tgz";
-      sha1 = "5058e1ae15a121a1f421500ced0c852c11e6fb34";
+      url = "https://registry.npmjs.org/tern/-/tern-0.21.0.tgz";
+      sha1 = "809c87a826e112494398cf8894f7c2d1b3464eb7";
     };
     dependencies = [
-      sources."acorn-3.3.0"
+      sources."acorn-4.0.11"
       sources."enhanced-resolve-2.3.0"
-      (sources."glob-3.2.11" // {
-        dependencies = [
-          sources."minimatch-0.3.0"
-        ];
-      })
-      sources."minimatch-0.2.14"
+      sources."glob-7.1.1"
+      sources."minimatch-3.0.3"
       sources."resolve-from-2.0.0"
       sources."tapable-0.2.6"
       sources."memory-fs-0.3.0"
       sources."graceful-fs-4.1.11"
       sources."object-assign-4.1.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."prr-0.0.0"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -27014,8 +27671,14 @@ in
       sources."process-nextick-args-1.0.7"
       sources."string_decoder-0.10.31"
       sources."util-deprecate-1.0.2"
-      sources."lru-cache-2.7.3"
-      sources."sigmund-1.0.1"
+      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."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -27055,7 +27718,7 @@ in
       (sources."request-2.78.0" // {
         dependencies = [
           sources."form-data-2.1.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."tough-cookie-2.3.2"
         ];
       })
@@ -27103,7 +27766,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.0.2"
+      sources."qs-6.0.3"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.2.2"
       sources."tunnel-agent-0.4.3"
@@ -27117,7 +27780,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -27201,10 +27864,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.1.6";
+    version = "2.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz";
-      sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.2.1.tgz";
+      sha1 = "4862b662b988a4c8ff691cc7969622d24db76ae9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -27252,13 +27915,13 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.1.7";
+    version = "1.1.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz";
-      sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.1.8.tgz";
+      sha1 = "1519b78475ef5162ef3342c2046889b396add651";
     };
     dependencies = [
-      sources."async-2.1.4"
+      sources."async-2.1.5"
       sources."bluebird-3.4.7"
       sources."blueimp-md5-2.6.0"
       sources."body-parser-1.15.2"
@@ -27271,7 +27934,7 @@ in
       sources."forever-monitor-1.1.0"
       sources."getmac-1.2.1"
       sources."hasher-1.2.0"
-      sources."ignore-3.2.2"
+      sources."ignore-3.2.4"
       sources."keen.io-0.1.3"
       sources."knockout-3.4.1"
       sources."lodash-4.17.4"
@@ -27281,8 +27944,10 @@ in
         ];
       })
       sources."moment-2.17.1"
+      sources."node-cache-4.1.1"
       (sources."npm-4.1.2" // {
         dependencies = [
+          sources."abbrev-1.0.9"
           sources."nopt-4.0.1"
           sources."request-2.79.0"
           sources."combined-stream-1.0.5"
@@ -27291,7 +27956,7 @@ in
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."tunnel-agent-0.4.3"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -27309,7 +27974,7 @@ in
           sources."hawk-3.1.3"
           sources."json-stringify-safe-5.0.1"
           sources."oauth-sign-0.8.2"
-          sources."qs-6.3.0"
+          sources."qs-6.3.1"
           sources."tunnel-agent-0.4.3"
           sources."delayed-stream-1.0.0"
           sources."hoek-2.16.3"
@@ -27329,7 +27994,7 @@ in
           sources."uuid-3.0.0"
         ];
       })
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -27339,7 +28004,7 @@ in
       sources."serve-static-1.11.2"
       sources."signals-1.0.0"
       sources."snapsvg-0.4.0"
-      (sources."socket.io-1.7.2" // {
+      (sources."socket.io-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."object-assign-4.1.0"
@@ -27391,7 +28056,7 @@ in
       sources."mime-types-2.1.14"
       sources."mime-db-1.26.0"
       sources."color-convert-1.9.0"
-      sources."color-string-1.4.0"
+      sources."color-string-1.5.0"
       sources."color-name-1.1.1"
       sources."simple-swizzle-0.2.2"
       sources."is-arrayish-0.3.1"
@@ -27405,7 +28070,7 @@ in
       })
       sources."whatwg-fetch-2.0.2"
       sources."nopt-1.0.10"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."accepts-1.3.3"
       sources."array-flatten-1.1.1"
       sources."content-disposition-0.5.2"
@@ -27515,7 +28180,8 @@ in
       sources."editions-1.3.3"
       sources."typechecker-4.4.1"
       sources."underscore-1.5.2"
-      sources."JSONStream-1.3.0"
+      sources."clone-2.1.0"
+      sources."JSONStream-1.3.1"
       sources."ansicolors-0.3.2"
       sources."ansistyles-0.1.3"
       sources."aproba-1.0.4"
@@ -27568,7 +28234,7 @@ in
       sources."npm-user-validate-0.1.5"
       sources."npmlog-4.0.2"
       sources."once-1.4.0"
-      sources."opener-1.4.2"
+      sources."opener-1.4.3"
       sources."osenv-0.1.4"
       sources."path-is-inside-1.0.2"
       sources."read-1.0.7"
@@ -27581,7 +28247,7 @@ in
         ];
       })
       sources."read-package-tree-5.1.5"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."realize-package-specifier-3.0.3"
       sources."retry-0.10.1"
       sources."sha-2.0.1"
@@ -27619,8 +28285,11 @@ in
       sources."jsonparse-1.3.0"
       sources."through-2.3.8"
       sources."wcwidth-1.0.1"
-      sources."defaults-1.0.3"
-      sources."clone-1.0.2"
+      (sources."defaults-1.0.3" // {
+        dependencies = [
+          sources."clone-1.0.2"
+        ];
+      })
       sources."proto-list-1.2.4"
       (sources."fstream-ignore-1.0.5" // {
         dependencies = [
@@ -27694,7 +28363,7 @@ in
       sources."asynckit-0.4.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -27745,9 +28414,9 @@ in
       sources."pause-0.0.1"
       sources."lsmod-1.0.0"
       sources."deep-extend-0.4.1"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."eve-0.4.2"
-      (sources."engine.io-1.8.2" // {
+      (sources."engine.io-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."ms-0.7.2"
@@ -27764,7 +28433,7 @@ in
           sources."ms-0.7.2"
         ];
       })
-      (sources."socket.io-client-1.7.2" // {
+      (sources."socket.io-client-1.7.3" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."ms-0.7.2"
@@ -27778,7 +28447,7 @@ in
       })
       sources."base64id-1.0.0"
       sources."engine.io-parser-1.3.2"
-      sources."ws-1.1.1"
+      sources."ws-1.1.2"
       sources."after-0.8.2"
       sources."arraybuffer.slice-0.0.6"
       sources."base64-arraybuffer-0.1.5"
@@ -27789,7 +28458,7 @@ in
       sources."backo2-1.0.2"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
-      (sources."engine.io-client-1.8.2" // {
+      (sources."engine.io-client-1.8.3" // {
         dependencies = [
           sources."debug-2.3.3"
           sources."ms-0.7.2"
@@ -27881,7 +28550,7 @@ in
       sources."ini-1.1.0"
       sources."proto-list-1.2.4"
       sources."wrappy-1.0.2"
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       (sources."extract-zip-1.5.0" // {
         dependencies = [
           sources."mkdirp-0.5.0"
@@ -27910,7 +28579,7 @@ in
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
       sources."path-is-absolute-1.0.1"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."glob-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."inflight-1.0.6"
@@ -27941,7 +28610,7 @@ in
       sources."isstream-0.1.2"
       sources."is-typedarray-1.0.0"
       sources."har-validator-2.0.6"
-      sources."async-2.1.4"
+      sources."async-2.1.5"
       sources."lodash-4.17.4"
       sources."mime-db-1.26.0"
       sources."assert-plus-0.2.0"
@@ -27977,7 +28646,7 @@ in
       sources."delayed-stream-1.0.0"
       sources."chalk-1.1.3"
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -28016,12 +28685,12 @@ in
       sources."acorn-dynamic-import-2.0.1"
       sources."ajv-4.11.3"
       sources."ajv-keywords-1.5.1"
-      sources."async-2.1.4"
+      sources."async-2.1.5"
       sources."enhanced-resolve-3.1.0"
       sources."interpret-1.0.1"
       sources."json-loader-0.5.4"
       sources."loader-runner-2.3.0"
-      sources."loader-utils-0.2.16"
+      sources."loader-utils-0.2.17"
       sources."memory-fs-0.4.1"
       sources."mkdirp-0.5.1"
       sources."node-libs-browser-2.0.0"
@@ -28034,7 +28703,7 @@ in
           sources."yargs-3.10.0"
         ];
       })
-      sources."watchpack-1.2.0"
+      sources."watchpack-1.3.1"
       sources."webpack-sources-0.1.4"
       (sources."yargs-6.6.0" // {
         dependencies = [
@@ -28052,7 +28721,7 @@ in
       sources."emojis-list-2.1.0"
       sources."json5-0.5.1"
       sources."errno-0.1.4"
-      sources."readable-stream-2.2.2"
+      sources."readable-stream-2.2.3"
       sources."prr-0.0.0"
       sources."buffer-shims-1.0.0"
       sources."core-util-is-1.0.2"
@@ -28113,10 +28782,12 @@ in
       sources."minimalistic-assert-1.0.0"
       sources."bn.js-4.11.6"
       sources."browserify-rsa-4.0.1"
-      sources."elliptic-6.3.3"
+      sources."elliptic-6.4.0"
       sources."parse-asn1-5.0.0"
-      sources."brorand-1.0.7"
+      sources."brorand-1.1.0"
       sources."hash.js-1.0.3"
+      sources."hmac-drbg-1.0.0"
+      sources."minimalistic-crypto-utils-1.0.1"
       sources."asn1.js-4.9.1"
       sources."ripemd160-1.0.1"
       sources."sha.js-2.4.8"
@@ -28150,7 +28821,7 @@ in
       sources."is-glob-2.0.1"
       sources."path-is-absolute-1.0.1"
       sources."readdirp-2.1.0"
-      sources."fsevents-1.0.17"
+      sources."fsevents-1.1.1"
       sources."arrify-1.0.1"
       sources."micromatch-2.3.11"
       sources."arr-diff-2.0.0"
@@ -28173,9 +28844,9 @@ in
       sources."isobject-2.1.0"
       sources."randomatic-1.1.6"
       sources."is-posix-bracket-0.1.1"
-      sources."for-own-0.1.4"
+      sources."for-own-0.1.5"
       sources."is-extendable-0.1.1"
-      sources."for-in-0.1.6"
+      sources."for-in-1.0.1"
       sources."glob-base-0.3.0"
       sources."is-dotfile-1.0.2"
       sources."is-equal-shallow-0.1.3"
@@ -28190,7 +28861,7 @@ in
       sources."node-pre-gyp-0.6.33"
       sources."nopt-3.0.6"
       sources."npmlog-4.0.2"
-      (sources."rc-1.1.6" // {
+      (sources."rc-1.1.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -28205,7 +28876,7 @@ in
           sources."readable-stream-2.1.5"
         ];
       })
-      sources."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
       sources."gauge-2.7.3"
@@ -28223,7 +28894,7 @@ in
       sources."ansi-regex-2.1.1"
       sources."deep-extend-0.4.1"
       sources."ini-1.3.4"
-      sources."strip-json-comments-1.0.4"
+      sources."strip-json-comments-2.0.1"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       sources."caseless-0.11.0"
@@ -28239,7 +28910,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
@@ -28252,7 +28923,7 @@ in
         ];
       })
       sources."commander-2.9.0"
-      sources."is-my-json-valid-2.15.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"
@@ -28368,13 +29039,13 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "0.19.1";
+    version = "0.20.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-0.19.1.tgz";
-      sha1 = "102ca03ce7fc910a73f719c70bba9e9f9e3b2b4d";
+      url = "https://registry.npmjs.org/yarn/-/yarn-0.20.4.tgz";
+      sha1 = "575190fee60a27a54d4125a0f7579fc702f01229";
     };
     dependencies = [
-      sources."babel-runtime-6.22.0"
+      sources."babel-runtime-6.23.0"
       sources."bytes-2.4.0"
       sources."camelcase-3.0.0"
       sources."chalk-1.1.3"
@@ -28383,35 +29054,34 @@ in
       sources."death-1.1.0"
       sources."debug-2.6.1"
       sources."defaults-1.0.3"
-      sources."detect-indent-4.0.0"
+      sources."detect-indent-5.0.0"
       sources."diff-2.2.3"
       sources."ini-1.3.4"
-      sources."inquirer-1.2.3"
+      sources."inquirer-3.0.5"
       sources."invariant-2.2.2"
       sources."is-builtin-module-1.0.0"
       sources."is-ci-1.0.10"
-      sources."leven-2.0.0"
+      sources."leven-2.1.0"
       sources."loud-rejection-1.6.0"
       sources."minimatch-3.0.3"
       sources."mkdirp-0.5.1"
       sources."node-emoji-1.5.1"
       sources."node-gyp-3.5.0"
-      sources."object-path-0.11.3"
+      sources."object-path-0.11.4"
       sources."proper-lockfile-2.0.0"
       sources."read-1.0.7"
-      sources."repeating-2.0.1"
       sources."request-2.79.0"
       sources."request-capture-har-1.1.4"
-      sources."rimraf-2.5.4"
+      sources."rimraf-2.6.1"
       sources."roadrunner-1.1.0"
       sources."semver-5.3.0"
-      sources."strip-bom-2.0.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.1"
+      sources."regenerator-runtime-0.10.3"
       sources."ansi-styles-2.2.1"
       sources."escape-string-regexp-1.0.5"
       sources."has-ansi-2.0.0"
@@ -28423,47 +29093,29 @@ in
       sources."ms-0.7.2"
       sources."clone-1.0.2"
       sources."ansi-escapes-1.4.0"
-      sources."cli-cursor-1.0.2"
+      sources."cli-cursor-2.1.0"
       sources."cli-width-2.1.0"
-      sources."external-editor-1.1.1"
-      sources."figures-1.7.0"
+      sources."external-editor-2.0.1"
+      sources."figures-2.0.0"
       sources."lodash-4.17.4"
-      sources."mute-stream-0.0.6"
-      sources."pinkie-promise-2.0.1"
+      sources."mute-stream-0.0.7"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
-      sources."string-width-1.0.2"
+      sources."string-width-2.0.0"
       sources."through-2.3.8"
-      sources."restore-cursor-1.0.1"
-      sources."exit-hook-1.1.1"
-      sources."onetime-1.1.0"
-      sources."extend-3.0.0"
-      sources."spawn-sync-1.0.15"
-      sources."tmp-0.0.29"
-      sources."concat-stream-1.6.0"
-      sources."os-shim-0.1.3"
-      sources."inherits-2.0.3"
-      sources."typedarray-0.0.6"
-      sources."readable-stream-2.2.2"
-      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."restore-cursor-2.0.0"
+      sources."onetime-2.0.0"
+      sources."signal-exit-3.0.2"
+      sources."mimic-fn-1.1.0"
+      sources."tmp-0.0.31"
       sources."os-tmpdir-1.0.2"
-      sources."object-assign-4.1.1"
-      sources."pinkie-2.0.4"
       sources."is-promise-2.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."is-fullwidth-code-point-2.0.0"
       sources."loose-envify-1.3.1"
       sources."js-tokens-3.0.1"
       sources."builtin-modules-1.1.1"
       sources."ci-info-1.0.0"
       sources."currently-unhandled-0.4.1"
-      sources."signal-exit-3.0.2"
       sources."array-find-index-1.0.2"
       sources."brace-expansion-1.1.6"
       sources."balanced-match-0.4.2"
@@ -28476,28 +29128,49 @@ in
       sources."npmlog-4.0.2"
       sources."osenv-0.1.4"
       sources."which-1.2.12"
+      sources."inherits-2.0.3"
       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."abbrev-1.0.9"
+      sources."abbrev-1.1.0"
       sources."are-we-there-yet-1.1.2"
       sources."console-control-strings-1.1.0"
-      sources."gauge-2.7.3"
+      (sources."gauge-2.7.3" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
+        ];
+      })
       sources."set-blocking-2.0.0"
       sources."delegates-1.0.0"
+      sources."readable-stream-2.2.3"
+      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."aproba-1.1.1"
       sources."has-unicode-2.0.1"
-      sources."wide-align-1.1.0"
+      sources."object-assign-4.1.1"
+      (sources."wide-align-1.1.0" // {
+        dependencies = [
+          sources."string-width-1.0.2"
+          sources."is-fullwidth-code-point-1.0.0"
+        ];
+      })
+      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."retry-0.10.1"
-      sources."is-finite-1.0.2"
       sources."aws-sign2-0.6.0"
       sources."aws4-1.6.0"
       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-2.1.2"
       sources."har-validator-2.0.6"
@@ -28508,14 +29181,271 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."mime-types-2.1.14"
       sources."oauth-sign-0.8.2"
-      sources."qs-6.3.0"
+      sources."qs-6.3.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.2"
       sources."tunnel-agent-0.4.3"
       sources."uuid-3.0.1"
       sources."delayed-stream-1.0.0"
       sources."asynckit-0.4.0"
-      sources."is-my-json-valid-2.15.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."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" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."extsprintf-1.0.2"
+      sources."json-schema-0.2.3"
+      sources."verror-1.3.6"
+      sources."asn1-0.2.3"
+      (sources."dashdash-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      (sources."getpass-0.1.6" // {
+        dependencies = [
+          sources."assert-plus-1.0.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.1"
+      sources."mime-db-1.26.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."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>";
+      homepage = "https://github.com/yarnpkg/yarn#readme";
+      license = "BSD-2-Clause";
+    };
+    production = true;
+  };
+  yo = nodeEnv.buildNodePackage {
+    name = "yo";
+    packageName = "yo";
+    version = "1.8.5";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/yo/-/yo-1.8.5.tgz";
+      sha1 = "776ab9ec79a7882f8d4f7a9e10214fdab050d928";
+    };
+    dependencies = [
+      sources."async-1.5.2"
+      sources."chalk-1.1.3"
+      sources."cli-list-0.1.8"
+      sources."configstore-1.4.0"
+      sources."cross-spawn-3.0.1"
+      sources."figures-1.7.0"
+      sources."fullname-2.1.0"
+      sources."got-5.7.1"
+      sources."humanize-string-1.0.1"
+      sources."inquirer-0.11.4"
+      (sources."insight-0.7.0" // {
+        dependencies = [
+          sources."inquirer-0.10.1"
+        ];
+      })
+      sources."lodash-3.10.1"
+      (sources."meow-3.7.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."npm-keyword-4.2.0"
+      sources."opn-3.0.3"
+      (sources."package-json-2.4.0" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."parse-help-0.1.1"
+      sources."read-pkg-up-1.0.1"
+      sources."repeating-2.0.1"
+      sources."root-check-1.0.0"
+      sources."sort-on-1.3.0"
+      sources."string-length-1.0.1"
+      (sources."tabtab-1.3.2" // {
+        dependencies = [
+          sources."inquirer-1.2.3"
+          sources."minimist-1.2.0"
+          sources."cli-width-2.1.0"
+          sources."lodash-4.17.4"
+          sources."mute-stream-0.0.6"
+          sources."run-async-2.3.0"
+        ];
+      })
+      sources."titleize-1.0.0"
+      (sources."update-notifier-0.6.3" // {
+        dependencies = [
+          sources."configstore-2.1.0"
+          sources."dot-prop-3.0.0"
+        ];
+      })
+      sources."user-home-2.0.0"
+      (sources."yeoman-character-1.1.0" // {
+        dependencies = [
+          sources."supports-color-3.2.3"
+        ];
+      })
+      (sources."yeoman-doctor-2.1.0" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      (sources."yeoman-environment-1.6.6" // {
+        dependencies = [
+          sources."inquirer-1.2.3"
+          sources."lodash-4.17.4"
+          sources."cli-width-2.1.0"
+          sources."mute-stream-0.0.6"
+          sources."run-async-2.3.0"
+        ];
+      })
+      sources."yosay-1.2.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-fs-4.1.11"
+      sources."mkdirp-0.5.1"
+      sources."object-assign-4.1.1"
+      sources."os-tmpdir-1.0.2"
+      sources."osenv-0.1.4"
+      sources."uuid-2.0.3"
+      sources."write-file-atomic-1.3.1"
+      sources."xdg-basedir-2.0.0"
+      sources."minimist-0.0.8"
+      sources."os-homedir-1.0.2"
+      sources."imurmurhash-0.1.4"
+      sources."slide-1.1.6"
+      sources."lru-cache-4.0.2"
+      sources."which-1.2.12"
+      sources."pseudomap-1.0.2"
+      sources."yallist-2.0.0"
+      sources."isexe-1.1.2"
+      sources."npmconf-2.1.2"
+      sources."pify-2.3.0"
+      sources."pinkie-promise-2.0.1"
+      sources."config-chain-1.1.11"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.4"
+      sources."nopt-3.0.6"
+      sources."once-1.3.3"
+      sources."semver-4.3.6"
+      sources."uid-number-0.0.5"
+      sources."proto-list-1.2.4"
+      sources."abbrev-1.1.0"
+      sources."wrappy-1.0.2"
+      sources."pinkie-2.0.4"
+      sources."create-error-class-3.0.2"
+      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."parse-json-2.2.0"
+      sources."read-all-stream-3.1.0"
+      sources."readable-stream-2.2.3"
+      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."is-arrayish-0.2.1"
+      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."prepend-http-1.0.4"
+      sources."decamelize-1.2.0"
+      sources."ansi-escapes-1.4.0"
+      sources."cli-cursor-1.0.2"
+      sources."cli-width-1.1.1"
+      sources."readline2-1.0.1"
+      sources."run-async-0.1.0"
+      sources."rx-lite-3.1.2"
+      sources."string-width-1.0.2"
+      sources."through-2.3.8"
+      sources."restore-cursor-1.0.1"
+      sources."exit-hook-1.1.1"
+      sources."onetime-1.1.0"
+      sources."code-point-at-1.1.0"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."mute-stream-0.0.5"
+      sources."number-is-nan-1.0.1"
+      sources."lodash.debounce-3.1.1"
+      sources."os-name-1.0.3"
+      (sources."request-2.79.0" // {
+        dependencies = [
+          sources."uuid-3.0.1"
+        ];
+      })
+      sources."tough-cookie-2.3.2"
+      sources."lodash._getnative-3.9.1"
+      (sources."osx-release-1.1.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      (sources."win-release-1.1.1" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.6.0"
+      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-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."oauth-sign-0.8.2"
+      sources."qs-6.3.1"
+      sources."stringstream-0.0.5"
+      sources."tunnel-agent-0.4.3"
+      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"
@@ -28553,22 +29483,145 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."mime-db-1.26.0"
       sources."punycode-1.4.1"
-      sources."is-utf8-0.2.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."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."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."is-builtin-module-1.0.0"
+      sources."validate-npm-package-license-3.0.1"
+      sources."builtin-modules-1.1.1"
       sources."spdx-correct-1.0.2"
       sources."spdx-expression-parse-1.0.4"
       sources."spdx-license-ids-1.2.2"
+      sources."indent-string-2.1.0"
+      sources."strip-indent-1.0.1"
+      sources."get-stdin-4.0.1"
+      sources."registry-url-3.1.0"
+      (sources."rc-1.1.7" // {
+        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."execall-1.0.0"
+      sources."clone-regexp-1.0.0"
+      sources."is-regexp-1.0.0"
+      sources."is-supported-regexp-flag-1.0.0"
+      sources."find-up-1.1.2"
+      sources."read-pkg-1.1.0"
+      sources."path-exists-2.1.0"
+      sources."load-json-file-1.1.0"
+      sources."path-type-1.1.0"
+      sources."strip-bom-2.0.0"
+      sources."is-utf8-0.2.1"
+      sources."is-finite-1.0.2"
+      sources."downgrade-root-1.2.2"
+      sources."sudo-block-1.2.0"
+      sources."default-uid-1.0.0"
+      sources."is-root-1.0.0"
+      sources."is-docker-1.1.0"
+      sources."arrify-1.0.1"
+      sources."dot-prop-2.4.0"
+      sources."is-obj-1.0.1"
+      sources."debug-2.6.1"
+      sources."npmlog-2.0.4"
+      sources."ms-0.7.2"
+      sources."external-editor-1.1.1"
+      sources."rx-4.1.0"
+      sources."spawn-sync-1.0.15"
+      sources."tmp-0.0.29"
+      sources."concat-stream-1.6.0"
+      sources."os-shim-0.1.3"
+      sources."typedarray-0.0.6"
+      sources."is-promise-2.1.0"
+      sources."ansi-0.3.1"
+      sources."are-we-there-yet-1.1.2"
+      sources."gauge-1.2.7"
+      sources."delegates-1.0.0"
+      sources."has-unicode-2.0.1"
+      sources."lodash.pad-4.5.1"
+      sources."lodash.padend-4.6.1"
+      sources."lodash.padstart-4.6.1"
+      sources."boxen-0.3.1"
+      sources."is-npm-1.0.0"
+      sources."latest-version-2.0.0"
+      (sources."semver-diff-2.1.0" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."filled-array-1.1.0"
+      sources."widest-line-1.0.0"
+      sources."has-flag-1.0.0"
+      (sources."bin-version-check-2.1.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."each-async-1.1.1"
+      sources."log-symbols-1.0.2"
+      sources."object-values-1.0.0"
+      sources."twig-0.8.9"
+      sources."bin-version-1.0.4"
+      (sources."semver-truncate-1.1.2" // {
+        dependencies = [
+          sources."semver-5.3.0"
+        ];
+      })
+      sources."find-versions-1.2.1"
+      sources."array-uniq-1.0.3"
+      sources."semver-regex-1.0.0"
+      sources."set-immediate-shim-1.0.1"
+      sources."walk-2.3.9"
+      sources."minimatch-3.0.3"
+      sources."foreachasync-3.0.0"
+      sources."brace-expansion-1.1.6"
+      sources."balanced-match-0.4.2"
+      sources."concat-map-0.0.1"
+      sources."diff-2.2.3"
+      sources."globby-4.1.0"
+      (sources."grouped-queue-0.3.3" // {
+        dependencies = [
+          sources."lodash-4.17.4"
+        ];
+      })
+      sources."mem-fs-1.1.3"
+      sources."text-table-0.2.0"
+      sources."untildify-2.1.0"
+      sources."array-union-1.0.2"
+      sources."glob-6.0.4"
+      sources."inflight-1.0.6"
+      sources."path-is-absolute-1.0.1"
+      sources."through2-2.0.3"
+      sources."vinyl-1.2.0"
+      sources."vinyl-file-2.0.0"
+      sources."clone-1.0.2"
+      sources."clone-stats-0.0.1"
+      sources."replace-ext-0.0.1"
+      sources."strip-bom-stream-2.0.0"
+      sources."first-chunk-stream-2.0.0"
+      sources."cli-boxes-1.0.0"
+      sources."pad-component-0.0.1"
+      (sources."taketalk-1.0.0" // {
+        dependencies = [
+          sources."minimist-1.2.0"
+        ];
+      })
+      sources."wrap-ansi-2.1.0"
     ];
     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>";
-      homepage = "https://github.com/yarnpkg/yarn#readme";
+      description = "CLI tool for running Yeoman generators";
+      homepage = http://yeoman.io/;
       license = "BSD-2-Clause";
     };
     production = true;
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 5f48cb9b02ef..80e6383a6f47 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -66,4 +66,5 @@
 , "webpack"
 , "wring"
 , "yarn"
+, "yo"
 ]

From 20ffc3cd735503ce92cb27ceead6b0ebabefbec4 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 Feb 2017 20:03:45 +0100
Subject: [PATCH 1297/3449] compress-man-pages: skip compressed manpages

Because of bash 4.4 the semantics GLOBIGNORE changed.
This resulted in already compressed manpages to be compressed twice.
Also be careful about symlinks to fix #21777, e.g. the ledger example.
---
 .../setup-hooks/compress-man-pages.sh         | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh
index f1d9cf3a3696..d10a898d6e46 100644
--- a/pkgs/build-support/setup-hooks/compress-man-pages.sh
+++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh
@@ -3,26 +3,30 @@ fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; f
 compressManPages() {
     local dir="$1"
 
-    if [ ! -d "$dir/share/man" ]; then return; fi
-    echo "gzipping man pages in $dir"
+    if [ -L "$dir"/share ] || [ -L "$dir"/share/man ] || [ ! -d "$dir/share/man" ]
+        then return
+    fi
+    echo "gzipping man pages under $dir/share/man/"
 
-    GLOBIGNORE=.:..:*.gz:*.bz2
-
-    for f in "$dir"/share/man/*/* "$dir"/share/man/*/*/*; do
-        if [ -f "$f" -a ! -L "$f" ]; then
-            if gzip -c -n "$f" > "$f".gz; then
-                rm "$f"
-            else
-                rm "$f".gz
-            fi
+    # Compress all uncompressed manpages.  Don't follow symlinks, etc.
+    find "$dir"/share/man/ -type f -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \
+        | while IFS= read -r -d $'\0' f
+    do
+        if gzip -c -n "$f" > "$f".gz; then
+            rm "$f"
+        else
+            rm "$f".gz
         fi
     done
 
-    for f in "$dir"/share/man/*/* "$dir"/share/man/*/*/*; do
-        if [ -L "$f" -a -f `readlink -f "$f"`.gz ]; then
-            ln -sf `readlink "$f"`.gz "$f".gz && rm "$f"
+    # Point symlinks to compressed manpages.
+    find "$dir"/share/man/ -type l -a '!' -regex '.*\.\(bz2\|gz\)$' -print0 \
+        | while IFS= read -r -d $'\0' f
+    do
+        local target
+        target="$(readlink -f "$f")"
+        if [ -f "$target".gz ]; then
+            ln -sf "$target".gz "$f".gz && rm "$f"
         fi
     done
-
-    unset GLOBIGNORE
 }

From e2e270d1e29bdafbbe7cb04008edf379b7d52179 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 Feb 2017 20:08:26 +0100
Subject: [PATCH 1298/3449] binutils: drop the $dev/bin symlink

Fixes #18839.  I suspect I once added this just because of some
deficiencies in an early development version of the multiple-output
framework in stdenv.
---
 pkgs/development/tools/misc/binutils/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 6ac9f3febc42..5041ef3b3eda 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -81,8 +81,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postFixup = optionalString (cross == null) "ln -s $out/bin $dev/bin"; # tools needed for development
-
   meta = with stdenv.lib; {
     description = "Tools for manipulating binaries (linker, assembler, etc.)";
     longDescription = ''

From b7d15edd9e9766612087a112e762b6abb0387b63 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 20:21:13 +0100
Subject: [PATCH 1299/3449] bump version to 17.10

This will be the Hummingbird release
---
 .version                       | 2 +-
 nixos/modules/misc/version.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.version b/.version
index 6879fa566dd8..6daccccf784d 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-17.03
\ No newline at end of file
+17.10
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index bf20e801f61b..315c33a462c6 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -95,7 +95,7 @@ in
       nixosVersionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
 
       # Note: code names must only increase in alphabetical order.
-      nixosCodeName = "Gorilla";
+      nixosCodeName = "Hummingbird";
     };
 
     # Generate /etc/os-release.  See

From 81de55118d2994a0097c8a93a965c11b6d339cc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 27 Feb 2017 20:09:18 +0100
Subject: [PATCH 1300/3449] eclipse: add aliases for "latest" versions

Add aliases like "eclipse-cpp = eclipse-cpp-46" so that user
configurations can point to "eclipse-cpp" and have it not regularly
break as nixpkgs is updated.
---
 pkgs/applications/editors/eclipse/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index cde3475196f3..d9d731f3835f 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -14,6 +14,8 @@ rec {
 
   ### Eclipse CPP
 
+  eclipse-cpp = eclipse-cpp-46; # always point to latest
+
   eclipse-cpp-46 = buildEclipse {
     name = "eclipse-cpp-4.6.0";
     description = "Eclipse IDE for C/C++ Developers, Neon release";
@@ -50,6 +52,8 @@ rec {
 
   ### Eclipse Modeling
 
+  eclipse-modeling = eclipse-modeling-46; # always point to latest
+
   eclipse-modeling-46 = buildEclipse {
     name = "eclipse-modeling-4.6";
     description = "Eclipse Modeling Tools";
@@ -85,7 +89,7 @@ rec {
 
   ### Eclipse Platform
 
-  eclipse-platform = eclipse-platform-46;
+  eclipse-platform = eclipse-platform-46; # always point to latest
 
   eclipse-platform-46 = buildEclipse {
     name = "eclipse-platform-4.6.2";
@@ -104,6 +108,8 @@ rec {
 
   ### Eclipse Scala SDK
 
+  eclipse-scala-sdk = eclipse-scala-sdk-441; # always point to latest
+
   eclipse-scala-sdk-441 = buildEclipse {
     name = "eclipse-scala-sdk-4.4.1";
     description = "Eclipse IDE for Scala Developers";
@@ -122,6 +128,8 @@ rec {
 
   ### Eclipse SDK
 
+  eclipse-sdk = eclipse-sdk-46; # always point to latest
+
   eclipse-sdk-46 = buildEclipse {
     name = "eclipse-sdk-4.6.2";
     description = "Eclipse Neon 2 Classic";

From 59d1ce1c7a729324e74baa0a7a88737f13d74942 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 Feb 2017 20:33:53 +0100
Subject: [PATCH 1301/3449] xorg.libX11: 1.6.4 -> 1.6.5

It seems like a maintenance release.
---
 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 96f348e92b39..eee912d1b8c3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -669,11 +669,11 @@ let
   }) // {inherit windowswmproto libX11 libXext xextproto ;};
 
   libX11 = (mkDerivation "libX11" {
-    name = "libX11-1.6.4";
+    name = "libX11-1.6.5";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2;
-      sha256 = "0hg46i6h92pmb7xp1cis2j43zq3fkdz89p0yv35w4vm17az4iixp";
+      url = mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2;
+      sha256 = "0pa3cfp6h9rl2vxmkph65250gfqyki0ccqyaan6bl9d25gdr0f2d";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
     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 3247d3e7b155..4aeace9f0c22 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -59,7 +59,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2
+mirror://xorg/individual/lib/libX11-1.6.5.tar.bz2
 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2
 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2

From 172a2bbeaf7b0c6a905bdfbb24b5fd67a1e8cbad Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 27 Feb 2017 20:21:33 +0100
Subject: [PATCH 1302/3449] haskell: ghc710x packages: remove obsolete
 configurations

---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ----
 1 file changed, 4 deletions(-)

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 6263d38a2bbf..45199ab94203 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -187,9 +187,7 @@ self: super: {
   mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
   attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);
   Glob = addBuildDepends super.Glob (with self; [semigroups]);
-  Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]);
   aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale";
-  aeson_0_11_2_0 = disableCabalFlag (addBuildDepend super.aeson_0_11_2_0 self.semigroups) "old-locale";
   bytes = addBuildDepend super.bytes self.doctest;
   case-insensitive = addBuildDepend super.case-insensitive self.semigroups;
   hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
@@ -197,13 +195,11 @@ self: super: {
   intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
-  semigroups_0_18_1 = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
   texmath = addBuildDepend super.texmath self.network-uri;
   yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });
   # cereal must have `fail` in pre-ghc-8.0.x versions
   # also tests require bytestring>=0.10.8.1
   cereal = dontCheck (addBuildDepend super.cereal self.fail);
-  cereal_0_5_2_0 = dontCheck (addBuildDepend super.cereal_0_5_2_0 self.fail);
 
   # Moved out from common as no longer the case for GHC8
   ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; };

From 1aa6d77af4a10cf9f66f2bef0b1ad81a2a9c18b6 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 27 Feb 2017 20:25:19 +0100
Subject: [PATCH 1303/3449] haskell: add semigroups dependency to Quickcheck
 for GHC < 8

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 45199ab94203..c07ce1e6fe8f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -194,6 +194,7 @@ self: super: {
   hslogger = addBuildDepend super.hslogger self.HUnit;
   intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
+  QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
   texmath = addBuildDepend super.texmath self.network-uri;
   yesod-auth-oauth2 = overrideCabal super.yesod-auth-oauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.load-env self.yesod ]; });

From 24c93619e96a24a26d6eefff5595e240a81cb2f1 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 27 Feb 2017 20:26:27 +0100
Subject: [PATCH 1304/3449] haskell: break dependency cycle between QuickCheck
 and semigroups for GHC < 8

The cycle:
QuickCheck -> semigroups
semigroups -> hashable
semigroups -> unordered-containers
unordered-containers -> hashable
unordered-containers -> QuickCheck # test suite only
hashable -> QuickCheck # test suite only
---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

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 c07ce1e6fe8f..26b3daa25bf4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -182,6 +182,10 @@ self: super: {
   # https://github.com/well-typed/hackage-security/issues/158
   hackage-security = dontHaddock (dontCheck super.hackage-security);
 
+  # Breaks a dependency cycle between QuickCheck and semigroups
+  hashable = dontCheck super.hashable;
+  unordered-containers = dontCheck super.unordered-containers;
+
   # GHC versions prior to 8.x require additional build inputs.
   distributive = addBuildDepend super.distributive self.semigroups;
   mono-traversable = addBuildDepend super.mono-traversable self.semigroups;

From 386ddc739cd48dbaf57e806096de0ade1f24469f Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 27 Feb 2017 20:30:57 +0100
Subject: [PATCH 1305/3449] haskell: add semigroups dependency to
 optparse-applicative for GHC < 8

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 26b3daa25bf4..2c1888b5eef6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -198,6 +198,7 @@ self: super: {
   hslogger = addBuildDepend super.hslogger self.HUnit;
   intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
+  optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);
   texmath = addBuildDepend super.texmath self.network-uri;

From 755902b54318b2768971c6ae708c471a176a6b3a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 20:36:13 +0100
Subject: [PATCH 1306/3449] release-notes: add 17.09

---
 .../manual/release-notes/release-notes.xml    |  1 +
 nixos/doc/manual/release-notes/rl-1709.xml    | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 nixos/doc/manual/release-notes/rl-1709.xml

diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 20d3f74f94b4..6065a86f60d8 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,6 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
+<xi:include href="rl-1709.xml" />
 <xi:include href="rl-1703.xml" />
 <xi:include href="rl-1609.xml" />
 <xi:include href="rl-1603.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
new file mode 100644
index 000000000000..11723f2c145c
--- /dev/null
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -0,0 +1,48 @@
+<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.10">
+
+<title>Release 17.09 (“Hummingbird”, 2017/03/??)</title>
+
+<para>In addition to numerous new and upgraded packages, this release
+has the following highlights: </para>
+
+<itemizedlist>
+  <listitem>
+    <para></para>
+  </listitem>
+
+</itemizedlist>
+
+<para>The following new services were added since the last release:</para>
+
+<itemizedlist>
+  <listitem>
+    <para></para>
+  </listitem>
+</itemizedlist>
+
+
+<para>When upgrading from a previous release, please be aware of the
+following incompatible changes:</para>
+
+<itemizedlist>
+  <listitem>
+    <para>
+    </para>
+  </listitem>
+</itemizedlist>
+
+
+<para>Other notable improvements:</para>
+
+<itemizedlist>
+  <listitem>
+    <para>
+    </para>
+  </listitem>
+</itemizedlist>
+
+</section>

From c710a2d477e8d1bb0f6431c275a3c7af65ace7de Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 27 Feb 2017 20:42:36 +0100
Subject: [PATCH 1307/3449] version: it's 17.09 not 17.10

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

diff --git a/.version b/.version
index 6daccccf784d..2fdad9f4058b 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-17.10
+17.09

From e292d166e8e892dd6ca200245ef114e1db1c9807 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 27 Feb 2017 15:28:43 -0500
Subject: [PATCH 1308/3449] fwupd: Fix localstatedir

---
 pkgs/os-specific/linux/firmware/fwupd/default.nix    |  4 +++-
 .../firmware/fwupd/localstatedir-check-perms.patch   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch

diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix
index 4c88e9c68079..5e109f9f46e2 100644
--- a/pkgs/os-specific/linux/firmware/fwupd/default.nix
+++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix
@@ -15,7 +15,8 @@ let version = "0.8.1"; in
           polkit gcab appstream-glib gusb sqlite libarchive libsoup
           docbook2x libxslt libelf libsmbios fwupdate libyaml valgrind
         ];
-      patchPhase = ''
+      patches = [ ./localstatedir-check-perms.patch ];
+      postPatch = ''
         sed -i -e \
           's|/usr/bin/gpgme-config|${gpgme.dev}/bin/gpgme-config|' -e \
           's|/usr/bin/gpg-error-config|${libgpgerror.dev}/bin/gpg-error-config|' \
@@ -27,6 +28,7 @@ let version = "0.8.1"; in
       configureFlags =
         [ "--with-systemdunitdir=$(out)/lib/systemd/system"
           "--with-udevrulesdir=$(out)/lib/udev/rules.d"
+          "--localstatedir=/var"
         ];
       enableParallelBuilding = true;
       meta =
diff --git a/pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch b/pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch
new file mode 100644
index 000000000000..0c1429d4f2e1
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/fwupd/localstatedir-check-perms.patch
@@ -0,0 +1,12 @@
+diff -Naur fwupd-0.8.1-orig/src/Makefile.in fwupd-0.8.1/src/Makefile.in
+--- fwupd-0.8.1-orig/src/Makefile.in	2017-02-24 02:59:23.000000000 -0500
++++ fwupd-0.8.1/src/Makefile.in	2017-02-27 15:06:56.218901891 -0500
+@@ -1639,7 +1639,7 @@
+ 		$(srcdir)/fwupd.gresource.xml
+ 
+ install-data-hook:
+-	if test -w $(DESTDIR)$(prefix)/; then \
++	if test -w $$(dirname $(DESTDIR)$(localstatedir)/); then \
+ 		mkdir -p $(DESTDIR)$(localstatedir)/lib/fwupd; \
+ 		chmod 0755 $(DESTDIR)$(localstatedir)/lib/fwupd; \
+ 		mkdir -p $(DESTDIR)$(localstatedir)/cache/app-info/xmls; \

From fa8afc05c0d1abb5ed81bccfa2b65fb06874e863 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 21 Feb 2017 19:01:03 -0500
Subject: [PATCH 1309/3449] pythonPackages.rootpy: 0.8.3 -> 0.9.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 5862289a2278..48a2a3e4c0b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22807,12 +22807,12 @@ in {
   };
 
   rootpy = buildPythonPackage rec {
-    version = "0.8.3";
+    version = "0.9.0";
     name = "rootpy-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/d5/40/feddb2c9d1cadfe05d1d9aea1a71be093dc700879c9f6af40a10b1330f34/rootpy-0.8.3.tar.gz";
-      sha256 = "14q9bhs2a53598571x8yikj68x2iyl6090wbvdrpbwr238799b0z";
+      url = "mirror://pypi/r/rootpy/${name}.tar.gz";
+      sha256 = "04alx6afiyahhv816f6zpwnm0sx2jxgqpgqcn6kdw0wnpc9625cr";
     };
 
     disabled = isPy3k;

From 7992ce65fc46e7153480ac4211c7f65ae3ba6b37 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Mon, 27 Feb 2017 19:08:34 +0100
Subject: [PATCH 1310/3449] gitlab-runner: 1.10.4 -> 1.11.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 7c8c71b29690..5e46b079aaa1 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "1.10.4";
+  version = "1.11.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 = "0csaacghcdnkrpxiwsg8166nmdpnddf77c619i558vj0wdglq45k";
+    sha256 = "082slksd0fs0gpwi7kzmk2i71y52xccsn2r2j6qxmbzxwhpwli83";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "1lsdp4v92v406qiwr435ym4f3zbc1vq6ipwrp7li640frhr2jqpk";
+    sha256 = "1c0awx4q27bckk4xpnw7357d5422iz971jkrfin17wrya4dshg64";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-ci-multi-runner";
     rev = "v${version}";
-    sha256 = "0r8f1m9f544ikcknvq1500kfjxbikgqlv7wdayfpazvj6s1zlswg";
+    sha256 = "0fvkdiyfp1bf68j3kq721msfhmv8snf968yxgm7d1y6shidghrqb";
   };
 
   buildInputs = [ go-bindata ];

From 9e7ce9010c572fcaa41daf2ed821a01cf4f7335a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 27 Feb 2017 22:36:27 +0100
Subject: [PATCH 1311/3449] lzbench: init at 20170208
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In-memory benchmark of several up-to-date compressors.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
---
 pkgs/tools/compression/lzbench/default.nix | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/compression/lzbench/default.nix

diff --git a/pkgs/tools/compression/lzbench/default.nix b/pkgs/tools/compression/lzbench/default.nix
new file mode 100644
index 000000000000..a38e0a67b282
--- /dev/null
+++ b/pkgs/tools/compression/lzbench/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, glibc }:
+
+stdenv.mkDerivation rec {
+  name = "lzbench-20170208";
+
+  src = fetchFromGitHub {
+    owner = "inikep";
+    repo = "lzbench";
+    rev = "d5e9b58";
+    sha256 = "16xj5fldwl639f0ys5rx54csbfvf35ja34bdl5m068hdn6dr47r5";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.static ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp lzbench $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "In-memory benchmark of open-source LZ77/LZSS/LZMA compressors";
+    license = licenses.free;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b477a9df8320..caf54ebf9e2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2769,6 +2769,8 @@ with pkgs;
 
   lz4 = callPackage ../tools/compression/lz4 { };
 
+  lzbench = callPackage ../tools/compression/lzbench { };
+
   lzop = callPackage ../tools/compression/lzop { };
 
   macchanger = callPackage ../os-specific/linux/macchanger { };

From 40b9506139d00ed0d3536518daeec6bf45084b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 27 Feb 2017 22:37:39 +0100
Subject: [PATCH 1312/3449] megatools: 1.9.97 -> 1.9.98
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
---
 pkgs/tools/networking/megatools/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index b06308acfc49..f948ab8eb616 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pkgconfig, glib, fuse, curl, glib_networking, gsettings_desktop_schemas
-, makeWrapper }:
+, asciidoc, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "megatools-${version}";
-  version = "1.9.97";
+  version = "1.9.98";
 
   src = fetchurl {
     url = "http://megatools.megous.com/builds/${name}.tar.gz";
-    sha256 = "1wssf8f2ndh43sdzcfc644azqa7bjppl3b9s26mz1pjswmpca5ik";
+    sha256 = "0vx1farp0dpg4zwvxdbfdnzjk9qx3sn109p1r1zl3g3xsaj221cv";
   };
 
   buildInputs = [ pkgconfig glib fuse curl makeWrapper
-      gsettings_desktop_schemas ];
+      gsettings_desktop_schemas asciidoc ];
 
   postInstall = ''
     for i in $(find $out/bin/ -type f); do

From 81b43ccd5773445a7e7e590b99b5b760a1401e3b 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 Feb 2017 23:03:16 +0100
Subject: [PATCH 1313/3449] 17.09 release notes: fix typos

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

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 11723f2c145c..b99ce3964616 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -2,9 +2,9 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="sec-release-17.10">
+         xml:id="sec-release-17.09">
 
-<title>Release 17.09 (“Hummingbird”, 2017/03/??)</title>
+<title>Release 17.09 (“Hummingbird”, 2017/09/??)</title>
 
 <para>In addition to numerous new and upgraded packages, this release
 has the following highlights: </para>

From e3d58dae7f83998395259824ef83dedc33e9ab62 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 25 Jan 2017 23:21:33 +0100
Subject: [PATCH 1314/3449] phpfpm service: one service per pool for isolation

---
 .../services/web-servers/phpfpm/default.nix   | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 2471a06a3b07..f1161c9e19ff 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -7,21 +7,21 @@ let
 
   stateDir = "/run/phpfpm";
 
+  poolConfigs = cfg.poolConfigs // mapAttrs mkPool cfg.pools;
+
   mkPool = n: p: ''
-    [${n}]
     listen = ${p.listen}
     ${p.extraConfig}
   '';
 
-  cfgFile = pkgs.writeText "phpfpm.conf" ''
+  fpmCfgFile = pool: poolConfig: pkgs.writeText "phpfpm-${pool}.conf" ''
     [global]
     error_log = syslog
     daemonize = no
     ${cfg.extraConfig}
 
-    ${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)}
-
-    ${concatStringsSep "\n" (mapAttrsToList (n: v: "[${n}]\n${v}") cfg.poolConfigs)}
+    [${pool}]
+    ${poolConfig}
   '';
 
   phpIni = pkgs.runCommand "php.ini" {
@@ -119,18 +119,29 @@ in {
     };
   };
 
-  config = mkIf (cfg.pools != {} || cfg.poolConfigs != {}) {
-
-    systemd.services.phpfpm = {
-      wantedBy = [ "multi-user.target" ];
-      preStart = ''
-        mkdir -p "${stateDir}"
-      '';
-      serviceConfig = {
-        Type = "notify";
-        ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
-        ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
-      };
-    };
+  config = {
+    systemd.services = flip mapAttrs' poolConfigs (pool: poolConfig:
+      nameValuePair "phpfpm-${pool}" {
+        description = "PHP FastCGI Process Manager for pool ${pool}";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        preStart = ''
+          mkdir -p ${stateDir}
+        '';
+        serviceConfig = let
+          cfgFile = fpmCfgFile pool poolConfig;
+        in {
+          PrivateTmp = true;
+          PrivateDevices = true;
+          ProtectSystem = "full";
+          ProtectHome = true;
+          NoNewPrivileges = true;
+          RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
+          Type = "notify";
+          ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}";
+          ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID";
+        };
+      }
+   );
   };
 }

From ec4ead0bfee965be95e596d39d4b076e9fe01267 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 00:00:57 +0100
Subject: [PATCH 1315/3449] phpfpm service: add target and slice

---
 .../services/web-servers/phpfpm/default.nix   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index f1161c9e19ff..488bd3fe0ef1 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.phpfpm;
+  enabled = cfg.poolConfigs != {} || cfg.pools != {};
 
   stateDir = "/run/phpfpm";
 
@@ -119,18 +120,30 @@ in {
     };
   };
 
-  config = {
+  config = mkIf enabled {
+
+    systemd.slices.phpfpm = {
+      description = "PHP FastCGI Process manager pools slice";
+    };
+
+    systemd.targets.phpfpm = {
+      description = "PHP FastCGI Process manager pools target";
+      wantedBy = [ "multi-user.target" ];
+    };
+
     systemd.services = flip mapAttrs' poolConfigs (pool: poolConfig:
       nameValuePair "phpfpm-${pool}" {
-        description = "PHP FastCGI Process Manager for pool ${pool}";
+        description = "PHP FastCGI Process Manager service for pool ${pool}";
         after = [ "network.target" ];
-        wantedBy = [ "multi-user.target" ];
+        wantedBy = [ "phpfpm.target" ];
+        partOf = [ "phpfpm.target" ];
         preStart = ''
           mkdir -p ${stateDir}
         '';
         serviceConfig = let
           cfgFile = fpmCfgFile pool poolConfig;
         in {
+          Slice = "phpfpm.slice";
           PrivateTmp = true;
           PrivateDevices = true;
           ProtectSystem = "full";

From 3f2566689d14f1d7778d55ca807d1dad2f4695d1 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 14 Feb 2017 23:18:44 +0100
Subject: [PATCH 1316/3449] modules: add support for module replacement with
 disabledModules

This is based on a prototype Nicolas B. Pierron worked on during a
discussion we had at FOSDEM.
---
 lib/modules.nix                               | 24 ++++--
 lib/tests/modules.sh                          |  8 ++
 lib/tests/modules/default.nix                 |  1 +
 lib/tests/modules/disable-declare-enable.nix  |  5 ++
 lib/tests/modules/disable-define-enable.nix   |  5 ++
 lib/tests/modules/disable-enable-modules.nix  |  5 ++
 .../manual/development/replace-modules.xml    | 75 +++++++++++++++++++
 .../manual/development/writing-modules.xml    |  1 +
 nixos/doc/manual/release-notes/rl-1703.xml    | 10 +++
 9 files changed, 127 insertions(+), 7 deletions(-)
 create mode 100644 lib/tests/modules/disable-declare-enable.nix
 create mode 100644 lib/tests/modules/disable-define-enable.nix
 create mode 100644 lib/tests/modules/disable-enable-modules.nix
 create mode 100644 nixos/doc/manual/development/replace-modules.xml

diff --git a/lib/modules.nix b/lib/modules.nix
index 4eee41306cd7..de9cfc637ae2 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -20,7 +20,8 @@ rec {
                 , prefix ? []
                 , # This should only be used for special arguments that need to be evaluated
                   # when resolving module structure (like in imports). For everything else,
-                  # there's _module.args.
+                  # there's _module.args. If specialArgs.modulesPath is defined it will be
+                  # used as the base path for disabledModules.
                   specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
@@ -58,10 +59,7 @@ rec {
 
       closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs);
 
-      # Note: the list of modules is reversed to maintain backward
-      # compatibility with the old module system.  Not sure if this is
-      # the most sensible policy.
-      options = mergeModules prefix (reverseList closed);
+      options = mergeModules prefix (filterModules (specialArgs.modulesPath or "") closed);
 
       # Traverse options and extract the option values into the final
       # config set.  At the same time, check whether all option
@@ -87,6 +85,16 @@ rec {
       result = { inherit options config; };
     in result;
 
+
+ # Filter disabled modules. Modules can be disabled allowing
+ # their implementation to be replaced.
+ filterModules = modulesPath: modules:
+   let
+     moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m;
+     disabledKeys = map moduleKey (concatMap (m: m.disabledModules) modules);
+   in
+     filter (m: !(elem m.key disabledKeys)) modules;
+
   /* Close a set of modules under the ‘imports’ relation. */
   closeModules = modules: args:
     let
@@ -111,12 +119,13 @@ rec {
       else {};
     in
     if m ? config || m ? options then
-      let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file" "meta"]; in
+      let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in
       if badAttrs != {} then
         throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'."
       else
         { file = m._file or file;
           key = toString m.key or key;
+          disabledModules = m.disabledModules or [];
           imports = m.imports or [];
           options = m.options or {};
           config = mkMerge [ (m.config or {}) metaSet ];
@@ -124,9 +133,10 @@ rec {
     else
       { file = m._file or file;
         key = toString m.key or key;
+        disabledModules = m.disabledModules or [];
         imports = m.require or [] ++ m.imports or [];
         options = {};
-        config = mkMerge [ (removeAttrs m ["key" "_file" "require" "imports"]) metaSet ];
+        config = mkMerge [ (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]) metaSet ];
       };
 
   applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 8b476a5d3dcc..ba0c67fb7d42 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -99,6 +99,14 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-if-foo-enabl
 checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enable.nix
 checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix
 
+# Check disabledModules with config definitions and option declarations.
+set -- config.enable ./define-enable.nix ./declare-enable.nix
+checkConfigOutput "true" "$@"
+checkConfigOutput "false" "$@" ./disable-define-enable.nix
+checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix
+checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix
+checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix
+
 # Check _module.args.
 set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix
 checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@"
diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix
index 5df7d9751eab..5be3af0ffe81 100644
--- a/lib/tests/modules/default.nix
+++ b/lib/tests/modules/default.nix
@@ -3,5 +3,6 @@
 {
   inherit (lib.evalModules {
     inherit modules;
+    specialArgs.modulesPath = ./.;
   }) config options;
 }
diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix
new file mode 100644
index 000000000000..a373ee7e550e
--- /dev/null
+++ b/lib/tests/modules/disable-declare-enable.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  disabledModules = [ ./declare-enable.nix ];
+}
diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix
new file mode 100644
index 000000000000..0d84a7c3cb6c
--- /dev/null
+++ b/lib/tests/modules/disable-define-enable.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  disabledModules = [ ./define-enable.nix ];
+}
diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix
new file mode 100644
index 000000000000..c325f4e07431
--- /dev/null
+++ b/lib/tests/modules/disable-enable-modules.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  disabledModules = [ "define-enable.nix" "declare-enable.nix" ];
+}
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml
new file mode 100644
index 000000000000..cc0539ec5109
--- /dev/null
+++ b/nixos/doc/manual/development/replace-modules.xml
@@ -0,0 +1,75 @@
+<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-replace-modules">
+
+<title>Replace Modules</title>
+
+<para>Modules that are imported can also be disabled.  The option
+  declarations and config implementation of a disabled module will be
+  ignored, allowing another to take it's place.  This can be used to
+  import a set of modules from another channel while keeping the rest
+  of the system on a stable release.</para>
+<para><literal>disabledModules</literal> is a top level attribute like
+  <literal>imports</literal>, <literal>options</literal> and
+  <literal>config</literal>.  It contains a list of modules that will
+  be disabled. This can either be the full path to the module or a
+  string with the filename relative to the modules path
+  (eg. &lt;nixpkgs/nixos/modules&gt; for nixos).
+  </para>
+
+<para>This example will replace the existing postgresql module with
+  the version defined in the nixos-unstable channel while keeping the
+  rest of the modules and packages from the original nixos channel.
+  This only overrides the module definition, this won't use postgresql
+  from nixos-unstable unless explicitly configured to do so.</para>
+
+<programlisting>
+{ config, lib, pkgs, ... }:
+
+{
+  disabledModules = [ "services/databases/postgresql.nix" ];
+
+  imports =
+    [ # Use postgresql service from nixos-unstable channel.
+      # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable
+      &lt;nixos-unstable/nixos/modules/services/databases/postgresql.nix&gt;
+    ];
+
+  services.postgresql.enable = true;
+}
+</programlisting>
+
+<para>This example shows how to define a custom module as a
+  replacement for an existing module. Importing this module will
+  disable the original module without having to know it's
+  implementation details.</para>
+
+<programlisting>
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.man;
+in
+
+{
+  disabledModules = [ "services/programs/man.nix" ];
+
+  options = {
+    programs.man.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Whether to enable manual pages.";
+    };
+  };
+
+  config = mkIf cfg.enabled {
+    warnings = [ "disabled manpages for production deployments." ];
+  };
+}
+</programlisting>
+
+</section>
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index ef6920160e6d..5bdcad5ceb57 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -179,5 +179,6 @@ in {
 <xi:include href="option-types.xml" />
 <xi:include href="option-def.xml" />
 <xi:include href="meta-attributes.xml" />
+<xi:include href="replace-modules.xml" />
 
 </chapter>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 38693437059b..e9d3a65e3ba0 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -261,6 +261,16 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Modules can now be disabled by using <link
+      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
+      disabledModules</link>, allowing another to take it's place.  This can be
+      used to import a set of modules from another channel while keeping the
+      rest of the system on a stable release.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From 37705ac1b1faa0e613d043da51ad00ea37b85966 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 22 Feb 2017 21:56:19 +0100
Subject: [PATCH 1317/3449] use relative path for module tests

---
 lib/tests/modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix
index 5be3af0ffe81..5b0947104198 100644
--- a/lib/tests/modules/default.nix
+++ b/lib/tests/modules/default.nix
@@ -1,4 +1,4 @@
-{ lib ? import <nixpkgs/lib>, modules ? [] }:
+{ lib ? import ../.., modules ? [] }:
 
 {
   inherit (lib.evalModules {

From d348b80f318388045dc3306a35531b2a7b3b6c4c Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 27 Feb 2017 19:22:37 -0500
Subject: [PATCH 1318/3449] bazel: Log test errors to stderr during checkPhase

Otherwise it's difficult or impossible to retrieve them, particularly
from a hydra build.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 195041f4b28a..65c9480b114f 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -54,8 +54,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = ''
     export TEST_TMPDIR=$(pwd)
-    ./output/bazel test examples/cpp:hello-success_test
-    ./output/bazel test examples/java-native/src/test/java/com/example/myproject:hello
+    ./output/bazel test --test_output=errors examples/cpp:hello-success_test
+    ./output/bazel test --test_output=errors examples/java-native/src/test/java/com/example/myproject:hello
   '';
 
   installPhase = ''

From 9431e49822eca4829c3075d993d77e10df88bf57 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 27 Feb 2017 18:57:26 +0000
Subject: [PATCH 1319/3449] ocamlPackages.ppx_tools: init at 5.0+4.05

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

diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index ddc3dec898dc..5672300ddabe 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -1,17 +1,20 @@
 { stdenv, fetchFromGitHub, ocaml, findlib }:
 
 let param = {
-  "4.02.3" = {
+  "4.02" = {
     version = "5.0+4.02.0";
     sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; };
-  "4.03.0" = {
+  "4.03" = {
     version = "5.0+4.03.0";
     sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg"; };
-  "4.04.0" = {
+  "4.04" = {
     version = "unstable-20161114";
     rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac";
     sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl"; };
-}."${ocaml.version}";
+  "4.05" = {
+    version = "5.0+4.05.0";
+    sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4"; };
+}."${ocaml.meta.branch}";
 in
   stdenv.mkDerivation {
     name = "ocaml${ocaml.version}-ppx_tools-${param.version}";

From 52507b3a9b2f9055594886250994a73871061ca0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 27 Feb 2017 19:11:29 +0000
Subject: [PATCH 1320/3449] ocamlPackages.ocp-build: 1.99.17-beta ->
 1.99.18-beta

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

diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index 503616511e5b..931e6989aa10 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, ncurses, buildOcaml }:
 let
-  version = "1.99.17-beta";
+  version = "1.99.18-beta";
 in
 buildOcaml {
 
@@ -11,7 +11,7 @@ buildOcaml {
     owner = "OCamlPro";
     repo = "ocp-build";
     rev = version;
-    sha256 = "0k1gi5v9as5l8h5illgl5prsd5z1i14y5j2k920ay1a3rv697b02";
+    sha256 = "14vzam8p1d2c5qxljrhsfppd8a3j9lxx8kzxlplwclkr2laar0ss";
   };
 
   buildInputs = [ ocaml ];

From 22404a068fa3ce2ed28b81a38d082a412eb0a91a Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 26 Feb 2017 02:59:20 -0600
Subject: [PATCH 1321/3449] musescore: add darwin-specific package

This is basically a clone of the Homebrew cask version:
https://github.com/caskroom/homebrew-cask/blob/master/Casks/musescore.rb
---
 pkgs/applications/audio/musescore/darwin.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  6 +++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/musescore/darwin.nix

diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix
new file mode 100644
index 000000000000..160e84e10a1a
--- /dev/null
+++ b/pkgs/applications/audio/musescore/darwin.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, undmg }:
+
+let
+  major = "2";
+  minor = "0.3";
+  patch = "1";
+  appName = "MuseScore ${major}";
+in
+
+stdenv.mkDerivation rec {
+  name = "musescore-darwin-${version}";
+  version = "${major}.${minor}.${patch}";
+
+  src = fetchurl {
+    url =  "ftp://ftp.osuosl.org/pub/musescore/releases/MuseScore-${major}.${minor}/MuseScore-${version}.dmg";
+    sha256 = "0a9v2nc7sx2az7xpd9i7b84m7xk9zcydfpis5fj334r5yqds4rm1";
+  };
+
+  buildInputs = [ undmg ];
+  installPhase = ''
+    mkdir -p "$out/Applications/${appName}.app"
+    cp -R . "$out/Applications/${appName}.app"
+    chmod a+x "$out/Applications/${appName}.app/Contents/MacOS/mscore"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Music notation and composition software";
+    homepage = https://musescore.org/;
+    license = licenses.gpl2;
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ yurrriq ];
+    repositories.git = https://github.com/musescore/MuseScore;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e70ebe4cc7f3..f3dc69586dc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14542,7 +14542,11 @@ with pkgs;
       else null;
   };
 
-  musescore = libsForQt55.callPackage ../applications/audio/musescore { };
+  musescore =
+    if stdenv.isDarwin then
+      callPackage ../applications/audio/musescore/darwin.nix { }
+    else
+      libsForQt55.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {

From 0d31a76813532a5a1a1d83b0f92c283206783f00 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Tue, 28 Feb 2017 05:35:52 +0200
Subject: [PATCH 1322/3449] virtualbox: fix build

The issue was caused by upgrading `qt` from `qt56` to `qt57`, which
now requires C++11.

For more info, see https://github.com/NixOS/nixpkgs/issues/23257.
---
 pkgs/applications/virtualization/virtualbox/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 7512ddb6b0f8..14121660fa85 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -66,6 +66,7 @@ in stdenv.mkDerivation {
     set -x
     sed -e 's@MKISOFS --version@MKISOFS -version@' \
         -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
+        -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \
         ${optionalString (!headless) ''
         -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \
         ''} -i configure

From e6541423b6679f6c0b6bc252f2f126953402e2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Feb 2017 09:14:38 +0100
Subject: [PATCH 1323/3449] libuv: disable a problematic test on Darwin

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

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 2a1c82ec639a..fe4ed6e410ec 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
       "getnameinfo_basic" # probably network-dependent
       "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
       "getaddrinfo_fail" "getaddrinfo_fail_sync"
-    ];
+    ]
+      # sometimes: timeout (no output)
+      ++ stdenv.lib.optional stdenv.isDarwin "process_title";
     tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in lib.optionalString doCheck ''
       sed '/${tdRegexp}/d' -i test/test-list.h

From 86b840d8c97ae00497be0c1d9acbc038960b5d81 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 28 Feb 2017 09:32:30 +0100
Subject: [PATCH 1324/3449] perl-Data-FormValidator: 4.81 -> 4.85

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4b58e8d20a73..3689f49c631e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2862,14 +2862,13 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ ModuleBuild ];
   };
 
-  DataFormValidator = buildPerlModule rec {
-    name = "Data-FormValidator-4.81";
+  DataFormValidator = buildPerlPackage rec {
+    name = "Data-FormValidator-4.85";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/M/MA/MARKSTOS/${name}.tar.gz";
-      sha256 = "f844056231b2eeb4068cafbcab1ddf5d46cb348bd5cfb1d234421c09ee8a0de3";
+      url = "mirror://cpan/authors/id/D/DF/DFARRELL/${name}.tar.gz";
+      sha256 = "809f15d05434ff5667c3967e71e86308fcfad8fce1057420bd2714300b2a5870";
     };
-    buildInputs = [ CGI ModuleBuild ];
-    propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes Perl6Junction RegexpCommon ];
+    propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ];
     meta = {
       description = "Validates user input (usually from an HTML form) based on input profile";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];

From 8788bfe762ab30952b67e09be2c001a9c022e1e3 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Tue, 28 Feb 2017 09:27:29 +0000
Subject: [PATCH 1325/3449] haskell-packages: use benchmark over bench

---
 .../haskell-modules/generic-builder.nix            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a22d2c67dfda..42ea03693ecd 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -9,11 +9,11 @@
 , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
 , buildDepends ? [], setupHaskellDepends ? [], libraryHaskellDepends ? [], executableHaskellDepends ? []
 , buildTarget ? ""
-, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchToolDepends ? []
+, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
 , configureFlags ? []
 , description ? ""
 , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
-, doBench ? false
+, withBenchmarkDepends ? false
 , doHoogle ? true
 , editedCabalFile ? null
 , enableLibraryProfiling ? false
@@ -37,9 +37,9 @@
 # TODO Do we care about haddock when cross-compiling?
 , doHaddock ? !isCross && (!stdenv.isDarwin || stdenv.lib.versionAtLeast ghc.version "7.8")
 , passthru ? {}
-, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchPkgconfigDepends ? []
+, pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
-, benchDepends ? [], benchHaskellDepends ? [], benchSystemDepends ? []
+, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? []
 , testTarget ? ""
 , broken ? false
 , preCompileBuildDriver ? "", postCompileBuildDriver ? ""
@@ -141,14 +141,14 @@ let
   isSystemPkg = x: !isHaskellPkg x;
 
   allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++
-                        optionals doCheck testPkgconfigDepends ++ optionals doBench benchPkgconfigDepends;
+                        optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends;
 
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++
                      buildTools ++ libraryToolDepends ++ executableToolDepends ++
                      optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
-                     optionals doBench (benchDepends ++ benchHaskellDepends ++ benchSystemDepends ++ benchToolDepends);
+                     optionals withBenchmarkDepends (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
@@ -344,7 +344,7 @@ stdenv.mkDerivation ({
 // optionalAttrs (preBuild != "")       { inherit preBuild; }
 // optionalAttrs (postBuild != "")      { inherit postBuild; }
 // optionalAttrs (doCheck)              { inherit doCheck; }
-// optionalAttrs (doBench)              { inherit doBench; }
+// optionalAttrs (withBenchmarkDepends) { inherit withBenchmarkDepends; }
 // optionalAttrs (checkPhase != "")     { inherit checkPhase; }
 // optionalAttrs (preCheck != "")       { inherit preCheck; }
 // optionalAttrs (postCheck != "")      { inherit postCheck; }

From 23004ec6dcf49eab66df0c2d3dbaa29cc4e587fa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 28 Feb 2017 17:57:41 +0800
Subject: [PATCH 1326/3449] s3fs: minor cleanups

---
 pkgs/tools/filesystems/s3fs/default.nix | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 051d27321003..fa975790d4a6 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,15 +1,22 @@
-{stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, openssl, libxml2, fuse }:
 
-stdenv.mkDerivation {
-  name = "s3fs-fuse-1.80";
+stdenv.mkDerivation rec {
+  name = "s3fs-fuse-${version}";
+  version = "1.80";
 
-  src = fetchurl {
-    url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.80.tar.gz;
-    sha256 = "0ddx5khlyyrxm4s8is4gqbczmrcivj11hmkk9s893r3kpp4q30yy";
+  src = fetchFromGitHub {
+    owner  = "s3fs-fuse";
+    repo   = "s3fs-fuse";
+    rev    = "v${version}";
+    sha256 = "0yikqpdyjibbb36rj4118lv9nxgp9f5jhydzxijzxrzw29ypvw76";
   };
 
-  preConfigure = "./autogen.sh";
-  buildInputs = [ autoconf automake pkgconfig curl openssl libxml2 fuse ];
+  buildInputs = [ curl openssl libxml2 fuse ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  configureFlags = [
+    "--with-openssl"
+  ];
 
   postInstall = ''
     ln -s $out/bin/s3fs $out/bin/mount.s3fs

From b5c619cbfec8b319f3a412a39241a9302f58ae82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 27 Feb 2017 23:36:26 +0100
Subject: [PATCH 1327/3449] cudatoolkit: 8.0.44 -> 8.0.61

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

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 927a1bcdf0b0..f2176ed26075 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -110,9 +110,9 @@ in {
   };
 
   cudatoolkit8 = common {
-    version = "8.0.44";
-    url = https://developer.nvidia.com/compute/cuda/8.0/prod/local_installers/cuda_8.0.44_linux-run;
-    sha256 = "1w5xmjf40kkis42dqs8dva4xjq7wr5y6vi1m0xlhs6i6cyw4mp34";
+    version = "8.0.61";
+    url = https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run;
+    sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w";
   };
 
 }

From c2d4b14637547efc602d4f135517c236ae596cfc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 28 Feb 2017 00:11:22 +0100
Subject: [PATCH 1328/3449] cudatoolkit: Multiple output improvements

* Add a "lib" output containing (for the moment) only libOpenCL. This
  reduces the closure size of opensubdiv and blender by about 2 GiB.

* Add a "doc" output (about ~200 MiB).

* Remove the "sdk" output since it was worse than useless: all of the
  "sdk" output was also included in "out", so it actually increased
  disk space usage.

* Run patchelf on ELF binaries only.
---
 .../compilers/cudatoolkit/default.nix         | 38 +++++++++++++------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index f2176ed26075..da29d918b05a 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -22,7 +22,7 @@ let
           }
         else throw "cudatoolkit does not support platform ${stdenv.system}";
 
-      outputs = [ "out" "sdk" ];
+      outputs = [ "out" "lib" "doc" ];
 
       buildInputs = [ perl ];
 
@@ -43,24 +43,35 @@ let
       '';
 
       buildPhase = ''
-        find . -type f -executable -exec patchelf \
-          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          '{}' \; || true
-        find . -type f -exec patchelf \
-          --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-          --force-rpath \
-          '{}' \; || true
+        chmod -R u+w .
+        while IFS= read -r -d ''$'\0' i; do
+          if ! isELF "$i"; then continue; fi
+          echo "patching $i..."
+          if [[ ! $i =~ \.so ]]; then
+            patchelf \
+              --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
+          fi
+          if [[ $i =~ libOpenCL ]]; then
+            rpath2=
+          else
+            rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
+          fi
+          patchelf --set-rpath $rpath2 --force-rpath $i
+        done < <(find . -type f -print0)
       '';
 
       installPhase = ''
-        mkdir $out $sdk
+        mkdir $out
         perl ./install-linux.pl --prefix="$out"
-        rm $out/tools/CUDA_Occupancy_Calculator.xls
-        perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+
+        rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
 
         # let's remove the 32-bit libraries, they confuse the lib64->lib mover
         rm -rf $out/lib
 
+        # Remove some cruft.
+        rm $out/bin/uninstall*
+
         # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
         if [ -d "$out"/cuda-samples ]; then
             mv "$out"/cuda-samples "$out"/samples
@@ -73,6 +84,11 @@ let
         mkdir -p $out/nix-support
         echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
 
+        # Move some libraries to the lib output so that programs that
+        # depend on them don't pull in this entire monstrosity.
+        mkdir -p $lib/lib
+        mv -v $out/lib64/libOpenCL* $lib/lib/
+
       '' + lib.optionalString (lib.versionOlder version "8.0") ''
         # Hack to fix building against recent Glibc/GCC.
         echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook

From bcdbd637fc76d5dab28820900d2ff85b21c95f7e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 28 Feb 2017 12:05:24 +0100
Subject: [PATCH 1329/3449] tinycc: 0.9.27pre-20170108 -> 20170220

tinycc has been relicensed to MIT.
---
 pkgs/development/compilers/tinycc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index d9f33bcc6b21..a8b1ac02673d 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 let
-  date = "20170108";
+  date = "20170220";
   version = "0.9.27pre-${date}";
-  rev = "5420bb8a67f5f782ac49c90afb7da178a60c448a";
-  sha256 = "0gf1ys4vv5qfkh6462fkdv44mz5chhrchlvgcl0m44f8mm8cjwa3";
+  rev = "e209b7dac463e228525499153103ec28173ca365";
+  sha256 = "1p8h999aqgy5rlkk47vc86c5lx8280761712nwkcgvydvixd0gd6";
 in
 
 stdenv.mkDerivation rec {
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.tinycc.org/;
-    license = licenses.lgpl2Plus;
+    license = licenses.mit;
 
     platforms = platforms.unix;
     maintainers = [ maintainers.joachifm ];

From ea0796129485751a9d6d7700b74a9c249786d4fc Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Tue, 28 Feb 2017 05:52:25 -0600
Subject: [PATCH 1330/3449] gitflow: tweak for darwin

On Darwin, wrap the git-flow binary and set:

    FLAGS_GETOPT_CMD=${getopt}/bin/getopt

Without this change, I was getting the following error:

    flags:ERROR short flag required for (showcommands) on this platform
---
 .../git-and-tools/gitflow/default.nix                 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 3d411a183245..a6ac19583858 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub }:
+{ pkgs, stdenv, fetchFromGitHub }:
+
+with pkgs.lib;
 
 stdenv.mkDerivation rec {
   pname = "gitflow";
@@ -12,10 +14,17 @@ stdenv.mkDerivation rec {
     sha256 = "1i8bwi83qcqvi8zrkjn4mp2v8v7y11fd520wpg2jgy5hqyz34chg";
   };
 
+  buildInputs = optionals (stdenv.isDarwin) [ pkgs.makeWrapper ];
+
   preBuild = ''
     makeFlagsArray+=(prefix="$out")
   '';
 
+  postInstall = optional (stdenv.isDarwin) ''
+    wrapProgram $out/bin/git-flow \
+      --set FLAGS_GETOPT_CMD ${pkgs.getopt}/bin/getopt
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/petervanderdoes/gitflow;
     description = "Extend git with the Gitflow branching model";

From 3c16812acf590de365d880b4f4b05424957e9d30 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 28 Feb 2017 12:46:07 +0100
Subject: [PATCH 1331/3449] micropolis: fix build (patch changed)

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

diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix
index 57103bb9101f..5c91911acaf5 100644
--- a/pkgs/games/micropolis/default.nix
+++ b/pkgs/games/micropolis/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   patches =
     [ (fetchurl {
         url = http://rmdir.de/~michael/micropolis_git.patch;
-        sha256 = "0sjl61av7lab3a5vif1jpyicmdb2igvqq6nwaw0s3agg6dh69v1d";
+        sha256 = "10j0svcs576ip7v5mn99gvqx9ki8jfd5w5yvsxj57xh56dd0by2p";
       })
     ];
 

From b31a63d2e50ab96ad5f063568a292e2b44a162d6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 05:59:45 -0600
Subject: [PATCH 1332/3449] pinentry_qt5: build with C++11 for Qt 5.7

---
 pkgs/tools/security/pinentry/qt5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/pinentry/qt5.nix b/pkgs/tools/security/pinentry/qt5.nix
index 18648633a097..375187a51463 100644
--- a/pkgs/tools/security/pinentry/qt5.nix
+++ b/pkgs/tools/security/pinentry/qt5.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     (mkEnable true "pinentry-qt")
   ];
 
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   meta = {

From 2cfa9c6af2c5f3719f4dc64e30cda750a47d86c8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 28 Feb 2017 12:38:43 +0100
Subject: [PATCH 1333/3449] ranger: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 9b7aeddc2ffb..1371646be273 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, w3m, file, less }:
 
 pythonPackages.buildPythonApplication rec {
-  name = "ranger-1.8.0";
+  name = "ranger-1.8.1";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
 
   src = fetchurl {
     url = "http://ranger.nongnu.org/${name}.tar.gz";
-    sha256 = "14j067n1azk6vc6cxlhi5w5bsn2wcz4hypvgxc0vjl9xp5n4f0nf";
+    sha256 = "1d11qw0mr9aj22a7nhr6p2c3yzf359xbffmjsjblq44bjpwzjcql";
   };
 
   checkInputs = with pythonPackages; [ pytest ];

From a0b0dd2a3255a69b0208fd8453db99754534d080 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 06:01:12 -0600
Subject: [PATCH 1334/3449] modemmanager-qt: mark broken on Qt 5.5

---
 .../development/libraries/kde-frameworks/modemmanager-qt.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index b4d05678dc2f..ea2e112ff678 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "modemmanager-qt";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ modemmanager ];

From e7b2300a0c88edd981e44c7a1c4257970702b365 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 06:01:52 -0600
Subject: [PATCH 1335/3449] threadweaver: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/threadweaver.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index bf36a21e9ec6..4df3ff510cb9 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "threadweaver";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

From 0cb62ab661e19831a427a27446519749160cc76c Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 28 Feb 2017 12:02:41 +0100
Subject: [PATCH 1336/3449] matrix-synapse: 0.19.1 -> 0.19.2

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 587ec52c421b..863f7afd159f 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.1";
+  version = "0.19.2";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1jjfa3vigghnk201zkhp97mh25cx17gic0cjn0fgn7yxs83wrh5c";
+    sha256 = "03gnz7rb7yncykqy0irl1y5lhk1cs0b4snpas8s1c9r0vsw1bmhr";
   };
 
   patches = [ ./matrix-synapse.patch ];

From 6d9a3f0dcd191e9dfda169b12d9549bfea79385a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Tue, 28 Feb 2017 13:11:21 +0100
Subject: [PATCH 1337/3449] screen: 4.5.0 -> 4.5.1 for CVE-2017-5618

See https://lists.gnu.org/archive/html/info-gnu/2017-02/msg00010.html
for release announcement
---
 pkgs/tools/misc/screen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 27e0270952ec..7af602106ff3 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "screen-${version}";
-  version = "4.5.0";
+  version = "4.5.1";
 
   src = fetchurl {
     url = "mirror://gnu/screen/${name}.tar.gz";
-    sha256 = "1c7grw03a9iwvqbxfd6hmjb681rp8gb55zsxm7b3apqqcb1sghq1";
+    sha256 = "0bbv16gpxrh64sn4bvjy3qjy7jsxjlqlilyysin02fwnvla23nwp";
   };
 
   configureFlags= [

From ac9c40643c863abc7081a15182ed14eb5accfc24 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 28 Feb 2017 14:05:44 +0800
Subject: [PATCH 1338/3449] emem: 0.2.28 -> 0.2.29

---
 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 00da9bfa5c1e..77549ce4df40 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.28";
+  version = "0.2.29";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1hapvvkkwnvg32awx4nj84s2ascpci6x02wf4rckyd1ykbxp2b8m";
+    sha256 = "1282m4qwdn6phg5x71l470vs1kld8lfhv5k8yvhp9i7frm29b6w7";
   };
 
   buildInputs = [ ];

From 4f981cb3f4a0e7c850e40cffc29b597abb1d2fb5 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 15 Feb 2017 21:15:45 +0100
Subject: [PATCH 1339/3449] gnome-22: drop bijiben due to dependency on
 webkitgtk24x

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

diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.22/default.nix
index 21e1ecc7a049..c6b2f1a76f50 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/default.nix
@@ -31,7 +31,7 @@ let
     gucharmap nautilus totem vino yelp gnome-bluetooth
     gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
     gnome-system-log gnome-system-monitor
-    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
+    gnome_terminal gnome-user-docs evolution file-roller gedit
     gnome-clocks gnome-music gnome-tweak-tool gnome-photos
     nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
     gnome-maps gnome-characters gnome-calendar accerciser gnome-nettool

From 3adee0aac90dfce9bef8397b499feebfdd35e25d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 28 Feb 2017 14:17:44 +0100
Subject: [PATCH 1340/3449] octave: 4.2.0 -> 4.2.1

See glists.gnu.org/archive/html/info-gnu/2017-02/msg00011.html for
release announcements.
---
 pkgs/development/interpreters/octave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 904ad97648e0..1c8644b18899 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -18,11 +18,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "4.2.0";
+  version = "4.2.1";
   name = "octave-${version}";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.gz";
-    sha256 = "0rsmg5i3b5yfvkvrl9mqvn3f2n1a6vqg45phpja1qlzkh8vsffs4";
+    sha256 = "0frk0nk3aaic8hj3g45h11rnz3arp7pjsq0frbx50sspk1iqzhl0";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull

From 3acf24e67ec030f2687af9d91fb24141a6bbb541 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:35:52 -0600
Subject: [PATCH 1341/3449] networkmanager-qt: mark broken on Qt 5.5

---
 .../libraries/kde-frameworks/networkmanager-qt.nix           | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 9d765eac95cc..80085bb2072d 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "networkmanager-qt";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ networkmanager ];

From e5283531c4b1a0baacf2178b408c774d8ea48536 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:36:54 -0600
Subject: [PATCH 1342/3449] kdnssd: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kdnssd.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index ad86b660c747..18a435139f6f 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "kdnssd";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ avahi ];
   buildInputs = [ qtbase ];

From 5f372535cda5d6fe1820b32aa9854184c5e3760d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:37:22 -0600
Subject: [PATCH 1343/3449] kidletime: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kidletime.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 758260517e7d..bfec344ca112 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -6,7 +6,10 @@
 
 kdeFramework {
   name = "kidletime";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase qtx11extras ];
 }

From fca36b617d2d62336735a6a9692f88513eaff826 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:38:57 -0600
Subject: [PATCH 1344/3449] ipe: build with C++11 for Qt 5.7

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

diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index c1c1861cd3d9..4a99d0ea4a17 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
     sed -i -e 's/install -s/install/' common.mak || die
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ]; # build with Qt 5.7
+
   IPEPREFIX="$$out";
   URWFONTDIR="${texlive}/texmf-dist/fonts/type1/urw/";
   LUA_PACKAGE = "lua";

From 256c4003e4803eafb7bfe692eca59091b9be2f8b Mon Sep 17 00:00:00 2001
From: Robbin C <robbinch33@gmail.com>
Date: Tue, 28 Feb 2017 21:39:34 +0800
Subject: [PATCH 1345/3449] haskellPackages.tinc: 20161119 -> 20170228

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

diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix
index c35002c33110..9c4b1f631488 100644
--- a/pkgs/development/tools/haskell/tinc/default.nix
+++ b/pkgs/development/tools/haskell/tinc/default.nix
@@ -7,12 +7,12 @@
 }:
 mkDerivation {
   pname = "tinc";
-  version = "20161119";
+  version = "20170228";
   src = fetchFromGitHub {
     owner = "sol";
     repo = "tinc";
-    rev = "8e31ed920ad1660b3bc458b4f6b281bacaf4bd14";
-    sha256 = "0y9pvr20p9z4dddbfxgy9hl3ny7pxixxjg8ij7g8l14br6mcak30";
+    rev = "e829926a043a68a8a4dc551485c4d666837474af";
+    sha256 = "1zdp1mqp3jn2faw0d3jlcbrkp4azgl5ahhq5pxdn24gyq70zkchc";
   };
   isLibrary = false;
   isExecutable = true;

From e77114e72bc90e0d86ddd5b38bd0d723f9aba4aa Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:40:01 -0600
Subject: [PATCH 1346/3449] kitemmodels: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kitemmodels.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index d6538e57698c..e2f0633da8c5 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kitemmodels";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

From 29d0bf7434ba3faa49ef97b6959485a096704a5c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:40:40 -0600
Subject: [PATCH 1347/3449] kplotting: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kplotting.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index 3fa8283d06c4..e132a45976f5 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kplotting";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

From 34df5c5684f87284ccf4ba16ad558d0721da515d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:41:16 -0600
Subject: [PATCH 1348/3449] bluez-qt: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/bluez-qt.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 93c945b58ca4..261d9471a771 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -1,11 +1,14 @@
 { kdeFramework, lib
 , extra-cmake-modules
-, qtdeclarative
+, qtbase, qtdeclarative
 }:
 
 kdeFramework {
   name = "bluez-qt";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtdeclarative ];
   preConfigure = ''

From 616e5c1953727c4f91c947b44bbbed3694fa0e3c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 14:40:04 +0100
Subject: [PATCH 1349/3449] linuxPackages.sch_cake: only supported in linux >=
 4.4

cc #23253
---
 pkgs/os-specific/linux/sch_cake/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix
index f459e5bf0b89..390d6ee47039 100644
--- a/pkgs/os-specific/linux/sch_cake/default.nix
+++ b/pkgs/os-specific/linux/sch_cake/default.nix
@@ -1,5 +1,7 @@
 { stdenv, lib, fetchFromGitHub, kernel }:
 
+assert stdenv.lib.versionAtLeast kernel.version "4.4";
+
 stdenv.mkDerivation {
   name = "sch_cake-2017-01-28";
 

From d733d36cc647c2b3b47cf6d1b0dc63370361178c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 14:43:33 +0100
Subject: [PATCH 1350/3449] linuxPackages.jool: only supported on linux < 4.10

cc #23253
---
 pkgs/os-specific/linux/jool/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
index 79094ebb3e38..260bf412062a 100644
--- a/pkgs/os-specific/linux/jool/default.nix
+++ b/pkgs/os-specific/linux/jool/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchzip, kernel }:
 
+assert stdenv.lib.versionOlder kernel.version "4.10";
+
 let
   sourceAttrs = (import ./source.nix) { inherit fetchzip; };
 in

From 78b6a1ad141df4b92b9a9aa226ccfc573b7ce6fc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:41:58 -0600
Subject: [PATCH 1351/3449] kwayland: mark broken on Qt 5.5

---
 .../libraries/kde-frameworks/kwayland.nix     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index b5255022a86d..d34687def3e9 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,15 +1,16 @@
-{ kdeFramework
-, extra-cmake-modules
-, qtbase, wayland
+{
+  kdeFramework, lib,
+  extra-cmake-modules,
+  qtbase, wayland
 }:
 
 kdeFramework {
   name = "kwayland";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
-  propagatedBuildInputs = [
-    wayland
-  ];
+  propagatedBuildInputs = [ wayland ];
 }

From e1bd5c96ea501aa837aa0e8b21a3eac3c13f9655 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:42:31 -0600
Subject: [PATCH 1352/3449] syntax-highlighting: mark broken on Qt 5.5

---
 .../libraries/kde-frameworks/syntax-highlighting.nix         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index 155e9fb8961b..f199321e6746 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "syntax-highlighting";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules perl qttools ];
   buildInputs = [ qtbase ];
 }

From 6ddaa3f7461c914dcccb66749a909083ed87f251 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:43:04 -0600
Subject: [PATCH 1353/3449] solid: mark broken on Qt 5.5

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

diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index 330b64035a12..d32acf598ebc 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -1,12 +1,15 @@
 {
   kdeFramework, lib,
   bison, extra-cmake-modules, flex,
-  qtdeclarative, qttools
+  qtbase, qtdeclarative, qttools
 }:
 
 kdeFramework {
   name = "solid";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ bison extra-cmake-modules flex qttools ];
   propagatedBuildInputs = [ qtdeclarative ];
 }

From be580f91d8a3395d0baa8c2603cad572894e57ba Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:43:32 -0600
Subject: [PATCH 1354/3449] kcodecs: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kcodecs.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index 482c30b7b57e..fa1679519cc1 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "kcodecs";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

From ffa8be8a0a66e7a721d1b1b9b2bd7b94e34f2512 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:44:16 -0600
Subject: [PATCH 1355/3449] kguiaddons: mark broken on Qt 5.5

---
 .../libraries/kde-frameworks/kguiaddons.nix          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 6ebfd1104f70..f93aa0967f67 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -1,11 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
+{
+  kdeFramework, lib,
+  extra-cmake-modules,
+  qtbase, qtx11extras,
 }:
 
 kdeFramework {
   name = "kguiaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtx11extras ];
 }

From c1630b533770dd7c499aecb742239f13ad34699a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:44:43 -0600
Subject: [PATCH 1356/3449] kdbusaddons: mark broken on Qt 5.5

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

diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index bc5aeff556d8..2bbbf65f898e 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -1,8 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, qttools, qtx11extras }:
+{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
 
 kdeFramework {
   name = "kdbusaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtx11extras ];
 }

From 420884558334bf3b0826d3178b8c3b9ae94ffad8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:45:09 -0600
Subject: [PATCH 1357/3449] kitemviews: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kitemviews.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index f114c007038b..df420f8f4b99 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kitemviews";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

From eb340b5753b2d3820f52f6a2e23b96bbec6f1685 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:46:08 -0600
Subject: [PATCH 1358/3449] ki18n: mark broken on Qt 5.5

---
 .../libraries/kde-frameworks/ki18n.nix          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 2698a97fd33f..68f29c8314f3 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -1,15 +1,16 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, gettext
-, python
-, qtdeclarative
-, qtscript
+{
+  kdeFramework, lib,
+  extra-cmake-modules, gettext, python,
+  qtbase, qtdeclarative, qtscript,
 }:
 
 kdeFramework {
   name = "ki18n";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtdeclarative qtscript ];
   propagatedNativeBuildInputs = [ gettext python ];
+  propagatedBuildInputs = [ qtdeclarative qtscript ];
 }

From 49f554aae005f825eda28890e78120ffbab78fe7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:46:35 -0600
Subject: [PATCH 1359/3449] kcoreaddons: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index f5d04a30b1ae..4d35c0bbdea1 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "kcoreaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
   propagatedBuildInputs = [ shared_mime_info ];

From b682464f4e0eba3111f2b5fe0ea14a3d4923ce5d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:47:07 -0600
Subject: [PATCH 1360/3449] kwidgetsaddons: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index c5c0063c4634..ce16e280faa7 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -4,7 +4,10 @@
 
 kdeFramework {
   name = "kwidgetsaddons";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

From 9cd0754191fb91024b91e19fabefc02004437fd8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:47:29 -0600
Subject: [PATCH 1361/3449] karchive: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/karchive.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index ca3321bef849..71561b1109c8 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "karchive";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

From a8cc6d909b4e571fe8a5ea2e036ee9d86e8165d4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:47:53 -0600
Subject: [PATCH 1362/3449] kconfig: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/kconfig.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index 981256e75bf6..f6d38cd23363 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "kconfig";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ qtbase ];
 }

From a821be7a0646adbb5c14dc94b0ace74992cad8f6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:48:14 -0600
Subject: [PATCH 1363/3449] sonnet: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/sonnet.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 190f2bae1b82..ae3e72e2a46a 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -5,7 +5,10 @@
 
 kdeFramework {
   name = "sonnet";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ hunspell qtbase ];
 }

From a7d3a084b901bf8128da7e8b196c581827aef26b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:48:43 -0600
Subject: [PATCH 1364/3449] attica: mark broken on Qt 5.5

---
 pkgs/development/libraries/kde-frameworks/attica.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index 6533a05b1602..6c120c20d3ac 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -2,7 +2,10 @@
 
 kdeFramework {
   name = "attica";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
 }

From cff0e06ed70be6115a98551234e80f2516f20aa1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 07:49:25 -0600
Subject: [PATCH 1365/3449] kwindowsystem: mark broken on Qt 5.5

---
 .../libraries/kde-frameworks/kwindowsystem.nix       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
index e55c4021b9ed..4bfd813ff932 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix
@@ -1,11 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qttools, qtx11extras
+{
+  kdeFramework, lib,
+  extra-cmake-modules,
+  qtbase, qttools, qtx11extras
 }:
 
 kdeFramework {
   name = "kwindowsystem";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+    broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
+  };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
   propagatedBuildInputs = [ qtx11extras ];
 }

From 6784a4429620e6a7581e09abb5da010bff23678a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 28 Feb 2017 15:12:45 +0100
Subject: [PATCH 1366/3449] clearsilver: fix build

fixes CVE-2011-4357
cc @grahamc, @fpletz, @domenkozar, @rbvermaa
---
 .../libraries/clearsilver/builder.sh          |  9 -------
 .../libraries/clearsilver/default.nix         | 25 ++++++++++++++++---
 2 files changed, 21 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/clearsilver/builder.sh

diff --git a/pkgs/development/libraries/clearsilver/builder.sh b/pkgs/development/libraries/clearsilver/builder.sh
deleted file mode 100644
index 2acff02e1355..000000000000
--- a/pkgs/development/libraries/clearsilver/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-mkdir -p $out/site-packages
-
-export PYTHON_SITE=$out/site-packages
-configureFlags="--with-python=$python/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp"
-
-genericBuild
diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix
index 34a26e9da86b..cd1789a13bbd 100644
--- a/pkgs/development/libraries/clearsilver/default.nix
+++ b/pkgs/development/libraries/clearsilver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchurl, fetchpatch, python }:
 
 stdenv.mkDerivation rec {
   name = "clearsilver-0.10.5";
@@ -8,12 +8,29 @@ stdenv.mkDerivation rec {
     sha256 = "1046m1dpq3nkgxbis2dr2x7hynmy51n64465q78d7pdgvqwa178y";
   };
 
-  builder = ./builder.sh;
+  PYTHON_SITE = "$(out)/site-packages";
 
-  inherit stdenv python;
+  configureFlags = "--with-python=${python}/bin/python --disable-apache --disable-perl --disable-ruby --disable-java --disable-csharp";
 
-  meta = {
+  preInstall = ''
+    mkdir -p $out
+    mkdir -p $out/site-packages
+  '';
+
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/clang-gcc5.patch";
+      sha256 = "0d44v9jx0b6k8nvrhknd958i9rs59kdh73z0lb4f1mzi8if16c38";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/c/clearsilver/0.10.5-1.6/debian/patches/CVE-2011-4357.diff";
+      sha256 = "1lfncavxdqckrz03gv97lcliygbpi9lnih944vmdbn9zw6fwcipi";
+    })
+  ];
+
+  meta = with stdenv.lib; {
     description = "Fast, powerful, and language-neutral HTML template system";
     homepage = http://www.clearsilver.net/;
+    license = licenses.free;
   };
 }

From c4eee0c4f14f8a539515b9e78f1d3eba7addc310 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 28 Feb 2017 15:15:54 +0100
Subject: [PATCH 1367/3449] retroarch.beetle-saturn: set platforms to
 x86_64-linux

cc #23253.

Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
---
 pkgs/misc/emulators/retroarch/cores.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 8d02fbfc9bd3..b7b720af508e 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -99,6 +99,7 @@ in
   }).override {
     buildPhase = "make";
     name = "beetle-saturn";
+    meta.platforms = [ "x86_64-linux" ];
   };
 
   bsnes-mercury = let bname = "bsnes-mercury"; in (mkLibRetroCore rec {

From 044a49febf11ff08fa4bbdee49e110d13ac423cd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Feb 2017 17:15:22 +0300
Subject: [PATCH 1368/3449] cudatoolkit: remove OpenCL library

libOpenCL is provided by ocl-icd with implementation in NVIDIA driver instead.
---
 .../compilers/cudatoolkit/default.nix         | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index da29d918b05a..17965e20d24a 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -22,7 +22,7 @@ let
           }
         else throw "cudatoolkit does not support platform ${stdenv.system}";
 
-      outputs = [ "out" "lib" "doc" ];
+      outputs = [ "out" "doc" ];
 
       buildInputs = [ perl ];
 
@@ -51,11 +51,7 @@ let
             patchelf \
               --set-interpreter "''$(cat $NIX_CC/nix-support/dynamic-linker)" $i
           fi
-          if [[ $i =~ libOpenCL ]]; then
-            rpath2=
-          else
-            rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
-          fi
+          rpath2=$rpath:$lib/lib:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64
           patchelf --set-rpath $rpath2 --force-rpath $i
         done < <(find . -type f -print0)
       '';
@@ -84,18 +80,19 @@ let
         mkdir -p $out/nix-support
         echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook
 
-        # Move some libraries to the lib output so that programs that
-        # depend on them don't pull in this entire monstrosity.
-        mkdir -p $lib/lib
-        mv -v $out/lib64/libOpenCL* $lib/lib/
+        # Remove OpenCL libraries as they are provided by ocl-icd and driver.
+        rm -f $out/lib64/libOpenCL*
 
       '' + lib.optionalString (lib.versionOlder version "8.0") ''
         # Hack to fix building against recent Glibc/GCC.
         echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
       '';
 
-      meta = {
-        license = lib.licenses.unfree;
+      meta = with stdenv.lib; {
+        description = "A compiler for NVIDIA GPUs, math libraries, and tools";
+        homepage = "https://developer.nvidia.com/cuda-toolkit";
+        platforms = platforms.linux;
+        license = licenses.unfree;
       };
     };
 

From d7ecf89580f4b50842f64bdfd86220accbbc0616 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Feb 2017 17:16:01 +0300
Subject: [PATCH 1369/3449] opensubdiv: 3.0.5 -> 3.2.0

Also remove cudatoolkit override as we have cudatoolkit = cudatoolkit8 now.
---
 .../libraries/opensubdiv/default.nix          | 25 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  3 +--
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix
index b253a27a7db3..e91fd0e60ffd 100644
--- a/pkgs/development/libraries/opensubdiv/default.nix
+++ b/pkgs/development/libraries/opensubdiv/default.nix
@@ -1,31 +1,26 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu, mesa_noglu, glew
+{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu
+, mesa_noglu, glew, ocl-icd, python3
 , cudaSupport ? false, cudatoolkit
 }:
 
-stdenv.mkDerivation {
-  name = "opensubdiv-3.0.5";
+stdenv.mkDerivation rec {
+  name = "opensubdiv-${version}";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
-    rev = "v3_0_5";
-    sha256 = "16xv4cw1k75wgd4ddr0sa87wd46ygbn2k2avh9c1mfd405p80d92";
+    rev = "v${lib.replaceChars ["."] ["_"] version}";
+    sha256 = "0wk12n1s8za3sz8d6bmfm3rfjyx20j48gy1xp57dvbnjvlvzqy3w";
   };
 
   outputs = [ "out" "dev" ];
 
-  patches =
-    [ # Fix for building with cudatoolkit 7.
-      (fetchurl {
-        url = "https://github.com/opeca64/OpenSubdiv/commit/c3c258d00feaeffe1123f6077179c155e71febfb.patch";
-        sha256 = "0vazhp35v8vsgnvprkzwvfkbalr0kzcwlin9ygyfb77cz7mwicnf";
-      })
-    ];
-
   buildInputs =
-    [ cmake pkgconfig mesa_glu mesa_noglu
+    [ cmake pkgconfig mesa_glu mesa_noglu ocl-icd python3
       # FIXME: these are not actually needed, but the configure script wants them.
-      glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama
+      glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor
+      xorg.libXinerama xorg.libXi
     ]
     ++ lib.optional cudaSupport cudatoolkit;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e70ebe4cc7f3..90037d302697 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9140,7 +9140,7 @@ with pkgs;
   };
 
   opensubdiv = callPackage ../development/libraries/opensubdiv {
-    cudatoolkit = cudatoolkit8;
+    cmake = cmake_2_8;
   };
 
   openwsman = callPackage ../development/libraries/openwsman {};
@@ -12794,7 +12794,6 @@ with pkgs;
   bleachbit = callPackage ../applications/misc/bleachbit { };
 
   blender = callPackage  ../applications/misc/blender {
-    cudatoolkit = cudatoolkit8;
     python = python35;
   };
 

From 6f3e0717555bff03321a1751b5eed4eb4d3d4465 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Feb 2017 17:20:27 +0300
Subject: [PATCH 1370/3449] rPackages: try to unbreak reverse dependencies of
 cudatoolkit

---
 pkgs/development/r-modules/default.nix | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index ad153a1c382b..adc842cf50b0 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -345,7 +345,7 @@ let
     seqminer = [ pkgs.zlib.dev pkgs.bzip2 ];
     showtext = [ pkgs.zlib pkgs.libpng pkgs.icu pkgs.freetype.dev ];
     simplexreg = [ pkgs.gsl_1 ];
-    SOD = [ pkgs.cudatoolkit ]; # requres CL/cl.h
+    SOD = [ pkgs.opencl-headers ];
     spate = [ pkgs.fftw.dev ];
     sprint = [ pkgs.openmpi ];
     ssanv = [ pkgs.proj ];
@@ -380,6 +380,7 @@ let
     affyio = [ pkgs.zlib.dev ];
     VariantAnnotation = [ pkgs.zlib.dev ];
     snpStats = [ pkgs.zlib.dev ];
+    gputools = [ pkgs.pcre.dev pkgs.lzma.dev pkgs.zlib.dev pkgs.bzip2.dev pkgs.icu.dev ];
   };
 
   packagesWithBuildInputs = {
@@ -392,7 +393,7 @@ let
     RPushbullet = [ pkgs.which ];
     qtpaint = [ pkgs.cmake ];
     qtbase = [ pkgs.cmake pkgs.perl ];
-    gmatrix = [ pkgs.cudatoolkit ];
+    gmatrix = [ pkgs.cudatoolkit pkgs.which ];
     RCurl = [ pkgs.curl.dev ];
     R2SWF = [ pkgs.pkgconfig ];
     rggobi = [ pkgs.pkgconfig ];
@@ -692,6 +693,7 @@ let
   packagesToSkipCheck = [
     "Rmpi" # tries to run MPI processes
     "gmatrix" # requires CUDA runtime
+    "gputools" # requires CUDA runtime
     "sprint" # tries to run MPI processes
     "pbdMPI" # tries to run MPI processes
   ];
@@ -741,6 +743,7 @@ let
     "RefNet" # depends on broken package interactiveDisplayBase
     "pwOmics" # depends on broken package interactiveDisplayBase
     "grasp2db" # depends on broken package interactiveDisplayBase
+    "gputools" # broken build
     "EnsDb_Rnorvegicus_v79" # depends on broken package interactiveDisplayBase
     "EnsDb_Rnorvegicus_v75" # depends on broken package interactiveDisplayBase
     "EnsDb_Mmusculus_v79" # depends on broken package interactiveDisplayBase
@@ -1089,13 +1092,11 @@ let
     "GEWIST" # depends on broken package nlopt
     "ggtree" # broken build
     "gimme" # depends on broken package nlopt
-    "gmatrix" # depends on broken package cudatoolkit
     "gMCP" # build is broken
     "gmum_r" # broken build
     "GPC" # broken build
     "gplm" # depends on broken package nlopt
     "gpuR" # depends on GPU-specific header files
-    "gputools" # depends on broken package cudatoolkit
     "granova" # depends on broken package nlopt
     "graphicalVAR" # depends on broken package nlopt
     "GraphPAC" # broken build
@@ -1435,7 +1436,6 @@ let
     "smacof" # broken build
     "SNAGEE" # build is broken
     "snm" # depends on broken package nlopt
-    "SOD" # depends on broken package cudatoolkit
     "sodium" # broken build
     "soilphysics" # depends on broken package rpanel
     "sortinghat" # broken build
@@ -1595,18 +1595,6 @@ let
       PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas";
     });
 
-    gputools = old.gputools.overrideDerivation (attrs: {
-      patches = [ ./patches/gputools.patch ];
-      CUDA_HOME = "${pkgs.cudatoolkit}";
-    });
-
-    gmatrix = old.gmatrix.overrideDerivation (attrs: {
-      patches = [ ./patches/gmatrix.patch ];
-      CUDA_LIB_PATH = "${pkgs.cudatoolkit}/lib64";
-      R_INC_PATH = "${pkgs.R}/lib/R/include";
-      CUDA_INC_PATH = "${pkgs.cudatoolkit}/include";
-    });
-
     EMCluster = old.EMCluster.overrideDerivation (attrs: {
       patches = [ ./patches/EMCluster.patch ];
     });

From 477b507a4f1dbcc9700c686126c992450b6db6b1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 28 Feb 2017 17:31:05 +0300
Subject: [PATCH 1371/3449] rPackages: remove old cuda-related patches

gputools doesn't build but because of unrelated linking issues.
---
 .../r-modules/patches/gmatrix.patch           | 48 -------------------
 .../r-modules/patches/gputools.patch          | 13 -----
 2 files changed, 61 deletions(-)
 delete mode 100644 pkgs/development/r-modules/patches/gmatrix.patch
 delete mode 100644 pkgs/development/r-modules/patches/gputools.patch

diff --git a/pkgs/development/r-modules/patches/gmatrix.patch b/pkgs/development/r-modules/patches/gmatrix.patch
deleted file mode 100644
index 990debb8a42d..000000000000
--- a/pkgs/development/r-modules/patches/gmatrix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru -x '*~' gmatrix_orig/src/Makefile gmatrix/src/Makefile
---- gmatrix_orig/src/Makefile	2014-08-27 02:42:04.000000000 +0900
-+++ gmatrix/src/Makefile	2014-10-25 15:35:29.797202981 +0900
-@@ -21,6 +21,7 @@
- # to the manual on the gmatrix install instructions)
- CUDA_LIB_PATH ?= /usr/local/cuda/lib64
- R_INC_PATH    ?= /usr/include/R
-+CUDA_INC_PATH ?= /usr/local/cuda/include
- 
- 
- # Nvidia CUDA Compiler
-@@ -49,25 +50,25 @@
- # Build rules
- build: $(OUT_OBJ)
- 	$(R_CC) $(OUT_OBJ) -o $(OUT_SO) $(LIBS) -L$(CUDA_LIB_PATH)
--	
-+
- conversions.o: 
--	$(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS)  -I$(R_INC_PATH)
--	
-+	$(NVCC) -c conversions.cu -o conversions.o $(NVCC_FLAGS)  -I$(R_INC_PATH) -I${CUDA_INC_PATH}
-+
- manipulation.o: 
--	$(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS)  -I$(R_INC_PATH)
-+	$(NVCC) -c manipulation.cu -o manipulation.o $(NVCC_FLAGS)  -I$(R_INC_PATH) -I${CUDA_INC_PATH}
- 
- general.o:
--	$(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH)
-+	$(NVCC) -c general.cu -o general.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
- 
- matrix.o: 
--	$(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH)
-- 	
-+	$(NVCC) -c matrix.cu -o matrix.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
-+
- ops.o: 
--	$(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH)
--	
-+	$(NVCC) -c ops.cu -o ops.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
-+
- dist.o: 
--	$(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH)
-- 	
-+	$(NVCC) -c dist.cu -o dist.o $(NVCC_FLAGS) -I$(R_INC_PATH) -I${CUDA_INC_PATH}
-+
- 
- clean:
- 	-rm -f *.o core
diff --git a/pkgs/development/r-modules/patches/gputools.patch b/pkgs/development/r-modules/patches/gputools.patch
deleted file mode 100644
index 1eb0c8c33cad..000000000000
--- a/pkgs/development/r-modules/patches/gputools.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*~' gputools_orig/src/Makefile gputools/src/Makefile
---- gputools_orig/src/Makefile	2013-05-09 01:43:32.000000000 +0900
-+++ gputools/src/Makefile	2014-10-21 21:41:23.067148490 +0900
-@@ -6,6 +6,9 @@
- 
- R_HOME := $(shell R RHOME)
- 
-+CUDA_INC := $(CUDA_HOME)/include
-+CUDA_LIB := $(CUDA_HOME)/lib
-+
- #compiler/preprocessor options
- INCS := -I. -I"$(CUDA_INC)" -I"$(R_INC)"
- PARAMS := $(DEVICEOPTS) -Xcompiler $(CPICFLAGS)

From af7ccaf8c872fa1325a9aad537fcdafa638ec897 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 28 Feb 2017 15:46:57 +0100
Subject: [PATCH 1372/3449] exfat-nofuse: build only for kernels < 4.10

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

diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index dcdafbcc8f94..394092b8da93 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchFromGitHub, kernel }:
 
+# Upstream build for kernel > 4.10 is currently broken
+# Reference: https://github.com/dorimanx/exfat-nofuse/issues/103
+assert stdenv.lib.versionOlder kernel.version "4.10";
+
 stdenv.mkDerivation rec {
   name = "exfat-nofuse-${version}-${kernel.version}";
   version = "2017-01-03";

From 768fac6c36c50dc2247767d05af9f5c17220da65 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 28 Feb 2017 15:50:10 +0100
Subject: [PATCH 1373/3449] btanks: fix build

---
 pkgs/games/btanks/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix
index 46f5b3d01830..93f341298a83 100644
--- a/pkgs/games/btanks/default.nix
+++ b/pkgs/games/btanks/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, scons, pkgconfig, SDL, mesa, zlib, smpeg, SDL_image, libvorbis, lua5, zip }:
+{ stdenv, fetchurl, fetchpatch, scons, pkgconfig, SDL, mesa, zlib, smpeg
+, SDL_image, libvorbis, expat, zip, lua5_1 }:
 
 stdenv.mkDerivation rec {
   name = "battle-tanks-0.9.8083";
@@ -8,8 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "0ha35kxc8xlbg74wsrbapfgxvcrwy6psjkqi7c6adxs55dmcxliz";
   };
 
-  buildInputs = [ scons pkgconfig SDL mesa zlib smpeg SDL_image libvorbis lua5
-    zip ];
+  nativeBuildInputs = [ scons pkgconfig ];
+  buildInputs = [ SDL mesa zlib smpeg SDL_image libvorbis expat zip lua5_1 ];
+
+  NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL";
+
+  patches = [ (fetchpatch {
+    name = "gcc-4.7.patch";
+    url = "https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/btanks/debian/patches/gcc-4.7.patch?revision=13641&view=co&pathrev=15758";
+    sha256 = "1dxlk1xh69gj10sqcsyckiakb8an3h41206wby4z44mpmvxc7pi4";
+  }) ];
 
   buildPhase = ''
     scons prefix=$out

From e748e18dde43b8560ab0f593287b5848d24c691f Mon Sep 17 00:00:00 2001
From: Felix Richter <makefu@users.noreply.github.com>
Date: Tue, 28 Feb 2017 15:53:50 +0100
Subject: [PATCH 1374/3449] mhddfs: fix-format-security (#23276)

* mhddfs: fix-format-security

* mhddfs: use fputs instead of fprintf
---
 pkgs/tools/filesystems/mhddfs/default.nix            |  4 ++++
 .../mhddfs/fix-format-security-error.patch           | 12 ++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch

diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix
index bfd25247b86a..54a8f8459152 100644
--- a/pkgs/tools/filesystems/mhddfs/default.nix
+++ b/pkgs/tools/filesystems/mhddfs/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ fuse pkgconfig attr uthash ];
 
+  patches = [
+    ./fix-format-security-error.patch
+  ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp mhddfs $out/bin/
diff --git a/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch b/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch
new file mode 100644
index 000000000000..35e58cf0ce9e
--- /dev/null
+++ b/pkgs/tools/filesystems/mhddfs/fix-format-security-error.patch
@@ -0,0 +1,12 @@
+--- mhddfs-0.1.39/src/usage.c.old	2017-02-28 15:00:25.435438622 +0100
++++ mhddfs-0.1.39/src/usage.c	2017-02-28 15:00:33.847454958 +0100
+@@ -43,7 +43,7 @@
+ 		"\n"
+ 		" see fusermount(1) for information about other options\n"
+ 		"";
+-	fprintf(to, usage);
++	fputs(usage, to);
+ 	if (to==stdout) exit(0);
+ 	exit(-1);
+ }
+

From 163db1bbf9d24a23cae5ca828ad8c2a14b85449e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 15:10:26 +0100
Subject: [PATCH 1375/3449] linuxPackages.e1000e: 3.3.1 -> 3.3.5.3

cc #23253
---
 pkgs/os-specific/linux/e1000e/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
index 5406c37522ea..ea17c287a292 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -1,11 +1,14 @@
 { stdenv, fetchurl, kernel }:
 
-stdenv.mkDerivation {
-  name = "e1000e-3.3.1-${kernel.version}";
+assert stdenv.lib.versionOlder kernel.version "4.10";
+
+stdenv.mkDerivation rec {
+  name = "e1000e-${version}-${kernel.version}";
+  version = "3.3.5.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/e1000/e1000e-3.3.1.tar.gz";
-    sha256 = "07hg6xxqgqshnys1qs9wbl9qr7d4ixdkd1y1fj27cg6bn8s2n797";
+    url = "mirror://sourceforge/e1000/e1000e-${version}.tar.gz";
+    sha256 = "1ajz3vdnf1y307k585w95r6jlh4ah8d74bq36gdkjl1z5hgiqi9q";
   };
 
   hardeningDisable = [ "pic" ];

From 40e84506ec18f8469e14fe92cb392236e4ac3775 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 15:16:03 +0100
Subject: [PATCH 1376/3449] linuxPackages.ixgbevf: 3.2.2 -> 4.0.3

cc #23253
---
 pkgs/os-specific/linux/ixgbevf/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix
index 1f8ced6c2d2a..1dbc5c744153 100644
--- a/pkgs/os-specific/linux/ixgbevf/default.nix
+++ b/pkgs/os-specific/linux/ixgbevf/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, kernel, kmod }:
 
+assert stdenv.lib.versionOlder kernel.version "4.10";
+
 stdenv.mkDerivation rec {
   name = "ixgbevf-${version}-${kernel.version}";
-  version = "3.2.2";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/e1000/ixgbevf-${version}.tar.gz";
-    sha256 = "1i6ry3vd77190sxb47xhbz3v30gighwax6prav4ggs3q80a389c8";
+    sha256 = "0f95p2d7yhf57qa6fl8nv1rb4x8vwwgh7qhqcqpag0hz19dc3xff";
   };
 
   hardeningDisable = [ "pic" ];

From e0b04b4c37cbdad66491f5ac018166a6d1e100e2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 15:59:14 +0100
Subject: [PATCH 1377/3449] bzflag: 2.4.2 -> 2.4.8

---
 pkgs/games/bzflag/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index 7015bf557613..d3792843d47c 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -1,19 +1,24 @@
-{ fetchurl, stdenv, curl, SDL, mesa, glew, ncurses }:
+{ stdenv, lib, fetchurl, pkgconfig
+, curl, SDL2, mesa, glew, ncurses, c-ares }:
 
 stdenv.mkDerivation rec {
-  name = "bzflag-2.4.2";
+  name = "${pname}-${version}";
+  pname = "bzflag";
+  version = "2.4.8";
 
   src = fetchurl {
-    url = mirror://sourceforge/bzflag/bzflag-2.4.2.tar.bz2;
-    sha256 = "04f8c83hfwwh4i74gxqqdbgc2r5hn9ayam986py3jjychhicaysg";
+    url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
+    sha256 = "08iiw0i0vx68d73hliiylswsm0nvnm849k37xc7iii6sflblvjj3";
   };
 
-  buildInputs = [ curl SDL mesa glew ncurses ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ curl SDL2 mesa glew ncurses c-ares ];
 
-  meta = {
+  meta = with lib; {
     description = "Multiplayer 3D Tank game";
     homepage = http://bzflag.org/;
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ fpletz ];
   };
 }

From be84f410cd2ac6cc39875f14af5387180f52149b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 28 Feb 2017 16:04:44 +0100
Subject: [PATCH 1378/3449] libcm: remove

umaintained, broken and not used for 10 years
---
 pkgs/development/libraries/libcm/default.nix | 15 ---------------
 pkgs/top-level/all-packages.nix              |  2 --
 2 files changed, 17 deletions(-)
 delete mode 100644 pkgs/development/libraries/libcm/default.nix

diff --git a/pkgs/development/libraries/libcm/default.nix b/pkgs/development/libraries/libcm/default.nix
deleted file mode 100644
index 1d4e96d55b6d..000000000000
--- a/pkgs/development/libraries/libcm/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, pkgconfig, glib, xorg, mesa}:
-
-stdenv.mkDerivation {
-  name = "libcm-0.1.1";
-  src = fetchurl {
-    url = mirror://gnome/sources/libcm/0.1/libcm-0.1.1.tar.bz2;
-    sha256 = "11i5z8l5v5ffihif35k5j8igj0rahsk4jdmsj24xhdw2s0zx53kn";
-  };
-  buildInputs = [
-    pkgconfig glib xorg.xlibsWrapper xorg.libXdamage xorg.libXcomposite
-    xorg.libXtst xorg.inputproto
-    # !!! inputproto should really be propagated by libXtst
-  ];
-  propagatedBuildInputs = [mesa];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90037d302697..97919a701771 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8022,8 +8022,6 @@ with pkgs;
 
   libclxclient = callPackage ../development/libraries/libclxclient  { };
 
-  libcm = callPackage ../development/libraries/libcm { };
-
   libconfuse = callPackage ../development/libraries/libconfuse { };
 
   inherit (gnome3) libcroco;

From 3fc79cb5ac5bce2589f893042212454ab1b09317 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 28 Feb 2017 14:09:33 +0100
Subject: [PATCH 1379/3449] ardour: 5.6 -> 5.8

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

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 90ab110bf198..57864f863e3b 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -16,7 +16,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "5.6";
+  tag = "5.8";
 
 in
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.ardour.org/ardour/ardour.git";
-    rev = "08353095dfee421f299d30d5d91259bc2df7e19d";
-    sha256 = "1fgvjmvdyh61qn8azpmh19ac58ps5sl2dywwshr56v0svakhwwh9";
+    rev = "e5c6f16126e0901654b09ecce990554b1ff73833";
+    sha256 = "1lcvslrcw6g4kp9w0h1jx46x6ilz4nzz0k2yrw4gd545k1rwx0c1";
   };
 
   buildInputs =

From b59fd85dd6ed185b0bc347cbd42dc69301cbf784 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 27 Feb 2017 23:56:26 +0100
Subject: [PATCH 1380/3449] haskell: ghc710x packages: fix gtk2hs-buildtools

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

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 2c1888b5eef6..ee0fcccd6331 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -42,6 +42,8 @@ self: super: {
   # Build jailbreak-cabal with the latest version of Cabal.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_24_2_0; };
 
+  gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; };
+
   Extra = appendPatch super.Extra (pkgs.fetchpatch {
     url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
     sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";

From 1a4ec414a4eb9e0ac5ef219705068ccf4341ddef Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 27 Feb 2017 23:56:55 +0100
Subject: [PATCH 1381/3449] haskell: ghc710x packages: fix megaparsec

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

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 ee0fcccd6331..6a7fe29b80fa 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -44,6 +44,8 @@ self: super: {
 
   gtk2hs-buildtools = super.gtk2hs-buildtools.override { Cabal = self.Cabal_1_24_2_0; };
 
+  megaparsec = addBuildDepend super.megaparsec self.fail;
+
   Extra = appendPatch super.Extra (pkgs.fetchpatch {
     url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
     sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";

From b4ff1ba4a9f959e23d3181c5a7f7fda5b6a4ec09 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 28 Feb 2017 16:28:23 +0100
Subject: [PATCH 1382/3449] exfat-nofuse: exclude 4.1 kernel build

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

diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix
index 394092b8da93..fa2939e947e5 100644
--- a/pkgs/os-specific/linux/exfat/default.nix
+++ b/pkgs/os-specific/linux/exfat/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchFromGitHub, kernel }:
+{ stdenv, lib, fetchFromGitHub, kernel }:
 
 # Upstream build for kernel > 4.10 is currently broken
 # Reference: https://github.com/dorimanx/exfat-nofuse/issues/103
-assert stdenv.lib.versionOlder kernel.version "4.10";
+assert lib.versionOlder kernel.version "4.10";
+
+# Upstream build for kernel 4.1 is broken, 3.12 and below seems to be working
+assert lib.versionAtLeast kernel.version  "4.2" || lib.versionOlder kernel.version "4.0";
 
 stdenv.mkDerivation rec {
   name = "exfat-nofuse-${version}-${kernel.version}";
@@ -28,8 +31,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "exfat kernel module";
     homepage = https://github.com/dorimanx/exfat-nofuse;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ makefu ];
-    platforms = stdenv.lib.platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ makefu ];
+    platforms = lib.platforms.linux;
   };
 }

From 251b9ca0e77963c48d9c198cec964f7a1cd91d4a Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Tue, 28 Feb 2017 09:15:20 -0600
Subject: [PATCH 1383/3449] nginx service: add commonHttpConfig option

---
 .../services/web-servers/nginx/default.nix    | 20 +++++++++
 nixos/tests/nginx.nix                         | 42 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 nixos/tests/nginx.nix

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 6bc7192963d1..548467ae7856 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -87,6 +87,8 @@ let
 
       server_tokens ${if cfg.serverTokens then "on" else "off"};
 
+      ${cfg.commonHttpConfig}
+
       ${vhosts}
 
       ${optionalString cfg.statusPage ''
@@ -275,6 +277,24 @@ in
         '';
       };
 
+      commonHttpConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          resolver 127.0.0.1 valid=5s;
+
+          log_format myformat '$remote_addr - $remote_user [$time_local] '
+                              '"$request" $status $body_bytes_sent '
+                              '"$http_referer" "$http_user_agent"';
+        '';
+        description = ''
+          With nginx you must provide common http context definitions before
+          they are used, e.g. log_format, resolver, etc. inside of server
+          or location contexts. Use this attribute to set these definitions
+          at the appropriate location.
+        '';
+      };
+
       httpConfig = mkOption {
         type = types.lines;
         default = "";
diff --git a/nixos/tests/nginx.nix b/nixos/tests/nginx.nix
new file mode 100644
index 000000000000..c2beb5590ef7
--- /dev/null
+++ b/nixos/tests/nginx.nix
@@ -0,0 +1,42 @@
+# verifies:
+#   1. nginx generates config file with shared http context definitions above
+#      generated virtual hosts config.
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "jenkins";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ mbbx6spp ];
+  };
+
+  nodes = {
+    webserver =
+      { config, pkgs, ... }:
+      { services.nginx.enable = true;
+        services.nginx.commonHttpConfig = ''
+        log_format ceeformat '@cee: {"status":"$status",'
+          '"request_time":$request_time,'
+          '"upstream_response_time":$upstream_response_time,'
+          '"pipe":"$pipe","bytes_sent":$bytes_sent,'
+          '"connection":"$connection",'
+          '"remote_addr":"$remote_addr",'
+          '"host":"$host",'
+          '"timestamp":"$time_iso8601",'
+          '"request":"$request",'
+          '"http_referer":"$http_referer",'
+          '"upstream_addr":"$upstream_addr"}';
+        '';
+        services.nginx.virtualHosts."0.my.test" = {
+          extraConfig = ''
+            access_log syslog:server=unix:/dev/log,facility=user,tag=mytag,severity=info ceeformat;
+          '';
+        };
+      };
+  };
+
+  testScript = ''
+    startAll;
+
+    $webserver->waitForUnit("nginx");
+    $webserver->waitForOpenPort("80");
+  '';
+})

From 479c6c1ef0c79be40722a0b7dee6c6370b1f209c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 28 Feb 2017 16:12:05 +0100
Subject: [PATCH 1384/3449] sysdig: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 343e4e809555..8aef1655a016 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -2,14 +2,14 @@
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
-  version = "0.14.0";
+  version = "0.15.0";
 in
 stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "14wy4p1q8rk3q4s8vczfhkk20z3kz8wvyxpi8qx0xc7px7z5da76";
+    sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2";
   };
 
   buildInputs = [
@@ -18,13 +18,6 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "pic" ];
 
-  patches = [
-  ];
-
-  postPatch = ''
-    sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
-  '';
-
   cmakeFlags = [
     "-DUSE_BUNDLED_DEPS=OFF"
     "-DSYSDIG_VERSION=${version}"

From a9d404c616f4cb879d3b58a094965a3cef660b5f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 27 Feb 2017 16:34:34 +0100
Subject: [PATCH 1385/3449] pythonPackages.libais: init at 0.16

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

diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix
new file mode 100644
index 000000000000..85b5d92e79f4
--- /dev/null
+++ b/pkgs/development/python-modules/libais/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl,
+  six, pytest, pytestrunner, pytestcov, coverage
+}:
+buildPythonPackage rec {
+  name = "libais-${version}";
+  version = "0.16";
+
+  src = fetchurl {
+    url = "mirror://pypi/l/libais/${name}.tar.bz2";
+    sha256 = "14dsh5k32ryszwdn6p45wrqp4ska6cc9qpm6lk5c5d1p4rc7wnhq";
+  };
+
+  # data files missing
+  doCheck = false;
+
+  buildInputs = [ pytest pytestrunner pytestcov coverage ];
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/schwehr/libais;
+    description = "Library for decoding maritime Automatic Identification System messages";
+    license = licenses.asl20;
+    platforms = platforms.linux;  # It currently fails to build on darwin
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8205cb41d2e..9208a2ad8a50 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5678,6 +5678,8 @@ in {
 
   leather = callPackage ../development/python-modules/leather { };
 
+  libais = callPackage ../development/python-modules/libais { };
+
   libtmux = buildPythonPackage rec {
     name = "libtmux-${version}";
     version = "0.6.0";

From ffcc8970901156225ff9ae5ba2bf58f48fbbb7e3 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 28 Feb 2017 16:40:27 +0100
Subject: [PATCH 1386/3449] qt5.qttools: fix path to qhelpgenerator

---
 .../qt-5/5.7/qttools/cmake-paths.patch        | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

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
index fe5bcadbe9a8..e3db17e978c2 100644
--- a/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.7/qttools/cmake-paths.patch
@@ -1,7 +1,6 @@
-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
+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)
@@ -18,11 +17,26 @@ Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake
      _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()
+@@ -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)
  
@@ -38,7 +52,7 @@ Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
      _qt5_LinguistTools_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::lrelease PROPERTIES
-@@ -59,11 +58,10 @@ endif()
+@@ -59,11 +58,10 @@
  if (NOT TARGET Qt5::lupdate)
      add_executable(Qt5::lupdate IMPORTED)
  
@@ -54,7 +68,7 @@ Index: qttools-opensource-src-5.5.1/src/linguist/Qt5LinguistToolsConfig.cmake.in
      _qt5_LinguistTools_check_file_exists(${imported_location})
  
      set_target_properties(Qt5::lupdate PROPERTIES
-@@ -74,11 +72,10 @@ endif()
+@@ -74,11 +72,10 @@
  if (NOT TARGET Qt5::lconvert)
      add_executable(Qt5::lconvert IMPORTED)
  

From 4c04d4e6e29c975d5bae61f5ac8b8d7664a346c1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 28 Feb 2017 16:33:17 +0100
Subject: [PATCH 1387/3449] libclc: 2015-08-07 -> 2017-02-25

---
 pkgs/development/libraries/libclc/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index 289fa20335a0..9c1acf132435 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchFromGitHub, python2, llvm, clang }:
+{ stdenv, fetchFromGitHub, python2, llvm_40, clang }:
 
 stdenv.mkDerivation {
-  name = "libclc-2015-08-07";
+  name = "libclc-2017-02-25";
 
   src = fetchFromGitHub {
     owner = "llvm-mirror";
     repo = "libclc";
-    rev = "f97d9db40718f2e68b3f0b44200760d8e0d50532";
-    sha256 = "10n9qk1dild9yjkjjkzpmp9zid3ysdgvqrad554azcf755frch7g";
+    rev = "17648cd846390e294feafef21c32c7106eac1e24";
+    sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s";
   };
 
-  buildInputs = [ python2 llvm clang ];
+  buildInputs = [ python2 llvm_40 clang ];
 
   postPatch = ''
     sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py

From efd93313337e4ed687a938d18bc298b96e762e16 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 28 Feb 2017 17:11:32 +0100
Subject: [PATCH 1388/3449] libjson-rpc-cpp: 0.6.0 -> 0.7.0, fix build

---
 .../libraries/libjson-rpc-cpp/default.nix     | 36 ++++++++-----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
index ca60f1570bc4..6487e9267bee 100644
--- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix
+++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix
@@ -1,26 +1,21 @@
-{ stdenv
-, fetchgit
-, cmake
-, jsoncpp
-, argtable
-, curl
-, libmicrohttpd
-, doxygen
-, catch
+{ stdenv, fetchFromGitHub, cmake, jsoncpp, argtable, curl, libmicrohttpd
+, doxygen, catch, pkgconfig, git, gcc6
 }:
+
 stdenv.mkDerivation rec {
   name = "libjson-rpc-cpp-${version}";
-  version = "0.6.0";
+  version = "0.7.0";
 
-  src = fetchgit {
-    url = https://github.com/cinemast/libjson-rpc-cpp.git;
-    sha256 = "00fxxisg89zgg1wq047n8r8ws48jx35x3s6bbym4kg7dkxv9vv9f";
-    rev = "c6e3d7195060774bf95afc6df9c9588922076d3e";
+  src = fetchFromGitHub {
+    owner = "cinemast";
+    repo = "libjson-rpc-cpp";
+    sha256 = "07bg4nyvx0yyhy8c4x9i22kwqpx5jlv36dvpabgbb46ayyndhr7a";
+    rev = "v${version}";
   };
 
-  hardeningDisable = [ "format" ];
+  NIX_CFLAGS_COMPILE = "-I${catch}/include/catch";
 
-  patchPhase = ''
+  postPatch = ''
     for f in cmake/FindArgtable.cmake \
              src/stubgenerator/stubgenerator.cpp \
              src/stubgenerator/stubgeneratorfactory.cpp
@@ -38,13 +33,13 @@ stdenv.mkDerivation rec {
     cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install \
              -DCMAKE_BUILD_TYPE=Release
   '';
- 
+
   installPhase = '' 
     mkdir -p $out
 
     function fixRunPath {
       p=$(patchelf --print-rpath $1)
-      q="$p:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
+      q="$p:${stdenv.lib.makeLibraryPath [ gcc6 jsoncpp argtable libmicrohttpd curl ]}:$out/lib"
       patchelf --set-rpath $q $1
     }
 
@@ -54,12 +49,11 @@ stdenv.mkDerivation rec {
     for f in Install/lib/*.so* $(find Install/bin -executable -type f); do
       fixRunPath $f
     done
- 
+
     cp -r Install/* $out
   '';
 
-  dontStrip = true;
-
+  nativeBuildInputs = [ pkgconfig gcc6 ];
   buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 318415b7512f..f790bbf29ed0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -75,6 +75,7 @@ doNotDisplayTwice rec {
   libcap_manpages = libcap.doc; # added 2016-04-29
   libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
   libcap_progs = libcap.out; # added 2016-04-29
+  libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
   libtidy = html-tidy;  # added 2014-12-21
   links = links2; # added 2016-01-31
   lttngTools = lttng-tools;  # added 2014-07-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97919a701771..10c06d2e1735 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8427,7 +8427,7 @@ with pkgs;
 
   libjreen = callPackage ../development/libraries/libjreen { };
 
-  libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
+  libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
 
   libjson_rpc_cpp_0_2_1 = callPackage ../development/libraries/libjson-rpc-cpp/0.2.1 { };
 

From 8ddfbe34bcfc9ab5abe36a53117af9be69423732 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 28 Feb 2017 17:14:28 +0100
Subject: [PATCH 1389/3449] libjson_rpc_cpp_0_2_1: remove

---
 .../libjson-rpc-cpp/0.2.1/default.nix         | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix

diff --git a/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix
deleted file mode 100644
index 5e0a8560110b..000000000000
--- a/pkgs/development/libraries/libjson-rpc-cpp/0.2.1/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, cmake, curl }:
-
-let
-  basename = "libjson-rpc-cpp";
-  version = "0.2.1";
-in
-
-stdenv.mkDerivation {
-  name = "${basename}-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/cinemast/${basename}/archive/${version}.tar.gz";
-    sha256 = "1pc9nn4968qkda8vr4f9dijn2fcldm8i0ymwmql29h4cl5ghdnpw";
-  };
-
-  buildInputs = [ cmake curl ];
-
-  NIX_LDFLAGS = "-lpthread";
-  enableParallelBuilding = true;
-  doCheck = true;
-
-  checkPhase = "LD_LIBRARY_PATH=out/ ctest";
-
-  meta = {
-    description = "C++ framework for json-rpc (json remote procedure call)";
-    homepage = https://github.com/cinemast/libjson-rpc-cpp;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10c06d2e1735..3fd9ecb32b9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8429,8 +8429,6 @@ with pkgs;
 
   libjson-rpc-cpp = callPackage ../development/libraries/libjson-rpc-cpp { };
 
-  libjson_rpc_cpp_0_2_1 = callPackage ../development/libraries/libjson-rpc-cpp/0.2.1 { };
-
   libkate = callPackage ../development/libraries/libkate { };
 
   libksba = callPackage ../development/libraries/libksba { };

From 75707b748ce20c80eb78c4235f96c0bd83ca829a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 28 Feb 2017 17:33:31 +0100
Subject: [PATCH 1390/3449] lincity: fix build

---
 pkgs/games/lincity/default.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index dba488016b99..1c433965c78b 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -1,20 +1,33 @@
-{ stdenv, fetchurl, libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib }:
+{ stdenv, fetchurl, fetchpatch, libX11, libXext, xextproto, libICE, libSM, xproto, libpng12, zlib }:
 
 stdenv.mkDerivation rec {
   name = "lincity-${version}";
-  version = "1.12.1";
+  version = "1.13.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/lincity/${name}.tar.gz";
-    sha256 = "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj";
+    sha256 = "0p81wl7labyfb6rgp0hi42l2akn3n7r2bnxal1wyvjylzw8vsk3v";
   };
 
   buildInputs = [
-    libICE libpng libSM libX11 libXext
+    libICE libpng12 libSM libX11 libXext
     xextproto zlib xproto
   ];
 
-  meta = {
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/extern-inline-functions-777982";
+      sha256 = "06dp3zwk0z5wr5a3xaaj2my75vcjcy98vc22hsag7ggd9jwrkcp0";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.net/data/main/l/lincity/1.13.1-13/debian/patches/clang-ftbfs-757859";
+      sha256 = "098rnywcsyc0m11x4a5m3dza8i0jmfh6pacfgma1vvxpsfkb6ngp";
+    })
+  ];
+
+  meta = with stdenv.lib; {
     description = "City simulation game";
+    license = licenses.gpl2Plus;
+    homepage = "https://sourceforge.net/projects/lincity";
   };
 }

From 17835f14c52acc0ec80e02eb8379ea81b1c58397 Mon Sep 17 00:00:00 2001
From: Itai Zukerman <zukerman@math-hat.com>
Date: Mon, 27 Feb 2017 23:33:48 -0800
Subject: [PATCH 1391/3449] bazel: replace patch with patchShebangs and
 substituteInPlace

---
 .../build-managers/bazel/bin_to_env.patch     | 207 ------------------
 .../tools/build-managers/bazel/default.nix    |  35 ++-
 2 files changed, 28 insertions(+), 214 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/bazel/bin_to_env.patch

diff --git a/pkgs/development/tools/build-managers/bazel/bin_to_env.patch b/pkgs/development/tools/build-managers/bazel/bin_to_env.patch
deleted file mode 100644
index b65bb681f235..000000000000
--- a/pkgs/development/tools/build-managers/bazel/bin_to_env.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff -ur a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java
---- a/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java	2017-02-19 15:37:06.021759347 -0800
-@@ -242,7 +242,7 @@
-   private static Artifact buildCommandLineArtifact(RuleContext ruleContext, String command,
-       String scriptPostFix) {
-     String scriptFileName = ruleContext.getTarget().getName() + scriptPostFix;
--    String scriptFileContents = "#!/bin/bash\n" + command;
-+    String scriptFileContents = "#!/usr/bin/env bash\n" + command;
-     Artifact scriptFileArtifact = FileWriteAction.createFile(
-         ruleContext, scriptFileName, scriptFileContents, /*executable=*/true);
-     return scriptFileArtifact;
-diff -ur a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java	2017-02-19 15:37:06.022759356 -0800
-@@ -73,7 +73,7 @@
-         return new PathFragment("/usr/local/bin/bash");
-       }
-     }
--    return new PathFragment("/bin/bash");
-+    return new PathFragment("bash");
-   }
- 
-   @Override
-diff -ur a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt
---- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt	2017-02-19 15:37:06.022759356 -0800
-@@ -1,4 +1,4 @@
--#!/bin/bash --posix
-+#!/usr/bin/env bash
- # Copyright 2014 The Bazel Authors. All rights reserved.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
-diff -ur a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java
---- a/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/test/java/com/google/devtools/build/lib/shell/CommandTest.java	2017-02-19 15:37:06.022759356 -0800
-@@ -70,7 +70,7 @@
-     }
- 
-     try {
--      new Command(new String[] {"/bin/true", null}).execute();
-+      new Command(new String[] {"/usr/bin/env", "true", null}).execute();
-       fail("Should have thrown NullPointerException");
-     } catch (NullPointerException npe) {
-       // good
-@@ -185,7 +185,7 @@
- 
-   @Test
-   public void testNoStreamingInputForCat() throws Exception {
--    final Command command = new Command(new String[]{"/bin/cat"});
-+    final Command command = new Command(new String[]{"/usr/bin/env", "cat"});
-     ByteArrayInputStream emptyInput = new ByteArrayInputStream(new byte[0]);
-     ByteArrayOutputStream out = new ByteArrayOutputStream();
-     ByteArrayOutputStream err = new ByteArrayOutputStream();
-@@ -198,7 +198,7 @@
- 
-   @Test
-   public void testNoInputForCat() throws Exception {
--    final Command command = new Command(new String[]{"/bin/cat"});
-+    final Command command = new Command(new String[]{"/usr/bin/env", "cat"});
-     CommandResult result = command.execute();
-     assertTrue(result.getTerminationStatus().success());
-     assertThat(new String(result.getStdout(), "UTF-8")).isEmpty();
-@@ -208,7 +208,7 @@
-   @Test
-   public void testProvidedOutputStreamCapturesHelloWorld() throws Exception {
-     String helloWorld = "Hello, world.";
--    final Command command = new Command(new String[]{"/bin/echo", helloWorld});
-+    final Command command = new Command(new String[]{"/usr/bin/env", "echo", helloWorld});
-     ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
-     ByteArrayOutputStream stdErr = new ByteArrayOutputStream();
-     command.execute(Command.NO_INPUT, Command.NO_OBSERVER, stdOut, stdErr);
-@@ -250,7 +250,7 @@
-   public void testAsynchronousWithOutputStreams() throws Exception {
- 
-     final String helloWorld = "Hello, world.";
--    final Command command = new Command(new String[]{"/bin/echo", helloWorld});
-+    final Command command = new Command(new String[]{"/usr/bin/env", "echo", helloWorld});
-     final ByteArrayInputStream emptyInput =
-       new ByteArrayInputStream(new byte[0]);
-     final ByteArrayOutputStream stdOut = new ByteArrayOutputStream();
-@@ -363,12 +363,12 @@
-     for (int exit : new int[] { -1, -2, -3 }) {
-       int expected = 256 + exit;
-       try {
--        String args[] = { "/bin/bash", "-c", "exit " + exit };
-+        String args[] = { "/usr/bin/env", "bash", "-c", "exit " + exit };
-         new Command(args).execute();
-         fail("Should have exited with status " + expected);
-       } catch (BadExitStatusException e) {
-         assertThat(e).hasMessage("Process exited with status " + expected);
--        checkCommandElements(e, "/bin/bash", "-c", "exit " + exit);
-+        checkCommandElements(e, "/usr/bin/env", "bash", "-c", "exit " + exit);
-         TerminationStatus status = e.getResult().getTerminationStatus();
-         assertFalse(status.success());
-         assertTrue(status.exited());
-@@ -471,7 +471,7 @@
-   public void testFlushing() throws Exception {
-     final Command command = new Command(
-         // On darwin, /bin/sh does not support -n for the echo builtin.
--        new String[] {"/bin/bash", "-c", "echo -n Foo; sleep 0.1; echo Bar"});
-+        new String[] {"/usr/bin/env", "bash", "-c", "echo -n Foo; sleep 0.1; echo Bar"});
-     // We run this command, passing in a special output stream
-     // that records when each flush() occurs.
-     // We test that a flush occurs after writing "Foo"
-@@ -541,13 +541,13 @@
-         throw new IOException();
-       }
-     };
--    Command command = new Command(new String[] {"/bin/echo", "foo"});
-+    Command command = new Command(new String[] {"/usr/bin/env", "echo", "foo"});
-     try {
-       command.execute(Command.NO_INPUT, Command.NO_OBSERVER, out, out);
-       fail();
-     } catch (AbnormalTerminationException e) {
-       // Good.
--      checkCommandElements(e, "/bin/echo", "foo");
-+      checkCommandElements(e, "/usr/bin/env", "echo", "foo");
-       assertThat(e).hasMessage("java.io.IOException");
-     }
-   }
-diff -ur a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java
---- a/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java	2017-02-19 16:17:42.973071187 -0800
-@@ -60,7 +60,7 @@
- 
-     // We interrupt after 1 sec, so this gives us plenty of time for the library to notice the
-     // subprocess exit.
--    this.command = new Command(new String[] { "/bin/sleep", "20" });
-+    this.command = new Command(new String[] { "/usr/bin/env", "sleep", "20" });
- 
-     interrupter.start();
-   }
-diff -ur a/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java b/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java
---- a/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/test/java/com/google/devtools/build/lib/shell/LoadTest.java	2017-02-19 15:37:06.022759356 -0800
-@@ -66,7 +66,7 @@
- 
-   @Test
-   public void testLoad() throws Throwable {
--    final Command command = new Command(new String[] {"/bin/cat",
-+    final Command command = new Command(new String[] {"/usr/bin/env", "cat",
-                                         tempFile.getAbsolutePath()});
-     Thread[] threads = new Thread[10];
-     List<Throwable> exceptions = Collections.synchronizedList(new ArrayList<Throwable>());
-diff -ur a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java
---- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java	2017-02-19 15:37:06.022759356 -0800
-@@ -523,7 +523,7 @@
-     @SuppressWarnings("unchecked")
-     List<String> argv = (List<String>) (List<?>) (MutableList) lookup("argv");
-     assertThat(argv).hasSize(3);
--    assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0));
-+    assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0));
-     assertThat(argv.get(1)).isEqualTo("-c");
-     assertThat(argv.get(2)).isEqualTo("I got the World on a string");
-   }
-@@ -558,7 +558,7 @@
-     @SuppressWarnings("unchecked")
-     List<String> argv = (List<String>) (List<?>) (MutableList) lookup("argv");
-     assertThat(argv).hasSize(3);
--    assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0));
-+    assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0));
-     assertThat(argv.get(1)).isEqualTo("-c");
-     assertMatches("argv[2]", "A.*/mytool .*/mytool.sh B.*file3.dat", argv.get(2));
-   }
-@@ -588,7 +588,7 @@
-     @SuppressWarnings("unchecked")
-     List<String> argv = (List<String>) (List<?>) (MutableList) lookup("argv");
-     assertThat(argv).hasSize(2);
--    assertMatches("argv[0]", "^.*/bash" + OsUtils.executableExtension() + "$", argv.get(0));
-+    assertMatches("argv[0]", "^(.*/)?bash" + OsUtils.executableExtension() + "$", argv.get(0));
-     assertMatches("argv[1]", "^.*/resolve_me[.]script[.]sh$", argv.get(1));
-   }
- 
-diff -ur a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
---- a/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java	1980-01-01 00:00:00.000000000 -0800
-+++ b/src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java	2017-02-19 16:27:27.851399769 -0800
-@@ -162,16 +162,16 @@
-   }
- 
-   private static String getFalseCommand() {
--    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/false" : "/bin/false";
-+    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/false" : "false";
-   }
- 
-   private static String getTrueCommand() {
--    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/true" : "/bin/true";
-+    return OS.getCurrent() == OS.DARWIN ? "/usr/bin/true" : "true";
-   }
- 
-   @Test
-   public void testBinEchoPrintsArguments() throws Exception {
--    Spawn spawn = createSpawn("/bin/echo", "Hello,", "world.");
-+    Spawn spawn = createSpawn("/usr/bin/env", "echo", "Hello,", "world.");
-     run(spawn);
-     assertEquals("Hello, world.\n", out());
-     assertThat(err()).isEmpty();
-@@ -179,7 +179,7 @@
- 
-   @Test
-   public void testCommandRunsInWorkingDir() throws Exception {
--    Spawn spawn = createSpawn("/bin/pwd");
-+    Spawn spawn = createSpawn("/usr/bin/env", "pwd");
-     run(spawn);
-     assertEquals(executor.getExecRoot() + "\n", out());
-   }
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 65c9480b114f..25378135d3d9 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, perl }:
+{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils }:
 
 stdenv.mkDerivation rec {
 
@@ -21,19 +21,31 @@ stdenv.mkDerivation rec {
 
   sourceRoot = ".";
 
-  patches = [ ./bin_to_env.patch ];
-
   postPatch = ''
-    patchShebangs ./compile.sh
-    for d in scripts src/java_tools src/test src/tools third_party/ijar/test tools; do
-      patchShebangs $d
+    patchShebangs .
+    for f in \
+      src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \
+      src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \
+      src/test/java/com/google/devtools/build/lib/shell/CommandTest.java \
+      src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java \
+      src/test/java/com/google/devtools/build/lib/shell/LoadTest.java \
+      src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java \
+      src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
+    do
+      substituteInPlace $f \
+        --replace /bin/bash ${bash}/bin/bash \
+        --replace /bin/cat ${coreutils}/bin/cat \
+        --replace /bin/echo ${coreutils}/bin/echo \
+        --replace /bin/false ${coreutils}/bin/false \
+        --replace /bin/pwd ${coreutils}/bin/pwd \
+        --replace /bin/sleep ${coreutils}/bin/sleep \
+        --replace /bin/true ${coreutils}/bin/true
     done
   '';
 
   buildInputs = [
     stdenv.cc
     stdenv.cc.cc.lib
-    bash
     jdk
     zip
     unzip
@@ -41,6 +53,14 @@ stdenv.mkDerivation rec {
     binutils
   ];
 
+  # These must be propagated since the dependency is hidden in a compressed
+  # archive.
+
+  propagatedBuildInputs = [
+    bash
+    coreutils
+  ];
+
   # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
   # detector (see com.google.devtools.build.lib.skyframe.FileFunction).
   # Change this to $(mktemp -d) as soon as we figure out why.
@@ -51,6 +71,7 @@ stdenv.mkDerivation rec {
   '';
 
   # Build the CPP and Java examples to verify that Bazel works.
+
   doCheck = true;
   checkPhase = ''
     export TEST_TMPDIR=$(pwd)

From 6405bbe8671c3a184ce09fc42c468604ec0a5fa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 28 Feb 2017 17:30:26 +0100
Subject: [PATCH 1392/3449] cantata: 1.5.1 -> 2.0.1

---
 pkgs/applications/audio/cantata/default.nix | 18 ++++++++----------
 pkgs/top-level/all-packages.nix             |  3 ++-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 89aadf49fb84..3231e3e53017 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake
+{ stdenv, fetchFromGitHub, cmake, vlc
 , withQt4 ? false, qt4
 , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
 
@@ -34,7 +34,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "1.5.1";
+  version = "2.0.1";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -43,14 +43,15 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    inherit name;
-    url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8";
-    sha256 = "0y7y3nbiqgh1ghb47n4lfyp163wvazvhavlshb1c18ik03fkn5sp";
+  src = fetchFromGitHub {
+    owner = "CDrummond";
+    repo = "cantata";
+    rev = "v${version}";
+    sha256 = "18fiz3cav41dpap42qwj9hwxf2k9fmhyg2r34yggxqi2cjlsil36";
   };
 
   buildInputs =
-    [ cmake ]
+    [ cmake vlc ]
     ++ stdenv.lib.optional withQt4 qt4
     ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
     ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
@@ -64,9 +65,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
 
-  unpackPhase = "tar -xvf $src";
-  sourceRoot = "${name}";
-
   cmakeFlags = stdenv.lib.flatten [
     (fstat withQt5 "QT5")
     (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3fd9ecb32b9b..3799fbd9638a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1101,6 +1101,7 @@ with pkgs;
   davix = callPackage ../tools/networking/davix { };
 
   cantata = libsForQt5.callPackage ../applications/audio/cantata {
+    inherit vlc;
     ffmpeg = ffmpeg_2;
   };
 
@@ -10499,7 +10500,7 @@ with pkgs;
   hbase = callPackage ../servers/hbase {};
 
   hiawatha = callPackage ../servers/http/hiawatha {};
-  
+
   ircdHybrid = callPackage ../servers/irc/ircd-hybrid { };
 
   jboss = callPackage ../servers/http/jboss { };

From ffb0fb51d4b4f29b72008a17292bdc4634873e87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 28 Feb 2017 11:56:51 +0100
Subject: [PATCH 1393/3449] blender: 2.78b -> 2.78c

---
 pkgs/applications/misc/blender/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 76810a6f2493..a7b15646f036 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -11,11 +11,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.78b";
+  name = "blender-2.78c";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0wgrqwznih6c19y2fpvrk3k6qsaxsy3g7xja87rb4hq7r7j8x22d";
+    sha256 = "0f6k3m9yd5yhn7fq9srgzwh2gachlxm03bdrvn2r7xq00grqzab4";
   };
 
   buildInputs =
@@ -54,7 +54,12 @@ stdenv.mkDerivation rec {
       "-DWITH_PYTHON_INSTALL_NUMPY=OFF"
     ]
     ++ optional jackaudioSupport "-DWITH_JACK=ON"
-    ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"
+    ++ optionals cudaSupport
+      [ "-DWITH_CYCLES_CUDA_BINARIES=ON"
+        # Disable the sm_20 architecture to work around a segfault in
+        # ptxas, as suggested on #blendercoders.
+        "-DCYCLES_CUDA_BINARIES_ARCH=sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61"
+      ]
     ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON";
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m";

From b13378c47927cbcd7c5b365c1fdc44e3c89a3759 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Tue, 28 Feb 2017 17:47:21 +0100
Subject: [PATCH 1394/3449] openconnect_openssl: added missing dependecy gmp

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

diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix
index e1104a88c909..5e38aee7f833 100644
--- a/pkgs/tools/networking/openconnect/default.nix
+++ b/pkgs/tools/networking/openconnect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, libxml2, stoken, zlib } :
+{ stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } :
 
 let
   xor = a: b: (a || b) && (!(a && b));
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ vpnc openssl gnutls libxml2 stoken zlib ];
+  propagatedBuildInputs = [ vpnc openssl gnutls gmp libxml2 stoken zlib ];
 
   meta = {
     description = "VPN Client for Cisco's AnyConnect SSL VPN";

From fc8e0ccc2e170f75a6fbfe4f9fc1b8602ccb0374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 28 Feb 2017 17:53:31 +0100
Subject: [PATCH 1395/3449] sysdig: give the source tarball a meaningful name

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 8aef1655a016..b23da5451d1c 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -1,13 +1,15 @@
 {stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, fetchpatch}:
+
 let
   inherit (stdenv.lib) optional optionalString;
   baseName = "sysdig";
   version = "0.15.0";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
 
   src = fetchurl {
+    name = "${name}.tar.gz";
     url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
     sha256 = "08spprzgx6ksd7sjp5nk7z5szdlixh2sb0bsb9mfaq4xr12gsjw2";
   };

From a6e2d5fcbb12e018ba36eb184615d32e1b03ca57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:58:38 +0100
Subject: [PATCH 1396/3449] lua5_{2,3}: replace sha1 with sha256

---
 pkgs/development/interpreters/lua-5/5.2.nix | 2 +-
 pkgs/development/interpreters/lua-5/5.3.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.nix b/pkgs/development/interpreters/lua-5/5.2.nix
index fa5113fd5727..d14230c158e1 100644
--- a/pkgs/development/interpreters/lua-5/5.2.nix
+++ b/pkgs/development/interpreters/lua-5/5.2.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.lua.org/ftp/${name}.tar.gz";
-    sha1 = "926b7907bc8d274e063d42804666b40a3f3c124c";
+    sha256 = "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk";
   };
 
   nativeBuildInputs = [ readline ];
diff --git a/pkgs/development/interpreters/lua-5/5.3.nix b/pkgs/development/interpreters/lua-5/5.3.nix
index 30c26a922ba9..a22e162b8e18 100644
--- a/pkgs/development/interpreters/lua-5/5.3.nix
+++ b/pkgs/development/interpreters/lua-5/5.3.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.lua.org/ftp/${name}.tar.gz";
-    sha1 = "1c46d1c78c44039939e820126b86a6ae12dadfba";
+    sha256 = "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf";
   };
 
   nativeBuildInputs = [ readline ];

From be23e983ae1b35c02ad3a54a176d8fcf4c5f00f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Feb 2017 00:55:56 +0100
Subject: [PATCH 1397/3449] haka: replace sha1 with sha256

---
 pkgs/tools/security/haka/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
index 6c5247a47bb5..f9c7f4eaf1c7 100644
--- a/pkgs/tools/security/haka/default.nix
+++ b/pkgs/tools/security/haka/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     name = "haka_${version}_source.tar.gz";
     url = "https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz";
-
-    # https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz.sha1.txt
-    sha1 = "87625ed32841cc0b3aa92aa49397ce71ce434bc2";
+    sha256 = "0dm39g3k77sa70zrjsqadidg27a6iqq61jzfdxazpllnrw4mjy4w";
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-error";

From 49f9c202f6cdfb8ec082e41c6aa1bed85cdaf4b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 26 Feb 2017 21:57:07 +0100
Subject: [PATCH 1398/3449] gpodder: disable iPodSupport by default

gpodder has an indirect dependency on libplist (pulled by libgpod),
which has known security vulnerabilities.
---
 pkgs/applications/audio/gpodder/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 569326ec375f..1fe2c46d236b 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python2Packages, mygpoclient, intltool
-, ipodSupport ? true, libgpod
+, ipodSupport ? false, libgpod
 , gnome3
 }:
 

From 0e5cce32d82cbfff0f17567e65e5ec97a20e0274 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 11:08:54 -0600
Subject: [PATCH 1399/3449] qt57: update community releases automatically

---
 pkgs/development/libraries/qt-5/5.7/fetch.sh |  1 +
 pkgs/development/libraries/qt-5/5.7/srcs.nix | 24 +++++++++++++-------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh
index 0f7d123aeb23..6a6a34d520d6 100644
--- a/pkgs/development/libraries/qt-5/5.7/fetch.sh
+++ b/pkgs/development/libraries/qt-5/5.7/fetch.sh
@@ -1,2 +1,3 @@
 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/srcs.nix b/pkgs/development/libraries/qt-5/5.7/srcs.nix
index fe497555874d..3fc4fab4ea54 100644
--- a/pkgs/development/libraries/qt-5/5.7/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.7/srcs.nix
@@ -2,14 +2,6 @@
 { fetchurl, mirror }:
 
 {
-  qtwebkit = {
-    version = "5.7.0";
-    src = fetchurl {
-      url = "${mirror}/community_releases/5.7/5.7.0/qtwebkit-opensource-src-5.7.0.tar.xz";
-      sha256 = "1prlpl3zslzpr1iv7m3irvxjxn3v8nlxh21v9k2kaq4fpwy2b8y7";
-      name = "qtwebkit-opensource-src-5.7.0.tar.xz";
-    };
-  };
   qt3d = {
     version = "5.7.1";
     src = fetchurl {
@@ -266,6 +258,22 @@
       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 {

From 14ef7c0c59be348c2e27c2d0d5d4ca175962e519 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 28 Feb 2017 12:21:52 -0500
Subject: [PATCH 1400/3449] bazel: consolidate bazel test invocations

This way it can run them in parallel.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 25378135d3d9..e40e78427c67 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -75,8 +75,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = ''
     export TEST_TMPDIR=$(pwd)
-    ./output/bazel test --test_output=errors examples/cpp:hello-success_test
-    ./output/bazel test --test_output=errors examples/java-native/src/test/java/com/example/myproject:hello
+    ./output/bazel test --test_output=errors \
+        examples/cpp:hello-success_test \
+        examples/java-native/src/test/java/com/example/myproject:hello
   '';
 
   installPhase = ''

From c4fd85a451a973745aabe227c1c392c39f14c23d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 16:11:33 +0100
Subject: [PATCH 1401/3449] phpPackages.redis22: not supported with php >= 7

cc #23253
---
 pkgs/top-level/php-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5f1e9a5f24ce..e07930a94db0 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -176,7 +176,7 @@ let
 
   redis = if isPhp7 then redisPhp7 else redis22;
 
-  redis22 = buildPecl {
+  redis22 = assert !isPhp7; buildPecl {
     name = "redis-2.2.7";
     sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm";
   };

From a36e1e2c353fea4b58b202308c38298503f6e63a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 16:47:21 +0100
Subject: [PATCH 1402/3449] youtubeDL: 2017.02.24.1 -> 2017.02.27

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index b3104d6629d7..2d942e014754 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -14,14 +14,15 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.02.24.1";
+  version = "2017.02.27";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "1m2mmnjf7zw0vsbw6vjl8b4p8wa3jdmdzli970cp26awgkq5c15v";
+    sha256 = "0pcrr1bxxw3aar681gj8n5ms69j54namjlw5bj88crs0nm69kspk";
   };
 
-  buildInputs = [ zip makeWrapper ] ++ optional generateManPage pandoc;
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ zip ] ++ optional generateManPage pandoc;
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
   # rtmpdump is required to download files over RTMP

From 7c17c10bab7ff0319c983828032d6a10b07b4faa Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Tue, 28 Feb 2017 12:44:44 -0500
Subject: [PATCH 1403/3449] bazel: Wrap so java is present at runtime

Bazel can't start up without javac in $PATH.
---
 pkgs/development/tools/build-managers/bazel/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index e40e78427c67..a8ad08feec11 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils }:
+{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils, makeWrapper }:
 
 stdenv.mkDerivation rec {
 
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
     unzip
     which
     binutils
+    makeWrapper
   ];
 
   # These must be propagated since the dependency is hidden in a compressed
@@ -83,6 +84,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     mv output/bazel $out/bin
+    wrapProgram "$out/bin/bazel" --prefix PATH : "${jdk}/bin"
   '';
 
   dontStrip = true;

From bfa067179e69049a0c458ad28bbf5566f290c2b2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 28 Feb 2017 18:42:08 +0100
Subject: [PATCH 1404/3449] multisync: remove, no release in > 10 years

Upstream suggests to use opensync.

cc #23253
---
 pkgs/applications/misc/multisync/default.nix | 23 --------------------
 pkgs/top-level/all-packages.nix              |  4 ----
 2 files changed, 27 deletions(-)
 delete mode 100644 pkgs/applications/misc/multisync/default.nix

diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix
deleted file mode 100644
index 5c00bddd9d23..000000000000
--- a/pkgs/applications/misc/multisync/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, gtk2, glib, ORBit2, libbonobo, libtool, pkgconfig
-, libgnomeui, GConf, automake, autoconf }:
-
-stdenv.mkDerivation {
-  name = "multisync-0.82-1";
-  
-  src = fetchurl {
-    url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2;
-    sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3";
-  };
-  
-  buildInputs =
-    [ gtk2 glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
-      automake autoconf
-    ];
-    
-  preConfigure = "./autogen.sh"; # install.sh is not contained in the tar
-
-  meta = {
-    description = "Modular program to synchronize calendars, addressbooks and other PIM data between pcs, mobile devices etc";
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3799fbd9638a..81e0afe5baf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14517,10 +14517,6 @@ with pkgs;
 
   multimon-ng = callPackage ../applications/misc/multimon-ng { };
 
-  multisync = callPackage ../applications/misc/multisync {
-    inherit (gnome2) ORBit2 libbonobo libgnomeui GConf;
-  };
-
   inherit (callPackages ../applications/networking/mumble {
       avahi = avahi.override {
         withLibdnssdCompat = true;

From 62c5f6884720205a442073612d59f7a9969b09d8 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 28 Feb 2017 18:28:12 +0100
Subject: [PATCH 1405/3449] palemoon: 27.0.3 -> 27.1.1

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

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 73a828413600..b167b59f03cf 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.0.3";
+  version = "27.1.1";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
-    rev    = "c09119484da17c682a66e32bacbffb8cff411608";
-    sha256 = "1i4hp1lz0xaryy4zpncr67gbqg8v7a2cnyqjwvs2an86rk1vg913";
+    rev    = "a35936746069e6591181eb67e5f9ea094938bae5";
+    sha256 = "0hns5993dh93brwz3z4xp1zp8n90x1hajxylv17zybpysax64jsk";
   };
 
   desktopItem = makeDesktopItem {

From 61785c55319dbb1d3af1f2d362d028f6814570af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 21 Feb 2017 23:22:08 +0100
Subject: [PATCH 1406/3449] keepassxc: 2.1.0 -> 2.1.2

also enable http plugin again. Readme mention using the protocol be a
security risk because it is unencrypted, but the connections stays local
(127.0.0.1) and the plugins has to explicitly enabled in settings
(disabled by default).
---
 pkgs/applications/misc/keepassx/community.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 58b45786c40e..c5bd9afd2cf6 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchFromGitHub, cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools }:
+{ stdenv, fetchFromGitHub,
+  cmake, libgcrypt, zlib, libmicrohttpd, libXtst, qtbase, qttools, libgpgerror
+, withKeePassHTTP ? true
+}:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassx-community-${version}";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "0qwmi9f8ik3vkwl1kx7g3079h5ia4wl87y42nr5dal3ic1jc941p";
+    sha256 = "0ncc157xki1mzxfa41bgwjfsz5jq9sq750ka578lq61smyzh5lq6";
   };
 
-  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd ];
+  cmakeFlags = optional (withKeePassHTTP) [ "-DWITH_XC_HTTP=ON" ];
+
+  buildInputs = [ cmake libgcrypt zlib qtbase qttools libXtst libmicrohttpd libgpgerror ];
 
   meta = {
     description = "Fork of the keepassX password-manager with additional http-interface to allow browser-integration an use with plugins such as PasslFox (https://github.com/pfn/passifox). See also keepassX2.";

From 5c89ab7cb61f4a4f6879acc701a10ee577d6c1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 28 Feb 2017 22:30:09 +0100
Subject: [PATCH 1407/3449] unbound: only use the two-phase build on Linux

Hydra shows some problems on Darwin with structure defns/decls.
http://hydra.nixos.org/build/49463873/nixlog/1/raw
---
 pkgs/tools/networking/unbound/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index c263da6efe6b..0a1d557dd935 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
-  preFixup =
+  preFixup = stdenv.lib.optionalString stdenv.isLinux
     # Build libunbound again, but only against nettle instead of openssl.
     # This avoids gnutls.out -> unbound.lib -> openssl.out.
+    # There was some problem with this on Darwin; let's not complicate non-Linux.
     ''
       configureFlags="$configureFlags --with-nettle=${nettle.dev} --with-libunbound-only"
       configurePhase

From 83644ee24dd25d690b478586f5d243291bcfc9f6 Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Wed, 22 Feb 2017 16:33:09 +0100
Subject: [PATCH 1408/3449] idea.rubymine: 2016.3.1 -> 2016.3.2

---
 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 c5f87d33f732..c9f5aa1e024a 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -220,12 +220,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2016.3.1";
+    version = "2016.3.2";
     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 = "10d1ba6qpizhz4d7fz0ya565pdvkgcmsdgs7b8dv98s9hxfjsldy";
+      sha256 = "1fqlrvhlk09z8nx68qv4nqs5n8ldia3lixsl6r04gsfyl1a69sb6";
     };
     wmClass = "jetbrains-rubymine";
   };

From e9c507e060c54042e7c33a57b42cdbfdae984113 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 16:19:28 -0600
Subject: [PATCH 1409/3449] xul: 0.8.0 -> 1.1.0

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

diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix
index 26d17355951a..6389bef5b330 100644
--- a/pkgs/tools/text/xurls/default.nix
+++ b/pkgs/tools/text/xurls/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, go }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.0";
+  version = "1.1.0";
   name = "xurls-${version}";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "xurls";
     rev = "v${version}";
-    sha256 = "0j35x6hl5hiwzpi6vjw9d2sn83rrsd9w07ql9kndhkngz8n6yr98";
+    sha256 = "05q4nqbpgfb0a35sn22rn9mlag2ks4cgwb54dx925hipp6zgj1hx";
   };
 
   buildInputs = [ go ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Extract urls from text";
     homepage = https://github.com/mvdan/xurls;
-    maintainers = [ maintainers.koral ];
+    maintainers = with maintainers; [ koral ndowens ];
     platforms = platforms.unix;
   };
 }

From 0e0af18b57201c88531d4c56e511da367ea8deef Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 16:06:01 -0600
Subject: [PATCH 1410/3449] fop: 1.1 -> 2.1

---
 pkgs/tools/typesetting/fop/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix
index 473b23fe2627..aff11fd61279 100644
--- a/pkgs/tools/typesetting/fop/default.nix
+++ b/pkgs/tools/typesetting/fop/default.nix
@@ -1,11 +1,12 @@
 { fetchurl, stdenv, ant, jdk }:
 
 stdenv.mkDerivation rec {
-  name = "fop-1.1";
+  name = "fop-${version}";
+  version = "2.1";
 
   src = fetchurl {
     url = "mirror://apache/xmlgraphics/fop/source/${name}-src.tar.gz";
-    sha256 = "08i56d57w5dl5bqchr34x9165hvi5h4bhiflxhi0a4wd56rlq5jq";
+    sha256 = "165rx13q47l6qc29ppr7sg1z26vw830s3rkklj5ap7wgvy0ivbz5";
   };
 
   buildInputs = [ ant jdk ];
@@ -45,6 +46,6 @@ stdenv.mkDerivation rec {
     homepage = http://xmlgraphics.apache.org/fop/;
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    maintainers = with maintainers; [ bjornfor ndowens ];
   };
 }

From d02209edf251a9d3ba564fe4ed1a20b8bbfca869 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 16:26:05 -0600
Subject: [PATCH 1411/3449] wgetpaste: 2.25 -> 2.28

---
 pkgs/tools/text/wgetpaste/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index ced6ce402fbd..81b90e4925de 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, wget, bash, coreutils }:
 
 stdenv.mkDerivation rec {
-  version = "2.25";
+  version = "2.28";
   name = "wgetpaste-${version}";
+
   src = fetchurl {
     url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
-    sha256 = "1x209j85mryp3hxmv1gfsbvw03k306k5fa65ky0zxx07cs70fzka";
+    sha256 = "1hh9svyypqcvdg5mjxyyfzpdzhylhf7s7xq5dzglnm4injx3i3ak";
   };
   # currently zsh-autocompletion support is not installed
 
@@ -23,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Command-line interface to various pastebins";
     homepage = http://wgetpaste.zlin.dk/;
     license = stdenv.lib.licenses.publicDomain;
-    maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ];
+    maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ndowens ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From 3e8c302525d4a25cd34fcb680653ad8706fb9baa Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 28 Feb 2017 16:29:45 +0100
Subject: [PATCH 1412/3449] qjackctl: 0.4.3 -> 0.4.4

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

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 52b94ca07d9e..857f77bbdaf3 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
+{ stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.3";
+  version = "0.4.4";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "01wyyynxy21kim0gplzvfij7275a1jz68hdx837d2j1w5x2w7zbb";
+    sha256 = "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak";
   };
 
   buildInputs = [
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     dbus
   ];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   configureFlags = [ "--enable-jack-version" ];
 
   meta = with stdenv.lib; {

From 40d47d457e7e19a12701ecc7d4f9e89da1269bd9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 28 Feb 2017 16:29:19 +0100
Subject: [PATCH 1413/3449] samplv1: 0.7.6 -> 0.8.0

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

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index aeb8396e0a6d..10f06e16cf4c 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
+{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, liblo, libsndfile, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.7.6";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "071j7mi2cwhx0ml5hq8izmjb0s4yhbkscqaxfdg56xfpfsqsa63l";
+    sha256 = "0j3hkmd9q0bw9b7nk9cssqywlrishkd1n790a9vq6gh3pdc5sf3r";
   };
 
   buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   meta = with stdenv.lib; {
     description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx";
     homepage = http://samplv1.sourceforge.net/;

From 9dabf88e725cd2632d21863a5f9541b108767d9a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 28 Feb 2017 16:28:39 +0100
Subject: [PATCH 1414/3449] drumkv1: 0.7.6 -> 0.8.0

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

diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index a14d642cd830..0a2e293d90be 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
+{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.7.6";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "0cl1rbj26nsbvg9wzsh2j8xlx69xjxn29x46ypmy3939zbk81bi6";
+    sha256 = "1n2kd468kn71yp2asmamprvblmdlvh0zd8lsh3598dwi4b7aa3ga";
   };
 
   buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   meta = with stdenv.lib; {
     description = "An old-school drum-kit sampler synthesizer with stereo fx";
     homepage = http://drumkv1.sourceforge.net/;

From cf9cb1bac3fe61b3cac5dcd3aca5e2c214186a24 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 28 Feb 2017 23:35:24 +0100
Subject: [PATCH 1415/3449] gpsbabel: require qt4 rather than qtbase

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

diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index c21f8bbe814f..38f81a979b3f 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, qtbase, which }:
+{ stdenv, fetchurl, zlib, qt4, which }:
 
 stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w";
   };
 
-  buildInputs = [ zlib qtbase which ];
+  buildInputs = [ zlib qt4 which ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
 

From 61237e17380b64f8e2879f082a06d719f729e30a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 28 Feb 2017 23:52:52 +0100
Subject: [PATCH 1416/3449] gpsbabel: 1.5.2 -> 1.5.3

---
 pkgs/applications/misc/gpsbabel/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 38f81a979b3f..6c248bc4dfa5 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl, zlib, qt4, which }:
+{ stdenv, fetchurl, fetchpatch, zlib, qt4, which }:
 
 stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchurl {
     # gpgbabel.org makes it hard to get the source tarball automatically, so
     # get it from elsewhere.
     url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
-    sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w";
+    sha256 = "0l6c8911f7i5bbdzah9irhqf127ib0b7lv53rb8r9z8g439mznq1";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip;
+      sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr";
+    })
+  ];
+
   buildInputs = [ zlib qt4 which ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
@@ -19,7 +26,6 @@ stdenv.mkDerivation rec {
 
     But FOP isn't packaged yet.  */
 
-  preConfigure = "cd gpsbabel";
   configureFlags = [ "--with-zlib=system" ]
     # Floating point behavior on i686 causes test failures. Preventing
     # extended precision fixes this problem.

From 1e74a156c366429af554113404fc89406043eaa1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 28 Feb 2017 15:12:28 +0100
Subject: [PATCH 1417/3449] qmidinet: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index f5f3119f73df..89f1682592aa 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,18 +1,20 @@
-{ stdenv, fetchurl, qt5, alsaLib, libjack2 }:
+{ stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.1";
+  version = "0.4.2";
   name = "qmidinet-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
-    sha256 = "1hh06g19lfh6r673avfvy0l2mq999mxk2jnv396226swj97lv7yz";
+    sha256 = "1sdnd189db44xhl9p8pd8h4bsy8s0bn1y64lrdq7nb21mwg8ymcs";
   };
 
   hardeningDisable = [ "format" ];
 
   buildInputs = [  qt5.qtbase qt5.qttools alsaLib libjack2 ];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   meta = with stdenv.lib; {
     description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
     homepage = http://qmidinet.sourceforge.net/;

From 6c5cbfd0916faefb432759a2b1c8d1b0ffce591e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Mar 2017 02:09:05 +0300
Subject: [PATCH 1418/3449] python3.pkgs.protobuf3_0: fix build

I spent some time trying to fix tests instead but have no idea what happens.
---
 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 e8205cb41d2e..cb6fee5977db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19269,7 +19269,7 @@ in {
   };
   protobuf3_0 = callPackage ../development/python-modules/protobuf.nix {
     disabled = isPyPy;
-    doCheck = isPy3k;
+    doCheck = !isPy3k;
     protobuf = pkgs.protobuf3_0;
   };
   protobuf2_6 = callPackage ../development/python-modules/protobuf.nix {

From cb766725c749c5145f4062569c279b7207399949 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 17:16:33 -0600
Subject: [PATCH 1419/3449] numdiff: 5.8.1 -> 5.9.0

---
 pkgs/tools/text/numdiff/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index db7eeb789afb..8f22a9e7600e 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchurl }:
 
-let
-  version = "5.8.1";
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
   name = "numdiff-${version}";
+  version = "5.9.0";
+
   src = fetchurl {
     url = "mirror://savannah/numdiff/numdiff-${version}.tar.gz";
-    sha256 = "00zm9955gjsid0daa94sbw69klk0vrnrrh0ihijza99kysnvmblr";
+    sha256 = "1vzmjh8mhwwysn4x4m2vif7q2k8i19x8azq7pzmkwwj4g48lla47";
   };
-  meta = {
+  meta = with stdenv.lib; {
     description = ''
       A little program that can be used to compare putatively similar files
       line by line and field by field, ignoring small numeric differences
       or/and different numeric formats
     '';
     homepage = http://www.nongnu.org/numdiff/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
-    platforms = stdenv.lib.platforms.gnu;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ bbenoist ndowens ];
+    platforms = platforms.gnu;
   };
 }

From f876ae4b924a7dbc97fd49185129119ed4dda827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 1 Mar 2017 00:20:05 +0100
Subject: [PATCH 1420/3449] cheat: 2.1.27 -> 2.1.28

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

diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 246a50842c66..68b77bafc0ef 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -1,14 +1,14 @@
 { python3Packages, fetchurl, lib }:
 
 python3Packages.buildPythonApplication rec {
-  version = "2.1.27";
+  version = "2.1.28";
   name = "cheat-${version}";
 
   propagatedBuildInputs = with python3Packages; [ docopt pygments ];
 
   src = fetchurl {
     url = "mirror://pypi/c/cheat/${name}.tar.gz";
-    sha256 = "1mrrfwd4ivas0alfkhjryxxzf24a4ngk8c6n2zlfb8ziwf7czcqd";
+    sha256 = "1a5c5f3dx3dmmvv75q2w6v2xb1i6733c0f8knr6spapvlim5i0c5";
   };
   # no tests available
   doCheck = false;

From 8aa73bbf55884d2a94db0e54aa5ceb92a513371b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Mar 2017 01:01:02 +0300
Subject: [PATCH 1421/3449] networkmanagerapplet: add librsvg

Fix tray icon. Also use wrapGAppsHook instead of custom wrapper.
---
 .../network-manager-applet/default.nix         | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 8d62cb1bc74d..a212e4f053d3 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
-, libnotify, libsecret, polkit, isocodes, modemmanager
+, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson }:
+, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name    = "${pname}-${version}";
@@ -18,10 +18,10 @@ 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
+    modemmanager jansson librsvg
   ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
 
   propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];
 
@@ -33,16 +33,6 @@ stdenv.mkDerivation rec {
     installFlagsArray=( "sysconfdir=$out/etc" )
   '';
 
-  preFixup = ''
-    wrapProgram "$out/bin/nm-applet" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
-      --prefix PATH ":" "${gnome3.gconf}/bin"
-    wrapProgram "$out/bin/nm-connection-editor" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   meta = with stdenv.lib; {
     homepage    = http://projects.gnome.org/NetworkManager/;
     description = "NetworkManager control applet for GNOME";

From 834471985e907911f2c5764df1c24bccea4aa954 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 26 Feb 2017 00:56:50 +0300
Subject: [PATCH 1422/3449] python.pkgs.enum-compat: init at 0.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb6fee5977db..ec6477723cee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10986,6 +10986,26 @@ in {
     };
   };
 
+  enum-compat = buildPythonPackage rec {
+    pname = "enum-compat";
+    version = "0.0.2";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "14j1i963jic2vncbf9k5nq1vvv8pw2zsg7yvwhm7d9c6h7qyz74k";
+    };
+
+    propagatedBuildInputs = with self; [ enum34 ];
+
+    meta = {
+      homepage = "https://github.com/jstasiak/enum-compat";
+      description = "enum/enum34 compatibility package";
+      license = licenses.mit;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   enum34 = if pythonAtLeast "3.4" then null else buildPythonPackage rec {
     pname = "enum34";
     version = "1.1.6";

From b6cba9ae3ff808c8b005dbc8021178013557216c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 26 Feb 2017 00:57:06 +0300
Subject: [PATCH 1423/3449] python.pkgs.zeroconf: init at 0.18.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec6477723cee..1662b1c5b241 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32046,6 +32046,26 @@ EOF
   zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else
     (pkgs.zeitgeist.override{python2Packages=self;}).py;
 
+  zeroconf = buildPythonPackage rec {
+    pname = "zeroconf";
+    version = "0.18.0";
+    name = "${pname}-${version}";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "0s1840v2h4h19ad8lfadbm3dhzs8bw9c5c3slkxql1zsaiycvjy2";
+    };
+
+    propagatedBuildInputs = with self; [ netifaces six enum-compat ];
+
+    meta = {
+      description = "A pure python implementation of multicast DNS service discovery";
+      homepage = "https://github.com/jstasiak/python-zeroconf";
+      license = licenses.lgpl21;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   zipfile36 = buildPythonPackage rec {
     pname = "zipfile36";
     version = "0.1.3";

From e3a6a1fc0e0888afe47ed9f1038c3a4c4c64de01 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 26 Feb 2017 00:58:52 +0300
Subject: [PATCH 1424/3449] python.pkgs.libarcus: init at 2.4.0

---
 .../python-modules/libarcus/default.nix       | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/libarcus/default.nix

diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix
new file mode 100644
index 000000000000..cae6ac62e1e6
--- /dev/null
+++ b/pkgs/development/python-modules/libarcus/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, fetchFromGitHub, python, cmake, sip, protobuf }:
+
+if lib.versionOlder python.version "3.4.0"
+then throw "libArcus not supported for interpreter ${python.executable}"
+else
+
+stdenv.mkDerivation rec {
+  name = "libarcus-${version}";
+  version = "2.4.0";
+  
+  src = fetchFromGitHub {
+    owner = "Ultimaker";
+    repo = "libArcus";
+    rev = version;
+    sha256 = "07lf5d42pnx0h9lgldplfdj142rbcsxx23njdblnq04di7a4937h";
+  };
+  
+  propagatedBuildInputs = [ sip protobuf ];
+  nativeBuildInputs = [ cmake ];
+
+  postPatch = ''
+    # To workaround buggy SIP detection which overrides PYTHONPATH
+    sed -i '/SET(ENV{PYTHONPATH}/d' cmake/FindSIP.cmake
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Communication library between internal components for Ultimaker software";
+    homepage = "https://github.com/Ultimaker/libArcus";
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1662b1c5b241..1c02e12a44e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28149,6 +28149,10 @@ EOF
     inherit (pkgs) libasyncns pkgconfig;
   };
 
+  libarcus = callPackage ../development/python-modules/libarcus {
+    protobuf = self.protobuf3_0;
+  };
+
   pybrowserid = buildPythonPackage rec {
     name = "PyBrowserID-${version}";
     version = "0.9.2";

From 868794010fb1d8295d6b83561f3c6d489d5ed818 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 26 Feb 2017 00:59:08 +0300
Subject: [PATCH 1425/3449] python.pkgs.uranium: init at 2.4.0

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

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
new file mode 100644
index 000000000000..bce88635d3c5
--- /dev/null
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, lib, fetchFromGitHub, python, cmake, pyqt5, numpy, scipy, libarcus }:
+
+if lib.versionOlder python.version "3.5.0"
+then throw "Uranium not supported for interpreter ${python.executable}"
+else
+
+stdenv.mkDerivation rec {
+  name = "uranium-${version}";
+  version = "2.4.0";
+  
+  src = fetchFromGitHub {
+    owner = "Ultimaker";
+    repo = "Uranium";
+    rev = version;
+    sha256 = "1jpl0ryk8xdppillk5wzr2415n50cpa09shn1xqj6y96fg22l2il";
+  };
+  
+  buildInputs = [ python ];
+  propagatedBuildInputs = [ pyqt5 numpy scipy libarcus ];
+  nativeBuildInputs = [ cmake ];
+
+  postPatch = ''
+    sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+    sed -i \
+     -e "s,Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,Resources.addSearchPath(\"$out/share/uranium/resources\")," \
+     -e "s,self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)).*,self._plugin_registry.addPluginLocation(\"$out/lib/uranium/plugins\")," \
+     UM/Application.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Python framework for building Desktop applications";
+    homepage = "https://github.com/Ultimaker/Uranium";
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c02e12a44e2..d9ec862146c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32010,6 +32010,8 @@ EOF
     };
   };
 
+  uranium = callPackage ../development/python-modules/uranium { };
+
   urlscan = callPackage ../applications/misc/urlscan { };
 
   vine = buildPythonPackage rec {

From 2e80b50a7eb7db481ff00b6ae4ab76ece6d245b7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 26 Feb 2017 01:05:04 +0300
Subject: [PATCH 1426/3449] cura, curaengine: 14.04 -> 2.4.0

Move old Cura to {cura,curaengine}_stable
---
 nixos/modules/services/misc/octoprint.nix     |  2 +-
 pkgs/applications/misc/cura/default.nix       | 79 ++++++-------------
 pkgs/applications/misc/cura/stable.nix        | 73 +++++++++++++++++
 pkgs/applications/misc/curaengine/default.nix | 35 ++++----
 pkgs/applications/misc/curaengine/stable.nix  | 29 +++++++
 pkgs/top-level/all-packages.nix               | 10 ++-
 6 files changed, 149 insertions(+), 79 deletions(-)
 create mode 100644 pkgs/applications/misc/cura/stable.nix
 create mode 100644 pkgs/applications/misc/curaengine/stable.nix

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index c2b3f63be7d4..8faad46a49f1 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -7,7 +7,7 @@ let
   cfg = config.services.octoprint;
 
   baseConfig = {
-    plugins.cura.cura_engine = "${pkgs.curaengine}/bin/CuraEngine";
+    plugins.cura.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
     server.host = cfg.host;
     server.port = cfg.port;
     webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index a53b001b0e98..ff18796e39d6 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,73 +1,38 @@
-{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
-let
-  py = python27Packages;
-  version = "15.04";
-in
+{ stdenv, lib, fetchFromGitHub, cmake, python3, qtbase, makeQtWrapper, curaengine }:
+
 stdenv.mkDerivation rec {
   name = "cura-${version}";
+  version = "2.4.0";
 
-  src = fetchurl {
-    url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
-    sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl";
+  src = fetchFromGitHub {
+    owner = "Ultimaker";
+    repo = "Cura";
+    rev = version;
+    sha256 = "04iglmjg9rzmlfrll6g7bcckkla327938xh8qmbdfrh215aivdlp";
   };
 
-  desktopItem = makeDesktopItem {
-    name = "Cura";
-    exec = "cura";
-    icon = "cura";
-    comment = "Cura";
-    desktopName = "Cura";
-    genericName = "3D printing host software";
-    categories = "GNOME;GTK;Utility;";
-  };
+  buildInputs = [ qtbase ];
+  propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
+  nativeBuildInputs = [ cmake python3.pkgs.wrapPython makeQtWrapper ];
 
-  python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
+  cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
 
-  pythonPath = python_deps;
+  postPatch = ''
+    sed -i 's,/python''${PYTHON_VERSION_MAJOR}/dist-packages,/python''${PYTHON_VERSION_MAJOR}.''${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
+    sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
+  '';
 
-  propagatedBuildInputs = python_deps;
-
-  buildInputs = [ curaengine py.wrapPython ];
-
-  configurePhase = "";
-  buildPhase = "";
-  
-  patches = [ ./numpy-cast.patch ];
-
-  installPhase = ''
-    # Install Python code.
-    site_packages=$out/lib/python2.7/site-packages
-    mkdir -p $site_packages
-    cp -r Cura $site_packages/
-
-    # Install resources.
-    resources=$out/share/cura
-    mkdir -p $resources
-    cp -r resources/* $resources/
-    sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py
-
-    # Install executable.
-    mkdir -p $out/bin
-    cp Cura/cura.py $out/bin/cura
-    chmod +x $out/bin/cura
-    sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura
+  postFixup = ''
     wrapPythonPrograms
-
-    # Make it find CuraEngine.
-    echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py
-
-    # Install desktop item.
-    mkdir -p "$out"/share/applications
-    cp "$desktopItem"/share/applications/* "$out"/share/applications/
-    mkdir -p "$out"/share/icons
-    ln -s "$resources/images/c.png" "$out"/share/icons/cura.png
+    mv $out/bin/cura $out/bin/.cura-noqtpath
+    makeQtWrapper $out/bin/.cura-noqtpath $out/bin/cura
   '';
 
   meta = with stdenv.lib; {
-    description = "3D printing host software";
-    homepage = https://github.com/daid/Cura;
+    description = "3D printer / slicing GUI built on top of the Uranium framework";
+    homepage = "https://github.com/Ultimaker/Cura";
     license = licenses.agpl3;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix
new file mode 100644
index 000000000000..a53b001b0e98
--- /dev/null
+++ b/pkgs/applications/misc/cura/stable.nix
@@ -0,0 +1,73 @@
+{ stdenv, python27Packages, curaengine, makeDesktopItem, fetchurl }:
+let
+  py = python27Packages;
+  version = "15.04";
+in
+stdenv.mkDerivation rec {
+  name = "cura-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/daid/Cura/archive/${version}.tar.gz";
+    sha256 = "0xbjvzhp8wzq9lnpmcg1fjf7j5h39bj5463sd5c8jzdjl96izizl";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "Cura";
+    exec = "cura";
+    icon = "cura";
+    comment = "Cura";
+    desktopName = "Cura";
+    genericName = "3D printing host software";
+    categories = "GNOME;GTK;Utility;";
+  };
+
+  python_deps = with py; [ pyopengl pyserial numpy wxPython30 power setuptools ];
+
+  pythonPath = python_deps;
+
+  propagatedBuildInputs = python_deps;
+
+  buildInputs = [ curaengine py.wrapPython ];
+
+  configurePhase = "";
+  buildPhase = "";
+  
+  patches = [ ./numpy-cast.patch ];
+
+  installPhase = ''
+    # Install Python code.
+    site_packages=$out/lib/python2.7/site-packages
+    mkdir -p $site_packages
+    cp -r Cura $site_packages/
+
+    # Install resources.
+    resources=$out/share/cura
+    mkdir -p $resources
+    cp -r resources/* $resources/
+    sed -i 's|os.path.join(os.path.dirname(__file__), "../../resources")|"'$resources'"|g' $site_packages/Cura/util/resources.py
+
+    # Install executable.
+    mkdir -p $out/bin
+    cp Cura/cura.py $out/bin/cura
+    chmod +x $out/bin/cura
+    sed -i 's|#!/usr/bin/python|#!/usr/bin/env python|' $out/bin/cura
+    wrapPythonPrograms
+
+    # Make it find CuraEngine.
+    echo "def getEngineFilename(): return '${curaengine}/bin/CuraEngine'" >> $site_packages/Cura/util/sliceEngine.py
+
+    # Install desktop item.
+    mkdir -p "$out"/share/applications
+    cp "$desktopItem"/share/applications/* "$out"/share/applications/
+    mkdir -p "$out"/share/icons
+    ln -s "$resources/images/c.png" "$out"/share/icons/cura.png
+  '';
+
+  meta = with stdenv.lib; {
+    description = "3D printing host software";
+    homepage = https://github.com/daid/Cura;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix
index ce743a008798..08df0cc3e903 100644
--- a/pkgs/applications/misc/curaengine/default.nix
+++ b/pkgs/applications/misc/curaengine/default.nix
@@ -1,29 +1,26 @@
-{ stdenv, fetchurl }:
-let
-  version = "15.04.6";
-in
-stdenv.mkDerivation {
-  name = "curaengine-${version}";
+{ stdenv, fetchFromGitHub, cmake, libarcus }:
 
-  src = fetchurl {
-    url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
-    sha256 = "1cd4dikzvqyj5g80rqwymvh4nwm76vsf78clb37kj6q0fig3qbjg";
+stdenv.mkDerivation rec {
+  name = "curaengine-${version}";
+  version = "2.4.0";
+
+  src = fetchFromGitHub {
+    owner = "Ultimaker";
+    repo = "CuraEngine";
+    rev = version;
+    sha256 = "1n587cqm310kzb2zbc31199x7ybgxzjq91hslb1zcb8qg8qqmixm";
   };
 
-  postPatch = ''
-    sed -i 's,--static,,g' Makefile
-  '';
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libarcus ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp build/CuraEngine $out/bin/
-  '';
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    description = "Engine for processing 3D models into 3D printing instructions";
-    homepage = https://github.com/Ultimaker/CuraEngine;
+    description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction";
+    homepage = "https://github.com/Ultimaker/CuraEngine";
     license = licenses.agpl3;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix
new file mode 100644
index 000000000000..ce743a008798
--- /dev/null
+++ b/pkgs/applications/misc/curaengine/stable.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+let
+  version = "15.04.6";
+in
+stdenv.mkDerivation {
+  name = "curaengine-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz";
+    sha256 = "1cd4dikzvqyj5g80rqwymvh4nwm76vsf78clb37kj6q0fig3qbjg";
+  };
+
+  postPatch = ''
+    sed -i 's,--static,,g' Makefile
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/CuraEngine $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Engine for processing 3D models into 3D printing instructions";
+    homepage = https://github.com/Ultimaker/CuraEngine;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46d4d7f8bc98..170fa60c27b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15270,9 +15270,15 @@ with pkgs;
 
   slic3r = callPackage ../applications/misc/slic3r { };
 
-  curaengine = callPackage ../applications/misc/curaengine { };
+  curaengine_stable = callPackage ../applications/misc/curaengine/stable.nix { };
+  cura_stable = callPackage ../applications/misc/cura/stable.nix {
+    curaengine = curaengine_stable;
+  };
 
-  cura = callPackage ../applications/misc/cura { };
+  curaengine = callPackage ../applications/misc/curaengine {
+    inherit (python3.pkgs) libarcus;
+  };
+  cura = qt5.callPackage ../applications/misc/cura { };
 
   curaLulzbot = callPackage ../applications/misc/cura/lulzbot.nix { };
 

From d35ff57b4e78222a6df32ac14b57373f77ecb119 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Tue, 28 Feb 2017 22:49:15 +0100
Subject: [PATCH 1427/3449] arx-libertatis: 2016-07-27 -> 2017-02-26

---
 pkgs/games/arx-libertatis/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index b9f78ca364aa..0d8c22d6e7be 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, cmake, zlib, boost,
+{ stdenv, fetchFromGitHub, cmake, zlib, boost,
   openal, glm, freetype, mesa, glew, SDL2,
   dejavu_fonts, inkscape, optipng, imagemagick }:
 
 stdenv.mkDerivation rec {
   name = "arx-libertatis-${version}";
-  version = "2016-07-27";
+  version = "2017-02-26";
 
-  src = fetchgit {
-    url = "https://github.com/arx/ArxLibertatis";
-    rev = "e3aa6353f90886e7e9db2f4350ad9a232dd01c1e";
-    sha256 = "1hkkf0z607z8wxdikxq1ji120b3w7pxixq9qapdj1p54dzgbhgza";
+  src = fetchFromGitHub {
+    owner  = "arx";
+    repo   = "ArxLibertatis";
+    rev    = "0d2bb46025b2ad0fd5c8bcddd1cc04750282608d";
+    sha256 = "11z0ndhk802jr3w3z5gfqw064g98v99xin883q1qd36jw96s27p5";
   };
 
   buildInputs = [

From 8f29ca2104641c85db1c01897f93eba08cdc2ebc Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 17:26:26 -0600
Subject: [PATCH 1428/3449] kytea: 0.4.6 -> 0.4.7; source was still pointing to
 version 0.4.6

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

diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 2aec0d04a619..142bb721277f 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
   version = "0.4.7";
 
   src = fetchurl {
-    url    = "http://www.phontron.com/kytea/download/kytea-0.4.6.tar.gz";
-    sha256 = "0n6d88j0qda4dmy6mcj0cyin46n05m5phvjiah9i4ip54h8vs9s3";
+    url    = "http://www.phontron.com/kytea/download/${name}.tar.gz";
+    sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
   };
 
   meta = with stdenv.lib; {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
     license = licenses.asl20;
 
-    maintainers = [ maintainers.ericsagnes ];
+    maintainers = with maintainers; [ ericsagnes ndowens ];
     platforms = platforms.linux;
   };
 

From a6ee264f1b83277c39cae991c02b0053873dfede Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 27 Feb 2017 11:25:49 +0100
Subject: [PATCH 1429/3449] cdparanoia: sha1 -> sha256

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

diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index ceff147d618b..ac5db3d1f636 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optionals stdenv.isDarwin [
     (fetchurl {
       url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
-      sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd";
+      sha256 = "1n86kzm2ssl8fdf5wlhp6ncb2bf6b9xlb5vg0mhc85r69prqzjiy";
     })
     (fetchurl {
       url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff";
-      sha1 = "d7dc121374df3b82e82adf544df7bf1eec377bdb";
+      sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad";
     })
   ];
 

From 56ae1e25af1a62f6ef3eea76710d7e304045ac05 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 27 Feb 2017 11:43:20 +0100
Subject: [PATCH 1430/3449] rhash: sha1 -> sha256

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

diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 40f5163d89d2..1f72ca294eb7 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "mirror://sourceforge/rhash/${name}-src.tar.gz";
     sha1 = "0981bdc98ba7ef923b1a6cd7fd8bb0374cff632e";
+    sha256 = "0nii6p4m2x8rkaf8r6smgfwb1q4hpf117kkg64yr6gyqgdchnljv";
   };
 
   installFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];

From 026366b00b335246b86701cea57bb2932cccfb3d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 27 Feb 2017 11:33:59 +0100
Subject: [PATCH 1431/3449] pan: sha1 -> sha256

---
 pkgs/applications/networking/newsreaders/pan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index e8885edaa2aa..8c0bb8a884f8 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
-    sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60";
+    sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz";
   };
 
   buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ]

From 3c178fe769c2c51f1be7b45dc248b11353b44c8a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 1 Mar 2017 00:22:06 +0100
Subject: [PATCH 1432/3449] tinycc: restrict platforms to x86_64-linux

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

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index a8b1ac02673d..79745d45c2b3 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.tinycc.org/;
     license = licenses.mit;
 
-    platforms = platforms.unix;
+    platforms = [ "x86_64-linux" ];
     maintainers = [ maintainers.joachifm ];
   };
 }

From 9655567c09fe6b7156a19ce44040c86738d9dd3c Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 17:44:50 -0600
Subject: [PATCH 1433/3449] highlight: 3.28 -> 3.35

---
 pkgs/tools/text/highlight/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index eb6359ba9782..3d8bfbf03f82 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -2,19 +2,23 @@
 
 stdenv.mkDerivation rec {
   name = "highlight-${version}";
-  version = "3.28";
+  version = "3.35";
 
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/${name}.tar.bz2";
-    sha256 = "1kg73isgz3czb1k6ccajqzifahr3zs9ci8168k0dlj31j1nlndin";
+    sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05";
   };
 
-  buildInputs = [ getopt lua boost pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ getopt lua boost ];
 
   preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"'';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Source code highlighting tool";
-    platforms = stdenv.lib.platforms.unix;
+    homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php";
+    platforms = platforms.unix;
+    maintainers = maintainers.ndowens;
   };
 }

From fe33c28ec94b8d6d533b08965671cd04100c2c0a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Mar 2017 02:50:11 +0300
Subject: [PATCH 1434/3449] blender: fix libOpenCL path

---
 pkgs/applications/misc/blender/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index a7b15646f036..335d0031b32c 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -2,7 +2,7 @@
 , ilmbase, libXi, libX11, libXext, libXrender
 , libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python
-, zlib, fftw, opensubdiv, freetype, jemalloc
+, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd
 , jackaudioSupport ? false, libjack2
 , cudaSupport ? false, cudatoolkit
 , colladaSupport ? true, opencollada
@@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
     ++ optional cudaSupport cudatoolkit
     ++ optional colladaSupport opencollada;
 
-  postUnpack =
+  postPatch =
     ''
-      substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
+      substituteInPlace doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
+      substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"'
     '';
 
   cmakeFlags =

From 775e8eb4a49e46072790d55f720464200c06d8d2 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 18:05:03 -0600
Subject: [PATCH 1435/3449] enca: 1.16 -> 1.19

---
 pkgs/tools/text/enca/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix
index 363446d409bd..f1899b42b866 100644
--- a/pkgs/tools/text/enca/default.nix
+++ b/pkgs/tools/text/enca/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, libiconv, recode }:
 
 stdenv.mkDerivation rec {
-  name = "enca-1.16";
+  name = "enca-${version}";
+  version = "1.19";
 
   src = fetchurl {
     url = "http://dl.cihar.com/enca/${name}.tar.xz";
-    sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw";
+    sha256 = "1f78jmrggv3jymql8imm5m9yc8nqjw5l99mpwki2245l8357wj1s";
   };
 
   buildInputs = [ recode libiconv ];
 
-  meta = {
-    homepage = http://freecode.com/projects/enca;
+  meta = with stdenv.lib; {
     description = "Detects the encoding of text files and reencodes them";
 
     longDescription = ''
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
         Unicode variants, independently on language.
     '';
 
-    license = stdenv.lib.licenses.gpl2;
-
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+   
   };
 }

From bb46cde8595f74c4f9e49e0d698ef17eb7ae6270 Mon Sep 17 00:00:00 2001
From: John Chee <cheecheeo@gmail.com>
Date: Fri, 17 Feb 2017 20:01:46 +0000
Subject: [PATCH 1436/3449] zstdmt: init at 0.3

---
 pkgs/tools/compression/zstdmt/default.nix | 36 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/compression/zstdmt/default.nix

diff --git a/pkgs/tools/compression/zstdmt/default.nix b/pkgs/tools/compression/zstdmt/default.nix
new file mode 100644
index 000000000000..14dd4f21b2dc
--- /dev/null
+++ b/pkgs/tools/compression/zstdmt/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, zstd, lz4 }:
+
+stdenv.mkDerivation rec {
+  name = "zstdmt-${version}";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    sha256 = "17i44kjc612sbs7diim9ih007zp7z9zs3q3yacd6dzlqya5vsp0w";
+    rev = "v${version}";
+    repo = "zstdmt";
+    owner = "mcmilk";
+  };
+
+  sourceRoot = "zstdmt-v${version}-src/unix";
+
+  buildInputs = [
+    zstd lz4
+  ];
+
+  buildPhase = ''
+    make zstdmt lz4mt
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin/
+    mv zstdmt lz4mt $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Multithreading Library for LZ4, LZ5 and ZStandard";
+    homepage = https://github.com/mcmilk/zstdmt;
+    license = with licenses; [ bsd2 ];
+
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d136fd7dfb52..1745a237a663 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4610,6 +4610,7 @@ with pkgs;
   zsh-autosuggestions = callPackage ../shells/zsh-autosuggestions { };
 
   zstd = callPackage ../tools/compression/zstd { };
+  zstdmt = callPackage ../tools/compression/zstdmt { };
 
   zsync = callPackage ../tools/compression/zsync { };
 

From a6c6d084303ef995a889c04e5f779429d757bc30 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Mar 2017 03:16:35 +0300
Subject: [PATCH 1437/3449] samba test: fix race condition

---
 nixos/tests/samba.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix
index d6658ef0400b..e446284fc0ef 100644
--- a/nixos/tests/samba.nix
+++ b/nixos/tests/samba.nix
@@ -37,12 +37,11 @@ import ./make-test.nix ({ pkgs, ... }:
   testScript =
     ''
       $server->start;
-      $server->waitForUnit("samba-smbd");
-      $server->waitForUnit("samba-nmbd");
+      $server->waitForUnit("samba.target");
       $server->succeed("mkdir -p /public; echo bar > /public/foo");
 
       $client->start;
-      $client->waitForUnit("network.target");
+      $client->waitForUnit("remote-fs.target");
       $client->succeed("[[ \$(cat /public/foo) = bar ]]");
     '';
 })

From 5e074f10e1edd6684eb3d8c2cf924e2f265ff0cf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 11 Feb 2017 02:40:13 +0300
Subject: [PATCH 1438/3449] postgresql: remove redundant static libraries

---
 pkgs/servers/sql/postgresql/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index a94d8d101d20..50101fc5ce82 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -56,6 +56,14 @@ let
 
         # Prevent a retained dependency on gcc-wrapper.
         substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld
+
+        # Remove static libraries in case dynamic are available.
+        for i in $out/lib/*.a; do
+          name="$(basename "$i")"
+          if [ -e "$lib/lib/''${name%.a}.so" ] || [ -e "''${i%.a}.so" ]; then
+            rm "$i"
+          fi
+        done
       '';
 
     postFixup = lib.optionalString (!stdenv.isDarwin)

From ab6d358ebf897a5fe32323072efd266e91fb0784 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 1 Mar 2017 01:43:44 +0100
Subject: [PATCH 1439/3449] openisns: fix empty lib output

Looks like enable-shared defaults to false, so we actually
ended up with no usable object files in the lib output.

This also appears to have broken open-iscsi, as evinced by

/nix/store/[...]-binutils-2.27/bin/ld: cannot find -lisns
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:57: iscsid] Error 1

https://hydra.nixos.org/build/49437400/log/raw

With this patch, open-iscsi builds fine here.
---
 pkgs/os-specific/linux/open-isns/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix
index bb4ee5e98777..36cbd1581a6b 100644
--- a/pkgs/os-specific/linux/open-isns/default.nix
+++ b/pkgs/os-specific/linux/open-isns/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "lib" ];
   outputInclude = "lib";
 
+  configureFlags = [ "--enable-shared" ];
+
   installFlags = "etcdir=$(out)/etc vardir=$(out)/var/lib/isns";
   installTargets = "install install_hdrs install_lib";
 

From 38d9c0b88f33b64d94b2fd36d4b7c24420363c8a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 19:21:59 -0600
Subject: [PATCH 1440/3449] ansifilter: 1.15 -> 2.4

---
 pkgs/tools/text/ansifilter/default.nix | 34 ++++++++++++++------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/text/ansifilter/default.nix b/pkgs/tools/text/ansifilter/default.nix
index cf272f3bc81c..921dbc22d415 100644
--- a/pkgs/tools/text/ansifilter/default.nix
+++ b/pkgs/tools/text/ansifilter/default.nix
@@ -1,28 +1,30 @@
 { fetchurl, stdenv, pkgconfig, boost, lua }:
-let version = "1.15";
-    pkgsha = "65dc20cc1a03d4feba990f830186404c90462d599e5f4b37610d4d822d67aec4";
-in stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
   name = "ansifilter-${version}";
-  buildInputs = [
-    pkgconfig boost lua
-  ];
+  version = "2.4";
+
   src = fetchurl {
     url = "http://www.andre-simon.de/zip/ansifilter-${version}.tar.bz2";
-    sha256 = pkgsha;
+    sha256 = "c57cb878afa7191c7b7db3c086a344b4234df814aed632596619a4bda5941d48";
+
   };
-  meta = {
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ boost lua ];
+
+  makeFlags = "PREFIX=$(out) conf_dir=/etc/ansifilter";
+
+  meta = with stdenv.lib; {
     description = "Tool to convert ANSI to other formats";
     longDescription = ''
-    Tool to remove ANSI or convert them to another format 
-    (HTML, TeX, LaTeX, RTF, Pango or BBCode)
+      Tool to remove ANSI or convert them to another format 
+      (HTML, TeX, LaTeX, RTF, Pango or BBCode)
     '';
 
-    license = stdenv.lib.licenses.gpl1;
-    maintainers = [ stdenv.lib.maintainers.Adjective-Object ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl1;
+    maintainers = maintainers.Adjective-Object;
+    platforms = platforms.linux;
   };
-
-  makeFlags="PREFIX=$(out) conf_dir=$(out)/etc/ansifilter/";
-
 }
 

From 0e3cf999edd5118181bd1318fe104f1f820a2cac Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 19:30:26 -0600
Subject: [PATCH 1441/3449] xe: 0.5 -> 0.6.1

---
 pkgs/tools/system/xe/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
index 303374942c0d..df8bb84a4f1e 100644
--- a/pkgs/tools/system/xe/default.nix
+++ b/pkgs/tools/system/xe/default.nix
@@ -2,19 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "xe-${version}";
-  version = "0.5";
+  version = "0.6.1";
+  
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "xe";
     rev = "v${version}";
-    sha256 = "0rv9npgjb695slql39asyp6znv9r3a6jbcsrsa1cmhk82iy4bljc";
+    sha256 = "1dr3xlfq3zfdba1q96iags572lbk3z6s2179rs3pvsgkxn4m0qpf";
   };
+
   makeFlags = "PREFIX=$(out)";
+  
   meta = with lib; {
     description = "Simple xargs and apply replacement";
     homepage = "https://github.com/chneukirchen/xe";
     license = licenses.publicDomain;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = with maintainers; [ cstrahan ndowens ];
   };
 }

From fa03b8279fa9b544c29c97eaa5263163b6716046 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 1 Mar 2017 09:35:26 +0800
Subject: [PATCH 1442/3449] libbsd: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index b7ec75338801..44a1fd5b3e2b 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl }:
 
-let name = "libbsd-0.8.2";
-in stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "libbsd-${version}";
+  version = "0.8.3";
 
   src = fetchurl {
     url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj";
+    sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Common functions found on BSD systems";
     homepage = http://libbsd.freedesktop.org/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 }

From f5c98a8a72cfa04be8032436a836cd65b6b4ee36 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 20:18:28 -0600
Subject: [PATCH 1443/3449] ioping: 0.9 -> 1.0

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

diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index bd01dc8377b9..92235fde8f35 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "ioping-${version}";
-  version = "0.9";
-  src = fetchurl {
-    url = "https://github.com/koct9i/ioping/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0pbp7b3304y9yyv2w41l3898h5q8w77hnnnq1vz8qz4qfl4467lm";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "koct9i";
+    repo = "ioping";
+    rev = "v${version}";
+    sha256 = "0yn7wgd6sd39zmr5l97zd6sq1ah7l49k1h7dhgx0nv96fa4r2y9h";
   };
 
   makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     description = "Disk I/O latency measuring tool";
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin ndowens ];
     platforms = platforms.unix;
     license = licenses.gpl3Plus;
     homepage = https://github.com/koct9i/ioping;

From 64d4bfd1397b48236199a660c49ad60f13188365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 1 Mar 2017 08:41:44 +0100
Subject: [PATCH 1444/3449] ploticus: fixup a manual-page symlink

With new man compression this caused a build error.
---
 pkgs/tools/graphics/ploticus/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix
index b855410f37f2..d0e678578723 100644
--- a/pkgs/tools/graphics/ploticus/default.nix
+++ b/pkgs/tools/graphics/ploticus/default.nix
@@ -15,6 +15,12 @@ stdenv.mkDerivation {
 
   patches = [ ./ploticus-install.patch ];
 
+  # Make the symlink relative instead of absolute.
+  # Otherwise it breaks when auto-moved to $out/share.
+  preFixup = ''
+    ln -sf pl.1 "$out"/man/man1/ploticus.1
+  '';
+
   meta = with stdenv.lib; {
     description = "A non-interactive software package for producing plots and charts";
     longDescription = ''Ploticus is a free, GPL'd, non-interactive

From 2ea14b1b83d6d07a0f422a5a64dcf6f43e171011 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Wed, 1 Mar 2017 10:47:43 +0100
Subject: [PATCH 1445/3449] tmate: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index baadd6f30646..f02c41484818 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tmate-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
-    owner  = "nviennot";
+    owner  = "tmate-io";
     repo   = "tmate";
     rev    = version;
-    sha256 = "1w3a7na0yj1y0x24qckc7s2y9xfak5iv6vyqrd0iibn3b7dxarli";
+    sha256 = "0pfl9vrswzim9ydi1n652h3rax2zrmy6sqkp0r09yy3lw83h4y1r";
   };
 
   buildInputs = [ autoconf automake pkgconfig libtool zlib openssl libevent ncurses cmake ruby libmsgpack libssh ];

From 516a7fc7bdd59b33f8501a2a95173e7522c8c641 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 1 Mar 2017 13:45:33 +0300
Subject: [PATCH 1446/3449] kmscon service: disable systemd-vconsole-setup

cc #22470.
---
 nixos/modules/services/ttys/kmscon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix
index ba25f9128445..8bad42927e3f 100644
--- a/nixos/modules/services/ttys/kmscon.nix
+++ b/nixos/modules/services/ttys/kmscon.nix
@@ -76,7 +76,7 @@ in {
           ln -s ${config.systemd.units."kmsconvt@.service".unit}/kmsconvt@.service $out/autovt@.service
         '';
 
-    systemd.services.systemd-vconsole-setup.restartIfChanged = false;
+    systemd.services.systemd-vconsole-setup.enable = false;
 
     services.kmscon.extraConfig = mkIf cfg.hwRender ''
       drm

From 6e9133fec1ea45b0852eda97d1ab02395ac090ef Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Wed, 1 Mar 2017 05:52:23 -0600
Subject: [PATCH 1447/3449] erlangR19: 19.2 -> 19.2.3

This fixes dialyzer for me.

- http://erlang.org/pipermail/erlang-bugs/2017-January/005213.html
- https://github.com/erlang/otp/commit/e27119948fc6ab28bea81019720bddaac5b655a7
---
 pkgs/development/interpreters/erlang/R19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index d08c4e517cb7..fc9db7d9bfb6 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -21,7 +21,7 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
   + "${optionalString javacSupport "-javac"}";
-  version = "19.2";
+  version = "19.2.3";
 
   # Minor OTP releases are not always released as tarbals at
   # http://erlang.org/download/ So we have to download from
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "erlang";
     repo = "otp";
     rev = "OTP-${version}";
-    sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk";
+    sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c";
   };
 
   buildInputs =

From 1c4d8de99b5ee255d3a082b10e90cf472bb7ddea Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Mar 2017 07:41:08 -0500
Subject: [PATCH 1448/3449] nix-buffer: 1.2.3 -> 2.0.0

---
 pkgs/applications/editors/emacs-modes/melpa-generated.nix   | 6 +++---
 .../editors/emacs-modes/melpa-stable-generated.nix          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index f9aef05a4d7c..9e403f5aaab6 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -45566,12 +45566,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20160908.523";
+        version = "20170301.417";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755";
-          sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0";
+          rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267";
+          sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 99ac15d14f90..1b7035509d67 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -22123,12 +22123,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "1.2.3";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "2e2324c7f3a3ef27c9cb9cc3945cd82bec6b7755";
-          sha256 = "18ys3ddla3z733r4jf2nnfkllclrq496i08pfiyvkj6l3jnghzx0";
+          rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267";
+          sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";

From 59036096b72fd36b66ae838ce6197d76174e1a4f Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Wed, 1 Mar 2017 13:01:13 +0000
Subject: [PATCH 1449/3449] pandas: Mark broken in i686.See #23253.

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

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index a923e553582c..21a7755c4097 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -82,10 +82,13 @@ in buildPythonPackage rec {
   '';
 
   meta = {
+    # https://github.com/pandas-dev/pandas/issues/14866
+    # pandas devs are no longer testing i686 so safer to assume it's broken
+    broken = stdenv.isi686;
     homepage = "http://pandas.pydata.org/";
     description = "Python Data Analysis Library";
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ raskin fridh ];
     platforms = stdenv.lib.platforms.unix;
   };
-}
\ No newline at end of file
+}

From b67ce6baf9e0e3601d7d8c63ad8b1ab66f6145fb Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Tue, 28 Feb 2017 22:51:28 -0600
Subject: [PATCH 1450/3449] cockatrice: 2015-09-24 -> 2017-01-20

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

diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index 170778b72a98..3189f3946b73 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
     name = "${pname}-${version}";
     pname = "cockatrice";
-    version = "2015-09-24";
+    version = "2017-01-20";
 
     src = fetchurl {
         url = "https://github.com/Cockatrice/Cockatrice/archive/${version}-Release.tar.gz";
-        sha256 = "068f93k3bg4cmdm0iyh2vfmk51nnzf3d6g6cvlm5q8dz1zk5nwzf";
+        sha256 = "1gbcn8vffqdagidlamx670jxymhzaw28r4c6aqg3pq0s6by1l65f";
     };
 
     buildInputs = [

From fb81abdc7d91c525b8ccbce8827352b4be59db4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Wed, 1 Mar 2017 09:27:51 +0100
Subject: [PATCH 1451/3449] cockatrice: add unstable version prefix

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

diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix
index 3189f3946b73..fa3b906268dc 100644
--- a/pkgs/games/cockatrice/default.nix
+++ b/pkgs/games/cockatrice/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-    name = "${pname}-${version}";
+    name = "${pname}-unstable-${version}";
     pname = "cockatrice";
     version = "2017-01-20";
 

From b8812dfeacf9f55605d03b61b7b4b8a627d44739 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 1 Mar 2017 14:59:45 +0100
Subject: [PATCH 1452/3449] profanity: 0.5.0 -> 0.5.1

---
 .../networking/instant-messengers/profanity/default.nix      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index e556eeb72834..32f4f8f32b36 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "profanity-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "http://www.profanity.im/profanity-${version}.tar.gz";
-    sha256 = "0s4njc4rcaii51qw1najxa0fa8bb2fnas00z47y94wdbdsmfhfvq";
+    sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
   };
 
   buildInputs = [
@@ -35,5 +35,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.devhell ];
+    updateWalker = true;
   };
 }

From 614afce3a88bf845e1116f0f2958b4c111ca238e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 08:29:46 -0600
Subject: [PATCH 1453/3449] dos2unix: 7.3.2 -> 7.3.4 (#23310)

---
 pkgs/tools/text/dos2unix/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index c4bb077ef233..338967e5b9a0 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,24 +1,26 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "dos2unix-7.3.2";
-  
+  name = "dos2unix-${version}";
+  version = "7.3.4";
+
   src = fetchurl {
     url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
-    sha256 = "12c68c6wjnwrkyjj99fn6d0i4bf53aldj259lhjwq0g0nc5yxs67";
+    sha256 = "1i9hbxn0br7xa18z4bjpkdv7mrzmbfxhm44mzpd07yd2qnxsgkcc";
   };
 
   configurePhase = ''
-    sed -i -e s,/usr,$out, Makefile
-  '';
+    substituteInPlace Makefile \
+    --replace /usr $out
+    '';
 
   buildInputs = [ perl gettext ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://waterlan.home.xs4all.nl/dos2unix.html;
     description = "Tools to transform text files from dos to unix formats and vicervesa";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [viric ndowens ];
+    
   };
 }

From 080b28054ad9a57d3f2d6f411d62c837c0fbb084 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 1 Mar 2017 15:39:13 +0100
Subject: [PATCH 1454/3449] haskellPackages.DPutils: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index fc0edb9e6f3f..2a8ae386b8f4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -868,4 +868,7 @@ self: super: {
 
   # https://github.com/jswebtools/language-ecmascript/pull/81
   language-ecmascript = doJailbreak super.language-ecmascript;
+
+  # https://github.com/choener/DPutils/pull/1
+  DPutils = doJailbreak super.DPutils;
 }

From eea7819af80096919832228259db7053d7e2f41d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 1 Mar 2017 15:51:18 +0100
Subject: [PATCH 1455/3449] haskellPackages.gl: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2a8ae386b8f4..50ce7434babd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -119,7 +119,7 @@ self: super: {
   diagrams = dontHaddock super.diagrams;
   either = dontHaddock super.either;
   feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
-  gl = dontHaddock super.gl;
+  gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unrleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133
   groupoids = dontHaddock super.groupoids;
   hamlet = dontHaddock super.hamlet;
   HaXml = dontHaddock super.HaXml;

From 12ca09d14eaa837289eaba5fdf20b6c706475473 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 1 Mar 2017 15:56:16 +0100
Subject: [PATCH 1456/3449] haskellPackages.machines: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 50ce7434babd..3ab5fcc015e1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -119,7 +119,7 @@ self: super: {
   diagrams = dontHaddock super.diagrams;
   either = dontHaddock super.either;
   feldspar-signal = dontHaddock super.feldspar-signal; # https://github.com/markus-git/feldspar-signal/issues/1
-  gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unrleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133
+  gl = doJailbreak (dontHaddock super.gl); # jailbreak fixed in unreleased (2017-03-01) https://github.com/ekmett/gl/commit/885e08a96aa53d80c3b62e157b20d2f05e34f133
   groupoids = dontHaddock super.groupoids;
   hamlet = dontHaddock super.hamlet;
   HaXml = dontHaddock super.HaXml;
@@ -871,4 +871,7 @@ self: super: {
 
   # https://github.com/choener/DPutils/pull/1
   DPutils = doJailbreak super.DPutils;
+
+  # fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0
+  machines = doJailbreak super.machines;
 }

From 0495b34782605f8e8836dfaf7d97ee18358cccb4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 1 Mar 2017 18:03:30 +0200
Subject: [PATCH 1457/3449] trinity: Apply upstream commit as a patch to fix
 build

Needed since glibc 2.25.
---
 pkgs/os-specific/linux/trinity/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
index a60175900cd7..1a6719715d2b 100644
--- a/pkgs/os-specific/linux/trinity/default.nix
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, linuxHeaders }:
+{ stdenv, fetchurl, fetchFromGitHub, linuxHeaders }:
 
 stdenv.mkDerivation rec {
   name = "trinity-${version}";
@@ -11,7 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1jwgsjjbngn2dsnkflyigy3ajd0szksl30dlaiy02jc6mqi3nr0p";
   };
 
-  patchPhase = ''
+  patches = stdenv.lib.singleton (fetchurl {
+    url = "https://github.com/kernelslacker/trinity/commit/b0e66a2d084ffc210bc1fc247efb4d177e9f7e3d.patch";
+    sha256 = "0468fdzbsj3n3k43qm8hf56pa020qn57ripcykv9jfwp215lf0an";
+  });
+
+  postPatch = ''
     patchShebangs ./configure.sh
     patchShebangs ./scripts/
     substituteInPlace Makefile --replace '/usr/bin/wc' 'wc'
@@ -20,6 +25,8 @@ stdenv.mkDerivation rec {
 
   configurePhase = "./configure.sh";
 
+  enableParallelBuilding = true;
+
   installPhase = "make DESTDIR=$out install";
 
   meta = with stdenv.lib; {

From bae77363c33533be95a65fd086dac4e879013f24 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Mar 2017 11:00:07 -0500
Subject: [PATCH 1458/3449] nixBufferBuilders.withPackages: Fix buffer count
 logic

---
 pkgs/build-support/emacs/buffer.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix
index e366fd1f739f..1cbac0709a66 100644
--- a/pkgs/build-support/emacs/buffer.nix
+++ b/pkgs/build-support/emacs/buffer.nix
@@ -12,15 +12,16 @@
       ; Only set up nixpkgs buffer handling when we have some buffers active
       (defvar nixpkgs--buffer-count 0)
       (when (eq nixpkgs--buffer-count 0)
+        (make-variable-buffer-local 'nixpkgs--is-nixpkgs-buffer)
         ; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer
         (defun nixpkgs--around-generate (orig name)
-          (if (eq (aref name 0) ?\s)
+          (if (and nixpkgs--is-nixpkgs-buffer (eq (aref name 0) ?\s))
               (let ((buf (funcall orig name)))
-                (when (inherit-local-inherit-child buf)
+                (progn
+                  (inherit-local-inherit-child buf)
                   (with-current-buffer buf
-                    (make-local-variable 'kill-buffer-hook)
                     (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
-                    (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count)))
+                    (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t)))
                 buf)
             (funcall orig name)))
         (advice-add 'generate-new-buffer :around #'nixpkgs--around-generate)
@@ -32,8 +33,7 @@
             (fmakunbound 'nixpkgs--around-generate)
             (fmakunbound 'nixpkgs--decrement-buffer-count))))
       (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count))
-      (make-local-variable 'kill-buffer-hook)
-      (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count)
+      (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count nil t)
 
       ; Add packages to PATH and exec-path
       (make-local-variable 'process-environment)
@@ -42,6 +42,9 @@
       (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH")))
       (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path))
 
+      (setq nixpkgs--is-nixpkgs-buffer t)
+      (inherit-local 'nixpkgs--is-nixpkgs-buffer)
+
       ${lib.concatStringsSep "\n" extras}
     '';
 }

From a27bc8b3174fa1847b5ca9f85d921c3e472cbeb1 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Mar 2017 11:03:00 -0500
Subject: [PATCH 1459/3449] haskell generic-builder: Pass through the ghcEnv.

Will be useful for nix-buffer
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 42ea03693ecd..7c3f64241934 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -303,7 +303,7 @@ stdenv.mkDerivation ({
 
   passthru = passthru // {
 
-    inherit pname version;
+    inherit pname version ghcEnv;
 
     isHaskellLibrary = hasActiveLibrary;
 

From fd770dd176918658de6fb72f3bc4ce88388c6427 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 1 Mar 2017 17:01:27 +0100
Subject: [PATCH 1460/3449] haskellPackages.OrderedBits: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3ab5fcc015e1..adccc0c51f2f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -874,4 +874,7 @@ self: super: {
 
   # fixed in unreleased (2017-03-01) https://github.com/ekmett/machines/commit/5463cf5a69194faaec2345dff36469b4b7a8aef0
   machines = doJailbreak super.machines;
+
+  # fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab
+  OrderedBits = doJailbreak super.OrderedBits;
 }

From a3e432129762354c50f927eebe30d885c73ded8c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 1 Mar 2017 17:08:56 +0100
Subject: [PATCH 1461/3449] haskellPackages.rank1dynamic: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index adccc0c51f2f..30be830f6b95 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -877,4 +877,7 @@ self: super: {
 
   # fixed in unreleased (2017-03-01) https://github.com/choener/OrderedBits/commit/7b9c6c6c61d9acd0be8b38939915d287df3c53ab
   OrderedBits = doJailbreak super.OrderedBits;
+
+  # https://github.com/haskell-distributed/rank1dynamic/issues/17
+  rank1dynamic = doJailbreak super.rank1dynamic;
 }

From b2919b454ff54451c21d68c0b17f4b946dd7ac88 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 1 Mar 2017 17:25:17 +0100
Subject: [PATCH 1462/3449] haskellPackages.cabal-lenses: fix build

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 30be830f6b95..cd88262c919a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -880,4 +880,6 @@ self: super: {
 
   # https://github.com/haskell-distributed/rank1dynamic/issues/17
   rank1dynamic = doJailbreak super.rank1dynamic;
+
+  cabal-lenses = doJailbreak super.cabal-lenses;
 }

From d12030d17589bc19686d300748362b82c41950b4 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 20:38:22 -0600
Subject: [PATCH 1463/3449] hwinfo: 21.23 -> 21.38

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

diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 57dfbbeeeb9a..8dd95a8b4dec 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, libx86emu, flex, perl }:
+{ stdenv, fetchFromGitHub, libx86emu, flex, perl }:
 
 stdenv.mkDerivation rec {
   name = "hwinfo-${version}";
-  version = "21.23";
+  version = "21.38";
 
-  src = fetchurl {
-    url = "https://github.com/opensuse/hwinfo/archive/${version}.tar.gz";
-    sha256 = "1a8815zp3a7n2jx0cn0hcr69rfr6vmw8r8grbn5mv61g90bbcj6p";
+  src = fetchFromGitHub {
+    owner = "opensuse";
+    repo = "hwinfo";
+    rev = "${version}";
+    sha256 = "17a1nx906gdl9br1wf6xmhjy195szaxxmyb119vayw4q112rjdql";
   };
 
   patchPhase = ''
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "Hardware detection tool from openSUSE";
     license = licenses.gpl2;
     homepage = https://github.com/openSUSE/hwinfo;
-    maintainers = with maintainers; [ bobvanderlinden ];
+    maintainers = with maintainers; [ bobvanderlinden ndowens ];
     platforms = platforms.unix;
   };
 }

From f5e53aea5db571a9b03600cbb6e10621c5bdab6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 1 Mar 2017 18:04:18 +0100
Subject: [PATCH 1464/3449] nixUnstable: 1.12pre4997_1351b0d ->
 1.12pre5060_fa125b9

---
 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 94cc7b9d2c48..742ddecf6ddf 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -112,12 +112,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre4997_1351b0d";
+    suffix = "pre5060_fa125b9";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "1351b0df87a0984914769c5dc76489618b3a3fec";
-      sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1";
+      rev = "fa125b9b28bea25a4eeb4d39a71a481563127cb9";
+      sha256 = "1l7prlki3rjw3i119cizqqkpqg4p3hvym103x7hddimwpzwkw756";
     };
     fromGit = true;
   });

From 96d774747bb04a95f39f1336a56248012bd007fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 1 Mar 2017 18:01:40 +0100
Subject: [PATCH 1465/3449] simavr: 1.3 -> 1.5 (fixes build)

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

diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 823f93f9ac4f..82c2c131f07f 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -3,14 +3,14 @@
 
 stdenv.mkDerivation rec {
   name = "simavr-${version}";
-  version = "1.3";
+  version = "1.5";
   enableParallelBuilding = true;
 
   src = fetchFromGitHub {
     owner = "buserror";
     repo = "simavr";
-    rev = "51d5fa69f9bc3d62941827faec02f8fbc7e187ab";
-    sha256 = "0k8xwzw9i6xsmf98q43fxhphq0wvflvmzqma1n4jd1ym9wi48lfx";
+    rev = "e0d4de41a72520491a4076b3ed87beb997a395c0";
+    sha256 = "0b2lh6l2niv80dmbm9xkamvnivkbmqw6v97sy29afalrwfxylxla";
   };
 
   buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}";

From 56f5eaae86730289a1ee45d04039d5aa3ccae394 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 1 Mar 2017 18:37:45 +0100
Subject: [PATCH 1466/3449] yoshimi: 1.4.1 -> 1.5.0

---
 pkgs/applications/audio/yoshimi/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 0f6bd45df276..ef10bfed9b66 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "133sx42wb66g803pcrgdwph40wh94knvab3yfqkgm0001jv4v14y";
+    sha256 = "10s1i18xlmvqfrnr0zn2mj2b28i7p62dlqzzzkmpaapqj1gsgpz5";
   };
 
   buildInputs = [
@@ -20,9 +20,13 @@ stdenv.mkDerivation  rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  patchPhase = ''
+    sed -i -e 's,/usr/share,'$out/share,g src/Misc/Config.cpp src/Misc/Bank.cpp
+  '';
+
   preConfigure = "cd src";
 
-  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so -DCMAKE_INSTALL_DATAROOTDIR=$out" ];
+  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ];
 
   meta = with stdenv.lib; {
     description = "High quality software synthesizer based on ZynAddSubFX";

From b0cff509837789ce732a648c1b37bccc9b302af4 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Mar 2017 12:59:48 -0500
Subject: [PATCH 1467/3449] nix-buffer: 2.0.0 -> 2.1.0

---
 pkgs/applications/editors/emacs-modes/melpa-generated.nix   | 6 +++---
 .../editors/emacs-modes/melpa-stable-generated.nix          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 9e403f5aaab6..6f67650e7636 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -45566,12 +45566,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170301.417";
+        version = "20170301.951";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267";
-          sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip";
+          rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821";
+          sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 1b7035509d67..b9d306d6a0ac 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -22123,12 +22123,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "2.0.0";
+        version = "2.1.0";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "6e8a0a1a9b820c35ece2d29c7215cd6ce8292267";
-          sha256 = "0qdflqvridzgjjzq7lckdqb831c8d98wx8mfls3mjdanqpf85mip";
+          rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821";
+          sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";

From c153036525575d046fc808a4805d023e3e2e9e75 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 1 Mar 2017 13:00:57 -0500
Subject: [PATCH 1468/3449] haskell generic-builder: Pass through the list of
 haskell build inputs.

Useful for building custom envs.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7c3f64241934..964f569ef67a 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -303,7 +303,7 @@ stdenv.mkDerivation ({
 
   passthru = passthru // {
 
-    inherit pname version ghcEnv;
+    inherit pname version ghcEnv haskellBuildInputs;
 
     isHaskellLibrary = hasActiveLibrary;
 

From c393512809513a88e55e060abd1248e6f5a688d7 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 19:10:08 -0600
Subject: [PATCH 1469/3449] catdoc: 0.94.2 -> 0.95

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

diff --git a/pkgs/tools/text/catdoc/default.nix b/pkgs/tools/text/catdoc/default.nix
index 2865e5b34826..b9db2eba5cd6 100644
--- a/pkgs/tools/text/catdoc/default.nix
+++ b/pkgs/tools/text/catdoc/default.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "catdoc-0.94.2";
+  name = "catdoc-${version}";
+  version = "0.95";
+
   src = fetchurl {
     url = "http://ftp.wagner.pp.ru/pub/catdoc/${name}.tar.gz";
-    sha256 = "0qnk8fw3wc40qa34yqz51g0knif2jd78a4717nvd3rb46q88pj83";
+    sha256 = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796";
   };
 
   configureFlags = "--disable-wordview";
@@ -12,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "MS-Word/Excel/PowerPoint to text converter";
     platforms = platforms.all;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ maintainers.urkud ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ urkud ndowens ];
   };
 }

From 3001b821c9b4908d7060b9e384ccae620107a25f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Mar 2017 19:56:08 +0100
Subject: [PATCH 1470/3449] haskell generic-builder: Revert "Pass through the
 list of haskell build inputs."

This reverts commit c153036525575d046fc808a4805d023e3e2e9e75. Please don't add
random stuff to the interface provided by the generic builder without
coordinating with others. There is a proper effort underway to provide that
information in https://github.com/NixOS/nixpkgs/pull/23023.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 964f569ef67a..7c3f64241934 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -303,7 +303,7 @@ stdenv.mkDerivation ({
 
   passthru = passthru // {
 
-    inherit pname version ghcEnv haskellBuildInputs;
+    inherit pname version ghcEnv;
 
     isHaskellLibrary = hasActiveLibrary;
 

From feffadefed82290a536c5436e81840f317a87e91 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Mar 2017 19:56:59 +0100
Subject: [PATCH 1471/3449] haskell generic-builder: Revert "Pass through the
 ghcEnv."

This reverts commit a27bc8b3174fa1847b5ca9f85d921c3e472cbeb1. Please don't add
random stuff to the interface provided by the generic builder without
coordinating with others. There is a proper effort underway to provide that
information in https://github.com/NixOS/nixpkgs/pull/23023.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 7c3f64241934..42ea03693ecd 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -303,7 +303,7 @@ stdenv.mkDerivation ({
 
   passthru = passthru // {
 
-    inherit pname version ghcEnv;
+    inherit pname version;
 
     isHaskellLibrary = hasActiveLibrary;
 

From 204850c975511cc1420d704ed3686ec3c1c5dcce Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 13:09:43 -0600
Subject: [PATCH 1472/3449] di: 4.42 -> 4.43

---
 pkgs/tools/system/di/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index baacfe6969e7..3e00ee795ff0 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "di-4.42";
+  name = "di-${version}";
+  version = "4.43";
 
   src = fetchurl {
     url = "http://gentoo.com/di/${name}.tar.gz";
-    sha256 = "1i6m9zdnidn8268q1lz9fd8payk7s4pgwh5zlam9rr4dy6h6a67n";
+    sha256 = "1q25jy51qfzsym9b2w0cqzscq2j492gn60dy6gbp88m8nwm4sdy8";
   };
 
   makeFlags = [ "INSTALL_DIR=$(out)" ];
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
     description = "Disk information utility; displays everything 'df' does and more";
     homepage = http://www.gentoo.com/di/;
     license = licenses.zlib;
-    maintainers = with maintainers; [ manveru ];
+    maintainers = with maintainers; [ manveru ndowens ];
     platforms = platforms.all;
   };
 }

From a5ed11202c772b2da8d2208b1574668a4bb608ad Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Mar 2017 20:11:02 +0100
Subject: [PATCH 1473/3449] svtplay-dl: 1.9.2 -> 1.9.3

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 1713977d20aa..a2d6caa15352 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1ajbflywfc3nfjqp95izbnxrbqjm4v56gx0am2mj0z0ypds2dvm5";
+    sha256 = "14qksi1svi89niffykxg47kay013byls6bnhkrkzkanq04075lmw";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From 337356448a9ce7f6ca4ba345af76b8625e4eb2c7 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 1 Mar 2017 20:11:20 +0100
Subject: [PATCH 1474/3449] perl-Log-Log4perl: 1.48 -> 1.49

---
 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 3689f49c631e..db37a83154e4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7561,10 +7561,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogLog4perl = buildPerlPackage rec {
-    name = "Log-Log4perl-1.48";
+    name = "Log-Log4perl-1.49";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MS/MSCHILLI/${name}.tar.gz";
-      sha256 = "cf6e9fc1f9183fabbe540d84f603c6541458034092b7c53e41008093db62dc98";
+      sha256 = "b739187f519146cb6bebcfc427c64b1f4138b35c5f4c96f46a21ed4a43872e16";
     };
     meta = {
       homepage = https://mschilli.github.io/log4perl/;

From 3df8bef60e97522de0b52e54e37fd7514bcc4062 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 18:45:06 -0600
Subject: [PATCH 1475/3449] discount: 2.2.0 -> 2.2.2

Discount: added missing update
---
 pkgs/tools/text/discount/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix
index 4112ee891b52..1fe905c98f81 100644
--- a/pkgs/tools/text/discount/default.nix
+++ b/pkgs/tools/text/discount/default.nix
@@ -1,12 +1,14 @@
 {stdenv, fetchurl}:
+
 stdenv.mkDerivation rec {
-  version = "2.2.0";
+  version = "2.2.2";
   name = "discount-${version}";
 
   src = fetchurl {
     url = "http://www.pell.portland.or.us/~orc/Code/discount/discount-${version}.tar.bz2";
-    sha256 = "1wxrv86xr8cacwhzkyzmfxg58svfnn3swbpbk5hq621ckk19alxj";
+    sha256 = "0r4gjyk1ngx47zhb25q0gkjm3bz2m5x8ngrk6rim3y1y3rricygc";
   };
+
   patches = ./fix-configure-path.patch;
   configureScript = "./configure.sh";
 
@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
     description = "Implementation of Markdown markup language in C";
     homepage = "http://www.pell.portland.or.us/~orc/Code/discount/";
     license = licenses.bsd3;
-    maintainers = [ maintainers.shell ];
+    maintainers = with maintainers; [ shell ndowens ];
     platforms = platforms.unix;
   };
 }

From d9bc4145212b103275f402b14ce989e42b35d992 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 13:38:11 -0600
Subject: [PATCH 1476/3449] augeas: 1.5.0 -> 1.7.0

---
 pkgs/tools/system/augeas/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index c8a4c2616de8..63bb8c1f9851 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "augeas-${version}";
-  version = "1.5.0";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "http://download.augeas.net/${name}.tar.gz";
-    sha256 = "0gzpafrflkr0incq58vjkabfncrpc97d7mdgglkr57iyzvkbcfr2";
+    sha256 = "0qwpjz23z1x7dkf5k2y9f1cppryzhx4hpxprla6a4yvzs1smacdr";
   };
-
-  buildInputs = [ pkgconfig readline libxml2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ readline libxml2 ];
 
   meta = with stdenv.lib; {
     description = "Configuration editing tool";
     license = licenses.lgpl2;
     homepage = http://augeas.net/;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [ offline ndowens ];
     platforms = platforms.unix;
   };
 }

From fff88b814c6bec72aee960e843d14936317a5e09 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Tue, 28 Feb 2017 14:14:24 -0600
Subject: [PATCH 1477/3449] graphicsmagick: fix for darwin

Prior to this change, GraphicsMagick didn't work at all for me on Darwin, due to
dylib linking issues.
---
 pkgs/applications/graphics/graphicsmagick/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 4b75d0ccc6b6..f655979c2ccc 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
-, libwebp, quantumdepth ? 8 }:
+, libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
 let version = "1.3.25"; in
 
@@ -53,7 +53,8 @@ stdenv.mkDerivation {
   buildInputs =
     [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
       zlib libtool libwebp
-    ];
+    ]
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   nativeBuildInputs = [ xz ];
 

From 8dcfa44a538396939f5b777b1ef43a453aeecaa6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 1 Mar 2017 22:18:28 +0200
Subject: [PATCH 1478/3449] memtest86: Mark as broken

It fails with hardening-related errors like:

reloc.o: In function `.L41':
reloc.c:(.text+0x452): undefined reference to `__stack_chk_fail_local'

... and several others as well!

Since nobody has noticed that this package has been broken the entire
16.09 release, it's probably not worth to try fixing it.

(Note that this is a different package from memtest86plus!)
---
 pkgs/tools/misc/memtest86/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix
index 6fccff7781d4..810bc36fb723 100644
--- a/pkgs/tools/misc/memtest86/default.nix
+++ b/pkgs/tools/misc/memtest86/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://memtest86.com/;
     description = "A tool to detect memory errors, to be run from a bootloader";
+    broken = true;
   };
 }

From 085502dd8084998a295323b8ba0802b211da0e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Wed, 1 Mar 2017 21:46:49 +0100
Subject: [PATCH 1479/3449] cytoscape: fixed issue with startup script

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

diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix
index 3eaf91be58f9..6b13d969bdd7 100644
--- a/pkgs/applications/science/misc/cytoscape/default.nix
+++ b/pkgs/applications/science/misc/cytoscape/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
     ln -s $out/share/cytoscape.sh $out/bin/cytoscape
 
-    wrapProgram $out/share/gen_vmoptions.sh \
+    wrapProgram $out/share/cytoscape.sh \
       --set JAVA_HOME "${jre}" \
       --set JAVA  "${jre}/bin/java"
 

From 247408d26fc200ba93fcb64e39114a4a2c87d11c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 1 Mar 2017 21:54:34 +0100
Subject: [PATCH 1480/3449] pythonPackages.dateutil: 2.5.3 -> 2.6.0

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

diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix
new file mode 100644
index 000000000000..8e05ee343573
--- /dev/null
+++ b/pkgs/development/python-modules/dateutil/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchurl, six }:
+buildPythonPackage rec {
+  name = "dateutil-${version}";
+  version = "2.6.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
+    sha256 = "1lhq0hxjc3cfha101q02ld5ijlpfyjn2w1yh7wvpiy367pgzi8k2";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  meta = with stdenv.lib; {
+    description = "Powerful extensions to the standard datetime module";
+    homepage = http://pypi.python.org/pypi/python-dateutil;
+    license = "BSD-style";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a92359cb9ab..cc5cb5833a65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5938,23 +5938,7 @@ in {
     };
   };
 
-  dateutil = buildPythonPackage (rec {
-    name = "dateutil-${version}";
-    version = "2.5.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-dateutil/python-${name}.tar.gz";
-      sha256 = "1v9j9fmf8g911yg6k01xa2db6dx3wv73zkk7fncsj7vagjqgs20l";
-    };
-
-    propagatedBuildInputs = with self; [ self.six ];
-
-    meta = {
-      description = "Powerful extensions to the standard datetime module";
-      homepage = http://pypi.python.org/pypi/python-dateutil;
-      license = "BSD-style";
-    };
-  });
+  dateutil = callPackage ../development/python-modules/dateutil { };
 
   # csvkit 0.9.1 needs dateutil==2.2
   dateutil_2_2 = buildPythonPackage (rec {

From fcec3e1c72ad7ac7eaacd00c8fc87dc04696fdb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 1 Mar 2017 18:20:22 +0100
Subject: [PATCH 1481/3449] Revert "modules: add support for module replacement
 with disabledModules"

This reverts commit 3f2566689d14f1d7778d55ca807d1dad2f4695d1 for now.
Evaluation of the tested job got broken, blocking nixos-unstable.
---
 lib/modules.nix                               | 24 ++----
 lib/tests/modules.sh                          |  8 --
 lib/tests/modules/default.nix                 |  1 -
 lib/tests/modules/disable-declare-enable.nix  |  5 --
 lib/tests/modules/disable-define-enable.nix   |  5 --
 lib/tests/modules/disable-enable-modules.nix  |  5 --
 .../manual/development/replace-modules.xml    | 75 -------------------
 .../manual/development/writing-modules.xml    |  1 -
 nixos/doc/manual/release-notes/rl-1703.xml    | 10 ---
 9 files changed, 7 insertions(+), 127 deletions(-)
 delete mode 100644 lib/tests/modules/disable-declare-enable.nix
 delete mode 100644 lib/tests/modules/disable-define-enable.nix
 delete mode 100644 lib/tests/modules/disable-enable-modules.nix
 delete mode 100644 nixos/doc/manual/development/replace-modules.xml

diff --git a/lib/modules.nix b/lib/modules.nix
index de9cfc637ae2..4eee41306cd7 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -20,8 +20,7 @@ rec {
                 , prefix ? []
                 , # This should only be used for special arguments that need to be evaluated
                   # when resolving module structure (like in imports). For everything else,
-                  # there's _module.args. If specialArgs.modulesPath is defined it will be
-                  # used as the base path for disabledModules.
+                  # there's _module.args.
                   specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
@@ -59,7 +58,10 @@ rec {
 
       closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs);
 
-      options = mergeModules prefix (filterModules (specialArgs.modulesPath or "") closed);
+      # Note: the list of modules is reversed to maintain backward
+      # compatibility with the old module system.  Not sure if this is
+      # the most sensible policy.
+      options = mergeModules prefix (reverseList closed);
 
       # Traverse options and extract the option values into the final
       # config set.  At the same time, check whether all option
@@ -85,16 +87,6 @@ rec {
       result = { inherit options config; };
     in result;
 
-
- # Filter disabled modules. Modules can be disabled allowing
- # their implementation to be replaced.
- filterModules = modulesPath: modules:
-   let
-     moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m;
-     disabledKeys = map moduleKey (concatMap (m: m.disabledModules) modules);
-   in
-     filter (m: !(elem m.key disabledKeys)) modules;
-
   /* Close a set of modules under the ‘imports’ relation. */
   closeModules = modules: args:
     let
@@ -119,13 +111,12 @@ rec {
       else {};
     in
     if m ? config || m ? options then
-      let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in
+      let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file" "meta"]; in
       if badAttrs != {} then
         throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'."
       else
         { file = m._file or file;
           key = toString m.key or key;
-          disabledModules = m.disabledModules or [];
           imports = m.imports or [];
           options = m.options or {};
           config = mkMerge [ (m.config or {}) metaSet ];
@@ -133,10 +124,9 @@ rec {
     else
       { file = m._file or file;
         key = toString m.key or key;
-        disabledModules = m.disabledModules or [];
         imports = m.require or [] ++ m.imports or [];
         options = {};
-        config = mkMerge [ (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]) metaSet ];
+        config = mkMerge [ (removeAttrs m ["key" "_file" "require" "imports"]) metaSet ];
       };
 
   applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index ba0c67fb7d42..8b476a5d3dcc 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -99,14 +99,6 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-if-foo-enabl
 checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enable.nix
 checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix
 
-# Check disabledModules with config definitions and option declarations.
-set -- config.enable ./define-enable.nix ./declare-enable.nix
-checkConfigOutput "true" "$@"
-checkConfigOutput "false" "$@" ./disable-define-enable.nix
-checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix
-checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix
-checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix
-
 # Check _module.args.
 set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix
 checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@"
diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix
index 5b0947104198..c5ce9cb3e3b8 100644
--- a/lib/tests/modules/default.nix
+++ b/lib/tests/modules/default.nix
@@ -3,6 +3,5 @@
 {
   inherit (lib.evalModules {
     inherit modules;
-    specialArgs.modulesPath = ./.;
   }) config options;
 }
diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix
deleted file mode 100644
index a373ee7e550e..000000000000
--- a/lib/tests/modules/disable-declare-enable.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  disabledModules = [ ./declare-enable.nix ];
-}
diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix
deleted file mode 100644
index 0d84a7c3cb6c..000000000000
--- a/lib/tests/modules/disable-define-enable.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  disabledModules = [ ./define-enable.nix ];
-}
diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix
deleted file mode 100644
index c325f4e07431..000000000000
--- a/lib/tests/modules/disable-enable-modules.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ lib, ... }:
-
-{
-  disabledModules = [ "define-enable.nix" "declare-enable.nix" ];
-}
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml
deleted file mode 100644
index cc0539ec5109..000000000000
--- a/nixos/doc/manual/development/replace-modules.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<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-replace-modules">
-
-<title>Replace Modules</title>
-
-<para>Modules that are imported can also be disabled.  The option
-  declarations and config implementation of a disabled module will be
-  ignored, allowing another to take it's place.  This can be used to
-  import a set of modules from another channel while keeping the rest
-  of the system on a stable release.</para>
-<para><literal>disabledModules</literal> is a top level attribute like
-  <literal>imports</literal>, <literal>options</literal> and
-  <literal>config</literal>.  It contains a list of modules that will
-  be disabled. This can either be the full path to the module or a
-  string with the filename relative to the modules path
-  (eg. &lt;nixpkgs/nixos/modules&gt; for nixos).
-  </para>
-
-<para>This example will replace the existing postgresql module with
-  the version defined in the nixos-unstable channel while keeping the
-  rest of the modules and packages from the original nixos channel.
-  This only overrides the module definition, this won't use postgresql
-  from nixos-unstable unless explicitly configured to do so.</para>
-
-<programlisting>
-{ config, lib, pkgs, ... }:
-
-{
-  disabledModules = [ "services/databases/postgresql.nix" ];
-
-  imports =
-    [ # Use postgresql service from nixos-unstable channel.
-      # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable
-      &lt;nixos-unstable/nixos/modules/services/databases/postgresql.nix&gt;
-    ];
-
-  services.postgresql.enable = true;
-}
-</programlisting>
-
-<para>This example shows how to define a custom module as a
-  replacement for an existing module. Importing this module will
-  disable the original module without having to know it's
-  implementation details.</para>
-
-<programlisting>
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.man;
-in
-
-{
-  disabledModules = [ "services/programs/man.nix" ];
-
-  options = {
-    programs.man.enable = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Whether to enable manual pages.";
-    };
-  };
-
-  config = mkIf cfg.enabled {
-    warnings = [ "disabled manpages for production deployments." ];
-  };
-}
-</programlisting>
-
-</section>
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index 5bdcad5ceb57..ef6920160e6d 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -179,6 +179,5 @@ in {
 <xi:include href="option-types.xml" />
 <xi:include href="option-def.xml" />
 <xi:include href="meta-attributes.xml" />
-<xi:include href="replace-modules.xml" />
 
 </chapter>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index cea8b93b075c..fda46217144c 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -261,16 +261,6 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
-  <listitem>
-    <para>
-      Modules can now be disabled by using <link
-      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
-      disabledModules</link>, allowing another to take it's place.  This can be
-      used to import a set of modules from another channel while keeping the
-      rest of the system on a stable release.
-    </para>
-  </listitem>
-
   <listitem>
     <para>
       Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.

From b12b4eaca6f2016af3dedb5e049dea0fc6898540 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Wed, 1 Mar 2017 23:34:37 +0100
Subject: [PATCH 1482/3449] phc-intel: 0.4.0-rev22 -> 0.4.0-rev24

Fixes Hydra failures on kernel >= 4.10 by only supporting kernel >= 4.10.
---
 pkgs/os-specific/linux/phc-intel/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index cb3201110174..85edfa41fa2f 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -2,20 +2,20 @@
 
 assert stdenv.isLinux;
 # Don't bother with older versions, though some might even work:
-assert stdenv.lib.versionAtLeast kernel.version "4.3";
+assert stdenv.lib.versionAtLeast kernel.version "4.10";
 # Disable on grsecurity kernels, which break module building:
 assert !kernel.features ? grsecurity;
 
 let
   release = "0.4.0";
-  revbump = "rev22"; # don't forget to change forum download id...
+  revbump = "rev24"; # don't forget to change forum download id...
 in stdenv.mkDerivation rec {
   name = "linux-phc-intel-${version}-${kernel.version}";
   version = "${release}-${revbump}";
 
   src = fetchurl {
-    sha256 = "f80285a8cd2ebb1753841e493af0c091d55c33823777b26a93d25ed7264a385d";
-    url = "http://www.linux-phc.org/forum/download/file.php?id=172";
+    sha256 = "02b4j8ap1fy09z36pmpplbw4vpwqdi16jyzw5kl0a60ydgxkmrpz";
+    url = "http://www.linux-phc.org/forum/download/file.php?id=178";
     name = "phc-intel-pack-${revbump}.tar.bz2";
   };
 

From fdd436b3e4029b8341e9e7af1c546d758c0ff9f2 Mon Sep 17 00:00:00 2001
From: David Terry <davidterry@posteo.de>
Date: Wed, 1 Mar 2017 23:35:05 +0100
Subject: [PATCH 1483/3449] vscode: 1.9.1 -> 1.10.0

---
 pkgs/applications/editors/vscode/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 816a310f7587..a92f8633c3a8 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,24 +2,24 @@
   makeWrapper, libXScrnSaver }:
 
 let
-  version = "1.9.1";
-  rev = "f9d0c687ff2ea7aabd85fb9a43129117c0ecf519";
+  version = "1.10.0";
+  rev = "49129d126e2c3c5592cfc8a509d872067b69d262";
   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 "03lv792rkb1hgn1knd8kpic7q07cd194cr4fw1bimnjblrvyy586"
-      else if stdenv.system == "x86_64-linux"  then "1vrcb4y2y83bhxx9121afwbzm8yddfin4zy3nyxfi805pjmszwjm"
-      else if stdenv.system == "x86_64-darwin" then "0s92ing4m2qyqdkpmkhl2zj40hcdsr5x764sb6zprwwhfv4npymr"
+  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"
       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}-1486596246_i386.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1488384152_i386.tar.gz"
       else if stdenv.system == "x86_64-linux" then
-        urlBase + "code-${channel}-code_${version}-1486597190_amd64.tar.gz"
+        urlBase + "code-${channel}-code_${version}-1488387854_amd64.tar.gz"
       else if stdenv.system == "x86_64-darwin" then
         urlBase + "VSCode-darwin-${channel}.zip"
       else throw "Unsupported system: ${stdenv.system}";

From a911240518bbf309ee9aa7945c3c7605bfd5785f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 16:48:07 -0600
Subject: [PATCH 1484/3449] sstp: 1.0.10 -> 1.0.11

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

diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix
index 6dbd62679939..dce6d1acb776 100644
--- a/pkgs/tools/networking/sstp/default.nix
+++ b/pkgs/tools/networking/sstp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sstp-client-${version}";
-  version = "1.0.10";
+  version = "1.0.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz";
-    sha256 = "096lw3a881hjqnffms3bl077pjyq77870kjaf83chhjcakc8942z";
+    sha256 = "087vp3n7nv001fsgbmkjpgl3a2vhbix22cflrqi5bv9h8181p18v";
   };
 
   patchPhase =

From 32cf5c4d02d3bbdba02d4b8b5b647ce5afdf9053 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 16:53:30 -0600
Subject: [PATCH 1485/3449] speedtest-cli: 0.3.4 -> 1.0.2

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

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index b82e1e337a7c..ac23635441d4 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
-  version = "0.3.4";
+  version = "1.0.2";
   
-  src = fetchurl {
-    url = "mirror://pypi/s/speedtest-cli/speedtest-cli-${version}.tar.gz";
-    sha256 = "19i671cd815fcv0x7h2m0a493slzwkzn7r926g8myx1srkss0q6d";
+  src = fetchFromGitHub {
+    owner = "sivel";
+    repo = "speedtest-cli";
+    rev = "v${version}";
+    sha256 = "1p7lavw95w3as9b2b55i61mwxdr1b6jj40yly91f9j26ywr5dpkg";
   };
 
   meta = with stdenv.lib; {
@@ -14,6 +16,6 @@ pythonPackages.buildPythonApplication rec {
     description = "Command line interface for testing internet bandwidth using speedtest.net";
     platforms = platforms.all;
     license = licenses.asl20;
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = with maintainers; [ domenkozar ndowens ];
   };
 }

From 05054e34c0a68a60f132756985bdee769c9023c0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 1 Mar 2017 23:39:15 +0100
Subject: [PATCH 1486/3449] tor: 0.2.9.9 -> 0.2.9.10

The 0.2.9 series is now a long-term support release, which will
receive backported security fixes until at least 2020.

tor should now build against libressl, as in
```nix
tor.override { openssl = libressl; }
```

Also re-enable the test-suite; works fine on my end.
---
 pkgs/tools/security/tor/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 41cb399cb9fd..25f80a16feaf 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.9";
+  name = "tor-0.2.9.10";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "0hqdk5p6dw4bpn7c8gmhyi8jjkhc37112pfw5nx4gl0g4lmmscik";
+    sha256 = "0h8kpn42mgpkzmnga143hi8nh0ai65ypxh7qhkwbb15j3wz2h4fn";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
       --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
   '';
 
-  # Fails in a sandboxed environment; at some point we want to disable
-  # just the tests that require networking.
-  doCheck = false;
+  doCheck = true;
 
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/;

From a55e8605ba56ef6a3212b86bf5b18c27d7f0f09c Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 17:06:22 -0600
Subject: [PATCH 1487/3449] pptp: 1.8.0 -> 1.9.0

---
 pkgs/tools/networking/pptp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index e7f40ade77ea..8fcdb49b2b1e 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, perl, ppp, iproute, which }:
 
 stdenv.mkDerivation rec {
-  name = "pptp-1.8.0";
+  name = "pptp-${version}";
+  version = "1.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pptpclient/${name}.tar.gz";
-    sha256 = "1nmvwj7wd9c1isfi9i0hdl38zv55y2khy2k0v1nqlai46gcl5773";
+    sha256 = "00cj3jqj1hqri856jif4kkzan684qv1cb1zf2amzblvqqnzqq7hb";
   };
 
   patchPhase =

From 2c0225add688f5c62d8011e494af6efdc2c3f660 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Wed, 1 Mar 2017 16:05:04 -0500
Subject: [PATCH 1488/3449] mesos: fix build with latest gcc/glibc

/cc #23253
---
 pkgs/applications/networking/cluster/mesos/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 818848f6a7f1..651d00e57108 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -58,6 +58,16 @@ in stdenv.mkDerivation rec {
   # if we dynamically link the lib, we get these errors:
   # https://github.com/NixOS/nixpkgs/pull/19064#issuecomment-255082684
   preConfigure = ''
+    # https://issues.apache.org/jira/browse/MESOS-6616
+    configureFlagsArray+=(
+      "CXXFLAGS=-O2 -Wno-error=strict-aliasing"
+    )
+
+    # Fix cases where makedev(),major(),minor() are referenced through
+    # <sys/types.h> instead of <sys/sysmacros.h>
+    sed 1i'#include <sys/sysmacros.h>' -i src/linux/fs.cpp
+    sed 1i'#include <sys/sysmacros.h>' -i src/slave/containerizer/mesos/isolators/gpu/isolator.cpp
+
     substituteInPlace 3rdparty/stout/include/stout/os/posix/chown.hpp \
       --subst-var-by chown ${coreutils}/bin/chown
 

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 1489/3449] 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 66028a973b3c..552cda93bcc9 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 aa429e677583e02785a96221e27e59590cf526b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 2 Mar 2017 01:24:39 +0100
Subject: [PATCH 1490/3449] ipfs: 0.4.5 -> 0.4.6

---
 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 40ac09177975..a00aebef2969 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.5";
-  rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064";
+  version = "0.4.6";
+  rev = "ed729423ce548785834cdcaa21aab11ebc3a1b1a";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
 
   extraSrcPaths = [
     (fetchgx {
       inherit name src;
-      sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d";
+      sha256 = "1wwzbps3ry3vlrr0iqhvxd44x0wi99dcp5hlxvh79dc0g9r7myfk";
     })
   ];
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47";
+    sha256 = "1b262k1lhb1g68l8hghly4pdrxx1c6wbv6ij6dg399zdwqzczl13";
   };
 
   meta = with stdenv.lib; {

From 256e7642264e2c29fbf2827a4d16d8db74ed114d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 2 Mar 2017 02:27:43 +0200
Subject: [PATCH 1491/3449] radeontools: Mark as broken

The upstream release is from 2004. The website of this software talks
about configuring XFree86. I *highly* doubt this software is of any use
nowadays.
---
 pkgs/os-specific/linux/radeontools/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix
index 92e00ffad3fa..81e5a2af9cdf 100644
--- a/pkgs/os-specific/linux/radeontools/default.nix
+++ b/pkgs/os-specific/linux/radeontools/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation {
     description = "Control the backlight and external video output of ATI Radeon Mobility graphics cards";
     homepage = http://fdd.com/software/radeon/;
     license = stdenv.lib.licenses.zlib;
+    broken = true;
   };
 }

From 1be1c905f2ccfa7793a921bc41e21a937a623ccf Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Thu, 2 Mar 2017 01:30:02 +0100
Subject: [PATCH 1492/3449] slack: 2.3.4 -> 2.5.1

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

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 240aebe91753..b8e2bddfc6bb 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "2.3.4";
+  version = "2.5.1";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -42,8 +42,8 @@ let
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "01kr7maj8f4yinyri7rs4pmzab9cvp48xfqw3ilirx4mvh8mr1fd";
+        url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
+        sha256 = "1rrhgqmz0ajv2135bzykv3dq0mifzf5kiycgrisk2sfxn6nwyyvj";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";

From 9d30abf7b201b6144883815fccf904e83555334b Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 18:43:26 -0600
Subject: [PATCH 1493/3449] miniupnpc: 1.9.20150430 -> 2.0.20161216

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

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index e5b6ea396fe4..42fe2db7a4ea 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,23 +1,21 @@
 { stdenv, fetchurl }:
 
-let version = "1.9.20150430"; in
 stdenv.mkDerivation rec {
   name = "miniupnpc-${version}";
+  version = "2.0.20161216";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
-    name = "${name}.tar.gz";
-  };
+    sha256 = "0gpxva9jkjvqwawff5y51r6bmsmdhixl3i5bmzlqsqpwsq449q81";
+   };
 
-  patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
+   patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
 
-  doCheck = !stdenv.isFreeBSD;
+   doCheck = !stdenv.isFreeBSD;
 
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
   meta = {
-    inherit version;
     homepage = http://miniupnp.free.fr/;
     description = "A client that implements the UPnP Internet Gateway Device (IGD) specification";
     platforms = with stdenv.lib.platforms; linux ++ freebsd;

From 5818355a69eb651f0865f5a4666b85f8c3d54b39 Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Thu, 2 Mar 2017 01:49:21 +0100
Subject: [PATCH 1494/3449] slack: remove ubuntu update cron

---
 .../networking/instant-messengers/slack/default.nix             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index b8e2bddfc6bb..c01dbbb98b20 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
     mkdir -p $out
     dpkg -x $src $out
     cp -av $out/usr/* $out
-    rm -rf $out/usr $out/share/lintian
+    rm -rf $out/etc $out/usr $out/share/lintian
 
     # Otherwise it looks "suspicious"
     chmod -R g-w $out

From ef4775c2a7b54877a7fac00a3d52a6f3539342c5 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 19:12:00 -0600
Subject: [PATCH 1495/3449] httping: 2.4 -> 2.5

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

diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index 00f7bde429fe..36627b4e7a41 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "httping-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "http://www.vanheusden.com/httping/${name}.tgz";
-    sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs";
+    sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
   };
 
   buildInputs = [ fftw ncurses openssl ];

From 5f76147fa7b05f7a00d7fa6d747ab2124db34a96 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 19:16:03 -0600
Subject: [PATCH 1496/3449] horst: git-2016-03-15 -> 5.0

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

diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix
index 4a756711e8ee..c7d06274bea0 100644
--- a/pkgs/tools/networking/horst/default.nix
+++ b/pkgs/tools/networking/horst/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "horst-${version}";
-  version = "git-2016-03-15";
+  version = "5.0";
 
   src = fetchFromGitHub {
     owner = "br101";
     repo = "horst";
-    rev = "9d5c2f387607ac1c174b59497557b8985cdb788b";
-    sha256 = "0a4ixc9xbc818hw7rai24i1y8nqq2aqxqd938ax89ik4pfd2w3l0";
+    rev = "version-${version}";
+    sha256 = "0m7gc6dj816z8wyq5bdkqj7fw6rmxaah84s34ncsaispz2llva1x";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2ff72c684d6da79272b96c4a87573d10881ec51e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 19:18:29 -0600
Subject: [PATCH 1497/3449] hans: 0.4.4 -> 1.0

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

diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index 0e838a896cb2..2e84aa960079 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "hans-${version}";
-  version = "0.4.4";
+  version = "1.0";
 
   src = fetchFromGitHub {
-    sha256 = "1xskffmmdmg1whlrl5wpkv9z29vh0igrbmsz0b45s9v0761a7kis";
+    sha256 = "1qnfl7wr5x937b6jx3vhhvnwnrclrqvq7d7zxbfhk74pdwnjy8n4";
     rev = "v${version}";
     repo = "hans";
     owner = "friedrich";

From 439facec2aa535e1da045860d71a4c9bc29ddb7f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 2 Mar 2017 03:59:31 +0200
Subject: [PATCH 1498/3449] lkl: Broken on i686

http://hydra.nixos.org/build/49534265
---
 pkgs/applications/virtualization/lkl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix
index a307099783eb..398c269d0746 100644
--- a/pkgs/applications/virtualization/lkl/default.nix
+++ b/pkgs/applications/virtualization/lkl/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "LKL (Linux Kernel Library) aims to allow reusing the Linux kernel code as extensively as possible with minimal effort and reduced maintenance overhead";
-    platforms   = platforms.linux; # Darwin probably works too but I haven't tested it
+    platforms   = [ "x86_64-linux" ]; # Darwin probably works too but I haven't tested it
     license     = licenses.gpl2;
     maintainers = with maintainers; [ copumpkin ];
   };

From 83462da2961a653f3958eaef8bbe80212ac25e8f Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 1 Mar 2017 23:10:03 +0100
Subject: [PATCH 1499/3449] eztrace: add missing dependency

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

diff --git a/pkgs/development/tools/profiling/EZTrace/default.nix b/pkgs/development/tools/profiling/EZTrace/default.nix
index 2c9b435682de..004e5dbd46e5 100644
--- a/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/pkgs/development/tools/profiling/EZTrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, libelf, gfortran, zlib, binutils }:
+{ stdenv, fetchurl, autoconf, libelf, libiberty, gfortran, zlib, binutils }:
 
 stdenv.mkDerivation rec {
   version = "1.0.6";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     export ac_cv_func_malloc_0_nonnull=yes
   '';
 
-  buildInputs = [ autoconf libelf gfortran zlib binutils ];
+  buildInputs = [ autoconf libelf libiberty gfortran zlib binutils ];
 
   meta = {
     description = "Tool that aims at generating automatically execution trace from HPC programs";

From 05359c327b3a594cca54e821db16868f42c48688 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 1 Mar 2017 20:55:42 -0500
Subject: [PATCH 1500/3449] ANTs: init at 2.1.0 (0gyys1lf)

---
 .../science/biology/ants/default.nix          | 30 +++++++++++++++++++
 pkgs/development/libraries/itk/default.nix    |  7 +++--
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/science/biology/ants/default.nix

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
new file mode 100644
index 000000000000..fa40e53aa0a5
--- /dev/null
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, itk, vtk }:
+
+stdenv.mkDerivation rec {
+  _name    = "ANTs";
+  _version = "2.1.0";
+  name  = "${_name}-${_version}";
+
+  src = fetchFromGitHub {
+    owner  = "stnava";
+    repo   = "ANTs";
+    rev    = "4e02aa76621698e3513330dd9e863e22917e14b7";
+    sha256 = "0gyys1lf69bl3569cskxc8r5llwcr0dsyzvlby5skhfpsyw0dh8r";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ itk vtk ];
+
+  cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
+
+  checkPhase = "ctest";
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/stnava/ANTs;
+    description = "Advanced normalization toolkit for medical image registration and other processing";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index ae1f9996b78a..aab373e6291e 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, libX11, libuuid, xz}:
+{ stdenv, fetchurl, cmake, libX11, libuuid, xz, vtk }:
 
 stdenv.mkDerivation rec {
   name = "itk-4.10.0";
@@ -12,12 +12,15 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTING=OFF"
     "-DBUILD_EXAMPLES=OFF"
     "-DBUILD_SHARED_LIBS=ON"
+    "-DModule_ITKIOMINC=ON"
+    "-DModule_ITKVtkGlue=ON"
+    "-DModule_ITKReview=ON"
   ];
 
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ cmake xz ];
-  buildInputs = [ libX11 libuuid ];
+  buildInputs = [ libX11 libuuid vtk ];
 
   meta = {
     description = "Insight Segmentation and Registration Toolkit";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 170fa60c27b2..8aedae4fe57c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16930,6 +16930,8 @@ with pkgs;
 
   alliance = callPackage ../applications/science/electronics/alliance { };
 
+  ants = callPackage ../applications/science/biology/ants { };
+
   archimedes = callPackage ../applications/science/electronics/archimedes {
     stdenv = overrideCC stdenv gcc49;
   };

From ad25011ba15d84949adde86468268dde551b5943 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 20:09:46 -0600
Subject: [PATCH 1501/3449] connect: 1.104 -> 1.105

---
 pkgs/tools/networking/connect/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index 5ccbc8d0cae1..387987c588ad 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -1,15 +1,12 @@
 { stdenv, fetchurl }:
 
-let
-
-  version = "1.104";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "connect-${version}";
-  
+  version ="1.105";
+
   src = fetchurl {
     url = "https://bitbucket.org/gotoh/connect/get/${version}.tar.bz2";
-    sha256 = "0h7bfh1b2kcw5ddpbif57phdxpf8if0cm01pgwc6avp6dqxcsqp2";
+    sha256 = "00yld6yinc8s4xv3b8kbvzn2f4rja5dmp6ysv3n4847qn4k60dh7";
   };
 
   makeFlags = [ "CC=cc" ];      # gcc and/or clang compat

From 82d3f926a98a4a5088fac7828efe4a25b088ecd1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 1 Mar 2017 22:33:33 -0500
Subject: [PATCH 1502/3449] fakeroot: add darwin support

replace utillinux with getopt

Fixes #22773
---
 pkgs/tools/system/fakeroot/default.nix | 27 +++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 7995a656c1e3..5286b6b2cbc9 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, utillinux, libcap }:
+{ stdenv, fetchurl, fetchpatch, getopt, libcap }:
 
 stdenv.mkDerivation rec {
   version = "1.20.2";
@@ -9,7 +9,28 @@ stdenv.mkDerivation rec {
     sha256 = "0313xb2j6a4wihrw9gfd4rnyqw7zzv6wf3rfh2gglgnv356ic2kw";
   };
 
-  buildInputs = [ utillinux /* provides getopt */ libcap ];
+  # patchset from brew
+  patches = stdenv.lib.optionals stdenv.isDarwin [
+    (fetchpatch {
+      name = "0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch";
+      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0001-Implement-openat-2-wrapper-which-handles-optional-ar.patch;att=1;bug=766649";
+      sha256 = "1m6ggrqwqy0in264sxqk912vniipiw629dxq7kibakvsswfk6bkk";
+    })
+    (fetchpatch {
+      name = "0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch";
+      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;filename=0002-OS-X-10.10-introduced-id_t-int-in-gs-etpriority.patch;att=2;bug=766649";
+      sha256 = "0rhayp42x4i1a6yc4d28kpshmf7lrmaprq64zfrjpdn4kbs0rkln";
+    })
+    (fetchpatch {
+      name = "fakeroot-always-pass-mode.patch";
+      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=2;bug=766649;filename=fakeroot-always-pass-mode.patch;msg=20";
+      sha256 = "0i3zaca1v449dm9m1cq6wq4dy6hc2y04l05m9gg8d4y4swld637p";
+    })
+    ];
+
+  buildInputs = [ getopt ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) libcap
+    ;
 
   postUnpack = ''
     for prog in getopt; do
@@ -22,7 +43,7 @@ stdenv.mkDerivation rec {
     description = "Give a fake root environment through LD_PRELOAD";
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
 }

From 1fbcce4448a99b2cf909670b49834cdb74dfb156 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 2 Mar 2017 11:39:55 +0800
Subject: [PATCH 1503/3449] dropbox: 19.4.13 -> 20.4.19

---
 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 a083b17dcb04..628905a6b057 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 = "19.4.13";
+  version = "20.4.19";
   sha256 =
     {
-      "x86_64-linux" = "06lgmjj204xpid35cqrp2msasg4s4w6lf1zpz1lnk3f9x6q10254";
-      "i686-linux"   = "1kdj3c5s8s4smd52p2mqbzjsk68a9cd5f8x92xgsx9zzdzjqmagl";
+      "x86_64-linux" = "1970zrvk2pbs7fa7q4rqc8c1vvsvcris8ybnihazh5pqii91s16l";
+      "i686-linux"   = "1p3fdjrin5v9ifz6lba1pvb2pw3nmsiqq0jp56vgdk5jzmky23km";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From e60805061b313fad4e4e3544a3c128df7dda5ace Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 9 Jan 2017 03:30:05 -0500
Subject: [PATCH 1504/3449] pythonPackages.pyhepmc: init at 0.5.0

---
 .../python-modules/pyhepmc_export_edges.patch | 204 ++++++++++++++++++
 .../python-modules/pyhepmc_export_flow.patch  |  20 ++
 pkgs/top-level/python-packages.nix            |  35 +++
 3 files changed, 259 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyhepmc_export_edges.patch
 create mode 100644 pkgs/development/python-modules/pyhepmc_export_flow.patch

diff --git a/pkgs/development/python-modules/pyhepmc_export_edges.patch b/pkgs/development/python-modules/pyhepmc_export_edges.patch
new file mode 100644
index 000000000000..5c6e56566a34
--- /dev/null
+++ b/pkgs/development/python-modules/pyhepmc_export_edges.patch
@@ -0,0 +1,204 @@
+# HG changeset patch
+# User Lukas Heinrich <lukas.heinrich@gmail.com>
+# Date 1430606843 14400
+# Node ID 325f89b7b72922e9add9ca9dd0f7ca4a6c83bf00
+# Parent  e4fd953257e0d38511f2177de7ffaef662358af2
+add incoming/outgoing generators for GenVertex
+
+diff --git a/hepmc/generators.i b/hepmc/generators.i
+new file mode 100644
+--- /dev/null
++++ b/hepmc/generators.i
+@@ -0,0 +1,171 @@
++/*!
++ * \file   generators.i
++ * \author Seth R. Johnson
++ * \brief  Define generator/iterator for any type
++
++Example:
++\code
++    SETUP_GENERATOR( std::vector<Cell>::const_iterator )
++    ADD_GENERATOR( Mesh, cells,
++    std::vector<Cell>::const_iterator, Cell, beginCells, endCells)
++\endcode
++would be a method to add a \c cells generator method method to the Python class
++\c Mesh, when the C++ class \c Mesh has a \c std::vector<Cell> accessed through
++methods \c beginCells and \c endCells.
++
++The macro \c ADD_GENERATOR_P would be if the underlying storage were \c
++std::vector<Cell*> instead.
++
++Alternatively, for containers of regular objects that provide \c begin(), \c end(), and \c const_iterator, you can use the \c ADD_CONTAINER_ITERATOR macro:
++\code
++ADD_CONTAINER_ITERATOR( QuadratureSet )
++\endcode
++
++\section License
++
++Copyright (c) 2010, Seth R. Johnson
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are met:
++ * Redistributions of source code must retain the above copyright notice, this
++   list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above copyright notice,
++   this list of conditions and the following disclaimer in the documentation
++   and/or other materials provided with the distribution.
++ * Neither the name of the this project nor the names of its contributors
++   may be used to endorse or promote products derived from this software
++   without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
++WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
++DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
++ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
++(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
++LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
++ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
++SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++ This material is based upon work supported under a National Science
++ Foundation Graduate Research Fellowship. Any opinions, findings, conclusions
++ or recommendations expressed in this publication are those of the author
++ and do not necessarily reflect the views of the National Science
++ Foundation.
++*/
++#ifndef tools_SWIG_generators_i
++#define tools_SWIG_generators_i
++/*----------------------------------------------------------------------------*/
++
++// Add a Python class to provide iterator objects
++%insert("python") %{
++class GenericIterator:
++    def __init__(self, begin_iter_method, deref_method, incr_method):
++        self.it = begin_iter_method()
++        self.incr   = incr_method
++        self.deref  = deref_method
++
++    def __iter__(self):
++        return self
++
++    def next(self):
++        obj = self.deref( self.it )
++        if obj is not None:
++            self.incr( self.it )
++            return obj
++        else:
++            raise StopIteration
++%}
++
++//============== GENERIC GENERATOR/ITERATOR WRAPPER SUPPORT ============
++//! Thin wrapper for incrementing a certain type of iterator
++// only need to define once per iterator type, and we can use the same name
++// thanks to overloading (even though this may decrease efficiency)
++%define SETUP_GENERATOR( ITERATOR... )
++%inline %{
++void _iter_incr( ITERATOR* iter )
++{
++    ++(*iter);
++}
++%}
++%enddef
++
++/*----------------------------------------------------------------------------*/
++// Internal method for adding common parts of the generator
++%define PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN )
++    %extend CLASS {
++%insert("python") %{
++    def PYMETHOD(self):
++        "Returns an iterator for PYMETHOD."
++        return GenericIterator(
++                self._begin_ ## PYMETHOD,
++                self._deref_ ## PYMETHOD,
++                _iter_incr
++                 )
++%}
++// get the first element in the vector
++ITERATOR* _begin_ ## PYMETHOD()
++{
++    return new ITERATOR( ($self)->CBEGIN() );
++}
++    }
++%enddef
++/*----------------------------------------------------------------------------*/
++// If the dereferenced iterator is an object
++%define ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND )
++
++// add the python and begin method
++PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN )
++
++    %extend CLASS {
++//! Dereference the iterator; return NULL if at the end
++const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter )
++{
++    // if at the end, return NULL
++    if (*iter == ($self)->CEND() ) {
++        return NULL;
++    }
++    // otherwise, return the POINTER to the dereferenced iterator
++    return &(**iter);
++}
++    }
++%enddef
++/*----------------------------------------------------------------------------*/
++// If the dereferenced iterator is a pointer
++%define ADD_GENERATOR_P( CLASS, PYMETHOD, ITERATOR, RVALUE, CBEGIN, CEND )
++
++// add the python and begin method
++PYTRT_BASE_ADD_GENERATOR( CLASS, PYMETHOD, ITERATOR, CBEGIN )
++
++    %extend CLASS {
++//! Dereference the iterator; return NULL if at the end
++const RVALUE* _deref_ ## PYMETHOD ## ( const ITERATOR* iter )
++{
++    // if at the end, return NULL
++    if (*iter == ($self)->CEND() ) {
++        return NULL;
++    }
++    // otherwise, return the dereferenced iterator (a pointer)
++    return **iter;
++}
++    }
++%enddef
++/*----------------------------------------------------------------------------*/
++//! For a regular container with "begin" and "end" and "size"
++%define ADD_CONTAINER_ITERATOR( CLASS )
++    SETUP_GENERATOR( CLASS::const_iterator );
++    ADD_GENERATOR( CLASS, __iter__,
++            CLASS ## ::const_iterator, CLASS ## ::value_type,
++            begin, end)
++    %extend CLASS {
++    %insert("python") %{
++    def __len__(self):
++        return self.size()
++    %}
++    }
++%enddef
++
++/*============================================================================*/
++#endif
++
+diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i
+--- a/hepmc/hepmcwrap.i
++++ b/hepmc/hepmcwrap.i
+@@ -1,5 +1,7 @@
+ %module hepmcwrap
+ 
++%include generators.i
++
+ %{
+   #include "HepMC/GenEvent.h"
+   #include "HepMC/GenVertex.h"
+@@ -251,3 +253,9 @@
+     return ss.str();
+   }
+ }
++
++SETUP_GENERATOR( std::vector< HepMC::GenParticle* >::const_iterator )
++ADD_GENERATOR_P( HepMC::GenVertex, incoming,
++std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_in_const_begin, particles_in_const_end)
++ADD_GENERATOR_P( HepMC::GenVertex, outgoing,
++std::vector< HepMC::GenParticle* >::const_iterator, HepMC::GenParticle, particles_out_const_begin, particles_out_const_end)
diff --git a/pkgs/development/python-modules/pyhepmc_export_flow.patch b/pkgs/development/python-modules/pyhepmc_export_flow.patch
new file mode 100644
index 000000000000..85e26a1a1607
--- /dev/null
+++ b/pkgs/development/python-modules/pyhepmc_export_flow.patch
@@ -0,0 +1,20 @@
+diff --git a/hepmc/hepmcwrap.i b/hepmc/hepmcwrap.i
+index cf35c1b..b94fbe2 100644
+--- a/hepmc/hepmcwrap.i
++++ b/hepmc/hepmcwrap.i
+@@ -1,6 +1,7 @@
+ %module hepmcwrap
+ 
+ %{
++  #include "HepMC/Flow.h"
+   #include "HepMC/GenEvent.h"
+   #include "HepMC/GenVertex.h"
+   #include "HepMC/GenParticle.h"
+@@ -93,6 +94,7 @@ namespace HepMC {
+ // headers before importing headers that use those classes.
+ // Result is that headers should probably be %included in an order
+ // which sees "contents before containers"
++%include "HepMC/Flow.h"
+ %include "HepMC/HepMCDefs.h"
+ %include "HepMC/SimpleVector.h"
+ // #ifdef HEPMC_HAS_ITERATOR_RANGES
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48a2a3e4c0b8..f3c764d1d070 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5084,6 +5084,41 @@ in {
     };
   };
 
+  pyhepmc = buildPythonPackage rec {
+    name = "pyhepmc-${version}";
+    version = "0.5.0";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pyhepmc/${name}.tar.gz";
+      sha256 = "1rbi8gqgclfvaibv9kzhfis11gw101x8amc93qf9y08ny4jfyr1d";
+    };
+
+    patches = [
+      # merge PR https://bitbucket.org/andybuckley/pyhepmc/pull-requests/1/add-incoming-outgoing-generators-for/diff
+      ../development/python-modules/pyhepmc_export_edges.patch
+      # add bindings to Flow class
+      ../development/python-modules/pyhepmc_export_flow.patch
+    ];
+
+    # regenerate python wrapper
+    preConfigure = ''
+      rm hepmc/hepmcwrap.py
+      swig -c++ -I${pkgs.hepmc}/include -python hepmc/hepmcwrap.i
+    '';
+
+    buildInputs = with pkgs; [ swig hepmc ];
+
+    HEPMCPATH = pkgs.hepmc;
+
+    meta = {
+      description = "A simple wrapper on the main classes of the HepMC event simulation representation, making it possible to create, read and manipulate HepMC events from Python code";
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ veprbl ];
+      platforms   = platforms.all;
+    };
+  };
+
   pytest = self.pytest_30;
 
   pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};

From 2198a7c747c319091445e4dd626caee3bfd9f507 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 22 Feb 2017 18:36:25 -0500
Subject: [PATCH 1505/3449] pythonPackages.graphviz: init at 0.5.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 f3c764d1d070..100e6578b1c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15376,6 +15376,24 @@ in {
     };
   };
 
+  graphviz = buildPythonPackage rec {
+    name = "graphviz-${version}";
+    version = "0.5.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/g/graphviz/${name}.zip";
+      sha256 = "0jh31nlm0qbxwylhdkwnb69pcjlc5z03fcfbs0gvgzp3hfrngsk0";
+    };
+
+    propagatedBuildInputs = [ pkgs.graphviz ];
+
+    meta = {
+      description = "Simple Python interface for Graphviz";
+      homepage = https://github.com/xflr6/graphviz;
+      license = licenses.mit;
+    };
+  };
+
   pygraphviz = buildPythonPackage rec {
     name = "pygraphviz-${version}";
     version = "1.4rc1";

From ac51822ee838b3a3a52736772431ad29ab71cd4b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 26 Feb 2017 16:42:53 -0500
Subject: [PATCH 1506/3449] pythonPackages.python-sybase: init at 0.40pre2

---
 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 100e6578b1c5..3c0057ef5a0d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -816,6 +816,30 @@ in {
     };
   };
 
+  python-sybase = buildPythonPackage rec {
+    name = "python-sybase-${version}";
+    version = "0.40pre2";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "https://sourceforge.net/projects/python-sybase/files/python-sybase/${name}/${name}.tar.gz";
+      sha256 = "0pm88hyn18dy7ljam4mdx9qqgmgraf2zy2wl02g5vsjl4ncvq90j";
+    };
+
+    propagatedBuildInputs = [ pkgs.freetds ];
+
+    SYBASE = pkgs.freetds;
+    setupPyBuildFlags = [ "-DHAVE_FREETDS" "-UWANT_BULKCOPY" ];
+
+    meta = {
+      description = "The Sybase module provides a Python interface to the Sybase relational database system";
+      homepage    = http://python-sybase.sourceforge.net;
+      license     = licenses.bsd3;
+      maintainers = with maintainers; [ veprbl ];
+      platforms   = platforms.unix;
+    };
+  };
+
   almir = buildPythonPackage rec {
     name = "almir-0.1.8";
 

From cb1b08a87163ad7dc8ad49ae92878c8832de95ac Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Mon, 27 Feb 2017 21:20:57 -0500
Subject: [PATCH 1507/3449] herwig: 7.0.3 -> 7.0.4

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

diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index cb765f761d78..737565d298e0 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "herwig-${version}";
-  version = "7.0.3";
+  version = "7.0.4";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
-    sha256 = "0v7b84n0v3dhjpx0vfk5p8g87kivgg9svfivnih1yrfm749269m2";
+    sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6";
   };
 
   patches = [

From 45344fdf193ad8aebcc7e3d4c1c997c8067b7b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 2 Mar 2017 07:26:27 +0100
Subject: [PATCH 1508/3449] tested job: drop the hibernate test on i686 for now

/cc #23107.
---
 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 6c048e8a0aca..57d39a2325fd 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -68,7 +68,7 @@ in rec {
         (all nixos.tests.boot.uefiCdrom)
         (all nixos.tests.boot.uefiUsb)
         (all nixos.tests.boot-stage1)
-        (all nixos.tests.hibernate)
+        nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107
         (all nixos.tests.ecryptfs)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)

From d072ac28f8b262e25358763682f40f7870789fd7 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 17:02:22 -0600
Subject: [PATCH 1509/3449] quicktun: 2.2.4 -> 2.2.5

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

diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
index ed559f5d5c9f..9a6784cc7f26 100644
--- a/pkgs/tools/networking/quicktun/default.nix
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quicktun-${version}";
-  version = "2.2.4";
+  version = "2.2.5";
 
   src = fetchFromGitHub {
     owner = "UCIS";
     repo = "QuickTun";
-    rev = "980fe1b8c718d6df82af1d57b56140c0e541dbe0";
-    sha256 = "0m7gvlgs1mhyw3c8s2dg05j7r7hz8kjpb0sk245m61ir9dmwlf8i";
+    rev = "2d0c6a9cda8c21f921a5d1197aeee92e9568ca39";
+    sha256 = "1ydvwasj84qljfbzh6lmhyzjc20yw24a0v2mykp8afsm97zzlqgx";
   };
 
   buildInputs = [ libsodium ];

From 021046a72e89494911e106c8c25c0b0fa7becfff Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 16:42:58 -0600
Subject: [PATCH 1510/3449] swaks:20130209.0 -> 20170101.0

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

diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix
index 0743a5c62f7e..5d5b17c2b263 100644
--- a/pkgs/tools/networking/swaks/default.nix
+++ b/pkgs/tools/networking/swaks/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "swaks-${version}";
-  version = "20130209.0";
+  version = "20170101.0";
 
   src = fetchurl {
     url = "http://www.jetmore.org/john/code/swaks/files/${name}.tar.gz";
-    sha256 = "0z0zsjminrdjpn6a8prjdwilnr27piibh78gc5ppg0nadljnf28b";
+    sha256 = "0pli4mlhasnqqxmmxalwyg3x7n2vhcbgsnp2xgddamjavv82vrl4";
   };
 
   buildInputs = [ perl makeWrapper ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       A featureful, flexible, scriptable, transaction-oriented SMTP test tool
     '';
     license = licenses.gpl2;
-    maintainers = with maintainers; [ rickynils ];
+    maintainers = with maintainers; [ rickynils ndowens ];
     platforms = platforms.all;
   };
 

From 86c51da755fc1adec7ea96d4c88a41b125683a73 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Feb 2017 11:14:28 +0100
Subject: [PATCH 1511/3449] LTS Haskell 8.3

---
 .../configuration-hackage2nix.yaml            | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index d2c86c935aa3..cc567df7c210 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.2
+  # LTS Haskell 8.3
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -265,7 +265,7 @@ default-package-overrides:
   - boundingboxes ==0.2.3
   - bower-json ==1.0.0.1
   - boxes ==0.1.4
-  - brick ==0.17
+  - brick ==0.17.1
   - broadcast-chan ==0.1.1
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
@@ -366,7 +366,7 @@ default-package-overrides:
   - cmark-lucid ==0.1.0.0
   - cmdargs ==0.10.14
   - code-builder ==0.1.3
-  - code-page ==0.1.1
+  - code-page ==0.1.2
   - codo-notation ==0.5.2
   - colorful-monoids ==0.2.1.0
   - colour ==2.3.3
@@ -565,7 +565,7 @@ default-package-overrides:
   - enummapset-th ==0.6.1.1
   - envelope ==0.2.1.0
   - envparse ==0.4
-  - envy ==1.3.0.1
+  - envy ==1.3.0.2
   - epub-metadata ==4.5
   - eq ==4.0.4
   - equivalence ==0.3.2
@@ -693,7 +693,7 @@ default-package-overrides:
   - gi-gobject ==2.0.11
   - gi-gtk ==3.0.11
   - gi-javascriptcore ==3.0.11
-  - gi-pango ==1.0.11
+  - gi-pango ==1.0.12
   - gi-soup ==2.4.11
   - gi-webkit ==3.0.11
   - ginger ==0.3.9.1
@@ -959,7 +959,7 @@ default-package-overrides:
   - hPDB ==1.2.0.9
   - hPDB-examples ==1.2.0.7
   - HPDF ==1.4.10
-  - hpio ==0.8.0.6
+  - hpio ==0.8.0.7
   - hpp ==0.4.0
   - hpqtypes ==1.5.1.1
   - hquantlib ==0.0.3.3
@@ -983,14 +983,14 @@ default-package-overrides:
   - hslua ==0.4.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4
+  - HsOpenSSL ==0.11.4.1
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
-  - hspec ==2.4.1
+  - hspec ==2.4.2
   - hspec-attoparsec ==0.1.0.2
   - hspec-contrib ==0.4.0
-  - hspec-core ==2.4.1
-  - hspec-discover ==2.4.1
+  - hspec-core ==2.4.2
+  - hspec-discover ==2.4.2
   - hspec-expectations ==0.8.2
   - hspec-expectations-pretty-diff ==0.7.2.4
   - hspec-golden-aeson ==0.2.0.3
@@ -1015,11 +1015,11 @@ default-package-overrides:
   - htoml ==1.0.0.3
   - HTTP ==4000.3.5
   - http-api-data ==0.3.5
-  - http-client ==0.5.5
+  - http-client ==0.5.6.1
   - http-client-openssl ==0.2.0.4
-  - http-client-tls ==0.3.3.1
+  - http-client-tls ==0.3.4
   - http-common ==0.8.2.0
-  - http-conduit ==2.2.3
+  - http-conduit ==2.2.3.1
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.6.4
@@ -1090,7 +1090,7 @@ default-package-overrides:
   - intervals ==0.7.2
   - intro ==0.1.0.8
   - invariant ==0.4
-  - invertible ==0.2.0
+  - invertible ==0.2.0.2
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1242,6 +1242,7 @@ default-package-overrides:
   - mathexpr ==0.3.0.0
   - matrices ==0.4.4
   - matrix ==0.3.5.0
+  - matrix-market-attoparsec ==0.1.0.5
   - maximal-cliques ==0.1.1
   - mbox ==0.3.3
   - mcmc-types ==1.0.3
@@ -1307,12 +1308,12 @@ default-package-overrides:
   - MonadRandom ==0.5.1
   - monads-tf ==0.1.0.3
   - mongoDB ==2.1.1.1
-  - mono-traversable ==1.0.1.2
+  - mono-traversable ==1.0.1.3
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.3.1
   - monoidal-containers ==0.3.0.1
-  - morte ==1.6.5
+  - morte ==1.6.6
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.1
@@ -1333,7 +1334,7 @@ default-package-overrides:
   - mysql ==0.1.4
   - mysql-haskell ==0.8.0.0
   - mysql-haskell-openssl ==0.8.0.0
-  - mysql-simple ==0.4.0.0
+  - mysql-simple ==0.4.0.1
   - nagios-check ==0.3.2
   - names-th ==0.2.0.2
   - nano-erl ==0.1.0.1
@@ -1377,7 +1378,7 @@ default-package-overrides:
   - non-empty-sequence ==0.2.0.2
   - nonce ==1.0.2
   - NoTrace ==0.3.0.1
-  - nsis ==0.3
+  - nsis ==0.3.1
   - numbers ==3000.2.0.1
   - numeric-extras ==0.1
   - NumInstances ==1.4
@@ -1395,7 +1396,7 @@ default-package-overrides:
   - OneTuple ==0.2.1
   - oo-prototypes ==0.1.0.0
   - opaleye ==0.5.3.0
-  - opaleye-trans ==0.3.4
+  - opaleye-trans ==0.3.5
   - open-browser ==0.2.1.0
   - open-witness ==0.4
   - OpenAL ==1.7.0.4
@@ -1458,7 +1459,7 @@ default-package-overrides:
   - persistent-postgresql ==2.6
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
-  - persistent-sqlite ==2.6
+  - persistent-sqlite ==2.6.0.1
   - persistent-template ==2.5.1.6
   - pgp-wordlist ==0.1.0.2
   - phantom-state ==0.2.1.2
@@ -1694,14 +1695,14 @@ 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.2
+  - servant-auth-cookie ==0.4.3.3
   - servant-blaze ==0.7.1
   - servant-cassava ==0.8
   - servant-client ==0.9.1.1
   - servant-docs ==0.9.1.1
   - servant-elm ==0.4.0.1
   - servant-foreign ==0.9.1.1
-  - servant-js ==0.9.1
+  - servant-js ==0.9.2
   - servant-JuicyPixels ==0.3.0.2
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.1.1
@@ -1766,7 +1767,7 @@ default-package-overrides:
   - sorted-list ==0.2.0.0
   - sourcemap ==0.1.6
   - sparkle ==0.4.0.2
-  - sparse-linear-algebra ==0.2.9.4
+  - sparse-linear-algebra ==0.2.9.7
   - spdx ==0.2.1.0
   - speculation ==1.5.0.3
   - speedy-slice ==0.3.0
@@ -1783,7 +1784,7 @@ default-package-overrides:
   - spool ==0.1
   - spoon ==0.3.1
   - sql-words ==0.1.4.1
-  - sqlite-simple ==0.4.12.1
+  - sqlite-simple ==0.4.13.0
   - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.0
   - stache ==0.2.0
@@ -1855,7 +1856,7 @@ default-package-overrides:
   - taggy ==0.2.0
   - taggy-lens ==0.1.2
   - tagshare ==0.0
-  - tagsoup ==0.14
+  - tagsoup ==0.14.1
   - tagstream-conduit ==0.5.5.3
   - tar ==0.5.0.3
   - tar-conduit ==0.1.0
@@ -2015,7 +2016,7 @@ default-package-overrides:
   - Unixutils ==1.54.1
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.7.2
-  - uri-bytestring ==0.2.2.1
+  - uri-bytestring ==0.2.3.0
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
   - url ==2.1.3
@@ -2084,7 +2085,7 @@ default-package-overrides:
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.1
   - waitra ==0.0.4.0
-  - warp ==3.2.11
+  - warp ==3.2.11.1
   - warp-tls ==3.2.3
   - wave ==0.1.4
   - wavefront ==0.7.0.3
@@ -2166,7 +2167,7 @@ default-package-overrides:
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
   - yahoo-finance-api ==0.2.0.1
-  - yaml ==0.8.21.2
+  - yaml ==0.8.22
   - Yampa ==0.10.5
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3
@@ -2207,7 +2208,7 @@ default-package-overrides:
   - yjtools ==0.9.18
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
-  - zip ==0.1.7
+  - zip ==0.1.8
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
   - zlib ==0.6.1.2

From eabf47b3022f23acf65cbf20e0d4ae36dbcff22e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2017 14:29:10 +0100
Subject: [PATCH 1512/3449] hackage2nix: disable builds that depend on broken
 webkitgtk-2.4.11

---
 .../configuration-hackage2nix.yaml            | 1725 +++++++++--------
 1 file changed, 865 insertions(+), 860 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cc567df7c210..a30a2fd4463f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2361,13 +2361,6 @@ dont-distribute-packages:
   abstract-par-accelerate:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   abt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-BuildPlatform:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-EasyRaster-GTK:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-HalfInteger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ac-machine-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ac-machine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-arithmetic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fftw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2377,12 +2370,17 @@ dont-distribute-packages:
   accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   accentuateus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   access-time:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-EasyRaster-GTK:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-HalfInteger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   acid-state-dist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   acid-state-tls:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ac-machine-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ac-machine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-all-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-comonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-flipping-tables:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-hq9plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ACME:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-inator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-left-pad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2395,31 +2393,34 @@ dont-distribute-packages:
   acme-strfry:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-stringly-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-zero:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ACME:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   activitystreams-aeson:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Adaptive-Blaisorblade:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adaptive-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adaptive-tuple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Adaptive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adaptive-tuple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   adb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   adhoc-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   adict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Basics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Net:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Real-Double:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real-Interval:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Real:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-Real-Interval:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-RnToRm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-applicative:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-filthy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2430,7 +2431,6 @@ dont-distribute-packages:
   aeson-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-t:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-yak:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affine-invariant-ensemble-mcmc:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2442,35 +2442,34 @@ dont-distribute-packages:
   agentx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   AGI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AhoCorasick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algo-s:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  align-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algo-s:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  align-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   alphachar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpino-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-midi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-pcm-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-seq-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alternative-io:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer-client-snap:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-apigateway:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-appstream:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-budgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2491,6 +2490,7 @@ dont-distribute-packages:
   amazonka-sqs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-stepfunctions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-xray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amby:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2498,8 +2498,8 @@ dont-distribute-packages:
   analyze-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   anansi-pandoc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   anatomy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  android-lint-summary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   android:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  android-lint-summary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AndroidViewHierarchyImporter:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   angle:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2515,13 +2515,13 @@ dont-distribute-packages:
   anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-authenticate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-clientsession:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-cookie:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-eventsource:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-helics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-http-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apiary:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-memcached:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-mongoDB:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2529,25 +2529,25 @@ dont-distribute-packages:
   apiary-purescript:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-websockets:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apiary:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   apis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   apotiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  app-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   appc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  app-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApplePush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AppleScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-fail:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-quoters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   approximate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   archnews:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arghwxhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2561,20 +2561,20 @@ dont-distribute-packages:
   arithmetic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   arithmoi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   array-forth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   array-primops:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrayRef:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AspectAG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2582,14 +2582,14 @@ dont-distribute-packages:
   astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-foreign:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2614,15 +2614,15 @@ dont-distribute-packages:
   avatar-generator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api-docs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avers-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  avers-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   avl-static:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AvlTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   avr-shake:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesome-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium-raw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   awesomium:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  awesomium-raw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-configuration-tools:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-streams:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2630,33 +2630,32 @@ dont-distribute-packages:
   aws-elastic-transcoder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-general:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-kinesis-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis-reshard:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-kinesis:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-kinesis-reshard:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-lambda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-performance-tests:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-text-converter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-xml-unordered:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-servicebus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   babl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   babylon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   backtracking-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   backward-state:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Baggins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bamboo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-launcher:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-plugin-highlight:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-plugin-photo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-theme-blueprint:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamboo-theme-mini-html5:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bamse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bang:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   banwords:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2666,24 +2665,24 @@ dont-distribute-packages:
   barley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   basic-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bdd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beautifHOL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2695,10 +2694,10 @@ dont-distribute-packages:
   BerlekampAlgorithm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   berp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   besout:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   betacode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bff-mono:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bff-mono:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bgmax:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bgzf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bibdb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2714,14 +2713,12 @@ dont-distribute-packages:
   binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binding-wx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-apr-util:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-apr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-apr-util:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-bfd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-cctools:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-codec2:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2746,15 +2743,16 @@ dont-distribute-packages:
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-wlc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binding-wx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseBlast:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseDotP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseFasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseFR3D:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseInfernal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseMAF:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseNewick:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2765,6 +2763,7 @@ dont-distribute-packages:
   BiobaseXNA:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   BioHMM:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biophd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2772,7 +2771,6 @@ dont-distribute-packages:
   bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   BirdPP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-array:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bit-vector:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitcoin-payment-channel:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitcoin-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitly-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2783,10 +2781,11 @@ dont-distribute-packages:
   bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bit-vector:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bkr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bla:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   black-jewel:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   blacktip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bla:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   blakesum-demo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   blakesum:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blank-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2807,8 +2806,8 @@ dont-distribute-packages:
   BlogLiterately:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blosum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2819,8 +2818,8 @@ dont-distribute-packages:
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-list:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2841,6 +2840,7 @@ dont-distribute-packages:
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-mapping:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2852,9 +2852,9 @@ dont-distribute-packages:
   bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   burst-detection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   byline:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2862,14 +2862,16 @@ dont-distribute-packages:
   bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-progress:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-typenats:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  c-io:                                         [ 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 ]
+  cabal2ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2877,27 +2879,23 @@ dont-distribute-packages:
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cabal-ide-backend:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-info:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-macosx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-progdeps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalQuery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalrpmdeps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   CabalSearch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalvchk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cached-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2906,8 +2904,8 @@ dont-distribute-packages:
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   calc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   calculator:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   caldims:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2919,29 +2917,29 @@ dont-distribute-packages:
   canteven-parsedate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   carettah:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   carte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cartesian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-control:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-core:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casadi-bindings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-internal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-ipopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   casadi-bindings-snopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cascade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cascading:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cases:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-meta-html:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-reports-html:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   casr-logbook-reports-meta-html:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-cql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2956,15 +2954,16 @@ dont-distribute-packages:
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CCA:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-alt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-cxe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-exc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-ref-tf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-ref:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CCA:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CC-delcont-ref-tf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cci:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ccnx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cellrenderer-cairo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2978,35 +2977,35 @@ dont-distribute-packages:
   cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cflp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cfopu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgi-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   charsetdetect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-gtk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-histogram:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chatty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chatty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cheapskate-terminal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chitauri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale-geo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-plus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-spec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-transformers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ChristmasTree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   chronograph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chronos:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3017,10 +3016,11 @@ dont-distribute-packages:
   cielo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cil:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cinvoke:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   citation-resolve:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citeproc-hs-pandoc-filter:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  citeproc-hs-pandoc-filter:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cjk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3031,22 +3031,23 @@ dont-distribute-packages:
   clarifai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLASE:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-ghc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-multisignal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-systemverilog:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-verilog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-prelude-conduit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  classy-prelude-yesod:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  classy-prelude-yesod:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-ircbot:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-media:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3054,16 +3055,15 @@ dont-distribute-packages:
   clckwrks-theme-bootstrap:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-clckwrks:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clean-home:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cless:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clevercss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippings:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3072,8 +3072,8 @@ dont-distribute-packages:
   clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clone-all:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   closure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloud-haskell:                                [ 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 ]
   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 ]
@@ -3083,24 +3083,24 @@ dont-distribute-packages:
   cmath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmathml3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CMCompare:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmd-item:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmdargs-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmd-item:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cndict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codec:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Codec-Image-DevIL:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codec:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   codeworld-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   colada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   colchis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3114,19 +3114,19 @@ dont-distribute-packages:
   color-counter:                                [ 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 ]
-  com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   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 ]
-  commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -3148,29 +3148,29 @@ dont-distribute-packages:
   comptrans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   computational-algebra:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft-hr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConcurrentUtils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   condorcet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   conductive-hsc3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-audio-samplerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-find:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-network-stream:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-resumablesink:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-ini:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConfigFileTH:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   configifier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-ini:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configurable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   congruence-relation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3189,8 +3189,8 @@ dont-distribute-packages:
   container:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   containers-benchmark:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContArrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3198,8 +3198,8 @@ dont-distribute-packages:
   control-event:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-attempt:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-exception-monadsfd:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-failure-mtl:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-failure:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-monad-failure-mtl:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Control-Monad-MultiPass:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Control-Monad-ST2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   contstuff-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3209,27 +3209,27 @@ dont-distribute-packages:
   convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-cbmc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-language:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-libraries:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   copilot-theorem:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   copr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   COrdering:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core-compiler:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   corebot-bliki:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  core-compiler:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreDump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreErlang:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  core-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coroutine-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coroutine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   couchdb-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   couchdb-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   CouchDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  couch-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  couch-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   counter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   court:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   coverage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3239,8 +3239,8 @@ dont-distribute-packages:
   cplusplus-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cprng-aes-effect:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cpuperf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cql-io:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cql-io:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-memory:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3248,7 +3248,6 @@ dont-distribute-packages:
   cqrs-sqlite3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-test:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-testkit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   crack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   craft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3264,6 +3263,7 @@ dont-distribute-packages:
   crf-chain1:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain2-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain2-tiers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   criterion-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   criterion-to-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3282,12 +3282,12 @@ dont-distribute-packages:
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   csound-catalog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   csp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-FiringRules:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Frontend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Interpreter:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-ToProlog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cspretty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   csv-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3300,8 +3300,8 @@ dont-distribute-packages:
   cue-sheet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   curryrs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   curve25519:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3309,33 +3309,33 @@ dont-distribute-packages:
   CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cyclotomic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  d-bus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   d3js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dapi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-benchmark:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-beta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-buildpackage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-fastconvert:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcswatch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darkplaces-rcon-util:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-rcon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darkplaces-rcon-util:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dash-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monadLib:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-fd:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-tf:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-concurrent-queue:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-construction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-cycle:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3347,62 +3347,62 @@ dont-distribute-packages:
   data-default-instances-unordered-containers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-default-instances-vector:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-dispersal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-easy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-embed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dataenc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-filepath:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-fin-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-fin-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-flagset:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-kiln:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-layer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-map-multikey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-msgpack:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-object:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-object-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-object:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-pprint:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-quotientref:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-repr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-result:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rev:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Data-Rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Data-Rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rtuple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-spacepart:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dataenc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datetime-sb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datetime-sb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dawdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbcleaner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBlimited:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbmigrations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbmigrations-mysql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbmigrations-postgresql:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbmigrations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  d-bus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-th-introspection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dclabel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-build:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-eval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-flow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-driver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-interface:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-war:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-code-detection:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   debian-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3424,8 +3424,8 @@ dont-distribute-packages:
   definitive-reactive:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   definitive-sound:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   deiko-config:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   delta-h:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   delta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3441,8 +3441,8 @@ dont-distribute-packages:
   derive-gadt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-monoid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-storable-plugin:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-storable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive-storable-plugin:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3467,6 +3467,7 @@ dont-distribute-packages:
   diagrams-rubiks-cube:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-wx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dialog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictionaries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3481,26 +3482,26 @@ dont-distribute-packages:
   digestive-functors-happstack:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-heist:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-lucid:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-scotty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-snap:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DigitalOcean:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   DimensionalHash:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-example:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-widgets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diophantine:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diplomacy-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diplomacy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diplomacy-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-binary-files:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  directed-cubical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-fastcgi:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   direct-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  directed-cubical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   directory-tree:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discordian-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3530,10 +3531,10 @@ dont-distribute-packages:
   DnaProteinAlignment:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dnscache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dnssd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3542,14 +3543,13 @@ dont-distribute-packages:
   DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dominion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   domplate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dot-linker:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dotfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dot-linker:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   download-curl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   download:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dozenal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dozens:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-lifted-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3558,36 +3558,37 @@ dont-distribute-packages:
   dph-prim-interface:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-prim-par:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dpkg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DPM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   drClickOn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dresdner-verkehrsbetriebe:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrIFT-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   drifter-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   drmaa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropbox-sdk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropsolve:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ds-kanren:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsh-sql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsmc-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsh-sql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ds-kanren:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dsmc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dson-parsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dsmc-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dson:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dson-parsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   DSTM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dstring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DTC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvdread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dvi-processing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3619,14 +3620,14 @@ dont-distribute-packages:
   edenskel:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   edentv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   edge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   editable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   effin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3634,19 +3635,19 @@ dont-distribute-packages:
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-carbon:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ekg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-rrd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ekg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   electrum-mnemonic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   embroidery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3655,10 +3656,10 @@ dont-distribute-packages:
   enchant:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   encoding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-growler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-snap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-wai:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EntrezHTTP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3673,8 +3674,8 @@ dont-distribute-packages:
   epass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epoll:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epub-metadata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epub-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  epub-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   equal-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EqualitySolver:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3713,7 +3714,6 @@ dont-distribute-packages:
   eventstore:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ex-pool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-hierarchy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-monads-fd:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3729,23 +3729,24 @@ dont-distribute-packages:
   exinst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   existential:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-determinant:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-bytestring:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explicit-iomodes-text:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  explicit-iomodes-text:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ex-pool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   faceted:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   factory:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3754,20 +3755,20 @@ dont-distribute-packages:
   fadno-braids:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   FailureT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fake-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  falling-turnip:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  falling-turnip:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   family-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-tags:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastirc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fast-tags:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FastxPipe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fathead-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-simplejson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fcd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fckeditor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3775,12 +3776,12 @@ dont-distribute-packages:
   FComp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fdo-trash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fedora-packages:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-crawl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-gipeda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-translator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fenfire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3796,10 +3797,10 @@ dont-distribute-packages:
   fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-collection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   file-command-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  file-location:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   filediff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  file-location:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepath-io-access:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Files:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3817,32 +3818,32 @@ dont-distribute-packages:
   fishfood:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitsio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-imports:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point-vector-space:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-point-vector-space:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-precision:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-storable-array:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-width:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fix-imports:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fizz-buzz:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flamethrower:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flat-maybe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexible-time:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flexiwrap-smallcheck:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexiwrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flexiwrap-smallcheck:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flickr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Flippi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flite:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   floating-bits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   flow2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3850,9 +3851,9 @@ dont-distribute-packages:
   fltkhs-fluid-demos:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluidsynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3860,21 +3861,21 @@ dont-distribute-packages:
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   font-opengl-basic4x6:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   foo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   forbidden-fruit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fordo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   foreign-var:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForestStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   forger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   forkable-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   formattable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets-hsp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  forml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   formura:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForSyDe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   forth-hll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3898,23 +3899,23 @@ dont-distribute-packages:
   free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-seq-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-seq-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  friday:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-juicypixels:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  friday:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3925,17 +3926,17 @@ dont-distribute-packages:
   FTPLine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftshell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   full-sessions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  full-text-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   fullstop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  full-text-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-git-hook:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funcons-tools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-combine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-instances-algebra:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functor-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  functor-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fungi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   funion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funpat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3943,16 +3944,15 @@ dont-distribute-packages:
   fusion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   futun:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzy-timings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fuzzytime:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fuzzy-timings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-glfw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fwgl-javascript:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fwgl-javascript:                              [ 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 ]
   game-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   garepinoh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gbu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3960,8 +3960,8 @@ dont-distribute-packages:
   gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeBoP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gegl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gelatin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gemstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3975,17 +3975,17 @@ dont-distribute-packages:
   generic-church:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-maybe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-pretty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-storable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   genetics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geni-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geni-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GenI:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   genifunctors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geni-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GenI:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   geniserver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geni-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   genprog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenSmsPdu:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gentlemark:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3995,17 +3995,17 @@ dont-distribute-packages:
   genvalidity-hspec-cereal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-path:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   geoip2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geojson-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geojson-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   geolite-csv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   geom2d:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeomPredicates-SSE:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   getemx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   getflag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4015,7 +4015,21 @@ dont-distribute-packages:
   ghc-events-analyze:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-generic-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-history-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghci-ng:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-hello:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-jsaddle:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-jsffi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-dom-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-hplay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-promise:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-man-completion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4023,67 +4037,54 @@ dont-distribute-packages:
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-history-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-ng:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom-hello:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom-jsaddle:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom-jsffi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-dom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-hplay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-promise:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-xhr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghclive:                                      [ 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 ]
   gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-girepository:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstbase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-gst:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstvideo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtk-hs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtkosxapplication:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gtksource:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-javascriptcore:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-notify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-pango:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-pangocairo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-poppler:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit2webextension:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  giak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ginger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-notify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-pangocairo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-pango:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   giphy-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-poppler:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  GiST:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-date:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-release:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-webhook-handler-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-jump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-mediate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-object:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-sanity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-release:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github-webhook-handler-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  github:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-vogue:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   givegif:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-webkit2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-webkit2webextension:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gi-webkit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   glapp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4095,10 +4096,10 @@ dont-distribute-packages:
   glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gll:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glob-posix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  global-variables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   global:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  global-variables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glob-posix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   glome-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeTrace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeVec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4118,6 +4119,7 @@ dont-distribute-packages:
   gnome-desktop:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnome-keyring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnomevfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnss-converters:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   goa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4135,17 +4137,17 @@ dont-distribute-packages:
   gogol-servicecontrol:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ 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 ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2-for-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-oauth2-jwt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-oauth2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-oauth2-jwt:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   googlepolyline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleSuggest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  google-translate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GoogleTranslate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gopherbot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-demo:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4171,16 +4173,6 @@ dont-distribute-packages:
   grapefruit-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   grapefruit-ui-gtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   grapefruit-ui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-lambdascope:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-layout:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ski:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-strategies:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-trs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ww:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Graph500:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Graphalyze:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphbuilder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4192,28 +4184,38 @@ dont-distribute-packages:
   graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphql-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-lambdascope:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-layout:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-ski:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-strategies:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-trs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-rewriting-ww:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   graql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gray-extended:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graylog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gremlin-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grid:                                         [ 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 ]
   gridland:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groundhog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-inspector:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-mysql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-postgresql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-sqlite:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   group-with:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   growler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4223,27 +4225,27 @@ dont-distribute-packages:
   gsl-random-fu:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsmenu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-gnomevfs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-gtkglext:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-cast-gtk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-gtksourceview2:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-th:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Gtk2hsGenerics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-hello:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-rpn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gtk2hsGenerics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk3-mac-integration:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkglext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GtkGLTV:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkimageview:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkrsync:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   guarded-rewriting:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   guess-combinator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   guid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4251,16 +4253,25 @@ dont-distribute-packages:
   GuiTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gulcii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gyah-bin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2048:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  H:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-snap-server:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-handler-warp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack2-interface-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-sparks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackernews:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-frontend-happstack:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-cgi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-epoll:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4270,23 +4281,10 @@ dont-distribute-packages:
   hack-handler-hyena:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-kibro:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-simpleserver:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HackMail:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-cleanpath:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-clientsession:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-snap-server:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-warp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-interface-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-sparks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackernews:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HackMail:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4305,8 +4303,8 @@ dont-distribute-packages:
   hakyll-contrib-csv:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-elm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib-hyphenation:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-convert:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-filestore:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-ogmarkup:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4328,20 +4326,18 @@ dont-distribute-packages:
   handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hangman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hannahci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hans-pcap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hans:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hans-pcap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haphviz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   happraise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-hsp-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   happs-hsp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happs-hsp-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-IxSet:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-State:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-auth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-contrib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4353,6 +4349,7 @@ dont-distribute-packages:
   happstack-heist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-helpers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-hstringtemplate:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-monad-peel:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-plugins:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4362,17 +4359,18 @@ dont-distribute-packages:
   happstack-static-routing:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-yui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happy-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happy-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hapstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaPy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  har:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hardware-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  har:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harmony:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4381,27 +4379,24 @@ dont-distribute-packages:
   haroonga-httpd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haroonga:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   harvest-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasbolt:                                      [ 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 ]
   hascat-lib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat-setup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascat-system:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haschoo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HasGP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashable-generics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashtables-plus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskakafka:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskanoid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskarrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4409,6 +4404,9 @@ dont-distribute-packages:
   haskdeep:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeline-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell2010:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell98:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell98libraries:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-aliyun:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-awk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-brainfuck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4416,15 +4414,38 @@ dont-distribute-packages:
   haskell-coffee:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-compression:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-mtl:           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-tf:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-catchio-transformers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-connect-hdbc-lifted:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-dynamic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-flat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hdbc-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-hsql-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-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 ]
+  HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-mpfr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-neo4j-client:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellNN:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Haskelloids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-pdf-presenter:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-platform-test:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4433,14 +4454,16 @@ dont-distribute-packages:
   haskell-read-editor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-reflect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-rules:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-prisms:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-simple:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-token-utils:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-fromghc:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-gen:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tools-ast-trf:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-ast-trf:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-backend-ghc:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-cli:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-daemon:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4450,62 +4473,36 @@ dont-distribute-packages:
   haskell-tools-refactor:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-rewrite:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaskellTutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-typescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tyrant:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-xmpp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell2010:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell98:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell98libraries:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-mtl:           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-tf:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-transformers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-lifted:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-dynamic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-flat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellNN:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haskelloids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellTutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskgame:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskheap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskhol-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskmon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-node:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-protocol:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-script:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-wallet:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoon-httpspec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon-salvia:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskoon-salvia:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore-realtime:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore-supercollider:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore-synthesizer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskRel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-backend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-class:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4513,20 +4510,21 @@ dont-distribute-packages:
   hasql-cursor-transaction:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-generic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-migration:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-cabal-install:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-compiler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-gapi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hastily:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hatex-guide:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-qq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hats:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haverer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaVSA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4536,8 +4534,8 @@ dont-distribute-packages:
   haxl-facebook:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haxr-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haxr-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hayland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hayoo-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4549,6 +4547,7 @@ dont-distribute-packages:
   hbeat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hblas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hblock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hbro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hburg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HCard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4564,13 +4563,13 @@ dont-distribute-packages:
   hdaemonize-buildfix:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbc-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDBC-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HDBC-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbc-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HDBC-postgresql-hstore:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hdbi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdbi-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hDFA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdigest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hdirect:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4594,32 +4593,32 @@ dont-distribute-packages:
   heist-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist-async:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helics-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   helics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  helics-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   helium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   helix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hellage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hellnet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   helm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   help-esb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemkay:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hemokit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hen:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   henet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hen:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hepevt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer-parsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HERA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   herbalizer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HerbiePlugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   heredocs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  her-lexer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  her-lexer-parsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hermes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone-embed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hesh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hesql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hetris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4627,12 +4626,12 @@ dont-distribute-packages:
   hevolisa-dph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hevolisa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-tagsoup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4645,7 +4644,6 @@ dont-distribute-packages:
   hfractal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HFrequencyQueue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hfusion:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hg-buildpackage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgalib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-API:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Audio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4657,6 +4655,7 @@ dont-distribute-packages:
   HGamer3D-Enet-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Graphics3D:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-GUI:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HGamer3D:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-InputSystem:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Network:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Ogre-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4665,7 +4664,7 @@ dont-distribute-packages:
   HGamer3D-SFML-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-WinEvent:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGamer3D-Wire:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hg-buildpackage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgdbmi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGE2D:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgearman:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4676,12 +4675,13 @@ dont-distribute-packages:
   hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi3status:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  H:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hidapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4697,33 +4697,34 @@ dont-distribute-packages:
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   highjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   himpy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hindley-milner:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinquire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinstaller:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinterface:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HipmunkPlayground:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hircules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hirt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hish:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hissmetrics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  historian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-fusion:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hist-pl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-lexicon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-lmf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  historian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJavaScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjcase:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJScript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJVM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlbfgsb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4741,8 +4742,8 @@ dont-distribute-packages:
   hlibfam:                                      [ 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 ]
   hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4757,13 +4758,13 @@ dont-distribute-packages:
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmm-hmatrix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hMollom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmp3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hmpf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4771,15 +4772,15 @@ dont-distribute-packages:
   hnetcdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HNM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoauth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hocilib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HODE:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hoed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hofix-mtl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4794,20 +4795,20 @@ dont-distribute-packages:
   HongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoobuddy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hood-off:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-publish:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-render:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hood-off:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoogle-index:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hooks-dir:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoovie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfli:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4822,14 +4823,14 @@ dont-distribute-packages:
   hp2any-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-manager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpack-convert:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpaco-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpaco-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpapi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaste:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpasteit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpc-coveralls:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4848,46 +4849,20 @@ dont-distribute-packages:
   hpygments:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpylos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
   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 ]
+  HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HROOT-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hruby:                                        [ i686-linux, x86_64-darwin ]
-  hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-di:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-dotnet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-duktape:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-excelx:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-ffmpeg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-GeoIP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gizapp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-mesos:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-nombre-generator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pkg-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pkpass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitterarchiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-watchman:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs2bf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4897,6 +4872,7 @@ dont-distribute-packages:
   hsbencher-codespeed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher-fusion:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-forth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4909,31 +4885,45 @@ dont-distribute-packages:
   hsc3-unsafe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscaffold:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscamwire:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscassandra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hScraper:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-di:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdns-cache:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-dotnet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-duktape:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hsed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsemail-ns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsenv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-excelx:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsfacter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsfcsh:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSFFIG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-ffmpeg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsfilt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-GeoIP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSGEP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgnutls-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-gizapp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsgnutls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsgnutls-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsgsom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHaruPDF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hskeleton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslackbuilder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4941,22 +4931,25 @@ dont-distribute-packages:
   HSlippyMap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogger-reader:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogger-template:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslogstash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsmagick:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSmarty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-mesos:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hsmtlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsmtpclient:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsnock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-nombre-generator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsns:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsnsq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsntp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsOpenSSL-x509-system:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsOpenSSL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HsOpenSSL-x509-system:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSoundFile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparklines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-lifted:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4968,17 +4961,22 @@ dont-distribute-packages:
   hspec-test-sandbox:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-webdriver:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsPerl5:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspkcs11:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pkg-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-pkpass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspresent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsprocess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsql-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-datamodel-vinyl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-datamodel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-datamodel-vinyl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-morris:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-notes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsreadability:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-re:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4989,15 +4987,19 @@ dont-distribute-packages:
   hstox:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstradeking:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HStringTemplateHelpers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-twitterarchiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstzaar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsubconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsverilog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-watchman:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hswip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsXenCtrl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyscall:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hszephyr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HTab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5020,12 +5022,12 @@ dont-distribute-packages:
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  https-everywhere-rules-raw:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-shed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-streams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-wget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  https-everywhere-rules-raw:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   htzaar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5051,27 +5053,27 @@ dont-distribute-packages:
   huttons-razor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-balancedparens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-bits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-eliasfano:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-excess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-packed-vector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-rankselect-base:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-rankselect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-bytevector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hwsl2-reducers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxt-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5086,13 +5088,13 @@ dont-distribute-packages:
   hydrogen-cli-args:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-multimap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-prelude-parsec:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-prelude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hydrogen-prelude-parsec:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-syntax:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylolib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5109,10 +5111,10 @@ dont-distribute-packages:
   iap-verifier:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ib-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   IcoGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ide-backend-common:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ide-backend-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ideas-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ide-backend-common:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ide-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ide-backend-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   idempotent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   identifiers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   idiii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5123,8 +5125,8 @@ dont-distribute-packages:
   ifcxt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   iff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   IFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ig:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ige-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ig:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   igraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   igrf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-aeson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5134,6 +5136,7 @@ dont-distribute-packages:
   ihaskell-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-display:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-hatex:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ihaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-inline-r:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-juicypixels:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-magic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5141,22 +5144,21 @@ dont-distribute-packages:
   ihaskell-plot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-rlangqq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihaskell-widgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihttp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   illuminate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagemagick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagepaste:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imapget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imbib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   imgurder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   imparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ImperativeHaskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  implicit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-logging:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-params:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  implicit:                                     [ 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 ]
   improve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5169,12 +5171,12 @@ dont-distribute-packages:
   IndexedList:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   indieweb-algorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inf-interval:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infer-upstream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   infernu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  infer-upstream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   infinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inf-interval:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   inject-function:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5195,27 +5197,27 @@ dont-distribute-packages:
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  intro-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  intro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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-syntax:                            [ 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 ]
-  io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IOR:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   IORefCAS:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  IOR:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   iothread:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iotransaction:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip2location:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ip:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipatch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ip:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -5226,10 +5228,10 @@ dont-distribute-packages:
   irc-fun-color:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Irc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   iridium:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iron-mq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ironforge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  is:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iron-mq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  is:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   IsNull:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iso8583-bitmaps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5237,33 +5239,33 @@ dont-distribute-packages:
   isohunt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   isotope:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   itemfield:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iter-stats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-compress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iteratee:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-parsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   iteratee-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iterio-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   iterIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iterio-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iter-stats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-backend-c:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-bitdata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-eval:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-hw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-opts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-serialize:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-stdlib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivy-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixdopp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixmonad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   iyql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   j2hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jack-bindings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JackMiniMix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jackminimix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JackMiniMix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jacobi-roots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jail:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jalaali:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5272,12 +5274,12 @@ dont-distribute-packages:
   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 ]
-  java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   javaclass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5287,42 +5289,42 @@ dont-distribute-packages:
   joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-dom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-hello:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jsaddle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-warp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-webkit2gtk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-webkitgtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-wkwebview:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsaddle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-assertions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSON-Combinator-Examples:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSON-Combinator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  JsonGrammar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-incremental-decoder:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-litobj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-pointer-hasql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-python:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JsonGrammar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonresume:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonrpc-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonschema-gen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonsql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-togo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsontsv:                                      [ 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 ]
@@ -5335,45 +5337,45 @@ dont-distribute-packages:
   JunkDB-driver-hashtables:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   JunkDB:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jupyter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jvm-streaming:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jvm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jvm-streaming:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   JYU-Utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-glut:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kafka-device:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-joystick:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-leap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-spacenav:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-vrpn:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kafka-device:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kaleidoscope:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Kalman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kangaroo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   kanji:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-cores:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-lava:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-shake:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   karakuri:                                     [ 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 ]
   kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-environment-gtk:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-lightmodel:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-protectedmodel:         [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-solutions-gtk:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-fs:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-gtk:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-reactivelenses:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-network:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-polling:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-yampa:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivelenses:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-posture:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   keiretsu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ketchup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5387,8 +5389,8 @@ dont-distribute-packages:
   kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kickass-torrents-dump-parser:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   KiCS-debugger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS-prophecy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   KiCS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  KiCS-prophecy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   kif-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-par:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5407,22 +5409,16 @@ dont-distribute-packages:
   ktx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure-your-boilerplate:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   KyotoCabinet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  l-bfgs-b:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   labeled-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   laborantin-hs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labyrinth-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   labyrinth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  labyrinth-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lagrangian:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   laika:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-options:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-sampler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda2js:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-media:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5433,17 +5429,21 @@ dont-distribute-packages:
   lambdacube-engine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-gl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-ir:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaFeed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaHack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaINet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdajudge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-options:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-sampler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatex:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaya-bus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdaya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5470,15 +5470,15 @@ dont-distribute-packages:
   language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  large-hashable:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   LargeCardinalHierarchy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  large-hashable:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lastik:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   latest-npm-version:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-hakyll:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-image:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-formulae-pandoc:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   latex-function-tables:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LATS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5487,6 +5487,7 @@ dont-distribute-packages:
   lazyset:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lazysplines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   LazyVault:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  l-bfgs-b:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lcs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LDAP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldapply:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5502,24 +5503,24 @@ dont-distribute-packages:
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leksah:                                       [ 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 ]
+  lensref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-text-encoding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-time:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-tutorial:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lenses:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lensref:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lentil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lenz-template:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lenz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lenz-template:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar-chart:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lgtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lha:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lhae:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lha:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lhc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lhe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lhs2TeX-hl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5556,8 +5557,8 @@ dont-distribute-packages:
   libzfs:                                       [ 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 ]
-  lighttpd-conf-qq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lighttpd-conf-qq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lilypond:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Limit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   limp-cbc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5566,12 +5567,12 @@ dont-distribute-packages:
   linda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-algebra-cblas:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linearmap-category:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linearmap-category:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linear-vect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linebreak:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinguisticsTypes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5579,8 +5580,8 @@ dont-distribute-packages:
   linkcore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkedhashmap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   linklater:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linode-v4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linode-v4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-blkid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-cgroup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-kmod:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5591,72 +5592,72 @@ dont-distribute-packages:
   lio-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lipsum-gen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquid-fixpoint:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal-demo:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell-cabal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   liquidhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  liquid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-mux:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-http-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-libcurl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-t-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-tries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ListTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  list-tries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  list-t-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  list-zip-def:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ll-picosat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  llvm-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-base-types:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-base-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-data-interop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   llvm-general-darwin:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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-general:                                 [ 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 ]
   llvm-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   located-monad-logger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-elasticsearch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-facade-journald:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Logic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-MPI:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-network:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-processes:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Logic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   logplex-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   logsink:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojban:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanParser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanXiragan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojysamban:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-apps:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol-calculus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lol-typing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   loli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lol-typing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lookup-tables:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-effin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-while:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5667,11 +5668,12 @@ dont-distribute-packages:
   loshadka:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lowgl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lp-diagrams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsystem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltiv1p1:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5704,15 +5706,15 @@ dont-distribute-packages:
   magma:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mahoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mailchimp-subscribe:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mailchimp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   MailchimpSimple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mailchimp-subscribe:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mailgun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   majordomo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   majority:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  makedo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-hard-links:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-package:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  makedo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-all:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-anything:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5720,6 +5722,7 @@ dont-distribute-packages:
   manatee-curl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-editor:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-filemanager:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-imageviewer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-ircclient:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-mplayer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5729,16 +5732,15 @@ dont-distribute-packages:
   manatee-template:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-terminal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-welcome:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-pap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   markup-preview:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5757,9 +5759,9 @@ dont-distribute-packages:
   maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT-monads-tf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   MBot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5776,10 +5778,10 @@ dont-distribute-packages:
   MeanShift:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Measure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mecab:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mech:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mecha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Mechs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5788,24 +5790,23 @@ dont-distribute-packages:
   melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcached-binary:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcached:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  memoization-utils:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-ptr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  memoization-utils:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   messente:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  meta-misc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  meta-par-accelerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   metadata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MetaHDBC:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  meta-misc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  meta-par-accelerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   metaplug:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metric:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   metricsd-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mezzolens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mgeneric:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-parser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5814,12 +5815,13 @@ dont-distribute-packages:
   micrologger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   MicrosoftTranslator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   midair:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midi-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mighttpd2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mighttpd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mikmod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   milena:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mime-string:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5841,8 +5843,8 @@ dont-distribute-packages:
   mix-arrows:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixed-strategies:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mkbndl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ml-w:                                         [ 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 ]
   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 ]
@@ -5861,56 +5863,56 @@ dont-distribute-packages:
   moesocks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mollie-api-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-atom-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadacme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-atom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-atom-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-mtl-foreign:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadCatchIO-mtl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
+  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 ]
+  monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadiccp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monadius:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadLab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-levels:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lgbt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadLib-compose:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadloc-pp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-log:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lrs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-memo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-mersenne-random:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-open:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-parallel-progressbar:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadRandomLazy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-resumption:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-st:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monads-fd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MonadStack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-statevar:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-st:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-io:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-stm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-task:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-tx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-unify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadacme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-mtl-foreign:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-mtl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-transformers-foreign:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-transformers:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCompose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monadius:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadLab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadLib-compose:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadloc-pp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadRandomLazy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monads-fd:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadStack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monarch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monaris:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monatron-IO:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monatron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Monatron-IO:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mondo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   money:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5924,8 +5926,8 @@ dont-distribute-packages:
   mosaico-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mount:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp3decoder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpdmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpppc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpretty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5934,12 +5936,12 @@ dont-distribute-packages:
   mpvguihs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mqtt-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mrm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ms:                                           [ 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 ]
   msgpack-idl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   msgpack-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msgpack:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   msh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ms:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   msi-kb-backlit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   MSQueue:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MTGBuilder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5956,8 +5958,8 @@ dont-distribute-packages:
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multihash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multipass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multiplate-simplified:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiplate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multiplate-simplified:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-alt-deriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-binary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5966,48 +5968,47 @@ dont-distribute-packages:
   Munkres-simple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   muon:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   murder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  murmur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   murmurhash3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  murmur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  musicbrainz-email:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-parts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-preludes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-sibelius:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-suite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  musicbrainz-email:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   musicxml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mustache2hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
   mute-unmute:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   myo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MyPrimes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession-example:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-effect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mysql-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-haskell-nem:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-haskell-openssl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mysql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-quasi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   mystem:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   myTestlll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mywatch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mzv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  n-m:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NameGenerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   namelist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanoAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-cryptr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nanocurses:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-hmac:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-md5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanoAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanocurses:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanomsg-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanomsg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6017,8 +6018,8 @@ dont-distribute-packages:
   narc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nat-sized-numbers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nats-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   NaturalLanguageAlphabets:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   naver-translate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   NearContextAlgebra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   neat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6029,12 +6030,12 @@ dont-distribute-packages:
   Neks:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nemesis-titan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nerf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nero-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nested-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NestedFunctor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nestedmap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nested-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   netcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   netease-fm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   netlines:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6042,14 +6043,14 @@ dont-distribute-packages:
   netspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   netstring-enumerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-frp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-input-glfw:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-input-javascript:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-input:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-vinylglfw-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   netwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netwire-input-glfw:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netwire-input:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netwire-input-javascript:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  netwire-vinylglfw-examples:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-anonymous-i2p:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-api-support:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6060,6 +6061,7 @@ dont-distribute-packages:
   network-connection:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-dbus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-dns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  networked-game:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-hans:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-interfacerequest:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-minihttp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6076,10 +6078,9 @@ dont-distribute-packages:
   network-uri-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  networked-game:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  neural:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-blashs:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural-network-hmatrix:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  neural:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   newports:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   newsynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   newt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6088,8 +6089,8 @@ dont-distribute-packages:
   newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   next-ref:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nfc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ngrams-loader:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ngrams-loader:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   nicovideo-translator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6101,23 +6102,24 @@ dont-distribute-packages:
   nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nm:                                           [ 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 ]
+  nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   nofib-analyze:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx:                                        [ 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 ]
   noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   notcpp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   notzero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6125,8 +6127,8 @@ dont-distribute-packages:
   nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ntrip-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   NTRU:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nullary:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nullpipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   NumberSieves:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6137,17 +6139,17 @@ dont-distribute-packages:
   nvim-hs-contrib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvim-hs-ghcid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nvim-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nylas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nymphaea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   oauthenticated:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   obd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   oberon0:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Object:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6156,14 +6158,14 @@ dont-distribute-packages:
   off-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ohloh-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ois-input-manager:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   old-version:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   olwrapper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   omaketex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnicodec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   on-a-horse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   one-liner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6171,13 +6173,8 @@ dont-distribute-packages:
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenAFP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLWrappers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6189,7 +6186,9 @@ dont-distribute-packages:
   OpenGLCheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   opengles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenGLRaw21:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-haddock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   openid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-crypto-api:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   openpgp-Crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenSCAD:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6199,25 +6198,28 @@ dont-distribute-packages:
   openssl-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentheory-char:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   opentype:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-typerep:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   operational-alacarte:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimization:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orchestrate:                                  [ 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 ]
   orchid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  order-statistic-tree:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  order-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   orders:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  order-statistics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  order-statistic-tree:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ordrea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   organize-imports:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   origami:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   OrPatterns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6226,10 +6228,10 @@ dont-distribute-packages:
   OSM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   overture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-dawg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   packunused:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pacman-memcache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6238,16 +6240,16 @@ dont-distribute-packages:
   PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paillier:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-csv2table:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  papa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  papa-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude-lens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude-semigroupoids:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papa-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   papillon:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   paragon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6255,23 +6257,23 @@ dont-distribute-packages:
   parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   paranoia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   parconc-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   parseerror-eq:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsely:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parser-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   parser241:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsergen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parser-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsestar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   partage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partial:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-isomorphisms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   partly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   passage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PasswordGenerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6286,8 +6288,8 @@ dont-distribute-packages:
   patterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-adaptive-hoops:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pbc4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   PBKDF2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6299,22 +6301,22 @@ dont-distribute-packages:
   peano:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PeanoWitnesses:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   peggy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  peg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
-  PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   period:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-audit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-cereal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6333,11 +6335,11 @@ dont-distribute-packages:
   peyotls-codec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   peyotls:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pez:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pg-store:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6347,21 +6349,21 @@ dont-distribute-packages:
   phraskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Phsu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   phybin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pi-forall:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pia-forward:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   picologic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   picosat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pi-forall:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   piki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-async:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-attoparsec-streaming:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cacophony:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6380,8 +6382,8 @@ dont-distribute-packages:
   pipes-zeromq4:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Piso:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   pkggraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   plailude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6395,17 +6397,17 @@ dont-distribute-packages:
   plot-lab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   plumbers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ply-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pocket-dns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokitdok:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6419,8 +6421,8 @@ dont-distribute-packages:
   polynomial:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polytypeable-utils:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  polytypeable-utils:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pomodoro:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ponder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pong-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6438,6 +6440,7 @@ dont-distribute-packages:
   posix-acl:                                    [ 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 ]
   postgresql-orm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-schema:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6445,9 +6448,8 @@ 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:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgrest-ws:                                 [ 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 ]
   postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmaster:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6461,8 +6463,8 @@ dont-distribute-packages:
   practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   preamble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pregame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   preliminaries:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6475,34 +6477,34 @@ dont-distribute-packages:
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-error:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pringletons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   print-debugger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Printf-TH:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  priority-queue:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  priority-queue:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ProbabilityMonads:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  processing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-iterio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-listlike:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-progress:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  processing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   procrastinating-structure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   proj4-hs-bindings:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prologue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   promise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6513,14 +6515,14 @@ dont-distribute-packages:
   proplang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prosper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   proteaaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-optparse:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-protoc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-optparse:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proto-lens-protoc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   protolude-lifted:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   proton-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   prove-everywhere-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6539,17 +6541,17 @@ dont-distribute-packages:
   punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pure-zlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pure-priority-queue-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   purescript-bridge:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
   pusher-ws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   putlenses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6558,8 +6560,8 @@ dont-distribute-packages:
   pyfi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   qc-oi-testgenerator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qd-vec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qd-vec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   qif:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6567,11 +6569,11 @@ dont-distribute-packages:
   QLearn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-imager:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-repa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-cpp-qt5:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-generator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-qt5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuadEdge:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quadratic-irrational:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuadTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6582,7 +6584,6 @@ dont-distribute-packages:
   quenya-verb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   querystring-pickle:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   queuelike:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quick-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickAnnotate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickbooks:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickCheck-GenT:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6597,19 +6598,19 @@ dont-distribute-packages:
   quickcheck-with-counterexamples:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quick-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickset:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Quickson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickterm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quicktest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickwebapp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quipper-rendering:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quipper-rendering:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-instances:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-interleave:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quoridor-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   qux:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  R-pandoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rabocsv2qif:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rad:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium-formula-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6622,19 +6623,19 @@ dont-distribute-packages:
   rakhana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ralist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rallod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-eff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-hypergeometric:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-variates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Range:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  range-space:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-bufs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6656,7 +6657,6 @@ dont-distribute-packages:
   rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdioh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6665,13 +6665,14 @@ dont-distribute-packages:
   reactive-banana-wx:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-jack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-midyim:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  read-bounded:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ReadArgs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  read-bounded:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   readline-statevar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   readme-lhs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   readpyc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6680,68 +6681,68 @@ dont-distribute-packages:
   reasonable-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-gl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   record:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursion-schemes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   refcount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Referees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   references:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   refh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflection-extras:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-animation:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-colonnade:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom-helpers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-jsx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-orphans:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   refty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexchar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexdot:                                     [ 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 ]
   regex-pderiv:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexpr-symbolic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regexqq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-pipes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-quasiquoter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   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-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexchar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexdot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexpr-symbolic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexqq:                                      [ 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 ]
   regions-monadsfd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regions-monadstf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   regions-mtl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   register-machine-typelevel:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regress:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regular-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regular:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regular-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   regular-xmlpickler:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regular:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
   relation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6750,10 +6751,10 @@ dont-distribute-packages:
   remark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   remarks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-debugger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remote-json-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remote-json-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remote-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remote-json-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remote-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remote-json-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   remotion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reorderable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-array:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6772,12 +6773,12 @@ dont-distribute-packages:
   repl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   replicant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   repo-based-blog:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   representable-tries:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   req:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6809,13 +6810,13 @@ dont-distribute-packages:
   ripple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   risc386:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rivers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rivet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rivet-migration:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rivet-simple-deploy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rivet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   RJson:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rl-satton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rlang-QQ:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rlglue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rl-satton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rlwe-challenges:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   RMP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6840,18 +6841,19 @@ dont-distribute-packages:
   rosso:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rounding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  roundtrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-string:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-xml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-generator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-planning:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rowrecord:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  R-pandoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rpc-framework:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rpc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rpm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl-frp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6867,7 +6869,6 @@ dont-distribute-packages:
   runtime-arbitrary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  s-cargot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   SableCC2Hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-access:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6877,31 +6878,31 @@ dont-distribute-packages:
   safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles-text:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safer-file-handles-text:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   saferoute:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sai-shape-syb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Salsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   saltine-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  salvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-sessions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   salvia-websocket:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   samtools-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   samtools-iteratee:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   sandlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sarasvati:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sarsi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sasl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sat-micro-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-backends:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-funsat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-minisat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-toysat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sat-micro-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sbp2udp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sbp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6911,13 +6912,14 @@ dont-distribute-packages:
   SCalendar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  s-cargot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedyield:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-texmath:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6946,8 +6948,8 @@ dont-distribute-packages:
   sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   secdh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seclib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   second-transfer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   secp256k1:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6957,16 +6959,16 @@ dont-distribute-packages:
   secure-sockets:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sednaDBXML:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Semantique:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   semdoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroupoids-syntax:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroups-actions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semiring-num:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semiring-num:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensei:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6974,15 +6976,13 @@ dont-distribute-packages:
   sentry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   separated:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqaid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqalign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqloc-datafiles:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequent-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   serokell-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   serpentine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  serv-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-aeson-specs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-docs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7005,19 +7005,21 @@ dont-distribute-packages:
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-subscriber:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-swagger-ui:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-swagger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-swagger-ui:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-persistent:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-redis:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-frontend-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  serv-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ses-html:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  set-with:                                     [ 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 ]
   setters:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7026,12 +7028,11 @@ dont-distribute-packages:
   SFML:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFont:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sgd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   SGdemo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sgd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sha-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shadower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shadowsocks:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shady-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7047,12 +7048,13 @@ dont-distribute-packages:
   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 ]
+  sha-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelduck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelltestrunner:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7061,50 +7063,50 @@ dont-distribute-packages:
   shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sibe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-atom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-bluetooth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-config:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-effects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-genetic-algorithm:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-index:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-neural-networks:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-nix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-pascal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-tabular:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleH:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-index:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-logger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-neural-networks:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-nix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplenote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-pascal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleServer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplessh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplest-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-tabular:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sindre:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sixfiguregroup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sized-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sjsp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7129,12 +7131,12 @@ dont-distribute-packages:
   smerdyakov:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Smooth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   smsaero:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-debug:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-pipe:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   SmtLib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtp2mta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snake-game:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snake:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-accept:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7144,14 +7146,6 @@ dont-distribute-packages:
   snap-cors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-error-collector:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-loader-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-templates:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-web-routes:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-acid-state:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-actionlog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7169,8 +7163,8 @@ dont-distribute-packages:
   snaplet-i18n:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-influxdb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-mandrill:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mongodb-minimalistic:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-mongoDB:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-mongodb-minimalistic:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-mysql-simple:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-oauth:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-persistent:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7186,14 +7180,22 @@ dont-distribute-packages:
   snaplet-scoped-session:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-sedna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-ses-html:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-sqlite-simple-jwt-auth:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-sqlite-simple:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snaplet-sqlite-simple-jwt-auth:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-stripe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-tasks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-typed-sessions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   snaplet-wordpress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-loader-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-templates:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-web-routes:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sndfile-enumerators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sneakyterm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sneathlane-haste:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7201,17 +7203,17 @@ dont-distribute-packages:
   snm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   snmp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   snorkels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowflake-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   soap-openssl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sodium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   soegtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7235,9 +7237,9 @@ dont-distribute-packages:
   spaceprobe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spanout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparkle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsebit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparsecheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   spata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   special-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   specialize-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7260,22 +7262,22 @@ dont-distribute-packages:
   spoty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sprig:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   spritz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sproxy-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sproxy2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sproxy-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-mysql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-pool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqlvalue-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqsd-local:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   squeeze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sshd-lint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sstable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7283,24 +7285,24 @@ dont-distribute-packages:
   stable-marriage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-memo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-haddock:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   starling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   starrover2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stasis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  state-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  state-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   statgrab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-fusion:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-hypergeometric-genvar:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7310,37 +7312,37 @@ dont-distribute-packages:
   stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-firehose:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-lifted:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stochastic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   StockholmAlignment:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   store:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-ATermLib:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrappedTemplates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratum-tool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratux-http:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stratux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratux-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stratux-websockets:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stratux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   strict-concurrency:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   strict-identity:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   strict-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   strictly:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  string-typelits:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  string-typelits:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   StringUtils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-http-streams:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7351,9 +7353,9 @@ dont-distribute-packages:
   structures:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stylized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffixarray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SuffixStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   suitable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7362,15 +7364,15 @@ dont-distribute-packages:
   sunroof-compiler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  super-user-spark:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-ht:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-midi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   superdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   supermonad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  super-user-spark:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7383,48 +7385,46 @@ dont-distribute-packages:
   SWMMoutGetMB:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syb-with-class-instances-text:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SybWidget:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syb-with-class-instances-text:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sylvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sym:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sync-mht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sym:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sync-mht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   syncthing-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntactic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-example-json:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax-example-json:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-pretty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-printer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees-fork-bairyn:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   syntax-trees:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-alsa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-core:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-dimensional:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   synthesizer-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sys-process:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sys-process:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  t-regex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   t3-client:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   t3-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  table-layout:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  table-tennis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   table:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  table-layout:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablestorage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  table-tennis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tag-bits:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7435,13 +7435,14 @@ dont-distribute-packages:
   tagsoup-ht:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-parsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-selection:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tailfile-hinotify:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-term:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-theory:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover-utils:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tape:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   target:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7459,9 +7460,9 @@ dont-distribute-packages:
   TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tcp-streams-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tcp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tcp-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tcp-streams-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdoc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7474,19 +7475,19 @@ dont-distribute-packages:
   template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-hsml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   templateify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   templatepg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  template-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tempodb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   temporal-csound:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   temporary-resourcet:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tempus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   terminal-progress-bar:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   termination-combinators:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   termplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7494,17 +7495,17 @@ dont-distribute-packages:
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-sandbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-skip:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-pkg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox-quickcheck:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-sandbox:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpattern:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-pkg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testPkg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   testrunner:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-sandbox-compose:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-sandbox-hunit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-sandbox:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-sandbox-quickcheck:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-all:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7513,81 +7514,81 @@ dont-distribute-packages:
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textocat-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-position:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-render:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-show-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-show:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-show-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  textual:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-zipper-monad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textocat-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textual:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tfp-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tftp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tga:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-build:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-context:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-fold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-instance-reification:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-sccs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-typegraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   THEff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   themoviedb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thentos-cookie-session:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Theora:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-fold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   thih:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   thimk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-instance-reification:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-kinds-fork:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   threads-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-sccs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-traced:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-typegraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tianbar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tibetan-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tictactoe3d:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   TicTacToe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-midi:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-serial:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tie-knot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tiempo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tiger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   TigerHash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tiger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tightrope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tighttp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timberc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeconsole:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-exts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-patterns:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeconsole:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-patterns:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   timestamp-subprocess-lines:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tinyMesh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7600,12 +7601,10 @@ dont-distribute-packages:
   tld:                                          [ 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 ]
-  to-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   toboggan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   todos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tofromxml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   toilet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokenify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   toktok:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7615,6 +7614,8 @@ dont-distribute-packages:
   Top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   topkata:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   total:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7622,9 +7623,9 @@ dont-distribute-packages:
   toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-call:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  traced:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-function-call:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  traced:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracetree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7646,11 +7647,12 @@ dont-distribute-packages:
   trawl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeCounter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  treemap-html-tools:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   treemap-html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  treemap-html-tools:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   treemap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   treersec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TreeStructures:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  t-regex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Treiber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tremulous-query:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   TrendGraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7665,17 +7667,17 @@ dont-distribute-packages:
   tskiplist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tslib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tslogger:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-hlist:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-lenses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-morph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   turingMachine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  turing-machines:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7699,45 +7701,45 @@ dont-distribute-packages:
   txtblk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   typalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-assertions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-combinators-quote:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-digits:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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-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 ]
+  TypeIlluminator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-int:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-bst:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typelevel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-induction:          [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-operations:         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TypeNat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-natural:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-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 ]
+  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 ]
   type-spine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-structure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-sub-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-process:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-spreadsheet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-wire-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typedquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typehash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeIlluminator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typelevel:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeNat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeparams:                                   [ 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 ]
   u2f:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uAgda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uber:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   uberlast:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uconv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhexdump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7748,13 +7750,13 @@ dont-distribute-packages:
   unboxed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbreak:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-normalization:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unicode-symbols:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unicode-symbols:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   union-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unique-logic-tf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unique-logic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unique-logic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unique-logic-tf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   units-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   unittyped:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7778,11 +7780,11 @@ dont-distribute-packages:
   uri-enumerator-file:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-templater:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   urlcheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   urxml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7795,31 +7797,30 @@ dont-distribute-packages:
   utc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-cairo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-graphviz:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-ubigraph:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  valid-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   validated-literals:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Validation:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   validations:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  valid-names:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vampire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   var:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   variable-precision:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   variables:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcsgui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-Transform:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating-accelerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7833,10 +7834,11 @@ dont-distribute-packages:
   vector-read-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-space-opengl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-static:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Vec-Transform:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Verba:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   verbalexpressions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7858,8 +7860,8 @@ dont-distribute-packages:
   vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vrpn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7882,8 +7884,8 @@ dont-distribute-packages:
   wai-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-consul:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-content-type:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7911,49 +7913,52 @@ dont-distribute-packages:
   watchdog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   watcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   watchit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wave:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   WaveFront:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wave:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wavy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-css:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-inv-route:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-regular:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcloud:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebCont:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank-dispatch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webcrank-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   webcrank:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webcrank-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-css:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   webdriver-angular:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   webdriver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WeberLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   webify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-inv-route:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkit2gtk3-javascriptcore:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkitgtk3:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkitgtk3-javascriptcore:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-regular:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  web-routing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   webserver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   websnap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   websockets-snap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   webwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted-regexp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   welshy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Wheb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-mongo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-redis:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-strapped:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wheb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   whim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   whiskers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   whitespace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7968,10 +7973,10 @@ dont-distribute-packages:
   wiring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wiringPi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wl-pprint-ansiterm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPLib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wlc-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wl-pprint-ansiterm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   WMSigner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7998,7 +8003,6 @@ dont-distribute-packages:
   wumpus-microprint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   WURFL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxAsteroids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxcore:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8007,10 +8011,10 @@ dont-distribute-packages:
   wxFruit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   WxGeneric:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxhnotepad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxSimpleCanvas:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxturtle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wyvern:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-rm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8021,6 +8025,7 @@ dont-distribute-packages:
   xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xdcc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Xec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xfconf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xhaskell-library:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8033,24 +8038,24 @@ dont-distribute-packages:
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsior:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-catalog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-conduit-decode:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator-combinators:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-html-conduit-lens:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-isogen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XMLParser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-pipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-prettify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-to-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMLParser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client-glib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8079,15 +8084,15 @@ dont-distribute-packages:
   yahoo-web-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml2owl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yamlkeysdiff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa2048:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yampa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   YampaSynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8105,8 +8110,8 @@ dont-distribute-packages:
   yesod-auth-fb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-hashdb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-smbclient:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-zendesk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8114,8 +8119,8 @@ dont-distribute-packages:
   yesod-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-crud-persist:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-crud:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-crud-persist:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-csp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8134,8 +8139,8 @@ dont-distribute-packages:
   yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-flow:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-rst:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-sass:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8147,6 +8152,7 @@ dont-distribute-packages:
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-keymap-cua:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-keymap-emacs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8155,13 +8161,12 @@ dont-distribute-packages:
   yi-mode-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-mode-javascript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-spolsky:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yjftp-libs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yjftp-libs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjsvg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoctoparsec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yogurt-Standalone:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Yogurt-Standalone:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8174,9 +8179,9 @@ dont-distribute-packages:
   ZEBEDDE:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   zendesk-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeno:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  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 ]
   zim-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8190,9 +8195,9 @@ dont-distribute-packages:
   zmidi-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmqat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoneinfo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-cache-pcm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-cache-sndfile:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]

From 53d55cbfe9f3e9c7d3b9d729fa93d9adf5bf0f84 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 26 Feb 2017 22:31:51 +0100
Subject: [PATCH 1513/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d654ea25e98c918aeb46cdb7b7d2372bec114101.
---
 .../haskell-modules/hackage-packages.nix      | 6315 +++++++++++++----
 1 file changed, 4817 insertions(+), 1498 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d31dc82822cb..a2e477baa15e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -255,6 +255,8 @@ self: {
        pname = "ADPfusion";
        version = "0.5.2.0";
        sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bits containers DPutils mmorph mtl OrderedBits primitive
          PrimitiveArray QuickCheck strict template-haskell th-orphans
@@ -455,6 +457,8 @@ self: {
        pname = "ALUT";
        version = "2.4.0.2";
        sha256 = "b8364da380f5f1d85d13e427851a153be2809e1838d16393e37566f34b384b87";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
        homepage = "https://github.com/haskell-openal/ALUT";
@@ -754,8 +758,9 @@ self: {
      }) {};
 
   "AlanDeniseEricLauren" = callPackage
-    ({ mkDerivation, base, containers, hspec, hspec-core, MonadRandom
-     , mtl, QuickCheck, random, random-shuffle, transformers, vector
+    ({ mkDerivation, base, containers, criterion, hspec, hspec-core
+     , MonadRandom, mtl, QuickCheck, random, random-shuffle
+     , transformers, vector
      }:
      mkDerivation {
        pname = "AlanDeniseEricLauren";
@@ -768,6 +773,7 @@ self: {
          base containers hspec hspec-core MonadRandom QuickCheck random
          transformers
        ];
+       benchmarkHaskellDepends = [ base containers criterion ];
        homepage = "http://github.com/enolan/AlanDeniseEricLauren";
        description = "Find the minimal subset/submap satisfying some property";
        license = stdenv.lib.licenses.bsd3;
@@ -916,8 +922,7 @@ self: {
        pname = "AppleScript";
        version = "0.2.0.1";
        sha256 = "796b0a7deaa5a6ae0f30f98f9451afa5033aea96b41df52b1d4bd7b27d8fbcca";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -1246,6 +1251,8 @@ self: {
        pname = "BenchmarkHistory";
        version = "0.0.0.2";
        sha256 = "a3ab4de30a90e70c3b8bfe28d956322312c5e14b42f94da1051c71ff0853fa3d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cassava deepseq directory statistics time vector
        ];
@@ -1344,8 +1351,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.4";
-       sha256 = "b3c36291729328b42ba73ee777c4ef1490eccee982b64ee3dbf5103c25d5c2f3";
+       version = "1.0.5";
+       sha256 = "f32d7c8e0433c38e77c3c06c08fd30bfc6eccaa8a4ccc074638de016ab13793f";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -2938,6 +2945,8 @@ self: {
        pname = "ConfigFile";
        version = "1.1.4";
        sha256 = "ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
        homepage = "http://software.complete.org/configfile";
        description = "Configuration file reading & writing";
@@ -3248,10 +3257,11 @@ self: {
     ({ mkDerivation, array, async, attoparsec, attoparsec-conduit, base
      , binary, blaze-builder, blaze-textual, bytestring, conduit
      , containers, data-default, directory, doctest, fast-logger
-     , filepath, hashable, hspec, lens, lifted-base, monad-control
-     , monad-logger, mtl, network, network-conduit, optparse-applicative
-     , stm, system-fileio, system-filepath, template-haskell, text, time
-     , transformers, transformers-base, unordered-containers
+     , filepath, hashable, hspec, lens, lifted-base
+     , mersenne-random-pure64, monad-control, monad-logger, mtl, network
+     , network-conduit, optparse-applicative, stm, system-fileio
+     , system-filepath, template-haskell, text, time, transformers
+     , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "CurryDB";
@@ -3273,6 +3283,9 @@ self: {
        testHaskellDepends = [
          base conduit directory doctest filepath hspec lifted-base mtl stm
        ];
+       benchmarkHaskellDepends = [
+         base bytestring mersenne-random-pure64 mtl
+       ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3435,8 +3448,9 @@ self: {
      }) {};
 
   "DPutils" = callPackage
-    ({ mkDerivation, base, containers, kan-extensions, parallel, pipes
-     , QuickCheck, tasty, tasty-quickcheck, tasty-th, vector
+    ({ mkDerivation, base, containers, criterion, kan-extensions
+     , parallel, pipes, QuickCheck, tasty, tasty-quickcheck, tasty-th
+     , vector
      }:
      mkDerivation {
        pname = "DPutils";
@@ -3449,6 +3463,7 @@ self: {
          base containers kan-extensions parallel pipes QuickCheck tasty
          tasty-quickcheck tasty-th vector
        ];
+       benchmarkHaskellDepends = [ base criterion vector ];
        homepage = "https://github.com/choener/DPutils";
        description = "utilities for DP";
        license = stdenv.lib.licenses.bsd3;
@@ -3485,8 +3500,8 @@ self: {
      }:
      mkDerivation {
        pname = "DSA";
-       version = "1.0.1";
-       sha256 = "cd5fb8bc019734caca4d1351bdc360c8947fc180646be43ee4888c25b9530101";
+       version = "1.0.2";
+       sha256 = "9c4f9de5fe61be4c25e4696b3ddbf1b38d7f064c4600d24e6021d342194deb1d";
        libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
@@ -3647,7 +3662,7 @@ self: {
      }) {};
 
   "DataIndex" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hspec }:
+    ({ mkDerivation, base, criterion, tasty, tasty-hspec }:
      mkDerivation {
        pname = "DataIndex";
        version = "0.1.1";
@@ -3657,6 +3672,7 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/yuhangwang/DataIndex#readme";
        description = "A package for adding index column to data files";
        license = stdenv.lib.licenses.mit;
@@ -4342,31 +4358,41 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, ListLike, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "Earley";
        version = "0.11.0.1";
        sha256 = "c207a40926bb0b9de05641a0fc03c22849a2c7e0bc007d2ffef37f33793985b3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "Earley_0_12_0_0" = callPackage
-    ({ mkDerivation, base, ListLike, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "Earley";
        version = "0.12.0.0";
        sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ListLike parsec
+       ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4613,6 +4639,8 @@ self: {
        pname = "EsounD";
        version = "0.2";
        sha256 = "59b6f6676e5cd005e296ee8e8f0669522d981f94fb96874deb223133d09842b4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bindings-EsounD monad-control network
          regions safer-file-handles storablevector transformers unix
@@ -4948,8 +4976,8 @@ self: {
     ({ mkDerivation, base, STMonadTrans, vector }:
      mkDerivation {
        pname = "FastPush";
-       version = "0.1.0.2";
-       sha256 = "301cf0552dc14adc8865038b7d7f5aac7dc791f4039c790c28262603b129c674";
+       version = "0.1.0.3";
+       sha256 = "61f383fa02c0c2e34e3905be1ededc0db65012e4a7d55bec747e756bacc7aa7b";
        libraryHaskellDepends = [ base STMonadTrans vector ];
        homepage = "https://github.com/wyager/FastPush/";
        description = "A monad and monad transformer for pushing things onto a stack very fast";
@@ -5316,8 +5344,8 @@ self: {
      }) {};
 
   "ForestStructures" = callPackage
-    ({ mkDerivation, base, containers, fgl, QuickCheck, test-framework
-     , test-framework-quickcheck2, test-framework-th
+    ({ mkDerivation, base, containers, criterion, fgl, QuickCheck
+     , test-framework, test-framework-quickcheck2, test-framework-th
      , unordered-containers, vector, vector-th-unbox
      }:
      mkDerivation {
@@ -5331,6 +5359,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/choener/ForestStructures";
        description = "Tree- and forest structures";
        license = stdenv.lib.licenses.bsd3;
@@ -5376,8 +5405,8 @@ self: {
      }) {};
 
   "Foster" = callPackage
-    ({ mkDerivation, array, base, cmdtheline, containers, random
-     , strict
+    ({ mkDerivation, array, base, cmdtheline, containers, criterion
+     , random, strict
      }:
      mkDerivation {
        pname = "Foster";
@@ -5388,6 +5417,9 @@ self: {
        executableHaskellDepends = [
          array base cmdtheline containers random strict
        ];
+       benchmarkHaskellDepends = [
+         array base cmdtheline containers criterion random strict
+       ];
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5443,15 +5475,17 @@ self: {
      }) {};
 
   "Frames" = callPackage
-    ({ mkDerivation, base, directory, ghc-prim, hspec, htoml, pipes
-     , pretty, primitive, readable, regex-applicative, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
-     , vinyl
+    ({ mkDerivation, base, criterion, directory, ghc-prim, hspec, htoml
+     , pipes, pretty, primitive, readable, regex-applicative
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector, vinyl
      }:
      mkDerivation {
        pname = "Frames";
        version = "0.1.9";
        sha256 = "18eaea64c8f3ff7156ca1dcc372bae3e8ff7538cffce4c415710eae770eb6b25";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base ghc-prim pipes primitive readable template-haskell text
          transformers vector vinyl
@@ -5460,6 +5494,7 @@ self: {
          base directory hspec htoml pretty regex-applicative
          template-haskell temporary text unordered-containers
        ];
+       benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5485,6 +5520,8 @@ self: {
        pname = "FreeTypeGL";
        version = "0.0.4";
        sha256 = "4e85f39777c29cc145b760289906b3a9f8e518296af258004223d87bbbdc5183";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base freetype2 OpenGL ];
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
@@ -5717,6 +5754,8 @@ self: {
        pname = "GLUT";
        version = "2.7.0.11";
        sha256 = "da270ef3027f48fd62115e6f1e90a44334e3da5524e4619dbab6d186f5511b5d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
@@ -6349,6 +6388,8 @@ self: {
        pname = "GrammarProducts";
        version = "0.1.1.2";
        sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ADPfusion ansi-wl-pprint base bytestring containers data-default
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
@@ -6795,6 +6836,8 @@ self: {
        sha256 = "7a3ee21c41e716111c4a3742a66eb448683719a9384afbf7021c5942ac73d2ad";
        revision = "1";
        editedCabalFile = "da1cef4f99bc200ef3c4c866519859dfee81457aff6a8fa7418c17f210a1e7fd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers convertible mtl old-time text time
          utf8-string
@@ -6830,6 +6873,8 @@ self: {
        pname = "HDBC-odbc";
        version = "2.5.0.1";
        sha256 = "96000a9573e873d231ca09f974c4ff0c4d7ec86d7ec6ceaaeb0cc02fc5e6de99";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring concurrent-extra HDBC mtl time utf8-string
        ];
@@ -6847,11 +6892,14 @@ self: {
        pname = "HDBC-postgresql";
        version = "2.3.2.4";
        sha256 = "71988482df2efc773e8272a041f46c61bb4357aa3856edbc69d3fb9d09c168fd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring convertible HDBC mtl old-time parsec time
          utf8-string
        ];
        librarySystemDepends = [ postgresql ];
+       executableSystemDepends = [ postgresql ];
        homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6889,8 +6937,11 @@ self: {
        pname = "HDBC-sqlite3";
        version = "2.3.3.1";
        sha256 = "a783d9ab707ebfc68e3e46bd1bbb5d3d5493f50a7ccf31223d9848cff986ebea";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
        librarySystemDepends = [ sqlite ];
+       executableSystemDepends = [ sqlite ];
        homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
@@ -6943,6 +6994,8 @@ self: {
        pname = "HFuse";
        version = "0.2.4.5";
        sha256 = "e28e0689dfe5f7bc312b842adb02e172b56c3f53a1819ebda7ab39eace6c24a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ fuse ];
        preConfigure = ''
@@ -7318,10 +7371,11 @@ self: {
      }) {};
 
   "HGraphStorage" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, data-default
-     , directory, filepath, HUnit, lifted-base, monad-control
-     , monad-logger, QuickCheck, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, transformers-base
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
+     , criterion, data-default, directory, filepath, HUnit, lifted-base
+     , monad-control, monad-logger, QuickCheck, resourcet, tar, tasty
+     , tasty-hunit, tasty-quickcheck, text, text-binary, transformers
+     , transformers-base, zlib
      }:
      mkDerivation {
        pname = "HGraphStorage";
@@ -7337,6 +7391,11 @@ self: {
          lifted-base monad-control monad-logger QuickCheck resourcet tasty
          tasty-hunit tasty-quickcheck text transformers transformers-base
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring Cabal containers criterion data-default
+         directory filepath monad-logger resourcet tar text text-binary
+         transformers zlib
+       ];
        homepage = "https://github.com/JPMoresmau/HGraphStorage";
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
@@ -7959,6 +8018,8 @@ self: {
        pname = "HSH";
        version = "2.1.2";
        sha256 = "788a7f25336e7fe9c7d38b68bb4cc0030712fc47e0cdf282267dea1e46b0da9f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory filepath hslogger MissingH mtl process
          regex-base regex-compat regex-posix unix
@@ -8562,6 +8623,8 @@ self: {
        pname = "HandsomeSoup";
        version = "0.4.2";
        sha256 = "0ae2dad3fbde1efee9e45b84b2aeb5b526cc7b3ea2cbc5715494f7bde3ceeefb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers HTTP hxt hxt-http mtl network network-uri parsec
          transformers
@@ -9109,6 +9172,8 @@ self: {
        pname = "Hoed";
        version = "0.3.6";
        sha256 = "8508f5077a0a45662af4dddd44bf1ce55fb4cd007b0246ce193ff6d439c351db";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cereal containers directory filepath FPretty
          libgraph mtl process RBTree regex-posix template-haskell
@@ -9252,13 +9317,14 @@ self: {
      }) {};
 
   "HostAndPort" = callPackage
-    ({ mkDerivation, base, doctest, hspec, parsec }:
+    ({ mkDerivation, base, criterion, doctest, hspec, parsec }:
      mkDerivation {
        pname = "HostAndPort";
        version = "0.2.0";
        sha256 = "15a625f5e0f1a510fa1a307127abae2ae2589d9525ff60ed33be39230f335be6";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base doctest hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/bacher09/hostandport";
        description = "Parser for host and port pairs like localhost:22";
        license = stdenv.lib.licenses.mit;
@@ -9385,8 +9451,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsOpenSSL";
-       version = "0.11.4";
-       sha256 = "6326b9b1fb07e05a72f8435cc3ae777d696251e43e93b25ec2ff513f7f2bed07";
+       version = "0.11.4.1";
+       sha256 = "03445cb1ed881f3a8825e375d87af92a5521549ab86042a5bd4d6052b4e7bfbd";
        libraryHaskellDepends = [
          base bytestring integer-gmp network time
        ];
@@ -9553,7 +9619,7 @@ self: {
      }) {};
 
   "Hungarian-Munkres" = callPackage
-    ({ mkDerivation, array, base, Munkres, random, tasty
+    ({ mkDerivation, array, base, criterion, Munkres, random, tasty
      , tasty-quickcheck
      }:
      mkDerivation {
@@ -9564,6 +9630,7 @@ self: {
        testHaskellDepends = [
          array base Munkres random tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ array base criterion Munkres random ];
        description = "A Linear Sum Assignment Problem (LSAP) solver";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -9789,13 +9856,19 @@ self: {
      }) {};
 
   "IntervalMap" = callPackage
-    ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
+    ({ mkDerivation, base, Cabal, containers, criterion, deepseq
+     , fingertree, QuickCheck, random, SegmentTree, weigh
+     }:
      mkDerivation {
        pname = "IntervalMap";
        version = "0.5.2.0";
        sha256 = "031a491ae40c333a3227d147aae9ace42f2f4b535fcbbb991c6b4f35a1531684";
        libraryHaskellDepends = [ base containers deepseq ];
        testHaskellDepends = [ base Cabal containers deepseq QuickCheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree random SegmentTree
+         weigh
+       ];
        homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Containers for intervals, with efficient search";
        license = stdenv.lib.licenses.bsd3;
@@ -9905,6 +9978,8 @@ self: {
        sha256 = "477eecd8af2f070ff648f576ee81ee04efa45cc77b606f7fc09b6f2c156df299";
        revision = "1";
        editedCabalFile = "47b2855a9c5769eadfdbb4eaddca6c66e6de21432d555162f2cc4dcde6e0861a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
@@ -9983,8 +10058,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "Jdh";
-       version = "0.1.0.0";
-       sha256 = "df460a97cde668b6d170ddcbfe547e146de56524108a4e811c6ca7bb26b4e864";
+       version = "0.1.0.1";
+       sha256 = "8005db8ccfcdd6bab84fcfb8bfc2b357161d5999e6a0ff121bfdd4ab06ece77d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/brunoczim/Json-Data-for-Haskell";
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
@@ -10070,13 +10145,14 @@ self: {
      }) {};
 
   "JuicyPixels-extra" = callPackage
-    ({ mkDerivation, base, hspec, JuicyPixels }:
+    ({ mkDerivation, base, criterion, hspec, JuicyPixels }:
      mkDerivation {
        pname = "JuicyPixels-extra";
        version = "0.1.1";
        sha256 = "d37b257e7780e18a4e8335523b2f8962efb845da3b1dd84435a684b24a82b9fd";
        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;
@@ -10416,6 +10492,8 @@ self: {
        pname = "LDAP";
        version = "0.6.11";
        sha256 = "01cb48801eb3033fbd8be6d755863e7fea7d9083afc76aff07b9c42f8e1890b3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ lber openldap ];
        testHaskellDepends = [ base HUnit ];
@@ -10929,9 +11007,9 @@ self: {
 
   "LogicGrowsOnTrees" = callPackage
     ({ mkDerivation, AbortT-mtl, AbortT-transformers, base, bytestring
-     , cereal, cmdtheline, composition, containers, data-ivar, derive
-     , directory, hslogger, hslogger-template, HUnit, lens
-     , MonadCatchIO-transformers, monoid-statistics, mtl, multiset
+     , cereal, cmdtheline, composition, containers, criterion, data-ivar
+     , deepseq, derive, directory, hslogger, hslogger-template, HUnit
+     , lens, MonadCatchIO-transformers, monoid-statistics, mtl, multiset
      , old-locale, operational, prefix-units, pretty, PSQueue
      , QuickCheck, quickcheck-instances, random, sequential-index
      , smallcheck, split, stm, test-framework, test-framework-hunit
@@ -10942,6 +11020,8 @@ self: {
        pname = "LogicGrowsOnTrees";
        version = "1.1.0.2";
        sha256 = "f3f6e7ee3022a60d279eff5d27fd6d3a7ca25972f18077594f90a15ed9cf16fb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          AbortT-mtl AbortT-transformers base bytestring cereal cmdtheline
          composition containers data-ivar derive directory hslogger
@@ -10956,6 +11036,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          test-framework-smallcheck time transformers uuid void
        ];
+       benchmarkHaskellDepends = [ base cereal criterion deepseq ];
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10970,12 +11051,15 @@ self: {
        pname = "LogicGrowsOnTrees-MPI";
        version = "1.0.0.1.1";
        sha256 = "22f5bcb22e731984e40a76ae1d48b0e59329ac5d3bd633efef7cb8140de8146b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers data-ivar derive
          hslogger hslogger-template LogicGrowsOnTrees
          MonadCatchIO-transformers stm transformers
        ];
        librarySystemDepends = [ openmpi ];
+       executableSystemDepends = [ openmpi ];
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10991,6 +11075,8 @@ self: {
        pname = "LogicGrowsOnTrees-network";
        version = "1.0.0.4";
        sha256 = "7a01eb40f87b5810bfccfb23d49e4a04f7bb630f201425caaa0eeb0a82d9b973";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cereal cmdtheline composition containers hslogger
          hslogger-template lens LogicGrowsOnTrees MonadCatchIO-transformers
@@ -11007,7 +11093,7 @@ self: {
 
   "LogicGrowsOnTrees-processes" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cmdtheline, containers
-     , filepath, FindBin, hslogger, hslogger-template, HUnit
+     , criterion, filepath, FindBin, hslogger, hslogger-template, HUnit
      , LogicGrowsOnTrees, MonadCatchIO-transformers, process, random
      , test-framework, test-framework-hunit, transformers
      }:
@@ -11015,6 +11101,8 @@ self: {
        pname = "LogicGrowsOnTrees-processes";
        version = "1.0.0.2";
        sha256 = "766b912ffe650e0ab7cd23a54b51fa440b9e411b63be1d520936bb815af93334";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal cmdtheline containers filepath FindBin
          hslogger hslogger-template LogicGrowsOnTrees
@@ -11024,6 +11112,7 @@ self: {
          base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees
          random test-framework test-framework-hunit transformers
        ];
+       benchmarkHaskellDepends = [ base criterion LogicGrowsOnTrees ];
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11376,6 +11465,8 @@ self: {
        pname = "MemoTrie";
        version = "0.6.7";
        sha256 = "cdab03dc1394e982dd3144ac433b7548d51a55a1c44ddb864e5ac14057c41672";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
        homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
@@ -11970,7 +12061,7 @@ self: {
      }) {};
 
   "MyPrimes" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, containers, time }:
      mkDerivation {
        pname = "MyPrimes";
        version = "0.1.0.0";
@@ -11979,6 +12070,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
+       benchmarkHaskellDepends = [ base time ];
        homepage = "http://afonso.xyz";
        description = "Generate all primes";
        license = stdenv.lib.licenses.mit;
@@ -12103,8 +12195,9 @@ self: {
 
   "NaturalLanguageAlphabets" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary
-     , bytestring, cereal, cereal-text, deepseq, file-embed, hashable
-     , intern, LinguisticsTypes, QuickCheck, stringable, system-filepath
+     , bytestring, cereal, cereal-text, containers, criterion, deepseq
+     , file-embed, hashable, hashtables, intern, LinguisticsTypes
+     , mwc-random, QuickCheck, random, stringable, system-filepath
      , test-framework, test-framework-quickcheck2, test-framework-th
      , text, text-binary, unordered-containers, vector, vector-th-unbox
      }:
@@ -12123,6 +12216,10 @@ self: {
          test-framework test-framework-quickcheck2 test-framework-th text
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashtables LinguisticsTypes
+         mwc-random random unordered-containers vector
+       ];
        homepage = "https://github.com/choener/NaturalLanguageAlphabets";
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
@@ -12135,6 +12232,8 @@ self: {
        pname = "NaturalSort";
        version = "0.2.1";
        sha256 = "49fd310566c86d85714a1839f1bc845891771dbc023a0befee16f073bbac50f6";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
        homepage = "http://github.com/joachifm/natsort";
        description = "Natural sorting for strings";
@@ -12800,6 +12899,8 @@ self: {
        pname = "OpenAL";
        version = "1.7.0.4";
        sha256 = "3989f6c4fe437843551004dd011c4308bf63d787ae4fbb8ce71d44b1b0b1f118";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base ObjectName OpenGL StateVar transformers
        ];
@@ -13021,19 +13122,20 @@ self: {
      }) {};
 
   "OrderedBits" = callPackage
-    ({ mkDerivation, base, bits, primitive, QuickCheck, tasty
-     , tasty-quickcheck, tasty-th, vector, vector-algorithms
+    ({ mkDerivation, base, bits, criterion, primitive, QuickCheck
+     , tasty, tasty-quickcheck, tasty-th, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "OrderedBits";
-       version = "0.0.1.1";
-       sha256 = "084e073c7b310b36fdfb0ad6c5793ef1478890b8a136160ab555e65b54e81284";
+       version = "0.0.1.2";
+       sha256 = "14855fdeda5822ea54c588085f98984062d5a7febc8cbb6e8b8f62de28375df5";
        libraryHaskellDepends = [
          base bits primitive vector vector-algorithms
        ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
+       benchmarkHaskellDepends = [ base criterion vector ];
        homepage = "https://github.com/choener/OrderedBits";
        description = "Efficient ordered (by popcount) enumeration of bits";
        license = stdenv.lib.licenses.bsd3;
@@ -13116,6 +13218,8 @@ self: {
        pname = "PDBtools";
        version = "0.0.3";
        sha256 = "d80810bd44765b86c0ebf247f32ddded301eddb587fe12a0bdc378ee6b8fb0c4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://www.github.com/rotskoff";
        description = "A library for analysis of 3-D protein coordinates";
@@ -13534,6 +13638,8 @@ self: {
        pname = "Plot-ho-matic";
        version = "0.11.0.0";
        sha256 = "bb9d6d7e5c39e48ebf380653f4f9c65391bb746ea68d44650707d02b3f6521a9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cairo cereal Chart Chart-cairo containers
          data-default-class generic-accessors glib gtk3 lens text time
@@ -14041,6 +14147,8 @@ self: {
        pname = "QuickPlot";
        version = "0.1.0.1";
        sha256 = "02864cb2f1abcea25b5956421cfdd596c3b4d3ceafcd54d3aad26f443ba53fb5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring haskell-src-meta parsec scientific
          snap snap-core template-haskell text vector websockets
@@ -14356,17 +14464,17 @@ self: {
 
   "Raincat" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, GLUT, mtl
-     , OpenGL, random, SDL, SDL-image, SDL-mixer, time
+     , OpenGL, random, sdl2, sdl2-image, sdl2-mixer, time
      }:
      mkDerivation {
        pname = "Raincat";
-       version = "1.1.1.3";
-       sha256 = "28abdf5df4d4654aee515f0629bab153163af5fd603cbfc9ae291d03918154a9";
+       version = "1.2";
+       sha256 = "93ce80efedffc63e49bcd3e5745521fa810e438cd2f601de54bca9d9e59eddff";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers extensible-exceptions GLUT mtl OpenGL random SDL
-         SDL-image SDL-mixer time
+         base containers extensible-exceptions GLUT mtl OpenGL random sdl2
+         sdl2-image sdl2-mixer time
        ];
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
@@ -14374,8 +14482,9 @@ self: {
      }) {};
 
   "Random123" = callPackage
-    ({ mkDerivation, array, base, data-dword, HUnit, QuickCheck, random
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, array, base, criterion, data-dword, HUnit
+     , QuickCheck, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "Random123";
@@ -14386,6 +14495,7 @@ self: {
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion random ];
        homepage = "http://github.com/Manticore/haskell-random123";
        description = "Haskell port of Random123 library";
        license = stdenv.lib.licenses.mit;
@@ -14952,6 +15062,8 @@ self: {
        pname = "SHA";
        version = "1.6.4.2";
        sha256 = "c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base binary bytestring ];
        testHaskellDepends = [
          array base binary bytestring QuickCheck test-framework
@@ -15264,6 +15376,8 @@ self: {
        pname = "SegmentTree";
        version = "0.3";
        sha256 = "6188c1b1276d7fa0391098a563df73dd522d20b57dc5321fe3418a9e3ca84fc1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Data structure for querying the set (or count) of intervals covering given point";
        license = stdenv.lib.licenses.bsd3;
@@ -15558,6 +15672,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SimpleTableGenerator" = callPackage
+    ({ mkDerivation, base, Cabal, split }:
+     mkDerivation {
+       pname = "SimpleTableGenerator";
+       version = "0.2.0.0";
+       sha256 = "1b58efcfa9689b1d1c82c5e3016b15d3eaa6d104303feabb31064dff16fe71ad";
+       libraryHaskellDepends = [ base split ];
+       testHaskellDepends = [ base Cabal ];
+       description = "Simple table generator";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "SizeCompare" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -16219,8 +16345,9 @@ self: {
 
   "SuffixStructures" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs
-     , containers, data-default-class, ListLike, primitive, vector
-     , vector-algorithms, vector-binary-instances
+     , containers, criterion, data-default-class, deepseq, ListLike
+     , mwc-random, primitive, vector, vector-algorithms
+     , vector-binary-instances
      }:
      mkDerivation {
        pname = "SuffixStructures";
@@ -16235,6 +16362,9 @@ self: {
        executableHaskellDepends = [
          aeson base binary bytestring cereal cmdargs containers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cmdargs criterion deepseq mwc-random vector
+       ];
        homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Suffix array construction";
        license = stdenv.lib.licenses.bsd3;
@@ -16481,6 +16611,8 @@ self: {
        pname = "Takusen";
        version = "0.8.7";
        sha256 = "9e9fe740a9030e27ee84343a7e308853b0e5d50371a841d9a3979a9f8d99ac57";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
@@ -17769,6 +17901,8 @@ self: {
        pname = "Win32-notify";
        version = "0.3.0.1";
        sha256 = "c49159d8154f9ff7d30207901125ceadc2aa94baa3b2996ff0884e9f0158eb7f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers directory Win32 ];
        description = "A binding to part of the Win32 library for file notification";
        license = stdenv.lib.licenses.bsd3;
@@ -17781,6 +17915,8 @@ self: {
        pname = "Win32-security";
        version = "0.1.1";
        sha256 = "9eca6c3efea64d83ee3aaf2ec0706695087e98e47c77163ac497f70ad4f90436";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "https://github.com/anton-dessiatov/Win32-security";
        description = "Haskell bindings to a security-related functions of the Windows API";
@@ -18261,7 +18397,7 @@ self: {
        pname = "Yablog";
        version = "0.2.0";
        sha256 = "737b4a1ab300cc2d5b8689640b51092b5a54d8ad4cb4bb451699b2367caa4761";
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          base blaze-builder blaze-html bytestring case-insensitive
@@ -18327,6 +18463,8 @@ self: {
        pname = "Yampa-core";
        version = "0.2.0";
        sha256 = "b78b1367c404e50021a7f17748d894e0c74a8b22dc8e48c7fbceea8fa4adaf1a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
        homepage = "https://github.com/ony/Yampa-core";
        description = "Library for programming hybrid systems";
@@ -18560,6 +18698,8 @@ self: {
        pname = "abcBridge";
        version = "0.15";
        sha256 = "45fef882d6e9c3f7ad48621fc835417df5c161c6743ebc4e4d3cabe9445b113c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aig base base-compat containers directory vector
        ];
@@ -18827,6 +18967,8 @@ self: {
        pname = "accelerate-cufft";
        version = "0.0.0.1";
        sha256 = "d78fd117e67ad141910f1a95ec5c82beb351bfe9a144c8cdb36fe94950055c8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          accelerate accelerate-cuda accelerate-fourier accelerate-utility
          base cuda cufft
@@ -18909,9 +19051,9 @@ self: {
      }) {};
 
   "accelerate-fourier" = callPackage
-    ({ mkDerivation, accelerate, accelerate-arithmetic
-     , accelerate-utility, base, containers, QuickCheck, transformers
-     , utility-ht
+    ({ mkDerivation, accelerate, accelerate-arithmetic, accelerate-cuda
+     , accelerate-utility, base, containers, criterion, QuickCheck
+     , transformers, utility-ht
      }:
      mkDerivation {
        pname = "accelerate-fourier";
@@ -18925,6 +19067,10 @@ self: {
          accelerate accelerate-arithmetic accelerate-utility base QuickCheck
          utility-ht
        ];
+       benchmarkHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
+         base criterion utility-ht
+       ];
        homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
@@ -19074,8 +19220,9 @@ self: {
 
   "acid-state" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
-     , directory, extensible-exceptions, filepath, mtl, network
-     , safecopy, stm, template-haskell, unix
+     , criterion, directory, extensible-exceptions, filepath, mtl
+     , network, random, safecopy, stm, system-fileio, system-filepath
+     , template-haskell, unix
      }:
      mkDerivation {
        pname = "acid-state";
@@ -19086,6 +19233,9 @@ self: {
          extensible-exceptions filepath mtl network safecopy stm
          template-haskell unix
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory mtl random system-fileio system-filepath
+       ];
        homepage = "http://acid-state.seize.it/";
        description = "Add ACID guarantees to any serializable Haskell data structure";
        license = stdenv.lib.licenses.publicDomain;
@@ -19093,8 +19243,9 @@ self: {
 
   "acid-state-dist" = callPackage
     ({ mkDerivation, acid-state, base, bytestring, cereal
-     , concurrent-extra, containers, directory, filepath, mtl, random
-     , safe, safecopy, semigroups, stm, transformers, zeromq4-haskell
+     , concurrent-extra, containers, criterion, directory, filepath, mtl
+     , random, safe, safecopy, semigroups, stm, transformers
+     , zeromq4-haskell
      }:
      mkDerivation {
        pname = "acid-state-dist";
@@ -19108,6 +19259,9 @@ self: {
        testHaskellDepends = [
          acid-state base directory mtl random safecopy
        ];
+       benchmarkHaskellDepends = [
+         acid-state base criterion directory mtl safecopy
+       ];
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19348,6 +19502,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "acme-kitchen-sink" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acme-kitchen-sink";
+       version = "0.1.0.0";
+       sha256 = "252007a08308670edeef46742da25169025f44b52da8c1ce55fe0fd37c3ea82c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/marcosdumay/acme-kitchen-sink";
+       description = "A place for dumping that does-not-feel-right code while you improve it";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-left-pad" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -19618,13 +19784,14 @@ self: {
      }) {};
 
   "acme-year" = callPackage
-    ({ mkDerivation, base, time }:
+    ({ mkDerivation, base, criterion, time }:
      mkDerivation {
        pname = "acme-year";
        version = "2016";
        sha256 = "b43d1f33434930d8f6f2971eef34bd12c305f3976d7115688b87b00c85f170ff";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/joeyadams/hs-acme-year";
        description = "Get the current year";
        license = stdenv.lib.licenses.publicDomain;
@@ -19738,9 +19905,9 @@ self: {
      }) {};
 
   "ad" = callPackage
-    ({ mkDerivation, array, base, comonad, containers, data-reify
-     , directory, doctest, erf, filepath, free, nats, reflection
-     , transformers
+    ({ mkDerivation, array, base, comonad, containers, criterion
+     , data-reify, directory, doctest, erf, filepath, free, nats
+     , reflection, transformers
      }:
      mkDerivation {
        pname = "ad";
@@ -19751,6 +19918,7 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [ base criterion erf ];
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
@@ -19937,6 +20105,8 @@ self: {
        pname = "adp-multi";
        version = "0.2.3";
        sha256 = "4728f3d87728adead1d6ebb33e032dd05673cc43573dc00d52a9522154f7b5d2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base containers htrace ];
        testHaskellDepends = [
          array base containers htrace HUnit mtl QuickCheck random-shuffle
@@ -19956,6 +20126,8 @@ self: {
        pname = "adp-multi-monadiccp";
        version = "0.2.1";
        sha256 = "dae838558f728af3cf1e58aaccfcc66fe66a0d3d33332eb365d710e71facf48f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ adp-multi base containers monadiccp ];
        testHaskellDepends = [
          adp-multi base containers monadiccp mtl QuickCheck test-framework
@@ -20240,6 +20412,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-flat" = callPackage
+    ({ mkDerivation, aeson, base, text, unordered-containers, vector }:
+     mkDerivation {
+       pname = "aeson-flat";
+       version = "0.1.0.0";
+       sha256 = "1db507abdb802732ffa3444cb227411ad68b430692578fc79e7c19b7165a6214";
+       libraryHaskellDepends = [
+         aeson base text unordered-containers vector
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/seanhess/aeson-flat#readme";
+       description = "Tools for creating flat JSON serializations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-flatten" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text
      , unordered-containers
@@ -20451,8 +20638,9 @@ self: {
      }) {};
 
   "aeson-quick" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
-     , microlens, tasty, tasty-hunit, text, unordered-containers, vector
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , deepseq, microlens, tasty, tasty-hunit, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-quick";
@@ -20464,6 +20652,7 @@ self: {
        testHaskellDepends = [
          aeson attoparsec base bytestring microlens tasty tasty-hunit text
        ];
+       benchmarkHaskellDepends = [ aeson base bytestring criterion text ];
        homepage = "https://github.com/libscott/aeson-quick";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -20628,16 +20817,17 @@ self: {
      }) {};
 
   "affection" = callPackage
-    ({ mkDerivation, babl, base, clock, containers, gegl, glib, linear
+    ({ mkDerivation, babl, base, clock, containers, gegl, glib
      , monad-loops, mtl, sdl2, text
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.2";
-       sha256 = "e8e0ba4af134cabf1af0b63e1d010e9d868f881074baf8096551dfdf5c68bf29";
+       version = "0.0.0.4";
+       sha256 = "31d82e66df577e34b0b96a70111d61918db70db93b3b0a66ce4e27c661688a58";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         babl base clock containers gegl glib linear monad-loops mtl sdl2
-         text
+         babl base clock containers gegl glib monad-loops mtl sdl2 text
        ];
        homepage = "https://github.com/nek0/affection#readme";
        description = "A simple Game Engine using SDL";
@@ -20785,6 +20975,8 @@ self: {
        pname = "agentx";
        version = "0.2.0.0";
        sha256 = "e61dc3994aaf70cf8823064d56e839ee1af18ae6be30e294214f759064ccb65e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bitwise bytestring containers data-default Diff
          fclabels mtl network pipes pipes-concurrency pipes-network safe
@@ -21372,6 +21564,8 @@ self: {
        pname = "algebraic-prelude";
        version = "0.1.0.1";
        sha256 = "8bb052b29571d4c07c03d14eb17f9d302f18e619bbe743509b9ec6e4fde2192d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          algebra base basic-prelude lens semigroups
        ];
@@ -21381,9 +21575,9 @@ self: {
      }) {};
 
   "algo-s" = callPackage
-    ({ mkDerivation, base, bytestring, errors, foldl, hspec, mwc-random
-     , optparse-applicative, primitive, QuickCheck, smallcheck
-     , unordered-containers
+    ({ mkDerivation, base, bytestring, criterion, errors, foldl, hspec
+     , mwc-random, optparse-applicative, primitive, QuickCheck
+     , smallcheck, unordered-containers
      }:
      mkDerivation {
        pname = "algo-s";
@@ -21400,6 +21594,7 @@ self: {
        testHaskellDepends = [
          base errors foldl hspec mwc-random QuickCheck smallcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "An implementation of Knuth's algorithm S";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21667,6 +21862,8 @@ self: {
        pname = "alsa-pcm";
        version = "0.6.0.4";
        sha256 = "9aae1379903b8445073f8a2b6ccf86b904b4045247747516530a165a3f76ca2a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core array base extensible-exceptions sample-frame
          storable-record
@@ -21700,6 +21897,8 @@ self: {
        pname = "alsa-seq";
        version = "0.6.0.7";
        sha256 = "06cda1e24993aaf0c3592b51a613cf1e187eea603dd77ad3a129a8a7b1e0b778";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core array base bytestring data-accessor enumset
          extensible-exceptions poll transformers utility-ht
@@ -23197,7 +23396,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "amazonka-s3-streaming_0_2_0_0" = callPackage
+  "amazonka-s3-streaming_0_2_0_1" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, base
      , bytestring, conduit, conduit-extra, deepseq, dlist, exceptions
      , http-client, lens, lifted-async, mmap, mmorph, mtl, resourcet
@@ -23205,8 +23404,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3-streaming";
-       version = "0.2.0.0";
-       sha256 = "d4a583eead4b7d050c9a6e762d77050cf07c5da541a04e25424850fa0e66dbd7";
+       version = "0.2.0.1";
+       sha256 = "714c62e6b903dfc968f72c3966ffbce14dd1f885f4c95a34a7bd1a49e84c6966";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -23578,6 +23777,7 @@ self: {
          safe scientific statistics text vector vector-algorithms
        ];
        testHaskellDepends = [ base doctest tasty tasty-hunit vector ];
+       benchmarkHaskellDepends = [ base statistics ];
        homepage = "https://github.com/jsermeno/amby#readme";
        description = "Statistical data visualization";
        license = stdenv.lib.licenses.bsd3;
@@ -23894,9 +24094,9 @@ self: {
      }) {};
 
   "angle" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, haskeline
-     , mtl, process, QuickCheck, split, tasty, tasty-quickcheck
-     , transformers, transformers-compat
+    ({ mkDerivation, base, containers, criterion, directory, filepath
+     , haskeline, mtl, process, QuickCheck, split, tasty
+     , tasty-quickcheck, transformers, transformers-compat
      }:
      mkDerivation {
        pname = "angle";
@@ -23916,6 +24116,7 @@ self: {
          base containers mtl QuickCheck tasty tasty-quickcheck transformers
          transformers-compat
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "A small, general-purpose programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24054,6 +24255,8 @@ self: {
        pname = "ansi-terminal";
        version = "0.6.2.3";
        sha256 = "4dc02cb53e9ca7c8800bbdfc0337b961e5a945382cd09a6a40c6170126e0ee42";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
@@ -24066,6 +24269,8 @@ self: {
        pname = "ansi-wl-pprint";
        version = "0.6.7.3";
        sha256 = "3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "http://github.com/ekmett/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
@@ -24262,6 +24467,8 @@ self: {
        pname = "anydbm";
        version = "1.0.7";
        sha256 = "d33410fc5fad79bd5a5bcc24248f6e5a7a3133ede5111c31a8c58068b219b3e7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl ];
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
@@ -24303,9 +24510,9 @@ self: {
      }) {};
 
   "apache-md5" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, MonadRandom, openssl
-     , process, random, test-framework, test-framework-hunit
-     , transformers
+    ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
+     , MonadRandom, openssl, process, random, test-framework
+     , test-framework-hunit, transformers
      }:
      mkDerivation {
        pname = "apache-md5";
@@ -24320,6 +24527,10 @@ self: {
          test-framework-hunit transformers
        ];
        testSystemDepends = [ openssl ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq MonadRandom
+       ];
+       benchmarkSystemDepends = [ openssl ];
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
@@ -24799,12 +25010,15 @@ self: {
      }) {};
 
   "app-lens" = callPackage
-    ({ mkDerivation, base, containers, lens, mtl }:
+    ({ mkDerivation, base, containers, criterion, deepseq, lens, mtl }:
      mkDerivation {
        pname = "app-lens";
        version = "0.1.0.3";
        sha256 = "ecb966a61eee1465d2e89d98ee2dfbdd52c7bc37707e817809ff520c91f9d744";
        libraryHaskellDepends = [ base containers lens mtl ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq lens mtl
+       ];
        homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
@@ -25261,9 +25475,9 @@ self: {
      }) {};
 
   "arena" = callPackage
-    ({ mkDerivation, base, bytes, bytestring, containers, digest
-     , directory, filepath, mtl, persistent-vector, safe, semigroups
-     , unix
+    ({ mkDerivation, base, bytes, bytestring, containers, criterion
+     , digest, directory, filepath, mtl, persistent-vector, safe
+     , semigroups, unix
      }:
      mkDerivation {
        pname = "arena";
@@ -25278,6 +25492,9 @@ self: {
        testHaskellDepends = [
          base bytes containers directory mtl semigroups
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory mtl semigroups
+       ];
        description = "A journaled data store";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -25508,9 +25725,9 @@ self: {
      }) {};
 
   "arithmoi" = callPackage
-    ({ mkDerivation, array, base, containers, ghc-prim, integer-gmp
-     , mtl, QuickCheck, random, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, transformers
+    ({ mkDerivation, array, base, containers, criterion, ghc-prim
+     , integer-gmp, mtl, QuickCheck, random, smallcheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers
      , transformers-compat
      }:
      mkDerivation {
@@ -25525,6 +25742,7 @@ self: {
          base containers QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck transformers transformers-compat
        ];
+       benchmarkHaskellDepends = [ base containers criterion random ];
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
@@ -25635,7 +25853,7 @@ self: {
      }) {};
 
   "array-primops" = callPackage
-    ({ mkDerivation, base, ghc-prim, QuickCheck, tasty
+    ({ mkDerivation, base, criterion, ghc-prim, QuickCheck, tasty
      , tasty-quickcheck
      }:
      mkDerivation {
@@ -25646,6 +25864,7 @@ self: {
        testHaskellDepends = [
          base ghc-prim QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25846,6 +26065,8 @@ self: {
        pname = "ascii-progress";
        version = "0.3.3.0";
        sha256 = "7e3fa6b80c09a83c9ba8a0644ef304ca92d65b76383b8dd023ff9f89ebec913e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base concurrent-output data-default time
        ];
@@ -25976,6 +26197,8 @@ self: {
        sha256 = "83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1";
        revision = "1";
        editedCabalFile = "1543bc1ee13d3f4b9ee6f9445edede596d5fe7f8a4551333b54634aad5b112a3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
@@ -26243,8 +26466,8 @@ self: {
      }:
      mkDerivation {
        pname = "async-extras";
-       version = "0.1.3.1";
-       sha256 = "c134da7e8955354670916cde8c5199b2bf08e455605d19a355a781d925b4d28e";
+       version = "0.1.3.2";
+       sha256 = "ac26da945147b74c5f1a29c7765e08d081d15dea5e609e5dc086a7b09efa32c7";
        libraryHaskellDepends = [
          async base lifted-async lifted-base monad-control SafeSemaphore stm
          transformers-base
@@ -26256,12 +26479,12 @@ self: {
      }) {};
 
   "async-io-either" = callPackage
-    ({ mkDerivation, async, base, transformers }:
+    ({ mkDerivation, async, base, retry, transformers }:
      mkDerivation {
        pname = "async-io-either";
-       version = "0.1.0.2";
-       sha256 = "71d7ed0974ac8aaaeba0a53268f13ad7277a24b224762b33837d0aab93d76601";
-       libraryHaskellDepends = [ async base transformers ];
+       version = "0.1.0.4";
+       sha256 = "f0326b543a51cf06e3bd8375d2ce18d6a60f7dd413bac1e740dc90083cbc7a6a";
+       libraryHaskellDepends = [ async base retry transformers ];
        homepage = "https://github.com/mankyKitty/async-io-either#readme";
        description = "Could be useful";
        license = stdenv.lib.licenses.bsd3;
@@ -26733,9 +26956,11 @@ self: {
      }) {};
 
   "attoparsec" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , QuickCheck, quickcheck-unicode, scientific, tasty
-     , tasty-quickcheck, text, transformers, vector
+    ({ 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
      }:
      mkDerivation {
        pname = "attoparsec";
@@ -26749,6 +26974,11 @@ self: {
          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
+       ];
        homepage = "https://github.com/bos/attoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
@@ -26967,6 +27197,8 @@ self: {
        pname = "audacity";
        version = "0.0";
        sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base deepseq utility-ht ];
        homepage = "http://code.haskell.org/~thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
@@ -27369,8 +27601,8 @@ self: {
 
   "avers" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, clock, containers, cryptohash, cryptonite, filepath
-     , hspec, inflections, memory, MonadRandom, mtl, network
+     , bytestring, clock, containers, criterion, cryptohash, cryptonite
+     , filepath, hspec, inflections, memory, MonadRandom, mtl, network
      , network-uri, resource-pool, rethinkdb-client-driver, safe, scrypt
      , stm, template-haskell, text, time, unordered-containers, vector
      }:
@@ -27378,8 +27610,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1b45d8aa036b3c2ec7ea180327ff3cdce28dc1e1ef319c062be79f0ffa7626f5";
-       revision = "6";
-       editedCabalFile = "4fdb981cfedcc58b8b64a823d826fafd32c7b0fce7e01bd816db1474994d6018";
+       revision = "7";
+       editedCabalFile = "fb4e416f91c130daa956139b2d2cac7c92735879c699802e7f2acb0115eb671f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -27392,6 +27624,10 @@ self: {
          rethinkdb-client-driver scrypt stm text time unordered-containers
          vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base criterion mtl network-uri resource-pool
+         rethinkdb-client-driver text
+       ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27605,6 +27841,8 @@ self: {
        pname = "aws";
        version = "0.16";
        sha256 = "84b5c60227f3c9eddc0abf0881aee22443fc4a211b8a95f18be628eaa492209c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
@@ -27742,6 +27980,8 @@ self: {
        pname = "aws-elastic-transcoder";
        version = "0.2.0.2";
        sha256 = "896b7cdb17313b8a5e848de797ab61a3d1ab3779b6bf2d571cda50e5317ebe09";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aws aws-sign4 base bytestring conduit containers http-conduit
          http-types QuickCheck regex-compat safe text time transformers
@@ -28104,12 +28344,17 @@ self: {
      }) {control-invariants = null;};
 
   "azubi" = callPackage
-    ({ mkDerivation, base, filepath, options }:
+    ({ mkDerivation, base, Diff, directory, filepath, hspec, options
+     , process, unix
+     }:
      mkDerivation {
        pname = "azubi";
-       version = "0.1.0.1";
-       sha256 = "b75133db17e6dfe66593dca1e2809e096a8473463950826c31c8ac9a1497468e";
-       libraryHaskellDepends = [ base filepath options ];
+       version = "0.2.0.0";
+       sha256 = "c3ac3b5ff5960c7ba0349bae282be1b0e4f361268b85aa80d57f399bac5a455c";
+       libraryHaskellDepends = [
+         base Diff directory filepath options process unix
+       ];
+       testHaskellDepends = [ base filepath hspec ];
        homepage = "http://palovandalo.com/azubi";
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
@@ -28204,9 +28449,9 @@ self: {
      }) {};
 
   "b-tree" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , errors, filepath, lens, mmap, mtl, pipes, pipes-interleave
-     , QuickCheck, transformers, vector
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , directory, errors, filepath, lens, mmap, mtl, pipes
+     , pipes-interleave, QuickCheck, transformers, vector
      }:
      mkDerivation {
        pname = "b-tree";
@@ -28217,6 +28462,7 @@ self: {
          mmap mtl pipes pipes-interleave transformers vector
        ];
        testHaskellDepends = [ base binary containers pipes QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion pipes ];
        homepage = "http://github.com/bgamari/b-tree";
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
@@ -28677,6 +28923,8 @@ self: {
        pname = "barrier";
        version = "0.1.1";
        sha256 = "6395da01eea1984c7bcc85c624b1b5dfbe0b6b764adeed7b04c9fa4d8de91ed9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-svg bytestring template-haskell text
          unordered-containers
@@ -28815,8 +29063,8 @@ self: {
      }) {};
 
   "base32-bytestring" = callPackage
-    ({ mkDerivation, base, bits-extras, bytestring, cpu, hspec
-     , QuickCheck
+    ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion
+     , hspec, QuickCheck
      }:
      mkDerivation {
        pname = "base32-bytestring";
@@ -28824,6 +29072,7 @@ self: {
        sha256 = "74bee674a45705347954f4e7e6eda01c123751fa51ac846b7ff97e39b81b187c";
        libraryHaskellDepends = [ base bits-extras bytestring cpu ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -28843,7 +29092,7 @@ self: {
      }) {};
 
   "base58-bytestring" = callPackage
-    ({ mkDerivation, base, bytestring, quickcheck-assertions
+    ({ mkDerivation, base, bytestring, criterion, quickcheck-assertions
      , quickcheck-instances, tasty, tasty-quickcheck
      }:
      mkDerivation {
@@ -28855,6 +29104,7 @@ self: {
          base bytestring quickcheck-assertions quickcheck-instances tasty
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://bitbucket.org/s9gf4ult/base58-bytestring";
        description = "Implementation of BASE58 transcoding for ByteStrings";
        license = stdenv.lib.licenses.publicDomain;
@@ -29284,9 +29534,9 @@ self: {
      }) {};
 
   "beamable" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim
-     , integer-gmp, murmur-hash, QuickCheck, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+     , deepseq, ghc-prim, integer-gmp, murmur-hash, QuickCheck
+     , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "beamable";
@@ -29299,6 +29549,10 @@ self: {
          base blaze-builder bytestring ghc-prim integer-gmp murmur-hash
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq ghc-prim
+         integer-gmp murmur-hash
+       ];
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29433,8 +29687,9 @@ self: {
      }) {};
 
   "bencoding" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-     , ghc-prim, hspec, mtl, pretty, QuickCheck, text
+    ({ mkDerivation, AttoBencode, attoparsec, base, bencode, bytestring
+     , containers, criterion, deepseq, ghc-prim, hspec, mtl, pretty
+     , QuickCheck, text
      }:
      mkDerivation {
        pname = "bencoding";
@@ -29446,6 +29701,10 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim hspec QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         AttoBencode attoparsec base bencode bytestring criterion deepseq
+         ghc-prim
+       ];
        homepage = "https://github.com/cobit/bencoding";
        description = "A library for encoding and decoding of BEncode data";
        license = stdenv.lib.licenses.bsd3;
@@ -29550,6 +29809,8 @@ self: {
        pname = "bet";
        version = "0.1.2.3";
        sha256 = "a818d927e09c0386842658f70682089c16bc241961834af07fdbb0155015c13f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bifunctors binary bytestring containers exceptions
          HsOpenSSL http-client http-client-openssl lens mtl semigroupoids
@@ -29613,6 +29874,8 @@ self: {
        pname = "bff";
        version = "0.3.1.2";
        sha256 = "5d44be6c1890b08ed18b8ebac8cf2565747f2c20f143edb7c0d0c311e73dbec4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bimap category-extras containers derive haskell98 mtl
          template-haskell unix
@@ -29694,6 +29957,8 @@ self: {
        pname = "bibtex";
        version = "0.1.0.6";
        sha256 = "090a3b9589388bdf9d2bf60d8d1898aa0313a2874b551ba86cbbd049f3ee5f04";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/BibTeX";
        description = "Parse, format and processing BibTeX files";
@@ -29934,8 +30199,8 @@ self: {
 
   "bimaps" = callPackage
     ({ mkDerivation, aeson, base, binary, cereal, cereal-vector
-     , containers, deepseq, hashable, primitive, QuickCheck
-     , storable-tuple, tasty, tasty-quickcheck, tasty-th
+     , containers, criterion, deepseq, hashable, mwc-random, primitive
+     , QuickCheck, storable-tuple, tasty, tasty-quickcheck, tasty-th
      , unordered-containers, vector, vector-binary-instances
      , vector-th-unbox
      }:
@@ -29951,15 +30216,19 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq mwc-random unordered-containers
+         vector
+       ];
        homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "binary_0_7_6_1" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , directory, filepath, HUnit, QuickCheck, random, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal, cereal
+     , containers, criterion, deepseq, directory, filepath, HUnit, mtl
+     , QuickCheck, random, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
@@ -29970,6 +30239,10 @@ self: {
          array base bytestring Cabal containers directory filepath HUnit
          QuickCheck random test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         array attoparsec base bytestring cereal containers criterion
+         deepseq mtl
+       ];
        homepage = "https://github.com/kolmodin/binary";
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -29977,9 +30250,10 @@ self: {
      }) {};
 
   "binary_0_8_4_1" = callPackage
-    ({ mkDerivation, array, base, bytestring, Cabal, containers
-     , directory, filepath, HUnit, QuickCheck, random, test-framework
-     , test-framework-quickcheck2
+    ({ 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";
@@ -29992,6 +30266,10 @@ self: {
          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;
@@ -30150,8 +30428,8 @@ self: {
      }) {};
 
   "binary-list" = callPackage
-    ({ mkDerivation, base, binary, bytestring, deepseq, phantom-state
-     , transformers
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , phantom-state, transformers
      }:
      mkDerivation {
        pname = "binary-list";
@@ -30160,6 +30438,7 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring deepseq phantom-state transformers
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Lists of length a power of two";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30220,14 +30499,17 @@ self: {
 
   "binary-parsers" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring
-     , bytestring-lexing, deepseq, directory, filepath, QuickCheck
-     , quickcheck-instances, quickcheck-unicode, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+     , bytestring-lexing, case-insensitive, criterion, deepseq
+     , directory, filepath, http-types, QuickCheck, quickcheck-instances
+     , quickcheck-unicode, scanner, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "binary-parsers";
        version = "0.2.3.0";
        sha256 = "bc6195493b950efcbeb9ef54dfe47a6badf894dff934cf02a4b170331c1b217a";
+       revision = "1";
+       editedCabalFile = "25e07c108ea6f11588d74be3c3d7f3010859706961a9c3077546d4903d0a4f25";
        libraryHaskellDepends = [
          base binary bytestring bytestring-lexing scientific
        ];
@@ -30237,6 +30519,11 @@ self: {
          quickcheck-unicode scientific tasty tasty-hunit tasty-quickcheck
          text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base binary bytestring case-insensitive criterion
+         deepseq directory filepath http-types scanner scientific text
+         unordered-containers vector
+       ];
        homepage = "https://github.com/winterland1989/binary-parsers";
        description = "Extends binary with parsec/attoparsec style parsing combinators";
        license = stdenv.lib.licenses.bsd3;
@@ -30261,6 +30548,8 @@ self: {
        pname = "binary-protocol-zmq";
        version = "0.2";
        sha256 = "beaad38fb11794b368e69f3b84d46809440a1afae26110401c79c9c0a6b94a92";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring mtl zeromq-haskell
        ];
@@ -30365,10 +30654,10 @@ self: {
 
   "binary-tagged" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, binary-orphans, bytestring, containers, generics-sop
-     , hashable, nats, quickcheck-instances, scientific, semigroups, SHA
-     , tagged, tasty, tasty-quickcheck, text, time, unordered-containers
-     , vector
+     , binary, binary-orphans, bytestring, containers, criterion
+     , deepseq, generics-sop, hashable, nats, quickcheck-instances
+     , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
+     , text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "binary-tagged";
@@ -30387,14 +30676,19 @@ self: {
          quickcheck-instances scientific semigroups SHA tagged tasty
          tasty-quickcheck text time unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson array base base16-bytestring binary binary-orphans bytestring
+         containers criterion deepseq generics-sop hashable nats scientific
+         semigroups SHA tagged text time unordered-containers vector
+       ];
        homepage = "https://github.com/phadej/binary-tagged#readme";
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "binary-typed" = callPackage
-    ({ mkDerivation, base, binary, bytestring, murmur-hash, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , murmur-hash, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "binary-typed";
@@ -30404,6 +30698,9 @@ self: {
        testHaskellDepends = [
          base binary bytestring tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion deepseq
+       ];
        homepage = "https://github.com/quchen/binary-typed";
        description = "Type-safe binary serialization";
        license = stdenv.lib.licenses.bsd2;
@@ -31418,7 +31715,7 @@ self: {
   "bioinformatics-toolkit" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , bytestring-lexing, case-insensitive, clustering, conduit
-     , conduit-combinators, containers, data-default-class
+     , conduit-combinators, containers, criterion, data-default-class
      , double-conversion, hexpat, HsHTSLib, http-conduit, IntervalMap
      , math-functions, matrices, mtl, parallel, primitive, random, split
      , statistics, tasty, tasty-golden, tasty-hunit, text, transformers
@@ -31441,6 +31738,10 @@ self: {
          matrices mtl random tasty tasty-golden tasty-hunit
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring clustering conduit criterion data-default-class mtl
+         random
+       ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31678,10 +31979,10 @@ self: {
 
   "bitcoin-payment-channel" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
-     , bytestring, cereal, deepseq, errors, haskoin-core, hexstring
-     , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific
-     , semigroups, string-conversions, tagged, test-framework
-     , test-framework-quickcheck2, text, tf-random, time
+     , bytestring, cereal, criterion, deepseq, errors, haskoin-core
+     , hexstring, hspec, monad-time, mtl, QuickCheck, random, rbpcp-api
+     , scientific, semigroups, string-conversions, tagged
+     , test-framework, test-framework-quickcheck2, text, tf-random, time
      }:
      mkDerivation {
        pname = "bitcoin-payment-channel";
@@ -31699,6 +32000,11 @@ self: {
          string-conversions tagged test-framework test-framework-quickcheck2
          text tf-random time
        ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring bytestring cereal criterion deepseq
+         errors haskoin-core hexstring hspec monad-time QuickCheck rbpcp-api
+         scientific semigroups string-conversions tagged text time
+       ];
        homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
        description = "Instant, two-party Bitcoin payments";
        license = "unknown";
@@ -31865,45 +32171,60 @@ self: {
        pname = "bits-atomic";
        version = "0.1.3";
        sha256 = "e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Atomic bit operations on memory locations for low-level synchronization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bits-bytestring" = callPackage
-    ({ mkDerivation, base, bits, bytestring, hspec, QuickCheck }:
+    ({ mkDerivation, base, bits, bytestring, criterion, hspec
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "bits-bytestring";
        version = "0.1.0.1";
        sha256 = "d9e90f0b05589d9fcb4a807242a3b92e25786c118d168cbb7ccdbaf8076b6152";
        libraryHaskellDepends = [ base bits bytestring ];
        testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/oldmanmike/bits-bytestring";
        description = "Bits instance for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bits-bytestring-lazy" = callPackage
-    ({ mkDerivation, base, bits, bytestring, hspec, QuickCheck }:
+    ({ mkDerivation, base, bits, bits-bytestring, bytestring, criterion
+     , hspec, QuickCheck
+     }:
      mkDerivation {
        pname = "bits-bytestring-lazy";
        version = "0.1.0.1";
        sha256 = "f222dd064307db289e6aacbffdbede82c8b459d80cb85d328a82fe8ef125eaf5";
        libraryHaskellDepends = [ base bits bytestring ];
        testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bits-bytestring bytestring criterion
+       ];
        homepage = "https://github.com/semaj/bits-bytestring-lazy";
        description = "Bits instance for lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bits-conduit" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, hspec, HUnit, mtl }:
+    ({ mkDerivation, base, bytestring, conduit, criterion, hspec, HUnit
+     , mtl, random
+     }:
      mkDerivation {
        pname = "bits-conduit";
        version = "0.2.0.0";
        sha256 = "32b7f730be27810519f1ea32bdb82e25c187373dd407cdf0cbb629be6fa00f22";
        libraryHaskellDepends = [ base bytestring conduit mtl ];
        testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion random
+       ];
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31915,6 +32236,8 @@ self: {
        pname = "bits-extras";
        version = "0.1.3";
        sha256 = "27a5dcf562e5f4c011421263859e09f65d4c382cd123abd73807f456f56cc96b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
@@ -31922,8 +32245,9 @@ self: {
      }) {gcc_s = null;};
 
   "bitset" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp
-     , QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
+     , gmp, integer-gmp, QuickCheck, random, random-shuffle, tasty
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "bitset";
@@ -31932,6 +32256,11 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ];
        librarySystemDepends = [ gmp ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq ghc-prim integer-gmp random
+         random-shuffle
+       ];
+       benchmarkSystemDepends = [ gmp ];
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32041,13 +32370,14 @@ self: {
      }) {};
 
   "bitwise" = callPackage
-    ({ mkDerivation, array, base, bytestring, QuickCheck }:
+    ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }:
      mkDerivation {
        pname = "bitwise";
        version = "0.1.1.1";
        sha256 = "cde04615108c8e1e4b9f3a6fd7115b6fe40068385489fc5fc3d41e3700d69486";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
+       benchmarkHaskellDepends = [ array base bytestring criterion ];
        homepage = "http://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -32077,6 +32407,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bizzlelude" = callPackage
+    ({ mkDerivation, base, containers, directory, text }:
+     mkDerivation {
+       pname = "bizzlelude";
+       version = "1.0.1";
+       sha256 = "0b1fa2c6e0ab2fa3830bbd41a18d93e34f8f035b1c7439fa1424e38a5f44a399";
+       libraryHaskellDepends = [ base containers directory text ];
+       homepage = "http://github.com/TheBizzle";
+       description = "A lousy Prelude replacement by a lousy dude";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bk-tree" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -32163,9 +32505,9 @@ self: {
      }) {};
 
   "blacktip" = callPackage
-    ({ mkDerivation, base, bitwise, bytestring, deepseq
-     , deepseq-generics, hspec, locators, network-info, safe, split
-     , system-fileio, system-filepath, time
+    ({ mkDerivation, async, base, bitwise, bytestring, criterion
+     , deepseq, deepseq-generics, hspec, locators, network-info, safe
+     , split, system-fileio, system-filepath, time
      }:
      mkDerivation {
        pname = "blacktip";
@@ -32176,6 +32518,9 @@ self: {
          network-info safe split system-fileio system-filepath time
        ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [
+         async base criterion network-info time
+       ];
        homepage = "https://github.com/bitemyapp/blacktip";
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
@@ -32183,8 +32528,8 @@ self: {
      }) {};
 
   "blake2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, hlint
-     , QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , hlint, QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "blake2";
@@ -32195,6 +32540,7 @@ self: {
          base base16-bytestring bytestring hlint QuickCheck tasty
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/centromere/blake2";
        description = "A library providing BLAKE2";
        license = stdenv.lib.licenses.publicDomain;
@@ -32401,8 +32747,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-colonnade";
-       version = "0.1";
-       sha256 = "cee73ec0777ecc268958699ead67b527b2b99cfbad38532b4687628bf70138e8";
+       version = "1.1.0";
+       sha256 = "194fd18e3d911dbe4b4f229df37b90e739fbb3c389a9c85cf9333f5a7159b37b";
        libraryHaskellDepends = [
          base blaze-html blaze-markup colonnade text
        ];
@@ -32918,9 +33264,9 @@ self: {
      }) {};
 
   "bloomfilter-redis" = callPackage
-    ({ mkDerivation, arithmoi, base, binary, bytestring, hashable
-     , hedis, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-rerun
+    ({ mkDerivation, arithmoi, base, binary, bytestring, criterion
+     , hashable, hedis, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-rerun
      }:
      mkDerivation {
        pname = "bloomfilter-redis";
@@ -32933,6 +33279,7 @@ self: {
          base bytestring hashable hedis QuickCheck tasty tasty-hunit
          tasty-quickcheck tasty-rerun
        ];
+       benchmarkHaskellDepends = [ base criterion random ];
        description = "Distributed bloom filters on Redis (using the Hedis client)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33209,9 +33556,9 @@ self: {
 
   "bond-haskell" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bond-haskell-compiler
-     , bytestring, containers, deepseq, either, extra, filepath
-     , hashable, mtl, scientific, tasty, tasty-golden, tasty-hunit
-     , tasty-quickcheck, text, unordered-containers, vector
+     , bytestring, containers, criterion, deepseq, either, extra
+     , filepath, hashable, mtl, scientific, tasty, tasty-golden
+     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "bond-haskell";
@@ -33227,6 +33574,9 @@ self: {
          tasty-golden tasty-hunit tasty-quickcheck unordered-containers
          vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion filepath vector
+       ];
        homepage = "http://github.com/rblaze/bond-haskell#readme";
        description = "Runtime support for BOND serialization";
        license = stdenv.lib.licenses.bsd3;
@@ -33257,8 +33607,8 @@ self: {
      }) {};
 
   "bookkeeper" = callPackage
-    ({ mkDerivation, base, data-default-class, doctest, Glob, hspec
-     , markdown-unlit, QuickCheck, type-level-sets, yaml
+    ({ mkDerivation, base, criterion, data-default-class, doctest, Glob
+     , hspec, markdown-unlit, QuickCheck, type-level-sets, yaml
      }:
      mkDerivation {
        pname = "bookkeeper";
@@ -33276,6 +33626,9 @@ self: {
          base data-default-class doctest Glob hspec QuickCheck
          type-level-sets yaml
        ];
+       benchmarkHaskellDepends = [
+         base criterion data-default-class type-level-sets
+       ];
        homepage = "http://github.com/turingjump/bookkeeper#readme";
        description = "Anonymous records and overloaded labels";
        license = stdenv.lib.licenses.bsd3;
@@ -33299,8 +33652,8 @@ self: {
     ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
      mkDerivation {
        pname = "bookkeeping";
-       version = "0.1.0.1";
-       sha256 = "3fcfd3c8754c14b4882c35bb9762d928ada95fc099bac3ab5bb4821aeb879a58";
+       version = "0.2.1.1";
+       sha256 = "d920c7865a11a35af8147e79e2c48028831d5f6c0227cdf2ee65ec32b0e17fb5";
        libraryHaskellDepends = [ base dlist mtl text time ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
@@ -33308,6 +33661,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bookkeeping-jp" = callPackage
+    ({ mkDerivation, base, bookkeeping, doctest, Glob }:
+     mkDerivation {
+       pname = "bookkeeping-jp";
+       version = "0.1.0.1";
+       sha256 = "10cb27933f689d38c0bc6e24ae6b1a06cdd9f69aef83dc6aa779c9872410cde5";
+       libraryHaskellDepends = [ base bookkeeping ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme";
+       description = "Helper functions for Japanese bookkeeping";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bool-extras" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33822,8 +34188,8 @@ self: {
      }:
      mkDerivation {
        pname = "breve";
-       version = "0.4.3.1";
-       sha256 = "2c1a7d1cb1653a4bf66d5cb53e064b498d8165aa67d7380580a0b69d0f5f2581";
+       version = "0.4.4.0";
+       sha256 = "1701c1550b07051e9c6f1c89713a2d3c6d5feb348e04e5bd957952543b8f72de";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33860,8 +34226,10 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.17";
-       sha256 = "891cb3323b1de2ed27849399cf8ab1ed1467560813a6182edb53b3726e4b3b68";
+       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
@@ -34020,8 +34388,8 @@ self: {
      }) {};
 
   "bspack" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, mtl, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+     , ghc-prim, mtl, sandi, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "bspack";
@@ -34031,6 +34399,9 @@ self: {
        testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion sandi
+       ];
        homepage = "https://github.com/NicolasDP/hs-bspack";
        description = "A simple and fast bytestring packer";
        license = stdenv.lib.licenses.bsd3;
@@ -34077,6 +34448,8 @@ self: {
        pname = "btrfs";
        version = "0.1.2.3";
        sha256 = "7efc0b5c65623dcf60910baf896aec7da7ac2df4231f03a3072c78fb5b2fb88d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
@@ -34125,8 +34498,8 @@ self: {
 
   "buffer-builder" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
-     , deepseq, HTF, mtl, quickcheck-instances, text
-     , unordered-containers, vector
+     , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
+     , text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "buffer-builder";
@@ -34139,6 +34512,10 @@ self: {
          aeson attoparsec base bytestring criterion deepseq HTF
          quickcheck-instances text vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion deepseq http-types json-builder
+         text vector
+       ];
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
@@ -34147,9 +34524,9 @@ self: {
 
   "buffer-builder-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, buffer-builder
-     , bytestring, hashable, HUnit, integer-gmp, QuickCheck, scientific
-     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text
-     , unordered-containers, vector
+     , bytestring, criterion, deepseq, hashable, HUnit, integer-gmp
+     , QuickCheck, scientific, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "buffer-builder-aeson";
@@ -34166,6 +34543,9 @@ self: {
          QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th
          text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base buffer-builder bytestring criterion deepseq text vector
+       ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34211,6 +34591,8 @@ self: {
        pname = "bugzilla";
        version = "0.2.1.1";
        sha256 = "ad30a9b8cbe7e9b994d6898ff68007e0c5a5a45b873e9a52dd51cf68d5945ea5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring connection containers
          data-default http-conduit http-types iso8601-time resourcet text
@@ -34342,13 +34724,14 @@ self: {
      }) {};
 
   "burst-detection" = callPackage
-    ({ mkDerivation, base, deepseq }:
+    ({ mkDerivation, base, criterion, deepseq }:
      mkDerivation {
        pname = "burst-detection";
        version = "1.0";
        sha256 = "953742286dddadd2bd54e13a72916044e1c1a7acada5a5e5d12759c29ac4f9dd";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://parsci.com/";
        description = "Burst detection algorithms";
        license = stdenv.lib.licenses.gpl2;
@@ -34479,6 +34862,8 @@ self: {
        pname = "bv";
        version = "0.4.1";
        sha256 = "dd092150f1792e76e168365d69798d3a27b911ce9de8b21a47c5fed42acf45bb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        homepage = "https://github.com/iagoabal/haskell-bv";
        description = "Bit-vector arithmetic library";
@@ -34493,6 +34878,8 @@ self: {
        pname = "byline";
        version = "0.2.3.0";
        sha256 = "964668e4e3eec9807e64c739a4a215c8e07800661c6d34ad2bd258e08872845c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
@@ -34533,6 +34920,8 @@ self: {
        pname = "bytedump";
        version = "1.0";
        sha256 = "ae17b5040f0423eec792505f14d1d3e53f5ff81ddf83524f1c5dc7a16c0dc0dd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
@@ -34603,13 +34992,18 @@ self: {
      }) {};
 
   "bytestring-arbitrary" = callPackage
-    ({ mkDerivation, base, bytestring, cryptohash, QuickCheck }:
+    ({ mkDerivation, base, bytestring, criterion, cryptohash
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "bytestring-arbitrary";
        version = "0.1.1";
        sha256 = "bbe78d37e9788ecf6fc4d64633047579b66e71ffcab70cbc8be100a722056efd";
        libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptohash QuickCheck
+       ];
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -34644,7 +35038,8 @@ self: {
 
   "bytestring-conversion" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, case-insensitive
-     , double-conversion, QuickCheck, tasty, tasty-quickcheck, text
+     , criterion, double-conversion, QuickCheck, tasty, tasty-quickcheck
+     , text, transformers
      }:
      mkDerivation {
        pname = "bytestring-conversion";
@@ -34658,6 +35053,9 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion text transformers
+       ];
        homepage = "https://github.com/twittner/bytestring-conversion/";
        description = "Type-classes to convert values to and from ByteString";
        license = stdenv.lib.licenses.mpl20;
@@ -34754,6 +35152,8 @@ self: {
        pname = "bytestring-nums";
        version = "0.3.6";
        sha256 = "bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        homepage = "http://github.com/solidsnack/bytestring-nums";
        description = "Parse numeric literals from ByteStrings";
@@ -34792,7 +35192,8 @@ self: {
      }) {};
 
   "bytestring-read" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing
+     , criterion, doctest, scientific, tasty, tasty-quickcheck, text
      , types-compat
      }:
      mkDerivation {
@@ -34805,6 +35206,10 @@ self: {
        testHaskellDepends = [
          base bytestring doctest tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring bytestring-lexing criterion scientific
+         text
+       ];
        homepage = "https://github.com/philopon/bytestring-read";
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
@@ -34874,7 +35279,7 @@ self: {
      }) {};
 
   "bytestring-tree-builder" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring
+    ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq
      , quickcheck-instances, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text
      }:
@@ -34889,6 +35294,9 @@ self: {
          base-prelude bytestring quickcheck-instances tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [
+         base-prelude bytestring criterion deepseq
+       ];
        homepage = "https://github.com/nikita-volkov/bytestring-tree-builder";
        description = "A very efficient ByteString builder implementation based on the binary tree";
        license = stdenv.lib.licenses.mit;
@@ -34908,7 +35316,7 @@ self: {
 
   "bytestring-typenats" = callPackage
     ({ mkDerivation, base, binary, blake2, bytestring, cereal
-     , cryptohash, deepseq, entropy, QuickCheck
+     , criterion, cryptohash, deepseq, entropy, QuickCheck
      }:
      mkDerivation {
        pname = "bytestring-typenats";
@@ -34919,6 +35327,7 @@ self: {
          QuickCheck
        ];
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
        homepage = "https://github.com/tsuraan/bytestring-typenats";
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
@@ -34990,6 +35399,7 @@ self: {
          base bytestring conduit conduit-extra hspec QuickCheck random
          resourcet
        ];
+       benchmarkHaskellDepends = [ base conduit conduit-extra resourcet ];
        homepage = "https://github.com/snoyberg/bzlib-conduit";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -35622,8 +36032,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-macosx";
-       version = "0.2.3.5";
-       sha256 = "6f5604cd4d1e7e67736c408babda35fdf1b1ff7348254d1f308ccea953615633";
+       version = "0.2.4.0";
+       sha256 = "41fb5231327860676eb4496fedba4da7df00f7cff969589a86e4b687177788fa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35993,15 +36403,15 @@ self: {
 
   "cabal2nix" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
-     , containers, deepseq, directory, distribution-nixpkgs, filepath
-     , hackage-db, language-nix, lens, monad-par, monad-par-extras, mtl
-     , optparse-applicative, pretty, process, SHA, split, text, time
-     , transformers, utf8-string, yaml
+     , containers, deepseq, directory, distribution-nixpkgs, doctest
+     , filepath, hackage-db, language-nix, lens, monad-par
+     , monad-par-extras, mtl, optparse-applicative, pretty, process, SHA
+     , split, text, time, transformers, utf8-string, yaml
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.0.4";
-       sha256 = "b20b597df92787ba878073cd7cc855b3c0186f1781ac65056f261c420a1c7fe3";
+       version = "2.1";
+       sha256 = "6874df33b6a208d7715f673ceded9e09a7e8188a0a94651b14e208b928256f6e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36016,6 +36426,12 @@ self: {
          lens monad-par monad-par-extras mtl optparse-applicative pretty
          process SHA split text time transformers utf8-string yaml
        ];
+       testHaskellDepends = [
+         aeson ansi-wl-pprint base bytestring Cabal containers deepseq
+         directory distribution-nixpkgs doctest filepath hackage-db
+         language-nix lens optparse-applicative pretty process SHA split
+         text transformers yaml
+       ];
        homepage = "https://github.com/nixos/cabal2nix#readme";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
@@ -36223,13 +36639,16 @@ self: {
 
   "cacophony" = callPackage
     ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring
-     , cryptonite, directory, exceptions, free, hlint, lens, memory
-     , monad-coroutine, mtl, safe-exceptions, text, transformers
+     , criterion, cryptonite, deepseq, directory, exceptions, free
+     , hlint, lens, memory, monad-coroutine, mtl, safe-exceptions, text
+     , transformers
      }:
      mkDerivation {
        pname = "cacophony";
        version = "0.9.1";
        sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cryptonite exceptions free lens memory
          monad-coroutine mtl safe-exceptions transformers
@@ -36238,6 +36657,10 @@ self: {
          aeson async base base16-bytestring bytestring directory free hlint
          lens memory mtl text
        ];
+       benchmarkHaskellDepends = [
+         async base base16-bytestring bytestring criterion deepseq lens
+         memory
+       ];
        homepage = "https://github.com/centromere/cacophony";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
@@ -36535,6 +36958,8 @@ self: {
        pname = "call";
        version = "0.1.4.2";
        sha256 = "2fe8f1ade21ea24c67ab2447189f756b75a60cbb4d2221a0058bc62050c00461";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bindings-portaudio boundingboxes colors containers
          control-bool deepseq directory filepath free freetype2 GLFW-b
@@ -36671,17 +37096,19 @@ self: {
      }) {};
 
   "canteven-http" = callPackage
-    ({ mkDerivation, base, bytestring, canteven-log, exceptions
-     , http-types, monad-logger, text, time, transformers, uuid, wai
+    ({ mkDerivation, base, bytestring, canteven-log, directory
+     , exceptions, filepath, http-types, mime-types, monad-logger
+     , template-haskell, text, time, transformers, unix, uuid, wai
      , wai-extra
      }:
      mkDerivation {
        pname = "canteven-http";
-       version = "0.1.2.0";
-       sha256 = "194fbbb36eaa70c4ed2dbf8cdc9e5831761bbefba2cccd473f1068bf33ac0977";
+       version = "0.1.3.0";
+       sha256 = "d427d5bc77861c2a648a604443f2a5ca882b911487ac313dbb5db6b0271870d4";
        libraryHaskellDepends = [
-         base bytestring canteven-log exceptions http-types monad-logger
-         text time transformers uuid wai wai-extra
+         base bytestring canteven-log directory exceptions filepath
+         http-types mime-types monad-logger template-haskell text time
+         transformers unix uuid wai wai-extra
        ];
        homepage = "https://github.com/SumAll/canteven-http";
        description = "Utilities for HTTP programming";
@@ -36872,6 +37299,8 @@ self: {
        pname = "caramia";
        version = "0.7.2.2";
        sha256 = "fa3129d63816e1ccb47a57808ece432a2b6ab652eeba15ac6a76d6799af277b3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers exceptions gl lens linear mtl semigroups
          text transformers vector
@@ -36937,6 +37366,7 @@ self: {
          array base binary bytestring ix-shapable QuickCheck syb
        ];
        testHaskellDepends = [ array base ix-shapable QuickCheck ];
+       benchmarkHaskellDepends = [ array base ];
        description = "A C-compatible array library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37149,8 +37579,8 @@ self: {
      }) {};
 
   "case-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
-     , test-framework, test-framework-hunit, text
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , HUnit, test-framework, test-framework-hunit, text
      }:
      mkDerivation {
        pname = "case-insensitive";
@@ -37160,13 +37590,16 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "https://github.com/basvandijk/case-insensitive";
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "case-insensitive-match" = callPackage
-    ({ mkDerivation, base, bytestring, mtl, QuickCheck, text }:
+    ({ mkDerivation, base, bytestring, case-insensitive, criterion, mtl
+     , QuickCheck, random-strings, tagsoup, text
+     }:
      mkDerivation {
        pname = "case-insensitive-match";
        version = "0.1.1.0";
@@ -37176,6 +37609,10 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring mtl QuickCheck text ];
+       benchmarkHaskellDepends = [
+         base bytestring case-insensitive criterion random-strings tagsoup
+         text
+       ];
        homepage = "https://github.com/mikehat/case-insensitive-match";
        description = "A simplified, faster way to do case-insensitive matching";
        license = stdenv.lib.licenses.bsd3;
@@ -37195,8 +37632,9 @@ self: {
      }) {};
 
   "cases" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit
-     , loch-th, placeholders, QuickCheck, text
+    ({ mkDerivation, attoparsec, base, base-prelude, criterion, HTF
+     , HUnit, loch-th, mwc-random, placeholders, QuickCheck, rerebase
+     , text
      }:
      mkDerivation {
        pname = "cases";
@@ -37206,6 +37644,7 @@ self: {
        testHaskellDepends = [
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
+       benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
@@ -37462,14 +37901,16 @@ self: {
 
   "cassava" = callPackage
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
-     , containers, deepseq, hashable, HUnit, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , unordered-containers, vector
+     , containers, criterion, deepseq, hashable, HUnit, lazy-csv
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "cassava";
        version = "0.4.5.1";
        sha256 = "7c622ae9dc647508662a1cda3fe3f6d7032786e4e3d15f8488de9e9330cf9d9f";
+       revision = "1";
+       editedCabalFile = "c04d2ca56a5c725b3044ccf06c6fd09ff47265e3a1e125ae364363bfed2a0314";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -37479,6 +37920,10 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         array attoparsec base blaze-builder bytestring containers criterion
+         deepseq hashable lazy-csv text unordered-containers vector
+       ];
        homepage = "https://github.com/hvr/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -37486,7 +37931,8 @@ self: {
 
   "cassava-conduit" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, conduit-extra, containers, mtl, QuickCheck, text
+     , conduit, conduit-extra, containers, criterion, mtl, QuickCheck
+     , text
      }:
      mkDerivation {
        pname = "cassava-conduit";
@@ -37499,6 +37945,7 @@ self: {
        testHaskellDepends = [
          base bytestring cassava conduit conduit-extra QuickCheck text
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
@@ -37534,6 +37981,8 @@ self: {
        pname = "cassava-streams";
        version = "0.3.0.0";
        sha256 = "81a4548c78474d025c525728a57616a657e5d59c377625c54ebb3f1818f5c49b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cassava io-streams vector
        ];
@@ -37803,6 +38252,8 @@ self: {
        pname = "cci";
        version = "0.3.1";
        sha256 = "87390d636e6877bfb982ce60b3accef9d73153ea03632cec967526eb8eb96a5f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ cci ];
        testHaskellDepends = [
@@ -38023,8 +38474,9 @@ self: {
      }) {};
 
   "cereal-io-streams" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, derive, HUnit
-     , io-streams, mtl, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , conduit-extra, criterion, derive, HUnit, io-streams, mtl
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cereal-io-streams";
@@ -38035,6 +38487,10 @@ self: {
          base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         criterion io-streams
+       ];
        description = "io-streams support for the cereal binary serialization library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38065,8 +38521,9 @@ self: {
      }) {};
 
   "cereal-streams" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, derive, HUnit
-     , io-streams, mtl, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
+     , conduit-extra, criterion, derive, HUnit, io-streams, mtl
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "cereal-streams";
@@ -38077,6 +38534,10 @@ self: {
          base bytestring cereal derive HUnit io-streams mtl QuickCheck tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra
+         criterion io-streams transformers
+       ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38117,6 +38578,8 @@ self: {
        sha256 = "e6257b4b0e884db8a817d265d9a7f9a6c76af8190504f32dadbbf64b0fcee5a1";
        revision = "1";
        editedCabalFile = "6b4b703a1c34a9fa3e0223f3ff2796183c7b9b7351da1ad34478225637e837ba";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          asn1-data base bytestring containers crypto-pubkey-types cryptohash
          directory filepath mtl pem process time
@@ -38701,6 +39164,8 @@ self: {
        pname = "check-email";
        version = "1.0";
        sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7";
+       revision = "1";
+       editedCabalFile = "39f8616eeee765838400cd6754f864e9e65e8a89123327161227b6a424c20d75";
        libraryHaskellDepends = [ base bytestring email-validate ];
        librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
@@ -39194,8 +39659,9 @@ self: {
      }) {};
 
   "cipher-aes" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -39209,28 +39675,40 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "https://github.com/vincenthz/hs-cipher-aes";
        description = "Fast AES cipher implementation with advanced mode of operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-aes128" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }:
+    ({ mkDerivation, base, bytestring, cereal, criterion, crypto-api
+     , entropy, tagged
+     }:
      mkDerivation {
        pname = "cipher-aes128";
        version = "0.7.0.3";
        sha256 = "6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal crypto-api tagged
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal criterion crypto-api entropy tagged
+       ];
        homepage = "https://github.com/TomMD/cipher-aes128";
        description = "AES and common modes using AES-NI when available";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-blowfish" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2, vector
      }:
      mkDerivation {
@@ -39244,14 +39722,19 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Blowfish cipher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-camellia" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2, vector
      }:
      mkDerivation {
@@ -39265,14 +39748,19 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Camellia block cipher primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-des" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, securemem, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, mtl, QuickCheck, securemem, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -39286,14 +39774,19 @@ self: {
          base byteable bytestring crypto-cipher-tests crypto-cipher-types
          QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "DES and 3DES primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cipher-rc4" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-cipher-tests
-     , crypto-cipher-types, QuickCheck, test-framework
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-cipher-benchmarks, crypto-cipher-tests
+     , crypto-cipher-types, deepseq, mtl, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -39307,6 +39800,10 @@ self: {
          base bytestring crypto-cipher-tests crypto-cipher-types QuickCheck
          test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-cipher-benchmarks
+         crypto-cipher-types deepseq mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-cipher-rc4";
        description = "Fast RC4 cipher implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -39608,6 +40105,8 @@ self: {
        pname = "clang-pure";
        version = "0.2.0.2";
        sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers contravariant inline-c microlens
          microlens-contra singletons stm template-haskell vector
@@ -39740,10 +40239,11 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, array, base, constraints, data-binary-ieee754
-     , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
-     , lens, QuickCheck, reflection, singletons, template-haskell
+    ({ 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
      }:
      mkDerivation {
        pname = "clash-prelude";
@@ -39756,6 +40256,9 @@ self: {
          singletons template-haskell
        ];
        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;
@@ -39841,14 +40344,15 @@ self: {
 
   "classy-influxdb-simple" = callPackage
     ({ mkDerivation, aeson, async-io-either, base, bytestring, lens
-     , mtl, text, wreq
+     , mtl, scientific, text, time, vector, wreq
      }:
      mkDerivation {
        pname = "classy-influxdb-simple";
-       version = "0.1.0.1";
-       sha256 = "37655507a92d3bc9c019a5d25b746db95f948b57f5d58126bac4abba38d37383";
+       version = "0.2.1.0";
+       sha256 = "75b4a50512fd4d9cc785620b1bd01c683cc6cb8940157b8e871fa89ec7c95961";
        libraryHaskellDepends = [
-         aeson async-io-either base bytestring lens mtl text wreq
+         aeson async-io-either base bytestring lens mtl scientific text time
+         vector wreq
        ];
        homepage = "https://github.com/mankyKitty/classy-influxdb-simple#readme";
        description = "Super simple InfluxDB package in Classy-MTL style";
@@ -40356,7 +40860,7 @@ self: {
 
   "clif" = callPackage
     ({ mkDerivation, base, containers, QuickCheck, tasty
-     , tasty-quickcheck, tasty-th
+     , tasty-quickcheck, tasty-th, time
      }:
      mkDerivation {
        pname = "clif";
@@ -40366,6 +40870,7 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [ base time ];
        description = "A Clifford algebra number type for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40396,6 +40901,9 @@ self: {
        testHaskellDepends = [
          base hspec nats numeric-prelude QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion numeric-prelude stream-fusion
+       ];
        homepage = "http://github.com/spacekitteh/haskell-clifford";
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
@@ -40718,9 +41226,10 @@ self: {
      }) {};
 
   "clustering" = callPackage
-    ({ mkDerivation, base, binary, containers, hierarchical-clustering
-     , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
-     , tasty-hunit, tasty-quickcheck, unordered-containers, vector
+    ({ mkDerivation, base, binary, containers, criterion
+     , hierarchical-clustering, matrices, mwc-random, parallel
+     , primitive, Rlang-QQ, split, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "clustering";
@@ -40734,6 +41243,9 @@ self: {
          base binary hierarchical-clustering matrices mwc-random Rlang-QQ
          split tasty tasty-hunit tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion hierarchical-clustering matrices mwc-random vector
+       ];
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40793,13 +41305,18 @@ self: {
      }) {};
 
   "cmark" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, text }:
+    ({ mkDerivation, base, blaze-html, bytestring, cheapskate
+     , criterion, discount, HUnit, markdown, sundown, text
+     }:
      mkDerivation {
        pname = "cmark";
        version = "0.5.5";
        sha256 = "03bd6fc962bb92127f64a9c597a904492a16fb3f34587775a741d22311fe53e2";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
+       benchmarkHaskellDepends = [
+         base blaze-html cheapskate criterion discount markdown sundown text
+       ];
        homepage = "https://github.com/jgm/cmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -40910,6 +41427,8 @@ self: {
        pname = "cmdargs";
        version = "0.10.14";
        sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
@@ -40944,6 +41463,8 @@ self: {
        pname = "cmdlib";
        version = "0.3.6";
        sha256 = "5643d219c371f903c3f877b5955de4ca99a723bc96165f4f629d3e3dbc3fb357";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
@@ -41080,8 +41601,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "code-page";
-       version = "0.1.1";
-       sha256 = "16b8b802bca21b71dd782560978b7ac88866c129df83b760e9059a7da04d70f7";
+       version = "0.1.2";
+       sha256 = "aef2b0b043767ef28496aa6b8c744db8185492c0d1e94e567a62eb4fdcaa3b09";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/RyanGlScott/code-page";
@@ -41539,15 +42060,15 @@ self: {
      }) {};
 
   "colonnade" = callPackage
-    ({ mkDerivation, base, bytestring, contravariant, doctest, text
-     , vector
+    ({ mkDerivation, base, bytestring, contravariant, doctest
+     , profunctors, text, vector
      }:
      mkDerivation {
        pname = "colonnade";
-       version = "1.0.0";
-       sha256 = "47280e7dc733a66d0e507492e2b5499115027911d6ab859e29c602308f7bdf08";
+       version = "1.1.0";
+       sha256 = "e86e90e2eb8e983a0916b8651b248ad9d11202add0cab034f609d5e80923eafc";
        libraryHaskellDepends = [
-         base bytestring contravariant text vector
+         base bytestring contravariant profunctors text vector
        ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
@@ -41689,8 +42210,7 @@ self: {
        pname = "com";
        version = "1.2.3.1";
        sha256 = "f5085572cd0b0c8f8fdf115fad5c842657e803c70b2ce1c230ee452f87a9dff8";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42033,6 +42553,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compact" = callPackage
+    ({ mkDerivation, base, binary, bytestring, directory, ghc-compact
+     }:
+     mkDerivation {
+       pname = "compact";
+       version = "0.1.0.1";
+       sha256 = "ee8533e16b94bbbf3519ccad26f3e569d60d33a5a9d2e3636e0764aff7b2d653";
+       libraryHaskellDepends = [ base binary bytestring ghc-compact ];
+       testHaskellDepends = [ base directory ];
+       homepage = "https://github.com/ezyang/compact";
+       description = "Non-GC'd, contiguous storage for immutable data structures";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {ghc-compact = null;};
+
   "compact-map" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers }:
      mkDerivation {
@@ -42061,8 +42596,7 @@ self: {
        ];
        description = "Socket functions for compact normal form";
        license = stdenv.lib.licenses.bsd3;
-       broken = true;
-     }) {compact = null;};
+     }) {};
 
   "compact-string" = callPackage
     ({ mkDerivation, base, bytestring }:
@@ -42116,10 +42650,10 @@ self: {
      }) {};
 
   "compdata" = callPackage
-    ({ mkDerivation, base, containers, deepseq, derive, HUnit, mtl
-     , QuickCheck, template-haskell, test-framework
+    ({ mkDerivation, base, containers, criterion, deepseq, derive
+     , HUnit, mtl, QuickCheck, random, template-haskell, test-framework
      , test-framework-hunit, test-framework-quickcheck2, th-expand-syns
-     , transformers, tree-view
+     , transformers, tree-view, uniplate
      }:
      mkDerivation {
        pname = "compdata";
@@ -42134,12 +42668,17 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-expand-syns transformers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq derive mtl QuickCheck random
+         template-haskell th-expand-syns transformers uniplate
+       ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "compdata-automata" = callPackage
-    ({ mkDerivation, base, compdata, containers, projection }:
+    ({ mkDerivation, base, compdata, containers, criterion, projection
+     }:
      mkDerivation {
        pname = "compdata-automata";
        version = "0.9";
@@ -42147,6 +42686,9 @@ self: {
        revision = "1";
        editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130";
        libraryHaskellDepends = [ base compdata containers projection ];
+       benchmarkHaskellDepends = [
+         base compdata containers criterion projection
+       ];
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42364,12 +42906,13 @@ self: {
      }) {};
 
   "compound-types" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, base-prelude }:
      mkDerivation {
        pname = "compound-types";
        version = "0.1.3.1";
        sha256 = "81c67beb0379502875e2fbec9c346db7221f598197534064a4b4bd3d4ae930f2";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base-prelude ];
        homepage = "https://github.com/nikita-volkov/compound-types";
        description = "Sum and Product types and such";
        license = stdenv.lib.licenses.mit;
@@ -42446,19 +42989,22 @@ self: {
 
   "computational-algebra" = callPackage
     ({ mkDerivation, algebra, algebraic-prelude, arithmoi, base
-     , constraints, containers, control-monad-loop, convertible, deepseq
-     , dlist, entropy, equational-reasoning, ghc-typelits-knownnat
-     , hashable, heaps, hmatrix, hspec, HUnit, hybrid-vectors, lens
-     , matrix, monad-loops, MonadRandom, mono-traversable, monomorphic
-     , mtl, parallel, primes, process, QuickCheck, quickcheck-instances
-     , reflection, semigroups, singletons, sized, smallcheck, tagged
-     , template-haskell, test-framework, test-framework-hunit, text
+     , constraints, containers, control-monad-loop, convertible
+     , criterion, deepseq, dlist, entropy, equational-reasoning
+     , ghc-typelits-knownnat, hashable, heaps, hmatrix, hspec, HUnit
+     , hybrid-vectors, lens, matrix, monad-loops, MonadRandom
+     , mono-traversable, monomorphic, mtl, parallel, primes, process
+     , QuickCheck, quickcheck-instances, random, reflection, semigroups
+     , singletons, sized, smallcheck, tagged, template-haskell
+     , test-framework, test-framework-hunit, text, transformers
      , type-natural, unamb, unordered-containers, vector
      }:
      mkDerivation {
        pname = "computational-algebra";
        version = "0.5.0.0";
        sha256 = "fce631557cfcef120382e91744279f5e7a61c0afaae95cf2159195f7e57fda49";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          algebra algebraic-prelude arithmoi base constraints containers
          control-monad-loop convertible deepseq dlist entropy
@@ -42475,6 +43021,13 @@ self: {
          singletons sized smallcheck tagged test-framework
          test-framework-hunit text type-natural vector
        ];
+       benchmarkHaskellDepends = [
+         algebra base constraints containers criterion deepseq
+         equational-reasoning hspec HUnit lens matrix MonadRandom
+         monomorphic parallel process QuickCheck quickcheck-instances random
+         reflection singletons sized smallcheck tagged test-framework
+         test-framework-hunit transformers type-natural vector
+       ];
        homepage = "https://github.com/konn/computational-algebra";
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
@@ -42541,6 +43094,8 @@ self: {
        pname = "concraft";
        version = "0.9.4";
        sha256 = "030f63c8c08dba11ac85b08746a145df45276930de8fc937ecf6260b1cac079f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson array base binary bytestring cmdargs comonad containers
          crf-chain1-constrained crf-chain2-tiers data-lens lazy-io
@@ -42672,6 +43227,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "concurrency_1_1_0_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, exceptions
+     , monad-control, mtl, stm, transformers
+     }:
+     mkDerivation {
+       pname = "concurrency";
+       version = "1.1.0.0";
+       sha256 = "bc6e4d9db178937bf5223b8534bb56bf508242259ee489709af203ad39914605";
+       libraryHaskellDepends = [
+         array atomic-primops base exceptions monad-control mtl stm
+         transformers
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Typeclasses, functions, and data types for concurrency and STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "concurrent-barrier" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -42741,6 +43314,7 @@ self: {
        testHaskellDepends = [
          base machines tasty tasty-hunit time transformers
        ];
+       benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42801,6 +43375,8 @@ self: {
        pname = "concurrent-state";
        version = "0.6.0.0";
        sha256 = "e6071814c277106cb13b458a7161dd42269e9a7c2419b17992a1908a7fb3342d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
        homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
@@ -42949,9 +43525,10 @@ self: {
      }) {};
 
   "conduit" = callPackage
-    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
-     , mmorph, monad-control, mtl, QuickCheck, resourcet, safe, split
-     , transformers, transformers-base
+    ({ 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";
@@ -42965,6 +43542,10 @@ self: {
          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;
@@ -43096,9 +43677,9 @@ self: {
 
   "conduit-extra" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
-     , bytestring-builder, conduit, directory, exceptions, filepath
-     , hspec, monad-control, network, primitive, process, QuickCheck
-     , resourcet, stm, streaming-commons, text, transformers
+     , bytestring-builder, conduit, criterion, directory, exceptions
+     , filepath, hspec, monad-control, network, primitive, process
+     , QuickCheck, resourcet, stm, streaming-commons, text, transformers
      , transformers-base
      }:
      mkDerivation {
@@ -43115,6 +43696,10 @@ self: {
          conduit directory exceptions hspec process QuickCheck resourcet stm
          streaming-commons text transformers transformers-base
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder conduit criterion
+         transformers
+       ];
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
@@ -43157,8 +43742,8 @@ self: {
      }) {};
 
   "conduit-iconv" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, mtl, QuickCheck
-     , test-framework, test-framework-quickcheck2, text
+    ({ mkDerivation, base, bytestring, conduit, criterion, mtl
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
      }:
      mkDerivation {
        pname = "conduit-iconv";
@@ -43169,6 +43754,9 @@ self: {
          base bytestring conduit mtl QuickCheck test-framework
          test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion mtl text
+       ];
        homepage = "https://github.com/sdroege/conduit-iconv";
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
@@ -43325,6 +43913,8 @@ self: {
        pname = "config-ini";
        version = "0.1.2.0";
        sha256 = "d3a2b77545fba315db644ce177248e59f918cf4b6e17123c04d66e8bb3c7ee15";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base megaparsec text transformers unordered-containers
        ];
@@ -43413,6 +44003,8 @@ self: {
        pname = "configifier";
        version = "0.1.1";
        sha256 = "52cbd5b32d438766e655104e583baa5379e618bc2526382c970bde313db72e11";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring case-insensitive containers directory either
          functor-infix mtl safe string-conversions template-haskell
@@ -43736,6 +44328,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "constrained-monads" = callPackage
+    ({ mkDerivation, base, containers, doctest, QuickCheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "constrained-monads";
+       version = "0.1.0.0";
+       sha256 = "1822fb5f5bec60b9c7efc11b776718bcdc66399a8c34687fe6173975ec010184";
+       libraryHaskellDepends = [ base containers transformers ];
+       testHaskellDepends = [
+         base containers doctest QuickCheck transformers
+       ];
+       homepage = "https://github.com/oisdk/constrained-monads#readme";
+       description = "Typeclasses and instances for monads with constraints";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "constrained-normal" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -43910,9 +44519,9 @@ self: {
      }) {};
 
   "containers_0_5_10_1" = callPackage
-    ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim
-     , HUnit, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, transformers
+    ({ mkDerivation, array, base, ChasingBottoms, criterion, deepseq
+     , ghc-prim, HUnit, QuickCheck, random, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "containers";
@@ -43924,6 +44533,9 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq ghc-prim random transformers
+       ];
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44040,19 +44652,22 @@ self: {
      }) {};
 
   "continuum" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, mtl
-     , nanomsg-haskell, time
+    ({ mkDerivation, base, bytestring, cereal, containers, hyperleveldb
+     , mtl, nanomsg-haskell, time
      }:
      mkDerivation {
        pname = "continuum";
        version = "0.1.0.7";
        sha256 = "a6bbd7bee80d5216e4678fc9bdf85f4136b079ed8d2e2cf8585c76420bb0386e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal containers mtl nanomsg-haskell time
        ];
+       executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {hyperleveldb = null;};
 
   "continuum-client" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, mtl
@@ -44453,6 +45068,8 @@ self: {
        pname = "convertible";
        version = "1.1.1.0";
        sha256 = "e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
@@ -44487,6 +45104,8 @@ self: {
        pname = "convertible-text";
        version = "0.4.0.2";
        sha256 = "df8dc391ff4d82e3d18b049e3c4db50198aa1345c101d088683a075d5ba217f3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attempt base bytestring containers old-time template-haskell text
          time
@@ -45003,6 +45622,8 @@ self: {
        pname = "country-codes";
        version = "0.1.3";
        sha256 = "062843cebfcb4df513e4688456311f07a2eb693935a053ce2eade2c8d586d1b5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ aeson base shakespeare text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
        homepage = "https://github.com/prowdsponsor/country-codes";
@@ -45147,9 +45768,31 @@ self: {
        license = "LGPL";
      }) {};
 
+  "cpphs_1_20_4" = callPackage
+    ({ mkDerivation, base, directory, filepath, old-locale, old-time
+     , polyparse
+     }:
+     mkDerivation {
+       pname = "cpphs";
+       version = "1.20.4";
+       sha256 = "d159437cea89854c3f413f7157f40ea2d82272fce83efe6ce17e2065883da47e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath old-locale old-time polyparse
+       ];
+       executableHaskellDepends = [
+         base directory filepath old-locale old-time polyparse
+       ];
+       homepage = "http://projects.haskell.org/cpphs/";
+       description = "A liberalised re-implementation of cpp, the C pre-processor";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cprng-aes" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, cipher-aes
-     , crypto-random
+    ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion
+     , crypto-random, mtl
      }:
      mkDerivation {
        pname = "cprng-aes";
@@ -45158,6 +45801,9 @@ self: {
        libraryHaskellDepends = [
          base byteable bytestring cipher-aes crypto-random
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-random mtl
+       ];
        homepage = "http://github.com/vincenthz/hs-cprng-aes";
        description = "Crypto Pseudo Random Number Generator using AES in counter mode";
        license = stdenv.lib.licenses.bsd3;
@@ -45202,6 +45848,8 @@ self: {
        pname = "cpu";
        version = "0.1.2";
        sha256 = "5627feb4974a3ff8499c42cc958927e88761a2e004c4000d34e9cd6a15ad2974";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
@@ -45214,6 +45862,8 @@ self: {
        pname = "cpuid";
        version = "0.2.3";
        sha256 = "f8198ab4408219fe001c0a50908af38a766e2a0b3afb8260307838e5517add88";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base data-accessor enumset ];
        homepage = "http://code.haskell.org/cpuid/";
        description = "Binding for the cpuid machine instruction on x86 compatible processors";
@@ -45555,6 +46205,8 @@ self: {
        pname = "craftwerk";
        version = "0.1";
        sha256 = "a39d24c7e05469883f35d642c393c04a8bca6d03d1bd41905fd5a981ddb00200";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base colour mtl vector-space ];
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
@@ -45583,6 +46235,8 @@ self: {
        pname = "craftwerk-gtk";
        version = "0.1";
        sha256 = "ced95080b5b735d57a13b9082ebdadf5015926f4f49a3b181a3e974ba01f66a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
@@ -45645,7 +46299,7 @@ self: {
 
   "crc" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , resourcet, tasty, tasty-golden, vector
+     , criterion, resourcet, tasty, tasty-golden, vector
      }:
      mkDerivation {
        pname = "crc";
@@ -45655,6 +46309,7 @@ self: {
        testHaskellDepends = [
          base bytestring conduit conduit-extra resourcet tasty tasty-golden
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "http://github.com/MichaelXavier/crc";
        description = "Implements various Cyclic Redundancy Checks (CRC)";
        license = stdenv.lib.licenses.mit;
@@ -45858,9 +46513,10 @@ self: {
      }) {};
 
   "critbit" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
+    ({ mkDerivation, array, base, bytestring, bytestring-trie
+     , containers, criterion, deepseq, hashable, mtl, mwc-random
      , QuickCheck, test-framework, test-framework-quickcheck2, text
-     , transformers, vector
+     , transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "critbit";
@@ -45873,6 +46529,11 @@ self: {
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2 text transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring bytestring-trie containers criterion deepseq
+         hashable mtl mwc-random text transformers unordered-containers
+         vector
+       ];
        homepage = "https://github.com/bos/critbit";
        description = "Crit-bit maps and sets";
        license = stdenv.lib.licenses.bsd3;
@@ -46017,9 +46678,9 @@ self: {
      }) {};
 
   "cron" = callPackage
-    ({ mkDerivation, attoparsec, base, data-default-class, generics-sop
-     , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups
-     , tasty, tasty-hunit, tasty-quickcheck, text, time
+    ({ mkDerivation, attoparsec, base, criterion, data-default-class
+     , generics-sop, mtl, mtl-compat, old-locale, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time
      , transformers-compat
      }:
      mkDerivation {
@@ -46034,6 +46695,7 @@ self: {
          attoparsec base generics-sop quickcheck-instances semigroups tasty
          tasty-hunit tasty-quickcheck text time transformers-compat
        ];
+       benchmarkHaskellDepends = [ attoparsec base criterion text time ];
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -46267,9 +46929,9 @@ self: {
      }) {};
 
   "crypto-numbers" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-random
-     , ghc-prim, integer-gmp, tasty, tasty-hunit, tasty-quickcheck
-     , vector
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-random, ghc-prim, integer-gmp, mtl, tasty, tasty-hunit
+     , tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "crypto-numbers";
@@ -46284,15 +46946,16 @@ self: {
          base byteable bytestring crypto-random tasty tasty-hunit
          tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion mtl ];
        homepage = "https://github.com/vincenthz/hs-crypto-numbers";
        description = "Cryptographic numbers: functions and algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "crypto-pubkey" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, crypto-numbers
-     , crypto-pubkey-types, crypto-random, cryptohash, tasty
-     , tasty-hunit, tasty-kat, tasty-quickcheck
+    ({ mkDerivation, base, byteable, bytestring, criterion
+     , crypto-numbers, crypto-pubkey-types, crypto-random, cryptohash
+     , deepseq, mtl, tasty, tasty-hunit, tasty-kat, tasty-quickcheck
      }:
      mkDerivation {
        pname = "crypto-pubkey";
@@ -46307,6 +46970,10 @@ self: {
          crypto-random cryptohash tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion crypto-pubkey-types crypto-random
+         cryptohash deepseq mtl
+       ];
        homepage = "https://github.com/vincenthz/hs-crypto-pubkey";
        description = "Public Key cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -46458,8 +47125,9 @@ self: {
      }) {};
 
   "cryptohash" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, cryptonite, ghc-prim
-     , HUnit, memory, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, byteable, bytestring, criterion, cryptonite
+     , ghc-prim, HUnit, memory, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash";
@@ -46472,6 +47140,7 @@ self: {
          base byteable bytestring HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base byteable bytestring criterion ];
        homepage = "http://github.com/vincenthz/hs-cryptohash";
        description = "collection of crypto hashes, fast, pure and practical";
        license = stdenv.lib.licenses.bsd3;
@@ -46511,8 +47180,8 @@ self: {
      }) {};
 
   "cryptohash-md5" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, pureMD5
-     , tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , pureMD5, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-md5";
@@ -46523,14 +47192,15 @@ self: {
          base base16-bytestring bytestring pureMD5 tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-md5";
        description = "Fast, pure and practical MD5 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha1" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , SHA, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-sha1";
@@ -46541,14 +47211,15 @@ self: {
          base base16-bytestring bytestring SHA tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-sha1";
        description = "Fast, pure and practical SHA-1 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha256" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , SHA, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-sha256";
@@ -46559,14 +47230,15 @@ self: {
          base base16-bytestring bytestring SHA tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-sha256";
        description = "Fast, pure and practical SHA-256 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptohash-sha512" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, SHA, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , SHA, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash-sha512";
@@ -46577,6 +47249,7 @@ self: {
          base base16-bytestring bytestring SHA tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/hvr/cryptohash-sha512";
        description = "Fast, pure and practical SHA-512 implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -46584,11 +47257,12 @@ self: {
 
   "cryptol" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, async, base
-     , base-compat, bytestring, containers, deepseq, directory, filepath
-     , gitrev, GraphSCC, happy, haskeline, heredoc, monad-control
-     , monadLib, old-time, presburger, pretty, process, QuickCheck
-     , random, sbv, simple-smt, smtLib, syb, template-haskell, text
-     , tf-random, transformers, transformers-base, utf8-string
+     , base-compat, bytestring, containers, criterion, deepseq
+     , directory, filepath, gitrev, GraphSCC, happy, haskeline, heredoc
+     , monad-control, monadLib, old-time, presburger, pretty, process
+     , QuickCheck, random, sbv, simple-smt, smtLib, syb
+     , template-haskell, text, tf-random, transformers
+     , transformers-base, utf8-string
      }:
      mkDerivation {
        pname = "cryptol";
@@ -46611,6 +47285,7 @@ self: {
          filepath haskeline monad-control monadLib process random sbv
          tf-random transformers
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
@@ -46637,6 +47312,26 @@ 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
+     }:
+     mkDerivation {
+       pname = "cryptonite";
+       version = "0.22";
+       sha256 = "4be312a42a12ccd2ca60272ef485664f242c7ed89fa1909ba36a54c5fb6ff5f0";
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp memory
+       ];
+       testHaskellDepends = [
+         base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck
+       ];
+       homepage = "https://github.com/haskell-crypto/cryptonite";
+       description = "Cryptography Primitives sink";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptonite-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit
@@ -46933,6 +47628,8 @@ self: {
        pname = "csv-conduit";
        version = "0.6.7";
        sha256 = "501e6b0b7c6f0e80ba381b5f18af5ec343eb5e1afb4f5fc4e5e318ce51eeb33d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring conduit
          conduit-extra containers data-default ghc-prim mmorph monad-control
@@ -47058,8 +47755,10 @@ self: {
      }) {};
 
   "ctrie" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, hashable
-     , primitive, QuickCheck, test-framework, test-framework-quickcheck2
+    ({ mkDerivation, async, atomic-primops, base, containers, criterion
+     , deepseq, hashable, primitive, QuickCheck, random, random-shuffle
+     , stm, test-framework, test-framework-quickcheck2, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "ctrie";
@@ -47070,6 +47769,10 @@ self: {
          base containers hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         async base containers criterion deepseq hashable random
+         random-shuffle stm transformers unordered-containers
+       ];
        homepage = "https://github.com/mcschroeder/ctrie";
        description = "Non-blocking concurrent map";
        license = stdenv.lib.licenses.mit;
@@ -47082,6 +47785,8 @@ self: {
        pname = "cube";
        version = "0.2.0";
        sha256 = "d71f6392f0323ab12da36c43e8780a39c3d547e217d63d19205f056839a30c6a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal containers STL ];
        testHaskellDepends = [
          base bytestring cereal containers hspec STL
@@ -47377,6 +48082,7 @@ self: {
        sha256 = "1cdb55745936dbca5224dbb36a7006b85164a3bcc3e6af0c2670c0c0f8bb9adb";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       benchmarkHaskellDepends = [ base ];
        homepage = "https://github.com/mgattozzi/curryrs#readme";
        description = "Easy to use FFI Bridge for using Rust in Haskell";
        license = "unknown";
@@ -47998,7 +48704,7 @@ self: {
      }) {};
 
   "darkplaces-demo" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
      , darkplaces-text, data-binary-ieee754, directory, mtl
      , optparse-applicative, regex-tdfa, transformers
      }:
@@ -48017,6 +48723,9 @@ self: {
        executableHaskellDepends = [
          base bytestring darkplaces-text directory mtl optparse-applicative
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion transformers
+       ];
        homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
@@ -48868,12 +49577,13 @@ self: {
      }) {};
 
   "data-has" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion, transformers }:
      mkDerivation {
        pname = "data-has";
        version = "0.2.1.0";
        sha256 = "c13dd9875174926b41911a826bbf6d616ceabc56d27017a76a39d097e170f890";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion transformers ];
        homepage = "https://github.com/winterland1989/data-has";
        description = "Simple extensible product";
        license = stdenv.lib.licenses.bsd3;
@@ -49104,7 +49814,7 @@ self: {
      }) {};
 
   "data-msgpack" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
      , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck
      , text, unordered-containers, vector, void
      }:
@@ -49123,6 +49833,9 @@ self: {
          base bytestring containers hashable hspec QuickCheck text
          unordered-containers vector void
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq QuickCheck
+       ];
        homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
@@ -49193,6 +49906,8 @@ self: {
        pname = "data-object-yaml";
        version = "0.3.4.2";
        sha256 = "5785ea86b5c2da50edc5dc595d9deadae0a5868f294a6b9664f1aceb38c949a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring conduit containers convertible-text data-object
          failure text transformers yaml
@@ -49301,6 +50016,8 @@ self: {
        sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202";
        revision = "1";
        editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        homepage = "http://ku-fpg.github.io/software/data-reify/";
        description = "Reify a recursive data structure into an explicit graph";
@@ -49428,9 +50145,10 @@ self: {
      }) {};
 
   "data-store" = callPackage
-    ({ mkDerivation, base, cereal, containers, deepseq, lens
-     , QuickCheck, safecopy, test-framework, test-framework-quickcheck2
-     , transformers, vector
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , deepseq, ixset, lens, mtl, QuickCheck, random, safecopy, tables
+     , tagged, test-framework, test-framework-quickcheck2, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "data-store";
@@ -49443,6 +50161,11 @@ self: {
          base cereal containers deepseq lens QuickCheck safecopy
          test-framework test-framework-quickcheck2 transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal containers criterion deepseq ixset lens mtl
+         random safecopy tables tagged transformers unordered-containers
+         vector
+       ];
        homepage = "https://github.com/Palmik/data-store";
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
@@ -49669,6 +50392,8 @@ self: {
        pname = "dataenc";
        version = "0.14.0.7";
        sha256 = "f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
        homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
        description = "Data encoding library";
@@ -50084,9 +50809,9 @@ self: {
 
   "dbus" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
-     , containers, directory, filepath, libxml-sax, network, parsec
-     , process, QuickCheck, random, text, transformers, unix, vector
-     , xml-types
+     , containers, criterion, deepseq, directory, filepath, libxml-sax
+     , network, parsec, process, QuickCheck, random, text, transformers
+     , unix, vector, xml-types
      }:
      mkDerivation {
        pname = "dbus";
@@ -50101,6 +50826,7 @@ self: {
          filepath libxml-sax network parsec process QuickCheck random text
          transformers unix vector xml-types
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        doCheck = false;
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
@@ -50197,8 +50923,9 @@ self: {
      }) {};
 
   "dclabel" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck
-     , quickcheck-instances, test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , QuickCheck, quickcheck-instances, test-framework
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "dclabel";
@@ -50209,6 +50936,10 @@ self: {
          base bytestring cereal containers QuickCheck quickcheck-instances
          test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal containers criterion QuickCheck
+         quickcheck-instances
+       ];
        description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51107,6 +51838,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_0_5_1_1" = callPackage
+    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
+     , monad-loops, mtl, random, ref-fd, semigroups, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "0.5.1.1";
+       sha256 = "c8ba221dd45a107488e5b499fc59f66587a66eb366c4e3dafb76b84b9d38488a";
+       libraryHaskellDepends = [
+         base concurrency containers deepseq exceptions monad-loops mtl
+         random ref-fd semigroups transformers transformers-base
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Systematic testing for Haskell concurrency";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -51485,8 +52235,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive";
-       version = "2.5.26";
-       sha256 = "b6ef2e5e7fa79d3b76053c97bf88cd2ab77fe15065bf321a135a29d18b4e4a6d";
+       version = "2.6.1";
+       sha256 = "8544ac13c09059acd2914da86506206879e3feb375361fc5e312548c4d9b6d72";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52208,7 +52958,7 @@ self: {
 
   "diagrams-lib" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, cereal, colour
-     , containers, data-default-class, deepseq, diagrams-core
+     , containers, criterion, data-default-class, deepseq, diagrams-core
      , diagrams-solve, directory, distributive, dual-tree, exceptions
      , filepath, fingertree, fsnotify, hashable, intervals, JuicyPixels
      , lens, linear, monoid-extras, mtl, numeric-extras
@@ -52234,6 +52984,7 @@ self: {
          base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion diagrams-core ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -52451,6 +53202,8 @@ self: {
        pname = "diagrams-wx";
        version = "0.1.1.0";
        sha256 = "472855bcd4f7df78002a35099ba9b0eb21e5473c30e6eff74ecc9dcafa35b9ba";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib wx wxcore
        ];
@@ -52475,6 +53228,7 @@ self: {
        homepage = "https://gitlab.com/lamefun/dialog";
        description = "Simple dialog-based user interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dib" = callPackage
@@ -53023,7 +53777,8 @@ self: {
      }) {};
 
   "dimensional" = callPackage
-    ({ mkDerivation, base, deepseq, exact-pi, HUnit, numtype-dk, vector
+    ({ mkDerivation, base, criterion, deepseq, exact-pi, HUnit
+     , numtype-dk, vector
      }:
      mkDerivation {
        pname = "dimensional";
@@ -53033,6 +53788,7 @@ self: {
          base deepseq exact-pi numtype-dk vector
        ];
        testHaskellDepends = [ base HUnit ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/bjornbm/dimensional/";
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
        license = stdenv.lib.licenses.bsd3;
@@ -53390,8 +54146,8 @@ self: {
      }:
      mkDerivation {
        pname = "dirstream";
-       version = "1.0.1";
-       sha256 = "76136a076311a19e4e3242ef15bd21e39b8eade315d03b92f9b8750daffdbe59";
+       version = "1.0.2";
+       sha256 = "ff5e186dffbb2308a81312c17147609bc9d0352c829a3f138119810f4b70fa75";
        libraryHaskellDepends = [
          base directory pipes pipes-safe system-fileio system-filepath unix
        ];
@@ -53436,6 +54192,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "discord-hs" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, data-default, hakyll, hashable, hslogger, lens
+     , mmorph, mtl, pipes, split, stm, stm-conduit, text, time
+     , transformers, unordered-containers, url, vector, websockets, wreq
+     , wuss
+     }:
+     mkDerivation {
+       pname = "discord-hs";
+       version = "0.1.3";
+       sha256 = "4cdcbc983ef10838e96344ad9b63e772296d9e734b4dc87768f657b7aaa106fc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers data-default
+         hashable hslogger lens mmorph mtl pipes stm stm-conduit text time
+         transformers unordered-containers url vector websockets wreq wuss
+       ];
+       executableHaskellDepends = [ base hakyll split ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "An API wrapper for Discord in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discordian-calendar" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -53480,9 +54260,10 @@ self: {
      }) {};
 
   "discrimination" = callPackage
-    ({ mkDerivation, array, base, containers, contravariant, deepseq
-     , ghc-prim, hashable, primitive, profunctors, promises, semigroups
-     , transformers, transformers-compat, vector, void
+    ({ mkDerivation, array, base, containers, contravariant, criterion
+     , deepseq, ghc-prim, hashable, primitive, profunctors, promises
+     , semigroups, transformers, transformers-compat
+     , unordered-containers, vector, void
      }:
      mkDerivation {
        pname = "discrimination";
@@ -53495,6 +54276,10 @@ self: {
          primitive profunctors promises semigroups transformers
          transformers-compat vector void
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq ghc-prim primitive
+         unordered-containers
+       ];
        homepage = "http://github.com/ekmett/discrimination/";
        description = "Fast generic linear-time sorting, joins and container construction";
        license = stdenv.lib.licenses.bsd3;
@@ -53544,6 +54329,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "display-haskell-do" = callPackage
+    ({ mkDerivation, aeson, base, text }:
+     mkDerivation {
+       pname = "display-haskell-do";
+       version = "0.1.0.0";
+       sha256 = "78c4fd335953e51394476a6643dac326645877c91f076f12079ebb595fd55948";
+       libraryHaskellDepends = [ aeson base text ];
+       homepage = "https://github.com/KitFreddura/HaskellDO-Display";
+       description = "A display API for HaskellDO";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "disposable" = callPackage
+    ({ mkDerivation, base, dlist }:
+     mkDerivation {
+       pname = "disposable";
+       version = "0.1.0.0";
+       sha256 = "fc7d7dc460566c9f3ac965c355792806278a19a0fa35e89ab3a5df465fb34e43";
+       libraryHaskellDepends = [ base dlist ];
+       homepage = "https://github.com/louispan/disposable#readme";
+       description = "Allows storing different resource-releasing actions together";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dist-upload" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process }:
      mkDerivation {
@@ -53605,8 +54414,8 @@ self: {
   "distributed-process" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, exceptions, hashable
-     , mtl, network-transport, random, rank1dynamic, stm, syb
-     , template-haskell, time, transformers
+     , mtl, network-transport, network-transport-tcp, random
+     , rank1dynamic, stm, syb, template-haskell, time, transformers
      }:
      mkDerivation {
        pname = "distributed-process";
@@ -53619,6 +54428,9 @@ self: {
          distributed-static exceptions hashable mtl network-transport random
          rank1dynamic stm syb template-haskell time transformers
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring network-transport-tcp
+       ];
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -53664,6 +54476,8 @@ self: {
        pname = "distributed-process-azure";
        version = "0.1.0";
        sha256 = "4f64d22e0ff0dc94e6ecfd99cc7133ab5c5df4dbbe3415bd2c99fdaee98f8035";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          azure-service-api base binary bytestring certificate
          distributed-process distributed-static executable-path filepath
@@ -53773,12 +54587,11 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-extras";
-       version = "0.3.0";
-       sha256 = "bffa1640ec7f59bf415e18fb68e6085bf1cf96d4fc4c51c260ef554385e3cb36";
+       version = "0.3.1";
+       sha256 = "feeb3891a60c8f1833aec4e3a7eeae34a54f0baf83f6ebfb5610bb14b4f66bdc";
        libraryHaskellDepends = [
-         base binary containers data-accessor deepseq distributed-process
-         exceptions fingertree hashable mtl stm time transformers
-         unordered-containers
+         base binary containers deepseq distributed-process exceptions
+         fingertree hashable mtl stm time transformers unordered-containers
        ];
        testHaskellDepends = [
          ansi-terminal base binary bytestring containers data-accessor
@@ -53847,6 +54660,8 @@ self: {
        pname = "distributed-process-p2p";
        version = "0.1.3.2";
        sha256 = "613c65aa986085e61cf65b55bf174cc2f31a79e5b666daf1ef402bcad940a28e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers distributed-process mtl network
          network-transport network-transport-tcp
@@ -53869,6 +54684,8 @@ self: {
        pname = "distributed-process-platform";
        version = "0.1.0";
        sha256 = "752980d006aaa5319b91da7b5bd5124322552fff9e9cb7de816aff89b7f5ae2f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -53931,6 +54748,8 @@ self: {
        sha256 = "7b98498f2d6ce185ae0a855ff35e97a9ad1bd1ec7872b2d75aa0bb1f1fb24316";
        revision = "1";
        editedCabalFile = "4ccf03a12611141e322511b6370e2f757e215f17e68fc3f68485ec5b48fa8f70";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor distributed-process
          network network-multicast network-transport network-transport-tcp
@@ -54068,6 +54887,8 @@ self: {
        pname = "distributed-process-zookeeper";
        version = "0.2.2.0";
        sha256 = "df15044fe0f74e4034be2f58d589e2ffa1e46c36e8024c07d6db56fe39697928";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers deepseq distributed-process hzk
          mtl network network-transport network-transport-tcp transformers
@@ -54490,13 +55311,14 @@ self: {
      }) {dns_sd = null;};
 
   "do-list" = callPackage
-    ({ mkDerivation, base, hspec }:
+    ({ mkDerivation, base, criterion, hspec, mtl, text }:
      mkDerivation {
        pname = "do-list";
        version = "1.0.1";
        sha256 = "b377193461b0ad7a81f9e66bcf10f8838b6f1e39f4a5de3b2e2f45c749c5b694";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion mtl text ];
        homepage = "https://github.com/tserduke/do-list#readme";
        description = "Do notation for free";
        license = stdenv.lib.licenses.bsd3;
@@ -55051,6 +55873,8 @@ self: {
        pname = "dotgen";
        version = "0.4.2";
        sha256 = "cf0de20a435d74aeb9a32b8bcb3ebfa1b6659ac3f26edefe2df9e1aaf1481891";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/ku-fpg/dotgen";
        description = "A simple interface for building .dot graph files.";
@@ -55457,6 +56281,8 @@ self: {
        pname = "drawille";
        version = "0.1.2.0";
        sha256 = "b8188ee87a06c168974c9655188450eb86c331c556decb31cf084efa846237df";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/yamadapc/haskell-drawille#readme";
@@ -55791,6 +56617,8 @@ self: {
        pname = "dtrace";
        version = "0.1";
        sha256 = "393b9e0f3ed92d2b817ae162ad5478116d001ec8e05ddf3c65a0334029a45f63";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to the DTrace system tracing utility";
        license = stdenv.lib.licenses.bsd3;
@@ -56284,6 +57112,8 @@ self: {
        pname = "dynobud";
        version = "1.9.1.0";
        sha256 = "3995a1186ca493ae30fc38b72fbfa49b8f4b5858e266a9b6b24135267deedde5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary casadi-bindings casadi-bindings-core cereal
          containers data-default-class directory distributive
@@ -56605,6 +57435,8 @@ self: {
        pname = "echo";
        version = "0.1.3";
        sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base process ];
        homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
@@ -56651,8 +57483,8 @@ self: {
      }) {canlib = null;};
 
   "ed25519" = callPackage
-    ({ mkDerivation, base, bytestring, directory, doctest, filepath
-     , ghc-prim, hlint, QuickCheck
+    ({ mkDerivation, base, bytestring, criterion, deepseq, directory
+     , doctest, filepath, ghc-prim, hlint, QuickCheck
      }:
      mkDerivation {
        pname = "ed25519";
@@ -56664,6 +57496,7 @@ self: {
        testHaskellDepends = [
          base bytestring directory doctest filepath hlint QuickCheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "Ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
@@ -56802,8 +57635,9 @@ self: {
      }) {};
 
   "edit-distance" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, random
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , process, QuickCheck, random, test-framework
+     , test-framework-quickcheck2, time, unix
      }:
      mkDerivation {
        pname = "edit-distance";
@@ -56816,6 +57650,9 @@ self: {
          array base containers QuickCheck random test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         array base containers criterion deepseq process random time unix
+       ];
        homepage = "http://github.com/phadej/edit-distance";
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
        license = stdenv.lib.licenses.bsd3;
@@ -56930,8 +57767,8 @@ self: {
      }) {};
 
   "effect-handlers" = callPackage
-    ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
-     , kan-extensions, mtl, QuickCheck
+    ({ mkDerivation, base, criterion, free, hspec, hspec-discover
+     , HUnit, kan-extensions, mtl, QuickCheck
      }:
      mkDerivation {
        pname = "effect-handlers";
@@ -56941,6 +57778,7 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover HUnit QuickCheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
@@ -57040,10 +57878,11 @@ self: {
      }) {};
 
   "egison" = callPackage
-    ({ mkDerivation, array, base, containers, 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
+    ({ 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
      }:
      mkDerivation {
        pname = "egison";
@@ -57065,6 +57904,9 @@ self: {
          base Glob HUnit mtl test-framework test-framework-hunit
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq mtl transformers
+       ];
        homepage = "http://www.egison.org";
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
@@ -57136,6 +57978,8 @@ self: {
        sha256 = "3d84485f15b876982c857a57e6e0fec85417c85eddd6b6f4344b3db30f8b934d";
        revision = "3";
        editedCabalFile = "e27ea9e604b3868e61e330abcd605d550371ef7f2c27e12e60b1caad99458222";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring haskell-src-meta parsec template-haskell text
          transformers
@@ -57315,6 +58159,7 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
+       benchmarkHaskellDepends = [ base ];
        homepage = "https://github.com/tibbe/ekg-core";
        description = "Tracking of system metrics";
        license = stdenv.lib.licenses.bsd3;
@@ -57396,6 +58241,8 @@ self: {
        pname = "ekg-push";
        version = "0.0.3";
        sha256 = "be683041cb6935aa194a9d241b5f11c2038b7056884fbc0a10ec1f148706b7fb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
@@ -57443,6 +58290,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "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;
+     }) {};
+
   "electrum-mnemonic" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
@@ -57512,10 +58377,10 @@ self: {
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
        pname = "elf";
-       version = "0.27";
-       sha256 = "5ade563fb19d75af6bf02effe6f9fa8fc207102c259b8d9fe394096f4798d4a7";
+       version = "0.28";
+       sha256 = "9e27129a3b10386e719e8caeed1cdff6a2a1f3a3c9a81ee493dfb6d11e9ff157";
        libraryHaskellDepends = [ base binary bytestring ];
-       homepage = "http://github.com/erikcharlebois/elf";
+       homepage = "https://github.com/wangbj/elf";
        description = "Parser for ELF object format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58165,6 +59030,8 @@ self: {
        pname = "enchant";
        version = "0.1.0.0";
        sha256 = "553536cc63fa18dfa07441e03166f10ae71d19c6dbfd04a996a91c318be36dfc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        libraryPkgconfigDepends = [ enchant ];
        libraryToolDepends = [ c2hs ];
@@ -58487,9 +59354,9 @@ self: {
      }) {};
 
   "enummapmap" = callPackage
-    ({ mkDerivation, base, cereal, containers, contravariant
+    ({ mkDerivation, base, cereal, containers, contravariant, criterion
      , data-default, deepseq, ghc-prim, hspec, hspec-expectations, HUnit
-     , lens, QuickCheck, safecopy, semigroups
+     , lens, mtl, QuickCheck, safecopy, semigroups
      }:
      mkDerivation {
        pname = "enummapmap";
@@ -58503,6 +59370,9 @@ self: {
          base cereal containers deepseq hspec hspec-expectations HUnit lens
          QuickCheck safecopy semigroups
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq mtl
+       ];
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58611,8 +59481,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "1.3.0.1";
-       sha256 = "ac630e03e9f4c8c99c39e622b9638c3bdc3b71300ef92597d60acac7ace8e85c";
+       version = "1.3.0.2";
+       sha256 = "4ca0af8de7d089cf9f1e16e46a6a1300e901907f4edb3a8d393e5af11868899b";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -59145,6 +60015,8 @@ self: {
        sha256 = "b83980c6f537ab812ac8605a9fe8c3bb9764bb5ae098e20ef882fd5aa824f7b6";
        revision = "1";
        editedCabalFile = "146f86cb3df790cd26c0ec2f7061027257c7932a64ff8a6725eee5356a887776";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers ersatz toysolver transformers
        ];
@@ -59474,8 +60346,8 @@ self: {
      }) {};
 
   "euler" = callPackage
-    ({ mkDerivation, base, directory, happy, hlint, hspec, process
-     , regex-posix, xml
+    ({ mkDerivation, base, criterion, directory, happy, hlint, hspec
+     , process, regex-posix, xml
      }:
      mkDerivation {
        pname = "euler";
@@ -59486,15 +60358,17 @@ self: {
          base directory hlint hspec process regex-posix xml
        ];
        testToolDepends = [ happy ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "euphoria" = callPackage
-    ({ mkDerivation, base, containers, deepseq, elerea, enummapset-th
-     , hashable, HUnit, test-framework, test-framework-hunit
-     , test-framework-th, transformers, unordered-containers
+    ({ mkDerivation, base, containers, criterion, deepseq, elerea
+     , enummapset-th, hashable, HUnit, test-framework
+     , test-framework-hunit, test-framework-th, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "euphoria";
@@ -59507,6 +60381,9 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq enummapset-th unordered-containers
+       ];
        homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
@@ -59832,8 +60709,8 @@ self: {
      }) {};
 
   "exact-real" = callPackage
-    ({ mkDerivation, base, checkers, directory, doctest, filepath
-     , groups, integer-gmp, memoize, QuickCheck, random, tasty
+    ({ mkDerivation, base, checkers, criterion, directory, doctest
+     , filepath, groups, integer-gmp, memoize, QuickCheck, random, tasty
      , tasty-hunit, tasty-quickcheck, tasty-th
      }:
      mkDerivation {
@@ -59845,6 +60722,7 @@ self: {
          base checkers directory doctest filepath groups QuickCheck random
          tasty tasty-hunit tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/expipiplus1/exact-real";
        description = "Exact real arithmetic";
        license = stdenv.lib.licenses.mit;
@@ -60364,6 +61242,8 @@ self: {
        pname = "explicit-exception";
        version = "0.1.8";
        sha256 = "7fee7a3781db3c3bf82079e635d510088dbb6f4295fde887c603819ec14cd16f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base deepseq transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Exception";
        description = "Exceptions which are explicit in the type signature";
@@ -60962,21 +61842,23 @@ self: {
      }) {};
 
   "farmhash" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck }:
+    ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck }:
      mkDerivation {
        pname = "farmhash";
        version = "0.1.0.5";
        sha256 = "0e685a5445f7bce88682d209bccb47d03f06065a627475df44a8e2af8bc20fa1";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fast-builder" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
-     , stm
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, ghc-prim, process, QuickCheck, scientific, stm
+     , template-haskell, text, true-name, unordered-containers, vector
      }:
      mkDerivation {
        pname = "fast-builder";
@@ -60984,14 +61866,19 @@ self: {
        sha256 = "4a83c2fb4e21ec43d7cf9b2412286e1fea036f7c5cbfd4dcee8914f8b2ae9e1c";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring process QuickCheck stm ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers criterion deepseq ghc-prim
+         scientific template-haskell text true-name unordered-containers
+         vector
+       ];
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "fast-digits" = callPackage
-    ({ mkDerivation, base, digits, integer-gmp, QuickCheck, smallcheck
-     , tasty, tasty-quickcheck, tasty-smallcheck
+    ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck
+     , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "fast-digits";
@@ -61002,6 +61889,7 @@ self: {
          base digits QuickCheck smallcheck tasty tasty-quickcheck
          tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [ base criterion digits ];
        homepage = "https://github.com/Bodigrim/fast-digits";
        description = "The fast library for integer-to-digits conversion";
        license = stdenv.lib.licenses.gpl3;
@@ -61189,8 +62077,8 @@ self: {
      }) {};
 
   "fastpbkdf2" = callPackage
-    ({ mkDerivation, base, base16-bytestring, bytestring, openssl
-     , tasty, tasty-hunit
+    ({ mkDerivation, base, base16-bytestring, bytestring, criterion
+     , cryptonite, openssl, pbkdf, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "fastpbkdf2";
@@ -61201,6 +62089,9 @@ self: {
        testHaskellDepends = [
          base base16-bytestring bytestring tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptonite pbkdf
+       ];
        homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme";
        description = "Haskell bindings to the fastpbkdf2 C library";
        license = stdenv.lib.licenses.bsd3;
@@ -61535,7 +62426,8 @@ self: {
      }) {};
 
   "fclabels" = callPackage
-    ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers
+    ({ mkDerivation, base, criterion, HUnit, mtl, template-haskell
+     , transformers
      }:
      mkDerivation {
        pname = "fclabels";
@@ -61545,6 +62437,7 @@ self: {
        testHaskellDepends = [
          base HUnit mtl template-haskell transformers
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/sebastiaanvisser/fclabels";
        description = "First class accessor labels implemented as lenses";
        license = stdenv.lib.licenses.bsd3;
@@ -61820,11 +62713,11 @@ self: {
      }) {};
 
   "feldspar-compiler" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, data-default
-     , directory, feldspar-language, filepath, gcc_s, ghc-paths, mtl
-     , plugins, plugins-multistage, pretty, process, QuickCheck
-     , storable-record, storable-tuple, syntactic, tasty, tasty-golden
-     , tasty-quickcheck, template-haskell
+    ({ mkDerivation, base, bytestring, Cabal, containers, criterion
+     , data-default, deepseq, directory, feldspar-language, filepath
+     , gcc_s, ghc-paths, mtl, plugins, plugins-multistage, pretty
+     , process, QuickCheck, storable-record, storable-tuple, syntactic
+     , tasty, tasty-golden, tasty-quickcheck, template-haskell
      }:
      mkDerivation {
        pname = "feldspar-compiler";
@@ -61840,6 +62733,9 @@ self: {
          base bytestring Cabal feldspar-language mtl process QuickCheck
          tasty tasty-golden tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion data-default deepseq feldspar-language
+       ];
        homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
@@ -62012,6 +62908,8 @@ self: {
        pname = "ffmpeg-light";
        version = "0.11.3";
        sha256 = "57206bff8bcf82f08f0881b80d5992d2be41b32443b8eca10d198789af24adfb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base either exceptions JuicyPixels mtl transformers vector
        ];
@@ -62805,7 +63703,9 @@ self: {
      }) {inherit (pkgs) cfitsio;};
 
   "fitspec" = callPackage
-    ({ mkDerivation, base, cmdargs, leancheck, template-haskell }:
+    ({ mkDerivation, base, cmdargs, haskell-src, haskell-src-exts
+     , leancheck, pretty, template-haskell
+     }:
      mkDerivation {
        pname = "fitspec";
        version = "0.4.0";
@@ -62814,6 +63714,10 @@ self: {
          base cmdargs leancheck template-haskell
        ];
        testHaskellDepends = [ base cmdargs leancheck template-haskell ];
+       benchmarkHaskellDepends = [
+         base cmdargs haskell-src haskell-src-exts leancheck pretty
+         template-haskell
+       ];
        homepage = "https://github.com/rudymatela/fitspec#readme";
        description = "refining property sets for testing Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -63493,13 +64397,14 @@ self: {
      }) {};
 
   "floating-bits" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion }:
      mkDerivation {
        pname = "floating-bits";
        version = "0.3.0.0";
        sha256 = "b2cf891588df5adc6633c26d8e75c582c0cecfcf7f48e3a889e8013d739ae2b2";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63726,8 +64631,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.0";
-       sha256 = "0153c9fe8224f1cf72acfd6b738f03fed28e7b498ececaec176edb98556ef184";
+       version = "0.5.1.1";
+       sha256 = "9230417d449ea9af3257dbaba15a7aada3db6289b2e26246bbd92787f3cb394c";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -63803,9 +64708,9 @@ self: {
 
   "fluent-logger" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal
-     , cereal-conduit, conduit, conduit-extra, containers, exceptions
-     , hspec, messagepack, network, network-socket-options, random, stm
-     , text, time, transformers, vector
+     , cereal-conduit, conduit, conduit-extra, containers, criterion
+     , exceptions, hspec, messagepack, network, network-socket-options
+     , random, stm, text, time, transformers, vector
      }:
      mkDerivation {
        pname = "fluent-logger";
@@ -63820,6 +64725,7 @@ self: {
          conduit-extra containers exceptions hspec messagepack network text
          time transformers
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "A structured logger for Fluentd (Haskell)";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -63886,13 +64792,21 @@ self: {
      }) {};
 
   "fmt" = callPackage
-    ({ mkDerivation, base, hspec, text, text-format }:
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, containers, hspec, microlens, neat-interpolation
+     , text, text-format, vector
+     }:
      mkDerivation {
        pname = "fmt";
-       version = "0.0.0.2";
-       sha256 = "8cf2554099987e09090d8b7ac084ff1b389c934e3de1cc99c0f29d754ff0a20a";
-       libraryHaskellDepends = [ base text text-format ];
-       testHaskellDepends = [ base hspec text ];
+       version = "0.0.0.3";
+       sha256 = "a6cc32309e996acc4db281368184a1333b52072023315dfa8f20fbfa235ed81b";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring microlens text
+         text-format
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec neat-interpolation text vector
+       ];
        homepage = "http://github.com/aelve/fmt";
        description = "Nice formatting library";
        license = stdenv.lib.licenses.bsd3;
@@ -63991,8 +64905,8 @@ self: {
 
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
-     , contravariant, mwc-random, primitive, profunctors, text
-     , transformers, vector
+     , contravariant, criterion, mwc-random, primitive, profunctors
+     , text, transformers, vector
      }:
      mkDerivation {
        pname = "foldl";
@@ -64002,13 +64916,14 @@ self: {
          base bytestring comonad containers contravariant mwc-random
          primitive profunctors text transformers vector
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "foldl-incremental" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, foldl
-     , histogram-fill, mwc-random, pipes, QuickCheck, tasty
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , foldl, histogram-fill, mwc-random, pipes, QuickCheck, tasty
      , tasty-golden, tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
@@ -64022,6 +64937,7 @@ self: {
          base bytestring containers foldl histogram-fill mwc-random pipes
          QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base containers criterion foldl ];
        homepage = "https://github.com/tonyday567/foldl-incremental";
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
@@ -64029,8 +64945,8 @@ self: {
      }) {};
 
   "foldl-statistics" = callPackage
-    ({ mkDerivation, base, foldl, math-functions, profunctors
-     , quickcheck-instances, semigroups, statistics, tasty
+    ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random
+     , profunctors, quickcheck-instances, semigroups, statistics, tasty
      , tasty-quickcheck, vector
      }:
      mkDerivation {
@@ -64044,6 +64960,9 @@ self: {
          base foldl profunctors quickcheck-instances semigroups statistics
          tasty tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion foldl mwc-random statistics vector
+       ];
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
@@ -64051,9 +64970,9 @@ self: {
 
   "foldl-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
-     , doctest, foldl, free, monoid-subclasses, profunctors
-     , semigroupoids, semigroups, split, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, void
+     , criterion, doctest, foldl, free, lens-family-core
+     , monoid-subclasses, profunctors, semigroupoids, semigroups, split
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, void
      }:
      mkDerivation {
        pname = "foldl-transduce";
@@ -64068,6 +64987,9 @@ self: {
          base doctest foldl free monoid-subclasses split tasty tasty-hunit
          tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [
+         base criterion foldl lens-family-core
+       ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64699,7 +65621,7 @@ self: {
      }) {};
 
   "foundation" = callPackage
-    ({ mkDerivation, base, ghc-prim, mtl, QuickCheck, tasty
+    ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
@@ -64712,6 +65634,7 @@ self: {
        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;
@@ -65054,8 +65977,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.7.1";
-       sha256 = "051dff857638b93e574aecce065860e1985e71a8e0f07c410966cdf87880930c";
+       version = "0.7.2";
+       sha256 = "de9a834164e97e1b025ca01d58833e8d91afe68e7152e0af40e30050b3898121";
        libraryHaskellDepends = [
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
@@ -65287,8 +66210,8 @@ self: {
          libfreenect = null;};
 
   "freer" = callPackage
-    ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, base, criterion, free, mtl, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "freer";
@@ -65301,6 +66224,7 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion free mtl ];
        homepage = "https://gitlab.com/queertypes/freer";
        description = "Implementation of the Freer Monad";
        license = stdenv.lib.licenses.bsd3;
@@ -65371,6 +66295,8 @@ self: {
        pname = "freetype2";
        version = "0.1.1";
        sha256 = "da18f9d3047277ba47e162dafa0b2a4777bfb6157b39ad91f9e808ba36f65e99";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        description = "Haskell binding for FreeType 2 library";
        license = stdenv.lib.licenses.bsd3;
@@ -65482,6 +66408,8 @@ self: {
        pname = "friday-scale-dct";
        version = "1.0.0.1";
        sha256 = "0a40db255149c553169d8c2cc8f7ae11b511061b45a3e5c810f9be3390951b48";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-compat carray fft friday vector
        ];
@@ -65773,6 +66701,8 @@ self: {
        pname = "ftdi";
        version = "0.2.0.1";
        sha256 = "a892fae6e1c12c3fc1db3f10e84b99c46f6145ac3fb3bcad519bcb619f5dcebe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring safe transformers usb
        ];
@@ -65844,6 +66774,8 @@ self: {
        pname = "ftphs";
        version = "1.0.9.1";
        sha256 = "ce0b05b2fc7f93a6195184ed1a8edee69a7a9cf4aa3d15ebeb25421715571bf2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base hslogger MissingH mtl network parsec regex-compat
        ];
@@ -65907,14 +66839,17 @@ self: {
      }) {};
 
   "full-text-search" = callPackage
-    ({ mkDerivation, array, base, containers, QuickCheck, tasty
-     , tasty-quickcheck, text, vector
+    ({ mkDerivation, alex, array, base, containers, happy, QuickCheck
+     , tasty, tasty-quickcheck, text, vector
      }:
      mkDerivation {
        pname = "full-text-search";
        version = "0.2.1.3";
        sha256 = "f3de82428b67819c1284f18192922e20cda5cb3cdb447297018507b13e3ca368";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base containers text vector ];
+       executableToolDepends = [ alex happy ];
        testHaskellDepends = [
          array base containers QuickCheck tasty tasty-quickcheck text vector
        ];
@@ -66222,13 +67157,16 @@ self: {
      }) {};
 
   "funnyprint" = callPackage
-    ({ mkDerivation, base, hscolour, ipprint, tasty, tasty-hspec }:
+    ({ mkDerivation, base, criterion, hscolour, ipprint, tasty
+     , tasty-hspec
+     }:
      mkDerivation {
        pname = "funnyprint";
        version = "0.0.5";
        sha256 = "8f13d87e1a47957cad27e4753af10d375406e503d90a9e1cb193aec68eeef99e";
        libraryHaskellDepends = [ base hscolour ipprint ];
        testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ];
+       benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
        homepage = "https://github.com/Pitometsu/funnyprint#readme";
        description = "funnyPrint function to colorize GHCi output";
        license = stdenv.lib.licenses.mit;
@@ -66763,8 +67701,8 @@ self: {
      }:
      mkDerivation {
        pname = "gdo";
-       version = "0.1.2";
-       sha256 = "0a4612e13b97de8950ff87779a98ca837ed5de78baf9754d465b648edcc44018";
+       version = "0.1.5";
+       sha256 = "9c128b9e29799b761e289bbfa7125e655acc934a84615b84164f3ba8188d1627";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -66843,6 +67781,8 @@ self: {
        pname = "gegl";
        version = "0.0.0.4";
        sha256 = "cd938dcc3042980669f01186cc4d0a52d03a5b8cf14553598ef6c04e0748f822";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          babl base containers glib inline-c monad-loops random split
          template-haskell
@@ -66953,8 +67893,8 @@ self: {
      }:
      mkDerivation {
        pname = "gendocs";
-       version = "0.1.0.0";
-       sha256 = "5ed453b7811e8b43ff5d660acbf6f75e6022a63c546ca282b2ea9b3474e762f0";
+       version = "0.1.2";
+       sha256 = "60e9e403012fdf31fd99a7ec1e89034b3cabb32de167af9ad54a1d5da45c7a64";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring safe text
        ];
@@ -66964,6 +67904,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "general-games" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, monad-loops, MonadRandom
+     , random, random-shuffle
+     }:
+     mkDerivation {
+       pname = "general-games";
+       version = "0.4.0";
+       sha256 = "ffd2e343716ee1bc73d6abfc810c06528e85eed083878f0c73cdc3510aa30642";
+       libraryHaskellDepends = [
+         base monad-loops MonadRandom random random-shuffle
+       ];
+       testHaskellDepends = [ base hspec HUnit MonadRandom ];
+       homepage = "https://github.com/cgorski/general-games";
+       description = "Library supporting simulation of a number of games";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "general-prelude" = callPackage
     ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath
      }:
@@ -67126,9 +68083,9 @@ self: {
      }) {};
 
   "generic-maybe" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, directory
-     , doctest, filepath, generic-deriving, ghc-prim, hlint, mtl, nats
-     , parallel, semigroups, simple-reflect, split, text
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , directory, doctest, filepath, generic-deriving, ghc-prim, hlint
+     , mtl, nats, parallel, semigroups, simple-reflect, split, text
      , unordered-containers, vector
      }:
      mkDerivation {
@@ -67141,6 +68098,7 @@ self: {
          generic-deriving hlint mtl nats parallel semigroups simple-reflect
          split text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/jfischoff/generic-maybe";
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
@@ -68170,6 +69128,8 @@ self: {
        pname = "ghc-exactprint";
        version = "0.5.3.0";
        sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers directory filepath free ghc ghc-boot
          ghc-paths mtl syb
@@ -68479,6 +69439,8 @@ self: {
        pname = "ghc-prof";
        version = "1.3.0.2";
        sha256 = "99a13463bf12803c02071206b090c1e4a1364f6f0bbc4162155c478a2c740fa1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -68499,6 +69461,8 @@ self: {
        pname = "ghc-prof";
        version = "1.4.0";
        sha256 = "2ab282b118684c30cf10f6b69aa362dacaf274a73b7e23b668c36d6830ce4253";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base containers scientific text time
        ];
@@ -68633,6 +69597,8 @@ self: {
        pname = "ghc-time-alloc-prof";
        version = "0.1.0";
        sha256 = "61a877a8f7a7dbfc8ceeac0e7b20f63a52183b7d1690d0557b4300c0bbfe30d5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ attoparsec base containers text time ];
        testHaskellDepends = [
          attoparsec base directory filepath process tasty tasty-hunit
@@ -68711,6 +69677,8 @@ self: {
        pname = "ghc-typelits-presburger";
        version = "0.1.1.0";
        sha256 = "bcb005e8c4ae609a75ceef344abe5b2282d23f0dc409426bda9965e02d2d4f92";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base equational-reasoning ghc ghc-tcplugins-extra presburger
          reflection
@@ -68950,8 +69918,6 @@ self: {
        pname = "ghcjs-dom-jsffi";
        version = "0.7.0.4";
        sha256 = "2a44162bf30cb0ebee18b76db5831804add52d3a4bba4c183d0229b975c15619";
-       isLibrary = false;
-       isExecutable = false;
        description = "DOM library using JSFFI and GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68969,6 +69935,7 @@ self: {
        ];
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-hplay" = callPackage
@@ -69021,6 +69988,8 @@ self: {
        pname = "ghcjs-vdom";
        version = "0.2.0.0";
        sha256 = "4a53dba09fc79b495f172584d0fa4e60d14453466098d9e221c8f3d0dc5d68c5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers ghc-prim ghcjs-base ghcjs-ffiqq ghcjs-prim split
          template-haskell
@@ -69335,7 +70304,7 @@ self: {
   "gi-gstaudio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
+     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstaudio";
@@ -69347,18 +70316,17 @@ self: {
          haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; 
-         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
+     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
 
   "gi-gstbase" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gobjectIntrospection, gst-plugins-base
+     , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base
      , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
@@ -69371,19 +70339,18 @@ self: {
          haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; 
-         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
+     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
 
   "gi-gstvideo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst-plugins-base, haskell-gi, haskell-gi-base, text, transformers
+     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstvideo";
@@ -69395,14 +70362,13 @@ self: {
          haskell-gi haskell-gi-base text transformers
        ];
        librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst-plugins-base ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; 
-         gst-plugins-base = pkgs.gst_all_1.gst-plugins-base;};
+     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
 
   "gi-gtk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -69566,8 +70532,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "1.0.11";
-       sha256 = "8e709c61b8e6a8d2973d7206b15e324327d79ec4b6c301b949837d33d1f7ec66";
+       version = "1.0.12";
+       sha256 = "8a2badc09262448996bc3b4b82d6fdc69b423d4a34d57cdc859c89f8ae74250d";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi
@@ -69595,8 +70561,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.11";
-       sha256 = "604c2759510e6987fb2ca63c4b20940147fd07fcf56f701c221bf836de0481ad";
+       version = "1.0.12";
+       sha256 = "e24214f43c50ecb1077168298bf48e447ddcb80ee8c8452fc02ef04df971a787";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -69669,8 +70635,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "2.91.12";
-       sha256 = "c286d581ad3f3e25dc4f7b5b8439d4e6a0e2d6312218e5cc528c490c07573670";
+       version = "2.91.13";
+       sha256 = "4dfce5aefb7e2e8daad8be77f3c64580bd5c1b90287513153f668497308c1b40";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
@@ -69821,7 +70787,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ginger_0_5_0_0" = callPackage
+  "ginger_0_5_1_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit
      , tasty-quickcheck, text, time, transformers, unordered-containers
@@ -69829,8 +70795,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.5.0.0";
-       sha256 = "619261156d6d5fa5cdde9b2f39429c22b20b9d9159dcb4e867a598f5ed5c7f5c";
+       version = "0.5.1.2";
+       sha256 = "f6eb7424e05408227d405607c12e6efce129da54693c6c56527a42cff9c82077";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69927,6 +70893,8 @@ self: {
        pname = "giphy-api";
        version = "0.5.2.0";
        sha256 = "447111d3fa32a76ffc50b26fbec59d9e9a097d7e2facb04a7a272cb9abd97ce9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers http-api-data http-client http-client-tls
          microlens microlens-th mtl network-uri servant servant-client text
@@ -70456,8 +71424,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20161118";
-       sha256 = "5278f8f3502721cb677b4ac0de4df8c2954ddb0335ceb9e63c4b29e77912a21b";
+       version = "1.20170221";
+       sha256 = "2838227d760bb0ea933a84023ec3eeda23ffc0dc870c290dfcd6b9b19d02b869";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
@@ -70847,9 +71815,9 @@ self: {
 
   "gitson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
-     , conduit-combinators, conduit-extra, directory, doctest, errors
-     , filepath, flock, Glob, hspec, lifted-base, monad-control, process
-     , transformers
+     , conduit-combinators, conduit-extra, criterion, directory, doctest
+     , errors, filepath, flock, Glob, hspec, lifted-base, monad-control
+     , process, random, transformers
      }:
      mkDerivation {
        pname = "gitson";
@@ -70863,6 +71831,9 @@ self: {
        testHaskellDepends = [
          aeson base directory doctest Glob hspec process transformers
        ];
+       benchmarkHaskellDepends = [
+         aeson base criterion directory random transformers
+       ];
        homepage = "https://github.com/myfreeweb/gitson";
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
@@ -71089,14 +72060,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "glazier_0_10_0_0" = callPackage
+  "glazier_0_11_0_0" = callPackage
     ({ mkDerivation, base, lens, mmorph, mtl, semigroupoids
      , transformers
      }:
      mkDerivation {
        pname = "glazier";
-       version = "0.10.0.0";
-       sha256 = "af7325fd898b62b8a29c106836b25fd334ab637d5d773a55da1fc25942af5167";
+       version = "0.11.0.0";
+       sha256 = "8ef0c04025f7d6942eeee13f9f376ed8019e38b6cd48e1eaffff5f5cd789c0ff";
        libraryHaskellDepends = [
          base lens mmorph mtl semigroupoids transformers
        ];
@@ -71256,8 +72227,8 @@ self: {
      }) {};
 
   "glob-posix" = callPackage
-    ({ mkDerivation, base, directory, filepath, tasty
-     , tasty-expected-failure, tasty-hunit, unix
+    ({ mkDerivation, base, criterion, directory, filepath, Glob
+     , MissingH, tasty, tasty-expected-failure, tasty-hunit, unix
      }:
      mkDerivation {
        pname = "glob-posix";
@@ -71268,6 +72239,7 @@ self: {
          base directory filepath tasty tasty-expected-failure tasty-hunit
          unix
        ];
+       benchmarkHaskellDepends = [ base criterion Glob MissingH ];
        homepage = "https://github.com/rdnetto/glob-posix#readme";
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
@@ -71796,15 +72768,16 @@ self: {
      }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;};
 
   "gnss-converters" = callPackage
-    ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring
-     , conduit, conduit-extra, exceptions, extra, HUnit-approx, lens
-     , monad-control, mtl, resourcet, rtcm, sbp, tasty, tasty-hunit
-     , time, transformers-base, unordered-containers
+    ({ mkDerivation, base, basic-prelude, binary, binary-conduit
+     , bytestring, conduit, conduit-extra, exceptions, extra
+     , HUnit-approx, lens, monad-control, mtl, resourcet, rtcm, sbp
+     , tasty, tasty-hunit, text, time, transformers-base
+     , unordered-containers
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.2.1";
-       sha256 = "47732c64bb1091ac79386d142ba790cf809b4390244c710d3a5c246feb24e4c2";
+       version = "0.2.4";
+       sha256 = "0781dbaaece9a06a2ded982b193e6a5fed7a4a36f4e3ac031f89d710e97dfafd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -71816,9 +72789,9 @@ self: {
          base basic-prelude binary-conduit conduit conduit-extra resourcet
        ];
        testHaskellDepends = [
-         base basic-prelude binary-conduit bytestring conduit conduit-extra
-         HUnit-approx lens resourcet rtcm sbp tasty tasty-hunit
-         unordered-containers
+         base basic-prelude binary binary-conduit bytestring conduit
+         conduit-extra HUnit-approx lens resourcet rtcm sbp tasty
+         tasty-hunit text unordered-containers
        ];
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
@@ -71858,6 +72831,8 @@ self: {
        pname = "gnuplot";
        version = "0.5.4.1";
        sha256 = "fa54c95f5dad96e3af6a13429cf6852bffe97bd52bdd99bdce60ca9e78bee8f7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq filepath process temporary time transformers utility-ht
@@ -74829,6 +75804,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-translate_0_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-api-data
+     , http-client, servant, servant-client, text, transformers
+     }:
+     mkDerivation {
+       pname = "google-translate";
+       version = "0.4";
+       sha256 = "acd1fe031674f578e83e7736335bfa9999b430c19afbd5ca89aae97179be4929";
+       libraryHaskellDepends = [
+         aeson base bytestring http-api-data http-client servant
+         servant-client text transformers
+       ];
+       description = "Google Translate API bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "googleplus" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , enumerator, haskell98, http-enumerator, http-types, mtl, text
@@ -75019,6 +76011,8 @@ self: {
        pname = "gore-and-ash-lambdacube";
        version = "0.2.0.0";
        sha256 = "62c2bd09408ecfc4f7140cb034b993822b4246c23df72bf17a708aa1b700407d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash hashable
          lambdacube-compiler lambdacube-gl mtl text unordered-containers
@@ -75713,6 +76707,8 @@ self: {
        pname = "graphics-drawingcombinators";
        version = "1.5.1";
        sha256 = "4e8ffecad64bc9529869059a62c3dc2ca177465dc8c3890e0be6b74b4aa61148";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bitmap bitmap-opengl FTGL OpenGL stb-image
        ];
@@ -75803,9 +76799,10 @@ self: {
      }) {};
 
   "graphql-api" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, containers, directory
-     , doctest, exceptions, hspec, protolude, QuickCheck, raw-strings-qq
-     , scientific, tasty, tasty-hspec, text, transformers
+    ({ mkDerivation, aeson, attoparsec, base, containers, criterion
+     , directory, doctest, exceptions, hspec, protolude, QuickCheck
+     , raw-strings-qq, scientific, tasty, tasty-hspec, text
+     , transformers
      }:
      mkDerivation {
        pname = "graphql-api";
@@ -75821,6 +76818,9 @@ self: {
          aeson attoparsec base containers directory doctest exceptions hspec
          protolude QuickCheck raw-strings-qq tasty tasty-hspec transformers
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base criterion exceptions protolude transformers
+       ];
        homepage = "https://github.com/jml/graphql-api#readme";
        description = "Write type-safe GraphQL services in Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -75863,14 +76863,17 @@ self: {
      }) {};
 
   "graphviz" = callPackage
-    ({ mkDerivation, base, bytestring, colour, containers, directory
-     , dlist, fgl, fgl-arbitrary, filepath, polyparse, process
-     , QuickCheck, temporary, text, transformers, wl-pprint-text
+    ({ mkDerivation, base, bytestring, colour, containers, criterion
+     , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath
+     , polyparse, process, QuickCheck, temporary, text, transformers
+     , wl-pprint-text
      }:
      mkDerivation {
        pname = "graphviz";
        version = "2999.18.1.2";
        sha256 = "b08c2026d3810c15f6ad49a07fd7b879978d958fa477b369b719ec00741c85fc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring colour containers directory dlist fgl filepath
          polyparse process temporary text transformers wl-pprint-text
@@ -75878,6 +76881,7 @@ self: {
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -76157,6 +77161,8 @@ self: {
        pname = "gridland";
        version = "0.1.0.3";
        sha256 = "2936472e5eb065e1fe28bd5d2f9d524be8d63f6eba0627527acf1668ec38b760";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array astar base containers grid htiled mtl random safe SDL SDL-gfx
          SDL-image SDL-mixer tuple vector
@@ -76370,8 +77376,8 @@ self: {
      }) {};
 
   "grouped-list" = callPackage
-    ({ mkDerivation, base, containers, deepseq, pointed, QuickCheck
-     , tasty, tasty-quickcheck
+    ({ mkDerivation, base, containers, criterion, deepseq, pointed
+     , QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "grouped-list";
@@ -76379,6 +77385,7 @@ self: {
        sha256 = "5bc49f34b1d9759a819c919971d789b14d37a8e22de811a5fc062675e3f8e875";
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
@@ -76588,7 +77595,7 @@ self: {
 
   "gstreamer" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, directory, glib
-     , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl
+     , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gstreamer";
@@ -76598,11 +77605,11 @@ self: {
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
        ];
-       libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
+       libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
+     }) {gst_plugins_base = null; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, haskeline
@@ -76944,6 +77951,8 @@ self: {
        pname = "gtk3";
        version = "0.14.6";
        sha256 = "f4c0d3c51a5e06e5f6a8fcfc2a1303e0a3ed0242309fc6c1b9603be9de1f4258";
+       isLibrary = true;
+       isExecutable = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          array base bytestring cairo containers gio glib mtl pango text
@@ -77399,7 +78408,7 @@ self: {
   "hOpenPGP" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bifunctors, binary, binary-conduit, byteable
-     , bytestring, bzlib, conduit, conduit-extra, containers
+     , bytestring, bzlib, conduit, conduit-extra, containers, criterion
      , crypto-cipher-types, cryptonite, data-default-class, errors
      , hashable, incremental-parser, ixset-typed, lens, memory
      , monad-loops, nettle, network, network-uri, newtype
@@ -77432,6 +78441,16 @@ self: {
          tasty-quickcheck text time time-locale-compat transformers
          unordered-containers wl-pprint-extras zlib
        ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bifunctors binary
+         binary-conduit byteable bytestring bzlib conduit conduit-extra
+         containers criterion crypto-cipher-types cryptonite
+         data-default-class errors hashable incremental-parser ixset-typed
+         lens memory monad-loops nettle network network-uri newtype
+         openpgp-asciiarmor resourcet securemem semigroups split text time
+         time-locale-compat transformers unordered-containers
+         wl-pprint-extras zlib
+       ];
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
@@ -78535,8 +79554,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.5.1";
-       sha256 = "667af1dc76c2833dd1fec935c5e61cc331be3c7b20c77ff68206177f70eccdad";
+       version = "0.5.2";
+       sha256 = "fa38878313ab5075d86438d3853760b48c5a943a822a91f6a4057424abed7c63";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -79055,10 +80074,10 @@ self: {
      }) {};
 
   "hairy" = callPackage
-    ({ mkDerivation, aeson, base, data-default, heroku, hspec
-     , http-types, monad-logger, mtl, persistent, persistent-postgresql
-     , persistent-template, scotty, text, time, transformers, wai
-     , wai-extra, warp
+    ({ mkDerivation, aeson, base, criterion, data-default, heroku
+     , hspec, http-types, monad-logger, mtl, persistent
+     , persistent-postgresql, persistent-template, scotty, text, time
+     , transformers, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "hairy";
@@ -79075,6 +80094,9 @@ self: {
        testHaskellDepends = [
          base hspec http-types mtl persistent scotty time wai wai-extra
        ];
+       benchmarkHaskellDepends = [
+         base criterion http-types mtl persistent scotty time wai wai-extra
+       ];
        homepage = "https://github.com/tfausak/hairy";
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
@@ -79083,11 +80105,11 @@ self: {
 
   "hakaru" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, Cabal, cassava
-     , containers, directory, hmatrix, HUnit, integration, logfloat
-     , math-functions, monad-loops, mwc-random, parallel, parsec, pretty
-     , primitive, QuickCheck, random, statistics, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , transformers, vector, zlib
+     , containers, criterion, deepseq, directory, ghc-prim, hmatrix
+     , HUnit, integration, logfloat, math-functions, monad-loops
+     , mwc-random, parallel, parsec, pretty, primitive, QuickCheck
+     , random, statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, transformers, vector, zlib
      }:
      mkDerivation {
        pname = "hakaru";
@@ -79105,6 +80127,7 @@ self: {
          statistics test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
        homepage = "http://indiana.edu/~ppaml/";
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -79391,8 +80414,8 @@ self: {
     ({ mkDerivation, base, hakyll, ogmarkup }:
      mkDerivation {
        pname = "hakyll-ogmarkup";
-       version = "1.0";
-       sha256 = "eee4e2f63409f209f77903cc18c86a68529b46e4af7eaa2497af849a4588ce24";
+       version = "3.0";
+       sha256 = "c7b1584e06384b18d2e1bc07ce55fbfc22c40592f330e4e155be7732bc641021";
        libraryHaskellDepends = [ base hakyll ogmarkup ];
        homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
@@ -79534,8 +80557,8 @@ self: {
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.2";
-       sha256 = "465255836639653f42763d8b04a39840af35bde77b3cdfc53a419a44a96f902d";
+       version = "0.1.3";
+       sha256 = "e80cb5da27691a969de1e9526bfe24cabb3bfa5f170b2af6066885518d6ece65";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79927,6 +80950,8 @@ self: {
        pname = "hans";
        version = "3.0.1";
        sha256 = "24da2418908a3297901c8b7e273b70a44a6b7255659de31b76afa4e3ffcc57ad";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base BoundedChan bytestring cereal containers cryptonite
          hashable heaps memory monadLib psqueues random time unix
@@ -80009,6 +81034,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_0_1" = callPackage
+    ({ mkDerivation, aeson, base, directory, filepath, hspec, mtl
+     , optparse-applicative, path, path-io, process, temporary, time
+     , transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.0.1";
+       sha256 = "ab0da599f2b4cb7208b2bdc349844bedb28141937a4aa0b3546f57b98854a6dc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson base optparse-applicative path path-io yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       homepage = "https://github.com/stackbuilders/hapistrano";
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -80033,6 +81084,8 @@ self: {
        pname = "happindicator3";
        version = "0.2.1";
        sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
        homepage = "https://github.com/mlacorte/happindicator3";
@@ -80117,6 +81170,8 @@ self: {
        pname = "happstack";
        version = "7.0.2";
        sha256 = "d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base happstack-server ];
        doHaddock = false;
        homepage = "http://happstack.com";
@@ -80200,6 +81255,8 @@ self: {
        pname = "happstack-contrib";
        version = "0.2.1";
        sha256 = "e550c0e74b1873ac051a886626f44571cf8543e179096f391f1cbecaa4750d33";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory happstack-data happstack-ixset
          happstack-server happstack-state happstack-util HTTP mtl network
@@ -80222,6 +81279,8 @@ self: {
        sha256 = "889654ad957d43fd719b4f62a97b943beb622bb2f25701ae388d46db2ab1546c";
        revision = "1";
        editedCabalFile = "dbf53b1d5012ac975d184455269f3d631ba2352e9642b707b98465c47225fd06";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers mtl pretty syb syb-with-class
          syb-with-class-instances-text template-haskell text time
@@ -80256,13 +81315,15 @@ self: {
      , filepath, happstack, happstack-data, happstack-hsp
      , happstack-ixset, happstack-server, happstack-state
      , happstack-util, harp, hsp, hsx, html, HTTP, json, mtl, network
-     , old-time, random, RJson, syb, text, time, utf8-string, web-routes
-     , web-routes-mtl
+     , old-time, random, RJson, syb, text, time, trhsx, utf8-string
+     , web-routes, web-routes-mtl
      }:
      mkDerivation {
        pname = "happstack-facebook";
        version = "0.30";
        sha256 = "0c517c663da5323fe6677fa73f8ba862725e1bb813566af63d38ee1f6716cde5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          applicative-extras base bytestring containers filepath happstack
          happstack-data happstack-hsp happstack-ixset happstack-server
@@ -80270,6 +81331,7 @@ self: {
          network old-time random RJson syb text time utf8-string web-routes
          web-routes-mtl
        ];
+       executableToolDepends = [ trhsx ];
        homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
@@ -80440,6 +81502,8 @@ self: {
        pname = "happstack-ixset";
        version = "6.0.1";
        sha256 = "d122eeff5fa0e0321a8a76d2b1ff39f9d99cc70df5dc13be9db970e723b0d0c2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers happstack-data happstack-util mtl syb
          syb-with-class template-haskell
@@ -80591,6 +81655,8 @@ self: {
        pname = "happstack-state";
        version = "6.1.4";
        sha256 = "09f7d8eaa7eec13f99d59b7c5bf7e88b3d2889b6879f0f54731a9c6f4801d7f5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers directory extensible-exceptions
          filepath happstack-data happstack-util hslogger mtl old-time random
@@ -80629,6 +81695,8 @@ self: {
        pname = "happstack-util";
        version = "6.0.3";
        sha256 = "10de089778b70311d290420c7e6ad987da711b1c1961436ccf26c7cf4bd31a43";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring directory extensible-exceptions filepath
          hslogger mtl network old-locale old-time parsec process random
@@ -80976,6 +82044,8 @@ self: {
        pname = "has";
        version = "0.5.0.1";
        sha256 = "5a5cdc8fafbb89a79e6831a707ce303c18edf54e0b389aab9dc6302532e4cd7f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck ];
        homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
@@ -81003,8 +82073,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt";
-       version = "0.1.0.9";
-       sha256 = "8b013b4fc84019eff89ba9d9e1cba86e84cd5570c8acb51aba9b68a958002097";
+       version = "0.1.1.1";
+       sha256 = "c715475ce67d5b311f6dc252d2d2e58cac9a12e417c007e28635c30c8ca619b1";
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 data-default
          hex network network-simple text transformers
@@ -81019,18 +82089,17 @@ self: {
      }) {};
 
   "hascal" = callPackage
-    ({ mkDerivation, base, HUnit, numbers }:
+    ({ mkDerivation, base, data-default, split }:
      mkDerivation {
        pname = "hascal";
-       version = "2.0.0.1";
-       sha256 = "344062494982b809fef504496c7bbacf0932fd7fd35c5b5716c832f1dc4003db";
+       version = "3.0.1";
+       sha256 = "012e1ed3ac556697f5b1c6888bdf0e6cab126a3fa0e01f2f07c52469856a3145";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       executableHaskellDepends = [ base numbers ];
-       testHaskellDepends = [ HUnit ];
-       homepage = "http://darcsden.com/mekeor/hascal";
-       description = "A minimalistic but extensible and precise calculator";
+       libraryHaskellDepends = [ base data-default split ];
+       executableHaskellDepends = [ base data-default split ];
+       homepage = "https://github.com/mekeor/hascal";
+       description = "tiny calculator library and command-line program";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -81043,8 +82112,8 @@ self: {
      }:
      mkDerivation {
        pname = "hascar";
-       version = "0.2.1.0";
-       sha256 = "1a09890e2b3d0955a966a1b7e84995957b44fab8c34c1afaabe7213610d244e1";
+       version = "0.2.1.1";
+       sha256 = "ff801c3a9595b9afa732194b7d992e1b1a264813f04bdf7bb1de097a7b5c4086";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81183,14 +82252,16 @@ self: {
      }) {};
 
   "hashable" = callPackage
-    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
-     , QuickCheck, random, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, unix
+    ({ 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
        ];
@@ -81198,6 +82269,9 @@ self: {
          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;
@@ -81224,7 +82298,7 @@ self: {
      }) {};
 
   "hashable-generics" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable, QuickCheck
+    ({ mkDerivation, base, criterion, ghc-prim, hashable, QuickCheck
      , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
@@ -81236,6 +82310,7 @@ self: {
          base ghc-prim hashable QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
        homepage = "https://github.com/wowus/hashable-generics";
        description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
@@ -81282,6 +82357,8 @@ self: {
        pname = "hashed-storage";
        version = "0.5.11";
        sha256 = "734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers dataenc directory
          extensible-exceptions filepath mmap mtl zlib
@@ -81406,7 +82483,9 @@ self: {
      }) {};
 
   "hashtables-plus" = callPackage
-    ({ mkDerivation, base, hashable, hashtables, loch-th, placeholders
+    ({ mkDerivation, base, criterion-plus, deepseq, hashable
+     , hashtables, lens, loch-th, mtl, mwc-random, placeholders
+     , string-conversions, text, th-printf, transformers
      }:
      mkDerivation {
        pname = "hashtables-plus";
@@ -81415,6 +82494,11 @@ self: {
        libraryHaskellDepends = [
          base hashable hashtables loch-th placeholders
        ];
+       benchmarkHaskellDepends = [
+         base criterion-plus deepseq hashable hashtables lens loch-th mtl
+         mwc-random placeholders string-conversions text th-printf
+         transformers
+       ];
        homepage = "https://github.com/nikita-volkov/hashtables-plus";
        description = "Extensions for a \"hashtables\" library";
        license = stdenv.lib.licenses.mit;
@@ -82173,11 +83257,15 @@ self: {
        pname = "haskell-mpi";
        version = "1.4.0";
        sha256 = "c0aa02ffe77d4a39d5b33e3f846e7615c78b2ddfb6b36c9cdec335edb79488ab";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring cereal extensible-exceptions
        ];
        librarySystemDepends = [ open-pal open-rte openmpi ];
        libraryToolDepends = [ c2hs ];
+       executableSystemDepends = [ open-pal open-rte openmpi ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
@@ -82589,6 +83677,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-time-range" = callPackage
+    ({ mkDerivation, base, doctest, lens, semigroups, text, time }:
+     mkDerivation {
+       pname = "haskell-time-range";
+       version = "0.2.0.0";
+       sha256 = "73c6258304465cd4e243287e7012a9630a6835025104414105c29c9e9f5503c7";
+       libraryHaskellDepends = [ base lens semigroups text time ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/mankyKitty/haskell-time-range#readme";
+       description = "Some useful wrappers and functions for building time ranges";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-token-utils" = callPackage
     ({ mkDerivation, base, containers, Diff, directory, dual-tree, ghc
      , ghc-mod, ghc-paths, ghc-prim, ghc-syb-utils, haskell-src-exts
@@ -82705,10 +83806,10 @@ self: {
      }) {};
 
   "haskell-tools-cli" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , ghc, ghc-paths, haskell-tools-ast, haskell-tools-prettyprint
-     , haskell-tools-refactor, knob, mtl, process, references, split
-     , tasty, tasty-hunit
+    ({ 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, tasty, tasty-hunit, time
      }:
      mkDerivation {
        pname = "haskell-tools-cli";
@@ -82725,6 +83826,9 @@ self: {
        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;
@@ -82984,6 +84088,8 @@ self: {
        pname = "haskell-xmpp";
        version = "1.0.2";
        sha256 = "a9345eb03a7ea0dc4a50af3a916ad2c455fb2232c6d36830afc8e70d6c259dfc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base HaXml html mtl network polyparse pretty random
          regex-compat stm utf8-string
@@ -83887,6 +84993,8 @@ self: {
        pname = "haskore";
        version = "0.2.0.8";
        sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring containers data-accessor event-list
          haskell-src markov-chain midi non-negative parsec process random
@@ -83953,6 +85061,8 @@ self: {
        pname = "haskore-synthesizer";
        version = "0.0.3.3";
        sha256 = "64ddc8bf5a6b5c7f7f0986aada8016c8a09ca21ef3e3320565006bea53a3a4ee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base data-accessor event-list haskore non-negative numeric-prelude
          random synthesizer-core synthesizer-filter utility-ht
@@ -83981,8 +85091,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.2.1";
-       sha256 = "9d369830ac5e146f7b2a2ed584eec732b0da85af00ed7b91a72e208f6ef5144a";
+       version = "0.69.3";
+       sha256 = "4e069aa63c2a7d762332d1acbc12a3d705abdc5e24c06d55129e1a3fd66e5afa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -84031,6 +85141,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasmin" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, doctest
+     , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec
+     , mainland-pretty, matrix, mtl, numbers, optparse-applicative
+     , parsers, QuickCheck, semigroups, text
+     }:
+     mkDerivation {
+       pname = "hasmin";
+       version = "0.3.0.1";
+       sha256 = "b4b7b8fbe3553a2b93de7a7f3a90b9e8a5410a5e79f59db15e1f08ef62777e38";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers mainland-pretty matrix mtl
+         numbers parsers semigroups text
+       ];
+       executableHaskellDepends = [
+         attoparsec base bytestring containers gitrev hopfli mainland-pretty
+         matrix mtl numbers optparse-applicative parsers text
+       ];
+       testHaskellDepends = [
+         attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
+         QuickCheck text
+       ];
+       homepage = "https://github.com/contivero/hasmin/";
+       description = "\"A CSS Minifier\"";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hasparql-client" = callPackage
     ({ mkDerivation, base, HTTP, monads-fd, network, xml }:
      mkDerivation {
@@ -84060,11 +85199,12 @@ self: {
   "hasql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , bytestring-tree-builder, contravariant, contravariant-extras
-     , data-default-class, dlist, either, hashable, hashtables, loch-th
-     , mtl, placeholders, postgresql-binary, postgresql-libpq
-     , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
-     , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, text, time, transformers, uuid, vector
+     , criterion, data-default-class, deepseq, dlist, either, hashable
+     , hashtables, loch-th, mtl, placeholders, postgresql-binary
+     , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances
+     , rebase, rerebase, scientific, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
      }:
      mkDerivation {
        pname = "hasql";
@@ -84081,6 +85221,11 @@ self: {
          data-default-class QuickCheck quickcheck-instances rebase rerebase
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         criterion data-default-class deepseq dlist either hashable
+         profunctors scientific text time transformers uuid vector
+       ];
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
@@ -84246,11 +85391,13 @@ self: {
 
   "hasql-postgres" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , directory, doctest, either, filepath, free, hashable, hashtables
-     , hasql, hasql-backend, hspec, list-t, loch-th, mmorph, mtl-prelude
-     , old-locale, placeholders, postgresql-binary, postgresql-libpq
-     , QuickCheck, quickcheck-instances, scientific, template-haskell
-     , text, time, transformers, uuid, vector
+     , criterion-plus, deepseq, directory, doctest, either, filepath
+     , free, hashable, hashtables, hasql, hasql-backend, HDBC
+     , HDBC-postgresql, hspec, list-t, loch-th, mmorph, monad-control
+     , mtl-prelude, old-locale, placeholders, postgresql-binary
+     , postgresql-libpq, postgresql-simple, QuickCheck
+     , quickcheck-instances, scientific, template-haskell, text, time
+     , transformers, uuid, vector
      }:
      mkDerivation {
        pname = "hasql-postgres";
@@ -84268,6 +85415,11 @@ self: {
          old-locale postgresql-binary QuickCheck quickcheck-instances
          scientific text time vector
        ];
+       benchmarkHaskellDepends = [
+         base-prelude criterion-plus deepseq either hasql hasql-backend HDBC
+         HDBC-postgresql list-t monad-control mtl-prelude postgresql-simple
+         QuickCheck quickcheck-instances scientific text time vector
+       ];
        homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
@@ -84396,6 +85548,8 @@ self: {
        version = "0.5.5.1";
        sha256 = "c93d1dce0f0024ecae56019b1c7a5b68ca37cf32ba7a8ee7b2f248981af4865c";
        configureFlags = [ "-fportable" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers data-binary-ieee754 directory
          filepath ghc ghc-paths ghc-prim monads-tf network network-uri
@@ -84563,10 +85717,10 @@ self: {
 
   "hats" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , conduit, conduit-extra, connection, deepseq, HUnit, network
-     , network-uri, process, QuickCheck, random, stm, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
-     , transformers, unordered-containers
+     , conduit, conduit-extra, connection, criterion, deepseq, HUnit
+     , network, network-uri, process, QuickCheck, random, stm
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "hats";
@@ -84584,6 +85738,9 @@ self: {
          aeson attoparsec base bytestring HUnit process QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [
+         async attoparsec base bytestring criterion random stm
+       ];
        homepage = "https://github.com/kosmoskatten/hats";
        description = "Haskell client for the NATS messaging system";
        license = stdenv.lib.licenses.mit;
@@ -85623,8 +86780,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.0.2";
-       sha256 = "bcaf93d7febb8f04540010b2b0a244030bda1d5002b7cc158bbd05ba5acc9172";
+       version = "0.5.1.0";
+       sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85687,8 +86844,8 @@ self: {
      }) {};
 
   "hdr-histogram" = callPackage
-    ({ mkDerivation, base, deepseq, hspec, primitive, QuickCheck
-     , random, tagged, vector, vector-algorithms
+    ({ mkDerivation, base, criterion, deepseq, hspec, primitive
+     , QuickCheck, random, tagged, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "hdr-histogram";
@@ -85700,6 +86857,7 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck random tagged vector vector-algorithms
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq primitive ];
        homepage = "http://github.com/joshbohde/hdr-histogram#readme";
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
        license = stdenv.lib.licenses.gpl3;
@@ -85839,6 +86997,7 @@ self: {
          async base bytestring HUnit mtl slave-thread stm test-framework
          test-framework-hunit text time
        ];
+       benchmarkHaskellDepends = [ base mtl time ];
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
@@ -85994,12 +87153,12 @@ self: {
 
   "heist" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, blaze-builder
-     , blaze-html, bytestring, containers, directory, directory-tree
-     , dlist, filepath, hashable, HUnit, lens, lifted-base, map-syntax
-     , monad-control, mtl, process, QuickCheck, random, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, transformers-base, unordered-containers, vector
-     , xmlhtml
+     , blaze-html, bytestring, containers, criterion, directory
+     , directory-tree, dlist, filepath, hashable, HUnit, lens
+     , lifted-base, map-syntax, monad-control, mtl, process, QuickCheck
+     , random, statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-base, unordered-containers, vector, xmlhtml
      }:
      mkDerivation {
        pname = "heist";
@@ -86021,6 +87180,13 @@ self: {
          test-framework-quickcheck2 text time transformers transformers-base
          unordered-containers vector xmlhtml
        ];
+       benchmarkHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html bytestring
+         containers criterion directory directory-tree dlist filepath
+         hashable HUnit lifted-base map-syntax monad-control mtl process
+         random statistics test-framework test-framework-hunit text time
+         transformers transformers-base unordered-containers vector xmlhtml
+       ];
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
@@ -86091,6 +87257,8 @@ self: {
        sha256 = "4cbc6fe323dd997d17b7c3724ec229d78209796133611af3379c7e5ab320721a";
        revision = "1";
        editedCabalFile = "698732187d22f634ca220584e3b4056415c873360a85bc0a4ab7c1e2c86fca3d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bytestring-show data-default-class time unix
        ];
@@ -86112,6 +87280,8 @@ self: {
        pname = "helics-wai";
        version = "0.5.1";
        sha256 = "61ac00d92870d2c5cb86fb15bcea21a0522bf12665f35b5c2a300ca7094d2b83";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default-class helics vault wai
        ];
@@ -86359,8 +87529,8 @@ self: {
 
   "hemokit" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cairo
-     , cipher-aes, conduit, deepseq, deepseq-generics, gtk, hidapi
-     , hspec, HUnit, mtl, network-simple, optparse-applicative
+     , cipher-aes, conduit, criterion, deepseq, deepseq-generics, gtk
+     , hidapi, hspec, HUnit, mtl, network-simple, optparse-applicative
      , pretty-show, robot, split, svgcairo, text, time, transformers
      , vector, vector-fftw, websockets
      }:
@@ -86381,6 +87551,7 @@ self: {
          transformers vector vector-fftw websockets
        ];
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
+       benchmarkHaskellDepends = [ base conduit criterion mtl ];
        homepage = "https://github.com/nh2/hemokit";
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
@@ -86727,8 +87898,8 @@ self: {
      }) {};
 
   "hetero-dict" = callPackage
-    ({ mkDerivation, aeson, base, primitive, template-haskell, text
-     , unordered-containers
+    ({ mkDerivation, aeson, base, criterion, deepseq, hvect, primitive
+     , template-haskell, text, unordered-containers, vinyl
      }:
      mkDerivation {
        pname = "hetero-dict";
@@ -86737,6 +87908,9 @@ self: {
        libraryHaskellDepends = [
          aeson base primitive template-haskell text unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq hvect template-haskell vinyl
+       ];
        description = "Fast heterogeneous data structures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87092,9 +88266,12 @@ self: {
        pname = "hfann";
        version = "0.4.2";
        sha256 = "5a25fc2af7f99f1ba0d25394f7f98c657c24aa5d9a193bfdce71981f3311f926";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ doublefann ];
        libraryPkgconfigDepends = [ fann ];
+       executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87402,16 +88579,18 @@ self: {
 
   "hgeometry" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, containers
-     , contravariant, data-clist, deepseq, directory, doctest
-     , fixed-vector, Frames, hexpat, hspec, lens, linear, mtl
-     , optparse-applicative, parsec, QuickCheck, random, semigroupoids
-     , semigroups, singletons, template-haskell, text, time, vector
-     , vinyl
+     , contravariant, criterion, data-clist, deepseq, deepseq-generics
+     , directory, doctest, fixed-vector, Frames, hexpat, hspec, lens
+     , linear, mtl, optparse-applicative, parsec, QuickCheck, random
+     , semigroupoids, semigroups, singletons, template-haskell, text
+     , time, vector, vinyl
      }:
      mkDerivation {
        pname = "hgeometry";
        version = "0.6.0.0";
        sha256 = "328e0e4438b729084b301b22f31d9f880157a5b317eacc48ddcf585d685bf0de";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bifunctors bytestring containers contravariant data-clist
          deepseq directory fixed-vector Frames hexpat lens linear mtl
@@ -87422,6 +88601,10 @@ self: {
          array base bytestring containers data-clist doctest Frames hspec
          lens linear QuickCheck random semigroups vector vinyl
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq deepseq-generics Frames lens QuickCheck
+         semigroups
+       ];
        homepage = "https://fstaals.net/software/hgeometry";
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
@@ -87571,6 +88754,8 @@ self: {
        pname = "hgrib";
        version = "0.3.1.0";
        sha256 = "d3e0d4b1088934c230c566458e327b535733de602aa96ca68fc9236b65e3d73b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ grib_api ];
        libraryToolDepends = [ c2hs ];
@@ -87887,7 +89072,8 @@ self: {
      }) {};
 
   "highjson" = callPackage
-    ({ mkDerivation, aeson, base, hspec, hvect, lens, QuickCheck, text
+    ({ mkDerivation, aeson, base, bytestring, criterion, deepseq, hspec
+     , hvect, lens, QuickCheck, text
      }:
      mkDerivation {
        pname = "highjson";
@@ -87895,6 +89081,9 @@ self: {
        sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962";
        libraryHaskellDepends = [ aeson base hvect lens text ];
        testHaskellDepends = [ aeson base hspec lens QuickCheck text ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/agrafix/highjson";
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
@@ -87965,6 +89154,8 @@ self: {
        pname = "highlighter";
        version = "0.2.2";
        sha256 = "3d88a570d7e682cab28652ebc585a790a9e061c5be1d998573e23dd19e0d68f4";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html bytestring filepath mtl pcre-light text
        ];
@@ -87980,6 +89171,8 @@ self: {
        pname = "highlighter2";
        version = "0.2.5";
        sha256 = "917718f0633c61184c5f768a817002bb8c8138759c846d245e1ea62862ffcdbe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath mtl pcre-light text
        ];
@@ -87997,6 +89190,8 @@ self: {
        version = "0.6.4";
        sha256 = "d8b83385f5da2ea7aa59f28eb860fd7eba0d35a4c36192a5044ee7ea1e001baf";
        configureFlags = [ "-fpcre-light" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html bytestring containers mtl parsec pcre-light
          utf8-string
@@ -88094,10 +89289,10 @@ self: {
      }) {};
 
   "hindent" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, descriptive
-     , Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec
-     , monad-loops, mtl, path, path-io, text, transformers, unix-compat
-     , utf8-string, yaml
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , descriptive, Diff, directory, exceptions, ghc-prim
+     , haskell-src-exts, hspec, monad-loops, mtl, path, path-io, text
+     , transformers, unix-compat, utf8-string, yaml
      }:
      mkDerivation {
        pname = "hindent";
@@ -88118,6 +89313,10 @@ self: {
          base bytestring deepseq Diff directory exceptions haskell-src-exts
          hspec monad-loops mtl utf8-string
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq directory exceptions ghc-prim
+         haskell-src-exts utf8-string
+       ];
        homepage = "http://www.github.com/chrisdone/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
@@ -88374,8 +89573,9 @@ self: {
 
   "hip" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour
-     , deepseq, directory, filepath, hspec, JuicyPixels, netpbm
-     , primitive, process, QuickCheck, repa, temporary, vector
+     , criterion, deepseq, directory, filepath, hspec, JuicyPixels
+     , netpbm, primitive, process, QuickCheck, repa, repa-algorithms
+     , temporary, vector
      }:
      mkDerivation {
        pname = "hip";
@@ -88386,6 +89586,9 @@ self: {
          filepath JuicyPixels netpbm primitive process repa temporary vector
        ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq repa repa-algorithms
+       ];
        homepage = "https://github.com/lehins/hip";
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
@@ -88642,12 +89845,15 @@ self: {
      }) {};
 
   "histogram-fill" = callPackage
-    ({ mkDerivation, base, deepseq, ghc-prim, primitive, vector }:
+    ({ mkDerivation, base, criterion, deepseq, ghc-prim, mwc-random
+     , primitive, vector
+     }:
      mkDerivation {
        pname = "histogram-fill";
        version = "0.8.5.0";
        sha256 = "fbdd167d6f27c0d88f9aa8647ae95a313101c63a827275ac8d016d6028975133";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
@@ -88705,6 +89911,8 @@ self: {
        pname = "hit";
        version = "0.6.3";
        sha256 = "db86b3712029a4e40d1306dd6cc9ca2c9f4c77fe65a2b74106f1cbd2de26e471";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base byteable bytestring containers cryptohash hourglass
          mtl parsec patience random system-fileio system-filepath
@@ -88897,6 +90105,8 @@ self: {
        pname = "hlatex";
        version = "0.3.1";
        sha256 = "1ea8a1097244818b694afd3f71aa2e56e8873b3019d3dcc973885be491a28d8e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols containers derive directory filepath mtl
          process template-haskell transformers uniplate utf8-string
@@ -88973,12 +90183,12 @@ self: {
 
   "hledger" = callPackage
     ({ mkDerivation, base, base-compat, bytestring, cmdargs, containers
-     , csv, data-default, directory, file-embed, filepath, hashable
-     , haskeline, hledger-lib, 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, transformers
-     , unordered-containers, utf8-string, wizards
+     , 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
      }:
      mkDerivation {
        pname = "hledger";
@@ -89010,6 +90220,10 @@ self: {
          test-framework-hunit text time unordered-containers utf8-string
          wizards
        ];
+       benchmarkHaskellDepends = [
+         base base-compat criterion directory file-embed filepath
+         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";
@@ -89414,6 +90628,8 @@ self: {
        sha256 = "8370a8e6d386a8342d9c4a683b3c085890ee092e95549737ccf26b4fc62fba8d";
        revision = "1";
        editedCabalFile = "5375f1b11a455cfd90aeedf16499c79fc541857e7c73d4bdb41a704f2a561283";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base stm transformers unix X11 ];
        homepage = "https://github.com/hpdeifel/hlwm-haskell";
        description = "Bindings to the herbstluftwm window manager";
@@ -89579,6 +90795,8 @@ self: {
        pname = "hmatrix-nipals";
        version = "0.2";
        sha256 = "322bdf452889dbaeccca42e28afb3ebd85bf594da754cdee2a1f43121dbfd529";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
@@ -89643,13 +90861,16 @@ self: {
      }) {};
 
   "hmatrix-svdlibc" = callPackage
-    ({ mkDerivation, base, hmatrix, hspec, QuickCheck, vector }:
+    ({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck
+     , vector
+     }:
      mkDerivation {
        pname = "hmatrix-svdlibc";
        version = "0.4.0";
        sha256 = "774504e862542f90441701122638c4ce11aa94792d270045eb0f0997e6f874a2";
        libraryHaskellDepends = [ base hmatrix vector ];
        testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
+       benchmarkHaskellDepends = [ base criterion hmatrix vector ];
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -89684,6 +90905,7 @@ self: {
          base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random
        ];
        testHaskellDepends = [ base HUnit QuickCheck random ];
+       benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
@@ -89947,9 +91169,10 @@ self: {
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix
-     , deepseq, deriving-compat, parsers, semigroups, tasty, tasty-hunit
-     , tasty-th, text, transformers, trifecta, unordered-containers
+    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
+     , data-fix, deepseq, deriving-compat, parsers, semigroups, tasty
+     , tasty-hunit, tasty-th, text, transformers, trifecta
+     , unordered-containers
      }:
      mkDerivation {
        pname = "hnix";
@@ -89967,6 +91190,7 @@ self: {
        testHaskellDepends = [
          base containers data-fix tasty tasty-hunit tasty-th text
        ];
+       benchmarkHaskellDepends = [ base containers criterion text ];
        homepage = "http://github.com/jwiegley/hnix";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
@@ -90045,6 +91269,8 @@ self: {
        pname = "hoauth2";
        version = "0.5.7";
        sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
          unordered-containers
@@ -90062,6 +91288,8 @@ self: {
        pname = "hoauth2";
        version = "0.5.8";
        sha256 = "caacec1259455de9d1cb78c38fe8ca4dabc901e5b9fd8a9e7d17eaca0a820e60";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types text
          unordered-containers
@@ -91006,8 +92234,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-docs";
-       version = "0.3.0";
-       sha256 = "e6663e8654fe93daa5a4628219eea03e2b6f31d7894a9f7c4180f43f92921d8f";
+       version = "0.3.1";
+       sha256 = "be94bd36afde578e202b39f865a9f342acc97367bfaf942b49cd2bd19aee9b96";
        libraryHaskellDepends = [
          base haskell-src hoppy-generator hoppy-runtime
        ];
@@ -91023,8 +92251,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-generator";
-       version = "0.3.1";
-       sha256 = "162598c04c1e977b666c491dfb34451c43c08354427d9ed806b81169d6dd9c80";
+       version = "0.3.2";
+       sha256 = "eaf41f874e0d26720c374430798e77e2f334de7936b313546b2293bb9c3767eb";
        libraryHaskellDepends = [
          base containers directory filepath haskell-src mtl
        ];
@@ -91164,8 +92392,8 @@ self: {
      }) {};
 
   "hosc" = callPackage
-    ({ mkDerivation, base, binary, blaze-builder, bytestring
-     , data-binary-ieee754, network, QuickCheck, test-framework
+    ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion
+     , data-binary-ieee754, deepseq, network, QuickCheck, test-framework
      , test-framework-quickcheck2, time, transformers
      }:
      mkDerivation {
@@ -91180,6 +92408,7 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "http://rd.slavepianos.org/t/hosc";
        description = "Haskell Open Sound Control";
        license = "GPL";
@@ -91298,8 +92527,8 @@ self: {
      }) {};
 
   "hourglass" = callPackage
-    ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit
-     , tasty-quickcheck, time
+    ({ mkDerivation, base, bytestring, criterion, deepseq, mtl
+     , old-locale, tasty, tasty-hunit, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "hourglass";
@@ -91309,6 +92538,9 @@ self: {
        testHaskellDepends = [
          base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq mtl old-locale time
+       ];
        homepage = "https://github.com/vincenthz/hs-hourglass";
        description = "simple performant time related library";
        license = stdenv.lib.licenses.bsd3;
@@ -91756,8 +92988,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpio";
-       version = "0.8.0.6";
-       sha256 = "3e46024f61f4dda52e5edafa3bbcab1d2dfe7f5f68a32c6f8480cecfd864cb94";
+       version = "0.8.0.7";
+       sha256 = "a003f549f3d7b44c87980fc31cdf5083c7cfd8ad651d5e4cd56448d67a8ee630";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91967,6 +93199,8 @@ self: {
        pname = "hps";
        version = "0.15";
        sha256 = "30df792e10ce0a2d2886ce5b6b081e95640cc00d02d9f2aa6426e7919eccb54e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hcg-minus ];
        homepage = "http://rd.slavepianos.org/?t=hps";
        description = "Haskell Postscript";
@@ -92222,8 +93456,8 @@ self: {
      }) {};
 
   "hs-blake2" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-arbitrary, libb2
-     , QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
+     , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "hs-blake2";
@@ -92236,6 +93470,8 @@ self: {
          tasty-quickcheck
        ];
        testSystemDepends = [ libb2 ];
+       benchmarkHaskellDepends = [ base bytestring criterion cryptohash ];
+       benchmarkSystemDepends = [ libb2 ];
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
@@ -92754,8 +93990,9 @@ self: {
      }) {};
 
   "hs2048" = callPackage
-    ({ mkDerivation, base, doctest, Glob, hlint, hspec, HUnit, process
-     , QuickCheck, random, regex-compat
+    ({ mkDerivation, base, criterion, doctest, Glob, hastache, hlint
+     , hspec, HUnit, process, QuickCheck, random, regex-compat
+     , statistics
      }:
      mkDerivation {
        pname = "hs2048";
@@ -92769,6 +94006,9 @@ self: {
          base doctest Glob hlint hspec HUnit process QuickCheck random
          regex-compat
        ];
+       benchmarkHaskellDepends = [
+         base criterion hastache random statistics
+       ];
        homepage = "https://github.com/tfausak/hs2048";
        description = "A 2048 clone in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -93223,6 +94463,8 @@ self: {
        pname = "hsc3-process";
        version = "0.10.0";
        sha256 = "ace3a309858541f5ec377403391d71176653601bcac3fa69adfa9576a74ae6c0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers data-default directory filepath hosc
          hsc3 process time time-compat transformers
@@ -93273,6 +94515,8 @@ self: {
        pname = "hsc3-server";
        version = "0.10.0";
        sha256 = "57bcb588adc0cabc5114919c32c240be63de704545b4803ac44e447364059c02";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bitset bytestring containers data-default failure hashtables
          hosc hsc3 hsc3-process lifted-base ListZipper monad-control
@@ -93556,10 +94800,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.2.1.0";
-       sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794";
-       revision = "1";
-       editedCabalFile = "2ed64491515bb9af5b43ee11a203925987797d5492a3c143a37ad6eae8a7c8f6";
+       version = "0.2.2.0";
+       sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93622,6 +94864,8 @@ self: {
        pname = "hsdns";
        version = "1.7";
        sha256 = "48960ac9e1f0d1e338170aac35f6fd7e064a3b36314894f4a968113385205cd3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
        homepage = "http://github.com/peti/hsdns";
@@ -94497,8 +95741,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.4.1";
-       sha256 = "c6d29aea545769b116e14ca7ca2c64d7e18649fc792adb98623b119d3a80f6da";
+       version = "2.4.2";
+       sha256 = "48b7e342c0990ae38373acbb7cac5a2ef9b1bb2cca8bdf41a896f1593e677484";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -94565,8 +95809,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.4.1";
-       sha256 = "b2ea5b6a37542fa138060085ee7bf82ab0ab130f2c287a57ae05a4f83ae437da";
+       version = "2.4.2";
+       sha256 = "393ba143901824579b736fb4313c7e07e57eda45580e657bf24d1b1c32c0a318";
        libraryHaskellDepends = [
          ansi-terminal array async base call-stack deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -94587,8 +95831,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.4.1";
-       sha256 = "e0670831f06a8924779cc81d4eb706b35d3a7176cba6bee5df506de961e8d5f3";
+       version = "2.4.2";
+       sha256 = "8c9ad7bc21eabcc28526e8fd8e12927c0d659c9b3179e665c30b175fa5011d2c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -95884,6 +97128,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) taglib;};
 
+  "htaglib_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, hspec
+     , taglib, text, transformers
+     }:
+     mkDerivation {
+       pname = "htaglib";
+       version = "1.1.0";
+       sha256 = "e2d2c9df136823d4c88f5e6f2c8053a713e326ec2b0de9e0e00410997c99ff00";
+       libraryHaskellDepends = [ base bytestring text transformers ];
+       librarySystemDepends = [ taglib ];
+       testHaskellDepends = [ base directory filepath hspec ];
+       homepage = "https://github.com/mrkkrp/htaglib";
+       description = "Bindings to TagLib, audio meta-data library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) taglib;};
+
   "htags" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell-src, mtl }:
      mkDerivation {
@@ -96009,7 +97270,7 @@ self: {
      }) {};
 
   "html-email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, hspec, QuickCheck
+    ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck
      , regex-pcre-builtin, text
      }:
      mkDerivation {
@@ -96020,6 +97281,7 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec QuickCheck regex-pcre-builtin text
        ];
+       benchmarkHaskellDepends = [ base criterion text ];
        description = "Validating an email address against HTML standard";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96068,12 +97330,17 @@ self: {
      }) {};
 
   "html-parse" = callPackage
-    ({ mkDerivation, attoparsec, base, deepseq, text }:
+    ({ mkDerivation, attoparsec, base, criterion, deepseq, tagsoup
+     , text
+     }:
      mkDerivation {
        pname = "html-parse";
        version = "0.2.0.0";
        sha256 = "9c9f8401dc86ea3a9612bfc0d430a03b7e9130183f0b8dc1fa100cd0bbb84a92";
        libraryHaskellDepends = [ attoparsec base deepseq text ];
+       benchmarkHaskellDepends = [
+         attoparsec base criterion deepseq tagsoup text
+       ];
        homepage = "http://github.com/bgamari/html-parse";
        description = "A high-performance HTML tokenizer";
        license = stdenv.lib.licenses.bsd3;
@@ -96147,12 +97414,15 @@ self: {
      }) {};
 
   "html5-entity" = callPackage
-    ({ mkDerivation, base, containers, text }:
+    ({ mkDerivation, base, containers, criterion, text }:
      mkDerivation {
        pname = "html5-entity";
        version = "0.2.0.3";
        sha256 = "2e067939e2c7d1a204ee219651f6c31205eed3ff6f43e0852ffc5bd5a1feb52e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers text ];
+       benchmarkHaskellDepends = [ base containers criterion ];
        homepage = "https://github.com/zudov/html5-entity/";
        description = "A library for looking up and validating HTML5 entities";
        license = stdenv.lib.licenses.bsd3;
@@ -96186,9 +97456,9 @@ self: {
      }) {};
 
   "htoml" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, file-embed
-     , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , file-embed, old-locale, parsec, tasty, tasty-hspec, tasty-hunit
+     , text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "htoml";
@@ -96202,6 +97472,10 @@ self: {
          aeson base bytestring containers file-embed parsec tasty
          tasty-hspec tasty-hunit text time unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base containers criterion parsec text time
+         unordered-containers vector
+       ];
        homepage = "https://github.com/cies/htoml";
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
@@ -96355,8 +97629,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.5.5";
-       sha256 = "d1fdda6035e0bab95d3294f5175ac8c3629f9cd1d32e1bce5d0aa27226751c85";
+       version = "0.5.6.1";
+       sha256 = "2c304337b88ea48cf4b1c4e4ac12ec48c5f3a241f3ab44a57965c1d9d06a2bed";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie deepseq exceptions filepath
@@ -96375,36 +97649,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "http-client_0_5_6" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , deepseq, directory, exceptions, filepath, ghc-prim, hspec
-     , http-types, mime-types, monad-control, network, network-uri
-     , random, streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.5.6";
-       sha256 = "514271d83fff7169a493111105e77ea93d11b562effa840c47117a3db912216a";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie deepseq exceptions filepath
-         ghc-prim http-types mime-types network network-uri random
-         streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "http-client-auth" = callPackage
     ({ mkDerivation, base, base64-string, blaze-builder, bytestring
      , case-insensitive, conduit, crypto-conduit, http-client
@@ -96539,19 +97783,21 @@ self: {
 
   "http-client-tls" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
-     , cryptonite, data-default-class, exceptions, hspec, http-client
-     , http-types, memory, network, tls, transformers
+     , containers, criterion, cryptonite, data-default-class, exceptions
+     , hspec, http-client, http-types, memory, network, network-uri
+     , text, tls, transformers
      }:
      mkDerivation {
        pname = "http-client-tls";
-       version = "0.3.3.1";
-       sha256 = "56317378785688a129fdc7abdf5d721fe15e46178f89f457878aa3acd1ac7d12";
+       version = "0.3.4";
+       sha256 = "37693b0ebcfa6ce796abf39647ff4df17361ab1ab1f999ac10faba67d3042bc1";
        libraryHaskellDepends = [
-         base bytestring case-insensitive connection cryptonite
+         base bytestring case-insensitive connection containers cryptonite
          data-default-class exceptions http-client http-types memory network
-         tls transformers
+         network-uri text tls transformers
        ];
        testHaskellDepends = [ base hspec http-client http-types ];
+       benchmarkHaskellDepends = [ base criterion http-client ];
        doCheck = false;
        homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
@@ -96586,8 +97832,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-conduit";
-       version = "2.2.3";
-       sha256 = "eee51e80fe76b3bf4b4041545f452e126e0593f70a0623a5a35ee47d72fe0dc3";
+       version = "2.2.3.1";
+       sha256 = "53ae16c601f980f323f2b24a32a776f9867b6b595e6e1929d440d1549715ca0e";
        libraryHaskellDepends = [
          aeson base bytestring conduit conduit-extra exceptions http-client
          http-client-tls http-types lifted-base monad-control mtl resourcet
@@ -96718,6 +97964,8 @@ self: {
        pname = "http-enumerator";
        version = "0.7.3.3";
        sha256 = "463f4a7086ee9226ad882ddeb51d5086b237204ef2e0780e1c544eb2debd8283";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          asn1-data attoparsec attoparsec-enumerator base base64-bytestring
          blaze-builder blaze-builder-enumerator bytestring case-insensitive
@@ -96731,6 +97979,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-grammar" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring }:
+     mkDerivation {
+       pname = "http-grammar";
+       version = "0.1.0.0";
+       sha256 = "47d093d24dacfda6880b2f920768323bd292fdebc70ad24d90eb2977b81d07f4";
+       libraryHaskellDepends = [ attoparsec base bytestring ];
+       homepage = "https://github.com/owensmurray/http-grammar";
+       description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "http-kinder" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
      , containers, http-media, http-types, HUnit, QuickCheck, singletons
@@ -96775,8 +98035,9 @@ self: {
 
   "http-link-header" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring
-     , bytestring-conversion, errors, hspec, hspec-attoparsec
-     , http-api-data, network-uri, QuickCheck, text
+     , bytestring-conversion, criterion, directory, errors, hspec
+     , hspec-attoparsec, http-api-data, network-uri, QuickCheck, text
+     , transformers
      }:
      mkDerivation {
        pname = "http-link-header";
@@ -96789,6 +98050,9 @@ self: {
        testHaskellDepends = [
          base hspec hspec-attoparsec QuickCheck text
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory network-uri text transformers
+       ];
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
@@ -96841,6 +98105,8 @@ self: {
        pname = "http-monad";
        version = "0.1.1.1";
        sha256 = "ad3ea0bc4a95cf66b442d69084f99906e79bcd431ae1c0eb0237fb1ee7276355";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers explicit-exception HTTP lazyio network
          network-uri parsec transformers utility-ht
@@ -97041,6 +98307,8 @@ self: {
        pname = "http-shed";
        version = "0.1";
        sha256 = "bb31968733cbe9d369c651b166f1ecbac9d325c371a9b2fd9723f79953224b2b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
@@ -97156,14 +98424,17 @@ self: {
 
   "http2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
-     , bytestring-builder, case-insensitive, containers, directory
-     , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
-     , unordered-containers, vector, word8
+     , bytestring-builder, case-insensitive, containers, criterion
+     , directory, doctest, filepath, Glob, hashtables, heaps, hex, hspec
+     , mwc-random, psqueues, stm, text, unordered-containers, vector
+     , word8
      }:
      mkDerivation {
        pname = "http2";
        version = "1.6.3";
        sha256 = "61620eca0f57875a6a9bd24f9cc04c301b5c3c668bf98f85e9989aad5d069c43";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring bytestring-builder case-insensitive
          containers psqueues stm
@@ -97173,6 +98444,10 @@ self: {
          case-insensitive containers directory doctest filepath Glob hex
          hspec psqueues stm text unordered-containers vector word8
        ];
+       benchmarkHaskellDepends = [
+         array base bytestring case-insensitive containers criterion
+         hashtables heaps mwc-random psqueues stm
+       ];
        homepage = "https://github.com/kazu-yamamoto/http2";
        description = "HTTP/2 library including frames, priority queues and HPACK";
        license = stdenv.lib.licenses.bsd3;
@@ -97184,6 +98459,8 @@ self: {
        pname = "httpd-shed";
        version = "0.4.0.3";
        sha256 = "b0ff87d81e61f788d3920d952e4469d984742ba49c006df086c159886bf09218";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base network network-uri ];
        description = "A simple web-server with an interact style API";
        license = stdenv.lib.licenses.bsd3;
@@ -97425,13 +98702,14 @@ self: {
      }) {};
 
   "human-readable-duration" = callPackage
-    ({ mkDerivation, base, doctest, Glob }:
+    ({ mkDerivation, base, criterion, doctest, Glob }:
      mkDerivation {
        pname = "human-readable-duration";
        version = "0.2.0.3";
        sha256 = "93f3a91a2994588728ae757dcca5104e18a570b3591773aa7f03c524c97599da";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/yogsototh/human-readable-duration#readme";
        description = "Provide duration helper";
        license = stdenv.lib.licenses.bsd3;
@@ -97496,6 +98774,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_0_4_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit, random }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "0.4.0.0";
+       sha256 = "70c53e26261d0075807635c135ead2a8b96a5fec004e9f50ee9043ead136e216";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit random ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -97825,8 +99116,8 @@ self: {
      }) {};
 
   "hw-balancedparens" = callPackage
-    ({ mkDerivation, base, hspec, hw-bits, hw-excess, hw-prim
-     , hw-rankselect-base, QuickCheck, vector
+    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
+     , hw-prim, hw-rankselect-base, QuickCheck, vector
      }:
      mkDerivation {
        pname = "hw-balancedparens";
@@ -97838,6 +99129,9 @@ self: {
        testHaskellDepends = [
          base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion hw-bits hw-prim vector
+       ];
        homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
@@ -97845,8 +99139,8 @@ self: {
      }) {};
 
   "hw-bits" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim
-     , hw-string-parse, QuickCheck, safe, vector
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
+     , hw-prim, hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-bits";
@@ -97858,6 +99152,7 @@ self: {
        testHaskellDepends = [
          base bytestring hspec hw-prim QuickCheck vector
        ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
        homepage = "http://github.com/haskell-works/hw-bits#readme";
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
@@ -97866,7 +99161,7 @@ self: {
 
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec
-     , hw-bits, resourcet, word8
+     , hw-bits, mmap, resourcet, vector, word8
      }:
      mkDerivation {
        pname = "hw-conduit";
@@ -97879,6 +99174,9 @@ self: {
        ];
        executableHaskellDepends = [ base criterion ];
        testHaskellDepends = [ base bytestring 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;
@@ -97981,6 +99279,11 @@ self: {
          hw-rankselect-base mmap parsec QuickCheck resourcet transformers
          vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion hw-balancedparens hw-bits
+         hw-conduit hw-prim hw-rankselect hw-rankselect-base mmap resourcet
+         vector
+       ];
        homepage = "http://github.com/haskell-works/hw-json#readme";
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
@@ -97989,11 +99292,11 @@ self: {
 
   "hw-json-lens" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
-     , bytestring, conduit, containers, dlist, hspec, hw-balancedparens
-     , hw-bits, hw-conduit, hw-diagnostics, hw-json, hw-parser, hw-prim
-     , hw-rankselect, lens, mmap, mono-traversable, parsec, QuickCheck
-     , resourcet, scientific, text, transformers, unordered-containers
-     , vector, word8
+     , bytestring, conduit, containers, criterion, dlist, hspec
+     , hw-balancedparens, hw-bits, hw-conduit, hw-diagnostics, hw-json
+     , hw-parser, hw-prim, hw-rankselect, lens, mmap, mono-traversable
+     , parsec, QuickCheck, resourcet, scientific, text, transformers
+     , unordered-containers, vector, word8
      }:
      mkDerivation {
        pname = "hw-json-lens";
@@ -98011,6 +99314,11 @@ self: {
          lens mmap parsec QuickCheck resourcet scientific transformers
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion hw-bits hw-conduit hw-prim
+         hw-rankselect lens mmap resourcet scientific unordered-containers
+         vector
+       ];
        homepage = "http://github.com/haskell-works/hw-json-lens#readme";
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
@@ -98024,8 +99332,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "1.1.1";
-       sha256 = "be1ae93a00f627052a5f6c2d87bf26b531d59c737d69db6d0717cf0ef1b03402";
+       version = "1.1.2";
+       sha256 = "d96a9cfb09a10a1c4526a9a910f7212692c36c138bf5594468a5699f6f0ebb78";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -98158,7 +99466,7 @@ self: {
      }) {};
 
   "hw-rankselect-base" = callPackage
-    ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-prim
+    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
@@ -98171,6 +99479,9 @@ self: {
        testHaskellDepends = [
          base hspec hw-bits hw-prim QuickCheck vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion hw-bits hw-prim vector
+       ];
        homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
@@ -98256,6 +99567,10 @@ self: {
          hw-rankselect-base mmap parsec QuickCheck resourcet transformers
          vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion hw-balancedparens hw-bits
+         hw-conduit hw-prim hw-rankselect mmap resourcet vector
+       ];
        homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
@@ -98282,8 +99597,8 @@ self: {
      }) {};
 
   "hweblib" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, HUnit
-     , mtl, text, transformers
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, HUnit, mtl, text, transformers
      }:
      mkDerivation {
        pname = "hweblib";
@@ -98295,6 +99610,10 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring containers HUnit mtl transformers
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring containers criterion HUnit mtl
+         transformers
+       ];
        homepage = "http://github.com/aycanirican/hweblib";
        description = "Haskell Web Library";
        license = stdenv.lib.licenses.bsd3;
@@ -98363,8 +99682,8 @@ self: {
      }) {};
 
   "hwsl2" = callPackage
-    ({ mkDerivation, base, bytestring, quickcheck-properties, tasty
-     , tasty-quickcheck
+    ({ mkDerivation, base, bytestring, Cabal, criterion, cryptohash
+     , parallel, quickcheck-properties, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "hwsl2";
@@ -98374,6 +99693,9 @@ self: {
        testHaskellDepends = [
          base bytestring quickcheck-properties tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring Cabal criterion cryptohash parallel
+       ];
        homepage = "https://github.com/srijs/hwsl2";
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
@@ -98536,6 +99858,8 @@ self: {
        pname = "hxt-css";
        version = "0.1.0.3";
        sha256 = "0244fc145d5923df0522ad80949e9b221b01a028c755ebfc4740339881ef65b7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
@@ -98628,8 +99952,8 @@ self: {
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, hxt-charproperties
-     , parsec, text
+    ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit
+     , hxt-charproperties, parsec, text
      }:
      mkDerivation {
        pname = "hxt-regex-xmlschema";
@@ -98639,6 +99963,9 @@ self: {
          base bytestring hxt-charproperties parsec text
        ];
        testHaskellDepends = [ base bytestring HUnit parsec text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq parsec text
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.mit;
@@ -99736,22 +101063,28 @@ self: {
      }) {};
 
   "identicon" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, JuicyPixels }:
+    ({ 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;
      }) {};
 
   "identifiers" = callPackage
-    ({ mkDerivation, base, binary, cereal, containers, deepseq
-     , hashable, ListLike, QuickCheck, test-framework
-     , test-framework-quickcheck2, text, unordered-containers
+    ({ mkDerivation, base, binary, bytestring, cereal, containers
+     , criterion, deepseq, hashable, ListLike, QuickCheck
+     , test-framework, test-framework-quickcheck2, text
+     , unordered-containers
      }:
      mkDerivation {
        pname = "identifiers";
@@ -99764,6 +101097,9 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring cereal criterion deepseq text
+       ];
        description = "Numeric identifiers for values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100376,13 +101712,17 @@ self: {
      }) {};
 
   "ilist" = callPackage
-    ({ mkDerivation, base, hspec, transformers }:
+    ({ mkDerivation, base, criterion, hspec, lens, transformers, vector
+     }:
      mkDerivation {
        pname = "ilist";
        version = "0.2.0.0";
        sha256 = "ffbfab4804e01a4b36caa3f75d77535084d6165ed6c92c0df4329b9238e03cef";
        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;
@@ -100445,10 +101785,13 @@ self: {
        pname = "imagemagick";
        version = "0.0.4.2";
        sha256 = "1956fd48139c43e73528c358021595c1b867abb6fba8bc0334770f74d4089178";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring filepath resourcet text transformers vector
        ];
        libraryPkgconfigDepends = [ imagemagick ];
+       executablePkgconfigDepends = [ imagemagick ];
        testHaskellDepends = [
          base bytestring directory filepath lifted-base QuickCheck resourcet
          tasty tasty-hunit text transformers vector
@@ -100712,8 +102055,8 @@ self: {
     ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg
      , bytestring, containers, criterion, deepseq, directory, download
      , filepath, hspec, JuicyPixels, monads-tf, mtl, NumInstances
-     , optparse-applicative, parallel, parsec, silently, snap-core
-     , snap-server, storable-endian, text, transformers
+     , optparse-applicative, parallel, parsec, random, silently
+     , snap-core, snap-server, storable-endian, text, transformers
      , unordered-containers, vector-space
      }:
      mkDerivation {
@@ -100735,6 +102078,7 @@ self: {
          storable-endian text transformers vector-space
        ];
        testHaskellDepends = [ base containers hspec mtl parsec ];
+       benchmarkHaskellDepends = [ base criterion parsec random ];
        homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable";
        description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
        license = stdenv.lib.licenses.agpl3;
@@ -100878,7 +102222,9 @@ self: {
      }) {};
 
   "include-file" = callPackage
-    ({ mkDerivation, base, bytestring, random, template-haskell }:
+    ({ mkDerivation, base, bytestring, criterion, random
+     , template-haskell
+     }:
      mkDerivation {
        pname = "include-file";
        version = "0.1.0.3";
@@ -100887,13 +102233,15 @@ self: {
          base bytestring random template-haskell
        ];
        testHaskellDepends = [ base bytestring ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "incremental-computing" = callPackage
     ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
-     , dlist, fingertree, order-maintenance, QuickCheck, transformers
+     , deepseq, dlist, fingertree, order-maintenance, QuickCheck
+     , transformers
      }:
      mkDerivation {
        pname = "incremental-computing";
@@ -100905,6 +102253,7 @@ self: {
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck
        ];
+       benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
@@ -100912,8 +102261,9 @@ self: {
      }) {};
 
   "incremental-maps" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
-     , dlist, fingertree, order-maintenance, QuickCheck, transformers
+    ({ mkDerivation, aeson, base, Cabal, cabal-test-quickcheck
+     , containers, criterion, deepseq, deepseq-generics, dlist
+     , fingertree, order-maintenance, QuickCheck, transformers
      }:
      mkDerivation {
        pname = "incremental-maps";
@@ -100925,14 +102275,18 @@ self: {
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         aeson base containers criterion deepseq deepseq-generics dlist
+         QuickCheck
+       ];
        description = "Package for doing incremental computations on maps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-parser" = callPackage
-    ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck
-     , tasty, tasty-quickcheck
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "incremental-parser";
@@ -100942,6 +102296,9 @@ self: {
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = "GPL";
@@ -101046,6 +102403,8 @@ self: {
        pname = "indentparser";
        version = "0.1";
        sha256 = "5c1dd6eeeb8fb5e136528df6ffb7c0041e708b63f0bcd4e55fa297d960fd2b90";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.cse.iitk.ac.in/users/ppk/code/HASKELL/indentparser";
        description = "A parser for indentation based structures";
@@ -101128,6 +102487,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "indextype" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "indextype";
+       version = "0.1.0.0";
+       sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498";
+       revision = "1";
+       editedCabalFile = "382507ce3407fd6b5c60eee31675c52dc3bdc192dc4132f7c6e7047021fa0ef2";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "A series of type families and constraints for \"indexable\" types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "indian-language-font-converter" = callPackage
     ({ mkDerivation, base, gtk, HDBC, HDBC-sqlite3 }:
      mkDerivation {
@@ -101140,13 +102513,16 @@ self: {
      }) {};
 
   "indices" = callPackage
-    ({ mkDerivation, base, QuickCheck, tagged, template-haskell }:
+    ({ mkDerivation, base, criterion, deepseq, QuickCheck, tagged
+     , template-haskell
+     }:
      mkDerivation {
        pname = "indices";
        version = "1.7.1";
        sha256 = "8505d262f5ae056e83be32084d93bb1472194c4c4d2b8e442fb3c5845f02c6eb";
        libraryHaskellDepends = [ base tagged template-haskell ];
        testHaskellDepends = [ base QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101318,6 +102694,8 @@ self: {
        pname = "influxdb";
        version = "0.10.0";
        sha256 = "063754458bbceb4a89e70c26a979f47e2c632a0ccaf93b53360870d44c5268bb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers data-default-class
          dlist exceptions http-client mtl network-uri retry scientific
@@ -101443,19 +102821,23 @@ self: {
 
   "inline-c" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring
-     , containers, cryptohash, directory, filepath, hashable, hspec, mtl
-     , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix
-     , template-haskell, transformers, unordered-containers, vector
+     , containers, cryptohash, directory, filepath, gsl, gslcblas
+     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
+     , regex-posix, template-haskell, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "inline-c";
        version = "0.5.6.1";
        sha256 = "2daf717e6fc0046ccb6563557825fe26fcdc327c55b9771aa7b4c51473e6eb4e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring containers cryptohash
          directory filepath hashable mtl parsec parsers QuickCheck
          template-haskell transformers unordered-containers vector
        ];
+       executableSystemDepends = [ gsl gslcblas ];
        testHaskellDepends = [
          ansi-wl-pprint base containers hashable hspec parsers QuickCheck
          raw-strings-qq regex-posix template-haskell transformers
@@ -101463,7 +102845,7 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-     }) {};
+     }) {inherit (pkgs) gsl; gslcblas = null;};
 
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
@@ -101518,14 +102900,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "inline-java_0_6_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, containers
+     , directory, distributed-closure, filepath, ghc-heap-view, hspec
+     , inline-c, jni, jvm, language-java, process, singletons, syb
+     , template-haskell, temporary, text, thread-local-storage, vector
+     }:
+     mkDerivation {
+       pname = "inline-java";
+       version = "0.6.2";
+       sha256 = "9c162f26c77d1030f0f5054394265aab7fded1c83df67b3ea8fe7e4bb68aa8c5";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal containers directory
+         distributed-closure filepath ghc-heap-view inline-c jni jvm
+         language-java process singletons syb template-haskell temporary
+         text thread-local-storage vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec jni jvm singletons text
+       ];
+       homepage = "http://github.com/tweag/inline-java#readme";
+       description = "Java interop via inline Java code in Haskell modules";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-r" = callPackage
     ({ mkDerivation, aeson, base, bytestring, c2hs, containers
-     , data-default-class, deepseq, directory, exceptions, filepath
-     , ieee754, mtl, pretty, primitive, process, quickcheck-assertions
-     , R, reflection, setenv, silently, singletons, strict, tasty
-     , tasty-expected-failure, tasty-golden, tasty-hunit
-     , tasty-quickcheck, template-haskell, temporary, text, th-lift
-     , th-orphans, transformers, unix, vector
+     , criterion, data-default-class, deepseq, directory, exceptions
+     , filepath, ieee754, mtl, pretty, primitive, process
+     , quickcheck-assertions, R, reflection, setenv, silently
+     , singletons, strict, tasty, tasty-expected-failure, tasty-golden
+     , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text
+     , th-lift, th-orphans, transformers, unix, vector
      }:
      mkDerivation {
        pname = "inline-r";
@@ -101545,6 +102952,10 @@ self: {
          tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
          template-haskell temporary text unix vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion filepath primitive process singletons
+         template-haskell vector
+       ];
        homepage = "https://tweag.github.io/HaskellR";
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
@@ -102128,6 +103539,8 @@ self: {
        pname = "interpolation";
        version = "0.1";
        sha256 = "cad3e655c9893007058dfd8b128195a15434f0759e447c78722fb50aa50337fa";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [
          array base containers QuickCheck utility-ht
@@ -102338,18 +103751,17 @@ self: {
      }) {};
 
   "invertible" = callPackage
-    ({ mkDerivation, arrows, base, haskell-src-meta, HList, invariant
-     , lens, partial-isomorphisms, Piso, QuickCheck, semigroupoids
-     , template-haskell, transformers, TypeCompose
+    ({ mkDerivation, base, haskell-src-meta, invariant, lens
+     , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
+     , transformers, TypeCompose
      }:
      mkDerivation {
        pname = "invertible";
-       version = "0.2.0";
-       sha256 = "3da08f518924925a547e954821eb96f15b4ecf47d541fa5770d38180963db19e";
+       version = "0.2.0.2";
+       sha256 = "eee1b66f20190b5cc87122e22c664422df4188b38f81e896e8381bf2f58385a8";
        libraryHaskellDepends = [
-         arrows base haskell-src-meta HList invariant lens
-         partial-isomorphisms Piso semigroupoids template-haskell
-         transformers TypeCompose
+         base haskell-src-meta invariant lens partial-isomorphisms
+         semigroupoids template-haskell transformers TypeCompose
        ];
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
@@ -102651,16 +104063,14 @@ self: {
      }) {};
 
   "ip" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, doctest
-     , hashable, HUnit, primitive, QuickCheck, test-framework
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , doctest, hashable, HUnit, primitive, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text, vector
      }:
      mkDerivation {
        pname = "ip";
-       version = "0.8.7";
-       sha256 = "f33f12745defa0ac5aa72f8bfd1b48d905c6ece9a228c9a2209b2943c2f2c690";
-       revision = "2";
-       editedCabalFile = "121a83393fc17cfc59aee069015fcfd0a6f6d33e14314cb6688fed05396aafb6";
+       version = "0.9";
+       sha256 = "19f99c1b673f9ca924a78888fb22ae2d534b0165653c3bdd3f8332ac7ca26a0e";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive text vector
        ];
@@ -102668,6 +104078,9 @@ self: {
          attoparsec base bytestring doctest HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion text
+       ];
        homepage = "https://github.com/andrewthad/haskell-ip#readme";
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
@@ -102776,6 +104189,8 @@ self: {
        pname = "ipopt-hs";
        version = "0.5.1.0";
        sha256 = "aaf193c06daed43998d4d37f7916d8c1bb73b61e01815755eff61bd2c472344a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ad ansi-wl-pprint base containers lens mtl template-haskell
          uu-parsinglib vector vector-space
@@ -102872,6 +104287,8 @@ self: {
        pname = "ipython-kernel";
        version = "0.8.4.0";
        sha256 = "ac4c822836d5b2cecf7ac4c61fe32ed876b09d18bcbe44760a6096bcd7338264";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring cereal containers directory filepath mtl
          process SHA temporary text transformers unordered-containers uuid
@@ -103346,14 +104763,14 @@ self: {
      }) {};
 
   "isobmff-builder" = callPackage
-    ({ mkDerivation, base, binary, bytestring, data-default, hspec, mtl
-     , pretty-types, QuickCheck, singletons, tagged, template-haskell
-     , text, time, type-list, type-spec, vector
+    ({ mkDerivation, base, binary, bytestring, criterion, data-default
+     , hspec, mtl, pretty-types, QuickCheck, singletons, tagged
+     , template-haskell, text, time, type-list, type-spec, vector
      }:
      mkDerivation {
        pname = "isobmff-builder";
-       version = "0.11.2.0";
-       sha256 = "062397e266687379d99ebe4acb7dd21b6289df1fdad079c3fef7d9ec45b1d220";
+       version = "0.11.3.0";
+       sha256 = "578e440f473427c7e413075de294830118a49e8043c8be75a6db9c158c5c7f42";
        libraryHaskellDepends = [
          base bytestring data-default mtl pretty-types singletons tagged
          template-haskell text time type-list type-spec vector
@@ -103362,6 +104779,9 @@ self: {
          base binary bytestring hspec mtl pretty-types QuickCheck tagged
          text type-spec
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion tagged type-spec
+       ];
        homepage = "https://github.com/sheyll/isobmff-builder#readme";
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
@@ -103392,12 +104812,14 @@ self: {
      }:
      mkDerivation {
        pname = "isotope";
-       version = "0.1.0.0";
-       sha256 = "8b63da859be3cbf3eaabcdf123563feeb2479b2edbb98acee1632b8322b5bc78";
+       version = "0.3.3.0";
+       sha256 = "e08fac7483c11f37786f5f98f6f7d1e58a456d1470c3f0f35bc9326e88c1fa2e";
        libraryHaskellDepends = [
          base containers megaparsec template-haskell th-lift
        ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
+       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;
@@ -103516,10 +104938,10 @@ self: {
      }) {};
 
   "iteratee" = callPackage
-    ({ mkDerivation, base, bytestring, containers, exceptions, HUnit
-     , ListLike, monad-control, mtl, parallel, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , transformers, transformers-base, unix
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, HUnit, ListLike, monad-control, mtl, parallel
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, transformers, transformers-base, unix
      }:
      mkDerivation {
        pname = "iteratee";
@@ -103536,6 +104958,10 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers transformers-base unix
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq exceptions ListLike monad-control
+         mtl transformers transformers-base unix
+       ];
        homepage = "http://www.tiresiaspress.us/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
@@ -103563,6 +104989,8 @@ self: {
        pname = "iteratee-mtl";
        version = "0.5.0.0";
        sha256 = "008a7dfc38986daf8b164472dd739b8185b5564246858450d093b04753056e28";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
@@ -104010,6 +105438,8 @@ self: {
        pname = "jack";
        version = "0.7.1.1";
        sha256 = "d17b5d299154edf55f479b9fc4508b662f4852e545dc47afa60b166ca7306c40";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring enumset event-list explicit-exception midi
          non-negative transformers
@@ -104093,13 +105523,14 @@ self: {
      }) {};
 
   "jalaali" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, deepseq, time }:
      mkDerivation {
        pname = "jalaali";
        version = "0.2.0";
        sha256 = "a01e8ade25f87e0c20c946b77be3a446e7ffa2870b601b001931ae837ef6b908";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base deepseq time ];
        homepage = "https://github.com/jalaali/jalaali-hs";
        description = "Convert Jalaali and Gregorian calendar systems to each other";
        license = stdenv.lib.licenses.mit;
@@ -104510,6 +105941,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
+  "jni_0_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, choice, containers, cpphs
+     , inline-c, jdk, singletons, thread-local-storage
+     }:
+     mkDerivation {
+       pname = "jni";
+       version = "0.3.0";
+       sha256 = "1d92d232180f5ebcb4e6017febc5f7b5320ccc49bcbc3787c62eb94195a60e08";
+       libraryHaskellDepends = [
+         base bytestring choice containers inline-c singletons
+         thread-local-storage
+       ];
+       librarySystemDepends = [ jdk ];
+       libraryToolDepends = [ cpphs ];
+       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
+       description = "Complete JNI raw bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) jdk;};
+
   "jobqueue" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bytestring
      , containers, data-default, directory, fast-logger, HDBC
@@ -104628,8 +106079,8 @@ self: {
 
   "jose-jwt" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal
-     , containers, cryptonite, doctest, either, hspec, HUnit, memory
-     , mtl, QuickCheck, text, time, unordered-containers, vector
+     , containers, criterion, cryptonite, doctest, either, hspec, HUnit
+     , memory, mtl, QuickCheck, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "jose-jwt";
@@ -104643,6 +106094,7 @@ self: {
          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;
@@ -105041,6 +106493,7 @@ self: {
        libraryHaskellDepends = [
          base base-prelude bytestring scientific semigroups text
        ];
+       benchmarkHaskellDepends = [ base-prelude bytestring text ];
        homepage = "https://github.com/nikita-volkov/json-bytes-builder";
        description = "Direct-to-bytes JSON Builder";
        license = stdenv.lib.licenses.mit;
@@ -105280,6 +106733,8 @@ self: {
        pname = "json-rpc-client";
        version = "0.2.5.0";
        sha256 = "5349f5c0b0fa8f6c5433152d6effc10846cfb3480e78c5aa99adb7540bcff49c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring json-rpc-server mtl text unordered-containers
          vector vector-algorithms
@@ -105324,6 +106779,8 @@ self: {
        pname = "json-rpc-server";
        version = "0.2.6.0";
        sha256 = "169e9997734bd1d7d07a13b5ae0223d5363c43de93b0d5fbb845a598f9eaccf5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring deepseq mtl text unordered-containers vector
        ];
@@ -105709,8 +107166,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.15";
-       sha256 = "4ff1279e9f4d54c605a22792f411d4b84324337b454449a0cd4c7c009abb2269";
+       version = "0.2.16";
+       sha256 = "5eac14b5102b5be904142843977560cddf4829182637e059cd09e7a384b7052f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105797,6 +107254,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jvm_0_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, distributed-closure
+     , hspec, jni, singletons, text, vector
+     }:
+     mkDerivation {
+       pname = "jvm";
+       version = "0.2.0";
+       sha256 = "f766db5293100de25605f883170d4869fcca7b99e1ae2b2d418cdb92eca7ccce";
+       libraryHaskellDepends = [
+         base bytestring distributed-closure jni singletons text vector
+       ];
+       testHaskellDepends = [ base bytestring hspec text ];
+       benchmarkHaskellDepends = [ base criterion jni ];
+       homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
+       description = "Call JVM methods from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jvm-parser" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, fgl, fingertree, pretty, zlib
@@ -105833,6 +107309,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jvm-streaming_0_2" = callPackage
+    ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni
+     , jvm, singletons, streaming
+     }:
+     mkDerivation {
+       pname = "jvm-streaming";
+       version = "0.2";
+       sha256 = "2251efe0192d36845ac852357a6af923950f7e9cb007900c40cc6a1d116c30bb";
+       libraryHaskellDepends = [
+         base distributed-closure inline-java jni jvm singletons streaming
+       ];
+       testHaskellDepends = [ base hspec inline-java jvm streaming ];
+       homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";
+       description = "Expose Java iterators as streams from the streaming package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jwt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
      , data-default, doctest, http-types, HUnit, lens, lens-aeson
@@ -105905,20 +107399,20 @@ self: {
      }) {};
 
   "kafka-device" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, cereal, milena
-     , mtl
+    ({ mkDerivation, aeson, base, binary, bytestring, cereal, linear
+     , milena, mtl
      }:
      mkDerivation {
        pname = "kafka-device";
-       version = "0.1.5.0";
-       sha256 = "e43b2e3ed49285745bf3dde7b870f61b87dc4f5ef8fdc31bda56c5ee22c18004";
+       version = "0.2.1.2";
+       sha256 = "281d1155594a4a4f44c71042e41c5151f10370d3a96a6159ae9a42c60898463b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring cereal milena mtl
+         aeson base binary bytestring cereal linear milena mtl
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring cereal milena mtl
+         aeson base binary bytestring cereal linear milena mtl
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device";
        description = "UI device events via a Kafka message broker";
@@ -105927,17 +107421,15 @@ self: {
      }) {};
 
   "kafka-device-glut" = callPackage
-    ({ mkDerivation, base, GLUT, kafka-device, milena, OpenGL }:
+    ({ mkDerivation, base, GLUT, kafka-device, OpenGL }:
      mkDerivation {
        pname = "kafka-device-glut";
-       version = "0.1.3.0";
-       sha256 = "c06c42b23f1fcec14fad72e690b2360942e56a6b5d3f7d7496c379dd22887f8f";
+       version = "0.2.1.2";
+       sha256 = "69a4fbd1015b765ab5e0ef7d81a9bd6db578545b7f69cfd96681c8052b87c146";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base GLUT kafka-device milena OpenGL ];
-       executableHaskellDepends = [
-         base GLUT kafka-device milena OpenGL
-       ];
+       libraryHaskellDepends = [ base GLUT kafka-device OpenGL ];
+       executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
        homepage = "https://bitbucket.org/functionally/kafka-device-glut";
        description = "GLUT events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
@@ -105946,19 +107438,19 @@ self: {
 
   "kafka-device-joystick" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cereal
-     , kafka-device, milena
+     , kafka-device, yaml
      }:
      mkDerivation {
        pname = "kafka-device-joystick";
-       version = "0.1.5.0";
-       sha256 = "ec7cdb06a7ddc8aa54238cf3b762721ce81ff22021daa16f559abf75350798cd";
+       version = "0.2.1.2";
+       sha256 = "e07acdef7bc09038d20b5b6ab4a228fcd41877e00fde257d41014a4197c4f49e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device yaml
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device-joystick";
        description = "Linux joystick events via a Kafka message broker";
@@ -105967,20 +107459,18 @@ self: {
      }) {};
 
   "kafka-device-leap" = callPackage
-    ({ mkDerivation, aeson, base, hleap, kafka-device, milena
-     , websockets
-     }:
+    ({ mkDerivation, aeson, base, hleap, kafka-device, websockets }:
      mkDerivation {
        pname = "kafka-device-leap";
-       version = "0.1.3.0";
-       sha256 = "d9440f6991d230caed95c81940569c77d7911616c2d598a8cb5e770e41cada3a";
+       version = "0.2.1.2";
+       sha256 = "c16b2c2ea6d79354bef02ace9f86c44e2627bb5de8506935715618a2b81f9693";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base hleap kafka-device milena websockets
+         aeson base hleap kafka-device websockets
        ];
        executableHaskellDepends = [
-         aeson base hleap kafka-device milena websockets
+         aeson base hleap kafka-device websockets
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device-leap";
        description = "Leap Motion events via a Kafka message broker";
@@ -105990,19 +107480,19 @@ self: {
 
   "kafka-device-spacenav" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cereal
-     , kafka-device, milena
+     , kafka-device, yaml
      }:
      mkDerivation {
        pname = "kafka-device-spacenav";
-       version = "0.1.5.0";
-       sha256 = "c501b38ef88ac3d8e870f6ce698a299508cbabb2088c472c8163bcca5d53cf7d";
+       version = "0.2.1.2";
+       sha256 = "39f0acf5ad9b6d4f4b53724080c7467aeadb6d93f76691143ec1599a1d713737";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device
        ];
        executableHaskellDepends = [
-         aeson base binary bytestring cereal kafka-device milena
+         aeson base binary bytestring cereal kafka-device yaml
        ];
        homepage = "https://bitbucket.org/functionally/kafka-device-spacenav";
        description = "Linux SpaceNavigator events via a Kafka message broker";
@@ -106011,15 +107501,15 @@ self: {
      }) {};
 
   "kafka-device-vrpn" = callPackage
-    ({ mkDerivation, base, kafka-device, milena, vrpn }:
+    ({ mkDerivation, base, kafka-device, vrpn }:
      mkDerivation {
        pname = "kafka-device-vrpn";
-       version = "0.1.5.0";
-       sha256 = "27df692620b7fbd293520108c236406cad95aed665c4807afc15d8efc9c006bb";
+       version = "0.2.1.2";
+       sha256 = "9adcd43ec1851ac26083c629b07744d12150dd6dbb13f2a468d904dbb6f3b17e";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base kafka-device milena vrpn ];
-       executableHaskellDepends = [ base kafka-device milena vrpn ];
+       libraryHaskellDepends = [ base kafka-device vrpn ];
+       executableHaskellDepends = [ base kafka-device vrpn ];
        homepage = "https://bitbucket.org/functionally/kafka-device-vrpn";
        description = "VRPN events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
@@ -106146,6 +107636,8 @@ self: {
        pname = "kansas-lava";
        version = "0.2.4.4";
        sha256 = "ed44a01f95c72580c3e198ea43f42a582ec44bbdc8897629fe37f874208f6c5d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cmdargs containers data-default data-reify
          directory dotgen filepath netlist netlist-to-vhdl process random
@@ -106165,6 +107657,8 @@ self: {
        pname = "kansas-lava-cores";
        version = "0.1.2.2";
        sha256 = "15502f0da60b224fc6b5a6fed21c2507c34ddbdbc51377736c3bc254186ad01c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
@@ -106241,11 +107735,12 @@ self: {
      }) {};
 
   "katip" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, bytestring, containers
-     , directory, either, exceptions, hostname, microlens, microlens-th
-     , monad-control, mtl, old-locale, quickcheck-instances, regex-tdfa
-     , resourcet, semigroups, string-conv, tasty, tasty-golden
-     , tasty-hunit, tasty-quickcheck, template-haskell, text, time
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , bytestring, containers, criterion, deepseq, directory, either
+     , exceptions, hostname, microlens, microlens-th, monad-control, mtl
+     , old-locale, quickcheck-instances, regex-tdfa, resourcet
+     , semigroups, string-conv, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time
      , time-locale-compat, transformers, transformers-base
      , transformers-compat, unix, unordered-containers
      }:
@@ -106265,6 +107760,10 @@ self: {
          regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck
          template-haskell text time time-locale-compat unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         aeson async base blaze-builder criterion deepseq text time
+         transformers unix
+       ];
        homepage = "https://github.com/Soostone/katip";
        description = "A structured logging framework";
        license = stdenv.lib.licenses.bsd3;
@@ -106273,10 +107772,11 @@ self: {
 
   "katip-elasticsearch" = callPackage
     ({ mkDerivation, aeson, async, base, bloodhound, containers
-     , enclosed-exceptions, exceptions, http-client, http-types, katip
-     , lens, lens-aeson, quickcheck-instances, retry, scientific, stm
-     , stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, unordered-containers, uuid, vector
+     , criterion, deepseq, enclosed-exceptions, exceptions, http-client
+     , http-types, katip, lens, lens-aeson, quickcheck-instances, retry
+     , rng-utils, scientific, stm, stm-chans, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , uuid, vector
      }:
      mkDerivation {
        pname = "katip-elasticsearch";
@@ -106292,6 +107792,10 @@ self: {
          lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
          tasty-quickcheck text time transformers unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         aeson base bloodhound criterion deepseq rng-utils text
+         unordered-containers uuid
+       ];
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106371,9 +107875,9 @@ self: {
      }) {};
 
   "kazura-queue" = callPackage
-    ({ mkDerivation, async, atomic-primops, base, containers, deepseq
-     , doctest, exceptions, free, hspec, hspec-expectations, HUnit, mtl
-     , primitive, QuickCheck, transformers
+    ({ mkDerivation, async, atomic-primops, base, containers, criterion
+     , deepseq, doctest, exceptions, free, hspec, hspec-expectations
+     , HUnit, mtl, primitive, QuickCheck, stm, transformers
      }:
      mkDerivation {
        pname = "kazura-queue";
@@ -106386,6 +107890,7 @@ self: {
          async base containers deepseq doctest exceptions free hspec
          hspec-expectations HUnit mtl QuickCheck transformers
        ];
+       benchmarkHaskellDepends = [ async base containers criterion stm ];
        homepage = "http://github.com/asakamirai/kazura-queue";
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
@@ -106461,7 +107966,8 @@ self: {
      }) {};
 
   "kdt" = callPackage
-    ({ mkDerivation, base, deepseq, deepseq-generics, heap, QuickCheck
+    ({ mkDerivation, base, criterion, deepseq, deepseq-generics, heap
+     , mersenne-random-pure64, MonadRandom, QuickCheck
      }:
      mkDerivation {
        pname = "kdt";
@@ -106469,6 +107975,10 @@ self: {
        sha256 = "bc0f8f9ac0cb01466273171f47b627abe170d1130bd59657fb9198b4f9479f9a";
        libraryHaskellDepends = [ base deepseq deepseq-generics heap ];
        testHaskellDepends = [ base deepseq deepseq-generics QuickCheck ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq deepseq-generics heap mersenne-random-pure64
+         MonadRandom QuickCheck
+       ];
        homepage = "https://github.com/giogadi/kdt";
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
@@ -106933,6 +108443,8 @@ self: {
        pname = "keyring";
        version = "0.1.0.5";
        sha256 = "9565c1b08e1b5b4a11d4f3df30fe053893c6228dc79f3766602837074a2901f8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
@@ -107217,8 +108729,9 @@ self: {
      }) {};
 
   "kmeans-par" = callPackage
-    ({ mkDerivation, base, hspec, metric, normaldistribution, parallel
-     , QuickCheck, semigroups, vector
+    ({ mkDerivation, base, criterion, deepseq, hspec, metric
+     , normaldistribution, parallel, QuickCheck, random, semigroups
+     , vector
      }:
      mkDerivation {
        pname = "kmeans-par";
@@ -107229,13 +108742,17 @@ self: {
          base hspec metric normaldistribution parallel QuickCheck semigroups
          vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq metric normaldistribution random vector
+       ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans-vector" = callPackage
-    ({ mkDerivation, base, mtl, probable, vector }:
+    ({ mkDerivation, base, criterion, mtl, probable, QuickCheck, vector
+     }:
      mkDerivation {
        pname = "kmeans-vector";
        version = "0.3.2";
@@ -107244,6 +108761,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl vector ];
        executableHaskellDepends = [ base probable vector ];
+       benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
        homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
@@ -107467,7 +108985,7 @@ self: {
      }) {};
 
   "krpc" = callPackage
-    ({ mkDerivation, base, bencoding, bytestring, containers
+    ({ mkDerivation, base, bencoding, bytestring, containers, criterion
      , data-default-class, hspec, lifted-base, monad-control
      , monad-logger, mtl, network, QuickCheck, quickcheck-instances
      , text, transformers
@@ -107484,6 +109002,9 @@ self: {
          base bencoding bytestring hspec monad-logger mtl network QuickCheck
          quickcheck-instances
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion monad-logger mtl
+       ];
        homepage = "https://github.com/cobit/krpc";
        description = "KRPC protocol implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -107743,6 +109264,8 @@ self: {
        pname = "laika";
        version = "0.1.3.1";
        sha256 = "a1873cd1fb75cc1ff45cca4565cf950ce25fa63bb4d15231349131f07fd63e2f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
@@ -108009,26 +109532,26 @@ self: {
 
   "lambdabot-haskell-plugins" = callPackage
     ({ mkDerivation, array, arrows, base, bytestring, containers
-     , data-memocombinators, directory, filepath, haskell-src-exts
-     , hoogle, HTTP, IOSpec, lambdabot-core, lambdabot-reference-plugins
-     , lambdabot-trusted, lifted-base, logict, MonadRandom, mtl, mueval
-     , network, numbers, oeis, parsec, pretty, process, QuickCheck
-     , regex-tdfa, show, split, syb, transformers, utf8-string
-     , vector-space
+     , data-memocombinators, directory, filepath
+     , haskell-src-exts-simple, hoogle, HTTP, IOSpec, lambdabot-core
+     , lambdabot-reference-plugins, lambdabot-trusted, lifted-base
+     , logict, MonadRandom, mtl, mueval, network, numbers, oeis, parsec
+     , pretty, process, QuickCheck, regex-tdfa, show, split, syb
+     , transformers, utf8-string, vector-space
      }:
      mkDerivation {
        pname = "lambdabot-haskell-plugins";
-       version = "5.1";
-       sha256 = "7fe68b97aec6f62e5694bda236b73e30a94fbf45a6a9a6b5c0f1b12398cfaef7";
+       version = "5.1.0.1";
+       sha256 = "fccf7635ec1074196695b424261fb243a2b6b71e25110131fbad13278cc6b3da";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
-         directory filepath haskell-src-exts hoogle HTTP IOSpec
+         directory filepath haskell-src-exts-simple hoogle HTTP IOSpec
          lambdabot-core lambdabot-reference-plugins lambdabot-trusted
          lifted-base logict MonadRandom mtl mueval network numbers oeis
          parsec pretty process QuickCheck regex-tdfa show split syb
          transformers utf8-string vector-space
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
+       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
      }) {};
@@ -108357,6 +109880,8 @@ self: {
        pname = "lambdacube-gl";
        version = "0.5.2.3";
        sha256 = "be33bde75e5753c134cba7dd2e98e8f31870bd0bfb3787659a3cf357c677dd2b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
@@ -108481,14 +110006,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lame" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, directory
+     , exceptions, filepath, hspec, htaglib, mp3lame, temporary, text
+     , transformers, wave
+     }:
+     mkDerivation {
+       pname = "lame";
+       version = "0.1.0";
+       sha256 = "af72ca85baee296af9577c307f263e9590841063903b7feaaae164fd50692e4c";
+       libraryHaskellDepends = [
+         base bytestring data-default-class directory exceptions filepath
+         text transformers wave
+       ];
+       librarySystemDepends = [ mp3lame ];
+       testHaskellDepends = [
+         base data-default-class directory filepath hspec htaglib temporary
+         text
+       ];
+       homepage = "https://github.com/mrkkrp/lame";
+       description = "Fairly complete high-level binding to LAME encoder";
+       license = stdenv.lib.licenses.bsd3;
+     }) {mp3lame = null;};
+
   "lame-tester" = callPackage
     ({ mkDerivation, base, bifunctors, containers, semigroups, tasty
      , tasty-hunit, validation
      }:
      mkDerivation {
        pname = "lame-tester";
-       version = "1.2";
-       sha256 = "de04042967c5d7879ce46ba7d77cd315e71f2f151432121139cbc1a3108147f1";
+       version = "1.2.1";
+       sha256 = "f13129313c8c0fe5757e5ff62ba9a326f19724568dd9e311c341df21633512a6";
        libraryHaskellDepends = [
          base bifunctors containers semigroups validation
        ];
@@ -108505,6 +110053,8 @@ self: {
        pname = "language-asn1";
        version = "0.5";
        sha256 = "e3fef756ed6c53c0e9d5058291071ca804f47a418ad0cada816bb440c3c45191";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base parsec syb ];
        homepage = "http://patch-tag.com/r/adept/language-asn1";
        description = "Parsing of ASN1 definitions";
@@ -108573,6 +110123,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_6" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.6";
+       sha256 = "5699cd7d386ae5a583d703bbc1c83b46faa618f3e53ff7fe9a97f6c7acb36be6";
+       libraryHaskellDepends = [
+         array base bytestring containers directory filepath pretty process
+         syb
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [ base directory filepath process ];
+       homepage = "http://visq.github.io/language-c/";
+       description = "Analysis and generation of C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-c-comments" = callPackage
     ({ mkDerivation, alex, array, base, language-c }:
      mkDerivation {
@@ -108651,6 +110221,8 @@ self: {
        pname = "language-conf";
        version = "0.2.2.0";
        sha256 = "f7413ee42c06fb62b47965e2aa1a03355e609177c5d2590d9d129ec0c2a8a39a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base deepseq directory filepath megaparsec pretty scientific
          semigroups text unordered-containers vector
@@ -108699,6 +110271,8 @@ self: {
        pname = "language-dockerfile";
        version = "0.3.5.0";
        sha256 = "9667fd70217ebf229369fbaf906bf74926a8ef1651fd965862c47082d09342e5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring free mtl parsec pretty ShellCheck split
          template-haskell th-lift th-lift-instances transformers
@@ -108872,9 +110446,9 @@ self: {
      }) {};
 
   "language-hcl" = callPackage
-    ({ mkDerivation, base, deepseq, directory, filepath, hspec
-     , hspec-megaparsec, megaparsec, pretty, QuickCheck, scientific
-     , semigroups, text, transformers, unordered-containers
+    ({ mkDerivation, base, criterion, deepseq, directory, filepath
+     , hspec, hspec-megaparsec, megaparsec, pretty, QuickCheck
+     , scientific, semigroups, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "language-hcl";
@@ -108888,6 +110462,9 @@ self: {
          base directory filepath hspec hspec-megaparsec megaparsec pretty
          QuickCheck semigroups text transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory filepath text
+       ];
        homepage = "https://github.com/beijaflor-io/haskell-language-hcl#readme";
        description = "HCL parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
@@ -108979,9 +110556,9 @@ self: {
      }) {};
 
   "language-lua" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, deepseq, directory
-     , filepath, happy, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , text
+    ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
+     , directory, filepath, happy, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "language-lua";
@@ -108993,6 +110570,9 @@ self: {
          base bytestring deepseq directory filepath QuickCheck tasty
          tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory filepath text
+       ];
        homepage = "http://github.com/glguy/language-lua";
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
@@ -109026,6 +110606,8 @@ self: {
        pname = "language-lua2";
        version = "0.1.0.5";
        sha256 = "4f24d7b015dbe1c7e9d1ead835ce426223531b8b6f408ee97b3d18904424393d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lexer-applicative microlens
          regex-applicative semigroups srcloc transformers
@@ -109177,6 +110759,50 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
+  "language-puppet_1_3_6" = 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.6";
+       sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2";
+       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
@@ -109376,10 +111002,11 @@ self: {
      }) {};
 
   "large-hashable" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytes, bytestring
-     , containers, hashable, HTF, QuickCheck, scientific, strict
-     , template-haskell, text, time, transformers, unordered-containers
-     , utf8-light, vector, void
+    ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes
+     , bytestring, cereal, containers, cryptohash, deepseq, hashable
+     , HTF, QuickCheck, safecopy, scientific, strict, template-haskell
+     , text, time, transformers, unordered-containers, utf8-light
+     , vector, void
      }:
      mkDerivation {
        pname = "large-hashable";
@@ -109394,6 +111021,10 @@ self: {
          aeson base bytes bytestring containers hashable HTF QuickCheck
          scientific strict text time unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base base16-bytestring byteable bytes bytestring cereal cryptohash
+         deepseq safecopy text transformers
+       ];
        homepage = "https://github.com/factisresearch/large-hashable";
        description = "Efficiently hash (large) Haskell values";
        license = stdenv.lib.licenses.bsd3;
@@ -109742,6 +111373,8 @@ self: {
        pname = "lazyio";
        version = "0.1.0.4";
        sha256 = "8b54f0bccdc1c836393ce667ea0f1ad069d52c04762e61fad633d4d44916cf6c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base transformers unsafe ];
        homepage = "http://www.haskell.org/haskellwiki/Lazy_IO";
        description = "Run IO actions lazily while respecting their order";
@@ -109749,13 +111382,18 @@ self: {
      }) {};
 
   "lazyset" = callPackage
-    ({ mkDerivation, base, containers, data-ordlist, HUnit }:
+    ({ mkDerivation, base, containers, data-ordlist, HUnit, time
+     , timeit
+     }:
      mkDerivation {
        pname = "lazyset";
        version = "0.1.0.0";
        sha256 = "9e62ccd181117484c63920b8dfb8d385d23119e11595ab2aa045b272c55f4bad";
        libraryHaskellDepends = [ base containers data-ordlist ];
        testHaskellDepends = [ base containers data-ordlist HUnit ];
+       benchmarkHaskellDepends = [
+         base containers data-ordlist time timeit
+       ];
        homepage = "https://github.com/happyherp/lazyset";
        description = "Set and Map from lazy/infinite lists";
        license = stdenv.lib.licenses.mit;
@@ -110296,7 +111934,7 @@ self: {
 
   "lens" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
-     , comonad, containers, contravariant, deepseq, directory
+     , 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
@@ -110325,6 +111963,10 @@ self: {
          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.bsd3;
@@ -110464,6 +112106,8 @@ self: {
        pname = "lens-regex";
        version = "0.1.0";
        sha256 = "4954b3ae395661e916c536bfe837c42a1cd8223ea81ffd86b1fdd9b6abfc5142";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base lens regex-base template-haskell
        ];
@@ -110677,6 +112321,8 @@ self: {
        pname = "leveldb-haskell";
        version = "0.6.4";
        sha256 = "25a8f9c2cdd5a32423389173a6323bd804689f69aee1082c57887ea74ead1b04";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default exceptions filepath resourcet
          transformers
@@ -110700,6 +112346,8 @@ self: {
        pname = "leveldb-haskell-fork";
        version = "0.3.4.4";
        sha256 = "589935f658b432546ba3e82f1473c55365a2a3fd01e3751faa93f3c2a79f2c08";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring data-default filepath resourcet transformers
        ];
@@ -110733,6 +112381,8 @@ self: {
        pname = "levmar-chart";
        version = "0.2";
        sha256 = "5271f6dadec35b22d6fd00900992c819d2e7a7daa7e53016c9f19879a3684973";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base Chart colour data-accessor levmar ];
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
@@ -110839,7 +112489,7 @@ self: {
        version = "0.10";
        sha256 = "23b3cd7479108864b5a167b3fd1b1f58bf49b1773f590c68c766dcd4a999a0f4";
        isLibrary = false;
-       isExecutable = false;
+       isExecutable = true;
        homepage = "http://lhc.seize.it/";
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
@@ -111108,8 +112758,8 @@ self: {
      }:
      mkDerivation {
        pname = "libjenkins";
-       version = "0.8.3";
-       sha256 = "939379ae30f65d20d524d5735d6b6ec86b91ce295c64e089b1097161da1067cc";
+       version = "0.8.4";
+       sha256 = "e7602fc1312661a8305e3ddb84b365cf520c74b9afbd4c5b741e05ab8fb71123";
        libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
@@ -111209,6 +112859,8 @@ self: {
        pname = "libltdl";
        version = "0.1.1";
        sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mainland/libltdl";
        description = "FFI interface to libltdl";
@@ -111420,6 +113072,8 @@ self: {
        pname = "libssh2";
        version = "0.2.0.3";
        sha256 = "7caa9f23ae3ff54a819ff56bbecc7953fe39aa958c77feebd52849f2bf86cd75";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring network syb time ];
        librarySystemDepends = [ ssh2 ];
        libraryPkgconfigDepends = [ libssh2 ];
@@ -111689,9 +113343,9 @@ self: {
      }) {};
 
   "lifted-async" = callPackage
-    ({ mkDerivation, async, base, constraints, HUnit, lifted-base
-     , monad-control, mtl, tasty, tasty-hunit, tasty-th
-     , transformers-base
+    ({ mkDerivation, async, base, constraints, criterion, deepseq
+     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
+     , tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
@@ -111704,15 +113358,16 @@ self: {
          async base HUnit lifted-base monad-control mtl tasty tasty-hunit
          tasty-th
        ];
+       benchmarkHaskellDepends = [ async base criterion deepseq ];
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lifted-base" = callPackage
-    ({ mkDerivation, base, HUnit, monad-control, test-framework
-     , test-framework-hunit, transformers, transformers-base
-     , transformers-compat
+    ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
+     , test-framework, test-framework-hunit, transformers
+     , transformers-base, transformers-compat
      }:
      mkDerivation {
        pname = "lifted-base";
@@ -111723,6 +113378,9 @@ self: {
          base HUnit monad-control test-framework test-framework-hunit
          transformers transformers-base transformers-compat
        ];
+       benchmarkHaskellDepends = [
+         base criterion monad-control monad-peel transformers
+       ];
        homepage = "https://github.com/basvandijk/lifted-base";
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
@@ -112296,8 +113954,8 @@ self: {
      }) {};
 
   "linkedhashmap" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, mtl, tasty
-     , tasty-hunit, unordered-containers
+    ({ mkDerivation, base, containers, criterion, deepseq, hashable
+     , mtl, tasty, tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "linkedhashmap";
@@ -112310,6 +113968,9 @@ self: {
          base containers deepseq hashable mtl tasty tasty-hunit
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashable unordered-containers
+       ];
        homepage = "https://github.com/abasko/linkedhashmap";
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
@@ -112422,6 +114083,8 @@ self: {
        pname = "linux-file-extents";
        version = "0.2.0.0";
        sha256 = "6c7cd9e700f666f774736d31a0e6aa7bfe9bd1e075c11eed701ba95095fd9bd0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
@@ -112634,7 +114297,7 @@ self: {
      }) {};
 
   "liquid" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, hashable, lens
+    ({ mkDerivation, aeson, attoparsec, base, criterion, hashable, lens
      , lens-aeson, mtl, QuickCheck, scientific, semigroups, tasty
      , tasty-hunit, tasty-quickcheck, tasty-th, text
      , unordered-containers, validation, vector
@@ -112652,6 +114315,7 @@ self: {
          semigroups tasty tasty-hunit tasty-quickcheck tasty-th text
          unordered-containers validation vector
        ];
+       benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
        homepage = "https://github.com/projectorhq/haskell-liquid";
        description = "Liquid template language library";
        license = stdenv.lib.licenses.bsd3;
@@ -112831,6 +114495,8 @@ self: {
        pname = "list-prompt";
        version = "0.1.1.0";
        sha256 = "c7323c7a802940deba1a7be46265fd8c01f548174d5f08923a607e1730ca4dee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base data-default stm terminal-size vty
        ];
@@ -113296,6 +114962,8 @@ self: {
        pname = "llvm-extra";
        version = "0.7.0.1";
        sha256 = "4928e405deff09451edce864558ce7b3276549ca7f1d71dac118dcbcafe15573";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers cpuid llvm-tf non-empty tfp transformers unsafe
          utility-ht
@@ -113312,6 +114980,8 @@ self: {
        pname = "llvm-ffi";
        version = "3.8.1";
        sha256 = "d636af82033d1fbfa5c05ed66f823afe9081db387f85eae862f97ca6db4e24c9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base enumset ];
        libraryPkgconfigDepends = [ llvm ];
        homepage = "http://haskell.org/haskellwiki/LLVM";
@@ -113451,8 +115121,8 @@ self: {
     ({ mkDerivation, base, containers, monadLib, pretty }:
      mkDerivation {
        pname = "llvm-pretty";
-       version = "0.5";
-       sha256 = "d38228d980ad1fc0b833cf5daa0e78ce981c102a6ad7cad16bed2761f98cbb19";
+       version = "0.6.0.0";
+       sha256 = "f9b50885551a48624a0577c6dabaef1fc77245367d6d9afdb84d548ada328e66";
        libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
@@ -113465,8 +115135,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-pretty-bc-parser";
-       version = "0.3.0.0";
-       sha256 = "7873abf8b3acbc679642f2f1c2d639db91c084a2a97546037f049735536dfb81";
+       version = "0.3.0.1";
+       sha256 = "def47c50959ae7b270987bcf53af87e07a290275bfd34f01e3d3c50b8edf1178";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113492,6 +115162,8 @@ self: {
        pname = "llvm-tf";
        version = "3.1.0.1";
        sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers enumset fixed-length llvm-ffi non-empty
          storable-record tfp transformers utility-ht
@@ -113683,12 +115355,13 @@ self: {
      }) {};
 
   "located-base" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion }:
      mkDerivation {
        pname = "located-base";
        version = "0.1.1.0";
        sha256 = "83a96081c87ec9820b6bad7200404f7e1fbed365fe8c57641d8645d95732d59f";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/gridaphobe/located-base";
        description = "Location-aware variants of partial functions";
        license = stdenv.lib.licenses.bsd3;
@@ -113982,8 +115655,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-warper";
-       version = "0.4.4";
-       sha256 = "9a2cfcf95d0c88ae6471106f67314e81e2bd370fe092a4f21d9459f1f235dbea";
+       version = "0.5.1";
+       sha256 = "8645928457c46ca217c2a9ebc75819176643552876c832ad3691a66e762798ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114107,7 +115780,8 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, exceptions, free, monad-control, mtl
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , semigroups, stm, stm-delay, text, time, transformers
      , transformers-base, wl-pprint-text
      }:
@@ -114119,11 +115793,39 @@ self: {
          async base exceptions free monad-control mtl semigroups stm
          stm-delay text time transformers transformers-base wl-pprint-text
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_2_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , semigroups, stm, stm-delay, text, time, transformers
+     , transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.2.0";
+       sha256 = "be6f0121d16e9947d4147c264123b8d622102eb43f0d16e815f117505d6d8544";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl semigroups stm
+         stm-delay text time transformers transformers-base wl-pprint-text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-facade" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
@@ -114342,6 +116044,8 @@ self: {
        pname = "lol";
        version = "0.6.0.0";
        sha256 = "973a5ecd6397fd01e34bb7a40e80a3b0b564ca00aeafb73dc66fb0ec988c950d";
+       revision = "1";
+       editedCabalFile = "bc9524337ed4a7608bda8a983259e6e381621d8a0914531833a5d1a761ba7971";
        libraryHaskellDepends = [
          arithmoi base bytestring constraints containers crypto-api
          data-default deepseq directory monadcryptorandom MonadRandom mtl
@@ -114356,31 +116060,35 @@ self: {
      }) {};
 
   "lol-apps" = callPackage
-    ({ mkDerivation, arithmoi, base, constraints, deepseq, DRBG, lol
-     , MonadRandom, mtl, numeric-prelude, QuickCheck, random, repa
-     , singletons, test-framework, test-framework-quickcheck2, vector
+    ({ mkDerivation, base, containers, deepseq, DRBG, filepath, lol
+     , lol-benches, lol-cpp, lol-repa, lol-tests, MonadRandom, mtl
+     , numeric-prelude, protocol-buffers, protocol-buffers-descriptor
+     , singletons, split, test-framework, time
      }:
      mkDerivation {
        pname = "lol-apps";
-       version = "0.1.1.0";
-       sha256 = "75b0d6d53161d25e77286ab0cbf43487112f6b6d944ff77d11ace6e7ef83af7e";
-       revision = "2";
-       editedCabalFile = "5d9f33a4442eff096507ba9917c86de5cd01ee1fe55f4837c69301ccaa7f4c69";
+       version = "0.2.0.2";
+       sha256 = "d082ac8f4112884878a5f8f0ce8d994b1c5dc8d62bba8f55a437b03f1f2e1c88";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base deepseq lol MonadRandom numeric-prelude
+         base containers deepseq lol MonadRandom mtl numeric-prelude
+         protocol-buffers protocol-buffers-descriptor singletons split
        ];
        executableHaskellDepends = [
-         arithmoi base lol MonadRandom numeric-prelude
+         base deepseq DRBG filepath lol lol-cpp MonadRandom mtl
+         numeric-prelude singletons time
        ];
        testHaskellDepends = [
-         arithmoi base constraints deepseq DRBG lol MonadRandom mtl
-         QuickCheck random repa singletons test-framework
-         test-framework-quickcheck2 vector
+         base lol lol-cpp lol-repa lol-tests MonadRandom numeric-prelude
+         test-framework
+       ];
+       benchmarkHaskellDepends = [
+         base DRBG lol lol-benches lol-cpp lol-repa MonadRandom mtl
+         numeric-prelude
        ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "Lattice-based cryptographic applications using Lol";
+       description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -114388,18 +116096,17 @@ self: {
   "lol-benches" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, criterion
      , crypto-api, deepseq, DRBG, lol, MonadRandom, split, statistics
-     , transformers, vector
      }:
      mkDerivation {
        pname = "lol-benches";
-       version = "0.0.0.3";
-       sha256 = "4ec18d88b5153220c89ec9f39bf9a0d2e6c1fdfff69f980cdabc42423ee092b5";
+       version = "0.0.0.5";
+       sha256 = "6d708ff14c3dbe0ea7742d9498fe43ad087eb43652bd20cc92bd4f5fc0671858";
        libraryHaskellDepends = [
          ansi-terminal base containers criterion crypto-api deepseq DRBG lol
-         MonadRandom split statistics transformers vector
+         MonadRandom split statistics
        ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "A library for benchmarking <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -114426,52 +116133,41 @@ self: {
      }) {};
 
   "lol-cpp" = callPackage
-    ({ mkDerivation, arithmoi, base, bytestring, constraints
-     , containers, crypto-api, data-default, deepseq, lol, lol-tests
-     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
-     , protocol-buffers, protocol-buffers-descriptor, random, reflection
-     , repa, singletons, tagged-transformer, template-haskell
-     , th-desugar, transformers, vector, vector-th-unbox
+    ({ mkDerivation, base, constraints, deepseq, DRBG, lol, lol-benches
+     , lol-tests, MonadRandom, mtl, numeric-prelude, reflection, vector
      }:
      mkDerivation {
        pname = "lol-cpp";
-       version = "0.0.0.1";
-       sha256 = "86d374f5628c89a35d969c6e6cc59da9c2ca85758bf7375b25f7c0e2ddcf0b57";
+       version = "0.0.0.3";
+       sha256 = "42fe0cc6f99aabd9ab47666fa41cb8407688d0e4e18a7e9cf67f1db43e1b9325";
        libraryHaskellDepends = [
-         arithmoi base bytestring constraints containers crypto-api
-         data-default deepseq lol monadcryptorandom MonadRandom mtl
-         numeric-prelude protocol-buffers protocol-buffers-descriptor random
-         reflection repa singletons tagged-transformer template-haskell
-         th-desugar transformers vector vector-th-unbox
+         base constraints deepseq lol MonadRandom mtl numeric-prelude
+         reflection vector
        ];
        testHaskellDepends = [ base lol-tests ];
+       benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "A fast C++ backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "lol-repa" = callPackage
-    ({ mkDerivation, arithmoi, base, bytestring, constraints
-     , containers, crypto-api, data-default, deepseq, lol, lol-tests
-     , monadcryptorandom, MonadRandom, mtl, numeric-prelude
-     , protocol-buffers, protocol-buffers-descriptor, random, reflection
-     , repa, singletons, tagged-transformer, template-haskell
-     , th-desugar, transformers, vector, vector-th-unbox
+    ({ mkDerivation, base, constraints, data-default, deepseq, DRBG
+     , lol, lol-benches, lol-tests, MonadRandom, mtl, numeric-prelude
+     , reflection, repa, singletons, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "lol-repa";
-       version = "0.0.0.1";
-       sha256 = "c175e5881ee98795a0e24adde1a7c1955102b5723048d540389f773fff239b98";
+       version = "0.0.0.2";
+       sha256 = "9545c89813d53d928ba6da0ef24118f6a80c01525d05963b6e8b1399bd3e91a4";
        libraryHaskellDepends = [
-         arithmoi base bytestring constraints containers crypto-api
-         data-default deepseq lol monadcryptorandom MonadRandom mtl
-         numeric-prelude protocol-buffers protocol-buffers-descriptor random
-         reflection repa singletons tagged-transformer template-haskell
-         th-desugar transformers vector vector-th-unbox
+         base constraints data-default deepseq lol MonadRandom mtl
+         numeric-prelude reflection repa singletons vector vector-th-unbox
        ];
        testHaskellDepends = [ base lol-tests ];
+       benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
        homepage = "https://github.com/cpeikert/Lol";
-       description = "A repa backend for <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
+       description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -114483,6 +116179,8 @@ self: {
        pname = "lol-tests";
        version = "0.0.0.1";
        sha256 = "656cbe1a7bcea84cffd271a61d0f2b731e14705309636d872afff363628a37ed";
+       revision = "1";
+       editedCabalFile = "39058c9844930c138aed3e9135879c07de330ae36259e5799c0cdf96fc9ca9d2";
        libraryHaskellDepends = [
          base lol MonadRandom QuickCheck test-framework
          test-framework-quickcheck2
@@ -114553,13 +116251,17 @@ self: {
      }) {};
 
   "loop" = callPackage
-    ({ mkDerivation, base, hspec, mtl }:
+    ({ mkDerivation, base, criterion, foldl, hspec, mtl, random, vector
+     }:
      mkDerivation {
        pname = "loop";
        version = "0.3.0";
        sha256 = "92962010bdab28cc0092dd3fe42819d6f215c717dd10d9349626d92a0d0b3ecf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec mtl ];
+       benchmarkHaskellDepends = [
+         base criterion foldl mtl random vector
+       ];
        homepage = "https://github.com/nh2/loop";
        description = "Fast loops (for when GHC can't optimize forM_)";
        license = stdenv.lib.licenses.mit;
@@ -114591,8 +116293,8 @@ self: {
      }) {};
 
   "loops" = callPackage
-    ({ mkDerivation, base, primitive, tasty, tasty-quickcheck
-     , transformers, vector
+    ({ mkDerivation, base, criterion, primitive, tasty
+     , tasty-quickcheck, transformers, vector
      }:
      mkDerivation {
        pname = "loops";
@@ -114602,6 +116304,7 @@ self: {
        editedCabalFile = "ef9ed99ec28140d39775a0b9c44333496d3ee754995219460d76cb137a9534ce";
        libraryHaskellDepends = [ base primitive transformers vector ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Fast imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114777,6 +116480,8 @@ self: {
        pname = "lp-diagrams-svg";
        version = "1.1";
        sha256 = "6cc63a8bf914fbc67e42c54c0c4327e81b650d56d9aee5b189946473453463b2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers FontyFruity gasp JuicyPixels lens linear
          lp-diagrams lucid-svg mtl optparse-applicative svg-tree text vector
@@ -115062,8 +116767,8 @@ self: {
 
   "lucid" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
-     , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text
-     , transformers, unordered-containers
+     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
+     , mtl, parsec, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "lucid";
@@ -115076,6 +116781,9 @@ self: {
        testHaskellDepends = [
          base bifunctors hspec HUnit mtl parsec text
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -115351,7 +117059,8 @@ self: {
      }) {};
 
   "lz4" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, hspec, HUnit, QuickCheck
+    ({ mkDerivation, base, bytestring, cereal, criterion, deepseq
+     , hspec, HUnit, QuickCheck, quicklz, snappy
      }:
      mkDerivation {
        pname = "lz4";
@@ -115359,6 +117068,9 @@ self: {
        sha256 = "98cc62bea1a359201f9e39a7db2457272f996ede25d97a2dbee3a07aa80693f1";
        libraryHaskellDepends = [ base bytestring cereal ];
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq quicklz snappy
+       ];
        homepage = "http://github.com/mwotton/lz4hs";
        description = "LZ4 compression for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -115412,8 +117124,7 @@ self: {
        pname = "lzma-clib";
        version = "5.2.2";
        sha256 = "0aed9cb8ef3a2b0e71c429b00161ee3fb342cce2603ccb934f507fb236a09fd5";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        description = "liblzma C library and headers for use by LZMA bindings";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115565,6 +117276,8 @@ self: {
        pname = "maccatcher";
        version = "2.1.5";
        sha256 = "cbafc38151d9c4c17c3055a7f8f0702bf5d7d5240db3369c84326e94ddcaa67c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base binary parsec process ];
        description = "Obtain the host MAC address on *NIX and Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -115591,10 +117304,11 @@ self: {
      }) {};
 
   "machines" = callPackage
-    ({ mkDerivation, adjunctions, base, comonad, containers, directory
-     , distributive, doctest, filepath, free, mtl, pointed, profunctors
-     , semigroupoids, semigroups, transformers, transformers-compat
-     , void
+    ({ mkDerivation, adjunctions, base, comonad, conduit
+     , conduit-combinators, containers, criterion, directory
+     , distributive, doctest, filepath, free, mtl, pipes, pointed
+     , profunctors, semigroupoids, semigroups, transformers
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "machines";
@@ -115606,6 +117320,9 @@ self: {
          transformers-compat void
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [
+         base conduit conduit-combinators criterion mtl pipes
+       ];
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -115773,8 +117490,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "1.0.0.0";
-       sha256 = "d8fd8f0055eab476c13c23361cec3a780319d90e45c2b45fccd1208b0ff24120";
+       version = "1.0.0.1";
+       sha256 = "edeea8b9d3cabfaf5392fbe7ad307754e20fe8ef90294b5a846c9a7f8edb5af8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116953,35 +118670,35 @@ self: {
      }) {};
 
   "marvin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, configurator, deepseq
-     , directory, filepath, hashable, haskeline, http-client
-     , http-client-tls, http-types, lens, lifted-async, lifted-base
-     , marvin-interpolate, monad-control, monad-logger, monad-loops, mtl
-     , mustache, network-uri, optparse-applicative, random, stm, text
-     , text-icu, time, transformers, transformers-base
-     , unordered-containers, vector, wai, warp, warp-tls, websockets
-     , wreq, wuss
+    ({ mkDerivation, aeson, base, bytestring, conduit, configurator
+     , deepseq, directory, filepath, hashable, haskeline, http-client
+     , http-client-tls, http-types, irc-conduit, lens, lifted-async
+     , lifted-base, marvin-interpolate, monad-control, monad-logger
+     , monad-loops, mtl, mustache, network-uri, optparse-applicative
+     , random, stm, text, text-icu, time, transformers
+     , transformers-base, unordered-containers, vector, wai, warp
+     , warp-tls, websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.1.5";
-       sha256 = "42cebd7af1b7d20575a08bbd1510226761aa2f494f64b0e7110d350f211b504a";
+       version = "0.2.0";
+       sha256 = "7928adc11b0fe646db3bb20333c6dcea09664a7b6a341de9d5ed3bfb639e6301";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring configurator deepseq hashable haskeline
-         http-client http-client-tls http-types lens lifted-async
-         lifted-base marvin-interpolate monad-control monad-logger
-         monad-loops mtl network-uri optparse-applicative random stm text
-         text-icu time transformers transformers-base unordered-containers
-         vector wai warp warp-tls websockets wreq wuss
+         aeson base bytestring conduit configurator deepseq hashable
+         haskeline http-client http-client-tls http-types irc-conduit lens
+         lifted-async lifted-base marvin-interpolate monad-control
+         monad-logger monad-loops mtl network-uri optparse-applicative
+         random stm text text-icu time transformers transformers-base
+         unordered-containers vector wai warp warp-tls websockets wreq wuss
        ];
        executableHaskellDepends = [
          aeson base bytestring configurator directory filepath mustache
          optparse-applicative text
        ];
        homepage = "https://marvin.readthedocs.io";
-       description = "A modular chat bot";
+       description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -117230,8 +118947,8 @@ self: {
      }) {eng = null; mat = null; mx = null;};
 
   "matrices" = callPackage
-    ({ mkDerivation, base, deepseq, primitive, tasty, tasty-hunit
-     , tasty-quickcheck, vector
+    ({ mkDerivation, base, criterion, deepseq, primitive, tasty
+     , tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrices";
@@ -117241,13 +118958,14 @@ self: {
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck vector
        ];
+       benchmarkHaskellDepends = [ base criterion vector ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "matrix" = callPackage
-    ({ mkDerivation, base, deepseq, loop, primitive, QuickCheck, tasty
-     , tasty-quickcheck, vector
+    ({ mkDerivation, base, criterion, deepseq, loop, primitive
+     , QuickCheck, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrix";
@@ -117255,6 +118973,7 @@ self: {
        sha256 = "7a3d41c0f66212360057b29ae9f81779c8da9f71b040ad7676699af7e7ca35b5";
        libraryHaskellDepends = [ base deepseq loop primitive vector ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "A native implementation of matrix operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117733,6 +119452,74 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mediabus" = callPackage
+    ({ mkDerivation, array, async, base, binary, bytestring, cereal
+     , conduit, conduit-combinators, conduit-extra, containers
+     , data-default, deepseq, hspec, lens, lifted-async, monad-control
+     , 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.2.0.2";
+       sha256 = "3dd4d11c4253eebe2ff21368222661341b64e8176171fb4be77b9ee45402f7d1";
+       libraryHaskellDepends = [
+         array async base bytestring cereal conduit conduit-combinators
+         conduit-extra containers data-default deepseq lens lifted-async
+         monad-control 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;
+     }) {};
+
+  "mediabus-rtp" = callPackage
+    ({ mkDerivation, array, async, base, binary, bytestring, cereal
+     , conduit, conduit-combinators, conduit-extra, containers
+     , data-default, deepseq, hspec, lens, lifted-async, mediabus
+     , monad-control, 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.2.0.0";
+       sha256 = "f802521f6f504e1ea56a2c694a216a8b92087f21aa4d493d3c6bf11d27063d27";
+       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 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 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 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;
+     }) {};
+
   "median-stream" = callPackage
     ({ mkDerivation, base, heap, QuickCheck }:
      mkDerivation {
@@ -117850,9 +119637,9 @@ self: {
      }) {};
 
   "megaparsec" = callPackage
-    ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
-     , hspec, hspec-expectations, mtl, QuickCheck, scientific, text
-     , transformers
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , exceptions, hspec, hspec-expectations, mtl, QuickCheck
+     , scientific, text, transformers, weigh
      }:
      mkDerivation {
        pname = "megaparsec";
@@ -117866,6 +119653,7 @@ self: {
          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;
@@ -117972,7 +119760,7 @@ self: {
      }) {};
 
   "memcache" = callPackage
-    ({ mkDerivation, base, binary, blaze-builder, bytestring
+    ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion
      , data-default-class, hashable, network, resource-pool, time
      , vector
      }:
@@ -117987,6 +119775,7 @@ self: {
        testHaskellDepends = [
          base binary blaze-builder bytestring network
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/dterei/memcache-hs";
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
@@ -118001,6 +119790,8 @@ self: {
        pname = "memcache-conduit";
        version = "0.0.3";
        sha256 = "f28e89dcbf1329dec98d67ce055a3eef12bc8c4ef9afeaf3c8adf10db5f632f8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring conduit conduit-extra
          memcache-haskell mtl network resourcet split
@@ -118018,6 +119809,8 @@ self: {
        pname = "memcache-haskell";
        version = "0.0.10.1";
        sha256 = "4c1b7d9c5d12a4ae24ea73ace9489232831bb15b1d8e0d2bb53e926f53b16e48";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring hashable network split transformers
        ];
@@ -118848,19 +120641,22 @@ self: {
      }) {};
 
   "midi-simple" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, generic-random
-     , hspec, hspec-attoparsec, QuickCheck, tasty, tasty-hspec
-     , tasty-quickcheck
+    ({ mkDerivation, attoparsec, base, bytestring, criterion
+     , generic-random, hspec, hspec-attoparsec, QuickCheck, tasty
+     , tasty-hspec, tasty-quickcheck
      }:
      mkDerivation {
        pname = "midi-simple";
        version = "0.1.0.0";
        sha256 = "f680eed206f3623e01817794b9f7dd9a7c8fb6aa935648a3a5cb24119621849a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [
          attoparsec base bytestring generic-random hspec hspec-attoparsec
          QuickCheck tasty tasty-hspec tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/tsahyt/midi-simple#readme";
        description = "A simple and fast library for working with MIDI messages";
        license = stdenv.lib.licenses.lgpl3;
@@ -118969,8 +120765,8 @@ self: {
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.3.5";
-       sha256 = "89e4e32bab7820b01e2b6e45cf70e406af1639aaf8534f769225efd89cc3730a";
+       version = "3.4.1";
+       sha256 = "0f24c72662be4a0e3d75956fff53899216e29ac7eb29dae771c7e4eb77bdd8d5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119443,12 +121239,13 @@ self: {
      }) {};
 
   "minisat-solver" = callPackage
-    ({ mkDerivation, base, containers, transformers }:
+    ({ mkDerivation, base, containers, easyrender, transformers }:
      mkDerivation {
        pname = "minisat-solver";
        version = "0.1";
        sha256 = "c12098dee034afb98b31ce7ac346398b93a3537c11e30e7573d25160120fd37d";
        libraryHaskellDepends = [ base containers transformers ];
+       benchmarkHaskellDepends = [ base containers easyrender ];
        homepage = "http://www.mathstat.dal.ca/~selinger/minisat-solver/";
        description = "High-level Haskell bindings for the MiniSat SAT solver";
        license = stdenv.lib.licenses.mit;
@@ -119715,6 +121512,8 @@ self: {
        pname = "mmap";
        version = "0.5.9";
        sha256 = "58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        description = "Memory mapped files for POSIX and Windows";
        license = stdenv.lib.licenses.bsd3;
@@ -120049,8 +121848,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "1.0.0.41";
-       sha256 = "85905960363cb617541b0f9ec3a93e73a9b9cd761acdf37174864da865c5cb95";
+       version = "1.0.0.42";
+       sha256 = "892870056d66fecae4db37a780a0dcc6c9cb6cae281c2883a20378efc83b019d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120504,7 +122303,7 @@ self: {
      }) {};
 
   "monad-logger-prefix" = callPackage
-    ({ mkDerivation, base, doctest, exceptions, Glob, hspec
+    ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
      , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
      , transformers, transformers-base
      }:
@@ -120517,6 +122316,7 @@ self: {
          transformers transformers-base
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion monad-logger ];
        homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
@@ -120585,7 +122385,7 @@ self: {
      }) {};
 
   "monad-memo" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, primitive
+    ({ mkDerivation, array, base, containers, criterion, mtl, primitive
      , QuickCheck, random, test-framework, test-framework-quickcheck2
      , transformers, vector
      }:
@@ -120600,6 +122400,9 @@ self: {
          array base containers mtl primitive QuickCheck random
          test-framework test-framework-quickcheck2 transformers vector
        ];
+       benchmarkHaskellDepends = [
+         array base containers criterion mtl primitive transformers vector
+       ];
        homepage = "https://github.com/EduardSergeev/monad-memo";
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -121375,7 +123178,7 @@ self: {
 
   "mongoDB" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
-     , binary, bson, bytestring, containers, cryptohash
+     , binary, bson, bytestring, containers, criterion, cryptohash
      , data-default-class, hashtables, hspec, lifted-base, monad-control
      , mtl, network, nonce, old-locale, parsec, random, random-shuffle
      , text, time, tls, transformers-base
@@ -121391,6 +123194,12 @@ self: {
          random-shuffle text tls 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;
@@ -121458,10 +123267,8 @@ self: {
      }:
      mkDerivation {
        pname = "monky";
-       version = "2.1.0.0";
-       sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0";
-       revision = "1";
-       editedCabalFile = "8dac5d11177a4374041712a519d50cb6b1fd41fffe201e77eff44f103257c446";
+       version = "2.1.3.0";
+       sha256 = "a80fee91a2ed4462d2f1688b59cdb13cb0aa0728205ce22592b0b0ad3b72736a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121490,14 +123297,15 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, foldl, hashable
-     , hspec, HUnit, QuickCheck, semigroups, split, text, transformers
-     , unordered-containers, vector, vector-algorithms
+    ({ mkDerivation, base, bytestring, containers, criterion, foldl
+     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+     , text, transformers, unordered-containers, vector
+     , vector-algorithms
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "1.0.1.2";
-       sha256 = "1875b0281b2956530c33d20cfdbc1d0e1d46d09d1f9623cff19c31b7a4d296ea";
+       version = "1.0.1.3";
+       sha256 = "2861eca0d69c759b02cb7e9669b7a3f8a6b0ede2d96984cba295b69bc9c70a72";
        libraryHaskellDepends = [
          base bytestring containers hashable split text transformers
          unordered-containers vector vector-algorithms
@@ -121506,6 +123314,7 @@ self: {
          base bytestring containers foldl hspec HUnit QuickCheck semigroups
          text transformers unordered-containers vector
        ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
@@ -121529,6 +123338,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable-wrapper" = callPackage
+    ({ mkDerivation, base, mono-traversable }:
+     mkDerivation {
+       pname = "mono-traversable-wrapper";
+       version = "0.1.0.1";
+       sha256 = "4d441c3ca20933060c7c60dc83070ecb0059406c3c376680d76e2320390664cb";
+       libraryHaskellDepends = [ base mono-traversable ];
+       homepage = "https://github.com/oisdk/mono-traversable-wrapper";
+       description = "Wrapper providing Foldable instance for MonoFoldables";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monoid-absorbing" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -121542,12 +123363,14 @@ self: {
      }) {};
 
   "monoid-extras" = callPackage
-    ({ mkDerivation, base, groups, semigroupoids, semigroups }:
+    ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
+     }:
      mkDerivation {
        pname = "monoid-extras";
        version = "0.4.2";
        sha256 = "13ff4e055c9656a3e599567cbc4a46ef8617c05534de46909a4239696e34281f";
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121882,16 +123705,16 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers, deepseq
-     , Earley, http-client, http-client-tls, microlens, microlens-mtl
-     , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
-     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
-     , text-format, transformers
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, http-client, http-client-tls
+     , microlens, microlens-mtl, mtl, optparse-applicative, pipes
+     , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-format, transformers
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.6.5";
-       sha256 = "49d292a44d25fe4372856da87380165e1da317c6fafc8bb0d047bbce867787c9";
+       version = "1.6.6";
+       sha256 = "c933dfa0cec4ddb0c5f552ccb70f3ac0f443b70d6bebc5a858d69c5ba8a4ce25";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121900,11 +123723,14 @@ self: {
          system-filepath text text-format transformers
        ];
        libraryToolDepends = [ alex ];
-       executableHaskellDepends = [ base optparse-applicative text ];
+       executableHaskellDepends = [
+         base code-page optparse-applicative text text-format
+       ];
        testHaskellDepends = [
          base mtl QuickCheck system-filepath tasty tasty-hunit
          tasty-quickcheck text transformers
        ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122551,6 +124377,30 @@ self: {
        license = "GPL";
      }) {};
 
+  "mud" = callPackage
+    ({ mkDerivation, base, directory, filepath, free, hspec, mtl
+     , optparse-applicative, parsec, process, QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "mud";
+       version = "0.1.0.0";
+       sha256 = "4043d1226482acf5bd9fd6797b95f24494a3f1b8612bbe4a469dfa0819023f47";
+       revision = "1";
+       editedCabalFile = "6d62d56fc07cd9b413ccbdddbcc517969acf89b1906b2254f0d0fb7c3b85203d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath free mtl optparse-applicative parsec
+         process time unix
+       ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [
+         base directory free hspec mtl QuickCheck time unix
+       ];
+       description = "Multi-version deployer for web applications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mudbath" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptohash, directory
      , github-types, http-conduit, http-types, process, random
@@ -122701,6 +124551,8 @@ self: {
        pname = "multiarg";
        version = "0.30.0.10";
        sha256 = "c9fa623a8e06d62addc2b7ad5102ceac3a6f0db6a67afbc8e693d0d0aec417a1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
@@ -122983,6 +124835,8 @@ self: {
        sha256 = "609650cbbfd102c775b44be3fd7bb4f6732127e64b21dd45ea1af057c5ffb8a6";
        revision = "1";
        editedCabalFile = "a5bd571eb919e74f8ba5313ffca801dce8c1fe1dd2c6699eadab39b0e37ae13b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base monad-control mtl tagged transformers transformers-base
        ];
@@ -123501,7 +125355,7 @@ self: {
      }) {};
 
   "mutable-containers" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim, hspec
+    ({ mkDerivation, base, containers, criterion, ghc-prim, hspec
      , mono-traversable, primitive, QuickCheck, vector
      }:
      mkDerivation {
@@ -123514,6 +125368,7 @@ self: {
        testHaskellDepends = [
          base containers hspec primitive QuickCheck vector
        ];
+       benchmarkHaskellDepends = [ base containers criterion ];
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Abstactions and concrete implementations of mutable containers";
        license = stdenv.lib.licenses.mit;
@@ -123887,8 +125742,8 @@ self: {
      }:
      mkDerivation {
        pname = "mysql-simple";
-       version = "0.4.0.0";
-       sha256 = "0f5ce026b8d45016dc90a543b394a72dae25aa115bfa5e7ae0095a516bb9f04d";
+       version = "0.4.0.1";
+       sha256 = "1b559d28555c88c6ab016b82d6cdd78357e9479d45bfd6cc1b3a88643c4cbf2d";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring blaze-builder blaze-textual
          bytestring mysql old-locale pcre-light text time
@@ -124259,8 +126114,9 @@ self: {
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
-    ({ mkDerivation, base, binary, bytestring, nanomsg, QuickCheck
-     , test-framework, test-framework-quickcheck2, test-framework-th
+    ({ mkDerivation, base, binary, bytestring, criterion, nanomsg
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     , test-framework-th, zeromq4-haskell
      }:
      mkDerivation {
        pname = "nanomsg-haskell";
@@ -124272,6 +126128,9 @@ self: {
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion zeromq4-haskell
+       ];
        homepage = "https://github.com/ivarnymoen/nanomsg-haskell";
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
@@ -124312,6 +126171,8 @@ self: {
        sha256 = "22e31d227770e55123aadb2750c35895f4d635327c7be1ef1ea2655d86180f5d";
        revision = "1";
        editedCabalFile = "ab822c8c3baab11820f06e9c34ba59c97789625020fabf476338cc17b2e74853";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
        librarySystemDepends = [ freeglut GLEW mesa ];
        libraryToolDepends = [ c2hs ];
@@ -124859,6 +126720,8 @@ self: {
        pname = "nested-routes";
        version = "7.2.2";
        sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring composition-extra errors exceptions
          hashable hashtables mtl poly-arity pred-set pred-trie regex-compat
@@ -124974,6 +126837,11 @@ self: {
          process QuickCheck random syb test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
+       benchmarkHaskellDepends = [
+         ansi-wl-pprint base bimap binary binary-strict bytestring
+         containers fgl HList hslogger mtl multiset network parsec process
+         random syb
+       ];
        homepage = "http://frenetic-lang.org";
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
@@ -125034,8 +126902,8 @@ self: {
      }:
      mkDerivation {
        pname = "netlink";
-       version = "1.0.0.4";
-       sha256 = "94061ae1809a11d564ae3a45972c3a49dfbb01054a937cc4d5a2805963260a6d";
+       version = "1.1.0.0";
+       sha256 = "48f59a7822b2e3dab8baed1d1cd3a3dca1e7744a82f9078c71ec1ce3f6ddf083";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125071,8 +126939,8 @@ self: {
 
   "netpbm" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
-     , hspec, HUnit, storable-record, unordered-containers, vector
-     , vector-th-unbox
+     , criterion, hspec, HUnit, storable-record, unordered-containers
+     , vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "netpbm";
@@ -125085,6 +126953,7 @@ self: {
          unordered-containers vector vector-th-unbox
        ];
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://github.com/nh2/haskell-netpbm";
        description = "Loading PBM, PGM, PPM image files";
        license = stdenv.lib.licenses.mit;
@@ -125255,6 +127124,8 @@ self: {
        pname = "netwire-input-glfw";
        version = "0.0.6";
        sha256 = "dd095cf915005ca6d72fa75a1ea7d890e2cdde2b8f16f45a994e413e97d9dd06";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers GLFW-b mtl netwire-input stm
        ];
@@ -125328,6 +127199,8 @@ self: {
        pname = "network-address";
        version = "0.2.0";
        sha256 = "614517e9712b1320ca86a1e77535e6cfb426850ca3e62e49f0eb776543e8e65f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base Cabal ];
        testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
@@ -125872,6 +127745,8 @@ self: {
        pname = "network-service";
        version = "0.1.0.0";
        sha256 = "e41ea01bb2705fde2a862f487ee5e90deeb74ec2ec9282adcc48ba2322b840cb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring bytestring network
        ];
@@ -126002,6 +127877,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport_0_5_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, hashable
+     , transformers
+     }:
+     mkDerivation {
+       pname = "network-transport";
+       version = "0.5.1";
+       sha256 = "29f6e730f7f29990a657dd3750d08eb500557e51a0dd9b60798bbce0f48c8b46";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq hashable transformers
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Network abstraction layer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-amqp" = callPackage
     ({ mkDerivation, amqp, async, base, bytestring, cereal, containers
      , exceptions, lens-family, lens-family-th, network-transport
@@ -126099,14 +127991,16 @@ self: {
 
   "network-transport-zeromq" = callPackage
     ({ mkDerivation, async, base, binary, bytestring, containers
-     , data-accessor, exceptions, network-transport
-     , network-transport-tests, random, semigroups, stm, stm-chans
-     , tasty, tasty-hunit, transformers, zeromq4-haskell
+     , criterion, data-accessor, distributed-process, exceptions
+     , network-transport, network-transport-tests, random, semigroups
+     , stm, stm-chans, tasty, tasty-hunit, transformers, zeromq4-haskell
      }:
      mkDerivation {
        pname = "network-transport-zeromq";
        version = "0.2.1.1";
        sha256 = "93b56e1a2b337c24cc899874d23eed335ff640c5c1e143b69584c4d71f0cca35";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base binary bytestring containers data-accessor exceptions
          network-transport random semigroups stm stm-chans transformers
@@ -126116,6 +128010,9 @@ self: {
          base network-transport network-transport-tests tasty tasty-hunit
          zeromq4-haskell
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion distributed-process
+       ];
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
@@ -126185,6 +128082,8 @@ self: {
        pname = "network-websocket";
        version = "0.3";
        sha256 = "75cd59bd534b39db084c73843c6d29c33e8d3557c440ba19ad24b4252acd7814";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base haskell98 network webserver ];
        homepage = "http://github.com/michaelmelanson/network-websocket";
        description = "WebSocket library";
@@ -126211,9 +128110,9 @@ self: {
      }) {};
 
   "neural" = callPackage
-    ({ mkDerivation, ad, array, attoparsec, base, bytestring, deepseq
-     , directory, doctest, filepath, ghc-typelits-natnormalise, Glob
-     , hspec, JuicyPixels, kan-extensions, lens, monad-par
+    ({ mkDerivation, ad, array, attoparsec, base, bytestring, criterion
+     , deepseq, directory, doctest, filepath, ghc-typelits-natnormalise
+     , Glob, hspec, JuicyPixels, kan-extensions, lens, monad-par
      , monad-par-extras, MonadRandom, mtl, parallel, pipes
      , pipes-bytestring, pipes-safe, pipes-zlib, profunctors, reflection
      , STMonadTrans, text, transformers, typelits-witnesses, vector
@@ -126235,6 +128134,7 @@ self: {
          array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text
        ];
        testHaskellDepends = [ base doctest Glob hspec MonadRandom ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/brunjlar/neural";
        description = "Neural Networks in native Haskell";
        license = stdenv.lib.licenses.mit;
@@ -126461,6 +128361,25 @@ self: {
        pname = "nfc";
        version = "0.0.1";
        sha256 = "524f46e2ccaacf26cd6058fbd7b1e9a27aa62a3338154d9209aa3b49d011d731";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ nfc ];
+       libraryToolDepends = [ c2hs ];
+       homepage = "https://github.com/centromere/nfc#readme";
+       description = "libnfc bindings";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {nfc = null;};
+
+  "nfc_0_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, c2hs, nfc }:
+     mkDerivation {
+       pname = "nfc";
+       version = "0.1.0";
+       sha256 = "63b8f1d434c9e20c1df08ab532c4e098871b0788f9d1b8a5ed84bce1abb01167";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
@@ -127022,6 +128941,8 @@ self: {
        pname = "nonlinear-optimization-ad";
        version = "0.2.2";
        sha256 = "b263aa4b690d8e62917c2090f0549f341858795514b35015a5b27344df03481d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ad base nonlinear-optimization primitive reflection vector
        ];
@@ -127059,8 +128980,9 @@ self: {
      }) {};
 
   "normalization-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit
-     , test-framework, test-framework-hunit, text, unicode-transforms
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
+     , HUnit, test-framework, test-framework-hunit, text
+     , unicode-transforms
      }:
      mkDerivation {
        pname = "normalization-insensitive";
@@ -127073,6 +128995,7 @@ self: {
          base bytestring hashable HUnit test-framework test-framework-hunit
          text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
        homepage = "https://github.com/ppelleti/normalization-insensitive";
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
@@ -127266,8 +129189,8 @@ self: {
      }:
      mkDerivation {
        pname = "nsis";
-       version = "0.3";
-       sha256 = "03af564c2edb8f0e0d291403d3b452c496ef3e2ab33d247b73eddfdec08df570";
+       version = "0.3.1";
+       sha256 = "d747e231d8f22c810e76a1269af4bd778638da7deca3ad3480415fedb5f05c92";
        libraryHaskellDepends = [ base transformers uniplate ];
        testHaskellDepends = [
          base directory process transformers uniplate
@@ -127426,7 +129349,7 @@ self: {
      }) {};
 
   "number-length" = callPackage
-    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+    ({ mkDerivation, base, criterion, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
@@ -127438,6 +129361,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/trskop/number-length";
        description = "Number of digits in a number in decimal and hexadecimal representation";
        license = stdenv.lib.licenses.bsd3;
@@ -127486,8 +129410,8 @@ self: {
      }) {};
 
   "numerals" = callPackage
-    ({ mkDerivation, base, containers, fingertree, HUnit, integer-gmp
-     , QuickCheck, test-framework, test-framework-hunit
+    ({ mkDerivation, base, containers, criterion, fingertree, HUnit
+     , integer-gmp, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text
      }:
      mkDerivation {
@@ -127501,6 +129425,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
@@ -127563,6 +129488,8 @@ self: {
        sha256 = "5327a9ffcc5997a062d2a9ea405130741114a0c6fe440a8e5b6d6c35fe56d8c4";
        revision = "1";
        editedCabalFile = "acbf128b14ff1177ed767ec9ebb89b1c3c0e998d5d031fdd0e4bc64ebc6bffe2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers deepseq non-negative parsec QuickCheck random
          storable-record utility-ht
@@ -127983,6 +129910,8 @@ self: {
        pname = "oberon0";
        version = "0.0.2";
        sha256 = "1b96e40cacb6a00856d55d7059fbefe5aa018a15bf9002189db2868cef7d1e71";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array AspectAG base containers ghc-prim HList mtl murder
          template-haskell transformers uu-parsinglib uulib
@@ -128293,6 +130222,8 @@ self: {
        pname = "oidc-client";
        version = "0.3.0.0";
        sha256 = "fcc89cd54d2493bfabbb4e5d76dd77c0f6dc3005207566cc5cf89272979daf4c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring exceptions http-client
          http-client-tls jose-jwt network network-uri text time tls
@@ -128661,6 +130592,8 @@ self: {
        pname = "opaleye";
        version = "0.5.3.0";
        sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73";
+       revision = "1";
+       editedCabalFile = "0188a5df6e42350cafb8771ed56b190451291bc04767a451c0aba76582bbed28";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -128728,8 +130661,8 @@ self: {
      }:
      mkDerivation {
        pname = "opaleye-trans";
-       version = "0.3.4";
-       sha256 = "84925620c5d596657a3d2467e0fbe297fad2876362da7f063d6b6034910d6e60";
+       version = "0.3.5";
+       sha256 = "9360dd3721ea49d3b738bff65ab518bcf4365d10282ffb3eea05242022ec48fd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -128820,8 +130753,8 @@ self: {
      }) {};
 
   "open-typerep" = callPackage
-    ({ mkDerivation, base, constraints, mtl, syntactic, tagged
-     , template-haskell
+    ({ mkDerivation, base, constraints, criterion, mtl, syntactic
+     , tagged, template-haskell
      }:
      mkDerivation {
        pname = "open-typerep";
@@ -128831,6 +130764,7 @@ self: {
          base constraints mtl syntactic tagged template-haskell
        ];
        testHaskellDepends = [ base syntactic ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
@@ -129016,6 +130950,8 @@ self: {
        pname = "openid";
        version = "0.2.0.2";
        sha256 = "5a33c21ca3e2b652bcea93bd32a96dbeabd336260d7617337331693a3e140d66";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
@@ -129602,8 +131538,8 @@ self: {
      }) {};
 
   "optimal-blocks" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-arbitrary, cryptohash
-     , deepseq, hex, QuickCheck, vector
+    ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
+     , cryptohash, deepseq, hex, QuickCheck, vector
      }:
      mkDerivation {
        pname = "optimal-blocks";
@@ -129618,6 +131554,9 @@ self: {
        testHaskellDepends = [
          base bytestring bytestring-arbitrary deepseq QuickCheck vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq vector
+       ];
        homepage = "https://github.com/tsuraan/optimal-blocks";
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
@@ -129925,13 +131864,18 @@ self: {
      }) {};
 
   "order-statistic-tree" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
+    ({ mkDerivation, base, containers, criterion, deepseq, random
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "order-statistic-tree";
        version = "0.1.1.0";
        sha256 = "0069ae9ad6ed98ca367026e9c1d6be4c553e6ec451aff0f658532e0ed6a692bd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq random
+       ];
        description = "Order statistic trees based on weight-balanced trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130340,13 +132284,14 @@ self: {
      }) {};
 
   "overture" = callPackage
-    ({ mkDerivation, base, doctest }:
+    ({ mkDerivation, base, criterion, doctest }:
      mkDerivation {
        pname = "overture";
        version = "0.0.5";
        sha256 = "fcdbff55a72636cfb27694ea6731cd6233fa57af937de08ee34afa80a78a6957";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "An alternative to some of the Prelude";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130439,9 +132384,9 @@ self: {
      }) {};
 
   "packed-dawg" = callPackage
-    ({ mkDerivation, base, binary, deepseq, HUnit, mtl, QuickCheck
-     , tasty, tasty-hunit, tasty-quickcheck, unordered-containers
-     , vector, vector-binary-instances
+    ({ mkDerivation, base, binary, criterion, deepseq, HUnit, mtl
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , unordered-containers, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "packed-dawg";
@@ -130456,6 +132401,10 @@ self: {
          tasty-quickcheck unordered-containers vector
          vector-binary-instances
        ];
+       benchmarkHaskellDepends = [
+         base binary criterion deepseq mtl unordered-containers vector
+         vector-binary-instances
+       ];
        description = "Generation and traversal of highly compressed directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130735,15 +132684,15 @@ self: {
   "pandoc" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
-     , cmark, containers, data-default, deepseq, Diff, directory
-     , doctemplates, executable-path, extensible-exceptions, filemanip
-     , filepath, ghc-prim, haddock-library, hslua, HTTP, http-client
-     , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network
-     , network-uri, old-time, pandoc-types, parsec, process, QuickCheck
-     , random, scientific, SHA, skylighting, syb, tagsoup, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , texmath, text, time, unix, unordered-containers, vector, xml
-     , yaml, zip-archive, zlib
+     , cmark, containers, criterion, data-default, deepseq, Diff
+     , directory, doctemplates, executable-path, extensible-exceptions
+     , filemanip, filepath, ghc-prim, haddock-library, hslua, HTTP
+     , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl
+     , network, network-uri, old-time, pandoc-types, parsec, process
+     , QuickCheck, random, scientific, SHA, skylighting, syb, tagsoup
+     , temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, texmath, text, time, unix
+     , unordered-containers, vector, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
@@ -130773,6 +132722,7 @@ self: {
          skylighting syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       benchmarkHaskellDepends = [ base criterion syb ];
        doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
@@ -130838,16 +132788,14 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.4.2";
-       sha256 = "fe1121698b9b9804f8ccc43cbbb2e77e40948caa543b42e129bf4ce872a7cd3f";
-       revision = "1";
-       editedCabalFile = "32a7466f513eaacbe70d359813e5f9fbb6f3492f23019e6588d48bd58ed994c2";
+       version = "0.2.5.0";
+       sha256 = "d4d93bbe448e2cf187a0b7bcc605d0445e28021e4e31bfef890b93bee2b28491";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers data-accessor data-accessor-template
-         data-accessor-transformers data-default mtl pandoc pandoc-types
-         roman-numerals syb template-haskell utility-ht
+         data-accessor-transformers data-default directory filepath mtl
+         pandoc pandoc-types roman-numerals syb template-haskell utility-ht
        ];
        executableHaskellDepends = [ base pandoc pandoc-types ];
        testHaskellDepends = [
@@ -130902,8 +132850,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-include-code";
-       version = "0.1.0";
-       sha256 = "f6a14ba6e4d00a27aef573336d6da703a39d1788a5fe9a5d18f080c3486c935c";
+       version = "0.2.0";
+       sha256 = "0241672e57d3bc0a5fa6ae953cf98d6d702b36076d58eaa64490b5089f377b72";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -131618,6 +133566,8 @@ self: {
        sha256 = "3a14c02b9b8b7c72577eb90a8dd72de75d99192def87d7aa79545ee4d6e80645";
        revision = "1";
        editedCabalFile = "75eeeb51593fa2771c8dbc965ca09d830d62e08135870188a10446f842178bee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers extensible-exceptions random
        ];
@@ -132560,8 +134510,8 @@ self: {
     ({ mkDerivation, array, base, HUnit, split, tasty, tasty-hunit }:
      mkDerivation {
        pname = "pathfindingcore";
-       version = "1.2";
-       sha256 = "88990d5daa4beff64a134e11bfbeb81b4f67367ea0345c3c6c3697ead3e14b74";
+       version = "1.2.1";
+       sha256 = "d24f4f8af78e7588daf7fad74b9675facc4b367fc25df5e94dbc93407480dfe0";
        libraryHaskellDepends = [ array base split ];
        testHaskellDepends = [ array base HUnit tasty tasty-hunit ];
        homepage = "http://github.com/TheBizzle";
@@ -132578,6 +134528,8 @@ self: {
        pname = "pathtype";
        version = "0.8";
        sha256 = "14e3b9d03c222a061ffeb40ecc0940d980e25fddd70339d04ec86dbae6f27897";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base deepseq directory old-time QuickCheck tagged time transformers
          utility-ht
@@ -133233,6 +135185,8 @@ self: {
        pname = "peggy";
        version = "0.3.2";
        sha256 = "de689373195748a273ba224adf5eae6dd91ffeee68e4c60ce6230596d521a8ce";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
@@ -133352,6 +135306,8 @@ self: {
        pname = "penny-lib";
        version = "0.22.0.0";
        sha256 = "272c53dc6cecc0353d4a6a53a9d8e6e57babdf485b5f9e1995f3a8b87b38c63b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          action-permutations base binary bytestring cereal containers
          explicit-exception matchers multiarg ofx old-locale parsec prednote
@@ -133419,8 +135375,9 @@ self: {
      }) {};
 
   "perfecthash" = callPackage
-    ({ mkDerivation, array, base, bytestring, cmph, containers, hspec
-     , QuickCheck, time
+    ({ mkDerivation, array, base, bytestring, cmph, containers
+     , criterion, deepseq, hspec, QuickCheck, random, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "perfecthash";
@@ -133432,6 +135389,10 @@ self: {
        testHaskellDepends = [
          base bytestring cmph containers hspec QuickCheck
        ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq random
+         unordered-containers
+       ];
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133795,6 +135756,8 @@ self: {
        pname = "persistent-odbc";
        version = "0.2.0.1";
        sha256 = "b751d48392f61d7b2f3b0cda149dedd04eb1a24912c2075c8640de7313956c67";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers convertible HDBC HDBC-odbc
          monad-control monad-logger persistent persistent-template resourcet
@@ -133940,8 +135903,10 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.6";
-       sha256 = "628670f06cc533adb057649a253e9332aa2b3f69278af8fd32905e9bb00e0ffa";
+       version = "2.6.0.1";
+       sha256 = "84df1475478f8c4aa7790152c89ffca43a08a32cd933e4062cb219a023e4768c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring conduit containers monad-control monad-logger
          old-locale persistent resource-pool resourcet text time
@@ -133984,8 +135949,8 @@ self: {
      }) {};
 
   "persistent-vector" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck
+     , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "persistent-vector";
@@ -133995,6 +135960,7 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base containers criterion deepseq ];
        homepage = "https://github.com/travitch/persistent-vector";
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
@@ -134320,12 +136286,13 @@ self: {
      }) {};
 
   "phantom-state" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, criterion, transformers, vector }:
      mkDerivation {
        pname = "phantom-state";
        version = "0.2.1.2";
        sha256 = "f978ef98e810e9a9e53f1479340ba7a28f80a64aba431322959cbf8c620c3811";
        libraryHaskellDepends = [ base transformers ];
+       benchmarkHaskellDepends = [ base criterion transformers vector ];
        description = "Phantom State Transformer. Like State Monad, but without values.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134721,6 +136688,8 @@ self: {
        sha256 = "130f67f8d018b4f988d434d37fa46d908d4d144ccbd005cfd2773a720ba25e4b";
        revision = "1";
        editedCabalFile = "e89ef8a03720c391eefc8a47c6f947a1b7f4a37762393f45923854e696fcb59b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl parsec picosat pretty
        ];
@@ -134734,9 +136703,11 @@ self: {
      }) {};
 
   "picoparsec" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , monoid-subclasses, QuickCheck, quickcheck-instances
-     , quickcheck-unicode, scientific, tasty, tasty-quickcheck, text
+    ({ mkDerivation, array, attoparsec, base, bytestring
+     , case-insensitive, containers, criterion, deepseq, directory
+     , filepath, ghc-prim, hashable, http-types, monoid-subclasses
+     , parsec, QuickCheck, quickcheck-instances, quickcheck-unicode
+     , scientific, tasty, tasty-quickcheck, text, unordered-containers
      , vector
      }:
      mkDerivation {
@@ -134752,6 +136723,11 @@ self: {
          quickcheck-instances quickcheck-unicode scientific tasty
          tasty-quickcheck text vector
        ];
+       benchmarkHaskellDepends = [
+         array attoparsec base bytestring case-insensitive criterion deepseq
+         directory filepath ghc-prim hashable http-types monoid-subclasses
+         parsec scientific text unordered-containers vector
+       ];
        homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
@@ -134885,6 +136861,8 @@ self: {
        pname = "pinchot";
        version = "0.24.0.0";
        sha256 = "b9769cdecb718c834d6fb04b62c08482f98cbb2a48c8a810ce83db96eff997e5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers Earley lens pretty-show semigroups template-haskell
          transformers
@@ -134923,8 +136901,9 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck
-     , test-framework, test-framework-quickcheck2, transformers
+    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
+     , optparse-applicative, QuickCheck, test-framework
+     , test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "pipes";
@@ -134937,6 +136916,9 @@ self: {
          base mtl QuickCheck test-framework test-framework-quickcheck2
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion mtl optparse-applicative transformers
+       ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135095,6 +137077,7 @@ self: {
          base bytestring bzlib directory hspec MonadRandom pipes
          pipes-bytestring pipes-safe QuickCheck random
        ];
+       benchmarkHaskellDepends = [ base ];
        homepage = "https://github.com/chemist/pipes-bzip";
        description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -135107,6 +137090,8 @@ self: {
        pname = "pipes-cacophony";
        version = "0.4.1";
        sha256 = "bcf15287c4ae951ed12e83c41795dfe212b87cc9b93420dc74783b44e54c5360";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cacophony memory pipes ];
        testHaskellDepends = [ base hlint ];
        homepage = "https://github.com/centromere/pipes-cacophony";
@@ -135198,6 +137183,8 @@ self: {
        pname = "pipes-cliff";
        version = "0.12.0.0";
        sha256 = "4fc4ce908899d20ed1ea8964cfe38bc547476d6901934cbb82e35e4ada5417c5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring pipes pipes-safe process stm unix
        ];
@@ -135297,14 +137284,17 @@ self: {
      }) {};
 
   "pipes-extra" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, mtl, pipes-core
-     , test-framework, test-framework-hunit, test-framework-th-prime
-     , transformers
+    ({ mkDerivation, base, bytestring, conduit, criterion, enumerator
+     , HUnit, mtl, pipes-core, pipes-zlib, test-framework
+     , test-framework-hunit, test-framework-th-prime, transformers, zlib
+     , zlib-conduit, zlib-enum
      }:
      mkDerivation {
        pname = "pipes-extra";
        version = "0.2.0";
        sha256 = "d9ede8b4a837bdecf8fb4e87a1c0d31b5ded403d0e8d900a0e2ae9e493962b7b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring pipes-core transformers
        ];
@@ -135312,6 +137302,10 @@ self: {
          base bytestring HUnit mtl pipes-core test-framework
          test-framework-hunit test-framework-th-prime
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit criterion enumerator pipes-core pipes-zlib
+         transformers zlib zlib-conduit zlib-enum
+       ];
        homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Various basic utilities for Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -135540,6 +137534,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-misc_0_3_0_0" = callPackage
+    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
+     , pipes, pipes-category, pipes-concurrency, semigroups, stm
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-misc";
+       version = "0.3.0.0";
+       sha256 = "1d204e4b329c0d44eca63ccaeaae74e2ea4e95a2934d81de9de0e09906f061f9";
+       libraryHaskellDepends = [
+         base clock Decimal lens mmorph mtl pipes pipes-category
+         pipes-concurrency semigroups stm transformers
+       ];
+       testHaskellDepends = [
+         base hspec lens mmorph pipes pipes-concurrency stm transformers
+       ];
+       homepage = "https://github.com/louispan/pipes-misc#readme";
+       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -135884,6 +137900,8 @@ self: {
        pname = "pipes-zeromq4";
        version = "0.2.0.0";
        sha256 = "24f3ae9640eb6e2180edb8e0fc12bc420c7fa83aa32605900de1d961d93e92fe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
@@ -136221,6 +138239,8 @@ self: {
        pname = "playlists-http";
        version = "0.1.1.0";
        sha256 = "2f5eaeba301115124529aeb72c8608838911209ab9a5830f705214c32dbb26cb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring either exceptions http-client mtl
          playlists text
@@ -136437,10 +138457,8 @@ self: {
      }:
      mkDerivation {
        pname = "plugins";
-       version = "1.5.5.0";
-       sha256 = "57012217c22dce398b3574f45af22404be38de96145e5862d1453c599816f6a2";
-       revision = "1";
-       editedCabalFile = "84dab5882c330bdc39bcecdbc9d8834c4c964241cd4a1ce87d4987947add924a";
+       version = "1.5.6.0";
+       sha256 = "18d17e53eb9068f7da3fe26b45af8d76a7e76645f7ec59f81552e3486c8a80d0";
        libraryHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
@@ -137186,16 +139204,16 @@ self: {
 
   "pontarius-xmpp" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary
-     , bytestring, Cabal, conduit, configurator, containers, crypto-api
-     , crypto-random, cryptohash, cryptohash-cryptoapi, data-default
-     , derive, directory, dns, doctest, exceptions, filepath, hslogger
-     , hspec, hspec-expectations, HUnit, iproute, lens, lens-family
-     , lifted-base, mtl, network, profunctors, pureMD5, QuickCheck
-     , quickcheck-instances, random, ranges, resourcet, smallcheck
-     , split, stm, stringprep, tasty, tasty-hspec, tasty-hunit
-     , tasty-quickcheck, tasty-th, template-haskell, text, tls
-     , transformers, unbounded-delays, void, x509-system, xml-conduit
-     , xml-picklers, xml-types
+     , bytestring, Cabal, conduit, configurator, containers, criterion
+     , crypto-api, crypto-random, cryptohash, cryptohash-cryptoapi
+     , data-default, derive, directory, dns, doctest, exceptions
+     , filepath, hslogger, hspec, hspec-expectations, HUnit, iproute
+     , lens, lens-family, lifted-base, mtl, network, profunctors
+     , pureMD5, QuickCheck, quickcheck-instances, random, ranges
+     , resourcet, smallcheck, split, stm, stringprep, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell, text
+     , tls, transformers, unbounded-delays, void, x509-system
+     , xml-conduit, xml-picklers, xml-types
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
@@ -137218,6 +139236,7 @@ self: {
          tasty-quickcheck tasty-th text tls transformers xml-picklers
          xml-types
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/pontarius/pontarius-xmpp/";
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
@@ -137297,6 +139316,8 @@ self: {
        pname = "pooled-io";
        version = "0.0.2.1";
        sha256 = "7d405a8876d55a9c077a304dd378854bc9e6e20f643c357c82bd3f38297ff9d0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base concurrent-split containers deepseq transformers unsafe
          utility-ht
@@ -137520,7 +139541,8 @@ self: {
      }) {};
 
   "posix-paths" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, HUnit, QuickCheck, unix
+    ({ mkDerivation, base, bytestring, criterion, directory, doctest
+     , filepath, HUnit, process, QuickCheck, unix
      }:
      mkDerivation {
        pname = "posix-paths";
@@ -137530,6 +139552,9 @@ self: {
        testHaskellDepends = [
          base bytestring doctest HUnit QuickCheck unix
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion directory filepath process unix
+       ];
        description = "POSIX filepath/directory functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137635,10 +139660,10 @@ self: {
   "postgresql-binary" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
-     , foldl, json-ast, loch-th, placeholders, postgresql-libpq
-     , QuickCheck, quickcheck-instances, rerebase, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
-     , transformers, uuid, vector
+     , criterion, foldl, json-ast, loch-th, placeholders
+     , postgresql-libpq, QuickCheck, quickcheck-instances, rerebase
+     , scientific, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "postgresql-binary";
@@ -137654,6 +139679,7 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
@@ -137849,21 +139875,20 @@ self: {
      }) {};
 
   "postgresql-simple-bind" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, case-conversion
-     , data-default, exceptions, heredoc, hspec, postgresql-simple
-     , template-haskell, text, time
+    ({ mkDerivation, attoparsec, base, bytestring, data-default
+     , exceptions, heredoc, hspec, postgresql-simple, template-haskell
+     , text, time
      }:
      mkDerivation {
        pname = "postgresql-simple-bind";
-       version = "0.3.0.0";
-       sha256 = "d80ea7b091a66eac0e3da8fc22804a39ccbb1ca6e4cfa0f2b3b2ffd569e0999a";
+       version = "0.4.0";
+       sha256 = "a313032f8a8a0c6b97094d396afcd81a04a2d017699a08b5e2cbc2b8309cf284";
        libraryHaskellDepends = [
          attoparsec base bytestring data-default exceptions heredoc
          postgresql-simple template-haskell text time
        ];
        testHaskellDepends = [
-         attoparsec base bytestring case-conversion data-default hspec
-         postgresql-simple text
+         base bytestring hspec postgresql-simple text
        ];
        description = "FFI-like bindings for PostgreSQL stored functions";
        license = stdenv.lib.licenses.bsd3;
@@ -138084,6 +140109,8 @@ self: {
        pname = "postie";
        version = "0.5.0.0";
        sha256 = "93e32bd30b22c7f6474958abc3f65bf467c1fea403aa130996dab396233f0fc7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base bytestring cprng-aes data-default-class mtl network
          pipes pipes-parse stringsearch tls transformers uuid
@@ -138101,6 +140128,8 @@ self: {
        pname = "postmark";
        version = "0.1.1";
        sha256 = "5c3d4c458d6b2683a2ec36380c216b05c297ba053cac4ede801531dba35f01ca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers http-client-tls
          http-types network-api-support text
@@ -138111,6 +140140,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postmark-streams" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
+     , bytestring, http-streams, io-streams, text, time
+     }:
+     mkDerivation {
+       pname = "postmark-streams";
+       version = "0.1.0.0";
+       sha256 = "5bc30a4c0688b85a93c91c12b17df0e68449dc45d9da5ba7a75db5e9e3b4fc4e";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring binary bytestring
+         http-streams io-streams text time
+       ];
+       description = "Send email via Postmark using io-streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postmaster" = callPackage
     ({ mkDerivation, adns, base, bytestring, containers, directory
      , hopenssl, hsdns, hsemail, hsyslog, mtl, network, old-time
@@ -138219,9 +140264,9 @@ self: {
      }) {};
 
   "powerqueue-levelmem" = callPackage
-    ({ mkDerivation, async, base, bytestring, cereal, dlist, filepath
-     , focus, hspec, leveldb, leveldb-haskell, list-t, powerqueue
-     , snappy, stm, stm-containers, temporary, unagi-chan
+    ({ mkDerivation, async, base, bytestring, cereal, criterion, dlist
+     , filepath, focus, hspec, leveldb, leveldb-haskell, list-t
+     , powerqueue, snappy, stm, stm-containers, temporary, unagi-chan
      }:
      mkDerivation {
        pname = "powerqueue-levelmem";
@@ -138235,6 +140280,10 @@ self: {
          async base cereal hspec powerqueue temporary
        ];
        testSystemDepends = [ leveldb snappy ];
+       benchmarkHaskellDepends = [
+         base cereal criterion powerqueue temporary
+       ];
+       benchmarkSystemDepends = [ leveldb snappy ];
        homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
@@ -138428,9 +140477,10 @@ self: {
 
   "pred-trie" = callPackage
     ({ mkDerivation, attoparsec, base, composition-extra, containers
-     , deepseq, errors, hashable, hashtables, mtl, poly-arity, pred-set
-     , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, text, tries, unordered-containers
+     , criterion, deepseq, errors, hashable, hashtables, mtl, poly-arity
+     , pred-set, QuickCheck, quickcheck-instances, semigroups, sets
+     , tasty, tasty-hunit, tasty-quickcheck, text, tries
+     , unordered-containers
      }:
      mkDerivation {
        pname = "pred-trie";
@@ -138446,6 +140496,11 @@ self: {
          poly-arity QuickCheck quickcheck-instances semigroups tasty
          tasty-hunit tasty-quickcheck text tries unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base composition-extra criterion deepseq hashable mtl
+         poly-arity QuickCheck semigroups sets text tries
+         unordered-containers
+       ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138547,6 +140602,8 @@ self: {
        pname = "prefork";
        version = "0.0.9";
        sha256 = "883b866c1c9b3adf2aa1b368db8ac1619666bd0506d3c3f5486e79c49eef2a7f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers data-default process stm system-argv0
          system-filepath unix
@@ -138656,6 +140713,8 @@ self: {
        pname = "prelude-plus";
        version = "0.0.0.6";
        sha256 = "5b4ec409806660b7f06e51e9df2e06caf88219a78785202424fd050750012b8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
@@ -138933,17 +140992,20 @@ self: {
      }) {};
 
   "pretty-simple" = callPackage
-    ({ mkDerivation, ansi-terminal, base, containers, doctest, Glob
-     , mtl, parsec, text, transformers
+    ({ mkDerivation, ansi-terminal, base, containers, criterion
+     , doctest, Glob, mtl, parsec, text, transformers
      }:
      mkDerivation {
        pname = "pretty-simple";
        version = "2.0.0.0";
        sha256 = "e64bfc73a962bba3f773e8e271d63e3e25924e1a6febbea7d3935d37ae856fbe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base containers mtl parsec text transformers
        ];
        testHaskellDepends = [ base doctest Glob ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/cdepillabout/pretty-simple";
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
@@ -139008,13 +141070,16 @@ self: {
      }) {};
 
   "prim-spoon" = callPackage
-    ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, spoon }:
+    ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
+     , spoon
+     }:
      mkDerivation {
        pname = "prim-spoon";
        version = "0.1.0";
        sha256 = "3349b21d56c9c635c89b679d805e155cf658a26a675f553cbb261d61b776a27c";
        libraryHaskellDepends = [ base ghc-prim spoon ];
        testHaskellDepends = [ base HUnit QuickCheck spoon ];
+       benchmarkHaskellDepends = [ base criterion ghc-prim spoon ];
        homepage = "https://github.com/michaeljklein/prim-spoon";
        description = "Catch errors thrown from pure computations using primops";
        license = stdenv.lib.licenses.bsd3;
@@ -139089,12 +141154,15 @@ self: {
      }) {};
 
   "primitive-simd" = callPackage
-    ({ mkDerivation, base, ghc-prim, primitive, vector }:
+    ({ mkDerivation, base, criterion, deepseq, ghc-prim, primitive
+     , random, vector
+     }:
      mkDerivation {
        pname = "primitive-simd";
        version = "0.1.0.0";
        sha256 = "d131c7a6aedc55c113e71fbc22cd79e2105186fb5e359236de04abe46433b58d";
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
+       benchmarkHaskellDepends = [ base criterion deepseq random vector ];
        description = "SIMD data types and functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139309,8 +141377,8 @@ self: {
      }) {};
 
   "probable" = callPackage
-    ({ mkDerivation, base, mtl, mwc-random, primitive, statistics
-     , transformers, vector
+    ({ mkDerivation, base, criterion, mtl, mwc-random, mwc-random-monad
+     , primitive, statistics, transformers, vector
      }:
      mkDerivation {
        pname = "probable";
@@ -139319,6 +141387,9 @@ self: {
        libraryHaskellDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion mwc-random mwc-random-monad vector
+       ];
        homepage = "http://github.com/alpmestan/probable";
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
@@ -139356,14 +141427,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "process_1_5_0_0" = callPackage
+  "process_1_6_0_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory, filepath
      , unix
      }:
      mkDerivation {
        pname = "process";
-       version = "1.5.0.0";
-       sha256 = "a87b228f52272ef20dd15260e40b3b4550205bac7d42ef0f0c0ad31d1f475c77";
+       version = "1.6.0.0";
+       sha256 = "3534c9a7e48a0d4417c230f4c6abbc3991e7919ea5a68c7de22729f7fcd8da0b";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base bytestring directory ];
        description = "Process libraries";
@@ -139655,6 +141726,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "product-profunctors_0_8_0_3" = callPackage
+    ({ mkDerivation, base, contravariant, profunctors, tagged
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "product-profunctors";
+       version = "0.8.0.3";
+       sha256 = "4fa4b1c6ba4f84305ef11e001695a7027f37d4a88bf34996ed3724233ac40cc9";
+       libraryHaskellDepends = [
+         base contravariant profunctors tagged template-haskell
+       ];
+       testHaskellDepends = [ base profunctors ];
+       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
+       description = "product-profunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prof2dot" = callPackage
     ({ mkDerivation, base, containers, filepath, haskell98, parsec }:
      mkDerivation {
@@ -139769,6 +141858,8 @@ self: {
        pname = "progressbar";
        version = "0.0.1";
        sha256 = "da0e18e771284738de24858b87c96b135c591df5158b1a212b9edcc6fad5ce27";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base io-reactive ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
@@ -139965,8 +142056,8 @@ self: {
 
   "prometheus-client" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , doctest, hspec, mtl, QuickCheck, random-shuffle, stm, time
-     , transformers, utf8-string
+     , criterion, doctest, hspec, mtl, QuickCheck, random
+     , random-shuffle, stm, time, transformers, utf8-string
      }:
      mkDerivation {
        pname = "prometheus-client";
@@ -139980,6 +142071,9 @@ self: {
          atomic-primops base bytestring containers doctest hspec mtl
          QuickCheck random-shuffle stm time transformers utf8-string
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion random utf8-string
+       ];
        homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Haskell client library for http://prometheus.io.";
        license = stdenv.lib.licenses.asl20;
@@ -140063,8 +142157,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.3.0";
-       sha256 = "dba271f7078786ba229c5dfe72caf4f03b92044506fab82e1a0ed24c555d9172";
+       version = "3.3.1";
+       sha256 = "32f2d2f709a94805fc89b4368d87cba556e0e80984dceb8b0df242a93a69f635";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140166,6 +142260,8 @@ self: {
        pname = "proteaaudio";
        version = "0.6.5";
        sha256 = "37c7d4272502afe08736bdbab192c95da578a71a6c1ae3ae7beea1fa797b342e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
@@ -140643,9 +142739,10 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
-     , QuickCheck, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
+     , QuickCheck, random, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, unordered-containers
      }:
      mkDerivation {
        pname = "psqueues";
@@ -140656,6 +142753,10 @@ self: {
          array base deepseq ghc-prim hashable HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree-psqueue ghc-prim
+         hashable mtl PSQueue random unordered-containers
+       ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140697,13 +142798,16 @@ self: {
      }) {};
 
   "publicsuffix" = callPackage
-    ({ mkDerivation, base, filepath, hspec, template-haskell }:
+    ({ mkDerivation, base, criterion, filepath, hspec, random
+     , template-haskell
+     }:
      mkDerivation {
        pname = "publicsuffix";
        version = "0.20170109";
        sha256 = "1b8c8b6c4eb93604598f5f6b7b671cc72b2f0d50a4dfe174e97a72d9919c1844";
        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;
@@ -140947,6 +143051,8 @@ self: {
        pname = "pulseaudio";
        version = "0.0.2.0";
        sha256 = "72cbacaf7c94bdaa27c9e0d299a00fe3f31e0cc0f9c2d6e7de9690b3154c078e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers stm unix ];
        librarySystemDepends = [ libpulseaudio ];
        description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api";
@@ -141085,7 +143191,7 @@ self: {
   "pure-zlib" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , bytestring-builder, containers, filepath, fingertree, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "pure-zlib";
@@ -141102,6 +143208,7 @@ self: {
          base base-compat bytestring filepath HUnit QuickCheck tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base base-compat bytestring time ];
        homepage = "http://github.com/GaloisInc/pure-zlib";
        description = "A Haskell-only implementation of zlib / DEFLATE";
        license = stdenv.lib.licenses.bsd3;
@@ -141304,6 +143411,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pushbullet-types" = callPackage
+    ({ mkDerivation, aeson, base, http-api-data, microlens
+     , microlens-th, scientific, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pushbullet-types";
+       version = "0.1.0.0";
+       sha256 = "0b9ecf81378eb74d27102c2253b4ecef75032b25f40242fcb99c7fbbe99df4b4";
+       libraryHaskellDepends = [
+         aeson base http-api-data microlens microlens-th scientific text
+         time unordered-containers
+       ];
+       description = "Datatypes used by the Pushbullet APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pusher-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, MissingH
      , mtl, SHA, time
@@ -141759,8 +143882,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "1.0.0.1";
-       sha256 = "ab437b12f05962d92a54a9dbaec62bb1df4cf688434b42ea3d3c958ee2a8278e";
+       version = "1.0.0.2";
+       sha256 = "b9c758375936269cfc16bd28b82adcbab3e8ed79e48e88fc2e23a8e89ec0d504";
        libraryHaskellDepends = [
          aeson base bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels lens MissingH optparse-applicative process
@@ -142097,6 +144220,8 @@ self: {
        pname = "questioner";
        version = "0.1.1.0";
        sha256 = "83ab4047671f59832eaa377e3fb3fce547439550f57479dd09e0ad4975250617";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal base readline terminal-size
        ];
@@ -142895,22 +145020,24 @@ self: {
      }) {};
 
   "raaz" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hspec, HUnit, mtl
-     , QuickCheck, transformers, vector
+    ({ mkDerivation, base, blaze-builder, bytestring, criterion
+     , deepseq, hspec, HUnit, mtl, pretty, QuickCheck, transformers
+     , vector
      }:
      mkDerivation {
        pname = "raaz";
-       version = "0.0.2";
-       sha256 = "89009f7ef7f7f995781f124ef99322eec0f2b820ca926eb529f41680c52b2f7a";
+       version = "0.1.0";
+       sha256 = "40f9ec9f735fbf45310d717ee39937740a09e8509f16d4950a5f3446a50e8650";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring deepseq mtl transformers vector
-       ];
+       libraryHaskellDepends = [ base bytestring deepseq mtl vector ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck transformers vector
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion pretty
+       ];
        homepage = "http://github.com/raaz-crypto/raaz";
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
@@ -143015,8 +145142,8 @@ self: {
      }) {};
 
   "rados-haskell" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, hspec, HUnit
-     , mtl, rados, uuid
+    ({ mkDerivation, async, base, bytestring, containers, criterion
+     , hspec, HUnit, mtl, rados, transformers, uuid
      }:
      mkDerivation {
        pname = "rados-haskell";
@@ -143030,6 +145157,9 @@ self: {
          async base bytestring hspec HUnit mtl uuid
        ];
        testSystemDepends = [ rados ];
+       benchmarkHaskellDepends = [
+         async base bytestring criterion mtl transformers
+       ];
        homepage = "github";
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -143239,13 +145369,15 @@ self: {
      }) {};
 
   "ramus" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }:
+    ({ mkDerivation, base, criterion, hspec, QuickCheck, quickcheck-io
+     }:
      mkDerivation {
        pname = "ramus";
        version = "0.1.2";
        sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/NickSeagull/ramus#readme";
        description = "Elm signal system for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -143681,16 +145813,17 @@ self: {
   "rasa" = callPackage
     ({ mkDerivation, async, base, bifunctors, containers, data-default
      , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse
-     , QuickCheck, quickcheck-instances, text, text-lens, transformers
-     , yi-rope
+     , profunctors, QuickCheck, quickcheck-instances, text, text-lens
+     , transformers, yi-rope
      }:
      mkDerivation {
        pname = "rasa";
-       version = "0.1.9";
-       sha256 = "8dd969c39222963cf97033e13a141fbc9b1f075b8c7af6428ef72bef9439cf3c";
+       version = "0.1.10";
+       sha256 = "970bd5b3dfac3a8050e2daea281d15b3b1dc499824cad392225d1e4d483527e8";
        libraryHaskellDepends = [
-         async base bifunctors containers data-default free lens mtl pipes
-         pipes-concurrency pipes-parse text text-lens transformers yi-rope
+         async base bifunctors containers data-default free hspec lens mtl
+         pipes pipes-concurrency pipes-parse profunctors text text-lens
+         transformers yi-rope
        ];
        testHaskellDepends = [
          base hspec lens QuickCheck quickcheck-instances text yi-rope
@@ -143701,20 +145834,19 @@ self: {
      }) {};
 
   "rasa-example-config" = callPackage
-    ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-cursors
-     , rasa-ext-files, rasa-ext-logger, rasa-ext-slate
-     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views, rasa-ext-vim
+    ({ mkDerivation, base, data-default, lens, mtl, rasa
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-logger, rasa-ext-slate
+     , rasa-ext-views, rasa-ext-vim, yi-rope
      }:
      mkDerivation {
        pname = "rasa-example-config";
-       version = "0.1.3";
-       sha256 = "471525573811177d6d5aaaeff5353ce154f1f44ccf1f29a865439d94b5ceca93";
+       version = "0.1.4";
+       sha256 = "160d148c51615b71900053186cefa5f12e5530aaae6328424d62bbaca6e7e6cd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base lens mtl rasa rasa-ext-cursors rasa-ext-files rasa-ext-logger
-         rasa-ext-slate rasa-ext-status-bar rasa-ext-style rasa-ext-views
-         rasa-ext-vim
+         base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
+         rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Example user config for Rasa";
@@ -143754,16 +145886,15 @@ self: {
      }) {};
 
   "rasa-ext-cursors" = callPackage
-    ({ mkDerivation, base, data-default, lens, mtl, rasa
-     , rasa-ext-style, text, text-lens, yi-rope
+    ({ mkDerivation, base, data-default, lens, mtl, rasa, text
+     , text-lens, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-cursors";
-       version = "0.1.5";
-       sha256 = "81c949b85bf60cb814cedf0fd58d1082cc161ee820caacd86d8754e8dd9f2d93";
+       version = "0.1.6";
+       sha256 = "c1407b36255825f4708ccffb9b04cdb1cd93da417cc2c337033b10306626390e";
        libraryHaskellDepends = [
-         base data-default lens mtl rasa rasa-ext-style text text-lens
-         yi-rope
+         base data-default lens mtl rasa text text-lens yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext adding cursor(s)";
@@ -143771,16 +145902,16 @@ self: {
      }) {};
 
   "rasa-ext-files" = callPackage
-    ({ mkDerivation, base, data-default, lens, rasa, rasa-ext-cmd
-     , rasa-ext-status-bar, rasa-ext-views, text, yi-rope
+    ({ mkDerivation, base, data-default, lens, mtl, rasa, rasa-ext-cmd
+     , rasa-ext-views, text, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-files";
-       version = "0.1.3";
-       sha256 = "094f8127c8266a0f988661ada65d0ff08979025cb1939edff8199cdcfd0da06f";
+       version = "0.1.4";
+       sha256 = "d824e1eec8ce6b92453e957c10859351c23306463b08bdcdfc5d635471147957";
        libraryHaskellDepends = [
-         base data-default lens rasa rasa-ext-cmd rasa-ext-status-bar
-         rasa-ext-views text yi-rope
+         base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text
+         yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for filesystem actions";
@@ -143802,16 +145933,15 @@ self: {
 
   "rasa-ext-slate" = callPackage
     ({ mkDerivation, base, lens, mtl, rasa, rasa-ext-logger
-     , rasa-ext-status-bar, rasa-ext-style, rasa-ext-views
-     , recursion-schemes, text, vty, yi-rope
+     , rasa-ext-views, recursion-schemes, text, vty, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-slate";
-       version = "0.1.6";
-       sha256 = "0e11bf0c2e01faf5279dc8b4e2c19f4318d74bc29eb3652966b590b906c2cca8";
+       version = "0.1.7";
+       sha256 = "6773e509862723cc02776cd05db0dea70a179433a57ab635f37124964738d312";
        libraryHaskellDepends = [
-         base lens mtl rasa rasa-ext-logger rasa-ext-status-bar
-         rasa-ext-style rasa-ext-views recursion-schemes text vty yi-rope
+         base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes
+         text vty yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa extension for rendering to terminal with vty";
@@ -143845,14 +145975,15 @@ self: {
 
   "rasa-ext-views" = callPackage
     ({ mkDerivation, base, bifunctors, data-default, lens, mtl, rasa
-     , recursion-schemes
+     , recursion-schemes, yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-views";
-       version = "0.1.3";
-       sha256 = "28413cc5643edb08b4095deaf973525a77496ce6d17df22915fa17daf2495691";
+       version = "0.1.4";
+       sha256 = "5542a37a779efe0e97ecbadbed2409414c99705a9298d0dfc5915f56682e11c0";
        libraryHaskellDepends = [
          base bifunctors data-default lens mtl rasa recursion-schemes
+         yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering views";
@@ -143862,16 +145993,16 @@ self: {
 
   "rasa-ext-vim" = callPackage
     ({ mkDerivation, base, data-default, hspec, lens, mtl, rasa
-     , rasa-ext-cursors, rasa-ext-files, rasa-ext-status-bar
-     , rasa-ext-views, text, text-lens, yi-rope
+     , rasa-ext-cursors, rasa-ext-files, rasa-ext-views, text, text-lens
+     , yi-rope
      }:
      mkDerivation {
        pname = "rasa-ext-vim";
-       version = "0.1.5";
-       sha256 = "bb90b7cf5c3e1a7cf212690e8ae1b58cb58a7ead5defa6e21bd6d0fd5136b9e6";
+       version = "0.1.6";
+       sha256 = "e97e6d096eee5f02ed022407276653ed33657f82ef708ad8095a3caf1fddb22a";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
-         rasa-ext-status-bar rasa-ext-views text text-lens yi-rope
+         rasa-ext-views text text-lens yi-rope
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/ChrisPenner/rasa/";
@@ -144123,8 +146254,8 @@ self: {
      }) {};
 
   "rawr" = callPackage
-    ({ mkDerivation, base, deepseq, doctest, ghc-datasize, ghc-prim
-     , lens, tasty, tasty-hunit, template-haskell
+    ({ mkDerivation, base, criterion, deepseq, doctest, ghc-datasize
+     , ghc-prim, lens, tasty, tasty-hunit, template-haskell
      }:
      mkDerivation {
        pname = "rawr";
@@ -144134,6 +146265,7 @@ self: {
        testHaskellDepends = [
          base deepseq doctest ghc-datasize lens tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/pkmx/rawr";
        description = "Anonymous extensible records";
        license = stdenv.lib.licenses.bsd3;
@@ -144153,13 +146285,18 @@ self: {
      }) {};
 
   "raz" = callPackage
-    ({ mkDerivation, base, deepseq, MonadRandom }:
+    ({ mkDerivation, base, containers, criterion, deepseq, MonadRandom
+     , random, transformers
+     }:
      mkDerivation {
        pname = "raz";
        version = "0.1.0.0";
        sha256 = "ee0c0fcff08e7f2faf28218b61cd5cb0b04031d13c73b71f2f735694eb96c215";
        libraryHaskellDepends = [ base deepseq MonadRandom ];
        testHaskellDepends = [ base MonadRandom ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq MonadRandom random transformers
+       ];
        homepage = "https://github.com/Lysxia/raz.haskell";
        description = "Random Access Zippers";
        license = stdenv.lib.licenses.mit;
@@ -144258,8 +146395,8 @@ self: {
      }) {};
 
   "rdf" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, deepseq, dlist, fgl
-     , text, transformers
+    ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq
+     , dlist, fgl, text, transformers
      }:
      mkDerivation {
        pname = "rdf";
@@ -144268,16 +146405,20 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring deepseq dlist fgl text transformers
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/traviswhitaker/rdf";
        description = "Representation and Incremental Processing of RDF Data";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "rdf4h" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, hashable, hgal, HTTP, HUnit, hxt, network, network-uri
-     , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck
-     , text, text-binary, unordered-containers, utf8-string
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, directory, hashable, hgal, HTTP, HUnit, hxt, network
+     , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit
+     , tasty-quickcheck, text, text-binary, unordered-containers
+     , utf8-string
      }:
      mkDerivation {
        pname = "rdf4h";
@@ -144297,6 +146438,7 @@ self: {
          base bytestring containers directory HUnit network network-uri
          QuickCheck safe tasty tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/robstewart57/rdf4h";
        description = "A library for RDF processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -144371,6 +146513,8 @@ self: {
        pname = "react-flux";
        version = "1.2.3";
        sha256 = "65c868e8b6522b1042d4d53aa9eb0e5cd4fe34a0e6bbae8f56279440bfbfb1c7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring deepseq mtl template-haskell text time
          unordered-containers
@@ -144526,8 +146670,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-gi-gtk";
-       version = "0.1.0.0";
-       sha256 = "adb56a19f5021b446929620bdb6a3977194d1e47698f192173f7e7e169821f30";
+       version = "0.2.0.0";
+       sha256 = "8ae81b3609e83f24765f31c0c50ccca88da9cd70a2a8566bff4727673becf615";
        libraryHaskellDepends = [
          base gi-gtk haskell-gi-base reactive-banana text transformers
        ];
@@ -144574,6 +146718,8 @@ self: {
        pname = "reactive-banana-threepenny";
        version = "0.7.1.3";
        sha256 = "2a51bbecf637916ac67cd8803fd08072927bb38024c10e857a5677960f5e60b9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
@@ -144588,6 +146734,8 @@ self: {
        version = "1.1.1.0";
        sha256 = "790e671d7eadfeacd7a21e4e415e7e79b1e885ef3b01aa1c6848ca8b0dabfefb";
        configureFlags = [ "-f-buildexamples" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
@@ -144768,6 +146916,8 @@ self: {
        pname = "read-editor";
        version = "0.1.0.2";
        sha256 = "ed8aeca86823fbaf11a0a543fd106c9c3abe65216ea974ed56050cbebf777085";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base directory process ];
        homepage = "https://github.com/yamadapc/haskell-read-editor";
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
@@ -144812,6 +146962,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "readcsv" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "readcsv";
+       version = "0.1";
+       sha256 = "dc30c00dd05156749ff38d42eed15c73a493fc0b66b630eab256c4e359456c88";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/george-steel/readcsv";
+       description = "Lightweight CSV parser/emitter based on ReadP";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "readline" = callPackage
     ({ mkDerivation, base, ncurses, process, readline }:
      mkDerivation {
@@ -145038,8 +147200,8 @@ self: {
      }) {};
 
   "record-preprocessor" = callPackage
-    ({ mkDerivation, base, base-prelude, conversion, conversion-text
-     , record-syntax, text
+    ({ mkDerivation, base, base-prelude, basic-lens, conversion
+     , conversion-text, record, record-syntax, text
      }:
      mkDerivation {
        pname = "record-preprocessor";
@@ -145050,6 +147212,7 @@ self: {
        executableHaskellDepends = [
          base base-prelude conversion conversion-text record-syntax text
        ];
+       benchmarkHaskellDepends = [ base-prelude basic-lens record ];
        doHaddock = false;
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
@@ -145073,6 +147236,9 @@ self: {
        testHaskellDepends = [
          base base-prelude directory doctest filepath hspec record
        ];
+       benchmarkHaskellDepends = [
+         base-prelude conversion conversion-text record text
+       ];
        homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
@@ -145236,8 +147402,8 @@ self: {
 
   "redis-io" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base, bytestring
-     , bytestring-conversion, containers, exceptions, iproute
-     , monad-control, mtl, network, operational, redis-resp
+     , bytestring-conversion, containers, criterion, exceptions, hedis
+     , iproute, monad-control, mtl, network, operational, redis-resp
      , resource-pool, semigroups, stm, tasty, tasty-hunit, time, tinylog
      , transformers, transformers-base
      }:
@@ -145255,6 +147421,9 @@ self: {
          async base bytestring bytestring-conversion containers redis-resp
          tasty tasty-hunit tinylog transformers
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion hedis redis-resp tinylog transformers
+       ];
        homepage = "https://gitlab.com/twittner/redis-io/";
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
@@ -145367,14 +147536,16 @@ self: {
      }) {};
 
   "reedsolomon" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, gitrev, loop, mtl
-     , primitive, profunctors, QuickCheck, random, tasty, tasty-ant-xml
-     , tasty-hunit, tasty-quickcheck, vector
+    ({ mkDerivation, base, bytestring, criterion, exceptions, gitrev
+     , loop, mtl, primitive, profunctors, QuickCheck, random, tasty
+     , tasty-ant-xml, tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "reedsolomon";
        version = "0.0.4.3";
        sha256 = "b74acd24ee1524e684860a20a8bf44eea5524ff8fd22c6efd0baf20bb5a0a42b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring exceptions gitrev loop mtl primitive profunctors
          vector
@@ -145384,6 +147555,9 @@ self: {
          QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck
          vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion exceptions loop mtl primitive vector
+       ];
        homepage = "http://github.com/NicolasT/reedsolomon";
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
@@ -145602,10 +147776,11 @@ self: {
      }) {};
 
   "reflex" = callPackage
-    ({ mkDerivation, base, containers, dependent-map, dependent-sum
-     , exception-transformers, haskell-src-exts, haskell-src-meta
-     , MemoTrie, mtl, primitive, ref-tf, semigroups, syb
-     , template-haskell, these, transformers, transformers-compat
+    ({ mkDerivation, base, containers, criterion, deepseq
+     , dependent-map, dependent-sum, exception-transformers
+     , haskell-src-exts, haskell-src-meta, MemoTrie, mtl, primitive
+     , ref-tf, semigroups, split, stm, syb, template-haskell, these
+     , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "reflex";
@@ -145621,6 +147796,10 @@ self: {
        testHaskellDepends = [
          base containers dependent-map MemoTrie mtl ref-tf
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq dependent-map dependent-sum mtl
+         primitive ref-tf split stm transformers
+       ];
        homepage = "https://github.com/reflex-frp/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -145897,6 +148076,8 @@ self: {
        pname = "refresht";
        version = "0.1.1.0";
        sha256 = "07350b47c06d2a1466419b33fa6983dd289fa33713c046b57f2ec92303bc633f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
        homepage = "https://github.com/konn/refresht#readme";
        description = "Environment Monad with automatic resource refreshment";
@@ -145925,8 +148106,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.2.0.1";
-       sha256 = "43ee04802ef3a4d6884cd97c73a261277d89eaa80abc31f148bd0b8f9c6f4a31";
+       version = "0.3.0.0";
+       sha256 = "f0f8c9722a601edfc2fb7963956f331f3dd1e1655fafb07758aad6defea579de";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable heredoc
          regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
@@ -146084,8 +148265,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "0.2.0.1";
-       sha256 = "73b95d1ca92342fff14b2a5f634b8b1a703d22e6a32140a6f0faea2c68ca55a1";
+       version = "0.3.0.0";
+       sha256 = "c274ffacf3eeecb9e9530d07fd44dd0539c8225923ae0cb82b5d48ad6333903b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -146712,13 +148893,16 @@ self: {
      }) {};
 
   "reinterpret-cast" = callPackage
-    ({ mkDerivation, array, base, data-binary-ieee754, hspec, loop }:
+    ({ mkDerivation, array, base, criterion, data-binary-ieee754, hspec
+     , loop
+     }:
      mkDerivation {
        pname = "reinterpret-cast";
        version = "0.1.0";
        sha256 = "5654622c904b42c62f2473c64624715dbd458ea00209ed9ab39396eabc1353e4";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
+       benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ];
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
@@ -146857,6 +149041,8 @@ self: {
        pname = "relational-record-examples";
        version = "0.3.1.1";
        sha256 = "56d726b946e454390b4efbda9e7effe11343c88aeb6390f9516b51445e96a242";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base HDBC HDBC-session HDBC-sqlite3 persistable-record
          relational-query relational-query-HDBC relational-schemas
@@ -147328,8 +149514,9 @@ self: {
      }) {};
 
   "repa-fftw" = callPackage
-    ({ mkDerivation, base, carray, fft, repa, storable-complex, tasty
-     , tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, carray, criterion, deepseq, fft, random
+     , repa, repa-algorithms, storable-complex, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "repa-fftw";
@@ -147339,6 +149526,9 @@ self: {
        testHaskellDepends = [
          base repa tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq random repa repa-algorithms
+       ];
        description = "Perform fft with repa via FFTW";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147447,6 +149637,8 @@ self: {
        pname = "repa-sndfile";
        version = "3.2.3.3";
        sha256 = "68bee7a0b5fb4afefc77235987b2bff74b8e60c0d0b46aa3ba8a057d226cf95d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base hsndfile repa ];
        testHaskellDepends = [
          base directory filepath hsndfile hsndfile-vector repa vector
@@ -147707,7 +149899,7 @@ self: {
 
   "req-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
-     , http-client, req, resourcet, temporary, transformers
+     , http-client, req, resourcet, temporary, transformers, weigh
      }:
      mkDerivation {
        pname = "req-conduit";
@@ -147722,6 +149914,9 @@ self: {
          base bytestring conduit conduit-extra hspec req resourcet temporary
          transformers
        ];
+       benchmarkHaskellDepends = [
+         base bytestring conduit conduit-extra req resourcet temporary weigh
+       ];
        homepage = "https://github.com/mrkkrp/req-conduit";
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
@@ -147773,8 +149968,9 @@ self: {
      }) {};
 
   "reroute" = callPackage
-    ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data
-     , hvect, mtl, text, unordered-containers, vector
+    ({ mkDerivation, base, criterion, deepseq, graph-core, hashable
+     , hspec, http-api-data, hvect, mtl, random, regex-compat, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "reroute";
@@ -147787,6 +149983,10 @@ self: {
        testHaskellDepends = [
          base hspec hvect mtl text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq graph-core hashable http-api-data hvect mtl
+         random regex-compat text unordered-containers vector
+       ];
        homepage = "http://github.com/agrafix/Spock";
        description = "abstract implementation of typed and untyped web routing";
        license = stdenv.lib.licenses.mit;
@@ -148294,20 +150494,24 @@ self: {
      }) {};
 
   "rethinkdb" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
-     , containers, data-default, doctest, mtl, network, scientific, text
-     , time, unordered-containers, utf8-string, vector
+    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
+     , bytestring, containers, criterion, data-default, doctest, mtl
+     , network, scientific, text, time, unordered-containers
+     , utf8-string, vector
      }:
      mkDerivation {
        pname = "rethinkdb";
        version = "2.2.0.8";
        sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring containers
          data-default mtl network scientific text time unordered-containers
          utf8-string vector
        ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ aeson async base criterion text ];
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
@@ -148315,9 +150519,9 @@ self: {
 
   "rethinkdb-client-driver" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , hashable, hspec, hspec-smallcheck, mtl, network, old-locale
-     , scientific, smallcheck, stm, template-haskell, text, time
-     , unordered-containers, vector
+     , criterion, hashable, hspec, hspec-smallcheck, mtl, network
+     , old-locale, scientific, smallcheck, stm, template-haskell, text
+     , time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
@@ -148334,6 +150538,9 @@ self: {
          base hspec hspec-smallcheck smallcheck text time
          unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion text time unordered-containers vector
+       ];
        homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
@@ -148574,6 +150781,8 @@ self: {
        pname = "rfc5051";
        version = "0.1.0.3";
        sha256 = "e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Simple unicode collation as per RFC5051";
        license = stdenv.lib.licenses.bsd3;
@@ -148600,7 +150809,7 @@ self: {
 
   "riak" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder
-     , bytestring, containers, data-default-class, deepseq
+     , bytestring, containers, criterion, data-default-class, deepseq
      , enclosed-exceptions, exceptions, hashable, HUnit
      , mersenne-random-pure64, monad-control, mtl, network
      , protocol-buffers, pureMD5, QuickCheck, random, resource-pool
@@ -148623,6 +150832,7 @@ self: {
          base bytestring containers data-default-class HUnit mtl QuickCheck
          riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
        homepage = "http://github.com/markhibberd/riak-haskell-client";
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
@@ -148993,26 +151203,23 @@ self: {
   "rlwe-challenges" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers
      , directory, DRBG, filepath, http-client, http-conduit, lol
-     , MonadRandom, mtl, nist-beacon, options, parsec, protocol-buffers
-     , protocol-buffers-descriptor, reflection, tagged, time
-     , transformers
+     , lol-cpp, MonadRandom, mtl, nist-beacon, options, parsec
+     , protocol-buffers, protocol-buffers-descriptor, reflection, tagged
+     , time
      }:
      mkDerivation {
        pname = "rlwe-challenges";
-       version = "0.0.0.1";
-       sha256 = "6a4c81357d92850790834fd570cd32c50bf07f0d80cf5f1c402c044588dc76f5";
-       revision = "7";
-       editedCabalFile = "71843308056de4beca80a87b7585129e14f2da528abc559f328af1b1c039d0f1";
+       version = "0.1.0.1";
+       sha256 = "f6e944ae436badc1bb3da258e54ef097eb1bd1fc05a656b89fb973a389f9f9e3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base lol MonadRandom protocol-buffers protocol-buffers-descriptor
-       ];
-       executableHaskellDepends = [
          ansi-terminal base bytestring containers directory DRBG filepath
-         http-client http-conduit lol MonadRandom mtl nist-beacon options
-         parsec protocol-buffers reflection tagged time transformers
+         http-client http-conduit lol lol-cpp MonadRandom mtl nist-beacon
+         parsec protocol-buffers protocol-buffers-descriptor reflection
+         tagged time
        ];
+       executableHaskellDepends = [ ansi-terminal base options time ];
        homepage = "https://github.com/cpeikert/Lol";
        description = "Ring-LWE/LWR challenges using Lol";
        license = stdenv.lib.licenses.gpl2;
@@ -149038,9 +151245,9 @@ self: {
 
   "rncryptor" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring
-     , bytestring-arbitrary, cryptonite, fastpbkdf2, io-streams, memory
-     , mtl, QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck
-     , text
+     , bytestring-arbitrary, criterion, cryptonite, fastpbkdf2
+     , io-streams, memory, mtl, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "rncryptor";
@@ -149059,6 +151266,7 @@ self: {
          base base16-bytestring bytestring bytestring-arbitrary cryptonite
          io-streams QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -149339,8 +151547,8 @@ self: {
      }:
      mkDerivation {
        pname = "rosa";
-       version = "0.3.0.0";
-       sha256 = "3779cc49176bc37088ce1d08fe35c45c6292e8645ddd3c64e97e9cfe2f13634c";
+       version = "0.3.1.0";
+       sha256 = "b363a0669623bd0edc46bf755ecdb34dc59121c302735515fd56a808567e7e42";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -149352,9 +151560,9 @@ self: {
      }) {};
 
   "rose-trees" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, mtl
-     , QuickCheck, quickcheck-instances, semigroupoids, semigroups, sets
-     , tasty, tasty-quickcheck, unordered-containers, witherable
+    ({ mkDerivation, base, containers, criterion, deepseq, hashable
+     , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups
+     , sets, tasty, tasty-quickcheck, unordered-containers, witherable
      }:
      mkDerivation {
        pname = "rose-trees";
@@ -149370,6 +151578,11 @@ self: {
          semigroupoids semigroups sets tasty tasty-quickcheck
          unordered-containers witherable
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq hashable mtl QuickCheck
+         quickcheck-instances semigroupoids semigroups sets
+         unordered-containers witherable
+       ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149628,6 +151841,8 @@ self: {
        pname = "roundtrip-xml";
        version = "0.3.0.5";
        sha256 = "35599e1f8ed46f1583dbcfd53caab4c3956dd7ad9c18d5705c41aaa8742286be";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator mtl pretty reference roundtrip roundtrip-string safe
@@ -149749,6 +151964,8 @@ self: {
        pname = "rpm";
        version = "0.0.1";
        sha256 = "9f2c95adfa873b55e56516ebb2a3c320914931d300b50ad1659d704669706af3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
@@ -149852,6 +152069,8 @@ self: {
        pname = "rss-conduit";
        version = "0.3.0.0";
        sha256 = "370a507c6df71af1bdce4c27381ebaa2c87664c5ae6e853e9f43c927e3345f5c";
+       revision = "1";
+       editedCabalFile = "3f56fc5d8b09d690e1d7bd4059cd31361cea9f1300b0ce909def41066376f7a5";
        libraryHaskellDepends = [
          base conduit conduit-combinators containers lens-simple
          mono-traversable safe safe-exceptions text time timerep
@@ -149928,8 +152147,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.7";
-       sha256 = "1d9628bceacfbfad0d5d6add0e302ea6aae6aa4ae4fd179f23aa83fdada17f75";
+       version = "0.1.9";
+       sha256 = "f5187739a6c450ed71299c1bb2b077751c45df297d18be8af80e0c8941b6f850";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150292,6 +152511,8 @@ self: {
        pname = "s-cargot";
        version = "0.1.1.1";
        sha256 = "5ac3d9e1a58763943249b3d7ac174ff3f17dec7a7508f984b8c1efc2a1c51c60";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers parsec text ];
        testHaskellDepends = [ base parsec QuickCheck text ];
        homepage = "https://github.com/aisamanra/s-cargot";
@@ -150811,6 +153032,8 @@ self: {
        pname = "sample-frame";
        version = "0.0.3";
        sha256 = "5baf301a4f7b2d52e6b9b9c06b10afd3938de0be6d09736d0188616cd9027247";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck storable-record ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Handling of samples in an (audio) signal";
@@ -150830,8 +153053,8 @@ self: {
      }) {};
 
   "sampling" = callPackage
-    ({ mkDerivation, base, containers, foldl, mwc-random, primitive
-     , vector
+    ({ mkDerivation, base, containers, criterion, foldl, mwc-random
+     , primitive, vector
      }:
      mkDerivation {
        pname = "sampling";
@@ -150841,6 +153064,7 @@ self: {
          base containers foldl mwc-random primitive vector
        ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/jtobin/sampling";
        description = "Sample values from collections";
        license = stdenv.lib.licenses.mit;
@@ -150852,9 +153076,13 @@ self: {
        pname = "samtools";
        version = "0.2.4.3";
        sha256 = "da91b82c0ce87b1f1f2775f7b1dd05352ceb918e79a926fc32ede324a9582086";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring seqloc vector ];
        librarySystemDepends = [ zlib ];
        libraryToolDepends = [ c2hs ];
+       executableSystemDepends = [ zlib ];
+       executableToolDepends = [ c2hs ];
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
@@ -150904,6 +153132,8 @@ self: {
        pname = "samtools-iteratee";
        version = "0.2.2.1";
        sha256 = "d4807605be6092c876ca779b2e74beb1ea4c8f8d0338fdcc28ba804a07b82c8d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring iteratee samtools transformers
        ];
@@ -150913,8 +153143,9 @@ self: {
      }) {};
 
   "sandi" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit
-     , stringsearch, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+    ({ mkDerivation, base, bytestring, conduit, criterion, exceptions
+     , HUnit, stringsearch, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th
      }:
      mkDerivation {
        pname = "sandi";
@@ -150926,6 +153157,7 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -151158,8 +153390,8 @@ self: {
      }) {};
 
   "say" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, temporary, text
-     , transformers
+    ({ mkDerivation, base, bytestring, criterion, hspec, temporary
+     , text, transformers
      }:
      mkDerivation {
        pname = "say";
@@ -151167,6 +153399,9 @@ self: {
        sha256 = "f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40";
        libraryHaskellDepends = [ base bytestring text transformers ];
        testHaskellDepends = [ base bytestring hspec temporary text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion temporary text
+       ];
        homepage = "https://github.com/fpco/say#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
@@ -151175,10 +153410,10 @@ self: {
   "sbp" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-combinators, conduit-extra, data-binary-ieee754, lens
-     , monad-loops, QuickCheck, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, unordered-containers
-     , yaml
+     , conduit-combinators, conduit-extra, criterion
+     , data-binary-ieee754, lens, monad-loops, QuickCheck, resourcet
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "sbp";
@@ -151199,6 +153434,10 @@ self: {
          aeson base base64-bytestring basic-prelude bytestring QuickCheck
          tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         aeson base base64-bytestring basic-prelude binary bytestring
+         criterion
+       ];
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
@@ -151392,8 +153631,9 @@ self: {
      }) {};
 
   "scalpel-core" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default, fail
-     , HUnit, regex-base, regex-tdfa, tagsoup, text, vector
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, fail, HUnit, regex-base, regex-tdfa, tagsoup, text
+     , vector
      }:
      mkDerivation {
        pname = "scalpel-core";
@@ -151404,6 +153644,7 @@ self: {
          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;
@@ -151437,13 +153678,18 @@ self: {
      }) {};
 
   "scanner" = callPackage
-    ({ mkDerivation, base, bytestring, hspec }:
+    ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
+     , hspec, text
+     }:
      mkDerivation {
        pname = "scanner";
        version = "0.2";
        sha256 = "3a020d68a0372a5211c72e55eeb299738ea608d17184bc68f74d31ebe667a5e9";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring cereal criterion text
+       ];
        homepage = "https://github.com/Yuras/scanner";
        description = "Fast non-backtracking incremental combinator parsing for bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -151615,8 +153861,8 @@ self: {
 
   "scholdoc" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, blaze-html
-     , blaze-markup, bytestring, containers, data-default, Diff
-     , directory, executable-path, extensible-exceptions, filepath
+     , blaze-markup, bytestring, containers, criterion, data-default
+     , Diff, directory, executable-path, extensible-exceptions, filepath
      , highlighting-kate, hslua, HTTP, http-client, http-client-tls
      , http-types, HUnit, JuicyPixels, mtl, network, network-uri
      , old-locale, old-time, parsec, process, QuickCheck, random
@@ -151651,6 +153897,7 @@ self: {
          HUnit process QuickCheck scholdoc-types syb test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
@@ -151700,6 +153947,8 @@ self: {
        pname = "scholdoc-texmath";
        version = "0.1.0.1";
        sha256 = "2939f906890eb13f488013f787f09ef1e35ee12b29cf06e729638fe15a29cb17";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl parsec scholdoc-types syb xml
        ];
@@ -151781,10 +154030,10 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck
-     , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, text, vector
+    ({ 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";
@@ -151798,6 +154047,7 @@ self: {
          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;
@@ -152411,6 +154661,8 @@ self: {
        pname = "sdl2";
        version = "2.2.0";
        sha256 = "5a3a83fad8936539a4ff1a4a845f2a30b859d2d62e1cda7ab1f39cb59378c484";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring exceptions linear StateVar text transformers vector
        ];
@@ -152426,6 +154678,8 @@ self: {
        pname = "sdl2-cairo";
        version = "0.1.0.2";
        sha256 = "e536adc0c2439267d3496cb5d33899c83d2e6d8debf2d56c69abd3c947704a86";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
        description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
        license = stdenv.lib.licenses.mit;
@@ -152454,6 +154708,8 @@ self: {
        pname = "sdl2-compositor";
        version = "1.2.0.5";
        sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base lens linear lrucache QuickCheck sdl2 StateVar stm text
          transformers
@@ -152557,11 +154813,12 @@ self: {
 
   "sdr" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, cereal, Chart
-     , Chart-cairo, colour, containers, Decimal, dynamic-graph, either
-     , fftwRaw, GLFW-b, mwc-random, OpenGL, optparse-applicative, pango
-     , pipes, pipes-bytestring, pipes-concurrency, primitive
-     , pulse-simple, QuickCheck, rtlsdr, storable-complex
-     , test-framework, test-framework-quickcheck2, time, tuple, vector
+     , Chart-cairo, colour, containers, criterion, Decimal
+     , dynamic-graph, either, fftwRaw, GLFW-b, mwc-random, OpenGL
+     , optparse-applicative, pango, pipes, pipes-bytestring
+     , pipes-concurrency, primitive, pulse-simple, QuickCheck, rtlsdr
+     , storable-complex, test-framework, test-framework-quickcheck2
+     , time, tuple, vector
      }:
      mkDerivation {
        pname = "sdr";
@@ -152578,6 +154835,9 @@ self: {
          base primitive QuickCheck storable-complex test-framework
          test-framework-quickcheck2 vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion primitive storable-complex vector
+       ];
        homepage = "https://github.com/adamwalker/sdr";
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
@@ -152614,8 +154874,8 @@ self: {
     ({ mkDerivation, base, bytestring, free, mtl, text }:
      mkDerivation {
        pname = "seakale";
-       version = "0.1.0.0";
-       sha256 = "c1aebae23aaa611db361eb2327fba0d90b3559d5ab8702417696e80c6e6254ea";
+       version = "0.2.0.0";
+       sha256 = "cdbab7220b1935ef18dd78113fd87981371492d904a1e07d2911c94dcf2b2349";
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -152627,8 +154887,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-postgresql";
-       version = "0.1.1.0";
-       sha256 = "e13909695f1c4b1aa4615c2e2d586a352e42a144cbb7552fe0d029702d9f5533";
+       version = "0.2.0.0";
+       sha256 = "f7205329cf6388331f77da685cfc9e742130e6714d6a2103e57a5cd6cf49b9ac";
        libraryHaskellDepends = [
          base bytestring free mtl postgresql-libpq seakale time
        ];
@@ -152642,8 +154902,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-tests";
-       version = "0.1.0.0";
-       sha256 = "bbd5c83a6335dca7f06bf8b7943e80bd3186530ff621d25b00b3a8a3950cec52";
+       version = "0.1.0.1";
+       sha256 = "ac54690de63000b5492d85b4009e5e6d3baab645726e06d4f099b990ce707508";
        libraryHaskellDepends = [
          base bytestring free mtl recursion-schemes seakale
        ];
@@ -153140,6 +155400,8 @@ self: {
        pname = "semiring";
        version = "0.3";
        sha256 = "befab81cfef9ae6499f44fdd93a2bc892f118b335462bcf2010aba4254f1a6ac";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
@@ -153177,8 +155439,8 @@ self: {
      }) {};
 
   "semver" = callPackage
-    ({ mkDerivation, attoparsec, base, deepseq, tasty, tasty-hunit
-     , text
+    ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty
+     , tasty-hunit, text
      }:
      mkDerivation {
        pname = "semver";
@@ -153186,6 +155448,7 @@ self: {
        sha256 = "36d3369706836d60f3bc517f30c6860734481866363723904b8768823b6bc8b1";
        libraryHaskellDepends = [ attoparsec base deepseq text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/brendanhay/semver";
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
        license = "unknown";
@@ -153517,6 +155780,8 @@ self: {
        pname = "sequent-core";
        version = "0.5.0.1";
        sha256 = "cd0a56a9fad3b7b0f53fd2e913f16a7d3c9472d0925f2ec56ed0da6c41ce39e1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers ghc transformers
        ];
@@ -153883,14 +156148,17 @@ self: {
 
   "servant-auth-cookie" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , cereal, cookie, cryptonite, data-default, deepseq, exceptions
-     , hspec, http-api-data, http-types, memory, mtl, QuickCheck
-     , servant, servant-server, tagged, time, transformers, wai
+     , 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.4.3.2";
-       sha256 = "faf62ad020d449638c3059847f16af7d72bfa623d9f5a8ad375e2add9f2c2e3c";
+       version = "0.4.3.3";
+       sha256 = "40376b033b2bd4d78ad327d0b83c2d2dcce05406fb5fbb4fd49e306f30dfee10";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring cereal cookie
          cryptonite data-default exceptions http-api-data http-types memory
@@ -153900,6 +156168,9 @@ self: {
          base bytestring cereal cryptonite data-default deepseq hspec
          QuickCheck servant-server time
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion cryptonite servant-server
+       ];
        description = "Authentication via encrypted cookies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154012,22 +156283,23 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.2.2.0";
-       sha256 = "ffec3373f25cabc2b182ea7226fff9e43a151c02e603780e5848a5ea03ee48b4";
+       version = "0.2.4.0";
+       sha256 = "c61e2d4b8de2aee42713fd30f37532ae60c19527ea06601e656c595102c6bbf2";
        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
+         data-default-class entropy http-api-data http-types 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
+         data-default-class entropy http-api-data http-types 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
@@ -154254,6 +156526,8 @@ self: {
        pname = "servant-db-postgresql";
        version = "0.2.1.0";
        sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers postgresql-query postgresql-simple
          servant servant-db text
@@ -154382,6 +156656,8 @@ self: {
        pname = "servant-elm";
        version = "0.4.0.1";
        sha256 = "69b3a5dcbb680fc1e923d76afa8255987d4613e0d4387eb493de071c9842ffc5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base elm-export lens servant servant-foreign text wl-pprint-text
        ];
@@ -154523,6 +156799,8 @@ self: {
        pname = "servant-jquery";
        version = "0.4.4.7";
        sha256 = "f3e7ba3e47ab318fc448f0539b4e58e8d82a5e9b32e3a6a6b5dea849dd7d11b1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base charset lens servant text ];
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
@@ -154540,10 +156818,10 @@ self: {
      }:
      mkDerivation {
        pname = "servant-js";
-       version = "0.9.1";
-       sha256 = "bbc8a860d7b84f716fcff7337654115cf6b7ba756d9a325cc0b1124cf82ade27";
-       revision = "2";
-       editedCabalFile = "babc912d297dfde6d2f7ae019458ae5d5f363b5930566a7827df219746aad537";
+       version = "0.9.2";
+       sha256 = "ad4676667cdd72f5bafac5c2d6de710b9c0082131b72dd117026fecb0d544369";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-compat charset lens servant servant-foreign text
        ];
@@ -154769,17 +157047,18 @@ self: {
 
   "servant-pushbullet-client" = callPackage
     ({ mkDerivation, aeson, base, http-api-data, http-client
-     , http-client-tls, microlens, microlens-th, scientific, servant
-     , servant-client, text, time, unordered-containers
+     , http-client-tls, microlens, microlens-th, pushbullet-types
+     , scientific, servant, servant-client, text, time
+     , unordered-containers
      }:
      mkDerivation {
        pname = "servant-pushbullet-client";
-       version = "0.0.3.0";
-       sha256 = "f6374498a3f6cfd59b8562cd506408dcbd6805cb107d2a756c1e3700aef09b9d";
+       version = "0.1.0.0";
+       sha256 = "185b20038906ae4e74dc08eb6723502444c9a9aa272f0051aed8325c31be6a1f";
        libraryHaskellDepends = [
          aeson base http-api-data http-client http-client-tls microlens
-         microlens-th scientific servant servant-client text time
-         unordered-containers
+         microlens-th pushbullet-types scientific servant servant-client
+         text time unordered-containers
        ];
        description = "Bindings to the Pushbullet API using servant-client";
        license = stdenv.lib.licenses.mit;
@@ -155407,6 +157686,8 @@ self: {
        pname = "set-cover";
        version = "0.0.8";
        sha256 = "186d3a1b6e824e3bd1d479347d8310dba9f1cba98e90bc03d885c42558ea95d1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers enummapset psqueues utility-ht
        ];
@@ -155530,7 +157811,7 @@ self: {
 
   "sets" = callPackage
     ({ mkDerivation, base, commutative, composition, containers
-     , contravariant, hashable, keys, mtl, QuickCheck
+     , contravariant, criterion, hashable, keys, mtl, QuickCheck
      , quickcheck-instances, semigroupoids, semigroups, tasty
      , tasty-hunit, tasty-quickcheck, transformers, transformers-base
      , unordered-containers, witherable
@@ -155549,6 +157830,10 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base commutative containers contravariant criterion
+         unordered-containers
+       ];
        description = "Ducktyped set interface for Haskell containers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -155605,10 +157890,10 @@ self: {
      }) {};
 
   "sexp-grammar" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers, happy
-     , mtl, profunctors, QuickCheck, scientific, semigroups, split
-     , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell
-     , text, transformers, wl-pprint-text
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , criterion, happy, mtl, profunctors, QuickCheck, scientific
+     , semigroups, split, tagged, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, transformers, wl-pprint-text
      }:
      mkDerivation {
        pname = "sexp-grammar";
@@ -155624,6 +157909,9 @@ self: {
          base QuickCheck scientific semigroups tasty tasty-hunit
          tasty-quickcheck text
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion scientific semigroups text
+       ];
        homepage = "https://github.com/esmolanka/sexp-grammar";
        description = "Invertible parsers for S-expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -155651,6 +157939,8 @@ self: {
        pname = "sexpr";
        version = "0.2.1";
        sha256 = "7724dc079ba390c8302079483ddf5f12bb425c2461133f94be71fe62402edab9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-string binary bytestring pretty
        ];
@@ -156488,6 +158778,8 @@ self: {
        sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd";
        revision = "1";
        editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -157145,11 +159437,13 @@ self: {
      }) {};
 
   "simple-conduit" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, chunked-data
-     , containers, either, exceptions, filepath, free, lifted-async
-     , lifted-base, mmorph, monad-control, mono-traversable, mtl
-     , mwc-random, primitive, semigroups, stm, streaming-commons, text
-     , transformers, transformers-base, vector
+    ({ mkDerivation, base, bifunctors, bytestring, CC-delcont
+     , chunked-data, conduit, conduit-combinators, conduit-extra
+     , containers, criterion, either, exceptions, filepath, foldl, free
+     , hspec, lifted-async, lifted-base, mmorph, monad-control
+     , mono-traversable, mtl, mwc-random, primitive, QuickCheck
+     , semigroups, stm, streaming-commons, text, transformers
+     , transformers-base, vector, void
      }:
      mkDerivation {
        pname = "simple-conduit";
@@ -157161,6 +159455,14 @@ self: {
          monad-control mono-traversable mtl mwc-random primitive semigroups
          stm streaming-commons text transformers transformers-base vector
        ];
+       benchmarkHaskellDepends = [
+         base bifunctors bytestring CC-delcont chunked-data conduit
+         conduit-combinators conduit-extra containers criterion either
+         exceptions filepath foldl free hspec lifted-async lifted-base
+         mmorph monad-control mono-traversable mtl mwc-random primitive
+         QuickCheck semigroups stm streaming-commons text transformers
+         transformers-base vector void
+       ];
        homepage = "http://github.com/jwiegley/simple-conduit";
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
@@ -157219,8 +159521,9 @@ self: {
      }) {};
 
   "simple-effects" = callPackage
-    ({ mkDerivation, array, base, exceptions, list-t, monad-control
-     , MonadRandom, mtl, text, transformers, transformers-base
+    ({ mkDerivation, array, base, criterion, exceptions, list-t
+     , monad-control, MonadRandom, mtl, text, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "simple-effects";
@@ -157231,6 +159534,7 @@ self: {
          transformers transformers-base
        ];
        testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [ base criterion mtl transformers ];
        homepage = "https://gitlab.com/LukaHorvat/simple-effects";
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
@@ -157653,6 +159957,8 @@ self: {
        pname = "simple-sql-parser";
        version = "0.4.2";
        sha256 = "ba720de50c82b47a90a1774e7b50365483801cfcb19e664cd184e04003ec7b04";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
        testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
@@ -157727,8 +160033,8 @@ self: {
      }) {};
 
   "simple-vec3" = callPackage
-    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
-     , tasty-th, vector, vector-th-unbox
+    ({ mkDerivation, base, criterion, QuickCheck, tasty
+     , tasty-quickcheck, tasty-th, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "simple-vec3";
@@ -157739,6 +160045,9 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
          vector-th-unbox
        ];
+       benchmarkHaskellDepends = [
+         base criterion QuickCheck vector vector-th-unbox
+       ];
        homepage = "https://github.com/dzhus/simple-vec3#readme";
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
@@ -158053,24 +160362,25 @@ self: {
 
   "siphon" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, colonnade
-     , contravariant, either, HUnit, pipes, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, vector
+     , contravariant, either, HUnit, pipes, profunctors, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, vector
      }:
      mkDerivation {
        pname = "siphon";
-       version = "0.2";
-       sha256 = "e55afce422fa4724636f7383624239a817f580cfedae68714df10ab0ff6ecc2d";
+       version = "0.6";
+       sha256 = "5776b99c6ef4262278ab7f76ecc9c83ee5ab7c137c3cdb9ee9c5badac24e2511";
        libraryHaskellDepends = [
          attoparsec base bytestring colonnade contravariant pipes text
          vector
        ];
        testHaskellDepends = [
          base bytestring colonnade contravariant either HUnit pipes
-         QuickCheck test-framework test-framework-hunit
+         profunctors QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
        homepage = "https://github.com/andrewthad/colonnade#readme";
-       description = "Generic types and functions for columnar encoding and decoding";
+       description = "Encode and decode CSV files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -158165,6 +160475,8 @@ self: {
        sha256 = "c76772fc89028f5407906bc699e7dd98e02328d0fe98c151706100e49f4899db";
        revision = "3";
        editedCabalFile = "ecf77e6598e7fbe7a12fc5bbb3cce000f14ffe87bee8386c95912e49f9a31e54";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base base-compat containers singletons
        ];
@@ -158341,16 +160653,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "skylark-client" = callPackage
+    ({ mkDerivation, base, conduit, conduit-extra, http-conduit
+     , http-types, lifted-async, optparse-generic, preamble, shakers
+     , stm, stm-conduit
+     }:
+     mkDerivation {
+       pname = "skylark-client";
+       version = "0.1.5";
+       sha256 = "e50e874a1f16ce71721d92118740853c53ee8822d43e173e670b47297dbb3ff7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base conduit http-conduit http-types lifted-async preamble stm
+         stm-conduit
+       ];
+       executableHaskellDepends = [
+         base conduit-extra optparse-generic preamble shakers
+       ];
+       homepage = "https://github.com/githubuser/skylark-client#readme";
+       description = "Skylark client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "skylighting" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring
-     , case-insensitive, containers, Diff, directory, filepath, HUnit
-     , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty
-     , tasty-golden, tasty-hunit, text, utf8-string
+     , case-insensitive, containers, criterion, Diff, directory
+     , filepath, HUnit, hxt, mtl, pretty-show, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text
+     , utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
        version = "0.1.1.5";
        sha256 = "0a4b666b2ccfeed35386bd364d663e919adc1815547e6360e83487253e33b13c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-html bytestring case-insensitive containers
          directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
@@ -158359,30 +160697,40 @@ self: {
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
        ];
+       benchmarkHaskellDepends = [
+         base criterion directory filepath text
+       ];
        homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "skylighting_0_3" = callPackage
-    ({ mkDerivation, aeson, base, binary, blaze-html, bytestring
-     , case-insensitive, containers, Diff, directory, filepath, HUnit
-     , hxt, mtl, pretty-show, random, regex-pcre-builtin, safe, tasty
-     , tasty-golden, tasty-hunit, text, utf8-string
+  "skylighting_0_3_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, blaze-html
+     , bytestring, case-insensitive, containers, criterion, Diff
+     , directory, filepath, HUnit, hxt, mtl, pretty-show, random
+     , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit, text
+     , utf8-string
      }:
      mkDerivation {
        pname = "skylighting";
-       version = "0.3";
-       sha256 = "ebfb2d5c8ce5769522826a2d5744064c578291d25d3671dcfe89a41f694ebf59";
+       version = "0.3.1";
+       sha256 = "d93ee3b15d74ab66fd729c4b56741c052fe331b4cfc78bad2a433827417d4f74";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base binary blaze-html bytestring case-insensitive containers
-         directory filepath hxt mtl regex-pcre-builtin safe text utf8-string
+         aeson attoparsec base binary blaze-html bytestring case-insensitive
+         containers directory filepath hxt mtl regex-pcre-builtin safe text
+         utf8-string
        ];
        testHaskellDepends = [
          aeson base bytestring containers Diff directory filepath HUnit
          pretty-show random tasty tasty-golden tasty-hunit text
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion directory filepath text
+       ];
        homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
@@ -158490,6 +160838,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "slack-web" = callPackage
+    ({ mkDerivation, aeson, base, generics-sop, http-api-data
+     , http-client, http-client-tls, servant, servant-client, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "slack-web";
+       version = "0.1.0";
+       sha256 = "82186c8bfe6857856034c9d53b0259e61b0575519d1cb22cb024f8464fb5f380";
+       libraryHaskellDepends = [
+         aeson base generics-sop http-api-data http-client http-client-tls
+         servant servant-client text transformers
+       ];
+       homepage = "https://github.com/jpvillaisaza/slack-web";
+       description = "Bindings for the Slack web API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "slave-thread" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
@@ -159373,6 +161739,8 @@ self: {
        pname = "snap-extras";
        version = "0.12.0.0";
        sha256 = "76ec979fa905a305392a545f24c6a33217e83aeedd0a8eec311623722b26e494";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring case-insensitive
          configurator containers data-default digestive-functors
@@ -159482,12 +161850,12 @@ self: {
   "snap-server" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, clock
-     , containers, deepseq, directory, filepath, HsOpenSSL, http-common
-     , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base
-     , monad-control, mtl, network, old-locale, openssl-streams
-     , parallel, QuickCheck, random, snap-core, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, threads
-     , time, transformers, unix, unix-compat, vector
+     , containers, criterion, deepseq, directory, filepath, HsOpenSSL
+     , http-common, http-streams, HUnit, io-streams, io-streams-haproxy
+     , lifted-base, monad-control, mtl, network, old-locale
+     , openssl-streams, parallel, QuickCheck, random, snap-core
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, threads, time, transformers, unix, unix-compat, vector
      }:
      mkDerivation {
        pname = "snap-server";
@@ -159496,6 +161864,8 @@ self: {
        revision = "1";
        editedCabalFile = "5b9b8071df32b8590c28df9cf4eb4afd77ee4554ff536b7e5a1d617f5e32f9a7";
        configureFlags = [ "-fopenssl" ];
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring bytestring-builder
          case-insensitive clock containers filepath HsOpenSSL io-streams
@@ -159511,6 +161881,10 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          threads time transformers unix unix-compat vector
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base blaze-builder bytestring bytestring-builder
+         criterion io-streams io-streams-haproxy snap-core vector
+       ];
        homepage = "http://snapframework.com/";
        description = "A web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -160582,9 +162956,10 @@ self: {
      }) {};
 
   "snowball" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, QuickCheck
-     , quickcheck-instances, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th, text, text-icu
+    ({ mkDerivation, base, bytestring, criterion, HUnit
+     , language-haskell-extract, QuickCheck, quickcheck-instances
+     , test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, text, text-icu
      }:
      mkDerivation {
        pname = "snowball";
@@ -160595,6 +162970,9 @@ self: {
          base HUnit QuickCheck quickcheck-instances test-framework-hunit
          test-framework-quickcheck2 test-framework-th text
        ];
+       benchmarkHaskellDepends = [
+         base criterion language-haskell-extract text
+       ];
        homepage = "http://hub.darcs.net/dag/snowball";
        description = "Bindings to the Snowball library";
        license = stdenv.lib.licenses.bsd3;
@@ -160771,6 +163149,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "socket_0_8_0_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "socket";
+       version = "0.8.0.1";
+       sha256 = "745f6d1ef2299e321ad646918b9b733c82b4ded51b3b6aab6755c85182ab09a2";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/lpeterse/haskell-socket";
+       description = "An extensible socket library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "socket-activation" = callPackage
     ({ mkDerivation, base, network, transformers, unix }:
      mkDerivation {
@@ -160821,8 +163217,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-unix";
-       version = "0.1.1.0";
-       sha256 = "7541dd005761c6d08f8a87fe8157e1cfde128437c3bb3b9a72f3052f799ebd0f";
+       version = "0.2.0.0";
+       sha256 = "4d7591116dcbf70f9aea4a4f80fe9261abc19b03184b46a6463e09d020f435ac";
        libraryHaskellDepends = [ base bytestring socket ];
        testHaskellDepends = [
          async base bytestring socket tasty tasty-hunit unix
@@ -161016,8 +163412,8 @@ self: {
      }) {};
 
   "sophia" = callPackage
-    ({ mkDerivation, base, bindings-sophia, bytestring, directory
-     , tasty, tasty-hunit
+    ({ mkDerivation, base, binary, bindings-sophia, bytestring
+     , criterion, directory, tasty, tasty-hunit
      }:
      mkDerivation {
        pname = "sophia";
@@ -161027,6 +163423,9 @@ self: {
        testHaskellDepends = [
          base bindings-sophia bytestring directory tasty tasty-hunit
        ];
+       benchmarkHaskellDepends = [
+         base binary bindings-sophia bytestring criterion directory
+       ];
        description = "Bindings to Sophia library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161061,12 +163460,13 @@ self: {
      }) {};
 
   "sorted-list" = callPackage
-    ({ mkDerivation, base, deepseq }:
+    ({ mkDerivation, base, criterion, deepseq }:
      mkDerivation {
        pname = "sorted-list";
        version = "0.2.0.0";
        sha256 = "cc52c787b056f4d3a9ecc59f06701695602558a4233042ff8f613cdd4985d138";
        libraryHaskellDepends = [ base deepseq ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
@@ -161161,8 +163561,8 @@ self: {
      }) {};
 
   "sourcemap" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, process, text
-     , unordered-containers, utf8-string
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , process, random, text, unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "sourcemap";
@@ -161177,6 +163577,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring process text unordered-containers utf8-string
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion random ];
        description = "Implementation of source maps as proposed by Google and Mozilla";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161229,6 +163630,8 @@ self: {
        pname = "soxlib";
        version = "0.0.3";
        sha256 = "18b555beb0eaafce25550feea23575ec68477728654bd2fbaad67d448f5dcd8b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers explicit-exception extensible-exceptions
          sample-frame storablevector transformers utility-ht
@@ -161286,8 +163689,8 @@ self: {
      }) {};
 
   "spaceprobe" = callPackage
-    ({ mkDerivation, base, clock, containers, erf, mtl, QuickCheck
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, clock, containers, criterion, erf, mtl
+     , QuickCheck, test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "spaceprobe";
@@ -161298,6 +163701,7 @@ self: {
          base clock containers erf mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com/SeanRBurton/spaceprobe";
        description = "Optimization over arbitrary search spaces";
        license = stdenv.lib.licenses.bsd3;
@@ -161347,12 +163751,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sparkle_0_5_0_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, choice
+     , distributed-closure, filepath, jni, jvm, jvm-streaming, process
+     , regex-tdfa, singletons, streaming, text, vector, zip-archive
+     }:
+     mkDerivation {
+       pname = "sparkle";
+       version = "0.5.0.1";
+       sha256 = "6b3458a12a880567c1ab2a8b51d3e0a2186e8d2621ce8c3dcf72f8dca183d133";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring choice distributed-closure jni jvm
+         jvm-streaming singletons streaming text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring filepath process regex-tdfa text zip-archive
+       ];
+       homepage = "http://github.com/tweag/sparkle#readme";
+       description = "Distributed Apache Spark applications in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sparse" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , deepseq, directory, doctest, filepath, hlint, hybrid-vectors
-     , lens, linear, mtl, primitive, QuickCheck, semigroups
-     , simple-reflect, test-framework, test-framework-quickcheck2
-     , test-framework-th, transformers, vector, vector-algorithms
+    ({ mkDerivation, array, base, bytestring, containers, contravariant
+     , criterion, deepseq, directory, doctest, filepath, hlint
+     , hybrid-vectors, lens, linear, mtl, primitive, QuickCheck
+     , semigroups, simple-reflect, test-framework
+     , test-framework-quickcheck2, test-framework-th, transformers
+     , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "sparse";
@@ -161368,6 +163797,7 @@ self: {
          test-framework test-framework-quickcheck2 test-framework-th
          transformers vector
        ];
+       benchmarkHaskellDepends = [ array base criterion deepseq vector ];
        homepage = "http://github.com/ekmett/sparse";
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
@@ -161393,21 +163823,21 @@ self: {
      }) {};
 
   "sparse-linear-algebra" = callPackage
-    ({ mkDerivation, base, containers, criterion, exceptions, hspec
-     , mtl, mwc-random, primitive, QuickCheck, transformers, vector
-     , vector-algorithms, vector-space
+    ({ mkDerivation, base, containers, exceptions, hspec
+     , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck
+     , scientific, transformers, vector, vector-algorithms, vector-space
      }:
      mkDerivation {
        pname = "sparse-linear-algebra";
-       version = "0.2.9.4";
-       sha256 = "5d97d81653785f08783cd29107f0f87c01611cf5b1ad1395ef1a8b799a04adf6";
+       version = "0.2.9.7";
+       sha256 = "f807cccc34abde9b33235b18739ca69f4b94500b932350a04c0107bb56d8536b";
        libraryHaskellDepends = [
          base containers exceptions mtl transformers vector
          vector-algorithms vector-space
        ];
        testHaskellDepends = [
-         base containers criterion exceptions hspec mtl mwc-random primitive
-         QuickCheck vector-space
+         base containers exceptions hspec matrix-market-attoparsec mtl
+         mwc-random primitive QuickCheck scientific vector-space
        ];
        homepage = "https://github.com/ocramz/sparse-linear-algebra";
        description = "Numerical computation in native Haskell";
@@ -161844,8 +164274,9 @@ self: {
      }) {};
 
   "splines" = callPackage
-    ({ mkDerivation, base, containers, polynomial, QuickCheck
-     , test-framework, test-framework-quickcheck2, vector, vector-space
+    ({ mkDerivation, base, containers, criterion, polynomial
+     , QuickCheck, test-framework, test-framework-quickcheck2, vector
+     , vector-space
      }:
      mkDerivation {
        pname = "splines";
@@ -161858,6 +164289,7 @@ self: {
          base containers polynomial QuickCheck test-framework
          test-framework-quickcheck2 vector vector-space
        ];
+       benchmarkHaskellDepends = [ base criterion polynomial vector ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162035,6 +164467,8 @@ self: {
        pname = "spreadsheet";
        version = "0.1.3.4";
        sha256 = "7e4a26ac4e565cb6fbc5845f010e0930b0ce2beff05dca998f312cd3d40249c2";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base explicit-exception transformers utility-ht
        ];
@@ -162176,8 +164610,9 @@ self: {
      }) {};
 
   "spsa" = callPackage
-    ({ mkDerivation, base, hmatrix, HUnit, mtl, QuickCheck, random
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, criterion, hmatrix, HUnit, mtl, QuickCheck
+     , random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "spsa";
@@ -162188,6 +164623,7 @@ self: {
          base hmatrix HUnit QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion hmatrix random ];
        homepage = "https://github.com/yanatan16/haskell-spsa";
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
@@ -162341,8 +164777,8 @@ self: {
      }:
      mkDerivation {
        pname = "sqlite-simple";
-       version = "0.4.12.1";
-       sha256 = "2f24f4dfea3b3bc1657b26c786666abd041bb89e09c22d084eaea43d67112227";
+       version = "0.4.13.0";
+       sha256 = "59b124c667b9c80cb59bcaf5ed9319b248daec81a70754063571a61b1771f9e8";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-textual bytestring containers
          direct-sqlite text time transformers
@@ -162578,6 +165014,8 @@ self: {
        pname = "ssh-known-hosts";
        version = "0.2.0.0";
        sha256 = "0a93cbeae395701ff1cd609c29aaa2b59d507304b91612a28193156faac210fe";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base iproute text ];
        testHaskellDepends = [
          base HUnit iproute QuickCheck test-framework test-framework-hunit
@@ -162693,12 +165131,17 @@ self: {
      }) {};
 
   "stable-heap" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, criterion, fingertree, heaps, mwc-random
+     , pqueue, vector
+     }:
      mkDerivation {
        pname = "stable-heap";
        version = "0.1.0.0";
        sha256 = "410f316118037f3fed6dcd58c667b5ad278f4e5bac6053c6366d8b59a9209d93";
        libraryHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [
+         base criterion fingertree heaps mwc-random pqueue vector
+       ];
        homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
@@ -162770,8 +165213,8 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
-     , directory, exceptions, file-embed, filepath, hspec
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, directory, exceptions, file-embed, filepath, hspec
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
      , unordered-containers, vector, yaml
      }:
@@ -162790,6 +165233,9 @@ self: {
          aeson base bytestring containers file-embed hspec hspec-megaparsec
          megaparsec text yaml
        ];
+       benchmarkHaskellDepends = [
+         aeson base criterion deepseq megaparsec text
+       ];
        homepage = "https://github.com/stackbuilders/stache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -163430,7 +165876,8 @@ self: {
      }) {};
 
   "stateWriter" = callPackage
-    ({ mkDerivation, base, free, hspec, mtl, QuickCheck, transformers
+    ({ mkDerivation, base, containers, criterion, deepseq, dlist, free
+     , hspec, lens, mtl, QuickCheck, transformers, vector
      }:
      mkDerivation {
        pname = "stateWriter";
@@ -163438,6 +165885,10 @@ self: {
        sha256 = "dbed209ec350b751b2c56388ab751149874f6b76c0d7a6725de1583682ccc6e2";
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base free hspec mtl QuickCheck ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq dlist lens mtl transformers
+         vector
+       ];
        description = "A faster variant of the RWS monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163969,7 +166420,8 @@ self: {
      }) {};
 
   "stitch" = callPackage
-    ({ mkDerivation, base, Cabal, containers, hspec, text, transformers
+    ({ mkDerivation, base, Cabal, containers, criterion, hspec, text
+     , transformers
      }:
      mkDerivation {
        pname = "stitch";
@@ -163977,6 +166429,7 @@ self: {
        sha256 = "72c114222abde4dbee6f087def13105bde3036a039ac6ded9e0f44462691ad77";
        libraryHaskellDepends = [ base containers text transformers ];
        testHaskellDepends = [ base Cabal hspec text ];
+       benchmarkHaskellDepends = [ base criterion ];
        description = "lightweight CSS DSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164057,9 +166510,10 @@ self: {
      }) {};
 
   "stm-containers" = callPackage
-    ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF
-     , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive
-     , QuickCheck, transformers, unordered-containers
+    ({ mkDerivation, async, base, base-prelude, containers, criterion
+     , focus, free, hashable, hashtables, HTF, list-t, loch-th, mtl
+     , mtl-prelude, mwc-random, mwc-random-monad, placeholders
+     , primitive, QuickCheck, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "stm-containers";
@@ -164073,6 +166527,11 @@ self: {
          mtl-prelude placeholders primitive QuickCheck transformers
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         async base base-prelude containers criterion focus free hashable
+         hashtables list-t loch-th mtl mtl-prelude mwc-random
+         mwc-random-monad placeholders text unordered-containers
+       ];
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
@@ -164408,6 +166867,8 @@ self: {
        pname = "storable-record";
        version = "0.0.3.1";
        sha256 = "74e5ceee49e0b7625d13759597d21e714843406b8b80e9168a0bb1199ffdadba";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base transformers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/storable-record/";
        description = "Elegant definition of Storable instances for records";
@@ -164442,7 +166903,8 @@ self: {
 
   "storablevector" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, non-negative
-     , QuickCheck, random, syb, transformers, unsafe, utility-ht
+     , QuickCheck, random, sample-frame, syb, transformers, unsafe
+     , utility-ht
      }:
      mkDerivation {
        pname = "storablevector";
@@ -164455,6 +166917,7 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck random utility-ht
        ];
+       benchmarkHaskellDepends = [ base deepseq sample-frame utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
        license = stdenv.lib.licenses.bsd3;
@@ -164478,6 +166941,8 @@ self: {
        pname = "storablevector-streamfusion";
        version = "0.0";
        sha256 = "d52cd96003f494733840cba6e0f83fd2a5900ceaa5e180b38a48b800f254f6e1";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base storablevector stream-fusion utility-ht
        ];
@@ -164524,6 +166989,16 @@ self: {
          time transformers unordered-containers vector
          vector-binary-instances void weigh
        ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         containers contravariant criterion cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable network primitive
+         resourcet safe semigroups smallcheck store-core streaming-commons
+         syb template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
        homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
@@ -164573,6 +167048,8 @@ self: {
        pname = "stratosphere";
        version = "0.4.0";
        sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring hashable lens template-haskell
          text unordered-containers
@@ -164693,8 +167170,8 @@ self: {
      }) {};
 
   "stream" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, hspec, mtl
-     , streaming-commons, temporary, transformers
+    ({ mkDerivation, base, bytestring, criterion, exceptions, ghc-prim
+     , hspec, mtl, streaming-commons, temporary, transformers, vector
      }:
      mkDerivation {
        pname = "stream";
@@ -164704,6 +167181,9 @@ self: {
          base bytestring exceptions mtl streaming-commons transformers
        ];
        testHaskellDepends = [ base bytestring hspec temporary ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim temporary vector
+       ];
        homepage = "https://github.com/githubuser/stream#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
@@ -164729,6 +167209,8 @@ self: {
        pname = "stream-monad";
        version = "0.4.0.2";
        sha256 = "86cd5770f903184b47113c42978cc409a483a5bdd2619c9e11f5a2339491210c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base logict ];
        homepage = "http://github.com/sebfisch/stream-monad";
        description = "Simple, Fair and Terminating Backtracking Monad";
@@ -164798,8 +167280,8 @@ self: {
 
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , deepseq, directory, hspec, network, process, QuickCheck, random
-     , stm, text, transformers, unix, zlib
+     , criterion, deepseq, directory, hspec, network, process
+     , QuickCheck, random, stm, text, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "streaming-commons";
@@ -164813,6 +167295,9 @@ self: {
          array async base blaze-builder bytestring deepseq hspec network
          QuickCheck text unix zlib
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text
+       ];
        homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
@@ -164851,6 +167336,7 @@ self: {
        testHaskellDepends = [
          base containers tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion ];
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -164863,6 +167349,8 @@ self: {
        pname = "streaming-png";
        version = "0.1.0.0";
        sha256 = "ecb3509c29481d7deb3b65c976cc08fb9a859cff9f52ad48c16402d9439420ca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring cereal exceptions JuicyPixels mmorph mtl resourcet
          streaming streaming-bytestring streaming-commons transformers
@@ -165273,13 +167761,16 @@ self: {
      }) {};
 
   "string-similarity" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck, suffixtree }:
+    ({ mkDerivation, base, bytestring, criterion, hspec, QuickCheck
+     , suffixtree
+     }:
      mkDerivation {
        pname = "string-similarity";
        version = "0.1.0.0";
        sha256 = "bb2e18741f084bef90531050a5b14712aca4e78d05de12d3ec6b803a5e9e034c";
        libraryHaskellDepends = [ base suffixtree ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "http://github.com/mwotton/string-similarity";
        description = "longest common substring";
        license = stdenv.lib.licenses.bsd3;
@@ -165637,12 +168128,12 @@ self: {
      }) {};
 
   "structures" = callPackage
-    ({ mkDerivation, base, bytestring, containers, contravariant
-     , deepseq, directory, doctest, filepath, free, ghc, ghc-prim
-     , hashable, hlint, hybrid-vectors, lens, monad-st, parallel
-     , primitive, QuickCheck, semigroups, tasty, tasty-quickcheck
-     , tasty-th, transformers, unordered-containers, vector
-     , vector-algorithms
+    ({ mkDerivation, array, base, bytestring, containers, contravariant
+     , criterion, deepseq, directory, doctest, filepath, free, ghc
+     , ghc-prim, hashable, hlint, hybrid-vectors, lens, monad-st
+     , MonadRandom, parallel, primitive, QuickCheck, semigroups, tasty
+     , tasty-quickcheck, tasty-th, transformers, unordered-containers
+     , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "structures";
@@ -165658,6 +168149,10 @@ self: {
          QuickCheck semigroups tasty tasty-quickcheck tasty-th
          unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         array base containers criterion deepseq MonadRandom
+         unordered-containers vector
+       ];
        homepage = "http://github.com/ekmett/structures";
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
@@ -165804,10 +168299,11 @@ self: {
 
   "subhask" = callPackage
     ({ mkDerivation, approximate, array, base, bloomfilter, bytes
-     , bytestring, cassava, containers, deepseq, erf, gamma, ghc-prim
-     , hmatrix, hyperloglog, lens, monad-primitive, MonadRandom, mtl
-     , parallel, primitive, QuickCheck, semigroups, template-haskell
-     , test-framework, test-framework-quickcheck2, vector
+     , bytestring, cassava, containers, criterion, deepseq, erf, gamma
+     , ghc-prim, hmatrix, hyperloglog, lens, monad-primitive
+     , MonadRandom, mtl, parallel, primitive, QuickCheck, semigroups
+     , template-haskell, test-framework, test-framework-quickcheck2
+     , vector
      }:
      mkDerivation {
        pname = "subhask";
@@ -165822,6 +168318,7 @@ self: {
        testHaskellDepends = [
          base test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion MonadRandom ];
        homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
@@ -165929,8 +168426,8 @@ self: {
      }) {};
 
   "suffix-array" = callPackage
-    ({ mkDerivation, array, base, containers, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, array, base, containers, criterion, random, tasty
+     , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "suffix-array";
@@ -165943,6 +168440,7 @@ self: {
        testHaskellDepends = [
          array base containers tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [ base criterion random ];
        homepage = "https://github.com/kadoban/suffix-array#readme";
        description = "Simple and moderately efficient suffix array implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -166142,13 +168640,18 @@ self: {
      }) {};
 
   "superbuffer" = callPackage
-    ({ mkDerivation, async, base, bytestring, HTF, QuickCheck }:
+    ({ mkDerivation, async, base, buffer-builder, bytestring, criterion
+     , HTF, QuickCheck
+     }:
      mkDerivation {
        pname = "superbuffer";
        version = "0.2.0.1";
        sha256 = "ced2a0ed729661412d28da1248d39a5b47bb4513847deae59219a0fc12b51166";
        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;
@@ -166162,6 +168665,8 @@ self: {
        pname = "supercollider-ht";
        version = "0.3";
        sha256 = "3cceb4e622bf1d6d7887cbefcd8d68e277c0d638de522276d4aa09db1cc316ed";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base hosc hsc3 opensoundcontrol-ht process random transformers
        ];
@@ -166804,10 +169309,10 @@ self: {
      }) {};
 
   "sync-mht" = callPackage
-    ({ mkDerivation, array, base, base16-bytestring, byteable, bytes
-     , bytestring, cereal, containers, cryptohash, directory, exceptions
-     , filepath, HUnit, io-streams, mtl, process, random, regex-compat
-     , temporary, text, time, transformers, unix, zlib
+    ({ mkDerivation, aeson, array, base, base16-bytestring, byteable
+     , bytes, bytestring, cereal, containers, cryptohash, directory
+     , exceptions, filepath, HUnit, io-streams, mtl, process, random
+     , regex-compat, temporary, text, time, transformers, unix, zlib
      }:
      mkDerivation {
        pname = "sync-mht";
@@ -166833,6 +169338,9 @@ self: {
          io-streams mtl process random regex-compat temporary text time
          transformers unix zlib
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring directory filepath process temporary time
+       ];
        homepage = "https://github.com/ekarayel/sync-mht";
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
@@ -166905,10 +169413,10 @@ self: {
      }) {Synt = null;};
 
   "syntactic" = callPackage
-    ({ mkDerivation, base, constraints, containers, data-hash, deepseq
-     , mtl, QuickCheck, syb, tagged, tasty, tasty-golden
-     , tasty-quickcheck, tasty-th, template-haskell, tree-view
-     , utf8-string
+    ({ mkDerivation, base, constraints, containers, criterion
+     , data-hash, deepseq, mtl, QuickCheck, syb, tagged, tasty
+     , tasty-golden, tasty-quickcheck, tasty-th, template-haskell
+     , tree-view, utf8-string
      }:
      mkDerivation {
        pname = "syntactic";
@@ -166922,6 +169430,7 @@ self: {
          base containers mtl QuickCheck tagged tasty tasty-golden
          tasty-quickcheck tasty-th utf8-string
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
@@ -167085,6 +169594,8 @@ self: {
        pname = "synthesizer";
        version = "0.2.0.1";
        sha256 = "6dfc0790c370fe8743052ee4ead7eb341d8ac44b126cc7911241a01e0c38b9d8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring containers event-list filepath gnuplot
          non-negative numeric-prelude numeric-quest process QuickCheck
@@ -167106,6 +169617,8 @@ self: {
        pname = "synthesizer-alsa";
        version = "0.5.0.5";
        sha256 = "aa9ac69ac0f0e1728b635cd06a1753d67a877ecfb24e6d51cbab15660f13ce26";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa
          non-negative numeric-prelude old-time random sox storablevector
@@ -167120,10 +169633,11 @@ self: {
 
   "synthesizer-core" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , deepseq, event-list, explicit-exception, filepath, non-empty
-     , non-negative, numeric-prelude, numeric-quest, process, QuickCheck
-     , random, sample-frame-np, sox, storable-record, storable-tuple
-     , storablevector, transformers, utility-ht
+     , deepseq, directory, event-list, explicit-exception, filepath
+     , non-empty, non-negative, numeric-prelude, numeric-quest, old-time
+     , process, QuickCheck, random, sample-frame-np, sox
+     , storable-record, storable-tuple, storablevector, timeit
+     , transformers, utility-ht
      }:
      mkDerivation {
        pname = "synthesizer-core";
@@ -167140,6 +169654,10 @@ self: {
          base containers event-list non-empty non-negative numeric-prelude
          QuickCheck random storable-tuple storablevector utility-ht
        ];
+       benchmarkHaskellDepends = [
+         array base binary bytestring directory numeric-prelude old-time
+         storable-tuple storablevector timeit utility-ht
+       ];
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Low level part";
        license = "GPL";
@@ -167155,6 +169673,8 @@ self: {
        pname = "synthesizer-dimensional";
        version = "0.8.0.2";
        sha256 = "d687c5907132d106952e033618ab7256885aa03bc462840c68131fbd4ec1a19d";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring event-list non-negative numeric-prelude random sox
          storable-record storablevector synthesizer-core transformers
@@ -167192,6 +169712,8 @@ self: {
        pname = "synthesizer-inference";
        version = "0.2";
        sha256 = "2ba794a3c1331a8f5c6e7927c6a4f06ea389d1692d1bac4cdf14e63d4e6b501e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base event-list non-negative numeric-prelude random
          synthesizer-core transformers UniqueLogicNP utility-ht
@@ -167213,6 +169735,8 @@ self: {
        pname = "synthesizer-llvm";
        version = "0.8.1.2";
        sha256 = "29fe7aacb673c44726a7aefa627759e4545cee369c09f1197784b1b8a2aa74e6";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers event-list llvm-extra llvm-tf midi non-empty
          non-negative numeric-prelude pathtype random sox storable-record
@@ -167240,6 +169764,8 @@ self: {
        pname = "synthesizer-midi";
        version = "0.6.0.4";
        sha256 = "607da1d5dd809228f89a73fc7caa26f5f7b7c41da0c8fa928848610835c47ff5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          array base containers data-accessor data-accessor-transformers
          deepseq event-list midi non-negative numeric-prelude sox
@@ -167465,10 +169991,10 @@ self: {
      }) {};
 
   "system-random-effect" = callPackage
-    ({ mkDerivation, base, bytestring, crypto-api, extensible-effects
-     , HUnit, mersenne-random-pure64, primitive, QuickCheck, statistics
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , vector, vector-algorithms
+    ({ mkDerivation, base, bytestring, criterion, crypto-api, deepseq
+     , extensible-effects, HUnit, mersenne-random-pure64, primitive
+     , QuickCheck, statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "system-random-effect";
@@ -167483,6 +170009,9 @@ self: {
          base extensible-effects HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq extensible-effects vector
+       ];
        homepage = "https://github.com/wowus/system-random-effect";
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
@@ -167552,11 +170081,14 @@ self: {
        pname = "system-uuid";
        version = "2.1.1";
        sha256 = "8b911863eab0109f0030282af3b94fa233988de78ef2050bd30ebbfeb02a8089";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring containers murmur-hash parsec
          template-haskell
        ];
        librarySystemDepends = [ libossp_uuid ];
+       executableSystemDepends = [ libossp_uuid ];
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
        license = stdenv.lib.licenses.bsd3;
@@ -167935,17 +170467,23 @@ self: {
 
   "tagchup" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
-     , explicit-exception, transformers, utility-ht, xml-basic
+     , explicit-exception, old-time, transformers, utility-ht, xml-basic
      }:
      mkDerivation {
        pname = "tagchup";
        version = "0.4.0.5";
        sha256 = "c0c12eeec562a7769deb165c7edae8a8dbc0087d5788655b72864df122a0fa35";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers data-accessor explicit-exception
          transformers utility-ht xml-basic
        ];
        testHaskellDepends = [ base xml-basic ];
+       benchmarkHaskellDepends = [
+         base bytestring containers data-accessor explicit-exception
+         old-time transformers utility-ht xml-basic
+       ];
        homepage = "http://code.haskell.org/~thielema/tagchup/";
        description = "alternative package for processing of tag soups";
        license = "GPL";
@@ -168088,8 +170626,8 @@ self: {
 
   "taggy" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , directory, hspec, hspec-attoparsec, text, unordered-containers
-     , vector
+     , criterion, directory, hspec, hspec-attoparsec, tagsoup, text
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "taggy";
@@ -168108,6 +170646,9 @@ self: {
          attoparsec base blaze-html blaze-markup directory hspec
          hspec-attoparsec text unordered-containers vector
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base criterion tagsoup text vector
+       ];
        homepage = "http://github.com/alpmestan/taggy";
        description = "Efficient and simple HTML/XML parsing library";
        license = stdenv.lib.licenses.bsd3;
@@ -168194,8 +170735,10 @@ self: {
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "tagsoup";
-       version = "0.14";
-       sha256 = "90822d8bb9d3a40d070a1f282fb2f7f6beec13f01f958f716de9d005e2e9ea1e";
+       version = "0.14.1";
+       sha256 = "028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
@@ -168386,6 +170929,8 @@ self: {
        pname = "takusen-oracle";
        version = "0.9.4.1";
        sha256 = "492159551e80b58cff2318546f3649dd1c2b08eb4ff4f94d855d713df4ec868b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
@@ -168530,8 +171075,8 @@ self: {
 
   "tar" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-handle
-     , containers, deepseq, directory, filepath, QuickCheck, tasty
-     , tasty-quickcheck, time
+     , containers, criterion, deepseq, directory, filepath, old-time
+     , QuickCheck, tasty, tasty-quickcheck, time
      }:
      mkDerivation {
        pname = "tar";
@@ -168544,6 +171089,10 @@ self: {
          array base bytestring bytestring-handle containers deepseq
          directory filepath QuickCheck tasty tasty-quickcheck time
        ];
+       benchmarkHaskellDepends = [
+         array base bytestring containers criterion deepseq directory
+         filepath old-time time
+       ];
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168575,12 +171124,13 @@ self: {
      }) {};
 
   "target" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, directory
-     , exceptions, filepath, ghc, ghc-paths, ghc-prim, hint
-     , liquid-fixpoint, liquidhaskell, mtl, pretty, process, QuickCheck
-     , syb, tagged, tasty, tasty-hunit, template-haskell, text
-     , text-format, th-lift, transformers, unordered-containers, vector
-     , z3
+    ({ mkDerivation, aeson, array, base, bytestring, cassava
+     , containers, data-timeout, deepseq, directory, exceptions
+     , filepath, ghc, ghc-paths, ghc-prim, hint, liquid-fixpoint
+     , liquidhaskell, mtl, pretty, process, QuickCheck, random
+     , SafeSemaphore, smallcheck, syb, tagged, tasty, tasty-hunit
+     , template-haskell, text, text-format, th-lift, time, transformers
+     , unordered-containers, vector, xml-conduit, z3
      }:
      mkDerivation {
        pname = "target";
@@ -168601,6 +171151,12 @@ self: {
          unordered-containers
        ];
        testSystemDepends = [ z3 ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring cassava containers data-timeout deepseq ghc
+         liquid-fixpoint liquidhaskell mtl QuickCheck random SafeSemaphore
+         smallcheck tagged template-haskell time unordered-containers vector
+         xml-conduit
+       ];
        description = "Generate test-suites from refinement types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168718,6 +171274,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-ant-xml_1_0_5" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+     , xml
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.0.5";
+       sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving ghc-prim mtl
+         stm tagged tasty transformers xml
+       ];
+       homepage = "http://github.com/ocharles/tasty-ant-xml";
+       description = "Render tasty output to XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-auto" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -168752,6 +171327,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_0_4_0_0" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "0.4.0.0";
+       sha256 = "b2e4f21f9ccc2777d36090f71f560fbff0c3fde3bf43d966339b3fc2bf19577e";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-th
@@ -169076,8 +171664,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-stats";
-       version = "0.2.0.1";
-       sha256 = "0957921fffb8ecc225694ab16812d329dbb3ab60c4905cd08bca6b087faa4311";
+       version = "0.2.0.2";
+       sha256 = "f6871db08e37ce62802d85040c59742f5611bc2450a2c1ceab6a6e80d58dc6a5";
        libraryHaskellDepends = [
          base containers directory process stm tagged tasty time
        ];
@@ -169260,6 +171848,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tcp-streams_1_0_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, directory
+     , HUnit, io-streams, network, pem, test-framework
+     , test-framework-hunit, tls, x509, x509-store, x509-system
+     }:
+     mkDerivation {
+       pname = "tcp-streams";
+       version = "1.0.0.0";
+       sha256 = "eb47251fa998f141bf5969e50980e5573da4531461d733e707695d504cca00b8";
+       libraryHaskellDepends = [
+         base bytestring data-default-class io-streams network pem tls x509
+         x509-store x509-system
+       ];
+       testHaskellDepends = [
+         base bytestring directory HUnit io-streams network test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/didi-FP/tcp-streams";
+       description = "One stop solution for tcp client and server with tls support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tcp-streams-openssl" = callPackage
     ({ mkDerivation, base, bytestring, directory, HsOpenSSL
      , HsOpenSSL-x509-system, HUnit, io-streams, network, QuickCheck
@@ -169285,6 +171896,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tcp-streams-openssl_1_0_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system
+     , HUnit, io-streams, network, tcp-streams, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "tcp-streams-openssl";
+       version = "1.0.0.0";
+       sha256 = "779dde5cac1fd61a8ee04ded3075bcad61e4851c7e685104196ac44fedf22f47";
+       libraryHaskellDepends = [
+         base bytestring HsOpenSSL HsOpenSSL-x509-system io-streams network
+         tcp-streams
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit io-streams network tcp-streams test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/didi-FP/tcp-streams";
+       description = "Tcp streams using openssl for tls support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tdd-util" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, lens
      , MonadCatchIO-transformers, parallel-io, process, QuickCheck
@@ -169315,8 +171949,10 @@ self: {
 
   "tdigest" = callPackage
     ({ mkDerivation, base, base-compat, binary, bytes, Cabal
-     , cabal-doctest, deepseq, directory, doctest, filepath, reducers
-     , semigroups, tasty, tasty-quickcheck, vector, vector-algorithms
+     , cabal-doctest, Chart, Chart-diagrams, deepseq, directory, doctest
+     , filepath, machines, mwc-random, optparse-applicative, parallel
+     , reducers, semigroups, statistics, tasty, tasty-quickcheck, time
+     , vector, vector-algorithms
      }:
      mkDerivation {
        pname = "tdigest";
@@ -169331,6 +171967,11 @@ self: {
          base base-compat binary bytes deepseq directory doctest filepath
          semigroups tasty tasty-quickcheck vector vector-algorithms
        ];
+       benchmarkHaskellDepends = [
+         base base-compat binary Chart Chart-diagrams deepseq machines
+         mwc-random optparse-applicative parallel semigroups statistics time
+         vector vector-algorithms
+       ];
        homepage = "https://github.com/futurice/haskell-tdigest#readme";
        description = "On-line accumulation of rank-based statistics";
        license = stdenv.lib.licenses.bsd3;
@@ -169855,8 +172496,8 @@ self: {
      }:
      mkDerivation {
        pname = "term-rewriting";
-       version = "0.2";
-       sha256 = "2154905572f2b12c37d4a6ec3dd57d1bdd243057216aaf584432538af2635d1d";
+       version = "0.2.1.1";
+       sha256 = "81ea2a0712af3b6f8f802c29f2fbc2dfb8e48db81dd4da48c42aa5382987e64e";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
@@ -169893,6 +172534,8 @@ self: {
        pname = "terminal-progress-bar";
        version = "0.1.1";
        sha256 = "2053a7ac9113378a6ae8852447b4e7ba430c014776443046788e84183dc9f380";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base stm stm-chans ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
@@ -170059,6 +172702,8 @@ self: {
        sha256 = "7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273";
        revision = "1";
        editedCabalFile = "a6d9dbedbb574271e85c6e5ef9a9f935d87501a9b99b473bf306e3dcd36bdd9e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
@@ -170266,13 +172911,16 @@ self: {
      }) {};
 
   "test-invariant" = callPackage
-    ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck }:
+    ({ mkDerivation, base, criterion, QuickCheck, tasty
+     , tasty-quickcheck
+     }:
      mkDerivation {
        pname = "test-invariant";
        version = "0.4.5.0";
        sha256 = "306fbfcd1b7fea5a88b757ac90550ae6083f64e9dae7da5a3a26c87acf9c6332";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
+       benchmarkHaskellDepends = [ base criterion QuickCheck ];
        homepage = "https://github.com/knupfer/test-invariant";
        description = "Provide common invariants to be checked with QuickCheck";
        license = stdenv.lib.licenses.bsd3;
@@ -170434,6 +173082,8 @@ self: {
        pname = "testbench";
        version = "0.1.0.0";
        sha256 = "66592406ff6e1a03d3ae994560e0bf04e500398fd0a9c9be6bca34a3b86f3e83";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base boxes criterion deepseq HUnit statistics transformers
        ];
@@ -170573,6 +173223,8 @@ self: {
        pname = "texmath";
        version = "0.9.1";
        sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers mtl pandoc-types parsec syb xml
        ];
@@ -170674,7 +173326,7 @@ self: {
      }) {};
 
   "text-builder" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring
+    ({ mkDerivation, base, base-prelude, bytestring, criterion
      , quickcheck-instances, rerebase, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text
      }:
@@ -170689,6 +173341,7 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
        homepage = "https://github.com/nikita-volkov/text-builder";
        description = "An efficient strict text builder";
        license = stdenv.lib.licenses.mit;
@@ -170937,13 +173590,14 @@ self: {
      }) {};
 
   "text-manipulate" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hunit, text }:
+    ({ mkDerivation, base, criterion, tasty, tasty-hunit, text }:
      mkDerivation {
        pname = "text-manipulate";
        version = "0.2.0.1";
        sha256 = "e0e9c71d9b1cfb7d3bca3d0a500d939b3efc6684515c0d7bd685503aa4f49d2f";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/brendanhay/text-manipulate";
        description = "Case conversion, word boundary manipulation, and textual subjugation";
        license = "unknown";
@@ -170967,13 +173621,15 @@ self: {
      }) {};
 
   "text-metrics" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, text }:
+    ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck, text
+     }:
      mkDerivation {
        pname = "text-metrics";
        version = "0.2.0";
        sha256 = "082304ce14ac6182cbb93f51207d90b91d104e5d1fc1b17bbe1c9280ebffe43a";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        homepage = "https://github.com/mrkkrp/text-metrics";
        description = "Calculate various string metrics efficiently";
        license = stdenv.lib.licenses.bsd3;
@@ -171132,10 +173788,10 @@ self: {
   "text-show" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
-     , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec
-     , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups
-     , tagged, template-haskell, text, th-lift, transformers
-     , transformers-compat, void
+     , 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";
@@ -171154,6 +173810,12 @@ self: {
          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;
@@ -171195,7 +173857,8 @@ self: {
      }) {};
 
   "text-stream-decode" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, hspec, text }:
+    ({ mkDerivation, base, bytestring, criterion, deepseq, hspec, text
+     }:
      mkDerivation {
        pname = "text-stream-decode";
        version = "0.1.0.5";
@@ -171204,6 +173867,7 @@ self: {
        editedCabalFile = "d4ea8ff401a3ccbd8a6ce2918385bac4859150047ce9b7f752ff5575db71e9fd";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base bytestring deepseq hspec text ];
+       benchmarkHaskellDepends = [ base bytestring criterion text ];
        homepage = "http://github.com/fpco/text-stream-decode";
        description = "Streaming decoding functions for UTF encodings. (deprecated)";
        license = stdenv.lib.licenses.mit;
@@ -172117,13 +174781,14 @@ self: {
      }) {};
 
   "thread-local-storage" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers }:
+    ({ mkDerivation, atomic-primops, base, containers, criterion }:
      mkDerivation {
        pname = "thread-local-storage";
        version = "0.1.1";
        sha256 = "11a0dfa77abf3d39e33529975aade945b0a6720143b3b134fd9460b0889845ca";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ atomic-primops base ];
+       benchmarkHaskellDepends = [ atomic-primops base criterion ];
        homepage = "https://github.com/rrnewton/thread-local-storage";
        description = "Several options for thread-local-storage (TLS) in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -172264,6 +174929,8 @@ self: {
        pname = "threepenny-gui";
        version = "0.7.0.1";
        sha256 = "b5802dbb6c43304d613373f464d6fd16a4f219a5d289be003a28c2c46cae44c8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson async base bytestring containers data-default deepseq
          filepath hashable network-uri safe snap-core snap-server stm
@@ -172403,9 +175070,10 @@ self: {
 
   "thyme" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , containers, cpphs, deepseq, directory, filepath, mtl, old-locale
-     , profunctors, QuickCheck, random, system-posix-redirect, text
-     , time, vector, vector-space, vector-th-unbox
+     , containers, cpphs, criterion, deepseq, directory, filepath, mtl
+     , old-locale, profunctors, QuickCheck, random
+     , system-posix-redirect, text, time, vector, vector-space
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "thyme";
@@ -172422,6 +175090,10 @@ self: {
          old-locale profunctors QuickCheck random system-posix-redirect text
          time vector-space
        ];
+       benchmarkHaskellDepends = [
+         base criterion mtl old-locale profunctors QuickCheck random time
+         vector vector-space
+       ];
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
@@ -172471,8 +175143,8 @@ self: {
      }:
      mkDerivation {
        pname = "tibetan-utils";
-       version = "0.1.1.0";
-       sha256 = "008b976ca9b9bbd5ebe620e64bddccde31e0eed95ddcda20378cac96d3ca8115";
+       version = "0.1.1.1";
+       sha256 = "fa38e4f2062e801c5f8bccb2afea945cfcf40bd24671d9080bf538e0533bbb2a";
        libraryHaskellDepends = [
          base composition either megaparsec text text-show
        ];
@@ -173007,6 +175679,8 @@ self: {
        pname = "time-w3c";
        version = "0.1.0.1";
        sha256 = "6fb9bd6dcaf5d95093d7d24b6d37edfae71c22dab8158b650b7ba2b019dc168a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base convertible parsec time ];
        homepage = "http://cielonegro.org/W3CDateTime.html";
        description = "Parse, format and convert W3C Date and Time";
@@ -173177,14 +175851,16 @@ self: {
      }) {};
 
   "timemap" = callPackage
-    ({ mkDerivation, base, containers, focus, hashable, list-t
-     , QuickCheck, quickcheck-instances, stm, stm-containers, tasty
-     , tasty-hunit, tasty-quickcheck, time, unordered-containers
+    ({ mkDerivation, base, containers, criterion, focus, hashable
+     , list-t, QuickCheck, quickcheck-instances, stm, stm-containers
+     , tasty, tasty-hunit, tasty-quickcheck, time, unordered-containers
      }:
      mkDerivation {
        pname = "timemap";
        version = "0.0.4";
        sha256 = "6e7c85c727fd9152db635c33ddb72cab5dca9ae240d41fcb653883f1bcd1d9e3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers focus hashable list-t stm stm-containers time
          unordered-containers
@@ -173194,6 +175870,10 @@ self: {
          quickcheck-instances stm stm-containers tasty tasty-hunit
          tasty-quickcheck time unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         base containers criterion focus hashable list-t stm stm-containers
+         time unordered-containers
+       ];
        description = "A mutable hashmap, implicitly indexed by UTCTime";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173526,8 +176206,8 @@ self: {
      }) {};
 
   "tinylog" = callPackage
-    ({ mkDerivation, base, bytestring, containers, double-conversion
-     , fast-logger, text, transformers, unix-time
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , double-conversion, fast-logger, text, transformers, unix-time
      }:
      mkDerivation {
        pname = "tinylog";
@@ -173537,6 +176217,7 @@ self: {
          base bytestring containers double-conversion fast-logger text
          transformers unix-time
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        homepage = "https://gitlab.com/twittner/tinylog/";
        description = "Simplistic logging using fast-logger";
        license = stdenv.lib.licenses.mpl20;
@@ -173677,7 +176358,7 @@ self: {
        pname = "tkyprof";
        version = "0.2.2.2";
        sha256 = "ea40c354d37843757b76152cbde1d9612000593fae4a515ad2d2cbf5940adef7";
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          aeson attoparsec base bytestring cmdargs conduit conduit-extra
@@ -173707,9 +176388,9 @@ self: {
 
   "tls" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
-     , cereal, cryptonite, data-default-class, hourglass, memory, mtl
-     , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
-     , x509-store, x509-validation
+     , cereal, criterion, cryptonite, data-default-class, hourglass
+     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
+     , transformers, x509, x509-store, x509-validation
      }:
      mkDerivation {
        pname = "tls";
@@ -173724,6 +176405,10 @@ self: {
          base bytestring cereal cryptonite data-default-class hourglass mtl
          QuickCheck tasty tasty-quickcheck x509 x509-validation
        ];
+       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)";
        license = stdenv.lib.licenses.bsd3;
@@ -173758,6 +176443,8 @@ self: {
        pname = "tls-extra";
        version = "0.6.6";
        sha256 = "dbf782edbb82321b6484105518fe8e2ff6d51992b20a545a5d3bd380ed901a4c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey
          crypto-random cryptohash mtl network pem time tls vector
@@ -173973,12 +176660,17 @@ self: {
      }) {};
 
   "tokenize" = callPackage
-    ({ mkDerivation, base, split, text }:
+    ({ mkDerivation, base, bytestring, criterion, deepseq, filepath
+     , split, text
+     }:
      mkDerivation {
        pname = "tokenize";
        version = "0.3.0";
        sha256 = "0e88490f06efb45c17138ebbc9bec206b87b98361c2c949ca16546e3f9ab91b5";
        libraryHaskellDepends = [ base split text ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq filepath split text
+       ];
        homepage = "https://bitbucket.org/gchrupala/lingo/overview";
        description = "Simple tokenizer for English text";
        license = stdenv.lib.licenses.bsd3;
@@ -174137,8 +176829,8 @@ self: {
     ({ mkDerivation, base, void }:
      mkDerivation {
        pname = "total";
-       version = "1.0.4";
-       sha256 = "eadd2440d593a5df926f8ed77c6455c235e25948240d235a0ae7bd6bff15807e";
+       version = "1.0.5";
+       sha256 = "922078be30b4ef27b37c9c7ecafa19e892ac8e19e5c99056ba0456d4c492694f";
        libraryHaskellDepends = [ base void ];
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -174200,6 +176892,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tower" = callPackage
+    ({ mkDerivation, base, HUnit, protolude, QuickCheck, smallcheck
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, vector
+     }:
+     mkDerivation {
+       pname = "tower";
+       version = "0.1.0";
+       sha256 = "0a9daecc7b1ab68b5dfdf108df6d324f27b3798b4eb43e275d957cd4313cd90b";
+       libraryHaskellDepends = [ base protolude QuickCheck vector ];
+       testHaskellDepends = [
+         base HUnit protolude QuickCheck smallcheck tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/tonyday567/tower";
+       description = "A numeric tower";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "toxcore" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary
      , data-default-class, hspec, QuickCheck, saltine, toxcore
@@ -174224,7 +176934,7 @@ self: {
 
   "toysolver" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-builder
-     , containers, data-default-class, data-interval, deepseq
+     , containers, criterion, data-default-class, data-interval, deepseq
      , exceptions, extended-reals, filepath, finite-field, ghc-prim
      , hashable, haskeline, heaps, intern, loop, mtl, multiset
      , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes
@@ -174263,6 +176973,9 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-th transformers
          transformers-compat vector vector-space
        ];
+       benchmarkHaskellDepends = [
+         array base criterion data-default-class parse-dimacs vector
+       ];
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174294,12 +177007,41 @@ self: {
          base binary containers distributed-process exceptions
          network-transport-inmemory pipes QuickCheck stm transformers
        ];
+       benchmarkHaskellDepends = [
+         async base binary bytestring containers distributed-process errors
+         exceptions ghc-prim heaps network network-transport-tcp
+         optparse-applicative pipes pipes-bytestring pipes-concurrency
+         pipes-safe process stm transformers trifecta
+       ];
        homepage = "http://github.com/bgamari/tpar/";
        description = "simple, parallel job scheduling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tpb" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, boxes, bytestring
+     , directory, filepath, free, http-client, http-client-tls
+     , libnotify, microlens, mtl, optparse-applicative, pushbullet-types
+     , servant, servant-client, servant-pushbullet-client, text, time
+     , websockets, wuss
+     }:
+     mkDerivation {
+       pname = "tpb";
+       version = "0.1.1.1";
+       sha256 = "816c0381011987955c8aa1b379f90077334547edf5675e1540d7562acafe5c70";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base boxes bytestring directory filepath free
+         http-client http-client-tls libnotify microlens mtl
+         optparse-applicative pushbullet-types servant servant-client
+         servant-pushbullet-client text time websockets wuss
+       ];
+       description = "Applications for interacting with the Pushbullet API";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tpdb" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, hashable
      , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text
@@ -174394,6 +177136,8 @@ self: {
        sha256 = "12d0eb7923a905fff4b92c7f4f187a4715ba95883ac1df5e0a7efb59427f5115";
        revision = "1";
        editedCabalFile = "9e20b69ed0c5280699565c000bcd8f8b70ae6bc2275e37669af70bbca5d4f77a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bifunctors containers json mtl transformers
        ];
@@ -174427,9 +177171,9 @@ self: {
      }) {};
 
   "traildb" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory
-     , exceptions, Judy, lens, primitive, text, time, traildb
-     , transformers, unix, vector
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , deepseq, directory, exceptions, Judy, lens, primitive, random
+     , text, time, traildb, transformers, unix, vector
      }:
      mkDerivation {
        pname = "traildb";
@@ -174440,6 +177184,9 @@ self: {
          time transformers unix vector
        ];
        librarySystemDepends = [ Judy traildb ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal criterion deepseq directory random
+       ];
        description = "TrailDB bindings for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174628,7 +177375,8 @@ self: {
      }) {};
 
   "transformers-eff" = callPackage
-    ({ mkDerivation, base, free, list-transformer, mmorph, transformers
+    ({ mkDerivation, base, criterion, effect-interpreters, free
+     , list-transformer, mmorph, mtl, pipes, transformers
      }:
      mkDerivation {
        pname = "transformers-eff";
@@ -174637,6 +177385,9 @@ self: {
        libraryHaskellDepends = [
          base free list-transformer mmorph transformers
        ];
+       benchmarkHaskellDepends = [
+         base criterion effect-interpreters mtl pipes transformers
+       ];
        homepage = "https://github.com/ocharles/transformers-eff";
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
        license = stdenv.lib.licenses.bsd3;
@@ -174743,6 +177494,8 @@ self: {
        pname = "translatable-intset";
        version = "0.1";
        sha256 = "7556dd009fa229c94ad47dfc7ef86b1e5e5bf76feee8db9b704419820b0d685f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base fingertree ];
        description = "Integer sets with a constant time translate operation";
        license = stdenv.lib.licenses.mit;
@@ -174968,6 +177721,8 @@ self: {
        pname = "treeviz";
        version = "2.0.3";
        sha256 = "dab7dd9935cde4259dab1604b732292a0076e1e8a277476abf822ea2819f26a9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
        homepage = "http://www.haskell.org/haskellwiki/Treeviz";
        description = "Visualization of computation decomposition trees";
@@ -175020,9 +177775,9 @@ self: {
 
   "tries" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, composition
-     , composition-extra, containers, deepseq, hashable, keys, mtl
-     , QuickCheck, quickcheck-instances, rose-trees, semigroups, sets
-     , tasty, tasty-quickcheck, unordered-containers
+     , composition-extra, containers, criterion, deepseq, hashable, keys
+     , mtl, QuickCheck, quickcheck-instances, rose-trees, semigroups
+     , sets, tasty, tasty-quickcheck, unordered-containers
      }:
      mkDerivation {
        pname = "tries";
@@ -175039,6 +177794,12 @@ self: {
          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
+       ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175294,6 +178055,8 @@ self: {
        pname = "tsparse";
        version = "0.4.0.0";
        sha256 = "511b4bca012747f7fc97a78f620ea3d9dca4e1a6d7a0b2fb17d8f010f7a5bb68";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base Decimal parsec pretty process split time
        ];
@@ -175376,9 +178139,11 @@ self: {
      }) {};
 
   "ttrie" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, hashable
-     , primitive, QuickCheck, stm, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, async, atomic-primops, base, bifunctors
+     , containers, criterion-plus, deepseq, hashable, mwc-random
+     , primitive, QuickCheck, stm, stm-containers, stm-stats
+     , test-framework, test-framework-quickcheck2, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "ttrie";
@@ -175391,6 +178156,11 @@ self: {
          base containers hashable QuickCheck stm test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         async base bifunctors containers criterion-plus deepseq mwc-random
+         primitive stm stm-containers stm-stats text transformers
+         unordered-containers vector
+       ];
        homepage = "http://github.com/mcschroeder/ttrie";
        description = "Contention-free STM hash map";
        license = stdenv.lib.licenses.mit;
@@ -175673,8 +178443,8 @@ self: {
 
   "turtle" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , directory, doctest, foldl, hostname, managed, optional-args
-     , optparse-applicative, process, stm, system-fileio
+     , criterion, directory, doctest, foldl, hostname, managed
+     , optional-args, optparse-applicative, process, stm, system-fileio
      , system-filepath, temporary, text, time, transformers, unix
      , unix-compat
      }:
@@ -175689,6 +178459,7 @@ self: {
          unix-compat
        ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176686,6 +179457,8 @@ self: {
        pname = "type-natural";
        version = "0.7.1.3";
        sha256 = "56d3962fb5c7a9e858f75603e1dc8d73c8a8adea65a0097bdf5ef033b0529ee2";
+       revision = "1";
+       editedCabalFile = "97d8c20d880fd2296ff023ced046b16a9291fa32922c45532027dda1e228db23";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger monomorphic singletons template-haskell
@@ -177165,10 +179938,11 @@ self: {
      }) {};
 
   "tz" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, data-default
-     , deepseq, HUnit, QuickCheck, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, time, tzdata, vector
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , data-default, deepseq, HUnit, lens, QuickCheck, template-haskell
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , test-framework-th, thyme, time, timezone-olson, timezone-series
+     , tzdata, vector
      }:
      mkDerivation {
        pname = "tz";
@@ -177182,6 +179956,9 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th time tzdata
        ];
+       benchmarkHaskellDepends = [
+         base criterion lens thyme time timezone-olson timezone-series
+       ];
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
@@ -177249,9 +180026,9 @@ self: {
      }) {};
 
   "ua-parser" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, data-default, file-embed
-     , filepath, HUnit, pcre-light, tasty, tasty-hunit, tasty-quickcheck
-     , text, yaml
+    ({ mkDerivation, aeson, base, bytestring, criterion, data-default
+     , deepseq, file-embed, filepath, HUnit, pcre-light, tasty
+     , tasty-hunit, tasty-quickcheck, text, yaml
      }:
      mkDerivation {
        pname = "ua-parser";
@@ -177264,6 +180041,10 @@ self: {
          aeson base bytestring data-default file-embed filepath HUnit
          pcre-light tasty tasty-hunit tasty-quickcheck text yaml
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion data-default deepseq file-embed
+         filepath pcre-light text yaml
+       ];
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177336,6 +180117,8 @@ self: {
        pname = "udbus";
        version = "0.2.1";
        sha256 = "d325b0c1f2a7b1eabde17d85734175f622c6597e9dfc40704894da94a09ef328";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
@@ -177352,6 +180135,8 @@ self: {
        pname = "udbus-model";
        version = "0.2.1";
        sha256 = "517ea7b540848f782f3dd6890a5cf41747eca445952649827c2addd3c11f3f76";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring udbus xml ];
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
@@ -177376,6 +180161,8 @@ self: {
        pname = "udev";
        version = "0.1.0.0";
        sha256 = "a2bb00c7c75ff9beb1951dfec706c628f5354a6a9d58abcb5e9d6950dc29b1a8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
        libraryPkgconfigDepends = [ libudev ];
        homepage = "https://github.com/pxqr/udev";
@@ -177552,6 +180339,8 @@ self: {
        pname = "unagi-bloomfilter";
        version = "0.1.1.0";
        sha256 = "4cdbd8c483c0c2285737e5f12f6a9c512c6697683b4be5e2e5cb286199db5a0f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          atomic-primops base bytestring hashabler primitive
        ];
@@ -177561,8 +180350,8 @@ self: {
      }) {};
 
   "unagi-chan" = callPackage
-    ({ mkDerivation, atomic-primops, base, containers, ghc-prim
-     , primitive
+    ({ mkDerivation, async, atomic-primops, base, containers, criterion
+     , ghc-prim, primitive
      }:
      mkDerivation {
        pname = "unagi-chan";
@@ -177572,6 +180361,7 @@ self: {
        testHaskellDepends = [
          atomic-primops base containers ghc-prim primitive
        ];
+       benchmarkHaskellDepends = [ async base criterion ];
        description = "Fast concurrent queues with a Chan-like API, and more";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177594,6 +180384,8 @@ self: {
        pname = "unamb";
        version = "0.2.5";
        sha256 = "3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://haskell.org/haskellwiki/unamb";
        description = "Unambiguous choice";
@@ -177634,9 +180426,10 @@ self: {
      }) {};
 
   "unbound-generics" = callPackage
-    ({ mkDerivation, base, containers, contravariant, deepseq, mtl
-     , profunctors, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers, transformers-compat
+    ({ mkDerivation, base, containers, contravariant, criterion
+     , deepseq, deepseq-generics, mtl, profunctors, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, template-haskell, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "unbound-generics";
@@ -177649,6 +180442,9 @@ self: {
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq deepseq-generics
+       ];
        homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
@@ -177905,6 +180701,8 @@ self: {
        pname = "unicode";
        version = "0.0";
        sha256 = "d41708f5800a83a2b7f44d10f74371625fbc50dd4a9520dd6fc53762904cc83b";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers utility-ht ];
        homepage = "http://code.haskell.org/~thielema/unicode/";
@@ -177992,8 +180790,9 @@ self: {
      }) {};
 
   "unicode-transforms" = callPackage
-    ({ mkDerivation, base, bitarray, bytestring, deepseq
-     , getopt-generics, QuickCheck, split, text
+    ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
+     , filepath, getopt-generics, optparse-applicative, path, path-io
+     , QuickCheck, split, text
      }:
      mkDerivation {
        pname = "unicode-transforms";
@@ -178003,14 +180802,19 @@ self: {
        testHaskellDepends = [
          base deepseq getopt-generics QuickCheck split text
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq filepath optparse-applicative path path-io
+         text
+       ];
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "unicode-transforms_0_3_0" = callPackage
-    ({ mkDerivation, base, bitarray, bytestring, deepseq
-     , getopt-generics, QuickCheck, split, text
+    ({ mkDerivation, base, bitarray, bytestring, criterion, deepseq
+     , filepath, getopt-generics, optparse-applicative, path, path-io
+     , QuickCheck, split, text
      }:
      mkDerivation {
        pname = "unicode-transforms";
@@ -178020,6 +180824,10 @@ self: {
        testHaskellDepends = [
          base deepseq getopt-generics QuickCheck split text
        ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq filepath optparse-applicative path path-io
+         text
+       ];
        homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
@@ -178102,12 +180910,15 @@ self: {
      }) {};
 
   "union" = callPackage
-    ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }:
+    ({ mkDerivation, base, criterion, deepseq, lens, profunctors
+     , tagged, vinyl
+     }:
      mkDerivation {
        pname = "union";
        version = "0.1.1.1";
        sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4";
        libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
+       benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178587,6 +181398,8 @@ self: {
        pname = "unix-fcntl";
        version = "0.0.0";
        sha256 = "69c1852fa11e98c99e0f61052bd642e66f2e491ffba1e0ee6d7cd5d049f832a3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
        homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
@@ -178754,8 +181567,9 @@ self: {
      }) {};
 
   "unordered-containers" = callPackage
-    ({ mkDerivation, base, ChasingBottoms, containers, deepseq
-     , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
+    ({ mkDerivation, base, bytestring, ChasingBottoms, containers
+     , criterion, deepseq, deepseq-generics, hashable, hashmap, HUnit
+     , mtl, QuickCheck, random, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
@@ -178767,6 +181581,10 @@ self: {
          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;
@@ -178866,6 +181684,8 @@ self: {
        pname = "unsafely";
        version = "0.2.0.0";
        sha256 = "19341a7d3d2e4d4ae3a4a232c566edb071c895a17e5f1d1ad092b1d3fe026583";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
@@ -179150,27 +181970,63 @@ self: {
 
   "uri-bytestring" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, generics-sop, HUnit, lens-simple, QuickCheck
-     , quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck
+     , containers, criterion, deepseq, deepseq-generics, generics-sop
+     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, th-lift-instances
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.2.2.1";
-       sha256 = "9185e8f05d5c5154348c0d57d0df2b92ba6d09153fbdebded995b2f54e71c67e";
+       version = "0.2.3.0";
+       sha256 = "50178faac44a67095602412846682040b8b72ae8af5289e73dabe2cc49a639dd";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers
+         template-haskell th-lift-instances
        ];
        testHaskellDepends = [
          attoparsec base blaze-builder bytestring containers generics-sop
          HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
          tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring_0_2_3_1" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , containers, criterion, deepseq, deepseq-generics, generics-sop
+     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, th-lift-instances
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.2.3.1";
+       sha256 = "1d2814b8ca76c8b72fcf995d4d863c492b22bc80c62d990dad2d969cbef1b16d";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers
+         template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers generics-sop
+         HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers, deepseq
      , failure, monad-control, network, system-fileio, system-filepath
@@ -179197,6 +182053,8 @@ self: {
        pname = "uri-encode";
        version = "1.5.0.5";
        sha256 = "e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring network-uri text utf8-string
        ];
@@ -179356,6 +182214,8 @@ self: {
        pname = "urlencoded";
        version = "0.4.1";
        sha256 = "91431808fc26a7a9d2d18100c93c8b0a815de519e33547e8f60da9ed66976799";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base mtl network network-uri split ];
        homepage = "https://github.com/pheaver/urlencoded";
        description = "Generate or process x-www-urlencoded data";
@@ -179468,6 +182328,8 @@ self: {
        pname = "usb-id-database";
        version = "0.4.0.9";
        sha256 = "4187f776f53c50423e1064753c0bf5446db871a6a4113ec8d970d24a5ffe26ca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
@@ -179888,9 +182750,10 @@ self: {
      }) {};
 
   "uuid" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cryptohash-md5
-     , cryptohash-sha1, entropy, HUnit, network-info, QuickCheck, random
-     , tasty, tasty-hunit, tasty-quickcheck, text, time, uuid-types
+    ({ mkDerivation, base, binary, bytestring, criterion
+     , cryptohash-md5, cryptohash-sha1, entropy, HUnit
+     , mersenne-random-pure64, network-info, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, uuid-types
      }:
      mkDerivation {
        pname = "uuid";
@@ -179904,6 +182767,9 @@ self: {
          base bytestring HUnit QuickCheck random tasty tasty-hunit
          tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base criterion mersenne-random-pure64 random
+       ];
        homepage = "https://github.com/hvr/uuid";
        description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
@@ -179961,8 +182827,9 @@ self: {
      }) {};
 
   "uuid-types" = callPackage
-    ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit
-     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, HUnit, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "uuid-types";
@@ -179976,6 +182843,9 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq random
+       ];
        homepage = "https://github.com/aslatter/uuid";
        description = "Type definitions for Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
@@ -180382,8 +183252,8 @@ self: {
      }) {};
 
   "var" = callPackage
-    ({ mkDerivation, base, QuickCheck, test-framework
-     , test-framework-quickcheck2, transformers
+    ({ mkDerivation, array, base, criterion, deepseq, QuickCheck
+     , test-framework, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "var";
@@ -180393,6 +183263,7 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ array base criterion deepseq ];
        homepage = "http://github.com/sonyandy/var";
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -180450,7 +183321,9 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
+    ({ mkDerivation, base, criterion, hspec, QuickCheck, time
+     , transformers
+     }:
      mkDerivation {
        pname = "varying";
        version = "0.7.0.3";
@@ -180460,6 +183333,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        executableHaskellDepends = [ base time transformers ];
        testHaskellDepends = [ base hspec QuickCheck time transformers ];
+       benchmarkHaskellDepends = [ base criterion time transformers ];
        homepage = "https://github.com/schell/varying";
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
@@ -180803,6 +183677,8 @@ self: {
        sha256 = "ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070";
        revision = "1";
        editedCabalFile = "82d67db49c85c1e136b6e6e44f99c908b405628a17b0d220c95aed34845426a5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
@@ -180825,13 +183701,18 @@ self: {
      }) {};
 
   "vector-binary-instances" = callPackage
-    ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }:
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , tasty, tasty-quickcheck, vector
+     }:
      mkDerivation {
        pname = "vector-binary-instances";
        version = "0.2.3.4";
        sha256 = "f3cef04ff645bbf25198c2c0c33d0c13e44bfe63602e1e694c2be9abf0e57d00";
        libraryHaskellDepends = [ base binary vector ];
        testHaskellDepends = [ base binary tasty tasty-quickcheck vector ];
+       benchmarkHaskellDepends = [
+         base binary bytestring criterion deepseq vector
+       ];
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
@@ -180886,6 +183767,8 @@ self: {
        pname = "vector-bytestring";
        version = "0.0.0.1";
        sha256 = "641eef86c91a0c742d74c1ea0f29ca69d9105379296ad622cb5f991142d53376";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim primitive vector
        ];
@@ -181167,8 +184050,9 @@ self: {
      }) {};
 
   "vectortiles" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, deepseq, hex
-     , protobuf, tasty, tasty-hunit, text, transformers, vector
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , deepseq, hex, microlens, microlens-platform, protobuf, tasty
+     , tasty-hunit, text, transformers, vector
      }:
      mkDerivation {
        pname = "vectortiles";
@@ -181181,6 +184065,10 @@ self: {
        testHaskellDepends = [
          base bytestring cereal hex protobuf tasty tasty-hunit text vector
        ];
+       benchmarkHaskellDepends = [
+         base bytestring cereal containers criterion microlens
+         microlens-platform protobuf text
+       ];
        homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.asl20;
@@ -181237,6 +184125,8 @@ self: {
        pname = "verdict-json";
        version = "0.0.0.0";
        sha256 = "7b64ab1ec3ae42db778f8adc52219a472af76ea0dd4d91d9376ad57dc9abaf4a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers text unordered-containers vector verdict
        ];
@@ -181321,6 +184211,8 @@ self: {
        pname = "vhd";
        version = "0.2.2";
        sha256 = "7c678f076395f44d853f87a4538635bc83d7a10319933dec9e06b40ce409ea7c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base byteable bytestring cereal cipher-aes cryptohash directory
          filepath mmap random storable-endian text time
@@ -181513,13 +184405,18 @@ self: {
      }) {};
 
   "vinyl" = callPackage
-    ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
+    ({ mkDerivation, base, criterion, doctest, ghc-prim, lens, linear
+     , mwc-random, singletons, vector
+     }:
      mkDerivation {
        pname = "vinyl";
        version = "0.5.3";
        sha256 = "00f86a43def432c564226daae42b130a67c5fb413f3b097f43a14fbfb57608a6";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base doctest lens singletons ];
+       benchmarkHaskellDepends = [
+         base criterion lens linear mwc-random vector
+       ];
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -181619,6 +184516,8 @@ self: {
        pname = "vinyl-vectors";
        version = "0.2.0";
        sha256 = "6f9b6b8772937c967ad2b51e062cab27cb94fdbfb6d5e35eaae7c396e42362d7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring constraints data-default primitive template-haskell
          text vector vinyl
@@ -182639,6 +185538,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-auth" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary
+     , blaze-builder, blaze-html, bytestring, case-insensitive, cereal
+     , 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
+     }:
+     mkDerivation {
+       pname = "wai-middleware-auth";
+       version = "0.1.1.0";
+       sha256 = "f951faa7f3b143b36268b3c3b0250779d229490b0a4bad8722cda3ea0a60a1a1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary blaze-builder blaze-html
+         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
+       ];
+       executableHaskellDepends = [
+         base bytestring cereal clientsession optparse-simple warp
+       ];
+       description = "Authentication middleware that secures WAI application";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wai-middleware-cache" = callPackage
     ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring
      , conduit, crypto-conduit, http-types, HUnit, pureMD5
@@ -182759,6 +185687,8 @@ self: {
        pname = "wai-middleware-consul";
        version = "0.1.0.2";
        sha256 = "d89d5a5bf0b08cf4fcd300d9e16c351a146119c34a9f31949498a874699c0763";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base base-prelude bytestring conduit conduit-extra
          consul-haskell enclosed-exceptions http-client http-types
@@ -182910,6 +185840,8 @@ self: {
        pname = "wai-middleware-hmac-client";
        version = "0.1.0.2";
        sha256 = "ba419c0e9a6d00e7ab03150219012128908bc3018b43d7d4cb46cbb01babaeca";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base base64-bytestring byteable bytestring case-insensitive
          cryptohash http-client http-types mtl old-locale time transformers
@@ -182921,9 +185853,9 @@ self: {
      }) {};
 
   "wai-middleware-metrics" = callPackage
-    ({ mkDerivation, base, bytestring, ekg-core, http-types, QuickCheck
-     , scotty, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers, wai, wai-extra
+    ({ 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";
@@ -182934,6 +185866,10 @@ self: {
          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;
@@ -183073,6 +186009,8 @@ self: {
        pname = "wai-middleware-verbs";
        version = "0.3.2";
        sha256 = "691fa97fda7204d84e1fa8f953334ca51cb1055577a5ec1d56cc5f07491aaa66";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base errors exceptions hashable http-types mmorph monad-logger mtl
          resourcet transformers transformers-base unordered-containers wai
@@ -183106,7 +186044,7 @@ self: {
 
   "wai-request-spec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , http-types, text, wai
+     , criterion, http-types, text, wai
      }:
      mkDerivation {
        pname = "wai-request-spec";
@@ -183115,6 +186053,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion http-types text wai
+       ];
        homepage = "https://gitlab.com/queertypes/wai-request-spec";
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -183194,8 +186135,8 @@ self: {
   "wai-routing" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, containers, cookie
-     , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
-     , wai, wai-predicates, wai-route
+     , criterion, http-types, tasty, tasty-hunit, tasty-quickcheck
+     , transformers, wai, wai-predicates, wai-route
      }:
      mkDerivation {
        pname = "wai-routing";
@@ -183210,6 +186151,9 @@ self: {
          case-insensitive containers http-types tasty tasty-hunit
          tasty-quickcheck wai wai-predicates
        ];
+       benchmarkHaskellDepends = [
+         base criterion http-types wai wai-predicates
+       ];
        homepage = "https://gitlab.com/twittner/wai-routing/";
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
@@ -183503,6 +186447,8 @@ self: {
        sha256 = "5610c69eb377e2714c3e502cf47fff7e116e356890aefb1f4144d3e6c1b16c12";
        revision = "2";
        editedCabalFile = "7b2f9d4fe0358eb303c3993233b05c1505f4021ebee41fccfad0b6badbf8bd8f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring directory filepath http-types
          regex-applicative template-haskell text wai
@@ -183547,15 +186493,16 @@ self: {
   "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
-     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     , criterion, directory, doctest, ghc-prim, hashable, hspec, HTTP
+     , http-date, http-types, http2, HUnit, iproute, lifted-base
+     , network, process, QuickCheck, silently, simple-sendfile, stm
+     , streaming-commons, text, time, transformers, unix, unix-compat
+     , vault, wai, word8
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.11";
-       sha256 = "193e6cd899c09850819c09ae4a4368f569ee65559eef3f440be83b6c2b2cffac";
+       version = "3.2.11.1";
+       sha256 = "853f672c48893936902a0c6b3e4711f58c0fd02f36e8badb46a0c8b58067e5fe";
        libraryHaskellDepends = [
          array async auto-update base blaze-builder bytestring
          bytestring-builder case-insensitive containers ghc-prim hashable
@@ -183570,6 +186517,10 @@ self: {
          simple-sendfile stm streaming-commons text time transformers unix
          unix-compat vault wai word8
        ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers criterion hashable http-date
+         http-types network unix unix-compat
+       ];
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
@@ -183641,6 +186592,8 @@ self: {
        pname = "warp-tls-uid";
        version = "0.1.0.4";
        sha256 = "beacad56f701aa913e0912a7a319a8b95d8e5100dddbf1f8655d7ce4a64c5b85";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring certificate conduit crypto-random network
          network-conduit pem tls tls-extra unix wai warp
@@ -183823,6 +186776,8 @@ self: {
        pname = "wcwidth";
        version = "0.0.2";
        sha256 = "ffc68736a3bbde3e8157710f29f4a99c0ca593c41194579c54a92c62f6c12ed8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        homepage = "http://github.com/solidsnack/wcwidth/";
        description = "Native wcwidth";
@@ -183878,6 +186833,8 @@ self: {
        pname = "web-encodings";
        version = "0.3.0.9";
        sha256 = "a30b0e0c596a1e9953fb1d5a5aa2ebe1710561d662294088d0cea657f5dae951";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring directory failure old-locale text time
        ];
@@ -183954,6 +186911,8 @@ self: {
        pname = "web-page";
        version = "0.2.0";
        sha256 = "143301e4a9ff9f01507ef2b4548aebce01811090b176d52adc3dc87bcce5f8c3";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring clay containers jmacro
          lens mtl Stream text vector wl-pprint-text
@@ -184070,6 +187029,8 @@ self: {
        pname = "web-routes-quasi";
        version = "0.7.1.1";
        sha256 = "aeb63d0670b2229a246530cb05666957bfa15387d2617104856d1e0b62f50be7";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
        homepage = "http://docs.yesodweb.com/web-routes-quasi/";
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
@@ -184134,8 +187095,8 @@ self: {
      }) {};
 
   "web-routing" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, primitive, text
-     , types-compat, unordered-containers
+    ({ mkDerivation, base, bytestring, criterion, doctest, primitive
+     , text, types-compat, unordered-containers
      }:
      mkDerivation {
        pname = "web-routing";
@@ -184147,6 +187108,7 @@ self: {
          base bytestring primitive text types-compat unordered-containers
        ];
        testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ base criterion text ];
        homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
@@ -184160,8 +187122,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.5.3.0";
-       sha256 = "258d2344367d7ceb3c1a43acd99b05bb23afbc5c5476be4d341e3ca2f56ae91d";
+       version = "0.5.4.0";
+       sha256 = "a33d6944539d6f7f811c8e0fffed8a8a291d6a0e147f29199cd9eadaada69e01";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring cryptonite
          http-client http-client-tls memory template-haskell text
@@ -184458,6 +187420,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
   "webkit-javascriptcore" = callPackage
@@ -184504,6 +187467,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
   "webkitgtk3-javascriptcore" = callPackage
@@ -184517,6 +187481,7 @@ self: {
        libraryPkgconfigDepends = [ webkit ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit = null;};
 
   "webpage" = callPackage
@@ -184586,6 +187551,8 @@ self: {
        pname = "websockets";
        version = "0.10.0.0";
        sha256 = "3ee56fa6683912928a7d336d591c43e4948886037b5aa72cbab2f33fb43fa2eb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          attoparsec base base64-bytestring binary blaze-builder bytestring
          case-insensitive containers entropy network random SHA text
@@ -184707,6 +187674,8 @@ self: {
        pname = "weighted-regexp";
        version = "0.3.1.2";
        sha256 = "f963773841854c56d36f329dae51ec08b9028832eee53b62a9ba7df5ef2de664";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
        homepage = "http://sebfisch.github.com/haskell-regexp";
@@ -184958,13 +187927,18 @@ self: {
      }) {};
 
   "wigner-symbols" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite }:
+    ({ mkDerivation, base, bytestring, criterion, cryptonite, primitive
+     , random, vector
+     }:
      mkDerivation {
        pname = "wigner-symbols";
        version = "1.0.0";
        sha256 = "0d2ae52728e6ef32519a6b648033185617291e76c4996c7107b9a3caf73db28e";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring cryptonite ];
+       benchmarkHaskellDepends = [
+         base criterion primitive random vector
+       ];
        homepage = "https://github.com/Rufflewind/wigner-symbols";
        description = "CG coefficients and Wigner symbols";
        license = stdenv.lib.licenses.mit;
@@ -185098,6 +188072,8 @@ self: {
        pname = "windowslive";
        version = "0.3";
        sha256 = "7fc9617306ccbe99a8f910ca442bfeabd8e78b8668db773defefa5b41b1fb395";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
@@ -185113,8 +188089,7 @@ self: {
        pname = "winerror";
        version = "1.0.1";
        sha256 = "0d527e4024967909171d3aea30d43abb0fd84306f77aa26625466c0f3de95575";
-       isLibrary = false;
-       isExecutable = false;
+       doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185139,19 +188114,26 @@ self: {
      }) {kernel32 = null; ws2_32 = null;};
 
   "wire-streams" = callPackage
-    ({ mkDerivation, base, binary, binary-parsers, bytestring
-     , io-streams, QuickCheck, tasty, tasty-quickcheck
+    ({ mkDerivation, base, binary, binary-parsers, bytestring, cereal
+     , cereal-conduit, conduit, conduit-extra, criterion, io-streams
+     , QuickCheck, tasty, tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "wire-streams";
        version = "0.1.1.0";
        sha256 = "96dffb70c08c89589881c96f199d271b55e4a5b3cc5be0f3e24e101858e2fb27";
+       revision = "1";
+       editedCabalFile = "08816c7fa53b20f52e5c465252c106d9de8e6d9580ec0b6d9f000a34c7bcefc8";
        libraryHaskellDepends = [
          base binary binary-parsers bytestring io-streams
        ];
        testHaskellDepends = [
          base binary bytestring io-streams QuickCheck tasty tasty-quickcheck
        ];
+       benchmarkHaskellDepends = [
+         base binary bytestring cereal cereal-conduit conduit conduit-extra
+         criterion io-streams transformers
+       ];
        homepage = "https://github.com/winterland1989/wire-streams";
        description = "Fast binary io-streams adapter";
        license = stdenv.lib.licenses.bsd3;
@@ -185165,6 +188147,8 @@ self: {
        pname = "wires";
        version = "0.1.0";
        sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base deepseq profunctors semigroupoids these
        ];
@@ -185583,8 +188567,8 @@ self: {
      }) {};
 
   "word24" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, base, criterion, deepseq, QuickCheck
+     , test-framework, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "word24";
@@ -185594,6 +188578,7 @@ self: {
        testHaskellDepends = [
          base deepseq QuickCheck test-framework test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        homepage = "https://github.com/winterland1989/word24";
        description = "24-bit word and int types for GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -185601,13 +188586,14 @@ self: {
      }) {};
 
   "word8" = callPackage
-    ({ mkDerivation, base, hspec }:
+    ({ mkDerivation, base, bytestring, criterion, hspec }:
      mkDerivation {
        pname = "word8";
        version = "0.1.2";
        sha256 = "3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Word8 library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185763,7 +188749,7 @@ self: {
        pname = "workflow-windows";
        version = "0.0.0";
        sha256 = "4c922f26ea5580022b8ecd184ce473eabead4a035cc95ea9394f9fc04efdff92";
-       isLibrary = false;
+       isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
@@ -185821,6 +188807,8 @@ self: {
        pname = "wraxml";
        version = "0.4.4.1";
        sha256 = "828d9250db9472c321c55d08f9daa2c4c9995e95d2fd964ef0c1d16b32c75613";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers data-accessor explicit-exception HaXml hxt
          hxt-filter polyparse tagchup tagsoup transformers utility-ht
@@ -185893,6 +188881,8 @@ self: {
        pname = "wreq";
        version = "0.5.0.0";
        sha256 = "15e5787791148991d6055ad1269b9d9cb22db04e16b0bd1d266e2f00cec1f4d5";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -185929,6 +188919,8 @@ self: {
        pname = "wreq-sb";
        version = "0.4.0.0";
        sha256 = "dfc9c0a13696bbe2521a9d440bd9c8a57b8dccef270bdffb011bf320a7971b54";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec authenticate-oauth base base16-bytestring byteable
          bytestring case-insensitive containers cryptohash exceptions
@@ -186766,6 +189758,8 @@ self: {
        pname = "xenstore";
        version = "0.1.1";
        sha256 = "c2b538c9ce6716f4a1b4c0cb63ed5c6e5ee3e69e80dbb7826ee7f5392f45e874";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base bytestring cereal mtl network ];
        description = "Xenstore client access";
        license = stdenv.lib.licenses.bsd3;
@@ -186781,10 +189775,14 @@ self: {
        sha256 = "9febbf8349f27fa184c56959a01db2f78176bd534f103f6b1be0bb01b7fac360";
        revision = "1";
        editedCabalFile = "ce4bb3ab326d8e4c0a4fc2576045b589305b12f7ca28b79a69fcc367c429d33c";
+       isLibrary = true;
+       isExecutable = true;
        setupHaskellDepends = [ base Cabal containers directory filepath ];
        libraryHaskellDepends = [ base glib ];
        libraryPkgconfigDepends = [ libxfconf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
+       executablePkgconfigDepends = [ libxfconf ];
+       executableToolDepends = [ gtk2hs-buildtools ];
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
@@ -186943,6 +189941,8 @@ self: {
        pname = "xing-api";
        version = "0.1.3";
        sha256 = "b3e21b098ef46e9d496efa4257172fa5a872149e708f694cd0ea60ef192d23fc";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring containers http-conduit
          http-types lifted-base monad-control resourcet text time
@@ -186974,8 +189974,9 @@ self: {
 
   "xkbcommon" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cpphs, data-flags
-     , directory, filepath, libxkbcommon, process, storable-record
-     , template-haskell, text, transformers, unix
+     , directory, filepath, libxkbcommon, process, random
+     , storable-record, template-haskell, text, time, transformers, unix
+     , vector
      }:
      mkDerivation {
        pname = "xkbcommon";
@@ -186990,6 +189991,7 @@ self: {
        ];
        librarySystemDepends = [ libxkbcommon ];
        testHaskellDepends = [ base unix ];
+       benchmarkHaskellDepends = [ base random time vector ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187288,6 +190290,8 @@ self: {
        pname = "xml-enumerator-combinators";
        version = "0.1";
        sha256 = "63c9e2548ef8c83116fff84160b48494974b1cf34852fe2e6377cab53ef754d8";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers enumerator xml-enumerator xml-types
        ];
@@ -187351,6 +190355,8 @@ self: {
        pname = "xml-html-conduit-lens";
        version = "0.3.2.2";
        sha256 = "bf2b242411168e2287d2189e8c74c4c3751afac03003a852ee6068ce7cc643ac";
+       revision = "1";
+       editedCabalFile = "4673f03cf274523d25c1b07e4fddd6b1729e42a372ef7e1967705b808eda52a8";
        libraryHaskellDepends = [
          base bytestring containers html-conduit lens text xml-conduit
        ];
@@ -187386,6 +190392,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xml-indexed-cursor" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default
+     , doctest, Glob, tasty, tasty-hunit, text, xml-conduit
+     }:
+     mkDerivation {
+       pname = "xml-indexed-cursor";
+       version = "0.1.1.0";
+       sha256 = "46d622fc738e8cc1513f598207ee5e6cda790c79e0697fe02d2da6ad02a6da74";
+       libraryHaskellDepends = [
+         base bytestring containers data-default text xml-conduit
+       ];
+       testHaskellDepends = [
+         base bytestring data-default doctest Glob tasty tasty-hunit text
+         xml-conduit
+       ];
+       homepage = "https://github.com/cdepillabout/xml-indexed-cursor";
+       description = "Indexed XML cursors similar to 'Text.XML.Cursor' from xml-conduit";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xml-isogen" = callPackage
     ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck
      , semigroups, template-haskell, text, xml-conduit-writer
@@ -187719,7 +190745,8 @@ self: {
 
   "xmlgen" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
-     , filepath, HUnit, hxt, mtl, process, QuickCheck, text, unix
+     , criterion, filepath, HUnit, hxt, mtl, process, QuickCheck, text
+     , unix
      }:
      mkDerivation {
        pname = "xmlgen";
@@ -187732,6 +190759,7 @@ self: {
          base bytestring containers filepath HUnit hxt process QuickCheck
          text unix
        ];
+       benchmarkHaskellDepends = [ base bytestring criterion text ];
        description = "Fast XML generation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188029,20 +191057,20 @@ self: {
      }) {};
 
   "xmonad-vanessa" = callPackage
-    ({ mkDerivation, base, containers, process, transformers, X11
-     , xmonad, xmonad-contrib, xmonad-extras
+    ({ mkDerivation, base, containers, hspec, process, transformers
+     , X11, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.0.3";
-       sha256 = "2ec997506b554282bbbddf02d9bb72326637ce5c6cd5634604b93a7e6e2b9ffa";
+       version = "0.1.0.6";
+       sha256 = "7abfe1bdaf7a9bbecdfa89b36b7144fe590d5b6344cc4838fb287e8f5ded52c4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers process transformers X11 xmonad xmonad-contrib
-         xmonad-extras
        ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec xmonad ];
        homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
        description = "Custom xmonad, which uses stack and sets various defaults";
        license = stdenv.lib.licenses.bsd3;
@@ -188353,8 +191381,8 @@ self: {
      }) {};
 
   "xxhash" = callPackage
-    ({ mkDerivation, base, bytestring, crypto-api, hspec, QuickCheck
-     , tagged
+    ({ mkDerivation, base, bytestring, criterion, crypto-api, deepseq
+     , digest, hashable, hspec, murmur-hash, QuickCheck, tagged
      }:
      mkDerivation {
        pname = "xxhash";
@@ -188362,6 +191390,9 @@ self: {
        sha256 = "4f5cc71564d71b7ab1e9f70ce9b8d32a3d73cb0b1e08ff96bc54298b21eb2f27";
        libraryHaskellDepends = [ base bytestring crypto-api tagged ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq digest hashable murmur-hash
+       ];
        description = "A Haskell implementation of the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188550,37 +191581,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, enclosed-exceptions
-     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
-     , semigroups, template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.21.2";
-       sha256 = "441cf712cd20ac6b0ded900562ca33770c8752702963ab267bff72b0657fef29";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         enclosed-exceptions filepath resourcet scientific semigroups
-         template-haskell text transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       executableHaskellDepends = [ aeson base bytestring ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring conduit directory hspec
-         HUnit mockery resourcet temporary text transformers
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_22" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, filepath, hspec
      , HUnit, libyaml, mockery, resourcet, scientific, semigroups
@@ -188609,7 +191609,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
@@ -188781,6 +191780,8 @@ self: {
        sha256 = "167c8dc3992d98d879eb281b27a0dbf6fde21ca69992e384df4b5babcdda3e3c";
        revision = "1";
        editedCabalFile = "98e99a555170a8b7281116b4e9c829c011b2401f21589f55ae80333ff2d6f34a";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base blank-canvas stm time Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
@@ -188814,6 +191815,8 @@ self: {
        pname = "yampa-glut";
        version = "0.1.1.1";
        sha256 = "f7c2b8aec210261341310f0c63f2eed3f80952077ad907ebff4427902ce4c304";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base GLUT newtype OpenGL vector-space Yampa-core
        ];
@@ -188984,9 +191987,9 @@ self: {
      }) {};
 
   "yeller" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, network, stm, text
-     , unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, hspec, http-client, http-client-tls, http-types, network
+     , stm, text, unordered-containers
      }:
      mkDerivation {
        pname = "yeller";
@@ -189000,6 +192003,10 @@ self: {
          aeson base bytestring containers hspec http-client http-client-tls
          http-types network stm text unordered-containers
        ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring containers criterion deepseq http-client
+         http-client-tls http-types network stm text unordered-containers
+       ];
        homepage = "http://yellerapp.com";
        description = "A Yeller Client For Haskell";
        license = stdenv.lib.licenses.mit;
@@ -189073,6 +192080,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod_1_4_5" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , conduit, conduit-extra, data-default-class, directory
+     , fast-logger, monad-control, monad-logger, resourcet, semigroups
+     , shakespeare, streaming-commons, template-haskell, text
+     , transformers, unix, unordered-containers, wai, wai-extra
+     , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod";
+       version = "1.4.5";
+       sha256 = "267c8780b27cc0ae8199f80b3063683fb2cd62eeb9696c4b155a298fb035e6e9";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring conduit conduit-extra
+         data-default-class directory fast-logger monad-control monad-logger
+         resourcet semigroups shakespeare streaming-commons template-haskell
+         text transformers unix unordered-containers wai wai-extra
+         wai-logger warp yaml yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-angular" = callPackage
     ({ mkDerivation, aeson, base, containers, shakespeare
      , template-haskell, text, transformers, yesod
@@ -189137,6 +192169,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-auth_1_4_17" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, mime-mail
+     , network-uri, nonce, persistent, persistent-template, random
+     , resourcet, safe, shakespeare, template-haskell, text, time
+     , transformers, unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.17";
+       sha256 = "444a9b4b913e5f7addb1b9c5aa778f32d2b9e040d9b1c4d8a232fae908392891";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptohash data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth-account" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger
      , mtl, nonce, persistent, persistent-sqlite, pwstore-fast
@@ -189384,8 +192446,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-oauth";
-       version = "1.4.1.1";
-       sha256 = "2dd9eda01b3b7625711b0a1dafce82915e82154976cd94c6076c8fa929d80773";
+       version = "1.4.2";
+       sha256 = "c115b0cd142423642e83775d81feee450e7bea2785ea882cd197bf3926ca7927";
        libraryHaskellDepends = [
          authenticate-oauth base bytestring lifted-base text transformers
          yesod-auth yesod-core yesod-form
@@ -189405,6 +192467,8 @@ self: {
        pname = "yesod-auth-oauth2";
        version = "0.2.2";
        sha256 = "6276f3bef0c992084ce55cdefb64dbb63b9a27b3ccfed515318f043ea7b85c33";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson authenticate base bytestring hoauth2 http-client http-conduit
          http-types lifted-base network-uri random text transformers vector
@@ -189504,6 +192568,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-bin_1_5_2" = 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";
+       sha256 = "b37087eb7e167c2250dd23452e8f4858190db11570e540df44809c197219439a";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
      , shakespeare, text, transformers, yesod-core, yesod-elements
@@ -189527,8 +192626,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-colonnade";
-       version = "0.4";
-       sha256 = "3cdb1f10dee36cdf4adebc5799fb108e4112065659051aed025ef4359b3509d7";
+       version = "1.1.0";
+       sha256 = "163fbe1c8618c01d17900ba205e7df8bd9e0a7abc5475ae6436417afafbf0a34";
        libraryHaskellDepends = [
          base blaze-html blaze-markup colonnade text yesod-core
        ];
@@ -189605,9 +192704,9 @@ self: {
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , data-default, deepseq, deepseq-generics, directory, exceptions
-     , fast-logger, hspec, hspec-expectations, http-types, HUnit
-     , lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
      , network, old-locale, parsec, path-pieces, primitive, QuickCheck
      , random, resourcet, safe, semigroups, shakespeare
      , streaming-commons, template-haskell, text, time, transformers
@@ -189636,11 +192735,58 @@ self: {
          resourcet shakespeare streaming-commons template-haskell text
          transformers wai wai-extra
        ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_4_32" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , criterion, data-default, deepseq, deepseq-generics, directory
+     , exceptions, fast-logger, hspec, hspec-expectations, http-types
+     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
+     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
+     , random, resourcet, safe, semigroups, shakespeare
+     , streaming-commons, template-haskell, text, time, transformers
+     , transformers-base, unix-compat, unordered-containers, vector, wai
+     , wai-extra, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.32";
+       sha256 = "0a3389e0e5d188c0bfcb99bb39856adcde28a1ebf572c0aebf8afa0e34946869";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq
+         deepseq-generics directory exceptions fast-logger http-types
+         lifted-base monad-control monad-logger mtl mwc-random old-locale
+         parsec path-pieces primitive random resourcet safe semigroups
+         shakespeare template-haskell text time transformers
+         transformers-base unix-compat unordered-containers vector wai
+         wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -189796,6 +192942,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-eventsource_1_4_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
+     , wai-eventsource, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-eventsource";
+       version = "1.4.1";
+       sha256 = "4019782d074ed5c23719e8e96f604b63990d9fd49255e14b7f5b769e7f3d3e13";
+       libraryHaskellDepends = [
+         base blaze-builder conduit transformers wai wai-eventsource
+         wai-extra yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Server-sent events support for Yesod apps";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-examples" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, data-object
      , data-object-yaml, hamlet, persistent-sqlite, persistent-template
@@ -189880,6 +193044,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form_1_4_11" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.11";
+       sha256 = "45edd3ea97a09968426ab20ea4595389b61f5fc2c9e328cecbdeed4a78dcd8d6";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form
@@ -189991,6 +193180,8 @@ self: {
        pname = "yesod-job-queue";
        version = "0.3.0.1";
        sha256 = "a58805e218e5b0e6c623a5447f06484004d72a357f4b2e30d476da56618b734f";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson api-field-json-th base bytestring cron file-embed hedis lens
          monad-control monad-logger stm text time transformers uuid yesod
@@ -190048,6 +193239,8 @@ self: {
        pname = "yesod-mangopay";
        version = "1.12";
        sha256 = "a53c0d1e8e1654a4c251b1830264f581a1ed668fffb303c05993e10e20932754";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers http-conduit http-types lifted-base mangopay
          persistent-template text time yesod yesod-core
@@ -190149,8 +193342,10 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-paginator";
-       version = "0.10.1";
-       sha256 = "06dd2e4ffb031176e3e9538f5ed5051e4e188ad803b8071bbc69a95e59d576c3";
+       version = "0.11.0";
+       sha256 = "60afa9b2a11f8c61a5ca090d3e0b0effe35162f67038e9c833a6e100b28aeb96";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base persistent resourcet text transformers yesod
        ];
@@ -190198,6 +193393,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-persistent_1_4_2" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+     , persistent-sqlite, persistent-template, resource-pool, resourcet
+     , text, transformers, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-persistent";
+       version = "1.4.2";
+       sha256 = "d938894209e27a7f2a6e41906a9db02cf5c66df2236a864361571ba4e63b1056";
+       libraryHaskellDepends = [
+         base blaze-builder conduit persistent persistent-template
+         resource-pool resourcet transformers yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-builder conduit hspec persistent persistent-sqlite text
+         wai-extra yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Some helpers for using Persistent from Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-platform" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding
      , asn1-parse, asn1-types, attoparsec-conduit, authenticate
@@ -190613,6 +193831,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-static_1_5_2" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, cryptohash-conduit, css-text
+     , data-default, directory, exceptions, file-embed, filepath
+     , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time
+     , process, resourcet, template-haskell, text, transformers
+     , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
+     , yesod-core, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-static";
+       version = "1.5.2";
+       sha256 = "b949c5f6087d9e32c7ff2f41ed647b1df605bbe1ce2cbcfe59cc46dc4a72099e";
+       libraryHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder byteable
+         bytestring conduit conduit-extra containers cryptohash
+         cryptohash-conduit css-text data-default directory exceptions
+         file-embed filepath hashable hjsmin http-types mime-types old-time
+         process resourcet template-haskell text transformers unix-compat
+         unordered-containers wai wai-app-static yesod-core
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring byteable bytestring conduit
+         conduit-extra containers cryptohash cryptohash-conduit data-default
+         directory exceptions file-embed filepath hjsmin hspec http-types
+         HUnit mime-types old-time process resourcet template-haskell text
+         transformers unix-compat unordered-containers wai wai-app-static
+         wai-extra yesod-core yesod-test
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Static file serving subsite for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-static-angular" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-markup
      , bytestring, data-default, directory, filepath, hamlet, hspec
@@ -190623,6 +193877,8 @@ self: {
        pname = "yesod-static-angular";
        version = "0.1.8";
        sha256 = "97b3ef260a7e6c70b811cbf3b2b3532a003c5028bd6a0df52fc14bd45ce03beb";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-markup bytestring data-default
          directory filepath hamlet language-javascript mime-types
@@ -190692,6 +193948,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_5_5" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, pretty-show, text, time
+     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
+     , yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.5";
+       sha256 = "44425bf59542649ff0b1ba4c976d8c35060c17c082e8b9f75a81ff89e16f0a39";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent pretty-show text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -190809,6 +194093,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-websockets_0_2_6" = callPackage
+    ({ mkDerivation, async, base, conduit, enclosed-exceptions
+     , monad-control, transformers, wai, wai-websockets, websockets
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-websockets";
+       version = "0.2.6";
+       sha256 = "98111901a0f33f4c43459a20310dbf20a3fda142c5d42c30cfe9c53eeabeee29";
+       libraryHaskellDepends = [
+         async base conduit enclosed-exceptions monad-control transformers
+         wai wai-websockets websockets yesod-core
+       ];
+       homepage = "https://github.com/yesodweb/yesod";
+       description = "WebSockets support for Yesod";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-websockets-extra" = callPackage
     ({ mkDerivation, base, enclosed-exceptions, transformers
      , websockets, yesod-websockets
@@ -191238,7 +194541,7 @@ self: {
 
   "yi-rope" = callPackage
     ({ mkDerivation, base, binary, bytestring, charsetdetect-ae
-     , data-default, deepseq, fingertree, hspec, QuickCheck
+     , criterion, data-default, deepseq, fingertree, hspec, QuickCheck
      , quickcheck-instances, text, text-icu
      }:
      mkDerivation {
@@ -191252,6 +194555,7 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances text
        ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -191626,6 +194930,8 @@ self: {
        pname = "z3";
        version = "4.1.0";
        sha256 = "096f9f4b92f5c9591d3098022b0b4047d1d6c4b970dc7d3ead6129d67fe4f5ee";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
        librarySystemDepends = [ gomp z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
@@ -191960,8 +195266,8 @@ self: {
      }:
      mkDerivation {
        pname = "zip";
-       version = "0.1.7";
-       sha256 = "8b7e4f597e926db852397bb2cbad04d05c718a222702076fbbdfcccb62679c9e";
+       version = "0.1.8";
+       sha256 = "3b6addaaf314df1587baf8b5e0423cbfa9fc256a09a20c70e1a746a8067370d1";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest exceptions filepath mtl path
@@ -191987,6 +195293,8 @@ self: {
        sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7";
        revision = "1";
        editedCabalFile = "f9284c6bdf1e6c9f85091c602faae19dfad856ac6628531d999a611994f3da86";
+       isLibrary = true;
+       isExecutable = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          array base binary bytestring containers digest directory filepath
@@ -192004,9 +195312,10 @@ self: {
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
-     , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet
-     , temporary, test-framework, test-framework-hunit, time
-     , transformers, utf8-string
+     , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl
+     , old-time, random, resourcet, temporary, test-framework
+     , test-framework-hunit, time, transformers, utf8-string
+     , zip-archive
      }:
      mkDerivation {
        pname = "zip-conduit";
@@ -192022,6 +195331,10 @@ self: {
          base bytestring conduit directory filepath hpc HUnit mtl resourcet
          temporary test-framework test-framework-hunit time
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion directory filepath LibZip random
+         temporary zip-archive
+       ];
        homepage = "https://github.com/tymmym/zip-conduit";
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -192072,8 +195385,8 @@ self: {
      }) {};
 
   "zippers" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, lens
-     , profunctors, semigroupoids
+    ({ mkDerivation, base, criterion, directory, doctest, filepath
+     , lens, profunctors, semigroupoids
      }:
      mkDerivation {
        pname = "zippers";
@@ -192081,6 +195394,7 @@ self: {
        sha256 = "d9c499cec6f60e0556b9874d2bf3b801b0a022b226a396200d11b91d3a1aede7";
        libraryHaskellDepends = [ base lens profunctors semigroupoids ];
        testHaskellDepends = [ base directory doctest filepath ];
+       benchmarkHaskellDepends = [ base criterion lens ];
        homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;
@@ -192164,6 +195478,8 @@ self: {
        pname = "zlib-enum";
        version = "0.2.3.1";
        sha256 = "e43dc9ea85ceea02c4f4204c95e8d8540205839c58079f9399dfa96e63fdccd9";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base bytestring enumerator transformers zlib-bindings
        ];
@@ -192393,8 +195709,8 @@ self: {
      }) {};
 
   "zstd" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, QuickCheck
-     , test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim
+     , QuickCheck, test-framework, test-framework-quickcheck2, zlib
      }:
      mkDerivation {
        pname = "zstd";
@@ -192405,6 +195721,9 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim zlib
+       ];
        homepage = "https://github.com/facebookexperimental/hs-zstd";
        description = "Haskell bindings to the Zstandard compression algorithm";
        license = stdenv.lib.licenses.bsd3;

From 2e5a4b1a3801bbea8980b71d8d77dc412be81f83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 27 Feb 2017 16:02:39 +0100
Subject: [PATCH 1514/3449] haskell-lambdabot: fix evaluation

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cd88262c919a..53ffd68a9972 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -712,9 +712,7 @@ self: super: {
     ];
 
     jailbreak = true;
-  })).override {
-    haskell-src-exts = self.haskell-src-exts-simple;
-  };
+  }));
 
   # Needs new version.
   haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };

From 9e72734826389c20b473c99d7b2375a01323838c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 28 Feb 2017 14:53:33 +0100
Subject: [PATCH 1515/3449] haskell-yaml: build with bundled libyaml rather
 than our system version

It looks like the yaml package bundles an unreleased version of libyaml and
relies on particulars of that versions behavior. Therefore, the package no
longer works with the official libyaml 0.1.7 release, which is what we have.

https://github.com/snoyberg/yaml/issues/106
---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 53ffd68a9972..7fbdd3d3c498 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -880,4 +880,8 @@ self: super: {
   rank1dynamic = doJailbreak super.rank1dynamic;
 
   cabal-lenses = doJailbreak super.cabal-lenses;
+
+  # https://github.com/snoyberg/yaml/issues/106
+  yaml = disableCabalFlag super.yaml "system-libyaml";
+
 }

From 1f709ad136ff18b209638372a0b48345cf1f4fa6 Mon Sep 17 00:00:00 2001
From: Itai Zukerman <zukerman@math-hat.com>
Date: Thu, 2 Mar 2017 00:07:56 -0800
Subject: [PATCH 1516/3449] bazel: add gcc to PATH and simplify patch

Removed patches that are purely for testing.
Removed dependencies that seemed to not be needed.
Expand all instances of #!/bin/bash, not just those at the start of scripts.
---
 .../tools/build-managers/bazel/default.nix    | 31 +++++++------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index a8ad08feec11..16e31eaf5a8a 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, jdk, zip, unzip, which, bash, binutils, coreutils, makeWrapper }:
+{ stdenv, fetchurl, jdk, zip, unzip, bash, makeWrapper }:
 
 stdenv.mkDerivation rec {
 
@@ -22,24 +22,16 @@ stdenv.mkDerivation rec {
   sourceRoot = ".";
 
   postPatch = ''
-    patchShebangs .
+    for f in $(grep -l -r '#!/bin/bash'); do
+      substituteInPlace "$f" --replace '#!/bin/bash' '#!${bash}/bin/bash'
+    done
     for f in \
       src/main/java/com/google/devtools/build/lib/analysis/CommandHelper.java \
       src/main/java/com/google/devtools/build/lib/bazel/rules/BazelConfiguration.java \
-      src/test/java/com/google/devtools/build/lib/shell/CommandTest.java \
-      src/test/java/com/google/devtools/build/lib/shell/InterruptibleTest.java \
-      src/test/java/com/google/devtools/build/lib/shell/LoadTest.java \
-      src/test/java/com/google/devtools/build/lib/skylark/SkylarkRuleImplementationFunctionsTest.java \
-      src/test/java/com/google/devtools/build/lib/standalone/StandaloneSpawnStrategyTest.java
-    do
-      substituteInPlace $f \
-        --replace /bin/bash ${bash}/bin/bash \
-        --replace /bin/cat ${coreutils}/bin/cat \
-        --replace /bin/echo ${coreutils}/bin/echo \
-        --replace /bin/false ${coreutils}/bin/false \
-        --replace /bin/pwd ${coreutils}/bin/pwd \
-        --replace /bin/sleep ${coreutils}/bin/sleep \
-        --replace /bin/true ${coreutils}/bin/true
+      src/main/java/com/google/devtools/build/lib/bazel/rules/sh/BazelShRuleClasses.java \
+      src/main/java/com/google/devtools/build/lib/rules/cpp/LinkCommandLine.java \
+      ; do
+      substituteInPlace "$f" --replace /bin/bash ${bash}/bin/bash
     done
   '';
 
@@ -49,8 +41,6 @@ stdenv.mkDerivation rec {
     jdk
     zip
     unzip
-    which
-    binutils
     makeWrapper
   ];
 
@@ -59,7 +49,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [
     bash
-    coreutils
   ];
 
   # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink
@@ -81,10 +70,12 @@ stdenv.mkDerivation rec {
         examples/java-native/src/test/java/com/example/myproject:hello
   '';
 
+  # Bazel expects gcc and java to be in the path.
+
   installPhase = ''
     mkdir -p $out/bin
     mv output/bazel $out/bin
-    wrapProgram "$out/bin/bazel" --prefix PATH : "${jdk}/bin"
+    wrapProgram "$out/bin/bazel" --prefix PATH : "${stdenv.cc}/bin:${jdk}/bin"
   '';
 
   dontStrip = true;

From ff9891767f11d1f52b8e970bd145fb4959f2ac42 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 2 Mar 2017 10:07:59 +0100
Subject: [PATCH 1517/3449] libgpg-error: 1.26 -> 1.27

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

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

From ade2357c653cbe336d8a7dc17a8dc02099ced432 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 2 Mar 2017 10:10:02 +0100
Subject: [PATCH 1518/3449] gnupg21: 2.1.18 -> 2.1.19

See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00000.html
for release information
---
 pkgs/tools/security/gnupg/21.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index f7968e47b1ce..0f021c6b4a12 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.18";
+  version = "2.1.19";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h";
+    sha256 = "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26";
   };
 
   buildInputs = [
@@ -31,17 +31,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./fix-libusb-include-path.patch
-    # TODO: Remove the following two patches on the next gnupg release after 2.1.18
-    (fetchpatch {
-      name = "scd-Backport-two-fixes-from-master";
-      url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0028-scd-Backport-two-fixes-from-master.patch?h=debian/2.1.18-6";
-      sha256 = "01l2s4s7kp6j2f3qd371arq7pfphvncc9k1m63rqm0kyzy9jk20k";
-    })
-    (fetchpatch {
-      name = "scd-Fix-use-case-of-PC-SC";
-      url = "https://anonscm.debian.org/git/pkg-gnupg/gnupg2.git/plain/debian/patches/0029-scd-Fix-use-case-of-PC-SC.patch?h=debian/2.1.18-6";
-      sha256 = "0lxqj614fialbqs2x0z13q5ikq2rc9xwphmkly179qs03d4mawsz";
-    })
   ];
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c

From 3806d47b490d207cdc1b2dfa9d22a9782bd3ef44 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 03:21:08 -0600
Subject: [PATCH 1519/3449] uptimed: 0.3.18 -> 0.4.0 (#23316)

* uptimed: 0.3.18 -> 0.4.0

* uptimed: autoreconfHook belongs to nativeBuildInputs
---
 pkgs/tools/system/uptimed/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix
index 6e0c2da5c181..58e194d38b94 100644
--- a/pkgs/tools/system/uptimed/default.nix
+++ b/pkgs/tools/system/uptimed/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
-let version = "0.3.18"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "uptimed-${version}";
-  
+  version = "0.4.0";
+
   src = fetchFromGitHub {
-    sha256 = "108h8ck8cyzvf3xv23vzyj0j8dffdmwavj6nbn9ryqhqhqmk4fhb";
+    sha256 = "0h3192angfiv01bjk3f3nd2fmjic37cl72pvmr556n0wy3cfybas";
     rev = "v${version}";
     repo = "uptimed";
     owner = "rpodgorny";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+  patches = [ ./no-var-spool-install.patch ];
+
   meta = with stdenv.lib; {
     description = "Uptime record daemon";
     longDescription = ''
@@ -24,7 +27,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
   };
 
-  patches = [ ./no-var-spool-install.patch ];
-
-  buildInputs = [ autoreconfHook ];
 }

From 9addeafe1a70a138ef6bb6b7f300634285b1b47e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 04:02:08 -0600
Subject: [PATCH 1520/3449] par2cmdline: 0.6.11 -> 0.6.13 (#23361)

* par2cmdline: 0.6.11 -> 0.6.13

* par2cmdline: add autoreconfHook to nativeBuildInputs
---
 pkgs/tools/networking/par2cmdline/default.nix | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index 94b9f3bdc7c2..e29c72fd0b95 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchzip, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name    = "par2cmdline-${version}";
-  version = "0.6.11";
+  version = "0.6.13";
 
-  src = fetchzip {
-    url = "https://github.com/BlackIkeEagle/par2cmdline/archive/v${version}.tar.gz";
-    sha256 = "0maywssv468ia7rf8jyq4axwahgli3nfykl7x3zip503psywjj8a";
+  src = fetchFromGitHub {
+    owner = "Parchive";
+    repo = "par2cmdline";
+    rev = "v${version}";
+    sha256 = "0jxixkc8vid933nph2mvhgz58my42kwjlzbir38hml2xrzq00d8f";
   };
 
-  buildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/BlackIkeEagle/par2cmdline;
     description = "PAR 2.0 compatible file verification and repair tool";
     longDescription = ''
@@ -19,8 +21,8 @@ stdenv.mkDerivation rec {
       damage in data files and repair them if necessary. It can be used with
       any kind of file.
     '';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.muflax ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.muflax ];
+    platforms = platforms.all;
   };
 }

From ec98c1d8f41a29fb4763ab629032ece46fc573dc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Mar 2017 11:03:25 +0100
Subject: [PATCH 1521/3449] haskellPackages.cabal-lenses: add comment to
 upstream issue

---
 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 7fbdd3d3c498..0c62c187ac02 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -879,6 +879,7 @@ self: super: {
   # https://github.com/haskell-distributed/rank1dynamic/issues/17
   rank1dynamic = doJailbreak super.rank1dynamic;
 
+  # https://github.com/dan-t/cabal-lenses/issues/6
   cabal-lenses = doJailbreak super.cabal-lenses;
 
   # https://github.com/snoyberg/yaml/issues/106

From 5a68d5484e9a3c654ac768093ca29026302a7c23 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreash87@gmx.ch>
Date: Wed, 1 Mar 2017 21:36:18 +0100
Subject: [PATCH 1522/3449] blitz: switch back to boost-1.60

The build fails with boost-1.62.
More specifically, the test of the boost-serialization integration fails
due to the protected destructor in the class template `MemoryBlock`.
---
 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 170fa60c27b2..9c72a200d62d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -636,7 +636,9 @@ with pkgs;
 
   blink1-tool = callPackage ../tools/misc/blink1-tool { };
 
-  blitz = callPackage ../development/libraries/blitz { };
+  blitz = callPackage ../development/libraries/blitz {
+    boost = boost160;
+  };
 
   blockdiag = pythonPackages.blockdiag;
 

From d2aa1706bd627989713e9330a3fdd8c872444341 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 2 Mar 2017 02:19:24 -0800
Subject: [PATCH 1523/3449] ffmpeg-full: 3.2.2 -> 3.2.4

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

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 090881107ce1..47fcd76240b2 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "3.2.2";
+  version = "3.2.4";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "1z7d5y5crhsl5fm74236rdwbkd4jj5frx1l4iizjfym1w4gvs09z";
+    sha256 = "0ymg1mkg1n0770gmjfqp79p5ijxq04smfrsrrxc8pjc0y0agyf3f";
   };
 
   patchPhase = ''patchShebangs .

From 0b7861dc7fc02f93a63f68bdd9104c41b272c00b Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Thu, 2 Mar 2017 02:18:57 -0800
Subject: [PATCH 1524/3449] obs-studio: 17.0.1 -> 18.0.0

---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 8051d5ee3764..61630c9a15c7 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -22,13 +22,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "17.0.1";
+  version = "18.0.0";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "0x5lnl1xkmm8x4g0f8rma8ir1bcldz9sssj2fzkv80hn79h2cvxm";
+    sha256 = "0qjv1l69ca8l8jihpkz7yln7gr7168k8c7yxgd8y23dp1db9hdrm";
   };
 
   nativeBuildInputs = [ cmake

From c5367a4409891ae5ea9aa564175a115bc6a83976 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Mar 2017 11:45:36 +0100
Subject: [PATCH 1525/3449] maintainers/hydra-eval-failures: flush stdout more
 often

---
 maintainers/scripts/hydra-eval-failures.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index 1b5df32c452f..b339f296056c 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -5,6 +5,7 @@
 
 import subprocess
 import json
+import sys
 
 import click
 import requests
@@ -75,12 +76,16 @@ def cli(jobset):
         a = pq(tr)('a')[1]
         print "- [ ] [{}]({})".format(a.text, a.get('href'))
 
+        sys.stdout.flush()
+
         maintainers = get_maintainers(a.text)
         if maintainers:
             print "  - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))
         # TODO: print last three persons that touched this file
         # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked?
 
+        sys.stdout.flush()
+
 
 if __name__ == "__main__":
     try:

From c44a41c73f15e7bf834a424d84ce23382c2e7bc4 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Mar 2017 03:09:27 +0100
Subject: [PATCH 1526/3449] tor: split out geoip data

Saves about 5.2 MiB.

To use geoip, add something like
```
GeoIPFile ${tor.geoip}/share/tor/geoip
GeoIPv6File ${tor.geoip}/share/tor/geoip6
```
to torrc
---
 pkgs/tools/security/tor/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 25f80a16feaf..8128b58155c2 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0h8kpn42mgpkzmnga143hi8nh0ai65ypxh7qhkwbb15j3wz2h4fn";
   };
 
+  outputs = [ "out" "geoip" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libevent openssl zlib ] ++
     stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
@@ -22,6 +24,12 @@ stdenv.mkDerivation rec {
       --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
   '';
 
+  postInstall = ''
+    mkdir -p $geoip/share/tor
+    mv $out/share/tor/geoip{,6} $geoip/share/tor
+    rm -rf $out/share/tor
+  '';
+
   doCheck = true;
 
   meta = with stdenv.lib; {

From bfe15ec83f769bc9b0511033a753425b05ca0bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 2 Mar 2017 12:56:05 +0100
Subject: [PATCH 1527/3449] electron: 1.4.13 -> 1.4.15

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

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 1bd7ac76bb19..3d5c23678dbd 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.13";
+  version = "1.4.15";
   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 = "1fd8axaln31c550dh7dnfwigrp44ahp142cklpdc57mz34xjawp3";
+      sha256 = "07b9jdbjrf3siv205wd1dphq6ly0hkaapzvj87d2yjfiyzv3cbsl";
       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 = "0aa4wrba1y7pab5g6bzxagj5dfl9bqrbpj3bbi5v5gsd0h34k0yx";
+      sha256 = "0p8gkyq4qczzia26wrnbs91vdqzxhgq515cmsrwvhw87mc9fka4k";
       name = "${name}.zip";
     };
 

From eebb5f20a3530cef84eb27ed84501efa1b6d0c99 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Mar 2017 11:51:22 +0100
Subject: [PATCH 1528/3449] cuter: fix indentation

---
 .../tools/erlang/cuter/default.nix            | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index 4d4dac0c8348..35b7774ab93f 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -2,43 +2,43 @@
   beamPackages, z3, python27 }:
 
 stdenv.mkDerivation rec {
-    name = "cuter";
-    version = "0.1";
+  name = "cuter";
+  version = "0.1";
 
-    src = fetchFromGitHub {
-        owner = "aggelgian";
-        repo = "cuter";
-        rev = "v${version}";
-        sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv";
-    };
+  src = fetchFromGitHub {
+    owner = "aggelgian";
+    repo = "cuter";
+    rev = "v${version}";
+    sha256 = "1ax1pj6ji4w2mg3p0nh2lzmg3n9mgfxk4cf07pll51yrcfpfrnfv";
+  };
 
-    setupHook = writeText "setupHook.sh" ''
+  setupHook = writeText "setupHook.sh" ''
     addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
-    '';
-    buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ];
+  '';
+  buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ];
 
-    buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
-    configurePhase = ''
-      autoconf
-      ./configure --prefix $out
-    '';
+  buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
+  configurePhase = ''
+    autoconf
+    ./configure --prefix $out
+  '';
 
-    installPhase = ''
-      mkdir -p "$out/lib/erlang/lib/cuter-${version}"
-      mkdir -p "$out/bin"
-      cp -r * "$out/lib/erlang/lib/cuter-${version}"
-      cp cuter "$out/bin/cuter"
-      wrapProgram $out/bin/cuter \
-       --prefix PATH : "${python27}/bin" \
-       --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \
-       --suffix ERL_LIBS : "$out/lib/erlang/lib"
-    '';
+  installPhase = ''
+    mkdir -p "$out/lib/erlang/lib/cuter-${version}"
+    mkdir -p "$out/bin"
+    cp -r * "$out/lib/erlang/lib/cuter-${version}"
+    cp cuter "$out/bin/cuter"
+    wrapProgram $out/bin/cuter \
+      --prefix PATH : "${python27}/bin" \
+      --suffix PYTHONPATH : "${z3}/lib/python2.7/site-packages" \
+      --suffix ERL_LIBS : "$out/lib/erlang/lib"
+  '';
 
-    meta = {
-      description = "A concolic testing tool for the Erlang functional programming language";
-      license = stdenv.lib.licenses.gpl3;
-      homepage = "https://github.com/aggelgian/cuter";
-      maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
-      platforms = with stdenv.lib.platforms; unix;
-    };
+  meta = {
+    description = "A concolic testing tool for the Erlang functional programming language";
+    license = stdenv.lib.licenses.gpl3;
+    homepage = "https://github.com/aggelgian/cuter";
+    maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
+    platforms = with stdenv.lib.platforms; unix;
+  };
 }

From feffa1aabf895f78bdaafe92990ebf4be34edc20 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Mar 2017 13:00:25 +0100
Subject: [PATCH 1529/3449] cuter: fix build

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

diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index 35b7774ab93f..b9682bead7d1 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -1,5 +1,5 @@
-{stdenv, autoconf, which, writeText, makeWrapper, fetchFromGitHub, erlang,
-  beamPackages, z3, python27 }:
+{ stdenv, autoreconfHook, which, writeText, makeWrapper, fetchFromGitHub, erlang
+, beamPackages, z3, python27 }:
 
 stdenv.mkDerivation rec {
   name = "cuter";
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
   setupHook = writeText "setupHook.sh" ''
     addToSearchPath ERL_LIBS "$1/lib/erlang/lib/"
   '';
-  buildInputs = with beamPackages; [ autoconf erlang z3 python27 makeWrapper which ];
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = with beamPackages; [ python27.pkgs.setuptools erlang z3 python27 makeWrapper which ];
 
   buildFlags = "PWD=$(out)/lib/erlang/lib/cuter-${version} cuter_target";
   configurePhase = ''

From b588ed95b9a2705a8500d1c5d21d33ab3a5e7971 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 2 Mar 2017 13:16:37 +0100
Subject: [PATCH 1530/3449] Python 3.4: fixup expat and libffi, fixes #23325

---
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 143dbcd5686e..58e4f21bb4a1 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -34,7 +34,7 @@ let
   sitePackages = "lib/${libPrefix}/site-packages";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
+    zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
     ++ optionals x11Support [ tcl tk libX11 xproto ]
     ++ optionals stdenv.isDarwin [ CF configd ];
 

From 306eb6ded018040470be2a462b0adbd7412349a2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Mar 2017 13:20:25 +0100
Subject: [PATCH 1531/3449] d4x: remove

removed in debian in 2010
---
 pkgs/applications/misc/d4x/default.nix | 20 --------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/applications/misc/d4x/default.nix

diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix
deleted file mode 100644
index b6d6e53b0019..000000000000
--- a/pkgs/applications/misc/d4x/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }:
-
-stdenv.mkDerivation {
-  name = "d4x-2.5.7.1";
-
-  inherit boost;
-
-  src = fetchurl {
-    url = http://pkgs.fedoraproject.org/repo/pkgs/d4x/d4x-2.5.7.1.tar.bz2/68d6336c3749a7caabb0f5a5f84f4102/d4x-2.5.7.1.tar.bz2;
-    sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m";
-  };
-
-  buildInputs = [ gtk2 glib pkgconfig openssl boost ];
-
-  meta = {
-    description = "Graphical download manager";
-    homepage = http://www.krasu.ru/soft/chuchelo/;
-    license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c72a200d62d..f5230fd82907 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12990,8 +12990,6 @@ with pkgs;
 
   cyclone = callPackage ../applications/audio/pd-plugins/cyclone  { };
 
-  d4x = callPackage ../applications/misc/d4x { };
-
   darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: {
     configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
     enableSharedExecutables = false;

From 095cf1b903a9a3c52c2fdf67afc76d97a0c6af7b Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Wed, 1 Mar 2017 11:06:05 -0800
Subject: [PATCH 1532/3449] Revert "buildRustPackage: fix deprecated use of
 registry.index config key"

This reverts commit e8aa8cc94be45103fcd32b5f0bfee4a55eae4080.
---
 pkgs/build-support/rust/fetch-cargo-deps | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 89b78547b38d..54593994990f 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -11,11 +11,8 @@ fetchCargoDeps() {
     echo "Using rust registry from $rustRegistry"
 
     cat <<EOF > $out/config
-[source.nix-store-rust-registry]
-registry = "file://$rustRegistry"
-
-[source.crates-io]
-replace-with = "nix-store-rust-registry"
+[registry]
+index = "file://$rustRegistry"
 EOF
 
     export CARGO_HOME=$out

From 3deb85bc63ecd39909d08c7e71df128af0fa4094 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Wed, 1 Mar 2017 15:16:23 +0100
Subject: [PATCH 1533/3449] locate: fix security.wrappers

---
 nixos/modules/misc/locate.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 089f354f6119..6d9bc915ba03 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -104,13 +104,13 @@ in {
     users.extraGroups = mkIf isMLocate { mlocate = {}; };
 
     security.wrappers = mkIf isMLocate {
-      mlocate = {
+      locate = {
         group = "mlocate";
         owner = "root";
         permissions = "u+rx,g+x,o+x";
         setgid = true;
         setuid = false;
-        program = "locate";
+        source = "${cfg.locate}/bin/locate";
       };
     };
 

From 869bc1c07e66cb1da432ccde8dd65816f5a7d617 Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Thu, 2 Mar 2017 13:44:47 +0100
Subject: [PATCH 1534/3449] atom: 1.14.3 -> 1.14.4

---
 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 27ba155ad74d..47a8eff3da8e 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.14.3";
+  version = "1.14.4";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "16zc1bbvxs9fpd9y3mzgbl789djp3p1664a8b2nn9ann1mbkdgsk";
+    sha256 = "0b1dbhpphbsjkizii6l5cxr2pqk6bjix0amc2avk3p7ys710zazv";
     name = "${name}.deb";
   };
 

From 80e883a7c31b78124c48fa3f60111f1b60c64671 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 11:26:01 -0600
Subject: [PATCH 1535/3449] iso_graphical: fix warning about Plasma 5 desktop
 module name

---
 .../installer/cd-dvd/installation-cd-graphical-kde.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
index b15aef885369..63227d573495 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
@@ -18,7 +18,7 @@ with lib;
       autoLogin = true;
     };
 
-    desktopManager.kde5 = {
+    desktopManager.plasma5 = {
       enable = true;
       enableQt4Support = false;
     };
@@ -66,7 +66,7 @@ with lib;
   in ''
     mkdir -p /root/Desktop
     ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
-    ln -sfT ${pkgs.kdeApplications.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
+    ln -sfT ${pkgs.konsole}/share/applications/org.kde.konsole.desktop /root/Desktop/org.kde.konsole.desktop
     ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
   '';
 

From 0da421ce17a0226e4880c596702adcc58cb19d6c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 19:09:56 -0600
Subject: [PATCH 1536/3449] nixos/tests: fix Plasma 5 test

---
 nixos/release-combined.nix            | 2 +-
 nixos/release.nix                     | 2 +-
 nixos/tests/{kde5.nix => plasma5.nix} | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename nixos/tests/{kde5.nix => plasma5.nix} (92%)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 6c048e8a0aca..341724b58475 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.kde5)
+        (all nixos.tests.plasma5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)
diff --git a/nixos/release.nix b/nixos/release.nix
index 2bfe8eada0b8..face44b94e2a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -255,7 +255,7 @@ in rec {
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
-  tests.kde5 = callTest tests/kde5.nix {};
+  tests.plasma5 = callTest tests/plasma5.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
   tests.keystone = callTest tests/keystone.nix {};
diff --git a/nixos/tests/kde5.nix b/nixos/tests/plasma5.nix
similarity index 92%
rename from nixos/tests/kde5.nix
rename to nixos/tests/plasma5.nix
index 2b61d6f3f0a1..3dd5121607a0 100644
--- a/nixos/tests/kde5.nix
+++ b/nixos/tests/plasma5.nix
@@ -17,7 +17,8 @@ import ./make-test.nix ({ pkgs, ...} :
         user = "alice";
       };
     };
-    services.xserver.desktopManager.kde5.enable = true;
+    services.xserver.desktopManager.plasma5.enable = true;
+    services.xserver.desktopManager.default = "plasma5";
     virtualisation.writableStore = false; # FIXME
   };
 

From c1866cade9bce6fefa209095055248302ef6ad9d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Mar 2017 14:13:02 +0100
Subject: [PATCH 1537/3449] libsForQt5.qmltermwidget: fix build

---
 pkgs/applications/science/misc/gplates/default.nix   | 8 ++++++--
 pkgs/development/libraries/qmltermwidget/default.nix | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 9dd7b6b72db1..bc5b8060e235 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
+{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
+, proj, boost160, cmake, python2, doxygen, graphviz, gmp }:
 
 stdenv.mkDerivation rec {
   name = "gplates-${version}";
@@ -13,7 +14,10 @@ stdenv.mkDerivation rec {
     ./boostfix.patch
   ];
 
-  buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ];
+  buildInputs = [
+    qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost160 cmake python2
+    doxygen graphviz gmp
+  ];
 
   meta = with stdenv.lib; {
     description = "Desktop software for the interactive visualisation of plate-tectonics";
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index c4bb36209d94..bb058711b2ec 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook }:
+{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook, qtmultimedia }:
 
 stdenv.mkDerivation rec {
   version = "0.1.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3";
   };
 
-  buildInputs = [ qtbase qtquick1 ];
+  buildInputs = [ qtbase qtquick1 qtmultimedia ];
   nativeBuildInputs = [ qmakeHook ];
 
   patchPhase = ''

From b955f27ad9c355d42f9d45ed9e416422f425cddc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 1 Mar 2017 07:43:24 -0600
Subject: [PATCH 1538/3449] elpa-packages: 2017-03-01

---
 .../editors/emacs-modes/elpa-generated.nix    | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 53b7d04d2e9b..5e736392fd29 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -41,10 +41,10 @@
       }) {};
     ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "ada-ref-man";
-        version = "2012.0";
+        version = "2012.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ada-ref-man-2012.0.tar";
-          sha256 = "1g97892h8d1xa7cfxgg4i232i15hhci7gijj0dzc31yd9vbqayx8";
+          url = "https://elpa.gnu.org/packages/ada-ref-man-2012.3.tar";
+          sha256 = "0w88xw51jb85nmqbi3i9kj9kx2fa6zlazk3x7afll7njc6g4105z";
         };
         packageRequires = [];
         meta = {
@@ -306,6 +306,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "cl-print";
+        version = "1.0";
+        src = fetchurl {
+          url = "https://elpa.gnu.org/packages/cl-print-1.0.el";
+          sha256 = "0ib8j7rv5f4c4xg3kban58jm6cam756i3xz6j8100846g3jn9zcc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://elpa.gnu.org/packages/cl-print.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "cobol-mode";
         version = "1.0.0";
@@ -376,10 +389,10 @@
     company-statistics = callPackage ({ company, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "company-statistics";
-        version = "0.2.2";
+        version = "0.2.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/company-statistics-0.2.2.tar";
-          sha256 = "0h1k0dbb7ngk6pghli2csfpzpx37si0wg840jmay0jlb80q6vw73";
+          url = "https://elpa.gnu.org/packages/company-statistics-0.2.3.tar";
+          sha256 = "0780xp09f739jys469x4fqpgj1lysi8gnhiaz0735jib07lmh4ww";
         };
         packageRequires = [ company emacs ];
         meta = {
@@ -1995,10 +2008,10 @@
       }) {};
     wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "wconf";
-        version = "0.2.0";
+        version = "0.2.1";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/wconf-0.2.0.el";
-          sha256 = "07adnx2ni7kprxw9mx1nywzs1a2h43rszfa8r8i0s9j16grvgphk";
+          url = "https://elpa.gnu.org/packages/wconf-0.2.1.el";
+          sha256 = "13p1xycp3mcrg8jv65mcyqvln4h7awhjz35dzr5bi86zb824ryxf";
         };
         packageRequires = [ emacs ];
         meta = {

From 6034d429fc03b6c846d4251e933d9269c9c4215f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Mar 2017 14:23:41 +0100
Subject: [PATCH 1539/3449] btrfs-dedupe: dependency is broken on i686

---
 pkgs/tools/filesystems/btrfs-dedupe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/btrfs-dedupe/default.nix b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
index 2cd1e8162c62..a9e05686e405 100644
--- a/pkgs/tools/filesystems/btrfs-dedupe/default.nix
+++ b/pkgs/tools/filesystems/btrfs-dedupe/default.nix
@@ -20,7 +20,7 @@ buildRustPackage rec {
     homepage = "https://gitlab.wellbehavedsoftware.com/well-behaved-software/btrfs-dedupe";
     description = "BTRFS deduplication utility";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ ikervagyok ];
   };
 }

From 00f28d74c9f6a79bf51cc45187430a09e4fd3d54 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 1 Mar 2017 07:44:19 -0600
Subject: [PATCH 1540/3449] melpa-packages: 2017-03-01

---
 .../editors/emacs-modes/melpa-generated.nix   | 1669 +++++++++--------
 1 file changed, 935 insertions(+), 734 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 6f67650e7636..daaf1f618916 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -712,12 +712,12 @@
     ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-octave";
-        version = "20150111.1708";
+        version = "20170220.1728";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "ac-octave";
-          rev = "28dfce296dd2aa0ea46b51803109f3fdd1e5c379";
-          sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q";
+          rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c";
+          sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave";
@@ -1486,12 +1486,12 @@
     alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
     melpaBuild {
         pname = "alert";
-        version = "20170106.1020";
+        version = "20170223.1030";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "alert";
-          rev = "2c21ee4ebe3e0b60e5df5c8e54a7c2b10f110b85";
-          sha256 = "119canyh19ck8fzashnwj9yfk0rm9qsg1yibyfjccd9inp8h7k6z";
+          rev = "fa9e6917c48e5338f3ed81226e1e5e5ec21563fb";
+          sha256 = "0ri8lv3ln7n3msc8y6y9133dv8h0550xi142fn7w0s95hbskr61l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert";
@@ -1688,8 +1688,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "1799bdbe410dc7dd91b766dddaa6c73e2d077059";
-          sha256 = "1gn835ny57cgaijjhifiafannbbnrj6v3g4kc45id52grkd041qk";
+          rev = "65de04e9bda55b858d53d4d7982183fd82839b55";
+          sha256 = "1x3wl30rbza8y4693jmpjpq7mcdv8gjhcnr451lgvfjmzxfhbn3d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1829,12 +1829,12 @@
     annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "annotate";
-        version = "20161006.16";
+        version = "20170227.23";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "annotate.el";
-          rev = "e6af7f8ef7d241fdc9f866d57dce24beb4bb6b87";
-          sha256 = "19a419rnqqsmvrcl2vwy3gl7mvbfg669vyin2h2xpm56rxsinvy1";
+          rev = "f08923762fb851edb292ba4d3ebb07bea025f83d";
+          sha256 = "11v8claymx40ix5zwzrklzc6g71nmzxhdhdzwfdh2b57fwmfvv95";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate";
@@ -2473,10 +2473,10 @@
     apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropos-fn-plus-var";
-        version = "20170102.902";
+        version = "20170221.748";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el";
-          sha256 = "0a9cfycj4y9z7sm7501bcyn6d66fq1jlna3zmr85m9fbkk42zlyj";
+          sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var";
@@ -2512,10 +2512,10 @@
       }) {};
     apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "apu";
-        version = "20161210.842";
+        version = "20170221.750";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/apu.el";
-          sha256 = "0knmp8kryndpag0hy3mjbhmw9spvi6kzmx0s215m0lbiqzzibgwz";
+          sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu";
@@ -3656,10 +3656,10 @@
     autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }:
     melpaBuild {
         pname = "autofit-frame";
-        version = "20170102.903";
+        version = "20170221.752";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/autofit-frame.el";
-          sha256 = "05pww6hqfknrkhn8iq53r8lzikggw6is6syrypxybkmxhfbx4d9h";
+          sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame";
@@ -4221,12 +4221,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170213.1604";
+        version = "20170227.1310";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "9b6f8f93af9eb892a4df0e460f3d98031b8bad30";
-          sha256 = "1l4h4cyhbkfg3zpf8wi7c44zkxjv1qjjm0v9mjv4cb7bav7f8kfb";
+          rev = "0ebf2ee7ab5ae3b3cb6140ea57b2a88e02a59818";
+          sha256 = "197avkxslnvp95f0spmys1nis6nmqfvrv0b1cm945syk7yxa30db";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4531,12 +4531,12 @@
     bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bbdb2erc";
-        version = "20130606.2329";
+        version = "20170221.554";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "bbdb2erc";
-          rev = "f39a36351e1e6f1105c9e32970e7502b77b0dbcd";
-          sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
+          rev = "15db2bd29df0f6ee32c499fdeffb960b6a7f97a0";
+          sha256 = "0jlm6qffhh84vy5wmkxmsm5i4dp87cfh7zr5kvrw72zyww986kn4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/bbdb2erc";
@@ -4885,12 +4885,12 @@
     bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bibtex-utils";
-        version = "20150924.647";
+        version = "20170221.1757";
         src = fetchFromGitHub {
           owner = "plantarum";
           repo = "bibtex-utils";
-          rev = "1695db9f4f9198bb27f219bd4da7d34a9ae58069";
-          sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8";
+          rev = "36953c6bd1e14eac553834720f383d4114585f55";
+          sha256 = "0z21p9j4wsbiygwk8lz9awwy1c2w2mnfyq501bvvd7r99k7hhy2k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5764b6a880e8143db66e9011cc1c2bf0bcd61082/recipes/bibtex-utils";
@@ -5364,10 +5364,10 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170129.1207";
+        version = "20170227.1053";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
-          sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1";
+          sha256 = "14xkhc0x5ac2b0np5hvb0f4d1rap4yysbvm3fnmaaq4kylriysad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
@@ -5635,10 +5635,10 @@
     browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "browse-kill-ring-plus";
-        version = "20170102.910";
+        version = "20170221.757";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
-          sha256 = "0qps93fx9x7iy9m2061fkizw90y0d6y4q9wk0c8krpbny73a18v2";
+          sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+";
@@ -6022,6 +6022,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    build-status = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "build-status";
+        version = "20170226.655";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "build-status";
+          rev = "25c61f445502699d18fda7eb2010a38cbf8085a2";
+          sha256 = "04siqz69c5dp762c118b1b7iwdz8x3gavc3bncacgnx4ybyb1crf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/23bbe012f313cf0cf4c45a66eb0bee9361ced564/recipes/build-status";
+          sha256 = "0ckyf0asll50gifx1v0qqzpimjms8i1rgw9bnqiyj861qn5hch92";
+          name = "build-status";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/build-status";
+          license = lib.licenses.free;
+        };
+      }) {};
     bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "bundler";
@@ -6214,12 +6235,12 @@
     c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "c-eldoc";
-        version = "20160704.957";
+        version = "20170227.809";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "c-eldoc";
-          rev = "008a2e70cd690ff5689145e01086316002b237fb";
-          sha256 = "1rzx185d1qqb9rirw97vl9449ax4n72ak6k0q7mscrxz9k8vd00p";
+          rev = "2232000692f6f891456fecf23c538d5b47302a60";
+          sha256 = "0mr49mvjak30c6x8n4c13xi4rjfnbpnizq27f4zmryx5k8w5f9fp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc";
@@ -6720,8 +6741,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "1536311cda64a00abb5c1631bbdb253689117a1c";
-          sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv";
+          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
+          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6762,8 +6783,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "1536311cda64a00abb5c1631bbdb253689117a1c";
-          sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv";
+          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
+          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6842,12 +6863,12 @@
     celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "celery";
-        version = "20150812.147";
+        version = "20170225.124";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "emacs-celery";
-          rev = "5b5b1968fd258c444dc2372e989aab82830004c3";
-          sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c";
+          rev = "51197d74f5eaa8ae09144af7663a2f4277f07d16";
+          sha256 = "1845qz0ih30z1jgm1zi11q4gvw9gy6w3vyj2mc1aiv5r170qj8as";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b896b2b89d990a7ce2f4bf4ce0aee0d126f3e55/recipes/celery";
@@ -6949,8 +6970,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "55a097ff3743e8a0c806a168545390007336f97e";
-          sha256 = "0h51y5k6bly50w280v948r3lbj849w8117zlgk0zyhjqzr3xzp4h";
+          rev = "4a880501207d066a865f929b605bf113753ffd62";
+          sha256 = "1h4db9g4ph6v6fz02hmby823rfr57rxafxynlhlwf4cfmimmdfcj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -6989,7 +7010,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12010";
+          rev = "12019";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7321,12 +7342,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20170219.2115";
+        version = "20170221.206";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "527af4291245b4ede1983cc27c08fe00db38ea1c";
-          sha256 = "09jbfnwhvrv8dvxzdd7w0j6p305wfpv95z9v45w8wjc987fgzs6l";
+          rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1";
+          sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7570,12 +7591,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170129.1941";
+        version = "20170228.2202";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "eb1bc430288af6e666e385c634c434a863a4ef8b";
-          sha256 = "137rkssq1gkf9djg0x5vwnsf8z64yvjigp05zkkxrdfwcgs2gria";
+          rev = "5d32b960739162b75c044be0175b9564e7b8293e";
+          sha256 = "0mih9dqk6ydqksa5jgjjcqiz6gnrwzp024mda0csibdf9snxb4a8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7759,12 +7780,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170212.240";
+        version = "20170225.344";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902";
-          sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c";
+          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
+          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7846,8 +7867,8 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "295677";
-          sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y";
+          rev = "296613";
+          sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format";
@@ -8232,12 +8253,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170120.2239";
+        version = "20170225.2308";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "0113aa969e09e31d65717d4a9c16c934c77dcb9b";
-          sha256 = "1dcj6brfw7fcjn86ibl5sk1q5qij8zmrfr7776nczwh9i7986l4a";
+          rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682";
+          sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8257,8 +8278,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "0113aa969e09e31d65717d4a9c16c934c77dcb9b";
-          sha256 = "1dcj6brfw7fcjn86ibl5sk1q5qij8zmrfr7776nczwh9i7986l4a";
+          rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682";
+          sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8402,14 +8423,14 @@
         pname = "clues-theme";
         version = "20161213.327";
         src = fetchFromGitHub {
-          owner = "jasonm23";
+          owner = "emacsfodder";
           repo = "emacs-clues-theme";
           rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
           sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
-          sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme";
+          sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr";
           name = "clues-theme";
         };
         packageRequires = [ emacs ];
@@ -8488,8 +8509,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "3c0de6db2d9e0580f23cc95c4a1e00a8f66108c9";
-          sha256 = "01ngv9qylhxfg3jj3yvj927y0iyjqlxpxs7fnzywpmkwv50mfj2w";
+          rev = "e9cfe63dfca48688064b56777508ab20c5f2aed4";
+          sha256 = "180npd4nb2qc2bp1xk0qqpvqm4glskf3xczlmhh8wb03dpn5fzsi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8546,10 +8567,10 @@
       }) {};
     cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cmds-menu";
-        version = "20170124.1824";
+        version = "20170221.1557";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cmds-menu.el";
-          sha256 = "1mcrgfwpckrx0k82waqyd80x72mxzv42jg878rkycf4qpa0wxjh4";
+          sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu";
@@ -8607,12 +8628,12 @@
     coati = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "coati";
-        version = "20160725.1704";
+        version = "20170228.705";
         src = fetchFromGitHub {
           owner = "CoatiSoftware";
           repo = "emacs-coati";
-          rev = "a4f2aaaf1c4b92dfed801c8c264ab2ddc8ee3d4c";
-          sha256 = "1dlx1f5p662f1zbc7pr66ymbb4x3v7szybsvskjd5a25mdggwn05";
+          rev = "c5943d556ab44949b8d4cf295e7c4e8a665bb18a";
+          sha256 = "15vks08bnrz3q2z5f7h69l8fka7k5p3r03ciah9nh3c11d3ldw36";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f28144401803d86bafdc9c5b60bcb3ada0bab/recipes/coati";
@@ -8775,10 +8796,10 @@
     col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }:
     melpaBuild {
         pname = "col-highlight";
-        version = "20170102.918";
+        version = "20170221.1559";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/col-highlight.el";
-          sha256 = "0ayr0psmfjy8iqq779v12ccgzclwakzlcfsl7g98qvxxmkh1vm8j";
+          sha256 = "1xm1sbmcily1zy5xfpiphy3waq7928xpqmsrm3rcy37xbk2xj7vr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight";
@@ -8923,8 +8944,8 @@
         src = fetchFromGitHub {
           owner = "vic";
           repo = "color-theme-buffer-local";
-          rev = "faf7415c99e132094f1f09c6b6974ec118a18d87";
-          sha256 = "1zk5clvkrq2grmm1bws2l5vbv1ycp41978bb902c563aws2rb8c0";
+          rev = "e606dec66f16a06140b9aad625a4fd52bca4f936";
+          sha256 = "0c04fy3hc8wc0aabilqx9mcipmd41rmshqjxc3z8m1w0bm4288g1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e43060d80b3345ef4e8df9f5a9d66af8a44a9c41/recipes/color-theme-buffer-local";
@@ -9407,12 +9428,12 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20170206.2151";
+        version = "20170227.644";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "f77e4b12a7deebc83125d69ac1e2288d8aecf521";
-          sha256 = "04a8vlw3999yhmn3jg9d3jvvmfwmc88xnpfw1qm820s97cinzsgf";
+          rev = "202f38a11d8b14b8f3a84c8261816dbcf0dbff8f";
+          sha256 = "0zs3n1nycpahx5qmlfpkb4nc1g7kjr0q9pc5lwgpasi54bcp3371";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq";
@@ -9582,12 +9603,12 @@
     company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-flow";
-        version = "20170208.756";
+        version = "20170226.1930";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "company-flow";
-          rev = "b86eaff31a66e311c210da93b83fa218f8def24b";
-          sha256 = "1lpihk96pz3v7qd62icm950wds1xc02mx08ygfv7ia1zv1m4m6w5";
+          rev = "e2183e247720c1e252e04300313f386749997f5b";
+          sha256 = "0gsdcm84k2j6753r44r2qxaq62264xj8cxqayynxvjsawzv3ljav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow";
@@ -9670,8 +9691,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc";
-          sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks";
+          rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b";
+          sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9792,12 +9813,12 @@
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "20160229.732";
+        version = "20170221.751";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "9407824d2b29d427ed5732aa01cb0a8530a8259f";
-          sha256 = "1xsk02ymgj0gfblz2f6pzwh96crgx4m524ia6m95kcxrd7y63004";
+          rev = "34b4b52f67e5c1ffaf807e4be1512fca4695eea8";
+          sha256 = "0xl2am7kwbdfaxysjamq0b9slcdmlqqprb23zf07i4b28qa72qca";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -9838,8 +9859,8 @@
         src = fetchFromGitHub {
           owner = "kshramt";
           repo = "company-ngram";
-          rev = "23c4d6b2ef184da1a4ce0a7f3e979bc2ea2600ca";
-          sha256 = "1db1wzrcrbh4yfc23xx46fv43n45npzg0syz5d8pwrh1xlx1aj04";
+          rev = "09a68b802e64799e95f205b438d469bbd78cd2e6";
+          sha256 = "0qg1ws7xi418lbnx130xqkwgpsl0p218gqxwy0fpwky01iahwcw9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@@ -9939,12 +9960,12 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "20170119.2217";
+        version = "20170226.522";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "639baefc78ee9346229969cf794fba596e15a7d3";
-          sha256 = "0ql5a34cgkdbz1bxml5sam5kwd78zllkf8hm0r6zcnjykh4b5wv4";
+          rev = "30197a39ddedef550fd98803805dc15f844fc3c6";
+          sha256 = "1a972l0y58bjpbnmxd2h33arx26naq9f8dbq2vka2axigpy4455r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp";
@@ -10075,8 +10096,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-tern";
-          rev = "b20b3e490bf277c8480712210e3c92ea489859ef";
-          sha256 = "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm";
+          rev = "dfa3f39d67f011a78fe04ad5a1c7f54d8d788a0a";
+          sha256 = "125p6ipp9mrrc0va4a3pfc2wdnrsk945i9yv0p9lnmrrq69nnszr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
@@ -10159,8 +10180,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "386f6101fec6975000ad724f117816c01ab55f16";
-          sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4";
+          rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
+          sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd";
@@ -10511,12 +10532,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170219.2346";
+        version = "20170225.356";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
-          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
+          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
+          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10574,12 +10595,12 @@
     counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-gtags";
-        version = "20161024.633";
+        version = "20170223.509";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-counsel-gtags";
-          rev = "59e7abc97715507e3c524a3e7132d38ed7ab0a12";
-          sha256 = "01i1ilp87hg9s5bh4n7msf8ljx9h7ml3cxlawqh7y8c04m83yamp";
+          rev = "2e9dd1ab3127819c6950a0bfd90c7c9894e37512";
+          sha256 = "0896m45nmjw4nkibj3cz1clwq5pr7f5f2fsi84g5xhv5f97pgajp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
@@ -10637,12 +10658,12 @@
     cov = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "cov";
-        version = "20170217.1633";
+        version = "20170222.940";
         src = fetchFromGitHub {
           owner = "AdamNiederer";
           repo = "cov";
-          rev = "e295cde1fc924c01dade3909f5b591bcfe5cf9d8";
-          sha256 = "1axddbrwhb3akb07v20gxhpnaqj2nq04gn5501lh26351p2zjl3l";
+          rev = "41719590b26b20642c31d233858dc27f34b277b3";
+          sha256 = "1ph8hxnwbww194gcqq79ny6p3p396w1dgjr6inkg6f52ylycp25m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d0f35ce436ac157955d6f92de96e14bef9ad69e3/recipes/cov";
@@ -10725,8 +10746,8 @@
         src = fetchFromGitHub {
           owner = "zakame";
           repo = "cpanfile-mode";
-          rev = "6f0b6121baa2c1469f168c0cbbed7b74bbdd7d08";
-          sha256 = "014ak97li7xsxrdqpsdmaclnsrm4d3gy2cw3msby4j6saj9rcn4r";
+          rev = "eda675703525198df1f76ddf250bffa40217ec5d";
+          sha256 = "07xivp1i9f884gs17lhp5jm0zk916c7gwazxnkm6m8rl3z2mcq0l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673e828a076ad806cdb69102a9d55f80ace45670/recipes/cpanfile-mode";
@@ -10826,12 +10847,12 @@
     creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "20170105.2029";
+        version = "20170222.258";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f";
-          sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi";
+          rev = "32fa3f4e461da92700523b1b20e7b28974c19a26";
+          sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@@ -10973,10 +10994,10 @@
     crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }:
     melpaBuild {
         pname = "crosshairs";
-        version = "20151231.1238";
+        version = "20170221.1608";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/crosshairs.el";
-          sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am";
+          sha256 = "1wjj88zv37ak9zd12d7sy7j261x5y17wxmw5jrzk56shkpdvcbq0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4144c2fd45877effd8005abf64019aed651148a/recipes/crosshairs";
@@ -11345,10 +11366,10 @@
       }) {};
     cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "cursor-chg";
-        version = "20170102.922";
+        version = "20170221.1610";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/cursor-chg.el";
-          sha256 = "04as4z0sbirdi68swcia783caz7hlbk5qicnpq0d4ihmnbagy3fd";
+          sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/871d02540951a217ea3d4aed9ce6b66a77223fbf/recipes/cursor-chg";
@@ -11551,8 +11572,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "299ad1163ac8e72c1910da3e03013e7634a94b91";
-          sha256 = "1xcxmmzyag8lj5kdnw0p0yram0ahbzb4cjy7h1ca0za6v0m3yc4l";
+          rev = "25cf792f735e8e7e06e2e4821d1ad21679c27f59";
+          sha256 = "0v7mk33nr64d4a705d8ljfccj47wkih5qfizbk53r5dr7f3wzbqc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11652,12 +11673,12 @@
     danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "danneskjold-theme";
-        version = "20170210.708";
+        version = "20170227.251";
         src = fetchFromGitHub {
           owner = "rails-to-cosmos";
           repo = "danneskjold-theme";
-          rev = "95805f95aa780ecdb6ff35aaa6a56f3acc4c8be3";
-          sha256 = "1bpyzx6i2z73y70na9a450bpv9gw4av5jx6njbwzjbapdcl7dxz6";
+          rev = "5a52c5eca997655b7db349962d056daba64219cb";
+          sha256 = "17kfv071zg0v3hcmlzk5yb88xpyknxig2fl2mj2cw3xjcshbxaa0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme";
@@ -12156,12 +12177,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170218.1508";
+        version = "20170227.412";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "1536311cda64a00abb5c1631bbdb253689117a1c";
-          sha256 = "0wg85mnkfailzf6558yi6lll14c0v9v4labalmnsz9kcvyfbrprv";
+          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
+          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12174,6 +12195,46 @@
           license = lib.licenses.free;
         };
       }) {};
+    debian-bug = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "debian-bug";
+        version = "20140131.929";
+        src = fetchcvs {
+          cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el";
+          module = "emacs-goodies-el";
+          sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-bug";
+          sha256 = "0qlksbiw9qb0bv85b3rimsmzfr8dhbjjg4h0wnx7x434m6wqlm1a";
+          name = "debian-bug";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/debian-bug";
+          license = lib.licenses.free;
+        };
+      }) {};
+    debian-changelog-mode = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "debian-changelog-mode";
+        version = "20140131.929";
+        src = fetchcvs {
+          cvsRoot = ":pserver:anonymous@cvs.alioth.debian.org:/cvs/pkg-goodies-el";
+          module = "emacs-goodies-el";
+          sha256 = "5c75978cdb4339ae7153edeafdf81d6effd8e23df6e406001c8106e105852105";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/19ea27b9e95dafa13b0740e850d065f169625c4f/recipes/debian-changelog-mode";
+          sha256 = "185l9ghsi6rlbmhs99lpsq257r5q87j8vra6h7jd9fwxfp4n9r22";
+          name = "debian-changelog-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/debian-changelog-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "debpaste";
@@ -12905,10 +12966,10 @@
     dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-details-plus";
-        version = "20170101.918";
+        version = "20170221.1629";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-details+.el";
-          sha256 = "1bm4q66wi476ppf8xiz9p0x491rqdxx9gpmn6sl9izjfg2xck4wb";
+          sha256 = "0821swa6qp2bs16r1pfamc7n62002rp8v0vimamw33cqxn2d0h6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0b6a13a5dfd977979d3185139000e7a639d32ec4/recipes/dired-details+";
@@ -13071,16 +13132,16 @@
     dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-icon";
-        version = "20161206.130";
+        version = "20170222.2126";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-icon";
-          rev = "4397e7858d5e63c251acc2741d78fe8e178cb206";
-          sha256 = "0g97lii8n9pal46kipw59nj78qv3l0gpy6rwbd702gxccj94glgv";
+          rev = "f60e10757a5011235b519231ad35974ff25963ed";
+          sha256 = "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
-          sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon";
+          sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1";
           name = "dired-icon";
         };
         packageRequires = [ emacs ];
@@ -13134,12 +13195,12 @@
     dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-launch";
-        version = "20170131.1740";
+        version = "20170227.1532";
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "0af40bc6755454beddc0d3cce7dead1b87b58904";
-          sha256 = "01swk3pp88myfams2kpnyzl0d3r4bry1hn6gf6vvvglwif02d3rn";
+          rev = "b62492c1a6404ed2ed32973d99cdcf8630cf7d02";
+          sha256 = "09nwzihg1v5p8c4jcjzl3w2il701lh3ps8c472g2iwmkihljs093";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13196,10 +13257,10 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20170220.922";
+        version = "20170221.1620";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "1f84ym2c1wwbjsw7bh4p60k2qvrcr850vb1d7sha506b7319rgqh";
+          sha256 = "0jfv0m3w3vqafaqcxp4n53msvjp83zczxc7drgng1amksr82xi63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+";
@@ -13335,10 +13396,10 @@
     dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-sort-menu-plus";
-        version = "20170101.923";
+        version = "20170221.1630";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
-          sha256 = "1ajx4nd14pzbj2629psc3aqmsfb7wsdggcrwyxy94mnvg553m5q9";
+          sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+";
@@ -13810,12 +13871,12 @@
     dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dix";
-        version = "20170217.112";
+        version = "20170224.615";
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "e335e5cb619b69d68a179cb1d4d757d9314da9ba";
-          sha256 = "1q1rrzfqc9a8mwmi8h35binh43f6zi6bgw4b5km4mqfgwpckrcqx";
+          rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8";
+          sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix";
@@ -13835,8 +13896,8 @@
         src = fetchFromGitHub {
           owner = "unhammer";
           repo = "dix";
-          rev = "e335e5cb619b69d68a179cb1d4d757d9314da9ba";
-          sha256 = "1q1rrzfqc9a8mwmi8h35binh43f6zi6bgw4b5km4mqfgwpckrcqx";
+          rev = "bcc7fd7aef5d25171978c386c620e09d0ba8d2f8";
+          sha256 = "12ny1a89xhjcnz03s1bw96y14kqb2w6cpf2rk8lv6kri7dasfq4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil";
@@ -14196,12 +14257,12 @@
     dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dockerfile-mode";
-        version = "20161209.631";
+        version = "20170221.1317";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "bebfa1b73e7e006d574a0e4fbae225dc1db214ff";
-          sha256 = "129kang099mw6lfi4616d47axm3q81hr8jhqwymc3ar9ramggyg3";
+          rev = "5f1e17e4e59fee4725c5b4cd9b5b49f1faaa108f";
+          sha256 = "1pw6706lnd6n866scwp35ar58y2c6jjyn82qpjdk0ma12hgv3gzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1406f5a24115d29e3b140c360a51b977a369e4f9/recipes/dockerfile-mode";
@@ -14238,12 +14299,12 @@
     dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dokuwiki-mode";
-        version = "20160129.7";
+        version = "20170223.501";
         src = fetchFromGitHub {
           owner = "kai2nenobu";
           repo = "emacs-dokuwiki-mode";
-          rev = "0e8f11572b6842b5b9d6e1a5123d988b26af04bf";
-          sha256 = "1qfmq8l4jqyrhfplsr1zd8bg9qqqwbh3mhipqzja0px0knjpqj85";
+          rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1";
+          sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode";
@@ -14301,12 +14362,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170217.1444";
+        version = "20170222.1412";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "21354daf4cea7796ebbe238aea04720f14871d79";
-          sha256 = "1j3rcvdp4wwyp7v45j5ypkb62660qmff704h77d1rxspn62rcs1x";
+          rev = "f6a5a148851183b2e3a92d21bc179cc637b5fcdd";
+          sha256 = "0w53gar82avmwx6rlhnn2p2vlmpghrn7hy83lggiawgr4h3yw4dw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14321,10 +14382,10 @@
       }) {};
     doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "doremi";
-        version = "20170101.922";
+        version = "20170221.1634";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi.el";
-          sha256 = "11cxhfps8d0b0nsqq4mvwxpppmwagzxmlzy70icf85iv83xa74kv";
+          sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi";
@@ -14340,10 +14401,10 @@
     doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doremi-cmd";
-        version = "20170101.919";
+        version = "20170221.1631";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el";
-          sha256 = "01x19bsdmz2z18s5a30mnbsgk1xjmff9rsd6dd2phaj750j6aiyb";
+          sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd";
@@ -14359,10 +14420,10 @@
     doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }:
     melpaBuild {
         pname = "doremi-frm";
-        version = "20170101.920";
+        version = "20170221.1632";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-frm.el";
-          sha256 = "1gbm3iyfg96fafnydha5zyj3sip1i7bk2qhr3hpa2g895mjfv6kd";
+          sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm";
@@ -14377,10 +14438,10 @@
       }) {};
     doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "doremi-mac";
-        version = "20170101.921";
+        version = "20170221.1633";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/doremi-mac.el";
-          sha256 = "1ilsnyzh4kka0kncd8w4fc5v9nm7q05i3g25z3m49zqifxp1vlfa";
+          sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac";
@@ -14749,7 +14810,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1783810";
+          rev = "1784923";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15353,12 +15414,12 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }:
     melpaBuild {
         pname = "ebib";
-        version = "20170208.1223";
+        version = "20170222.1459";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "1ae554d1b67cb81b96c828e9710a4658db35b9fd";
-          sha256 = "0ch8ws46r55rdap67xa40gb9h4llad6wx75iga4fyjzh6fxv9q9d";
+          rev = "36d9d19abacaeade54a043701c5b2e4e58b8a61b";
+          sha256 = "1fiwgdlykgnyi93lrnh0ifd4c5jlbs1kg69r2q2fyyfcwwvvq3ck";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib";
@@ -15394,10 +15455,10 @@
       }) {};
     echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "echo-bell";
-        version = "20170101.925";
+        version = "20170221.1635";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/echo-bell.el";
-          sha256 = "1q1z151cfw1775gcfzpnm4afp62skqlnj5z2miizbnraincqy24b";
+          sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell";
@@ -15501,8 +15562,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-database-url";
-          rev = "a6e4be7547ee8e0bb43a11ff173d6271b21b5012";
-          sha256 = "0f59s0a7zpa3dny1k7x6zrymrnzba184smq8v1vvz8hkc0ym1j1v";
+          rev = "d56c580268cd93651998c4c6b1c5558e6b6ca90f";
+          sha256 = "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb/recipes/edbi-database-url";
@@ -15522,8 +15583,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-django";
-          rev = "01c44a330a8d6ff08932d63dec4d9512d582bcda";
-          sha256 = "1029b7p1lnyqkg0jm9an6s1l7la0kb38gx42g7212wbj71s3krga";
+          rev = "61c70d3a727ff28c1c7d1eb61af1efba7a268b8f";
+          sha256 = "0kp2g0vb7pag57n20blqfri01cnkaxa0h6adbg2bfw7vcbn3h1gd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/345cafbf5358f8179bcbcb895cace75f289c02f1/recipes/edbi-django";
@@ -15602,12 +15663,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "20170220.1134";
+        version = "20170221.1002";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "ed0bbffe5270a1df19e0e751c08a852f6f5a5c8e";
-          sha256 = "0p64nvqxb3a554qa3x3w1lh9qj8dafzpjpmdvj2g47hr840sxdfn";
+          rev = "dfabfc775ab3288ac91aac855de4b64e5279f0a2";
+          sha256 = "0nb2yfbw3zsxpygy8ksz55k720lymy2fbfszh1qfd4yi0hkmbm5i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -15620,6 +15681,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ede-php-autoload-composer-installers";
+        version = "20170221.1226";
+        src = fetchFromGitHub {
+          owner = "xendk";
+          repo = "ede-php-autoload-composer-installers";
+          rev = "7840439802c7d11ee086bbf465657f3da12f9f66";
+          sha256 = "1dkq0py1sybmpy59h3szafa59g5g3jp8l9az22l15qgmkpbqydh4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers";
+          sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268";
+          name = "ede-php-autoload-composer-installers";
+        };
+        packageRequires = [ ede-php-autoload f s ];
+        meta = {
+          homepage = "https://melpa.org/#/ede-php-autoload-composer-installers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ede-php-autoload-drupal";
+        version = "20170225.1448";
+        src = fetchFromGitHub {
+          owner = "xendk";
+          repo = "ede-php-autoload-drupal";
+          rev = "b32b0f309e24969022d194035b9afc7675c22aca";
+          sha256 = "1yydbrcydh712w6v5qg7pzpfqlgchsniq0fw6psmlichn8cfmsjv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal";
+          sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964";
+          name = "ede-php-autoload-drupal";
+        };
+        packageRequires = [ ede-php-autoload f s ];
+        meta = {
+          homepage = "https://melpa.org/#/ede-php-autoload-drupal";
+          license = lib.licenses.free;
+        };
+      }) {};
     edebug-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edebug-x";
@@ -15791,12 +15894,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20170103.2124";
+        version = "20170222.2141";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "99011d5780dd726ec46b7936e2cbbade66b725db";
-          sha256 = "1757lgjbycbf5368s908xbj6dwn3xm9a9zix6ixwxd7j4gyhy16n";
+          rev = "1d69cffd1dd4709338fba7241f344a55cb61f59e";
+          sha256 = "1pv83biyiqkm5if3wkm071r5cl0ch1wv5yxzdqyxsq4k11s9z4qy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15951,8 +16054,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6";
-          sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x";
+          rev = "5bf34ba5f71e993ea9ae0971240d5e0e975f1377";
+          sha256 = "0wk5p4qr0a9mkwrayfcc6rshzjsg7dnwvlp5aj4rpfmlliy4qmfb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16029,12 +16132,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170216.1457";
+        version = "20170224.1115";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "9e1341a704cfd6cacc1f5e4ffd75e8866a2519e8";
-          sha256 = "1x73qsdnaywlvigas8m4djpb7gkddsp96v4v5vh178k9ppcrm8j0";
+          rev = "4578772ff1a64fa50f225646a9f4cd2c3070bffb";
+          sha256 = "0dcn3wkb1hvmk9jy5s28nyfw7hrxslzjlylxxrf8g454swkmx0i8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16092,12 +16195,12 @@
     ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }:
     melpaBuild {
         pname = "ejc-sql";
-        version = "20170218.916";
+        version = "20170221.33";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "ejc-sql";
-          rev = "6ed56bc8a860c6b0719614210632202fd474bec7";
-          sha256 = "0dgwl918n7pzmhflm3ljlsz218hqvfbblpmfiihjgy9zni4idfpj";
+          rev = "4663cd80af74d8e29001adc696568de5d3d8717c";
+          sha256 = "1r6b4dgk1scy1fwsri96gjldcx4q60vdgqb29k5g9sljsw00xzfy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql";
@@ -16218,12 +16321,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170211.1725";
+        version = "20170227.2208";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c";
-          sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46";
+          rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b";
+          sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -16573,8 +16676,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d";
-          sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4";
+          rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1";
+          sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16643,8 +16746,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "caa3679a4af386c73d01cabf7c114a5abb40ea3d";
-          sha256 = "0af65imbh2lp4i7n4k44pr5sl4035rh61zngn4fznwcgs6kjk7d4";
+          rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1";
+          sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -17080,12 +17183,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170214.318";
+        version = "20170224.702";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "65e7c410acfcc8d675f531894269866ecaedea6e";
-          sha256 = "0khsycp7l93zz3n9aa2lbyk4imcdwyfpp2i9jc6g2j9k9jn1dcal";
+          rev = "72f06e3e7f5010ff794e0db73950b33bcdfb2e72";
+          sha256 = "0xbd5gq0pp6zn1rjkn3p44cvrg0xkyd8y8a41nnvgy5h1pjaqk0s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17486,12 +17589,12 @@
     emamux = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emamux";
-        version = "20161123.414";
+        version = "20170226.1937";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-emamux";
-          rev = "e4611a4049d3180e35da6419cf01f15c8fe2575f";
-          sha256 = "1gskns6fqgp575hvk3jxl8wjlrh3i6wq1s4lwbgx0m5qybgqa62q";
+          rev = "39f57786b2cdd3844888df42d71c7bd251f07158";
+          sha256 = "184669qynz1m93s9nv5pdc8m4bnvqa56wz472nsq4xhixz44jjsv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6de1ed3dfccb9f7e7b8586e8334af472a4988840/recipes/emamux";
@@ -17653,11 +17756,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20161222.1446";
+        version = "20170226.1429";
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
-          rev = "dde22abffb7a47adfe2cf98e4505ac0048e0b5fd";
-          sha256 = "1r7gkilgmk2gll1ps0z7n0i74wbg66jla9cf8fvppvajxmmng4gv";
+          rev = "0b0bdd12eb97797d3c481de70871d64f42672a58";
+          sha256 = "1lvq4kc0sj5wrdjfyiarmz644ws36r7vp06jk4b11g5csk07lrc2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
@@ -17925,12 +18028,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20161124.940";
+        version = "20170220.2247";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "62609316f269bed9e6775f9614783789a79268e7";
-          sha256 = "04wwi7f6cma1s0nhw2k756k3x3sjsc5s7iq1q6zlq4wmz08czg6v";
+          rev = "181d619e96cd3275e69e010486169553c13479e7";
+          sha256 = "1ms2pkjqdkwfvn8xq4dbm0585p2gdwcwplnx6rk7zjvir6nc6y5s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18428,11 +18531,11 @@
     erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "erc-hipchatify";
-        version = "20160909.1503";
+        version = "20170228.1151";
         src = fetchhg {
           url = "https://bitbucket.com/seanfarley/erc-hipchatify";
-          rev = "dbb74dd91c5a";
-          sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj";
+          rev = "2b93fb7103f5";
+          sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
@@ -18788,8 +18891,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "32a74e6c83cd110b8e8ab714be4365c0da558fca";
-          sha256 = "12aw6rkh5dvznzzbwdlcjraw0s91bp5azs2d0lyblrnpi7lf28gg";
+          rev = "a76345ae86f97c6c07569499a8f49c199a386444";
+          sha256 = "1d8f3g5d6rjrlyzi77vx1c69lm8wx0h894zrw9y8nkp9mvydf1v3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19263,12 +19366,12 @@
     eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eslintd-fix";
-        version = "20170220.832";
+        version = "20170227.1220";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "eslintd-fix";
-          rev = "4b0c93731d451ea7ddf4b1a8a61bab07915bbb0f";
-          sha256 = "08384v47dasnw4dy3wlnj0n9wzc03wcf6r6y3hy36xizvkng4qdl";
+          rev = "37f14a715d1909c9db271c435a3c0b234f131175";
+          sha256 = "1kp9f3l2fnjw6sffxc5n439326kg00gfdhlvach9jpiy9dhkarpj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
@@ -19368,12 +19471,12 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20170219.1024";
+        version = "20170227.802";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "081ce9c0ac19e2f98fe2c35384f301de10cf8ce2";
-          sha256 = "0q2s5mj2m3daqfhw34idvvlx0qkscbgqgpan6rc5aflibv7rlhk5";
+          rev = "e7e52d2c07d374209261d207293caa391db7b398";
+          sha256 = "1apk33hmsn5qlagnrqnmd975pz2ydf69s4kwsnx00fj9fb48bkzz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess";
@@ -19452,12 +19555,12 @@
     ess-smart-underscore = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ess-smart-underscore";
-        version = "20160711.748";
+        version = "20170222.1715";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "ess-smart-underscore.el";
-          rev = "bd219dc9af764e6c255299fe77ced4ed78df0cbb";
-          sha256 = "1wnnswfpqcgspcij55i7z6cx41j3bbmqgvpgxhzzw3g47vsa1dkz";
+          rev = "02e8a03553f34fe7184afff97f20e560d6f8d617";
+          sha256 = "0kk9n66xjm08cj6zdqxfn332fb4c2is4pdxgqamypdwsdjhcz57l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4d6166f5c80cf37c79256402fa633ad2274d065/recipes/ess-smart-underscore";
@@ -20370,12 +20473,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20170208.1712";
+        version = "20170222.259";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "01a98a20c536a575ee5bc897f38116155154d5fe";
-          sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl";
+          rev = "8b5830a003ea4b1262621d822b9a45a0948bee22";
+          sha256 = "11djm4qjj7h4iv661f55zpvlc3010ngj43rw5jgaii9mlrsfa6d2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -20664,12 +20767,12 @@
     evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-swap-keys";
-        version = "20170125.452";
+        version = "20170221.444";
         src = fetchFromGitHub {
           owner = "wbolster";
           repo = "evil-swap-keys";
-          rev = "1f137e85fc092cf5a1bd8abbd8e8fda0f4cd024b";
-          sha256 = "0vx4gsyhcb050q8bh6d016ybjkji1mfpp9m000s4kq1k04nm4cwb";
+          rev = "6a2f4db944076439c2cb481c4e9e4e5d736a5ab8";
+          sha256 = "0ymxmlx6dfczxkdgsm8g8pz6dhdnb3ay74s2a70jgwqns8yaqv7k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys";
@@ -21021,12 +21124,12 @@
     expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-region";
-        version = "20170213.616";
+        version = "20170222.343";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "expand-region.el";
-          rev = "d9435e3d0954e9b791001a36d628124cc520445e";
-          sha256 = "0i4463821lhi3cid6y3v3milq0ckagbdc513xs5vv3ri44h91n57";
+          rev = "d1252200bac2e0197497d6d57ab6fd004f1b2e77";
+          sha256 = "0bhwv92wqccz8y5xm6gj71ryci8cpsnm8z8vmdj8lsf6ki8vz512";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region";
@@ -21147,10 +21250,10 @@
     eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }:
     melpaBuild {
         pname = "eyedropper";
-        version = "20170101.930";
+        version = "20170221.1640";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/eyedropper.el";
-          sha256 = "1132mc9c79k07gh51i50qaykilnxwzb58rf18pja9fdqc9vzcs7y";
+          sha256 = "1nyplgpcpbczb1lfj2x5l92ckn6f7wz28sviqiinh45fzsji5h3r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/eyedropper";
@@ -21208,12 +21311,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170209.613";
+        version = "20170228.815";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "5580dad950d866ff0110c01480b02b792167b83d";
-          sha256 = "06ww18igmy7v07gqgw6yn9qb8h76a8mwd43pyi25y615k48ilrg6";
+          rev = "4872561241cf67b679290fe91e5783dd9cba8d72";
+          sha256 = "0ca36s17bhpzmsgl65q7c8fhadca0zpw6dh58vychrv4k7757gav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -21291,10 +21394,10 @@
       }) {};
     face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "face-remap-plus";
-        version = "20170101.931";
+        version = "20170222.1742";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/face-remap+.el";
-          sha256 = "1mjh7hjpfxy476nwn0kbcq1zyaklrxd3l8482y5dlbcziwg85s1f";
+          sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+";
@@ -21309,10 +21412,10 @@
       }) {};
     facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "facemenu-plus";
-        version = "20170101.934";
+        version = "20170222.1744";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/facemenu+.el";
-          sha256 = "0xdrmmygyynk0rinfhikw5zjbh8kf8xbcs5a79irhm5mv88jiikf";
+          sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+";
@@ -21327,10 +21430,10 @@
       }) {};
     faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "faces-plus";
-        version = "20170101.934";
+        version = "20170222.1745";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/faces+.el";
-          sha256 = "1cvwna544xk5jlmimsszvvqcf2h8xmx6f9ripbpvkldgqalb91mn";
+          sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+";
@@ -21742,10 +21845,10 @@
       }) {};
     files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "files-plus";
-        version = "20170101.936";
+        version = "20170222.1746";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/files+.el";
-          sha256 = "01391gkkzciahi2azad5gd260i9s48c5k73m2w3qinv7clqwxc32";
+          sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+";
@@ -21760,10 +21863,10 @@
       }) {};
     filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "filesets-plus";
-        version = "20170101.937";
+        version = "20170222.1748";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/filesets+.el";
-          sha256 = "0d30i1vnmja1vjhqs25vdph2gcvrsrrxvzgnm5hp8pscf8wz1igf";
+          sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+";
@@ -21862,10 +21965,10 @@
       }) {};
     find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "find-dired-plus";
-        version = "20170127.943";
+        version = "20170222.1750";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/find-dired+.el";
-          sha256 = "1d0h5bcvk6x20apkvi8ywq961y9zvs4qj8p4n9n8yhm5sznrksyc";
+          sha256 = "002lcqhddw163w8h2lkp3yd47qhbia9ml7g8agngffsin9jip7qw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+";
@@ -21964,10 +22067,10 @@
       }) {};
     finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "finder-plus";
-        version = "20170101.945";
+        version = "20170222.1752";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/finder+.el";
-          sha256 = "1ip8y3qhswfhshh61c7b8iajdnlsyg2cpypbv87825mzy8vbgp6z";
+          sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+";
@@ -22168,10 +22271,10 @@
       }) {};
     fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "fit-frame";
-        version = "20170101.946";
+        version = "20170222.1754";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fit-frame.el";
-          sha256 = "0l48zayzmlpzvqx02g1d2ilwijakwl2ql5svk78w3vx4nj41xxj7";
+          sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame";
@@ -22589,12 +22692,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170212.1015";
+        version = "20170223.247";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "3943b4cc991eba2d6aff6ef085ab34915dc274ee";
-          sha256 = "1n2rl1b7xca5vyk6x60q7v3xn55n7a971xcmzz10yqh28qxn6qlg";
+          rev = "da499ef6a7e3c8f4adec732703f34aea2a4e70a2";
+          sha256 = "0nyvkgva0qkk7hrsb2h3q22hxvc17r10hff87gv7bj82ia8lxqnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -22631,12 +22734,12 @@
     flycheck-ats2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-ats2";
-        version = "20151130.607";
+        version = "20170225.836";
         src = fetchFromGitHub {
           owner = "drvink";
           repo = "flycheck-ats2";
-          rev = "431e46d5bbd20941c26270c7ba6872c86451348b";
-          sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c";
+          rev = "9f77add8408462af35bdddf87e37a661880255e3";
+          sha256 = "1fv3r49i8dgszaq5rs8dwnwcj6rgx922ww01ikrq3b4c9y17srpz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d3605bdc402e6b13f53910eafb7f1428a5f749f/recipes/flycheck-ats2";
@@ -22733,6 +22836,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-clang-tidy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-clang-tidy";
+        version = "20170222.512";
+        src = fetchFromGitHub {
+          owner = "ch1bo";
+          repo = "flycheck-clang-tidy";
+          rev = "fe49836f30b37eae308e2255acbdcb0195d3a2ba";
+          sha256 = "14i8f5gid9pnrgsvhibwclv4m53j86i05wbfjfj15aprhbf2ii94";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a289ac549a7735a12eec85521c32f915b9194b85/recipes/flycheck-clang-tidy";
+          sha256 = "0lhf5byydmd380y7qx5x34r0sq7gzrj286pcaxhl388p6j58cb4p";
+          name = "flycheck-clang-tidy";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "https://melpa.org/#/flycheck-clang-tidy";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-clangcheck = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-clangcheck";
@@ -22757,12 +22881,12 @@
     flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-clojure";
-        version = "20161231.836";
+        version = "20170221.1354";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "254bd6a65a262896a4cc4f2061a6bbce51a5b73f";
-          sha256 = "0315x1j55wkff0fizqvalfmxjiy1rl9fjk6hl7xziiw3rdvb943a";
+          rev = "c690f780b07cf9412b5b58e981b0caff2cef0e44";
+          sha256 = "136pmcp6zkarp5fasmw5532klik948hrbls5bbq5iqddb82si7x3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure";
@@ -23618,12 +23742,12 @@
     flycheck-scala-sbt = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, sbt-mode }:
     melpaBuild {
         pname = "flycheck-scala-sbt";
-        version = "20170217.934";
+        version = "20170226.1127";
         src = fetchFromGitHub {
           owner = "rjmac";
           repo = "flycheck-scala-sbt";
-          rev = "872a8f4e22d625149fb523dd75e69587773c2591";
-          sha256 = "0zdnh4rfrg3wrr7jkbhq4p4g3cbcl4dzr4i4zkdzsda8g7y3gz7n";
+          rev = "2d063d42628baf4cd4f38224013ece5b027db046";
+          sha256 = "0ch63mm24ljpz1kd6w2qs4218ifir6aah7dnxipi2q2yz24frg6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0afc1e5b31689a5ba52443e2878114d9ec0e7757/recipes/flycheck-scala-sbt";
@@ -23769,8 +23893,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "386f6101fec6975000ad724f117816c01ab55f16";
-          sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4";
+          rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
+          sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd";
@@ -24772,10 +24896,10 @@
       }) {};
     font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "font-lock-plus";
-        version = "20170101.947";
+        version = "20170222.1755";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/font-lock+.el";
-          sha256 = "0ffs2c7gyhfa2mskdh7a1yp0na99kk282zm4zn56ljp55rrnnnh0";
+          sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+";
@@ -24851,22 +24975,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fontawesome";
-        version = "20161219.312";
+        version = "20170226.2039";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-fontawesome";
-          rev = "72b4f2f83c7fdacd225aee58f93acefc53166626";
-          sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d";
+          rev = "c0ec46b7d7d9d194a09b572c55980f32a08c29a1";
+          sha256 = "10dszqwb8sxhka4dv0xkd1pkd566z006xhq9d75qz29v3b7krbnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
-        packageRequires = [ emacs helm-core ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/fontawesome";
           license = lib.licenses.free;
@@ -24875,12 +24999,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "20170202.1427";
+        version = "20170221.1327";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "975bf79f16f2c653466315669f4a26f85be0eaa3";
-          sha256 = "0vq0fafll0j2k0f9b0rbzbyg6jxp3sba0nq5bqx0l3mjfvlg0x4d";
+          rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94";
+          sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -25106,10 +25230,10 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20170207.1045";
+        version = "20170222.1758";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/frame-cmds.el";
-          sha256 = "05mdds242vcav9gy15phvlk9q8iy29wnc8bp0c7i6z6bblairfzj";
+          sha256 = "1r2hyl7f1rgw20mh8nj0lzf491p5pl4pfprv0yj0jls5jaqds4xc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds";
@@ -25124,10 +25248,10 @@
       }) {};
     frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "frame-fns";
-        version = "20170101.951";
+        version = "20170222.1759";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/frame-fns.el";
-          sha256 = "00b2bb3rfraps47mcv0vb51ygjx0f311i95g0b7dh1jqi6nxdfb1";
+          sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns";
@@ -25337,12 +25461,12 @@
     fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170210.1336";
+        version = "20170224.912";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "26ac5bb8fe1cafbf2bd09ef8a528af506c2caf8a";
-          sha256 = "0gbcwj36ns34xqgjp6pxml6zn8kza080gyyf383vhqqfqp640vqj";
+          rev = "f7b982007e26e34e43debd8759346874966e6924";
+          sha256 = "1mh1qv8vxipxyi060xzniq3y8h7b0as9j5si4ql6hs742fhpd2zk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -25361,8 +25485,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "55834faba7e5f7096f9ce53613333137ab20ad07";
-          sha256 = "15vn4bw0qzgg3y5ak703c4jqds8zjc758fnrq2xsdi84d4r67c91";
+          rev = "890be490748f1b8cdd79919e169600f5e8c0e8d7";
+          sha256 = "0ygn4kvv8ypr55db0jgpqx0z2gynsn53wqgca4pjb1cbxqbkwi0g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25487,8 +25611,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "b66b691c56b128ee03541a7e0e777ceb78811f16";
-          sha256 = "1ya49xakc30ljy3g6bfb1kikdhrgsq6rg2z63gvkzxhpqx63wjr5";
+          rev = "2da9d1fc29dd9aaf2381ada1d5eeda4bed0a26cd";
+          sha256 = "16c00vikjdq3hd8wv54y8nf7yj84311n9m06v4iwn8smh94ydzg3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -25542,10 +25666,10 @@
       }) {};
     fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "fuzzy-match";
-        version = "20170101.952";
+        version = "20170222.1800";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el";
-          sha256 = "130rx8x0d64pb5sz9xq3qvgq698xlkvlb76fk9xfq7n895kxf1bp";
+          sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e00737be152e9082d0f0c9076cac7fcd08bd4e7b/recipes/fuzzy-match";
@@ -25752,8 +25876,8 @@
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "geben";
-          rev = "cf0a28c1f43c2d01f4b4a408de4f7a915b11076e";
-          sha256 = "1hkdch2pj6vbj3j4hfazn2dvfhsgilqqn5r8m7ipj8sw1598rv0r";
+          rev = "7639411604552fcb6352afe88522a9ff1c8132fc";
+          sha256 = "02pic12kfa9794sz7qj57ca5ld8x1pk0apfr3h2xzr6zdsmsdday";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben";
@@ -26004,8 +26128,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "084688bb357d42e2459fdd381da2fea17ffc96ea";
-          sha256 = "1n3rcmrv7mbi5h0s0b527kx358k7wl2s0rgnrvavbv392jf08890";
+          rev = "53df9d228fb0bd1e89b74c9e86f773abd697540d";
+          sha256 = "0rcw0wjql50qs5mi0m1516nsmhh0pj9xy0clr23fx2dxlflbhwr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -26298,8 +26422,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "35566abd2d21e6576dc2e33311c15977f5ba5667";
-          sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f";
+          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
+          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26459,22 +26583,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20170218.1541";
+        version = "20170228.1957";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "4bb6dacc8e3faf781415e9fab44ebd45aa002fb4";
-          sha256 = "0l0irmjl44kj4ghvr7jrbyi84q5ggyr36g3jpmvy3pag2fk3pc5n";
+          rev = "891cfbcb4ea3a7d05b49495b4b01ce9ce417b9bb";
+          sha256 = "18fxg5vr5m782np8957mk3c8d00z793k1qzpays5lv1v8ijkhzj2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://melpa.org/#/git-link";
           license = lib.licenses.free;
@@ -26525,12 +26649,12 @@
     git-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "20161125.142";
+        version = "20170226.24";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "d67901fd3f87f4836386d85a4a7df8a300d47147";
-          sha256 = "0rgcr26snphimiigs3krzb577zd6xpzzhw1mcvmq2cjbc6hi6sdn";
+          rev = "efa6752397101739c6abb53a0ca7a904d1c7898d";
+          sha256 = "1v85cci8rm82wgss53ia1dqvq2q17hf2vayx6pi34h0hvj7ihzlx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/41e95e41fc429b688f0852f58ec6ce80303b68ce/recipes/git-timemachine";
@@ -26777,12 +26901,12 @@
     github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-theme";
-        version = "20170220.1038";
+        version = "20170221.804";
         src = fetchFromGitHub {
           owner = "philiparvidsson";
           repo = "emacs-github-theme";
-          rev = "a424395262b2215866a02bf42bf8d93667979c13";
-          sha256 = "017p4l68gw4gyfd2yr5yr3di407f50fs7ki6bqa0z74hc661n1g5";
+          rev = "a7bce12f914c09c6c58db2d33390e890cb685537";
+          sha256 = "1isskh364klkvx7krxngx9fapf0qr41mzfl581admcl64b70x315";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme";
@@ -27261,8 +27385,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "f54790e5d4386b60b80d0c6f9e59db345839d7cc";
-          sha256 = "1x9wdahpdkqwqkipxl5m0sh8d59i389rdvrsyz57slpfd0hapkks";
+          rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b";
+          sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -27408,8 +27532,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "5737e59cbac9bc480546766c9502c527fa2be26f";
-          sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd";
+          rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3";
+          sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -27446,12 +27570,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20170206.1507";
+        version = "20170228.916";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "5737e59cbac9bc480546766c9502c527fa2be26f";
-          sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd";
+          rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3";
+          sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -27467,12 +27591,12 @@
     go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
     melpaBuild {
         pname = "go-playground";
-        version = "20170211.2";
+        version = "20170226.43";
         src = fetchFromGitHub {
           owner = "grafov";
           repo = "go-playground";
-          rev = "70437bc4348ef252e4788f867c86622aff670f91";
-          sha256 = "1mvldim8igbrnff80h0x7570bhhxa0pli84888wfylks30r9kg5x";
+          rev = "559d53bbc507394aaca3683325d17286637bf4f0";
+          sha256 = "04hxgi27cyhs07mb0wz21q11b1nxmfsx56gynxjc2gqj2wb5i086";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground";
@@ -27534,8 +27658,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "5737e59cbac9bc480546766c9502c527fa2be26f";
-          sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd";
+          rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3";
+          sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -27719,12 +27843,12 @@
     golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "golden-ratio-scroll-screen";
-        version = "20151211.230";
+        version = "20170223.1829";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "golden-ratio-scroll-screen";
-          rev = "585ca16851ac543da75d6ff61872565fb851a118";
-          sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm";
+          rev = "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791";
+          sha256 = "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/af044c4a28149362347c2477f0d8d0f8d1dc8c0d/recipes/golden-ratio-scroll-screen";
@@ -27744,8 +27868,8 @@
         src = fetchFromGitHub {
           owner = "golang";
           repo = "lint";
-          rev = "b8599f7d71e7fead76b25aeb919c0e2558672f4a";
-          sha256 = "0dlai5893607dirgwiw39zfmmp3iaswayym4gc1m4p7v9pvl7hx9";
+          rev = "cb00e5669539f047b2f4c53a421a01b0c8e172c6";
+          sha256 = "1wav8y5yps407znh0wspvcripbp2xjigqhzhgbv0adqsm9nyn70p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint";
@@ -27807,8 +27931,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "b282a74fea1455f4648d7f3098c954cce46e3a8d";
-          sha256 = "0q2vkzr2vvkvnb3zw3mzcggpa897adv1hq4sk1mcfav2s4zri9jk";
+          rev = "594d91bfbb8dfcbcac0f148af8175f2b7ec9857b";
+          sha256 = "14g48ml7qfj2kyw5id0gmfigkw5k3xbr7fm55wrh2m3v1hq3cnfi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28052,12 +28176,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170214.1211";
+        version = "20170227.1257";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "93064c0677521a409cfc701a9b6739ca2ee0a1f4";
-          sha256 = "1r28da357iggz6mw7cvizf41pap6wy76ma883zxa8cwpb7g5qfhb";
+          rev = "f4a3ffe52df6113f08a3c68e473ab6ff7dad28cf";
+          sha256 = "001fh4z65f75s22rchdkffv71jwwfcfsc3sclcf3h77cj66h9ma0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28094,12 +28218,12 @@
     grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grab-mac-link";
-        version = "20170211.619";
+        version = "20170228.1039";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "grab-mac-link.el";
-          rev = "e47faf9c190d694b8b19b99bc919db98e51e67d8";
-          sha256 = "1hkyd8mr2rrvkrm2rqmi2yb2way05jkxj3l6z3d8026l88rwiddy";
+          rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2";
+          sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -28461,10 +28585,10 @@
       }) {};
     grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "grep-plus";
-        version = "20170101.953";
+        version = "20170223.728";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/grep+.el";
-          sha256 = "13ivcicjdg3ig1jfgl2n39acmrwif5h7hwvb5677i7p8i69w3nds";
+          sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+";
@@ -28692,8 +28816,8 @@
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "guess-language.el";
-          rev = "89537dca05a72c0ad501856bbd3d12355d14a93d";
-          sha256 = "08r7bknp602zsjhq7zzm021xlf686zdnabgzshrnrpiiwfgqv7wy";
+          rev = "52e7623953dc1a76a24d1b8d261a7a1143fca903";
+          sha256 = "00bkpxfn60sq0vz3xh60fylhvx4ijj9l34qmy55z024f1plzmvwp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language";
@@ -28751,12 +28875,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170215.241";
+        version = "20170227.656";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "092ea5a157621c6ef3236dd00dc1230a0c7ffc05";
-          sha256 = "05ya8jny9j4amsmvgsnzpscbx8k7j016li5aikny7c12z4lf1n5d";
+          rev = "c11094293d250bd6299c4eeb4dc64af223124aa9";
+          sha256 = "0ya4zacfrv3hl317l78jrj491hag36i4ishh0gcrz602qqdgw531";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29234,12 +29358,12 @@
     haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20170210.1038";
+        version = "20170228.730";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "0f8eabf8c633df2539a158108a7c9083f894970f";
-          sha256 = "0a3iqsq6pdsifylydk1wqrf45y5j9r86imh5pac15r2p0xqg6p46";
+          rev = "74351e8a14e6e8e1cdb77a4b677065ab81d98d8b";
+          sha256 = "0h6xrng4qmfkafd77pg1svzcsz5law6rcif95050c03w3fvy4syn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29462,10 +29586,10 @@
       }) {};
     header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "header2";
-        version = "20170101.954";
+        version = "20170223.729";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/header2.el";
-          sha256 = "124cqzhhkaplq3nxlmy2dizpbllcazqbpv9k2yjxj5zk50s8dzxr";
+          sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d16829cb4dea98908735be13aa632bc13d308acb/recipes/header2";
@@ -29502,12 +29626,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170216.738";
+        version = "20170228.412";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "e991087781e17de415ead3dec0d3e67897b637f7";
-          sha256 = "0rar882mpaw48nvg6xdv69z3q5hd79y8dqqby65rrb6vh7hvjz77";
+          rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0";
+          sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29712,12 +29836,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20170124.940";
+        version = "20170227.608";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "6a6cef0668b86c88e629a817e1d13c4be45ad62a";
-          sha256 = "0wsh8b0m094di1bxm2vdnrdqhix1a1wcd5nj2crra678d70ad9g9";
+          rev = "c4fd39864d0c9f770426a93319b492942c81b1e6";
+          sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -30069,12 +30193,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170215.2338";
+        version = "20170301.12";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "e991087781e17de415ead3dec0d3e67897b637f7";
-          sha256 = "0rar882mpaw48nvg6xdv69z3q5hd79y8dqqby65rrb6vh7hvjz77";
+          rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0";
+          sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30153,12 +30277,12 @@
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "20161207.1232";
+        version = "20170221.638";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "b649ca44481e874146df8b88cc8750589dbdc232";
-          sha256 = "0wchzxfd16g7idlvfa1idqivv7m2nvnil94b2fx39q9zcs0qzw4f";
+          rev = "f07a77bd6ae6d8c933753f25526cbf3b71903e77";
+          sha256 = "0az1j68g0svynvag7p3x7l1rv4n6y1knkmfcjhcli4jwrkn720xr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash";
@@ -30888,12 +31012,12 @@
     helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-hunks";
-        version = "20161229.657";
+        version = "20170225.602";
         src = fetchFromGitHub {
           owner = "torgeir";
           repo = "helm-hunks.el";
-          rev = "aa266c87d5ac08f8a4021627d104972679bba21c";
-          sha256 = "1g7mr04mhf0cx68ww28zfppigjp9m4b11sc037gn770n1vm0xvcm";
+          rev = "1ea40753244ec843f38481b0889bb7d0e8db6619";
+          sha256 = "0lhzzm5z50zfhfvg7chrflgnjnmpr9k9w40s6yczpsfanqm96qp3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks";
@@ -31265,12 +31389,12 @@
     helm-notmuch = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, notmuch }:
     melpaBuild {
         pname = "helm-notmuch";
-        version = "20161127.2308";
+        version = "20170221.1208";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "helm-notmuch";
-          rev = "7d03cd9fed32b49a1f200c65ed38086c9f19cfaf";
-          sha256 = "10nx6wnd2vfqxv9zr8brml0l9mfx8rrid3lbqgs8wr9313ra3360";
+          rev = "aac6b3ee2142515dc3f4b59f242cdfa2b012118c";
+          sha256 = "10d2r9bksiq2v03fw6f44i30dk0hai12d1baygkci850m5n67irz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/98667b3aa43d3e0f6174eeef82acaf71d7019aac/recipes/helm-notmuch";
@@ -31433,12 +31557,12 @@
     helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }:
     melpaBuild {
         pname = "helm-perspeen";
-        version = "20170219.812";
+        version = "20170228.545";
         src = fetchFromGitHub {
           owner = "jimo1001";
           repo = "helm-perspeen";
-          rev = "aec145d5196aed1689563d138a2aa37b139e1759";
-          sha256 = "1wv13mvm9149nl9p93znl3d2yfnq4rph440ja07w804cd61qjhq9";
+          rev = "7fe2922d85608bfa9e18269fc44181428b8849ff";
+          sha256 = "1m89c95vzmhsvrg5g7ixz5a5ckw2n983x58cwh8rkmaklavacgsy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen";
@@ -32230,10 +32354,10 @@
       }) {};
     help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "help-fns-plus";
-        version = "20170101.959";
+        version = "20170223.733";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help-fns+.el";
-          sha256 = "14i48b139m7kp2qmmm8vfv359i74zmbjw1mck2n67xdxrh8bsk0k";
+          sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+";
@@ -32248,10 +32372,10 @@
       }) {};
     help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "help-mode-plus";
-        version = "20170101.1004";
+        version = "20170223.737";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help-mode+.el";
-          sha256 = "1aj53ihdhrxsncw14v4npgfsbpjnzmz481nx8xmzlcxs16xayyqv";
+          sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+";
@@ -32266,10 +32390,10 @@
       }) {};
     help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "help-plus";
-        version = "20170101.956";
+        version = "20170223.731";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/help+.el";
-          sha256 = "1k772rdakq2br8ahlk5l84s534wnb8jarlfhv4nbfaip6hidfqgk";
+          sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+";
@@ -32348,12 +32472,12 @@
     hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hexo";
-        version = "20160815.2246";
+        version = "20170228.615";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "hexo.el";
-          rev = "1ef35c70692e58b9c5d0ae52b00c058df99397ba";
-          sha256 = "0xvzbbsqdx6lqkcydc67iv56y0s7536574m2pnj7q52hbfidazf8";
+          rev = "fcc713565189eae4dc9f39ffd1944f4c192b512a";
+          sha256 = "0338j0wf5h3vxdrhsgdiqiczg97md3gapghabswpsk8r9k4nsjn1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -32368,10 +32492,10 @@
       }) {};
     hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hexrgb";
-        version = "20170101.1007";
+        version = "20170223.738";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hexrgb.el";
-          sha256 = "1cpf5kj49iam5bfw2mddv4c5vr8d4j0sipbzjry3s8jvcxw2lzbi";
+          sha256 = "0aijifwk7z9sl7wyl3qw649y2k8nk9qsv7dfaca0k42idh6ihswl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb";
@@ -32470,10 +32594,10 @@
       }) {};
     hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hide-comnt";
-        version = "20170116.1012";
+        version = "20170223.739";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hide-comnt.el";
-          sha256 = "1g58gvbh5qrfc5r1af2plxdc1ygd6rxspmhhdz9z8hbf172b8j62";
+          sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt";
@@ -32545,10 +32669,10 @@
       }) {};
     hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hideshowvis";
-        version = "20130824.500";
+        version = "20170227.1250";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hideshowvis.el";
-          sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6";
+          sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis";
@@ -32563,10 +32687,10 @@
       }) {};
     highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "highlight";
-        version = "20170101.1010";
+        version = "20170223.743";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight.el";
-          sha256 = "19mj1fw9hwqz5kybjbmac6l4gh8g52s1lgd01x34452zy69qdcnp";
+          sha256 = "05dsa2sfciajwagm1gzl3v2r199nl1yjnb6l0v8ria3f9d72yj5j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight";
@@ -32602,10 +32726,10 @@
       }) {};
     highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "highlight-chars";
-        version = "20170101.1008";
+        version = "20170223.740";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/highlight-chars.el";
-          sha256 = "0hkspc6skyra2lhrlg8wm008llmp4asxvxxkk6xbvlx3p0ajihjv";
+          sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars";
@@ -33178,10 +33302,10 @@
       }) {};
     hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-defined";
-        version = "20170101.1011";
+        version = "20170223.744";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-defined.el";
-          sha256 = "1m21l7hlk46pkpbzmglpkpigynsf8121dx8swslpbn0lck9wrg21";
+          sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined";
@@ -33217,10 +33341,10 @@
       }) {};
     hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-line-plus";
-        version = "20170101.1012";
+        version = "20170223.745";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-line+.el";
-          sha256 = "16mv6h2mx1z47nds4q2crym8idj9i6y9jbdsqbafxmzwp54hfl3p";
+          sha256 = "1dhrfbmh98y18xgsp42rx1qqcs296mpqqzzp3nr9rcqv4gvpllgp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d5d1cf2f29d46e8abd821095da86f137650a2ff/recipes/hl-line+";
@@ -33277,10 +33401,10 @@
       }) {};
     hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hl-spotlight";
-        version = "20170101.1013";
+        version = "20170223.746";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el";
-          sha256 = "0f16nalmz7pdrxmmxznqgbb8m7kkwfpf8a31r0b98wqrw8n5nnwg";
+          sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight";
@@ -33317,12 +33441,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170219.532";
+        version = "20170227.1018";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "6c1d1cd47ffa003c7b6fac9a0130f2401cab5dcb";
-          sha256 = "1idsw6hvrs5cjaz0sx4nfikv8md9mc4010245lpfhx4hn559c5k3";
+          rev = "c9d602b8d4947db2b759ecfe0a8b7bf81acec3bb";
+          sha256 = "14c1alab62y2d5qwzhp48dhcilwklph7597rgkpqniccd41b8wav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -35145,14 +35269,14 @@
         pname = "import-js";
         version = "20161220.508";
         src = fetchFromGitHub {
-          owner = "galooshi";
+          owner = "Galooshi";
           repo = "emacs-import-js";
           rev = "15d395126f57408d770a72db2e5f43271f90fa52";
           sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
-          sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
+          sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn";
           name = "import-js";
         };
         packageRequires = [ emacs grizzl ];
@@ -35206,12 +35330,12 @@
     indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "indent-guide";
-        version = "20170220.57";
+        version = "20170221.327";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "indent-guide";
-          rev = "92dd919f70b4d7398ae528123d035936c0ad9d05";
-          sha256 = "1jmb53kcl3x94raba8g5w0ys3dgrnam6a540i5jmxpc5z1vanskc";
+          rev = "d64f43011c72068e008621e620009ec592b35913";
+          sha256 = "1zjxfwbbmg95llpkvgbwdgk6cx7g9x48y3i4v75r8d4iy2xndgq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide";
@@ -35436,10 +35560,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170109.1240";
+        version = "20170227.1101";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "087svwy5s8pkvfmg5s1qk4vfg315fsvhqkdjq0pa3zavly3vm1kq";
+          sha256 = "1nh8l0ah2gqg3p8lg9z7zf2fzbzalrbrjkqgn30l48rkk58bmf4b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -35790,12 +35914,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170220.440";
+        version = "20170228.441";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "9d183b6eeeef274092127385b8e4075bde87ba78";
-          sha256 = "171as5lssfy1ccpn6hzvqbjs72cl62nifs45909df9782l3d0608";
+          rev = "e1c2c47e4ca6219c76b0ab3ee41dda27d3126d4a";
+          sha256 = "026i5wrg7gs9h9nw79fzmi0q9w9hrjbrl1h26569la15fqjvfs22";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36060,12 +36184,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170217.136";
+        version = "20170223.515";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "284ca00b48d8261106efc6c6ac128ebec608c86f";
-          sha256 = "0clpnv6byy8zxw0qlxmljbsx9zf4qag9i1lmzianczdpiba4pq9a";
+          rev = "75b356b357e63a03c04e194e85f1925f198363dc";
+          sha256 = "0fsg79ww3aqy0m46xjdr3783zwc6vnxknh4k2yrizmm44zvy925z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36348,12 +36472,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170217.605";
+        version = "20170225.351";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
-          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
+          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
+          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36369,12 +36493,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20170124.940";
+        version = "20170227.608";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "6a6cef0668b86c88e629a817e1d13c4be45ad62a";
-          sha256 = "0wsh8b0m094di1bxm2vdnrdqhix1a1wcd5nj2crra678d70ad9g9";
+          rev = "c4fd39864d0c9f770426a93319b492942c81b1e6";
+          sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -36436,8 +36560,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
-          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
+          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
+          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -36495,12 +36619,12 @@
     ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-rich";
-        version = "20170210.409";
+        version = "20170227.1745";
         src = fetchFromGitHub {
           owner = "yevgnen";
           repo = "ivy-rich";
-          rev = "4517ca22b462f5202d3959a11acbcd4b64d883b3";
-          sha256 = "0zy7scakd2hj0zggb41r3c9lh9y437121yjlha5mmlbd4zszdyxl";
+          rev = "ba15a2fb46a63f0aaf5e5b4dae026c2e1228ec1a";
+          sha256 = "1hkydyrcqv3qn605kjm8lhv2hpjmrjp7qvfxwyjbr878nhbm6jn0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich";
@@ -36682,12 +36806,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20161210.804";
+        version = "20170224.922";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "2bacd4da0b190547d2d767adfea1b3c4501710c0";
-          sha256 = "18r8rkcqrcizg884axf3d2zi9a6d5nlh1syn68l17yf2fi4mkkzw";
+          rev = "83ad172b96bb011bb705add136a7571b08f6c4c2";
+          sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -37018,12 +37142,12 @@
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20160406.1257";
+        version = "20170227.1420";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "b2ecf9bfad26a15afc75bfae1db097baa5c29f03";
-          sha256 = "1gns0y05kyxl2fcyiawgdx2hi0vslz97kvirbckg19id50cv9ac1";
+          rev = "3c5959de68117f5ebc622ba0a79caf7116c5b863";
+          sha256 = "09bmk1dw6h4cidrmfn6nmzj6lrfk39phngc11v7h0cwvxcbq6kpl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -37039,12 +37163,12 @@
     jdecomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jdecomp";
-        version = "20170212.2147";
+        version = "20170224.1400";
         src = fetchFromGitHub {
           owner = "xiongtx";
           repo = "jdecomp";
-          rev = "1590b06f139f036c1041e1ce5c0acccaa24b31a7";
-          sha256 = "0sb9vzn6cycys31r98kxwgpn7v9aw5ck86nkskmn9hhhkrfsabii";
+          rev = "692866abc83deedce62be8d6040cf24dda7fb7a8";
+          sha256 = "00l6mc643na97jrb0k595kwmfg8wc7m5iqjd9l9vvf3dal6389b8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d7725a5b3e2aa065cc6f9bac55575151cfdc7791/recipes/jdecomp";
@@ -37561,12 +37685,12 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20170202.1422";
+        version = "20170221.1636";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "faf73e8b6cfa9b896abde60cedd4cc69c9dfae19";
-          sha256 = "12las04bxp74w0pp1w8ri4mqv7kl48sz6dzqvq9xb50nz8y9bijy";
+          rev = "4787b5f2b8dbc1a8f8620c374402aa347e311527";
+          sha256 = "0zlmadvmyl9q8qlzs1i880slr4h800qq6zgqisa45nzychx8b07k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode";
@@ -38121,6 +38245,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaolin-theme";
+        version = "20170226.839";
+        src = fetchFromGitHub {
+          owner = "0rdy";
+          repo = "kaolin-theme";
+          rev = "697d437510ff38c22913f232a051a3620be68db5";
+          sha256 = "0c9l7pdklk8l7qfi6xvmmbj2cjaj2dwzfgzvblh0dc4hv32g4r9v";
+        };
+        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;
+        };
+      }) {};
     kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "kaomoji";
@@ -38608,8 +38753,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "bf1da4672ca848eee59ccf486e68f74157e45af1";
-          sha256 = "064nak7bkpzip03k81cz3fzjf1kn7vq2azcazhspn4i6f8xgfzb5";
+          rev = "b449bae54e4508f42f28cf1cba20e3ad849b1210";
+          sha256 = "1vr65dcyjisq61nq90qpxww0spz558ny7l2yis3hk9qg4zic58ky";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38688,12 +38833,12 @@
     kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }:
     melpaBuild {
         pname = "kodi-remote";
-        version = "20170206.1833";
+        version = "20170226.1627";
         src = fetchFromGitHub {
           owner = "spiderbit";
           repo = "kodi-remote.el";
-          rev = "f028d330e0220d7719f1504ad3b25bab9c1b8e4a";
-          sha256 = "0pmchrsw59ng8vilgml7ba5b17bwh0ac4b31s55nhy3f59l7y0d1";
+          rev = "60141505ca027231866f7032c557afd7d085b35f";
+          sha256 = "1c47p9zan4cifiaz097sc3sxq04inh5rqqc22p105x0jm0hykd93";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote";
@@ -39482,12 +39627,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170218.357";
+        version = "20170226.131";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "f2778f661ebfe1159aa632c987db7f46673aac14";
-          sha256 = "08p4nlh5f4bw65p75rlf6nxrbs5fv84l6fwvcl5frs6lng3a2s0s";
+          rev = "51ca421f52839c62c6b4ed4cc70d55701ca2afdb";
+          sha256 = "08v2mx80ihcs4v2ydf4ksb5yhbsp222wwzzx26xw70icahsx67y4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -39546,8 +39691,8 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "640ef0f7251ae23b43f6824bd4f116fa2ee16b9b";
-          sha256 = "067n6i4vvjldwrm2xif7qskbxy59aqz8jrkjniq4kv8jgpab9iwc";
+          rev = "69a2d1d410220a688ad169366d0d20e138e264f6";
+          sha256 = "0ky6dcvqprmaww5503q2y42vz5qls844xvb7yx2sl3czlm47riy0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode";
@@ -40172,12 +40317,12 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20170218.2328";
+        version = "20170225.2207";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "6e413e5692b38e5b7e3713cf0216b143c765cfc2";
-          sha256 = "0zsi0y2fhynj0qdvyds1vihzli4nw9ii0i5mksqki0v02jmaaygh";
+          rev = "0c253d6547008202c20eba2cb5649dd1f44b3126";
+          sha256 = "02wrf9mih1dx2xgzwc5465gb8ylm4i3y84x0y0bv1pk420y4iiav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode";
@@ -40259,8 +40404,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "3abe103b2e7d593974f7dff008d09139e1e5e030";
-          sha256 = "104qhhbgd68wrxyrlrywb7rsh095lg9hviyv3w8p6wymzfa9j2ms";
+          rev = "8d23745f59b90c6229cb58fb65ef8cf2725826ea";
+          sha256 = "184ir75pald2g3fkyhnrgff58n617fxj7q5qwjqcn759r59qhxma";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40485,12 +40630,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20170127.1107";
+        version = "20170226.1206";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "bbed5a7651042594340de7e15ac96150097f1555";
-          sha256 = "0iks3451x6nf2hhhw6nvnh4y9gigjp3rd38sp7m60vsz9ggmninh";
+          rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3";
+          sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -40629,12 +40774,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170118.2007";
+        version = "20170222.747";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "7f43aa9c669832f1c2f22a3f785f3cd05aacfe02";
-          sha256 = "0dfyyjvzh55cnm33w6gq841cbldki8yfzqpz37gs98zxy0wkc6kw";
+          rev = "81e58d62c5f480a876a06f67427150233c5c9d14";
+          sha256 = "0m0ly7ysp1wvy50jv4cykjgskd1wjm1sfqjpf75rhij6fq6cb87r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -40920,12 +41065,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170219.906";
+        version = "20170228.1717";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "35566abd2d21e6576dc2e33311c15977f5ba5667";
-          sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f";
+          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
+          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41099,8 +41244,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "35566abd2d21e6576dc2e33311c15977f5ba5667";
-          sha256 = "1z4w5vz6gqqsv05smqr6a4dwmicplw87z9hp08f7lm168jz3340f";
+          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
+          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41302,22 +41447,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
+    major-mode-icons = callPackage ({ all-the-icons, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "major-mode-icons";
-        version = "20170208.40";
+        version = "20170228.2314";
         src = fetchFromGitHub {
           owner = "stardiviner";
           repo = "major-mode-icons";
-          rev = "8773a4d01a77f0562373633692c8ded0305aa374";
-          sha256 = "1pqbqybv21j4a9h5spyv780khky80n5bwvh1dg9sqia47kf3z5ak";
+          rev = "e6117a236b2ad52e948576550b183053321dfc91";
+          sha256 = "0gpp9x23qz7ll8d7hlbvynv891hw907k38i7v0b08s8zh1ilvnwa";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons";
           sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95";
           name = "major-mode-icons";
         };
-        packageRequires = [ emacs powerline ];
+        packageRequires = [ all-the-icons emacs powerline ];
         meta = {
           homepage = "https://melpa.org/#/major-mode-icons";
           license = lib.licenses.free;
@@ -41347,12 +41492,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20170206.741";
+        version = "20170225.1000";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "c674b25e6b3eb7c848a62727e69bdafdc92a37be";
-          sha256 = "1qjcwvqbxl0iqlbwcisqmq2m3giwkm2sq5i2a5crrwhzxjasbbsj";
+          rev = "2df57246b6cf32b3af2d44ddd16b4a711eb49abd";
+          sha256 = "091lh50gf7xd2l737qb9mypbfabrjy7f0ry4d3rcb8ar2sqj58gd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -41774,12 +41919,12 @@
     markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
     melpaBuild {
         pname = "markdown-toc";
-        version = "20161214.1011";
+        version = "20170224.2350";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "markdown-toc";
-          rev = "c7a526c0cd2c3b2ecc7b36458c762e0a0b55909e";
-          sha256 = "1j35pmm9rk7zk5j6x0fzglx09hbm8csf07f0pc9fkvvyh1nqskxf";
+          rev = "0edc303871517da67483119f2b1969055e6e0608";
+          sha256 = "0fnb2qw7p5mmv9nbkjy2iw3whi40gxwxbdfwgadbypzk0yvh6a3v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc";
@@ -41942,12 +42087,12 @@
     math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "math-symbol-lists";
-        version = "20160302.1431";
+        version = "20170221.553";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "math-symbol-lists";
-          rev = "b540f67201e6e13e0e1dd97ceba3070a83e5649c";
-          sha256 = "0k1ayv0a9g778b50jni3hh70pg6axmq34wl8x3zgphadgms1w9dd";
+          rev = "1af8fdcab7941a62287c2d04b8876e1538f39c60";
+          sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists";
@@ -42252,12 +42397,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170219.1656";
+        version = "20170226.2008";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "bcbd1701745c2dc0b161fdf428f3db3887dfa48a";
-          sha256 = "1zs9b8ijwj7b61m3az4k5ch89siz4hy74adz9k4amaab9s6chzcf";
+          rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8";
+          sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -42438,12 +42583,12 @@
     merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "merlin";
-        version = "20161103.821";
+        version = "20170204.628";
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019";
-          sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc";
+          rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805";
+          sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -42481,8 +42626,8 @@
         src = fetchFromGitHub {
           owner = "legoscia";
           repo = "messages-are-flowing";
-          rev = "649061753b67b24c54a2eaadc8b3218cafae7376";
-          sha256 = "01y9cx5d5sqgvg97dzrnyi7m3yp0q3hm2yqcgknkp111afcgiwm7";
+          rev = "17a0d91658390ba8d38f325b3ece380e07e3cb49";
+          sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/275d537d9dab56e21d0d6d25a287ae9cbcc26d98/recipes/messages-are-flowing";
@@ -42940,14 +43085,14 @@
         pname = "minimal-theme";
         version = "20160608.322";
         src = fetchFromGitHub {
-          owner = "ikame";
+          owner = "anler";
           repo = "minimal-theme";
           rev = "430e0d3fc2044c16aa9f10961841febbd60df285";
           sha256 = "1rmcvdydgwppma1v2yajz6yzhns8bh3gdb09338jlk0nkp1akpfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/07609fd557b7e93875ad64488d2c638e48b34d68/recipes/minimal-theme";
-          sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/minimal-theme";
+          sha256 = "01dar95l7wjjqhbsknvsfbpvv41ka7iqd1fssckz18lgfqpb54bs";
           name = "minimal-theme";
         };
         packageRequires = [];
@@ -43159,12 +43304,12 @@
     mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mmm-mode";
-        version = "20150828.1716";
+        version = "20170220.1548";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "mmm-mode";
-          rev = "c9a857a638701482931ffaaee262b61ce53489f3";
-          sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9";
+          rev = "631e7f12d1641cb40e650134f35f2680a1a310a1";
+          sha256 = "0lwvh7f6hmjfdgidshqz25pihyd5bg87y23mbhkjb7qkdjas07wb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode";
@@ -43407,10 +43552,10 @@
       }) {};
     modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-posn";
-        version = "20170219.757";
+        version = "20170227.1124";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
-          sha256 = "1f3qdf2drdx0sv1rgcg87n4zhjlg8d9iaxzqgfz4qdjxhi1swg0z";
+          sha256 = "0glwnfgch9li5z6051ia3f61csl3f6aa1cwkwmw9w7saw4d6q3m1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -43426,12 +43571,12 @@
     modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modern-cpp-font-lock";
-        version = "20160622.1321";
+        version = "20170224.114";
         src = fetchFromGitHub {
           owner = "ludwigpacifici";
           repo = "modern-cpp-font-lock";
-          rev = "3e9c18b5a2ade485565f5191f12a724f1969dbb0";
-          sha256 = "0jg5yix4c18gvy5n4wsi7zg2sb7r0bw0xlmq0w15g3z63nhy69vc";
+          rev = "f1a4413c40e933b8b5b380860656b1ef5663f121";
+          sha256 = "0hb40cp33fpgfs4c5g8phhvv9mbykygybidh73pbrcacyiz4g6jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4bfc2386049adfe7a8e20da9b69fb73d6cb71387/recipes/modern-cpp-font-lock";
@@ -43552,12 +43697,12 @@
     monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monky";
-        version = "20160315.2051";
+        version = "20170224.921";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "monky";
-          rev = "988571711a350d0cedff8ff394c6ffa0e0042cc5";
-          sha256 = "1p9p0yp68wb7f1qf0c02fk7ayb7dw6gv57368ksa6nw76w58hhfm";
+          rev = "190079ea4d22a4e875a3b2892e58737344cb2b26";
+          sha256 = "01d7mbpkkb36lk6g9gkxlj3b58c23nqfmh7m5qq7xz90kd42316g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9b33d35e3004f3cc8a5c17aa1ee07dd21d2d46dc/recipes/monky";
@@ -44134,12 +44279,12 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20160909.918";
+        version = "20170220.2245";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "839cb7a9b9db150460d1e1b40fc7abcd61679011";
-          sha256 = "1kl0f9m3zs9nkkmzpbf4kddjmbvvg7psmv1hanlw5h3z3yy1m9x0";
+          rev = "38452683b2cb4448de13062d47264f9e9d35e7c8";
+          sha256 = "0mazixn55g0wcg541vj1wg2madczcy9r3ka38zfxnvj3jbf18cij";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert";
@@ -44257,11 +44402,11 @@
     multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-project";
-        version = "20170212.1130";
+        version = "20170221.232";
         src = fetchhg {
           url = "https://bitbucket.com/ellisvelo/multi-project";
-          rev = "7465189ae9ac";
-          sha256 = "1zgvg3gx283jgclqyl141p2nbrc21x775d4nnz9fp8bxz3gci7nk";
+          rev = "c04d5bdeb213";
+          sha256 = "1m4sjmbrc8rln8817b4nybbh1akphbl58i0pfl1ic515xn1g3by2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/multi-project";
@@ -45255,8 +45400,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "2f76c26353062ba6578914113ca26c53f5abcdb7";
-          sha256 = "1nn6kfg84g5aplis76q7r6wx74rj6r3n6kcdghvsyih77r4r32jl";
+          rev = "07683fa4850bba450d7853aacd181c44a9b57ea8";
+          sha256 = "1571sp3abdwzny3zph1alyam0a0vvi4h97g017r8bm2rj16r01fi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -45293,12 +45438,12 @@
     neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20170206.804";
+        version = "20170227.1731";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "ab9a1559d01857252b85d787666ea24a103003b4";
-          sha256 = "04473ay2hcpw696x9k2gh1dvj2h4nb898q4g3nf3b0rdg2cpb250";
+          rev = "75d8e8686ae479490a0e60d4ea96f989d7a18725";
+          sha256 = "10xc3hmm468rvjwmgyfg6zwwmki2bzlnnj61ch33m0hqrr8q6nl9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree";
@@ -45591,8 +45736,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "5789b692d4b0a74f5804a1dfdb4b1f429ab877ea";
-          sha256 = "1ri76jwvnh533ylnqh96dhqcpinj2r90b9vysyzm62ppzny7lkxp";
+          rev = "07808052461e9534dc42f7f98e83a7b58565fd13";
+          sha256 = "0ss34q1xmwbg5sswf3yfhi6h3pxpfbr3yvvcsz7w24brfd0zllkh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -45713,12 +45858,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170206.33";
+        version = "20170226.1130";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "1a6ca91e4a2cb48cccc989b6473191f42b606ab6";
-          sha256 = "1kd65x4bg9xrqp7241yxs352p2hiwa5hnggi2sw4718wcfbim1zw";
+          rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b";
+          sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -45878,11 +46023,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170127.1808";
+        version = "20170226.355";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "0e037c34dd4b7eb9be96e62e0ee18260291de1b2";
-          sha256 = "1vafbkmyk7gf7jnk70nypah1y2r0x43v9ki00bxdg51rh61fyhqx";
+          rev = "508b5c20fa38b17fa527af075857061f4ed81e2a";
+          sha256 = "0bjb539mqmjq9s2ks8pvq0ync9b19af48kx60vwgg4k0c7n03sab";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -46126,12 +46271,12 @@
     nv-delete-back = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nv-delete-back";
-        version = "20170213.1355";
+        version = "20170224.449";
         src = fetchFromGitHub {
           owner = "nivaca";
           repo = "nv-delete-back";
-          rev = "a977d0446a94aed12f7d01abe339fe01d55085cf";
-          sha256 = "1jfliyrp8wl9xz76lfpqgpcgxfhvf6cbrp2hf7ry5mk6iqwwnmd2";
+          rev = "44d506105989873dc1725e0cfc675925b35c9c98";
+          sha256 = "0lgz0sknnrxmc7iy4lniday1nwpz4q841c3w2hm72aiwn5z21h22";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a7bdc83e14be56f5848d3066686f5d24c2ed4a3c/recipes/nv-delete-back";
@@ -46270,6 +46415,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-async = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-async";
+        version = "20170216.2011";
+        src = fetchFromGitHub {
+          owner = "astahlman";
+          repo = "ob-async";
+          rev = "6bdb5b63ff4a8853d03805d7a7042213003a3dee";
+          sha256 = "1n4zc4nfv7hzilnb0qng6vh19dj4kq12gwsillj6c3i89gjz73wr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/e1b0ca3a2da727e2f521dacd2fa9fa79ca03f7e2/recipes/ob-async";
+          sha256 = "0pra4lvvkdyn7agcgdjsk5dhis78pnvdfk3s5ivbaki70yi71aia";
+          name = "ob-async";
+        };
+        packageRequires = [ async org ];
+        meta = {
+          homepage = "https://melpa.org/#/ob-async";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-axiom";
@@ -47767,12 +47933,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170214.734";
+        version = "20170228.1156";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "3854459ba0356be7385cfc707eb33fab7d1baf41";
-          sha256 = "1k30djkyah6qpkb09a9pid091agkvq97vf5idscjjxxpdjyglcj6";
+          rev = "346140fcd727964dbac623dde856addb08d9ddd3";
+          sha256 = "04ax2c6rg197i6is24gfm7cwdgkr98ic5r8x5h4dlqkr36f43f9m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -48417,12 +48583,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "20170207.2145";
+        version = "20170224.1951";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "e665315fc041851e19c759e51173f9ddc0445512";
-          sha256 = "0fgir67cm6gmwj80gmhblg9j7pp6qvkksm9qnsdj2r5q1c9s33kc";
+          rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da";
+          sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -48438,12 +48604,12 @@
     org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-journal";
-        version = "20170126.234";
+        version = "20170221.612";
         src = fetchFromGitHub {
           owner = "bastibe";
           repo = "org-journal";
-          rev = "3f29a64655cd03c662fa24ff687e5ed29d6bdd9e";
-          sha256 = "1a5z726hfaimjhidxskw7fr89hc3i0wl5hmpk8x64q87an0mkcmi";
+          rev = "30ca909d50737d32b3790c57fd2e13915fccfe97";
+          sha256 = "0j60ka5klx97swa20ldcm1y8rs5ib0jc0zz3vavhgdg0nhc7w69p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal";
@@ -48504,8 +48670,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f5722944575dc83b1e12c730b2887c584fd523d7";
-          sha256 = "16sdfzlk522yiz45brnk7kzkrnp4b9cwknl7q4nhpa5awz22ny15";
+          rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee";
+          sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48524,8 +48690,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f5722944575dc83b1e12c730b2887c584fd523d7";
-          sha256 = "16sdfzlk522yiz45brnk7kzkrnp4b9cwknl7q4nhpa5awz22ny15";
+          rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee";
+          sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48911,12 +49077,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170217.1354";
+        version = "20170228.1517";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "6a13b566b1272773921b76bc6142fb2cf243bc7e";
-          sha256 = "1n125f2r3g5lkypk02cz5mfyhywlm8q5cnlh4h2rs5vdx39kpji8";
+          rev = "4977d1d519cfb9cfcdb1f72010097188de5766c8";
+          sha256 = "17nxsa5yzkawnff1ibfn21qwd3w5awvky0ywjdwh3mm2jg3r7sfz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49068,12 +49234,12 @@
     org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-table-sticky-header";
-        version = "20170216.2216";
+        version = "20170227.1242";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org-table-sticky-header";
-          rev = "a47f67927cdd66a0bd44bd45d41bd74c97c5d873";
-          sha256 = "1wxqlccbfywik5fj79clv781g41aialpi3xwbibx8m6p4h51rlrl";
+          rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043";
+          sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
@@ -49233,29 +49399,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
+    org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "20160604.645";
+        version = "20170225.1247";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "dfb98150207b13c7771d0c0b8209e0503cd99cd6";
-          sha256 = "1d2bi29m8kxhp46slg904frgmlc6ajqagxjrhxlbdmlxrp18s44g";
+          rev = "32dd866e830836a72a3b96b96e0d00d044d0eaf7";
+          sha256 = "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
-        packageRequires = [
-          dash
-          dash-functional
-          deferred
-          emacs
-          request-deferred
-          s
-        ];
+        packageRequires = [ dash dash-functional deferred request-deferred s ];
         meta = {
           homepage = "https://melpa.org/#/org-trello";
           license = lib.licenses.free;
@@ -49411,12 +49570,12 @@
     org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org2jekyll";
-        version = "20160519.1004";
+        version = "20170225.115";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "org2jekyll";
-          rev = "991c995715ecad0454d0402f43a5161a3954b7f7";
-          sha256 = "1gdv1dwmwhmpcpcvf8fmsjg3mli3l27inlql13m98h7vpv7rzqvb";
+          rev = "52a19a5d372116262b9d613f4ec8490a3b49e329";
+          sha256 = "14ld8ip487282if2sil96lfg5wx7632kg71sxhafygphbdl9vxd4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/48a1e5bd5e338bd3593f004f95b6fbb12595bfb7/recipes/org2jekyll";
@@ -50045,8 +50204,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "b3d9d6310a411ada0212c702a75f32dc2f7743a1";
-          sha256 = "1hllqlh89y4cn7jx72bxljvvys6avgnq2qb2543q8iabh1jj4q2m";
+          rev = "6a642cdc7e98cc8f0e80474ac7172cea4f8889f3";
+          sha256 = "11304vs5wvi0p5v3yvqn463ablm4cc5zk6xli37m08yd8ifgh2q9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50605,22 +50764,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-utils";
-        version = "20161125.930";
+        version = "20170222.2352";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "package-utils";
-          rev = "1ad19f3a9de68ae68e6dd2d4dad31532b4de1700";
-          sha256 = "04ckdz80paj1dz1q659cgm7hkdh828ckxlch6iq18abr1ijzl8vm";
+          rev = "4ee0d996d4c1a6fed0689361bd9524661339ebdd";
+          sha256 = "0a1wvjlr176dbkqgf44f0iwvx865wl2isns36gllcq5fsh4g1q1c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
-        packageRequires = [ async ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/package-utils";
           license = lib.licenses.free;
@@ -51236,8 +51395,8 @@
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "77f1384a6321eef06265ea5e5b11eabdc53ab720";
-          sha256 = "0b4qlbrz6g39x1p89lx3xk4h7159jj14rf6mgsyv1fasc7yyxxiz";
+          rev = "20081b546f371dcaee9ea2769f46e513bb39c275";
+          sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -51693,12 +51852,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170130.300";
+        version = "20170228.2312";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "3a32d2420cc40ed864215f75aae4f6d868dc1cd2";
-          sha256 = "15j8ll2rna5f0a4zq2bflbn888c6yp852i405qlcxcjvs3jalxcy";
+          rev = "7cca03bd2fc534a6b42eafc2afef20099bf83dbf";
+          sha256 = "05m282b4n2pgj3qgmdms8i8yxb2h2sdlvd7r9xlfp3j5xb35pk27";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -51965,12 +52124,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170123.1056";
+        version = "20170209.658";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "70290b60fd20850c728a63d763037fac69fd1874";
-          sha256 = "1dw17m0dczry3chyw3yks33jqzr7zgccx3xdjv0lziwfxdnwkaji";
+          rev = "cd1ecbddf42542a3f5e161c954439c6dba70f53c";
+          sha256 = "0q3lhppwr0515qq6l08ypxffpp4jf3y2v1giyxwpmfcnbiwxicnc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -52028,12 +52187,12 @@
     perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "perspeen";
-        version = "20170205.300";
+        version = "20170221.1910";
         src = fetchFromGitHub {
           owner = "seudut";
           repo = "perspeen";
-          rev = "8fc32cf57fe8f38bf47e8bce99058ba3cc2561ad";
-          sha256 = "1n69jshs35cafx6p7ibdr1mqzbp2k1gdknb1k9f9nfzasr0nma56";
+          rev = "cca16ec338454acbad26f4d1d57a463a034bdd44";
+          sha256 = "078mfmky682hbjkdxkawimxddzc2laz6xqrcpi1dli1vzgpkx7p9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
@@ -52427,12 +52586,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170201.1842";
+        version = "20170220.1707";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "2a335398928a4fdab24335ed7aceed95c1bd0871";
-          sha256 = "0i8ns9jncih3s33wv66gkd45brixlc4smbssb3j47dqp3drpn0nw";
+          rev = "aa69d062ea91e03ad84a378ed4f71c63846027d9";
+          sha256 = "0xpdzv2vigidnqv2pl9g614cqd8xykyln84pksifx2ldjbcs9xsc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -53773,6 +53932,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    prassee-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prassee-theme";
+        version = "20170228.618";
+        src = fetchFromGitHub {
+          owner = "prassee";
+          repo = "prassee-emacs-theme";
+          rev = "5c95639cf397b6cae5b0b37e462bd370296f84b2";
+          sha256 = "0qyzfw7qxy6jb1qv93a6dvylji62yi06wvi8bqaxjsqf0a3zhb32";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
+          sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs";
+          name = "prassee-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/prassee-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     preproc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "preproc-font-lock";
@@ -54211,12 +54391,12 @@
     projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170106.606";
+        version = "20170225.2320";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "cdf9c228ccdcb57b73184f10ea3f1e2e4e03d320";
-          sha256 = "02md2hmf21w03xc8imqmcbhildnkj9s69pig1zd9nbs1svgqbycp";
+          rev = "d9cc453b9e11c9b2f03413e3075e063a6143af69";
+          sha256 = "1zam1avzb5dcv0icjd8vs1p7k24szqx1n4b7qr17pikyvjz4g0xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
@@ -54614,8 +54794,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "a9ab38c17178fcedd9b46c09fa33f94d1a6335c3";
-          sha256 = "0rhwxpbb328ivndnck5dcgwi8g4a8lrdvbsc4vcjhxc2yrfm93q8";
+          rev = "5274d6ee314a237f6626b5b4633c9f87574ad46d";
+          sha256 = "0rjxp15xnj8hd39z6nzjdxypj7fgi6rpmfcbjmx5xqah4gbcbpnc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -54895,14 +55075,14 @@
         pname = "purple-haze-theme";
         version = "20141014.1929";
         src = fetchFromGitHub {
-          owner = "jasonm23";
+          owner = "emacsfodder";
           repo = "emacs-purple-haze-theme";
           rev = "3e245cbef7cd09e6b3ee124963e372a04e9a6485";
           sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/1bacdfc5c14c16f60da5f57f41eb3859345d9f62/recipes/purple-haze-theme";
-          sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/purple-haze-theme";
+          sha256 = "1rvfpm3zkhdv3ikc8pqqngf9pi0niwyi52pg8dq8i056nwc5bk9z";
           name = "purple-haze-theme";
         };
         packageRequires = [ emacs ];
@@ -55357,8 +55537,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "0d3b4a72b585b34cc12cb95eaf62ca3d13173a9e";
-          sha256 = "1nrz534rb8lkrb1ch7804i8r0gxrjbwim90j7pzsinqfl21xg5p2";
+          rev = "56daa5c3a0d2d6592c673c2932c354b68679997f";
+          sha256 = "0h1d069hd6kk0z05x8454km3sx4bwab3gv860v5a7cf79ahx2k5q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -55588,8 +55768,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pythonic";
-          rev = "0279cbc8e7fba8900060da0d1be4fae7404109b8";
-          sha256 = "16sp3mg5jzx89lgr3kr61fqw1p9gc5zxq2mi9rpgqi5hkkcpnpgj";
+          rev = "87475def246b84339f464e80c76c7e7fcc2e780a";
+          sha256 = "1j93c4rx7llyfvfvvvcrcpsj47zb56kkdii1lnyzay4n5zakhjhf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5589c55d459f15717914061d0f0f4caa32caa13c/recipes/pythonic";
@@ -55605,12 +55785,12 @@
     pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyvenv";
-        version = "20170211.456";
+        version = "20170224.538";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "3fd0fad48cfdc978b3cbc2da56b26af0e33dd94c";
-          sha256 = "09mqkqdp615c689qz71q94ynyysiz4qc280cvznp6k4w28nskbwf";
+          rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55";
+          sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -55815,12 +55995,12 @@
     quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20170129.650";
+        version = "20170222.1715";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "572869b70f8987306f4d938badf37bbf5c08b518";
-          sha256 = "0zw3hyydqs616r96snns5mwxcn2il5hldiy8jpbyqh32mlam8w8f";
+          rev = "55bbe5d54b80206ea5a60bf2f58eb6368b2c8201";
+          sha256 = "1skbd5q99d9rwfi954r9p7b7nhwcfijq30z0fpdhbi1iiabf7vqz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun";
@@ -55899,12 +56079,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170203.1014";
+        version = "20170226.1906";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "d010a865355e9014f1a897de587cacbb6cf23aa4";
-          sha256 = "1n15vnq21kym4ani61pf35a80kmp3i17hfn1dj7ayx5q2ifi0qi7";
+          rev = "c50cd48edc74348bd89b09661ea325dac12fcb48";
+          sha256 = "1vxplnnp751lp4nm2vqdysr9b1ksqykrn6l02dn2priyy5hh29k4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -57161,8 +57341,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "relative-buffers";
-          rev = "88c24259ed62b85adff6850e34bbbe844caddccf";
-          sha256 = "0100maanb1v0hl4pj8ykzlqpr3cvs6ldak5japndm5yngzp6m8ks";
+          rev = "2547475084244d266b507e563c9b4034705cfeca";
+          sha256 = "16m4qyjg0ca1j944ra1qhhg9ks3sk0rv5ax59rqga20l8wf6k0jq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ab22cea99fbee937bbd6e8fbc8bd27967aeaa8a5/recipes/relative-buffers";
@@ -57283,12 +57463,12 @@
     replace-from-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "replace-from-region";
-        version = "20161203.1306";
+        version = "20170227.1516";
         src = fetchFromGitHub {
           owner = "rubikitch";
           repo = "replace-from-region";
-          rev = "959ab7b2e2f19f3b559fd1228597530ce0694d7c";
-          sha256 = "0xmslc7r0lsi7566ajrr9sqvzmfp7qjgfg13pf6n63rb3rsk72ny";
+          rev = "dc9318b9b2822da7b00ecc34d1dc965c8f96c9bb";
+          sha256 = "05l0wn1gqw2sbl65s1m7afmg3b1ps2qgqqrjkl9r2i26p95kqlq3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/replace-from-region";
@@ -57511,12 +57691,12 @@
     restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restart-emacs";
-        version = "20161108.2239";
+        version = "20170220.2245";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "dc28874f47fe47e6891803fd3a483f9577b65ee9";
-          sha256 = "029y18bzk9ld2ig9666idsrig1wmnswavcj8rilxw5f8wkrh38wg";
+          rev = "56f877fe86373df3eb048ac96d6deef7b9f60892";
+          sha256 = "1v4yvkp4f3rg8gi01y1gsfn7sikx4c3w0gisc3kdb3rs9kf1p8dd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -57929,8 +58109,8 @@
         src = fetchFromGitHub {
           owner = "felipeochoa";
           repo = "rjsx-mode";
-          rev = "20c7bd0e704dfc1c391edf78765c8b0ec4f5b3c0";
-          sha256 = "142zihjqgdq4bfy1hp0pz6k109ngii4kyc8xrdvd9yvzc0y5vp8a";
+          rev = "276be756cdf3cbaf23198e5f19ce7daa7bc2b6e8";
+          sha256 = "0lhwkgk3n36kd6rzvnj6h5xcp5wwa4yczri0274a7ch5gz2jdhhz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode";
@@ -58135,12 +58315,12 @@
     rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "rspec-mode";
-        version = "20170125.732";
+        version = "20170225.12";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "2096d8c7c98aeb19eeb028082d4c9374168971d1";
-          sha256 = "1xlxpnhs9k2pch6abkgblr18j8k41wbzyn1k86jl3ka72vmv4wlm";
+          rev = "159afaf630be5fb13b3b0762f4c42ae6699dd143";
+          sha256 = "0pm0zzk7sdzvk3zwlqpkq5pg6p3kkny9a8104fpyszvd3f2ygsk2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -58156,12 +58336,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170121.2345";
+        version = "20170228.842";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "37eef2838ea78b7e457e7236af93cd1581a63492";
-          sha256 = "097niszwri76g5sbwh4hnsv27wk1nfqd7gpx974rh1bwfk735jxg";
+          rev = "3adf4a22eb4eeede241dd5a7389254f9c8a755fa";
+          sha256 = "1g9h9d5x8pcm2m66dljwr4l6gqm013ll1fwy4yjhmy5mkmavn5hi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -58222,7 +58402,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57668";
+          rev = "57752";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58302,7 +58482,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57668";
+          rev = "57752";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58844,12 +59024,12 @@
     save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "save-visited-files";
-        version = "20170215.1537";
+        version = "20170228.2250";
         src = fetchFromGitHub {
           owner = "nflath";
           repo = "save-visited-files";
-          rev = "fd5f53256a81e57f438f37a6088862d7555a8aaa";
-          sha256 = "0vf1b3x7s4w0szvf9vkgj9dqivfvzgx3pwznvd9s1n7fxk70ghsn";
+          rev = "33e8d223f622001f5792c52d8b36661e46b5834c";
+          sha256 = "1lf03fhmgjz1pixfahdm3cbqs5vbp6bk4qgm2xkm51vzmp39hfim";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f5979e2c2dbfc4e8e3b4d2881cf860c26f63db5/recipes/save-visited-files";
@@ -58932,8 +59112,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "56d73a422a61dae4bb18fc0c89b53647cfe90e81";
-          sha256 = "1f8labhw1a224hmh71b1lv0i2m6ynga4lqwali83a0214hnksyh7";
+          rev = "7d205e730d3f1d00058203111b0f016a2371879d";
+          sha256 = "04l27yz2n88hmqifxpjl181wc13d39ybx31zb9xci0s7mvhkfkak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -59613,12 +59793,12 @@
     selected = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selected";
-        version = "20170217.1106";
+        version = "20170222.34";
         src = fetchFromGitHub {
           owner = "Kungsgeten";
           repo = "selected.el";
-          rev = "478dc7a8b04819f9a7ba809b3ee6080450e32bb4";
-          sha256 = "0xr7vgm7yr86vrx75z4q3az7npn8n5ar4wr5w27m8cij0mvaw831";
+          rev = "03edaeac90bc6000d263f03be3d889b4685e1bf7";
+          sha256 = "1d72vw1dcxnyir7vymr3cfxal5dndm1pmm192aa9bcyrcg7aq39g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/selected";
@@ -59924,12 +60104,12 @@
     sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sexy-monochrome-theme";
-        version = "20160915.353";
+        version = "20170225.346";
         src = fetchFromGitHub {
           owner = "nuncostans";
           repo = "sexy-monochrome-theme";
-          rev = "87bea99be5fe4f2395bec1c6ee7f81794c3f6695";
-          sha256 = "0gyh9kfj76wxajrbdi3q0cii9giyn2gbfdsgnrgvh1cv96cqbm6i";
+          rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1";
+          sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@@ -60125,22 +60305,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "20161127.623";
+        version = "20170223.222";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "788250f22a4e652407eef117f19d6f4b56d7f919";
-          sha256 = "0dd4hxbw6q9fazdjqdlfvv2g7fggmfhfmmy9ncipy4v8yd2d74pn";
+          rev = "9429e538121c2613177848dc97b73d08f6fb4a42";
+          sha256 = "0zfbsg0vgkc9bpzm3mlkqz4gpjlai81c49g0m55zwkmvqshlsrch";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/shell-pop";
           license = lib.licenses.free;
@@ -60316,11 +60496,11 @@
       }) {};
     shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "shimbun";
-        version = "20170203.647";
+        version = "20170301.255";
         src = fetchcvs {
           cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
           module = "emacs-w3m";
-          sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453";
+          sha256 = "b861237e76035df9e806681dee0f58680d9e68e773cc5e3c65dd513e127f4240";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun";
@@ -61021,12 +61201,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170218.2336";
+        version = "20170228.602";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "0927080970374a1f8591fa412ae2b3201f5a7d18";
-          sha256 = "0zcchsanjggdlczl9wrq6lb809rsx0iwlnb5qn3aplp7178imrxb";
+          rev = "3bd88ab8cb9d8deae4ad965156de87245538f29e";
+          sha256 = "15d0g3d3nj7q7qadm0blfnhaagxzd20a6lhsy6wv788qvq4fcq4j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -61752,12 +61932,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170209.246";
+        version = "20170227.318";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "290ce9f63b9fa07e1a7514ccb9abb6aaf98ab045";
-          sha256 = "02cchakanr8zlvahdrrgm9rnqa49wqfvc4g90g7nwwqifdhr5njs";
+          rev = "67b1a1dbdfd2285f8a04a50a0fb006978e21727c";
+          sha256 = "121wa1capjhrssqp2vaaf359jjsm23si3m4shmsi7n1hdvdjirrw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -62108,12 +62288,12 @@
     snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20161123.2130";
+        version = "20170226.1852";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "e4a0916d3b60dc4b7e98db59a2c2e2db4bb71fea";
-          sha256 = "1463949imwyg3kd4988fz38i472lppvphga0qinn27ddwkrf0v0s";
+          rev = "6f2c034f1ec557c9e7e624cfd53e8ebb997376ab";
+          sha256 = "0255lh2r73h84kks3h7pfr8242q86kb8qrv8sm6dwv9jcbjp094n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode";
@@ -62341,14 +62521,14 @@
         pname = "soothe-theme";
         version = "20141027.741";
         src = fetchFromGitHub {
-          owner = "jasonm23";
+          owner = "emacsfodder";
           repo = "emacs-soothe-theme";
           rev = "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b";
           sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/a63de796e73d255b89b7f311e4ad51645eeb39fc/recipes/soothe-theme";
-          sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/soothe-theme";
+          sha256 = "124akv3a4q4vrmprdcjmq7rq6x73mz4wqxvnlczglh9vjl39ndbk";
           name = "soothe-theme";
         };
         packageRequires = [ emacs ];
@@ -62640,12 +62820,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170217.1753";
+        version = "20170226.405";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "dbe5eb19a1b3267b87b59f7082b3a618df6024f2";
-          sha256 = "03cgx82kpdl0g193wi38gb5k6y28dllrz6wln910555s3rymym29";
+          rev = "c45aa258dcc7427082f1bb253964d82967c24072";
+          sha256 = "1blpg7d8bkpgagxbqkb9sm0jcdrba7l1dmm0z2h1nlrx4n66p4vm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -63281,12 +63461,12 @@
     srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "srefactor";
-        version = "20161130.2112";
+        version = "20170223.540";
         src = fetchFromGitHub {
           owner = "tuhdo";
           repo = "semantic-refactor";
-          rev = "8707d93ede4b45c6173641d3482b0d8ffbbeb860";
-          sha256 = "1k4jsklaqmzg6lmrb1sgkwrqpl3qvycqxqdfc129vrg4gybhsavz";
+          rev = "531753fdc24570a1341c169f36b9fa0d4c09ff42";
+          sha256 = "1rn89sznfyzjn3gpk18h8qassc7d1cchk8b7lz7rhc9zrdl6qsha";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23115ab231ab108678608f2ad0a864f896cd0f2/recipes/srefactor";
@@ -63640,8 +63820,8 @@
         version = "20140213.348";
         src = fetchgit {
           url = "git://repo.or.cz/stgit.git";
-          rev = "0accbea79b9cae8dae68ff64d35fd342792c15dc";
-          sha256 = "13ab7k0c5az712ph2a879da84mwijvb1mxzn59cv3xkriabndk4p";
+          rev = "90d50ad4a78c06f99fbf185aeb3322d1502a016e";
+          sha256 = "0gh15q04dl0cgnabxjr3sgzkm31m9ls3r0d9ha7vs710wiffpbqx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit";
@@ -64031,8 +64211,8 @@
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "sublimity";
-          rev = "02a477004b8807984b5f752fa225f1e7bb6f90ab";
-          sha256 = "1dc3kkq931nwa7p26dgrdgqhi110h6ilmch00300gh0m0wx9031d";
+          rev = "033c7c04e47e7666afd125a72467c3eb657732d9";
+          sha256 = "073c4bbxkmq7cifzwn933qxkqvklcbg3gh9vm5hr3af9j7vpx2ac";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity";
@@ -64339,13 +64519,13 @@
         version = "20161109.1215";
         src = fetchFromGitHub {
           owner = "TheSuspiciousWombat";
-          repo = "suscolors-emacs";
+          repo = "SusColors-emacs";
           rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889";
           sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/100c3244cfce8691240b11bc8a1d95ede3aae4fe/recipes/suscolors-theme";
-          sha256 = "08sh20lmhqzpxb55nmqwsfv4xd6sjirh592in7s6vl52r3hl0jkh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme";
+          sha256 = "0j8yfl3yglp9kfdpbmfj3jw7npc6nlqw48cchiczh4biry204lbw";
           name = "suscolors-theme";
         };
         packageRequires = [];
@@ -64501,12 +64681,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20170205.348";
+        version = "20170224.1825";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "75cbae223fbf84d19e14a7f7734ded4f46078654";
-          sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny";
+          rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a";
+          sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -64543,12 +64723,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170217.57";
+        version = "20170225.356";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "950545ba0e0bde6b4662aa769f60ac3c768ffeb2";
-          sha256 = "0mq1id9xv4rn13y95n98pyywgrll2yb69v1cqacq8rq7my08awsq";
+          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
+          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -64690,12 +64870,12 @@
     symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "symon";
-        version = "20160514.1904";
+        version = "20170224.33";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "symon";
-          rev = "7beeedd70dc37f5904c781fb697c8df056196ee9";
-          sha256 = "1q7di9s8k710nx98wnqnbkkhdimrn0jf6z4xkm4c78l6s5idjwlz";
+          rev = "8dd8b6df49b03cd7d31b85aedbe9dd08fb922335";
+          sha256 = "1bbblz9qzc84h08010y48mjyciavl6lnxk2m19mwbc6b5y58vwpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f4bbc6b3d7b2e2a9fbe7ff7f1d47cda9c859cc0/recipes/symon";
@@ -65382,8 +65562,8 @@
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "tco.el";
-          rev = "722eef5591303f118c1e79be6993ef4c90de7b46";
-          sha256 = "0vf29cgbc7wirj077hr2fvzps5vq3cr888ksa5il74xlz4vk1yb3";
+          rev = "97529ed7a0939c51ce0084c0aa8b12b313654735";
+          sha256 = "1s8lw38d43c06w6q88h1kf480zvxzjzxmb426zb9rral61m1f0dl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca33f97f0394585c8ccb31cab0ee776d1655907c/recipes/tco";
@@ -65781,8 +65961,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "tern-django";
-          rev = "b6a884609047ba49976d5bb6b150f17d3d956d5b";
-          sha256 = "00nv6j18s6983raajfcrxfg5rfz68cgf88zrdp7fhf9l0iicim1q";
+          rev = "46f2cd5e96bc804069f18455a828b8e4c5ec358a";
+          sha256 = "0b1279i05qmk85zgdd1qy0r823ajg7fxzi62qlhd7l03wivlbkc0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e9e128a795e4949e3d4c2f01db0161a34935f635/recipes/tern-django";
@@ -66211,8 +66391,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "bc0082e02357de2f30b997188bdfa94d703331f4";
-          sha256 = "02g4pl8vsrgzcc6p934lsq1qqxlmgck1dw387il17gwmbz467zb0";
+          rev = "c89e172289129a0a700a20f11f4a157b7da789d2";
+          sha256 = "1dmvi4919b5x3j22vxbpp4pyfmx7iz34xra0ai003dv2crb2qb2z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -66268,12 +66448,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170220.157";
+        version = "20170301.418";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "35686d79a2603693d855a55c56f9486b8af89b20";
-          sha256 = "1srcrr9bzvngkp0hy5cbiv34gip55c3f4nzfi0l5l1jam96bczs8";
+          rev = "624406228042ded6cf427a179eccbdb8ce1392d6";
+          sha256 = "0xb7nxy8pkvc4p2wcps26hs04pv35qdizfc1bqv59527gqpixd57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67000,8 +67180,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "a9df12a6e2f2c8e940722e151829d5dcf980c902";
-          sha256 = "00rdv0dij1d21jddw73iikc4vcx7hi1bi85b25hj1jx36nx4m16c";
+          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
+          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -67242,12 +67422,12 @@
     trr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "trr";
-        version = "20160620.1505";
+        version = "20170221.42";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "emacs-trr";
-          rev = "8c63eaae802066bdce9976fe195a445051f2dda9";
-          sha256 = "0pcny9rfzvsn82n0ryhfpc9gn4jy1cg0nb467xcckgv6pcxzsf2g";
+          rev = "83660d8343ef3367837354dc684dfdde2f95826a";
+          sha256 = "0h12szq1cww3bpsk09m7d2bk9bfjxrmzlw9ccviwhnric40nh67k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56fa3c0b65e4e300f01804df7779ba6f1cb18cec/recipes/trr";
@@ -67284,12 +67464,12 @@
     try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "try";
-        version = "20160226.730";
+        version = "20170226.805";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Try";
-          rev = "f5a930105e81826682cd71ff3f23e5fcb5502e30";
-          sha256 = "0gvwavsq9s4a75qz7xq9wl219fnzz085zjqpnrxxgmaqbi9m8l7a";
+          rev = "271b0a362cadf44d0694628b9e213f54516ef913";
+          sha256 = "1fvpi02c6awyrwg2yqjapvcv4132qvmvd9bkbwpjmndxpicsann3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13c0ed40ad02fa0893cbf4dd9617dccb624f064b/recipes/try";
@@ -67387,12 +67567,12 @@
     tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tuareg";
-        version = "20170212.139";
+        version = "20170221.1141";
         src = fetchFromGitHub {
           owner = "ocaml";
           repo = "tuareg";
-          rev = "0148e6d3c780e3914a5732fdd0201100394a2dbf";
-          sha256 = "1wmfnjkmxf0z7hadzgmv1s3fpk49rc9h1vxkj2c8s2xpz8ymck42";
+          rev = "f242fe45dc47aab8fe69392304ebc2c779c411e0";
+          sha256 = "07lz7s7z913h0mvmjnvvg9m36pc5r9nrg1a6z2wxszbccjvkz95b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg";
@@ -67643,8 +67823,8 @@
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "f72826e564dc9d7b60dd9df3c6337f33b02560bf";
-          sha256 = "1mhsznkg7hnhb7ypbx0ljg3scawz6dsa5l2vaapb51akaf87a267";
+          rev = "3b0ace2a710cbe0a47617a2e4650f593c7282385";
+          sha256 = "15rghh1k657hiahaqb6isrxs1bwys220r0fzk7fxhv8jfbmb2a12";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -67843,12 +68023,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170220.116";
+        version = "20170227.23";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "b8a3c13978ba6d0043b263f8efe829bb87145e25";
-          sha256 = "16v6m9q1hw7wkp9si43h4chjabygqpx90ds45lq9k0r3lx9vsmd6";
+          rev = "c066af10ac41d2c459e113c5932ef6844193e7e5";
+          sha256 = "0jlcyrmmrg5nchcr91lc6x0hl7wlip0nfyy9qbda4nalkv5xgphy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68817,8 +68997,8 @@
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "c32fe46ad8362b4d918e194cca5ef84dd09981bf";
-          sha256 = "16xw159pydkqiki21axv3vhf56yqn8jgg9n97xws2swfkh4drafm";
+          rev = "d243767ed4b1ac68515c9276f53cc3ea407456a3";
+          sha256 = "1xg4jxz1nxsmfwdqwzz35mkvd3afa28dlxgd5rw19m0wqsb0miim";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -68838,8 +69018,8 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "4232676e93ca5ace8e51f6605bec223c3205beea";
-          sha256 = "0jdjg50f6my9952frl6asi8zk0i8b4hva26wm7pi8zk423pydr30";
+          rev = "1f071902d4e2aea49e7e96a327e09712565cb39c";
+          sha256 = "0qkb7wx1qaa85g0dwmkyh4r65fg1j441f0b4hgg7qjq1yxrlkkhb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/72b5ea3f4444c3de73d986a28e1d12bf47c40246/recipes/vdirel";
@@ -69254,12 +69434,12 @@
     visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-regexp";
-        version = "20161017.1713";
+        version = "20170228.1716";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp.el";
-          rev = "4ab9426a831cf0620f49ba227fd10b9c71672274";
-          sha256 = "0c8z1brxsxz175fd887nmpyclswv3yablkscfcjpc8f66a7k53qp";
+          rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85";
+          sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
@@ -69275,12 +69455,12 @@
     visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }:
     melpaBuild {
         pname = "visual-regexp-steroids";
-        version = "20160516.1238";
+        version = "20170221.1853";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp-steroids.el";
-          rev = "6fe4e504ae7a532d67aead6089d68bb2406e4c25";
-          sha256 = "0bc44z8y1jmw7jlz785bisy36v08jichj53nwhmp2wjyv40xy321";
+          rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e";
+          sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids";
@@ -69437,6 +69617,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vue-html-mode";
+        version = "20170225.2301";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "vue-html-mode";
+          rev = "e9708b80a319af14266562d8bf920747e94f1cf8";
+          sha256 = "073vygm04x4gf150ibarz2qxbl37k6jzd907ydbq8nyq6hm1z1wj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode";
+          sha256 = "1f4pjfp4298jkvhacxygddg557hhyivgnm5x3yhjipfv6fjkgl2s";
+          name = "vue-html-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/vue-html-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "vue-mode";
@@ -69497,11 +69698,11 @@
       }) {};
     w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "w3m";
-        version = "20170203.647";
+        version = "20170301.254";
         src = fetchcvs {
           cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot";
           module = "emacs-w3m";
-          sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453";
+          sha256 = "b861237e76035df9e806681dee0f58680d9e68e773cc5e3c65dd513e127f4240";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m";
@@ -69605,8 +69806,8 @@
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "490eed2ac5f3cc375bace345f1060583d166a385";
-          sha256 = "06jqlvy2078fd8py59z5rraf2ymlkv6wizmw91vq63f87vpw71zg";
+          rev = "c5c4f1279f48e7871407d0fca2409512f427107e";
+          sha256 = "0xzwflvj0mq0h9qr62aq473jz71jggnq2dlf1x2vy0a7rh8qw445";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/wandbox";
@@ -69850,22 +70051,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170219.1202";
+        version = "20170225.1206";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "dafb6c0b4d6de9475ba2adfaa117157f881d880c";
-          sha256 = "0bh9z3kd3y7f78hdgnrzwgggmkw807a175xabx66pjacqwm9laia";
+          rev = "6e4d7e96f2a699c2df3056609584e586f4667b39";
+          sha256 = "10iwzjc697niwj0sqvazpi779ipsncpmn2pfy58lgglriq88ss8r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/web-mode";
           license = lib.licenses.free;
@@ -70400,8 +70601,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "0afc3a524ec4c900f7ac1291e37b4f7da19e9ae6";
-          sha256 = "15rjaxzwq7wh6zmyh8nzkbr4c75z8qjlbhpi8yjmf9bik3srr14d";
+          rev = "83bce5f49e49e526a66e528445f54889cd57dbb6";
+          sha256 = "02dmmw20jqcx1ij2kj3aam9fhwqcb52sjhcx7k4faryzdbx6zvwd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -70887,22 +71088,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    wolfram-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wolfram-mode";
-        version = "20140118.757";
+        version = "20170221.120";
         src = fetchFromGitHub {
           owner = "kawabata";
           repo = "wolfram-mode";
-          rev = "72cb36975816a9a7b677269e19b9ff431f597ed7";
-          sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w";
+          rev = "d27a0f23791abde2bdda22e50108b99f11c13ed7";
+          sha256 = "0r82h3x1ggirgd0a03qr71pdcxgkc4s3307ggwy86j4asd308m79";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/299fe35d0a5a11d20f0b917bc8f406bd0f011c93/recipes/wolfram-mode";
           sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
           name = "wolfram-mode";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/wolfram-mode";
           license = lib.licenses.free;
@@ -70995,12 +71196,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170211.402";
+        version = "20170225.405";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "cba75ae94e6c233f92fcdde005d023107495df7b";
-          sha256 = "1sxs89mqns9n847m0gqpv43b9gr15zicjhcnavk5n8g7gnssjmj4";
+          rev = "d543680243046f5f62d36f9e56debcfe414ba40a";
+          sha256 = "0hdd5yi6cnf7ry088wrq2xdm7f2hirhwrds56wvi0bdm9rizm6gs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -71121,12 +71322,12 @@
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "20160830.616";
+        version = "20170228.1521";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "425ab2bd4f37165a6cf85b58e0dec8105bd2bd35";
-          sha256 = "0b6rr78aid7h006k77i6gm82par48l5d5w7xhhkbv109cdra1qlh";
+          rev = "f853350da848d0814f822587ae310e52d895f523";
+          sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -71415,12 +71616,12 @@
     xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-lookup";
-        version = "20170209.342";
+        version = "20170227.1044";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "lookup-word-on-internet";
-          rev = "55e4e539f65e260418ead77c138bc2af2bdfa638";
-          sha256 = "0b9q2y42v73c49l4s7z8qgsj02g2yvn2vbf4kv5m26k8x7547cja";
+          rev = "4843663678db42827d12f2514f8ad4e2f4abcfb9";
+          sha256 = "1hr4m5lrwhx1jf8zlwpx60w9528vq49j0q8kzydlsb895nivnn3s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup";
@@ -71478,12 +71679,12 @@
     xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-replace-pairs";
-        version = "20170111.652";
+        version = "20170221.2112";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-replace-pairs";
-          rev = "fb1b37f482ae2082d0a26214b2160760324d3fce";
-          sha256 = "1am9zyszav8mr1g60g7jdmxd1hnvm2p7zpdrzv3awmr92y3psn1i";
+          rev = "b5bd1ff843063f6eba32ab71f33f0ebde57d5e41";
+          sha256 = "1m5yd9kwsjy37f2czqhjpj5dkqf62pgj40a4ziy65mch4niw0slz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs";
@@ -71545,8 +71746,8 @@
         src = fetchFromGitHub {
           owner = "nicklanasa";
           repo = "xcode-mode";
-          rev = "5b5f0a4f505d44840a4924b24e3ef73b8528d98b";
-          sha256 = "0g2vc13rc9vk20m9l1a1rxkdsc099k33pya3z10sg9pa09a4a2a2";
+          rev = "2ae4f512d6c601ea39d5ab785c2b5288eac24b59";
+          sha256 = "0pi85ylxvjj63cmibgvi493d4ybcp2blhlwgrwzn2hjz31jldh0y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/845c731bed7dbe9c41c09e47e219299f17d0d489/recipes/xcode-mode";
@@ -71734,8 +71935,8 @@
         src = fetchFromGitHub {
           owner = "xquery-mode";
           repo = "xquery-mode";
-          rev = "19e6f9553ce05380843582b879712de00679e4ab";
-          sha256 = "0q04p75qkcbij7cqvhwnfx2729f1v4si05xjv433v7f6dfxxkhhl";
+          rev = "1b655ccf83d02a7bd473d2cf02359ed60bdf7369";
+          sha256 = "1iprgfjrbx3fmqhkgjxdxnlzz2s6h895q270lhjrhkwgpphgna2c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8ea1c9e26963f290d912df21b81afd689543658/recipes/xquery-mode";
@@ -72314,11 +72515,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170117.1449";
+        version = "20170225.1836";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "8871fe9f563b";
-          sha256 = "0bfhf0fhx8znq7xsqwms3n178qpxds93wcznj26k3ypqgwkkcx5x";
+          rev = "bf2497be3ec5";
+          sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -72376,12 +72577,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 = "20170114.445";
+        version = "20170227.2341";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "386f6101fec6975000ad724f117816c01ab55f16";
-          sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4";
+          rev = "0e6c93a6e2f3646b35ae860d50f2ca1777d8bd8a";
+          sha256 = "0ms2q4sbr1m02ifqr9792ab36icg1481332dz7mkpfcz4x0l2k8c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd";
@@ -72467,22 +72668,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }:
+    youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup, pos-tip }:
     melpaBuild {
         pname = "youdao-dictionary";
-        version = "20161017.829";
+        version = "20170226.49";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "youdao-dictionary.el";
-          rev = "30cf46170168f8fec95a5504861a4d9aad314883";
-          sha256 = "06q0xdxl5wcm8pza42vc8k64fyms32x976mwiy2sl9qvvynfa2k3";
+          rev = "44548f56a1c736e6a7fae4546657bff0a94bf3cb";
+          sha256 = "1bazpqibydns36d4m6spvhk7vh6l4xz3w4d3jj78xrvcvi2z2rg2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
-        packageRequires = [ chinese-word-at-point emacs names popup ];
+        packageRequires = [ chinese-word-at-point emacs names popup pos-tip ];
         meta = {
           homepage = "https://melpa.org/#/youdao-dictionary";
           license = lib.licenses.free;
@@ -73009,11 +73210,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170216.2206";
+        version = "20170223.2227";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "50aeab07a53a";
-          sha256 = "1qzxmnvhl39a4vzbdb9a3rh1mzkxdckvd1b3960py9xcnba23ikn";
+          rev = "772da5ae125e";
+          sha256 = "0zqa0jplra23hq6iv5538x7f24yfx8j8fzq5d4csr7hbndya4nqh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";
@@ -73029,12 +73230,12 @@
     ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ztree";
-        version = "20170208.4";
+        version = "20170223.1014";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "bf343665c9d97a5cb370572364865e42074af95c";
-          sha256 = "1hpyymmg5mxrcmj0pngnj8fxyalfxzdqgpghk7lba2r35da05ph5";
+          rev = "febc2d02373312ce69f56c9dbe54cabea3e0813c";
+          sha256 = "0sj30f87gvxbqwi1k7xxqc1h0w7n53630d04csqayiwvc6a2z2sz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree";
@@ -73110,4 +73311,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
\ No newline at end of file
+  }

From 60d1915b616571ab6ca2652703bb4aca6eed9b5d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 1 Mar 2017 08:43:53 -0600
Subject: [PATCH 1541/3449] melpa-stable-packages: 2017-03-01

---
 .../emacs-modes/melpa-stable-generated.nix    | 394 ++++++++++++------
 1 file changed, 267 insertions(+), 127 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index b9d306d6a0ac..b43f8822910b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -506,12 +506,12 @@
     ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-octave";
-        version = "0.4";
+        version = "0.6";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "ac-octave";
-          rev = "eb6463631a69dfd06fe750c1c155594d11de0590";
-          sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf";
+          rev = "f131ed6859a0945ac0c0520d2ab076f16ce7314c";
+          sha256 = "0aigfydmfw284qkhajzxhnl5zx41v5z6ip0kjwmwgphqyxay7nih";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/634bd324148d6b74e1098362e06dc512456cde31/recipes/ac-octave";
@@ -3586,12 +3586,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "1.5.2";
+        version = "1.5.3";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4";
-          sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as";
+          rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1";
+          sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -3754,12 +3754,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "2.3";
+        version = "2.4";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9a4f3c9a554f99de0eb9e5f2b3e545b3e6390918";
-          sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq";
+          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
+          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -4103,14 +4103,14 @@
         pname = "clues-theme";
         version = "1.0.1";
         src = fetchFromGitHub {
-          owner = "jasonm23";
+          owner = "emacsfodder";
           repo = "emacs-clues-theme";
           rev = "abd61f2b7f3e98de58ca26e6d1230e70c6406cc7";
           sha256 = "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf43125306df445ac829c2edb98dd608bc1407de/recipes/clues-theme";
-          sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/clues-theme";
+          sha256 = "0b0gypmxx8qjd8hgxf4kbvci1nwacsxl7rm5s1bcnk9cwc6k2jpr";
           name = "clues-theme";
         };
         packageRequires = [ emacs ];
@@ -4731,12 +4731,12 @@
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "2e24a088d660d0bf37585a664eddbbb6c4a8e20d";
-          sha256 = "0k6bx4i3d2x6kmkzififc8r7vid74bxsvgxp19z7bv1fh6m1f3aa";
+          rev = "2cb03c48f44a5b3cbbbbe05e9841b2c61bd8ed81";
+          sha256 = "1i13w1pziv8c1d9gi6pg50v60z7jyx2grpamrbnazvd6rci88paf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/company-math";
@@ -5346,12 +5346,12 @@
     creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "creamsody-theme";
-        version = "0.3.6";
+        version = "0.3.7";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-creamsody";
-          rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f";
-          sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi";
+          rev = "32fa3f4e461da92700523b1b20e7b28974c19a26";
+          sha256 = "01q1l8ajw6lpp1bb4yp8r70d86hcl4hy0mz7x1hzqsvb7flhppp0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@@ -6352,16 +6352,16 @@
     dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-icon";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitLab {
           owner = "xuhdev";
           repo = "dired-icon";
-          rev = "bd10690402aa451e65cbadb192356386cd855abd";
-          sha256 = "1millrv2rgiswnh9hrprqx2lmbi9h8fasgin5clhixafhmp9l6sf";
+          rev = "dbace8d2250f84487d31b39050fcdc260fcde804";
+          sha256 = "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d0947148441ed48f92f4cfaaf39c2a9aadda48/recipes/dired-icon";
-          sha256 = "1fl12pbncvq80la3bjgq1wlbpmf32mq76sq61mbnwcimi3nj27na";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8a96249947cba52cd75515b3dc83b0842fedf624/recipes/dired-icon";
+          sha256 = "0nyiqcywc1p8kw3psisl4zxwmf2g0x82kanka85zxxdz15s509j1";
           name = "dired-icon";
         };
         packageRequires = [ emacs ];
@@ -6755,6 +6755,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dokuwiki-mode";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "kai2nenobu";
+          repo = "emacs-dokuwiki-mode";
+          rev = "e4e116f6fcc373e3f5937c1a7daa5c2c9c6d3fa1";
+          sha256 = "0bmcm7lvzm8sg2l1j7bg02jasxb8g81q9ilycblmsl1ckbfwq0yp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/dokuwiki-mode";
+          sha256 = "1jc3sn61mipkhgr91wp74s673jk2w5991p54jlw05qqpf5gmxd7v";
+          name = "dokuwiki-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/dokuwiki-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom";
@@ -7387,12 +7408,12 @@
     ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ede-php-autoload";
-        version = "0.4.3";
+        version = "1.0.0";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "c6896c648fbc90f4d083f511353d6b165836d0e8";
-          sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a";
+          rev = "2a8988d845d5acf9d49d8177a68c3c8863916d25";
+          sha256 = "19i746dyshcm2bih82n1m39sf18zx8gi1xaxc9q3pxm4hvn4s8mm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -7405,6 +7426,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    ede-php-autoload-composer-installers = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ede-php-autoload-composer-installers";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "xendk";
+          repo = "ede-php-autoload-composer-installers";
+          rev = "f9942e07d0773444040084ac84652e69f0fd46d5";
+          sha256 = "04gw8ma5c898ai7haxvdagmxx8zw9ncc9v0cv8a5ddg6arvzkl1z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6e0e9058593b32b8d9fd7873d4698b4dd516930f/recipes/ede-php-autoload-composer-installers";
+          sha256 = "0s7dv81niz4h8kj0648x2nbmz47hqxchfs2rjmjpy2lcbifvj268";
+          name = "ede-php-autoload-composer-installers";
+        };
+        packageRequires = [ ede-php-autoload f s ];
+        meta = {
+          homepage = "https://melpa.org/#/ede-php-autoload-composer-installers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ede-php-autoload-drupal";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "xendk";
+          repo = "ede-php-autoload-drupal";
+          rev = "6b62ffa7a69f52aab79067eaed80b2720f7e3fc2";
+          sha256 = "001yhxngr6h7v1sjz0wskd5dv6fiby7m1mbc8vdz1h93150wzahp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal";
+          sha256 = "139sr7jy5hb8h5zmw5mw01r0dy7yvbbyaxzj62m1a589n8w6a964";
+          name = "ede-php-autoload-drupal";
+        };
+        packageRequires = [ ede-php-autoload f s ];
+        meta = {
+          homepage = "https://melpa.org/#/ede-php-autoload-drupal";
+          license = lib.licenses.free;
+        };
+      }) {};
     edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edit-indirect";
@@ -7471,12 +7534,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "0.7.8";
+        version = "0.7.9";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "442f23637ec50274c5e47c20827c946f51cfb8fb";
-          sha256 = "1cwd2b72wm5rdbydv12qb64jz0a383j13vbzpy20z091ixkpmrj7";
+          rev = "b86a4b3a696328faaa37a808abeed54561d19385";
+          sha256 = "0ak5rw3y9cqggyclf9qddqrg9kzl50r5ynk9f99xjmsn2mpw6dwj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -7763,12 +7826,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "1.1";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "5fe9ff42e2651013ae8ff6bb8a1691d3f7b7225c";
-          sha256 = "1d6n1w049wziphkx9vc2ijg70qj8zflwmn4xgzf3k09hzbgk4n46";
+          rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b";
+          sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -8944,8 +9007,8 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/seanfarley/erc-hipchatify";
-          rev = "dbb74dd91c5a";
-          sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj";
+          rev = "2b93fb7103f5";
+          sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
@@ -10532,6 +10595,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "faust-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "magnetophon";
+          repo = "emacs-faust-mode";
+          rev = "41379dd52a8be01cdfac06996ea1593877fdaf58";
+          sha256 = "0q624nm9wfyg95wybi542bx8pdpqk9vibyb6b9fin4mw102nah9j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode";
+          sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
+          name = "faust-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/faust-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
@@ -12138,12 +12222,12 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "0.6.1";
+        version = "0.6.2";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "1bae400e5154d7494fd989b1be47450565810e23";
-          sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2";
+          rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94";
+          sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast";
@@ -13929,12 +14013,12 @@
     grab-mac-link = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grab-mac-link";
-        version = "0.1";
+        version = "0.2";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "grab-mac-link.el";
-          rev = "e5a720d6aa173939c35cab836a31651b184c11e6";
-          sha256 = "0pas60sib23vv1gkprp10jzksgchl5caqj565akg358a0iay7ax4";
+          rev = "8bf05a69758fd10a4303c5c458cd91a49ab8b1b2";
+          sha256 = "12x47k3mm5hvhgn7fmfi7bqfa3naz8w1sx6fl3rmnbzvldb89i1k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e4cc8a72a9f161f024ed9415ad281dbea5f07a18/recipes/grab-mac-link";
@@ -14421,12 +14505,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "0.2.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c";
-          sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl";
+          rev = "9cc6dba6ac9ede2855a1a95a22bc7353949f4362";
+          sha256 = "0yyq2z3vsgib9r8paaj7ls4f8rwxmnhi5jsydzdmwqw1hrpkclv9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -17530,14 +17614,14 @@
         pname = "import-js";
         version = "1.0.0";
         src = fetchFromGitHub {
-          owner = "galooshi";
+          owner = "Galooshi";
           repo = "emacs-import-js";
           rev = "15d395126f57408d770a72db2e5f43271f90fa52";
           sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js";
-          sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/import-js";
+          sha256 = "00b2qv1y8879cf8ayplmwqd36w7sppx57myi2wjhy9i2rnvdbmgn";
           name = "import-js";
         };
         packageRequires = [ emacs grizzl ];
@@ -18239,12 +18323,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "0.26";
+        version = "0.28";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "fc0c467db0549cfa3d96ff6e0f56d0c84c493ba6";
-          sha256 = "17iq0dn862xaak898lc7fmfbzxl9pyycwlmm5wn9kbbq8p6y7nrd";
+          rev = "83ad172b96bb011bb705add136a7571b08f6c4c2";
+          sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -19842,12 +19926,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "0.5.4";
+        version = "0.7";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50";
-          sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv";
+          rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3";
+          sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -20612,12 +20696,12 @@
     math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "math-symbol-lists";
-        version = "1.1";
+        version = "1.2";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "math-symbol-lists";
-          rev = "d11f74fef06d93637e28f32e16edfb5b0ccd064d";
-          sha256 = "127q9xp015j28gjcna988dnrkadznn0xw8sdfvi943nhhqy4yvri";
+          rev = "328f792599e4e298d164e3c6331a2426d82ebf64";
+          sha256 = "1kj9r2mvmvnj6m2bwhbj8fspqiq8fdrhkaj0ir43f7qmd4imblsj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fadff01600d57f5b9ea9c0c47ed109e058114998/recipes/math-symbol-lists";
@@ -20759,12 +20843,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.6.2";
+        version = "0.6.5";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "bcbd1701745c2dc0b161fdf428f3db3887dfa48a";
-          sha256 = "1zs9b8ijwj7b61m3az4k5ch89siz4hy74adz9k4amaab9s6chzcf";
+          rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8";
+          sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -20826,8 +20910,8 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "69b1ec176603cfab6b60941c2dc8d75d64fac019";
-          sha256 = "150iyy75wqwva096c8g1w2sc97nfdgbry6kpz4ngz6l7ij3vivpc";
+          rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805";
+          sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -22144,12 +22228,12 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.6";
+        version = "1.11.7";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "1fa2c86db50af806916d72e76f10bef39dd65e7d";
-          sha256 = "1l4xfv38famawrxs6lg9k7gxghgmlgbpp2dbchnqln21d32b6a8h";
+          rev = "13fe83dc8e28a32bdd454d04908fe1514ec50d51";
+          sha256 = "1mddzphb0xbsa5ma83h3hmama77fvxxhwp5qbcrnwpihz1g1l5dv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -22186,12 +22270,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "0.5.4";
+        version = "0.5.5";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "no-littering";
-          rev = "87fffa1973376bd1837fcf84277cd16db9c96957";
-          sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573";
+          rev = "63bf66630f48403f536f96f8a0d5b5fab46eac9b";
+          sha256 = "0qi706xafi05rqpdz87sayqb728f5qisln2i3yicymr0wy93x76i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@@ -22267,11 +22351,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.23.5";
+        version = "0.23.7";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "cff1e0673a7ca91d9b9907072c501a8bdcf0e3f8";
-          sha256 = "1vxxksq4w6gl3wnh77jcpmjyph0x9r3ibqp9dvgmzxlwig495vfk";
+          rev = "770d00a8955b2ad8be9daf2923e31221c4847043";
+          sha256 = "1919kj6k8avkgji6r9ngd2a2qj8xpnjiwjx4brcvwrgkbryffq21";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -23262,12 +23346,12 @@
     org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "org-jira";
-        version = "2.6.0";
+        version = "2.6.3";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "org-jira";
-          rev = "0ff62665231df2be5d5bc84c4748c272664eeff3";
-          sha256 = "0qn203bw0v7g8kmpkqp9vwh7m8cjjhklvwbhgmr8szaz1i1m9d0i";
+          rev = "1e4def3c7b9bbcf9f1b2c6d6582de60c4cdf50da";
+          sha256 = "06vpag5gd72ckm6vnyk2gv612ds3sml117da40xz3m794779brvr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira";
@@ -23687,6 +23771,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-table-sticky-header";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "org-table-sticky-header";
+          rev = "1fca19fbccbb21159086970b82af56a81f78e247";
+          sha256 = "1swhsspa5yz68hl2449l9hk1d6r9c32z19z4mrdxw4nimdxhxmqp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
+          sha256 = "1rk41279rcsdma39zpr1ka5p47gh1d0969wahd0jbm5xlmx5gz2m";
+          name = "org-table-sticky-header";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-table-sticky-header";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-tfl";
@@ -23834,29 +23939,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
+    org-trello = callPackage ({ dash, dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "0.7.9";
+        version = "0.8.0";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "dfb98150207b13c7771d0c0b8209e0503cd99cd6";
-          sha256 = "1d2bi29m8kxhp46slg904frgmlc6ajqagxjrhxlbdmlxrp18s44g";
+          rev = "32dd866e830836a72a3b96b96e0d00d044d0eaf7";
+          sha256 = "0m5hyhb6211hdmyp1bq6f3fklfgw3957knd96bfdafj727vdnlzm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/188ed8dc1ce2704838f7a2883c41243598150a46/recipes/org-trello";
           sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
-        packageRequires = [
-          dash
-          dash-functional
-          deferred
-          emacs
-          request-deferred
-          s
-        ];
+        packageRequires = [ dash dash-functional deferred request-deferred s ];
         meta = {
           homepage = "https://melpa.org/#/org-trello";
           license = lib.licenses.free;
@@ -24408,22 +24506,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    package-utils = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    package-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-utils";
-        version = "0.4.2";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "package-utils";
-          rev = "e37d38b3c94ac39443f0e449f4112b654b6a8fd1";
-          sha256 = "1spdffw1pi4sp70w46v1njmzgjldcn9cir74imr23fw4n00hb4fa";
+          rev = "e00df8a85fb3d0cfe9dde5a683d81e1a89570e29";
+          sha256 = "14zcg9rc2nif8kv8pfmv9arbq0i8glviyvxgxr0lfiif2n4cfg9s";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
-        packageRequires = [ async ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/package-utils";
           license = lib.licenses.free;
@@ -24805,21 +24903,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    password-store = callPackage ({ dash, f, fetchgit, fetchurl, lib, melpaBuild, s }:
+    password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "password-store";
-        version = "1.6.5";
+        version = "1.7";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "1aac79d9617431bbaf218f9a9d270929762d2816";
-          sha256 = "0zlhiqhx19dpmxvcczhif5c8acj911p61plsp0gdmamkpbxmkbjv";
+          rev = "20081b546f371dcaee9ea2769f46e513bb39c275";
+          sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
-        packageRequires = [ dash f s ];
+        packageRequires = [ f s ];
         meta = {
           homepage = "https://melpa.org/#/password-store";
           license = lib.licenses.free;
@@ -25935,6 +26033,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    prassee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prassee-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "prassee";
+          repo = "prassee-emacs-theme";
+          rev = "9850c806d39acffdef8e91e1a31b54a7620cbae3";
+          sha256 = "1agghimrmh4kh71y51l6lzampjl15ac6jxrrhdviw95c3rxfll4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/15425b576045af1c508912e2091daf475b80b429/recipes/prassee-theme";
+          sha256 = "1j0817hxxri6mq9pplgwf5jp2dagk6hay7g1a1lgz4qgkf5jnshs";
+          name = "prassee-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/prassee-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pretty-mode";
@@ -26690,6 +26809,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-mode";
+        version = "6.2.3";
+        src = fetchFromGitLab {
+          owner = "python-mode-devs";
+          repo = "python-mode";
+          rev = "a0a534639bc6142c2c2f44bd7ca5878ad5f79518";
+          sha256 = "0sj2hfjwpcdg9djsgl3y5aa3gnvl4s87477x6a9d14m11db3p7ml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
+          sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
+          name = "python-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/python-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
     melpaBuild {
         pname = "python-x";
@@ -26735,12 +26875,12 @@
     pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyvenv";
-        version = "1.9";
+        version = "1.10";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "pyvenv";
-          rev = "5c48de2419ddf10c00e38f5940ed97a84c43f1ce";
-          sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z";
+          rev = "91c47b8d2608ccbcac2eba91f0e36b422101ce55";
+          sha256 = "09c0f7ln1in8h03idbzggvmqkxj6i9jdjbmg1nnyarhffmgbcvnh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv";
@@ -28602,12 +28742,12 @@
     sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sexy-monochrome-theme";
-        version = "1.5.2";
+        version = "2.0";
         src = fetchFromGitHub {
           owner = "nuncostans";
           repo = "sexy-monochrome-theme";
-          rev = "dd582a45a4e13891935ab68f030d8c2d755fa6a5";
-          sha256 = "01jv7raxjyd37lipl05kl1892lz28ig292icik8l30y0p5gp8qgy";
+          rev = "436206eef592ca22e4c3e0cd3bd87a1fba4083a1";
+          sha256 = "0aaicpiihrd5ny2g68cpkasysyx5wj28gs727qwdqw3ljpc0qlz9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme";
@@ -29883,12 +30023,12 @@
     speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "speed-type";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "parkouss";
           repo = "speed-type";
-          rev = "d9d98b9744e21d5e12a695096efcde288bdb5c18";
-          sha256 = "043ydcik23ykphbh89haagxbdn11s1b44wkziwibnb7d3r9hd8p7";
+          rev = "5d691f57743304db63b6afdc5bd79dabd282d390";
+          sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type";
@@ -30615,12 +30755,12 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "2.2.3";
+        version = "2.2.4";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "75cbae223fbf84d19e14a7f7734ded4f46078654";
-          sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny";
+          rev = "e91e924c225b7bfb7aa6e4a84b5d379c6268014a";
+          sha256 = "0nfh5a3lnrj9z1qfgdn28mk5f9cn5fzpdjvpcv44kab3dff2irnl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode";
@@ -31621,12 +31761,12 @@
     tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tracking";
-        version = "2.3";
+        version = "2.4";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "9a4f3c9a554f99de0eb9e5f2b3e545b3e6390918";
-          sha256 = "008fz7829mvjlid93hvs5xwwvigh5lnq2fxf2w9ghnw9lygkv5bq";
+          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
+          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -32551,12 +32691,12 @@
     visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "visual-regexp";
-        version = "1.0.0";
+        version = "1.1.1";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp.el";
-          rev = "2cf4dc5a2dff0736eb2e2da95997d7274bbb5766";
-          sha256 = "0zz83l97xkna2yqiiywxyhj2zwil2a0xqzdsdxw0ai951jql1j5r";
+          rev = "b3096c2d391ff4e28a2a4e8cd82efbf11071ea85";
+          sha256 = "12zpmzwyp85dzsjpxd3279kpfi9yz3jwc1k9fnb3xv3pjiil5svg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp";
@@ -32572,12 +32712,12 @@
     visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }:
     melpaBuild {
         pname = "visual-regexp-steroids";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "benma";
           repo = "visual-regexp-steroids.el";
-          rev = "6fe4e504ae7a532d67aead6089d68bb2406e4c25";
-          sha256 = "0bc44z8y1jmw7jlz785bisy36v08jichj53nwhmp2wjyv40xy321";
+          rev = "a6420b25ec0fbba43bf57875827092e1196d8a9e";
+          sha256 = "1isqa4ck6pm4ykcrkr0g1qj8664jkpcsrq0f8dlb0sksns2dqkwj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids";
@@ -32824,12 +32964,12 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "14";
+        version = "14.1";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "9bd7a7ebcbe67ae8f14d585d04b93569fa496ec7";
-          sha256 = "1cs9ldj2qckyynwxzvbd5fmniis6mhprdz1wvvvpjs900bbc843s";
+          rev = "44de4e0198051b52110d50d860db26ed770219f3";
+          sha256 = "0pbim6aw0w9z5bb0hl98bda1a19pjmfki6jr1mxcfi5yismk2863";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -33516,12 +33656,12 @@
     writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
     melpaBuild {
         pname = "writeroom-mode";
-        version = "3.5";
+        version = "3.6.1";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "writeroom-mode";
-          rev = "2e15db8e26a05618da7a1f97e19ff68f7359e8f6";
-          sha256 = "1695vr25jr6m6fqjxyjns8vcbfixgjpkpqj1lk9k75k8n38x4ibw";
+          rev = "f853350da848d0814f822587ae310e52d895f523";
+          sha256 = "1al4ch96p0c8qf51pqv62nl3cwz05w8s2cgkxl01ff3l9y7qjsvz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode";
@@ -33980,8 +34120,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "8871fe9f563b";
-          sha256 = "0bfhf0fhx8znq7xsqwms3n178qpxds93wcznj26k3ypqgwkkcx5x";
+          rev = "bf2497be3ec5";
+          sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -34112,12 +34252,12 @@
     youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }:
     melpaBuild {
         pname = "youdao-dictionary";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "youdao-dictionary.el";
-          rev = "5b4f716ca41fa0cdb18a4949ac5cdcd470182c57";
-          sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
+          rev = "a6e44e4fb93cc1b9f1067f10cf854b0bfc3fe732";
+          sha256 = "1m4zri7kiw70062w2sp4fdqmmx2vmjisamjwmjdg6669dzvnpawq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/712bdf83f71c2105754f9b549a889ffc5b7ba565/recipes/youdao-dictionary";
@@ -34340,4 +34480,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
\ No newline at end of file
+  }

From 5ce06263a35da4b99589227f3553093d381c24c9 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 2 Mar 2017 08:25:35 -0500
Subject: [PATCH 1542/3449] kdeFrameworks.kio: patch for insecure URL passing

---
 .../libraries/kde-frameworks/kio/default.nix          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index cb67c8459034..1d37c794674b 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -4,7 +4,7 @@
 , kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
 , kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
 , kwidgetsaddons, kwindowsystem, kxmlgui
-, qtscript, qtx11extras, solid
+, qtscript, qtx11extras, solid, fetchpatch
 }:
 
 kdeFramework {
@@ -17,5 +17,12 @@ kdeFramework {
     ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
     qtx11extras
   ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series))
+    ++ [
+      (fetchpatch {
+        name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch";
+        url = "https://cgit.kde.org/kio.git/patch/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4";
+        sha256 = "1s6rcp8rrlhc6rgy3b303y0qq0s8371n12r5lk9zbkw14wjvbix0";
+      })
+    ];
 }

From 7abda54bbbe9e43fe3ed4712d875701837e31d3f Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 2 Mar 2017 08:34:17 -0500
Subject: [PATCH 1543/3449] kdeApplications.kdelibs: patch for insecure URL
 passing

---
 pkgs/applications/kde/kdelibs/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index 0292b51a48d4..e7b7b0a0ec4d 100644
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -3,7 +3,7 @@
   automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
   attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
   libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
-  shared_desktop_ontologies, soprano, strigi, udev, xz, pcre
+  shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
 }:
 
 kdeApp {
@@ -28,6 +28,11 @@ kdeApp {
     ./0001-old-kde4-cmake-policies.patch
     ./0002-polkit-install-path.patch
     ./0003-remove_xdg_impurities.patch
+    (fetchpatch {
+     name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch";
+     url = "https://cgit.kde.org/kdelibs.git/patch/?id=1804c2fde7bf4e432c6cf5bb8cce5701c7010559";
+     sha256 = "1y9951wgx35yf24i6gjz219fhspyqri1jvbw4fybd8nwwjb6ciz1";
+   })
   ];
 
   # cmake does not detect path to `ilmbase`

From 441ad3a8048b5e380bed6d82e776f34991de034a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 13:45:13 -0600
Subject: [PATCH 1544/3449] amtterm: 1.4 -> 1.6-1

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

diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix
index 3fe85be35f71..222cbde19e3e 100644
--- a/pkgs/tools/system/amtterm/default.nix
+++ b/pkgs/tools/system/amtterm/default.nix
@@ -1,15 +1,16 @@
 { fetchurl, stdenv, makeWrapper, perl, perlPackages }:
 
-let version = "1.4"; in
-stdenv.mkDerivation {
-  name = "amtterm-"+version;
 
+stdenv.mkDerivation rec {
+  name = "amtterm-${version}";
+  version = "1.6-1";
+  
   buildInputs = with perlPackages; [ perl SOAPLite ];
   nativeBuildInputs = [ makeWrapper ];
 
   src = fetchurl {
-    url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-a75e48e010e92dc5540e2142efc445ccb0ab1a42.tar.gz";
-    sha256 = "0i4ny5dyf3fy3sd65zw9v4xxw3rc3qyn8r8y8gwwgankj6iqkqp4";
+    url = "https://www.kraxel.org/cgit/amtterm/snapshot/${name}.tar.gz";
+    sha256 = "1jxcsqkag2bxmrnr4m6g88sln1j2d9liqlna57fj8kkc85316vlc";
   };
 
   makeFlags = [ "prefix=$(out)" ];

From 7f31a8e359b1a9a4a325e043ab41278f34331072 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Mar 2017 15:52:17 +0100
Subject: [PATCH 1545/3449] cryptodev: mark as broken for kernels >4.4

All builds for kernels above 4.4 fail; there is no newer
upstream version.
---
 pkgs/os-specific/linux/cryptodev/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix
index f3c262231223..46b5fcb0bf94 100644
--- a/pkgs/os-specific/linux/cryptodev/default.nix
+++ b/pkgs/os-specific/linux/cryptodev/default.nix
@@ -19,5 +19,7 @@ stdenv.mkDerivation rec {
     description = "Device that allows access to Linux kernel cryptographic drivers";
     homepage = http://home.gna.org/cryptodev-linux/;
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
+    broken = !stdenv.lib.versionOlder kernel.version "4.9";
   };
 }

From 499f813ae8eba9fc8909a4aafa6b861e740d9181 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Mar 2017 16:10:23 +0100
Subject: [PATCH 1546/3449] nvidiabl: 0.85 -> 0.87

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

diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix
index 881c29c1ce0f..1c1ea1d11d8f 100644
--- a/pkgs/os-specific/linux/nvidiabl/default.nix
+++ b/pkgs/os-specific/linux/nvidiabl/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchFromGitHub, kernel }:
 
-stdenv.mkDerivation {
-  name = "nvidiabl-0.85-${kernel.version}";
+stdenv.mkDerivation rec {
+  name = "nvidiabl-${version}-${kernel.version}";
+  version = "0.87";
 
-  src = fetchurl {
-    url = "https://github.com/guillaumezin/nvidiabl/archive/v0.85.tar.gz";
-    sha256 = "1c7ar39wc8jpqh67sw03lwnyp0m9l6dad469ybqrgcywdiwxspwj";
+  src = fetchFromGitHub {
+    owner = "guillaumezin";
+    repo = "nvidiabl";
+    rev = "v${version}";
+    sha256 = "1hs61dxn84vsyvrd2s899dhgg342mhfkbdn1nkhcvly45hdp2nca";
   };
 
   hardeningDisable = [ "pic" ];

From c5785dc3eb7c11f1aecb786834d6de9ca77de568 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 2 Mar 2017 16:10:57 +0100
Subject: [PATCH 1547/3449] nvidiabl: mark as broken on kernels >4.4

All builds on kernels >4.4 fail.
---
 pkgs/os-specific/linux/nvidiabl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix
index 1c1ea1d11d8f..6f9af040b8a3 100644
--- a/pkgs/os-specific/linux/nvidiabl/default.nix
+++ b/pkgs/os-specific/linux/nvidiabl/default.nix
@@ -29,5 +29,7 @@ stdenv.mkDerivation rec {
     description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU";
     homepage = https://github.com/guillaumezin/nvidiabl;
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    broken = !stdenv.lib.versionOlder kernel.version "4.9";
   };
 }

From 1b9875220fd8785d8c059c39e3ea2cc35c303b5d Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 2 Mar 2017 16:35:33 +0100
Subject: [PATCH 1548/3449] gitfs: 0.2.5 -> 0.4.5.1

---
 pkgs/tools/filesystems/gitfs/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index bb652c285809..ec734e52f733 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  name = "gitfs-0.2.5";
+  name = "gitfs-${version}";
+  version = "0.4.5.1";
 
   src = fetchFromGitHub {
     owner = "PressLabs";
     repo = "gitfs";
-    rev = "495c6c52ec3573294ba7b8426ed794eb466cbb82";
-    sha256 = "04yh6b5ivbviqy5k2768ag75cd5kr8k70ar0d801yvc8hnijvphk";
+    rev = version;
+    sha256 = "1s9ml2ryqxvzzq9mxa9y3xmzr742qxcpw9kzzbr7vm3bxgkyi074";
   };
 
   patchPhase = ''
@@ -18,9 +19,8 @@ python2Packages.buildPythonApplication rec {
   buildInputs = with python2Packages; [ pytest pytestcov mock ];
   propagatedBuildInputs = with python2Packages; [ atomiclong fusepy pygit2 ];
 
-  checkPhase = ''
-    py.test
-  '';
+  checkPhase = "py.test";
+  doCheck = false;
 
   meta = {
     description = "A FUSE filesystem that fully integrates with git";

From 98523861f67992a603e503c19b9642253fd7bfca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 2 Mar 2017 16:37:48 +0100
Subject: [PATCH 1549/3449] highlight: disable darwin build

https://hydra.nixos.org/build/49668465/nixlog/1
---
 pkgs/tools/text/highlight/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 3d8bfbf03f82..6f2a2df82f8d 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Source code highlighting tool";
     homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php";
-    platforms = platforms.unix;
+    platforms = platforms.linux;
     maintainers = maintainers.ndowens;
   };
 }

From 7566b36259f53ebcea925b85afe5d316d67c060c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Mar 2017 17:13:54 +0100
Subject: [PATCH 1550/3449] zfs.autoScrub service: init

---
 nixos/modules/tasks/filesystems/zfs.nix | 63 ++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 045cbeb7cff8..c8fa6c21a4f6 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -13,12 +13,14 @@ let
   cfgZfs = config.boot.zfs;
   cfgSnapshots = config.services.zfs.autoSnapshot;
   cfgSnapFlags = cfgSnapshots.flags;
+  cfgScrub = config.services.zfs.autoScrub;
 
   inInitrd = any (fs: fs == "zfs") config.boot.initrd.supportedFilesystems;
   inSystem = any (fs: fs == "zfs") config.boot.supportedFilesystems;
 
   enableAutoSnapshots = cfgSnapshots.enable;
-  enableZfs = inInitrd || inSystem || enableAutoSnapshots;
+  enableAutoScrub = cfgScrub.enable;
+  enableZfs = inInitrd || inSystem || enableAutoSnapshots || enableAutoScrub;
 
   kernel = config.boot.kernelPackages;
 
@@ -217,6 +219,37 @@ in
         '';
       };
     };
+
+    services.zfs.autoScrub = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Enables periodic scrubbing of ZFS pools.
+        '';
+      };
+
+      interval = mkOption {
+        default = "Sun, 02:00";
+        type = types.str;
+        example = "daily";
+        description = ''
+          Systemd calendar expression when to scrub ZFS pools. See
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry>.
+        '';
+      };
+
+      pools = mkOption {
+        default = [];
+        type = types.listOf types.str;
+        example = [ "tank" ];
+        description = ''
+          List of ZFS pools to periodically scrub. If empty, all pools
+          will be scrubbed.
+        '';
+      };
+    };
   };
 
   ###### implementation
@@ -282,7 +315,7 @@ in
         zfsSupport = true;
       };
 
-      environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/*";
+      environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/";
 
       system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck
       environment.systemPackages = [ packages.zfsUser ]
@@ -391,5 +424,31 @@ in
                               };
                             }) snapshotNames);
     })
+
+    (mkIf enableAutoScrub {
+      systemd.services.zfs-scrub = {
+        description = "ZFS pools scrubbing";
+        after = [ "zfs-import.target" ];
+        serviceConfig = {
+          Type = "oneshot";
+        };
+        script = ''
+          ${packages.zfsUser}/bin/zpool scrub ${
+            if cfgScrub.pools != [] then
+              (concatStringsSep " " cfgScrub.pools)
+            else
+              "$(${packages.zfsUser}/bin/zpool list -H -o name)"
+            }
+        '';
+      };
+
+      systemd.timers.zfs-scrub = {
+        wantedBy = [ "timers.target" ];
+        timerConfig = {
+          OnCalendar = cfgScrub.interval;
+          Persistent = "yes";
+        };
+      };
+    })
   ];
 }

From 75e85cae42f4ae2f8ffd237009701aeb45da1dcf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 13 Nov 2016 16:20:29 +0100
Subject: [PATCH 1551/3449] linux: enable FOU tunnels and VRF interfaces

---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 40c49509fd05..189560c28ac0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -129,6 +129,7 @@ with stdenv.lib;
   IPV6_MROUTE y
   IPV6_MROUTE_MULTIPLE_TABLES y
   IPV6_PIMSM_V2 y
+  IPV6_FOU_TUNNEL m
   CLS_U32_PERF y
   CLS_U32_MARK y
   ${optionalString (stdenv.system == "x86_64-linux") ''
@@ -143,6 +144,8 @@ with stdenv.lib;
   L2TP_ETH m
   BRIDGE_VLAN_FILTERING y
   BONDING m
+  NET_L3_MASTER_DEV y
+  NET_FOU_IP_TUNNELS y
 
   # Wireless networking.
   CFG80211_WEXT? y # Without it, ipw2200 drivers don't build

From 49bdf9803a9c481948e980e5b11db86bb23ddc4c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 17 Nov 2016 07:48:44 +0100
Subject: [PATCH 1552/3449] linux: IPV6_FOU_TUNNEL is available since 4.7

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

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 189560c28ac0..9b0cd003072b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -129,7 +129,9 @@ with stdenv.lib;
   IPV6_MROUTE y
   IPV6_MROUTE_MULTIPLE_TABLES y
   IPV6_PIMSM_V2 y
-  IPV6_FOU_TUNNEL m
+  ${optionalString (versionAtLeast version "4.7") ''
+    IPV6_FOU_TUNNEL m
+  ''}
   CLS_U32_PERF y
   CLS_U32_MARK y
   ${optionalString (stdenv.system == "x86_64-linux") ''

From 7d356ff69646e78c5f9a362ff8b5912fa9ecec7c Mon Sep 17 00:00:00 2001
From: 3noch <eacameron@gmail.com>
Date: Sat, 25 Feb 2017 17:44:04 -0500
Subject: [PATCH 1553/3449] Disable large address space in GHC iOS X compiler

Original:
https://github.com/NixOS/nixpkgs-channels/commit/17cea33d1aa55fdc8beff1001882efa7cc142da1
---
 pkgs/development/compilers/ghc/head.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0ca8e8c299eb..3ae7d9c61e45 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
+{ stdenv, lib, fetchgit, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
 , autoconf, automake, happy, alex, python3, buildPlatform, targetPlatform
 , selfPkgs, cross ? null
 
@@ -105,7 +105,7 @@ in stdenv.mkDerivation (rec {
     "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib"
     "--target=${cross.config}"
     "--enable-bootstrap-with-devel-snapshot"
-  ];
+  ] ++ (lib.optional ("${cross.config}" == "aarch64-apple-darwin14") "--disable-large-address-space");
 
   buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ];
 

From 4b77d425aa5970f39f0637894075d2df8c1575c8 Mon Sep 17 00:00:00 2001
From: 3noch <eacameron@gmail.com>
Date: Sat, 25 Feb 2017 17:45:40 -0500
Subject: [PATCH 1554/3449] Fix GHCJS HEAD patch; support GHCJS libdir link;
 use full ghcEnv for GHCJS

Original:
https://github.com/NixOS/nixpkgs-channels/commit/f3110651c81cc3fd4f6d342f0c30d363ea8cd0b0

(With some tweaks from @cstrahan)

closes #23199
---
 pkgs/development/compilers/ghc/8.0.2.nix      |  7 +++++--
 pkgs/development/compilers/ghc/head.nix       |  4 +++-
 pkgs/development/compilers/ghcjs/base.nix     | 10 ++++++++-
 .../haskell-modules/generic-builder.nix       |  4 +++-
 .../haskell-modules/with-packages-wrapper.nix | 21 ++++++++++---------
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 5f687aca63a2..605458e71859 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
+{ stdenv, lib, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils
 , hscolour, patchutils, sphinx
 
   # If enabled GHC will be build with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
 , enableIntegerSimple ? false, gmp
+, cross ? null
 }:
 
 let
@@ -44,7 +45,9 @@ stdenv.mkDerivation rec {
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ];
+  ] ++
+    # 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";
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 3ae7d9c61e45..ed6f4717446d 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -105,7 +105,9 @@ in stdenv.mkDerivation (rec {
     "RANLIB=${stdenv.binutilsCross}/bin/${cross.config}-ranlib"
     "--target=${cross.config}"
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ (lib.optional ("${cross.config}" == "aarch64-apple-darwin14") "--disable-large-address-space");
+  ] ++
+    # 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 ];
 
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix
index 5ffc6e2720e0..ac9419d662ec 100644
--- a/pkgs/development/compilers/ghcjs/base.nix
+++ b/pkgs/development/compilers/ghcjs/base.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, lib
 , broken ? false
 , test-framework
 , test-framework-hunit
@@ -94,6 +95,11 @@
   ]
 
 , stage2 ? import ./stage2.nix
+
+, patches ? [ ./ghcjs.patch ]
+
+# used for resolving compiler plugins
+, ghcLibdir ? null
 }:
 let
   inherit (bootPkgs) ghc;
@@ -122,7 +128,7 @@ in mkDerivation (rec {
   testDepends = [
     HUnit test-framework test-framework-hunit
   ];
-  patches = [ ./ghcjs.patch ];
+  inherit patches;
   postPatch = ''
     substituteInPlace Setup.hs \
       --replace "/usr/bin/env" "${coreutils}/bin/env"
@@ -165,6 +171,8 @@ in mkDerivation (rec {
         --with-cabal ${cabal-install}/bin/cabal \
         --with-gmp-includes ${gmp.dev}/include \
         --with-gmp-libraries ${gmp.out}/lib
+  '' + lib.optionalString (ghcLibdir != null) ''
+    printf '%s' '${ghcLibdir}' > "$out/lib/ghcjs-${version}/ghc_libdir"
   '';
   passthru = {
     inherit bootPkgs;
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 42ea03693ecd..e47375e71c73 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -193,11 +193,13 @@ stdenv.mkDerivation ({
     ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
   '' + postPatch;
 
+  # for ghcjs, we want to put ghcEnv on PATH so compiler plugins will be available.
+  # TODO(cstrahan): would the same be of benefit to native ghc?
   setupCompilerEnvironmentPhase = ''
     runHook preSetupCompilerEnvironment
 
     echo "Build with ${ghc}."
-    export PATH="${ghc}/bin:$PATH"
+    export PATH="${if ghc.isGhcjs or false then ghcEnv else ghc}/bin:$PATH"
     ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
     packageConfDir="$TMPDIR/package.conf.d"
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index c49b81762e71..e04cbe08c2c7 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,9 +1,12 @@
-{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper
+{ stdenv, lib, ghc, llvmPackages, packages, symlinkJoin, makeWrapper
 , ignoreCollisions ? false, withLLVM ? false
 , postBuild ? ""
 , haskellPackages
+, ghcLibdir ? null # only used by ghcjs, when resolving plugins
 }:
 
+assert ghcLibdir != null -> (ghc.isGhcjs or false);
+
 # This wrapper works only with GHC 6.12 or later.
 assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs;
 
@@ -48,7 +51,7 @@ let
                    ++ lib.optional stdenv.isDarwin llvmPackages.clang);
 in
 if paths == [] && !withLLVM then ghc else
-buildEnv {
+symlinkJoin {
   # this makes computing paths from the name attribute impossible;
   # if such a feature is needed, the real compiler name should be saved
   # as a dedicated drv attribute, like `compiler-name`
@@ -59,14 +62,6 @@ buildEnv {
   postBuild = ''
     . ${makeWrapper}/nix-support/setup-hook
 
-    # Work around buildEnv sometimes deciding to make bin a symlink
-    if test -L "$out/bin"; then
-      binTarget="$(readlink -f "$out/bin")"
-      rm "$out/bin"
-      cp -r "$binTarget" "$out/bin"
-      chmod u+w "$out/bin"
-    fi
-
     # wrap compiler executables with correct env variables
 
     for prg in ${ghcCommand} ${ghcCommand}i ${ghcCommand}-${ghc.version} ${ghcCommand}i-${ghc.version}; do
@@ -102,6 +97,12 @@ buildEnv {
     done
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
+    ${# ghcjs will read the ghc_libdir file when resolving plugins.
+      lib.optionalString (isGhcjs && ghcLibdir != null) ''
+      mkdir -p "${libDir}"
+      rm -f "${libDir}/ghc_libdir"
+      printf '%s' '${ghcLibdir}' > "${libDir}/ghc_libdir"
+    ''}
     $out/bin/${ghcCommand}-pkg check
   '' + postBuild;
   passthru = {

From fa5ecc2d1a6123feb8740496656a04c5d1986849 Mon Sep 17 00:00:00 2001
From: Alistair Bill <alistair.bill@gmail.com>
Date: Thu, 2 Mar 2017 17:51:17 +0000
Subject: [PATCH 1555/3449] msgpack-tools: fix sandbox build

---
 .../tools/msgpack-tools/default.nix           | 32 ++++++++++++++++---
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix
index d83be1c14313..2b5f42b2cbe5 100644
--- a/pkgs/development/tools/msgpack-tools/default.nix
+++ b/pkgs/development/tools/msgpack-tools/default.nix
@@ -1,17 +1,39 @@
-{ stdenv, fetchFromGitHub, cmake }:
-
+{ stdenv, fetchurl, fetchFromGitHub, cmake, unzip }:
 stdenv.mkDerivation rec {
   name = "msgpack-tools-${version}";
-  version = "v0.6";
+  version = "0.6";
 
   src = fetchFromGitHub {
     owner = "ludocode";
     repo = "msgpack-tools";
-    rev = version;
+    rev = "v${version}";
     sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
   };
 
-  buildInputs = [ cmake ];
+  libb64 = fetchurl {
+    url = "mirror://sourceforge/libb64/libb64-1.2.1.zip";
+    sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410";
+  };
+
+  rapidjson = fetchurl {
+    url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz";
+    sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw";
+  };
+
+  mpack = fetchurl {
+    url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz";
+    sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg";
+  };
+
+  postUnpack = ''
+    mkdir $sourceRoot/contrib
+    cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz
+    cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip
+    cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
+  '';
+
+
+  buildInputs = [ cmake unzip ];
 
   meta = with stdenv.lib; {
     description = "Command-line tools for converting between MessagePack and JSON";

From b0ae3c14fbdd6a85b31d58fe4bc977551446ddb5 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 2 Mar 2017 19:20:26 +0100
Subject: [PATCH 1556/3449] httping 2.5: fetch over https + license

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

diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index 36627b4e7a41..ce58da880d63 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "2.5";
 
   src = fetchurl {
-    url = "http://www.vanheusden.com/httping/${name}.tgz";
+    url = "https://www.vanheusden.com/httping/${name}.tgz";
     sha256 = "1y7sbgkhgadmd93x1zafqc4yp26ssiv16ni5bbi9vmvvdl55m29y";
   };
 
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
       the transmission across the network also takes time! So it measures the
       latency of the webserver + network. It supports IPv6.
     '';
+    license = licenses.agpl3;
     maintainers = with maintainers; [ nckx rickynils ];
     platforms = platforms.linux;
   };

From 53b059ade536f7e9b238abb4d68eaa5bee2c31f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 2 Mar 2017 19:27:10 +0100
Subject: [PATCH 1557/3449] miniupnpc: switch to old version by default

miniupnpc 2.0.20161216 change its api
---
 pkgs/tools/networking/miniupnpc/default.nix | 45 +++++++++++++--------
 pkgs/top-level/all-packages.nix             |  9 ++++-
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix
index 42fe2db7a4ea..575bac3e9d1e 100644
--- a/pkgs/tools/networking/miniupnpc/default.nix
+++ b/pkgs/tools/networking/miniupnpc/default.nix
@@ -1,23 +1,34 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation rec {
-  name = "miniupnpc-${version}";
-  version = "2.0.20161216";
+let
+  generic = { version, sha256 }:
+    stdenv.mkDerivation rec {
+      name = "miniupnpc-${version}";
+      src = fetchurl {
+        name = "${name}.tar.gz";
+        url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+        inherit sha256;
+      };
 
-  src = fetchurl {
-    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+      patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
+
+      doCheck = !stdenv.isFreeBSD;
+
+      installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
+
+      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;
+      };
+    };
+in {
+  miniupnpc_2 = generic {
+    version = "2.0.20161216";
     sha256 = "0gpxva9jkjvqwawff5y51r6bmsmdhixl3i5bmzlqsqpwsq449q81";
-   };
-
-   patches = stdenv.lib.optional stdenv.isFreeBSD ./freebsd.patch;
-
-   doCheck = !stdenv.isFreeBSD;
-
-  installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
-
-  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;
+  };
+  miniupnpc_1 = generic {
+    version = "1.9.20150430";
+    sha256 = "0ivnvzla0l2pzmy8s0j8ss0fnpsii7z9scvyl4a13g9k911hgmvn";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5230fd82907..4f1968ebf406 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2883,7 +2883,9 @@ with pkgs;
 
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
-  miniupnpc = callPackage ../tools/networking/miniupnpc { };
+  inherit (callPackage ../tools/networking/miniupnpc { })
+    miniupnpc_1 miniupnpc_2;
+  miniupnpc = miniupnpc_1;
 
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
@@ -14932,7 +14934,10 @@ with pkgs;
     libtorrentRasterbar = libtorrentRasterbar_1_0;
   };
 
-  eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; };
+  eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp {
+    lua5 = lua5_1;
+    miniupnpc = miniupnpc_1;
+  };
 
   qemu = callPackage ../applications/virtualization/qemu {
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa;

From 86a0a1ecedcb851fbee4c0e26e453e6c17c5ab12 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 2 Mar 2017 21:41:25 +0300
Subject: [PATCH 1558/3449] haskellPackages.lambdabot-haskell-plugins: remove
 overrides

---
 .../haskell-modules/configuration-common.nix       | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0c62c187ac02..db9a8d573986 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -700,20 +700,6 @@ self: super: {
   # 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; };
 
-  # To be in sync with Hoogle.
-  lambdabot-haskell-plugins = (overrideCabal super.lambdabot-haskell-plugins (drv: {
-    patches = [
-      (pkgs.fetchpatch {
-        url = "https://github.com/lambdabot/lambdabot/commit/78a2361024724acb70bc1c12c42f3a16015bb373.patch";
-        sha256 = "0aw0jpw07idkrg8pdn3y3qzhjfrxsvmx3plg51m1aqgbzs000yxf";
-        stripLen = 2;
-        addPrefixes = true;
-      })
-    ];
-
-    jailbreak = true;
-  }));
-
   # Needs new version.
   haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; };
 

From 197236af88eb448ad4501175e1d0a0345b20db64 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Mar 2017 12:22:20 +0100
Subject: [PATCH 1559/3449] hackage2nix: disable broken builds

---
 .../configuration-hackage2nix.yaml            | 336 ++++++++++++++++++
 1 file changed, 336 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index a30a2fd4463f..47fb3f7f87f1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2396,6 +2396,7 @@ dont-distribute-packages:
   AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  activehs-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   activitystreams-aeson:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2405,9 +2406,11 @@ dont-distribute-packages:
   Adaptive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   adaptive-tuple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   adb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  adblock2privoxy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   adhoc-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   adict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ADPfusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2424,8 +2427,10 @@ dont-distribute-packages:
   aeson-diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-filthy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-flat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-injector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-quick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2448,6 +2453,7 @@ dont-distribute-packages:
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2501,10 +2507,12 @@ dont-distribute-packages:
   android:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   android-lint-summary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AndroidViewHierarchyImporter:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  angel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   angle:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   annah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Annotations:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  anonymous-sums-tests:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   antagonist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   antfarm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2529,6 +2537,7 @@ dont-distribute-packages:
   apiary-purescript:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   apiary-websockets:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  api-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   apis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   apotiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2539,6 +2548,7 @@ dont-distribute-packages:
   applicative-fail:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-quoters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   approximate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2587,10 +2597,12 @@ dont-distribute-packages:
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atndapi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-foreign:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  attic-schedule:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2604,6 +2616,7 @@ dont-distribute-packages:
   audiovisual:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   augeas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   augur:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aur-api:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aur:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Aurochs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   authenticate-ldap:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2634,6 +2647,7 @@ dont-distribute-packages:
   aws-kinesis-reshard:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-lambda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-performance-tests:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aws-route53:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-text-converter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sdk-xml-unordered:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2687,6 +2701,7 @@ dont-distribute-packages:
   bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bench:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   BenchmarkHistory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bencoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2709,6 +2724,7 @@ dont-distribute-packages:
   billeksah-main:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   billeksah-pane:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   billeksah-services:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bimaps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-communicator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2738,6 +2754,7 @@ dont-distribute-packages:
   bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-linux-videodev2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-monetdb-mapi:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sane:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2782,6 +2799,7 @@ dont-distribute-packages:
   bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-vector:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bitwise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bkr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   black-jewel:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   blacktip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2793,6 +2811,7 @@ dont-distribute-packages:
   blas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   blatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-builder-enumerator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2801,9 +2820,11 @@ dont-distribute-packages:
   blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bliplib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blockhash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlogLiterately-diagrams:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlogLiterately:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bloodhound-amazonka-auth:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blosum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2820,8 +2841,10 @@ dont-distribute-packages:
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-list:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boomange:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2847,6 +2870,7 @@ dont-distribute-packages:
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bugzilla:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buildbox:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2873,7 +2897,10 @@ dont-distribute-packages:
   cabal2ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-bounds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-cargs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-db:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-dev:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2887,6 +2914,7 @@ dont-distribute-packages:
   cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-macosx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-progdeps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2894,7 +2922,9 @@ dont-distribute-packages:
   cabalrpmdeps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   CabalSearch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-sort:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-test-quickcheck:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabalvchk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2902,6 +2932,7 @@ dont-distribute-packages:
   cacophony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   caffegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2913,6 +2944,7 @@ dont-distribute-packages:
   call:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   campfire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   canonical-filepath:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  canteven-http:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-parsedate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2951,6 +2983,8 @@ dont-distribute-packages:
   categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-traced:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  catnplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cautious-file:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2971,7 +3005,9 @@ dont-distribute-packages:
   cereal-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-ieee754:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cereal-io-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-plus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cereal-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   certificate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2980,6 +3016,7 @@ dont-distribute-packages:
   cgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgi-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2996,6 +3033,7 @@ dont-distribute-packages:
   Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chell-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chitauri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3018,6 +3056,7 @@ dont-distribute-packages:
   cinvoke:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  circlehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   citation-resolve:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   citeproc-hs-pandoc-filter:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3045,6 +3084,7 @@ dont-distribute-packages:
   classy-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-prelude-yesod:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3060,6 +3100,7 @@ dont-distribute-packages:
   clean-unions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cless:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clevercss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cli-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3068,6 +3109,7 @@ dont-distribute-packages:
   clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippings:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cloben:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clocked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clone-all:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3098,6 +3140,7 @@ dont-distribute-packages:
   codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   codeworld-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3127,13 +3170,17 @@ dont-distribute-packages:
   commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  commutative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
   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 ]
   compdata-automata:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-dags:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compdata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compdata-param:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   compensated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   competition:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3180,6 +3227,7 @@ dont-distribute-packages:
   console-program:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-categories:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3259,6 +3307,8 @@ dont-distribute-packages:
   crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   crc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   creatur:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  credentials-cli:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  credential-store:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1-constrained:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain2-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3266,6 +3316,8 @@ dont-distribute-packages:
   cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   criterion-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   criterion-to-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  criu-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  criu-rpc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3312,6 +3364,7 @@ dont-distribute-packages:
   d3js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  damnpacket:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3355,6 +3408,7 @@ dont-distribute-packages:
   data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-fin-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-flagset:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-interval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-kiln:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-layer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3396,11 +3450,18 @@ dont-distribute-packages:
   dclabel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-build:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-babel:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-eval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-core-flow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-llvm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-salt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-simpl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-core-tetra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-driver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-interface:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ddc-source-tetra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ddc-war:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dead-code-detection:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3429,6 +3490,7 @@ dont-distribute-packages:
   delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   delta-h:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   delta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Delta-Lambda:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   demarcate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   denominate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3509,6 +3571,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 ]
+  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 ]
   distributed-process-async:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3522,6 +3585,7 @@ dont-distribute-packages:
   distributed-process-simplelocalnet:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   dixi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3530,10 +3594,12 @@ dont-distribute-packages:
   DMuCheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DnaProteinAlignment:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dnscache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dnsrbl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dnssd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3594,6 +3660,7 @@ dont-distribute-packages:
   dvi-processing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dwarfadt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dynamic-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-linker-template:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-mvector:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dynamic-object:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3606,12 +3673,14 @@ dont-distribute-packages:
   DysFRP-Craftwerk:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   dywapitchtrack:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   eager-sockets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  earclipper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   easy-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebeats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ec2-unikernel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecdsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3708,6 +3777,7 @@ dont-distribute-packages:
   eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Euterpea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eventloop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EventSocket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventsource-geteventstore-store:              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3719,6 +3789,7 @@ dont-distribute-packages:
   exception-monads-fd:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   execs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exference:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   exhaustive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   exherbo-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   exif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3744,7 +3815,9 @@ dont-distribute-packages:
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extended-reals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extensible-effects:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3753,6 +3826,7 @@ dont-distribute-packages:
   Facts:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   factual-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno-braids:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fadno-xml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FailureT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fake-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3767,6 +3841,7 @@ dont-distribute-packages:
   fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-simplejson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fbmessenger-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fb-persistent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fca:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3806,6 +3881,7 @@ dont-distribute-packages:
   filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filesystem-trees:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   filtrable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3832,6 +3908,7 @@ dont-distribute-packages:
   flac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flac-picture:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flamethrower:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flamingra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   flat-maybe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexible-time:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexiwrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3844,6 +3921,7 @@ dont-distribute-packages:
   flowdock-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  flow-er:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3863,11 +3941,13 @@ dont-distribute-packages:
   foo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   forbidden-fruit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fordo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  forecast-io:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   foreign-var:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForestStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   forger:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   forkable-monad:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ForkableT:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3912,6 +3992,7 @@ dont-distribute-packages:
   FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-vector-spaces:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fresh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-juicypixels:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3920,6 +4001,7 @@ dont-distribute-packages:
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   FTGL-bytestring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3953,10 +4035,12 @@ dont-distribute-packages:
   gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   game-of-life:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   game-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Gamgine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   garepinoh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gbu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gc-monitoring-wai:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gcodehs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeBoP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3993,8 +4077,10 @@ 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:                            [ 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 ]
+  genvalidity-time:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4035,10 +4121,12 @@ dont-distribute-packages:
   ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ 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 ]
+  Gifcurry:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-girepository:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gi-gstaudio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4062,18 +4150,22 @@ dont-distribute-packages:
   git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-date:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-fmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-freq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   github:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-release:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-webhook-handler-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-jump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-mediate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-monitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-object:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-sanity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4093,6 +4185,7 @@ dont-distribute-packages:
   GLFW-task:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   glirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gll:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4121,21 +4214,27 @@ dont-distribute-packages:
   gnomevfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnss-converters:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gnuidn:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   goa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-geometry:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-probability:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-simulation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  goatee-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  goatee:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   goat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-containerbuilder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-firebase-dynamiclinks:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-iam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gogol-manufacturers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-ml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-runtimeconfig:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-safebrowsing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicecontrol:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gogol-servicemanagement:                      [ 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 ]
   google-drive:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4151,8 +4250,10 @@ dont-distribute-packages:
   GoogleTranslate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gopherbot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-demo:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gore-and-ash-lambdacube:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-logging:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-network:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gore-and-ash-sdl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sync:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   GotoT-transformers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpah:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4204,6 +4305,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 ]
+  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 ]
   gridland:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4227,6 +4329,7 @@ dont-distribute-packages:
   gsmenu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gssapi-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gstreamer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4256,6 +4359,7 @@ dont-distribute-packages:
   h2048:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4264,11 +4368,14 @@ dont-distribute-packages:
   hack2-interface-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-diff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-mirror:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-sparks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-whatsnew:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackernews:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4282,12 +4389,14 @@ dont-distribute-packages:
   hack-handler-kibro:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-simpleserver:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HackMail:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackmanager:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-cleanpath:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-clientsession:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haddocset:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-formats:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hadoop-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4323,6 +4432,7 @@ dont-distribute-packages:
   hamsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamtmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  handa-gdata:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hangman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hannahci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4388,6 +4498,7 @@ dont-distribute-packages:
   hascat-system:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haschoo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HasGP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hashable-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashable-generics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4457,6 +4568,7 @@ dont-distribute-packages:
   haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskellscript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-prisms:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-src-exts-qq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-simple:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-token-utils:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4503,6 +4615,7 @@ dont-distribute-packages:
   HaskRel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasmin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-backend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-class:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4530,6 +4643,7 @@ dont-distribute-packages:
   HaVSA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hawitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hawk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hax:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-amazonka:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-facebook:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4541,6 +4655,7 @@ dont-distribute-packages:
   hayoo-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hayoo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hback:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hbayes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hbb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hBDD-CMUBDD:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hBDD-CUDD:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4672,6 +4787,7 @@ dont-distribute-packages:
   hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgettext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4726,6 +4842,7 @@ dont-distribute-packages:
   HJScript:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HJVM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlbfgsb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hleap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4744,6 +4861,7 @@ dont-distribute-packages:
   HListPP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlwm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4756,6 +4874,7 @@ dont-distribute-packages:
   hmatrix-repa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-svdlibc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4792,6 +4911,7 @@ dont-distribute-packages:
   Holumbus-Storage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   homeomorphic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hommage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  homplexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoobuddy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4813,6 +4933,7 @@ dont-distribute-packages:
   hopfli:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hothasktags:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4843,6 +4964,7 @@ dont-distribute-packages:
   hpqtypes-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpqtypes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hprotoc-fork:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hprotoc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-cairo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-kmeans:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPushover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4851,6 +4973,7 @@ dont-distribute-packages:
   hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hreader-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-reversi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4873,6 +4996,7 @@ dont-distribute-packages:
   hsbencher-fusion:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc2hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-forth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4881,8 +5005,10 @@ dont-distribute-packages:
   hsc3-lisp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-plot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-rec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-rw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-unsafe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscaffold:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscamwire:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4890,6 +5016,7 @@ dont-distribute-packages:
   hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hscope:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hScraper:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4947,6 +5074,7 @@ dont-distribute-packages:
   HsOpenSSL-x509-system:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HSoundFile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsoz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparklines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4955,6 +5083,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-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 ]
   hspec-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4971,6 +5100,7 @@ dont-distribute-packages:
   hsql-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-datamodel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-datamodel-vinyl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsqml-demo-manic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-morris:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-demo-notes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsqml-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4979,6 +5109,8 @@ dont-distribute-packages:
   hs-scrape:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hssqlppp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hssqlppp-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hstest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5001,11 +5133,13 @@ dont-distribute-packages:
   hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyscall:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsyslog-udp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hszephyr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HTab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hTalos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   htar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HTicTacToe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  html-entities:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-rules:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-tokenizer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hts:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5021,6 +5155,7 @@ dont-distribute-packages:
   http-dispatch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-pony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules-raw:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5039,6 +5174,7 @@ dont-distribute-packages:
   hulk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hums:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hunch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HUnit-Diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HUnit-Plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5061,6 +5197,8 @@ dont-distribute-packages:
   hw-excess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-kafka-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-kafka-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker-ses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-packed-vector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5100,6 +5238,7 @@ dont-distribute-packages:
   hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyloutils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperdrive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyper-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperfunctions:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperloglog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperloglogplus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5178,6 +5317,7 @@ dont-distribute-packages:
   InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  influxdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   inject-function:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   inline-java:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5196,10 +5336,12 @@ dont-distribute-packages:
   intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interlude-l:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpolation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  interpol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   interruptible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction-test:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   intro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5222,6 +5364,8 @@ dont-distribute-packages:
   iptables-helpers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   iptadmin:                                     [ 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 ]
   irc-dcc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5281,6 +5425,7 @@ dont-distribute-packages:
   javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Jdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   jni:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5305,6 +5450,7 @@ dont-distribute-packages:
   json-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-assertions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-quickcheck:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-autotype:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSON-Combinator-Examples:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5364,6 +5510,7 @@ dont-distribute-packages:
   kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-i18n:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-environment-gtk:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-lightmodel:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-protectedmodel:         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5384,6 +5531,7 @@ dont-distribute-packages:
   keyring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keysafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   keystore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keyvaluehash:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   keyword-args:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   khph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5417,7 +5565,9 @@ dont-distribute-packages:
   laika:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda2js:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-calculator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-canvas:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5448,6 +5598,7 @@ dont-distribute-packages:
   lambdaya-bus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lambdaya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdiff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lame:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame-tester:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-bash:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-boogie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5460,6 +5611,7 @@ dont-distribute-packages:
   language-guess:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-java-classfile:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-kort:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-lua2:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua-qq:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-mixal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5481,6 +5633,7 @@ dont-distribute-packages:
   lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LATS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  layers-game:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   layout-bootstrap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lazyarray:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5498,6 +5651,7 @@ dont-distribute-packages:
   learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   leetify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  legion-discovery-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-discovery:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5557,6 +5711,7 @@ dont-distribute-packages:
   libzfs:                                       [ 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 ]
   lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lighttpd-conf-qq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lilypond:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5632,6 +5787,7 @@ dont-distribute-packages:
   located-monad-logger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lock-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-elasticsearch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5649,6 +5805,7 @@ dont-distribute-packages:
   log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   logsink:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-warper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojban:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanParser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lojbanXiragan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5675,6 +5832,7 @@ dont-distribute-packages:
   LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsystem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ltext:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltiv1p1:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   luachunk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5691,13 +5849,17 @@ dont-distribute-packages:
   lxc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   lye:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lykah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lz4-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-clib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lzma-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lzma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lzma-streams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   maam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machinecell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maclight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   madlang:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5737,11 +5899,13 @@ dont-distribute-packages:
   manifold-random:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  map-syntax:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-pap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   markup-preview:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5786,13 +5950,17 @@ dont-distribute-packages:
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mega-sdist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mellon-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mellon-gpio:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-web:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcached-binary:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcached:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  memis:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   memoization-utils:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-ptr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  merge-bash-history:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   messente:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   metadata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MetaHDBC:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5814,6 +5982,7 @@ dont-distribute-packages:
   microlens-each:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   micrologger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   MicrosoftTranslator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mida:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   midair:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   midimory:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-music-box:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5831,6 +6000,7 @@ dont-distribute-packages:
   miniforth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   minilens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   minimung:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  minio-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   minions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   minioperational:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   miniplex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5861,6 +6031,7 @@ dont-distribute-packages:
   modulo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MoeDict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   moesocks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mohws:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mollie-api-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadacme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5896,6 +6067,7 @@ dont-distribute-packages:
   MonadStack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-state:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-statevar:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-ste:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-st:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-io:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-stm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5907,6 +6079,7 @@ dont-distribute-packages:
   Monatron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monatron-IO:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mondo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monetdb-mapi:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   money:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5950,7 +6123,13 @@ dont-distribute-packages:
   mtl-tf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtlx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MuCheck-Hspec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MuCheck-HUnit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MuCheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MuCheck-QuickCheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MuCheck-SmallCheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mudbath:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mud:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5964,6 +6143,7 @@ dont-distribute-packages:
   multirec-binary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   multisetrewrite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multistate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   multivariant:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Munkres-simple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   muon:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5973,6 +6153,7 @@ dont-distribute-packages:
   musicbrainz-email:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-parts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  music-pitch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-preludes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   music-sibelius:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5983,8 +6164,12 @@ dont-distribute-packages:
   mustache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mutable-iter:                                 [ 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 ]
   mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mxnet-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mxnet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mxnet-nnvm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   myo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   MyPrimes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession-example:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6016,6 +6201,7 @@ dont-distribute-packages:
   nanovg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   narc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  native:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nat-sized-numbers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nats-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NaturalLanguageAlphabets:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6067,6 +6253,7 @@ dont-distribute-packages:
   network-minihttp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-msgpack-rpc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-netpacket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-protocol-xmpp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-rpca:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-service:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6116,6 +6303,7 @@ dont-distribute-packages:
   NonEmptyList:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonfree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  normalization-insensitive:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   no-role-annots:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   notcpp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6130,7 +6318,9 @@ dont-distribute-packages:
   nullary:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nullpipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  number-length:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NumberSieves:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NumberTheory:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -6167,9 +6357,12 @@ dont-distribute-packages:
   omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnicodec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  omnifmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   on-a-horse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  onama:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   one-liner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   oneormore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OnRmt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-classy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6205,6 +6398,7 @@ dont-distribute-packages:
   open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   operational-alacarte:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimization:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6220,12 +6414,14 @@ dont-distribute-packages:
   organize-imports:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orgstat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   origami:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   OrPatterns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-download:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OSM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oso2pdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   overture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6241,8 +6437,11 @@ dont-distribute-packages:
   Paillier:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-crossref:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-csv2table:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-include-code:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6260,6 +6459,7 @@ dont-distribute-packages:
   parco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   parconc-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pareto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6274,6 +6474,7 @@ dont-distribute-packages:
   partial:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-isomorphisms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  partial-order:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   partly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   passage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PasswordGenerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6288,6 +6489,7 @@ dont-distribute-packages:
   patterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-adaptive-hoops:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   paypal-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  paypal-rest-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pbc4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   PBKDF2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6295,6 +6497,8 @@ dont-distribute-packages:
   PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcre-light-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdf-slave:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pdf-slave-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdfsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pdynload:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   peakachu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6330,6 +6534,7 @@ dont-distribute-packages:
   persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-ratelimit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persona:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona-idp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pesca:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   peyotls-codec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6360,6 +6565,7 @@ dont-distribute-packages:
   Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-async:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-attoparsec-streaming:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-bgzf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cacophony:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cereal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6370,8 +6576,11 @@ dont-distribute-packages:
   pipes-errors:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-files:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-illumina:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-key-value-csv:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-lzma:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6379,7 +6588,9 @@ dont-distribute-packages:
   pipes-rt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-shell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-sqlite-simple:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-zeromq4:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-zlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Piso:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pitchtrack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6405,6 +6616,7 @@ dont-distribute-packages:
   pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pocket-dns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pocket:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6445,6 +6657,7 @@ dont-distribute-packages:
   postgresql-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-schema:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-bind:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgresql-simple-opts:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-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 ]
@@ -6452,8 +6665,10 @@ dont-distribute-packages:
   postgrest-ws:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postmark-streams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmaster:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   potato-tool:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  potrace-diagrams:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   powermate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PPrinter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6461,6 +6676,7 @@ dont-distribute-packages:
   pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  praglude:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   preamble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6477,6 +6693,7 @@ dont-distribute-packages:
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-error:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PrimitiveArray:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6498,6 +6715,7 @@ dont-distribute-packages:
   procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prof2pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6541,9 +6759,12 @@ dont-distribute-packages:
   punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pure-cdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pure-priority-queue:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   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 ]
@@ -6579,6 +6800,7 @@ dont-distribute-packages:
   QuadTree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quantfin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quantum-arrow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quantum-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   qudb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Quelea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quenya-verb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6586,6 +6808,7 @@ dont-distribute-packages:
   queuelike:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickAnnotate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickbooks:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-combinators:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickCheck-GenT:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-poly:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-comb:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6593,7 +6816,9 @@ dont-distribute-packages:
   quickcheck-regex:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-relaxng:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-report:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-special:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-string-random:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-with-counterexamples:              [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6606,6 +6831,9 @@ dont-distribute-packages:
   quickwebapp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quipper-rendering:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quiver-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quiver-groups:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quiver-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-instances:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-interleave:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   quiver-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6623,6 +6851,7 @@ dont-distribute-packages:
   rakhana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ralist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rallod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  raml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6639,10 +6868,16 @@ dont-distribute-packages:
   Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-example-config:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-bufs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-cmd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-cursors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-files:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-logger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-slate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-status-bar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa-ext-style:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-views:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rasa-ext-vim:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rasa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rattletrap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6660,6 +6895,7 @@ dont-distribute-packages:
   reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-sdl2:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-threepenny:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-wx:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6673,6 +6909,7 @@ dont-distribute-packages:
   react-tutorial-haskell-server:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ReadArgs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   read-bounded:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  read-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   readline-statevar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   readme-lhs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   readpyc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6687,6 +6924,8 @@ dont-distribute-packages:
   records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursion-schemes:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  recursors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reddit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reduce-equations:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6710,6 +6949,7 @@ dont-distribute-packages:
   reflex-orphans:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ref-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  refresht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   refty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexchar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6755,12 +6995,14 @@ dont-distribute-packages:
   remote-json-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote-json-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  remote-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   remotion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reorderable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-array:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-bytestring:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-convert:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-devil:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  repa-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-fftw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-flow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-linear-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6795,7 +7037,9 @@ dont-distribute-packages:
   resumable-exceptions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   rethinkdb-client-driver:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rethinkdb-model:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rethinkdb-wereHamster:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   retryer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reverse-geocoding:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reversi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ReviewBoard:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6826,6 +7070,7 @@ dont-distribute-packages:
   RNAFoldProgs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAlien:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   RNAwolf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rncryptor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   robot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   robots-txt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6835,6 +7080,7 @@ dont-distribute-packages:
   roller:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   RollingDirectory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rose-trees:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rose-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   roshask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rosmsg-bin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6860,9 +7106,11 @@ dont-distribute-packages:
   rtcm:                                         [ 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 ]
   ruby-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruby-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ruin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruler-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruler:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rungekutta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6873,8 +7121,10 @@ dont-distribute-packages:
   safe-access:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-lazy-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-length:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6922,6 +7172,7 @@ dont-distribute-packages:
   scholdoc-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   scons2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6942,6 +7193,8 @@ dont-distribute-packages:
   scrz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sdl2-cairo-image:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-gfx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-image:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6987,19 +7240,25 @@ dont-distribute-packages:
   servant-auth-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-docs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-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-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 ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-github:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github-webhook:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-mock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-multipart:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pandoc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-purescript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-router:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7007,6 +7266,7 @@ dont-distribute-packages:
   servant-subscriber:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-swagger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-swagger-ui:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-persistent:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-redis:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-frontend-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7018,6 +7278,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 ]
+  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 ]
   sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7027,6 +7288,7 @@ dont-distribute-packages:
   SFML-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sfnt2woff:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFont:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SGdemo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7054,6 +7316,7 @@ dont-distribute-packages:
   Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shellmate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelltestrunner:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7095,8 +7358,10 @@ dont-distribute-packages:
   simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleServer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-sql-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplessh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplest-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SimpleTableGenerator:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-tabular:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7111,13 +7376,17 @@ dont-distribute-packages:
   skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   skell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   skemmtun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  skylark-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   skylighting:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   skype4hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slack-web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   slidemews:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Slides:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sloane:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slot-lambda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallarray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-laws:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7189,6 +7458,7 @@ dont-distribute-packages:
   snap-loader-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snappy-framing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snappy-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-routes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7215,6 +7485,7 @@ dont-distribute-packages:
   socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  socket-unix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sodium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   soegtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   solga-swagger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7285,17 +7556,23 @@ dont-distribute-packages:
   stable-marriage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-memo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage-build-plan:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-haddock:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   starling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   starrover2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stasis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  state-bag:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   state:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  state-plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   state-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   statgrab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7303,6 +7580,7 @@ dont-distribute-packages:
   statistics-hypergeometric-genvar:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  staversion:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7349,10 +7627,12 @@ dont-distribute-packages:
   stripe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   structs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-induction:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  structural-traversal:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   structured-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   structures:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stunts:                                       [ 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 ]
   subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7371,6 +7651,7 @@ dont-distribute-packages:
   supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   super-user-spark:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  supplemented:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7415,6 +7696,7 @@ dont-distribute-packages:
   sys-process:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  system-locale:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   systemstats:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   t3-client:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7425,6 +7707,7 @@ dont-distribute-packages:
   Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablestorage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   table-tennis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tablize:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tag-bits:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7435,6 +7718,7 @@ dont-distribute-packages:
   tagsoup-ht:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-parsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-selection:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Tahin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tailfile-hinotify:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7471,6 +7755,7 @@ dont-distribute-packages:
   telegram-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  teleport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tellbot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7491,10 +7776,12 @@ dont-distribute-packages:
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  TestExplode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-sandbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-skip:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-framework-th-prime:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpattern:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7506,6 +7793,7 @@ dont-distribute-packages:
   test-sandbox:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-sandbox-quickcheck:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-shouldbe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  test-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-all:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7514,6 +7802,10 @@ dont-distribute-packages:
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-ldap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-lips:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-markup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   textocat-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7548,6 +7840,7 @@ dont-distribute-packages:
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   threads-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threepenny-gui-flexbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7659,6 +7952,7 @@ dont-distribute-packages:
   trhsx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   triangulation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TrieMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tries:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   trimpolya:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tripLL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tropical:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7671,6 +7965,7 @@ dont-distribute-packages:
   tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tup-functor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-hlist:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7681,6 +7976,7 @@ dont-distribute-packages:
   tweak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-eventloop-graphics:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-graphs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-rosetree:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   twentefp-trees:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7695,8 +7991,11 @@ dont-distribute-packages:
   twiml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   twisty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   txtblk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7740,8 +8039,10 @@ dont-distribute-packages:
   uconv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  udp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uhexdump:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uhttpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uid:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   UMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7751,6 +8052,7 @@ dont-distribute-packages:
   unbreak:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-normalization:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unicode-show:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-symbols:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   union-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7771,6 +8073,7 @@ dont-distribute-packages:
   unscramble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unsequential:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unused:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  update-nix-fetchgit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   up:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uploadcare:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   upskirt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7818,6 +8121,7 @@ dont-distribute-packages:
   variables:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vcatt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcsgui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7862,6 +8166,7 @@ dont-distribute-packages:
   vrpn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vty-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7884,6 +8189,7 @@ dont-distribute-packages:
   wai-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7934,6 +8240,7 @@ dont-distribute-packages:
   webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WeberLogic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webfinger-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-fpco:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   webify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-inv-route:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7943,6 +8250,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-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 ]
   web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7953,12 +8261,17 @@ dont-distribute-packages:
   websnap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   websockets-snap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   webwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wedged:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  weighted:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted-regexp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   welshy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  werewolf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  werewolf-slack:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wheb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-mongo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-redis:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wheb-strapped:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  while-lang-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   whim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   whiskers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   whitespace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7987,11 +8300,13 @@ dont-distribute-packages:
   WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordsearch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  workdays:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-windows:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wp-archivebot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wrecker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wreq-sb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wright:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   writer-cps-monads-tf:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsedit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8057,12 +8372,16 @@ dont-distribute-packages:
   xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-to-json:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-tydom-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client-glib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMMS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-bluetilebranch:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-bluetilebranch:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-contrib-gpl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-vanessa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xmonad-wallpaper:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-windownames:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmpipe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMPP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8070,6 +8389,7 @@ dont-distribute-packages:
   xournal-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   xournal-convert:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   xournal-render:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xpathdsv:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xsact:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   XSaiga:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xslt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8080,6 +8400,7 @@ dont-distribute-packages:
   yabi-muno:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   YACPong:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yahoo-finance-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yahoo-finance-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yahoo-web-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8097,6 +8418,7 @@ dont-distribute-packages:
   YampaSynth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yarr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yarr-image-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yavie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8105,6 +8427,7 @@ dont-distribute-packages:
   yeshql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-angular-ui:                             [ 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 ]
   yesod-auth-deskcom:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-fb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8112,6 +8435,8 @@ dont-distribute-packages:
   yesod-auth-kerberos:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-mediocre:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-oauth2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-oauth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-smbclient:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-zendesk:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8124,20 +8449,24 @@ dont-distribute-packages:
   yesod-csp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-fb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-ip:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-job-queue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-media-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pagination:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-paypal-rest:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-platform:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pnotify:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-purescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-recaptcha:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-flow:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8147,6 +8476,7 @@ dont-distribute-packages:
   yesod-session-redis:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-tableview:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-test-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-text-markdown:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8154,12 +8484,15 @@ dont-distribute-packages:
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-keymap-cua:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-keymap-emacs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-keymap-vim:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-misc-modes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-mode-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-mode-javascript:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-monokai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yi-solarized:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-spolsky:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp-libs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8170,6 +8503,7 @@ dont-distribute-packages:
   yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yst:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yuiGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yuuko:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yxdb-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8199,5 +8533,7 @@ dont-distribute-packages:
   zoom-cache-pcm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-cache-sndfile:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zoom-refs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zstd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]

From 090921fa5f4943e50464b6e7953c2d1935a019f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Mar 2017 09:16:30 +0100
Subject: [PATCH 1560/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/163561eab9dfab4e48923e6efdcc29b2a5a13861.
---
 .../haskell-modules/hackage-packages.nix      | 832 ++++++++++++++++--
 1 file changed, 746 insertions(+), 86 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a2e477baa15e..0c70f42b65f9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -269,6 +269,7 @@ self: {
        homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -1801,6 +1802,7 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Boolean" = callPackage
@@ -3816,6 +3818,7 @@ self: {
        homepage = "https://github.com/listofoptions/delta-lambda";
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DescriptiveKeys" = callPackage
@@ -5376,6 +5379,7 @@ self: {
        homepage = "https://github.com/exFalso/ForkableT/";
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FormalGrammars" = callPackage
@@ -5919,6 +5923,7 @@ self: {
        ];
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ganymede" = callPackage
@@ -6181,6 +6186,7 @@ self: {
        homepage = "https://github.com/lettier/gifcurry";
        description = "Create animated GIFs, overlaid with optional text, from video files";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GiveYouAHead" = callPackage
@@ -10064,6 +10070,7 @@ self: {
        homepage = "https://github.com/brunoczim/Json-Data-for-Haskell";
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JsContracts" = callPackage
@@ -11943,6 +11950,7 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/mucheck";
        description = "Automated Mutation Testing";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MuCheck-HUnit" = callPackage
@@ -11958,6 +11966,7 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/mucheck-hunit";
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MuCheck-Hspec" = callPackage
@@ -11973,6 +11982,7 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/mucheck-hspec";
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MuCheck-QuickCheck" = callPackage
@@ -11988,6 +11998,7 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/mucheck-quickcheck";
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MuCheck-SmallCheck" = callPackage
@@ -12003,6 +12014,7 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/mucheck-smallcheck";
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Munkres" = callPackage
@@ -12615,6 +12627,7 @@ self: {
        testHaskellDepends = [ base containers HUnit primes ];
        description = "A library for number theoretic computations, written in Haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Numbers" = callPackage
@@ -12839,6 +12852,7 @@ self: {
        ];
        description = "Text UI library for performing parallel remote SSH operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OneTuple" = callPackage
@@ -13756,6 +13770,7 @@ self: {
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
@@ -15328,6 +15343,7 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ScratchFs" = callPackage
@@ -15682,6 +15698,7 @@ self: {
        testHaskellDepends = [ base Cabal ];
        description = "Simple table generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SizeCompare" = callPackage
@@ -16591,6 +16608,7 @@ self: {
        homepage = "http://github.com/mtesseract/Tahin#readme";
        description = "Tahin Password Generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tainted" = callPackage
@@ -16727,6 +16745,7 @@ self: {
        homepage = "https://github.com/testexplode/testexplode";
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Theora" = callPackage
@@ -19874,6 +19893,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Basic definitions for activehs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -19984,6 +20004,7 @@ self: {
        homepage = "https://projects.zubr.me/wiki/adblock2privoxy";
        description = "Convert adblock config files to privoxy format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -20425,6 +20446,7 @@ self: {
        homepage = "https://github.com/seanhess/aeson-flat#readme";
        description = "Tools for creating flat JSON serializations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-flatten" = callPackage
@@ -20656,6 +20678,7 @@ self: {
        homepage = "https://github.com/libscott/aeson-quick";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-schema" = callPackage
@@ -21127,8 +21150,8 @@ self: {
      }:
      mkDerivation {
        pname = "airtable-api";
-       version = "0.2.0.0";
-       sha256 = "aeb20ea165849959f6a4463dd85a0c3f4d41012bfd11b4b8eef65942f24f024a";
+       version = "0.2.0.1";
+       sha256 = "e17565f18a0ecee13f9650a350f4731e20a21df03c350a8aa6bfe30b37233230";
        libraryHaskellDepends = [
          aeson base bytestring hashable lens text time unordered-containers
          wreq
@@ -21472,6 +21495,7 @@ self: {
        homepage = "https://github.com/mrkkrp/alga";
        description = "Algorithmic automation for various DAWs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebra" = callPackage
@@ -24091,6 +24115,7 @@ self: {
        homepage = "http://github.com/MichaelXavier/Angel";
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "angle" = callPackage
@@ -24226,6 +24251,7 @@ self: {
        homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-pretty" = callPackage
@@ -24578,6 +24604,7 @@ self: {
        homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "api-field-json-th" = callPackage
@@ -25171,6 +25198,7 @@ self: {
        homepage = "https://github.com/takano-akio/applicative-splice";
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apply-refact" = callPackage
@@ -26223,6 +26251,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "asn1-encoding_0_9_5" = callPackage
+    ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl
+     , tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "asn1-encoding";
+       version = "0.9.5";
+       sha256 = "1e863bfd363f6c3760cc80f2c0d422e17845a9f79fe006030db202ecab5aaf29";
+       libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
+       testHaskellDepends = [
+         asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
+         text
+       ];
+       homepage = "http://github.com/vincenthz/hs-asn1";
+       description = "ASN1 data reader and writer in RAW, BER and DER forms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "asn1-parse" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }:
      mkDerivation {
@@ -26686,6 +26733,7 @@ self: {
        homepage = "http://github.com/ynishi/atndapi#readme";
        description = "An interface of ATND API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom" = callPackage
@@ -26931,6 +26979,7 @@ self: {
        homepage = "http://github.com/passy/attic-schedule#readme";
        description = "A script I use to run \"attic\" for my backups";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atto-lisp" = callPackage
@@ -27303,6 +27352,7 @@ self: {
        homepage = "https://github.com/wangbj/aur-api";
        description = "ArchLinux AUR json v5 API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "authenticate" = callPackage
@@ -28177,6 +28227,7 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sdk" = callPackage
@@ -29644,6 +29695,7 @@ self: {
        homepage = "http://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -30223,6 +30275,7 @@ self: {
        homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary_0_7_6_1" = callPackage
@@ -31308,6 +31361,7 @@ self: {
        libraryPkgconfigDepends = [ monetdb-mapi ];
        description = "Low-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {monetdb-mapi = null;};
 
   "bindings-mpdecimal" = callPackage
@@ -32381,6 +32435,7 @@ self: {
        homepage = "http://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitx-bitcoin" = callPackage
@@ -32756,6 +32811,7 @@ self: {
        homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using blaze-html with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-from-html" = callPackage
@@ -33030,8 +33086,8 @@ self: {
      }:
      mkDerivation {
        pname = "ble";
-       version = "0.1.3.0";
-       sha256 = "adddceeeca53d3ef79dc6e3d8a01f41d3382d8227a794c5df8adbae24ae799fb";
+       version = "0.2.0.0";
+       sha256 = "c8961033317b333de25d2fa49375b309b17aa1d825bb4030cc0cc990df6655e1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33128,6 +33184,7 @@ self: {
        homepage = "https://github.com/kseo/blockhash#readme";
        description = "Blockhash perceptual image hash algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blocking-transactions" = callPackage
@@ -33243,6 +33300,7 @@ self: {
        homepage = "http://github.com/MichaelXavier/bloodhound-amazonka-auth#readme";
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloomfilter" = callPackage
@@ -33784,6 +33842,7 @@ self: {
        ];
        description = "A Bookmarks manager with a HTML generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boombox" = callPackage
@@ -34632,6 +34691,7 @@ self: {
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildbox-tools" = callPackage
@@ -35635,6 +35695,7 @@ self: {
        ];
        description = "A command line program for managing the bounds/versions of the dependencies in a cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-cargs" = callPackage
@@ -35657,6 +35718,7 @@ self: {
        testHaskellDepends = [ base filepath tasty tasty-golden ];
        description = "A command line program for extracting compiler arguments from a cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-constraints" = callPackage
@@ -35692,6 +35754,7 @@ self: {
        homepage = "http://github.com/vincenthz/cabal-db";
        description = "query tools for the local cabal database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-debian" = callPackage
@@ -36090,6 +36153,7 @@ self: {
        ];
        description = "A monitor for cabal builds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-nirvana" = callPackage
@@ -36222,6 +36286,7 @@ self: {
        ];
        description = "Topologically sort cabal packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-src" = callPackage
@@ -36301,6 +36366,7 @@ self: {
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-uninstall" = callPackage
@@ -36762,6 +36828,7 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -37113,6 +37180,7 @@ self: {
        homepage = "https://github.com/SumAll/canteven-http";
        description = "Utilities for HTTP programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canteven-listen-http" = callPackage
@@ -38172,6 +38240,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "catnplus" = callPackage
+    ({ mkDerivation, ansi-terminal, base, directory, either
+     , optparse-applicative, template-haskell, terminal-size
+     , transformers, vcs-revision
+     }:
+     mkDerivation {
+       pname = "catnplus";
+       version = "0.1.0.0";
+       sha256 = "72b17e8a2b104b9d194802b97f5ababd3000635b74b1f6596b9d09b81fa67511";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-terminal base directory either optparse-applicative
+         template-haskell terminal-size transformers vcs-revision
+       ];
+       homepage = "https://github.com/rcook/catnplus#readme";
+       description = "Simple tool to display text files with line numbers and paging";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cautious-file" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, unix }:
      mkDerivation {
@@ -38185,6 +38274,7 @@ self: {
        ];
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayley-client" = callPackage
@@ -38493,6 +38583,7 @@ self: {
        ];
        description = "io-streams support for the cereal binary serialization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-plus" = callPackage
@@ -38540,6 +38631,7 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-text" = callPackage
@@ -38775,6 +38867,7 @@ self: {
        homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chain-codes" = callPackage
@@ -39042,13 +39135,13 @@ self: {
      }:
      mkDerivation {
        pname = "chatty";
-       version = "0.7.0.0";
-       sha256 = "87e2025fab3187c029ffdf221c8280b25dffb4f59fcf57212dcf0235ddba167b";
+       version = "0.7.0.1";
+       sha256 = "663d7bee8df42287cefa88f8c072981a2475e22d722046cd3ab6e6bdc775ec34";
        libraryHaskellDepends = [
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
        ];
-       homepage = "http://doomanddarkness.eu/pub/chatty";
+       homepage = "http://hub.darcs.net/enum/chatty";
        description = "Some monad transformers and typeclasses for abstraction of global dependencies";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39071,10 +39164,10 @@ self: {
     ({ mkDerivation, base, mtl, text, transformers }:
      mkDerivation {
        pname = "chatty-utils";
-       version = "0.7.3.3";
-       sha256 = "e966e3c04e31cba118a4dd5a3a695976b4e5aa03cafa8031c7305c1587ebf8ad";
+       version = "0.7.3.4";
+       sha256 = "dac3ce02d2c0b14258d8de258a3c0d8749d5c8466ed002ffb9df671d8899e1b6";
        libraryHaskellDepends = [ base mtl text transformers ];
-       homepage = "http://doomanddarkness.eu/pub/chatty";
+       homepage = "http://hub.darcs.net/enum/chatty-utils";
        description = "Some utilities every serious chatty-based application may need";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39172,6 +39265,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {resolv = null;};
 
+  "check-email_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, email-validate, resolv }:
+     mkDerivation {
+       pname = "check-email";
+       version = "1.0.2";
+       sha256 = "1c2615fadba09a5d7aa5c68648d12218a595efb759842fb4f524cf380afa9327";
+       libraryHaskellDepends = [ base bytestring email-validate ];
+       librarySystemDepends = [ resolv ];
+       homepage = "https://github.com/qoelet/check-email#readme";
+       description = "Confirm whether an email is valid and probably existant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {resolv = null;};
+
   "check-pvp" = callPackage
     ({ mkDerivation, base, Cabal, containers, explicit-exception
      , filepath, haskell-src-exts, non-empty, transformers, utility-ht
@@ -39255,6 +39362,7 @@ self: {
        homepage = "https://john-millikin.com/software/chell/";
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chesshs" = callPackage
@@ -39874,6 +39982,7 @@ self: {
        homepage = "https://github.com/denisshevchenko/circlehs";
        description = "The CircleCI REST API for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cirru-parser" = callPackage
@@ -40471,6 +40580,7 @@ self: {
        homepage = "http://fvisser.nl/clay";
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks" = callPackage
@@ -40811,6 +40921,7 @@ self: {
        homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/cli-builder";
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "click-clack" = callPackage
@@ -41008,6 +41119,7 @@ self: {
        homepage = "http://github.com/sgraf812/cloben#readme";
        description = "Clone and benchmark Haskell cabal projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clock" = callPackage
@@ -41762,6 +41874,7 @@ self: {
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codo-notation" = callPackage
@@ -42476,6 +42589,7 @@ self: {
        ];
        description = "Commutative binary operations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad" = callPackage
@@ -42596,6 +42710,7 @@ self: {
        ];
        description = "Socket functions for compact normal form";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compact-string" = callPackage
@@ -42674,6 +42789,7 @@ self: {
        ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compdata-automata" = callPackage
@@ -42734,6 +42850,7 @@ self: {
        ];
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compensated" = callPackage
@@ -44343,6 +44460,7 @@ self: {
        homepage = "https://github.com/oisdk/constrained-monads#readme";
        description = "Typeclasses and instances for monads with constraints";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-normal" = callPackage
@@ -46384,6 +46502,7 @@ self: {
        homepage = "https://github.com/rblaze/credential-store#readme";
        description = "Library to access secure credential storage providers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "credentials" = callPackage
@@ -46432,6 +46551,7 @@ self: {
        homepage = "https://github.com/brendanhay/credentials";
        description = "Secure Credentials Administration";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain1" = callPackage
@@ -46630,6 +46750,7 @@ self: {
        ];
        description = "CRIU RPC client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criu-rpc-types" = callPackage
@@ -46644,6 +46765,7 @@ self: {
        homepage = "https://github.com/wayofthepie/haskell-criu-rpc-types";
        description = "Criu RPC protocol buffer types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "crockford" = callPackage
@@ -48114,8 +48236,8 @@ self: {
      }:
      mkDerivation {
        pname = "curve25519";
-       version = "0.2.2";
-       sha256 = "baa776233ff1e56d3e4c9ecfc30c0c607e98bb2f4fdb8ef9a057d29d5dabe8f2";
+       version = "0.2.3";
+       sha256 = "d3f48bd08fea16d270fe5785380ca163ab9ef83d72d3b9418ef5ee74c83b964f";
        libraryHaskellDepends = [ base bytestring crypto-api ];
        testHaskellDepends = [
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
@@ -48346,6 +48468,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec HUnit QuickCheck ];
        description = "Parsing dAmn messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "danibot" = callPackage
@@ -49624,6 +49747,7 @@ self: {
        ];
        description = "Interval arithmetic for both open and closed intervals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-inttrie" = callPackage
@@ -51052,6 +51176,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-babel" = callPackage
@@ -51066,6 +51191,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler PHP code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -51119,6 +51245,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -51135,6 +51262,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -51151,6 +51279,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -51168,6 +51297,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-driver" = callPackage
@@ -51219,6 +51349,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-tools" = callPackage
@@ -54059,12 +54190,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_0_2" = callPackage
+  "directory_1_3_1_0" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.0.2";
-       sha256 = "f9ee11de8bbaf7b8e2710d40ca0f1081fd1aaa609faede14a3706d60345c7aa3";
+       version = "1.3.1.0";
+       sha256 = "94b0d06aba8311e3b9dc8e460d4ad5b25fdfcc361eecb8e7ad68a18f171aa7f2";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -54392,6 +54523,7 @@ self: {
        homepage = "https://github.com/joshuaclayton/distance-of-time#readme";
        description = "Generate readable distances between times";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-closure" = callPackage
@@ -54875,6 +55007,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests";
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-zookeeper" = callPackage
@@ -55294,6 +55427,7 @@ self: {
        homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/";
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dnssd" = callPackage
@@ -55414,6 +55548,7 @@ self: {
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockercook" = callPackage
@@ -56944,6 +57079,7 @@ self: {
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -57213,6 +57349,7 @@ self: {
        homepage = "https://github.com/zaidan/earclipper#readme";
        description = "Ear Clipping Triangulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easy-api" = callPackage
@@ -57396,6 +57533,7 @@ self: {
        homepage = "http://github.com/GaloisInc/ec2-unikernel";
        description = "A handy tool for uploading unikernels to Amazon's EC2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eccrypto" = callPackage
@@ -59180,8 +59318,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-wai";
-       version = "1.0.5";
-       sha256 = "80e4737835acbadb0aafa66defc961e32045c66760040456700853e5baf0dab3";
+       version = "1.0.6";
+       sha256 = "9db83e3a8e5dc42089f7078b6cea87746bd96872516d688292bcf92719de104a";
        libraryHaskellDepends = [
          attoparsec base bytestring either engine-io http-types mtl text
          transformers transformers-compat unordered-containers wai
@@ -60511,6 +60649,7 @@ self: {
        homepage = "-";
        description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsource-api" = callPackage
@@ -60935,6 +61074,7 @@ self: {
        homepage = "https://github.com/lspitzner/exference";
        description = "Tool to search/generate (haskell) expressions with a given type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exhaustive" = callPackage
@@ -61424,6 +61564,7 @@ self: {
        homepage = "https://github.com/msakai/extended-reals/";
        description = "Extension of real numbers with positive/negative infinities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible" = callPackage
@@ -61479,6 +61620,7 @@ self: {
        homepage = "https://github.com/suhailshergill/extensible-effects";
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -61693,6 +61835,7 @@ self: {
        homepage = "http://github.com/slpopejoy/fadno-xml";
        description = "XML/XSD combinators/schemas/codegen";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fail" = callPackage
@@ -62313,6 +62456,7 @@ self: {
        homepage = "https://github.com/prowdsponsor/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb-persistent" = callPackage
@@ -63424,6 +63568,7 @@ self: {
        homepage = "https://github.com/kallisti-dev/filesystem-trees";
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filtrable" = callPackage
@@ -64192,6 +64337,7 @@ self: {
        ];
        description = "FlameGraphs of profiling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flat-maybe" = callPackage
@@ -64464,6 +64610,7 @@ self: {
        homepage = "https://github.com/expede/flower#README";
        description = "More directional operators";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow2dot" = callPackage
@@ -65238,6 +65385,7 @@ self: {
        homepage = "https://github.com/stormont/forecast-io";
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foreign-storable-asymmetric" = callPackage
@@ -66340,6 +66488,7 @@ self: {
        homepage = "https://github.com/davidlazar/fresh";
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday" = callPackage
@@ -66691,6 +66840,7 @@ self: {
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -67610,6 +67760,7 @@ self: {
        homepage = "https://github.com/hackerspace/gcodehs";
        description = "GCode processor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gconf" = callPackage
@@ -67779,8 +67930,8 @@ self: {
      }:
      mkDerivation {
        pname = "gegl";
-       version = "0.0.0.4";
-       sha256 = "cd938dcc3042980669f01186cc4d0a52d03a5b8cf14553598ef6c04e0748f822";
+       version = "0.0.0.5";
+       sha256 = "e783b1718f06fea318730ec8f6fb6c7d89e66691fa5dfd779f40ba192b5c5920";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -67893,8 +68044,8 @@ self: {
      }:
      mkDerivation {
        pname = "gendocs";
-       version = "0.1.2";
-       sha256 = "60e9e403012fdf31fd99a7ec1e89034b3cabb32de167af9ad54a1d5da45c7a64";
+       version = "0.1.3";
+       sha256 = "0e934bfd9dd84f4e069737352e1c3503eef81747564f3dfd51e47a4959522df8";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring safe text
        ];
@@ -67910,8 +68061,8 @@ self: {
      }:
      mkDerivation {
        pname = "general-games";
-       version = "0.4.0";
-       sha256 = "ffd2e343716ee1bc73d6abfc810c06528e85eed083878f0c73cdc3510aa30642";
+       version = "1.0.1";
+       sha256 = "ce6805d308b6aed79de4c55ea6b4d1edd7ce0a536df9131d1aef2f1f7e1221a6";
        libraryHaskellDepends = [
          base monad-loops MonadRandom random random-shuffle
        ];
@@ -68507,6 +68658,7 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -68598,6 +68750,7 @@ self: {
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geo-resolver" = callPackage
@@ -69536,6 +69689,7 @@ self: {
        homepage = "https://github.com/valderman/ghc-simple";
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-srcspan-plugin" = callPackage
@@ -70995,8 +71149,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20170214";
-       sha256 = "d2f5a5bfa8077f417a8c0fee556571f498a9fbdabb99cdeed326df0a1f042e4b";
+       version = "6.20170301.1";
+       sha256 = "f416c02fabefb28e346b3bb6723141b0ff9785575e78e4d1e9ab5982cf6389de";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -71031,7 +71185,7 @@ self: {
        ];
        preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
        postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
-       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
+       installPhase = "make PREFIX=$out BUILDER=: install";
        checkPhase = "./git-annex test";
        enableSharedExecutables = false;
        homepage = "http://git-annex.branchable.com/";
@@ -71119,6 +71273,7 @@ self: {
        homepage = "https://github.com/hjwylde/git-fmt";
        description = "Custom git command for formatting code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-freq" = callPackage
@@ -71142,6 +71297,7 @@ self: {
        homepage = "https://github.com/fujimura/git-freq";
        description = "A Git subcommand to show total addition, deletion per file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-gpush" = callPackage
@@ -71221,6 +71377,7 @@ self: {
        homepage = "http://github.com/jwiegley/gitlib";
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-object" = callPackage
@@ -71424,8 +71581,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20170221";
-       sha256 = "2838227d760bb0ea933a84023ec3eeda23ffc0dc870c290dfcd6b9b19d02b869";
+       version = "1.20170301";
+       sha256 = "5e6215f3feac9dc8871e42e554decf6049df2f18f3d84fb8906fe0c3849378b0";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [
@@ -71439,7 +71596,7 @@ self: {
          unix-compat utf8-string vector
        ];
        executableToolDepends = [ git ];
-       homepage = "https://github.com/joeyh/github-backup";
+       homepage = "https://github-backup.branchable.com/";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71585,6 +71742,7 @@ self: {
        homepage = "https://github.com/relrod/gitignore";
        description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitit" = callPackage
@@ -72117,6 +72275,7 @@ self: {
        homepage = "https://github.com/goromlagche/gli#readme";
        description = "Tiny cli to fetch PR info from gitlab";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glib" = callPackage
@@ -72820,6 +72979,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnuidn/";
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
@@ -72983,6 +73143,7 @@ self: {
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goatee-gtk" = callPackage
@@ -73004,6 +73165,7 @@ self: {
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
        license = stdenv.lib.licenses.agpl3;
        platforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gofer-prelude" = callPackage
@@ -74553,6 +74715,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Natural Language SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-latencytest" = callPackage
@@ -74615,6 +74778,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Manufacturer Center SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-maps-coordinate" = callPackage
@@ -75267,6 +75431,7 @@ self: {
        homepage = "https://github.com/brendanhay/gogol";
        description = "Google Slides SDK";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol-spectrum" = callPackage
@@ -76020,6 +76185,7 @@ self: {
        homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme";
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash-logging" = callPackage
@@ -76082,6 +76248,7 @@ self: {
        homepage = "git@github.com:Teaspot-Studio/gore-and-ash-sdl.git";
        description = "Gore&Ash core module for integration with SDL library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash-sync" = callPackage
@@ -77119,6 +77286,7 @@ self: {
        homepage = "https://github.com/zaidan/gridbounds#readme";
        description = "Collision detection for GridBox";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gridbox" = callPackage
@@ -77609,6 +77777,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gst_plugins_base = null; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -78733,6 +78902,7 @@ self: {
        executableHaskellDepends = [ base optparse-applicative text ];
        description = "A blog system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hacanon-light" = callPackage
@@ -79197,6 +79367,7 @@ self: {
        homepage = "https://github.com/blitzcode/hackage-diff";
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-mirror" = callPackage
@@ -79227,6 +79398,7 @@ self: {
        homepage = "http://fpcomplete.com";
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-plot" = callPackage
@@ -79433,6 +79605,7 @@ self: {
        homepage = "https://github.com/stepcut/hackage-whatsnew";
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -79541,6 +79714,7 @@ self: {
        homepage = "http://github.com/agrafix/hackmanager";
        description = "Generate useful files for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackport" = callPackage
@@ -79792,6 +79966,7 @@ self: {
        homepage = "https://github.com/philopon/haddocset";
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -80811,6 +80986,7 @@ self: {
        homepage = "http://code.google.com/p/hgdata";
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "handa-geodata" = callPackage
@@ -81034,22 +81210,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hapistrano_0_3_0_1" = callPackage
-    ({ mkDerivation, aeson, base, directory, filepath, hspec, mtl
-     , optparse-applicative, path, path-io, process, temporary, time
-     , transformers, yaml
+  "hapistrano_0_3_1_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.0.1";
-       sha256 = "ab0da599f2b4cb7208b2bdc349844bedb28141937a4aa0b3546f57b98854a6dc";
+       version = "0.3.1.0";
+       sha256 = "41d680421dad0d83f7c05f7271788955ff332c6acd83cc9aa1a6af776b1c7a6a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base filepath mtl path process time transformers
        ];
        executableHaskellDepends = [
-         aeson base optparse-applicative path path-io yaml
+         aeson async base optparse-applicative path path-io stm yaml
        ];
        testHaskellDepends = [
          base directory filepath hspec mtl path path-io process temporary
@@ -82295,6 +82471,7 @@ self: {
        homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-generics" = callPackage
@@ -83630,6 +83807,7 @@ self: {
        testHaskellDepends = [ base haskell-src-exts hspec ];
        description = "A quasiquoter for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-simple" = callPackage
@@ -84611,8 +84789,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskelzinc";
-       version = "0.2.0.3";
-       sha256 = "a7248945f8c53b1a0f36e1c184c236fcb2bea27c970fc0453bcc0e88be767a72";
+       version = "0.3.0.9";
+       sha256 = "1a047ba85cbddf9a89d51799fb60231b5ca05a340c0baeefbac227637f97e5ed";
        libraryHaskellDepends = [
          base containers filepath parsec3 pretty process
        ];
@@ -85168,6 +85346,7 @@ self: {
        homepage = "https://github.com/contivero/hasmin/";
        description = "\"A CSS Minifier\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasparql-client" = callPackage
@@ -85841,6 +86020,7 @@ self: {
        homepage = "http://johannesgerer.com/hax";
        description = "Haskell cash-flow and tax simulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl" = callPackage
@@ -86077,6 +86257,7 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbb" = callPackage
@@ -88645,6 +88826,7 @@ self: {
        homepage = "https://github.com/vasylp/hgettext";
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgithub" = callPackage
@@ -90113,6 +90295,7 @@ self: {
        ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlbfgsb" = callPackage
@@ -90634,6 +90817,7 @@ self: {
        homepage = "https://github.com/hpdeifel/hlwm-haskell";
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hly" = callPackage
@@ -90874,6 +91058,7 @@ self: {
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -91241,6 +91426,7 @@ self: {
        homepage = "https://github.com/emilaxelsson/ho-rewriting";
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoauth" = callPackage
@@ -91661,6 +91847,7 @@ self: {
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "honi" = callPackage
@@ -92219,12 +92406,12 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
      mkDerivation {
        pname = "hopfli";
-       version = "0.2.1.0";
-       sha256 = "c3af486ae287728d01662cc13f552a80a9cc3274c9a20f58c5a37ecbd49ea5e7";
+       version = "0.2.1.1";
+       sha256 = "6cc5b278396c2c6d24bb3cca9458366d1444208b32e49f658e75efbd803b1fdf";
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
        homepage = "https://github.com/ananthakumaran/hopfli";
-       description = "zlib compatible compression using Zopfli Compression Algorithm";
+       description = "Bidings to Google's Zopfli compression library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -93161,6 +93348,7 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -93391,6 +93579,7 @@ self: {
        homepage = "http://github.com/dredozubov/hreader-lens";
        description = "Optics for hreader package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hricket" = callPackage
@@ -93588,8 +93777,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-duktape";
-       version = "0.1.3";
-       sha256 = "7c7a1b80b066c1436509d19a1e688ce506a31e30481100878411f89b5be33719";
+       version = "0.1.5";
+       sha256 = "716ea1f8a7414c64d03d2b7adcf47d1f29c0e2f916d8d550da63c834640683f4";
        libraryHaskellDepends = [
          aeson base bytestring text transformers unordered-containers vector
        ];
@@ -94259,6 +94448,7 @@ self: {
        ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3" = callPackage
@@ -94502,6 +94692,7 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hsc3-rw";
        description = "hsc3 re-writing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-server" = callPackage
@@ -94592,6 +94783,7 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-utils";
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscaffold" = callPackage
@@ -94722,6 +94914,7 @@ self: {
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -95654,6 +95847,7 @@ self: {
        homepage = "https://github.com/rvl/hsoz";
        description = "Iron, Hawk, Oz: Web auth protocols";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsp" = callPackage
@@ -95982,6 +96176,7 @@ self: {
        homepage = "https://github.com/worksap-ate/hspec-jenkins";
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-laws" = callPackage
@@ -96545,6 +96740,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML-based clone of Pipe Mania";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -96720,6 +96916,7 @@ self: {
        homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hssqlppp-th" = callPackage
@@ -96739,6 +96936,7 @@ self: {
        homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstatistics" = callPackage
@@ -97095,6 +97293,7 @@ self: {
        homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hszephyr" = callPackage
@@ -97303,6 +97502,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-kure" = callPackage
@@ -98130,6 +98330,7 @@ self: {
        homepage = "https://github.com/nfjinjing/http-pony";
        description = "A type unsafe http library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-pony-serve-wai" = callPackage
@@ -98760,6 +98961,7 @@ self: {
        homepage = "https://github.com/loganbraga/hunch";
        description = "CSS-like syntax for file system manipulation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-dejafu" = callPackage
@@ -99351,17 +99553,18 @@ self: {
        homepage = "https://github.com/haskell-works/hw-kafka-client";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) rdkafka;};
 
   "hw-kafka-conduit" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, conduit
-     , conduit-extra, containers, exceptions, hspec, hw-kafka-client
-     , mtl, resourcet, transformers
+     , conduit-extra, containers, exceptions, extra, hspec
+     , hw-kafka-client, mtl, QuickCheck, resourcet, transformers
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "1.1.1";
-       sha256 = "308d8e9ed13fc980148b0b1b26e090739533c210bdbbfceb990d4ae54170a212";
+       version = "1.1.2";
+       sha256 = "aa01650709e83e2a6014e47081248d6169fcab10e1b49a8c2b89928605693bcf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99372,12 +99575,13 @@ self: {
          base bifunctors bytestring conduit containers resourcet
        ];
        testHaskellDepends = [
-         base bifunctors bytestring conduit conduit-extra containers hspec
-         hw-kafka-client mtl resourcet transformers
+         base bifunctors bytestring conduit conduit-extra containers extra
+         hspec hw-kafka-client mtl QuickCheck resourcet transformers
        ];
        homepage = "https://github.com/haskell-works/hw-kafka-client-conduit";
        description = "Conduit bindings for kafka-client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-mquery" = callPackage
@@ -100486,6 +100690,7 @@ self: {
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyper-haskell-server" = callPackage
@@ -102493,8 +102698,8 @@ self: {
        pname = "indextype";
        version = "0.1.0.0";
        sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498";
-       revision = "1";
-       editedCabalFile = "382507ce3407fd6b5c60eee31675c52dc3bdc192dc4132f7c6e7047021fa0ef2";
+       revision = "2";
+       editedCabalFile = "daa67f59c54d4c61f73317a1edc7ee86e59327df0eade3a8db6e348a80b8d2d5";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
@@ -102708,6 +102913,7 @@ self: {
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -103386,6 +103592,7 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intern" = callPackage
@@ -103469,6 +103676,7 @@ self: {
        homepage = "https://github.com/scvalex/interpol";
        description = "GHC preprocessor and library to enable variable interpolation in strings";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolate" = callPackage
@@ -103657,6 +103865,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "intro_0_1_0_9" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, bytestring, containers
+     , deepseq, dlist, extra, hashable, lens, mtl, safe
+     , string-conversions, tagged, text, transformers
+     , unordered-containers, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "intro";
+       version = "0.1.0.9";
+       sha256 = "963620591271c3a8e39cfc6b222b4ea9266da0121887298de7e6e59962d422ae";
+       libraryHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable mtl safe string-conversions tagged text transformers
+         unordered-containers writer-cps-mtl
+       ];
+       testHaskellDepends = [
+         base bifunctors binary bytestring containers deepseq dlist extra
+         hashable lens mtl safe string-conversions 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";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intro-prelude" = callPackage
     ({ mkDerivation, intro }:
      mkDerivation {
@@ -104378,6 +104612,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "irc-conduit_0_2_2_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+     , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
+     , time, tls, transformers, x509-validation
+     }:
+     mkDerivation {
+       pname = "irc-conduit";
+       version = "0.2.2.1";
+       sha256 = "9640c826f27f262cbe6877cb3757548fd6e052d6e27a64bfba41875856a1721a";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra connection irc irc-ctcp
+         network-conduit-tls profunctors text time tls transformers
+         x509-validation
+       ];
+       homepage = "https://github.com/barrucadu/irc-conduit";
+       description = "Streaming IRC message library using conduits";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "irc-core" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring
      , hashable, HUnit, primitive, text, time, vector
@@ -104396,6 +104650,7 @@ self: {
        homepage = "https://github.com/glguy/irc-core";
        description = "IRC core library for glirc";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-ctcp" = callPackage
@@ -104535,6 +104790,7 @@ self: {
        homepage = "https://github.com/stepcut/ircbot";
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbouncer" = callPackage
@@ -106439,6 +106695,7 @@ self: {
        homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-b" = callPackage
@@ -108038,6 +108295,7 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -108549,6 +108807,7 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyword-args" = callPackage
@@ -109321,6 +109580,7 @@ self: {
        homepage = "https://github.com/sgillespie/lambda-calculus#readme";
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-canvas" = callPackage
@@ -109680,6 +109940,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacat" = callPackage
@@ -110027,6 +110288,7 @@ self: {
        homepage = "https://github.com/mrkkrp/lame";
        description = "Fairly complete high-level binding to LAME encoder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mp3lame = null;};
 
   "lame-tester" = callPackage
@@ -110620,6 +110882,7 @@ self: {
        homepage = "http://github.com/mitchellwrosen/language-lua2";
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-mixal" = callPackage
@@ -111280,6 +111543,7 @@ self: {
        ];
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout" = callPackage
@@ -111808,6 +112072,7 @@ self: {
        homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
        description = "Client library for communicating with legion-discovery";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "legion-extra" = callPackage
@@ -112808,29 +113073,27 @@ self: {
     ({ mkDerivation, aeson, base, base-unicode-symbols, binary
      , boomerang, bytestring, containers, containers-unicode-symbols
      , contravariant, data-default, data-textual, dns, exceptions
-     , filepath, hjsonschema, lens, machines, mtl, network, network-ip
-     , parsers, pathtype, protolude, QuickCheck, random, semigroups, stm
-     , stm-containers, temporary, test-framework
+     , filepath, hjsonschema, lens, machines, managed, 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.16.1";
-       sha256 = "9598c6e717b1118057190f6a6f15977903956df374812e94049e78866b40578a";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.17.1";
+       sha256 = "dbba3ab5865c0f957daf3ead4e3f7c16a44ba2e3c4fbbe4ced429f1c88e6f397";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
          containers containers-unicode-symbols contravariant data-default
-         data-textual dns exceptions hjsonschema lens machines 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
+         data-textual dns exceptions hjsonschema lens machines managed 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 temporary test-framework test-framework-quickcheck2
+         semigroups stm temporary test-framework test-framework-quickcheck2
          test-framework-th text time transformers
        ];
        description = "Prelude based on protolude for GHC 8 and beyond";
@@ -113275,8 +113538,8 @@ self: {
     ({ mkDerivation, base, mtl, nvpair, transformers, zfs }:
      mkDerivation {
        pname = "libzfs";
-       version = "0.1.0.2";
-       sha256 = "887ea6f0fbcba72885090666e3384b35cd543c7bc56f28fd1b9c6b5f6640f2e7";
+       version = "0.2.0.0";
+       sha256 = "85cce97cf4f0fa9be343427ecd3ab0d18c93e6264f1562eafd54fd59dbb06bbc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl transformers ];
@@ -113483,6 +113746,7 @@ self: {
        homepage = "https://github.com/cmoresid/lightning-haskell#readme";
        description = "Haskell client for lightning-viz REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lighttpd-conf" = callPackage
@@ -115450,6 +115714,7 @@ self: {
        homepage = "https://github.com/trskop/lock-file";
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "locked-poll" = callPackage
@@ -115673,6 +115938,7 @@ self: {
        homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -116629,6 +116895,7 @@ self: {
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -116789,6 +117056,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lucid_2_9_8" = callPackage
+    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
+     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
+     , mtl, parsec, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lucid";
+       version = "2.9.8";
+       sha256 = "9ab498348a68317d2b995c29e0963895d0943de571e9164a28fc3f30ae7f9b72";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers hashable mmorph mtl text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq text
+       ];
+       homepage = "https://github.com/chrisdone/lucid";
+       description = "Clear to write, read and edit DSL for HTML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lucid-foundation" = callPackage
     ({ mkDerivation, base, hspec, lucid, QuickCheck
      , quickcheck-instances, text
@@ -117098,6 +117390,7 @@ self: {
        homepage = "https://github.com/bigmac2k/lz4-conduit";
        description = "LZ4 compression for conduits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lzma" = callPackage
@@ -117116,6 +117409,7 @@ self: {
        homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
@@ -117195,6 +117489,7 @@ self: {
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mDNSResponder-client" = callPackage
@@ -117460,6 +117755,7 @@ self: {
        homepage = "http://github.com/tych0/maclight";
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "macosx-make-standalone" = callPackage
@@ -118351,6 +118647,7 @@ self: {
        ];
        description = "Syntax sugar for defining maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mappy" = callPackage
@@ -118566,6 +118863,7 @@ self: {
        ];
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup-preview" = callPackage
@@ -119687,6 +119985,7 @@ self: {
        homepage = "https://github.com/dhess/mellon/";
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mellon-gpio" = callPackage
@@ -119700,6 +119999,7 @@ self: {
        homepage = "https://github.com/dhess/mellon/";
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mellon-web" = callPackage
@@ -119895,6 +120195,7 @@ self: {
        homepage = "http://johannesgerer.com/memis";
        description = "Memis Efficient Manual Image Sorting";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memo-ptr" = callPackage
@@ -120013,6 +120314,7 @@ self: {
        homepage = "http://github.com/j1r1k/merge-bash-history#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mersenne-random" = callPackage
@@ -120568,6 +120870,7 @@ self: {
        homepage = "https://github.com/mrkkrp/mida";
        description = "Language for algorithmic generation of MIDI files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midair" = callPackage
@@ -121152,6 +121455,7 @@ self: {
        homepage = "https://github.com/donatello/minio-hs#readme";
        description = "A Minio client library, compatible with S3 like services";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minions" = callPackage
@@ -121884,6 +122188,7 @@ self: {
        homepage = "http://code.haskell.org/mohws/";
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mole" = callPackage
@@ -122568,6 +122873,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-peel_0_2_1_2" = callPackage
+    ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework
+     , test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "monad-peel";
+       version = "0.2.1.2";
+       sha256 = "2dd5e9090f3951dbc298e35c3cea7099818aba0485a55059475c4f346fc933f4";
+       libraryHaskellDepends = [
+         base extensible-exceptions transformers
+       ];
+       testHaskellDepends = [
+         base extensible-exceptions HUnit test-framework
+         test-framework-hunit transformers
+       ];
+       homepage = "http://andersk.mit.edu/haskell/monad-peel/";
+       description = "Lift control operations like exception catching through monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-primitive" = callPackage
     ({ mkDerivation, base, primitive, transformers }:
      mkDerivation {
@@ -122686,6 +123012,7 @@ self: {
        homepage = "http://github.com/cartazio/monad-ste";
        description = "ST monad with efficient explicit errors";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-stlike-io" = callPackage
@@ -123160,6 +123487,7 @@ self: {
        libraryHaskellDepends = [ base bindings-monetdb-mapi ];
        description = "Mid-level bindings for the MonetDB API (mapi)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "money" = callPackage
@@ -123320,6 +123648,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mono-traversable_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, foldl
+     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
+     , text, transformers, unordered-containers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "1.0.2";
+       sha256 = "aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633";
+       libraryHaskellDepends = [
+         base bytestring containers hashable split text transformers
+         unordered-containers vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mono-traversable-instances" = callPackage
     ({ mkDerivation, base, comonad, containers, dlist, dlist-instances
      , mono-traversable, semigroupoids, semigroups, transformers
@@ -124399,6 +124752,7 @@ self: {
        ];
        description = "Multi-version deployer for web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mudbath" = callPackage
@@ -124844,6 +125198,7 @@ self: {
        homepage = "https://github.com/lspitzner/multistate";
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multivariant" = callPackage
@@ -125087,6 +125442,7 @@ self: {
        ];
        description = "Musical pitch representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-pitch-literal" = callPackage
@@ -125425,6 +125781,7 @@ self: {
        ];
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mvc-updates" = callPackage
@@ -125510,6 +125867,7 @@ self: {
        homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "MXNet interface in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mxnet = null;};
 
   "mxnet-examples" = callPackage
@@ -125524,6 +125882,7 @@ self: {
        homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "Examples for MXNet in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mxnet-nnvm" = callPackage
@@ -125538,6 +125897,7 @@ self: {
        homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "NNVM interface in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mxnet = null;};
 
   "myTestlll" = callPackage
@@ -126276,6 +126636,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Native library manager for Windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nats" = callPackage
@@ -127704,6 +128065,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-xmpp/";
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-rpca" = callPackage
@@ -127942,6 +128304,8 @@ self: {
        pname = "network-transport-inmemory";
        version = "0.5.2";
        sha256 = "8245d795330157d90ad9de599854d119c6d8938a45ab8c4ec89f3160b2e9ef4e";
+       revision = "1";
+       editedCabalFile = "333544d0ef41ac0b5ccc570f131edefa350d2d522f581ff7351a027a65229ab2";
        libraryHaskellDepends = [
          base bytestring containers data-accessor network-transport stm
        ];
@@ -128999,6 +129363,7 @@ self: {
        homepage = "https://github.com/ppelleti/normalization-insensitive";
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "not-gloss" = callPackage
@@ -129365,6 +129730,7 @@ self: {
        homepage = "https://github.com/trskop/number-length";
        description = "Number of digits in a number in decimal and hexadecimal representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "number-show" = callPackage
@@ -130412,6 +130778,7 @@ self: {
        homepage = "https://github.com/hjwylde/omnifmt";
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "on-a-horse" = callPackage
@@ -130464,6 +130831,7 @@ self: {
        libraryHaskellDepends = [ base containers parsec tagsoup ];
        description = "HTML-parsing primitives for Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "once" = callPackage
@@ -131535,6 +131903,7 @@ self: {
        homepage = "http://github.com/akc/opn";
        description = "Open files or URLs using associated programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimal-blocks" = callPackage
@@ -132048,6 +132417,7 @@ self: {
        homepage = "https://github.com/volhovM/orgstat";
        description = "Statistics visualizer for org-mode";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "origami" = callPackage
@@ -132195,6 +132565,7 @@ self: {
        homepage = "https://github.com/spwhitton/oso2pdf";
        description = "Better conversion of Oxford Scholarship Online material to PDF";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "osx-ar" = callPackage
@@ -132698,6 +133069,8 @@ self: {
        pname = "pandoc";
        version = "1.19.2.1";
        sha256 = "08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801";
+       revision = "1";
+       editedCabalFile = "0ba3a65619868f044f48fcad137a2d3564ef1f07daf022f3e147248c1eed3bfa";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -132806,6 +133179,7 @@ self: {
        ];
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-csv2table" = callPackage
@@ -132860,6 +133234,7 @@ self: {
        homepage = "https://github.com/owickstrom/pandoc-include-code";
        description = "A Pandoc filter for including code from source files";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-japanese-filters" = callPackage
@@ -132892,6 +133267,7 @@ self: {
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -132963,6 +133339,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.5";
        sha256 = "c8825588b587ff5ed0c105156a11a43f3b752279997231cfc13102809bbc51b3";
+       revision = "1";
+       editedCabalFile = "f6238d666c941d4eb5c80c195a9df9cb4d6579281b648dbecd2aad84aaf0e949";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -133733,6 +134111,7 @@ self: {
        homepage = "http://bitbucket.org/hyllos/pareto-haskell";
        description = "A library for cause-effect relationships";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parport" = callPackage
@@ -134243,6 +134622,7 @@ self: {
        homepage = "https://github.com/mtesseract/haskell-partial-order";
        description = "Provides typeclass suitable for types admitting a partial order";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-uri" = callPackage
@@ -134440,6 +134820,8 @@ self: {
        pname = "path";
        version = "0.5.12";
        sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d";
+       revision = "1";
+       editedCabalFile = "540d42d3ea3169520a788d6771a3f907f01e5410bd87deea8bb57cb76b536ca0";
        libraryHaskellDepends = [
          aeson base deepseq exceptions filepath hashable template-haskell
        ];
@@ -134679,6 +135061,7 @@ self: {
        homepage = "https://github.com/meoblast001/paypal-rest-client";
        description = "A client to connect to PayPal's REST API (v1)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pb" = callPackage
@@ -134924,6 +135307,7 @@ self: {
        homepage = "https://github.com/NCrashed/pdf-slave#readme";
        description = "Tool to generate PDF from haskintex templates and YAML input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-slave-template" = callPackage
@@ -134940,6 +135324,7 @@ self: {
        homepage = "https://github.com/ncrashed/pdf-slave#readme";
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-content" = callPackage
@@ -136011,6 +136396,7 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-persona";
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persona-idp" = callPackage
@@ -137020,6 +137406,7 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-binary" = callPackage
@@ -137439,6 +137826,7 @@ self: {
        homepage = "http://github.com/rcallahan/pipes-illumina";
        description = "Illumina NGS data processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-interleave" = callPackage
@@ -137466,6 +137854,7 @@ self: {
        testHaskellDepends = [ base hspec pipes ];
        description = "Stateful IO streams based on pipes";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-key-value-csv" = callPackage
@@ -137511,6 +137900,7 @@ self: {
        homepage = "http://github.com/bgamari/pipes-lzma";
        description = "LZMA compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-misc" = callPackage
@@ -137800,6 +138190,7 @@ self: {
        ];
        description = "Functions that smash Pipes and sqlite-simple together";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-text" = callPackage
@@ -137930,6 +138321,7 @@ self: {
        homepage = "https://github.com/k0001/pipes-zlib";
        description = "Zlib and GZip compression and decompression for Pipes streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pisigma" = callPackage
@@ -138608,6 +139000,7 @@ self: {
        homepage = "https://github.com/jpvillaisaza/pocket-haskell";
        description = "Bindings for the Pocket API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pocket-dns" = callPackage
@@ -139937,6 +140330,7 @@ self: {
        homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme";
        description = "An optparse-applicative parser for postgresql-simple's connection options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-sop" = callPackage
@@ -140154,6 +140548,7 @@ self: {
        ];
        description = "Send email via Postmark using io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postmaster" = callPackage
@@ -140219,6 +140614,7 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powermate" = callPackage
@@ -140401,6 +140797,7 @@ self: {
        homepage = "https://github.com/tdammers/praglude";
        description = "A pragmatic Prelude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "preamble" = callPackage
@@ -141777,6 +142174,7 @@ self: {
        homepage = "https://gitorious.org/prof2pretty";
        description = "generate pretty source from time/allocation profiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profiteur" = callPackage
@@ -142157,8 +142555,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.3.1";
-       sha256 = "32f2d2f709a94805fc89b4368d87cba556e0e80984dceb8b0df242a93a69f635";
+       version = "3.4.1";
+       sha256 = "b5d8f9773d4f58ab68fc036dacf7368b450e0535769bb1df28e80166cd3d2116";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143133,6 +143531,7 @@ self: {
        homepage = "https://github.com/bosu/pure-cdb";
        description = "Another pure-haskell CDB (Constant Database) implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pure-fft" = callPackage
@@ -143287,6 +143686,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
@@ -143326,6 +143726,7 @@ self: {
        homepage = "https://github.com/bitc/purescript-bundle-fast";
        description = "A fast alternative to Purescript's `psc-bundle` to be used during development";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pursuit-client" = callPackage
@@ -144152,6 +144553,7 @@ self: {
        homepage = "http://github.com/BlackBrane/quantum-random/";
        description = "Retrieve, store and manage real quantum random data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qudb" = callPackage
@@ -144365,6 +144767,7 @@ self: {
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        description = "Simple type-level combinators for augmenting QuickCheck instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-instances" = callPackage
@@ -144514,6 +144917,7 @@ self: {
        ];
        description = "Customizable reports for quickcheck properties";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-script" = callPackage
@@ -144573,6 +144977,7 @@ self: {
        homepage = "https://github.com/hiratara/hs-string-random#readme";
        description = "Helper to build generators with Text.StringRandom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-text" = callPackage
@@ -144837,6 +145242,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
        description = "Binary serialisation support for Quivers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver-bytestring" = callPackage
@@ -144901,6 +145307,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck quiver ];
        description = "Group and chunk values within a Quiver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver-http" = callPackage
@@ -144919,6 +145326,7 @@ self: {
        homepage = "https://github.com/christian-marie/quiver-http/";
        description = "Adapter to stream over HTTP(s) with quiver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quiver-instances" = callPackage
@@ -145026,8 +145434,8 @@ self: {
      }:
      mkDerivation {
        pname = "raaz";
-       version = "0.1.0";
-       sha256 = "40f9ec9f735fbf45310d717ee39937740a09e8509f16d4950a5f3446a50e8650";
+       version = "0.1.1";
+       sha256 = "e18010a169135a33f1aa9526aa7cfdd528a9a3c4d57cde26a76a80e6e7bc67a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring deepseq mtl vector ];
@@ -145366,6 +145774,7 @@ self: {
        homepage = "https://github.com/fnoble/raml";
        description = "RESTful API Modeling Language (RAML) library for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ramus" = callPackage
@@ -145831,6 +146240,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa#readme";
        description = "A modular text editor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-example-config" = callPackage
@@ -145883,6 +146293,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for running commands";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-cursors" = callPackage
@@ -145899,6 +146310,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext adding cursor(s)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-files" = callPackage
@@ -145929,6 +146341,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for logging state/actions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-slate" = callPackage
@@ -145959,6 +146372,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for populating status-bar";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-style" = callPackage
@@ -145971,6 +146385,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering styles";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rasa-ext-views" = callPackage
@@ -146710,6 +147125,7 @@ self: {
        homepage = "http://github.com/cies/reactive-banana-sdl2#readme";
        description = "Reactive Banana integration with SDL2";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-threepenny" = callPackage
@@ -146948,6 +147364,7 @@ self: {
        homepage = "https://github.com/zaidan/read-io#readme";
        description = "Read IO library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "readable" = callPackage
@@ -147327,6 +147744,7 @@ self: {
        homepage = "https://www.github.com/jwiegley/recursors";
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redHandlers" = callPackage
@@ -147369,6 +147787,7 @@ self: {
        homepage = "https://github.com/intolerable/reddit";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis" = callPackage
@@ -148082,6 +148501,7 @@ self: {
        homepage = "https://github.com/konn/refresht#readme";
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "refty" = callPackage
@@ -149315,6 +149735,7 @@ self: {
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remotion" = callPackage
@@ -149511,6 +149932,7 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Examples using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-fftw" = callPackage
@@ -150517,6 +150939,31 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "rethinkdb_2_2_0_9" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
+     , bytestring, containers, criterion, data-default, doctest, mtl
+     , network, scientific, text, time, unordered-containers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "rethinkdb";
+       version = "2.2.0.9";
+       sha256 = "8adb11ec9fd6cfd756571faf97f6727c35fa2adc6111ceab0f51ccde658bdd50";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary bytestring containers
+         data-default mtl network scientific text time unordered-containers
+         utf8-string vector
+       ];
+       testHaskellDepends = [ base doctest ];
+       benchmarkHaskellDepends = [ aeson async base criterion text ];
+       homepage = "http://github.com/atnnn/haskell-rethinkdb";
+       description = "A driver for RethinkDB 2.2";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rethinkdb-client-driver" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , criterion, hashable, hspec, hspec-smallcheck, mtl, network
@@ -150582,6 +151029,7 @@ self: {
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "retry" = callPackage
@@ -150683,6 +151131,7 @@ self: {
        homepage = "https://github.com/jcristovao/reverse-geocoding";
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reversi" = callPackage
@@ -151269,6 +151718,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Haskell implementation of the RNCryptor file format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rng-utils" = callPackage
@@ -151585,6 +152035,7 @@ self: {
        ];
        description = "A collection of rose tree structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rose-trie" = callPackage
@@ -152253,6 +152704,7 @@ self: {
        homepage = "https://github.com/DanielG/rts-loader";
        description = "Dynamically load Haskell libraries";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rubberband" = callPackage
@@ -152343,6 +152795,7 @@ self: {
        ];
        description = "Pliable records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruler" = callPackage
@@ -152697,6 +153150,7 @@ self: {
        homepage = "https://github.com/k0001/safe-money";
        description = "Type-safe and lossless encoding and manipulation of money, world currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-plugins" = callPackage
@@ -152759,6 +153213,30 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safecopy-store" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, lens
+     , lens-action, old-time, QuickCheck, quickcheck-instances, store
+     , store-core, tasty, tasty-quickcheck, template-haskell, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "safecopy-store";
+       version = "0.9.2";
+       sha256 = "17e37e713a1dc86a50a16589ebc7e087e9896bdfe40918350b6f546a4992007b";
+       libraryHaskellDepends = [
+         array base bytestring containers old-time store store-core
+         template-haskell text time vector
+       ];
+       testHaskellDepends = [
+         array base containers lens lens-action QuickCheck
+         quickcheck-instances store tasty tasty-quickcheck template-haskell
+         time vector
+       ];
+       homepage = "https://github.com/NCrashed/safecopy";
+       description = "Binary serialization with version control";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "safeint" = callPackage
     ({ mkDerivation, base, ghc-prim, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -152774,6 +153252,7 @@ self: {
        ];
        description = "overflow-checked Int type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safepath" = callPackage
@@ -154683,6 +155162,7 @@ self: {
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
        description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-cairo-image" = callPackage
@@ -154698,6 +155178,7 @@ self: {
        ];
        description = "An image loading and rendering library for sdl2 / sdl2-cairo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-compositor" = callPackage
@@ -156113,8 +156594,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }:
      mkDerivation {
        pname = "servant-auth";
-       version = "0.2.1.0";
-       sha256 = "31c963fa9dcc39431d45edb0f859771cba74f0dc6229258205fac99f0572fb4a";
+       version = "0.2.6.0";
+       sha256 = "ca70089cb1560dc8b990437c3eb6ff4a8cea0aba387fc7cb7ef1bd0b9f17113d";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ];
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
@@ -156130,8 +156611,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-client";
-       version = "0.2.1.0";
-       sha256 = "61afe42548bf696d2a2d2ad89b6284a40c192a30bc9201f0f49529cd90d556fe";
+       version = "0.2.6.0";
+       sha256 = "928cd5a1e546e38f76f161332ea6591f885d62c052fd8a6cee5e4e22f35e5c36";
        libraryHaskellDepends = [
          base bytestring servant servant-auth servant-client text
        ];
@@ -156181,8 +156662,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-docs";
-       version = "0.2.1.0";
-       sha256 = "0bdce6889b1caf64e6b1ecbf565fb5201d32689c576bb3701cde671fbad8e3a1";
+       version = "0.2.6.0";
+       sha256 = "333d3fabb345a2892aa803e5e5558356a66382032693d68e762fb95dd75cb4b2";
        libraryHaskellDepends = [
          base lens servant servant-auth servant-docs text
        ];
@@ -156283,8 +156764,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.2.4.0";
-       sha256 = "c61e2d4b8de2aee42713fd30f37532ae60c19527ea06601e656c595102c6bbf2";
+       version = "0.2.6.0";
+       sha256 = "d78ab2c470731d2e18f19c2b45b8cc398541cda56ba947cdb032081737c55ea8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156321,8 +156802,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.1.0";
-       sha256 = "4d2165bed0789e627cc716270491bf87863d5cda4c3041dfd10c0a297b22e3dc";
+       version = "0.4.1.1";
+       sha256 = "06a2f6928bd558ad6d22542bf212ac0acdb60d68febe70eab917d37812bb3e84";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers mtl pwstore-fast
          servant-auth-token-api servant-server text time transformers uuid
@@ -156353,6 +156834,7 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token-api" = callPackage
@@ -156361,8 +156843,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.4.0.0";
-       sha256 = "6a8ab7ae1f63d2aecca8c6d63f2b305238b010e5c2e19e4c7f51e01d6bb65526";
+       version = "0.4.0.1";
+       sha256 = "0850d95cc86d0893069887f2e30ed0cb22eef0bdf7f82a6d28e1c51f551e3d83";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -156392,6 +156874,7 @@ self: {
        homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-blaze" = callPackage
@@ -156738,6 +157221,7 @@ self: {
        homepage = "http://github.com/finlay/servant-github#readme";
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-github-webhook" = callPackage
@@ -156834,6 +157318,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-js_0_9_3" = callPackage
+    ({ mkDerivation, base, base-compat, charset, hspec
+     , hspec-expectations, language-ecmascript, lens, QuickCheck
+     , servant, servant-foreign, text
+     }:
+     mkDerivation {
+       pname = "servant-js";
+       version = "0.9.3";
+       sha256 = "086905a2c5d8903910b415b71f007c28cb6de9bccc4ab273e7ed944ceeca2cc2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat charset lens servant servant-foreign text
+       ];
+       testHaskellDepends = [
+         base base-compat hspec hspec-expectations language-ecmascript lens
+         QuickCheck servant text
+       ];
+       homepage = "http://haskell-servant.readthedocs.org/";
+       description = "Automatically derive javascript functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-lucid" = callPackage
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
@@ -156896,6 +157404,7 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-mock_0_8_1_2" = callPackage
@@ -156926,6 +157435,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-multipart" = callPackage
+    ({ mkDerivation, base, bytestring, directory, http-client
+     , http-media, network, resourcet, servant, servant-server, text
+     , transformers, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "servant-multipart";
+       version = "0.10";
+       sha256 = "285298e7411297f4e023cceba14fd8f5c03c694f47533adfaf01538682698199";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory http-media resourcet servant
+         servant-server text transformers wai wai-extra
+       ];
+       executableHaskellDepends = [
+         base http-client network servant servant-server text transformers
+         wai warp
+       ];
+       homepage = "https://github.com/haskell-servant/servant-multipart#readme";
+       description = "multipart/form-data (e.g file upload) support for servant";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-named" = callPackage
     ({ mkDerivation, base, hspec, hspec-wai, http-types, servant
      , servant-server
@@ -157089,6 +157623,7 @@ self: {
        ];
        description = "QuickCheck entire APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-response" = callPackage
@@ -157457,6 +157992,7 @@ self: {
        homepage = "https://github.com/Gabriel439/Haskell-Server-Generic-Library";
        description = "Auto-generate a server for your datatype";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession" = callPackage
@@ -157836,6 +158372,7 @@ self: {
        ];
        description = "Ducktyped set interface for Haskell containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setters" = callPackage
@@ -158011,6 +158548,7 @@ self: {
        homepage = "https://github.com/kseo/sfnt2woff#readme";
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "sgd" = callPackage
@@ -158721,6 +159259,7 @@ self: {
        homepage = "https://github.com/valderman/shellmate";
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellmate-extras" = callPackage
@@ -159966,6 +160505,7 @@ self: {
        homepage = "http://jakewheat.github.io/simple-sql-parser/";
        description = "A parser for SQL queries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-stacked-vm" = callPackage
@@ -160674,6 +161214,7 @@ self: {
        homepage = "https://github.com/githubuser/skylark-client#readme";
        description = "Skylark client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skylighting" = callPackage
@@ -160802,8 +161343,8 @@ self: {
      }:
      mkDerivation {
        pname = "slack-api";
-       version = "0.11";
-       sha256 = "aa4c71bd6e877bca8d5e4cdb516c4049eb9068e287205985fd4305d78425d0c3";
+       version = "0.12";
+       sha256 = "9b5cde3cbeb67a020614e0b9e10c316dd6dc378b03144944b99846ee75c2bc36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -160854,6 +161395,7 @@ self: {
        homepage = "https://github.com/jpvillaisaza/slack-web";
        description = "Bindings for the Slack web API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slave-thread" = callPackage
@@ -160964,6 +161506,7 @@ self: {
        homepage = "http://akc.is/sloane";
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slope-field" = callPackage
@@ -161000,6 +161543,7 @@ self: {
        homepage = "https://github.com/ducis/pa_slot";
        description = "Write lambdas without naming the parameters";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sloth" = callPackage
@@ -162798,6 +163342,7 @@ self: {
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -163226,6 +163771,7 @@ self: {
        homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme";
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketio" = callPackage
@@ -165341,6 +165887,7 @@ self: {
        homepage = "http://github.com/rubik/stack-hpc-coveralls";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-prism" = callPackage
@@ -165464,6 +166011,7 @@ self: {
        homepage = "https://github.com/fpco/stackage-build-plan";
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-cabal" = callPackage
@@ -165485,6 +166033,7 @@ self: {
        homepage = "https://www.stackage.org/package/stackage-cabal";
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-cli" = callPackage
@@ -165819,6 +166368,7 @@ self: {
        ];
        description = "To be written";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "state" = callPackage
@@ -165848,6 +166398,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/";
        description = "Monad transformers for holding bags of state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "state-plus" = callPackage
@@ -165860,6 +166411,7 @@ self: {
        testHaskellDepends = [ base checkers mtl QuickCheck ];
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "state-record" = callPackage
@@ -166216,6 +166768,7 @@ self: {
        homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-image" = callPackage
@@ -168087,6 +168640,7 @@ self: {
        homepage = "http://github.com/nboldi/structural-traversal#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "structured-haskell-mode" = callPackage
@@ -168277,6 +168831,7 @@ self: {
        ];
        description = "A generator of nix files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sub-state" = callPackage
@@ -168786,6 +169341,7 @@ self: {
        homepage = "https://github.com/nikita-volkov/supplemented";
        description = "Early termination for monads";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suspend" = callPackage
@@ -169135,6 +169691,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "syb_0_7" = callPackage
+    ({ mkDerivation, base, containers, HUnit, mtl }:
+     mkDerivation {
+       pname = "syb";
+       version = "0.7";
+       sha256 = "b8757dce5ab4045c49a0ae90407d575b87ee5523a7dd5dfa5c9d54fcceff42b5";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers HUnit mtl ];
+       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+       description = "Scrap Your Boilerplate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "syb-extras" = callPackage
     ({ mkDerivation, base, eq, prelude-extras }:
      mkDerivation {
@@ -169919,8 +170489,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "system-info";
-       version = "0.1.0.3";
-       sha256 = "9d31bad4a6ea7abdb6bef5e929388a58d200982964042cc4aa991c81066dc8b8";
+       version = "0.1.0.5";
+       sha256 = "aa1e2fec0ceb10b8916422d2e4421e6a6167a283344c7fd2c0fba5fec86f2c45";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChaosGroup/system-info";
@@ -169977,6 +170547,7 @@ self: {
        homepage = "https://github.com/cocreature/system-locale";
        description = "Get system locales";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-posix-redirect" = callPackage
@@ -170372,6 +170943,7 @@ self: {
        homepage = "https://github.com/lovasko/tablize";
        description = "Pretty-printing of CSV files";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tabloid" = callPackage
@@ -172103,6 +172675,7 @@ self: {
        homepage = "https://github.com/bollu/teleport#readme";
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tellbot" = callPackage
@@ -172908,6 +173481,7 @@ self: {
        ];
        description = "Template Haskell for test framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-invariant" = callPackage
@@ -173058,6 +173632,7 @@ self: {
        ];
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testPkg" = callPackage
@@ -173534,6 +174109,7 @@ self: {
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-lens" = callPackage
@@ -173547,6 +174123,7 @@ self: {
        homepage = "https://github.com/ChrisPenner/rasa";
        description = "Lenses for operating over text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-lips" = callPackage
@@ -173563,6 +174140,7 @@ self: {
        homepage = "https://github.com/mvv/text-lips";
        description = "Monadic parsing combinator library with attention to locations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-loc" = callPackage
@@ -173618,6 +174196,7 @@ self: {
        homepage = "https://github.com/jtdaugherty/text-markup/";
        description = "A data structure for mapping metadata to text subsequences";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-metrics" = callPackage
@@ -174959,6 +175538,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "threepenny-gui-flexbox" = callPackage
+    ({ mkDerivation, base, clay, text, threepenny-gui }:
+     mkDerivation {
+       pname = "threepenny-gui-flexbox";
+       version = "0.3.0.2";
+       sha256 = "cd38f3ca7672d3f418ec1c9c93e00563178177e407f0013ee3b2eb7f8c00ed2d";
+       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
@@ -177392,7 +177987,8 @@ self: {
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {effect-interpreters = null;};
 
   "transformers-free" = callPackage
     ({ mkDerivation, base, transformers }:
@@ -177802,6 +178398,7 @@ self: {
        ];
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trifecta" = callPackage
@@ -178246,6 +178843,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple" = callPackage
@@ -178569,6 +179167,7 @@ self: {
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp-graphs" = callPackage
@@ -178936,6 +179535,7 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -179002,6 +179602,7 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -179018,6 +179619,7 @@ self: {
        homepage = "https://github.com/himura/twitter-types-lens";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -180184,6 +180786,7 @@ self: {
        homepage = "https://github.com/kqr/udp-conduit#readme";
        description = "Simple fire-and-forget conduit UDP wrappers";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uglymemo" = callPackage
@@ -180280,6 +180883,7 @@ self: {
        homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ui-command" = callPackage
@@ -180775,6 +181379,7 @@ self: {
        homepage = "http://github.com/nushio3/unicode-show#readme";
        description = "print and show in unicode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -181856,6 +182461,7 @@ self: {
        homepage = "https://github.com/expipiplus1/update-nix-fetchgit#readme";
        description = "A program to update fetchgit values in Nix expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "update-repos" = callPackage
@@ -183476,6 +184082,7 @@ self: {
        homepage = "http://github.com/bergey/vcatt";
        description = "Recursively check that a directory is under version control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcd" = callPackage
@@ -184855,6 +185462,7 @@ self: {
        homepage = "https://github.com/coreyoconnor/vty";
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-menu" = callPackage
@@ -185536,6 +186144,7 @@ self: {
        homepage = "https://github.com/soenkehahn/wai-make-assets#readme";
        description = "Compiling and serving assets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-auth" = callPackage
@@ -186920,6 +187529,7 @@ self: {
        homepage = "http://hub.darcs.net/ertes/web-page";
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-plugins" = callPackage
@@ -187360,6 +187970,7 @@ self: {
        homepage = "http://hub.darcs.net/fr33domlover/webfinger-client";
        description = "WebFinger client library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webidl" = callPackage
@@ -187637,6 +188248,7 @@ self: {
        ];
        description = "Wedged postcard generator";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weigh" = callPackage
@@ -187666,6 +188278,7 @@ self: {
        homepage = "https://github.com/oisdk/weighted";
        description = "Writer monad which uses semiring constraint";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -187758,6 +188371,7 @@ self: {
        homepage = "https://github.com/hjwylde/werewolf";
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "werewolf-slack" = callPackage
@@ -187778,6 +188392,7 @@ self: {
        homepage = "https://github.com/hjwylde/werewolf-slack";
        description = "A chat interface for playing werewolf in Slack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wheb-mongo" = callPackage
@@ -187829,6 +188444,7 @@ self: {
        homepage = "https://github.com/davnils/while-lang-parser";
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "whim" = callPackage
@@ -188700,6 +189316,7 @@ self: {
        homepage = "https://github.com/stackbuilders/workdays";
        description = "Workday calculations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "workflow-osx" = callPackage
@@ -188939,6 +189556,7 @@ self: {
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wreq-stringless" = callPackage
@@ -189752,6 +190370,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "xeno" = callPackage
+    ({ mkDerivation, array, base, bytestring, criterion, deepseq
+     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
+     , weigh, xml
+     }:
+     mkDerivation {
+       pname = "xeno";
+       version = "0.1";
+       sha256 = "e61e9ca39c0d5dfcdb8bc785a4807d1b8469866a239562b757d9b3c6718de2d5";
+       libraryHaskellDepends = [
+         array base bytestring deepseq mtl mutable-containers vector
+       ];
+       testHaskellDepends = [ base bytestring hexml hspec ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
+       ];
+       homepage = "https://github.com/ocramz/xeno";
+       description = "A fast event-based XML parser in pure Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "xenstore" = callPackage
     ({ mkDerivation, base, bytestring, cereal, mtl, network }:
      mkDerivation {
@@ -190656,6 +191295,7 @@ self: {
        homepage = "https://github.com/lancelet/xml-tydom";
        description = "Typed XML encoding for an xml-conduit backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-tydom-core" = callPackage
@@ -190971,6 +191611,7 @@ self: {
        homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-entryhelper" = callPackage
@@ -191074,6 +191715,7 @@ self: {
        homepage = "https://github.com/vmchale/xmonad-vanessa#readme";
        description = "Custom xmonad, which uses stack and sets various defaults";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-wallpaper" = callPackage
@@ -191085,6 +191727,7 @@ self: {
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-windownames" = callPackage
@@ -191254,6 +191897,7 @@ self: {
        homepage = "https://github.com/danchoi/xpathdsv#readme";
        description = "Command line tool to extract DSV data from HTML and XML with XPATH expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xsact" = callPackage
@@ -191494,6 +192138,7 @@ self: {
        homepage = "https://github.com/cdepillabout/yahoo-finance-api";
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -191898,6 +192543,7 @@ self: {
        ];
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -192262,6 +192908,7 @@ self: {
        testHaskellDepends = [ base hlint hspec text yesod yesod-test ];
        description = "Yesod Middleware for HTTP Basic Authentication";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-bcrypt" = callPackage
@@ -192455,6 +193102,7 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "OAuth Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-oauth2" = callPackage
@@ -192478,6 +193126,7 @@ self: {
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -193018,6 +193667,7 @@ self: {
        homepage = "https://github.com/prowdsponsor/yesod-fb";
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form" = callPackage
@@ -193285,6 +193935,7 @@ self: {
        homepage = "https://github.com/mgsloan/yesod-media-simple";
        description = "Simple display of media types, served by yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-newsfeed" = callPackage
@@ -193369,6 +194020,7 @@ self: {
        ];
        description = "Yesod plugin to use PayPal with the paypal-rest-client library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-persistent" = callPackage
@@ -193646,6 +194298,7 @@ self: {
        homepage = "https://github.com/prowdsponsor/yesod-recaptcha";
        description = "Dead simple support for reCAPTCHA on Yesod applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes" = callPackage
@@ -194009,6 +194662,7 @@ self: {
        ];
        description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-tls" = callPackage
@@ -194211,6 +194865,7 @@ self: {
        homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-contrib" = callPackage
@@ -194537,6 +195192,7 @@ self: {
        homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-rope" = callPackage
@@ -194591,6 +195247,7 @@ self: {
        homepage = "https://github.com/NorfairKing/yi-solarized";
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-spolsky" = callPackage
@@ -194846,6 +195503,7 @@ self: {
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yuiGrid" = callPackage
@@ -195676,6 +196334,7 @@ self: {
        libraryHaskellDepends = [ base lens stm ];
        description = "Zoom (~ Functor) and pairing (~ Applicative) for mutable references";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zot" = callPackage
@@ -195727,6 +196386,7 @@ self: {
        homepage = "https://github.com/facebookexperimental/hs-zstd";
        description = "Haskell bindings to the Zstandard compression algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ztail" = callPackage

From b923fd5253d797b95b2ce617217954416d827d66 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Mar 2017 12:17:36 +0100
Subject: [PATCH 1561/3449] git-annex 6.20170301.1 tarballs are no longer
 available anywhere; now we must use fetchgit

---
 .../haskell-modules/configuration-common.nix        | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index db9a8d573986..bbd02b4dc9ff 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -59,14 +59,13 @@ self: super: {
   # Link the proper version.
   zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
 
-  # The Hackage tarball is purposefully broken. Mr. Hess wants people to build
-  # his package from the Git repo because that is, like, better!
+  # The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
+  # https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
   git-annex = ((overrideCabal super.git-annex (drv: {
-    src = pkgs.fetchFromGitHub {
-      owner = "joeyh";
-      repo = "git-annex";
-      sha256 = "0f79i2i1cr8j02vc4ganw92prbkv9ca1yl9jgkny0rxf28wdlc6v";
-      rev = drv.version;
+    src = pkgs.fetchgit {
+      url = "git://git-annex.branchable.com/";
+      rev = "refs/tags/" + drv.version;
+      sha256 = "0irvzwpwxxdy6qs7jj81r6qk7i1gkkqyaza4wcm0phyyn07yh2sz";
     };
   }))).override {
     dbus = if pkgs.stdenv.isLinux then self.dbus else null;

From cb13a8c5f839da09c67020b346f899d762d4c75e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 3 Mar 2017 00:20:19 +0300
Subject: [PATCH 1562/3449] openspades: 0.0.12 -> 0.1.1b

Remove openspades-git, it's not needed now that there was a release.
---
 pkgs/games/openspades/default.nix | 58 ++++++++++++++-----------------
 pkgs/games/openspades/git.nix     | 48 -------------------------
 pkgs/top-level/all-packages.nix   |  4 +--
 3 files changed, 27 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/games/openspades/git.nix

diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index 0438b687a1b9..02e4e9c608f0 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -1,49 +1,43 @@
-{ stdenv, lib, fetchurl, cmake, curl, glew, makeWrapper, mesa, SDL2,
-  SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:
-
-assert withOpenal -> openal != null;
+{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file
+, curl, glew , mesa_noglu, SDL2, SDL2_image, zlib, freetype, imagemagick
+, openal , opusfile, libogg
+}:
 
 stdenv.mkDerivation rec {
   name = "openspades-${version}";
-  version = "0.0.12";
+  version = "0.1.1b";
+  devPakVersion = "33";
 
-  src = fetchurl {
-    url = "https://github.com/yvt/openspades/archive/v${version}.tar.gz";
-    sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm";
+  src = fetchFromGitHub {
+    owner = "yvt";
+    repo = "openspades";
+    rev = "v${version}";
+    sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn";
   };
 
-  # https://github.com/yvt/openspades/issues/354
-  postPatch = ''
-    substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan("
-    substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan("
-    substituteInPlace Sources/Draw/SWMapRenderer.cpp \
-      --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
-    sed '1i#include <cmath>' -i Sources/Client/{Player,Client_Input,Corpse}.cpp \
-      -i Sources/Draw/SWMapRenderer.cpp
-    sed '1i#include <math.h>' -i Sources/Draw/SWFeatureLevel.h
-  '';
+  nativeBuildInputs = [ cmake imagemagick unzip zip file ];
 
-  nativeBuildInputs =
-    [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
-    ++ lib.optional withOpenal openal;
+  buildInputs = [
+    freetype SDL2 SDL2_image mesa_noglu zlib curl glew opusfile openal libogg
+  ];
 
   cmakeFlags = [
     "-DOPENSPADES_INSTALL_BINARY=bin"
-    "-DOPENSPADES_RESOURCES=NO"
   ];
 
+  devPak = fetchurl {
+    url = "https://github.com/yvt/openspades-paks/releases/download/r${devPakVersion}/OpenSpadesDevPackage-r${devPakVersion}.zip";
+    sha256 = "1bd2fyn7mlxa3xnsvzj08xjzw02baimqvmnix07blfhb78rdq9q9";
+  };
+
+  postPatch = ''
+    sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh
+    patchShebangs Resources
+  '';
+
   enableParallelBuilding = true;
 
-  devPack = fetchurl {
-    url = "http://yvt.jp/files/programs/osppaks/DevPaks27.zip";
-    sha256 = "05y7wldg70v5ys41fm0c8kipyspn524z4pglwr3p8h0gfz9n52v6";
-  };
-
-  preBuild = ''
-    unzip -u -o $devPack -d Resources/DevPak
-  '';
-
-  NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";
+  NIX_CFLAGS_LINK = [ "-lopenal" ];
 
   meta = with stdenv.lib; {
     description = "A compatible client of Ace of Spades 0.75";
diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix
deleted file mode 100644
index 9e3d4ac5b64c..000000000000
--- a/pkgs/games/openspades/git.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, curl, glew, makeWrapper, mesa, SDL2,
-  SDL2_image, unzip, wget, zlib, withOpenal ? true, openal ? null }:
-
-assert withOpenal -> openal != null;
-
-stdenv.mkDerivation rec {
-  name = "openspades-${version}";
-  version = "2016-04-17";
-
-  src = fetchFromGitHub {
-    owner = "yvt";
-    repo = "openspades";
-    rev = "cadc0b6a57fbee05abcaf42d15664502c94b58cf";
-    sha256 = "0vyvmgim03q8pcmfa1i0njr4w1lpjq5g3b47f67v9b5c5jcjycwn";
-  };
-
-  postPatch = "sed '1i#include <cmath>' -i Sources/Client/{,Client}Player.cpp";
-
-  nativeBuildInputs =
-    with stdenv.lib;
-    [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]
-    ++ lib.optional withOpenal openal;
-
-  cmakeFlags = [
-    "-DOPENSPADES_INSTALL_BINARY=bin"
-    "-DOPENSPADES_RESOURCES=NO"
-  ];
-
-  #enableParallelBuilding = true;
-
-  devPack = fetchurl {
-    url = "http://yvt.jp/files/programs/osppaks/DevPaks29.zip";
-    sha256 = "1fhwxm6wifg0l3ykmiiqa1h4ch5ika2kw2j0v9xnrz24cabsi6cc";
-  };
-
-  preBuild = ''
-    unzip -u -o $devPack -d Resources/DevPak
-  '';
-
-  NIX_CFLAGS_LINK = lib.optional withOpenal "-lopenal";
-
-  meta = with stdenv.lib; {
-    description = "A compatible client of Ace of Spades 0.75";
-    homepage    = "https://github.com/yvt/openspades/";
-    license     = licenses.gpl3;
-    platforms   = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f1968ebf406..3f2bfc5bda09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16493,9 +16493,7 @@ with pkgs;
 
   openrw = callPackage ../games/openrw { };
 
-  openspades = callPackage ../games/openspades {};
-
-  openspades-git = lowPrio (callPackage ../games/openspades/git.nix {});
+  openspades = callPackage ../games/openspades { };
 
   openttd = callPackage ../games/openttd {
     zlib = zlibStatic;

From 1254f1a46a56aba571eaa4fe636a1593631eeb25 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Mar 2017 00:21:47 +0200
Subject: [PATCH 1563/3449] gf2x: Disable i686 build

http://hydra.nixos.org/build/49552136/nixlog/3/raw
---
 pkgs/development/libraries/gf2x/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix
index feba97f4da4c..7ab06afdad61 100644
--- a/pkgs/development/libraries/gf2x/default.nix
+++ b/pkgs/development/libraries/gf2x/default.nix
@@ -2,17 +2,17 @@
 stdenv.mkDerivation rec {
   name = "gf2x-${version}";
   version = "1.1";
+
   # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
   src = fetchurl {
     url = "http://gforge.inria.fr/frs/download.php/file/30873/gf2x-1.1.tar.gz";
     sha256 = "17w4b39j9dvri5s278pxi8ha7mf47j87kq1lr802l4408rh02gqd";
   };
-  buildInputs = [];
+
   meta = {
-    inherit version;
     description = ''Routines for fast arithmetic in GF(2)[x]'';
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = ["x86_64-linux"];
   };
 }

From 1dcb0bbc39b1b58484c8aad7e0748c3fdb8423ab Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 28 Feb 2017 20:10:30 -0600
Subject: [PATCH 1564/3449] logcheck: 1.3.17 -> 1.3.18

logcheck: Added hyphen
---
 pkgs/tools/system/logcheck/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index 9934175ae3b6..9c2a42eeb5ae 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, lockfileProgs, perl, mimeConstruct }:
 
 stdenv.mkDerivation rec {
-  _name   = "logcheck";
-  version = "1.3.17";
-  name    = "${_name}-${version}";
+  name = "logcheck-${version}";
+  version = "1.3.18";
+  _name    = "logcheck_${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.xz";
-    sha256 = "0fphzaljc9ddv1x6l3zdf9cbarqgzpdqaqwm3plmarcc7qrgrly2";
+    url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
+    sha256 = "1x4skb5nmv2xj8cygj8pq1rd1ws4m2fsibw54yslgdyjri4r2yq7";
   };
 
   preConfigure = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "SHAREDIR=share/logtail/detectrotate"
  ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Mails anomalies in the system logfiles to the administrator";
     longDescription = ''
       Mails anomalies in the system logfiles to the administrator.
@@ -37,9 +37,8 @@ stdenv.mkDerivation rec {
       Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
     '';
     homepage = http://logcheck.org;
-    license = stdenv.lib.licenses.gpl2;
-
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.bluescreen303 ];
+    
   };
 }

From 33e23934a7b2ff57f20fb0ff308dd92e868a82e8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 2 Mar 2017 13:51:01 +0100
Subject: [PATCH 1565/3449] synthv1: 0.7.6 -> 0.8.0

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

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 4050675e51fc..c7932a132d75 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchurl, qt5, libjack2, alsaLib, liblo, lv2 }:
+{ stdenv, fetchurl, pkgconfig, qt5, libjack2, alsaLib, liblo, lv2 }:
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.7.6";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "03vnmmiyq92p2gh4zax1vg2lx6y57bsxch936pzbiwx649x53wi9";
+    sha256 = "155pfyhr6d35ciw95pbxlqy7751cmij8j5d849rvblqbjzyzb5qx";
   };
 
   buildInputs = [ qt5.qtbase qt5.qttools libjack2 alsaLib liblo lv2 ];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   meta = with stdenv.lib; {
     description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
     homepage = http://synthv1.sourceforge.net/;

From 5e267f657da817bb3ef16c4c1030aac0bfe49735 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 2 Mar 2017 16:25:07 -0600
Subject: [PATCH 1566/3449] llvm4.0: rc2 -> rc3

Also add myself to maintainers for LLVM.
---
 pkgs/development/compilers/llvm/4.0/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/4.0/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/4.0/libc++/default.nix | 4 ++--
 pkgs/development/compilers/llvm/4.0/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/4.0/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/4.0/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/4.0/llvm.nix           | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4.0/clang/default.nix
index f566cd6d21c2..5be8ffd91cf1 100644
--- a/pkgs/development/compilers/llvm/4.0/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4.0/clang/default.nix
@@ -6,7 +6,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "1p55db1yfya60r2fnr9bh8pj8fqq5gjc1fnv0c1kmac8yfvwkmkn"}
+      unpackFile ${fetch "cfe" "1lsdyrz82vyrsc7k0ah1zmzzan61s5kakxrkxgfbmklp3pclfkwp"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4.0/default.nix
index f407b2cdc9f5..349545a29599 100644
--- a/pkgs/development/compilers/llvm/4.0/default.nix
+++ b/pkgs/development/compilers/llvm/4.0/default.nix
@@ -3,7 +3,7 @@ let
   callPackage = newScope (self // { inherit stdenv isl release_version version fetch; });
 
   release_version = "4.0.0";
-  rc = "rc2";
+  rc = "rc3";
   version = "${release_version}${rc}";
 
   fetch = name: sha256: fetchurl {
@@ -13,8 +13,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "07i098rj41h1sq2f30d6161924zr5yd9gx5kans79p7akxxgc0jr";
-  clang-tools-extra_src = fetch "clang-tools-extra" "0ypvkv55pw88iaixib29sgz44d4pfs166vpswnrrbkqlhz92ns0z";
+  compiler-rt_src = fetch "compiler-rt" "0jfqhz95cp15c5688c6l9mr12s0qp86milpcrjlc93dc2jy08ba5";
+  clang-tools-extra_src = fetch "clang-tools-extra" "1c9c507w3f5vm153rdd0kmzvv2ski6z439izk01zf5snfwkqxkq8";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4.0/libc++/default.nix
index 9f950e601b21..57e064fb79ad 100644
--- a/pkgs/development/compilers/llvm/4.0/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4.0/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "130clvfffqml8hbnlvr596nfjk18n6ifxab27xl66nxhq99wccfn";
+  src = fetch "libcxx" "15l6bcmwczspbqcq4m2lmzb23g11axr9m8dayn25iys26nn00q43";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   patchPhase = ''
-		substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
+    substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
   '';
 
   buildInputs = [ cmake llvm libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4.0/libc++abi.nix
index 362663ed443f..fc1a6d84caa8 100644
--- a/pkgs/development/compilers/llvm/4.0/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4.0/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "09hlqlbxpnqi3449nrk43khp4jgd34xwx406mw6igwl8a673pa85";
+  src = fetch "libcxxabi" "1frj1wz780xcwq77icfclnw6q4c8bkkdzkqsrmfjv9963kjylsy5";
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4.0/lld.nix
index 004230ca81ab..7fe08cb02625 100644
--- a/pkgs/development/compilers/llvm/4.0/lld.nix
+++ b/pkgs/development/compilers/llvm/4.0/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "144vmb13800s33xgd18321lrviw21mjx5dphzszjgvizn4a1sf1p";
+  src = fetch "lld" "0kmyp7iyf4f76wgy87jczkyhvzhlwfydvxgggl74z0x89xgry745";
 
   buildInputs = [ cmake llvm ];
 
diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4.0/lldb.nix
index f37e6fdfafc2..23667e6afcd7 100644
--- a/pkgs/development/compilers/llvm/4.0/lldb.nix
+++ b/pkgs/development/compilers/llvm/4.0/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "0g3il7bz1b0xbcm85c6r64vgn8ppxigi1s39s3xzga4pkllf7k07";
+  src = fetch "lldb" "1qr0ky7llwgjgx1pzkp3pnz32nb6f7lvg8qg6rp5axhgpkx54hz7";
 
   patchPhase = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4.0/llvm.nix
index d54390e5ee8d..2d36f7cd0fb1 100644
--- a/pkgs/development/compilers/llvm/4.0/llvm.nix
+++ b/pkgs/development/compilers/llvm/4.0/llvm.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  src = fetch "llvm" "1qfvvblca2aa5shamz66132k30hmpq2mkpfn172xzzlm6znzlmr2";
+  src = fetch "llvm" "0ic3y9gaissi6ixyj9x1c0pq69wfbl2svhprp33av0b58f7wj9v7";
   shlib = if stdenv.isDarwin then "dylib" else "so";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
@@ -111,7 +111,7 @@ in stdenv.mkDerivation rec {
     description = "Collection of modular and reusable compiler and toolchain technologies";
     homepage    = http://llvm.org/;
     license     = stdenv.lib.licenses.ncsa;
-    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ];
+    maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric dtzWill ];
     platforms   = stdenv.lib.platforms.all;
   };
 }

From 6f6c06adc1c0338e0125e7d5785b43223493f114 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 2 Mar 2017 16:51:32 -0600
Subject: [PATCH 1567/3449] llvm4.0: Rename "4.0" (and _40) to "4" (and _4).

This reflects upstream versioning change, and allows
us to replace 4.0 with 4.1 (which is now a minor revision)
without changing the attribute name.

Thanks to @vcunat for the idea.
---
 .../compilers/llvm/{4.0 => 4}/clang/default.nix           | 0
 .../compilers/llvm/{4.0 => 4}/clang/purity.patch          | 0
 pkgs/development/compilers/llvm/{4.0 => 4}/default.nix    | 2 +-
 .../compilers/llvm/{4.0 => 4}/libc++/default.nix          | 0
 .../compilers/llvm/{4.0 => 4}/libc++/setup-hook.sh        | 0
 pkgs/development/compilers/llvm/{4.0 => 4}/libc++abi.nix  | 0
 pkgs/development/compilers/llvm/{4.0 => 4}/lld.nix        | 0
 pkgs/development/compilers/llvm/{4.0 => 4}/lldb.nix       | 0
 .../compilers/llvm/{4.0 => 4}/llvm-outputs.patch          | 0
 pkgs/development/compilers/llvm/{4.0 => 4}/llvm.nix       | 0
 pkgs/top-level/all-packages.nix                           | 8 ++++----
 11 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/clang/default.nix (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/clang/purity.patch (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/default.nix (96%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++/default.nix (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++/setup-hook.sh (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/libc++abi.nix (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/lld.nix (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/lldb.nix (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/llvm-outputs.patch (100%)
 rename pkgs/development/compilers/llvm/{4.0 => 4}/llvm.nix (100%)

diff --git a/pkgs/development/compilers/llvm/4.0/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/clang/default.nix
rename to pkgs/development/compilers/llvm/4/clang/default.nix
diff --git a/pkgs/development/compilers/llvm/4.0/clang/purity.patch b/pkgs/development/compilers/llvm/4/clang/purity.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/clang/purity.patch
rename to pkgs/development/compilers/llvm/4/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/4.0/default.nix b/pkgs/development/compilers/llvm/4/default.nix
similarity index 96%
rename from pkgs/development/compilers/llvm/4.0/default.nix
rename to pkgs/development/compilers/llvm/4/default.nix
index 349545a29599..cbb3852057df 100644
--- a/pkgs/development/compilers/llvm/4.0/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -8,7 +8,7 @@ let
 
   fetch = name: sha256: fetchurl {
     url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz";
-    # Once 4.0 is released, use this instead:
+    # Once 4 is released, use this instead:
     # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/libc++/default.nix
rename to pkgs/development/compilers/llvm/4/libc++/default.nix
diff --git a/pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/libc++/setup-hook.sh
rename to pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
diff --git a/pkgs/development/compilers/llvm/4.0/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/libc++abi.nix
rename to pkgs/development/compilers/llvm/4/libc++abi.nix
diff --git a/pkgs/development/compilers/llvm/4.0/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/lld.nix
rename to pkgs/development/compilers/llvm/4/lld.nix
diff --git a/pkgs/development/compilers/llvm/4.0/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/lldb.nix
rename to pkgs/development/compilers/llvm/4/lldb.nix
diff --git a/pkgs/development/compilers/llvm/4.0/llvm-outputs.patch b/pkgs/development/compilers/llvm/4/llvm-outputs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/llvm-outputs.patch
rename to pkgs/development/compilers/llvm/4/llvm-outputs.patch
diff --git a/pkgs/development/compilers/llvm/4.0/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/4.0/llvm.nix
rename to pkgs/development/compilers/llvm/4/llvm.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f1968ebf406..75fef2685a1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4759,7 +4759,7 @@ with pkgs;
 
   clang = llvmPackages.clang;
 
-  clang_40 = lowPrio llvmPackages_40.clang;
+  clang_4 = lowPrio llvmPackages_4.clang;
   clang_39 = llvmPackages_39.clang;
   clang_38 = llvmPackages_38.clang;
   clang_37 = llvmPackages_37.clang;
@@ -5314,13 +5314,13 @@ with pkgs;
 
   lizardfs = callPackage ../tools/filesystems/lizardfs { };
 
-  lld = lowPrio llvmPackages_40.lld;
+  lld = lowPrio llvmPackages_4.lld;
 
   lldb = llvmPackages.lldb;
 
   llvm = llvmPackages.llvm;
 
-  llvm_40 = lowPrio llvmPackages_40.llvm;
+  llvm_4 = lowPrio llvmPackages_4.llvm;
   llvm_39 = llvmPackages_39.llvm;
   llvm_38 = llvmPackages_38.llvm;
   llvm_37 = llvmPackages_37.llvm;
@@ -5358,7 +5358,7 @@ with pkgs;
     inherit (stdenvAdapters) overrideCC;
   };
 
-  llvmPackages_40 = callPackage ../development/compilers/llvm/4.0 {
+  llvmPackages_4 = callPackage ../development/compilers/llvm/4 {
     inherit (stdenvAdapters) overrideCC;
   };
 

From 40fb61392cee9a4086494b229a879281664c1ef3 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 16:13:10 -0600
Subject: [PATCH 1568/3449] tpm-quote-tools: 1.0.2 -> 1.0.3

tpm-quote-tools: Fixed library issue
---
 .../security/tpm-quote-tools/default.nix      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix
index b294c1c9feb8..7ffe8e51eacd 100644
--- a/pkgs/tools/security/tpm-quote-tools/default.nix
+++ b/pkgs/tools/security/tpm-quote-tools/default.nix
@@ -1,16 +1,23 @@
 { stdenv, fetchurl, trousers, openssl }:
 
-stdenv.mkDerivation {
-  name = "tpm-quote-tools-1.0.2";
+stdenv.mkDerivation rec { 
+  name = "tpm-quote-tools-${version}";
+  version = "1.0.3";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/tpmquotetools/1.0.2/tpm-quote-tools-1.0.2.tar.gz";
-    sha256 = "17bf9d1hiiaybx6rgl0sqcb0prjz6d2mv8fwp4bj1c0rsfw5dbk8";
+  src = fetchurl { 
+    url = "mirror://sourceforge/project/tpmquotetools/${version}/${name}.tar.gz";
+    sha256 = "1d6ry2c78sgv0z4phfrwrbvgag83xnnfri2cdzrd86w4yfgnfwdf";
   };
 
   buildInputs = [ trousers openssl ];
 
-  meta = with stdenv.lib; {
+  postFixup = ''
+    patchelf \
+      --set-rpath "${stdenv.lib.makeLibraryPath [ openssl ]}:$(patchelf --print-rpath $out/bin/tpm_mkaik)" \
+      $out/bin/tpm_mkaik
+  '';
+
+  meta = with stdenv.lib; { 
     description = "A collection of programs that provide support for TPM based attestation using the TPM quote mechanism";
     longDescription = ''
       The TPM Quote Tools is a collection of programs that provide support
@@ -19,7 +26,7 @@ stdenv.mkDerivation {
     '';
     homepage    = http://tpmquotetools.sourceforge.net/;
     license     = licenses.bsd3;
-    maintainers = [ maintainers.ak ];
+    maintainers = with maintainers; [ ak ndowens ];
     platforms   = platforms.linux;
   };
 }

From acb1032968927c5e78e5d05c1bafc6378d82c44b Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Fri, 3 Mar 2017 08:54:32 +0900
Subject: [PATCH 1569/3449] fcitx: fix fcitx-qt5 attribute path

---
 pkgs/tools/inputmethods/fcitx/wrapper.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index 8e086f7386f5..1dfe6b245061 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,9 +1,9 @@
-{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, qt55 }:
+{ stdenv, symlinkJoin, fcitx, fcitx-configtool, makeWrapper, plugins, libsForQt5 }:
 
 symlinkJoin {
   name = "fcitx-with-plugins-${fcitx.version}";
 
-  paths = [ fcitx fcitx-configtool qt55.fcitx-qt5 ] ++ plugins;
+  paths = [ fcitx fcitx-configtool libsForQt5.fcitx-qt5 ] ++ plugins;
 
   buildInputs = [ makeWrapper ];
 

From 3f116702cc1242e34d008a8f1793e6f542e79472 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 3 Mar 2017 01:33:18 +0000
Subject: [PATCH 1570/3449] buildbot-master module: fix overly restrictive
 option type for masterCfg

---
 .../modules/services/continuous-integration/buildbot/master.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 512e09eb8041..f638cf4bae3b 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -66,7 +66,7 @@ in {
       };
 
       masterCfg = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
         description = ''
           Optionally pass raw master.cfg file as string.
           Other options in this configuration will be ignored.

From 28cb067600e8800caf090843583fd39e8301073e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 2 Mar 2017 19:39:55 -0600
Subject: [PATCH 1571/3449] fricas: 1.2.2 -> 1.3.1

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

diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix
index 0dd1222b0965..ccdd666e90bd 100644
--- a/pkgs/applications/science/math/fricas/default.nix
+++ b/pkgs/applications/science/math/fricas/default.nix
@@ -1,11 +1,15 @@
 { stdenv, fetchurl, sbcl, libX11, libXpm, libICE, libSM, libXt, libXau, libXdmcp }:
 
-stdenv.mkDerivation rec {
-  name = "fricas-1.2.2";
+let
+  version = "1.3.1";
+  name = "fricas-" + version;
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    url    = "http://sourceforge.net/projects/fricas/files/fricas/1.2.2/${name}-full.tar.bz2";
-    sha256 = "87db64a1fd4211f3b776793acea931b4271d2e7a28396414c7d7397d833defe1";
+    url    = "http://sourceforge.net/projects/fricas/files/fricas/${version}/${name}-full.tar.bz2";
+    sha256 = "0c2wgj1c3mh5f8msx1ckxpnhm0dyq7dqf1wk6aiyysh8xn57cjkx";
   };
 
   buildInputs = [ sbcl libX11 libXpm libICE libSM libXt libXau libXdmcp ];

From 3f8ed79a5a5e7ecba335e72e0a736a3b6390fb82 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 20:22:54 -0600
Subject: [PATCH 1572/3449] s6-portable-utils: 2.0.5.3 -> 2.1.0.0

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 70b36222cca9..357600e8d4f6 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,16 +1,14 @@
-{ stdenv, fetchurl, skalibs }:
-
-let
-
-  version = "2.0.5.3";
-
-in stdenv.mkDerivation rec {
+{ stdenv, fetchFromGitHub, skalibs }:
 
+stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
+  version = "2.1.0.0";
 
-  src = fetchurl {
-    url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
-    sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7";
+  src = fetchFromGitHub {
+    owner = "skarnet";
+    repo = "s6-portable-utils";
+    rev = "v${version}";
+    sha256 = "0k5pcwc45jw5l8ycz03wx2w4pds0wp4ll47d3i5i1j02i9v0rhc9";
   };
 
   dontDisableStatic = true;
@@ -23,12 +21,12 @@ in stdenv.mkDerivation rec {
   ]
   ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.isc;
-    maintainers = with stdenv.lib.maintainers; [ pmahoney ];
+    platforms = platforms.all;
+    license = licenses.isc;
+    maintainers = with maintainers; [ pmahoney ];
   };
 
 }

From c00aa5d178148985854ec265b9ecd7e4b1d45e9e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 20:37:01 -0600
Subject: [PATCH 1573/3449] lzip: 1.17 -> 1.18

---
 pkgs/tools/compression/lzip/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index a800a19e12b9..36014fdd0ad1 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "lzip-1.17";
+  name = "lzip-${version}";
+  version = "1.18";
 
   buildInputs = [ texinfo ];
 
   src = fetchurl {
     url = "mirror://savannah/lzip/${name}.tar.gz";
-    sha256 = "0lh3x964jjldx3piax6c2qzlhfiir5i6rnrcn8ri44rk19g8ahwl";
+    sha256 = "1p8lvc22sv3damld9ng8y6i8z2dvvpsbi9v7yhr5bc2a20m8iya7";
   };
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";

From a391e8837c8a873166d15c4342a3c21cb84dca73 Mon Sep 17 00:00:00 2001
From: Clemens Manert <Clemens@Manert.de>
Date: Fri, 3 Mar 2017 03:43:55 +0100
Subject: [PATCH 1574/3449] Update 1.16 -> 1.17

---
 pkgs/desktops/mate/mate-common/default.nix     | 4 ++--
 pkgs/desktops/mate/mate-icon-theme/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix
index 7a7ad23c6bdd..b020351afe21 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.16";
+  major-ver = "1.17";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "02pj5ry3c7p5sd2mp9dsshy0ij0xgv00bxr4vvmnm027hv2silrl";
+    sha256 = "06pvbi2kk39ysd9dfi6ljkncm53hn02n7dygax6ig4p9qd750sdc";
   };
 
   meta = {
diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix
index 8acef0338715..ab699c78c0ef 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.16";
+  major-ver = "1.17";
   minor-ver = "0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
-    sha256 = "1zldw22p1i76iss8car39pmfagpfxxlfk1fdhvr4x5r6gf36gv7d";
+    sha256 = "1kxpckaksaz5g3c4jjkh4pdm9yhbjda5835am3wg2iyy2p7rjn8n";
   };
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils ];

From fc12998c3aea2a156ae96f79dac69c74ef394ec4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 3 Mar 2017 04:56:57 +0100
Subject: [PATCH 1575/3449] libchop: fix package

---
 .../development/libraries/libchop/default.nix | 19 ++++++++++---------
 .../libraries/libchop/size_t.patch            | 11 +++++++++++
 2 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/libraries/libchop/size_t.patch

diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 7ff992ccc554..1be3a74fbff5 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -1,5 +1,7 @@
-{ fetchurl, stdenv, zlib, bzip2, libgcrypt, gdbm, gperf, tdb, gnutls, db
-, libuuid, lzo, pkgconfig, guile }:
+{ fetchurl, stdenv, zlib, bzip2, libgcrypt
+, gdbm, gperf, tdb, gnutls, db, libuuid
+, lzo, pkgconfig, guile
+}:
 
 stdenv.mkDerivation rec {
   name = "libchop-0.5.2";
@@ -9,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g";
   };
 
-  patches = [ ./gets-undeclared.patch ];
+  patches = [ ./gets-undeclared.patch ./size_t.patch ];
 
   nativeBuildInputs = [ pkgconfig gperf ];
   
@@ -21,13 +23,13 @@ stdenv.mkDerivation rec {
       guile
     ];
 
-  doCheck = true;
+  doCheck = false;
 
   preConfigure = ''
     sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.*
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tools & library for data backup and distributed storage";
 
     longDescription =
@@ -46,9 +48,8 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = http://nongnu.org/libchop/;
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.gnu;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ viric ];
+    platforms = platforms.gnu;
   };
 }
diff --git a/pkgs/development/libraries/libchop/size_t.patch b/pkgs/development/libraries/libchop/size_t.patch
new file mode 100644
index 000000000000..82b6cb995ef3
--- /dev/null
+++ b/pkgs/development/libraries/libchop/size_t.patch
@@ -0,0 +1,11 @@
+--- a/src/chop.c
++++ b/src/chop.c
+@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc
+   chop_qdbm_block_iterator_class;
+ 
+ const struct chop_class_entry *
+-chop_lookup_class_entry (const char *str, unsigned int len);
++chop_lookup_class_entry (const char *str, size_t len);
+ 
+ /* Include the gperf-generated perfect hash table.  */
+ #include "class-lookup.c"

From a1f6b8b5fc3c76d679064208aee228a051280f33 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 3 Mar 2017 07:43:41 +0100
Subject: [PATCH 1576/3449] Python 3.6 fixup expat and libffi, fixes #23406

---
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index ebf621d50576..2acca2b8a3cf 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -34,7 +34,7 @@ let
   sitePackages = "lib/${libPrefix}/site-packages";
 
   buildInputs = filter (p: p != null) [
-    zlib bzip2 lzma gdbm sqlite readline ncurses openssl ]
+    zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ]
     ++ optionals x11Support [ tcl tk libX11 xproto ]
     ++ optionals stdenv.isDarwin [ CF configd ];
 

From 09a593b3de8e66084def281e205afff7d53e28e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Mar 2017 22:58:23 +0100
Subject: [PATCH 1577/3449] Drop obsolete, unmaintained
 haskell.packages.lts-x_y package sets.

Stack no longer uses them since a long time: https://github.com/commercialhaskell/stack/issues/2259.
---
 pkgs/top-level/haskell-packages.nix | 128 ----------------------------
 1 file changed, 128 deletions(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 6f07c129322d..b4226e656fde 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -182,133 +182,5 @@ in rec {
        };
     });
 
-    # These attributes exist only for backwards-compatibility so that we don't break
-    # stack's --nix support. These attributes will disappear in the foreseeable
-    # future: https://github.com/commercialhaskell/stack/issues/2259.
-
-    lts-0_0 = packages.ghc783;
-    lts-0_1 = packages.ghc783;
-    lts-0_2 = packages.ghc783;
-    lts-0_3 = packages.ghc783;
-    lts-0_4 = packages.ghc783;
-    lts-0_5 = packages.ghc783;
-    lts-0_6 = packages.ghc783;
-    lts-0_7 = packages.ghc783;
-    lts-0 = packages.lts-0_7;
-
-    lts-1_0 = packages.ghc784;
-    lts-1_1 = packages.ghc784;
-    lts-1_2 = packages.ghc784;
-    lts-1_4 = packages.ghc784;
-    lts-1_5 = packages.ghc784;
-    lts-1_7 = packages.ghc784;
-    lts-1_8 = packages.ghc784;
-    lts-1_9 = packages.ghc784;
-    lts-1_10 =packages.ghc784;
-    lts-1_11 =packages.ghc784;
-    lts-1_12 =packages.ghc784;
-    lts-1_13 =packages.ghc784;
-    lts-1_14 =packages.ghc784;
-    lts-1_15 =packages.ghc784;
-    lts-1 = packages.lts-1_15;
-
-    lts-2_0 = packages.ghc784;
-    lts-2_1 = packages.ghc784;
-    lts-2_2 = packages.ghc784;
-    lts-2_3 = packages.ghc784;
-    lts-2_4 = packages.ghc784;
-    lts-2_5 = packages.ghc784;
-    lts-2_6 = packages.ghc784;
-    lts-2_7 = packages.ghc784;
-    lts-2_8 = packages.ghc784;
-    lts-2_9 = packages.ghc784;
-    lts-2_10 = packages.ghc784;
-    lts-2_11 = packages.ghc784;
-    lts-2_12 = packages.ghc784;
-    lts-2_13 = packages.ghc784;
-    lts-2_14 = packages.ghc784;
-    lts-2_15 = packages.ghc784;
-    lts-2_16 = packages.ghc784;
-    lts-2_17 = packages.ghc784;
-    lts-2_18 = packages.ghc784;
-    lts-2_19 = packages.ghc784;
-    lts-2_20 = packages.ghc784;
-    lts-2_21 = packages.ghc784;
-    lts-2_22 = packages.ghc784;
-    lts-2 = packages.lts-2_22;
-
-    lts-3_0 = packages.ghc7102;
-    lts-3_1 = packages.ghc7102;
-    lts-3_2 = packages.ghc7102;
-    lts-3_3 = packages.ghc7102;
-    lts-3_4 = packages.ghc7102;
-    lts-3_5 = packages.ghc7102;
-    lts-3_6 = packages.ghc7102;
-    lts-3_7 = packages.ghc7102;
-    lts-3_8 = packages.ghc7102;
-    lts-3_9 = packages.ghc7102;
-    lts-3_10 = packages.ghc7102;
-    lts-3_11 = packages.ghc7102;
-    lts-3_12 = packages.ghc7102;
-    lts-3_13 = packages.ghc7102;
-    lts-3_14 = packages.ghc7102;
-    lts-3_15 = packages.ghc7102;
-    lts-3_16 = packages.ghc7102;
-    lts-3_17 = packages.ghc7102;
-    lts-3_18 = packages.ghc7102;
-    lts-3_19 = packages.ghc7102;
-    lts-3_20 = packages.ghc7102;
-    lts-3 = packages.lts-3_20;
-
-    lts-4_0 = packages.ghc7103;
-    lts-4_1 = packages.ghc7103;
-    lts-4_2 = packages.ghc7103;
-    lts-4 = packages.lts-4_2;
-
-    lts-5_0 = packages.ghc7103;
-    lts-5_1 = packages.ghc7103;
-    lts-5_2 = packages.ghc7103;
-    lts-5_3 = packages.ghc7103;
-    lts-5_4 = packages.ghc7103;
-    lts-5_5 = packages.ghc7103;
-    lts-5_6 = packages.ghc7103;
-    lts-5_7 = packages.ghc7103;
-    lts-5_8 = packages.ghc7103;
-    lts-5_9 = packages.ghc7103;
-    lts-5_10 = packages.ghc7103;
-    lts-5_11 = packages.ghc7103;
-    lts-5_12 = packages.ghc7103;
-    lts-5_13 = packages.ghc7103;
-    lts-5_14 = packages.ghc7103;
-    lts-5_15 = packages.ghc7103;
-    lts-5_16 = packages.ghc7103;
-    lts-5_17 = packages.ghc7103;
-    lts-5_18 = packages.ghc7103;
-    lts-5 = packages.lts-5_18;
-
-    lts-6_0 = packages.ghc7103;
-    lts-6_1 = packages.ghc7103;
-    lts-6_2 = packages.ghc7103;
-    lts-6_3 = packages.ghc7103;
-    lts-6_4 = packages.ghc7103;
-    lts-6_5 = packages.ghc7103;
-    lts-6_6 = packages.ghc7103;
-    lts-6_7 = packages.ghc7103;
-    lts-6_8 = packages.ghc7103;
-    lts-6_9 = packages.ghc7103;
-    lts-6_10 = packages.ghc7103;
-    lts-6_11 = packages.ghc7103;
-    lts-6_12 = packages.ghc7103;
-    lts-6_13 = packages.ghc7103;
-    lts-6_14 = packages.ghc7103;
-    lts-6_15 = packages.ghc7103;
-    lts-6_16 = packages.ghc7103;
-    lts-6_17 = packages.ghc7103;
-    lts-6 = packages.lts-6_17;
-
-    lts-7_0 = packages.ghc801;
-    lts-7 = packages.lts-7_0;
-
-    lts = packages.lts-7;
   };
 }

From 39488911128ad5d5df0b549baf53840dedfc6d21 Mon Sep 17 00:00:00 2001
From: Alexander Kirchhoff <kirch@cs.washington.edu>
Date: Fri, 3 Mar 2017 00:17:01 -0800
Subject: [PATCH 1578/3449] pam_ssh_agent_auth: Re-allow multiple authorized
 keys files

This functionality was initially introduced in
3644f9124aaf35f2ad7b17cd05df19226d4e4d1c to fix
https://github.com/NixOS/nixos/pull/52, but was broken in the update from 0.9.5
to 0.10.3.  The original patch does not cleanly apply due to reformatting and
parameter changes upstream, but the adaptations of the patch to the new version
are not too severe.
---
 .../linux/pam_ssh_agent_auth/default.nix      |   6 +
 .../multiple-key-files.patch                  | 365 ++++++++++++++++++
 2 files changed, 371 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch

diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
index 9ce1ef6ae53d..48c02be9c389 100644
--- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
+++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix
@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0qx78x7nvqdscyp04hfijl4rgyf64xy03prr28hipvgasrcd6lrw";
   };
 
+  patches =
+    [ # Allow multiple colon-separated authorized keys files to be
+      # specified in the file= option.
+      ./multiple-key-files.patch
+    ];
+
   buildInputs = [ pam openssl perl ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
new file mode 100644
index 000000000000..190325251c9a
--- /dev/null
+++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/multiple-key-files.patch
@@ -0,0 +1,365 @@
+diff -u pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.c pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c
+--- pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.c	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c	2017-03-02 23:47:18.012203283 -0800
+@@ -176,7 +176,7 @@
+     return;
+ }
+ 
+-int
++const char *
+ pamsshagentauth_find_authorized_keys(const char * user, const char * ruser, const char * servicename)
+ {
+     Buffer session_id2 = { 0 };
+@@ -184,7 +184,7 @@
+     Key *key;
+     AuthenticationConnection *ac;
+     char *comment;
+-    uint8_t retval = 0;
++    const char *key_file = 0;
+     uid_t uid = getpwnam(ruser)->pw_uid;
+ 
+     OpenSSL_add_all_digests();
+@@ -199,13 +199,11 @@
+                 id->key = key;
+                 id->filename = comment;
+                 id->ac = ac;
+-                if(userauth_pubkey_from_id(ruser, id, &session_id2)) {
+-                    retval = 1;
+-                }
++                key_file = userauth_pubkey_from_id(ruser, id, &session_id2);
+                 pamsshagentauth_xfree(id->filename);
+                 pamsshagentauth_key_free(id->key);
+                 pamsshagentauth_xfree(id);
+-                if(retval == 1)
++                if(key_file)
+                     break;
+             }
+         }
+@@ -217,5 +215,5 @@
+     }
+     /* pamsshagentauth_xfree(session_id2); */
+     EVP_cleanup();
+-    return retval;
++    return key_file;
+ }
+diff -u pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.h pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.h
+--- pam_ssh_agent_auth-0.10.3-orig/iterate_ssh_agent_keys.h	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.h	2017-03-02 23:48:06.345803339 -0800
+@@ -31,6 +31,6 @@
+ #ifndef _ITERATE_SSH_AGENT_KEYS_H
+ #define _ITERATE_SSH_AGENT_KEYS_H
+ 
+-int pamsshagentauth_find_authorized_keys(const char * user, const char * ruser, const char * servicename);
++const char * pamsshagentauth_find_authorized_keys(const char * user, const char * ruser, const char * servicename);
+ 
+ #endif
+diff -u pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.c pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.c
+--- pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.c	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.c	2017-03-02 23:51:57.642669946 -0800
+@@ -61,7 +61,6 @@
+ #define strncasecmp_literal(A,B) strncasecmp( A, B, sizeof(B) - 1)
+ #define UNUSED(expr) do { (void)(expr); } while (0)
+ 
+-char           *authorized_keys_file = NULL;
+ uint8_t         allow_user_owned_authorized_keys_file = 0;
+ char           *authorized_keys_command = NULL;
+ char           *authorized_keys_command_user = NULL;
+@@ -171,15 +170,13 @@
+         goto cleanexit;
+     }
+ 
+-    if(authorized_keys_file_input && user) {
+-        /*
+-         * user is the name of the target-user, and so must be used for validating the authorized_keys file
+-         */
+-        parse_authorized_key_file(user, authorized_keys_file_input);
+-    } else {
+-        pamsshagentauth_verbose("Using default file=/etc/security/authorized_keys");
+-        authorized_keys_file = pamsshagentauth_xstrdup("/etc/security/authorized_keys");
+-    }
++    if (!authorized_keys_file_input || !user)
++        authorized_keys_file_input = "/etc/security/authorized_keys";
++
++    /*
++     * user is the name of the target-user, and so must be used for validating the authorized_keys file
++     */
++    parse_authorized_key_files(user, authorized_keys_file_input);
+ 
+     /*
+      * PAM_USER and PAM_RUSER do not necessarily have to get set by the calling application, and we may be unable to divine the latter.
+@@ -187,16 +184,17 @@
+      */
+ 
+     if(user && strlen(ruser) > 0) {
+-        pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
++        pamsshagentauth_verbose("Attempting authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
+ 
+         /*
+          * this pw_uid is used to validate the SSH_AUTH_SOCK, and so must be the uid of the ruser invoking the program, not the target-user
+          */
+-        if(pamsshagentauth_find_authorized_keys(user, ruser, servicename)) { /* getpwnam(ruser)->pw_uid)) { */
+-            pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
++        const char *key_file;
++        if((key_file = pamsshagentauth_find_authorized_keys(user, ruser, servicename))) { /* getpwnam(ruser)->pw_uid)) { */
++            pamsshagentauth_logit("Authenticated: `%s' as `%s' using %s", ruser, user, key_file);
+             retval = PAM_SUCCESS;
+         } else {
+-            pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file);
++            pamsshagentauth_logit("Failed Authentication: `%s' as `%s' using %s", ruser, user, authorized_keys_file_input);
+         }
+     } else {
+         pamsshagentauth_logit("No %s specified, cannot continue with this form of authentication", (user) ? "ruser" : "user" );
+@@ -208,7 +206,7 @@
+     free(__progname);
+ #endif
+ 
+-    free(authorized_keys_file);
++    free_authorized_key_files();
+ 
+     return retval;
+ }
+diff -u pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.pod pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.pod
+--- pam_ssh_agent_auth-0.10.3-orig/pam_ssh_agent_auth.pod	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/pam_ssh_agent_auth.pod	2017-03-02 23:52:28.914857449 -0800
+@@ -31,7 +31,7 @@
+ 
+ =item file=<path to authorized_keys>
+ 
+-Specify the path to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below) 
++Specify the path(s) to the authorized_keys file(s) you would like to use for authentication. Subject to tilde and % EXPANSIONS (below). Paths are separated using colons.
+ 
+ =item allow_user_owned_authorized_keys_file
+ 
+diff -u pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.c pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.c
+--- pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.c	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.c	2017-03-03 00:07:45.201322570 -0800
+@@ -79,8 +79,12 @@
+ 
+ #include "identity.h"
+ #include "pam_user_key_allowed2.h"
++#include "pam_user_authorized_keys.h"
+ 
+-extern char *authorized_keys_file;
++#define MAX_AUTHORIZED_KEY_FILES 16
++
++char *authorized_keys_files[MAX_AUTHORIZED_KEY_FILES];
++unsigned int nr_authorized_keys_files = 0;
+ 
+ extern char *authorized_keys_command;
+ 
+@@ -91,79 +95,88 @@
+ uid_t authorized_keys_file_allowed_owner_uid;
+ 
+ void
+-parse_authorized_key_file(const char *user,
+-                          const char *authorized_keys_file_input)
++parse_authorized_key_files(const char *user,
++                           const char *authorized_keys_file_input)
+ {
+-    char fqdn[HOST_NAME_MAX] = "";
++    const char *pos = authorized_keys_file_input;
+     char hostname[HOST_NAME_MAX] = "";
+-    char auth_keys_file_buf[4096] = "";
+-    char *slash_ptr = NULL;
+-    char owner_uname[128] = "";
+-    size_t owner_uname_len = 0;
+-
+-    /* 
+-     * temporary copy, so that both tilde expansion and percent expansion both
+-     * get to apply to the path
+-     */
+-    strncat(auth_keys_file_buf, authorized_keys_file_input,
+-            sizeof(auth_keys_file_buf) - 1);
++    char fqdn[HOST_NAME_MAX] = "";
+ 
+-    if(allow_user_owned_authorized_keys_file)
+-        authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++#if HAVE_GETHOSTNAME
++    *hostname = '\0';
++    gethostname(fqdn, HOST_NAME_MAX);
++    strncat(hostname, fqdn, strcspn(fqdn,"."));
++#endif
+ 
+-    if(*auth_keys_file_buf == '~') {
+-        if(*(auth_keys_file_buf + 1) == '/') {
+-            authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++    while (pos) {
++        const char *colon = strchr(pos, ':');
++        char auth_keys_file_buf[4096] = "";
++        char *slash_ptr = NULL;
++        char owner_uname[128] = "";
++        size_t owner_uname_len = 0;
++
++        strncat(auth_keys_file_buf, pos, sizeof(auth_keys_file_buf) - 1);
++        if (colon) {
++            auth_keys_file_buf[colon - pos] = 0;
++            pos = colon + 1;
+         } else {
+-            slash_ptr = strchr(auth_keys_file_buf, '/');
+-            if(!slash_ptr)
+-                pamsshagentauth_fatal
+-                    ("cannot expand tilde in path without a `/'");
+-
+-            owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
+-            if(owner_uname_len > (sizeof(owner_uname) - 1))
+-                pamsshagentauth_fatal("Username too long");
+-
+-            strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
+-            if(!authorized_keys_file_allowed_owner_uid)
+-                authorized_keys_file_allowed_owner_uid =
+-                    getpwnam(owner_uname)->pw_uid;
++            pos = 0;
++        }
++
++        if(allow_user_owned_authorized_keys_file)
++            authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++
++        if(*auth_keys_file_buf == '~') {
++            if(*(auth_keys_file_buf+1) == '/') {
++                authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++            }
++            else {
++                slash_ptr = strchr(auth_keys_file_buf,'/');
++                if(!slash_ptr)
++                    pamsshagentauth_fatal("cannot expand tilde in path without a `/'");
++
++                owner_uname_len = slash_ptr - auth_keys_file_buf - 1;
++                if(owner_uname_len > (sizeof(owner_uname) - 1) )
++                    pamsshagentauth_fatal("Username too long");
++
++                strncat(owner_uname, auth_keys_file_buf + 1, owner_uname_len);
++                if(!authorized_keys_file_allowed_owner_uid)
++                    authorized_keys_file_allowed_owner_uid = getpwnam(owner_uname)->pw_uid;
++            }
++            char *tmp = pamsshagentauth_tilde_expand_filename(auth_keys_file_buf, authorized_keys_file_allowed_owner_uid);
++            strncpy(auth_keys_file_buf, tmp, sizeof(auth_keys_file_buf) - 1 );
++            pamsshagentauth_xfree(tmp);
+         }
+-        authorized_keys_file =
+-            pamsshagentauth_tilde_expand_filename(auth_keys_file_buf,
+-                                                  authorized_keys_file_allowed_owner_uid);
+-        strncpy(auth_keys_file_buf, authorized_keys_file,
+-                sizeof(auth_keys_file_buf) - 1);
+-        pamsshagentauth_xfree(authorized_keys_file)        /* when we
+-                                                              percent_expand
+-                                                              later, we'd step
+-                                                              on this, so free
+-                                                              it immediately */ ;
+-    }
+ 
+-    if(strstr(auth_keys_file_buf, "%h")) {
+-        authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++        if(strstr(auth_keys_file_buf, "%h")) {
++            authorized_keys_file_allowed_owner_uid = getpwnam(user)->pw_uid;
++        }
++
++        if (nr_authorized_keys_files >= MAX_AUTHORIZED_KEY_FILES)
++            pamsshagentauth_fatal("Too many authorized key files");
++        authorized_keys_files[nr_authorized_keys_files++] =
++            pamsshagentauth_percent_expand(auth_keys_file_buf, "h", getpwnam(user)->pw_dir, "H", hostname, "f", fqdn, "u", user, NULL);
+     }
+-#if HAVE_GETHOSTNAME
+-    *hostname = '\0';
+-    gethostname(fqdn, HOST_NAME_MAX);
+-    strncat(hostname, fqdn, strcspn(fqdn, "."));
+-#endif
+-    authorized_keys_file =
+-        pamsshagentauth_percent_expand(auth_keys_file_buf, "h",
+-                                       getpwnam(user)->pw_dir, "H", hostname,
+-                                       "f", fqdn, "u", user, NULL);
+ }
+ 
+-int
++void
++free_authorized_key_files()
++{
++    unsigned int n;
++    for (n = 0; n < nr_authorized_keys_files; n++)
++        free(authorized_keys_files[n]);
++    nr_authorized_keys_files = 0;
++}
++
++const char *
+ pam_user_key_allowed(const char *ruser, Key * key)
+ {
+-    return
+-        pamsshagentauth_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid),
+-                                          key, authorized_keys_file)
+-        || pamsshagentauth_user_key_allowed2(getpwuid(0), key,
+-                                             authorized_keys_file)
+-        || pamsshagentauth_user_key_command_allowed2(authorized_keys_command,
+-                                                     authorized_keys_command_user,
+-                                                     getpwnam(ruser), key);
++    unsigned int n;
++    for (n = 0; n < nr_authorized_keys_files; n++) {
++        if (pamsshagentauth_user_key_allowed2(getpwuid(authorized_keys_file_allowed_owner_uid), key, authorized_keys_files[n])
++            || pamsshagentauth_user_key_allowed2(getpwuid(0), key, authorized_keys_files[n])
++            || pamsshagentauth_user_key_command_allowed2(authorized_keys_command, authorized_keys_command_user, getpwnam(ruser), key))
++            return authorized_keys_files[n];
++    }
++    return 0;
+ }
+diff -u pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.h pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.h
+--- pam_ssh_agent_auth-0.10.3-orig/pam_user_authorized_keys.h	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/pam_user_authorized_keys.h	2017-03-03 00:09:17.256064914 -0800
+@@ -28,11 +28,12 @@
+  */
+ 
+ 
+-#ifndef _PAM_USER_KEY_ALLOWED_H
+-#define _PAM_USER_KEY_ALLOWED_H
++#ifndef _PAM_USER_AUTHORIZED_KEYS_H
++#define _PAM_USER_AUTHORIZED_KEYS_H
+ 
+ #include "identity.h"
+-int pam_user_key_allowed(const char *, Key *);
+-void parse_authorized_key_file(const char *, const char *);
++const char * pam_user_key_allowed(const char *, Key *);
++void parse_authorized_key_files(const char *, const char *);
++void free_authorized_key_files();
+ 
+ #endif
+diff -u pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.c pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c
+--- pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.c	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c	2017-03-03 00:10:33.163545380 -0800
+@@ -52,7 +52,7 @@
+ extern uint8_t  session_id_len;
+  */
+ 
+-int
++const char *
+ userauth_pubkey_from_id(const char *ruser, Identity * id, Buffer * session_id2)
+ {
+     Buffer          b = { 0 };
+@@ -60,11 +60,12 @@
+     u_char         *pkblob = NULL, *sig = NULL;
+     u_int           blen = 0, slen = 0;
+     int             authenticated = 0;
++    const char     *key_file;
+ 
+     pkalg = (char *) key_ssh_name(id->key);
+ 
+     /* first test if this key is even allowed */
+-    if(! pam_user_key_allowed(ruser, id->key))
++    if(!(key_file = pam_user_key_allowed(ruser, id->key)))
+         goto user_auth_clean_exit;
+ 
+     if(pamsshagentauth_key_to_blob(id->key, &pkblob, &blen) == 0)
+@@ -97,5 +98,5 @@
+     if(pkblob != NULL)
+         pamsshagentauth_xfree(pkblob);
+     CRYPTO_cleanup_all_ex_data();
+-    return authenticated;
++    return authenticated ? key_file : 0;
+ }
+diff -u pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.h pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.h
+--- pam_ssh_agent_auth-0.10.3-orig/userauth_pubkey_from_id.h	2016-11-12 19:24:32.000000000 -0800
++++ pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.h	2017-03-03 00:10:59.067046872 -0800
+@@ -32,6 +32,6 @@
+ #define _USERAUTH_PUBKEY_FROM_ID_H
+ 
+ #include <identity.h>
+-int userauth_pubkey_from_id(const char *, Identity *, Buffer *);
++const char * userauth_pubkey_from_id(const char *, Identity *, Buffer *);
+ 
+ #endif

From 86a1d6f4aa6dd6b40f8a50fac556165bfb43ce23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 3 Mar 2017 10:21:32 +0100
Subject: [PATCH 1579/3449] pfixtools: fix build with unbound-1.6.1

---
 .../0001-Fix-build-with-unbound-1.6.1.patch   | 54 +++++++++++++++++++
 pkgs/servers/mail/postfix/pfixtools.nix       |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch

diff --git a/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch b/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch
new file mode 100644
index 000000000000..5de22573ea33
--- /dev/null
+++ b/pkgs/servers/mail/postfix/0001-Fix-build-with-unbound-1.6.1.patch
@@ -0,0 +1,54 @@
+From bf269dda3c81bb9eaa244b3015d426de38c85ccf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
+Date: Fri, 3 Mar 2017 09:59:09 +0100
+Subject: [PATCH] Fix build with unbound 1.6.1
+
+From their changelog: Fix to rename ub_callback_t to ub_callback_type, because POSIX reserves _t typedefs
+---
+ postlicyd/dns.c       | 2 +-
+ postlicyd/dns.h       | 2 +-
+ postlicyd/spf-proto.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/postlicyd/dns.c b/postlicyd/dns.c
+index d8409c2..97f1c4d 100644
+--- a/postlicyd/dns.c
++++ b/postlicyd/dns.c
+@@ -123,7 +123,7 @@ static int dns_handler(client_t *event, void *config)
+ }
+ 
+ bool dns_resolve(const char *hostname, dns_rrtype_t type,
+-                 ub_callback_t callback, void *data)
++                 ub_callback_type callback, void *data)
+ {
+     if (_G.ctx == NULL) {
+         _G.ctx = ub_ctx_create();
+diff --git a/postlicyd/dns.h b/postlicyd/dns.h
+index d84de3b..905b924 100644
+--- a/postlicyd/dns.h
++++ b/postlicyd/dns.h
+@@ -89,7 +89,7 @@ typedef void (*dns_result_callback_f)(dns_result_t *result, void *data);
+  */
+ __attribute__((nonnull(1,3,4)))
+ bool dns_resolve(const char *hostname, dns_rrtype_t type,
+-                 ub_callback_t callback, void *data);
++                 ub_callback_type callback, void *data);
+ 
+ /** Fetch the DNS record of the given type.
+  */
+diff --git a/postlicyd/spf-proto.c b/postlicyd/spf-proto.c
+index 31cb0a5..79a2d83 100644
+--- a/postlicyd/spf-proto.c
++++ b/postlicyd/spf-proto.c
+@@ -279,7 +279,7 @@ static bool spf_validate_domain(const char* restrict domain)
+ }
+ 
+ static bool spf_query(spf_t *spf, const char* query, dns_rrtype_t rtype,
+-                      ub_callback_t cb)
++                      ub_callback_type cb)
+ {
+     buffer_reset(&_G.query_buffer);
+     buffer_addstr(&_G.query_buffer, query);
+-- 
+2.12.0
+
diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
index b17beeb095f2..1bbe6f3466b8 100644
--- a/pkgs/servers/mail/postfix/pfixtools.nix
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation {
 
   src = pfixtoolsSrc;
 
+  patches = [ ./0001-Fix-build-with-unbound-1.6.1.patch ];
+
   buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2];
 
   postUnpack = ''

From a32a00eb813818daa69e6dbc67f119d4ae527101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 3 Mar 2017 11:45:08 +0100
Subject: [PATCH 1580/3449] haskellPackages.http-api-data: dontCheck
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 2f4003b56163ebf4b9f0b1ea6ed3c0a974a3fcd7)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 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 bbd02b4dc9ff..dd5d42b8a9f7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -867,6 +867,9 @@ self: super: {
   # https://github.com/dan-t/cabal-lenses/issues/6
   cabal-lenses = doJailbreak super.cabal-lenses;
 
+  # https://github.com/fizruk/http-api-data/issues/49
+  http-api-data = dontCheck super.http-api-data;
+
   # https://github.com/snoyberg/yaml/issues/106
   yaml = disableCabalFlag super.yaml "system-libyaml";
 

From 0f9517eb9e67aabecc4ed90c18216545378c5ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@ruiec.cat>
Date: Fri, 3 Mar 2017 11:51:12 +0100
Subject: [PATCH 1581/3449] hexen: mark as broken

Does not build and is not maintained.
---
 pkgs/games/hexen/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/hexen/default.nix b/pkgs/games/hexen/default.nix
index 9e8d3ce0b8e7..7dfb4cf9d3a9 100644
--- a/pkgs/games/hexen/default.nix
+++ b/pkgs/games/hexen/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation {
     homepage = http://www.libsdl.org/projects/hexen/;
     description = "Port of Raven Software's popular Hexen 3-D shooter game";
     license = stdenv.lib.licenses.free;
+    broken = true;
   };
 }

From 410bba8f9547f00d1d196b3d424f908bf2f2a3c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 3 Mar 2017 12:03:50 +0100
Subject: [PATCH 1582/3449] libbladeRF: fix udev rule location in $out

Shell variables in cmakeFlags are not expanded, so the rules instead ended up
in `$out/'$out'/etc/udev/rules.d`.
---
 pkgs/development/libraries/libbladeRF/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index b8a4466c8c33..1411474195d3 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DCMAKE_BUILD_TYPE=Debug"
-    "-DUDEV_RULES_PATH=$out/etc/udev/rules.d"
+    "-DUDEV_RULES_PATH=etc/udev/rules.d"
     "-DINSTALL_UDEV_RULES=ON"
     "-DBUILD_DOCUMENTATION=ON"
   ];

From 1f7fe3dc07d76862da17dda37ac4d5190e0ec8ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 3 Mar 2017 12:10:09 +0100
Subject: [PATCH 1583/3449] vbam: fix location of etc in output

Shell variables are not expanded in cmakeFlags, so the etc files ended up in
`$out/'$out'/etc` instead of the expected `$out/etc`.
---
 pkgs/misc/emulators/vbam/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix
index 82193bc350b6..8ef64a11a177 100644
--- a/pkgs/misc/emulators/vbam/default.nix
+++ b/pkgs/misc/emulators/vbam/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
     "-DCMAKE_BUILD_TYPE='Release'"
     "-DENABLE_FFMPEG='true'"
     #"-DENABLE_LINK='true'" currently broken :/
-    "-DSYSCONFDIR='$out/etc'"
+    "-DSYSCONFDIR=etc"
   ];
 
   meta = {

From 75c3f009719b14906548027b7d43149664c122e1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 3 Mar 2017 12:39:00 +0100
Subject: [PATCH 1584/3449] libclc: fix evaluation

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

diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix
index 9c1acf132435..c5ba65e7b6d7 100644
--- a/pkgs/development/libraries/libclc/default.nix
+++ b/pkgs/development/libraries/libclc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2, llvm_40, clang }:
+{ stdenv, fetchFromGitHub, python2, llvm_4, clang }:
 
 stdenv.mkDerivation {
   name = "libclc-2017-02-25";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1c20jyh3sdwd9r37zs4vvppmsx8vhf2xbx0cxsrc27bhx5245p0s";
   };
 
-  buildInputs = [ python2 llvm_40 clang ];
+  buildInputs = [ python2 llvm_4 clang ];
 
   postPatch = ''
     sed -i 's,llvm_clang =.*,llvm_clang = "${clang}/bin/clang",' configure.py

From 2ac1a1da8b87f7d18e37745948d943fb0d95b731 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri@netradyne.com>
Date: Fri, 3 Mar 2017 17:11:31 +0530
Subject: [PATCH 1585/3449] kafka: 0.10.1.1 -> 0.10.2.0

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

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 2d3a74e18aa0..ceb6e8c86c01 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -11,9 +11,9 @@ let
               scalaVersion = "2.11";
               sha256 = "0ykcjv5dz9i5bws9my2d60pww1g9v2p2nqr67h0i2xrjm7az8a6v";
             };
-    "0.10" = { kafkaVersion = "0.10.1.1";
-               scalaVersion = "2.11";
-               sha256 = "0a89dyvisa5vilfa0h0ljrb00l5n9h730yxy1058z7a2g43q0h0m";
+    "0.10" = { kafkaVersion = "0.10.2.0";
+               scalaVersion = "2.12";
+               sha256 = "0py43s6zv8z7wr2lk8403k07xxckl11gla3vs4gr99lixc4whis1";
              };
   };
 in

From 253d7363981a6f76be8dd99ee7747fb05f513f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 3 Mar 2017 12:43:56 +0100
Subject: [PATCH 1586/3449] boinc: fix location of /etc in $out

Looks like the latest version no longer requires the patch, and the patch instead resulted in
/etc files being installed to `$out/$out/etc` instead of `$out/etc`
---
 pkgs/applications/science/misc/boinc/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 53ea9ce72125..54be212b86cd 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
     libxcb xcbutil
   ];
 
-  postConfigure = ''
-    sed -i -e s,/etc,$out/etc, client/scripts/Makefile
-  '';
-
   NIX_LDFLAGS = "-lX11";
 
   preConfigure = ''

From a8458bb506daf18cd83d9a5e159dbaa67c7592c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 3 Mar 2017 12:57:24 +0100
Subject: [PATCH 1587/3449] ffcast: remove unnecessary DESTDIR=$out

This avoids files being installed to $out/nix/store
---
 pkgs/tools/X11/ffcast/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix
index 1e1e3f888c99..3283cea1db52 100644
--- a/pkgs/tools/X11/ffcast/default.nix
+++ b/pkgs/tools/X11/ffcast/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-xrectsel" ];
 
   postBuild = ''
-    make DESTDIR="$out" install
+    make install
   '';
 
   meta = with stdenv.lib; {

From ac592121b9df83a81d2d90be1c40c2d393689ce5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Fri, 3 Mar 2017 12:57:24 +0100
Subject: [PATCH 1588/3449] xrectsel: remove unnecessary DESTDIR=$out

This avoids files being installed to $out/nix/store
---
 pkgs/tools/X11/xrectsel/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix
index f38ecab9f112..e54ced714e76 100644
--- a/pkgs/tools/X11/xrectsel/default.nix
+++ b/pkgs/tools/X11/xrectsel/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 ];
 
   postBuild = ''
-    make DESTDIR="$out" install
+    make install
   '';
 
   meta = with stdenv.lib; {

From bb9a37a2a56249483cd98ef09c254b78e736af1a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 3 Mar 2017 13:42:31 +0100
Subject: [PATCH 1589/3449] ikarus: remove

unmaintained, only works on 32 bit
---
 .../science/misc/gplates/default.nix          |  4 ++--
 pkgs/development/compilers/ikarus/default.nix | 19 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/development/compilers/ikarus/default.nix

diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index bc5b8060e235..7fa0c3f6865c 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
-, proj, boost160, cmake, python2, doxygen, graphviz, gmp }:
+, proj, boost159, cmake, python2, doxygen, graphviz, gmp }:
 
 stdenv.mkDerivation rec {
   name = "gplates-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost160 cmake python2
+    qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost159 cmake python2
     doxygen graphviz gmp
   ];
 
diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix
deleted file mode 100644
index e9bf6c8bb5b6..000000000000
--- a/pkgs/development/compilers/ikarus/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, gmp }:
-
-stdenv.mkDerivation rec {
-  version = "0.0.3";
-  name = "ikarus-${version}";
-
-  src = fetchurl {
-    url = "http://launchpad.net/ikarus/0.0/${version}/+download/${name}.tar.gz";
-    sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv";
-  };
-
-  buildInputs = [ gmp ];
-
-  meta = {
-    description = "Scheme compiler, aiming at R6RS";
-    homepage = http://ikarus-scheme.org/;
-    license = stdenv.lib.licenses.gpl3;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34341874e3a0..5adbe3eb8061 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5191,8 +5191,6 @@ with pkgs;
     inherit (haskellPackages) idris;
   };
 
-  ikarus = callPackage ../development/compilers/ikarus { };
-
   intercal = callPackage ../development/compilers/intercal {
     flex = flex_2_6_1; # Works with 2.5.35 too, but not 2.6.3
   };

From d88721e4408988202a0ae3cea3f5551ebfa13168 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 14 Feb 2017 23:18:44 +0100
Subject: [PATCH 1590/3449] modules: add support for module replacement with
 disabledModules

This is based on a prototype Nicolas B. Pierron worked on during a
discussion we had at FOSDEM.

A new version with a workaround for problems of the reverted original.
Discussion: https://github.com/NixOS/nixpkgs/commit/3f2566689
---
 lib/modules.nix                               | 24 ++++--
 lib/tests/modules.sh                          |  8 ++
 lib/tests/modules/default.nix                 |  1 +
 lib/tests/modules/disable-declare-enable.nix  |  5 ++
 lib/tests/modules/disable-define-enable.nix   |  5 ++
 lib/tests/modules/disable-enable-modules.nix  |  5 ++
 .../manual/development/replace-modules.xml    | 75 +++++++++++++++++++
 .../manual/development/writing-modules.xml    |  1 +
 nixos/doc/manual/release-notes/rl-1703.xml    | 10 +++
 9 files changed, 127 insertions(+), 7 deletions(-)
 create mode 100644 lib/tests/modules/disable-declare-enable.nix
 create mode 100644 lib/tests/modules/disable-define-enable.nix
 create mode 100644 lib/tests/modules/disable-enable-modules.nix
 create mode 100644 nixos/doc/manual/development/replace-modules.xml

diff --git a/lib/modules.nix b/lib/modules.nix
index 4eee41306cd7..a7c397d2cf43 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -20,7 +20,8 @@ rec {
                 , prefix ? []
                 , # This should only be used for special arguments that need to be evaluated
                   # when resolving module structure (like in imports). For everything else,
-                  # there's _module.args.
+                  # there's _module.args. If specialArgs.modulesPath is defined it will be
+                  # used as the base path for disabledModules.
                   specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
@@ -58,10 +59,7 @@ rec {
 
       closed = closeModules (modules ++ [ internalModule ]) ({ inherit config options; lib = import ./.; } // specialArgs);
 
-      # Note: the list of modules is reversed to maintain backward
-      # compatibility with the old module system.  Not sure if this is
-      # the most sensible policy.
-      options = mergeModules prefix (reverseList closed);
+      options = mergeModules prefix (reverseList (filterModules (specialArgs.modulesPath or "") closed));
 
       # Traverse options and extract the option values into the final
       # config set.  At the same time, check whether all option
@@ -87,6 +85,16 @@ rec {
       result = { inherit options config; };
     in result;
 
+
+ # Filter disabled modules. Modules can be disabled allowing
+ # their implementation to be replaced.
+ filterModules = modulesPath: modules:
+   let
+     moduleKey = m: if isString m then toString modulesPath + "/" + m else toString m;
+     disabledKeys = map moduleKey (concatMap (m: m.disabledModules) modules);
+   in
+     filter (m: !(elem m.key disabledKeys)) modules;
+
   /* Close a set of modules under the ‘imports’ relation. */
   closeModules = modules: args:
     let
@@ -111,12 +119,13 @@ rec {
       else {};
     in
     if m ? config || m ? options then
-      let badAttrs = removeAttrs m ["imports" "options" "config" "key" "_file" "meta"]; in
+      let badAttrs = removeAttrs m ["_file" "key" "disabledModules" "imports" "options" "config" "meta"]; in
       if badAttrs != {} then
         throw "Module `${key}' has an unsupported attribute `${head (attrNames badAttrs)}'. This is caused by assignments to the top-level attributes `config' or `options'."
       else
         { file = m._file or file;
           key = toString m.key or key;
+          disabledModules = m.disabledModules or [];
           imports = m.imports or [];
           options = m.options or {};
           config = mkMerge [ (m.config or {}) metaSet ];
@@ -124,9 +133,10 @@ rec {
     else
       { file = m._file or file;
         key = toString m.key or key;
+        disabledModules = m.disabledModules or [];
         imports = m.require or [] ++ m.imports or [];
         options = {};
-        config = mkMerge [ (removeAttrs m ["key" "_file" "require" "imports"]) metaSet ];
+        config = mkMerge [ (removeAttrs m ["_file" "key" "disabledModules" "require" "imports"]) metaSet ];
       };
 
   applyIfFunction = key: f: args@{ config, options, lib, ... }: if isFunction f then
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 8b476a5d3dcc..ba0c67fb7d42 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -99,6 +99,14 @@ checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-if-foo-enabl
 checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-if-enable.nix
 checkConfigOutput 'true' "$@" ./define-enable.nix ./define-loaOfSub-foo-enable-if.nix
 
+# Check disabledModules with config definitions and option declarations.
+set -- config.enable ./define-enable.nix ./declare-enable.nix
+checkConfigOutput "true" "$@"
+checkConfigOutput "false" "$@" ./disable-define-enable.nix
+checkConfigError "The option .*enable.* defined in .* does not exist" "$@" ./disable-declare-enable.nix
+checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix
+checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix
+
 # Check _module.args.
 set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix
 checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@"
diff --git a/lib/tests/modules/default.nix b/lib/tests/modules/default.nix
index c5ce9cb3e3b8..5b0947104198 100644
--- a/lib/tests/modules/default.nix
+++ b/lib/tests/modules/default.nix
@@ -3,5 +3,6 @@
 {
   inherit (lib.evalModules {
     inherit modules;
+    specialArgs.modulesPath = ./.;
   }) config options;
 }
diff --git a/lib/tests/modules/disable-declare-enable.nix b/lib/tests/modules/disable-declare-enable.nix
new file mode 100644
index 000000000000..a373ee7e550e
--- /dev/null
+++ b/lib/tests/modules/disable-declare-enable.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  disabledModules = [ ./declare-enable.nix ];
+}
diff --git a/lib/tests/modules/disable-define-enable.nix b/lib/tests/modules/disable-define-enable.nix
new file mode 100644
index 000000000000..0d84a7c3cb6c
--- /dev/null
+++ b/lib/tests/modules/disable-define-enable.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  disabledModules = [ ./define-enable.nix ];
+}
diff --git a/lib/tests/modules/disable-enable-modules.nix b/lib/tests/modules/disable-enable-modules.nix
new file mode 100644
index 000000000000..c325f4e07431
--- /dev/null
+++ b/lib/tests/modules/disable-enable-modules.nix
@@ -0,0 +1,5 @@
+{ lib, ... }:
+
+{
+  disabledModules = [ "define-enable.nix" "declare-enable.nix" ];
+}
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml
new file mode 100644
index 000000000000..cc0539ec5109
--- /dev/null
+++ b/nixos/doc/manual/development/replace-modules.xml
@@ -0,0 +1,75 @@
+<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-replace-modules">
+
+<title>Replace Modules</title>
+
+<para>Modules that are imported can also be disabled.  The option
+  declarations and config implementation of a disabled module will be
+  ignored, allowing another to take it's place.  This can be used to
+  import a set of modules from another channel while keeping the rest
+  of the system on a stable release.</para>
+<para><literal>disabledModules</literal> is a top level attribute like
+  <literal>imports</literal>, <literal>options</literal> and
+  <literal>config</literal>.  It contains a list of modules that will
+  be disabled. This can either be the full path to the module or a
+  string with the filename relative to the modules path
+  (eg. &lt;nixpkgs/nixos/modules&gt; for nixos).
+  </para>
+
+<para>This example will replace the existing postgresql module with
+  the version defined in the nixos-unstable channel while keeping the
+  rest of the modules and packages from the original nixos channel.
+  This only overrides the module definition, this won't use postgresql
+  from nixos-unstable unless explicitly configured to do so.</para>
+
+<programlisting>
+{ config, lib, pkgs, ... }:
+
+{
+  disabledModules = [ "services/databases/postgresql.nix" ];
+
+  imports =
+    [ # Use postgresql service from nixos-unstable channel.
+      # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable
+      &lt;nixos-unstable/nixos/modules/services/databases/postgresql.nix&gt;
+    ];
+
+  services.postgresql.enable = true;
+}
+</programlisting>
+
+<para>This example shows how to define a custom module as a
+  replacement for an existing module. Importing this module will
+  disable the original module without having to know it's
+  implementation details.</para>
+
+<programlisting>
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.man;
+in
+
+{
+  disabledModules = [ "services/programs/man.nix" ];
+
+  options = {
+    programs.man.enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "Whether to enable manual pages.";
+    };
+  };
+
+  config = mkIf cfg.enabled {
+    warnings = [ "disabled manpages for production deployments." ];
+  };
+}
+</programlisting>
+
+</section>
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index ef6920160e6d..5bdcad5ceb57 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -179,5 +179,6 @@ in {
 <xi:include href="option-types.xml" />
 <xi:include href="option-def.xml" />
 <xi:include href="meta-attributes.xml" />
+<xi:include href="replace-modules.xml" />
 
 </chapter>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index fda46217144c..f40b03ec9b99 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -271,6 +271,16 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      Modules can now be disabled by using <link
+      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
+      disabledModules</link>, allowing another to take it's place.  This can be
+      used to import a set of modules from another channel while keeping the
+      rest of the system on a stable release.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From 913aae40baea860244bac1dbecd7ea564316a40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 3 Mar 2017 14:10:18 +0100
Subject: [PATCH 1591/3449] luajitPackages.mpack.meta.broken = true

It seems only to link succesfully to vanilla lua.
http://hydra.nixos.org/build/49554613
---
 pkgs/top-level/lua-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 3b6603996fcc..d2aaa63c667f 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -461,6 +461,8 @@ let
       homepage = "https://github.com/tarruda/libmpack";
       platforms = stdenv.lib.platforms.linux;
       license = stdenv.lib.licenses.mit;
+      # gcc -llua fails with luajit
+      broken = (builtins.parseDrvName lua.name).name != "lua";
     };
   };
 

From 7755fcd5439093e37d028a44ef809fb0421dc3c5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 07:24:58 -0600
Subject: [PATCH 1592/3449] nixos: fix renaming warning in KDE closure

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

diff --git a/nixos/release.nix b/nixos/release.nix
index face44b94e2a..8a5b41ca3bb3 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -327,7 +327,7 @@ in rec {
     kde = makeClosure ({ pkgs, ... }:
       { services.xserver.enable = true;
         services.xserver.displayManager.sddm.enable = true;
-        services.xserver.desktopManager.kde5.enable = true;
+        services.xserver.desktopManager.plasma5.enable = true;
       });
 
     xfce = makeClosure ({ pkgs, ... }:

From dcee54c935f893566085471e786aaeecbde75d11 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 07:25:45 -0600
Subject: [PATCH 1593/3449] nixos/tests/plasma5: fix test name

---
 nixos/tests/plasma5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix
index 3dd5121607a0..ca787e9c7b9b 100644
--- a/nixos/tests/plasma5.nix
+++ b/nixos/tests/plasma5.nix
@@ -1,7 +1,7 @@
 import ./make-test.nix ({ pkgs, ...} :
 
 {
-  name = "kde5";
+  name = "plasma5";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ ttuegel ];
   };

From e7b0b2bb66fb0047ccd6288bd4faaf91ebad00a0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 07:26:17 -0600
Subject: [PATCH 1594/3449] nixos/tests/phabricator: fix renaming warning

---
 nixos/tests/phabricator.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
index 85faafd56899..fdc39393faea 100644
--- a/nixos/tests/phabricator.nix
+++ b/nixos/tests/phabricator.nix
@@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     client =
       { config, pkgs, ... }:
       { imports = [ ./common/x11.nix ];
-        services.xserver.desktopManager.kde5.enable = true;
+        services.xserver.desktopManager.plasma5.enable = true;
       };
   };
 

From 60817e4715a2fd42390a44b189b1c1cd1b888529 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 07:26:51 -0600
Subject: [PATCH 1595/3449] nixos/tests/trac: fix renaming warning

---
 nixos/tests/trac.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix
index 0d56c564e182..d426bbde68d2 100644
--- a/nixos/tests/trac.nix
+++ b/nixos/tests/trac.nix
@@ -45,7 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: {
     client =
       { config, pkgs, ... }:
       { imports = [ ./common/x11.nix ];
-        services.xserver.desktopManager.kde5.enable = true;
+        services.xserver.desktopManager.plasma5.enable = true;
       };
   };
 

From 8e6bdcc7317179fbc906d725e2b1c0f6b1c72199 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 07:27:41 -0600
Subject: [PATCH 1596/3449] nixos: fix renaming warning in graphical profile

---
 nixos/modules/profiles/graphical.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix
index 73dd2d4bc9f7..e23375375188 100644
--- a/nixos/modules/profiles/graphical.nix
+++ b/nixos/modules/profiles/graphical.nix
@@ -1,5 +1,5 @@
-# This module defines a NixOS configuration that contains X11 and
-# KDE 4.  It's used by the graphical installation CD.
+# This module defines a NixOS configuration with the Plasma 5 desktop.
+# It's used by the graphical installation CD.
 
 { config, pkgs, ... }:
 
@@ -7,7 +7,7 @@
   services.xserver = {
     enable = true;
     displayManager.sddm.enable = true;
-    desktopManager.kde5.enable = true;
+    desktopManager.plasma5.enable = true;
     synaptics.enable = true; # for touchpad support on many laptops
   };
 

From d5d7fcb95ff76e291bc00ae218f8a2873835909c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 3 Mar 2017 14:20:43 +0100
Subject: [PATCH 1597/3449] snappy: performance update 1.1.3 -> 1.1.4

... and use release tarball instead of snapshot.
---
 pkgs/development/libraries/snappy/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 50e4534f162c..5692e6ebfefb 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook }:
+{ stdenv, fetchurl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "snappy-${version}";
-  version = "1.1.3";
+  version = "1.1.4";
   
-  src = fetchFromGitHub {
-    owner = "google";
-    repo = "snappy";
-    rev = version;
-    sha256 = "1w9pq8vag8c6m4ib0qbdbqzsnpwjvw01jbp15lgwg1rzwhvflm10";
+  src = fetchurl {
+    url = "http://github.com/google/snappy/releases/download/${version}/"
+        + "snappy-${version}.tar.gz";
+    sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  nativeBuildInputs = [ pkgconfig ];
 
   # -DNDEBUG for speed
   configureFlags = [ "CXXFLAGS=-DNDEBUG" ];

From d91637c54632761b8a918da28d047d96c4cdfd68 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 07:28:29 -0600
Subject: [PATCH 1598/3449] nixos-generate-config: rename plasma5 desktop

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index b72db1f6f503..29b447912e70 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -607,7 +607,7 @@ $bootLoaderConfig
 
   # Enable the KDE Desktop Environment.
   # services.xserver.displayManager.sddm.enable = true;
-  # services.xserver.desktopManager.kde5.enable = true;
+  # services.xserver.desktopManager.plasma5.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   # users.extraUsers.guest = {

From ecb65eceaa746c7d9bc6b5c1330268e959912d4e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 07:29:16 -0600
Subject: [PATCH 1599/3449] nixos/doc/manual: rename plasma5 desktop

---
 nixos/doc/manual/configuration/modularity.xml | 2 +-
 nixos/doc/manual/configuration/x-windows.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index 30da064ac579..5420c7f88385 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -37,7 +37,7 @@ latter might look like this:
 
 { services.xserver.enable = true;
   services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.kde5.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
 }
 </programlisting>
 
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 214eec9e1fc4..4a73695e0942 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated
 <command>xterm</command> window.  Thus you should pick one or more of
 the following lines:
 <programlisting>
-services.xserver.desktopManager.kde5.enable = true;
+services.xserver.desktopManager.plasma5.enable = true;
 services.xserver.desktopManager.xfce.enable = true;
 services.xserver.desktopManager.gnome3.enable = true;
 services.xserver.windowManager.xmonad.enable = true;

From da3467003341d400985ba0a7f809c866dbffbb11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 3 Mar 2017 14:29:39 +0100
Subject: [PATCH 1600/3449] snappy: split into multiple outputs

Most of the size was documentation;
it got into many closures via mysql attribute.
---
 pkgs/development/libraries/snappy/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix
index 5692e6ebfefb..a31fa1f0516d 100644
--- a/pkgs/development/libraries/snappy/default.nix
+++ b/pkgs/development/libraries/snappy/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk";
   };
 
+  outputs = [ "out" "dev" "doc" ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   # -DNDEBUG for speed

From fb40889ddb62a9d138610e246d8d693122d5ac2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 3 Mar 2017 14:37:06 +0100
Subject: [PATCH 1601/3449] mk-python-derivation: remove me as maintainer

The time has come ...
---
 pkgs/development/interpreters/python/mk-python-derivation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 69eea056c763..f30bd175daac 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -93,7 +93,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // {
     platforms = python.meta.platforms;
   } // meta // {
     # add extra maintainer(s) to every package
-    maintainers = (meta.maintainers or []) ++ [ chaoflow domenkozar ];
+    maintainers = (meta.maintainers or []) ++ [ chaoflow ];
     # a marker for release utilities to discover python packages
     isBuildPythonPackage = python.meta.platforms;
   };

From 6be140d621c89e37bb5eeea5338d50f4eb3ef20e Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Thu, 2 Mar 2017 20:51:55 -0500
Subject: [PATCH 1602/3449] pylint: 1.5.4 -> 1.6.5

- tested on nixos
- tested on darwin
---
 .../python-modules/pylint/default.nix         | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +-----------
 2 files changed, 43 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylint/default.nix

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
new file mode 100644
index 000000000000..844d2e229547
--- /dev/null
+++ b/pkgs/development/python-modules/pylint/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, buildPythonPackage, python, astroid, isort,
+  pytest,  mccabe, configparser, backports_functools_lru_cache }:
+
+  buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "pylint";
+    version = "1.6.5";
+
+    src = fetchurl {
+      url = "mirror://pypi/p/${pname}/${name}.tar.gz";
+      sha256 = "06b78nl996949a7h01c4ycy8779hl5cm7vpxij5lm3npim59hwx6";
+    };
+
+    buildInputs = [ pytest mccabe configparser backports_functools_lru_cache ];
+
+    propagatedBuildInputs = [ astroid isort ];
+
+    postPatch = ''
+      # Remove broken darwin tests
+      sed -i -e '/test_parallel_execution/,+2d' pylint/test/test_self.py
+      sed -i -e '/test_py3k_jobs_option/,+4d' pylint/test/test_self.py
+      rm -vf pylint/test/test_functional.py
+    '';
+
+    checkPhase = ''
+      cd pylint/test
+      ${python.interpreter} -m unittest discover -p "*test*"
+    '';
+
+    postInstall = ''
+      mkdir -p $out/share/emacs/site-lisp
+      cp "elisp/"*.el $out/share/emacs/site-lisp/
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://www.logilab.org/project/pylint;
+      description = "A bug and style checker for Python";
+      platform = platforms.all;
+      license = licenses.gpl1Plus;
+      maintainers = with maintainers; [ nand0p ];
+    };
+  }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a92359cb9ab..7ef9cfdb102e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20380,31 +20380,7 @@ in {
     };
   };
 
-  pylint = buildPythonPackage rec {
-    name = "pylint-${version}";
-    version = "1.5.4";
-
-    src = pkgs.fetchurl {
-        url = "mirror://pypi/p/pylint/${name}.tar.gz";
-        sha256 = "2fe3cc2fc66a56fdc35dbbc2bf1dd96a534abfc79ee6b2ad9ae4fe166e570c4b";
-    };
-
-    propagatedBuildInputs = with self; [ astroid ];
-
-    checkPhase = ''
-        cd pylint/test; ${python.interpreter} -m unittest discover -p "*test*"
-    '';
-
-    postInstall = ''
-        mkdir -p $out/share/emacs/site-lisp
-        cp "elisp/"*.el $out/share/emacs/site-lisp/
-    '';
-
-    meta = {
-        homepage = http://www.logilab.org/project/pylint;
-        description = "A bug and style checker for Python";
-    };
-  };
+  pylint = callPackage ../development/python-modules/pylint { };
 
   pyopencl = callPackage ../development/python-modules/pyopencl { };
 

From f40b0f5e3741bd01142574db6eb54a748e19149b Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Thu, 2 Mar 2017 21:05:54 -0500
Subject: [PATCH 1603/3449] astroid: 1.4.4 -> 1.4.9

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

diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix
new file mode 100644
index 000000000000..76f58e695f28
--- /dev/null
+++ b/pkgs/development/python-modules/astroid/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, buildPythonPackage, python, logilab_common, six,
+  lazy-object-proxy, wrapt }:
+
+  buildPythonPackage rec {
+    name = "${pname}-${version}";
+    pname = "astroid";
+    version = "1.4.9";
+
+    src = fetchurl {
+      url = "mirror://pypi/a/${pname}/${name}.tar.gz";
+      sha256 = "1mw5q20b80j55vbpcdfl824sbb1q15dhkfbczjnnv8733j4yg0x4";
+    };
+
+    propagatedBuildInputs = [ logilab_common six lazy-object-proxy wrapt ];
+
+    postPatch = ''
+      cd astroid/tests
+      for i in $(ls unittest*); do mv -v $i test_$i; done 
+      cd ../..
+      rm -vf astroid/tests/test_unittest_inference.py
+    '';
+
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A abstract syntax tree for Python with inference support";
+      homepage = http://bitbucket.org/logilab/astroid;
+      license = licenses.lgpl2;
+      platform = platforms.all;
+      maintainers = with maintainers; [ nand0p ]; 
+    };
+  }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ef9cfdb102e..d17233eb6567 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1369,29 +1369,7 @@ in {
     };
   });
 
-  astroid = buildPythonPackage rec {
-    name = "astroid-1.4.4";
-
-    propagatedBuildInputs = with self; [ logilab_common six lazy-object-proxy wrapt ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/a/astroid/${name}.tar.gz";
-      sha256 = "7f7e5512efe515098e77cbd3a60e87c8db8954097b0e025d8d6f72f2e8ddc298";
-    };
-
-    checkPhase = ''
-        ${python.interpreter} -m unittest discover
-    '';
-
-    # Tests cannot be found because they're named unittest_...
-    # instead of test_...
-
-    meta = {
-      description = "A abstract syntax tree for Python with inference support";
-      homepage = http://bitbucket.org/logilab/astroid;
-      license = with licenses; [ lgpl2 ];
-    };
-  };
+  astroid = callPackage ../development/python-modules/astroid { };
 
   attrdict = buildPythonPackage (rec {
     name = "attrdict-2.0.0";

From fc57e634f31db84d26438865f1dc4b737abf6e76 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 3 Mar 2017 15:16:57 +0100
Subject: [PATCH 1604/3449] scid: fix build

---
 pkgs/games/scid/default.nix     | 2 ++
 pkgs/top-level/all-packages.nix | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix
index 91ceb74b0c56..0df7fae13c65 100644
--- a/pkgs/games/scid/default.nix
+++ b/pkgs/games/scid/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     "SHAREDIR=$(out)/share"
   ];
 
+  hardeningDisable = [ "format" ];
+
   dontPatchShebangs = true;
 
   postFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5adbe3eb8061..c32a12d76355 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16568,7 +16568,10 @@ with pkgs;
 
   sauerbraten = callPackage ../games/sauerbraten {};
 
-  scid = callPackage ../games/scid { };
+  scid = callPackage ../games/scid {
+    tcl = tcl-8_5;
+    tk = tk-8_5;
+  };
 
   scummvm = callPackage ../games/scummvm { };
 

From 85d0348e2aea1b68c9ea83daf56c6f59eb0d4a16 Mon Sep 17 00:00:00 2001
From: Ji-Haeng Huh <jhhuh.note@gmail.com>
Date: Wed, 1 Mar 2017 16:22:25 +0100
Subject: [PATCH 1605/3449] eflite: init at 0.4.1

fixes #23336
---
 lib/maintainers.nix                           |  1 +
 .../audio/eflite/buf-overflow.patch           | 22 +++++
 .../audio/eflite/cvs-update.patch             | 98 +++++++++++++++++++
 pkgs/applications/audio/eflite/default.nix    | 32 ++++++
 pkgs/applications/audio/eflite/format.patch   | 11 +++
 pkgs/applications/audio/eflite/link.patch     | 11 +++
 pkgs/top-level/all-packages.nix               |  2 +
 7 files changed, 177 insertions(+)
 create mode 100644 pkgs/applications/audio/eflite/buf-overflow.patch
 create mode 100644 pkgs/applications/audio/eflite/cvs-update.patch
 create mode 100644 pkgs/applications/audio/eflite/default.nix
 create mode 100644 pkgs/applications/audio/eflite/format.patch
 create mode 100644 pkgs/applications/audio/eflite/link.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 07fa9e632eb3..552f273a2cad 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -223,6 +223,7 @@
   jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
   jgertm = "Tim Jaeger <jger.tm@gmail.com>";
   jgillich = "Jakob Gillich <jakob@gillich.me>";
+  jhhuh = "Ji-Haeng Huh <jhhuh.note@gmail.com>";
   jirkamarsik = "Jirka Marsik <jiri.marsik89@gmail.com>";
   joachifm = "Joachim Fasting <joachifm@fastmail.fm>";
   joamaki = "Jussi Maki <joamaki@gmail.com>";
diff --git a/pkgs/applications/audio/eflite/buf-overflow.patch b/pkgs/applications/audio/eflite/buf-overflow.patch
new file mode 100644
index 000000000000..8873aa77b0e6
--- /dev/null
+++ b/pkgs/applications/audio/eflite/buf-overflow.patch
@@ -0,0 +1,22 @@
+Fix buffer overflow
+
+--- eflite-0.4.1.orig/es.c
++++ eflite-0.4.1/es.c
+@@ -329,7 +329,7 @@
+   char *p;
+ 
+   p = getenv("HOME");
+-  sprintf(buf, "%s/.es.conf", p);
++  snprintf(buf, sizeof(buf), "%s/.es.conf", p);
+   fp = fopen(buf, "r");
+   if (!fp) fp = fopen("/etc/es.conf", "r");
+   if (!fp) return 1;
+@@ -438,7 +438,7 @@
+   char logname[200];
+ 
+   if ((flags & 0xffff) > DEBUG) return;
+-  sprintf(logname, "%s/es.log", getenv("HOME"));
++  snprintf(logname, sizeof(logname), "%s/es.log", getenv("HOME"));
+   va_start(arg, text);
+   vsnprintf(buf, 200, text, arg);
+   va_end(arg);
diff --git a/pkgs/applications/audio/eflite/cvs-update.patch b/pkgs/applications/audio/eflite/cvs-update.patch
new file mode 100644
index 000000000000..1ceace83aa5d
--- /dev/null
+++ b/pkgs/applications/audio/eflite/cvs-update.patch
@@ -0,0 +1,98 @@
+--- eflite-0.4.1.orig/fs.c
++++ eflite-0.4.1/fs.c
+@@ -9,7 +9,7 @@
+  * GNU General Public License, as published by the Free Software
+  * Foundation.  Please see the file COPYING for details.
+  *
+- * $Id: fs.c,v 1.19 2007/01/18 23:58:42 mgorse Exp $
++ * $Id: fs.c,v 1.22 2008/03/05 15:21:43 mgorse Exp $
+  *
+  * Notes:
+  *
+@@ -505,19 +505,6 @@
+   }
+ }
+ 
+-
+-
+-static void play_audio_close(void *cancel)
+-{
+-  if (audiodev)
+-  {
+-	audio_drain(audiodev);
+-	close_audiodev();
+-	//	usleep(5000);
+-  }
+-}
+-
+-
+ static inline void determine_playlen(int speed, cst_wave *wptr, int type, int *pl, int *s)
+ {
+   int playlen, skip;
+@@ -573,12 +560,12 @@
+ 	type = ac[ac_head].type;
+ 	WAVE_UNLOCK;
+ 	pthread_testcancel();
+-	pthread_cleanup_push(play_audio_close, NULL);
+-
++	
+ 	es_log(2, "Opening audio device.");
+ 	/* We abuse the wave mutex here to avoid being canceled
+ 	 * while the audio device is being openned */
+ 	WAVE_LOCK;
++	assert(audiodev == NULL);
+ 	audiodev = audio_open(wptr->sample_rate, wptr->num_channels, CST_AUDIO_LINEAR16);
+ 	WAVE_UNLOCK;
+ 	if (audiodev == NULL)
+@@ -606,8 +593,8 @@
+ #ifdef DEBUG
+ 	  start_time = get_ticks_count();
+ #endif
+-	  pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+       audio_write(audiodev, wptr->samples + skip, playlen * 2);
++      pthread_testcancel();
+ 	  es_log(2, "Write took %.2f seconds.", get_ticks_count() - start_time);
+ 	}
+     es_log(2, "play: syncing.");
+@@ -617,16 +604,16 @@
+     audio_flush(audiodev);
+ 	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+ 	es_log(2, "Flush took %.2f seconds.", get_ticks_count() - start_time);
+-    es_log(2, "play: Closing audio device");
+-	close_audiodev();
+-	pthread_cleanup_pop(0);
+-	  pthread_testcancel();
+-	  TEXT_LOCK;
++    	pthread_testcancel();
++
++	TEXT_LOCK;
+     time_left -= ((float)playlen) / wptr->sample_rate;
+ 	pthread_cond_signal(&text_condition);
+ 	TEXT_UNLOCK;
+ 
+ 	WAVE_LOCK;
++	es_log(2, "play: Closing audio device");
++	close_audiodev();
+     ac_destroy(&ac[ac_head]);
+ 	ac_head++;
+ 	if (ac_head == ac_tail)
+@@ -894,6 +881,7 @@
+ 	WAVE_LOCK_NI;
+ 	pthread_cond_signal(&wave_condition); // necessary because we inhibit cancellation while waiting
+ 	pthread_cancel(wave_thread);
++	if (audiodev != NULL) audio_drain(audiodev);
+ 	WAVE_UNLOCK_NI;
+   }
+ 
+@@ -917,7 +905,10 @@
+   }
+ 	
+   /* At this point, no thread is running */
+-  
++
++  // Make sure audio device is closed
++  close_audiodev();
++
+   /* Free any wave data */
+   es_log(2, "s_clear: freeing wave data: %d", ac_tail);
+   for (i = 0; i < ac_tail; i++)
diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix
new file mode 100644
index 000000000000..36fbdbc2cc9e
--- /dev/null
+++ b/pkgs/applications/audio/eflite/default.nix
@@ -0,0 +1,32 @@
+{stdenv,fetchurl,flite,alsaLib,debug ? false}:
+
+stdenv.mkDerivation rec {
+  name = "eflite-${version}";
+  version = "0.4.1";
+  src = fetchurl {
+    url = "https://sourceforge.net/projects/eflite/files/eflite/${version}/${name}.tar.gz";
+    sha256 = "088p9w816s02s64grfs28gai3lnibzdjb9d1jwxzr8smbs2qbbci";
+  };
+  buildInputs = [ flite alsaLib ];
+  configureFlags = "flite_dir=${flite} --with-audio=alsa --with-vox=cmu_us_kal16";
+  patches = [
+    ./buf-overflow.patch
+    ./cvs-update.patch
+    ./link.patch
+    ./format.patch
+  ]; # Patches are taken from debian.
+  CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2";
+  meta = {
+    homepage = http://eflite.sourceforge.net;
+    description = "EFlite is a speech server for screen readers";
+    longDescription = ''
+      EFlite is a speech server for Emacspeak and other screen
+      readers that allows them to interface with Festival Lite,
+      a free text-to-speech engine developed at the CMU Speech
+      Center as an off-shoot of Festival.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ jhhuh ];
+  };
+}
diff --git a/pkgs/applications/audio/eflite/format.patch b/pkgs/applications/audio/eflite/format.patch
new file mode 100644
index 000000000000..d1a81aac4801
--- /dev/null
+++ b/pkgs/applications/audio/eflite/format.patch
@@ -0,0 +1,11 @@
+--- eflite-0.4.1.orig/es.c	2017-03-02 14:38:36.009731423 +0100
++++ eflite-0.4.1/es.c	2017-03-02 14:39:06.285894934 +0100
+@@ -449,7 +449,7 @@
+   fclose(fp);
+   if (flags & LOG_STDERR)
+   {
+-    fprintf(stderr, buf);
++    fprintf(stderr, "%s", buf);
+     fprintf(stderr, "\n");
+   }
+ #endif
diff --git a/pkgs/applications/audio/eflite/link.patch b/pkgs/applications/audio/eflite/link.patch
new file mode 100644
index 000000000000..73c69da965c3
--- /dev/null
+++ b/pkgs/applications/audio/eflite/link.patch
@@ -0,0 +1,11 @@
+--- eflite-0.4.1/Makefile.in	2007-01-19 01:01:09.000000000 +0100
++++ eflite-0.4.1-new/Makefile.in	2017-03-01 23:25:34.223615492 +0100
+@@ -34,7 +34,7 @@
+ 	$(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
+ 
+ fs.o: fs.c
+-	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
++	$(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
+ 
+ tone.o: tone.c
+ 	$(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c32a12d76355..191bca195513 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1573,6 +1573,8 @@ with pkgs;
 
   edk2 = callPackage ../development/compilers/edk2 { };
 
+  eflite = callPackage ../applications/audio/eflite {};
+
   eid-mw = callPackage ../tools/security/eid-mw { };
 
   eid-viewer = callPackage ../tools/security/eid-viewer { };

From 136f77b7b974f41362eddb750aae7ec9cb4c0a86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 3 Mar 2017 15:21:42 +0100
Subject: [PATCH 1606/3449] nixos-rebuild: Sync /nix/store only

We only care about /nix/store because its contents might be out of
sync with /nix/var/nix/db. Syncing other filesystems might cause
unnecessary delays or hangs (e.g. I encountered a case where an NFS
mount was taking a very long time to sync).
---
 nixos/modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index ca7932a3c5cd..88e7847cf8c8 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -41,7 +41,7 @@ if ($action eq "switch" || $action eq "boot") {
 }
 
 # Just in case the new configuration hangs the system, do a sync now.
-system("@coreutils@/bin/sync") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1";
+system("@coreutils@/bin/sync", "-f", "/nix/store") unless ($ENV{"NIXOS_NO_SYNC"} // "") eq "1";
 
 exit 0 if $action eq "boot";
 

From 3070c887987e9c24a72a5b7b18db29ebe1ed6d4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 3 Mar 2017 15:42:53 +0100
Subject: [PATCH 1607/3449] Fix incorrect $NIX_BUILD_HOOK on Nix 1.12

---
 nixos/modules/services/misc/nix-daemon.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 7101cadfeed2..66ee20b5ac94 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -389,7 +389,11 @@ in
       }
 
       // optionalAttrs cfg.distributedBuilds {
-        NIX_BUILD_HOOK = "${nix}/libexec/nix/build-remote.pl";
+        NIX_BUILD_HOOK =
+          if versionAtLeast (getVersion nix) "1.12pre4997" then
+            "${nix}/libexec/nix/build-remote"
+          else
+            "${nix}/libexec/nix/build-remote.pl";
         NIX_REMOTE_SYSTEMS = "/etc/nix/machines";
         NIX_CURRENT_LOAD = "/run/nix/current-load";
       };

From 3971876585eb0829a8fc2732c547743544fa706f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 3 Mar 2017 15:55:27 +0100
Subject: [PATCH 1608/3449] nix-daemon: Remove a bunch of unnecessary
 environment variables

---
 nixos/modules/services/misc/nix-daemon.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 66ee20b5ac94..3027dd1c3d0e 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -8,6 +8,8 @@ let
 
   nix = cfg.package.out;
 
+  isNix112 = versionAtLeast (getVersion nix) "1.12pre4997";
+
   makeNixBuildUser = nr:
     { name = "nixbld${toString nr}";
       description = "Nix build user ${toString nr}";
@@ -380,7 +382,9 @@ in
 
     nix.envVars =
       { NIX_CONF_DIR = "/etc/nix";
+      }
 
+      // optionalAttrs (!isNix112) {
         # Enable the copy-from-other-stores substituter, which allows
         # builds to be sped up by copying build results from remote
         # Nix stores.  To do this, mount the remote file system on a
@@ -390,12 +394,10 @@ in
 
       // optionalAttrs cfg.distributedBuilds {
         NIX_BUILD_HOOK =
-          if versionAtLeast (getVersion nix) "1.12pre4997" then
+          if isNix112 then
             "${nix}/libexec/nix/build-remote"
           else
             "${nix}/libexec/nix/build-remote.pl";
-        NIX_REMOTE_SYSTEMS = "/etc/nix/machines";
-        NIX_CURRENT_LOAD = "/run/nix/current-load";
       };
 
     # Set up the environment variables for running Nix.

From 3d3096b229eb108498e15e0f27ce3edf5d74ca3a Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 3 Mar 2017 16:52:55 +0100
Subject: [PATCH 1609/3449] VoiceOfFaust: fix pitchTracker (#23394)

---
 pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 12d9679f97cd..d7cc88905c53 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper
-    sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/synthWrapper
+    sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker
   '';
 
   buildPhase = ''

From 0e2a8cd01c1d3af49b0f42569a2974173be5ff76 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 3 Mar 2017 16:58:10 +0100
Subject: [PATCH 1610/3449] guitarix: webkitgtk2 -> webkitgtk (#23390)

---
 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 a5e29a5e1747..2ed59124ee2e 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -2,7 +2,7 @@
 , avahi, bluez, boost, eigen, fftw, glib, glib_networking
 , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
-, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler
+, webkitgtk, wrapGAppsHook, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm glib_networking.out
     gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf
-    libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver
+    libsndfile lilv lv2 serd sord sratom webkitgtk zita-convolver
     zita-resampler
   ];
 

From eccc1fa9bb2fd5baea960d55f81708637cfd8ff0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 15 Feb 2017 07:25:16 -0600
Subject: [PATCH 1611/3449] mesa: allow overriding driver compilation

---
 pkgs/development/libraries/mesa/default.nix | 61 +++++++++++++++++----
 1 file changed, 50 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b36316f72f4e..f5e716d212c7 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchurl, fetchpatch, lib
 , pkgconfig, intltool, autoreconfHook, substituteAll
 , file, expat, libdrm, xorg, wayland, openssl
 , llvmPackages, libffi, libomxil-bellagio, libva
@@ -6,9 +6,11 @@
 , grsecEnabled ? false
 , enableRadv ? false
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
+, galliumDrivers ? null
+, driDrivers ? null
+, vulkanDrivers ? null
 }:
 
-
 /** Packaging design:
   - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now).
     This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers)
@@ -26,6 +28,40 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
   throw "unsupported platform for Mesa"
 else
 
+let
+  defaultGalliumDrivers =
+    if (stdenv.isArm || stdenv.isAarch64)
+    then ["nouveau" "freedreno" "vc4" "etnaviv"]
+    else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
+  defaultDriDrivers =
+    if (stdenv.isArm || stdenv.isAarch64)
+    then ["nouveau"]
+    else ["i915" "i965" "nouveau" "radeon" "r200"];
+  defaultVulkanDrivers =
+    if (stdenv.isArm || stdenv.isAarch64)
+    then []
+    else ["intel"] ++ lib.optional enableRadv "radeon";
+in
+
+let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in
+
+let
+  galliumDrivers =
+    ["svga"]
+    ++ (if gallium_ == null
+          then defaultGalliumDrivers
+          else gallium_)
+    ++ ["swrast"];
+  driDrivers =
+    (if dri_ == null
+      then defaultDriDrivers
+      else dri_) ++ ["swrast"];
+  vulkanDrivers =
+    if vulkan_ == null
+    then defaultVulkanDrivers
+    else vulkan_;
+in
+
 let
   version = "17.0.0";
   branch  = head (splitString "." version);
@@ -63,14 +99,17 @@ stdenv.mkDerivation {
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
     "--with-egl-platforms=x11,wayland,drm"
-  ] ++ (if stdenv.isArm || stdenv.isAarch64 then [
-      "--with-gallium-drivers=nouveau,freedreno,vc4,etnaviv,swrast"
-      "--with-dri-drivers=nouveau,swrast"
-  ] else [
-      "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,swrast"
-      "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
-      ("--with-vulkan-drivers=intel" + optionalString enableRadv ",radeon")
-  ]) ++ [
+  ]
+  ++ (optional (galliumDrivers != [])
+      ("--with-gallium-drivers=" +
+        builtins.concatStringsSep "," galliumDrivers))
+  ++ (optional (driDrivers != [])
+      ("--with-dri-drivers=" +
+        builtins.concatStringsSep "," driDrivers))
+  ++ (optional (vulkanDrivers != [])
+      ("--with-vulkan-drivers=" +
+        builtins.concatStringsSep "," vulkanDrivers))
+  ++ [
     (enableFeature enableTextureFloats "texture-float")
     (enableFeature grsecEnabled "glx-rts")
     (enableFeature stdenv.isLinux "dri3")
@@ -143,7 +182,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 (!(stdenv.isArm || stdenv.isAarch64)) ''
+  '' + optionalString (builtins.elem "intel" vulkanDrivers) ''
     # move share/vulkan/icd.d/
     mv $out/share/ $drivers/
     # Update search path used by Vulkan (it's pointing to $out but

From 4ffa5fa1827408cca7c4a34fbb02457b5b2516d8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 3 Mar 2017 16:40:51 +0100
Subject: [PATCH 1612/3449] urh: 1.3.3 -> 1.5.5

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

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 713a36f10296..e12b95754edf 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchFromGitHub, python3Packages, hackrf, rtl-sdr }:
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "1.3.3";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "137dsxs4i0lmxwp31g8fzwpwv1i8rsiir9gxvs5cmnwsrbcrdvxh";
+    sha256 = "1f7hz2zs2dx3v6hpdyz7wyyq1xf641jhpljyhvmjr4zg5m035isa";
   };
 
-  propagatedBuildInputs = with python3Packages; [ pyqt5 numpy psutil cython ];
+  buildInputs = [ hackrf rtl-sdr ];
+  propagatedBuildInputs = with python3Packages; [
+    pyqt5 numpy psutil cython pyzmq
+  ];
 
   doCheck = false;
 

From 0904cf034cda55a423b0dbe9865fde9a813ffe32 Mon Sep 17 00:00:00 2001
From: Alistair Bill <alistair.bill@gmail.com>
Date: Thu, 2 Mar 2017 18:53:22 +0000
Subject: [PATCH 1613/3449] proselint: init at 0.8.0

---
 pkgs/tools/text/proselint/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix    |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/text/proselint/default.nix

diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix
new file mode 100644
index 000000000000..69c0600359f8
--- /dev/null
+++ b/pkgs/tools/text/proselint/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, buildPythonApplication, click, future, six }:
+
+buildPythonApplication rec {
+  name = "proselint-${version}";
+  version = "0.8.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/proselint/${name}.tar.gz";
+    sha256 = "1g8vx04gmv0agmggz1ml5vydfppqvl8dzjvqm6vqw5rzafa89m08";
+  };
+
+  propagatedBuildInputs = [ click future six ];
+
+  meta = with stdenv.lib; {
+    description = "A linter for prose";
+    homepage = http://proselint.com;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ alibabzo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81f602772d1c..850067a04c1b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18901,6 +18901,8 @@ in {
      };
   };
 
+  proselint = callPackage ../tools/text/proselint { };
+
   pylibconfig2 = buildPythonPackage rec {
     name = "pylibconfig2-${version}";
     version = "0.2.4";

From fb3853cd71b5229925ce69f4d7e9b42f6234ff25 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 3 Mar 2017 17:20:32 +0100
Subject: [PATCH 1614/3449] Revert "guitarix: webkitgtk2 -> webkitgtk (#23390)"

This reverts commit 0e2a8cd01c1d3af49b0f42569a2974173be5ff76.

Per https://github.com/NixOS/nixpkgs/pull/23390#issuecomment-283994426
guitarix only works with webkit1; replacing it with webkit2 then
is equivalent to removing it outright.
---
 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 2ed59124ee2e..a5e29a5e1747 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -2,7 +2,7 @@
 , avahi, bluez, boost, eigen, fftw, glib, glib_networking
 , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
-, webkitgtk, wrapGAppsHook, zita-convolver, zita-resampler
+, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm glib_networking.out
     gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf
-    libsndfile lilv lv2 serd sord sratom webkitgtk zita-convolver
+    libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver
     zita-resampler
   ];
 

From 6c99a31c89caae36aca6658cf236c118d9a5de95 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri@netradyne.com>
Date: Wed, 1 Mar 2017 12:54:26 +0530
Subject: [PATCH 1615/3449] httplab: init at 0.1.0

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

diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix
new file mode 100644
index 000000000000..fb50ddc9eb4e
--- /dev/null
+++ b/pkgs/tools/networking/httplab/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "httplab-${version}";
+  version = "0.1.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/gchaincl/httplab";
+
+  src = fetchFromGitHub {
+    owner = "gchaincl";
+    repo = "httplab";
+    inherit rev;
+    sha256 = "19d0aasaxayvw25m9n2gahyq590dwym7k0fng8pqvrgc2mpl0ncw";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/gchaincl/httplab;
+    description = "Interactive WebServer";
+    license = licenses.mit;
+    maintainers = with maintainers; [ pradeepchhetri ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 191bca195513..d8e52a70de83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2148,6 +2148,8 @@ with pkgs;
 
   gzrt = callPackage ../tools/compression/gzrt { };
 
+  httplab = callPackage ../tools/networking/httplab { };
+
   partclone = callPackage ../tools/backup/partclone { };
 
   partimage = callPackage ../tools/backup/partimage { };

From d6b0c87bda75b0b8ccc6b8591767e5774847c48b Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Fri, 3 Mar 2017 17:38:33 +0100
Subject: [PATCH 1616/3449] tlspool: init at 20170123 (#23437)

---
 pkgs/development/libraries/gnutls-kdh/3.5.nix | 12 +++
 .../libraries/gnutls-kdh/generic.nix          | 92 +++++++++++++++++++
 .../networking/tlspool/configvar-fix.patch    | 36 ++++++++
 pkgs/tools/networking/tlspool/default.nix     | 60 ++++++++++++
 .../networking/tlspool/fixing-rpath.patch     | 36 ++++++++
 pkgs/top-level/all-packages.nix               |  7 ++
 6 files changed, 243 insertions(+)
 create mode 100644 pkgs/development/libraries/gnutls-kdh/3.5.nix
 create mode 100644 pkgs/development/libraries/gnutls-kdh/generic.nix
 create mode 100644 pkgs/tools/networking/tlspool/configvar-fix.patch
 create mode 100644 pkgs/tools/networking/tlspool/default.nix
 create mode 100644 pkgs/tools/networking/tlspool/fixing-rpath.patch

diff --git a/pkgs/development/libraries/gnutls-kdh/3.5.nix b/pkgs/development/libraries/gnutls-kdh/3.5.nix
new file mode 100644
index 000000000000..e245496c63ac
--- /dev/null
+++ b/pkgs/development/libraries/gnutls-kdh/3.5.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, autoreconfHook, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "arpa2";
+    repo = "gnutls-kdh";
+    rev = "ff3bb36f70a746f28554641d466e124098dfcb25";
+    sha256 = "1rr3p4r145lnprxn8hqyyzh3qkj3idsbqp08g07ndrhqnxq0k0sw";
+  };
+})
diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix
new file mode 100644
index 000000000000..0e8457a8c54b
--- /dev/null
+++ b/pkgs/development/libraries/gnutls-kdh/generic.nix
@@ -0,0 +1,92 @@
+{ lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
+, tpmSupport ? true, trousers, nettools, bash, gperftools, gperf, gettext, automake
+, yacc, texinfo
+
+# Version dependent args
+, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
+, ...}:
+
+assert guileBindings -> guile != null;
+let
+  # XXX: Gnulib's `test-select' fails on FreeBSD:
+  # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
+  doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4";
+in
+stdenv.mkDerivation {
+  name = "gnutls-kdh-${version}";
+
+  inherit src patches;
+
+  outputs = [ "bin" "dev" "out" ];
+
+  patchPhase = ''
+      # rm -fR ./po
+      # substituteInPlace configure "po/Makefile.in" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_cipher_list.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_cipher_self_test.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_digest_self_test.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_mac_self_test.3" " "
+      substituteInPlace doc/manpages/Makefile.in  --replace "gnutls_pk_self_test.3" " "
+      printf "all: ;\n\ninstall: ;" > "po/Makefile.in"
+      printf "all: ;\n\ninstall: ;" > "po/Makefile.in.in"
+      '';
+
+  postPatch = lib.optionalString (lib.versionAtLeast version "3.4") ''
+    sed '2iecho "name constraints tests skipped due to datefudge problems"\nexit 0' \
+      -i tests/cert-tests/name-constraints
+  '' + postPatch;
+
+  preConfigure = "patchShebangs .";
+  configureFlags =
+    lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
+  ++ [
+    "--disable-dependency-tracking"
+    "--enable-fast-install"
+  ] ++ lib.optional guileBindings
+    [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
+
+  # Build of the Guile bindings is not parallel-safe.  See
+  # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
+  # for the actual fix.  Also an apparent race in the generation of
+  # systemkey-args.h.
+  enableParallelBuilding = false;
+
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp
+  autogen gperftools gperf gettext automake yacc texinfo ]
+    ++ lib.optional doCheck nettools
+    ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
+    ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
+    ++ [ unbound ]
+    ++ lib.optional guileBindings guile;
+
+  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
+
+  #inherit doCheck;
+  doCheck = false;
+
+  # Fixup broken libtool and pkgconfig files
+  preFixup = lib.optionalString (!stdenv.isDarwin) ''
+    sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
+        -e 's,-lz,-L${zlib.out}/lib -lz,' \
+        -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \
+        -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \
+        -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc"
+  '';
+
+  meta = with lib; {
+    description = "GnuTLS with additional TLS-KDH ciphers: Kerberos + Diffie-Hellman";
+
+    longDescription = ''
+       The ARPA2 project aims to add security. This is an enhanced
+       version of GnuTLS,  a project that aims to develop a library which
+       provides a secure layer, over a reliable transport
+       layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman.
+    '';
+
+    homepage = http://www.gnu.org/software/gnutls://github.com/arpa2/gnutls-kdh;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/networking/tlspool/configvar-fix.patch b/pkgs/tools/networking/tlspool/configvar-fix.patch
new file mode 100644
index 000000000000..424fef20dcfd
--- /dev/null
+++ b/pkgs/tools/networking/tlspool/configvar-fix.patch
@@ -0,0 +1,36 @@
+From 8561789ba70ae5d741992b143ee288b8e11a5e2b Mon Sep 17 00:00:00 2001
+From: joachim schiele <js@lastlog.de>
+Date: Wed, 1 Mar 2017 15:15:22 +0100
+Subject: [PATCH] fix to
+ https://github.com/arpa2/tlspool/issues/58#issuecomment-283333738
+
+---
+ tool/Makefile | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/tool/Makefile b/tool/Makefile
+index 9a15012..0f655e9 100644
+--- a/tool/Makefile
++++ b/tool/Makefile
+@@ -38,7 +38,6 @@ pgp11genkey_LIBS = $(P11KIT_LIBS) -lcrypto
+ 
+ configvar_CFLAGS = $(tlspool_CFLAGS)
+ configvar_LDFLAGS = $(tlspool_LDFLAGS)
+-configvar_LIBS = $(tlspool_LIBS)
+ 
+ P11KIT_CFLAGS = $(shell pkg-config --cflags p11-kit-1)
+ P11KIT_LIBS   = $(shell pkg-config --libs   p11-kit-1)
+@@ -96,8 +95,8 @@ have_db: have_db.c
+ pgp11_genkey: pgp11_genkey.c
+ 	gcc -std=gnu11 $(CFLAGS) $(pgp11genkey_CFLAGS) -o "$@" "$<" $(pgp11genkey_LIBS)
+ 
+-configvar: configvar.c $(configvar_LIBS)
+-	gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<" $(configvar_LIBS)
++configvar: configvar.c
++	gcc -std=gnu11 $(CFLAGS) $(configvar_CFLAGS) $(configvar_LDFLAGS) $(configvar_CFLAGS) -o "$@" "$<"
+ 
+ $(tlspool_LIBS):
+ 	$(MAKE) -C ../lib `basename $(tlspool_LIBS)`
+-- 
+2.12.0
+
diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix
new file mode 100644
index 000000000000..2a43358a5e1a
--- /dev/null
+++ b/pkgs/tools/networking/tlspool/default.nix
@@ -0,0 +1,60 @@
+{ pkgs, stdenv, fetchFromGitHub, unzip, libtool, pkgconfig, git, p11_kit,
+  libtasn1, db, openldap, libmemcached, cyrus_sasl, openssl, softhsm, bash,
+  python, libkrb5, quickder, unbound, ldns, gnupg, gnutls-kdh,
+  useSystemd ? true, systemd, swig
+}:
+
+let
+  pname = "tlspool";
+  version = "20170123";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  src = fetchFromGitHub { 
+    owner = "arpa2";
+    repo = "tlspool";
+    rev = "90cfa0758b02849114ba6373f280a4f2d3e534bf";
+    sha256 = "1qyq6da5bsgb8y9f3jhfrnhbvjns4k80lpkrydkvfx83bg494370";
+  };
+
+  propagatedBuildInputs = [ python softhsm openldap p11_kit.dev p11_kit.out gnupg ];
+  buildInputs = [ unbound pkgconfig unzip git libtasn1 db libmemcached cyrus_sasl openssl bash quickder
+                  libkrb5 ldns libtool swig pkgs.pythonPackages.pip gnutls-kdh ]
+                ++ stdenv.lib.optional useSystemd systemd;
+
+  phases = [ "unpackPhase" "patchPhase" "postPatchPhase" "buildPhase" "installPhase" ]; 
+
+  patches = [ ./fixing-rpath.patch ./configvar-fix.patch ];
+
+  postPatchPhase = ''
+    substituteInPlace etc/tlspool.conf \
+      --replace "dnssec_rootkey ../etc/root.key" "dnssec_rootkey $out/etc/root.key" \
+      --replace "pkcs11_path /usr/local/lib/softhsm/libsofthsm2.so" "pkcs11_path ${softhsm}/lib/softhsm/libsofthsm2.so"
+    substituteInPlace lib/Makefile \
+      --replace "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX)" "DESTDIR=\$(DESTDIR) PREFIX=\$(PREFIX) SWIG=${swig}/bin/swig"
+  '';
+
+  buildPhase = ''
+    make clean
+    make DESTDIR=$out PREFIX=/ all
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib $out/sbin $out/man $out/etc/tlspool/ $out/include/${pname}/pulleyback
+    mkdir -p $out/${python.sitePackages}/tlspool
+    mkdir -p $out/bdb
+    make DESTDIR=$out PREFIX=/ install
+    cp -R etc/* $out/etc/tlspool/
+    cp include/tlspool/*.h $out/include/${pname}
+    cp pulleyback/*.h $out/include/${pname}/pulleyback/
+    cp src/*.h $out/include/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment";
+    license = licenses.bsd2;
+    homepage = https://www.tlspool.org;
+    maintainers = with maintainers; [ leenaars qknight ];
+  };
+}
diff --git a/pkgs/tools/networking/tlspool/fixing-rpath.patch b/pkgs/tools/networking/tlspool/fixing-rpath.patch
new file mode 100644
index 000000000000..6a434f3e4008
--- /dev/null
+++ b/pkgs/tools/networking/tlspool/fixing-rpath.patch
@@ -0,0 +1,36 @@
+From 8082f050794f771d1afb8e5c3d08862fc633922b Mon Sep 17 00:00:00 2001
+From: joachim schiele <js@lastlog.de>
+Date: Wed, 1 Mar 2017 13:12:19 +0100
+Subject: [PATCH] RPATH is back
+ https://github.com/arpa2/tlspool/issues/58#issuecomment-283318767
+
+---
+ tool/Makefile | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/tool/Makefile b/tool/Makefile
+index c1e6ce9..9a15012 100644
+--- a/tool/Makefile
++++ b/tool/Makefile
+@@ -18,9 +18,17 @@ LIBS =
+ 
+ PREFIX = /usr/local
+ 
++DIR := ${CURDIR}
++LIBDIR := ""
++ifndef DESTDIR
++       LIBDIR=$(DIR)/../lib/
++else
++       LIBDIR=$(DESTDIR)/lib
++endif
++
+ tlspool_CFLAGS =
+ tlspool_LIBS = ../lib/libtlspool.so
+-tlspool_LDFLAGS = -L ../lib -ltlspool
++tlspool_LDFLAGS = -L ../lib -ltlspool -Wl,-rpath,$(LIBDIR)
+ 
+ donai_CFLAGS = -DDONAI_ONLY_TEXTPROC
+ donai_SRC = ../src/donai.c
+-- 
+2.11.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8e52a70de83..43743b5c83bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4097,6 +4097,8 @@ with pkgs;
 
   tldr = callPackage ../tools/misc/tldr { };
 
+  tlspool = callPackage ../tools/networking/tlspool { };
+
   tmate = callPackage ../tools/misc/tmate { };
 
   tmpwatch = callPackage ../tools/misc/tmpwatch  { };
@@ -7596,6 +7598,11 @@ with pkgs;
     guileBindings = config.gnutls.guile or false;
   };
 
+  gnutls-kdh = callPackage ../development/libraries/gnutls-kdh/3.5.nix {
+    guileBindings = config.gnutls.guile or false;
+    gperf = gperf_3_0;
+  };
+
   gpac = callPackage ../applications/video/gpac { };
 
   gpgme = callPackage ../development/libraries/gpgme {

From db2f87a99869e32ad125b10f7830baea244188f1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 3 Mar 2017 16:41:48 +0100
Subject: [PATCH 1617/3449] torchat: mark as broken

Looks abandoned by upstream (last commit 2014, no response on
issue tracker).  For an application of this nature it seems
prudent to simply mark the package as broken instead of
attempting to fix the build.

Prospective users can check out richochet or tor messenger.
---
 .../networking/instant-messengers/torchat/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix
index 06bcd7a0400e..700fab061164 100644
--- a/pkgs/applications/networking/instant-messengers/torchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ maintainers.phreedom ];
     platforms = platforms.unix;
+    broken = true;
   };
 }

From 0a8d9779c5b3bce15b252bb0f31c94744107ecf6 Mon Sep 17 00:00:00 2001
From: Thomas Strobel
 <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>
Date: Fri, 3 Mar 2017 19:14:20 +0100
Subject: [PATCH 1618/3449] fix: "nixos-rebuild build-vm-with-bootloader"

---
 nixos/modules/virtualisation/qemu-vm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 56a05028b1d1..dcf14c73610f 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -138,13 +138,13 @@ let
         ''
           # Create a /boot EFI partition with 40M
           ${pkgs.gptfdisk}/bin/sgdisk -G /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:"BIOS Boot Partition" -t 1:ef02 /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:"EFI System" -t 2:ef00 /dev/vda
+          ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:BIOSBootPartition -t 1:ef02 /dev/vda
+          ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:EFISystem -t 2:ef00 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -A 1:set:1 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -h 2 /dev/vda
           ${pkgs.gptfdisk}/bin/sgdisk -C /dev/vda
-          ${pkgs.utillinux}/bin/sfdisk /dev/vda -A 2
+          ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda
           . /sys/class/block/vda2/uevent
           mknod /dev/vda2 b $MAJOR $MINOR
           . /sys/class/block/vda/uevent

From 792d8bd74bcc63d1b7f592668d0e37487439ea25 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 3 Mar 2017 20:08:38 +0100
Subject: [PATCH 1619/3449] nodejs: 7.6.0 -> 7.7.1

---
 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 53ed893794c2..b34d84ac851a 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.6.0";
+    version = "7.7.1";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "1adldbhza422951i9rk69x75apj9rdqlx1pm8ybb9w7zjqk09ybg";
+      sha256 = "04bn7c2hvhs6dqjz3khrlqyspljbxiw7y7g4fkjkn8k7lwmchpwn";
     };
 
   })

From 0297fdc76495ce1b9301ab49fe2281a20e13174c Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 3 Mar 2017 16:44:02 +0100
Subject: [PATCH 1620/3449] beast: mark as broken

---
 pkgs/applications/audio/beast/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix
index 900d6759e4a6..7f62d53af9ef 100644
--- a/pkgs/applications/audio/beast/default.nix
+++ b/pkgs/applications/audio/beast/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     description = "A music composition and modular synthesis application";
     homepage = http://beast.gtk.org;
     license = with licenses; [ gpl2 lgpl21 ];
+    broken = true;
   };
 }

From 3d2e118a5554b620bf1c2fb2befaf9fae23a3e34 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 3 Mar 2017 20:34:33 +0100
Subject: [PATCH 1621/3449] xca: fix build

cc #23253
---
 pkgs/applications/misc/xca/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 8515efc56bce..30d38183c8f2 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeQtWrapper pkgconfig which ];
 
+  configureFlags = [ "CXXFLAGS=-std=c++11" ];
+
   preBuild = ''
     substituteInPlace Local.mak \
       --replace ${qtbase}/bin/moc ${qtbase.dev}/bin/moc \

From 477014fd6a8c88efe314524d465b15c4379c7921 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 19:44:17 -0600
Subject: [PATCH 1622/3449] trash-cli: 0.12.9.14 -> 0.17.1.14

---
 pkgs/tools/misc/trash-cli/default.nix         | 24 ++++----
 ...hould_output_info_for_multiple_files.patch | 60 -------------------
 pkgs/tools/misc/trash-cli/nix-paths.patch     | 17 +-----
 3 files changed, 12 insertions(+), 89 deletions(-)
 delete mode 100644 pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 2a4dae87e185..40fc72a0d713 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,33 +1,29 @@
-{ stdenv, fetchurl, substituteAll, coreutils, python2, python2Packages }:
+{ stdenv, fetchFromGitHub, coreutils
+, python3, python3Packages, substituteAll }:
 
 assert stdenv.isLinux;
 
-python2Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
-  version = "0.12.9.14";
+  version = "0.17.1.14";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz";
-    sha256 = "10idvzrlppj632pw6mpk1zy9arn1x4lly4d8nfy9cz4zqv06lhvh";
+  src = fetchFromGitHub {
+    owner = "andreafrancia";
+    repo = "trash-cli";
+    rev = "${version}";
+    sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";
   };
 
-
   patches = [
-    # Fix paths.
     (substituteAll {
       src = ./nix-paths.patch;
       df = "${coreutils}/bin/df";
-      python = "${python2}/bin/${python2.executable}";
       libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
     })
-
-    # Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3
-    # to fix failing test case.
-    ./fix_should_output_info_for_multiple_files.patch
   ];
 
-  buildInputs = with python2Packages; [ nose mock ];
+  buildInputs = with python3Packages; [ nose mock ];
 
   checkPhase = "nosetests";
 
diff --git a/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch
deleted file mode 100644
index 17947be74824..000000000000
--- a/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4f45a37a390d7c844dd9c9b58fff7259a77ffff9 Mon Sep 17 00:00:00 2001
-From: Javi Merino <merino.jav@gmail.com>
-Date: Sun, 31 Aug 2014 05:45:17 -0700
-Subject: [PATCH] Fix should_output_info_for_multiple_files
-
-Test should_output_info_for_multiple_files fails because the output is
-not in the same order as the input.  Add assert_equal_any_order() to
-the OutputCollector, which sorts the expected and actual lines so that
-the output matches even if the order in which they are shown in
-trash-list is different.
----
- integration_tests/describe_trash_list.py | 8 +++++---
- integration_tests/output_collector.py    | 8 ++++++++
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/integration_tests/describe_trash_list.py b/integration_tests/describe_trash_list.py
-index 6dd8d30..3489a22 100644
---- a/integration_tests/describe_trash_list.py
-+++ b/integration_tests/describe_trash_list.py
-@@ -73,9 +73,9 @@ def should_output_info_for_multiple_files(self):
- 
-         self.user.run_trash_list()
- 
--        self.user.should_read_output( "2000-01-01 00:00:01 /file1\n"
--                                      "2000-01-01 00:00:02 /file2\n"
--                                      "2000-01-01 00:00:03 /file3\n")
-+        self.user.should_read_output_any_order( "2000-01-01 00:00:01 /file1\n"
-+                                                "2000-01-01 00:00:02 /file2\n"
-+                                                "2000-01-01 00:00:03 /file3\n")
- 
-     @istest
-     def should_output_unknown_dates_with_question_marks(self):
-@@ -294,6 +294,8 @@ def error(self):
-         raise ValueError()
-     def should_read_output(self, expected_value):
-         self.stdout.assert_equal_to(expected_value)
-+    def should_read_output_any_order(self, expected_value):
-+        self.stdout.assert_equal_any_order(expected_value)
-     def should_read_error(self, expected_value):
-         self.stderr.assert_equal_to(expected_value)
-     def output(self):
-diff --git a/integration_tests/output_collector.py b/integration_tests/output_collector.py
-index 06dc002..7f3704f 100644
---- a/integration_tests/output_collector.py
-+++ b/integration_tests/output_collector.py
-@@ -9,6 +9,14 @@ def write(self,data):
-         self.stream.write(data)
-     def assert_equal_to(self, expected):
-         return self.should_be(expected)
-+    def assert_equal_any_order(self, expected):
-+        actual_sorted = sorted(self.stream.getvalue().splitlines(1))
-+        actual = "".join(actual_sorted)
-+
-+        expected_sorted = sorted(expected.splitlines(1))
-+        expected = "".join(expected_sorted)
-+
-+        assert_equals_with_unidiff(expected, actual)
-     def should_be(self, expected):
-         assert_equals_with_unidiff(expected, self.stream.getvalue())
-     def should_match(self, regex):
diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch
index 29412027b7a5..d7b485eec158 100644
--- a/pkgs/tools/misc/trash-cli/nix-paths.patch
+++ b/pkgs/tools/misc/trash-cli/nix-paths.patch
@@ -1,18 +1,5 @@
-diff -Nurp trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py
---- trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py	2014-12-23 10:10:43.808470486 +0100
-+++ trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py	2014-12-23 10:11:02.688517975 +0100
-@@ -9,7 +9,7 @@ from pprint import pprint
- @istest
- class WhenNoArgs:
-     def setUp(self):
--        process = Popen(['python', 'trashcli/rm.py'],
-+        process = Popen(['@python@', 'trashcli/rm.py'],
-                     env={'PYTHONPATH':'.'},
-                     stdin=None,
-                     stdout=PIPE,
-diff -Nurp trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py trash-cli-0.12.9.14/trashcli/list_mount_points.py
---- trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py	2014-12-23 10:10:43.808470486 +0100
-+++ trash-cli-0.12.9.14/trashcli/list_mount_points.py	2014-12-23 10:19:04.954796457 +0100
+--- a/trashcli/list_mount_points.py	2014-12-23 10:10:43.808470486 +0100
++++ a/trashcli/list_mount_points.py	2014-12-23 10:19:04.954796457 +0100
 @@ -12,7 +12,7 @@ def mount_points_from_getmnt():
  
  def mount_points_from_df():

From 8eccd34f10a936e46164b30c76df4fef9340fef3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 3 Mar 2017 21:14:00 +0100
Subject: [PATCH 1623/3449] vim_configurable: enable ximSupport by default

---
 pkgs/applications/editors/vim/configurable.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 9c0becc47295..3f588fdde585 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -139,7 +139,7 @@ composableDerivation {
     multibyteSupport = config.vim.multibyte or false;
     cscopeSupport    = config.vim.cscope or true;
     netbeansSupport  = config.netbeans or true; # eg envim is using it
-    ximSupport       = config.vim.xim or false;
+    ximSupport       = config.vim.xim or true; # less than 15KB, needed for deadkeys
 
     # by default, compile with darwin support if we're compiling on darwin, but
     # allow this to be disabled by setting config.vim.darwin to false

From c2291aae442cea320aeb88f3fcd0cf36868df770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 3 Mar 2017 20:08:23 +0100
Subject: [PATCH 1624/3449] vlock: fix EINTR handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
---
 pkgs/misc/screensavers/vlock/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix
index 012fef1b5b0e..031afeeca2fc 100644
--- a/pkgs/misc/screensavers/vlock/default.nix
+++ b/pkgs/misc/screensavers/vlock/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
     sed -i -e '/INSTALL/s/-[og] [^ ]*//g' Makefile modules/Makefile
   '';
 
+  patches = [ ./eintr.patch ];
+
   configureFlags = "VLOCK_GROUP=root ROOT_GROUP=root";
 
   buildInputs = [ pam ];

From d093c111ea4bd8e3387ec217a8f23b91e952c2d3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 3 Mar 2017 21:18:52 +0100
Subject: [PATCH 1625/3449] josm: 11526 -> 11639

---
 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 fb60babebe20..6dd0f532f183 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 = "11526";
+  version = "11639";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1164vfqbbys0032amk85219y0paihvi8jkx0kwc5lramwsk57pld";
+    sha256 = "1xq074jfk58gh5xmm8s9sjbcbnl34dpx7wsgq9n60phciya90sfb";
   };
 
   phases = [ "installPhase" ];

From 4a6ba21bdd93df0d82b2f41e0dcbf8e6885ebb4e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 4 Mar 2017 01:01:17 +0300
Subject: [PATCH 1626/3449] liferea: 1.10.19 -> 1.12-rc2

It's a release candidate but it works with new WebKitGTK and we don't build old
one anymore because of vulnerabilities.
---
 .../newsreaders/liferea/default.nix           | 44 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index f3fdea59e48d..0cb554480a1f 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -1,41 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, intltool, pythonPackages
-, glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking
-, webkitgtk, json_glib, gobjectIntrospection, gst_all_1
-, libnotify
-, makeWrapper
+{ stdenv, fetchurl, pkgconfig, intltool, python3Packages, wrapGAppsHook
+, glib, libxml2, libxslt, sqlite, libsoup , webkitgtk, json_glib, gst_all_1
+, libnotify, gtk3, gsettings_desktop_schemas, libpeas, dconf, librsvg
+, gobjectIntrospection, glib_networking
 }:
 
 let
   pname = "liferea";
-  version = "1.10.19";
-  inherit (pythonPackages) python pygobject3;
+  version = "1.12-rc2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "1h6x8xd4ldrgw9mbf2gwf7wxi6z34h0d0rnwy9kyskdcgkymvi80";
+    sha256 = "1q83s900skl0w9pb0afq8z387ynhl0rqn6fmps8wmncj0z1q07wb";
   };
 
-  buildInputs = with gst_all_1; [
-    pkgconfig intltool python
-    glib gnome3.gtk pango libxml2 libxslt sqlite libsoup
-    webkitgtk json_glib gobjectIntrospection gnome3.gsettings_desktop_schemas
-    gnome3.libpeas gnome3.dconf
-    gst-plugins-base gst-plugins-good gst-plugins-bad
-    gnome3.libgnome_keyring gnome3.defaultIconTheme
-    libnotify
-    makeWrapper
-  ];
+  nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];
+
+  buildInputs = [
+    glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas
+    libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection
+    librsvg glib_networking
+  ] ++ (with gst_all_1; [
+    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
+  ]);
+
+  pythonPath = with python3Packages; [ pygobject3 pycairo ];
 
   preFixup = ''
-    for f in "$out"/bin/*; do
-      wrapProgram "$f" \
-        --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
+    buildPythonPath "$out $pythonPath"
+    gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43743b5c83bc..0fdaf8e4d108 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14263,7 +14263,7 @@ with pkgs;
 
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
-    webkitgtk = webkitgtk24x;
+    inherit (gnome3) libpeas gsettings_desktop_schemas dconf;
   };
 
   lingot = callPackage ../applications/audio/lingot {

From fe265f129ecb4e7dfa1a552b219b64f910582b26 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 4 Mar 2017 01:13:30 +0300
Subject: [PATCH 1627/3449] liferea: add libnotify

I've accidentially removed it from build inputs.

Notice that GNOME 3 icons weren't removed accidentially -- it works without
them for me on XFCE.
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 0cb554480a1f..b348010c61f1 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     glib gtk3 webkitgtk libxml2 libxslt sqlite libsoup gsettings_desktop_schemas
     libpeas gsettings_desktop_schemas json_glib dconf gobjectIntrospection
-    librsvg glib_networking
+    librsvg glib_networking libnotify
   ] ++ (with gst_all_1; [
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad
   ]);

From 59211b6ed08f2e5cb3d938c3e58074ec38d8e269 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 3 Mar 2017 16:16:45 -0600
Subject: [PATCH 1628/3449] tty-clock: 0.1 -> 2.3 (#23419)

---
 pkgs/tools/misc/tty-clock/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix
index eb1a861db928..113359a8bcea 100644
--- a/pkgs/tools/misc/tty-clock/default.nix
+++ b/pkgs/tools/misc/tty-clock/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchFromGitHub, ncurses }:
+{ stdenv, fetchFromGitHub, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "tty-clock-${version}";
-  version = "0.1";
+  version = "2.3";
 
   src = fetchFromGitHub {
     owner = "xorg62";
     repo = "tty-clock";
-    rev = "v0.1";
-    sha256 = "14h70ky5y9nb3mzhlshdgq5n47hg3g6msnwbqd7nnmjzrw1nmarl";
+    rev = "v${version}";
+    sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp";
   };
-
+  
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ];
 
-  preInstall = ''
-    sed -i 's@/usr/local/@$(out)/@' Makefile
-  '';
+  makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
     homepage = https://github.com/xorg62/tty-clock;

From b66c0e78307b5264edafdcee6d11dfef4efe0f7e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 3 Mar 2017 16:21:16 -0600
Subject: [PATCH 1629/3449] xiccd: 0.2.2 -> 0.2.4 (#23379)

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

diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix
index 03c8949bb459..e4d5bf7abdd0 100644
--- a/pkgs/tools/misc/xiccd/default.nix
+++ b/pkgs/tools/misc/xiccd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xiccd-${version}";
-  version = "0.2.2";
+  version = "0.2.4";
 
   src = fetchFromGitHub {
     owner = "agalakhov";
     repo = "xiccd";
     rev = "v${version}";
-    sha256 = "17p3vngmmjk52r5p8y41s19nwp7w25bgff68ffd50zdlicd33rsy";
+    sha256 = "0dhv913njzm80g5lwak5znmxllfa6rrkifwja8vk133lyxnarqra";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 2552b034ab29a8c9e030c23e74be2ae9fcd3b481 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 4 Mar 2017 02:14:22 +0200
Subject: [PATCH 1630/3449] unionfs-fuse: Use fetchFromGitHub

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

diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 73db9e2ca203..b7d7a07a084f 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, cmake, fuse }:
+{ stdenv, fetchFromGitHub, cmake, fuse }:
 
 stdenv.mkDerivation rec {
   name = "unionfs-fuse-${version}";
   version = "1.0";
 
-  src = fetchurl {
-    url = "https://github.com/rpodgorny/unionfs-fuse/archive/v${version}.tar.gz";
-    sha256 = "02fcrjb06lxkxpk4l8arsqmai807sray24lj2nrasqaacg80ps1f";
+  src = fetchFromGitHub {
+    owner = "rpodgorny";
+    repo = "unionfs-fuse";
+    rev = "v${version}";
+    sha256 = "0g2hd6yi6v8iqzmgncg1zi9a7ixy9hsh51rzf6jnmzi79543dihf";
   };
 
   patches =

From 6744f3a986c53483bb198542f6bda879c08d04d9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 3 Mar 2017 19:59:56 -0600
Subject: [PATCH 1631/3449] frostwire: 6.0.0 -> 6.4.5

---
 .../networking/p2p/frostwire/default.nix           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 99ba36ca7156..74f0ef392efc 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.0.0";
+  version = "6.4.5";
   name = "frostwire-${version}";
 
   src = fetchurl {
-    url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.x86_64.tar.gz";
-    sha256 = "16rpfh235jj75vm4rx6qqw25ax3rk2p21l6lippbm0pi13lp2pdh";
+    url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
+    sha256 = "01nq1vwkqdidmprlnz5d3c5412r6igv689barv64dmb9m6iqg53z";
   };
 
   inherit jre;
@@ -27,11 +27,11 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/frostwire
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.frostwire.com/;
     description = "BitTorrent Client and Cloud File Downloader";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.gavin ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ gavin ];
+    platforms = platforms.all;
   };
 }

From d3899a2495a45efc6490454f69ee0eca6a324ec8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 3 Mar 2017 22:02:12 +0000
Subject: [PATCH 1632/3449] ocamlPackages.async_kernel: init at 113.33.00

---
 .../janestreet/async_kernel-113_33_00.nix     | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
new file mode 100644
index 000000000000..2110b1d6b504
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/async_kernel-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, core_kernel, ppx_jane
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-async_kernel-113.33.00";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_kernel-113.33.00.tar.gz;
+    sha256 = "1kkkqpdd3mq9jh3b3l1yk37841973lh6g3pfv8fcjzif4n7myf15";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
+  propagatedBuildInputs = [ core_kernel ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4f5d29295620..570fc2b3a4d4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -717,7 +717,9 @@ let
       else core_extended_p4;
 
     async_kernel =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/async_kernel-113_33_00.nix {}
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {}
       else async_kernel_p4;
 

From 5a0c577d32bc5e7210033001dae5c351e2b4a0c8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Mar 2017 04:59:22 +0000
Subject: [PATCH 1633/3449] ocamlPackages.async_unix: init at 113.33.00+4.03

---
 .../janestreet/async_unix-113_33_00.nix       | 21 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix

diff --git a/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
new file mode 100644
index 000000000000..595e1198de5f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/janestreet/async_unix-113_33_00.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, async_kernel, core, ppx_jane
+}:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-async_unix-113.33.00+4.03";
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/113.33/files/async_unix-113.33.00+4.03.tar.gz;
+    sha256 = "12b0ffq9yhv3f49kk2k7z7hrn2j4xlka7knm99hczl6gmjni7nqv";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam ppx_jane ];
+  propagatedBuildInputs = [ async_kernel core ];
+
+  inherit (topkg) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 570fc2b3a4d4..1cc5de01e101 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -726,7 +726,9 @@ let
     async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {};
 
     async_unix =
-      if lib.versionOlder "4.02" ocaml.version
+      if lib.versionOlder "4.03" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/async_unix-113_33_00.nix {}
+      else if lib.versionOlder "4.02" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {}
       else async_unix_p4;
 

From 708bcdb307d57cbd1285b8c9bb1ca635f01a3951 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Mar 2017 05:33:30 +0000
Subject: [PATCH 1634/3449] 
 ocamlPackages.{angstrom,cstruct,ezjsonm,hex,io-page}: depend on ocamlbuild

---
 pkgs/development/ocaml-modules/angstrom/default.nix | 4 ++--
 pkgs/development/ocaml-modules/cstruct/default.nix  | 4 ++--
 pkgs/development/ocaml-modules/ezjsonm/default.nix  | 4 ++--
 pkgs/development/ocaml-modules/hex/default.nix      | 4 ++--
 pkgs/development/ocaml-modules/io-page/default.nix  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix
index 56509ab5786a..755724bc8b82 100644
--- a/pkgs/development/ocaml-modules/angstrom/default.nix
+++ b/pkgs/development/ocaml-modules/angstrom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, cstruct, result, findlib, ocaml_oasis }:
+{ stdenv, fetchFromGitHub, ocaml, ocamlbuild, cstruct, result, findlib, ocaml_oasis }:
 
 stdenv.mkDerivation rec {
   version = "0.3.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   createFindlibDestdir = true;
 
-  buildInputs = [ ocaml ocaml_oasis findlib ];
+  buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild ];
   propagatedBuildInputs = [ result cstruct ];
 
   meta = {
diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix
index 8c1aac4d83b2..eb148311be0b 100644
--- a/pkgs/development/ocaml-modules/cstruct/default.nix
+++ b/pkgs/development/ocaml-modules/cstruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, writeText, fetchFromGitHub, ocaml, ocplib-endian, sexplib, findlib, ppx_tools
+{ stdenv, writeText, fetchFromGitHub, ocaml, ocamlbuild, ocplib-endian, sexplib, findlib, ppx_tools
 , async ? null, lwt ? null
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   configureFlags = [ "${opt lwt}-lwt" "${opt async}-async" "${opt ppx_tools}-ppx" ];
 
-  buildInputs = [ ocaml findlib ppx_tools lwt async ];
+  buildInputs = [ ocaml findlib ocamlbuild ppx_tools lwt async ];
   propagatedBuildInputs = [ ocplib-endian sexplib ];
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix
index 44d8ce393fbd..aec6851e12bc 100644
--- a/pkgs/development/ocaml-modules/ezjsonm/default.nix
+++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, jsonm, hex, sexplib, lwt }:
 
 let version = "0.4.3"; in
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls";
   };
 
-  buildInputs = [ ocaml findlib lwt ];
+  buildInputs = [ ocaml findlib ocamlbuild lwt ];
   propagatedBuildInputs = [ jsonm hex sexplib ];
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix
index 07b7773ff2c7..56d5e07f1d19 100644
--- a/pkgs/development/ocaml-modules/hex/default.nix
+++ b/pkgs/development/ocaml-modules/hex/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }:
 
 let version = "1.0.0"; in
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0g4cq4bsksga15fa5ln083gkglawknbnhi2s4k8yk0yi5xngvwm4";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ cstruct ];
   configureFlags = "--enable-tests";
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix
index 8580bb647134..ed058d82a0ed 100644
--- a/pkgs/development/ocaml-modules/io-page/default.nix
+++ b/pkgs/development/ocaml-modules/io-page/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, ocaml, findlib, cstruct }:
+{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cstruct }:
 
 let version = "1.5.1"; in
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0y92wbvi129d0i7wr4lpk1ps9l247zaf1ibqqz0i6spgl28dyq79";
   };
 
-  buildInputs = [ ocaml findlib ];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [ cstruct ];
 
   createFindlibDestdir = true;

From ad49932f8a3a62ac6cc9420cfdd467018e4e8c06 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Mar 2017 06:51:24 +0000
Subject: [PATCH 1635/3449] camlp4: init at 4.05+1

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

diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix
index cedd35ae6ade..8babfe415dfd 100644
--- a/pkgs/development/tools/ocaml/camlp4/default.nix
+++ b/pkgs/development/tools/ocaml/camlp4/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchzip, which, ocaml, ocamlbuild }:
 
 let param = {
-  "4.02.3" = {
+  "4.02" = {
      version = "4.02+6";
      sha256 = "06yl4q0qazl7g25b0axd1gdkfd4qpqzs1gr5fkvmkrcbz113h1hj"; };
-  "4.03.0" = {
+  "4.03" = {
      version = "4.03+1";
      sha256 = "1f2ndch6f1m4fgnxsjb94qbpwjnjgdlya6pard44y6n0dqxi1wsq"; };
-  "4.04.0" = {
+  "4.04" = {
      version = "4.04+1";
      sha256 = "1ad7rygqjxrc1im95gw9lp8q83nhdaf383f2808f1p63yl42xm7k"; };
-  }."${ocaml.version}";
+  "4.05" = {
+     version = "4.05+1";
+     sha256 = "0wm795hpwvwpib9c9z6p8kw2fh7p7b2hml6g15z8zry3y7w738sv"; };
+  }."${ocaml.meta.branch}";
 in
 
 stdenv.mkDerivation rec {

From f8e5b8dbe29cd1cbbc0334c06d8663bdd42208b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 4 Mar 2017 08:19:13 +0100
Subject: [PATCH 1636/3449] pythonPackages.jupyter: set priority

in order to prevent a collision.
---
 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 81f602772d1c..75a880cb889c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8160,6 +8160,7 @@ in {
       homepage = "http://jupyter.org/";
       license = licenses.bsd3;
       platforms = platforms.all;
+      priority = 100; # This is a metapackage which is unimportant
     };
   };
 

From da3c0ac19c7b0de26a27c162f61dc2f75c115be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 4 Mar 2017 08:21:22 +0100
Subject: [PATCH 1637/3449] xorg.xorgserver: security 1.19.1 -> 1.19.2

Various bugfixes including CVE-2017-2624.
It seems to run without any problems for me.
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/overrides.nix | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index eee912d1b8c3..49e71614bf93 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.1";
+    name = "xorg-server-1.19.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2;
-      sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr";
+      url = mirror://xorg/individual/xserver/xorg-server-1.19.2.tar.bz2;
+      sha256 = "1fw4b2lf75nsqkiyhn95b1c2if1l3cw5a188a1szx1d8l7sbk2jg";
     };
     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/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 310bebd382ad..c7a4ff20a73d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -394,6 +394,11 @@ in
     let
       attrs = with args;
         if (args.abiCompat == null) then attrs_passed
+            # All this just for 1.19.2, as the tarball is incorrectly autotoolized.
+            // {
+              nativeBuildInputs = [ utilmacros fontutil ];
+              preConfigure = "libtoolize --force; aclocal; autoheader; automake -afi";
+            }
         else if (args.abiCompat == "1.17") then {
           name = "xorg-server-1.17.4";
           builder = ./builder.sh;

From 1bd3fa6210743928ca6a92f1d7f14a6d28a66232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 4 Mar 2017 09:18:56 +0100
Subject: [PATCH 1638/3449] vlock: fix ENOPATCH
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks, @dtzWill.

Signed-off-by: Lluís Batlle i Rossell <viric@viric.name>
---
 pkgs/misc/screensavers/vlock/eintr.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 pkgs/misc/screensavers/vlock/eintr.patch

diff --git a/pkgs/misc/screensavers/vlock/eintr.patch b/pkgs/misc/screensavers/vlock/eintr.patch
new file mode 100644
index 000000000000..e33b52228fc3
--- /dev/null
+++ b/pkgs/misc/screensavers/vlock/eintr.patch
@@ -0,0 +1,22 @@
+In systemd I have seen this error, using it as a service:
+
+vlock-start[14567]: vlock-new: could not activate new terminal: Interrupted system call
+
+I think this should fix that.
+
+diff --git a/modules/new.c b/modules/new.c
+index e9b15fb..1f692fd 100644
+--- a/modules/new.c
++++ b/modules/new.c
+@@ -103,7 +103,10 @@ static char *get_console_name(int n)
+  * file descriptor. */
+ static int activate_console(int consfd, int vtno)
+ {
+-  int c = ioctl(consfd, VT_ACTIVATE, vtno);
++  int c;
++  do {
++    c = ioctl(consfd, VT_ACTIVATE, vtno);
++  } while(c != 0 && errno == EINTR);
+ 
+   return c < 0 ? c : ioctl(consfd, VT_WAITACTIVE, vtno);
+ }

From 843e5daebe636087c4c865810e05828677e73a22 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Mar 2017 06:24:36 +0100
Subject: [PATCH 1639/3449] ocamlPackages.ppx_deriving: 3.3 -> 4.1

---
 .../ocaml-modules/ppx_deriving/default.nix          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
index 4b4056a69d72..a1255b2dbc17 100644
--- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix
@@ -1,15 +1,16 @@
-{stdenv, buildOcaml, fetchurl,
- cppo, ppx_tools, result, ounit}:
+{ stdenv, buildOcaml, fetchzip
+, cppo, ppx_tools, result, ounit
+}:
 
 buildOcaml rec {
   name = "ppx_deriving";
-  version = "v3.3";
+  version = "4.1";
 
   minimumSupportedOcamlVersion = "4.02";
 
-  src = fetchurl {
-    url = "https://github.com/whitequark/${name}/archive/${version}.tar.gz";
-    sha256 = "1j20c6r2v7h05a4v9m8z5m1yqgwif41yrp63mik14pf3dkrj8x3f";
+  src = fetchzip {
+    url = "https://github.com/whitequark/${name}/archive/v${version}.tar.gz";
+    sha256 = "0cy9p8d8cbcxvqyyv8fz2z9ypi121zrgaamdlp4ld9f3jnwz7my9";
   };
 
   hasSharedObjects = true;

From fe0ef5538428b4c30cd7151431ac2903a489b68f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Mar 2017 10:38:42 +0100
Subject: [PATCH 1640/3449] solc: fix build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prevent the download of jsoncpp to happen at build time.
Don’t treat warnings as errors, since there is a warning about the major() macros in GNU libc.
---
 pkgs/development/compilers/solc/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 354c8f4e5f57..ecf975bf76f1 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,4 +1,9 @@
-{ stdenv, fetchgit, boost, cmake, jsoncpp }:
+{ stdenv, fetchzip, fetchgit, boost, cmake }:
+
+let jsoncpp = fetchzip {
+  url = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
+  sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
+}; in
 
 stdenv.mkDerivation rec {
   version = "0.4.8";
@@ -13,9 +18,13 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     echo >commit_hash.txt 2dabbdf06f414750ef0425c664f861aeb3e470b8
+    substituteInPlace deps/jsoncpp.cmake \
+      --replace https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz ${jsoncpp}
+    substituteInPlace cmake/EthCompilerSettings.cmake \
+      --replace 'add_compile_options(-Werror)' ""
   '';
 
-  buildInputs = [ boost cmake jsoncpp ];
+  buildInputs = [ boost cmake ];
 
   meta = {
     description = "Compiler for Ethereum smart contract language Solidity";

From 7771db2eb6f0525c487c2fdff914d0c9bae3b99d Mon Sep 17 00:00:00 2001
From: Jens Grunert <jens.grunert@gmail.com>
Date: Sat, 4 Mar 2017 11:19:23 +0100
Subject: [PATCH 1641/3449] corebird: missing dependencies (glib_networking)

---
 pkgs/applications/networking/corebird/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 3ceb9c4d8164..95a2e8877c31 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32
-, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }:
+, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook
+, glib_networking }:
 
 stdenv.mkDerivation rec {
   version = "1.3.3";
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
 
   buildInputs = [
-    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest
+    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest glib_networking
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
 
   meta = {

From b9a7aacef71671bdeffdc7c4f21e3b25cb3d4a5a Mon Sep 17 00:00:00 2001
From: Thomas Strobel
 <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>
Date: Sat, 4 Mar 2017 11:26:11 +0100
Subject: [PATCH 1642/3449] improve: modules/virtualisation/qemu-vm.nix

disk image for qemu VM with bootloader:
* remove redundant command
* improve readability
* improve execution speed
* make output more reproducible
---
 nixos/modules/virtualisation/qemu-vm.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index dcf14c73610f..1933f11d1fff 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -136,15 +136,17 @@ let
                       else "-nographic -serial pty";
         }
         ''
-          # Create a /boot EFI partition with 40M
-          ${pkgs.gptfdisk}/bin/sgdisk -G /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -a 1 -n 1:34:2047 -c 1:BIOSBootPartition -t 1:ef02 /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -a 512 -N 2 -c 2:EFISystem -t 2:ef00 /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -A 1:set:1 /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -h 2 /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -C /dev/vda
-          ${pkgs.gptfdisk}/bin/sgdisk -A 2:set:2 /dev/vda
+          # Create a /boot EFI partition with 40M and arbitrary but fixed GUIDs for reproducibility
+          ${pkgs.gptfdisk}/bin/sgdisk \
+            --set-alignment=1 --new=1:34:2047 --change-name=1:BIOSBootPartition --typecode=1:ef02 \
+            --set-alignment=512 --largest-new=2 --change-name=2:EFISystem --typecode=2:ef00 \
+            --attributes=1:set:1 \
+            --attributes=2:set:2 \
+            --disk-guid=97FD5997-D90B-4AA3-8D16-C1723AEA73C1 \
+            --partition-guid=1:1C06F03B-704E-4657-B9CD-681A087A2FDC \
+            --partition-guid=2:970C694F-AFD0-4B99-B750-CDB7A329AB6F \
+            --hybrid 2 \
+            --recompute-chs /dev/vda
           . /sys/class/block/vda2/uevent
           mknod /dev/vda2 b $MAJOR $MINOR
           . /sys/class/block/vda/uevent

From 57c6fac3e980bb22cbd9ba8fa4c97b4d49292c7f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 4 Mar 2017 04:19:58 +0200
Subject: [PATCH 1643/3449] kernel config: Enable IP_MULTICAST

This is lacking on ARM and causes libuv tests to fail.
---
 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 9b0cd003072b..8acf67d3dd15 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -121,6 +121,7 @@ with stdenv.lib;
   IP_VS_PROTO_ESP y
   IP_VS_PROTO_AH y
   IP_DCCP_CCID3 n # experimental
+  IP_MULTICAST y
   IPV6_ROUTER_PREF y
   IPV6_ROUTE_INFO y
   IPV6_OPTIMISTIC_DAD y

From c184d2e3343c2d2adafa9eaa36179f53a558e264 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 4 Mar 2017 11:50:38 +0100
Subject: [PATCH 1644/3449] ocamlPackages.core_extended_p4: fix build on linux

---
 pkgs/development/ocaml-modules/core_extended/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix
index fef4fd81158f..fe4fc5d87ab7 100644
--- a/pkgs/development/ocaml-modules/core_extended/default.nix
+++ b/pkgs/development/ocaml-modules/core_extended/default.nix
@@ -12,6 +12,13 @@ buildOcaml rec {
     sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3";
   };
 
+  preConfigure = stdenv.lib.optionalString stdenv.isLinux ''
+    patch lib/extended_unix_stubs.c <<EOF
+    0a1
+    > #define _LINUX_QUOTA_VERSION 2
+    EOF
+  '';
+
   hasSharedObjects = true;
   buildInputs = [ pa_bench pa_test pa_ounit ];
   propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4

From 9b6164ffb9879b99adefb9bb5961c25af0feaf2a Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Mar 2017 01:07:31 +0100
Subject: [PATCH 1645/3449] kaitaistruct: init at 0.6

---
 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 75a880cb889c..1d605d4fe4f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17395,6 +17395,22 @@ in {
     };
   };
 
+  kaitaistruct = buildPythonPackage rec {
+    name = "kaitaistruct-${version}";
+    version = "0.6";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/k/kaitaistruct/${name}.tar.gz";
+      sha256 = "0rwcrlz7f2bwmypqa38pag492bp71wp1bhz51hsaynjjyr9knr12";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Kaitai Struct: runtime library for Python";
+      homepage = "https://github.com/kaitai-io/kaitai_struct_python_runtime";
+      license = licenses.mit;
+    };
+  };
+
   Kajiki = buildPythonPackage rec {
     name = "Kajiki-${version}";
     version = "0.5.5";

From 6c08b145ab91ec03a510ebea3e35a137e84343f9 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 4 Mar 2017 01:07:40 +0100
Subject: [PATCH 1646/3449] mitmproxy: 1.0.2 -> 2.0.6

---
 pkgs/tools/networking/mitmproxy/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 8e82023d50a2..dcdcf9b734c0 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -3,20 +3,21 @@
 python3Packages.buildPythonPackage rec {
   baseName = "mitmproxy";
   name = "${baseName}-${version}";
-  version = "1.0.2";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = baseName;
     repo = baseName;
     rev = "v${version}";
-    sha256 = "19nqg7s1034fal8sb2rjssgcpvxh50yidyjhnbfmmi8v3fbvpbwl";
+    sha256 = "17gvr642skz4a23966lckdbrkh6mx31shi8hmakkvi91sa869i30";
   };
 
   propagatedBuildInputs = with python3Packages; [
-    pyopenssl pyasn1 urwid pillow flask click pyperclip blinker
-    construct pyparsing html2text tornado brotlipy requests2
-    sortedcontainers passlib cssutils h2 ruamel_yaml jsbeautifier
-    watchdog editorconfig
+    blinker click certifi construct cryptography
+    cssutils editorconfig h2 html2text hyperframe
+    jsbeautifier kaitaistruct passlib pyasn1 pyopenssl
+    pyparsing pyperclip requests2 ruamel_yaml tornado
+    urwid watchdog brotlipy sortedcontainers
   ];
 
   # Tests fail due to an error with a decorator

From f704050a21ecbf950aab06e056e9044120a80835 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Mar 2017 11:59:54 +0100
Subject: [PATCH 1647/3449] sqlite: 3.16.2 -> 3.17.0

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

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 6e86780446c5..a80317162302 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.16.2";
+  name = "sqlite-3.17.0";
 
   src = fetchurl {
-    url = "http://sqlite.org/2017/sqlite-autoconf-3160200.tar.gz";
-    sha256 = "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35";
+    url = "http://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz";
+    sha256 = "0k472gq0p706jq4529p60znvw02hdf172qxgbdv59q0n7anqbr54";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 92d8680785d4de6dbc003bae36bae0bf03f11f2b Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sat, 4 Mar 2017 08:36:06 -0300
Subject: [PATCH 1648/3449] pcsxr: remove name conflict with zlib 1.2.9

---
 pkgs/misc/emulators/pcsxr/default.nix       |  2 ++
 pkgs/misc/emulators/pcsxr/uncompress2.patch | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/misc/emulators/pcsxr/uncompress2.patch

diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix
index 74b9932ed832..bb6997dfb96c 100644
--- a/pkgs/misc/emulators/pcsxr/default.nix
+++ b/pkgs/misc/emulators/pcsxr/default.nix
@@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
       url = "https://anonscm.debian.org/cgit/pkg-games/pcsxr.git/plain/debian/patches/08_reproducible.patch?h=debian/1.9.94-2";
       sha256 = "1cx9q59drsk9h6l31097lg4aanaj93ysdz5p88pg9c7wvxk1qz06";
     })
+
+    ./uncompress2.patch
   ];
 
   buildInputs = [
diff --git a/pkgs/misc/emulators/pcsxr/uncompress2.patch b/pkgs/misc/emulators/pcsxr/uncompress2.patch
new file mode 100644
index 000000000000..356868ce7a8b
--- /dev/null
+++ b/pkgs/misc/emulators/pcsxr/uncompress2.patch
@@ -0,0 +1,20 @@
+--- a/libpcsxcore/cdriso.c
++++ b/libpcsxcore/cdriso.c
+@@ -1219,7 +1219,7 @@
+ 	return ret;
+ }
+ 
+-static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
++static int uncompress3(void *out, unsigned long *out_size, void *in, unsigned long in_size)
+ {
+ 	static z_stream z;
+ 	int ret = 0;
+@@ -1298,7 +1298,7 @@
+ 	if (is_compressed) {
+ 		cdbuffer_size_expect = sizeof(compr_img->buff_raw[0]) << compr_img->block_shift;
+ 		cdbuffer_size = cdbuffer_size_expect;
+-		ret = uncompress2(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
++		ret = uncompress3(compr_img->buff_raw[0], &cdbuffer_size, compr_img->buff_compressed, size);
+ 		if (ret != 0) {
+ 			SysPrintf("uncompress failed with %d for block %d, sector %d\n",
+ 					ret, block, sector);

From 2b38cbb3299ea3cb9a6c315c4445e256e4dc68f4 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Mar 2017 12:30:16 +0100
Subject: [PATCH 1649/3449] qshowdiff: fix build

---
 pkgs/tools/text/qshowdiff/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index a2d6e360a374..63759184ba47 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, qt4, perl}:
+{stdenv, fetchurl, qt4, perl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qshowdiff-1.2";
-  
+  name = "qshowdiff-${version}";
+  version = "1.2";
+
   src = fetchurl {
-    url = "http://qshowdiff.danfis.cz/files/${name}.tar.gz";
-    sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
+    url = "https://github.com/danfis/qshowdiff/archive/v${version}.tar.gz";
+    sha256 = "027959xbzvi5c2w9y1x122sr5i26k9mvp43banz2wln6gd860n1a";
   };
 
-  buildInputs = [ qt4 perl ];
+  buildInputs = [ qt4 perl pkgconfig ];
 
   configurePhase = ''
     mkdir -p $out/{bin,man/man1}

From 04283047a5d9d8b06c3a0c43678e0ffe24a5049f Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Mar 2017 10:29:14 +0100
Subject: [PATCH 1650/3449] gparted: 0.26.1 -> 0.28.1

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

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index cdf2a4aca86c..67e5a7848b2e 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,10 +4,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.26.1";
+  name = "gparted-0.28.1";
 
   src = fetchurl {
-    sha256 = "1h9d6x335wxpm49yphzm9n1hbh2hcg0p2rphv76mrvsss91bcm1g";
+    sha256 = "0cyk8lpimm6wani8khw0szwqkgw5wpq2mfnfxkbgfm2774a1z2bn";
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
   };
 

From d8a7b507d9aa9fdedfed0ffcb4e8f3eea74e2274 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 19:54:32 -0600
Subject: [PATCH 1651/3449] smc: 6.3.0 -> 6.6.0

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

diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix
index c7c389a3733f..83c384e5ec0a 100644
--- a/pkgs/tools/misc/smc/default.nix
+++ b/pkgs/tools/misc/smc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, jre }:
 
 stdenv.mkDerivation rec {
-  name = "smc-6.3.0";
+  name = "smc-6.6.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/smc/smc/6_3_0/smc_6_3_0.tgz";
-    sha256 = "0arzi8kc4vycp1ccf0v87p08cdpylwhx4za2pzvp08vkfwi8zc7z";
+    url = "mirror://sourceforge/project/smc/smc/6_6_0/smc_6_6_0.tgz";
+    sha256 = "14lf286dslm7ymkr4my1xgjvwvqc9181mwkfr65ab49cxl0q85wz";
   };
 
   # Prebuilt Java package.

From 8977b1f2eef8adcffc708dd61edcb1e1f6f8c61c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 3 Mar 2017 23:36:52 +0100
Subject: [PATCH 1652/3449] vim-plugins: use https for github repositories

---
 pkgs/misc/vim-plugins/vim-utils.nix            | 2 +-
 pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 4b754f15c0fa..141dde927626 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -254,7 +254,7 @@ let
           let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager'
           if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload')
             " checkout VAM
-            execute '!git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager '
+            execute '!git clone --depth=1 https://github.com/MarcWeber/vim-addon-manager '
                 \       shellescape(c.plugin_root_dir.'/vim-addon-manager', 1)
           endif
         endif
diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
index 376b7c674d6c..89a96133fba5 100644
--- a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
+++ b/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim
@@ -134,10 +134,10 @@ fun! nix#AddNixDerivation(opts, cache, name, ...) abort
     if len(list) > 0
       if '' != list[2]
         let name = list[2]
-        let repository = { 'type': 'git', 'owner': list[1], 'repo': list[2], 'url': 'git://github.com/'.list[1].'/'.list[2] }
+        let repository = { 'type': 'git', 'owner': list[1], 'repo': list[2], 'url': 'https://github.com/'.list[1].'/'.list[2] }
       else
         let name = list[1]
-        let repository = { 'type': 'git', 'owner': list[1], 'repo': 'vim-addon-'.list[1], 'url': 'git://github.com/'.list[1].'/vim-addon-'.list[1] }
+        let repository = { 'type': 'git', 'owner': list[1], 'repo': 'vim-addon-'.list[1], 'url': 'https://github.com/'.list[1].'/vim-addon-'.list[1] }
       endif
     else
       let repository = get(g:vim_addon_manager.plugin_sources, a:name, {})

From f14b001e27806e5da40fa8a83f75fc31e769194d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 3 Mar 2017 23:56:32 +0100
Subject: [PATCH 1653/3449] vim-plugins: update with https sources

---
 pkgs/misc/vim-plugins/default.nix      | 603 +++++++++++++------------
 pkgs/misc/vim-plugins/vim-plugin-names |   1 +
 2 files changed, 303 insertions(+), 301 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c8872a40e561..b9b318cfb960 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -124,11 +124,11 @@ rec {
   };
 
   CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "CheckAttach-2017-02-12";
+    name = "CheckAttach-2017-02-26";
     src = fetchgit {
       url = "git://github.com/chrisbra/CheckAttach";
-      rev = "17e8e37e348a93f2a2104f07f1224c9c8798f85e";
-      sha256 = "0i8y0h840bpj5s0vf603ghjnpfyds5q7y8c4p8a58qzw20i2v88g";
+      rev = "4e841a854e8ee3fd24849e972a3c3f5456ef6be3";
+      sha256 = "0dvqrca1sa8r29kg2k6qhpp3mbsbk29p81zpa7gzw8h73kqfwph1";
     };
     dependencies = [];
 
@@ -146,11 +146,11 @@ rec {
   };
 
   Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Hoogle-2016-11-29";
+    name = "Hoogle-2017-03-01";
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
-      rev = "9f00214ece60b9514ef2911fb62e7d53c52d3b4c";
-      sha256 = "1yh732s9k3lhsdqz8qfqijvl0za7cl9mndbzqh4dg2g14f5f5qqw";
+      rev = "cfb0c864dbacf6f916ba05c4a688e21154aa971b";
+      sha256 = "0gddyh47gwy684kjs9yxfnc0lg8jq9w5pdyv3yrvypyiqi51vw1b";
     };
     dependencies = [];
 
@@ -179,11 +179,11 @@ rec {
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2017-02-07";
+    name = "Syntastic-2017-02-28";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "53a3db5e3bfbafb660ebbdbc8210e3b30cb60c10";
-      sha256 = "0kinqr5azlcs01q8czynxvbjswfdjh30xww26a8lf2h9750qzyhi";
+      rev = "48e8b0e9d2721f608fd1d1157c9388b2626cbddf";
+      sha256 = "0q52iqnbqm1h5iy8wr4l03y8w9yamgk48sd495p255pmxn8dryc5";
     };
     dependencies = [];
 
@@ -201,33 +201,33 @@ rec {
   };
 
   Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Tagbar-2017-02-12";
+    name = "Tagbar-2017-02-18";
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
-      rev = "9d051c1e2d9f3dc88d3ae00485e55934b06d42f7";
-      sha256 = "055n6armj80vmyv9kc8jhd84wl6nrr8qf7fj6b5vxp221y86wf3x";
+      rev = "959f48798136bfd4ce60075d3c86c580fcf5e5c5";
+      sha256 = "02v30744w2jcavwk9cjdy51ldpqylj6pgg6zavj4dni7knbnq3jm";
     };
     dependencies = [];
 
   };
 
   The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_Commenter-2017-01-22";
+    name = "The_NERD_Commenter-2017-02-28";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
-      rev = "607253203dc2fc1798dbe2ea9a3471db9c12e005";
-      sha256 = "1z7rg52153vm5vj5xpvqny0aikvlr7nk9nfkrwnfxcs4jq8i752d";
+      rev = "41e686824a5b77ba5afe9c5dabdc045aac922c5a";
+      sha256 = "1c9zhlljbnskmgn8ycckznbh05cf3ldbq902gg8rn0n0433dy7wc";
     };
     dependencies = [];
 
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2017-01-02";
+    name = "The_NERD_tree-2017-02-25";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "281701021c5001332a862da80175bf585d24e2e8";
-      sha256 = "0fp2rfz6rmaj01w5kifqzdyi934j20pa8bpgw13ks1s0s4x7xkck";
+      rev = "e671e403dd1ec1da59f70605c73aaedb6cb0e637";
+      sha256 = "0g3bdwbg6hyh83qn4ad1hjk3pvq049fjqwj6viwa668zyvq4vwm4";
     };
     dependencies = [];
 
@@ -356,11 +356,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2017-02-10";
+    name = "fugitive-2017-02-25";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "f44845e4408aae03e018e98afb7fbf0c2ee87dd5";
-      sha256 = "1rd6iqg1q8wchsypm0mg75mfc93y871xsx6cl733771w83zi91hq";
+      rev = "87c1bda4d5573185a1f79c42a919c4b62bc34c42";
+      sha256 = "1zfq28sawq5x6y55w5m248r5vhs2g0llhs2xpihys9kg7jgj49zq";
     };
     dependencies = [];
 
@@ -380,7 +380,7 @@ rec {
   vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-auto-save-2017-01-16";
     src = fetchgit {
-      url = "git://github.com/907th/vim-auto-save";
+      url = "https://github.com/907th/vim-auto-save";
       rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5";
       sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y";
     };
@@ -389,22 +389,11 @@ rec {
   };
 
   vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-autoformat-2017-02-06";
+    name = "vim-autoformat-2017-02-19";
     src = fetchgit {
-      url = "git://github.com/Chiel92/vim-autoformat";
-      rev = "56170ff0d3c4e7b9acf0d373425ae2b2f047036e";
-      sha256 = "0q4jz79jn6w9nkfvy9dk41d2krccx6pn91lm51987j9viijb6kyq";
-    };
-    dependencies = [];
-
-  };
-
-  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-indent-object-2015-08-11";
-    src = fetchgit {
-      url = "git://github.com/michaeljsmith/vim-indent-object";
-      rev = "1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b";
-      sha256 = "1xxl5pwbz56qjfxw6l686m1qc4a3q0r7afa9r5gjhgd1jy67z7d7";
+      url = "https://github.com/Chiel92/vim-autoformat";
+      rev = "42adced2500134017180ec37d10a8ffcde48e825";
+      sha256 = "0yabhdnarrb0iiv51lxjvlicmlh6ga9n51iwrriv03p43s9h5hg1";
     };
     dependencies = [];
 
@@ -413,7 +402,7 @@ rec {
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-nix-2016-11-02";
     src = fetchgit {
-      url = "git://github.com/LnL7/vim-nix";
+      url = "https://github.com/LnL7/vim-nix";
       rev = "b06cccd8ff61149b13d3fc8b7e0d06caa55c9888";
       sha256 = "0d1wxxijyyl449f81asl9d31kg0wvs3m0fypin172ahgpf3lyar4";
     };
@@ -422,33 +411,22 @@ rec {
   };
 
   tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tsuquyomi-2017-01-31";
+    name = "tsuquyomi-2017-02-16";
     src = fetchgit {
-      url = "git://github.com/Quramy/tsuquyomi";
-      rev = "201d84d37ac9077855942dc9c6e6e235e285f20f";
-      sha256 = "1rcibh4clxw8sq2n8072i4x52msvfxim9r9rwqi264jm31s81yyx";
-    };
-    dependencies = [];
-
-  };
-
-  delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "delimitMate-2016-07-19";
-    src = fetchgit {
-      url = "git://github.com/Raimondi/delimitMate";
-      rev = "b5719054beebe0135c94f4711a06dc7588041f09";
-      sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3";
+      url = "https://github.com/Quramy/tsuquyomi";
+      rev = "043f8e0a008853bfe4c6a56a04930defe8494984";
+      sha256 = "0jzkg2wrs46g6ycidh54z0rdhvjfm1syaf6sf17cl9m7h6wprsy8";
     };
     dependencies = [];
 
   };
 
   deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-nvim-2017-02-09";
+    name = "deoplete-nvim-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/Shougo/deoplete.nvim";
-      rev = "2e9fd874b7d974a03df8af10a090e2601b16c7f0";
-      sha256 = "1zj80jxsnff2s16wkim56sxks7p2nj5dv073v30nbscbxacq6hvp";
+      url = "https://github.com/Shougo/deoplete.nvim";
+      rev = "b9774f4a320838288670fd215901115b06b4a600";
+      sha256 = "1r91lnbjqhvpzszygkl4s1m9wc1qh4pg2pd43r66akpnddmgil0k";
     };
     dependencies = [];
 
@@ -457,7 +435,7 @@ rec {
   Spacegray-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Spacegray-vim-2016-10-30";
     src = fetchgit {
-      url = "git://github.com/ajh17/Spacegray.vim";
+      url = "https://github.com/ajh17/Spacegray.vim";
       rev = "79936a4434bf57b64c2d73320e62b4e67d84af74";
       sha256 = "0dg037aw99yjdirw6f8v6da1lyf5ba2c6bni2wnka6bmzqx0k53r";
     };
@@ -468,7 +446,7 @@ rec {
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-closetag-2016-07-19";
     src = fetchgit {
-      url = "git://github.com/alvan/vim-closetag";
+      url = "https://github.com/alvan/vim-closetag";
       rev = "e7e6cb99b9abb2aaa4711b9b2a98ad029169253b";
       sha256 = "0827yrgawfjf82z37lndf58ikyh6s8g9qhxvnbfxvz8cc4a6r21v";
     };
@@ -479,7 +457,7 @@ rec {
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-css-color-2017-02-09";
     src = fetchgit {
-      url = "git://github.com/ap/vim-css-color";
+      url = "https://github.com/ap/vim-css-color";
       rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b";
       sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc";
     };
@@ -488,11 +466,11 @@ rec {
   };
 
   clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "clighter8-2017-02-12";
+    name = "clighter8-2017-03-04";
     src = fetchgit {
-      url = "git://github.com/bbchung/clighter8";
-      rev = "357a0292438dfad356ce52c94f96840063fad80d";
-      sha256 = "0rd5ikq7ln0n2a1alhjzcjhqdfa5m5laylsg24xl1py32lcqayak";
+      url = "https://github.com/bbchung/clighter8";
+      rev = "229012f8f8181417e0f43b4f19c4273dd7d5233a";
+      sha256 = "0hx9l1mr7im9zrwhwf6n2lyc5azna7b2lkz4v1y9f93gv78b1vv5";
     };
     dependencies = [];
     preFixup = ''
@@ -502,11 +480,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2017-02-12";
+    name = "neomake-2017-03-03";
     src = fetchgit {
-      url = "git://github.com/benekastah/neomake";
-      rev = "375684a1c81ffe24a8e2dfb1e92d164498f38653";
-      sha256 = "1yhkh94fpnwk335s6xd17jl5w6mrzj8vz9aw3g39gf5m4lwlqn8w";
+      url = "https://github.com/benekastah/neomake";
+      rev = "4cd4dbb68f4f5c365e213552642c7e8a8b954f83";
+      sha256 = "1h03cxdbbzghigrya2xy7a4rri5fjm8vma4bya7xfndc0sg9wlhz";
     };
     dependencies = [];
 
@@ -515,7 +493,7 @@ rec {
   vim-hdevtools = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hdevtools-2012-12-29";
     src = fetchgit {
-      url = "git://github.com/bitc/vim-hdevtools";
+      url = "https://github.com/bitc/vim-hdevtools";
       rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
       sha256 = "1wwjb9m2l9q75d408jzq9bwv5i376bfgs6vc3ihwwlawcrmhjpxz";
     };
@@ -524,11 +502,11 @@ rec {
   };
 
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-tmux-navigator-2017-01-28";
+    name = "vim-tmux-navigator-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/christoomey/vim-tmux-navigator";
-      rev = "34f8fbf1d4ebaa1bf1db6715b17a197eaffe1ad8";
-      sha256 = "074isx0kksl7kc72n1n8ywqcx5vj7ndz01jaih14nwqpqshv2zgx";
+      url = "https://github.com/christoomey/vim-tmux-navigator";
+      rev = "2fc1ed42ab580ab47c506ab0bef09f1dbb9ff04d";
+      sha256 = "1mw0x3kcxvhfypzd7yj6bcknp6c5bh4zb4r9b16n1r7gplvwv8jn";
     };
     dependencies = [];
 
@@ -537,7 +515,7 @@ rec {
   spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "spacevim-2017-01-22";
     src = fetchgit {
-      url = "git://github.com/ctjhoa/spacevim";
+      url = "https://github.com/ctjhoa/spacevim";
       rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5";
       sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn";
     };
@@ -548,7 +526,7 @@ rec {
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "ctrlp-vim-2017-01-13";
     src = fetchgit {
-      url = "git://github.com/ctrlpvim/ctrlp.vim";
+      url = "https://github.com/ctrlpvim/ctrlp.vim";
       rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359";
       sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc";
     };
@@ -559,7 +537,7 @@ rec {
   agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "agda-vim-2016-10-22";
     src = fetchgit {
-      url = "git://github.com/derekelkins/agda-vim";
+      url = "https://github.com/derekelkins/agda-vim";
       rev = "5c698a0dcc4881ea8fbe672e60aaca70d4c8b6f4";
       sha256 = "0ii9gmwnc97zjis7d0a230gbh4pqvx4ja83aypmpmy67s3sxhwvf";
     };
@@ -570,7 +548,7 @@ rec {
   vim-scala = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-scala-2016-08-02";
     src = fetchgit {
-      url = "git://github.com/derekwyatt/vim-scala";
+      url = "https://github.com/derekwyatt/vim-scala";
       rev = "a6a350f7c632d0e640b57f9dcc7e123409a7bcd7";
       sha256 = "108c5h02vcb3pnr3si8dhwq3mv2pj5d83mj1ljxdk9595xv8j2rp";
     };
@@ -579,11 +557,11 @@ rec {
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2017-02-01";
+    name = "vim-jade-2017-02-15";
     src = fetchgit {
-      url = "git://github.com/digitaltoad/vim-jade";
-      rev = "eb8c6b23b86fdc93cd2a34217adfe5f6b2d7d05d";
-      sha256 = "1y325pq8r4njx6mz5y2hk0j6dpkbw9f6cxp0n2hdfp4xj9qgx9v1";
+      url = "https://github.com/digitaltoad/vim-jade";
+      rev = "20e41fc7ca0f1f1023c64548918e2b8155bb44ea";
+      sha256 = "1smqwpzsllmwc7kafyj65fkmh8p87b14dzgldnh4cnrhkcbnddav";
     };
     dependencies = [];
 
@@ -592,7 +570,7 @@ rec {
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-2016-09-21";
     src = fetchgit {
-      url = "git://github.com/dracula/vim";
+      url = "https://github.com/dracula/vim";
       rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
       sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv";
     };
@@ -603,7 +581,7 @@ rec {
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-ghc-2016-07-01";
     src = fetchgit {
-      url = "git://github.com/eagletmt/neco-ghc";
+      url = "https://github.com/eagletmt/neco-ghc";
       rev = "7f02a9c25fb272a87d2be092826e2cd3094c620d";
       sha256 = "1fcfk45qb96h6y4zb3p0104iyqc85q1synn9ah56zp6hnkkyffbw";
     };
@@ -614,7 +592,7 @@ rec {
   editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "editorconfig-vim-2016-07-16";
     src = fetchgit {
-      url = "git://github.com/editorconfig/editorconfig-vim";
+      url = "https://github.com/editorconfig/editorconfig-vim";
       rev = "a459b8cfef00100da40fd69c8ae92c4d1e63e1d2";
       sha256 = "03slzk7jgr348f59pxghmd9giwla63lxmwvripg99zrlgl0pvp5g";
     };
@@ -625,7 +603,7 @@ rec {
   acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "acp-2013-02-05";
     src = fetchgit {
-      url = "git://github.com/eikenb/acp";
+      url = "https://github.com/eikenb/acp";
       rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e";
       sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg";
     };
@@ -633,45 +611,34 @@ rec {
 
   };
 
-  argtextobj = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "argtextobj-vim-2010-10-17";
-    src = fetchgit {
-      url = "git://github.com/vim-scripts/argtextobj.vim";
-      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
-      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
-    };
-    dependencies = [];
-
-  };
-
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2017-01-24";
+    name = "vim-elixir-2017-02-21";
     src = fetchgit {
-      url = "git://github.com/elixir-lang/vim-elixir";
-      rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f";
-      sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4";
+      url = "https://github.com/elixir-lang/vim-elixir";
+      rev = "9524e66ee03a36ef1d5913c7f42c3dd9b235146e";
+      sha256 = "0n7v2kfzqifm527pbh8d08xmdzj8rmbhnnvs22hyxv2ij06lzzn2";
     };
     dependencies = [];
 
   };
 
   elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "elm-vim-2017-01-13";
+    name = "elm-vim-2017-02-27";
     src = fetchgit {
-      url = "git://github.com/elmcast/elm-vim";
-      rev = "0c1fbfdf12f165681b8134ed2cae2c148105ac40";
-      sha256 = "0l871hzg55ysns5h6v7xq63lwf4135m3xggm2s4q2pmzizivk0x2";
+      url = "https://github.com/elmcast/elm-vim";
+      rev = "b47d013d1fdfecc9e19df8034439b8e379813696";
+      sha256 = "0ibmb02qal7q29brmq0jkd3rcnwp6yba9agza3av1x1ixvb61mlw";
     };
     dependencies = [];
 
   };
 
   vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-localvimrc-2017-02-07";
+    name = "vim-localvimrc-2017-03-01";
     src = fetchgit {
-      url = "git://github.com/embear/vim-localvimrc";
-      rev = "775ea57b9f433bdaf83c42c26d51137e1e7b3b98";
-      sha256 = "094jmnfzl1girjwhpg4kq48lrdcfrx4x1baq1n8rjlm2zln2sbdx";
+      url = "https://github.com/embear/vim-localvimrc";
+      rev = "aaea27fe897edbfb0c5f71ef0ac02489f4bcfefa";
+      sha256 = "1lp947x9q9746r8zfssnn2xylbvzyyzxh7s7rshqglslwd74hhz8";
     };
     dependencies = [];
 
@@ -680,7 +647,7 @@ rec {
   vim-haskellConcealPlus = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-haskellConcealPlus-2016-05-13";
     src = fetchgit {
-      url = "git://github.com/enomsg/vim-haskellConcealPlus";
+      url = "https://github.com/enomsg/vim-haskellConcealPlus";
       rev = "81dfb51ff8e471fb1f30659a10daaf1bdd65fb03";
       sha256 = "0vm76gxw62lkyxccrlnn8sblfl3d51svwfra9wfixq4h51jdggyr";
     };
@@ -691,7 +658,7 @@ rec {
   YUNOcommit-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "YUNOcommit-vim-2014-11-26";
     src = fetchgit {
-      url = "git://github.com/esneider/YUNOcommit.vim";
+      url = "https://github.com/esneider/YUNOcommit.vim";
       rev = "981082055a73ef076d7e27477874d2303153a448";
       sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab";
     };
@@ -700,11 +667,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2017-02-02";
+    name = "vim-go-2017-02-19";
     src = fetchgit {
-      url = "git://github.com/fatih/vim-go";
-      rev = "1425decf6d4e1b313955cefe08c859d07c2c2822";
-      sha256 = "1pql4m5iiajqk6qfb3nahlf2q2ixp425lg5bni16rk78r173wqvl";
+      url = "https://github.com/fatih/vim-go";
+      rev = "b9c81562630e9dfc098d25814c16bedcfcf9ffa9";
+      sha256 = "0r5r4laqd4jwqc14lkjyccz3ijjzz366r0zgqw5cybspnf622f9a";
     };
     dependencies = [];
 
@@ -713,7 +680,7 @@ rec {
   vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-colorschemes-2016-08-01";
     src = fetchgit {
-      url = "git://github.com/flazz/vim-colorschemes";
+      url = "https://github.com/flazz/vim-colorschemes";
       rev = "b8dff40f69f1873effbed97c759a8452ecb240ed";
       sha256 = "1mb08l2crl5mal0jllh9s099w2bqcb88vfjw3z5zj1jn8bbpniaj";
     };
@@ -724,7 +691,7 @@ rec {
   floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "floobits-neovim-2017-02-08";
     src = fetchgit {
-      url = "git://github.com/floobits/floobits-neovim";
+      url = "https://github.com/floobits/floobits-neovim";
       rev = "9755412fcd68cfc76a36aa000682a84d96013650";
       sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1";
     };
@@ -733,11 +700,11 @@ rec {
   };
 
   psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "psc-ide-vim-2016-11-29";
+    name = "psc-ide-vim-2017-03-03";
     src = fetchgit {
-      url = "git://github.com/frigoeu/psc-ide-vim";
-      rev = "640842ac8786098fc74fce4737734c97a7629591";
-      sha256 = "0mwqkgqlglcnv1k7k5lmibc7piwkd79j96vgv52ya31hg50vkrin";
+      url = "https://github.com/frigoeu/psc-ide-vim";
+      rev = "cfd4228ff907be6124953d4ff41951ce3eca28ce";
+      sha256 = "1dvdrj06l65xflq7f5k2c4awrc7hh03qr48h9i39q8lg4xc0qc1p";
     };
     dependencies = [];
 
@@ -746,7 +713,7 @@ rec {
   vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jsonnet-2016-12-16";
     src = fetchgit {
-      url = "git://github.com/google/vim-jsonnet";
+      url = "https://github.com/google/vim-jsonnet";
       rev = "ff255a3ac45dcd8bcda04728a8140243adde9c57";
       sha256 = "16ica7n8dcb3kq40dx3sd8lwvdrz7bzks1cranw2vxh4riv1i251";
     };
@@ -757,7 +724,7 @@ rec {
   vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jsdoc-2017-02-11";
     src = fetchgit {
-      url = "git://github.com/heavenshell/vim-jsdoc";
+      url = "https://github.com/heavenshell/vim-jsdoc";
       rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35";
       sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j";
     };
@@ -768,7 +735,7 @@ rec {
   vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-leader-guide-2017-02-12";
     src = fetchgit {
-      url = "git://github.com/hecal3/vim-leader-guide";
+      url = "https://github.com/hecal3/vim-leader-guide";
       rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da";
       sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1";
     };
@@ -779,7 +746,7 @@ rec {
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "idris-vim-2017-01-27";
     src = fetchgit {
-      url = "git://github.com/idris-hackers/idris-vim";
+      url = "https://github.com/idris-hackers/idris-vim";
       rev = "c9b8066730fd8e62cf20eecf0e2c60f225ff12c8";
       sha256 = "0nkr2qwykl57xky3dpz40m5gy7s1kjfsgb1kzj7z9jqm6a41m2bb";
     };
@@ -790,7 +757,7 @@ rec {
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "calendar-vim-2017-02-09";
     src = fetchgit {
-      url = "git://github.com/itchyny/calendar.vim";
+      url = "https://github.com/itchyny/calendar.vim";
       rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852";
       sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip";
     };
@@ -801,7 +768,7 @@ rec {
   lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lightline-vim-2017-02-12";
     src = fetchgit {
-      url = "git://github.com/itchyny/lightline.vim";
+      url = "https://github.com/itchyny/lightline.vim";
       rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a";
       sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5";
     };
@@ -812,7 +779,7 @@ rec {
   thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "thumbnail-vim-2016-12-25";
     src = fetchgit {
-      url = "git://github.com/itchyny/thumbnail.vim";
+      url = "https://github.com/itchyny/thumbnail.vim";
       rev = "f911ebd0dfe08dd83a55dd0d0e4804195079b13c";
       sha256 = "1pa0c34v2mah97i41hg1vyppf44sfmvdpji30bq54yv7gza36plz";
     };
@@ -823,7 +790,7 @@ rec {
   vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-ipython-2015-06-23";
     src = fetchgit {
-      url = "git://github.com/ivanov/vim-ipython";
+      url = "https://github.com/ivanov/vim-ipython";
       rev = "42499f094b805b90b683afa5009cee99abd0bb75";
       sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x";
     };
@@ -834,7 +801,7 @@ rec {
   vim-hier = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hier-2011-08-27";
     src = fetchgit {
-      url = "git://github.com/jceb/vim-hier";
+      url = "https://github.com/jceb/vim-hier";
       rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
       sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n";
     };
@@ -845,7 +812,7 @@ rec {
   vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-orgmode-2017-01-31";
     src = fetchgit {
-      url = "git://github.com/jceb/vim-orgmode";
+      url = "https://github.com/jceb/vim-orgmode";
       rev = "37fc5db4d167ca0def23febcb06d984ab72015be";
       sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x";
     };
@@ -856,7 +823,7 @@ rec {
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-buffergator-2017-02-05";
     src = fetchgit {
-      url = "git://github.com/jeetsukumaran/vim-buffergator";
+      url = "https://github.com/jeetsukumaran/vim-buffergator";
       rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d";
       sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7";
     };
@@ -867,7 +834,7 @@ rec {
   tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tslime-vim-2016-06-14";
     src = fetchgit {
-      url = "git://github.com/jgdavey/tslime.vim";
+      url = "https://github.com/jgdavey/tslime.vim";
       rev = "c980c76bbfc9a523fcf1edf08580d0d3a486e8f2";
       sha256 = "0gifyxwlspfnkni886adwn9kc0dckanjk0097y8pwxh7qbwfydf1";
     };
@@ -878,7 +845,7 @@ rec {
   auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "auto-pairs-2017-01-26";
     src = fetchgit {
-      url = "git://github.com/jiangmiao/auto-pairs";
+      url = "https://github.com/jiangmiao/auto-pairs";
       rev = "e915d857fe927309ef0090e830f892204b750c43";
       sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4";
     };
@@ -887,11 +854,11 @@ rec {
   };
 
   vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nerdtree-tabs-2017-02-12";
+    name = "vim-nerdtree-tabs-2017-02-22";
     src = fetchgit {
-      url = "git://github.com/jistr/vim-nerdtree-tabs";
-      rev = "de6a60909e71790baf5d46f863643379ec19bc4c";
-      sha256 = "1h9r9c9b788b6fz56s12ih85zyf1vv0bzrl7k54vl4cncryyw37y";
+      url = "https://github.com/jistr/vim-nerdtree-tabs";
+      rev = "01ae3cdc7018fa33f140cce3e7cdf210c04ffbab";
+      sha256 = "01z2xp95sqi5mxhdxm8q0zkx83rn16qbv884rj2irmbl1k8fhv62";
     };
     dependencies = [];
 
@@ -900,7 +867,7 @@ rec {
   zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "zenburn-2015-09-18";
     src = fetchgit {
-      url = "git://github.com/jnurmine/zenburn";
+      url = "https://github.com/jnurmine/zenburn";
       rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179";
       sha256 = "1las12jznf25dkxrjk3s9l70c6wnpjisngmvi83bhw5gvx4c7mq5";
     };
@@ -911,7 +878,7 @@ rec {
   vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-colorstepper-2016-01-28";
     src = fetchgit {
-      url = "git://github.com/jonbri/vim-colorstepper";
+      url = "https://github.com/jonbri/vim-colorstepper";
       rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05";
       sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs";
     };
@@ -922,7 +889,7 @@ rec {
   vim-xdebug = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-xdebug-2012-08-15";
     src = fetchgit {
-      url = "git://github.com/joonty/vim-xdebug";
+      url = "https://github.com/joonty/vim-xdebug";
       rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
       sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw";
     };
@@ -931,11 +898,11 @@ rec {
   };
 
   fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fzf-vim-2017-02-08";
+    name = "fzf-vim-2017-03-03";
     src = fetchgit {
-      url = "git://github.com/junegunn/fzf.vim";
-      rev = "dade777e6dad6a318630d7ce26b9761761522c40";
-      sha256 = "0yixz5nr6c6719yfcpci21fhx6kk6wa0213zlkipj8aij2y6ygfy";
+      url = "https://github.com/junegunn/fzf.vim";
+      rev = "87a910a127623db9ba2eae9ec9548db1a5142a0a";
+      sha256 = "05b4slg10h9v19bvb6n8hn706w4zyyz0h8akyzzmjkrm0sv92x6r";
     };
     dependencies = [];
 
@@ -944,7 +911,7 @@ rec {
   limelight-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "limelight-vim-2016-06-24";
     src = fetchgit {
-      url = "git://github.com/junegunn/limelight.vim";
+      url = "https://github.com/junegunn/limelight.vim";
       rev = "106fb5749d227a0de72e36068ed72798c6fd48e6";
       sha256 = "0fp4yp50n5v5zx3a7afh9wip4nwcfhmdgdzwpnl79jvild1z9fgh";
     };
@@ -955,7 +922,7 @@ rec {
   vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-peekaboo-2017-01-13";
     src = fetchgit {
-      url = "git://github.com/junegunn/vim-peekaboo";
+      url = "https://github.com/junegunn/vim-peekaboo";
       rev = "9de6fd70ad20cbf568664c06d673c69e2f622287";
       sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky";
     };
@@ -966,7 +933,7 @@ rec {
   vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-eighties-2016-12-15";
     src = fetchgit {
-      url = "git://github.com/justincampbell/vim-eighties";
+      url = "https://github.com/justincampbell/vim-eighties";
       rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170";
       sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2";
     };
@@ -977,7 +944,7 @@ rec {
   latex-box = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "latex-box-2015-06-01";
     src = fetchgit {
-      url = "git://github.com/latex-box-team/latex-box";
+      url = "https://github.com/latex-box-team/latex-box";
       rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1";
       sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl";
     };
@@ -986,11 +953,11 @@ rec {
   };
 
   typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "typescript-vim-2016-08-10";
+    name = "typescript-vim-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/leafgarland/typescript-vim";
-      rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a";
-      sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk";
+      url = "https://github.com/leafgarland/typescript-vim";
+      rev = "48f92032a446daf2aea64ac5912b26328c3df1ef";
+      sha256 = "1lpqqjl3im96zy8w0iwyvmzcwdijfgji0czbsmi84hx299dpn8n4";
     };
     dependencies = [];
 
@@ -999,7 +966,7 @@ rec {
   vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-jinja-2016-11-16";
     src = fetchgit {
-      url = "git://github.com/lepture/vim-jinja";
+      url = "https://github.com/lepture/vim-jinja";
       rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
       sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
     };
@@ -1008,22 +975,22 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2017-02-09";
+    name = "vimtex-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/lervag/vimtex";
-      rev = "de61b31cf89b6fd4653dc812d779abcf21ed33d0";
-      sha256 = "0cg0l4jm9zfmg7nx0zha5cpv9c9szyj7fmfs19v1r7bzc3dvi492";
+      url = "https://github.com/lervag/vimtex";
+      rev = "75c4ac90f2d254741bad326536d03f382266a150";
+      sha256 = "1l89skr6ifpavximggzyzaw11973ci5gyh48cni07a2m0z26sy07";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2016-12-25";
+    name = "vim-easymotion-2017-03-04";
     src = fetchgit {
-      url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "af9786ee5780bf0cbafbd7b341c2b5234d18c1c0";
-      sha256 = "0f9xc6wz53msq03qivbmqfcfjncba0mrcl4x8vdkzr4chi0yxvbd";
+      url = "https://github.com/lokaltog/vim-easymotion";
+      rev = "19d00afefe5a1b8f6d891ce0b73dcde38c718fdd";
+      sha256 = "1fdfg8i1xllpgjfk52r58ar8pmbcw3gjdzj712d2n0j7mjmphdgs";
     };
     dependencies = [];
 
@@ -1032,7 +999,7 @@ rec {
   vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-lawrencium-2017-01-10";
     src = fetchgit {
-      url = "git://github.com/ludovicchabant/vim-lawrencium";
+      url = "https://github.com/ludovicchabant/vim-lawrencium";
       rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f";
       sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab";
     };
@@ -1043,7 +1010,7 @@ rec {
   rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rainbow-2016-10-28";
     src = fetchgit {
-      url = "git://github.com/luochen1990/rainbow";
+      url = "https://github.com/luochen1990/rainbow";
       rev = "906094f73a46ab4636806541b50c5d4182fa09e1";
       sha256 = "1za2pwv24yiap2655wagyg4yd69g1xqwayazablwj7x1wvqdvd5p";
     };
@@ -1052,11 +1019,11 @@ rec {
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2016-01-31";
+    name = "vim-xkbswitch-2017-02-21";
     src = fetchgit {
-      url = "git://github.com/lyokha/vim-xkbswitch";
-      rev = "89fa3fc16251f2e97281d29ade3ee022ba285003";
-      sha256 = "16wahaz9d6jyqlvmsn764xqircrwaap3pn4fbgmly7vfmdvq4p8b";
+      url = "https://github.com/lyokha/vim-xkbswitch";
+      rev = "0d88988f33b5b100fa14ab8ce93f3950ce6069e5";
+      sha256 = "0bglqbdhgrq9c3dzl6031ar6wzz733ym1af1sahb6h6zky30ij7n";
     };
     dependencies = [];
     patchPhase = ''
@@ -1067,22 +1034,33 @@ rec {
   };
 
   vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-highlightedyank-2017-01-04";
+    name = "vim-highlightedyank-2017-02-22";
     src = fetchgit {
-      url = "git://github.com/machakann/vim-highlightedyank";
-      rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640";
-      sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a";
+      url = "https://github.com/machakann/vim-highlightedyank";
+      rev = "db9b1e89af6dcbc56f84db980009915cac303fb8";
+      sha256 = "05l7q7l3zbk2lssgs52srk65b53frmxw0rpnv5dma7c2mjxcn9gn";
     };
     dependencies = [];
 
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2017-02-04";
+    name = "vim-startify-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/mhinz/vim-startify";
-      rev = "5e9e6a48c992d9255a3be2f96765c9bb80faae97";
-      sha256 = "1gnpg59i81hwhqva5grjd4f5lnjaclwwra58sgv30mrxkjg4d741";
+      url = "https://github.com/mhinz/vim-startify";
+      rev = "a16e94e6879d8cb5443ebd79ec53883489f46b55";
+      sha256 = "14c179wrh9aw4lwr2b88y6cjxj7x6jyl8kk4fqwzv1h5zqh48fk6";
+    };
+    dependencies = [];
+
+  };
+
+  vim-indent-object = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-indent-object-2015-08-11";
+    src = fetchgit {
+      url = "https://github.com/michaeljsmith/vim-indent-object";
+      rev = "1d3e4aac0117d57c3e1aaaa7e5a99f1d7553e01b";
+      sha256 = "1xxl5pwbz56qjfxw6l686m1qc4a3q0r7afa9r5gjhgd1jy67z7d7";
     };
     dependencies = [];
 
@@ -1091,7 +1069,7 @@ rec {
   lushtags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "lushtags-2016-10-12";
     src = fetchgit {
-      url = "git://github.com/mkasa/lushtags";
+      url = "https://github.com/mkasa/lushtags";
       rev = "ef6410cd66c6729e6f4795222bdc0e406251f27a";
       sha256 = "094cl57zfqjq7gpv4151zxipb6kd1czwx4nv6x8wsl3n0z4p3jkx";
     };
@@ -1102,7 +1080,7 @@ rec {
   hlint-refactor-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hlint-refactor-vim-2015-12-05";
     src = fetchgit {
-      url = "git://github.com/mpickering/hlint-refactor-vim";
+      url = "https://github.com/mpickering/hlint-refactor-vim";
       rev = "fffb044ecef854a82c5c2efda252e09044ba03e0";
       sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8";
     };
@@ -1113,7 +1091,7 @@ rec {
   vim-indent-guides = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-indent-guides-2016-04-17";
     src = fetchgit {
-      url = "git://github.com/nathanaelkane/vim-indent-guides";
+      url = "https://github.com/nathanaelkane/vim-indent-guides";
       rev = "018298ead9d3aa9cd3b4ae222f81022a33978b09";
       sha256 = "0zyrs9r3vza2kqhqir6qpkygy6yljpn877bvycspv89ljzczmwrs";
     };
@@ -1124,7 +1102,7 @@ rec {
   vim-stylish-haskell = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-stylish-haskell-2015-05-10";
     src = fetchgit {
-      url = "git://github.com/nbouscal/vim-stylish-haskell";
+      url = "https://github.com/nbouscal/vim-stylish-haskell";
       rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
       sha256 = "1xm5ark2mwphznv3xsyzgcldnr52i5jzk1pfqdh0080j07aama8j";
     };
@@ -1133,11 +1111,11 @@ rec {
   };
 
   haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "haskell-vim-2017-02-08";
+    name = "haskell-vim-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/neovimhaskell/haskell-vim";
-      rev = "c07c2b63f393252412b9c65726f2693bcacef71b";
-      sha256 = "09xcsh3411l1wj7w0cwalcpd26rdw4k9idd2mclywrzlrlfddl9b";
+      url = "https://github.com/neovimhaskell/haskell-vim";
+      rev = "5009c37a0f005aee164f8aaf2e99c57abf7a3402";
+      sha256 = "1i2ahm0sikdybhkhmijwcmcsq86bf29jpac6mh3jh0iimimrgwi7";
     };
     dependencies = [];
 
@@ -1146,7 +1124,7 @@ rec {
   cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "cpsm-2017-02-12";
     src = fetchgit {
-      url = "git://github.com/nixprime/cpsm";
+      url = "https://github.com/nixprime/cpsm";
       rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c";
       sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs";
     };
@@ -1168,7 +1146,7 @@ rec {
   shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "shabadou-vim-2016-07-19";
     src = fetchgit {
-      url = "git://github.com/osyo-manga/shabadou.vim";
+      url = "https://github.com/osyo-manga/shabadou.vim";
       rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1";
       sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870";
     };
@@ -1179,7 +1157,7 @@ rec {
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-watchdogs-2016-11-14";
     src = fetchgit {
-      url = "git://github.com/osyo-manga/vim-watchdogs";
+      url = "https://github.com/osyo-manga/vim-watchdogs";
       rev = "455a61a34e6f2f82fda7e6de0fc14fc740a11764";
       sha256 = "05mqphn2l3f0sa86xq5iw1gmm8l1x8ri26kiw6w40hvdc22xkak5";
     };
@@ -1190,7 +1168,7 @@ rec {
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-markdown-2017-02-02";
     src = fetchgit {
-      url = "git://github.com/plasticboy/vim-markdown";
+      url = "https://github.com/plasticboy/vim-markdown";
       rev = "d6d59eef6f604b6430fd6adade9e18364666232b";
       sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6";
     };
@@ -1201,7 +1179,7 @@ rec {
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-racer-2017-02-08";
     src = fetchgit {
-      url = "git://github.com/racer-rust/vim-racer";
+      url = "https://github.com/racer-rust/vim-racer";
       rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e";
       sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd";
     };
@@ -1212,7 +1190,7 @@ rec {
   purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "purescript-vim-2016-08-31";
     src = fetchgit {
-      url = "git://github.com/raichoo/purescript-vim";
+      url = "https://github.com/raichoo/purescript-vim";
       rev = "2c55bcefd63bc40ed2aa9d6ce9d89a590dfa3477";
       sha256 = "1y96w8p865gd6zr29wpxn1qwsk833y06x1qp586gylgi0jp1ybzv";
     };
@@ -1221,11 +1199,11 @@ rec {
   };
 
   vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-grammarous-2017-02-12";
+    name = "vim-grammarous-2017-02-24";
     src = fetchgit {
-      url = "git://github.com/rhysd/vim-grammarous";
-      rev = "3e096ed4d5b702167470f771ba2a40b31949dddf";
-      sha256 = "0lxfy6gilcpjjypgpmw37hy3gk27bf51vggjkkrh3270xwxkmqj0";
+      url = "https://github.com/rhysd/vim-grammarous";
+      rev = "74a88d233056ac63ef65b3dd6766494ec33e6f2e";
+      sha256 = "0av6j1i0kf1gdvj19n9mdaxkxhb6dkbl7yia81sw6j2mkdzka3jc";
     };
     dependencies = [];
 
@@ -1234,7 +1212,7 @@ rec {
   rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "rust-vim-2017-01-01";
     src = fetchgit {
-      url = "git://github.com/rust-lang/rust.vim";
+      url = "https://github.com/rust-lang/rust.vim";
       rev = "732b5fcb3652f81726d5f0f5b97c9027c01f057a";
       sha256 = "0yrg0wlpc9nj5zf25vgr9zd1kwapds3f10njr0dw0wgxr7g204dz";
     };
@@ -1243,11 +1221,11 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2017-02-11";
+    name = "neoformat-2017-03-01";
     src = fetchgit {
-      url = "git://github.com/sbdchd/neoformat";
-      rev = "21117552efdc3fa8bac0d6977a30ba247c20e67b";
-      sha256 = "09mrfbzpqi0kk39f9k76nmwq2b5pr0pvrdak9p13774kxm76gwvm";
+      url = "https://github.com/sbdchd/neoformat";
+      rev = "c59748c706b15cfae891772c4e17a31f396c8ffb";
+      sha256 = "0awb1f7ham13rwsg88q356lczblb23kxq194j8h19jmjjbb1lv7p";
     };
     dependencies = [];
 
@@ -1256,7 +1234,7 @@ rec {
   vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-polyglot-2017-02-02";
     src = fetchgit {
-      url = "git://github.com/sheerun/vim-polyglot";
+      url = "https://github.com/sheerun/vim-polyglot";
       rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb";
       sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny";
     };
@@ -1267,7 +1245,7 @@ rec {
   neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neco-vim-2017-01-16";
     src = fetchgit {
-      url = "git://github.com/shougo/neco-vim";
+      url = "https://github.com/shougo/neco-vim";
       rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa";
       sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3";
     };
@@ -1278,7 +1256,7 @@ rec {
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neocomplete-vim-2017-01-08";
     src = fetchgit {
-      url = "git://github.com/shougo/neocomplete.vim";
+      url = "https://github.com/shougo/neocomplete.vim";
       rev = "9617d825c0d4acdb18aec903e9c1c0443058d18b";
       sha256 = "0a6mhh0ylzgjddlnwqaa5zq4abpv2dhhw7wv7w9lmwa82w31j5ya";
     };
@@ -1289,7 +1267,7 @@ rec {
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "neosnippet-snippets-2017-01-24";
     src = fetchgit {
-      url = "git://github.com/shougo/neosnippet-snippets";
+      url = "https://github.com/shougo/neosnippet-snippets";
       rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a";
       sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6";
     };
@@ -1298,11 +1276,11 @@ rec {
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2017-02-09";
+    name = "neosnippet-vim-2017-02-13";
     src = fetchgit {
-      url = "git://github.com/shougo/neosnippet.vim";
-      rev = "db828325268ca28c17674bd876b40be895daa27e";
-      sha256 = "1l3zxxj90341slf0k6hprjgjy4slsajbc95v4l46bchcsyxsrh3i";
+      url = "https://github.com/shougo/neosnippet.vim";
+      rev = "1bd7e23c79b73da16eb0c9469b25c376d3594583";
+      sha256 = "0k80syscmpnj38ks1fq02ds59g0r4jlg9ll7z4qc048mgi35alw5";
     };
     dependencies = [];
 
@@ -1311,7 +1289,7 @@ rec {
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "unite-vim-2017-02-10";
     src = fetchgit {
-      url = "git://github.com/shougo/unite.vim";
+      url = "https://github.com/shougo/unite.vim";
       rev = "97e634117ff05d3c867d625940da5c7947cebf63";
       sha256 = "1qc7k5n7whw5z78czhi363fbllj9znz1gqlps096aiwhapfv3m1z";
     };
@@ -1322,7 +1300,7 @@ rec {
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vimproc-vim-2016-08-06";
     src = fetchgit {
-      url = "git://github.com/shougo/vimproc.vim";
+      url = "https://github.com/shougo/vimproc.vim";
       rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0";
       sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20";
     };
@@ -1341,17 +1319,18 @@ rec {
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vimshell-vim-2016-12-14";
     src = fetchgit {
-      url = "git://github.com/shougo/vimshell.vim";
+      url = "https://github.com/shougo/vimshell.vim";
       rev = "d0c5bef010237855b4de25863bc54895effe5d7a";
       sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz";
     };
     dependencies = [ "vimproc-vim" ];
+
   };
 
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "gundo-vim-2016-12-16";
     src = fetchgit {
-      url = "git://github.com/sjl/gundo.vim";
+      url = "https://github.com/sjl/gundo.vim";
       rev = "b4f3624d01ffdfd7bdcd2e19128fffe768fe6262";
       sha256 = "0a18z3yc2fmpaymzlyjkjblxxkjvn83yh64rvidr3nzg262applz";
     };
@@ -1360,11 +1339,11 @@ rec {
   };
 
   alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "alchemist-vim-2017-01-24";
+    name = "alchemist-vim-2017-02-24";
     src = fetchgit {
-      url = "git://github.com/slashmili/alchemist.vim";
-      rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4";
-      sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf";
+      url = "https://github.com/slashmili/alchemist.vim";
+      rev = "31c13df87ed13428f8070718cea8a3ade4c37c99";
+      sha256 = "0c485zgrg997waf7jrw1qyzw8903yc4p5y5d7skn2irn66dl0388";
     };
     dependencies = [];
 
@@ -1373,7 +1352,7 @@ rec {
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-hardtime-2016-12-19";
     src = fetchgit {
-      url = "git://github.com/takac/vim-hardtime";
+      url = "https://github.com/takac/vim-hardtime";
       rev = "0551f0836d311fae408fb1dc73e0c09cdfa3661b";
       sha256 = "1izyx3dnds1hdhjk16578cdda72mnhbsrdz2klm0dygfvfq9h7x4";
     };
@@ -1384,7 +1363,7 @@ rec {
   vim-expand-region = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-expand-region-2013-08-19";
     src = fetchgit {
-      url = "git://github.com/terryma/vim-expand-region";
+      url = "https://github.com/terryma/vim-expand-region";
       rev = "966513543de0ddc2d673b5528a056269e7917276";
       sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv";
     };
@@ -1395,7 +1374,7 @@ rec {
   vimpreviewpandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vimpreviewpandoc-2016-03-07";
     src = fetchgit {
-      url = "git://github.com/tex/vimpreviewpandoc";
+      url = "https://github.com/tex/vimpreviewpandoc";
       rev = "b109d41ad6478df5ec7f1311950c6efca66f36e4";
       sha256 = "1gx326xarjs3qjygpkrknncad90crjqfx8v6pir4r7k1hl7dfxc4";
     };
@@ -1406,7 +1385,7 @@ rec {
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-quickrun-2017-01-22";
     src = fetchgit {
-      url = "git://github.com/thinca/vim-quickrun";
+      url = "https://github.com/thinca/vim-quickrun";
       rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2";
       sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv";
     };
@@ -1417,7 +1396,7 @@ rec {
   molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "molokai-2015-11-11";
     src = fetchgit {
-      url = "git://github.com/tomasr/molokai";
+      url = "https://github.com/tomasr/molokai";
       rev = "c67bdfcdb31415aa0ade7f8c003261700a885476";
       sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s";
     };
@@ -1428,7 +1407,7 @@ rec {
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-eunuch-2016-09-07";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-eunuch";
+      url = "https://github.com/tpope/vim-eunuch";
       rev = "7eeb681ff3caedc1c01e50966bc293951f7b3e21";
       sha256 = "0hk4p1qjmplddmwrpp6b2x776z1298pkcgp855kgigib53w5srmc";
     };
@@ -1439,7 +1418,7 @@ rec {
   vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-repeat-2015-05-09";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-repeat";
+      url = "https://github.com/tpope/vim-repeat";
       rev = "7a6675f092842c8f81e71d5345bd7cdbf3759415";
       sha256 = "0p8g5y3vyl1765lj1r8jpc06l465f9bagivq6k8ndajbg049brl7";
     };
@@ -1450,7 +1429,7 @@ rec {
   vim-speeddating = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-speeddating-2015-01-24";
     src = fetchgit {
-      url = "git://github.com/tpope/vim-speeddating";
+      url = "https://github.com/tpope/vim-speeddating";
       rev = "426c792e479f6e1650a6996c683943a09344c21e";
       sha256 = "1i8pndds1lk5afxl6nwsnl4vzszh0qxgqx7x11fp3vqw27c5bwn8";
     };
@@ -1461,7 +1440,7 @@ rec {
   hasksyn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "hasksyn-2014-09-03";
     src = fetchgit {
-      url = "git://github.com/travitch/hasksyn";
+      url = "https://github.com/travitch/hasksyn";
       rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
       sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx";
     };
@@ -1472,7 +1451,7 @@ rec {
   vim-haskellconceal = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-haskellconceal-2014-10-28";
     src = fetchgit {
-      url = "git://github.com/twinside/vim-haskellconceal";
+      url = "https://github.com/twinside/vim-haskellconceal";
       rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9";
       sha256 = "1a1v0m3qj0gian3mp5xynf2ghscr3xaid37b0wi38bb4f2qrigqy";
     };
@@ -1481,11 +1460,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2017-02-11";
+    name = "youcompleteme-2017-02-27";
     src = fetchgit {
-      url = "git://github.com/valloric/youcompleteme";
-      rev = "1d1a4f4cff04ed32ab924dda20666e67eabdefb4";
-      sha256 = "12xz019jrvr6wgjbp0w052awpmhwbpkwy6j7v0f0ldx242rv9sr8";
+      url = "https://github.com/valloric/youcompleteme";
+      rev = "39659caf34c664c7419cadb41cb813158e0749fa";
+      sha256 = "0rl8fxcwcj61bj8b2qcnwfipcnf1nb47bvb52sv68sf9v78qa7sx";
     };
     dependencies = [];
     buildPhase = ''
@@ -1507,22 +1486,22 @@ rec {
   };
 
   vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-themes-2016-12-31";
+    name = "vim-airline-themes-2017-02-26";
     src = fetchgit {
-      url = "git://github.com/vim-airline/vim-airline-themes";
-      rev = "6026eb78bf362cb3aa875aff8487f65728d0f7d8";
-      sha256 = "13ijkavh1r0935cn2rjsfbdd1q3ka8bi26kw0bdkrqlrqxwvpss8";
+      url = "https://github.com/vim-airline/vim-airline-themes";
+      rev = "205f6964be55d17c908baaf89066928090b02729";
+      sha256 = "0cz39gxmrsnv9r72ymyzjwlgdi2x0dxxibwvlwp6zwdwws4l3fw8";
     };
     dependencies = [];
 
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2017-02-07";
+    name = "vim-pandoc-2017-02-20";
     src = fetchgit {
-      url = "git://github.com/vim-pandoc/vim-pandoc";
-      rev = "32ebfb105cf86b191b72e6c9aaf8d6230d05684c";
-      sha256 = "0k79bj9lb65w5nxsb226bf3r0ppqh9p9g8yigbs0qgfx8aidwnsw";
+      url = "https://github.com/vim-pandoc/vim-pandoc";
+      rev = "15873af56c3c15ebd5431983741c399097fb61de";
+      sha256 = "08h1bmrjv8bjywz1fj2rjnmmwrlpdl1lv1gz5msdy817n5lf1xh2";
     };
     dependencies = [];
 
@@ -1531,7 +1510,7 @@ rec {
   vim-pandoc-after = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-pandoc-after-2015-06-01";
     src = fetchgit {
-      url = "git://github.com/vim-pandoc/vim-pandoc-after";
+      url = "https://github.com/vim-pandoc/vim-pandoc-after";
       rev = "4377665e5c98f29ea838deb3b942200b8dd096ef";
       sha256 = "1379g174pvsaw1wdv1n18gby84sv59rsamfcgq9bqd4kg54g6h3j";
     };
@@ -1540,11 +1519,11 @@ rec {
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2017-01-19";
+    name = "vim-pandoc-syntax-2017-02-22";
     src = fetchgit {
-      url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "89341527b2bde3fbd473f5677e1df09072c319b5";
-      sha256 = "106h40vbcgap4jqqwcc6k01q65ss8r99594g6144kacnk0jixg52";
+      url = "https://github.com/vim-pandoc/vim-pandoc-syntax";
+      rev = "2e7420ba617da6aa6acc221c41fbea44783eb585";
+      sha256 = "0k964jsr9v8nz1w2d8qy6rv66110ga6hllbp5zcrfw7j62cgmvn7";
     };
     dependencies = [];
 
@@ -1553,7 +1532,7 @@ rec {
   Colour-Sampler-Pack = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Colour-Sampler-Pack-2012-11-29";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/Colour-Sampler-Pack";
+      url = "https://github.com/vim-scripts/Colour-Sampler-Pack";
       rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
       sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
     };
@@ -1564,7 +1543,7 @@ rec {
   Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "Rename-2011-08-30";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/Rename";
+      url = "https://github.com/vim-scripts/Rename";
       rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34";
       sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r";
     };
@@ -1575,7 +1554,7 @@ rec {
   a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "a-vim-2010-11-06";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/a.vim";
+      url = "https://github.com/vim-scripts/a.vim";
       rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
       sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
     };
@@ -1586,7 +1565,7 @@ rec {
   align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "align-2012-08-07";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/align";
+      url = "https://github.com/vim-scripts/align";
       rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
       sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp";
     };
@@ -1594,10 +1573,21 @@ rec {
 
   };
 
+  argtextobj-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "argtextobj-vim-2010-10-17";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/argtextobj.vim";
+      rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b";
+      sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48";
+    };
+    dependencies = [];
+
+  };
+
   changeColorScheme-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "changeColorScheme-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/changeColorScheme.vim";
+      url = "https://github.com/vim-scripts/changeColorScheme.vim";
       rev = "b041d49f828629d72f2232531a230d1ec5de2405";
       sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09";
     };
@@ -1608,7 +1598,7 @@ rec {
   random-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "random-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/random.vim";
+      url = "https://github.com/vim-scripts/random.vim";
       rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
       sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp";
     };
@@ -1619,7 +1609,7 @@ rec {
   tabmerge = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "tabmerge-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/tabmerge";
+      url = "https://github.com/vim-scripts/tabmerge";
       rev = "074e5f06f26e7108a0570071a0f938a821768c06";
       sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq";
     };
@@ -1630,7 +1620,7 @@ rec {
   wombat256-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "wombat256-vim-2010-10-17";
     src = fetchgit {
-      url = "git://github.com/vim-scripts/wombat256.vim";
+      url = "https://github.com/vim-scripts/wombat256.vim";
       rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
       sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg";
     };
@@ -1639,22 +1629,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2017-02-08";
+    name = "vim-wakatime-2017-03-01";
     src = fetchgit {
-      url = "git://github.com/wakatime/vim-wakatime";
-      rev = "3d343f656521ef0521a3277b81e4cd9af8be671a";
-      sha256 = "0xr6q39a20121kkscjpz1bly9j0z3lbzwj34gl3msba91mv1glb1";
+      url = "https://github.com/wakatime/vim-wakatime";
+      rev = "a7be16c948bc4975d83c07c7bf25206953b79b22";
+      sha256 = "0lnng566bw4462xg3i4qjbqvnkxmg2m33368nllapb1yj0x735c9";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2017-01-08";
+    name = "command-t-2017-03-02";
     src = fetchgit {
-      url = "git://github.com/wincent/command-t";
-      rev = "ce9daf8d792c945d32d0bf8878149eaa8aee2b81";
-      sha256 = "13ylc9bwf5qxsc8i62ppbcr446m35iyp243293ahn7xdrlnv2f9g";
+      url = "https://github.com/wincent/command-t";
+      rev = "5a19460ea0eab0ca617a8dbf405f7a506eca4ff6";
+      sha256 = "0vzw5cvlsw0cs2jp52qbc7nghw4jsbldrbkynbx8g7nrh36847my";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1669,7 +1659,7 @@ rec {
   vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-easytags-2015-07-01";
     src = fetchgit {
-      url = "git://github.com/xolox/vim-easytags";
+      url = "https://github.com/xolox/vim-easytags";
       rev = "72a8753b5d0a951e547c51b13633f680a95b5483";
       sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i";
     };
@@ -1677,15 +1667,26 @@ rec {
 
   };
 
-  deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-go-2017-02-10";
+  vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-misc-2015-05-21";
     src = fetchgit {
-      url = "git://github.com/zchee/deoplete-go";
-      rev = "85a9c1847aa76e13e0e6e59e9694927281f3f15a";
-      sha256 = "0i0hfkr7xnm8v8rz2788xvz65yrwhw6i2sin17hymkfwscjdds86";
+      url = "https://github.com/xolox/vim-misc";
+      rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b";
+      sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi";
     };
     dependencies = [];
-    buildInputs = [ python3 ];
+
+  };
+
+  deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "deoplete-go-2017-02-13";
+    src = fetchgit {
+      url = "https://github.com/zchee/deoplete-go";
+      rev = "9c2d57710f022ea5fe3b0428e6635a3de77bcf9e";
+      sha256 = "0rl211rmnzwribzpqxfg99lsyln2x1i8ygyz8b9jy804fm5i24f3";
+    };
+    dependencies = [];
+    buildInputs = [ python3 ]; 
     buildPhase = ''
       pushd ./rplugin/python3/deoplete/ujson
       python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build
@@ -1695,11 +1696,11 @@ rec {
   };
 
   deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "deoplete-jedi-2017-01-16";
+    name = "deoplete-jedi-2017-02-17";
     src = fetchgit {
-      url = "git://github.com/zchee/deoplete-jedi";
-      rev = "6240de812f06263524f46379ad08a0d3d539730f";
-      sha256 = "00hn00dv7klywqv14zhicsa0gd9iiv5va155ayr6mpj74p9lp2a1";
+      url = "https://github.com/zchee/deoplete-jedi";
+      rev = "a4dd511535a6fe06717a7bd2d680b9b87ade595d";
+      sha256 = "03wwqk4r2rm5yjxqw2f4302lknb9a10yfpw4b0vyr40zch6jascr";
     };
     dependencies = [];
 
@@ -1750,11 +1751,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2016-10-13";
+    name = "pathogen-2017-02-13";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "7ba2e1b67a8f8bcbafedaf6763580390dfd93436";
-      sha256 = "1g15wzyw9b93n3icwpscx4b4qkn23snbmqjqp867ba0w0z3h6hpv";
+      rev = "020ab25c38f62627c1dab6c7a851176c6ad309f9";
+      sha256 = "19cdb9ach89jx0y9kpz39d41dzq5dfy5l83v8l57jxjq1s4wry55";
     };
     dependencies = [];
 
@@ -1870,11 +1871,11 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2016-08-07";
+    name = "tlib-2017-03-03";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "8c74564396e368788a5cb901b0e8017a3166cee9";
-      sha256 = "15bh6q8g7p1giz2lybqhdf7a7xisqwpr751gprqx3vmh97drry5z";
+      rev = "b80c8f0f932ffaf9078f6998fe422cfbc7b95178";
+      sha256 = "177phwdhfckhc4bm4xv1db8lxrvsi8lvv7n3c1j03w2r8f9h8pj8";
     };
     dependencies = [];
 
@@ -2101,22 +2102,22 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2017-02-11";
+    name = "vim-airline-2017-02-28";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "b66c1ef07005fad6a70957b90d4f47bb932e33e2";
-      sha256 = "0y8adl6dl7c501na2k2j38cs200ykm6pjva19xshiv0h2f916l2b";
+      rev = "fbd791e7f0431e18b987a2a8937a4c3d34dd2125";
+      sha256 = "15m4wdvx4x8m43x5z08sbw74i1l7vwj0qljsgs7jn36yc9453sn7";
     };
     dependencies = [];
 
   };
 
   vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-coffee-script-2016-12-27";
+    name = "vim-coffee-script-2017-03-02";
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
-      rev = "72f48c3f9bb6ba4f9ba1e6e4933c2c25686a1b62";
-      sha256 = "07qamx2jv5418ya1c1hca3qvnfvw78r15iakgh0kljajzdq3yy0b";
+      rev = "1eddf182ba28d4e695fe1dbcae5b5b029218cb44";
+      sha256 = "1s9idnbj3613ldgrysp4iscd1xnrfdcgdhygfzhhsv0a0lrm40xa";
     };
     dependencies = [];
 
@@ -2134,22 +2135,22 @@ rec {
   };
 
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2016-09-21";
+    name = "vim-gista-2017-02-20";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
-      rev = "8f27e74bd1f8edb3ca5711864b34cb4c526d9947";
-      sha256 = "0zymx6ww6yc9h06k373z7mbv07jmi66zv1cm15ip2qnik1nr80p7";
+      rev = "b6cd41d0eb480cd79e84f3da3703613d0cf94a6c";
+      sha256 = "0bkzbppd3jdci4yvifb4sh05q20qn8cr3j9kqhxyc703s0l0lk2s";
     };
     dependencies = [];
 
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2017-02-06";
+    name = "vim-gitgutter-2017-02-22";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143";
-      sha256 = "19iz6k1wb8jy51lpr8pwp3fy80ww4sw6n6mp56lw59n8227gffc1";
+      rev = "1c034be0d31168c8f4770ef7b69adb67d00d6f3d";
+      sha256 = "1wj084frahj80h1nkllmpf0qj06d96a5m5qclnd3fc2aqclcimx0";
     };
     dependencies = [];
 
@@ -2200,33 +2201,33 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2017-02-10";
+    name = "vim-signify-2017-03-02";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "a2c28f654087735a276ec7c1f558b782db5488a5";
-      sha256 = "0zhm26d5s68gcj1lmw866m0gcfss46mr4z79zggiara83x5abbxp";
+      rev = "b4c516cd63f04c08bfc6a8eb27a971702d849f33";
+      sha256 = "108vlkrv00b6ldj4r972k3z2a3dfcs1z4788dhnx81k25rax42k4";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2017-02-07";
+    name = "vim-snippets-2017-03-01";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "b8c340daf084f243a487f8853a0984504909dfda";
-      sha256 = "1173hck15aijhvh00rjdsyiv21ax6hp9h7w2yph514zi9mhzgg8q";
+      rev = "9a2379be7698ff83985eebb394b7a9f99560a77f";
+      sha256 = "0c7gicl9m05m7wb846vbd1i7ginkm5k4rvcvcvhc9x7krn5qg64q";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2016-12-10";
+    name = "vim-webdevicons-2017-02-25";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "93387d7fba06f8ba7ee52dc00d08919f8a35341d";
-      sha256 = "1zxw0mbb5a54kc31qfwi1d9gylagsa9jnbsfghnsminx32ch8jcd";
+      rev = "d246037d0da70d80be9699487a95f913316a4c76";
+      sha256 = "0bps527fhhgp06yswxx6rdmrycckm4hzacmrwzll85xg8cqcjwh2";
     };
     dependencies = [];
 
@@ -2244,11 +2245,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2017-01-30";
+    name = "vimwiki-2017-03-01";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "be79f68a9292cbe53d330cb37fd18d835e8f74d4";
-      sha256 = "0n43vaxh90v5wbgqld61bwlhzr11s0c72dgrp0cirj7ri7xajq8z";
+      rev = "56cb06e73e9850e60b6eb53bad8bb98ded1ab872";
+      sha256 = "1s9nppmgkr5v6ljc918qivlyzp491vnyn3cc4k3cqd1ly2ymxv48";
     };
     dependencies = [];
 
@@ -2266,11 +2267,11 @@ rec {
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2016-10-22";
+    name = "vundle-2017-02-24";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "88688fe453038ac1ac26e31646cfbec50fca2fb7";
-      sha256 = "1i46xjn0zklcrdp4yf856jpl7lwf14x4y67qhnc41q12rcvimvr5";
+      rev = "f6cc06238d5ac888ddfc514f80392f44cb2e21ac";
+      sha256 = "00qd5nalac7q83dx779547s6dwn952adj2w3j1sgdgaybjwmsrl2";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b12983b4bc09..554ad5e3bd6d 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -131,6 +131,7 @@
 "github:wakatime/vim-wakatime"
 "github:wincent/command-t"
 "github:xolox/vim-easytags"
+"github:xolox/vim-misc"
 "github:zchee/deoplete-jedi"
 "github:zchee/deoplete-go"
 "goyo"

From 5262f5e3a2794719b0db1c57b514395a5176f560 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 4 Mar 2017 00:15:26 +0100
Subject: [PATCH 1654/3449] vim-plugins: add some more plugins

---
 pkgs/misc/vim-plugins/default.nix      | 44 ++++++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  4 +++
 2 files changed, 48 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b9b318cfb960..2686138bc930 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -501,6 +501,17 @@ rec {
 
   };
 
+  vim-sort-motion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-sort-motion-2017-01-28";
+    src = fetchgit {
+      url = "https://github.com/christoomey/vim-sort-motion";
+      rev = "dab96e1f4100a559c58f1d0d8e5e400057479f6b";
+      sha256 = "0p8p8nn0q62xm6sc36rwn3dknyk0wpjya21iy9y721vbz1s0l8x7";
+    };
+    dependencies = [];
+
+  };
+
   vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-tmux-navigator-2017-02-26";
     src = fetchgit {
@@ -1176,6 +1187,17 @@ rec {
 
   };
 
+  python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "python-mode-2017-02-06";
+    src = fetchgit {
+      url = "https://github.com/python-mode/python-mode";
+      rev = "d113cffc3f7a48564aeb568e1c7a6f5312ff09f5";
+      sha256 = "1gn74cj629q00ar3z0c1dlngn31jr4lv04bwi2npzinn7rpf8nj6";
+    };
+    dependencies = [];
+
+  };
+
   vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-racer-2017-02-08";
     src = fetchgit {
@@ -1404,6 +1426,17 @@ rec {
 
   };
 
+  vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-dispatch-2016-08-30";
+    src = fetchgit {
+      url = "https://github.com/tpope/vim-dispatch";
+      rev = "a54f2c5e18b8c2aad8c6f8ba474760e70fdaaca3";
+      sha256 = "18z1hkr3qrgj9j0kr0q3i5vq27dpkjhsm3mqyssi6k5v0iyw49dk";
+    };
+    dependencies = [];
+
+  };
+
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-eunuch-2016-09-07";
     src = fetchgit {
@@ -1551,6 +1584,17 @@ rec {
 
   };
 
+  ReplaceWithRegister = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "ReplaceWithRegister-2014-10-30";
+    src = fetchgit {
+      url = "https://github.com/vim-scripts/ReplaceWithRegister";
+      rev = "832efc23111d19591d495dc72286de2fb0b09345";
+      sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g";
+    };
+    dependencies = [];
+
+  };
+
   a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "a-vim-2010-11-06";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 554ad5e3bd6d..f5f3f9556577 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:christoomey/vim-sort-motion"
 "github:christoomey/vim-tmux-navigator"
 "github:ctjhoa/spacevim"
 "github:ctrlpvim/ctrlp.vim"
@@ -89,6 +90,7 @@
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
 "github:plasticboy/vim-markdown"
+"github:python-mode/python-mode"
 "github:racer-rust/vim-racer"
 "github:raichoo/purescript-vim"
 "github:rhysd/vim-grammarous"
@@ -109,6 +111,7 @@
 "github:tex/vimpreviewpandoc"
 "github:thinca/vim-quickrun"
 "github:tomasr/molokai"
+"github:tpope/vim-dispatch"
 "github:tpope/vim-eunuch"
 "github:tpope/vim-repeat"
 "github:tpope/vim-speeddating"
@@ -121,6 +124,7 @@
 "github:vim-pandoc/vim-pandoc-syntax"
 "github:vim-scripts/Colour-Sampler-Pack"
 "github:vim-scripts/Rename"
+"github:vim-scripts/ReplaceWithRegister"
 "github:vim-scripts/a.vim"
 "github:vim-scripts/argtextobj.vim"
 "github:vim-scripts/align"

From 0e2bd7e248974cd48961a24c831a39078c1d44b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 1 Mar 2017 11:22:34 +0100
Subject: [PATCH 1655/3449] openldap module: fix paths for example includes

---
 nixos/modules/services/databases/openldap.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index b8e6c0cec3dc..d76859bf3eb6 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -68,10 +68,10 @@ in
         ";
         example = literalExample ''
             '''
-            include ${pkgs.openldap.out}/etc/openldap/schema/core.schema
-            include ${pkgs.openldap.out}/etc/openldap/schema/cosine.schema
-            include ${pkgs.openldap.out}/etc/openldap/schema/inetorgperson.schema
-            include ${pkgs.openldap.out}/etc/openldap/schema/nis.schema
+            include ${pkgs.openldap.out}/etc/schema/core.schema
+            include ${pkgs.openldap.out}/etc/schema/cosine.schema
+            include ${pkgs.openldap.out}/etc/schema/inetorgperson.schema
+            include ${pkgs.openldap.out}/etc/schema/nis.schema
 
             database bdb 
             suffix dc=example,dc=org 

From 7a9881de6196ffe3f1e31d85d98be53672b93508 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 14:03:24 +0100
Subject: [PATCH 1656/3449] haskell-diagrams-lib: test suite fails on i686

(cherry picked from commit 3e3dfdd085f17fec5e94d29a63e4bc898a4c4a79)
---
 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 dd5d42b8a9f7..0e7075a45d97 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -873,4 +873,7 @@ self: super: {
   # https://github.com/snoyberg/yaml/issues/106
   yaml = disableCabalFlag super.yaml "system-libyaml";
 
+  # https://github.com/diagrams/diagrams-lib/issues/288
+  diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });
+
 }

From e47a0ae7675e39cbb96332d199951ec2c3102f48 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 14:11:06 +0100
Subject: [PATCH 1657/3449] haskell-arithmoi: test suite fails on i686

(cherry picked from commit cb1af9fd4f2d9c850a3d643133e72277371d3427)
---
 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 0e7075a45d97..8811a7b093ab 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -876,4 +876,7 @@ 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; });
+
 }

From dc2bf68d7b72cd9655931923ac1b07bd04e1c676 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 4 Mar 2017 14:29:10 +0100
Subject: [PATCH 1658/3449] pythonPackages.sympy: 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 1d605d4fe4f3..a72d27a4705f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24190,6 +24190,9 @@ in {
 
     propagatedBuildInputs = with self; [ mpmath ];
 
+    # Bunch of failures including transients.
+    doCheck = false;
+
     preCheck = ''
       export LANG="en_US.UTF-8"
     '';

From 6011e3ea93e78e45dc2cb6cdf63afeb516670681 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 4 Mar 2017 08:47:07 -0500
Subject: [PATCH 1659/3449] jitsi: 2.8.5426 -> 2.10.5550 for CVE-2017-5603

---
 .../networking/instant-messengers/jitsi/default.nix    |  4 ++--
 .../networking/instant-messengers/jitsi/jitsi.patch    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index ee05f16a8f4f..30fedec1a4bb 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -8,11 +8,11 @@ assert stdenv.isLinux;
 stdenv.mkDerivation rec {
 
   name = "jitsi-${version}";
-  version = "2.8.5426";
+  version = "2.10.5550";
 
   src = fetchurl {
     url = "https://download.jitsi.org/jitsi/src/jitsi-src-${version}.zip";
-    sha256 = "0v7k16in2i57z5amr7k5c3fc8f0azrzrs5dvn729bwbc31z8cjg6";
+    sha256 = "11vjchc3dnzj55x7c62wsm6masvwmij1ifkds917r1qvil1nzz6d";
   };
 
 
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
index 9db7ec368b08..e477bdfe2fd4 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
+++ b/pkgs/applications/networking/instant-messengers/jitsi/jitsi.patch
@@ -8,20 +8,20 @@
 +#mkdir -p $HOME/.sip-communicator/log
 +
 +cd "$(dirname "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
- 
+
  # Get architecture
  ARCH=`uname -m | sed -e s/x86_64/64/ -e s/i.86/32/`
-@@ -6,10 +11,12 @@
+@@ -6,7 +11,9 @@
  # Additionnal JVM arguments
  CLIENTARGS=""
- 
+
 +NATIVELIBS="lib/native/linux-64"
- if [ $ARCH -eq 32 ]
+ if [ $ARCH = 32 ]
  then
      CLIENTARGS="-client -Xmx256m"
 +    NATIVELIBS="lib/native/linux"
  fi
- 
+
  export PATH=$PATH:native
 -java $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator
 +LD_LIBRARY_PATH=@EXTRALIBS@ exec @JAVA@ $CLIENTARGS -classpath "lib/felix.jar:sc-bundles/sc-launcher.jar:sc-bundles/util.jar:lib/" -Djava.library.path=$NATIVELIBS -Dfelix.config.properties=file:lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties net.java.sip.communicator.launcher.SIPCommunicator

From 3fdd726b16cf39da25dd97d30631dc129e33fb0f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 3 Mar 2017 20:06:15 -0600
Subject: [PATCH 1660/3449] ncdc: 1.19.1 -> 1.20

---
 .../networking/p2p/ncdc/default.nix           | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix
index b1181960f41a..6d204de9ac43 100644
--- a/pkgs/applications/networking/p2p/ncdc/default.nix
+++ b/pkgs/applications/networking/p2p/ncdc/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchurl, ncurses, zlib, bzip2, sqlite, pkgconfig, glib, gnutls }:
 
-let
-  version = "1.19.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ncdc-${version}";
+  version = "1.20";
 
   src = fetchurl {
     url = "http://dev.yorhel.nl/download/ncdc-${version}.tar.gz";
-    sha256 = "0iwx4b3x207sw11qqjfynpwnhryhixjzbgcy9l9zfisa8f0k7cm6";
+    sha256 = "0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca";
   };
 
-  buildInputs = [ ncurses zlib bzip2 sqlite pkgconfig glib gnutls ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses zlib bzip2 sqlite glib gnutls ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Modern and lightweight direct connect client with a friendly ncurses interface";
     homepage = http://dev.yorhel.nl/ncdc;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux; # arbitrary
-    maintainers = [ stdenv.lib.maintainers.ehmry ];
+    license = licenses.mit;
+    platforms = platforms.linux; # arbitrary
+    maintainers = with maintainers; [ ehmry ];
   };
 }

From fc6c50f1b530c717c34dc6c2acd637de06d2858f Mon Sep 17 00:00:00 2001
From: David Costa <david@zarel.net>
Date: Sat, 4 Mar 2017 17:51:32 +0100
Subject: [PATCH 1661/3449] xfce: add screenLock option

screenLock option is needed to provide at least one application for
xflock4 to lock the screen
---
 nixos/modules/services/x11/desktop-managers/xfce.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 37523feb4140..9c42dc8781b9 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -47,6 +47,12 @@ in
         default = true;
         description = "Enable the XFWM (default) window manager.";
       };
+
+      screenLock = mkOption {
+        type = types.enum [ "xscreensaver" "xlockmore" "slock" ];
+        default = "xlockmore";
+        description = "Application used by XFCE to lock the screen.";
+      };
     };
 
   };
@@ -80,6 +86,7 @@ in
         pkgs.tango-icon-theme
         pkgs.shared_mime_info
         pkgs.which # Needed by the xfce's xinitrc script.
+        pkgs."${cfg.screenLock}"
         pkgs.xfce.exo
         pkgs.xfce.gtk_xfce_engine
         pkgs.xfce.mousepad

From 7b914b29864132ae73e4a0eb9656eec8bb05102f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 4 Mar 2017 19:01:32 +0100
Subject: [PATCH 1662/3449] mu: leave mug off by default

This unbreaks the package after marking legacy webkit as
insecure.  Per upstream, mug is a toy.
---
 pkgs/tools/networking/mu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index c82588559dfc..2813e7e655d4 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
 , xapian, glib, gmime, texinfo , emacs, guile
 , gtk3, webkitgtk24x, libsoup, icu
-, withMug ? stdenv.isLinux }:
+, withMug ? false }:
 
 stdenv.mkDerivation rec {
   version = "0.9.18";

From 56e71f62dc49e64fcd37768cc7d1ec219d4990e6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 4 Mar 2017 13:15:23 -0500
Subject: [PATCH 1663/3449] Add locateDominatingFile lib function

---
 lib/default.nix    |  5 ++++-
 lib/filesystem.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 lib/filesystem.nix

diff --git a/lib/default.nix b/lib/default.nix
index c0d7899b882a..09a64f754d8f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -34,6 +34,9 @@ let
   sandbox = import ./sandbox.nix;
   fetchers = import ./fetchers.nix;
 
+  # Eval-time filesystem handling
+  filesystem = import ./filesystem.nix;
+
 in
   { inherit trivial
             attrsets lists strings stringsWithDeps
@@ -41,7 +44,7 @@ in
             modules options types
             licenses platforms systems
             debug generators misc
-            sandbox fetchers;
+            sandbox fetchers filesystem;
   }
   # !!! don't include everything at top-level; perhaps only the most
   # commonly used functions.
diff --git a/lib/filesystem.nix b/lib/filesystem.nix
new file mode 100644
index 000000000000..91b04d81c13b
--- /dev/null
+++ b/lib/filesystem.nix
@@ -0,0 +1,26 @@
+{ # locateDominatingFile :  RegExp
+  #                      -> Path
+  #                      -> Nullable { path : Path;
+  #                                    matches : [ MatchResults ];
+  #                                  }
+  # Find the first directory containing a file matching 'pattern'
+  # upward from a given 'file'.
+  # Returns 'null' if no directories contain a file matching 'pattern'.
+  locateDominatingFile = pattern: file:
+    let go = path:
+          let files = builtins.attrNames (builtins.readDir path);
+              matches = builtins.filter (match: match != null)
+                          (map (builtins.match pattern) files);
+          in
+            if builtins.length matches != 0
+              then { inherit path matches; }
+              else if path == /.
+                then null
+                else go (dirOf path);
+        parent = dirOf file;
+        isDir =
+          let base = baseNameOf file;
+              type = (builtins.readDir parent).${base} or null;
+          in file == /. || type == "directory";
+    in go (if isDir then file else parent);
+}

From ef5986e03cf3e4943eb018e39d6d71222cba5975 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 4 Mar 2017 13:18:14 -0500
Subject: [PATCH 1664/3449] haskellSrc2nix: Change sha arg when sha256 is null.

Otherwise it just fails due to no nix-prefetch-url
---
 pkgs/development/haskell-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 7ba06b6b60c1..df17c769ea2d 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -56,7 +56,7 @@ let
 
       haskellSrc2nix = { name, src, sha256 ? null }:
         let
-          sha256Arg = if isNull sha256 then "" else ''--sha256="${sha256}"'';
+          sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"'';
         in pkgs.stdenv.mkDerivation {
           name = "cabal2nix-${name}";
           buildInputs = [ pkgs.cabal2nix ];

From 9ac3a8a5afa9c880fbf635f15d6a691751980540 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 4 Mar 2017 18:00:58 +0100
Subject: [PATCH 1665/3449] khd: 2.0.0 -> 2.1.1

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

diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix
index 0e5d466e16ad..0768f5a12e09 100644
--- a/pkgs/os-specific/darwin/khd/default.nix
+++ b/pkgs/os-specific/darwin/khd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "khd-${version}";
-  version = "2.0.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "khd";
     rev = "v${version}";
-    sha256 = "02v2bq095h1ylx700kayakg7f9p43vrz6p9ry3g7lq37s6apgm8h";
+    sha256 = "1ijfrlnwdf8hk259j3jfxj6zizvqzj57458rflza626z5dnhmbpr";
   };
 
   buildInputs = [ Carbon Cocoa ];
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A simple modal hototkey daemon for OSX";
+    description = "A simple modal hotkey daemon for OSX";
     homepage = https://github.com/koekeishiya/khd;
     downloadPage = https://github.com/koekeishiya/khd/releases;
     platforms = platforms.darwin;

From eaa4b5e21665db63c013b3e050fbf7fb94c5689a Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 4 Mar 2017 13:47:40 -0500
Subject: [PATCH 1666/3449] nix-buffer: 2.1.0 -> 2.2.0

---
 pkgs/applications/editors/emacs-modes/melpa-generated.nix | 8 ++++----
 .../editors/emacs-modes/melpa-stable-generated.nix        | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index daaf1f618916..d1ef872ad3ba 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -45711,12 +45711,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170301.951";
+        version = "20170304.1037";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821";
-          sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw";
+          rev = "8205f24c1315d178d23ac682c5e33800752ce80e";
+          sha256 = "00lxvfvkjyk041xv8jis0hdqdq6vn4di8gd5cd9cwvhcgqbznyvp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -73311,4 +73311,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
+  }
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index b43f8822910b..82a328dcce1c 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -22207,12 +22207,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "2.1.0";
+        version = "2.2.0";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "a4b403eab4a94f8416ef9339d67fdb6f7db8a821";
-          sha256 = "1a5v2lk2rzx0nzsmmln80757di1blnhsvldyhybablds3qfjdinw";
+          rev = "8205f24c1315d178d23ac682c5e33800752ce80e";
+          sha256 = "00lxvfvkjyk041xv8jis0hdqdq6vn4di8gd5cd9cwvhcgqbznyvp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -34480,4 +34480,4 @@
           license = lib.licenses.free;
         };
       }) {};
-  }
+  }
\ No newline at end of file

From 42cf524f2d15a9eacf683be4076e8451d0492f83 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 4 Mar 2017 14:50:15 -0600
Subject: [PATCH 1667/3449] nixos/plasma5: set default fonts for Plasma desktop

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

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 24225308ffb3..b02524012026 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -196,6 +196,11 @@ in
       };
 
       fonts.fonts = with pkgs; [ noto-fonts hack-font ];
+      fonts.fontconfig.defaultFonts = {
+        monospace = [ "Hack" "Noto Mono" ];
+        sansSerif = [ "Noto Sans" ];
+        serif = [ "Noto Serif" ];
+      };
 
       programs.ssh.askPassword = "${plasma5.ksshaskpass.out}/bin/ksshaskpass";
 

From 164cdd38a62e435bf83943cacc66d4f14d09f77d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 4 Mar 2017 10:20:50 -0600
Subject: [PATCH 1668/3449] startkde: inherit NixOS system font settings

---
 pkgs/desktops/plasma-5/startkde/startkde.sh | 23 ++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
index a403e8e05e6e..c38450516e91 100755
--- a/pkgs/desktops/plasma-5/startkde/startkde.sh
+++ b/pkgs/desktops/plasma-5/startkde/startkde.sh
@@ -14,6 +14,12 @@ if ! [ -e $HOME/.gtkrc-2.0 ] \
     cat >$HOME/.gtkrc-2.0 <<EOF
 # Default GTK+ 2 config for NixOS KDE 5
 include "/run/current-system/sw/share/themes/Breeze/gtk-2.0/gtkrc"
+style "user-font"
+{
+  font_name="Sans Serif Regular"
+}
+widget_class "*" style "user-font"
+gtk-font-name="Sans Serif Regular 10"
 gtk-theme-name="Breeze"
 gtk-icon-theme-name="breeze"
 gtk-fallback-icon-theme="hicolor"
@@ -28,6 +34,7 @@ if ! [ -e $HOME/.config/gtk-3.0/settings.ini ] \
        && [ -e /run/current-system/sw/share/themes/Breeze/gtk-3.0 ]; then
     cat >$HOME/.config/gtk-3.0/settings.ini <<EOF
 [Settings]
+gtk-font-name=Sans Serif Regular 10
 gtk-theme-name=Breeze
 gtk-icon-theme-name=breeze
 gtk-fallback-icon-theme=hicolor
@@ -79,9 +86,9 @@ kcheckrunning_result=$?
 if test $kcheckrunning_result -eq 0 ; then
     echo "KDE seems to be already running on this display."
     xmessage -geometry 500x100 "KDE seems to be already running on this display."
-	exit 1
+    exit 1
 elif test $kcheckrunning_result -eq 2 ; then
-	echo "\$DISPLAY is not set or cannot connect to the X server."
+    echo "\$DISPLAY is not set or cannot connect to the X server."
     exit 1
 fi
 
@@ -122,6 +129,7 @@ ksplashrc KSplash Theme ${THEME}.desktop
 ksplashrc KSplash Engine KSplashQML
 kdeglobals KScreen ScreenScaleFactors ''
 kcmfonts General forceFontDPI 0
+kcmfonts General dontChangeAASettings true
 EOF
 
 # preload the user's locale on first start
@@ -145,9 +153,14 @@ kdeglobalsfile=$configDir/kdeglobals
 test -f $kdeglobalsfile || {
 cat >$kdeglobalsfile <<EOF
 [General]
-XftAntialias=true
-XftHintStyle=hintmedium
-XftSubPixel=none
+fixed=Monospace,10,-1,5,50,0,0,0,0,0,Regular
+font=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular
+menuFont=Sans Serif,10,-1,5,50,0,0,0,0,0,Regular
+smallestReadableFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular
+toolBarFont=Sans Serif,8,-1,5,50,0,0,0,0,0,Regular
+
+[WM]
+activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold
 EOF
 }
 

From 286b007bd327a1e8d6d1fe66702b951f2fd6e29a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 4 Mar 2017 11:23:34 -0600
Subject: [PATCH 1669/3449] nixos/fontconfig: lift some settings out of
 fontconfig.ultimate

---
 .../config/fonts/fontconfig-ultimate.nix      | 100 ---------------
 nixos/modules/config/fonts/fontconfig.nix     | 120 +++++++++++++++++-
 nixos/modules/rename.nix                      |   7 +
 3 files changed, 122 insertions(+), 105 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix
index a3f52fbd9199..ed6429dda085 100644
--- a/nixos/modules/config/fonts/fontconfig-ultimate.nix
+++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix
@@ -8,61 +8,6 @@ let fcBool = x: if x then "<bool>true</bool>" else "<bool>false</bool>";
 
     latestVersion  = pkgs.fontconfig.configVersion;
 
-    # fontconfig ultimate main configuration file
-    # priority 52
-    fontconfigUltimateConf = pkgs.writeText "fc-52-fontconfig-ultimate.conf" ''
-      <?xml version="1.0"?>
-      <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-      <fontconfig>
-
-        ${optionalString (!cfg.allowBitmaps) ''
-        <!-- Reject bitmap fonts -->
-        <selectfont>
-          <rejectfont>
-            <pattern>
-              <patelt name="scalable"><bool>false</bool></patelt>
-            </pattern>
-          </rejectfont>
-        </selectfont>
-        ''}
-
-        ${optionalString cfg.allowType1 ''
-        <!-- Reject Type 1 fonts -->
-        <selectfont>
-          <rejectfont>
-            <pattern>
-              <patelt name="fontformat">
-                <string>Type 1</string>
-              </patelt>
-            </pattern>
-          </rejectfont>
-        </selectfont>
-        ''}
-
-        <!-- Use embedded bitmaps in fonts like Calibri? -->
-        <match target="font">
-          <edit name="embeddedbitmap" mode="assign">
-            ${fcBool cfg.useEmbeddedBitmaps}
-          </edit>
-        </match>
-
-        <!-- Force autohint always -->
-        <match target="font">
-          <edit name="force_autohint" mode="assign">
-            ${fcBool cfg.forceAutohint}
-          </edit>
-        </match>
-
-        <!-- Render some monospace TTF fonts as bitmaps -->
-        <match target="pattern">
-          <edit name="bitmap_monospace" mode="assign">
-            ${fcBool cfg.renderMonoTTFAsBitmap}
-          </edit>
-        </match>
-
-      </fontconfig>
-    '';
-
     # The configuration to be included in /etc/font/
     confPkg = pkgs.runCommand "font-ultimate-conf" {} ''
       support_folder=$out/etc/fonts/conf.d
@@ -71,12 +16,6 @@ let fcBool = x: if x then "<bool>true</bool>" else "<bool>false</bool>";
       mkdir -p $support_folder
       mkdir -p $latest_folder
 
-      # 52-fontconfig-ultimate.conf
-      ln -s ${fontconfigUltimateConf} \
-            $support_folder/52-fontconfig-ultimate.conf
-      ln -s ${fontconfigUltimateConf} \
-            $latest_folder/52-fontconfig-ultimate.conf
-
       # fontconfig ultimate substitutions
       ${optionalString (cfg.substitutions != "none") ''
       ln -s ${pkgs.fontconfig-ultimate}/etc/fonts/presets/${cfg.substitutions}/*.conf \
@@ -113,45 +52,6 @@ in
             '';
           };
 
-          allowBitmaps = mkOption {
-            type = types.bool;
-            default = true;
-            description = ''
-              Allow bitmap fonts. Set to <literal>false</literal> to ban all
-              bitmap fonts.
-            '';
-          };
-
-          allowType1 = mkOption {
-            type = types.bool;
-            default = false;
-            description = ''
-              Allow Type-1 fonts. Default is <literal>false</literal> because of
-              poor rendering.
-            '';
-          };
-
-          useEmbeddedBitmaps = mkOption {
-            type = types.bool;
-            default = false;
-            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;
-            description = ''Render some monospace TTF fonts as bitmaps.'';
-          };
-
           substitutions = mkOption {
             type = types.nullOr (types.enum ["free" "combi" "ms"]);
             default = "free";
diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 52ad1e714fb9..5648b7b1d027 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -41,11 +41,11 @@ let cfg = config.fonts.fontconfig;
     # 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 
+      let
         fcPackage = if builtins.isNull version
                     then "fontconfig"
                     else "fontconfig_${version}";
@@ -104,6 +104,13 @@ let cfg = config.fonts.fontconfig;
         </match>
         ''}
 
+        <!-- Force autohint always -->
+        <match target="font">
+          <edit name="force_autohint" mode="assign">
+            ${fcBool cfg.forceAutohint}
+          </edit>
+        </match>
+
       </fontconfig>
     '';
 
@@ -113,7 +120,7 @@ let cfg = config.fonts.fontconfig;
 
     # default fonts configuration file
     # priority 52
-    defaultFontsConf = 
+    defaultFontsConf =
       let genDefault = fonts: name:
         optionalString (fonts != []) ''
           <alias>
@@ -142,7 +149,61 @@ let cfg = config.fonts.fontconfig;
       </fontconfig>
     '';
 
-    # fontconfig configuration package 
+    # bitmap font options
+    # priority 53
+    rejectBitmaps = pkgs.writeText "fc-53-nixos-bitmaps.conf" ''
+      <?xml version="1.0"?>
+      <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+      <fontconfig>
+
+      ${optionalString (!cfg.allowBitmaps) ''
+      <!-- Reject bitmap fonts -->
+      <selectfont>
+        <rejectfont>
+          <pattern>
+            <patelt name="scalable"><bool>false</bool></patelt>
+          </pattern>
+        </rejectfont>
+      </selectfont>
+      ''}
+
+      <!-- Use embedded bitmaps in fonts like Calibri? -->
+      <match target="font">
+        <edit name="embeddedbitmap" mode="assign">
+          ${fcBool cfg.useEmbeddedBitmaps}
+        </edit>
+      </match>
+
+      <!-- Render some monospace TTF fonts as bitmaps -->
+      <match target="pattern">
+        <edit name="bitmap_monospace" mode="assign">
+          ${fcBool cfg.renderMonoTTFAsBitmap}
+        </edit>
+      </match>
+
+      </fontconfig>
+    '';
+
+    # reject Type 1 fonts
+    # priority 53
+    rejectType1 = pkgs.writeText "fc-53-nixos-reject-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>
+    '';
+
+    # fontconfig configuration package
     confPkg = pkgs.runCommand "fontconfig-conf" {} ''
       support_folder=$out/etc/fonts
       latest_folder=$out/etc/fonts/${latestVersion}
@@ -166,7 +227,7 @@ let cfg = config.fonts.fontconfig;
 
       substitute ${latestPkg.out}/etc/fonts/conf.d/51-local.conf \
                  $latest_folder/conf.d/51-local.conf \
-                 --replace local.conf /etc/fonts/${latestVersion}/local.conf 
+                 --replace local.conf /etc/fonts/${latestVersion}/local.conf
 
       # 00-nixos-cache.conf
       ln -s ${cacheConfSupport} \
@@ -192,6 +253,16 @@ let cfg = config.fonts.fontconfig;
       # 52-nixos-default-fonts.conf
       ln -s ${defaultFontsConf} $support_folder/conf.d/52-nixos-default-fonts.conf
       ln -s ${defaultFontsConf} $latest_folder/conf.d/52-nixos-default-fonts.conf
+
+      # 53-nixos-bitmaps.conf
+      ln -s ${rejectBitmaps} $support_folder/conf.d/53-nixos-bitmaps.conf
+      ln -s ${rejectBitmaps} $latest_folder/conf.d/53-nixos-bitmaps.conf
+
+      ${optionalString (! cfg.allowType1) ''
+      # 53-nixos-reject-type1.conf
+      ln -s ${rejectType1} $support_folder/conf.d/53-nixos-reject-type1.conf
+      ln -s ${rejectType1} $latest_folder/conf.d/53-nixos-reject-type1.conf
+      ''}
     '';
 
     # Package with configuration files
@@ -349,6 +420,45 @@ in
           '';
         };
 
+        allowBitmaps = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Allow bitmap fonts. Set to <literal>false</literal> to ban all
+            bitmap fonts.
+          '';
+        };
+
+        allowType1 = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Allow Type-1 fonts. Default is <literal>false</literal> because of
+            poor rendering.
+          '';
+        };
+
+        useEmbeddedBitmaps = mkOption {
+          type = types.bool;
+          default = false;
+          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;
+          description = ''Render some monospace TTF fonts as bitmaps.'';
+        };
+
       };
 
     };
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ff3654737afd..0b609287f63a 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -181,6 +181,13 @@ with lib;
     # KDE Plasma 5
     (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
 
+    # Fontconfig
+    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "config" "fonts" "fontconfig" "allowBitmaps" ])
+    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowType1" ] [ "config" "fonts" "fontconfig" "allowType1" ])
+    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "config" "fonts" "fontconfig" "useEmbeddedBitmaps" ])
+    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ])
+    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "")
     (mkRemovedOptionModule [ "programs" "bash" "enable" ] "")

From a909329bed59e03d184e4ebc96c8b04ce2018503 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 09:26:44 -0600
Subject: [PATCH 1670/3449] libxkbcommon: 0.6.1 -> 0.7.1

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

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 173e1814aeab..082f004d116b 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.6.1";
+  name = "libxkbcommon-0.7.1";
 
   src = fetchurl {
     url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha256 = "0q47xa1szlxwgvwmhv4b7xwawnykz1hnc431d84nj8dlh2q8f22v";
+    sha256 = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b";
   };
 
   outputs = [ "out" "dev" ];

From a368a80c90f1a0ccffb59017e1900e87b9c66824 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 09:26:56 -0600
Subject: [PATCH 1671/3449] libxkbcommon: add ttuegel to maintainers

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

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 082f004d116b..486d52a2e27b 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "A library to handle keyboard descriptions";
     homepage = http://xkbcommon.org;
     license = licenses.mit;
-    maintainers = with maintainers; [ garbas ];
+    maintainers = with maintainers; [ garbas ttuegel ];
     platforms = with platforms; unix;
   };
 }

From cd7d8a60b44a80bab95b1cfceb58b27443bce502 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 09:37:57 -0600
Subject: [PATCH 1672/3449] qt58: init at 5.8.0

Qt 5.8 is now the default version.
---
 .../libraries/qt-5/5.8/default.nix            | 121 ++++++
 pkgs/development/libraries/qt-5/5.8/fetch.sh  |   3 +
 .../qt-5/5.8/qtbase/cmake-paths.patch         | 385 ++++++++++++++++++
 .../qt-5/5.8/qtbase/compose-search-path.patch |  16 +
 .../qt-5/5.8/qtbase/decrypt-ssl-traffic.patch |  13 +
 .../libraries/qt-5/5.8/qtbase/default.nix     | 243 +++++++++++
 .../qt-5/5.8/qtbase/dlopen-dbus.patch         |  13 +
 .../libraries/qt-5/5.8/qtbase/dlopen-gl.patch |  17 +
 .../qt-5/5.8/qtbase/dlopen-gtkstyle.patch     |  50 +++
 .../qt-5/5.8/qtbase/dlopen-libXcursor.patch   |  17 +
 .../qt-5/5.8/qtbase/dlopen-openssl.patch      |  26 ++
 .../qt-5/5.8/qtbase/dlopen-resolv.patch       |  26 ++
 .../libraries/qt-5/5.8/qtbase/libressl.patch  |  33 ++
 .../qt-5/5.8/qtbase/mkspecs-libgl.patch       |  15 +
 .../qtbase/nix-profiles-library-paths.patch   |  22 +
 .../libraries/qt-5/5.8/qtbase/series          |  10 +
 .../libraries/qt-5/5.8/qtbase/tzdir.patch     |  40 ++
 .../qt-5/5.8/qtbase/xdg-config-dirs.patch     |  41 ++
 .../libraries/qt-5/5.8/qtconnectivity.nix     |   6 +
 .../qt-5/5.8/qtdeclarative/default.nix        |   8 +
 .../nix-profiles-import-paths.patch           |  20 +
 .../libraries/qt-5/5.8/qtdeclarative/series   |   1 +
 pkgs/development/libraries/qt-5/5.8/qtdoc.nix |   6 +
 .../libraries/qt-5/5.8/qtgraphicaleffects.nix |   6 +
 .../libraries/qt-5/5.8/qtimageformats.nix     |   6 +
 .../libraries/qt-5/5.8/qtlocation.nix         |   6 +
 .../libraries/qt-5/5.8/qtmultimedia.nix       |  12 +
 .../libraries/qt-5/5.8/qtquickcontrols.nix    |   6 +
 .../libraries/qt-5/5.8/qtquickcontrols2.nix   |   6 +
 .../qt-5/5.8/qtscript/0001-glib-2.32.patch    |  25 ++
 .../libraries/qt-5/5.8/qtscript/default.nix   |   7 +
 .../libraries/qt-5/5.8/qtsensors.nix          |   6 +
 .../0001-dlopen-serialport-udev.patch         |  28 ++
 .../qt-5/5.8/qtserialport/default.nix         |  12 +
 pkgs/development/libraries/qt-5/5.8/qtsvg.nix |   6 +
 .../qt-5/5.8/qttools/cmake-paths.patch        |  72 ++++
 .../libraries/qt-5/5.8/qttools/default.nix    |  11 +
 .../libraries/qt-5/5.8/qttools/series         |   1 +
 .../libraries/qt-5/5.8/qttranslations.nix     |   6 +
 .../libraries/qt-5/5.8/qtwayland.nix          |   8 +
 .../libraries/qt-5/5.8/qtwebchannel.nix       |   7 +
 .../qt-5/5.8/qtwebengine/default.nix          |  69 ++++
 .../qtwebengine-paxmark-mksnapshot.patch      |  46 +++
 .../0001-dlopen-webkit-nsplugin.patch         |  53 +++
 .../5.8/qtwebkit/0002-dlopen-webkit-gtk.patch |  25 ++
 .../qtwebkit/0003-dlopen-webkit-udev.patch    |  31 ++
 .../libraries/qt-5/5.8/qtwebkit/default.nix   |  35 ++
 .../libraries/qt-5/5.8/qtwebsockets.nix       |   6 +
 .../libraries/qt-5/5.8/qtx11extras.nix        |   6 +
 .../libraries/qt-5/5.8/qtxmlpatterns.nix      |   6 +
 pkgs/development/libraries/qt-5/5.8/srcs.nix  | 325 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  17 +-
 52 files changed, 1980 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/fetch.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gtkstyle.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/series
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtdoc.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtimageformats.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtlocation.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtscript/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtsensors.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtsvg.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qttools/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qttools/series
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qttranslations.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwayland.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtx11extras.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtxmlpatterns.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.8/srcs.nix

diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
new file mode 100644
index 000000000000..85b38c6fc6ce
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -0,0 +1,121 @@
+/*
+
+# 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,
+
+  # 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 qtscript
+        qtsensors qtserialport qtsvg qttools qttranslations qtwayland
+        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.8/fetch.sh b/pkgs/development/libraries/qt-5/5.8/fetch.sh
new file mode 100644
index 000000000000..2e21cdefba6a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/fetch.sh
@@ -0,0 +1,3 @@
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/ \
+            http://download.qt.io/community_releases/5.8/5.8.0-final/ \
+            -A '*.tar.xz' )
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
new file mode 100644
index 000000000000..0d5c2d510929
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
@@ -0,0 +1,385 @@
+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.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
new file mode 100644
index 000000000000..a0e344a7bc68
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
@@ -0,0 +1,16 @@
+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.8/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch
new file mode 100644
index 000000000000..495db07cfbb5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/decrypt-ssl-traffic.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..e4783ef9838a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -0,0 +1,243 @@
+{
+  stdenv, lib, copyPathsToStore,
+  src, version,
+
+  coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
+  ruby,
+
+  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, 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)
+    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
+    ++ lib.optional 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/plugins/platforms/xcb/qxcbcursor.cpp \
+        --replace "@libXcursor@" "${libXcursor.out}"
+
+      substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
+        --replace "@openssl@" "${openssl.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}"
+    '';
+
+
+  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"}
+    -accessibility
+    -rpath
+    -strip
+    -no-reduce-relocations
+    -system-proxies
+    -pkg-config
+
+    -gui
+    -widgets
+    -opengl desktop
+    -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
+    -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
+    -libinput
+    -gtk
+
+    -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
+  '';
+
+  # 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
+    libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil
+    xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm
+  ]
+  ++ lib.optional mesaSupported mesa;
+
+  buildInputs =
+    [ 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 ];
+
+  # 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"
+  '';
+
+  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
+    '';
+
+  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; [ bbenoist qknight ttuegel ];
+    platforms = platforms.linux;
+  };
+
+}
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
new file mode 100644
index 000000000000..10b0b6701ddc
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-dbus.patch
@@ -0,0 +1,13 @@
+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.8/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
new file mode 100644
index 000000000000..ea3073ced50a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gl.patch
@@ -0,0 +1,17 @@
+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.8/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gtkstyle.patch
new file mode 100644
index 000000000000..755b0965cf5f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-gtkstyle.patch
@@ -0,0 +1,50 @@
+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.8/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
new file mode 100644
index 000000000000..02b7efb73d22
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-libXcursor.patch
@@ -0,0 +1,17 @@
+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.8/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
new file mode 100644
index 000000000000..9891bfeac5bf
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-openssl.patch
@@ -0,0 +1,26 @@
+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.8/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
new file mode 100644
index 000000000000..98a3610f5fbd
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/dlopen-resolv.patch
@@ -0,0 +1,26 @@
+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.8/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
new file mode 100644
index 000000000000..4390db977a71
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch
@@ -0,0 +1,33 @@
+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.8/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch
new file mode 100644
index 000000000000..fda3d3e36533
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/mkspecs-libgl.patch
@@ -0,0 +1,15 @@
+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.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
new file mode 100644
index 000000000000..ebaf3651a6d0
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
@@ -0,0 +1,22 @@
+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.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
new file mode 100644
index 000000000000..44e2d9040807
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -0,0 +1,10 @@
+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
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
new file mode 100644
index 000000000000..f4056dd9cc97
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch
@@ -0,0 +1,40 @@
+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.8/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
new file mode 100644
index 000000000000..1f2f316c5b26
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch
@@ -0,0 +1,41 @@
+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.8/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
new file mode 100644
index 000000000000..95cd6fea79b4
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtconnectivity";
+  qtInputs = [ qtbase qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
new file mode 100644
index 000000000000..9b6a6c46176c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -0,0 +1,8 @@
+{ 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.8/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
new file mode 100644
index 000000000000..06b244b974ff
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
@@ -0,0 +1,20 @@
+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.8/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
new file mode 100644
index 000000000000..7dbe197c56e0
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
@@ -0,0 +1 @@
+nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix b/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
new file mode 100644
index 000000000000..578ea6ba0b22
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtdoc";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix
new file mode 100644
index 000000000000..3273f12eb830
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtgraphicaleffects";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.8/qtimageformats.nix
new file mode 100644
index 000000000000..03d0fffbe80e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtimageformats.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtimageformats";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix b/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
new file mode 100644
index 000000000000..1e134057c4b4
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtmultimedia }:
+
+qtSubmodule {
+  name = "qtlocation";
+  qtInputs = [ qtbase qtmultimedia ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
new file mode 100644
index 000000000000..7c1cc5da07e3
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
@@ -0,0 +1,12 @@
+{ 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.8/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix
new file mode 100644
index 000000000000..93a864621b82
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtquickcontrols";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
new file mode 100644
index 000000000000..19750f2fd99d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtquickcontrols2";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch
new file mode 100644
index 000000000000..887e107b6c1b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch
@@ -0,0 +1,25 @@
+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.8/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.8/qtscript/default.nix
new file mode 100644
index 000000000000..127766e2ebd6
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtscript/default.nix
@@ -0,0 +1,7 @@
+{ qtSubmodule, qtbase, qttools }:
+
+qtSubmodule {
+  name = "qtscript";
+  qtInputs = [ qtbase qttools ];
+  patches = [ ./0001-glib-2.32.patch ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
new file mode 100644
index 000000000000..61e64dc47e4d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtsensors";
+  qtInputs = [ qtbase qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
new file mode 100644
index 000000000000..3a813dc80074
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
@@ -0,0 +1,28 @@
+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.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
new file mode 100644
index 000000000000..2bffd0a2bd61
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
@@ -0,0 +1,12 @@
+{ 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.8/qtsvg.nix b/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
new file mode 100644
index 000000000000..b9ccac7cf933
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtsvg";
+  qtInputs = [ qtbase ];
+}
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
new file mode 100644
index 000000000000..fe5bcadbe9a8
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch
@@ -0,0 +1,72 @@
+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.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
new file mode 100644
index 000000000000..d72d7b6c64cb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -0,0 +1,11 @@
+{ 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.8/qttools/series b/pkgs/development/libraries/qt-5/5.8/qttools/series
new file mode 100644
index 000000000000..6cc1d3b87bca
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/series
@@ -0,0 +1 @@
+cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qttranslations.nix b/pkgs/development/libraries/qt-5/5.8/qttranslations.nix
new file mode 100644
index 000000000000..50fc8cf6826a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qttranslations.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qttools }:
+
+qtSubmodule {
+  name = "qttranslations";
+  qtInputs = [ qttools ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix b/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
new file mode 100644
index 000000000000..6d887f7c650b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
@@ -0,0 +1,8 @@
+{ qtSubmodule, qtbase, qtquickcontrols, wayland, pkgconfig }:
+
+qtSubmodule {
+  name = "qtwayland";
+  qtInputs = [ qtbase qtquickcontrols ];
+  buildInputs = [ wayland ];
+  nativeBuildInputs = [ pkgconfig ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
new file mode 100644
index 000000000000..fd7a3c52026e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
@@ -0,0 +1,7 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtwebchannel";
+  qtInputs = [ qtbase qtdeclarative ];
+}
+
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
new file mode 100644
index 000000000000..ec3f9061f795
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -0,0 +1,69 @@
+{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel
+
+, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst
+, fontconfig, freetype, harfbuzz, icu, dbus
+, zlib, libjpeg, libpng, libtiff
+, alsaLib
+, libcap
+, pciutils
+
+, bison, flex, git, which, gperf
+, coreutils
+, pkgconfig, python2
+
+, 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 default SSL bundle location
+    sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
+
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
+  '';
+  propagatedBuildInputs = [
+    dbus zlib alsaLib
+
+    # Image formats
+    libjpeg libpng libtiff
+
+    # Text rendering
+    fontconfig freetype harfbuzz icu
+
+    # X11 libs
+    xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst
+    xlibs.libXcomposite
+
+    libcap
+    pciutils
+  ];
+  patches = stdenv.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.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
new file mode 100644
index 000000000000..b3316188f7d9
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
@@ -0,0 +1,46 @@
+--- 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.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
new file mode 100644
index 000000000000..0eeacce1bc05
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
@@ -0,0 +1,53 @@
+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.8/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
new file mode 100644
index 000000000000..bb5d1f74364c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
@@ -0,0 +1,25 @@
+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.8/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
new file mode 100644
index 000000000000..1c360cd81aa2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
@@ -0,0 +1,31 @@
+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.8/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
new file mode 100644
index 000000000000..915a6bcae8a8
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
@@ -0,0 +1,35 @@
+{ 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.8/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
new file mode 100644
index 000000000000..fbdfbbcf0dbe
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtwebsockets";
+  qtInputs = [ qtbase qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.8/qtx11extras.nix
new file mode 100644
index 000000000000..a765161e2d7e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtx11extras.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtx11extras";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.8/qtxmlpatterns.nix
new file mode 100644
index 000000000000..9a8ddbba2bd2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtxmlpatterns.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtxmlpatterns";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.8/srcs.nix b/pkgs/development/libraries/qt-5/5.8/srcs.nix
new file mode 100644
index 000000000000..02bd5c4f18b2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/srcs.nix
@@ -0,0 +1,325 @@
+# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+{ fetchurl, mirror }:
+
+{
+  qt3d = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qt3d-opensource-src-5.8.0.tar.xz";
+      sha256 = "1rca1k8lf0xy2x1w3kp9rnpi77bbrm8v7db302n9a8cjziv4a8is";
+      name = "qt3d-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtactiveqt-opensource-src-5.8.0.tar.xz";
+      sha256 = "1a9m87chmp2m3ljadryh9ggvwpvclmazz081h3p68n092dbl2ylj";
+      name = "qtactiveqt-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtandroidextras-opensource-src-5.8.0.tar.xz";
+      sha256 = "1wgbxi579fdnripp481qhcqma95hm4zcc16n4ljjpl0yzn1zx8qa";
+      name = "qtandroidextras-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz";
+      sha256 = "01f07yjly7y24njl2h4hyknmi7pf8yd9gky23szcfkd40ap12wf1";
+      name = "qtbase-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtcanvas3d-opensource-src-5.8.0.tar.xz";
+      sha256 = "18yaikbwk4d7sh09psi3kjn1mxjp4d2f3qchfzgq5x96yn8gfijl";
+      name = "qtcanvas3d-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtcharts = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtcharts-opensource-src-5.8.0.tar.xz";
+      sha256 = "11m5g1fxip6z2xk1z6g6h4rq7v282qbkxflan8hs87hadnzars03";
+      name = "qtcharts-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtconnectivity-opensource-src-5.8.0.tar.xz";
+      sha256 = "1w97na5s420y08dcydqinbqb0rd9h4pfdnjbwslr0qvzsvlh2bbv";
+      name = "qtconnectivity-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtdatavis3d = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtdatavis3d-opensource-src-5.8.0.tar.xz";
+      sha256 = "1n2vdf6n7pr9xrjwbvbar899q74shx6cy19x32adxfn2iilygwbp";
+      name = "qtdatavis3d-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtdeclarative-opensource-src-5.8.0.tar.xz";
+      sha256 = "0ilaf2sprpk9fg2j3905hxnhm0xbnm88ppk4zifp7n0jmnwix51j";
+      name = "qtdeclarative-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtdoc-opensource-src-5.8.0.tar.xz";
+      sha256 = "13jpml9hdcxvf8j2033x5liw26r3q8idpjmx2rij63w2956c84ii";
+      name = "qtdoc-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtgamepad = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtgamepad-opensource-src-5.8.0.tar.xz";
+      sha256 = "0dwcrq60h802z694h4108figlr3yvp8fpzhwjzbjm503v8yaxw5j";
+      name = "qtgamepad-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtgraphicaleffects-opensource-src-5.8.0.tar.xz";
+      sha256 = "06frknb7m8bgg55rs7jjm61iziisy2ykzrrc5dy3vj0aad89najz";
+      name = "qtgraphicaleffects-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtimageformats-opensource-src-5.8.0.tar.xz";
+      sha256 = "0vv0wh5q5sih294x661djzwvgdwy7r6xpnxsc111k5hwq7m5w13m";
+      name = "qtimageformats-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtlocation-opensource-src-5.8.0.tar.xz";
+      sha256 = "1fqssa8rhq83lnxjcdh4ijqck3lmqglpk8yax8x17w49v6gf78a8";
+      name = "qtlocation-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtmacextras-opensource-src-5.8.0.tar.xz";
+      sha256 = "049lbxy6yxv7yii7zxibfbix0q2p8fn58dsbc33rn40gbs7rj9zf";
+      name = "qtmacextras-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtmultimedia-opensource-src-5.8.0.tar.xz";
+      sha256 = "01sakngvsqr90qhrxyghfqdpddpxwbjyzzhm34k0hlpr6i409g58";
+      name = "qtmultimedia-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtnetworkauth = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtnetworkauth-opensource-src-5.8.0.tar.xz";
+      sha256 = "1hz4lcm4cai56v0q7h1q6zc29ykkb2191iqmf8h7l5l9m71q2mb1";
+      name = "qtnetworkauth-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtpurchasing = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtpurchasing-opensource-src-5.8.0.tar.xz";
+      sha256 = "0mdkw73yx1csz9mf3wl0w1x1b8cv9j5px4nvakrknkjzaa9qgzdk";
+      name = "qtpurchasing-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols-opensource-src-5.8.0.tar.xz";
+      sha256 = "09mkswxw7wa2l8xz9fbblxr1pbi86hggis55j4k8ifnrrw60vrq4";
+      name = "qtquickcontrols-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols2-opensource-src-5.8.0.tar.xz";
+      sha256 = "06yy98x4vic2yrlpp83gf4kvl7kd93q62k178w0cy4sgqxp8d6dh";
+      name = "qtquickcontrols2-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtscript-opensource-src-5.8.0.tar.xz";
+      sha256 = "1lssbsjf2p2ag02fjq6k6vk7vywhj4jsl286r2fqi78q5lfvjfi9";
+      name = "qtscript-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtscxml = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtscxml-opensource-src-5.8.0.tar.xz";
+      sha256 = "1i4xl24q4i32mbhyndrwaz0xj79d9n84s320gmkf5rwnfcwrvfxn";
+      name = "qtscxml-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtsensors-opensource-src-5.8.0.tar.xz";
+      sha256 = "15p7bp21yj4cdl5yfc9qnn4lhhiwiwx3b71lrb431kgqxhwhcp9s";
+      name = "qtsensors-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtserialbus-opensource-src-5.8.0.tar.xz";
+      sha256 = "02n1b1wrvfg6c7z15c5c5gv9r5gd4pp58jrd1a8d8fg3ybcksd2q";
+      name = "qtserialbus-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtserialport-opensource-src-5.8.0.tar.xz";
+      sha256 = "1b86al3zn1pxyk0n59vh8bqxrpz2m0j33ygclaqbxl1sszg7ycaj";
+      name = "qtserialport-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtspeech = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtspeech-opensource-src-5.8.0.tar.xz";
+      sha256 = "0i2cx1b6ssj56p5blf7n16bbrq1g0hb27m3b5r6dh6py7mcq2spi";
+      name = "qtspeech-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz";
+      sha256 = "12fwzbp28szqw1sk3flb8i6xnxgl94siwyy41ffdmd0s44f1jwwq";
+      name = "qtsvg-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qttools = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz";
+      sha256 = "10wx4vydj91yag30457c7azx4ihrwky42l7zzwkbmdlksdv8xv4m";
+      name = "qttools-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qttranslations-opensource-src-5.8.0.tar.xz";
+      sha256 = "0bpwqclidji12f3f20hfpafr1b7b9wc7nhp4yhms1hhbqlpgfz1v";
+      name = "qttranslations-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtvirtualkeyboard = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtvirtualkeyboard-opensource-src-5.8.0.tar.xz";
+      sha256 = "0772yhb8w6rzxqgrdmvbw61vk2gagcs9zics56v3a2ckknrzbz9m";
+      name = "qtvirtualkeyboard-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwayland-opensource-src-5.8.0.tar.xz";
+      sha256 = "06ilh55vaxbkyv7irw0n11gxgc34ypx2qhqawxzy7kllzg9zcl7z";
+      name = "qtwayland-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebchannel-opensource-src-5.8.0.tar.xz";
+      sha256 = "0jhbgp9rdp5lpwjrykxmg4lb60wk7gm3dldz5kp3b8ms2dab3xav";
+      name = "qtwebchannel-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebengine-opensource-src-5.8.0.tar.xz";
+      sha256 = "1gkrvb8wa04p91hras2pa7i26n1q5xgsiq5gfw3fc488cvqj4g92";
+      name = "qtwebengine-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwebkit = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/community_releases/5.8/5.8.0-final/qtwebkit-opensource-src-5.8.0.tar.xz";
+      sha256 = "1v0vj6slyh19mjrrpbqdzb47fr0f4xk7bc8803xjzybb11h8dbkr";
+      name = "qtwebkit-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwebkit-examples = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/community_releases/5.8/5.8.0-final/qtwebkit-examples-opensource-src-5.8.0.tar.xz";
+      sha256 = "18ar35mg32knm3r0wgqv1hmxl9pqhi1y0yhd3lbskca0f0csxiw4";
+      name = "qtwebkit-examples-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebsockets-opensource-src-5.8.0.tar.xz";
+      sha256 = "1xa5p36grqxz3fa08amn7r3dy6k28g6y0gkc6jgj7lyhjzr0l4da";
+      name = "qtwebsockets-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwebview = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwebview-opensource-src-5.8.0.tar.xz";
+      sha256 = "1lvzab6vjmpsl3rq73afhvjv6hkkgj19sl6sd03fgx0iikfd9n5p";
+      name = "qtwebview-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtwinextras-opensource-src-5.8.0.tar.xz";
+      sha256 = "1761qaqbrsqqpznv2mrkc44fk4x3lc13x6s0z3ahjms6pna7pzr7";
+      name = "qtwinextras-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtx11extras-opensource-src-5.8.0.tar.xz";
+      sha256 = "03i8lk9qcdf8h2k4f3rkqqkzbrlnyaspv9mgjkn4k61s2asz5mxy";
+      name = "qtx11extras-opensource-src-5.8.0.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.8.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.8/5.8.0/submodules/qtxmlpatterns-opensource-src-5.8.0.tar.xz";
+      sha256 = "016s75j2cml7kc8scdm9a6pmxm8jhs424lml2h9znm1flmgadzvv";
+      name = "qtxmlpatterns-opensource-src-5.8.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5adbe3eb8061..d167438e5d98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9347,8 +9347,21 @@ with pkgs;
 
   libsForQt57 = recurseIntoAttrs (lib.makeScope qt57.newScope mkLibsForQt5);
 
-  qt5 = qt57;
-  libsForQt5 = libsForQt57;
+  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(...
+    cups = if stdenv.isLinux then cups else null;
+    harfbuzz = harfbuzz-icu;
+    mesa = mesa_noglu;
+    inherit perl;
+    inherit (gst_all_1) gstreamer gst-plugins-base;
+  });
+
+  libsForQt58 = recurseIntoAttrs (lib.makeScope qt58.newScope mkLibsForQt5);
+
+  qt5 = qt58;
+  libsForQt5 = libsForQt58;
 
   qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { };
 

From 8ec7f51167b2c23b951509a6ab6b077a9c2778cf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 10:11:01 -0600
Subject: [PATCH 1673/3449] phonon: 4.9.0 -> 4.9.1

Fix build failure with Qt 5.8.0
---
 pkgs/development/libraries/phonon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index defeb8db490f..696cd6a36e5e 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -6,7 +6,7 @@
 with lib;
 
 let
-  v = "4.9.0";
+  v = "4.9.1";
 in
 
 assert withQt5 -> qtbase != null;
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
-    sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v";
+    sha256 = "177647r2jqfm32hqcz2nqfqv6v48hn5ab2vc31svba2wz23fkgk7";
   };
 
   buildInputs =

From c93c57b8acb59b0904bee2a4208c25e245f50972 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Feb 2017 10:51:20 -0600
Subject: [PATCH 1674/3449] plasma5: 5.8.6 -> 5.9.3

---
 pkgs/desktops/plasma-5/fetch.sh               |   2 +-
 pkgs/desktops/plasma-5/kwin/default.nix       |  11 +-
 .../plasma-5/plasma-desktop/default.nix       |   7 +-
 .../plasma-5/plasma-workspace/default.nix     |   9 +-
 pkgs/desktops/plasma-5/srcs.nix               | 320 +++++++++---------
 pkgs/desktops/plasma-5/startkde/default.nix   |   6 +-
 pkgs/desktops/plasma-5/systemsettings.nix     |   4 +-
 7 files changed, 181 insertions(+), 178 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 7d127211956b..acf7f54f0ed8 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.8.6/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.3/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 3555cf91e005..01f90664276e 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -5,8 +5,9 @@
   kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
   ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications,
   kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem,
-  kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative,
-  qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, xwayland
+  kxmlgui, libICE, libSM, libinput, libxkbcommon, plasma-framework,
+  qtdeclarative, qtmultimedia, qtscript, qtx11extras, udev, wayland,
+  xcb-util-cursor, xwayland
 }:
 
 plasmaPackage {
@@ -19,9 +20,9 @@ plasmaPackage {
     breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets
     kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
     kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
-    kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM
-    plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev
-    wayland xcb-util-cursor xwayland
+    kwayland kwidgetsaddons kwindowsystem kxmlgui libICE libSM libxkbcommon
+    libinput plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras
+    udev wayland xcb-util-cursor xwayland
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postPatch = ''
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 1ac257057309..1c152500b6a0 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -6,8 +6,9 @@
   kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
   kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
   libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
-  plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras,
-  xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver,
+  plasma-workspace, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg,
+  qtx11extras, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
+  xorgserver,
   utillinux
 }:
 
@@ -21,7 +22,7 @@ plasmaPackage rec {
     xf86inputsynaptics xkeyboard_config xinput baloo kactivities
     kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel
     ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
-    qtquickcontrols qtx11extras ksysguard
+    qtquickcontrols qtquickcontrols2 qtx11extras ksysguard
   ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 19d530da1a60..5463e017d23c 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -7,8 +7,9 @@
   kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
   knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet,
   kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt,
-  phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, qtscript,
-  qtx11extras, solid, isocodes, libdbusmenu, libSM, libXcursor, pam, wayland
+  phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols,
+  qtquickcontrols2, qtscript, qtx11extras, solid, isocodes, libdbusmenu, libSM,
+  libXcursor, pam, wayland
 }:
 
 plasmaPackage {
@@ -20,8 +21,8 @@ plasmaPackage {
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
     kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
-    plasma-framework qtgraphicaleffects qtquickcontrols qtscript qtx11extras
-    solid isocodes libdbusmenu libSM libXcursor pam wayland
+    plasma-framework qtgraphicaleffects qtquickcontrols qtquickcontrols2
+    qtscript qtx11extras solid isocodes libdbusmenu libSM libXcursor pam wayland
   ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index aaaea8708ae6..eff7a816a09a 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/bluedevil-5.8.6.tar.xz";
-      sha256 = "0qz9v5wrx72s3r1shi3m77931kl7sx7p89dk3h9w1hy61bx0azlj";
-      name = "bluedevil-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/bluedevil-5.9.3.tar.xz";
+      sha256 = "0cfk0khcd62ficsmpxhiqwfdgwzv771ndlf0s7b8ghqqyckq6bld";
+      name = "bluedevil-5.9.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/breeze-5.8.6.tar.xz";
-      sha256 = "16wxrmnlk359kapa6zj8hfcjjdffvmqc7ibzdxdd8xpdva01p7sm";
-      name = "breeze-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/breeze-5.9.3.tar.xz";
+      sha256 = "0f1h7ky9chsnbm8r85lwipc1sh7kb32jdaj3wl9qd7k0q4j115x0";
+      name = "breeze-5.9.3.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/breeze-grub-5.8.6.tar.xz";
-      sha256 = "1ywlczid32a8z4rrjxc6c3b8q3l02a3b7scbxyljgfv7xzggj1fm";
-      name = "breeze-grub-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/breeze-grub-5.9.3.tar.xz";
+      sha256 = "1hbvmyj1f5f8v0pc70w93ck27xw25m4x70vnbhgqi91y5dd1gh49";
+      name = "breeze-grub-5.9.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/breeze-gtk-5.8.6.tar.xz";
-      sha256 = "1ppxsf868d2v9kmdz18hnbdwwqbs0xhpn7pc3bdxxj4gk87dpxpl";
-      name = "breeze-gtk-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/breeze-gtk-5.9.3.tar.xz";
+      sha256 = "12qa4wllgr52ycdprlxq0h4pgykbbs0vbmmmiardpzlrplm0an26";
+      name = "breeze-gtk-5.9.3.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/breeze-plymouth-5.8.6.tar.xz";
-      sha256 = "0cdrl0ri4b5zbld8wb3hkmsncac6qn3mswvb7zp63br3jiqfg7v8";
-      name = "breeze-plymouth-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/breeze-plymouth-5.9.3.tar.xz";
+      sha256 = "0vz0hgx3hl03h4rkfrcaydaddljam3jbg6gd7n600a068p74s2mm";
+      name = "breeze-plymouth-5.9.3.tar.xz";
     };
   };
   discover = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/discover-5.8.6.tar.xz";
-      sha256 = "04smq3n0prs2bjq6sn5kd5mp4aay58nr2fg10yq39sgyp2qkls0r";
-      name = "discover-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/discover-5.9.3.tar.xz";
+      sha256 = "0xkf08k4jz5ym406bpnjf3xsx0il9wka4jp2k38bkl3sxh2s900f";
+      name = "discover-5.9.3.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kactivitymanagerd-5.8.6.tar.xz";
-      sha256 = "0cxpf3aj22ap6m24gm1ybjykwv10ryqhpd4bv6wr748ckj5zsgh4";
-      name = "kactivitymanagerd-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kactivitymanagerd-5.9.3.tar.xz";
+      sha256 = "0ywby3ijq4hjljy5qwd7rybpk2x4scairjffiy5n1jg7lq6sm44r";
+      name = "kactivitymanagerd-5.9.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kde-cli-tools-5.8.6.tar.xz";
-      sha256 = "08j6mpn6g4mrdwiljfm5rqvyfjgd3wd4kpwmpmvrprqrd755m0cs";
-      name = "kde-cli-tools-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kde-cli-tools-5.9.3.tar.xz";
+      sha256 = "1p9zjp9jmknyh82d6av3xhy461fsdppjxrxbmrlm9z6nsjyp0m0a";
+      name = "kde-cli-tools-5.9.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kdecoration-5.8.6.tar.xz";
-      sha256 = "0nbh0phgfzc5j1l1adnq3gn5fkazgk2pg2iiqjkfbax6a7r9wwny";
-      name = "kdecoration-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kdecoration-5.9.3.tar.xz";
+      sha256 = "1z37llaqf9mrb4aif75dfvbhr51rrgfpncv70v916jddcf90q4i9";
+      name = "kdecoration-5.9.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kde-gtk-config-5.8.6.tar.xz";
-      sha256 = "07in78awn7kqg47zbypj5lb2i9yibrmpzkljjy67wwcwax5zlm2d";
-      name = "kde-gtk-config-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kde-gtk-config-5.9.3.tar.xz";
+      sha256 = "1wxk3brwq105258ndx5l98n78q2h2idigkpp5s2xzmzw05m3gg6r";
+      name = "kde-gtk-config-5.9.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kdeplasma-addons-5.8.6.tar.xz";
-      sha256 = "0yvh2n736apbfzqc5kdf3b0a9jyvlzcaamall1paa8jb8cg706px";
-      name = "kdeplasma-addons-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kdeplasma-addons-5.9.3.tar.xz";
+      sha256 = "1k3fsrafrd72qymyi2ij36al7k92mnssz90kmmh830pszif16js3";
+      name = "kdeplasma-addons-5.9.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kgamma5-5.8.6.tar.xz";
-      sha256 = "1kk9bygihnggm4kmgxf1bbd0wc92ijmzvm9k5cmkm3v0pc975viz";
-      name = "kgamma5-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kgamma5-5.9.3.tar.xz";
+      sha256 = "02s3j1c5gjcv7b79448sizs6hdw91jysq9prkzznprw6jbb615v1";
+      name = "kgamma5-5.9.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/khotkeys-5.8.6.tar.xz";
-      sha256 = "0x6z025vzpccz0yql7nafcarq6rpw3p7d7wjffdck3lym8vkalxj";
-      name = "khotkeys-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/khotkeys-5.9.3.tar.xz";
+      sha256 = "0jv77rpx01cl15qf9vzndpks2q2lgq8dhjq4pg34zh8khr03snlf";
+      name = "khotkeys-5.9.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kinfocenter-5.8.6.tar.xz";
-      sha256 = "1d8h5h01dy7s1yaapamcz4dzf0pjdykf7jn8y34hc0djxww29k4b";
-      name = "kinfocenter-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kinfocenter-5.9.3.tar.xz";
+      sha256 = "14zaqrjf77008dc5c071hw75vd4dwvvmgkyz74vhs94i7bspzy6a";
+      name = "kinfocenter-5.9.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kmenuedit-5.8.6.tar.xz";
-      sha256 = "0zvircfmggc4vwz6520i67s1yfv34zkx8ydj1vfhaabpsn7nqn1w";
-      name = "kmenuedit-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kmenuedit-5.9.3.tar.xz";
+      sha256 = "1m7naiy6jq031psdx4jsxq7vsldn9j4girq820m24inh2ky105zk";
+      name = "kmenuedit-5.9.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kscreen-5.8.6.tar.xz";
-      sha256 = "15k8pm1k2ylxqb3x4b75zi68firsxq56qfn39xddxnzncbsqp54r";
-      name = "kscreen-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kscreen-5.9.3.tar.xz";
+      sha256 = "1z3cihgjqrkg5h4y4gm1ah60r0vfpxrngry10fcc6343arbyk1bb";
+      name = "kscreen-5.9.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kscreenlocker-5.8.6.tar.xz";
-      sha256 = "1cql5wq4zh8sdwlgwibnyyx169g79948nhdqslw08ddw61f9llgd";
-      name = "kscreenlocker-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kscreenlocker-5.9.3.tar.xz";
+      sha256 = "0ccpgfp1gz07yiw98sqjlc097cac4z9qdcrwxm65bvqjj777by1a";
+      name = "kscreenlocker-5.9.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/ksshaskpass-5.8.6.tar.xz";
-      sha256 = "0y912dcvdx6gih0brnxnd3cysw0rj5pw7684xswaqz5i8iimw68g";
-      name = "ksshaskpass-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/ksshaskpass-5.9.3.tar.xz";
+      sha256 = "0jk6k5bn2aqjjl3li5qpmihk57d5hc197cpqjaj61a0bapab42hw";
+      name = "ksshaskpass-5.9.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/ksysguard-5.8.6.tar.xz";
-      sha256 = "0c0bxv5m0kziyqzwr6x46g4x2kahmq6n95kgcbihv74yvnn6v049";
-      name = "ksysguard-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/ksysguard-5.9.3.tar.xz";
+      sha256 = "0paypcwah41p2ygmfwzhw8mdfh47a6x0190yngxn8j0jhzfyllca";
+      name = "ksysguard-5.9.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kwallet-pam-5.8.6.tar.xz";
-      sha256 = "1ii1035w8xqvkbm0ckj5iq4qq7fnbix7vyvwmdjm8m4xm0rr7g33";
-      name = "kwallet-pam-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kwallet-pam-5.9.3.tar.xz";
+      sha256 = "1pmsfp6pn1r3crg5z5v7sz413v9qvn0j4n9l88zbw538lz2scpna";
+      name = "kwallet-pam-5.9.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kwayland-integration-5.8.6.tar.xz";
-      sha256 = "0bd8hnqr6sqlzk0qrymk6jdxnl2niamb1a08m8d27qdybm0ga56v";
-      name = "kwayland-integration-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kwayland-integration-5.9.3.tar.xz";
+      sha256 = "1r3cryv10lkvl1nrpq21w4kj9jd270m3p3dw07d888b891rgmzb7";
+      name = "kwayland-integration-5.9.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kwin-5.8.6.tar.xz";
-      sha256 = "1p9dgh6d25h41bgnx9jiyb9qg7jyc61kbzh9j9vy9j5kd97dsjg5";
-      name = "kwin-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kwin-5.9.3.tar.xz";
+      sha256 = "119cy472x5ssrr54v14pbs85gfrsjhz99ms8flb1xp38jb14xxhk";
+      name = "kwin-5.9.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/kwrited-5.8.6.tar.xz";
-      sha256 = "08frbgzfzqhi4si3v024lx4dypxvm60mdz2xzyyx482iqjny97d5";
-      name = "kwrited-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/kwrited-5.9.3.tar.xz";
+      sha256 = "0liqspd4m6xly48vv85abnaxfvsjcbgg58843j9fpnzkk9nlj98q";
+      name = "kwrited-5.9.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/libkscreen-5.8.6.tar.xz";
-      sha256 = "0210lyvsk9wm7svj3bkaa9j0n57lfzs56jplasdqdia1450n7dmf";
-      name = "libkscreen-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/libkscreen-5.9.3.tar.xz";
+      sha256 = "1nxhbxmr0kmyp745bf3vd21xcjpv7jac9bdagraiqfcmwj4f86gb";
+      name = "libkscreen-5.9.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/libksysguard-5.8.6.tar.xz";
-      sha256 = "0i325hzl9zsknkr1dcdg64r4msrnvbb4b9rmjysygnpyll6n9bm8";
-      name = "libksysguard-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/libksysguard-5.9.3.tar.xz";
+      sha256 = "0fj7rycawarg7iydml0xw20nkyxlwa2nl5chxbbcs5mnmvpfv6ig";
+      name = "libksysguard-5.9.3.tar.xz";
     };
   };
   milou = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/milou-5.8.6.tar.xz";
-      sha256 = "00svi7f9pa1m6gxkkf8vngyf4jzv7k88pbcnlvik38zws17j4vbs";
-      name = "milou-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/milou-5.9.3.tar.xz";
+      sha256 = "1pmk9czmpz0mfqmkv7gl9wdlj8b7wwixv1zb43q24a471qby2xf3";
+      name = "milou-5.9.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/oxygen-5.8.6.tar.xz";
-      sha256 = "1dspmzjmymnnv6blz2sfw0ynpqbw6cqzvhlnmzakf3xq8jd99k0m";
-      name = "oxygen-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/oxygen-5.9.3.tar.xz";
+      sha256 = "1v529wp9ll1hzb48xswigzf2r23k84f4cd7am2fnj73p3a0rg5ia";
+      name = "oxygen-5.9.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-desktop-5.8.6.tar.xz";
-      sha256 = "10qz1r777wr8wdr5lb7fph8ny8sxbm9vlq6njpn9rxxwr0nhlp6y";
-      name = "plasma-desktop-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-desktop-5.9.3.tar.xz";
+      sha256 = "0582n21nd15834mxc54pq1nx9a5z8ds3yz0x0lc5m35ps7abh7im";
+      name = "plasma-desktop-5.9.3.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-integration-5.8.6.tar.xz";
-      sha256 = "0v07i95xxv5rp0lis2xm0p66qicbigqjlx3sxyvcj3llf73jpcnc";
-      name = "plasma-integration-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-integration-5.9.3.tar.xz";
+      sha256 = "1yq3i0sqsn0m2y62npyad1nv17hgc0fm35cfq5fdjd96sr356znl";
+      name = "plasma-integration-5.9.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-nm-5.8.6.tar.xz";
-      sha256 = "162756r2rif415w8x6x67h8bwjvvmfv56s84p7a4k5zisyr1j678";
-      name = "plasma-nm-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-nm-5.9.3.tar.xz";
+      sha256 = "1i5djnbimkwcbjh6bi0cdw98qskli4jd1c8a8dbwqqh5pyqbrf66";
+      name = "plasma-nm-5.9.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-pa-5.8.6.tar.xz";
-      sha256 = "173w2ks2nm4sp96vj3pkax1d8asshd9y39m5cwq8mgzgpz6ldjp8";
-      name = "plasma-pa-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-pa-5.9.3.tar.xz";
+      sha256 = "0br83bnm6g7lzw4hwkppk8l6scbzblr3m3mi64a852lnxxvdwn01";
+      name = "plasma-pa-5.9.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-sdk-5.8.6.tar.xz";
-      sha256 = "1vadfwv23r33f5byaf3zj8m12a84r4qk24ak7qyq869m9gznyw8r";
-      name = "plasma-sdk-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-sdk-5.9.3.tar.xz";
+      sha256 = "104rhybchdjqnglzp3bpjv8052n2gi44bn58nyb6wz6gkzg3xzrb";
+      name = "plasma-sdk-5.9.3.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-tests-5.8.6.tar.xz";
-      sha256 = "0baqfn861jy7kmaqka79k6nkr7vivzymk8jy3glkh21rm4yl8gvh";
-      name = "plasma-tests-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-tests-5.9.3.tar.xz";
+      sha256 = "1wpbfna9yjvzc5fhgnw2hwnq04vzb3qfy42zrwbijy8sl6csgzzp";
+      name = "plasma-tests-5.9.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-5.8.6.tar.xz";
-      sha256 = "14h1lmyyb4rxnww7vyn9wnsi56v9ydhpbwmk9sv3zj1k9igqpasi";
-      name = "plasma-workspace-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-5.9.3.tar.xz";
+      sha256 = "0lnb36qnkw5z7w1y5ykiz6xfhc4h21dzlbhddipvd97bxycad6vg";
+      name = "plasma-workspace-5.9.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-wallpapers-5.8.6.tar.xz";
-      sha256 = "11s2sc37xni78fyb0yvnhlkw6ahhx4pkynqr06bmd9vq6c3133id";
-      name = "plasma-workspace-wallpapers-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-wallpapers-5.9.3.tar.xz";
+      sha256 = "1ikjj41nn5hn9r3glfhqsizawhkpw3cvybqq0ym4zky9lvbxzxb0";
+      name = "plasma-workspace-wallpapers-5.9.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.8.6";
+    version = "1-5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/polkit-kde-agent-1-5.8.6.tar.xz";
-      sha256 = "10bglbr7svm9bfl4a5kfyvj5zpyk46hsyh2rq9z9qy9ds76fh9w2";
-      name = "polkit-kde-agent-1-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/polkit-kde-agent-1-5.9.3.tar.xz";
+      sha256 = "0kfafag3bqp03aaa5dn7f8mkc174s80mwn98linl1dn12np2wv2q";
+      name = "polkit-kde-agent-1-5.9.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/powerdevil-5.8.6.tar.xz";
-      sha256 = "0cmyx267z917qqpndpzqzlgzx1hf54430644rhr7cf9iqqilvnv4";
-      name = "powerdevil-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/powerdevil-5.9.3.tar.xz";
+      sha256 = "1sphmngckfns5sx0n95njf39m02fg3q7bdafwrw8i4lv2svb1axj";
+      name = "powerdevil-5.9.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/sddm-kcm-5.8.6.tar.xz";
-      sha256 = "0xd8137pb0409vfiwv5n1vzzwa1vcvf3rgc36fid5hnlrdc15ilc";
-      name = "sddm-kcm-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/sddm-kcm-5.9.3.tar.xz";
+      sha256 = "142na2cnx5v459798fq6gx30k9v0i10myfyvgv562n1x79nbkyl0";
+      name = "sddm-kcm-5.9.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/systemsettings-5.8.6.tar.xz";
-      sha256 = "1zy037pb8w9xbzg316hbqfmfm39aylqngb5v08yn5hcnvxcll71v";
-      name = "systemsettings-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/systemsettings-5.9.3.tar.xz";
+      sha256 = "15ihvbkp91dz1z1z5dqgqyziiklzq2zkl3ns8dqzs3pbpki7jbqc";
+      name = "systemsettings-5.9.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.8.6";
+    version = "5.9.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.8.6/user-manager-5.8.6.tar.xz";
-      sha256 = "1z0aj5cvl5rxikbbvrvg0dq6y68jxm34ssf3gvhkd0jqlyqdl7ip";
-      name = "user-manager-5.8.6.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.3/user-manager-5.9.3.tar.xz";
+      sha256 = "1s91zgh1rcqrpyh9fiklwqj2m78ify5fv83kh9zvyl4bapgyb0gn";
+      name = "user-manager-5.9.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
index 516d651cec25..87c72fdc5995 100644
--- a/pkgs/desktops/plasma-5/startkde/default.nix
+++ b/pkgs/desktops/plasma-5/startkde/default.nix
@@ -1,8 +1,8 @@
 {
   stdenv, lib, runCommand, dbus, qttools, socat, gnugrep, gnused, kconfig,
   kinit, kservice, plasma-workspace, xmessage, xprop, xsetroot, qtbase,
-  qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtscript, qtsvg,
-  qtx11extras, qtxmlpatterns
+  qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2,
+  qtscript, qtsvg, qtx11extras, qtxmlpatterns
 }:
 
 let
@@ -19,7 +19,7 @@ let
       ];
     libs = builtins.map (pkg: pkg.out or pkg)
       [
-        qtbase qtdeclarative qtgraphicaleffects qtquickcontrols
+        qtbase qtdeclarative qtgraphicaleffects qtquickcontrols qtquickcontrols2
         qtscript qtsvg qtx11extras qtxmlpatterns
       ];
   };
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 32ea83d9d507..4146e34c2f73 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,7 +1,7 @@
 {
   plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
-  kservice, kwindowsystem, kxmlgui, qtquickcontrols
+  kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2
 }:
 
 plasmaPackage {
@@ -9,6 +9,6 @@ plasmaPackage {
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
-    kwindowsystem kxmlgui qtquickcontrols
+    kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
   ];
 }

From 46ba7cf94a21f7e78ddfd72bdca61f567219ccec Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 1 Mar 2017 09:36:37 -0600
Subject: [PATCH 1675/3449] lyx: pin to Qt 5.7

Build fails with Qt 5.8 due to an ambiguous overloaded member function.
---
 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 d167438e5d98..e08d6b661ee2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14320,7 +14320,7 @@ with pkgs;
 
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
-  lyx = libsForQt5.callPackage ../applications/misc/lyx { };
+  lyx = libsForQt57.callPackage ../applications/misc/lyx { };
 
   mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
 

From f5d460a7a0795f0caf85625adda970dd94491b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 1 Mar 2017 18:30:27 +0100
Subject: [PATCH 1676/3449] qt5.qtbase: fix host_bins= path in pkg-config file

So that pkg-config can be used to find 'moc' etc. (Currently it points
to a non-existing path.)

Fixes #22945 ('Linux kbuild incompatible with "nix-shell -p qt5.full"').
---
 .../libraries/qt-5/5.5/qtbase/default.nix     |  3 +++
 .../libraries/qt-5/5.6/qtbase/default.nix     |  3 +++
 .../libraries/qt-5/5.7/qtbase/default.nix     | 23 ++++++++++++++++
 .../libraries/qt-5/5.8/qtbase/default.nix     | 27 ++++++++++++++++++-
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index a8598f654dda..87fb3f08e2b9 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -269,6 +269,9 @@ stdenv.mkDerivation {
               done
           popd
       fi
+
+      # fixup .pc file (where to find 'moc' etc.)
+      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
     '';
 
   inherit lndir;
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 341ebe1198b7..b0e12ae99e48 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -267,6 +267,9 @@ stdenv.mkDerivation {
               done
           popd
       fi
+
+      # fixup .pc file (where to find 'moc' etc.)
+      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
     '' + lib.optionalString stdenv.isDarwin ''
       fixDarwinDylibNames_rpath() {
         local flags=()
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 934203950b09..7f0c71f64b25 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -228,6 +228,29 @@ stdenv.mkDerivation {
               done
           popd
       fi
+
+      # fixup .pc file (where to find 'moc' etc.)
+      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
+    ''
+    # 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;
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 e4783ef9838a..cafaaecaa507 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -225,10 +225,35 @@ stdenv.mkDerivation {
               done
           popd
       fi
+
+      # fixup .pc file (where to find 'moc' etc.)
+      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
+    ''
+    # 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 = ../../qtbase-setup-hook.sh;
+  setupHook = if stdenv.isDarwin
+              then ../../qtbase-setup-hook-darwin.sh
+              else ../../qtbase-setup-hook.sh;
 
   enableParallelBuilding = true;
 

From d12df18235ce8e7cd2f4cd066e89d53d00490080 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 3 Mar 2017 15:45:24 -0600
Subject: [PATCH 1677/3449] undmg: 1.0.2 -> 1.0.3

undmg: Readd setup-hook
---
 pkgs/tools/archivers/undmg/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
index 5cb7bf2c62fc..89bb816aa579 100644
--- a/pkgs/tools/archivers/undmg/default.nix
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -1,27 +1,28 @@
 { stdenv, fetchFromGitHub, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.2";
+  version = "1.0.3";
   name = "undmg-${version}";
 
   src = fetchFromGitHub {
     owner = "matthewbauer";
     repo = "undmg";
-    rev = "refs/tags/v${version}";
-    sha256 = "0w9vwvj9zbpsjkg251bwv9y10wjyjmh54q2piklz74w64rlbqblr";
-    name = "undmg-${version}";
+    rev = "v${version}";
+    sha256 = "1pxqw92h2w75d4jwiihwnkhnsfk09cddh3flgrqwh9r3ry14fgbb";
+    
   };
 
   buildInputs = [ zlib bzip2 ];
 
   setupHook = ./setup-hook.sh;
 
-  installFlags = "PREFIX=\${out}";
+  makeFlags = "PREFIX=$(out)";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/matthewbauer/undmg;
     description = "Extract a DMG file";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ matthewbauer lnl7 ];
   };
 }

From cc7c3c6bb84f0f235bf8c136995074cdf4ae89b5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 17:34:27 -0600
Subject: [PATCH 1678/3449] nixos/plasma5: set GST_PLUGIN_SYSTEM_PATH_1_0 to
 list of paths

---
 .../services/x11/desktop-managers/plasma5.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 24225308ffb3..15ffd330e72c 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -181,17 +181,17 @@ in
       };
 
       environment.variables = {
-        # Enable GTK applications to load SVG icons
         GST_PLUGIN_SYSTEM_PATH_1_0 =
-          lib.makeSearchPath "/lib/gstreamer-1.0"
-          (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
-            gstreamer
-            gst-plugins-base
-            gst-plugins-good
-            gst-plugins-ugly
-            gst-plugins-bad
-            gst-libav # for mp3 playback
-          ]));
+          builtins.map (pkg: getLib pkg + "/lib/gstreamer-1.0")
+            (with pkgs.gst_all_1; [
+              gstreamer
+              gst-plugins-base
+              gst-plugins-good
+              gst-plugins-ugly
+              gst-plugins-bad
+              gst-libav # for mp3 playback
+            ]);
+        # Enable GTK applications to load SVG icons
         GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
       };
 

From a7645c293f99407b6b46ac13d41efbd92fed5553 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 5 Mar 2017 00:48:17 +0100
Subject: [PATCH 1679/3449] getmail: 4.53.0 -> 4.54.0

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

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 5eac65a009a7..691b93844a02 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,17 +1,23 @@
 { stdenv, fetchurl, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  version = "4.53.0";
+  version = "4.54.0";
   name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "1awjdxiq3d25h10h32a7h2wxbkgvgvsnicp5xwx4p8mm6gz9c998";
+    sha256 = "0r9s91zrdm6xklnj1fwzz74cxhkbmrgrrp86n62qgijkafa5fmnl";
   };
 
   doCheck = false;
 
+  postPatch = ''
+    # getmail spends a lot of effort to build an absolute path for
+    # documentation installation; too bad it is counterproductive now
+    sed -e '/datadir or prefix,/d' -i setup.py
+  '';
+
   meta = {
     description = "A program for retrieving mail";
     maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ];

From 4618585e5e4f563a87ea4f14c794543ba99e3a15 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Mar 2017 16:46:40 +0800
Subject: [PATCH 1680/3449] qsyncthing: build against qt 5.6 as 5.7 segfaults

---
 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 0fdaf8e4d108..7e1cb3ca6557 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14975,7 +14975,8 @@ with pkgs;
     qt = qt4;
   };
 
-  qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
+  # 0.5.7 segfaults when opening the main panel with qt 5.7
+  qsyncthingtray = libsForQt56.callPackage ../applications/misc/qsyncthingtray { };
 
   qsynth = callPackage ../applications/audio/qsynth { };
 

From 3f34000358f40c459b533724a0b0240273f682bb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Mar 2017 16:47:04 +0800
Subject: [PATCH 1681/3449] xca: build against qt 5.6 as 5.7 segfaults

---
 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 7e1cb3ca6557..1c3a78d44f68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15966,7 +15966,8 @@ with pkgs;
   };
   xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers;
 
-  xca = libsForQt5.callPackage ../applications/misc/xca { };
+  # v1.3.2 segfaults with qt 5.7
+  xca = libsForQt56.callPackage ../applications/misc/xca { };
 
   xcalib = callPackage ../tools/X11/xcalib { };
 

From 69b504fc4b30316566bbbbdfc3edaa0a437d6644 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 4 Mar 2017 19:52:28 -0600
Subject: [PATCH 1682/3449] links2: 2.13 -> 2.14

---
 .../networking/browsers/links2/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 148e20f1bbcb..be2a836a085c 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.13";
+  version = "2.14";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "c252095334a3b199fa791c6f9a9affe2839a7fbd536685ab07851cb7efaa4405";
+    sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp";
   };
 
   buildInputs =
@@ -35,10 +35,10 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://links.twibright.com/;
     description = "A small browser with some graphics support";
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud viric ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ raskin urkud viric ];
+    platforms = platforms.linux;
   };
 }

From fbc92ef6a37dcd1b71927956347c5434096e9139 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 4 Mar 2017 20:17:10 -0600
Subject: [PATCH 1683/3449] freetalk: 4.0rc6 -> 4.1

---
 .../instant-messengers/freetalk/default.nix   | 47 ++++++++-----------
 1 file changed, 20 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
index 01707dd1ff32..ca8d7f2076ec 100644
--- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix
+++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix
@@ -1,42 +1,35 @@
-{ stdenv, fetchgit
+{ stdenv, fetchFromGitHub
 , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool
 , libunwind, ncurses, curl, jansson, texinfo
 , automake, autoconf
 }:
 
-let
-  s = rec {
-    baseName="freetalk";
-    version="4.0rc6";
-    name="${baseName}-${version}";
-    url="https://github.com/GNUFreetalk/freetalk";
-    rev = "refs/tags/v${version}";
-    sha256="1wr3q40f4gwmr0vm6w07d5vzr65q6llk9xxq75klpcj83va5l3xv";
+stdenv.mkDerivation rec {
+  name = "freetalk-${version}";
+  version = "4.1";
+  
+  src = fetchFromGitHub {
+    owner = "GNUFreetalk";
+    repo = "freetalk";
+    rev = "v${version}";
+    sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757";
   };
-  buildInputs = [
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+ buildInputs = [
     guile pkgconfig glib loudmouth gmp libidn readline libtool
     libunwind ncurses curl jansson texinfo
     autoconf automake
   ];
-in
-stdenv.mkDerivation {
-  inherit (s) name version;
-  inherit buildInputs;
-  src = fetchgit {
-    inherit (s) url rev sha256;
-  };
 
-  preConfigure = ''
-    patchShebangs .
-    ./autogen.sh
-  '';
-
-  meta = {
-    inherit (s) version;
+  meta = with stdenv.lib; {
     description =  "Console XMPP client";
-    license = stdenv.lib.licenses.gpl3Plus ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus ;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
     downloadPage = "http://www.gnu.org/software/freetalk/";
   };
 }

From 48fba404297c95ad13d4a3b41163bfa50a3720b5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Mar 2017 09:53:36 +0800
Subject: [PATCH 1684/3449] terraform: 0.8.8

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

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 2f57456f309c..7dc2c5ed4982 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "terraform-${version}";
-  version = "0.8.7";
+  version = "0.8.8";
 
   goPackagePath = "github.com/hashicorp/terraform";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "hashicorp";
     repo   = "terraform";
     rev    = "v${version}";
-    sha256 = "0b30m0qc50x84klc8ggc3i83z36l46b1qmc8mpw90mxp07ra8vbw";
+    sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
   postInstall = ''

From f9e76bae63dfce55bcc6624bc0b860aa73cd8801 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Mar 2017 09:56:30 +0800
Subject: [PATCH 1685/3449] terragrunt: 0.10.3 -> 0.11.0

---
 .../networking/cluster/terragrunt/default.nix             | 4 ++--
 pkgs/applications/networking/cluster/terragrunt/deps.nix  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index b7845b177060..e2641b2d6571 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.10.3";
+  version = "0.11.0";
 
   goPackagePath = "github.com/gruntwork-io/terragrunt";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev    = "v${version}";
     owner  = "gruntwork-io";
     repo   = "terragrunt";
-    sha256 = "1vyyal4m8qwmlsvd2hriwvgly17iava0siyx7gdhy6dcs8ivc4ng";
+    sha256 = "0i0ds6llkzrn6a0qq53d2pbb6ghc47lnd004zqfbgn3kwiajx73b";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix
index dcc8ee66fb42..31f9f9a2b703 100644
--- a/pkgs/applications/networking/cluster/terragrunt/deps.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/aws/aws-sdk-go";
-      rev = "9350193373dc6d4bb4d6af55675c11ca7fc4230c";
-      sha256 = "0n9b1szwf69mjmf7dgl1b2hv3aqjhih2pvfcjxnv1xgbigm821w2";
+      rev = "78568b07950e5e7948496878fe99b9436add41d4";
+      sha256 = "0qi3q9qx8k055i2hlc6n8agl7nw1hzcw7aqqykla6z0hjv2hq0c3";
     };
   }
   {
@@ -95,8 +95,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/urfave/cli";
-      rev = "2526b57c56f30b50466c96c4133b1a4ad0f0191f";
-      sha256 = "03vvr1wq4pw2fixxsbr1d623hwqxf93d07p8vjml6iyd6k97b15p";
+      rev = "9e5b04886c4bfee2ceba1465b8121057355c4e53";
+      sha256 = "18jx6ypc1w02ha37rsx6hhmdwqmnybajd6l54qm07bdb850ip9db";
     };
   }
 ]

From e6150d8be9811b72449aad0d106b9417b6036813 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Mar 2017 12:28:01 +0800
Subject: [PATCH 1686/3449] pmccabe: 2.4 -> 2.6

---
 .../tools/misc/pmccabe/default.nix            | 33 +++++++++++--------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix
index 18f3fe375cbc..77066cfc8e15 100644
--- a/pkgs/development/tools/misc/pmccabe/default.nix
+++ b/pkgs/development/tools/misc/pmccabe/default.nix
@@ -1,24 +1,30 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pmccabe-2.4-CVS20070814";
+  name = "pmccabe-${version}";
+  version = "2.6";
 
   src = fetchurl {
-    url = "http://cvs.parisc-linux.org/download/${name}.tar.gz";
-    sha256 = "0nqvfdf2cxx516nw0rwr3lhzhiyrnpc2jf45ldfwsdc9rm2nj3r9";
+    url = "http://http.debian.net/debian/pool/main/p/pmccabe/pmccabe_${version}.tar.gz";
+    sha256 = "0a3h1b9fb87c82d5fbql5lc4gp338pa5s9i66dhw7zk8jdygx474";
   };
 
   configurePhase = ''
-    sed -i "Makefile"							\
-        -"es|^[[:blank:]]*DESTDIR[[:blank:]]*=.*$|DESTDIR = $out|g ;	\
-	   s|^[[:blank:]]*INSTALL[[:blank:]]*=.*$|INSTALL = install|g ;	\
-	   s|/usr/|/|g"
-  '';
+    sed -i -r Makefile \
+      -e 's,/usr/,/,g' \
+      -e "s,^DESTDIR =.*$,DESTDIR = $out," \
+      -e "s,^INSTALL = install.*$,INSTALL = install," \
+      -e "s,^all:.*$,all: \$(PROGS),"
+    '';
 
-  meta = {
+  checkPhase = "make test";
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     description = "McCabe-style function complexity and line counting for C and C++";
-    homepage = http://www.parisc-linux.org/~bame/pmccabe/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    homepage = https://people.debian.org/~bame/pmccabe/;
+    license = licenses.gpl2Plus;
 
     longDescription = ''
       pmccabe calculates McCabe-style cyclomatic complexity for C and
@@ -32,6 +38,7 @@ stdenv.mkDerivation rec {
       trees or files; and vifn, to invoke vi given a function name rather
       than a file name.
     '';
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ peterhoeg ];
   };
 }

From cd18b65432df1ac3888bb63b78c0af19232c8a14 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 3 Mar 2017 17:00:46 -0600
Subject: [PATCH 1687/3449] hexcurse: 1.58 -> 1.60.0

---
 pkgs/applications/editors/hexcurse/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix
index 861bf88f7dd2..17bb9739b9b7 100644
--- a/pkgs/applications/editors/hexcurse/default.nix
+++ b/pkgs/applications/editors/hexcurse/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "hexcurse-${version}";
-  version = "1.58";
+  version = "1.60.0";
+
   src = fetchFromGitHub {
     owner = "LonnyGomes";
     repo = "hexcurse";
-    rev = "hexcurse-${version}";
-    sha256 = "0hm9mms2ija3wqba0mkk9i8fhb8q1pam6d6pjlingkzz6ygxnnp7";
+    rev = "v${version}";
+    sha256 = "17ckkxfzbqvvfdnh10if4aqdcq98q3vl6dn1v6f4lhr4ifnyjdlk";
   };
-  buildInputs = [
-    ncurses
-  ];
+  buildInputs = [ ncurses ];
+  
   meta = with lib; {
     description = "ncurses-based console hexeditor written in C";
     homepage = "https://github.com/LonnyGomes/hexcurse";

From 7582da5d8bf8613e4e3b4a10d0516e2faa3dc511 Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Sat, 4 Mar 2017 10:21:25 -0900
Subject: [PATCH 1688/3449] eclipse: import builder instead of callPackage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Switched from callPackage to import so that dependencies are passed
instead of being grabbed from pkgs.

[Bjørn: wrap overlong line.]
---
 pkgs/applications/editors/eclipse/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d9d731f3835f..9271579346aa 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
-, glib, libXtst, jdk
+, glib, gtk2, libXtst, jdk
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
 , callPackage
@@ -10,7 +10,10 @@ assert stdenv ? glibc;
 
 rec {
 
-  buildEclipse = callPackage ./build-eclipse.nix { };
+  buildEclipse = import ./build-eclipse.nix {
+    inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
+            jdk glib gtk2 libXtst webkitgtk2 makeWrapper;
+  };
 
   ### Eclipse CPP
 

From 49ea0e27363e5ab5cb3b4e86f6531e799e43dabd Mon Sep 17 00:00:00 2001
From: zraexy <zraexy@users.noreply.github.com>
Date: Sat, 4 Mar 2017 10:33:53 -0900
Subject: [PATCH 1689/3449] eclipse: Do not use webkitgtk2 by default

Tell callPackage to not include webkitgtk2 due to the fact that it has
multiple vulnerabilities.
---
 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 1c3a78d44f68..f3a660dc7108 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13110,7 +13110,7 @@ with pkgs;
 
   eaglemode = callPackage ../applications/misc/eaglemode { };
 
-  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { });
+  eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { webkitgtk2 = null; });
 
   ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
 

From 199f57079ccbbe6db8e3dbe9c59112005067a9c9 Mon Sep 17 00:00:00 2001
From: Miguel Madrid <mimadrid@users.noreply.github.com>
Date: Sun, 5 Mar 2017 11:54:21 +0100
Subject: [PATCH 1690/3449] shotwell: 0.25.5 -> 0.25.90 (#23478)

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

diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 814127abe7d2..8cd1a04e977d 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,19 +1,19 @@
 { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala_0_28, sqlite
 , webkitgtk, pkgconfig, gnome3, gst_all_1, which, udev, libgudev, libraw, glib, json_glib
 , gettext, desktop_file_utils, lcms2, gdk_pixbuf, librsvg, wrapGAppsHook
-, gnome_doc_utils, hicolor_icon_theme, itstool }:
+, gnome_doc_utils, hicolor_icon_theme, itstool, libgdata }:
 
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
 stdenv.mkDerivation rec {
   version = "${major}.${minor}";
   major = "0.25";
-  minor = "5";
+  minor = "90";
   name = "shotwell-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz";
-    sha256 = "10pv3v789hky8h7ladqzzmgvkmgy3c41n4xz0nnyjmpycwl26g29";
+    sha256 = "1xlywhwr27n2q7xid19zzgf6rmmiyf4jq62rxn2af2as8rpkf1pm";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
                   which udev libgudev gnome3.gexiv2 hicolor_icon_theme
                   libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg
                   wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr
-                  gnome3.defaultIconTheme itstool ];
+                  gnome3.defaultIconTheme itstool libgdata ];
 
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";

From cc9b960f48a117fa720f645b9f496eca576591a8 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 20:13:55 -0600
Subject: [PATCH 1691/3449] scanmem: 0.15.6 -> 0.16

---
 pkgs/tools/misc/scanmem/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix
index 654ba4c1795c..03c1273a7d32 100644
--- a/pkgs/tools/misc/scanmem/default.nix
+++ b/pkgs/tools/misc/scanmem/default.nix
@@ -1,23 +1,27 @@
 { stdenv, autoconf, automake, intltool, libtool, fetchFromGitHub, readline }:
 
 stdenv.mkDerivation rec {
-  version = "0.15.6";
+  version = "0.16";
   name = "scanmem-${version}";
+ 
   src = fetchFromGitHub {
     owner  = "scanmem";
     repo   = "scanmem";
     rev    = "v${version}";
-    sha256 = "16cw76ji3mp0sj8q0sz5wndavk10n0si1sm6kr5zpiws4sw047ii";
+    sha256 = "131rx6cpnlz2x36r0ry80gqapmxpz2qc3h0040xhvp7ydmd4fyjd";
   };
-  buildInputs = [ autoconf automake intltool libtool readline ];
+
+  nativeBuildInputs = [ autoconf automake intltool libtool ];
+  buildInputs = [ readline ];
+  
   preConfigure = ''
     ./autogen.sh
   '';
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/scanmem/scanmem";
     description = "Memory scanner for finding and poking addresses in executing processes";
-    maintainers = [ stdenv.lib.maintainers.chattered  ];
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ maintainers.chattered  ];
+    platforms = with platforms; linux ++ darwin;
+    license = licenses.gpl3;
   };
 }

From 36f27506e5796d879f5b8ccea585b5f8711300eb Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 19:18:21 -0600
Subject: [PATCH 1692/3449] ttfautohint: 1.3 -> 1.6

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

diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix
index e539c0e1e025..1042c5794bdf 100644
--- a/pkgs/tools/misc/ttfautohint/default.nix
+++ b/pkgs/tools/misc/ttfautohint/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, harfbuzz, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "1.3";
+  version = "1.6";
   name = "ttfautohint-${version}";
   
   src = fetchurl {
     url = "mirror://savannah/freetype/${name}.tar.gz";
-    sha256 = "01719jgdzgf0m4fzkkij563iksr40c7wydv1yq8ygpxjj0vs17y3";
+    sha256 = "1r8vsznvh89ay35angxp3w1xljxjlpcv9wdjyn7m61n323vi6474";
   };
-
-  buildInputs = [ harfbuzz pkgconfig qt4 ];
+  
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ harfbuzz qt4 ];
 
   meta = with stdenv.lib; {
     description = "An automatic hinter for TrueType fonts";
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.freetype.org/ttfautohint/;
     license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu ndowens ];
     platforms = platforms.linux;
   };
 

From 81db3f2b0b1c48655904713ab05fe57d6664ce89 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 5 Mar 2017 06:35:34 -0500
Subject: [PATCH 1693/3449] nix-buffer: 2.2.0 -> 2.3.0

---
 pkgs/applications/editors/emacs-modes/melpa-generated.nix   | 6 +++---
 .../editors/emacs-modes/melpa-stable-generated.nix          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index d1ef872ad3ba..2d667e29e361 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -45711,12 +45711,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170304.1037";
+        version = "20170305.333";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "8205f24c1315d178d23ac682c5e33800752ce80e";
-          sha256 = "00lxvfvkjyk041xv8jis0hdqdq6vn4di8gd5cd9cwvhcgqbznyvp";
+          rev = "c48d501ec6a1c2d8295190abd1e27ef61867c92b";
+          sha256 = "0q4fhf311c8pz0lwp4lc7i9jxpvdrp2a1b2jgi3g2wv5fcavx5a7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 82a328dcce1c..3645e4a098f4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -22207,12 +22207,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "2.2.0";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "8205f24c1315d178d23ac682c5e33800752ce80e";
-          sha256 = "00lxvfvkjyk041xv8jis0hdqdq6vn4di8gd5cd9cwvhcgqbznyvp";
+          rev = "c48d501ec6a1c2d8295190abd1e27ef61867c92b";
+          sha256 = "0q4fhf311c8pz0lwp4lc7i9jxpvdrp2a1b2jgi3g2wv5fcavx5a7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";

From 2fd787ddd1838eebc4ce1bdc952427daa1cb3ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 5 Mar 2017 12:38:20 +0100
Subject: [PATCH 1694/3449] libuv: disable another flaky test on Darwin

I really want to avoid debugging these on Darwin.
---
 pkgs/development/libraries/libuv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index fe4ed6e410ec..0b3b86e66a24 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
       "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces
       "getaddrinfo_fail" "getaddrinfo_fail_sync"
     ]
-      # sometimes: timeout (no output)
-      ++ stdenv.lib.optional stdenv.isDarwin "process_title";
+      # sometimes: timeout (no output), failed uv_listen
+      ++ stdenv.lib.optionals stdenv.isDarwin [ "process_title" "emfile" ];
     tdRegexp = lib.concatStringsSep "\\|" toDisable;
     in lib.optionalString doCheck ''
       sed '/${tdRegexp}/d' -i test/test-list.h

From 4da420709d1408addd0cfd1406c18e7ec3d1d941 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 5 Mar 2017 07:39:23 -0500
Subject: [PATCH 1695/3449] nixUnstable: Add s3 support on darwin

---
 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 742ddecf6ddf..7caa2fc44fd7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -21,7 +21,7 @@ let
 
     buildInputs = [ curl openssl sqlite xz ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-      ++ lib.optional (stdenv.isLinux && lib.versionAtLeast version "1.12pre")
+      ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
           (aws-sdk-cpp.override {
             apis = ["s3"];
             customMemoryManagement = false;

From 316e7d67646d2d12382871ca439db99ba168740c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 5 Mar 2017 14:04:47 +0100
Subject: [PATCH 1696/3449] nixos/nix-daemon: doc: use literalExample

Makes the example more readable by not squashed everything onto one
single line.
---
 nixos/modules/services/misc/nix-daemon.nix | 33 +++++++++++-----------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 3027dd1c3d0e..5088c4e60691 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -164,22 +164,23 @@ in
       buildMachines = mkOption {
         type = types.listOf types.attrs;
         default = [];
-        example = [
-          { hostName = "voila.labs.cs.uu.nl";
-            sshUser = "nix";
-            sshKey = "/root/.ssh/id_buildfarm";
-            system = "powerpc-darwin";
-            maxJobs = 1;
-          }
-          { hostName = "linux64.example.org";
-            sshUser = "buildfarm";
-            sshKey = "/root/.ssh/id_buildfarm";
-            system = "x86_64-linux";
-            maxJobs = 2;
-            supportedFeatures = [ "kvm" ];
-            mandatoryFeatures = [ "perf" ];
-          }
-        ];
+        example = literalExample ''
+          [ { hostName = "voila.labs.cs.uu.nl";
+              sshUser = "nix";
+              sshKey = "/root/.ssh/id_buildfarm";
+              system = "powerpc-darwin";
+              maxJobs = 1;
+            }
+            { hostName = "linux64.example.org";
+              sshUser = "buildfarm";
+              sshKey = "/root/.ssh/id_buildfarm";
+              system = "x86_64-linux";
+              maxJobs = 2;
+              supportedFeatures = [ "kvm" ];
+              mandatoryFeatures = [ "perf" ];
+            }
+          ]
+        '';
         description = ''
           This option lists the machines to be used if distributed
           builds are enabled (see

From 9eec46189078e49708fdea6c74706bb9b68fa8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Sat, 4 Mar 2017 11:32:42 +0100
Subject: [PATCH 1697/3449] coq_8_4: ocaml dependency 4.01 -> 4.02

---
 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 f3a660dc7108..7cc02cb95834 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17132,8 +17132,8 @@ with pkgs;
     lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
   };
   coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
-    inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk;
-    camlp5 = ocamlPackages_4_01_0.camlp5_transitional;
+    inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
+    camlp5 = ocamlPackages_4_02.camlp5_transitional;
   };
   coq_8_5 = callPackage ../applications/science/logic/coq {
     version = "8.5pl3";

From 12a00b51b3b6feb34f19dc68a8df2560370d36d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Sat, 4 Mar 2017 12:01:45 +0100
Subject: [PATCH 1698/3449] coq: default version 8.4pl6 -> 8.6

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cc02cb95834..0d30fc3ccc1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6429,7 +6429,9 @@ with pkgs;
     ocaml = ocaml_4_02;
   };
 
-  framac = callPackage ../development/tools/analysis/frama-c { };
+  framac = callPackage ../development/tools/analysis/frama-c {
+    coq = coq_8_4;
+  };
 
   frame = callPackage ../development/libraries/frame { };
 
@@ -17143,7 +17145,7 @@ with pkgs;
     inherit (ocamlPackages) ocaml findlib lablgtk;
     camlp5 = ocamlPackages.camlp5_transitional;
   };
-  coq = coq_8_4;
+  coq = coq_8_6;
 
   mkCoqPackages_8_4 = self: let callPackage = newScope self; in {
     inherit callPackage;

From 35a65a670473ed6d0db34e2f68aaa1b28f44bd83 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 5 Mar 2017 14:17:00 +0100
Subject: [PATCH 1699/3449] release-nodes: move disabledModules to 17.09

---
 nixos/doc/manual/release-notes/rl-1703.xml | 10 ----------
 nixos/doc/manual/release-notes/rl-1709.xml |  7 +++++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index f40b03ec9b99..fda46217144c 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -271,16 +271,6 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
-  <listitem>
-    <para>
-      Modules can now be disabled by using <link
-      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
-      disabledModules</link>, allowing another to take it's place.  This can be
-      used to import a set of modules from another channel while keeping the
-      rest of the system on a stable release.
-    </para>
-  </listitem>
-
 </itemizedlist>
 
 
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index b99ce3964616..3705fd468f61 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -39,10 +39,17 @@ following incompatible changes:</para>
 <para>Other notable improvements:</para>
 
 <itemizedlist>
+
   <listitem>
     <para>
+      Modules can now be disabled by using <link
+      xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
+      disabledModules</link>, allowing another to take it's place.  This can be
+      used to import a set of modules from another channel while keeping the
+      rest of the system on a stable release.
     </para>
   </listitem>
+
 </itemizedlist>
 
 </section>

From c56587eb301b514dff380268876134c5cb841cbe Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Mar 2017 12:53:38 +0100
Subject: [PATCH 1700/3449] doc: Remove indention from program listings

---
 nixos/doc/manual/configuration/xfce.xml | 30 ++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index af6278e9c920..e9f7bd8d0688 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -9,10 +9,10 @@
     <para>
         To enable the Xfce Desktop Environment, set
         <programlisting>
-            services.xserver.desktopManager = {
-                xfce.enable = true;
-                default = "xfce";
-            };
+services.xserver.desktopManager = {
+    xfce.enable = true;
+    default = "xfce";
+};
         </programlisting>
     </para>
 
@@ -20,13 +20,13 @@
         Optionally, <emphasis>compton</emphasis>
         can be enabled for nice graphical effects, some example settings:
         <programlisting>
-            services.compton = {
-              enable          = true;
-              fade            = true;
-              inactiveOpacity = "0.9";
-              shadow          = true;
-              fadeDelta       = 4;
-            };
+services.compton = {
+  enable          = true;
+  fade            = true;
+  inactiveOpacity = "0.9";
+  shadow          = true;
+  fadeDelta       = 4;
+};
         </programlisting>
     </para>
 
@@ -43,7 +43,7 @@
 	   	You can, for example, select KDE’s
         <command>sddm</command> instead:
         <programlisting>
-            services.xserver.displayManager.sddm.enable = true;
+services.xserver.displayManager.sddm.enable = true;
         </programlisting>
     </para>
 
@@ -55,7 +55,7 @@
             <emphasis>Thunar</emphasis>
             volume support, put
             <programlisting>
-                services.xserver.desktopManager.xfce.enable = true;
+services.xserver.desktopManager.xfce.enable = true;
             </programlisting>
             into your <emphasis>configuration.nix</emphasis>.
         </para>
@@ -87,7 +87,7 @@
             (look at journalctl --user -b).
 
             <programlisting>
-                Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
+Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
             </programlisting>
 
             This is caused by some needed GNOME services not running.
@@ -95,7 +95,7 @@
             the Advanced tab of the Session and Startup settings panel.
             Alternatively, you can run this command to do the same thing.
             <programlisting>
-                $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
+$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
             </programlisting>
             A log-out and re-log will be needed for this to take effect.
         </para>

From 1e3dec3baaf12c6be0704d4e15fb270a628ecc10 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Mar 2017 12:56:23 +0100
Subject: [PATCH 1701/3449] nixos doc xfce: Fix missing space

---
 nixos/doc/manual/configuration/xfce.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index e9f7bd8d0688..1639351e70cb 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -37,7 +37,7 @@ services.compton = {
 	</para>
 
     <para>
-		NixOS’s default <emphasis>display manager</emphasis>is SLiM.
+		NixOS’s default <emphasis>display manager</emphasis> is SLiM.
 		(DM is the program that provides a graphical login prompt
 		 and manages the X server.)
 	   	You can, for example, select KDE’s

From 0a18a56375fbf2146b19fba7528b8d1a5bd51d44 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Mar 2017 12:57:01 +0100
Subject: [PATCH 1702/3449] nixos doc xfce: Tabs -> spaces

---
 nixos/doc/manual/configuration/xfce.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 1639351e70cb..e35f6096a21e 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -34,13 +34,13 @@ services.compton = {
         Some Xfce programs are not installed automatically.
         To install them manually (system wide), put them into your
         <literal>environment.systemPackages</literal>.
-	</para>
+    </para>
 
     <para>
-		NixOS’s default <emphasis>display manager</emphasis> is SLiM.
-		(DM is the program that provides a graphical login prompt
-		 and manages the X server.)
-	   	You can, for example, select KDE’s
+        NixOS’s default <emphasis>display manager</emphasis> is SLiM.
+        (DM is the program that provides a graphical login prompt
+         and manages the X server.)
+        You can, for example, select KDE’s
         <command>sddm</command> instead:
         <programlisting>
 services.xserver.displayManager.sddm.enable = true;

From 816beccf500708fe8e4ef2ff8918a6509789455a Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sun, 5 Mar 2017 10:39:10 +0100
Subject: [PATCH 1703/3449] wrapFirefox: fix default-browser update

Set MOZ_APP_LAUNCHER for firefox as per [1] (see [2] for detailed discussion).
Firefox will recognise itself across verions, skipping the 'not-the-default-browser' prompt.
Firefox will also write sane paths to the generated desktop file, should someone ever set it as default through the 'not-the-default-browser' prompt.
Also removed the unnecessary libtrick cruft.

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=611953
[2] https://bugzilla.mozilla.org/show_bug.cgi?id=593948
---
 .../networking/browsers/firefox/wrapper.nix   | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index ad1091c9d39e..f2ca9eaa622b 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -17,7 +17,7 @@ browser:
 , desktopName ? # browserName with first letter capitalized
   (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
 , nameSuffix ? ""
-, icon ? browserName, libtrick ? true
+, icon ? browserName
 }:
 
 let
@@ -52,16 +52,15 @@ let
   gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
   gtk_modules = [ libcanberra_gtk2 ];
 
-in
-stdenv.mkDerivation {
+in stdenv.mkDerivation {
   inherit name;
 
   desktopItem = makeDesktopItem {
     name = browserName;
-    exec = browserName + " %U";
+    exec = "${browserName}${nameSuffix} %U";
     inherit icon;
     comment = "";
-    desktopName = desktopName;
+    desktopName = "${desktopName}${nameSuffix}";
     genericName = "Web Browser";
     categories = "Application;Network;WebBrowser;";
     mimeType = stdenv.lib.concatStringsSep ";" [
@@ -84,39 +83,27 @@ stdenv.mkDerivation {
         exit 1
     fi
 
-    makeWrapper "${browser}/bin/${browserName}" \
+    makeWrapper "$(readlink -v --canonicalize-existing "${browser}/bin/${browserName}")" \
         "$out/bin/${browserName}${nameSuffix}" \
         --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
         --suffix LD_LIBRARY_PATH ':' "$libs" \
         --suffix-each GTK_PATH ':' "$gtk_modules" \
         --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \
-        --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" \
+        --suffix PATH ':' "$out/bin" \
+        --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
         ${lib.optionalString (!ffmpegSupport) ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''}
 
-    ${ lib.optionalString libtrick
-    ''
-    libdirname="$(echo "${browser}/lib/${browserName}"*)"
-    libdirbasename="$(basename "$libdirname")"
-    mkdir -p "$out/lib/$libdirbasename"
-    ln -s "$libdirname"/* "$out/lib/$libdirbasename"
-    script_location="$(mktemp "$out/lib/$libdirbasename/${browserName}${nameSuffix}.XXXXXX")"
-    mv "$out/bin/${browserName}${nameSuffix}" "$script_location"
-    ln -s "$script_location" "$out/bin/${browserName}${nameSuffix}"
-    ''
-    }
-
     if [ -e "${browser}/share/icons" ]; then
         mkdir -p "$out/share"
         ln -s "${browser}/share/icons" "$out/share/icons"
     else
         mkdir -p "$out/share/icons/hicolor/128x128/apps"
-        ln -s "$out/lib/$libdirbasename/browser/icons/mozicon128.png" \
+        ln -s "${browser}/lib/${browserName}-"*"/browser/icons/mozicon128.png" \
             "$out/share/icons/hicolor/128x128/apps/${browserName}.png"
     fi
 
-    mkdir -p $out/share/applications
-    cp $desktopItem/share/applications/* $out/share/applications
+    install -D -t $out/share/applications $desktopItem/share/applications/*
 
     # For manpages, in case the program supplies them
     mkdir -p $out/nix-support

From 87f57de8e579ed7b41096c77b1ceb2146db87f5a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Mar 2017 14:21:45 +0100
Subject: [PATCH 1704/3449] Wrap command in <command>

---
 nixos/doc/manual/configuration/xfce.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index e35f6096a21e..21c7a85e19cc 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -84,7 +84,7 @@ services.xserver.desktopManager.xfce.enable = true;
             Thunar and/or the desktop takes time to show up.
 
             Thunar will spit out this kind of message on start
-            (look at journalctl --user -b).
+            (look at <command>journalctl --user -b</command>).
 
             <programlisting>
 Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported

From 13a9059c5556a1fecc35dd6f2a7242e73b7c5b34 Mon Sep 17 00:00:00 2001
From: Michal Rus <m@michalrus.com>
Date: Sun, 5 Mar 2017 14:48:22 +0100
Subject: [PATCH 1705/3449] =?UTF-8?q?devede:=203.23.0=20=E2=86=92=204.8.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/video/devede/default.nix | 33 +++++++++++++++-------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 824ef9661b8e..157e4903e52e 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,23 +1,37 @@
-{ pkgs, stdenv, fetchurl, pythonPackages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }:
+{ pkgs, stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
+, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }:
 
 let
-  inherit (pythonPackages) dbus-python buildPythonApplication pygtk;
+  inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
 
 in buildPythonApplication rec {
-  name = "devede-3.23.0";
+  name = "devede-4.8.8";
   namePrefix = "";
 
-  src = fetchurl {
-    url = "http://www.rastersoft.com/descargas/${name}.tar.bz2";
-    sha256 = "9e217ca46f5f275cb0c3cadbe8c830fa1fde774c004bd95a343d1255be6f25e1";
+  src = fetchFromGitHub {
+    owner = "rastersoft";
+    repo = "devedeng";
+    rev = "c518683fbcd793aa92249e4fecafc3c3fea7da68";
+    sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q";
   };
 
-  buildInputs = [ ffmpeg ];
+  nativeBuildInputs = [
+    gettext wrapGAppsHook
+  ];
 
-  propagatedBuildInputs = [ pygtk dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit ];
+  buildInputs = [
+    ffmpeg
+  ];
+
+  propagatedBuildInputs = [
+    gtk3 pygobject3 gdk_pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
+  ];
 
   postPatch = ''
-    substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede"
+    substituteInPlace setup.py --replace "'/usr'," ""
+    substituteInPlace src/devedeng/configuration_data.py \
+      --replace "/usr/share" "$out/share" \
+      --replace "/usr/local/share" "$out/share"
   '';
 
   meta = with stdenv.lib; {
@@ -25,6 +39,5 @@ in buildPythonApplication rec {
     homepage = http://www.rastersoft.com/programas/devede.html;
     license = licenses.gpl3;
     maintainers = [ maintainers.bdimcheff ];
-    broken = true;  # tarball is gone
   };
 }

From eff9b09fb737bf7e619cd3fed65566857ed663e0 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Mon, 5 Sep 2016 18:37:03 +0000
Subject: [PATCH 1706/3449] qemu: separate usbredirSupport option out of
 spiceSupport option

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

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index b201e2299310..a8f11de96bcf 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -9,7 +9,8 @@
 , pulseSupport ? !stdenv.isDarwin, libpulseaudio
 , sdlSupport ? !stdenv.isDarwin, SDL
 , vncSupport ? true, libjpeg, libpng
-, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol, usbredir
+, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol
+, usbredirSupport ? spiceSupport, usbredir
 , x86Only ? false
 , nixosTestRunner ? false
 }:
@@ -44,7 +45,8 @@ stdenv.mkDerivation rec {
     ++ optionals pulseSupport [ libpulseaudio ]
     ++ optionals sdlSupport [ SDL ]
     ++ optionals vncSupport [ libjpeg libpng ]
-    ++ optionals spiceSupport [ spice_protocol spice usbredir ]
+    ++ optionals spiceSupport [ spice_protocol spice ]
+    ++ optionals usbredirSupport [ usbredir ]
     ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];
 
   enableParallelBuilding = true;
@@ -95,6 +97,7 @@ stdenv.mkDerivation rec {
     ++ optional numaSupport "--enable-numa"
     ++ optional seccompSupport "--enable-seccomp"
     ++ optional spiceSupport "--enable-spice"
+    ++ optional usbredirSupport "--enable-usb-redir"
     ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
     ++ optional stdenv.isDarwin "--enable-cocoa"
     ++ optional stdenv.isLinux "--enable-linux-aio";

From 1c8940a2b817ed3cb559e7d0fb96e25783b3dbfe Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 2 Nov 2016 16:06:48 +0000
Subject: [PATCH 1707/3449] qemu: add xen support

---
 pkgs/applications/virtualization/qemu/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                   | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a8f11de96bcf..8d462395ce07 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -11,6 +11,7 @@
 , vncSupport ? true, libjpeg, libpng
 , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol
 , usbredirSupport ? spiceSupport, usbredir
+, xenSupport ? false, xen
 , x86Only ? false
 , nixosTestRunner ? false
 }:
@@ -25,6 +26,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "qemu-"
+    + stdenv.lib.optionalString xenSupport "xen-"
     + stdenv.lib.optionalString x86Only "x86-only-"
     + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-"
     + version;
@@ -47,7 +49,8 @@ stdenv.mkDerivation rec {
     ++ optionals vncSupport [ libjpeg libpng ]
     ++ optionals spiceSupport [ spice_protocol spice ]
     ++ optionals usbredirSupport [ usbredir ]
-    ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ];
+    ++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
+    ++ optionals xenSupport [ xen ];
 
   enableParallelBuilding = true;
 
@@ -100,7 +103,8 @@ stdenv.mkDerivation rec {
     ++ optional usbredirSupport "--enable-usb-redir"
     ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"
     ++ optional stdenv.isDarwin "--enable-cocoa"
-    ++ optional stdenv.isLinux "--enable-linux-aio";
+    ++ optional stdenv.isLinux "--enable-linux-aio"
+    ++ optional xenSupport "--enable-xen";
 
   postFixup =
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a660dc7108..87c575d55551 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11892,6 +11892,8 @@ with pkgs;
   watch = callPackage ../os-specific/linux/procps/watch.nix { };
 
   qemu_kvm = lowPrio (qemu.override { x86Only = true; });
+  qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; });
+
   qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; });
 
   firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { };

From 916fa0a6102a75325dbc3ffca5e88ec435aeffa4 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 1 Sep 2016 01:51:09 +0000
Subject: [PATCH 1708/3449] xen: rewrite build expression to be more modular,
 support upstream qemu and seabios

Also:

* provides a bunch of build options
* documents build options config in longDescription
* provides a bunch of predefined packages and documents them some more
* sources' hashes stay the same
---
 .../xen/0000-fix-install-python.patch         |  16 +
 .../xen/0000-fix-ipxe-src.patch               |  27 ++
 pkgs/applications/virtualization/xen/4.5.nix  | 375 +++++++++++-------
 .../virtualization/xen/generic.nix            | 335 +++++++++-------
 .../virtualization/xen/packages.nix           |  64 +++
 pkgs/top-level/all-packages.nix               |  14 +-
 6 files changed, 530 insertions(+), 301 deletions(-)
 create mode 100644 pkgs/applications/virtualization/xen/0000-fix-install-python.patch
 create mode 100644 pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
 create mode 100644 pkgs/applications/virtualization/xen/packages.nix

diff --git a/pkgs/applications/virtualization/xen/0000-fix-install-python.patch b/pkgs/applications/virtualization/xen/0000-fix-install-python.patch
new file mode 100644
index 000000000000..53821c0d9c51
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0000-fix-install-python.patch
@@ -0,0 +1,16 @@
+tools/python/install-wrap script brakes shebangs patching, disable
+
+diff --git a/tools/Rules.mk b/tools/Rules.mk
+index 87a56dc..a7da869 100644
+--- a/tools/Rules.mk
++++ b/tools/Rules.mk
+@@ -90,8 +90,7 @@ CFLAGS += $(CFLAGS-y)
+ 
+ CFLAGS += $(EXTRA_CFLAGS_XEN_TOOLS)
+ 
+-INSTALL_PYTHON_PROG = \
+-	$(XEN_ROOT)/tools/python/install-wrap "$(PYTHON_PATH)" $(INSTALL_PROG)
++INSTALL_PYTHON_PROG = $(INSTALL_PROG)
+ 
+ %.opic: %.c
+ 	$(CC) $(CPPFLAGS) -DPIC $(CFLAGS) $(CFLAGS_$*.opic) -fPIC -c -o $@ $< $(APPEND_CFLAGS)
diff --git a/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
new file mode 100644
index 000000000000..072338b87aba
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/0000-fix-ipxe-src.patch
@@ -0,0 +1,27 @@
+hack to make etherboot use prefetched ipxe
+
+diff --git a/tools/firmware/etherboot/Makefile b/tools/firmware/etherboot/Makefile
+index a0578d2..64428a0 100644
+--- a/tools/firmware/etherboot/Makefile
++++ b/tools/firmware/etherboot/Makefile
+@@ -16,6 +16,7 @@ IPXE_TARBALL_URL ?= $(XEN_EXTFILES_URL)/ipxe-git-$(IPXE_GIT_TAG).tar.gz
+ 
+ D=ipxe
+ T=ipxe.tar.gz
++G=ipxe.git
+ 
+ ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
+ 
+@@ -36,9 +37,9 @@ $T:
+ 	fi
+ 	mv _$T $T
+ 
+-$D/src/arch/i386/Makefile: $T Config
+-	rm -rf $D
+-	gzip -dc $T | tar xf -
++$D/src/arch/i386/Makefile: $G Config
++	mkdir $D
++	cp -a $G/* $D
+ 	for i in $$(cat patches/series) ; do                 \
+ 	    patch -d $D -p1 --quiet <patches/$$i || exit 1 ; \
+ 	done
diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix
index bc8d89af5b2a..754f800afada 100644
--- a/pkgs/applications/virtualization/xen/4.5.nix
+++ b/pkgs/applications/virtualization/xen/4.5.nix
@@ -1,152 +1,237 @@
-{ callPackage, fetchurl, fetchpatch, fetchgit, ... } @ args:
+{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit
+, withInternalQemu ? true
+, withInternalTraditionalQemu ? true
+, withInternalSeabios ? true
+, withSeabios ? !withInternalSeabios, seabios ? null
+, withInternalOVMF ? false # FIXME: tricky to build
+, withOVMF ? false, OVMF
+, withLibHVM ? true
+
+# qemu
+, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir
+, alsaLib
+, ... } @ args:
+
+assert withInternalSeabios -> !withSeabios;
+assert withInternalOVMF -> !withOVMF;
+
+with stdenv.lib;
+
+# Patching XEN? Check the XSAs at
+# https://xenbits.xen.org/xsa/
+# and try applying all the ones we don't have yet.
 
 let
-  # Xen 4.5.5
-  #
-  # Patching XEN? Check the XSAs and try applying all the ones we
-  # don't have yet.
-  #
-  # XSAs at: https://xenbits.xen.org/xsa/
-  xenConfig = rec {
-    version = "4.5.5";
+  xsaPatch = { name , sha256 }: (fetchpatch {
+    url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
+    inherit sha256;
+  });
 
-    xsaPatch = { name , sha256 }: (fetchpatch {
-      url = "https://xenbits.xen.org/xsa/xsa${name}.patch";
-      inherit sha256;
-    });
+  qemuDeps = [
+    udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
+    alsaLib
+  ];
+in
 
-    name = "xen-${version}";
+callPackage (import ./generic.nix (rec {
+  version = "4.5.5";
 
-    src = fetchurl {
-      url = "http://bits.xensource.com/oss-xen/release/${version}/${name}.tar.gz";
-      sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
-    };
-
-    # Sources needed to build the xen tools and tools/firmware.
-    firmwareGits =
-      [
-        { git = { name = "seabios";
-                  url = https://xenbits.xen.org/git-http/seabios.git;
-                  rev = "rel-1.7.5";
-                  sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb";
-                };
-          patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
-        }
-      ];
-
-    toolsGits =
-      [
-        { git = { name = "qemu-xen";
-                  url = https://xenbits.xen.org/git-http/qemu-xen.git;
-                  rev = "refs/tags/qemu-xen-${version}";
-                  sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2";
-                };
-          patches = [
-            (xsaPatch {
-              name = "197-4.5-qemuu";
-              sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx";
-            })
-            (xsaPatch {
-              name = "208-qemuu-4.7";
-              sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb";
-            })
-            (xsaPatch {
-              name = "209-qemuu";
-              sha256 = "05df4165by6pzxrnizkw86n2f77k9i1g4fqqpws81ycb9ng4jzin";
-            })
-          ];
-        }
-        { git = { name = "qemu-xen-traditional";
-                  url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
-                  # rev = "28c21388c2a32259cff37fc578684f994dca8c9f";
-                  rev = "refs/tags/xen-${version}";
-                  sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r";
-                };
-          patches = [
-            (xsaPatch {
-              name = "197-4.5-qemut";
-              sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79";
-            })
-            (xsaPatch {
-              name = "199-trad";
-              sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42";
-            })
-            (xsaPatch {
-              name = "208-qemut";
-              sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54";
-            })
-            (xsaPatch {
-              name = "209-qemut";
-              sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r";
-            })
-          ];
-        }
-        { git = { name = "xen-libhvm";
-                  url = https://github.com/ts468/xen-libhvm;
-                  rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63";
-                  sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8";
-                };
-          description = ''
-            Helper library for reading ACPI and SMBIOS firmware values
-            from the host system for use with the HVM guest firmware
-            pass-through feature in Xen.
-            '';
-          #license = licenses.bsd2;
-        }
-      ];
-
-      xenPatches = [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
-                     ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
-                     ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
-                     (xsaPatch {
-                       name = "190-4.5";
-                       sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
-                     })
-                     (xsaPatch {
-                       name = "191-4.6";
-                       sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
-                     })
-                     (xsaPatch {
-                       name = "192-4.5";
-                       sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
-                     })
-                     (xsaPatch {
-                       name = "193-4.5";
-                       sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
-                     })
-                     (xsaPatch {
-                       name = "195";
-                       sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
-                     })
-                     (xsaPatch {
-                       name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
-                       sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
-                     })
-                     (xsaPatch {
-                       name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
-                       sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
-                     })
-                     (xsaPatch {
-                       name = "198";
-                       sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
-                     })
-                     (xsaPatch {
-                       name = "200-4.6";
-                       sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
-                     })
-                     (xsaPatch {
-                       name = "202-4.6";
-                       sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
-                     })
-                     (xsaPatch {
-                       name = "204-4.5";
-                       sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
-                     })
-                     (xsaPatch {
-                       name = "207";
-                       sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
-                     })
-                   ];
+  src = fetchurl {
+    url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz";
+    sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2";
   };
 
-in callPackage ./generic.nix (args // { xenConfig=xenConfig; })
+  # Sources needed to build tools and firmwares.
+  xenfiles = optionalAttrs withInternalQemu {
+    "qemu-xen" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/qemu-xen.git;
+        rev = "refs/tags/qemu-xen-${version}";
+        sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2";
+      };
+      buildInputs = qemuDeps;
+      patches = [
+        (xsaPatch {
+          name = "197-4.5-qemuu";
+          sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx";
+        })
+        (xsaPatch {
+          name = "208-qemuu-4.7";
+          sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb";
+        })
+        (xsaPatch {
+          name = "209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i";
+          sha256 = "1xvxzsrsq05fj6szjlpbgg4ia3cw54dn5g7xzq1n1dymbhv606m0";
+        })
+        (xsaPatch {
+          name = "209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput";
+          sha256 = "0avxqs9922qjfsxxlk7bh10432a526j2yyykhags8dk1bzxkpxwv";
+        })
+      ];
+      meta.description = "Xen's fork of upstream Qemu";
+    };
+  } // optionalAttrs withInternalTraditionalQemu {
+    "qemu-xen-traditional" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git;
+        rev = "refs/tags/xen-${version}";
+        sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r";
+      };
+      buildInputs = qemuDeps;
+      patches = [
+        (xsaPatch {
+          name = "197-4.5-qemut";
+          sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79";
+        })
+        (xsaPatch {
+          name = "199-trad";
+          sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42";
+        })
+        (xsaPatch {
+          name = "208-qemut";
+          sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54";
+        })
+        (xsaPatch {
+          name = "209-qemut";
+          sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r";
+        })
+      ];
+      postPatch = ''
+        substituteInPlace xen-hooks.mak \
+          --replace /usr/include/pci ${pciutils}/include/pci
+      '';
+      meta.description = "Xen's fork of upstream Qemu that uses old device model";
+    };
+  } // optionalAttrs withInternalSeabios {
+    "firmware/seabios-dir-remote" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/seabios.git;
+        rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2";
+        #rev = "rel-1.7.5";
+        sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb";
+      };
+      patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ];
+      meta.description = "Xen's fork of Seabios";
+    };
+  } // optionalAttrs withInternalOVMF {
+    "firmware/ovmf-dir-remote" = {
+      src = fetchgit {
+        url = https://xenbits.xen.org/git-http/ovmf.git;
+        rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd";
+        sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq";
+      };
+      meta.description = "Xen's fork of OVMF";
+    };
+  } // {
+    # TODO: patch Xen to make this optional?
+    "firmware/etherboot/ipxe.git" = {
+      src = fetchgit {
+        url = https://git.ipxe.org/ipxe.git;
+        rev = "9a93db3f0947484e30e753bbd61a10b17336e20e";
+        sha256 = "1ga3h1b34q0cl9azj7j9nswn7mfcs3cgfjdihrm5zkp2xw2hpvr6";
+      };
+      meta.description = "Xen's fork of iPXE";
+    };
+  } // optionalAttrs withLibHVM {
+    "xen-libhvm-dir-remote" = {
+      src = fetchgit {
+        name = "xen-libhvm";
+        url = https://github.com/ts468/xen-libhvm;
+        rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63";
+        sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8";
+      };
+      buildPhase = ''
+        make
+        cd biospt
+        cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm
+      '';
+      installPhase = ''
+        make install
+        cp biospt/biospt $out/bin/
+      '';
+      meta = {
+        description = ''
+          Helper library for reading ACPI and SMBIOS firmware values
+          from the host system for use with the HVM guest firmware
+          pass-through feature in Xen'';
+        license = licenses.bsd2;
+      };
+    };
+  };
+
+  configureFlags = []
+    ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH
+    ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional"
+    ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional"
+
+    ++ optional (withSeabios) "--with-system-seabios=${seabios}"
+    ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios"
+
+    ++ optional (withOVMF) "--with-system-ovmf=${OVMF}"
+    ++ optional (withInternalOVMF) "--enable-ovmf";
+
+  patches =
+    [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch
+      ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch
+      ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch
+      (xsaPatch {
+        name = "190-4.5";
+        sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm";
+      })
+      (xsaPatch {
+        name = "191-4.6";
+        sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg";
+      })
+      (xsaPatch {
+        name = "192-4.5";
+        sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm";
+      })
+      (xsaPatch {
+        name = "193-4.5";
+        sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr";
+      })
+      (xsaPatch {
+        name = "195";
+        sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7";
+      })
+      (xsaPatch {
+        name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject";
+        sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6";
+      })
+      (xsaPatch {
+        name = "196-0002-x86-svm-Fix-injection-of-software-interrupts";
+        sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz";
+      })
+      (xsaPatch {
+        name = "198";
+        sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9";
+      })
+      (xsaPatch {
+        name = "200-4.6";
+        sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7";
+      })
+      (xsaPatch {
+        name = "202-4.6";
+        sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f";
+      })
+      (xsaPatch {
+        name = "204-4.5";
+        sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp";
+      })
+      (xsaPatch {
+        name = "207";
+        sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc";
+      })
+    ];
+
+  # Fix build on Glibc 2.24.
+  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
+
+  postPatch = ''
+    # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
+    sed 1i'#include <sys/sysmacros.h>' \
+      -i tools/blktap2/control/tap-ctl-allocate.c \
+      -i tools/libxl/libxl_device.c
+  '';
+
+})) args
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 9943d70fa8cd..953368b7e3bc 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -1,188 +1,219 @@
-{ stdenv, fetchurl, which, zlib, pkgconfig, SDL, openssl
-, libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2
-, lvm2, utillinux, procps, texinfo, perl, python2Packages
-, glib, bridge-utils, xorg, pixman, iproute, udev, bison
-, flex, cmake, ocamlPackages, figlet, libaio, yajl
-, checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
-, spice_protocol, usbredir, alsaLib, quilt
+config:
+{ stdenv, cmake, pkgconfig, which
+
+# Xen
+, bison, bzip2, checkpolicy, dev86, figlet, flex, gettext, glib
+, iasl, libaio, libiconv, libuuid, ncurses, openssl, perl
+, python2Packages
+# python2Packages.python
+, xz, yajl, zlib
+
+# Xen Optional
+, ocamlPackages
+
+# Scripts
 , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
-, inetutils, iptables, openvswitch, nbd, drbd, xenConfig
-, xenserverPatched ? false, ... }:
+, iproute, inetutils, iptables, bridge-utils, openvswitch, nbd, drbd
+, lvm2, utillinux, procps
+
+# Documentation
+# python2Packages.markdown
+, transfig, ghostscript, texinfo, pandoc
+
+, ...} @ args:
 
 with stdenv.lib;
 
 let
+  #TODO: fix paths instead
+  scriptEnvPath = concatMapStringsSep ":" (x: "${x}/bin") [
+    which perl
+    coreutils gawk gnused gnugrep diffutils utillinux multipath-tools
+    iproute inetutils iptables bridge-utils openvswitch nbd drbd
+  ];
 
-  libDir = if stdenv.is64bit then "lib64" else "lib";
+  withXenfiles = f: concatStringsSep "\n" (mapAttrsToList f config.xenfiles);
 
-  # Sources needed to build the tools
-  # These sources are already rather old and probably do not change frequently
-  xenExtfiles = [
-      { url = http://xenbits.xensource.com/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz;
-        sha256 = "0p206zaxlhda60ci33h9gipi5gm46fvvsm6k5c0w7b6cjg0yhb33";
-      }
-    ];
-
-  scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin")
-    [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools
-      iproute inetutils iptables bridge-utils openvswitch nbd drbd ]));
+  withTools = a: f: withXenfiles (name: x: optionalString (hasAttr a x) ''
+    echo "processing ${name}"
+    __do() {
+      cd "tools/${name}"
+      ${f name x}
+    }
+    ( __do )
+  '');
 in
 
+stdenv.mkDerivation (rec {
+  inherit (config) version;
 
-
-stdenv.mkDerivation {
-  inherit (xenConfig) name version src;
+  name = "xen-${version}";
 
   dontUseCmakeConfigure = true;
 
-  buildInputs =
-    [ which zlib pkgconfig SDL openssl libuuid gettext ncurses
-      dev86 iasl pciutils bzip2 xz texinfo perl yajl
-      python2Packages.python python2Packages.wrapPython
-      glib bridge-utils pixman iproute udev bison xorg.libX11
-      flex ocamlPackages.ocaml ocamlPackages.findlib figlet libaio
-      checkpolicy python2Packages.markdown transfig
-      glusterfs acl cmake spice spice_protocol usbredir
-      alsaLib quilt
-    ];
-
   hardeningDisable = [ "stackprotector" "fortify" "pic" ];
 
-  patches = stdenv.lib.optionals ((xenserverPatched == false) && (builtins.hasAttr "xenPatches" xenConfig)) xenConfig.xenPatches;
+  buildInputs = [
+    cmake pkgconfig which
+
+    # Xen
+    bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio
+    libiconv libuuid ncurses openssl perl python2Packages.python xz yajl zlib
+
+    # oxenstored
+    ocamlPackages.findlib ocamlPackages.ocaml
+
+    # Python fixes
+    python2Packages.wrapPython
+
+    # Documentation
+    python2Packages.markdown transfig ghostscript texinfo pandoc
+
+    # Others
+  ] ++ (concatMap (x: x.buildInputs or []) (attrValues config.xenfiles))
+    ++ (config.buildInputs or []);
+
+  prePatch = ''
+    ### Generic fixes
+
+    # Xen's stubdoms, tools and firmwares need various sources that
+    # are usually fetched at build time using wget and git. We can't
+    # have that, so we prefetch them in nix-expression and setup
+    # fake wget and git for debugging purposes.
+
+    mkdir fake-bin
+
+    # Fake git: just print what it wants and die
+    cat > fake-bin/wget << EOF
+    #!/bin/sh -e
+    echo ===== FAKE WGET: Not fetching \$*
+    [ -e \$3 ]
+    EOF
+
+    # Fake git: just print what it wants and die
+    cat > fake-bin/git << EOF
+    #!/bin/sh
+    echo ===== FAKE GIT: Not cloning \$*
+    [ -e \$3 ]
+    EOF
+
+    chmod +x fake-bin/*
+    export PATH=$PATH:$PWD/fake-bin
+
+    # Remove in-tree qemu stuff in case we build from a tar-ball
+    rm -rf tools/qemu-xen tools/qemu-xen-traditional
+
+    # Fix shebangs, mainly for build-scipts
+    # 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'
+
+    # Get prefetched stuff
+    ${withXenfiles (name: x: ''
+      echo "${x.src} -> tools/${name}"
+      cp -r ${x.src} tools/${name}
+      chmod -R +w tools/${name}
+    '')}
+  '';
+
+  patches = [ ./0000-fix-ipxe-src.patch
+              ./0000-fix-install-python.patch ]
+         ++ (config.patches or []);
 
   postPatch = ''
-      ${stdenv.lib.optionalString ((xenserverPatched == true) && (builtins.hasAttr "xenserverPatches" xenConfig)) xenConfig.xenserverPatches}
+    ### Hacks
 
-      # Xen's tools and firmares need various git repositories that it
-      # usually checks out at time using git.  We can't have that.
-      ${flip concatMapStrings xenConfig.toolsGits (x: let src = fetchgit x.git; in ''
-        cp -r ${src} tools/${src.name}-dir-remote
-        chmod -R +w tools/${src.name}-dir-remote
-      '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) ''
-        ( cd tools/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} )
-      '')}
-      ${flip concatMapStrings xenConfig.firmwareGits (x: let src = fetchgit x.git; in ''
-        cp -r ${src} tools/firmware/${src.name}-dir-remote
-        chmod -R +w tools/firmware/${src.name}-dir-remote
-      '' + stdenv.lib.optionalString (builtins.hasAttr "patches" x) ''
-        ( cd tools/firmware/${src.name}-dir-remote; ${concatStringsSep "; " (map (p: "patch -p1 < ${p}") x.patches)} )
-      '')}
+    # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
+    # print the GCC version number properly.
+    substituteInPlace xen/Makefile \
+      --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
 
-      # Xen's stubdoms and firmwares need various sources that are usually fetched
-      # at build time using wget. We can't have that, so we prefetch Xen's ext_files.
-      mkdir xen_ext_files
-      ${flip concatMapStrings xenExtfiles (x: let src = fetchurl x; in ''
-        cp ${src} xen_ext_files/${src.name}
-      '')}
+    # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
+    mkdir -p tools/include/gnu
+    touch tools/include/gnu/stubs-32.h
 
-      # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror.
-      sed 1i'#include <sys/sysmacros.h>' \
-        -i tools/blktap2/control/tap-ctl-allocate.c \
-        -i tools/libxl/libxl_device.c
+    ### Fixing everything else
+
+    substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
+      --replace /usr $out
+
+    substituteInPlace tools/blktap2/lvm/lvm-util.c \
+      --replace /usr/sbin/vgs ${lvm2}/bin/vgs \
+      --replace /usr/sbin/lvs ${lvm2}/bin/lvs
+
+    substituteInPlace tools/misc/xenpvnetboot \
+      --replace /usr/sbin/mount ${utillinux}/bin/mount \
+      --replace /usr/sbin/umount ${utillinux}/bin/umount
+
+    substituteInPlace tools/xenmon/xenmon.py \
+      --replace /usr/bin/pkill ${procps}/bin/pkill
+
+    substituteInPlace tools/xenstat/Makefile \
+      --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
+
+    # TODO: use this as a template and support our own if-up scripts instead?
+    substituteInPlace tools/hotplug/Linux/xen-backend.rules.in \
+      --replace "@XEN_SCRIPT_DIR@" $out/etc/xen/scripts
+
+    # blktap is not provided by xen, but by xapi
+    sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules.in
+
+    ${withTools "patches" (name: x: ''
+      ${concatMapStringsSep "\n" (p: ''
+        echo "# Patching with ${p}"
+        patch -p1 < ${p}
+      '') x.patches}
+    '')}
+
+    ${withTools "postPatch" (name: x: x.postPatch)}
+
+    ${config.postPatch or ""}
   '';
 
-  preConfigure = ''
-    # Fake wget: copy prefetched downloads instead
-    mkdir wget
-    echo "#!/bin/sh" > wget/wget
-    echo "echo ===== Not fetching \$*, copy pre-fetched file instead" >> wget/wget
-    echo "cp \$4 \$3" >> wget/wget
-    chmod +x wget/wget
-    export PATH=$PATH:$PWD/wget
-    export EXTRA_QEMUU_CONFIGURE_ARGS="--enable-spice --enable-usb-redir --enable-linux-aio"
-  '';
-
-  # https://github.com/NixOS/nixpkgs/issues/13590
-  configureFlags = ["--disable-stubdom"];
-
-  postConfigure =
-    ''
-      substituteInPlace tools/libfsimage/common/fsimage_plugin.c \
-        --replace /usr $out
-
-      substituteInPlace tools/blktap2/lvm/lvm-util.c \
-        --replace /usr/sbin/vgs ${lvm2}/sbin/vgs \
-        --replace /usr/sbin/lvs ${lvm2}/sbin/lvs
-
-      substituteInPlace tools/xenmon/xenmon.py \
-        --replace /usr/bin/pkill ${procps}/bin/pkill
-
-      substituteInPlace tools/xenstat/Makefile \
-        --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
-
-      substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \
-        --replace /usr/include/pci ${pciutils}/include/pci
-
-      substituteInPlace tools/qemu-xen-traditional-dir-remote/xen-hooks.mak \
-        --replace /usr/include/pci ${pciutils}/include/pci
-
-      substituteInPlace tools/hotplug/Linux/xen-backend.rules \
-        --replace /etc/xen/scripts $out/etc/xen/scripts
-
-      # blktap is not provided by xen, but by xapi
-      sed -i '/blktap/d' tools/hotplug/Linux/xen-backend.rules
-
-      # Work around a bug in our GCC wrapper: `gcc -MF foo -v' doesn't
-      # print the GCC version number properly.
-      substituteInPlace xen/Makefile \
-        --replace '$(CC) $(CFLAGS) -v' '$(CC) -v'
-
-      # Allow the location of the xendomains config file to be
-      # overriden at runtime.
-      substituteInPlace tools/hotplug/Linux/init.d/xendomains \
-        --replace 'XENDOM_CONFIG=/etc/sysconfig/xendomains' "" \
-        --replace 'XENDOM_CONFIG=/etc/default/xendomains' "" \
-        --replace /etc/xen/scripts/hotplugpath.sh $out/etc/xen/scripts/hotplugpath.sh \
-        --replace /bin/ls ls
-
-      substituteInPlace tools/hotplug/Linux/xendomains \
-        --replace /bin/ls ls
-
-      # Hack to get `gcc -m32' to work without having 32-bit Glibc headers.
-      mkdir -p tools/include/gnu
-      touch tools/include/gnu/stubs-32.h
-    '';
-
-  # Fix build on Glibc 2.24.
-  NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
-
   # 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_EXTFILES_URL=\\$(XEN_ROOT)/xen_ext_files ";
+  makeFlags = [ "PREFIX=$(out) CONFIG_DIR=/etc" "XEN_SCRIPT_DIR=/etc/xen/scripts" ]
+           ++ (config.makeFlags or []);
 
   buildFlags = "xen tools";
 
-  postBuild =
-    ''
-      make -C docs man-pages
+  postBuild = ''
+    make -C docs man-pages
 
-      (cd tools/xen-libhvm-dir-remote; make)
-      (cd tools/xen-libhvm-dir-remote/biospt; cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm)
-    '';
+    ${withTools "buildPhase" (name: x: x.buildPhase)}
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $out $out/share
-      cp -prvd dist/install/nix/store/*/* $out/
-      cp -prvd dist/install/boot $out/boot
-      cp -prvd dist/install/etc $out
-      cp -dR docs/man1 docs/man5 $out/share/man/
-      wrapPythonPrograms
-      substituteInPlace $out/etc/xen/scripts/hotplugpath.sh --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\"
+  installPhase = ''
+    mkdir -p $out $out/share
+    cp -prvd dist/install/nix/store/*/* $out/
+    cp -prvd dist/install/boot $out/boot
+    cp -prvd dist/install/etc $out
+    cp -dR docs/man1 docs/man5 $out/share/man/
 
-      shopt -s extglob
-      for i in $out/etc/xen/scripts/!(*.sh); do
-        sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i
-      done
+    ${withTools "installPhase" (name: x: x.installPhase)}
 
-      (cd tools/xen-libhvm-dir-remote; make install)
-      cp tools/xen-libhvm-dir-remote/biospt/biospt $out/bin/.
-    '';
+    # Hack
+    substituteInPlace $out/etc/xen/scripts/hotplugpath.sh \
+      --replace SBINDIR=\"$out/sbin\" SBINDIR=\"$out/bin\"
+
+    wrapPythonPrograms
+
+    shopt -s extglob
+    for i in $out/etc/xen/scripts/!(*.sh); do
+      sed -i "2s@^@export PATH=$out/bin:${scriptEnvPath}\n@" $i
+    done
+  '';
 
   meta = {
     homepage = http://www.xen.org/;
-    description = "Xen hypervisor and management tools for Dom0";
+    description = "Xen hypervisor and related components"
+                + optionalString (args ? meta && args.meta ? description)
+                                 " (${args.meta.description})";
+    longDescription = (args.meta.longDescription or "")
+                    + "\nIncludes:\n"
+                    + withXenfiles (name: x: ''* ${name}: ${x.meta.description or "(No description)"}.'');
     platforms = [ "x86_64-linux" ];
-    maintainers = with stdenv.lib.maintainers; [ eelco tstrobel ];
+    maintainers = with stdenv.lib.maintainers; [ eelco tstrobel oxij ];
   };
-}
+} // removeAttrs config [ "xenfiles" "buildInputs" "patches" "postPatch" "meta" ])
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
new file mode 100644
index 000000000000..633ec4f3d124
--- /dev/null
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -0,0 +1,64 @@
+{ callPackage
+, stdenv, overrideCC, gcc49
+}:
+
+# TODO on new Xen version: generalize this to generate [vanilla slim
+# light] for each ./<version>.nix.
+
+rec {
+
+  xen_4_5-vanilla = callPackage ./4.5.nix {
+    # At the very least included seabios and etherboot need gcc49,
+    # so we have to build all of it with gcc49.
+    stdenv = overrideCC stdenv gcc49;
+
+    meta = {
+      description = "vanilla";
+      longDescription = ''
+        Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
+        with Xen. This gives vanilla experince, but wastes space and
+        build time: typical NixOS setup that runs lots of VMs will
+        build three different versions of Qemu when using this (two
+        forks and upstream).
+      '';
+    };
+  };
+
+  xen_4_5-slim = xen_4_5-vanilla.override {
+    withInternalQemu = false;
+    withInternalTraditionalQemu = true;
+    withInternalSeabios = false;
+    withSeabios = true;
+
+    meta = {
+      description = "slim";
+      longDescription = ''
+        Slimmed-down version of Xen that reuses nixpkgs packages as
+        much as possible. Different parts may get out of sync, but
+        this builds faster and uses less space than vanilla. Use with
+        `qemu_xen` from nixpkgs.
+      '';
+    };
+  };
+
+  xen_4_5-light = xen_4_5-vanilla.override {
+    withInternalQemu = false;
+    withInternalTraditionalQemu = false;
+    withInternalSeabios = false;
+    withSeabios = true;
+
+    meta = {
+      description = "light";
+      longDescription = ''
+        Slimmed-down version of Xen without `qemu-traditional` (you
+        don't need it if you don't know what it is). Use with
+        `qemu_xen-light` from nixpkgs.
+      '';
+    };
+  };
+
+  xen-vanilla = xen_4_5-vanilla;
+  xen-slim = xen_4_5-slim;
+  xen-light = xen_4_5-light;
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87c575d55551..e1e4e70c399e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11892,7 +11892,11 @@ with pkgs;
   watch = callPackage ../os-specific/linux/procps/watch.nix { };
 
   qemu_kvm = lowPrio (qemu.override { x86Only = true; });
-  qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; });
+
+  # See `xenPackages` source for explanations.
+  # Building with `xen` instead of `xen-slim` is possible, but makes no sense.
+  qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-slim; });
+  qemu_xen-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-light; });
 
   qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; });
 
@@ -15997,9 +16001,11 @@ with pkgs;
 
   xdotool = callPackage ../tools/X11/xdotool { };
 
-  xen_4_5 = callPackage ../applications/virtualization/xen/4.5.nix { stdenv = overrideCC stdenv gcc49; };
-  xen_xenServer = callPackage ../applications/virtualization/xen/4.5.nix { xenserverPatched = true; stdenv = overrideCC stdenv gcc49; };
-  xen = xen_4_5;
+  xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
+
+  xen = xenPackages.xen_4_5-vanilla;
+  xen-slim = xenPackages.xen_4_5-slim;
+  xen-light = xenPackages.xen_4_5-light;
 
   win-spice = callPackage ../applications/virtualization/driver/win-spice { };
   win-virtio = callPackage ../applications/virtualization/driver/win-virtio { };

From 442b8d49d0e973d2f78bd424efab55d33f6ae98c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 3 Mar 2017 17:46:57 +0000
Subject: [PATCH 1709/3449] nixos: xen: make packages configurable

---
 nixos/modules/virtualisation/xen-dom0.nix | 66 ++++++++++++++++-------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 67eef0ec1e4c..a80b2e1f3b04 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -27,6 +27,36 @@ in
           '';
       };
 
+    virtualisation.xen.package = mkOption {
+      type = types.package;
+      default = pkgs.xen;
+      defaultText = "pkgs.xen";
+      example = literalExample "pkgs.xen-light";
+      description = ''
+        The package used for Xen binary.
+      '';
+    };
+
+    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 = ''
+        The qemu binary to use for Dom-0 backend.
+      '';
+    };
+
+    virtualisation.xen.qemu-package = mkOption {
+      type = types.package;
+      default = pkgs.xen;
+      defaultText = "pkgs.xen";
+      example = literalExample "pkgs.qemu_xen-light";
+      description = ''
+        The package with qemu binaries for xendomains.
+      '';
+    };
+
     virtualisation.xen.bootParams =
       mkOption {
         default = "";
@@ -106,9 +136,9 @@ in
       message = "Xen currently does not support EFI boot";
     } ];
 
-    virtualisation.xen.stored = mkDefault "${pkgs.xen}/bin/oxenstored";
+    virtualisation.xen.stored = mkDefault "${cfg.package}/bin/oxenstored";
 
-    environment.systemPackages = [ pkgs.xen ];
+    environment.systemPackages = [ cfg.package ];
 
     # Make sure Domain 0 gets the required configuration
     #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; };
@@ -144,7 +174,7 @@ in
 
     system.extraSystemBuilderCmds =
       ''
-        ln -s ${pkgs.xen}/boot/xen.gz $out/xen.gz
+        ln -s ${cfg.package}/boot/xen.gz $out/xen.gz
         echo "${toString cfg.bootParams}" > $out/xen-params
       '';
 
@@ -180,19 +210,19 @@ in
 
 
     environment.etc =
-      [ { source = "${pkgs.xen}/etc/xen/xl.conf";
+      [ { source = "${cfg.package}/etc/xen/xl.conf";
           target = "xen/xl.conf";
         }
-        { source = "${pkgs.xen}/etc/xen/scripts";
+        { source = "${cfg.package}/etc/xen/scripts";
           target = "xen/scripts";
         }
-        { source = "${pkgs.xen}/etc/default/xendomains";
+        { source = "${cfg.package}/etc/default/xendomains";
           target = "default/xendomains";
         }
       ];
 
     # Xen provides udev rules.
-    services.udev.packages = [ pkgs.xen ];
+    services.udev.packages = [ cfg.package ];
 
     services.udev.path = [ pkgs.bridge-utils pkgs.iproute ];
 
@@ -217,7 +247,7 @@ in
         time=0
         timeout=30
         # Wait for xenstored to actually come up, timing out after 30 seconds
-        while [ $time -lt $timeout ] && ! `${pkgs.xen}/bin/xenstore-read -s / >/dev/null 2>&1` ; do
+        while [ $time -lt $timeout ] && ! `${cfg.package}/bin/xenstore-read -s / >/dev/null 2>&1` ; do
             time=$(($time+1))
             sleep 1
         done
@@ -228,8 +258,8 @@ in
             exit 1
         fi
 
-        ${pkgs.xen}/bin/xenstore-write "/local/domain/0/name" "Domain-0"
-        ${pkgs.xen}/bin/xenstore-write "/local/domain/0/domid" 0
+        ${cfg.package}/bin/xenstore-write "/local/domain/0/name" "Domain-0"
+        ${cfg.package}/bin/xenstore-write "/local/domain/0/domid" 0
         '';
     };
 
@@ -256,7 +286,7 @@ in
         '';
       serviceConfig = {
         ExecStart = ''
-          ${pkgs.xen}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
+          ${cfg.package}/bin/xenconsoled${optionalString cfg.trace " --log=all --log-dir=/var/log/xen"}
           '';
       };
     };
@@ -267,8 +297,8 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "xen-console.service" ];
       serviceConfig.ExecStart = ''
-        ${pkgs.xen}/lib/xen/bin/qemu-system-i386 -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv \
-           -monitor /dev/null -serial /dev/null -parallel /dev/null
+        ${cfg.qemu} -xen-attach -xen-domid 0 -name dom0 -M xenpv \
+           -nographic -monitor /dev/null -serial /dev/null -parallel /dev/null
         '';
     };
 
@@ -277,7 +307,7 @@ in
       description = "Xen Watchdog Daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "xen-qemu.service" ];
-      serviceConfig.ExecStart = "${pkgs.xen}/bin/xenwatchdogd 30 15";
+      serviceConfig.ExecStart = "${cfg.package}/bin/xenwatchdogd 30 15";
       serviceConfig.Type = "forking";
       serviceConfig.RestartSec = "1";
       serviceConfig.Restart = "on-failure";
@@ -366,11 +396,11 @@ in
       before = [ "dhcpd.service" ];
       restartIfChanged = false;
       serviceConfig.RemainAfterExit = "yes";
-      path = [ pkgs.xen ];
-      environment.XENDOM_CONFIG = "${pkgs.xen}/etc/sysconfig/xendomains";
+      path = [ cfg.package cfg.qemu-package ];
+      environment.XENDOM_CONFIG = "${cfg.package}/etc/sysconfig/xendomains";
       preStart = "mkdir -p /var/lock/subsys -m 755";
-      serviceConfig.ExecStart = "${pkgs.xen}/etc/init.d/xendomains start";
-      serviceConfig.ExecStop = "${pkgs.xen}/etc/init.d/xendomains stop";
+      serviceConfig.ExecStart = "${cfg.package}/etc/init.d/xendomains start";
+      serviceConfig.ExecStop = "${cfg.package}/etc/init.d/xendomains stop";
     };
 
   };

From 6abb141a644d6e61eecadd138e0ce615a26e43b5 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 13 Oct 2016 12:33:48 +0000
Subject: [PATCH 1710/3449] osmctools: osmfilter: init at 1.4.0

---
 pkgs/applications/misc/osmctools/default.nix | 34 ++++++++++++++------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix
index bb4719639ab9..5a9ffc13007f 100644
--- a/pkgs/applications/misc/osmctools/default.nix
+++ b/pkgs/applications/misc/osmctools/default.nix
@@ -1,30 +1,46 @@
 { stdenv, fetchurl, zlib } :
 
+let
+
+  convert_src = fetchurl {
+    url = http://m.m.i24.cc/osmconvert.c;
+    sha256 = "1mvmb171c1jqxrm80jc7qicwk4kgg7yq694n7ci65g6i284r984x";
+    # version = 0.8.5
+  };
+
+  filter_src = fetchurl {
+    url = http://m.m.i24.cc/osmfilter.c;
+    sha256 = "0vm3bls9jb2cb5b11dn82sxnc22qzkf4ghmnkivycigrwa74i6xl";
+    # version = 1.4.0
+  };
+
+in
+
 stdenv.mkDerivation rec {
   name = "osmctools-${version}";
-  version = "0.8.5";
-
-  src = fetchurl {
-    url = http://m.m.i24.cc/osmconvert.c;
-    sha256 = "9da0940912d1bc62223b962483fd796f92c959c48749806aee5806164e5875d7";
-  };
+  version = "0.8.5plus1.4.0";
 
   buildInputs = [ zlib ];
 
   phases = [ "buildPhase" "installPhase" ];
 
   buildPhase = ''
-    cc $src -lz -O3 -o osmconvert
+    cc ${convert_src} -lz -O3 -o osmconvert
+    cc ${filter_src} -O3 -o osmfilter
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     mv osmconvert $out/bin
+    mv osmfilter $out/bin
   '';
 
   meta = with stdenv.lib; {
-    description = "Converter between various Open Street Map file formats";
-    homepage = http://wiki.openstreetmap.org/wiki/Osmconvert;
+    description = "Command line tools for transforming Open Street Map files";
+    homepage = ''
+      http://wiki.openstreetmap.org/wiki/Osmconvert
+      https://wiki.openstreetmap.org/wiki/Osmfilter
+    '';
     platforms = platforms.unix;
   };
 }

From 518a9e3da49e184e7080b65c82983990e8b41da4 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 6 May 2016 14:35:01 +0000
Subject: [PATCH 1711/3449] timidity: add ALSA sequencer support

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

diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index a79f38464746..24a7e8d3f714 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ alsaLib libjack2 ncurses ];
 
-  configureFlags = [ "--enable-audio=oss,alsa,jack" "--with-default-output=alsa" "--enable-ncurses" ];
+  configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ];
 
   NIX_LDFLAGS = ["-ljack -L${libjack2}/lib"];
 

From 1971e94d48cf0e06a52c53370a4c5e5f1399c361 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Fri, 3 Mar 2017 19:21:19 +0100
Subject: [PATCH 1712/3449] hasklig: 0.9 -> 1.1

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

diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix
index 3b5aff984e42..3bca24379142 100644
--- a/pkgs/data/fonts/hasklig/default.nix
+++ b/pkgs/data/fonts/hasklig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hasklig-${version}";
-  version = "0.9";
+  version = "1.1";
 
   src = fetchurl {
     url = "https://github.com/i-tu/Hasklig/releases/download/${version}/Hasklig-${version}.zip";
-    sha256 = "0rav55f6j1b8pqjgwvw52b92j2m630ampamlsiiym2xf684wnw2d";
+    sha256 = "1hwmdbygallw2kjk0v3a3dl7w6b21wii3acrl0w3ibn05g1cxv4q";
   };
 
   buildInputs = [ unzip ];

From 55996b8daf9549cc1b7484be5384e52ee3c77bae Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 7 Sep 2016 10:09:20 +0000
Subject: [PATCH 1713/3449] nixos: network-interfaces-scripted: don't require
 mstpd when rstp is off

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

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index 179300ef1667..3571e00d04ec 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -220,7 +220,7 @@ let
             wantedBy = [ "network-setup.service" (subsystemDevice n) ];
             bindsTo = deps ++ optional v.rstp "mstpd.service";
             partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service";
-            after = [ "network-pre.target" "mstpd.service" ] ++ deps
+            after = [ "network-pre.target" ] ++ deps ++ optional v.rstp "mstpd.service"
               ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces;
             before = [ "network-setup.service" (subsystemDevice n) ];
             serviceConfig.Type = "oneshot";

From a0caadc7d29c7292dbaf9d962666105a3b428aa3 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 08:43:12 -0600
Subject: [PATCH 1714/3449] chuck: 1.3.5.1 -> 1.3.5.2

---
 pkgs/applications/audio/chuck/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index 04cc8008ea89..fd7f0c2b07c2 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.5.1";
+  version = "1.3.5.2";
   name = "chuck-${version}";
 
   src = fetchurl {
     url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
-    sha256 = "0lqzkphfd91kz95nf1wqy0z17r1m70c8inwvnb9fscbiaihwlhfi";
+    sha256 = "02z7sglax3j09grj5s1skmw8z6wz7b21hjrm95nrrdpwbxabh079";
   };
 
   buildInputs = [ bison flex libsndfile which ]
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
     install -Dm755 ./src/chuck $out/bin/chuck
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programming language for real-time sound synthesis and music creation";
     homepage = http://chuck.cs.princeton.edu;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ ftrvxmtrx ];
   };
 }

From 69ca4dec310078037b23ffcc3466237c70d6dd2a Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 5 Mar 2017 15:53:41 +0100
Subject: [PATCH 1715/3449] Geany: 1.29 -> 1.30

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

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index c0370229580b..5a27a8efeb0e 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
 
 let
-  version = "1.29";
+  version = "1.30";
 in
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.geany.org/${name}.tar.bz2";
-    sha256 = "394307596bc908419617e4c33e93eae8b5b733dfc8d01161677b8cbd3a4fb20f";
+    sha256 = "b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

From 659fb3b757ae7e56d565f8aa4b96f84d51a417d9 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 3 Sep 2016 13:45:00 +0000
Subject: [PATCH 1716/3449] kiwix: refactor expression, push pugixml into its
 own derivation

---
 pkgs/applications/misc/kiwix/default.nix | 68 +++++++++++++++---------
 1 file changed, 42 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index a3c140b6e6c2..fa3083943325 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,9 +1,11 @@
 { stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc
 , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
-, gtk2, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk
+, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
 }:
 
+with stdenv.lib;
+
 let
   xulrunner64_tar = fetchurl {
     url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2;
@@ -22,18 +24,41 @@ let
     sha256 = "1h9vcbvf8wgds6i2z20y7krpys0mqsqhv1ijyfljanp6vyll9fvi";
   };
 
-  xulrunner_tar = if stdenv.system == "x86_64-linux" then xulrunner64_tar else xulrunner32_tar;
-  xulrunnersdk_tar = if stdenv.system == "x86_64-linux" then xulrunnersdk64_tar else xulrunnersdk32_tar;
-  pugixml_tar = fetchurl {
-    url = http://download.kiwix.org/dev/pugixml-1.2.tar.gz;
-    sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
-  };
+  xulrunner = if stdenv.system == "x86_64-linux"
+              then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; }
+              else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; };
 
   xapian = callPackage ../../../development/libraries/xapian { inherit stdenv; };
   zimlib = callPackage ../../../development/libraries/zimlib { inherit stdenv; };
 
+
+  pugixml = stdenv.mkDerivation rec {
+    version = "1.2";
+    name = "pugixml-${version}";
+
+    src = fetchurl {
+      url = "http://download.kiwix.org/dev/${name}.tar.gz";
+      sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg";
+    };
+
+    buildInputs = [ cmake ];
+
+    unpackPhase = ''
+      # not a nice src archive: all the files are in the root :(
+      mkdir ${name}
+      cd ${name}
+      tar -xf ${src}
+
+      # and the build scripts are in there :'(
+      cd scripts
+    '';
+
+    NIX_CFLAGS_COMPILE = "-fPIC";
+
+  };
+
 in
-with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "kiwix-${version}";
   version = "0.9";
@@ -60,41 +85,32 @@ stdenv.mkDerivation rec {
     bc
     libuuid
     makeWrapper
+    pugixml
   ];
 
   postUnpack = ''
-    cd kiwix-*
+    cd kiwix*
     mkdir static
     cp Makefile.in static/
 
     cd src/dependencies
-    cp ${pugixml_tar} pugixml-1.2.tar.gz
 
-    tar -xf ${xulrunner_tar}
-    tar -xf ${xulrunnersdk_tar}
+    tar -xf ${xulrunner.tar}
+    tar -xf ${xulrunner.sdk}
 
     cd ../../..
   '';
 
-  configurePhase = ''
-    bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF
-  '';
-
-  buildPhase = ''
-    cd src/dependencies
-    make pugixml-1.2/libpugixml.a
-
-    cd ../..
-    bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF
-
-    make
-  '';
+  configureFlags = [
+    "--disable-static"
+    "--disable-staticbins"
+  ];
 
   installPhase = ''
     make install
     cp -r src/dependencies/xulrunner $out/lib/kiwix
 
-    patchelf --set-interpreter ${glibc.out}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner
 
     rm $out/bin/kiwix
     makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \

From 869878255429de690814417387c23b72b0970d7d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 2 Nov 2016 16:05:37 +0000
Subject: [PATCH 1717/3449] kiwix: fix the build by using custom ctpp2

---
 pkgs/applications/misc/kiwix/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index fa3083943325..ef8f61fddcaa 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,5 +1,5 @@
 { stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig
-, zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc
+, zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
 , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
 , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
 }:
@@ -28,6 +28,7 @@ let
               then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; }
               else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; };
 
+  ctpp2 = callPackage ../../../development/libraries/ctpp2 { inherit stdenv; };
   xapian = callPackage ../../../development/libraries/xapian { inherit stdenv; };
   zimlib = callPackage ../../../development/libraries/zimlib { inherit stdenv; };
 

From 056e57678d52f7106ec7bbc4d4a3eb544de84ba6 Mon Sep 17 00:00:00 2001
From: Jesper Geertsen Jonsson <yesbox@users.noreply.github.com>
Date: Sun, 5 Mar 2017 14:15:18 +0100
Subject: [PATCH 1718/3449] grsecurity docs: fix syntax and indentation errors

Closes https://github.com/NixOS/nixpkgs/pull/23515
---
 nixos/modules/security/grsecurity.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
index ef0aab4a3f13..07a61919ab42 100644
--- a/nixos/modules/security/grsecurity.xml
+++ b/nixos/modules/security/grsecurity.xml
@@ -214,8 +214,8 @@
             GRKERNSEC_CONFIG_SERVER y
             GRKERNSEC_CONFIG_SECURITY y
           '';
-          };
-      }
+        };
+      };
     </programlisting>
   </para>
 

From 27367d634760b23ecb2259397bd897a00476c4ac Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 2 Nov 2016 16:01:50 +0000
Subject: [PATCH 1719/3449] speedread: init at git-2016-09-21

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

diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix
new file mode 100644
index 000000000000..7b4c552f9a36
--- /dev/null
+++ b/pkgs/applications/misc/speedread/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, perl }:
+
+stdenv.mkDerivation rec {
+  version = "git-2016-09-21";
+  name = "speedread-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "pasky";
+    repo   = "speedread";
+    rev    = "93acfd61a1bf4482537ce5d71b9164b8446cb6bd";
+    sha256 = "1h94jx3v18fdlc64lfmj2g5x63fjyqb8c56k5lihl7bva0xgdkxd";
+  };
+
+  buildInputs = [ perl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv speedread $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple terminal-based open source Spritz-alike";
+    longDescription = ''
+      Speedread is a command line filter that shows input text as a
+      per-word rapid serial visual presentation aligned on optimal
+      reading points. This allows reading text at a much more rapid
+      pace than usual as the eye can stay fixed on a single place.
+    '';
+    homepage = src.meta.homepage;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.oxij ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a660dc7108..d6aeebfa7f62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14605,6 +14605,8 @@ with pkgs;
 
   sudolikeaboss = callPackage ../tools/security/sudolikeaboss { };
 
+  speedread = callPackage ../applications/misc/speedread { };
+
   sup = callPackage ../applications/networking/mailreaders/sup {
     ruby = ruby_2_3.override { cursesSupport = true; };
   };

From 82594b3cc2d3f65dc5a50034ea5eb37df1477967 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 09:15:21 -0600
Subject: [PATCH 1720/3449] easytag: 2.4.1 -> 2.4.3

---
 pkgs/applications/audio/easytag/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index a6ba9eab48c1..e9186cd3242c 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
   name = "easytag-${version}";
   majorVersion = "2.4";
-  version = "${majorVersion}.1";
+  version = "${majorVersion}.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz";
-    sha256 = "1mbpwp3lh6yz5xkaq3a329x4r3chmjsr83r349crhi1gax3mzvxr";
+    sha256 = "1mbxnqrw1fwcgraa1bgik25vdzvf97vma5pzknbwbqq5ly9fwlgw";
   };
 
   preFixup = ''
@@ -21,17 +21,17 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lid3tag -lz";
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper pkgconfig intltool ];
   buildInputs = [
-    pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
+    gtk3 glib libid3tag id3lib taglib libvorbis libogg flac
     itstool libxml2 gsettings_desktop_schemas gnome3.defaultIconTheme gnome3.dconf
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "View and edit tags for various audio files";
     homepage = "http://projects.gnome.org/easytag/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fuuzetsu ];
+    platforms = platforms.linux;
   };
 }

From 517efd1c8d651e7bda86ed6471150b31b7ef1294 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 09:43:23 -0600
Subject: [PATCH 1721/3449] fmit: 1.1.8 -> 1.1.11

---
 pkgs/applications/audio/fmit/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 9df6abf16979..bb4df5ea1db5 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -11,16 +11,17 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "fmit-${version}";
-  version = "1.1.8";
+  version = "1.1.11";
 
   src = fetchFromGitHub {
-    sha256 = "14vx4p1h3c6frvv8dam4ymz588zpycmg17pxfkmx4m7pszhlin6b";
+    sha256 = "1w492lf8n2sjkr53z8cvkgywzn0w53cf78hz93zaw6dwwv36lwdp";
     rev = "v${version}";
     repo = "fmit";
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ fftw qtbase qtmultimedia qmakeHook ]
+  nativeBuildInputs = [ qmakeHook ];
+  buildInputs = [ fftw qtbase qtmultimedia ]
     ++ optionals alsaSupport [ alsaLib ]
     ++ optionals jackSupport [ libjack2 ]
     ++ optionals portaudioSupport [ portaudio ];

From 691b3bcd77efc5e00339ccb2dcd9dc7e06402439 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Sun, 5 Mar 2017 16:36:47 +0100
Subject: [PATCH 1722/3449] haskellPackages: fix dangling references

haskeline_0_7_2_1 -> haskline_0_7_3_1
terminfo_0_4_0_1 -> terminfo_0_4_0_2
---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghcjs.nix      | 4 ++--
 7 files changed, 13 insertions(+), 13 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 32348f2c9095..03a905ea3d11 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -43,9 +43,9 @@ self: super: {
   # These packages are core libraries in GHC 7.10.x, but not here.
   binary = self.binary_0_8_4_1;
   deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_2_1;
+  haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
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 16c1ff4f0652..ca271e6c271e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -37,9 +37,9 @@ self: super: {
   # These packages are core libraries in GHC 7.10.x, but not here.
   binary = self.binary_0_7_6_1;
   deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_2_1;
+  haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_0;
-  terminfo = self.terminfo_0_4_0_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
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 5aea83e7567d..ee6e59c65ef3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -36,8 +36,8 @@ self: super: {
 
   # These packages are core libraries in GHC 7.10.x, but not here.
   deepseq = self.deepseq_1_3_0_1;
-  haskeline = self.haskeline_0_7_2_1;
-  terminfo = self.terminfo_0_4_0_1;
+  haskeline = self.haskeline_0_7_3_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
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 32d3c89d5fe3..3bbfa34fb502 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -35,8 +35,8 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_2_1;
-  terminfo = self.terminfo_0_4_0_1;
+  haskeline = self.haskeline_0_7_3_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
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 ffd6845b1d05..150d38dbbf1b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -34,8 +34,8 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  haskeline = self.haskeline_0_7_2_1;
-  terminfo = self.terminfo_0_4_0_1;
+  haskeline = self.haskeline_0_7_3_1;
+  terminfo = self.terminfo_0_4_0_2;
   transformers = self.transformers_0_4_3_0;
   xhtml = self.xhtml_3000_2_1;
 
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 4b18332648db..1be8f16a7d58 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -65,7 +65,7 @@ self: super: {
     mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
     mtl = super.mtl_2_2_1;
     transformers = super.transformers_0_4_3_0;
-    haskeline = self.haskeline_0_7_2_1;
+    haskeline = self.haskeline_0_7_3_1;
     transformers-compat = disableCabalFlag super.transformers-compat "three";
   })) (drv: {});
 
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 826869f828b1..e4a4f74907a8 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -47,10 +47,10 @@ self: super:
 
   # These packages are core libraries in GHC 7.10.x, but not here.
   bin-package-db = null;
-  haskeline = self.haskeline_0_7_2_1;
+  haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_1;
   hpc = self.hpc_0_6_0_2;
-  terminfo = self.terminfo_0_4_0_1;
+  terminfo = self.terminfo_0_4_0_2;
   xhtml = self.xhtml_3000_2_1;
 
 

From 55e213c55849239cb473bde54e417303e91eeed8 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Sun, 5 Mar 2017 16:33:45 +0000
Subject: [PATCH 1723/3449] emby: 3.2.4 -> 3.2.5

---
 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 340e376e9ed6..a9b1333fb0fa 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.4";
+  version = "3.2.5";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "0a14wr2yal9q5vlwadyki9w35bn4f3r7r5w3zynp4f7460lfapmf";
+    sha256 = "1vgn3k57pgj4prndhjshzkwchj9igpagmmlrbkvqdj4axw762i9g";
   };
 
   buildInputs = with pkgs; [

From 2b174d5114a8b579ce146dbfce71daab8cd218aa Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Sun, 5 Mar 2017 18:30:01 +0100
Subject: [PATCH 1724/3449] haskell: ghc710x packages: fix dependent-map

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 6a7fe29b80fa..54cd16957edc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -191,6 +191,7 @@ self: super: {
   unordered-containers = dontCheck super.unordered-containers;
 
   # GHC versions prior to 8.x require additional build inputs.
+  dependent-map = addBuildDepend super.dependent-map self.semigroups;
   distributive = addBuildDepend super.distributive self.semigroups;
   mono-traversable = addBuildDepend super.mono-traversable self.semigroups;
   attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]);

From b5bb83b273f7c019e1af2ea6358423b8bc2a6054 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Thu, 23 Feb 2017 17:39:29 +0100
Subject: [PATCH 1725/3449] sha1collisiondetection: init at 1.0.1

Closes https://github.com/NixOS/nixpkgs/pull/23114
---
 .../sha1collisiondetection/default.nix        | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/security/sha1collisiondetection/default.nix

diff --git a/pkgs/tools/security/sha1collisiondetection/default.nix b/pkgs/tools/security/sha1collisiondetection/default.nix
new file mode 100644
index 000000000000..de1796f431d3
--- /dev/null
+++ b/pkgs/tools/security/sha1collisiondetection/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, libtool, which }:
+
+stdenv.mkDerivation  rec {
+  pname = "sha1collisiondetection";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "cr-marcstevens";
+    repo = pname;
+    rev = "development-v${version}";
+    sha256 = "09vd5mgclcdx7yq3kwzxy1z7pbxcp0xljfly7hy4ixahmnn290h6";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  doCheck = true;
+
+  nativeBuildInputs = [ libtool which ];
+
+  meta = with stdenv.lib; {
+    description = "Library and command line tool to detect SHA-1 collision";
+    longDescription = ''
+      This library and command line tool were designed as near drop-in
+      replacements for common SHA-1 libraries and sha1sum. They will
+      compute the SHA-1 hash of any given file and additionally will
+      detect cryptanalytic collision attacks against SHA-1 present in
+      each file. It is very fast and takes less than twice the amount
+      of time as regular SHA-1.
+      '';
+    platforms = platforms.all;
+    maintainers = with maintainers; [ leenaars ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d30fc3ccc1e..c51a76f6c83d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3825,6 +3825,8 @@ with pkgs;
 
   sg3_utils = callPackage ../tools/system/sg3_utils { };
 
+  sha1collisiondetection = callPackage ../tools/security/sha1collisiondetection { };
+
   shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { };
 
   sharutils = callPackage ../tools/archivers/sharutils { };

From 2ddcbcfe62d358e9d5bc4033cc618709342e86ac Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 12:05:43 -0600
Subject: [PATCH 1726/3449] xdo: 0.5.3 -> 0.5.5 (#23415)

---
 pkgs/tools/misc/xdo/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index ddcf6061ed8b..a07c1507218d 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
    name = "xdo-${version}";
-   version = "0.5.3";
+   version = "0.5.5";
 
    src = fetchFromGitHub {
      owner = "baskerville";
      repo = "xdo";
      rev = version;
-     sha256 = "0gfrziil6xw6pkr8k8rn56ihy0333v6dlsw3dckib9hm7ikj0k2f";
+     sha256 = "17i7ym4jrrbsiqs0jnm6k49hp9qn32hswad4j0lavwgv4wawachz";
    };
-
-   prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';
+   
+   makeFlags = "PREFIX=$(out)";
 
    buildInputs = [ libxcb xcbutilwm ];
 
-   meta = {
+   meta = with stdenv.lib; {
      description = "Small X utility to perform elementary actions on windows";
-     inherit (src.meta) homepage;
-     maintainers = [ stdenv.lib.maintainers.meisternu ];
-     license = stdenv.lib.licenses.bsd2;
-     platforms = stdenv.lib.platforms.linux;
+     homepage = "https://github.com/baskerville/xdo";
+     maintainers = with maintainers; [ meisternu ];
+     license = licenses.bsd2;
+     platforms = platforms.linux;
    };
 }

From 079c306c6e498caa0d99e5a0e212e60ebac4fd58 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sun, 5 Mar 2017 20:47:24 +0100
Subject: [PATCH 1727/3449] openshot-qt: remove myself from the maintainer list

---
 pkgs/applications/video/openshot-qt/default.nix           | 2 +-
 pkgs/applications/video/openshot-qt/libopenshot-audio.nix | 2 +-
 pkgs/applications/video/openshot-qt/libopenshot.nix       | 2 +-
 pkgs/development/libraries/unittest-cpp/default.nix       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index eb184933964b..ca44742b0461 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "http://openshot.org/";
     description = "Free, open-source video editor";
     license = licenses.gpl3Plus;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
index fdaa049fa428..069c3ba7800b 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "http://openshot.org/";
     description = "Free, open-source video editor";
     license = licenses.gpl3Plus;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix
index 841587fcab30..b0891a3d69f3 100644
--- a/pkgs/applications/video/openshot-qt/libopenshot.nix
+++ b/pkgs/applications/video/openshot-qt/libopenshot.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "http://openshot.org/";
     description = "Free, open-source video editor";
     license = licenses.gpl3Plus;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix
index bc9035d479b5..cee71df4849a 100644
--- a/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/pkgs/development/libraries/unittest-cpp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/unittest-cpp/unittest-cpp";
     description = "Lightweight unit testing framework for C++";
     license = licenses.mit;
-    maintainers = [maintainers.tohl];
+    maintainers = [];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From 6ed6731e364c68322588b22109208a54747756d3 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Sun, 5 Mar 2017 14:51:48 -0500
Subject: [PATCH 1728/3449] racket: disable i686 builds

ref #23253
---
 pkgs/development/interpreters/racket/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 2bf7ec5d2dfe..6f3df4e866d6 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -80,6 +80,6 @@ stdenv.mkDerivation rec {
     homepage = http://racket-lang.org/;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ kkallio henrytill vrthra ];
-    platforms = platforms.unix;
+    platforms = platforms.x86_64;
   };
 }

From 21c51c570e6db667dd45cd3972176bbc8f868633 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Mar 2017 21:06:25 +0100
Subject: [PATCH 1729/3449] xfce-timer-plugin: init at 1.6.0 (#22563)

---
 pkgs/desktops/xfce/default.nix                |  1 +
 .../xfce/panel-plugins/xfce4-timer-plugin.nix | 29 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index ace5f289ab4d..96e05a2fb636 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -91,6 +91,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4_notes_plugin            = callPackage ./panel-plugins/xfce4-notes-plugin.nix            { };
   xfce4-sensors-plugin          = callPackage ./panel-plugins/xfce4-sensors-plugin.nix          { };
   xfce4_systemload_plugin       = callPackage ./panel-plugins/xfce4-systemload-plugin.nix       { };
+  xfce4_timer_plugin            = callPackage ./panel-plugins/xfce4-timer-plugin.nix            { };
   xfce4_verve_plugin            = callPackage ./panel-plugins/xfce4-verve-plugin.nix            { };
   xfce4_xkb_plugin              = callPackage ./panel-plugins/xfce4-xkb-plugin.nix              { };
   xfce4_weather_plugin          = callPackage ./panel-plugins/xfce4-weather-plugin.nix          { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
new file mode 100644
index 000000000000..17dcb10c9d1e
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui, libxfcegui4, xfconf, gtk}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-timer-plugin";
+  ver_maj = "1.6";
+  ver_min = "0";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "0z46gyw3ihcd1jf0m5z1dsc790xv1cpi8mk1dagj3i4v14gx5mrr";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  buildInputs = [ intltool libxfce4util libxfce4ui xfce4panel libxfcegui4 xfconf
+    gtk ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  hardeningDisable = [ "format" ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Battery plugin for Xfce panel";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}

From 20c2f51967271c2274d7c5255be394926afd9649 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 5 Mar 2017 21:07:59 +0100
Subject: [PATCH 1730/3449] xfce4-mpc-plugin: init at 0.4.5 (#22560)

---
 pkgs/desktops/xfce/default.nix                |  5 ++--
 .../xfce/panel-plugins/xfce4-mpc-plugin.nix   | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 96e05a2fb636..abe2cc961be2 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -32,9 +32,9 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   thunar          = callPackage ./core/thunar.nix { };
   thunarx-2-dev   = thunar-build; # Plugins need only the `thunarx-2` part of the package. Awaiting multiple outputs.
   thunar_volman   = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now
-  thunar-archive-plugin 
+  thunar-archive-plugin
                   = callPackage ./thunar-plugins/archive { };
-  thunar-dropbox-plugin 
+  thunar-dropbox-plugin
                   = callPackage ./thunar-plugins/dropbox { };
   tumbler         = callPackage ./core/tumbler.nix { };
   xfce4panel      = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
@@ -89,6 +89,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { };
   xfce4_netload_plugin          = callPackage ./panel-plugins/xfce4-netload-plugin.nix          { };
   xfce4_notes_plugin            = callPackage ./panel-plugins/xfce4-notes-plugin.nix            { };
+  xfce4_mpc_plugin              = callPackage ./panel-plugins/xfce4-mpc-plugin.nix              { };
   xfce4-sensors-plugin          = callPackage ./panel-plugins/xfce4-sensors-plugin.nix          { };
   xfce4_systemload_plugin       = callPackage ./panel-plugins/xfce4-systemload-plugin.nix       { };
   xfce4_timer_plugin            = callPackage ./panel-plugins/xfce4-timer-plugin.nix            { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
new file mode 100644
index 000000000000..6a2f5bd50849
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel, libxfce4ui,
+libxfcegui4, xfconf, gtk, exo }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-mpc-plugin";
+  ver_maj = "0.4";
+  ver_min = "5";
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7";
+  };
+
+  buildInputs = [ pkgconfig intltool libxfce4util libxfce4ui xfce4panel
+    libxfcegui4 xfconf gtk exo ];
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "MPD plugin for Xfce panel";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.matthiasbeyer ];
+  };
+}

From 5f1398ce13048714a5d94e1532dc0049a748b02a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 5 Mar 2017 16:28:04 +0100
Subject: [PATCH 1731/3449] borgbackup: 1.0.9 -> 1.0.10

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

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index b27d5c834b1b..476c42504a26 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "1.0.9";
+  version = "1.0.10";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/borgbackup/borg/releases/download/"
       + "${version}/${name}.tar.gz";
-    sha256 = "1ciwp9yilcibk0x82y5nn8ps95jrm8rxvff8mjrlp7a2w100i1im";
+    sha256 = "1sarmpzwr8dhbg0hsvaclcsjfax36ssb32d9klhhah4j8kqji3wp";
   };
 
   nativeBuildInputs = with python3Packages; [

From b478df134933f322c5d80787773b00e6a4a3aa92 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 14:49:48 -0600
Subject: [PATCH 1732/3449] openresolv: 3.8.1 -> 3.9.0 (#23362)

---
 pkgs/tools/networking/openresolv/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 7d9062c08db7..f22ad32aaa4e 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, makeWrapper, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "openresolv-3.8.1";
+  name = "openresolv-${version}";
+  version = "3.9.0";
 
   src = fetchurl {
     url = "mirror://roy/openresolv/${name}.tar.xz";
-    sha256 = "0hqxvrhc4r310hr59bwi1vbl16my27pdlnbrnbqqihiav67xfnfj";
+    sha256 = "1f2dccc52iykbpma26fbxzga2l6g4njm3bgaxz4rgdrb4cwlv82i";
   };
 
   buildInputs = [ makeWrapper ];

From 947815f59f59fab8405af84d0a80df99dd8d6e9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 5 Mar 2017 22:40:01 +0100
Subject: [PATCH 1733/3449] fcron: 3.1.2 -> 3.2.1

fixes #23320 #23413
---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/services/scheduling/fcron.nix   | 48 ++++++++++++----
 pkgs/tools/system/fcron/default.nix           | 57 ++++++++++---------
 .../system/fcron/relative-fcronsighup.patch   | 16 ++++++
 4 files changed, 86 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/tools/system/fcron/relative-fcronsighup.patch

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index d51b29b99dae..feecee3225be 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -288,6 +288,7 @@
       kresd = 270;
       rpc = 271;
       geoip = 272;
+      fcron = 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
+      fcron = 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/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index e4ada2768715..bd1ecb40969b 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -23,7 +23,8 @@ let
   allowdeny = target: users:
     { source = pkgs.writeText "fcron.${target}" (concatStringsSep "\n" users);
       target = "fcron.${target}";
-      mode = "600"; # fcron has some security issues.. So I guess this is most safe
+      mode = "644";
+      gid = config.ids.gids.fcron;
     };
 
 in
@@ -89,7 +90,7 @@ in
       [ (allowdeny "allow" (cfg.allow))
         (allowdeny "deny" cfg.deny)
         # see man 5 fcron.conf
-        { source = pkgs.writeText "fcon.conf" ''
+        { source = pkgs.writeText "fcron.conf" ''
             fcrontabs   =       /var/spool/fcron
             pidfile     =       /var/run/fcron.pid
             fifofile    =       /var/run/fcron.fifo
@@ -97,16 +98,40 @@ in
             fcrondeny   =       /etc/fcron.deny
             shell       =       /bin/sh
             sendmail    =       /run/wrappers/bin/sendmail
-            editor      =       /run/current-system/sw/bin/vi
+            editor      =       ${pkgs.vim}/bin/vim
           '';
           target = "fcron.conf";
-          mode = "0600"; # max allowed is 644
+          gid = config.ids.gids.fcron;
+          mode = "0644";
         }
       ];
 
     environment.systemPackages = [ pkgs.fcron ];
+    users.extraUsers.fcron = {
+      uid = config.ids.uids.fcron;
+      home = "/var/spool/fcron";
+      group = "fcron";
+    };
+    users.groups.fcron.gid = config.ids.gids.fcron;
 
-    security.wrappers.fcrontab.source = "${pkgs.fcron.out}/bin/fcrontab";
+    security.wrappers = {
+      fcrontab = {
+        source = "${pkgs.fcron}/bin/fcrontab";
+        owner = "fcron";
+        group = "fcron";
+        setgid = true;
+      };
+      fcrondyn = {
+        source = "${pkgs.fcron}/bin/fcrondyn";
+        owner = "fcron";
+        group = "fcron";
+        setgid = true;
+      };
+      fcronsighup = {
+        source = "${pkgs.fcron}/bin/fcronsighup";
+        group = "fcron";
+      };
+    };
     systemd.services.fcron = {
       description = "fcron daemon";
       after = [ "local-fs.target" ];
@@ -118,14 +143,17 @@ in
       };
 
       preStart = ''
-        ${pkgs.coreutils}/bin/mkdir -m 0700 -p /var/spool/fcron
+        ${pkgs.coreutils}/bin/mkdir -m 0770 -p /var/spool/fcron
+        ${pkgs.coreutils}/bin/chown -R fcron:fcron /var/spool/fcron
         # load system crontab file
-        ${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
+        set -x
+        #${pkgs.fcron}/bin/fcrontab -u systab ${pkgs.writeText "systab" cfg.systab}
       '';
 
-      serviceConfig.Type = "forking";
-
-      script = "${pkgs.fcron}/sbin/fcron -m ${toString cfg.maxSerialJobs} ${queuelen}";
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.fcron}/sbin/fcron -m ${toString cfg.maxSerialJobs} ${queuelen}";
+      };
     };
   };
 }
diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index f546cd8f5ffc..ec52b5b3db8e 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -1,58 +1,61 @@
-# I've only worked on this till it compiled and worked. So maybe there are some things which should be done but I've missed
 # restart using 'killall -TERM fcron; fcron -b
 # use convert-fcrontab to update fcrontab files
 
 { stdenv, fetchurl, perl, busybox, vim }:
 
 stdenv.mkDerivation rec {
-  name = "fcron-3.1.2";
+  name = "fcron-${version}";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "http://fcron.free.fr/archives/${name}.src.tar.gz";
-    sha256 = "0p8sn4m3frh2x2llafq2gbcm46rfrn6ck4qi0d0v3ql6mfx9k4hw";
+    sha256 = "0sjz7r050myj6zgixzx3pk5ff819v6b0zfn0q1lkd19jkaix0531";
   };
 
   buildInputs = [ perl ];
 
+  patches = [ ./relative-fcronsighup.patch ];
+
   configureFlags =
     [ "--with-sendmail=${busybox}/sbin/sendmail"
       "--with-editor=${vim}/bin/vi"  # TODO customizable
       "--with-bootinstall=no"
+      "--localstatedir=/var"
       "--sysconfdir=/etc"
-      # fcron would have been default user/grp
-      "--with-username=root"
-      "--with-groupname=root"
       "--with-rootname=root"
       "--with-rootgroup=root"
       "--disable-checks"
     ];
-    
+
   installTargets = "install-staged"; # install does also try to change permissions of /etc/* files
-  
-  preConfigure =
-    ''
-      sed -i 's@/usr/bin/env perl@${perl}/bin/perl@g' configure script/*
-      # Don't let fcron create the group fcron, nix(os) should do this
-      sed -i '2s@.*@exit 0@' script/user-group
 
-      # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
-      sed -i '2s@.*@exit 0@' script/boot-install
+  # fcron tries to install pid into system directory on install
+  installFlags = [
+    "ETC=."
+    "PIDDIR=."
+    "PIDFILE=fcron.pid"
+    "REBOOT_LOCK=fcron.reboot"
+    "FIFODIR=."
+    "FIFOFILE=fcron.fifo"
+    "FCRONTABS=."
+  ];
 
-      # also don't use chown or chgrp for documentation (or whatever) when installing
-      find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
-    '';
+  preConfigure = ''
+    sed -i 's@/usr/bin/env perl@${perl}/bin/perl@g' configure script/*
+    # Don't let fcron create the group fcron, nix(os) should do this
+    sed -i '2s@.*@exit 0@' script/user-group
 
-  patchPhase =
-    ''
-      # don't try to create /etc/fcron.{allow,deny,conf} 
-      sed -i -e 's@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
-             -e 's@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in
-    '';
+    # --with-bootinstall=no shoud do this, didn't work. So just exit the script before doing anything
+    sed -i '2s@.*@exit 0@' script/boot-install
 
-  meta = { 
+    # also don't use chown or chgrp for documentation (or whatever) when installing
+    find -type f | xargs sed -i -e 's@^\(\s\)*chown@\1:@' -e 's@^\(\s\)*chgrp@\1:@'
+  '';
+
+  meta = with stdenv.lib; {
     description="A command scheduler with extended capabilities over cron and anacron";
     homepage = http://fcron.free.fr;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+
   };
 }
diff --git a/pkgs/tools/system/fcron/relative-fcronsighup.patch b/pkgs/tools/system/fcron/relative-fcronsighup.patch
new file mode 100644
index 000000000000..c0bbfc1ee3ef
--- /dev/null
+++ b/pkgs/tools/system/fcron/relative-fcronsighup.patch
@@ -0,0 +1,16 @@
+Use relative fcronsighup to prefer setuid executable over package binary.
+--- fcron-3.2.1.orig/fcrontab.c	2016-06-26 17:02:48.000000000 +0200
++++ fcron-3.2.1/fcrontab.c	2017-03-05 21:54:24.676871335 +0100
+@@ -154,10 +154,10 @@
+                         fcrontab_gid);
+                 exit(ERR);
+             }
+-            execl(BINDIREX "/fcronsighup", BINDIREX "/fcronsighup", fcronconf,
++            execlp("fcronsighup",  "fcronsighup", fcronconf,
+                   NULL);
+ 
+-            error_e("Could not exec " BINDIREX " fcronsighup");
++            error_e("Could not exec fcronsighup");
+             exit(ERR);
+             break;
+ 

From c0bfcdf3a6d2bdc97524274a83febef043749107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 5 Mar 2017 23:31:37 +0100
Subject: [PATCH 1734/3449] opensc: remove obsolete DESTDIR patch

This patch was actively causing harm, because it lead to a "double prefix"
issue where the etc files were installed into $out/$out/etc instead of just
$out/etc.
---
 pkgs/tools/security/opensc/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 672b95dec450..302a5e251b03 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "16y3ryx606nry2li05hm88bllrragdj3sfl3yh7pf71777n4lsk4";
   };
 
-  postPatch = ''
-    sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am
-  '';
-
   buildInputs = [
     autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan
     libXt libxslt libiconv docbook_xml_dtd_412
@@ -38,9 +34,11 @@ stdenv.mkDerivation rec {
   ];
 
   installFlags = [
-    "sysconfdir=\${out}/etc"
+    "sysconfdir=$(out)/etc"
   ];
 
+  
+
   meta = with stdenv.lib; {
     description = "Set of libraries and utilities to access smart cards";
     homepage = https://github.com/OpenSC/OpenSC/wiki;

From 82fda65c8a6ff488c46e8a3f66538aac2421bdc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 5 Mar 2017 23:38:56 +0100
Subject: [PATCH 1735/3449] fcron: add missing meta.platforms

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

diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix
index ec52b5b3db8e..5de03199fa51 100644
--- a/pkgs/tools/system/fcron/default.nix
+++ b/pkgs/tools/system/fcron/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     description="A command scheduler with extended capabilities over cron and anacron";
     homepage = http://fcron.free.fr;
     license = licenses.gpl2;
-
+    platforms = stdenv.lib.platforms.all;
   };
 }

From 4c42fac49368cbc15e21b9ed2464766470a32dcc Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 16:52:20 -0600
Subject: [PATCH 1736/3449] s6-portable-utils: Retry of Darwin gcc

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 357600e8d4f6..0b92b543f84e 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 }:
+{ stdenv, fetchFromGitHub, skalibs, gcc }:
 
 stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
@@ -12,7 +12,10 @@ stdenv.mkDerivation rec {
   };
 
   dontDisableStatic = true;
-
+  
+  # Darwin Support, optional isDarwin failed
+  nativeBuildInputs = [ gcc ];
+    
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"

From 869037812c14cf96d49aa46d0d723eba50199367 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 5 Mar 2017 17:04:53 -0600
Subject: [PATCH 1737/3449] qttools: update cmake paths for Qt 5.8

---
 .../qt-5/5.8/qttools/cmake-paths.patch        | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

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 fe5bcadbe9a8..3d557c4c023b 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
@@ -1,7 +1,7 @@
-Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake.in
+Index: qttools-opensource-src-5.8.0/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
+--- qttools-opensource-src-5.8.0.orig/src/assistant/help/Qt5HelpConfigExtras.cmake.in
++++ qttools-opensource-src-5.8.0/src/assistant/help/Qt5HelpConfigExtras.cmake.in
 @@ -2,11 +2,10 @@
  if (NOT TARGET Qt5::qcollectiongenerator)
      add_executable(Qt5::qcollectiongenerator IMPORTED)
@@ -18,10 +18,23 @@ Index: qttools-opensource-src-5.5.1/src/assistant/help/Qt5HelpConfigExtras.cmake
      _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
+@@ -17,11 +16,7 @@ endif()
+ 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\")
+     _qt5_Help_check_file_exists(${imported_location})
+ 
+     set_target_properties(Qt5::qhelpgenerator PROPERTIES
+Index: qttools-opensource-src-5.8.0/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
+--- qttools-opensource-src-5.8.0.orig/src/linguist/Qt5LinguistToolsConfig.cmake.in
++++ qttools-opensource-src-5.8.0/src/linguist/Qt5LinguistToolsConfig.cmake.in
 @@ -44,11 +44,10 @@ endmacro()
  if (NOT TARGET Qt5::lrelease)
      add_executable(Qt5::lrelease IMPORTED)

From 923224ab2e6ad7131763f3ea6aee2453b0dd3e35 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 5 Mar 2017 17:05:17 -0600
Subject: [PATCH 1738/3449] qtstyleplugins: mark broken with Qt 5.8

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

diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index addc13a8c968..f1ee6e659a6f 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, pkgconfig, gtk2 }:
+{ stdenv, fetchFromGitHub, qmakeHook, qtbase, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "qtstyleplugins-2016-12-01";
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
     maintainers = [ maintainers.gnidorah ];
     platforms = platforms.linux;
+    broken = builtins.compareVersion qtbase.version "5.7.0" > 0;
   };
 }

From 2a385516516c5d1762e1d33c96e3fd25c457ca96 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 5 Mar 2017 17:05:33 -0600
Subject: [PATCH 1739/3449] qtwebengine: update build system paths for Qt 5.8

---
 pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix   | 4 ++--
 .../qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 ec3f9061f795..9d63f848cba8 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -27,9 +27,9 @@ qtSubmodule {
     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 \
+    substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \
       --replace /bin/echo ${coreutils}/bin/echo
-    substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
+    substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
       --replace /bin/echo ${coreutils}/bin/echo
 
     # fix default SSL bundle location
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch b/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
index b3316188f7d9..49d4c4f042b6 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/qtwebengine-paxmark-mksnapshot.patch
@@ -1,5 +1,5 @@
---- 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
+--- qtwebengine-opensource-src-5.8.0-orig/src/3rdparty/chromium/v8/src/v8.gyp	2016-03-04 01:48:36.000000000 +1100
++++ qtwebengine-opensource-src-5.8.0/src/3rdparty/chromium/v8/src/v8.gyp	2016-05-01 19:15:44.052770543 +1000
 @@ -33,6 +33,7 @@
      'embed_script%': "",
      'v8_extra_library_files%': [],

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 1740/3449] 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 000000000000..e79cdede092e
--- /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 6a51e40d1233..1d534bd452b1 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 bb86916487246213de5b71c2a3fb3972f0029227 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 6 Mar 2017 00:15:36 +0100
Subject: [PATCH 1741/3449] hydrogen: 0.9.6.1 -> 0.9.7

---
 pkgs/applications/audio/hydrogen/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix
index 21767e3079f2..686a6b67e6aa 100644
--- a/pkgs/applications/audio/hydrogen/default.nix
+++ b/pkgs/applications/audio/hydrogen/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, alsaLib, boost, cmake, glib, libjack2, libarchive
+{ stdenv, fetchurl, alsaLib, boost, cmake, glib, lash, libjack2, libarchive
 , liblrdf, libsndfile, pkgconfig, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.6.1";
+  version = "0.9.7";
   name = "hydrogen-${version}";
 
   src = fetchurl {
     url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz";
-    sha256 = "0vxnaqfmcv7hhk0cj67imdcqngspnck7f0wfmvhfgfqa7x1xznll";
+    sha256 = "1dy2jfkdw0nchars4xi4isrz66fqn53a9qk13bqza7lhmsg3s3qy";
   };
 
-  buildInputs = [ 
-    alsaLib boost cmake glib libjack2 libarchive liblrdf libsndfile pkgconfig qt4
+  buildInputs = [
+    alsaLib boost cmake glib lash libjack2 libarchive liblrdf libsndfile pkgconfig qt4
   ];
 
   meta = with stdenv.lib; {

From c4733c3350e7f0bc79e5d35cc04a7046aa86f653 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 18:00:50 -0600
Subject: [PATCH 1742/3449] s6-portable-utils: Trying again for gcc support

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 0b92b543f84e..7e81a37cc36c 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, skalibs, gcc }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
   version = "2.1.0.0";
@@ -13,8 +15,8 @@ stdenv.mkDerivation rec {
 
   dontDisableStatic = true;
   
-  # Darwin Support, optional isDarwin failed
-  nativeBuildInputs = [ gcc ];
+  nativeBuildInputs = []
+    ++ optional stdenv.isDarwin gcc;
     
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
@@ -22,9 +24,10 @@ stdenv.mkDerivation rec {
     "--with-lib=${skalibs}/lib"
     "--with-dynlib=${skalibs}/lib"
   ]
-  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
+  ++ (optional stdenv.isDarwin "--target=${stdenv.system}")
+  ++ (optional stdenv.isDarwin "--with-gcc=${gcc}/bin");
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";
     platforms = platforms.all;

From 237e6dccb2a09ebe28aa7feed72b7061b4ef6cd7 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 18:25:40 -0600
Subject: [PATCH 1743/3449] s6-portable-utils: removed cross, may be causing
 issue for Darwin

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 7e81a37cc36c..d0855f24f3ac 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,6 +1,9 @@
 { stdenv, fetchFromGitHub, skalibs, gcc }:
 
 with stdenv.lib;
+let
+  cross = "";
+in
 
 stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
@@ -17,7 +20,12 @@ stdenv.mkDerivation rec {
   
   nativeBuildInputs = []
     ++ optional stdenv.isDarwin gcc;
-    
+  
+  preConfigure = ''
+    substituteInPlace configure \
+      "${cross}" " "
+      '';
+
   configureFlags = [
     "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
     "--with-include=${skalibs}/include"
@@ -25,8 +33,7 @@ stdenv.mkDerivation rec {
     "--with-dynlib=${skalibs}/lib"
   ]
   ++ (optional stdenv.isDarwin "--target=${stdenv.system}")
-  ++ (optional stdenv.isDarwin "--with-gcc=${gcc}/bin");
-
+  ;
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";

From e18816ff6a11db490ffb40fb575195602002b943 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 18:44:57 -0600
Subject: [PATCH 1744/3449] s6-portable-utils: removed cross, may be causing
 issue for Darwin

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index d0855f24f3ac..d227c86466d6 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -21,19 +21,19 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = []
     ++ optional stdenv.isDarwin gcc;
   
-  preConfigure = ''
-    substituteInPlace configure \
-      "${cross}" " "
-      '';
+    #preConfigure = ''
+    #substituteInPlace configure \
+    # "${cross}" " "
+    # '';
 
-  configureFlags = [
-    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    "--with-include=${skalibs}/include"
-    "--with-lib=${skalibs}/lib"
-    "--with-dynlib=${skalibs}/lib"
-  ]
-  ++ (optional stdenv.isDarwin "--target=${stdenv.system}")
-  ;
+      # configureFlags = [
+        #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
+        #"--with-include=${skalibs}/include"
+        #"--with-lib=${skalibs}/lib"
+        #"--with-dynlib=${skalibs}/lib"
+        #]
+        #++ (optional stdenv.isDarwin "--target=${stdenv.system}")
+  
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";

From 384bc23beef5da1754f51e292821812a99892745 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 18:53:27 -0600
Subject: [PATCH 1745/3449] s6-portable-utils: setting of config flags

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index d227c86466d6..06ea8a406f91 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -21,18 +21,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = []
     ++ optional stdenv.isDarwin gcc;
   
-    #preConfigure = ''
-    #substituteInPlace configure \
-    # "${cross}" " "
-    # '';
-
-      # configureFlags = [
-        #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-        #"--with-include=${skalibs}/include"
-        #"--with-lib=${skalibs}/lib"
-        #"--with-dynlib=${skalibs}/lib"
-        #]
-        #++ (optional stdenv.isDarwin "--target=${stdenv.system}")
+  configureFlags = [
+    #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
+    #"--with-include=${skalibs}/include"
+     "--with-lib=${skalibs}/lib"
+     "--with-dynlib=${skalibs}/lib"
+        ];
+        
   
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;

From c9b4317b2d8221245ac144ea832817766290be93 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Mar 2017 23:22:27 +0800
Subject: [PATCH 1746/3449] docker-machine-kvm: 0.7.0 -> 0.8.2

---
 .../cluster/docker-machine/kvm-deps.nix       | 22 +++++++++----------
 .../networking/cluster/docker-machine/kvm.nix | 18 ++++++---------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
index 709491a76f8a..e321b2c1b0ac 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm-deps.nix
@@ -1,21 +1,21 @@
 # This file was generated by go2nix.
 [
-  {
-    goPackagePath = "github.com/alexzorin/libvirt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/alexzorin/libvirt-go";
-      rev = "9359c4feb97212380aa05213fa30c4b7348365f0";
-      sha256 = "02ipw28pjl5ng2xk63r279apc2py1yr5brcpnsc0cnd2imd51fqa";
-    };
-  }
   {
     goPackagePath = "github.com/docker/machine";
     fetch = {
       type = "git";
       url = "https://github.com/docker/machine";
-      rev = "bb37dc7806687013c0c3097342ef7db4257655d2";
-      sha256 = "0wgyxpwis4hyknqalal1cnvb0v3j8f6lscchhk9ch6i69ngiaf03";
+      rev = "457c02d06a155827c1c4af9b5ab38c0b6b4e48ea";
+      sha256 = "0hx5bhjc7q9ml6h6d2a5csqg6vqwjj68599q0cccw3pcfrb34gmd";
+    };
+  }
+  {
+    goPackagePath = "github.com/libvirt/libvirt-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/libvirt/libvirt-go";
+      rev = "e9642325d747c353ca7b76b4893d5dbdc81c296f";
+      sha256 = "1822b2kbwyxb2gigbiashcs7v4fsyw7k3sdlqh43ga0l6058fmhl";
     };
   }
 ]
diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
index 46105f34b5b7..a73ec99cb9fb 100644
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@@ -1,25 +1,21 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub, libvirt }:
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
 
 buildGoPackage rec {
   name = "docker-machine-kvm-${version}";
-  version = "0.7.0";
+  version = "0.8.2";
 
   goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
   goDeps = ./kvm-deps.nix;
 
   src = fetchFromGitHub {
-    rev = "v${version}";
-    owner = "dhiltgen";
-    repo = "docker-machine-kvm";
-    sha256 = "0zkwwkx74vsfd7v38y9sidi759mhdcpm4409l9y4cx0wmkpavlv6";
+    rev    = "v${version}";
+    owner  = "dhiltgen";
+    repo   = "docker-machine-kvm";
+    sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p";
   };
 
-  buildInputs = [ libvirt ];
-
-  postInstall = ''
-    mv $bin/bin/bin $bin/bin/docker-machine-driver-kvm
-  '';
+  buildInputs = [ libvirt pkgconfig ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/dhiltgen/docker-machine-kvm;

From 35dbe4d0f1c1ff8496d150c14d518b8efda0632f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 5 Mar 2017 11:23:44 +0800
Subject: [PATCH 1747/3449] minikube: 0.16.0 -> 0.17.1

---
 .../networking/cluster/minikube/default.nix          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index c773d8ac23a4..fcc17df3fc46 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -5,14 +5,14 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "0njx4vzr0cpr3dba08w0jrlpfb8qrmxq5lqfrk3qrx29x5y6i6hi"
-             else "0i21m1pys6rdxcwsk987l08lhzpcbg4bdrznaam02g6jj6jxvq0x";
+             then "0cdcabsx5l4jbpyj3zzyz5bnzks6wl64bmzdsnk41x92ar5y5yal"
+             else "12f3b7s5lwpvzx4wj6i6h62n4zjshqf206fxxwpwx9kpsdaw6xdi";
 
 # TODO: compile from source
 
 in stdenv.mkDerivation rec {
   pname = "minikube";
-  version = "0.16.0";
+  version = "0.17.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     sha256 = "${checksum}";
   };
 
-  phases = [ "installPhase" ];
+  phases = [ "installPhase" "fixupPhase" ];
 
   buildInputs = [ makeWrapper ];
 
@@ -28,6 +28,10 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     install -Dm755 ${src} $out/bin/${pname}
+  '';
+
+  fixupPhase = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/minikube"
 
     wrapProgram $out/bin/${pname} \
       --prefix PATH : ${binPath}

From f2961da3f7adf103e4e3ee26de1ce9362c7118d9 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 5 Mar 2017 19:32:38 -0600
Subject: [PATCH 1748/3449] wakatime: 6.0.1 -> 7.0.4

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

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index cf3b75be3f68..5f407591f673 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -5,10 +5,10 @@ with pythonPackages;
 buildPythonPackage rec {
   namePrefix = "";
   name = "wakatime-${version}";
-  version = "6.0.1";
+  version = "7.0.4";
 
   src = fetchFromGitHub {
-    sha256 = "0bkzchivkz39jiz78jy7zkpsg6fd94wd7nsmrnijvxb3dn35l7l2";
+    sha256 = "0ghrf0aqb89gjp4pb0398cszi6wzk8chqwd3l5xq6qcgvsq8srq3";
     rev = version;
     repo = "wakatime";
     owner = "wakatime";

From 5c18f3760d1f7daaff910225bccb40faa28364ee Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 19:35:53 -0600
Subject: [PATCH 1749/3449] s6-portable-utils: readded config flags

---
 pkgs/tools/misc/s6-portable-utils/default.nix | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 06ea8a406f91..b16806139b45 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -1,9 +1,6 @@
 { stdenv, fetchFromGitHub, skalibs, gcc }:
 
 with stdenv.lib;
-let
-  cross = "";
-in
 
 stdenv.mkDerivation rec {
   name = "s6-portable-utils-${version}";
@@ -17,18 +14,18 @@ stdenv.mkDerivation rec {
   };
 
   dontDisableStatic = true;
-  
+
   nativeBuildInputs = []
-    ++ optional stdenv.isDarwin gcc;
-  
+  ++ optional stdenv.isDarwin gcc;
+
   configureFlags = [
-    #"--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
-    #"--with-include=${skalibs}/include"
-     "--with-lib=${skalibs}/lib"
-     "--with-dynlib=${skalibs}/lib"
-        ];
-        
-  
+    "--with-sysdeps=${skalibs}/lib/skalibs/sysdeps"
+    "--with-include=${skalibs}/include"
+    "--with-lib=${skalibs}/lib"
+    "--with-dynlib=${skalibs}/lib"
+  ];
+
+
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
     description = "A set of tiny general Unix utilities optimized for simplicity and small size";

From bb867aabd26ced5bf24a83afa5dcf111b20c9760 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 1 Mar 2017 15:56:54 +0800
Subject: [PATCH 1750/3449] grc: 1.9 -> 1.10.1

Additionally, grc wasn't actually working unless you copied out the config files
to your home directory because it couldn't find the default config in
/etc/grc.conf

So now we patch the program to look in the right places.

Upstream has moved to github.
---
 pkgs/tools/misc/grc/default.nix | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index 452b6c981ff9..5fcde9bdaeb7 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -1,19 +1,30 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchFromGitHub, python3Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "1.9";
   name    = "grc-${version}";
+  version = "1.10.1";
 
-  src = fetchurl {
-    url    = "http://korpus.juls.savba.sk/~garabik/software/grc/grc_${version}.orig.tar.gz";
-    sha256 = "0nsgqpijhpinnzscmpnhcjahv8yivz0g65h8zsly2md23ibnwqj1";
+  src = fetchFromGitHub {
+    owner  = "garabik";
+    repo   = "grc";
+    rev    = "v${version}";
+    sha256 = "1c2ndnbyznb608h3s99fbcyh4qb1ccipxm15lyszrrks0w2llbah";
   };
 
+  buildInputs = with python3Packages; [ wrapPython makeWrapper ];
+
   installPhase = ''
-    sed -i s%/usr%% install.sh
-    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
-    sed -i "s% /usr/bin/python%${python}/bin/python%" grc
-    ./install.sh "$out"
+    ./install.sh "$out" "$out"
+
+    for f in $out/bin/* ; do
+      patchPythonScript $f
+      substituteInPlace $f \
+        --replace ' /usr/bin/env python3' '${python3Packages.python.interpreter}' \
+        --replace "'/etc/grc.conf'"   "'$out/etc/grc.conf'" \
+        --replace "'/usr/share/grc/'" "'$out/share/grc/'"
+      wrapProgram $f \
+        --prefix PATH : $out/bin
+    done
   '';
 
   meta = with stdenv.lib; {

From 99e74e95096a1afd19a23c5561a1177a4902e44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 6 Mar 2017 08:22:23 +0100
Subject: [PATCH 1751/3449] alliance: mark as broken

there is no maintainer for this package and even debian looks
for a new maintainer.
---
 pkgs/applications/science/electronics/alliance/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix
index ee01643d85ea..97d1db83a162 100644
--- a/pkgs/applications/science/electronics/alliance/default.nix
+++ b/pkgs/applications/science/electronics/alliance/default.nix
@@ -70,5 +70,6 @@ stdenv.mkDerivation rec {
     license = with licenses; gpl2Plus;
     maintainers = with maintainers; [ ];
     platforms = with platforms; linux;
+    broken = true;
   };
 }

From f39e718cab2d6c6c2e60688a0f16777a7a148cd9 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Fri, 3 Mar 2017 19:00:59 +0100
Subject: [PATCH 1752/3449] uriparser: 0.8.2 -> 0.8.4

Fixed the Makefile for the doc : there is no .map files to install in
this release since dot outputs images in PNG and SVG

fixes #23456
---
 .../libraries/uriparser/default.nix           | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 9089889f4dd2..6b5c48a6105d 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -1,19 +1,35 @@
 { stdenv, fetchurl, cpptest, pkgconfig, doxygen, graphviz }:
 
 stdenv.mkDerivation rec {
-  name = "uriparser-0.8.2";
+  name = "uriparser-${version}";
+  version = "0.8.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
-    sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
+    url = "mirror://sourceforge/project/uriparser/Sources/${version}/${name}.tar.bz2";
+    sha256 = "08vvcmg4mcpi2gyrq043c9mfcy3mbrw6lhp86698hx392fjcsz6f";
   };
 
-  buildInputs = [ cpptest pkgconfig doxygen graphviz ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ cpptest doxygen graphviz ];
+
+  # There is actually no .map files to install in doc for v0.8.4
+  # (dot outputs only SVG and PNG in this release)
+  preBuild = ''
+    substituteInPlace doc/Makefile.am --replace " html/*.map" ""
+    substituteInPlace doc/Makefile.in --replace " html/*.map" ""
+  '';
+
 
   meta = with stdenv.lib; {
     homepage = http://uriparser.sourceforge.net/;
     description = "Strictly RFC 3986 compliant URI parsing library";
+    longDescription = ''
+      uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C.
+      API documentation is available on uriparser website.
+    '';
+    license = licenses.bsd3;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ bosu ];
-    license = stdenv.lib.licenses.bsd3;
   };
 }

From bdc9589df102bc35ecb8f1c3c00bd47bdc784bec Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 6 Mar 2017 01:31:53 -0600
Subject: [PATCH 1753/3449] lilypond: add openlilylib-fonts and
 lilypond-with-fonts

---
 pkgs/misc/lilypond/fonts.nix      | 122 ++++++++++++++++++++++++++++++
 pkgs/misc/lilypond/with-fonts.nix |  28 +++++++
 pkgs/top-level/all-packages.nix   |   4 +
 3 files changed, 154 insertions(+)
 create mode 100644 pkgs/misc/lilypond/fonts.nix
 create mode 100644 pkgs/misc/lilypond/with-fonts.nix

diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
new file mode 100644
index 000000000000..fd96c8adc325
--- /dev/null
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -0,0 +1,122 @@
+{ stdenv, fetchFromGitHub, lilypond }:
+
+with stdenv.lib;
+
+let
+  olpFont = a@{
+    fontName,
+    rev,
+    sha256,
+    version ? rev,
+    ...
+  }:
+    stdenv.mkDerivation (a // rec {
+      inherit version;
+      name = "openlilypond-font-${fontName}-${version}";
+
+      src = fetchFromGitHub {
+        inherit rev sha256;
+        owner = "OpenLilyPondFonts";
+        repo = a.fontName;
+      };
+
+      phases = [ "unpackPhase" "installPhase" ];
+
+      installPhase = ''
+        for f in {otf,supplementary-fonts}/**.{o,t}tf; do
+          install -Dt $out/otf -m755 otf/*
+        done
+
+        for f in svg/**.{svg,woff}; do
+          install -Dt $out/svg -m755 svg/*
+        done
+      '';
+
+      meta = {
+        inherit (src.meta) homepage;
+        description = "${fontName} font for LilyPond";
+        license = a.license or licenses.ofl;
+        platforms = lilypond.meta.platforms;
+        maintainers = (a.meta.maintainers or []) ++ [ maintainers.yurrriq ];
+      };
+    });
+
+in
+
+{
+  beethoven = olpFont {
+    fontName = "beethoven";
+    rev = "669f400";
+    sha256 = "17wdklg5shmqwnb7b81qavfg52v32wx5yf15c6al0hbvv1nqqj2i";
+  };
+  bravura = olpFont {
+    fontName = "bravura";
+    rev = "53c7744";
+    sha256 = "1p27w1c3bzxlnm6rzq8n7dbfjwbxqjy4r0fhkmk9jbm8awmzw214";
+  };
+  cadence = olpFont {
+    fontName = "cadence";
+    rev = "1cc0fb7";
+    sha256 = "1zxb3m8glh8iwj8mzcgyaxhlq0bji0rwniw702m70h9kpifiim1j";
+  };
+  gonville = olpFont {
+    fontName = "gonville";
+    rev = "a638bc9";
+    sha256 = "15khy9677crgd6bpajn7l1drysgxy49wiym3b248khgpavidwyy9";
+  };
+  gutenberg1939 = olpFont {
+    fontName = "gutenberg1939";
+    rev = "2316a35";
+    sha256 = "1lkhivmrx92z37zfrb5mkhzhwggyaga9cm0wl89r0n2f2kayyc7q";
+  };
+  haydn = olpFont {
+    fontName = "haydn";
+    rev = "9e7de8b";
+    sha256 = "1jmbhb2jm887sdc498l2jilpivq1d8lmmgdb8lp59lv8d9fx105z";
+  };
+  improviso = olpFont {
+    fontName = "improviso";
+    rev = "0753f5a";
+    sha256 = "1clin9c74gjhhira12mwxynxn4b1ixij5bg04mvk828lbr740mfm";
+  };
+  lilyboulez = olpFont {
+    fontName = "lilyboulez";
+    rev = "e8455fc";
+    sha256 = "0mq92x0rbgfb6s7ipgg2zcxika2si30w3ay89rp7m6vwca01649y";
+  };
+  lilyjazz = olpFont {
+    fontName = "lilyjazz";
+    rev = "8f1f2dd";
+    sha256 = "0k44dl5hfcn7wn2b6c51mbw6hsb1sprmx95xiabvcbpxnkplbmac";
+  };
+  lv-goldenage = olpFont {
+    fontName = "lv-goldenage";
+    rev = "8a92fd3";
+    sha256 = "03nbd1vmlaj7wkhsnl2lq09nafv7zj1k518zs966vclzah94qghp";
+  };
+  paganini = olpFont {
+    fontName = "paganini";
+    rev = "8e4e55a";
+    sha256 = "0gw9wr4hfn205j40rpgnfddhzhn9x4pwfinamj5b7607880nvx29";
+  };
+  profondo = olpFont {
+    fontName = "profondo";
+    rev = "8cfb668";
+    sha256 = "0armwbg9y0l935949b7klngws6fq42fi944lws61qvjl61780br8";
+  };
+  ross = olpFont {
+    fontName = "ross";
+    rev = "aa8127f";
+    sha256 = "1w2x3pd1d1z4x0107dpq95v7m547cj4nkkzxgqpmzfqa0074idqd";
+  };
+  scorlatti = olpFont {
+    fontName = "scorlatti";
+    rev = "1db87da";
+    sha256 = "07jam5hwdy6bydrm98cdla6p6rl8lmy8zzsfq46i55l64l3w956h";
+  };
+  sebastiano = olpFont {
+    fontName = "sebastiano";
+    rev = "44bf262";
+    sha256 = "09i8p3p4z6vz69j187cpxvikkgc4pk6gxippahy0k7i7bh0d4qaj";
+  };
+}
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
new file mode 100644
index 000000000000..9165fb1ed30d
--- /dev/null
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -0,0 +1,28 @@
+{ stdenv, lilypond, lndir }: fonts: stdenv.mkDerivation {
+  name = "${lilypond.name}-with-fonts";
+  phases = "installPhase";
+  buildInputs = fonts;
+  nativeBuildInputs = [ lndir ];
+  installPhase = ''
+    local fontsdir=$out/share/lilypond/${lilypond.version}/fonts
+
+    install -m755 -d $fontsdir/otf
+    install -m755 -d $fontsdir/svg
+
+    ${stdenv.lib.concatMapStrings (font: ''
+        lndir -silent ${font}/otf $fontsdir/otf
+        lndir -silent ${font}/svg $fontsdir/svg
+      '') fonts}
+
+      install -m755 -d $out/lib
+      lndir -silent ${lilypond}/lib $out/lib
+      install -m755 -d $out/share
+      lndir -silent ${lilypond}/share $out/share
+
+      install -m755 -Dt $out/bin ${lilypond}/bin/*
+
+      for p in $out/bin/*; do
+        substituteInPlace $p --replace "exec -a ${lilypond}" "exec -a $out"
+      done
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c51a76f6c83d..85d2ccd08b97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17708,6 +17708,10 @@ with pkgs;
 
   lilypond = callPackage ../misc/lilypond { guile = guile_1_8; };
   lilypond-unstable = callPackage ../misc/lilypond/unstable.nix { guile = guile_1_8; };
+  lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix {
+    lilypond = lilypond-unstable;
+  };
+  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
   mailcore2 = callPackage ../development/libraries/mailcore2 { };
 

From 4ae0e8c9a9e3b8aff7d50b28adbfde884170ec1f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 09:38:26 -0600
Subject: [PATCH 1754/3449] flacon: 2.0.1 -> 2.1.1

fixes #23529
---
 pkgs/applications/audio/flacon/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix
index 0f81fb451660..ab28c43f66cf 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/applications/audio/flacon/default.nix
@@ -1,30 +1,34 @@
 { stdenv, lib, fetchFromGitHub, cmake, qt5, libuchardet, pkgconfig, makeWrapper
 , shntool, flac, opusTools, vorbisTools, mp3gain, lame, wavpack, vorbisgain
+, gtk3
 }:
 
 stdenv.mkDerivation rec {
   name = "flacon-${version}";
-  version = "2.0.1";
+  version = "2.1.1";
+
   src = fetchFromGitHub {
     owner = "flacon";
     repo = "flacon";
     rev = "v${version}";
-    sha256 = "0hip411k3arb96rnd22ifs9shlv0xmy96hhx1jcwdk48kw8aa9rw";
+    sha256 = "0jazv3d1xaydp2ws1pd5rmga76z5yk74v3a8yqfc8vbb2z6ahimz";
   };
 
-  buildInputs = [ cmake qt5.qtbase qt5.qttools libuchardet pkgconfig makeWrapper ];
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+  buildInputs = [ qt5.qtbase qt5.qttools libuchardet ];
 
   postInstall = ''
     wrapProgram $out/bin/flacon \
+      --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
       --prefix PATH : "${lib.makeBinPath [ shntool flac opusTools vorbisTools
-      mp3gain lame wavpack vorbisgain ]}"
+     mp3gain lame wavpack vorbisgain ]}"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Extracts audio tracks from an audio CD image to separate tracks.";
     homepage = https://flacon.github.io/;
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.nico202 ];
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ndowens nico202 ];
   };
 }

From 0f40d2dea32211672824ea77865afaffde6cf080 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Wed, 11 Jan 2017 04:36:19 -0600
Subject: [PATCH 1755/3449] latex2html: init at 2016

---
 pkgs/tools/misc/latex2html/default.nix | 52 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/tools/misc/latex2html/default.nix

diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
new file mode 100644
index 000000000000..596a72ee5ac1
--- /dev/null
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, makeWrapper
+, ghostscript, netpbm, perl }:
+# TODO: withTex
+
+# Ported from Homebrew.
+# https://github.com/Homebrew/homebrew-core/blob/21834573f690407d34b0bbf4250b82ec38dda4d6/Formula/latex2html.rb
+
+stdenv.mkDerivation rec {
+  name = "latex2html-${version}";
+  version = "2016";
+
+  src = fetchurl {
+    url = "http://mirrors.ctan.org/support/latex2html/latex2html-${version}.tar.gz";
+    sha256 = "028k0ypbq94mlhydf1sbqlphlfl2fhmlzhgqq5jjzihfmccbq7db";
+  };
+
+  buildInputs = [ ghostscript netpbm perl ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  configurePhase = ''
+    ./configure \
+      --prefix="$out" \
+      --without-mktexlsr \
+      --with-texpath=$out/share/texmf/tex/latex/html
+  '';
+
+  postInstall = ''
+    for p in $out/bin/{latex2html,pstoimg}; do \
+      wrapProgram $p --add-flags '--tmp="''${TMPDIR:-/tmp}"'
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "LaTeX-to-HTML translator";
+    longDescription = ''
+      A Perl program that translates LaTeX into HTML (HyperText Markup
+      Language), optionally creating separate HTML files corresponding to each
+      unit (e.g., section) of the document. LaTeX2HTML proceeds by interpreting
+      LaTeX (to the best of its abilities). It contains definitions from a wide
+      variety of classes and packages, and users may add further definitions by
+      writing Perl scripts that provide information about class/package
+      commands.
+    '';
+
+    homepage = "https://www.ctan.org/pkg/latex2html";
+
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ yurrriq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c51a76f6c83d..7600887e71e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2646,6 +2646,8 @@ with pkgs;
 
   kindlegen = callPackage ../tools/typesetting/kindlegen { };
 
+  latex2html = callPackage ../tools/misc/latex2html { };
+
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
   ldns = callPackage ../development/libraries/ldns {

From cb078875dcbf12ee3818cdfbedb795921b932866 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 6 Mar 2017 07:15:29 -0300
Subject: [PATCH 1756/3449] pnmixer: 0.7 -> 0.7.1-rc1

---
 pkgs/tools/audio/pnmixer/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix
index 34946355d108..9827cc472430 100644
--- a/pkgs/tools/audio/pnmixer/default.nix
+++ b/pkgs/tools/audio/pnmixer/default.nix
@@ -1,23 +1,19 @@
-{ stdenv, fetchFromGitHub, pkgconfig, intltool, autoconf, automake, alsaLib, gtk3, glibc, libnotify, libX11 }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, alsaLib, gtk3, glib, libnotify, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "pnmixer-${version}";
-  version = "0.7";
+  version = "0.7.1-rc1";
 
   src = fetchFromGitHub {
     owner = "nicklan";
     repo = "pnmixer";
     rev = "v${version}";
-    sha256 = "077l28qhr82ifqfwc2nqi5q1hmi6dyqqbhmjcsn27p4y433f3rpb";
+    sha256 = "0ns7s1jsc7fc3fvs9m3xwbv1fk1410cqc5w1cmia1mlzy94r3r6p";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf automake intltool ];
+  nativeBuildInputs = [ cmake pkgconfig gettext ];
 
-  buildInputs = [ alsaLib gtk3 glibc libnotify libX11 ];
-
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  buildInputs = [ alsaLib gtk3 glib libnotify libX11 ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/nicklan/pnmixer;

From ae38cdad26f72ab1c0d858c1a6a737e366575e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Mon, 6 Mar 2017 11:07:42 +0100
Subject: [PATCH 1757/3449] clog-cli: init at 0.9.2

---
 pkgs/development/tools/clog-cli/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/tools/clog-cli/default.nix

diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
new file mode 100644
index 000000000000..9cb2405a36fc
--- /dev/null
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -0,0 +1,24 @@
+{ fetchFromGitHub, rustPlatform, stdenv }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "clog-cli-${version}";
+  version = "0.9.2";
+
+  src = fetchFromGitHub {
+    owner = "clog-tool";
+    repo = "clog-cli";
+    rev = "${version}";
+    sha256 = "00sfbchyf50z6mb5dq1837hlrki88rrf043idy6qd1r90488jsbv";
+  };
+
+  depsSha256 = "0czv190r6xhbw33l0jhlri6rgspxb8f6dakcamh52qr3z9m0xs2x";
+
+  meta = {
+    description = "Generate changelogs from local git metadata";
+    homepage = https://github.com/clog-tool/clog-cli;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2520f020e07e..40202d0d5432 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -726,6 +726,8 @@ with pkgs;
 
   cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
 
+  clog-cli = callPackage ../development/tools/clog-cli { };
+
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
   clib = callPackage ../tools/package-management/clib { };

From 9235c3c26bba928779790ce8eaeb0957bd6f3745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Mon, 6 Mar 2017 11:20:02 +0100
Subject: [PATCH 1758/3449] speedread: simplify installPhase

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

diff --git a/pkgs/applications/misc/speedread/default.nix b/pkgs/applications/misc/speedread/default.nix
index 7b4c552f9a36..180b66fda8ce 100644
--- a/pkgs/applications/misc/speedread/default.nix
+++ b/pkgs/applications/misc/speedread/default.nix
@@ -1,8 +1,7 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  version = "git-2016-09-21";
-  name = "speedread-${version}";
+  name = "speedread-unstable-2016-09-21";
 
   src = fetchFromGitHub {
     owner  = "pasky";
@@ -14,8 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    mv speedread $out/bin
+    install -m755 -D speedread $out/bin/speedread
   '';
 
   meta = with stdenv.lib; {

From 810bf85bfaf847da3c2795732ab0506c51dd43b3 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 6 Mar 2017 07:26:07 -0300
Subject: [PATCH 1759/3449] greybird: 2017-02-17 -> 2017-02-26

---
 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 634ea743e322..2a75ea590eea 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-17";
+  version = "2017-02-26";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "${pname}";
-    rev = "46afa0f1566207c07ce15633d3a4ca12075afcb7";
-    sha256 = "0sxpj8k0dlgh1k1w1hnpy94rvh7h6mj9vrhldmhc128kncdcxk3j";
+    rev = "66c222c25c43603e73d3521e0e91ffb268214229";
+    sha256 = "1q0nc02d7kwaxjb8d2rvwc3yf3v46r44zsighwjnmczpw7y3j6h8";
   };
 
   nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ];

From f497421e148dcb91736cba1771ca5ba18235d299 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 6 Mar 2017 04:33:31 -0600
Subject: [PATCH 1760/3449] lilypond-with-fonts: use all fonts by default

Add a list of all fonts to openlilylib-fonts and use that as the default
fonts argument to lilypond-with-fonts.
---
 pkgs/misc/lilypond/fonts.nix      | 20 +++++++++++++++++++-
 pkgs/misc/lilypond/with-fonts.nix |  9 ++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
index fd96c8adc325..6ad4f06328d8 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -43,7 +43,7 @@ let
 
 in
 
-{
+rec {
   beethoven = olpFont {
     fontName = "beethoven";
     rev = "669f400";
@@ -119,4 +119,22 @@ in
     rev = "44bf262";
     sha256 = "09i8p3p4z6vz69j187cpxvikkgc4pk6gxippahy0k7i7bh0d4qaj";
   };
+
+  all = [
+    beethoven
+    bravura
+    cadence
+    gonville
+    gutenberg1939
+    haydn
+    improviso
+    lilyboulez
+    lilyjazz
+    lv-goldenage
+    paganini
+    profondo
+    ross
+    scorlatti
+    sebastiano
+  ];
 }
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 9165fb1ed30d..861d8cf14de9 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -1,4 +1,11 @@
-{ stdenv, lilypond, lndir }: fonts: stdenv.mkDerivation {
+{ stdenv
+, lndir
+, lilypond
+, openlilylib-fonts
+, fonts ? openlilylib-fonts.all
+}:
+
+stdenv.mkDerivation {
   name = "${lilypond.name}-with-fonts";
   phases = "installPhase";
   buildInputs = fonts;

From 27ffa39468f70c1777f232fdd4c022a0d271926c Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Mon, 6 Mar 2017 07:34:40 -0300
Subject: [PATCH 1761/3449] albert: 0.9.3 -> 0.9.4

---
 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 8e79c09c2ad1..734ebb9cd862 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.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner  = "manuelschneid3r";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "026vcnx893wrggx0v07x66vc179mpil2p90lzb16n070qn3jb58n";
+    sha256 = "131ij525rgh2j9m2vydh79wm4bs0p3x27crar9f16rqhz15gkcpl";
   };
 
   nativeBuildInputs = [ cmake makeQtWrapper ];

From f40b96137844fe474f9c7d73272313a3848b4ee5 Mon Sep 17 00:00:00 2001
From: timor <timor.dd@googlemail.com>
Date: Fri, 10 Feb 2017 12:50:28 +0100
Subject: [PATCH 1762/3449] couchdb: add support for version 2.0.0

Version 2.0.0 is installed as a separate package called "couchdb2".
When setting the config option "package" attribute to pkgs.couchdb2, a
corresponding service configuration will be generated.  If a previous
1.6 installation exists, the databases can still be found on the local
port (default: 5986) and can be replicated from there.

Note that single-node or cluster setup still needs to be configured
manually, as described in
http://docs.couchdb.org/en/2.0.0/install/index.html.
---
 nixos/modules/services/databases/couchdb.nix | 30 ++++++++--
 pkgs/servers/http/couchdb/2.0.0.nix          | 53 +++++++++++++++++
 pkgs/servers/http/couchdb/jsapi.patch        | 60 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 ++
 4 files changed, 142 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/servers/http/couchdb/2.0.0.nix
 create mode 100644 pkgs/servers/http/couchdb/jsapi.patch

diff --git a/nixos/modules/services/databases/couchdb.nix b/nixos/modules/services/databases/couchdb.nix
index d4d231456c52..52247bfb983e 100644
--- a/nixos/modules/services/databases/couchdb.nix
+++ b/nixos/modules/services/databases/couchdb.nix
@@ -4,20 +4,29 @@ with lib;
 
 let
   cfg = config.services.couchdb;
-  configFile = pkgs.writeText "couchdb.ini"
+  useVersion2 = strings.versionAtLeast (strings.getVersion cfg.package) "2.0";
+  configFile = pkgs.writeText "couchdb.ini" (
     ''
       [couchdb]
       database_dir = ${cfg.databaseDir}
       uri_file = ${cfg.uriFile}
       view_index_dir = ${cfg.viewIndexDir}
-
+    '' + (if useVersion2 then
+    ''
+      [chttpd]
+    '' else
+    ''
       [httpd]
+    '') +
+    ''
       port = ${toString cfg.port}
       bind_address = ${cfg.bindAddress}
 
       [log]
       file = ${cfg.logFile}
-    '';
+    '');
+  executable = if useVersion2 then "${cfg.package}/bin/couchdb"
+    else ''${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}'';
 
 in {
 
@@ -130,7 +139,6 @@ in {
 
       configFile = mkOption {
         type = types.string;
-        default = "/var/lib/couchdb/couchdb.ini";
         description = ''
           Configuration file for persisting runtime changes. File
           needs to be readable and writable from couchdb user/group.
@@ -147,6 +155,9 @@ in {
 
     environment.systemPackages = [ cfg.package ];
 
+    services.couchdb.configFile = mkDefault
+      (if useVersion2 then "/var/lib/couchdb/local.ini" else "/var/lib/couchdb/couchdb.ini");
+
     systemd.services.couchdb = {
       description = "CouchDB Server";
       wantedBy = [ "multi-user.target" ];
@@ -170,11 +181,20 @@ in {
         fi
         '';
 
+      environment = mkIf useVersion2 {
+        # we are actually specifying 4 configuration files:
+        # 1. the preinstalled default.ini
+        # 2. the module configuration
+        # 3. the extraConfig from the module options
+        # 4. the locally writable config file, which couchdb itself writes to
+        ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
+      };
+
       serviceConfig = {
         PermissionsStartOnly = true;
         User = cfg.user;
         Group = cfg.group;
-        ExecStart = "${cfg.package}/bin/couchdb -a ${configFile} -a ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} -a ${cfg.configFile}";
+        ExecStart = executable;
       };
     };
 
diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix
new file mode 100644
index 000000000000..0481ebb9b8dc
--- /dev/null
+++ b/pkgs/servers/http/couchdb/2.0.0.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, erlang, icu, openssl, spidermonkey
+, coreutils, bash, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "couchdb-${version}";
+  version = "2.0.0";
+
+  src = fetchurl {
+    url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz";
+    sha256 = "1jkfx6g9anrgmkhrkcn50axcamragranwsciw1rhmi86rglkrbyc";
+  };
+
+  buildInputs = [ erlang icu openssl spidermonkey makeWrapper ];
+
+  patches = [ ./jsapi.patch ];
+  postPatch = ''
+    substituteInPlace src/couch/rebar.config.script --replace '-DHAVE_CURL -I/usr/local/include' "-DHAVE_CURL -I/usr/local/include $NIX_CFLAGS_COMPILE"
+
+    patch bin/rebar <<EOF
+    1c1
+    < #!/usr/bin/env escript
+    ---
+    > #!${coreutils}/bin/env escript
+    EOF
+
+  '';
+
+  # Configure a username.  The build system would use "couchdb" as
+  # default if none is provided.  Note that it is unclear where this
+  # username is actually used in the build, as any choice seems to be
+  # working.
+  configurePhase = ''
+    ./configure -u nobody
+  '';
+
+  buildPhase = ''
+    make release
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r rel/couchdb/* $out
+    wrapProgram $out/bin/couchdb --suffix PATH : ${bash}/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
+    homepage = "http://couchdb.apache.org";
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/servers/http/couchdb/jsapi.patch b/pkgs/servers/http/couchdb/jsapi.patch
new file mode 100644
index 000000000000..bb7d4ca610c7
--- /dev/null
+++ b/pkgs/servers/http/couchdb/jsapi.patch
@@ -0,0 +1,60 @@
+diff -ru couch_js/http.c couch_js-patched/http.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/http.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/http.c	2017-02-10 10:52:33.025854045 +0100
+@@ -15,7 +15,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ #include "config.h"
+ #include "utf8.h"
+ #include "util.h"
+diff -ru couch_js/main.c couch_js-patched/main.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/main.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/main.c	2017-02-10 10:52:33.001854154 +0100
+@@ -20,7 +20,7 @@
+ #include <unistd.h>
+ #endif
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ #include "config.h"
+ #include "http.h"
+ #include "utf8.h"
+diff -ru couch_js/utf8.c couch_js-patched/utf8.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/utf8.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/utf8.c	2017-02-10 10:52:33.009854117 +0100
+@@ -10,7 +10,7 @@
+ // License for the specific language governing permissions and limitations under
+ // the License.
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ #include "config.h"
+ 
+ static int
+diff -ru couch_js/util.c couch_js-patched/util.c
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.c	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.c	2017-02-10 10:52:33.017854081 +0100
+@@ -13,7 +13,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ 
+ #include "help.h"
+ #include "util.h"
+diff -ru couch_js/util.h couch_js-patched/util.h
+--- apache-couchdb-2.0.0/src/couch/priv/couch_js/util.h	2016-09-12 11:28:51.000000000 +0200
++++ apache-couchdb-2.0.0-patched/src/couch/priv/couch_js/util.h	2017-02-10 10:52:32.988854212 +0100
+@@ -13,7 +13,7 @@
+ #ifndef COUCHJS_UTIL_H
+ #define COUCHJS_UTIL_H
+ 
+-#include <jsapi.h>
++#include <js/jsapi.h>
+ 
+ typedef struct {
+     int          no_eval;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 079f3220015a..36f98de5a511 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10287,6 +10287,10 @@ with pkgs;
     erlang = erlangR16;
   };
 
+  couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {
+    spidermonkey = spidermonkey_1_8_5;
+  };
+
   couchpotato = callPackage ../servers/couchpotato {};
 
   dico = callPackage ../servers/dico { };

From 029c3f917edbe4a53fdd17cd797ca6ff9e8a7615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 6 Mar 2017 12:25:43 +0100
Subject: [PATCH 1763/3449] hhvm: fix location of include files in $out

Fixes a "double prefix" issue, where parts of the include files
for hhvm where located in `$out/$out/include` instead of `$out/include`.
---
 pkgs/development/compilers/hhvm/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index e6f98a121946..f0f3a130ef68 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
   # work around broken build system
   NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2";
 
+  # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
+  # (setting it to an absolute path causes include files to go to $out/$out/include,
+  #  because the absolute path is interpreted with root at $out).
+  cmakeFlags = "-DCMAKE_INSTALL_INCLUDEDIR=include";
+
   prePatch = ''
     substituteInPlace hphp/util/generate-buildinfo.sh \
       --replace /bin/bash ${stdenv.shell}

From dd23d08b9047b74254723e3e54086ce9b656b694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 6 Mar 2017 12:51:03 +0100
Subject: [PATCH 1764/3449] ocamlgraph: fix binary location (binaries had
 double prefix path)

Due to setting `DESTDIR` *and* `exec_prefix` (defaulted to `$prefix`), binaries
ended up in `$out/$out/bin` instead of just $out/bin. Not setting `DESTDIR` and adapting
the `LIBDIR` patch a little fixes this issue.
---
 pkgs/development/ocaml-modules/ocamlgraph/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index 579571ef6253..4f7c79142019 100644
--- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix
@@ -11,14 +11,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ocaml findlib ocamlPackages.lablgtk ocamlPackages.camlp4 ];
 
-  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@$(DESTDIR)/lib/ocaml/${ocaml.version}/site-lib/ocamlgraph@' Makefile.in
+    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
   '';

From ce355bdafa2a7d6c42df006a464b96de219e7e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 6 Mar 2017 13:06:51 +0100
Subject: [PATCH 1765/3449] xpra: install data files to correct location in
 $out

The patch is no longer needed, with the wheel-based method that we use now
data_files *are* relative to the prefix.
---
 pkgs/tools/X11/xpra/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 6349633af66b..943707c0c5ee 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -53,12 +53,6 @@ in buildPythonApplication rec {
   '';
   setupPyBuildFlags = ["--with-Xdummy" "--without-strict"];
 
-  preInstall = ''
-    # see https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix
-    ${python}/bin/${python.executable} setup.py install_data --install-dir=$out --root=$out
-    sed -i '/ = data_files/d' setup.py
-  '';
-
   postInstall = ''
     wrapProgram $out/bin/xpra \
       --set XPRA_INSTALL_PREFIX "$out" \

From 128901e09fd7cdd8f1fd8af2753dba54bf86c0f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 6 Mar 2017 13:25:12 +0100
Subject: [PATCH 1766/3449] phonon-backend-gstreamer: don't create
 $out/$out/share/icons

The build system tries to update the mtime of the icons directory if
`DESTDIR` is unset. That code has bug though that does not deal well
with absolute `CMAKE_SHARE_PREFIX` resulting a double prefix bug.

Setting `DESTDIR=/` (should be a no-op) fixes this.
---
 pkgs/development/libraries/phonon/backends/gstreamer.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 56d40f818338..d8358757094d 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -38,6 +38,10 @@ stdenv.mkDerivation rec {
     "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
   ];
 
+  # cleanup: the build system creates (empty) $out/$out/share/icons (double prefix)
+  # if DESTDIR is unset
+  DESTDIR="/";
+
   nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
 
   cmakeFlags =

From 17015b421e0ce1c502878f52352ac863c94c0a78 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 6 Mar 2017 12:35:49 +0000
Subject: [PATCH 1767/3449] endless-sky: 0.9.4 -> 0.9.6

---
 pkgs/games/endless-sky/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix
index f993ad1b8e09..128cbe71b5d3 100644
--- a/pkgs/games/endless-sky/default.nix
+++ b/pkgs/games/endless-sky/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub
-, SDL2, libpng, libjpeg, glew, openal, scons
+, SDL2, libpng, libjpeg, glew, openal, scons, libmad
 }:
 
 let
-  version = "0.9.4";
+  version = "0.9.6";
 
 in
 stdenv.mkDerivation rec {
@@ -13,13 +13,13 @@ stdenv.mkDerivation rec {
     owner = "endless-sky";
     repo = "endless-sky";
     rev = "v${version}";
-    sha256 = "1mirdcpap0a280j472lhmhqg605b7glvdr4l93qcapk8an8d46m7";
+    sha256 = "166wr861w415kynim0yx3x7c16x66f5367hv2mfzhpyp244jzccx";
   };
 
   enableParallelBuilding = true;
 
   buildInputs = [
-    SDL2 libpng libjpeg glew openal scons
+    SDL2 libpng libjpeg glew openal scons libmad
   ];
 
   patches = [

From e43fc06012f1c6ff4f939aa411fac35487a4622e Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Mon, 6 Mar 2017 20:15:10 +1100
Subject: [PATCH 1768/3449] monero: 0.10.1 -> 0.10.2.1

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

diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
index a8bde39a2783..8b3e0a7cb4e8 100644
--- a/pkgs/applications/misc/monero/default.nix
+++ b/pkgs/applications/misc/monero/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, pkgconfig, unbound }:
+{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
 
 let
-  version = "0.10.1";
+  version = "0.10.2.1";
 in
 stdenv.mkDerivation {
   name = "monero-${version}";
@@ -10,12 +10,12 @@ stdenv.mkDerivation {
     owner = "monero-project";
     repo = "monero";
     rev = "v${version}";
-    sha256 = "1zngskpgxz3vqq348h0mab2kv95z6g9ckvqkr77mx15m5z3qi6aw";
+    sha256 = "0jr57lih3smdg4abglfyfhxp69akiyqy889gcpdplwl05vfnhand";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ boost miniupnpc unbound ];
+  buildInputs = [ boost miniupnpc openssl unbound ];
 
   # these tests take a long time and don't
   # always complete in the build environment

From 8d87f8addd474c6e9d743fcf1346298509bd229b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Mon, 6 Mar 2017 13:45:39 +0100
Subject: [PATCH 1769/3449] clog-cli: init at 0.9.2

Updated with maintainer information.
---
 lib/maintainers.nix                         | 1 +
 pkgs/development/tools/clog-cli/default.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index cd9ced5832fc..2e29e0f8429d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -341,6 +341,7 @@
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
+  nthorne = "Niklas Thörne <notrupertthorne@gmail.com>";
   obadz = "obadz <obadz-nixos@obadz.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 9cb2405a36fc..1d6ac8493f19 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -20,5 +20,6 @@ buildRustPackage rec {
     homepage = https://github.com/clog-tool/clog-cli;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [stdenv.lib.maintainers.nthorne];
   };
 }

From 2e93988e643747e087bec6137804a0919be3cdbb Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 20:34:30 -0600
Subject: [PATCH 1770/3449] yubikey-personalization: 1.17.3 -> 1.18.0

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

diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index dbf0b9af8abc..71c9a113298f 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yubikey-personalization-${version}";
-  version = "1.17.3";
+  version = "1.18.0";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz";
-    sha256 = "034wmwinxmngji1ly8nm9q4hg194iwk164y5rw0whnf69ycc6bs8";
+    sha256 = "1bc2z6y2x7bbqn7ink2dg3wrgqzlcq2zxxg0cdcxy6jm7c9kwcyg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3686e1bbc800ec8c035e8d458e357c049dc71859 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 18:22:21 -0600
Subject: [PATCH 1771/3449] ocproxy: 1.50 -> 1.60

---
 pkgs/tools/networking/ocproxy/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix
index 65729d896aab..f2d4d979ceeb 100644
--- a/pkgs/tools/networking/ocproxy/default.nix
+++ b/pkgs/tools/networking/ocproxy/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libevent }:
 
 stdenv.mkDerivation rec {
-  version = "1.50";
+  version = "1.60";
   name = "ocproxy-${version}";
 
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = "ocproxy";
     rev = "v${version}";
-    sha256 = "136vlk2svgls5paf17xi1zahcahgcnmi2p55khh7zpqaar4lzw6s";
+    sha256 = "03323nnhb4y9nzwva04mq7xg03dvdrgp689g89f69jqc261skcqx";
   };
 
-  buildInputs = [ autoconf automake libevent ];
+  nativeBuildInputs = [ autoconf automake ];
+  buildInputs = [ libevent ];
 
   preConfigure = ''
     patchShebangs autogen.sh

From b4f5bce607a6f2df197b69c5384e781846a82ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 6 Mar 2017 12:11:14 +0100
Subject: [PATCH 1772/3449] android-udev-rules: 20170208 -> 20170305

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 0d62f99e1e77..08c729baaaf7 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20170208";
+  version = "20170305";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "0bqwb2xwwihyj8sw084qpyi8d4xx9sn7jlza6hfc57qnj4dha76w";
+    sha256 = "0di64pqs0snbfmncbarvyb9dr3bpv203pqxn5h5i39400jvqwyb6";
   };
 
   installPhase = ''

From 633cd69453dcb5efa922558b8cbe7bfb8cefffbe Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 3 Mar 2017 16:52:16 +0100
Subject: [PATCH 1773/3449] simplescreenrecorder: 0.3.6 -> 0.3.8

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

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index f50a41129adb..571f46de3854 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "simplescreenrecorder-${version}";
-  version = "0.3.6";
+  version = "0.3.8";
 
   src = fetchurl {
     url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
-    sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql";
+    sha256 = "0v8w35n8w772s08w7k0icynqdsdakbrcanbgx6j847bfqfsg21gg";
   };
 
   patches = [ ./fix-paths.patch ];

From 99013f853a65b7bc4669ac12a2137d82619e3073 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Thu, 2 Mar 2017 14:05:47 +0800
Subject: [PATCH 1774/3449] jenkins-job-builder: allow setting access tokens
 for reloading

---
 .../jenkins/job-builder.nix                   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
index 7b1fe6269fe9..861b46a2d642 100644
--- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix
@@ -29,6 +29,22 @@ in {
         '';
       };
 
+      accessUser = mkOption {
+        default = "";
+        type = types.str;
+        description = ''
+          User id in Jenkins used to reload config.
+        '';
+      };
+
+      accessToken = mkOption {
+        default = "";
+        type = types.str;
+        description = ''
+          User token in Jenkins used to reload config.
+        '';
+      };
+
       yamlJobs = mkOption {
         default = "";
         type = types.lines;
@@ -110,6 +126,11 @@ in {
           # Stamp file is placed in $JENKINS_HOME/jobs/$JOB_NAME/ to indicate
           # ownership. Enables tracking and removal of stale jobs.
           ownerStamp = ".config-xml-managed-by-nixos-jenkins-job-builder";
+          reloadScript = ''
+            echo "Asking Jenkins to reload config"
+            CRUMB=$(curl -s 'http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)')
+            curl --silent -X POST -H "$CRUMB" http://${cfg.accessUser}:${cfg.accessToken}@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
+          '';
         in
           ''
             rm -rf ${jobBuilderOutputDir}
@@ -142,10 +163,7 @@ in {
                 echo "Deleting stale job \"$jobname\""
                 rm -rf "$jobdir"
             done
-
-            echo "Asking Jenkins to reload config"
-            curl --silent -X POST http://${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}/reload
-          '';
+          '' + (if cfg.accessUser != "" then reloadScript else "");
       serviceConfig = {
         User = jenkinsCfg.user;
         RuntimeDirectory = "jenkins-job-builder";

From 2ad7e759c460ba1c2643d2970f8571bf48146616 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 19:55:11 -0600
Subject: [PATCH 1775/3449] driftnet: 0.7 -> 1.1.5

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

diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 7c8a30971f72..1f34952ad24b 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -5,8 +5,8 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "driftnet-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "8d47fd563a06122d4a6f9b9b9d27ba3d635148c0";
+  name = "driftnet-${version}";
+  version = "1.1.5";
 
   buildInputs = [
     pkgconfig libpcap libjpeg libungif libpng giflib
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "deiv";
     repo = "driftnet";
-    sha256 = "1i9fqbsfrhvr36r17v3ydr1bqsszns8gyjbvlfqbdd4l5l5n6amg";
+    rev = "0ae4a91";
+    sha256 = "1sagpx0mw68ggvqd9c3crjhghqmj7391mf2cb6cjw1cpd2hcddsj";
   };
 
   meta = {

From 6dd19dc4e31e7c8ebe1789c569782844acfcf945 Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Thu, 2 Mar 2017 02:24:26 +0100
Subject: [PATCH 1776/3449] yarn: 0.20.3 -> 0.21.3

---
 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 4af3ab5c4b93..93d9422a759a 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.20.3";
+  version = "0.21.3";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "1w4n05155rlkyv9k43fs0zrl04pri89vbi7rzpwmcg6zfxz273lw";
+    sha256 = "0blcaick4p82d64cy9ip9rnbysd4194d77479hz2bx4iq6cdp6wa";
   };
 
   buildInputs = [makeWrapper nodejs];

From 906afc7e74d8f434171cf7f08262267e15aac278 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 1 Mar 2017 13:48:04 +0100
Subject: [PATCH 1777/3449] delve: 0.11.0-alpha -> 0.12.1

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/delve/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index 0276b3f96013..fc8488ee104e 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "delve-${version}";
-  version = "0.11.0-alpha";
+  version = "0.12.1";
 
   goPackagePath = "github.com/derekparker/delve";
-  excludedPackages = "_fixtures";
+  excludedPackages = "\\(_fixtures\\|scripts\\|service/test\\)";
 
   src = fetchFromGitHub {
     owner = "derekparker";
     repo = "delve";
     rev = "v${version}";
-    sha256 = "10axxlvqpa6gx6pz2djp8bb08b83rdj1pavay0nqdd2crsb6rvgd";
+    sha256 = "0vkyx9sd66yrqz9sa4pysmpjv6gdgpfk1icrbjk93h2ry15ma8d6";
   };
 
   meta = {

From 55e376078a1a3837ec42204d955e6c0181b8acb9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 2 Mar 2017 19:06:22 -0600
Subject: [PATCH 1778/3449] ttylog: 0.26 -> 0.29

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

diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix
index ab7ab2b68c34..45149cafc9d2 100644
--- a/pkgs/tools/misc/ttylog/default.nix
+++ b/pkgs/tools/misc/ttylog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "ttylog-${version}";
-  version = "0.26";
+  version = "0.29";
 
   src = fetchFromGitHub {
     owner = "rocasa";
     repo = "ttylog";
     rev = version;
-    sha256 = "1xvqch1dwpl2d89n9cjcxhqbpvm50fspj5yn883wbii6dpg62p84";
+    sha256 = "035i9slmdgds5azwxqwp6skxykvaq3mq4jckvm49fng8jq09z7zr";
   };
 
   nativeBuildInputs = [ cmake ];

From 133245f961d7c8f216d1448eae868d889a574131 Mon Sep 17 00:00:00 2001
From: Vi Po <pi@homedir.eu>
Date: Sun, 26 Feb 2017 23:52:21 +0200
Subject: [PATCH 1779/3449] epson-escpr: 1.6.8 -> 1.6.12

Improve documentation
---
 pkgs/misc/drivers/epson-escpr/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 3f86d4e725df..0ed6f5dfe190 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, cups }:
 
 let
-  version = "1.6.8";
+  version = "1.6.12";
 in
   stdenv.mkDerivation {
 
     name = "epson-escpr-${version}";
   
     src = fetchurl {
-      url = "https://download3.ebz.epson.net/dsc/f/03/00/05/10/61/125006df4ffc84861395c1158a02f1f73e6f1753/epson-inkjet-printer-escpr-1.6.8-1lsb3.2.tar.gz";
-      sha256 = "02v8ljzw6xhfkz1x8m50mblcckgfbpa89fc902wcmi2sy8fihgh4";
+
+      url = "https://download3.ebz.epson.net/dsc/f/03/00/05/46/21/01534966894f35247dac8c8ef0a0a9c94d1c8b40/epson-inkjet-printer-escpr-1.6.12-1lsb3.2.tar.gz";
+      sha256 = "3773e74a0c4debf202eb9ad0aa31c6614a93d6170484ff660c14e99f8698cfda";
     }; 
 
     patches = [ ./cups-filter-ppd-dirs.patch ]; 
@@ -29,7 +30,14 @@ in
 	    enable = true;
 	    drivers = [ pkgs.epson-escpr ];
 	  };
-      '';
+
+  To setup a wireless printer, enable Avahi which provides
+  printer's hostname to CUPS and nss-mdns to make this
+  hostname resolvable:
+    services.avahi = {
+      enable = true;
+      nssmdns = true;
+    };'';
       license = licenses.gpl3Plus;
       maintainers = with maintainers; [ artuuge ];
       platforms = platforms.linux;

From 8784b0582e91251da6c8dcc7d2ed1b90fda254c8 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 6 Mar 2017 13:31:06 +0000
Subject: [PATCH 1780/3449] Update nixUnstable

(cherry picked from commit fce036d16443b8b9f5f02a9d2bcadc5976044dbc)
---
 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 7caa2fc44fd7..e755507356d7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -112,12 +112,12 @@ in rec {
 
   nixUnstable = lib.lowPrio (common rec {
     name = "nix-1.12${suffix}";
-    suffix = "pre5060_fa125b9";
+    suffix = "pre5073_1cf4801";
     src = fetchFromGitHub {
       owner = "NixOS";
       repo = "nix";
-      rev = "fa125b9b28bea25a4eeb4d39a71a481563127cb9";
-      sha256 = "1l7prlki3rjw3i119cizqqkpqg4p3hvym103x7hddimwpzwkw756";
+      rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
+      sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
     };
     fromGit = true;
   });

From 6e5eaf58a30340143a595db37815609e95367938 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Tue, 28 Feb 2017 22:15:02 +0000
Subject: [PATCH 1781/3449] purescript: pin dependencies.

---
 .../haskell-modules/configuration-common.nix           | 10 ++++++++++
 .../haskell-modules/configuration-hackage2nix.yaml     |  8 +++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8811a7b093ab..065ccdc9de35 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -448,6 +448,16 @@ 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;
 
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 47fb3f7f87f1..02a6819b5161 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2247,6 +2247,13 @@ extra-packages:
   - 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
   - zlib < 0.6                          # newer versions break cabal-install
+  - aeson == 0.11.3.0                   # purescript 0.10.7
+  - bower-json == 1.0.0.1               # purescript 0.10.7
+  - optparse-applicative == 0.13.1.0    # purescript 0.10.7
+  - http-client == 0.4.31.2             # purescript 0.10.7
+  - http-client-tls == 0.2.4.1          # purescript 0.10.7
+  - pipes == 4.2.0                      # purescript 0.10.7
+  - websockets == 0.9.8.2               # purescript 0.10.7
 
 package-maintainers:
   peti:
@@ -6764,7 +6771,6 @@ 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 ]

From dd20fbe5d141e6e1cbaa47817daba86620b3270b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 14:15:36 +0100
Subject: [PATCH 1782/3449] hackage2nix: disable failing builds

---
 .../configuration-hackage2nix.yaml            | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 02a6819b5161..38cd991692fa 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2487,6 +2487,7 @@ dont-distribute-packages:
   amazonka-appstream:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-budgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-codebuild:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-ec2:                                 [ i686-linux ]
   amazonka-elbv2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-health:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-kinesis-analytics:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2496,12 +2497,15 @@ dont-distribute-packages:
   amazonka-polly:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-rds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-rekognition:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-s3:                                  [ i686-linux ]
+  amazonka-s3-streaming:                        [ i686-linux ]
   amazonka-servicecatalog:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-shield:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-sms:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-snowball:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-sqs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazonka-stepfunctions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  amazonka-swf:                                 [ i686-linux ]
   amazonka-xray:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   amby:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2661,6 +2665,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 ]
+  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 ]
   azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3573,6 +3578,7 @@ dont-distribute-packages:
   direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   discordian-calendar:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   discount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DiscussionSupportSystem:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3685,6 +3691,7 @@ dont-distribute-packages:
   easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easytensor:                                   [ i686-linux ]
   ebeats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ec2-unikernel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3941,6 +3948,7 @@ dont-distribute-packages:
   FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  foldl-statistics:                             [ i686-linux ]
   folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3958,6 +3966,7 @@ dont-distribute-packages:
   FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  format-numbers:                               [ i686-linux ]
   format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   formattable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets-hsp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4163,6 +4172,7 @@ dont-distribute-packages:
   github-backup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   github:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-release:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-tools:                                 [ i686-linux ]
   github-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-webhook-handler-snap:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4795,6 +4805,7 @@ dont-distribute-packages:
   hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgettext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgopher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4819,6 +4830,8 @@ dont-distribute-packages:
   higher-leveldb:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   highjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  highjson-swagger:                             [ i686-linux ]
+  highjson-th:                                  [ i686-linux ]
   highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4940,6 +4953,7 @@ dont-distribute-packages:
   hopfli:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hora:                                         [ i686-linux ]
   ho-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5162,6 +5176,7 @@ dont-distribute-packages:
   http-dispatch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-link-header:                             [ i686-linux ]
   http-pony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5434,6 +5449,7 @@ dont-distribute-packages:
   jcdecaux-vls:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Jdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jdi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jenga:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   jni:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5441,6 +5457,7 @@ dont-distribute-packages:
   joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jose-jwt:                                     [ i686-linux ]
   jsaddle-dom:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-hello:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5865,6 +5882,7 @@ dont-distribute-packages:
   maam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   machinecell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  machines-amazonka:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   maclight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5953,6 +5971,8 @@ 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:                                     [ i686-linux ]
+  mediabus-rtp:                                 [ i686-linux ]
   mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6347,6 +6367,7 @@ dont-distribute-packages:
   objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  octane:                                       [ i686-linux ]
   octohat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6452,6 +6473,7 @@ dont-distribute-packages:
   pandoc-placetable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pansite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude-lens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7079,6 +7101,7 @@ dont-distribute-packages:
   rncryptor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   robot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   robots-txt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rocksdb-haskell:                              [ i686-linux ]
   roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-gl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   roguestar-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7125,6 +7148,7 @@ dont-distribute-packages:
   RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   SableCC2Hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-access:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safecopy-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safeint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7252,6 +7276,7 @@ dont-distribute-packages:
   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 ]
+  servant-docs:                                 [ i686-linux ]
   servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github-webhook:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7334,6 +7359,7 @@ dont-distribute-packages:
   sibe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sigma-ij:                                     [ i686-linux ]
   signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7663,6 +7689,7 @@ dont-distribute-packages:
   svgutils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swagger2:                                     [ i686-linux ]
   swagger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7742,6 +7769,7 @@ dont-distribute-packages:
   tasty-fail-fast:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-groundhog-converters:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-jenkins-xml:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-laws:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-tap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7918,6 +7946,7 @@ dont-distribute-packages:
   total:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   touched:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tower:                                        [ i686-linux ]
   toxcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   toysolver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8151,6 +8180,7 @@ dont-distribute-packages:
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ViennaRNA-bindings:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8196,6 +8226,7 @@ dont-distribute-packages:
   wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-make-assets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-auth:                          [ i686-linux ]
   wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8486,6 +8517,7 @@ dont-distribute-packages:
   yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yet-another-logger:                           [ i686-linux ]
   YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8527,6 +8559,7 @@ dont-distribute-packages:
   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 ]
   zlib-enum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]

From fb5b6ddab60f27667e7a1e1234b2083955821dda Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Mar 2017 10:43:04 +0100
Subject: [PATCH 1783/3449] hackage2nix: revert to old version of store

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 38cd991692fa..76c460786c1e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -37,6 +37,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
+  - store < 0.4.1               # https://github.com/fpco/store/issues/104
   # LTS Haskell 8.3
   - abstract-deque ==0.3
   - abstract-par ==0.3.3

From 1329368d82529eaea134f79a199c46ea0bf590e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 14:21:48 +0100
Subject: [PATCH 1784/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ea0774dfde00b2922e2c048bdf678bd96de02d08.
---
 .../haskell-modules/hackage-packages.nix      | 1037 ++++++++++++++---
 1 file changed, 882 insertions(+), 155 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 0c70f42b65f9..d9ebdb70b82c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3450,19 +3450,22 @@ self: {
      }) {};
 
   "DPutils" = callPackage
-    ({ mkDerivation, base, containers, criterion, kan-extensions
-     , parallel, pipes, QuickCheck, tasty, tasty-quickcheck, tasty-th
-     , vector
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , kan-extensions, lens, mtl, parallel, pipes, pipes-bytestring
+     , pipes-parse, QuickCheck, quickcheck-instances, stringsearch
+     , tasty, tasty-quickcheck, tasty-th, transformers, vector
      }:
      mkDerivation {
        pname = "DPutils";
-       version = "0.0.0.2";
-       sha256 = "cfa99cdd515cffd20f5c20ad100d4793ea3d36f650a7c049bc7182efec5cc33e";
+       version = "0.0.1.0";
+       sha256 = "2640e8e994275b3227578d33551f60528da345ad336c287b10136113f0de11a8";
        libraryHaskellDepends = [
-         base containers kan-extensions parallel pipes QuickCheck vector
+         base bytestring containers kan-extensions parallel pipes QuickCheck
+         stringsearch transformers vector
        ];
        testHaskellDepends = [
-         base containers kan-extensions parallel pipes QuickCheck tasty
+         base bytestring containers kan-extensions lens mtl parallel pipes
+         pipes-bytestring pipes-parse QuickCheck quickcheck-instances tasty
          tasty-quickcheck tasty-th vector
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
@@ -4543,6 +4546,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Empty" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "Empty";
+       version = "0.1.0.1";
+       sha256 = "62afb83e3ca21f67181289f6496e566ffb2bbadfec91f170bc6f40a76212953d";
+       libraryHaskellDepends = [ base containers ];
+       description = "A type class for empty containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Encode" = callPackage
     ({ mkDerivation, base, Cabal, containers, mtl }:
      mkDerivation {
@@ -8022,8 +8036,8 @@ self: {
      }:
      mkDerivation {
        pname = "HSH";
-       version = "2.1.2";
-       sha256 = "788a7f25336e7fe9c7d38b68bb4cc0030712fc47e0cdf282267dea1e46b0da9f";
+       version = "2.1.3";
+       sha256 = "54df051277d3dfe263277e2c2416ecb5f1515bc69729870f13749b495565670d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13750,22 +13764,23 @@ self: {
 
   "PrimitiveArray" = callPackage
     ({ mkDerivation, aeson, base, binary, bits, cereal, cereal-vector
-     , deepseq, DPutils, hashable, OrderedBits, primitive, QuickCheck
-     , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck, tasty-th
-     , vector, vector-binary-instances, vector-th-unbox
+     , containers, deepseq, DPutils, hashable, log-domain, OrderedBits
+     , primitive, QuickCheck, smallcheck, tasty, tasty-quickcheck
+     , tasty-smallcheck, tasty-th, text, vector, vector-binary-instances
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.7.1.0";
-       sha256 = "d950e1f842ff65012484a7d0c03f1b3e990d3ff6bdd08eecdac4d478f9af23f6";
+       version = "0.8.0.0";
+       sha256 = "b4af0d0d8502dc8ba8985cd70b69a0220a70e8d44a2ee4dfa73db1bce5774445";
        libraryHaskellDepends = [
          aeson base binary bits cereal cereal-vector deepseq DPutils
-         hashable OrderedBits primitive QuickCheck smallcheck vector
-         vector-binary-instances vector-th-unbox
+         hashable log-domain OrderedBits primitive QuickCheck smallcheck
+         text vector vector-binary-instances vector-th-unbox
        ];
        testHaskellDepends = [
-         base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
-         tasty-th
+         base containers QuickCheck smallcheck tasty tasty-quickcheck
+         tasty-smallcheck tasty-th
        ];
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
@@ -13774,17 +13789,18 @@ self: {
      }) {};
 
   "PrimitiveArray-Pretty" = callPackage
-    ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-postscript
-     , diagrams-svg, log-domain, QuickCheck, split, test-framework
-     , test-framework-quickcheck2, test-framework-th
+    ({ mkDerivation, base, diagrams, diagrams-contrib, diagrams-lib
+     , diagrams-postscript, diagrams-svg, filepath, log-domain
+     , QuickCheck, split, test-framework, test-framework-quickcheck2
+     , test-framework-th
      }:
      mkDerivation {
        pname = "PrimitiveArray-Pretty";
-       version = "0.0.0.1";
-       sha256 = "cd1b84ee169bb3fa05eac16916158a622984a78e9ddaca834deec3f79e6095ac";
+       version = "0.0.0.2";
+       sha256 = "87d0b2c42dc47f3c6c42b94dcd543b09bdc512e67f81c7ab72368cc374bc894d";
        libraryHaskellDepends = [
-         base diagrams diagrams-lib diagrams-postscript diagrams-svg
-         log-domain split
+         base diagrams diagrams-contrib diagrams-lib diagrams-postscript
+         diagrams-svg filepath log-domain split
        ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -17477,16 +17493,22 @@ self: {
      }) {};
 
   "ViennaRNA-bindings" = callPackage
-    ({ mkDerivation, array, base, c2hs }:
+    ({ mkDerivation, array, base, c2hs, QuickCheck, tasty, tasty-hunit
+     , tasty-silver, tasty-th
+     }:
      mkDerivation {
        pname = "ViennaRNA-bindings";
-       version = "0.1.2.2";
-       sha256 = "83169ef8f28901644c36446b12322ab5e63b5d5c5a007de4fad878ddb61eff1b";
+       version = "0.233.1.1";
+       sha256 = "8435afc87b0265175eef88b586e69934e8404bd5126b6d6f5969c6486ce31b1a";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       testHaskellDepends = [
+         array base QuickCheck tasty tasty-hunit tasty-silver tasty-th
+       ];
+       homepage = "https://github.com/choener/ViennaRNA-bindings";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ViennaRNAParser" = callPackage
@@ -20189,6 +20211,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson_0_11_3_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+     , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
+     , QuickCheck, quickcheck-instances, scientific, syb, tagged
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "0.11.3.0";
+       sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist fail ghc-prim
+         hashable mtl scientific syb tagged template-haskell text time
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base base-orphans bytestring containers ghc-prim
+         hashable HUnit QuickCheck quickcheck-instances tagged
+         template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time unordered-containers vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, dlist
@@ -22719,6 +22770,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ecr" = callPackage
@@ -23394,6 +23446,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-s3-streaming" = callPackage
@@ -23418,6 +23471,7 @@ self: {
        homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-s3-streaming_0_2_0_1" = callPackage
@@ -23703,6 +23757,7 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-test" = callPackage
@@ -28400,15 +28455,18 @@ self: {
      }:
      mkDerivation {
        pname = "azubi";
-       version = "0.2.0.0";
-       sha256 = "c3ac3b5ff5960c7ba0349bae282be1b0e4f361268b85aa80d57f399bac5a455c";
+       version = "0.2.0.1";
+       sha256 = "9c772283727f23f433bb3617917ad7318c179a7e34b9bc890ab42ca20e9bd651";
        libraryHaskellDepends = [
          base Diff directory filepath options process unix
        ];
-       testHaskellDepends = [ base filepath hspec ];
+       testHaskellDepends = [
+         base Diff directory filepath hspec options process unix
+       ];
        homepage = "http://palovandalo.com/azubi";
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "azure-acs" = callPackage
@@ -29327,6 +29385,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "basic-prelude_0_6_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, filepath, hashable
+     , lifted-base, ReadArgs, safe, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "basic-prelude";
+       version = "0.6.1.1";
+       sha256 = "f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7";
+       libraryHaskellDepends = [
+         base bytestring containers filepath hashable lifted-base ReadArgs
+         safe text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/basic-prelude";
+       description = "An enhanced core prelude; a common foundation for alternate preludes";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "basic-sop" = callPackage
     ({ mkDerivation, base, deepseq, generics-sop, QuickCheck, text }:
      mkDerivation {
@@ -30258,8 +30335,8 @@ self: {
      }:
      mkDerivation {
        pname = "bimaps";
-       version = "0.1.0.1";
-       sha256 = "c143b5e2643d3c679b0e3083fe46a447eeab4fbac1f979c593c5c189f047ba04";
+       version = "0.1.0.2";
+       sha256 = "9774dd645620074f0b95d8c29183f4bf328944f571b2dbe9c0f02d508c6d9520";
        libraryHaskellDepends = [
          aeson base binary cereal cereal-vector containers deepseq hashable
          primitive storable-tuple unordered-containers vector
@@ -34431,15 +34508,13 @@ self: {
      }) {};
 
   "bson-mapping" = callPackage
-    ({ mkDerivation, base, bson, compact-string-fix, template-haskell
-     , th-lift
-     }:
+    ({ mkDerivation, base, bson, template-haskell, text, th-lift }:
      mkDerivation {
        pname = "bson-mapping";
-       version = "0.1.4.1";
-       sha256 = "eaa729942da079f4d4bce93ab1be378491fe171d74d6297814b8d203fdcc214d";
+       version = "0.1.5.0";
+       sha256 = "ba8ec4df8362c67e3da032399e92ddc94a6ddbd80232e2566648de0b5d53085a";
        libraryHaskellDepends = [
-         base bson compact-string-fix template-haskell th-lift
+         base bson template-haskell text th-lift
        ];
        description = "Mapping between BSON and algebraic data types";
        license = "unknown";
@@ -35681,8 +35756,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.0.4";
-       sha256 = "2621cd4e76357bcf7f175413c111874c6afc552d80c85372dc43f4bcd5c99719";
+       version = "1.0.5";
+       sha256 = "10a81b97a6d993c37778b5840be9a7a67ab47feb59cec3550e345ab5239c8e62";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -35705,8 +35780,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.7.10";
-       sha256 = "464b299f095150bd0831df7dbab45d272909875a21f4030b79aee58faefdbb1d";
+       version = "0.7.11";
+       sha256 = "160d44411a0a8fe922ae1aa192de5b481d4354d5df4e863d2782f49f0ab57277";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36078,8 +36153,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.4.8";
-       sha256 = "0dd6bbe6b77f6d8cfaff690f0ce53064e9fae10d317278205895fa5fb8d13195";
+       version = "0.4.9";
+       sha256 = "59bb6a13229fbb28a481cb8839369cfd0e30c2d9f65a93f3ee8240ad19288238";
        libraryHaskellDepends = [
          base Cabal either lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -40516,6 +40591,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "classy-prelude_1_2_0_1" = callPackage
+    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
+     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
+     , hashable, hspec, lifted-async, lifted-base, monad-unlift
+     , mono-traversable, mono-traversable-instances, mtl
+     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
+     , semigroups, stm, stm-chans, text, time, time-locale-compat
+     , transformers, transformers-base, unordered-containers, vector
+     , vector-instances
+     }:
+     mkDerivation {
+       pname = "classy-prelude";
+       version = "1.2.0.1";
+       sha256 = "a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34";
+       libraryHaskellDepends = [
+         async base basic-prelude bifunctors bytestring chunked-data
+         containers deepseq dlist exceptions ghc-prim hashable lifted-async
+         lifted-base monad-unlift mono-traversable
+         mono-traversable-instances mtl mutable-containers primitive
+         safe-exceptions say semigroups stm stm-chans text time
+         time-locale-compat transformers transformers-base
+         unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck transformers unordered-containers
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "A typeclass-based Prelude";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "classy-prelude-conduit" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude, conduit
      , conduit-combinators, hspec, monad-control, QuickCheck, resourcet
@@ -41086,18 +41193,23 @@ self: {
      }) {};
 
   "clit" = callPackage
-    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , data-default, http-client, http-client-tls, http-types, lens
-     , optparse-applicative, split, text
+    ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
+     , bytestring, data-default, http-client, http-client-tls
+     , http-types, lens, megaparsec, MissingH, optparse-applicative
+     , split, text
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.2.2.6";
-       sha256 = "28913ec550761c623008250ef071840761216eaa1bb9e02b77c32c1dac6bb656";
+       version = "0.3.0.3";
+       sha256 = "963a5a636ded2f1f7ac7a6b4b4af8a38403ecda4913e12b36719ee57c1a27925";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson authenticate-oauth base bytestring data-default http-client
-         http-client-tls http-types lens optparse-applicative split text
+         aeson ansi-wl-pprint authenticate-oauth base bytestring
+         data-default 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";
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
@@ -43344,14 +43456,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "concurrency_1_1_0_0" = callPackage
+  "concurrency_1_1_1_0" = callPackage
     ({ mkDerivation, array, atomic-primops, base, exceptions
      , monad-control, mtl, stm, transformers
      }:
      mkDerivation {
        pname = "concurrency";
-       version = "1.1.0.0";
-       sha256 = "bc6e4d9db178937bf5223b8534bb56bf508242259ee489709af203ad39914605";
+       version = "1.1.1.0";
+       sha256 = "f955671cc7814d06d99a84f003423d8903604cdc9911d7f4986acaa39c519973";
        libraryHaskellDepends = [
          array atomic-primops base exceptions monad-control mtl stm
          transformers
@@ -51969,15 +52081,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_0_5_1_1" = callPackage
+  "dejafu_0_5_1_2" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
      , monad-loops, mtl, random, ref-fd, semigroups, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "0.5.1.1";
-       sha256 = "c8ba221dd45a107488e5b499fc59f66587a66eb366c4e3dafb76b84b9d38488a";
+       version = "0.5.1.2";
+       sha256 = "0e6114f59678ff0c5a9f5a4561f9b1ae4d87c77c50fd498e447ca7f67eae6d4c";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions monad-loops mtl
          random ref-fd semigroups transformers transformers-base
@@ -54325,26 +54437,27 @@ self: {
 
   "discord-hs" = callPackage
     ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, data-default, hakyll, hashable, hslogger, lens
-     , mmorph, mtl, pipes, split, stm, stm-conduit, text, time
-     , transformers, unordered-containers, url, vector, websockets, wreq
-     , wuss
+     , 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.1.3";
-       sha256 = "4cdcbc983ef10838e96344ad9b63e772296d9e734b4dc87768f657b7aaa106fc";
+       version = "0.2.1";
+       sha256 = "439cc60b1206c4709a9a28e9ac5c64f7fb6eb5e40014ef055624459842add95e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive containers data-default
-         hashable hslogger lens mmorph mtl pipes stm stm-conduit text time
-         transformers unordered-containers url vector websockets wreq wuss
+         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";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "discordian-calendar" = callPackage
@@ -54476,8 +54589,8 @@ self: {
     ({ mkDerivation, base, dlist }:
      mkDerivation {
        pname = "disposable";
-       version = "0.1.0.0";
-       sha256 = "fc7d7dc460566c9f3ac965c355792806278a19a0fa35e89ab3a5df465fb34e43";
+       version = "0.1.1.0";
+       sha256 = "719e8e28cfe3345c441478f9d88949767122d2708241a0e232e9fe672c662b12";
        libraryHaskellDepends = [ base dlist ];
        homepage = "https://github.com/louispan/disposable#readme";
        description = "Allows storing different resource-releasing actions together";
@@ -57462,6 +57575,7 @@ self: {
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ebeats" = callPackage
@@ -61132,13 +61246,22 @@ self: {
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
-    ({ mkDerivation, base, constraints, profunctors, singletons }:
+    ({ mkDerivation, aeson, base, bytes, constraints, deepseq
+     , generic-random, hashable, profunctors, QuickCheck, singletons
+     , tasty, tasty-hunit, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "exinst";
-       version = "0.2";
-       sha256 = "64c8d5a121db7274436f4e0fdb5c7ea3c9746419a84c0f16e6edb92bb83c7a3b";
+       version = "0.3";
+       sha256 = "3edfe07ca71b4c296349661f8f2d496100d3b44ae72af8ce1ab7f76f1adddb11";
        libraryHaskellDepends = [
-         base constraints profunctors singletons
+         aeson base bytes constraints deepseq hashable profunctors
+         QuickCheck singletons
+       ];
+       testHaskellDepends = [
+         aeson base bytes constraints deepseq generic-random hashable
+         profunctors QuickCheck singletons tasty tasty-hunit
+         tasty-quickcheck
        ];
        homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for your existential types";
@@ -61584,6 +61707,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4" = callPackage
+    ({ mkDerivation, base, comonad, constraints, criterion, deepseq
+     , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton
+     , mtl, primitive, profunctors, semigroups, tagged, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4";
+       sha256 = "f9fbd703c2ac7b2790446cb04281d3577848797d53413374e5c1987afcec3a1c";
+       libraryHaskellDepends = [
+         base comonad constraints deepseq ghc-prim monad-skeleton mtl
+         primitive profunctors semigroups tagged template-haskell
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       benchmarkHaskellDepends = [
+         base criterion effin extensible-effects freer lens mtl
+       ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -62282,8 +62430,8 @@ self: {
        pname = "fay";
        version = "0.23.1.16";
        sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64";
-       revision = "3";
-       editedCabalFile = "636e2fbbe689dde982c327a7fc33871804ec66e47105d6cbffd6ce09716c241f";
+       revision = "4";
+       editedCabalFile = "efe4614bc8832765c649a86b4e4a8c26122af3a5a23cad77676e062e3a85f66c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63130,6 +63278,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fgl_5_5_3_1" = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, hspec
+     , microbench, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "fgl";
+       version = "5.5.3.1";
+       sha256 = "dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c";
+       libraryHaskellDepends = [
+         array base containers deepseq transformers
+       ];
+       testHaskellDepends = [ base containers hspec QuickCheck ];
+       benchmarkHaskellDepends = [ base deepseq microbench ];
+       description = "Martin Erwig's Functional Graph Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fgl-arbitrary" = callPackage
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
@@ -63142,6 +63308,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fgl-arbitrary_0_2_0_3" = callPackage
+    ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "fgl-arbitrary";
+       version = "0.2.0.3";
+       sha256 = "55ba994bdb884497b5e664b1c14969d66235ba2358eb38283aca21efded7c152";
+       libraryHaskellDepends = [ base fgl QuickCheck ];
+       testHaskellDepends = [ base containers fgl hspec QuickCheck ];
+       description = "QuickCheck support for fgl";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fgl-extras-decompositions" = callPackage
     ({ mkDerivation, base, containers, fgl }:
      mkDerivation {
@@ -64778,8 +64957,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.1";
-       sha256 = "9230417d449ea9af3257dbaba15a7aada3db6289b2e26246bbd92787f3cb394c";
+       version = "0.5.1.2";
+       sha256 = "30a8f7229bb16ccd72bdefddf67d4ef23e9c87e200207dfdf944b737dd49a71d";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -64945,8 +65124,8 @@ self: {
      }:
      mkDerivation {
        pname = "fmt";
-       version = "0.0.0.3";
-       sha256 = "a6cc32309e996acc4db281368184a1333b52072023315dfa8f20fbfa235ed81b";
+       version = "0.0.0.4";
+       sha256 = "bfc71940c7f5c90c72945906e0887eb71894858593d536cb43b04109fd82634f";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring microlens text
          text-format
@@ -65113,6 +65292,7 @@ self: {
        homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "foldl-transduce" = callPackage
@@ -65518,6 +65698,7 @@ self: {
        homepage = "https://github.com/agrafix/format-numbers#readme";
        description = "Various number formatting functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "format-status" = callPackage
@@ -70110,6 +70291,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ghcjs-hplay_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , ghcjs-perch, mtl, transformers, transient, transient-universe
+     }:
+     mkDerivation {
+       pname = "ghcjs-hplay";
+       version = "0.4.1";
+       sha256 = "0589b76f6411abcf05a61a3f2b9d2d25064d5c1140dabf14b4a5d6aca0162b2b";
+       libraryHaskellDepends = [
+         base bytestring containers directory ghcjs-perch mtl transformers
+         transient transient-universe
+       ];
+       homepage = "https://github.com/transient-haskell/ghcjs-hplay";
+       description = "Client-side web EDSL for transient nodes running in the web browser";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-perch" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -71659,6 +71858,7 @@ self: {
        homepage = "https://toktok.github.io/";
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "github-types" = callPackage
@@ -75885,6 +76085,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "google-maps-geocoding" = callPackage
+    ({ mkDerivation, aeson, base, http-client, servant, servant-client
+     , text
+     }:
+     mkDerivation {
+       pname = "google-maps-geocoding";
+       version = "0.1.0.0";
+       sha256 = "375204744bebde75f9d249dc535d6b3199b342c6e68e452b7af4a3ac55521ef5";
+       revision = "1";
+       editedCabalFile = "293782aef4b6465cfe154b1601db24c5720a444c802f5a454fa06f04f0549614";
+       libraryHaskellDepends = [
+         aeson base http-client servant servant-client text
+       ];
+       homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme";
+       description = "Google Maps Geocoding API bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "google-oauth2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, http-conduit
      , http-types, load-env
@@ -76973,10 +77191,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphql-api";
-       version = "0.1.1";
-       sha256 = "e8d19197ff982e111ec199b411faf78e2800778b82c3c0147f1ef35615522a7d";
-       revision = "1";
-       editedCabalFile = "593742fa27cf4b14bcb88ced31b9af3a0567a5fab700e18e2f47f49a6c5fd1a9";
+       version = "0.1.2";
+       sha256 = "8620df9b4750b3b6003d3efe6ba74e27581f3df042c7333ce0bd9c6e9e2e8c13";
        libraryHaskellDepends = [
          aeson attoparsec base containers exceptions protolude QuickCheck
          scientific text transformers
@@ -76989,7 +77205,7 @@ self: {
          attoparsec base criterion exceptions protolude transformers
        ];
        homepage = "https://github.com/jml/graphql-api#readme";
-       description = "Write type-safe GraphQL services in Haskell";
+       description = "Sketch of GraphQL stuff";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -85321,23 +85537,22 @@ self: {
 
   "hasmin" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, doctest
-     , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec
-     , mainland-pretty, matrix, mtl, numbers, optparse-applicative
-     , parsers, QuickCheck, semigroups, text
+     , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec, matrix
+     , mtl, numbers, optparse-applicative, parsers, QuickCheck, text
      }:
      mkDerivation {
        pname = "hasmin";
-       version = "0.3.0.1";
-       sha256 = "b4b7b8fbe3553a2b93de7a7f3a90b9e8a5410a5e79f59db15e1f08ef62777e38";
+       version = "0.3.1.3";
+       sha256 = "b5297b795fba11f2644c9211b60cf535ca8d67aea6059714e7948d8261ddc9d8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring containers mainland-pretty matrix mtl
-         numbers parsers semigroups text
+         attoparsec base bytestring containers matrix mtl numbers parsers
+         text
        ];
        executableHaskellDepends = [
-         attoparsec base bytestring containers gitrev hopfli mainland-pretty
-         matrix mtl numbers optparse-applicative parsers text
+         attoparsec base bytestring containers gitrev hopfli matrix mtl
+         numbers optparse-applicative parsers text
        ];
        testHaskellDepends = [
          attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
@@ -88247,8 +88462,8 @@ self: {
      }:
      mkDerivation {
        pname = "hexpat";
-       version = "0.20.9";
-       sha256 = "5d1c075f1ae00be2e80c0018b522a351b2f4ef73b9baca1113ee80e554449d9d";
+       version = "0.20.10";
+       sha256 = "39e6a1a30e80873165c3287a5b84de325c0b1dee1ddfd271daa360c1b15e0e2e";
        libraryHaskellDepends = [
          base bytestring containers deepseq List text transformers
          utf8-string
@@ -88829,6 +89044,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hgis" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, cairo
+     , 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.1.2";
+       sha256 = "fe9ba90e951533980aff909f6c53a33d2e1960ddb5eb547a4650564a0ee4bb5f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base binary bytestring Chart Chart-cairo
+         Chart-diagrams colour composition data-binary-ieee754 data-default
+         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
      , bytestring, case-insensitive, cmdargs, directory, http-enumerator
@@ -89289,6 +89531,7 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highjson-th" = callPackage
@@ -89310,6 +89553,7 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highlight-versions" = callPackage
@@ -92542,6 +92786,7 @@ self: {
        homepage = "https://github.com/ciez/hora";
        description = "date time";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "horizon" = callPackage
@@ -97820,6 +98065,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-client_0_4_31_2" = callPackage
+    ({ mkDerivation, array, async, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ghc-prim, hspec, http-types, mime-types, monad-control, network
+     , network-uri, random, streaming-commons, text, time, transformers
+     , zlib
+     }:
+     mkDerivation {
+       pname = "http-client";
+       version = "0.4.31.2";
+       sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b";
+       libraryHaskellDepends = [
+         array base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         exceptions filepath ghc-prim http-types mime-types network
+         network-uri random streaming-commons text time transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring blaze-builder bytestring
+         case-insensitive containers deepseq directory hspec http-types
+         monad-control network network-uri streaming-commons text time
+         transformers zlib
+       ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
@@ -97981,6 +98257,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-client-tls_0_2_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, connection, data-default-class
+     , hspec, http-client, http-types, network, tls
+     }:
+     mkDerivation {
+       pname = "http-client-tls";
+       version = "0.2.4.1";
+       sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3";
+       revision = "1";
+       editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c";
+       libraryHaskellDepends = [
+         base bytestring connection data-default-class http-client network
+         tls
+       ];
+       testHaskellDepends = [ base hspec http-client http-types ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "http-client backend using the connection package and tls library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-client-tls" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, connection
      , containers, criterion, cryptonite, data-default-class, exceptions
@@ -98256,6 +98554,7 @@ self: {
        homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "http-listen" = callPackage
@@ -102890,21 +103189,22 @@ self: {
      }) {};
 
   "influxdb" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
-     , data-default-class, dlist, exceptions, http-client, HUnit, mtl
-     , network-uri, retry, scientific, tagged, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, template-haskell, text, vector
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
+     , containers, foldl, http-client, http-types, HUnit, lens, mtl
+     , network, optional-args, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "0.10.0";
-       sha256 = "063754458bbceb4a89e70c26a979f47e2c632a0ccaf93b53360870d44c5268bb";
+       version = "1.0.0";
+       sha256 = "6b86e068856689490a006dcaeac1f47fc8deb3d678bd0ddd9dad7c78cff396ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring containers data-default-class
-         dlist exceptions http-client mtl network-uri retry scientific
-         tagged template-haskell text vector
+         aeson attoparsec base bytestring clock containers foldl http-client
+         http-types lens network optional-args scientific text time
+         unordered-containers vector
        ];
        testHaskellDepends = [
          base http-client HUnit mtl tasty tasty-hunit tasty-quickcheck
@@ -103865,7 +104165,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intro_0_1_0_9" = callPackage
+  "intro_0_1_0_10" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
      , deepseq, dlist, extra, hashable, lens, mtl, safe
      , string-conversions, tagged, text, transformers
@@ -103873,8 +104173,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.9";
-       sha256 = "963620591271c3a8e39cfc6b222b4ea9266da0121887298de7e6e59962d422ae";
+       version = "0.1.0.10";
+       sha256 = "1c8c6c7bd6ff10eb10d26cea7a04c2a048b8128eb7fc154d931f7c17201741d9";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -106070,6 +106370,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "jenga" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , http-conduit, http-types, text
+     }:
+     mkDerivation {
+       pname = "jenga";
+       version = "0.1.0.0";
+       sha256 = "4468d8a1c55009b146b8294ab9ed677b5c7a5e3d0fbae1825a5aebcd509412d0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal containers http-conduit http-types text
+       ];
+       executableHaskellDepends = [ base text ];
+       homepage = "https://github.com/erikd/jenga";
+       description = "Generate a cabal freeze file from a stack.yaml";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jespresso" = callPackage
     ({ mkDerivation, arrows, base, bytestring, cmdargs
      , data-default-class, data-default-instances-base, Diff, directory
@@ -106354,6 +106674,7 @@ self: {
        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" ];
      }) {};
 
   "jpeg" = callPackage
@@ -108742,8 +109063,8 @@ self: {
      }:
      mkDerivation {
        pname = "keysafe";
-       version = "0.20170122";
-       sha256 = "39349c641898e77e340d171263a9b2d860089a4ae7a6068a563e8e6647a1fd7e";
+       version = "0.20170303";
+       sha256 = "1785ee897795fcde79ef96742b473f84705335a22d6f033981163cf8a3a9b45a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -117056,15 +117377,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lucid_2_9_8" = callPackage
+  "lucid_2_9_8_1" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
      , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
      , mtl, parsec, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "lucid";
-       version = "2.9.8";
-       sha256 = "9ab498348a68317d2b995c29e0963895d0943de571e9164a28fc3f30ae7f9b72";
+       version = "2.9.8.1";
+       sha256 = "eba0e020ce560c5b6146bd7786d8c531026c5c898590e46f7d94a8019740da08";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers hashable mmorph mtl text
          transformers unordered-containers
@@ -117073,7 +117394,7 @@ self: {
          base bifunctors hspec HUnit mtl parsec text
        ];
        benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq text
+         base blaze-builder bytestring criterion deepseq text transformers
        ];
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
@@ -117623,6 +117944,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "machines-amazonka" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-ec2, amazonka-s3
+     , amazonka-sts, base, concurrent-machines, containers, exceptions
+     , focus, hashable, liblawless, lifted-async, list-t, monad-control
+     , mtl, resourcet, stm, stm-containers, time, transformers
+     }:
+     mkDerivation {
+       pname = "machines-amazonka";
+       version = "0.4.1";
+       sha256 = "cce59823213d25be8bc6b570baaf2f2af5bcbbb5ccc79443afa6542586d5d6bd";
+       libraryHaskellDepends = [
+         amazonka amazonka-core amazonka-ec2 amazonka-s3 amazonka-sts base
+         concurrent-machines containers exceptions focus hashable liblawless
+         lifted-async list-t monad-control mtl resourcet stm stm-containers
+         time transformers
+       ];
+       description = "Machine transducers for Amazonka calls";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "machines-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, machines }:
      mkDerivation {
@@ -118969,18 +119311,18 @@ self: {
 
   "marvin" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, configurator
-     , deepseq, directory, filepath, hashable, haskeline, http-client
-     , http-client-tls, http-types, irc-conduit, lens, lifted-async
-     , lifted-base, marvin-interpolate, monad-control, monad-logger
-     , monad-loops, mtl, mustache, network-uri, optparse-applicative
-     , random, stm, text, text-icu, time, transformers
-     , transformers-base, unordered-containers, vector, wai, warp
-     , warp-tls, websockets, wreq, wuss
+     , deepseq, directory, filepath, hashable, haskeline, hspec
+     , http-client, http-client-tls, http-types, irc-conduit, lens
+     , lifted-async, lifted-base, marvin-interpolate, monad-control
+     , monad-logger, monad-loops, mtl, mustache, network-uri
+     , optparse-applicative, random, stm, text, text-icu, time
+     , transformers, transformers-base, unordered-containers, vector
+     , wai, warp, warp-tls, websockets, wreq, wuss
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.2.0";
-       sha256 = "7928adc11b0fe646db3bb20333c6dcea09664a7b6a341de9d5ed3bfb639e6301";
+       version = "0.2.2";
+       sha256 = "87c5aa6059c7dbf6c8d20d31d3a242bc68aa888313453448ca520f726272dbbb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118995,6 +119337,7 @@ self: {
          aeson base bytestring configurator directory filepath mustache
          optparse-applicative text
        ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://marvin.readthedocs.io";
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
@@ -119778,6 +120121,7 @@ self: {
        homepage = "https://github.com/lindenbaum/mediabus";
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "mediabus-rtp" = callPackage
@@ -119816,6 +120160,7 @@ self: {
        homepage = "https://github.com/lindenbaum/mediabus-rtp";
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "median-stream" = callPackage
@@ -122955,6 +123300,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-skeleton_0_1_3" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-st" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -124108,6 +124466,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mosquitto-hs" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mosquitto-hs";
+       version = "0.1.0.0";
+       sha256 = "964a6f05bbbcf3c4797ca35d82c99c21d257b8ce252397ffc87dbe8482bb0031";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/anishray/mosquitto-hs#readme";
+       description = "Mosquitto client library bindings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mount" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -130384,6 +130754,7 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "octohat" = callPackage
@@ -133405,6 +133776,36 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) pango;};
 
+  "pansite" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default
+     , directory, doctest, filepath, Glob, hspec, http-types, MissingH
+     , optparse-applicative, pandoc, pandoc-types, shake, split
+     , template-haskell, text, time, unordered-containers, vcs-revision
+     , vector, wai, wai-logger, warp, yaml
+     }:
+     mkDerivation {
+       pname = "pansite";
+       version = "0.1.0.0";
+       sha256 = "656dbab42493e28e112650ba1095d2f0cde42a06c47a640714be969cd9a3a8c2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default split text unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson base blaze-html bytestring data-default directory filepath
+         http-types MissingH optparse-applicative pandoc pandoc-types shake
+         template-haskell text time unordered-containers vcs-revision wai
+         wai-logger warp
+       ];
+       testHaskellDepends = [ base doctest Glob hspec ];
+       homepage = "https://github.com/rcook/pansite#readme";
+       description = "Pansite: a simple web site management tool";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "papa" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, papa-base
      , papa-base-export, papa-base-implement, papa-bifunctors
@@ -137286,6 +137687,30 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "pipes_4_2_0" = callPackage
+    ({ mkDerivation, base, criterion, mmorph, mtl, optparse-applicative
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes";
+       version = "4.2.0";
+       sha256 = "1e407197e94c3c8642fd2c7b4f8e5a3e537844dff2780c396464a47ae0ec0124";
+       revision = "1";
+       editedCabalFile = "1ce0aac0a280be337215bcf2a8b73b081a948bfb93e24045a7e3a3c3e6adfad0";
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
+       testHaskellDepends = [
+         base mtl QuickCheck test-framework test-framework-quickcheck2
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base criterion mtl optparse-applicative transformers
+       ];
+       description = "Compositional pipelines";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, test-framework
@@ -137882,6 +138307,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-lines" = callPackage
+    ({ mkDerivation, base, bytestring, lens, mtl, pipes, pipes-group
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "pipes-lines";
+       version = "1.0.3.1";
+       sha256 = "6781737f9686f4e53d48eabffe8079b3cc608a4603da98ebdb34d34bf24a1efc";
+       libraryHaskellDepends = [ base bytestring pipes pipes-group text ];
+       testHaskellDepends = [
+         base bytestring lens mtl pipes pipes-group QuickCheck
+       ];
+       homepage = "https://github.com/mindreader/pipes-lines";
+       description = "Pipes for grouping by lines with carriage returns";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-lzma" = callPackage
     ({ mkDerivation, base, bytestring, lzma, pipes, pipes-bytestring
      , QuickCheck
@@ -142940,13 +143382,14 @@ self: {
      }) {};
 
   "protolude-lifted" = callPackage
-    ({ mkDerivation, base, lifted-async, lifted-base, protolude }:
+    ({ mkDerivation, async, base, lifted-async, lifted-base, protolude
+     }:
      mkDerivation {
        pname = "protolude-lifted";
-       version = "0.1.0.1";
-       sha256 = "1cf719477b66ad04fca3c5322fc3e9b27d6208bf677cbab84b4577cdce83364f";
+       version = "0.1.1.0";
+       sha256 = "82a83f5b6ba7f16be05dfaa5e490b6fe65b93fe3b6b3dbf8969f7bda9f2bf532";
        libraryHaskellDepends = [
-         base lifted-async lifted-base protolude
+         async base lifted-async lifted-base protolude
        ];
        homepage = "https://github.com/pbogdan/protolude-lifted";
        description = "Protolude with lifted-base and lifted-async";
@@ -143686,7 +144129,6 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bridge" = callPackage
@@ -143940,6 +144382,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pushover" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, exceptions, http-client
+     , http-client-tls, mtl, tasty, tasty-hunit, text, time
+     , transformers, uri-encode
+     }:
+     mkDerivation {
+       pname = "pushover";
+       version = "0.1.0.1";
+       sha256 = "8c3168b78d79384eeabfa83ba810314c1c81adcd70a491c76ad9af016646262a";
+       libraryHaskellDepends = [
+         aeson base bytestring exceptions http-client http-client-tls mtl
+         text time transformers uri-encode
+       ];
+       testHaskellDepends = [
+         base bytestring http-client tasty tasty-hunit text time
+       ];
+       homepage = "https://github.com/DanMeakin/pushover";
+       description = "A Haskell Pushover API library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "putlenses" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, lens, mtl, QuickCheck
      , random, safe, split, template-haskell, transformers
@@ -144962,6 +145425,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickcheck-special_0_1_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific
+     , text
+     }:
+     mkDerivation {
+       pname = "quickcheck-special";
+       version = "0.1.0.4";
+       sha256 = "9a3f3a24b6595aaa12b4c61644e329c82457f2d49ee913986b08378dacba67b7";
+       libraryHaskellDepends = [
+         base bytestring ieee754 QuickCheck scientific text
+       ];
+       homepage = "https://github.com/minad/quickcheck-special#readme";
+       description = "Edge cases and special values for QuickCheck Arbitrary instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-string-random" = callPackage
     ({ mkDerivation, base, QuickCheck, string-random, tasty
      , tasty-quickcheck, text
@@ -151803,6 +152283,7 @@ self: {
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
@@ -153235,6 +153716,7 @@ self: {
        homepage = "https://github.com/NCrashed/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safeint" = callPackage
@@ -156386,30 +156868,28 @@ self: {
      }) {};
 
   "serokell-util" = callPackage
-    ({ mkDerivation, acid-state, aeson, aeson-extra, base
-     , base16-bytestring, base64-bytestring, binary, binary-orphans
-     , bytestring, cereal, cereal-vector, clock, containers
-     , data-msgpack, deepseq, directory, either, exceptions, extra
-     , filepath, formatting, hashable, hspec, lens, log-warper
+    ({ mkDerivation, acid-state, aeson, aeson-extra, ansi-terminal
+     , base, base16-bytestring, base64-bytestring, binary
+     , binary-orphans, bytestring, cereal, cereal-vector, clock
+     , containers, data-msgpack, deepseq, directory, either, exceptions
+     , extra, filepath, formatting, hashable, hspec, lens, log-warper
      , monad-control, mtl, optparse-applicative, parsec, QuickCheck
      , quickcheck-instances, safecopy, scientific, semigroups, stm
      , template-haskell, text, text-format, time-units, transformers
-     , unordered-containers, vector, yaml
+     , universum, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.3.5";
-       sha256 = "4d39b93b18636db11004b7b03fc118da8417ff9abe4db32164c200da23a22391";
-       revision = "1";
-       editedCabalFile = "3bcba06004dd1f2cfe23b7321917dd53e08efff1c65e2c48898d773b91ce5a35";
+       version = "0.1.4.0";
+       sha256 = "ab37e7b6833fa3499501c82133dfd640875326c1b0ba96df3cf7b0380c2215cf";
        libraryHaskellDepends = [
-         acid-state aeson aeson-extra base base16-bytestring
+         acid-state aeson aeson-extra ansi-terminal base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
          cereal-vector clock containers data-msgpack deepseq directory
          either exceptions extra filepath formatting hashable lens
          log-warper monad-control mtl optparse-applicative parsec QuickCheck
          quickcheck-instances safecopy scientific semigroups stm
-         template-haskell text text-format time-units transformers
+         template-haskell text text-format time-units transformers universum
          unordered-containers vector yaml
        ];
        testHaskellDepends = [
@@ -157051,6 +157531,7 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "servant-docs_0_10" = callPackage
@@ -158048,8 +158529,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-backend-persistent";
-       version = "1.0.2";
-       sha256 = "19dfb2c55d64168e3fa2ceb6476ac55c67e69a750e0a39b400d9b3b0fbd3be4b";
+       version = "1.0.3";
+       sha256 = "689eb02ada5f1ad8ce0e0c43ae0931953533fab1f65d10d3a7c35dd01688c5ae";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring cereal path-pieces
          persistent serversession tagged text time transformers
@@ -158074,8 +158555,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-backend-redis";
-       version = "1.0.1";
-       sha256 = "b4b30860fa2e431fd7101b3fb5541e7a687bce71886ca164564c35fbf104af4f";
+       version = "1.0.2";
+       sha256 = "d7746682f83e796bb1de3d14dd26d20c3c0723d7683af93e58d8a0a57b9bf917";
        libraryHaskellDepends = [
          base bytestring hedis path-pieces serversession tagged text time
          transformers unordered-containers
@@ -158097,8 +158578,8 @@ self: {
      }:
      mkDerivation {
        pname = "serversession-frontend-snap";
-       version = "1.0";
-       sha256 = "91719ff595a845f26a670c4f41c9a1d405d78ee4f213e666fa2e98ede46049d8";
+       version = "1.0.1";
+       sha256 = "bb2476bb04907b0f2df1be9ef8c7a6c2aa984b8a06fe4bd6342ed990c2868d2c";
        libraryHaskellDepends = [
          base bytestring nonce path-pieces serversession snap snap-core text
          time transformers unordered-containers
@@ -159313,10 +159794,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.8.1";
-       sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd";
-       revision = "1";
-       editedCabalFile = "455095701152d4564c2b0a6e553f3add129b7bd0a91174a3bc2bc2292bdd5501";
+       version = "1.6.8.3";
+       sha256 = "78ae736c22455b40176b47003be4ea9ea2d02b440f921a1a022e8536833a8487";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -159342,8 +159821,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly-extra";
-       version = "0.3.0.1";
-       sha256 = "0502062de043c0322d3cddf379847c1148e515c4fa18f19db835210d422d85d5";
+       version = "0.3.0.2";
+       sha256 = "19d39c38a90fb19d9f79a648d72f73d0a5ec2bd3788abf7dac3d77da19ae5446";
        libraryHaskellDepends = [ async base mtl SafeSemaphore shelly ];
        testHaskellDepends = [
          async base hspec HUnit mtl SafeSemaphore shelly text
@@ -159765,6 +160244,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "sign" = callPackage
@@ -167519,8 +167999,61 @@ self: {
      }:
      mkDerivation {
        pname = "store";
-       version = "0.3.1";
-       sha256 = "ec1005ebaf7334f6e5166315f8406553c94cffa8e06bc1d60f372c0d46ceda90";
+       version = "0.4.0";
+       sha256 = "bdbbc77a10941ee721c4c3fb456ec236ada3be51a890415c00a57cd4f06973cc";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         containers contravariant cryptohash deepseq directory filepath free
+         ghc-prim hashable hspec hspec-smallcheck integer-gmp lifted-base
+         monad-control mono-traversable network primitive resourcet safe
+         semigroups smallcheck store-core streaming-commons syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring cereal
+         cereal-vector conduit containers contravariant criterion cryptohash
+         deepseq directory filepath free ghc-prim hashable hspec
+         hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable network primitive resourcet safe semigroups
+         smallcheck store-core streaming-commons syb template-haskell text
+         th-lift th-lift-instances th-orphans th-reify-many th-utilities
+         time transformers unordered-containers vector
+         vector-binary-instances void weigh
+       ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bytestring conduit
+         containers contravariant criterion cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable network primitive
+         resourcet safe semigroups smallcheck store-core streaming-commons
+         syb template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       homepage = "https://github.com/fpco/store#readme";
+       description = "Fast binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "store_0_4_1" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bytestring, cereal, cereal-vector, conduit
+     , containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, network, primitive, resourcet, safe, semigroups
+     , smallcheck, store-core, streaming-commons, syb, template-haskell
+     , text, th-lift, th-lift-instances, th-orphans, th-reify-many
+     , th-utilities, time, transformers, unordered-containers, vector
+     , vector-binary-instances, void, weigh
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.4.1";
+       sha256 = "aee7f803b9338569b089d01c3ab3ec1384d9ae55d1ebb6c867faefb34656bdb2";
        libraryHaskellDepends = [
          array async base base-orphans base64-bytestring bytestring conduit
          containers contravariant cryptohash deepseq directory filepath free
@@ -167564,8 +168097,8 @@ self: {
      }:
      mkDerivation {
        pname = "store-core";
-       version = "0.3";
-       sha256 = "8793230b634a310a91db98727dfa6f34a0b7f5ded55985342066d33d98507087";
+       version = "0.4";
+       sha256 = "aa8df93b9c5aba42b800b17a6cfd6bbdeef9369dc71ef684108d424a88ecf4f5";
        libraryHaskellDepends = [
          base bytestring fail ghc-prim primitive text transformers
        ];
@@ -167616,6 +168149,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stratosphere_0_4_1" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stratum-tool" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, bytestring-builder
      , cmdargs, connection, containers, curl, curl-aeson, network, stm
@@ -169543,6 +170101,7 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "swapper" = callPackage
@@ -171887,6 +172446,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-auto_0_2_0_0" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-auto";
+       version = "0.2.0.0";
+       sha256 = "b24e6f45aca98bc83316261d21ac5d9094aede0c5c7179c16ef2f69dfa3cf65a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/minad/tasty-auto#readme";
+       description = "Auto discovery for Tasty with support for ingredients and test tree generation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-dejafu" = callPackage
     ({ mkDerivation, base, dejafu, tagged, tasty }:
      mkDerivation {
@@ -172093,6 +172674,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-jenkins-xml" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hlint, hspec
+     , io-capture, mockery, tasty, tasty-ant-xml, tasty-hunit, unix
+     }:
+     mkDerivation {
+       pname = "tasty-jenkins-xml";
+       version = "0.2.0.0";
+       sha256 = "b5f88fb4478d7d3dc1e74237fabea54d0098dc5a726752279f41c5ce0eaaade4";
+       libraryHaskellDepends = [ base tasty tasty-ant-xml ];
+       testHaskellDepends = [
+         base bytestring directory hlint hspec io-capture mockery tasty
+         tasty-hunit unix
+       ];
+       homepage = "https://github.com/IxpertaSolutions/tasty-jenkins-xml#readme";
+       description = "Render tasty output to both console and XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-kat" = callPackage
     ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit
      , tasty-quickcheck
@@ -177503,6 +178103,7 @@ self: {
        homepage = "https://github.com/tonyday567/tower";
        description = "A numeric tower";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "toxcore" = callPackage
@@ -178054,6 +178655,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "transient_0_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, mtl
+     , random, stm, time, transformers
+     }:
+     mkDerivation {
+       pname = "transient";
+       version = "0.5.1";
+       sha256 = "a6b90bed245013a7ffe61f8d6e5b0f5798dd64999c914c1f956b0d3a1c3a8d25";
+       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";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "transient-universe" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
@@ -178084,6 +178703,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transient-universe_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , directory, filepath, hashable, HTTP, iproute, mtl, network
+     , network-info, network-uri, process, random, stm, TCache, text
+     , time, transformers, transient, vector, websockets
+     }:
+     mkDerivation {
+       pname = "transient-universe";
+       version = "0.4.1";
+       sha256 = "2000815b5df5dfa3e02856e0ba3e1f408efaf4fc6365c6949c0f9cca4ad8d6fb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers directory filepath
+         hashable HTTP iproute mtl network network-info network-uri process
+         random stm TCache text time transformers transient vector
+         websockets
+       ];
+       executableHaskellDepends = [ base transformers transient ];
+       testHaskellDepends = [
+         base bytestring case-insensitive containers directory filepath
+         hashable HTTP mtl network network-info network-uri process random
+         stm TCache text time transformers transient vector websockets
+       ];
+       homepage = "http://www.fpcomplete.com/user/agocorona";
+       description = "Remote execution and map-reduce: distributed computing for Transient";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "translatable-intset" = callPackage
     ({ mkDerivation, base, fingertree }:
      mkDerivation {
@@ -186174,6 +186823,7 @@ self: {
        ];
        description = "Authentication middleware that secures WAI application";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "wai-middleware-cache" = callPackage
@@ -188152,6 +188802,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "websockets_0_9_8_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , blaze-builder, bytestring, case-insensitive, containers, entropy
+     , HUnit, network, QuickCheck, random, SHA, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "websockets";
+       version = "0.9.8.2";
+       sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy network random SHA text
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary blaze-builder bytestring
+         case-insensitive containers entropy HUnit network QuickCheck random
+         SHA test-framework test-framework-hunit test-framework-quickcheck2
+         text
+       ];
+       doCheck = false;
+       homepage = "http://jaspervdj.be/websockets";
+       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers, entropy
@@ -192256,6 +192935,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml-combinators" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
+     , scientific, tasty, tasty-hunit, text, transformers
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "yaml-combinators";
+       version = "1.0";
+       sha256 = "9997df825976d8e02ce501248dc2ab82bc4ba30510fe3511b199e4d99bd9bd17";
+       libraryHaskellDepends = [
+         aeson base bytestring generics-sop scientific text transformers
+         unordered-containers vector yaml
+       ];
+       testHaskellDepends = [
+         aeson base doctest tasty tasty-hunit unordered-containers
+       ];
+       homepage = "https://github.com/feuerbach/yaml-combinators";
+       description = "YAML parsing combinators for improved validation and error reporting";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yaml-config" = callPackage
     ({ mkDerivation, base, deepseq, hashable, QuickCheck, tasty
      , tasty-quickcheck, text, unordered-containers, yaml
@@ -194829,6 +195529,7 @@ self: {
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "yhccore" = callPackage
@@ -195938,6 +196639,32 @@ self: {
        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_9" = 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 = stdenv.lib.platforms.none;
      }) {};
 
   "zip-archive" = callPackage

From 85a06d6b8d8272f394cb8a9c66c53420bc8118c4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 19:36:16 +0100
Subject: [PATCH 1785/3449] haskell-shelly: drop obsolete overrides

---
 .../haskell-modules/configuration-common.nix       | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 065ccdc9de35..6163e177a898 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -634,20 +634,6 @@ self: super: {
     haskell-src-exts = self.haskell-src-exts_1_19_1;
   };
 
-  # https://github.com/yesodweb/Shelly.hs/issues/106
-  # https://github.com/yesodweb/Shelly.hs/issues/108
-  # https://github.com/yesodweb/Shelly.hs/issues/130
-  shelly =
-    let drv = appendPatch (dontCheck (doJailbreak super.shelly)) (pkgs.fetchpatch {
-                url = "https://github.com/k0001/Shelly.hs/commit/32a1e290961755e7b2379f59faa49b13d03dfef6.patch";
-                sha256 = "0ccq0qly8bxxv64dk97a44ng6hb01j6ajs0sp3f2nn0hf5j3xv69";
-              });
-    in overrideCabal drv (drv : {
-         # doJailbreak doesn't seem to work for build-depends inside an
-         # if-then-else block so we have to do it manually.
-         postPatch = "sed -i 's/base >=4\.6 \&\& <4\.9\.1/base -any/' shelly.cabal";
-       });
-
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
 

From ac61ddef8ff6509549b0f8da588e668cadcf49bf Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 24 Feb 2017 07:40:37 +1100
Subject: [PATCH 1786/3449] asterisk: use fetchsvn for vendored library

---
 pkgs/servers/asterisk/default.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index 0c9f72f66d5d..581dbc3b1f76 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, pkgs, lib, fetchurl, fetchgit,
+{ stdenv, pkgs, lib, fetchurl, fetchgit, fetchsvn,
   jansson, libxml2, libxslt, ncurses, openssl, sqlite,
   utillinux, dmidecode, libuuid, binutils, newt,
   lua, speex,
-  srtp, wget, curl,
-  subversionClient
+  srtp, wget, curl
 }:
 
 let
@@ -11,7 +10,7 @@ let
     inherit version;
     name = "asterisk-${version}";
 
-    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl subversionClient ];
+    buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl ];
 
     patches = [
       # We want the Makefile to install the default /var skeleton
@@ -36,7 +35,7 @@ let
     preConfigure = ''
       mkdir externals_cache
     '' + lib.concatStringsSep "\n"
-        (lib.mapAttrsToList (dst: src: "cp ${src} ${dst}") externals) + ''
+        (lib.mapAttrsToList (dst: src: "cp -r --no-preserve=mode ${src} ${dst}") externals) + ''
 
       chmod -w externals_cache
     '';
@@ -50,7 +49,6 @@ let
     preBuild = ''
       make menuselect.makeopts
       substituteInPlace menuselect.makeopts --replace 'format_mp3 ' ""
-      ./contrib/scripts/get_mp3_source.sh
     '';
 
     postInstall = ''
@@ -71,6 +69,12 @@ let
     sha256 = "1wq8lpfcd4dfrbl7bgy2yzgp3ldjzq5430fqkhcqad0xfrxj0fdb";
   };
 
+  mp3-202 = fetchsvn {
+    url = http://svn.digium.com/svn/thirdparty/mp3/trunk;
+    rev = 202;
+    sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy";
+  };
+
 in
 {
 
@@ -79,6 +83,7 @@ in
     sha256 = "0yh097rrp1i681qclvwyh7l1gg2i5wx5pjrcvwpbj6g949mc98vd";
     externals = {
       "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+      "addons/mp3" = mp3-202;
     };
   };
 
@@ -87,6 +92,7 @@ in
     sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj";
     externals = {
       "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255;
+      "addons/mp3" = mp3-202;
     };
   };
 

From 8ac336b539bd8e79a2c199d42a246330ceddcb96 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 3 Mar 2017 09:41:14 +0800
Subject: [PATCH 1787/3449] mu: run tests

---
 pkgs/tools/networking/mu/default.nix         | 15 ++++++++++++---
 pkgs/tools/networking/mu/failing_tests.patch | 18 ++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/networking/mu/failing_tests.patch

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 2813e7e655d4..0fc6d7273eaf 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook
+{ fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook, pmccabe
 , xapian, glib, gmime, texinfo , emacs, guile
 , gtk3, webkitgtk24x, libsoup, icu
 , withMug ? false }:
@@ -12,9 +12,18 @@ stdenv.mkDerivation rec {
     sha256 = "0gfwi4dwqhsz138plryd0j935vx2i44p63jpfx85ki3l4ysmmlwd";
   };
 
+  # as of 0.9.18 2 tests are failing but previously we had no tests
+  patches = [
+    ./failing_tests.patch
+  ];
+
+  # pmccabe should be a checkInput instead, but configure looks for it
   buildInputs = [
-    sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu
-    autoreconfHook ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
+    sqlite xapian glib gmime texinfo emacs guile libsoup icu pmccabe
+  ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
+  doCheck = true;
 
   preBuild = ''
     # Fix mu4e-builddir (set it to $out)
diff --git a/pkgs/tools/networking/mu/failing_tests.patch b/pkgs/tools/networking/mu/failing_tests.patch
new file mode 100644
index 000000000000..c45834ff2082
--- /dev/null
+++ b/pkgs/tools/networking/mu/failing_tests.patch
@@ -0,0 +1,18 @@
+diff --git a/mu/tests/test-mu-query.c b/mu/tests/test-mu-query.c
+index 73cbd3f4..46a0b131 100644
+--- a/mu/tests/test-mu-query.c
++++ b/mu/tests/test-mu-query.c
+@@ -753,10 +753,10 @@ main (int argc, char *argv[])
+	g_test_add_func ("/mu-query/test-mu-query-sizes",
+			 test_mu_query_sizes);
+
+-	g_test_add_func ("/mu-query/test-mu-query-dates-helsinki",
+-			 test_mu_query_dates_helsinki);
+-	g_test_add_func ("/mu-query/test-mu-query-dates-sydney",
+-			 test_mu_query_dates_sydney);
++	/* g_test_add_func ("/mu-query/test-mu-query-dates-helsinki", */
++	/* 		 test_mu_query_dates_helsinki); */
++	/* g_test_add_func ("/mu-query/test-mu-query-dates-sydney", */
++	/* 		 test_mu_query_dates_sydney); */
+	g_test_add_func ("/mu-query/test-mu-query-dates-la",
+			 test_mu_query_dates_la);

From 8d6fbd05786b1859d7621f636455843aeb314b7b Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Thu, 23 Feb 2017 15:06:47 -0600
Subject: [PATCH 1788/3449] go: 1.7 -> 1.8

---
 pkgs/development/compilers/go/1.8.nix         | 170 ++++++++++++++++++
 .../development/compilers/go/cacert-1.8.patch |  80 +++++++++
 .../compilers/go/remove-test-pie-1.8.patch    |  23 +++
 .../compilers/go/remove-tools-1.8.patch       |  35 ++++
 pkgs/top-level/all-packages.nix               |  14 +-
 5 files changed, 320 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/compilers/go/1.8.nix
 create mode 100644 pkgs/development/compilers/go/cacert-1.8.patch
 create mode 100644 pkgs/development/compilers/go/remove-test-pie-1.8.patch
 create mode 100644 pkgs/development/compilers/go/remove-tools-1.8.patch

diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
new file mode 100644
index 000000000000..00ec11abc47b
--- /dev/null
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -0,0 +1,170 @@
+{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin
+, perl, which, pkgconfig, patch, fetchpatch
+, pcre, cacert
+, Security, Foundation, bash }:
+
+let
+
+  inherit (stdenv.lib) optional optionals optionalString;
+
+  clangHack = writeScriptBin "clang" ''
+    #!${stdenv.shell}
+    exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2)
+  '';
+
+  goBootstrap = runCommand "go-bootstrap" {} ''
+    mkdir $out
+    cp -rf ${go_bootstrap}/* $out/
+    chmod -R u+w $out
+    find $out -name "*.c" -delete
+    cp -rf $out/bin/* $out/share/go/bin/
+  '';
+
+in
+
+stdenv.mkDerivation rec {
+  name = "go-${version}";
+  version = "1.8";
+
+  src = fetchFromGitHub {
+    owner = "golang";
+    repo = "go";
+    rev = "go${version}";
+    sha256 = "0plm11rqrqz7frwz0jjcm13x939yhny755ks1adxjzmsngln9prl";
+  };
+
+  # perl is used for testing go vet
+  nativeBuildInputs = [ perl which pkgconfig patch ];
+  buildInputs = [ pcre ]
+    ++ optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
+  propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ];
+
+  hardeningDisable = [ "all" ];
+
+  prePatch = ''
+    patchShebangs ./ # replace /bin/bash
+
+    # This source produces shell script at run time,
+    # and thus it is not corrected by patchShebangs.
+    substituteInPlace misc/cgo/testcarchive/carchive_test.go \
+      --replace '#!/usr/bin/env bash' '#!${stdenv.shell}'
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/net/{listen,parse}_test.go
+    rm src/syscall/exec_linux_test.go
+
+    # !!! substituteInPlace does not seems to be effective.
+    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+    # Disable the unix socket test
+    sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+    # Remove the api check as it never worked
+    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+    # Remove the coverage test as we have removed this utility
+    sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+    # 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
+
+    # Disable cgo lookup tests not works, they depend on resolver
+    rm src/net/cgo_unix_test.go
+
+  '' + optionalString stdenv.isLinux ''
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+  '' + optionalString stdenv.isDarwin ''
+
+    # Disabling `format_test.go` because it fails on Darwin for an
+    # unknown reason see: https://github.com/NixOS/nixpkgs/pull/23122#issuecomment-282188727
+    rm src/time/format_test.go
+
+    substituteInPlace src/race.bash --replace \
+      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
+    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
+    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+
+    sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
+    sed -i '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
+    sed -i '/TestCurrent/areturn' src/os/user/user_test.go
+    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
+    sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
+
+    sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
+
+    sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go
+    sed -i 's/unrecognized/unknown/' src/cmd/go/build.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+
+    sed -i '1 a\exit 0' misc/cgo/errors/test.bash
+  '';
+
+  patches =
+    [ ./remove-tools-1.8.patch
+      ./cacert-1.8.patch
+      ./creds-test.patch
+      ./remove-test-pie-1.8.patch
+    ];
+
+  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  GOOS = if stdenv.isDarwin then "darwin" else "linux";
+  GOARCH = if stdenv.isDarwin then "amd64"
+           else if stdenv.system == "i686-linux" then "386"
+           else if stdenv.system == "x86_64-linux" then "amd64"
+           else if stdenv.isArm then "arm"
+           else throw "Unsupported system";
+  GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
+  GO386 = 387; # from Arch: don't assume sse2 on i686
+  CGO_ENABLED = 1;
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
+  # The go build actually checks for CC=*/clang and does something different, so we don't
+  # just want the generic `cc` here.
+  CC = if stdenv.isDarwin then "clang" else "cc";
+
+  configurePhase = ''
+    mkdir -p $out/share/go/bin
+    export GOROOT=$out/share/go
+    export GOBIN=$GOROOT/bin
+    export PATH=$GOBIN:$PATH
+  '';
+
+  postConfigure = optionalString stdenv.isDarwin ''
+    export PATH=${clangHack}/bin:$PATH
+  '';
+
+  installPhase = ''
+    cp -r . $GOROOT
+    ( cd $GOROOT/src && ./all.bash )
+  '';
+
+  preFixup = ''
+    rm -r $out/share/go/pkg/bootstrap
+    ln -s $out/share/go/bin $out/bin
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  disallowedReferences = [ go_bootstrap ];
+
+  meta = with stdenv.lib; {
+    branch = "1.8";
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/development/compilers/go/cacert-1.8.patch b/pkgs/development/compilers/go/cacert-1.8.patch
new file mode 100644
index 000000000000..bf44e123711f
--- /dev/null
+++ b/pkgs/development/compilers/go/cacert-1.8.patch
@@ -0,0 +1,80 @@
+diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go
+index a4b33c7..9700b75 100644
+--- a/src/crypto/x509/root_cgo_darwin.go
++++ b/src/crypto/x509/root_cgo_darwin.go
+@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) {
+ import "C"
+ import (
+ 	"errors"
++	"io/ioutil"
++	"os"
+ 	"unsafe"
+ )
+ 
+ func loadSystemRoots() (*CertPool, error) {
+ 	roots := NewCertPool()
++	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
+ 
+ 	var data C.CFDataRef = nil
+ 	err := C.FetchPEMRoots(&data)
+diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
+index 66cdb5e..bb28036 100644
+--- a/src/crypto/x509/root_darwin.go
++++ b/src/crypto/x509/root_darwin.go
+@@ -61,17 +61,25 @@ func execSecurityRoots() (*CertPool, error) {
+ 		println(fmt.Sprintf("crypto/x509: %d certs have a trust policy", len(hasPolicy)))
+ 	}
+
+-	cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
+-	data, err := cmd.Output()
+-	if err != nil {
+-		return nil, err
+-	}
+-
+ 	var (
+ 		mu          sync.Mutex
+ 		roots       = NewCertPool()
+ 		numVerified int // number of execs of 'security verify-cert', for debug stats
+ 	)
+
++	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
++
++	cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain")
++	data, err := cmd.Output()
++	if err != nil {
++		return nil, err
++	}
++
+ 	blockCh := make(chan *pem.Block)
+ 	var wg sync.WaitGroup
+diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
+index 7bcb3d6..3986e1a 100644
+--- a/src/crypto/x509/root_unix.go
++++ b/src/crypto/x509/root_unix.go
+@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
+ 
+ func loadSystemRoots() (*CertPool, error) {
+ 	roots := NewCertPool()
++	if file := os.Getenv("SSL_CERT_FILE"); file != "" {
++		data, err := ioutil.ReadFile(file)
++		if err == nil {
++			roots.AppendCertsFromPEM(data)
++			return roots, nil
++		}
++	}
++
+ 	var firstErr error
+ 	for _, file := range certFiles {
+ 		data, err := ioutil.ReadFile(file)
diff --git a/pkgs/development/compilers/go/remove-test-pie-1.8.patch b/pkgs/development/compilers/go/remove-test-pie-1.8.patch
new file mode 100644
index 000000000000..d09e143c74c1
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-test-pie-1.8.patch
@@ -0,0 +1,23 @@
+diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
+index c51dcea..8fbec5e 100644
+--- a/src/cmd/dist/test.go
++++ b/src/cmd/dist/test.go
+@@ -461,17 +461,5 @@ func (t *tester) registerTests() {
+ 		})
+ 	}
+
+-	// Test internal linking of PIE binaries where it is supported.
+-	if t.goos == "linux" && t.goarch == "amd64" {
+-		t.tests = append(t.tests, distTest{
+-			name:    "pie_internal",
+-			heading: "internal linking of -buildmode=pie",
+-			fn: func(dt *distTest) error {
+-				t.addCmd(dt, "src", "go", "test", "reflect", "-short", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60), t.tags(), t.runFlag(""))
+-				return nil
+-			},
+-		})
+-	}
+-
+ 	// sync tests
+ 	t.tests = append(t.tests, distTest{
+ 		name:    "sync_cpu",
\ No newline at end of file
diff --git a/pkgs/development/compilers/go/remove-tools-1.8.patch b/pkgs/development/compilers/go/remove-tools-1.8.patch
new file mode 100644
index 000000000000..b53e48e1a515
--- /dev/null
+++ b/pkgs/development/compilers/go/remove-tools-1.8.patch
@@ -0,0 +1,35 @@
+diff --git a/src/go/build/build.go b/src/go/build/build.go
+index 9706b8b..f250751 100644
+--- a/src/go/build/build.go
++++ b/src/go/build/build.go
+@@ -1513,7 +1513,7 @@ func init() {
+ }
+ 
+ // ToolDir is the directory containing build tools.
+-var ToolDir = filepath.Join(runtime.GOROOT(), "pkg/tool/"+runtime.GOOS+"_"+runtime.GOARCH)
++var ToolDir = runtime.GOTOOLDIR()
+ 
+ // IsLocalImport reports whether the import path is
+ // a local import path, like ".", "..", "./foo", or "../foo".
+diff --git a/src/runtime/extern.go b/src/runtime/extern.go
+index 441dcd9..a50277e 100644
+--- a/src/runtime/extern.go
++++ b/src/runtime/extern.go
+@@ -230,6 +230,17 @@ func GOROOT() string {
+ 	return sys.DefaultGoroot
+ }
+ 
++// GOTOOLDIR returns the root of the Go tree.
++// It uses the GOTOOLDIR environment variable, if set,
++// or else the root used during the Go build.
++func GOTOOLDIR() string {
++	s := gogetenv("GOTOOLDIR")
++	if s != "" {
++		return s
++	}
++	return GOROOT() + "/pkg/tool/" + GOOS + "_" + GOARCH
++}
++
+ // Version returns the Go tree's version string.
+ // It is either the commit hash and date at the time of the build or,
+ // when possible, a release tag like "go1.3".
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 297229b78867..9f59811f5319 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5175,7 +5175,13 @@ with pkgs;
     stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;
   });
 
-  go = go_1_7;
+  go_1_8 = callPackage ../development/compilers/go/1.8.nix ({
+    inherit (darwin.apple_sdk.frameworks) Security Foundation;
+  } // stdenv.lib.optionalAttrs stdenv.isDarwin {
+    stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38;
+  });
+
+  go = go_1_8;
 
   go-repo-root = callPackage ../development/tools/go-repo-root { };
 
@@ -10250,7 +10256,11 @@ with pkgs;
     go = go_1_7;
   };
 
-  buildGoPackage = buildGo17Package;
+  buildGo18Package = callPackage ../development/go-modules/generic {
+    go = go_1_8;
+  };
+
+  buildGoPackage = buildGo18Package;
 
   go2nix = callPackage ../development/tools/go2nix { };
 

From 15ea9bcfee4257d40c443f34bf3bb42be8aa71e9 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Fri, 18 Nov 2016 08:12:15 +0800
Subject: [PATCH 1789/3449] meteor: 1.2.0.1 -> 1.4.2.1

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

diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 82a5604bed84..3e2de8f50424 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -2,14 +2,14 @@
 
 let
   bootstrap = fetchurl {
-    url = "https://d3sqy0vbqsdhku.cloudfront.net/packages-bootstrap/1.2.0.1/meteor-bootstrap-os.linux.x86_64.tar.gz";
-    sha256 = "0jc516qyig7f5a8ns4y6d9031f0ww2sd90n837kz6x97nin7655s";
+    url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.1/meteor-bootstrap-os.linux.x86_64.tar.gz";
+    sha256 = "094byqsrj8g0arn4xsdjvcpa0m0k6xm2jjadppl326n4gsr946xd";
   };
 in
 
 stdenv.mkDerivation rec {
   name = "meteor-${version}";
-  version = "1.2.0.1";
+  version = "1.4.2.1";
 
   dontStrip = true;
 
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     for p in $(find $out/packages -name '*.node'); do
       patchelf \
         --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc.lib}/lib" \
-        $p
+        $p || true
     done
 
     # Meteor needs an initial package-metadata in $HOME/.meteor,

From 4a80a97ca9828324f98a7d88a64dccc94e863f67 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Sun, 5 Feb 2017 18:15:40 +0800
Subject: [PATCH 1790/3449] meteor: 1.4.2.1 -> 1.4.2.3

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

diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 3e2de8f50424..52596d6e0795 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -2,14 +2,14 @@
 
 let
   bootstrap = fetchurl {
-    url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.1/meteor-bootstrap-os.linux.x86_64.tar.gz";
-    sha256 = "094byqsrj8g0arn4xsdjvcpa0m0k6xm2jjadppl326n4gsr946xd";
+    url = "https://meteorinstall-4168.kxcdn.com/packages-bootstrap/1.4.2.3/meteor-bootstrap-os.linux.x86_64.tar.gz";
+    sha256 = "1x5dp8y731qai882ghy3337844lc686r15a4dd9wjx2zvy7wmwhz";
   };
 in
 
 stdenv.mkDerivation rec {
   name = "meteor-${version}";
-  version = "1.4.2.1";
+  version = "1.4.2.3";
 
   dontStrip = true;
 

From 9b20ce2a8c77d6c40b64a3405a9ff0fb4a4b0daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 6 Mar 2017 15:08:59 +0100
Subject: [PATCH 1791/3449] wakatime: fix checksum

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

diff --git a/pkgs/tools/misc/wakatime/default.nix b/pkgs/tools/misc/wakatime/default.nix
index 5f407591f673..0e7cd49b543d 100644
--- a/pkgs/tools/misc/wakatime/default.nix
+++ b/pkgs/tools/misc/wakatime/default.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   version = "7.0.4";
 
   src = fetchFromGitHub {
-    sha256 = "0ghrf0aqb89gjp4pb0398cszi6wzk8chqwd3l5xq6qcgvsq8srq3";
+    sha256 = "1cddabx9x11d2nxxcqlf4piysjnpfici0n5qy3n9gw81asz1djhf";
     rev = version;
     repo = "wakatime";
     owner = "wakatime";

From 00ffbf060c7c11c11d755ea2e4815bfc5e58d464 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 3 Mar 2017 18:25:00 +0100
Subject: [PATCH 1792/3449] guitarix: remove webkit, add compile flags

as recomended by the author: https://sourceforge.net/p/guitarix/mailman/message/33688855/
---
 pkgs/applications/audio/guitarix/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index a5e29a5e1747..642cbbd23f62 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python2
 , avahi, bluez, boost, eigen, fftw, glib, glib_networking
 , glibmm, gsettings_desktop_schemas, gtkmm2, libjack2
-, ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
-, webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler
+, ladspaH, libav, librdf, libsndfile, lilv, lv2, serd, sord, sratom
+, wrapGAppsHook, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
 
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm glib_networking.out
-    gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf
-    libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver
+    gsettings_desktop_schemas gtkmm2 libjack2 ladspaH libav librdf
+    libsndfile lilv lv2 serd sord sratom zita-convolver
     zita-resampler
   ];
 
@@ -33,6 +33,9 @@ stdenv.mkDerivation rec {
     "--no-desktop-update"
     "--enable-nls"
     "--no-faust" # todo: find out why --faust doesn't work
+    "--install-roboto-font"
+    "--includeresampler"
+    "--convolver-ffmpeg"
   ] ++ optional optimizationSupport "--optimization";
 
   configurePhase = ''python2 waf configure --prefix=$out $configureFlags'';

From e96a2f845080c68a4a3347f14c4d9700a1aafe52 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@gmail.com>
Date: Mon, 6 Mar 2017 11:24:40 -0300
Subject: [PATCH 1793/3449] sound-of-sorting: 0.6.5 -> 20150721 (#23549)

* sound-of-sorting: 0.6.5 -> 20150721

* sound-of-sorting: correct unstable version format
---
 pkgs/misc/sound-of-sorting/default.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix
index fa1be80287a2..6db3b44b6866 100644
--- a/pkgs/misc/sound-of-sorting/default.nix
+++ b/pkgs/misc/sound-of-sorting/default.nix
@@ -1,28 +1,29 @@
-{ stdenv, fetchurl
-, SDL2, wxGTK
-}:
+{ stdenv, fetchgit
+, SDL2, wxGTK }:
 
 stdenv.mkDerivation rec {
 
   name = "sound-of-sorting-${version}";
-  version = "0.6.5";
+  version = "unstable-2015-07-21";
 
-  src = fetchurl {
-    url = "https://github.com/bingmann/sound-of-sorting/archive/${name}.tar.gz";
-    sha256 = "1524bhmy5067z9bjc15hvqslw43adgpdn4272iymq09ahja4x76b";
+  src = fetchgit {
+    url = "https://github.com/bingmann/sound-of-sorting.git";
+    rev = "05db428c796a7006d63efdbe314f976e0aa881d6";
+    sha256 = "0m2f1dym3hcar7784sjzkbf940b28r02ajhkjgyyw7715psifb8l";
+    fetchSubmodules = true;
   };
 
   buildInputs = with stdenv.lib;
   [ wxGTK SDL2 ];
 
   preConfigure = ''
-    export SDL_CONFIG=${SDL2}/bin/sdl2-config
+    export SDL_CONFIG=${SDL2.dev}/bin/sdl2-config
   '';
 
   meta = with stdenv.lib;{
     description = "Audibilization and Visualization of Sorting Algorithms";
     homepage = http://panthema.net/2013/sound-of-sorting/;
-    license = licenses.gpl3;
-    maintainers = [ maintainers.AndersonTorres ];
+    license = with licenses; gpl3;
+    maintainers = with maintainers; [ AndersonTorres ];
   };
 }

From d72a34311a5a0034659cc0af333d2a9cc09213d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 6 Mar 2017 15:53:34 +0100
Subject: [PATCH 1794/3449] Remove nixFallback

This causes unintended schema upgrades, and is no longer needed now
that we have nixos/modules/installer/tools/nix-fallback-paths.nix.
---
 nixos/default.nix                             |  3 --
 .../modules/installer/tools/nixos-rebuild.sh  | 30 +++++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/nixos/default.nix b/nixos/default.nix
index 5f3e2ae081cc..0e45a1cd75e2 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -37,7 +37,4 @@ in
   vm = vmConfig.system.build.vm;
 
   vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
-
-  # The following are used by nixos-rebuild.
-  nixFallback = pkgs.nixUnstable.out;
 }
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 4f73865dad6a..4b5e7b3230c8 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -278,24 +278,22 @@ if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
     nixDrv=
     if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package.out "${extraBuildFlags[@]}")"; then
-        if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
-            if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
-                nixStorePath="$(prebuiltNix "$(uname -m)")"
-                if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
-                    --option extra-binary-caches https://cache.nixos.org/; then
+        if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
+            nixStorePath="$(prebuiltNix "$(uname -m)")"
+            if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
+                --option extra-binary-caches https://cache.nixos.org/; then
+                echo "warning: don't know how to get latest Nix" >&2
+            fi
+            # Older version of nix-store -r don't support --add-root.
+            [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
+            if [ -n "$buildHost" ]; then
+                remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
+                remoteNix="$remoteNixStorePath/bin"
+                if ! buildHostCmd nix-store -r $remoteNixStorePath \
+                  --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
+                    remoteNix=
                     echo "warning: don't know how to get latest Nix" >&2
                 fi
-                # Older version of nix-store -r don't support --add-root.
-                [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
-                if [ -n "$buildHost" ]; then
-                    remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
-                    remoteNix="$remoteNixStorePath/bin"
-                    if ! buildHostCmd nix-store -r $remoteNixStorePath \
-                      --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
-                        remoteNix=
-                        echo "warning: don't know how to get latest Nix" >&2
-                    fi
-                fi
             fi
         fi
     fi

From f278793fdb96e9625b6e02931421de317a61f30f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 6 Mar 2017 03:22:02 +0100
Subject: [PATCH 1795/3449] btsync module: remove redundant example

The default value already gives a good example of what values to
put here.
---
 nixos/modules/services/networking/btsync.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index 572a7387316b..92e9fa7be419 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -208,7 +208,6 @@ in
       storagePath = mkOption {
         type = types.path;
         default = "/var/lib/btsync/";
-        example = "/var/lib/btsync/";
         description = ''
           Where BitTorrent Sync will store it's database files (containing
           things like username info and licenses). Generally, you should not

From 17d80c49fa240b427753f98ba3bc0e4143624a25 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 6 Mar 2017 15:58:21 +0100
Subject: [PATCH 1796/3449] grsecurity: 4.9.13-201702270729 -> 201703052141

---
 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 1f5c07f9b094..fffe524b11f3 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -96,8 +96,8 @@ rec {
 
   grsecurity_testing = grsecPatch
     { kver   = "4.9.13";
-      grrev  = "201702270729";
-      sha512 = "07sbgvksjrvawisq4knjq34022blgg8f14blv22d37siplyamydarsykai5dks5573k61dv9q027jigxyamy50h0fd5ic8qpdp0y30c";
+      grrev  = "201703052141";
+      sha512 = "197n21975ifp2nkpl6d7v3r9fllw2l7pyd2h8cic7dnigy65a5jqx1sxhqryivijx3czf6hj173q999j218ihlg15p6a7aqjhkh90kf";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 4da7f83f4e7958a218b08952d45d642bdf0133a9 Mon Sep 17 00:00:00 2001
From: pngwjpgh <pngwjpgh@users.noreply.github.com>
Date: Mon, 6 Mar 2017 16:12:49 +0100
Subject: [PATCH 1797/3449] nitpick: Init at 1.1 (#23389)

---
 .../version-management/nitpick/default.nix    | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/version-management/nitpick/default.nix

diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix
new file mode 100644
index 000000000000..8fb1095dc581
--- /dev/null
+++ b/pkgs/applications/version-management/nitpick/default.nix
@@ -0,0 +1,41 @@
+{ fetchFromGitHub
+, buildPythonPackage
+, stdenv
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "nitpick";
+  version = "1.1";
+  name = "${pname}-${version}";
+
+  format = "other";
+  disabled = !isPy27;
+  
+  src = fetchFromGitHub {
+    owner = "travisb-ca";
+    repo = pname;
+    rev = version;
+    sha256 = "11gn6nc6ypwivy20bx1r0rm2giblwx6jv485zk875a9pdbcwbrf6";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/src
+    install -m 755 -t $out/share/src nitpick.py
+  
+    mkdir -p $out/bin
+    ln -s $out/share/src/nitpick.py $out/bin/nitpick
+  '';
+
+  meta = {
+    description = "A distributed issue tracker";
+    longDescription = ''
+      Nitpick is a distributed issue tracker. It helps keep track of which nits you
+      should pick. It's intended to be used with source code such that the issues can
+      follow the code via whatever VCS or distribution mechanism.
+    '';
+    homepage = http://travisbrown.ca/projects/nitpick/docs/nitpick.html;
+    license = with stdenv.lib.licenses; gpl2;
+    maintainers = [];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a72d27a4705f..fa5909b6498c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32156,6 +32156,8 @@ EOF
 
   snakeviz = callPackage ../development/python-modules/snakeviz { };
 
+  nitpick = callPackage ../applications/version-management/nitpick { };
+
 });
 
 in fix' (extends overrides packages)

From 064a1e09adb72f2db9edcbdc67ed5c40efd4301c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 6 Mar 2017 17:13:11 +0200
Subject: [PATCH 1798/3449] sbagen: Fix build

---
 pkgs/applications/misc/sbagen/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix
index 495f37de2f40..14680619e0c2 100644
--- a/pkgs/applications/misc/sbagen/default.nix
+++ b/pkgs/applications/misc/sbagen/default.nix
@@ -1,9 +1,16 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "sbagen-1.4.4";
 
-  buildPhases = "buildPhase installPhase";
+  src = fetchurl {
+    url = "http://uazu.net/sbagen/${name}.tgz";
+    sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
+  };
+
+  postPatch = ''
+    patchShebangs ./mk
+  '';
 
   buildPhase = "./mk";
 
@@ -14,14 +21,10 @@ stdenv.mkDerivation {
     cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt
   '';
 
-  src = fetchurl {
-    url = http://uazu.net/sbagen/sbagen-1.4.4.tgz;
-    sha256 = "0w62yk1b0hq79kl0angma897yqa8p1ww0dwydf3zlwav333prkd2";
-  };
-
-  meta = { 
+  meta = {
     description = "Binaural sound generator";
     homepage = http://uazu.net/sbagen;
     license = "GPL";
+    platforms = [ "i686-linux" ];
   };
 }

From 1205b27b2477a6782a1994cbc0b4000d2a6257e5 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 5 Mar 2017 12:38:18 -0300
Subject: [PATCH 1799/3449] wxSVG: init at 1.5.11

---
 pkgs/development/libraries/wxSVG/default.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 +++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/libraries/wxSVG/default.nix

diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix
new file mode 100644
index 000000000000..b991590924db
--- /dev/null
+++ b/pkgs/development/libraries/wxSVG/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl
+, pkgconfig, wxGTK
+, ffmpeg, libexif
+, cairo, pango }:
+
+stdenv.mkDerivation rec {
+
+  name = "wxSVG-${version}";
+  srcName = "wxsvg-${version}";
+  version = "1.5.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2";
+    sha256 = "0m3ff8mjiq4hvy8rmxyc9fkpf24xwxhvr3a6jmvr2q5zc41xhz7x";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ wxGTK ffmpeg libexif ];
+
+  buildInputs = [ cairo pango ];
+
+  meta = with stdenv.lib; {
+    description = "A SVG manipulation library built with wxWidgets";
+    longDescription = ''
+    wxSVG is C++ library to create, manipulate and render
+    Scalable Vector Graphics (SVG) files with the wxWidgets toolkit.
+    '';
+    homepage = http://wxsvg.sourceforge.net/;
+    license = with licenses; gpl2;
+    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 c9b2d6792c1e..3d97cdc28e25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10033,6 +10033,10 @@ with pkgs;
     inherit (darwin.stubs) setfile rez derez;
   };
 
+  wxSVG = callPackage ../development/libraries/wxSVG {
+    wxGTK = wxGTK30;
+  };
+
   wtk = callPackage ../development/libraries/wtk { };
 
   x264 = callPackage ../development/libraries/x264 { };

From 9ef30ce570382411c2365388b3dd80099da6c7fa Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sun, 5 Mar 2017 12:42:31 -0300
Subject: [PATCH 1800/3449] dvdstyler: init at 3.0.3

---
 pkgs/applications/video/dvdstyler/default.nix | 85 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +
 2 files changed, 89 insertions(+)
 create mode 100644 pkgs/applications/video/dvdstyler/default.nix

diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix
new file mode 100644
index 000000000000..e59469c704cb
--- /dev/null
+++ b/pkgs/applications/video/dvdstyler/default.nix
@@ -0,0 +1,85 @@
+{ stdenv, fetchurl, pkgconfig
+, flex, bison, gettext
+, xineUI, wxSVG
+, fontconfig
+, xmlto, docbook5, zip
+, cdrtools, dvdauthor, dvdplusrwtools
+, dvdisasterSupport ? true, dvdisaster ? null
+, thumbnailSupport ? true, libgnomeui ? null
+, udevSupport ? true, libudev ? null
+, dbusSupport ? true, dbus ? null
+, makeWrapper }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "dvdstyler-${version}";
+  srcName = "DVDStyler-${version}";
+  version = "3.0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/dvdstyler/dvdstyler/${version}/${srcName}.tar.bz2";
+    sha256 = "1j432kszmwmsd3nz398h5514dbm5vsrn4rr3iil72ckjj1h3i00q";
+  };
+
+  nativeBuildInputs = 
+  [ pkgconfig ];
+
+  packagesToBinPath =
+  [ cdrtools dvdauthor dvdplusrwtools ];
+
+  buildInputs =
+  [ flex bison gettext xineUI
+    wxSVG fontconfig xmlto
+    docbook5 zip makeWrapper ]
+  ++ packagesToBinPath
+  ++ optionals dvdisasterSupport [ dvdisaster ]
+  ++ optionals udevSupport [ libudev ]
+  ++ optionals dbusSupport [ dbus ]
+  ++ optionals thumbnailSupport [ libgnomeui ];
+
+  binPath = makeBinPath packagesToBinPath;
+
+  postInstall = ''
+    wrapProgram $out/bin/dvdstyler \
+      --prefix PATH ":" "${binPath}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A DVD authoring software";
+    longDescription = ''
+    DVDStyler is a cross-platform free DVD authoring application for the
+    creation of professional-looking DVDs. It allows not only burning of video
+    files on DVD that can be played practically on any standalone DVD player,
+    but also creation of individually designed DVD menus. It is Open Source
+    Software and is completely free.
+
+    Some of its features include:
+    -  create and burn DVD video with interactive menus
+    - design your own DVD menu or select one from the list of ready to use menu
+      templates
+    - create photo slideshow
+    - add multiple subtitle and audio tracks
+    - support of AVI, MOV, MP4, MPEG, OGG, WMV and other file formats
+    - support of MPEG-2, MPEG-4, DivX, Xvid, MP2, MP3, AC-3 and other audio and
+      video formats
+    - support of multi-core processor
+    - use MPEG and VOB files without reencoding
+    - put files with different audio/video format on one DVD (support of
+      titleset)
+    - user-friendly interface with support of drag & drop
+    - flexible menu creation on the basis of scalable vector graphic
+    - import of image file for background
+    - place buttons, text, images and other graphic objects anywhere on the menu
+      screen
+    - change the font/color and other parameters of buttons and graphic objects
+    - scale any button or graphic object
+    - copy any menu object or whole menu
+    - customize navigation using DVD scripting
+    '';
+    homepage = http://www.dvdstyler.org/;
+    license = with licenses; gpl2;
+    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 3d97cdc28e25..78fd1a78662c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13115,6 +13115,10 @@ with pkgs;
 
   dvd-slideshow = callPackage ../applications/video/dvd-slideshow { };
 
+  dvdstyler = callPackage ../applications/video/dvdstyler {
+    inherit (gnome2) libgnomeui;
+  };
+
   dwb-unwrapped = callPackage ../applications/networking/browsers/dwb { dconf = gnome3.dconf; };
   dwb = wrapFirefox dwb-unwrapped { desktopName = "dwb"; };
 

From c1c624f077131a4a9c8992e34464548a3102d23e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 6 Mar 2017 11:47:32 -0500
Subject: [PATCH 1801/3449] nix-buffer: 2.3.0 -> 3.0.0

---
 pkgs/applications/editors/emacs-modes/melpa-generated.nix   | 6 +++---
 .../editors/emacs-modes/melpa-stable-generated.nix          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 2d667e29e361..35a43735643a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -45711,12 +45711,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170305.333";
+        version = "20170305.1601";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "c48d501ec6a1c2d8295190abd1e27ef61867c92b";
-          sha256 = "0q4fhf311c8pz0lwp4lc7i9jxpvdrp2a1b2jgi3g2wv5fcavx5a7";
+          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
+          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 3645e4a098f4..6514d2381888 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -22207,12 +22207,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "2.3.0";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "c48d501ec6a1c2d8295190abd1e27ef61867c92b";
-          sha256 = "0q4fhf311c8pz0lwp4lc7i9jxpvdrp2a1b2jgi3g2wv5fcavx5a7";
+          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
+          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";

From 97c9ed0ba15957c5f9b967d57635b7049f46dae9 Mon Sep 17 00:00:00 2001
From: Alexey Muranov <alexeymuranov@users.noreply.github.com>
Date: Sun, 5 Mar 2017 01:00:02 +0100
Subject: [PATCH 1802/3449] doc: cleanup whitespace in python.md

---
 doc/languages-frameworks/python.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 0c7e521b11ee..effd0b01b2e8 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -576,7 +576,7 @@ specified packages in its path.
 #### python.withPackages function
 
 The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality.
-It takes a function as an argument that is passed the set of python packages and returns the list 
+It takes a function as an argument that is passed the set of python packages and returns the list
 of the packages to be included in the environment. Using the `withPackages` function, the previous
 example for the Pyramid Web Framework environment can be written like this:
 
@@ -584,10 +584,10 @@ example for the Pyramid Web Framework environment can be written like this:
 
     python.withPackages (ps: [ps.pyramid])
 
-`withPackages` passes the correct package set for the specific interpreter version as an 
+`withPackages` passes the correct package set for the specific interpreter version as an
 argument to the function. In the above example, `ps` equals `pythonPackages`.
 But you can also easily switch to using python3:
-    
+
     with import <nixpkgs> {};
 
     python3.withPackages (ps: [ps.pyramid])
@@ -828,7 +828,7 @@ Create this `default.nix` file, together with a `requirements.txt` and simply ex
 with import <nixpkgs> {};
 with pkgs.python27Packages;
 
-stdenv.mkDerivation { 
+stdenv.mkDerivation {
   name = "impurePythonEnv";
   buildInputs = [
     # these packages are required for virtualenv and pip to work:
@@ -836,10 +836,10 @@ stdenv.mkDerivation {
     python27Full
     python27Packages.virtualenv
     python27Packages.pip
-    # the following packages are related to the dependencies of your python 
-    # project. 
-    # In this particular example the python modules listed in the 
-    # requirements.tx require the following packages to be installed locally 
+    # the following packages are related to the dependencies of your python
+    # project.
+    # In this particular example the python modules listed in the
+    # requirements.tx require the following packages to be installed locally
     # in order to compile any binary extensions they may require.
     #
     taglib
@@ -854,7 +854,7 @@ stdenv.mkDerivation {
   shellHook = ''
   # set SOURCE_DATE_EPOCH so that we can use python wheels
   SOURCE_DATE_EPOCH=$(date +%s)
-  virtualenv --no-setuptools venv 
+  virtualenv --no-setuptools venv
   export PATH=$PWD/venv/bin:$PATH
   pip install -r requirements.txt
   '';
@@ -862,7 +862,7 @@ stdenv.mkDerivation {
 ```
 
 Note that the `pip install` is an imperative action. So every time `nix-shell`
-is executed it will attempt to download the python modules listed in 
+is executed it will attempt to download the python modules listed in
 requirements.txt. However these will be cached locally within the `virtualenv`
 folder and not downloaded again.
 

From 34afc31c49b067879c3c49b29c67e2a1bc806685 Mon Sep 17 00:00:00 2001
From: Alexey Muranov <alexeymuranov@users.noreply.github.com>
Date: Sun, 5 Mar 2017 17:16:29 +0100
Subject: [PATCH 1803/3449] doc: fix code highlighting, use valid Nix syntax

Fix code syntax highlighting by specifying language in every code block
and adding some context to Nix code blocks to make them valid
expressions.  Use the same markup style for all code blocks.  Reformat
some code blocks.

fixes #23535
---
 doc/languages-frameworks/python.md | 327 ++++++++++++++++-------------
 1 file changed, 179 insertions(+), 148 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index effd0b01b2e8..87b5668740d1 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -74,7 +74,6 @@ can do is write a simple Nix expression which sets up an environment for you,
 requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy`
 and `toolz`, like before, in an environment. With a `shell.nix` file
 containing
-
 ```nix
 with import <nixpkgs> {};
 
@@ -101,22 +100,25 @@ On Nix all packages are built by functions. The main function in Nix for buildin
 Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
 
 ```nix
-toolz = buildPythonPackage rec{
-  name = "toolz-${version}";
-  version = "0.7.4";
+{ # ...
 
-  src = pkgs.fetchurl{
-    url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-  };
+  toolz = buildPythonPackage rec {
+    name = "toolz-${version}";
+    version = "0.7.4";
 
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
+      sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+    };
+
+    meta = {
+      homepage = "http://github.com/pytoolz/toolz/";
+      description = "List processing tools and functional utilities";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
+    };
   };
-};
+}
 ```
 
 What happens here? The function `buildPythonPackage` is called and as argument
@@ -143,7 +145,7 @@ pkgs.python35Packages.buildPythonPackage rec {
   name = "toolz-${version}";
   version = "0.8.0";
 
-  src = pkgs.fetchurl{
+  src = pkgs.fetchurl {
     url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
     sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
   };
@@ -174,7 +176,7 @@ with import <nixpkgs> {};
       name = "toolz-${version}";
       version = "0.8.0";
 
-      src = pkgs.fetchurl{
+      src = pkgs.fetchurl {
         url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
         sha256 = "e8451af61face57b7c5d09e71c0d27b8005f001ead56e9fdf470417e5cc6d479";
       };
@@ -215,25 +217,28 @@ The following example shows which arguments are given to `buildPythonPackage` in
 order to build [`datashape`](https://github.com/blaze/datashape).
 
 ```nix
-datashape = buildPythonPackage rec {
-  name = "datashape-${version}";
-  version = "0.4.7";
+{ # ...
 
-  src = pkgs.fetchurl {
-    url = "mirror://pypi/D/DataShape/${name}.tar.gz";
-    sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
+  datashape = buildPythonPackage rec {
+    name = "datashape-${version}";
+    version = "0.4.7";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/D/DataShape/${name}.tar.gz";
+      sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
+    };
+
+    buildInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
+
+    meta = {
+      homepage = https://github.com/ContinuumIO/datashape;
+      description = "A data description language";
+      license = licenses.bsd2;
+      maintainers = with maintainers; [ fridh ];
+    };
   };
-
-  buildInputs = with self; [ pytest ];
-  propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
-
-  meta = {
-    homepage = https://github.com/ContinuumIO/datashape;
-    description = "A data description language";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fridh ];
-  };
-};
+}
 ```
 
 We can see several runtime dependencies, `numpy`, `multipledispatch`, and
@@ -247,23 +252,26 @@ Python bindings to `libxml2` and `libxslt`. These libraries are only required
 when building the bindings and are therefore added as `buildInputs`.
 
 ```nix
-lxml = buildPythonPackage rec {
-  name = "lxml-3.4.4";
+{ # ...
 
-  src = pkgs.fetchurl {
-    url = "mirror://pypi/l/lxml/${name}.tar.gz";
-    sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
+  lxml = buildPythonPackage rec {
+    name = "lxml-3.4.4";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/l/lxml/${name}.tar.gz";
+      sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
+    };
+
+    buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
+
+    meta = {
+      description = "Pythonic binding for the libxml2 and libxslt libraries";
+      homepage = http://lxml.de;
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ sjourdois ];
+    };
   };
-
-  buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
-
-  meta = {
-    description = "Pythonic binding for the libxml2 and libxslt libraries";
-    homepage = http://lxml.de;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sjourdois ];
-  };
-};
+}
 ```
 
 In this example `lxml` and Nix are able to work out exactly where the relevant
@@ -277,33 +285,37 @@ find each of them in a different folder, and therefore we have to set `LDFLAGS`
 and `CFLAGS`.
 
 ```nix
-pyfftw = buildPythonPackage rec {
-  name = "pyfftw-${version}";
-  version = "0.9.2";
+{ # ...
 
-  src = pkgs.fetchurl {
-    url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz";
-    sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
+  pyfftw = buildPythonPackage rec {
+    name = "pyfftw-${version}";
+    version = "0.9.2";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pyFFTW/pyFFTW-${version}.tar.gz";
+      sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
+    };
+
+    buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble];
+
+    propagatedBuildInputs = with self; [ numpy scipy ];
+
+    # Tests cannot import pyfftw. pyfftw works fine though.
+    doCheck = false;
+
+    preConfigure = ''
+      export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
+      export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
+    '';
+
+    meta = {
+      description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
+      homepage = http://hgomersall.github.com/pyFFTW/;
+      license = with licenses; [ bsd2 bsd3 ];
+      maintainer = with maintainers; [ fridh ];
+    };
   };
-
-  buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble];
-
-  propagatedBuildInputs = with self; [ numpy scipy ];
-
-  # Tests cannot import pyfftw. pyfftw works fine though.
-  doCheck = false;
-
-  LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
-  CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
-  '';
-
-  meta = {
-    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
-    homepage = http://hgomersall.github.com/pyFFTW/;
-    license = with licenses; [ bsd2 bsd3 ];
-    maintainer = with maintainers; [ fridh ];
-  };
-};
+}
 ```
 Note also the line `doCheck = false;`, we explicitly disabled running the test-suite.
 
@@ -316,10 +328,7 @@ That way, you can run updated code without having to reinstall after each and ev
 Development mode is also available. Let's see how you can use it.
 
 In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using
-
-```nix
-src = ./path/to/source/tree;
-```
+`src = ./path/to/source/tree;`
 
 If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
 is a local source, and if the local source has a `setup.py`, then development
@@ -338,7 +347,7 @@ buildPythonPackage rec {
   name = "mypackage";
   src = ./path/to/package/source;
   propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ];
-};
+}
 ```
 
 It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode.
@@ -371,7 +380,7 @@ buildPythonPackage rec {
   name = "toolz-${version}";
   version = "0.7.4";
 
-  src = pkgs.fetchurl{
+  src = pkgs.fetchurl {
     url = "mirror://pypi/t/toolz/toolz-${version}.tar.gz";
     sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
   };
@@ -382,7 +391,7 @@ buildPythonPackage rec {
     license = licenses.bsd3;
     maintainers = with maintainers; [ fridh ];
   };
-};
+}
 ```
 
 It takes two arguments, `pkgs` and `buildPythonPackage`.
@@ -392,7 +401,10 @@ We now call this function using `callPackage` in the definition of our environme
 with import <nixpkgs> {};
 
 ( let
-    toolz = pkgs.callPackage ~/path/to/toolz/release.nix { pkgs=pkgs; buildPythonPackage=pkgs.python35Packages.buildPythonPackage; };
+    toolz = pkgs.callPackage /path/to/toolz/release.nix {
+      pkgs = pkgs;
+      buildPythonPackage = pkgs.python35Packages.buildPythonPackage;
+    };
   in pkgs.python35.withPackages (ps: [ ps.numpy toolz ])
 ).env
 ```
@@ -474,22 +486,27 @@ The `buildPythonPackage` function is implemented in
 `pkgs/development/interpreters/python/build-python-package.nix`
 
 The following is an example:
+```nix
+{ # ...
 
-    twisted = buildPythonPackage {
-      name = "twisted-8.1.0";
+  twisted = buildPythonPackage {
+    name = "twisted-8.1.0";
 
-      src = pkgs.fetchurl {
-        url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
-        sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
-      };
+    src = pkgs.fetchurl {
+      url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
+      sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
+    };
 
-      propagatedBuildInputs = [ self.ZopeInterface ];
+    propagatedBuildInputs = [ self.ZopeInterface ];
 
-      meta = {
-        homepage = http://twistedmatrix.com/;
-        description = "Twisted, an event-driven networking engine written in Python";
-        license = stdenv.lib.licenses.mit; };
-      };
+    meta = {
+      homepage = http://twistedmatrix.com/;
+      description = "Twisted, an event-driven networking engine written in Python";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+}
+```
 
 The `buildPythonPackage` mainly does four things:
 
@@ -539,29 +556,32 @@ Because with an application we're not interested in multiple version the prefix
 Python environments can be created using the low-level `pkgs.buildEnv` function.
 This example shows how to create an environment that has the Pyramid Web Framework.
 Saving the following as `default.nix`
+```nix
+with import <nixpkgs> {};
 
-    with import <nixpkgs> {};
-
-    python.buildEnv.override {
-      extraLibs = [ pkgs.pythonPackages.pyramid ];
-      ignoreCollisions = true;
-    }
+python.buildEnv.override {
+  extraLibs = [ pkgs.pythonPackages.pyramid ];
+  ignoreCollisions = true;
+}
+```
 
 and running `nix-build` will create
-
-    /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env
+```
+/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env
+```
 
 with wrapped binaries in `bin/`.
 
 You can also use the `env` attribute to create local environments with needed
 packages installed. This is somewhat comparable to `virtualenv`. For example,
 running `nix-shell` with the following `shell.nix`
+```nix
+with import <nixpkgs> {};
 
-    with import <nixpkgs> {};
-
-    (python3.buildEnv.override {
-      extraLibs = with python3Packages; [ numpy requests2 ];
-    }).env
+(python3.buildEnv.override {
+  extraLibs = with python3Packages; [ numpy requests2 ];
+}).env
+```
 
 will drop you into a shell where Python will have the
 specified packages in its path.
@@ -579,27 +599,30 @@ The `python.withPackages` function provides a simpler interface to the `python.b
 It takes a function as an argument that is passed the set of python packages and returns the list
 of the packages to be included in the environment. Using the `withPackages` function, the previous
 example for the Pyramid Web Framework environment can be written like this:
+```nix
+with import <nixpkgs> {};
 
-    with import <nixpkgs> {};
-
-    python.withPackages (ps: [ps.pyramid])
+python.withPackages (ps: [ps.pyramid])
+```
 
 `withPackages` passes the correct package set for the specific interpreter version as an
 argument to the function. In the above example, `ps` equals `pythonPackages`.
 But you can also easily switch to using python3:
+```nix
+with import <nixpkgs> {};
 
-    with import <nixpkgs> {};
-
-    python3.withPackages (ps: [ps.pyramid])
+python3.withPackages (ps: [ps.pyramid])
+```
 
 Now, `ps` is set to `python3Packages`, matching the version of the interpreter.
 
 As `python.withPackages` simply uses `python.buildEnv` under the hood, it also supports the `env`
 attribute. The `shell.nix` file from the previous section can thus be also written like this:
+```nix
+with import <nixpkgs> {};
 
-    with import <nixpkgs> {};
-
-    (python33.withPackages (ps: [ps.numpy ps.requests2])).env
+(python33.withPackages (ps: [ps.numpy ps.requests2])).env
+```
 
 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`.
@@ -613,22 +636,24 @@ install -e . --prefix $TMPDIR/`for the package.
 Warning: `shellPhase` is executed only if `setup.py` exists.
 
 Given a `default.nix`:
+```nix
+with import <nixpkgs> {};
 
-    with import <nixpkgs> {};
+buildPythonPackage { name = "myproject";
 
-    buildPythonPackage { name = "myproject";
+buildInputs = with pkgs.pythonPackages; [ pyramid ];
 
-    buildInputs = with pkgs.pythonPackages; [ pyramid ];
-
-    src = ./.; }
+src = ./.; }
+```
 
 Running `nix-shell` with no arguments should give you
 the environment in which the package would be built with
 `nix-build`.
 
 Shortcut to setup environments with C headers/libraries and python packages:
-
-    $ nix-shell -p pythonPackages.pyramid zlib libjpeg git
+```shell
+nix-shell -p pythonPackages.pyramid zlib libjpeg git
+```
 
 Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
 
@@ -676,7 +701,7 @@ with import <nixpkgs> {};
 pkgs.python35.withPackages (ps: with ps; [ numpy ipython ])
 ```
 and install it in your profile with
-```
+```shell
 nix-env -if build.nix
 ```
 Now you can use the Python interpreter, as well as the extra packages that you added to the environment.
@@ -684,15 +709,19 @@ Now you can use the Python interpreter, as well as the extra packages that you a
 #### Environment defined in `~/.nixpkgs/config.nix`
 
 If you prefer to, you could also add the environment as a package override to the Nixpkgs set.
-```
+```nix
+{ # ...
+
   packageOverrides = pkgs: with pkgs; {
     myEnv = python35.withPackages (ps: with ps; [ numpy ipython ]);
   };
+}
 ```
 and install it in your profile with
-```
+```shell
 nix-env -iA nixpkgs.myEnv
 ```
+
 We're installing using the attribute path and assume the channels is named `nixpkgs`.
 Note that I'm using the attribute path here.
 
@@ -701,9 +730,12 @@ Note that I'm using the attribute path here.
 For the sake of completeness, here's another example how to install the environment system-wide.
 
 ```nix
-environment.systemPackages = with pkgs; [
-  (python35.withPackages(ps: with ps; [ numpy ipython ]))
-];
+{ # ...
+
+  environment.systemPackages = with pkgs; [
+    (python35.withPackages(ps: with ps; [ numpy ipython ]))
+  ];
+}
 ```
 
 ### How to solve circular dependencies?
@@ -740,19 +772,18 @@ All packages in the Python package set will now use the updated `scipy` version.
 ```nix
 with import <nixpkgs> {};
 
-(
-let
-  packageOverrides = self: super: {
-    scipy = super.scipy_0_17;
-  };
-in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze])
+( let
+    packageOverrides = self: super: {
+      scipy = super.scipy_0_17;
+    };
+  in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.blaze])
 ).env
 ```
 The requested package `blaze` depends on `pandas` which itself depends on `scipy`.
 
 If you want the whole of Nixpkgs to use your modifications, then you can use `overlays`
 as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`.
-```
+```nix
 let
   pkgs = import <nixpkgs> {};
   newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: {
@@ -775,32 +806,32 @@ This is because files are included that depend on items in the Nix store which h
 The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels.
 
 Use 1980 as timestamp:
-```
+```shell
 nix-shell --run "SOURCE_DATE_EPOCH=315532800 python3 setup.py bdist_wheel"
 ```
 or the current time:
-```
+```shell
 nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
 ```
 or unset:
-```
+```shell
 nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
 ```
 
 ### `install_data` / `data_files` problems
 
 If you get the following error:
-
-    could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
-    Permission denied
-
-This is a [known bug](https://github.com/pypa/setuptools/issues/130) in setuptools.
+```
+could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
+Permission denied
+```
+This is a [known bug](https://github.com/pypa/setuptools/issues/130) in `setuptools`.
 Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
 As workaround install it as an extra `preInstall` step:
-
-    ${python.interpreter} setup.py install_data --install-dir=$out --root=$out
-    sed -i '/ = data\_files/d' setup.py
-
+```shell
+${python.interpreter} setup.py install_data --install-dir=$out --root=$out
+sed -i '/ = data\_files/d' setup.py
+```
 
 ###  Rationale of non-existent global site-packages
 
@@ -824,7 +855,7 @@ and install python modules through `pip` the traditional way.
 
 Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`.
 
-```
+```nix
 with import <nixpkgs> {};
 with pkgs.python27Packages;
 

From 07bf113bbe79640ad044177751b2da9dc94b70c2 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 21 Feb 2017 21:41:45 +0100
Subject: [PATCH 1804/3449] garden-of-coloured-lights: init at 1.0.9

---
 .../garden-of-coloured-lights/default.nix     | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/garden-of-coloured-lights/default.nix

diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix
new file mode 100644
index 000000000000..b8550b3712e3
--- /dev/null
+++ b/pkgs/games/garden-of-coloured-lights/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, autoconf, automake, allegro }:
+
+stdenv.mkDerivation rec {
+  name = "garden-of-coloured-lights-${version}";
+  version = "1.0.9";
+
+  buildInputs = [ allegro autoconf automake ];
+
+  prePatch = ''
+    noInline='s/inline //'
+    sed -e "$noInline" -i src/stuff.c
+    sed -e "$noInline" -i src/stuff.h
+  '';
+
+  src = fetchurl {
+    url = "mirror://sourceforge/garden/${version}/garden-${version}.tar.gz";
+    sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Old-school vertical shoot-em-up / bullet hell";
+    homepage = http://garden.sourceforge.net/drupal/;
+    maintainers = with maintainers; [ profpatsch ];
+    license = licenses.gpl3;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78fd1a78662c..d1f7876c8dfa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6936,7 +6936,8 @@ with pkgs;
 
   agg = callPackage ../development/libraries/agg { };
 
-  allegro = callPackage ../development/libraries/allegro {};
+  allegro = allegro4;
+  allegro4 = callPackage ../development/libraries/allegro {};
   allegro5 = callPackage ../development/libraries/allegro/5.nix {};
 
   amrnb = callPackage ../development/libraries/amrnb { };
@@ -16392,6 +16393,8 @@ with pkgs;
 
   gambatte = callPackage ../games/gambatte { };
 
+  garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
+
   gav = callPackage ../games/gav { };
 
   gcs = callPackage ../games/gcs { };

From 504dc9de295584debb3d822a44f91ca04489b5e4 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 6 Mar 2017 19:38:05 +0100
Subject: [PATCH 1805/3449] scalafmt: 0.5.7 -> 0.5.8

---
 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 0e8c656fbb8b..c7d26fc79ddb 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.5.7";
+  version = "0.5.8";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "1jg2yhnzlyxg735b6qcj3pgnr5q2i361ql27qmxk977al24v5w8i";
+    sha256 = "0pwmmn5k5wscmpidxpc88yrgm7gkpk9ssdh97lz0fjqln99gwp8r";
   };
 
   unpackPhase = "tar xvzf $src";

From 8cbba14dbe34dd2d7f838e4322976c8350f02b6f Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sat, 4 Mar 2017 12:24:46 -0300
Subject: [PATCH 1806/3449] tome4: 1.4.6 -> 1.4.9

---
 pkgs/games/tome4/default.nix | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix
index b0fd8072566e..f13190abdf70 100644
--- a/pkgs/games/tome4/default.nix
+++ b/pkgs/games/tome4/default.nix
@@ -1,32 +1,43 @@
 {stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.6";
+  version = "1.4.9";
   name = "tome4-${version}";
   src = fetchurl {
     url = "http://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
-    sha256 = "12pi2lw1k6l3p209nnkh4nfv3ppp8kpd6mkh1324c81z6mh6w4wg";
+    sha256 = "0c82m0g1ps64zghgdrp78m6bvfngcb75whhknqiailld7kz1g9xl";
   };
-  buildInputs = [ mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image premake4 ];
-  NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" "-I${SDL2_ttf}/include/SDL2" ];
+  nativeBuildInputs = [ premake4 ];
+  buildInputs = [
+    mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image
+  ];
+  NIX_CFLAGS_COMPILE = [
+    "-I${SDL2_image}/include/SDL2"
+    "-I${SDL2_ttf}/include/SDL2"
+  ];
   preConfigure = ''
-    sed -e "s@/opt/SDL-2.0/include/SDL2@${SDL2}/include/SDL2@g" -e "s@/usr/include/GL@/run/opengl-driver/include@g" -i premake4.lua
+    substituteInPlace premake4.lua \
+      --replace "/opt/SDL-2.0/include/SDL2" "${SDL2.dev}/include/SDL2" \
+      --replace "/usr/include/GL" "/run/opengl-driver/include"
     premake4 gmake
   '';
   makeFlags = [ "config=release" ];
   installPhase = ''
     install -Dm755 t-engine $out/opt/tome4/t-engine
-    echo "cd $out/opt/tome4" >> tome4
-    echo "./t-engine &" >> tome4
+    cat > tome4 <<EOF
+#!/bin/sh
+cd $out/opt/tome4
+./t-engine &
+EOF
     install -Dm755 tome4 $out/bin/tome4
     cp -r bootstrap $out/opt/tome4
     cp -r game $out/opt/tome4
   '';
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://te4.org/";
     description = "Tales of Maj'eyal (rogue-like game)";
-    maintainers = [ stdenv.lib.maintainers.chattered  ];
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.chattered ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
   };
 }

From 37315d65a0c5baa967e08437aa9c9d497355381b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 6 Mar 2017 12:45:38 -0600
Subject: [PATCH 1807/3449] mendeley: 1.16.3 -> 1.17.8, multiple improvements

* don't use bundled qt
* fix link-handler script, autorun as 'normal'
* fix execution on grsec kernels
---
 pkgs/applications/office/mendeley/default.nix | 91 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 83 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 0ae0732da27f..d24c59b87d99 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,6 +1,30 @@
-{ fetchurl, stdenv, dpkg, makeWrapper, which
-, gcc, orc, xorg, qt4, zlib
-, ...}:
+{ fetchurl, stdenv, dpkg, which
+, alsaLib
+, desktop_file_utils
+, dbus
+, libcap
+, fontconfig
+, freetype
+, gcc
+, gconf
+, glib
+, icu
+, libxml2
+, libxslt
+, orc
+, nss
+, nspr
+, qt5
+, sqlite
+, xorg
+, xlibs
+, zlib
+# The provided wrapper does this, but since we don't use it
+# we emulate the behavior.  The downside is that this
+# will leave entries on your system after uninstalling mendeley.
+# (they can be removed by running '$out/bin/install-mendeley-link-handler.sh -u')
+, autorunLinkHandler ? true
+}:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
@@ -12,20 +36,49 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.16.3-stable";
+  shortVersion = "1.17.8-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 "14cxysn1l6s6z8awmqj1glm4146jif0852wiyhjg1dhhh25cvpbv"
-    else "1hdvawj8g4hpj36xy5ys27h1fa76xcdx8apsxa6hpg5xmxvcamqz";
+    then "0j2hi0kd3cjjs47fxdzilc3rh02kzkdhvh70yyv7j8n58lnyjnx7"
+    else "0pi1bis0jmy618c1jn6b61mn666w7546xzicbqv1g6c4l8s3wgm5";
 
   deps = [
+    qt5.qtbase
+    qt5.qtsvg
+    qt5.qtdeclarative
+    qt5.qtwebchannel
+    qt5.qtquickcontrols
+    qt5.qtwebkit
+    qt5.qtwebengine
+    alsaLib
+    dbus
+    freetype
+    fontconfig
     gcc.cc
+    gconf
+    glib
+    icu
+    libcap
+    libxml2
+    libxslt
+    nspr
+    nss
     orc
-    qt4
+    sqlite
     xorg.libX11
+    xlibs.xcbutilkeysyms
+    xorg.libxcb
+    xorg.libXcomposite
+    xorg.libXext
+    xorg.libXrender
+    xorg.libXi
+    xorg.libXcursor
+    xorg.libXtst
+    xorg.libXrandr
+    xorg.xcbutilimage
     zlib
   ];
 
@@ -39,19 +92,33 @@ stdenv.mkDerivation {
     sha256 = sha256;
   };
 
-  buildInputs = [ dpkg makeWrapper which ];
+  nativeBuildInputs = [ qt5.makeQtWrapper ];
+  buildInputs = [ dpkg which ] ++ deps;
 
   unpackPhase = "true";
 
   installPhase = ''
     dpkg-deb -x $src $out
-    mv $out/opt/mendeleydesktop/{bin,lib,plugins,share} $out
+    mv $out/opt/mendeleydesktop/{bin,lib,share} $out
 
     interpreter=$(patchelf --print-interpreter $(readlink -f $(which patchelf)))
-    patchelf --set-interpreter $interpreter $out/bin/mendeleydesktop
+    patchelf --set-interpreter $interpreter \
+             --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \
+             $out/bin/mendeleydesktop
+    paxmark m $out/bin/mendeleydesktop
 
-    librarypath="${stdenv.lib.makeLibraryPath deps}:$out/lib:$out/lib/qt"
-    wrapProgram $out/bin/mendeleydesktop --prefix LD_LIBRARY_PATH : "$librarypath"
+    wrapQtProgram $out/bin/mendeleydesktop \
+      --add-flags "--unix-distro-build" \
+      ${stdenv.lib.optionalString autorunLinkHandler
+      ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''}
+
+    # Remove bundled qt bits
+    rm -rf $out/lib/qt
+    rm $out/bin/qt* $out/bin/Qt*
+
+    # Patch up link handler script
+    wrapProgram $out/bin/install-mendeley-link-handler.sh \
+      --prefix PATH ':' ${stdenv.lib.makeBinPath [ which gconf desktop_file_utils ] }
   '';
 
   dontStrip = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78fd1a78662c..17bff33e4858 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14381,7 +14381,10 @@ with pkgs;
 
   mcomix = callPackage ../applications/graphics/mcomix { };
 
-  mendeley = callPackage ../applications/office/mendeley { };
+  mendeley = callPackage ../applications/office/mendeley {
+    qt5 = qt56;
+    gconf = pkgs.gnome2.GConf;
+  };
 
   mercurial = callPackage ../applications/version-management/mercurial {
     inherit (darwin.apple_sdk.frameworks) ApplicationServices;

From b10fb4624b4d31a495aca99008f26777fb8501ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 6 Mar 2017 20:23:02 +0100
Subject: [PATCH 1808/3449] xapian-ruby: link against correct xapian

---
 pkgs/development/libraries/xapian/default.nix | 41 +++++++++++--------
 .../ruby-modules/gem-config/default.nix       | 10 ++---
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 36b55c59c245..e461ce858cfd 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -1,23 +1,28 @@
 { stdenv, fetchurl, libuuid, zlib }:
 
-stdenv.mkDerivation rec {
-  name = "xapian-${version}";
-  version = "1.4.0";
+let
+  generic = version: sha256: stdenv.mkDerivation rec {
+    name = "xapian-${version}";
 
-  src = fetchurl {
-    url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
-    sha256 = "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  buildInputs = [ libuuid zlib ];
-
-  meta = {
-    description = "Search engine library";
-    homepage = http://xapian.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
-    platforms = stdenv.lib.platforms.unix;
+    src = fetchurl {
+      url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
+      inherit sha256;
+    };
+
+    outputs = [ "out" "doc" ];
+
+    buildInputs = [ libuuid zlib ];
+
+    meta = {
+      description = "Search engine library";
+      homepage = http://xapian.org/;
+      license = stdenv.lib.licenses.gpl2Plus;
+      maintainers = [ stdenv.lib.maintainers.chaoflow ];
+      platforms = stdenv.lib.platforms.unix;
+    };
   };
+in {
+  # used by xapian-ruby
+  xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
+  xapian_1_4_0 = generic "1.4.0" "0xv4da5rmqqzkkkzx2v3jwh5hz5zxhd2b7m8x30fk99a25blyn0h";
 }
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 20dc23979f5a..02fe9f50558e 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -19,7 +19,7 @@
 
 { lib, fetchurl, writeScript, ruby, kerberos, libxml2, libxslt, python, stdenv, which
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
-, pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
+, pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
 , libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc
 }@args:
@@ -89,7 +89,7 @@ in
   msgpack = attrs: {
     buildInputs = [ libmsgpack ];
   };
-  
+
   mysql = attrs: {
     buildInputs = [ mysql.lib zlib openssl ];
   };
@@ -218,7 +218,7 @@ in
         --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
     '';
   };
-  
+
   uuid4r = attrs: {
     buildInputs = [ which libossp_uuid ];
   };
@@ -226,12 +226,12 @@ in
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;
-    buildInputs = [ xapian pkgconfig zlib ];
+    buildInputs = [ xapian_1_2_22 pkgconfig zlib ];
     postPatch = ''
       cp ${./xapian-Rakefile} Rakefile
     '';
     preInstall = ''
-      export XAPIAN_CONFIG=${xapian}/bin/xapian-config
+      export XAPIAN_CONFIG=${xapian_1_2_22}/bin/xapian-config
     '';
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1f7876c8dfa..ae4e43b93506 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10044,7 +10044,9 @@ with pkgs;
 
   x265 = callPackage ../development/libraries/x265 { };
 
-  xapian = callPackage ../development/libraries/xapian { };
+  inherit (callPackage ../development/libraries/xapian { })
+    xapian_1_2_22 xapian_1_4_0;
+  xapian = xapian_1_4_0;
 
   xapian-omega = callPackage ../development/libraries/xapian/tools/omega {
     libmagic = file;

From eba71df6bc2b30cef389a659223590ccc06b7483 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sat, 4 Mar 2017 11:54:27 +0100
Subject: [PATCH 1809/3449] sqlite3_analyzer: 3.8.10.1 -> 3.17.0

fixes #23479
---
 .../libraries/sqlite/sqlite3_analyzer.nix     | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index d3e1a6dc17e7..d450cd21aecd 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,35 +1,27 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.8.10.1";
+  name = "sqlite3_analyzer-3.17.0";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2015/sqlite-src-3081001.zip";
-    sha1 = "6z7w8y69jxr0xwxbhs8z3zf56zfs5x7z";
+    url = "https://www.sqlite.org/2017/sqlite-src-3170000.zip";
+    sha256 = "1hs8nzk2pjr4fhhrwcyqwpa24gd4ndp6f0japykg5wfadgp4nxc6";
   };
 
-  buildInputs = [ unzip tcl ];
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ tcl ];
 
-  # A bug in the latest release of sqlite3 prevents bulding sqlite3_analyzer.
-  # Hopefully this work-around can be removed for future releases.
-  postConfigure = ''
-    substituteInPlace Makefile \
-      --replace '"#define SQLITE_ENABLE_DBSTAT_VTAB"' '"#define SQLITE_ENABLE_DBSTAT_VTAB 1"'
-  '';
-
-  buildPhase = ''
-    make sqlite3_analyzer
-  '';
+  makeFlags = [ "sqlite3_analyzer" ];
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    mv sqlite3_analyzer "$out/bin"
+    install -Dm755 sqlite3_analyzer \
+      "$out/bin/sqlite3_analyzer"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.sqlite.org/;
     description = "A tool that shows statistics about sqlite databases";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ pesterhazy ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ pesterhazy ];
   };
 }

From 6cdff59992bf13149473a65026f6424f0f4e8cf5 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Mon, 6 Mar 2017 21:12:25 +0100
Subject: [PATCH 1810/3449] tldr: 1.2.0 -> 1.3.0 (#23465)

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

diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index 39a7dc25c094..5cf29c5cd428 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tldr-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
-    sha256 = "1dyvmxdxm92bfs5i6cngk8isa65qp6xlpim4yizs5rnm0rynf9kr";
-    rev = "v${version}";
-    repo = "tldr-cpp-client";
     owner = "tldr-pages";
+    repo = "tldr-cpp-client";
+    rev = "v${version}";
+    sha256 = "10ylpiqc06p0qpma72vwksd7hd107s0vlx9c6s9rz4vc3i274lb6";
   };
 
   buildInputs = [ curl clang libzip ];

From f8ad48ea1d83fdae35cbb43e0caafa813f8b4264 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Mon, 6 Mar 2017 21:33:21 +0100
Subject: [PATCH 1811/3449] nixos/tests/leaps.nix: fixed race condition

---
 nixos/tests/leaps.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/leaps.nix b/nixos/tests/leaps.nix
index 3c390e1a1691..6163fed56b6f 100644
--- a/nixos/tests/leaps.nix
+++ b/nixos/tests/leaps.nix
@@ -24,6 +24,7 @@ import ./make-test.nix ({ pkgs,  ... }:
     ''
       startAll;
       $server->waitForOpenPort(6666);
-      $client->succeed("curl http://server:6666/leaps/ | grep -i 'leaps'"); 
+      $client->waitForUnit("network.target");
+      $client->succeed("${pkgs.curl}/bin/curl http://server:6666/leaps/ | grep -i 'leaps'");
     '';
 })

From 46ba5acd822e813418483e7975357c7b5e8586c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 6 Mar 2017 21:34:12 +0100
Subject: [PATCH 1812/3449] dmtcp: 2.3.1 -> 2.5.0

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

diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index fea41affe2c4..e67e54f7b439 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -1,18 +1,24 @@
-{stdenv, fetchurl, perl, python}:
-# Perl and Python required by the test suite.
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
+  version = "2.5.0";
 
-  version = "2.3.1";
-
-  buildInputs = [ perl python ];
-
-  src = fetchurl {
-    url = "mirror://sourceforge/dmtcp/dmtcp-${version}.tar.gz";
-    sha256 = "1f83ae112e102d4fbf69dded0dfaa6daeb60c4c0c569297553785a876e95ba15";
+  src = fetchFromGitHub {
+    owner = "dmtcp";
+    repo = "dmtcp";
+    rev = version;
+    sha256 = "08l774i8yp41j6kmzhj7x13475m5kdfhn678ydpm5cbg4l3dda3c";
   };
 
+  dontDisableStatic = true;
+
+  postPatch = ''
+    substituteInPlace configure \
+      --replace '#define ELF_INTERPRETER "$interp"' \
+                "#define ELF_INTERPRETER \"$(cat $NIX_CC/nix-support/dynamic-linker)\""
+  '';
+
   preConfigure = ''
     substituteInPlace src/dmtcp_coordinator.cpp \
       --replace /bin/bash ${stdenv.shell}

From 9256383bc2ee599794e3703a1f811ecf15ac6d89 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Mon, 6 Mar 2017 21:35:16 +0100
Subject: [PATCH 1813/3449] lftp: 4.7.3 -> 4.7.6

Package update : minor updates and fixes
See http://lftp.tech/news.html
---
 pkgs/tools/networking/lftp/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index d7b7fcb2fdc0..d6ae4a0e5a94 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn, gmp, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.7.3";
+  name = "lftp-${version}";
+  version = "4.7.6";
 
   src = fetchurl {
     urls = [
-      "http://lftp.yar.ru/ftp/${name}.tar.bz2"
+      "https://lftp.tech/ftp/${name}.tar.bz2"
+      "ftp://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "06jmc9x86ga67yyx7655zv96gfv1gdm955a7g4afd3bwf6bzfxac";
+    sha256 = "6b46389e9c2e67af9029a783806facea4c8f0b4d6adca5c1088e948d2fd68ae7";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -18,13 +20,11 @@ stdenv.mkDerivation rec {
     "--with-readline=${readline.dev}"
   ];
 
-  postPatch = ''
-    substituteInPlace src/lftp_rl.c --replace 'history.h' 'readline/history.h'
-  '';
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A file transfer program supporting a number of network protocols";
-    homepage = http://lftp.yar.ru/;
+    homepage = http://lftp.tech/;
     license = licenses.gpl3;
     platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];

From 5ff2a924c6b6323b6392c57a783cb55552ce3dc2 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 6 Mar 2017 15:50:40 -0500
Subject: [PATCH 1814/3449] elpa-packages: 2017-03-06

---
 pkgs/applications/editors/emacs-modes/elpa-generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 5e736392fd29..834d3056e742 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1956,10 +1956,10 @@
     validate = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }:
     elpaBuild {
         pname = "validate";
-        version = "1.0.2";
+        version = "1.0.4";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/validate-1.0.2.el";
-          sha256 = "19xhd9mxkdcisspz5q3bnvf6jjsvmhjjrpw3pq5lgyqbcz8k8dsr";
+          url = "https://elpa.gnu.org/packages/validate-1.0.4.el";
+          sha256 = "0vksssk98hcnz804g62k8kika13argf6p7bx8rf9hwidvzdsv6mi";
         };
         packageRequires = [ cl-lib emacs seq ];
         meta = {

From 192bc411b0d653cd4fc8f8c5b581106f23382bfa Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 6 Mar 2017 15:51:00 -0500
Subject: [PATCH 1815/3449] melpa-stable-packages: 2017-03-06

---
 .../emacs-modes/melpa-stable-generated.nix    | 188 ++++++++++++------
 1 file changed, 125 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 3645e4a098f4..18759a91f5b7 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -527,12 +527,12 @@
     ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.6";
+        version = "1.7.7";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         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.6";
+        version = "1.7.7";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -4164,12 +4164,12 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.8.0pre1";
+        version = "3.8.0pre2";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "84df4a49500e51ac6e2a19a77e385e66234386f7";
-          sha256 = "1kkycphqbz8j3jp70n9vh3lgpb2fxy2461q6x365h8mg5ab4w7x3";
+          rev = "e1adec32b8325fb731da084e99acd6070f5e39bf";
+          sha256 = "08illrxn9jks2z8yj7kczy65k7q3dkifima6j706kz8vjza60ikm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -4794,12 +4794,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "1.7.6";
+        version = "1.7.7";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
-          sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
+          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
+          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -5115,12 +5115,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "edc6d2313b321988fdf780fac229d395e4752702";
-          sha256 = "1gnm9r42nkp349d5ry2bv9in83ikmh5pnrfcw96yigxrzkbajb2s";
+          rev = "a77b914ba99729ef618e9e86543da24a46be315a";
+          sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -8920,12 +8920,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "2.2.0";
+        version = "2.3.0";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "f2daeceb98766914548bf9a3c8206ae64850e395";
-          sha256 = "06j07j0gfg4ahjklxlk7m7w53arpl42ynf1diphqn02jy7ycdlh6";
+          rev = "deb9affaadce11c356df53b6b62ab376ef652d16";
+          sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -9947,12 +9947,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "2.3.3";
+        version = "3.0.1";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "01a98a20c536a575ee5bc897f38116155154d5fe";
-          sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl";
+          rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d";
+          sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -10343,6 +10343,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    exiftool = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "exiftool";
+        version = "0.2";
+        src = fetchgit {
+          url = "https://git.systemreboot.net/exiftool.el/";
+          rev = "799076ae62d96e9d502f1189217b04ffdda2dc1a";
+          sha256 = "0yfa6w0518179v8hzzwrs6swrc1ak1nkyy0a7lkryrw310107j5n";
+        };
+        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-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "expand-region";
@@ -10430,12 +10450,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "e0ca54afdec6eeaf275fa5130a90ed77b0b72277";
-          sha256 = "1m64clhwcwwry76imqcwbsz1bm8blpqynzmpqwcsmhsjqp0yb620";
+          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
+          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -10980,6 +11000,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    melpaBuild {
+        pname = "flow-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "an-sh";
+          repo = "flow-mode";
+          rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
+          sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
+          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
+          name = "flow-mode";
+        };
+        packageRequires = [ emacs web-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flow-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flx";
@@ -13992,12 +14033,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "0.12.1";
+        version = "0.13.0";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "6103db21b38cbdfda3100fed08b988fc2d83aa1a";
-          sha256 = "0hlqrqi1s94cr828qyfbr95np5xwr3bn98l4gv59rnqa1vmx49gy";
+          rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16";
+          sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -14259,8 +14300,8 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "c7e2817461c3";
-          sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg";
+          rev = "5383fff2996b";
+          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -14924,12 +14965,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "2.5.2";
+        version = "2.5.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7d7c16f10103aeee591daf46b143d23efdf3a825";
-          sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l";
+          rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
+          sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -15218,12 +15259,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "2.5.2";
+        version = "2.5.3";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7d7c16f10103aeee591daf46b143d23efdf3a825";
-          sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l";
+          rev = "a7d4308604ae790ff568730f8a2f47e578209d3a";
+          sha256 = "10xjdq8ch68c2ysfynrby9sxms23b5g2vmhjv8gv0vn15cc50ir5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -19926,12 +19967,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "0.7";
+        version = "0.7.1";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3";
-          sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7";
+          rev = "6409991053350ab2d3def61749b92780dd1ed095";
+          sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -20843,12 +20884,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.6.5";
+        version = "0.6.6";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8";
-          sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna";
+          rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9";
+          sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -22207,12 +22248,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "2.3.0";
+        version = "3.0.0";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "c48d501ec6a1c2d8295190abd1e27ef61867c92b";
-          sha256 = "0q4fhf311c8pz0lwp4lc7i9jxpvdrp2a1b2jgi3g2wv5fcavx5a7";
+          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
+          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -22351,11 +22392,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.23.7";
+        version = "0.24pre0";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "770d00a8955b2ad8be9daf2923e31221c4847043";
-          sha256 = "1919kj6k8avkgji6r9ngd2a2qj8xpnjiwjx4brcvwrgkbryffq21";
+          rev = "990f8cd03203c7a19cef4e3edbec823cc99fa701";
+          sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -26266,12 +26307,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.13.0";
+        version = "0.13.1";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366";
-          sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7";
+          rev = "038c7f9724f684c7862e108150e256a00ff9c5c6";
+          sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -27253,12 +27294,12 @@
     rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rdf-prefix";
-        version = "1.6";
+        version = "1.7";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4";
-          sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv";
+          rev = "d7e61535aaf89e643673b27c79b4a84ddb530288";
+          sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -28447,6 +28488,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sayid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sayid";
+        version = "0.0.13";
+        src = fetchFromGitHub {
+          owner = "bpiel";
+          repo = "sayid";
+          rev = "01bf777cb15a4f236bc44842712e9ca82fed7f55";
+          sha256 = "0lh4mmdm5vizr08lyz2jc131991dqmyx29n8njgpxa1vjzqd08az";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
+          sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs";
+          name = "sayid";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/sayid";
+          license = lib.licenses.free;
+        };
+      }) {};
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
@@ -28823,22 +28885,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "0.63";
+        version = "0.64";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "4531d234ca471ed80458252cba0ed005a0720b27";
-          sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
+          rev = "4a3a9d093ad1add792bba764c601aa28de302b34";
+          sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/shell-pop";
           license = lib.licenses.free;
@@ -33950,12 +34012,12 @@
     yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yafolding";
-        version = "0.3.1";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "zenozeng";
           repo = "yafolding.el";
-          rev = "f0cc030ddd7ab53fbdf3cdb8b157d8cbcd6a08bd";
-          sha256 = "0xwa490bl59bk0lpga6kag8gif9ln0g4hp42hryhjv5spvgzlsb8";
+          rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7";
+          sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding";
@@ -34120,8 +34182,8 @@
         version = "1.78";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "bf2497be3ec5";
-          sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs";
+          rev = "7bf780961390";
+          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";

From cc5bb40c1c0eb8e5b21e4b0fd303d29ead3e67c2 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 6 Mar 2017 16:17:24 -0500
Subject: [PATCH 1816/3449] melpa-packages: 2017-03-06

---
 .../editors/emacs-modes/melpa-generated.nix   | 1078 ++++++++++-------
 1 file changed, 664 insertions(+), 414 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 2d667e29e361..92159833e9c4 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -380,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
-          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
+          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
+          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
         };
         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 = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
+          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
         };
         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 = "20170209.2128";
+        version = "20170304.704";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
+          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
         };
         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 = "20161201.1001";
+        version = "20170215.348";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "8324b88d54970059b0f8dd4695e38db6223d39f7";
-          sha256 = "18jw8y2d9xjcacgv9k32579khjlg9mha23sia7m12paamjpjbm9p";
+          rev = "5959b48e94493738ead6fc91f18e70155962ffba";
+          sha256 = "06kk8j7yq60cir4llgqdsyj4d94261danyw36idqx9papa4da3id";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent";
@@ -2273,8 +2273,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "4e7e13bedb3900ff8f8843bd3111c17a9381ce7b";
-          sha256 = "0brk9218racdkbmqdqslmpwiynch89c9j0lk0w5xix9s03gqsg6q";
+          rev = "6f062a3bd00f7af651a21532d43900c22523e596";
+          sha256 = "1vhf8qnknxvxkk44yyhp04kfmf0vrf41ycpgrj7p7la3k1anyvg6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2407,6 +2407,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    apiwrap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apiwrap";
+        version = "20170302.1825";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "apiwrap.el";
+          rev = "2a14eab0c66b7c8ae4c8767ebcca1a82e325773c";
+          sha256 = "1rxkzcl1clp794c017d19dpm085njmz7hlvn3sqgsw06wkczd0pl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
+          sha256 = "0n50n1n5pvcgcp1gmna3ci36pnbanjdbjpgv7zyarlb80hywbiyw";
+          name = "apiwrap";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/apiwrap";
+          license = lib.licenses.free;
+        };
+      }) {};
     apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apples-mode";
@@ -3593,12 +3614,12 @@
     autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "autobookmarks";
-        version = "20160930.1113";
+        version = "20170303.1213";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "autobookmarks";
-          rev = "067c29cd6088c019578df8530356c126eef9ea2c";
-          sha256 = "0iqcl1y1lnfma95lhdyy1zkkn8xlp2hin2wb0gbmkcrlfy0cw364";
+          rev = "62a1bbf904d075e7786fe1de2df86c5088a4be2d";
+          sha256 = "156wbir32fvkwfvamp5yfw9gkz8j0cs2shgx406mhv7prcr6cnhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks";
@@ -4260,22 +4281,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    basic-c-compile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    basic-c-compile = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "basic-c-compile";
-        version = "20161114.2134";
+        version = "20170302.312";
         src = fetchFromGitHub {
           owner = "nick96";
           repo = "basic-c-compile";
-          rev = "ccdbb2fcb605e285ca39c1781ab1e583e90f7558";
-          sha256 = "03hsg0n2hvsqiziblpjal9saiyhcizldn9bkpk3cqh2bipg1fjys";
+          rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23";
+          sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile";
           sha256 = "07p35wg426ap0awgk4vg5n36s5jbfs3fi5djl8jq93jr6xs9imbc";
           name = "basic-c-compile";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib f ];
         meta = {
           homepage = "https://melpa.org/#/basic-c-compile";
           license = lib.licenses.free;
@@ -5236,6 +5257,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, s, simple-httpd }:
+    melpaBuild {
+        pname = "blog-minimal";
+        version = "20170304.1548";
+        src = fetchFromGitHub {
+          owner = "thiefuniverse";
+          repo = "blog-minimal";
+          rev = "a3454f1358a8add2969f221c4e56d3bc17ee4baa";
+          sha256 = "0g7n9g4hnaar5basv26c1p00kdkn3vsbsxzby2bi1590grkgjycq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/56217a33b0669a782621dd65d83419ae371ed60a/recipes/blog-minimal";
+          sha256 = "1qj25b6n3slvmbqvzfd37v4xmy1vvz37686jdr29bw5qk4prgxff";
+          name = "blog-minimal";
+        };
+        packageRequires = [ ht mustache s simple-httpd ];
+        meta = {
+          homepage = "https://melpa.org/#/blog-minimal";
+          license = lib.licenses.free;
+        };
+      }) {};
     bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bm";
@@ -5593,12 +5635,12 @@
     browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "browse-at-remote";
-        version = "20161207.2252";
+        version = "20170302.2236";
         src = fetchFromGitHub {
           owner = "rmuslimov";
           repo = "browse-at-remote";
-          rev = "396f6ca23e3a6d12cd3af4651d8130a5baf10e2b";
-          sha256 = "0d4lhaqwralv790ry6g84q0nk243dkaybf1nynr8kp0njhdif6k1";
+          rev = "6de3e242e7b11ee2cb942547ac01823fada52605";
+          sha256 = "09c4hsg02bmws65z4396j1yavx96785l6h3yl6s91qgx4byq9l17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/203e177f09eac4ebb8c7e3532bd82f749f8e2607/recipes/browse-at-remote";
@@ -6741,8 +6783,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
-          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
+          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
+          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6783,8 +6825,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
-          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
+          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
+          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -6970,8 +7012,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "4a880501207d066a865f929b605bf113753ffd62";
-          sha256 = "1h4db9g4ph6v6fz02hmby823rfr57rxafxynlhlwf4cfmimmdfcj";
+          rev = "5d48e64b00bd6d9ceef9f80ce27be6b8df76415d";
+          sha256 = "0zzk009qjdc92svann593l7w3qajna29nv92qwsp4hav9zjgq07w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7010,7 +7052,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12019";
+          rev = "12036";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7591,12 +7633,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170228.2202";
+        version = "20170306.1";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "5d32b960739162b75c044be0175b9564e7b8293e";
-          sha256 = "0mih9dqk6ydqksa5jgjjcqiz6gnrwzp024mda0csibdf9snxb4a8";
+          rev = "52e69c102f2e6438196e223483a388115809bbc1";
+          sha256 = "0cr9clqni9yy5kxspy9nn9llzpqaa3x1d5q4fnlg7qncv6jyfyqb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7780,12 +7822,12 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20170225.344";
+        version = "20170304.419";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
-          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+          rev = "9d68903018f255838b51c734015be74bbdbf539c";
+          sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe";
@@ -7867,7 +7909,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "296613";
+          rev = "297038";
           sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
@@ -8253,12 +8295,12 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20170225.2308";
+        version = "20170303.2310";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682";
-          sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357";
+          rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
+          sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode";
@@ -8274,12 +8316,12 @@
     clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "20160307.414";
+        version = "20170303.2310";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "2f7387830185aeaab3650c1299ad3bb5c3ad2682";
-          sha256 = "0xk6f4176gql7c15xqwfcsm2sdhvn86ka1mr5s13chw5rnf3d357";
+          rev = "4dcd7bc95f056ea61b0d1b16c5b03e1a6681b709";
+          sha256 = "0z27hgd3jc3lnhv2j3gc5inwlwmqidw7js41ciwawjma59bhv1ka";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking";
@@ -8509,8 +8551,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "e9cfe63dfca48688064b56777508ab20c5f2aed4";
-          sha256 = "180npd4nb2qc2bp1xk0qqpvqm4glskf3xczlmhh8wb03dpn5fzsi";
+          rev = "add3b1ee4f798fe667b53a521eb18a623e64f0e0";
+          sha256 = "0k0przix6iyfqc9flphsgbzbz09r2lbmw45667zbimpd91k4a29f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8632,8 +8674,8 @@
         src = fetchFromGitHub {
           owner = "CoatiSoftware";
           repo = "emacs-coati";
-          rev = "c5943d556ab44949b8d4cf295e7c4e8a665bb18a";
-          sha256 = "15vks08bnrz3q2z5f7h69l8fka7k5p3r03ciah9nh3c11d3ldw36";
+          rev = "f06eee92cb43b0dfd6dcf758ae05ac021a184f1c";
+          sha256 = "1l36pjapcsgc6sph6scgpc4zl5qfwf17ppyjznchkh4ykj13ghj3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f28144401803d86bafdc9c5b60bcb3ada0bab/recipes/coati";
@@ -9449,12 +9491,12 @@
     company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }:
     melpaBuild {
         pname = "company-dcd";
-        version = "20161020.430";
+        version = "20161114.2306";
         src = fetchFromGitHub {
           owner = "tsukimizake";
           repo = "company-dcd";
-          rev = "24c5c56efee1e850ae851a87e8345313a2388ef4";
-          sha256 = "1mcr6rbmkk5yh1icgfhq1qfcvpmrwimqcp7f8k8dmyk99lpkmx6f";
+          rev = "4161374fd0da40bbebb6f6e01f1589625708d8ef";
+          sha256 = "0pi0363s8ww6xz7drgxi195jcanvmx1g4wv4zrpdl9dx8cf166bs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd";
@@ -9544,8 +9586,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
-          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
+          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
+          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9687,12 +9729,12 @@
     company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "company-go";
-        version = "20161006.1616";
+        version = "20170303.909";
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b";
-          sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0";
+          rev = "d09cef6327ed848a446636a857cd851dc7e63d19";
+          sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9897,12 +9939,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20170214.45";
+        version = "20170306.659";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "dd04c95ed8a0b5787cb4bf536797cb14aff9991b";
-          sha256 = "1yg01ba5c7cv9dvmz5sd797wf46a1ylj57dr4k5i0jjz2y1mb8z6";
+          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
+          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10218,12 +10260,12 @@
     composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, seq }:
     melpaBuild {
         pname = "composer";
-        version = "20170127.1745";
+        version = "20170304.1647";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "composer.el";
-          rev = "00b00cc48dec28ef4f993ad7044cd79f44b4cbd6";
-          sha256 = "16vv7s3g4in3zl5yl2iqgcmfmay64gk6z8mc7pb199alk7m0dlyq";
+          rev = "43e50a5e626bedb3c46c875ac765daf615f18ce9";
+          sha256 = "0vfr9v60dgynjfz1kpx4c17mhsfbyi9g68jzvjkw7y95pwqv8f0y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer";
@@ -10427,12 +10469,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "20170208.1921";
+        version = "20170303.1916";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "22239b22b63393222143857825098b03c53a1044";
-          sha256 = "1r4f04ca4w60qqrc5s7ic69ah3z63ygc1xagxqbp85wavq7vk8rc";
+          rev = "a77b914ba99729ef618e9e86543da24a46be315a";
+          sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10536,8 +10578,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10595,12 +10637,12 @@
     counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-gtags";
-        version = "20170223.509";
+        version = "20170305.600";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-counsel-gtags";
-          rev = "2e9dd1ab3127819c6950a0bfd90c7c9894e37512";
-          sha256 = "0896m45nmjw4nkibj3cz1clwq5pr7f5f2fsi84g5xhv5f97pgajp";
+          rev = "9d9061ece327a315ad9161e4fcc20c83638ccd10";
+          sha256 = "04h3hn1rs9i7cgdg393v12vqrm862bgiw64hyck7978d1w6n3a1b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
@@ -11572,8 +11614,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "25cf792f735e8e7e06e2e4821d1ad21679c27f59";
-          sha256 = "0v7mk33nr64d4a705d8ljfccj47wkih5qfizbk53r5dr7f3wzbqc";
+          rev = "56a44bf2944107cfdb178a90c14a6e8092471359";
+          sha256 = "1jg3bhm2ksa4ask2n8q80afpa027430gz5w7vq4iwqw5ij8cx4v8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12177,12 +12219,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170227.412";
+        version = "20170304.120";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "b5075a46bbf52969b3d6f71f3fb941e5f5ff6c0c";
-          sha256 = "129w66a4xmjdvysnwpnnins3a0ddlcs9k1lp6djd7i7l8p7zivij";
+          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
+          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12343,12 +12385,12 @@
     dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dedukti-mode";
-        version = "20170206.514";
+        version = "20170225.722";
         src = fetchFromGitHub {
           owner = "rafoo";
           repo = "dedukti-mode";
-          rev = "6f5513a1dd7ff5d76da2402287a58f55f8891efa";
-          sha256 = "1vxbringd99w6mraq4d3b2k4rh5ldc4wvxjvg1z95xawhznv3v0r";
+          rev = "49d7a83d3e966e0913e3969000701d4159dfab2f";
+          sha256 = "0ryibbpq4qpj35lnczy1q4ldja782dzza5b48b7vy8a3x77yv07p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode";
@@ -14601,12 +14643,12 @@
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "20170210.830";
+        version = "20170303.1415";
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "0b865af179768c24a1f7135c2866eca0f65b9295";
-          sha256 = "114kxmki4hmrckxflkzgrl8i6n9qc1jdvma5assbvmhnfqmy4hvm";
+          rev = "5db3f961644ea611682eab843a960eb3177ace48";
+          sha256 = "0rrxvvspz2l8byhnl052x59yd0yx7aajnc9b41846ng83kyb8dlm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14810,7 +14852,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1784923";
+          rev = "1785720";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -15474,12 +15516,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170116.1335";
+        version = "20170305.1130";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "3b5ce79b5ed80f9ce7ca1fa10f0c314516300d6b";
-          sha256 = "1gxsixg2rp09myqrcq7plk84bhhd8aaz68a09xfsbdia41q3vaa7";
+          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
+          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15709,8 +15751,8 @@
         src = fetchFromGitHub {
           owner = "xendk";
           repo = "ede-php-autoload-drupal";
-          rev = "b32b0f309e24969022d194035b9afc7675c22aca";
-          sha256 = "1yydbrcydh712w6v5qg7pzpfqlgchsniq0fw6psmlichn8cfmsjv";
+          rev = "2989b39067d5b556abb2977e52f1f0775fff3bbc";
+          sha256 = "0j9nz2w3mg895nvfqnmxhl41xr6ijfrpqrf044mrz5h97hgk3g7w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal";
@@ -16054,8 +16096,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "5bf34ba5f71e993ea9ae0971240d5e0e975f1377";
-          sha256 = "0wk5p4qr0a9mkwrayfcc6rshzjsg7dnwvlp5aj4rpfmlliy4qmfb";
+          rev = "8b9bfc404818038b8dd93dd4d39f3b820f8fcd52";
+          sha256 = "0y6k54vz9r6b81aif9ags130wgk2v00yq6rv2l4nzswsifxy2r07";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16241,8 +16283,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "6b707565b7328d8bcb8898db1a5b9dffaa06cdf8";
-          sha256 = "02qvxpg3pnw6crr13isimbhxyk6lf0x216418bhilgvgzmp1jwmj";
+          rev = "e2b412ef6b6a6b6443314575609f730fce766e9b";
+          sha256 = "0hzx6g62sa7lqkgsq1bavq8b73ji4994n31lr8afzgdx885xw6kw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16300,12 +16342,12 @@
     el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-mock";
-        version = "20170114.2257";
+        version = "20170305.2325";
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "el-mock.el";
-          rev = "5fb2867d2e0350dda047a903ce60d264f78ef424";
-          sha256 = "0fdnvsdnkc9xlxch3zavq7ya463g7m7xsc60ymx7a4350zl2vwyn";
+          rev = "9e4d0921791cd04917613d8e3d06342ead129777";
+          sha256 = "1wkbhgyisj4kix0s4dkg72jylghqckmnyzk2brlrkvhz12zmhva3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock";
@@ -16588,12 +16630,12 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20170102.307";
+        version = "20170304.453";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "1670a0d8e4a09b48da312afc57d35e0cf7033b5f";
-          sha256 = "0cm1zg2hgwzwwkri0wsb6x9jhgma6vm9jga81jjiasih33nd0zy4";
+          rev = "57c00c08257794562e8b328adb7707c4aefe37a0";
+          sha256 = "1gymbxdw8z2sfh3k2apg197r7k0l37pxzj761lc5jps3wy4d6w1g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -16672,12 +16714,12 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20170125.1905";
+        version = "20170305.1633";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1";
-          sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9";
+          rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
+          sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed";
@@ -16746,8 +16788,8 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "89332e78917c58fe09c792f32f72ffda1f4bb0c1";
-          sha256 = "03ilkyj4bl9j9yan7n6gdablxd4441j92hg6arqwypqsrfn9k4r9";
+          rev = "5028a4f75cc5e7d7e9134ed32a9f5bc4b6809b32";
+          sha256 = "1glj6s8hpas5ph9bg85rq6fq6n4nzq84di27sa2nbv7qpjwq4fcj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web";
@@ -16994,12 +17036,12 @@
     elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elmacro";
-        version = "20161004.5";
+        version = "20170304.705";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "d9703c73ca37fa07f6cea003efcb0974db1f7776";
-          sha256 = "0rc97dpdb2y418msw1z1nry6swffqdi4q806f4klfv1qr6rn2vwd";
+          rev = "fad4cee572cb4dbe670be8eb19f10646d02be854";
+          sha256 = "0zmg56gvq1hhhzzcx0d08r8ii56bn96ifaby6r6bgr6b094c2i59";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -17183,12 +17225,12 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20170224.702";
+        version = "20170303.621";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "72f06e3e7f5010ff794e0db73950b33bcdfb2e72";
-          sha256 = "0xbd5gq0pp6zn1rjkn3p44cvrg0xkyd8y8a41nnvgy5h1pjaqk0s";
+          rev = "2c8792e6e379c565e8dbfb5d3486988ab49c6b4e";
+          sha256 = "1zrr7gmfpxjk0psvi3gf87qxf8nzh29n92f5f14xb75kjn2ji9l6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy";
@@ -17208,6 +17250,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elquery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elquery";
+        version = "20170226.1238";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "elquery";
+          rev = "bfda1499d11b5705bea60886a3d25ca6d3808111";
+          sha256 = "1q0ifhq7wflzayg9mqy0wfc1fhgh4fmy17psz977k01yc7nc5s42";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/121f7d2091b83143402b44542db12e8f78275103/recipes/elquery";
+          sha256 = "19yik9w4kcj7i9d3bwwdszznwcrh75hxd0540iqk5by861z5f3zr";
+          name = "elquery";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/elquery";
+          license = lib.licenses.free;
+        };
+      }) {};
     elscreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elscreen";
@@ -17756,11 +17819,11 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20170226.1429";
+        version = "20170301.1406";
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
-          rev = "0b0bdd12eb97797d3c481de70871d64f42672a58";
-          sha256 = "1lvq4kc0sj5wrdjfyiarmz644ws36r7vp06jk4b11g5csk07lrc2";
+          rev = "6601ba8ef710b8ed260773e18a3baa940a7adc3a";
+          sha256 = "1fzbzyvm98128dr01rldlabqkz9mag1z1qys36v2h6cfax1xjv9i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms";
@@ -18363,12 +18426,12 @@
     epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epkg";
-        version = "20170205.616";
+        version = "20170301.856";
         src = fetchFromGitHub {
           owner = "emacscollective";
           repo = "epkg";
-          rev = "521026f777543b73bee6107aab089f44fb809c91";
-          sha256 = "0k2vxhr9rjkya95wca4v2qihbs72yx9zv1z7snm0wgfy39y385fh";
+          rev = "deb9affaadce11c356df53b6b62ab376ef652d16";
+          sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@@ -18887,12 +18950,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20170209.52";
+        version = "20170303.248";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a76345ae86f97c6c07569499a8f49c199a386444";
-          sha256 = "1d8f3g5d6rjrlyzi77vx1c69lm8wx0h894zrw9y8nkp9mvydf1v3";
+          rev = "3300b3059d13cd204f553f0c7d46d784adc5a8ab";
+          sha256 = "1717hpj71kq9bgfwp30z8k2pns6n23vh3mybfsn6iz8wz424428x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19370,8 +19433,8 @@
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "eslintd-fix";
-          rev = "37f14a715d1909c9db271c435a3c0b234f131175";
-          sha256 = "1kp9f3l2fnjw6sffxc5n439326kg00gfdhlvach9jpiy9dhkarpj";
+          rev = "9c1f697c95b16f623c24bbb9c63257068d834977";
+          sha256 = "0ddpr9brxigc22mzq4nc5x499bpkqq3xx28ygjcmc0z7kb03d0rk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
@@ -19843,12 +19906,12 @@
     evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20170219.629";
+        version = "20170306.334";
         src = fetchFromGitHub {
           owner = "emacs-evil";
           repo = "evil";
-          rev = "5d040cdf9769f484448385715103d0e48efb1425";
-          sha256 = "0d8cfnch23s80nymbjls4xsqj8ib89mrpi6ln185xh9jzscjfra1";
+          rev = "56e92f7cb4e04e665670460093b41f58446b7a2b";
+          sha256 = "0063x3v849h57bf4pqf3k2kiqrjj0sjw5y9w9lr0q0v33mn8q145";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil";
@@ -20305,12 +20368,12 @@
     evil-lispy = callPackage ({ evil, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild }:
     melpaBuild {
         pname = "evil-lispy";
-        version = "20160522.1106";
+        version = "20170304.259";
         src = fetchFromGitHub {
           owner = "sp3ctum";
           repo = "evil-lispy";
-          rev = "af670bf37068d94e4f9c0bcb5019d4c11dbf4143";
-          sha256 = "1ylj4mblill964ffbkg8mqy8gxhr8krjgnl9gzp8icr0izb9hj14";
+          rev = "040a7ee130c2403a1d6dac591b94b202bb48e186";
+          sha256 = "008jar578yxa70nd69z4ldmknfmm1jar3wx71n3y2gnyghr759k1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/377d43f3717b8e17c3adce886aaf3e579383ec64/recipes/evil-lispy";
@@ -20473,12 +20536,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20170222.259";
+        version = "20170305.1847";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "8b5830a003ea4b1262621d822b9a45a0948bee22";
-          sha256 = "11djm4qjj7h4iv661f55zpvlc3010ngj43rw5jgaii9mlrsfa6d2";
+          rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d";
+          sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21082,12 +21145,12 @@
     exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "exec-path-from-shell";
-        version = "20170212.2116";
+        version = "20170304.1309";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "9def990ba4c30409a316d5cbf7b02296a394dece";
-          sha256 = "1ghivxwslvsbcimhhacbl07kxc1kfv7gn95fwsdx687p9qyffyfb";
+          rev = "c6eedaf916f763a68cbb7fdaf9c7af568546d4b9";
+          sha256 = "1r8053w782054dygpjpahjns5v0qf4drjisg5131qjkd9nvwyc0k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell";
@@ -21100,6 +21163,26 @@
           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 = "ff6f30a005444269b985bbc28963c85ebcdaa835";
+          sha256 = "078xpnjqndlcaidzgdcvryqsrd5vpi2ckvlb6ihcym68611zqy7g";
+        };
+        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";
@@ -21311,12 +21394,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170228.815";
+        version = "20170306.534";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "4872561241cf67b679290fe91e5783dd9cba8d72";
-          sha256 = "0ca36s17bhpzmsgl65q7c8fhadca0zpw6dh58vychrv4k7757gav";
+          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
+          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22605,6 +22688,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    melpaBuild {
+        pname = "flow-mode";
+        version = "20170303.1146";
+        src = fetchFromGitHub {
+          owner = "an-sh";
+          repo = "flow-mode";
+          rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
+          sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
+          sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
+          name = "flow-mode";
+        };
+        packageRequires = [ emacs web-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/flow-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fluxus-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
     melpaBuild {
         pname = "fluxus-mode";
@@ -24978,12 +25082,12 @@
     fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fontawesome";
-        version = "20170226.2039";
+        version = "20170305.556";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-fontawesome";
-          rev = "c0ec46b7d7d9d194a09b572c55980f32a08c29a1";
-          sha256 = "10dszqwb8sxhka4dv0xkd1pkd566z006xhq9d75qz29v3b7krbnp";
+          rev = "a743f80bfd53767ca9ee32da34c5ca032172a480";
+          sha256 = "1mkyd2bbyd9avw2qaidkzkpv8i7lfiv9189bj49dxklg92823sip";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome";
@@ -25485,8 +25589,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "890be490748f1b8cdd79919e169600f5e8c0e8d7";
-          sha256 = "0ygn4kvv8ypr55db0jgpqx0z2gynsn53wqgca4pjb1cbxqbkwi0g";
+          rev = "d60970c0a5de8cb16eba55fe71441e9de35d6299";
+          sha256 = "0bhw69yh1jxlyny5w5dxpvd3r6s0rnp54il2q32dark22s75w72x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25565,12 +25669,12 @@
     function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "function-args";
-        version = "20160731.320";
+        version = "20170303.515";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "12930e157f70b89f344f3314cca8f9f5c6820bad";
-          sha256 = "1hz40k4pwgjdhddx0cvh8c04gmhgihx9lmynp353m00h58x37gm9";
+          rev = "a559041e5fed851c889bcfed7553a4dcd855ffae";
+          sha256 = "0cc9djbsr3i5w9zsiblk1f9y45czkiwjmn32kzf3fni4rxwvc8xk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args";
@@ -25611,8 +25715,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "2da9d1fc29dd9aaf2381ada1d5eeda4bed0a26cd";
-          sha256 = "16c00vikjdq3hd8wv54y8nf7yj84311n9m06v4iwn8smh94ydzg3";
+          rev = "430317e5b2ea5005851ce7f03564aa8f8dba61c6";
+          sha256 = "0zsg5q1370fqswq5cysfc4lg74hyjxn5yjpqzyl9mwlips90y42l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26128,8 +26232,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "53df9d228fb0bd1e89b74c9e86f773abd697540d";
-          sha256 = "0rcw0wjql50qs5mi0m1516nsmhh0pj9xy0clr23fx2dxlflbhwr0";
+          rev = "fdd8ffb39098e38c0179dd647f05b846012f10a2";
+          sha256 = "1niq9vwdgyw0bwwcfbmkzs9z59adx0ly1ana8rjb7r39ii1am6ah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -26422,8 +26526,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
-          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
+          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
+          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -26586,12 +26690,12 @@
     git-link = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-link";
-        version = "20170228.1957";
+        version = "20170301.1618";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "git-link";
-          rev = "891cfbcb4ea3a7d05b49495b4b01ce9ce417b9bb";
-          sha256 = "18fxg5vr5m782np8957mk3c8d00z793k1qzpays5lv1v8ijkhzj2";
+          rev = "8d43732a753bcea8a7777b03755c17a0f45094d2";
+          sha256 = "1p439cwrxkcf36qfv93j8h2xyynynysr9ch9w662mhm7k7fgwc65";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link";
@@ -27258,12 +27362,12 @@
     gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-desktop-notify";
-        version = "20170208.546";
+        version = "20170305.1215";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "gnus-desktop-notify.el";
-          rev = "8fd980c4a4ba18085ec87a2f0c71875c5d01087f";
-          sha256 = "00zh5v24pxkfg240z6c5y9ngsn6rnvmxphiilf84bxxpwn030brk";
+          rev = "7d80d5e1894859e963584c55f570508fdf9c2ee0";
+          sha256 = "1slj86f8c4pkl30xkv43vqwijd49nxya1bmhb8mqadncp3wapwr0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify";
@@ -27385,8 +27489,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9d5d0279192075babb0e01a8346dcc1aa7f8e29b";
-          sha256 = "1155r4rky7h53l2mdaxrfrarsbvnwik1qbr79rrwsdl96nkclpd0";
+          rev = "d09cef6327ed848a446636a857cd851dc7e63d19";
+          sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -27465,12 +27569,12 @@
     go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "20170211.721";
+        version = "20170305.627";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "f9c6e25419c2d13f3841050ba66610a7ac728f49";
-          sha256 = "033md85r3y5gxvw458l125d0jxc3k8yfn5im22zi64rrbwlwkifx";
+          rev = "cbbd2ea1e94a36004432a9ac61414cb5a95a39bd";
+          sha256 = "1029qg6ida3cw4ynxll6ykpnqkpbrbrx12nnzcplhc25vqpz7hik";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ce1190db06cc214746215dd27648eded5fe5140/recipes/go-eldoc";
@@ -27633,12 +27737,12 @@
     go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "go-projectile";
-        version = "20170104.1730";
+        version = "20170302.1705";
         src = fetchFromGitHub {
           owner = "dougm";
           repo = "go-projectile";
-          rev = "46e937a88cbfd9715706fbc319672bb3297cc579";
-          sha256 = "17q23d29q0kw2vqcf8psjvhiqnk4ynpbbflcy35kihilwvrsx2l5";
+          rev = "4c449eae696d4e3a15078c336c98ea779da227ab";
+          sha256 = "1cyvd2va0vgbh7im5rhapyd66ql469cl2hswg946qj961kdxc7s9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile";
@@ -27931,8 +28035,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "594d91bfbb8dfcbcac0f148af8175f2b7ec9857b";
-          sha256 = "14g48ml7qfj2kyw5id0gmfigkw5k3xbr7fm55wrh2m3v1hq3cnfi";
+          rev = "15f2836d9fea3835d541d4d327ccf053d4052822";
+          sha256 = "1yrd7v75pcpb658m53ysgai3ak5nvrm7bf7hzhga3rgm20hhsc16";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style";
@@ -28074,12 +28178,12 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20161017.204";
+        version = "20170303.13";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "2ae187078beb5d9672ca14cb636b6b4021de4230";
-          sha256 = "1pq9zjfs7gp7bz3jq11fx75m4zcx9p772lja5jicz535khpgxw7f";
+          rev = "a057deb08b41e37d767805ffeb024eee30f9faca";
+          sha256 = "07s75y01mrs7m2xmvg764yhivczycynaa31paz8h2pz65sb0qdhd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/gotest";
@@ -28095,12 +28199,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20170219.2338";
+        version = "20170305.942";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "d9b00bd93ab3fed0e7fff99b0dc8773584f5207d";
-          sha256 = "0vrz97w9yzkxl8pc9jmxkxvj5nagpnzqq9pvavwmvlh68wrh58gi";
+          rev = "aca1bdd18997759bd4d3618c9591cc38774ac16a";
+          sha256 = "1g59mwb1l8bvc66gsq8lprbrfbs238lp280k3xqda6z7dbrh9vq9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -28176,12 +28280,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170227.1257";
+        version = "20170302.1450";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "f4a3ffe52df6113f08a3c68e473ab6ff7dad28cf";
-          sha256 = "001fh4z65f75s22rchdkffv71jwwfcfsc3sclcf3h77cj66h9ma0";
+          rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16";
+          sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28306,8 +28410,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
-          sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
+          rev = "48f64589005d79f64beef367fc9a83afb6e26b1e";
+          sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -28482,11 +28586,11 @@
     grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grass-mode";
-        version = "20161130.732";
+        version = "20170303.854";
         src = fetchhg {
           url = "https://bitbucket.com/tws/grass-mode.el";
-          rev = "c7e2817461c3";
-          sha256 = "095v1l46axada3vnhp1ypim6b789y39jlyy5466im02fjfjkcadg";
+          rev = "5383fff2996b";
+          sha256 = "1igbdrs14dmaa5mbhq3jnrkq16nndingflpnwxi921dag613c3jz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/grass-mode";
@@ -28686,12 +28790,12 @@
     groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "groovy-mode";
-        version = "20161015.114";
+        version = "20170305.813";
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "5dc1e6a43727b8170f828b48fbbc52aad152de46";
-          sha256 = "0lp54fnz1v1pppbs9zjv9q292jri3padphriqz313hslyvb0mv09";
+          rev = "48f64589005d79f64beef367fc9a83afb6e26b1e";
+          sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -29626,12 +29730,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170228.412";
+        version = "20170304.206";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0";
-          sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431";
+          rev = "5d4d74c9ad506c33263df8a561289b621eda1546";
+          sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30193,12 +30297,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170301.12";
+        version = "20170301.2122";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "38649eedb5031cc10c330c7849a7d4035f9a96f0";
-          sha256 = "1x17i5i0habcac00rkp4wxmflgvcqqmz0ribbpvbsr8q122sk431";
+          rev = "5d4d74c9ad506c33263df8a561289b621eda1546";
+          sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30484,6 +30588,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ext";
+        version = "20170304.910";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "helm-ext";
+          rev = "1546dbbfaac7729435226b4a7426c9e67032482a";
+          sha256 = "1a7kjibc2r26wxc2c12bymjxdx965blm39qfgcvmqy6if0bp6w7h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
+          sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw";
+          name = "helm-ext";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-filesets";
@@ -32170,8 +32295,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "adfd03eeee3d8c3393695646cb8f37d729dd87c4";
-          sha256 = "1ram4fqzmrqs04vxjapl4hddazb9489c9jal1xa6m8644hg5jpqa";
+          rev = "65e1f3ab12caa206402fad381cc75c7e844f9452";
+          sha256 = "0j07hrdws0n9s51a5z7b0q1lzivvmrpn0crsg5rwnm9jwa1a6vws";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -32492,10 +32617,10 @@
       }) {};
     hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "hexrgb";
-        version = "20170223.738";
+        version = "20170304.1213";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/hexrgb.el";
-          sha256 = "0aijifwk7z9sl7wyl3qw649y2k8nk9qsv7dfaca0k42idh6ihswl";
+          sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb";
@@ -33118,8 +33243,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "cd3d3241c7dbd88a0505fb005d4072965c1bfe1f";
-          sha256 = "144arwryhp464v8k1w12v87mf70bq372dc4pxvl2giqssmaq7jms";
+          rev = "c2ac3e3ce57c834525dc8ec5ca87d5e8d728b69b";
+          sha256 = "1zhggfmhk57v2yj6w9z8mrq8yjsdjg7nzljz1jwbk03jkf7zvwr8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33441,12 +33566,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170227.1018";
+        version = "20170302.711";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "c9d602b8d4947db2b759ecfe0a8b7bf81acec3bb";
-          sha256 = "14c1alab62y2d5qwzhp48dhcilwklph7597rgkpqniccd41b8wav";
+          rev = "0e65583a7821e60882b8ce7934b1f1c34d4d1874";
+          sha256 = "12r0jxcipfbs77yr2svs60x1b52l6lyjgjax3kxaizjdjaxxwsdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -33982,12 +34107,12 @@
     hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hyai";
-        version = "20160319.1835";
+        version = "20170301.647";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "hyai";
-          rev = "85df4feb527ee65f0b0228832ecfcc452fe572fd";
-          sha256 = "05fhbs4ifa40s8fp6bhccm0kdd5laq1g8r8rvyjbq9f7mj0s9g87";
+          rev = "e9a7e945fed12d8e664e898cf8b434b0376d5d80";
+          sha256 = "1sbn4h74crawdy8yjdjklxh1q6js5y9ip5qxf6dfi85h82qizpa8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1dd9bd1cfd2f3b760b664a4677b0e4e617cbdfa6/recipes/hyai";
@@ -34231,10 +34356,10 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20170217.1048";
+        version = "20170303.1455";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icicles.el";
-          sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x";
+          sha256 = "00zsdahszs919zvklxgpm5kqhm2139cdr4acchgp9ppnyljs94jp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles";
@@ -34249,10 +34374,10 @@
       }) {};
     icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icomplete-plus";
-        version = "20170101.1028";
+        version = "20170303.1456";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/icomplete+.el";
-          sha256 = "0r2s3vwqs31pj7jfya8l46ij1jc894bar4pk4i9zk2l69d7pwllr";
+          sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+";
@@ -35123,10 +35248,10 @@
       }) {};
     imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "imenu-plus";
-        version = "20170101.1029";
+        version = "20170303.1457";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/imenu+.el";
-          sha256 = "039s81faqg5y3vhl9hlwn5qffdghshn6867pp8nf93f6zhj9mxr0";
+          sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+";
@@ -35414,12 +35539,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20161121.314";
+        version = "20170305.900";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "117d8cb2564bca1248bd71eaec8b97ff1d94668d";
-          sha256 = "0wdajff7p1d1ziac6immc11jx9c4ivkj6npnjx80cyjnacj7byn4";
+          rev = "2e1dd6c1e1540223f8cc4e3493c1e555144d5431";
+          sha256 = "0flfp8313xxw8c3wip0fqqz33n7gfn3fhppsrpz7wlxiqymsb20d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -35560,10 +35685,10 @@
       }) {};
     info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "info-plus";
-        version = "20170227.1101";
+        version = "20170303.1500";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/info+.el";
-          sha256 = "1nh8l0ah2gqg3p8lg9z7zf2fzbzalrbrjkqgn30l48rkk58bmf4b";
+          sha256 = "0xpgry9bzjwmdj0j0pcsr2a37gp8yqbcpl06linv0hjxcwca9nsz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+";
@@ -35914,12 +36039,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170228.441";
+        version = "20170302.2354";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "e1c2c47e4ca6219c76b0ab3ee41dda27d3126d4a";
-          sha256 = "026i5wrg7gs9h9nw79fzmi0q9w9hrjbrl1h26569la15fqjvfs22";
+          rev = "693e13fd3f19c05e906c234c692d77ac48d69fdc";
+          sha256 = "18xj5m6qglh4w903vcdxmw1sms51ansrai43sndcp6z4sbi02xpb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36246,10 +36371,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20170207.2149";
+        version = "20170303.1503";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "1h2pn8qvxpnn2y0h54fijgqb47l047hq5g2n42x0nmiky2hjqras";
+          sha256 = "0nkyav1fw3n16alb5b90cqb3bbmr7i74rc90bpd22hkm25wcvqbj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+";
@@ -36264,10 +36389,10 @@
       }) {};
     isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-prop";
-        version = "20170101.1034";
+        version = "20170303.1504";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/isearch-prop.el";
-          sha256 = "0n83qikh3mlnd3f9qwcsflg5x10sxvs9fkidyyv79jr673x4ljpv";
+          sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop";
@@ -36476,8 +36601,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36556,12 +36681,12 @@
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
-        version = "20161213.439";
+        version = "20170302.1033";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -37142,12 +37267,12 @@
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20170227.1420";
+        version = "20170303.1035";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "3c5959de68117f5ebc622ba0a79caf7116c5b863";
-          sha256 = "09bmk1dw6h4cidrmfn6nmzj6lrfk39phngc11v7h0cwvxcbq6kpl";
+          rev = "6eb6132f44bf87e52d5ed74c4bb3869c0d5f66a8";
+          sha256 = "023yhdp4pdfm1fi4y09v925l8f1d8206z41kk1hv90zy034b94hk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6dd4bd78795ec7509d8744fec1e80426ce0557ec/recipes/jbeans-theme";
@@ -37184,12 +37309,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170217.22";
+        version = "20170303.1253";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "41c15d11fa0ed3f84c8a18aecf391c4a87e3ac56";
-          sha256 = "1c51sy5951hz3zyhs1w9r365qsw2amppf87141gsyl688vjrbn2s";
+          rev = "481b040c227e60c645094d0ec193a53adac7b09a";
+          sha256 = "0qbiqjr2nkmvf1m874mdfwsszzcv32rfdvrp7bs62fw9q95wcrhb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -38248,12 +38373,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170226.839";
+        version = "20170304.2103";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "697d437510ff38c22913f232a051a3620be68db5";
-          sha256 = "0c9l7pdklk8l7qfi6xvmmbj2cjaj2dwzfgzvblh0dc4hv32g4r9v";
+          rev = "5995aa56c9ccbb3eb78c49daba1e77a6aed354b0";
+          sha256 = "0aqmd5hkqphwv74n6y5yidhn21hl2hlnmfdm7m8wkwhcylylq6xi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -38753,8 +38878,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "b449bae54e4508f42f28cf1cba20e3ad849b1210";
-          sha256 = "1vr65dcyjisq61nq90qpxww0spz558ny7l2yis3hk9qg4zic58ky";
+          rev = "ca9eb0bbb8e9a4b5b6e2b177b2b36ab024495587";
+          sha256 = "0kzh5q1dj7mqdjcp1di0lm8imxjlp1ak8licidfy0lz4h4fcqsch";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -38893,6 +39018,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    korean-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "korean-holidays";
+        version = "20170228.2045";
+        src = fetchFromGitHub {
+          owner = "tttuuu888";
+          repo = "korean-holidays";
+          rev = "aed79c24e3f91d8f9508367758b18e5fa3a9eaf4";
+          sha256 = "1kqbxnjmp7hxjcv8zhy9v8v6220l9vd7rgqicjln4yrjz82z4579";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9453d96fb963973ff53884d31e060f1e98004acb/recipes/korean-holidays";
+          sha256 = "1w8mhhc05i1b6s9vvpk73zkk5x2kxxh3aax61p54mbkhn0a5zb8r";
+          name = "korean-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/korean-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
     kosmos-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kosmos-theme";
@@ -40004,12 +40150,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170214.123";
+        version = "20170302.1031";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "cb94346e9cd1fdf70cb872acc7e10f8bf6f3e1ed";
-          sha256 = "08sakrwaz0dcwl8zhqkkanajhnc94vy9qagcdmax52w708kyrspr";
+          rev = "8794864744151b808c0f966b29c33c547be96d89";
+          sha256 = "0ii8092148a5mi59ssnl9hxzjx861vpb6ajma4anpzfjlv9wjjq7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40404,8 +40550,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "8d23745f59b90c6229cb58fb65ef8cf2725826ea";
-          sha256 = "184ir75pald2g3fkyhnrgff58n617fxj7q5qwjqcn759r59qhxma";
+          rev = "c7849f87280d549f3829a2c2fe4cd911c421a0db";
+          sha256 = "1anp1avlzl7xf2zhj9b8ixhwxmvprbiis7nmdnh9nq1xkpfjlmxm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40630,12 +40776,12 @@
     logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "logview";
-        version = "20170226.1206";
+        version = "20170303.1225";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "logview";
-          rev = "a62d03d9437949154633ffec7b9ac61ae27fc5d3";
-          sha256 = "0i51hnk3ara85izfbjhyf69c0s8cn2mi641w48h71kwns6ysnpa7";
+          rev = "6409991053350ab2d3def61749b92780dd1ed095";
+          sha256 = "0phhkg3qgh4q4b7as0a00zx7kcrlmh24by1sjbp7b4dsd0mnz22k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview";
@@ -40774,12 +40920,12 @@
     lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170222.747";
+        version = "20170302.1127";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "81e58d62c5f480a876a06f67427150233c5c9d14";
-          sha256 = "0m0ly7ysp1wvy50jv4cykjgskd1wjm1sfqjpf75rhij6fq6cb87r";
+          rev = "03f1bd56317557c398851757893522f25908cc7f";
+          sha256 = "1xmmh4a23naa7ipd673q52hv31wmi1j20sh5kcgw14r3pqymd8dh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
@@ -40813,6 +40959,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    luarocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "luarocks";
+        version = "20170226.1430";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "luarocks.el";
+          rev = "29fb50ec6ec1943b54b5a4810c3249bccee249ce";
+          sha256 = "19ailxb0jlvkl5ljvbpddd1862j8x9vf767lfrby89s09fjxwfcp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d5abd2b52a071ab206d40057dc85c891183204ea/recipes/luarocks";
+          sha256 = "05srrk9gmv1vhq7m5bjhh2hl2siis04j15b31x0sgknxh3ybr33x";
+          name = "luarocks";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/luarocks";
+          license = lib.licenses.free;
+        };
+      }) {};
     lush-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "lush-theme";
@@ -41065,12 +41232,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170228.1717";
+        version = "20170306.44";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
-          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
+          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
+          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41244,8 +41411,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "1093e5b41a8c665b5026ebdec22874f9220926cd";
-          sha256 = "0ii6sjxywg2v2xwba2vwfrsby37ad4fh0qg2svjra7njmh5qqwa7";
+          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
+          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41492,12 +41659,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20170225.1000";
+        version = "20170304.348";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "2df57246b6cf32b3af2d44ddd16b4a711eb49abd";
-          sha256 = "091lh50gf7xd2l737qb9mypbfabrjy7f0ry4d3rcb8ar2sqj58gd";
+          rev = "af83a1be2bb800ebee4ab378f167075537eeb7ec";
+          sha256 = "1zbjaixbrhs39fmf58mxqmwlby531gfxzn2s8s10rm0m6sswbzii";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -41678,15 +41845,36 @@
           license = lib.licenses.free;
         };
       }) {};
+    mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mandm-theme";
+        version = "20170304.1401";
+        src = fetchFromGitHub {
+          owner = "choppsv1";
+          repo = "emacs-mandm-theme";
+          rev = "cd1505c8bcff0a3de821f0b419f897f4b0378b01";
+          sha256 = "1spj3mlydwnngccrny27p8s3m75n039hipqvzqskdg7p1hvr6m59";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/216a33a3acecb226c6b638a9e30ec4c741779a29/recipes/mandm-theme";
+          sha256 = "1qhxzhv63hk81dff6w06cghir856ck6wn1zba6736qn4phbka7ja";
+          name = "mandm-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/mandm-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170210.2253";
+        version = "20170301.1511";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "578d87183d2a759811a5d1eab4dc9c74513e557c";
-          sha256 = "02zgc56s1wl7a27vrgycfgsy0fd6xbsbhgnpy6rrq5iyrb6a6wnc";
+          rev = "b360948acf5a31b6cf6f0113ab5f30bc47f6b098";
+          sha256 = "016h6mq0650fw8ix1zh1j15i782g0bpmlsnsznzi5aspy8b391kn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -42313,12 +42501,12 @@
     mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mbsync";
-        version = "20170213.357";
+        version = "20170303.206";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "mbsync-el";
-          rev = "a1fbd1a350e7da5cf4da09ded0443bfee826a45a";
-          sha256 = "0a52s9pvh83hdj05rg04na6pnr4dra256h64bgdvf65703yfbs8k";
+          rev = "8e34a059445b70a18ee5546921385d1636aeda09";
+          sha256 = "1w1kjpi2gnhmvkay71q2rkc92bcibdrdjx8r7p979sds5pgaq332";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync";
@@ -42397,12 +42585,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170226.2008";
+        version = "20170228.1746";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "d2abacb50a95a6eab0afadf829ab7a6ef15d67f8";
-          sha256 = "0j1wx7x6v7b4x2ibhhcs9gc994d5a5ynlxjh9v0xi6hfxmpqinna";
+          rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9";
+          sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -45400,8 +45588,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "07683fa4850bba450d7853aacd181c44a9b57ea8";
-          sha256 = "1571sp3abdwzny3zph1alyam0a0vvi4h97g017r8bm2rj16r01fi";
+          rev = "883bca8693d0d289c19ea62d55e5fbaa93e721ce";
+          sha256 = "0mr9x0fkza7l1427ib4cwab77vva2aghr7279rzh2hq0wlkzc5zj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -45666,6 +45854,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    nikola = callPackage ({ async, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nikola";
+        version = "20170301.1148";
+        src = fetchgit {
+          url = "https://git.daemons.cf/drymer/nikola.el/";
+          rev = "6752cc70b08889ff5184ac111616863f1881d357";
+          sha256 = "0cwn05q0fj6xddfc5qimryvqi5l68sqyxvw638vzmrpnzl6dfc9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/89354d06dddc3be4b952e3f0b86d11824064dd97/recipes/nikola";
+          sha256 = "1i6z4gkh52fr9s506dqr3ccczank7c8zr0q1bg8ik5gbna0jv705";
+          name = "nikola";
+        };
+        packageRequires = [ async emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/nikola";
+          license = lib.licenses.free;
+        };
+      }) {};
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
@@ -45711,12 +45919,12 @@
     nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-buffer";
-        version = "20170305.333";
+        version = "20170305.1601";
         src = fetchFromGitHub {
           owner = "shlevy";
           repo = "nix-buffer";
-          rev = "c48d501ec6a1c2d8295190abd1e27ef61867c92b";
-          sha256 = "0q4fhf311c8pz0lwp4lc7i9jxpvdrp2a1b2jgi3g2wv5fcavx5a7";
+          rev = "89d30002eddcc33c5c74dcc871a97aee0228d403";
+          sha256 = "0pz1p8mdk988x4k41qi3j8rf6g33gj6lx4dm9sgfyzgzi9ixyma8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer";
@@ -45736,8 +45944,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "07808052461e9534dc42f7f98e83a7b58565fd13";
-          sha256 = "0ss34q1xmwbg5sswf3yfhi6h3pxpfbr3yvvcsz7w24brfd0zllkh";
+          rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
+          sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46023,11 +46231,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170226.355";
+        version = "20170304.1716";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "508b5c20fa38b17fa527af075857061f4ed81e2a";
-          sha256 = "0bjb539mqmjq9s2ks8pvq0ync9b19af48kx60vwgg4k0c7n03sab";
+          rev = "91524d5d6cafbab1c1d6bc5a75b02c4d86689e3b";
+          sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -46585,12 +46793,12 @@
     ob-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ob-go";
-        version = "20160711.1606";
+        version = "20170302.849";
         src = fetchFromGitHub {
           owner = "pope";
           repo = "ob-go";
-          rev = "8240e61e859323e097694af22bada2983a5f2727";
-          sha256 = "10yngyyrv1q1arwdlj7wvjl2487vsx5hpqsji8wjs72yl0qd86rr";
+          rev = "f4e9c1afebe4b8a2d89bdf012ac533a2544cdf4e";
+          sha256 = "05yz1kf1jszns4psf065gq18c5y12xlyg2zcqqbw5zjkvbgsgnh1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3afb687d6d3d1e52336ca9a7343278a9f37c3d54/recipes/ob-go";
@@ -46606,12 +46814,12 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20170218.503";
+        version = "20170304.2215";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "f5c12bc3447baed9bfb03a627dadace975969b7f";
-          sha256 = "1qzb2h4acmbljixnky3sksd1sjfnpcknf4z6zjm89lz8nrjldx5a";
+          rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44";
+          sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http";
@@ -48670,8 +48878,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee";
-          sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743";
+          rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b";
+          sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48690,8 +48898,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "9d1355504288206c04d24d9e5d8522db7c3f6eee";
-          sha256 = "1n8lichn659kqk8hxffnxmm30lys2hr6fi7zrzhvzmsczw5lc743";
+          rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b";
+          sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48812,12 +49020,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170206.1845";
+        version = "20170305.1948";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "c2f54f310e0f50b5ca291a45356717e932505bb5";
-          sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi";
+          rev = "493e9ac843eb44efd8a6f486a7cfa727d575f3af";
+          sha256 = "1amviznfqjb3z09bzv11yy2ickka43z7ffzjlbgk9wy066944p8l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -48842,11 +49050,11 @@
     org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170129.1041";
+        version = "20170302.2113";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "02aab579be3f";
-          sha256 = "0yb8zkq6iizpkp331wg6l9ksvy1z88pq3g12ya7ral992yn5yb8z";
+          rev = "690b6d4e1b83";
+          sha256 = "0smla8pxnqdzgfhxhs6hsqv8par5xcvfcww857i691gya6scslnb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
@@ -49077,12 +49285,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170228.1517";
+        version = "20170306.638";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "4977d1d519cfb9cfcdb1f72010097188de5766c8";
-          sha256 = "17nxsa5yzkawnff1ibfn21qwd3w5awvky0ywjdwh3mm2jg3r7sfz";
+          rev = "1cf25da328ecfeac402aaa38dc3f50af8f462264";
+          sha256 = "17bw03c22khqxf8b5hmf4f0l2s7qbmjkkw6m3xvs30k5snq1wk8x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -50204,8 +50412,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "6a642cdc7e98cc8f0e80474ac7172cea4f8889f3";
-          sha256 = "11304vs5wvi0p5v3yvqn463ablm4cc5zk6xli37m08yd8ifgh2q9";
+          rev = "af3d973d90b779d93153f751c746f9ede85972dd";
+          sha256 = "0468if164skl0rwnk36ld3kjcmiqmj59jijgfw5w9mpd8j4mvwf0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50221,12 +50429,12 @@
     ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-gfm";
-        version = "20170104.249";
+        version = "20170304.1504";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "ox-gfm";
-          rev = "cd01aa0970e8836718731cb096a2c4c030423bd6";
-          sha256 = "1n825l86738qkqgmnhg84z52vp4csvr1ql2i1n1nc1pvyykb9kva";
+          rev = "47c466b660ec184af70589df1c3a26d90241cd1c";
+          sha256 = "0jwk7nrdc09mrmwc6myyhlnqq4fap15s8spbzl78zsw3kf89n4vs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm";
@@ -50704,12 +50912,12 @@
     package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-lint";
-        version = "20170219.2318";
+        version = "20170305.2112";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "package-lint";
-          rev = "9f8f808244f00666d335810757b2f366309a4d53";
-          sha256 = "1af8izvx5fqk0w71yyg9hqxmj7cxqnrrnsc7h4zdjakimdss6rhw";
+          rev = "4448466c8fe6f2dc049e076ac10cdc3ba31472fb";
+          sha256 = "0fsj7fq2qgvaz76jdxcgrh08q3fnbl4afbsm44mcldfj7fjn1klk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint";
@@ -51062,8 +51270,8 @@
         src = fetchFromGitHub {
           owner = "atgreen";
           repo = "paperless";
-          rev = "abf43ed368c909dfeeab1faa5b91763976945b81";
-          sha256 = "0qlwbwym4575kxxssi9y2g60ai9k5pccbjp963rkwsnabczg0lxg";
+          rev = "4e8c5d147db5c8ef0a3914e95b4030b28d29c6bb";
+          sha256 = "1lnxbn6mwbpfsn8qf8rdn1v7f00jjsk0h1bn4syvzik37x51f2hh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/921ba9059183a57e08f9c79af2b28bb77a210508/recipes/paperless";
@@ -51395,8 +51603,8 @@
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "20081b546f371dcaee9ea2769f46e513bb39c275";
-          sha256 = "1d650s6nid8aidq0ypc7jb6sdbxb6255qr5sb1hvc5gx1ycyl6vs";
+          rev = "6c7425b16895c6925c4f1ec875dac4576574b34c";
+          sha256 = "1i4g5qhsp426jkxn4z1kps4cnb97lsrbfd2yk7x456v7dkrd6fn8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -52124,12 +52332,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170209.658";
+        version = "20170302.712";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "cd1ecbddf42542a3f5e161c954439c6dba70f53c";
-          sha256 = "0q3lhppwr0515qq6l08ypxffpp4jf3y2v1giyxwpmfcnbiwxicnc";
+          rev = "5e440fb287897b97a0d13fc150df60b6860e4481";
+          sha256 = "1ff1h80hmkm3b1qj4y3hjzmmzcwp14qr8ankmi0qxymsz5z2jar8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -52754,12 +52962,12 @@
     picpocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "picpocket";
-        version = "20170219.420";
+        version = "20170305.259";
         src = fetchFromGitHub {
           owner = "johanclaesson";
           repo = "picpocket";
-          rev = "e483b1a5661871bcd9dfffbf24fe388db82e839d";
-          sha256 = "1l9wxhs459ygmm40g8w2wpy6yyv4kkbmc20saf0gl7fkf14vgmf5";
+          rev = "3404de0e6ed1b46f3b873472e34ea9342445f43e";
+          sha256 = "044p26x76i5x0921f8b8zl51k0wfkygdwdiwyhqmmnxzb54qj74l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e88dc89311d4bfe82dc15f22b84c4b76abb3fd69/recipes/picpocket";
@@ -53584,12 +53792,12 @@
     poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "poporg";
-        version = "20150603.1847";
+        version = "20170303.526";
         src = fetchFromGitHub {
           owner = "QBobWatson";
           repo = "poporg";
-          rev = "d4d8b3e6206b0af4044d1dcecfc0bd2193704e07";
-          sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
+          rev = "ba2f7f4c8662164c5e6f89aa2923484d6f1df8ed";
+          sha256 = "04z2p4f5mdnc8jms6z360f3qv6ngpbyp7b88ybvw67kjkg9jn821";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/63502ec265a66d3f72ef93a2f6e7c2e517ff98a3/recipes/poporg";
@@ -54209,8 +54417,8 @@
         src = fetchFromGitHub {
           owner = "rejeep";
           repo = "prodigy.el";
-          rev = "e53e1ba0d8c5081b4671f4292b164e919d0fdb2b";
-          sha256 = "18xbql40myis77lyjiqq3kdsp0961iwf4rcg3c9i5w49chw3ql85";
+          rev = "50a5d4e0c720e73ef0919cf8019a32d934e86616";
+          sha256 = "1a9cbzfchbiv7kafmim1mbx38y2iscibbgg6i0aq3200b30mxk57";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy";
@@ -54496,12 +54704,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170115.731";
+        version = "20170301.1407";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366";
-          sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7";
+          rev = "038c7f9724f684c7862e108150e256a00ff9c5c6";
+          sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -54794,8 +55002,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "5274d6ee314a237f6626b5b4633c9f87574ad46d";
-          sha256 = "0rjxp15xnj8hd39z6nzjdxypj7fgi6rpmfcbjmx5xqah4gbcbpnc";
+          rev = "0c0a8879c3dd7ee6925746d2206f3262689b5833";
+          sha256 = "1np5vkyzp5fjjzj8x3b55pj7mvanqsff726maj77mnixcs11vj7f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -55491,12 +55699,12 @@
     pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
     melpaBuild {
         pname = "pyimport";
-        version = "20170120.307";
+        version = "20170303.732";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pyimport";
-          rev = "60725d1632562789374808f6c1496e76ae751fcd";
-          sha256 = "1ldj79sg8ps1n7wzymyhsdh3gfrrm48dhpb08ihi3ng126qdikxs";
+          rev = "2482c8efee8edab9f26ea278848d786323fcff9d";
+          sha256 = "091ilax7vs34mh907rxfi2hm140ipa39nwrs27w8nllx2qsrbljv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport";
@@ -55537,8 +55745,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "56daa5c3a0d2d6592c673c2932c354b68679997f";
-          sha256 = "0h1d069hd6kk0z05x8454km3sx4bwab3gv860v5a7cf79ahx2k5q";
+          rev = "7df8caaa3e1995018417ac2fd87afd89be6945ba";
+          sha256 = "0fj97k1h4yplz87pfcmbxcg7sam447k1rn6ggb227jlyvqbw30sm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -56604,12 +56812,12 @@
     rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rdf-prefix";
-        version = "20161221.1216";
+        version = "20170304.508";
         src = fetchFromGitHub {
           owner = "simenheg";
           repo = "rdf-prefix";
-          rev = "12fdb54d6e7b1e00dba566448280ec878bf9057c";
-          sha256 = "1gfhvq2cdvq72jppiajig6khql7f7f9n8q3akb12pipbzak1xw1g";
+          rev = "d7e61535aaf89e643673b27c79b4a84ddb530288";
+          sha256 = "1in1xp559g8hlxa9i2algwlgc069m8afjad6laxbyjqc61srzw6i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix";
@@ -57418,6 +57626,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    remember-last-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "remember-last-theme";
+        version = "20170304.29";
+        src = fetchFromGitHub {
+          owner = "anler";
+          repo = "remember-last-theme";
+          rev = "14b4b5a03bb59b4e7040da96d7c261ee8f7884e9";
+          sha256 = "069bzswwaq1disnq0j49c3xq69xrz7rn6z3zc0cv2cspn2hk1x5p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/26edcdddaf8dc8c9a18d6b007e0d49d04fe4ccca/recipes/remember-last-theme";
+          sha256 = "0pw36f9mchkl1qhaii39zd0vwrydjlijzanv706ai2bl8r7l0ppy";
+          name = "remember-last-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/remember-last-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "repeatable-motion";
@@ -58336,12 +58565,12 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20170228.842";
+        version = "20170303.1422";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "3adf4a22eb4eeede241dd5a7389254f9c8a755fa";
-          sha256 = "1g9h9d5x8pcm2m66dljwr4l6gqm013ll1fwy4yjhmy5mkmavn5hi";
+          rev = "ec6d0dcd9215fe9f29c7cf49685a60c3ebeeaf8d";
+          sha256 = "01br0l60ng8jx0wyvikjy96g6safdmr3vdr463jz61shif3xpirx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -58402,7 +58631,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57752";
+          rev = "57789";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58482,7 +58711,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57752";
+          rev = "57789";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59084,6 +59313,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sayid";
+        version = "20170301.256";
+        src = fetchFromGitHub {
+          owner = "bpiel";
+          repo = "sayid";
+          rev = "5a85d5e98b7a23a1009dc089d604de9a32facedf";
+          sha256 = "1sxsf3f9rzlpm3pib39cdy4sbn2fg1l5k0iwcr3vpkrfiyzivbpd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
+          sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs";
+          name = "sayid";
+        };
+        packageRequires = [ cider ];
+        meta = {
+          homepage = "https://melpa.org/#/sayid";
+          license = lib.licenses.free;
+        };
+      }) {};
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
@@ -59112,8 +59362,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "7d205e730d3f1d00058203111b0f016a2371879d";
-          sha256 = "04l27yz2n88hmqifxpjl181wc13d39ybx31zb9xci0s7mvhkfkak";
+          rev = "14322d78b2be5148c2756d69e7a6c1e53b745569";
+          sha256 = "0ih1kahzr3n6rvmsv2jg9v1f5n119vn1qa6jjs27wpd39n3az3hj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60308,12 +60558,12 @@
     shell-pop = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "20170223.222";
+        version = "20170304.616";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "9429e538121c2613177848dc97b73d08f6fb4a42";
-          sha256 = "0zfbsg0vgkc9bpzm3mlkqz4gpjlai81c49g0m55zwkmvqshlsrch";
+          rev = "4a3a9d093ad1add792bba764c601aa28de302b34";
+          sha256 = "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/44150bddc9b276ab9fb2ab6a92a11383a3ed03b0/recipes/shell-pop";
@@ -60455,12 +60705,12 @@
     shift-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shift-number";
-        version = "20160419.1257";
+        version = "20170301.659";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "shift-number.el";
-          rev = "4ea4c2a2ece26e208980e6d2f0939271bca751aa";
-          sha256 = "1fqrsr4j2axmxnvznz9zyy8giywnia23i6a8xi1f8lx924xg3cr6";
+          rev = "cd099a5582fc996b800ac7607f6c38a004ce9740";
+          sha256 = "131by7z6303m81kjhy8rnfvwyzfbxglc19xb90jdks4vgczqkcah";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b06be6b25078ddfabc1ef1145c817552f679c41c/recipes/shift-number";
@@ -61201,12 +61451,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170228.602";
+        version = "20170306.718";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "3bd88ab8cb9d8deae4ad965156de87245538f29e";
-          sha256 = "15d0g3d3nj7q7qadm0blfnhaagxzd20a6lhsy6wv788qvq4fcq4j";
+          rev = "e64753db3c989ba12f6b52796e9dbcf8c285fbea";
+          sha256 = "0bxn7nngc851h5z8bwmc61cl3yps6w6zwf26af6fpcj7d4i8435r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -61453,12 +61703,12 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20170205.1642";
+        version = "20170305.1423";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "8b676ee14a3bdfef503472e31d1a5e89fcee63ff";
-          sha256 = "1kyryixfmqzjyh6f2bcsrsqvklcvmf9saqm6f0cnxa86rvcdkln0";
+          rev = "f419ab5294015368ef30e658f94894ff2084f5b9";
+          sha256 = "0llax80z1d5kn03ip6d4jclnd2x8ydx8q3y8kyx8ypzyvx1ya43n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -61932,12 +62182,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170227.318";
+        version = "20170303.346";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "67b1a1dbdfd2285f8a04a50a0fb006978e21727c";
-          sha256 = "121wa1capjhrssqp2vaaf359jjsm23si3m4shmsi7n1hdvdjirrw";
+          rev = "0c81107de550931466b11132b8c6286851615b5f";
+          sha256 = "1xmaxl7s8lh288vrqg6diakzldp615z41innkl13yjawnad4mxfk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -62460,8 +62710,8 @@
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "solarized-emacs";
-          rev = "64fa78256efdc11bbc63ec311a976aeddb4808e4";
-          sha256 = "0pg7v1lrf12vigakzcjz3i9yqirqp5m0n7ryp430hyv92mk01l40";
+          rev = "dc80b1fe7c613d26b6357dbf447b593af6000ca6";
+          sha256 = "0w0lxihnzkav8mab050s600p06f8cmvvdv84fnfzj8zmd2raifki";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme";
@@ -62498,12 +62748,12 @@
     sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
     melpaBuild {
         pname = "sonic-pi";
-        version = "20161024.313";
+        version = "20170305.327";
         src = fetchFromGitHub {
           owner = "repl-electric";
           repo = "sonic-pi.el";
-          rev = "0a14120e004565ec294c31c601131be7cc010c19";
-          sha256 = "0sfrgqvyw9z6rw8pjbfn1yvxxg3aznyc2kwp024g0w7ybb1a38li";
+          rev = "d2f6facaf012fc556498c90a4d1343fcb59a4628";
+          sha256 = "0hnjws9b4k0f6clcpcmvvlqnjkq09zrppkdylw334nhdbpkdhkxl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi";
@@ -62820,12 +63070,12 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20170226.405";
+        version = "20170305.506";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "c45aa258dcc7427082f1bb253964d82967c24072";
-          sha256 = "1blpg7d8bkpgagxbqkb9sm0jcdrba7l1dmm0z2h1nlrx4n66p4vm";
+          rev = "80f40d21ff3350f6dbd3e572e49e177f734391fe";
+          sha256 = "0yavgzricvgrvqgnjwxhw4vlphkglh9bb91j78wsmqr11l1sl66n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -63152,12 +63402,12 @@
     spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spotify";
-        version = "20160816.15";
+        version = "20170302.2229";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "spotify-el";
-          rev = "472f6e61d732a7e700f5505e2a445fc0b030916a";
-          sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi";
+          rev = "2825b5cac8406969405096660aeab6e5fef765eb";
+          sha256 = "1270c4l7dxxsnzkifwa0ncgv078da9pzhlyxpdfbdbsj8w70plzm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify";
@@ -64727,8 +64977,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "80d3fe3f65bd4a73140511a3481acc06daa4b309";
-          sha256 = "1p8jj72mb6xmaq2wvj31jv3b3jnqjv7w7l8ryr4xqys6zfgy3k8x";
+          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
+          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -65453,12 +65703,12 @@
     tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tao-theme";
-        version = "20170209.950";
+        version = "20170301.557";
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "a3bcc27b53b08f2114261795d4b4422bd75c94a8";
-          sha256 = "1l439z9wa9jwb1ascfvjzm8699cjr8hxip20536ph8dql8hk7rsz";
+          rev = "df36a5b37928855f013d40bd47c87e2ed281727c";
+          sha256 = "0qn1z4cxc3v4s6fl0j7k95zdnfs5r860nd0ah0w9yn7ic71jl9ib";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -65478,8 +65728,8 @@
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "tawny-owl";
-          rev = "1cb37c49e97aff263ecb5f20746256126b048628";
-          sha256 = "1310pw200l6jdlpdyscnhf9cwll5wc1vyayi55x7jyvm02nngbq1";
+          rev = "f7013f7e70da5d2fff2fcaf88c5edc2d807a022b";
+          sha256 = "08l8c1kixx32zm7vvs4xy7zp53aqwlgx567hg7byqy8mqn3x0q8f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode";
@@ -66083,12 +66333,12 @@
     textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "textile-mode";
-        version = "20151203.53";
+        version = "20170304.916";
         src = fetchFromGitHub {
           owner = "juba";
           repo = "textile-mode";
-          rev = "db33dc5f994c008ef9f1556801bf8ac62d451f31";
-          sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
+          rev = "c37aaab809503df008209390e31e19abf4e23630";
+          sha256 = "16543im5iymc5hfcix1lglbvpq4v0441vb7sk58nbnffqba83yzy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ebe5e52bc9bb8875ca390b34ac32eb47f4e1252/recipes/textile-mode";
@@ -66391,8 +66641,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "c89e172289129a0a700a20f11f4a157b7da789d2";
-          sha256 = "1dmvi4919b5x3j22vxbpp4pyfmx7iz34xra0ai003dv2crb2qb2z";
+          rev = "431732d39e89f1661dc7dddffedb2c5c1e019cc7";
+          sha256 = "1mz2g5flz7yrsjzjfa9p6f5sinhd3xxf6nn3sjma7a9jcm626l7l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -66448,12 +66698,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170301.418";
+        version = "20170303.1211";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "624406228042ded6cf427a179eccbdb8ce1392d6";
-          sha256 = "0xb7nxy8pkvc4p2wcps26hs04pv35qdizfc1bqv59527gqpixd57";
+          rev = "616a93710a3bf882f75f61bd8f3438de698938c4";
+          sha256 = "19n1pc3igwbd1yz1cylnk46jvv723aab7505i8r7mw05zd5cnwpg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67149,12 +67399,12 @@
     traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }:
     melpaBuild {
         pname = "traad";
-        version = "20161010.152";
+        version = "20170302.613";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "d96da54c87cba247306b4519295cc4d4df7cc33c";
-          sha256 = "1hx6d4r20irs8zdimsfw17kwpwrdcjhkvf1zf7k4cr9bmkj4bvz5";
+          rev = "de76278e77d26ab8c400c03cef7bc3326be1e257";
+          sha256 = "1l092pxpm02wr0wp5j1027s8wdd0qjaj5rl2gfl9b2qskw4qh8f2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -67180,8 +67430,8 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "87f2d8604e41c6caf68cff3fcf61b1f4d4e8a961";
-          sha256 = "19mjzws9hiqhaa8v0wxa369m3qzam2axvhcqcrggdjjsr7hyhvwr";
+          rev = "9d68903018f255838b51c734015be74bbdbf539c";
+          sha256 = "0iddz0m7p7bfnly33gwi8vmpz0lv026lj4val1x584hqix6xk8vh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking";
@@ -67281,12 +67531,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170216.457";
+        version = "20170305.1155";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "133a3b8b6bc61927183b775b8a8209b9abc794ef";
-          sha256 = "1wgydsqy4p1y6kfs53a06ardabd4fxrdzqxwqimyslv7sqz0y3kc";
+          rev = "3c1b891f350a5c0b87d15d174203b9ba2bf3db2d";
+          sha256 = "0l2qqrxpfn4f0x9zdz0rsf5vw8238ycjmxnbjx7mcp3awm90pp46";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -68023,12 +68273,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170227.23";
+        version = "20170306.214";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "c066af10ac41d2c459e113c5932ef6844193e7e5";
-          sha256 = "0jlcyrmmrg5nchcr91lc6x0hl7wlip0nfyy9qbda4nalkv5xgphy";
+          rev = "69bbb941a6835137564b919109884d056429f2f0";
+          sha256 = "1dg642b8s9s0f97mqm7facqsg6lmaxi9nv0kpj33p58bqsjrq6hc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -68741,12 +68991,12 @@
     vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vagrant";
-        version = "20160505.130";
+        version = "20170301.1406";
         src = fetchFromGitHub {
           owner = "ottbot";
           repo = "vagrant.el";
-          rev = "46c0c5129f6330497c518de442d517a0794b70fa";
-          sha256 = "11bh92a40x778875q1m2kmq9nanp96d9v9hzra0jk8954g0bavlr";
+          rev = "636ce2f9af32ea199170335a9cf1201b64873440";
+          sha256 = "06zws69z327p00jw3zaf67niji2d4j339xmhbsrwbcr4w65dmz94";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/vagrant";
@@ -70138,12 +70388,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20161010.1100";
+        version = "20170306.946";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "6e34759f77b94318f079e178f7551fb16317b661";
-          sha256 = "1lw4jf4jnch5c57vv5dyiwgkmqmxisbm1wx269p6nkkvb9y49qm7";
+          rev = "92a586752b7fbc4089a6d92750c70274448aa496";
+          sha256 = "00b6sbcp827n5d8ql87503m3k1wnlx6rbr3xgrr41aq0b0xj6z7k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -71595,12 +71845,12 @@
     xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-get-thing";
-        version = "20161218.2145";
+        version = "20170303.1530";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-get-thing-or-selection";
-          rev = "14bf7ad0d8366b3b8754c252ca45660181ba5a1d";
-          sha256 = "0025g3ikdfpmcaa6pkdyh1vp7wxbbdd5slxxdzyvshmi7lm2p2nc";
+          rev = "1eef698b7be06fa49347798089ca1e2ed8484da5";
+          sha256 = "0cysykwnwpy43mnx9fjiqk1r004ac6c7h92zhki8858bcgjnwzzk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing";
@@ -72162,12 +72412,12 @@
     yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yafolding";
-        version = "20160814.1230";
+        version = "20170304.1917";
         src = fetchFromGitHub {
           owner = "zenozeng";
           repo = "yafolding.el";
-          rev = "a89146d35b8f66be68c1e8d1d03c4abdde39ebee";
-          sha256 = "1pq2b6bhl93b023gin7j1warvg8bz8zvf6kdgkmhmqaaaqqha5kr";
+          rev = "57c015ddd7c3454571c80825bc5391d7a10fa1d7";
+          sha256 = "144v8nn4l8ngfdrsgj5nrxp09391gnfrqf950y956cbmqvnlw7z8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding";
@@ -72474,12 +72724,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170216.1928";
+        version = "20170226.1638";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "cddb8260a0d89cc05577742f0f06938f2317de26";
-          sha256 = "1yrlzknbspkwysqalcbhfi0gfdk7mjknvzz60ijsyx14f26y8lds";
+          rev = "6e9b7f9432a87122cf9bb80a505be2fd9811a9cf";
+          sha256 = "0k5yv90530946zjs7xdq3017vcq688mz44r542l39hyd9skxq8ba";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -72515,11 +72765,11 @@
       }) {};
     yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "yatex";
-        version = "20170225.1836";
+        version = "20170306.55";
         src = fetchhg {
           url = "https://www.yatex.org/hgrepos/yatex/";
-          rev = "bf2497be3ec5";
-          sha256 = "00nx60qvimayxn9ijch9hi35m7dc9drhakb43jnhbasfcxcz4ncs";
+          rev = "7bf780961390";
+          sha256 = "19nxjabwr3c5sjii2pwlgak751wq9h12yp7xd6nz8i6f75md59xs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex";
@@ -72650,12 +72900,12 @@
     yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yoshi-theme";
-        version = "20161115.1258";
+        version = "20170305.2158";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "278dba2c6846c6898ced9948505775ef71812586";
-          sha256 = "03fibd99wihg811c72cn6q8w89pdivjn3305lyhzlbs69ylafz0f";
+          rev = "c76b1659a8e5cfccbdfcfe971ef6fcb3b7cd0263";
+          sha256 = "0k86b7lkkdlwd2570hc93ywbg60bxpx1axvzbvyvqiara7vq6njy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -72775,12 +73025,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20170219.1611";
+        version = "20170306.429";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "310c270d164fdb740c6af41120d5841a54c895b4";
-          sha256 = "1b6q7aaafxn5vllgx4ihyylgns8ykr5j9p45xphpx62n70m3c6qr";
+          rev = "96f953cee3358fbc299662a3b3cbc087cb395b70";
+          sha256 = "0cp2n0a4g1x4py1ixf273k6nrymhxc4hy1ccvg0cv43jpka85xkf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -73084,12 +73334,12 @@
     zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom-window";
-        version = "20170115.120";
+        version = "20170302.27";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-zoom-window";
-          rev = "5d1ea2a67ca4c74557183d62ebd90bae5a81cfc6";
-          sha256 = "11qj8mqqmcxc7c14mzf84k7mpgzarpv1y2mgsky2a7hnb0si14fx";
+          rev = "cd6ecc103fc30b171bda7daf1f44a550854d0dbf";
+          sha256 = "1rfhdzwyag32s15ysmf75976nvkx995581afaa4ychj45vwnaqfm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window";
@@ -73210,11 +73460,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170223.2227";
+        version = "20170305.2023";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "772da5ae125e";
-          sha256 = "0zqa0jplra23hq6iv5538x7f24yfx8j8fzq5d4csr7hbndya4nqh";
+          rev = "d33bf30fd45c";
+          sha256 = "0wa2nw8q1pbmif1n7vxyzxf7zziwxdv60pa4rx1kxjnrd8aizzi7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From 620ef803b97e4186a9852c5079277af508925b3a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 6 Mar 2017 22:20:58 +0100
Subject: [PATCH 1817/3449] idutils: disable tests on darwin

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

diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index 503beefa15af..99f19889201a 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
 
-  doCheck = true;
+  doCheck = !stdenv.isDarwin;
 
   patches = [ ./nix-mapping.patch ];
 

From 6e4d902e49f539fbae4fdb45d9527d3b1cdaa09c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 6 Mar 2017 22:21:28 +0100
Subject: [PATCH 1818/3449] kiwix: add platforms

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

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index a3c140b6e6c2..91076f0bf99d 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -106,6 +106,7 @@ stdenv.mkDerivation rec {
     description = "An offline reader for Web content";
     homepage = http://kiwix.org;
     license = licenses.gpl3;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ robbinch ];
   };
 }

From 18f1127f0582b65e2e4bba16f0917ee3fb7501ba Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 6 Mar 2017 20:33:23 +0000
Subject: [PATCH 1819/3449] typed-ast: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
new file mode 100644
index 000000000000..8d36d3c3a61f
--- /dev/null
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -0,0 +1,16 @@
+{ buildPythonPackage, fetchzip, isPy3k, lib, pythonOlder }:
+buildPythonPackage rec {
+  name = "typed-ast-${version}";
+  version = "1.0.1";
+  src = fetchzip {
+    url = "mirror://pypi/t/typed-ast/${name}.zip";
+    sha256 = "1q69czr9ghnbd81hay71kgynn6mqi5nsgand9yw6dyw5bim5l154";
+  };
+  # Only works with Python 3.3 and newer;
+  disabled = !isPy3k && !(pythonOlder "3.3");
+  meta = {
+    homepage = "https://pypi.python.org/pypi/typed-ast";
+    description = "a fork of Python 2 and 3 ast modules with type comment support";
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa5909b6498c..0cd4752cc1ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32038,6 +32038,8 @@ EOF
     };
   };
 
+  typed-ast = callPackage ../development/python-modules/typed-ast { };
+
   stripe = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "stripe";

From 1a8a1941867a10be826ec5039d0d7e1dcb2a06b4 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 6 Mar 2017 20:34:04 +0000
Subject: [PATCH 1820/3449] mypy-lang: 0.4.5 -> 0.501 and rename to mypy

---
 .../development/tools/{mypy-lang => mypy}/default.nix | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/development/tools/{mypy-lang => mypy}/default.nix (62%)

diff --git a/pkgs/development/tools/mypy-lang/default.nix b/pkgs/development/tools/mypy/default.nix
similarity index 62%
rename from pkgs/development/tools/mypy-lang/default.nix
rename to pkgs/development/tools/mypy/default.nix
index 6831c7f2b56c..eb6e50840a5b 100644
--- a/pkgs/development/tools/mypy-lang/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -1,18 +1,17 @@
 { stdenv, fetchurl, python35Packages }:
-
 python35Packages.buildPythonApplication rec {
-  name = "mypy-lang-${version}";
-  version = "0.4.5";
+  name = "mypy-${version}";
+  version = "0.501";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchurl {
-    url = "mirror://pypi/m/mypy-lang/${name}.tar.gz";
-    sha256 = "0x1n6r5in57zv4s75r22smpqxrz7xxp84fnrhkwzbpjnafa3y81f";
+    url = "mirror://pypi/m/mypy/${name}.tar.gz";
+    sha256 = "164g3dq2vzxa53n9lgvmbapg41qiwcxk1w9mvzmnqksvql5vm60h";
   };
 
-  propagatedBuildInputs = with python35Packages; [ lxml ];
+  propagatedBuildInputs = with python35Packages; [ lxml typed-ast ];
 
   meta = with stdenv.lib; {
     description = "Optional static typing for Python";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78fd1a78662c..a3cf74d50144 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6909,7 +6909,7 @@ with pkgs;
 
   grabserial = callPackage ../development/tools/grabserial { };
 
-  mypy-lang = callPackage ../development/tools/mypy-lang { };
+  mypy = callPackage ../development/tools/mypy { };
 
 
   ### DEVELOPMENT / LIBRARIES

From 3fa2a5dc23c5e50292b9a00bf004bd75190741f6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Mar 2017 22:44:56 +0100
Subject: [PATCH 1821/3449] youtubeDL: 2017.02.27 -> 2017.03.07

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 2d942e014754..dbd042ec8858 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.02.27";
+  version = "2017.03.07";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0pcrr1bxxw3aar681gj8n5ms69j54namjlw5bj88crs0nm69kspk";
+    sha256 = "19acz9m3gazd1ims4l9a9ni1p7jw8z4y0ncqn99xlx9kna8ryjnv";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -51,6 +51,6 @@ buildPythonApplication rec {
     '';
     license = licenses.publicDomain;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu ];
+    maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz ];
   };
 }

From 2df1d3f828b0415c18089e3cea6b8418767d69c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 6 Mar 2017 22:23:02 +0100
Subject: [PATCH 1822/3449] purple-facebook: 2016-04-09 -> 0.9.0

---
 .../purple-facebook/default.nix               | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 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 cc58736afa59..30e4992ff36c 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
@@ -1,30 +1,58 @@
-{ stdenv, fetchFromGitHub, pidgin, glib, json_glib, mercurial, autoreconfHook } :
+{ stdenv, fetchFromGitHub, fetchhg, pidgin, glib, json_glib, mercurial, autoreconfHook } :
 
-stdenv.mkDerivation rec {
-  name = "purple-facebook-${version}";
-  version = "2016-04-09";
+
+let
+  pidginHg = fetchhg {
+    url = "https://bitbucket.org/pidgin/main";
+    # take from VERSION file
+    rev = "c9b74a765767";
+    sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "purple-facebook-0.9.0";
 
   src = fetchFromGitHub {
     owner = "dequis";
     repo = "purple-facebook";
-    rev = "66ee77378d82";
-    sha256 = "0kr9idl79h70lacd3cvpmzvfd6il3b5xm2fj1sj96l7bjhiw9s3y";
+    rev = "v0.9.0-c9b74a765767";
+    sha256 = "1f7jhmaj15p3c9s4xmfygrpav9c8wq0vilbi5cj4jysb7xgndlqv";
   };
 
-  preAutoreconf = "./autogen.sh";
+  postPatch = ''
+    # we do all patching from update.sh in preAutoreconf
+    echo "#!/bin/sh" > update.sh
+  '';
+
+  preAutoreconf = ''
+    for FILE in $(cat MANIFEST_PIDGIN); do
+        install -Dm644 "${pidginHg}/$FILE" "pidgin/$FILE" || true
+    done
+
+    touch $(cat MANIFEST_VOIDS)
+
+    patchdir="$(pwd)/patches"
+    pushd pidgin
+
+    for patch in $(ls -1 "$patchdir"); do
+      patch -p1 -i "$patchdir/$patch"
+    done
+    popd
+
+    ./autogen.sh
+  '';
 
   makeFlags = [
     "PLUGIN_DIR_PURPLE=/lib/pidgin/"
     "DATA_ROOT_DIR_PURPLE=/share"
-    "DESTDIR=$(out)"
   ];
 
-  postInstall =  ''
+  installPhase = ''
     mkdir -p $out/lib/purple-2
     cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/
   '';
 
-  buildInputs = [ pidgin glib json_glib mercurial autoreconfHook];
+  buildInputs = [pidgin glib json_glib mercurial autoreconfHook];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From a5fcca2004524e8603c211cb496e69d81dcd7152 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 6 Mar 2017 22:57:54 +0100
Subject: [PATCH 1823/3449] gss: don't build with shishi on darwin

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

diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix
index a748d9582695..0cc6a07e0839 100644
--- a/pkgs/development/libraries/gss/default.nix
+++ b/pkgs/development/libraries/gss/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl
-
-# Optional Dependencies
-, shishi ? null
+, withShishi ? !stdenv.isDarwin, shishi ? null
 }:
 
+assert withShishi -> shishi != null;
+
 stdenv.mkDerivation rec {
   name = "gss-1.0.3";
 
@@ -12,16 +12,16 @@ stdenv.mkDerivation rec {
     sha256 = "1syyvh3k659xf1hdv9pilnnhbbhs6vfapayp4xgdcc8mfgf9v4gz";
   };
 
-  buildInputs = [ shishi ];
+  buildInputs = stdenv.lib.optional withShishi shishi;
 
   configureFlags = [
-    "--${if shishi != null then "enable" else "disable"}-kereberos5"
+    "--${if withShishi != null then "enable" else "disable"}-kereberos5"
   ];
 
   doCheck = true;
 
   # Fixup .la files
-  postInstall = stdenv.lib.optionalString (!stdenv.isDarwin && shishi != null) ''
+  postInstall = stdenv.lib.optionalString withShishi ''
     sed -i 's,\(-lshishi\),-L${shishi}/lib \1,' $out/lib/libgss.la
   '';
 

From abc0421c4673f26429f0e872a6560d152eddbe89 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 3 Mar 2017 15:32:26 +0100
Subject: [PATCH 1824/3449] kdenlive: phonon-backend-vlc ->
 phonon-backend-gstreamer

---
 pkgs/applications/kde/kdenlive.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 071ec21bbd01..3c18772f0392 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -27,7 +27,7 @@
 , libv4l
 , kfilemetadata
 , ffmpeg
-, phonon-backend-vlc
+, phonon-backend-gstreamer
 , qtquickcontrols
 }:
 
@@ -65,7 +65,7 @@ unwrapped = kdeApp {
     kwindowsystem
     kfilemetadata
     plasma-framework
-    phonon-backend-vlc
+    phonon-backend-gstreamer
     qtquickcontrols
   ];
   enableParallelBuilding = true;

From a3e6b41d3677d37d808ee8f3b81f94d996899d40 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 6 Mar 2017 23:03:52 +0100
Subject: [PATCH 1825/3449] javasvn: remove

Upstream URL is invalid and the package has not had direct attention
since June 2006.
---
 .../libraries/java/javasvn/builder.sh           |  6 ------
 .../libraries/java/javasvn/default.nix          | 17 -----------------
 pkgs/top-level/all-packages.nix                 |  2 --
 3 files changed, 25 deletions(-)
 delete mode 100755 pkgs/development/libraries/java/javasvn/builder.sh
 delete mode 100644 pkgs/development/libraries/java/javasvn/default.nix

diff --git a/pkgs/development/libraries/java/javasvn/builder.sh b/pkgs/development/libraries/java/javasvn/builder.sh
deleted file mode 100755
index 5eaed4c88425..000000000000
--- a/pkgs/development/libraries/java/javasvn/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-$unzip/bin/unzip $src
-mkdir -p $out
-mv $name*/* $out
diff --git a/pkgs/development/libraries/java/javasvn/default.nix b/pkgs/development/libraries/java/javasvn/default.nix
deleted file mode 100644
index 2ad9a33879ca..000000000000
--- a/pkgs/development/libraries/java/javasvn/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{stdenv, fetchurl, unzip} :
-
-stdenv.mkDerivation {
-  name = "javasvn-1.0.6";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://tmate.org/svn/org.tmatesoft.svn_1.0.6.standalone.zip;
-    sha256 = "0l2s3jqi5clzj5jz962i7gmy8ims51ma60mm5iflsl00dwbmgrqf";
-  };
-  
-  inherit unzip;
-
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1f7876c8dfa..7fb7dcbcfcfd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10206,8 +10206,6 @@ with pkgs;
 
   javaCup = callPackage ../development/libraries/java/cup { };
 
-  javasvn = callPackage ../development/libraries/java/javasvn { };
-
   jclasslib = callPackage ../development/tools/java/jclasslib { };
 
   jdom = callPackage ../development/libraries/java/jdom { };

From 918a4e649dd81b38e91832e3cd2aafcd43535e95 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 3 Mar 2017 15:39:26 -0600
Subject: [PATCH 1826/3449] unshield: 1.3 -> 1.4.2

---
 pkgs/tools/archivers/unshield/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix
index fae72e5fcd84..c47242503c9c 100644
--- a/pkgs/tools/archivers/unshield/default.nix
+++ b/pkgs/tools/archivers/unshield/default.nix
@@ -1,30 +1,23 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, openssl }:
+{ stdenv, fetchFromGitHub, cmake, zlib, openssl }:
 
 stdenv.mkDerivation rec {
   name = "unshield-${version}";
-  version = "1.3";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "twogood";
     repo = "unshield";
     rev = version;
-    sha256 = "0cg84jr0ymvi8bmm3lx5hshhgm33vnr1rma1mfyqkc065c7gi9ja";
+    sha256 = "07lmh8vmrbqy4kd6zl5yc1ar3bg33w5cymlzwfijy6arg77hjgq9";
   };
 
-  patches = [
-    # Fix build in separate directory
-    (fetchpatch {
-      url = "https://github.com/twogood/unshield/commit/07ce8d82f0f60b9048265410fa8063298ab520c4.patch";
-      sha256 = "160pbk2r98lv3vd0qxsxm6647qn5mddj37jzfmccdja4dpxhxz2z";
-    })
-  ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib openssl ];
 
   meta = with stdenv.lib; {
     description = "Tool and library to extract CAB files from InstallShield installers";
-    homepage = https://github.com/twogood/unshield;
+    homepage = "https://github.com/twogood/unshield";
     license = licenses.mit;
     platforms = platforms.linux;
   };

From 558751b41eda2970d6f1279d06b3f9aa5929d1f0 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 5 Mar 2017 08:36:55 -0600
Subject: [PATCH 1827/3449] bs1770gain: 0.4.7 -> 0.4.12

---
 pkgs/applications/audio/bs1770gain/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix
index 862f52636951..0241e38281b7 100644
--- a/pkgs/applications/audio/bs1770gain/default.nix
+++ b/pkgs/applications/audio/bs1770gain/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "bs1770gain-${version}";
-  version = "0.4.7";
+  version = "0.4.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/bs1770gain/${name}.tar.gz";
-    sha256 = "0dnypm7k4axc693g0z73n2mvycbzgc4lnj2am64xjzyg37my4qzz";
+    sha256 = "0n9skdap1vnl6w52fx0gsrjlk7w3xgdwi62ycyf96h29rx059z6a";
   };
 
   buildInputs = [ ffmpeg sox ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A audio/video loudness scanner implementing ITU-R BS.1770";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     homepage = "http://bs1770gain.sourceforge.net/";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }

From 747b62f909c16f951b7b94624f6494ab861d67ef Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 4 Mar 2017 20:38:09 +0100
Subject: [PATCH 1828/3449] photivo: fix build with lensfun >= 0.3

---
 pkgs/applications/graphics/photivo/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/photivo/default.nix b/pkgs/applications/graphics/photivo/default.nix
index d84363df899e..69bc36dea61c 100644
--- a/pkgs/applications/graphics/photivo/default.nix
+++ b/pkgs/applications/graphics/photivo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchhg, cmake, qt4, fftw, graphicsmagick_q16,
+{ stdenv, fetchhg, fetchpatch, cmake, qt4, fftw, graphicsmagick_q16,
   lcms2, lensfun, pkgconfig, libjpeg, exiv2, liblqr1 }:
 
 stdenv.mkDerivation rec {
@@ -10,6 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "0f6y18k7db2ci6xn664zcwm1g1k04sdv7gg1yd5jk41bndjb7z8h";
   };
 
+  patches = [
+    # Patch fixing build with lensfun >= 0.3, taken from
+    # https://www.linuxquestions.org/questions/slackware-14/photivo-4175530230/#post5296578
+    (fetchpatch {
+      url = "https://www.linuxquestions.org/questions/attachment.php?attachmentid=17287&d=1420577220";
+      name = "lensfun-0.3.patch";
+      sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv";
+    })
+  ];
+
   postPatch = '' # kinda icky
     sed -e '/("@INSTALL@")/d' \
         -e s,@INSTALL@,$out/share/photivo, \

From 9614ebf1372149b77edabde2d6318aaf8d35c31d Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 3 Mar 2017 15:27:23 -0600
Subject: [PATCH 1829/3449] coccinelle: 1.0.0-r23 -> 1.0.6

* Remove camlp4 dependency, no longer needed
* Keep pycaml to use ours over bundled version
* Enable tests for sanity (broken on darwin)
* no longer need to force specific ocaml version
* don't create python wrappers, they don't seem to be needed
* remove deprecated configure flag.
* fix spgen by removing bytecode version.
---
 .../tools/misc/coccinelle/default.nix         | 39 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix
index f21808d28f7c..4040eda141fd 100644
--- a/pkgs/development/tools/misc/coccinelle/default.nix
+++ b/pkgs/development/tools/misc/coccinelle/default.nix
@@ -1,36 +1,37 @@
-{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig, makeWrapper }:
+{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name    = "coccinelle-${version}";
-  version = "1.0.0-rc23";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "http://coccinelle.lip6.fr/distrib/${name}.tgz";
-    sha256 = "1qrd4kr3wc0hm4l60fwn19iwzwqcjsx85mm3k4gm3cdhljjma82p";
+    sha256 = "02g9hmwkvfl838zz690yra5jzrqjg6y6ffxkrfcsx790bhkfsll4";
   };
 
   buildInputs = with ocamlPackages; [
-    ocaml findlib menhir ocamlPackages.camlp4
+    ocaml findlib menhir
     ocaml_pcre pycaml
     python ncurses pkgconfig
-    makeWrapper
   ];
 
-  # TODO: is the generation of this wrapper truly/still needed?
-  # I don't have a non-NixOS system, so I cannot verify this, but shouldn't
-  # libpython know where to find its modules? (the path is for example in
-  # its Sys-module).
-  postInstall =
-    # On non-NixOS systems, Coccinelle would end up looking up Python modules
-    # in the wrong directory.
-    '' for p in "$out/bin/"*
-       do
-         wrapProgram "$p" \
-           --prefix "PYTHONPATH" ":" "${python}/lib/python${python.majorVersion}"
-       done
-    '';
+  doCheck = !stdenv.isDarwin;
 
-  configureFlags = "--enable-release";
+  # The build system builds two versions of spgen:
+  # 'spgen' with ocamlc -custom (bytecode specially linked)
+  # and 'spgen.opt' using ocamlopt.
+  # I'm not sure of the intentions here, but the way
+  # the 'spgen' binary is produced results in an
+  # invalid/incorrect interpreter path (/lib/ld-linux*).
+  # We could patch it, but without knowing why it's
+  # finding the wrong path it seems safer to use
+  # the .opt version that is built correctly.
+  # All that said, our fix here is simple: remove 'spgen'.
+  # The bin/spgen entrypoint is really a bash script
+  # and will use spgen.opt if 'spgen' doesn't exist.
+  postInstall = ''
+    rm $out/lib/coccinelle/spgen/spgen
+  '';
 
   meta = {
     description = "Program to apply semantic patches to C code";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a280fad2e87..55596ec6efa0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6315,9 +6315,7 @@ with pkgs;
   # Does not actually depend on Qt 5
   inherit (kdeFrameworks) extra-cmake-modules kapidox kdoctools;
 
-  coccinelle = callPackage ../development/tools/misc/coccinelle {
-    ocamlPackages = ocamlPackages_4_01_0;
-   };
+  coccinelle = callPackage ../development/tools/misc/coccinelle { };
 
   cpptest = callPackage ../development/libraries/cpptest { };
 

From 94497a0ef31dfe9506e1249dc171f9da955d78c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Wed, 1 Mar 2017 22:02:53 +0000
Subject: [PATCH 1830/3449] lxcfs: 2.0.4 -> unstable-2017-03-02

---
 pkgs/os-specific/linux/lxcfs/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index ceaed205db96..2555ce5c6c31 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -1,16 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, help2man, fuse, pam }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxcfs-${version}";
-  version = "2.0.4";
+  # use unstable because it fixed some serious crashes,
+  # stable should be reconsidered in future
+  name = "lxcfs-unstable-2017-03-02";
 
-  src = fetchurl {
-    url = "https://linuxcontainers.org/downloads/lxcfs/lxcfs-${version}.tar.gz";
-    sha256 = "0pfrsn7hqccpcnwg4xk8ds0avb2yc9gyvj7bk2bl90vpwsm35j7y";
+  src = fetchFromGitHub {
+    owner = "lxc";
+    repo = "lxcfs";
+    sha256 = "1say5bf6gknzs0aymvrg2xiypc311gcdcfdmvb2vnz058pmianq9";
+    rev = "4a6707e130b4b65a33606ebc18a95ec471f4bf40";
   };
 
-  nativeBuildInputs = [ pkgconfig help2man ];
+  nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
   buildInputs = [ fuse pam ];
 
   configureFlags = [

From 85b47bbd5e5273207919ad9ff81f12471f1769d3 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 6 Mar 2017 18:02:55 -0500
Subject: [PATCH 1831/3449] mailpile: mark as insecure, pending removal

---
 pkgs/applications/networking/mailreaders/mailpile/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index 05fea05fd14e..9c2ab08babcf 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -33,5 +33,8 @@ python2Packages.buildPythonApplication rec {
     license = [ licenses.asl20 licenses.agpl3 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.domenkozar ];
+    knownVulnerabilities = [
+      "Numerous and uncounted, upstream has requested we not package it. See more: https://github.com/NixOS/nixpkgs/pull/23058#issuecomment-283515104"
+    ];
   };
 }

From 9f062c2c0b98a8f6e715dacc4b90ca712a868fac Mon Sep 17 00:00:00 2001
From: Fernando J Pando <fernando.pando@stelligent.com>
Date: Mon, 27 Feb 2017 14:02:11 -0500
Subject: [PATCH 1832/3449] buildbot: 0.9.3 -> 0.9.4

- adds jwt
- adds module tests
- master.cfg as path in module
- fix systemd worker config
- builds on darwin
- tested on nixos
---
 .../buildbot/master.nix                       | 18 +++-----
 .../buildbot/worker.nix                       |  5 +-
 nixos/tests/buildbot.nix                      | 46 +++++++++++++++++++
 .../tools/build-managers/buildbot/default.nix |  6 +--
 .../tools/build-managers/buildbot/plugins.nix | 20 ++++----
 .../tools/build-managers/buildbot/worker.nix  |  5 +-
 6 files changed, 66 insertions(+), 34 deletions(-)
 create mode 100644 nixos/tests/buildbot.nix

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index f638cf4bae3b..68306109130e 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -28,7 +28,7 @@ let
 
     ${cfg.extraConfig}
   ''
-  else pkgs.writeText "master.cfg" cfg.masterCfg;
+  else cfg.masterCfg;
 
 in {
   options = {
@@ -66,13 +66,10 @@ in {
       };
 
       masterCfg = mkOption {
-        type = types.nullOr types.str;
-        description = ''
-          Optionally pass raw master.cfg file as string.
-          Other options in this configuration will be ignored.
-        '';
+        type = types.nullOr types.path;
+        description = "Optionally pass master.cfg path. Other options in this configuration will be ignored.";
         default = null;
-        example = "BuildmasterConfig = c = {}";
+        example = "/etc/nixos/buildbot/master.cfg";
       };
 
       schedulers = mkOption {
@@ -88,7 +85,7 @@ in {
         type = types.listOf types.str;
         description = "List of Builders.";
         default = [
-          "util.BuilderConfig(name='runtests',workernames=['default-worker'],factory=factory)"
+          "util.BuilderConfig(name='runtests',workernames=['example-worker'],factory=factory)"
         ];
       };
 
@@ -183,10 +180,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.buildbot-ui;
-        description = ''
-          Package to use for buildbot.
-          <literal>buildbot-full</literal> is required in order to use local workers.
-        '';
+        description = "Package to use for buildbot.";
         example = pkgs.buildbot-full;
       };
 
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index 430fd4e53f1c..1ad1319d501d 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -100,14 +100,11 @@ in {
 
     systemd.services.buildbot-worker = {
       description = "Buildbot Worker.";
-      after = [ "network.target" ];
+      after = [ "network.target" "buildbot-master.service" ];
       wantedBy = [ "multi-user.target" ];
-      wants = [ "buildbot-master.service" ];
       path = cfg.packages;
 
       preStart = ''
-        # NOTE: ensure master has time to start in case running on localhost
-        ${pkgs.coreutils}/bin/sleep 4
         ${pkgs.coreutils}/bin/mkdir -vp ${cfg.buildbotDir}
         ${cfg.package}/bin/buildbot-worker create-worker ${cfg.buildbotDir} ${cfg.masterUrl} ${cfg.workerUser} ${cfg.workerPass}
       '';
diff --git a/nixos/tests/buildbot.nix b/nixos/tests/buildbot.nix
new file mode 100644
index 000000000000..13a162e6c6e8
--- /dev/null
+++ b/nixos/tests/buildbot.nix
@@ -0,0 +1,46 @@
+# Test ensures buildbot master comes up correctly and workers can connect
+
+import ./make-test.nix ({ pkgs, ... } : {
+  name = "buildbot";
+
+  nodes = {
+    bbmaster = { config, pkgs, nodes, ... }: {
+      services.buildbot-master = {
+        enable = true;
+        factorySteps = [
+          "steps.Git(repourl='git://github.com/buildbot/pyflakes.git', mode='incremental')"
+          "steps.ShellCommand(command=['trial', 'pyflakes'])"
+        ];
+        changeSource = [
+          "changes.GitPoller('git://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)"
+        ];
+      };
+      networking.firewall.allowedTCPPorts = [ 8010 9989 ];
+    };
+
+    bbworker = { config, pkgs, ... }: {
+      services.buildbot-worker = {
+        enable = true;
+        masterUrl = "bbmaster:9989";
+      };
+    };
+  };
+
+  testScript = ''
+
+    $bbmaster->waitForUnit("network.target");
+    $bbworker->waitForUnit("network.target");
+
+    # Additional tests to be added
+    #$bbmaster->waitForUnit("buildbot-master.service");
+    #$bbmaster->waitUntilSucceeds("curl -s --head http://bbmaster:8010") =~ /200 OK/ or die;
+    #$bbworker->waitForUnit("buildbot-worker.service");
+    #$bbworker->waitUntilSucceeds("tail -10 /home/bbworker/worker/twistd.log") =~ /success/ or die;
+
+  '';
+
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ nand0p ];
+  };
+
+})
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 427ff7058405..b9b8dc719270 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -4,10 +4,10 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot";
-  version = "0.9.3";
+  version = "0.9.4";
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "1yw7knk5dcvwms14vqwlp89flhjf8567l17s9cq7vydh760nmg62";
+    sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086";
   };
 
   buildInputs = with pythonPackages; [
@@ -41,6 +41,7 @@ pythonPackages.buildPythonApplication (rec {
     dateutil
     txaio
     autobahn
+    pyjwt
 
     # tls
     pyopenssl
@@ -70,7 +71,6 @@ pythonPackages.buildPythonApplication (rec {
     homepage = http://buildbot.net/;
     description = "Continuous integration system that automates the build/test cycle";
     maintainers = with maintainers; [ nand0p ryansydnor ];
-    platforms = platforms.linux;
     license = licenses.gpl2;
   };
 })
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index f2fdd1535bfd..b22759af8fec 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -4,11 +4,11 @@ let
   buildbot-pkg = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-pkg";
-    version = "0.9.3";
+    version = "0.9.4";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "02949cvmghyh313i1hmplwxp3nzq789kk85xjx2ir82cpr1d6h6j";
+      sha256 = "09a3yvs5hhf8syrkyydznmymgg86dpvgrwy9rb3bryq00wpjb3wn";
     };
 
     propagatedBuildInputs = with pythonPackages; [ setuptools ];
@@ -17,7 +17,6 @@ let
       homepage = http://buildbot.net/;
       description = "Buildbot Packaging Helper";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
@@ -26,7 +25,7 @@ in {
   www = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot_www";
-    version = "0.9.3";
+    version = "0.9.4";
 
     # NOTE: wheel is used due to buildbot circular dependency
     format = "wheel";
@@ -34,14 +33,13 @@ in {
     src = pythonPackages.fetchPypi {
       inherit pname version format;
       python = "py2";
-      sha256 = "0yggg6mcykcnv41srl2sp2zwx2r38vb6a8jgxh1a4825mspm2jf7";
+      sha256 = "08m4h2pf6hgi8igh2j0qzfq49izc2z0qqj6ddxk0di5l306jx4im";
     };
 
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot UI";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
@@ -49,11 +47,11 @@ in {
   console-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-console-view";
-    version = "0.9.3";
+    version = "0.9.4";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "1rkzakm05x72nvdivc5bc3gab3nyasdfvlwnwril90jj9q1b92dk";
+      sha256 = "1w2vv8iyzl7ak4161avp9n6mhh08adav2fl82bbm17a3064apl8n";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -62,7 +60,6 @@ in {
       homepage = http://buildbot.net/;
       description = "Buildbot Console View Plugin";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
@@ -70,11 +67,11 @@ in {
   waterfall-view = pythonPackages.buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "buildbot-waterfall-view";
-    version = "0.9.3";
+    version = "0.9.4";
 
     src = fetchurl {
       url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-      sha256 = "033x2cs0znhk1j0lw067nmjw2m7yy1fdq5qch0sx50jnpjiq6g6g";
+      sha256 = "17xn6vrr0k2xabw6hr9sdyy0ry3llyjfmc79qrpgp5bsly2qv3jf";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -83,7 +80,6 @@ in {
       homepage = http://buildbot.net/;
       description = "Buildbot Waterfall View Plugin";
       maintainers = with maintainers; [ nand0p ryansydnor ];
-      platforms = platforms.all;
       license = licenses.gpl2;
     };
   };
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 861ed647c5df..3023555d22c1 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchurl {
     url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "176kp04g4c7gj15f73wppraqrirbfclyx214gcz966019niikcsp";
+    sha256 = "0rdrr8x7sn2nxl51p6h9ad42s3c28lb6sys84zrg0d7fm4zhv7hj";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];
@@ -21,7 +21,6 @@ pythonPackages.buildPythonApplication (rec {
     homepage = http://buildbot.net/;
     description = "Buildbot Worker Daemon";
     maintainers = with maintainers; [ nand0p ryansydnor ];
-    platforms = platforms.all;
     license = licenses.gpl2;
   };
 })

From 5013998b0ee4f2289fa0baebf3a7ff495bfabfb5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 4 Mar 2017 14:03:42 -0600
Subject: [PATCH 1833/3449] ustr: Remove unhelpful 'buildTargets' value.

mkDerivation doesn't do anything with this,
and while it does become an environment variable
AFAICT that was never the intention and isn't helpful here.
---
 pkgs/development/libraries/ustr/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index b0a4cc07bc63..c15259c585ad 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     sed -i 's,\(USTR_CONF_HAVE_STDINT_H\) 0,\1 1,g' ustr-import.in
   '';
 
-  buildTargets = [ "all-shared" ];
-
   preBuild = ''
     makeFlagsArray+=("prefix=$out")
     makeFlagsArray+=("LDCONFIG=echo")

From 6f88f8ca1b94785fbe8dab8ac153504b68256e34 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 7 Mar 2017 01:04:31 +0100
Subject: [PATCH 1834/3449] znc: 1.6.3 -> 1.6.4

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

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index bc75fb5f9a48..f51b41d85686 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -6,12 +6,14 @@
 }:
 
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "znc-1.6.3";
+  name = "znc-${version}";
+  version = "1.6.4";
 
   src = fetchurl {
     url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "09xqi5fs40x6nj9gq99bnw1a7saq96bvqxknxx0ilq7yfvg4c733";
+    sha256 = "070d6b1i3jy66m4ci4ypxkg4pbwqbzbzss1y1ycgq2w62zmrf423";
   };
 
   buildInputs = [ openssl pkgconfig ]
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Advanced IRC bouncer";
     homepage = http://wiki.znc.in/ZNC;
-    maintainers = with maintainers; [ viric schneefux ];
+    maintainers = with maintainers; [ viric schneefux lnl7 ];
     license = licenses.asl20;
     platforms = platforms.unix;
   };

From d6192e9985bba22cdc521d923ca6b9cfbd3a970b Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 7 Mar 2017 08:21:53 +0800
Subject: [PATCH 1835/3449] emem: 0.2.29 -> 0.2.31

---
 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 77549ce4df40..cc4e289b7d1a 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.29";
+  version = "0.2.31";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1282m4qwdn6phg5x71l470vs1kld8lfhv5k8yvhp9i7frm29b6w7";
+    sha256 = "11kciq73y76c78rpd87bmlnvv4llrf81g3d28y02llnngrbczp7v";
   };
 
   buildInputs = [ ];

From 2d0991580c3f4bd5b875bb919f60e1b8ec54b8af Mon Sep 17 00:00:00 2001
From: Jeff Simpson <jeff@syncrodoka.net>
Date: Mon, 6 Mar 2017 19:20:46 -0700
Subject: [PATCH 1836/3449] slack: added missing libxkbfile dependency (#23579)

---
 .../applications/networking/instant-messengers/slack/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index c01dbbb98b20..fa0c72f0ca05 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -26,6 +26,7 @@ let
     stdenv.cc.cc
     systemd
 
+    xorg.libxkbfile
     xorg.libX11
     xorg.libXcomposite
     xorg.libXcursor

From 9a7bad2c178c6b4642ed50e7d10e69d03dc3e35b Mon Sep 17 00:00:00 2001
From: Tom <Tom.TSmeets@Gmail.com>
Date: Tue, 7 Mar 2017 03:50:37 +0100
Subject: [PATCH 1837/3449] networkmanager service: support changing the
 mac-address (#23464)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Set `networking.networkmanager.wifi.macAddress` or `networking.networkmanager.ethernet.macAddress`
to one of these values to change your macAddress.

* "XX:XX:XX:XX:XX:XX": set the MAC address of the interface.
* "permanent": use the permanent MAC address of the device.
* "preserve": don’t change the MAC address of the device upon activation.
* "random": generate a randomized value upon each connect.
* "stable": generate a stable, hashed MAC address.

See https://blogs.gnome.org/thaller/2016/08/26/mac-address-spoofing-in-networkmanager-1-4-0/ for more information
---
 .../services/networking/networkmanager.nix    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index c11d4434c206..7255ffc5af4b 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -24,6 +24,8 @@ let
 
     [connection]
     ipv6.ip6-privacy=2
+    ethernet.cloned-mac-address=${cfg.ethernet.macAddress}
+    wifi.cloned-mac-address=${cfg.wifi.macAddress}
   '';
 
   /*
@@ -73,6 +75,19 @@ let
     "pre-down" = "pre-down.d/";
   };
 
+  macAddressOpt = mkOption {
+    type = types.either types.str (types.enum ["permanent" "preserve" "random" "stable"]);
+    default = "preserve";
+    example = "00:11:22:33:44:55";
+    description = ''
+      "XX:XX:XX:XX:XX:XX": MAC address of the interface.
+      <literal>permanent</literal>: use the permanent MAC address of the device.
+      <literal>preserve</literal>: don’t change the MAC address of the device upon activation.
+      <literal>random</literal>: generate a randomized value upon each connect.
+      <literal>stable</literal>: generate a stable, hashed MAC address.
+    '';
+  };
+
 in {
 
   ###### interface
@@ -140,6 +155,9 @@ in {
         '';
       };
 
+      ethernet.macAddress = macAddressOpt;
+      wifi.macAddress = macAddressOpt;
+
       dispatcherScripts = mkOption {
         type = types.listOf (types.submodule {
           options = {
@@ -229,6 +247,7 @@ in {
 
     systemd.services."network-manager" = {
       wantedBy = [ "network.target" ];
+      restartTriggers = [ configFile ];
 
       preStart = ''
         mkdir -m 700 -p /etc/NetworkManager/system-connections

From c78251f17c9d5f0cbebefc4ec3f337c8cec89b96 Mon Sep 17 00:00:00 2001
From: Neil Mayhew <neil@neil.mayhew.name>
Date: Mon, 6 Mar 2017 21:05:42 -0700
Subject: [PATCH 1838/3449] inetutils: Add perl to buildInputs

`whois' uses perl for various things during its build. Without it,
whois fails to build .
---
 pkgs/tools/networking/inetutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index a92c34328579..9ca2eab20aba 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses }:
+{ stdenv, fetchurl, ncurses, perl }:
 
 stdenv.mkDerivation rec {
   name = "inetutils-1.9.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
   };
 
-  buildInputs = [ ncurses /* for `talk' */ ];
+  buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ];
 
   configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include";
 

From 13ed7e6631b834b7f6628ecfa7e7ab2034528989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 7 Mar 2017 10:33:06 +0100
Subject: [PATCH 1839/3449] xfstests: set correct echo binary

---
 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 5573f7e17ea9..d9f87a8d8940 100644
--- a/pkgs/tools/misc/xfstests/default.nix
+++ b/pkgs/tools/misc/xfstests/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     # The configure scripts really don't like looking in PATH at all...
     export AWK=$(type -P awk)
-    export ECHO=$(type -P sort)
+    export ECHO=$(type -P echo)
     export LIBTOOL=$(type -P libtool)
     export MAKE=$(type -P make)
     export SED=$(type -P sed)

From 5641769ff0eded299799b4ad89da1bd7458aa4ff Mon Sep 17 00:00:00 2001
From: Clemens Manert <Clemens@Manert.de>
Date: Fri, 3 Mar 2017 03:52:29 +0100
Subject: [PATCH 1840/3449] mate-desktop: init at 1.17.2

---
 pkgs/desktops/mate/default.nix              |  1 +
 pkgs/desktops/mate/mate-desktop/default.nix | 33 +++++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-desktop/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index c3a49011c1d9..4e6a673d311a 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -1,6 +1,7 @@
 { callPackage, pkgs }:
 rec {
   mate-common = callPackage ./mate-common { };
+  mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
   mate-themes = callPackage ./mate-themes { };
diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
new file mode 100644
index 000000000000..fcb66c9ad799
--- /dev/null
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name      = "mate-desktop-${version}";
+  version   = "${major-ver}.${minor-ver}";
+  major-ver = "1.17";
+  minor-ver = "2";
+
+  src = fetchurl {
+    url    = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "1l7aih9hvmnmddwjwyafhz87drd5vdkmjr41m7f24bn5k7abl90g";
+  };
+
+  propagatedUserEnvPkgs = [ pkgs.gnome3.gnome_themes_standard ];
+
+  buildInputs = with pkgs; [
+      intltool
+      pkgconfig
+
+      gnome3.dconf
+      gnome3.gtk
+      gnome3.defaultIconTheme
+  ];
+
+  nativeBuildInputs = [ pkgconfig 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;
+  };
+}

From 2a24e86676f87e8358f187fb78c0c9747d27f6a0 Mon Sep 17 00:00:00 2001
From: Clemens Manert <Clemens@Manert.de>
Date: Fri, 3 Mar 2017 03:58:54 +0100
Subject: [PATCH 1841/3449] mate-terminal: init at 1.17.0

---
 pkgs/desktops/mate/default.nix               |  1 +
 pkgs/desktops/mate/mate-terminal/default.nix | 36 ++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/desktops/mate/mate-terminal/default.nix

diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix
index 4e6a673d311a..4d662cf52a99 100644
--- a/pkgs/desktops/mate/default.nix
+++ b/pkgs/desktops/mate/default.nix
@@ -4,5 +4,6 @@ rec {
   mate-desktop = callPackage ./mate-desktop { };
   mate-icon-theme = callPackage ./mate-icon-theme { };
   mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
+  mate-terminal = callPackage ./mate-terminal { };
   mate-themes = callPackage ./mate-themes { };
 }
diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix
new file mode 100644
index 000000000000..dd380f39477a
--- /dev/null
+++ b/pkgs/desktops/mate/mate-terminal/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgs, pkgconfig, wrapGAppsHook }:
+
+stdenv.mkDerivation rec {
+  name      = "mate-terminal-${version}";
+  version   = "${major-ver}.${minor-ver}";
+  major-ver = "1.17";
+  minor-ver = "0";
+
+  src = fetchurl {
+    url    = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
+    sha256 = "0sbncykjf0ifj87rwpdw2ln0wavykiki4zqsw60vch7agh49fw0f";
+  };
+
+  buildInputs = with pkgs; [
+     intltool
+     pkgconfig
+     glib
+     itstool
+     libxml2
+
+     mate.mate-desktop
+
+     gnome3.vte
+     gnome3.gtk
+     gnome3.dconf
+  ];
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
+  meta = with stdenv.lib; {
+    description = "The MATE Terminal Emulator";
+    homepage    = "http://mate-desktop.org";
+    license     = licenses.gpl3;
+    platforms   = platforms.unix;
+  };
+}

From 99ef5c84b491261bbc429f5d476c3ff8e229cd3e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 4 Mar 2017 12:36:15 +0100
Subject: [PATCH 1842/3449] cups-pk-helper: 0.2.5 -> 0.2.6

---
 pkgs/misc/cups/cups-pk-helper.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix
index b3d289df551c..91f5af1062c1 100644
--- a/pkgs/misc/cups/cups-pk-helper.nix
+++ b/pkgs/misc/cups/cups-pk-helper.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.5";
+  version = "0.2.6";
   name = "cups-pk-helper-${version}";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/cups-pk-helper/releases/cups-pk-helper-${version}.tar.xz";
-    sha256 = "0651ij5p5s0n3xxbaqsy72s22nx9hfkrjgvg766lkqd1cpniw8hr";
+    sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm";
   };
 
-  buildInputs = [ intltool pkgconfig glib polkit cups ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ glib polkit cups ];
 
   meta = with stdenv.lib; {
     description = "PolicyKit helper to configure cups with fine-grained privileges";

From 1522496288597d9e99aee69dfc3580ebaefb2061 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 7 Mar 2017 09:43:47 +0100
Subject: [PATCH 1843/3449] softhsm: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix
index 5f282dd378a5..42b6024fb214 100644
--- a/pkgs/tools/security/softhsm/default.nix
+++ b/pkgs/tools/security/softhsm/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "softhsm-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://dist.opendnssec.org/source/${name}.tar.gz";
-    sha256 = "0399b06f196fbfaebe73b4aeff2e2d65d0dc1901161513d0d6a94f031dcd827e";
+    sha256 = "1xw53zkv5xb9pxa8q84kh505yd6pkavxd12x2fjgqi6s12p2hsgb";
   };
 
   configureFlags = [

From ec202fe9f197226f9c5a62c2e1c07b8a1f72af4c Mon Sep 17 00:00:00 2001
From: Ryan Desfosses <ryan@desfo.org>
Date: Mon, 6 Mar 2017 22:54:58 -0500
Subject: [PATCH 1844/3449] docker-machine: 0.9.0 -> 0.10.0

---
 .../networking/cluster/docker-machine/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From d12635370b4f4b35bedf1938975706b0ec7836f8 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Tue, 7 Mar 2017 07:48:04 -0300
Subject: [PATCH 1845/3449] lxqt: fix qtsvg attribute

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

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 71eff8a1b0fa..fbcb286f5b24 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -71,7 +71,7 @@ let
       pkgs.lxmenu-data
       pkgs.menu-cache
       pkgs.openbox # default window manager
-      qt5.qtsvg # provides QT5 plugins for svg icons
+      pkgs.qt5.qtsvg # provides QT5 plugins for svg icons
     ];
 
     corePackages = [

From 0b2502a2845ae7ea4f74c04903d925dd6b65ffc7 Mon Sep 17 00:00:00 2001
From: Tim Digel <tim.digel@active-group.de>
Date: Tue, 7 Mar 2017 11:20:24 +0100
Subject: [PATCH 1846/3449] elixir: 1.4.0 -> 1.4.2

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 2d27185a9fca..31a58bcde11d 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "elixir";
     rev = "v${version}";
-    sha256 = "1q05f1s581nk475a8d9hakh2irgvsg50x3084yjzhrcmmykwnysi";
+    sha256 = "0jqww3l5jgqvlqpp6lh8i55v23a5imw4giarr05gsl7imv2qqshz";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From ecd849b267171d7abb1dc8663d8e74f10060a6c6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 7 Mar 2017 12:09:41 +0100
Subject: [PATCH 1847/3449] binutils: 2.27 -> 2.28

See http://lists.gnu.org/archive/html/info-gnu/2017-03/msg00002.html
for release announcement
---
 pkgs/development/tools/misc/binutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 5041ef3b3eda..89faa1d952d9 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -2,7 +2,7 @@
 , cross ? null, gold ? true, bison ? null
 }:
 
-let basename = "binutils-2.27"; in
+let basename = "binutils-2.28"; in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
-    sha256 = "125clslv17xh1sab74343fg6v31msavpmaa1c1394zsqa773g5rn";
+    sha256 = "0wiasgns7i8km8nrxas265sh2dfpsw93b3qw195ipc90w4z475v2";
   };
 
   patches = [

From 3449107d683e80848ed408cbecf20845cf99663e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 7 Mar 2017 12:07:29 +0100
Subject: [PATCH 1848/3449] dvdisaster: fix $out variable expansion (makeFlags)

Make requires variables with more than one letter to be surrounded by parentheses,
like `$(out)`. Just writing `$out` will be interpreted as `$o` followed by `ut`, so
the package installed its documentaion to `ut/share/doc`.

/cc maintainers @jgeerds @nckx
---
 pkgs/tools/cd-dvd/dvdisaster/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index a0306d8d51a9..7e3c2cda48b8 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     # Explicit --docdir= is required for on-line help to work:
-    "--docdir=$out/share/doc"
+    "--docdir=share/doc"
     "--with-nls=yes"
     "--with-embedded-src-path=no"
   ] ++ stdenv.lib.optional (builtins.elem stdenv.system

From a24aaae60252b8c383bdf480858c724c4b38c3b6 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 7 Mar 2017 03:12:49 +0900
Subject: [PATCH 1849/3449] firefox, firefox-bin: 51.0.1 -> 52.0, firefox-esr:
 45.7esr -> 52.0esr

---
 .../browsers/firefox-bin/sources.nix          | 738 +++++++++---------
 .../networking/browsers/firefox/default.nix   |   8 +-
 2 files changed, 373 insertions(+), 373 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 587e807b1686..5e8891385d5e 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -1,925 +1,925 @@
 {
-  version = "51.0.1";
+  version = "52.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ach/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ach/firefox-52.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "264a80d657603925d3ac0e848e60e3593a94e20eaaad4aba1767fc35c8bdd826d7fffbf7aa7be9fc8e380bbc174d53937eb24f887db18fa69ee375f72e8ef092";
+      sha512 = "2fc16b1e570004de7dc43b52f6b0123fc650a7717bfcdd1bab161149f8ad7fab7558df6ce48b7a66cf06d773e5edc25087c2642e3a37d34c6c775660730ae7af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/af/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/af/firefox-52.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "ca4498387c7786f96e3e7220b6a072cb5df0daaf00dade13a149e61ba725229e47f84622f196034caa608c9c2ef49a14450a9816fd3accb62c29063344d354ca";
+      sha512 = "0f74ac773789bc2089b9280af5e995f46f92f34c4c90ef4d6d972bb6c67e8cf77857909b88f0419894edaf6057bd0affa4b4551d89e3e3b938b2ae84911a80b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/an/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/an/firefox-52.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "7abba14523671201798f8abb53233472f56fd961d679aee52b4ae9be1c9b5afe547cb1c10a5f6aa80cd5b41eeb0a3d04edc60a62ed00b1bc21ad8cb9dc86906e";
+      sha512 = "fee74bac85e8b35ca16cbe81aca1d5e180ee6794ebee146d483315ee861f5c4f80797885a2a1a4d6d759fb787fa5e4a252ab66ad6cd5102a1dbaa346ed89d5ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ar/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ar/firefox-52.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "429aa2cf388d1efd0e6d9658b9464d06bf6aa42cce1b9b0d4bf2d85a350fbf307d45a205d9303ff386fbbba56a637c19d6c7695a78b9947d29ccaec285053864";
+      sha512 = "2d2f2daf74f829683959411f712c26ae232db3c3e079ef54ee4b12cea20b58a270df580f9256eda9bfb0cbf90bad3890c8d58a5576cea9f5a25e6c17dd581b67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/as/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/as/firefox-52.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "670102d9e6b50aa44d9d035af068dfd55d5b009a8e189e0e0d1e6d3404918c0e009e3e573b3de2601801e7c792746885d32aeb48235921c4cbf7874b82f06a73";
+      sha512 = "4da8d96beadc799c27d72c56f1294dca5c8e76b5a8bbb2a9637bbbb16ecb47aa563abdc0bae5078eec040c019052e233608feac180596f8dd0787a42c8500222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ast/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ast/firefox-52.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e6e6236bc496bab83bb64c7fcd2444d4f81fa49c9b6914d2d9abd2cced829f22b75705b3755525277d0d5a1193d0766cdaf936423889c77a2773ab28d953c738";
+      sha512 = "7184213214f8687a8de9bf1dd8326c98777e613a47c8e6b3bc283e94c09c5fd11d2360a4df334ca1447bd773614f6b8673ffb67a5323a2d0887efbfd3aad6f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/az/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/az/firefox-52.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "16b6fed737a5d2fdeb18945cd71f8e844abfcc1402ade665260d2644612579e76111a53548dd5c645c5816fec7c8162df91d687eb6b9dc84ad520af2a9580dde";
+      sha512 = "d9a791b2a679438686896ebcb995600138fb1cd88310f720afa33e302cb161550dbc628a8f3b2699217ec9275a54920197c2a2e8a9ff8671c0b6d29fe372c60e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bg/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bg/firefox-52.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "dd311d55e182408ba16853dec80d13fabc957e9ff9e6098f040698b35fea28b4579827ca35b21188f1e6287b749fd1ac94b3bb9979b75caf5b10b90686f425ac";
+      sha512 = "1a1f7d34375273786cd2efe5c138aecf55839cc223520a6d31eab84446860f480521e380fa76003fff7a9fb5b41668bb20995c9f8ae50e11dc453e0ea6de3b4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-BD/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-BD/firefox-52.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "857a13768160d71dfe5dd806933c85006e63508b6dce63545a0618c20531204b672dac7b2634dbba3a453277cfc53a9395215287ea51b18642d8e8c97258c704";
+      sha512 = "283255c0527e44e43b9de32940886f038735537f04a83d6ed17dcee7c157ec3cedf1f6e043c7365782417040c9494560623d22552e9b9aebd5ef0a18c6dd38b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bn-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-IN/firefox-52.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "602c352dd5de9a90128318c72496b2439531a5f4c4d16b28060686396db0b84c1300255eb8cb5dc6e6560971e6283d3c4bbe4376939177e4fbc0192898922a7f";
+      sha512 = "973d32d9e8106964bd6fe15064e0bfa851e935f7fecd353e199f88a0dbe5287a2e65740f079a43dcdf35a76a8d0c98d2f24c45e8b92738e38b0a71766d980cd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/br/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/br/firefox-52.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "fa8ba39abf6691c4127b5d4f6002405eff04fee2522ac274ce57c349ae042f5f47ee7cdb3519608d6415629aadf6a5894f575dab79ae3055fba383cf2680cc54";
+      sha512 = "2b7180ecc0bdd038faabd837e6ce09442e8254d997f50d709fc1e4779f502ebe8d4bf0e3a90657601a9f67a09d88361da0cf354929a043116e613eb9c709f704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/bs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bs/firefox-52.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "c8960b8cf4055c7a9032a3d5c10bbc59bf1b828909bfcb57f45a8d05dff07111d18da1644a18cdccb653630d77ebc17d435109d289f1d378335db043ae2c142f";
+      sha512 = "9033d98af42e5affe3f5b80dfc16ea6b08660c5a06326a50540b41463ba7356a51e9a1107fa1a698ebd0fb828100050a504a380811c8f1047aa580be28b7d9c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ca/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ca/firefox-52.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3b8cbbb0b8a14640f2b919fcfb67d4274e6ac9c6f612bb4baf5c368752d76fcdbea7c795cdf23b00f3bd64ddb2ae4af950cdb7a0637f621ab0ef382c1f6933cc";
+      sha512 = "d0ab3be67b331f3a6c18cb1a4036820ecb7e67187ba0fd6fda59b9b6a707482c065dd21d3623796007e5b5cb492f16b95a0a759f950b830c45909910fef8ff74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cak/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cak/firefox-52.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e7a325d7ffed7db337c5fa4c3bfd31bf8b7703041de16f8024821f1d89487f36131616d460db8518d71d20af4285d43a040331d304c5b828fabdce181f736965";
+      sha512 = "6fe7403947b46fcd7535ff86259c4fd1beb36c22b4461f9ed676e38c01feaae6ae80a7711e15340e7a22605ce05b32ebd1786806c96a1e4a30b322d040acd868";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cs/firefox-52.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "32a4b758b2cfac67f19a7fe7ad7d04b49122921e2b3c1c8236d8be3452b665aa54c13dcd9e2d2b298dc017b864f56aa9b6f06d174be46ca41a722226a15eaf01";
+      sha512 = "31c326df9d697dc5ddba65eb5d3c998c8ecbcda7a14712fda4909fc2ebaaa257247472d315e9d58e17cfa7feb75225cb1d8d20632381e35c3b65f47d21fa0885";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/cy/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cy/firefox-52.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "908bc9d3d9ada201a2fa81a83f6773c635c3dbec0e08b464c6dab5a311d667291fe7f5ee403ff13e5cd923d01cbfc0d9e2a0de3a2a7469af4bbf4afc8368ef4d";
+      sha512 = "7c56c2780de97448f796763aef6df581639b27feced5c06e8184da2c242d0cc6500f0e1692e7e2c70f324bd9fba1f1b780146c6e969d89d2053c935cb120ef19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/da/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/da/firefox-52.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e10fd9c7ee4496a674cb18414f0bfbd1671d21aad4bf41a63432540555a6f4059faf50e488bb76241a1e15884fdf7c43ec289e2641d9ee13f63985062526cd07";
+      sha512 = "e3033e0cf9100454e8fe93476a4b9935f1783f2f5489fabe9c2b495efa1af935546f8350178bb89ed71917f7fb11baedbbf90bc95922bb4c8d8214972bb61938";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/de/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/de/firefox-52.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "07221eea748fbad6ffca0b7f77e4995039e28e506a790d5e858d4d88cd80737f1a366735a4a826358a9aa76ee1b454d99f8fc8732f4082e91c9a9e5ce40a9b81";
+      sha512 = "9aa9a36751e14d30e7ac34680e216785d657952254e67b1cf3de33288907019790bd4f865a142551118dbbe12ddbfd28129fc74bc83d3fd96f1c250874f680da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/dsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/dsb/firefox-52.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9e2f1eee45e5dc1b8f7ab5c72c734c85bdd21544500c45ba1b85580cc110c02499cc69b596d979633e64b3aee7b1408e27862c761d4451b749399815199d3694";
+      sha512 = "ac543d1f58c287979bc392618051c1d525d72cfd8d51a2eafb611954be12889f40b842ef30b37001686529f8d436d259a56ec37d50e14c096781a0c44de3ed2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/el/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/el/firefox-52.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "270b1fd5fcf6958929e81c38a5ae2d8b5ee3de62e64eb6e7e7b80a8520759f1bddf03eec408165853ae624918194c57c2b7b496b4146a78ef42bc4b5b77a1d55";
+      sha512 = "190d0f6eb4b9b34e8535b90444e90983fedc89aec81ae0fa3c22860bee552a1b165e3e3e0531698cbbcb0d24c175479b96a772891d099d39ea3654029dc5e36b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-GB/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-GB/firefox-52.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "79bc0e031f3ad065e5309dc20ff509d9d6fa85c2669548b24be9e2b8fd9347ce354b51faea65943b421941ba20d8d0fb22c79b89ad380a37ff52ccf330343f33";
+      sha512 = "6dbbd4b3a0033fa0fa0eeeca1e141154f90cb1217371a4c5be89f468e8a3529dfac0d9cd624b9cd4d1f93ba52028de8cef3678605f68597e587f644215212bf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-US/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-US/firefox-52.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "724a778bf54c6778838378c07481c5eed2cc7984c1a9809e352b6bcbd2562c060f6f39b6308caec2e62c05f8631753796a7b2714afda0606bab70b3ef3acc15c";
+      sha512 = "55e553adbb74b246a3638f8fb2db5ed4dfe9342d3f2b8fa8924290a45697b68b8cf56ff8b1722326511d6da700f181d686b9e9234a0becded70298b85d41e305";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/en-ZA/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-ZA/firefox-52.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "ffb4d4554ffdab057507fe29c0fb56a74e683b3bfbf19b26a52f23336918c788a476b549df3b4f57dc79c555bc36af620f46bcbb7c6467855952a024c75f7213";
+      sha512 = "fef8c97af1e77e077206527f6ec0e06c1176039caad06e9880958c3fc34f4cb121d0a234f1bb1c1beca12877e403b1995ff46ffafcd7ab7849966e961b13c913";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eo/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eo/firefox-52.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "42768a6de7144ccd63c6a58c6fa2913004cdc3d7f35bfbb3d47ecc8a705672d2b95e8e8389fdc6715bcaff48b2c1a335c23f39a2c07d03b4cb660146fa811a7d";
+      sha512 = "44d5497fd194c5743f2da30ebb19cfd5705c94469bba39803cc94e76b87a7a41c1e5f500b44fb28a7a36b1d4f3cd23c582fdf1c6769c226b4aff3808f31aa23e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-AR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-AR/firefox-52.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "36da6cd0f8aea2419ba618b11f47764510c109c18bfbac380234b10c864a991a211742be3c058b4a8a59944324c7b32f65b4b3b8a9bc25460e6b4ef99e5d12e5";
+      sha512 = "56a43da6b90755174727734c7d5e2c73cb27c3d81d563b0e50a30e5c7314a6e7af0bec1f51087079caac92fb826c36001c2ca31d526ab4f1051be77a3140551e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-CL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-CL/firefox-52.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "e3dbcdad48741a73aeebc46ab4771b4ea2324e6b0a9e6af020e0c5929528458cc3d66931dc67de4bf93b90afbb7f79078436c3da1ddc35779fbf40b8aad0ef1f";
+      sha512 = "85a8bc7d4496703350e7c8652d8517ea719b4ff7600b2070f41d815eeaf184dc0110d1a75a8e7d85905d44eab7db1e5f98f6ae2f19efc51123fca79e8ac78b44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-ES/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-ES/firefox-52.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "1353c9d7fbe55d579486488d94d34b5acc0a87f6155ec2aa106ad6b2df53ee6813e19346bbfd920d5d0582bdb9c16dee667ebc384d48e06026fcf79590dc30fd";
+      sha512 = "7ccf29e7fb6c4259e146601b6d3bce643b2b5424a5940804d6e8c1baa58c0c4b3ee3c1eeb58caef42e4c799c7b3ede6fcff8db117f3de042fb7a52638b658826";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/es-MX/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-MX/firefox-52.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "fc93aaa68159c75d5c53d253e71aa87d099f499ff54a10606f0b87912837a1b85d897719d69753f6f84d389cbdf64a4a9306a9d19b809892032431d1a142b03c";
+      sha512 = "dcf32d58b6fd5bb7b631305e7be42182a13b0abf0be1f5fc22c969449b152c536ca65892d20d85f5799bf14627449e0b61de3a67cc9f33e23f8494070f7ffa27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/et/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/et/firefox-52.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "e665a3e923bcd1ed070c1c4852d385f61ef43b5e6b39ad1eb0f547666d9c1cf82022638b9b60ef25f1621499ec930fec09367634ac972f7ce4c95f9bfb21cd15";
+      sha512 = "d67c35211d0220d4f9961ae6fd2664b4e4d5e8341f97f1505c6acdd9bbc57ded445dd167d31efe938b00e2f64240e48bae06d7ae295032e5eef382412fc8ea60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/eu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eu/firefox-52.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "aaad849c7de92f4dcda618b882b82f9c1ccf1de45454162f90f7beebe060d2f2c53e21dbc7a50ccfe24c505608f45aebd1744900647d7131234a55e79e4e8a6d";
+      sha512 = "2ae3709537afaaf0bfce3d40ecbd38946258de2a246013c64ed6ba6fbd2ef2898c3c0ba2cb6ec512060353a0e1864b75c3358a709ee940713f45fcdff94e952a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fa/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fa/firefox-52.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ac4f9518cf658c2438bc6037cccbdfc5f3af40b4c2ec89c6ef82f43b171f3d781ff067ad096322cf316c4b46dd27f7e0da68291289d6f03e81d1b90f3c436d2c";
+      sha512 = "ab880a914c5bb3ccfc99814c6c3ff53bb4b5fe151bd4db081cd7f84cbbfe5b85f14550fa83abedef140583d0084562dbf9fd46643716022e7155d19333f979b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ff/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ff/firefox-52.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "0a788a34a6f8ac67da73ff0531ceda803a911f30b77957d31b47e5acab221a55501daa94643ebd2d824b475591edb147ae66a06fe2641915c8a18adaaedeecd6";
+      sha512 = "b3859fd606829d519fbd66c15cde7f22b21129e503e785666e2e76ed8ba9ddb4f2fdac99d0fd45a295f2384e6cb0a92b9b49641a9ec00842590d236a4b49bf43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fi/firefox-52.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "c163e07e2097469be8dfaa57b6b722e9787c617cd8833e043b742a4d1424e7835e2c661412aae353fe0373bd163548102fd0b30dc37fbffe53444f0791c1777b";
+      sha512 = "b0bd095d475c786d2e5af898cbbde4e06cca3995363af180b7d56a03830aa30ddabaaae64ba685724778b613262074f5eb3ab17784b547f502ac9170919956cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fr/firefox-52.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "481a00f96cd79c04fde00ea39e560193575c1244d6e13c38ff4a81299cf944909a24bc8c8e0ff2a280bd9d4d7e8ca77b66e0532dc0643967ab52f27148dcab5a";
+      sha512 = "70cfef5874adcbfbedd07a7e6a838d3a7cc0bba3a14d009abb84ec6307b89c5568e5dee13ab435a69a5d8d16083f051da6d7fd01583001dfb4aa514d6820c082";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/fy-NL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fy-NL/firefox-52.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "37d8b6df59f8433efbd55de434b2639e83b6306065017b62c8f2d1730dc84842081abd9669eb48ea862b36c0c62f84a0ec03eaac7be17463129b46a03426d8da";
+      sha512 = "e21d8d72c62f504cb46d13a4d386834f4c3fba4e13a7b7851f0a991d52ef68cd8a51283e3c2ab9d1edf18c6955126b0ac397de9f5fc2fbef2e31ffb1ae953964";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ga-IE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ga-IE/firefox-52.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "a6516adb884d070f4e6265e89e9a20b99f06f4093eb01df612f19748a1dc5fa07ed949a5d90030b8c512203717f0c9cdfdb307e1dfc2fbcd9def2bb7caf92dd3";
+      sha512 = "b341e6dd7e0506c9ebde9b21bf3a265b476bfbeb6b74f32eb6f062769ee8e70f58e64157165dd8d099fa444a6beff97092e4eb960a98f56938fa387a602cd794";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gd/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gd/firefox-52.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "1d8710d83abf7e185aa73da047efd15d7e0b9667b80737528900a15b9a6aacd20588c963366f2aa08c7772444843b642e53bb2d3ababbb8b9812926d7c5a858e";
+      sha512 = "fa799e7d9fea0e4ce8f9de26e0adbf113dc95a42174dc70386a1407dede25108d8d27dc41be2929947fec362bd6bb10cda3da0e506cb4c15b77c94cba896885d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gl/firefox-52.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "08fee9be09fa365e188cfbe00dfb50c9b82a5228ec9d9feac7b4f01de43097f20dae4cd4f05da9983cff7d9504a5443854e8c13e8114a0977e65875406942007";
+      sha512 = "f9ffa106084fb083173e07131cfdbde5a45513e14adb5e87d60710ddd43e7be909b212e11eb2c0f3062d973c509d14d89784deb6f68f9fbe83a5bb54efd0f706";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gn/firefox-52.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "4a21dc3c3355c08bf98d6366acfceb84841f50f5686dac61e87def3995c0e0df399834640722ce1c278e461096996320d7eac9af400bb08d1bbfb95cbfafb694";
+      sha512 = "0e2656122941ab02a9fbd4c4614058851b1dbc9f3bc65935fdf357ae29a23bbacbaefcf24d610ae991058debaadd2d17ed308a2fb9c44d3b9430bf31702fed7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/gu-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gu-IN/firefox-52.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "0d565d1e41f9b57cd71d30034f576877650941c4e2250b49668232aa7cfc9a3e8c37dbda3e1e8eafc594fab09ac90e4b3f6b52c90613a9b236d9dc4092c65e50";
+      sha512 = "1c440a46044ab52b547bb949ff10da02dcf156f6195b2ccde058ce9f43ea866cef96365132302609547969afb9c5ca267eb51c917f6794e23d98dd3f98df5cd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/he/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/he/firefox-52.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c0c87223d0c51b2d4df51ccf1d48938cbc2860f90b32a8d32fa69c7a4768c550deb9e9ee3f720404d51fb1461e0f25b56dc927449acc6a5d5dd23ac64fb4bf61";
+      sha512 = "22a01a470d56d22707987b84a0bf0a89b5f21c8b77c4255c0a5caa85b9549ac6a9af7f210ea7537d51f48c3ed84096de4df2474d8b2cd59e89b26f3f561d0d4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hi-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hi-IN/firefox-52.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "6c0de623688af6a3eefa1a5a230979d2342d2414d27acca2e64646a9c82356cad47898d9fa791202bbe97464fad6e0903a12d73b15088d36062e89132c8e6d79";
+      sha512 = "89d11d581bfee9ef435226c367097270482da889df318e837230aeb28aa4d112bb357ecbe4a1a2c71d43286d10a0a9a1255ed0123f46793f3a121558d70a086c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hr/firefox-52.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "637ab29f7bc717b33007970bc23abbf75bcdc39df3be75c71830ec27874269a948aefdec854bf051d702f4201525a279f3f250734a35b773bbcc44e47888cb10";
+      sha512 = "b0b5a0263803b01ed338bd37350ca85184b7fdffc7296e5cbde6d4dc5e3ea1a25035602e8d00090643804f82d9006b6b300d7aebdfd7b58af1a588aa22419b0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hsb/firefox-52.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "92b7c0e1ecdeb485ea616ed025589add7305be63d401c37ea0372b2bf75d90c41fb8fbdb99de1c21c61da6f8f59ab1c403d512cc0c19828c10336a9f1a315903";
+      sha512 = "0fedac52dab1961c98a90ccd981c9362aa7f5697c0a2654c0529f33cd8c2e7d7efb0a36589478431cd34b876388bbabb8eb1aafd455afa76d85945ee975a2c61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hu/firefox-52.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "04e1aa441756e4452d1f8d762a5ba16af0121a3dae2a1fd1f33c223531a5f17f5cd1713b9fe81ee2c3746117df8942c26ed8e27e39e82644684babb060e32eb3";
+      sha512 = "729c194c24228e008e7464d75b7572fc6287841e24c3cb83c94e0799f70428b405c9effb16cbe0e354c001756eff2c780987a909a2984e3a33a78d09b096164d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/hy-AM/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hy-AM/firefox-52.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "a962703c41aa3a9712b9ec98b5c00b621b844de5e277f98db65f9b682222ef580e2bfb259cdd6fc4a165ff319ba62daba3e0445b4cff0c47e4582249e6dd1add";
+      sha512 = "9fb96724588559e800cc39adba0619b6d1efeb0fb13f6e0b93e8a59cb1042bc73297bf97c46d838add2cadcd0ad3dcf97fe329c6447f11165770d573a24e7585";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/id/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/id/firefox-52.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "fb8a70915b978d61510f843de20e3f6549331fa5e625fd831b1ad7745e33c55cbfdf0afc8fad51e82b92ff60cf88a8a9bfdf4471036aebb75380b713401d03fc";
+      sha512 = "8958cfb1abbf21148c82dece6cf656b543df31bc9125e87f4de01b4c749cc5ef4e4190587b2a14c91ecb27c97f198f1de151c5c32683f61c0855120ad738ec9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/is/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/is/firefox-52.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "28af7725b79fbb2ea49514413e886c7e8572d55d943c99c2a08887ba8371526e3879735ca29989465a5fc7a35b09d781740b97988c3667d212c5d3eed5467e00";
+      sha512 = "14b989d96abd7a21aa5fdc222e803e73744c232d861b392da266e10b2f2be3e72eaa84f57665491c0c7b590ce3724805024c54262f1523c8debe48cb8b318027";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/it/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/it/firefox-52.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "c470694846df0b78cf0a9b43215d3e187720953508109e04b6d11c2803dd981bf4c0c2116e804246f95643ea8a8c47c4c4cebe7cf45a867ae50e98b34cd68681";
+      sha512 = "1d9b164ae2b4c2265bc2101b409de63fd10f1181a660a61348ea1fd01171fca2f38e716f1a35c5f680fd246532debd18274919bc3dc2f421be0bcb0b7706d8f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ja/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ja/firefox-52.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "96c6f130818df3e642c3f43ea05180629ab9ce80cce7da668873c7cac7745d5448815d00c9dc7be88e48384c0603e2019fabd5743e4c48da6aff4495bb54c740";
+      sha512 = "7cf13ec3bf7bb2e19096732ca8d2f1436296e4955302a8329d80d1ba295c2c622785b370dcc7253070fdbc133a4223e438d37d3b2c2b4fd823c84261907029de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ka/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ka/firefox-52.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "7559a392bb227029cc6950d21e222f48744fa7cdba666219ce66697b7ab97c7d036539ee4527d956a0d74c2fe9fd6129c71c6a0faf36062cf001c2b68c973ceb";
+      sha512 = "88a54a3c07aa02e1da990b93975879b29dd87b3c4743357a4a029bd58e793539a039695306de9abf4a01161d61f22049f5a7df2eddb8124b3034be68434412fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kab/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kab/firefox-52.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "f98b871784261f0569aac50f10780bcc79e338d0b385c605a3e348b050e54279e4387daffec826710b8703b2ad38fe8d63d54cf3c12d94da8368091668d9ab3b";
+      sha512 = "31c9197ae7411208cf9fb543da9ea8e21a770ce160a1f109aeba0ee98beea8a760f74d3ba526d8c75b47510bb0475d523592379e511f3a881279b4af49ea2ba8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kk/firefox-52.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "6ecfba23dce0b0ec23c4b309aafc6b6d89a69e889be31dcdffbeed90da4bbecc58c18dfbee6dcb9e09d65a495fc57535457aa7750ebab364cb46a73c548724a4";
+      sha512 = "62cf335828c4ee0f834187c99e2faf03ffe15693d5a7a6d0f9e2756f60f0f014aeb3fa507bbc8dd28a856c98254979c98d5756413c7a7d597b02a2f98bcb5ab9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/km/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/km/firefox-52.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "b9eef61d168e7f73c537e276c7c4d4ec5ef4e886c10c5c1e0d16c22e07fb68ca39d64b7c0308ae662c73ebd1d1a760638da6000db4ed7a07853f096632df690a";
+      sha512 = "efc614494cb18f21756bb25211c4bdce58af1f43ae927b63c655cd76605a1ee6ea95dedd6398fcf8ef81da2811d8a0e0c46a108a55882e7deea9b27ff089e1c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/kn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kn/firefox-52.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "df5cae66a6b62d74d3b55e96135099bee9744edca2e5f3b0e8b21aa9f3cb6228d4477c63d62c18f95eeb06ba774187d214cdf0161be20c7aed7ca9d835722f11";
+      sha512 = "0bfcb783ae230f187133f2fa5eb1fc8d77712e34eb41f73bd64bac7501d28f11bbbf79e7fc0b9a8f00d499b27f7d77917050de7b4c90f0c71387cce149c6e745";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ko/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ko/firefox-52.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c5d023c4f0034950dbef00bf4ac4945f1e8853e10fbcdb904268bcbb855f5997fa091d7739683776af097524a5a0a602bd05dbab9ede702ec8532b18465ed47e";
+      sha512 = "de4d4f1982351f7013524ee8df8d394888755296724c7c578dc59c5adacf42845aafb31156f69828de49163d72a89f31003140d81b59934bc87ad35e856b9369";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lij/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lij/firefox-52.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "1c25e8bdae267c9673783f55dc99a23ba14c904a6763950098591f3a5db2e0007d11fa52506ed86018edfdffa5c3e6a7d3000bc0d30a69381b3a92d9f14192a0";
+      sha512 = "c38525ef79e48ad5e9bc004f2e297598bd86c3aaa578dc525b66b26b5c6b2419daf99b6d45f64739a0d62a03dd281bba2d53b68d4eebdc9ea033b37adc840246";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lt/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lt/firefox-52.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "7c95e21dae9a449617f3405614f8ab934fadd93de771a4aa44a718ccb20e2976922cf88121d9dd3f2fbee892de7d435915b0fc7aa80ec720b297e668beeb042f";
+      sha512 = "ce6a5628317e81dc1b61a2ff3b5a0347624921bda728ac8b4de19d43270bdf294b1e9f1c8f9460594d53a94707a041ec2a4cdfd7363e1a4c273edc9dd68095e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/lv/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lv/firefox-52.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "61928f84cd78ca91ad758e4b4fe391a3d50cdae457c66a14511e8770c0f1ba76c986c8a1e07728717642d77557fe8d7f70513f5cf2884566e092482f5b98e18d";
+      sha512 = "43fb630b7202264d98cbefd1b9e7c30c804e6023251e161f5f0d3250d5975b385a3beee08142f32b2c140ab0ed223dbf1909294b3e82def4b0ff7794f5695daa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mai/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mai/firefox-52.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "61ccb7600c1510d6e0480f35f63286cfd095edfeaa24e9ac2540a22fd1ea0c246d221e6e5b4d1f68bdbb1c9071b480240bc660097d2a761ff4166e1b3a6a629c";
+      sha512 = "3db01d1c2b2bc22ab8ad67fcee00c93106b48b2c8859c726d4efb0d66f86088ac2e31ccd4bac5ec76754a9948c77739e7e0473447b227d3ef11743f655705cff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mk/firefox-52.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "89ba4db24bc1e1689925885446846a915adc1bc590f2f65752c54cdf6a69ca21333a4d6ef1b3e9d7252fb890de0ec41b0c6c229b9cd0d03b167e1bf4829befa0";
+      sha512 = "75d8ca10d3ab0e28947e17a5f64ba5fcad21a9ac68784dc2d0cd80d02ff8faafe6aabcb7b26a7c1f05f665ab18fa276e2f28af0fa8487399e6c466ecbb0128a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ml/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ml/firefox-52.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "2889ed4020dd1ef59d90dcf727d2758937708b1189bee785640bde9d12b32fdd252cc181c193462fb01421fcac7fe71f5989cdb21a46d8a27939bd814dec1177";
+      sha512 = "7fcf6674469b994b12c8e31fda52be57d8ea9947aeb32dd35f00ac4e0c66d651542b4efaa646c66099bd64c42aeb0358f3a52e4d164b7e91a10bd487eaf23e6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/mr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mr/firefox-52.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "d85c03d1dde8003d7f877585e1bd86bf1cd9c3685fa2a3b25d1a0cbe5496b9cf09aa44940babe42fecbe22ab8a261d585695bb441b2e84f29fe4d9721b494361";
+      sha512 = "8784880ce70eb5d0ea160f9f26b4446ffb5ad6796299d36912440076f0cce5f59d3a59aaf7e79eb7b2dad5b5c5001498276891b72d77bc8e9a7df6aaab6bf412";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ms/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ms/firefox-52.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "9e88c9ca69dcc1acb3509d8197a73af221b38e0154e19a0912743064c1a877e23f9966ca111caadebd0245aba019832720aa7e95ac9bcd41c45852aadf7607e3";
+      sha512 = "faaa9c67122e362d011db6b5c403375994f397b3a0270d70468154a8f6f1328dec85f6cb9f3fdb239f3b778a605bb83e64f9b5e1ee99d104fc3abd63fa7a1d17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nb-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nb-NO/firefox-52.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2b59fc05c2bb90cdd1c8841aca920bb9dd2f4ce125384b1cc91279f3e125668e54bbe8e73efab1d3dc018130f9c1188f0ef7d2d0031255bab6bc16b820b53ddd";
+      sha512 = "755275081354ab0dbd6ba801b918a59df40af7ea94760042c32dfd08c5625fe94104d0eab83a80baaf93b631d65cf9619fa93c49165521cf05e2fde738bf6edf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nl/firefox-52.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "cdd2c8feacd7e22dab6762289f9fe7b42dd8581adf70df47f5fe1c69083ad369da2daa8964f846787085bf6932abada8c447b15a7b5693cdd32f4c00eecbb3e8";
+      sha512 = "05c4dabc37487d7ebc379ccab1c062b43124934c885b277d13b7f6adb8563bab04cc55e0c1824d4a66154db6ca6f10ace14deb962645098cc76ba7291db80e35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/nn-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nn-NO/firefox-52.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "c902e7ad7024e0e2b1acc5ac3b1006edf1d4abc4213db17da4c92628ee3687051363645829db08fd2776221a3048f8373e3a13c6b02f4f13d81f420c93b03df9";
+      sha512 = "fde805c087400922a86557511bfdc8fde97843a7a8e0d138dc83c291219bd29dea404b356d0ff87c1ed907e6e749f73962772b1a3d821505451daf6356327d81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/or/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/or/firefox-52.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "c62a5a2135553015bbbf688bc35fa4ebee02cebb5593f7d31e30f8648bdb715b37161d34ac8310a1a0c0f651c6f336e44a71097c6b09f5cb480b0f0a17e3fff8";
+      sha512 = "47e2bd4cc1c955429f5c28e9ae92833ff7e9211bb1251e01f55a6e0e1709c107d7012c4da3e367c2481e67ba3f2091c9145d93b2920362eea4c33be9904ceacc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pa-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pa-IN/firefox-52.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "d993d5808649dc7367c38aefe9dbd49d3e434784dc515e1203260da6a6d13968971cb63949f1cf9188d5a05467f07b420825ab752e7ef3f556ca37853f841733";
+      sha512 = "4fe0d44c5b3282b6788656a9d0da4681dae7e5737106fc18d10b339d95359035a8a746f3b5c4364b8beb321f82c9e17059d9eb51b79f5173b60aa0541f51359a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pl/firefox-52.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e58720685e6e55671c332f916d65ea04301fabb05bc250a56c5aed1f9b1044b333d60ef729e08ca382d775dd35b86d84dd266cd5d5bc0d275f58350a598b7464";
+      sha512 = "d7f1077f616b9d264ad62c04c1734fcf67729f6fdb0a7f3be4a36b33d9ba247550a42b93c8da0c7f2dc1f552278c104a3efaa80bf4cefb1aacf806025b1c1c12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-BR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-BR/firefox-52.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "f26934daddb1f43ef364cb4c97eb9f625a816a2aede791adbfeb3cf959ef1b1c9b75f2e1bdb907be1ea4640956e55ae4facdb67a3323099b12cb23faea0891c1";
+      sha512 = "5cadc49cbd2dbf2af20d99620c7015b2cafa687c1739badcbca0c2daa3435b454fa0fcb001e6ab45d685a950be91963d6649218eeabd6895f530a7f5d007bfd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/pt-PT/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-PT/firefox-52.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "ea0657b1966553e286bb7c610adcea89da7d435675cf575ed4858f207092f0eda5dd3e91a5127679aaa3b8a17efcc660c363327f4ea20590a890cc43d2ebd5ae";
+      sha512 = "f661dbf60b6b844e7fc085492905b2a568a36170150f1712e10ebcc32f9ab57a805b6b9292c2e4451ee72559120867b0b5c589e97ec4efa1ec64c60a2e283317";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/rm/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/rm/firefox-52.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "197b212a29f056b22d3cf5c881bc9dc1b2cd8f47ef5e90573975a180743d81e696f5a3a3ddcd414fcff66979c6fa0e33332e5ef5586ce6e0d2f3ae7e939cd9b9";
+      sha512 = "bea3e8846a1030df7513e8d383cbb82f693951803bbc5954658996052f301747fe2a67cff3ffea2f5b7abdceb028c67c3e66a6189615bc2f90f9c03e53e0cf2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ro/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ro/firefox-52.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "06143af441806517a03a2ba1293316f1b2979cefa8395ed3b9f3579cc6d23da8ecdd219c8cb53f871d544149e0e2f18ffa9387cd57b2407336866775c56dbcf2";
+      sha512 = "9534563f065de5083af1eaff3ff4bd82079c848092f63fad4b0009e475bb4cc23a8a0c17085c00798b16ff2fb9e3b79f6c3b8e981d9ea083e6f3b8c5edcf3ab1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ru/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ru/firefox-52.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9680dc697f2760163737a443b345c657da6eb2cd6d6bfab5016675815cdc4a4b393f6f9b91277bdbb2962c7cbd5cce3670a633398a5c59d86d45d47072a72b1a";
+      sha512 = "0cd86a2595715c73a367cac8528abfc07b930274be56f2fe0672161aa27b9e409d9a241ff822d566fed8f4ea7d4795b358e10d929ec77c4992386ad31d49aca9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/si/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/si/firefox-52.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "24a870b434a3b58cb93d229f12b58b2316f83e0be6c5e30ff724468116679a90887269af42ffb0080b4bf0866084afdf7767d8d17d3f34a6dd9c30de8de3aa1d";
+      sha512 = "44c760a5c134fe22d0df3e846913f126b2a93129c542e6e4a0d1ad2704d5f275148776568864af08fd4d1f5b50d03d67bb9ca4d07203061522c1974469a27a4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sk/firefox-52.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "60e5947239a89b616616c1a45375c46463b3a0ff0b2c5d37a4f5eeb6cc8992f21ee5ea87592710a89e1237512179fb84a93f471cbd8e8d7a8dfb506cec39eaac";
+      sha512 = "1af8e84bb1e518e5d21a78a14f4adcbbadc0c3d08afc45923975a320e76492db97f3e0cdc90ea999ff6eb02ef7d717b817bf1ec6ce13d4bbd8e92cad3ce8c6e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sl/firefox-52.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c3b87002895c5cf12314f7f7c1d784228b50b892eda9c2e94a7630aa5f5bbd35a27963cb008063b53869ff18d6d003deb456ce6506f8a52c5ea11df3b736c312";
+      sha512 = "9d7ca89124f2e1831a762ed210ce89a1ca4cd683382c38083744d1902d357fd7d34e3e573bd54d929a5f03633686f365bdca3ba750c950e97e14209eee65c4fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/son/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/son/firefox-52.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "14437f5b71bc9902fad66e9d7cd3ce144c1dd19a8bfe1f6ce66f7f456da165cc9453b9f314e67e19fca3516d9b2a03b950befa96c2d36cd96593554eaa8a1aff";
+      sha512 = "aa1d0fc504c528e1f2984bf226285e452ded5ab1d650065cea7c3510b0b22c6c87d7cdc4ff4af902a10e471dfad9cb5d513951ef377c28bac250ebef2b67250d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sq/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sq/firefox-52.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "286d680dabb398e160a1454513938b46d32ab054136b5682533e41d1fea4d860ee192b7de48b822c17ee0386feb05ee2325fe1f135f82b28e8c98b1ab485be1d";
+      sha512 = "b2d59c0e085d7e5be9a81dce19e025d36898dd804a549c3304a5bd4853bc2884f3ad6b88ace53f320eb0f1648bb1be9034b8cd153bdca3a8b1a391d0a3c743fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sr/firefox-52.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "980ade36ef136932d668222af83d8be9180070c210813abd896ccf90cca0149af2f1b634d147dc63d88bc91a4a9b2411ac24ad50632e49281fb704875e537383";
+      sha512 = "1de0f66b93b22185a58ecae73c1be5497c4d5e2c2f62d9d91775717023e1793cc08fd2ee12e03a39aa008fce8c5a344de92777b00d53dbcf4c80948a627ab329";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/sv-SE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sv-SE/firefox-52.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "95a23a1d149cb95927446fcbc74a6e083b390f1f844d3e783a003f2f7a6699e5f0c72b5090ff9f0cda27df90fb2d1bc34c9c70dca33ef22bd1330e916a1de42d";
+      sha512 = "2f763fc403c14032a2588a2aff730a04c8b3aa4f8b3fa3f812f316db99753a6e9238eba544102800192c879f6c6e5e30e94a1dd11f3cdc77ca79d95e59716d9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/ta/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ta/firefox-52.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "0fff10acf1d6f427ad848ad852395d70b441cb6a1fb4191ed4671dcf4320665bdd6b3bf697b75331650adcea2bcde8bb07b98e6d0c65912b1573bad6509e35a8";
+      sha512 = "e5096461c09ad9cb8e059772f9ccc90592cd11300ea2055746450b7a32b1d2e6a6ef07fc6c5cd31f7afbecbb23dc231b7608e85b3c1a7530599cd9523c3058b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/te/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/te/firefox-52.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "97fd1e8ce3b2910b99a10bae70b8b2f70abbe7d6306045bdd9b2cda65be070fa2cde5ef950716a22eafb6ac4f841179fe7b982575e8c7ed43e056c8277e5f744";
+      sha512 = "e2ff646646643faab7b63cc1114354e03ce1dafdd7f9aae23b0c56a61e64a707e684fc13707d20e8a00f191cf540afc985521cacc70e66cbd50ce06e78ebe6d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/th/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/th/firefox-52.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "9da048c44fc7d219d1c6ee0c1298cf98019b1cb14a552d832cb858063e00e3750c364a0bce93bd89a84156ed5cf0e09d5addf0723baf6e607b6516fe1a2a2c6f";
+      sha512 = "724470cf2f1cc4b64f8e2b3c2b49a6fbe67702f76d123f171e637980ab0fadd28731ec31680389dab4ef216e5cd82ff2e3ae1f8eea86e9c8c329406fa41af44e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/tr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/tr/firefox-52.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "7e8aad1d86a396de699c103e2ea422fc2740cd9d70128b30280901ec9df9453fcaf60346db8b1cb82c06ae51108176ef8bcdd4278c1050cefbe71a4f29b3a1e2";
+      sha512 = "eadd1ff93b30212388e4bfb911ed7302badc30f64016366ca2eac69098fd4ab79c8bf7d352d9b91f1fd9c512693585b9673b2aee0ed739dac8db2cf913e1597e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uk/firefox-52.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "23be58f1f0f75a89fe5ca96c8322b1d3c60b136f479a23b0b96c62767520aa1f09864d7bfc111e924da6c035b03b1eb3f271aecc5799c3c97b7a928c7c8c4a65";
+      sha512 = "2a01e79f7ca1a497605597a2fa164927d5ad6798aa70e8e4f2f72711a6f928ab3a06fe8be288ed220ea7e4e59d24d3283ff9a437ef5359e39392f35e053b33f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/uz/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uz/firefox-52.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "fb1f9f93ca6db9510d00c2dc55745cdce67c1e274a952f678d3377d3b3911b20b7a3649acc49c8ad4ca276ae42900ef6560a7a17bf90f758d67208655b9b203d";
+      sha512 = "882daeb95ec0d8ebd5d6c29b06fe55bc66284cbe0b3d8e404798e0db0d33f27cf3df12a7c4f74f122e8a15bbbcdcad3c97f699c66d813821758019d3e1dd0f3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/vi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/vi/firefox-52.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "925aed6825e77fa78453cab5fc1c2e92e91be01c2890f4fc93bf148c0423a37c3b4deadfb96b466f56cdb95ea0a983f0f4bc2cc41fb1926a4659a701c1d7362a";
+      sha512 = "bef28fbebef2fe622230d72176387bbf4aa115f4aec8b78b4276b1a7c23ad25bb2f92edefa44f989253e7235db6d69f595fa2467a00bd1813b7bc29077347b8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/xh/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/xh/firefox-52.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "1b4297ae13c799cc43b9420c3c6edc7d92700788e77f6871b939fba18120745ad316919b4f8d18528df8da12dea0896ff5e1d78f8699edc72b6cf1f0357c0b6f";
+      sha512 = "dcfdf95811886bea9baa8eb1a46eb4f9419bbeaf1f54d713efc5a3d7d7beaec0d18c79a77221eb7fc246b99aa16193f91de92225fc9c3e8cb795bc9e49887d93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-CN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-CN/firefox-52.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2e9683de094417d96718fb60222d85206b9610123db9bced5905c50da21b42e03133160ad523eeb74df33206e44a6889909dfaa2418b043c5e8024ef871a1502";
+      sha512 = "2650644609f4b2ce2a4d82072fcb95e188334cc0190b9dd2bc13e40a035f60029fffc65fea1a6d644eaa049d31503a68095aa1f8b1df8ac9435708f86741a13b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-x86_64/zh-TW/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-TW/firefox-52.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "aa1abf501d2ca6bbe71cea5ab885c85f57b88ee68390bdb5a33047f10dbb4e5d4f3c506ee44c62ca293edd3515e32da70d23027aeae23526cbfb9e16402cd803";
+      sha512 = "3c2439185cb7935203dfb774e23dc0cb759f1357b599a026edd93d24c0617bbcb19eded53cb5c55ccadba3f4bc4fe85351c141337d94ee28c102b024e893ae2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ach/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ach/firefox-52.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "b01fe99df4dd612bd6e5033782e2dedb5416c7cc9f1de0d659f056371e24340423cd098e7775164c8e605bf895b69a0aae287b131c1533d3175d8ef8b183ae3f";
+      sha512 = "672908e232cb36c8d88229ff9c0cf427363a3e046cd3df21398b67897a179637972e01c08e89623bda23fa4ddbc7c76a2d7f1184a7299665269324f5fe0429fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/af/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/af/firefox-52.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "e42c48a74351afee8e40a791dfa1a20a7a867b4fbf6fbdc9141d4905293646a099c032cb9b52859612d9d16983d11d876bcea0dbc40fa9aa88333345d1d1a788";
+      sha512 = "a6f22c97a43b7ac6d001599f280d01e8cebc1910e6af958d0c9d2058ac2af5b42dab1dc3ac00aac1d2f61d068bff351beaf9514a6baf335a10f3efa0205b4ed7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/an/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/an/firefox-52.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "06670ef25bea3800b7a5639ac945c99b7ca67183f89425f597e515385b63c803159a0b18dc27805b9e718c4751ef5232ce9b6ba39c16073e35f47e7910e47624";
+      sha512 = "26b0b7629a11b8ffa20b10eb635c375088d1725a5c829b4f7dfb25d5df3c1a465ec7fc8ce56e36a81794c99ecb758b8462ead8ac4d6f79242c5f6931630e29da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ar/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ar/firefox-52.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "662cc92061ee62619d4b4f397057ec8142572c74a370be74d75c837e853b97eb17dc798f77e0736f3ca6acd0a4183048e81c5f8a32d57776fa72ab0dfd4f1558";
+      sha512 = "cccc951ad72024eb5790d2a7d668d4103d76ccd6e760504ca7e2e0755d3e41e426f87c6720d53a7668e17cd7b74cfb0ec22d3ff5f23d6cd547e43f97c7f9c609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/as/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/as/firefox-52.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "e18f231ea53351d473a0ac4a84abc458fc88eafacc4fac7093657c4b226eef7e52c5b3a4d06616e5556a49929fa79dd68a2f3c1a73e04b9d85ede8ff5b8167c5";
+      sha512 = "1dc216d63a3ba302f532a35d523ff4a3c234c17ae5ad755586ead5fd18b7e530c48c4fd5f8d3a30b679d89a45ed927a5e5a1d6f911f2fe0528989bcaa9128ece";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ast/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ast/firefox-52.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "05e174a85606820829b279b2226b6f1d2b0f24f6c0b73162b3eaa5955270be8db38c5512aa33c51b0a5df1db304537df5975f061029963eefb5eb06c0174b9b7";
+      sha512 = "384211024df02a1a463a078a255093b8a43b728e7062025cefdc1409c7be63ea97ed74b2f843251b0df6622629d11d667a795e478f1eafdcb6ac5ad2a48cfdfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/az/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/az/firefox-52.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b8fc2bf0d78e511b6c97a731742eb5d36a1ed74f4f6f5a58c8f6652d507b99a51dd6036654d0954488055caeb449be235d006377c3e376b7a650cd14f92945dc";
+      sha512 = "75bdd785a96262d00e7c2ae01cf7314cc6767f99e65e1e73b580fb7e16c93216a8e6180a3cd7dbb479bd5c2d172bfcfc9664cf8977aa9ae6678c0dc9aaca826e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bg/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bg/firefox-52.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "e10684f0a0f841cbce17a6dba5aacf780fa0c3226f0638d48a29ecd5c22f21b0b882623be6269edba707394f92a581e8719a78dcf28e31505654557add711049";
+      sha512 = "888872d2c630a2e3966a50a1789a8d68f199431ae62b81dec5ac06c0fee37524fbba3fcfd035b7869a3bfcc076cdcab6344e449de3df226cfd6c819898e67e4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-BD/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-BD/firefox-52.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a5bc927ef7615543b6ad8afa5b61ac08570be96ac0806c8330150ea9bd7e8dbcbc7c51a79bef45c865a05cfb776898435730954ba5b4d336063e0be4880b699c";
+      sha512 = "10277429342c915c2043f4865a5b22741bc729fb8592b9527a42f000943756e9ad8116af30857966d6cb6ae6877ddb6ba2a53e719a4ee42b19963548bf66d9b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bn-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-IN/firefox-52.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "72d23cf99c23a4ba414469e823ff0b30947f37f0aeeaa857ab09b22fddb6b224a18f3c3a796288030a1a9ef03f9bf14faf7292e58682e75c5ddb1981a47c8171";
+      sha512 = "31819eea3f2b0d2c90a3bc6f4a60207eba4d1eae568b45cb5d8f48dd500702161d5469c2ab3369358140a413041c1cfd9ce62e892fe5bb0db525b5481fc6a44b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/br/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/br/firefox-52.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "cd5111cd1831c7d7f0498cca21a78f225b9a403cc7e791e0903c88012b6ba31c95b726e8f9df644791350b12a8df5a1d431331a75eb76c8c529935d6447797a7";
+      sha512 = "3320933ae550ab188c8f7f6ad8d317b19439ffe85089e37e23edd24f5ac088b67af4c0968646030683dc02f64ee5c2068cce6f8250114024c8e24f2a9eff0b77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/bs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bs/firefox-52.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0871b142576517d4dc2ec2a24322bd8cdc5206356f71ddfb3c71832a9f5e825b2c38471287f2b2e3a699b2331b088dab1291535b66bbd52805ae1dd78f64315f";
+      sha512 = "9ac88212fb64d404c43a2292c8a4ab164ea1fae08249cab6fd8dfeded5e51304ae5b2d870a074c49e8ae14c820742d50700072fb6e5584dcd5ce2a06d7c85899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ca/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ca/firefox-52.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "4477a8b0650e39a27035913a956acb952f70f0a7c557ee2b97380b195296db4e2af03d08ea6ddf9d1aab699686375db06074796cb16d71807bca0afaa993840d";
+      sha512 = "ea1b4565917e7ffba47a7a030cfa69b8405163ef533c01668a5a65159f2f82b9737f43796fb583306d81216f664afe090e8483c37f348d6d107b5924020d6580";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cak/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cak/firefox-52.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "e0cf154538d8580faafeea44494df16995605eae0f7afb97ebad219f4371de3d92127a05dfcc227eeb3cc161a7013f71e45848c41919e3a1ab918521c6e7bc32";
+      sha512 = "a409ae71e157ca692d9919c00ba63679f2e3fe726537fcd49cf38ddae613806be5b9c773a0205013d48815055b6333110d283c48a9651ffb912ba6dedf74accd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cs/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cs/firefox-52.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f6d94786b8068452de617afbfb19d662defc0c00ec412e84ed0fc58ac0510f3b9b98cbe0e26ef98b2fee41d794b46cfbfd307373a04a71a0dbccb49fa29ea916";
+      sha512 = "f236da19b0bea73127a52997a461d704ff7472c3fbac29a57ba54ed18a765eceee6a0a46eceaa70d84de610f7dcdb53fcebdc5b2fb013fb0385e2ffd1fc602cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/cy/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cy/firefox-52.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "a794ee2a28402fa0f671b727b16840a8cdf6152e44ff9b0c9bee7bf121a955e570f8d643ae9688db385850e6abd1b9f47574922ad0b3184772184e50370ac788";
+      sha512 = "ace481c656d40e5bb88cacc82220b8384ed7bbb686974caab399f52b362f86c2390306eccc5709ff48d5086493e16dbc8e8f387454eef01e8baeffc05dacc5f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/da/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/da/firefox-52.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "895da18fcfb79737dcfeac111be8a867df75473cc3efa65c81511b9f10a8b1b7373005e42ebafbad9e1f9bb6b1cae23034e66b012cd766c1d0826ac3c919b1a0";
+      sha512 = "50e87a5326f1fba31ae8fe289a022b778136483d0454e81e440198d8e71c29405fbd2c53ea7975b30430d7734298d7e01cc5a9fdc3d3d3adfe6ccb33b4ebda17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/de/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/de/firefox-52.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "d212a73bcb4ce90982058e942ec08dbd4054149755dd1cb8f963984b5ad5e7a0c5847760fde105510476f2cea2cb1dca4ccde78a21e9a5769e605e61162505a3";
+      sha512 = "6cab0138fc67670dde0f1b3481d1a6f8d0126d8f336340a52cb87f0cd30942fabdc2a670351f09a63e875a6203f0893c995eec8a556e4240aaf599d0767f4d3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/dsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/dsb/firefox-52.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "bbbec4179f5ccd5569c0442deaa23015ea9b21a91eccc150838659d399608124ed34b4c57716c1386504e3b74088df705cb4807bf1a12e29b8bc22c5ed15907c";
+      sha512 = "f31b7a88244f60f419bf9a4e64dfd1ee93f406ac0d10ad2c4e63e0cb6260f03fcce45b904433fccad0e3c17b9d6fb999b4810e843be645a9ef283e16e6ae1992";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/el/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/el/firefox-52.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f73864a004d1f1bc5460a30ca60f589e7a98d0017b299376e0166ba9bb64b1af6b1523739133c1651945345228130c53bb13c9e9a846afef363a74a9eaf780c4";
+      sha512 = "5a61e800101e0f550d1916fa5bc90fc0bbc201379d5f283cb01901385bc7949a658aab272fbec48d5732907ec7355d8e84c73a46611d46daae31439a64c0bcf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-GB/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-GB/firefox-52.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "e7e547490b3dd9ed8260c18077e056beab6d523323c51230200a9f1e019fbb8f691e4ad42d936aca546367434d1fe901eb00c1bb16663e47dd8c6f40f0793589";
+      sha512 = "226f999af2ab4274e7e1e83360b432d25609668814ff54480c3df4d081c0f52c617e89d79dafa86f949e7ef8b5b5ac4f873299c90eb97028ca68593179631452";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-US/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-US/firefox-52.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "cf81bd8ea9a98bef6a4ba99e1ed1058bf9cecd2f43bbac310bee8226409512cde220b6a891421adb7166eac83715cbe7e8b41aa96a7ab1cb4d0d8d8a0f15dcbe";
+      sha512 = "00cb5b343e186110d0e55fd28d9f11184af27b697a2e63dad0ea6bbacb274ce946574e6395dcd812ca8d1fdc0bf12968af7abddaa0183ba995452423b2a886aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/en-ZA/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-ZA/firefox-52.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "853dd3491519ad29536f0ec078aa2f1ab73f4e436aaf9f367a8ad74188818575016292b0b3b1f9da2e94f6b6caeacfc1fc64460d4f7360be63840e45c82361b3";
+      sha512 = "0c66e49588b1b73fdbed23a1de4eecf9a5920c378deb7ebab415d5f7a159983b198ae4191da177170b8015d4975d83271385e3ecce26148d7c0859442ed877a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eo/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eo/firefox-52.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "dd8be779d5bc57be841580a891cb22a2b0743f9cdcd014a6d2e7b430663c74b0d8553571eab972b902dfd5e2f5c19bd9caf6e6d82499595cb7e97ca57580be22";
+      sha512 = "8246ee3309d4dbf8126132a97407f8af71915a3578f6ebf37693262e3be3658454eb12266b00acf62ee7c987985804bf7c4171225b5ec5ebf2cc97927e626049";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-AR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-AR/firefox-52.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7c8928c448295799e73dcdd2c762f52c4c239d09f16c83dbfd1ed1e3f7910144fa41a7d58fa721418d6ed6e6e6f7973de417af67b9dcd68f1db9d32e31d59b93";
+      sha512 = "b962232b534b0603b7bdcd7af4ac05fe136ca7920f9c37f889a203f42a50ead56053f93a49d153edd04e0d4e865ce71a210673514b86d624c1c4820217f76b8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-CL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-CL/firefox-52.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "58ddc5c2020191308d4a6ae23fe2f948592574bb5546a479d7fbfb0e3ace2e9bfbf53a0c26b2bee91e214d2284e8f1c38037b26bfc932c62c5d34dd11e24a84d";
+      sha512 = "034e713a9c5f844fcd2f5911d96dd672c61a3fff9870ab38daab8561d9660b295deb6238b3acc31b0755a043d4c72ea914151a4ffac7a8199ff679d8b1b31272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-ES/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-ES/firefox-52.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "2aa9e83b82b23e7360cfe1aa8e70131ddd3ec32271ce951fe50aaefa1b45d083c01dfcbd2581dc2377cfca127c16d79f818e1ee09a858f6b0138574a5b8b6b33";
+      sha512 = "8ed0e9d6215aea8c6ffb4212e400063674805329a4cc5135a0d016e04370190349bf166b111c67b43369e43833f8715e53268327696375fc68811e023f55694c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/es-MX/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-MX/firefox-52.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "689d87ac2ea33dadb20cf6b44426a63e5f058e899c29121caf2d83cf37b13de572e9c32c9e483dedb56f7de198c1745f7e5cab85988399e6790fdf337d85d2e6";
+      sha512 = "a33c8a1ba9e576ac05d3991979028a504cdeddec376fbaf2f2bcca6e4d9fc1edab2f8b34c12f282764b96c49a837bf9d5038a292bb96013233c8e9c60ae65fa7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/et/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/et/firefox-52.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "18382e5c6cff469357ea010653665d03a7e9ff9588aa2d6657b98c09ae7f30c2c04c1507475596635843f222419f5caffcd95556eb9b4176ad8d60bf7c5d7f68";
+      sha512 = "4647857b00ddfaf765d1d1cada904d35a2ffae0e0c1d3e2aad073090441d19c5e48b2e837a58ad9d1c20ecff7e44a3bb39f4486c8fb6d84720360e8a5b14827b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/eu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eu/firefox-52.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "5e5464dbfed7e91a087c7b67d715060ff97e24c83b99a68439b823992cd93bbdf994a2977a187761f92d911b19b5f53ce473628a45a8ea160c65bdab3f51c300";
+      sha512 = "327aeee163aa44517914a71971f620116fc68def75e8fc929401c696902f5b6dc35f9c4ca6bc3b4f93f0d116d499e1cf0c49e9296b8e730b3a6d7f644976f109";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fa/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fa/firefox-52.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "34242b1cf86c83920947862561ceff073f818389164f05e88cab01d8949bba2b30a43e212be1bb71e2bb9a2498bd6ab604c52fa169d31b96864c07b747e4e5de";
+      sha512 = "01e489e74b45cf8acb05ec87c4d853ebde51ca228487b8fee9dfece11aac9ed58f0e6a6c2fc6c9935189421d534b2f36e4b51016636c1010a4e93b670aaf9e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ff/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ff/firefox-52.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "ee83ecc78c8b3c7c304971110df8fc9402e67ddcaa8d38bc6a7d0471f3122cbab2a69b578ed85b0d58b0f67bf5e775696e18685e706aacf5787b0d24931df517";
+      sha512 = "b561312de7a9b67ceee00ed5730d8c5951f69d134b93077da06d5bb78f0d26e6a2e89f3acf1141c410f590b1d04c0d50beb78f27007e7bf99255d1dd27fc7347";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fi/firefox-52.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9eac668caa56dd7d819e388d994caa8633d18828e9ce469d0044b90e260a2fcf9b056c5d43274e6392830fa48420b6f3718988e88db70f2820ded2ed6b4527b0";
+      sha512 = "c9fa17537106470d29c2a632df636efe33cccc44ee7cc496321b09dd0c69329fff0063d1a2fb52c336235327923f3ce564ea6bbf513148dceb8d647903663e7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fr/firefox-52.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "9abb5cac7ee05039c374444f7c03604df1b3a79055b1afb42550765ac3f337dcee93cb30f2076697149f560d3d0de4840304259dc9c79325ea04d5585432c1e9";
+      sha512 = "ec5639f4c9c0f1f6bb30aa8e1269b1d772277b34bd5beb965e52a7ab6558da1e481876765cffa21f04f5a13e6cbfef53150051ac0089c3e35949afeb79e1ba10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/fy-NL/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fy-NL/firefox-52.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "197d3aa8d9954f4bc6a3a318869310bcd4745b9c611c6df421c0c3f8bbacca48c7118322990a650e00104a429f16cc0eaa81fb56b68c4dca957b14cf2e2746c3";
+      sha512 = "9a2b1e4df459dca591f20d5d389196c4d61ad90b968ade5bdbc006f80ffc7aecf4b6d004bba11bc196be490fa93fb0be5f26dba698518130c9cde120ef11f1cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ga-IE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ga-IE/firefox-52.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b26159956597932d413e40789e8eda3191cd2e2581e22a4c450bf6a901dd3c40e330fd486a401fed5f2bd94d3affe4763debb118d524aa31d1ff7d1676e02c2d";
+      sha512 = "ed90e0ac43699ddd648a99c008ec775a2cbb34c5de34fb9ce369e1cde7beb8cd98c3d1f56e45910e121bb91f39112a9e7ffeb97f8847bb7ffac76bbfb9aeb762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gd/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gd/firefox-52.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "38623b6b077c5cee3f4f39bdad198d2a7453a851547a966fc211f4194bff6fee47e7e6022a7600726109fd7043b83ff37275958a1fccb863f57c4e60d175997e";
+      sha512 = "e79d439d2977b10027d6518b7e8dac32e3da9b38cf72a8ebe2521c255bb41682515db2809fac94bcdcddb5e172e090e76ee990f9670fd8b59cab85f17e61222e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gl/firefox-52.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "d9a4287c5c5c28c15d6ac3913ea8cd51b88701ee0c5c091a9127e753d5417eefa7d10bdd159ba63204111ad032498bf80b4c944a194d60a14343db4ee1770d56";
+      sha512 = "ebee1f0b709590d60451be8b8ade78340905b098f08f86214a5816e58f173830902717b68a393c91c5274cbbf8da0fa8915800069e5bb2e48c0973e54c07af9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gn/firefox-52.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "f8ad4718fe88e594eca07cd8ceabd19a51cffb17337eead004b9871f7576fbea35cd5a51434b4225e831f4a76c4fb47f1669936d4ded0953160e978f07e3e6ee";
+      sha512 = "479bae9554c8a8061fb98528ed80a7093444daad909820e7c2ffa3a13384a8b3711ff599fb767345f7edac1ba5eca5aba3cced9a7c1a60577a90c0b7db334813";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/gu-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gu-IN/firefox-52.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "0cd44e6375a7c11826428a7d13e9b59e73075452806f6f2d8d1e20cd9d32c36e4de684c511544aaf9845ddb6320f8f72657a9f56cae2ab10cc880428bcc55048";
+      sha512 = "ea7f2fa1f5d90e613496affc5f58dea0621fdd36a4c7b04d3559b72b2606941cd315d7de575c649678c3c0e454961c1d8b4a360d1661f6e4fd4e8426cd8aea62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/he/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/he/firefox-52.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "963562443976aa856b5d7e389d057c8bf17bb6045d5f763f5e3f46c500c5f6877d046bebb5515c726bb652b986bde4189fad3c84bc6b8812c7ab6aa47b629d8e";
+      sha512 = "b757a756643c0093757b843b784bafab71d1d7e50e5bc2b2b47b29479dc27ac754ab5d8cfed842cff58de309ec276fe0c0c0ce72adf87dabbcb46f0514eecef8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hi-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hi-IN/firefox-52.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "2ea7bdbf502a950863574bf3502df03a6d2ce8128934f52aa33f2f1d41d41320a0eb0da6b51d0fffe8ffda1ab7dccf72fc904230f2b3f11b82421f55e494a4a8";
+      sha512 = "7fc338870ecedd35d24ed8f20bfcc82d9ca26465704554f3d808f2fed855866d24cf68038651c4975f73a8ec6f90a297160a367132bf1e9b22a69797b311ab02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hr/firefox-52.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f7f865feab6b90082a59b2d1cf4d5f73380baecdbdda5eabffab3926747c83f3668a5feb4a792e35b56ae47e2c690b2f97b23662f2d5868f6e7be4ec4828f43e";
+      sha512 = "c7be8964891258fce40e7d9062914d6ef418f80ac94c864448e292720f14b58ff1dcedac9cd7aff125a2819ef45c7ebdbb277a1ff87b6e8f1b5ac5e4d4e445b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hsb/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hsb/firefox-52.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "5aefabeef739ce224cc4d1d3a83f9cca3a5626cb6a3d0026ecf068e5b4283bc16735107f78d5b4ca3748e56489a0463701f1ddc021772f3d3b97ea04254a7d4b";
+      sha512 = "6468362c84079699b82aa0899c4605241e9c55d42acaba84d80120b52aa81be339d9ebb90140ae06b2f33475b972aacf74c6c37fbe7a66b59db314bcd01b9313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hu/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hu/firefox-52.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "fe1c8538d5df66ddf27b2e8e4b2e01fffdba689103371bd5a58f0ed6fe08f704438c440277272a5eeb2c261e51cd6b81d92fc28c23fbd78f87afef3564656199";
+      sha512 = "0c5f56ab09225ced4072e6852be50a352ceb6befda8ba8f420431a6ca3a7d376e73ad11c38044eb7fc1a3a5a8a3dc8f49eba1fea0f17c96401be5a94276e937a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/hy-AM/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hy-AM/firefox-52.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "8ed0da0f6df8d2c6ef65f58fc06a25ea1d96b6c69161600b104772c61ddaa3d7a572b9e971e616a6870f57668bdea326b59bdcd968ffcff5485bf8e7399a60aa";
+      sha512 = "c3af17826b66b8faf265c2f2bf8bfd565f916163f3050e8c7d83ca5426749f7c93174be34cfa8b0d0dce6d4ee175ad6977f0fff890f072af1419fd0c8c61145a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/id/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/id/firefox-52.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "6f90d870f2964e76b394ba419479f87ad30c0b7677b37305592e028f1611690fa59fe50f32bae694bd30854d8d0cb36c1dd0ff5cb04e3e8d0a3caa779797f734";
+      sha512 = "c12627f8fdc7fce12b5803f989e2a038d041482a86f23ca279e2fc1c54509bc98cc11995dce4a5858b85d9755fe8c44c2171bc1c4371a3e86dba1926caa36553";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/is/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/is/firefox-52.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "68559b8cc00c5d0ec92e274e30a10bcacf5c87096617e0a7a0ce30e495482ffd5f2b4f4bc9f61e0f5d41aba722ae2ee12d9a17e2124199717720bd6e4d1a4874";
+      sha512 = "4adf2f31a05f19cc0d075bc47be810cf813535c0152e2e131b0e0017478733e0db2d81cf26867d9701122d3494bc4bc1693e34351ea60e2ca261efea3634a599";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/it/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/it/firefox-52.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "3bbbdeae057aafe87b9b7c7c99b67de5c4a2642569570cba9456d680f726a5bace48d785f6871d1731375d0d92084bf30fc60a390dddbd410573f9ffc9c81fce";
+      sha512 = "5fcae4a024210439ab71d41435768283e3cd4ff06d8cbd24e6482559797118398974d42753afb5ddab086cf41f46183827cd3532262625a036c5f22b7de3c9af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ja/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ja/firefox-52.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "38dbf45822d7d2cabe38f3d0b36a5c0dc93436d42554fc9802c9f69f34241553fc95256edaeb410c9eb16e640e1ba09fd3f6cef48c507660234a892ee1abef43";
+      sha512 = "4a881b1c24cd0d679799373c5b13b5e0c4f03f2ffe4128669db300963a19918b99453446e504f5c25e87331fdc09a300bd6ce567894bf56453a84937d8a4c882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ka/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ka/firefox-52.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "d49b3024a54f3ff2ee08b5e9a416b4e3b5ff0a69407d34b8b66a165cd5c9d167adee6cc7107a611a250bbabbf90b798d152d049bcb5c6d59846098035a081afa";
+      sha512 = "c6c120d64184c6171140c23e547b982419f3df12ff5c49ed0a5f7643feabd0d8af0899e9a764b3359d05492bd28598235ca6dc90d0af7dd7cde126243ebf47e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kab/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kab/firefox-52.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6baebe38ecb1412b464702e6ab5d2d46166fc3e4ccaa4e4fb3f012ef5049146136a0eec94849148800d4fc4a1f803caec9fe9ae60b330fd4d97662a61d9bb1a0";
+      sha512 = "f97796c3ed9fb03637decfa6e3fbf53373d8091668ad7adeb778eed173dc3e8e7665ca1aacfa13b2e09410bb5a93e3e3ecf4333292713c55013ba33a93998362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kk/firefox-52.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "8300f42545782543318c789f4537bcf12a4e1a1674ed34e11ad3ebc2583aa944ba4f7fb9a92268d36f4c95f4ab06d8b79bb6cf3bd859edbb98c0fc5bc2ac1891";
+      sha512 = "df59e8f662db504fe5368c135a265e0e6f985b14f3402ee0330dee218c699b9828790f3a37081cdf6fca95708770bd1ade2d3140f3c7c804ce624efc74cc2e27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/km/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/km/firefox-52.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "8352dc1b0eee5476bc40ba81bd7e387bb36b781df823e900bff4cffa2fce5295aec05aaefe01e24640d3ca015d83d320e95caed91539504f71b2c4591ea9707a";
+      sha512 = "29a03004cce0216508ba7b6f9fdf6f2e9407293c0e95d142d30045cd4ecf347c713c07d12c486dbd7e619e57e500bee15ce6eb539fe9314b7101f6f4fd35cfa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/kn/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kn/firefox-52.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "0767e6bbcd9db184206dbd8d6a8519bee3824451ef1f856608ebf6eb6bfff0266b3f4f680d47fccbe5e86f4b14d8243354f3ca8683d6741d76aa8fa77621e10e";
+      sha512 = "11af63e757722279bb71270349f952e35771a08c3fc182f5a24b02b192775b84d966393c10f19034ef762ea7105b79354642b735e04817465afe90c818ba78ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ko/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ko/firefox-52.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "f9b18473ffddd1f9d9f63d29ce7ba7fbaddf195d57e791a7c2a03e634714b2dc2f811730d9ad1534f2bb6271a79522f32f1e88d365b664df54146db9366f6911";
+      sha512 = "51f8c8a08f605877dbfb44eaf2c552221458780cd5b3f8a4124b096c36543dbe9aef1e4dbf7d8b3775d31a5fdfde2d8b71d1f8b1f7beaa826efb211d8751b9bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lij/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lij/firefox-52.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "b72a26fc384860a17bd81f075b7080129711fc9b640b5c332958ece8c47540d2b3ca41c46f35999afdacb15e4f7928b2ba943ae10ed1ea3863a7222f30329756";
+      sha512 = "a8420d626862c54ea298c75bcb19bd90e55c713ca3b6d6802e8a4d8e7c02ddcd260d11392c9011e6fe807c17b3cedfa579d356e766b531819c89e24cdd4d7977";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lt/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lt/firefox-52.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2b8e656a402b935c640a17db9d3907bb99498180d36fc0b8f2eab2a007fea9d0dddd7283292f549aead49c6ec2c926eeba728e03975905adfc561f159eae5e42";
+      sha512 = "0c577c917af487d700501205e3267d42db0c1b12c8a3168a053e90cabc1a2a4a111355c0f7a1331367afeaf8f20f662b155738ed9ebb1fc987d8086704b938a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/lv/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lv/firefox-52.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b571c834c1181c5ba2685c8ae77165cc0dad5a60d45717d2fe9e2528814b2352748295a0817fc127057a1403bd5ee2c154d8eb2d876d3ac428638562c19fa3f6";
+      sha512 = "3df4ca413c2f388d65aef69600be089062731bc3521de3ccb706e1185b5cb40505ac5c9325c8f5d1d91fe8b366d461998eaadd42e090dee1dc4f8b81e0822182";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mai/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mai/firefox-52.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "1f703f3f3456d6fdb69f6702a8c7b8e069387862b99e09d9e85ba0d34d35f5ce30bca8268d1332930f55a9d7e614ae77afbfdae5caec7c1fbbc7abb8c9898710";
+      sha512 = "a614b5b82df1b71a3880a7ba75bfcf7bd0047b6be7a49126ce2620a6b76590a9798e142f23dff99a67d569978ba565ddd7a33e3ece69cd2c33cf74c3674cf27b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mk/firefox-52.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "526b2b8709942a6c3d071c39b03625e90aba2e298b89934c3623dd61bc0beb8680729ef8f716375abb0d487507eafe885407a995f3d4365cdaea8b2d0fb55070";
+      sha512 = "029d1a4196ef641b4da250520f852bf2cd27a4396620fa699777a9f470a019070384098bcc25a8d01410cb2e353cc13df60ca7b8a4fdaf89bbcfe9cf50484e6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ml/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ml/firefox-52.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "0c36352abe8088a2d0fe151e6e7d39273dafc370e1222e8251859f99b89baa8782bf108cd97c2df7dc22fc1231c6cac5409a3c0bcdb1a849c7f894732bebf78a";
+      sha512 = "078cb38737ff67e92cfb56fa5a9b18ba39479a92d23e2d70c0a45ddf7533f422f8887db6d4c6483da761ef15b93798e1c8edcf9d469ab484b53bb02d256d531b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/mr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mr/firefox-52.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "ba013b86e7b16f1d90b1e6328ef9932e3fed6b6e9f2961944ff4a3a00afd0d0c94f9db1b25c54191b50b798bad9e5f740c2b63e094077df562d39634074d1b01";
+      sha512 = "e16481b30598b84768ceef0e3b50f4f022b0b19d48c01f24f4fb2848244a07c8dc3babfcaadfb237dad6f41434e2fec8a51217850fc6af3f2ce8025eb9b68352";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ms/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ms/firefox-52.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "a5df3ab9feaaaf459f545154a0f30dafb384febc269e701974e221a6a33e2701777141b7ca15624eeae009e984f4e813d134823ba733955d2deaeccfb1add161";
+      sha512 = "bee27e45bda71129c09ad7c26fc678713bbf1ae066d07adab661a96ea4fe0cb7a2ee561541932ae7869b5fdb2367332001aec45cb3a776c23fd98f96a376a770";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nb-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nb-NO/firefox-52.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "81e16991c9e68b8fffc47eda12c1858879781a1e512a244cdb5ea202ed4abc8366b587433568b1d31a943520bbf56416b62bd00a52a2db313de619f037f5e87e";
+      sha512 = "e07bb11cc2158ae8d1d5d5c0d3d9380c50aa11091a55f444a7b84cdaa271cacbf2dac42a39f21aaa636bc51678707b54e2ed393f4c2156fa1e407dd0659ca1cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nl/firefox-52.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "31bc837dd0a974e51712f0e3be8fbd114ebb285d34329a4282d9d41c4927bb031738958997ba77f8ec5ecff09342d2c2dbc13bc8161e8d54d331c55e7df3684c";
+      sha512 = "b3fdc32a487c7c9f519f8f4de6c547054ed58ec85c76991d6268040844012b85b8a85aa7add09fab2e25fbb0a5f9a645cfc5b51d8a18b735f64678cf0ceddb3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/nn-NO/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nn-NO/firefox-52.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "361730a873a3912a10437eb3f766fde1a79f2a8f9f2302e6515fb5fdc34d615fea07a225f9ef25314d4cba2b83b35f9fceda7dbdb31433ebe9cacc2dbcc4794d";
+      sha512 = "b78a4caffd59c8610b783c743f6896db2bffd40a910c394473ec7258525557d922bcd8f993d12c2aacc49763f4f1afa0872658d5dc03be662a285b04b54872ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/or/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/or/firefox-52.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "cbdc0f8f11194bec2894daa29d92ac6c644ba55a6921315d3e30c560d761c226c0673a35c98e19e31afda3992583ce14ecb51ced97077a6a52196f30da7c127d";
+      sha512 = "2c68f1b4c0becb38ebc75720a1af76a2dd1031bb05d4c9aab05b17d486ec18d3fd3733a4d729b29fc7d1dbcf8ca8a9cdde75429c790de62f3930bf3ab7a52bbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pa-IN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pa-IN/firefox-52.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "21819c58f4c7e9f98f714e6392283bb2e5aedc3866a5f7360535050d75f8b54b527593af4b0004accce95459545c176cbbefb09199be15e088123556e378c5b2";
+      sha512 = "69022b727226221c9f412ef47340fa4aa4d9495f617add10f343bac457353aa9bb3eee1ebbcbe16d06625e6fa4f77fbc1d6ce2ba021b90acbbfff8e4bc49e62d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pl/firefox-52.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "293090773a416b8282e8eda9904646390a0b17215a156cb63bee043bf68e69a28656ab880f9c825c280deea9b6c9e13ae55e08284f540c7b50d7b7844c5989f4";
+      sha512 = "3852945b017f4d88f0dd59b824fe5d67a904d736d9b9e180d116ed77a4da66d9a5a624c7706b11885d50817aae3a8890b0e6fee0b01f121a5ffe9ceac4184541";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-BR/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-BR/firefox-52.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "ce58560445849eb90798150ebe4ffe6bad23a6cf2bdffe1688b1e0e8da01c088334604a2d32ed9317ba63f9064f4a3ba406a282cf74ca64bbb5abfb0a6c37f6e";
+      sha512 = "59c7d15417a2f81dbadfa23e27b08fef1d9e4d37f93642ced7dad81158e47d12ea28b620af7ebadb419f90f2a340b9b87dbc5321a77a4580573cc8fa4e0b7368";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/pt-PT/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-PT/firefox-52.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "04f86eb4d434190f313a76a3b366c35cd132930ec5fbcdf6f5bafacbaa7433cb161c278ee28a120dcdb0ea70cd9d2a36cb5fd52d45b6811bf748bde11dc43398";
+      sha512 = "ec95ff787a5dd3f7b736e97e50333828bbd1726b6c88f95502aa92b245d00eb8bb8ce43f665f75f993c530498ce49642aa99d2466fd7b65921390991859c50e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/rm/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/rm/firefox-52.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "0e1307cae4e83a0c0b883c8b84c623ccdf5f91b2d39097eb4ba86db7cbca70982c9ddf76b7036ce5dc574fbec0f02ccede1bf5ff28e2a53c4afcecab33c0073b";
+      sha512 = "88c28449200c951bbb8a08dccbff253176d62e61776c58900fff1f0bfb9daeb65e3d49f0e4a9bb8a962af40b1174d1878c4162cf6aafee65c643b35cd7535565";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ro/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ro/firefox-52.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "cb93e5a9ba39abab21069206a6267d87773177cda7d5966dfe76cf2a6ea83a00348a7f4b1aadfa890585874a9b2cc2e27cbaba73037f4026a56f7790ce0b7df4";
+      sha512 = "ca333f714287da738d469b32285d9b1496268656206ae4f648896adca89007950548456340b8efbbae61f26b3692f474c1af9112a9d0bc8064502e25a447e6c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ru/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ru/firefox-52.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "3972def5e0d34011e33476306d748e6e8936bedd3a3a4746c21a572bbf1dc71db364b5b4f83506d677d9d148dfe49aefeb56bff91e4943910348e7ec58c791ae";
+      sha512 = "75a19e48ac59114456a6e32f1c7557d6ab9a21377c440e88cd018620f85d14d8ef2538e271f04052c47e311d9eeba78a99d5a0f7550d1c4223d86301365dc763";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/si/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/si/firefox-52.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "216f65d5f9ec399cb4317123d4fe9186c3caa1c403df16acf86d1987c356c32db809155bc3d9904c7396951a09b8398e402bb93d269372c924da7e690a7569d1";
+      sha512 = "6423857acae37915ebdd69b1e5868bbe7d8b578f48e7c87fc4ce2dadbb812098a37627c53cc7d56dc66a9431bb8a995e28dc837ebc50cc14ce3edc0cfc6e7733";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sk/firefox-52.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a23944d43660d5d151b8fa618303aa5cc673eec16868ceb3b1b1c7e197f6a707cc511f63ea07263fabf20ec75d630dd699f0ec8cb2c5fc53d1642b35c90b4e2d";
+      sha512 = "19e49096ff410d3abf571895c73af14a1977ea2b44f9aab917f7d6df6cf172187f40e13faaaab095ff659b5ef17457ce315c7af8de60bf50e599048d2cac4a24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sl/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sl/firefox-52.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "ff3bd653e64c26f387c231687d4f26502ba284138596bb1f5f75549476270be712242c42be07902faed80bc327bba49f2be37db3ffa5258a9c944c3408461cb0";
+      sha512 = "aa81792a46431668d7c73c937e88997adc1fc79f570d1984d48ef328ba2543aa4e3b0bba83084cad75c911566e762d8f6c689bd938367ce5940bef52fb218823";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/son/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/son/firefox-52.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "adfcae5aa31e9c153b53234c9c10ff51927b8785e0952c233aff08a3de800d7b0076c9304368a0ffd52ef91b9aab1dd0718a5228c28300b03fac69edfebba0dc";
+      sha512 = "db4e58058f5a96ff86716a94ac5cfd08d286770560ce9d2dd0b4e66c2b2cb2de49044d0add4e47afea815910435b89c4ded953d4c8908bcf2bd0b006d8eb2e1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sq/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sq/firefox-52.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "32f039f1f05771766d0413d0ed9a526c5cb21a0ebf5688ed577afa73e39d482cbec87878c8acd2ddf56e048992ef0c37725a6209d89add9fab72c48bcf135553";
+      sha512 = "412b08900c697b8aacca05a0e8e972d5f8a94c659fcb43883ee53e5e70ebefa6ef96ae25b7053bc0652a1600b2fc552effa62add6ad126a2ff00614b7c956873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sr/firefox-52.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "22a0ec9854a80f0ca6aeaf8baa98d72d0781b6e67af899701686a8b4def205b90d9b9084a2d0b160b690d4fbfc6eb55c6bb6cfaffe9f1e394b484f264fade306";
+      sha512 = "2a6d6d5c4d8215b08e0de5f85c9bb20df27975a27ef81f7706c78d6315fa73adb99b7676237463d73a376ebfe1960702291b38100e9035d4f9961270e07a5a50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/sv-SE/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sv-SE/firefox-52.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3f1204d3b069dbfcfac753ec72ca7265008f2543c14455fec81f4cab1cacb815c1529e7c9b50672552acf6855c2de81645428bb5ae43d514d2aeab3c750159d1";
+      sha512 = "6c12add3fc10a2bba6603418662e02331d6266a4df5b05a25a921f5da3f5235366e7114dabf2cd8d41b27b43932f14ebfdf10d30baea9b065a1d6a419ec887ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/ta/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ta/firefox-52.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4f32b734fd4e4cfa1f031516176ba82b9128cf7f9577eef1b5243aaf20dc719697c86330fe58feb54aa650109fd33a97ce3e6c0d5639ca7a40d90208a0a195f7";
+      sha512 = "63532f2d237a8533ce87872e939cab06345cafb7e51488972c51f9a63f16bcc768d21a13574b798bf09ae9412b827f95cf3acda33a08082e764a9fbbc026a044";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/te/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/te/firefox-52.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "55cc6c548a2f0a89ecbced9aa9903089d04771d97e71f99ca943f73c489e8f3dd0fb0a3f999d641d5162b3f43a0b2058eec62ee5009f7d796ac89d013ac15426";
+      sha512 = "42a37106d3921dbc65dd4ef1729513c6bc97cb9b0a7412c44223d07b49b5b2d48b3275fff1454cc022935d32741a434fbc45387a2151629c24f832a04b9baee8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/th/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/th/firefox-52.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "64202fab7515634d5cc12845902e4c0df6b1e4b59606f1c4ca779ed684edd329915b9e133b19b465ac6343d5af91572b767171f56c7ea2883d1dd216a39eb1b8";
+      sha512 = "6707469f29aad81f15e9522e49373b39988598f40ad4e4afee0fcdee9551e66aa74d94d31268fa0fb62f7ef69f6eda177d7b30408691af694ad6475db30c5612";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/tr/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/tr/firefox-52.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "aec62567d934fae018c8ab4273c7f3a7350ea1e14820990374ab2542c512e005536e851b6fe315667c9ec63d48ed391ffa896fe7cbd24405945ed7f8aca4d945";
+      sha512 = "6c6ecc7d4fcbb967217b1c174a993b711485eec530cbc171d64b9f777b867b4ee1a6e17ea3fe054fa3c1e6255c28c3ffcdc3beccd28546977714f0d5cada7871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uk/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uk/firefox-52.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "e1f3df0c6637cfa394ae0d2829b24b486d0af39d46f7747e77e579e0ad4325663ba312504f5cdbc5fc2da378e7205a5e9528df99e61af20b9df58f8cf1cd54db";
+      sha512 = "d7cd7d0b100ad257c92444d9637e924d5900b9b99f04e205149e79e59c757fae741ec3f6cd01842efe1c7f219c594cece5d7a9345925a8765ee4d3245afe5215";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/uz/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uz/firefox-52.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "c095ff29e2c42920975400b0f80a55e22b3334859d82dde662fd9a8889884bdb045601522e961f4d0f6c6c934a5d42cc838fd263e91337fa9838479acb2064fc";
+      sha512 = "c1ded0aa9b6975a71b5132349521f745648bd2cf74aacf71764120cfb5c663ffc23615e62bfa662feab8c6e8c2cc40f8d0bc5b707c8cf7619de9b712d893a7f9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/vi/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/vi/firefox-52.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "14ae54681bd1a6e48f94c6d624e00a034689489e631f4216beb019baa51f35f00eb2a764c66a4e79762c9d1188659b78e5ad50b8187354863abe9b501d4fef77";
+      sha512 = "fd19f568b5467df2f92ffb4367bbac35ff36979c875847433da573cee0f6fc24cac1c538e197a53c1a920bc274e4715a3f3734df131fc00ae8972b1a14218418";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/xh/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/xh/firefox-52.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "6bcba0e20540cb93811aae08f6b10e0cf6a9108528fd0f00aa84d2af9d982578d4e03f034e6d0f155fac4519ff0ea90f3d8aa4731aafc179a5a497a26d224ef9";
+      sha512 = "58d10220a9ae70cddd7e814071a57f944654edd58abf8dba6a083a9de0d6b1887f09e3e6756896ca65d49622dd2981dc7abafdb655187650b7aff7023b87c60d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-CN/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-CN/firefox-52.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ffa67e88d736bdb41dd7bc046bdfa02161f3c703e992615cd98df788cce5e9f97a610f8b7b31e825dcf17dff790029081aa13316433db2c2ecd06de6aec4f811";
+      sha512 = "59fd16400cde462fc339e5df5dd8c21dcea02cc8d46268ee01566d0a5e3188d51bb71ece2516fa2ca141b8f93fe35aa97af92841f0a7211760708f01d5cbcc36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/51.0.1/linux-i686/zh-TW/firefox-51.0.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-TW/firefox-52.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "d67b82836f4035ac4050751b9235d49bafb2bbea2da9d1b209451e0fc3cbf54ce70b4111d66f107a22be30baa6b6a043c2736f6e05961f0aa3cff95531601134";
+      sha512 = "f288f83fc827221d46e656c5217e16b2fe23d1d9cde279ccf64824ded9135c4ea0ea3d3657a22aaab6e42f679a7c1040fe5de0875f57ae568712f1e6287177b1";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index f2da6257efd1..68e3bf1b2022 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -148,8 +148,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "51.0.1";
-    sha512 = "556e31b717c0640ef5e181e00b9d2a6ea0ace7c16ae04333d0f2e9e120d0ab9efe82a4ca314ef43594c080523edf37953e65dbf694c7428be0a024f3719d8312";
+    version = "52.0";
+    sha512 = "bffe5fd9eee240f252bf8a882c46f04551d21f6f58b8da68779cd106ed012ea77ee16bc287c847f8a7b959203c79f1b1d3f50151111f9610e1ca7a57c7b811f7";
     updateScript = import ./update.nix {
       attrPath = "firefox-unwrapped";
       inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;
@@ -158,8 +158,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "45.7.0esr";
-    sha512 = "6424101b6958191ce654d0619950dfbf98d4aa6bdd979306a2df8d6d30d3fecf1ab44638061a2b4fb1af85fe972f5ff49400e8eeda30cdcb9087c4b110b97a7d";
+    version = "52.0esr";
+    sha512 = "7e191c37af98163131cbba4dcc820a4edc0913d81c3b2493d9aad0a2886e7aed41a990fa5281ccfb08566ecfdfd7df7353063a01ad92d2ec6e1ce19d277b6e67";
     updateScript = import ./update.nix {
       attrPath = "firefox-esr-unwrapped";
       versionSuffix = "esr";

From f9b08c9dbbeef144b00a7e7a1efa884e81d6ddbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Tue, 7 Mar 2017 12:33:36 +0100
Subject: [PATCH 1850/3449] mpdris2: install locale files to correct location

The package included outdated intltool makefiles, resulting in installation of
local files to `$out/'@DATADIRNAME'`. Running `intltoolize -f` forces
regeneration of the Makefile and fixes the issue.
---
 pkgs/tools/audio/mpdris2/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index bbec851b25cc..9378585d8b2f 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
     sha256 = "0zdmamj2ldhr6y3s464w8y2x3yizda784jnlrg3j3myfabssisvz";
   };
 
+  preConfigure = ''
+    intltoolize -f
+  '';
+
   buildInputs = [ intltool autoreconfHook pythonPackages.wrapPython ];
   propagatedBuildInputs = with pythonPackages; [ python pygtk dbus-python ];
   pythonPath = with pythonPackages; [ mpd pygtk dbus-python notify ];

From 540163e4a43f6e4b3bd509d148eedd2e01f8024c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Mar 2017 14:01:30 +0100
Subject: [PATCH 1851/3449] search module: add missing types

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

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index b852e4e6dc86..bb0c2c485f27 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -19,6 +19,7 @@ in
     services.searx = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = "
           Whether to enable the Searx server. See https://github.com/asciimoo/searx
@@ -26,6 +27,7 @@ in
       };
 
       configFile = mkOption {
+        type = types.path;
         default = "";
         description = "
           The path of the Searx server configuration file. If no file
@@ -35,6 +37,7 @@ in
       };
 
       package = mkOption {
+        type = types.package;
         default = pkgs.pythonPackages.searx;
         description = "searx package to use.";
       };

From 15da23d5c143dfa94543b120795af03b44dfbf0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Mar 2017 14:01:50 +0100
Subject: [PATCH 1852/3449] nixos/modules: use defaultText/literalExample where
 applicable

Primarily to fix rendering of default values/examples but also
to avoid unnecessary work.
---
 nixos/modules/services/cluster/kubernetes.nix                | 1 +
 .../services/continuous-integration/buildbot/master.nix      | 5 +++--
 .../services/continuous-integration/buildbot/worker.nix      | 5 +++--
 nixos/modules/services/logging/fluentd.nix                   | 1 +
 nixos/modules/services/misc/ssm-agent.nix                    | 1 +
 nixos/modules/services/networking/searx.nix                  | 1 +
 nixos/modules/virtualisation/ecs-agent.nix                   | 1 +
 nixos/modules/virtualisation/openstack/glance.nix            | 2 +-
 8 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index a82802c32662..9ccc7295019a 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -76,6 +76,7 @@ in {
       description = "Kubernetes package to use.";
       type = types.package;
       default = pkgs.kubernetes;
+      defaultText = "pkgs.kubernetes";
     };
 
     verbose = mkOption {
diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 68306109130e..f363822c21ce 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -180,13 +180,14 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.buildbot-ui;
+        defaultText = "pkgs.buildbot-ui";
         description = "Package to use for buildbot.";
-        example = pkgs.buildbot-full;
+        example = literalExample "pkgs.buildbot-full";
       };
 
       packages = mkOption {
         default = [ ];
-        example = [ pkgs.git ];
+        example = literalExample "[ pkgs.git ]";
         type = types.listOf types.package;
         description = "Packages to add to PATH for the buildbot process.";
       };
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index 1ad1319d501d..e80869573fa3 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -68,13 +68,14 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.buildbot-worker;
+        defaultText = "pkgs.buildbot-worker";
         description = "Package to use for buildbot worker.";
-        example = pkgs.buildbot-worker;
+        example = literalExample "pkgs.buildbot-worker";
       };
 
       packages = mkOption {
         default = [ ];
-        example = [ pkgs.git ];
+        example = literalExample "[ pkgs.git ]";
         type = types.listOf types.package;
         description = "Packages to add to PATH for the buildbot process.";
       };
diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix
index e56a9a4e9afb..9fbec2457371 100644
--- a/nixos/modules/services/logging/fluentd.nix
+++ b/nixos/modules/services/logging/fluentd.nix
@@ -25,6 +25,7 @@ in {
       package = mkOption {
         type = types.path;
         default = pkgs.fluentd;
+        defaultText = "pkgs.fluentd";
         description = "The fluentd package to use.";
       };
     };
diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix
index b04959a9686a..c1e1f0903539 100644
--- a/nixos/modules/services/misc/ssm-agent.nix
+++ b/nixos/modules/services/misc/ssm-agent.nix
@@ -23,6 +23,7 @@ in {
       type = types.path;
       description = "The SSM agent package to use";
       default = pkgs.ssm-agent;
+      defaultText = "pkgs.ssm-agent";
     };
   };
 
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index bb0c2c485f27..3520c6d3f7da 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -39,6 +39,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.pythonPackages.searx;
+        defaultText = "pkgs.pythonPackages.searx";
         description = "searx package to use.";
       };
 
diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix
index 18e45e0b8457..fc51b159579e 100644
--- a/nixos/modules/virtualisation/ecs-agent.nix
+++ b/nixos/modules/virtualisation/ecs-agent.nix
@@ -12,6 +12,7 @@ in {
       type = types.path;
       description = "The ECS agent package to use";
       default = pkgs.ecs-agent;
+      defaultText = "pkgs.ecs-agent";
     };
 
     extra-environment = mkOption {
diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix
index 4d85718e369c..7862409a65ec 100644
--- a/nixos/modules/virtualisation/openstack/glance.nix
+++ b/nixos/modules/virtualisation/openstack/glance.nix
@@ -43,7 +43,7 @@ in {
     package = mkOption {
       type = types.package;
       default = pkgs.glance;
-      example = literalExample "pkgs.glance";
+      defaultText = "pkgs.glance";
       description = ''
         Glance package to use.
       '';

From 9632cc221abb9ef23a07b6f5d4c9b4c14020e077 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Mar 2017 13:09:33 +0100
Subject: [PATCH 1853/3449] zimlib: 20150710 -> 1.4

---
 pkgs/development/libraries/zimlib/default.nix | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix
index 77a7989baab4..9b7a90266284 100644
--- a/pkgs/development/libraries/zimlib/default.nix
+++ b/pkgs/development/libraries/zimlib/default.nix
@@ -1,22 +1,23 @@
-{ stdenv, fetchgit, automake, autoconf, libtool, lzma }:
+{ stdenv, fetchurl, lzma }:
 
-stdenv.mkDerivation {
-  name = "zimlib";
-  version = "20150710";
-  src = fetchgit {
-    url = https://gerrit.wikimedia.org/r/p/openzim.git;
-    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
-    sha256 = "076ixsq4lis0rkk7p049g02bidc7bggl9kf2wzmgmsnx396mqymf";
+stdenv.mkDerivation rec {
+  name = "zimlib-${version}";
+  version = "1.4";
+
+  src = fetchurl {
+    url = "http://www.openzim.org/download/${name}.tar.gz";
+    sha256 = "14ra3iq42x53k1nqxb5lsg4gadlkpkgv6cbjjl6305ajmbrghcdq";
   };
-  buildInputs = [ automake autoconf libtool lzma ];
-  setSourceRoot = "cd openzim-*/zimlib; export sourceRoot=`pwd`";
-  preConfigure = "./autogen.sh";
 
-  meta = {
-    description = "Library for reading and writing ZIM files (file format for storing Web content offline)";
+  buildInputs = [ lzma ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Library for reading and writing ZIM files";
     homepage =  http://www.openzim.org/wiki/Zimlib;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ robbinch ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ robbinch ];
+    platforms = platforms.linux;
   };
 }

From 351d1d9032cc3c92281e65d2efa88a5a03ce78c6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Mar 2017 13:49:30 +0100
Subject: [PATCH 1854/3449] zimwriterfs: 20150710 -> 1.0

---
 pkgs/tools/text/zimwriterfs/default.nix | 35 ++++++++++++++++++-------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/text/zimwriterfs/default.nix b/pkgs/tools/text/zimwriterfs/default.nix
index db604d862b88..6fcbf5061d1d 100644
--- a/pkgs/tools/text/zimwriterfs/default.nix
+++ b/pkgs/tools/text/zimwriterfs/default.nix
@@ -1,16 +1,33 @@
-{ stdenv, fetchgit, automake, autoconf, libtool, lzma, pkgconfig, zimlib, file, zlib }:
+{ stdenv
+, fetchFromGitHub
 
-stdenv.mkDerivation {
-  name = "zimwriterfs";
-  version = "20150710";
+, autoconf
+, automake
+, libtool
+, pkgconfig
 
-  src = fetchgit {
-    url = https://gerrit.wikimedia.org/r/p/openzim.git;
-    rev = "165eab3e154c60b5b6436d653dc7c90f56cf7456";
-    sha256 = "076ixsq4lis0rkk7p049g02bidc7bggl9kf2wzmgmsnx396mqymf";
+, file
+, icu
+, libgumbo
+, lzma
+, xapian
+, zimlib
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  name = "zimwriterfs-${version}";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "wikimedia";
+    repo = "openzim";
+    rev = name;
+    sha256 = "1vkrrq929a8s3m5rri1lg0l2vd0mc9n2fsb2z1g88k4n4j2l6f19";
   };
 
-  buildInputs = [ automake autoconf libtool lzma pkgconfig zimlib file zlib ];
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  buildInputs = [ file icu libgumbo lzma zimlib zlib xapian ];
   setSourceRoot = "cd openzim-*/zimwriterfs; export sourceRoot=`pwd`";
   preConfigure = "./autogen.sh";
 

From 09d7f7dfbda2c4ce1ea51e345d8dbf8803f8c62a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 7 Mar 2017 14:03:08 +0100
Subject: [PATCH 1855/3449] kiwix: fix eval and build

---
 pkgs/applications/misc/kiwix/default.nix | 35 ++++++------------------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index ef8f61fddcaa..c6d5d3056c81 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig
+{ stdenv, callPackage, fetchurl, makeWrapper, pkgconfig
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
 , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
 , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
+, xapian, ctpp2, zimlib
 }:
 
 with stdenv.lib;
@@ -28,10 +29,9 @@ let
               then { tar = xulrunner64_tar; sdk = xulrunnersdk64_tar; }
               else { tar = xulrunner32_tar; sdk = xulrunnersdk32_tar; };
 
-  ctpp2 = callPackage ../../../development/libraries/ctpp2 { inherit stdenv; };
-  xapian = callPackage ../../../development/libraries/xapian { inherit stdenv; };
-  zimlib = callPackage ../../../development/libraries/zimlib { inherit stdenv; };
-
+  ctpp2_ = ctpp2.override { inherit stdenv; };
+  xapian_ = xapian.override { inherit stdenv; };
+  zimlib_ = zimlib.override { inherit stdenv; };
 
   pugixml = stdenv.mkDerivation rec {
     version = "1.2";
@@ -53,9 +53,6 @@ let
       # and the build scripts are in there :'(
       cd scripts
     '';
-
-    NIX_CFLAGS_COMPILE = "-fPIC";
-
   };
 
 in
@@ -70,23 +67,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    zip
-    pkgconfig
-    python
-    zlib
-    xapian
-    which
-    icu
-    libmicrohttpd
-    lzma
-    zimlib
-    ctpp2
-    aria2
-    wget
-    bc
-    libuuid
-    makeWrapper
-    pugixml
+    zip pkgconfig python zlib xapian_ which icu libmicrohttpd
+    lzma zimlib_ ctpp2_ aria2 wget bc libuuid makeWrapper pugixml
   ];
 
   postUnpack = ''
@@ -107,8 +89,7 @@ stdenv.mkDerivation rec {
     "--disable-staticbins"
   ];
 
-  installPhase = ''
-    make install
+  postInstall = ''
     cp -r src/dependencies/xulrunner $out/lib/kiwix
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/lib/kiwix/xulrunner/xulrunner
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b328822f687..212647f37198 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10042,7 +10042,7 @@ with pkgs;
 
   x265 = callPackage ../development/libraries/x265 { };
 
-  inherit (callPackage ../development/libraries/xapian { })
+  inherit (callPackages ../development/libraries/xapian { })
     xapian_1_2_22 xapian_1_4_0;
   xapian = xapian_1_4_0;
 

From b94e253e69046e519bcfb04d64bf3864bf912d19 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 7 Mar 2017 14:14:14 +0100
Subject: [PATCH 1856/3449] kiwix: remove unused param

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

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index c6d5d3056c81..3961138658f7 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, callPackage, fetchurl, makeWrapper, pkgconfig
+{ stdenv, fetchurl, makeWrapper, pkgconfig
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
 , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib
 , gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake

From fac139e7233aac981cc5d1479ce75ca51264a00a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 26 Feb 2017 22:26:12 +0100
Subject: [PATCH 1857/3449] R: update to version 3.3.3

---
 pkgs/applications/science/math/R/default.nix  | 29 ++++++++++---------
 .../science/math/R/zlib-version-check.patch   | 20 -------------
 2 files changed, 16 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/science/math/R/zlib-version-check.patch

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index d9bbda9512a7..424c8172dd11 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,21 +7,21 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.3.2";
+  name = "R-3.3.3";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0k2i9qdd83g09fcpls2198q4ykxkii5skczb514gnx7mx4hsv56j";
+    sha256 = "0v7wpj89b0i3ad3fi1wak5c93hywmbxv8sdnixhq8l17782nidss";
   };
 
-  buildInputs = [ bzip2 gfortran libX11 libXmu libXt
-    libXt libjpeg libpng libtiff ncurses pango pcre perl readline
-    texLive xz zlib less texinfo graphviz icu pkgconfig bison imake
-    which jdk openblas curl ]
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
+  buildInputs = [
+    bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses
+    pango pcre perl readline texLive xz zlib less texinfo graphviz icu
+    pkgconfig bison imake which jdk openblas curl
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
 
-  patches = [ ./no-usr-local-search-paths.patch ./zlib-version-check.patch ];
+  patches = [ ./no-usr-local-search-paths.patch ];
 
   preConfigure = ''
     configureFlagsArray=(
@@ -58,6 +58,9 @@ stdenv.mkDerivation rec {
     echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
   '';
 
+  # This Darwin-specific patch has almost certainly become unnecessary. Can
+  # some Darwin user please verify that the R build still succeeds if this is
+  # removed?
   postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R
     sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c
@@ -71,10 +74,10 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.r-project.org/";
     description = "Free software environment for statistical computing and graphics";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
 
     longDescription = ''
       GNU R is a language and environment for statistical computing and
@@ -95,9 +98,9 @@ stdenv.mkDerivation rec {
       user-defined recursive functions and input and output facilities.
     '';
 
-    platforms = stdenv.lib.platforms.all;
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    platforms = platforms.all;
+    hydraPlatforms = platforms.linux;
 
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    maintainers = [ maintainers.peti ];
   };
 }
diff --git a/pkgs/applications/science/math/R/zlib-version-check.patch b/pkgs/applications/science/math/R/zlib-version-check.patch
deleted file mode 100644
index 83cfed2cac4c..000000000000
--- a/pkgs/applications/science/math/R/zlib-version-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/configure b/configure
-index cf368ce..dc528ff 100755
---- a/configure
-+++ b/configure
-@@ -35507,10 +35507,11 @@ else
- #include <string.h>
- #include <zlib.h>
- int main() {
--#ifdef ZLIB_VERSION
--/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
--   version on the master site zlib.net */
--  exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
-+#ifdef ZLIB_VERNUM
-+  if (ZLIB_VERNUM < 0x01250) {
-+    exit(1);
-+  }
-+  exit(0);
- #else
-   exit(1);
- #endif

From 6b3eec627e55158c08034b739a4ec9f2e12b98af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 1 Mar 2017 10:05:34 +0100
Subject: [PATCH 1858/3449] R: include output of sessionInfo() in the "make
 check" log

The R developers would like that information to be included in bug
reports.
---
 pkgs/applications/science/math/R/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 424c8172dd11..659b648561cf 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -68,7 +68,8 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "install" "install-info" "install-pdf" ];
 
-  doCheck = withRecommendedPackages;
+  doCheck = true;
+  preCheck = "bin/Rscript -e 'sessionInfo()'";
 
   enableParallelBuilding = true;
 

From c5563b48baabe42ee21c840997d2405888e3f65a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 20:26:20 +0100
Subject: [PATCH 1859/3449] R: set TZDIR properly to fix test suite

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

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 659b648561cf..f87a26cda8a5 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -55,15 +55,8 @@ stdenv.mkDerivation rec {
       OBJC="clang"
   '' + ''
     )
-    echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
-  '';
-
-  # This Darwin-specific patch has almost certainly become unnecessary. Can
-  # some Darwin user please verify that the R build still succeeds if this is
-  # removed?
-  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R
-    sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c
+    echo >>etc/Renviron.in "TCLLIBPATH=${tk}/lib"
+    echo >>etc/Renviron.in "TZDIR=${tzdata}/share/zoneinfo"
   '';
 
   installTargets = [ "install" "install-info" "install-pdf" ];

From e7b68767a88c53233a487f2b816c01710e0933ea Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Mar 2017 10:25:56 +0100
Subject: [PATCH 1860/3449] nlopt: rescue build by dropping support for Octave

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

diff --git a/pkgs/development/libraries/nlopt/default.nix b/pkgs/development/libraries/nlopt/default.nix
index 4e3db9b0d401..7561f3b322b5 100644
--- a/pkgs/development/libraries/nlopt/default.nix
+++ b/pkgs/development/libraries/nlopt/default.nix
@@ -16,16 +16,12 @@ stdenv.mkDerivation rec {
         "M_INSTALL_DIR=$(out)/${octave.sitePath}/m " +
         "OCT_INSTALL_DIR=$(out)/${octave.sitePath}/oct ");
 
-  preConfigure = ''
-    find octave -name '*.cc' | xargs sed -i 's|Octave_map|octave_map|g'
-  '';
-
   meta = {
     homepage = "http://ab-initio.mit.edu/nlopt/";
     description = "Free open-source library for nonlinear optimization";
     license = stdenv.lib.licenses.lgpl21Plus;
     hydraPlatforms = stdenv.lib.platforms.linux;
-    broken = true;              # cannot cope with Octave 4.x
+    broken = (octave != null);              # cannot cope with Octave 4.x
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 212647f37198..f2641e4e39d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3106,7 +3106,7 @@ with pkgs;
 
   nkf = callPackage ../tools/text/nkf {};
 
-  nlopt = callPackage ../development/libraries/nlopt {};
+  nlopt = callPackage ../development/libraries/nlopt { octave = null; };
 
   npapi_sdk = callPackage ../development/libraries/npapi-sdk {};
 

From 3dc4e12ff05fa885ee06c2e6024aca9b6ae5e471 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 2 Mar 2017 13:22:26 +0100
Subject: [PATCH 1861/3449] r-modules: remove weird version assertion

---
 pkgs/development/r-modules/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index adc842cf50b0..c37acf1076f7 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -16,8 +16,6 @@ let
   # some packages, e.g. cncaGUI, require X running while installation,
   # so that we use xvfb-run if requireX is true.
   mkDerive = {mkHomepage, mkUrls}: args:
-      # XXX: not ideal ("2.2" would match "2.22") but sufficient
-      assert (!(args ? rVersion) || lib.hasPrefix args.rVersion (lib.getVersion R));
       lib.makeOverridable ({
         name, version, sha256,
         depends ? [],

From f4595fa555333e576682e61da84a56de5df73d3c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 21:50:20 +0100
Subject: [PATCH 1862/3449] r-modules: drop broken irkernel package set

We can no longer update that package set since, apparently, it has moved
to a different packaging scheme.
---
 pkgs/development/r-modules/README.md             |  3 ---
 pkgs/development/r-modules/default.nix           |  9 ++-------
 pkgs/development/r-modules/generate-r-packages.R |  1 -
 pkgs/development/r-modules/irkernel-packages.nix | 13 -------------
 4 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/r-modules/irkernel-packages.nix

diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
index 0d9c1490d2b9..5aa839b3b5a8 100644
--- a/pkgs/development/r-modules/README.md
+++ b/pkgs/development/r-modules/README.md
@@ -94,9 +94,6 @@ mv cran-packages.nix.new cran-packages.nix
 
 Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
 mv bioc-packages.nix.new bioc-packages.nix
-
-Rscript generate-r-packages.R irkernel  > irkernel-packages.nix.new
-mv irkernel-packages.nix.new irkernel-packages.nix
 ```
 
 `generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c37acf1076f7..05016c326efc 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -38,7 +38,7 @@ let
     meta.broken = broken;
   });
 
-  # Templates for generating Bioconductor, CRAN and IRkernel packages
+  # Templates for generating Bioconductor and CRAN packages
   # from the name, version, sha256, and optional per-package arguments above
   #
   deriveBioc = mkDerive {
@@ -57,10 +57,6 @@ let
     mkHomepage = {name, snapshot}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/";
     mkUrls = {name, version, snapshot}: [ "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" ];
   };
-  deriveIRkernel = mkDerive {
-    mkHomepage = {name}: "https://irkernel.github.io/";
-    mkUrls = {name, version}: [ "http://irkernel.github.io/src/contrib/${name}_${version}.tar.gz" ];
-  };
 
   # Overrides package definitions with nativeBuildInputs.
   # For example,
@@ -222,8 +218,7 @@ let
   _self = import ./bioc-packages.nix { inherit self; derive = deriveBioc; } //
           import ./bioc-annotation-packages.nix { inherit self; derive = deriveBiocAnn; } //
           import ./bioc-experiment-packages.nix { inherit self; derive = deriveBiocExp; } //
-          import ./cran-packages.nix { inherit self; derive = deriveCran; } //
-          import ./irkernel-packages.nix { inherit self; derive = deriveIRkernel; };
+          import ./cran-packages.nix { inherit self; derive = deriveCran; };
 
   # tweaks for the individual packages and "in self" follow
 
diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R
index 9aec419c0f8d..8dc3a50abec5 100755
--- a/pkgs/development/r-modules/generate-r-packages.R
+++ b/pkgs/development/r-modules/generate-r-packages.R
@@ -10,7 +10,6 @@ mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/pa
                   , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/annotation/src/contrib/")
                   , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", rVersion, "/data/experiment/src/contrib/")
                   , cran=paste0("http://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/")
-                  , irkernel="http://irkernel.github.io/src/contrib/"
                   )
 
 mirrorType <- commandArgs(trailingOnly=TRUE)[1]
diff --git a/pkgs/development/r-modules/irkernel-packages.nix b/pkgs/development/r-modules/irkernel-packages.nix
deleted file mode 100644
index cef0af62e4f6..000000000000
--- a/pkgs/development/r-modules/irkernel-packages.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is generated from generate-r-packages.R. DO NOT EDIT.
-# Execute the following command to update the file.
-#
-# Rscript generate-r-packages.R irkernel >new && mv new irkernel-packages.nix
-
-{ self, derive }:
-let derive2 = derive {};
-in with self; {
-  IRdisplay = derive2 { name="IRdisplay"; version="0.3"; sha256="0aa7v3x6s9jd5kzwfh4659gm3dqkmadbk40a0jdpm856mf9r5w6s"; depends=[base64enc repr]; };
-  IRkernel = derive2 { name="IRkernel"; version="0.5"; sha256="0v9f01j1ysadq2f8d4mpbimrspj7051cncl0rd1n97rb8wlb9rrf"; depends=[digest evaluate IRdisplay jsonlite repr rzmq uuid]; };
-  repr = derive2 { name="repr"; version="0.4"; sha256="1mhvslkxr5nkxiijapzm29jpmjnhhjs1v9s84xvhqpxlcav8dsn6"; depends=[]; };
-  rzmq = derive2 { name="rzmq"; version="0.7.7"; sha256="0cds9wsbfb7lhgfjjfisv1i3905ny7x3i2wbb1rcih03ba4a1ij3"; depends=[]; };
-}

From add394d8f1c3a56b5e65e2563a87443d829c1c8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 4 Mar 2017 21:51:23 +0100
Subject: [PATCH 1863/3449] r-modules: update CRAN package set

---
 pkgs/development/r-modules/cran-packages.nix |  465 ++++---
 pkgs/development/r-modules/default.nix       | 1290 +++++++-----------
 2 files changed, 764 insertions(+), 991 deletions(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index b2cb8857db77..a19aa0f51a2d 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2017-02-23"; };
+let derive2 = derive { snapshot = "2017-03-03"; };
 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=[]; };
@@ -76,6 +76,7 @@ in with self; {
   AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; };
   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]; };
   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=[]; };
@@ -112,6 +113,7 @@ in with self; {
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
   AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="0.2.1"; sha256="100mbmdllk6c32j75jviz2k9kmwca3jvrqb95a555alfcpkfim8c"; depends=[]; };
   AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
+  AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.0"; sha256="14cdkbwv6bf0h6na200gwq6gdldzawsvzk9pnpixj1kq2n8amm6b"; depends=[ape seqinr]; };
   AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   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]; };
@@ -184,7 +186,7 @@ in with self; {
   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]; };
-  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="1.12-0"; sha256="13bdv9wh5s5jz5hkl839hd9x13958r3p3zzkz6j0nd7z5xax47x6"; depends=[miceadds mitools Rcpp RcppArmadillo TAM]; };
+  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=[]; };
   BIOMASS = derive2 { name="BIOMASS"; version="1.1"; sha256="1qawp10hw7xhqyg9bdwvgxbksiwhga7h6vwp8m7q30ibwfv5kamg"; depends=[httr jsonlite minpack_lm msm raster]; };
@@ -201,7 +203,8 @@ in with self; {
   BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; };
   BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="0.2.0"; sha256="1w8p8fkiai2xqgf0w8imv55p8s1nvsfdfmyrq2cnc5b8m1gw457k"; depends=[MASS matrixcalc mvtnorm plyr truncnorm]; };
   BNPTSclust = derive2 { name="BNPTSclust"; version="1.1"; sha256="1zmxwg6zn3nqqm1sw2n4pvq47mv7ygb4lf1c6yhn3xaf1rqmf26s"; depends=[MASS mvtnorm]; };
-  BNPdensity = derive2 { name="BNPdensity"; version="2015.5"; sha256="0jgdc9dayc57y77bb2yjcn1pb5ahrvbrsmyjkhyl4365sn5njzl8"; depends=[]; };
+  BNPdensity = derive2 { name="BNPdensity"; version="2017.03"; sha256="0anpi75wwx91dbm937ydgcpd8wchm0nyciy4xdhppsvzq9v3d2hp"; depends=[]; };
+  BNSP = derive2 { name="BNSP"; version="1.1.1"; sha256="00rmfn0ivrjghwzpfig3znwpswj0l1jvs9kvkknb1z33kvwbc9b4"; depends=[]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
   BOIN = derive2 { name="BOIN"; version="2.4"; sha256="0vb3bkaq9vl1yqm3dhdpd27nhv2095n3lp90fr961jpwj1xhjh5l"; depends=[Iso]; };
   BPEC = derive2 { name="BPEC"; version="1.0"; sha256="15ys0nzy6988yw1lf4lmv2h9i164cbl41x261gdyvmg0dy62qsnc"; depends=[ape coda fields igraph maps maptools mvtnorm phytools R2G2 sp]; };
@@ -258,7 +261,7 @@ in with self; {
   BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; };
   BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; };
   BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
-  BayesS5 = derive2 { name="BayesS5"; version="1.22"; sha256="18bs9kgpk7qg1hqdk7av0ygmrkn19nmrdprxf5syy0iqj5l3y13q"; depends=[abind Matrix snowfall]; };
+  BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; };
   BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; };
   BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
   BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; };
@@ -283,7 +286,7 @@ in with self; {
   Bergm = derive2 { name="Bergm"; version="3.0.1"; sha256="1ngxqpagf8snnwdm82bg8yxbf1zpzd99g32fhw9l4gjx77kpkhl2"; depends=[coda ergm 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="3.0"; sha256="0mm1n9lmx03cmwdm3nwj7x42sa24vnahhxizykfd1npcfm9zz5ij"; depends=[Rcpp]; };
+  BeviMed = derive2 { name="BeviMed"; version="4.0"; sha256="16hwjs3kv1f49la2p5qlywc02n9g7g7qzb5v4m7p2mmi0p2ybmvm"; depends=[Rcpp]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
   BiBitR = derive2 { name="BiBitR"; version="0.2.2"; sha256="13v8kwf8rnagf978v26a5qn19x44lzdz61n80rw8vxi2ydxbdbr9"; depends=[biclust foreign]; };
   BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
@@ -337,6 +340,7 @@ in with self; {
   BrailleR = derive2 { name="BrailleR"; version="0.24.2"; sha256="07kd9x176gd3ccpskv7vn22jam1pknsywcd09qj7l4zfbv9l0rqx"; depends=[devtools extrafont gridGraphics gridSVG knitr moments nortest pander rmarkdown xtable]; };
   Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
   Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
+  Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; };
   BsMD = derive2 { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
   BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
   BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; };
@@ -357,7 +361,7 @@ in with self; {
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
   CATT = derive2 { name="CATT"; version="1.0"; sha256="1hnhzla14y0cii51pi53a42bmsxcqvylj88fyvgpfavmvz301f7d"; depends=[]; };
   CATkit = derive2 { name="CATkit"; version="3.0.0.2"; sha256="1afaa1s8clynpna9hwgbgfdp5jciv0n5q9vb27cgyl9n69nla991"; depends=[magic MASS png rtf season signal]; };
-  CAvariants = derive2 { name="CAvariants"; version="3.3"; sha256="14ly5pyhvsbz08p0pk1ijwivz17jrnd0qqzn4n9jqzc9b8yml4dw"; depends=[]; };
+  CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; };
   CBPS = derive2 { name="CBPS"; version="0.13"; sha256="16g62pvxd2njawk2sfaznhicy1dfxab3v1k0bfrzj5a4l1501l2z"; depends=[MASS MatchIt nnet numDeriv]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
@@ -373,6 +377,7 @@ in with self; {
   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]; };
+  CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.0"; sha256="1sj6w80w5qmy5advk2y38lrq9xz1zidq9f83xc364kpn3nw2d7x2"; depends=[combinat VineCopula]; };
   CEC = derive2 { name="CEC"; version="0.9.4"; sha256="194n190szwzxjxfdhiah1f50vp6n7f3q567yky7pq1x2hngna5rs"; depends=[]; };
   CEGO = derive2 { name="CEGO"; version="2.1.0"; sha256="141gr1sin6sgvjasm6sczvq2za25ybw7wapdljdx2lx7qhgq77rk"; depends=[DEoptim expm MASS Matrix quadprog]; };
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
@@ -454,7 +459,7 @@ in with self; {
   CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; };
   CensMixReg = derive2 { name="CensMixReg"; version="1.0"; sha256="0plqirl6vhk2rx9q2kgniq7km9jl1g6xdn74sdjpdcm4srmr7074"; depends=[mixsmsn mnormt mvtnorm]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
-  CensSpatial = derive2 { name="CensSpatial"; version="1.2"; sha256="07zi8mxzrqfdcyrrgch9yn0dpmvj5aj2d10q26cnykifsdbaq12c"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
+  CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
   CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; };
   CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.5"; sha256="1q6dcikmk5la5msb4gml0llvbb9262bsgmdhxi75myv4jlb3b8p9"; depends=[robustbase]; };
   CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; };
@@ -520,8 +525,9 @@ in with self; {
   CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
   CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.5"; sha256="0z9fjd344wc5bisir7hf64abli7in8b5860y1012vmah4vz9knlr"; depends=[Matrix]; };
   CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
+  CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; };
   Compind = derive2 { name="Compind"; version="1.1.2"; sha256="14y18vvj13f3wi5gzrwabmj908hh1c2mizw98a36xxzlxw79fipd"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff psych]; };
-  Compositional = derive2 { name="Compositional"; version="2.2"; sha256="06s101fa8iv1sdg6x5yz3fl08mjjw265ff9kj9dxds02h036b84s"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
+  Compositional = derive2 { name="Compositional"; version="2.3"; sha256="1w2knd1h2827vl31zm9k2h404w9kcavigsj8idi8ndp6c0b2j6pc"; depends=[doParallel emplik fields foreach MASS mixture Rfast sn]; };
   Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
   ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; };
   ConR = derive2 { name="ConR"; version="1.1"; sha256="1jl6pp0g7qrp0h5771r03gjiy4g7xbqw12liiqd8cfyl045s07yr"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat]; };
@@ -536,7 +542,7 @@ in with self; {
   ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[lattice tkrplot]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
-  CopulaDTA = derive2 { name="CopulaDTA"; version="0.0.4"; sha256="087kyq6bmnv12cg1il2hb9x1wbac5a85khf8mgvcvy4f1f8hhckr"; depends=[ggplot2 plyr reshape2 rstan]; };
+  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]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; };
@@ -598,7 +604,7 @@ in with self; {
   DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; };
   DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; };
   DClusterm = derive2 { name="DClusterm"; version="0.1"; sha256="0xkl4677vqy4sdkm0fczscqszjxk1kfmlbzdgm88shcnjzjg71d8"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; };
-  DDD = derive2 { name="DDD"; version="3.3"; sha256="1rjk35gz8zq0xprzag9nzfs569pm7nhl7bfrvcnapigd2h7gw612"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; };
+  DDD = derive2 { name="DDD"; version="3.4"; sha256="0rjn28ndwa5cp23xdk830qidgs0kg3rx34yipkfg1bi4r7751was"; depends=[ade4 ape deSolve expoRkit Matrix phytools SparseM subplex]; };
   DDHFm = derive2 { name="DDHFm"; version="1.1.2"; sha256="0lgh6kcfas06p2yy7zy21r05k5521xbj5af3wwwssp5li1cia35g"; depends=[lokern wavethresh]; };
   DDIwR = derive2 { name="DDIwR"; version="0.2-0"; sha256="0dqbldl5c6b8i5q3yk0hwd12lp8z9j4ilnmsqrkj69fv7mys9q3k"; depends=[foreign XML]; };
   DDRTree = derive2 { name="DDRTree"; version="0.1.4"; sha256="02z4j777yxqp09gxwzmn6x5fjz4rbsp1lh4qj20vgdjp8wcn3pn0"; depends=[BH irlba Rcpp RcppEigen]; };
@@ -624,7 +630,7 @@ in with self; {
   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]; };
   DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
-  DMRMark = derive2 { name="DMRMark"; version="1.0"; sha256="09bw1iyyc4hqy6cjbci736zh0qzdfzk1s90in93f7s967d73mj8w"; depends=[ellipse MCMCpack mvtnorm]; };
+  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]; };
@@ -642,6 +648,7 @@ in with self; {
   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]; };
+  DSAIDE = derive2 { name="DSAIDE"; version="0.4.0"; sha256="1dy6kxk63yaa8npaszcsc5g5is8ikcdfxkk1csy34m6q5l18yxar"; depends=[adaptivetau deSolve knitr shiny]; };
   DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; };
   DSL = derive2 { name="DSL"; version="0.1-6"; sha256="0fmqxladifqqcs4mpb8a1az74fyb4gb8l2y5gzqaad3dbiz82qih"; depends=[]; };
   DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; };
@@ -705,12 +712,13 @@ in with self; {
   DiceView = derive2 { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceEval DiceKriging rgl]; };
   DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; };
   DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; };
+  DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; };
   DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; };
   Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
-  Directional = derive2 { name="Directional"; version="2.4"; sha256="1yrk0x4dydsx82415kv6a2asbd1d06ac7vyqi5j6rm4sa5cp6qmb"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
+  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]; };
   Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
   DiscML = derive2 { name="DiscML"; version="1.0.1"; sha256="0qkh0yak1kmzxxx0cqb47zgrj8v2s1d5danpibwwg43j138sb73l"; depends=[ape]; };
@@ -724,7 +732,7 @@ in with self; {
   DistributionUtils = derive2 { name="DistributionUtils"; version="0.5-1"; sha256="0gw531wfrjx1sxh17qh48dwbxnibgr0viga07vsp8nay7l02jap9"; depends=[RUnit]; };
   DivE = derive2 { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwppnbiwbpc1139rcl8f5giiwcdh"; depends=[deSolve FME rgeos sp]; };
   DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
-  DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.5"; sha256="009fy4c11w0p30jpd94vj020pnrzm8z2iwlhkdij1f14ifpamzv2"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; };
+  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]; };
@@ -754,7 +762,7 @@ in with self; {
   EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; };
   ECOSolveR = derive2 { name="ECOSolveR"; version="0.2"; sha256="1y9gl6gd8im7zhn5j4vhzk0ck620n4l9kwgxig2r27q6h652fqn9"; depends=[Matrix]; };
   ECctmc = derive2 { name="ECctmc"; version="0.2.3"; sha256="1iplg647qs52007h4vx507s643h7knisravif3v6rfyp6fhfl7v2"; depends=[Rcpp RcppArmadillo]; };
-  ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.5"; sha256="0ml623q679id989gbr9k52719blgbhfcsrzi9xaqzvwcg5qq9bi5"; depends=[jsonlite shiny]; };
+  ECharts2Shiny = derive2 { name="ECharts2Shiny"; version="0.2.8"; sha256="1yy3qxp1555h76xybnsxqnwg65flwp473wif9r1wx9965v8v6brq"; depends=[jsonlite shiny]; };
   EDFIR = derive2 { name="EDFIR"; version="1.0"; sha256="0nv1badyg1dri6z91fvs68a72g22vdg0rpi3fkpxw527r11fvrrv"; depends=[geometry lpSolve MASS vertexenum]; };
   EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; };
   EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; };
@@ -843,8 +851,9 @@ in with self; {
   EnvCpt = derive2 { name="EnvCpt"; version="0.1.1"; sha256="052yz26lypcffwnxdqxm2d029rzcdkw5dvf2xyvyhi5lcnxjrn9r"; depends=[changepoint forecast MASS zoo]; };
   EnvNicheR = derive2 { name="EnvNicheR"; version="1.4"; sha256="0hxx9wmzlw0clvdgdsy8msc78nvm81j3naxr57i7lqqa360sjy3a"; depends=[IDPmisc]; };
   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.7"; sha256="0pc1k9xr6ghm7v4cpi8qkz0b3xbq6yy4r3fqjlqly16rsvznnpcr"; depends=[cmprsk data_table etm MASS Matrix numDeriv plyr survival]; };
+  Epi = derive2 { name="Epi"; version="2.10"; sha256="0kmyan9jhjsr9f1yhff94yyy56xhm9irfrzm2m4dpf56376m2w8b"; 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=[]; };
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
@@ -957,7 +966,7 @@ in with self; {
   FatTailsR = derive2 { name="FatTailsR"; version="1.7-0"; sha256="0mywkrq929a0v20a1zaa9zc5l9k2kw5y1zz458iff3i56pzrcrsj"; depends=[minpack_lm timeSeries]; };
   FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
   FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; };
-  FedData = derive2 { name="FedData"; version="2.4.0"; sha256="1rai3hgx10q6jcjpqd0jsqvp15am3i48n1ph6dl88mhwgiblvh9w"; depends=[curl data_table devtools doParallel dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; };
+  FedData = derive2 { name="FedData"; version="2.4.5"; sha256="1ad5dffrp2rwl8sdbik40g8p0c1drb5fxkcysh3qzsd6wi1zc2ff"; depends=[curl data_table devtools doParallel dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp]; };
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
   Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
@@ -996,7 +1005,7 @@ in with self; {
   Frames2 = derive2 { name="Frames2"; version="0.2.1"; sha256="0xbz19v5r1h15p8mf94vacw04h3kvmm88ayy4b1aqxrd925n63mw"; depends=[MASS nnet sampling]; };
   FreeSortR = derive2 { name="FreeSortR"; version="1.2"; sha256="01h29p9qhlkd2qmmmw23wh9lrsggvp1h3r2laqi2lln7d7srcwbj"; depends=[ellipse smacof vegan]; };
   FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; };
-  FunChisq = derive2 { name="FunChisq"; version="2.3.3"; sha256="0n4c6lfljp7mbl05r75rj31q0rkwnmj6gif3fmxmv1y5x7x2jrxj"; depends=[BH Rcpp]; };
+  FunChisq = derive2 { name="FunChisq"; version="2.4.0"; sha256="06nnqij3cki1mdks5r422ydyc1hswfv03686jx5g9fcgxbs907kh"; depends=[BH Rcpp]; };
   FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; };
   FuncMap = derive2 { name="FuncMap"; version="1.0.8"; sha256="04rfmdy1hzxqy16csj6cf3x2kj9lg1xxvvnn494xjdwjdkfkyl09"; depends=[mvbutils]; };
   Funclustering = derive2 { name="Funclustering"; version="1.0.1"; sha256="0i6g98mfgdyc9hdzvviynrgqhkzicp8y6s0scqy3ifgk9h1k79dw"; depends=[fda Rcpp RcppEigen]; };
@@ -1059,7 +1068,7 @@ in with self; {
   GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; };
   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.6"; sha256="02g4g3w7dq5jjrir1fcxirbx36ci04fcadli921r6hz4xifhil7d"; depends=[ddst GLDEX]; };
+  GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; };
   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]; };
@@ -1136,7 +1145,6 @@ in with self; {
   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=[]; };
-  GeneticTools = derive2 { name="GeneticTools"; version="0.3.1"; sha256="033dwg94ns4mz2ixgn180h6qd783gm492p9qs2nf8498cb4ycg9m"; depends=[gMWT plotrix Rcpp RcppArmadillo snpStats]; };
   GenomicTools = derive2 { name="GenomicTools"; version="0.2.3"; sha256="1ga2myi2y5rpab0v58y1ndfqrxmbl1wdr3d0s8215apwiax4rfm4"; 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]; };
@@ -1178,7 +1186,7 @@ in with self; {
   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]; };
-  GsymPoint = derive2 { name="GsymPoint"; version="1.1"; sha256="0dps7mwq17y4fd64if2d99pr38y2wn3mksv3nsijysj0bhiwzh11"; depends=[ROCR Rsolnp truncnorm]; };
+  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=[]; };
   GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; };
@@ -1218,12 +1226,12 @@ in with self; {
   HMR = derive2 { name="HMR"; version="0.4.1"; sha256="1acaph5q6vgi4c7liv7xsc3crhp23nib5q44aszxhramky0gvaqr"; 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.4.3"; sha256="1g6kka2havns39c2m3ynq3k2zfl5vjvrf2xhhr3xhfd1p4sl0c6g"; depends=[ggplot2 MASS matrixcalc plyr reshape2]; };
+  HRM = derive2 { name="HRM"; version="0.5.0"; sha256="0xppx5ip0qhrfhri7yzqmkqrr6lf1a4pmk2lc5vxmsxdfs273y9r"; 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=[]; };
-  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-14"; sha256="0psykccxyqigkfzrszy7x3qhdw02kppzgz0bqr21q8zh51jb2y3v"; depends=[]; };
-  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-5"; sha256="0hjlkmxp1yhwkfcbx16nda96ysqddjrcvl4z52w2ab84prqn6196"; depends=[]; };
+  HSAUR2 = derive2 { name="HSAUR2"; version="1.1-15"; sha256="0vsmx201dwfgdwm9kz6nl2z5v0x3fpkbf5qmj39zb174rfz4bvhf"; depends=[]; };
+  HSAUR3 = derive2 { name="HSAUR3"; version="1.0-6"; sha256="1mn9nawi2nv6qmzm5h3259sb4k0ywc281rfnwjcv8wv88i11qiwd"; depends=[]; };
   HSROC = derive2 { name="HSROC"; version="2.1.8"; sha256="056g6iygrddmpmg5nnilqrlw2xavmcc9q07z942vc2nivw06h346"; depends=[coda lattice MASS MCMCpack]; };
   HSSVD = derive2 { name="HSSVD"; version="1.2"; sha256="1k7ga397grl0r4p0ipjgw5xlafb2528rpww67bw7mmy01w87a1cc"; depends=[bcv]; };
   HTMLUtils = derive2 { name="HTMLUtils"; version="0.1.7"; sha256="05y505jazzahnd6jsp3plqz8hd75991hhhcpcdn8093rinb1f8l1"; depends=[R2HTML]; };
@@ -1238,7 +1246,7 @@ in with self; {
   HandTill2001 = derive2 { name="HandTill2001"; version="0.2-12"; sha256="1rijjv27zwdznznvwlb5hahixmfxayr6vs11p1mzwqma8qhsn5ak"; depends=[]; };
   Hankel = derive2 { name="Hankel"; version="0.0-1"; sha256="0g3b0ji8hw29k0wxxvlnbcm0z91p4vbajbrhm6cqbccjq85lg4si"; depends=[]; };
   HapEstXXR = derive2 { name="HapEstXXR"; version="0.1-8"; sha256="00p8pziy8q6vki7brpd57c7ckc9zw41c90h47yp9vb3ndanfqavp"; depends=[survival]; };
-  Haplin = derive2 { name="Haplin"; version="6.0.1"; sha256="1hdni0ni7qbhcwg7ficv09dxj20cavyzijwdc2vk41smdsm9gg9i"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
+  Haplin = derive2 { name="Haplin"; version="6.2.0"; sha256="1r1qmald48xl1cxk2ynvh8p15958x52dlp3bdb303q2v8w66nfjm"; depends=[DatABEL GenABEL MASS mgcv snow SuppDists]; };
   HaploSim = derive2 { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
   HardyWeinberg = derive2 { name="HardyWeinberg"; version="1.5.6"; sha256="1zpba8l8fjc7ncrw0virfv1s9zaa4xsyn63jiay8ivik98siqhkb"; depends=[mice]; };
   HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
@@ -1299,7 +1307,7 @@ in with self; {
   ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; };
   ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
   ICtest = derive2 { name="ICtest"; version="0.2"; sha256="0pd16cafhx7cfwasbdli0kin83wayn7hil8allpacv9yiinj2bq3"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey]; };
-  IDPSurvival = derive2 { name="IDPSurvival"; version="1.1"; sha256="0vd2dkspsq8aqihjs7dqpfb1xk5ydnwqwzhhg142mywgf0zg2fkh"; depends=[gtools Rsolnp survival]; };
+  IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; };
   IDPmisc = derive2 { name="IDPmisc"; version="1.1.17"; sha256="0nbwdyg9javjjfvljwbp2jl0c6414c11zb2pirmm5pmimaq9vv0q"; depends=[lattice]; };
   IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; };
   IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
@@ -1344,11 +1352,13 @@ in with self; {
   Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; };
   ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; };
   ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; };
+  ImputeRobust = derive2 { name="ImputeRobust"; version="1.1-1"; sha256="1rc22p1wy9y20swv40z9f1yjswhzyifymbgrdlf1ycxm9dzn4nyk"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; };
   InPosition = derive2 { name="InPosition"; version="0.12.7"; sha256="1f7xb2kxikmja4cq7s1aiwhdq27zc6hghjbliqqpm8ci8860lb8p"; depends=[ExPosition prettyGraphs]; };
   InSilicoVA = derive2 { name="InSilicoVA"; version="1.1.4"; sha256="16978c1bdxbp3xxrcnx8yyar1dd292a5i43qhcymdp7nnprd6gc7"; depends=[coda ggplot2 rJava]; };
   IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; };
   IndTestPP = derive2 { name="IndTestPP"; version="1.0"; sha256="1ywl35k2syv46pz6ap5sjkynapqj04aq197czspqky0pvrq7ldr1"; depends=[]; };
   IndependenceTests = derive2 { name="IndependenceTests"; version="0.2"; sha256="04qfh2mg9xkfnvp6k7w1ip4rb663p3pzww9lyprcjvr3hcac7gqa"; depends=[xtable]; };
+  IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.1"; sha256="0phl0p6k4jsznvg7wn2vr4id5y5p0x81s7mj4sss9pjz49kj0laj"; depends=[]; };
   InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; };
   InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; };
   InfiniumPurify = derive2 { name="InfiniumPurify"; version="1.3.1"; sha256="0yqah4rwpishas0xyv5a7cn4v18brj33cd7f494g21b9brggafq1"; depends=[matrixStats]; };
@@ -1373,6 +1383,7 @@ in with self; {
   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]; };
   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]; };
@@ -1496,7 +1507,7 @@ in with self; {
   LSTS = derive2 { name="LSTS"; version="1.0"; sha256="1vgdqyj6k50gqfffqfb4n3sw27jrq21nl2h8sz8942w4a8fn7sgv"; depends=[]; };
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
-  LTRCtrees = derive2 { name="LTRCtrees"; version="0.1.5"; sha256="08g6bb2fbjw7xssav1n2hgr3x7wdpczvbdz2kgrgv8bhl1f4k9yx"; depends=[partykit rpart survival]; };
+  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]; };
   LaF = derive2 { name="LaF"; version="0.6.3"; sha256="0mp1g8pikmkahxgshgs4a7iryxzzcxhxdzvdn60s6m9h1addvhww"; depends=[Rcpp]; };
@@ -1559,7 +1570,7 @@ in with self; {
   MALDIquant = derive2 { name="MALDIquant"; version="1.16.1"; sha256="0058i0nc81qp7sj7j9bcy7s2vkmbacj5ycwdnvsfmsr172adxdar"; 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.0"; sha256="1y322is7c60naaz4cb090wpavw71y7hvx6n3k41ig8rfh096f60b"; depends=[mvtnorm]; };
+  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]; };
@@ -1611,7 +1622,7 @@ in with self; {
   MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.2"; sha256="04w0y5ib23l7nhj1947hwvfk6lpwwc11amqpyw1w53yj794g97wz"; 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="0.3.1"; sha256="1d5gv47zaal6vsfi10vfjvawdm911pnhjradhkrd647w54iykl59"; depends=[gplots gtools MASS RColorBrewer]; };
+  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]; };
@@ -1645,13 +1656,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]; };
   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.0"; sha256="0xrdynns2w3rgpf2hliyn80x3an17kpisbkpfhwsak87pbfamk9i"; depends=[DirichletReg]; };
+  MMDai = derive2 { name="MMDai"; version="1.0.1"; sha256="0bh25yhdyk5i4gh4h6f5i8gkwympy3i2xwlkgrj18jzghyy02rx2"; 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=[]; };
@@ -1704,7 +1716,7 @@ in with self; {
   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.6"; sha256="0gwprgf22lna4d8bifq381p5hv7ws3nnj08m6rrjnisgl158459w"; depends=[]; };
+  MVar_pt = derive2 { name="MVar.pt"; version="1.9.7"; sha256="1d5xgq3ydzv69v5dazkmmbxgag530cx5m1a3566kxkdk02rd8i71"; 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]; };
@@ -1737,7 +1749,7 @@ in with self; {
   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]; };
   McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; };
-  Mcomp = derive2 { name="Mcomp"; version="2.05"; sha256="0wggj0h0qxjwym1vz1gk9iwnwia4lpjlk6n46l6hinsdax3g221y"; depends=[forecast tseries]; };
+  Mcomp = derive2 { name="Mcomp"; version="2.6"; sha256="01m2kawkxs9k7va3bvv7bknl4y13rhy8zczc093f10msgy6nqncl"; depends=[forecast ggplot2]; };
   MeanShift = derive2 { name="MeanShift"; version="1.1-1"; sha256="02zf27xvk2zlmgxfyl5pwl2rdq8c30fb52x1mbpvlhmxjbhg6fsn"; depends=[wavethresh]; };
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
@@ -1752,6 +1764,7 @@ in with self; {
   MetSizeR = derive2 { name="MetSizeR"; version="1.1"; sha256="11hdmpvnszr6pn9ihb3zjy9miksz1fs4piry153z4dic8pjydkax"; depends=[cairoDevice gWidgets gWidgetsRGtk2 MetabolAnalyze mvtnorm]; };
   MetStaT = derive2 { name="MetStaT"; version="1.0"; sha256="0400gx6i8xlkm51da98ap91c3hgrkgfgxswn0plaxfry3625khkp"; depends=[abind MASS pls]; };
   MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; };
+  MetaComp = derive2 { name="MetaComp"; version="1.0.1"; sha256="11h0b62c54vgvdnxfjg233ripyfpi4b1d9lkpkc09d8jifhbga7q"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaDE = derive2 { name="MetaDE"; version="1.0.5"; sha256="1ijg64bri5jn2d3d13q1gvvfyqmbh6gn0lk6dkihixf0jwvjdyqi"; depends=[Biobase combinat impute survival]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; };
@@ -1833,6 +1846,7 @@ in with self; {
   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]; };
   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]; };
@@ -1932,6 +1946,7 @@ in with self; {
   OIsurv = derive2 { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[KMsurv survival]; };
   OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
   ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; };
+  OOBCurve = derive2 { name="OOBCurve"; version="0.1"; sha256="1dx2lfdpfl0aq1wshjrwa58wz20s57q03pzfj5rv6xyfmm8qhrzw"; depends=[mlr randomForest ranger]; };
   OOR = derive2 { name="OOR"; version="0.1.1"; sha256="09c7c2inpnag3kckrg9lfzxd3giqkj9xm91ibjkgpfv68nf733qc"; depends=[]; };
   OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
   OPDOE = derive2 { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
@@ -1963,7 +1978,7 @@ in with self; {
   OpenML = derive2 { name="OpenML"; version="1.2"; sha256="16zvxr45jcw4z30jmg9l6xdlkq76wbi89xj8c328qkwlghik17sy"; 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]; };
-  OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.9"; sha256="1s40c2yfd4a4khs0ghlbzii94x8cidg851bivanplg2s51j5jrhk"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
+  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=[]; };
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
@@ -2038,7 +2053,7 @@ in with self; {
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-3"; sha256="07qxyszj0f7qwrg5ixvciy33mjsfxxi9rk32a1fz46z8wiwfil9i"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-3"; sha256="1xhc84k4iszvfawwwzrwclfs41nvb8bmyygapxmsxjky725s7k1g"; depends=[base64enc]; };
-  PKNCA = derive2 { name="PKNCA"; version="0.7.1"; sha256="170chkdh78xmcw2p1xm23x4q5kj0637i0nbrwz73cxg0yni4h3qa"; depends=[digest doBy lattice nlme plyr tidyr]; };
+  PKNCA = derive2 { name="PKNCA"; version="0.8.1"; sha256="1by2yp1ngqv06w7dfl7lbb80gnmpid4xg1yhk4zvx8bwss0ggzph"; depends=[digest dplyr lattice nlme plyr tidyr]; };
   PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; };
   PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; };
   PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; };
@@ -2055,7 +2070,7 @@ in with self; {
   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]; };
   PRIMsrc = derive2 { name="PRIMsrc"; version="0.6.3"; sha256="18vk968dz9508bnnyhq2wz7py72ld42c0ah22a7d8n3nwx26ldbd"; depends=[glmnet Hmisc MASS survival]; };
-  PRISMA = derive2 { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[ggplot2 gplots Matrix]; };
+  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]; };
   PROFANCY = derive2 { name="PROFANCY"; version="1.0"; sha256="11a0fpsv1hy0djv36x2i2hv2j50ryy0x7g7nn7vv76m1sl6q6r4b"; depends=[igraph lattice Matrix]; };
   PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; };
@@ -2078,7 +2093,7 @@ in with self; {
   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="0.1"; sha256="09jl3ny4wcz7kd9kvqp5rscl8amxhpibzhny9lnakck3jrwa20hr"; depends=[Formula lasso2 mgcv RColorBrewer]; };
+  PanJen = derive2 { name="PanJen"; version="1.1"; sha256="00bvmwskawmi4x89wcn6k37nrdxfil7j1n6kc368yxvrfwvxgssy"; 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]; };
@@ -2184,6 +2199,7 @@ in with self; {
   ProteinDescriptors = derive2 { name="ProteinDescriptors"; version="0.1.0"; sha256="1ydm8aym1wwxmfh4krh84nmj1wkgb574igg1sywl58l3qlnhya0l"; depends=[]; };
   Przewodnik = derive2 { name="Przewodnik"; version="0.16.12"; sha256="1aq80aqflfm1ypqa51h10mc3g0qdr651j6g1b7008k7h0ryq42gv"; depends=[PBImisc PogromcyDanych]; };
   PsiHat = derive2 { name="PsiHat"; version="1.0"; sha256="0an71x75j6ih55alxp7kfwi0qf4z3y5bwswrjk01z2w4b9glacqh"; depends=[qvalue]; };
+  Pstat = derive2 { name="Pstat"; version="1.0"; sha256="13mm5jk3frl74sm988q8yazm790wlx2npf2cav6h5rb8ck637ffb"; depends=[]; };
   PsumtSim = derive2 { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[boot EffectsRelBaseline]; };
   PtProcess = derive2 { name="PtProcess"; version="3.3-12"; sha256="14d39xxgkqnqq79v9sp6g9csj2rp6pix2hzg9acjdmw1xyadn71h"; depends=[]; };
   PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
@@ -2223,15 +2239,15 @@ in with self; {
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
   Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; };
   QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
-  QuantTools = derive2 { name="QuantTools"; version="0.5.3"; sha256="01q71n9q9fqg6yn8mxnmd3j0mwp7ryxrkfw5cvpjwd1i9ld5d7jd"; depends=[data_table fasttime Rcpp RCurl readxl]; };
+  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="0.16.8.19"; sha256="019rhpvc4by3pizy3i6sw04230hzhmq79mkhjin3777mn9gdnzfm"; depends=[doParallel foreach fpc ggplot2 gridExtra optimx]; };
+  QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.3"; sha256="1j7v6cg3rafs9a8qmlmqk1an39kd6h6pbspd7zalmnq1v1a10m91"; 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]; };
   R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
-  R_filesets = derive2 { name="R.filesets"; version="2.10.0"; sha256="0wdqxskmamqygvxh9jmvkhkgm906yrqci6vivczr9la0j4zwnn0b"; depends=[digest future listenv R_cache R_methodsS3 R_oo R_utils]; };
+  R_filesets = derive2 { name="R.filesets"; version="2.11.0"; sha256="0hjmd86zqsd9v17ma9r734pk9b0k53ayb52w5mm19d9hnl3wnv08"; depends=[digest future R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
   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=[]; };
@@ -2253,7 +2269,7 @@ in with self; {
   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]; };
   R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
-  R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.1"; sha256="08s999m1kfjzabng41d5fpkag7nrdbricnw7m4jvj1ssqfnil2hj"; depends=[bitops RCurl RJSONIO]; };
+  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]; };
@@ -2350,6 +2366,7 @@ in with self; {
   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]; };
@@ -2430,7 +2447,7 @@ in with self; {
   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=[]; };
-  RPMM = derive2 { name="RPMM"; version="1.20"; sha256="09rwrcd8jz0nii1vx0n3b4daidiq0kp0vf88bvi84y4i06743il7"; depends=[cluster]; };
+  RPMM = derive2 { name="RPMM"; version="1.25"; sha256="1j48dh434wfhfzka0l21w6f73qlwfm70r9gdddhn504i2d5m4jph"; depends=[cluster]; };
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   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]; };
@@ -2472,7 +2489,7 @@ 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"; sha256="0gcmgnczqhz8vzwj8img32z95si1ywbg2mvfd3rwlxzxqdkxg98v"; depends=[NLP openNLP plyr stringr]; };
+  RSentiment = derive2 { name="RSentiment"; version="2.1.1"; sha256="1p8bffsngk0s91y4f7prnlr7w9bxh460mf5ibi7v4md7jbbvhcsf"; 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]; };
   RSmartlyIO = derive2 { name="RSmartlyIO"; version="0.1.1"; sha256="1xxs5q25v3i0qf829xl8n90n2fx1anfgfrzvwzff4dm252y7b2gw"; depends=[RCurl]; };
@@ -2485,7 +2502,7 @@ in with self; {
   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]; };
-  RSurvey = derive2 { name="RSurvey"; version="0.9.0"; sha256="09ivilmwvjjbs3451cyxhcgq2w9rx6b8b5dsgg6y7l478k5bffrw"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
+  RSurvey = derive2 { name="RSurvey"; version="0.9.1"; sha256="0q0iyljdrg6avskqmsczda3008nrzg0lf1bmp4x188vx4dm0cs11"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
   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=[]; };
@@ -2494,7 +2511,7 @@ in with self; {
   RTextureMetrics = derive2 { name="RTextureMetrics"; version="1.1"; sha256="0d0mvpmcpd62cvqlajrqp32lnvpflyf9bqvdzly2v8v1kb8274fc"; depends=[]; };
   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-62"; sha256="0b4g0ia5kawamm6mpzw04365j1cgf8py5dp18kdsqwgisxxm699f"; depends=[ade4 boot car cramer dunn_test FactoMineR lme4 MASS mixOmics multcompView nnet pls pspearman statmod vegan]; };
+  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]; };
   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]; };
@@ -2639,7 +2656,7 @@ in with self; {
   Records = derive2 { name="Records"; version="1.0"; sha256="08y1g2m6bdrvv4rpkhd5v2lh7vprxy9bcx9ahp1f7p062bn2lwji"; depends=[]; };
   RedditExtractoR = derive2 { name="RedditExtractoR"; version="2.0.2"; sha256="1113dm41rhyimn7jc3pkrdqz3biqg5m174vz24jchhmn9n38zsss"; depends=[igraph RJSONIO]; };
   Redmonder = derive2 { name="Redmonder"; version="0.2.0"; sha256="02qrz1b0g7hdacj2s2bks5gfwnypkbiwlmn0bv7im1zz1swg9cp8"; depends=[]; };
-  RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.0"; sha256="1mli7h3d4vw0sds6pav74fzpw4c3lmy7jrlp0dw47cmfxg2rhslg"; depends=[isva quadprog]; };
+  RefFreeEWAS = derive2 { name="RefFreeEWAS"; version="2.1"; sha256="1w0cx988ixl10d8ylfsblmk1mdd9dhzxdhp9z4n1643dkd2xzr02"; depends=[isva quadprog]; };
   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=[]; };
@@ -2656,11 +2673,11 @@ in with self; {
   ReporteRs = derive2 { name="ReporteRs"; version="0.8.8"; sha256="1pw3hy3g0nc6amga59sb1nnwqc9asdpn6lh2zfh87y8nazrf1hf0"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
   ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.2"; sha256="1abvgzxipg0cgiy26z14i99qydzqva6j2v7pnrxapysg7ml5cnjc"; depends=[rJava]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
-  ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-1"; sha256="1x7kc0zh22pqi7dw4iav9dac8wpj491lpqbnaqfncyhswpdkimvi"; depends=[MASS Matrix pbapply]; };
+  ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-2"; sha256="08b1aa3183k1y30dwabnd6x353mdp2sn5b908cpv84bs3fdzlrdp"; depends=[MASS Matrix pbapply]; };
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
   Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; };
   Rfacebook = derive2 { name="Rfacebook"; version="0.6.11"; sha256="1si21in7ykv4532xsz12v9nwzfj142bnbf14qc74fbp1p087k6c0"; depends=[httpuv httr rjson]; };
-  Rfast = derive2 { name="Rfast"; version="1.7.4"; sha256="1yrg3iflppbpjmw8rah4jdgwksnqplc0l3ds492s9zrw51vxz38c"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
+  Rfast = derive2 { name="Rfast"; version="1.7.5"; sha256="09nxyv2cb7z79nkcnb5wm58930yfhk6ndvznlqfg6xlihx0yjyq6"; depends=[Rcpp RcppArmadillo RcppZiggurat]; };
   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]; };
@@ -2765,7 +2782,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.6"; sha256="0mm3dls9w9q060pylrkl3zwzix9zprpljajfm6z8k5bbhha1qsbc"; depends=[]; };
+  SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.7"; sha256="0xs2zjr3r3a39szip53qkcja3n89vr1hq46a2zcwl6s5gdbb1vyj"; 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=[]; };
@@ -2888,7 +2905,7 @@ in with self; {
   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]; };
-  STPGA = derive2 { name="STPGA"; version="3.0"; sha256="093van0k48x7i7r6g2kzn59x58rpqizkkw99l67agndnij13kck9"; depends=[]; };
+  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]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
@@ -3010,16 +3027,17 @@ in with self; {
   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]; };
   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]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-1"; sha256="108gxk0gbbjck9bgxvqb9h216ww21lmh2by0hrhzwx5r63hhcbmd"; depends=[]; };
   SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
   SpatialPosition = derive2 { name="SpatialPosition"; version="1.1.1"; sha256="1fbch16qmp8xnlkl7crydn1rh5gj49zlii6c9va5l7zp5wf8cl87"; depends=[raster rgdal rgeos sp]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; };
-  SpatialVx = derive2 { name="SpatialVx"; version="0.6"; sha256="1zjjdhfancjliz0pa0rdfbf26wdci1v3krb42bd99kb4crrk9291"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
+  SpatialVx = derive2 { name="SpatialVx"; version="0.6-1"; sha256="1yscz5w6ydh87qh4ncgn6br49pzg08nqgx95m5bmydqx2r74h9jg"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
   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-0"; sha256="02mwl7kv784wdf3v6f15vbjd8sa1mh8ms11k19bjj3qci9xnx4jw"; depends=[Rcpp RcppArmadillo]; };
+  SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-1"; sha256="18l2dpyks6vay4vh24jmv81br9fblhm0rb1m6jpfj1qzpa974010"; 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]; };
@@ -3059,6 +3077,7 @@ in with self; {
   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]; };
   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]; };
@@ -3085,10 +3104,11 @@ in with self; {
   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.99993-0"; sha256="1n5xs7s1rkn4y0317pkzg1dwdf7r5fm8wkaf0d3jvrz80g6cqbin"; depends=[CDM GPArotation lattice lavaan MASS msm mvtnorm plyr psych Rcpp RcppArmadillo sfsmisc tensor WrightMap]; };
+  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]; };
   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]; };
   TBEST = derive2 { name="TBEST"; version="5.0"; sha256="15piy507vv8x59xgga17splxszy0vm87qjbfgxycvba633jishsa"; depends=[fdrtool signal]; };
   TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; };
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
@@ -3206,7 +3226,7 @@ in with self; {
   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]; };
-  TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.5"; sha256="198yvnvw8yq321p2cdan1s47dy9vy4yxhqsnlp391lzykvan1qpc"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
+  TraMineRextras = derive2 { name="TraMineRextras"; version="0.2.6"; sha256="1ih2d02p8dnpcvsxqqi6mcnac36i93g4fkq1pdpl7p2i1hl15hyr"; depends=[cluster combinat RColorBrewer survival TraMineR]; };
   TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.1"; sha256="1f2l3nshb6qrhyczw5rxqqzmsjxf0rvv3y78j8d9lv1nnd9kxzq5"; depends=[fields RColorBrewer]; };
   Trading = derive2 { name="Trading"; version="1.1"; sha256="1mzqck9n14xp16vflx1sx8lry0wjmx37hqv76ldj21xnk5zbrgil"; depends=[]; };
   Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; };
@@ -3222,7 +3242,7 @@ in with self; {
   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.0.2"; sha256="0rkgjx3nnjyy46fbn4szvbsiz8awf6238h7br9kjwc06aaj935dp"; depends=[beepr doParallel GA GenSA MASS msm propagate reshape2]; };
+  TropFishR = derive2 { name="TropFishR"; version="1.1"; sha256="0iv7v2wl899mw4c9nwgn530spc9vz0klhbrkc9ssazzrpxn3lq21"; 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=[]; };
@@ -3311,6 +3331,7 @@ in with self; {
   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]; };
@@ -3322,12 +3343,13 @@ in with self; {
   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]; };
   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.4"; sha256="085jzpgd1wgbsj68n5cixq6q4hw2sz485d9lpmch9qakhbpm7849"; depends=[]; };
+  WhopGenome = derive2 { name="WhopGenome"; version="0.9.6"; sha256="038bg8c3y9h5hbkicikdqcjli5cf1bpmsc021zi00bgsk8z4i1iq"; 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]; };
@@ -3364,8 +3386,8 @@ 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-15"; sha256="1a55v03znczpbwlxd70dy73lzq75ifmqfkhwmwn7vdz8pdcsmiqx"; depends=[AER Amelia coda dplyr geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
-  ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-3"; sha256="0wh10mzasl2mzn0afas2k9dqjsmdgnbjci9i9s1fqxgdil0jp09q"; depends=[dplyr jsonlite MASS VGAM Zelig]; };
+  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]; };
+  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]; };
@@ -3442,7 +3464,6 @@ in with self; {
   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]; };
-  after = derive2 { name="after"; version="1.0.0"; sha256="0r0cdb0jspqi5vmaighwwqc0636wc5m297nq1j3n84w7z2aglg2w"; depends=[]; };
   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]; };
@@ -3511,7 +3532,7 @@ in with self; {
   aop = derive2 { name="aop"; version="1.0.0"; sha256="1i3mixiwcvqygbcvj6f9vm223plmydzmixpy6nhis2zv9d90vakd"; depends=[ggplot2 graph igraph plyr Rgraphviz rjson]; };
   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.1.0"; sha256="1a5xhybx43xgwf68fkxrqwj6azj70jpsrp2fwi1m7gvn4klcv3wh"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
+  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]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
@@ -3536,7 +3557,7 @@ in with self; {
   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]; };
   arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
-  arc = derive2 { name="arc"; version="1.0"; sha256="1arms8crr198i4niq1wvp8ig474hlgjx63q0m96f8w6fsz63knqy"; depends=[arules discretization Matrix R_utils]; };
+  arc = derive2 { name="arc"; version="1.1"; sha256="1ms0ibvsdjqgdramd4nxy5dcnw019yfpd5xryjficmkfxs6jl9pf"; depends=[arules discretization Matrix R_utils]; };
   archdata = derive2 { name="archdata"; version="1.1"; sha256="07ca51kl5imy6d9s0qi501xxl3zn4q3gbm0w8kvznfw8imclq17z"; depends=[]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
   archiDART = derive2 { name="archiDART"; version="1.4"; sha256="1ymk56w07jj51p2r4g7qa4a3nyhnjrbn6igxgn6644mm0v118b8h"; depends=[XML]; };
@@ -3618,16 +3639,18 @@ in with self; {
   attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; };
   attribrisk = derive2 { name="attribrisk"; version="0.1"; sha256="1zqx53mxz2hh9jyanf3jkadgpj44jbqrk4p13fas91zvhpw9pn5s"; depends=[boot survival]; };
   auRoc = derive2 { name="auRoc"; version="0.1-0"; sha256="1ijk127p6g5mzc7b4b9lnjnfzvklz3g8w6bckrdahlw7djd9mgz1"; depends=[coda MBESS ProbYX rjags]; };
-  aucm = derive2 { name="aucm"; version="2016.1-2"; sha256="1nyxxyivs6inq8r18x7fl3zkpn75sczwnbzsv672nzdlqj5d2b5f"; depends=[kyotil]; };
+  aucm = derive2 { name="aucm"; version="2017.3-2"; sha256="124rb1lhssvmlzkzb5h6hc5plv0hk7wkid53cbd28nxx1grp2wwm"; depends=[kyotil]; };
   audio = derive2 { name="audio"; version="0.1-5"; sha256="1hv4052n2r6jkzkilhkfsk4dj1xhbgk4bhba2ca9nf8ag92jkqml"; depends=[]; };
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   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.1"; sha256="0yi6n60b72qw20bp2hchxn653c3a9x2yvgawkqs31xbkq0s50rbc"; depends=[fields ggplot2 mapproj maps viridis]; };
+  autoimage = derive2 { name="autoimage"; version="1.2"; sha256="1dzxdz7wpmhl5p1jcab2i7k9fd7idm3dflsyj8clpp203wr4kz56"; depends=[fields ggplot2 mapproj maps viridis]; };
+  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]; };
   aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; };
@@ -3670,7 +3693,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-35"; sha256="12sakwz9g3w0w4di2i0l12nk5lmdniqhiq2nvmzbdy3vs4n06m3i"; depends=[Matrix orthopolynom polynom variables]; };
+  basefun = derive2 { name="basefun"; version="0.0-36"; sha256="1y2pvs5gffifvchyqahsnqg6zw00yargajvryrb96labh9c5dqyl"; 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]; };
@@ -3748,7 +3771,8 @@ in with self; {
   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]; };
-  bestglm = derive2 { name="bestglm"; version="0.35"; sha256="047gb82hgivgafx5b267gpgq9y11m74rag5j05rprmv9nz43hdqj"; depends=[lattice leaps]; };
+  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=[]; };
   betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; };
   betapart = derive2 { name="betapart"; version="1.4-1"; sha256="1ldz6hr08vsgvz0h9ilsm5ab5fyppjpnz215lhri80x7biym3c0q"; depends=[ape geometry picante rcdd]; };
@@ -3766,7 +3790,7 @@ in with self; {
   bgeva = derive2 { name="bgeva"; version="0.3"; sha256="0isijl43kmg4x7mdnvz0lrxr87f68dl4jx7gmlg70m8r6kk8cfqn"; depends=[magic mgcv trust]; };
   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.7"; sha256="00bjwmgqvz053yczvllf1nxy1g88fgwrrzhnw309f2yjr1qvjbgg"; depends=[car combinat lattice mvtnorm]; };
+  bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; };
   bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; };
   bhm = derive2 { name="bhm"; version="1.1"; sha256="00xnqppq95qvdbiklsz4af4f0f4p61b7c7v0l1k1isxqr3mgcgia"; depends=[coda survival]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
@@ -3776,7 +3800,7 @@ in with self; {
   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.1"; sha256="09pv4xll609y4nfgalssyfgqd8c74zc75bbyq4d8h94yyhw1d8d0"; depends=[Formula Rcpp RcppArmadillo]; };
+  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]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
   bigQueryR = derive2 { name="bigQueryR"; version="0.2.0"; sha256="1z9a725jd9nparid0df7fyvsa5mvz92krj0q7mq75x6cprr44f29"; depends=[googleAuthR googleCloudStorageR]; };
@@ -3826,7 +3850,7 @@ in with self; {
   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]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
-  biogas = derive2 { name="biogas"; version="1.6.0"; sha256="100593ddrsl82hhpq289vs0gdasrm9fmwf6vhd530rp8k7y07j4a"; 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]; };
@@ -3858,7 +3882,7 @@ in with self; {
   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]; };
   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-2"; sha256="1jiicy21zhrnk04b74nxs4yp3g0mzcxxb6zn5wks12b1791ykrm6"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
+  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=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
   blighty = derive2 { name="blighty"; version="3.1-4"; sha256="1fkz3vfcnciy6rfybddcp5j744dcsdpmf7cln2jky0krag8pjzpn"; depends=[]; };
@@ -3869,7 +3893,7 @@ in with self; {
   blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; };
   blob = derive2 { name="blob"; version="1.0.0"; sha256="0zjb3sbx4q36d69p2164im1nvpsdjz5mqa5rmncjziipgz6aix38"; depends=[tibble]; };
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
-  blockcluster = derive2 { name="blockcluster"; version="4.2.1"; sha256="05fy6l0q0q0jmvyfph3wmlkniz4njkrzmhyy14hamzsiwn23cpiw"; depends=[Rcpp rtkore]; };
+  blockcluster = derive2 { name="blockcluster"; version="4.2.3"; sha256="1b3rqpg3i5bplz85lxfspb1vv8l7qsxwkalnn0h5pwy9ppqdbcb7"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
   blockmodeling = derive2 { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
@@ -3913,7 +3937,7 @@ in with self; {
   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="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
+  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]; };
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
@@ -3945,7 +3969,7 @@ in with self; {
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
   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.0"; sha256="1rjrf88wfbq1zzyxkrrajis6mrsv3zi4kdf7y8992bwfx53pwpph"; depends=[abind bayesplot coda evd ggplot2 loo Matrix matrixStats mgcv nlme Rcpp rstan rstantools RWiener shinystan statmod]; };
+  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]; };
   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]; };
@@ -4031,7 +4055,7 @@ in with self; {
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
   catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; };
   cati = derive2 { name="cati"; version="0.99.1"; sha256="0sg6qagv1wiygylgygjfn7v4n99ifaaa34qvaspmm9b4fyfcxqa5"; depends=[ade4 ape e1071 FD geometry hypervolume mice nlme rasterVis vegan]; };
-  catlearn = derive2 { name="catlearn"; version="0.3"; sha256="1bqcv58g4111yjschzdikb130as4wv08pxppzwpjh4k2pg929jmk"; depends=[Rcpp]; };
+  catlearn = derive2 { name="catlearn"; version="0.4"; sha256="1bpmvbpa6qab40ajmy64hg6f3zh3yifqj0rfqyk0b9f9jpdqxz9h"; depends=[Rcpp]; };
   catnet = derive2 { name="catnet"; version="1.15.0"; sha256="0z2ps2wb33hc0dg08v70gvpy2zibr6kqjjv90g07hkmrhp6zjk5n"; depends=[]; };
   catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; };
   causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; };
@@ -4042,6 +4066,7 @@ in with self; {
   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]; };
   ccaPP = derive2 { name="ccaPP"; version="0.3.2"; sha256="166spwqsqbp42mr1acglydlxspcpn8vhnim8r3s9m81sa9pmazpj"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; };
+  ccafs = derive2 { name="ccafs"; version="0.1.0"; sha256="1bb1127mfpz6s2hs43msjcxk56bsk6vhxznpnv0fb21r8xnx0g7m"; depends=[crul data_table httr jsonlite rappdirs raster tibble xml2]; };
   cccd = derive2 { name="cccd"; version="1.5"; sha256="0m364zsrgr7mh1yhl2lqxpaf71gzq3y3pp9qgnj4spiy4iadyy7i"; depends=[deldir FNN igraph proxy]; };
   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]; };
@@ -4185,7 +4210,7 @@ in with self; {
   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]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-  clustvarsel = derive2 { name="clustvarsel"; version="2.2"; sha256="1b38y9zn4xbiddm5m5ki307i5yih2nadhnpnsizz91jkcqdnjhw1"; depends=[BMA foreach iterators mclust]; };
+  clustvarsel = derive2 { name="clustvarsel"; version="2.3"; sha256="1f7qyffm4jrlg4bh3mg550igs7wib8y9pksx0h6gn0n9pkv1s8rc"; depends=[BMA foreach iterators Matrix mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
@@ -4213,7 +4238,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.1"; sha256="00kvvsz1l603v36clsz7jm1yiwl07vcyhv4ghy0pjlz8hcfaqmna"; depends=[fractional Matrix]; };
+  codingMatrices = derive2 { name="codingMatrices"; version="0.2.2"; sha256="1x1h5jdnfx6l8ry7nmn3f1qyzv96vf8axzjxcxqrlylh6z1zc068"; 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]; };
@@ -4251,7 +4276,7 @@ in with self; {
   comf = derive2 { name="comf"; version="0.1.6"; sha256="1dfba8i08gc319ybqhfs96wa2mp0ndh4rrkv9i432gc56p4kgapr"; depends=[plyr]; };
   commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; };
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
-  commonmark = derive2 { name="commonmark"; version="1.1"; sha256="0dh56cspy8wkvbz0602vp050qxd70wm063lqflfk2zddcrv9lhc2"; depends=[]; };
+  commonmark = derive2 { name="commonmark"; version="1.2"; sha256="12q5mncxvkwdxc35is6y5idx8a1h99hyz5x6ri0arni6k25krchk"; depends=[]; };
   compHclust = derive2 { name="compHclust"; version="1.0-2"; sha256="1h39krvz516xwsvn5987i1zbzan8vx2411qz6dad112hpss0vyk9"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
@@ -4312,7 +4337,7 @@ in with self; {
   cooccurNet = derive2 { name="cooccurNet"; version="0.1.6"; sha256="1vqfmvjrxxn977jrry47wn4lag4yi4bkyxwlis3n1ly39kkmyh2j"; depends=[bigmemory doParallel foreach igraph knitr Matrix pryr seqinr]; };
   coop = derive2 { name="coop"; version="0.6-0"; sha256="1q38kawck0625fyxmh7a0cya5yyhv9ds53q1l0h03vrappq5amxv"; depends=[]; };
   cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; };
-  copBasic = derive2 { name="copBasic"; version="2.0.4"; sha256="0vc1rk0njcmd501jpsrpgqzrcqyplnycfaidn9qwns84cswx0hxs"; depends=[lmomco randtoolbox]; };
+  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]; };
   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]; };
@@ -4372,6 +4397,7 @@ 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=[]; };
+  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]; };
@@ -4394,6 +4420,7 @@ in with self; {
   crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
   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=[]; };
   crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; };
   crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; };
@@ -4409,7 +4436,7 @@ in with self; {
   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.14.4"; sha256="11pj3pbb9hs7bwdmgr10jlir95rq4xdn4qmyklqjls2kgh9r9sfn"; depends=[curl httpcache httr jsonlite]; };
+  crunch = derive2 { name="crunch"; version="1.15.0"; sha256="0ylkp861dy8qa03pjl6znf2mgknhnf3wfyby01zjzrwak2pixi5n"; 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=[]; };
@@ -4471,7 +4498,7 @@ in with self; {
   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]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.1"; sha256="0xx1lpp9qpkqh991ib0l9z1wn6j67jnggrhq5gr5sm63m7sjijwn"; depends=[base64enc dendextend htmlwidgets png scales]; };
-  d3r = derive2 { name="d3r"; version="0.6.1"; sha256="1j69rm37j4q6dwhqprr9cmcl2x9qlmjas025kzl5fagb554dkgy8"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.6.2"; sha256="0abxv8ld6zzkajqkiz0dv61axw3yak4arpw8ar43dypg1ar5cbmm"; 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]; };
@@ -4545,7 +4572,7 @@ in with self; {
   deal = derive2 { name="deal"; version="1.2-37"; sha256="1nn2blmxz3j5yzpwfviarnmabbyivc25cbfhcf814avrhpysvpxa"; depends=[]; };
   deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
   debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
-  debugme = derive2 { name="debugme"; version="1.0.1"; sha256="14yhkvh05748jfn2dsdllflsjnjljhjm8kkzzqb7zcp6qjylwcys"; depends=[crayon]; };
+  debugme = derive2 { name="debugme"; version="1.0.2"; sha256="0ayqai6a5zv8mmhv2pcj6yzlpkkhjh7fa3l4pjljgi37ma3pi38z"; depends=[crayon]; };
   decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; };
   decisionSupport = derive2 { name="decisionSupport"; version="1.101.2"; sha256="0zmf87wjrpkg12ix8dz3asrwldwvclj1ifvzff46zgipdm3viqr0"; depends=[msm mvtnorm]; };
   decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
@@ -4603,7 +4630,7 @@ in with self; {
   detect = derive2 { name="detect"; version="0.4-0"; sha256="119kvkgpgd12v31ps1bg5dmc9djkaqzls548nlrvn1pbmahfnfx5"; depends=[Formula pbapply]; };
   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.2"; sha256="0hw88kizz0kcz4i1lqz30gixiq7im91875p2wpvbnzyxhs3n04vi"; depends=[ggplot2 MASS shiny]; };
+  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=[]; };
   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]; };
@@ -4618,7 +4645,7 @@ in with self; {
   dfpk = derive2 { name="dfpk"; version="2.0.0"; sha256="0nn0m4kvjsyv48xribkab0jnbv0db17aan9flnkg5jh4s03pg9sc"; 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="1.0.5"; sha256="02g8x4p98jv3cfwfxvh68aivb72651w4977g4xqksq0p4nqcs636"; depends=[]; };
+  dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; };
   dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
   dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; };
@@ -4641,7 +4668,7 @@ in with self; {
   diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; };
   diffeR = derive2 { name="diffeR"; version="0.0-4"; sha256="08g21h3yq8rm2i6ah364nfadg7hnghc21jnpi5aqwzqyd2v93b67"; depends=[ggplot2 raster rgdal]; };
   diffobj = derive2 { name="diffobj"; version="0.1.6"; sha256="0f6wskh3nl8ngh195x8wiv1g0fc690r4zh4ypkraqd2c6x1iskg7"; depends=[crayon]; };
-  diffr = derive2 { name="diffr"; version="0.0.1"; sha256="0lhk9vm9gp0pwzsniy49dgq9vd4c1bxf8c8w8ib4b4fg5jq3hfwj"; depends=[htmlwidgets]; };
+  diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
   diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
   diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
   diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; };
@@ -4657,6 +4684,7 @@ in with self; {
   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]; };
+  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]; };
   discgolf = derive2 { name="discgolf"; version="0.1.0"; sha256="15bk2k7glahcbz4kyl3fiayi7ck6z3wabl9y25fg6cnxkbyh6dbn"; depends=[httr jsonlite xml2]; };
@@ -4677,7 +4705,7 @@ in with self; {
   disposables = derive2 { name="disposables"; version="1.0.1"; sha256="1gmmf34hq8vm2gjg1560hkarppxmzakymgjbpzbpy2j471kd9s7a"; 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]; };
-  distcomp = derive2 { name="distcomp"; version="0.25.4"; sha256="0drh7a79nvc6l6c0q2k9hva6kpb8ik6q2aiynp8ab8pf0dh84h6d"; depends=[digest httr jsonlite R6 shiny stringr survival]; };
+  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=[]; };
@@ -4693,7 +4721,7 @@ 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.1"; sha256="13vgnjifvjsrhh3ns5l2gxwf80bg3a3j3n9ycblzjyjpl7i1960i"; depends=[caTools geosphere KernSmooth quantreg]; };
+  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]; };
@@ -4733,7 +4761,7 @@ in with self; {
   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.1"; sha256="1xvzsnb6v904829lqxmypn56jkm98lw4wpcvljn8620w2wipark5"; 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]; };
   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]; };
@@ -4749,6 +4777,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]; };
   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]; };
@@ -4796,7 +4825,8 @@ in with self; {
   dynlm = derive2 { name="dynlm"; version="0.3-5"; sha256="1sjhhlvvcgmayb9dfwacv1g75c4lhbpzyczj6h7gkd19bcfbdhqp"; depends=[car lmtest zoo]; };
   dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
-  dynr = derive2 { name="dynr"; version="0.1.8-17"; sha256="1q2rag00haniv2ffp6k7kr00zy11rpksa55sp8wymcb96x8m64mw"; depends=[ggplot2 latex2exp MASS Matrix numDeriv plyr reshape2 xtable]; };
+  dynr = derive2 { name="dynr"; version="0.1.9-20"; sha256="0pdlbnrxj4jzfy1ycm7k2jdwckgzdjmgkrkhak43d0bgcp1wh8qv"; depends=[ggplot2 latex2exp MASS Matrix numDeriv plyr reshape2 xtable]; };
+  dynsbm = derive2 { name="dynsbm"; version="0.3"; sha256="0wgpcilqfy5jjqw5sk0jwgi5ryf4d52308fgcx133059n9i1k3rz"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
   dynsurv = derive2 { name="dynsurv"; version="0.3-5"; sha256="0rvwnssg876sng53viiqfcm7mxvilpds9yahj6bwgs90chnkjz4g"; depends=[BH ggplot2 nleqslv plyr reshape survival]; };
   e1071 = derive2 { name="e1071"; version="1.6-8"; sha256="08n6i26nfckjpxjkzi8phhanc3ahsrirkv5rz38y2jcv7ds031pn"; depends=[class]; };
@@ -4811,7 +4841,7 @@ in with self; {
   earth = derive2 { name="earth"; version="4.4.9"; sha256="1dyz2ac754scg474x9ksrwrqflmh9wi7qwgm494fpfi9ndd9ycig"; 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]; };
-  easyPubMed = derive2 { name="easyPubMed"; version="1.7"; sha256="1gkd95ady6wqm3v89rf5k3axz3g4gv67bvr2kgci3zf3xvqzva7a"; depends=[XML]; };
+  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]; };
   easyanova = derive2 { name="easyanova"; version="4.0"; sha256="1d8fkgyqzphipvla7x8ipcf0by07iqx8xran15d2q82yq9iik5g9"; depends=[car nlme]; };
@@ -4833,7 +4863,7 @@ 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.6.0"; sha256="0swkaimm1nfrnb5niiihwx5i0b5l4cg8b6bmy0aipawpgpphn1yh"; depends=[car]; };
+  ecm = derive2 { name="ecm"; version="0.8.0"; sha256="0y9whfr75mc54ip1vc0zrbxsjslz86adqrqdvpbbva81c2x1b0ir"; 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]; };
@@ -4883,7 +4913,7 @@ in with self; {
   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.7"; sha256="128wvfsvzf84rkvk3bnailn2k4qf5iq5r7hnrxlamajia526ky31"; depends=[cubature data_table eiPack ellipse foreach ggplot2 magrittr mnormt msm mvtnorm plotrix plyr R_utils tidyr 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]; };
   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=[]; };
@@ -4972,7 +5002,7 @@ in with self; {
   epxToR = derive2 { name="epxToR"; version="0.1-0"; sha256="1nvm9cr12lvh877xxiyii0gbfs6r0px76f5qlpn3pdlgj59msn3s"; 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.0"; sha256="1yq8f1svh8cg9pgharnb5ijxf692rm2avjvd6xabsv8jid25618l"; depends=[huge igraph mvtnorm XMRF ZIM]; };
+  equSA = derive2 { name="equSA"; version="1.0.1"; sha256="0sy1wfdr9p5m8hx0wbf4kzcfxmak2q6snaasp224agammslgyqyp"; depends=[huge igraph mvtnorm 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]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
@@ -4986,7 +5016,7 @@ in with self; {
   ergm_rank = derive2 { name="ergm.rank"; version="1.0.1"; sha256="0k5ffqxn9fspbg82j2cmrcyav3nqjk7cnsq48xwy9i3z3vaq704k"; depends=[ergm network statnet_common]; };
   ergm_userterms = derive2 { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[ergm network statnet_common]; };
   ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
-  erp_easy = derive2 { name="erp.easy"; version="1.0.0"; sha256="0md4l48qb2z6c527ir1dwc51z8yw1jq7yx85fxzzg0wh1vzafp1z"; depends=[plyr signal]; };
+  erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; };
   erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
   errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
   errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; };
@@ -5008,11 +5038,12 @@ 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.2"; sha256="1wdxmhcq7zz0x9rrddp7pswj6pbsfdgwrrlm6lgsv7cvs6cmh1na"; depends=[dplyr httr jsonlite plyr urltools xml2]; };
-  europop = derive2 { name="europop"; version="0.3"; sha256="01c31p82r1paxqq209078av9fzkvrl3wp9hz8s79iwf4hlqxbiw6"; depends=[]; };
+  europepmc = derive2 { name="europepmc"; version="0.1.3"; sha256="1mjrrz8xjizxvkmzidbwxs82ijaa70l39anaba8bi7vj8l2k64bm"; 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]; };
   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]; };
   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=[]; };
@@ -5033,7 +5064,7 @@ in with self; {
   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-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; 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=[]; };
@@ -5061,6 +5092,7 @@ in with self; {
   exsic = derive2 { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[markdown stringr]; };
   extRemes = derive2 { name="extRemes"; version="2.0-8"; sha256="0pnpib3g2r9x8hfqhvq23j8m3jh62lp28ipnqir5yadnzv850gfm"; depends=[car distillery Lmoments]; };
   extWeibQuant = derive2 { name="extWeibQuant"; version="1.1"; sha256="08dzw5xfgqx0c7ac632c5mg5jmjjw7wwpcr4c9lvz5rv72ykh2rh"; depends=[]; };
+  extdplyr = derive2 { name="extdplyr"; version="0.1.4"; sha256="0rxwpspn3905f4l27cwgi9rlj379hb6b4kkb0kjq8gzpkg2fznh1"; depends=[dplyr lazyeval tidyr]; };
   exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; };
   extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; };
   extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; };
@@ -5117,7 +5149,7 @@ in with self; {
   faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; };
   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.1"; sha256="0sxsvx6nppys9sgmrxi79f709kfhafckd22nmn4ql7vf7p0z1fs7"; depends=[]; };
+  falconx = derive2 { name="falconx"; version="0.2"; sha256="0648mvbc7ga7vr2xqzyln3dgd11h5s4bqhv3p55mj7smr4qv7hv9"; depends=[]; };
   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=[]; };
@@ -5147,7 +5179,7 @@ in with self; {
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
   fasteraster = derive2 { name="fasteraster"; version="1.0.4"; sha256="0xxfwgzf6xbk4sajchaz7wjppg6cs1vkb00wiwsqmjm2yr48yp0m"; depends=[Rcpp]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
-  fastnet = derive2 { name="fastnet"; version="0.1.1"; sha256="1rqr9cc5xnz3pqjhakp52xk0m8c8dld50vm29blr8s6gw0spp7j8"; depends=[doParallel foreach igraph]; };
+  fastnet = derive2 { name="fastnet"; version="0.1.2"; sha256="124nbvxhrx2nnyzcbr602fpay1zq9fibg1k33f2pkl8pwk87s14q"; depends=[doParallel foreach igraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
   fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; };
   fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.2"; sha256="1xqr4azc5gsr7kcm8qzwjpjy72w1b111i61wbm35vns9r38a6cxz"; depends=[kinship2 multgee]; };
@@ -5205,6 +5237,7 @@ in with self; {
   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]; };
   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=[]; };
@@ -5225,14 +5258,14 @@ in with self; {
   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]; };
-  fitplc = derive2 { name="fitplc"; version="1.1-3"; sha256="1l7s5adzindq24slbygmkyk17jh37hgv1pwa7bphsb997k5qk4fm"; depends=[car nlme]; };
+  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=[]; };
   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.3"; sha256="1kqr8a311d2kh4rgy176813vcai63qkz4x7snynj82jgmqfz2llq"; depends=[BBmisc checkmate]; };
+  flacco = derive2 { name="flacco"; version="1.4"; sha256="1hfh71s1qb0v7ip1v5gibgdpqq4sa3cz22kwszj1pprlfp711vvg"; depends=[BBmisc checkmate mlr]; };
   flam = derive2 { name="flam"; version="3.1"; sha256="12dkxisi56fg5720mh58jqrjvkqllqgzynafd44xalswkk4ahaak"; depends=[MASS Rcpp]; };
-  flan = derive2 { name="flan"; version="0.3"; sha256="1ayba6gifxmvwn5mfh0zqgl1hbp5d9spl1bxc8w8zxvih4khw7w4"; depends=[lbfgsb3 Rcpp]; };
+  flan = derive2 { name="flan"; version="0.4"; sha256="1h1i0gvq29gl0xla77vwd09vj5szrvxw2fmmzg5y2ys9lhjjjifw"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; };
   flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
@@ -5266,7 +5299,9 @@ in with self; {
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   foghorn = derive2 { name="foghorn"; version="0.4.2"; sha256="0wskaky1jb9yqz0ds1hjrvdfdxdsmbfx730257z9xsyip1fwlic4"; depends=[clisymbols crayon curl dplyr httr lazyeval magrittr rvest tibble tidyr xml2]; };
   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=[]; };
+  fontMPlus = derive2 { name="fontMPlus"; version="0.1.1"; sha256="1hvviawbfs3m7mr46y2sjdxkksi10vpbnjic11rjaxqcy9a43f4y"; depends=[extrafont ggplot2 hrbrthemes]; };
   fontcm = derive2 { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0fffi1vxzvq71p0flxybzyb7d15la"; depends=[]; };
   fontquiver = derive2 { name="fontquiver"; version="0.2.1"; sha256="0qv3i9hch7cygl9983s3w68wfh5qvym2jkm52pp06p6mq8a1i1wm"; depends=[fontBitstreamVera fontLiberation]; };
   foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
@@ -5274,7 +5309,7 @@ in with self; {
   forcats = derive2 { name="forcats"; version="0.2.0"; sha256="1mvwkynvvgz2vi8dyz11x7xrp53kadjawjcja34hwk1d89qf7g5m"; depends=[magrittr tibble]; };
   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="7.3"; sha256="02zckbxwb4b83kadk7nd5ybxanswq1ws4z5xzdyiss626pgzljp1"; depends=[colorspace fracdiff ggplot2 nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
+  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]; };
   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]; };
@@ -5287,7 +5322,7 @@ in with self; {
   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]; };
-  formula_tools = derive2 { name="formula.tools"; version="1.5.4"; sha256="1qs7ls757qvh5gdkx32zslgpx1a4zk2vf8bbgjdax02jmlyp2qrp"; depends=[operator_tools]; };
+  formula_tools = derive2 { name="formula.tools"; version="1.6.1"; sha256="14n89fljl5x24fka2jab41hwqmjq3a2yl02n58n1li20wrl3zagj"; depends=[operator_tools]; };
   fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; };
   forward = derive2 { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
   fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; };
@@ -5299,6 +5334,7 @@ in with self; {
   fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
   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]; };
   fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; };
   fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
   fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
@@ -5346,7 +5382,7 @@ in with self; {
   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"; sha256="1h0qzdx6yk10snhx6apriz3al52wqrisffqvanhpznsvk8yg3wvd"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander reshape2 ROCR scales]; };
+  funModeling = derive2 { name="funModeling"; version="1.6.1"; sha256="18lhvp0i7lfbhyg4ry24qk06nfmsqlgb8qr1ag7hwwsxxssjhmxb"; depends=[dplyr ggplot2 gridExtra Hmisc lazyeval pander RColorBrewer reshape2 ROCR scales]; };
   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]; };
@@ -5354,7 +5390,7 @@ in with self; {
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
   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="3.0"; sha256="017qad38q5zpbzpsln0cns7y1wf5q5xm7kll4knqrfa6zwaijl92"; depends=[Jmisc]; };
+  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]; };
   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]; };
@@ -5401,6 +5437,7 @@ in with self; {
   gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-83"; sha256="1kn2095jx1amyzbkvgf7m466zqfv548n232xc555bpsrw9ma5qhk"; depends=[cairoDevice gWidgets RGtk2]; };
   gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; };
   gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; };
+  gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; };
   gains = derive2 { name="gains"; version="1.1"; sha256="1mn8db8yxgkf8z6nm6k76g5l3i3vnw750ksg3w9ysd2pcabb65g1"; depends=[]; };
   galts = derive2 { name="galts"; version="1.3"; sha256="0b18hsdcsx43rn8l4x9nhy9hgggjr5b8kvjnbxrf6r23qsdk43mn"; depends=[DEoptim genalg]; };
   gam = derive2 { name="gam"; version="1.14"; sha256="1z31anm8c4aly7wd9j4zl34pfc0i8cr3p2yjhhf4x3850a1sjlv6"; depends=[foreach]; };
@@ -5446,7 +5483,7 @@ in with self; {
   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.0.1"; sha256="1n6180sfr5m7vms8rk8pwsg7nxyw3pmq05bh72462ygyfykivifm"; depends=[doParallel doRNG earth foreach gbm xgboost]; };
+  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]; };
   gcbd = derive2 { name="gcbd"; version="0.2.6"; sha256="1dvnly0aljv2c4x7sn3q55ncvfdfjfgp7w0k2900p77h4w8nixia"; depends=[DBI lattice Matrix plyr reshape RSQLite]; };
@@ -5459,8 +5496,8 @@ in with self; {
   gdalUtils = derive2 { name="gdalUtils"; version="2.0.1.7"; sha256="0n8c72m7dapy8agqcglagb8bwf0rpajdq9qsli3qyrrp7fh3h4ck"; depends=[foreach R_utils raster rgdal sp]; };
   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.1-9"; sha256="174ngm0xg993gkmf70yaln98d2rpjvdx5ngf2aga1jzph6xxdj6d"; depends=[igraph Matrix raster sp]; };
-  gdm = derive2 { name="gdm"; version="1.3.0"; sha256="185vsf8cvazk3865ds1vxwaaf3y8g7x52r5kp8rxkmnjavw6x24q"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; };
+  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]; };
   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]; };
@@ -5518,7 +5555,7 @@ in with self; {
   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.0"; sha256="0br2vp9lzqmz84scscclcd3d7ysvrdk68fxbc05ywnlsimdp5fxd"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
+  geojson = derive2 { name="geojson"; version="0.1.2"; sha256="0f8zimw50ryi776l5yxx5pi11559sa2278plvx289v3lfb20f7ii"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
   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]; };
@@ -5588,6 +5625,7 @@ in with self; {
   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]; };
+  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]; };
@@ -5599,7 +5637,7 @@ in with self; {
   ggtern = derive2 { name="ggtern"; version="2.2.0"; sha256="0ddcbbgp8ni3zbz4ailqx79i16aa2x4z4gvz55f0b731bilczw86"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
   ggthemes = derive2 { name="ggthemes"; version="3.4.0"; sha256="1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"; depends=[assertthat colorspace ggplot2 scales]; };
   ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
-  ghit = derive2 { name="ghit"; version="0.2.15"; sha256="07f7bz0n2bzs3m3q1hsld15n10nkk7ziwl37lxsf2gh9yv7xvfb3"; depends=[git2r]; };
+  ghit = derive2 { name="ghit"; version="0.2.17"; sha256="16vhfv0j8f07p8dzqh93gws2zpb86h1glh062l8riar0gfpc34ia"; depends=[git2r]; };
   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=[]; };
@@ -5624,7 +5662,7 @@ in with self; {
   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.0"; sha256="0siwy8jx0r0135sm8gyf8g7w05r3zlq6bns5f2s348njk19da9mn"; depends=[ddR Matrix]; };
+  glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; };
   glm_predict = derive2 { name="glm.predict"; version="2.4-0"; sha256="10cpbl25csfs2ng7jj7hcfwl58akbx5dsdv1qlgbnvhf9rmlblww"; depends=[iterpc MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
   glmBfp = derive2 { name="glmBfp"; version="0.0-48"; sha256="1r8mc55v717g4666f07hkc13v9vhj96n7xvn2r3crjndq3w5x3yn"; depends=[coda Rcpp RcppArmadillo rms Runuran statmod survival]; };
@@ -5683,7 +5721,7 @@ in with self; {
   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.4.0"; sha256="00dm7ccfm2sk3qmgffs3dx809ihwfhw49f6fsgnllm19qyxf5hl0"; depends=[devtools formatR httr jsonlite miniUI R6 roxygen2 shiny testthat]; };
+  googleAuthR = derive2 { name="googleAuthR"; version="0.5.0"; sha256="0fk0rijn3529v918chpygvlkigj31dpimdfnkmhsgcznfarkc598"; 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]; };
@@ -5693,7 +5731,7 @@ in with self; {
   googleway = derive2 { name="googleway"; version="1.0.0"; sha256="01gzpb48iffir57cqw9hs2s4rxdllvdjf5hkmrf5zkjxhbzw7w14"; depends=[curl jsonlite Rcpp]; };
   goric = derive2 { name="goric"; version="0.0-95"; sha256="05sbsnjjlpy1z0mfbsrihrp2gp4d66cvprhgzxy76lipgm5mmvqi"; depends=[MASS Matrix mvtnorm nlme quadprog]; };
   govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; };
-  gower = derive2 { name="gower"; version="0.1.1"; sha256="04k1c9h27wknp5bvzxq6gzv3yccmfhs3whnaic1phz4f9vx5g6bz"; depends=[]; };
+  gower = derive2 { name="gower"; version="0.1.2"; sha256="1mbrj1lam3jfbby2j32shmmj5cn09zx3rkxbamq7q8sdg39b54gb"; depends=[]; };
   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=[]; };
@@ -5706,7 +5744,7 @@ in with self; {
   gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; };
   gpuR = derive2 { name="gpuR"; version="1.2.1"; sha256="1k9nxsz4grjl8lyf9108vj94g2gpi6h0pbf5l63y2h5rn0lmpw8s"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; };
   gputools = derive2 { name="gputools"; version="1.1"; sha256="0np1lndvppdi409a1kfbbl0z5hr8wg2q473jch58zd16d2ickwkb"; depends=[]; };
-  gquad = derive2 { name="gquad"; version="2.0-0"; sha256="0d2mg21ix1a08lk43mz0r84q49yhgh7w9jyxa89lmx9ihzl42nhx"; depends=[ape seqinr]; };
+  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=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
@@ -5767,7 +5805,7 @@ in with self; {
   gsl = derive2 { name="gsl"; version="1.9-10.3"; sha256="00isw2iha5af4s7rr8svqka9mkl9l26l8h2rnk4r7fkhh7fc97sg"; depends=[]; };
   gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
   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-6"; sha256="1vkdhji8xpnq9j2ah3vnfvhyjnkgk406grws4q3gj4csbpkkzh86"; depends=[]; };
+  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]; };
   gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
@@ -5815,7 +5853,7 @@ in with self; {
   hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; };
   hashmap = derive2 { name="hashmap"; version="0.1.0"; sha256="1pp62py2n8ajv90fmv4zkga3hshk9cj1qfzagnp8jnfym0jp9rlc"; depends=[BH Rcpp]; };
   hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; };
-  hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.2"; sha256="0rh5kl9ivv9ckv5j5fqwdcflbfzkjicmqrddgxnzbv1iwyph4c0w"; depends=[graph Rgraphviz]; };
+  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]; };
   hawkes = derive2 { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp RcppArmadillo]; };
   hazus = derive2 { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
@@ -5828,7 +5866,6 @@ 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.5"; sha256="1cihc3kn8nvcj0z314b7md02xb108xkrnz1j4svr6hcxwxvv97c5"; depends=[gdata Hmisc raster RCurl rgdal rnrfa sp stringr 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]; };
@@ -5927,6 +5964,7 @@ in with self; {
   hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; };
   hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
   hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; };
+  hrbrthemes = derive2 { name="hrbrthemes"; version="0.1.0"; sha256="1hf4370hj80m6zr20236p9068g6ky0366gfk5l9hnj6l8jpmy9qa"; depends=[extrafont ggplot2 hunspell purrr scales stringi]; };
   hrr = derive2 { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
   hsdar = derive2 { name="hsdar"; version="0.5.1"; sha256="0n5d05f7bh9zsjipfzf07yx71ccqdkarmmm4a1ryah7sjlg0zpil"; depends=[caret raster rgdal rootSolve signal]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
@@ -5957,7 +5995,6 @@ in with self; {
   hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.0.1"; sha256="1j6srqnmdhmg1yg06nqxapdrd9p3yrfs01z0sk43dvjq4dmwmrjr"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate maps purrr RColorBrewer stringr tidyr]; };
   hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; };
   hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; };
-  hwriterPlus = derive2 { name="hwriterPlus"; version="1.0-3"; sha256="1sk95qgpyxwk1cfkkp91qvn1iklad9glrnljdpidj20lnmpwyikx"; depends=[hwriter TeachingDemos]; };
   hwwntest = derive2 { name="hwwntest"; version="1.3"; sha256="1b5wfbiwc542vlmn0l2aka75ss1673z8bcszfrlibg9wwqjxlwk5"; depends=[polynom wavethresh]; };
   hybridEnsemble = derive2 { name="hybridEnsemble"; version="1.0.0"; sha256="08y11cmlhnl456wxsvh3ll1f9ywkmgqjwlwr3v3qhm54nlanwvkr"; depends=[ada AUC e1071 FNN genalg GenSA glmnet kernelFactory NMOF nnet nnls pso quadprog randomForest reportr Rmalschains ROCR rotationForest rpart soma tabuSearch]; };
   hybridHclust = derive2 { name="hybridHclust"; version="1.0-5"; sha256="0w06vna66hlmvx10dl1l0nzbnxkd634gxjz26w015f83vpmfc5vz"; depends=[cluster]; };
@@ -6024,7 +6061,7 @@ in with self; {
   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]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
-  icesAdvice = derive2 { name="icesAdvice"; version="1.2-0"; sha256="0z3b31qj0wggd2yayvgivrpg9435bi8pmsp11rg2vwz4vfsqvlkb"; depends=[]; };
+  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]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
@@ -6106,7 +6143,7 @@ in with self; {
   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]; };
-  inpdfr = derive2 { name="inpdfr"; version="0.1.3"; sha256="1qdnh4bcwhg587y4s1r27vqmx3i4fsg8gvnrl4gx1nk7r2fhsqxc"; depends=[ca cluster entropart metacom R_devices RColorBrewer RGtk2 SnowballC stringi tm wordcloud]; };
+  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=[]; };
   inspectr = derive2 { name="inspectr"; version="1.0.0"; sha256="04rpr5ajpdx1d49y327dryxwxk27yljj4c96i9qglf02i9kmplkg"; depends=[openxlsx]; };
@@ -6121,6 +6158,7 @@ in with self; {
   interactionTest = derive2 { name="interactionTest"; version="1.0"; sha256="1ppc476glwf0bsr1wgzircvnhgn9kkbhy3rskfz671ma6fv3p67b"; 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]; };
   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]; };
@@ -6133,7 +6171,7 @@ in with self; {
   intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; };
   intsvy = derive2 { name="intsvy"; version="1.9"; sha256="080vklwfrnm5gfcympwi1llipkk5a3qh2xw6m91k9p6xyvnl3rrz"; depends=[foreign ggplot2 Hmisc memisc plyr reshape]; };
   intubate = derive2 { name="intubate"; version="1.0.0"; sha256="03ikqwai7wdahdfyzdy42xs8qpdhl9gmbak2qd82yxjl62956i8c"; depends=[]; };
-  inum = derive2 { name="inum"; version="0.9-1"; sha256="11aks7y41298rqdbawg016akam99qxf2f6rwwkkvzp62syp2ip6g"; depends=[]; };
+  inum = derive2 { name="inum"; version="0.9-2"; sha256="0bqk9hh3ps0ria52fh3xfpis9wazh04fj9bbdd3ydj7inwj2lxxs"; depends=[]; };
   invGauss = derive2 { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[optimx survival]; };
   invLT = derive2 { name="invLT"; version="0.2.1"; sha256="0dcr2cclgzkvsw1lysmjrkwgahas96rjc328yc7a1a56pf62kw2v"; depends=[]; };
   investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; };
@@ -6150,9 +6188,9 @@ 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.2"; sha256="1wncz4plz8gziv33yvwkdiw7shpbhs357ag0i9350yn5h9zhhp9b"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; };
+  ipft = derive2 { name="ipft"; version="0.2.8"; sha256="0jyg69bj32j1xgnwrl233s6bi85drhry94midsrjqn3g2ik6xafz"; 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-5"; sha256="193bdx5y4xlb5as5h59lkakrsp9m0xs5faqgrp3c85wfh0bn8iis"; depends=[class MASS nnet prodlim rpart survival]; };
+  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]; };
   ips = derive2 { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
   iptools = derive2 { name="iptools"; version="0.4.0"; sha256="0c3j5sl129xl75p14qr880ll1y3yss3zqg39zbj2jp6wcv9rvafx"; depends=[AsioHeaders BH ISOcodes Rcpp]; };
@@ -6166,7 +6204,7 @@ in with self; {
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
   irtoys = derive2 { name="irtoys"; version="0.2.0"; sha256="1rjw7f8r7kg4yrlkv6cwiiggm6hgx3gqc4jzcmvvmv0ycyi2w3pw"; depends=[ltm sm]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
-  isa2 = derive2 { name="isa2"; version="0.3.4"; sha256="12qbfvcj8whhy7d68l7ra5wnkpx87ldl6mir7r5n8afb3fkww0kp"; depends=[lattice]; };
+  isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; };
   isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
   isdparser = derive2 { name="isdparser"; version="0.2.0"; sha256="061wi94rj3iyvf3dgvcjy0x46hvwhr4ifx0jhirz44bj0c8g3h7j"; depends=[data_table tibble]; };
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
@@ -6231,15 +6269,17 @@ in with self; {
   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.2"; sha256="0k966hzp3qnwck7fgd76w49zrz39s7pqyywws17bhbcd8rh4csyb"; depends=[]; };
+  jsonlite = derive2 { name="jsonlite"; version="1.3"; sha256="0y55znjn69af4d4cy7n8r3nlgblnri7vdhvzpvp4fq4n43faqzsw"; 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=[]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
-  jug = derive2 { name="jug"; version="0.1.4"; sha256="1rf3akm9w5sbp59w1070ygqz1b9krq6lilbxp9r4w234c8k81a27"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
+  jug = derive2 { name="jug"; version="0.1.6"; sha256="19n6fi26yssid1xlixwmvqd6720rvn2jcnw7347izsmlxxyip6hv"; 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]; };
   kSamples = derive2 { name="kSamples"; version="1.2-4"; sha256="1k026wbzcrzzr3ji3gdnhbj13nrmbp6ybbcki3v3gk6s0xk6f2rx"; depends=[SuppDists]; };
+  kableExtra = derive2 { name="kableExtra"; version="0.1.0"; sha256="0sgk2sdjnlip9pl2wd2gn53hwz60wyc0926iy69swnv48vhaa6c6"; depends=[knitr magrittr rmarkdown rvest stringr xml2]; };
   kamila = derive2 { name="kamila"; version="0.1.1.1"; sha256="06jl868i8a6zg3pyaf1r6ccd33ya5f83apc5w6d3m111dzdqqlcy"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; };
   kantorovich = derive2 { name="kantorovich"; version="2.0.0"; sha256="0y965nkhgk0z2q2j3sycfg76aqqi3ry8avg0bz9xggpd60bhh5vd"; depends=[gmp lpSolve rcdd Rglpk]; };
   kappaSize = derive2 { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
@@ -6263,7 +6303,7 @@ in with self; {
   kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; };
   kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; };
   keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; };
-  keypress = derive2 { name="keypress"; version="1.0.0"; sha256="16msbanmbv2kf09qvl8bd9rf1vr7xgcjzjhzngyfyxv90va3k86b"; depends=[]; };
+  keypress = derive2 { name="keypress"; version="1.1.1"; sha256="0w8hcxxx47zyz2cbz2s8va2rfb6s2ziw9ck1slq9kh3aqsx3i9g0"; depends=[]; };
   keyringr = derive2 { name="keyringr"; version="0.4.0"; sha256="04f0z6mqj75l5qhiab0zvjsvz3jz1bp6dfazkpgihjmls5k11dnh"; depends=[stringr]; };
   kfigr = derive2 { name="kfigr"; version="1.2"; sha256="0hmfh4a95883p1a63lnziw8l9f2g0fn0xzxzh36x9qd9nm7ypmkw"; depends=[knitr]; };
   kimisc = derive2 { name="kimisc"; version="0.3"; sha256="1cdjhfdfidilvz0w92xfjwwnp2h73y8l1n7fxnh5jsv6wnx491l4"; depends=[plyr pryr]; };
@@ -6272,6 +6312,9 @@ in with self; {
   kinfit = derive2 { name="kinfit"; version="1.1.14"; sha256="0gb43pghgllb9gzh8jzzpfmc46snv02ln4g3yqsdah3cyqnck0ih"; depends=[]; };
   kinn = derive2 { name="kinn"; version="0.2"; sha256="14vckrk3sppxswccy4qiyc7pbzkwncwag4acbkbqfnm84pxblh3m"; depends=[caret caTools igraph KRLS mclust stringr]; };
   kinship2 = derive2 { name="kinship2"; version="1.6.4"; sha256="19r3y5as83nzk922hi4fkpp86gbqxdg1bgng798g1b073bp6m9yj"; depends=[Matrix quadprog]; };
+  kirby21_base = derive2 { name="kirby21.base"; version="1.5.1.1"; sha256="0gvxvwqwn5bhmwr632gbvh2ikkygqw4vqyn6jbwgnkaxqq127p11"; depends=[git2r]; };
+  kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.5.1"; sha256="1hifxp6ilzgakbdz067lmpz1wrq8ah9a8kv542717z1pn6bmw69w"; depends=[kirby21_base kirby21_t1]; };
+  kirby21_t1 = derive2 { name="kirby21.t1"; version="1.5.1"; sha256="0gs39fy8wxrilgfyz1dlkaar4gf9qifcdxc4vzy2vha0z2ci46sy"; depends=[kirby21_base]; };
   kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
   kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
   kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; };
@@ -6298,7 +6341,7 @@ 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.06-5"; sha256="0anip3m7shp8lj2xd2gks7cbwxfkhp3pz9hn7ijf7b5q5r4gvl15"; depends=[]; };
+  koRpus = derive2 { name="koRpus"; version="0.10-1"; sha256="1f7mspq7iiahpqfj57n63i8b0qs73qgmvpgm1yxi0ax5zjdnspqb"; 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]; };
@@ -6367,7 +6410,7 @@ in with self; {
   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]; };
-  lavaan = derive2 { name="lavaan"; version="0.5-22"; sha256="1z6b4xf9zymyikmi8q4kj0cn6xy8m2p31yc6zah539jk9cxpi304"; depends=[MASS mnormt pbivnorm quadprog]; };
+  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_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]; };
@@ -6398,7 +6441,7 @@ in with self; {
   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]; };
-  leafletCN = derive2 { name="leafletCN"; version="0.2"; sha256="10kkclna64jwfmmn5rw91rb4f0cxqr62027vp1699iqm553dvhhd"; depends=[htmltools jsonlite leaflet magrittr sp]; };
+  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=[]; };
@@ -6412,7 +6455,7 @@ in with self; {
   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.3.0"; sha256="0afgjzcmhnrq30n1mkzx51f0yk369ds5sh47a4z8z56w2w5sb8ik"; depends=[dplyr igraph magrittr Rcpp SnowballC stringr tidyr tm]; };
+  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=[]; };
   lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; };
@@ -6445,15 +6488,16 @@ in with self; {
   linbin = derive2 { name="linbin"; version="0.1.1"; sha256="0i99j7n1hxvnm2605b2xr4mxpib64abr10wp03nxii16nssvv66m"; 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.1"; sha256="1k56x651c84sc60fmz1yf0x5436dnh6v3vxh8yq9hk5qpmkgz8h9"; depends=[leaflet magrittr rowr stringdist]; };
+  lingtypology = derive2 { name="lingtypology"; version="1.0.2"; sha256="1m0szmlraqvqvqcj5nlfkpcwckiagc31qkd834m00w47kggmzlhb"; 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]; };
   linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; };
   linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; };
-  lintools = derive2 { name="lintools"; version="0.1.1.1"; sha256="1rsya48abvr5zijd10bh5g03hjviyack2gh0waawqhv29lhiy9f1"; depends=[]; };
+  lintools = derive2 { name="lintools"; version="0.1.1.3"; sha256="0jxy7wp7jg02d59fb3cdhpmnqzdxrdvs858g3yfamx6fjgb6bd8i"; depends=[]; };
   lintr = derive2 { name="lintr"; version="1.0.0"; sha256="0d03lwr96pdvkdxgjlrzj591dkaxm2rbdk2n3jgr1k428v6jkzy0"; depends=[codetools crayon digest httr igraph jsonlite knitr rex rstudioapi stringdist testthat]; };
   liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; };
+  liquidSVM = derive2 { name="liquidSVM"; version="1.0.1"; sha256="1440zkna0l79q1klfl91gif90q9fp0g05lyrvbbslhvcynwkgj7y"; depends=[]; };
   lira = derive2 { name="lira"; version="1.2.0"; sha256="1n4vjq5v0qj26bq56w5vchwdv10ysc94aizblwm1wl9ss8lpsc0a"; depends=[coda rjags]; };
   liso = derive2 { name="liso"; version="0.2"; sha256="072l7ac1fbkh8baiiwx2psiv1sd7h8ggmgk5xkzml069ihhldj5i"; depends=[Iso MASS]; };
   lisp = derive2 { name="lisp"; version="0.1"; sha256="025sq46277q9i21189cbmx5dnrh5wfshc5k6la1wjilhr1iqf6nj"; depends=[]; };
@@ -6556,6 +6600,7 @@ in with self; {
   lrgs = derive2 { name="lrgs"; version="0.5.1"; sha256="1hzcmrvax03bzrljnqskmnnpsw6amnwcfygnls727369h0dbzc4a"; depends=[mvtnorm]; };
   lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; };
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
+  lsasim = derive2 { name="lsasim"; version="1.0.0"; sha256="05b4ddrqs7kpz8nqgarydh9har9v2k0fx8njwzaj3gnih8jzdn84"; depends=[]; };
   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=[]; };
@@ -6579,7 +6624,7 @@ in with self; {
   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]; };
-  lumendb = derive2 { name="lumendb"; version="0.2.1"; sha256="0cmbiiixvf6c33vxzcn4q48asinlsplmc5xpj5h84xnysa6zs3xv"; depends=[httr xml2]; };
+  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]; };
@@ -6639,7 +6684,7 @@ in with self; {
   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]; };
   maps = derive2 { name="maps"; version="3.1.1"; sha256="0ajdrd4z66jpdjqdgk6vz89x7gh1isidgr8qkg0fq6cmrvjn08lp"; depends=[]; };
-  maptools = derive2 { name="maptools"; version="0.8-41"; sha256="0niz4qssvd8g43z4a85mq5p7cs3s169sgc3p3rzviqqgcc0i6z7n"; depends=[foreign lattice sp]; };
+  maptools = derive2 { name="maptools"; version="0.9-1"; sha256="0ma1diflrkq9wa6qjli6ncjn17b3rqrgjwq984dx5djy9f5bjf3f"; 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]; };
@@ -6679,7 +6724,7 @@ in with self; {
   maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; };
   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-24"; sha256="1l7q83233jbxsly081mnc7lf20nn894hcynq3sm3hjxkvrplzsm9"; depends=[exactRankTests mvtnorm]; };
+  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]; };
   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]; };
@@ -6762,7 +6807,7 @@ 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.4"; sha256="14snpgdl8lwfh3fy63728jpxp6yjchq7i5sqfhzkfmrmy3kwgl22"; depends=[vegan]; };
+  metacom = derive2 { name="metacom"; version="1.4.5"; sha256="1c79sm0b00mm723g3h9llxlk33zk6f9yv6z10jx1la6kk1cgs7a2"; 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]; };
@@ -6777,7 +6822,7 @@ in with self; {
   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="0.1"; sha256="0d57gn802cnpmvyxkczmqafllglzgw17jn4rpj659s16qh0fz4j2"; depends=[corpcor]; };
+  metavcov = derive2 { name="metavcov"; version="1.0"; sha256="183xrrdz8agwcxgn8i4jg28f8gqskim9wcz193524fjhcm4bklxr"; 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]; };
@@ -6786,7 +6831,7 @@ in with self; {
   meteoland = derive2 { name="meteoland"; version="0.5.2"; sha256="17sfi14q5cp74cmlvhbyg6xlpiw9ssqc4kp48r41allk38dfk1zd"; 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"; sha256="078g04bj3ipwz3cw5wkz0gvj1dmd5vxygkwpz4pymg0r9svy2yf2"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
+  mets = derive2 { name="mets"; version="1.2.1"; sha256="0wmycy87v0hry7vzyz3vjpjq8cx7nraigihwch04nfhpg6x4zal8"; 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]; };
@@ -6850,17 +6895,17 @@ in with self; {
   minval = derive2 { name="minval"; version="0.5"; sha256="1pbcfcaysaicppkzvnllvvx2jykc17nk3331n0rl41x56jxcjsgd"; depends=[gdata XML]; };
   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.22"; sha256="0jzxmj2a0kq0xylsxrkd6j9rzvy3y0qkl823pb84mc3zv2jwnjrx"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
-  mirtCAT = derive2 { name="mirtCAT"; version="1.3"; sha256="00zmli79ll313qjjl0j28ibxdjn41zfgwx43cg9mzzm6ayiz26ci"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
+  mirt = derive2 { name="mirt"; version="1.23"; sha256="13dx1ir09lmvapjv6igya71w5yp6r41yzpcdnbdk5jqyyqidnian"; depends=[GPArotation lattice mgcv numDeriv Rcpp RcppArmadillo sfsmisc]; };
+  mirtCAT = derive2 { name="mirtCAT"; version="1.4"; sha256="1gfpbx0zay8bkr116fnvcwxgrm6vpcvf25k3advnaj54ad8vw4b4"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-3"; sha256="1djmsffwkicj25ndg07dnid6qj66b1rdw0yrv79jakjfbv71c13i"; depends=[BayesBridge BRugs MASS MCMCpack mvtnorm R2jags Rcpp RcppArmadillo]; };
   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]; };
-  miscset = derive2 { name="miscset"; version="1.0.0"; sha256="0m6gv2w8fj1604wrmcdgz6dpmpkz7j3sppda11klsx0hv1xqr2af"; depends=[ggplot2 gridExtra Rcpp xtable]; };
+  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.0"; sha256="1nys59bik6cnrpdh1azp2y9k201y326hbf5jzv2kilh34p57ilfs"; depends=[mvtnorm numDeriv VGAM]; };
+  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]; };
@@ -6870,8 +6915,9 @@ in with self; {
   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]; };
-  mixOmics = derive2 { name="mixOmics"; version="6.1.1"; sha256="0wdl5g0455whlf331j77c0d9vk6qyb03basy5b7svz3zrg15q2qa"; depends=[corpcor dplyr ellipse ggplot2 igraph lattice MASS plyr RColorBrewer reshape2 rgl tidyr]; };
+  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]; };
   mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; };
   mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
   mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
@@ -6965,7 +7011,7 @@ in with self; {
   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="0.9.1"; sha256="1hy36bh9klhdj2yxr3b2rl101lsgfgw61l5zn08brvvh04zvfv31"; depends=[jsonlite openssl]; };
+  mongolite = derive2 { name="mongolite"; version="1.0"; sha256="02m9909wkwbyc0w1jhvlib7jmwslq16n49a22bq9pdriaq4rmb8m"; 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=[]; };
@@ -7019,7 +7065,7 @@ in with self; {
   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.1.0"; sha256="0krfass51686ki4wv8nj3kipgsv1v3rs5n6wcdyyqyd1ni8j7mr2"; depends=[ape htmlwidgets]; };
+  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]; };
   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]; };
@@ -7030,7 +7076,7 @@ in with self; {
   msgl = derive2 { name="msgl"; version="2.3.5"; sha256="0lihvgh86r3swfma6msjbsmfc14b1p1h16v6pkd53v5q3dp4asld"; 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.4"; sha256="1m0a6f2q23jm4nl6sp1ympqkiv478q8hgdn5wjfg6gx0nij29jmk"; depends=[devtools digest hunspell poio tibble]; };
+  msgtools = derive2 { name="msgtools"; version="0.2.7"; sha256="1lk4r9gdhlfarl5z6a48aih682q7dvwa6lf31119lljpa5gmi92y"; depends=[devtools digest hunspell poio tibble]; };
   msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.4"; sha256="0h0h9cgavpylbj9692750if1hw7qylhsad549fqjx5l0zqbh3zhy"; depends=[expm mvtnorm survival]; };
@@ -7046,6 +7092,7 @@ in with self; {
   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]; };
   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]; };
@@ -7094,7 +7141,7 @@ in with self; {
   mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; };
   mutoss = derive2 { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[multcomp multtest mvtnorm plotrix]; };
   mutossGUI = derive2 { name="mutossGUI"; version="0.1-10"; sha256="16fgmpnym9nhiywqimjgv10swrvs3whp0nlzsw573vv0k6qjmwd2"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; };
-  mvLSW = derive2 { name="mvLSW"; version="1.0"; sha256="0sbiq7ynilbnwggfl4n9s43cvzgavxq9vi4q09cz3v8wf8xjj3kf"; depends=[fields wavethresh]; };
+  mvLSW = derive2 { name="mvLSW"; version="1.1"; sha256="0nh3myycz8kagk1sks71i20602r82mh6nxczjnlnal5qwgp6zg80"; depends=[fields wavethresh xts zoo]; };
   mvMORPH = derive2 { name="mvMORPH"; version="1.0.8"; sha256="1psjlqx7xb5zlrwcd2q2by8y8ykffxdcskbzb12f643iimlp1l4m"; depends=[ape corpcor phytools spam subplex]; };
   mvPot = derive2 { name="mvPot"; version="0.1.2"; sha256="0ni953ncm8h4ap0gjimlxjypgjaj2crlx4vscqi7a158hphahj2g"; depends=[evd gmp MASS numbers]; };
   mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
@@ -7107,7 +7154,7 @@ in with self; {
   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]; };
   mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
-  mvdalab = derive2 { name="mvdalab"; version="1.1"; sha256="18lwhplwp87dcvxzvyah3g98b5jrs91ifwk2hwn5a1gs733va989"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
+  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]; };
   mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; };
   mvmesh = derive2 { name="mvmesh"; version="1.4"; sha256="14yk09s1ym4p9nijxqasd3060hncmr1br7lv9rk9vm96bgi6l1rc"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
@@ -7126,7 +7173,7 @@ in with self; {
   mvst = derive2 { name="mvst"; version="1.0.1"; sha256="0sv8pd1524pr3xpxplq468dxfd0wipdr41awqwvcljpw5wgl34qa"; depends=[MCMCpack mnormt mvtnorm]; };
   mvtboost = derive2 { name="mvtboost"; version="0.5.0"; sha256="06zgx1c2470bh3x6s2awzkxbyij6bvzv23xbvamg77v5pz5bjj6h"; depends=[gbm RColorBrewer]; };
   mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; };
-  mvtnorm = derive2 { name="mvtnorm"; version="1.0-5"; sha256="1pc1mi2h063gh4a40009xk5j6pf5bm4274i5kycln38dixsry3yh"; depends=[]; };
+  mvtnorm = derive2 { name="mvtnorm"; version="1.0-6"; sha256="0i74s9dl4jf1gln6agra8h38qn9ifd5v0gi13caj1da5nrbmn0aa"; depends=[]; };
   mvtsplot = derive2 { name="mvtsplot"; version="1.0-1"; sha256="0g5grrha77rsnkfasw5pxnpmkl7vgb728ms8apyg8xnbmgilg9vv"; depends=[RColorBrewer]; };
   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]; };
@@ -7147,7 +7194,7 @@ in with self; {
   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]; };
-  naptime = derive2 { name="naptime"; version="1.2.2"; sha256="0jzzs7iphcan6vf1bc3h82gpplnlkw9vhg6366izr2b7vycxafi5"; depends=[anytime lubridate]; };
+  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]; };
   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=[]; };
@@ -7178,6 +7225,7 @@ in with self; {
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
   negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; };
+  neighbr = derive2 { name="neighbr"; version="1.0"; sha256="0612nzpryj4xp0ncpvpn56x5n9ammzjp3ysq1rj1fc84h0p7nml3"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-10"; sha256="1snavf90yb12sydic7br749njbnfr0k7kk20fy677mg648sf73di"; depends=[optimbase optimsimplex]; };
   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=[]; };
@@ -7232,7 +7280,7 @@ in with self; {
   nlsem = derive2 { name="nlsem"; version="0.7"; sha256="1g5vnqmqq4swnid3601f1cm0q9w9k802394jd3yac95n8sm05i5g"; depends=[gaussquad lavaan mvtnorm nlme orthopolynom]; };
   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.12"; sha256="1fzyfqi6nfzxg0vjlqcvrf6p7qjgvg9qvf4icy13vqs1k70y5v4x"; depends=[digest]; };
+  nlsr = derive2 { name="nlsr"; version="2017.2.19"; sha256="0y1qfg042yk855v6i45w00mbmwic1ravlkrd0fbnr8zrvq74iy1s"; depends=[digest]; };
   nlstimedist = derive2 { name="nlstimedist"; version="1.0.4"; sha256="10wbkngcx02cjyv188ascrw7aaqg8vvwbr7rgy6q87ch5g7ih35g"; depends=[broom dplyr ggplot2 lazyeval minpack_lm nlstools]; };
   nlstools = derive2 { name="nlstools"; version="1.0-2"; sha256="0mjn1j9fqqgr3qgdr0ki4lfbd0yrkanvya4y2483q3wklqa6qvjc"; depends=[]; };
   nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
@@ -7244,7 +7292,7 @@ in with self; {
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
-  nodiv = derive2 { name="nodiv"; version="1.1.4"; sha256="0m12pw4l7lmqn796ac6yn3f9h5h59cv84swb8fk559aw258kpr4s"; depends=[ape picante raster sp vegan]; };
+  nodiv = derive2 { name="nodiv"; version="1.1.6"; sha256="1srcmv4mmmsmkk4nbbnmrkv4z19l80agvwlh2q1j7xdi26wpqc5r"; depends=[ape picante raster sp vegan]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
   nomclust = derive2 { name="nomclust"; version="1.00.1011"; sha256="1mzz1bc8gg9lw5aacmicfzjak212hrbq2wchblljcxxjvkkn87w5"; depends=[cluster dummies]; };
@@ -7273,7 +7321,6 @@ in with self; {
   nortestARMA = derive2 { name="nortestARMA"; version="1.0"; sha256="170dqxaln51snqzqjwagd16f2x4aarqg3xsim0gbvfqlv43sksb7"; depends=[astsa]; };
   nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; };
   not = derive2 { name="not"; version="1.0"; sha256="1hwrka8a5jygm3zjh5jhzjx2bvdqip7pb5009vkk7k0sp8m760kq"; depends=[]; };
-  notifier = derive2 { name="notifier"; version="1.0.0"; sha256="1yi99ja8xdg771fn0brz5qz5p9kcbspwjx272lvjvw26lw7gaw3f"; depends=[]; };
   notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
   notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; };
   novelist = derive2 { name="novelist"; version="1.0"; sha256="0wzx0vkqvl9sfhbbrzylsxhm3qmjj5w8sy5w6gvd104fn84d49yk"; depends=[]; };
@@ -7341,7 +7388,6 @@ in with self; {
   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]; };
-  ocean = derive2 { name="ocean"; version="0.2-4"; sha256="1554iixfbw3k6w9xh3hgbiygszqvj5ci431cfmnx48jm27h2alqg"; depends=[ncdf4 proj4]; };
   oceanmap = derive2 { name="oceanmap"; version="0.0.2"; sha256="0pbwja7m0ng2j2147sgc07v3q80xmj3bwidvqksigklka4zx822q"; 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]; };
@@ -7354,6 +7400,7 @@ in with self; {
   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]; };
   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=[]; };
@@ -7384,7 +7431,7 @@ in with self; {
   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]; };
   opera = derive2 { name="opera"; version="1.0"; sha256="0p2wg3srg088l420ykrq0wqvzh1mp6l753rdw35f7kdmaj08mqfq"; depends=[quadprog quantreg RColorBrewer]; };
-  operator_tools = derive2 { name="operator.tools"; version="1.4.4"; sha256="1ridxi3pbylb4flfgn371n1v9796rnd1ndxhh6ijyzpysqqmwi08"; depends=[]; };
+  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]; };
@@ -7396,7 +7443,7 @@ in with self; {
   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.1"; sha256="0jr1gi31la8lnz1s7xyk4bc650kf374v2bha638fzg2cx2zqkiif"; depends=[alabama cccp GENLIB kinship2 MASS Matrix nadiv nloptr pedigree pspline Rcsdp stringr]; };
+  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]; };
   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]; };
@@ -7455,7 +7502,7 @@ in with self; {
   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=[]; };
-  overlap = derive2 { name="overlap"; version="0.2.6"; sha256="066zf4i6anklqqmxf06lyfr9w4scw0djqgp8rabgpzwkvk9xgxmb"; depends=[]; };
+  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]; };
   oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; };
@@ -7493,7 +7540,7 @@ in with self; {
   pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
   pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
   pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; };
-  pairwise = derive2 { name="pairwise"; version="0.3.1"; sha256="1p6cclq9dm8zqs6m1r1mlq80cgasrmrv5sjnqj6yw5wwn4rxry6w"; depends=[]; };
+  pairwise = derive2 { name="pairwise"; version="0.4.1"; sha256="06g6ma8wfn3zxyxhbj3bi851aflddsdisw4rwvg0w6l3w2q9mvnf"; depends=[]; };
   pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-25"; sha256="0wpv22db63xkgjw0nwa39clgrr2finxvl0a510hkc54ijqjx9ksh"; depends=[binMto boot coin MASS MCPAN mcprofile mratios]; };
   palaeoSig = derive2 { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[MASS mgcv rioja TeachingDemos vegan]; };
   paleoMAS = derive2 { name="paleoMAS"; version="2.0-1"; sha256="1hhb5wbj4m3ch8wnvd1zkl5bk6wa9nl6jl1dhm4z6yqkh29yn9z6"; depends=[lattice MASS vegan]; };
@@ -7536,7 +7583,7 @@ in with self; {
   parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; };
   parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
   parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; };
-  parsedate = derive2 { name="parsedate"; version="1.1.1"; sha256="0mr97rw4fzg2v9dh5d4x0b76d5s56gi6zilq69yjhbx78w46apzc"; depends=[]; };
+  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]; };
@@ -7546,7 +7593,7 @@ in with self; {
   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]; };
   partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-  party = derive2 { name="party"; version="1.2-1"; sha256="1vi0hisph0xscj80ch8gcdp9vrh2k8z5msd2j9p5mvr0f5i5hr7d"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; };
+  party = derive2 { name="party"; version="1.2-2"; sha256="0rmvscgmbligg23djyph54cz5r8xkmmrn04vd3r7pwy1qarah9fi"; 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]; };
@@ -7566,7 +7613,7 @@ in with self; {
   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]; };
   pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; };
-  pbapply = derive2 { name="pbapply"; version="1.3-1"; sha256="053i92j0ch3msywapdia08mmk1w8bhcs6x7cl0han2r9sfliwkzw"; depends=[]; };
+  pbapply = derive2 { name="pbapply"; version="1.3-2"; sha256="1sdmjlnwxb99f95g5v8k8mirrkzw99yig377v0qi9lzwjgd6fqqr"; depends=[]; };
   pbatR = derive2 { name="pbatR"; version="2.2-9"; sha256="1p8rj0lzm4pp1svgy7xia2sclkngzfjbgbikq94s6v92d582wncw"; depends=[rootSolve survival]; };
   pbdBASE = derive2 { name="pbdBASE"; version="0.4-5"; sha256="0i7rav197787snhw2l5pyb2x0i9d1gl9d7lks2bk0dcxr0ndy9gm"; depends=[pbdMPI pbdSLAP]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
@@ -7723,9 +7770,9 @@ in with self; {
   pid = derive2 { name="pid"; version="0.36"; sha256="1w6h09ddq8rv7k5xl4v6nhlkm0vnmim57mg0dzk2dv9dc4v8i141"; depends=[DoE_base FrF2 ggplot2 png]; };
   piecewiseSEM = derive2 { name="piecewiseSEM"; version="1.2.1"; sha256="0c705ngyj2pf24vvqdld5rnf875pw64gs64l9f7nylbfrax39kbv"; depends=[lavaan lme4 nlme pbkrtest]; };
   pim = derive2 { name="pim"; version="2.0.0.2"; sha256="1fjnll2lfgdfak9427rh343y80awjzwpy46v33kpd6niz41zmra8"; depends=[BB nleqslv]; };
-  pinbasic = derive2 { name="pinbasic"; version="1.0.1"; sha256="16sja6f8ivixrqj83xjgfxrvql6rzhkr0kd9li9spzhs20r4yshl"; depends=[doParallel fastcluster foreach ggplot2 iterators lubridate reshape2 scales]; };
+  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.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; 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]; };
   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=[]; };
@@ -7748,7 +7795,7 @@ in with self; {
   placement = derive2 { name="placement"; version="0.1.1"; sha256="1narjb90sb5prvzfv2x30bz8y9aq8hqggza91ghwi47m99vm1dg6"; depends=[base64enc digest jsonlite RCurl stringi urltools]; };
   plan = derive2 { name="plan"; version="0.4-2"; sha256="0vwiv8gcjdbnsxd8zqf0j1yh6gvbzm0b5kr7m47ha9z64d7wxch6"; depends=[]; };
   planar = derive2 { name="planar"; version="1.6"; sha256="0x5xdb2afpc1w8s217hy765mz938kg5b5j7vzqzhlsh2dzdjccpj"; depends=[cubature dielectric ggplot2 plyr Rcpp RcppArmadillo reshape2 statmod]; };
-  planor = derive2 { name="planor"; version="1.0-1"; sha256="1wi1s41wwk4zi5sqzm5flaphrpffqv8bhsgzdpknmnhp1nn0hllv"; depends=[conf_design]; };
+  planor = derive2 { name="planor"; version="1.3-6"; sha256="0anli2nrsfq9wzk4vgn7lfr6mi01d70ffb631fxrgh45p36im7dw"; depends=[bit64 conf_design Rcpp RcppArmadillo]; };
   plantecophys = derive2 { name="plantecophys"; version="1.1-8"; sha256="02425j4pgwqadg2zn7vyl4741panif236m89zm36p580chp23wir"; depends=[]; };
   plaqr = derive2 { name="plaqr"; version="1.1"; sha256="0hkzfxph2lacrd4npqvf4pyaldr1z56hlfbj3gi7qjlflxqnv3xp"; depends=[quantreg]; };
   plater = derive2 { name="plater"; version="1.0.0"; sha256="0nbkfqrz78zgf06lsfzmwj50lfbq3dvi01j4rlbb6dwamx2cn3sf"; depends=[dplyr]; };
@@ -7790,7 +7837,8 @@ in with self; {
   plsgenomics = derive2 { name="plsgenomics"; version="1.3-1"; sha256="0vddhzqfix8q692mdls227m2l6zjzbjwp1ia5j9shy71ycg2fzn9"; depends=[boot MASS]; };
   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-0"; sha256="1qq0f95ndpiykbizyivjcbjbbmqqns08i1dkjn3n7k2r9130z8rx"; depends=[lhs MASS]; };
+  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]; };
   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]; };
@@ -7803,8 +7851,8 @@ in with self; {
   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=[]; };
-  pmml = derive2 { name="pmml"; version="1.5.1"; sha256="1w53lkzsgi8d3h89zpr4la3r52mhqxr6a7hazhsmvwhjfkz874ki"; depends=[survival XML]; };
-  pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.0"; sha256="17dhgpldwadsvm25p8xwqsamcn1ypsqdijy2jia048qqmsy4ky86"; depends=[]; };
+  pmml = derive2 { name="pmml"; version="1.5.2"; sha256="0yp9xhgsdfbkxl5xxzw6n5v9zbpn5819lynj1glzi32bfzjfiwk3"; depends=[stringr XML]; };
+  pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.1"; sha256="1cxmp3fgsf3z71v6qpd9l9ilgda5knan7vqifxpgm8m7a30sp3f3"; depends=[]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
@@ -7825,14 +7873,14 @@ in with self; {
   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]; };
   pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; };
-  polmineR = derive2 { name="polmineR"; version="0.7.0"; sha256="13ncdqn1wh5rcad79l0d388qnyi3171djfbz3qjkzw05n3q8rk57"; depends=[data_table DT foreach Matrix R6 slam tm]; };
+  polmineR = derive2 { name="polmineR"; version="0.7.1"; sha256="189zfqcw9w1i1z14l2rgkzqali0arkiq7k770xhzdrahw1whcsc7"; 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]; };
-  polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-0"; sha256="0yb119y0a2xjsijxbrxgksnhf3m997dgp9d57wghq68dsfjp3hf3"; depends=[lhs MASS]; };
+  polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; };
   polyclip = derive2 { name="polyclip"; version="1.5-6"; sha256="1ypwvgd5z61md539z7ndmpl8vaifsjbm231n08zsxskskj1fid7y"; 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]; };
@@ -7840,7 +7888,7 @@ in with self; {
   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.10"; sha256="1v4mkgn0vn83kgl2la94gnc5g1xxkk1h5gxvjyzkqgkakaigwmsx"; depends=[coda deSolve digest mvtnorm nloptr subplex]; };
+  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=[]; };
   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]; };
@@ -7851,7 +7899,7 @@ in with self; {
   popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; };
   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.16"; sha256="0yp1hfda2k6c5x0gbcfxj9h6igzx3ra05xs7g88wjz76yxp3wb6w"; depends=[DBI dplyr igraph lazyeval RSQLite]; };
+  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]; };
   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]; };
@@ -7894,10 +7942,11 @@ in with self; {
   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]; };
   predatory = derive2 { name="predatory"; version="1.1"; sha256="18nv8riw380acvgb8iz771wzdgrmkrwcvdxbxhkbczcdhgw1p0ig"; depends=[readr stringr]; };
-  prediction = derive2 { name="prediction"; version="0.1.1"; sha256="0ys0pds2x8nhkf45dp5f0pmp64al670w7xgr5hbifmykn2ivdiqr"; depends=[]; };
+  prediction = derive2 { name="prediction"; version="0.1.10"; sha256="1za32spd6qg63mi5dvkw54k24f5s4a10p2rkfgzjzqxjb9rd265h"; 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=[]; };
+  prefeR = derive2 { name="prefeR"; version="0.1.1"; sha256="1wgbwbmghsnc2cargwndda0xhcdswvzd0nkjq5g895kl8zcwgpyf"; depends=[entropy mcmc]; };
   prefmod = derive2 { name="prefmod"; version="0.8-33"; sha256="0wklp3djy3z8lq0vrjrzqha6r8z00jwdm6d9ffyq5vhimmbirzj8"; depends=[colorspace gnm]; };
   prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; };
   preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; };
@@ -7936,7 +7985,7 @@ in with self; {
   prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; };
   profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
   profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
-  profileR = derive2 { name="profileR"; version="0.3-3"; sha256="0yc0bgcv8g4qm777l8czvwcw4gsrsgc1f2qgllyid6wsnvw25x6v"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
+  profileR = derive2 { name="profileR"; version="0.3-4"; sha256="1vinqddhd4jbncn37rbypja7ili3kwmj2sacgf491s94zil4ijik"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
   profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; };
   profmem = derive2 { name="profmem"; version="0.4.0"; sha256="1nnk145hzr447z9frk3c58xks3jp0cdl7cv8schqnyjxqlv967g9"; depends=[]; };
   profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
@@ -7982,7 +8031,7 @@ in with self; {
   psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; };
   pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
   pspline = derive2 { name="pspline"; version="1.0-17"; sha256="1n3mhj6q7a1v2k8xkbwji27dihcy3845wp50sx14hy4nbay5kf1r"; depends=[]; };
-  pssm = derive2 { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[abind MASS MHadaptive numDeriv]; };
+  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]; };
@@ -8025,7 +8074,7 @@ in with self; {
   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-0"; sha256="0fc6c3pzlm79nqs9qkngs8m0y8y9syhgilfsav9bbi6ylfhlmdh0"; depends=[]; };
+  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]; };
   qcc = derive2 { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
   qclust = derive2 { name="qclust"; version="1.0"; sha256="0cxkk4lybpawyqmy5j6kkpgm0zy0gyn3brc1mf9jv8gmkl941cp3"; depends=[mclust mvtnorm]; };
@@ -8039,7 +8088,7 @@ in with self; {
   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]; };
   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.3"; sha256="1mqlj8350i7llp76qhpzzisd6vryrnx9wmdazj7xbdg5666qdz45"; depends=[ggplot2 ggrepel lattice latticeExtra scales]; };
+  qicharts = derive2 { name="qicharts"; version="0.5.4"; sha256="0lq9faksp18mgb6pa7qhbm9frd6f4675623d797snvnm67aiy8fa"; depends=[ggplot2 lattice latticeExtra scales]; };
   qiimer = derive2 { name="qiimer"; version="0.9.4"; sha256="0argspi9pin2gjsg0qkl28hj3bw8svfab1cy410zlq76qdnmg7df"; depends=[pheatmap]; };
   qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; };
   qlcData = derive2 { name="qlcData"; version="0.1.0"; sha256="00xfr7dywvadyhs2z32za06fzdzmm20sn31grin0b3xw5qndai0f"; depends=[stringi yaml]; };
@@ -8158,7 +8207,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.2"; sha256="1dklyda8xagg643c67ii9hx2lvwkc9xaxlkvigs9dv1bkzbrw9gs"; depends=[fields GEOmap MBA RCurl rvest scrapeR stringr XML xml2]; };
+  rNOMADS = derive2 { name="rNOMADS"; version="2.3.3"; sha256="186pcxdfkp24aff3qldkhbcxydifg092w3jadahfrd30d6gyfvp8"; 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]; };
@@ -8201,14 +8250,14 @@ in with self; {
   ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; };
   randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; };
   randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
-  randgeo = derive2 { name="randgeo"; version="0.1.0"; sha256="1jjblzqm45yxz5pvkg2mhv891vxlw0c3ii8y6gah680g09xgwjxx"; depends=[]; };
+  randgeo = derive2 { name="randgeo"; version="0.2.0"; sha256="056c522zw2x4ab7z2bpkw9byfn1gzsfavbjaxdgwi4n934f46h14"; depends=[]; };
   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=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
-  randomLCA = derive2 { name="randomLCA"; version="1.0-10"; sha256="1h1fxymdiycxn90lipzb190xakf7hlbn6nwxsbfwcz8278xkcn4g"; depends=[boot fastGHQuad lattice Matrix]; };
+  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]; };
@@ -8264,6 +8313,7 @@ in with self; {
   rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; };
   rcbalance = derive2 { name="rcbalance"; version="1.8.3"; sha256="0bksyjbxdllgaqkhpz29isslqkpp3y4xl3wqhpjy881lhlw40y1j"; depends=[MASS plyr]; };
   rcbsubset = derive2 { name="rcbsubset"; version="1.1.2"; sha256="0izvxbkjmhyp8jz4mlwa5grdgcd8q9pdc3jwrccby0xz0f5gw2x0"; depends=[MASS plyr]; };
+  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=[]; };
@@ -8272,7 +8322,7 @@ in with self; {
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
-  rclimateca = derive2 { name="rclimateca"; version="0.1"; sha256="0pnmazi33lvmccb1x2rkac0cwp8rf1p0659dfx9718vkdlgkvlgz"; depends=[digest httr lubridate prettymapr reshape2]; };
+  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]; };
@@ -8322,7 +8372,7 @@ in with self; {
   rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
   rebus_numbers = derive2 { name="rebus.numbers"; version="0.0-1"; sha256="0drgszz0824j49c6jk9ry0cfjky7g843ldlxrx3g2vjp0v7hznj3"; depends=[rebus_base]; };
   rebus_unicode = derive2 { name="rebus.unicode"; version="0.0-2"; sha256="185313wh4zpp6addfdr78pjhxzazlfwgsddwk02zrzblf4iwzjdm"; depends=[rebus_base]; };
-  recexcavAAR = derive2 { name="recexcavAAR"; version="0.2.2"; sha256="050klwldr8jzn0dwwh7yb0yzjckbdc4z7phd0rp8y8d5ah0n8bn2"; depends=[kriging Rcpp]; };
+  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]; };
@@ -8332,7 +8382,7 @@ in with self; {
   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="0.2.0"; sha256="0vpwx8lv0jhddcw2cypdhvchgrrkxx8l70yhsp5415mgdkmpp5x2"; depends=[BAT dismo geosphere igraph maptools raster rgdal rgeos rJava sp]; };
+  red = derive2 { name="red"; version="1.0.0"; sha256="07m48znd0dm2fd4jagjrn2fqx2wr1hzvx2rljlkpl0hkkljcz8lj"; depends=[BAT dismo geosphere igraph jsonlite maptools raster rgdal rgeos rJava 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]; };
@@ -8356,7 +8406,7 @@ in with self; {
   regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; };
   regress = derive2 { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
   regsel = derive2 { name="regsel"; version="0.2"; sha256="0wwwpawqsqimaldy0zxnqsy23nwp30ypa5dnrnndwhbs4qz99c9w"; depends=[elasticnet glmnet]; };
-  regsem = derive2 { name="regsem"; version="0.5.0"; sha256="0ajva492a0z0q1ixdh24w10vbq7fknn66cyjzla5aqcmc5gggp7g"; depends=[lavaan Rcpp RcppArmadillo]; };
+  regsem = derive2 { name="regsem"; version="0.7.0"; sha256="1niwal7dn99kkjm1dj03jfa3lkj747ihy29ay7jcwzin7nnkw9c5"; depends=[lavaan Rcpp RcppArmadillo]; };
   regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; };
   regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
   regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
@@ -8473,6 +8523,7 @@ in with self; {
   ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
   riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
   rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; };
+  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]; };
@@ -8516,7 +8567,7 @@ in with self; {
   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]; };
   rmatio = derive2 { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[lattice Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.2.2"; sha256="1fx50z8pb5z1i1gzs4v194k9fdiq40ny5ridxym9ykgqf82ncvsa"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.2.3"; sha256="14brfil6s9hi0rnw13g8d9xvgnyblqbwvs3iwwwb38lzl8az5rqs"; 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]; };
@@ -8527,6 +8578,7 @@ in with self; {
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
   rmngb = derive2 { name="rmngb"; version="0.6-1"; sha256="1wyq8jvzqpy1s6w0j77ngh5x2q7mpj0ib01m8mla20w6yr6xbqjk"; depends=[Hmisc]; };
   rmp = derive2 { name="rmp"; version="2.0"; sha256="1cs5ylh5z9mfj3r0yvxxd38ksna2dxk9nnfgqkry1kxibnd1b4ff"; depends=[]; };
+  rmpw = derive2 { name="rmpw"; version="0.0.1"; sha256="0h5h77hh6v6nfhivmrs5dyks9krwqyh32kmp0mlwialrpshs0hp3"; depends=[]; };
   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=[]; };
@@ -8561,6 +8613,7 @@ in with self; {
   robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; };
   robustHD = derive2 { name="robustHD"; version="0.5.1"; sha256="14v6l0appy206zx1jcv7m14r2z9g12dpkm6zxzv756rca2yj8fp5"; depends=[ggplot2 MASS perry Rcpp RcppArmadillo robustbase]; };
   robustX = derive2 { name="robustX"; version="1.2-2"; sha256="0pgfq78qd8s40ciqval01bwajy6zfdjms1lbh0b5g0rww6920s6f"; depends=[robustbase]; };
+  robustarima = derive2 { name="robustarima"; version="0.2.5"; sha256="0mqlp4xmma74rgwb6rihbzs5nillcnddl6smlxmm8lq1wba27jdj"; depends=[splusTimeDate splusTimeSeries]; };
   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]; };
@@ -8591,7 +8644,7 @@ in with self; {
   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.0"; sha256="09rlkzajgs7sqdj5lwb0bs0vx6676qwqcwx1wawvg40npfw40l0h"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; };
+  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]; };
   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]; };
@@ -8610,10 +8663,10 @@ in with self; {
   rpdo = derive2 { name="rpdo"; version="0.2.1"; sha256="0n2lpnphnb5h7y9jszq4m15wymwgv7v2pw5fwbflr0ihvx3i3iac"; 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=[]; };
   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]; };
-  rplexos = derive2 { name="rplexos"; version="1.1.11"; sha256="0i0yiiy84d6qgx70ib0rf0hr0jb6naw6d6w8lvsl104c3m23sf4q"; depends=[data_table DBI doParallel dplyr foreach lubridate Rcpp RSQLite stringi tidyr]; };
   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]; };
@@ -8667,7 +8720,7 @@ in with self; {
   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]; };
   rspa = derive2 { name="rspa"; version="0.1.8"; sha256="1zgk1v1yk9c51wbsl3skqfrznqj84146dzfwg7q3jy2hpdgf1cg6"; depends=[editrules]; };
-  rsparkling = derive2 { name="rsparkling"; version="0.1.0"; sha256="15yz4z96hbl18l2n3vz7mcamwvh7zkqbhlhdmyi002bsc1jd97s9"; depends=[h2o sparklyr]; };
+  rsparkling = derive2 { name="rsparkling"; version="0.1.1"; sha256="1mjlm4gv0551nz0n6qd0596jpn6yc5a4pdqn7h5087gg9cpay0sv"; depends=[h2o sparklyr]; };
   rsq = derive2 { name="rsq"; version="0.6"; sha256="0qc5mkz7b68al3iahsbv45imkzabbsykd95w1yd7gfcrw0qk592m"; depends=[]; };
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
@@ -8777,7 +8830,7 @@ in with self; {
   samplingVarEst = derive2 { name="samplingVarEst"; version="1.0-2"; sha256="182y1srz2cs6rn8kh6nns5v29q0ww2jmv0yfp8b110qq23wd5mnd"; depends=[]; };
   samplingbook = derive2 { name="samplingbook"; version="1.2.1"; sha256="0xjsmsqj3ik2ffih8f2cpq6m5rpk603y697mh5m42frg20cqa87w"; depends=[pps sampling survey]; };
   samr = derive2 { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[impute matrixStats]; };
-  sand = derive2 { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
+  sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; };
   sandwich = derive2 { name="sandwich"; version="2.3-4"; sha256="0kbdfkqc8h3jpnlkil0c89z1192q207lii92yirc61css7izfli0"; depends=[zoo]; };
   sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
   sankey = derive2 { name="sankey"; version="1.0.0"; sha256="0wm10f514sg3gfrz291k720kznnyssznyvr49c15i26bhb82m0q0"; depends=[simplegraph]; };
@@ -8840,7 +8893,7 @@ in with self; {
   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.21.6"; sha256="17vi1mzr1kiq47dv1zskg63cpsqwxraj01g6sp6lx9vmw2cax74r"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
+  sdcTable = derive2 { name="sdcTable"; version="0.22.1"; sha256="0mcvymzabflhd0akczczv1cmxaakknqxjma5vdv75043rv151hqr"; 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]; };
@@ -9034,7 +9087,7 @@ in with self; {
   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]; };
-  sirt = derive2 { name="sirt"; version="1.14-0"; sha256="1dbv1wg16hd34hhsah0bf4rk3jqrr31rmsysjsbhall6mqlkprxz"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix MCMCpack mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
+  sirt = derive2 { name="sirt"; version="1.15-41"; sha256="00l8xv10isbk150gmp0b3rppzy0rnrhfn6w1j8whwdgws5fa3vl3"; depends=[CDM coda combinat gtools ic_infer igraph lavaan lavaan_survey MASS Matrix MCMCpack mirt mvtnorm pbivnorm plyr psych Rcpp RcppArmadillo sfsmisc sm survey TAM]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.3"; sha256="17q6dl8wiwf01g6jm93w72jvp1madd0fww1yiazjcbkmz0j3kdbl"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
@@ -9088,7 +9141,7 @@ in with self; {
   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]; };
   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.6.3"; sha256="0b7gdy0bjnaqn4djflxzkjx036jqn8izlc344yvsvybw5gysavl8"; depends=[nloptr Rcpp RcppArmadillo zoo]; };
+  smooth = derive2 { name="smooth"; version="1.7.0"; sha256="16jhg9qn6rcgd64wx6f7b9a3p9kgkbms8vlygc1gmnkifnh60a0v"; 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]; };
@@ -9137,12 +9190,12 @@ in with self; {
   solrium = derive2 { name="solrium"; version="0.4.0"; sha256="1jjvwwgyq335mhc4pff2l604x1k2260zwxl6k6k9lfzgcgqylbbw"; depends=[dplyr httr jsonlite plyr tibble xml2]; };
   solvebio = derive2 { name="solvebio"; version="0.3.0"; sha256="1y3raw38888jii2c4x1mvdwscyss8qc9fpyl96y0hpmxj4yg1d4l"; depends=[httr jsonlite]; };
   som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
-  som_nn = derive2 { name="som.nn"; version="1.0.3"; sha256="1viyw7gyfglnpqxamzqxsph876006bx0hbkjb8psi3v71wi014i2"; depends=[class hexbin kohonen som]; };
+  som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   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.5"; sha256="02a2j43nppzpbh0zqkq79yqys79jsmwql7nsijxlz27b847wf3pz"; depends=[MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="2.6"; sha256="02y0iah34h9zjji0p5xllz76q3cdabkljsi6vvbdraf0rhi2x51f"; 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=[]; };
@@ -9239,13 +9292,13 @@ 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-10"; sha256="0d94irvrpwlxsc7rw56lj8h72wigpxrsk3gsy6n37zr5l1yc2k5k"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp]; };
+  spdep = derive2 { name="spdep"; version="0.6-11"; sha256="15pv5ygaj924fjscm7wffjxyz9krbdh6f70f2vawq2m1w7qs2kd8"; 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]; };
   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.2"; sha256="03f6w575n8c8whi2hcxwspfs65112ykbwyn5nhx3r7x3dyqpk9v1"; depends=[MassSpecWavelet]; };
+  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]; };
   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]; };
@@ -9289,6 +9342,7 @@ in with self; {
   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]; };
   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]; };
@@ -9355,7 +9409,7 @@ in with self; {
   stationaRy = derive2 { name="stationaRy"; version="0.4.1"; sha256="1iyzg40vi1l4s68kh50in1p97pcb28z6n932cgrx5k1rv3api13g"; depends=[downloader dplyr leaflet lubridate plyr progress readr stringr]; };
   statip = derive2 { name="statip"; version="0.1.4"; sha256="1vy3433rrifcix1m28lizbik3qrl2krdldbvmqfyp046xxf2inc1"; depends=[bazar dplyr]; };
   statisticalModeling = derive2 { name="statisticalModeling"; version="0.3.0"; sha256="018ap1hbv4m6y0c71f807apbb9bhr64kcfrn4w8ahhb2520l4mf8"; depends=[ggplot2 lazyeval magrittr mosaic rpart]; };
-  statmod = derive2 { name="statmod"; version="1.4.27"; sha256="14yilq9d3z20hig4rs8bjqyydw3dfx90mhmzvw9w8p16h0s595sn"; depends=[]; };
+  statmod = derive2 { name="statmod"; version="1.4.29"; sha256="1fgzkwriba39d7946lq892f0si2fjdy37pvxki6ix8xyj8qgnci4"; depends=[]; };
   statnet = derive2 { name="statnet"; version="2016.9"; sha256="1j5z7awvac3sb66ma1lrc9j23m6hmzqfnqxc0znsm36h324y3y6s"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm]; };
   statnet_common = derive2 { name="statnet.common"; version="3.3.0"; sha256="190gwkbzd1qh3d7v1xi13snp83jkpvsl7x4ac9x1pxybn3kw856p"; depends=[]; };
   statnetWeb = derive2 { name="statnetWeb"; version="0.4.0"; sha256="0gqvvpz9435wakpgf5jsznwgd3fix1vyabh87bnnfsm3pfs7rf2x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; };
@@ -9403,7 +9457,7 @@ in with self; {
   stratification = derive2 { name="stratification"; version="2.2-5"; sha256="0cgr49gvh12s6rr43878jxjkir7b7absqgbfsvj1bjlf2r3gyqy9"; 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-3"; sha256="0ngsbnm8zy2nzvsdbbqg1lyd9l0k537ql7y8ck85hmwxj7nxna4b"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
+  stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
   streamMOA = derive2 { name="streamMOA"; version="1.1-2"; sha256="0mg113v8zy6kh67hm91xfd9kd1x8vvvx03svhz70nz9npw00pvlz"; depends=[rJava stream]; };
   streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
   stremr = derive2 { name="stremr"; version="0.4"; sha256="0n8ickmzjqlxwrz8dsphh1nsbnsgp4mnwm52i5ji099ps5292f65"; depends=[assertthat data_table pander R6 Rcpp rmarkdown speedglm stringr zoo]; };
@@ -9458,7 +9512,7 @@ in with self; {
   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]; };
-  surrosurv = derive2 { name="surrosurv"; version="1.1.5"; sha256="1mga3xi41rhnpci7zb224j1jdzf4nli4mbr7jy8nibjyjw4ccdz9"; depends=[copula eha lme4 MASS msm mvmeta optextras optimx parfm SurvCorr survival]; };
+  surrosurv = derive2 { name="surrosurv"; version="1.1.10"; sha256="1sqwj90nvklrx0by185dlkjwaf9fxrlikf94irxih893vrqsihg8"; depends=[copula eha lme4 MASS msm mvmeta optextras optimx parfm SurvCorr survival]; };
   surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-4"; sha256="1ihz71vzrkd5ksy7421myrgkbww0z5k0ywcb2bfalxx2bd2cs2wf"; depends=[flexsurv plotrix survC1 survival]; };
   survAUC = derive2 { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zbvx3h1m96jy9q37krmk6kfzw25ms6bzzr"; depends=[survival]; };
   survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; };
@@ -9513,7 +9567,7 @@ in with self; {
   swamp = derive2 { name="swamp"; version="1.2.3"; sha256="1xpnq5yrmmsx3d48x411p7nx6zmwmfc9hz6m3v9avvpjkbc3glkg"; depends=[amap gplots impute MASS]; };
   sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; };
   swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; };
-  swirl = derive2 { name="swirl"; version="2.4.2"; sha256="1dmjpjyk1a76vyya2x47sakj7xspma0i20zhryraf52mavb5qnw9"; depends=[digest httr RCurl stringr testthat yaml]; };
+  swirl = derive2 { name="swirl"; version="2.4.3"; sha256="1l7gwisk3sjslh6zh4cq3vxf5y84af2fr078cp4i86rw1w2j9d44"; depends=[digest httr RCurl stringr testthat yaml]; };
   swirlify = derive2 { name="swirlify"; version="0.5.0"; sha256="1j5xrv9nbfxmwxr77qa545fcm0vg76zwv1l5msgykq2g6cc9vc4z"; depends=[base64enc rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.11.2"; sha256="0kwkadw1hfkjvlpgr8lfx9qknlml3alk8ka2yhbga019y7ifbm7y"; depends=[RCurl RJSONIO]; };
@@ -9611,6 +9665,7 @@ in with self; {
   textreg = derive2 { name="textreg"; version="0.1.3"; sha256="0wp1yybhcybb77aykk9frrylk4kjn0jc98q488195qzx7m5n7ccw"; 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]; };
   textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
   tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; };
@@ -9634,6 +9689,7 @@ in with self; {
   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]; };
   tidyr = derive2 { name="tidyr"; version="0.6.1"; sha256="11hs3gqpbaw3w281as4m7j9n594ix5axfpwbyjsd0l62pwnzj217"; depends=[dplyr lazyeval magrittr Rcpp stringi tibble]; };
@@ -9682,7 +9738,7 @@ in with self; {
   tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; };
   tlm = derive2 { name="tlm"; version="0.1.4"; sha256="041ydlbsn0dxggrvfjfpg2jmns3c4z021f64cl2k1lwmxvqrp265"; depends=[boot]; };
   tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; };
-  tm = derive2 { name="tm"; version="0.6-2"; sha256="0q7plaqgc2ypihnz3dyjv2pwa0aimd4kv5i2z6m7aycc4wkmc7j4"; depends=[NLP slam]; };
+  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]; };
   tm_plugin_dc = derive2 { name="tm.plugin.dc"; version="0.2-8"; sha256="0z843i2wlmx75748p95jz3j45d9bzmlmqa3awgya24k7bdhpd6kd"; depends=[DSL NLP slam tm]; };
   tm_plugin_europresse = derive2 { name="tm.plugin.europresse"; version="1.4"; sha256="03qi9rkfwgjvir4cjpi9imc8zaldvan42v9lqfr5d6zhr0ajy6wx"; depends=[NLP tm XML]; };
@@ -9707,7 +9763,7 @@ in with self; {
   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-4"; sha256="0hqgq8lkaj5p4lvjgyyw8vh8j85khqvvrm8vw172dbj997x2izi4"; depends=[modeltools slam tm]; };
+  topicmodels = derive2 { name="topicmodels"; version="0.2-5"; sha256="1kilkwfhs7295w410xv34np1cr1wdwqxq1776mg24z4f8a56ccrw"; 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=[]; };
@@ -9805,6 +9861,7 @@ in with self; {
   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]; };
+  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]; };
@@ -9894,7 +9951,7 @@ in with self; {
   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]; };
   vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; };
-  vardpoor = derive2 { name="vardpoor"; version="0.8.4"; sha256="1w2l3pz4qwsx376wd4vzkfs1xajsy10fkkhmn7gmvrvi899afmh3"; depends=[data_table foreach gdata laeken MASS plyr stringr surveyplanning]; };
+  vardpoor = derive2 { name="vardpoor"; version="0.8.6"; sha256="0jfwrpg85w10m6y4pk06wrbmnvzjby1fiarn3i14dgglba8jcrbl"; 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]; };
@@ -9966,6 +10023,7 @@ in with self; {
   waffle = derive2 { name="waffle"; version="0.7.0"; sha256="1qjmai33p96cyavi9lgi6k30h6fj7db5sr569v9jf4kwx92c61df"; depends=[extrafont ggplot2 gridExtra gtable RColorBrewer]; };
   wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; };
   wakefield = derive2 { name="wakefield"; version="0.3.0"; sha256="1f74503ar4hw48j13npgzybvwc631xndldidqnyfk72wb11fzi4z"; depends=[chron dplyr ggplot2 stringi]; };
+  walkr = derive2 { name="walkr"; version="0.3.4"; sha256="01278hfa9mppwqmr54826gb65pswhqbh7ai8ij6m4ncc0fk6pvvd"; depends=[ggplot2 hitandrun limSolve MASS Rcpp RcppEigen shinystan]; };
   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]; };
@@ -10018,6 +10076,7 @@ in with self; {
   wicket = derive2 { name="wicket"; version="0.2.0"; sha256="0wyd72w1l84kxzfy0hhrzr6ipxgzh2gfwldlmv0h79r5icjk17z3"; 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]; };
   wikipediatrend = derive2 { name="wikipediatrend"; version="1.1.10"; sha256="10av87jlfn2lfx37bnhlpdnhg657md9jx3c3frc9a4mm4lhl7rbv"; depends=[hellno httr jsonlite rvest stringr xml2]; };
@@ -10095,7 +10154,7 @@ in with self; {
   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]; };
-  xyloplot = derive2 { name="xyloplot"; version="1.3"; sha256="1pgxsmghpy9am1smdfc0d8hi2l9gb15ssfpf4z84cc2chhaghc7w"; depends=[]; };
+  xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; };
   xyz = derive2 { name="xyz"; version="0.1"; sha256="0hynmrbi1f0ijv2g0va8bnr84ls2d8prl32f76mmfq6a3laqrj9i"; 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=[]; };
@@ -10110,11 +10169,11 @@ in with self; {
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
   yuima = derive2 { name="yuima"; version="1.5.9"; sha256="04s96zkyccb2nkgzh07jxa8lpyrvzigyiynis2ifiql12yw5c960"; depends=[cubature expm mvtnorm Rcpp zoo]; };
-  yuimaGUI = derive2 { name="yuimaGUI"; version="1.0.0"; sha256="12mr9icngrrghn0j1dpyx2njr7sn9zc5nm3imrqq3qxz7wv45fg8"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
+  yuimaGUI = derive2 { name="yuimaGUI"; version="1.0.1"; sha256="14iyx7rp538l41s135qq5rcq2hbl7rpnhpigz0lzyzdyg6a2mn2n"; depends=[DT ggplot2 quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
   zCompositions = derive2 { name="zCompositions"; version="1.0.3-1"; sha256="1408bb5nfipsxskgpjzixnxndg7hf48nq27k0pwrcxx16wykmlcy"; depends=[MASS NADA truncnorm]; };
   zTree = derive2 { name="zTree"; version="1.0.4"; sha256="058vjvxn1lw07nxw8rs1b8vnw6ccxh3swrmvjicvr35xmakj8qa0"; depends=[plyr]; };
-  zeallot = derive2 { name="zeallot"; version="0.0.2"; sha256="0rksacqasiq9xxxmkdqi5c844xhbnda6f6hr8mz37vg9zxqzfbdj"; depends=[]; };
+  zeallot = derive2 { name="zeallot"; version="0.0.3"; sha256="0cxrq9lf184szysccx7zhhgsimixhkpdybgj05asi5kbrlf03pn6"; depends=[]; };
   zebu = derive2 { name="zebu"; version="0.1.0"; sha256="1s9lm90yhyhflikvrwpbx94gysc7wazpi4v3vh3fibiyna0a9sgj"; depends=[ggplot2 pbapply plyr reshape2]; };
   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]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 05016c326efc..40d8e2b1b436 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -693,794 +693,508 @@ let
 
   # Packages which cannot be installed due to lack of dependencies or other reasons.
   brokenPackages = [
-    "TED" # depends on broken package animation
-    "streamMOA" # depends on broken package animation
-    "stream" # depends on broken package animation
-    "spdynmod" # depends on broken package animation
-    "treeplyr" # depends on broken package animation
-    "recluster" # depends on broken package animation
-    "geomorph" # depends on broken package animation
-    "phytools" # depends on broken package animation
-    "animation" # broken build
-    "srd" # broken build
-    "paleotree" # broken build
-    "ndtv" # broken build
-    "mvMORPH" # broken build
-    "mptools" # broken build
-    "monogeneaGM" # broken build
-    "molaR" # broken build
-    "idm" # broken build
-    "hisse" # broken build
-    "gfcanalysis" # broken build
-    "evolqg" # broken build
-    "evobiR" # broken build
-    "convevol" # broken build
-    "bayou" # broken build
-    "anim_plots" # broken build
-    "TKF" # broken build
-    "Rphylopars" # broken build
-    "RAM" # broken build
-    "PhySortR" # broken build
-    "MonoPhy" # broken build
-    "Momocs" # broken build
-    "Evomorph" # broken build
-    "PBD" # depends on broken package DDD
-    "DDD" # broken build
-    "BMhyd" # broken build
-    "rscala" # broken build
-    "rgpui" # depends on broken package rgp
-    "rgp" # broken build
-    "qcmetrics" # broken build
-    "lfe" # broken build
-    "interactiveDisplay" # depends on broken package interactiveDisplayBase
-    "RefNet" # depends on broken package interactiveDisplayBase
-    "pwOmics" # depends on broken package interactiveDisplayBase
-    "grasp2db" # depends on broken package interactiveDisplayBase
-    "gputools" # broken build
-    "EnsDb_Rnorvegicus_v79" # depends on broken package interactiveDisplayBase
-    "EnsDb_Rnorvegicus_v75" # depends on broken package interactiveDisplayBase
-    "EnsDb_Mmusculus_v79" # depends on broken package interactiveDisplayBase
-    "EnsDb_Mmusculus_v75" # depends on broken package interactiveDisplayBase
-    "EnsDb_Hsapiens_v79" # depends on broken package interactiveDisplayBase
-    "EnsDb_Hsapiens_v75" # depends on broken package interactiveDisplayBase
-    "ensembldb" # depends on broken package interactiveDisplayBase
-    "AnnotationHubData" # depends on broken package interactiveDisplayBase
-    "AnnotationHub" # depends on broken package interactiveDisplayBase
-    "interactiveDisplayBase" # broken build
-    "h2o" # broken build
-    "funModeling" # broken build
-    "brr" # broken build
-    "bedr" # broken build
-    "Sabermetrics" # broken build
-    "RKEEL" # depends on broken package RKEELjars
-    "RKEELjars" # broken build
-    "RapidPolygonLookup" # depends on broken package PBSmapping
-    "PBSmapping" # broken build
-    "stagePop" # depends on broken package PBSddesolve
-    "PBSddesolve" # broken build
-    "Metab" # broken build
-    "Crossover" # broken build
-    "CardinalWorkflows" # broken build
-    "mapr" # depends on broken package spocc
-    "vmsbase" # broken build
-    "vcfR" # broken build
-    "strataG" # broken build
-    "SSDM" # broken build
-    "SimInf" # broken build
-    "shazam" # broken build
-    "rsvg" # broken build
-    "Rothermel" # broken build
-    "rfPermute" # broken build
-    "redland" # broken build
-    "RAppArmor" # broken build
-    "permGPU" # broken build
-    "pdftools" # broken build
-    "OceanView" # broken build
-    "MSeasyTkGUI" # broken build
-    "mrMLM" # broken build
-    "MonetDBLite" # broken build
-    "MixGHD" # broken build
-    "LCMCR" # broken build
-    "hunspell" # broken build
-    "googleformr" # broken build
-    "ggseas" # depends on broken package x13binary
-    "seasonal" # depends on broken package x13binary
-    "gunsales" # depends on broken package x13binary
-    "x13binary" # broken build
-    "fds" # broken build
-    "exifr" # broken build
-    "rite" # depends on broken package euroMix
-    "MBCB" # depends on broken package euroMix
-    "forensim" # depends on broken package euroMix
-    "dynBiplotGUI" # depends on broken package euroMix
-    "cncaGUI" # depends on broken package euroMix
-    "biplotbootGUI" # depends on broken package euroMix
-    "AnthropMMD" # depends on broken package euroMix
-    "ilc" # depends on broken package demography
-    "demography" # broken build
-    "TransView" # broken build
-    "Starr" # broken build
-    "SICtools" # broken build
-    "ReQON" # depends on broken package seqbias
-    "seqbias" # broken build
-    "Repitools" # broken build
-    "QuasR" # broken build
-    "qrqc" # broken build
-    "ProteomicsAnnotationHubData" # broken build
-    "podkat" # broken build
-    "PING" # depends on broken package PICS
-    "PICS" # broken build
-    "mcaGUI" # broken build
-    "deepSNV" # broken build
-    "motifbreakR" # depends on broken package MotIV
-    "LowMACA" # depends on broken package MotIV
-    "dagLogo" # depends on broken package MotIV
-    "motifStack" # depends on broken package MotIV
-    "MotIV" # broken build
-    "CNEr" # broken build
-    "canceR" # broken build
-    "BubbleTree" # broken build
-    "arrayQualityMetrics" # broken build
-    "ArrayExpressHTS" # broken build
-    "TargetSearchData" # depends on broken package TargetSearch
-    "TargetSearch" # broken build
-    "ptw" # depends on broken package nloptr
-    "gpuR" # broken build
-    "erma" # broken build
-    "MBmca" # depends on broken package chipPCR
-    "dpcR" # depends on broken package chipPCR
-    "chipPCR" # broken build
-    "alsace" # broken build
-    "rrlda" # depends on broken package VIM
-    "qrfactor" # depends on broken package VIM
-    "MVN" # depends on broken package VIM
-    "mvoutlier" # depends on broken package VIM
-    "robCompositions" # depends on broken package VIM
-    "DiagrammeRsvg" # depends on broken package V8
-    "dagitty" # depends on broken package V8
-    "remoter" # depends on broken package sodium
-    "Fletcher2013b" # depends on broken package RTN
-    "apaStyle" # depends on broken package ReporteRs
-    "categoryCompare" # depends on broken package RCytoscape
-    "preseqR" # depends on broken package polynom
-    "permutations" # depends on broken package partitions
-    "GLMMRR" # depends on broken package lme4
-    "replicationInterval" # depends on broken package lme4
-    "GWASdata" # depends on broken package GWASTools
-    "EnsemblePCReg" # depends on broken package EnsembleBase
-    "EnsembleCV" # depends on broken package EnsembleBase
-    "cpgen" # depends on broken package pedigreemm
-    "mitml" # depends on broken package jomo
-    "IlluminaHumanMethylation450k_db" # broken build
-    "gahgu95ecdf" # broken build
-    "gahgu95dcdf" # broken build
-    "gahgu95ccdf" # broken build
-    "gahgu95bcdf" # broken build
-    "gahgu95av2cdf" # broken build
-    "PREDAsampledata" # depends on broken package gahgu133plus2cdf
-    "gahgu133plus2cdf" # broken build
-    "gahgu133bcdf" # broken build
-    "gahgu133acdf" # broken build
-    "annmap" # depends on broken package RMySQL
-    "choroplethr" # depends on broken package acs
-    "acs" # broken build
-    "spray" # depends on broken package partitions
-    "CNVrd2" # broken build
-    "proteoQC" # depends on broken package rTANDEM
-    "PGA" # depends on broken package rTANDEM
-    "MBESS" # depends on broken package OpenMx
-    "DOQTL" # depends on broken package rhdf5
-    "DmelSGI" # depends on broken package rhdf5
-    "flowDiv" # depends on broken package ncdfFlow
-    "ChemmineDrugs" # depends on broken package ChemmineR
-    "stpm" # depends on broken package nloptr
-    "sjmisc" # depends on broken package nloptr
-    "rstanarm" # depends on broken package nloptr
-    "glmmsr" # depends on broken package nloptr
-    "FDboost" # depends on broken package nloptr
-    "faraway" # depends on broken package nloptr
-    "interplot" # depends on broken package nloptr
-    "VSE" # depends on broken package car
-    "VARSEDIG" # depends on broken package car
-    "translateSPSS2R" # depends on broken package car
-    "tadaatoolbox" # depends on broken package car
-    "lavaan_shiny" # depends on broken package car
-    "RcmdrPlugin_GWRM" # depends on broken package car
-    "pcaBootPlot" # depends on broken package car
-    "ClustGeo" # depends on broken package car
-    "preproviz" # depends on broken package car
-    "hsdar" # depends on broken package car
-    "DecisionCurve" # depends on broken package car
-    "CONDOP" # depends on broken package car
-    "EnsemblePenReg" # depends on broken package car
-    "EnsembleBase" # depends on broken package car
-    "fullfact" # depends on broken package car
-    "clusterSEs" # depends on broken package car
-    "ggiraph" # depends on broken package gdtools
-    "rvg" # depends on broken package gdtools
-    "ggpmisc" # depends on broken package polynom
-    "mlt_docreg" # depends on broken package polynom
-    "mlt" # depends on broken package polynom
-    "basefun" # depends on broken package polynom
-    "rtable" # depends on broken package ReporteRs
-    "Mediana" # depends on broken package ReporteRs
-    "ReporteRs" # broken build
-    "abd" # depends on broken package nlopt
-    "adabag" # depends on broken package nlopt
-    "adhoc" # broken build
-    "AER" # depends on broken package nlopt
-    "afex" # depends on broken package nlopt
-    "agRee" # depends on broken package nlopt
-    "aLFQ" # depends on broken package nlopt
-    "algstat" # broken build
-    "alr3" # depends on broken package nlopt
-    "alr4" # depends on broken package nlopt
-    "alsace" # depends on broken nloptr
-    "anacor" # depends on broken package nlopt
-    "aods3" # depends on broken package nlopt
-    "apaTables" # depends on broken package car
-    "apt" # depends on broken package nlopt
-    "ArfimaMLM" # depends on broken package nlopt
-    "arm" # depends on broken package nlopt
-    "ART" # depends on broken package car
-    "ARTool" # depends on broken package nlopt
-    "AssetPricing" # broken build
-    "AtelieR" # broken build
-    "auRoc" # depends on broken package MBESS
-    "AutoModel" # depends on broken package car
-    "bamdit" # broken build
-    "bapred" # depends on broken package lme4
-    "bartMachine" # depends on broken package nlopt
-    "bayesDem" # depends on broken package nlopt
-    "bayesLife" # depends on broken package nlopt
-    "BayesMed" # broken build
-    "bayesmix" # broken build
-    "bayesPop" # depends on broken package nlopt
-    "Bayesthresh" # depends on broken package nlopt
-    "BaySIC" # broken build
-    "BBRecapture" # depends on broken package nlopt
-    "BCA" # depends on broken package nlopt
-    "bdynsys" # depends on broken package car
-    "BEST" # broken build
-    "bgmm" # depends on broken package nlopt
-    "BIFIEsurvey" # depends on broken package nlopt
-    "BiGGR" # depends on broken package rsbml
-    "bioassayR" # broken build
-    "BiodiversityR" # depends on broken package nlopt
-    "biotools" # depends on broken package rpanel
-    "birte" # build is broken
-    "BLCOP" # depends on broken package Rsymphony
-    "blmeco" # depends on broken package nlopt
-    "blme" # depends on broken package nlopt
-    "bmd" # depends on broken package nlopt
-    "bmem" # depends on broken package nlopt
-    "bmeta" # depends on broken package R2jags
-    "bootnet" # depends on broken package nlopt
-    "boral" # broken build
-    "BradleyTerry2" # depends on broken package nlopt
-    "BrailleR" # broken build
-    "brainGraph" # build is broken
-    "brms" # build is broken
-    "BRugs" # build is broken
-    "BTSPAS" # broken build
-    "CADFtest" # depends on broken package nlopt
-    "cAIC4" # depends on broken package nlopt
-    "candisc" # depends on broken package nlopt
-    "carcass" # depends on broken package nlopt
-    "car" # depends on broken package nlopt
-    "caret" # depends on broken package nlopt
-    "caretEnsemble" # depends on broken package nlopt
-    "CARrampsOcl" # depends on broken package OpenCL
-    "Causata" # broken build
-    "CCpop" # depends on broken package nlopt
-    "CCTpack" # broken build
-    "ChainLadder" # depends on broken package nlopt
-    "ChemmineR" # Build Is Broken
-    "chipenrich" # build is broken
-    "chipPCR" # depends on broken nloptr
-    "classify" # broken build
-    "climwin" # depends on broken package nlopt
-    "CLME" # depends on broken package nlopt
-    "clpAPI" # build is broken
-    "clusterPower" # depends on broken package nlopt
-    "clusterSEs" # depends on broken AER
-    "ClustGeo" # depends on broken FactoMineR
-    "CNORfuzzy" # depends on broken package nlopt
-    "CNVPanelizer" # depends on broken cn.mops
-    "COHCAP" # build is broken
-    "colorscience" # broken build
-    "compendiumdb" # broken build
-    "conformal" # depends on broken package nlopt
-    "corHMM" # depends on broken package nlopt
-    "CosmoPhotoz" # depends on broken package nlopt
-    "covmat" # depends on broken package VIM
-    "cplexAPI" # build is broken
-    "cquad" # depends on broken package car
-    "CrypticIBDcheck" # depends on broken package nlopt
-    "ctsem" # depends on broken package OpenMx
-    "cudaBayesreg" # build is broken
-    "daff" # depends on broken package V8
-    "dagbag" # build is broken
-    "DAMisc" # depends on broken package nlopt
-    "dbConnect" # broken build
-    "DBKGrad" # depends on broken package rpanel
-    #"dcmle" # broken build
-    "ddst" # broken build
-    "Deducer" # depends on broken package nlopt
-    "DeducerExtras" # depends on broken package nlopt
-    "DeducerPlugInExample" # depends on broken package nlopt
-    "DeducerPlugInScaling" # depends on broken package nlopt
-    "DeducerSpatial" # depends on broken package nlopt
-    "DeducerSurvival" # depends on broken package nlopt
-    "DeducerText" # depends on broken package nlopt
-    "DEGraph" # depends on broken package RCytoscape
-    "destiny" # depends on broken package VIM
-    "DiagTest3Grp" # depends on broken package nlopt
-    "difR" # depends on broken package nlopt
-    "DirichletMultinomial" # Build Is Broken
-    "DistatisR" # depends on broken package nlopt
-    "diveRsity" # depends on broken package nlopt
-    "DJL" # depends on broken package car
-    "dpa" # depends on broken package nlopt
-    "dpcR" # depends on broken nloptr
-    "drc" # depends on broken package nlopt
-    "drfit" # depends on broken package nlopt
-    "drsmooth" # depends on broken package nlopt
-    "dynlm" # depends on broken package nlopt
-    "easyanova" # depends on broken package nlopt
-    "ecd" # depends on broken package polynom
-    "edge" # depends on broken package nlopt
-    "eeptools" # depends on broken package nlopt
-    "EffectLiteR" # depends on broken package nlopt
-    "effects" # depends on broken package nlopt
-    "eiR" # depends on broken package ChemmineR
-    "EMA" # depends on broken package nlopt
-    "embryogrowth" # broken build
-    "emg" # broken build
-    "EnQuireR" # depends on broken package nlopt
-    "episplineDensity" # depends on broken package nlopt
-    "epr" # depends on broken package nlopt
-    "erer" # depends on broken package nlopt
-    "erma" # depends on broken GenomicFiles
-    "erpR" # depends on broken package rpanel
-    "ESKNN" # depends on broken package caret
-    "euroMix" # build is broken
-    "extRemes" # depends on broken package nlopt
-    "ez" # depends on broken package nlopt
-    "ezec" # depends on broken package drc
-    "facopy" # depends on broken package nlopt
-    "FactoMineR" # depends on broken package nlopt
-    "Factoshiny" # depends on broken package nlopt
-    "faoutlier" # depends on broken package nlopt
-    "fastR" # depends on broken package nlopt
-    "FDRreg" # depends on broken package nlopt
-    "fishmethods" # depends on broken package lme4
-    "flipflop" # broken build
-    "flowDensity" # depends on broken package nlopt
-    "flowPeaks" # build is broken
-    "flowQ" # build is broken
-    "flowStats" # depends on broken package ncdfFlow
-    "flowVS" # depends on broken package ncdfFlow
-    "flowWorkspace" # depends on broken package ncdfFlow
-    "fmcsR" # depends on broken package ChemmineR
-    "fPortfolio" # depends on broken package Rsymphony
-    "fracprolif" # broken build
-    "FreeSortR" # broken build
-    "freqweights" # depends on broken package nlopt
-    "frmqa" # broken build
-    "FSA" # depends on broken package car
-    "fscaret" # depends on broken package nlopt
-    "funcy" # depends on broken package car
-    "fxregime" # depends on broken package nlopt
-    "gamclass" # depends on broken package nlopt
-    "gamlss_demo" # depends on broken package rpanel
-    "gamm4" # depends on broken package nlopt
-    "gaussquad" # broken build
-    "gcmr" # depends on broken package nlopt
-    "GDAtools" # depends on broken package nlopt
-    "gdtools" # broken build
-    "GENESIS" # broken build
-    "genridge" # depends on broken package nlopt
-    "geojsonio" # depends on broken package V8
-    "GEWIST" # depends on broken package nlopt
-    "ggtree" # broken build
-    "gimme" # depends on broken package nlopt
-    "gMCP" # build is broken
-    "gmum_r" # broken build
-    "GPC" # broken build
-    "gplm" # depends on broken package nlopt
-    "gpuR" # depends on GPU-specific header files
-    "granova" # depends on broken package nlopt
-    "graphicalVAR" # depends on broken package nlopt
-    "GraphPAC" # broken build
-    "gridGraphics" # build is broken
-    "GSCA" # depends on broken package rhdf5
-    "GUIDE" # depends on broken package rpanel
-    "GWAF" # depends on broken package nlopt
-    "GWASTools" # broken build
-    "hbsae" # depends on broken package nlopt
-    "heplots" # depends on broken package nlopt
-    "HiDimMaxStable" # broken build
-    "HierO" # Build Is Broken
-    "HilbertVisGUI" # Build Is Broken
-    "HiPLARM" # Build Is Broken
-    "HistDAWass" # depends on broken package nlopt
-    "HLMdiag" # depends on broken package nlopt
-    "homomorpheR" # broken build
-    "hpcwld" # broken build
-    "hwwntest" # broken build
-    "HydeNet" # broken build
-    "hysteresis" # depends on broken package nlopt
-    "IATscores" # depends on broken package nlopt
-    "ibd" # depends on broken package nlopt
-    "iccbeta" # depends on broken package nlopt
-    "iClick" # depends on broken package rugarch
-    "ifaTools" # depends on broken package OpenMx
-    "imager" # broken build
-    "immunoClust" # build is broken
-    "in2extRemes" # depends on broken package nlopt
-    "inferference" # depends on broken package nlopt
-    "influence_ME" # depends on broken package nlopt
-    "inSilicoMerging" # build is broken
-    "INSPEcT" # depends on broken GenomicFeatures
-    "interplot" # depends on broken arm
-    "IsingFit" # depends on broken package nlopt
-    "ITEMAN" # depends on broken package car
-    "iteRates" # broken build
-    "iterpc" # broken build
-    "IUPS" # broken build
-    "IVAS" # depends on broken package nlopt
-    "ivpack" # depends on broken package nlopt
-    "jagsUI" # broken build
-    "JAGUAR" # depends on broken package nlopt
-    "joda" # depends on broken package nlopt
-    "jomo" # build is broken
-    "js" # depends on broken package V8
-    "KoNLP" # broken build
-    "kzft" # broken build
-    "LaplaceDeconv" # depends on broken package orthopolynom
-    "lawn" # depends on broken package V8
-    "ldamatch" # broken build
-    "learnstats" # depends on broken package nlopt
-    "lefse" # build is broken
-    "lessR" # depends on broken package nlopt
-    "lgcp" # depends on broken package rpanel
-    "Libra" # broken build
-    "LinRegInteractive" # depends on broken package rpanel
-    "lira" # broken build
-    "littler" # broken build
-    "lme4" # depends on broken package nlopt
-    "LMERConvenienceFunctions" # depends on broken package nlopt
-    "lmerTest" # depends on broken package nlopt
-    "lmSupport" # depends on broken package nlopt
-    "LOGIT" # depends on broken package caret
-    "longpower" # depends on broken package nlopt
-    "LPTime" # broken build
-    "MAIT" # depends on broken package nlopt
-    "mAPKL" # build is broken
-    "maPredictDSC" # depends on broken package nlopt
-    "mar1s" # broken build
-    "marked" # depends on broken package nlopt
-    "matchingMarkets" # broken build
-    "MatrixRider" # depends on broken package DirichletMultinomial
-    "MaxPro" # depends on broken package nlopt
-    "mbest" # depends on broken package nlopt
-    "MBmca" # depends on broken nloptr
-    "mBvs" # build is broken
-    "meboot" # depends on broken package nlopt
-    "medflex" # depends on broken package car
-    "mediation" # depends on broken package lme4
-    "MEDME" # depends on broken package nlopt
-    "MEMSS" # depends on broken package nlopt
-    "merTools" # depends on broken package arm
-    "meta4diag" # broken build
-    "metagear" # build is broken
-    "metaheur" # depends on broken package preprocomb
-    "metamisc" # broken build
-    "metaplus" # depends on broken package nlopt
-    "metaSEM" # depends on broken package OpenMx
-    "Metatron" # depends on broken package nlopt
-    "miceadds" # depends on broken package nlopt
-    "micEconAids" # depends on broken package nlopt
-    "micEconCES" # depends on broken package nlopt
-    "micEconSNQP" # depends on broken package nlopt
-    "mi" # depends on broken package nlopt
-    "MigClim" # Build Is Broken
-    "migui" # depends on broken package nlopt
-    "minimist" # depends on broken package V8
-    "missMDA" # depends on broken package nlopt
-    "mitoODE" # build is broken
-    "mixAK" # depends on broken package nlopt
-    "MixedPoisson" # broken build
-    "mixlm" # depends on broken package nlopt
-    "MixMAP" # depends on broken package nlopt
-    "mlma" # depends on broken package lme4
-    "mlmRev" # depends on broken package nlopt
-    "MLSeq" # depends on broken package nlopt
-    "mlVAR" # depends on broken package nlopt
-    "MM" # broken build
-    "mongolite" # build is broken
-    "mosaic" # depends on broken package nlopt
-    "mpoly" # broken build
-    "mRMRe" # broken build
-    "msa" # broken build
-    "MSGFgui" # depends on broken package MSGFplus
-    "MSGFplus" # Build Is Broken
-    "MSstats" # depends on broken package nlopt
-    "MultiRR" # depends on broken package nlopt
-    "muma" # depends on broken package nlopt
-    "munsellinterpol" # broken build
-    "mutossGUI" # build is broken
-    "mvinfluence" # depends on broken package nlopt
-    "MXM" # broken build
-    "NanoStringDiff" # broken build
-    "NanoStringQCPro" # build is broken
-    "nCal" # depends on broken package nlopt
-    "ncdfFlow" # build is broken
-    "NCIgraph" # depends on broken package RCytoscape
-    "NHPoisson" # depends on broken package nlopt
-    "nloptr" # depends on broken package nlopt
-    "nlsem" # broken build
-    "nlts" # broken build
-    "nonrandom" # depends on broken package nlopt
-    "NORRRM" # build is broken
-    "npIntFactRep" # depends on broken package nlopt
-    "NSM3" # broken build
-    "omics" # depends on broken package lme4
-    "OmicsMarkeR" # depends on broken package nlopt
-    "OPDOE" # broken build
-    "OpenCL" # build is broken
-    "openCyto" # depends on broken package ncdfFlow
-    "OpenMx" # build is broken
-    "optBiomarker" # depends on broken package rpanel
-    "ora" # depends on broken package ROracle
-    "ordBTL" # depends on broken package nlopt
-    "ordPens" # depends on broken package lme4
-    "orthopolynom" # broken build
-    "OUwie" # depends on broken package nlopt
-    "oz" # broken build
-    "PAA" # broken build
-    "pamm" # depends on broken package nlopt
-    "panelAR" # depends on broken package nlopt
-    "papeR" # depends on broken package nlopt
-    "parboost" # depends on broken package nlopt
-    "parma" # depends on broken package nlopt
-    "partitions" # broken build
-    "PatternClass" # build is broken
-    "PBImisc" # depends on broken package nlopt
-    "pcaBootPlot" # depends on broken FactoMineR
-    "pcaL1" # build is broken
-    "pcnetmeta" # broken build
-    "PDQutils" # broken build
-    "pedigreemm" # depends on broken package nlopt
-    "pequod" # depends on broken package nlopt
-    "pglm" # depends on broken package car
-    "PhenStat" # depends on broken package nlopt
-    "phia" # depends on broken package nlopt
-    "phylocurve" # depends on broken package nlopt
-    "piecewiseSEM" # depends on broken package lme4
-    "plateCore" # depends on broken package ncdfFlow
-    "plfMA" # broken build
-    "plm" # depends on broken package car
-    "plsRbeta" # depends on broken package nlopt
-    "plsRcox" # depends on broken package nlopt
-    "plsRglm" # depends on broken package nlopt
-    "pmm" # depends on broken package nlopt
-    "polynom" # broken build
-    "pomp" # depends on broken package nlopt
-    "predictmeans" # depends on broken package nlopt
-    "preprocomb" # depends on broken package caret
-    "prevalence" # broken build
-    "prLogistic" # depends on broken package nlopt
-    "pRoloc" # depends on broken package nlopt
-    "pRolocGUI" # depends on broken package nlopt
-    "PSAboot" # depends on broken package nlopt
-    "ptw" # depends on broken nloptr
-    "PurBayes" # broken build
-    "pvca" # depends on broken package nlopt
-    "PythonInR" # broken build
-    "QFRM" # broken build
-    "qgraph" # depends on broken package nlopt
-    "qtbase" # build is broken
-    "qtlnet" # depends on broken package nlopt
-    "qtpaint" # depends on broken package qtbase
-    "qtutils" # depends on broken package qtbase
-    "QUALIFIER" # depends on broken package ncdfFlow
-    "quantification" # depends on broken package nlopt
-    "QuartPAC" # broken build
-    "R2jags" # broken build
-    "R2STATS" # depends on broken package nlopt
-    "rain" # broken build
-    "raincpc" # build is broken
-    "rainfreq" # build is broken
-    "RamiGO" # depends on broken package RCytoscape
-    "RareVariantVis" # depends on broken VariantAnnotation
-    "rasclass" # depends on broken package nlopt
-    "rationalfun" # broken build
-    "RBerkeley" # broken build
-    "RbioRXN" # depends on broken package ChemmineR
-    "Rblpapi" # broken build
-    "Rchemcpp" # depends on broken package ChemmineR
-    "rchess" # depends on broken package V8
-    "Rchoice" # depends on broken package car
-    "Rcmdr" # depends on broken package nlopt
-    "RcmdrMisc" # depends on broken package nlopt
-    "RcmdrPlugin_BCA" # depends on broken package nlopt
-    "RcmdrPlugin_coin" # depends on broken package nlopt
-    "RcmdrPlugin_depthTools" # depends on broken package nlopt
-    "RcmdrPlugin_DoE" # depends on broken package nlopt
-    "RcmdrPlugin_doex" # depends on broken package nlopt
-    "RcmdrPlugin_EACSPIR" # depends on broken package nlopt
-    "RcmdrPlugin_EBM" # depends on broken package nlopt
-    "RcmdrPlugin_EcoVirtual" # depends on broken package nlopt
-    "RcmdrPlugin_epack" # depends on broken package nlopt
-    "RcmdrPlugin_Export" # depends on broken package Rcmdr
-    "RcmdrPlugin_EZR" # depends on broken package nlopt
-    "RcmdrPlugin_FactoMineR" # depends on broken package nlopt
-    "RcmdrPlugin_HH" # depends on broken package nlopt
-    "RcmdrPlugin_IPSUR" # depends on broken package nlopt
-    "RcmdrPlugin_KMggplot2" # depends on broken package nlopt
-    "RcmdrPlugin_lfstat" # depends on broken package nlopt
-    "RcmdrPlugin_MA" # depends on broken package nlopt
-    "RcmdrPlugin_mosaic" # depends on broken package nlopt
-    "RcmdrPlugin_MPAStats" # depends on broken package nlopt
-    "RcmdrPlugin_NMBU" # depends on broken package nlopt
-    "RcmdrPlugin_orloca" # depends on broken package nlopt
-    "RcmdrPlugin_plotByGroup" # depends on broken package nlopt
-    "RcmdrPlugin_pointG" # depends on broken package nlopt
-    "RcmdrPlugin_qual" # depends on broken package nlopt
-    "RcmdrPlugin_RMTCJags" # depends on broken package nlopt
-    "RcmdrPlugin_ROC" # depends on broken package nlopt
-    "RcmdrPlugin_sampling" # depends on broken package nlopt
-    "RcmdrPlugin_SCDA" # depends on broken package nlopt
-    "RcmdrPlugin_seeg" # depends on broken package nlopt
-    "RcmdrPlugin_SLC" # depends on broken package nlopt
-    "RcmdrPlugin_SM" # depends on broken package nlopt
-    "RcmdrPlugin_sos" # depends on broken package nlopt
-    "RcmdrPlugin_steepness" # depends on broken package nlopt
-    "RcmdrPlugin_survival" # depends on broken package nlopt
-    "RcmdrPlugin_TeachingDemos" # depends on broken package nlopt
-    "RcmdrPlugin_temis" # depends on broken package nlopt
-    "RcmdrPlugin_UCA" # depends on broken package nlopt
-    "Rcpi" # depends on broken package ChemmineR
-    "Rcplex" # Build Is Broken
-    "RcppAPT" # Build Is Broken
-    "RcppRedis" # build is broken
-    "rcrypt" # broken build
-    "RCytoscape" # Build Is Broken
-    "rdd" # depends on broken package nlopt
-    "rddtools" # depends on broken package AER
-    "rDEA" # build is broken
-    "RDieHarder" # build is broken
-    "REBayes" # depends on broken package Rmosek
-    "referenceIntervals" # depends on broken package nlopt
-    "refund" # depends on broken package nlopt
-    "refund_shiny" # depends on broken package refund
-    "REndo" # depends on broken package AER
-    "repijson" # depends on broken package V8
-    "REST" # depends on broken package nlopt
-    "rgbif" # depends on broken package V8
-    "Rgnuplot" # broken build
-    "rjade" # depends on broken package V8
-    "rJPSGCS" # build is broken
-    "rLindo" # build is broken
-    "RLRsim" # depends on broken package lme4
-    "RMallow" # broken build
-    "rMAT" # build is broken
-    "rmgarch" # depends on broken package nlopt
-    "rminer" # depends on broken package nlopt
-    "Rmosek" # build is broken
-    "RMySQL" # broken build
-    "RNAither" # depends on broken package nlopt
-    "RnavGraph" # build is broken
-    "rnetcarto" # broken build
-    "robustlmm" # depends on broken package nlopt
-    "rockchalk" # depends on broken package nlopt
-    "ROI_plugin_symphony" # depends on broken package Rsymphony
-    "rols" # build is broken
-    "ROracle" # Build Is Broken
-    "rpanel" # build is broken
-    "Rpoppler" # broken build
-    "rpubchem" # depends on broken package nlopt
-    "RQuantLib" # build is broken
-    "rr" # depends on broken package nlopt
-    "RRreg" # depends on broken package lme4
-    "RSAP" # build is broken
-    "rsbml" # build is broken
-    "RSDA" # depends on broken package nlopt
-    "Rsomoclu" # broken build
-    "RStoolbox" # depends on broken package caret
-    "Rsymphony" # build is broken
-    "rTableICC" # broken build
-    "rTANDEM" # build is broken
-    "RTN" # depends on broken package nlopt
-    "rugarch" # depends on broken package nlopt
-    "rUnemploymentData" # broken build
-    "RVAideMemoire" # depends on broken package nlopt
-    "RVFam" # depends on broken package nlopt
-    "RVideoPoker" # depends on broken package rpanel
-    "RWebServices" # broken build
-    "ryouready" # depends on broken package nlopt
-    "sadists" # broken build
-    "sampleSelection" # depends on broken package nlopt
-    "sapFinder" # depends on broken package rTANDEM
-    "sdcMicro" # depends on broken package nlopt
-    "SDD" # depends on broken package rpanel
-    "seeg" # depends on broken package nlopt
-    "Sejong" # broken build
-    "sem" # depends on broken package nlopt
-    "semdiag" # depends on broken package nlopt
-    "semGOF" # depends on broken package nlopt
-    "semPlot" # depends on broken package nlopt
-    "SensMixed" # depends on broken package lme4
-    "SensoMineR" # depends on broken package nlopt
-    "seqCNA" # build is broken
-    "SeqFeatR" # broken build
-    "SeqGrapheR" # Build Is Broken
-    "seqHMM" # depends on broken package nloptr
-    "seqTools" # build is broken
-    "SharpeR" # broken build
-    "shinyTANDEM" # depends on broken package rTANDEM
-    "SIBER" # broken build
-    "simPop" # depends on broken package VIM
-    "simr" # depends on broken package lme4
-    "SJava" # broken build
-    "sjPlot" # depends on broken package nlopt
-    "smacof" # broken build
-    "SNAGEE" # build is broken
-    "snm" # depends on broken package nlopt
-    "sodium" # broken build
-    "soilphysics" # depends on broken package rpanel
-    "sortinghat" # broken build
-    "SoyNAM" # depends on broken package lme4
-    "spacom" # depends on broken package nlopt
-    "SparseLearner" # depends on broken package qgraph
-    "specificity" # depends on broken package nlopt
-    "specmine" # depends on broken package caret
-    "splm" # depends on broken package car
-    "spocc" # depends on broken package V8
-    "ssmrob" # depends on broken package nlopt
-    "StatMethRank" # broken build
-    "stepp" # depends on broken package nlopt
-    "stringgaussnet" # build is broken
-    "Surrogate" # depends on broken package nlopt
-    "svglite" # depends on broken package gdtools
-    "sybilSBML" # build is broken
-    "systemfit" # depends on broken package nlopt
-    "TcGSA" # depends on broken package nlopt
-    "TDMR" # depends on broken package nlopt
-    "TFBSTools" # depends on broken package DirichletMultinomial
-    "tigerstats" # depends on broken package nlopt
-    "TLBC" # depends on broken package caret
-    "tmle" # broken build
-    "tnam" # depends on broken package lme4
-    "tolBasis" # depends on broken package polynom
-    "translateSPSS2R" # depends on broken car
-    "TriMatch" # depends on broken package nlopt
-    "TSMySQL" # broken build
-    "tsoutliers" # broken build
-    "UBCRM" # broken build
-    "umx" # depends on broken package OpenMx
-    "uniftest" # broken build
-    "untb" # broken build
-    "userfriendlyscience" # depends on broken package nlopt
-    "V8" # build is broken
-    "varComp" # depends on broken package lme4
-    "varian" # build is broken
-    "variancePartition" # depends on broken package lme4
-    "VBmix" # broken build
-    "VIM" # depends on broken package nlopt
-    "VIMGUI" # depends on broken package nlopt
-    "vows" # depends on broken package nlopt
-    "webp" # build is broken
-    "wfe" # depends on broken package nlopt
-    "wordbankr" # depends on broken package RMySQL
-    "xergm" # depends on broken package nlopt
-    "xps" # build is broken
-    "ZeligChoice" # depends on broken package AER
-    "Zelig" # depends on broken package AER
-    "zetadiv" # depends on broken package nlopt
-    "zoib" # broken build
+    "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
+    "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
+    "ArrayExpressHTS"                 # build is broken
+    "arrayQualityMetrics"             # build is broken
+    "auRoc"                           # depends on broken package OpenMx-2.7.4
+    "BatchQC"                         # 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
+    "biomformat"                      # depends on broken package r-rhdf5-2.16.0
+    "biotools"                        # depends on broken package rpanel-1.1-3
+    "birte"                           # build is broken
+    "BiSEp"                           # build is broken
+    "BLCOP"                           # depends on broken package Rsymphony-0.1-26
+    "BMhyd"                           # depends on broken package animation-2.4
+    "BNSP"                            # build is broken
+    "BPEC"                            # depends on broken package animation-2.4
+    "BrailleR"                        # depends on broken package gridGraphics-0.1-5
+    "brainGraph"                      # build is broken
+    "brranching"                      # depends on broken package animation-2.4
+    "brr"                             # build is broken
+    "BRugs"                           # build is broken
+    "CADStat"                         # build is broken
+    "CampaR1"                         # depends on broken package r-bio3d-2.3-1
+    "canceR"                          # build is broken
+    "CardinalWorkflows"               # build is broken
+    "CARrampsOcl"                     # depends on broken package OpenCL-0.1-3
+    "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
+    "ChemmineDrugs"                   # depends on broken package ChemmineR-2.24.2
+    "ChemmineR"                       # build is broken
+    "chinese_misc"                    # build is broken
+    "ChIPQC"                          # depends on broken package r-DiffBind-2.0.9
+    "ChIPXpress"                      # build is broken
+    "ChIPXpressData"                  # build is broken
+    "choroplethr"                     # depends on broken package acs-2.0
+    "CHRONOS"                         # build is broken
+    "cleanEHR"                        # build is broken
+    "clickR"                          # depends on broken package gdtools-0.1.3
+    "clpAPI"                          # build is broken
+    "CNEr"                            # build is broken
+    "colormap"                        # depends on broken package V8-1.2
+    "colorscience"                    # build is broken
+    "compendiumdb"                    # depends on broken package RMySQL-0.10.9
+    "CONFESS"                         # depends on broken package r-flowCore-1.38.2
+    "CONS"                            # build is broken
+    "convevol"                        # depends on broken package animation-2.4
+    "CountClust"                      # build is broken
+    "CountsEPPM"                      # build is broken
+    "COUSCOus"                        # depends on broken package r-bio3d-2.3-1
+    "covr"                            # build is broken
+    "cplexAPI"                        # build is broken
+    "Crossover"                       # build is broken
+    "CrypticIBDcheck"                 # build is broken
+    "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
+    "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
+    "dataMaid"                        # build is broken
+    "dataone"                         # build is broken
+    "datapack"                        # build is broken
+    "dbConnect"                       # depends on broken package RMySQL-0.10.9
+    "DBKGrad"                         # depends on broken package rpanel-1.1-3
+    "DCM"                             # build is broken
+    "DDD"                             # depends on broken package animation-2.4
+    "deBInfer"                        # depends on broken package PBSddesolve-1.12.2
+    "DecisionCurve"                   # build is broken
+    "deepSNV"                         # build is broken
+    "DEGraph"                         # depends on broken package RCytoscape-1.21.1
+    "DEploid"                         # build is broken
+    "DiagrammeRsvg"                   # depends on broken package V8-1.2
+    "DiffBind"                        # build is broken
+    "diffHic"                         # depends on broken package r-csaw-1.6.1
+    "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
+    "dynr"                            # build is broken
+    "ecospat"                         # depends on broken package MigClim-1.6
+    "EGAD"                            # depends on broken package arrayQualityMetrics-3.28.2
+    "eiR"                             # depends on broken package ChemmineR-2.24.2
+    "emg"                             # build is broken
+    "envlpaster"                      # build is broken
+    "erpR"                            # depends on broken package rpanel-1.1-3
+    "euroMix"                         # build is broken
+    "evobiR"                          # depends on broken package animation-2.4
+    "exifr"                           # build is broken
+    "exprso"                          # build is broken
+    "fastR"                           # build is broken
+    "fdq"                             # depends on broken package gdtools-0.1.3
+    "Fgmutils"                        # depends on broken package gdtools-0.1.3
+    "flan"                            # build is broken
+    "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
+    "flowCHIC"                        # depends on broken package r-flowCore-1.38.2
+    "flowClean"                       # depends on broken package r-flowCore-1.38.2
+    "flowClust"                       # depends on broken package r-flowCore-1.38.2
+    "flowCore"                        # build is broken
+    "flowDensity"                     # depends on broken package flowCore-1.38.2
+    "flowDiv"                         # depends on broken package r-flowCore-1.38.2
+    "flowFit"                         # depends on broken package r-flowCore-1.38.2
+    "flowFitExampleData"              # depends on broken package r-flowCore-1.38.2
+    "flowFP"                          # depends on broken package r-flowCore-1.38.2
+    "flowMatch"                       # depends on broken package r-flowCore-1.38.2
+    "flowMeans"                       # depends on broken package r-flowCore-1.38.2
+    "flowMerge"                       # depends on broken package r-flowCore-1.38.2
+    "flowPeaks"                       # build is broken
+    "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
+    "flowStats"                       # depends on broken package r-flowCore-1.38.2
+    "flowTrans"                       # depends on broken package r-flowCore-1.38.2
+    "flowType"                        # depends on broken package r-flowCore-1.38.2
+    "flowUtils"                       # depends on broken package r-flowCore-1.38.2
+    "flowViz"                         # depends on broken package r-flowCore-1.38.2
+    "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
+    "gahgu133acdf"                    # build is broken
+    "gahgu133bcdf"                    # build is broken
+    "gahgu133plus2cdf"                # build is broken
+    "gahgu95av2cdf"                   # build is broken
+    "gahgu95bcdf"                     # build is broken
+    "gahgu95ccdf"                     # build is broken
+    "gahgu95dcdf"                     # build is broken
+    "gahgu95ecdf"                     # build is broken
+    "gamlss_demo"                     # depends on broken package rpanel-1.1-3
+    "gazepath"                        # build is broken
+    "gdtools"                         # build is broken
+    "GENE_E"                          # depends on broken package r-rhdf5-2.16.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
+    "gfcanalysis"                     # depends on broken package animation-2.4
+    "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
+    "ggiraph"                         # depends on broken package gdtools-0.1.3
+    "ggiraphExtra"                    # depends on broken package gdtools-0.1.3
+    "ggseas"                          # 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
+    "goldi"                           # build is broken
+    "googleformr"                     # build is broken
+    "gpg"                             # build is broken
+    "gpuR"                            # build is broken
+    "gputools"                        # depends on broken package cudatoolkit-8.0.61
+    "GraphPAC"                        # 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
+    "gunsales"                        # build is broken
+    "h2o"                             # build is broken
+    "h5vc"                            # depends on broken package r-rhdf5-2.16.0
+    "harrietr"                        # build is broken
+    "HDF5Array"                       # depends on broken package r-rhdf5-2.16.0
+    "healthyFlowData"                 # depends on broken package r-flowCore-1.38.2
+    "HierO"                           # build is broken
+    "HilbertVisGUI"                   # build is broken
+    "HiPLARM"                         # build is broken
+    "hisse"                           # depends on broken package animation-2.4
+    "homomorpheR"                     # depends on broken package sodium-0.4
+    "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
+    "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
+    "interactiveDisplay"              # build is broken
+    "ionicons"                        # depends on broken package rsvg-1.0
+    "IONiseR"                         # depends on broken package r-rhdf5-2.16.0
+    "ITGM"                            # depends on broken package gdtools-0.1.3
+    "jpmesh"                          # depends on broken package V8-1.2
+    "js"                              # depends on broken package V8-1.2
+    "jsonld"                          # depends on broken package V8-1.2
+    "jsonvalidate"                    # depends on broken package V8-1.2
+    "KoNLP"                           # build is broken
+    "largeList"                       # build is broken
+    "largeVis"                        # build is broken
+    "lawn"                            # depends on broken package V8-1.2
+    "LCMCR"                           # build is broken
+    "lefse"                           # build is broken
+    "lfe"                             # build is broken
+    "lgcp"                            # depends on broken package rpanel-1.1-3
+    "Libra"                           # build is broken
+    "libsoc"                          # build is broken
+    "link2GI"                         # depends on broken package r-sf-0.3-4
+    "LinRegInteractive"               # depends on broken package rpanel-1.1-3
+    "liquidSVM"                       # build is broken
+    "littler"                         # build is broken
+    "LowMACA"                         # depends on broken package MotIV-1.28.0
+    "lpsymphony"                      # build is broken
+    "lvnet"                           # depends on broken package OpenMx-2.7.4
+    "MafDb_1Kgenomes_phase3_hs37d5"   # build is broken
+    "mafs"                            # build is broken
+    "magick"                          # build is broken
+    "maGUI"                           # build is broken
+    "mapr"                            # depends on broken package V8-1.2
+    "mar1s"                           # build is broken
+    "MatrixRider"                     # depends on broken package CNEr-1.8.3
+    "MBESS"                           # depends on broken package OpenMx-2.7.4
+    "mBvs"                            # build is broken
+    "mcaGUI"                          # 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
+    "MeSH_Hsa_eg_db"                  # build is broken
+    "MeSH_Mmu_eg_db"                  # build is broken
+    "meshr"                           # depends on broken package r-MeSH.Hsa.eg.db-1.6.0
+    "Metab"                           # build is broken
+    "metagear"                        # build is broken
+    "MetaIntegrator"                  # depends on broken package RMySQL-0.10.9
+    "metaSEM"                         # depends on broken package OpenMx-2.7.4
+    "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
+    "MMDiff"                          # depends on broken package r-DiffBind-2.0.9
+    "mmnet"                           # build is broken
+    "MonetDBLite"                     # build is broken
+    "mongolite"                       # build is broken
+    "monogeneaGM"                     # depends on broken package animation-2.4
+    "MonoPhy"                         # depends on broken package animation-2.4
+    "motifbreakR"                     # depends on broken package MotIV-1.28.0
+    "motifStack"                      # depends on broken package MotIV-1.28.0
+    "MotIV"                           # build is broken
+    "mptools"                         # depends on broken package animation-2.4
+    "mrMLM"                           # build is broken
+    "mRMRe"                           # build is broken
+    "mscstexta4r"                     # build is broken
+    "mscsweblm4r"                     # build is broken
+    "MSeasyTkGUI"                     # build is broken
+    "MSGFgui"                         # depends on broken package MSGFplus-1.6.2
+    "MSGFplus"                        # build is broken
+    "multiDimBio"                     # depends on broken package gridGraphics-0.1-5
+    "multipanelfigure"                # depends on broken package gridGraphics-0.1-5
+    "munsellinterpol"                 # build is broken
+    "mutossGUI"                       # build is broken
+    "mvMORPH"                         # depends on broken package animation-2.4
+    "mvst"                            # build is broken
+    "ncdfFlow"                        # depends on broken package r-flowCore-1.38.2
+    "NCIgraph"                        # depends on broken package RCytoscape-1.21.1
+    "ndjson"                          # build is broken
+    "ndtv"                            # depends on broken package animation-2.4
+    "NetRep"                          # depends on broken package r-RhpcBLASctl-0.15-148
+    "nlts"                            # build is broken
+    "NORRRM"                          # build is broken
+    "odbc"                            # build is broken
+    "officer"                         # depends on broken package gdtools-0.1.3
+    "OpenCL"                          # build is broken
+    "opencpu"                         # depends on broken package r-protolite-1.5
+    "openCyto"                        # depends on broken package r-flowCore-1.38.2
+    "OpenMx"                          # build is broken
+    "optbdmaeAT"                      # build is broken
+    "optBiomarker"                    # depends on broken package rpanel-1.1-3
+    "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
+    "PathSelectMP"                    # build is broken
+    "PatternClass"                    # build is broken
+    "PBD"                             # depends on broken package animation-2.4
+    "PBSddesolve"                     # build is broken
+    "PBSmapping"                      # build is broken
+    "pcadapt"                         # depends on broken package vcfR-1.4.0
+    "pcaL1"                           # build is broken
+    "pcaPA"                           # build is broken
+    "pcrsim"                          # build is broken
+    "pdfsearch"                       # build is broken
+    "pdftools"                        # build is broken
+    "pd_genomewidesnp_6"              # build is broken
+    "permGPU"                         # build is broken
+    "PGA"                             # build is broken
+    "PGPC"                            # depends on broken package ChemmineR-2.24.2
+    "ph2bye"                          # depends on broken package animation-2.4
+    "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
+    "PhySortR"                        # depends on broken package animation-2.4
+    "phytools"                        # depends on broken package animation-2.4
+    "PICS"                            # build is broken
+    "PING"                            # depends on broken package PICS-2.16.0
+    "plateCore"                       # depends on broken package r-flowCore-1.38.2
+    "plfMA"                           # build is broken
+    "podkat"                          # build is broken
+    "PottsUtils"                      # depends on broken package BRugs-0.8-6
+    "powell"                          # build is broken
+    "pqsfinder"                       # depends on broken package r-flowCore-1.38.2
+    "prebs"                           # depends on broken package r-rhdf5-2.16.0
+    "PREDAsampledata"                 # depends on broken package gahgu133plus2cdf-2.2.1
+    "predictionInterval"              # depends on broken package OpenMx-2.7.4
+    "pRoloc"                          # build is broken
+    "pRolocGUI"                       # build is broken
+    "proteoQC"                        # build is broken
+    "protolite"                       # build is broken
+    "prototest"                       # build is broken
+    "PSAboot"                         # build is broken
+    "psbcGroup"                       # build is broken
+    "PythonInR"                       # build is broken
+    "qcmetrics"                       # build is broken
+    "QFRM"                            # build is broken
+    "qrqc"                            # build is broken
+    "qtbase"                          # build is broken
+    "qtpaint"                         # build is broken
+    "qtutils"                         # build is broken
+    "QUALIFIER"                       # depends on broken package r-flowCore-1.38.2
+    "QuartPAC"                        # build is broken
+    "QuasR"                           # build is broken
+    "QUBIC"                           # build is broken
+    "QVM"                             # build is broken
+    "raincpc"                         # build is broken
+    "rainfreq"                        # build is broken
+    "RAM"                             # depends on broken package animation-2.4
+    "RamiGO"                          # depends on broken package RCytoscape-1.21.1
+    "randomcoloR"                     # depends on broken package V8-1.2
+    "randstr"                         # build is broken
+    "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
+    "rchess"                          # depends on broken package V8-1.2
+    "RchyOptimyx"                     # depends on broken package r-flowCore-1.38.2
+    "RcmdrPlugin_FuzzyClust"          # build is broken
+    "RcmdrPlugin_PcaRobust"           # build is broken
+    "Rcpi"                            # depends on broken package ChemmineR-2.24.2
+    "Rcplex"                          # build is broken
+    "RcppAPT"                         # build is broken
+    "RcppGetconf"                     # build is broken
+    "RcppOctave"                      # build is broken
+    "RcppRedis"                       # build is broken
+    "rcqp"                            # build is broken
+    "rcrypt"                          # build is broken
+    "RCytoscape"                      # build is broken
+    "rDEA"                            # build is broken
+    "RDieHarder"                      # build is broken
+    "REBayes"                         # depends on broken package Rmosek-1.2.5.1
+    "recluster"                       # depends on broken package animation-2.4
+    "redland"                         # build is broken
+    "remoter"                         # build is broken
+    "repijson"                        # depends on broken package V8-1.2
+    "replicationInterval"             # depends on broken package OpenMx-2.7.4
+    "ReporteRs"                       # depends on broken package gdtools-0.1.3
+    "ReQON"                           # depends on broken package seqbias-1.20.0
+    "RforProteomics"                  # depends on broken package interactiveDisplay-1.10.2
+    "rgbif"                           # depends on broken package V8-1.2
+    "Rgnuplot"                        # build is broken
+    "rgp"                             # build is broken
+    "rgpui"                           # depends on broken package rgp-0.4-1
+    "rhdf5"                           # build is broken
+    "RhpcBLASctl"                     # build is broken
+    "ridge"                           # build is broken
+    "rjade"                           # depends on broken package V8-1.2
+    "rJPSGCS"                         # build is broken
+    "RKEEL"                           # depends on broken package RKEELjars-1.0.15
+    "RKEELjars"                       # build is broken
+    "Rknots"                          # depends on broken package r-bio3d-2.3-1
+    "rLindo"                          # build is broken
+    "rlo"                             # depends on broken package PythonInR-0.1-3
+    "RMallow"                         # build is broken
+    "rmapshaper"                      # depends on broken package V8-1.2
+    "rMAT"                            # build is broken
+    "Rmosek"                          # build is broken
+    "RMySQL"                          # build is broken
+    "RnavGraph"                       # build is broken
+    "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
+    "rpanel"                          # build is broken
+    "rpg"                             # build is broken
+    "Rphylopars"                      # depends on broken package animation-2.4
+    "Rpoppler"                        # build is broken
+    "RQuantLib"                       # build is broken
+    "RSAP"                            # build is broken
+    "rsbml"                           # build is broken
+    "RSCABS"                          # build is broken
+    "rscala"                          # build is broken
+    "Rsomoclu"                        # build is broken
+    "rsparkling"                      # depends on broken package h2o-3.10.3.6
+    "rsvg"                            # build is broken
+    "Rsymphony"                       # build is broken
+    "rtable"                          # depends on broken package gdtools-0.1.3
+    "rTANDEM"                         # build is broken
+    "Rtextrankr"                      # build is broken
+    "rUnemploymentData"               # depends on broken package acs-2.0
+    "rvg"                             # depends on broken package gdtools-0.1.3
+    "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
+    "scran"                           # depends on broken package r-rhdf5-2.16.0
+    "SDD"                             # depends on broken package rpanel-1.1-3
+    "seasonal"                        # build is broken
+    "seasonalview"                    # build is broken
+    "Sejong"                          # build is broken
+    "SemiCompRisks"                   # build is broken
+    "semtree"                         # depends on broken package OpenMx-2.7.4
+    "seqbias"                         # build is broken
+    "SeqGrapheR"                      # build is broken
+    "seqTools"                        # build is broken
+    "sf"                              # build is broken
+    "shazam"                          # build is broken
+    "shinyTANDEM"                     # build is broken
+    "SICtools"                        # build is broken
+    "SigTree"                         # depends on broken package r-rhdf5-2.16.0
+    "SimInf"                          # build is broken
+    "simsalapar"                      # build is broken
+    "smapr"                           # depends on broken package r-rhdf5-2.16.0
+    "SnakeCharmR"                     # build is broken
+    "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
+    "srd"                             # depends on broken package animation-2.4
+    "SSDM"                            # build is broken
+    "stagePop"                        # depends on broken package PBSddesolve-1.12.2
+    "Starr"                           # build is broken
+    "stream"                          # depends on broken package animation-2.4
+    "streamMOA"                       # depends on broken package animation-2.4
+    "stremr"                          # build is broken
+    "subspaceMOA"                     # depends on broken package animation-2.4
+    "svglite"                         # depends on broken package gdtools-0.1.3
+    "sybilSBML"                       # 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
+    "textreadr"                       # build is broken
+    "textTinyR"                       # build is broken
+    "TFBSTools"                       # depends on broken package CNEr-1.8.3
+    "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
+    "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
+    "UBCRM"                           # build is broken
+    "uHMM"                            # build is broken
+    "umx"                             # depends on broken package OpenMx-2.7.4
+    "userfriendlyscience"             # depends on broken package OpenMx-2.7.4
+    "V8"                              # build is broken
+    "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
+    "webp"                            # build is broken
+    "wordbankr"                       # depends on broken package RMySQL-0.10.9
+    "x13binary"                       # build is broken
+    "x_ent"                           # depends on broken package r-protolite-1.5
+    "xps"                             # build is broken
+    "xslt"                            # build is broken
+    "zoon"                            # build is broken
   ];
 
   otherOverrides = old: new: {

From 4b02bfb5ad618dd3fa3c3268f74a21299db14589 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 6 Mar 2017 20:49:01 -0600
Subject: [PATCH 1864/3449] dogecoin: 1.8.2 -> 1.10.0

---
 pkgs/applications/altcoins/dogecoin.nix | 28 ++++++++++---------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index 10bf5860834e..37fc1bde3142 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -1,4 +1,4 @@
-{ stdenv , fetchurl
+{ stdenv , fetchFromGitHub
 , pkgconfig, autoreconfHook
 , db5, openssl, boost, zlib, miniupnpc
 , glib, protobuf, utillinux, qt4, qrencode
@@ -8,26 +8,20 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "1.8.2";
+  version = "1.10.0";
 
-  src = fetchurl {
-    url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz";
-    sha256 = "17jxsxsrsz3qy2hxdpw78vcbnnd0nq614iy42ypzhw4pdpz0s1l7";
+  src = fetchFromGitHub {
+    owner = "dogecoin";
+    repo = "dogecoin";
+    rev = "v${version}";
+    sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy";
   };
 
-  buildInputs = [ autoreconfHook pkgconfig openssl
-                  db5 openssl utillinux protobuf boost zlib miniupnpc ]
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db5 openssl utillinux 
+                  protobuf boost zlib miniupnpc ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  # BSD DB5 location
-  patchPhase = ''
-    sed -i \
-      -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db5}/include",g' \
-      -e 's,BDB_LIBS=$,BDB_LIBS="-L${db5}/lib",g' \
-      -e 's,bdbdirlist=$,bdbdirlist="${db5}/include",g' \
-      src/m4/dogecoin_find_bdb51.m4
-  '';
-
   configureFlags = [ "--with-incompatible-bdb"
                      "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui" ];
@@ -43,6 +37,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.dogecoin.com/;
     license = licenses.mit;
     maintainers = with maintainers; [ edwtjo offline AndersonTorres ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
   };
 }

From d76db9315528607e8e39b18effaa859458d8fc77 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 6 Mar 2017 20:55:31 -0600
Subject: [PATCH 1865/3449] dogecoin: cosmetic change

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

diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index 37fc1bde3142..fc70302ab3c1 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -6,7 +6,6 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-
   name = "dogecoin" + (toString (optional (!withGui) "d")) + "-" + version;
   version = "1.10.0";
 
@@ -14,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "dogecoin";
     repo = "dogecoin";
     rev = "v${version}";
-    sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy";
+    sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvyt chec";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From d7674dabba39d21f24578d414da926d74a8ceb17 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 7 Mar 2017 15:08:55 +0100
Subject: [PATCH 1866/3449] phpfpm service: fix phpOptions

Broken due to #23216.
---
 nixos/modules/services/web-servers/phpfpm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 488bd3fe0ef1..846dfbb587f5 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -29,7 +29,7 @@ let
     inherit (cfg) phpPackage phpOptions;
     passAsFile = [ "phpOptions" ];
   } ''
-    cat $phpPackage/etc/php.ini $phpOptionsFile > $out
+    cat $phpPackage/etc/php.ini $phpOptionsPath > $out
   '';
 
 in {

From a9a706770a344f872035d05af7316064aa6390f5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 25 Dec 2016 14:54:45 +0200
Subject: [PATCH 1867/3449] grub2: Make EFI grub work on aarch64

---
 pkgs/tools/misc/grub/2.0x.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index eef1ac472280..7a70f2bdbff3 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -12,12 +12,21 @@ let
     "x86_64-linux".target = "i386";
   };
 
-  efiSystems = {
+  efiSystemsBuild = {
     "i686-linux".target = "i386";
     "x86_64-linux".target = "x86_64";
+    "aarch64-linux".target = "aarch64";
   };
 
-  canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
+  # For aarch64, we need to use '--target=aarch64-efi' when building,
+  # but '--target=arm64-efi' when installing. Insanity!
+  efiSystemsInstall = {
+    "i686-linux".target = "i386";
+    "x86_64-linux".target = "x86_64";
+    "aarch64-linux".target = "arm64";
+  };
+
+  canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystemsBuild);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
   version = "2.x-2015-11-16";
@@ -89,11 +98,11 @@ stdenv.mkDerivation rec {
   patches = [ ./fix-bash-completion.patch ];
 
   configureFlags = optional zfsSupport "--enable-libzfs"
-    ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ];
+    ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ];
 
   # save target that grub is compiled for
   grubTarget = if efiSupport
-               then "${efiSystems.${stdenv.system}.target}-efi"
+               then "${efiSystemsInstall.${stdenv.system}.target}-efi"
                else if inPCSystems
                     then "${pcSystems.${stdenv.system}.target}-pc"
                     else "";

From 1af3a9854f2353616873c330922c9879157f0bb5 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 7 Mar 2017 13:09:49 +0100
Subject: [PATCH 1868/3449] graylog: 2.2.1 -> 2.2.2

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index 68ee65159954..da7af7ef66f6 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.1";
+  version = "2.2.2";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "19kwg6yn2bx9nk813d7z1mv5j375iy2qvpcvwm8hp242g13j5cy7";
+    sha256 = "1d6fbyc9m2dkmlv03w3b1n8vq6sga888ag1k55mq3rgn4ba1kx26";
   };
 
   dontBuild = true;

From 32eecf98777f5cc2ee05c27078d47357f7c8fdce Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 7 Mar 2017 15:40:40 +0100
Subject: [PATCH 1869/3449] memtest86Plus: fix runtime errors with fortify
 hardening

fixes #6630
---
 pkgs/tools/misc/memtest86+/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index 77149a179900..5b4044f1891c 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I. -std=gnu90";
 
-  hardeningDisable = [ "stackprotector" "pic" ];
+  hardeningDisable = [ "fortify" "stackprotector" "pic" ];
 
   buildFlags = "memtest.bin";
 

From e0908699ff0015f38dc3cdb5b53a69b63f3f082b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 7 Mar 2017 15:36:55 +0100
Subject: [PATCH 1870/3449] haskell-QuickCheck: fix build with ghc-7.6.x

---
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

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 150d38dbbf1b..27fed51e6fc8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -100,8 +100,12 @@ self: super: {
   semigroups = addBuildDepends super.semigroups (with self; [bytestring-builder nats tagged unordered-containers transformers]);
   lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
   distributive = addBuildDepend super.distributive self.semigroups;
+  QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
 
   # Haddock doesn't cope with the new markup.
   bifunctors = dontHaddock super.bifunctors;
 
+  # Breaks a dependency cycle between QuickCheck and semigroups
+  unordered-containers = dontCheck super.unordered-containers;
+
 }

From cb3bfc97175d62b0298c279b007fb48936f9cc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Balzarotti?= <anothersms@gmail.com>
Date: Fri, 3 Mar 2017 13:39:52 +0100
Subject: [PATCH 1871/3449] qnotero: fix #23438

---
 pkgs/applications/office/qnotero/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix
index 5076a8f586e3..ad571cd8b186 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -18,15 +18,10 @@ python3Packages.buildPythonPackage rec {
 
   patchPhase = ''
       substituteInPlace ./setup.py \
-        --replace "/usr/share" "$out/usr/share"
+        --replace "/usr/share" "usr/share"
 
       substituteInPlace ./libqnotero/_themes/default.py \
-        --replace "/usr/share" "$out/usr/share"
-  '';
-
-  postInstall = ''
-      mkdir -p "$out/usr/share/qnotero"
-      mv resources "$out/usr/share/qnotero"
+         --replace "/usr/share" "$out/usr/share"
   '';
 
   meta = {

From e50203bfde29065fd7d1f047d9e3797f5c302b76 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 7 Mar 2017 16:25:09 +0000
Subject: [PATCH 1872/3449] yarn: 0.21.3 -> 0.22.0

---
 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 93d9422a759a..770eb9cc78b4 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.21.3";
+  version = "0.22.0";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0blcaick4p82d64cy9ip9rnbysd4194d77479hz2bx4iq6cdp6wa";
+    sha256 = "1hs4fqjj9rg47ipcagpdk3grh7aa0ls3vsxq4q20d5hb43s9n5gs";
   };
 
   buildInputs = [makeWrapper nodejs];

From 0aa29fa4d8a8bf0e96e83993a624f61fab73c59f Mon Sep 17 00:00:00 2001
From: NWDD <nwdd+nixos@no.team>
Date: Sun, 5 Mar 2017 16:38:55 +0100
Subject: [PATCH 1873/3449] gitkraken: init at 2.1.0

---
 .../version-management/gitkraken/default.nix  | 74 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/applications/version-management/gitkraken/default.nix

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
new file mode 100644
index 000000000000..70ca7a74b236
--- /dev/null
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -0,0 +1,74 @@
+{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.mkDerivation rec {
+  name = "gitkraken-${version}";
+  version = "2.1.0";
+
+  src = fetchurl {
+    url = "https://release.gitkraken.com/linux/v${version}.tar.gz";
+    sha256 = "56b5657f5c13fa1d8f6b7b9331194cbc8c48c0b913e5f0fb561d0e9af82f7999";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath [
+    stdenv.cc.cc.lib
+    curl
+    udev
+    libX11
+    libXext
+    libXcursor
+    libXi
+    glib
+    libXScrnSaver
+    libxkbfile
+    libXtst
+    nss
+    nspr
+    cups
+    alsaLib
+    expat
+    gdk_pixbuf
+    dbus
+    libXdamage
+    libXrandr
+    atk
+    pango
+    cairo
+    freetype
+    fontconfig
+    libXcomposite
+    libXfixes
+    libXrender
+    gtk2
+    gnome2.GConf
+    libgnome_keyring
+  ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p "$out/opt/gitkraken"
+    cp -r ./* "$out/opt/gitkraken"
+    fixupPhase
+    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"
+    mkdir "$out/bin"
+    ln -s "$out/opt/gitkraken/gitkraken" "$out/bin/gitkraken"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://www.gitkraken.com/;
+    description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 43743b5c83bc..5457886d5307 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1918,6 +1918,8 @@ with pkgs;
 
   gitinspector = callPackage ../applications/version-management/gitinspector { };
 
+  gitkraken = callPackage ../applications/version-management/gitkraken { };
+
   gitlab = callPackage ../applications/version-management/gitlab { };
 
   gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };

From feab711f84f32ff92978b971585026ed247e3a98 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 1 Mar 2017 11:05:23 +0100
Subject: [PATCH 1874/3449] lilyterm-git: init at 2017-01-06

The latest stable release is quite old (2013-02) and many improvements have been
made in the meantime.
---
 pkgs/applications/misc/lilyterm/default.nix | 40 ++++++++++++++++-----
 pkgs/top-level/all-packages.nix             |  5 +++
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 2fe07d8c5dd0..2fa4ba9ae644 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -1,17 +1,39 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchFromGitHub
 , pkgconfig
 , autoconf, automake, intltool, gettext
-, gtk, vte }:
+, gtk, vte
 
+# "stable" or "git"
+, flavour ? "stable"
+}:
+
+assert flavour == "stable" || flavour == "git";
+
+let
+  stuff =
+    if flavour == "stable"
+    then rec {
+        version = "0.9.9.4";
+        src = fetchurl {
+          url = "http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz";
+          sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp";
+        };
+      }
+    else {
+        version = "2017-01-06";
+        src = fetchFromGitHub {
+          owner = "Tetralet";
+          repo = "lilyterm";
+          rev = "20cce75d34fd24901c9828469d4881968183c389";
+          sha256 = "0am0y65674rfqy69q4qz8izb8cq0isylr4w5ychi40jxyp68rkv2";
+        };
+      };
+
+in
 stdenv.mkDerivation rec {
-
   name = "lilyterm-${version}";
-  version = "0.9.9.4";
 
-  src = fetchurl {
-    url = "http://lilyterm.luna.com.tw/file/${name}.tar.gz";
-    sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp";
-  };
+  inherit (stuff) src version;
 
   buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ];
 
@@ -29,7 +51,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://lilyterm.luna.com.tw/;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres profpatsch ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2641e4e39d4..2daf5c8338ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14333,6 +14333,11 @@ with pkgs;
   lilyterm = callPackage ../applications/misc/lilyterm {
     inherit (gnome2) vte;
     gtk = gtk2;
+    flavour = "stable";
+  };
+
+  lilyterm-git = lilyterm.override {
+    flavour = "git";
   };
 
   lumail = callPackage ../applications/networking/mailreaders/lumail { };

From db23fe1581dc99253113fe06444c65b262284f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 7 Mar 2017 18:13:59 +0100
Subject: [PATCH 1875/3449] haskell: add justStaticExecutables combinator

---
 pkgs/development/haskell-modules/lib.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index ab817b7b2a16..2093ec2b218b 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -76,6 +76,14 @@ rec {
     fixupPhase = ":";
   });
 
+  # link executables statically against haskell libs to reduce closure size
+  justStaticExecutables = drv: overrideCabal drv (drv: {
+    enableSharedExecutables = false;
+    isLibrary = false;
+    doHaddock = false;
+    postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
+  });
+
   buildFromSdist = pkg: pkgs.lib.overrideDerivation pkg (drv: {
     unpackPhase = let src = sdistTarball pkg; tarname = "${pkg.pname}-${pkg.version}"; in ''
       echo "Source tarball is at ${src}/${tarname}.tar.gz"

From f67a89e2484bd0c58d3860276264adb65939aaa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 7 Mar 2017 18:15:07 +0100
Subject: [PATCH 1876/3449] haskell: use new justStaticExecutables and add
 purescript

---
 pkgs/top-level/all-packages.nix | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2641e4e39d4..54ad012ed9e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3287,14 +3287,9 @@ with pkgs;
 
   pal = callPackage ../tools/misc/pal { };
 
-  pandoc = haskell.lib.overrideCabal haskellPackages.pandoc (drv: {
+  pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: {
     configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"];
     buildTools = drv.buildTools or [] ++ [haskellPackages.hsb2hs];
-    enableSharedExecutables = false;
-    enableSharedLibraries = false;
-    isLibrary = false;
-    doHaddock = false;
-    postFixup = "rm -rf $out/lib $out/nix-support $out/share";
   });
 
   panomatic = callPackage ../tools/graphics/panomatic { };
@@ -5132,15 +5127,12 @@ with pkgs;
 
   cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
 
-  stack = haskell.lib.overrideCabal haskellPackages.stack (drv: {
-    enableSharedExecutables = false;
-    isLibrary = false;
-    doHaddock = false;
-    postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
-  });
+  stack = haskell.lib.justStaticExecutables haskellPackages.stack;
 
   all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
 
+  purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
+
   inherit (ocamlPackages) haxe;
 
   hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { };
@@ -6756,12 +6748,7 @@ with pkgs;
 
   shards = callPackage ../development/tools/build-managers/shards { };
 
-  shellcheck = haskell.lib.overrideCabal haskellPackages.ShellCheck (drv: {
-    isLibrary = false;
-    enableSharedExecutables = false;
-    doHaddock = false;
-    postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
-  });
+  shellcheck = haskell.lib.justStaticExecutables haskellPackages.ShellCheck;
 
   shncpd = callPackage ../tools/networking/shncpd { };
 
@@ -13020,13 +13007,8 @@ with pkgs;
 
   cyclone = callPackage ../applications/audio/pd-plugins/cyclone  { };
 
-  darcs = haskell.lib.overrideCabal haskellPackages.darcs (drv: {
+  darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: {
     configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"];
-    enableSharedExecutables = false;
-    enableSharedLibraries = false;
-    isLibrary = false;
-    doHaddock = false;
-    postFixup = "rm -rf $out/lib $out/nix-support $out/share";
   });
 
   darktable = callPackage ../applications/graphics/darktable {

From ce03c08567a87d968bb535d8786e39b8ffafaa2b Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Tue, 7 Mar 2017 11:50:45 -0600
Subject: [PATCH 1877/3449] haproxy: build on darwin

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

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 7d9c00ecaaf3..1b917019662a 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl zlib ];
 
-  # TODO: make it work on darwin/bsd as well
+  # TODO: make it work on bsd as well
   preConfigure = ''
-    export makeFlags="TARGET=${if stdenv.isSunOS then "solaris" else "linux2628"} PREFIX=$out USE_OPENSSL=yes USE_ZLIB=yes"
+    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"}"
   '';
 
   meta = {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://haproxy.1wt.eu;
     maintainers = [ stdenv.lib.maintainers.garbas ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with stdenv.lib.platforms; linux ++ darwin;
     license = stdenv.lib.licenses.gpl2;
   };
 }

From 032de64e0fd10650b0d432cbc2921486755576fc Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Mon, 6 Mar 2017 02:46:42 +0100
Subject: [PATCH 1878/3449] haskell: ghc710x packages: remove superflous
 configuration for lens

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 54cd16957edc..ee62cf64fec6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -202,7 +202,7 @@ self: super: {
   hoauth2 = overrideCabal super.hoauth2 (drv: { testDepends = (drv.testDepends or []) ++ [ self.wai self.warp ]; });
   hslogger = addBuildDepend super.hslogger self.HUnit;
   intervals = addBuildDepends super.intervals (with self; [doctest QuickCheck]);
-  lens = addBuildDepends super.lens (with self; [doctest generic-deriving nats simple-reflect]);
+  lens = addBuildDepend super.lens self.generic-deriving;
   optparse-applicative = addBuildDepend super.optparse-applicative self.semigroups;
   QuickCheck = addBuildDepend super.QuickCheck self.semigroups;
   semigroups = addBuildDepends super.semigroups (with self; [hashable tagged text unordered-containers]);

From 0f72dee0002ff94e1f1620b5cd56c8cb985b0dff Mon Sep 17 00:00:00 2001
From: NWDD <nwdd+nixos@no.team>
Date: Tue, 7 Mar 2017 18:08:43 +0100
Subject: [PATCH 1879/3449] add xnwdd <Guillermo NWDD> as a maintainer

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ef64a9b53c6f..0ffca05180f9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -354,6 +354,7 @@
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
   nthorne = "Niklas Thörne <notrupertthorne@gmail.com>";
+  xnwdd = "Guillermo NWDD <nwdd+nixos@no.team>";
   obadz = "obadz <obadz-nixos@obadz.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";

From 82aa79d57fd558ff6ba295c65502cd315556d915 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Tue, 7 Mar 2017 20:42:38 +0100
Subject: [PATCH 1880/3449] haskell: ghcjs shims: dc034a0 -> b970152

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

diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix
index 0da50570bf59..fa706699449a 100644
--- a/pkgs/development/compilers/ghcjs/shims.nix
+++ b/pkgs/development/compilers/ghcjs/shims.nix
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "ghcjs";
   repo = "shims";
-  rev = "dc034a035aa73db2c5be34145732090bd74c1b57";
-  sha256 = "18r8kf7g7d2n0rhwcgiz9gsgdmgln1nmwwyj347bpn4zh17qlkqa";
+  rev = "b97015229c58eeab7c1d0bb575794b14a9f6efca";
+  sha256 = "1p5adkqvmb1gsv9hnn3if0rdpnaq3v9a1zkfdy282yw05jaaaggz";
 }

From d95f21f6a18b77ae503902325af84256369ea3d1 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Tue, 7 Mar 2017 15:08:02 -0500
Subject: [PATCH 1881/3449] racket: add readline support

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 6f3df4e866d6..72217a860b4d 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeFontsConf, makeWrapper
 , cairo, coreutils, fontconfig, freefont_ttf
-, glib, gmp, gtk2, libffi, libjpeg, libpng
-, libtool, mpfr, openssl, pango, poppler
+, glib, gmp, gtk2, libedit, libffi, libjpeg
+, libpng, libtool, mpfr, openssl, pango, poppler
 , readline, sqlite
 , disableDocs ? true
 }:
@@ -18,6 +18,7 @@ let
     glib
     gmp
     gtk2
+    libedit
     libjpeg
     libpng
     mpfr

From ba8b6b4a7a8b4c547fd77ac373356a657a2d96c6 Mon Sep 17 00:00:00 2001
From: Neil Mayhew <neil@neil.mayhew.name>
Date: Mon, 6 Mar 2017 21:08:24 -0700
Subject: [PATCH 1882/3449] inetutils: Add patch for Canadian TLD server

Cherry-picked from upstream (inetutils-1_9_4-31-g73e2811).

Could be a long time before a new inetutils release is made.
vcunat amended the patch to apply.
---
 pkgs/tools/networking/inetutils/default.nix   |  2 ++
 .../whois-Update-Canadian-TLD-server.patch    | 27 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 9ca2eab20aba..3a6e9b625b87 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy";
   };
 
+  patches = [ ./whois-Update-Canadian-TLD-server.patch ];
+
   buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ ];
 
   configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include";
diff --git a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
new file mode 100644
index 000000000000..d63d4e29daf0
--- /dev/null
+++ b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch
@@ -0,0 +1,27 @@
+From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001
+From: Mats Erik Andersson <gnu@gisladisker.se>
+Date: Thu, 2 Mar 2017 15:38:38 +0100
+Subject: [PATCH] whois: Update Canadian TLD server.
+Content-Type: text/plain; charset=utf-8
+
+---
+ ChangeLog           | 8 ++++++++ (OMITTED)
+ whois/tld_serv_list | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/whois/tld_serv_list b/whois/tld_serv_list
+index 056efcf..91697b8 100644
+--- a/whois/tld_serv_list
++++ b/whois/tld_serv_list
+@@ -81,7 +81,7 @@
+ #.bw			# NIC? www.botsnet.bw
+ #.by	NONE		# NIC? http://unibel.by www.open.by
+ .bz	NONE		# http://www.psg.com/dns/bz/
+-.ca	whois.cdnnet.ca
++.ca	whois.cira.ca
+ .cc	whois.nic.cc
+ .cd	WEB http://www.nic.cd/database/cd/
+ #.cf	NONE		# NIC? http://www.socatel.intnet.cf
+-- 
+2.10.0
+

From ac0021ce53d2f9d8b26aa5374ccac1cc3e4b270d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 7 Mar 2017 21:41:49 +0100
Subject: [PATCH 1883/3449] cassandra_2_2: init at 2.2.9

---
 pkgs/servers/nosql/cassandra/2.2.nix | 6 ++++++
 pkgs/top-level/all-packages.nix      | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/servers/nosql/cassandra/2.2.nix

diff --git a/pkgs/servers/nosql/cassandra/2.2.nix b/pkgs/servers/nosql/cassandra/2.2.nix
new file mode 100644
index 000000000000..b467fcfdff5b
--- /dev/null
+++ b/pkgs/servers/nosql/cassandra/2.2.nix
@@ -0,0 +1,6 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  version = "2.2.9";
+  sha256 = "1wc2l8l7i43r0yc6qqi3wj4pm0969kjkh2pgx80wglzxm7275hv5";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2daf5c8338ff..34c48c592130 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10405,6 +10405,7 @@ with pkgs;
   cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { };
   cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { };
   cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { };
+  cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { };
   cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { };
   cassandra = cassandra_3_0;
 

From 17b64e892976e76fba1951fd9087eeccb07b7177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 7 Mar 2017 21:48:18 +0100
Subject: [PATCH 1884/3449] mesa: maintenance 17.0.0 -> 17.0.1

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index b36316f72f4e..7bedc189f030 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -27,7 +27,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then
 else
 
 let
-  version = "17.0.0";
+  version = "17.0.1";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -37,11 +37,12 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     urls = [
+      "ftp://ftp.freedesktop.org/pub/mesa/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
       "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 = "10c4cvm6hhdch0idh2kn7qv1dq6zlw97sc3pz7bssn81f1ckvnrr";
+    sha256 = "96fd70ef5f31d276a17e424e7e1bb79447ccbbe822b56844213ef932e7ad1b0c";
   };
 
   prePatch = "patchShebangs .";

From e965d8aa1c7be58f6a07ba9d9f3c0370dcce6f94 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 7 Mar 2017 21:54:13 +0100
Subject: [PATCH 1885/3449] cassandra: remove old branches 1.2 and 2.0

These are no longer supported upstream.
---
 pkgs/servers/nosql/cassandra/1.2.nix | 6 ------
 pkgs/servers/nosql/cassandra/2.0.nix | 6 ------
 pkgs/top-level/all-packages.nix      | 2 --
 3 files changed, 14 deletions(-)
 delete mode 100644 pkgs/servers/nosql/cassandra/1.2.nix
 delete mode 100644 pkgs/servers/nosql/cassandra/2.0.nix

diff --git a/pkgs/servers/nosql/cassandra/1.2.nix b/pkgs/servers/nosql/cassandra/1.2.nix
deleted file mode 100644
index 87cb4a11f9ab..000000000000
--- a/pkgs/servers/nosql/cassandra/1.2.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "1.2.19";
-  sha256 = "0zkq3ggpk8ra2siar43vmrn6lmvn902p1g2lrgb46ak1vii6w30w";
-})
diff --git a/pkgs/servers/nosql/cassandra/2.0.nix b/pkgs/servers/nosql/cassandra/2.0.nix
deleted file mode 100644
index 68bee0c124ba..000000000000
--- a/pkgs/servers/nosql/cassandra/2.0.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "2.0.16";
-  sha256 = "1fpvgmakmxy1lnygccpc32q53pa36bwy0lqdvb6hsifkxymdw8y5";
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34c48c592130..34027760b46a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10402,8 +10402,6 @@ with pkgs;
 
   cadvisor = callPackage ../servers/monitoring/cadvisor { };
 
-  cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { };
-  cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { };
   cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { };
   cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { };
   cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { };

From 0bd211d84f66975380c35386b7b19a69d1beff44 Mon Sep 17 00:00:00 2001
From: Daniel Ehlers <ehlers@rz.uni-kiel.de>
Date: Mon, 6 Mar 2017 16:41:02 +0100
Subject: [PATCH 1886/3449] ddclient: Make verbose logging deactivatable.

---
 .../modules/services/networking/ddclient.nix  | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 5928203368d2..28c96a9baefc 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -7,7 +7,7 @@ let
 
   stateDir = "/var/spool/ddclient";
   ddclientUser = "ddclient";
-  ddclientFlags = "-foreground -verbose -noquiet -file ${config.services.ddclient.configFile}";
+  ddclientFlags = "-foreground -file ${config.services.ddclient.configFile}";
   ddclientPIDFile = "${stateDir}/ddclient.pid";
 
 in
@@ -102,6 +102,22 @@ in
           Method to determine the IP address to send to the dynamic DNS provider.
         '';
       };
+
+      verbose = mkOption {
+        default = true;
+        type = bool;
+        description = ''
+          Print verbose information.
+        '';
+      };
+
+      quiet = mkOption {
+        default = false;
+        type = bool;
+        description = ''
+          Print no messages for unnecessary updates.
+        '';
+      };
     };
   };
 
@@ -136,6 +152,8 @@ in
           lib.optionalString (server != "") "server=${server}"}
         ssl=${if config.services.ddclient.ssl then "yes" else "no"}
         wildcard=YES
+        quiet=${if config.services.ddclient.quiet then "yes" else "no"}
+        verbose=${if config.services.ddclient.verbose then "yes" else "no"}
         ${config.services.ddclient.domain}
         ${config.services.ddclient.extraConfig}
       '';

From e206d5ab63b64b377c22488ac0b33481bef9bf21 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 7 Mar 2017 22:15:13 +0100
Subject: [PATCH 1887/3449] dogecoin: fix sha256

---
 pkgs/applications/altcoins/dogecoin.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index fc70302ab3c1..d8df6dd8349a 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "dogecoin";
     repo = "dogecoin";
     rev = "v${version}";
-    sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvyt chec";
+    sha256 = "16q3rldj04hkzzjd23h0knszqr5dgixizy4iyc129mz8wa8pbnvy";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From f9f31ff83e4af66716ce0bbd23d28be10838b107 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 6 Mar 2017 21:19:20 +0100
Subject: [PATCH 1888/3449] pdnsd: fix darwin build

---
 pkgs/tools/networking/pdnsd/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
index b1e7e92e815c..10c004ecd94f 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -14,11 +14,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-ipv6" ];
 
-  meta = { 
+  # fix ipv6 on darwin
+  CPPFLAGS = "-D__APPLE_USE_RFC_3542";
+
+  meta = with stdenv.lib; {
     description = "Permanent DNS caching";
-    homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    homepage = http://members.home.nl/p.a.rombouts/pdnsd;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [viric];
   };
 }

From 9ea35eae7a5aee9159735ca662b65c8552aec8dc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Mar 2017 00:29:20 +0100
Subject: [PATCH 1889/3449] nixos/users-groups: chown home on createHome

Fixes #23619.
---
 nixos/modules/config/update-users-groups.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index cbbe216e5a17..4ca8a83554ad 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -177,7 +177,7 @@ foreach my $u (@{$spec->{users}}) {
     }
 
     # Create a home directory.
-    if ($u->{createHome} && ! -e $u->{home}) {
+    if ($u->{createHome}) {
         make_path($u->{home}, { mode => 0700 }) if ! -e $u->{home};
         chown $u->{uid}, $u->{gid}, $u->{home};
     }

From 22c265182f9e0d543de0fe46a809180ff2021b85 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 6 Mar 2017 13:23:45 +0100
Subject: [PATCH 1890/3449] networking/bonds: fix examples

After the change of the bonding options, the examples were not quite correct.
The diff is over-the top because the new `let` needs everything indented.

Also add a small docstring to the `networkd` attr in the networking test.
---
 nixos/modules/tasks/network-interfaces.nix | 181 +++++++++++----------
 nixos/tests/networking.nix                 |   4 +-
 2 files changed, 94 insertions(+), 91 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 42a1a5a2332d..6467259766ea 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -560,101 +560,102 @@ in
 
     };
 
-    networking.bonds = mkOption {
-      default = { };
-      example = literalExample {
-        bond0 = {
-          interfaces = [ "eth0" "wlan0" ];
-          miimon = 100;
+    networking.bonds =
+      let
+        driverOptionsExample = {
+          miimon = "100";
           mode = "active-backup";
         };
-        fatpipe.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ];
-      };
-      description = ''
-        This option allows you to define bond devices that aggregate multiple,
-        underlying networking interfaces together. The value of this option is
-        an attribute set. Each attribute specifies a bond, with the attribute
-        name specifying the name of the bond's network interface
-      '';
-
-      type = with types; attrsOf (submodule {
-
-        options = {
-
-          interfaces = mkOption {
-            example = [ "enp4s0f0" "enp4s0f1" "wlan0" ];
-            type = types.listOf types.str;
-            description = "The interfaces to bond together";
+      in mkOption {
+        default = { };
+        example = literalExample {
+          bond0 = {
+            interfaces = [ "eth0" "wlan0" ];
+            driverOptions = driverOptionsExample;
           };
-
-          driverOptions = mkOption {
-            type = types.attrsOf types.str;
-            default = {};
-            example = literalExample {
-              interfaces = [ "eth0" "wlan0" ];
-              miimon = 100;
-              mode = "active-backup";
-            };
-            description = ''
-              Options for the bonding driver.
-              Documentation can be found in
-              <link xlink:href="https://www.kernel.org/doc/Documentation/networking/bonding.txt" />
-            '';
-
-          };
-
-          lacp_rate = mkOption {
-            default = null;
-            example = "fast";
-            type = types.nullOr types.str;
-            description = ''
-              DEPRECATED, use `driverOptions`.
-              Option specifying the rate in which we'll ask our link partner
-              to transmit LACPDU packets in 802.3ad mode.
-            '';
-          };
-
-          miimon = mkOption {
-            default = null;
-            example = 100;
-            type = types.nullOr types.int;
-            description = ''
-              DEPRECATED, use `driverOptions`.
-              Miimon is the number of millisecond in between each round of polling
-              by the device driver for failed links. By default polling is not
-              enabled and the driver is trusted to properly detect and handle
-              failure scenarios.
-            '';
-          };
-
-          mode = mkOption {
-            default = null;
-            example = "active-backup";
-            type = types.nullOr types.str;
-            description = ''
-              DEPRECATED, use `driverOptions`.
-              The mode which the bond will be running. The default mode for
-              the bonding driver is balance-rr, optimizing for throughput.
-              More information about valid modes can be found at
-              https://www.kernel.org/doc/Documentation/networking/bonding.txt
-            '';
-          };
-
-          xmit_hash_policy = mkOption {
-            default = null;
-            example = "layer2+3";
-            type = types.nullOr types.str;
-            description = ''
-              DEPRECATED, use `driverOptions`.
-              Selects the transmit hash policy to use for slave selection in
-              balance-xor, 802.3ad, and tlb modes.
-            '';
-          };
-
+          anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ];
         };
+        description = ''
+          This option allows you to define bond devices that aggregate multiple,
+          underlying networking interfaces together. The value of this option is
+          an attribute set. Each attribute specifies a bond, with the attribute
+          name specifying the name of the bond's network interface
+        '';
 
-      });
-    };
+        type = with types; attrsOf (submodule {
+
+          options = {
+
+            interfaces = mkOption {
+              example = [ "enp4s0f0" "enp4s0f1" "wlan0" ];
+              type = types.listOf types.str;
+              description = "The interfaces to bond together";
+            };
+
+            driverOptions = mkOption {
+              type = types.attrsOf types.str;
+              default = {};
+              example = literalExample driverOptionsExample;
+              description = ''
+                Options for the bonding driver.
+                Documentation can be found in
+                <link xlink:href="https://www.kernel.org/doc/Documentation/networking/bonding.txt" />
+              '';
+
+            };
+
+            lacp_rate = mkOption {
+              default = null;
+              example = "fast";
+              type = types.nullOr types.str;
+              description = ''
+                DEPRECATED, use `driverOptions`.
+                Option specifying the rate in which we'll ask our link partner
+                to transmit LACPDU packets in 802.3ad mode.
+              '';
+            };
+
+            miimon = mkOption {
+              default = null;
+              example = 100;
+              type = types.nullOr types.int;
+              description = ''
+                DEPRECATED, use `driverOptions`.
+                Miimon is the number of millisecond in between each round of polling
+                by the device driver for failed links. By default polling is not
+                enabled and the driver is trusted to properly detect and handle
+                failure scenarios.
+              '';
+            };
+
+            mode = mkOption {
+              default = null;
+              example = "active-backup";
+              type = types.nullOr types.str;
+              description = ''
+                DEPRECATED, use `driverOptions`.
+                The mode which the bond will be running. The default mode for
+                the bonding driver is balance-rr, optimizing for throughput.
+                More information about valid modes can be found at
+                https://www.kernel.org/doc/Documentation/networking/bonding.txt
+              '';
+            };
+
+            xmit_hash_policy = mkOption {
+              default = null;
+              example = "layer2+3";
+              type = types.nullOr types.str;
+              description = ''
+                DEPRECATED, use `driverOptions`.
+                Selects the transmit hash policy to use for slave selection in
+                balance-xor, 802.3ad, and tlb modes.
+              '';
+            };
+
+          };
+
+        });
+      };
 
     networking.macvlans = mkOption {
       default = { };
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 17b04c8db151..6a7e628d8ef1 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -1,4 +1,6 @@
-{ system ? builtins.currentSystem, networkd }:
+{ system ? builtins.currentSystem
+# bool: whether to use networkd in the tests
+, networkd }:
 
 with import ../lib/testing.nix { inherit system; };
 with pkgs.lib;

From 90c5c9d8c941254f2d8af6685d99ff277e864087 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Tue, 7 Mar 2017 23:02:26 -0600
Subject: [PATCH 1891/3449] lilypond-with-fonts: fix typos

In development, I experimented with file globs, for loops and making the
supplementary fonts optional. As such, the original PR ended up with a
dysfunctional combination.

This commit fully adopts the for loop approach, which I prefer, since failing
matches, e.g. missing supplementary-fonts/, won't cause a failure.
---
 pkgs/misc/lilypond/fonts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/lilypond/fonts.nix b/pkgs/misc/lilypond/fonts.nix
index 6ad4f06328d8..bb3487cd0a88 100644
--- a/pkgs/misc/lilypond/fonts.nix
+++ b/pkgs/misc/lilypond/fonts.nix
@@ -24,11 +24,11 @@ let
 
       installPhase = ''
         for f in {otf,supplementary-fonts}/**.{o,t}tf; do
-          install -Dt $out/otf -m755 otf/*
+          install -Dt $out/otf -m755 $f
         done
 
         for f in svg/**.{svg,woff}; do
-          install -Dt $out/svg -m755 svg/*
+          install -Dt $out/svg -m755 $f
         done
       '';
 

From 6f68eb7c7ec8f17e33a93330c4a387e8bc8048c6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Mar 2017 15:35:33 +0800
Subject: [PATCH 1892/3449] msmtp: use netcat-gnu to unbreak darwin

---
 pkgs/applications/networking/msmtp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 1eab140e1d7a..156ea589388d 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchurl, autoreconfHook, pkgconfig
-, openssl, netcat, gnutls, gsasl, libidn, Security, systemd }:
+, openssl, netcat-gnu, gnutls, gsasl, libidn, Security
+, systemd ? null }:
 
 let
   tester = "n"; # {x| |p|P|n|s}
@@ -28,7 +29,7 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \
       --replace @msmtp@      $out/bin/msmtp \
-      --replace @nc@         ${netcat}/bin/nc \
+      --replace @nc@         ${netcat-gnu}/bin/nc \
       --replace @journal@    ${journal} \
       ${lib.optionalString (journal == "y") "--replace @systemdcat@ ${systemd}/bin/systemd-cat" } \
       --replace @test@       ${tester}

From 060f7cb94d236c8f1b60ab05670c5448b5be3e67 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 8 Mar 2017 09:31:18 +0100
Subject: [PATCH 1893/3449] haskell-generic-builder: remove unused nodePackages
 argument

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index e47375e71c73..f580de51a35c 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, nodePackages
+, jailbreak-cabal, hscolour, cpphs
 }: let isCross = (ghc.cross or null) != null; in
 
 { pname

From 2c99575c664312449fb0844e68f9ad5eac376dc0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Mar 2017 17:34:54 +0800
Subject: [PATCH 1894/3449] neovim-qt: 0.2.4 -> 0.2.5

---
 pkgs/applications/editors/neovim/qt.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 66c538a19766..1c5d227a0ba5 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchFromGitHub, cmake, doxygen
-, libmsgpack, makeWrapper, neovim, pythonPackages, qtbase }:
+, libmsgpack, makeQtWrapper, neovim, pythonPackages, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner  = "equalsraf";
     repo   = "neovim-qt";
     rev    = "v${version}";
-    sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59";
+    sha256 = "1q706k400j5v9kans71yjz9p36ran2lpz29m4vjzj920llksln3d";
   };
 
   cmakeFlags = [
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     jinja2 msgpack python
   ]);
 
-  nativeBuildInputs = [ cmake doxygen makeWrapper ];
+  nativeBuildInputs = [ cmake doxygen makeQtWrapper ];
 
   enableParallelBuilding = true;
 
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
   preConfigure = "echo \"\" > third-party/CMakeLists.txt";
 
   postInstall = ''
-    wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin"
+    wrapQtProgram "$out/bin/nvim-qt" \
+      --prefix PATH : "${neovim}/bin"
   '';
 
   meta = with stdenv.lib; {

From 2c02c84cdceea6aebba06502cc740ab69e69bd5f Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 8 Mar 2017 11:33:01 +0100
Subject: [PATCH 1895/3449] verilator: fix Perl shebangs

---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index 3c01f8f37498..ed4a430198a1 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   buildInputs = [ perl flex_2_6_1 bison ];
 
+  postInstall = ''
+    sed -i -e '3a\#!/usr/bin/env perl' -e '1,3d' $out/bin/{verilator,verilator_coverage,verilator_profcfunc}
+  '';
+
   meta = {
     description = "Fast and robust (System)Verilog simulator/compiler";
     homepage    = "http://www.veripool.org/wiki/verilator";

From e17d3d4ef1c777b9b4ea9724d4dcc1631832bdc1 Mon Sep 17 00:00:00 2001
From: Ricardo Ardissone <ricardo.ardissone@gmail.com>
Date: Sat, 4 Mar 2017 10:29:16 -0300
Subject: [PATCH 1896/3449] gplates: use boost 160

update 161 changed reference parameters for optional
https://hydra.nixos.org/build/49707856/nixlog/1
http://www.boost.org/doc/libs/1_61_0/libs/optional/doc/html/boost_ooptional/relnotes.html
---
 pkgs/applications/science/misc/gplates/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                    | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix
index 7fa0c3f6865c..05e0091108aa 100644
--- a/pkgs/applications/science/misc/gplates/default.nix
+++ b/pkgs/applications/science/misc/gplates/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
-, proj, boost159, cmake, python2, doxygen, graphviz, gmp }:
+, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
 
 stdenv.mkDerivation rec {
   name = "gplates-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost159 cmake python2
+    qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2
     doxygen graphviz gmp
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b01b111f230..12504c5099e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17466,7 +17466,10 @@ with pkgs;
 
   fityk = callPackage ../applications/science/misc/fityk { };
 
-  gplates = callPackage ../applications/science/misc/gplates { };
+  gplates = callPackage ../applications/science/misc/gplates {
+    boost = boost160;
+    cgal = cgal.override { boost = boost160; };
+  };
 
   gravit = callPackage ../applications/science/astronomy/gravit { };
 

From cb670556c52f134e6d042ea3be4f607b8ece508a Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Wed, 8 Mar 2017 13:27:16 +0200
Subject: [PATCH 1897/3449] nss: 3.28.1 -> 3.28.3

This should fix firefox build, which fails due to nss being too old.
---
 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 8621d60ca960..294371dde7ad 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.1";
+  version = "3.28.3";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_28_1_RTM/src/${name}.tar.gz";
-    sha256 = "58cc0c05c0ed9523e6d820bea74f513538f48c87aac931876e3d3775de1a82ad";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_28_3_RTM/src/${name}.tar.gz";
+    sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From d4bb1c786fd35d359b2eb8364863b4320cac1627 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Wed, 8 Mar 2017 13:39:40 +0200
Subject: [PATCH 1898/3449] sqlite: 3.16.2 -> 3.17.0

Firefox requires the latest sqlite to build:
```
checking for sqlite3 >= 3.17.0... Requested 'sqlite3 >= 3.17.0' but version of SQLite is 3.16.2
configure: error: Library requirements (sqlite3 >= 3.17.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```
---
 pkgs/development/libraries/sqlite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 6e86780446c5..a80317162302 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.16.2";
+  name = "sqlite-3.17.0";
 
   src = fetchurl {
-    url = "http://sqlite.org/2017/sqlite-autoconf-3160200.tar.gz";
-    sha256 = "059n4s9qd35qpbd4g29y9ay99a6f68ad7k65g430rxb6jcz0rk35";
+    url = "http://sqlite.org/2017/sqlite-autoconf-3170000.tar.gz";
+    sha256 = "0k472gq0p706jq4529p60znvw02hdf172qxgbdv59q0n7anqbr54";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 28598c01e7e09c606b5988306ce84534a717b94a Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Wed, 8 Mar 2017 14:01:39 +0200
Subject: [PATCH 1899/3449] icu: 57.1 -> 58.2

Firefox requires new version of the icu to build:
```
checking for icu-i18n >= 58.1... Requested 'icu-i18n >= 58.1' but version of icu-i18n is 57.1
configure: error: Library requirements (icu-i18n >= 58.1) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
```
---
 pkgs/development/libraries/icu/default.nix | 24 ++--------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index d4a4c2a500c1..1508f05db8b6 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "icu4c";
-  version = "57.1";
+  version = "58.2";
 in
 stdenv.mkDerivation ({
   name = pname + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation ({
   src = fetchurl {
     url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
       + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";
+    sha256 = "036shcb3f8bm1lynhlsb4kpjm9s9c2vdiir01vg216rs2l8482ib";
   };
 
   outputs = [ "out" "dev" ];
@@ -35,26 +35,6 @@ stdenv.mkDerivation ({
   '';
 
   patches = [
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2014-6585.patch";
-      sha256 = "1s8kqax444pqf5chwxvgsx1n1dx7v74h34fqh08fyq57mcjnpj4d";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2015-4760.patch";
-      sha256 = "08gawyqbylk28i9pxv9vsw2drdpd6i97q0aml4nmv2xyb1ala0wp";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-0494.patch";
-      sha256 = "1741s8lpmnizjprzk3xb7zkm5fznzgk8hhlrs8a338c18nalvxay";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-6293.patch";
-      sha256 = "01h4xcss1vmsr60ijkv4lxsgvspwimyss61zp9nq4xd5i3kk1f4b";
-    })
-    (fetchpatch {
-      url = "https://sources.debian.net/data/main/i/icu/57.1-5/debian/patches/CVE-2016-7415.patch";
-      sha256 = "01d070h8d7rkj55ac8isr64m999bv5znc8vnxa7aajglsfidzs2r";
-    })
   ];
 
   preConfigure = ''

From a9e990b818b3922f0994178bd12970df60abaa22 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Mar 2017 20:07:40 +0800
Subject: [PATCH 1900/3449] neovim: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 1c5d227a0ba5..b2eef4305f29 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
-  version = "0.2.5";
+  version = "0.2.6";
 
   src = fetchFromGitHub {
     owner  = "equalsraf";
     repo   = "neovim-qt";
     rev    = "v${version}";
-    sha256 = "1q706k400j5v9kans71yjz9p36ran2lpz29m4vjzj920llksln3d";
+    sha256 = "1wsxhy8fdayy4dsr2dxgh5k4jysybjlyzj134vk325v6cqz9bsgm";
   };
 
   cmakeFlags = [

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 1901/3449] 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 e4a4f74907a8..6bbcb716051e 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 b4226e656fde..0cb2ce640504 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 26625c928be8ce503b23f5302222bdcb380a4445 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Wed, 8 Mar 2017 20:26:18 +0800
Subject: [PATCH 1902/3449] neovim-qt: run tests

---
 pkgs/applications/editors/neovim/qt.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index b2eef4305f29..26f2a3b69411 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
     "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
   ];
 
-  doCheck = false; # 5 out of 7 fail
+  doCheck = true;
 
   buildInputs = with pythonPackages; [
-    qtbase libmsgpack
+    neovim qtbase libmsgpack
   ] ++ (with pythonPackages; [
     jinja2 msgpack python
   ]);
@@ -29,8 +29,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # avoid cmake trying to download libmsgpack
-  preConfigure = "echo \"\" > third-party/CMakeLists.txt";
+  preConfigure = ''
+    # avoid cmake trying to download libmsgpack
+    echo "" > third-party/CMakeLists.txt
+    # we rip out the gui test as spawning a GUI fails in our build environment
+    sed -i '/^add_xtest_gui/d' test/CMakeLists.txt
+  '';
 
   postInstall = ''
     wrapQtProgram "$out/bin/nvim-qt" \

From 01bb228b2a1a2b2893bd5845b241a3ca0317a219 Mon Sep 17 00:00:00 2001
From: Jeff Simpson <jeff@syncrodoka.net>
Date: Wed, 8 Mar 2017 05:52:40 -0700
Subject: [PATCH 1903/3449] Add curl dependency to Slack for calls

---
 .../networking/instant-messengers/slack/default.nix            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index fa0c72f0ca05..59ce03cc0f45 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome2
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, gnome2
 , libnotify, nspr, nss, systemd, xorg }:
 
 let
@@ -11,6 +11,7 @@ let
     atk
     cairo
     cups
+    curl
     dbus
     expat
     fontconfig

From c8402dde1547dd3faaadba5d08015cd07c5c98a4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 8 Mar 2017 15:31:34 +0200
Subject: [PATCH 1904/3449] libp11: Fetch src from GitHub

---
 pkgs/development/libraries/libp11/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 4f1bd7de3d95..91195229d87a 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, libtool, openssl, pkgconfig}:
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "libp11-0.2.7";
-  
-  src = fetchurl {
-    urls = [
-      "http://www.opensc-project.org/files/libp11/${name}.tar.gz"
-      "http://www.openadk.org/distfiles/${name}.tar.gz"
-    ];
-    sha256 = "0kaz5qafaxm0ycywmajl166c29fh9cz89b8i043jqsbxlpzf4hdp";
+
+  src = fetchFromGitHub {
+    owner = "OpenSC";
+    repo = "libp11";
+    rev = name;
+    sha256 = "0llw69kcb6nvz7zzkb9nyfyhc2s972q68sqciabqxwxljr09c411";
   };
-  
-  buildInputs = [ libtool openssl pkgconfig ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
+  buildInputs = [ openssl ];
 
   meta = {
     homepage = http://www.opensc-project.org/libp11/;

From bb4c6a78008bcf3841a7d4b2ebaa71ae99ecd5dc Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Wed, 8 Mar 2017 09:08:31 -0500
Subject: [PATCH 1905/3449] nixpkgs: build aarch64-linux

---
 pkgs/top-level/release.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index c301ceb1530d..9c24855dc50b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -12,7 +12,7 @@
 { 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" ]
+  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]
 , # Strip most of attributes when evaluating to spare memory usage
   scrubJobs ? true
 }:
@@ -41,18 +41,23 @@ let
               jobs.lib-tests
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
+              jobs.stdenv.aarch64-linux
               jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.linux.i686-linux
+              jobs.linux.aarch64-linux
               jobs.python.x86_64-linux
               jobs.python.i686-linux
+              jobs.python.aarch4-linux
               jobs.python.x86_64-darwin
               jobs.python3.x86_64-linux
               jobs.python3.i686-linux
+              jobs.python3.aarchh64-linux
               jobs.python3.x86_64-darwin
               # Many developers use nix-repl
               jobs.nix-repl.x86_64-linux
               jobs.nix-repl.i686-linux
+              jobs.nix-repl.aarch64-linux
               jobs.nix-repl.x86_64-darwin
               # Needed by travis-ci to test PRs
               jobs.nox.i686-linux
@@ -61,6 +66,7 @@ let
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
               jobs.thunderbird.i686-linux
+              jobs.thunderbird.aarch64-linux
               # Ensure that basic stuff works on darwin
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin
@@ -73,6 +79,9 @@ let
     }) // (lib.optionalAttrs (builtins.elem "x86_64-linux" supportedSystems) {
       stdenvBootstrapTools.x86_64-linux =
         { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "x86_64-linux"; }) dist test; };
+    }) // (lib.optionalAttrs (builtins.elem "aarch64-linux" supportedSystems) {
+      stdenvBootstrapTools.aarch64-linux =
+        { inherit (import ../stdenv/linux/make-bootstrap-tools.nix { system = "aarch64-linux"; }) dist test; };
     }) // (lib.optionalAttrs (builtins.elem "x86_64-darwin" supportedSystems) {
       stdenvBootstrapTools.x86_64-darwin =
         let

From 413bc03986801af2dcad2e3672b4c42d03390ac2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 8 Mar 2017 16:13:49 +0200
Subject: [PATCH 1906/3449] mess: Mark broken

Even fixing the source urls doesn't make it build.
---
 pkgs/misc/emulators/mess/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix
index 8f232a6023c7..98bd8bae3e02 100644
--- a/pkgs/misc/emulators/mess/default.nix
+++ b/pkgs/misc/emulators/mess/default.nix
@@ -6,12 +6,12 @@ let
   version = "139";
 
   mameSrc = fetchurl {
-    url = "http://www.aarongiles.com/mirror/releases/mame0${version}s.zip";
+    url = "https://github.com/mamedev/mame/releases/download/mame0139/mame0${version}s.zip";
     sha256 = "1mpkwxfz38cgxzvlni2y3fxas3b8qmnzj2ik2zzbd8mr622jdp79";
   };
-  
+
   messSrc = fetchurl {
-    url = "http://mess.redump.net/_media/downloads:mess0${version}s.zip";
+    url = "http://www.progettosnaps.net/MESS/src/mess0${version}s.zip";
     name = "mess0139s.zip";
     sha256 = "1v892cg6wn8cdwc8pf1gcqqdb1v1v295r6jw2hf58svwx3h27xyy";
   };
@@ -39,10 +39,11 @@ stdenv.mkDerivation {
       mkdir -p $out/bin
       cp mess* $out/bin/mess 
     '';
-    
+
   meta = {
     homepage = http://www.mess.org/;
     license = "non-commercial";
     description = "Multi Emulator Super System, an emulator of many game consoles and computer systems";
+    broken = true;
   };
 }

From 9d9cc7ba5f87108b01305bc43d7b97e25453170c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Mar 2017 14:41:55 +0100
Subject: [PATCH 1907/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1-2-g3de0b84 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/e5e1058cdef630c7377086dd752665ffd48b182f.
---
 .../haskell-modules/hackage-packages.nix      | 442 ++++++++++++++++--
 1 file changed, 410 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index d9ebdb70b82c..c50f9a12731a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2873,6 +2873,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Compactable" = callPackage
+    ({ mkDerivation, base, containers, transformers, vector }:
+     mkDerivation {
+       pname = "Compactable";
+       version = "0.1.0.2";
+       sha256 = "402a4d9c2fd28c9d780f094d112858f38600cf73bbdddf9baaac580912cd3f3e";
+       libraryHaskellDepends = [ base containers transformers vector ];
+       description = "A generalization for containers that can be stripped of Nothing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Concurrent-Cache" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -20896,8 +20907,8 @@ self: {
      }:
      mkDerivation {
        pname = "affection";
-       version = "0.0.0.4";
-       sha256 = "31d82e66df577e34b0b96a70111d61918db70db93b3b0a66ce4e27c661688a58";
+       version = "0.0.0.5";
+       sha256 = "4d5f2d6257d6dcb6fe7b1658bead8e0c48451414d434d44e5492709b81ac43e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33658,6 +33669,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "boltzmann-samplers" = callPackage
+    ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754
+     , MonadRandom, mtl, QuickCheck, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "boltzmann-samplers";
+       version = "0.1.0.0";
+       sha256 = "5707065a83cb30223ffedbd740ac07d3d879bb0895ba7666d23d659e3b69883f";
+       revision = "1";
+       editedCabalFile = "203beaed2fdb6bbbd42cfa264f9fe1ef2ba4a69f4c92a85864317ffdd43a6a03";
+       libraryHaskellDepends = [
+         ad base containers hashable hmatrix ieee754 MonadRandom mtl
+         QuickCheck transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/Lysxia/boltzmann-samplers#readme";
+       description = "Uniform random generators";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bond" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring
      , cmdargs, derive, Diff, directory, filepath, HUnit, monad-loops
@@ -34511,8 +34542,8 @@ self: {
     ({ mkDerivation, base, bson, template-haskell, text, th-lift }:
      mkDerivation {
        pname = "bson-mapping";
-       version = "0.1.5.0";
-       sha256 = "ba8ec4df8362c67e3da032399e92ddc94a6ddbd80232e2566648de0b5d53085a";
+       version = "0.1.5.1";
+       sha256 = "3f8eeb235b75a265bbc32b0fd808319144096d306f9bf1ed4434a28dd24facde";
        libraryHaskellDepends = [
          base bson template-haskell text th-lift
        ];
@@ -41194,20 +41225,20 @@ self: {
 
   "clit" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
-     , bytestring, data-default, http-client, http-client-tls
+     , bytestring, data-default, directory, http-client, http-client-tls
      , http-types, lens, megaparsec, MissingH, optparse-applicative
      , split, text
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.3.0.3";
-       sha256 = "963a5a636ded2f1f7ac7a6b4b4af8a38403ecda4913e12b36719ee57c1a27925";
+       version = "0.3.1.0";
+       sha256 = "1e8f6dfb1c868b979722ec855b8b75165a61bf41a210a2c29a408573c9bc8085";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring
-         data-default http-client http-client-tls http-types lens megaparsec
-         MissingH optparse-applicative split text
+         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";
@@ -58120,8 +58151,8 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "effin";
-       version = "0.3.0.1";
-       sha256 = "2e6a4a183d3626ab2509e7e80461efaeeb7327fa41fe3883f7e4163e9bec9365";
+       version = "0.3.0.2";
+       sha256 = "dd09e453c57987990865d8ff3b5e8ff26035a6087a31b5ecb4d1c3dfd785f014";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
@@ -60658,6 +60689,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eve" = callPackage
+    ({ mkDerivation, base, containers, data-default, free, hspec
+     , hspec-core, lens, mtl, pipes, pipes-concurrency, pipes-parse
+     }:
+     mkDerivation {
+       pname = "eve";
+       version = "0.1.0";
+       sha256 = "18cc10498a3c663fed847eaa5caf910f613cca4c817e05a3e884b077b2122ed9";
+       libraryHaskellDepends = [
+         base containers data-default free lens mtl pipes pipes-concurrency
+         pipes-parse
+       ];
+       testHaskellDepends = [
+         base data-default hspec hspec-core lens mtl
+       ];
+       homepage = "https://github.com/ChrisPenner/eve#readme";
+       description = "An extensible event framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "event" = callPackage
     ({ mkDerivation, base, containers, semigroups, transformers }:
      mkDerivation {
@@ -64053,8 +64104,8 @@ self: {
      }:
      mkDerivation {
        pname = "fix-imports";
-       version = "1.0.4";
-       sha256 = "46da19d982e3470bd28e55f895c3fc6e6e80a6b98f1014f32755b8601cc61e49";
+       version = "1.0.5";
+       sha256 = "0b072eec7895d3514276c2a25d6d56665dbabb46b13c22aeb5f560459216de05";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -64957,8 +65008,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.2";
-       sha256 = "30a8f7229bb16ccd72bdefddf67d4ef23e9c87e200207dfdf944b737dd49a71d";
+       version = "0.5.1.3";
+       sha256 = "391f97abb8acac97b82d3b8a3ee3d62e2f76b566c01be2dff8835932fd85ae29";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -66560,6 +66611,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "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;
+     }) {};
+
   "freesect" = callPackage
     ({ mkDerivation, array, base, cpphs, directory, mtl, parallel
      , pretty, random, syb
@@ -68242,8 +68314,8 @@ self: {
      }:
      mkDerivation {
        pname = "general-games";
-       version = "1.0.1";
-       sha256 = "ce6805d308b6aed79de4c55ea6b4d1edd7ce0a536df9131d1aef2f1f7e1221a6";
+       version = "1.0.2";
+       sha256 = "1415c6cb8a2d37322e7568ae53ffca5d658aed6e47bbbefa5c59ed88c09b384e";
        libraryHaskellDepends = [
          base monad-loops MonadRandom random random-shuffle
        ];
@@ -68475,6 +68547,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generic-random_0_4_1_0" = callPackage
+    ({ mkDerivation, base, boltzmann-samplers, QuickCheck }:
+     mkDerivation {
+       pname = "generic-random";
+       version = "0.4.1.0";
+       sha256 = "cad16f88436384b5157b1ba09d7931f2d31a60c46bab4669659bff7936032ee2";
+       libraryHaskellDepends = [ base boltzmann-samplers 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 {
@@ -70291,14 +70376,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghcjs-hplay_0_4_1" = callPackage
+  "ghcjs-hplay_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , ghcjs-perch, mtl, transformers, transient, transient-universe
      }:
      mkDerivation {
        pname = "ghcjs-hplay";
-       version = "0.4.1";
-       sha256 = "0589b76f6411abcf05a61a3f2b9d2d25064d5c1140dabf14b4a5d6aca0162b2b";
+       version = "0.4.2";
+       sha256 = "abab4f37c8168fca3c9c82b3349ac817c0771b6b09cc09a1eb6cce46bd0bdc2d";
        libraryHaskellDepends = [
          base bytestring containers directory ghcjs-perch mtl transformers
          transient transient-universe
@@ -76091,10 +76176,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.1.0.0";
-       sha256 = "375204744bebde75f9d249dc535d6b3199b342c6e68e452b7af4a3ac55521ef5";
-       revision = "1";
-       editedCabalFile = "293782aef4b6465cfe154b1601db24c5720a444c802f5a454fa06f04f0549614";
+       version = "0.1.0.1";
+       sha256 = "58cd8efd50ebeaf4a5630f4548065c1e05ce6a39367d9ccaa0e1ccc67be3f531";
        libraryHaskellDepends = [
          aeson base http-client servant servant-client text
        ];
@@ -102520,8 +102603,8 @@ self: {
        pname = "imperative-edsl";
        version = "0.7";
        sha256 = "1a207736fb6b84e5316bbbe95593b464fe7f155db65e89fbac78b59d0e05f5f7";
-       revision = "1";
-       editedCabalFile = "c7ce36becbcecf66151a8b850abb7a19752aa0dfd68922198dd53ed95470b57c";
+       revision = "2";
+       editedCabalFile = "c0d206bbb494b14bb4f2bbcbab994dc65fde03edb3f898d3ede7492578774f97";
        libraryHaskellDepends = [
          array base BoundedChan containers data-default-class deepseq
          directory exception-transformers ghc-prim language-c-quote
@@ -106293,6 +106376,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "javascript-extras" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "javascript-extras";
+       version = "0.1.0.0";
+       sha256 = "cf74b6c2be87ee5bc96b5ff47335a8eb2d879d7ec83bf6c83be609293f40f4be";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/louispan/javascript-extras#readme";
+       description = "Extra javascript functions when using GHCJS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "javasf" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, doctest
      , filepath, language-java-classfile, QuickCheck
@@ -110783,6 +110878,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c-quote_0_11_7_2" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , exception-mtl, exception-transformers, filepath, happy
+     , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
+     , symbol, template-haskell, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "language-c-quote";
+       version = "0.11.7.2";
+       sha256 = "5654187eaa82afe2b7ad959436b35c561fa5bc5b68af5624ab204e9db3591508";
+       libraryHaskellDepends = [
+         array base bytestring containers exception-mtl
+         exception-transformers filepath haskell-src-meta mainland-pretty
+         mtl srcloc syb symbol template-haskell
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         base bytestring HUnit mainland-pretty srcloc symbol test-framework
+         test-framework-hunit
+       ];
+       homepage = "http://www.drexel.edu/~mainland/";
+       description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-cil" = callPackage
     ({ mkDerivation, base, bool-extras }:
      mkDerivation {
@@ -118345,6 +118466,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mainland-pretty_0_5_0_0" = callPackage
+    ({ mkDerivation, base, containers, srcloc, text }:
+     mkDerivation {
+       pname = "mainland-pretty";
+       version = "0.5.0.0";
+       sha256 = "0666eb8e8005d42c00b49177eeb07518f578d2cb0f891aa7be6c44bd88428d43";
+       libraryHaskellDepends = [ base containers srcloc text ];
+       homepage = "https://github.com/mainland/mainland-pretty";
+       description = "Pretty printing designed for printing source code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "majordomo" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, monad-loops, old-locale
      , threads, time, unix, zeromq-haskell
@@ -119321,8 +119455,8 @@ self: {
      }:
      mkDerivation {
        pname = "marvin";
-       version = "0.2.2";
-       sha256 = "87c5aa6059c7dbf6c8d20d31d3a242bc68aa888313453448ca520f726272dbbb";
+       version = "0.2.3";
+       sha256 = "79f439662bd8acd8ab528f29fad7ec73517edcf198fc29dc693c35100110553d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -119587,6 +119721,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {eng = null; mat = null; mx = null;};
 
+  "matplotlib" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, process, tasty
+     , tasty-hunit, temporary
+     }:
+     mkDerivation {
+       pname = "matplotlib";
+       version = "0.1.0.0";
+       sha256 = "8001811170e201741eca52a0926c78810f451b104cc1ef055779b1b7351dee0d";
+       libraryHaskellDepends = [
+         aeson base bytestring process temporary
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit temporary ];
+       homepage = "https://github.com/abarbu/matplotlib-haskell";
+       description = "Bindings to Matplotlib; a Python plotting library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "matrices" = callPackage
     ({ mkDerivation, base, criterion, deepseq, primitive, tasty
      , tasty-hunit, tasty-quickcheck, vector
@@ -136351,6 +136502,41 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent_2_6_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , blaze-html, blaze-markup, bytestring, conduit, containers
+     , exceptions, fast-logger, hspec, http-api-data, lifted-base
+     , monad-control, monad-logger, mtl, old-locale, path-pieces
+     , resource-pool, resourcet, scientific, silently, tagged
+     , template-haskell, text, time, transformers, transformers-base
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "persistent";
+       version = "2.6.1";
+       sha256 = "c79e0f6e7b727dcae0c7c541f1d47eb8fb0b9e9c55d2478a476a4aca8e405f7e";
+       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
@@ -136532,6 +136718,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-mysql_2_6_0_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-control, monad-logger, mysql, mysql-simple
+     , persistent, resource-pool, resourcet, text, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-mysql";
+       version = "2.6.0.1";
+       sha256 = "6c7b1805517c084ed971bcb78f12e7ebc87339389660ac470473a2ed49894cbe";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers
+         monad-control monad-logger mysql mysql-simple persistent
+         resource-pool resourcet text transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-odbc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , convertible, HDBC, HDBC-odbc, monad-control, monad-logger
@@ -136588,6 +136794,28 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-postgresql_2_6_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-control, monad-logger, persistent
+     , postgresql-libpq, postgresql-simple, resource-pool, resourcet
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-postgresql";
+       version = "2.6.1";
+       sha256 = "0cdfb492faa3a69ec69f06bb3c17ee6c36399f406e02a2ff16086f45bed6f870";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers
+         monad-control monad-logger persistent postgresql-libpq
+         postgresql-simple resource-pool resourcet text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Backend for the persistent library using postgresql";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-protobuf" = callPackage
     ({ mkDerivation, base, bytestring, persistent, protocol-buffers
      , protocol-buffers-descriptor, template-haskell, text
@@ -136708,6 +136936,34 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-sqlite_2_6_2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, containers
+     , hspec, microlens-th, monad-control, monad-logger, old-locale
+     , persistent, persistent-template, resource-pool, resourcet
+     , temporary, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-sqlite";
+       version = "2.6.2";
+       sha256 = "6136c471fc81869cf0fde2049defb9c82698e3c0048d1321c3eda01046b985bf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring conduit containers microlens-th monad-control
+         monad-logger old-locale persistent resource-pool resourcet text
+         time transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base hspec persistent persistent-template temporary text time
+         transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Backend for the persistent library using sqlite3";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-template" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
@@ -136734,6 +136990,31 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
+  "persistent-template_2_5_2" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
+     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
+     , path-pieces, persistent, QuickCheck, tagged, template-haskell
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "persistent-template";
+       version = "2.5.2";
+       sha256 = "de695b008158f9ae66d103fc33f89c098ebcf59337367063d9f4f816a58b4011";
+       libraryHaskellDepends = [
+         aeson aeson-compat base bytestring containers ghc-prim
+         http-api-data monad-control monad-logger path-pieces persistent
+         tagged template-haskell text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec persistent QuickCheck text transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Type-safe, non-relational, multi-backend persistence";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
   "persistent-vector" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -141984,6 +142265,8 @@ self: {
        pname = "primitive";
        version = "0.6.2.0";
        sha256 = "b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1";
+       revision = "1";
+       editedCabalFile = "a67c9da25c0d15971f8dc06c119cae4a0180a7216c0a3a3d6e52357d2f7ac134";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        testHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/haskell/primitive";
@@ -149006,8 +149289,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex";
-       version = "0.3.0.0";
-       sha256 = "f0f8c9722a601edfc2fb7963956f331f3dd1e1655fafb07758aad6defea579de";
+       version = "0.5.0.0";
+       sha256 = "422392384ce3986d1c5627b30c8dc9dfb05fe41044820739d11da51ff1a8c27f";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable heredoc
          regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
@@ -149165,8 +149448,8 @@ self: {
      }:
      mkDerivation {
        pname = "regex-examples";
-       version = "0.3.0.0";
-       sha256 = "c274ffacf3eeecb9e9530d07fd44dd0539c8225923ae0cb82b5d48ad6333903b";
+       version = "0.5.0.0";
+       sha256 = "bfc94f67d1723fd833247512549aa2e0a9d18070aaf9409feaef87388a48a1bb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -159666,6 +159949,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shell-conduit_4_6_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
+     , control-monad-loop, directory, filepath, hspec
+     , hspec-expectations, monad-control, monads-tf, process, resourcet
+     , semigroups, split, template-haskell, text, transformers
+     , transformers-base, unix
+     }:
+     mkDerivation {
+       pname = "shell-conduit";
+       version = "4.6.0";
+       sha256 = "9ce6230efb78589b5b28dd82396d73afbc832bbb8213f51c28ab6c946a9a12a1";
+       libraryHaskellDepends = [
+         async base bytestring conduit conduit-extra control-monad-loop
+         directory filepath monad-control monads-tf process resourcet
+         semigroups split template-haskell text transformers
+         transformers-base unix
+       ];
+       testHaskellDepends = [
+         base hspec hspec-expectations template-haskell
+       ];
+       homepage = "https://github.com/psibi/shell-conduit";
+       description = "Write shell scripts with Conduit";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shell-escape" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, vector }:
      mkDerivation {
@@ -166267,6 +166576,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stache_0_2_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, criterion
+     , deepseq, directory, exceptions, file-embed, filepath, hspec
+     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
+     , unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "stache";
+       version = "0.2.1";
+       sha256 = "f25c0a913cca7ae0056d8030e5351da809bdff53afef80d863c1ecaa0dbbd00f";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq directory exceptions
+         filepath megaparsec mtl template-haskell text unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers file-embed hspec hspec-megaparsec
+         megaparsec text yaml
+       ];
+       benchmarkHaskellDepends = [
+         aeson base criterion deepseq megaparsec text
+       ];
+       homepage = "https://github.com/stackbuilders/stache";
+       description = "Mustache templates for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stack" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
      , attoparsec, base, base-compat, base16-bytestring
@@ -178733,6 +179070,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transient-universe-tls" = callPackage
+    ({ mkDerivation, base, bytestring, certificate, cprng-aes
+     , data-default, network, tls, transient, transient-universe
+     , x509-store
+     }:
+     mkDerivation {
+       pname = "transient-universe-tls";
+       version = "0.1.0.0";
+       sha256 = "9f4b345602de7a3652fdcebb787c66017697ef6e0f16a47e59cda3c42cbd8467";
+       libraryHaskellDepends = [
+         base bytestring certificate cprng-aes data-default network tls
+         transient transient-universe x509-store
+       ];
+       homepage = "http://github.com/transient-haskell/transient-universe-tls";
+       description = "transient with secure communications";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "translatable-intset" = callPackage
     ({ mkDerivation, base, fingertree }:
      mkDerivation {
@@ -188859,6 +189214,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets-rpc" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, exceptions
+     , mtl, QuickCheck, quickcheck-instances, stm, tasty
+     , tasty-quickcheck, text, unordered-containers, wai-transformers
+     , websockets
+     }:
+     mkDerivation {
+       pname = "websockets-rpc";
+       version = "0.0.0";
+       sha256 = "e8a97330230f178fede76701fd2335fe18f48a124bd020c4be8120fa75ddf5bb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers exceptions mtl QuickCheck stm text
+         unordered-containers wai-transformers websockets
+       ];
+       testHaskellDepends = [
+         aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
+       ];
+       description = "Simple streaming RPC mechanism using WebSockets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "websockets-snap" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
      , mtl, snap-core, snap-server, websockets

From c71d1e72b28367471e281eea0d7439de3128e554 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 6 Mar 2017 14:42:06 +0100
Subject: [PATCH 1908/3449] LTS Haskell 8.4

---
 .../configuration-hackage2nix.yaml            | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 76c460786c1e..cab70ea6f6d7 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.3
+  # LTS Haskell 8.4
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -171,7 +171,7 @@ default-package-overrides:
   - arrow-list ==0.7
   - ascii-progress ==0.3.3.0
   - asciidiagram ==1.3.3
-  - asn1-encoding ==0.9.4
+  - asn1-encoding ==0.9.5
   - asn1-parse ==0.9.4
   - asn1-types ==0.3.2
   - async ==2.1.1
@@ -207,7 +207,7 @@ default-package-overrides:
   - base58string ==0.10.0
   - base64-bytestring ==1.0.0.1
   - base64-string ==0.2
-  - basic-prelude ==0.6.1
+  - basic-prelude ==0.6.1.1
   - bcrypt ==0.0.10
   - benchpress ==0.2.2.9
   - bencode ==0.6.0.0
@@ -326,7 +326,7 @@ default-package-overrides:
   - cheapskate ==0.1.0.5
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
-  - check-email ==1.0
+  - check-email ==1.0.2
   - checkers ==0.4.6
   - chell ==0.4.0.1
   - choice ==0.2.0
@@ -345,7 +345,7 @@ default-package-overrides:
   - clash-systemverilog ==0.7
   - clash-verilog ==0.7
   - clash-vhdl ==0.7
-  - classy-prelude ==1.2.0
+  - classy-prelude ==1.2.0.1
   - classy-prelude-conduit ==1.2.0
   - classy-prelude-yesod ==1.2.0
   - clay ==0.12.1
@@ -407,7 +407,7 @@ default-package-overrides:
   - cookie ==0.4.2.1
   - countable ==1.0
   - courier ==0.1.1.4
-  - cpphs ==1.20.3
+  - cpphs ==1.20.4
   - cprng-aes ==0.6.1
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.1
@@ -612,8 +612,8 @@ default-package-overrides:
   - feed ==0.3.12.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.4
-  - fgl ==5.5.3.0
-  - fgl-arbitrary ==0.2.0.2
+  - fgl ==5.5.3.1
+  - fgl-arbitrary ==0.2.0.3
   - file-embed ==0.0.10
   - file-modules ==0.1.2.4
   - filecache ==0.2.9
@@ -860,6 +860,7 @@ default-package-overrides:
   - happstack-server-tls ==7.1.6.2
   - happy ==1.19.5
   - harp ==0.4.2
+  - hasbolt ==0.1.1.1
   - hashable ==1.2.5.0
   - hashable-time ==0.2
   - hashmap ==1.3.2
@@ -1089,7 +1090,7 @@ default-package-overrides:
   - interpolatedstring-perl6 ==1.0.0
   - IntervalMap ==0.5.2.0
   - intervals ==0.7.2
-  - intro ==0.1.0.8
+  - intro ==0.1.0.10
   - invariant ==0.4
   - invertible ==0.2.0.2
   - io-choice ==0.0.6
@@ -1105,7 +1106,7 @@ default-package-overrides:
   - IPv6Addr ==0.6.3
   - irc ==0.6.1.0
   - irc-client ==0.4.4.1
-  - irc-conduit ==0.2.2.0
+  - irc-conduit ==0.2.2.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.0
   - islink ==0.1.0.0
@@ -1164,7 +1165,7 @@ 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.5.1
+  - language-puppet ==1.3.6
   - language-python ==0.5.4
   - language-thrift ==0.10.0.0
   - large-hashable ==0.1.0.3
@@ -1223,7 +1224,7 @@ default-package-overrides:
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.1
-  - lucid ==2.9.7
+  - lucid ==2.9.8.1
   - lucid-svg ==0.7.0.0
   - lzma-conduit ==1.1.3.1
   - machines ==0.6.1
@@ -1259,6 +1260,7 @@ default-package-overrides:
   - metrics ==0.4.0.1
   - MFlow ==0.4.6.0
   - mfsolve ==0.3.2.0
+  - microbench ==0.1
   - microformats2-parser ==1.0.1.6
   - microlens ==0.4.7.0
   - microlens-aeson ==2.2.0
@@ -1293,10 +1295,10 @@ default-package-overrides:
   - monad-par ==0.3.4.8
   - monad-par-extras ==0.3.3
   - monad-parallel ==0.7.2.2
-  - monad-peel ==0.2.1.1
+  - monad-peel ==0.2.1.2
   - monad-primitive ==0.1
   - monad-products ==4.0.1
-  - monad-skeleton ==0.1.2.2
+  - monad-skeleton ==0.1.3
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.0
@@ -1309,7 +1311,7 @@ default-package-overrides:
   - MonadRandom ==0.5.1
   - monads-tf ==0.1.0.3
   - mongoDB ==2.1.1.1
-  - mono-traversable ==1.0.1.3
+  - mono-traversable ==1.0.2
   - mono-traversable-instances ==0.1.0.0
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.3.1
@@ -1646,7 +1648,7 @@ default-package-overrides:
   - rest-types ==1.14.1.1
   - rest-wai ==0.2.0.1
   - result ==0.2.6.0
-  - rethinkdb ==2.2.0.8
+  - rethinkdb ==2.2.0.9
   - rethinkdb-client-driver ==0.0.23
   - retry ==0.7.4.2
   - rev-state ==0.1.2
@@ -1703,7 +1705,7 @@ default-package-overrides:
   - servant-docs ==0.9.1.1
   - servant-elm ==0.4.0.1
   - servant-foreign ==0.9.1.1
-  - servant-js ==0.9.2
+  - servant-js ==0.9.3
   - servant-JuicyPixels ==0.3.0.2
   - servant-lucid ==0.7.1
   - servant-mock ==0.8.1.1
@@ -1813,7 +1815,7 @@ default-package-overrides:
   - storable-endian ==0.2.6
   - storable-record ==0.0.3.1
   - Strafunski-StrategyLib ==5.0.0.10
-  - stratosphere ==0.4.0
+  - stratosphere ==0.4.1
   - streaming ==0.1.4.5
   - streaming-bytestring ==0.1.4.6
   - streaming-commons ==0.1.17
@@ -1831,6 +1833,10 @@ default-package-overrides:
   - stringable ==0.1.3
   - stringbuilder ==0.5.0
   - stringsearch ==0.3.6.6
+  - stripe-core ==2.2.1
+  - stripe-haskell ==2.2.1
+  - stripe-http-streams ==2.2.1
+  - stripe-tests ==2.2.1
   - strive ==3.0.2
   - stylish-haskell ==0.7.1.0
   - success ==0.2.6
@@ -1863,7 +1869,7 @@ default-package-overrides:
   - tar-conduit ==0.1.0
   - tardis ==0.4.1.0
   - tasty ==0.11.2
-  - tasty-ant-xml ==1.0.4
+  - tasty-ant-xml ==1.0.5
   - tasty-auto ==0.1.0.2
   - tasty-dejafu ==0.3.0.2
   - tasty-discover ==1.1.0
@@ -2017,7 +2023,7 @@ default-package-overrides:
   - Unixutils ==1.54.1
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.7.2
-  - uri-bytestring ==0.2.3.0
+  - uri-bytestring ==0.2.3.1
   - uri-encode ==1.5.0.5
   - uri-templater ==0.2.1.0
   - url ==2.1.3
@@ -2172,27 +2178,27 @@ default-package-overrides:
   - Yampa ==0.10.5
   - YampaSynth ==0.2
   - yes-precure5-command ==5.5.3
-  - yesod ==1.4.4
-  - yesod-auth ==1.4.16
+  - yesod ==1.4.5
+  - 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-bin ==1.5.1
-  - yesod-core ==1.4.31
-  - yesod-eventsource ==1.4.0.1
+  - yesod-bin ==1.5.2
+  - yesod-core ==1.4.32
+  - yesod-eventsource ==1.4.1
   - yesod-fay ==0.8.0
-  - yesod-form ==1.4.10
+  - yesod-form ==1.4.11
   - yesod-form-richtext ==0.1.0.0
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
   - yesod-newsfeed ==1.6
-  - yesod-persistent ==1.4.1.1
+  - yesod-persistent ==1.4.2
   - yesod-sitemap ==1.4.0.1
-  - yesod-static ==1.5.1.1
+  - yesod-static ==1.5.2
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.4.1
-  - yesod-websockets ==0.2.5
+  - yesod-test ==1.5.5
+  - yesod-websockets ==0.2.6
   - yi-core ==0.13.5
   - yi-frontend-vty ==0.13.5
   - yi-fuzzy-open ==0.13.5
@@ -2209,7 +2215,7 @@ default-package-overrides:
   - yjtools ==0.9.18
   - zero ==0.1.4
   - zeromq4-haskell ==0.6.5
-  - zip ==0.1.8
+  - zip ==0.1.9
   - zip-archive ==0.3.0.5
   - zippers ==0.2.2
   - zlib ==0.6.1.2

From d7496b560edc773d89fad211a8f446d286fff984 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 7 Mar 2017 08:20:29 -0500
Subject: [PATCH 1909/3449] gi-webkit2: fix gi-javascriptcore dependency

This actually depends on the specially-versioned gi-javascriptcore
package.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index c62d2702b44e..3ec5ffc3d968 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -424,6 +424,9 @@ self: super: builtins.intersectAttrs super {
   gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
   gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
 
+  # Requires gi-javascriptcore API version 4
+  gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; };
+
   # requires valid, writeable $HOME
   hatex-guide = overrideCabal super.hatex-guide (drv: {
     preConfigure = ''

From 763e21e982370f67c126f92a1113ea949db3b6e0 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 7 Mar 2017 08:24:22 -0500
Subject: [PATCH 1910/3449] haskell-gi-base: propagate gobjectIntrospection
 dependency

So the thinking is: anything that needs `haskell-gi-base` is going to
need `gobjectIntrospection` in order to work correctly; by adding this
one `buildDepends` (which therefore gets propagated), we put ourselves
in a position to simplify away a bunch of code in `cabal2nix`.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 3ec5ffc3d968..85421ba960e8 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -420,6 +420,9 @@ self: super: builtins.intersectAttrs super {
   # tests require git
   hapistrano = addBuildTool super.hapistrano pkgs.git;
 
+  # This propagates this to everything depending on haskell-gi-base
+  haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
+
   # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
   gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
   gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };

From 4c751ced376e0042ddd4f2aa8bd40754b9ea8926 Mon Sep 17 00:00:00 2001
From: Parnell Springmeyer <parnell@digitalmentat.com>
Date: Wed, 8 Mar 2017 08:57:52 -0600
Subject: [PATCH 1911/3449] security-wrapper: Don't remove the old paths yet as
 that can create migration pain

---
 nixos/modules/security/wrappers/default.nix | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 65d875c3a375..0aca39fd6bed 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -177,25 +177,6 @@ in
           # programs to be wrapped.
           WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
-          # Remove the old /var/setuid-wrappers path from the system...
-          #
-          # TODO: this is only necessary for ugprades 16.09 => 17.x;
-          # this conditional removal block needs to be removed after
-          # the release.
-          if [ -d /var/setuid-wrappers ]; then
-            rm -rf /var/setuid-wrappers
-          fi
-
-          # Remove the old /run/setuid-wrappers-dir path from the
-          # system as well...
-          #
-          # TODO: this is only necessary for ugprades 16.09 => 17.x;
-          # this conditional removal block needs to be removed after
-          # the release.
-          if [ -d /run/setuid-wrapper-dirs ]; then
-            rm -rf /run/setuid-wrapper-dirs
-          fi
-
           # We want to place the tmpdirs for the wrappers to the parent dir.
           wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
           chmod a+rx $wrapperDir

From 07905c8f93b444acd231adf9559dc55b2dc6fc73 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Tue, 7 Mar 2017 20:45:22 +0100
Subject: [PATCH 1912/3449] haskell: ghcjs packages: fix ghcjs-dom-jsffi with
 newer Cabal

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

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index e4a4f74907a8..bea914354de0 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -126,7 +126,8 @@ self: super:
   });
 
   ghcjs-dom-jsffi = overrideCabal super.ghcjs-dom-jsffi (drv: {
-    libraryHaskellDepends = [ self.ghcjs-base self.text ];
+    setupHaskellDepends = (drv.setupHaskellDepends or []) ++ [ self.Cabal_1_24_2_0 ];
+    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ [ self.ghcjs-base self.text ];
     isLibrary = true;
   });
 

From 3bc5a68a63605c86f8a3822476a947a4f40ce5d6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 6 Mar 2017 08:33:16 -0600
Subject: [PATCH 1913/3449] llvm4: enable tests

---
 pkgs/development/compilers/llvm/4/llvm.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 2d36f7cd0fb1..c346f536158e 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -50,12 +50,19 @@ in stdenv.mkDerivation rec {
   # 10.9. This is a temporary measure until nixpkgs darwin support is
   # updated.
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-        sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
+    sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc
   ''
   # Patch llvm-config to return correct library path based on --link-{shared,static}.
   + stdenv.lib.optionalString (enableSharedLibraries) ''
     substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib
     patch -p1 < ./llvm-outputs.patch
+  ''
+  # Remove broken tests: (https://bugs.llvm.org//show_bug.cgi?id=31610)
+  + ''
+    rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata1.ll
+    rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata2.ll
+    rm test/CodeGen/AMDGPU/invalid-opencl-version-metadata3.ll
+    rm test/CodeGen/AMDGPU/runtime-metadata.ll
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -85,6 +92,14 @@ in stdenv.mkDerivation rec {
     rm -fR $out
 
     paxmark m bin/{lli,llvm-rtdyld}
+    paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
+    paxmark m unittests/ExecutionEngine/Orc/OrcJITTests
+    paxmark m unittests/Support/SupportTests
+    paxmark m bin/lli-child-target
+  '';
+
+  preCheck = ''
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
   '';
 
   postInstall = ""
@@ -103,6 +118,10 @@ in stdenv.mkDerivation rec {
     ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
   '';
 
+  doCheck = stdenv.isLinux;
+
+  checkTarget = "check-all";
+
   enableParallelBuilding = true;
 
   passthru.src = src;

From 8d10f1dc5b05a29bd5d64ce698543be4be09b472 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 8 Mar 2017 09:57:41 -0600
Subject: [PATCH 1914/3449] llvm4: rc3 -> rc4

---
 pkgs/development/compilers/llvm/4/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/4/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/4/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/4/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/4/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/4/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/4/llvm.nix           | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 5be8ffd91cf1..c0a33f03e0f2 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -6,7 +6,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "1lsdyrz82vyrsc7k0ah1zmzzan61s5kakxrkxgfbmklp3pclfkwp"}
+      unpackFile ${fetch "cfe" "062n17mfsn85dx3qy1qvq8rfxi7hcbr2nj70v2dah3xmy28i3yaq"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index cbb3852057df..aed77b7513ad 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -3,7 +3,7 @@ let
   callPackage = newScope (self // { inherit stdenv isl release_version version fetch; });
 
   release_version = "4.0.0";
-  rc = "rc3";
+  rc = "rc4";
   version = "${release_version}${rc}";
 
   fetch = name: sha256: fetchurl {
@@ -13,8 +13,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "0jfqhz95cp15c5688c6l9mr12s0qp86milpcrjlc93dc2jy08ba5";
-  clang-tools-extra_src = fetch "clang-tools-extra" "1c9c507w3f5vm153rdd0kmzvv2ski6z439izk01zf5snfwkqxkq8";
+  compiler-rt_src = fetch "compiler-rt" "1bxz2z9mxbx7211xfgsn5inwvpz53d1cqg76h8166dsli27xwkjm";
+  clang-tools-extra_src = fetch "clang-tools-extra" "0zkgnnv3srqxf44q4a5n3wpizf71mlq8w5rnwfwhdx777k94s5nx";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 57e064fb79ad..753aded54ff7 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "15l6bcmwczspbqcq4m2lmzb23g11axr9m8dayn25iys26nn00q43";
+  src = fetch "libcxx" "052fc91y8084830ajfm8nkc0vghafhnfl7l89b68qsyz3ra93i3l";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index fc1a6d84caa8..23269f605f09 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "1frj1wz780xcwq77icfclnw6q4c8bkkdzkqsrmfjv9963kjylsy5";
+  src = fetch "libcxxabi" "02z8d0q42wfmnnd0rd1yg2x4y50rfrv1k9rq00a86b6803dc7p45";
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index 7fe08cb02625..e62e50b2d316 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "0kmyp7iyf4f76wgy87jczkyhvzhlwfydvxgggl74z0x89xgry745";
+  src = fetch "lld" "00wy4qczh4s6g49sbfmyk21845zx5qc2qpm39bznqz8ynpnh4phc";
 
   buildInputs = [ cmake llvm ];
 
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 23667e6afcd7..4fec3ad1a894 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "1qr0ky7llwgjgx1pzkp3pnz32nb6f7lvg8qg6rp5axhgpkx54hz7";
+  src = fetch "lldb" "14dy1j48nw10w8brkpmla2vjjwfr1mrsl9wfabjfx1j85ywp3h69";
 
   patchPhase = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index c346f536158e..1470e7d510fa 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  src = fetch "llvm" "0ic3y9gaissi6ixyj9x1c0pq69wfbl2svhprp33av0b58f7wj9v7";
+  src = fetch "llvm" "1ljb5y5wgypk3sy8zcd5qdgsm5hw8vl7cy6874mbf4gnk9k809b1";
   shlib = if stdenv.isDarwin then "dylib" else "so";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib

From e3b84d71a674836fc1c65fcc6c030e63a65a0daf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 8 Mar 2017 17:12:03 +0100
Subject: [PATCH 1915/3449] nixpkgs: add aarch64-linux to release-lib

cc #23638
---
 pkgs/top-level/release-lib.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/release-lib.nix b/pkgs/top-level/release-lib.nix
index 5fe87711c016..a6e574a7d11a 100644
--- a/pkgs/top-level/release-lib.nix
+++ b/pkgs/top-level/release-lib.nix
@@ -25,6 +25,7 @@ rec {
   pkgsFor = system:
     if system == "x86_64-linux" then pkgs_x86_64_linux
     else if system == "i686-linux" then pkgs_i686_linux
+    else if system == "aarch64-linux" then pkgs_aarch64_linux
     else if system == "x86_64-darwin" then pkgs_x86_64_darwin
     else if system == "x86_64-freebsd" then pkgs_x86_64_freebsd
     else if system == "i686-freebsd" then pkgs_i686_freebsd
@@ -34,6 +35,7 @@ rec {
 
   pkgs_x86_64_linux = allPackages { system = "x86_64-linux"; };
   pkgs_i686_linux = allPackages { system = "i686-linux"; };
+  pkgs_aarch64_linux = allPackages { system = "aarch64-linux"; };
   pkgs_x86_64_darwin = allPackages { system = "x86_64-darwin"; };
   pkgs_x86_64_freebsd = allPackages { system = "x86_64-freebsd"; };
   pkgs_i686_freebsd = allPackages { system = "i686-freebsd"; };

From fb5369dbe9697ee191cdf099cd9cc737a2d48f15 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 8 Mar 2017 17:18:18 +0100
Subject: [PATCH 1916/3449] haskellPackages.streaming-eversion: dontCheck

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6163e177a898..f37d8b4c9c7f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -875,4 +875,6 @@ self: super: {
   # 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 49b20e5569c584f2f2db6475ab6ab63ee7d62116 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Mar 2017 10:55:16 -0500
Subject: [PATCH 1917/3449] buildbot: assorted cleanups

Some changes to be more idiomatic and use stdenv building blocks more.
I also added a `buildbot.withPlugins` instead of the current plugins
mechanism, which forces an unnecessary rebuild of the package and reruns
all the tests. This should be equivalent and more pleasant to use in
practice.
---
 .../tools/build-managers/buildbot/default.nix | 151 +++++++++---------
 .../tools/build-managers/buildbot/worker.nix  |   8 +-
 pkgs/top-level/all-packages.nix               |   8 +-
 3 files changed, 85 insertions(+), 82 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index b9b8dc719270..ad37aee5bb98 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,76 +1,83 @@
-{ stdenv, lib, fetchurl, coreutils, openssh, buildbot-worker, makeWrapper,
-  pythonPackages, gnused, plugins ? [] }:
+{ stdenv, lib, openssh, buildbot-worker, pythonPackages, runCommand, makeWrapper }:
 
-pythonPackages.buildPythonApplication (rec {
-  name = "${pname}-${version}";
-  pname = "buildbot";
-  version = "0.9.4";
-  src = fetchurl {
-    url = "mirror://pypi/b/${pname}/${name}.tar.gz";
-    sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086";
-  };
-
-  buildInputs = with pythonPackages; [
-    lz4
-    txrequests
-    pyjade
-    boto3
-    moto
-    txgithub
-    mock
-    setuptoolsTrial
-    isort
-    pylint
-    astroid
-    pyflakes
-    openssh
-    buildbot-worker
-    makeWrapper
-    treq
-  ];
-
-  propagatedBuildInputs = with pythonPackages; [
-
-    # core
-    twisted
-    jinja2
-    zope_interface
-    sqlalchemy
-    sqlalchemy_migrate
-    future
-    dateutil
-    txaio
-    autobahn
-    pyjwt
-
-    # tls
-    pyopenssl
-    service-identity
-    idna
-
-    # docs
-    sphinx
-    sphinxcontrib-blockdiag
-    sphinxcontrib-spelling
-    pyenchant
-    docutils
-    ramlfications
-    sphinx-jinja
-
-  ] ++ plugins;
-
-  postPatch = ''
-    ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py
+let
+  withPlugins = plugins: runCommand "wrapped-${package.name}" {
+    buildInputs = [ makeWrapper ];
+    passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins);
+  } ''
+    makeWrapper ${package}/bin/buildbot $out/bin/buildbot \
+      --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" pythonPackages.python.sitePackages plugins}
   '';
 
-  postFixup = ''
-    makeWrapper $out/bin/.buildbot-wrapped $out/bin/buildbot --set PYTHONPATH "$PYTHONPATH"
-  '';
+  package = pythonPackages.buildPythonApplication (rec {
+    name = "${pname}-${version}";
+    pname = "buildbot";
+    version = "0.9.4";
 
-  meta = with stdenv.lib; {
-    homepage = http://buildbot.net/;
-    description = "Continuous integration system that automates the build/test cycle";
-    maintainers = with maintainers; [ nand0p ryansydnor ];
-    license = licenses.gpl2;
-  };
-})
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "0wklrn4fszac9wi8zw3vbsznwyff6y57cz0i81zvh46skb6n3086";
+    };
+
+    buildInputs = with pythonPackages; [
+      lz4
+      txrequests
+      pyjade
+      boto3
+      moto
+      txgithub
+      mock
+      setuptoolsTrial
+      isort
+      pylint
+      astroid
+      pyflakes
+      openssh
+      buildbot-worker
+      treq
+    ];
+
+    propagatedBuildInputs = with pythonPackages; [
+
+      # core
+      twisted
+      jinja2
+      zope_interface
+      sqlalchemy
+      sqlalchemy_migrate
+      future
+      dateutil
+      txaio
+      autobahn
+      pyjwt
+
+      # tls
+      pyopenssl
+      service-identity
+      idna
+
+      # docs
+      sphinx
+      sphinxcontrib-blockdiag
+      sphinxcontrib-spelling
+      pyenchant
+      docutils
+      ramlfications
+      sphinx-jinja
+
+    ];
+
+    postPatch = ''
+      substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
+    '';
+
+    passthru = { inherit withPlugins; };
+
+    meta = with stdenv.lib; {
+      homepage = http://buildbot.net/;
+      description = "Continuous integration system that automates the build/test cycle";
+      maintainers = with maintainers; [ nand0p ryansydnor ];
+      license = licenses.gpl2;
+    };
+  });
+in package
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 3023555d22c1..b9b4b86aa442 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, gnused, coreutils, pythonPackages }:
+{ stdenv, pythonPackages }:
 
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
   version = "0.9.4";
 
-  src = fetchurl {
-    url = "mirror://pypi/b/${pname}/${name}.tar.gz";
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
     sha256 = "0rdrr8x7sn2nxl51p6h9ad42s3c28lb6sys84zrg0d7fm4zhv7hj";
   };
 
@@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication (rec {
   propagatedBuildInputs = with pythonPackages; [ twisted future ];
 
   postPatch = ''
-    ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot_worker/scripts/logwatcher.py
+    substituteInPlace buildbot_worker/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47e9b4213a8a..d480b617e0b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6220,12 +6220,8 @@ with pkgs;
   buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix {
     pythonPackages = python2Packages;
   };
-  buildbot-ui = self.buildbot.override {
-    plugins = with self.buildbot-plugins; [ www ];
-  };
-  buildbot-full = self.buildbot.override {
-    plugins = with self.buildbot-plugins; [ www console-view waterfall-view ];
-  };
+  buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
+  buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view ]);
 
   buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
 

From ca5a1d927f13c4c36e2112c68b3512eda5f76e0c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Mar 2017 12:39:44 -0500
Subject: [PATCH 1918/3449] buildbot: fix .withPlugins to propagate inputs

Before I was just grabbing the immediate dependencies. I _think_ this
will do the right thing by using the pre-existing setup hook to avoid
having to compute the transitive closure myself.
---
 pkgs/development/tools/build-managers/buildbot/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index ad37aee5bb98..ed24e917a1cb 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -2,11 +2,10 @@
 
 let
   withPlugins = plugins: runCommand "wrapped-${package.name}" {
-    buildInputs = [ makeWrapper ];
+    buildInputs = [ makeWrapper ] ++ plugins;
     passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins);
   } ''
-    makeWrapper ${package}/bin/buildbot $out/bin/buildbot \
-      --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" pythonPackages.python.sitePackages plugins}
+    makeWrapper ${package}/bin/buildbot $out/bin/buildbot --prefix PYTHONPATH : $PYTHONPATH
   '';
 
   package = pythonPackages.buildPythonApplication (rec {

From adf044e1fbb723e65942da887486a873c022e3ac Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Mar 2017 23:40:31 +0100
Subject: [PATCH 1919/3449] nixos/dnscrypt-proxy: refactoring

Use mkMerge to make the code a little more ergonomic and easier
to follow (to my eyes, anyway ...).  Also take the opportunity
to do some minor cleanups & tweaks, but no functional changes.
---
 .../services/networking/dnscrypt-proxy.nix    | 114 ++++++++++--------
 1 file changed, 62 insertions(+), 52 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 462039803f80..60ce0bc2aa26 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -155,15 +155,59 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-
+  config = mkIf cfg.enable (mkMerge [{
     assertions = [
       { assertion = (cfg.customResolver != null) || (cfg.resolverName != null);
         message   = "please configure upstream DNSCrypt resolver";
       }
     ];
 
-    security.apparmor.profiles = optional apparmorEnabled (pkgs.writeText "apparmor-dnscrypt-proxy" ''
+    users.users.dnscrypt-proxy = {
+      description = "dnscrypt-proxy daemon user";
+      isSystemUser = true;
+      group = "dnscrypt-proxy";
+    };
+    users.groups.dnscrypt-proxy = {};
+
+    systemd.sockets.dnscrypt-proxy = {
+      description = "dnscrypt-proxy listening socket";
+      documentation = [ "man:dnscrypt-proxy(8)" ];
+
+      wantedBy = [ "sockets.target" ];
+
+      socketConfig = {
+        ListenStream = localAddress;
+        ListenDatagram = localAddress;
+      };
+    };
+
+    systemd.services.dnscrypt-proxy = {
+      description = "dnscrypt-proxy daemon";
+      documentation = [ "man:dnscrypt-proxy(8)" ];
+
+      before = [ "nss-lookup.target" ];
+
+      after = [ "network.target" ]
+        ++ optional apparmorEnabled "apparmor.service";
+
+      requires = [ "dnscrypt-proxy.socket "]
+        ++ optional apparmorEnabled "apparmor.service";
+
+      serviceConfig = {
+        NonBlocking = "true";
+        ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
+
+        User = "dnscrypt-proxy";
+
+        PrivateTmp = true;
+        PrivateDevices = true;
+        ProtectHome = true;
+      };
+    };
+    }
+
+    (mkIf apparmorEnabled {
+    security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
       ${dnscrypt-proxy}/bin/dnscrypt-proxy {
         /dev/null rw,
         /dev/urandom r,
@@ -188,35 +232,35 @@ in
         ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
         ${getLib pkgs.libcap}/lib/libcap.so.* mr,
         ${getLib pkgs.lz4}/lib/liblz4.so.* mr,
-        ${getLib pkgs.attr}/lib/libattr.so.* mr,
+        ${getLib pkgs.attr}/lib/libattr.so.* mr, # */
 
         ${resolverList} r,
       }
     '');
+    })
 
-    users.users.dnscrypt-proxy = {
-      description = "dnscrypt-proxy daemon user";
-      isSystemUser = true;
-      group = "dnscrypt-proxy";
-    };
-    users.groups.dnscrypt-proxy = {};
-
-    systemd.services.init-dnscrypt-proxy-statedir = optionalAttrs useUpstreamResolverList {
+    (mkIf useUpstreamResolverList {
+    systemd.services.init-dnscrypt-proxy-statedir = {
       description = "Initialize dnscrypt-proxy state directory";
+
+      wantedBy = [ "dnscrypt-proxy.service" ];
+      before = [ "dnscrypt-proxy.service" ];
+
       script = ''
         mkdir -pv ${stateDirectory}
         chown -c dnscrypt-proxy:dnscrypt-proxy ${stateDirectory}
-        cp --preserve=timestamps -uv \
+        cp -uv \
           ${pkgs.dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv \
           ${stateDirectory}
       '';
+
       serviceConfig = {
         Type = "oneshot";
         RemainAfterExit = true;
       };
     };
 
-    systemd.services.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList {
+    systemd.services.update-dnscrypt-resolvers = {
       description = "Update list of DNSCrypt resolvers";
 
       requires = [ "init-dnscrypt-proxy-statedir.service" ];
@@ -243,47 +287,13 @@ in
       };
     };
 
-    systemd.timers.update-dnscrypt-resolvers = optionalAttrs useUpstreamResolverList {
+    systemd.timers.update-dnscrypt-resolvers = {
+      wantedBy = [ "timers.target" ];
       timerConfig = {
         OnBootSec = "5min";
         OnUnitActiveSec = "6h";
       };
-      wantedBy = [ "timers.target" ];
     };
-
-    systemd.sockets.dnscrypt-proxy = {
-      description = "dnscrypt-proxy listening socket";
-      socketConfig = {
-        ListenStream = localAddress;
-        ListenDatagram = localAddress;
-      };
-      wantedBy = [ "sockets.target" ];
-    };
-
-    systemd.services.dnscrypt-proxy = {
-      description = "dnscrypt-proxy daemon";
-
-      before = [ "nss-lookup.target" ];
-
-      after = [ "network.target" ]
-        ++ optional apparmorEnabled "apparmor.service"
-        ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service";
-
-      requires = [ "dnscrypt-proxy.socket "]
-        ++ optional apparmorEnabled "apparmor.service"
-        ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service";
-
-      serviceConfig = {
-        Type = "simple";
-        NonBlocking = "true";
-        ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
-
-        User = "dnscrypt-proxy";
-
-        PrivateTmp = true;
-        PrivateDevices = true;
-        ProtectHome = true;
-      };
-    };
-  };
+    })
+    ]);
 }

From e72aaa73eacb15b82270fe702517be97d1beba37 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 7 Mar 2017 23:17:01 +0100
Subject: [PATCH 1920/3449] nixos/dnscrypt-proxy: support updating before nss
 is up

Resolve download.dnscrypt.org using hostip with a bootstrap
resolver (hard-coded to Google Public DNS for now), to ensure
that we can get an up-to-date resolver list without working name
service lookups. This makes us more robust to the upstream
resolver list getting out of date and other DNS configuration
problems.

We use the curl --resolver switch to allow https cert validation
(we'd need to do --insecure if using just the ip addr). Note
that we don't rely on https for security but it's nice to have
it ...
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 60ce0bc2aa26..636caf25a552 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -266,13 +266,15 @@ in
       requires = [ "init-dnscrypt-proxy-statedir.service" ];
       after = [ "init-dnscrypt-proxy-statedir.service" ];
 
-      path = with pkgs; [ curl minisign ];
+      path = with pkgs; [ curl dnscrypt-proxy minisign ];
       script = ''
         cd ${stateDirectory}
-        curl -fSsL -o dnscrypt-resolvers.csv.tmp \
-          https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv
-        curl -fSsL -o dnscrypt-resolvers.csv.minisig.tmp \
-          https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig
+        domain=download.dnscrypt.org
+        get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)"
+        $get -o dnscrypt-resolvers.csv.tmp \
+          https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv
+        $get -o dnscrypt-resolvers.csv.minisig.tmp \
+          https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig
         mv dnscrypt-resolvers.csv.minisig{.tmp,}
         minisign -q -V -p ${upstreamResolverListPubKey} \
           -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig

From 5f27abec233604ebe543e4fc833f282a7c835b3f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 8 Mar 2017 00:42:20 +0100
Subject: [PATCH 1921/3449] nixos/dnscrypt-proxy: more fs isolation for the
 updater

It'd be better to do the update as an unprivileged user; for
now, we do our best to minimize the surface available.  We
filter mount syscalls to prevent the process from undoing the fs
isolation.
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 636caf25a552..ad1559e21df7 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -285,7 +285,9 @@ in
         PrivateTmp = true;
         PrivateDevices = true;
         ProtectHome = true;
-        ProtectSystem = true;
+        ProtectSystem = "strict";
+        ReadWritePaths = "${dirOf stateDirectory} ${stateDirectory}";
+        SystemCallFilter = "~@mount";
       };
     };
 

From 06520c7fb785b872e17112bf8be0b6ae1d7d0ec0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 8 Mar 2017 03:09:22 +0100
Subject: [PATCH 1922/3449] nixos/dnscrypt-proxy: indicate update status

Make it easier for the user to tell when the list is updated
and, at their option, see what changed.
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index ad1559e21df7..8e9747b29667 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -266,7 +266,7 @@ in
       requires = [ "init-dnscrypt-proxy-statedir.service" ];
       after = [ "init-dnscrypt-proxy-statedir.service" ];
 
-      path = with pkgs; [ curl dnscrypt-proxy minisign ];
+      path = with pkgs; [ curl diffutils dnscrypt-proxy minisign ];
       script = ''
         cd ${stateDirectory}
         domain=download.dnscrypt.org
@@ -278,7 +278,13 @@ in
         mv dnscrypt-resolvers.csv.minisig{.tmp,}
         minisign -q -V -p ${upstreamResolverListPubKey} \
           -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig
+        [[ -f dnscrypt-resolvers.csv ]] && mv dnscrypt-resolvers.csv{,.old}
         mv dnscrypt-resolvers.csv{.tmp,}
+        if cmp dnscrypt-resolvers.csv{,.old} ; then
+          echo "no change"
+        else
+          echo "resolver list updated"
+        fi
       '';
 
       serviceConfig = {

From a3a21a72453299ea0423762ffad2a438d63b4dce Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 8 Mar 2017 20:09:38 +0200
Subject: [PATCH 1923/3449] delve: Disable on i686

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

diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix
index fc8488ee104e..9fe9c46816af 100644
--- a/pkgs/development/tools/delve/default.nix
+++ b/pkgs/development/tools/delve/default.nix
@@ -19,5 +19,6 @@ buildGoPackage rec {
     homepage = "https://github.com/derekparker/delve";
     maintainers = with stdenv.lib.maintainers; [ vdemeester ];
     license = stdenv.lib.licenses.mit;
+    platforms = [ "x86_64-linux" ];
   };
 }

From 8dce538640973c590ac51388a4e2338c4ba9cf4e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 8 Mar 2017 20:15:36 +0200
Subject: [PATCH 1924/3449] gtkglextmm: Mark as broken

No release since 2010. Build broken. Sounds like a library, but no
users. GNOME 2 stuff.

http://hydra.nixos.org/build/49554500/nixlog/3
---
 pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
index 97bad111ca74..152c1d98b8c8 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
@@ -28,9 +28,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "C++ wrappers for GtkGLExt";
-
     license = stdenv.lib.licenses.lgpl2Plus;
-
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }

From 74f8e0fd7aeac19a47cd83197e5ff03d54fe6e03 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 8 Mar 2017 19:42:15 +0100
Subject: [PATCH 1925/3449] torbrowser: 6.5 -> 6.5.1

---
 pkgs/tools/security/tor/torbrowser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index fc77628a3c60..80a92b4a932e 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -24,13 +24,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "6.5";
+  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
-      "0q0rdwjiqjjh9awiyp0a55nkhyri5y6zhkyq3n3x6w4afihl0wf4" else
-      "1y1sx2gp7c66l7a4smfibl8mv54byvawhhkikpa5l2vic75vyhk9";
+      "1p2bgavvyzahqpjg9vp14c0s50rmha3v1hs1c8zvz6fj8fgrhn0i" else
+      "1zfghr01bhpn39wqaw7hyx7yap7xyla4m3mrgz2vi9a5qsyxmbcr";
   };
 
   preferLocalBuild = true;

From 4ae5f4d3ccbe2bea5b53ebd6600218504f632051 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Mar 2017 14:14:27 -0500
Subject: [PATCH 1926/3449] pythonPackages.cryptography: fix test on macOS
 10.12

Hydra didn't notice because it's running 10.11.
---
 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 63fc33ed17eb..e5f9e191304c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4526,6 +4526,14 @@ in {
     propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules pytz ]
      ++ optional (pythonOlder "3.4") self.enum34;
 
+    # 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 = ''
+      substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"'
+    '';
+
     # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
     # can do until nix 1.11's release
     __impureHostDeps = [ "/usr/lib" ];

From d39be63a1076c55b46d967869c7c86476b012ead Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 8 Mar 2017 14:25:06 -0500
Subject: [PATCH 1927/3449] stripDirs: Silence annoying 'File format not
 recognized' errors

---
 pkgs/build-support/setup-hooks/strip.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
index 6860c9b9cb9a..0bf37e10d870 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/pkgs/build-support/setup-hooks/strip.sh
@@ -30,7 +30,7 @@ stripDirs() {
 
     if [ -n "${dirs}" ]; then
         header "stripping (with flags $stripFlags) in$dirs"
-        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
+        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags 2>/dev/null || true
         stopNest
     fi
 }

From 5f5b87107f89ae0de0b1e39890a7906f162d4f00 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Mar 2017 21:16:31 +0200
Subject: [PATCH 1928/3449] raspberrypifw, linux_rpi: 1.20161020 -> 1.20170303

---
 pkgs/os-specific/linux/firmware/raspberrypi/default.nix | 4 ++--
 pkgs/os-specific/linux/kernel/linux-rpi.nix             | 8 ++++----
 pkgs/top-level/all-packages.nix                         | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index 03281d2ee3a4..50ffe7d25e66 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20161020";
+  version = "1.20170303";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "073cry7xqrbkn8p1qzl4f3z6jvcbks4i61fz7i2pbwa60vddcp34";
+    sha256 = "1s5dycgix97681vpq7ggpc27n865wgv9npzxvbr2q2bp3ia9mcim";
   };
 
   dontStrip = true;    # Stripping breaks some of the binaries
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index e50a6c802326..264d4dffee1e 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.4.26";
-  tag = "1.20161020-1";
+  modDirVersion = "4.4.50";
+  tag = "1.20170303";
 in
 stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -11,8 +11,8 @@ stdenv.lib.overrideDerivation (import ./generic.nix (args // rec {
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "linux";
-    rev = "raspberrypi-kernel_${tag}";
-    sha256 = "0y76xrapq7710zzf6sif94xzly72gg505y65lslfirng500ncnv5";
+    rev = "raspberrypi-kernel_${tag}-1";
+    sha256 = "1lvsr8zm8p1ng4b9vq0nkf2gn4gabla8dh6l60vifclqdcq2vwvx";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2cc71f0aad9..f4e5375c99f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11384,7 +11384,6 @@ with pkgs;
   linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
     kernelPatches = with kernelPatches; [
       bridge_stp_helper
-      packet_fix_race_condition_CVE_2016_8655
       DCCP_double_free_vulnerability_CVE-2017-6074
     ];
   };

From 9188f2ed8ae463398fc9800ddd3e12a7b0ee03a7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 8 Mar 2017 21:35:12 +0200
Subject: [PATCH 1929/3449] release.nix: Fix typo

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 9c24855dc50b..889df6a00af2 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -48,7 +48,7 @@ let
               jobs.linux.aarch64-linux
               jobs.python.x86_64-linux
               jobs.python.i686-linux
-              jobs.python.aarch4-linux
+              jobs.python.aarch64-linux
               jobs.python.x86_64-darwin
               jobs.python3.x86_64-linux
               jobs.python3.i686-linux

From 116953ffc90ff09b00b0130defb52949e8d53392 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 8 Mar 2017 20:25:22 +0100
Subject: [PATCH 1930/3449] torbrowser: callPackage can fill in missing params
 from xorg

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4e5375c99f0..3ab8684bec25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4124,9 +4124,7 @@ with pkgs;
 
   tor-arm = callPackage ../tools/security/tor/tor-arm.nix { };
 
-  torbrowser = callPackage ../tools/security/tor/torbrowser.nix {
-    inherit (xorg) libXrender libX11 libXext libXt;
-  };
+  torbrowser = callPackage ../tools/security/tor/torbrowser.nix { };
 
   touchegg = callPackage ../tools/inputmethods/touchegg { };
 

From f36b72107c57f5a5c7cbd3a8f9cb63f5f0231e76 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Mar 2017 23:07:15 +0300
Subject: [PATCH 1931/3449] primus: fix if nvidia is not used

Fixes #23628
---
 pkgs/tools/X11/primus/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix
index 229e228e405c..d130c9bac7cc 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/tools/X11/primus/default.nix
@@ -20,7 +20,10 @@ let
 
   primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
   primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; };
-  ldPath = lib.makeLibraryPath ([ primus primus.glvnd ] ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]);
+  ldPath = lib.makeLibraryPath (lib.filter (x: x != null) (
+    [ primus primus.glvnd ]
+    ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]
+  ));
 
 in writeScriptBin "primusrun" ''
   #!${stdenv.shell}

From 6fb645037dcf8495a9ec3805f1f7322f5bdb9cec Mon Sep 17 00:00:00 2001
From: Jens Grunert <jens.grunert@gmail.com>
Date: Wed, 8 Mar 2017 21:39:59 +0100
Subject: [PATCH 1932/3449] missing dconf in buildInput

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

diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix
index 95a2e8877c31..07d89b53fa49 100644
--- a/pkgs/applications/networking/corebird/default.nix
+++ b/pkgs/applications/networking/corebird/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ];
 
   buildInputs = [
-    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest glib_networking
+    gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest gnome3.dconf glib_networking
   ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]);
 
   meta = {

From 661048c803f7c0c7aa1915162580b7c21316a4a3 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 7 Mar 2017 15:46:53 +1100
Subject: [PATCH 1933/3449] platypus: init at 2017-03-07

---
 .../science/biology/platypus/default.nix      | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/science/biology/platypus/default.nix

diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix
new file mode 100644
index 000000000000..868540fcbc3b
--- /dev/null
+++ b/pkgs/applications/science/biology/platypus/default.nix
@@ -0,0 +1,38 @@
+{stdenv, fetchFromGitHub, python27, htslib, zlib, makeWrapper}:
+
+let python = python27.withPackages (ps: with ps; [ cython ]);
+
+in stdenv.mkDerivation rec {
+  name = "platypus-unstable-${version}";
+  version = "2017-03-07";
+
+  src = fetchFromGitHub {
+    owner = "andyrimmer";
+    repo = "Platypus";
+    rev = "cbbd914";
+    sha256 = "0xgj3pl7n4c12j5pp5qyjfk4rsvb5inwzrpcbhdf3br5f3mmdsb9";
+  };
+
+  buildInputs = [ htslib python zlib makeWrapper ];
+
+  buildPhase = ''
+    patchShebangs .
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/libexec/platypus
+    cp -r ./* $out/libexec/platypus
+
+    mkdir -p $out/bin
+    makeWrapper ${python}/bin/python $out/bin/platypus --add-flags "$out/libexec/platypus/bin/Platypus.py"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The Platypus variant caller";
+    license = licenses.gpl3;
+    homepage = https://github.com/andyrimmer/Platypus;
+    maintainers = with maintainers; [ jbedo ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ab8684bec25..12d9b13bc781 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16996,6 +16996,8 @@ with pkgs;
 
   paml = callPackage ../applications/science/biology/paml { };
 
+  platypus = callPackage ../applications/science/biology/platypus/default.nix { };
+
   plink = callPackage ../applications/science/biology/plink/default.nix { };
 
   plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { };

From 7f214e64109438fb8a9bbffd94ca41021d8b8fa7 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 7 Mar 2017 15:54:31 +1100
Subject: [PATCH 1934/3449] bedtools: init at 2.26.0

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

diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
new file mode 100644
index 000000000000..cd5c980b0016
--- /dev/null
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchFromGitHub, zlib, python}:
+
+stdenv.mkDerivation rec {
+  name = "bedtools-${version}";
+  version = "2.26.0";
+
+  src = fetchFromGitHub {
+    owner = "arq5x";
+    repo = "bedtools2";
+    rev = "v${version}";
+    sha256 = "1j2ia68rmcw3qksjm5gvv1cb84bh76vmln59mvncr2an23f5a3ss";
+  };
+
+  buildInputs = [ zlib python ];
+  buildPhase = "make prefix=$out SHELL=${stdenv.shell} -j $NIX_BUILD_CORES";
+  installPhase = "make prefix=$out SHELL=${stdenv.shell} install";
+
+  meta = with stdenv.lib; {
+    description = "A powerful toolset for genome arithmetic.";
+    license = licenses.gpl2;
+    homepage = https://bedtools.readthedocs.io/en/latest/;
+    maintainers = with maintainers; [ jbedo ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12d9b13bc781..b3b78bf18279 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16970,6 +16970,8 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
+  bedtools = callPackage ../applications/science/biology/bedtools/default.nix { };
+
   bcftools = callPackage ../applications/science/biology/bcftools { };
 
   ecopcr = callPackage ../applications/science/biology/ecopcr { };

From 4bb50fd08cb63aefbb4b7d38092310048e62dc20 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 7 Mar 2017 16:16:03 +1100
Subject: [PATCH 1935/3449] picard-tools: init at 2.7.1

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

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
new file mode 100644
index 000000000000..3f17825202ea
--- /dev/null
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, jre, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "picard-tools-${version}";
+  version = "2.7.1";
+
+  src = fetchurl {
+    url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
+    sha256 = "0rcfcvy9zacqmh7nyqlm93hzsx6gfygmcf8d2p02h5l69gvygnb9";
+  };
+
+  buildInputs = [ jre makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/libexec/picard
+    cp $src $out/libexec/picard/picard.jar
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/picard --add-flags "-jar $out/libexec/picard/picard.jar"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tools for high-throughput sequencing (HTS) data and formats such as SAM/BAM/CRAM and VCF.";
+    license = licenses.mit;
+    homepage = https://broadinstitute.github.io/picard/;
+    maintainers = with maintainers; [ jbedo ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3b78bf18279..47e75c8632a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16998,6 +16998,8 @@ with pkgs;
 
   paml = callPackage ../applications/science/biology/paml { };
 
+  picard-tools = callPackage ../applications/science/biology/picard-tools/default.nix { };
+
   platypus = callPackage ../applications/science/biology/platypus/default.nix { };
 
   plink = callPackage ../applications/science/biology/plink/default.nix { };

From 076e513b94a4bd42c635394c393fb583f9dbadc3 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 7 Mar 2017 16:24:06 +1100
Subject: [PATCH 1936/3449] varscan: init at 2.4.2

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

diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix
new file mode 100644
index 000000000000..f685031e87e4
--- /dev/null
+++ b/pkgs/applications/science/biology/varscan/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, jre, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "varscan-${version}";
+  version = "2.4.2";
+
+  src = fetchurl {
+    url = "https://github.com/dkoboldt/varscan/releases/download/${version}/VarScan.v${version}.jar";
+    sha256 = "0cfhshinyqgwc6i7zf8lhbfybyly2x5anrz824zyvdhzz5i69zrl";
+  };
+
+  buildInputs = [ jre makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/libexec/varscan
+    cp $src $out/libexec/varscan/varscan.jar
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/varscan --add-flags "-jar $out/libexec/varscan/varscan.jar"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Variant calling and somatic mutation/CNV detection for next-generation sequencing data";
+    # VarScan 2 is free for non-commercial use by academic,
+    # government, and non-profit/not-for-profit institutions. A
+    # commercial version of the software is available, and licensed
+    # through the Office of Technology Management at Washington
+    # University School of Medicine.
+    license = licenses.unfree;
+    homepage = https://github.com/dkoboldt/varscan;
+    maintainers = with maintainers; [ jbedo ];
+    platforms = platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47e75c8632a2..d59650440477 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17008,6 +17008,8 @@ with pkgs;
 
   samtools = callPackage ../applications/science/biology/samtools/default.nix { };
 
+  varscan = callPackage ../applications/science/biology/varscan/default.nix { };
+
   bwa = callPackage ../applications/science/biology/bwa/default.nix { };
 
   ### SCIENCE/MATH

From 1ac797861b1e020c433ccda24b3ea74032fc7354 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 7 Mar 2017 16:33:04 +1100
Subject: [PATCH 1937/3449] SnpEff: init at 4.3i

---
 .../science/biology/snpeff/default.nix        | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/science/biology/snpeff/default.nix

diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix
new file mode 100644
index 000000000000..6c7a6b969ee6
--- /dev/null
+++ b/pkgs/applications/science/biology/snpeff/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchurl, jre, unzip, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "snpeff-${version}";
+  version = "4.3i";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/snpeff/snpEff_latest_core.zip";
+    sha256 = "0i1slg201c8yjfr4wrg4xcgzwi0c8b9l3fb1i73fphq6q6zdblzb";
+  };
+
+  buildInputs = [ unzip jre makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/libexec/snpeff
+    cp *.jar *.config $out/libexec/snpeff
+
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/snpeff --add-flags "-jar $out/libexec/snpeff/snpEff.jar"
+    makeWrapper ${jre}/bin/java $out/bin/snpsift --add-flags "-jar $out/libexec/snpeff/SnpSift.jar"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Genetic variant annotation and effect prediction toolbox.";
+    license = licenses.lgpl3;
+    homepage = http://snpeff.sourceforge.net/;
+    maintainers = with maintainers; [ jbedo ];
+    platforms = platforms.all;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d59650440477..97c8741d6fa6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17008,6 +17008,8 @@ with pkgs;
 
   samtools = callPackage ../applications/science/biology/samtools/default.nix { };
 
+  snpeff = callPackage ../applications/science/biology/snpeff/default.nix { };
+
   varscan = callPackage ../applications/science/biology/varscan/default.nix { };
 
   bwa = callPackage ../applications/science/biology/bwa/default.nix { };

From 1fb6fc28cf9d20a6ba95b2a7e23eb4481c1636d3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 8 Mar 2017 21:54:44 +0100
Subject: [PATCH 1938/3449] smplayer: 17.2.0 -> 17.3.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 9c2f6d041197..d7411c1128e2 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmakeHook, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-17.2.0";
+  name = "smplayer-17.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "05nqwpyh3zlyzip7chs711sz97cgijb92h44cd5aqbwbx06hihdd";
+    sha256 = "0yv7725kr3dq02mcanc07sapirx6s73l4b6d13nzvq5rkwr8crmj";
   };
 
   buildInputs = [ qtscript ];

From 44cf3c44b0b1d4f278e1be379ab24d6abbf4f71b Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Tue, 7 Mar 2017 14:52:08 +1300
Subject: [PATCH 1939/3449] dnsmasq: install launchd plist on darwin

---
 pkgs/tools/networking/dnsmasq/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 14bde9a5fa5b..4b1717e09025 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
   # module can create it in Nix-land?
   postInstall = ''
     install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf
+  '' + optionalString stdenv.isDarwin ''
+    install -Dm644 contrib/MacOSX-launchd/uk.org.thekelleys.dnsmasq.plist \
+      $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist
+    substituteInPlace $out/Library/LaunchDaemons/uk.org.thekelleys.dnsmasq.plist \
+      --replace "/usr/local/sbin" "$out/bin"
   '' + optionalString stdenv.isLinux ''
     install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf
     install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time

From ee4e630648e31ef998403be990fae3f453363537 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Wed, 8 Mar 2017 15:45:48 +0100
Subject: [PATCH 1940/3449] salt-pepper: init at 0.5.0

---
 pkgs/tools/admin/salt/pepper/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/admin/salt/pepper/default.nix

diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
new file mode 100644
index 000000000000..781e94059ad7
--- /dev/null
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -0,0 +1,19 @@
+{ lib
+, fetchurl
+, python2Packages
+}:
+
+python2Packages.buildPythonApplication rec {
+  name = "salt-pepper-${version}";
+  version = "0.5.0";
+  src = fetchurl {
+    url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
+  };
+
+  meta = {
+    description = "A CLI front-end to a running salt-api system";
+    homepage = https://github.com/saltstack/pepper;
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12504c5099e6..47edfd44698a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3314,6 +3314,8 @@ with pkgs;
 
   pell = callPackage ../applications/misc/pell { };
 
+  pepper = callPackage ../tools/admin/salt/pepper { };
+
   pick = callPackage ../tools/misc/pick { };
 
   pitivi = callPackage ../applications/video/pitivi {

From d5ef0daf7c7a363aff0e7afa81629bb04a18401d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 9 Mar 2017 00:46:13 +0100
Subject: [PATCH 1941/3449] crunch: enable darwin build

---
 pkgs/tools/security/crunch/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix
index 914d79965c3e..3e94d52fc5fc 100644
--- a/pkgs/tools/security/crunch/default.nix
+++ b/pkgs/tools/security/crunch/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation  rec {
 
   buildInputs = [ which ];
 
-  configurePhase = "true";
-
   preBuild = ''
-    sed 's/sudo //' -i Makefile
-    sed 's/-g root -o root//' -i Makefile
+    substituteInPlace Makefile \
+      --replace '-g root -o root' "" \
+      --replace '-g wheel -o root' "" \
+      --replace 'sudo ' ""
   '';
 
   makeFlags = "PREFIX=$(out)";
@@ -23,7 +23,7 @@ stdenv.mkDerivation  rec {
   meta = with stdenv.lib; {
     description = "Wordlist generator";
     homepage = https://sourceforge.net/projects/crunch-wordlist/;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ lethalman lnl7 ];
   };
 }

From f1ae64ba41958e339af2d717817ad3565908eb08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 1 Mar 2017 10:17:43 +0100
Subject: [PATCH 1942/3449] cheat: 2.1.27 -> 2.2.0

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

diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix
index 68b77bafc0ef..e1ed03c428de 100644
--- a/pkgs/applications/misc/cheat/default.nix
+++ b/pkgs/applications/misc/cheat/default.nix
@@ -1,14 +1,14 @@
 { python3Packages, fetchurl, lib }:
 
 python3Packages.buildPythonApplication rec {
-  version = "2.1.28";
+  version = "2.2.0";
   name = "cheat-${version}";
 
   propagatedBuildInputs = with python3Packages; [ docopt pygments ];
 
   src = fetchurl {
     url = "mirror://pypi/c/cheat/${name}.tar.gz";
-    sha256 = "1a5c5f3dx3dmmvv75q2w6v2xb1i6733c0f8knr6spapvlim5i0c5";
+    sha256 = "16pg1bgyfjvzpm2rbi411ckf3gljg9v1vzd5qhp23g69ch6yr138";
   };
   # no tests available
   doCheck = false;

From 80dbc4df36a72401b08d944a1b0a42c78eb6147b Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 9 Mar 2017 00:58:00 +0100
Subject: [PATCH 1943/3449] sqlitebrowser: 3.8.0 -> 3.9.1

Now uses Qt5
The file CMakeLists.txt needs patching - known issue upstream
---
 .../tools/database/sqlitebrowser/default.nix  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 338f3323d947..c9aecd591354 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,17 +1,28 @@
-{ stdenv, fetchFromGitHub, qt4, sqlite, cmake }:
+{ stdenv, fetchFromGitHub, qt5, sqlite, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "3.8.0";
+  version = "3.9.1";
   name = "sqlitebrowser-${version}";
 
   src = fetchFromGitHub {
     repo   = "sqlitebrowser";
     owner  = "sqlitebrowser";
     rev    = "v${version}";
-    sha256 = "009yaamf6f654dl796f1gmj3rb34d55w87snsfgk33gpy6x19ccp";
+    sha256 = "1s7f2d7wx2i68x60z7wdws3il6m83k5n5w5wyjvr0mz0mih0s150";
   };
 
-  buildInputs = [ qt4 sqlite cmake ];
+  buildInputs = [ qt5.qtbase qt5.qttools sqlite cmake ];
+  
+  enableParallelBuilding = true;
+  
+  cmakeFlags = [ "-DUSE_QT5=TRUE" ];
+  
+  # A regression was introduced in CMakeLists.txt on v3.9.x
+  # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755
+  patchPhase = ''
+    substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)'
+  '';
+
 
   meta = with stdenv.lib; {
     description = "DB Browser for SQLite";
@@ -21,4 +32,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux; # can only test on linux
   };
 }
-

From 2ab778cc9c784eb2bbb45c6de3212d6df7138262 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 9 Mar 2017 01:26:26 +0100
Subject: [PATCH 1944/3449] inkscape: 0.92.0 -> 0.92.1 (#23652)

---
 pkgs/applications/graphics/inkscape/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 2f72d00bd15f..2ab918e99b6a 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -5,18 +5,24 @@
 , libvisio, libcdr, libexif, automake114x, cmake
 }:
 
-let 
+let
   python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
 in
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.92.0";
+  name = "inkscape-0.92.1";
 
   src = fetchurl {
-    url = "https://inkscape.org/gallery/item/10552/${name}.tar.bz2";
-    sha256 = "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q";
+    url = "https://media.inkscape.org/dl/resources/file/${name}.tar_XlpI7qT.bz2";
+    sha256 = "01chr3vh728dkg7l7lilwgmh5nrp784khdhjgpqjbq9dh2zhax15";
   };
 
+  unpackPhase = ''
+    cp $src ${name}.tar.bz2
+    tar xvjf ${name}.tar.bz2 > /dev/null
+    cd ${name}
+  '';
+
   postPatch = ''
     patchShebangs share/extensions
     patchShebangs fix-roff-punct

From e57e005ac80553e784758dde08f59b8cba41bfb6 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 7 Mar 2017 22:12:00 +0100
Subject: [PATCH 1945/3449] lgogdownloader: 2.28 -> 3.2

lgogdownloader: 2.28 -> 3.2
---
 pkgs/games/lgogdownloader/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index 5c7cad8aa95f..c857ccc47a85 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, curl, boost, liboauth, jsoncpp
-, htmlcxx, rhash, tinyxml, help2man }:
+, htmlcxx, rhash, tinyxml-2, help2man }:
 
 stdenv.mkDerivation rec {
   name = "lgogdownloader-${version}";
-  version = "2.28";
+  version = "3.2";
 
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
     rev = "v${version}";
-    sha256 = "1xn6pfvxz496sj5jiqyzqj6vn6vrzyks9f6xha8g4vy6hkw717ag";
+    sha256 = "0p1zh2l8g4y2z02xj0fndbfhcxgcpwhf5d9izwsdi3yljvqv23np";
   };
 
   nativeBuildInputs = [ cmake pkgconfig help2man ];
 
-  buildInputs = [ curl boost liboauth jsoncpp htmlcxx rhash tinyxml ];
+  buildInputs = [ curl boost liboauth jsoncpp htmlcxx rhash tinyxml-2 ];
 
   meta = {
     homepage = https://github.com/Sude-/lgogdownloader;

From a69d92c4df3ae06c41d05538b1eee912b8e9cbbc Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 19:23:36 -0600
Subject: [PATCH 1946/3449] gvpe: 2.25 -> 3.0

---
 pkgs/tools/networking/gvpe/default.nix              | 4 ++--
 pkgs/tools/networking/gvpe/src-for-default.nix      | 9 ---------
 pkgs/tools/networking/gvpe/src-info-for-default.nix | 5 -----
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/tools/networking/gvpe/src-for-default.nix
 delete mode 100644 pkgs/tools/networking/gvpe/src-info-for-default.nix

diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix
index fe5581039256..6a9a34da9f8c 100644
--- a/pkgs/tools/networking/gvpe/default.nix
+++ b/pkgs/tools/networking/gvpe/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gvpe-${version}";
-  version = "2.25";
+  version = "3.0";
 
   src = fetchurl {
     url = "http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
-    sha256 = "1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk";
+    sha256 = "1v61mj25iyd91z0ir7cmradkkcm1ffbk52c96v293ibsvjs2s2hf";
   };
 
   buildInputs = [ openssl gmp zlib ];
diff --git a/pkgs/tools/networking/gvpe/src-for-default.nix b/pkgs/tools/networking/gvpe/src-for-default.nix
deleted file mode 100644
index 3db30de0bdd9..000000000000
--- a/pkgs/tools/networking/gvpe/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="2.25";
-   name="gvpe-2.25";
-   hash="1gsipcysvsk80gvyn9jnk9g0xg4ng9yd5zp066jnmpgs52d2vhvk";
-   url="http://ftp.gnu.org/gnu/gvpe/gvpe-${version}.tar.gz";
-   advertisedUrl="http://ftp.gnu.org/gnu/gvpe/gvpe-2.25.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/networking/gvpe/src-info-for-default.nix b/pkgs/tools/networking/gvpe/src-info-for-default.nix
deleted file mode 100644
index bbd8f41da029..000000000000
--- a/pkgs/tools/networking/gvpe/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://ftp.gnu.org/gnu/gvpe/?C=M;O=D";
-  baseName = "gvpe";
-  sourceRegexp = "[.]tar[.]gz\$";
-}

From 15089457556a99db79ad661a470333fc7cd9021a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 9 Mar 2017 03:37:14 +0200
Subject: [PATCH 1947/3449] treewide: Fix eval-release.nix for aarch64

---
 pkgs/development/compilers/rust/bootstrap.nix  | 4 ++--
 pkgs/development/compilers/rust/nightlyBin.nix | 4 ++--
 pkgs/development/tools/misc/kibana/default.nix | 2 +-
 pkgs/tools/misc/bandwidth/default.nix          | 2 +-
 pkgs/tools/misc/grub4dos/default.nix           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index b582b21dcc49..91660dcc5b33 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -12,7 +12,7 @@ let
     then "i686-apple-darwin"
     else if stdenv.system == "x86_64-darwin"
     then "x86_64-apple-darwin"
-    else abort "missing boostrap url for platform ${stdenv.system}";
+    else throw "missing bootstrap url for platform ${stdenv.system}";
 
   # fetch hashes by running `print-hashes.sh 1.14.0`
   bootstrapHash =
@@ -24,7 +24,7 @@ let
     then "fe1b3d67329a22d67e3b8db8858a43022e2e746dde60ef4a2db3f2cac16ea9bd"
     else if stdenv.system == "x86_64-darwin"
     then "3381341524b0184da5ed2cdcddc2a25e2e335e87f1cf676f64d98ee5e6479f20"
-    else throw "missing boostrap hash for platform ${stdenv.system}";
+    else throw "missing bootstrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;
 
diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index 5f92e5c6d922..9916e4555c56 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -5,12 +5,12 @@ let
 
   platform = if stdenv.system == "x86_64-linux"
     then "x86_64-unknown-linux-gnu"
-    else abort "missing boostrap url for platform ${stdenv.system}";
+    else throw "missing bootstrap url for platform ${stdenv.system}";
 
   bootstrapHash =
     if stdenv.system == "x86_64-linux"
     then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91"
-    else throw "missing boostrap hash for platform ${stdenv.system}";
+    else throw "missing bootstrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;
 
diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index 677ffa49c998..bd85f6140288 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz";
-    sha256 = shas."${stdenv.system}";
+    sha256 = shas."${stdenv.system}" or (throw "Unknown architecture");
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 05fbe9b56324..8b0e17191964 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -7,7 +7,7 @@ let
     else if stdenv.system == "x86_64-darwin" then "bandwidth-mac64"
     else if stdenv.system == "i686-darwin" then "bandwidth-mac32"
     else if stdenv.system == "i686-cygwin" then "bandwidth-win32"
-    else null;
+    else throw "Unknown architecture";
 in
 stdenv.mkDerivation rec {
   name = "bandwidth-${version}";
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index d9e4ae3a638c..054c7d39405c 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -3,7 +3,7 @@
 let arch =
   if stdenv.isi686 then "i386"
   else if stdenv.isx86_64 then "x86_64"
-  else abort "Unknown architecture";
+  else throw "Unknown architecture";
 in stdenv.mkDerivation rec {
   name = "grub4dos-${version}";
   version = "0.4.6a-2016-12-24";

From dc94d1a2b5162ca8bd0241d8bff6bfb991a35384 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 9 Mar 2017 03:37:40 +0200
Subject: [PATCH 1948/3449] release.nix: Fix another typo

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 889df6a00af2..3a9a304a72d2 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -52,7 +52,7 @@ let
               jobs.python.x86_64-darwin
               jobs.python3.x86_64-linux
               jobs.python3.i686-linux
-              jobs.python3.aarchh64-linux
+              jobs.python3.aarch64-linux
               jobs.python3.x86_64-darwin
               # Many developers use nix-repl
               jobs.nix-repl.x86_64-linux

From 23bbeec420d46f36b1c4609800fd8367aa3ce6ae Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Thu, 9 Mar 2017 10:35:52 +0800
Subject: [PATCH 1949/3449] emem: 0.2.31 -> 0.2.32

---
 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 cc4e289b7d1a..82c224e7db16 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.31";
+  version = "0.2.32";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "11kciq73y76c78rpd87bmlnvv4llrf81g3d28y02llnngrbczp7v";
+    sha256 = "1ril6ljbm7mczcfgbjnswcxpxpnp0kv949bhv1f6q42pxxj1wj75";
   };
 
   buildInputs = [ ];

From ccf7640a4b39a11f8c7f8000536588c48f377ab8 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Mar 2017 23:28:45 -0500
Subject: [PATCH 1950/3449] openjdk: stop defaulting Darwin to version 7

Let's just be consistent with 8. At some point we'll get a proper build
of it from source but until then we might as well standardize on 8, which
has been out for years now and seems to work fine on Darwin.
---
 pkgs/top-level/all-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97c8741d6fa6..f4e5dad15b15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5230,7 +5230,7 @@ with pkgs;
         inherit (gnome2) GConf gnome_vfs;
       };
 
-  openjdk = if stdenv.isDarwin then openjdk7 else openjdk8;
+  openjdk = openjdk8;
 
   jdk7 = openjdk7 // { outputs = [ "out" ]; };
   jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}"
@@ -5247,9 +5247,9 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
-  jdk = if stdenv.isDarwin then jdk7 else jdk8;
-  jre = if stdenv.isDarwin then jre7 else jre8;
-  jre_headless = if stdenv.isDarwin then jre7 else jre8_headless;
+  jdk = jdk8;
+  jre = jre8;
+  jre_headless = jre8_headless;
 
   openshot-qt = callPackage ../applications/video/openshot-qt { };
 

From 7c3699b0f61bb5cb1f6a0d8f0b9c69035abd68b2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 8 Mar 2017 23:39:56 -0500
Subject: [PATCH 1951/3449] fsharp: enable on Darwin

Seems to work just fine based on my simple tests
---
 pkgs/development/compilers/fsharp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix
index c00cea0029e1..2971fd8a98b0 100644
--- a/pkgs/development/compilers/fsharp/default.nix
+++ b/pkgs/development/compilers/fsharp/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation rec {
     homepage = "http://fsharp.org/";
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ];
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; unix;
   };
 }

From 02549a20a5ca1742b692be6327d1d98ae8e39099 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 9 Mar 2017 08:45:40 +0800
Subject: [PATCH 1952/3449] syncthing: 0.14.23 -> 0.14.24

---
 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 864acacaa9fc..95ab09542a07 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -6,14 +6,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "0.14.23";
+  version = "0.14.24";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1himf8yhfpjsv5m068y2f6f696d7ip0jq7jmg69kn7035zlxicis";
+    sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1";
   };
 
   buildInputs = [ go ];

From 83fa5738d5249466a8c14fc206563bcde5cd4fb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Thu, 9 Mar 2017 08:05:13 +0100
Subject: [PATCH 1953/3449] pepper: disable tests

---
 pkgs/tools/admin/salt/pepper/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index 781e94059ad7..3959946b3228 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -10,6 +10,8 @@ python2Packages.buildPythonApplication rec {
     url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
     sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
   };
+  
+  doCheck = false; # no tests available
 
   meta = {
     description = "A CLI front-end to a running salt-api system";

From f2480bdb0a4804c4325d44f2a5da62187513d5ef Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Wed, 8 Mar 2017 19:27:13 +0000
Subject: [PATCH 1954/3449] rackspace-novaclient: init at 2.1

Note that I package a number of dependencies that make no sense
outside of rackspace-novaclient. I don't want to pollute the main
namespace with those packages.
---
 .../python-modules/rackspace-novaclient.nix   | 151 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   1 +
 2 files changed, 152 insertions(+)
 create mode 100644 pkgs/development/python-modules/rackspace-novaclient.nix

diff --git a/pkgs/development/python-modules/rackspace-novaclient.nix b/pkgs/development/python-modules/rackspace-novaclient.nix
new file mode 100644
index 000000000000..0eaed7e36fd9
--- /dev/null
+++ b/pkgs/development/python-modules/rackspace-novaclient.nix
@@ -0,0 +1,151 @@
+{ buildPythonPackage, fetchurl, isPy3k, requests2, novaclient, six, lib }:
+let
+os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
+  name = "os_virtual_interfacesv2_python_novaclient_ext-0.20";
+
+  src = fetchurl {
+    url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz";
+    sha256 = "17a4r8psxmfikgmzh709absbn5jsh1005whibmwhysj9fi0zyfbd";
+  };
+
+  propagatedBuildInputs = [ six novaclient ];
+
+  meta = {
+    homepage = https://github.com/rackerlabs/os_virtual_interfacesv2_ext;
+    license = lib.licenses.asl20;
+    description = "Adds Virtual Interfaces support to python-novaclient";
+  };
+};
+
+ip-associations-python-novaclient-ext = buildPythonPackage rec {
+  name = "ip_associations_python_novaclient_ext-0.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz";
+    sha256 = "0dxfkfjhzskafmb01y8hzbcpvc4cd6fas1s50dzcmg29w4z6qmz4";
+  };
+
+  propagatedBuildInputs = [ six novaclient ];
+
+  meta = {
+    homepage = https://github.com/rackerlabs/ip_associations_python_novaclient_ext;
+    license = lib.licenses.asl20;
+    description = "Adds Rackspace ip_associations support to python-novaclient";
+  };
+};
+
+
+rackspace-auth-openstack = buildPythonPackage rec {
+  name = "rackspace-auth-openstack-1.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz";
+    sha256 = "1kaiyvgwmavw2mh0s32yjk70xsziynjdhi01qn9a8kljn7p6kh64";
+  };
+
+  propagatedBuildInputs = [ six novaclient ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/rackspace-auth-openstack;
+    license = lib.licenses.asl20;
+    description = "Rackspace Auth Plugin for OpenStack Clients.";
+  };
+};
+rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec {
+  name = "rax_default_network_flags_python_novaclient_ext-0.4.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz";
+    sha256 = "00b0csb58k6rr1is68bkkw358mms8mmb898bm8bbr8g7j2fz8aw5";
+  };
+
+  propagatedBuildInputs = [ six novaclient ];
+
+  meta = {
+    homepage = https://pypi.python.org/simple/rax-default-network-flags-python-novaclient-ext;
+    license = lib.licenses.asl20;
+    description = "Novaclient Extension for Instance Default Network Flags";
+  };
+};
+os-networksv2-python-novaclient-ext = buildPythonPackage rec {
+  name = "os_networksv2_python_novaclient_ext-0.26";
+
+  src = fetchurl {
+    url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz";
+    sha256 = "06dzqmyrwlq7hla6dk699z18c8v27qr1gxqknimwxlwqdlhpafk1";
+  };
+
+  propagatedBuildInputs = [ six novaclient ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/os_networksv2_python_novaclient_ext;
+    license = lib.licenses.asl20;
+    description = "Adds rackspace networks support to python-novaclient";
+  };
+};
+
+rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec {
+  name = "rax_scheduled_images_python_novaclient_ext-0.3.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz";
+    sha256 = "1nvwjgrkp1p1d27an393qf49pszm1nvqa2ychhbqmp0bnabwyw7i";
+  };
+
+  propagatedBuildInputs = [ six novaclient ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/rax_scheduled_images_python_novaclient_ext;
+    license = lib.licenses.asl20;
+    description = "Extends python-novaclient to use RAX-SI, the Rackspace Nova API Scheduled Images extension";
+  };
+};
+
+os-diskconfig-python-novaclient-ext = buildPythonPackage rec {
+  name = "os_diskconfig_python_novaclient_ext-0.1.3";
+
+  src = fetchurl {
+    url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz";
+    sha256 = "0xayy5nlkgl9yr0inqkwirlmar8pv1id29r59lj70g5plwrr5lg7";
+  };
+
+  propagatedBuildInputs = [ six novaclient ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/os_diskconfig_python_novaclient_ext;
+    license = lib.licenses.asl20;
+    description = "Disk Config extension for python-novaclient";
+  };
+};
+
+in
+buildPythonPackage rec {
+  name = "rackspace-novaclient-2.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz";
+    sha256 = "1rzaa328hzm8hs9q99gvjr64x47fmcq4dv4656rzxq5s4gv49z12";
+  };
+
+  disabled = isPy3k;
+  propagatedBuildInputs = [
+    requests2
+    novaclient
+    six
+    # extensions
+    ip-associations-python-novaclient-ext
+    os-diskconfig-python-novaclient-ext
+    os-networksv2-python-novaclient-ext
+    os-virtual-interfacesv2-python-novaclient-ext
+    rackspace-auth-openstack
+    rax-default-network-flags-python-novaclient-ext
+    rax-scheduled-images-python-novaclient-ext
+  ];
+
+  meta = {
+    homepage = https://pypi.python.org/pypi/rackspace-novaclient/;
+    license = lib.licenses.asl20;
+    description = "Metapackage to install python-novaclient and Rackspace extensions";
+    maintainers = with lib.maintainers; [ teh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63fc33ed17eb..1ab5ebac01bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21554,6 +21554,7 @@ in {
     doCheck = false;
   };
 
+  rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { };
 
   pyrax = buildPythonPackage rec {
     name = "pyrax-1.8.2";

From a9aeb1039a44a8b1ae30ef8f5fdf54ff62ba3f98 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Thu, 9 Mar 2017 09:22:20 +0000
Subject: [PATCH 1955/3449] pyrax: 1.8.2 -> 1.9.8

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

diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix
new file mode 100644
index 000000000000..b0fc29d3cc94
--- /dev/null
+++ b/pkgs/development/python-modules/pyrax.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring,
+  rackspace-novaclient, six, isPy3k }:
+buildPythonPackage rec {
+  name = "pyrax-1.9.8";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pyrax/${name}.tar.gz";
+    sha256 = "1x98jzyxnvha81pgx3jpfixljhs7zik89yfp8q06kwpx8ws99nz9";
+  };
+
+  # no good reason given in commit why limited, and seems to work
+  patchPhase = ''
+      substituteInPlace "setup.py"                                     \
+              --replace "python-novaclient==2.27.0" "python-novaclient"
+    '';
+
+  disabled = isPy3k;
+  propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ];
+
+  meta = {
+    homepage = "https://github.com/rackspace/pyrax";
+    license = lib.licenses.asl20;
+    description = "Python API to interface with Rackspace";
+    maintainers = with lib.maintainers; [ teh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ab5ebac01bd..5559b0547a0e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21556,25 +21556,7 @@ in {
 
   rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { };
 
-  pyrax = buildPythonPackage rec {
-    name = "pyrax-1.8.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyrax/${name}.tar.gz";
-      sha256 = "0hvim60bhgfj91m7pp8jfmb49f087xqlgkqa505zw28r7yl0hcfp";
-    };
-
-    propagatedBuildInputs = with self; [ requests2 ];
-    doCheck = false;
-
-    meta = {
-      broken = true;  # missing lots of dependencies with rackspace-novaclient
-      homepage    = "https://github.com/rackspace/pyrax";
-      license     = licenses.mit;
-      description = "Python API to interface with Rackspace";
-    };
-  };
-
+  pyrax = callPackage ../development/python-modules/pyrax.nix { };
 
   pyreport = buildPythonPackage (rec {
     name = "pyreport-0.3.4c";

From de363e8706e989dd05afe3ee77633e4d7314d507 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Thu, 9 Mar 2017 10:44:39 +0100
Subject: [PATCH 1956/3449] pepper: add 'pierrer' as a maintainer

---
 lib/maintainers.nix                      | 1 +
 pkgs/tools/admin/salt/pepper/default.nix | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ef64a9b53c6f..d8056063edd2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -383,6 +383,7 @@
   Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
+  pierrer = "Pierre Radermecker <pierrer@pi3r.be>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
   piotr = "Piotr Pietraszkiewicz <ppietrasa@gmail.com>";
   pjbarnoy = "Perry Barnoy <pjbarnoy@gmail.com>";
diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix
index 3959946b3228..ff9590c79a51 100644
--- a/pkgs/tools/admin/salt/pepper/default.nix
+++ b/pkgs/tools/admin/salt/pepper/default.nix
@@ -10,12 +10,13 @@ python2Packages.buildPythonApplication rec {
     url = "https://github.com/saltstack/pepper/releases/download/${version}/${name}.tar.gz";
     sha256 = "0gf4v5y1kp16i1na4c9qw7cgrpsh21p8ldv9r6b8gdwcxzadxbck";
   };
-  
+
   doCheck = false; # no tests available
 
-  meta = {
+  meta = with lib; {
     description = "A CLI front-end to a running salt-api system";
     homepage = https://github.com/saltstack/pepper;
-    license = lib.licenses.asl20;
+    maintainers = [ maintainers.pierrer ];
+    license = licenses.asl20;
   };
 }

From d639498ed9da1001663b86efc14e1c751f384863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 9 Mar 2017 10:52:37 +0100
Subject: [PATCH 1957/3449] pythonPackges.pyrax: enable tests

---
 pkgs/development/python-modules/pyrax.nix | 9 ++++++++-
 pkgs/top-level/python-packages.nix        | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyrax.nix b/pkgs/development/python-modules/pyrax.nix
index b0fc29d3cc94..0abf54f03fe1 100644
--- a/pkgs/development/python-modules/pyrax.nix
+++ b/pkgs/development/python-modules/pyrax.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchurl, requests2, novaclient, keyring,
-  rackspace-novaclient, six, isPy3k }:
+  rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
 buildPythonPackage rec {
   name = "pyrax-1.9.8";
 
@@ -17,6 +17,13 @@ buildPythonPackage rec {
   disabled = isPy3k;
   propagatedBuildInputs = [ requests2 novaclient keyring rackspace-novaclient six ];
 
+  LC_ALL = "en_US.UTF-8";
+  buildInputs = [ pytest glibcLocales ];
+
+  checkPhase = ''
+    py.test tests/unit
+  '';
+
   meta = {
     homepage = "https://github.com/rackspace/pyrax";
     license = lib.licenses.asl20;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5559b0547a0e..49f5a48476ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21556,7 +21556,9 @@ in {
 
   rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient.nix { };
 
-  pyrax = callPackage ../development/python-modules/pyrax.nix { };
+  pyrax = callPackage ../development/python-modules/pyrax.nix {
+    glibcLocales = pkgs.glibcLocales;
+  };
 
   pyreport = buildPythonPackage (rec {
     name = "pyreport-0.3.4c";

From ac1c3c95e18f6e9839f2ca151c761d1b283831f1 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 9 Mar 2017 10:59:58 +0000
Subject: [PATCH 1958/3449] alphabetize maintainers list

---
 lib/maintainers.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0ffca05180f9..6bb0ea3d0b82 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -86,9 +86,9 @@
   carlsverre = "Carl Sverre <accounts@carlsverre.com>";
   cdepillabout = "Dennis Gosnell <cdep.illabout@gmail.com>";
   cfouche = "Chaddaï Fouché <chaddai.fouche@gmail.com>";
+  changlinli = "Changlin Li <mail@changlinli.com>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   chattered = "Phil Scott <me@philscotted.com>";
-  changlinli = "Changlin Li <mail@changlinli.com>";
   choochootrain = "Hurshal Patel <hurshal@imap.cc>";
   chris-martin = "Chris Martin <ch.martin@gmail.com>";
   chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>";
@@ -354,7 +354,6 @@
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
   nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>";
   nthorne = "Niklas Thörne <notrupertthorne@gmail.com>";
-  xnwdd = "Guillermo NWDD <nwdd+nixos@no.team>";
   obadz = "obadz <obadz-nixos@obadz.com>";
   ocharles = "Oliver Charles <ollie@ocharles.org.uk>";
   odi = "Oliver Dunkl <oliver.dunkl@gmail.com>";
@@ -535,6 +534,7 @@
   womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>";
   wscott = "Wayne Scott <wsc9tt@gmail.com>";
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
+  xnwdd = "Guillermo NWDD <nwdd+nixos@no.team>";
   xwvvvvwx = "David Terry <davidterry@posteo.de>";
   yarr = "Dmitry V. <savraz@gmail.com>";
   yochai = "Yochai <yochai@titat.info>";

From 603b799bcbcb8d49a9397bbd2896c1a454ee6ff6 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Mon, 6 Mar 2017 17:54:54 +0000
Subject: [PATCH 1959/3449] Add removeReferencesTo for removing specific refs

This allows for a less blanket approach than nuke-refs, targetting specific
references that we know we don't want rather than all references that we don't
know we want.
---
 .../remove-references-to/default.nix          | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/build-support/remove-references-to/default.nix

diff --git a/pkgs/build-support/remove-references-to/default.nix b/pkgs/build-support/remove-references-to/default.nix
new file mode 100644
index 000000000000..8b1d05fc2307
--- /dev/null
+++ b/pkgs/build-support/remove-references-to/default.nix
@@ -0,0 +1,34 @@
+# The program `remove-references-to' created by this derivation replaces all
+# references to the given Nix store paths in the specified files by a
+# non-existent path (/nix/store/eeee...).  This is useful for getting rid of
+# dependencies that you know are not actually needed at runtime.
+
+{ stdenv, writeScriptBin }:
+
+writeScriptBin "remove-references-to" ''
+#! ${stdenv.shell} -e
+
+# References to remove
+targets=()
+while getopts t: o; do
+    case "$o" in
+        t) storeId=$(echo "$OPTARG" | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p")
+           if [ -z "$storeId" ]; then
+               echo "-t argument must be a Nix store path"
+               exit 1
+           fi
+           targets+=("$storeId")
+    esac
+done
+shift $(($OPTIND-1))
+
+# Files to remove the references from
+regions=()
+for i in "$@"; do
+    test ! -L "$i" -a -f "$i" && regions+=("$i")
+done
+
+for target in "''${targets[@]}" ; do
+    sed -i -e "s|$NIX_STORE/$target-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "''${regions[@]}"
+done
+''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4e5dad15b15..d15a2f1ae933 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -291,6 +291,8 @@ with pkgs;
 
   nukeReferences = callPackage ../build-support/nuke-references/default.nix { };
 
+  removeReferencesTo = callPackage ../build-support/remove-references-to/default.nix { };
+
   vmTools = callPackage ../build-support/vm/default.nix { };
 
   releaseTools = callPackage ../build-support/release/default.nix { };

From a80e4d76af0e9d9dfca0e5f33eb37e5c82d901b3 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 9 Mar 2017 12:02:46 +0000
Subject: [PATCH 1960/3449] syncthing: use removeReferencesTo

---
 pkgs/applications/networking/syncthing/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 95ab09542a07..2cb4f0a5922e 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -1,11 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, go, pkgs }:
+{ stdenv, lib, fetchFromGitHub, go, pkgs, removeReferencesTo }:
 
-let
-  removeExpr = ref: ''
-    sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
-  '';
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   version = "0.14.24";
   name = "syncthing-${version}";
 
@@ -16,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1";
   };
 
-  buildInputs = [ go ];
+  buildInputs = [ go removeReferencesTo ];
 
   buildPhase = ''
     mkdir -p src/github.com/syncthing
@@ -48,7 +43,7 @@ in stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    find $out/bin -type f -exec ${removeExpr go} '{}' '+'
+    find $out/bin -type f -exec remove-references-to -t ${go} '{}' '+'
   '';
 
   meta = with stdenv.lib; {

From 0a3b7f994e5995f414b1db3e1d7ca2244220b4e1 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Sat, 4 Mar 2017 13:04:23 +0000
Subject: [PATCH 1961/3449] python-sip: 4.18.1 -> 4.19.1

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

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index e44f92ab013d..99d3c89e1f9d 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -1,11 +1,11 @@
 { lib, fetchurl, mkPythonDerivation, python, isPyPy }:
 
 if isPyPy then throw "sip not supported for interpreter ${python.executable}" else mkPythonDerivation rec {
-  name = "sip-4.18.1";
+  name = "sip-4.19.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz";
-    sha256 = "1452zy3g0qv4fpd9c0y4gq437kn0xf7bbfniibv5n43zpwnpmklv";
+    sha256 = "501852b8325349031b769d1c03d6eab04f7b9b97f790ec79f3d3d04bf065d83e";
   };
 
   configurePhase = ''

From e7a432db1e5a0e221e598b7bdd76262056542441 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Sat, 4 Mar 2017 13:12:44 +0000
Subject: [PATCH 1962/3449] python-PyQt: 5.6 -> 5.8

---
 pkgs/development/python-modules/pyqt/5.x.nix | 4 ++--
 pkgs/top-level/python-packages.nix           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 84da1cf9ebf0..fcd3f25de7ac 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -2,7 +2,7 @@
 , lndir, makeWrapper, qmakeHook }:
 
 let
-  version = "5.6";
+  version = "5.8";
   inherit (pythonPackages) mkPythonDerivation python dbus-python sip;
 in mkPythonDerivation {
   name = "PyQt-${version}";
@@ -17,7 +17,7 @@ in mkPythonDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
-    sha256 = "1qgh42zsr9jppl9k7fcdbhxcd1wrb7wyaj9lng9nxfa19in1lj1f";
+    sha256 = "9edf2816105a4111a447452df2bef7ce47d7efb307c75c3e74c27b8d31d7f66e";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3136e5edbee6..d71380f2c612 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -318,7 +318,7 @@ in {
     pythonPackages = self;
   };
 
-  pyqt5 = pkgs.qt5.callPackage ../development/python-modules/pyqt/5.x.nix {
+  pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix {
     pythonPackages = self;
   };
 

From 6631000bd3b229ffaf858642397f496c76fd390c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Mar 2017 22:48:17 +0300
Subject: [PATCH 1963/3449] pythonPackages.pyqt5: 5.8 -> 5.8.1

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

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index fcd3f25de7ac..ee3419eed0e9 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -2,7 +2,7 @@
 , lndir, makeWrapper, qmakeHook }:
 
 let
-  version = "5.8";
+  version = "5.8.1";
   inherit (pythonPackages) mkPythonDerivation python dbus-python sip;
 in mkPythonDerivation {
   name = "PyQt-${version}";
@@ -17,7 +17,7 @@ in mkPythonDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
-    sha256 = "9edf2816105a4111a447452df2bef7ce47d7efb307c75c3e74c27b8d31d7f66e";
+    sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy";
   };
 
   buildInputs = [

From 7eb9a85b906adca731afdb96bd766cd38f8a71b1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Mar 2017 22:48:31 +0300
Subject: [PATCH 1964/3449] qt5.qtwebengine: fix library paths

Without this it would try to find files in qtbase.
---
 .../development/libraries/qt-5/5.7/qtwebengine/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
index ec3f9061f795..a42dda1b36cb 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
@@ -35,6 +35,13 @@ qtSubmodule {
     # fix default SSL bundle location
     sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
 
+    # 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
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \

From a0f3590c5bf23bd8ac877ff6b88d06163e4b1757 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 8 Mar 2017 13:16:23 +0300
Subject: [PATCH 1965/3449] pyqt4: 4.11.3 -> 4.12

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

diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix
index 73835fedcd42..dc3dd69ac02e 100644
--- a/pkgs/development/python-modules/pyqt/4.x.nix
+++ b/pkgs/development/python-modules/pyqt/4.x.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pythonPackages, qt4, pkgconfig, lndir, dbus_libs, makeWrapper }:
 
 let
-  version = "4.11.3";
+  version = "4.12";
   inherit (pythonPackages) mkPythonDerivation python dbus-python sip;
 in mkPythonDerivation {
   name = "PyQt-x11-gpl-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz";
-    sha256 = "11jnfjw79s0b0qdd9s6kd69w87vf16dhagbhbmwbmrp2vgf80dw5";
+    url = "mirror://sourceforge/pyqt/PyQt4_gpl_x11-${version}.tar.gz";
+    sha256 = "1nw8r88a5g2d550yvklawlvns8gd5slw53yy688kxnsa65aln79w";
   };
 
   configurePhase = ''

From d398217d637411d32f82eab7685670c7f3aa703d Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 9 Mar 2017 21:40:53 +0900
Subject: [PATCH 1966/3449] thunderbird, thunderbird-bin: 45.7.1 -> 45.8.0

---
 .../mailreaders/thunderbird-bin/default.nix   |   3 +-
 .../mailreaders/thunderbird-bin/sources.nix   | 466 +++++++++---------
 .../mailreaders/thunderbird/default.nix       |   4 +-
 3 files changed, 237 insertions(+), 236 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 1b9c1ac1622f..851b87374951 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -38,6 +38,7 @@
 , coreutils
 , gnused
 , gnugrep
+, gnupg
 }:
 
 assert stdenv.isLinux;
@@ -148,7 +149,7 @@ stdenv.mkDerivation {
     '';
 
   passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
-    inherit name writeScript xidel coreutils gnused gnugrep curl;
+    inherit name writeScript xidel coreutils gnused gnugrep curl gnupg;
     baseName = "thunderbird";
     basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 556101f6f952..286911e05c6b 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -1,585 +1,585 @@
 {
-  version = "45.7.1";
+  version = "45.8.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ar/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ar/thunderbird-45.8.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "e1c0092e9068c5b687443c66e51d0a66821b509d554ae49563ceb5ca7f9f1429b47b084d39d9b8c7726aad79d61ad09b3b256118560b77ae9a179152d4914147";
+      sha512 = "b56803f7047547e0ffbe7491062e82a82b19dabf8d4a7483834720166b0fb913f4a0252bebb5653abfaaf526998a5af0c31ff8a62ad8f5ec7d9736a6d581a7d6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ast/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ast/thunderbird-45.8.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "0dfa480291f654fcd3af50711b3634202b81e9661a037a98d1e32e7b51bdc0395331fa99d8806a49873f23a02be95a383bfbdf001f905eac42d9b132d1e170ee";
+      sha512 = "c49d973c8b138743ea8fa0bca75f2de01ce1d051b15b5d9e6516ad7a8e489028d2198ba460abcb62a06f0738994f00885d0e26e98b5f3311dddb258622ef6f36";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/be/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/be/thunderbird-45.8.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "fd705a8bdbe5bb6e8c7e120495021b538f75ca8d5c485d9d224392808c5397e149004c2262e2dbf982d5248a7ab036ed82980665be7628cf87e789b5d4ed4e19";
+      sha512 = "8e5463a97d93c70fd9fb3b5cda89ad916c7ae2abc89974536dbe2af0633e696c839a97e8dfbf35bb3c1efc7ccf1c588c5ab3e595a0cea519596ac2c112f8012f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bg/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bg/thunderbird-45.8.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "f6ceb36dfd93e10b29a8d5322604c1fe17d1ef96113e79bd3c5a0f9912b4a77f8a182f676919ad5a58c15ef9555fc2ab07d8c2f375654057cdf2efc0be9a1ea1";
+      sha512 = "912056b19247376e3f8f4f8da493391c9e094abe2723091cf22c83017fcaefa3402e3465db99ea2a4413ea3fdecb9eb6170e8091a2ce3bc191061e9697daf0cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/bn-BD/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/bn-BD/thunderbird-45.8.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "d3dfebeb5d6a301449130c94c7cbdea50e8c29c2571b408d89b3a632a164056605bc0e15dc2957f677d639ca9712088d94c62d26c0b2ade4faadb159978519c8";
+      sha512 = "a221336fae5a44312b1fbf8027c9a6088152f96cf2e5ff55239c0256f6b824c92eddba4442b5efa9e4ae1ed81b3a7114d85fa08a785eb73a20aa0f2b86f73107";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/br/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/br/thunderbird-45.8.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "1de73392b72d595504314e36c2c8cda7ee781a246dab443ba8f1cf46027c40a85a1e7a8626bfc46901940a08d89de69c2779a0702e5271da3f703aa299ae4767";
+      sha512 = "ba3d2a59ef9347cb1c23716bd308f62cdcf1399ea6a2c35ede563fa2af48e49a8ca9954f986f55e41c80647cceb218d664ebed0c7053e3ef4a0ea12395bd01d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ca/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ca/thunderbird-45.8.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "e481f63846a437dd1326820f455ec7c50ae56e638bc771814c4a53b5fcd7b397e0b6d7886965f4ebc94c15d33eeabb947c65a72ddad8ebd6a0549ec5df94be73";
+      sha512 = "f64e2eaa1208fbcc8be61e28ceedc113101fd6a9d7b2ac23299f36913b7c696b7a3fbb83934c4ea2ca8d23d632891a22e48ce3001425fea54f7669599da136cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cs/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cs/thunderbird-45.8.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "148114a531d1dd467fa59690836dee75e2640dca5b448175424d56224867676990561693e12faef7ea53b0e0a87cb039a5f7b35432901703f135cfb99f48e53f";
+      sha512 = "130c73d25b581988fc14f734d39bdea4d777258ba35f56f421b234a79a00cc4f322912977af0feab0b3d4ac72e3fd3d13eb26465da7b2d81d8ccbf05a42b8c0e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/cy/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/cy/thunderbird-45.8.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "6ee390cc87fc717cb1e413e5e2b46eb1f7335f617877f9c190075f808f9e0f7d21f59a41a651f2bce14323a46994c499056c6ba3308dfc28a2733f125e200a0e";
+      sha512 = "a3894db9cef7368ee824ea7015b62d378a7e8733b86eaa5fa59645fea4fe9bd9bcb1752ed12678d6ac052b42060d2a3282f23c25c4451362a0c941001352a352";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/da/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/da/thunderbird-45.8.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1246c3338ec1c66ec0631cd3dd2e2ddfa2f55eaac2ebf36d6fc78a58cdafe15b5bb02c542447fa7aeac56eb9dce2501951b998c605844ce37fe8bb4868c100c7";
+      sha512 = "ae037f835dd51fc4b140ca0165f75ff26a305715a8536929d46c487d4db1e77cb10f101faea6a612579b021db597b63045deaaa7db1cea2b3d4160d8ef423a4d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/de/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/de/thunderbird-45.8.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "ba651c2f07eceb4c20a9997bd518c322b025467e3474a56c17e1c35ea9dab7c3ac08295f573cdb7c4967e531dfcaa76facf4185ecc12a66436690817c73c0454";
+      sha512 = "71255dfb152f4f204399b6ecaa837a468bce5582fb9f358a1d7bdd073e2aecd41a7302a0096f1429d20bd67a92d012172308e8df9aebde141bb7da828b158cd5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/dsb/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/dsb/thunderbird-45.8.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "5fcbb029e59b50e3c8762acdcb561f3541a1056bd467f2830b316ef39b9f55f88797693ef4c281d8411c678bfbe86abde74483f0b9418e185fe80463487da489";
+      sha512 = "39f02422d754637044fe4c75c9d677c43ff6a87229893c3eb637ff6b9c8adf541833aa929b70f2b783aa1fcf998e112645809c6256070fa746c4c95885c9232e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/el/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/el/thunderbird-45.8.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "36fa1fe8d3b52ee95275acfcda8eeda175f9ff5d44b7fcd0e33df2a27fd4c815d79b647265e9c32bfdcd9f1900bc98195bee6de5e580abb452ca47003a438b40";
+      sha512 = "3cf4cce1398e945a3cb41e5432aa0c2ed1fa386e8e553816b1478a12e1248ac709de8d21a938e6c3cd801fffb58fe6e10776b8b96bb295b5fa016492f70031e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-GB/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-GB/thunderbird-45.8.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "15973247dab22789b8c63f5617fd1d85aa2a889e78d1bfd8ade002d769bf81857cf7d84c6302c168c5923ccdd08ea561df4fca1f17f0fe3337608af161c6e86e";
+      sha512 = "609ebe7d015af9dfd3b88ebfb04d67691314ac91d3df7cff91df3f20ba7fb12db5f44dff5c773b4b7c858cc4bc5817119fcfabff03ec550ce250a5289aaea9ab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/en-US/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/en-US/thunderbird-45.8.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "4acce7404bad1bef72d1ba0630a6d9e7678716121b5520d399c3e47096a5b82c03b797a3680428d1c8447121d403de227d7f327001a27092db8df438f1d88d18";
+      sha512 = "4294c93adb8f38617b2898c91d0362b3ab327158e1810d2304f2481bdc4e0e06e1fd2a2d6748cb491cc6c732a039fa3dd83dac801b12ec7be2d7c8cf7e986286";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-AR/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-AR/thunderbird-45.8.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "68e7e8b134d6b3a6b44ecf9deaaa4fe58a2ba2324621722300eb39c74f6d4801edb7532ff81a2a22f473b55d227caefce4e5460b9527fee2bc7e9b765b4a66e9";
+      sha512 = "ded0d52934a5b74e4eff172037c1abe9c15cb522897daee5173739f4a149c1891309a366d3aded2f1306c447970e72b1a2930a9adce07d57287f7f5f0e8eec73";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/es-ES/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/es-ES/thunderbird-45.8.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "80517102d930a0613254f5f2ebbccfadc27606664e957b217e899b2d519f1a7fd189caa17756ae9849f870b97ed8a589c327d3239d2312368a94583434a31bf9";
+      sha512 = "523c9b931d9ef8319c5a30463035d84946d97b07a9714b2357637f9992a3dcda4536a29933a29340d4e4951ff2bc540d587ab290a16033bfc510ac911c32d3e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/et/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/et/thunderbird-45.8.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "3399aaf7a8eb812b4ed4c56e8e6619c9e7018e552bc810f9a20773854cdaaa3a4382754fafde2809bb945885059c1613e3832071bdc55d32816aac49e38acc9e";
+      sha512 = "376e5cd8f50c4b10c4f71b6410528965f256b69c17f3d0d103efe6bdd28ed96d0fc47dcfb709dce617757c3cec603c5a16ac675ae12e17b093db3d1184c8ebfb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/eu/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/eu/thunderbird-45.8.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4b7ace6485b3d9f14a924a9827226c3337f4b95107b94e51925524aea6eff2d446868f7a7f350c22ef7dec0c3c04c0fbb79f9eac9c1db0070195ce402559b3c6";
+      sha512 = "8dba4439fadb14028903eb552ad08c62b0a63559ff5332fd2d5434179fe28a75d754b6769d1a171d7e580ec6d86fdfcad8ae6230c14c4e9aa981944013dc5b86";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fi/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fi/thunderbird-45.8.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "42330fa494ff9e09ddddaa5828fd6e984f4e016d45f90638a72d958f1d0d52458c4d66492c4bf3a9a57fad32ebb24ecd4d43efc51795f738f50d7385b3090015";
+      sha512 = "40d579d59beae9070cf548f340d5b36d67d0456bb0f9569330dcaf4667d6cef71be1be4d32ffbb49446c8921486153e50d5c33ad87746f605e4d3a79b4b74a69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fr/thunderbird-45.8.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "53696b4b77c2dfc4eeb03059429dbf38dc31910664ef7638ce291adee5d9e0bcfb1b8a19524a96fed02594b664d125e9c4791aac674c03e9dbb272544f429cb1";
+      sha512 = "80b489cb98c0a39c641c0d49cb750cd737594e6de1c9b0559208535a41f95855afbbaf987ab0cfedf5fb5b2fa1589d538b7eada05114d7259d3789fa399e20e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/fy-NL/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/fy-NL/thunderbird-45.8.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "2c8a487a2a77451d2d4c239a16cdf114e1d9ef37d7c0a1f2dd2e3e9ba6270004e39fc38828b363805ac530b2f6cd3016594dfcccf2db37525f9700866d6a513f";
+      sha512 = "6bd13607375c513be19ae9f86e806ca94d4acb087700fdf85842cd2a7eecab66735b9ca5130b013d09dcaab12134d894bb991774727d67ff71ef2cef4b0f9b49";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ga-IE/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ga-IE/thunderbird-45.8.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "127d0cfc24b8e3e00aedee39aa400af198c7e48239fce97dde27416ac517108957d5f18735e5106eaba0433321f406ca9c82d774a83f1e58dc297b80e55a33dd";
+      sha512 = "de4744accb4332e8509a1cb439f29d773d67f42d3964e11df83e790e6f720063b3368d3a120f746829d61741abb18baaf1f2afd9dc3bffde1ae2a118025d7973";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gd/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gd/thunderbird-45.8.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "48dca91d52b3f71a76c3a08003247bcfe498342b3e2e6158f58087251a9248959d17a7c91437475892a5b5124d9a76a1f0cc99c118e34c763ae4227fc4776dd9";
+      sha512 = "98f73337263ea57e609bab9f8f0537c15c385448c48b84185d9c8cde8550d2d2fb6adc31735c7a45eff5d1872047f7137e168b977a5686401c1f0aa21a38effb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/gl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/gl/thunderbird-45.8.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "92993f4090d641ee6573ec08c9ed25d3126e0e9796568aaa77296e859fd70069ce0f63f017fc08a3e01d65dd9864063f8ec089ee8e43197d511358b53259fb76";
+      sha512 = "b255dcc44f33c9b8d74ba664350cb6423245a146134e64292f7bd0850ddeafedfd691d8c5e4db51c019df92283b094a8d152441512aef33971ac8959a2904656";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/he/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/he/thunderbird-45.8.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "c7e78d6aa2920fa81820b54a3f1047d42089e65fcc424ff663ef287cf581aec7b11fec33c309c88ae5986c9a78d3967dbc3cccd6efadbacfb145e36d2409e514";
+      sha512 = "4c8406c16bae204a1aeb075dd061eb3a70585e439c29f585fed4bb7ee3c1d599f8fb2f12f2ad9d0521550729d7ad1a0b097349a3a318be89a37d10b749fa4fc1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hr/thunderbird-45.8.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "0160db00133e4564b9ca0ddcb2771abd343bd3cef1bfc09303805bc0aaa01a5cbeeb6a23effd2e8256ae5457a2fddc149156d1702705531c728134845945dc56";
+      sha512 = "e855a5753de07b4f4435356571178149c0eb26d9b0b81bbd41de89e88bcf30c3d970514c3548a389cf719917f29899185e1bed9d18c4b467f2d31e00d271623b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hsb/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hsb/thunderbird-45.8.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "012f4544e60f7a917ffd49fd6668da548e6e44ce666a86f61cc0e36e53806db16496824bd20b253d079e27d5601ddb6cc1ee290c600e116c922bb842a2232294";
+      sha512 = "8afc5a73b43ae6b43595028213ff6e21da813f9e9a93aad498e583c4ad5fcc2c5eb90ecdf911a32a68710c36a742ca1a0cc89b987789aaeb9995716783e0fff3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hu/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hu/thunderbird-45.8.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "ff13587b1098f0d503c6f3b81c2a9f3c075d192517e0dee6d9fe324927a6dce8686d989a34c3d36cff7a8e2bd6a074aee5fc96f7527ec3fd78cc0c96f4279b2c";
+      sha512 = "da48fd9398349c6dd583391413add0b789d1500dd1481758a62121052bedaa739406011b5a3747fca810c74140c98498eb8c49a092ff3f184627bbc3469df90c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/hy-AM/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/hy-AM/thunderbird-45.8.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "84f3ca15346c821dcb9efdcfbc2b599a68b608cf8dc28145e0aac80babcf3b82da456a0816f2e31ed47b19c47f3afa9a265f864de6662fdd4fa8586d520ea025";
+      sha512 = "588c3670d7748453e273f515255c29e5644e521f9710d1f87360a2031334f9353adba4e219b0f90c3c028102e5e02a0ffe07071a6fddea2bd2a1d972c04e1537";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/id/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/id/thunderbird-45.8.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "2310cca9ced00d10b932eb6d27797b53e427f997671b836a5d03bc3f263fd469ea3dc5a2ba35a71da6b73e4dec83c60fc31203329562d6250ec573a38c55f115";
+      sha512 = "a9acd62a369249370f7c6b70bb48aaa8af06de2439b328d92ddd3092cb95fd59df679a451f42173e6901d0e9fce9159e295331479d5128fc50ca7a2c93129bbb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/is/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/is/thunderbird-45.8.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "710f180201035cde81d8e07cbc7e9e83289a160f6679393d2dd70c48c92f5b3568c0f7290e18613945abee052433f31c2b3b11019cb95cb8f6b23f04e985741d";
+      sha512 = "76aee81433e6d8f2f7906d754069a5aab3ff8caa2b3d503a730eefcc42ddc1ea2018049419015dd4725344dbb54d821633f10f1d0c0139ee62c230f7643c5ee9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/it/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/it/thunderbird-45.8.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "d5596d86c425f2d1251947a6d66558d87ec22a20490db23c267c514b98ddb9acebc30180c6c29a242ead4bf079fb8e9bc35414210c1d294dc735923f0ab29d3d";
+      sha512 = "c7912a63ab9141a32e8f9040522900b10bb56360fd387b8b47af860814fa1541ab7ec1c59eb6376b7aacc2a22faa046d05c4a1ae81ef12bf553fdf546cfc403a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ja/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ja/thunderbird-45.8.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "954e41ec6842e4ea40c84354a3499085d5fa754c0a8fe581fd0e1ddafb84c218b0afc6b84d6b89448573372ca8170563f4732eb0e00388d5daf918fc9eccab5b";
+      sha512 = "03f414eba62f4188bb7a368653f89f0b8d48e850751cab0fb6d706912787aa098a32934bd5c7b3026e466b23df4cc6780f6b88f1f252943b2d56b53f1ea62cb6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ko/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ko/thunderbird-45.8.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "3b48ec21a87f4763e95a045f273b3077cc0f73f0cd79d0fd341bab93308ca6aa122aa1b6fe60cd9857e2af30f8b868a1ce56ca5e2418235b9207c33339abe66b";
+      sha512 = "d9c1cfba0ab167b4f3e16eb8ee37ca3acfd94477df51a2526975602882b93a4c86e7936f76263bddfc904900146b0ed570c641f4cd1d48904bd5b9f09aef91ac";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/lt/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/lt/thunderbird-45.8.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "e314d8aebc993a9471610d885736e50a174905cdd862eacb3cc08516fda8538cd86afbe62744a7a28947f289cd9d3847436ac4be6966097c4e2d81f74bb3aa19";
+      sha512 = "5f28db94768ba285feb1a239cfd909a588a975dea16ade7793e4e1f71f8dcee1685e7370ba23cb50b253d8252a51a38a90375e8224653bfeb37e2a1e8d969d34";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nb-NO/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nb-NO/thunderbird-45.8.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2d14dad1eedc2b5043adca4d8ae9ddfa7bd7c4d9c246fb5abaf552f2bd1a27cd7d64638291a82391ceb84ba83c6c4f22f9ae09c7efc1c2530cfe986654b8b27e";
+      sha512 = "e3078466c4a5aa5a2743c7224c279c908be05730a79bc541031efa48605e0b74fb4244e087f3cf526bab6c67c40da585815f11999ff29d6a3d0867614aa11e17";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nl/thunderbird-45.8.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "fcde3900e201175fb9071b553f26dc49cad67888137df2e6ca4c7a85ffcf85aa23ca331bd4e5a3430b20615b2dbfae1ca4fe59833cd9d303f7ea6f8b73f42f64";
+      sha512 = "7e2bc54b6d72fa495ef99e132dc4e476bc233c88c1652fc625ed66b504b901fcef53b4968d63d7d468e734903b38ef897282c2122e4bfca5b492e2f4d44b51b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/nn-NO/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/nn-NO/thunderbird-45.8.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "a3e41f8fe0486a691c413104fe89009db9e4709821bac4a7062a78a6a30b083fed5a522c6d5b7c004e0e9b2131aa4bdbae85e8dae3300d2f81fd875981d79b44";
+      sha512 = "99a733996460fe3a425d7ac9d37d292ef9fdd0d1bb22aac251f592bd57f4ab2228040443ed132987cf17d971b3bb2232ba9e70aa2b6b702d73967ed55a1b3b41";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pa-IN/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pa-IN/thunderbird-45.8.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "841cf7f21b436d1194c4082ec0fd0067bed7ae625299b8f07f535708005ea3a7c217f4a6d3acd8b392e620ebdd15447f62f969c4e0c8e40e69f77c3b89402517";
+      sha512 = "d43dc96e3620c8ee1257243e725743e72c64f39123d2e4648eb5a31e45175b9b01b066b85ee9cc3d9765151bc2aee32f73b50579619968ff95918189d45358ca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pl/thunderbird-45.8.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "026002b4161801b9ba44442ac2b54f0897b6fd3dea3c6819a16c5b886c829308558917470e87eba1e7bfa9adf6d5a33dcce4645f24cec8b8cf7ef4773d924e65";
+      sha512 = "32f034261425fc41ad9b2c252aa456b1526526816d9ed66e92c49fbf8fb4b077405e2ead3256dac568e1470e29971ff84466854115f57f792a254f0723278054";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-BR/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-BR/thunderbird-45.8.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "7b78eed009541c2b5e99fac1c6267f42511feab8cd26b8c6cd758c8cc4fade84195da5b4ed1dd44ba078c3ae6a3d2aeed0bdd04e37a48f585938765a7e14021e";
+      sha512 = "65f85f596241f812a548a90a1ebf3cd24733e590cbedd600ca8d1164d3d3f5db9fb9a0e152ea05025039203f192168f60fd28a03121c31cdcf14449505d57c0d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/pt-PT/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/pt-PT/thunderbird-45.8.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "15f5f46ad34ab5506d462c68ae5a2c0ab1548b8588ac877863ca73c97166d10ed26a6af32c9f0f57bb94da7b0c025813585a17e52dd3238b49344995905bb705";
+      sha512 = "fab114396e6cbee135441392dfe6baa179640174edd19ec4d1854a4adb6d3310a38e162209bea0ac532e2734a9ad4c5abc1926e0a4ca2052c62697f99c374135";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/rm/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/rm/thunderbird-45.8.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "d0e70c192fdd0cc440f81173b13a09e6916355c2f65292c234e1da288e9a54ff1696e20c3a04f3a18fdb664d0fd76d8c477c7b19b0368a1d5dd889a5bfdf8f49";
+      sha512 = "e03da559d75887e2418119cc946bb9ae2f11027dc2109035e533da46c859f3dcaf8fec294a6bdcb10d164866bc5c3652ccb6b8276c58a91311c2bba63117f1fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ro/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ro/thunderbird-45.8.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0bd336fa6f8e1f22e8d9f8e10071518a91922d9f8b75d4e462cda1ff9a7e6a744a4d8b4412dd3d1f5617553cea67bf73599b5023dd205437ff3aa26854916e24";
+      sha512 = "f7bed7908706485e0cb26a663bdd6b0fd8ad8ad5e687a21e1c137c39d01427e3edce5ce58602bcd18a185445badefa519ecd841367f88f169591aabdf570b940";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ru/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ru/thunderbird-45.8.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "61a02467ee16e6a14b535be1b4a3ce2fa3a6bc6a61c2804e234242758361182df976f7edd0c8080637f3403436b018946c28668da09ecb9322c0eaa5fe395ba1";
+      sha512 = "7775b9054e95d373d188e496287b2cbea1ddcd12c51681123642fbc181cff258d47b900b3dbf046f3de7d75e80eef5f343a50577a9db05ab2b56867a18f3c912";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/si/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/si/thunderbird-45.8.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "823e069b47f42c35c194bbfae832f71203e78f14057223bc569d8a18bc631d2d5bfdc3dfe5cb18c0bbae561b39023cb43dc26bf841a0e20e53bf336128bc1210";
+      sha512 = "3e19c7e5b62b6d0bd3598ce6bfd23631abe381f7af91275aa8e424ff2950433fd5e58e912ad13c726185e528046d3bdccdb6b3e1fa540fc0cb69b18d37caa095";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sk/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sk/thunderbird-45.8.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "c3bf6785424419f7a1240c2069abafcd1275dfdf8908fe2e80dbd395176328e7c8c0c2cad9ce7ef46a605bae9e153e6c98fa696145fe7a186e30c7a2b147dde2";
+      sha512 = "35a5b23cffb7a80aaab378ac17195b727b7776a0c91e1616fe9a66708adc08d6041efa55dd5b291eee823a5420b092671a34f930276521f0d757e3b5568e7861";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sl/thunderbird-45.8.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "bbf63ca0e0992c5102b047c5e41dd9a2dd04d38bcbb983393345a54679ddf100496082804d17c088f6dbb76bcaf1d9be39f0e45d1e1cb0abc33fef98a79bde7c";
+      sha512 = "a7b27babbcd47b4bca6e0686aefa175fab17c4ab0d7f18793a0a3755fcaf04cd85e9bf8ddaec442ab83bafede0ad9f8211add33b6cad845f7c827e3af0982f76";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sq/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sq/thunderbird-45.8.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "68f2977a84aa0a1fc94b19a3504733cb4168d5835244482e775b0200cc0e17a548cb3f4e29d81edffb9172d3faced2a8d459709ddb90e1957c6c05ff792ce05d";
+      sha512 = "796d3cd98d39fbad987387f92d23c10f4176f2e612c1fa939bbbcf86eb3de5798a9c9add31549dcae001041d0318de2186e00200190f467ebfc85e5c95797cb0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sr/thunderbird-45.8.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "d0de9ea4f4cfb619d37b957b4260477522ae1c2df9af19e6001672f7f693015c09e8e74ff0278d0107abbb0483de0c9f6d251efaa3d9175947beb8c156145ae8";
+      sha512 = "8b296aaf9314a8b0381e567ff87e8ed261ebb976c0f63d3636d03fe2e416475dad8c500058e58793a7945ae620268854f99c97b93da0ab73a40f67d801b34af9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/sv-SE/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/sv-SE/thunderbird-45.8.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "db4af37830a458808b9450b414b7e25aede621c602b344cfbb62f00fb610747ee48fe3a7aceb1a58c0b1fc397415ea7a9e0888e0cbd7116922f2bc28d09c6426";
+      sha512 = "59e0eb3a4e1cc65fc34369b0854d7029bfe108b3cc3550bde26628d88d82c0031bbf13ed8564c7508b2acae5ffc9a912f1cbb991bc5cecf2a210bcdb181e2a05";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/ta-LK/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/ta-LK/thunderbird-45.8.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "1db6844293dce004878176cb76df68e7c7b3fd1147b4e78bf647d155d1a7efe01e5126c088c96d26f78dd2c9de98e0703b7eedef1f2de1584a0cb835f9123c1b";
+      sha512 = "86719203c04b90e2d359ede21ef3bca7e2190b131a78ba4ccf6a7d9644bcb2971b541cb3c6432e6a12952a3a589769851277a257aeec594b6208918c17d76b32";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/tr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/tr/thunderbird-45.8.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "f05b1f63839a9d38431b9c1bce8a2f31ad242edc4df5b327f9f0a562dca1f94a9f3947ba55a517cca5dab9a96fc44b938496bf72086f1dd8d1399aa3170167a1";
+      sha512 = "5b7fa2e0881dceeb0ac371a0d84209cb9e9c414ee617766ff898b50c2b21956919410be26cc0b1e30997931519fcc491c63c6e30144a2c57af8b7b8f61cd192d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/uk/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/uk/thunderbird-45.8.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "303d6b4ea136dba2217301f6c42bd91e45ff635ffa1ab38ec0633d963a1bafc1625475bbd24383e5b9dcf233a19ab0a712e70891614e14207b651c4e65016456";
+      sha512 = "8be8b331dce88d3244007066036741af4794559237811ab8d45dffe3e850383de636bb75a510d4a0500a2a78aa86d06768073a5626f5bf2676eb4d8e355eddcd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/vi/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/vi/thunderbird-45.8.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "3f712c97073ff191bf2e16d61877711ca4faac204e85b2394015d53a4f600a3c0fa352787ccddf863379ebefce4020b3526f957f2556620e4632bcb20204421c";
+      sha512 = "60ff68fc5190679b4faf2e80f89b8061348f24c0426f632fc2e523be2d47b0477b2ca122fe4c9a77e8baa91d5c55ef0204fba74f65a1d7e77727abb9846c93df";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-CN/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-CN/thunderbird-45.8.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d986a5e9a60512ca4d398fc4fb503aa7980947eee68dfcd5c4a73bcc8b324c20c6a3be66855eece6d0d77019e6b22d8ae220058948488d197063f55a291a8865";
+      sha512 = "a7da3633bb13627a81681e2539472291e0ffbef2921ae59c7fa541b0115f761295221501ea7b4e71975ba89dff559aa0f4ae1be196983854021bef823cd7c40d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-x86_64/zh-TW/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-x86_64/zh-TW/thunderbird-45.8.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "7dee7ced1c48aa6019eb80c66d2c68af9b5afe89ba3c147bd83e78532fab84fbdba8afce934ef8bb55a82837b84475797cad25710001e22fa522823bc60d6a96";
+      sha512 = "dc16cdd23ad53baa7b0863aa889a9222a14ae8e81794efad08dfffc4a6282655fcce3ff64187ce149c06d808a0010af8a084bafc59e253f094d501ee6bebbbef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ar/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ar/thunderbird-45.8.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "0453a451bc0ef3704cf54121f7781f11c2a35c29fa407b36a1159bdb462daf35ac13da1cb0deca19b5b9456a4bc68c8bcfa12384dde82441a8e69c5376875d5a";
+      sha512 = "21c08dc4ae1655ddf62ab03ab68ff0d5fc3efd6c8cd3ccc6d757b0b684365a3316b4cf4fac5a51b21be27a5e3067fbc875bdac1a8bca5cceab6e048c10f0f177";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ast/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ast/thunderbird-45.8.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "4bc10c64922604b95dfb310f0415a8e49552378c51025511265e7f1e7f2cf7bd8f9e9c6b3e45f8806f2df9fd02db451014cae4de7c2e5ce57e48dc1288cb30b3";
+      sha512 = "3669b524e5d5800f9ef3c1c6b5f874c29ba6fbb336cebbfc9a88f857e73f9bf90ccdb0fa2f1723d4e883947e71dc0333391b9021166b5acf2e39ca3d7bf02ff1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/be/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/be/thunderbird-45.8.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "0fb8f8d0a2c7ea4455c0ff90b85e4ef6b0b6f8ccd08f9f9d4852743ebc1f6a6277011be82be979142097fe8cba853d244afad30749aaa423bd9ffcde9fc3a00a";
+      sha512 = "f49f90f1998a5b7dec1e3a862b8f76bc11445d99f66cc6503675fc6629a028624e55dac5245da777b6e3acffcba24305ed199674343cb610861da9c7671c342f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bg/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bg/thunderbird-45.8.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "6d586700050d399e4058eb03931bc6915ec56a9270462a7a60846f66b884aea9627526b87b14a654166e30b8a1d43412ba8acfcb12ba4af8d3fd4fd15d4d7cbb";
+      sha512 = "b46e78338269dc6c65f0eb2bcd2cb4a0dffd5c100b4b1905582c8189f79abc975f55c7edf06e1f0edbb641de86f3b6aba1ca9028d11f4fa08ea8bd1c276e41f6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/bn-BD/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/bn-BD/thunderbird-45.8.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "1cfa845129724a098cb913b3bcaf7174ab125321b35f58279ec9c11c04f7f991b37bb9000eeea4003cf033f6f0089992ebd0d7ebf1d6f8b4d7c558eb8c850d99";
+      sha512 = "d349c503a13ae9b951af173a43f4f8dcbd5cab43d5a6219fe5b00e1d37efa7a0ceeeda36576f31f51bac615d6e4307611496e8036af4f9fc40dd3dfb495a6b6c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/br/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/br/thunderbird-45.8.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "951631129aff5cbfc2695e1a5dddd88e855d57716ce335a15ae069b7bb4572d082495ddad9caea202c5d36f46f599cdcb8f028def63252f7888fb2ba24f4437f";
+      sha512 = "4afebf7eab2f7205a8760f04e566ba8d54bc2974cbd132262eedeaf880d29aaaba48ebd731bb8dd7ca537e6cc3fe444c1ae4168e3e08b7e17c55e70f763fbadb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ca/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ca/thunderbird-45.8.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "cae03ff18fb33f6d097836e5e7f5884f64e7c594eaaf77cb3a0e1f46214b878ef2de51c750bf1f849f5cfddc68da21c3fb72927ddf6824a89ae51e44378123fc";
+      sha512 = "6b5e9abc4fc05ed580d35baeb6c7b1462daef2352f751e318b9a7bf16d032d8a8240f83d54fa17d02a9a967e7477a36808587a9183df4274f10b59059c55fede";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cs/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cs/thunderbird-45.8.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "ea9ec870c91cc2eaab758a3585e20779d24734e62c285f1f591646f9aba92e33c6a7966b0b1e484f28ba0a2f40d74f918dc899c87518f052b793fb5d1cc867ce";
+      sha512 = "1410e7bb8ffc8a4c515b1c023ffa6eedc960632c05e5e7f4675aee9e972877dfc73d09ef14deb1c308bfcc1a6333e62b24af582410854b62acf4d889c7d54158";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/cy/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/cy/thunderbird-45.8.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "082d8f2fa527a75b8a388f84085a709cde9d9c455aaa2615f35bad0eb6962de0af163d515e0481edcbba29fb858095aebb05c0a3f25f33e1e14f7136b83a73d9";
+      sha512 = "28b50a2fb0703f80fc9fb91d1add2305e71f2ddac99cfd086c8559f29b5a420e9e5e3d370f0b84a32f5c358661566b070844ccd0b33447ed4c5a427eec03cfa0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/da/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/da/thunderbird-45.8.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "9ccb84b78ec7fbef596b64e76fae50bbc8af63eb0c0d37c6f81e1353f3afc242c0e3be9495d4b0125fc0500e0b4569df3e00d5e302f93f7007bcdf3089cf0c22";
+      sha512 = "c38cffe6416ca50c78651d24d5466d6e06b2cbaa66062eb13381c4402d39a7bd55aae10cbe3400ba0fe5983309f2d70d3058a46054911399a057679b09b451be";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/de/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/de/thunderbird-45.8.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "a493f5e2c4c787f7c8f15d1d2da6f457a52af3deee161d3d9c031525eff48d2aeb294b6745e3ada079026f727db06baaca943d0711aeedb8df5bcd37c3f13286";
+      sha512 = "101ee34b890f1f3f9bc3eedf4936b8ef1fc9edd2f5af79b9c8375326d430585fc564a76a0bbc81bb119ce9a638af60055d578b5e6f1f760100171696351f13c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/dsb/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/dsb/thunderbird-45.8.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "4d1e7a0bf3f55d913aaa47c37ed5529c59240168f2a53faa4367d3c47e900e136d25446b2b4e465d05b3857fdf3671e9bc7f98be6fe7b42c1ec926d0216d6022";
+      sha512 = "a6dd564baa36402d082d5bc2b5bc6002a5abd66b9bd545a0962fc844f4800390e527b9deaa6ca4f197d98265bd85e7d52624e32be17b2efc96b136d4a0108109";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/el/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/el/thunderbird-45.8.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "145bf4a0db9b2fd3b16637fed966d6c0f0d184eeb7ce373024609b869219720f73feb0c10b13c761a4214a88d68ceeee234ac50694ac16599a92e2fe6ea61e4a";
+      sha512 = "d5611f341f3322adeb5e94f9dc83dc0de26d6dbaaaa45a904fb9add1770f77b86db57693aa3c89f69c1aeb27e98793475c900643b78a70284911a63791048069";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-GB/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-GB/thunderbird-45.8.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "1d3deeccfbba4a871a54eb4ad6077be1cf2e6fc7adb0ad0c04b3638db3b7fb3cbf66b55737befaef034d0b1671e9a53bdadc8d9ee7b3b9eb33a7c64e53ce5b2e";
+      sha512 = "b8c71ccef1793589f5cbbac8e12ad1aef833131a51a0029c75b08e26f28b3d5dfa821a84654efffae1e41c23cf5575cfb1b55de29e9c29b1a5adc1632581129f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/en-US/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/en-US/thunderbird-45.8.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "b1340885d6c92da79ad99f9f491ca1f15429aca73759d4e5055c212f33af96f7a7d4446eec6bc37ffcff4371213051188d7211c021da50f25b85fcf445ca58dc";
+      sha512 = "dbc77f7814b3a085fdf54536d77db69ad893b0230ca1930fb5fbf916cc09e421cdf8987e7f75d726f1fe31f3c7ed0afc584da1d1b1636a2750e9e0454a6de45f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-AR/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-AR/thunderbird-45.8.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "307473247bbcf0064380b4d9f9bb12ea796c32dfc012af2d4246466aab880dc040a92f06e0917acdf2f930a9df0cc0fce39b17e4ff710ea2311f4b2250b90f53";
+      sha512 = "f161bccff6692a9652568530faa89012e2a7438814fc87f816cbbf93d40425133ef24250a6d1b9990bc772e9ce86d778f905d844166527ab6020687bbede4688";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/es-ES/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/es-ES/thunderbird-45.8.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "3245ee600a95e1f59e8e7aabb521be96d88c1e59ae5cd29cc78825ed2c8c2abd1135dce1c2272d1eef2716717719947ca4b223359e1c56df406569b55226de61";
+      sha512 = "51ca5165f83366f0fd73fa900640b35d572656d123d14663b737e140c1903a816ca8e2980c2c121b1e0a512e9211ceef745c34d3fd8c04b21cbec84b868b468a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/et/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/et/thunderbird-45.8.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "b1cd90842d3888e555799cef84bd2e8d3eeb0c73abd4af9bab2a9db2b24ee90770f39d1376e63df567f8ab63778f6cde305ea8ba2a070aad36d6809a676a2344";
+      sha512 = "a8524b1a72353ddf3d2b883b3936606b9eb3f1898aea05530c38d7d57fd03ad9c36085996fe3442f085ddf668e2fc909a704939c370ba1d2d0684253a10fa965";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/eu/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/eu/thunderbird-45.8.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "6278435a0f46cbd40514780beacda014c8528a79bb5d9be1366b0dd46dc71aa1f7a387311511e8d04cea3e78dd84157b97307df5bb69797b6d39cd299be18a33";
+      sha512 = "6c3f12ccd7dd48258ff5972163da3617f3038f4f670223617f1b7734181234eaef5be4762156650c0398c4791fc82cfb397149f62e14bc6c873d279eaca92fb3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fi/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fi/thunderbird-45.8.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "000fbb4519ed626af2dfaec3d588f4ce567212b8a01c4aeae34b1f9e8ec6086ad45b90b57412fe830b8e236606d686e05c807e60bc2078df1364fd9f58d06d0e";
+      sha512 = "2d417c63a5c5d5203bea96f88a51ac4b501dee7575bb43fcda3ea523e76e65dacaf16c3f6ad772b25a242aa8016fb36c4f3a04c86431ade23389a97b7cac25cb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fr/thunderbird-45.8.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "5120e880f297f8899ee6067660d65cf1ffd66d3ae6c16a888ab5e5e1b32f48a58aefef9a7023b1a8860987a5ca6399d69fd6df8e12838c00c305c3854c18582f";
+      sha512 = "2c64e8a21306b6129a87333ff1c29ebba10f708d67636042bf6daf40bf01e5ef954038afae8d0d76c42d83ed0c8074525b13b60791f0d0e21108053c9b81822e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/fy-NL/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/fy-NL/thunderbird-45.8.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "2e3b2a7cdcd4e5bcae6e46f86c5a4956f164ec37f4cb657ac18c1233c5b36b8c0f041e6930ea15adbcd8269662f9315e2822a9ed43be38a5fae8b7c747812035";
+      sha512 = "fe444a91350d3c30e6254e526f5a506aedaebc92ed9632df6a4d2ee5c8f18246601bc8b853eadd54c0b02c2647cae21514a0c1767ff506bb3fd048aa431d5b7a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ga-IE/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ga-IE/thunderbird-45.8.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b4567af9057eaffe812feb43fa195474094fe1c0d804eb79a9dc936b93662cdfafd1c1f4bba51adda57abed677473fe2bd5e5ce9523659c931035b617a1e3ad7";
+      sha512 = "73979022d045433b27f71a7278d518b2ee42a7250b166327bfd2f94c2f747acf2d14a9ea55e254f6ade0ccc3ffdc898f61e8dfaa9c7e2b8450fdee195db97b5b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gd/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gd/thunderbird-45.8.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "1200cfb333861d2bd5013cfa5c764f202b7a2febadff5f4c8c0bc648f744af19362b07147e720c06046d4ceae7fac186c5bc33c1b637104241493f960a5c307c";
+      sha512 = "e856393fe16f57ecbcdc796dd027d8f426f9c1b39fd51c4bcea8ceb82934087ab71d87e7c04ae67b12de6d063994ee4eb607cca9889c7e500272600f80d65f6c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/gl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/gl/thunderbird-45.8.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "10ec0d042e14c80d65af5ce7a271844553e4bfb96f349a16d94c5caed3c33fa35fb2065ec99b2ae1dfb7b1e47059f6f3ce730d6d293efdd380862fe18b03c877";
+      sha512 = "c1e8ae50ce6495e9706ff1ef4fb790c53be407eaa738e86f2a788feaa16e5e903386f59bc986497d2ae9e5dff8489007a16c0f2b8b9c37456d180794dfa82642";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/he/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/he/thunderbird-45.8.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7d7edbf3fd840fcf80c3d3491fcf9cbeed923b597840bdc16e7e43097cd5843554030e2690ff178f10ad97b0f447760bd06da87b4cae545dfb32c3b0f4668b68";
+      sha512 = "6caf34bd52e21809eb80ed88b104ed1a47a1c29abdc3b3f4059fb183a0b844449936362a1839d888e4d224ee987890982d37d27c32102cfe8029bea1371847cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hr/thunderbird-45.8.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "28a2e3e0dcabecced0a9b66a5e11434fcbabe11257508eb481513e56a82d13c5bf36e79d8174fcd0080b0b310df4ada6f92f3d24fb67658d40db66823d18e0a6";
+      sha512 = "230f0bd3eddf99811d8fc60e988772ed107b75981beceec053d861f977e1e3c5261c0ea51475410aeff50efd0a4e378b5e666cdd4b2bfd76ad0ae465142a28a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hsb/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hsb/thunderbird-45.8.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "760c99978bc2a326fa5e5d8f9b4a6fc9420a8a3c95251b42dc3db26bb399942a5fdd08f3eff3eaea9f3bc96ca85b0523abdae3f72b7400f8bed136e906a8e79f";
+      sha512 = "389b0fab729562e09c17d7ca251675ed4d333f4a79932b5ef2ffeda9d3e683adb95b7f4e4cb192fcf9416826a8aa470b7f8ae4211165b50d7a5a21fe39ba199a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hu/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hu/thunderbird-45.8.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "4118ae0a62d7c8c6e68f7468040361091f98197c8135ba88ba9165ff3c807ae3ec8ac7e587224e9f45cb49290abe7c85aa11518714440db0f797f426fb73b5d5";
+      sha512 = "2d0ec213b7cf3f875518841e0c08bc6b4134173606098cd0515e93206bf2419377041d44a2737c98b17a198998b80453763e695cabedc283ebbdfb42a60abd70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/hy-AM/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/hy-AM/thunderbird-45.8.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "664dade424cdca68158c98e531dc0b46ee5482f728b4f172684061da029c7dac76d80bcaa4c0228ff929a19e6bf11fd08890b3ed71fa6e23f442dba174de84da";
+      sha512 = "f77164c2fc3a083e13a11417f77454a885fd4ac77a0b7695c0d2bf8169b54afcd06c32e7c78cb6bbb4ac447a3d690a423344cdab59bc6fdfe83d82bac5d0be0d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/id/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/id/thunderbird-45.8.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "58e48787ec26d8cfaa7be233055d95982d073ae8a1a01e4556d239e18598939ab6077f0aaa4b14051c6460730f89c1710a6dbb54ce5aaaa75967418f324073ab";
+      sha512 = "24c383b106de72a3741d7333aa4ec53c091d41ab3638c91f5f88f8d2952d25e77223e95a728611bdfd1cbe2d4418447e588069c286f90ffec0d12c7f245c07fd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/is/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/is/thunderbird-45.8.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "77e95822a92855c41ed557574ab3f0e464d8be21146139a1cbff243ae76b035ae0912e92c07513d4c5fc9d522a2da1a738dc7ab790f9327ecc6d94c0d577a124";
+      sha512 = "bae6f4fa377bb76ffd8d5257f525ce43f151f44f07eaeb5c4109a3440965c36a622c41d6577113bf111335d51d211e18b1c9decac6d9c1dea6303f90b7368f94";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/it/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/it/thunderbird-45.8.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "835a2059b02ffd019fefa2988bc2f05f456e5fc8b05badc7f5477a6958ba8fac1bc3539cc66ce6eca73fe86b4c70a172b609fa365e83593ff97405e9bbb533cd";
+      sha512 = "6b6082972ea030e2564bffaf4e9349d33800b840c0b185bb646c53d0578a1b6360a3d85cdf1dbc534a648d34138f1c8cd26d1c0297c99795e93b93b145a100c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ja/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ja/thunderbird-45.8.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "11b6f0d2326bb89a6cf6d8452d2312eb8f7af616a0fcd43dd2b2263f52397c1c0a0a3ad7ceb67dd09b81a624adb95ed8a905bd7c9dba5f1d2a94114776257ff6";
+      sha512 = "66c8808d49986675e9049e77328cf7b1d2fad163b193b8442ca39be1b605bce0180e29b239141509cfec6302f053eaf2197513d5d482beb6c498f6a0ae8bbd9b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ko/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ko/thunderbird-45.8.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "69f804d87a17072803b6e081dedcea57d633036299eaee9599b7df83604dd599234236b5b5b647da25c066633ee481e196fe9b219bc3da29d07b6dd55fdbf4f1";
+      sha512 = "bdb8a9d6172b6f56d29b29043c484547c9a9dc7bd1477bd8ac4aaa4bf07c0ceffe2ae1560458acefefad66e4487d62746f60b6ec56d5d91603937b0c339d5625";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/lt/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/lt/thunderbird-45.8.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "4534bc70c43b108e59d7e7c15cb53e32f54c20e0ad21a5c0e1d309b3fec32db870ab8cb268d59b8964c526c28382cd89753ccc978e34d0aedd5c87eeeb525a5e";
+      sha512 = "dd70d123787ef85ee1c596346bf4c40a99907c2ece2116f7fb4536cb078d162f9afe0f92b466b713d6b75bf92960de32a3b3dedd861946da5b2e946187d4ebc5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nb-NO/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nb-NO/thunderbird-45.8.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "13d4f6b638d6005ec854cac82b16c02dc347d0cd1eb804a056c106fb1031c11982973abbfbd319f4925264a1095cce8bede670f68c2efc9bd4be49ceb6b2f2a3";
+      sha512 = "caf4d3d27db952fce1f34d5c641194d555c2443b86fbecdf68869cafeed0d532d7379212f4338401743e6e26531dd98111f75bddc5e2a3af42a3a7731ec3039b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nl/thunderbird-45.8.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b6e49ff5a473dee02bb749481924fdbb345be2d532119dde93f80396a29da726b0450e2f2ee522454c8dcef74b09dfcb57474264873b873beeaa6edc81853fb2";
+      sha512 = "dd5071174889bdda282c496c4aa05158887fffc652d4c557320fab2c11e16b0cbb7e5121ef20b423d703dfbf9da52983ff288b9377ecedabfdba496f9c99eb6b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/nn-NO/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/nn-NO/thunderbird-45.8.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "3992cb6ca869e9470bb30042ba3c8d1710511a2170504a5a65cafa4a9091492903509ddd366c29f5e9e7ada9ac657416972002a297a57550a418031a7ed6ee0f";
+      sha512 = "edd6a1384ed0060398cffb4598a7014aa13cfe83891a4cd4972db2ed6eaae5068703944a6e14b033409eaf6b6426838a0a3d708b9d83eb08907f39469fde4435";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pa-IN/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pa-IN/thunderbird-45.8.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "6aca05743fe7383490cd94281fe1d0c64451832e128b8b3da5d2643bf59f05cdcfe2130ba5218f7e314ac7c55b126ad62d4d24f987b215bfe767a17d6a8eeeed";
+      sha512 = "9e6227d28dc844621d1d9ac6c5536505dea0cc1d1b3d161bedf13b75a3255c5c681ce5b38bb510150f8db1add7f149119a8b5ce5b98c5f4dfe2427db6ad58581";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pl/thunderbird-45.8.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "0b8969b08e11792c547d666843799459e27d3732f4e56ab64d7624df4360e6cf65fc2cce538ffd0a287f239cf6c57ebe7aad68bd397c0f56a85dcc499f35e4a5";
+      sha512 = "8da6ec38d37df6202b751f112031e590777e587e23437cb7a4dcfeb958b27928e2f01cbd1682daa96c143df756b3c8f31f7516ca8cb30a884db2dc03f130f960";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-BR/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-BR/thunderbird-45.8.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "4a921106175214b7fd029e27e19f4442a50076d08c2bf6f6ad4b27c1c37730d2f90ac4bd058363395777d336e5170bdd48276f71b0d253375d32daac9af66412";
+      sha512 = "00a7ffd7509d538b9fe3e801d5c2ad069edd62665a7ce045381213b78226646b1cfe6356b5c873904277330b674608711e15f18dcf4664218b9c61048cf88e40";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/pt-PT/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/pt-PT/thunderbird-45.8.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "f64a4396570349d2f520f8eeca157a012e028cba1e3cf592f5e11807997b4501a2af829dd4920ffac5fee8c50bd691d037aa86bbe9396305352ed4710e854e25";
+      sha512 = "f12f544c9eb3a33f861791af9afcc987b72607c2456d7f741046ef9ad36f12552d4e9cf2682ac3f8adc108dc9d36c9fc1b013714b50ae894f72cbe367914f14b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/rm/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/rm/thunderbird-45.8.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "540d6db390cbe93dbb607f84286e445da5234b01c55846f3d3a91cc61d30d1d32f0216fbfefc0ab0d7a60c5369a63aaab385c73362adf1a0595db57282dad01e";
+      sha512 = "9a8497f13a459d5dde822edeb9516d98beed220d75735a2f620c69b1f5e75e68987420aac6bb2a77775b6b34c2e0daa277c15d1491a6a02bb0f9658a40a16526";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ro/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ro/thunderbird-45.8.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "37cede489bb3082efa853f310dec5293baa411abcf15e9f193a760768cfc2b9f7be952bb6225bf901a0097bc19e77d9133c0e6dfed880c6e33cef250e80ff0f1";
+      sha512 = "2c9c650647079eb754e471757cae6b5844ae8e19bf01ce25d91a73832483507f90e604caf11305760cab719fe4f830cace5b9313b7e2a6f07a92427f35441c55";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ru/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ru/thunderbird-45.8.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b091376e3937712f5f92ac789dbe39b90e1b486b4409325341dadb06d4a4a3ff4fa9438d8da2fb5b7923beab4ec6b568d6be309cd22a68c277c822614205734d";
+      sha512 = "4cbbe88691fd265b4d98aab61c5763f6baea168ea4cae222425973023174f765e7fa6b97fdef959ac0788a632f742715eb7e565113344147d43c228ece7f08ae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/si/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/si/thunderbird-45.8.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "bb53ecebf56785d7ede52b7a0afed0a01e6248d537ccd8bcd236a837fed86b3f390cf9493f1c2d6d6d58c0d349cd6cfef2a59996fd7766ee77f25dc1af75faca";
+      sha512 = "a270a871187dc95d05cb79d9f4df7947aa58b875c2b0c588c2646f806e7e0eaeb1a62f69d38e78d40399f1c588f043b26d06c0d77cedc9949d8e3d8b026ad4a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sk/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sk/thunderbird-45.8.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c13c32cf17b0291bf049c2790fce2066e8b07aa2f30fb7bbecaf8cb88b4660bbf07506cb04e5aa8b756a35371d25c5a793b54d0134a81027946d35109e7714a9";
+      sha512 = "8cfd22b92789766c179dbb70739fcf68907c4b215e70d164c83e50f67f2c834f515176e30788ba1fcd58717fdf5642c9e1ef05640a06470146ee942737744c83";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sl/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sl/thunderbird-45.8.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "be0d2a0e501f074329b815f61c1ce04337499c7a88f58e3526e762b47c82ccd975c22063a363a338e22bfc12ad3403107751f66376b1d269101b660e391e7437";
+      sha512 = "fbf54d81b006625f526ab496e9ec7acf9698f7c95415d61aa4bd91896db07bce9d13c835ec944f164678fca9f49be16b69d6e8b728914ec84a5a8d733d3941b4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sq/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sq/thunderbird-45.8.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "1aadc162591de3467af622c3e1fc7655885d7831d2faa470a5f53b2fb12a42dfbd44f3a942dc4089a28235942ba0e46749810a88adbb396e1417f7ed0fc07586";
+      sha512 = "f8dee08b3a4e049392f7c407e9403b972c755493fe638e7917181b8281a86d70f2d1113e69b785be756774bb9aef4cb493084bc8d0d12bda0f928f4cd468f569";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sr/thunderbird-45.8.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "aab1299fb2e2b022bfaaa6403461bd2f5ed70d5fea77ea29936fea465984cc57bfa1ed5be1e8968138e757118d1caa3eb664388fddb04d0008abe932035c818e";
+      sha512 = "8c8fba2fc92d91f086679b6ba451eed1af4fef5c56747260f9907300f057aab354d7f8ebc411fa25821bc006a551f26e0ddf29b344846a30dc493cfef30c7375";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/sv-SE/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/sv-SE/thunderbird-45.8.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "11ce9c1b444adb242e826d4e1e8ab88e2272ac6b77f68f9d2a860c75e421c7b69f1841d0a4fef0b9b4d3a636678f0d57d5abb985f5fda6b5afd6cfb319f39b14";
+      sha512 = "caf3911023d48fc48f4834be424c01cb22bd7383582c8bfc15468401a1558351659e93955103625872b5ea3351570bf216b34e93bff9bf535eccd1789f493bca";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/ta-LK/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/ta-LK/thunderbird-45.8.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "e46dff7831a6805917d2982347e4899aea9c726bcbf1e0b081c8ead225d585df1d0e9c485729d28483fd7ea8e0e5a47598fa9146f0138ed8ed65162c8191a381";
+      sha512 = "99a0db9f4e7d9f05e8398f76f0dcce418d0230b8a325a1289b690a87a43febd0c17f52248bb6070ad7bd2dc60d6e877a78f1c4a23c8888b105160f131b31ec1c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/tr/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/tr/thunderbird-45.8.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "158e4d49beae2af88c9aeddf5933e58a73541d0acc960d3965159662dd18ec876fd9a598b7bdba31261f8eeccf1595eb5e66ace3656658b3557c1482b7a4263f";
+      sha512 = "79379c3dc58d330949aa5a0338fb38e6334ca47c964842bf090a9431e5b7267f871aaa519dd35262ed9d6e042188e998e95eb7a63c77b3592db09a81bdd95267";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/uk/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/uk/thunderbird-45.8.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "0d298daa6b416b60b696d57ae7508f56749f1fdc7f8d4ca3514fc106b91567fcc3bf41881cce398d431c0aa0b6bb9d5913d25abcded8e68628fe54fae3cbec25";
+      sha512 = "a2f0efb561fd84e5881bb93145f86f9445eb6cb3ce5ce0e209fc896c797e9a554d180ed1009f369bc12790b8d03d09d429dd3d52fda4ce48d7642009c1a9920a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/vi/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/vi/thunderbird-45.8.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "f3e21ff0bf5b0b57bf6a3d1564ec0194c4c4b8987e0db89c84662e091131601526cd1b109e113fa8738d6b16d61220df1ef6c09acfd46c154de7e86dd9aa744b";
+      sha512 = "14a7352ac3254aa0a748e98e208f48ee0b764853b37889077f651ed1d1a401d98c35dd6cd09bb5b25a7f8c5d5c3a7b02319ddf4dcdaa7a5440aa5caae9f09a32";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-CN/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-CN/thunderbird-45.8.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ad624ccf882b3703de853d67b9fb2d53fa4a69a20353638dc108750b35b486f2333307e7fb947e39a76f32cc204459347fe9c52e5c6c60c8b9210d9f7ca68632";
+      sha512 = "5b991ccc4daafe744f1fffdc51882bdc72d5fadd1e570e0ff3670f7d7201a67151797a26f0222fe8cfa0ddefff45f0741da6c04d924367705347858cc028a945";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.7.1/linux-i686/zh-TW/thunderbird-45.7.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.8.0/linux-i686/zh-TW/thunderbird-45.8.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "877e9fbfd4421fecb01d94142ae753c7b90b7a1430a01dfdfbf916e4505a1b647fc3f75d896558437e7d5c4ae3a0aefe0892881f4bec7ce9ab672d7b44c337b3";
+      sha512 = "231abcab55934962d3b8dec164ddf48b8b7bfc0e8cd70251479351d8be5d2605e2bb823bbf6c3002bba6c431461b0bfd570f101f31b5adf7c70804610262b856";
     }
     ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index d4ddfcfc4a69..6990c12439d7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -14,7 +14,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "45.7.1"; in
+let version = "45.8.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz";
-    sha512 = "aa1231169cfe243a257e6b9088281b85d0cf75207e3b9ebeda7792567a86f6098fb5c74dc397e3eeeb1925d221d2fb1b17df8762afd115eff9ad4d1370a49e56";
+    sha512 = "f8ba08d874fb1a09ac9ba5d4d1f46cefe801783ba4bf82eee682ac2ecc4e231d07033a80e036ad04bda7780c093fb7bc3122a23dc6e19c12f18fb7168dc78deb";
   };
 
   patches = [ ./gcc6.patch ];

From 15a1743d87edf9f2c85ded977ced7dba52ad6beb Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 9 Mar 2017 07:41:09 -0500
Subject: [PATCH 1967/3449] libuv: disable tests (temporarily) on Darwin

They're flaky, break Hydra builds regularly, and lots of stuff depends
transitively on libuv.
---
 pkgs/development/libraries/libuv/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index 0b3b86e66a24..941ab6710c2e 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -34,7 +34,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  # These should be turned back on, but see https://github.com/NixOS/nixpkgs/issues/23651
+  # For now the tests are just breaking large swaths of the nixpkgs binary cache for Darwin,
+  # and I'd rather have everything else work at all than have stronger assurance here.
+  doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
     description = "A multi-platform support library with a focus on asynchronous I/O";

From 1fa6ecb48d8257dbe33ab688313aba3a66a20c6b Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sat, 4 Mar 2017 18:09:10 +0000
Subject: [PATCH 1968/3449] nltk: init at 3.2.2

---
 pkgs/development/python-modules/nltk.nix | 30 ++++++++++++++++++++++++
 pkgs/top-level/python-packages.nix       |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/python-modules/nltk.nix

diff --git a/pkgs/development/python-modules/nltk.nix b/pkgs/development/python-modules/nltk.nix
new file mode 100644
index 000000000000..c436e40d2382
--- /dev/null
+++ b/pkgs/development/python-modules/nltk.nix
@@ -0,0 +1,30 @@
+{ fetchurl, buildPythonPackage, isPy33, lib, six, pythonAtLeast, pythonOlder }:
+
+buildPythonPackage rec {
+  name = "nltk-${version}";
+  version = "3.2.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/n/nltk/nltk-${version}.tar.gz";
+    sha256 = "13m8i393h5mhpyvh5rghxxpax3bscv8li3ynwfdiq0kh8wsdndqv";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  disabled = pythonOlder "2.7" || pythonOlder "3.4" && (pythonAtLeast "3.0");
+
+  # Tests require some data, the downloading of which is impure. It would
+  # probably make sense to make the data another derivation, but then feeding
+  # that into the tests (given that we need nltk itself to download the data,
+  # unless there's an easy way to download it without nltk's downloader) might
+  # be complicated. For now let's just disable the tests and hope for the
+  # best.
+  doCheck = false;
+
+  meta = {
+    description = "Natural Language Processing ToolKit";
+    homepage = http://nltk.org/;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e5f9e191304c..7c115adc7759 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -283,6 +283,8 @@ in {
   # version of nixpart.
   nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { };
 
+  nltk = callPackage ../development/python-modules/nltk.nix { };
+
   pitz = callPackage ../applications/misc/pitz { };
 
   plantuml = callPackage ../tools/misc/plantuml { };

From be2019570444e6442fc2aee3c53a70ff546042bc Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 9 Mar 2017 14:27:29 +0100
Subject: [PATCH 1969/3449] qgis: 2.18.3 -> 2.18.4

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

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index d32aaba8468c..004d11fe1575 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.18.3";
+  name = "qgis-2.18.4";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "155kz7fizhkmgc4lsmk1cph1zar03pdd8pjpmv81yyx1z0i4ygvl";
+    sha256 = "1s264pahxpn0215xmzm8q2khr5xspipd7bbvxah5kj339kyjfy3k";
   };
 
   cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";

From 838051e9cd7a76b93cf94c10d8728c2faca23cdc Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 9 Mar 2017 13:17:32 +0000
Subject: [PATCH 1970/3449] nixos/iso-image: support boot from USB disks

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 93dba0d882b8..85163305c1ef 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -280,7 +280,7 @@ in
         options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
       };
 
-    boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ];
+    boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" "uas" ];
 
     boot.blacklistedKernelModules = [ "nouveau" ];
 

From 899fd868ea49d9a9835821f60ea58e8e701e280e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 9 Mar 2017 16:14:17 +0100
Subject: [PATCH 1971/3449] das_watchdog: fix service type

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

diff --git a/nixos/modules/services/monitoring/das_watchdog.nix b/nixos/modules/services/monitoring/das_watchdog.nix
index 6e2653836d5e..88ca3a9227d2 100644
--- a/nixos/modules/services/monitoring/das_watchdog.nix
+++ b/nixos/modules/services/monitoring/das_watchdog.nix
@@ -25,7 +25,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         User = "root";
-        Type = "oneshot";
+        Type = "simple";
         ExecStart = "${das_watchdog}/bin/das_watchdog";
         RemainAfterExit = true;
       };

From c3939cbcf54619b48cbfef16ae627248b0e22558 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 9 Mar 2017 11:46:26 -0500
Subject: [PATCH 1972/3449] buildbot modules: don't put BB users in nixbld
 group

The nixbld group belongs to nix-daemon and you really don't want to be
in it. If you are in it, nix-daemon will kill your processes when you
least expect it :)
---
 .../modules/services/continuous-integration/buildbot/master.nix | 2 +-
 .../modules/services/continuous-integration/buildbot/worker.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index f363822c21ce..0ff6dbac39c7 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -118,7 +118,7 @@ in {
 
       extraGroups = mkOption {
         type = types.listOf types.str;
-        default = [ "nixbld" ];
+        default = [];
         description = "List of extra groups that the buildbot user should be a part of.";
       };
 
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index e80869573fa3..00423bd33865 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -31,7 +31,7 @@ in {
 
       extraGroups = mkOption {
         type = types.listOf types.str;
-        default = [ "nixbld" ];
+        default = [];
         description = "List of extra groups that the Buildbot Worker user should be a part of.";
       };
 

From 6962e84b8d9b8069d561709aab21fab15817996c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:14:47 +0100
Subject: [PATCH 1973/3449] botan2: init at 2.0.1

---
 pkgs/development/libraries/botan/2.0.nix      | 10 ++++++++++
 pkgs/development/libraries/botan/2.0.upstream | 10 ++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/botan/2.0.nix
 create mode 100644 pkgs/development/libraries/botan/2.0.upstream

diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix
new file mode 100644
index 000000000000..8d87f119157b
--- /dev/null
+++ b/pkgs/development/libraries/botan/2.0.nix
@@ -0,0 +1,10 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  baseVersion = "2.0";
+  revision = "1";
+  sha256 = "02sf6qghgs1lmprx715dnyll1rmqcjb9q6s50n20li8idlqysf51";
+  postPatch = ''
+    sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
+  '';
+})
diff --git a/pkgs/development/libraries/botan/2.0.upstream b/pkgs/development/libraries/botan/2.0.upstream
new file mode 100644
index 000000000000..d10850d46adc
--- /dev/null
+++ b/pkgs/development/libraries/botan/2.0.upstream
@@ -0,0 +1,10 @@
+url http://botan.randombit.net/download.html
+version_link 'Botan-[0-9]+[.][0-9]*[02468]([.][0-9]+)?[.](tgz|tbz|tbz2|tar[.]bz2)$'
+ensure_version
+attribute_name botan2
+do_overwrite(){
+  ensure_hash
+  set_var_value sha256 $CURRENT_HASH
+  set_var_value baseVersion ${CURRENT_VERSION%.*}
+  set_var_value revision ${CURRENT_VERSION##*.}
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7baf06381d1f..4cd62e54deb6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7001,6 +7001,7 @@ with pkgs;
   boost_process = callPackage ../development/libraries/boost-process { };
 
   botan = callPackage ../development/libraries/botan { };
+  botan2 = callPackage ../development/libraries/botan/2.0.nix { };
   botanUnstable = callPackage ../development/libraries/botan/unstable.nix { };
 
   box2d = callPackage ../development/libraries/box2d { };

From 1a665f4850970230ffe26701876ad201690fbe45 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:15:31 +0100
Subject: [PATCH 1974/3449] mc: 4.8.18 -> 4.8.19

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

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index 0c9ac20fcc3e..7ea7789687fb 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mc-${version}";
-  version = "4.8.18";
+  version = "4.8.19";
   
   src = fetchurl {
     url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
-    sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp";
+    sha256 = "1pzjq4nfxl2aakxipdjs5hq9n14374ly1l00s40kd2djnnxmd7pb";
   };
   
   buildInputs = [ pkgconfig perl glib slang zip unzip file gettext libX11 libICE

From 5daf9c3e7664d87ac487d23b574e299693b89928 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:27:31 +0100
Subject: [PATCH 1975/3449] baresip: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 2b831cdcaaf8..5dc4294ba3bc 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache
 }:
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.5.1";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc";
+    sha256 = "0yi80gi2vb600n7wi6mk81zfdi1n5pg1dsz7458sb3z5cv5gj8yg";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good

From 1c8c795a209a6e1701fbf6030e2d52745bad81e3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:28:20 +0100
Subject: [PATCH 1976/3449] asymptote: 2.39 -> 2.40

---
 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 483c73d149b4..0fbca9f659ce 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.39";
+    version="2.40";
     name="${baseName}-${version}";
-    hash="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3";
-    url="https://netcologne.dl.sourceforge.net/project/asymptote/2.39/asymptote-2.39.src.tgz";
-    sha256="187q81yw06x4gv2spfn0hcs1064ym3a8l6mdgawymfhqd60yhrs3";
+    hash="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
+    url="https://netcologne.dl.sourceforge.net/project/asymptote/2.40/asymptote-2.40.src.tgz";
+    sha256="08hy8hgh217df9kwznr22mg8vxxh3rbmbxgx3nqhxyggc9xqy544";
   };
   buildInputs = [
    ghostscriptX imagemagick fftw

From a7945a8cab676ba61303910563b0df63fb3e49b8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:29:11 +0100
Subject: [PATCH 1977/3449] sgt-puzzles: 20161228.7cae89f -> 20170228.1f613ba

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

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 26278dd031cc..6718b3b0b5e6 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -1,6 +1,6 @@
 {stdenv, gtk3, pkgconfig, libX11, perl, fetchurl, automake115x, autoconf}:
 let
-  version = "20161228.7cae89f";
+  version = "20170228.1f613ba";
   buildInputs = [
     gtk3 pkgconfig libX11 perl automake115x autoconf
   ];
@@ -8,7 +8,7 @@ in
 stdenv.mkDerivation {
   src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-   sha256 = "0kqy3gdgfjgaqbjl95pnljz44v91i79qphwdp91k0n5alswxwn76";
+   sha256 = "02nqc18fhvxr545wgk55ly61fi0a06q61ljzwadprqxa1n0g0fz5";
   };
   name = "sgt-puzzles-r" + version;
   inherit buildInputs;

From 3589e08ac5515198986b27076fde8274f848a3b0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:34:06 +0100
Subject: [PATCH 1978/3449] mpir: 2.7.2 -> 3.0.0

---
 pkgs/development/libraries/mpir/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index 142bd93fe525..4bfd43508317 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -1,21 +1,16 @@
-{ stdenv, fetchurl, fetchpatch, m4 }:
+{ stdenv, fetchurl, fetchpatch, m4, which, yasm }:
 
 stdenv.mkDerivation rec {
   name = "mpir-${version}";
-  version = "2.7.2";
+  version = "3.0.0";
 
-  buildInputs = [ m4 ];
+  nativeBuildInputs = [ m4 which yasm ];
 
   src = fetchurl {
     url = "http://mpir.org/mpir-${version}.tar.bz2";
-    sha256 = "1v25dx7cah2vxwzgq78hpzqkryrfxhwx3mcj3jjq3xxljlsw7m57";
+    sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
   };
 
-  patches = [ (fetchpatch {
-    url = "https://github.com/wbhart/mpir/commit/fdb590023f7ca4b2e881a2e9573718e7ed180f03.patch";
-    sha256 = "152pdqpf8xxr4ky25f9zrvfb66i1wzy6a5b91h4zmpqjdffqf1iw";
-  }) ];
-
   meta = {
     inherit version;
     description = ''A highly optimised library for bignum arithmetic forked from GMP'';

From 4d44ed9d90b9bc6642e7ee98db2c639471fa96b7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:34:35 +0100
Subject: [PATCH 1979/3449] ipmiutil: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 059a5d9e416c..174772107268 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "3.0.1";
+  version = "3.0.2";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "179hvarw0mk3j1z4102q4692q4mx06y259llr891by0pri0bsb3n";
+    sha256 = "0nw12v7w9gx2px3b081i5mm5gl4l9n3vxhhk5n18vj1bs2jsxf4d";
   };
 
   buildInputs = [ openssl ];

From c798e3f94a59154561d99991f58ffd5e68207f49 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:37:07 +0100
Subject: [PATCH 1980/3449] apache-jena: 3.1.1 -> 3.2.0

---
 pkgs/servers/nosql/apache-jena/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 13001b1813f2..423bc8070355 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena";
-    version = "3.1.1";
+    version = "3.2.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
-    sha256 = "0sxhpasc3qkj1axkccvckv8wiwcc5v6f4yri49inc3sl02pvvanp";
+    sha256 = "0n15mx8lnamkf3a1wlgx5slh6615m14wclv8fzkbb1xqq001c3j4";
   };
   buildInputs = [
     makeWrapper

From 30b9da628a5a3921920203be73fc656db132f061 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:37:17 +0100
Subject: [PATCH 1981/3449] fuseki: 2.4.1 -> 2.5.0

---
 pkgs/servers/nosql/apache-jena/fuseki-binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
index 12543b336dda..e3e748dc2b48 100644
--- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena-fuseki";
-    version = "2.4.1";
+    version = "2.5.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
-    sha256 = "01yjpghgz637wwgnk5n9d7kchc3mmrbyrm8fs4rh2hkh66mq3ya4";
+    sha256 = "0qkdpifv30138y7d6vj0dksk4fbgcnwl26dqm89q0d66sc0czfbv";
   };
   buildInputs = [
     makeWrapper

From 1fc34861547ca6df9cd01ee0765f075afc5ec312 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:37:37 +0100
Subject: [PATCH 1982/3449] glusterfs: 3.9.1 -> 3.10.0

---
 pkgs/tools/filesystems/glusterfs/default.nix      | 9 ++++-----
 pkgs/tools/filesystems/glusterfs/default.upstream | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index e81c3768b254..2f49d630c151 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -3,14 +3,13 @@
  , liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which
 }:
 let 
-  s = # Generated upstream information 
+  s =
   rec {
     baseName="glusterfs";
-    version="3.9.1";
+    version = "3.10.0";
     name="${baseName}-${version}";
-    hash="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.9/3.9.1/glusterfs-3.9.1.tar.gz";
-    sha256="02p3i1zr0i2fhjhz64wvhdn0z7b6b3hkiqz1bkyhracncspxnvw9";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.10/3.10.0/glusterfs-3.10.0.tar.gz";
+    sha256 = "1svysq55z4sd6bxcdpkxljwis4cnzkknag22ngyr7sgb4bs19c97";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python2 ncurses readline
diff --git a/pkgs/tools/filesystems/glusterfs/default.upstream b/pkgs/tools/filesystems/glusterfs/default.upstream
index 7c86455b4409..29494eab87b9 100644
--- a/pkgs/tools/filesystems/glusterfs/default.upstream
+++ b/pkgs/tools/filesystems/glusterfs/default.upstream
@@ -1,4 +1,5 @@
 url http://download.gluster.org/pub/gluster/glusterfs/
-version_link '[0-9.]+/$'
-version_link '[0-9.]+/$'
-version_link '[.]tar[.]'
+version_link '/[0-9.]+/$'
+version_link '/[0-9.]+/$'
+version_link 'glusterfs-[0-9.]+[.]tar[.]'
+minimize_overwrite

From bf514e4412d29f6f177b4d5854367713da45640d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:47:26 +0100
Subject: [PATCH 1983/3449] sbcl: 1.3.14 -> 1.3.15

---
 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 c713d819661f..d1dcda064cb5 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.14";
+  version = "1.3.15";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "1jnwsv8bdkrrg1w0gkjx9nb8sw3if38sna40davrx0rxadc3v5mz";
+    sha256 = "11db8pkv3i8ajyb295dh9nl0niyrkh9gjqv4vlaa1dl1vzck5ddi";
   };
 
   patchPhase = ''

From 8a91ac56b4bbb119dddc8a28832ab0650f57b880 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 15:51:52 +0100
Subject: [PATCH 1984/3449] eigen3_3: 3.3.1 -> 3.3.3

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

diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index ca3d44022062..b4cb1029001e 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.3.1";
+  version = "3.3.3";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "141axgv5kykq7125scisjvnfcdx7qcj8n8zlk7g09r7fhqgjr79w";
+    sha256 = "0pz7k8kd9nydmsj2prjs67apixipl6pll3f0cjy0y3bvlazqr1wl";
   };
   
   nativeBuildInputs = [ cmake ];

From b5485da2cd359a1257a296cba5361a0e52bbe4e0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 18:44:37 +0100
Subject: [PATCH 1985/3449] icu_57: init at 57.1 for LibreOffice Still

---
 pkgs/development/libraries/icu/57.nix | 64 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/libraries/icu/57.nix

diff --git a/pkgs/development/libraries/icu/57.nix b/pkgs/development/libraries/icu/57.nix
new file mode 100644
index 000000000000..fbd5f512aee7
--- /dev/null
+++ b/pkgs/development/libraries/icu/57.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
+
+let
+  pname = "icu4c";
+  version = "57.1";
+in
+stdenv.mkDerivation ({
+  name = pname + "-" + version;
+
+  src = fetchurl {
+    url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
+      + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
+    sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";
+  };
+
+  outputs = [ "out" "dev" ];
+  outputBin = "dev";
+
+  # FIXME: This fixes dylib references in the dylibs themselves, but
+  # not in the programs in $out/bin.
+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
+  postUnpack = ''
+    sourceRoot=''${sourceRoot}/source
+    echo Source root reset to ''${sourceRoot}
+  '';
+
+  # This pre/postPatch shenanigans is to handle that the patches expect
+  # to be outside of `source`.
+  prePatch = ''
+    pushd ..
+  '';
+  postPatch = ''
+    popd
+  '';
+
+  patches = [
+  ];
+
+  preConfigure = ''
+    sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
+  '';
+
+  configureFlags = "--disable-debug" +
+    stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath";
+
+  # remove dependency on bootstrap-tools in early stdenv build
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
+  '';
+
+  postFixup = ''moveToOutput lib/icu "$dev" '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Unicode and globalization support library";
+    homepage = http://site.icu-project.org/;
+    maintainers = with maintainers; [ raskin urkud ];
+    platforms = platforms.all;
+  };
+} // (if stdenv.isArm then {
+  patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ];
+} else {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cd62e54deb6..81a876240887 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7782,6 +7782,8 @@ with pkgs;
   hyena = callPackage ../development/libraries/hyena { };
 
   icu = callPackage ../development/libraries/icu { };
+  # Needed for LibreOffice Still as of 5.2.6.2
+  icu_57 = callPackage ../development/libraries/icu/57.nix { };
 
   id3lib = callPackage ../development/libraries/id3lib { };
 

From ccebeca50046b0181027eb9586686826f44bee20 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 18:45:01 +0100
Subject: [PATCH 1986/3449] libreoffice-still: use icu_57

---
 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 81a876240887..8c8ffd58a8d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14268,7 +14268,9 @@ with pkgs;
     lcms = lcms2;
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
+      icu = icu_57;
     };
+    icu = icu_57;
   });
 
 

From d90e6c7ee63bf9fba4b50844a29f47459a3833ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 9 Mar 2017 18:47:59 +0100
Subject: [PATCH 1987/3449] gajim: 0.16.6 -> 0.16.7

---
 .../instant-messengers/gajim/default.nix      | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index ae318e644243..1228804f5b95 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -25,30 +25,22 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.6";
+  version = "0.16.7";
 
   src = fetchurl {
     name = "${name}.tar.bz2";
     url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
         + "ref=${name}";
-    sha256 = "1s0h4xll9490vh7ygmi4zsd1fa107f3s9ykhpq0snb04fllwhjq7";
+    sha256 = "18srrsswq09i54gcqqy0ylmrix1rrq43f0b8sz1lijr39h3ayw3j";
   };
 
   patches = let
     # An attribute set of revisions to apply from the upstream repository.
     cherries = {
-      misc-test-fixes = {
-        rev = "1f0d7387fd020df5dfc9a6349005ec7dedb7c008";
-        sha256 = "0nazpzyg50kl0k8z4dkn033933iz60g1i6nzhib1nmzhwwbnacc5";
-      };
-      jingle-fix = {
-        rev = "491d32a2ec13ed3a482e151e0b403eda7b4151b8";
-        sha256 = "1pfg1ysr0p6rcwmd8ikjs38av3c4gcxn8pxr6cnnj27n85gvi30g";
-      };
-      fix-connection-mock = {
-        rev = "46a19733d208fbd2404cbaeedd8c203d0b6557a4";
-        sha256 = "0l3s577pksnz16r4mqa1zmz4y165amsx2mclrm4vzlszy35rmy2b";
-      };
+      #example-fix = {
+      #  rev = "<replace-with-git-revsion>";
+      #  sha256 = "<replace-with-sha256>";
+      #};
     };
   in mapAttrsToList (name: { rev, sha256 }: fetchurl {
     name = "gajim-${name}.patch";

From 6de1b73db1e6f1a0e2f11fc603282881d3a03a55 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 18:57:25 +0100
Subject: [PATCH 1988/3449] eigen: 3.2.5 -> 3.2.10

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 0e43b9fb6020..c38759e0c757 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, cmake}:
 
 let
-  version = "3.2.5";
+  version = "3.2.10";
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
@@ -9,10 +9,14 @@ stdenv.mkDerivation {
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
-    sha256 = "1vjixip19lwfia2bjpjwm09j7l20ry75493i6mjsk9djszj61agi";
+    sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
   };
   
   nativeBuildInputs = [ cmake ];
+
+  postInstall = ''
+    sed -e '/Cflags:/s@''${prefix}@@' -i "$out"/share/pkgconfig/eigen3.pc
+  '';
   
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";

From eaf8cf2f75b17f563f68226184cd06614f4598d5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 18:58:35 +0100
Subject: [PATCH 1989/3449] harfbuzz: 1.4.2 -> 1.4.4

---
 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 43861e9e195f..e8cd4f13ecef 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.4.2";
+  version = "1.4.4";
   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 = "1cxpkhrjd20fwfysyxmi9rjvvggxlbzlyrs39p1dw3q0mg7ls8wg";
+    sha256 = "0mfj37qr8fw9mzsvk4296fq8vzq909mwlkl2xrjfrfvc8z5gilim";
   };
 
   outputs = [ "out" "dev" ];

From 308f13ce6010cdb3baf035fc50148bed2a6271c0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 18:58:59 +0100
Subject: [PATCH 1990/3449] libre: 0.5.0 -> 0.5.1

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

diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 6ec6333a73d7..5bd18f72356f 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.5.1";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "18msdi5a1ssymz00w21hg6sgacb2lzx0ns31iapvk5hv6l225pd2";
+    sha256 = "1qs6gpflgwic2pp1nplhhyl585h9q0kf74h5z29ajr5ij0j65rsa";
   };
   buildInputs = [zlib openssl];
   makeFlags = [

From 6fad14b66eacadeb3aec7eb874d756718283512b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 9 Mar 2017 18:59:13 +0100
Subject: [PATCH 1991/3449] libreoffice-still: 5.2.5.1 -> 5.2.6.2

---
 .../office/libreoffice/libreoffice-srcs-still.nix      | 10 +++++-----
 .../office/libreoffice/still-primary-src.nix           |  6 +++---
 pkgs/applications/office/libreoffice/still.nix         |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
index 8bfb54fef550..7bcb638b77ec 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix
@@ -112,11 +112,11 @@
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
-    name = "curl-7.51.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz";
-    sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c";
-    md5 = "490e19a8ccd1f4a244b50338a0eb9456";
-    md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz";
+    name = "curl-7.52.1.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
+    sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+    md5 = "4e1ef056e117b4d25f4ec42ac609c0d4";
+    md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz";
   }
   {
     name = "libe-book-0.1.2.tar.bz2";
diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix
index 0fae854f42fa..d1e87d7de6da 100644
--- a/pkgs/applications/office/libreoffice/still-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/still-primary-src.nix
@@ -3,8 +3,8 @@
 rec {
   major = "5";
   minor = "2";
-  patch = "5";
-  tweak = "1";
+  patch = "6";
+  tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "006kn1m5d6c1skgc1scc0gssin922raca2psjv887alplhia6mlp";
+    sha256 = "0w1myl4l1qhdkwqb3b52xld1sq45xyg8b45q40l6a50iccwy6j9x";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 329b292da27c..6897597e7ef8 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0lv3jbnzzkr7nbivsl9jm9b4m9mxvngbmhz6yasblhi0m9ifkxmb";
+      sha256 = "0w77mkxmhxx4qjwdwb8bipcdb4pkvkg202mxbbjrv0aj09k6dhvk";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "1d29ppdkhhy5x8cric0l872x607ng02bnp2gvv5ck3blb759q68i";
+      sha256 = "12xqzp005dhbh618g3zb30vj7rdmccdqj6ix10jlk0clk66n9kf0";
     };
 
   };

From ff2e2e82ccc2eebc36220613b332efa475dcca51 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Thu, 9 Mar 2017 13:02:29 -0500
Subject: [PATCH 1992/3449] nginx: Add alias configuration option for hosts and
 locations.

It's like root, but doesn't keep the prefix.
---
 nixos/modules/services/web-servers/nginx/default.nix     | 2 ++
 .../services/web-servers/nginx/location-options.nix      | 9 +++++++++
 .../modules/services/web-servers/nginx/vhost-options.nix | 9 +++++++++
 3 files changed, 20 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 9e93e56b9c2c..4ad272deb376 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -158,6 +158,7 @@ let
           server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
           ${acmeLocation}
           ${optionalString (vhost.root != null) "root ${vhost.root};"}
+          ${optionalString (vhost.alias != null) "alias ${vhost.alias};"}
           ${optionalString (vhost.globalRedirect != null) ''
             return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri;
           ''}
@@ -180,6 +181,7 @@ let
       ${optionalString (config.index != null) "index ${config.index};"}
       ${optionalString (config.tryFiles != null) "try_files ${config.tryFiles};"}
       ${optionalString (config.root != null) "root ${config.root};"}
+      ${optionalString (config.alias != null) "alias ${config.alias};"}
       ${config.extraConfig}
     }
   '') locations);
diff --git a/nixos/modules/services/web-servers/nginx/location-options.nix b/nixos/modules/services/web-servers/nginx/location-options.nix
index e1885b160664..83ce0f717341 100644
--- a/nixos/modules/services/web-servers/nginx/location-options.nix
+++ b/nixos/modules/services/web-servers/nginx/location-options.nix
@@ -45,6 +45,15 @@ with lib;
       '';
     };
 
+    alias = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      example = "/your/alias/directory";
+      description = ''
+        Alias directory for requests.
+      '';
+    };
+
     extraConfig = mkOption {
       type = types.lines;
       default = "";
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index c0ea645b3dfe..a76a971aff06 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -89,6 +89,15 @@ with lib;
       '';
     };
 
+    alias = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      example = "/data/webserver/docs";
+      description = ''
+        The path of the web alias directory.
+      '';
+    };
+
     default = mkOption {
       type = types.bool;
       default = false;

From e7358b192a3cdfc7d64fa2a21321df03b2256345 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Thu, 9 Mar 2017 13:02:49 -0500
Subject: [PATCH 1993/3449] nginx: Assert that either root or alias is null.

If both are set, nginx won't start.  More error checking is certainly in
order, but this seems like a reasonable start.
---
 nixos/modules/services/web-servers/nginx/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 4ad272deb376..72cc10caef11 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -380,6 +380,15 @@ in
   config = mkIf cfg.enable {
     # TODO: test user supplied config file pases syntax test
 
+    assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ {
+        assertion = all hostOrAliasIsNull (attrValues virtualHosts);
+        message = "Only one of nginx root or alias can be specified on a virtualHost.";
+      } {
+        assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts);
+        message = "Only one of nginx root or alias can be specified on a location.";
+      }
+    ];
+
     systemd.services.nginx = {
       description = "Nginx Web Server";
       after = [ "network.target" ];

From 4c33ea35b70fb222aa61f5f1c50d074b6df3e8fc Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 9 Mar 2017 14:40:02 +0100
Subject: [PATCH 1994/3449] libpcap: fix missing remote-ext.h error

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

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 14567c0daf4d..0cd9d758725c 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison }:
+{ stdenv, fetchurl, fetchpatch, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "libpcap-1.8.1";
@@ -21,6 +21,13 @@ stdenv.mkDerivation rec {
     substituteInPlace configure --replace " -arch i386" ""
   '';
 
+  patches = [
+    (fetchpatch {
+      url    = "https://sources.debian.net/data/main/libp/libpcap/1.8.1-3/debian/patches/disable-remote.diff";
+      sha256 = "0dvjax9c0spvq8cdjnkbnm65wlzaml259yragf95kzg611vszfmj";
+    })
+  ];
+
   preInstall = ''mkdir -p $out/bin'';
 
   crossAttrs = {

From 16651026882e9e6c74d520be386d4eada09fb572 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 9 Mar 2017 14:46:33 +0100
Subject: [PATCH 1995/3449] ostinato: refactor

---
 .../networking/ostinato/default.nix           | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 941ed60f9aff..41e64d7b721f 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchgit, fetchurl, writeText
-, qt4, qmake4Hook, protobuf, libpcap
-, wireshark, gzip, diffutils, gawk
+{ stdenv, fetchFromGitHub, fetchurl, qmake4Hook, makeDesktopItem
+, qt4, protobuf, libpcap, wireshark, gzip, diffutils, gawk
 }:
 
 stdenv.mkDerivation rec {
-  name = "ostinato-2015-12-24";
-  src = fetchgit {
-    url = "https://github.com/pstavirs/ostinato.git";
-    rev = "414d89860de0987843295d149bcabeac7c6fd9e5";
-    sha256 = "1yif8z8ih027jdsgnxd82z9914wrqpkpi4xgxqv9lygnb2jjjrdx";
+  name    = "ostinato-${version}";
+  version = "0.8";
+
+  src = fetchFromGitHub  {
+    owner  = "pstavirs";
+    repo   = "ostinato";
+    rev    = "v${version}";
+    sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3";
   };
 
-  ostinato_png = fetchurl {
+  ostinatoIcon = fetchurl {
     url = "http://ostinato.org/images/site-logo.png";
     sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
   };
@@ -22,7 +24,27 @@ stdenv.mkDerivation rec {
 
   patches = [ ./drone_ini.patch ];
 
+  desktopItem = makeDesktopItem {
+    type          = "application";
+    name          = "ostinato";
+    desktopName   = "Ostinato";
+    genericName   = "Packet/Traffic Generator and Analyzer";
+    comment       = "Network packet and traffic generator and analyzer with a friendly GUI";
+    categories    = "Network";
+    terminal      = "false";
+    startupNotify = "true";
+    exec          = "$out/bin/ostinato";
+    icon          =  ostinatoIcon;
+    extraEntries  = ''
+      GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
+      Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
+    '';
+  };
+
   postInstall = ''
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+
     cat > $out/bin/ostinato.ini <<EOF
     WiresharkPath=${wireshark}/bin/wireshark
     TsharkPath=${wireshark}/bin/tshark
@@ -30,34 +52,13 @@ stdenv.mkDerivation rec {
     DiffPath=${diffutils}/bin/diff
     AwkPath=${gawk}/bin/awk
     EOF
-
-    mkdir -p $out/share/pixmaps
-    cp ${ostinato_png} $out/share/pixmaps/ostinato.png
-
-    # Create a desktop item.
-    mkdir -p $out/share/applications
-    cat > $out/share/applications/ostinato.desktop <<EOF
-    [Desktop Entry]
-    Type=Application
-    Encoding=UTF-8
-    Name=Ostinato
-    GenericName=Packet/Traffic Generator and Analyzer
-    GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
-    Comment=Network packet and traffic generator and analyzer with a friendly GUI
-    Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
-    Icon=$out/share/pixmaps/ostinato.png
-    Exec=$out/bin/ostinato
-    Terminal=false
-    Categories=Network;
-    StartupNotify=true
-    EOF
   '';
 
   meta = with stdenv.lib; {
     description = "A packet traffic generator and analyzer";
-    homepage = http://ostinato.org;
-    license = licenses.gpl3;
+    homepage    = http://ostinato.org;
+    license     = licenses.gpl3;
     maintainers = with maintainers; [ rick68 ];
-    platforms = platforms.linux;  # also OS X and cygwin
+    platforms   = with platforms; linux ++ darwin ++ cygwin;
   };
 }

From cdfa92184d9a88d9fce213d2ea603952c2b46ecc Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 9 Mar 2017 15:10:47 -0500
Subject: [PATCH 1996/3449] pythonPackages.blockdiag: enable on Darwin and
 other unixes

Seemed to work fine on Darwin
---
 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 70ed8297ff1f..ad065148f74a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2991,7 +2991,7 @@ in {
       description = "Generate block-diagram image from spec-text file (similar to Graphviz)";
       homepage = http://blockdiag.com/;
       license = licenses.asl20;
-      platforms = platforms.linux;
+      platforms = platforms.unix;
       maintainers = with maintainers; [ bjornfor ];
     };
   };

From a4f8b67783198ded98516244d5a1592cfc463bd8 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 9 Mar 2017 15:11:05 -0500
Subject: [PATCH 1997/3449] pythonPackages.funcparserlib: enable on Darwin and
 other unixes

Seemed to work fine on Darwin
---
 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 ad065148f74a..09e0caaf9b07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7204,7 +7204,7 @@ in {
       description = "Recursive descent parsing library based on functional combinators";
       homepage = https://code.google.com/p/funcparserlib/;
       license = licenses.mit;
-      platforms = platforms.linux;
+      platforms = platforms.unix;
     };
   };
 

From 0b0b3b80217a6d8614b6def3b2edb78999b364c4 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 9 Mar 2017 15:12:05 -0500
Subject: [PATCH 1998/3449] pythonPackages.webcolors: enable on Darwin and
 other unixes

Seemed to work fine on Darwin
---
 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 09e0caaf9b07..4dbb61cc4568 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26886,7 +26886,7 @@ EOF
       description = "Library for working with color names/values defined by the HTML and CSS specifications";
       homepage = https://bitbucket.org/ubernostrum/webcolors/overview/;
       license = licenses.bsd3;
-      platforms = platforms.linux;
+      platforms = platforms.unix;
     };
   };
 

From 74f92e95562c1dea4791c648fe4a4d9a70b2fd2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Mar 2017 21:25:45 +0100
Subject: [PATCH 1999/3449] knot-resolver: maintenance 1.2.3 -> 1.2.4

---
 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 24960eb65eff..bc9e35f88c4b 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.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "81a773f182112b4e11935223f900cfbcca8624f2c382b1e39a68d7c3db81c921";
+    sha256 = "630b2ad0bfdcf59164957a377adef8b1fddc37a58a7e1d10e76a1b497a30f036";
   };
 
   outputs = [ "out" "dev" ];

From d94acf8519baa2bd55536f878c98fe93b2a165f8 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 9 Mar 2017 14:42:26 -0600
Subject: [PATCH 2000/3449] coreutils: 8.26 -> 8.27

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

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 2c435881f8c5..455937f3a67c 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -13,11 +13,11 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "coreutils-8.26";
+  name = "coreutils-8.27";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.xz";
-    sha256 = "13lspazc7xkviy93qz7ks9jv4sldvgmwpq36ghrbrqpq93br8phm";
+    sha256 = "0sv547572iq8ayy8klir4hnngnx92a9nsazmf1wgzfc7xr4x74c8";
   };
 
   # FIXME needs gcc 4.9 in bootstrap tools

From a09246948cafb7672ea1e5590688e7eb6a16cef3 Mon Sep 17 00:00:00 2001
From: Evan Danaher <edanaher@edanaher.net>
Date: Thu, 9 Mar 2017 16:54:44 -0500
Subject: [PATCH 2001/3449] nginx: disallow alias directive on server level; it
 doesn't work.

---
 nixos/modules/services/web-servers/nginx/default.nix     | 7 ++-----
 .../modules/services/web-servers/nginx/vhost-options.nix | 9 ---------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 72cc10caef11..709fce522d52 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -158,7 +158,6 @@ let
           server_name ${serverName} ${concatStringsSep " " vhost.serverAliases};
           ${acmeLocation}
           ${optionalString (vhost.root != null) "root ${vhost.root};"}
-          ${optionalString (vhost.alias != null) "alias ${vhost.alias};"}
           ${optionalString (vhost.globalRedirect != null) ''
             return 301 http${optionalString ssl "s"}://${vhost.globalRedirect}$request_uri;
           ''}
@@ -380,10 +379,8 @@ in
   config = mkIf cfg.enable {
     # TODO: test user supplied config file pases syntax test
 
-    assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [ {
-        assertion = all hostOrAliasIsNull (attrValues virtualHosts);
-        message = "Only one of nginx root or alias can be specified on a virtualHost.";
-      } {
+    assertions = let hostOrAliasIsNull = l: l.root == null || l.alias == null; in [
+      {
         assertion = all (host: all hostOrAliasIsNull (attrValues host.locations)) (attrValues virtualHosts);
         message = "Only one of nginx root or alias can be specified on a location.";
       }
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index a76a971aff06..c0ea645b3dfe 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -89,15 +89,6 @@ with lib;
       '';
     };
 
-    alias = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      example = "/data/webserver/docs";
-      description = ''
-        The path of the web alias directory.
-      '';
-    };
-
     default = mkOption {
       type = types.bool;
       default = false;

From 62117656763341903f466e5ca67703b6dc9f10f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 9 Mar 2017 23:09:32 +0100
Subject: [PATCH 2002/3449] qtstyleplugins: fix eval of meta

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

diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index f1ee6e659a6f..215a038adbe1 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
     maintainers = [ maintainers.gnidorah ];
     platforms = platforms.linux;
-    broken = builtins.compareVersion qtbase.version "5.7.0" > 0;
+    broken = builtins.compareVersions qtbase.version "5.7.0" > 0;
   };
 }

From fe20a3275154c6425cbb63434a7e2f98f65804f6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Mar 2017 01:20:22 +0200
Subject: [PATCH 2003/3449] pshs: 0.3 -> 0.3.1, fix source location

---
 pkgs/servers/http/pshs/default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix
index b9a42b4a5f61..38ab4bd3187d 100644
--- a/pkgs/servers/http/pshs/default.nix
+++ b/pkgs/servers/http/pshs/default.nix
@@ -1,24 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode, miniupnpc }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
 
-let
-  version = "0.3";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "pshs-${version}";
+  version = "0.3.1";
 
-  src = fetchurl {
-    url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2";
-    sha256 = "0qvy1m9jmbjhbihs1qr9nasbaajl3n0x8bgz1vw9xvpkqymx5i63";
+  src = fetchFromGitHub {
+    owner = "mgorny";
+    repo = "pshs";
+    rev = "v${version}";
+    sha256 = "18mhxdjlyr21gghzkrrlp0imicb6bqf741p0a21c2rkvs4bv8c1w";
   };
 
-  buildInputs = [ pkgconfig libevent file qrencode miniupnpc ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libevent file qrencode miniupnpc ];
 
   # SSL requires libevent at 2.1 with ssl support
   configureFlags = "--disable-ssl";
 
   meta = {
     description = "Pretty small HTTP server - a command-line tool to share files";
-    homepage = "https://bitbucket.org/mgorny/pshs/";
+    homepage = "https://github.com/mgorny/pshs";
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.eduarrrd ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From e7ce27f9ce47bd87f8580f27583f98d29be9e4bf Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Mar 2017 01:48:53 +0200
Subject: [PATCH 2004/3449] john: Disable parallel build

http://hydra.nixos.org/build/49940032/nixlog/1/raw
---
 pkgs/tools/security/john/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index c44f144bea68..f5d253af9ff3 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -30,7 +30,10 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-native-macro" ];
 
   buildInputs = [ openssl nss nspr kerberos gmp zlib libpcap re2 gcc ];
-  enableParallelBuilding = true;
+
+  # gcc -DAC_BUILT -Wall vncpcap2john.o memdbg.o -g    -lpcap -fopenmp -o ../run/vncpcap2john
+  # gcc: error: memdbg.o: No such file or directory
+  enableParallelBuilding = false;
 
   NIX_CFLAGS_COMPILE = [ "-DJOHN_SYSTEMWIDE=1" ];
 

From d56e596da7f96a7bd8f422dd9fcda5b135607eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 10 Mar 2017 00:50:59 +0100
Subject: [PATCH 2005/3449] lua-{5.2,5.3}: fixup dylib symlink names on Darwin

Hopefully; I didn't test it.
https://github.com/NixOS/nixpkgs/pull/6311#issuecomment-285521028
---
 pkgs/development/interpreters/lua-5/5.2.darwin.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/lua-5/5.2.darwin.patch b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
index b314bd2abac3..be0e206bbfc7 100644
--- a/pkgs/development/interpreters/lua-5/5.2.darwin.patch
+++ b/pkgs/development/interpreters/lua-5/5.2.darwin.patch
@@ -15,8 +15,8 @@ index d2c7db4..dc107b3 100644
  	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
  	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)
  	cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN)
-+	ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${majorVersion}.dylib
-+	ln -s -f liblua.${majorVersion}.dylib $(INSTALL_LIB)/liblua.dylib
++	ln -s -f liblua.${version}.dylib $(INSTALL_LIB)/liblua.${luaversion}.dylib
++	ln -s -f liblua.${luaversion}.dylib $(INSTALL_LIB)/liblua.dylib
  
  uninstall:
  	cd src && cd $(INSTALL_BIN) && $(RM) $(TO_BIN)

From 5bb99ca0f6e5853ec2628fbae0e764ae122af1d3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Mar 2017 01:57:23 +0200
Subject: [PATCH 2006/3449] simavr: Disable parallel build

http://hydra.nixos.org/build/49945319/nixlog/1/raw
---
 pkgs/development/tools/simavr/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix
index 82c2c131f07f..9fa6b8b5716c 100644
--- a/pkgs/development/tools/simavr/default.nix
+++ b/pkgs/development/tools/simavr/default.nix
@@ -4,7 +4,6 @@
 stdenv.mkDerivation rec {
   name = "simavr-${version}";
   version = "1.5";
-  enableParallelBuilding = true;
 
   src = fetchFromGitHub {
     owner = "buserror";
@@ -13,6 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "0b2lh6l2niv80dmbm9xkamvnivkbmqw6v97sy29afalrwfxylxla";
   };
 
+  # ld: cannot find -lsimavr
+  enableParallelBuilding = false;
+
   buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}";
   installFlags = buildFlags + " DESTDIR=$(out)";
 

From f02ac9588ffa4d1a68764be378f4bc3a5ab94ecd Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 9 Mar 2017 19:05:04 -0500
Subject: [PATCH 2007/3449] mark old seg3d as broken for now since it no longer
 builds with stock gcc version and flags

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

diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix
index d645a15b02ea..e97278148f99 100644
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ b/pkgs/applications/graphics/seg3d/default.nix
@@ -48,4 +48,8 @@ stdenv.mkDerivation {
   '';
 
   buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ];
+
+  meta = {
+    broken = true;
+  };
 }

From 57486f21a3e5711ff3eaaad877ecd3781587f584 Mon Sep 17 00:00:00 2001
From: Ben Darwin <ben@gentzen>
Date: Fri, 3 Mar 2017 11:17:00 -0500
Subject: [PATCH 2008/3449] edward: init at 1.2.2

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

diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
new file mode 100644
index 000000000000..0ae81aef0968
--- /dev/null
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
+, Keras, numpy, scipy, six, tensorflow }:
+
+buildPythonPackage rec {
+  pname = "edward";
+  version = "1.2.2";
+  name  = "${pname}-${version}";
+
+  disabled = !(isPy27 || pythonAtLeast "3.4");
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0h9i15l7mczwx8jvabjbvxjjidr13x81h6vylb1p8r308w01r2as";
+  };
+
+  # disabled for now due to Tensorflow trying to create files in $HOME:
+  doCheck = false;
+
+  propagatedBuildInputs = [ Keras numpy scipy six tensorflow ];
+
+  meta = with stdenv.lib; {
+    description = "Probabilistic programming language using Tensorflow";
+    homepage = https://github.com/blei-lab/edward;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81f602772d1c..9df39f6cd3ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6672,6 +6672,8 @@ in {
     };
   };
 
+  edward = callPackage ../development/python-modules/edward { };
+
   elasticsearch = buildPythonPackage (rec {
     name = "elasticsearch-1.9.0";
 

From 8e61b7fefa836bc73f3454c79655275c8d829e37 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 9 Mar 2017 21:56:54 -0500
Subject: [PATCH 2009/3449] pythonPackages.pyopenssl: disable tests on Darwin

---
 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 4dbb61cc4568..069a10cdba52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21540,11 +21540,15 @@ in {
 
     checkPhase = ''
       runHook preCheck
-      export LANG="en_US.UTF-8";
-      py.test;
+      export LANG="en_US.UTF-8"
+      py.test
       runHook postCheck
     '';
 
+    # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1
+    # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail.
+    doCheck = !stdenv.isDarwin;
+
     buildInputs = [ pkgs.openssl self.pytest pkgs.glibcLocales ];
     propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ];
   };

From bce352949e3fe2bc361bc9d03f381f99c233d8fa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 9 Mar 2017 18:24:00 +0800
Subject: [PATCH 2010/3449] virtmanager-qt: init at 0.39.60

---
 .../virtualization/virt-manager/qt.nix        | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/virtualization/virt-manager/qt.nix

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
new file mode 100644
index 000000000000..d502ef06671e
--- /dev/null
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, qtbase, qtmultimedia, qtsvg, makeQtWrapper
+, lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol
+}:
+
+stdenv.mkDerivation rec {
+  name = "virt-manager-qt-${version}";
+  version = "0.39.60";
+
+  src = fetchFromGitHub {
+    owner  = "F1ash";
+    repo   = "qt-virt-manager";
+    rev    = "${version}";
+    sha256 = "010lpw85m5sd613l281y4zxkp5v3k16pgnawskbi1ricsnj4k5mh";
+  };
+
+  cmakeFlags = [
+    "-DBUILD_QT_VERSION=5"
+  ];
+
+  buildInputs = [
+    qtbase qtmultimedia qtsvg lxqt.qtermwidget
+    libvirt libvncserver pixman spice_gtk spice_protocol
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig makeQtWrapper ];
+
+  postFixup = ''
+    for f in $out/bin/* ; do
+      wrapQtProgram $f
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://f1ash.github.io/qt-virt-manager;
+    description = "Desktop user interface for managing virtual machines (QT)";
+    longDescription = ''
+      The virt-manager application is a desktop user interface for managing
+      virtual machines through libvirt. It primarily targets KVM VMs, but also
+      manages Xen and LXC (linux containers).
+    '';
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c8ffd58a8d9..6ff4a907eb02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15712,6 +15712,8 @@ with pkgs;
     system-libvirt = libvirt;
   };
 
+  virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { };
+
   virtinst = callPackage ../applications/virtualization/virtinst {};
 
   virtualbox = callPackage ../applications/virtualization/virtualbox {

From c390cec12249442a4865857b2a10d7755de0740f Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 10 Mar 2017 00:02:49 -0500
Subject: [PATCH 2011/3449] buildbot NixOS modules: switch to not daemonize

1) The forking behavior of `buildbot start` is temporarily broken for
   mysterious reasons that I'm still looking into
2) Let systemd do the forking: no point in using two different process
   startup wait loops
---
 .../services/continuous-integration/buildbot/master.nix       | 4 ++--
 .../services/continuous-integration/buildbot/worker.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix
index 0ff6dbac39c7..533751734fa5 100644
--- a/nixos/modules/services/continuous-integration/buildbot/master.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/master.nix
@@ -217,11 +217,11 @@ in {
       path = cfg.packages;
 
       serviceConfig = {
-        Type = "forking";
+        Type = "simple";
         User = cfg.user;
         Group = cfg.group;
         WorkingDirectory = cfg.home;
-        ExecStart = "${cfg.package}/bin/buildbot start ${cfg.buildbotDir}";
+        ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";
       };
 
       preStart = ''
diff --git a/nixos/modules/services/continuous-integration/buildbot/worker.nix b/nixos/modules/services/continuous-integration/buildbot/worker.nix
index 00423bd33865..e4ee4dd861ef 100644
--- a/nixos/modules/services/continuous-integration/buildbot/worker.nix
+++ b/nixos/modules/services/continuous-integration/buildbot/worker.nix
@@ -111,11 +111,11 @@ in {
       '';
 
       serviceConfig = {
-        Type = "forking";
+        Type = "simple";
         User = cfg.user;
         Group = cfg.group;
         WorkingDirectory = cfg.home;
-        ExecStart = "${cfg.package}/bin/buildbot-worker start ${cfg.buildbotDir}";
+        ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}";
       };
 
     };

From 00f16e3d7c4239bcb4c0b55302e4956adf69d691 Mon Sep 17 00:00:00 2001
From: Sebastian Hagen <sh_c_git@memespace.net>
Date: Fri, 10 Mar 2017 05:14:14 +0000
Subject: [PATCH 2012/3449] hwdata: Use content-addressed source file; previous
 source tarball changed contents.

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

diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index dc3160af7aae..e4dd43de424b 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
   version = "0.291";
 
   src = fetchurl {
-    url = "https://git.fedorahosted.org/cgit/hwdata.git/snapshot/hwdata-${version}.tar.xz";
-    sha256 = "121qixrdhdncva1cnj7m7jlqvi1kbj85dpi844jiis3a8hgpzw5a";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/hwdata/hwdata-0.291.tar.bz2/effe59bf406eb03bb295bd34e0913dd8/hwdata-0.291.tar.bz2";
+    sha256 = "01cq9csryxcrilnqdjd2r8gpaap3mk4968v7y36c7shyyaf9zkym";
   };
 
   preConfigure = "patchShebangs ./configure";

From 1309b0883d51ed834af77c5cd98b8e010c7f8908 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 10 Mar 2017 01:08:01 -0500
Subject: [PATCH 2013/3449] buildbot-plugins: use callPackages, since it
 contains several

This should allow Hydra to build those plugins.
---
 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 6ff4a907eb02..9ce3089ebbd5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6209,7 +6209,7 @@ with pkgs;
   buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix {
     pythonPackages = python2Packages;
   };
-  buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix {
+  buildbot-plugins = callPackages ../development/tools/build-managers/buildbot/plugins.nix {
     pythonPackages = python2Packages;
   };
   buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]);

From b36ee3d387b7ec6b4bfe3bd7c130806c4b1bbfa8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 10 Mar 2017 14:03:00 +0800
Subject: [PATCH 2014/3449] dropbox: 20.4.19 -> 21.4.25

---
 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 628905a6b057..3721f7ed4af6 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 = "20.4.19";
+  version = "21.4.25";
   sha256 =
     {
-      "x86_64-linux" = "1970zrvk2pbs7fa7q4rqc8c1vvsvcris8ybnihazh5pqii91s16l";
-      "i686-linux"   = "1p3fdjrin5v9ifz6lba1pvb2pw3nmsiqq0jp56vgdk5jzmky23km";
+      "x86_64-linux" = "1pgab1ah6rl30rm4dj0biq5714pfzd5jjd2bp0nmhdqn1hm5vmhv";
+      "i686-linux"   = "05kn8qman8ghknb0chrlmcxrxg7w6l79frkaqj6blgnhanh13h4n";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 161d73c1639a3da02389137baa310883bd54221a Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Fri, 10 Mar 2017 07:12:16 +0000
Subject: [PATCH 2015/3449] ripgrep: install man-page

Modify the `ripgrep` package to install the tool's manual page.

I have tested this commit per nixpkgs manual section 11.1 ("Making
patches").
---
 pkgs/tools/text/ripgrep/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 7ba43e38f382..786bcaa5334f 100644
--- a/pkgs/tools/text/ripgrep/default.nix
+++ b/pkgs/tools/text/ripgrep/default.nix
@@ -15,6 +15,11 @@ buildRustPackage rec {
 
   depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
 
+  preFixup = ''
+    mkdir -p "$out/man/man1"
+    cp "$src/doc/rg.1" "$out/man/man1"
+  '';
+
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
     homepage = https://github.com/BurntSushi/ripgrep;

From c663f6aba91ad7a5ff778618a0d7a83f225e0955 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Tue, 7 Mar 2017 16:51:28 +0100
Subject: [PATCH 2016/3449] qt57: darwin compatibility

Port of the qt56 compatibility patch 7a9400d by @acowley
---
 .../libraries/qt-5/5.7/default.nix            |   4 +-
 .../qt-5/5.7/qtbase/cmake-paths-darwin.patch  | 384 ++++++++++++++++++
 .../libraries/qt-5/5.7/qtbase/default.nix     | 127 ++++--
 .../libraries/qt-5/5.7/qtbase/series          |   1 -
 4 files changed, 479 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch

diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index 85b38c6fc6ce..f468670674f0 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -107,12 +107,12 @@ let
       makeQtWrapper =
         makeSetupHook
         { deps = [ makeWrapper ]; }
-        ../make-qt-wrapper.sh;
+        (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.7/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
new file mode 100644
index 000000000000..2fda5ed8cf0c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
@@ -0,0 +1,384 @@
+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/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 934203950b09..63e65ff24890 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -4,6 +4,7 @@
 
   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,
@@ -15,7 +16,8 @@
   cups ? null, mysql ? null, postgresql ? null,
 
   # options
-  mesaSupported, mesa,
+  mesaSupported ? (!stdenv.isDarwin),
+  mesa,
   buildExamples ? false,
   buildTests ? false,
   developerBuild ? false,
@@ -35,6 +37,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.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
@@ -54,11 +57,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 +77,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 '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 = ''
@@ -103,7 +121,6 @@ stdenv.mkDerivation {
     ${lib.optionalString developerBuild "-developer-build"}
     -largefile
     -accessibility
-    -rpath
     -optimized-qmake
     -strip
     -no-reduce-relocations
@@ -117,15 +134,6 @@ stdenv.mkDerivation {
     -iconv
     -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
@@ -141,13 +149,8 @@ stdenv.mkDerivation {
     -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
@@ -158,7 +161,30 @@ stdenv.mkDerivation {
     -${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.
@@ -166,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 CoreServices AppKit Carbon OpenGL AGL Cocoa
+    DiskArbitration darwin.cf-private libiconv darwin.apple_sdk.sdk
+  ]);
 
-  buildInputs =
-    [ gtk3 libinput ]
+  buildInputs = [ ]
+    ++ lib.optional (!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
@@ -213,6 +251,11 @@ stdenv.mkDerivation {
     moveToOutput "share/doc" "$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.
   postFixup =
     ''
       # Don't retain build-time dependencies like gdb.
@@ -221,17 +264,33 @@ 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"
               done
           popd
       fi
+    '' + 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 = ../../qtbase-setup-hook.sh;
+  setupHook = if stdenv.isDarwin
+              then ../../qtbase-setup-hook-darwin.sh
+              else ../../qtbase-setup-hook.sh;
 
   enableParallelBuilding = true;
 
@@ -240,7 +299,7 @@ stdenv.mkDerivation {
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series
index 44e2d9040807..2196d8383752 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.7/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 f3a4f31554f655440181aa6085ed7fea5b4c24e4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 10 Mar 2017 09:48:54 +0100
Subject: [PATCH 2017/3449] libreoffice-still: apply the patch for ICU 58, see
 17126

---
 pkgs/applications/office/libreoffice/still.nix | 7 +++++++
 pkgs/top-level/all-packages.nix                | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 6897597e7ef8..b973a4192bba 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -72,6 +72,13 @@ in stdenv.mkDerivation rec {
   configureScript = "./autogen.sh";
   dontUseCmakeConfigure = true;
 
+  # ICU 58, included in 5.3.x
+  patches = [(fetchurl {
+    url = "https://gerrit.libreoffice.org/gitweb?p=core.git;a=patch;h=3e42714c76b1347babfdea0564009d8d82a83af4";
+    sha256 = "10bid0jdw1rpdsqwzzk3r4rp6bjs2cvi82h7anz2m1amfjdv86my";
+    name = "libreoffice-5.2.x-icu4c-58.patch";
+  })];
+
   postUnpack = ''
     mkdir -v $sourceRoot/src
   '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ce3089ebbd5..4e4362e0c804 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14268,9 +14268,7 @@ with pkgs;
     lcms = lcms2;
     harfbuzz = harfbuzz.override {
       withIcu = true; withGraphite2 = true;
-      icu = icu_57;
     };
-    icu = icu_57;
   });
 
 

From 2e16a8d9b37cee03f50efa058a0b0c56760d9352 Mon Sep 17 00:00:00 2001
From: Mikhail Volkhov <volhovm.cs@gmail.com>
Date: Fri, 10 Mar 2017 13:33:23 +0300
Subject: [PATCH 2018/3449] scudcloud: 1.40 -> 1.44

AFAIU qt5 version was updated so older scudcloud was no longer
working. This fixes the problem.
---
 .../networking/instant-messengers/scudcloud/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
index 9bed654b9b38..d9a3dfc690dd 100644
--- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
+++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchgit, python3Packages }:
 
 python3Packages.buildPythonPackage {
-  name = "scudcloud-1.40";
+  name = "scudcloud-1.44";
 
   # Branch 254-port-to-qt5
-  # https://github.com/raelgc/scudcloud/commit/43ddc87f123a641b1fa78ace0bab159b05d34b65
+  # https://github.com/raelgc/scudcloud/commit/65c304416dfdd5f456fa6f7301432a953d5e12d0
   src = fetchgit {
       url = https://github.com/raelgc/scudcloud/;
-      rev = "43ddc87f123a641b1fa78ace0bab159b05d34b65";
-      sha256 = "1lh9naf9xfrmj1pj7p8bd3fz7vy3gap6cvda4silk4b6ylyqa8vj";
+      rev = "65c304416dfdd5f456fa6f7301432a953d5e12d0";
+      sha256 = "0h1055y88kldqw31ayqfx9zsksgxsyqd8h0hwnhj80yn3jcx0rp6";
   };
 
   propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ];

From 330c7e4a5f409da8bb0bfaa48d8ef0ac352e6386 Mon Sep 17 00:00:00 2001
From: Wei-Ming Yang <rick68@users.noreply.github.com>
Date: Fri, 10 Mar 2017 18:39:16 +0800
Subject: [PATCH 2019/3449] fix the incorrect elasticsearch plugin name

elasticsearch_analisys_lemmagen -> elasticsearch_analysis_lemmagen
---
 pkgs/servers/search/elasticsearch/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 32b065364a6a..9cce987e58f4 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -36,7 +36,7 @@ in {
     };
   };
 
-  elasticsearch_analisys_lemmagen = esPlugin rec {
+  elasticsearch_analysis_lemmagen = esPlugin rec {
     name = "elasticsearch-analysis-lemmagen-${version}";
     pluginName = "elasticsearch-analysis-lemmagen";
     version = "0.1";

From 9041f0d8d964b0c348f72f10a6aef86155796b4f Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 10 Mar 2017 12:51:02 +0100
Subject: [PATCH 2020/3449] pythonPackages.django-raster: 0.3 -> 0.3.1

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

diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix
new file mode 100644
index 000000000000..e673d587e3e3
--- /dev/null
+++ b/pkgs/development/python-modules/django-raster/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl,
+  numpy, django_colorful, pillow, psycopg2,
+  pyparsing, django, celery
+}:
+buildPythonPackage rec {
+  name = "django-raster-${version}";
+  version = "0.3.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/django-raster/${name}.tar.gz";
+    sha256 = "1hsrkvybak1adn9d9qdw7hx3rcxsbzas4ixwll6vrjkrizgfihk3";
+  };
+
+  # Tests require a postgresql + postgis server
+  doCheck = false;
+
+  propagatedBuildInputs = [ numpy django_colorful pillow psycopg2
+                            pyparsing django celery ];
+
+  meta = with stdenv.lib; {
+    description = "Basic raster data integration for Django";
+    homepage = https://github.com/geodesign/django-raster;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 069a10cdba52..ad5e74a51747 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10632,24 +10632,7 @@ in {
 
   djangorestframework = callPackage ../development/python-modules/djangorestframework { };
 
-  django_raster = buildPythonPackage rec {
-    name = "django-raster-${version}";
-    version = "0.3";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-raster/${name}.tar.gz";
-      sha256 = "0vn11y07wag7yvjzrk7m99xs3cqyaaaklwcsik9zbvw0kwp2khni";
-    };
-
-    propagatedBuildInputs = with self ; [ numpy django_colorful pillow psycopg2
-                                          pyparsing django celery_3 ];
-
-    meta = {
-      description = "Basic raster data integration for Django";
-      homepage = https://github.com/geodesign/django-raster;
-      license = licenses.mit;
-    };
-  };
+  django-raster = callPackage ../development/python-modules/django-raster { };
 
   django_redis = buildPythonPackage rec {
     name = "django-redis-${version}";

From 1ca372e4d23934b857e6d8ca16ed8d5b253b7de8 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 10 Mar 2017 12:52:18 +0100
Subject: [PATCH 2021/3449] pythonPackages.celery_3: drop

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ad5e74a51747..912ce72dea7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3630,31 +3630,6 @@ in {
     };
   };
 
-  celery_3 = buildPythonPackage rec {
-    name = "celery-${version}";
-    version = "3.1.23";
-
-    disabled = (pythonOlder "2.6") || isPy35;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/celery/${name}.tar.gz";
-      sha256 = "0614ppp18vmiwdk0rxvz0wn62d7svanwdnx7jgqxpy9pb20rqd8s";
-    };
-
-    buildInputs = with self; [ mock nose unittest2 ];
-    propagatedBuildInputs = with self; [ kombu_3 billiard_33 pytz anyjson amqp_1 ];
-
-    checkPhase = ''
-      nosetests $out/${python.sitePackages}/celery/tests/
-    '';
-
-    meta = {
-      homepage = https://github.com/celery/celery/;
-      description = "Distributed task queue";
-      license = licenses.bsd3;
-    };
-  };
-
   celery = buildPythonPackage rec {
     name = "celery-${version}";
     version = "4.0.2";

From 1873721fcdcdd3a45294e873cef053878c10c20d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 10 Mar 2017 11:57:05 +0000
Subject: [PATCH 2022/3449] luaPackages.mpack: enable darwin platform

It was working fine but then regressed by
77f5a50c400d7e312e7491593dcc8ee8cab86c2c
---
 pkgs/top-level/lua-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index d2aaa63c667f..ea3a849c7ac5 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -459,7 +459,7 @@ let
     meta = {
       description = "Simple implementation of msgpack in C Lua 5.1";
       homepage = "https://github.com/tarruda/libmpack";
-      platforms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
       license = stdenv.lib.licenses.mit;
       # gcc -llua fails with luajit
       broken = (builtins.parseDrvName lua.name).name != "lua";

From 76836ee2c7e127d632018ff6a8a4c4d063806716 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Fri, 10 Mar 2017 04:10:42 -0800
Subject: [PATCH 2023/3449] obs-studio: 18.0.0 -> 18.0.1

also add patch to fix a segfault, submitted upstream to obs-studio
---
 .../applications/video/obs-studio/default.nix |  6 ++-
 .../obs-studio/segfault-patch-systray.patch   | 40 +++++++++++++++++++
 2 files changed, 44 insertions(+), 2 deletions(-)
 create 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 61630c9a15c7..a6238d9e808a 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -22,15 +22,17 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "18.0.0";
+  version = "18.0.1";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "0qjv1l69ca8l8jihpkz7yln7gr7168k8c7yxgd8y23dp1db9hdrm";
+    sha256 = "0mvjmkq5zlcppjqy18933w7r7rz1mpr2jpf8ipd0famdlgyacix6";
   };
 
+  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
new file mode 100644
index 000000000000..c66b07bb57ad
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/segfault-patch-systray.patch
@@ -0,0 +1,40 @@
+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 7dcc40b674e98ef9216262a969888ca9342728de Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 10 Mar 2017 16:13:49 +0300
Subject: [PATCH 2024/3449] networkmanagerapplet: add dconf and glib_networking

Fixes #23700.
---
 pkgs/tools/networking/network-manager-applet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index a212e4f053d3..cca111db67d5 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -18,7 +18,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
+    modemmanager jansson librsvg glib_networking gnome3.dconf
   ];
 
   nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

From 5a05f6f48316f04904eabc9fdb411b093d59dc1c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 19:21:23 -0600
Subject: [PATCH 2025/3449] phonon-backend-gstreamer: hardcode gstreamer plugin
 paths

---
 .../phonon/backends/gst-plugin-paths.patch    | 13 +++++++++
 .../libraries/phonon/backends/gstreamer.nix   | 27 +++++++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch

diff --git a/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch
new file mode 100644
index 000000000000..39c1b9c0d290
--- /dev/null
+++ b/pkgs/development/libraries/phonon/backends/gst-plugin-paths.patch
@@ -0,0 +1,13 @@
+Index: phonon-gstreamer-4.9.0/gstreamer/backend.cpp
+===================================================================
+--- phonon-gstreamer-4.9.0.orig/gstreamer/backend.cpp
++++ phonon-gstreamer-4.9.0/gstreamer/backend.cpp
+@@ -85,6 +85,8 @@ Backend::Backend(QObject *parent, const
+         "--gst-debug-no-color"
+     };
+ 
++    qputenv("GST_PLUGIN_PATH_1_0", GST_PLUGIN_PATH_1_0);
++
+     int argc = sizeof(args) / sizeof(*args);
+     char **argv = const_cast<char**>(args);
+     GError *err = 0;
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 56d40f818338..9fdcf65346cc 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -29,15 +29,32 @@ stdenv.mkDerivation rec {
     sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf";
   };
 
+  # Hardcode paths to useful plugins so the backend doesn't depend
+  # on system paths being set.
+  patches = [ ./gst-plugin-paths.patch ];
+
+  NIX_CFLAGS_COMPILE =
+    let gstPluginPaths =
+          lib.makeSearchPathOutput "lib" "/lib/gstreamer-1.0"
+          (with gst_all_1; [
+            gstreamer
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-bad
+            gst-libav
+          ]);
+    in [
+      # This flag should be picked up through pkgconfig, but it isn't.
+      "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
+
+      ''-DGST_PLUGIN_PATH_1_0="${gstPluginPaths}"''
+    ];
+
   buildInputs = with gst_all_1;
     [ gstreamer gst-plugins-base phonon ]
     ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);
 
-  NIX_CFLAGS_COMPILE = [
-    # This flag should be picked up through pkgconfig, but it isn't.
-    "-I${gst_all_1.gstreamer.dev}/lib/gstreamer-1.0/include"
-  ];
-
   nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
 
   cmakeFlags =

From edd43351cfa861a5e641a4c25666bbd3bc181f67 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 3 Mar 2017 19:21:55 -0600
Subject: [PATCH 2026/3449] nixos/plasma5: no need to set gstreamer plugin path

---
 .../modules/services/x11/desktop-managers/plasma5.nix  | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 15ffd330e72c..4afd8a58d643 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -181,16 +181,6 @@ in
       };
 
       environment.variables = {
-        GST_PLUGIN_SYSTEM_PATH_1_0 =
-          builtins.map (pkg: getLib pkg + "/lib/gstreamer-1.0")
-            (with pkgs.gst_all_1; [
-              gstreamer
-              gst-plugins-base
-              gst-plugins-good
-              gst-plugins-ugly
-              gst-plugins-bad
-              gst-libav # for mp3 playback
-            ]);
         # Enable GTK applications to load SVG icons
         GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
       };

From c7d9032b510facf0cc1d55240df86c163b4a2161 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 2 Mar 2017 22:03:16 -0500
Subject: [PATCH 2027/3449] brscan4: 0.4.3-4 -> 0.4.4-2

Also add missing linux32 support.
---
 .../sane/backends/brscan4/default.nix         | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index 063d0f13faf9..7037e944f3f9 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -10,11 +10,19 @@ let
   udevRules = callPackage ./udev_rules_type1.nix {};
 
 in stdenv.mkDerivation rec {
-  name = "brscan4-0.4.3-3";
-  src = fetchurl {
-    url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
-    sha256 = "1nccyjl0b195pn6ya4q0zijb075q8r31v9z9a0hfzipfyvcj57n2";
-  };
+  name = "brscan4-0.4.4-2";
+  src = 
+    if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "http://download.brother.com/welcome/dlf006646/${name}.i386.deb";
+        sha256 = "1rd6qmg49lvack8rg9kkqs3vxfvvqf2x45h93pkrhk8a4aj5c8ll";
+      }
+    else if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
+        sha256 = "1r3cq1k2a2bghibkckmk00x7y59ic31gv7jcsw7380szf1j3la59";
+      }
+    else throw "${name} is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)";
 
   unpackPhase = ''
     ar x $src
@@ -36,12 +44,12 @@ in stdenv.mkDerivation rec {
     done
   '';
 
-  installPhase = ''
+  installPhase = with stdenv.lib; ''
     PATH_TO_BRSCAN4="opt/brother/scanner/brscan4"
     mkdir -p $out/$PATH_TO_BRSCAN4
     cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4
     mkdir -p $out/lib/sane
-    cp -rp usr/lib64/sane/* $out/lib/sane
+    cp -rp usr/lib${optionalString stdenv.is64bit "64"}/sane/* $out/lib/sane
 
     # Symbolic links were absolute. Fix them so that they point to $out.
     pushd "$out/lib/sane" > /dev/null

From 943c4ed72ff85bb9a2610d8909ee68bb0f0d0744 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Fri, 10 Mar 2017 22:39:18 +0800
Subject: [PATCH 2028/3449] emem: 0.2.32 -> 0.2.34 (#23680)

---
 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 82c224e7db16..a30a58db4836 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.32";
+  version = "0.2.34";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1ril6ljbm7mczcfgbjnswcxpxpnp0kv949bhv1f6q42pxxj1wj75";
+    sha256 = "19dslv632qyz3hcycx22w6x96nwph7cxl1yjprir2w2c692dq06x";
   };
 
   buildInputs = [ ];

From acd8ede120462c2682795a4dab3d10ba0a4385d0 Mon Sep 17 00:00:00 2001
From: Gauthier POGAM--LE MONTAGNER <kendos.kenlen@gmail.com>
Date: Fri, 10 Mar 2017 15:53:04 +0100
Subject: [PATCH 2029/3449] atom: 1.14.4 -> 1.15.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 47a8eff3da8e..3eae877ff61a 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.14.4";
+  version = "1.15.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0b1dbhpphbsjkizii6l5cxr2pqk6bjix0amc2avk3p7ys710zazv";
+    sha256 = "0w790b9m94m28bx7n94pg2zjxrcjf13228lsb0pl8kyfsk2k2glx";
     name = "${name}.deb";
   };
 

From 66bc2135f6c374ffba8e351a51a2d836a8da5d62 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 10 Mar 2017 09:23:05 -0600
Subject: [PATCH 2030/3449] qtbase: don't patch non-existent .pc files on
 Darwin

---
 .../libraries/qt-5/5.6/qtbase/default.nix        | 16 +++++++++++++---
 .../libraries/qt-5/5.7/qtbase/default.nix        | 10 +++++++---
 .../libraries/qt-5/5.8/qtbase/default.nix        | 10 +++++++---
 3 files changed, 27 insertions(+), 9 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 b0e12ae99e48..7a80d63356a7 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -267,10 +267,20 @@ stdenv.mkDerivation {
               done
           popd
       fi
+    ''
 
-      # fixup .pc file (where to find 'moc' etc.)
-      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
-    '' + lib.optionalString stdenv.isDarwin ''
+    # fixup .pc file (where to find 'moc' etc.)
+    + lib.optionalString (!stdenv.isDarwin) ''
+      sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
+          "s|^host_bins=.*|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=()
 
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 7f0c71f64b25..8829b33acf61 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -228,10 +228,14 @@ stdenv.mkDerivation {
               done
           popd
       fi
-
-      # fixup .pc file (where to find 'moc' etc.)
-      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
     ''
+
+    # fixup .pc file (where to find 'moc' etc.)
+    + lib.optionalString (!stdenv.isDarwin) ''
+      sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
+          "s|^host_bins=.*|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
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 cafaaecaa507..e6d8b5ffeea6 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -225,10 +225,14 @@ stdenv.mkDerivation {
               done
           popd
       fi
-
-      # fixup .pc file (where to find 'moc' etc.)
-      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
     ''
+
+    # fixup .pc file (where to find 'moc' etc.)
+    + lib.optionalString (!stdenv.isDarwin) ''
+      sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
+          "s|^host_bins=.*|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

From b3fadc908511e1ab9a12adc2f8b3926e8ac39f82 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Fri, 10 Mar 2017 15:41:57 +0000
Subject: [PATCH 2031/3449] sops: init at version 2.0.8

---
 pkgs/tools/security/sops/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/security/sops/default.nix

diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix
new file mode 100644
index 000000000000..79753305c592
--- /dev/null
+++ b/pkgs/tools/security/sops/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "sops-${version}";
+  version = "2.0.8";
+
+  goPackagePath = "go.mozilla.org/sops";
+
+  src = fetchFromGitHub {
+    rev = version;
+    owner = "mozilla";
+    repo = "sops";
+    sha256 = "0kawnp24i3r981hz6apfwhgp71002vjq7ir54arq0zkssmykms1c";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files";
+    homepage = https://github.com/mozilla/sops;
+    license = licenses.mpl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e4362e0c804..df1622fc2912 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15228,6 +15228,8 @@ with pkgs;
 
   sooperlooper = callPackage ../applications/audio/sooperlooper { };
 
+  sops = callPackage ../tools/security/sops { };
+
   sorcer = callPackage ../applications/audio/sorcer { };
 
   sound-juicer = callPackage ../applications/audio/sound-juicer { };

From 17a8d19032b45126e6ec3814e98d25dbe37a18be Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Fri, 10 Mar 2017 09:57:51 -0600
Subject: [PATCH 2032/3449] dd-agent: fix Python missing dependencies and
 versions

---
 pkgs/tools/networking/dd-agent/default.nix | 34 +++++++++++++++++++---
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 0e12c50d1546..2cfef9a53a84 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,7 +1,31 @@
-{ stdenv, fetchFromGitHub, python, pythonPackages, sysstat, unzip, tornado
-, makeWrapper }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, pythonPackages
+, sysstat, unzip, tornado, makeWrapper }:
+let
+  docker_1_10 = buildPythonPackage rec {
+    name = "docker-${version}";
+    version = "1.10.6";
 
-stdenv.mkDerivation rec {
+    src = fetchFromGitHub {
+      owner = "docker";
+      repo = "docker-py";
+      rev = version;
+      sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [
+      six
+      requests2
+      websocket_client
+      ipaddress
+      backports_ssl_match_hostname
+      docker_pycreds
+    ];
+
+    # due to flake8
+    doCheck = false;
+  };
+
+in stdenv.mkDerivation rec {
   version = "5.5.2";
   name = "dd-agent-${version}";
 
@@ -23,7 +47,9 @@ stdenv.mkDerivation rec {
     pythonPackages.simplejson
     pythonPackages.pyyaml
     pythonPackages.pymongo
-    pythonPackages.docker
+    pythonPackages.python-etcd
+    pythonPackages.consul
+    docker_1_10
   ];
   propagatedBuildInputs = [ python tornado ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e4362e0c804..19f329e7a913 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13025,7 +13025,7 @@ with pkgs;
 
   dbvisualizer = callPackage ../applications/misc/dbvisualizer {};
 
-  dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
+  dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado buildPythonPackage; };
 
   deadbeef = callPackage ../applications/audio/deadbeef {
     pulseSupport = config.pulseaudio or true;

From 35f9f63a39f24f8b7e68451d5860a74260b4e5f8 Mon Sep 17 00:00:00 2001
From: Susan Potter <me@susanpotter.net>
Date: Fri, 10 Mar 2017 09:58:58 -0600
Subject: [PATCH 2033/3449] dd-agent: 5.5.2 -> 5.11.2

---
 pkgs/tools/networking/dd-agent/default.nix | 13 +++++++------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 2cfef9a53a84..ddef8a70012d 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, pythonPackages
-, sysstat, unzip, tornado, makeWrapper }:
+{ stdenv, fetchFromGitHub, pythonPackages
+, sysstat, unzip, makeWrapper }:
 let
-  docker_1_10 = buildPythonPackage rec {
+  inherit (pythonPackages) python;
+  docker_1_10 = pythonPackages.buildPythonPackage rec {
     name = "docker-${version}";
     version = "1.10.6";
 
@@ -26,14 +27,14 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  version = "5.5.2";
+  version = "5.11.2";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
     owner  = "datadog";
     repo   = "dd-agent";
     rev    = version;
-    sha256 = "0ga7h3rdg6q2pi4dxxkird5nf6s6hc13mj1xd9awwpli48gyvxn7";
+    sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
   };
 
   buildInputs = [
@@ -51,7 +52,7 @@ in stdenv.mkDerivation rec {
     pythonPackages.consul
     docker_1_10
   ];
-  propagatedBuildInputs = [ python tornado ];
+  propagatedBuildInputs = with pythonPackages; [ python tornado ];
 
   buildCommand = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19f329e7a913..e44665766d62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13025,7 +13025,7 @@ with pkgs;
 
   dbvisualizer = callPackage ../applications/misc/dbvisualizer {};
 
-  dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado buildPythonPackage; };
+  dd-agent = callPackage ../tools/networking/dd-agent { };
 
   deadbeef = callPackage ../applications/audio/deadbeef {
     pulseSupport = config.pulseaudio or true;

From 7baad2e4beeea1a14ffb6e54387ca1c4cbfcb10c Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 9 Mar 2017 17:00:30 -0500
Subject: [PATCH 2034/3449] c3d: init at 1.1.0

---
 pkgs/applications/graphics/c3d/default.nix | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/graphics/c3d/default.nix

diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix
new file mode 100644
index 000000000000..a254993a016b
--- /dev/null
+++ b/pkgs/applications/graphics/c3d/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, cmake, itk }:
+
+stdenv.mkDerivation rec {
+  _name   = "c3d";
+  _version = "1.1.0";
+  name     = "${_name}-${_version}";
+
+  src = fetchgit {
+    url = "https://git.code.sf.net/p/c3d/git";
+    rev = "3453f6133f0df831dcbb0d0cfbd8b26e121eb153";
+    sha256 = "1xgbk20w22jwvf7pa0n4lcbyx35fq56zzlslj0nvcclh6vx0b4z8";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ itk ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.itksnap.org/c3d;
+    description = "Medical imaging processing tool";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 170fa60c27b2..986096dec653 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -697,6 +697,8 @@ with pkgs;
 
   burpsuite = callPackage ../tools/networking/burpsuite {};
 
+  c3d = callPackage ../applications/graphics/c3d {};
+
   cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: {
     isLibrary = false;
     enableSharedExecutables = false;

From c863aa384e1a6237380afffd0feaf28b48983a23 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Mar 2017 19:39:40 +0200
Subject: [PATCH 2035/3449] cdparanoia: Fix aarch64 build

Hooray for autohelltools actually reducing portability!
---
 pkgs/applications/audio/cdparanoia/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index ac5db3d1f636..34dba5e206fa 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, IOKit, Carbon }:
+{ stdenv, fetchurl, autoreconfHook, gnu-config, IOKit, Carbon }:
 
 stdenv.mkDerivation rec {
   name = "cdparanoia-III-10.2";
@@ -8,10 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
   };
 
-  hardeningDisable = [ "format" ];
-
-  preConfigure = "unset CC";
-
   patches = stdenv.lib.optionals stdenv.isDarwin [
     (fetchurl {
       url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
@@ -23,11 +19,20 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;
+
   propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [
     Carbon
     IOKit
   ];
 
+  hardeningDisable = [ "format" ];
+
+  preConfigure = "unset CC" + stdenv.lib.optionalString stdenv.isAarch64 ''\n
+    cp ${gnu-config}/config.sub configure.sub
+    cp ${gnu-config}/config.guess configure.guess
+  '';
+
   meta = {
     homepage = http://xiph.org/paranoia;
     description = "A tool and library for reading digital audio from CDs";

From c6da2c7c2bec396fe5557d08d595a2f75fea98fc Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 14:59:59 +0100
Subject: [PATCH 2036/3449] nixos/dnscrypt-proxy: use example.com in example
 values

It is the canonical example domain after all.
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 8e9747b29667..824995099639 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -121,7 +121,7 @@ in
           name = mkOption {
             type = types.str;
             description = "Fully qualified domain name";
-            example = "2.dnscrypt-cert.opendns.com";
+            example = "2.dnscrypt-cert.example.com";
           };
 
           key = mkOption {

From 563c8e14965e15833c465330dfba1d94854285cf Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Mar 2017 17:54:29 +0100
Subject: [PATCH 2037/3449] nixos/dnscrypt-proxy: inline top-level binding
 (cleanup)

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 824995099639..8520cc5e9ebc 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -3,8 +3,9 @@ with lib;
 
 let
   apparmorEnabled = config.security.apparmor.enable;
-  dnscrypt-proxy = pkgs.dnscrypt-proxy;
+
   cfg = config.services.dnscrypt-proxy;
+
   stateDirectory = "/var/lib/dnscrypt-proxy";
 
   localAddress = "${cfg.localAddress}:${toString cfg.localPort}";
@@ -195,7 +196,7 @@ in
 
       serviceConfig = {
         NonBlocking = "true";
-        ExecStart = "${dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
+        ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
 
         User = "dnscrypt-proxy";
 
@@ -208,7 +209,7 @@ in
 
     (mkIf apparmorEnabled {
     security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
-      ${dnscrypt-proxy}/bin/dnscrypt-proxy {
+      ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy {
         /dev/null rw,
         /dev/urandom r,
 

From c0a8a9205b590828c2a174f751c80908e632f734 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Mar 2017 17:55:45 +0100
Subject: [PATCH 2038/3449] nixos/dnscrypt-proxy: inline option renamings

In an effort to make the module more self-contained.
---
 nixos/modules/rename.nix                             | 3 ---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0b609287f63a..af8b34b5e5cb 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -103,9 +103,6 @@ with lib;
     (mkRenamedOptionModule [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
     (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ])
 
-    # DNSCrypt-proxy
-    (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])
-
     (mkRenamedOptionModule [ "services" "hostapd" "extraCfg" ] [ "services" "hostapd" "extraConfig" ])
 
     # Enlightenment
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 8520cc5e9ebc..d65296f422ee 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -307,4 +307,8 @@ in
     };
     })
     ]);
+
+  imports = [
+    (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])
+  ];
 }

From 5279ec111fef20a04155537ec19d8f5b36a4d50e Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Mar 2017 20:32:03 +0100
Subject: [PATCH 2039/3449] nixos/dnscrypt-proxy docs: reword section on
 forwarding

Newer versions of DNSCrypt proxy *can* cache lookups (via
plugin); make the wording more neutral wrt. why one might want
to run the proxy in a forwarding setup.
---
 nixos/modules/services/networking/dnscrypt-proxy.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml
index 982961833ad2..555c6df4d551 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixos/modules/services/networking/dnscrypt-proxy.xml
@@ -31,15 +31,12 @@
 
   </sect1>
 
-  <sect1><title>As a forwarder for a caching DNS client</title>
+  <sect1><title>As a forwarder for another DNS client</title>
 
   <para>
-    By default, DNSCrypt proxy acts as a transparent proxy for the
-    system stub resolver. Because the client does not cache lookups, this
-    setup can significantly slow down e.g., web browsing. The recommended
-    configuration is to run DNSCrypt proxy as a forwarder for a caching DNS
-    client. To achieve this, change the default proxy listening port to
-    a non-standard value and point the caching client to it:
+    To run the DNSCrypt proxy client as a forwarder for another
+    DNS client, change the default proxy listening port to a
+    non-standard value and point the other client to it:
     <programlisting>
       services.dnscrypt-proxy.localPort = 43;
     </programlisting>
@@ -60,7 +57,6 @@
   <para>
     <programlisting>
       {
-        networking.nameservers = [ "127.0.0.1" ];
         services.unbound.enable = true;
         services.unbound.forwardAddresses = [ "127.0.0.1@43" ];
       }

From bb6361b81a1177a829fdcfb54e008840a87a17e6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 15:08:59 +0100
Subject: [PATCH 2040/3449] nixos/dnscrypt-proxy: grant daemon access to load
 plugins

---
 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 d65296f422ee..beddaa076122 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -225,6 +225,8 @@ in
         network inet dgram,
         network inet6 dgram,
 
+        ${getLib pkgs.dnscrypt-proxy}/lib/dnscrypt-proxy/libdcplugin*.so mr,
+
         ${getLib pkgs.gcc.cc}/lib/libssp.so.* mr,
         ${getLib pkgs.libsodium}/lib/libsodium.so.* mr,
         ${getLib pkgs.systemd}/lib/libsystemd.so.* mr,

From 2b450377bf6e51cce0d831a88e74d5f61811b74d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 10 Mar 2017 20:06:03 +0200
Subject: [PATCH 2041/3449] boost155: Not supported on aarch64

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

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 6adcce45d808..174e9fe47769 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -126,7 +126,7 @@ stdenv.mkDerivation {
     description = "Collection of C++ libraries";
     license = stdenv.lib.licenses.boost;
 
-    platforms = platforms.unix;
+    platforms = (if versionOlder version "1.59" then remove "aarch64-linux" else id) platforms.unix;
     maintainers = with maintainers; [ peti wkennington ];
   };
 

From 7dff6a8689351069ba3734aad2c90e19b3b835b0 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 10 Mar 2017 13:31:05 -0500
Subject: [PATCH 2042/3449] kubernetes: fix on Darwin

Also bump its Go version to 1.7, since 1.6 is fatally flawed on macOS 10.12
---
 pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 0040d0ca8238..952fd8fe9b6e 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   postBuild = ''
     ./hack/generate-docs.sh
-    (cd build/pause && gcc pause.c -o pause)
+    (cd build/pause && cc pause.c -o pause)
   '';
 
   installPhase = ''
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     homepage = http://kubernetes.io;
     maintainers = with maintainers; [offline];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e44665766d62..8044b1a39966 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14188,7 +14188,7 @@ with pkgs;
   ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { };
 
   kubernetes = callPackage ../applications/networking/cluster/kubernetes {
-    go = go_1_6;
+    go = go_1_7;
   };
 
   lame = callPackage ../development/libraries/lame { };

From 69ce1ed5262be7427e46759b24f00381b73ba1fc Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Mar 2017 14:28:10 +0100
Subject: [PATCH 2043/3449] surf-webkit2: init at 2017-03-06

---
 .../networking/browsers/surf/webkit2.nix      | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/surf/webkit2.nix

diff --git a/pkgs/applications/networking/browsers/surf/webkit2.nix b/pkgs/applications/networking/browsers/surf/webkit2.nix
new file mode 100644
index 000000000000..4a7b3d44e797
--- /dev/null
+++ b/pkgs/applications/networking/browsers/surf/webkit2.nix
@@ -0,0 +1,42 @@
+{ 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 = "37e43501d80710533f3ec0bd61ee84916c8524a4";
+  sha256 = "1q388rzm4irpaam4z8xycbyh5dgkjlar5jn1iw7zfls1pbpzr5br";
+  date = "2017-03-06";
+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/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8044b1a39966..8353b9260986 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15425,6 +15425,8 @@ with pkgs;
     webkit = webkitgtk2;
   };
 
+  surf-webkit2 = callPackage ../applications/networking/browsers/surf/webkit2.nix { };
+
   swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
 
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };

From ba499aa845fc907844b84e90a630aaaf5149cead Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 20:27:11 +0100
Subject: [PATCH 2044/3449] pythonPackages.pep257: meta.lecense -> license

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

diff --git a/pkgs/development/python-modules/pep257.nix b/pkgs/development/python-modules/pep257.nix
index f185019b0f7a..1cd0e4afc0ce 100644
--- a/pkgs/development/python-modules/pep257.nix
+++ b/pkgs/development/python-modules/pep257.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
     homepage = https://github.com/GreenSteam/pep257/;
     description = "Python docstring style checker";
     longDescription = "Static analysis tool for checking compliance with Python PEP 257.";
-    lecense = licenses.mit;
+    license = licenses.mit;
   };
 }

From 5bf3b4c7ff2531f2cf6c2a53d9caa0d6746e1c48 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 20:37:08 +0100
Subject: [PATCH 2045/3449] vndr: meta.licence -> license

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

diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix
index 7cc77bd1bb39..14f01863c8a4 100644
--- a/pkgs/development/tools/vndr/default.nix
+++ b/pkgs/development/tools/vndr/default.nix
@@ -18,6 +18,6 @@ buildGoPackage rec {
     description = "Stupid golang vendoring tool, inspired by docker vendor script";
     homepage = "https://github.com/LK4D4/vndr";
     maintainers = with lib.maintainers; [ vdemeester ];
-    licence = lib.licenses.asl20;
+    license = lib.licenses.asl20;
   };
 }

From fb4c43dd8adbd7a10d1c52539b36e2da269f3f7f Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Fri, 10 Mar 2017 14:54:02 -0500
Subject: [PATCH 2046/3449] curl: Use CA bundle in nix default profile by
 default

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index e9b438a6037b..bb9316512ecd 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -57,7 +57,9 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-      "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
+      # 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"
       "--disable-manual"
       ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" )
       ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" )

From 1b1d85bf752d90ec8116c1125262e5f788c77704 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 10 Mar 2017 08:30:40 +0100
Subject: [PATCH 2047/3449] scalafmt: 0.5.8 -> 0.6.2

---
 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 c7d26fc79ddb..59a16bfc27cb 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.5.8";
+  version = "0.6.2";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "0pwmmn5k5wscmpidxpc88yrgm7gkpk9ssdh97lz0fjqln99gwp8r";
+    sha256 = "0xafl7vmncdycapi9shxqf73nhb24llgxjd2x98irmr9bvzg844q";
   };
 
   unpackPhase = "tar xvzf $src";

From b34b4674d2c810ebc339cdd299544685692ebedb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 10 Mar 2017 20:13:56 +0000
Subject: [PATCH 2048/3449] jbuilder: init at 1.0+beta2

jbuilder is a fast, portable and opinionated build system

Homepage: https://github.com/janestreet/jbuilder
---
 .../tools/ocaml/jbuilder/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/jbuilder/default.nix

diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
new file mode 100644
index 000000000000..9d6485841fae
--- /dev/null
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchzip, ocaml, opam }:
+
+stdenv.mkDerivation {
+  name = "jbuilder-1.0+beta2";
+  src = fetchzip {
+    url = http://github.com/janestreet/jbuilder/archive/1.0+beta2.tar.gz;
+    sha256 = "0xbq6p0n4a740l3jvq4a0a58mwfcal0q37vi8ix053f3jiqki6ng";
+  };
+
+  buildInputs = [ ocaml ];
+
+  installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+
+  preFixup = "rm -rf $out/jbuilder";
+
+  meta = {
+    homepage = https://github.com/janestreet/jbuilder;
+    description = "Fast, portable and opinionated build system";
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8044b1a39966..1de35f861f8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -938,6 +938,10 @@ with pkgs;
 
   interlock = callPackage ../servers/interlock {};
 
+  jbuilder = callPackage ../development/tools/ocaml/jbuilder {
+    inherit (ocaml-ng.ocamlPackages_4_03) ocaml;
+  };
+
   kapacitor = callPackage ../servers/monitoring/kapacitor { };
 
   languagetool = callPackage ../tools/text/languagetool {  };

From 65b8a97ab341d18bfeb1026c3e19cf69ca20a140 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 7 Mar 2017 14:47:59 -0600
Subject: [PATCH 2049/3449] litecoin: 0.10.2.2 -> 0.13.2.1

---
 pkgs/applications/altcoins/litecoin.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index 38e671e89940..9b19d2f29969 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -1,28 +1,31 @@
-{ stdenv, fetchurl
+{ stdenv, fetchFromGitHub
 , pkgconfig, autoreconfHook
 , openssl, db48, boost, zlib, miniupnpc
 , glib, protobuf, utillinux, qt4, qrencode
-, withGui }:
+, withGui, libevent }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.10.2.2";
+  version = "0.13.2.1";
 
-  src = fetchurl {
-    url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz";
-    sha256 = "1p1h2654b7f2lyrmihcjmpmx6sjpkgsifcm2ixxb2g9jh6qq8b4m";
+  src = fetchFromGitHub {
+    owner = "litecoin-project";
+    repo = "litecoin";
+    rev = "v${version}";
+    sha256 = "0hml1crml6rx7im8dfbig3znmvnk2di61ybbhrhpad5mj0yrih30";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook openssl
-                  openssl db48 boost zlib miniupnpc glib protobuf utillinux ]
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
+                  miniupnpc glib protobuf utillinux libevent ]
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A lite version of Bitcoin using scrypt as a proof-of-work algorithm";
     longDescription= ''
       Litecoin is a peer-to-peer Internet currency that enables instant payments

From f3bf3a4318295f92a62b7aaf739ec6e9bb5a5517 Mon Sep 17 00:00:00 2001
From: sternenseemann <git@lukasepple.de>
Date: Fri, 10 Mar 2017 21:50:05 +0100
Subject: [PATCH 2050/3449] redo-sh: init at 1.2.6

---
 .../tools/build-managers/redo-sh/default.nix  | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/redo-sh/default.nix

diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix
new file mode 100644
index 000000000000..95a49dc167aa
--- /dev/null
+++ b/pkgs/development/tools/build-managers/redo-sh/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.6";
+  name = "redo-sh-${version}";
+
+  src = fetchurl {
+    url = "http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz";
+    sha256 = "1cwrk4v22rb9410rzyb4py4ncg01n6850l80s74bk3sflbw974wp";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  sourceRoot = ".";
+  installPhase = ''
+    mkdir -p "$out/share"
+    mv man "$out/share"
+    mv bin "$out"
+    for p in $out/bin/*; do
+      wrapProgram "$p" --set PATH '$PATH:'"$out/bin"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Redo implementation in Bourne Shell";
+    homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html";
+    license  = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ sternenseemann ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 197b2970b463..f69652bcf11c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6657,6 +6657,8 @@ with pkgs;
 
   redo = callPackage ../development/tools/build-managers/redo { };
 
+  redo-sh = callPackage ../development/tools/build-managers/redo-sh { };
+
   reno = callPackage ../development/tools/reno { };
 
   re2c = callPackage ../development/tools/parsing/re2c { };

From ccba00655a159e18346452c4482537dc6cad0988 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 15:56:35 -0600
Subject: [PATCH 2051/3449] libhttpseverywhere: 0.2.3 -> 0.2.10

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index cf38f117bb8c..1e60a63fe06b 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   major = "0.2";
-  minor = "3";
+  minor = "10";
   version = "${major}.${minor}";
 
   name = "libhttpseverywhere-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "0ndk6yyfcd7iwwkv4rkivhd08k0x8v03gnp9dk1ms4bxb1l2i8l1";
+    sha256 = "235f5b7f96188d800470871774e31696fbde085b63f65bd71434af8e9e6ac8aa";
   };
 
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];
@@ -23,8 +23,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     ninja
-    ninja devhelp
-  '';
+   '';
 
   installPhase = "ninja install";
 

From 2151e3b8ebfeee97655704e140ecb7a5dee8ec9c Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Thu, 9 Mar 2017 14:54:04 -0800
Subject: [PATCH 2052/3449] packetdrill: init at 1.0

Closes https://github.com/NixOS/nixpkgs/pull/23679
---
 lib/maintainers.nix                           |  1 +
 pkgs/tools/networking/packetdrill/default.nix | 25 +++++++++++++++++++
 pkgs/tools/networking/packetdrill/nix.patch   | 24 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/networking/packetdrill/default.nix
 create mode 100644 pkgs/tools/networking/packetdrill/nix.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9b682da3e343..dd257a495023 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -133,6 +133,7 @@
   dgonyeo = "Derek Gonyeo <derek@gonyeo.com>";
   dipinhora = "Dipin Hora <dipinhora+github@gmail.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
+  dmjio = "David Johnson <djohnson.m@gmail.com>";
   dochang = "Desmond O. Chang <dochang@gmail.com>";
   domenkozar = "Domen Kozar <domen@dev.si>";
   doublec = "Chris Double <chris.double@double.co.nz>";
diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix
new file mode 100644
index 000000000000..f7690e447461
--- /dev/null
+++ b/pkgs/tools/networking/packetdrill/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, bison, flex }:
+stdenv.mkDerivation rec {
+  version = "1.0";
+  name = "packetdrill-${version}";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "packetdrill";
+    rev = "58a7865c47e3a71e92ca0e4cc478c320e1c35f82";
+    sha256 = "09sqiakmn63idfjhy2ddf1456sfhi8yhsbp8lxvc1yfjikjxwwbc";
+  };
+  setSourceRoot = ''
+    export sourceRoot=$(realpath */gtests/net/packetdrill)
+  '';
+  hardeningDisable = [ "all" ];
+  buildInputs = [ bison flex ];
+  patches = [ ./nix.patch ];
+  enableParallelBuilding = true;
+  meta = {
+    description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks";
+    homepage = https://github.com/google/packetdrill;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ];
+  };
+}
diff --git a/pkgs/tools/networking/packetdrill/nix.patch b/pkgs/tools/networking/packetdrill/nix.patch
new file mode 100644
index 000000000000..6bad14421b98
--- /dev/null
+++ b/pkgs/tools/networking/packetdrill/nix.patch
@@ -0,0 +1,24 @@
+diff --git a/gtests/net/packetdrill/Makefile.common b/gtests/net/packetdrill/Makefile.common
+index 0ec741f..bf1cbb1 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -33,7 +33,7 @@ packetdrill-lib := \
+ packetdrill-objs := packetdrill.o $(packetdrill-lib)
+ 
+ packetdrill: $(packetdrill-objs)
+-	$(CC) -o packetdrill -g -static $(packetdrill-objs) $(packetdrill-ext-libs)
++	$(CC) -o packetdrill -g $(packetdrill-objs) $(packetdrill-ext-libs)
+ 
+ test-bins := checksum_test packet_parser_test packet_to_string_test
+ tests: $(test-bins)
+@@ -43,6 +43,10 @@ tests: $(test-bins)
+ 
+ binaries: packetdrill $(test-bins)
+ 
++install: packetdrill $(test-bins)
++	mkdir -p ${out}/bin
++	cp -vi $^ ${out}/bin
++
+ checksum_test-objs := $(packetdrill-lib) checksum_test.o
+ checksum_test: $(checksum_test-objs)
+ 	$(CC) -o checksum_test $(checksum_test-objs) $(packetdrill-ext-libs)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1de35f861f8c..8fba9b8ef6bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3289,6 +3289,8 @@ with pkgs;
     nix = nixUnstable;
   };
 
+  packetdrill = callPackage ../tools/networking/packetdrill { };
+
   pakcs = callPackage ../development/compilers/pakcs {};
 
   pal = callPackage ../tools/misc/pal { };

From 8db26dbee4f5cc6bf8f91e8a2897df1c22679125 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 23:21:16 +0100
Subject: [PATCH 2053/3449] packetdrill: minor packaging tweaks

- native build inputs
- allow building with hardening
---
 pkgs/tools/networking/packetdrill/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix
index f7690e447461..75007b5ed681 100644
--- a/pkgs/tools/networking/packetdrill/default.nix
+++ b/pkgs/tools/networking/packetdrill/default.nix
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
   setSourceRoot = ''
     export sourceRoot=$(realpath */gtests/net/packetdrill)
   '';
-  hardeningDisable = [ "all" ];
-  buildInputs = [ bison flex ];
+  NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
+  nativeBuildInputs = [ bison flex ];
   patches = [ ./nix.patch ];
   enableParallelBuilding = true;
   meta = {

From 6e73c301355786557211ac2ac0d295edee8ec924 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 16:48:29 -0600
Subject: [PATCH 2054/3449] coinmp: 1.7.6 -> 1.8.3

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

diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix
index 079c0a5cf6f7..ea72bfb434b8 100644
--- a/pkgs/development/libraries/CoinMP/default.nix
+++ b/pkgs/development/libraries/CoinMP/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "CoinMP-${version}";
-  version = "1.7.6";
+  version = "1.8.3";
 
   src = fetchurl {
     url = "http://www.coin-or.org/download/source/CoinMP/${name}.tgz";
-    sha256 = "0gqi2vqkg35gazzzv8asnhihchnbjcd6bzjfzqhmj7wy1dw9iiw6";
+    sha256 = "1xr2iwbbhm6l9hwiry5c10pz46xfih8bvzrzwp0nkzf76vdnb9m1";
   };
 
   hardeningDisable = [ "format" ];

From b52af49d36867fa4e51f2a35a745e0b47a0f21a6 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 11 Mar 2017 00:09:22 +0100
Subject: [PATCH 2055/3449] virtualisation-xen: fix defaultText interpolation

---
 nixos/modules/virtualisation/xen-dom0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index a80b2e1f3b04..57487f704519 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -40,7 +40,7 @@ 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";
+      defaultText = "\${pkgs.xen}/lib/xen/bin/qemu-system-i386";
       example = literalExample "''${pkgs.qemu_xen-light}/bin/qemu-system-i386";
       description = ''
         The qemu binary to use for Dom-0 backend.

From 0a72e457cca89e0e5d62b069c09bb426941e18ef Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 17:16:01 -0600
Subject: [PATCH 2056/3449] cgal: 4.7 -> 4.9

---
 pkgs/development/libraries/CGAL/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index b8fd4af812ab..dc3909f66490 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchurl, cmake, boost, gmp, mpfr, mesa_glu }:
+{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, mesa_glu }:
 
 stdenv.mkDerivation rec {
-  version = "4.7";
+  version = "4.9";
   name = "cgal-" + version;
 
-  src = fetchurl {
-    url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz";
-    sha256 = "1hbp4qpfqvpggvv79yxr6z3w7y0nwd31zavb1s57y55yl9z3zfxy";
+  src = fetchFromGitHub {
+    owner = "CGAL";
+    repo = "releases";
+    rev = "CGAL-${version}";
+    sha256 = "044amgml1x5h17rpkck2azmxrmjvlzzykv71cjh5hlajsi88cid5";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
   #   there are also libCGAL_Qt{3,4} omitted ATM
-  buildInputs = [ cmake boost gmp mpfr ];
-  #propagatedBuildInputs = [ mesa_glu ];
+  buildInputs = [ boost gmp mpfr ];
+  nativeBuildInputs = [ cmake ];
 
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = http://cgal.org;
-    license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+
+    license = with licenses; [ gpl3Plus lglp3Plus];
     platforms = platforms.all;
     maintainers = [ maintainers.raskin ];
   };

From 77c49794cd773d8a20f61b28d430c9673d5452fe Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Mar 2017 01:19:34 +0200
Subject: [PATCH 2057/3449] linux_testing: 4.10-rc7 -> 4.11-rc1

Some config options got removed, so conditionalize them.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 7 +++++--
 pkgs/os-specific/linux/kernel/linux-testing.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                 | 1 -
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 8acf67d3dd15..b66ad655b648 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -32,17 +32,20 @@ with stdenv.lib;
   # Debugging.
   DEBUG_KERNEL y
   DYNAMIC_DEBUG y
-  TIMER_STATS y
   BACKTRACE_SELF_TEST n
   CPU_NOTIFIER_ERROR_INJECT? n
   DEBUG_DEVRES n
-  DEBUG_NX_TEST n
   DEBUG_STACK_USAGE n
   DEBUG_STACKOVERFLOW n
   RCU_TORTURE_TEST n
   SCHEDSTATS n
   DETECT_HUNG_TASK y
 
+  ${optionalString (versionOlder version "4.11") ''
+    TIMER_STATS y
+    DEBUG_NX_TEST n
+  ''}
+
   # Bump the maximum number of CPUs to support systems like EC2 x1.*
   # instances and Xeon Phi.
   ${optionalString (stdenv.system == "x86_64-linux" || stdenv.system == "aarch64-linux") ''
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index e3a4206f1ca7..124486606637 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.10-rc7";
-  modDirVersion = "4.10.0-rc7";
-  extraMeta.branch = "4.10";
+  version = "4.11-rc1";
+  modDirVersion = "4.11.0-rc1";
+  extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "01jq4bxb8jcnawhsklc9aa2ba9sg7k5g97jp0slpbi8xw71dripl";
+    sha256 = "19zcyjqiw255d48k1mk33i1wgbiwv58nn3dw9i9079hfb843s28l";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fba9b8ef6bd..fa03b80c3f74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11483,7 +11483,6 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-      kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
     ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
       kernelPatches.mips_fpureg_emu
       kernelPatches.mips_fpu_sigill

From a2eae3bc4433e8d3f3c3690532bf99fdfbd8b3a1 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 11 Mar 2017 00:26:52 +0100
Subject: [PATCH 2058/3449] Revert "Merge pull request #23602 from
 periklis/topic_qt57_darwin"

This reverts commit 4c0737eb80af8a1e0c0bab4c51454807837dfdde, reversing
changes made to 943c4ed72ff85bb9a2610d8909ee68bb0f0d0744.
---
 .../libraries/qt-5/5.7/default.nix            |   4 +-
 .../qt-5/5.7/qtbase/cmake-paths-darwin.patch  | 384 ------------------
 .../libraries/qt-5/5.7/qtbase/default.nix     | 127 ++----
 .../libraries/qt-5/5.7/qtbase/series          |   1 +
 4 files changed, 37 insertions(+), 479 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch

diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index f468670674f0..85b38c6fc6ce 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -107,12 +107,12 @@ let
       makeQtWrapper =
         makeSetupHook
         { deps = [ makeWrapper ]; }
-        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
+        ../make-qt-wrapper.sh;
 
       qmakeHook =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
-        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
+        ../qmake-hook.sh;
 
     };
 
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 2fda5ed8cf0c..000000000000
--- 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/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 63e65ff24890..934203950b09 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -4,7 +4,6 @@
 
   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,
@@ -16,8 +15,7 @@
   cups ? null, mysql ? null, postgresql ? null,
 
   # options
-  mesaSupported ? (!stdenv.isDarwin),
-  mesa,
+  mesaSupported, mesa,
   buildExamples ? false,
   buildTests ? false,
   developerBuild ? false,
@@ -37,7 +35,6 @@ 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.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
@@ -57,12 +54,12 @@ stdenv.mkDerivation {
       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/network/ssl/qsslsocket_openssl_symbols.cpp \
+        --replace "@openssl@" "${openssl.out}"
+
       substituteInPlace src/dbus/qdbus_symbols.cpp \
         --replace "@dbus_libs@" "${dbus.lib}"
 
@@ -77,23 +74,8 @@ 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 '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 = ''
@@ -121,6 +103,7 @@ stdenv.mkDerivation {
     ${lib.optionalString developerBuild "-developer-build"}
     -largefile
     -accessibility
+    -rpath
     -optimized-qmake
     -strip
     -no-reduce-relocations
@@ -134,6 +117,15 @@ stdenv.mkDerivation {
     -iconv
     -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
@@ -149,8 +141,13 @@ stdenv.mkDerivation {
     -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
@@ -161,30 +158,7 @@ stdenv.mkDerivation {
     -${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.
@@ -192,44 +166,32 @@ stdenv.mkDerivation {
   PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
-    libxml2 libxslt openssl pcre16 sqlite zlib
-
-    # Text rendering
-    harfbuzz icu
+    dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib
 
     # Image formats
     libjpeg libpng libtiff
-  ]
-  ++ lib.optional mesaSupported mesa
-  ++ lib.optionals (!stdenv.isDarwin) [
-    dbus glib udev
 
     # Text rendering
-    fontconfig freetype
+    fontconfig freetype harfbuzz icu
 
     # 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
-  ]);
+  ]
+  ++ lib.optional mesaSupported mesa;
 
-  buildInputs = [ ]
-    ++ lib.optional (!stdenv.isDarwin) [ gtk3 libinput]
+  buildInputs =
+    [ 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;
+  nativeBuildInputs =
+    [ bison flex gperf lndir patchelf perl pkgconfig python2 ];
 
   # 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";
 
   postInstall = ''
     find "$out" -name "*.cmake" | while read file; do
@@ -251,11 +213,6 @@ stdenv.mkDerivation {
     moveToOutput "share/doc" "$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.
   postFixup =
     ''
       # Don't retain build-time dependencies like gdb.
@@ -264,33 +221,17 @@ stdenv.mkDerivation {
       # 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'"} | \
+          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
-    '' + 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;
+  setupHook = ../../qtbase-setup-hook.sh;
 
   enableParallelBuilding = true;
 
@@ -299,7 +240,7 @@ stdenv.mkDerivation {
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
   };
 
 }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series
index 2196d8383752..44e2d9040807 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/series
@@ -7,3 +7,4 @@ xdg-config-dirs.patch
 nix-profiles-library-paths.patch
 compose-search-path.patch
 libressl.patch
+cmake-paths.patch

From 8d3c35ad024a7b354ed74916a7a61bde7053c1b6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Mar 2017 02:37:00 +0200
Subject: [PATCH 2059/3449] SDL2_gfx: Fix non-x86 build

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

diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 1d26fed805eb..cee0a81ccfbd 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL2 ];
 
-  configureFlags = [ "--enable-mmx" ];
+  configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx";
 
   meta = with stdenv.lib; {
     description = "SDL graphics drawing primitives and support functions";

From 9017f3634960f3e8def45e1814b5fd9e33bbd0a4 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 18:49:01 -0600
Subject: [PATCH 2060/3449] appstream: 0.9.5 -> 0.10.6

---
 .../libraries/appstream/default.nix           | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix
index 302d63aa7596..d2b605c4f19c 100644
--- a/pkgs/development/libraries/appstream/default.nix
+++ b/pkgs/development/libraries/appstream/default.nix
@@ -1,24 +1,32 @@
-{ stdenv, fetchurl, cmake, pkgconfig, gettext, intltool
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, intltool
 , xmlto, docbook_xsl, docbook_xml_dtd_45
 , glib, xapian, libxml2, libyaml, gobjectIntrospection
+, pcre, itstool
 }:
 
-stdenv.mkDerivation {
-  name = "appstream-0.9.5";
+stdenv.mkDerivation rec {
+  name = "appstream-${version}";
+  version = "0.10.6";
 
-  src = fetchurl {
-    url = "https://github.com/ximion/appstream/archive/APPSTREAM_0_8_0.tar.gz";
-    sha256 = "16a3b38avrwyl1pp8jdgfjv6cd5mccbmk4asni92l40y5r0xfycr";
+  src = fetchFromGitHub {
+    owner = "ximion";
+    repo = "appstream";
+    rev = "APPSTREAM_0_10_6";
+    sha256 = "1fg7zxx2qhkyj7fmcpwbf80b72d16kyi8dadi111kf00sgzfbiyy";
   };
 
   nativeBuildInputs = [
     cmake pkgconfig gettext intltool
     xmlto docbook_xsl docbook_xml_dtd_45
-    gobjectIntrospection
+    gobjectIntrospection itstool
   ];
 
-  buildInputs = [ glib xapian libxml2 libyaml ];
+  buildInputs = [ pcre glib xapian libxml2 libyaml ];
 
+  cmakeFlags = ''
+    -DSTEMMING=off
+    '';
+      
   meta = with stdenv.lib; {
     description = "Software metadata handling library";
     homepage    = "http://www.freedesktop.org/wiki/Distributions/AppStream/Software/";

From 49207a62f3f14aefeddd0daf311529a9495101db Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 11 Mar 2017 01:44:49 +0100
Subject: [PATCH 2061/3449] chromium: 56.0.2924.87 -> 57.0.2987.98 [Security]

---
 .../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 32a3713682e7..20a7743439a0 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 = "0mwwscybips1kazl0rva3jdswfzfb7yp90ggqgk27z2ndp0qj8b3";
-    sha256bin64 = "17n0jcysxi99v8hwlg7f69nrs2y5z87644145a8r53l809hkvkrk";
-    version = "57.0.2987.21";
+    sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n";
+    sha256bin64 = "0dx9ivjc7avm0zgw0jcx5mmlzapwc2lp1sdjpwgd4y0iai1zr3yw";
+    version = "57.0.2987.98";
   };
   dev = {
-    sha256 = "18gsj415cdlllp95q8pv1s3hhjg8cmjb6kwrvbr5mjdvsvj0ianf";
-    sha256bin64 = "0z58rwz00bq61d24h8jynhzxanbh0m9wi04jbczci3681b4zyiyh";
-    version = "58.0.3000.4";
+    sha256 = "1i6qr1ypjww3q59lqg60xpns8xqxxrkd0yrpyx96alb1bp22x85p";
+    sha256bin64 = "1ahp99p4hi8r2bvkdpnkakwkpmmnndjn299axc7cafz85zs6z9vl";
+    version = "58.0.3029.14";
   };
   stable = {
-    sha256 = "1q2kg85pd6lv036w7lsss5mhiiva9rx4f0410sbn9bnazhghib4s";
-    sha256bin64 = "1s64smkpjmnlw7ym14v3g3lcpagsgavmnlq6wkgci80kyvwasd3w";
-    version = "56.0.2924.87";
+    sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n";
+    sha256bin64 = "1qs8pmfasf3j84pjf4fnf6yb0pfa2hdgicskvfmr1sqy7c7yg348";
+    version = "57.0.2987.98";
   };
 }

From 26623240e93f8454ac69f66a3a025d98a7e94b71 Mon Sep 17 00:00:00 2001
From: David Johnson <djohnson.m@gmail.com>
Date: Sat, 4 Feb 2017 11:19:14 -0600
Subject: [PATCH 2062/3449] Init HaLVM at 2.4.0

---
 pkgs/development/compilers/ghc/7.10.3.nix     |  1 -
 pkgs/development/compilers/halvm/2.4.0.nix    | 48 +++++++++++++++
 .../configuration-halvm-2.4.0.nix             | 59 +++++++++++++++++++
 .../haskell-modules/generic-builder.nix       | 20 +++----
 .../haskell-modules/with-packages-wrapper.nix |  9 +--
 pkgs/top-level/haskell-packages.nix           |  9 +++
 6 files changed, 131 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/compilers/halvm/2.4.0.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index d75f5df370f8..5c6b62bee6f1 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -82,5 +82,4 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
     inherit (ghc.meta) license platforms;
   };
-
 }
diff --git a/pkgs/development/compilers/halvm/2.4.0.nix b/pkgs/development/compilers/halvm/2.4.0.nix
new file mode 100644
index 000000000000..c167f4bdd75a
--- /dev/null
+++ b/pkgs/development/compilers/halvm/2.4.0.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, binutils, autoconf, alex, happy, makeStaticLibraries
+, hscolour, xen, automake, gcc, git, zlib, libtool, enableIntegerSimple ? false
+}:
+
+stdenv.mkDerivation rec {
+  version = "2.4.0";
+  name = "HaLVM-${version}";
+  isHaLVM = true;
+  isGhcjs = false;
+  src = fetchgit {
+    rev = "6aa72c9b047fd8ddff857c994a5a895461fc3925";
+    url = "https://github.com/GaloisInc/HaLVM";
+    sha256 = "05cg4w6fw5ajmpmh8g2msprnygmr4isb3pphqhlddfqwyvqhl167";
+  };
+  prePatch = ''
+    sed -i '312 d' Makefile
+    sed -i '316,446 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
+  '';
+  configureFlags = stdenv.lib.optional (!enableIntegerSimple) [ "--enable-gmp" ];
+  propagatedNativeBuildInputs = [ alex happy ];
+  buildInputs =
+   let haskellPkgs = [ alex happy bootPkgs.hscolour bootPkgs.cabal-install bootPkgs.haddock bootPkgs.hpc
+    ]; in [ bootPkgs.ghc
+            automake perl git binutils
+            autoconf xen zlib ncurses.dev
+            libtool gmp ] ++ haskellPkgs;
+  preConfigure = ''
+    autoconf
+    patchShebangs .
+  '';
+  hardeningDisable = ["all"];
+  postInstall = "$out/bin/halvm-ghc-pkg recache";
+  passthru = {
+    inherit bootPkgs;
+    cross.config = "halvm";
+    cc = "${gcc}/bin/gcc";
+    ld = "${binutils}/bin/ld";
+  };
+
+  meta = {
+    homepage = "http://github.com/GaloisInc/HaLVM";
+    description = "The Haskell Lightweight Virtual Machine (HaLVM): GHC running on Xen";
+    maintainers = with stdenv.lib.maintainers; [ dmjio ];
+    inherit (bootPkgs.ghc.meta) license platforms;
+  };
+}
diff --git a/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
new file mode 100644
index 000000000000..cd7857e23de9
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-halvm-2.4.0.nix
@@ -0,0 +1,59 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # Suitable LLVM version.
+  llvmPackages = pkgs.llvmPackages_35;
+
+  # Disable GHC 8.0.x core libraries.
+  array = null;
+  base = null;
+  binary = null;
+  bytestring = null;
+  Cabal = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-boot = null;
+  ghc-boot-th = null;
+  ghc-prim = null;
+  ghci = null;
+  haskeline = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  terminfo = null;
+  time = null;
+  transformers = null;
+  unix = null;
+  xhtml = null;
+
+  # cabal-install can use the native Cabal library.
+  cabal-install = super.cabal-install.override { Cabal = null; };
+
+  # jailbreak-cabal can use the native Cabal library.
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
+
+  # https://github.com/bmillwood/applicative-quoters/issues/6
+  applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch";
+    sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy";
+  });
+
+  # https://github.com/christian-marie/xxhash/issues/3
+  xxhash = doJailbreak super.xxhash;
+
+  # https://github.com/Deewiant/glob/issues/8
+  Glob = doJailbreak super.Glob;
+
+  # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715
+  vector-algorithms = dontCheck super.vector-algorithms;
+
+}
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index e47375e71c73..64924f7252e0 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -66,7 +66,8 @@ let
                        concatStringsSep enableFeature optionalAttrs toUpper;
 
   isGhcjs = ghc.isGhcjs or false;
-  packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version
+  isHaLVM = ghc.isHaLVM or false;
+  packageDbFlag = if isGhcjs || isHaLVM || versionOlder "7.6" ghc.version
                   then "package-db"
                   else "package-conf";
 
@@ -99,16 +100,15 @@ let
     "--with-ghc-pkg=${ghc.cross.config}-ghc-pkg"
     "--with-gcc=${ghc.cc}"
     "--with-ld=${ghc.ld}"
-    "--hsc2hs-options=--cross-compile"
     "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
-  ];
+  ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]);
 
   crossCabalFlagsString =
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
 
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
-    "--with-gcc=$CC"            # Clang won't work without that extra information.
+    "--with-gcc=$CC" # Clang won't work without that extra information.
     "--package-db=$packageConfDir"
     (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
     (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
@@ -133,8 +133,9 @@ let
 
   setupCompileFlags = [
     (optionalString (!coreSetup) "-${packageDbFlag}=$packageConfDir")
-    (optionalString (isGhcjs || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES")
-    (optionalString (versionOlder "7.10" ghc.version) "-threaded") # https://github.com/haskell/cabal/issues/2398
+    (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")
   ];
 
   isHaskellPkg = x: (x ? pname) && (x ? version) && (x ? env);
@@ -319,11 +320,10 @@ 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"
-        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}";
     };
-
   };
 
   meta = { inherit homepage license platforms; }
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index e04cbe08c2c7..15d66bbd6dc0 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -8,7 +8,7 @@
 assert ghcLibdir != null -> (ghc.isGhcjs or false);
 
 # This wrapper works only with GHC 6.12 or later.
-assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs;
+assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs || ghc.isHaLVM;
 
 # It's probably a good idea to include the library "ghc-paths" in the
 # compiler environment, because we have a specially patched version of
@@ -33,13 +33,14 @@ assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs;
 
 let
   isGhcjs       = ghc.isGhcjs or false;
-  ghc761OrLater = isGhcjs || lib.versionOlder "7.6.1" ghc.version;
+  isHaLVM       = ghc.isHaLVM or false;
+  ghc761OrLater = isGhcjs || isHaLVM || lib.versionOlder "7.6.1" ghc.version;
   packageDBFlag = if ghc761OrLater then "--global-package-db" else "--global-conf";
-  ghcCommand'    = if isGhcjs then "ghcjs" else "ghc";
+  ghcCommand'   = if isGhcjs then "ghcjs" else "ghc";
   crossPrefix = if (ghc.cross or null) != null then "${ghc.cross.config}-" else "";
   ghcCommand = "${crossPrefix}${ghcCommand'}";
   ghcCommandCaps= lib.toUpper ghcCommand';
-  libDir        = "$out/lib/${ghcCommand}-${ghc.version}";
+  libDir        = if isHaLVM then "$out/lib/HaLVM-${ghc.version}" else "$out/lib/${ghcCommand}-${ghc.version}";
   docDir        = "$out/share/doc/ghc/html";
   packageCfgDir = "${libDir}/package.conf.d";
   paths         = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b4226e656fde..bad483f02373 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -79,6 +79,10 @@ in rec {
     ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
       bootPkgs = packages.ghc802;
     };
+    ghcHaLVM240 = callPackage ../development/compilers/halvm/2.4.0.nix rec {
+      bootPkgs = packages.ghc802;
+      inherit (bootPkgs) hscolour alex happy;
+    };
 
     jhc = callPackage ../development/compilers/jhc {
       inherit (packages.ghc763) ghcWithPackages;
@@ -100,6 +104,7 @@ in rec {
       in pkgs.recurseIntoAttrs (integerSimpleGhcs // {
            ghcHEAD = integerSimpleGhcs.ghcHEAD.override { selfPkgs = packages.integer-simple.ghcHEAD; };
          });
+
   };
 
   packages = {
@@ -167,6 +172,10 @@ in rec {
       ghc = compiler.ghcjsHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
+    ghcHaLVM240 = callPackage ../development/haskell-modules {
+      ghc = compiler.ghcHaLVM240;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-halvm-2.4.0.nix { };
+    };
 
     # The integer-simple attribute set contains package sets for all the GHC compilers
     # using integer-simple instead of integer-gmp.

From e50dba97d202ed3d3fc057380b0766dc73930b2e Mon Sep 17 00:00:00 2001
From: Ben Zhang <benzhangniu@gmail.com>
Date: Fri, 10 Mar 2017 21:54:49 -0500
Subject: [PATCH 2063/3449] nodejs: 7.7.1 -> 7.7.2

---
 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 b34d84ac851a..a93cd16e00e1 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.1";
+    version = "7.7.2";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "04bn7c2hvhs6dqjz3khrlqyspljbxiw7y7g4fkjkn8k7lwmchpwn";
+      sha256 = "117mqhvnvipyaq02knq75ikbk1swrw42b0kw6iijqb6k8j78si77";
     };
 
   })

From 954e145101494c3114fffeded5e439ad0a4b8493 Mon Sep 17 00:00:00 2001
From: Ben Zhang <benzhangniu@gmail.com>
Date: Fri, 10 Mar 2017 22:59:19 -0500
Subject: [PATCH 2064/3449] emscripten 1.37.1 -> 1.37.3

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

diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index f94e826defbb..05df6e9359a0 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.1";
+  rev = "1.37.3";
   appdir = "share/emscripten";
 in
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten";
-    sha256 = "0xl8lv0ihxsnwnhma3i34pkbz0v1yyc93ac6mdqmzv6fx2wczm04";
+    sha256 = "0pkxm8nd2zv57f2xm0c3n4xsdh2scliyy3zx04xk2bpkvskyzl7x";
     inherit rev;
   };
 

From 49a14162b972ddef04adc3258596d2d1e5ba8a6b Mon Sep 17 00:00:00 2001
From: Ben Zhang <benzhangniu@gmail.com>
Date: Fri, 10 Mar 2017 23:13:10 -0500
Subject: [PATCH 2065/3449] Update emscripten-fastcomp version to 1.37.3

---
 pkgs/development/compilers/emscripten-fastcomp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix
index c457ae158389..b5d2ba66e752 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.1";
+  rev = "1.37.3";
   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 = "08jci6h73j4pcd6iq5r4zn8c6qpd6qxc7xivxh3iama9hghmxyk9";
+    sha256 = "0s5156g6576hm31628c2wbqwl9r6vn10z5ry59psl565zz3lpg8x";
     inherit rev;
   };
 
   srcFL = fetchFromGitHub {
     owner = "kripken";
     repo = "emscripten-fastcomp-clang";
-    sha256 = "053svm8vnsma61jzzr8n1224brmjw4pzvklh572bm1p7yg32chaw";
+    sha256 = "0jhk20wb7275n5m9niqkzmvrr8hh5v26glkmsfmng4p66cs7jkil";
     inherit rev;
   };
 

From cef420bd611a2e8da3cc39a061c8a575b8f0702a Mon Sep 17 00:00:00 2001
From: vbgl <vbgl@users.noreply.github.com>
Date: Sat, 11 Mar 2017 06:49:31 +0000
Subject: [PATCH 2066/3449] cgal: fix typo in license

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

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index dc3909f66490..e4eb8d3ab2ec 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, mesa_glu }:
+{ stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
   version = "4.9";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Computational Geometry Algorithms Library";
     homepage = http://cgal.org;
-    license = with licenses; [ gpl3Plus lglp3Plus];
+    license = with licenses; [ gpl3Plus lgpl3Plus];
     platforms = platforms.all;
     maintainers = [ maintainers.raskin ];
   };

From 4e0375cb59b80934ab55a3fe523979c5f2e81640 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 06:56:21 +0100
Subject: [PATCH 2067/3449] pidgin: 2.11.0 -> 2.12.0 for CVE-2017-2640

Also removes unmaintained plugins.

See https://bitbucket.org/pidgin/www/src/tip/htdocs/ChangeLog.
---
 .../networking/instant-messengers/pidgin/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index def683882dc9..45aafba57f30 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -14,11 +14,11 @@
 let unwrapped = stdenv.mkDerivation rec {
   name = "pidgin-${version}";
   majorVersion = "2";
-  version = "${majorVersion}.11.0";
+  version = "${majorVersion}.12.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "0crkggjj6y07v1kdwil9vw532b0vrs6p33nmlvdkpnl60m2169pp";
+    sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc";
   };
 
   inherit nss ncurses;

From 12f3006861bd8058d738790f8df65ec3175c8bd3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 07:02:41 +0100
Subject: [PATCH 2068/3449] vim: 8.0.0329 -> 8.0.0442

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

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 0412d1d2d6c6..1d661014c772 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.0329";
+  version = "8.0.0442";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "0dcvj2la5g6s87mx3vm96jk904xfmqbwi0jyds9bd3qgbpnn80r1";
+    sha256 = "1pyyrkb7k5vhm1ijrh4v2f50lxhrgga5mm0gvmz4v704z0h585yg";
   };
 
   enableParallelBuilding = true;

From 051b3b3b7876cff28f6815a843f6d4e165299686 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 07:09:35 +0100
Subject: [PATCH 2069/3449] libarchive: 3.2.2 -> 3.3.1

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 89e2762e3ccb..883273f188c8 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,20 +10,13 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.2.2";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739";
+    sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9";
   };
 
-  patches = [
-    (fetchurl {
-      url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch";
-      sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6";
-    })
-  ];
-
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];

From 3bd44428cfa0a9f2fe8d1eae62b105e7a5dace86 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 07:09:51 +0100
Subject: [PATCH 2070/3449] lxc: add patch for CVE-2017-5985

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

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index bf3a05f11161..bab7038aa475 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./support-db2x.patch
+    (fetchurl {
+      name = "CVE-2017-5985.patch";
+      url = "https://github.com/lxc/lxc/commit/d512bd5efb0e407eba350c4e649c464a65b712a3.patch";
+      sha256 = "0v1rhlfviadsxj2wmbl7nqb64p6y2bxm9y43sc44jg3k6mkr0r5c";
+    })
   ];
 
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";

From ff2313a6c62c471f06a01739a05b799b28707a23 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 07:12:39 +0100
Subject: [PATCH 2071/3449] linux: 3.12.70 -> 3.12.71

---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index a0d089807193..f82eb073de9a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.70";
+  version = "3.12.71";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "07l6wjhlii2qlki447d702fi1ycyd85iq750xjmsnnz9xrilw7sc";
+    sha256 = "11wmrj2zqb3x2az22q7ggdp6ibhqmlngy7v01fm8vrhz7f6lwf87";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa03b80c3f74..96647e83a675 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11414,7 +11414,6 @@ with pkgs;
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
     kernelPatches = with kernelPatches;
       [ bridge_stp_helper
-        DCCP_double_free_vulnerability_CVE-2017-6074
       ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu

From c1ccedeaffe2608ca595f4b01286739368891915 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 07:15:47 +0100
Subject: [PATCH 2072/3449] linux: make some new config settings optional

These are not support on older kernels pre 4.0.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b66ad655b648..329f80d0e67e 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -150,8 +150,8 @@ with stdenv.lib;
   L2TP_ETH m
   BRIDGE_VLAN_FILTERING y
   BONDING m
-  NET_L3_MASTER_DEV y
-  NET_FOU_IP_TUNNELS y
+  NET_L3_MASTER_DEV? y
+  NET_FOU_IP_TUNNELS? y
 
   # Wireless networking.
   CFG80211_WEXT? y # Without it, ipw2200 drivers don't build

From c512180f9c175c1fae1387b3879ede6d55d0dbe0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 08:04:43 +0100
Subject: [PATCH 2073/3449] qemu: add patches for multiple CVEs

New upstream patch function and patches for fixing a bug in the patch for
CVE-2017-5667 and the following security issues:

  * CVE-2016-7907
  * CVE-2016-9602
  * CVE-2016-10155
  * CVE-2017-2620
  * CVE-2017-2630
  * CVE-2017-5525
  * CVE-2017-5526
  * CVE-2017-5579
  * CVE-2017-5856
  * CVE-2017-5857
  * CVE-2017-5987
  * CVE-2017-6058
---
 .../virtualization/qemu/default.nix           | 95 ++++++++++++++-----
 1 file changed, 73 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 8d462395ce07..10973e8c9152 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -54,38 +54,89 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [
+  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
+    (upstreamPatch "qemu-vnc-no-disconnect" "537848ee62195fc06c328b1cd64f4218f404a7f1"
+      "1pf4ghfl6mx6yw3qzy384kvdf0ch9qbh4n32c8d5dwq98lgxavqs")
+
+    (upstreamPatch "qemu-fix-win7-xhci" "7da76e12cc5cc902dda4c168d8d608fd4e61cbc5"
+      "0m1ggbxziy7vqz9007ypzg23cni8cc4db36wlnhxz0kdpq70c6x0")
+
+    (upstreamPatch "qemu-xhci-free-completed-transfers" "f94d18d6c6df388fde196d3ab252f57e33843a8b"
+      "0lk19qss6ky7cqnvis54742cr2z0vl8c64chhch0kp6n83hray9x")
+
+    # security fixes from debian
     (fetchurl {
-      name = "CVE-2017-2615.patch";
-      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=62d4c6bd5263bb8413a06c80144fc678df6dfb64";
-      sha256 = "0miph2x4d474issa44hmc542zxmkc7lsr4ncb7pwarq6j7v52l8h";
+      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-5667.patch";
-      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=42922105beb14c2fc58185ea022b9f72fb5465e9";
-      sha256 = "049vq70is3fj9bf4ysfj3s44iz93qhyqn6xijck32w1x6yyzqyx4";
-     })
+      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-5898.patch";
-      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=c7dfbf322595ded4e70b626bf83158a9f3807c6a";
-      sha256 = "1y2j0qw04s8fl0cs8i619y08kj75lxn3c0y19g710fzpk3rq8dvn";
-     })
+      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";
+    })
 
-    (fetchurl {
-      name = "CVE-2017-5931.patch";
-      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=a08aaff811fb194950f79711d2afe5a892ae03a4";
-      sha256 = "0hlih9jhbb1mb174hvxs7pf7lgcs7s9g705ri9rliw7wrhqdpja5";
-     })
+    # security fixes from upstream
+    (upstreamPatch "CVE-2016-7907" "81f17e0d435c3db3a3e67e0d32ebf9c98973211f"
+      "0dzghbm3jmnyw34kd40a6akrr1cpizd9hdzqmhlc2ljab7pr1rcb")
 
-    (fetchurl {
-      name = "CVE-2017-5973.patch";
-      url = "http://git.qemu-project.org/?p=qemu.git;a=patch;h=f89b60f6e5fee3923bedf80e82b4e5efc1bb156b";
-      sha256 = "06niyighjxb4p5z2as3mqfmrwrzn4sq47j7raipbq9gnda7x9sw6";
-     })
+    (upstreamPatch "CVE-2016-10155" "eb7a20a3616085d46aa6b4b4224e15587ec67e6e"
+      "1xk00fyls0hdza11dyfrnzcn6gibmmcrwy7sxgp6iizp6wgzi3vw")
+
+    (upstreamPatch "CVE-2017-2615" "62d4c6bd5263bb8413a06c80144fc678df6dfb64"
+      "0miph2x4d474issa44hmc542zxmkc7lsr4ncb7pwarq6j7v52l8h")
+
+    (upstreamPatch "CVE-2017-2620" "92f2b88cea48c6aeba8de568a45f2ed958f3c298"
+      "1kz12qmvfccy7xilsrxahbs67jycv4zjfbijxivadvx9klxs1n58")
+
+    (upstreamPatch "CVE-2017-5525" "12351a91da97b414eec8cdb09f1d9f41e535a401"
+      "190b4aqr35p4lb3rjarknfi1ip1c9zizliqp1dd6frx4364y5yp2")
+
+    (upstreamPatch "CVE-2017-5526" "069eb7b2b8fc47c7cb52e5a4af23ea98d939e3da"
+      "05xgzd3zldk3x2vqpjag9z5ilhdkpkyh633fb5kvnz8scns6v86f")
+
+    (upstreamPatch "CVE-2017-5579" "8409dc884a201bf74b30a9d232b6bbdd00cb7e2b"
+      "0lbcyhif1kdcy8my0bv8aqr2f421kmljcch3plrjzj9pgcm4sv83")
+
+    (upstreamPatch "CVE-2017-5667" "42922105beb14c2fc58185ea022b9f72fb5465e9"
+      "049vq70is3fj9bf4ysfj3s44iz93qhyqn6xijck32w1x6yyzqyx4")
+
+    (upstreamPatch "CVE-2017-5667-fix" "913a87885f589d263e682c2eb6637c6e14538061"
+      "0nm1k2r9n6r86dvjr16hxak2vcsinj7ijlqw5i6f4y5h2sh37wr5")
+
+    (upstreamPatch "CVE-2017-5856" "765a707000e838c30b18d712fe6cb3dd8e0435f3"
+      "03pjkn8l8rp9ip5h5rm1dp0nrwd43nmgpwamz4z1vy3rli1z3yjw")
+
+    (upstreamPatch "CVE-2017-5857" "5e8e3c4c75c199aa1017db816fca02be2a9f8798"
+      "1kz14rmxf049zl5m27apzpbvy8dk0g47n9gnwy0nm70g65rl1dh8")
+
+    (upstreamPatch "CVE-2017-5898" "c7dfbf322595ded4e70b626bf83158a9f3807c6a"
+      "1y2j0qw04s8fl0cs8i619y08kj75lxn3c0y19g710fzpk3rq8dvn")
+
+    (upstreamPatch "CVE-2017-5931" "a08aaff811fb194950f79711d2afe5a892ae03a4"
+      "0hlih9jhbb1mb174hvxs7pf7lgcs7s9g705ri9rliw7wrhqdpja5")
+
+    (upstreamPatch "CVE-2017-5973" "f89b60f6e5fee3923bedf80e82b4e5efc1bb156b"
+      "06niyighjxb4p5z2as3mqfmrwrzn4sq47j7raipbq9gnda7x9sw6")
+
+    (upstreamPatch "CVE-2017-5987" "6e86d90352adf6cb08295255220295cf23c4286e"
+      "09yfxf93cisx8rhm0h48ib1ibwfs420k5pqpz8dnz33nci9567jm")
 
   ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
 

From 39e8db7849ceb14e4d234436abb760dd7f3a8cb7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 08:18:57 +0100
Subject: [PATCH 2074/3449] wget: add patch for CVE-2017-6508

---
 pkgs/tools/networking/wget/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index f024c637c341..1a260f910e20 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -12,7 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c";
   };
 
-  patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];
+  patches = [
+    ./remove-runtime-dep-on-openssl-headers.patch
+    (fetchurl {
+      name = "CVE-2017-6508";
+      url = "http://git.savannah.gnu.org/cgit/wget.git/patch/?id=4d729e322fae359a1aefaafec1144764a54e8ad4";
+      sha256 = "14r0c5y3w3gavxp2d9yq8xji82izi5sx0sjv6jpmk6zp6cnr7cjf";
+    })
+  ];
 
   preConfigure = ''
     patchShebangs doc

From 82f1c3fb43ec57944fb839ef99a523a26093d603 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 09:12:15 +0100
Subject: [PATCH 2075/3449] kanboard: init at 1.0.40

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

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
new file mode 100644
index 000000000000..ba1a266a42f5
--- /dev/null
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "kanboard-${version}";
+  version = "1.0.40";
+
+  src = fetchzip {
+    url = "https://kanboard.net/kanboard-1.0.40.zip";
+    sha256 = "1phn3rvngch636g00rhicl0225qk6gdmxqjflkrdchv299zysswd";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/kanboard
+    cp -rv . $out/share/kanboard
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Kanban project management software";
+    homepage = "https://kanboard.net";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96647e83a675..f93e2922cacf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14111,6 +14111,8 @@ with pkgs;
 
   kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { };
 
+  kanboard = callPackage ../applications/misc/kanboard { };
+
   kde-telepathy = kde4.callPackage ../applications/networking/instant-messengers/telepathy/kde {};
 
   kdeApplications =

From 621e7a99457e295d6bfa51e0489584a7d7f5b167 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 09:32:48 +0100
Subject: [PATCH 2076/3449] qemu: fetch vnc bugfix patch from debian

This version of the patch applies cleanly to the 2.8.0 release.
---
 pkgs/applications/virtualization/qemu/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 10973e8c9152..e5620b6ce456 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -64,8 +64,11 @@ stdenv.mkDerivation rec {
     ./no-etc-install.patch
 
     # bugfixes
-    (upstreamPatch "qemu-vnc-no-disconnect" "537848ee62195fc06c328b1cd64f4218f404a7f1"
-      "1pf4ghfl6mx6yw3qzy384kvdf0ch9qbh4n32c8d5dwq98lgxavqs")
+    (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";
+    })
 
     (upstreamPatch "qemu-fix-win7-xhci" "7da76e12cc5cc902dda4c168d8d608fd4e61cbc5"
       "0m1ggbxziy7vqz9007ypzg23cni8cc4db36wlnhxz0kdpq70c6x0")

From 323d0fdd5a6e1a47ab9da72d15ed9872625fe8a0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 9 Mar 2017 20:19:28 +0100
Subject: [PATCH 2077/3449] phpfpm module: set correct nixos sendmail path

---
 nixos/modules/services/web-servers/phpfpm/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix
index 846dfbb587f5..efb721c5773f 100644
--- a/nixos/modules/services/web-servers/phpfpm/default.nix
+++ b/nixos/modules/services/web-servers/phpfpm/default.nix
@@ -27,9 +27,12 @@ let
 
   phpIni = pkgs.runCommand "php.ini" {
     inherit (cfg) phpPackage phpOptions;
-    passAsFile = [ "phpOptions" ];
+    nixDefaults = ''
+      sendmail_path = "/run/wrappers/bin/sendmail -t -i"
+    '';
+    passAsFile = [ "nixDefaults" "phpOptions" ];
   } ''
-    cat $phpPackage/etc/php.ini $phpOptionsPath > $out
+    cat $phpPackage/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out
   '';
 
 in {

From 71161443b44dcf21e0bec919cdd602d3e7e05893 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 10 Mar 2017 00:54:46 +0100
Subject: [PATCH 2078/3449] batman-adv: 2016.5 -> 2017.0.1

---
 pkgs/os-specific/linux/batman-adv/alfred.nix  | 4 ++--
 pkgs/os-specific/linux/batman-adv/batctl.nix  | 4 ++--
 pkgs/os-specific/linux/batman-adv/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 0ee928754db7..5d58e50fd7b8 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
 
 let
-  ver = "2016.5";
+  ver = "2017.0";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1ln997qyknkfm7xp4vx5lm0z833ksn1gn4dyjvr3qr1pgyzvmcrp";
+    sha256 = "1a0gnl8v8l7zj01hca0srbsc11sk51rj1qac6lw242z35hyximpq";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index c8cab86413fb..e7c20a07b051 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2016.5";
+  ver = "2017.0";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1saa088ggsr7bwlvnzpgjj6zqn51j0km96f4x1djhj55hwfypv87";
+    sha256 = "11n66hcs4jdnfdl896kzz22zlw8d2p8n6sldxfmlc2q7sqki3fy0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index 044469986245..1449d85fc162 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -2,14 +2,14 @@
 
 #assert stdenv.lib.versionOlder kernel.version "3.17";
 
-let base = "batman-adv-2016.5"; in
+let base = "batman-adv-2017.0.1"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "1dqdzpxdrgqpgkc6bqfvbvx5x18bpd9y459j0iyva47lqj8gr86h";
+    sha256 = "0z640jgi9l9355s8v75yhrb9wjyc7cd4618pjpb17vy576bvrhjm";
   };
 
   hardeningDisable = [ "pic" ];

From a5f4e22289229a5f6b7341d17c45db98be84d479 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 10 Mar 2017 13:50:21 +0100
Subject: [PATCH 2079/3449] stdenv: aarch64 is also ARM

---
 pkgs/development/libraries/libdrm/default.nix | 2 +-
 pkgs/development/libraries/mesa/default.nix   | 6 +++---
 pkgs/stdenv/generic/default.nix               | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 3dfbdd7040f2..aadcfcf05a8e 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
   configureFlags = [ "--disable-valgrind" ]
-    ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
+    ++ stdenv.lib.optionals stdenv.isArm [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
   crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f5e716d212c7..758e2446d03c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -30,15 +30,15 @@ else
 
 let
   defaultGalliumDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
+    if stdenv.isArm
     then ["nouveau" "freedreno" "vc4" "etnaviv"]
     else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
+    if stdenv.isArm
     then ["nouveau"]
     else ["i915" "i965" "nouveau" "radeon" "r200"];
   defaultVulkanDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
+    if stdenv.isArm
     then []
     else ["intel"] ++ lib.optional enableRadv "radeon";
 in
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index cb94db48f4bd..1900e404e6d0 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -397,7 +397,8 @@ let
             || system == "mips64el-linux";
       isArm = system == "armv5tel-linux"
            || system == "armv6l-linux"
-           || system == "armv7l-linux";
+           || system == "armv7l-linux"
+           || system == "aarch64-linux";
       isAarch64 = system == "aarch64-linux";
       isBigEndian = system == "powerpc-linux";
 

From a2737b1fdfc5e31285c709c444410e9696226f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 11 Mar 2017 09:21:17 +0100
Subject: [PATCH 2080/3449] vlock: improve eintr patch

---
 pkgs/misc/screensavers/vlock/eintr.patch | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/screensavers/vlock/eintr.patch b/pkgs/misc/screensavers/vlock/eintr.patch
index e33b52228fc3..64f432434324 100644
--- a/pkgs/misc/screensavers/vlock/eintr.patch
+++ b/pkgs/misc/screensavers/vlock/eintr.patch
@@ -4,11 +4,13 @@ vlock-start[14567]: vlock-new: could not activate new terminal: Interrupted syst
 
 I think this should fix that.
 
+Also on github: https://github.com/viric/vlock/commit/781a26087f83c7247601b6f82f784cca9266694e
+
 diff --git a/modules/new.c b/modules/new.c
-index e9b15fb..1f692fd 100644
+index e9b15fb..7aed640 100644
 --- a/modules/new.c
 +++ b/modules/new.c
-@@ -103,7 +103,10 @@ static char *get_console_name(int n)
+@@ -103,9 +103,19 @@ static char *get_console_name(int n)
   * file descriptor. */
  static int activate_console(int consfd, int vtno)
  {
@@ -18,5 +20,15 @@ index e9b15fb..1f692fd 100644
 +    c = ioctl(consfd, VT_ACTIVATE, vtno);
 +  } while(c != 0 && errno == EINTR);
  
-   return c < 0 ? c : ioctl(consfd, VT_WAITACTIVE, vtno);
+-  return c < 0 ? c : ioctl(consfd, VT_WAITACTIVE, vtno);
++  if (c < 0)
++      return c;
++
++  do {
++    c = ioctl(consfd, VT_WAITACTIVE, vtno);
++  } while(c != 0 && errno == EINTR);
++
++  return c;
  }
+ 
+ struct new_console_context {

From 8ac134321b5c525bf33d6136528fa13b8d5f2707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 11 Mar 2017 09:28:05 +0100
Subject: [PATCH 2081/3449] bsc: init at 3.1.0

Compressor.
---
 pkgs/tools/compression/bsc/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/compression/bsc/default.nix

diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix
new file mode 100644
index 000000000000..be512e2ae689
--- /dev/null
+++ b/pkgs/tools/compression/bsc/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl } :
+
+stdenv.mkDerivation rec {
+  name = "bsc-${version}";
+  version = "3.1.0";
+
+  src = fetchurl {
+    url = "https://github.com/IlyaGrebnov/libbsc/archive/${version}.tar.gz";
+    sha256 = "01yhizaf6qjv1plyrx0fcib264maa5qwvgfvvid9rzlzj9fxjib6";
+  };
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    makeFlagsArray+=("PREFIX=$out")
+  '';
+
+  meta = with stdenv.lib; {
+    description = "High performance block-sorting data compression library";
+    homepage = http://libbsc.com/;
+    # Later commits changed the licence to Apache2 (no release yet, though)
+    license = with licenses; [ lgpl3Plus ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f93e2922cacf..793daf719529 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1100,6 +1100,8 @@ with pkgs;
 
   atool = callPackage ../tools/archivers/atool { };
 
+  bsc = callPackage ../tools/compression/bsc { };
+
   bzip2 = callPackage ../tools/compression/bzip2 { };
 
   cabextract = callPackage ../tools/archivers/cabextract { };

From 7aa5effaf64b0cb97657bca8a54d038b714baa05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 11 Mar 2017 09:59:48 +0100
Subject: [PATCH 2082/3449] lzham: init at 1.0

Compressor.
---
 pkgs/tools/compression/lzham/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/compression/lzham/default.nix

diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix
new file mode 100644
index 000000000000..cdc155474a78
--- /dev/null
+++ b/pkgs/tools/compression/lzham/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake } :
+
+stdenv.mkDerivation rec {
+  name = "lzham-1.0";
+
+  src = fetchFromGitHub {
+    owner = "richgel999";
+    repo = "lzham_codec";
+    rev = "v1_0_release";
+    sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v";
+  };
+
+  buildInputs = [ cmake ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ../bin_linux/lzhamtest $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed";
+    homepage = https://github.com/richgel999/lzham_codec;
+    license = with licenses; [ mit ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 793daf719529..a1e4bb13c809 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2778,6 +2778,8 @@ with pkgs;
 
   lzfse = callPackage ../tools/compression/lzfse { };
 
+  lzham = callPackage ../tools/compression/lzham { };
+
   lzip = callPackage ../tools/compression/lzip { };
 
   lzma = xz;

From 70b174d79dddf424a10f1fbf8373bf5ee88ad661 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 10:20:59 +0100
Subject: [PATCH 2083/3449] Revert "libarchive: 3.2.2 -> 3.3.1"

This reverts commit 051b3b3b7876cff28f6815a843f6d4e165299686.

This is a mass rebuild and should go into staging.
---
 pkgs/development/libraries/libarchive/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 883273f188c8..89e2762e3ccb 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,13 +10,20 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.3.1";
+  version = "3.2.2";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9";
+    sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739";
   };
 
+  patches = [
+    (fetchurl {
+      url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch";
+      sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6";
+    })
+  ];
+
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];

From 7dfea0a84ad327aa978e523666162980a33cf914 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 10:19:23 +0100
Subject: [PATCH 2084/3449] youtubeDL: 2017.03.07 -> 2017.03.10

---
 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 dbd042ec8858..aa92e66d98fb 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.07";
+  version = "2017.03.10";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "19acz9m3gazd1ims4l9a9ni1p7jw8z4y0ncqn99xlx9kna8ryjnv";
+    sha256 = "0ccrwhgycz17xmsdsd0rsv7khhp1z7dnwp7fkxx7dxbivjf0h0a4";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bf6c90ed677b41e7ecc512c562a25b0396371f0f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 07:09:35 +0100
Subject: [PATCH 2085/3449] libarchive: 3.2.2 -> 3.3.1

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 89e2762e3ccb..883273f188c8 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,20 +10,13 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.2.2";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "03q6y428rg723c9fj1vidzjw46w1vf8z0h95lkvz1l9jw571j739";
+    sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9";
   };
 
-  patches = [
-    (fetchurl {
-      url = "https://github.com/libarchive/libarchive/commit/98dcbbf0bf4854bf987557e55e55fff7abbf3ea9.patch";
-      sha256 = "1934krf5imc9rq1av6immpsfn77pglanhz1csq8j22h9ab87n5z6";
-    })
-  ];
-
   outputs = [ "out" "lib" "dev" ];
 
   nativeBuildInputs = [ pkgconfig ];

From 1de5f1bbeb403f8477b0651e1c9d1445b8ba8da3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 11 Mar 2017 10:53:25 +0100
Subject: [PATCH 2086/3449] aqbanking/updater: Switch to HTTPS URL

The site has changed to HTTPS and no longer serves HTTP (yay).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/aqbanking/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aqbanking/update.sh b/pkgs/development/libraries/aqbanking/update.sh
index 2ba0192cbb64..8929e8bc6eb4 100755
--- a/pkgs/development/libraries/aqbanking/update.sh
+++ b/pkgs/development/libraries/aqbanking/update.sh
@@ -13,7 +13,7 @@ getCurrentVersions() {
 currentVersions="$(getCurrentVersions)"
 
 getLastestVersion() {
-    local baseurl="http://www.aquamaniac.de"
+    local baseurl="https://www.aquamaniac.de"
     local pkglist="sites/download/packages.php?package=$1&showall=1"
     local url="$baseurl/$pkglist"
     local reVersion='[0-9]+(\.[0-9]+)+' # Only release versions, no betas!

From 460c064852aa368c53b168a5f09d5b4e78d42caf Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 11 Mar 2017 10:55:06 +0100
Subject: [PATCH 2087/3449] aqbanking: 5.6.10 -> 5.6.12

 * 5.6.11: Fix problem with some servers aborting SSL connections.
 * 5.6.12: Improve handling of offset accounts during turnover
           retrieval.

The full changelogs in German can be found at:

https://www.aquamaniac.de/sites/news/index.php

Built and tested successfully on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/aqbanking/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index f53d9a9e26f1..ecaabb5ed876 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -6,7 +6,7 @@
   libchipcard.version = "5.0.4";
   libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
   libchipcard.releaseId = "200";
-  aqbanking.version = "5.6.10";
-  aqbanking.sha256 = "1x0isvpk43rq2zlyyb9p0kgjmqv7yq07vgkiprw3f5sjkykvxw6d";
-  aqbanking.releaseId = "206";
+  aqbanking.version = "5.6.12";
+  aqbanking.sha256 = "08jbwmiv6f3v8iqdr44x4szna496fqcjfi6mlx04cnbx91m70lh6";
+  aqbanking.releaseId = "208";
 }

From e25f8f2e37ab0cb042220939cd9a2360e4851594 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 11 Mar 2017 10:59:53 +0100
Subject: [PATCH 2088/3449] gwenhywfar: 4.15.3 -> 4.17.0

 * 4.17.0: A few smaller fixes.
 * 4.16.0beta: It's now possible to show saved passwords from the
               GWEN_PASSWD_STORE file.
 * 4.15.6beta: Improve Certificate handling with TLS connections.
 * 4.15.5beta: Fix problem with some servers aborting SSL connections.

The full changelogs in German can be found at:

https://www.aquamaniac.de/sites/news/index.php

Built and tested successfully on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/aqbanking/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index ecaabb5ed876..1638c72e95f5 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -1,8 +1,8 @@
 # This file is autogenerated from update.sh in the same directory.
 {
-  gwenhywfar.version = "4.15.3";
-  gwenhywfar.sha256 = "0fp67s932x66xfljb26zbrn8ambbc5y5c3hllr6l284nr63qf3ka";
-  gwenhywfar.releaseId = "201";
+  gwenhywfar.version = "4.17.0";
+  gwenhywfar.sha256 = "1z9bm2r407x8vxk2nk6pndx0zhlk32j65z472ljkgjbh56mgzz8i";
+  gwenhywfar.releaseId = "205";
   libchipcard.version = "5.0.4";
   libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
   libchipcard.releaseId = "200";

From 3a4e2376e444fd7664102af00a34c65b47e271ec Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 13:43:42 +0100
Subject: [PATCH 2089/3449] qemu_test: don't apply patch for CVE-2016-9602

Both patches are conflicting. Keeping the vulnerability unpatched in qemu
binaries used for nixos test is tolerable.
---
 pkgs/applications/virtualization/qemu/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index e5620b6ce456..ef3cce4808d1 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -77,12 +77,6 @@ stdenv.mkDerivation rec {
       "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";
@@ -141,7 +135,13 @@ stdenv.mkDerivation rec {
     (upstreamPatch "CVE-2017-5987" "6e86d90352adf6cb08295255220295cf23c4286e"
       "09yfxf93cisx8rhm0h48ib1ibwfs420k5pqpz8dnz33nci9567jm")
 
-  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
+  ] ++ (if nixosTestRunner then [ ./force-uid0-on-9p.patch ] else [
+    (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";
+    })
+ ]);
 
   hardeningDisable = [ "stackprotector" ];
 

From 91bbd73ffa7e70f0b1294a12bda6be63dae0fb95 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 11 Mar 2017 14:47:29 +0100
Subject: [PATCH 2090/3449] suil-qt5: fix build

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

diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix
index 8864d710174a..f0dbdcc7daf6 100644
--- a/pkgs/development/libraries/audio/suil/default.nix
+++ b/pkgs/development/libraries/audio/suil/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
+{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, gcc6
 , withQt4 ? true, qt4 ? null
 , withQt5 ? false, qt5 ? null }:
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf";
   };
 
-  buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ]
+  buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom gcc6 ]
     ++ (lib.optionals withQt4 [ qt4 ])
     ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
 

From d6d796812a388be1461eb624cfde60b1036c585a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 11 Mar 2017 14:52:42 +0100
Subject: [PATCH 2091/3449] lightdm_qt: fix build

---
 pkgs/applications/display-managers/lightdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index 291439db5beb..b3dd9f91ec89 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pam, pkgconfig, libxcb, glib, libXdmcp, itstool, libxml2
-, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit
+, intltool, xlibsWrapper, libxklavier, libgcrypt, libaudit, gcc6
 , qt4 ? null
 , withQt5 ? false, qtbase
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig pam libxcb glib libXdmcp itstool libxml2 intltool libxklavier libgcrypt
-    qt4 libaudit
+    qt4 libaudit gcc6
   ] ++ stdenv.lib.optional withQt5 qtbase;
 
   configureFlags = [

From a241abf603e7fe971bdddc7c9454581e26c15d5a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Mar 2017 15:54:24 +0200
Subject: [PATCH 2092/3449] Revert "stdenv: aarch64 is also ARM"

This reverts commit a5f4e22289229a5f6b7341d17c45db98be84d479.

Breaks the stdenv build, e.g.: http://hydra.nixos.org/build/50015717
In general, the architectures are different enough that there is no
reason to consider both as ARM, just like we don't consider x86_64 as
32-bit x86.

cc @fpletz
---
 pkgs/development/libraries/libdrm/default.nix | 2 +-
 pkgs/development/libraries/mesa/default.nix   | 6 +++---
 pkgs/stdenv/generic/default.nix               | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index aadcfcf05a8e..3dfbdd7040f2 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
   configureFlags = [ "--disable-valgrind" ]
-    ++ stdenv.lib.optionals stdenv.isArm [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
+    ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
   crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 758e2446d03c..f5e716d212c7 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -30,15 +30,15 @@ else
 
 let
   defaultGalliumDrivers =
-    if stdenv.isArm
+    if (stdenv.isArm || stdenv.isAarch64)
     then ["nouveau" "freedreno" "vc4" "etnaviv"]
     else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
-    if stdenv.isArm
+    if (stdenv.isArm || stdenv.isAarch64)
     then ["nouveau"]
     else ["i915" "i965" "nouveau" "radeon" "r200"];
   defaultVulkanDrivers =
-    if stdenv.isArm
+    if (stdenv.isArm || stdenv.isAarch64)
     then []
     else ["intel"] ++ lib.optional enableRadv "radeon";
 in
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 1900e404e6d0..cb94db48f4bd 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -397,8 +397,7 @@ let
             || system == "mips64el-linux";
       isArm = system == "armv5tel-linux"
            || system == "armv6l-linux"
-           || system == "armv7l-linux"
-           || system == "aarch64-linux";
+           || system == "armv7l-linux";
       isAarch64 = system == "aarch64-linux";
       isBigEndian = system == "powerpc-linux";
 

From 2262855d9c50514d1aa33b1f443c7255c0d3d52e Mon Sep 17 00:00:00 2001
From: butterflya <rtdvrs+butterflya@gmail.com>
Date: Sat, 11 Mar 2017 15:03:48 +0100
Subject: [PATCH 2093/3449] Delete invalid option

The removed configureFlags entry is not a documented option according to `configure --help`.
---
 pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
index 87a014f8f74e..c0ef7904668d 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
-  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
+  configureFlags = [ "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" ];
 
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";

From c3c69535aa9f18f611950655d2e8ffc82521943d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 11 Mar 2017 15:02:27 +0100
Subject: [PATCH 2094/3449] firmwareLinuxNonfree: 2017-02-06 -> 2017-03-11

Fixes #22365.
---
 .../linux/firmware/firmware-linux-nonfree/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index dcc52de7fe7e..69f0a16785d1 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2017-02-06";
+  version = "2017-03-11";
 
   # This repo is built by merging the latest versions of
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "fpletz";
     repo = "linux-firmware";
     rev = version;
-    sha256 = "1r5ph97rqp8asw8kx65izb3p934669n2na20yfwplbsk76c9i82v";
+    sha256 = "05hz78z919jnacvk4i1mghjn2h15ph91vkffgi4w94zhzbf77cna";
   };
 
   preInstall = ''

From b729a3a9dca1d367fa3c0fbecb02cd828d41cac8 Mon Sep 17 00:00:00 2001
From: Pierre Radermecker <pierrer@pi3r.be>
Date: Sat, 11 Mar 2017 12:19:04 +0100
Subject: [PATCH 2095/3449] albert: fix #23710

---
 pkgs/applications/misc/albert/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 734ebb9cd862..986b3fe8f77c 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    sed -i "/QStringList dirs = {/a    \"$out/lib\"," \
+      src/lib/albert/src/pluginsystem/extensionmanager.cpp
+  '';
+
   fixupPhase = ''
     wrapQtProgram $out/bin/albert
   '';

From 0a7673d2029ef69175b8e3ce41677965edde371b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 11 Mar 2017 14:59:26 +0100
Subject: [PATCH 2096/3449] qemu_test: Rebase force-uid0-on-9p.patch

This reverts commit 3a4e2376e444fd7664102af00a34c65b47e271ec.

The reverted commit caused the fix for CVE-2016-9602 not to be applied
for qemu_test because it conflicts with the force-uid0-on-9p.patch.

So with the rebase of the patch on top of the changes of the
CVE-2016-9602.patch, both patches no longer conflict with each other.

I've tested this with the "misc" NixOS test and it succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../virtualization/qemu/default.nix           | 14 ++--
 .../qemu/force-uid0-on-9p.patch               | 72 ++++++++++---------
 2 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index ef3cce4808d1..e5620b6ce456 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -77,6 +77,12 @@ stdenv.mkDerivation rec {
       "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";
@@ -135,13 +141,7 @@ stdenv.mkDerivation rec {
     (upstreamPatch "CVE-2017-5987" "6e86d90352adf6cb08295255220295cf23c4286e"
       "09yfxf93cisx8rhm0h48ib1ibwfs420k5pqpz8dnz33nci9567jm")
 
-  ] ++ (if nixosTestRunner then [ ./force-uid0-on-9p.patch ] else [
-    (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";
-    })
- ]);
+  ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch;
 
   hardeningDisable = [ "stackprotector" ];
 
diff --git a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
index 9578d595129f..33c4ffff6fe5 100644
--- a/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
+++ b/pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
@@ -1,8 +1,8 @@
 diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
-index 3f271fc..dc273f4 100644
+index 45e9a1f9b0..494ee00c66 100644
 --- a/hw/9pfs/9p-local.c
 +++ b/hw/9pfs/9p-local.c
-@@ -45,6 +45,23 @@
+@@ -84,6 +84,23 @@ static void unlinkat_preserve_errno(int dirfd, const char *path, int flags)
  
  #define VIRTFS_META_DIR ".virtfs_metadata"
  
@@ -23,10 +23,10 @@ index 3f271fc..dc273f4 100644
 +    return 0;
 +}
 +
- static char *local_mapped_attr_path(FsContext *ctx, const char *path)
+ static FILE *local_fopenat(int dirfd, const char *name, const char *mode)
  {
-     int dirlen;
-@@ -128,6 +145,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
+     int fd, o_mode = 0;
+@@ -161,6 +178,8 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)
      if (err) {
          goto err_out;
      }
@@ -35,28 +35,17 @@ index 3f271fc..dc273f4 100644
      if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
          /* Actual credentials are part of extended attrs */
          uid_t tmp_uid;
-@@ -462,6 +481,11 @@ static ssize_t local_pwritev(FsContext *ctx, V9fsFidOpenState *fs,
-     return ret;
- }
- 
-+static inline int maybe_chmod(const char *path, mode_t mode)
-+{
-+    return is_in_store_path(path) ? 0 : chmod(path, mode);
-+}
-+
- static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+@@ -280,6 +299,9 @@ static int fchmodat_nofollow(int dirfd, const char *name, mode_t mode)
  {
-     char *buffer;
-@@ -477,7 +501,7 @@ static int local_chmod(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
-     } else if ((fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
-                (fs_ctx->export_flags & V9FS_SM_NONE)) {
-         buffer = rpath(fs_ctx, path);
--        ret = chmod(buffer, credp->fc_mode);
-+        ret = maybe_chmod(buffer, credp->fc_mode);
-         g_free(buffer);
-     }
-     return ret;
-@@ -621,6 +645,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
+     int fd, ret;
+ 
++    if (is_in_store_path(name))
++        return 0;
++
+     /* FIXME: this should be handled with fchmodat(AT_SYMLINK_NOFOLLOW).
+      * Unfortunately, the linux kernel doesn't implement it yet. As an
+      * alternative, let's open the file and use fchmod() instead. This
+@@ -661,6 +683,8 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,
      if (err) {
          return err;
      }
@@ -65,13 +54,28 @@ index 3f271fc..dc273f4 100644
      if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
          /* Actual credentials are part of extended attrs */
          uid_t tmp_uid;
-@@ -916,7 +942,8 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+@@ -795,8 +819,11 @@ static int local_symlink(FsContext *fs_ctx, const char *oldpath,
+         if (err) {
+             goto out;
+         }
+-        err = fchownat(dirfd, name, credp->fc_uid, credp->fc_gid,
+-                       AT_SYMLINK_NOFOLLOW);
++        if (is_in_store_path(name))
++            err = 0;
++        else
++            err = fchownat(dirfd, name, credp->fc_uid, credp->fc_gid,
++                           AT_SYMLINK_NOFOLLOW);
+         if (err == -1) {
+             /*
+              * If we fail to change ownership and if we are
+@@ -911,7 +938,9 @@ static int local_chown(FsContext *fs_ctx, V9fsPath *fs_path, FsCred *credp)
+         goto out;
+     }
+ 
+-    if ((credp->fc_uid == -1 && credp->fc_gid == -1) ||
++    if (is_in_store_path(name)) {
++        ret = 0;
++    } else if ((credp->fc_uid == -1 && credp->fc_gid == -1) ||
          (fs_ctx->export_flags & V9FS_SM_PASSTHROUGH) ||
          (fs_ctx->export_flags & V9FS_SM_NONE)) {
-         buffer = rpath(fs_ctx, path);
--        ret = lchown(buffer, credp->fc_uid, credp->fc_gid);
-+        ret = is_in_store_path(buffer)
-+            ? 0 : lchown(buffer, credp->fc_uid, credp->fc_gid);
-         g_free(buffer);
-     } else if (fs_ctx->export_flags & V9FS_SM_MAPPED) {
-         buffer = rpath(fs_ctx, path);
+         ret = fchownat(dirfd, name, credp->fc_uid, credp->fc_gid,

From 061ff21bbf5ca1df9f956756c923613e0e7301d5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 15:07:45 +0100
Subject: [PATCH 2097/3449] kubernetes: use removeReferencesTo

---
 .../networking/cluster/kubernetes/default.nix         | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 952fd8fe9b6e..ecb2cd65a37c 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, which, go, go-bindata, makeWrapper, rsync
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo, which, go, go-bindata, makeWrapper, rsync
 , iptables, coreutils
 , components ? [
     "cmd/kubeadm"
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v";
   };
 
-  buildInputs = [ makeWrapper which go rsync go-bindata ];
+  buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];
 
@@ -59,12 +59,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    # Remove references to go compiler
-    while read file; do
-      cat $file | sed "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" > $file.tmp
-      mv $file.tmp $file
-      chmod +x $file
-    done < <(find $out/bin $pause/bin -type f 2>/dev/null)
+    find $out/bin $pause/bin -type f -exec remove-references-to -t ${go} '{}' +
   '';
 
   meta = {

From 0c6a1eaa434ce6d0186ad1777de68c553cf6ccc6 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 15:07:56 +0100
Subject: [PATCH 2098/3449] containerd: use removeReferencesTo

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

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index c428c56b313b..c07670b5de65 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub
+{ stdenv, lib, fetchFromGitHub, removeReferencesTo
 , go, libapparmor, apparmor-parser, libseccomp }:
 
 with lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "16p8kixhzdx8afpciyf3fjx43xa3qrqpx06r5aqxdrqviw851zh8";
   };
 
-  buildInputs = [ go ];
+  buildInputs = [ removeReferencesTo go ];
 
   preBuild = ''
     ln -s $(pwd) vendor/src/github.com/docker/containerd
@@ -26,10 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    # remove references to go compiler
-    while read file; do
-      sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
-    done < <(find $out/bin -type f 2>/dev/null)
+    find $out -type f -exec remove-references-to -t ${go} '{}' +
   '';
 
   meta = {

From c4fe1960877dc8d6d7dfa006bcfa0b77e5d9792f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 15:08:04 +0100
Subject: [PATCH 2099/3449] docker: use removeReferencesTo

---
 pkgs/applications/virtualization/docker/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 903ee98a0e1b..f2db629336c2 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man
-, go, containerd, runc, docker-proxy, tini
+{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
+, go-md2man, go, containerd, runc, docker-proxy, tini
 , sqlite, iproute, bridge-utils, devicemapper, systemd
 , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
 , procps
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   });
 
   buildInputs = [
-    makeWrapper pkgconfig go-md2man go
+    makeWrapper removeReferencesTo pkgconfig go-md2man go
     sqlite devicemapper btrfs-progs systemd
   ];
 
@@ -126,12 +126,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    # remove references to go compiler, gcc and glibc
-    while read file; do
-      sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
-      sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
-      sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
-    done < <(find $out -type f 2>/dev/null)
+    find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} -t ${stdenv.glibc.dev} '{}' +
   '';
 
   meta = {

From d082a29c3a0eeb014b678c2797329389274fc4a2 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 15:08:09 +0100
Subject: [PATCH 2100/3449] runc: use removeReferencesTo

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

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index 7f19121b7f5b..3ce183d90e26 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, go-md2man
+{ stdenv, lib, fetchFromGitHub, fetchpatch, removeReferencesTo, go-md2man
 , go, pkgconfig, libapparmor, apparmor-parser, libseccomp }:
 
 with lib;
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = ["fortify"];
 
-  buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ];
+  buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ];
 
   makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor'';
 
@@ -61,10 +61,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    # remove references to go compiler
-    while read file; do
-      sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file
-    done < <(find $out/bin -type f 2>/dev/null)
+    find $out/bin -type f -exec remove-references-to -t ${go} '{}' +
   '';
 
   meta = {

From ee160d08eb31a38549d585c81005304eecb1fd8a Mon Sep 17 00:00:00 2001
From: butterflya <rtdvrs+butterflya@gmail.com>
Date: Sat, 11 Mar 2017 15:25:05 +0100
Subject: [PATCH 2101/3449] Enable openldap support

---
 pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
index 87a014f8f74e..a089df126dca 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib, libnotify, gtkspell3
 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf }:
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, dconf, openldap}:
 
 let
   majVer = gnome3.version;
@@ -24,12 +24,12 @@ in stdenv.mkDerivation rec {
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
                   nss nspr libnotify procps highlight gnome3.libgweather
                   gnome3.gsettings_desktop_schemas dconf
-                  gnome3.libgnome_keyring gnome3.glib_networking ];
+                  gnome3.libgnome_keyring gnome3.glib_networking openldap ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
   configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
-                     "--disable-libcryptui" ];
+                     "--disable-libcryptui" --with-openldap ];
 
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 

From 3051dafeb6b0e960b520103cf9bfc5673fe4744f Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 18 Jun 2016 15:38:23 +0100
Subject: [PATCH 2102/3449] pythonPackages.pyudev: 0.16.1 -> 0.20.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c248e4c77840..ae004f669471 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21202,20 +21202,19 @@ in {
 
   pyudev = buildPythonPackage rec {
     name = "pyudev-${version}";
-    version = "0.16.1";
+    version = "0.20.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pyudev/${name}.tar.gz";
-      sha256 = "765d1c14bd9bd031f64e2612225621984cb2bbb8cbc0c03538bcc4c735ff1c95";
+      sha256 = "0al4cpg0m8n7cd06w94x3cx8mxaqg08bfv4r6a3pkgqxc74mpn0l";
     };
 
     postPatch = ''
-      sed -i -e '/udev_library_name/,/^ *libudev/ {
-        s|CDLL([^,]*|CDLL("${pkgs.systemd.lib}/lib/libudev.so.1"|p; d
-      }' pyudev/_libudev.py
+      substituteInPlace src/pyudev/_ctypeslib/libudev.py \
+        --replace "find_library('udev')" "'${pkgs.systemd.lib}/lib/libudev.so'"
     '';
 
-    propagatedBuildInputs = with self; [ pkgs.systemd ];
+    propagatedBuildInputs = with self; [ pkgs.systemd six ];
 
     meta = {
       homepage = "http://pyudev.readthedocs.org/";

From 4aaf27bb4d071c8751484ac0e07e4df7368ecc4b Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 18 Jun 2016 17:26:45 +0100
Subject: [PATCH 2103/3449] pythonPackages.ds4drv: 0.5.0 -> 0.5.1

Also move expression
---
 pkgs/development/python-modules/ds4drv.nix | 27 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix         | 20 ++--------------
 2 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/ds4drv.nix

diff --git a/pkgs/development/python-modules/ds4drv.nix b/pkgs/development/python-modules/ds4drv.nix
new file mode 100644
index 000000000000..8698a65ea11b
--- /dev/null
+++ b/pkgs/development/python-modules/ds4drv.nix
@@ -0,0 +1,27 @@
+{ lib, fetchFromGitHub, buildPythonPackage
+, evdev, pyudev
+, bluez
+}:
+
+buildPythonPackage rec {
+  name = "ds4drv-${version}";
+  version = "0.5.1";
+
+  # PyPi only carries py3 wheel
+  src = fetchFromGitHub {
+    owner = "chrippa";
+    repo = "ds4drv";
+    rev = "v${version}";
+    sha256 = "0vinpla0apizzykcyfis79mrm1i6fhns83nkzw85svypdhkx2g8v";
+  };
+
+  propagatedBuildInputs = [ evdev pyudev ];
+
+  buildInputs = [ bluez ];
+
+  meta = {
+    description = "Userspace driver for the DualShock 4 controller";
+    homepage = "https://github.com/chrippa/ds4drv";
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae004f669471..4e6493d910c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6590,24 +6590,8 @@ in {
     };
   };
 
-  ds4drv = buildPythonPackage rec {
-    name = "ds4drv-${version}";
-    version = "0.5.0";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/ds4drv/${name}.tar.gz";
-      sha256 = "0dq2z1z09zxa6rn3v94vwqaaz29jwiydkss8hbjglixf20krmw3b";
-    };
-
-    propagatedBuildInputs = with self; [ evdev pyudev ];
-
-    buildInputs = [ pkgs.bluez ];
-
-    meta = {
-      description = "Userspace driver for the DualShock 4 controller";
-      homepage = "https://github.com/chrippa/ds4drv";
-      license = licenses.mit;
-    };
-
+  ds4drv = callPackage ../development/python-modules/ds4drv.nix {
+    inherit (pkgs) fetchFromGitHub bluez;
   };
 
   dyn = buildPythonPackage rec {

From 61edb1cb2ec30bd437650a18a1a8a7556c813af0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 9 Mar 2017 13:40:56 +0100
Subject: [PATCH 2104/3449] pythonPackages.pyudev: 0.20.0 -> 0.21.0

Also move expression
---
 pkgs/development/python-modules/pyudev.nix | 26 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix         | 25 ++-------------------
 2 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyudev.nix

diff --git a/pkgs/development/python-modules/pyudev.nix b/pkgs/development/python-modules/pyudev.nix
new file mode 100644
index 000000000000..98607501e032
--- /dev/null
+++ b/pkgs/development/python-modules/pyudev.nix
@@ -0,0 +1,26 @@
+{ lib, fetchurl, buildPythonPackage
+, six, systemd
+}:
+
+buildPythonPackage rec {
+  name = "pyudev-${version}";
+  version = "0.21.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/p/pyudev/${name}.tar.gz";
+    sha256 = "0arz0dqp75sszsmgm6vhg92n1lsx91ihddx3m944f4ah0487ljq9";
+  };
+
+  postPatch = ''
+    substituteInPlace src/pyudev/_ctypeslib/libudev.py \
+      --replace "find_library('udev')" "'${systemd.lib}/lib/libudev.so'"
+    '';
+
+  propagatedBuildInputs = [ systemd six ];
+
+  meta = {
+    homepage = "http://pyudev.readthedocs.org/";
+    description = "Pure Python libudev binding";
+    license = lib.licenses.lgpl21Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e6493d910c7..11ebfad988c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21184,31 +21184,10 @@ in {
     buildInputs = with self; [ pyasn1 pycrypto ];
   };
 
-  pyudev = buildPythonPackage rec {
-    name = "pyudev-${version}";
-    version = "0.20.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyudev/${name}.tar.gz";
-      sha256 = "0al4cpg0m8n7cd06w94x3cx8mxaqg08bfv4r6a3pkgqxc74mpn0l";
-    };
-
-    postPatch = ''
-      substituteInPlace src/pyudev/_ctypeslib/libudev.py \
-        --replace "find_library('udev')" "'${pkgs.systemd.lib}/lib/libudev.so'"
-    '';
-
-    propagatedBuildInputs = with self; [ pkgs.systemd six ];
-
-    meta = {
-      homepage = "http://pyudev.readthedocs.org/";
-      description = "Pure Python libudev binding";
-      license = licenses.lgpl21Plus;
-      platforms = platforms.linux;
-    };
+  pyudev = callPackage ../development/python-modules/pyudev.nix {
+    inherit (pkgs) fetchurl systemd;
   };
 
-
   pynzb = buildPythonPackage (rec {
     name = "pynzb-0.1.0";
 

From 286917bfc983599d75d248a255e66234a4e8ddb9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 08:28:07 -0600
Subject: [PATCH 2105/3449] aubio: 0.4.1 -> 0.4.4 (#23739)

---
 pkgs/development/libraries/aubio/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index a14de67d7f39..3ea86b36a306 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -1,24 +1,23 @@
 { stdenv, fetchurl, alsaLib, fftw, libjack2, libsamplerate
-, libsndfile, pkgconfig, python2
+, libsndfile, pkgconfig, python3
 }:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.4.3";
+  name = "aubio-0.4.4";
 
   src = fetchurl {
     url = "http://aubio.org/pub/${name}.tar.bz2";
-    sha256 = "1azarklqggch8kkz3gbqwi2vlb6ld4lidyhp34qawr0c7h3xnb5n";
+    sha256 = "1y5zzwv9xjc649g4xrlqnim4q7pcwgzn0xrq3ijbmm5r4ckbkk9a";
   };
 
-  buildInputs = [
-    alsaLib fftw libjack2 libsamplerate libsndfile pkgconfig python2
-  ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ alsaLib fftw libjack2 libsamplerate libsndfile python3 ];
 
-  configurePhase = "${python2.interpreter} waf configure --prefix=$out";
+  configurePhase = "${python3.interpreter} waf configure --prefix=$out";
 
-  buildPhase = "${python2.interpreter} waf";
+  buildPhase = "${python3.interpreter} waf";
 
-  installPhase = "${python2.interpreter} waf install";
+  installPhase = "${python3.interpreter} waf install";
 
   meta = with stdenv.lib; {
     description = "Library for audio labelling";

From 42c2bac8c06a2d062134087de9807b40e1e4da15 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 11 Mar 2017 15:39:05 +0100
Subject: [PATCH 2106/3449] neomutt: 20170128 -> 20170306

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

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 18ea017cb8c8..e61386a6819f 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -2,14 +2,14 @@
 , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }:
 
 stdenv.mkDerivation rec {
-  version = "20170128";
+  version = "20170306";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "neomutt";
     rev = "neomutt-${version}";
-    sha256 = "082ksn4fsj48nkz61ia0hcxz3396p6a4p9q8738w15qkycq23c20";
+    sha256 = "0nlazabwj4czi30m84ppga275hkr51glyndizqzg540q9wp1acz4";
   };
 
   nativeBuildInputs = [ which autoconf automake ];

From 55e477c1f15405bd53bdac2cc61fa8f62defe4ee Mon Sep 17 00:00:00 2001
From: butterflya <rtdvrs+butterflya@gmail.com>
Date: Sat, 11 Mar 2017 17:42:20 +0100
Subject: [PATCH 2107/3449] Remove Python 2 specific syntax

---
 maintainers/scripts/hydra-eval-failures.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py
index b339f296056c..6122dabb1e85 100755
--- a/maintainers/scripts/hydra-eval-failures.py
+++ b/maintainers/scripts/hydra-eval-failures.py
@@ -74,13 +74,13 @@ def cli(jobset):
     # TODO: dependency failed without propagated builds
     for tr in d('img[alt="Failed"]').parents('tr'):
         a = pq(tr)('a')[1]
-        print "- [ ] [{}]({})".format(a.text, a.get('href'))
+        print("- [ ] [{}]({})".format(a.text, a.get('href')))
 
         sys.stdout.flush()
 
         maintainers = get_maintainers(a.text)
         if maintainers:
-            print "  - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers)))
+            print("  - maintainers: {}".format(", ".join(map(lambda u: '@' + u, maintainers))))
         # TODO: print last three persons that touched this file
         # TODO: pinpoint the diff that broke this build, or maybe it's transient or maybe it never worked?
 

From 1252a3707baece8ccfe02554a0fa973992801226 Mon Sep 17 00:00:00 2001
From: Ben Zhang <benzhangniu@gmail.com>
Date: Sat, 11 Mar 2017 12:37:05 -0500
Subject: [PATCH 2108/3449] closurecompiler: 20160208 -> 20170218

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 949008d990f8..86e04b491e57 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20160208";
+  version = "20170218";
 
   src = fetchurl {
     url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "19v9z8lfxfmhc4cl9fys7vnaslqiznjy1jpk5mcv468p7vysg46p";
+    sha256 = "06snabmpy07x4xm8d1xgq5dfzbjli10xkxk3nx9jms39zkj493cd";
   };
 
   phases = [ "installPhase" ];
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/share/java $out/bin
     tar -xzf $src
-    cp -r compiler.jar $out/share/java/
+    cp -r closure-compiler-v${version}.jar $out/share/java/
     echo "#!${bash}/bin/bash" > $out/bin/closure-compiler
-    echo "${jre}/bin/java -jar $out/share/java/compiler.jar \"\$@\"" >> $out/bin/closure-compiler
+    echo "${jre}/bin/java -jar $out/share/java/closure-compiler-v${version}.jar \"\$@\"" >> $out/bin/closure-compiler
     chmod +x $out/bin/closure-compiler
   '';
 

From 10a0f1c2afcaa593d2cc491cee8a7bc889903874 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 13:49:23 +0100
Subject: [PATCH 2109/3449] pythonPackages.trezor: 0.7.4 -> 0.7.12

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

diff --git a/pkgs/development/python-modules/trezor.nix b/pkgs/development/python-modules/trezor.nix
new file mode 100644
index 000000000000..36bf0c15de25
--- /dev/null
+++ b/pkgs/development/python-modules/trezor.nix
@@ -0,0 +1,26 @@
+{ lib, fetchurl, buildPythonPackage, protobuf3_0, hidapi, ecdsa, mnemonic }:
+
+buildPythonPackage rec {
+  pname = "trezor";
+  version = "0.7.12";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/t/${pname}/${name}.tar.gz";
+    sha256 = "0ryqdk13x60qq5s68i9dfc1na4dka66kdxqycxignzg9k9ykaa8g";
+  };
+
+  propagatedBuildInputs = [ protobuf3_0 hidapi ];
+
+  buildInputs = [ ecdsa mnemonic ];
+
+  # There are no actual tests: "ImportError: No module named tests"
+  doCheck = false;
+
+  meta = {
+    description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
+    homepage = https://github.com/trezor/python-trezor;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11ebfad988c2..13a749182e35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30799,29 +30799,7 @@ EOF
     };
   };
 
-  trezor = buildPythonPackage rec{
-    version = "0.7.4";
-    name = "trezor-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/trezor/${name}.tar.gz";
-      sha256 = "18nr76jkdg24sb3r8cfbiq12b95gnh0amc0r1wx9mmg3pwq6jx6y";
-    };
-
-    propagatedBuildInputs = with self; [ protobuf3_0 hidapi ];
-
-    buildInputs = with self; [ ecdsa mnemonic ];
-
-    # There are no actual tests: "ImportError: No module named tests"
-    doCheck = false;
-
-    meta = {
-      description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
-      homepage = https://github.com/trezor/python-trezor;
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ np ];
-    };
-  };
+  trezor = callPackage ../development/python-modules/trezor.nix { };
 
   keepkey = buildPythonPackage rec{
     version = "0.7.3";

From 9cc2083daca4e712f2e759afccd855894b8d1b53 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 13:52:18 +0100
Subject: [PATCH 2110/3449] pythonPackages.mnemonic: 0.12 -> 0.17

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

diff --git a/pkgs/development/python-modules/mnemonic.nix b/pkgs/development/python-modules/mnemonic.nix
new file mode 100644
index 000000000000..9f71fdb8e741
--- /dev/null
+++ b/pkgs/development/python-modules/mnemonic.nix
@@ -0,0 +1,21 @@
+{ lib, fetchurl, buildPythonPackage, pbkdf2 }:
+
+buildPythonPackage rec {
+  pname = "mnemonic";
+  version = "0.17";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://pypi/m/${pname}/${name}.tar.gz";
+    sha256 = "1hq6xb47jagfqf65iwcrh0065mj3521d2mxmahg7vfraihqyqdjn";
+  };
+
+  propagatedBuildInputs = [ pbkdf2 ];
+
+  meta = {
+    description = "Implementation of Bitcoin BIP-0039";
+    homepage = https://github.com/trezor/python-mnemonic;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 13a749182e35..e430099dace3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -30780,24 +30780,7 @@ EOF
     };
   };
 
-  mnemonic = buildPythonPackage rec{
-    version = "0.12";
-    name = "mnemonic-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mnemonic/${name}.tar.gz";
-      sha256 = "0j5jm4v54135qqw455fw4ix2mhxhzjqvxji9gqkpxagk31cvbnj4";
-    };
-
-    propagatedBuildInputs = with self; [ pbkdf2 ];
-
-    meta = {
-      description = "Implementation of Bitcoin BIP-0039";
-      homepage = https://github.com/trezor/python-mnemonic;
-      license = licenses.mit;
-      maintainers = with maintainers; [ np ];
-    };
-  };
+  mnemonic = callPackage ../development/python-modules/mnemonic.nix { };
 
   trezor = callPackage ../development/python-modules/trezor.nix { };
 

From 617d8af325bc427178f9022b57478eac9d726d52 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 14:00:41 +0100
Subject: [PATCH 2111/3449] pythonPackages.pyaes: init at 1.6.0

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

diff --git a/pkgs/development/python-modules/pyaes.nix b/pkgs/development/python-modules/pyaes.nix
new file mode 100644
index 000000000000..c2feb2e239c7
--- /dev/null
+++ b/pkgs/development/python-modules/pyaes.nix
@@ -0,0 +1,18 @@
+{ lib, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "pyaes";
+  version = "1.6.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bp9bjqy1n6ij1zb86wz9lqa1dhla8qr1d7w2kxyn7jbj56sbmcw";
+  };
+
+  meta = {
+    description = "Pure-Python AES";
+    license = lib.licenses.mit;
+    homepage = https://github.com/ricmoo/pyaes;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e430099dace3..9260b8e73faa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -289,6 +289,8 @@ in {
 
   plantuml = callPackage ../tools/misc/plantuml { };
 
+  pyaes = callPackage ../development/python-modules/pyaes.nix { };
+
   pyatspi = if isPy3k then callPackage ../development/python-modules/pyatspi { } else throw "pyatspi not supported for interpreter ${python.executable}";
 
   pycairo = callPackage ../development/python-modules/pycairo { };

From d575efc5f05080834019ce0abebde4f47b1657cf Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 11 Mar 2017 14:00:59 +0100
Subject: [PATCH 2112/3449] electrum: 2.7.18 -> 2.8.1

See https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES

Also
- patch .desktop file to include full path to electrum
- add dep on pysocks
- remove dep on pyasn; per the changelog, it has not been used since v2.1
- replace dep on slowaes with pyaes
---
 pkgs/applications/misc/electrum/default.nix | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 28b5f02e813a..0fde5c8644eb 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.7.18";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "1l9krc7hqhqrm5bwp999bpykkcq4958qwvx8v0l5mxcxw8k7fkab";
+    sha256 = "1398s9d8j04is24il2xjb6xkj666pj21bsr90xglpsmfa1js9z7g";
   };
 
   propagatedBuildInputs = with python2Packages; [
@@ -15,22 +15,22 @@ python2Packages.buildPythonApplication rec {
     jsonrpclib
     pbkdf2
     protobuf3_0
-    pyasn1
-    pyasn1-modules
+    pyaes
     pycrypto
     pyqt4
+    pysocks
     qrcode
     requests
-    slowaes
     tlslite
 
     # plugins
-    trezor
     keepkey
+    trezor
+
     # TODO plugins
-    # matplotlib
-    # btchip
     # amodem
+    # btchip
+    # matplotlib
   ];
 
   preBuild = ''
@@ -43,8 +43,11 @@ python2Packages.buildPythonApplication rec {
   postInstall = ''
     # Despite setting usr_share above, these files are installed under
     # $out/nix ...
-    mv $out/lib/python2.7/site-packages/nix/store/*/share $out
+    mv $out/lib/python2.7/site-packages/nix/store"/"*/share $out
     rm -rf $out/lib/python2.7/site-packages/nix
+
+    substituteInPlace $out/share/applications/electrum.desktop \
+      --replace "Exec=electrum %u" "Exec=$out/bin/electrum %u"
   '';
 
   doInstallCheck = true;

From bd4285a4cb36c364487c506a23db0f5fd06819bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 11 Mar 2017 19:41:18 +0100
Subject: [PATCH 2113/3449] Remove Dockerfile

One can generate a new layer with nix-channel --update
from https://hub.docker.com/r/nixos/nix/

This file wasn't maintained.
---
 maintainers/docker/.dockerignore | 14 --------------
 maintainers/docker/Dockerfile    | 12 ------------
 2 files changed, 26 deletions(-)
 delete mode 100644 maintainers/docker/.dockerignore
 delete mode 100644 maintainers/docker/Dockerfile

diff --git a/maintainers/docker/.dockerignore b/maintainers/docker/.dockerignore
deleted file mode 100644
index eb4668233e6a..000000000000
--- a/maintainers/docker/.dockerignore
+++ /dev/null
@@ -1,14 +0,0 @@
-*~
-,*
-.*.swp
-.*.swo
-result
-result-*
-/doc/NEWS.html
-/doc/NEWS.txt
-/doc/manual.html
-/doc/manual.pdf
-.version-suffix
-
-.DS_Store
-.git
diff --git a/maintainers/docker/Dockerfile b/maintainers/docker/Dockerfile
deleted file mode 100644
index f02a9d653fd5..000000000000
--- a/maintainers/docker/Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM busybox
-
-RUN dir=`mktemp -d` && trap 'rm -rf "$dir"' EXIT && \
-    wget -O- https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2  | bzcat | tar x -C $dir && \
-    mkdir -m 0755 /nix && USER=root sh $dir/*/install && \
-    echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile
-
-ADD . /root/nix/nixpkgs
-ONBUILD ENV NIX_PATH nixpkgs=/root/nix/nixpkgs:nixos=/root/nix/nixpkgs/nixos
-ONBUILD ENV PATH /root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin
-ONBUILD ENV ENV /etc/profile
-ENV ENV /etc/profile

From 2a9208cd2421674f04df6c283b4356dfbffb2b1a Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 11 Mar 2017 10:29:44 -0500
Subject: [PATCH 2114/3449] krfb: init at 16.12.2

---
 pkgs/applications/kde/default.nix |  1 +
 pkgs/applications/kde/krfb.nix    | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/kde/krfb.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index fff0df35d052..79536662a6b1 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -76,6 +76,7 @@ let
       kmix = callPackage ./kmix.nix {};
       kompare = callPackage ./kompare.nix {};
       konsole = callPackage ./konsole.nix {};
+      krfb = callPackage ./krfb.nix {};
       kwalletmanager = callPackage ./kwalletmanager.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
new file mode 100644
index 000000000000..ef5530be6fa6
--- /dev/null
+++ b/pkgs/applications/kde/krfb.nix
@@ -0,0 +1,22 @@
+{
+  kdeApp, lib, kdeWrapper,
+  extra-cmake-modules, kdoctools,
+  kdelibs4support, kdnssd, libvncserver, libXtst
+}:
+
+let
+  unwrapped =
+    kdeApp {
+      name = "krfb";
+      meta = {
+        license = with lib.licenses; [ gpl2 fdl12 ];
+        maintainers = with lib.maintainers; [ jerith666 ];
+      };
+      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+      propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
+    };
+in
+kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/krfb" ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 170fa60c27b2..54937c3287a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14101,7 +14101,7 @@ with pkgs;
 
   inherit (kdeApplications)
     akonadi ark dolphin ffmpegthumbs filelight gwenview kate
-    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole marble
+    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig konsole krfb marble
     okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };

From 7c980f5e9c2c9c6bc58a5bdbe4009458a38d9e84 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Thu, 2 Mar 2017 15:19:45 +0100
Subject: [PATCH 2115/3449] valgrind: enable darwin build

---
 .../tools/analysis/valgrind/default.nix       | 27 ++++++++++++--
 .../analysis/valgrind/valgrind-bzero.patch    | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++-
 3 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 2ecb5eaa1329..80e3fdfc8072 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, perl, gdb }:
+{ stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
   name = "valgrind-3.12.0";
@@ -14,11 +14,13 @@ stdenv.mkDerivation rec {
 
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
-  buildInputs = [ perl ] ++ stdenv.lib.optional (!stdenv.isDarwin) gdb;
+  buildInputs = [ perl gdb ]  ++ stdenv.lib.optionals (stdenv.isDarwin) [ bootstrap_cmds xnu ];
 
   enableParallelBuilding = true;
 
-  postPatch =
+  patches = stdenv.lib.optionals (stdenv.isDarwin) [ ./valgrind-bzero.patch ];
+
+  postPatch = stdenv.lib.optionalString (stdenv.isDarwin)
     # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
     ''
       echo "getting rid of the \`-arch' GCC option..."
@@ -27,6 +29,23 @@ stdenv.mkDerivation rec {
 
       sed -i coregrind/link_tool_exe_darwin.in \
           -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
+
+      echo "substitute hardcoded /usr/include/mach with ${xnu}/include/mach"
+      substituteInPlace coregrind/Makefile.in \
+         --replace /usr/include/mach ${xnu}/include/mach
+
+      echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
+      find -name "Makefile.in" | while read file; do
+         substituteInPlace "$file" \
+           --replace dsymutil ${llvm}/bin/llvm-dsymutil
+      done
+
+      substituteInPlace coregrind/m_debuginfo/readmacho.c \
+         --replace /usr/bin/dsymutil ${llvm}/bin/llvm-dsymutil
+
+      echo "substitute hardcoded /usr/bin/ld with ${cctools}/bin/ld"
+      substituteInPlace coregrind/link_tool_exe_darwin.in \
+        --replace /usr/bin/ld ${cctools}/bin/ld
     '';
 
   configureFlags =
@@ -58,6 +77,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch b/pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch
new file mode 100644
index 000000000000..f56a277ad717
--- /dev/null
+++ b/pkgs/development/tools/analysis/valgrind/valgrind-bzero.patch
@@ -0,0 +1,37 @@
+Index: coregrind/m_main.c
+===================================================================
+--- a/coregrind/m_main.c (revision 16102)
++++ b/coregrind/m_main.c (revision 16103)
+@@ -3489,6 +3489,10 @@
+     // skip check
+   return VG_(memset)(s,c,n);
+ }
++void __bzero(void* s, UWord n);
++void __bzero(void* s, UWord n) {
++    (void)VG_(memset)(s,0,n);
++}
+ void bzero(void *s, SizeT n);
+ void bzero(void *s, SizeT n) {
+     VG_(memset)(s,0,n);
+@@ -4058,20 +4062,7 @@
+ 
+ #endif
+ 
+-#if defined(VGO_darwin) && DARWIN_VERS == DARWIN_10_10
+ 
+-/* This might also be needed for > DARWIN_10_10, but I have no way
+-   to test for that.  Hence '==' rather than '>=' in the version
+-   test above. */
+-void __bzero ( void* s, UWord n );
+-void __bzero ( void* s, UWord n )
+-{
+-   (void) VG_(memset)( s, 0, n );
+-}
+-
+-#endif
+-
+-
+ /*--------------------------------------------------------------------*/
+ /*--- end                                                          ---*/
+ /*--------------------------------------------------------------------*/
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d98ce26aff46..dc3924c5829e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6862,7 +6862,10 @@ with pkgs;
 
   gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
 
-  valgrind = callPackage ../development/tools/analysis/valgrind { };
+  valgrind = callPackage ../development/tools/analysis/valgrind {
+    inherit (darwin) xnu bootstrap_cmds cctools;
+    llvm = llvm_39;
+   };
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 

From f474f82860d7ce780ccef9d1e91b0174f5c5d7e5 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 11 Mar 2017 16:23:00 -0500
Subject: [PATCH 2116/3449] ykpers: consolidate into yubikey-personalization

Looks like this accidentally got packaged twice.
---
 nixos/modules/system/boot/luksroot.nix        |  4 ++--
 pkgs/applications/misc/pwsafe/default.nix     |  6 ++---
 pkgs/applications/misc/ykpers/default.nix     | 24 -------------------
 .../misc/yubikey-personalization/default.nix  |  2 +-
 pkgs/top-level/all-packages.nix               |  2 --
 5 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 pkgs/applications/misc/ykpers/default.nix

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 1f412fe2d8f2..8978b73749b7 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -434,8 +434,8 @@ in
       chmod +x $out/bin/cryptsetup-askpass
 
       ${optionalString luks.yubikeySupport ''
-        copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp
-        copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
+        copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykchalresp
+        copy_bin_and_libs ${pkgs.yubikey-personalization}/bin/ykinfo
         copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl
 
         cc -O3 -I${pkgs.openssl.dev}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index f65435ba7b23..0ea530b6bf1c 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, wxGTK, libuuid, xercesc, zip , libXt, libXtst
-, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, ykpers
+, libXi, xextproto, gettext, perl, pkgconfig, libyubikey, yubikey-personalization
 }:
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
   };
 
   makefile = "Makefile.linux";
-  makeFlags = "YBPERS_LIBPATH=${ykpers}/lib";
+  makeFlags = "YBPERS_LIBPATH=${yubikey-personalization}/lib";
 
   buildFlags = "unicoderelease";
   buildInputs = [ wxGTK libuuid gettext perl zip
                   xercesc libXt libXtst libXi xextproto
-                  pkgconfig libyubikey ykpers ];
+                  pkgconfig libyubikey yubikey-personalization ];
 
   postPatch = ''
     # Fix perl scripts used during the build.
diff --git a/pkgs/applications/misc/ykpers/default.nix b/pkgs/applications/misc/ykpers/default.nix
deleted file mode 100644
index 0fa9b5f66b26..000000000000
--- a/pkgs/applications/misc/ykpers/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libusb1, libyubikey}:
-
-stdenv.mkDerivation rec
-{
-  version = "1.17.2";
-  name = "ykpers-${version}";
-
-  src = fetchurl
-  {
-    url = "http://opensource.yubico.com/yubikey-personalization/releases/${name}.tar.gz";
-    sha256 = "1z6ybpdhl74phwzg2lhxhipqf7xnfhg52dykkzb3fbx21m0i4jkh";
-  };
-
-  buildInputs = [pkgconfig libusb1 libyubikey];
-
-  meta =
-  {
-    homepage = "http://opensource.yubico.com/yubikey-personalization/";
-    description = "YubiKey Personalization cross-platform library and tool";
-    license = "bsd";
-    maintainers = [ stdenv.lib.maintainers.calrama ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 71c9a113298f..36dd8339f26e 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = "A library and command line tool to personalize YubiKeys";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ wkennington calrama ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc3924c5829e..b846409edfef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16181,8 +16181,6 @@ with pkgs;
 
   inherit (gnome3) yelp;
 
-  ykpers = callPackage ../applications/misc/ykpers {};
-
   yoshimi = callPackage ../applications/audio/yoshimi { };
 
   inherit (python3Packages) you-get;

From 8cc10357ce3cef5e7dc18bb53cc4f02a16bb131e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 11 Mar 2017 21:56:44 +0000
Subject: [PATCH 2117/3449] kcachegrind: init at 16.2.2

---
 pkgs/applications/kde/default.nix     |  1 +
 pkgs/applications/kde/kcachegrind.nix | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/kde/kcachegrind.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index fff0df35d052..46aa6473f0c8 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -62,6 +62,7 @@ let
       kate = callPackage ./kate.nix {};
       kdenlive = callPackage ./kdenlive.nix {};
       kcalc = callPackage ./kcalc.nix {};
+      kcachegrind = callPackage ./kcachegrind.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
       kcontacts = callPackage ./kcontacts.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
new file mode 100644
index 000000000000..2f270d24224f
--- /dev/null
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -0,0 +1,27 @@
+{
+  kdeApp, lib, kdeWrapper,
+  cmake, automoc4,
+  kdelibs, perl, python, php
+}:
+
+kdeWrapper {
+  unwrapped = kdeApp {
+    name = "kcachegrind";
+    meta = {
+      license = with lib.licenses; [ gpl2 ];
+      maintainers = with lib.maintainers; [ orivej ];
+    };
+    nativeBuildInputs = [ cmake automoc4 ];
+    buildInputs = [ kdelibs perl python php ];
+    enableParallelBuilding = true;
+  };
+
+  targets = [
+    "bin/kcachegrind"
+    "bin/dprof2calltree"    # perl
+    "bin/hotshot2calltree"  # python
+    "bin/memprof2calltree"  # perl
+    "bin/op2calltree"       # perl
+    "bin/pprof2calltree"    # php
+  ];
+}

From e24261ed16e5ffbbb5737947180b3830ae368476 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 11 Mar 2017 16:25:48 -0600
Subject: [PATCH 2118/3449] qtbase: fix sed syntax in .pc file fixup

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 7 +++++--
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.7/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 87fb3f08e2b9..c4e7689efa29 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -269,9 +269,12 @@ stdenv.mkDerivation {
               done
           popd
       fi
+    ''
 
-      # fixup .pc file (where to find 'moc' etc.)
-      sed "s|^host_bins=.*|host_bins=$dev/bin|" -i "$dev/lib/pkgconfig/Qt5Core.pc"
+    # 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;
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 7a80d63356a7..60a3896abafb 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -272,7 +272,7 @@ stdenv.mkDerivation {
     # fixup .pc file (where to find 'moc' etc.)
     + lib.optionalString (!stdenv.isDarwin) ''
       sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-          "s|^host_bins=.*|host_bins=$dev/bin|"
+          -e "/^host_bins=/ c host_bins=$dev/bin"
     ''
 
     # Don't move .prl files on darwin because they end up in
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 8829b33acf61..73df6726f4a7 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -233,7 +233,7 @@ stdenv.mkDerivation {
     # fixup .pc file (where to find 'moc' etc.)
     + lib.optionalString (!stdenv.isDarwin) ''
       sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-          "s|^host_bins=.*|host_bins=$dev/bin|"
+          -e "/^host_bins=/ c host_bins=$dev/bin"
     ''
 
     # Don't move .prl files on darwin because they end up in
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 e6d8b5ffeea6..a48c5dbb07a9 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -230,7 +230,7 @@ stdenv.mkDerivation {
     # fixup .pc file (where to find 'moc' etc.)
     + lib.optionalString (!stdenv.isDarwin) ''
       sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \
-          "s|^host_bins=.*|host_bins=$dev/bin|"
+          -e "/^host_bins=/ c host_bins=$dev/bin"
     ''
 
     # Don't move .prl files on darwin because they end up in

From d9123a2329f0d35af45d25aab5adb4348b8e3d56 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 11 Mar 2017 17:39:40 -0500
Subject: [PATCH 2119/3449] lib: fix mixed tab/space indents, trailing
 whitespace, etc

Nix style seems to have settled on not using spaces between bound
variable names and the lambda : so I also tried to make those somewhat
more consistent throughout.
---
 lib/composable-derivation.nix |   6 +-
 lib/debug.nix                 |  14 +--
 lib/deprecated.nix            | 179 +++++++++++++++++-----------------
 lib/modules.nix               |   8 +-
 lib/tests.nix                 |   8 +-
 lib/types.nix                 |   2 +-
 6 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/lib/composable-derivation.nix b/lib/composable-derivation.nix
index e3e017d982d3..5442dcedeabc 100644
--- a/lib/composable-derivation.nix
+++ b/lib/composable-derivation.nix
@@ -1,4 +1,4 @@
-{lib, pkgs} :
+{lib, pkgs}:
 let inherit (lib) nv nvs; in
 {
 
@@ -19,7 +19,7 @@ let inherit (lib) nv nvs; in
   # * vim_configurable
   #
   # A minimal example illustrating most features would look like this:
-  # let base = composableDerivation { (fixed : let inherit (fixed.fixed) name in {
+  # let base = composableDerivation { (fixed: let inherit (fixed.fixed) name in {
   #    src = fetchurl {
   #    }
   #    buildInputs = [A];
@@ -79,7 +79,7 @@ let inherit (lib) nv nvs; in
         # consider adding addtional elements by derivation.merge { removeAttrs = ["elem"]; };
         removeAttrs ? ["cfg" "flags"]
 
-      }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a) 
+      }: (lib.defaultOverridableDelayableArgs ( a: mkDerivation a)
          {
            inherit applyPreTidy removeAttrs;
          }).merge;
diff --git a/lib/debug.nix b/lib/debug.nix
index e2e895ab6202..5b3878554c5d 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -24,10 +24,10 @@ rec {
   traceValSeq = v: traceVal (builtins.deepSeq v v);
 
   # this can help debug your code as well - designed to not produce thousands of lines
-  traceShowVal = x : trace (showVal x) x;
+  traceShowVal = x: trace (showVal x) x;
   traceShowValMarked = str: x: trace (str + showVal x) x;
-  attrNamesToStr = a : lib.concatStringsSep "; " (map (x : "${x}=") (attrNames a));
-  showVal = x :
+  attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a));
+  showVal = x:
       if isAttrs x then
           if x ? outPath then "x is a derivation, name ${if x ? name then x.name else "<no name>"}, { ${attrNamesToStr x} }"
           else "x is attr set { ${attrNamesToStr x} }"
@@ -43,9 +43,9 @@ rec {
 
   # trace the arguments passed to function and its result
   # maybe rewrite these functions in a traceCallXml like style. Then one function is enough
-  traceCall  = n : f : a : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a));
-  traceCall2 = n : f : a : b : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b));
-  traceCall3 = n : f : a : b : c : let t = n2 : x : traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c));
+  traceCall  = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a));
+  traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b));
+  traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c));
 
   # FIXME: rename this?
   traceValIfNot = c: x:
@@ -71,7 +71,7 @@ rec {
 
   # create a test assuming that list elements are true
   # usage: { testX = allTrue [ true ]; }
-  testAllTrue = expr : { inherit expr; expected = map (x: true) expr; };
+  testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
 
   strict = v:
     trace "Warning: strict is deprecated and will be removed in the next release"
diff --git a/lib/deprecated.nix b/lib/deprecated.nix
index 3729197f48bc..45a3893fc22d 100644
--- a/lib/deprecated.nix
+++ b/lib/deprecated.nix
@@ -16,23 +16,23 @@ rec {
 
   defaultMergeArg = x : y: if builtins.isAttrs y then
     y
-  else 
+  else
     (y x);
   defaultMerge = x: y: x // (defaultMergeArg x y);
-  foldArgs = merger: f: init: x: 
-    let arg=(merger init (defaultMergeArg init x));
-      # now add the function with composed args already applied to the final attrs
-        base = (setAttrMerge "passthru" {} (f arg) 
-                        ( z : z // rec { 
-                          function = foldArgs merger f arg; 
-			  args = (lib.attrByPath ["passthru" "args"] {} z) // x;
+  foldArgs = merger: f: init: x:
+    let arg = (merger init (defaultMergeArg init x));
+        # now add the function with composed args already applied to the final attrs
+        base = (setAttrMerge "passthru" {} (f arg)
+                        ( z: z // rec {
+                            function = foldArgs merger f arg;
+                            args = (lib.attrByPath ["passthru" "args"] {} z) // x;
                           } ));
-	withStdOverrides = base // {
-	   override = base.passthru.function;
-	   } ;
+        withStdOverrides = base // {
+          override = base.passthru.function;
+        };
         in
-	withStdOverrides;
-    
+          withStdOverrides;
+
 
   # predecessors: proposed replacement for applyAndFun (which has a bug cause it merges twice)
   # the naming "overridableDelayableArgs" tries to express that you can
@@ -49,35 +49,35 @@ rec {
   #
   # examples: see test cases "res" below;
   overridableDelayableArgs =
-          f :        # the function applied to the arguments
-          initial :  # you pass attrs, the functions below are passing a function taking the fix argument
+          f:        # the function applied to the arguments
+          initial:  # you pass attrs, the functions below are passing a function taking the fix argument
     let
         takeFixed = if isFunction initial then initial else (fixed : initial); # transform initial to an expression always taking the fixed argument
-        tidy = args : 
+        tidy = args:
             let # apply all functions given in "applyPreTidy" in sequence
-                applyPreTidyFun = fold ( n : a : x : n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args);
+                applyPreTidyFun = fold ( n: a: x: n ( a x ) ) lib.id (maybeAttr "applyPreTidy" [] args);
             in removeAttrs (applyPreTidyFun args) ( ["applyPreTidy"] ++ (maybeAttr  "removeAttrs" [] args) ); # tidy up args before applying them
-        fun = n : x :
-             let newArgs = fixed :
-                     let args = takeFixed fixed; 
-                         mergeFun = args.${n};
-                     in if isAttrs x then (mergeFun args x)
-                        else assert isFunction x;
-                             mergeFun args (x ( args // { inherit fixed; }));
-             in overridableDelayableArgs f newArgs;
+        fun = n: x:
+            let newArgs = fixed:
+                    let args = takeFixed fixed;
+                        mergeFun = args.${n};
+                    in if isAttrs x then (mergeFun args x)
+                       else assert isFunction x;
+                            mergeFun args (x ( args // { inherit fixed; }));
+            in overridableDelayableArgs f newArgs;
     in
     (f (tidy (lib.fix takeFixed))) // {
       merge   = fun "mergeFun";
       replace = fun "keepFun";
     };
-  defaultOverridableDelayableArgs = f : 
+  defaultOverridableDelayableArgs = f:
       let defaults = {
             mergeFun = mergeAttrByFunc; # default merge function. merge strategie (concatenate lists, strings) is given by mergeAttrBy
-            keepFun = a : b : { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values
+            keepFun = a: b: { inherit (a) removeAttrs mergeFun keepFun mergeAttrBy; } // b; # even when using replace preserve these values
             applyPreTidy = []; # list of functions applied to args before args are tidied up (usage case : prepareDerivationArgs)
             mergeAttrBy = mergeAttrBy // {
-              applyPreTidy = a : b : a ++ b;
-              removeAttrs = a : b: a ++ b;
+              applyPreTidy = a: b: a ++ b;
+              removeAttrs = a: b: a ++ b;
             };
             removeAttrs = ["mergeFun" "keepFun" "mergeAttrBy" "removeAttrs" "fixed" ]; # before applying the arguments to the function make sure these names are gone
           };
@@ -86,7 +86,7 @@ rec {
 
 
   # rec { # an example of how composedArgsAndFun can be used
-  #  a  = composedArgsAndFun (x : x) { a = ["2"]; meta = { d = "bar";}; };
+  #  a  = composedArgsAndFun (x: x) { a = ["2"]; meta = { d = "bar";}; };
   #  # meta.d will be lost ! It's your task to preserve it (eg using a merge function)
   #  b  = a.passthru.function { a = [ "3" ]; meta = { d2 = "bar2";}; };
   #  # instead of passing/ overriding values you can use a merge function:
@@ -119,7 +119,7 @@ rec {
     else if val == true || val == false then false
     else null;
 
-    
+
   # Return true only if there is an attribute and it is true.
   checkFlag = attrSet: name:
         if name == "true" then true else
@@ -134,29 +134,29 @@ rec {
   ( attrByPath [name] (if checkFlag attrSet name then true else
         if argList == [] then null else
         let x = builtins.head argList; in
-                if (head x) == name then 
+                if (head x) == name then
                         (head (tail x))
-                else (getValue attrSet 
+                else (getValue attrSet
                         (tail argList) name)) attrSet );
 
-                        
+
   # Input : attrSet, [[name default] ...], [ [flagname reqs..] ... ]
   # Output : are reqs satisfied? It's asserted.
-  checkReqs = attrSet : argList : condList :
+  checkReqs = attrSet: argList: condList:
   (
-    fold lib.and true 
-      (map (x: let name = (head x) ; in
-        
-        ((checkFlag attrSet name) -> 
+    fold lib.and true
+      (map (x: let name = (head x); in
+
+        ((checkFlag attrSet name) ->
         (fold lib.and true
         (map (y: let val=(getValue attrSet argList y); in
-                (val!=null) && (val!=false)) 
-        (tail x))))) condList)) ;
-        
+                (val!=null) && (val!=false))
+        (tail x))))) condList));
+
 
   # This function has O(n^2) performance.
-  uniqList = {inputList, acc ? []} :
-    let go = xs : acc :
+  uniqList = { inputList, acc ? [] }:
+    let go = xs: acc:
              if xs == []
              then []
              else let x = head xs;
@@ -164,26 +164,26 @@ rec {
                   in y ++ go (tail xs) (y ++ acc);
     in go inputList acc;
 
-  uniqListExt = {inputList, outputList ? [],
-    getter ? (x : x), compare ? (x: y: x==y)}:
+  uniqListExt = { inputList,
+                  outputList ? [],
+                  getter ? (x: x),
+                  compare ? (x: y: x==y) }:
         if inputList == [] then outputList else
-        let x=head inputList; 
-        isX = y: (compare (getter y) (getter x));
-        newOutputList = outputList ++
-         (if any isX outputList then [] else [x]);
-        in uniqListExt {outputList=newOutputList; 
-                inputList = (tail inputList);
-                inherit getter compare;
-                };
+        let x = head inputList;
+            isX = y: (compare (getter y) (getter x));
+            newOutputList = outputList ++
+                (if any isX outputList then [] else [x]);
+        in uniqListExt { outputList = newOutputList;
+                         inputList = (tail inputList);
+                         inherit getter compare;
+                       };
 
-
-                
   condConcat = name: list: checker:
         if list == [] then name else
-        if checker (head list) then 
-                condConcat 
-                        (name + (head (tail list))) 
-                        (tail (tail list)) 
+        if checker (head list) then
+                condConcat
+                        (name + (head (tail list)))
+                        (tail (tail list))
                         checker
         else condConcat
                 name (tail (tail list)) checker;
@@ -202,12 +202,12 @@ rec {
     in
       work startSet [] [];
 
-  innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else 
+  innerModifySumArgs = f: x: a: b: if b == null then (f a b) // x else
         innerModifySumArgs f x (a // b);
   modifySumArgs = f: x: innerModifySumArgs f x {};
 
 
-  innerClosePropagation = acc : xs :
+  innerClosePropagation = acc: xs:
     if xs == []
     then acc
     else let y  = head xs;
@@ -227,31 +227,31 @@ rec {
   closePropagation = list: (uniqList {inputList = (innerClosePropagation [] list);});
 
   # calls a function (f attr value ) for each record item. returns a list
-  mapAttrsFlatten = f : r : map (attr: f attr r.${attr}) (attrNames r);
+  mapAttrsFlatten = f: r: map (attr: f attr r.${attr}) (attrNames r);
 
   # attribute set containing one attribute
-  nvs = name : value : listToAttrs [ (nameValuePair name value) ];
+  nvs = name: value: listToAttrs [ (nameValuePair name value) ];
   # adds / replaces an attribute of an attribute set
-  setAttr = set : name : v : set // (nvs name v);
+  setAttr = set: name: v: set // (nvs name v);
 
   # setAttrMerge (similar to mergeAttrsWithFunc but only merges the values of a particular name)
-  # setAttrMerge "a" [] { a = [2];} (x : x ++ [3]) -> { a = [2 3]; } 
-  # setAttrMerge "a" [] {         } (x : x ++ [3]) -> { a = [  3]; }
-  setAttrMerge = name : default : attrs : f :
+  # setAttrMerge "a" [] { a = [2];} (x: x ++ [3]) -> { a = [2 3]; }
+  # setAttrMerge "a" [] {         } (x: x ++ [3]) -> { a = [  3]; }
+  setAttrMerge = name: default: attrs: f:
     setAttr attrs name (f (maybeAttr name default attrs));
 
-  # Using f = a : b = b the result is similar to //
+  # Using f = a: b = b the result is similar to //
   # merge attributes with custom function handling the case that the attribute
   # exists in both sets
-  mergeAttrsWithFunc = f : set1 : set2 :
-    fold (n: set : if set ? ${n}
+  mergeAttrsWithFunc = f: set1: set2:
+    fold (n: set: if set ? ${n}
                         then setAttr set n (f set.${n} set2.${n})
                         else set )
            (set2 // set1) (attrNames set2);
 
   # merging two attribute set concatenating the values of same attribute names
   # eg { a = 7; } {  a = [ 2 3 ]; } becomes { a = [ 7 2 3 ]; }
-  mergeAttrsConcatenateValues = mergeAttrsWithFunc ( a : b : (toList a) ++ (toList b) );
+  mergeAttrsConcatenateValues = mergeAttrsWithFunc ( a: b: (toList a) ++ (toList b) );
 
   # merges attributes using //, if a name exisits in both attributes
   # an error will be triggered unless its listed in mergeLists
@@ -262,10 +262,10 @@ rec {
   # ! deprecated, use mergeAttrByFunc instead
   mergeAttrsNoOverride = { mergeLists ? ["buildInputs" "propagatedBuildInputs"],
                            overrideSnd ? [ "buildPhase" ]
-                         } : attrs1 : attrs2 :
-    fold (n: set : 
+                         }: attrs1: attrs2:
+    fold (n: set:
         setAttr set n ( if set ? ${n}
-            then # merge 
+            then # merge
               if elem n mergeLists # attribute contains list, merge them by concatenating
                 then attrs2.${n} ++ attrs1.${n}
               else if elem n overrideSnd
@@ -286,14 +286,14 @@ rec {
   # { mergeAttrsBy = [...]; buildInputs = [ a b c d ]; }
   # is used by prepareDerivationArgs, defaultOverridableDelayableArgs and can be used when composing using
   # foldArgs, composedArgsAndFun or applyAndFun. Example: composableDerivation in all-packages.nix
-  mergeAttrByFunc = x : y :
+  mergeAttrByFunc = x: y:
     let
-          mergeAttrBy2 = { mergeAttrBy=lib.mergeAttrs; }
+          mergeAttrBy2 = { mergeAttrBy = lib.mergeAttrs; }
                       // (maybeAttr "mergeAttrBy" {} x)
                       // (maybeAttr "mergeAttrBy" {} y); in
     fold lib.mergeAttrs {} [
       x y
-      (mapAttrs ( a : v : # merge special names using given functions
+      (mapAttrs ( a: v: # merge special names using given functions
           if x ? ${a}
              then if y ? ${a}
                then v x.${a} y.${a} # both have attr, use merge func
@@ -313,9 +313,9 @@ rec {
   #
   # This function is best explained by an example:
   #
-  #     {version ? "2.x"} :
+  #     {version ? "2.x"}:
   #
-  #     mkDerivation (mergeAttrsByVersion "package-name" version 
+  #     mkDerivation (mergeAttrsByVersion "package-name" version
   #       { # version specific settings
   #         "git" = { src = ..; preConfigre = "autogen.sh"; buildInputs = [automake autoconf libtool];  };
   #         "2.x" = { src = ..; };
@@ -346,21 +346,24 @@ rec {
   # See misc.nix -> versionedDerivation
   # discussion: nixpkgs: pull/310
   mergeAttrsByVersion = name: version: attrsByVersion: base:
-    mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; } base (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)];
+    mergeAttrsByFuncDefaultsClean [ { name = "${name}-${version}"; }
+                                    base
+                                    (maybeAttr version (throw "bad version ${version} for ${name}") attrsByVersion)
+                                  ];
 
   # sane defaults (same name as attr name so that inherit can be used)
   mergeAttrBy = # { buildInputs = concatList; [...]; passthru = mergeAttr; [..]; }
-    listToAttrs (map (n : nameValuePair n lib.concat)
+    listToAttrs (map (n: nameValuePair n lib.concat)
       [ "nativeBuildInputs" "buildInputs" "propagatedBuildInputs" "configureFlags" "prePhases" "postAll" "patches" ])
-    // listToAttrs (map (n : nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ])
-    // listToAttrs (map (n : nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ])
+    // listToAttrs (map (n: nameValuePair n lib.mergeAttrs) [ "passthru" "meta" "cfg" "flags" ])
+    // listToAttrs (map (n: nameValuePair n (a: b: "${a}\n${b}") ) [ "preConfigure" "postInstall" ])
   ;
 
   # prepareDerivationArgs tries to make writing configurable derivations easier
   # example:
   #  prepareDerivationArgs {
   #    mergeAttrBy = {
-  #       myScript = x : y : x ++ "\n" ++ y;
+  #       myScript = x: y: x ++ "\n" ++ y;
   #    };
   #    cfg = {
   #      readlineSupport = true;
@@ -392,10 +395,10 @@ rec {
   # TODO use args.mergeFun here as well?
   prepareDerivationArgs = args:
     let args2 = { cfg = {}; flags = {}; } // args;
-        flagName = name : "${name}Support";
-        cfgWithDefaults = (listToAttrs (map (n : nameValuePair (flagName n) false) (attrNames args2.flags)))
+        flagName = name: "${name}Support";
+        cfgWithDefaults = (listToAttrs (map (n: nameValuePair (flagName n) false) (attrNames args2.flags)))
                           // args2.cfg;
-        opts = attrValues (mapAttrs (a : v :
+        opts = attrValues (mapAttrs (a: v:
                 let v2 = if v ? set || v ? unset then v else { set = v; };
                     n = if cfgWithDefaults.${flagName a} then "set" else "unset";
                     attr = maybeAttr n {} v2; in
diff --git a/lib/modules.nix b/lib/modules.nix
index a7c397d2cf43..862488310d81 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -114,7 +114,7 @@ rec {
   /* Massage a module into canonical form, that is, a set consisting
      of ‘options’, ‘config’ and ‘imports’ attributes. */
   unifyModuleSyntax = file: key: m:
-    let metaSet = if m ? meta 
+    let metaSet = if m ? meta
       then { meta = m.meta; }
       else {};
     in
@@ -595,7 +595,7 @@ rec {
        functionality
 
      This show a warning if any a.b.c or d.e.f is set, and set the value of
-     x.y.z to the result of the merge function 
+     x.y.z to the result of the merge function
   */
   mkMergedOptionModule = from: to: mergeFn:
     { config, options, ... }:
@@ -611,12 +611,12 @@ rec {
           let val = getAttrFromPath f config;
               opt = getAttrFromPath f options;
           in
-          optionalString 
+          optionalString
             (val != "_mkMergedOptionModule")
             "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly."
         ) from);
       } // setAttrByPath to (mkMerge
-             (optional 
+             (optional
                (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from)
                (mergeFn config)));
     };
diff --git a/lib/tests.nix b/lib/tests.nix
index d33e3a824e34..251282d29904 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -80,7 +80,7 @@ runTests {
                      y = x.merge {};
                 in (y.merge) { a = 10; };
 
-          resRem7 = res6.replace (a : removeAttrs a ["a"]);
+          resRem7 = res6.replace (a: removeAttrs a ["a"]);
 
           resReplace6 = let x = defaultOverridableDelayableArgs id { a = 7; mergeAttrBy = { a = add; }; };
                             x2 = x.merge { a = 20; }; # now we have 27
@@ -88,10 +88,10 @@ runTests {
 
           # fixed tests (delayed args): (when using them add some comments, please)
           resFixed1 =
-                let x = defaultOverridableDelayableArgs id ( x : { a = 7; c = x.fixed.b; });
-                    y = x.merge (x : { name = "name-${builtins.toString x.fixed.c}"; });
+                let x = defaultOverridableDelayableArgs id ( x: { a = 7; c = x.fixed.b; });
+                    y = x.merge (x: { name = "name-${builtins.toString x.fixed.c}"; });
                 in (y.merge) { b = 10; };
-          strip = attrs : removeAttrs attrs ["merge" "replace"];
+          strip = attrs: removeAttrs attrs ["merge" "replace"];
       in all id
         [ ((strip res1) == { })
           ((strip res2) == { a = 7; })
diff --git a/lib/types.nix b/lib/types.nix
index 0d1a88a00f2d..175cb7472bf6 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -81,7 +81,7 @@ rec {
       #   name: name of the type
       #   type: type function.
       #   wrapped: the type wrapped in case of compound types.
-      #   payload: values of the type, two payloads of the same type must be 
+      #   payload: values of the type, two payloads of the same type must be
       #            combinable with the binOp binary operation.
       #   binOp: binary operation that merge two payloads of the same type.
       functor ? defaultFunctor name

From e0988990232c5f437876f05434e1603b537f865b Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 18:36:11 -0600
Subject: [PATCH 2120/3449] cdk:5.0-20160131 -> 5.0-20161210

---
 pkgs/development/libraries/cdk/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 614d57002cd2..a97ca5cc6980 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, ncurses }:
 
-let
-  version = "5.0-20160131";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "cdk-${version}";
-  inherit version;
+  version ="5.0-20161210";
 
   buildInputs = [
     ncurses
@@ -13,13 +10,13 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz";
-    sha256 = "08ic2f5rmi8niaxwxwr6l6lhpan7690x52vpldnbjcf20rc0fbf3";
+    sha256 = "1bazwcwz4qhxyc8jaahdd2nlm30f5dhy0f6cnix5rjjhi35mhxcy";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Curses development kit";
-    license = stdenv.lib.licenses.bsdOriginal ;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsdOriginal ;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
   };
 }

From a50e64a60cbc3de7f2db7a8724ae5299cae49ce8 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 19:10:06 -0600
Subject: [PATCH 2121/3449] ceres-solver: 1.10.0 -> 1.12.0

---
 .../libraries/ceres-solver/default.nix           | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix
index 7cd848e602aa..673fb77f01aa 100644
--- a/pkgs/development/libraries/ceres-solver/default.nix
+++ b/pkgs/development/libraries/ceres-solver/default.nix
@@ -10,18 +10,17 @@
 # google-gflags is required to run tests
 assert runTests -> google-gflags != null;
 
-let
-  version = "1.10.0";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ceres-solver-${version}";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "http://ceres-solver.org/ceres-solver-${version}.tar.gz";
-    sha256 = "20bb5db05c3e3e14a4062e2cf2b0742d2653359549ecded3e0653104ef3deb17";
+    sha256 = "15f8mwhcy9f5qggcc9dqwl5y687ykvmlidr686aqdq0ia7azwnvl";
   };
 
-  buildInputs = [ cmake glog ]
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ glog ]
     ++ stdenv.lib.optional (google-gflags != null) google-gflags;
 
   inherit eigen;
@@ -38,8 +37,7 @@ stdenv.mkDerivation {
     description = "C++ library for modeling and solving large, complicated optimization problems";
     license = licenses.bsd3;
     homepage = "http://ceres-solver.org";
-    maintainers = with stdenv.lib.maintainers; [ giogadi ];
-    inherit version;
-    platforms = with stdenv.lib.platforms; unix;
+    maintainers = with maintainers; [ giogadi ];
+    platforms = platforms.unix;
   };
 }

From 2188e0f61fa7bede37c372fd7d3ddab7cd807ac9 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Sun, 12 Mar 2017 12:22:52 +1100
Subject: [PATCH 2122/3449] pure: 0.64 -> 0.66

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

diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix
index c471a3cdc0fb..133329f4f203 100644
--- a/pkgs/development/interpreters/pure/default.nix
+++ b/pkgs/development/interpreters/pure/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   baseName="pure";
   project="pure-lang";
-  version="0.64";
+  version="0.66";
   name="${baseName}-${version}";
   extension="tar.gz";
 
   src = fetchurl {
     url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}";
-    sha256="01vvix302gh5vsmnjf2g0rrif3hl1yik4izsx1wrvv1a6hlm5mgg";
+    sha256="42df6832476e8bee3a7ca179671284c1edd7bc82b71062fa0de62fd2117ee676";
   };
 
   buildInputs = [ bison flex makeWrapper ];

From 5d025f573114561650bd469d8fb7c3b47e80c4ae Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 19:58:16 -0600
Subject: [PATCH 2123/3449] chipmunk:7.0.0 -> 7.0.1

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

diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index 52990097a230..2c50d8138057 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -5,15 +5,16 @@
 stdenv.mkDerivation rec {
   name = "chipmunk-${version}";
   majorVersion = "7";
-  version = "${majorVersion}.0.0";
+  version = "${majorVersion}.0.1";
 
   src = fetchurl {
     url = "https://chipmunk-physics.net/release/Chipmunk-${majorVersion}.x/Chipmunk-${version}.tgz";
-    sha256 = "1kaii8wgvp0kgn2p22jm9smyqlws4p5dg8j23jaiasx9jq1kiaql";
+    sha256 = "0q4jwv1icz8spcjkp0v3bnygi6hq2zmnsgcxkwm8i2bxfxjb8m7y";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs =
-    [ cmake freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ];
+    [ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ];
 
   postInstall = ''
     mkdir -p $out/bin

From ef741de5b1b125a5e22700b91ed0907e0f1500ab Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 20:59:11 -0600
Subject: [PATCH 2124/3449] cl:1.2.1 -> 1.2.3

---
 pkgs/development/libraries/cl/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix
index 1fa45992aeee..b26327dd7754 100644
--- a/pkgs/development/libraries/cl/default.nix
+++ b/pkgs/development/libraries/cl/default.nix
@@ -1,19 +1,19 @@
-{stdenv, fetchurl, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }:
+{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.1";
+  version = "1.2.3";
   name = "cl-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/tonyrog/cl/archive/${name}.tar.gz";
-    sha256 = "03jv280h9gqqqkm0mmkjr53srd2mzhvyy1biss77wpjrzq2z12c8";
+  src = fetchFromGitHub {
+    owner = "tonyrog";
+    repo = "cl";
+    rev = "cl-${version}";
+    sha256 = "1dk0k03z0ipxvrnn0kihph135hriw96jpnd31lbq44k6ckh6bm03";
   };
 
   buildInputs = [ erlang rebar opencl-headers ocl-icd ];
-  #propagatedBuildInputs = [ SDL mesa ];
-
+  
   buildPhase = ''
-    sed 's/git/"${version}"/' -i src/cl.app.src
     rebar compile
   '';
 
@@ -25,10 +25,10 @@ stdenv.mkDerivation rec {
     cp -ruv c_src doc ebin include priv src $DIR
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/tonyrog/cl;
     description = "OpenCL binding for Erlang";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.mit;
+    platforms = platforms.linux;
   };
 }

From 5f03cf8f940f55e129be192220cd31d5222e9109 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 21:15:29 -0600
Subject: [PATCH 2125/3449] concurrencykit: 0.4.5 -> 0.6.0

---
 .../libraries/concurrencykit/default.nix      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix
index 3fad256e5728..29ce216cadf1 100644
--- a/pkgs/development/libraries/concurrencykit/default.nix
+++ b/pkgs/development/libraries/concurrencykit/default.nix
@@ -2,22 +2,23 @@
 
 stdenv.mkDerivation rec {
   name    = "concurrencykit-${version}";
-  version = "0.4.5";
+  version = "0.6.0";
 
   src = fetchurl {
     url    = "http://concurrencykit.org/releases/ck-${version}.tar.gz";
-    sha256 = "0mh3z8ibiwidc6qvrv8bx9slgcycxwy06kfngfzfza6nihrymzl9";
+    sha256 = "1pv21p7sjwwmbs2xblpy1lqk53r2i212yrqyjlr5dr3rlv87vqnp";
   };
+  
+  #Deleting this line causes "Unknown option --disable-static"
+  configurePhase = "./configure --prefix=$out";
 
   enableParallelBuilding = true;
 
-  configurePhase = "./configure --prefix=$out";
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library of safe, high-performance concurrent data structures";
-    homepage    = "http://concurrencykit.org";
-    license     = stdenv.lib.licenses.bsd2;
-    platforms   = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+    homepage    = http://concurrencykit.org;
+    license     = licenses.bsd2;
+    platforms   = platforms.unix;
+    maintainers = [ maintainers.thoughtpolice ];
   };
 }

From a7843b01f2caccb9d67614df2a6a1a3112c77869 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 20:45:24 -0600
Subject: [PATCH 2126/3449] chromaprint: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix
index 7c3c776e81b0..09c5eeb611ba 100644
--- a/pkgs/development/libraries/chromaprint/default.nix
+++ b/pkgs/development/libraries/chromaprint/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "chromaprint-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url = "http://bitbucket.org/acoustid/chromaprint/downloads/${name}.tar.gz";
-    sha256 = "10dm9cfqb77g12pyjnqaw80860kzdcvskni02ll7afpywq8s15cg";
+    sha256 = "0lln8dh33gslb9cbmd1hcv33pr6jxdwipd8m8gbsyhksiq6r1by3";
   };
 
   nativeBuildInputs = [ cmake ];

From e18d518d668ac98e9e216916da869f6aba1e0e06 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 12 Mar 2017 14:40:26 +0800
Subject: [PATCH 2127/3449] heroku-cli: 5.6.14 -> 5.6.32

---
 pkgs/development/tools/heroku/default.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix
index f9c43ee841ba..6334bb2e5ddf 100644
--- a/pkgs/development/tools/heroku/default.nix
+++ b/pkgs/development/tools/heroku/default.nix
@@ -6,7 +6,7 @@ with stdenv.lib;
 let
   cli = buildGoPackage rec {
     name = "cli-${version}";
-    version = "5.6.14";
+    version = "5.6.32";
 
     goPackagePath = "github.com/heroku/cli";
 
@@ -14,8 +14,21 @@ let
       owner  = "heroku";
       repo   = "cli";
       rev    = "v${version}";
-      sha256 = "11jccham1vkmh5284l6i30na4a4y7b1jhi2ci2z2wwx8m3gkypq9";
+      sha256 = "062aa79mv2njjb0ix7isbz6646wxmsldv27bsz5v2pbv597km0vz";
     };
+
+    buildFlagsArray = ''
+      -ldflags=
+        -X=main.Version=${version}
+        -X=main.Channel=stable
+        -X=main.Autoupdate=no
+    '';
+
+    preCheck = ''
+      export HOME=/tmp
+    '';
+
+    doCheck = true;
   };
 
 in stdenv.mkDerivation rec {

From c9d8ae084d9340f9f7dddd3267e1f7ad72f70502 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 12 Mar 2017 07:29:54 +0000
Subject: [PATCH 2128/3449] ocamlPackages.ocaml-migrate-parsetree: init at 0.5

This library converts parsetrees, outcometree and ast mappers
between different OCaml versions. High-level functions help making
PPX rewriters independent of a compiler version.

Homepage: https://github.com/let-def/ocaml-migrate-parsetree
---
 .../ocaml-migrate-parsetree/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
new file mode 100644
index 000000000000..3694dd2d6abc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, jbuilder, result }:
+
+stdenv.mkDerivation rec {
+   name = "ocaml${ocaml.version}-ocaml-migrate-parsetree-${version}";
+   version = "0.5";
+
+   src = fetchFromGitHub {
+     owner = "let-def";
+     repo = "ocaml-migrate-parsetree";
+     rev = "v${version}";
+     sha256 = "023lnd3kxa3d4zgsvv0z2lyzhg05zcgagy18vaalimbza57wq83h";
+   };
+
+   buildInputs = [ ocaml findlib ocamlbuild jbuilder ];
+   propagatedBuildInputs = [ result ];
+
+   installPhase = ''
+     for p in *.install
+     do
+       ${jbuilder.installPhase} $p
+     done
+   '';
+
+   meta = {
+     description = "Convert OCaml parsetrees between different major versions";
+     license = stdenv.lib.licenses.lgpl21;
+     maintainers = [ stdenv.lib.maintainers.vbgl ];
+     inherit (src.meta) homepage;
+     inherit (ocaml.meta) platforms;
+   };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 1cc5de01e101..f3f535bb0857 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -336,6 +336,8 @@ let
 
     ocaml_lwt = callPackage ../development/ocaml-modules/lwt { };
 
+    ocaml-migrate-parsetree = callPackage ../development/ocaml-modules/ocaml-migrate-parsetree { };
+
     ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { };
 
     ocaml_mysql = callPackage ../development/ocaml-modules/mysql { };

From 1e68693cef9d2e588460d0695d69a2f81bee404b Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 20:50:59 -0600
Subject: [PATCH 2129/3449] cimg: 1.7.0 -> 1.7.9

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

diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 722852f12700..a9470ee3f41b 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -4,14 +4,14 @@
 stdenv.mkDerivation rec {
 
   name = "cimg-${version}";
-  version = "1.7.0";
+  version = "1.7.9";
 
   src = fetchurl {
     url = "http://cimg.eu/files/CImg_${version}.zip";
-    sha256 = "06j3n7gvgxzvprqwf56nnca195y38dcbdlszrxyn5p9w9al437zj";
+    sha256 = "07g81jn25y2wksg9ycf9a7f5bfpcdl3xbrkp1xy3czl043a00y7s";
   };
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];
 
   builder = ./builder.sh;
 

From 819b8c68de7376b8e08cdba1c1629a456a6b2d3a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 19:51:45 -0600
Subject: [PATCH 2130/3449] assimp: 3.2 -> 3.3.1

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

diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix
index 5fbc45a7c08b..e342d8ab6c09 100644
--- a/pkgs/development/libraries/assimp/default.nix
+++ b/pkgs/development/libraries/assimp/default.nix
@@ -1,19 +1,17 @@
 { stdenv, fetchFromGitHub, unzip, cmake, boost, zlib }:
 
-let
-  version = "3.2";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "assimp-${version}";
+  version = "3.3.1";
 
   src = fetchFromGitHub{
     owner = "assimp";
     repo = "assimp";
     rev = "v${version}";
-    sha256 = "09fsksbq9a8gykwmw6gaicwh2ladrln1jc1xc5yk7w6x180cbb1x";
+    sha256 = "13y44fymj13h6alig0nqab91j2qch0yh9gq8yql2zz744ch2s5vc";
   };
 
-  buildInputs = [ unzip cmake boost zlib ];
+  buildInputs = [ cmake boost zlib ];
 
   meta = with stdenv.lib; {
     description = "A library to import various 3D model formats";

From c52b7510b5efe30ed7a1fecba84214796ad966e0 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 1 Mar 2017 18:18:37 -0600
Subject: [PATCH 2131/3449] olsrd: 0.6.6.1 -> 0.9.6.1

---
 pkgs/tools/networking/olsrd/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix
index 90f686f77ea6..8fa30a5c2211 100644
--- a/pkgs/tools/networking/olsrd/default.nix
+++ b/pkgs/tools/networking/olsrd/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "olsrd-0.6.6.1";
+  name = "olsrd-${version}";
+  version = "0.9.6.1";
 
   src = fetchurl {
-    url = "http://www.olsr.org/releases/0.6/${name}.tar.bz2";
-    sha256 = "1fphbh9x724r83gxxrd13zv487s4svnr9jdy76h4f36xxb15pnp8";
+    url = "http://www.olsr.org/releases/0.9/${name}.tar.bz2";
+    sha256 = "9cac290e9bff5fc7422110b9ccd972853f10962c962d2f31a63de9c6d1520612";
   };
 
   buildInputs = [ bison flex ];

From f5a55163555b2520afafc5acb0174982905e7ed8 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sun, 12 Mar 2017 15:32:15 +0800
Subject: [PATCH 2132/3449] emem: 0.2.34 -> 0.2.35

---
 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 a30a58db4836..76f2f03d159f 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.34";
+  version = "0.2.35";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "19dslv632qyz3hcycx22w6x96nwph7cxl1yjprir2w2c692dq06x";
+    sha256 = "0y1jwfmqmmff3kh82j07p9j0l2hc7dxhy8vij4lz8wrv6pnxng7f";
   };
 
   buildInputs = [ ];

From a57d9e420cad0667451d2e3819bc1ca44eb533f7 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Sun, 12 Mar 2017 12:33:04 +0100
Subject: [PATCH 2133/3449] libzip: 1.1.2 -> 1.2.0

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

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index d1f2e633a0c5..9958a65d408b 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libzip-${version}";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "http://www.nih.at/libzip/${name}.tar.gz";
-    sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r";
+    sha256 = "17vxj2ffsxwh8lkc6801ppmwj15jp8q58rin76znxfbx88789ybc";
   };
 
   outputs = [ "out" "dev" ];

From 4904df80bb2d333a4a19ba5320a79c95570ace8a Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Sat, 11 Mar 2017 20:49:14 +0100
Subject: [PATCH 2134/3449] qt57.qtbase: enable darwin compatibility

---
 .../libraries/qt-5/5.7/default.nix            |   4 +-
 .../qt-5/5.7/qtbase/cmake-paths-darwin.patch  | 384 ++++++++++++++++++
 .../libraries/qt-5/5.7/qtbase/default.nix     | 127 ++++--
 .../libraries/qt-5/5.7/qtbase/series          |   1 -
 4 files changed, 479 insertions(+), 37 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch

diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index 85b38c6fc6ce..f468670674f0 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -107,12 +107,12 @@ let
       makeQtWrapper =
         makeSetupHook
         { deps = [ makeWrapper ]; }
-        ../make-qt-wrapper.sh;
+        (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.7/qtbase/cmake-paths-darwin.patch b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
new file mode 100644
index 000000000000..2fda5ed8cf0c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/cmake-paths-darwin.patch
@@ -0,0 +1,384 @@
+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/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 934203950b09..3c865c318b2e 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -4,6 +4,7 @@
 
   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,
@@ -15,7 +16,8 @@
   cups ? null, mysql ? null, postgresql ? null,
 
   # options
-  mesaSupported, mesa,
+  mesaSupported ? (!stdenv.isDarwin),
+  mesa,
   buildExamples ? false,
   buildTests ? false,
   developerBuild ? false,
@@ -35,6 +37,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.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
@@ -54,11 +57,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 +77,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 '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 = ''
@@ -103,7 +121,6 @@ stdenv.mkDerivation {
     ${lib.optionalString developerBuild "-developer-build"}
     -largefile
     -accessibility
-    -rpath
     -optimized-qmake
     -strip
     -no-reduce-relocations
@@ -117,15 +134,6 @@ stdenv.mkDerivation {
     -iconv
     -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
@@ -141,13 +149,8 @@ stdenv.mkDerivation {
     -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
@@ -158,7 +161,30 @@ stdenv.mkDerivation {
     -${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.
@@ -166,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 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
@@ -213,6 +251,11 @@ stdenv.mkDerivation {
     moveToOutput "share/doc" "$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.
   postFixup =
     ''
       # Don't retain build-time dependencies like gdb.
@@ -221,17 +264,33 @@ 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"
               done
           popd
       fi
+    '' + 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 = ../../qtbase-setup-hook.sh;
+  setupHook = if stdenv.isDarwin
+              then ../../qtbase-setup-hook-darwin.sh
+              else ../../qtbase-setup-hook.sh;
 
   enableParallelBuilding = true;
 
@@ -240,7 +299,7 @@ stdenv.mkDerivation {
     description = "A cross-platform application framework for C++";
     license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/series b/pkgs/development/libraries/qt-5/5.7/qtbase/series
index 44e2d9040807..2196d8383752 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.7/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 4ca17dd6c099792f64399b2e9bd5b173ecee762f Mon Sep 17 00:00:00 2001
From: zetok <zetok@users.noreply.github.com>
Date: Sun, 12 Mar 2017 14:05:14 +0000
Subject: [PATCH 2135/3449] gresecurity docs: fix incorrect option (#23789)

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

diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml
index 07a61919ab42..620e8f653f99 100644
--- a/nixos/modules/security/grsecurity.xml
+++ b/nixos/modules/security/grsecurity.xml
@@ -312,7 +312,7 @@
       Overflows in boot critical code (e.g., the root filesystem module) can
       render the system unbootable.  Work around by setting
       <programlisting>
-        boot.kernel.kernelParams = [ "pax_size_overflow_report_only" ];
+        boot.kernelParams = [ "pax_size_overflow_report_only" ];
       </programlisting>
     </para></listitem>
 

From 04fa8e006cf662a9cdefa52162e006304ad8877d Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 8 Feb 2017 21:16:01 +0100
Subject: [PATCH 2136/3449] darwin: add setup-hook to fix CF references

---
 .../setup-hooks/fix-darwin-frameworks.sh      | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh

diff --git a/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh
new file mode 100644
index 000000000000..e3a08b2598d9
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/fix-darwin-frameworks.sh
@@ -0,0 +1,31 @@
+# On Mac OS X, frameworks are linked to the system CoreFoundation but
+# dynamic libraries built with nix use a pure version of CF this
+# causes segfaults for binaries that depend on it at runtime.  This
+# can be solved in two ways.
+# 1. Rewrite references to the pure CF using this setup hook, this
+# works for the simple case but this can still cause problems if other
+# dependencies (eg. python) use the pure CF.
+# 2. Create a wrapper for the binary that sets DYLD_FRAMEWORK_PATH to
+# /System/Library/Frameworks.  This will make everything load the
+# system's CoreFoundation framework while still keeping the
+# dependencies pure for other packages.
+
+fixupOutputHooks+=('fixDarwinFrameworksIn $prefix')
+
+fixDarwinFrameworks() {
+    local systemPrefix='/System/Library/Frameworks'
+
+    for fn in "$@"; do
+        if [ -L "$fn" ]; then continue; fi
+        echo "$fn: fixing dylib"
+
+        for framework in $(otool -L "$fn" | awk '/CoreFoundation\.framework/ {print $1}'); do
+          install_name_tool -change "$framework" "$systemPrefix/CoreFoundation.framework/Versions/A/CoreFoundation" "$fn" >&2
+        done
+    done
+}
+
+fixDarwinFrameworksIn() {
+    local dir="$1"
+    fixDarwinFrameworks $(find "$dir" -name "*.dylib")
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc3924c5829e..f40f7d10577b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -305,6 +305,8 @@ with pkgs;
 
   fixDarwinDylibNames = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-dylib-names.sh;
 
+  fixDarwinFrameworks = makeSetupHook { } ../build-support/setup-hooks/fix-darwin-frameworks.sh;
+
   keepBuildTree = makeSetupHook { } ../build-support/setup-hooks/keep-build-tree.sh;
 
   enableGCOVInstrumentation = makeSetupHook { } ../build-support/setup-hooks/enable-coverage-instrumentation.sh;

From 97a3e7cf52068f9e48d3d811f97638c73a513d85 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 7 Mar 2017 22:10:07 +0100
Subject: [PATCH 2137/3449] darwin-frameworks: don't use pure CF

---
 pkgs/os-specific/darwin/apple-sdk/default.nix | 3 +++
 pkgs/top-level/all-packages.nix               | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 1148fe5c4a16..338e02b9df3d 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -119,6 +119,9 @@ let
 
     propagatedBuildInputs = deps;
 
+    # don't use pure CF for dylibs that depend on frameworks
+    setupHook = ../../../build-support/setup-hooks/fix-darwin-frameworks.sh;
+
     # allows building the symlink tree
     __impureHostDeps = [ "/System/Library/Frameworks/${name}.framework" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f40f7d10577b..45f2438c782c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8733,7 +8733,8 @@ with pkgs;
   libusb = callPackage ../development/libraries/libusb {};
 
   libusb1 = callPackage ../development/libraries/libusb1 {
-    inherit (darwin) libobjc IOKit;
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
   libusbmuxd = callPackage ../development/libraries/libusbmuxd { };

From 16023ef5984153febd0cca71e9848ebed6874799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Mar 2017 11:48:14 -0300
Subject: [PATCH 2138/3449] enlightenment: 0.21.5 -> 0.21.7 (#23791)

---
 pkgs/desktops/enlightenment/enlightenment.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 3949bffaba17..23805b469ae1 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -4,11 +4,11 @@ mesa_glu , xkeyboard_config }:
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.21.5";
+  version = "0.21.7";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "1fslq70z4s6v9ipahnk8s5fgqnqq4njv4rlqv951r1bh1xk5lx7h";
+    sha256 = "1xvngjdsa0p901vfhrh2qpa50k32hwwhc8bgi16a9b5d9byzfhvn";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 196f64d6756b1aa1a3a74c2eea35dbe1d15504fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 12 Mar 2017 11:48:26 -0300
Subject: [PATCH 2139/3449] qbittorrent: 3.3.10 -> 3.3.11 (#23703)

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

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index cdafea3be79f..17548d824417 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.10";
+  version = "3.3.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "1lm8y5k9363gajbw0k9jb1cb7zg0lz5rw2ja0kd36h68rpm7qr9c";
+    sha256 = "0q57ahhlx7r5k1ji87gbp4rvjfvhirlmcx5nbwrfvqmxsigar4j8";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From 453529bd605a473b44802f8ac1df077ac98bf456 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sun, 5 Mar 2017 19:25:39 +0000
Subject: [PATCH 2140/3449] nodePackages: support github:owner/repo scheme for
 package deps

JS devs found a new way to be annoying - adjust code accordingly.

Have also put this change in PR svanderburg/node2nix#40
---
 pkgs/development/node-packages/node-env.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix
index bd1de3e9f93e..e8328252a117 100644
--- a/pkgs/development/node-packages/node-env.nix
+++ b/pkgs/development/node-packages/node-env.nix
@@ -73,7 +73,7 @@ let
               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:" ||
+              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

From 252e58a95e395d34a8d3925639ba565d0632eaf8 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sun, 5 Mar 2017 16:48:29 +0000
Subject: [PATCH 2141/3449] pump.io: 1.0.0 -> 3.0.0

The package stopped building for some unknown reason (npm could no
longer fetch a module).

This is one of the build failures listed in #23253.

    http://hydra.nixos.org/build/49551309
    http://hydra.nixos.org/build/49548753

Easiest fix is to upgrade to latest stable version and regenerate
packages with node2nix.

The databank-memcached dependency needed to be dropped due to
dependency failures.
---
 pkgs/servers/web-apps/pump.io/generate.sh     |   14 +-
 .../web-apps/pump.io/node-packages.nix        | 2087 ++++++++++-------
 2 files changed, 1239 insertions(+), 862 deletions(-)

diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh
index 51e05ce37d6b..6dc91c72c09e 100755
--- a/pkgs/servers/web-apps/pump.io/generate.sh
+++ b/pkgs/servers/web-apps/pump.io/generate.sh
@@ -15,15 +15,23 @@ set -e
 # Also jshon does funny things with slashes in strings, which can be
 # fixed with sed.
 
-curl https://raw.githubusercontent.com/e14n/pump.io/v1.0.0/package.json | \
+VERSION="3.0.0"
+URL="https://registry.npmjs.org/pump.io/-/pump.io-$VERSION.tgz"
+SHA1="ycfm7ak83xi8mgafhp9q0n6n3kzmdz16"
+
+curl https://raw.githubusercontent.com/e14n/pump.io/v$VERSION/package.json | \
     jshon -e dependencies              \
           -s '*' -i databank-mongodb   \
           -s '*' -i databank-redis     \
-          -s '*' -i databank-memcached \
           -s '*' -i databank-lrucache  \
           -p | sed 's=\\/=/=g' > full-package.json
 
 node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix
 
 # overriding nodePackages src doesn't seem to work, so...
-sed -i 's|src = ./.|src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }|' node-packages.nix
+sed -i "s|src = ./.|src = fetchurl { url = \"$URL\"; sha1 = \"$SHA1\"; }|" node-packages.nix
+
+# fetchgit or node2nix is having problems with submodules or something.
+# This is the sha256 for connect-auth which is a npm dep hosted on
+# github and containing submodules.
+sed -i "s|d08fecbb72aff14ecb39dc310e8965ba92228f0c0def41fbde3db5ea7a1aac19|1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b|" node-packages.nix
diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix
index ab3022b95123..a275ef4ca402 100644
--- a/pkgs/servers/web-apps/pump.io/node-packages.nix
+++ b/pkgs/servers/web-apps/pump.io/node-packages.nix
@@ -13,13 +13,22 @@ let
         sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093";
       };
     };
-    "bunyan-1.8.5" = {
+    "bunyan-1.8.8" = {
       name = "bunyan";
       packageName = "bunyan";
-      version = "1.8.5";
+      version = "1.8.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.5.tgz";
-        sha1 = "0d619e83005fb89070f5f47982fc1bf00600878a";
+        url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.8.tgz";
+        sha1 = "6549ed6db088e4d82b7be3bcc6d0697159f6e209";
+      };
+    };
+    "colors-1.1.2" = {
+      name = "colors";
+      packageName = "colors";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+        sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
     "connect-2.30.2" = {
@@ -31,13 +40,14 @@ let
         sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609";
       };
     };
-    "connect-auth-0.6.1" = {
+    "connect-auth-git://github.com/e14n/connect-auth" = {
       name = "connect-auth";
       packageName = "connect-auth";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-auth/-/connect-auth-0.6.1.tgz";
-        sha1 = "8d798153d6c8e78cb809de82a436f1de7c79868f";
+      version = "0.6.0";
+      src = fetchgit {
+        url = "git://github.com/e14n/connect-auth";
+        rev = "ae4e3c4c86a5d266be7bd91c2b99856f9a37b1ec";
+        sha256 = "1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b";
       };
     };
     "connect-databank-1.0.3" = {
@@ -49,6 +59,15 @@ let
         sha1 = "dad24f08dc385d9c3a94f1a52730aec0c7d13b02";
       };
     };
+    "connect-multiparty-2.0.0" = {
+      name = "connect-multiparty";
+      packageName = "connect-multiparty";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz";
+        sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab";
+      };
+    };
     "crypto-cacerts-0.1.0" = {
       name = "crypto-cacerts";
       packageName = "crypto-cacerts";
@@ -58,13 +77,13 @@ let
         sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41";
       };
     };
-    "databank-0.19.5" = {
+    "databank-0.19.8" = {
       name = "databank";
       packageName = "databank";
-      version = "0.19.5";
+      version = "0.19.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/databank/-/databank-0.19.5.tgz";
-        sha1 = "edcbd954b84730c0c5d0de551e004b92f1f53119";
+        url = "https://registry.npmjs.org/databank/-/databank-0.19.8.tgz";
+        sha1 = "bf73d6b4fc002045793faeff2b1c3fabc9999844";
       };
     };
     "dateformat-1.0.12" = {
@@ -85,13 +104,13 @@ let
         sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6";
       };
     };
-    "dompurify-0.8.4" = {
+    "dompurify-0.8.5" = {
       name = "dompurify";
       packageName = "dompurify";
-      version = "0.8.4";
+      version = "0.8.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.4.tgz";
-        sha1 = "93cabe8b6b84f3cf83f63b985ff71ef05f8cdeb6";
+        url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.5.tgz";
+        sha1 = "5bc591b61e222243cc827ca382d7a2e2660c1a44";
       };
     };
     "emailjs-1.0.8" = {
@@ -103,22 +122,22 @@ let
         sha1 = "d4240db7670dc78aff97352092d8460edc130f66";
       };
     };
-    "express-2.5.11" = {
+    "express-3.21.2" = {
       name = "express";
       packageName = "express";
-      version = "2.5.11";
+      version = "3.21.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz";
-        sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
+        url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz";
+        sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
       };
     };
-    "express-session-1.14.2" = {
+    "express-session-1.15.1" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.14.2";
+      version = "1.15.1";
       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.1.tgz";
+        sha1 = "9abba15971beea7ad98da5a4d25ed92ba4a2984e";
       };
     };
     "gm-1.23.0" = {
@@ -130,13 +149,22 @@ let
         sha1 = "80a2fe9cbf131515024846444658461269f52661";
       };
     };
-    "helmet-2.3.0" = {
+    "helmet-3.4.1" = {
       name = "helmet";
       packageName = "helmet";
-      version = "2.3.0";
+      version = "3.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/helmet/-/helmet-2.3.0.tgz";
-        sha1 = "d655c85b55b0a3bf722a4c2c66e48b78b4161b91";
+        url = "https://registry.npmjs.org/helmet/-/helmet-3.4.1.tgz";
+        sha1 = "27d37629227f25a110f2a128bfe1b1028648a397";
+      };
+    };
+    "jade-1.11.0" = {
+      name = "jade";
+      packageName = "jade";
+      version = "1.11.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz";
+        sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd";
       };
     };
     "jankyqueue-0.1.1" = {
@@ -157,6 +185,15 @@ let
         sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e";
       };
     };
+    "method-override-2.3.7" = {
+      name = "method-override";
+      packageName = "method-override";
+      version = "2.3.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
+        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
+      };
+    };
     "mkdirp-0.5.1" = {
       name = "mkdirp";
       packageName = "mkdirp";
@@ -166,15 +203,6 @@ let
         sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
       };
     };
-    "node-uuid-1.4.7" = {
-      name = "node-uuid";
-      packageName = "node-uuid";
-      version = "1.4.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
-        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
-      };
-    };
     "oauth-evanp-0.9.10-evanp.2" = {
       name = "oauth-evanp";
       packageName = "oauth-evanp";
@@ -184,6 +212,15 @@ let
         sha1 = "9b5fb3508cea584420855957d56531405cf53a02";
       };
     };
+    "octal-1.0.0" = {
+      name = "octal";
+      packageName = "octal";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz";
+        sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b";
+      };
+    };
     "optimist-0.6.1" = {
       name = "optimist";
       packageName = "optimist";
@@ -193,13 +230,13 @@ let
         sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
       };
     };
-    "rimraf-2.5.4" = {
+    "rimraf-2.6.1" = {
       name = "rimraf";
       packageName = "rimraf";
-      version = "2.5.4";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz";
-        sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz";
+        sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d";
       };
     };
     "sanitize-html-1.14.1" = {
@@ -229,13 +266,13 @@ let
         sha1 = "765e7607c8055452bba6f0b052595350986036de";
       };
     };
-    "showdown-1.6.0" = {
+    "showdown-1.6.4" = {
       name = "showdown";
       packageName = "showdown";
-      version = "1.6.0";
+      version = "1.6.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/showdown/-/showdown-1.6.0.tgz";
-        sha1 = "4a3cd2b73c45914f8cc00a388303be78b9f3e2a4";
+        url = "https://registry.npmjs.org/showdown/-/showdown-1.6.4.tgz";
+        sha1 = "056bbb654ecdb8d8643ae12d6d597893ccaf46c6";
       };
     };
     "sockjs-0.3.18" = {
@@ -247,13 +284,22 @@ let
         sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207";
       };
     };
-    "step-0.0.6" = {
+    "ssl-config-0.0.9" = {
+      name = "ssl-config";
+      packageName = "ssl-config";
+      version = "0.0.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ssl-config/-/ssl-config-0.0.9.tgz";
+        sha1 = "905ed1b7ddd0564aa9395cd4ae7146907351ff2c";
+      };
+    };
+    "step-1.0.0" = {
       name = "step";
       packageName = "step";
-      version = "0.0.6";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz";
-        sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2";
+        url = "https://registry.npmjs.org/step/-/step-1.0.0.tgz";
+        sha1 = "b300e9d2ae9057d4d78633aae2303813a94bdff2";
       };
     };
     "ua-parser-js-0.7.12" = {
@@ -283,13 +329,13 @@ let
         sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7";
       };
     };
-    "utml-0.2.0" = {
-      name = "utml";
-      packageName = "utml";
-      version = "0.2.0";
+    "uuid-3.0.1" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utml/-/utml-0.2.0.tgz";
-        sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48";
+        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
+        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
       };
     };
     "validator-4.4.0" = {
@@ -310,13 +356,13 @@ let
         sha1 = "3477a6d97799461896039fcffc650b73468ee76d";
       };
     };
-    "databank-mongodb-0.19.0" = {
+    "databank-mongodb-1.0.0" = {
       name = "databank-mongodb";
       packageName = "databank-mongodb";
-      version = "0.19.0";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.19.0.tgz";
-        sha1 = "66ffa32848986d0e138403396506d64895fefc45";
+        url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-1.0.0.tgz";
+        sha1 = "66f229698df1d4f7e9e3ad849a30174b2aae527b";
       };
     };
     "databank-redis-0.19.6" = {
@@ -328,15 +374,6 @@ let
         sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9";
       };
     };
-    "databank-memcached-0.15.0" = {
-      name = "databank-memcached";
-      packageName = "databank-memcached";
-      version = "0.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz";
-        sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2";
-      };
-    };
     "databank-lrucache-0.1.2" = {
       name = "databank-lrucache";
       packageName = "databank-lrucache";
@@ -364,13 +401,13 @@ let
         sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
       };
     };
-    "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" = {
@@ -382,13 +419,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";
       };
     };
     "moment-2.17.1" = {
@@ -400,13 +437,13 @@ let
         sha1 = "fed9506063f36b10f066c8b59a144d7faebe1d82";
       };
     };
-    "nan-2.5.0" = {
+    "nan-2.5.1" = {
       name = "nan";
       packageName = "nan";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz";
-        sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8";
+        url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz";
+        sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2";
       };
     };
     "ncp-2.0.0" = {
@@ -670,15 +707,6 @@ let
         sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
       };
     };
-    "method-override-2.3.7" = {
-      name = "method-override";
-      packageName = "method-override";
-      version = "2.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz";
-        sha1 = "8e1d47ac480fb0cd8777083f11c896901166b2e5";
-      };
-    };
     "morgan-1.6.1" = {
       name = "morgan";
       packageName = "morgan";
@@ -922,13 +950,13 @@ let
         sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
       };
     };
-    "csrf-3.0.4" = {
+    "csrf-3.0.5" = {
       name = "csrf";
       packageName = "csrf";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.4.tgz";
-        sha1 = "ba01423e5b5bea7b655e38b0bdd1323954cbdaa5";
+        url = "https://registry.npmjs.org/csrf/-/csrf-3.0.5.tgz";
+        sha1 = "3c3aa86f395dd39f86d68fcf1734a2380f466112";
       };
     };
     "base64-url-1.3.3" = {
@@ -958,13 +986,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" = {
@@ -1048,42 +1076,6 @@ let
         sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e";
       };
     };
-    "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";
-      };
-    };
-    "methods-1.1.2" = {
-      name = "methods";
-      packageName = "methods";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
-        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
-      };
-    };
-    "vary-1.1.0" = {
-      name = "vary";
-      packageName = "vary";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
-        sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
-      };
-    };
-    "ms-0.7.2" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
-        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
-      };
-    };
     "basic-auth-1.0.4" = {
       name = "basic-auth";
       packageName = "basic-auth";
@@ -1156,6 +1148,15 @@ let
         sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
       };
     };
+    "ms-0.7.2" = {
+      name = "ms";
+      packageName = "ms";
+      version = "0.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz";
+        sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765";
+      };
+    };
     "batch-0.5.3" = {
       name = "batch";
       packageName = "batch";
@@ -1174,22 +1175,13 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "connect-2.7.11" = {
-      name = "connect";
-      packageName = "connect";
-      version = "2.7.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-2.7.11.tgz";
-        sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e";
-      };
-    };
-    "oauth-0.9.10" = {
+    "oauth-0.9.7" = {
       name = "oauth";
       packageName = "oauth";
-      version = "0.9.10";
+      version = "0.9.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.10.tgz";
-        sha1 = "7d356af319a16d889e581fa80f86bbd5ab454646";
+        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz";
+        sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd";
       };
     };
     "openid-0.4.1" = {
@@ -1201,114 +1193,6 @@ let
         sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387";
       };
     };
-    "qs-0.6.5" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.6.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
-        sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
-      };
-    };
-    "formidable-1.0.14" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
-        sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
-      };
-    };
-    "cookie-signature-1.0.1" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
-        sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
-      };
-    };
-    "buffer-crc32-0.2.1" = {
-      name = "buffer-crc32";
-      packageName = "buffer-crc32";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
-        sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
-      };
-    };
-    "cookie-0.0.5" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
-        sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
-      };
-    };
-    "send-0.1.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.1.1.tgz";
-        sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8";
-      };
-    };
-    "bytes-0.2.0" = {
-      name = "bytes";
-      packageName = "bytes";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
-        sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
-      };
-    };
-    "fresh-0.1.0" = {
-      name = "fresh";
-      packageName = "fresh";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
-        sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
-      };
-    };
-    "pause-0.0.1" = {
-      name = "pause";
-      packageName = "pause";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
-        sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
-      };
-    };
-    "debug-2.6.0" = {
-      name = "debug";
-      packageName = "debug";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz";
-        sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b";
-      };
-    };
-    "mime-1.2.11" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-        sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
-      };
-    };
-    "range-parser-0.0.4" = {
-      name = "range-parser";
-      packageName = "range-parser";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
-        sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
-      };
-    };
     "async-1.5.2" = {
       name = "async";
       packageName = "async";
@@ -1318,6 +1202,15 @@ let
         sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
       };
     };
+    "node-uuid-1.4.7" = {
+      name = "node-uuid";
+      packageName = "node-uuid";
+      version = "1.4.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+        sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
+      };
+    };
     "set-immediate-0.1.1" = {
       name = "set-immediate";
       packageName = "set-immediate";
@@ -1327,40 +1220,31 @@ let
         sha1 = "8986e4a773bf8ec165f24d579107673bfac141de";
       };
     };
-    "vows-0.7.0" = {
-      name = "vows";
-      packageName = "vows";
-      version = "0.7.0";
+    "multiparty-4.1.3" = {
+      name = "multiparty";
+      packageName = "multiparty";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vows/-/vows-0.7.0.tgz";
-        sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867";
+        url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz";
+        sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94";
       };
     };
-    "setimmediate-1.0.5" = {
-      name = "setimmediate";
-      packageName = "setimmediate";
-      version = "1.0.5";
+    "fd-slicer-1.0.1" = {
+      name = "fd-slicer";
+      packageName = "fd-slicer";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
-        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
+        url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+        sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
       };
     };
-    "eyes-0.1.8" = {
-      name = "eyes";
-      packageName = "eyes";
-      version = "0.1.8";
+    "pend-1.2.0" = {
+      name = "pend";
+      packageName = "pend";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
-        sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
-      };
-    };
-    "diff-1.0.8" = {
-      name = "diff";
-      packageName = "diff";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
-        sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
+        url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+        sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
       };
     };
     "get-stdin-4.0.1" = {
@@ -1426,13 +1310,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" = {
@@ -1507,13 +1391,13 @@ let
         sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1";
       };
     };
-    "hosted-git-info-2.1.5" = {
+    "hosted-git-info-2.2.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
-      version = "2.1.5";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz";
-        sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b";
+        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz";
+        sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5";
       };
     };
     "is-builtin-module-1.0.0" = {
@@ -1678,13 +1562,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" = {
@@ -1759,6 +1643,15 @@ let
         sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
       };
     };
+    "step-0.0.6" = {
+      name = "step";
+      packageName = "step";
+      version = "0.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz";
+        sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2";
+      };
+    };
     "addressparser-0.3.2" = {
       name = "addressparser";
       packageName = "addressparser";
@@ -1831,49 +1724,112 @@ let
         sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb";
       };
     };
-    "connect-1.9.2" = {
-      name = "connect";
-      packageName = "connect";
-      version = "1.9.2";
+    "content-disposition-0.5.0" = {
+      name = "content-disposition";
+      packageName = "content-disposition";
+      version = "0.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
-        sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
+        sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
       };
     };
-    "mime-1.2.4" = {
+    "commander-2.6.0" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
+        sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+      };
+    };
+    "merge-descriptors-1.0.0" = {
+      name = "merge-descriptors";
+      packageName = "merge-descriptors";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
+        sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
+      };
+    };
+    "methods-1.1.2" = {
+      name = "methods";
+      packageName = "methods";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+      };
+    };
+    "proxy-addr-1.0.10" = {
+      name = "proxy-addr";
+      packageName = "proxy-addr";
+      version = "1.0.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz";
+        sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5";
+      };
+    };
+    "range-parser-1.0.3" = {
+      name = "range-parser";
+      packageName = "range-parser";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz";
+        sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175";
+      };
+    };
+    "send-0.13.0" = {
+      name = "send";
+      packageName = "send";
+      version = "0.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz";
+        sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de";
+      };
+    };
+    "forwarded-0.1.0" = {
+      name = "forwarded";
+      packageName = "forwarded";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+        sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
+      };
+    };
+    "ipaddr.js-1.0.5" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz";
+        sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7";
+      };
+    };
+    "destroy-1.0.3" = {
+      name = "destroy";
+      packageName = "destroy";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+        sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
+      };
+    };
+    "mime-1.3.4" = {
       name = "mime";
       packageName = "mime";
-      version = "1.2.4";
+      version = "1.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
-        sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7";
+        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
       };
     };
-    "qs-0.4.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.4.2";
+    "statuses-1.2.1" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
-        sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f";
-      };
-    };
-    "mkdirp-0.3.0" = {
-      name = "mkdirp";
-      packageName = "mkdirp";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
-        sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
-      };
-    };
-    "formidable-1.0.17" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
-        sha1 = "ef5491490f9433b705faa77249c99029ae348559";
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
+        sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
       };
     };
     "cookie-0.3.1" = {
@@ -1885,13 +1841,22 @@ let
         sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb";
       };
     };
-    "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";
+      };
+    };
+    "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";
       };
     };
     "array-parallel-0.1.3" = {
@@ -1966,13 +1931,13 @@ let
         sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
       };
     };
-    "connect-3.4.1" = {
+    "connect-3.6.0" = {
       name = "connect";
       packageName = "connect";
-      version = "3.4.1";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz";
-        sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d";
+        url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz";
+        sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e";
       };
     };
     "dns-prefetch-control-0.1.0" = {
@@ -1993,22 +1958,22 @@ let
         sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58";
       };
     };
-    "frameguard-2.0.0" = {
+    "frameguard-3.0.0" = {
       name = "frameguard";
       packageName = "frameguard";
-      version = "2.0.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/frameguard/-/frameguard-2.0.0.tgz";
-        sha1 = "30c2c149e5e3505f9e156f9bc491a438420e487e";
+        url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz";
+        sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9";
       };
     };
-    "helmet-csp-1.2.2" = {
+    "helmet-csp-2.3.0" = {
       name = "helmet-csp";
       packageName = "helmet-csp";
-      version = "1.2.2";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-1.2.2.tgz";
-        sha1 = "085c0307d57fc96cd97337f170ab8bfea99e5df7";
+        url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.3.0.tgz";
+        sha1 = "bc341939dfef5266cc817abcf53f079f61fe7e3f";
       };
     };
     "hide-powered-by-1.0.0" = {
@@ -2020,22 +1985,22 @@ let
         sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b";
       };
     };
-    "hpkp-1.2.0" = {
+    "hpkp-2.0.0" = {
       name = "hpkp";
       packageName = "hpkp";
-      version = "1.2.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hpkp/-/hpkp-1.2.0.tgz";
-        sha1 = "83f2cb38b26cff21daf26e2ff4b57126921dec65";
+        url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz";
+        sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672";
       };
     };
-    "hsts-1.0.0" = {
+    "hsts-2.0.0" = {
       name = "hsts";
       packageName = "hsts";
-      version = "1.0.0";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hsts/-/hsts-1.0.0.tgz";
-        sha1 = "98e1039ef7aba554057b6b0e32584c0b1143a414";
+        url = "https://registry.npmjs.org/hsts/-/hsts-2.0.0.tgz";
+        sha1 = "a52234c6070decf214b2b6b70bb144d07e4776c7";
       };
     };
     "ienoopen-1.0.0" = {
@@ -2047,22 +2012,22 @@ let
         sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b";
       };
     };
-    "nocache-1.0.1" = {
+    "nocache-2.0.0" = {
       name = "nocache";
       packageName = "nocache";
-      version = "1.0.1";
+      version = "2.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nocache/-/nocache-1.0.1.tgz";
-        sha1 = "695c9f736926a7554f7365fa25e087941065bd36";
+        url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz";
+        sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980";
       };
     };
-    "referrer-policy-1.0.0" = {
+    "referrer-policy-1.1.0" = {
       name = "referrer-policy";
       packageName = "referrer-policy";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.0.0.tgz";
-        sha1 = "f60eedc92f942b01a6118121ec932d66e8fd7e14";
+        url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz";
+        sha1 = "35774eb735bf50fb6c078e83334b472350207d79";
       };
     };
     "x-xss-protection-1.0.0" = {
@@ -2074,13 +2039,22 @@ let
         sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9";
       };
     };
-    "finalhandler-0.4.1" = {
+    "finalhandler-1.0.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
-      version = "0.4.1";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
-        sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz";
+        sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755";
+      };
+    };
+    "encodeurl-1.0.1" = {
+      name = "encodeurl";
+      packageName = "encodeurl";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz";
+        sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20";
       };
     };
     "camelize-1.0.0" = {
@@ -2092,31 +2066,40 @@ let
         sha1 = "164a5483e630fa4321e5af07020e531831b2609b";
       };
     };
-    "content-security-policy-builder-1.0.0" = {
+    "content-security-policy-builder-1.1.0" = {
       name = "content-security-policy-builder";
       packageName = "content-security-policy-builder";
-      version = "1.0.0";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.0.0.tgz";
-        sha1 = "11fd40c5cc298a6c725a35f9acf71e82ab5d3243";
+        url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.1.0.tgz";
+        sha1 = "d91f1b076236c119850c7dee9924bf55e05772b3";
       };
     };
-    "lodash.reduce-4.5.0" = {
+    "dasherize-2.0.0" = {
+      name = "dasherize";
+      packageName = "dasherize";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz";
+        sha1 = "6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308";
+      };
+    };
+    "lodash.reduce-4.6.0" = {
       name = "lodash.reduce";
       packageName = "lodash.reduce";
-      version = "4.5.0";
+      version = "4.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.5.0.tgz";
-        sha1 = "af7d2ec621062441e77d5bf408a1e071ef86691c";
+        url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz";
+        sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b";
       };
     };
-    "platform-1.3.1" = {
+    "platform-1.3.3" = {
       name = "platform";
       packageName = "platform";
-      version = "1.3.1";
+      version = "1.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/platform/-/platform-1.3.1.tgz";
-        sha1 = "492210892335bd3131c0a08dda2d93ec3543e423";
+        url = "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz";
+        sha1 = "646c77011899870b6a0903e75e997e8e51da7461";
       };
     };
     "dashify-0.2.2" = {
@@ -2128,13 +2111,112 @@ let
         sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe";
       };
     };
-    "abab-1.0.3" = {
-      name = "abab";
-      packageName = "abab";
-      version = "1.0.3";
+    "character-parser-1.2.1" = {
+      name = "character-parser";
+      packageName = "character-parser";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz";
-        sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d";
+        url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
+        sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
+      };
+    };
+    "clean-css-3.4.25" = {
+      name = "clean-css";
+      packageName = "clean-css";
+      version = "3.4.25";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz";
+        sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede";
+      };
+    };
+    "constantinople-3.0.2" = {
+      name = "constantinople";
+      packageName = "constantinople";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz";
+        sha1 = "4b945d9937907bcd98ee575122c3817516544141";
+      };
+    };
+    "jstransformer-0.0.2" = {
+      name = "jstransformer";
+      packageName = "jstransformer";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz";
+        sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab";
+      };
+    };
+    "transformers-2.1.0" = {
+      name = "transformers";
+      packageName = "transformers";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
+        sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
+      };
+    };
+    "uglify-js-2.8.9" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.8.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.9.tgz";
+        sha1 = "01194b91cc0795214093c05594ef5ac1e0b2e900";
+      };
+    };
+    "void-elements-2.0.1" = {
+      name = "void-elements";
+      packageName = "void-elements";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
+        sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
+      };
+    };
+    "with-4.0.3" = {
+      name = "with";
+      packageName = "with";
+      version = "4.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz";
+        sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e";
+      };
+    };
+    "commander-2.8.1" = {
+      name = "commander";
+      packageName = "commander";
+      version = "2.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+        sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+      };
+    };
+    "source-map-0.4.4" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.4.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+        sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+      };
+    };
+    "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";
+      };
+    };
+    "amdefine-1.0.1" = {
+      name = "amdefine";
+      packageName = "amdefine";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
+        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
       };
     };
     "acorn-2.7.0" = {
@@ -2146,6 +2228,258 @@ let
         sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
       };
     };
+    "is-promise-2.1.0" = {
+      name = "is-promise";
+      packageName = "is-promise";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+        sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+      };
+    };
+    "promise-6.1.0" = {
+      name = "promise";
+      packageName = "promise";
+      version = "6.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
+        sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6";
+      };
+    };
+    "asap-1.0.0" = {
+      name = "asap";
+      packageName = "asap";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
+        sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
+      };
+    };
+    "promise-2.0.0" = {
+      name = "promise";
+      packageName = "promise";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+        sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
+      };
+    };
+    "css-1.0.8" = {
+      name = "css";
+      packageName = "css";
+      version = "1.0.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz";
+        sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
+      };
+    };
+    "uglify-js-2.2.5" = {
+      name = "uglify-js";
+      packageName = "uglify-js";
+      version = "2.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+        sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
+      };
+    };
+    "is-promise-1.0.1" = {
+      name = "is-promise";
+      packageName = "is-promise";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
+        sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
+      };
+    };
+    "css-parse-1.0.4" = {
+      name = "css-parse";
+      packageName = "css-parse";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
+        sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
+      };
+    };
+    "css-stringify-1.0.5" = {
+      name = "css-stringify";
+      packageName = "css-stringify";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
+        sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
+      };
+    };
+    "source-map-0.1.43" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.1.43";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+        sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
+      };
+    };
+    "optimist-0.3.7" = {
+      name = "optimist";
+      packageName = "optimist";
+      version = "0.3.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+        sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
+      };
+    };
+    "wordwrap-0.0.3" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+      };
+    };
+    "source-map-0.5.6" = {
+      name = "source-map";
+      packageName = "source-map";
+      version = "0.5.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz";
+        sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412";
+      };
+    };
+    "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";
+      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";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+        sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
+      };
+    };
+    "cliui-2.1.0" = {
+      name = "cliui";
+      packageName = "cliui";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+        sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
+      };
+    };
+    "window-size-0.1.0" = {
+      name = "window-size";
+      packageName = "window-size";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+        sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+      };
+    };
+    "center-align-0.1.3" = {
+      name = "center-align";
+      packageName = "center-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+        sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
+      };
+    };
+    "right-align-0.1.3" = {
+      name = "right-align";
+      packageName = "right-align";
+      version = "0.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+        sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+      };
+    };
+    "wordwrap-0.0.2" = {
+      name = "wordwrap";
+      packageName = "wordwrap";
+      version = "0.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+        sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      };
+    };
+    "align-text-0.1.4" = {
+      name = "align-text";
+      packageName = "align-text";
+      version = "0.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+        sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+      };
+    };
+    "lazy-cache-1.0.4" = {
+      name = "lazy-cache";
+      packageName = "lazy-cache";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz";
+        sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e";
+      };
+    };
+    "kind-of-3.1.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz";
+        sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47";
+      };
+    };
+    "longest-1.0.1" = {
+      name = "longest";
+      packageName = "longest";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+        sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
+      };
+    };
+    "repeat-string-1.6.1" = {
+      name = "repeat-string";
+      packageName = "repeat-string";
+      version = "1.6.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz";
+        sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
+      };
+    };
+    "is-buffer-1.1.4" = {
+      name = "is-buffer";
+      packageName = "is-buffer";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz";
+        sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b";
+      };
+    };
+    "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";
+      };
+    };
     "acorn-globals-1.0.9" = {
       name = "acorn-globals";
       packageName = "acorn-globals";
@@ -2155,13 +2489,22 @@ let
         sha1 = "55bb5e98691507b74579d0513413217c380c54cf";
       };
     };
-    "cssom-0.3.1" = {
+    "abab-1.0.3" = {
+      name = "abab";
+      packageName = "abab";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz";
+        sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d";
+      };
+    };
+    "cssom-0.3.2" = {
       name = "cssom";
       packageName = "cssom";
-      version = "0.3.1";
+      version = "0.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz";
-        sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3";
+        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz";
+        sha1 = "b8036170c79f07a90ff2f16e22284027a243848b";
       };
     };
     "cssstyle-0.2.37" = {
@@ -2200,31 +2543,31 @@ let
         sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
       };
     };
-    "request-2.79.0" = {
+    "request-2.80.0" = {
       name = "request";
       packageName = "request";
-      version = "2.79.0";
+      version = "2.80.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.79.0.tgz";
-        sha1 = "4dfe5bf6be8b8cdc37fcf93e04b65577722710de";
+        url = "https://registry.npmjs.org/request/-/request-2.80.0.tgz";
+        sha1 = "8cc162d76d79381cdefdd3505d76b80b60589bd0";
       };
     };
-    "sax-1.2.1" = {
+    "sax-1.2.2" = {
       name = "sax";
       packageName = "sax";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
-        sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+        url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz";
+        sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828";
       };
     };
-    "symbol-tree-3.2.1" = {
+    "symbol-tree-3.2.2" = {
       name = "symbol-tree";
       packageName = "symbol-tree";
-      version = "3.2.1";
+      version = "3.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.1.tgz";
-        sha1 = "8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb";
+        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz";
+        sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6";
       };
     };
     "tough-cookie-2.3.2" = {
@@ -2362,15 +2705,6 @@ let
         sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917";
       };
     };
-    "amdefine-1.0.1" = {
-      name = "amdefine";
-      packageName = "amdefine";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz";
-        sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5";
-      };
-    };
     "aws-sign2-0.6.0" = {
       name = "aws-sign2";
       packageName = "aws-sign2";
@@ -2380,22 +2714,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" = {
@@ -2434,13 +2768,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" = {
@@ -2497,13 +2831,22 @@ 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.3.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.3.0";
+      version = "6.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz";
-        sha1 = "f403b264f23bc01228c74131b407f18d5ea5d442";
+        url = "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz";
+        sha1 = "e75bd5f6e268122a2a0e0bda630b2550c166502c";
       };
     };
     "stringstream-0.0.5" = {
@@ -2524,15 +2867,6 @@ let
         sha1 = "6373db76909fe570e08d73583365ed828a74eeeb";
       };
     };
-    "uuid-3.0.1" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz";
-        sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1";
-      };
-    };
     "delayed-stream-1.0.0" = {
       name = "delayed-stream";
       packageName = "delayed-stream";
@@ -2551,139 +2885,49 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "chalk-1.1.3" = {
-      name = "chalk";
-      packageName = "chalk";
-      version = "1.1.3";
+    "ajv-4.11.4" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "4.11.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
-        sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
+        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.4.tgz";
+        sha1 = "ebf3a55d4b132ea60ff5847ae85d2ef069960b45";
       };
     };
-    "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";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+        sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
       };
     };
-    "generate-function-2.0.0" = {
-      name = "generate-function";
-      packageName = "generate-function";
-      version = "2.0.0";
+    "jsonify-0.0.0" = {
+      name = "jsonify";
+      packageName = "jsonify";
+      version = "0.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";
-      };
-    };
-    "xtend-4.0.1" = {
-      name = "xtend";
-      packageName = "xtend";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
-        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
-      };
-    };
-    "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";
+        url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+        sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
       };
     };
     "hoek-2.16.3" = {
@@ -2740,13 +2984,13 @@ let
         sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252";
       };
     };
-    "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";
       };
     };
     "extsprintf-1.0.2" = {
@@ -2812,13 +3056,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" = {
@@ -2848,13 +3092,13 @@ let
         sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
-    "bcrypt-pbkdf-1.0.0" = {
+    "bcrypt-pbkdf-1.0.1" = {
       name = "bcrypt-pbkdf";
       packageName = "bcrypt-pbkdf";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz";
-        sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4";
+        url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
+        sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
       };
     };
     "punycode-1.4.1" = {
@@ -2875,6 +3119,24 @@ 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" = {
+      name = "vary";
+      packageName = "vary";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
+        sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
+      };
+    };
     "minimist-0.0.8" = {
       name = "minimist";
       packageName = "minimist";
@@ -2884,15 +3146,6 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "wordwrap-0.0.3" = {
-      name = "wordwrap";
-      packageName = "wordwrap";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
-        sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
-      };
-    };
     "minimist-0.0.10" = {
       name = "minimist";
       packageName = "minimist";
@@ -2938,6 +3191,15 @@ let
         sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
       };
     };
+    "xtend-4.0.1" = {
+      name = "xtend";
+      packageName = "xtend";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+        sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
+      };
+    };
     "domelementtype-1.3.0" = {
       name = "domelementtype";
       packageName = "domelementtype";
@@ -2974,13 +3236,13 @@ let
         sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
       };
     };
-    "readable-stream-2.2.2" = {
+    "readable-stream-2.2.3" = {
       name = "readable-stream";
       packageName = "readable-stream";
-      version = "2.2.2";
+      version = "2.2.3";
       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.3.tgz";
+        sha1 = "9cf49463985df016c8ae8813097a9293a9b33729";
       };
     };
     "dom-serializer-0.1.0" = {
@@ -3046,33 +3308,6 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
-    "mime-1.3.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
-        sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
-      };
-    };
-    "range-parser-1.0.3" = {
-      name = "range-parser";
-      packageName = "range-parser";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz";
-        sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175";
-      };
-    };
-    "statuses-1.2.1" = {
-      name = "statuses";
-      packageName = "statuses";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
-        sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
-      };
-    };
     "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -3181,6 +3416,15 @@ let
         sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c";
       };
     };
+    "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";
+      };
+    };
     "wrap-ansi-2.1.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -3190,6 +3434,15 @@ let
         sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85";
       };
     };
+    "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";
+      };
+    };
     "lcid-1.0.0" = {
       name = "lcid";
       packageName = "lcid";
@@ -3262,6 +3515,51 @@ let
         sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7";
       };
     };
+    "assert-1.4.1" = {
+      name = "assert";
+      packageName = "assert";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz";
+        sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91";
+      };
+    };
+    "es6-shim-0.27.1" = {
+      name = "es6-shim";
+      packageName = "es6-shim";
+      version = "0.27.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.27.1.tgz";
+        sha1 = "bd3f870663eac2ede8e8943e2a6d23c052d53fc6";
+      };
+    };
+    "minimum-tls-version-0.0.1" = {
+      name = "minimum-tls-version";
+      packageName = "minimum-tls-version";
+      version = "0.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimum-tls-version/-/minimum-tls-version-0.0.1.tgz";
+        sha1 = "42220187e52700e253218cfa8ad974920b73ea74";
+      };
+    };
+    "util-0.10.3" = {
+      name = "util";
+      packageName = "util";
+      version = "0.10.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz";
+        sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
+      };
+    };
+    "inherits-2.0.1" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+        sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      };
+    };
     "underscore-1.6.0" = {
       name = "underscore";
       packageName = "underscore";
@@ -3280,13 +3578,31 @@ let
         sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
       };
     };
-    "mongodb-2.2.21" = {
+    "databank-1.0.1" = {
+      name = "databank";
+      packageName = "databank";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/databank/-/databank-1.0.1.tgz";
+        sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b";
+      };
+    };
+    "mongodb-2.2.24" = {
       name = "mongodb";
       packageName = "mongodb";
-      version = "2.2.21";
+      version = "2.2.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.21.tgz";
-        sha1 = "f7ee56489600e0ac8024c062c0857ac04ddb5f48";
+        url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.24.tgz";
+        sha1 = "80f40d6ec5bdec0ddecf0f9ce0144e794c46449a";
+      };
+    };
+    "setimmediate-1.0.5" = {
+      name = "setimmediate";
+      packageName = "setimmediate";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz";
+        sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285";
       };
     };
     "es6-promise-3.2.1" = {
@@ -3298,13 +3614,13 @@ let
         sha1 = "ec56233868032909207170c39448e24449dd1fc4";
       };
     };
-    "mongodb-core-2.1.6" = {
+    "mongodb-core-2.1.8" = {
       name = "mongodb-core";
       packageName = "mongodb-core";
-      version = "2.1.6";
+      version = "2.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.6.tgz";
-        sha1 = "9d179e7487767c58993bb7c8d6685d035c346a42";
+        url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.8.tgz";
+        sha1 = "b33e0370d0a59d97b6cb1ec610527be9e95ca2c0";
       };
     };
     "readable-stream-2.1.5" = {
@@ -3361,78 +3677,6 @@ let
         sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
       };
     };
-    "memcached-0.2.8" = {
-      name = "memcached";
-      packageName = "memcached";
-      version = "0.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz";
-        sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212";
-      };
-    };
-    "databank-0.18.2" = {
-      name = "databank";
-      packageName = "databank";
-      version = "0.18.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/databank/-/databank-0.18.2.tgz";
-        sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed";
-      };
-    };
-    "underscore-1.4.4" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        sha1 = "61a6a32010622afa07963bf325203cf12239d604";
-      };
-    };
-    "hashring-0.0.8" = {
-      name = "hashring";
-      packageName = "hashring";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz";
-        sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31";
-      };
-    };
-    "jackpot-0.0.6" = {
-      name = "jackpot";
-      packageName = "jackpot";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz";
-        sha1 = "3cff064285cbf66f4eab2593c90bce816a821849";
-      };
-    };
-    "bisection-0.0.3" = {
-      name = "bisection";
-      packageName = "bisection";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz";
-        sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db";
-      };
-    };
-    "simple-lru-cache-0.0.2" = {
-      name = "simple-lru-cache";
-      packageName = "simple-lru-cache";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
-        sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
-      };
-    };
-    "retry-0.6.0" = {
-      name = "retry";
-      packageName = "retry";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
-        sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
-      };
-    };
     "lru-cache-2.3.1" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -3446,8 +3690,8 @@ let
   args = {
     name = "pump.io";
     packageName = "pump.io";
-    version = "1.0.0";
-    src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; };
+    version = "3.0.0";
+    src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-3.0.0.tgz"; sha1 = "ycfm7ak83xi8mgafhp9q0n6n3kzmdz16"; };
     dependencies = [
       (sources."bcrypt-0.8.7" // {
         dependencies = [
@@ -3455,11 +3699,11 @@ let
           sources."nan-2.3.5"
         ];
       })
-      (sources."bunyan-1.8.5" // {
+      (sources."bunyan-1.8.8" // {
         dependencies = [
-          (sources."dtrace-provider-0.8.0" // {
+          (sources."dtrace-provider-0.8.1" // {
             dependencies = [
-              sources."nan-2.5.0"
+              sources."nan-2.5.1"
             ];
           })
           (sources."mv-2.1.1" // {
@@ -3497,10 +3741,11 @@ let
               })
             ];
           })
-          sources."safe-json-stringify-1.0.3"
+          sources."safe-json-stringify-1.0.4"
           sources."moment-2.17.1"
         ];
       })
+      sources."colors-1.1.2"
       (sources."connect-2.30.2" // {
         dependencies = [
           sources."basic-auth-connect-1.0.0"
@@ -3553,12 +3798,12 @@ let
           sources."content-type-1.0.2"
           (sources."csurf-1.8.3" // {
             dependencies = [
-              (sources."csrf-3.0.4" // {
+              (sources."csrf-3.0.5" // {
                 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"
                     ];
@@ -3616,17 +3861,6 @@ let
               sources."statuses-1.3.1"
             ];
           })
-          (sources."method-override-2.3.7" // {
-            dependencies = [
-              (sources."debug-2.3.3" // {
-                dependencies = [
-                  sources."ms-0.7.2"
-                ];
-              })
-              sources."methods-1.1.2"
-              sources."vary-1.1.0"
-            ];
-          })
           (sources."morgan-1.6.1" // {
             dependencies = [
               sources."basic-auth-1.0.4"
@@ -3700,51 +3934,52 @@ let
           sources."vhost-3.0.2"
         ];
       })
-      (sources."connect-auth-0.6.1" // {
+      (sources."connect-auth-git://github.com/e14n/connect-auth" // {
         dependencies = [
-          (sources."connect-2.7.11" // {
-            dependencies = [
-              sources."qs-0.6.5"
-              sources."formidable-1.0.14"
-              sources."cookie-signature-1.0.1"
-              sources."buffer-crc32-0.2.1"
-              sources."cookie-0.0.5"
-              (sources."send-0.1.1" // {
-                dependencies = [
-                  sources."mime-1.2.11"
-                  sources."range-parser-0.0.4"
-                ];
-              })
-              sources."bytes-0.2.0"
-              sources."fresh-0.1.0"
-              sources."pause-0.0.1"
-              (sources."debug-2.6.0" // {
-                dependencies = [
-                  sources."ms-0.7.2"
-                ];
-              })
-            ];
-          })
-          sources."oauth-0.9.10"
+          sources."oauth-0.9.7"
           sources."openid-0.4.1"
         ];
       })
       (sources."connect-databank-1.0.3" // {
         dependencies = [
           sources."async-1.5.2"
+          sources."node-uuid-1.4.7"
           sources."set-immediate-0.1.1"
         ];
       })
-      sources."crypto-cacerts-0.1.0"
-      (sources."databank-0.19.5" // {
+      (sources."connect-multiparty-2.0.0" // {
         dependencies = [
-          (sources."vows-0.7.0" // {
+          (sources."multiparty-4.1.3" // {
             dependencies = [
-              sources."eyes-0.1.8"
-              sources."diff-1.0.8"
+              (sources."fd-slicer-1.0.1" // {
+                dependencies = [
+                  sources."pend-1.2.0"
+                ];
+              })
             ];
           })
-          sources."setimmediate-1.0.5"
+          (sources."on-finished-2.3.0" // {
+            dependencies = [
+              sources."ee-first-1.1.1"
+            ];
+          })
+          sources."qs-4.0.0"
+          (sources."type-is-1.6.14" // {
+            dependencies = [
+              sources."media-typer-0.3.0"
+              (sources."mime-types-2.1.14" // {
+                dependencies = [
+                  sources."mime-db-1.26.0"
+                ];
+              })
+            ];
+          })
+        ];
+      })
+      sources."crypto-cacerts-0.1.0"
+      (sources."databank-0.19.8" // {
+        dependencies = [
+          sources."set-immediate-0.1.1"
         ];
       })
       (sources."dateformat-1.0.12" // {
@@ -3770,9 +4005,9 @@ let
               })
               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.1.5"
+                  sources."hosted-git-info-2.2.0"
                   (sources."is-builtin-module-1.0.0" // {
                     dependencies = [
                       sources."builtin-modules-1.1.1"
@@ -3811,7 +4046,7 @@ let
                           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"
                                 ];
@@ -3872,9 +4107,10 @@ let
       (sources."dialback-client-0.2.0" // {
         dependencies = [
           sources."underscore-1.5.2"
+          sources."step-0.0.6"
         ];
       })
-      sources."dompurify-0.8.4"
+      sources."dompurify-0.8.5"
       (sources."emailjs-1.0.8" // {
         dependencies = [
           sources."addressparser-0.3.2"
@@ -3893,34 +4129,70 @@ let
           sources."bufferjs-1.1.0"
         ];
       })
-      (sources."express-2.5.11" // {
+      (sources."express-3.21.2" // {
         dependencies = [
-          (sources."connect-1.9.2" // {
-            dependencies = [
-              sources."formidable-1.0.17"
-            ];
-          })
-          sources."mime-1.2.4"
-          sources."qs-0.4.2"
-          sources."mkdirp-0.3.0"
-        ];
-      })
-      (sources."express-session-1.14.2" // {
-        dependencies = [
-          sources."cookie-0.3.1"
+          sources."basic-auth-1.0.4"
+          sources."content-disposition-0.5.0"
+          sources."content-type-1.0.2"
+          sources."commander-2.6.0"
+          sources."cookie-0.1.3"
           sources."cookie-signature-1.0.6"
-          sources."crc-3.4.1"
           (sources."debug-2.2.0" // {
             dependencies = [
               sources."ms-0.7.1"
             ];
           })
+          sources."depd-1.0.1"
+          sources."escape-html-1.0.2"
+          sources."etag-1.7.0"
+          sources."fresh-0.3.0"
+          sources."merge-descriptors-1.0.0"
+          sources."methods-1.1.2"
+          sources."parseurl-1.3.1"
+          (sources."proxy-addr-1.0.10" // {
+            dependencies = [
+              sources."forwarded-0.1.0"
+              sources."ipaddr.js-1.0.5"
+            ];
+          })
+          sources."range-parser-1.0.3"
+          (sources."send-0.13.0" // {
+            dependencies = [
+              sources."destroy-1.0.3"
+              (sources."http-errors-1.3.1" // {
+                dependencies = [
+                  sources."inherits-2.0.3"
+                ];
+              })
+              sources."mime-1.3.4"
+              sources."ms-0.7.1"
+              (sources."on-finished-2.3.0" // {
+                dependencies = [
+                  sources."ee-first-1.1.1"
+                ];
+              })
+              sources."statuses-1.2.1"
+            ];
+          })
+          sources."utils-merge-1.0.0"
+          sources."vary-1.0.1"
+        ];
+      })
+      (sources."express-session-1.15.1" // {
+        dependencies = [
+          sources."cookie-0.3.1"
+          sources."cookie-signature-1.0.6"
+          sources."crc-3.4.4"
+          (sources."debug-2.6.1" // {
+            dependencies = [
+              sources."ms-0.7.2"
+            ];
+          })
           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"
             ];
           })
@@ -3953,23 +4225,25 @@ let
           })
         ];
       })
-      (sources."helmet-2.3.0" // {
+      (sources."helmet-3.4.1" // {
         dependencies = [
-          (sources."connect-3.4.1" // {
+          (sources."connect-3.6.0" // {
             dependencies = [
-              (sources."debug-2.2.0" // {
+              (sources."debug-2.6.1" // {
                 dependencies = [
-                  sources."ms-0.7.1"
+                  sources."ms-0.7.2"
                 ];
               })
-              (sources."finalhandler-0.4.1" // {
+              (sources."finalhandler-1.0.0" // {
                 dependencies = [
+                  sources."encodeurl-1.0.1"
                   sources."escape-html-1.0.3"
                   (sources."on-finished-2.3.0" // {
                     dependencies = [
                       sources."ee-first-1.1.1"
                     ];
                   })
+                  sources."statuses-1.3.1"
                   sources."unpipe-1.0.0"
                 ];
               })
@@ -3979,34 +4253,155 @@ let
           })
           sources."dns-prefetch-control-0.1.0"
           sources."dont-sniff-mimetype-1.0.0"
-          sources."frameguard-2.0.0"
-          (sources."helmet-csp-1.2.2" // {
+          sources."frameguard-3.0.0"
+          (sources."helmet-csp-2.3.0" // {
             dependencies = [
               sources."camelize-1.0.0"
-              (sources."content-security-policy-builder-1.0.0" // {
+              (sources."content-security-policy-builder-1.1.0" // {
                 dependencies = [
                   sources."dashify-0.2.2"
                 ];
               })
-              sources."lodash.reduce-4.5.0"
-              sources."platform-1.3.1"
+              sources."dasherize-2.0.0"
+              sources."lodash.reduce-4.6.0"
+              sources."platform-1.3.3"
             ];
           })
           sources."hide-powered-by-1.0.0"
-          sources."hpkp-1.2.0"
-          (sources."hsts-1.0.0" // {
+          sources."hpkp-2.0.0"
+          (sources."hsts-2.0.0" // {
             dependencies = [
               sources."core-util-is-1.0.2"
             ];
           })
           sources."ienoopen-1.0.0"
-          (sources."nocache-1.0.1" // {
+          sources."nocache-2.0.0"
+          sources."referrer-policy-1.1.0"
+          sources."x-xss-protection-1.0.0"
+        ];
+      })
+      (sources."jade-1.11.0" // {
+        dependencies = [
+          sources."character-parser-1.2.1"
+          (sources."clean-css-3.4.25" // {
             dependencies = [
-              sources."depd-1.1.0"
+              (sources."commander-2.8.1" // {
+                dependencies = [
+                  sources."graceful-readlink-1.0.1"
+                ];
+              })
+              (sources."source-map-0.4.4" // {
+                dependencies = [
+                  sources."amdefine-1.0.1"
+                ];
+              })
+            ];
+          })
+          sources."commander-2.6.0"
+          (sources."constantinople-3.0.2" // {
+            dependencies = [
+              sources."acorn-2.7.0"
+            ];
+          })
+          (sources."jstransformer-0.0.2" // {
+            dependencies = [
+              sources."is-promise-2.1.0"
+              (sources."promise-6.1.0" // {
+                dependencies = [
+                  sources."asap-1.0.0"
+                ];
+              })
+            ];
+          })
+          (sources."transformers-2.1.0" // {
+            dependencies = [
+              (sources."promise-2.0.0" // {
+                dependencies = [
+                  sources."is-promise-1.0.1"
+                ];
+              })
+              (sources."css-1.0.8" // {
+                dependencies = [
+                  sources."css-parse-1.0.4"
+                  sources."css-stringify-1.0.5"
+                ];
+              })
+              (sources."uglify-js-2.2.5" // {
+                dependencies = [
+                  (sources."source-map-0.1.43" // {
+                    dependencies = [
+                      sources."amdefine-1.0.1"
+                    ];
+                  })
+                  (sources."optimist-0.3.7" // {
+                    dependencies = [
+                      sources."wordwrap-0.0.3"
+                    ];
+                  })
+                ];
+              })
+            ];
+          })
+          (sources."uglify-js-2.8.9" // {
+            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"
+                  (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.4"
+                                ];
+                              })
+                              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.4"
+                                ];
+                              })
+                              sources."longest-1.0.1"
+                              sources."repeat-string-1.6.1"
+                            ];
+                          })
+                        ];
+                      })
+                      sources."wordwrap-0.0.2"
+                    ];
+                  })
+                  sources."decamelize-1.2.0"
+                  sources."window-size-0.1.0"
+                ];
+              })
+            ];
+          })
+          sources."void-elements-2.0.1"
+          (sources."with-4.0.3" // {
+            dependencies = [
+              sources."acorn-1.2.2"
+              (sources."acorn-globals-1.0.9" // {
+                dependencies = [
+                  sources."acorn-2.7.0"
+                ];
+              })
             ];
           })
-          sources."referrer-policy-1.0.0"
-          sources."x-xss-protection-1.0.0"
         ];
       })
       sources."jankyqueue-0.1.1"
@@ -4015,7 +4410,7 @@ let
           sources."abab-1.0.3"
           sources."acorn-2.7.0"
           sources."acorn-globals-1.0.9"
-          sources."cssom-0.3.1"
+          sources."cssom-0.3.2"
           sources."cssstyle-0.2.37"
           (sources."escodegen-1.8.1" // {
             dependencies = [
@@ -4041,11 +4436,11 @@ let
           })
           sources."nwmatcher-1.3.9"
           sources."parse5-1.5.1"
-          (sources."request-2.79.0" // {
+          (sources."request-2.80.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"
@@ -4058,47 +4453,19 @@ let
                   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.4" // {
                     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" // {
@@ -4119,17 +4486,17 @@ let
                       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"
                     ];
                   })
                 ];
@@ -4143,14 +4510,14 @@ let
                 ];
               })
               sources."oauth-sign-0.8.2"
-              sources."qs-6.3.0"
+              sources."performance-now-0.2.0"
+              sources."qs-6.3.2"
               sources."stringstream-0.0.5"
               sources."tunnel-agent-0.4.3"
-              sources."uuid-3.0.1"
             ];
           })
-          sources."sax-1.2.1"
-          sources."symbol-tree-3.2.1"
+          sources."sax-1.2.2"
+          sources."symbol-tree-3.2.2"
           (sources."tough-cookie-2.3.2" // {
             dependencies = [
               sources."punycode-1.4.1"
@@ -4165,20 +4532,32 @@ let
           sources."xml-name-validator-2.0.1"
         ];
       })
+      (sources."method-override-2.3.7" // {
+        dependencies = [
+          (sources."debug-2.3.3" // {
+            dependencies = [
+              sources."ms-0.7.2"
+            ];
+          })
+          sources."methods-1.1.2"
+          sources."parseurl-1.3.1"
+          sources."vary-1.1.0"
+        ];
+      })
       (sources."mkdirp-0.5.1" // {
         dependencies = [
           sources."minimist-0.0.8"
         ];
       })
-      sources."node-uuid-1.4.7"
       sources."oauth-evanp-0.9.10-evanp.2"
+      sources."octal-1.0.0"
       (sources."optimist-0.6.1" // {
         dependencies = [
           sources."wordwrap-0.0.3"
           sources."minimist-0.0.10"
         ];
       })
-      (sources."rimraf-2.5.4" // {
+      (sources."rimraf-2.6.1" // {
         dependencies = [
           (sources."glob-7.1.1" // {
             dependencies = [
@@ -4226,7 +4605,7 @@ let
               })
               sources."entities-1.1.1"
               sources."inherits-2.0.3"
-              (sources."readable-stream-2.2.2" // {
+              (sources."readable-stream-2.2.3" // {
                 dependencies = [
                   sources."buffer-shims-1.0.0"
                   sources."core-util-is-1.0.2"
@@ -4267,7 +4646,7 @@ let
           sources."statuses-1.2.1"
         ];
       })
-      (sources."showdown-1.6.0" // {
+      (sources."showdown-1.6.4" // {
         dependencies = [
           (sources."yargs-6.6.0" // {
             dependencies = [
@@ -4312,7 +4691,7 @@ let
                           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"
                                 ];
@@ -4332,9 +4711,9 @@ let
                           })
                         ];
                       })
-                      (sources."normalize-package-data-2.3.5" // {
+                      (sources."normalize-package-data-2.3.6" // {
                         dependencies = [
-                          sources."hosted-git-info-2.1.5"
+                          sources."hosted-git-info-2.2.0"
                           (sources."is-builtin-module-1.0.0" // {
                             dependencies = [
                               sources."builtin-modules-1.1.1"
@@ -4407,7 +4786,22 @@ let
           sources."uuid-2.0.3"
         ];
       })
-      sources."step-0.0.6"
+      (sources."ssl-config-0.0.9" // {
+        dependencies = [
+          (sources."assert-1.4.1" // {
+            dependencies = [
+              (sources."util-0.10.3" // {
+                dependencies = [
+                  sources."inherits-2.0.1"
+                ];
+              })
+            ];
+          })
+          sources."es6-shim-0.27.1"
+          sources."minimum-tls-version-0.0.1"
+        ];
+      })
+      sources."step-1.0.0"
       sources."ua-parser-js-0.7.12"
       sources."underscore-1.8.3"
       (sources."underscore-contrib-0.3.0" // {
@@ -4415,28 +4809,34 @@ let
           sources."underscore-1.6.0"
         ];
       })
-      sources."utml-0.2.0"
+      sources."uuid-3.0.1"
       sources."validator-4.4.0"
       (sources."webfinger-0.4.2" // {
         dependencies = [
+          sources."step-0.0.6"
           (sources."xml2js-0.1.14" // {
             dependencies = [
-              sources."sax-1.2.1"
+              sources."sax-1.2.2"
             ];
           })
         ];
       })
-      (sources."databank-mongodb-0.19.0" // {
+      (sources."databank-mongodb-1.0.0" // {
         dependencies = [
-          (sources."debug-2.6.0" // {
+          (sources."databank-1.0.1" // {
+            dependencies = [
+              sources."setimmediate-1.0.5"
+            ];
+          })
+          (sources."debug-2.6.1" // {
             dependencies = [
               sources."ms-0.7.2"
             ];
           })
-          (sources."mongodb-2.2.21" // {
+          (sources."mongodb-2.2.24" // {
             dependencies = [
               sources."es6-promise-3.2.1"
-              (sources."mongodb-core-2.1.6" // {
+              (sources."mongodb-core-2.1.8" // {
                 dependencies = [
                   sources."bson-1.0.4"
                   (sources."require_optional-1.0.0" // {
@@ -4469,37 +4869,6 @@ let
           sources."underscore-1.6.0"
         ];
       })
-      (sources."databank-memcached-0.15.0" // {
-        dependencies = [
-          (sources."memcached-0.2.8" // {
-            dependencies = [
-              (sources."hashring-0.0.8" // {
-                dependencies = [
-                  sources."bisection-0.0.3"
-                  sources."simple-lru-cache-0.0.2"
-                ];
-              })
-              (sources."jackpot-0.0.6" // {
-                dependencies = [
-                  sources."retry-0.6.0"
-                ];
-              })
-            ];
-          })
-          (sources."databank-0.18.2" // {
-            dependencies = [
-              (sources."vows-0.7.0" // {
-                dependencies = [
-                  sources."eyes-0.1.8"
-                  sources."diff-1.0.8"
-                ];
-              })
-              sources."set-immediate-0.1.1"
-            ];
-          })
-          sources."underscore-1.4.4"
-        ];
-      })
       (sources."databank-lrucache-0.1.2" // {
         dependencies = [
           sources."underscore-1.5.2"

From f1a1490135aaf4d2f1fe9b4001cc40718c6ebf2a Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Fri, 10 Mar 2017 22:34:42 +0000
Subject: [PATCH 2142/3449] pumpio service: adjust upload directory config for
 3.0.0

These changes are backwards compatible.
---
 nixos/modules/services/web-apps/pump.io.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix
index b7c64bc6940b..b946aa28477f 100644
--- a/nixos/modules/services/web-apps/pump.io.nix
+++ b/nixos/modules/services/web-apps/pump.io.nix
@@ -57,7 +57,8 @@ let
     smtpfrom = cfg.smtpFrom;
 
     nologger = false;
-    uploaddir =  "${dataDir}/uploads";
+    enableUploads = cfg.enableUploads;
+    datadir = dataDir;
     debugClient = false;
     firehose = cfg.firehose;
     disableRegistration = cfg.disableRegistration;
@@ -152,6 +153,15 @@ in
         '';
       };
 
+      enableUploads = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          If you want to disable file uploads, set this to false. Uploaded files will be stored
+          in ${dataDir}/uploads.
+        '';
+      };
+
       sslKey = mkOption {
         type = types.path;
         example = "${dataDir}/myserver.key";
@@ -341,7 +351,15 @@ in
       { description = "pump.io social network stream server";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+
+        preStart = ''
+          mkdir -p ${dataDir}/uploads
+          chown pumpio:pumpio ${dataDir}/uploads
+          chmod 770 ${dataDir}/uploads
+        '';
+
         serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json";
+        PermissionsStartOnly = true;
         serviceConfig.User = if cfg.port < 1024 then "root" else user;
         serviceConfig.Group = user;
       };

From f488b1811bf0ee1430ce728d661830e55abef88c Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Fri, 10 Mar 2017 22:16:12 +0000
Subject: [PATCH 2143/3449] pumpio service: don't keep secrets in nix store

Added extra config options to allow reading passwords from file rather
than the world-readable nix store.

The full config.json file is created at service startup.

Relevant to #18881
---
 .../services/web-apps/pump.io-configure.js    |  23 ++
 nixos/modules/services/web-apps/pump.io.nix   | 196 +++++++++++-------
 2 files changed, 149 insertions(+), 70 deletions(-)
 create mode 100644 nixos/modules/services/web-apps/pump.io-configure.js

diff --git a/nixos/modules/services/web-apps/pump.io-configure.js b/nixos/modules/services/web-apps/pump.io-configure.js
new file mode 100644
index 000000000000..1fbf346a34c4
--- /dev/null
+++ b/nixos/modules/services/web-apps/pump.io-configure.js
@@ -0,0 +1,23 @@
+var fs = require('fs');
+
+var opts = JSON.parse(fs.readFileSync("/dev/stdin").toString());
+var config = opts.config;
+
+var readSecret = function(filename) {
+  return fs.readFileSync(filename).toString().trim();
+};
+
+if (opts.secretFile) {
+  config.secret = readSecret(opts.secretFile);
+}
+if (opts.dbPasswordFile) {
+  config.params.dbpass = readSecret(opts.dbPasswordFile);
+}
+if (opts.smtpPasswordFile) {
+  config.smtppass = readSecret(opts.smtpPasswordFile);
+}
+if (opts.spamClientSecretFile) {
+  config.spamclientsecret = readSecret(opts.opts.spamClientSecretFile);
+}
+
+fs.writeFileSync(opts.outputFile, JSON.stringify(config));
diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix
index b946aa28477f..27ae68516367 100644
--- a/nixos/modules/services/web-apps/pump.io.nix
+++ b/nixos/modules/services/web-apps/pump.io.nix
@@ -5,72 +5,74 @@ with lib;
 let
   cfg = config.services.pumpio;
   dataDir = "/var/lib/pump.io";
+  runDir = "/run/pump.io";
   user = "pumpio";
 
+  optionalSet = condition: value: if condition then value else {};
+
+  configScript = ./pump.io-configure.js;
   configOptions = {
-    driver = if cfg.driver == "disk" then null else cfg.driver;
-    params = ({ } //
-    (if cfg.driver == "disk" then {
-      dir = dataDir;
-     } else { }) //
-    (if cfg.driver == "mongodb" || cfg.driver == "redis" then {
-       host = cfg.dbHost;
-       port = cfg.dbPort;
-       dbname = cfg.dbName;
-       dbuser = cfg.dbUser;
-       dbpass = cfg.dbPassword;
-     } else { }) //
-    (if cfg.driver == "memcached" then {
-       host = cfg.dbHost;
-       port = cfg.dbPort;
-     } else { }) //
-     cfg.driverParams);
+    outputFile = "${runDir}/config.json";
+    config =
+      (optionalSet (cfg.driver != "disk") {
+        driver = cfg.driver;
+      }) //
+      {
+        params = (optionalSet (cfg.driver == "disk") { dir = dataDir; }) //
+                 (optionalSet (cfg.driver == "mongodb" || cfg.driver == "redis") {
+                   host = cfg.dbHost;
+                   port = cfg.dbPort;
+                   dbname = cfg.dbName;
+                   dbuser = cfg.dbUser;
+                   dbpass = cfg.dbPassword;
+                 }) //
+                 (optionalSet (cfg.driver == "memcached") {
+                   host = cfg.dbHost;
+                   port = cfg.dbPort;
+                 }) // cfg.driverParams;
+        secret = cfg.secret;
 
-    secret = cfg.secret;
+        address = cfg.address;
+        port = cfg.port;
 
-    address = cfg.address;
-    port = cfg.port;
+        noweb = false;
+        urlPort = cfg.urlPort;
+        hostname = cfg.hostname;
+        favicon = cfg.favicon;
 
-    noweb = false;
-    urlPort = cfg.urlPort;
-    hostname = cfg.hostname;
-    favicon = cfg.favicon;
+        site = cfg.site;
+        owner = cfg.owner;
+        ownerURL = cfg.ownerURL;
 
-    site = cfg.site;
-    owner = cfg.owner;
-    ownerURL = cfg.ownerURL;
+        key = cfg.sslKey;
+        cert = cfg.sslCert;
+        bounce = false;
 
-    key = cfg.sslKey;
-    cert = cfg.sslCert;
-    bounce = false;
+        spamhost = cfg.spamHost;
+        spamclientid = cfg.spamClientId;
+        spamclientsecret = cfg.spamClientSecret;
 
-    spamhost = cfg.spamHost;
-    spamclientid = cfg.spamClientId;
-    spamclientsecret = cfg.spamClientSecret;
+        requireEmail = cfg.requireEmail;
+        smtpserver = cfg.smtpHost;
+        smtpport = cfg.smtpPort;
+        smtpuser = cfg.smtpUser;
+        smtppass = cfg.smtpPassword;
+        smtpusessl = cfg.smtpUseSSL;
+        smtpfrom = cfg.smtpFrom;
 
-    requireEmail = cfg.requireEmail;
-    smtpserver = cfg.smtpHost;
-    smtpport = cfg.smtpPort;
-    smtpuser = cfg.smtpUser;
-    smtppass = cfg.smtpPassword;
-    smtpusessl = cfg.smtpUseSSL;
-    smtpfrom = cfg.smtpFrom;
+        nologger = false;
+        enableUploads = cfg.enableUploads;
+        datadir = dataDir;
+        debugClient = false;
+        firehose = cfg.firehose;
+        disableRegistration = cfg.disableRegistration;
 
-    nologger = false;
-    enableUploads = cfg.enableUploads;
-    datadir = dataDir;
-    debugClient = false;
-    firehose = cfg.firehose;
-    disableRegistration = cfg.disableRegistration;
-  } //
-  (if cfg.port < 1024 then {
-    serverUser = user;  # have pump.io listen then drop privileges
-   } else { }) //
-  cfg.extraConfig;
-
-in
-
-{
+        inherit (cfg) secretFile dbPasswordFile smtpPasswordFile spamClientSecretFile;
+      } //
+      (optionalSet (cfg.port < 1024) {
+        serverUser = user;  # have pump.io listen then drop privileges
+      }) // cfg.extraConfig;
+}; in {
   options = {
 
     services.pumpio = {
@@ -78,7 +80,8 @@ in
       enable = mkEnableOption "Pump.io social streams server";
 
       secret = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
+        default = null;
         example = "my dog has fleas";
         description = ''
           A session-generating secret, server-wide password.  Warning:
@@ -86,6 +89,16 @@ in
         '';
       };
 
+      secretFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/run/keys/pump.io-secret";
+        description = ''
+          A file containing the session-generating secret,
+          server-wide password.
+        '';
+      };
+
       site = mkOption {
         type = types.str;
         example = "Awesome Sauce";
@@ -126,7 +139,7 @@ in
 
       hostname = mkOption {
         type = types.nullOr types.str;
-        default = null;
+        default = "localhost";
         description = ''
           The hostname of the server, used for generating
           URLs. Defaults to "localhost" which doesn't do much for you.
@@ -263,6 +276,15 @@ in
         '';
       };
 
+      dbPasswordFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/run/keys/pump.io-dbpassword";
+        description = ''
+          A file containing the password corresponding to dbUser.
+        '';
+      };
+
       smtpHost = mkOption {
         type = types.nullOr types.str;
         default = null;
@@ -301,6 +323,17 @@ in
         '';
       };
 
+      smtpPasswordFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/run/keys/pump.io-smtppassword";
+        description = ''
+          A file containing the password used to connect to SMTP
+          server. Might not be necessary for some servers.
+        '';
+      };
+
+
       smtpUseSSL = mkOption {
         type = types.bool;
         default = false;
@@ -342,32 +375,55 @@ in
           stored in cleartext in the Nix store!
         '';
       };
+      spamClientSecretFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/run/keys/pump.io-spamclientsecret";
+        description = ''
+          A file containing the OAuth key for the spam server.
+        '';
+      };
     };
 
   };
 
   config = mkIf cfg.enable {
+    warnings = let warn = k: optional (cfg.${k} != null)
+                 "config.services.pumpio.${k} is insecure. Use ${k}File instead.";
+               in concatMap warn [ "secret" "dbPassword" "smtpPassword" "spamClientSecret" ];
+
+    assertions = [
+      { assertion = !(isNull cfg.secret && isNull cfg.secretFile);
+        message = "pump.io needs a secretFile configured";
+      }
+    ];
+
     systemd.services."pump.io" =
-      { description = "pump.io social network stream server";
+      { description = "Pump.io - stream server that does most of what people really want from a social network";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
 
         preStart = ''
           mkdir -p ${dataDir}/uploads
-          chown pumpio:pumpio ${dataDir}/uploads
-          chmod 770 ${dataDir}/uploads
+          mkdir -p ${runDir}
+          chown pumpio:pumpio ${dataDir}/uploads ${runDir}
+          chmod 770 ${dataDir}/uploads ${runDir}
+
+          ${pkgs.nodejs}/bin/node ${configScript} <<EOF
+          ${builtins.toJSON configOptions}
+          EOF
+
+          chgrp pumpio ${configOptions.outputFile}
+          chmod 640 ${configOptions.outputFile}
         '';
 
-        serviceConfig.ExecStart = "${pkgs.pumpio}/bin/pump -c /etc/pump.io.json";
-        PermissionsStartOnly = true;
-        serviceConfig.User = if cfg.port < 1024 then "root" else user;
-        serviceConfig.Group = user;
-      };
-
-      environment.etc."pump.io.json" = {
-        mode = "0440";
-        gid = config.ids.gids.pumpio;
-        text = builtins.toJSON configOptions;
+        serviceConfig = {
+          ExecStart = "${pkgs.pumpio}/bin/pump -c ${configOptions.outputFile}";
+          PermissionsStartOnly = true;
+          User = if cfg.port < 1024 then "root" else user;
+          Group = user;
+        };
+        environment = { NODE_ENV = "production"; };
       };
 
       users.extraGroups.pumpio.gid = config.ids.gids.pumpio;

From 41625dcab64efe29c3b15876f27ec520927367bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 12 Mar 2017 15:56:31 +0100
Subject: [PATCH 2144/3449] pump.io: fix tests

fixes #23568
---
 nixos/tests/pump.io.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix
index 18da52b5134b..0991ed3fce1f 100644
--- a/nixos/tests/pump.io.nix
+++ b/nixos/tests/pump.io.nix
@@ -51,16 +51,6 @@ import ./make-test.nix ({ pkgs, ...} : let
     Vd5WD2HJhLb9u0UxVp9vfWIUDgydopV5ZmWCQ5YvNepb1w==
     -----END CERTIFICATE-----
   '';
-
-  makePump = { opts ? { } }:
-    {
-      enable = true;
-      sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert;
-      sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey;
-      secret = "test";
-      site = "test";
-    } // opts;
-
 in {
   name = "pumpio";
   meta = with pkgs.stdenv.lib.maintainers; {
@@ -72,9 +62,14 @@ in {
       { config, pkgs, ... }:
         {
           services = {
-           pumpio = makePump { opts = {
+           pumpio = {
              port = 443;
-           }; };
+             enable = true;
+             sslCert = pkgs.writeText "snakeoil.cert" snakeOilCert;
+             sslKey = pkgs.writeText "snakeoil.pem" snakeOilKey;
+             secretFile = pkgs.writeText "secretFile" "test123";
+             site = "test";
+           };
            mongodb.enable = true;
            mongodb.extraConfig = ''
              storage.journal.enabled: false

From b8685ddf68e0b17ee7767856454b94d355007887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Mar 2017 15:50:26 +0100
Subject: [PATCH 2145/3449] cups: 2.1.4 -> 2.2.2

The changelog seems safe, test succeeds on x86_64-linux.
---
 pkgs/misc/cups/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 38a22a01d955..457e6ad53b1a 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -9,13 +9,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "cups-${version}";
-  version = "2.1.4";
+  version = "2.2.2";
 
   passthru = { inherit version; };
 
   src = fetchurl {
-    url = "https://github.com/apple/cups/releases/download/release-${version}/cups-${version}-source.tar.gz";
-    sha256 = "13bjxw256wd1nff22vj2z25mdhllj2h6d9xypsg55b40661zs52b";
+    url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
+    sha256 = "1xp4ji4rz3xffsz6w6nd60ajxvvihn02pkyp2l4smhqxbmyvp2gm";
   };
 
   # FIXME: the cups libraries contains some $out/share strings so can't be split.

From 2e4c5711a29ccf47bab1a16efc2743bf31b1874f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Mar 2017 15:52:00 +0100
Subject: [PATCH 2146/3449] cups: minor expression refactoring

---
 pkgs/misc/cups/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 457e6ad53b1a..51f518867abb 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -71,11 +71,10 @@ stdenv.mkDerivation rec {
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint
 
-      mkdir $dev/bin
-      mv $out/bin/cups-config $dev/bin/
+      moveToOutput bin/cups-config "$dev"
 
       # Rename systemd files provided by CUPS
-      for f in $out/lib/systemd/system/*; do
+      for f in "$out"/lib/systemd/system/*; do
         substituteInPlace "$f" \
           --replace "org.cups.cupsd" "cups" \
           --replace "org.cups." ""
@@ -88,7 +87,7 @@ stdenv.mkDerivation rec {
       done
     '' + optionalString stdenv.isLinux ''
       # Use xdg-open when on Linux
-      substituteInPlace $out/share/applications/cups.desktop \
+      substituteInPlace "$out"/share/applications/cups.desktop \
         --replace "Exec=htmlview" "Exec=xdg-open"
     '';
 

From 2d47e1be722df1e61132ae4a7b17444f3af656f9 Mon Sep 17 00:00:00 2001
From: Ambroz Bizjak <ambrop7@gmail.com>
Date: Sun, 12 Mar 2017 16:49:24 +0100
Subject: [PATCH 2147/3449] kdevelop: 5.0.3 -> 5.0.4 (#23788)

---
 .../editors/kdevelop5/kdevelop.nix            |  6 +-
 .../kdevplatform-projectconfigskeleton.patch  | 55 -------------------
 .../editors/kdevelop5/kdevplatform.nix        |  8 +--
 3 files changed, 6 insertions(+), 63 deletions(-)
 delete mode 100644 pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch

diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index 19ffb2c4959b..facd1206a00e 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -9,8 +9,8 @@
 
 let
   pname = "kdevelop";
-  version = "5.0.3";
-  dirVersion = "5.0.3";
+  version = "5.0.4";
+  dirVersion = "5.0.4";
 
 in
 stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${dirVersion}/src/${name}.tar.xz";
-    sha256 = "17a58dfc38b853c6c5987084e8973b4f7f5015a6c2c20f94c2a9f96b0c13f601";
+    sha256 = "191142b2bdb14837c82721fdfeb15e852329f2c4c0d48fd479c57514c3235d55";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch
deleted file mode 100644
index ba5140c77fcf..000000000000
--- a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From e84645d1694bdad7f179cd41babce723fe07aa63 Mon Sep 17 00:00:00 2001
-From: Kevin Funk <kfunk@kde.org>
-Date: Mon, 5 Dec 2016 15:20:53 +0100
-Subject: Hotfix for restoring build with newer KConfig
-
-https://phabricator.kde.org/D3386 is a SIC change, handle that
----
- project/projectconfigskeleton.cpp |  4 ++++
- project/projectconfigskeleton.h   | 14 +++++---------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp
-index 0e06149..c4c9767 100644
---- a/project/projectconfigskeleton.cpp
-+++ b/project/projectconfigskeleton.cpp
-@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname )
- ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config )
-         : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate )
- {
-+    // FIXME: Check if that does the right thing.
-+    // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public
-+    Q_ASSERT(config);
-+    d->m_developerTempFile = config->name();
- }
- 
- void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg )
-diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h
-index ed17ed0..c8314df 100644
---- a/project/projectconfigskeleton.h
-+++ b/project/projectconfigskeleton.h
-@@ -55,16 +55,12 @@ public:
- 
-     Path projectFile() const;
-     Path developerFile() const;
-+
-+protected:
-+    explicit ProjectConfigSkeleton( KSharedConfigPtr config );
-+
- private:
--    /**
--     * There's no way in KDE4 API to find out the file that the config object
--     * was created from, so we can't apply defaults when using this
--     * constructors. Thus I'm making this private, so we can find out when
--     * this constructor is used and see if we need to add appropriate API to
--     * kdelibs
--     */
--     explicit ProjectConfigSkeleton( KSharedConfigPtr config );
--     struct ProjectConfigSkeletonPrivate * const d;
-+    struct ProjectConfigSkeletonPrivate * const d;
- };
- 
- }
--- 
-cgit v0.11.2
-
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index c36885a9e139..f2b4fc32fe4c 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -6,8 +6,8 @@
 
 let
   pname = "kdevplatform";
-  version = "5.0.3";
-  dirVersion = "5.0.3";
+  version = "5.0.4";
+  dirVersion = "5.0.4";
 
 in
 stdenv.mkDerivation rec {
@@ -15,11 +15,9 @@ stdenv.mkDerivation rec {
   
   src = fetchurl {
     url = "mirror://kde/stable/kdevelop/${dirVersion}/src/${name}.tar.xz";
-    sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4";
+    sha256 = "01abfcd71383048d017fe989ccce0e7590010a3975bbe6e161f55ababe2ad471";
   };
 
-  patches = [ ./kdevplatform-projectconfigskeleton.patch ];
-
   nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
 
   propagatedBuildInputs = [ ];

From 697838cbea0d7aadb7ca3a4da78ab2753af2bf63 Mon Sep 17 00:00:00 2001
From: Ji-Haeng Huh <jhhuh.note@gmail.com>
Date: Sat, 25 Feb 2017 22:18:03 +0100
Subject: [PATCH 2148/3449] yasr: init at 0.6.9

fixes #23188
---
 .../yasr/10_fix_openpty_forkpty_declarations  | 25 +++++++++++++++++
 pkgs/applications/audio/yasr/20_maxpathlen    | 11 ++++++++
 pkgs/applications/audio/yasr/30_conf          | 18 ++++++++++++
 .../audio/yasr/40_dectalk_extended_chars      | 14 ++++++++++
 pkgs/applications/audio/yasr/default.nix      | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 6 files changed, 98 insertions(+)
 create mode 100644 pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations
 create mode 100644 pkgs/applications/audio/yasr/20_maxpathlen
 create mode 100644 pkgs/applications/audio/yasr/30_conf
 create mode 100644 pkgs/applications/audio/yasr/40_dectalk_extended_chars
 create mode 100644 pkgs/applications/audio/yasr/default.nix

diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations b/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations
new file mode 100644
index 000000000000..f575af5ecd31
--- /dev/null
+++ b/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations
@@ -0,0 +1,25 @@
+Disable openpty() and forkpty() prototypes when needed.
+--- a/yasr/yasr.h
++++ b/yasr/yasr.h
+@@ -308,8 +308,10 @@ extern void opt_set(int num, void *val);
+ extern void opt_queue_empty(int ll);
+ extern void opt_write(FILE * fp);
+ 
++#ifndef HAVE_OPENPTY
+ /* openpty.c prototypes */
+ extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
++#endif
+ 
+ /* cfmakeraw.c prototypes */
+ extern void cfmakeraw(struct termios *);
+@@ -317,8 +319,10 @@ extern void cfmakeraw(struct termios *);
+ /* login_tty.c prototypes */
+ extern int login_tty(int);
+ 
++#ifndef HAVE_FORKPTY
+ /* forkpty.c prototypes */
+ extern int forkpty(int *, char *, struct termios *, struct winsize *);
++#endif
+ 
+ /* tbc - Would it be more efficient to ensure that "blank" grids always held
+    ascii 0x20 rather than ascii 0x00? */
diff --git a/pkgs/applications/audio/yasr/20_maxpathlen b/pkgs/applications/audio/yasr/20_maxpathlen
new file mode 100644
index 000000000000..386c6cbf22bd
--- /dev/null
+++ b/pkgs/applications/audio/yasr/20_maxpathlen
@@ -0,0 +1,11 @@
+--- a/yasr/config.c.orig	2011-11-28 03:56:58.764995828 +0100
++++ a/yasr/config.c	2011-11-28 03:57:00.048967703 +0100
+@@ -60,7 +60,7 @@
+   int args, arg[16], *argp;
+   int i, key, ln = 0, mode = 0;
+   char *home, *ptr, *s;
+-  char confname[MAXPATHLEN];
++  char confname[strlen(PACKAGE_DATA_DIR) + 10 + 1];
+ 
+   if ((home = getenv("HOME")) != NULL)
+   {
diff --git a/pkgs/applications/audio/yasr/30_conf b/pkgs/applications/audio/yasr/30_conf
new file mode 100644
index 000000000000..98e959f55f31
--- /dev/null
+++ b/pkgs/applications/audio/yasr/30_conf
@@ -0,0 +1,18 @@
+diff --git a/yasr.conf b/yasr.conf
+index 1e07fc6..72f5922 100644
+--- a/yasr.conf
++++ b/yasr.conf
+@@ -59,11 +59,11 @@ synthesizer=emacspeak server
+ #synthesizer=speech dispatcher
+ #synthesizer port=S0
+ #synthesizer port=l0
+-synthesizer port=|/usr/local/bin/eflite
++synthesizer port=|eflite
+ # Below line appropriate for Speech Dispatcher in its default configuration
+ #synthesizer port=127.0.0.1:6560
+ key echo=off
+-shell=/bin/bash
++shell=/bin/sh
+ special=off
+ up and down arrows=speak line
+ DisableKey=6925
diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars b/pkgs/applications/audio/yasr/40_dectalk_extended_chars
new file mode 100644
index 000000000000..cc1f0af86065
--- /dev/null
+++ b/pkgs/applications/audio/yasr/40_dectalk_extended_chars
@@ -0,0 +1,14 @@
+Index: yasr-0.6.9/yasr/tts.c
+===================================================================
+--- yasr-0.6.9.orig/yasr/tts.c	2008-02-03 00:10:07.000000000 +1100
++++ yasr-0.6.9/yasr/tts.c	2012-02-05 10:59:06.059007839 +1100
+@@ -281,6 +281,9 @@
+   char *p = synth[tts.synth].unspeakable;
+ 
+   if (ch < 32) return 1;
++  /* characters with high bit set cause DECTALK to crash */
++  if (tts.synth == TTS_DECTALK && ch & 0x80)
++    return 1;
+   while (*p)
+   {
+     if (*p++ == ch) return 1;
diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix
new file mode 100644
index 000000000000..b700cc0bd83d
--- /dev/null
+++ b/pkgs/applications/audio/yasr/default.nix
@@ -0,0 +1,28 @@
+{stdenv,fetchurl}:
+
+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;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ jhhuh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc3924c5829e..0d30d2197ce9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4626,6 +4626,8 @@ with pkgs;
   yaft = callPackage ../applications/misc/yaft { };
 
   yarn = callPackage ../development/tools/yarn  { };
+  
+  yasr = callPackage ../applications/audio/yasr { };
 
   yank = callPackage ../tools/misc/yank { };
 

From 496b2930702c6ecab344fe6f6205dea0039ef43a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 11:15:38 -0500
Subject: [PATCH 2149/3449] dlib: 18.10 -> 19.4

---
 pkgs/development/libraries/dlib/default.nix | 40 ++++++---------------
 1 file changed, 10 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix
index 8a24445dcca7..fe4e7907c9fe 100644
--- a/pkgs/development/libraries/dlib/default.nix
+++ b/pkgs/development/libraries/dlib/default.nix
@@ -1,45 +1,25 @@
-{ stdenv, fetchurl, cmake, xlibsWrapper }:
+{ stdenv, fetchFromGitHub, cmake, xlibsWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "18.10";
+  version = "19.4";
   name = "dlib-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/dclib/dlib/${name}.tar.bz2";
-    sha256 = "1g3v13azc29m5r7zqs3x0g731hny6spb66cxnra7f167z31ka3s7";
+  src = fetchFromGitHub {
+    owner = "davisking";
+    repo = "dlib";
+    rev ="v${version}";
+    sha256 = "0zqa36i4s5i7n6284sp22qrhm3k37n9vqmpz068nm02vj9h0a2j4";
   };
 
-  # The supplied CMakeLists.txt does not have any install targets.
-  sources_var = "\$\{sources\}";
-  headers_var = "\$\{hearders\}";
-  preConfigure = ''
-    cat << EOF > CMakeLists.txt
-    cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
-    project(dlib)
-
-    include_directories(./)
-
-    file(GLOB sources ./dlib/all/*.cpp)
-    file(GLOB headers ./dlib/*.h)
-
-    SET(LIBRARY_OUTPUT_PATH ".")
-    add_library(dlib "SHARED" dlib/all/source.cpp ${sources_var} ${headers_var})
-
-    install(TARGETS dlib DESTINATION lib)
-    install(DIRECTORY dlib/ DESTINATION include/dlib FILES_MATCHING PATTERN "*.h")
-    EOF
-  '';   
-
   enableParallelBuilding = true;
-  buildInputs = [ cmake xlibsWrapper ];
-  propagatedBuildInputs = [ xlibsWrapper ];
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     description = "A general purpose cross-platform C++ machine learning library";
     homepage = http://www.dlib.net;
-    license = stdenv.lib.licenses.boost;
+    license = licenses.boost;
     maintainers = with maintainers; [ christopherpoole ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }
 

From e333a71478730c63510b48131282f97b5e9c1af9 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sun, 12 Mar 2017 16:24:43 +0000
Subject: [PATCH 2150/3449] scala: put docs in correct subdirectory

Under NixOS, /run/current-system/sw/share/doc was getting the license
file, etc.
---
 pkgs/development/compilers/scala/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 8e1f8dd47220..7971d7a8b23d 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -16,6 +16,10 @@ stdenv.mkDerivation rec {
     rm "bin/"*.bat
     mv * $out
 
+    # put docs in correct subdirectory
+    mkdir -p $out/share/doc
+    mv $out/doc $out/share/doc/scala
+
     for p in $(ls $out/bin/) ; do
       wrapProgram $out/bin/$p \
         --prefix PATH ":" ${coreutils}/bin \

From 69448187a47619f60f6506e3c96e36aed073e491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Mar 2017 18:17:53 +0100
Subject: [PATCH 2151/3449] haskellPackages.llvm-general-darwin: fix #23794

by hiding under llvm-general.  There seems no use in a separately named
attribute.  The derivations are unchanged.
---
 .../haskell-modules/configuration-nix.nix     | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 85421ba960e8..3dd462397742 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -216,20 +216,19 @@ self: super: builtins.intersectAttrs super {
   # Uses OpenGL in testing
   caramia = dontCheck super.caramia;
 
-  llvm-general-darwin = overrideCabal (super.llvm-general.override { llvm-config = pkgs.llvm_35; }) (drv: {
-      preConfigure = ''
-        sed -i llvm-general.cabal \
-            -e 's,extra-libraries: stdc++,extra-libraries: c++,'
-      '';
-      configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"];
-      librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or [];
-    });
-
-  # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142
   llvm-general =
-    if pkgs.stdenv.isDarwin
-    then self.llvm-general-darwin
-    else super.llvm-general.override { llvm-config = pkgs.llvm_35; };
+    # Supports only 3.5 for now, https://github.com/bscarlet/llvm-general/issues/142
+    let base = super.llvm-general.override { llvm-config = pkgs.llvm_35; };
+    in if !pkgs.stdenv.isDarwin then base else overrideCabal base (
+      drv: {
+        preConfigure = ''
+          sed -i llvm-general.cabal \
+              -e 's,extra-libraries: stdc++,extra-libraries: c++,'
+        '';
+        configureFlags = (drv.configureFlags or []) ++ ["--extra-include-dirs=${pkgs.libcxx}/include/c++/v1"];
+        librarySystemDepends = [ pkgs.libcxx ] ++ drv.librarySystemDepends or [];
+      }
+    );
 
   # Needs help finding LLVM.
   spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm;

From 50fadc8b18fb3da6bda2f3710009a15f6ac45567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Mar 2017 18:09:39 +0100
Subject: [PATCH 2152/3449] cups: split the $lib output

This saves > 10 MB from most closures.
Printing test succeeds on x86_64-linux.
---
 nixos/modules/services/printing/cupsd.nix            |  1 +
 .../networking/browsers/opera/default.nix            |  2 +-
 pkgs/development/libraries/qt-4.x/4.8/default.nix    |  2 +-
 pkgs/misc/cups/default.nix                           | 12 ++++++++++--
 pkgs/misc/cups/drivers/samsung/4.00.39/default.nix   |  2 +-
 pkgs/misc/cups/drivers/samsung/default.nix           |  4 ++--
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 3041dccfd154..7ce2ae38fb36 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -52,6 +52,7 @@ let
 
     ServerBin ${bindir}/lib/cups
     DataDir ${bindir}/share/cups
+    DocumentRoot ${cups.out}/share/doc/cups
 
     AccessLog syslog
     ErrorLog syslog
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 47e82d06e0eb..30e8af85b2ae 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -46,7 +46,7 @@ let
     alsaLib.out
     atk.out
     cairo.out
-    cups.out
+    cups
     curl.out
     dbus.lib
     expat.out
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 0860a90192f0..d4b85e0dfe43 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
       ./libressl.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
-        cups = if cups != null then cups.out else null;
+        cups = if cups != null then stdenv.lib.getLib cups else null;
         icu = icu.out;
         libXfixes = libXfixes.out;
         glibc = stdenv.cc.libc.out;
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 51f518867abb..f47ba022c352 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xp4ji4rz3xffsz6w6nd60ajxvvihn02pkyp2l4smhqxbmyvp2gm";
   };
 
-  # FIXME: the cups libraries contains some $out/share strings so can't be split.
-  outputs = [ "out" "dev" "man" ]; # TODO: above
+  outputs = [ "out" "lib" "dev" "man" ];
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
     ++ optionals stdenv.isLinux [ avahi pam dbus systemd acl ]
@@ -30,6 +29,13 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gmp ];
 
   configureFlags = [
+    # Put just lib/* and locale into $lib; this didn't work directly.
+    # lib/cups is moved back to $out in postInstall.
+    # Beware: some parts of cups probably don't fully respect these.
+    "--prefix=$(lib)"
+    "--datadir=$(out)/share"
+    "--localedir=$(lib)/share/locale"
+
     "--localstatedir=/var"
     "--sysconfdir=/etc"
     "--with-systemd=\${out}/lib/systemd/system"
@@ -68,6 +74,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
+      moveToOutput lib/cups "$out"
+
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint
 
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
index 0569eabe8f14..16b40798a5da 100644
--- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -16,7 +16,7 @@
 # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
 # to see what will break when upgrading. Consider a new versioned attribute.
 let
-  cups' = cups.out;
+  cups' = stdenv.lib.getLib cups;
 in stdenv.mkDerivation rec {
   name = "samsung-UnifiedLinuxDriver-${version}";
   version = "4.00.39";
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index 8ef788df66fb..26bd771e023a 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -72,10 +72,10 @@ in stdenv.mkDerivation rec {
 
   for bin in $out/bin/*; do
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$bin"
-    patchelf --set-rpath "$out/lib:${cups.out}/lib" "$bin"
+    patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$bin"
   done
 
-  patchelf --set-rpath "$out/lib:${cups.out}/lib" "$out/lib/libscmssc.so"
+  patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so"
 
   ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
 

From d2e30a74f4d940899f5919e45558bf282022a577 Mon Sep 17 00:00:00 2001
From: Karn Kallio <kkallio@skami.org>
Date: Sun, 12 Mar 2017 13:09:00 -0400
Subject: [PATCH 2153/3449] eigen : Fix an extra slash.

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

diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index c38759e0c757..374f52c9cb06 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ];
 
   postInstall = ''
-    sed -e '/Cflags:/s@''${prefix}@@' -i "$out"/share/pkgconfig/eigen3.pc
+    sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
   '';
   
   meta = with stdenv.lib; {

From 4c211bdc635358c2888afb8371f8a7854bb14403 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 12 Mar 2017 18:38:12 +0100
Subject: [PATCH 2154/3449] grsecurity: 4.9.13-201703052141 ->
 4.9.14-201703121245

---
 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 859385c4e994..b10ef6a6a67d 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.13";
+  version = "4.9.14";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "2mszr7n212ryaw5q2lj92766aqnjznkfr7ly04g2ggzk7cyiirrf1w37d9arzg3smn5695fb1frikacnbrmz2hsaia48kjhwgjbxn2h";
+    sha512 = "0qc78s1j3mm03qs5m3dkc1ah9zchwdkmnkl1bl516dr9gy9i386all5c3f9bxniy8dd3lsk7bgfyqnigav1gyaki7vf9jh9ywqz58vd";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index fffe524b11f3..25441c5a5d26 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.13";
-      grrev  = "201703052141";
-      sha512 = "197n21975ifp2nkpl6d7v3r9fllw2l7pyd2h8cic7dnigy65a5jqx1sxhqryivijx3czf6hj173q999j218ihlg15p6a7aqjhkh90kf";
+    { kver   = "4.9.14";
+      grrev  = "201703121245";
+      sha512 = "1h9d1vvfwxn8flzhbii7xd808cmhw8az895sk3fam2vjy5ls1mxvrmvw0z9nzx5sq2hgjg9adyz52y5nj2rza09n3m2gn4i7lid81hh";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From 8091c1b208a439c068300b7c564ea8470445dd21 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 12 Mar 2017 18:38:39 +0100
Subject: [PATCH 2155/3449] linux_4_9: 4.9.13 -> 4.9.14

---
 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 9290bb125f50..2327c882f2d0 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.13";
+  version = "4.9.14";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0s52hrs3wrsa1chzgcqpxwgb5kjmpfd82i964n9d2bmk9zn4liin";
+    sha256 = "0h5nnf9h00fsd7q66rapvwmfxs4pi0vjljk92ir5vid59hzk8kak";
   };
 
   kernelPatches = args.kernelPatches;

From 3c37edb928a5bbbb69603ac43c7b810fd6bc738d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 12 Mar 2017 18:19:20 +0100
Subject: [PATCH 2156/3449] tinycc: 0.9.27pre-20170220 -> 20170225

Contains a fix for x86-64 asm gen and unified cross-compilation.
---
 pkgs/development/compilers/tinycc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 79745d45c2b3..dfbbaa4d4310 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -2,10 +2,10 @@
 with stdenv.lib;
 
 let
-  date = "20170220";
+  date = "20170225";
   version = "0.9.27pre-${date}";
-  rev = "e209b7dac463e228525499153103ec28173ca365";
-  sha256 = "1p8h999aqgy5rlkk47vc86c5lx8280761712nwkcgvydvixd0gd6";
+  rev = "bb93064d7857d887b674999c9b4152b44a628f9a";
+  sha256 = "12wcahj1x4qy9ia931i23lvwkqjmyhaks3wipnzvbnlnc2b03kpr";
 in
 
 stdenv.mkDerivation rec {

From 45cfd3969ae954da8b7f804df6e9ec2833c5eb7f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 12:55:30 -0500
Subject: [PATCH 2157/3449] drumstick: 1.0.2 -> 1.1.0

---
 pkgs/development/libraries/drumstick/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix
index 809037bb5edf..7ec72afc2bff 100644
--- a/pkgs/development/libraries/drumstick/default.nix
+++ b/pkgs/development/libraries/drumstick/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumstick-${version}";
-  version = "1.0.2";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumstick/${version}/${name}.tar.bz2";
-    sha256 = "0l47gy9yywrc860db5g3wdqg8yc8qdb2lqq6wvw1dfim5j0vbail";
+    sha256 = "13pkfqrav30bbcddgf1imd7jk6lpqbxkz1qv31718pdl446jq7df";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -28,8 +28,14 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket
+  postInstall = ''
+    rm $out/bin/drumstick-vpiano
+    '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
-    alsaLib cmake doxygen fluidsynth pkgconfig qt5.qtbase qt5.qtsvg
+    alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg
   ];
 
   meta = with stdenv.lib; {
@@ -37,6 +43,6 @@ stdenv.mkDerivation rec {
     description = "MIDI libraries for Qt5/C++";
     homepage = http://drumstick.sourceforge.net/;
     license = licenses.gpl2Plus;
-    platforms = [ "x86_64-linux" ];
+    platforms = platforms.linux;
   };
 }

From 498cc60f9008fc33648d6e99d065ea0a647f5369 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 13:27:55 -0500
Subject: [PATCH 2158/3449] libp11: 0.2.7 -> 0.4.4

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

diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index 91195229d87a..b049a8ba65df 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -1,21 +1,25 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libtool, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libp11-0.2.7";
+  name = "libp11-${version}";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "libp11";
     rev = name;
-    sha256 = "0llw69kcb6nvz7zzkb9nyfyhc2s972q68sqciabqxwxljr09c411";
+    sha256 = "1jnpnwipmw3skw112qff36w046nyz5amiil228rn5divpkvx4axa";
   };
 
+  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig libtool ];
   buildInputs = [ openssl ];
 
-  meta = {
-    homepage = http://www.opensc-project.org/libp11/;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/OpenSC/libp11;
     license = "LGPL";
     description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
+    platforms = platforms.all;
   };
 }

From c05ac3ea126300ee65345bd0b07ab212aa9b5f6a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 12 Mar 2017 22:07:43 +0300
Subject: [PATCH 2159/3449] makeDBusConf: re-add XDG directories for session
 bus

Fixes #23770.
---
 pkgs/development/libraries/dbus/make-session-conf.xsl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/make-session-conf.xsl b/pkgs/development/libraries/dbus/make-session-conf.xsl
index bc73369af944..9544aa13db56 100644
--- a/pkgs/development/libraries/dbus/make-session-conf.xsl
+++ b/pkgs/development/libraries/dbus/make-session-conf.xsl
@@ -18,7 +18,8 @@
 
   <xsl:template match="/busconfig">
     <busconfig>
-      <xsl:copy-of select="child::node()[name() != 'include' and name() != 'standard_session_servicedirs' and name() != 'servicedir' and name() != 'includedir']" />
+      <!-- We leave <standard_session_servicedirs/> because it includes XDG dirs and therefore user Nix profile. -->
+      <xsl:copy-of select="child::node()[name() != 'include' and name() != 'servicedir' and name() != 'includedir']" />
 
       <xsl:for-each select="str:tokenize($serviceDirectories)">
         <servicedir><xsl:value-of select="." />/share/dbus-1/services</servicedir>

From 7b89e8b2b641f96f0464734663cbfc9fef135440 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 14:33:54 -0500
Subject: [PATCH 2160/3449] exempi: 2.2.2 -> 2.4.2

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

diff --git a/pkgs/development/libraries/exempi/default.nix b/pkgs/development/libraries/exempi/default.nix
index e7a3bd495132..1453db8563f5 100644
--- a/pkgs/development/libraries/exempi/default.nix
+++ b/pkgs/development/libraries/exempi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, expat, zlib, boost }:
 
 stdenv.mkDerivation rec {
-  name = "exempi-2.2.2";
+  name = "exempi-2.4.2";
 
   src = fetchurl {
     url = "http://libopenraw.freedesktop.org/download/${name}.tar.bz2";
-    sha256 = "01vcd1mfn2s0iiq2cjyzgvnxx6kcq9cwra1iipijhs0vwvjx0yhf";
+    sha256 = "1v665fc7x0yi7x6lzskvd8bd2anf7951svn2vd5384dblmgv43av";
   };
 
   configureFlags = [

From e86bb4da9d9236825f7d322eccda6afaa1e61bfe Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 14:44:58 -0500
Subject: [PATCH 2161/3449] exosip: 4.0.0 -> 4.1.0

---
 pkgs/development/libraries/exosip/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/exosip/default.nix b/pkgs/development/libraries/exosip/default.nix
index 9cf49b3c2c09..a5dba0c94f12 100644
--- a/pkgs/development/libraries/exosip/default.nix
+++ b/pkgs/development/libraries/exosip/default.nix
@@ -1,18 +1,20 @@
 {stdenv, fetchurl, libosip, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.0";
-  src = fetchurl {
+ name = "libexosip2-${version}";
+ version = "4.1.0";
+ 
+ src = fetchurl {
     url = "mirror://savannah/exosip/libeXosip2-${version}.tar.gz";
-    sha256 = "1rdjr3x7s992w004cqf4xji1522an9rpzsr9wvyhp685khmahrsj";
+    sha256 = "17cna8kpc8nk1si419vgr6r42k2lda0rdk50vlxrw8rzg0xp2xrw";
   };
-  name = "libexosip2-${version}";
-
+ 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libosip openssl pkgconfig ];
       
-  meta = {
-    license = stdenv.lib.licenses.gpl2Plus;
+  meta = with stdenv.lib; {
+    license = licenses.gpl2Plus;
     description = "Library that hides the complexity of using the SIP protocol";
-    platforms = stdenv.lib.platforms.linux;
+    platforms =platforms.linux;
   };
 }

From fb35166629a0ee55517bd9b3119828c2183b999a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 14:53:50 -0500
Subject: [PATCH 2162/3449] fcppt: 1.3.0 -> 2.5.0

---
 pkgs/development/libraries/fcppt/default.nix | 25 +++++++++++---------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix
index ac785d65c4ee..c4332df5a3db 100644
--- a/pkgs/development/libraries/fcppt/default.nix
+++ b/pkgs/development/libraries/fcppt/default.nix
@@ -1,21 +1,24 @@
-{ stdenv, fetchgit, cmake, boost }:
+{ stdenv, fetchFromGitHub, cmake, boost }:
 
 stdenv.mkDerivation rec {
-  name = "fcppt-1.3.0";
+  name = "fcppt-${version}";
+  version = "2.5.0";
 
-  src = fetchgit {
-    url = https://github.com/freundlich/fcppt.git;
-    rev = "7787733afc7a6278c0de8c0435b3d312e0c0c851";
-    sha256 = "1vy6nhk6nymbp4yihvw75qn67q9fgmfc518f8dn3h2pq2gfjqrpy";
+  src = fetchFromGitHub {
+    owner = "freundlich";
+    repo = "fcppt";
+    rev = version;
+    sha256 = "0pjldwwxgnzjfd04cy29a9mn2szq4v2mjnw0367kxd141q2iglqi";
   };
 
-  buildInputs = [ cmake boost ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ boost ];
 
   cmakeFlags = [ "-DENABLE_EXAMPLES=false" "-DENABLE_TEST=false" ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Freundlich's C++ toolkit";
     longDescription = ''
       Freundlich's C++ Toolkit (fcppt) is a collection of libraries focusing on
@@ -25,8 +28,8 @@ stdenv.mkDerivation rec {
       C++11).
     '';
     homepage = http://fcppt.org;
-    license = stdenv.lib.licenses.boost;
-    maintainers = with stdenv.lib.maintainers; [ pmiddend ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.boost;
+    maintainers = with maintainers; [ pmiddend ];
+    platforms = platforms.linux;
   };
 }

From a7b6f2eee460d2a55a9474c78c89a62bdf1700d6 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 15:24:05 -0500
Subject: [PATCH 2163/3449] ffms: 2.21 -> 2.22

---
 pkgs/development/libraries/ffms/default.nix | 27 ++++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix
index 3fc3f37d2aad..5aa62a638fe8 100644
--- a/pkgs/development/libraries/ffms/default.nix
+++ b/pkgs/development/libraries/ffms/default.nix
@@ -1,23 +1,26 @@
-{ stdenv, fetchurl, zlib, ffmpeg, pkgconfig }:
+{ stdenv, fetchFromGitHub, zlib, ffmpeg, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "ffms-2.21";
+  name = "ffms-${version}";
+  version = "2.22";
 
-  src = fetchurl {
-    url = https://codeload.github.com/FFMS/ffms2/tar.gz/2.21;
-    name = "${name}.tar.gz";
-    sha256 = "00h2a5yhvr1qzbrzwbjv1ybxrx25lchgral6yxv36aaf4pi3rhn2";
+  src = fetchFromGitHub {
+    owner = "FFMS";
+    repo = "ffms2";
+    rev = version;
+    sha256 = "1ywcx1f3q533qfrbck5qhik3l617qhm062l8zixv02gnla7w6rkm";
   };
 
   NIX_CFLAGS_COMPILE = "-fPIC";
 
-  buildInputs = [ zlib ffmpeg pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ zlib ffmpeg ];
 
-  meta = {
-    homepage = http://code.google.com/p/ffmpegsource/;
+  meta = with stdenv.lib; {
+    homepage = http://github.com/FFMS/ffms2/;
     description = "Libav/ffmpeg based source library for easy frame accurate access";
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = licenses.mit;
+    maintainers = with maintainers; [ fuuzetsu ];
+    platforms = platforms.unix;
   };
 }

From f303ac7c79b000a8438cd62438db64b17f13f792 Mon Sep 17 00:00:00 2001
From: hlolli <hlolli@gmail.com>
Date: Sat, 11 Mar 2017 23:40:29 +0100
Subject: [PATCH 2164/3449] csound: 6.04 -> 6.08.1

fixes #23767
---
 pkgs/applications/audio/csound/default.nix | 26 +++++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 166ed592ad84..976ecb675e76 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libsndfile, flex, bison
+{ stdenv, fetchFromGitHub, cmake, libsndfile, flex, bison, boost
 , alsaLib ? null
 , libpulseaudio ? null
 , tcltk ? null
@@ -11,26 +11,30 @@
 # , wiiuse ? null
 }:
 
-stdenv.mkDerivation {
-  name = "csound-6.04";
+stdenv.mkDerivation rec {
+  name = "csound-6.08.1";
+  version = "6.08.1";
 
   enableParallelBuilding = true;
 
   hardeningDisable = [ "format" ];
 
-  src = fetchurl {
-    url = mirror://sourceforge/csound/Csound6.04.tar.gz;
-    sha256 = "1030w38lxdwjz1irr32m9cl0paqmgr02lab2m7f7j1yihwxj1w0g";
+  src = fetchFromGitHub {
+    owner = "csound";
+    repo = "csound";
+    rev = version;
+    sha256 = "03xnva17sw35ga3n96x1zdfgw913dga1hccly85wzfn0kxz4rld9";
   };
 
-  buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ];
+  nativeBuildInputs = [ cmake flex bison ];
+  buildInputs = [ libsndfile alsaLib libpulseaudio tcltk boost ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
     homepage = http://www.csounds.com/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [maintainers.marcweber];
+    platforms = platforms.linux;
   };
 }
 

From 6723703f465eeca88489f395e2bde29e39a9b47f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 15:43:03 -0500
Subject: [PATCH 2165/3449] filter-audio: 20150624 -> 0.0.1

---
 .../development/libraries/filter-audio/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/filter-audio/default.nix b/pkgs/development/libraries/filter-audio/default.nix
index 989d9518a0eb..3faba45714a0 100644
--- a/pkgs/development/libraries/filter-audio/default.nix
+++ b/pkgs/development/libraries/filter-audio/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "filter-audio-20150624";
+  name = "filter-audio-${version}";
+  version = "0.0.1";
 
-  src = fetchgit {
-    url = "https://github.com/irungentoo/filter_audio.git";
-    rev = "612c5a102550c614e4c8f859e753ea64c0b7250c";
-    sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na";
+  src = fetchFromGitHub {
+    owner = "irungentoo";
+    repo ="filter_audio";
+    rev = "v${version}";
+    sha256 = "1dv4pram317c1w97cjsv9f6r8cdxhgri7ib0v364z08pk7r2avfn";
   };
 
   doCheck = false;

From 1d948ddc016882b2189bfebcb501ebafee53a6fb Mon Sep 17 00:00:00 2001
From: Bo Bakker <bobakk3r@gmail.com>
Date: Sat, 11 Mar 2017 22:42:43 +0100
Subject: [PATCH 2166/3449] caf: init at 0.15.3

fixes #23772
---
 lib/maintainers.nix                        |  1 +
 pkgs/development/libraries/caf/default.nix | 23 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/caf/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index dd257a495023..e7b8ff7bf101 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -71,6 +71,7 @@
   bjg = "Brian Gough <bjg@gnu.org>";
   bjornfor = "Bjørn Forsman <bjorn.forsman@gmail.com>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
+  bobakker = "Bo Bakker <bobakk3r@gmail.com>";
   bobvanderlinden = "Bob van der Linden <bobvanderlinden@gmail.com>";
   bodil = "Bodil Stokke <nix@bodil.org>";
   boothead = "Ben Ford <ben@perurbis.com>";
diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
new file mode 100644
index 000000000000..d3e655676e64
--- /dev/null
+++ b/pkgs/development/libraries/caf/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "actor-framework-${version}";
+  version = "0.15.3";
+
+  src = fetchFromGitHub {
+    owner = "actor-framework";
+    repo = "actor-framework";
+    rev = "${version}";
+    sha256 = "0202nsdriigdh6sxi1k3hddvmf1x54qpykbvf2ghfhzyh0m1q7j2";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "An open source implementation of the actor model in C++";
+    homepage = http://actor-framework.org/;
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bobakker ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 981d2950c6a7..e294eb2dd1e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7059,6 +7059,8 @@ with pkgs;
 
   certbot = callPackage ../tools/admin/certbot { };
 
+  caf = callPackage ../development/libraries/caf {};
+
   cgal = callPackage ../development/libraries/CGAL {};
 
   cgui = callPackage ../development/libraries/cgui {};

From 586cd21796800786b0c6ead5b2a34c6930a865df Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 9 Mar 2017 21:06:40 -0600
Subject: [PATCH 2167/3449] peru: 1.0.1 -> 1.1.0

---
 .../version-management/peru/default.nix       | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
index 28df4f7fc312..01369b9685dc 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchurl, python3Packages }:
-
-let 
-  pythonPackages = python3Packages;
-in pythonPackages.buildPythonApplication rec {
+{ stdenv, fetchFromGitHub, python3Packages }:
 
+python3Packages.buildPythonApplication rec {
   name = "peru-${version}";
-  version = "1.0.1";
+  version = "1.1.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/p/peru/${name}.tar.gz";
-    sha256 = "d51771d4aa7e16119e46c39efd71b0a1a898607bf3fb7735fc688a64fc59cbf1";
+  src = fetchFromGitHub {
+    owner = "buildinspace";
+    repo = "peru";
+    rev = "${version}";
+    sha256 = "0hvp6pvpsz0f98az4f1wl93gqlz6wj24pjnc5zs1har9rqlpq8y8";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pyyaml docopt ];
+  propagatedBuildInputs = with python3Packages; [ pyyaml docopt ];
 
   # No tests in archive
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/buildinspace/peru;
     description = "A tool for including other people's code in your projects";
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
+    platforms = platforms.unix;
   };
-}
\ No newline at end of file
+
+}

From 3d9d879bc0d54bf22988b16f40b3c04c04753bc8 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 18:01:55 -0600
Subject: [PATCH 2168/3449] ace: 6.3.3 -> 6.4.2

---
 pkgs/development/libraries/ace/default.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index 10ba217175c3..9bc714c5538b 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, libtool, perl
-}:
+{ stdenv, fetchurl, pkgconfig, libtool, perl }:
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.3.3";
+  version = "6.4.2";
+
   src = fetchurl {
-    url=http://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2;
-    sha256 = "124qk205v8rx8p7rfigsargrpxjx3mh4nr99nlyk9csdc9gy8qpk";
+    url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
+    sha256 = "0dscvlgxy0fwma63azjkdbc85mh8k751ik67s88w6w75j0psld73";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [ pkgconfig libtool perl ];
+  nativeBuildInputs = [ pkgconfig libtool ];
+  buildInputs = [ perl ];
 
   patchPhase = ''substituteInPlace ./MPC/prj_install.pl \
     --replace /usr/bin/perl "${perl}/bin/perl"'';
@@ -25,12 +26,11 @@ stdenv.mkDerivation rec {
     > include/makeinclude/platform_macros.GNU
   '';
 
-meta = {
+  meta = with stdenv.lib; {
     description = "ADAPTIVE Communication Environment";
     homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html;
-    license = stdenv.lib.licenses.doc;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.nico202 ];
+    license = licenses.doc;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.nico202 ];
   };
 }
-

From d80cb1b08019ed5f93ae45a0a5fb27577d433323 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 16:21:13 -0500
Subject: [PATCH 2169/3449] gecode: 4.4.0 -> 5.0.0

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

diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index ee7b12de5027..5d683de404d9 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -2,13 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "gecode-${version}";
-  version = "4.4.0";
+  version = "5.0.0";
 
   src = fetchurl {
     url = "http://www.gecode.org/download/${name}.tar.gz";
-    sha256 = "0akqjzy6pd229mn0lhpdbyc4wbazhprkd5ijqs99z68bj3b9h0s3";
+    sha256 = "0yz7m4msp7g2jzsn216q74d9n7rv6qh8abcv0jdc1n7y2nhjzzzl";
   };
 
+  enableParallelBuilding = true;
   buildInputs = [ perl ];
 
   meta = with stdenv.lib; {

From f0bb10fea396d44d126b0e515f6dbb6265467e63 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 16:25:18 -0500
Subject: [PATCH 2170/3449] geis: 2.2.16 -> 2.2.17

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

diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index e8f4001c1b59..5a7bff7459e3 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "geis-${version}";
-  version = "2.2.16";
+  version = "2.2.17";
 
   src = fetchurl {
     url = "https://launchpad.net/geis/trunk/${version}/+download/${name}.tar.xz";
-    sha256 = "40a694092c79f325a2fbf8a9f301177bc91c364f4e637c2aa8963ad2a5aabbcf";
+    sha256 = "1svhbjibm448ybq6gnjjzj0ak42srhihssafj0w402aj71lgaq4a";
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-error=pedantic";

From 1dd16a93741c425880ac81d1e611af7be050c96b Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 12 Mar 2017 21:31:59 +0000
Subject: [PATCH 2171/3449] coreclr: mark broken

---
 pkgs/development/compilers/coreclr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 558cfa35adad..b619bf6ce208 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -102,5 +102,6 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     maintainers = with stdenv.lib.maintainers; [ obadz ];
     license = stdenv.lib.licenses.mit;
+    broken = true; # CoreCLR has proven to be very difficult to package. PRs welcome if someone wants to shave that yak.
   };
 }

From 2df3b5ca7f52393e32cbdef9ae50df9dff863ec2 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 12 Mar 2017 22:37:10 +0100
Subject: [PATCH 2172/3449] geogebra: 5-0-331-0 -> 5-0-338-0 (#23593)

---
 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 45f8dd1960b7..aee4831034d8 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-331-0";
+  version = "5-0-338-0";
 
   preferLocalBuild = true;
 
   src = fetchurl {
     url = "http://download.geogebra.org/installers/5.0/GeoGebra-Linux-Portable-${version}.tar.bz2";
-    sha256 = "135g2xqafgs1gv98vqq2jpfwyi1aflyiynx1gmsgs23jxbr218v2";
+    sha256 = "1namwib3912zjizgl9swan0fwgmq9kvfq5k5y8lz818vh4lv88kx";
   };
 
   srcIcon = fetchurl {

From 039c6a6dfad1d37c09411fecaf8e821f108f12cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 12 Mar 2017 22:45:19 +0100
Subject: [PATCH 2173/3449] haskell: comment about configuration-nix.nix's
 intersectAttrs

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 3dd462397742..9773a65cefec 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -29,6 +29,17 @@
 
 with import ./lib.nix { inherit pkgs; };
 
+# All of the overrides in this set should look like:
+#
+#   foo = ... something involving super.foo ...
+#
+# but that means that we add `foo` attribute even is there is no `super.foo`! So if
+# you want to use this configuration for a package set that only contains a subset of
+# the packages that have overrides defined here, you'll end up with a set that contains
+# a bunch of attributes that trigger an evaluation error.
+#
+# To avoid this, we use `intersectAttrs` here so we never add packages that are not present
+# in the parent package set (`super`).
 self: super: builtins.intersectAttrs super {
 
   # Apply NixOS-specific patches.

From 6c99f88eeced94c9940e45419c4608a766a02487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sun, 12 Mar 2017 22:47:28 +0100
Subject: [PATCH 2174/3449] fix typo in comment

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 9773a65cefec..981a48055bcc 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -33,7 +33,7 @@ with import ./lib.nix { inherit pkgs; };
 #
 #   foo = ... something involving super.foo ...
 #
-# but that means that we add `foo` attribute even is there is no `super.foo`! So if
+# but that means that we add `foo` attribute even if there is no `super.foo`! So if
 # you want to use this configuration for a package set that only contains a subset of
 # the packages that have overrides defined here, you'll end up with a set that contains
 # a bunch of attributes that trigger an evaluation error.

From 39cd6ccb8e557ea7697c932f2537ac5979f4dc3d Mon Sep 17 00:00:00 2001
From: Olegs Jeremejevs <olegs@jeremejevs.com>
Date: Sun, 12 Mar 2017 23:59:48 +0200
Subject: [PATCH 2175/3449] Add subl symlink for Sublime Text 3 (#23815)

---
 pkgs/applications/editors/sublime3/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index f900a4e9147c..8912aca0711d 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -66,6 +66,7 @@ in stdenv.mkDerivation {
   phases = [ "installPhase" ];
   installPhase = ''
     mkdir -p $out/bin
+    ln -s ${sublime}/sublime_text $out/bin/subl
     ln -s ${sublime}/sublime_text $out/bin/sublime
     ln -s ${sublime}/sublime_text $out/bin/sublime3
     mkdir -p $out/share/applications

From 848423f2234fc3e008799ca9475d7a164164cac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 12 Mar 2017 23:02:28 +0100
Subject: [PATCH 2176/3449] clisp-tip: make the build more reliable

Hydra shows it sometimes fails without autoconf:
http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.clisp-tip.x86_64-linux
I can't say I understand why this happened.
---
 pkgs/development/interpreters/clisp/hg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix
index b4930e7d57d6..58bb52397bf7 100644
--- a/pkgs/development/interpreters/clisp/hg.nix
+++ b/pkgs/development/interpreters/clisp/hg.nix
@@ -5,8 +5,7 @@
 # - full: contains base plus modules in withModules
 { stdenv, fetchhg, libsigsegv, gettext, ncurses, readline, libX11
 , libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
-, libffi
-, libffcall
+, libffi, libffcall, automake
 , coreutils
 # build options
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
@@ -37,6 +36,7 @@ stdenv.mkDerivation rec {
 
   ffcallAvailable = stdenv.isLinux && (libffcall != null);
 
+  nativeBuildInputs = [ automake ]; # sometimes fails otherwise
   buildInputs = [libsigsegv]
   ++ stdenv.lib.optional (gettext != null) gettext
   ++ stdenv.lib.optional (ncurses != null) ncurses

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 2177/3449] 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 a3f52fbd9199..acfdcbd26574 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 52ad1e714fb9..aa9c59ec551b 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 ff3654737afd..02d875b26748 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 e8b897fb6050..4e2c0e01ca03 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 7df72bc05605..e1b87fafd8e8 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 2705339adbfb..222dfc27256c 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 14983b744df9..c44373625e0f 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 000000000000..24aa6e5aaa1e
--- /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 adf48df2494e..f966965fa5fa 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 000000000000..4f908343e8c1
--- /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 000000000000..37419f14f40f
--- /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 47b14e0a99f8eb2c06b4a5e2fe9be9f0de8e130d Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sun, 12 Mar 2017 23:35:28 +0100
Subject: [PATCH 2178/3449] doc/language-frameworks/haskell.md: integer-simple
 improvements

* Strip the unnecessary 'pkgs' attribute.

* Remove ghc-7.6.3 as a GHC supporting integer-simple.
---
 doc/languages-frameworks/haskell.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 6d8984821741..1cab3d1e4eed 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -823,10 +823,10 @@ alternative implemention for Integer called
 [integer-simple](http://hackage.haskell.org/package/integer-simple).
 
 To get a GHC compiler build with `integer-simple` instead of `integer-gmp` use
-the attribute: `pkgs.haskell.compiler.integer-simple."${ghcVersion}"`.
+the attribute: `haskell.compiler.integer-simple."${ghcVersion}"`.
 For example:
 
-    $ nix-build -E '(import <nixpkgs> {}).pkgs.haskell.compiler.integer-simple.ghc802'
+    $ nix-build -E '(import <nixpkgs> {}).haskell.compiler.integer-simple.ghc802'
     ...
     $ result/bin/ghc-pkg list | grep integer
         integer-simple-0.1.1.1
@@ -838,7 +838,6 @@ The following command displays the complete list of GHC compilers build with `in
     haskell.compiler.integer-simple.ghc7103  ghc-7.10.3
     haskell.compiler.integer-simple.ghc722   ghc-7.2.2
     haskell.compiler.integer-simple.ghc742   ghc-7.4.2
-    haskell.compiler.integer-simple.ghc763   ghc-7.6.3
     haskell.compiler.integer-simple.ghc783   ghc-7.8.3
     haskell.compiler.integer-simple.ghc784   ghc-7.8.4
     haskell.compiler.integer-simple.ghc801   ghc-8.0.1
@@ -846,10 +845,10 @@ The following command displays the complete list of GHC compilers build with `in
     haskell.compiler.integer-simple.ghcHEAD  ghc-8.1.20170106
 
 To get a package set supporting `integer-simple` use the attribute:
-`pkgs.haskell.packages.integer-simple."${ghcVersion}"`. For example
+`haskell.packages.integer-simple."${ghcVersion}"`. For example
 use the following to get the `scientific` package build with `integer-simple`:
 
-    $ nix-build -A pkgs.haskell.packages.integer-simple.ghc802.scientific
+    $ nix-build -A haskell.packages.integer-simple.ghc802.scientific
 
 
 ## Other resources

From ba0b527456ac6885f0dd4a287d028384ffbf82b2 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 13 Mar 2017 05:40:22 +0700
Subject: [PATCH 2179/3449] exim: 4.88 -> 4.89 (#23670)

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

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 68e3ad4ca426..bf7b5d8d6ed1 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,11 +1,11 @@
 { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.88";
+  name = "exim-4.89";
 
   src = fetchurl {
-    url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.bz2";
-    sha256 = "0bca3wb45hl7h8m8bpvsmrmqa07jhbhqyigs9pl29hhzwgbmz78i";
+    url = "http://ftp.exim.org/pub/exim/exim4/${name}.tar.xz";
+    sha256 = "09lndv34jsxwglq5zsh9y4xaqj5g37g9ca4x0zb25fvvm4f0lj8c";
   };
 
   buildInputs = [ coreutils db openssl pcre perl pkgconfig ];

From 06ece41778ff3c06dbb4fad0f87e888ca6c9889d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 12 Mar 2017 12:51:03 -0500
Subject: [PATCH 2180/3449] KDE Applications: 16.12.2 -> 16.12.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 2224 ++++++++++++++++----------------
 2 files changed, 1113 insertions(+), 1113 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 607a16eb45b1..c31b8a865839 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.2/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/16.12.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 60c412e55fda..445c5783b8ee 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2227 +3,2227 @@
 
 {
   akonadi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-16.12.2.tar.xz";
-      sha256 = "1csaa69n65d3cnkajzk5702vxskfaiajvxw724s17a5y6sgk0h5z";
-      name = "akonadi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadi-16.12.3.tar.xz";
+      sha256 = "00sbchj3yjbqdjckrciv2c7j9i7kc5yqvyvbmjlxacbkq80a4j7w";
+      name = "akonadi-16.12.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-16.12.2.tar.xz";
-      sha256 = "1qfkwmh82l5ahzjpsla9gwwk2kqxv773ddq8f5h52qlxx56agc6k";
-      name = "akonadi-calendar-16.12.2.tar.xz";
+      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";
     };
   };
   akonadi-calendar-tools = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-calendar-tools-16.12.2.tar.xz";
-      sha256 = "1isjvsas6fnz2v2a8yl6ggkimfknr56a3zydwhq59lzcm15hn0hj";
-      name = "akonadi-calendar-tools-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadiconsole-16.12.2.tar.xz";
-      sha256 = "188qb2lc6d0xhvq8n5y7ax13a6wz3agg1mx3j2kphwn8f53grgzb";
-      name = "akonadiconsole-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akonadiconsole-16.12.3.tar.xz";
+      sha256 = "195amn610y5ydg665ag45xb0l1wyplbdlrwagzc7yvswp12rlcv3";
+      name = "akonadiconsole-16.12.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-contacts-16.12.2.tar.xz";
-      sha256 = "1ixd1qzakxhq9qlfr6l8igii2ny8fi8hxasdadq9cyr5jl20rpgp";
-      name = "akonadi-contacts-16.12.2.tar.xz";
+      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";
     };
   };
   akonadi-import-wizard = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-import-wizard-16.12.2.tar.xz";
-      sha256 = "0xdmcs8l0lqqx2f2yabp1xx60h1jcz05q7lk6zzapzc0xqa8pqnq";
-      name = "akonadi-import-wizard-16.12.2.tar.xz";
+      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";
     };
   };
   akonadi-mime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-mime-16.12.2.tar.xz";
-      sha256 = "0w88splvk1ci6l590kybb8dgddhk8q0mqag1xxliws534kl9bd0s";
-      name = "akonadi-mime-16.12.2.tar.xz";
+      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";
     };
   };
   akonadi-notes = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-notes-16.12.2.tar.xz";
-      sha256 = "181d4sv6vqrx0iy5fwdpd28h78i0jy4bj51jxbdn7fqmx1mavbkl";
-      name = "akonadi-notes-16.12.2.tar.xz";
+      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";
     };
   };
   akonadi-search = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akonadi-search-16.12.2.tar.xz";
-      sha256 = "1jfcpjn45cxxnfg9y15fjkig6nfj6w8ggq3a7339kdhb79lkh1p5";
-      name = "akonadi-search-16.12.2.tar.xz";
+      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";
     };
   };
   akregator = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/akregator-16.12.2.tar.xz";
-      sha256 = "0yyjpl6kajy0ip60m6vf0jnm217m5ax34a5y14k1wj7civ4fz9il";
-      name = "akregator-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/akregator-16.12.3.tar.xz";
+      sha256 = "1v6jg35ha6wrjgwfvrvy1qwl1700dmk40d0fwy1irkpdlgg79128";
+      name = "akregator-16.12.3.tar.xz";
     };
   };
   analitza = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/analitza-16.12.2.tar.xz";
-      sha256 = "1jii70a2nppfzqlzwrjvawfq2cfjqrcsj0mbpgahb8zphcfs5xhy";
-      name = "analitza-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/analitza-16.12.3.tar.xz";
+      sha256 = "0ap3sf8bw9f58pzw3zy6w60apd4ccc47zs3v61x4kp1g81rn265w";
+      name = "analitza-16.12.3.tar.xz";
     };
   };
   ark = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ark-16.12.2.tar.xz";
-      sha256 = "07jp25jqnfcx48x7w0wwyldk56czyx2341yf2k73p3fy67rldlr3";
-      name = "ark-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ark-16.12.3.tar.xz";
+      sha256 = "0q1bxrsb03pwsvxqlbnzfmahlj300l336pdrm82vin89m294ird0";
+      name = "ark-16.12.3.tar.xz";
     };
   };
   artikulate = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/artikulate-16.12.2.tar.xz";
-      sha256 = "11065zl5gdc1q7rvzmjvbz33k9xhdph7ynqwnv628c6a0478xwc5";
-      name = "artikulate-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/artikulate-16.12.3.tar.xz";
+      sha256 = "113k6c0yrir61j258gn9n6k7fifa6g9g8wxf3zq18jy3liwdl97s";
+      name = "artikulate-16.12.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/audiocd-kio-16.12.2.tar.xz";
-      sha256 = "184grq1nfpv9sfcsk6kcx6bdnbh938jc3qr6n00gnnj509347xga";
-      name = "audiocd-kio-16.12.2.tar.xz";
+      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";
     };
   };
   baloo-widgets = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/baloo-widgets-16.12.2.tar.xz";
-      sha256 = "000v5s33j6qsdbxqf856si0z5dmh9dan41kf2lrzc017hj6pr34x";
-      name = "baloo-widgets-16.12.2.tar.xz";
+      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";
     };
   };
   blinken = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/blinken-16.12.2.tar.xz";
-      sha256 = "1wcl8199wg74cv9hyrhcpqkf1awpf3q960jzgfv0z0c28xywb76x";
-      name = "blinken-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/blinken-16.12.3.tar.xz";
+      sha256 = "1z50ack1iqh194vn487nhdkrbn1camswy4a3g2ayxv3qfgmxdcga";
+      name = "blinken-16.12.3.tar.xz";
     };
   };
   blogilo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/blogilo-16.12.2.tar.xz";
-      sha256 = "0j5mz8nfndr0g99l84s7n3gxrj6y4jbql1srnyl0yspmcjwmnc09";
-      name = "blogilo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/blogilo-16.12.3.tar.xz";
+      sha256 = "14yl52m8x7b8bj2b7pkhabwg7rrmmhnkjq4z7mrxbnsndqmsi10f";
+      name = "blogilo-16.12.3.tar.xz";
     };
   };
   bomber = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/bomber-16.12.2.tar.xz";
-      sha256 = "1fy17y5grir6kbr7xzclslrxyip4favhag6wasg9ah60r6k15cqc";
-      name = "bomber-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/bomber-16.12.3.tar.xz";
+      sha256 = "1h4s6amjzazr3ywcqw8d14a0fi1arzxka0g6i9ii85s904k23r41";
+      name = "bomber-16.12.3.tar.xz";
     };
   };
   bovo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/bovo-16.12.2.tar.xz";
-      sha256 = "0dszbxisq172x5jv10w62wg3kcs1f8wdxgw9pjq423j3jq8rw9zq";
-      name = "bovo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/bovo-16.12.3.tar.xz";
+      sha256 = "1pr67gf47xmw21sv1im7k0dz18bhjfpbkhd7j5gaifj66h65sfy6";
+      name = "bovo-16.12.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/calendarsupport-16.12.2.tar.xz";
-      sha256 = "065h09kq6h2hr4lg34lqckw0g91zkhxpviagdgymx7qpdy36l2sb";
-      name = "calendarsupport-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/calendarsupport-16.12.3.tar.xz";
+      sha256 = "0r30z2wzyms7m7s8y0livsfy5pj82g988bs6amaj2571hz55d8y0";
+      name = "calendarsupport-16.12.3.tar.xz";
     };
   };
   cantor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/cantor-16.12.2.tar.xz";
-      sha256 = "055sxyl2x2mipnidrsgkmbjy4vw64pf5k0fql64p7pjhknn3i6x4";
-      name = "cantor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/cantor-16.12.3.tar.xz";
+      sha256 = "1nzg9sfnv8afpa84x51whbw1qh8gfwqnkr5zyai7817kkc97g1l8";
+      name = "cantor-16.12.3.tar.xz";
     };
   };
   cervisia = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/cervisia-16.12.2.tar.xz";
-      sha256 = "1fdnvdp27wa8pni4vq501ajdln6dmg2kc0468x1c375g734npabx";
-      name = "cervisia-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/cervisia-16.12.3.tar.xz";
+      sha256 = "14r55ngvz4rci1h3iqdwbfcyxmm2b04c5smkv9x0bqxq4zz2yfvk";
+      name = "cervisia-16.12.3.tar.xz";
     };
   };
   dolphin = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/dolphin-16.12.2.tar.xz";
-      sha256 = "1xqkrkhpcxcrrk3msd7fkhqikwrx2mjd0c4cna2iwd0s4h7ahmy6";
-      name = "dolphin-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/dolphin-16.12.3.tar.xz";
+      sha256 = "0y35ljbjib4pvyngdgbq1yx3rfmy94crpa7v1zzwfav94lm3kwb2";
+      name = "dolphin-16.12.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/dolphin-plugins-16.12.2.tar.xz";
-      sha256 = "07i4w95b20db51bzg0rnx6m3dgk2bz5nwivz6zngfiiksmb39dj3";
-      name = "dolphin-plugins-16.12.2.tar.xz";
+      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";
     };
   };
   dragon = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/dragon-16.12.2.tar.xz";
-      sha256 = "07iip379kpwy8yfiwacykkgzj7bfw2nz3vij61q68lr64k5sg4kk";
-      name = "dragon-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/dragon-16.12.3.tar.xz";
+      sha256 = "1652cl6sa9d71c685xpwqv5hgz3spxg2hynwcnn8xybn5hv9ar4r";
+      name = "dragon-16.12.3.tar.xz";
     };
   };
   eventviews = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/eventviews-16.12.2.tar.xz";
-      sha256 = "1hl0adi0ss533mnncyih3y9075i90accklbk8068dvxb7la9b7zd";
-      name = "eventviews-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/eventviews-16.12.3.tar.xz";
+      sha256 = "0z8jznvw2nhszrlll7458gb4r0585ivkbq9dqplkw2mdrv7vxz5c";
+      name = "eventviews-16.12.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ffmpegthumbs-16.12.2.tar.xz";
-      sha256 = "0p1fqxqcgz3k910acacr86pa66yl5d65wxf93nlg4627dfhmrbkc";
-      name = "ffmpegthumbs-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ffmpegthumbs-16.12.3.tar.xz";
+      sha256 = "1scyyd85rs21rv3ghcxv7pw3aa2nl703gi4dpikbsd7wjmxixzq9";
+      name = "ffmpegthumbs-16.12.3.tar.xz";
     };
   };
   filelight = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/filelight-16.12.2.tar.xz";
-      sha256 = "0ynqnagyrn61gzvi0rl38200yxbxa2zpch3cl917wff527kjd7cw";
-      name = "filelight-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/filelight-16.12.3.tar.xz";
+      sha256 = "13gcx1w9zq3i9fy32m3ypjyqcd9vrkqyr0j4cbqfvhpzv2chk3is";
+      name = "filelight-16.12.3.tar.xz";
     };
   };
   granatier = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/granatier-16.12.2.tar.xz";
-      sha256 = "01b0nvfj5v2spaml003bpd4f5snncxsilfplwgb06kf8wwsb9mzd";
-      name = "granatier-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/granatier-16.12.3.tar.xz";
+      sha256 = "17vpz6jz2vvpvsrhvllglacrwg0sxy15aqnm8n6d73sk9zlv9n76";
+      name = "granatier-16.12.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/grantlee-editor-16.12.2.tar.xz";
-      sha256 = "16r1f7vwsqfngv3kld4wqmvxn4pnxgcpiaaxa2z9szsjfrz10bp9";
-      name = "grantlee-editor-16.12.2.tar.xz";
+      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";
     };
   };
   grantleetheme = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/grantleetheme-16.12.2.tar.xz";
-      sha256 = "09qr7icbkq4my594xkjkydkfwx8sixbc73i3gxjnki64w549gan2";
-      name = "grantleetheme-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/grantleetheme-16.12.3.tar.xz";
+      sha256 = "19mka62p75qnv6r9ib70y25jjj3bpziz0xqihfkb6jvafrgy8p8k";
+      name = "grantleetheme-16.12.3.tar.xz";
     };
   };
   gwenview = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/gwenview-16.12.2.tar.xz";
-      sha256 = "1ldflh10b34r9xy8a8yh72jcjdxs3ylhyjhs97xcg381q4dyg1dr";
-      name = "gwenview-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/gwenview-16.12.3.tar.xz";
+      sha256 = "069fblw9g9h6r9gy05nj2n93jpnsx610jncwl6403q01rwlbrgbr";
+      name = "gwenview-16.12.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/incidenceeditor-16.12.2.tar.xz";
-      sha256 = "0z8ysrdkxfkn71anlzifd0dxh6fysl924jh4wjsphb4dnb417rym";
-      name = "incidenceeditor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/incidenceeditor-16.12.3.tar.xz";
+      sha256 = "11jplw3fngnyvpjkhqwv1gzzwxxcm4v93h09f68hs015apncjvpp";
+      name = "incidenceeditor-16.12.3.tar.xz";
     };
   };
   jovie = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/jovie-16.12.2.tar.xz";
-      sha256 = "19ifp3p02ayka2zqnwfq381mjqpxhm0hydf1yx9lh2p8n6j9s4gy";
-      name = "jovie-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/jovie-16.12.3.tar.xz";
+      sha256 = "190c4g587x4wxbfksf0mszq5qv1pzny6bkd3w2pwwsj222bl0fxa";
+      name = "jovie-16.12.3.tar.xz";
     };
   };
   juk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/juk-16.12.2.tar.xz";
-      sha256 = "1453s0zxagqmx91f3x7fqrb6xdlgzr2sqj6hcj2pgl6jaz2x3n1c";
-      name = "juk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/juk-16.12.3.tar.xz";
+      sha256 = "1ssgia5sknam2hnjflzglv0khxbwyyvzm4w1wmxw04rbjzs4gi4h";
+      name = "juk-16.12.3.tar.xz";
     };
   };
   kaccessible = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaccessible-16.12.2.tar.xz";
-      sha256 = "1ibh2nw4bdnj1ll8qp3d3vkwvzdkv2k53n98p9282w3jhckpiq5r";
-      name = "kaccessible-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kaccessible-16.12.3.tar.xz";
+      sha256 = "162a4pw61b3rhq5mf7zdhgyyhbrxhr9fjw7bidicw7aljiy2cwb9";
+      name = "kaccessible-16.12.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaccounts-integration-16.12.2.tar.xz";
-      sha256 = "0nx9wlh7arjqz0wf2zyaj3fwzm7sn38hn00m74mj7zvxr1pwcypv";
-      name = "kaccounts-integration-16.12.2.tar.xz";
+      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";
     };
   };
   kaccounts-providers = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaccounts-providers-16.12.2.tar.xz";
-      sha256 = "0dln1l44bzaw782qjc57w2hgydbqzn4g7xh8d93qq52yz8ph875g";
-      name = "kaccounts-providers-16.12.2.tar.xz";
+      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";
     };
   };
   kaddressbook = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kaddressbook-16.12.2.tar.xz";
-      sha256 = "023mfnin8si234yczhhfm3nk083w8bixg1b3gr8bzc1x92ka93m2";
-      name = "kaddressbook-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kaddressbook-16.12.3.tar.xz";
+      sha256 = "1a86asy0pw8ivyg7aaw2mais4xbplabp5aljzcyb2rykij6482rh";
+      name = "kaddressbook-16.12.3.tar.xz";
     };
   };
   kajongg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kajongg-16.12.2.tar.xz";
-      sha256 = "0909hzwj8yf6sv97r2rgzbp8l7ixlxxy8nwy8dcv471dznlvqznn";
-      name = "kajongg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kajongg-16.12.3.tar.xz";
+      sha256 = "0xwwkl2npls0aq4435xlcvssm8pmfhramjgxv70mnjapr0dlpk5c";
+      name = "kajongg-16.12.3.tar.xz";
     };
   };
   kalarm = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalarm-16.12.2.tar.xz";
-      sha256 = "1znp4lym95jz93wwn1nrw9q8nkbwg7x489iccndrv4pl93jfsnqk";
-      name = "kalarm-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalarm-16.12.3.tar.xz";
+      sha256 = "1n3h252cvqib1bx4ryq3xgj2mkqr38wvhiyj2vkkll4pf5lphpqz";
+      name = "kalarm-16.12.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalarmcal-16.12.2.tar.xz";
-      sha256 = "06rx33hdwz940cggr5rg6g1gh84yzz6vrnvk5lrgr8vxqgrssp3s";
-      name = "kalarmcal-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalarmcal-16.12.3.tar.xz";
+      sha256 = "064sihcsbdi1w6viv5gq6sw2m8r7x3nn1hl2aji1109pf5913vbr";
+      name = "kalarmcal-16.12.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalgebra-16.12.2.tar.xz";
-      sha256 = "02yykjrsa01r697bk4jsly7762hvml7f67gy33vgywhh8lz3h3cd";
-      name = "kalgebra-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalgebra-16.12.3.tar.xz";
+      sha256 = "0qhini5gm41dlyham4zzqgz6r11s2rfwwphb81xvwp1bgn8q2rqb";
+      name = "kalgebra-16.12.3.tar.xz";
     };
   };
   kalzium = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kalzium-16.12.2.tar.xz";
-      sha256 = "043prql6bwg2ka6y0inh8h46y7d5060b0h2inw0lhm49vizgkmsh";
-      name = "kalzium-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kalzium-16.12.3.tar.xz";
+      sha256 = "0rlfjqfb1vpr0cdcx429nvrbkr7kc1m4ps3z3pphkajq4vlrql8i";
+      name = "kalzium-16.12.3.tar.xz";
     };
   };
   kamera = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kamera-16.12.2.tar.xz";
-      sha256 = "1kxmjpk0vdj9s3kxgcp2vw8dpx4r69j3jwifyvzrh06sg9z0bnqd";
-      name = "kamera-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kamera-16.12.3.tar.xz";
+      sha256 = "04p19qv5ssf5wlpfqzhqsi8281pzcdjkd0jy177f9r7qgqq4lkgr";
+      name = "kamera-16.12.3.tar.xz";
     };
   };
   kanagram = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kanagram-16.12.2.tar.xz";
-      sha256 = "09d20x0z066pgkwp25ig49v78k89nyxs769a3zjmq1y490nm34y1";
-      name = "kanagram-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kanagram-16.12.3.tar.xz";
+      sha256 = "183hkxxwf7h335gmfvi2lppsyhpv80lvlg1fg4whq79f1d2lrw47";
+      name = "kanagram-16.12.3.tar.xz";
     };
   };
   kapman = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kapman-16.12.2.tar.xz";
-      sha256 = "0g9swdgz8sd49q3sw2107b50ww978nppzp1b7bkv7ygiz49p28bq";
-      name = "kapman-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kapman-16.12.3.tar.xz";
+      sha256 = "1if3dzn1qy2pr42zcmzpq7f38spkxh492gl12vndckzah67cmz4g";
+      name = "kapman-16.12.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kapptemplate-16.12.2.tar.xz";
-      sha256 = "1agpq16wxbzd7crgbj1cj60alqv090dkvxi2szg054bmks82j6rc";
-      name = "kapptemplate-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kapptemplate-16.12.3.tar.xz";
+      sha256 = "036npdxyh9rx0aaiwvdjqrb39f8bqglqbl3iddb1vh7w9p1h158n";
+      name = "kapptemplate-16.12.3.tar.xz";
     };
   };
   kate = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kate-16.12.2.tar.xz";
-      sha256 = "1hkqzidd2cfp3wg7pq47ymsw1dh26qwn4cybnxw23d95ss85wx2p";
-      name = "kate-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kate-16.12.3.tar.xz";
+      sha256 = "1fbrdlf64bdj71g692fkk7fiym0nm9vvbki2q105carrhl4w9s0r";
+      name = "kate-16.12.3.tar.xz";
     };
   };
   katomic = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/katomic-16.12.2.tar.xz";
-      sha256 = "1sgi8npzq3p7qwv3c4q8ji83gp33zxb0i19dx2i6rb45lir3lj68";
-      name = "katomic-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/katomic-16.12.3.tar.xz";
+      sha256 = "14dnfjww1fzgz3nbg45ck5yqbxdyvp0la9qs4n5cjy1ym52k5pjm";
+      name = "katomic-16.12.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kblackbox-16.12.2.tar.xz";
-      sha256 = "1cv5kqyqspiz0aaamnyq37s683m2iw27ma6yf3blm5f9g1r43n2k";
-      name = "kblackbox-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kblackbox-16.12.3.tar.xz";
+      sha256 = "0i359pq65swrzsb7vdk0m00vjrj2xgvbgxin8ly2cijqlmfd3iv8";
+      name = "kblackbox-16.12.3.tar.xz";
     };
   };
   kblocks = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kblocks-16.12.2.tar.xz";
-      sha256 = "1xd5pxpi97nmrp4xglhm2qfpz8ksv8vyq4wrv25qbgvfc8jis790";
-      name = "kblocks-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kblocks-16.12.3.tar.xz";
+      sha256 = "09kdbwya4xl84vzayhz286lmfb6a0mmp9i40hzldfl59as4d67kw";
+      name = "kblocks-16.12.3.tar.xz";
     };
   };
   kblog = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kblog-16.12.2.tar.xz";
-      sha256 = "001mqvahsmf4amxqmz2ah5chlgpp2zi8g4pcg83qb9d65cvr6877";
-      name = "kblog-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kblog-16.12.3.tar.xz";
+      sha256 = "0q1qswg7dgy0jvk9kaz6cps6sfddsmv0lp5r3nhk751l497bbl3x";
+      name = "kblog-16.12.3.tar.xz";
     };
   };
   kbounce = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kbounce-16.12.2.tar.xz";
-      sha256 = "1gsrafcjk55lbxi2mx382hj2lahlgnn3pv13ldi7zh6ms4sms1wm";
-      name = "kbounce-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kbounce-16.12.3.tar.xz";
+      sha256 = "0cwvsbw0a60a2csxqvpkm3znbcd1whsl80v63ljyc3gyik7wxil0";
+      name = "kbounce-16.12.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kbreakout-16.12.2.tar.xz";
-      sha256 = "0lwwz17ynhdi6qw76yih8an6p890w8gwh1khsr8casc1wlm04s0y";
-      name = "kbreakout-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kbreakout-16.12.3.tar.xz";
+      sha256 = "0zszxxw7r7ggxhc47pngsi7bl57mnhbzkb0bhvy5rcyamgi90v39";
+      name = "kbreakout-16.12.3.tar.xz";
     };
   };
   kbruch = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kbruch-16.12.2.tar.xz";
-      sha256 = "1n119nkm0385pv8pngsbwxd56v6y6pwh0rshbk0ryd7974i2z4mi";
-      name = "kbruch-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kbruch-16.12.3.tar.xz";
+      sha256 = "12zmp9ix8q9mf3a4xpbsr0y9h4g1srwx48604x1phdwwdhgx0gsj";
+      name = "kbruch-16.12.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcachegrind-16.12.2.tar.xz";
-      sha256 = "0wcizav1z3n31n7qcc05mx42vl2rv71c7haaa8vn0ma39rj4iaqv";
-      name = "kcachegrind-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcachegrind-16.12.3.tar.xz";
+      sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
+      name = "kcachegrind-16.12.3.tar.xz";
     };
   };
   kcalc = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcalc-16.12.2.tar.xz";
-      sha256 = "07lyssmkq34ym1w3ajm1vf4f57xv2h8y2zb039vj7gdx609syaq0";
-      name = "kcalc-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcalc-16.12.3.tar.xz";
+      sha256 = "06kfz1d5i01h31v277y04pqnx08yv0050rlb6phv72cx6div4mgp";
+      name = "kcalc-16.12.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcalcore-16.12.2.tar.xz";
-      sha256 = "1lq5shp8jwy490qx0rnc0sd67976r7j3sblzw0j5hn95k8n23hzd";
-      name = "kcalcore-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcalcore-16.12.3.tar.xz";
+      sha256 = "09i43vs6jpjmmk52df6pzclh0jn8shn3wfnaivw2wlirwa60d901";
+      name = "kcalcore-16.12.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcalutils-16.12.2.tar.xz";
-      sha256 = "1sf5f8mwjdi2d8lpkrprnqc9jkj72p6mdz3pbczmixgfy7d7y4ci";
-      name = "kcalutils-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcalutils-16.12.3.tar.xz";
+      sha256 = "0449029fa1w496fmb81csb5amk801n11ish450drqw34lp9qla4n";
+      name = "kcalutils-16.12.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcharselect-16.12.2.tar.xz";
-      sha256 = "0a5cmc6n9h8h64in68qdi8bmqx341fvm8vf98vcqn5sivwwnflhc";
-      name = "kcharselect-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcharselect-16.12.3.tar.xz";
+      sha256 = "1iwqqds9fy970ykgq1xbpbrzpdacy1h4bw87h1jingi42z1jkw2n";
+      name = "kcharselect-16.12.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcolorchooser-16.12.2.tar.xz";
-      sha256 = "07psjid00bjw0s6xx2hq96f8cj2axdsr7lqvgrclksa07lphzcvm";
-      name = "kcolorchooser-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcolorchooser-16.12.3.tar.xz";
+      sha256 = "13nkvxl3z2l3m6zs057ipxgqfgsw7gma1rs66maqhzl30k3hrcyb";
+      name = "kcolorchooser-16.12.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcontacts-16.12.2.tar.xz";
-      sha256 = "18z7894xh1ifkg177xxy41n61djcy07m8a39favbpab0ya1xk81l";
-      name = "kcontacts-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcontacts-16.12.3.tar.xz";
+      sha256 = "1479g32c9532pjgmfpy38vycii1sxk1nzv27z7wbgpxch6735szx";
+      name = "kcontacts-16.12.3.tar.xz";
     };
   };
   kcron = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kcron-16.12.2.tar.xz";
-      sha256 = "1z72wcrr8ggw89ivq70v98zwg1hw3sn5l5czpq00scqpaf8664g2";
-      name = "kcron-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kcron-16.12.3.tar.xz";
+      sha256 = "0whxc9h7qn0fwcca9sq6qy0j4hfb8xlkdypnb6gspl687ws799xz";
+      name = "kcron-16.12.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdebugsettings-16.12.2.tar.xz";
-      sha256 = "1zbmvn9c1sjjxiskivl0s4mpmh52hqj7921v2bac7bvqd2hkc5cv";
-      name = "kdebugsettings-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdebugsettings-16.12.3.tar.xz";
+      sha256 = "0mkhklv4dynz23w8w9yh5qspdlfp3hi6fyiijyfwj358rqgbf3p5";
+      name = "kdebugsettings-16.12.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-dev-scripts-16.12.2.tar.xz";
-      sha256 = "0l4sbzpnczixavyppc3swb09jna44rb61awwgh37ngsz97iza3sx";
-      name = "kde-dev-scripts-16.12.2.tar.xz";
+      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";
     };
   };
   kde-dev-utils = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-dev-utils-16.12.2.tar.xz";
-      sha256 = "0fhf9w5v355jsrr25yhj612gi0qh8kvrbfdfplns04q7viycn44f";
-      name = "kde-dev-utils-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdeedu-data-16.12.2.tar.xz";
-      sha256 = "05jhqasi5h5dl4xlydx6jmn1i81qd8q8bzimhc2f9bwakkhqf73b";
-      name = "kdeedu-data-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-mobipocket-16.12.2.tar.xz";
-      sha256 = "07mpm55ipdqq6absvhcsrbc3c9xmb3b5bnl5k852mqpp0v36ijs8";
-      name = "kdegraphics-mobipocket-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdegraphics-thumbnailers-16.12.2.tar.xz";
-      sha256 = "0asv8wjr5nm5i6zylvhn8qgxvpr79yg681rc6mg1liimimwzxia3";
-      name = "kdegraphics-thumbnailers-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ar = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ar-16.12.2.tar.xz";
-      sha256 = "0an0r2l4vc2sdi4lc2p7iks9gnwasgvxnq81vf3qb40q290x4fim";
-      name = "kde-l10n-ar-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ast = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ast-16.12.2.tar.xz";
-      sha256 = "0fjpypz9w1ic9w75gpp1c71l43x3j8nm37h1bgbqkyik3spxin2l";
-      name = "kde-l10n-ast-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-bg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bg-16.12.2.tar.xz";
-      sha256 = "1iwcs8nz2rfi0b05ypl6mydiw02c64hscy3zlz998nww65x3nks0";
-      name = "kde-l10n-bg-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-bs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-bs-16.12.2.tar.xz";
-      sha256 = "0kps4paygx10l2nijwd946wns6sxlgn2771fzv1cmn5h1smffhkn";
-      name = "kde-l10n-bs-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ca = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca-16.12.2.tar.xz";
-      sha256 = "0r6yccw7fdi2dsz9qf9rccgdmznkc66z5c51asdhrmyzq4x7c7r2";
-      name = "kde-l10n-ca-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-16.12.2";
+    version = "ca_valencia-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ca@valencia-16.12.2.tar.xz";
-      sha256 = "15wpsjzk9z61rpai8dzpzi5j9w57nmhm7fx4b6i5hsr9c4ypmi01";
-      name = "kde-l10n-ca_valencia-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-cs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-cs-16.12.2.tar.xz";
-      sha256 = "1z6a3rl7p0wmq6zs8fap052dp5hvlpzxf4xvjxk9c75wl2m9nvlg";
-      name = "kde-l10n-cs-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-da = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-da-16.12.2.tar.xz";
-      sha256 = "0zi7h0cvzza1ly88821fsl2bnr2vn524rrdqsfc9yj3z1jbpnn2h";
-      name = "kde-l10n-da-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-de = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-de-16.12.2.tar.xz";
-      sha256 = "0s1c22ad1r0qxpkc878gxz2wqkb52qrn1k753kqpn9105p5l92fh";
-      name = "kde-l10n-de-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-el = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-el-16.12.2.tar.xz";
-      sha256 = "02d4j12yr4v9apa3iziza611v6cgjf6725wgd41g00pj41p61kcq";
-      name = "kde-l10n-el-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-16.12.2";
+    version = "en_GB-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-en_GB-16.12.2.tar.xz";
-      sha256 = "09h3zsq5qhzyagl8xysv74g2iv26739y02xgbwv5dahv0iln99rs";
-      name = "kde-l10n-en_GB-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-eo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eo-16.12.2.tar.xz";
-      sha256 = "1isqdnnj1g9jxagns3yq611pfd6nbanji9a8igfgm55djj5hx527";
-      name = "kde-l10n-eo-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-es = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-es-16.12.2.tar.xz";
-      sha256 = "0h3c5an1i072rk9mkc9mc6k3bvlk37slhgl6qy3rs2l77mhhnpyi";
-      name = "kde-l10n-es-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-et = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-et-16.12.2.tar.xz";
-      sha256 = "0dpkxwpl17pgimx94v67wq90fzdayp6p3wcz7y0g8b0hn3bsbidj";
-      name = "kde-l10n-et-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-eu = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-eu-16.12.2.tar.xz";
-      sha256 = "0q7l5s502ayr2vfa4ysvk4c6k5i8y5ci6yb34mm3lpwlain3bssb";
-      name = "kde-l10n-eu-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-fa = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fa-16.12.2.tar.xz";
-      sha256 = "03qvv814kvddf24fjvg55pbxaq58kc936b5qwbddxjr05n1dy964";
-      name = "kde-l10n-fa-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-fi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fi-16.12.2.tar.xz";
-      sha256 = "0902bbyi10vpn0qn0xn46p8fy98kaa4cvlgnn4cb2dgp8q3kni8j";
-      name = "kde-l10n-fi-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-fr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-fr-16.12.2.tar.xz";
-      sha256 = "0zjlryvyq8z2llrba4hp3awz5hq74b6z21wp2x86g4k6y154i0as";
-      name = "kde-l10n-fr-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ga = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ga-16.12.2.tar.xz";
-      sha256 = "1gwd4r28qv5sh4r008nq5mdzzb8cwq8dg17r19l3syydxxhjlf86";
-      name = "kde-l10n-ga-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-gl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-gl-16.12.2.tar.xz";
-      sha256 = "1jka29dh5aqdzgmqc9rf3lmrq4mm4vahhsk2klhp12ajzp9dgg70";
-      name = "kde-l10n-gl-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-he = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-he-16.12.2.tar.xz";
-      sha256 = "0g87g0mpa3i59fk4fm5hk2z54s07cy9niy2kal50fbm5lnr7czfk";
-      name = "kde-l10n-he-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-hi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hi-16.12.2.tar.xz";
-      sha256 = "05q608wic0ssx0d14n39s786k8xw86hc560ywfs3k89v973nba5b";
-      name = "kde-l10n-hi-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-hr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hr-16.12.2.tar.xz";
-      sha256 = "0sm7ba6x3hgw1ml6qm00g9dfi56w2kx3pk37944l3r4jx2wdqs4f";
-      name = "kde-l10n-hr-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-hu = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-hu-16.12.2.tar.xz";
-      sha256 = "1qcdqm6wjcgd5br99mm93lwlaxk5dvrliyj1ff4bxfxx0cabhx2g";
-      name = "kde-l10n-hu-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ia = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ia-16.12.2.tar.xz";
-      sha256 = "0r1fryhi4czgbl1r228zry0msk11s075y15i4flznwdps99s5q8c";
-      name = "kde-l10n-ia-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-id = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-id-16.12.2.tar.xz";
-      sha256 = "1lz51bilx8dziiff65l91pknif9w7390q3l9amdlcjq86cj44khz";
-      name = "kde-l10n-id-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-is = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-is-16.12.2.tar.xz";
-      sha256 = "08bqhxppib360ywzmphjqx5yalzr3bgwpqkff79rl5ffq9dd4psv";
-      name = "kde-l10n-is-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-it = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-it-16.12.2.tar.xz";
-      sha256 = "12k9vqdr2nrcqh535crylxrmznndx7bkwz68vrdvqidlabd0ci7m";
-      name = "kde-l10n-it-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ja = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ja-16.12.2.tar.xz";
-      sha256 = "0i9hc66qlnq0yij9d3754m5wa2wkra95wcdbp6xwk82ws7lkckai";
-      name = "kde-l10n-ja-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-kk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-kk-16.12.2.tar.xz";
-      sha256 = "1h9scz1z046szxf54702w3wzlsvzr8016rx9fwg7z5fc1vpkhxxn";
-      name = "kde-l10n-kk-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-km = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-km-16.12.2.tar.xz";
-      sha256 = "09vw686y9qdx09cz58d11ldqz5bsnch1sx2dsbxvp1drypb1nhxk";
-      name = "kde-l10n-km-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ko = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ko-16.12.2.tar.xz";
-      sha256 = "1q9kla2djqsvkj773wybxb1lds50v0lg3jkfpnrg2pvm49jl2c9g";
-      name = "kde-l10n-ko-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-lt = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lt-16.12.2.tar.xz";
-      sha256 = "1i6nzmqm1sl895x7hnsk9snw2ci8cbdvswdfbvllqivcd8l4vmg5";
-      name = "kde-l10n-lt-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-lv = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-lv-16.12.2.tar.xz";
-      sha256 = "0why1sa09pd7pwwa57c27y969ijgmjsmni8x7n9gxx5w0317kq9d";
-      name = "kde-l10n-lv-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-mr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-mr-16.12.2.tar.xz";
-      sha256 = "0wkncbs5di9vlcfqbc8g4msp6kp926049jlkj4jhvgj1in434ay8";
-      name = "kde-l10n-mr-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-nb = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nb-16.12.2.tar.xz";
-      sha256 = "0p9yq33jzh83c1471072p94mrx8jazrinb987ifrl5lk8m54k34z";
-      name = "kde-l10n-nb-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-nds = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nds-16.12.2.tar.xz";
-      sha256 = "1yb7axm4k1rlfp41s9q8ql7l2mjbyrf7ry1ww7c1rprcb93gm7f8";
-      name = "kde-l10n-nds-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-nl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nl-16.12.2.tar.xz";
-      sha256 = "04d75kfxxijb4a7xk5saxz5vbrwfsl2nx0i4x3d4i2k06wzysvch";
-      name = "kde-l10n-nl-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-nn = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-nn-16.12.2.tar.xz";
-      sha256 = "09vmvvmakcybgy6zl51xj05wflq88xkbjmns4wv42jf0fn4kipif";
-      name = "kde-l10n-nn-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-pa = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pa-16.12.2.tar.xz";
-      sha256 = "0nv9pch0s24aamcz8lgbs26kp343kyw0rnz4a7myzcrb8g8sm0d3";
-      name = "kde-l10n-pa-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-pl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pl-16.12.2.tar.xz";
-      sha256 = "1bxhcqwmcfl2srfrn50ib57890m3m6w4x9vwn24qxwapb9s6nzav";
-      name = "kde-l10n-pl-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-pt = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt-16.12.2.tar.xz";
-      sha256 = "02x96cdvrbdcmrhnn4pamsdnr8m530p047avh82xvjvqywsnqf7z";
-      name = "kde-l10n-pt-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-16.12.2";
+    version = "pt_BR-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-pt_BR-16.12.2.tar.xz";
-      sha256 = "17155laifayfb5c2hznlpnmaa8kwxzlmk7yb2skrf92fzzqx2379";
-      name = "kde-l10n-pt_BR-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ro = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ro-16.12.2.tar.xz";
-      sha256 = "1zsng3m031cbyz1jl5lv1fjg5vb3ig3pk0gaamvxbs6fxaz14ss3";
-      name = "kde-l10n-ro-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ru = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ru-16.12.2.tar.xz";
-      sha256 = "1shs2j4kqqf2b8jz2691yi45f5bpsr9nx2i5j67mmn94dnds4ps6";
-      name = "kde-l10n-ru-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-sk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sk-16.12.2.tar.xz";
-      sha256 = "1397sxczn9jdxbab3d9296w15swc40a8ypa3f4yhckqm4nmr8xn1";
-      name = "kde-l10n-sk-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-sl = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sl-16.12.2.tar.xz";
-      sha256 = "1z14sbdk5zdshn36wija4hkj7l825i336bz92rq42f8by4mha0h4";
-      name = "kde-l10n-sl-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-sr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sr-16.12.2.tar.xz";
-      sha256 = "12v6whnydgxxpx9vl3pimnxqny22kfiv51i1r9dk6vfqik18kxzy";
-      name = "kde-l10n-sr-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-sv = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-sv-16.12.2.tar.xz";
-      sha256 = "10dzz39779lbb5mcnnmhwm86pkwc2g5qyiqg5jzpf0mg1zbl9y3w";
-      name = "kde-l10n-sv-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-tr = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-tr-16.12.2.tar.xz";
-      sha256 = "0m4rgz7ha2i9bladavc5g3n94kai82ilx8akd2jcxz6q3wb75r0r";
-      name = "kde-l10n-tr-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-ug = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-ug-16.12.2.tar.xz";
-      sha256 = "1kjdiy92pi5vdxbfy61ckq8j9pc8kmrccfqnlm7yqvh8p5i28p2x";
-      name = "kde-l10n-ug-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-uk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-uk-16.12.2.tar.xz";
-      sha256 = "1nhclnwy5lgkzhs6lm8dkhh4957v78rv2d9ss13a1jn2salz5kfv";
-      name = "kde-l10n-uk-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-wa = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-wa-16.12.2.tar.xz";
-      sha256 = "12f2kvks21hj5gjqjys7fa295148j0ndhxbzs5jysl0zq9y4909j";
-      name = "kde-l10n-wa-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-16.12.2";
+    version = "zh_CN-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_CN-16.12.2.tar.xz";
-      sha256 = "1v21kap5lyzgygqv02jjx9yrfnkjkk0qrd85l0pjhqjyycs5r97w";
-      name = "kde-l10n-zh_CN-16.12.2.tar.xz";
+      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";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-16.12.2";
+    version = "zh_TW-16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-l10n/kde-l10n-zh_TW-16.12.2.tar.xz";
-      sha256 = "049q9d9ykhxk0dkmm4aw7fx1aa39s5cslk4011335jmg1msmrfna";
-      name = "kde-l10n-zh_TW-16.12.2.tar.xz";
+      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.29";
+    version = "4.14.30";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdelibs-4.14.29.tar.xz";
-      sha256 = "0xvw0cscvz8arclgfhrrbgdg94mz4h9y33nyndlsw67qrbg8slqv";
-      name = "kdelibs-4.14.29.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdenetwork-filesharing-16.12.2.tar.xz";
-      sha256 = "0q43c2xim5ibxyib1xz1wfz6bigkmk97bkvy9wrlk869c0qvrcn5";
-      name = "kdenetwork-filesharing-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdenlive-16.12.2.tar.xz";
-      sha256 = "116lk641qlx8jkiaxm54g6svc6adg0bilhf634cyc8c46991a8z7";
-      name = "kdenlive-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdepim-addons-16.12.2.tar.xz";
-      sha256 = "1gi87bbdkj8cwinhicr5r6qxysc5rmylj8gajn0qh99rsyxy52dn";
-      name = "kdepim-addons-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdepim-apps-libs-16.12.2.tar.xz";
-      sha256 = "07imq7nb1aqan8pbapvqg9mkzj18pj1v9xah9lpi6k64rhh0bkw9";
-      name = "kdepim-apps-libs-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdepim-runtime-16.12.2.tar.xz";
-      sha256 = "0wd04zhc7nq2qf8iyjqf036bjs5by0zl0c58hl8r579b7gp5xljz";
-      name = "kdepim-runtime-16.12.2.tar.xz";
+      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";
     };
   };
   kde-runtime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kde-runtime-16.12.2.tar.xz";
-      sha256 = "1bsnb7inxqv652vq9izwdj02gi15xxf34my51kdq2xk9dn2kmj8x";
-      name = "kde-runtime-16.12.2.tar.xz";
+      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";
     };
   };
   kdesdk-kioslaves = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdesdk-kioslaves-16.12.2.tar.xz";
-      sha256 = "18wd4lb3v2br40xclsig718r8mqs5hgl7xw13pq5bfqk5kx11md1";
-      name = "kdesdk-kioslaves-16.12.2.tar.xz";
+      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";
     };
   };
   kdesdk-thumbnailers = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdesdk-thumbnailers-16.12.2.tar.xz";
-      sha256 = "1jjchrbpyxjzs4zv68av53zhnlj46705261p0ad7x9ayb1mdrr24";
-      name = "kdesdk-thumbnailers-16.12.2.tar.xz";
+      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";
     };
   };
   kdf = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdf-16.12.2.tar.xz";
-      sha256 = "0zkwqqrcna2f9j4g798lhdi2v5j9p6r3zqkhf7clh4nk2c6f766k";
-      name = "kdf-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdf-16.12.3.tar.xz";
+      sha256 = "1502ib1hlc5xxsphspxwj8jvjm7qig0zdwckvm3nmh7hf4474sc5";
+      name = "kdf-16.12.3.tar.xz";
     };
   };
   kdialog = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdialog-16.12.2.tar.xz";
-      sha256 = "0jrp06zbdj5c3nigdard0a7whb3lg8j2lgnf3dp2gf7iqj8gb189";
-      name = "kdialog-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdialog-16.12.3.tar.xz";
+      sha256 = "161barz5x9jrdk2p5hqc2vk1rqfwn8nlhdmc1vjqnhvww786ghmh";
+      name = "kdialog-16.12.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kdiamond-16.12.2.tar.xz";
-      sha256 = "1bflb2lbhahwmcqzck0xbr39rcbyaw4fzjaalbsdf9n5mk5ixmxs";
-      name = "kdiamond-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kdiamond-16.12.3.tar.xz";
+      sha256 = "0qdh9ngrz5ph0kly27c58sxhwamqm3wq566337yhdqjizzcin4pf";
+      name = "kdiamond-16.12.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/keditbookmarks-16.12.2.tar.xz";
-      sha256 = "16a2sq92r6nq7ksp905xp9v3fv8ynhfp9hslq4a46v71an06yh4p";
-      name = "keditbookmarks-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/keditbookmarks-16.12.3.tar.xz";
+      sha256 = "0dn3jb5lsjj2c6pbrbn4cik68fqqk99ljl45vbal9cc27lmrfa2n";
+      name = "keditbookmarks-16.12.3.tar.xz";
     };
   };
   kfilereplace = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfilereplace-16.12.2.tar.xz";
-      sha256 = "086x9k71s2bc80863vlfryblg0cyw1qhk20vwhxmq81xkxsah6ky";
-      name = "kfilereplace-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfilereplace-16.12.3.tar.xz";
+      sha256 = "0gym9bmkyjwg97khy6xxiaidjp6wi98fzmk7wa97wbdqc0qvswja";
+      name = "kfilereplace-16.12.3.tar.xz";
     };
   };
   kfind = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfind-16.12.2.tar.xz";
-      sha256 = "0jpn75d331qiyhqswflkad5nc5r6c21q1d8236k2qvcm80xp10bm";
-      name = "kfind-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfind-16.12.3.tar.xz";
+      sha256 = "1d7rn3xri4dgv97s6jw3n4cbsg73zyrbcm3ligxgj37ziggrhgsj";
+      name = "kfind-16.12.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfloppy-16.12.2.tar.xz";
-      sha256 = "1q1fh16msixpn59y0yglmjbib6a5c9pb3hpmcd5vsiy2ilpgffbm";
-      name = "kfloppy-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfloppy-16.12.3.tar.xz";
+      sha256 = "07mgrpjqd2kdz5gmg8ylmvdb4mis328b7qlchszdx0l1z30kqkzp";
+      name = "kfloppy-16.12.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kfourinline-16.12.2.tar.xz";
-      sha256 = "1df3si16d4ra3x3v9m4kiknlflx1ac10fq3vydcsn4yi89rhx2ix";
-      name = "kfourinline-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kfourinline-16.12.3.tar.xz";
+      sha256 = "087c00sggx5i1g8i2rjvvwlys15bisgx9fm2nl8f30h2ba3im4sg";
+      name = "kfourinline-16.12.3.tar.xz";
     };
   };
   kgeography = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kgeography-16.12.2.tar.xz";
-      sha256 = "1sw7blr264p88702718m5ch9qdzyd5krpf5qjvfhypx0fgzr40b6";
-      name = "kgeography-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kgeography-16.12.3.tar.xz";
+      sha256 = "1rnk00nj29zimpw36vhm0yrwlmpmxwv9wzxnhr7n2jq5qhbqsp5g";
+      name = "kgeography-16.12.3.tar.xz";
     };
   };
   kget = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kget-16.12.2.tar.xz";
-      sha256 = "1qiwcbdvr9g7cgqm4i3gcc6aw60d36n2m8a7faqa28srrw8f55lj";
-      name = "kget-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kget-16.12.3.tar.xz";
+      sha256 = "0h8nklsl6gddwzgjig5cwp463s96ffn5688zjlsyx4hphnvbj8kb";
+      name = "kget-16.12.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kgoldrunner-16.12.2.tar.xz";
-      sha256 = "0sa7yf3656f8mib785xdv7q86gsslx1hwy69vqrnrfwg24vzx3gy";
-      name = "kgoldrunner-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kgoldrunner-16.12.3.tar.xz";
+      sha256 = "028kz5x8a3jb3zp3vfxajmszrqk859hdln9175pp6zj78b278xz4";
+      name = "kgoldrunner-16.12.3.tar.xz";
     };
   };
   kgpg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kgpg-16.12.2.tar.xz";
-      sha256 = "082fvxpawhsvfn6c1y32rvgp2qcim6lnk1gpp92cgn6k70dcx4lr";
-      name = "kgpg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kgpg-16.12.3.tar.xz";
+      sha256 = "0abh15j2p0vinskd8f1yvjkyi1a70k0wf1sdldrfdwpdgq1pqsxw";
+      name = "kgpg-16.12.3.tar.xz";
     };
   };
   khangman = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/khangman-16.12.2.tar.xz";
-      sha256 = "1v57za5bqhppc1fy2xd7d1x1fvanwxgl3xzckfz1k7kbx1kcpn1s";
-      name = "khangman-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/khangman-16.12.3.tar.xz";
+      sha256 = "03ffigr9a6n3aj1a7lxcw9wgf1pafdjwqjnwnny2ric5vn6lpq1z";
+      name = "khangman-16.12.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/khelpcenter-16.12.2.tar.xz";
-      sha256 = "1cij7v57zs14ynvmplcgn14m30hdc554kvrsbjgb695kmcvm1jv9";
-      name = "khelpcenter-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/khelpcenter-16.12.3.tar.xz";
+      sha256 = "100xcjjjbszhbwgydbylk9m9lrxikjyazmhaq2rvv2mfzsbijjm7";
+      name = "khelpcenter-16.12.3.tar.xz";
     };
   };
   kholidays = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kholidays-16.12.2.tar.xz";
-      sha256 = "0pybdq2asx10sxf4kz1p85yfs66dhccz2xvf95n8hky7833kqs1n";
-      name = "kholidays-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kholidays-16.12.3.tar.xz";
+      sha256 = "09iwkqpnmn3h7yfin4y9izb2sdk6hrm8rfq106cnz7j8i31q93ad";
+      name = "kholidays-16.12.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kidentitymanagement-16.12.2.tar.xz";
-      sha256 = "0wv7b3rfysbsj87xgp5ymy5glh9p12i9x8ffv483nm8xqyzwaa9p";
-      name = "kidentitymanagement-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kidentitymanagement-16.12.3.tar.xz";
+      sha256 = "1b23cwdhc7rv260kmn4akff3jfa21hk49p0kp8p0mf6nw6qahbvp";
+      name = "kidentitymanagement-16.12.3.tar.xz";
     };
   };
   kig = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kig-16.12.2.tar.xz";
-      sha256 = "0v261pb1l7cnjkqcqfg3885wxa2hb2bgdk0a1dcwrg4q6fr9kw1g";
-      name = "kig-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kig-16.12.3.tar.xz";
+      sha256 = "0fnlgxwcnspaqzv4y40xm0kq3xwwd4r5abh7ssbd6iqsbzgm6ghw";
+      name = "kig-16.12.3.tar.xz";
     };
   };
   kigo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kigo-16.12.2.tar.xz";
-      sha256 = "19sns6w32pm12634xqxx53hgpmrb4ggzx2idcx3ldknbixhmqm7c";
-      name = "kigo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kigo-16.12.3.tar.xz";
+      sha256 = "08rdz91jzz79884xhg87cwy57q1jk2414shyxxy9r0pb4wdcdbhn";
+      name = "kigo-16.12.3.tar.xz";
     };
   };
   killbots = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/killbots-16.12.2.tar.xz";
-      sha256 = "1cc2ddmp7a21yn0aavbh887j4xmzm2a6xlyq71b3msraw3p5vbmy";
-      name = "killbots-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/killbots-16.12.3.tar.xz";
+      sha256 = "0lwniwm8cbnwpqhfis38x5qvkz53626v9bn00amml57zj8x3hjnd";
+      name = "killbots-16.12.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kimagemapeditor-16.12.2.tar.xz";
-      sha256 = "0n82v73da8hnan2c96g2lxy826dg6xhln28wwr8iib89zd5gmbi6";
-      name = "kimagemapeditor-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kimagemapeditor-16.12.3.tar.xz";
+      sha256 = "0362zcj6by3kydr5v3sr7l6k9kkyfcy16879f93d1qqkjfi11cic";
+      name = "kimagemapeditor-16.12.3.tar.xz";
     };
   };
   kimap = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kimap-16.12.2.tar.xz";
-      sha256 = "04shglmr8rv5r16qb3n9x7vwrsm55121rkj9pz1y7l40kybajl87";
-      name = "kimap-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kimap-16.12.3.tar.xz";
+      sha256 = "1jlva17hy500jpb5mg6m3vrcy6mqikcy8m1pgy68d2ip0m93rb5f";
+      name = "kimap-16.12.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kio-extras-16.12.2.tar.xz";
-      sha256 = "0bfjmggyl7x7nmkqq10pmcc2507yfkbv5c5v86225g9mk02frmhp";
-      name = "kio-extras-16.12.2.tar.xz";
+      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";
     };
   };
   kiriki = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kiriki-16.12.2.tar.xz";
-      sha256 = "1fgdw7f4fqdfzsryvd8crdv60j2s2g3cvbibv3g91xkcq6p155wk";
-      name = "kiriki-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kiriki-16.12.3.tar.xz";
+      sha256 = "142p2zv1826iclaa2zrfyzfdwnflh3sq2xymca4di5anrmcwmm2m";
+      name = "kiriki-16.12.3.tar.xz";
     };
   };
   kiten = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kiten-16.12.2.tar.xz";
-      sha256 = "1ya1wwgh1x4iap3vs947ln949hjc499aiylg24666ab7vcqkbhh8";
-      name = "kiten-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kiten-16.12.3.tar.xz";
+      sha256 = "0skwgv3v79p5z1livjbdsg7i18ky8vc49z53dmgsgbziqvs0s2y4";
+      name = "kiten-16.12.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kjumpingcube-16.12.2.tar.xz";
-      sha256 = "0flx7sxqac763i2nsvyjzjv9aii27hnv51k0yhqcp6pnsjy1fbhh";
-      name = "kjumpingcube-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kjumpingcube-16.12.3.tar.xz";
+      sha256 = "1fii1arzpsdhnnb5yladhpsb0g6icald5si0fwnl47wg3gshaqiz";
+      name = "kjumpingcube-16.12.3.tar.xz";
     };
   };
   kldap = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kldap-16.12.2.tar.xz";
-      sha256 = "06ql2d7l22c19gnw6wigym3qpqw22arsmwpnnwz9i76l3wq32s3x";
-      name = "kldap-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kldap-16.12.3.tar.xz";
+      sha256 = "0a7pm9dzcvyyznqs4apwdl6dpg87qhxcr3a06grjwxhqvfdl52na";
+      name = "kldap-16.12.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kleopatra-16.12.2.tar.xz";
-      sha256 = "1kh75qjas4x4aqvshdgcryqdrp475lx60gksjfh34ygz03avdssl";
-      name = "kleopatra-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kleopatra-16.12.3.tar.xz";
+      sha256 = "1ja26gzdj8h5f8w1061scl40p6ahba3ci4hp91n2vp3rrz9m96wa";
+      name = "kleopatra-16.12.3.tar.xz";
     };
   };
   klettres = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klettres-16.12.2.tar.xz";
-      sha256 = "116igb1gbl3dfh5rm4mp0n8krm0d9kpgns63sh355g02wf0cbz3f";
-      name = "klettres-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klettres-16.12.3.tar.xz";
+      sha256 = "0m3k3zyrw7rwm6ad75c86bap80v2y5k938mdhqjaciglqc9pk83h";
+      name = "klettres-16.12.3.tar.xz";
     };
   };
   klickety = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klickety-16.12.2.tar.xz";
-      sha256 = "00fqfnxh8bb069q3a5jszggnwq0z45najd6qg3z9gqb2i6bb4w93";
-      name = "klickety-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klickety-16.12.3.tar.xz";
+      sha256 = "0mim86wxcljs192q9y6a6i326sic350jd89m1vx3p78dwpj35q42";
+      name = "klickety-16.12.3.tar.xz";
     };
   };
   klines = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klines-16.12.2.tar.xz";
-      sha256 = "1pr5pvxd6fnybkjqxig9zjiq04d7g6igw24p2j6kfz91ihaf4g6q";
-      name = "klines-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klines-16.12.3.tar.xz";
+      sha256 = "03ran5hyl8p9vfi82m2pkzng9hn5ipx1plgq9bz25c53z5fg63di";
+      name = "klines-16.12.3.tar.xz";
     };
   };
   klinkstatus = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/klinkstatus-16.12.2.tar.xz";
-      sha256 = "07wmaphs56x0jwgbkdynahwa0hrr3rakkbbfa4w046dga5z6dz60";
-      name = "klinkstatus-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/klinkstatus-16.12.3.tar.xz";
+      sha256 = "0kmjh0398k6fpz6lgz6d5rb79xl6wpgd4j56zacpha9046cfnmsk";
+      name = "klinkstatus-16.12.3.tar.xz";
     };
   };
   kmag = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmag-16.12.2.tar.xz";
-      sha256 = "02vjwfh926jvhxn1sw603ijdrayk4jxrw9rl7kv48q00kgk5sr23";
-      name = "kmag-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmag-16.12.3.tar.xz";
+      sha256 = "1llv9vd1557h4lz2sdd1wjlqb9wzrk9jxn4731iac2b5wdwpihii";
+      name = "kmag-16.12.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmahjongg-16.12.2.tar.xz";
-      sha256 = "1rbcbak87jyf6bc8k44xvpcihagwh4i3v20af14hvm52gdvzdhij";
-      name = "kmahjongg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmahjongg-16.12.3.tar.xz";
+      sha256 = "0xy3w5kxn69l0dagly5qd9dqzkpikflmrjbv1b45psafdmj3125r";
+      name = "kmahjongg-16.12.3.tar.xz";
     };
   };
   kmail = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmail-16.12.2.tar.xz";
-      sha256 = "0a3r6pwm3dvvmljp5grl1mgymp3fb1l3hb8issdqlk4s805q0pql";
-      name = "kmail-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmail-16.12.3.tar.xz";
+      sha256 = "1kyhc952k78yg2wa9cgxvqa6qrrgc08dly7fin7as8cxfh49i0b0";
+      name = "kmail-16.12.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmail-account-wizard-16.12.2.tar.xz";
-      sha256 = "1vm4lx5jwk5kqf3zdfm3zyzhap1dalslwj03gxmif6hh65d2s7h5";
-      name = "kmail-account-wizard-16.12.2.tar.xz";
+      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";
     };
   };
   kmailtransport = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmailtransport-16.12.2.tar.xz";
-      sha256 = "0g2f25l4l8jlj4d5dcdlbz8rgy4xvm6if2i3qm4naqh35kb4rycn";
-      name = "kmailtransport-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmailtransport-16.12.3.tar.xz";
+      sha256 = "1dkw7niymhnf0jncflvqyldw28c9j0q6j598flb5ksds0n30iasy";
+      name = "kmailtransport-16.12.3.tar.xz";
     };
   };
   kmbox = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmbox-16.12.2.tar.xz";
-      sha256 = "1j30kvvlnfbky5x19gxjsbrshrdys6ajdbhpd9fy46jjh2dv3y6j";
-      name = "kmbox-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmbox-16.12.3.tar.xz";
+      sha256 = "0khvf4kqf9i425fjczl1miqsz0pxbyryxy32bf9knr3k5kmwbn24";
+      name = "kmbox-16.12.3.tar.xz";
     };
   };
   kmime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmime-16.12.2.tar.xz";
-      sha256 = "0sl34qahgvxaw9xi56d0l2a2iim9bpiv8ysf3spsc1m2ribf3400";
-      name = "kmime-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmime-16.12.3.tar.xz";
+      sha256 = "0gzbh0g075ml5x0qy4zd1cg1qygdsnssl5ahk9pcgc0fik4p9j20";
+      name = "kmime-16.12.3.tar.xz";
     };
   };
   kmines = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmines-16.12.2.tar.xz";
-      sha256 = "1324j3myr1wds3f6nzw186d1rc2aakxv0mqsx89bdvnky6zq2v5q";
-      name = "kmines-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmines-16.12.3.tar.xz";
+      sha256 = "0dz6yx7y0jpxhmyjrfyf6rrkiayn4mpyr4n1iszs11gac1bqppvn";
+      name = "kmines-16.12.3.tar.xz";
     };
   };
   kmix = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmix-16.12.2.tar.xz";
-      sha256 = "1s8di3jbgcaamfxfmmwxlajixia9m2ngl4qc1z7rq6a14fk3w5hz";
-      name = "kmix-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmix-16.12.3.tar.xz";
+      sha256 = "1mq4kna3z62269m43qy42knq4byrvirk0mk5yp56n51im1bmdyj4";
+      name = "kmix-16.12.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmousetool-16.12.2.tar.xz";
-      sha256 = "128hp75zyyariflx03ilmvw09jngfy9ylykb73gg7xw2zqnjjw4i";
-      name = "kmousetool-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmousetool-16.12.3.tar.xz";
+      sha256 = "1678sjj96f22sn60ccyj6hqi2vghkf4facnx8l15x4xx05yq1vgg";
+      name = "kmousetool-16.12.3.tar.xz";
     };
   };
   kmouth = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmouth-16.12.2.tar.xz";
-      sha256 = "0gk8rdlpwh304k7g85i80rfdjnvj4fcd1nlj89zmq2qh5s9jmqzg";
-      name = "kmouth-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmouth-16.12.3.tar.xz";
+      sha256 = "1afvjds1kfb8zvv3ma8c6svan6zlbd1w9a164vxwp7gl3ycjyj52";
+      name = "kmouth-16.12.3.tar.xz";
     };
   };
   kmplot = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kmplot-16.12.2.tar.xz";
-      sha256 = "0lwx0d1gv6k3nm0nxry6bl282j3vjc0p7rssbvhi5qsc7z9lc8s3";
-      name = "kmplot-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kmplot-16.12.3.tar.xz";
+      sha256 = "02vh4diqs4688p2xlia437jywx89yhpaf8ipprdq92q034glybyz";
+      name = "kmplot-16.12.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/knavalbattle-16.12.2.tar.xz";
-      sha256 = "065hyrdqaj0g7kpgxdyjbf2msdxb6w6m2y50bw23p4w69y7fdxgn";
-      name = "knavalbattle-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/knavalbattle-16.12.3.tar.xz";
+      sha256 = "0164z9h1689bz600p17p8fq552g8pq73l81nj4f5csklhnsiykkg";
+      name = "knavalbattle-16.12.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/knetwalk-16.12.2.tar.xz";
-      sha256 = "1rhmgr2qk8h04y87dviy0yhrv5dg8za5v00csmia3s1jyvz0fbwp";
-      name = "knetwalk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/knetwalk-16.12.3.tar.xz";
+      sha256 = "1mavc0rn41y3vgzf0ikwvk3kh4fszylh7h4briw9k0kqx2cxh5vk";
+      name = "knetwalk-16.12.3.tar.xz";
     };
   };
   knotes = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/knotes-16.12.2.tar.xz";
-      sha256 = "12bdrw4ikw014phbq9w4q5y9lgjnazhvri7j13ld5r6806bxls04";
-      name = "knotes-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/knotes-16.12.3.tar.xz";
+      sha256 = "1yyx98zn7a3hbiyr16fcbylbm5v8lyg22v8gwf7xpnbx5jb4hpb8";
+      name = "knotes-16.12.3.tar.xz";
     };
   };
   kolf = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kolf-16.12.2.tar.xz";
-      sha256 = "1v9lhir520n7kcc061z3zcc8wxswhnmjv7yifbqvviazl1n0p0vx";
-      name = "kolf-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kolf-16.12.3.tar.xz";
+      sha256 = "136iyf8clr2r8qkjcm0nqcq0sjr5xry9gbxjhz128lc0nywsxpd5";
+      name = "kolf-16.12.3.tar.xz";
     };
   };
   kollision = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kollision-16.12.2.tar.xz";
-      sha256 = "1dklg0ns3abfxbfr7xrnzkcxxng3v7avzj4bjvsmsbq3lzy3pb8c";
-      name = "kollision-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kollision-16.12.3.tar.xz";
+      sha256 = "0kwnqqm9gs6ac7ags9x82ykmp3vccp3kdd3js26a1kz1zkip32il";
+      name = "kollision-16.12.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kolourpaint-16.12.2.tar.xz";
-      sha256 = "1himisb1f68pgaz15qam73qv9acqqh8i1jnk9wbsqjyj6z67wvnj";
-      name = "kolourpaint-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kommander-16.12.2.tar.xz";
-      sha256 = "140sz82gm5p8f8mhr2kdfy24fr6jjs0l53jcqr9hwdw6vlrm399w";
-      name = "kommander-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kommander-16.12.3.tar.xz";
+      sha256 = "1wlks0alw82ra3g63d8k8nj9sq899hjv1r2kshk7c4vdk7arn1fg";
+      name = "kommander-16.12.3.tar.xz";
     };
   };
   kompare = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kompare-16.12.2.tar.xz";
-      sha256 = "1dd4k3rq8wlzsvl5nv5mrd0ddxgwlriik3vxj8xx3b4nqk720lh6";
-      name = "kompare-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kompare-16.12.3.tar.xz";
+      sha256 = "18z6424xidpx5kmbjiasvhagh2b1a9pxizc0dsvba47v9xcavsaw";
+      name = "kompare-16.12.3.tar.xz";
     };
   };
   konqueror = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/konqueror-16.12.2.tar.xz";
-      sha256 = "0md9glzr1br2n5dsfmmv6gxsfhv6jl0r4fa1qgw4d2j2kpm94zw7";
-      name = "konqueror-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/konqueror-16.12.3.tar.xz";
+      sha256 = "1pwv2mj9xrn6aymhkqmwd89d5i3v2jixp07dz0by62rcpfhm89p5";
+      name = "konqueror-16.12.3.tar.xz";
     };
   };
   konquest = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/konquest-16.12.2.tar.xz";
-      sha256 = "0k58adqr20k9wrwbaf1s6lqqgcma08wqnv66zrxbgacgsgx3pnzi";
-      name = "konquest-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/konquest-16.12.3.tar.xz";
+      sha256 = "1fhz9pwi2dmmcjg10vp36m8d759zikg6nqpjdp41dg95lkyf5vkf";
+      name = "konquest-16.12.3.tar.xz";
     };
   };
   konsole = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/konsole-16.12.2.tar.xz";
-      sha256 = "1mwfv2hznmd1qml8hq1z81jv9y8jn1ybc69dqgnf1n6ygmz14676";
-      name = "konsole-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/konsole-16.12.3.tar.xz";
+      sha256 = "10k7ryvsssbskpxk04iqx2mrp2a91291r8nzvg1780lrhql5rdj7";
+      name = "konsole-16.12.3.tar.xz";
     };
   };
   kontact = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kontact-16.12.2.tar.xz";
-      sha256 = "1rfqb5a4brbvkhv905lcvc40r0as8zwdm2h67jc96cix358cpshv";
-      name = "kontact-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kontact-16.12.3.tar.xz";
+      sha256 = "0wj4w9ak6dm330s393hjb79w16gs5kij5gz9swf3pxwg21xbd4ps";
+      name = "kontact-16.12.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kontactinterface-16.12.2.tar.xz";
-      sha256 = "0z6mjg8sy18jhkfmk9s098851gdqbh03031l92yqzsgsfph9nk77";
-      name = "kontactinterface-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kontactinterface-16.12.3.tar.xz";
+      sha256 = "0n5hvx3xp01krwwd2szgh1s6nn5spfns1ivc36i1gdbhkf871k98";
+      name = "kontactinterface-16.12.3.tar.xz";
     };
   };
   kopete = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kopete-16.12.2.tar.xz";
-      sha256 = "0bf0bffcsyhrj70yb4l5g6n0jr38i5zkcl4hsfi9hac43xvp62ib";
-      name = "kopete-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kopete-16.12.3.tar.xz";
+      sha256 = "1dkn4d13knf0lcj4241fmjcj51ypg9frzsf0pl02mr08rd2rxgk1";
+      name = "kopete-16.12.3.tar.xz";
     };
   };
   korganizer = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/korganizer-16.12.2.tar.xz";
-      sha256 = "1211rhxvx42lndqv6n23mj6ibhfp09vvmzz59k1j0l9z8y1zyr2g";
-      name = "korganizer-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/korganizer-16.12.3.tar.xz";
+      sha256 = "1724l321gzjwha8yhrans4lhzs39fs98xi7wbd5msfflzyg3l6ga";
+      name = "korganizer-16.12.3.tar.xz";
     };
   };
   kpat = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kpat-16.12.2.tar.xz";
-      sha256 = "1yc16yfsq18m5xxm9b17zba3ppw7j5hq82z0ln8sw2yisz59mylr";
-      name = "kpat-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kpat-16.12.3.tar.xz";
+      sha256 = "04qvv7q7rlsiyff2isy18h2fbz2lnljal5spq5qg9zl6v8hx6qzm";
+      name = "kpat-16.12.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kpimtextedit-16.12.2.tar.xz";
-      sha256 = "0xspr7hip57j8n3mp71x8s908vlj7acl27jwyc33yi4xvlyfcgfy";
-      name = "kpimtextedit-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kpimtextedit-16.12.3.tar.xz";
+      sha256 = "06iz9l8z708kdivzibqkgdrbvw7kfd2lr2grf3v9l6gfl3qs1kbw";
+      name = "kpimtextedit-16.12.3.tar.xz";
     };
   };
   kppp = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kppp-16.12.2.tar.xz";
-      sha256 = "1gvb3sgxg1ysdrv18rf5kh6znvwlkp673yld6ghj3dcif8w6xq0n";
-      name = "kppp-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kppp-16.12.3.tar.xz";
+      sha256 = "0lqv95zfzcik8k95a39s6whjsnq6g15amnxlzy898liyxkr499bc";
+      name = "kppp-16.12.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kqtquickcharts-16.12.2.tar.xz";
-      sha256 = "1gh3alqlmj2icd2jblncps4k6kklckbpqv18wplybgaz4h0pi4pi";
-      name = "kqtquickcharts-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kqtquickcharts-16.12.3.tar.xz";
+      sha256 = "1xzn9vxiqam8pk4zj8qcq55v9g52d9qkddbdv25pml8s0yhlsgqf";
+      name = "kqtquickcharts-16.12.3.tar.xz";
     };
   };
   krdc = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/krdc-16.12.2.tar.xz";
-      sha256 = "1ql2mkx7xc2y0vkxjk3i5scxa6ws5mwz39zynmyx7rmxp9f8frsf";
-      name = "krdc-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/krdc-16.12.3.tar.xz";
+      sha256 = "0visx3371ym78n9aqkln2akvvf0rphyxg5hxvc2981pgpdry20zq";
+      name = "krdc-16.12.3.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kremotecontrol-16.12.2.tar.xz";
-      sha256 = "1c1xx458lchn9b3c9h27zb13m2y6b01sb0g6lf6bpx4skbdwdwma";
-      name = "kremotecontrol-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kremotecontrol-16.12.3.tar.xz";
+      sha256 = "0xcs8gvb7ack0xqdp99x04lyv6hbqgxa5nq44pxl7czzc0la5nbk";
+      name = "kremotecontrol-16.12.3.tar.xz";
     };
   };
   kreversi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kreversi-16.12.2.tar.xz";
-      sha256 = "18zfy3dzi9rgwhgvci93iv0gkmvac30rbj4xwpvzr3bc8zwz76df";
-      name = "kreversi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kreversi-16.12.3.tar.xz";
+      sha256 = "1qi6y263c8qp0bv9vmjk4rxq55mc0v1kn56yvivc5sfg9p4bqs9b";
+      name = "kreversi-16.12.3.tar.xz";
     };
   };
   krfb = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/krfb-16.12.2.tar.xz";
-      sha256 = "1sqij11a6pbivf2xbcglxzkfrpqvzcqxb4d85jxrhbp2wljx0xvy";
-      name = "krfb-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/krfb-16.12.3.tar.xz";
+      sha256 = "1ijz0zdlkxb9mldgd5a5k7aa2ikmmg023mafmxrjwymsig7ya4hv";
+      name = "krfb-16.12.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kross-interpreters-16.12.2.tar.xz";
-      sha256 = "1cw84z2wdh1kb7fgwmmljmc5d57skh6hlm0p6kzlqdbqknnva8ad";
-      name = "kross-interpreters-16.12.2.tar.xz";
+      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";
     };
   };
   kruler = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kruler-16.12.2.tar.xz";
-      sha256 = "11i7k53kpfampbkzzabp0v97pb22h7sb2i0r6qdx78kyhmkgdrvp";
-      name = "kruler-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kruler-16.12.3.tar.xz";
+      sha256 = "08w7pb7wyaqnhwvqczxzbrbnm8930wzkl8y4lpimp5mqzb94i8qx";
+      name = "kruler-16.12.3.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksaneplugin-16.12.2.tar.xz";
-      sha256 = "0ljk7cf4ns39xszn6g1vk8av3dkkgwzj4ry4n56305mqyjgqx258";
-      name = "ksaneplugin-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksaneplugin-16.12.3.tar.xz";
+      sha256 = "1z0ziapcjmi7fqfnb0zsbjgd1q05np1s7smj1k8cd8c6f169yrld";
+      name = "ksaneplugin-16.12.3.tar.xz";
     };
   };
   kscd = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kscd-16.12.2.tar.xz";
-      sha256 = "1w1gcfwp1r18pjfp526pdb837kpd8zj08g1jrjcb3bmvh600apm0";
-      name = "kscd-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kscd-16.12.3.tar.xz";
+      sha256 = "1mpba78m4hs8541n4ydz7vswq1chi0fmmlfw2kqnrzarcandyga0";
+      name = "kscd-16.12.3.tar.xz";
     };
   };
   kshisen = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kshisen-16.12.2.tar.xz";
-      sha256 = "0sw78qwlpimlhqzlz5migbngrhj7w6gdbqx12q7949paa03ash1b";
-      name = "kshisen-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kshisen-16.12.3.tar.xz";
+      sha256 = "17szjblrp172rvyl98x5a0g9yg29b85bmwkzk7pqnjbn387kgy9r";
+      name = "kshisen-16.12.3.tar.xz";
     };
   };
   ksirk = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksirk-16.12.2.tar.xz";
-      sha256 = "0f9k476wbwx0maf0wsicgipqyv7gccm7ydwvns399iamb6xkiqnn";
-      name = "ksirk-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksirk-16.12.3.tar.xz";
+      sha256 = "1akfskyfhffh71w2hknw9vvap2a2sq0irmkxij9xcdmlvpfwnkn5";
+      name = "ksirk-16.12.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksnakeduel-16.12.2.tar.xz";
-      sha256 = "0lhwz1b1v1dir7k1vbkcwb73x7f3h7prb3zv4f8wlh32dj1yg983";
-      name = "ksnakeduel-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksnakeduel-16.12.3.tar.xz";
+      sha256 = "1797kac3prchq5254dby41k04i8i7hgf2a9cb8s71n7hrsj62dyn";
+      name = "ksnakeduel-16.12.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kspaceduel-16.12.2.tar.xz";
-      sha256 = "0h6m8xnmxx0q2r863ikck0kpyscd8s4iidcjiqz7wqgbsw1dadqb";
-      name = "kspaceduel-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kspaceduel-16.12.3.tar.xz";
+      sha256 = "0ipx1sxhv207nlw7rcp7155l76z39x7j1b5y3qwxcgd7s69wb82k";
+      name = "kspaceduel-16.12.3.tar.xz";
     };
   };
   ksquares = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksquares-16.12.2.tar.xz";
-      sha256 = "14x1d9300wdhrnri5f5n5i31bs83hcbxs5w9cai1m8mlql99vvfy";
-      name = "ksquares-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksquares-16.12.3.tar.xz";
+      sha256 = "0abd19hf1rvlzkxc4kvdljs5yk39pay81n3n9n0w6qyr764r4qn9";
+      name = "ksquares-16.12.3.tar.xz";
     };
   };
   kstars = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kstars-16.12.2.tar.xz";
-      sha256 = "0acbirhr970fh53hfsbfw9jn4jqlww9zf80jfyg2drixi9d70mpp";
-      name = "kstars-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kstars-16.12.3.tar.xz";
+      sha256 = "0lcrn7r1nw85c0w6dg03mwf5lnsahmww60y6vwzfh2r53nbm9c1y";
+      name = "kstars-16.12.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksudoku-16.12.2.tar.xz";
-      sha256 = "1nvk8l6n7sja19s2kazf6xhzqwi9mrjxvz5i0i9nmpwmksii6lbg";
-      name = "ksudoku-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksudoku-16.12.3.tar.xz";
+      sha256 = "00hi8x09fj5ahj0ah9rsci2dscrdl8x9mrlcacjrwgwm503y95gk";
+      name = "ksudoku-16.12.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ksystemlog-16.12.2.tar.xz";
-      sha256 = "13q2h3yhlpjy8hiiz6vdx5xwniysbmz5agvvn28a469710601154";
-      name = "ksystemlog-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ksystemlog-16.12.3.tar.xz";
+      sha256 = "0xd6pp02k84a1r6gy10x0br33g4awpbhx45j7n69l1s96szj4aki";
+      name = "ksystemlog-16.12.3.tar.xz";
     };
   };
   kteatime = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kteatime-16.12.2.tar.xz";
-      sha256 = "0m163a11hp90rqf5170iqapmvn4ym6m2n42da2p1jgyim4877613";
-      name = "kteatime-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kteatime-16.12.3.tar.xz";
+      sha256 = "0wqzw9sa4zkgkwndvyas47x5wc4gcya3pmdcvg7wf7wl8j5k7vdy";
+      name = "kteatime-16.12.3.tar.xz";
     };
   };
   ktimer = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktimer-16.12.2.tar.xz";
-      sha256 = "1l9xwfg3701h1f16ifh74c5hv7j7z0f332izcvfpiccps7gplhvz";
-      name = "ktimer-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktimer-16.12.3.tar.xz";
+      sha256 = "0hpskwa8g88fz39b0y7sjl574s82d6smla1bhs8mdjlabv0sln6z";
+      name = "ktimer-16.12.3.tar.xz";
     };
   };
   ktnef = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktnef-16.12.2.tar.xz";
-      sha256 = "0id9shripwahgb258hgfpmxyg0z9x2dqpxgyrvb47d44rrcf9dxg";
-      name = "ktnef-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktnef-16.12.3.tar.xz";
+      sha256 = "0v38h7bwjwab1656w3c2h1by5925f616idnvflgp123v1cs6jy1n";
+      name = "ktnef-16.12.3.tar.xz";
     };
   };
   ktouch = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktouch-16.12.2.tar.xz";
-      sha256 = "08c0g35ypsndh8pj1nbxn8gnzis10a5cxkz175x4asi5lcpw3kc1";
-      name = "ktouch-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktouch-16.12.3.tar.xz";
+      sha256 = "17gkvzczfgmip18y3jbjisz4z8m5hwbgkqn4qynabp6dqihwhzgg";
+      name = "ktouch-16.12.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-accounts-kcm-16.12.2.tar.xz";
-      sha256 = "1p3pqvkyhwcqcwgpyfghhii3d5shbfpm8i9vap8vc43clvj9sfah";
-      name = "ktp-accounts-kcm-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-approver = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-approver-16.12.2.tar.xz";
-      sha256 = "1ky4wg8qk4n2qyh5009zz6487pf31jb8w8zmjmck9fypc9rhzw2j";
-      name = "ktp-approver-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-auth-handler = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-auth-handler-16.12.2.tar.xz";
-      sha256 = "05dvbq1q0fbznyj11wkg0ic8svgkqdq8i20xddkkx2jpwhpkmcnl";
-      name = "ktp-auth-handler-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-call-ui = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-call-ui-16.12.2.tar.xz";
-      sha256 = "1czm56vvbjbyyib2wi60f9s2icnyac007zzh2qxsxfnlp52mkzm2";
-      name = "ktp-call-ui-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-common-internals = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-common-internals-16.12.2.tar.xz";
-      sha256 = "0323dhfiddq5yhbp0rpmpw60334z41f45ml8lcada8dv6mbjxlc6";
-      name = "ktp-common-internals-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-contact-list = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-list-16.12.2.tar.xz";
-      sha256 = "0gk0lims3ypjsir9k9a010kylnqzqb2dsh5yfv24a6fb1ix6q4yy";
-      name = "ktp-contact-list-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-contact-runner = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-contact-runner-16.12.2.tar.xz";
-      sha256 = "1bfm4639jshw9ncchcj6m8q6xg49a20z4fzc66vrjkdbha8fwr0g";
-      name = "ktp-contact-runner-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-desktop-applets = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-desktop-applets-16.12.2.tar.xz";
-      sha256 = "1ahm69h309dyg3byv3jxxm3j0c5jphzxng2g87hvjs9dvgx00msv";
-      name = "ktp-desktop-applets-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-filetransfer-handler = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-filetransfer-handler-16.12.2.tar.xz";
-      sha256 = "1j1bmrwabh0mzm51ibb0qyf164g7hznjk2vm2kwkgk5sy8r1a363";
-      name = "ktp-filetransfer-handler-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-kded-module = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-kded-module-16.12.2.tar.xz";
-      sha256 = "1ia62r55my8s6l3am22z6nkvmi2x2gnpbwmmpiv8n2i7j2ysdjp9";
-      name = "ktp-kded-module-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-send-file = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-send-file-16.12.2.tar.xz";
-      sha256 = "0vl00bbnpddq9nczb53apf3sdr1r2hnpa3fa390yx3jrrr4hp3k0";
-      name = "ktp-send-file-16.12.2.tar.xz";
+      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";
     };
   };
   ktp-text-ui = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktp-text-ui-16.12.2.tar.xz";
-      sha256 = "0c0khkargj4hg2j1va72hp45b3dzwvkvbssq7k309iljxgfi9qry";
-      name = "ktp-text-ui-16.12.2.tar.xz";
+      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";
     };
   };
   ktuberling = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/ktuberling-16.12.2.tar.xz";
-      sha256 = "0867ci5bi0phcwwxlqlyn3w1pv5q5wvzyqnzjvywc0bzy2qbpp0p";
-      name = "ktuberling-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/ktuberling-16.12.3.tar.xz";
+      sha256 = "1vn35bn0x5ykd9j78q5apg1i14v546jrqq1yn2q178d9qmx79pgv";
+      name = "ktuberling-16.12.3.tar.xz";
     };
   };
   kturtle = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kturtle-16.12.2.tar.xz";
-      sha256 = "183glhn0amkcrzylax9cjyj3if9iz3dybmw55ljw003mf1s0sydq";
-      name = "kturtle-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kturtle-16.12.3.tar.xz";
+      sha256 = "1mpdwb6999nar16mpha30cf4qzmpbsdha44aw77gn301v215rwj3";
+      name = "kturtle-16.12.3.tar.xz";
     };
   };
   kubrick = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kubrick-16.12.2.tar.xz";
-      sha256 = "10yakz1ffdx33sqgqmlga525r3cnz90m0rm5m2sl3b97ib7r0fxl";
-      name = "kubrick-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kubrick-16.12.3.tar.xz";
+      sha256 = "1bwr8xi4d58k94h7lpl02iqf87nxhpls33ca654kzy353awqbp7f";
+      name = "kubrick-16.12.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kwalletmanager-16.12.2.tar.xz";
-      sha256 = "129q3c805g4jsrws3gvy751y4pdwp9m8yvlc62pkp703xwlnkzj4";
-      name = "kwalletmanager-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kwalletmanager-16.12.3.tar.xz";
+      sha256 = "07miaqr0yaqb0lkssb1jfg35cvr9svn16nhvb1zffvbf9fdlim47";
+      name = "kwalletmanager-16.12.3.tar.xz";
     };
   };
   kwave = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kwave-16.12.2.tar.xz";
-      sha256 = "0g3n0fm3pyp6sd28qjpadpqs2kqd5gsbicdz1c5jkm8c1bypi0ij";
-      name = "kwave-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kwave-16.12.3.tar.xz";
+      sha256 = "1s5zwhck204m5rkrpmbghzid3dpzhqbwsilb5pfh4128d04fx9ad";
+      name = "kwave-16.12.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/kwordquiz-16.12.2.tar.xz";
-      sha256 = "1jy9833zrgaddzpfaaps2gcxjnf9mg2yx4w7mfpa3vglsyvhqlzx";
-      name = "kwordquiz-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/kwordquiz-16.12.3.tar.xz";
+      sha256 = "1r8q2d6j7bq8jdr4cl9maapadzg7yp0zldjxkcqg08ldwsrrsnqj";
+      name = "kwordquiz-16.12.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libgravatar-16.12.2.tar.xz";
-      sha256 = "0vdryr9q30jkk5b9fa75yiqpspj83wvcy2zry8rsrx7pj21cdlsw";
-      name = "libgravatar-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libgravatar-16.12.3.tar.xz";
+      sha256 = "0m726ixss72rz3gwgn7q5s34xwbghi877y7gxa1ilcrk9rhyxv2f";
+      name = "libgravatar-16.12.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkcddb-16.12.2.tar.xz";
-      sha256 = "0gs0zyisrgbzbcnwp95qi8msj5x2ysmqk9nwja3bwqzbangm0y82";
-      name = "libkcddb-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkcddb-16.12.3.tar.xz";
+      sha256 = "0iaascv9a5g8681mjc6b7f2fd8fdi9p3dx8l9lapkpzcygy1fwpc";
+      name = "libkcddb-16.12.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkcompactdisc-16.12.2.tar.xz";
-      sha256 = "1ydhfi3hp30zg9nlmnzd5pslwlq6v6jbim2jda8ciyvniw0pm6va";
-      name = "libkcompactdisc-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkcompactdisc-16.12.3.tar.xz";
+      sha256 = "021yws9854w6fwwfw31b87rpz92ach5xyq427968m3mc3c430d4l";
+      name = "libkcompactdisc-16.12.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkdcraw-16.12.2.tar.xz";
-      sha256 = "0w54h8fa1hgyvqps936annb8dhbrpizv4ifcix0gq714p573l8w3";
-      name = "libkdcraw-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkdcraw-16.12.3.tar.xz";
+      sha256 = "03ag6vzdj5n7zbb8yb9k84ckm1zwp2i9qqrsfn2mmmhypwknpg4w";
+      name = "libkdcraw-16.12.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkdegames-16.12.2.tar.xz";
-      sha256 = "0lw6v81pr4xq5h58mgkbzlvp5bxic9szfmabgd3nrdijh6mla4ly";
-      name = "libkdegames-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkdegames-16.12.3.tar.xz";
+      sha256 = "0w7q7x04imwrdfj5zwgv0y49k4wi7a6ghqipyc5qmrwfg9ya85b3";
+      name = "libkdegames-16.12.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkdepim-16.12.2.tar.xz";
-      sha256 = "1xblfj2i205jsm6nl05r3jis4gb4d15naq2mmfgxwy913pjh74jf";
-      name = "libkdepim-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkdepim-16.12.3.tar.xz";
+      sha256 = "07afpxhvxpf50h10vg6vla543n4rvy1grldjj4aygwh1fgl5snm0";
+      name = "libkdepim-16.12.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkeduvocdocument-16.12.2.tar.xz";
-      sha256 = "118z200ffqb2rj6yhmqp4b998cq6mlbpzn2gh2pdp70yin9w35qz";
-      name = "libkeduvocdocument-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkeduvocdocument-16.12.3.tar.xz";
+      sha256 = "05s79q269m5s78zjwxljxvprrqvpalf6h38n90m589vks82ahxx0";
+      name = "libkeduvocdocument-16.12.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkexiv2-16.12.2.tar.xz";
-      sha256 = "1bpk2mwiplk7c5xrdx7nq9fa0g53sgx6f5xa7d4k2i9mzn2s8hyr";
-      name = "libkexiv2-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkexiv2-16.12.3.tar.xz";
+      sha256 = "02fr10prqmpaqqlcj8hf5h4b3vhhiwkfsbpzlag64n5764x1hl3f";
+      name = "libkexiv2-16.12.3.tar.xz";
     };
   };
   libkface = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkface-16.12.2.tar.xz";
-      sha256 = "0jhnx71bnn2f8x5w5iylkk7369fcbx0y793182vc5rdqaax983sc";
-      name = "libkface-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkface-16.12.3.tar.xz";
+      sha256 = "068xixlw0hfhi3c9nxik2y6xyci1ilwwfq4sjm1paqfszp0f4rq8";
+      name = "libkface-16.12.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkgeomap-16.12.2.tar.xz";
-      sha256 = "1skmmg3hppzj923nl90r7v26k4fii7h3sr6yxzzvzaakwbil7d9q";
-      name = "libkgeomap-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkgeomap-16.12.3.tar.xz";
+      sha256 = "1zz2w7cbabyrvzvw2ph38mxw7khyhjzg86na2lcywla7japlbsd9";
+      name = "libkgeomap-16.12.3.tar.xz";
     };
   };
   libkipi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkipi-16.12.2.tar.xz";
-      sha256 = "0g1yyd5lhvwwa7q4in1p3q4mwlpp00lbir1a25wanlr6hqr2247w";
-      name = "libkipi-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkipi-16.12.3.tar.xz";
+      sha256 = "0f1m0v0cm11dqwm3n9w1mwz25sj3bggx19fi0jj4ij7zqicpykz6";
+      name = "libkipi-16.12.3.tar.xz";
     };
   };
   libkleo = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkleo-16.12.2.tar.xz";
-      sha256 = "031lfrn48xzi0kxkvg9597nxzharv0s0nxlkbdcr4xx8d8iga2l0";
-      name = "libkleo-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkleo-16.12.3.tar.xz";
+      sha256 = "0rzp2bxqij9fkdsghskd2f05vgcybdc9l7wdrjqhhcngi8qxl0nn";
+      name = "libkleo-16.12.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkmahjongg-16.12.2.tar.xz";
-      sha256 = "0imj2xv6qcf00dx53h37yq84cqrg806qjfmm836hw6wicw24117f";
-      name = "libkmahjongg-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkmahjongg-16.12.3.tar.xz";
+      sha256 = "0fhz7jp4wcvjcicyiwc4qq4vviwagfjdy6n5bhv7bmlccq4xfk5x";
+      name = "libkmahjongg-16.12.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libkomparediff2-16.12.2.tar.xz";
-      sha256 = "02d3bd7miq1nq81z6b4c8c64wjj2z9shr8y0rd0yqlzmf8ma05p2";
-      name = "libkomparediff2-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libkomparediff2-16.12.3.tar.xz";
+      sha256 = "1hm2d6217qwxsq6nyyh7iv573zkkmcn68x188zav48kmydj45l9i";
+      name = "libkomparediff2-16.12.3.tar.xz";
     };
   };
   libksane = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libksane-16.12.2.tar.xz";
-      sha256 = "0p215qc56ma4laajmql72f8bngi2x88nk1q8ysq0wviadgack885";
-      name = "libksane-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libksane-16.12.3.tar.xz";
+      sha256 = "0406jdzs193scmb8rkx2fqcr2a0svz53sf1av9qi2nq9dnil9hcq";
+      name = "libksane-16.12.3.tar.xz";
     };
   };
   libksieve = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/libksieve-16.12.2.tar.xz";
-      sha256 = "1bzd8lfz0d9gnq6kh8k9wrcfbc61mdigy2madn7ywpxpcjp4rp3v";
-      name = "libksieve-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/libksieve-16.12.3.tar.xz";
+      sha256 = "1riqsfl3x4vpwqv7398gj86hnwfzqwfj7d69wsxk3r02jp3xd9i2";
+      name = "libksieve-16.12.3.tar.xz";
     };
   };
   lokalize = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/lokalize-16.12.2.tar.xz";
-      sha256 = "03cr89skhwbzq4h6fr78iaziplahpr4i7fvsf8395w6yiwsvcnyk";
-      name = "lokalize-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/lokalize-16.12.3.tar.xz";
+      sha256 = "17ikk89680jjzv95gnrzah4bi3xnyp5mi64prhblhw7kz6vlf8x0";
+      name = "lokalize-16.12.3.tar.xz";
     };
   };
   lskat = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/lskat-16.12.2.tar.xz";
-      sha256 = "1jz7bjzw5msz5nyjvr21n3c355598afdnnqc6xzfl9zjkfgx4q9w";
-      name = "lskat-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/lskat-16.12.3.tar.xz";
+      sha256 = "02mqb4c650ydy9qp3qg1avrj0m0a8yxmg0zw6hcv5pvckgfpcxki";
+      name = "lskat-16.12.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/mailcommon-16.12.2.tar.xz";
-      sha256 = "0b9qawglc42y4wd98xaaiqdz7586wabj9zabs3dvk9vs10qpb9p0";
-      name = "mailcommon-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/mailcommon-16.12.3.tar.xz";
+      sha256 = "1sx7dgy9jad6vqp1dljg9m40x57zz6xy9d2f1lgab5ibs1lrjhq5";
+      name = "mailcommon-16.12.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/mailimporter-16.12.2.tar.xz";
-      sha256 = "0dvnqqmmxdca7wmsajhzdxgz1k07dfbac0z1paww4d2inr164b8q";
-      name = "mailimporter-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/mailimporter-16.12.3.tar.xz";
+      sha256 = "08yj4i6jy08hk62mxw299sh2n5pknzxanmzr96n6lf8g1jcf2l21";
+      name = "mailimporter-16.12.3.tar.xz";
     };
   };
   marble = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/marble-16.12.2.tar.xz";
-      sha256 = "0p7ka2hl0f9ghpmyh124p57dy1ynhw0dszihg4rbbrjfjj65vig0";
-      name = "marble-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/marble-16.12.3.tar.xz";
+      sha256 = "08dykrmiq1jk9yv83sjj6s3gps56bw0hxjbvb90bzd1g0kh0c82j";
+      name = "marble-16.12.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/mbox-importer-16.12.2.tar.xz";
-      sha256 = "00q7x30bl1fwfgwvqmgbspp74bmjm40d30rykq052v1cp6n0c060";
-      name = "mbox-importer-16.12.2.tar.xz";
+      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";
     };
   };
   messagelib = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/messagelib-16.12.2.tar.xz";
-      sha256 = "0b65248mc6qamj1wcpv73v1ywda9gk2s2y20vjf35lmv5xi4cz88";
-      name = "messagelib-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/messagelib-16.12.3.tar.xz";
+      sha256 = "1s5r5w231lzy3csljd5qil54ibm9mjs7c9hbw1whqmn4kd0vaz15";
+      name = "messagelib-16.12.3.tar.xz";
     };
   };
   minuet = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/minuet-16.12.2.tar.xz";
-      sha256 = "1sv9b1lq2dyvlwq0bmmnxak60nz83wbwnw1d8w3n5xadssarbr1s";
-      name = "minuet-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/minuet-16.12.3.tar.xz";
+      sha256 = "15c0mw8qj7r6192h39lvsmiy3pqlfqzari4qjg2x44j5gq02ab3c";
+      name = "minuet-16.12.3.tar.xz";
     };
   };
   okteta = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/okteta-16.12.2.tar.xz";
-      sha256 = "1xq1bjpy7g8qn9d7dfgy00kf5bdcpvj1489b65yrlmyi382m5k7s";
-      name = "okteta-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/okteta-16.12.3.tar.xz";
+      sha256 = "14wmacbxc5kc3y5y5lsdxgsswi1jdvlxsd0xqcims50xjpb8znpd";
+      name = "okteta-16.12.3.tar.xz";
     };
   };
   okular = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/okular-16.12.2.tar.xz";
-      sha256 = "020z6wlycip067j398lznqcspi3b6dx1zds9ibhxw9zzh3ms92kc";
-      name = "okular-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/okular-16.12.3.tar.xz";
+      sha256 = "1gilr9nviv51pcnmqdfw7834knvyfd11ggdjvinxvbpz61832niv";
+      name = "okular-16.12.3.tar.xz";
     };
   };
   palapeli = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/palapeli-16.12.2.tar.xz";
-      sha256 = "1vkkq9r9r85x46xx91gqyhpagx1xscrvlkx4knd72rcxfygipzf9";
-      name = "palapeli-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/palapeli-16.12.3.tar.xz";
+      sha256 = "13s9ybj8a1f39z66syj88vx8rygdbb969b1d5r01msav3lk8ar3j";
+      name = "palapeli-16.12.3.tar.xz";
     };
   };
   parley = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/parley-16.12.2.tar.xz";
-      sha256 = "0fvkhph41y5ig3nwmb4zfh8n3sip52r5al3vn4yll2ndkbwdkgjb";
-      name = "parley-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/parley-16.12.3.tar.xz";
+      sha256 = "0vmbn8188brp4bysyzmkgsa8nnn9zdqb7q6x3mi1xg7ralzfjw71";
+      name = "parley-16.12.3.tar.xz";
     };
   };
   picmi = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/picmi-16.12.2.tar.xz";
-      sha256 = "0j0jhvw8b18sskvd32snk4g7xpjk3kqfw9kpvfri0qayrshcxk2c";
-      name = "picmi-16.12.2.tar.xz";
+      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.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pimcommon-16.12.2.tar.xz";
-      sha256 = "1c4h1g6hpa7hw3ka2r561q813if031vriz646skin840jwdhnv7m";
-      name = "pimcommon-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/pimcommon-16.12.3.tar.xz";
+      sha256 = "179ig6rwxil1ssm7k2cy7ny3vf2dbhsjn39c0ic70r03q3lzbhll";
+      name = "pimcommon-16.12.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pim-data-exporter-16.12.2.tar.xz";
-      sha256 = "14gkkyvcwa7q1yq6qhswq4ch9gcp1ddpjyf46d0550z1rkpws28m";
-      name = "pim-data-exporter-16.12.2.tar.xz";
+      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";
     };
   };
   pim-sieve-editor = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pim-sieve-editor-16.12.2.tar.xz";
-      sha256 = "03a3imm5zs4p6zlp3m0pdc22cii26cnkgl1s1059lhmd3g3dhl85";
-      name = "pim-sieve-editor-16.12.2.tar.xz";
+      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";
     };
   };
   pim-storage-service-manager = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/pim-storage-service-manager-16.12.2.tar.xz";
-      sha256 = "1kcbrg9h3c5khyabs5n6adqljj60vks7npb8iy649y0rx2qc2fn9";
-      name = "pim-storage-service-manager-16.12.2.tar.xz";
+      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";
     };
   };
   poxml = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/poxml-16.12.2.tar.xz";
-      sha256 = "17sv19rg1d65h6ks11k7f8zx6yliyhk1j2fxnc81l8md1flarfm0";
-      name = "poxml-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/poxml-16.12.3.tar.xz";
+      sha256 = "1cpc49hnslc2iabgnvda7967mmrdzykjydi8py67ycr9k1gx6pm5";
+      name = "poxml-16.12.3.tar.xz";
     };
   };
   print-manager = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/print-manager-16.12.2.tar.xz";
-      sha256 = "1amhl13n7i5z1jfhyrhvigk0bhh9myag7kk83bqkxffsx0lzzwbw";
-      name = "print-manager-16.12.2.tar.xz";
+      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";
     };
   };
   rocs = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/rocs-16.12.2.tar.xz";
-      sha256 = "1gd0wdvp3c4s8br23fqqa0cp2vwfjp3xqkj1y3xf6pzv01sk7n7g";
-      name = "rocs-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/rocs-16.12.3.tar.xz";
+      sha256 = "17iz9ql988mj1vsvywd8w5w7qmbncxal71maf3rldadwmadkvzbl";
+      name = "rocs-16.12.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/signon-kwallet-extension-16.12.2.tar.xz";
-      sha256 = "187xjbjw9a34p9cjjhijmwg8n7m83qikxa5q8nsffd48pl7pag2i";
-      name = "signon-kwallet-extension-16.12.2.tar.xz";
+      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";
     };
   };
   spectacle = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/spectacle-16.12.2.tar.xz";
-      sha256 = "1snz8kgnwm2cbfa6y9awb3d0markfmmbgkjs1k0xs938mqam4507";
-      name = "spectacle-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/spectacle-16.12.3.tar.xz";
+      sha256 = "1fca71a59sgicq9zi8d0im0xpg7iz93s96h3clxxc6p493vsjkx6";
+      name = "spectacle-16.12.3.tar.xz";
     };
   };
   step = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/step-16.12.2.tar.xz";
-      sha256 = "0ghr054c644hvay0k4xsahrl8bwnd9w8yqq3slrdblhs7z3c7iqk";
-      name = "step-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/step-16.12.3.tar.xz";
+      sha256 = "0pyvhlfrklc2xxylb0nlnpqx5xi0pp4zyb3xbzj87wmvcw7v5n6r";
+      name = "step-16.12.3.tar.xz";
     };
   };
   svgpart = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/svgpart-16.12.2.tar.xz";
-      sha256 = "0z9a7654f3n5870d02zm8a9dpymc3jxgmf79wavsp8jjr8sdgy6g";
-      name = "svgpart-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/svgpart-16.12.3.tar.xz";
+      sha256 = "0frzqp504dzqwqs9lh544xxa8i6sqi6qj533mqbzkqbjx310ka3w";
+      name = "svgpart-16.12.3.tar.xz";
     };
   };
   sweeper = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/sweeper-16.12.2.tar.xz";
-      sha256 = "0g0iw89l27v4ivqzsrv9j1q4dgihk80nvgf2cfagadfd50hmifr4";
-      name = "sweeper-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/sweeper-16.12.3.tar.xz";
+      sha256 = "1vf4840l233gji4sjkg9gz2pr98kin5sz37kj645z75vikwmk3al";
+      name = "sweeper-16.12.3.tar.xz";
     };
   };
   syndication = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/syndication-16.12.2.tar.xz";
-      sha256 = "0vgpbr46ibyb097pbqmvpl934d4zwz3gb0fkyc23gwpxq1fgsizp";
-      name = "syndication-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/syndication-16.12.3.tar.xz";
+      sha256 = "11qa0jya3fjvhwsq98aag92ha20y7x758fvc4xi3800rbj8nlc58";
+      name = "syndication-16.12.3.tar.xz";
     };
   };
   umbrello = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/umbrello-16.12.2.tar.xz";
-      sha256 = "1g4856mvj9vzm3k86nqm9sfynall1wcj3mvnc80jji7aazmpkl6z";
-      name = "umbrello-16.12.2.tar.xz";
+      url = "${mirror}/stable/applications/16.12.3/src/umbrello-16.12.3.tar.xz";
+      sha256 = "1a4jhfmh2p1vsx8702ham550blkjj42ibwigcink6s9cadwk90cl";
+      name = "umbrello-16.12.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "16.12.2";
+    version = "16.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/16.12.2/src/zeroconf-ioslave-16.12.2.tar.xz";
-      sha256 = "1wqiakgc82zylvssxrm2askw6rjw89x85dws7q9zw13hdpvh12ss";
-      name = "zeroconf-ioslave-16.12.2.tar.xz";
+      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";
     };
   };
 }

From a2d50e744a9bfaf61b7b72e4a8fb06327bf46753 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 17:56:33 -0500
Subject: [PATCH 2181/3449] gloox: 1.0.14 -> 1.0.20

---
 pkgs/development/libraries/gloox/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix
index 12460f4f2d29..9ce47ec2f1a2 100644
--- a/pkgs/development/libraries/gloox/default.nix
+++ b/pkgs/development/libraries/gloox/default.nix
@@ -8,27 +8,29 @@ assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 assert idnSupport -> libidn != null;
 
+with stdenv.lib;
+
 let
-  version = "1.0.14";
+  version = "1.0.20";
 in
 stdenv.mkDerivation rec {
   name = "gloox-${version}";
 
   src = fetchurl {
     url = "http://camaya.net/download/gloox-${version}.tar.bz2";
-    sha256 = "0h9r4382qv0vqc91x1qz1nivxw1r2l874s1kl0bskzm9dyk742sj";
+    sha256 = "1a6yhs42wcdm8az3983m3lx4d9296bw0amz5v3b4012g1xn0hhq2";
   };
 
   buildInputs = [ ]
-    ++ stdenv.lib.optional zlibSupport zlib
-    ++ stdenv.lib.optional sslSupport openssl
-    ++ stdenv.lib.optional idnSupport libidn;
+    ++ optional zlibSupport zlib
+    ++ optional sslSupport openssl
+    ++ optional idnSupport libidn;
 
   meta = {
     description = "A portable high-level Jabber/XMPP library for C++";
-    homepage = "http://camaya.net/gloox";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    platforms = with stdenv.lib.platforms; unix;
+    homepage = http://camaya.net/gloox;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ fuuzetsu ];
+    platforms = platforms.unix;
   };
 }

From 54b7c3b63fd46f66487f4b29fb4b42d0c6353118 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 12 Mar 2017 23:58:20 +0100
Subject: [PATCH 2182/3449] clisp-git: update to the upstream fix of 32-bit
 builds

The current exact tip fails to build on x86_64, there probably is a
fresher safe commit, but I haven't try bisecting.
---
 pkgs/development/interpreters/clisp/hg.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix
index 58bb52397bf7..597f75c46456 100644
--- a/pkgs/development/interpreters/clisp/hg.nix
+++ b/pkgs/development/interpreters/clisp/hg.nix
@@ -23,13 +23,13 @@ assert x11Support -> (libX11 != null && libXau != null && libXt != null
   && libXpm != null && xproto != null && libXext != null && xextproto != null);
 
 stdenv.mkDerivation rec {
-  v = "2.50pre20161201";
+  v = "2.50pre20170130";
   name = "clisp-${v}";
 
   src = fetchhg {
     url = "http://hg.code.sf.net/p/clisp/clisp";
-    rev = "536a48";
-    sha256 = "097igsfpn8xipnjapyf5hx6smzh04v4ncskxl747xxn6pgpq813z";
+    rev = "130e74c8ea17";
+    sha256 = "1aqaxskvghc4ipbs3m4syvzn6bzj165zqvjpw0xa696i07vkk19j";
   };
 
   inherit libsigsegv gettext coreutils;

From 86a23bcffff96fa67a7a1c01d922b90d1b48f9c9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 18:05:06 -0500
Subject: [PATCH 2183/3449] gmm: 4.3 -> 5.1

gmm: Remove whitespace
---
 pkgs/development/libraries/gmm/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix
index 47345e2a22c7..7f8a2276ef25 100644
--- a/pkgs/development/libraries/gmm/default.nix
+++ b/pkgs/development/libraries/gmm/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "gmm-4.3";
+stdenv.mkDerivation rec {
+  name = "gmm-${version}";
+  version = "5.1";
 
   src = fetchurl {
-    url = http://download.gna.org/getfem/stable/gmm-4.3.tar.gz;
-    sha256 = "0wpp3k73wd3rblsrwxl6djq6m11fx3q5wgw0pl41m9liswsw6din";
+    url ="http://download.gna.org/getfem/stable/${name}.tar.gz";
+    sha256 = "0di68vdn34kznf96rnwrpb3bbm3ahaczwxd306s9dx41kcqbzrlh";
   };
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "Generic C++ template library for sparse, dense and skyline matrices";
     homepage = http://home.gna.org/getfem/gmm_intro.html;
-    license = stdenv.lib.licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
   };
 }

From bed935bd135215771a11e3b18ff658c5aa6ae521 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 13 Mar 2017 00:27:41 +0000
Subject: [PATCH 2184/3449] qmetro: init at 0.7.1

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

diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix
new file mode 100644
index 000000000000..932d8156a79a
--- /dev/null
+++ b/pkgs/applications/misc/qmetro/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, qmake4Hook, unzip, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "${project}-${version}";
+  project = "qmetro";
+  version = "0.7.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/${project}/${name}.zip";
+    sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5";
+  };
+
+  nativeBuildInputs = [ qmake4Hook unzip ];
+
+  buildInputs = [ qt4 ];
+
+  postPatch = ''
+    sed -e 's#Exec=/usr/bin/qmetro#Exec=qmetro#' -i rc/qmetro.desktop
+    echo 'LIBS += -lz' >> qmetro.pro
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/projects/qmetro/;
+    description = "Worldwide transit maps viewer";
+    license = licenses.gpl3;
+
+    maintainter = with maintainers; [ orivej ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9686b1c62d64..28fea813af78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14998,6 +14998,8 @@ with pkgs;
 
   qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
 
+  qmetro = callPackage ../applications/misc/qmetro { };
+
   qmidinet = callPackage ../applications/audio/qmidinet { };
 
   qmidiroute = callPackage ../applications/audio/qmidiroute { };

From b64c6b46b1f4bbf48e6312d40de1a9f2bfa1bc16 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 19:41:00 -0500
Subject: [PATCH 2185/3449] gssdp: 0.14.11 -> 1.0.1

---
 pkgs/development/libraries/gssdp/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 1a8cb233b77a..55e20065732c 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,21 +1,22 @@
 { stdenv, fetchurl, pkgconfig, libsoup, glib }:
 
-stdenv.mkDerivation {
-  name = "gssdp-0.14.11";
+stdenv.mkDerivation rec {
+  name = "gssdp-${version}";
+  version = "1.0.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz;
-    sha256 = "0njkqr2y7c6linnw4wkc4y2vq5dfkpryqcinbzn0pzhr46psxxbv";
+    url = "mirror://gnome/sources/gssdp/1.0/${name}.tar.xz";
+    sha256 = "1qfj4gir1qf6v86z70ryzmjb75ns30q6zi5p89vhd3621gs6f7b0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libsoup ];
   propagatedBuildInputs = [ glib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = http://www.gupnp.org/;
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.lgpl2;
+    platforms = platforms.all;
   };
 }

From 14db0b9ef3315e87c07cdc9195cc543c21e63bd5 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Mon, 13 Mar 2017 02:35:34 +0100
Subject: [PATCH 2186/3449] pbrt: 2016-05-19 -> 2017-01-12 (#23405)

---
 pkgs/applications/graphics/pbrt/default.nix | 25 +++++++++++----------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix
index 5bf6907744ad..894667597d85 100644
--- a/pkgs/applications/graphics/pbrt/default.nix
+++ b/pkgs/applications/graphics/pbrt/default.nix
@@ -1,25 +1,26 @@
-{stdenv, fetchgit, flex, bison, cmake, git, zlib}:
+{stdenv, fetchFromGitHub, flex, bison, cmake, git, zlib}:
 
 stdenv.mkDerivation rec {
 
-  version = "2016-05-19";
+  version = "2017-01-12";
   name = "pbrt-v3-${version}";
-  src = fetchgit {
-    url = "https://github.com/mmp/pbrt-v3.git";
-    rev = "638249e5cf4596e129695c8df8525d43f11573ff";
-    sha256 = "10ykqrg4zcfb4sfsg3z793c6vld6b6g8bzfyk7ya3yvvc9sdlr5g";
-  };
 
-  fetchSubmodules = true;
+  src = fetchFromGitHub {
+    rev = "35b6da3429526f2026fe5e5ebaf36d593e113028";
+    owner  = "mmp";
+    repo   = "pbrt-v3";
+    sha256 = "10lvbph13p6ilzqb8sgrvn9gg1zmi8wpy3hhjbqp8dnsa4x0mhj7";
+    fetchSubmodules = true;
+  };
 
   buildInputs = [ git flex bison cmake zlib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://pbrt.org";
     description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
-    platforms = stdenv.lib.platforms.linux ;
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.juliendehos ];
+    platforms = platforms.linux ;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.juliendehos ];
     priority = 10;
   };
 }

From 09c73776b952c6f99856263eb86b422cf09d913d Mon Sep 17 00:00:00 2001
From: andyjscott <andyjscott@users.noreply.github.com>
Date: Mon, 13 Mar 2017 01:38:27 +0000
Subject: [PATCH 2187/3449] mmex: v1.3.1 -> v1.3.3 (#23732)

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

diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix
index 2981a0f7f890..30b8809f2247 100644
--- a/pkgs/applications/office/mmex/default.nix
+++ b/pkgs/applications/office/mmex/default.nix
@@ -2,7 +2,7 @@
 
 
 let
-  version = "1.3.1";
+  version = "1.3.3";
 in
   stdenv.mkDerivation {
     name = "money-manager-ex-${version}";
@@ -10,7 +10,7 @@ in
     src = fetchgit {
       url = "https://github.com/moneymanagerex/moneymanagerex.git";
       rev = "refs/tags/v${version}";
-      sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0";
+      sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74";
     };
 
     buildInputs = [ sqlite wxGTK30 gettext ];

From afeb989c5c400b5439f2019bf4e31fb00aaade7f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 20:38:46 -0500
Subject: [PATCH 2188/3449] gtkspell:3.0.8 -> 3.0.9

---
 pkgs/development/libraries/gtkspell/3.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 1b28477f1e0c..c6cc51b1e1f8 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -2,21 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "gtkspell-${version}";
-  version = "3.0.8";
+  version = "3.0.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.gz";
-    sha256 = "1zrz5pz4ryvcssk898liynmy2wyxgj95ak7mp2jv7x62yzihq6h1";
+    url = "mirror://sourceforge/gtkspell/gtkspell3-${version}.tar.xz";
+    sha256 = "09jdicmpipmj4v84gnkqwbmj4lh8v0i6pn967rb9jx4zg2ia9x54";
   };
 
-  buildInputs = [ aspell pkgconfig gtk3 enchant intltool ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ aspell gtk3 enchant ];
   propagatedBuildInputs = [ enchant ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://gtkspell.sourceforge.net/";
     description = "Word-processor-style highlighting GtkTextView widget";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fuuzetsu ];
   };
 }

From 912b956b074a68c8280321da5082e49ccb2bf882 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 20:55:07 -0500
Subject: [PATCH 2189/3449] gupnp-tools: 0.8.8 -> 0.8.13

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

diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index f846a711aa4a..ea78cdd106ac 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -3,10 +3,10 @@
 stdenv.mkDerivation rec {
   name = "gupnp-tools-${version}";
   majorVersion = "0.8";
-  version = "${majorVersion}.8";
+  version = "${majorVersion}.13";
   src = fetchurl {
     url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz";
-    sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij";
+    sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda";
   };
 
   buildInputs = [gupnp libuuid gssdp pkgconfig gtk3 intltool gupnp_av

From fe339d281bd1947983a8d590736227707a9f56b9 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 11 Mar 2017 20:12:53 -0500
Subject: [PATCH 2190/3449] minikube: switch to build from source & fix on
 Darwin

Linux behavior should be largely unchanged but we now build minikube
ourselves. Unfortunately localkube is still tricky to build so I pull in
a binary version from upstream.
---
 .../networking/cluster/minikube/default.nix   | 88 +++++++++++++------
 1 file changed, 59 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index fcc17df3fc46..19fe89ea4491 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,47 +1,77 @@
-{ stdenv, lib, fetchurl, makeWrapper, docker-machine-kvm, kubernetes, libvirt, qemu }:
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm, makeWrapper }:
 
 let
-  arch = if stdenv.isLinux
-         then "linux-amd64"
-         else "darwin-amd64";
-  checksum = if stdenv.isLinux
-             then "0cdcabsx5l4jbpyj3zzyz5bnzks6wl64bmzdsnk41x92ar5y5yal"
-             else "12f3b7s5lwpvzx4wj6i6h62n4zjshqf206fxxwpwx9kpsdaw6xdi";
+  binPath = [ kubernetes ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [];
 
-# TODO: compile from source
-
-in stdenv.mkDerivation rec {
-  pname = "minikube";
+  # Normally, minikube bundles localkube in its own binary via go-bindata. Unfortunately, it needs to make that localkube
+  # a static linux binary, and our Linux nixpkgs go compiler doesn't seem to work when asking for a cgo binary that's static
+  # (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
+  # 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.
+  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";
+  };
+in buildGoPackage rec {
+  pname   = "minikube";
+  name    = "${pname}-${version}";
   version = "0.17.1";
-  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/minikube/releases/v${version}/minikube-${arch}";
-    sha256 = "${checksum}";
+  goPackagePath = "k8s.io/minikube";
+
+  src = fetchFromGitHub {
+    owner  = "kubernetes";
+    repo   = "minikube";
+    rev    = "v${version}";
+    sha256 = "1m61yipn0p3cfavjddhrg1rcmr0hv6k3zxvqqd9fisl79g0sdfsr";
   };
 
-  phases = [ "installPhase" "fixupPhase" ];
+  # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
+  # that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
+  buildInputs = [ go-bindata makeWrapper kubernetes ];
+  subPackages = [ "cmd/minikube" ];
 
-  buildInputs = [ makeWrapper ];
+  preBuild = ''
+    pushd go/src/${goPackagePath} >/dev/null
 
-  binPath = lib.makeBinPath [ docker-machine-kvm kubernetes libvirt qemu ];
+    mkdir -p out
+    cp ${localkube-binary} out/localkube
 
-  installPhase = ''
-    install -Dm755 ${src} $out/bin/${pname}
+    go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/addons/...
+
+    ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
+    ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
+
+    export buildFlagsArray="-ldflags=\
+      -X k8s.io/minikube/pkg/version.version=v${version} \
+      -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \
+      -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET"
+
+    popd >/dev/null
   '';
 
-  fixupPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/bin/minikube"
-
-    wrapProgram $out/bin/${pname} \
-      --prefix PATH : ${binPath}
+  postInstall = ''
+    mkdir -p $bin/share/bash-completion/completions/
+    MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube
   '';
 
+  postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}";
+
   meta = with stdenv.lib; {
-    homepage = https://github.com/kubernetes/minikube;
+    homepage    = https://github.com/kubernetes/minikube;
     description = "A tool that makes it easy to run Kubernetes locally";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ebzzry ];
-    platforms = with platforms; linux ++ darwin;
+    license     = licenses.asl20;
+    maintainers = with maintainers; [ ebzzry copumpkin ];
+    platforms   = with platforms; unix;
   };
 }

From 23e4e32b91f40a569ca8e0b213ab531455b5fb7e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 12 Mar 2017 22:35:20 -0400
Subject: [PATCH 2191/3449] kops: enable on Darwin

---
 pkgs/applications/networking/cluster/kops/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index 80747e44bf53..ea25fa6ccb57 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -27,5 +27,6 @@ buildGoPackage rec {
     homepage = https://github.com/kubernetes/kops;
     license = licenses.asl20;
     maintainers = with maintainers; [offline];
+    platforms = platforms.unix;
   };
 }

From cf7d4bf8af4829e6a7ad1abf19109e0a19fcc41c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 12 Mar 2017 23:02:34 -0400
Subject: [PATCH 2192/3449] kubernetes: 1.5.2 -> 1.5.4

---
 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 ecb2cd65a37c..bf69eac318dc 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.2";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1ps9bn5gqknyjv0b9jvp7xg3cyd4anq11j785p22347al0b8w81v";
+    sha256 = "1xhz6m6ly6ffj60id9ms1liijlrik8n2pxyzb5m77ym3zf7rxlpl";
   };
 
   buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ];

From 6a51b55af6f3b962a55402a5c3406f5dd848b044 Mon Sep 17 00:00:00 2001
From: Arseniy Alekseyev <rotsor@gmail.com>
Date: Mon, 13 Mar 2017 03:02:33 +0000
Subject: [PATCH 2193/3449] fetchSvn: Add support for --ignore-keywords flag

This is a flag that disables subversion keyword substitution.
Keyword substitution inserts metadata into the files being checked
out, and is therefore somewhat at odds with build reproducibility.

In particular, it can become a problem if you're trying to switch
between svn and a git export of the same thing (keyword substitutions
are normally not exported into git).
---
 pkgs/build-support/fetchsvn/builder.sh  | 3 ++-
 pkgs/build-support/fetchsvn/default.nix | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh
index 3ab6e730a51b..7a8a161712d6 100644
--- a/pkgs/build-support/fetchsvn/builder.sh
+++ b/pkgs/build-support/fetchsvn/builder.sh
@@ -22,7 +22,8 @@ fi;
 # server's certificate.  This is perfectly safe: we don't care
 # whether the server is being spoofed --- only the cryptographic
 # hash of the output matters. Pass in extra p's to handle redirects.
-printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive ${ignoreExternals:+--ignore-externals} \
+printf 'p\np\np\n' | svn export --trust-server-cert --non-interactive \
+    ${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \
     -r "$rev" "$url" "$out"
 
 stopNest
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 85ec52c4bde0..05ed0505f81c 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -1,5 +1,6 @@
 {stdenv, subversion, sshSupport ? false, openssh ? null}:
-{url, rev ? "HEAD", md5 ? "", sha256 ? "", ignoreExternals ? false, name ? null}:
+{url, rev ? "HEAD", md5 ? "", sha256 ? "",
+ ignoreExternals ? false, ignoreKeywords ? false, name ? null}:
 
 let
   repoName = with stdenv.lib;
@@ -31,7 +32,7 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = if sha256 == "" then md5 else sha256;
   
-  inherit url rev sshSupport openssh ignoreExternals;
+  inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
 
   impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
   preferLocalBuild = true;

From d4beeef3ce78c1ef0077db51136664553a51eaff Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Thu, 9 Mar 2017 18:26:47 +0800
Subject: [PATCH 2194/3449] vlc: compile against qt 5.6

---
 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 9686b1c62d64..029455e0dd75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15794,7 +15794,8 @@ with pkgs;
     gtk = gtk2;
   };
 
-  vlc_qt5 = libsForQt5.vlc;
+  # VLC 3.0 is needed to compile in C++11 mode (QT 5.7)
+  vlc_qt5 = libsForQt56.vlc;
 
   vmpk = callPackage ../applications/audio/vmpk { };
 

From eb7690ab0628bae91eeeeadf0586bb3237602167 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 13 Mar 2017 11:46:02 +0800
Subject: [PATCH 2195/3449] qsyncthingtray: broken on qt 5.7

---
 pkgs/applications/misc/qsyncthingtray/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index ba8b946f3fbb..0aeb7d7eb8fc 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase qtwebengine ];
   nativeBuildInputs = [ qmakeHook ];
   enableParallelBuilding = true;
-  
+
   postInstall = ''
     mkdir -p $out/bin
     cp binary/QSyncthingTray $out/bin
@@ -33,5 +33,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3;
     maintainers = with maintainers; [ zraexy ];
     platforms = platforms.all;
+    broken = builtins.compareVersions qtbase.version "5.7.0" >= 0;
   };
 }

From f7fd8a6f73aa58307c178c8b3141abf2af92d6e0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 13 Mar 2017 11:46:08 +0800
Subject: [PATCH 2196/3449] xca: broken on qt 5.7

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

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 30d38183c8f2..60af439e94bb 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -37,5 +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;
   };
 }

From c272796806fa0cbce3e51ba9be2234af2b22657a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 13 Mar 2017 04:22:29 +0000
Subject: [PATCH 2197/3449] mtr: 0.86 -> 0.87

---
 pkgs/tools/networking/mtr/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index c96e5cac367c..666bb4942a9f 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses, autoconf
+{stdenv, fetchurl, autoreconfHook, pkgconfig, ncurses
 , withGtk ? false, gtk2 ? null}:
 
 assert withGtk -> gtk2 != null;
@@ -6,24 +6,27 @@ assert withGtk -> gtk2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   baseName="mtr";
-  version="0.86";
+  version="0.87";
   name="${baseName}-${version}";
-  
+
   src = fetchurl {
     url="ftp://ftp.bitwizard.nl/${baseName}/${name}.tar.gz";
-    sha256 = "01lcy89q3i9g4kz4liy6m7kcq1zyvmbc63rqidgw67341f94inf5";
+    sha256 = "17zi99n8bdqrwrnbfyjn327jz4gxx287wrq3vk459c933p34ff8r";
   };
 
   configureFlags = optionalString (!withGtk) "--without-gtk";
 
-  buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk2;
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ ncurses ] ++ optional withGtk gtk2;
+
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://www.bitwizard.nl/mtr/;
     description = "A network diagnostics tool";
-    maintainers = [ maintainers.koral maintainers.raskin ];
+    maintainers = with maintainers; [ koral orivej raskin ];
     platforms = platforms.unix;
     license = licenses.gpl2;
   };
 }
-

From 12083de992057d55a575a36965260d0c153bc13a Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 6 Mar 2017 12:56:50 -0800
Subject: [PATCH 2198/3449] nvidia_x11: 375.26 -> 375.39

nvidia_x11_beta: 378.09 -> 378.13
---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 5e26fef6e19d..f04ff107ea66 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -6,19 +6,19 @@ in
 {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "375.26";
-    sha256_32bit = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw";
-    sha256_64bit = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg";
-    settingsSha256 = "1s8zf5cfhx8m05fvws0gh1q0wy5zyyg2j510zlwp4hk35y7dic5y";
-    persistencedSha256 = "15r6rbzyk4yaqkpkqs8j00zc7jbhgp8naskv93dwjyw0lnj0wgky";
+    version = "375.39";
+    sha256_32bit = "0mlly5n84640xa2mcdqqg44s42ck6g3lj5skf7gmfp2w5ibzccvz";
+    sha256_64bit = "19w5v81f770rqjrvdwz11k015zli2y8f4x10ydqxcy0nhhh5mgli";
+    settingsSha256 = "0f881q4jzliqzqi1p5lzwz86h829m5g74zdj7nlfi1cc6s45g5p5";
+    persistencedSha256 = "0zj6wdcgg2ljhvsssfsqz9wk28ykmsh4gwmis31q3rsrkq668x33";
   };
 
   beta = generic {
-    version = "378.09";
-    sha256_32bit = "0a1vwvsqi89pn29c9aii53xq8292dxf68sr8lxzx4bpqjqmsbapy";
-    sha256_64bit = "018qqg9zlpwd2cad99vbn18rnrrkrqybs7q65h8dmxirkx4pcvh8";
-    settingsSha256 = "1fjkpqmzdzk46p1chzxqvbj3cpqcwwx4qmv33yjq7z2a5zab9z8v";
-    persistencedSha256 = "1svaa5a0zz0r8qy6pg9lnhy5zmffvw0h120h46qqd01pkb4yv5lc";
+    version = "378.13";
+    sha256_32bit = "1ca6kbk20kki5f698x1ga9b1v1is4mr10f7f70s3gixak1h2mrh5";
+    sha256_64bit = "1vj2vyy6vim0qis7iqq4la6k6bnby65p3qjbl888qnpjkqj7kqrx";
+    settingsSha256 = "08q04cd769l1i6737ylvanaxrqg8fym05kjp7kvpz28764g96gxj";
+    persistencedSha256 = "0hmxp5fbxwl9f7c9fspg65my6lwynpqhz02zw7100dgwqb2vn1qj";
   };
 
   legacy_340 = generic {

From 8799254eac48f8b351aef941f3ff330e309ab150 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 6 Mar 2017 12:59:51 -0800
Subject: [PATCH 2199/3449] nvidia_x11_beta: add patch to support Linux 4.10.x

thanks to bendlas for the review for pointing out a way to grab the patch remotely!
---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 9e39a6df09c1..eb4d3ae224a0 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -42,6 +42,13 @@ 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 versionOlder version "375"
+              then null
+              else [ (fetchurl {
+                      url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia;  sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";
+                     }) ];
+
     inherit version useGLVND useProfiles;
     inherit (stdenv) system;
 

From 7dc3edaa6a660021ede4db72e38f138873b0f7fc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 13 Mar 2017 08:23:19 +0100
Subject: [PATCH 2200/3449] slimerjs: 0.10.2 -> 0.10.3

---
 pkgs/development/tools/slimerjs/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index cb6c4614a1a4..b3049736b710 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, fetchgit, zip, unzip, firefox, bash}:
+{stdenv, fetchurl, fetchgit, fetchFromGitHub, zip, unzip, firefox, bash}:
 let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.10.2";
+    version="0.10.3";
     name="${baseName}-${version}";
-    hash="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529";
-    url="http://download.slimerjs.org/releases/0.10.2/slimerjs-0.10.2.zip";
-    sha256="16pg12bvfqls707nsdqi3bl1c833kncsvnd0qiq5692lrh93x529";
+    owner = "laurentj";
+    repo = "${baseName}";
+    sha256="16v6a1kcq8il4snbrgsq5xmxs35alzf4qlmscr2yli95xq5fnl5y";
+    rev = "${version}";
   };
   buildInputs = [
     unzip zip
@@ -16,12 +17,15 @@ in
 stdenv.mkDerivation {
   inherit (s) name version;
   inherit buildInputs;
-  src = fetchurl {
-    inherit (s) url sha256;
-  };
+  #src = fetchurl {
+  #  inherit (s) url sha256;
+  #};
   #src = fetchgit {
   #  inherit (s) url sha256 rev;
   #};
+  src = fetchFromGitHub {
+    inherit (s) owner repo rev sha256;
+  };
   preConfigure = ''
     test -d src && cd src
     test -f omni.ja || zip omni.ja -r */

From 78c0cecc5fa0d2a1d179dd3230652f8af2dc179f Mon Sep 17 00:00:00 2001
From: Mikhail Volkhov <volhovm.cs@gmail.com>
Date: Mon, 13 Mar 2017 10:34:55 +0300
Subject: [PATCH 2201/3449] sage: fix build at 6.8

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

diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix
index 9e17fe60c295..af4cda874730 100644
--- a/pkgs/applications/science/math/sage/default.nix
+++ b/pkgs/applications/science/math/sage/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk
-, imagemagick, liblapack, python, openssl, libpng
+{ stdenv, fetchurl, m4, perl, gfortran, texlive, ffmpeg, tk, gnused_422
+, imagemagick, liblapack, python, openssl, libpng 
 , which
 }:
 
@@ -9,10 +9,11 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "http://old.files.sagemath.org/src-old/${name}.tar.gz";
     sha256 = "102mrzzi215g1xn5zgcv501x9sghwg758jagx2jixvg1rj2jijj9";
+
   };
 
-  buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg tk imagemagick liblapack
-                  python openssl libpng which];
+  buildInputs = [ m4 perl gfortran texlive.combined.scheme-basic ffmpeg gnused_422 tk imagemagick liblapack
+                  python openssl libpng which ];
 
   patches = [ ./spkg-singular.patch ./spkg-python.patch ./spkg-git.patch ];
 

From 89747d357badd51485a2c893ee3803d49def058b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 11 Mar 2017 15:05:23 +0100
Subject: [PATCH 2202/3449] msilbc: fix build

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

diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix
index 1e868b79ce66..c7d65f156b8b 100644
--- a/pkgs/development/libraries/msilbc/default.nix
+++ b/pkgs/development/libraries/msilbc/default.nix
@@ -2,18 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "msilbc-2.0.3";
-  
+
   src = fetchurl {
     url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz";
     sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d";
   };
 
-#  patchPhase = "sed -i /MS_FILTER_SET_FMTP/d ilbc.c";
+  propagatedBuildInputs = [ ilbc mediastreamer ];
+  nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ilbc mediastreamer];
-
-  buildInputs = [pkgconfig];
-  configureFlags = "ILBC_LIBS=ilbc ILBC_CFLAGS=-I${ilbc}/include";
+  configureFlags = [
+    "ILBC_LIBS=ilbc" "ILBC_CFLAGS=-I${ilbc}/include"
+    "MEDIASTREAMER_LIBS=mediastreamer" "MEDIASTREAMER_CFLAGS=-I${mediastreamer}/include"
+  ];
 
   meta = {
     platforms = stdenv.lib.platforms.linux;

From b264486cf11b5b5946a0c1ad73610a9f80f520a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Mar 2017 10:28:53 +0100
Subject: [PATCH 2203/3449] gnutls: bugfix+security 3.5.9 -> 3.5.10

http://gnutls.org/security.html#GNUTLS-SA-2017-3
---
 pkgs/development/libraries/gnutls/3.5.nix     | 4 ++--
 pkgs/development/libraries/gnutls/generic.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix
index 8bb1a2d97f76..a1eab1a84c11 100644
--- a/pkgs/development/libraries/gnutls/3.5.nix
+++ b/pkgs/development/libraries/gnutls/3.5.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, libunistring, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.5.9";
+  version = "3.5.10";
 
   src = fetchurl {
     url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
-    sha256 = "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2";
+    sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
   };
 })
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index cf298baf48a3..3aef10df33ed 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,6 +1,6 @@
 { lib, fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
 , guileBindings, guile, perl, gmp, autogen, libidn, p11_kit, unbound, libiconv
-, tpmSupport ? false, trousers, nettools, libunistring
+, tpmSupport ? false, trousers, which, nettools, libunistring
 
 # Version dependent args
 , version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
@@ -38,14 +38,14 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   buildInputs = [ lzo lzip libtasn1 libidn p11_kit zlib gmp autogen libunistring ]
-    ++ lib.optional doCheck nettools
     ++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
     ++ lib.optional (tpmSupport && stdenv.isLinux) trousers
     ++ [ unbound ]
     ++ lib.optional guileBindings guile
     ++ buildInputs;
 
-  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs;
+  nativeBuildInputs = [ perl pkgconfig ] ++ nativeBuildInputs
+    ++ lib.optionals doCheck [ which nettools ];
 
   propagatedBuildInputs = [ nettle ];
 

From 64fcdf7aa4754cdb38f0a69297e3b3c80d636c72 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 13 Mar 2017 17:47:40 +0800
Subject: [PATCH 2204/3449] requests-cache: 0.4.10 -> 0.4.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9260b8e73faa..7468b8325e1f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5841,17 +5841,16 @@ in {
 
   requests-cache = buildPythonPackage (rec {
     name = "requests-cache-${version}";
-    version = "0.4.10";
-    disabled = isPy3k;
+    version = "0.4.13";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/requests-cache/${name}.tar.gz";
-      sha256 = "671969d00719fa3e80476b128dc9232025926884d0110d4d235abdd9c3508fc0";
+      sha256 = "18jpyivnq5pjbkymk3i473rihpj2bgikafpha7xvr6w736hiqmpy";
     };
 
     buildInputs = with self; [ mock ];
 
-    propagatedBuildInputs = with self; [ self.six requests2 ];
+    propagatedBuildInputs = with self; [ requests2 six urllib3 ];
 
     meta = {
       description = "Persistent cache for requests library";

From c1b1da21ea86841695a5f90b571ac07dceb2a0f4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 13 Mar 2017 17:48:45 +0800
Subject: [PATCH 2205/3449] tvdb_api: add support for python3

---
 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 7468b8325e1f..d26a29da7290 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31280,7 +31280,7 @@ EOF
       sha256 = "0hq887yb3rwc0rcw32lh7xdkk9bbrqy274aspzqkd6f7dyhp73ih";
     };
 
-    disabled = isPy3k;
+    propagatedBuildInputs = with self; [ requests-cache ];
 
     meta = {
       description = "Simple to use TVDB (thetvdb.com) API in Python.";

From 5fa3b11239bbd0dd95a01f96fd611c5e55690126 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Mon, 13 Mar 2017 17:49:04 +0800
Subject: [PATCH 2206/3449] tvnamer: 2.3 -> 2.4

Also add support for python3
---
 pkgs/top-level/python-packages.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d26a29da7290..5b9cb3b6e6b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -31292,19 +31292,18 @@ EOF
 
   tvnamer = buildPythonPackage rec {
     name = "tvnamer-${version}";
-    version = "2.3";
+    version = "2.4";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/tvnamer/${name}.tar.gz";
-      sha256 = "15i6qvhwhcx08c96xx3s2841yc7k8gxrqqvhw908c11g0045c2r3";
+      sha256 = "10iizmwna2xpyc2694hsrvny68y3bdq576p8kxsvg5gj2spnsxav";
     };
 
-    propagatedBuildInputs = with self; [
-      tvdb_api
-    ];
+    buildInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [ tvdb_api ];
 
-    # tvdb_api isn't working with Python 3
-    disabled = isPy3k;
+    # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or ..
+    doCheck = false;
 
     meta = {
       description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api.";

From c83665108492437527554e39963a733471c75023 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Mar 2017 10:18:00 +0100
Subject: [PATCH 2207/3449] purePackages.octave: 0.7 -> 0.9

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

diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix
index 9f9527d0f025..61bc7a4d5c15 100644
--- a/pkgs/development/pure-modules/octave/default.nix
+++ b/pkgs/development/pure-modules/octave/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, pure, octave }:
+{ stdenv, fetchurl, pkgconfig, pure, octave, gcc6 }:
 
 stdenv.mkDerivation rec {
   baseName = "octave";
-  version = "0.7";
+  version = "0.9";
   name = "pure-${baseName}-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz";
-    sha256 = "04c1q5cjcyc5sg15ny1hn43rkphja3virw4k110cahc3piwbpsqk";
+    sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildInputs = [ pkgconfig gcc6 ];
   propagatedBuildInputs = [ pure octave ];
   makeFlags = "libdir=$(out)/lib prefix=$(out)/";
   setupHook = ../generic-setup-hook.sh;

From 80bd50a6e4cbb875d936a951420abda5167cfc16 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Mar 2017 11:43:24 +0100
Subject: [PATCH 2208/3449] ponyc: 0.10.0 -> 0.11.0

---
 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 2c785d2a721d..3f1aa85e0fcc 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.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1v314abmhlqsj8iyab61cf8nb4kbddv1ycnw29z53mpbmivk4gn0";
+    sha256 = "0jjzc1711km53zkkxwy4r9ki9yxdx8mdjrp7g3mkr42p7q5h4w70";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From dbbdccdd658169a9f001eff01a7629a2404780ba Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Mar 2017 12:07:48 +0100
Subject: [PATCH 2209/3449] ispc: fix build

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

diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 6bc7f66ca299..f8413075ac81 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf,
+{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex_2_6_1, llvmPackages, clangWrapSelf,
 testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
 }:
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     m4
     python
     bison
-    flex
+    flex_2_6_1
     llvm
     llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped
   ];

From 0867ac9963122db938d40cecf188d2e97a4a8182 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Mon, 13 Mar 2017 11:27:08 +0000
Subject: [PATCH 2210/3449] Haskell Packages: jailbreak strict-io

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f37d8b4c9c7f..85839b6492a2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -877,4 +877,8 @@ self: super: {
 
   # https://github.com/danidiaz/streaming-eversion/issues/1
   streaming-eversion = dontCheck super.streaming-eversion;
+
+  # 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;
 }

From e2a13af49c0a05fef1dafc0bb75ec99b8c7da6b7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Mar 2017 13:15:51 +0100
Subject: [PATCH 2211/3449] emboss: fix build

---
 .../science/biology/emboss/default.nix           | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix
index 331820276553..2110a9bcfaba 100644
--- a/pkgs/applications/science/biology/emboss/default.nix
+++ b/pkgs/applications/science/biology/emboss/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, readline, perl, libX11, libpng, libXt, zlib}:
+{stdenv, fetchurl, readline, perl, libharu, libX11, libpng, libXt, zlib}:
 
 stdenv.mkDerivation {
   name = "emboss-6.6.0";
@@ -6,16 +6,14 @@ stdenv.mkDerivation {
     url = "ftp://emboss.open-bio.org/pub/EMBOSS/EMBOSS-6.6.0.tar.gz";
     sha256 = "7184a763d39ad96bb598bfd531628a34aa53e474db9e7cac4416c2a40ab10c6e";
   };
-  # patch = fetchurl {
-  #   url = ftp://emboss.open-bio.org/pub/EMBOSS/fixes/patches/patch-1-9.gz;
-  #   sha256 = "1pfn5zdxrr71c3kwpdkzmmsqvdwkmynkvcr707vqh73h9cjhk3c1";
-  # };
 
-  buildInputs = [readline perl libpng libX11 libXt zlib];
+  buildInputs = [ readline perl libharu libpng libX11 libXt zlib ];
 
-  # preConfigure = ''
-  #   gzip -d $patch | patch -p1
-  # '';
+  configureFlags = [ "--with-hpdf=${libharu}" "--with-pngdriver=${zlib}" ];
+
+  postConfigure = ''
+    sed -i 's@$(bindir)/embossupdate@true@' Makefile
+  '';
 
   meta = {
     description     = "The European Molecular Biology Open Software Suite";

From f32fc9b03e0a5c8152f94ddec01879050df2b988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 13 Mar 2017 13:21:58 +0100
Subject: [PATCH 2212/3449] setuptools_scm: 1.11.1 -> 1.15.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b9cb3b6e6b7..e51ad68366f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23420,11 +23420,11 @@ in {
 
   setuptools_scm = buildPythonPackage rec {
     name = "setuptools_scm-${version}";
-    version = "1.11.1";
+    version = "1.15.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/setuptools_scm/${name}.tar.gz";
-      sha256 = "8c45f738a23410c5276b0ed9294af607f491e4260589f1eb90df8312e23819bf";
+      sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs";
     };
 
     buildInputs = with self; [ pip pytest ];

From 28d2066063953d80ee86a1bf48de68a326662fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 13 Mar 2017 13:22:33 +0100
Subject: [PATCH 2213/3449] sphinxcontrib-httpdomain: 1.3.0 -> 1.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e51ad68366f4..3f0a9a6b2f60 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24728,7 +24728,7 @@ in {
   });
 
   sphinxcontrib_httpdomain = buildPythonPackage (rec {
-    name = "sphinxcontrib-httpdomain-1.3.0";
+    name = "sphinxcontrib-httpdomain-1.5.0";
 
     # Check is disabled due to this issue:
     # https://bitbucket.org/pypa/setuptools/issue/137/typeerror-unorderable-types-str-nonetype
@@ -24736,7 +24736,7 @@ in {
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/s/sphinxcontrib-httpdomain/${name}.tar.gz";
-      sha256 = "ba8fbe82eddc96cfa9d7b975b0422801a14ace9d7e051b8b2c725b92ea6137b5";
+      sha256 = "0srg8lwf4m1hyhz942fcdfxh689xphndngiidb575qmfbi89gc7a";
     };
 
     propagatedBuildInputs = with self; [sphinx];

From 9ab1d08bb0956430a324d338eccc34fdb095aa40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 13 Mar 2017 13:24:43 +0100
Subject: [PATCH 2214/3449] Add sphinxcontrib-openapi at 0.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f0a9a6b2f60..11c2f48ba36b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24727,6 +24727,19 @@ in {
     };
   });
 
+  sphinxcontrib-openapi = buildPythonPackage (rec {
+    name = "sphinxcontrib-openapi-0.3.0";
+
+    doCheck = false;
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/sphinxcontrib-openapi/${name}.tar.gz";
+      sha256 = "0fyniq37nnmhrk4j7mzvg6vfcpb624hb9x70g6mccyw4xrnhadv6";
+    };
+
+    propagatedBuildInputs = with self; [setuptools_scm pyyaml jsonschema sphinxcontrib_httpdomain];
+  });
+
   sphinxcontrib_httpdomain = buildPythonPackage (rec {
     name = "sphinxcontrib-httpdomain-1.5.0";
 

From e4eb46129d5c48f9b3fe4bd06e0f194b833e63e6 Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Mon, 13 Mar 2017 13:58:35 +0100
Subject: [PATCH 2215/3449] spotify: get source via https instead of plain http

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index affb574d60bd..6b4d8e33b503 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
 
   src =
     fetchurl {
-      url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
+      url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
       sha256 = "0l008x06d257vcw6gq3q90hvv93cq6mxpj11by1np6bzzg61qv8x";
     };
 

From d23effdedf359557e6fa306f251f58965b734797 Mon Sep 17 00:00:00 2001
From: Fatih Altinok <fatih@picussecurity.com>
Date: Mon, 13 Mar 2017 17:02:43 +0300
Subject: [PATCH 2216/3449] flow: 0.39.0 -> 0.41.0

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index c1cb4412b9ca..1b41a10bb9c4 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.39.0";
+  version = "0.41.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "05a0kvhlakm7c7n19npg77rj52cz6282290126sfn0qq2059zhli";
+    sha256 = "0v3dhvvj4k35h7g42rmpwc9hqi2z0ccg7rmk8ad00l0djs13l18z";
   };
 
   installPhase = ''

From 8bfa9f528c88243578246798c7c2ddde045e0de0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 13 Mar 2017 15:40:43 +0100
Subject: [PATCH 2217/3449] syslinux: fixup build via a Debian patch

It stopped working probably since binutils update.
---
 pkgs/os-specific/linux/syslinux/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index f4ad94b5085c..ce63d383c8e8 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nasm, perl, python, libuuid, mtools, makeWrapper }:
+{ stdenv, fetchFromGitHub, fetchurl, nasm, perl, python, libuuid, mtools, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "syslinux-2015-11-09";
@@ -10,7 +10,16 @@ stdenv.mkDerivation rec {
     sha256 = "0wk3r5ki4lc334f9jpml07wpl8d0bnxi9h1l4h4fyf9a0d7n4kmw";
   };
 
-  patches = [ ./perl-deps.patch ];
+  patches = [
+    ./perl-deps.patch
+    (fetchurl {
+      # ldlinux.elf: Not enough room for program headers, try linking with -N
+      name = "not-enough-room.patch";
+      url = "https://anonscm.debian.org/cgit/collab-maint/syslinux.git/plain/"
+          + "debian/patches/0014_fix_ftbfs_no_dynamic_linker.patch?id=a556ad7";
+      sha256 = "0ijqjsjmnphmvsx0z6ppnajsfv6xh6crshy44i2a5klxw4nlvrsw";
+    })
+  ];
 
   nativeBuildInputs = [ nasm perl python ];
   buildInputs = [ libuuid makeWrapper ];

From 4efed1d0d410cb1c68628f37636549eed40f1c6a Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 13 Mar 2017 15:42:20 +0100
Subject: [PATCH 2218/3449] jenkins: 2.44 -> 2.49

---
 .../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 3196b6728e05..7b42e5877520 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.44";
+  version = "2.49";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "01v9p0p27czwsk7ljv1879b5qcrhgy7zan6dj8klr9rci1id8x0d";
+    sha256 = "0c7qnrx87wrgxgh4im1i6sqlxq3hsrs119krh5vwjzx5wp6daa93";
   };
 
   buildCommand = ''

From 1375a2eecf52dc6f4fe61a52b9beadc1ffbc5dc6 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 13 Mar 2017 16:05:31 +0100
Subject: [PATCH 2219/3449] qgis: Fix build after pythonPackages.sip update

QGis seems to have a problem with recent sip releases. This patch fixes
the issue.
---
 pkgs/applications/gis/qgis/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 004d11fe1575..d7dbaeb1fc21 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
+{ stdenv, fetchurl, fetchpatch, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, python2Packages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
 , qjson, qca2, txt2tags, openssl
 , withGrass ? false, grass
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake makeWrapper ];
 
+  patches = [
+    # See https://hub.qgis.org/issues/16071
+    (fetchpatch {
+      name = "fix-build-against-recent-sip";
+      url = "https://github.com/qgis/QGIS/commit/85a0db24f32351f6096cd8282f03ad5c2f4e6ef5.patch";
+      sha256 = "0snspzdrpawd7j5b69i8kk7pmmy6ij8bn02bzg94qznfpf9ihf30";
+    })
+  ];
+
   # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory
   #enableParallelBuilding = true;
 

From 6f90badeac9c6453033665bdeb78e28d02c8250c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Mar 2017 14:42:10 +0100
Subject: [PATCH 2220/3449] pythonPackages.hypothesis: fix for python 3.3

---
 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 f313f6ab5c4d..7505d3bf5b7a 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python
-, isPy27, enum34
+, pythonOlder, enum34
 , doCheck ? true, pytest, flake8, flaky
 }:
 buildPythonPackage rec {
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];
-  propagatedBuildInputs = stdenv.lib.optionals isPy27 [ enum34 ];
+  propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
 
   inherit doCheck;
 

From 891a051df18c029845415718773d3bdf16d1c7e6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Mar 2017 14:42:40 +0100
Subject: [PATCH 2221/3449] ipython_genutils: fix for python 3.3 and 3.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11c2f48ba36b..39d541ca42ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13131,6 +13131,13 @@ in {
       sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
     };
 
+    patches = [
+      (pkgs.fetchpatch {
+        url = "https://github.com/ipython/ipython_genutils/commit/6d74d8cb34e49820e48ba8b4f5e5f8322824f4f7.patch";
+        sha256 = "13ah6a11qldzzywax50la6qwq02sk5929gjkzzn456lg1ja5gq35";
+      })
+    ];
+
     LC_ALL = "en_US.UTF-8";
     buildInputs = with self; [ nose pkgs.glibcLocales ];
 

From 8aee2b5c4fd0dfe79b801d261d440a0107e789d9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Mar 2017 14:42:52 +0100
Subject: [PATCH 2222/3449] pythonPackages.traitlets: 4.3.1 -> 4.3.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39d541ca42ca..00a43b05424c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25661,12 +25661,13 @@ in {
   };
 
   traitlets = buildPythonPackage rec {
-    version = "4.3.1";
-    name = "traitlets-${version}";
+    pname = "traitlets";
+    version = "4.3.2";
+    name = "${pname}-${version}";
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/traitlets/${name}.tar.gz";
-      sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "9c4bd2d267b7153df9152698efb1050a5d84982d3384a37b2c1f7723ba3e7835";
     };
 
     LC_ALL = "en_US.UTF-8";

From 57e768f58e7d2019ea19520226d5fb6e05e98c96 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 13 Mar 2017 15:30:39 +0100
Subject: [PATCH 2223/3449] hypothesis: 3.6.0 -> 3.6.1

---
 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 7505d3bf5b7a..e961d56abcb6 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.0";
+  version = "3.6.1";
 
   # Upstream prefers github tarballs
   src = fetchFromGitHub {
     owner = "HypothesisWorks";
     repo = "hypothesis";
     rev = "${version}";
-    sha256 = "0a3r4c8sr9jn7sv419vdzrzfc9sp7zf105f1lgyiwyzi3cgyvcvg";
+    sha256 = "1zwr9g4h4jizbvm2d7fywdpcxmw8i1m85h8g72kizah07gk12aq1";
   };
 
   buildInputs = stdenv.lib.optionals doCheck [ pytest flake8 flaky ];

From b2c96062ca28a9073b8deeab9855f23352a260f9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 13 Mar 2017 18:47:21 +0200
Subject: [PATCH 2224/3449] kernel: Add a validity check for modDirVersion

Because if you get it wrong, you get a very confusing error message at
the end of the kernel build, which is quite painful as the build can
take a long time.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 83020ad35a2b..e07a89fc1e64 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -102,6 +102,13 @@ let
         make $makeFlags "''${makeFlagsArray[@]}" oldconfig
         runHook postConfigure
 
+        make $makeFlags prepare
+        actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
+        if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
+          echo "Error: modDirVersion specified in the Nix expression is wrong, it should be: $actualModDirVersion"
+          exit 1
+        fi
+
         # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged.
         buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
       '';

From bc1011b3303c847bbd7dca9ed7d706aeb2d13a11 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 13 Mar 2017 17:53:12 +0100
Subject: [PATCH 2225/3449] radare2: 0.10.6 -> 1.3.0

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

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 1c1dace284f1..5befd5e620d5 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 = "0.10.6";
+  version = "1.3.0";
   name = "radare2-${version}";
 
   src = fetchurl {
-    url = "http://radare.org/get/${name}.tar.xz";
-    sha256 = "0icxd8zilygnggxc50lkk6jmcq8xl66rqxqhzqwpiprbn8k7b24f";
+    url = "http://cloud.radare.org/get/${version}/${name}.tar.gz";
+    sha256 = "08p2vhv6vkqvknwq18xl5wgf843lbpbmb111x23gkkxm6vxvpydd";
   };
 
 
@@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
     ++ optional luaBindings [lua];
 
   meta = {
-    description = "Free advanced command line hexadecimal editor";
+    description = "unix-like reverse engineering framework and commandline tools";
     homepage = http://radare.org/;
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [raskin];
+    maintainers = with stdenv.lib.maintainers; [raskin makefu];
     platforms = with stdenv.lib.platforms; linux;
     inherit version;
   };

From c70ded3295cddcfc569f4b143609918e3fd8e44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 13 Mar 2017 18:18:42 +0100
Subject: [PATCH 2226/3449] conky: 1.10.5 -> 1.10.6

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

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 674f3caa7653..9c2553dbf456 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -62,13 +62,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "conky-${version}";
-  version = "1.10.5";
+  version = "1.10.6";
 
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
     rev = "v${version}";
-    sha256 = "1x1b7h4s8f8qbiyas7sw5v2nq5h2wy3q7hsp1ah4l7191jjidqix";
+    sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8";
   };
 
   postPatch = ''

From 72619a86c9166d7b4bea5762070ee14fb72dc6e7 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Thu, 9 Mar 2017 21:02:16 +0100
Subject: [PATCH 2227/3449] JBoss AS: list known vulnerability

CVE-2015-7501

Warning in JBoss module
---
 nixos/modules/services/web-servers/jboss/default.nix | 2 +-
 pkgs/servers/http/jboss/default.nix                  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index 583fe56eb5e2..d28724281a83 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -25,7 +25,7 @@ in
 
       enable = mkOption {
         default = false;
-        description = "Whether to enable jboss";
+        description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities.";
       };
 
       tempDir = mkOption {
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 2dd9d544a03b..068053d71f09 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -22,5 +22,8 @@ stdenv.mkDerivation {
     license = licenses.lgpl21;
     maintainers = [ maintainers.sander ];
     platforms = platforms.unix;
+    knownVulnerabilities = [
+      "CVE-2015-7501: remote code execution in apache-commons-collections: InvokerTransformer during deserialisation"
+    ];
   };
 }

From b2b8a412fb376fccda36530666948bf25170d26e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 12 Mar 2017 18:22:01 +0000
Subject: [PATCH 2228/3449] ocaml-llvm: 3.7.1 -> 3.9.1

---
 .../ocaml-modules/llvm/default.nix            | 24 ++++++++++---------
 pkgs/top-level/ocaml-packages.nix             |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix
index 351a773a6f7b..3bced92cc3e3 100644
--- a/pkgs/development/ocaml-modules/llvm/default.nix
+++ b/pkgs/development/ocaml-modules/llvm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, python, llvm, ocaml, findlib, ctypes }:
+{ stdenv, fetchpatch, python, cmake, llvm, ocaml, findlib, ctypes }:
 
 let version = stdenv.lib.getVersion llvm; in
 
@@ -7,21 +7,23 @@ stdenv.mkDerivation {
 
   inherit (llvm) src;
 
-  buildInputs = [ python llvm ocaml findlib ctypes ];
+  buildInputs = [ python cmake llvm ocaml findlib ctypes ];
 
-  configurePhase = ''
-    mkdir build
-    cd build
-    ../configure --disable-compiler-version-checks --prefix=$out \
-    --disable-doxygen --disable-docs --with-ocaml-libdir=$OCAMLFIND_DESTDIR/llvm \
-    --enable-static
-    '';
+  patches = [ (fetchpatch {
+    url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/llvm/llvm.3.9/files/cmake.patch;
+    sha256 = "1fcc6ylfiw1npdhx7mrsj7h0dx7cym7i9664kpr76zqazb52ikm9";
+  })];
 
-  enableParallelBuilding = false;
+  cmakeFlags = [ "-DLLVM_OCAML_OUT_OF_TREE=TRUE" ];
 
-  makeFlags = [ "-C bindings" "SYSTEM_LLVM_CONFIG=llvm-config" ];
+  buildFlags = "ocaml_all";
+
+  installFlags = "-C bindings/ocaml";
 
   postInstall = ''
+    mv $out/lib/ocaml $out/ocaml
+    mkdir -p $OCAMLFIND_DESTDIR/
+    mv $out/ocaml $OCAMLFIND_DESTDIR/llvm
     mv $OCAMLFIND_DESTDIR/llvm/META{.llvm,}
   '';
 
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f3f535bb0857..bb4d2abed22b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -261,7 +261,7 @@ let
       else lambdaTerm-1_6;
 
     llvm = callPackage ../development/ocaml-modules/llvm {
-      llvm = pkgs.llvm_37;
+      llvm = pkgs.llvm_39;
     };
 
     logs = callPackage ../development/ocaml-modules/logs {

From 4433fc90892a53c207093854db70088015e1381d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 13 Mar 2017 14:57:42 -0400
Subject: [PATCH 2229/3449] elpa-package: 2017-03-13

---
 .../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 834d3056e742..400b1cd42468 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -645,10 +645,10 @@
     el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
     elpaBuild {
         pname = "el-search";
-        version = "1.2.3";
+        version = "1.3";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/el-search-1.2.3.tar";
-          sha256 = "1d7iqr4fr0kr171fnjcm2n0bgcwzdh6jl585mwjf2zqnqszv13h0";
+          url = "https://elpa.gnu.org/packages/el-search-1.3.tar";
+          sha256 = "0hg7jppdsaxy285bdaban1i096bjx21pqmczz7w9f3nr34n28pyn";
         };
         packageRequires = [ emacs stream ];
         meta = {
@@ -821,10 +821,10 @@
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "gnorb";
-        version = "1.1.2";
+        version = "1.1.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnorb-1.1.2.tar";
-          sha256 = "18d5wdv33lcg96m3ljnv9zn98in27apm7bjycgq0asd2f31dvcvx";
+          url = "https://elpa.gnu.org/packages/gnorb-1.1.5.tar";
+          sha256 = "128ag8zkfxspf6szxfd7dcscm1zzzcibx7p9dpbpk036cr7m5i1p";
         };
         packageRequires = [ cl-lib ];
         meta = {

From 2b1faaae9eddfd7f2f409732fc27fc26dc1f8415 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 13 Mar 2017 14:58:13 -0400
Subject: [PATCH 2230/3449] melpa-stable-packages: 2017-03-13

---
 .../emacs-modes/melpa-stable-generated.nix    | 356 ++++++++++++++----
 1 file changed, 283 insertions(+), 73 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 18759a91f5b7..8a5d293ab055 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -1477,6 +1477,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-tramp";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-anything-tramp";
+          rev = "75df15ac263701f921649fefb29f03f6b7d49b9f";
+          sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
+          sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1";
+          name = "anything-tramp";
+        };
+        packageRequires = [ anything emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/anything-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
     anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
@@ -2284,12 +2305,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "b50e90a39344402d169b8fdd5d18cc43fb16a256";
-          sha256 = "13b9ccm7yw95zc8v8sri762fgqdp2hp107nj5b40yv90g3y4fwby";
+          rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1";
+          sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4458,12 +4479,12 @@
     company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ansible";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "company-ansible";
-          rev = "2e3264670c861ecbe862f7618241367ab497b5ff";
-          sha256 = "0a0pb3amsxj6m8ka12ny1w9qjy3dg7vsxdsy1wg3qzanj2pdsk4l";
+          rev = "f08c19e95e67c852512c30b6825dae3dbd3005a0";
+          sha256 = "0qypfla1j7c34syphh21nyswr363v6vwi87614wx9d1rz5v4h24n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible";
@@ -5115,12 +5136,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "0.0.4";
+        version = "0.0.5";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "a77b914ba99729ef618e9e86543da24a46be315a";
-          sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx";
+          rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8";
+          sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -5721,22 +5742,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "0.2.100";
+        version = "0.3.5";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "380fdcff12f44faf099bc5a38984d88784b495a2";
-          sha256 = "1pragypiv59rrvq2xjzmldkf1v007viwwcvr3f5iyv31n0bmd0cn";
+          rev = "dde50661210d8610cd03526a6c9a922bb0e494a6";
+          sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
-        packageRequires = [];
+        packageRequires = [ autothemer ];
         meta = {
           homepage = "https://melpa.org/#/darktooth-theme";
           license = lib.licenses.free;
@@ -6349,6 +6370,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-hide-dotfiles";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "mattiasb";
+          repo = "dired-hide-dotfiles";
+          rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221";
+          sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles";
+          sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0";
+          name = "dired-hide-dotfiles";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-hide-dotfiles";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-icon";
@@ -6496,6 +6538,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
+    melpaBuild {
+        pname = "direnv";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "wbolster";
+          repo = "emacs-direnv";
+          rev = "cc8fbcc9c71f120c45c3363ed6ad202352e9a6d5";
+          sha256 = "03m4c2x7d7hmsgx3ma4z0ra5y6s7fyfsxmzwz618pfa94nbx3qny";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
+          sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd";
+          name = "direnv";
+        };
+        packageRequires = [ dash emacs with-editor ];
+        meta = {
+          homepage = "https://melpa.org/#/direnv";
+          license = lib.licenses.free;
+        };
+      }) {};
     direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "direx";
@@ -8099,12 +8162,12 @@
     elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elmacro";
-        version = "1.0.1";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "d712c8efc01646117097e061e1b14933b822b9c7";
-          sha256 = "00fry1gjsrx4dv9d9rjf5pd8w3709mn0052al0l948vhwz4wys9z";
+          rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe";
+          sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -9419,6 +9482,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eslintd-fix";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "aaronjensen";
+          repo = "eslintd-fix";
+          rev = "555fdad8ebee4ca0d990b8c80151c77c8bd6b773";
+          sha256 = "0xmlr98gyq56vas02nnjdfv7x6zjddy4b1qpy3zz770jnpnrgq33";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
+          sha256 = "0lv4xpp9bm1yyn9mj7hpgw1v46yyxr0nlwggbav78jbg4v7ai04v";
+          name = "eslintd-fix";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/eslintd-fix";
+          license = lib.licenses.free;
+        };
+      }) {};
     espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "espuds";
@@ -9947,12 +10031,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "3.0.1";
+        version = "3.0.2";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d";
-          sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8";
+          rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
+          sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -12647,12 +12731,12 @@
     gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gams-mode";
-        version = "6.1.2";
+        version = "6.2";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
           repo = "gams-mode";
-          rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96";
-          sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy";
+          rev = "ce51aa1afec78bf96aedb4badf33463383b7593e";
+          sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@@ -13046,12 +13130,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "2.10.2";
+        version = "2.10.3";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
-          sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
+          rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e";
+          sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -16306,6 +16390,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-tramp";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "masasam";
+          repo = "emacs-helm-tramp";
+          rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523";
+          sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
+          sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv";
+          name = "helm-tramp";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-unicode";
@@ -17170,12 +17275,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "3.14";
+        version = "3.15";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "397a43309c0405009cc6961053c54dedebdc83a2";
-          sha256 = "091kq58bb5dxq13d3jap7m4v6ddpin7hkybzy7drqkwn2q005ggb";
+          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
+          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -17275,12 +17380,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "3.14";
+        version = "3.15";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "397a43309c0405009cc6961053c54dedebdc83a2";
-          sha256 = "091kq58bb5dxq13d3jap7m4v6ddpin7hkybzy7drqkwn2q005ggb";
+          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
+          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -18550,6 +18655,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jinja2-mode";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "paradoxxxzero";
+          repo = "jinja2-mode";
+          rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86";
+          sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b79196cf0dc0b436ff75eabea369a62f92825d9f/recipes/jinja2-mode";
+          sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
+          name = "jinja2-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/jinja2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     jpop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jpop";
@@ -19796,6 +19922,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "literal-string";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "joodie";
+          repo = "literal-string-mode";
+          rev = "46dd2b620df70d681261616f1a26afa4a032e2d5";
+          sha256 = "02a1jvxk2m1lb21p3281cr9xyhzix31cn8a9la53w90sz569i66r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string";
+          sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn";
+          name = "literal-string";
+        };
+        packageRequires = [ emacs markdown-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/literal-string";
+          license = lib.licenses.free;
+        };
+      }) {};
     literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "literate-coffee-mode";
@@ -20135,12 +20282,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "2.10.2";
+        version = "2.10.3";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
-          sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
+          rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e";
+          sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -20289,12 +20436,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "2.10.2";
+        version = "2.10.3";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "ade30b02b7a732c4b145f8e7e2af1e17af0a9f4d";
-          sha256 = "0fgid2z4rqlqlzxp0ix1kmv78m2zfs60hgnhgwn4ny007q5138qv";
+          rev = "d5b747473ab0bf0f0034fca2f57f6497d476b67e";
+          sha256 = "1cw1nrgmbh0jikr88di4na3f0m643v0p7x8cf7xya2lgqwkdravc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -20951,8 +21098,8 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805";
-          sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q";
+          rev = "89f9643c08211a770454919551a7fd8605d1fca8";
+          sha256 = "13x0zjd297ssqmbvba32zk2p588kznd5ag4wh3nqb6fdgyzy4d63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -21238,6 +21385,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+    melpaBuild {
+        pname = "mmm-jinja2";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "glynnforrest";
+          repo = "mmm-jinja2";
+          rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f";
+          sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2";
+          sha256 = "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi";
+          name = "mmm-jinja2";
+        };
+        packageRequires = [ mmm-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/mmm-jinja2";
+          license = lib.licenses.free;
+        };
+      }) {};
     mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "mmm-mako";
@@ -22392,11 +22560,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "0.24pre0";
+        version = "0.24";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "990f8cd03203c7a19cef4e3edbec823cc99fa701";
-          sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q";
+          rev = "e60b44ecf8bd5934959727496c7ef3016ff80cf6";
+          sha256 = "1q81ibvhjvnz4hbwmdna3a1xjkik21avy5im89fnkhq068kwac2j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -22769,12 +22937,12 @@
     ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ocp-indent";
-        version = "1.5.3";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "8c349c5531d3bc90b00df875b6cd3c64110f59f1";
-          sha256 = "1c4fdm6r3r3fqjflqjncfmx0ps52b5f17vq957g0b3pcaql5n63d";
+          rev = "032599b162624a4b65c82c20be06433f24b00e8f";
+          sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -23815,12 +23983,12 @@
     org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-table-sticky-header";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org-table-sticky-header";
-          rev = "1fca19fbccbb21159086970b82af56a81f78e247";
-          sha256 = "1swhsspa5yz68hl2449l9hk1d6r9c32z19z4mrdxw4nimdxhxmqp";
+          rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043";
+          sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
@@ -24379,6 +24547,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-epub";
+        version = "0.1.6";
+        src = fetchFromGitHub {
+          owner = "ofosos";
+          repo = "ox-epub";
+          rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8";
+          sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
+          sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh";
+          name = "ox-epub";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/ox-epub";
+          license = lib.licenses.free;
+        };
+      }) {};
     ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-ioslide";
@@ -24842,12 +25031,12 @@
     parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsebib";
-        version = "1.0.5";
+        version = "2.0.3";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "parsebib";
-          rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce";
-          sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
+          rev = "748d6a179fcbbc4af77c7b96059a66d579f34dc8";
+          sha256 = "0f8rcifzfp4fs52pjgfly39vqz54kgjb3yqyxlh4adq12zbq11cd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -25260,12 +25449,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "2.9.5";
+        version = "2.9.6";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "1116ead88123a11efef346db0045ee8389250bd2";
-          sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m";
+          rev = "1dfea0de788f6d25ee47b5c62ddbeaf9e8e92f06";
+          sha256 = "11ww8hg9p8qlmr8zpir0m5xzzbvd1faiqjx6vn4b05d4ll03rnhm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -28131,22 +28320,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rubocop";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "rubocop-emacs";
-          rev = "405e0fd4c57adb125e3d04208bc86081e3e78d4c";
-          sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q";
+          rev = "980bedb455e3551d35a212fae515c054888907c1";
+          sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
-        packageRequires = [ dash emacs ];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "https://melpa.org/#/rubocop";
           license = lib.licenses.free;
@@ -28425,6 +28614,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
+    melpaBuild {
+        pname = "salt-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "glynnforrest";
+          repo = "salt-mode";
+          rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81";
+          sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
+          sha256 = "1n7i9d6qpjsdcgbzmbf63y4c7ggxh5wsim8fd0casnrq9bl7ssym";
+          name = "salt-mode";
+        };
+        packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/salt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     sass-mode = callPackage ({ fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "sass-mode";
@@ -28488,22 +28698,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sayid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sayid";
-        version = "0.0.13";
+        version = "0.0.14";
         src = fetchFromGitHub {
           owner = "bpiel";
           repo = "sayid";
-          rev = "01bf777cb15a4f236bc44842712e9ca82fed7f55";
-          sha256 = "0lh4mmdm5vizr08lyz2jc131991dqmyx29n8njgpxa1vjzqd08az";
+          rev = "3e5456cade044f01eb0753aabc9e50868000bd14";
+          sha256 = "1asphbijh5y4ax03x1cn02l4ya8v44s23ani91a0d52msdaxbnyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
           sha256 = "0chz46wmwmsn4ys59pn7lqs4assqy2hv43rvka7kq61jdl4g6fgs";
           name = "sayid";
         };
-        packageRequires = [];
+        packageRequires = [ cider ];
         meta = {
           homepage = "https://melpa.org/#/sayid";
           license = lib.licenses.free;
@@ -30040,22 +30250,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sparql-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "0.11.2";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "303858e7f91829ec720141482c777460e66f310b";
-          sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
+          rev = "33da09b3895e03e64959005678d448ab82e527b6";
+          sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/sparql-mode";
           license = lib.licenses.free;
@@ -34335,12 +34545,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "2.4";
+        version = "2.5";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "e5dc3962fd30005914b79b14e9821d298f2c305a";
-          sha256 = "1n7ka608lk0xp7vg4zcw282zna0cwvcwvmhic6ym1ag7lq5cjrhc";
+          rev = "f031c785b469cf4356fddb997eccf60399e34235";
+          sha256 = "029955wp29wdrk1ddmhxixd76vhkp2li3mjaknw9d8iqz819vshc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";

From 29559f6d7a8de71a631728039a7cf949a4940ad4 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Mon, 13 Mar 2017 14:59:57 -0400
Subject: [PATCH 2231/3449] melpa-packages: 2017-03-13

---
 .../editors/emacs-modes/melpa-generated.nix   | 1453 ++++++++++-------
 1 file changed, 884 insertions(+), 569 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 92159833e9c4..844dfa9fcb80 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -127,12 +127,12 @@
     abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abl-mode";
-        version = "20170211.1328";
+        version = "20170309.117";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
           repo = "abl-mode";
-          rev = "54777551c1760f02b35043a51e1cadad1468aa44";
-          sha256 = "0p5jhp71n4021p173c9agmm26xqqx7z864ygaskf9dh810mxs1yh";
+          rev = "0539862591a5af70e6fa04f0e88e7fc0f0fbb11e";
+          sha256 = "0fxl67nmy6vi6viwxday4j81m9lg4l8vg6yw2phgagm4zlp65k58";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode";
@@ -194,8 +194,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "ac-anaconda";
-          rev = "e42b68f648a4179c76b56b7ff03d25a6e482f38c";
-          sha256 = "092m8y38h4irh2ig6n6510gw2scjjxah37zim6mk92jzn1xv06d0";
+          rev = "94f66b4d4bf0fd9683ee77511833b1eceace0462";
+          sha256 = "15xkwnadqjkbgvilyfldj7z5kz2wvw1dk2bcgphx2z9qwjc7wd5f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/ac-anaconda";
@@ -380,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
-          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
+          rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459";
+          sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx";
         };
         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 = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
-          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
+          rev = "1f823b74622b1602c7336991c211b71d3f20b180";
+          sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -758,8 +758,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
-          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
+          rev = "1f823b74622b1602c7336991c211b71d3f20b180";
+          sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -859,12 +859,12 @@
     ace-flyspell = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-flyspell";
-        version = "20170124.1245";
+        version = "20170308.2109";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-flyspell";
-          rev = "044d38fb8eb390ef1f51cf92cfe5c4ffd103044c";
-          sha256 = "0yy7g2903v78a8pavhxi8c7vqbmifn2sjk84zhw5aygihp3d6vf0";
+          rev = "538d4f8508d305262ba0228dfe7c819fb65b53c9";
+          sha256 = "1yplf5klgjjzx3cb1ihqb9f9cwn898l0vhasc3cwiqz6ldyq2na8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ea85eca9cf2df3f8c06709dfb44b339b8bdbc6c/recipes/ace-flyspell";
@@ -1299,12 +1299,12 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20170215.348";
+        version = "20170310.828";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "5959b48e94493738ead6fc91f18e70155962ffba";
-          sha256 = "06kk8j7yq60cir4llgqdsyj4d94261danyw36idqx9papa4da3id";
+          rev = "0492172a766971405fb6dea19371a3c97db8dc3c";
+          sha256 = "12s14diivykwfmkp5429j1y5ry8is81wmnmw048wy3jlh4zwrxnc";
         };
         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 = "20170217.103";
+        version = "20170311.1021";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "c39a6184c665e5ee3e53ed22beab6c4b6e8be2ce";
-          sha256 = "17s35dj95nprac081v34bvj7mipnydj4blvjcymsn698aa21vgxm";
+          rev = "7b799f901ceecf1aeb101ebeef5f785c2e4d6d03";
+          sha256 = "10sd8m8ym7c47fkdawkiss3cfrm9kwh0ysknrws1g108zpmszsij";
         };
         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 = "20170214.556";
+        version = "20170313.343";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "65de04e9bda55b858d53d4d7982183fd82839b55";
-          sha256 = "1x3wl30rbza8y4693jmpjpq7mcdv8gjhcnr451lgvfjmzxfhbn3d";
+          rev = "b76345e0ba398c03347b6af4fa087f346eb32174";
+          sha256 = "105m01hnkm2asq900c8ndcpim6a2dgndcl83669vb5v39alm17g6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode";
@@ -1938,8 +1938,8 @@
         src = fetchFromGitHub {
           owner = "lunaryorn";
           repo = "ansible-doc.el";
-          rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad";
-          sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4";
+          rev = "86083a7bb2ed0468ca64e52076b06441a2f8e9e0";
+          sha256 = "0lap404ch74w99n3xip176jr42b38xhyzkfnkyqg0g3wk2cd3aq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc";
@@ -2269,12 +2269,12 @@
     anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anything-tramp";
-        version = "20170208.539";
+        version = "20170313.257";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-anything-tramp";
-          rev = "6f062a3bd00f7af651a21532d43900c22523e596";
-          sha256 = "1vhf8qnknxvxkk44yyhp04kfmf0vrf41ycpgrj7p7la3k1anyvg6";
+          rev = "75df15ac263701f921649fefb29f03f6b7d49b9f";
+          sha256 = "0al2k5az5x6idnhkhckjxr4vh52f0n9fi20ranwid9ac8k6kspvz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp";
@@ -2414,8 +2414,8 @@
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "apiwrap.el";
-          rev = "2a14eab0c66b7c8ae4c8767ebcca1a82e325773c";
-          sha256 = "1rxkzcl1clp794c017d19dpm085njmz7hlvn3sqgsw06wkczd0pl";
+          rev = "e6732de88dcbe48ae88466b5cf34fd30405540df";
+          sha256 = "1xg96pidwzxrg2r025pdc8644m8g11z9avcw3jvpmm11rvi2af7z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0197fd3657e65e3826375d9b6f19da3058366c91/recipes/apiwrap";
@@ -3590,6 +3590,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }:
+    melpaBuild {
+        pname = "auto-virtualenvwrapper";
+        version = "20170309.1536";
+        src = fetchFromGitHub {
+          owner = "robert-zaremba";
+          repo = "auto-virtualenvwrapper.el";
+          rev = "bfe512270cd6471346f149d46e9f724569dd10a9";
+          sha256 = "1mw61d29z8p847qmlyjqpl1lmnpla40xh5sxgqg5hjp9scwwwp8w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
+          sha256 = "1v82z922d9sadwvyrl4iddsa19f5k43s6iwn8w146jcl0v42bkmd";
+          name = "auto-virtualenvwrapper";
+        };
+        packageRequires = [ cl-lib s virtualenvwrapper ];
+        meta = {
+          homepage = "https://melpa.org/#/auto-virtualenvwrapper";
+          license = lib.licenses.free;
+        };
+      }) {};
     auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "auto-yasnippet";
@@ -4242,12 +4263,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170227.1310";
+        version = "20170307.143";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "0ebf2ee7ab5ae3b3cb6140ea57b2a88e02a59818";
-          sha256 = "197avkxslnvp95f0spmys1nis6nmqfvrv0b1cm945syk7yxa30db";
+          rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1";
+          sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -5239,12 +5260,12 @@
     blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }:
     melpaBuild {
         pname = "blog-admin";
-        version = "20170126.458";
+        version = "20170310.909";
         src = fetchFromGitHub {
           owner = "CodeFalling";
           repo = "blog-admin";
-          rev = "bcf4302dd158e6a7b9e4a57d739818987e039e76";
-          sha256 = "0dc27df1cph67ygvsvjjskc21flsa055hzxc2j00sk5078gp7a9y";
+          rev = "925e9cf749387fc5c631d93c1652a4a80eac91c3";
+          sha256 = "0kb1y56cq990i1hsvk8dfrh3ks67l6wf7a3658w6f1nj903xy3rf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin";
@@ -5257,22 +5278,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, s, simple-httpd }:
+    blog-minimal = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, org, s, simple-httpd }:
     melpaBuild {
         pname = "blog-minimal";
-        version = "20170304.1548";
+        version = "20170311.555";
         src = fetchFromGitHub {
           owner = "thiefuniverse";
           repo = "blog-minimal";
-          rev = "a3454f1358a8add2969f221c4e56d3bc17ee4baa";
-          sha256 = "0g7n9g4hnaar5basv26c1p00kdkn3vsbsxzby2bi1590grkgjycq";
+          rev = "d679d74039ecc114b037800c8a94303265b9542a";
+          sha256 = "1x14xwnv22dc99gzbn6z48dhxpy46a7lrby2p59aizpwpysi64yk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/56217a33b0669a782621dd65d83419ae371ed60a/recipes/blog-minimal";
           sha256 = "1qj25b6n3slvmbqvzfd37v4xmy1vvz37686jdr29bw5qk4prgxff";
           name = "blog-minimal";
         };
-        packageRequires = [ ht mustache s simple-httpd ];
+        packageRequires = [ ht mustache org s simple-httpd ];
         meta = {
           homepage = "https://melpa.org/#/blog-minimal";
           license = lib.licenses.free;
@@ -5344,12 +5365,12 @@
     bongo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bongo";
-        version = "20160623.1058";
+        version = "20170312.808";
         src = fetchFromGitHub {
           owner = "dbrock";
           repo = "bongo";
-          rev = "6499a28fdd8249724cf3b9f3cf2dcbce8c4d3927";
-          sha256 = "0s24b0z4q23rfj8j8ifhnnh1ll87c3frpcc0p829a2qqb2nqc4nn";
+          rev = "1961b2e05c01c03d0dd6527988d1348610359d0d";
+          sha256 = "0alm2kq32sxxc7708djxhgd3xnzlglynqjqp9af0y308ryajmdgn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/692428769cd792dc0644641682c2793103dd00c6/recipes/bongo";
@@ -5406,7 +5427,7 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170227.1053";
+        version = "20170312.1134";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
           sha256 = "14xkhc0x5ac2b0np5hvb0f4d1rap4yysbvm3fnmaaq4kylriysad";
@@ -6783,8 +6804,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
-          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
+          rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd";
+          sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6825,8 +6846,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
-          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
+          rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd";
+          sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7012,8 +7033,8 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "5d48e64b00bd6d9ceef9f80ce27be6b8df76415d";
-          sha256 = "0zzk009qjdc92svann593l7w3qajna29nv92qwsp4hav9zjgq07w";
+          rev = "19de82713504f253961ad46d30943bf004f8a64c";
+          sha256 = "1x8fr5rczzppgpq7hrcvzv95s5hjpvm4ksm5wwmkvy5a8awghdyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@@ -7052,7 +7073,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12036";
+          rev = "12051";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7342,12 +7363,12 @@
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
-        version = "20161008.450";
+        version = "20170309.2126";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-fonts-setup";
-          rev = "3f1e8d13837d22109a0eb0af4ee85fb2e90b31a1";
-          sha256 = "0xx692nbnw6wkdh84i59kfr0nzq6jh4iarzzqppd60rr48r3l9wx";
+          rev = "a73397712f5a1d008330778b45b3071df5232806";
+          sha256 = "0rx9z90k6mmlgnmwn4d3az9q72rd51zv8x038ws4f6aa7zji7wnx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup";
@@ -7384,12 +7405,12 @@
     chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20170221.206";
+        version = "20170313.423";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "ed2ccea3d827084b3c80afbd5d7b9345f31243d1";
-          sha256 = "03nvmrwvkadab9yp74d5msfxd01xjj1jhqxymisj6jnhgv421yi0";
+          rev = "36284714815a2339bf25ed2a6051e6136ad81920";
+          sha256 = "10qvikdi2mh72s9c5df2y8hx9m1hny3g9mwm8ar5nfvdhpwwhnnp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim";
@@ -7633,12 +7654,12 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20170306.1";
+        version = "20170310.735";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "52e69c102f2e6438196e223483a388115809bbc1";
-          sha256 = "0cr9clqni9yy5kxspy9nn9llzpqaa3x1d5q4fnlg7qncv6jyfyqb";
+          rev = "f5a1ade83c0299df9ae99bbb5a2bb843e0168452";
+          sha256 = "14zdnvjjlqgw6y23lgs5mjf3b0g5z04xqzvn3fyjgbjzw77pa9ya";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7909,7 +7930,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "297038";
+          rev = "297625";
           sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
@@ -8551,8 +8572,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "add3b1ee4f798fe667b53a521eb18a623e64f0e0";
-          sha256 = "0k0przix6iyfqc9flphsgbzbz09r2lbmw45667zbimpd91k4a29f";
+          rev = "ccec62c6aa8ac44aaa9908ca5d72c396c5f068c0";
+          sha256 = "1wdhyrx7ddqrj0fwqpdqrgnbdmcbk0z83jsn9lkqqv5bnw0l5k5r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -9319,8 +9340,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-anaconda";
-          rev = "182a8fdabc01630f255beeb2708728c0cd5c6316";
-          sha256 = "1rqf9i4l32njpwx4aiwxqr994g3jzispwprs6nwjfvg70xkvm4m0";
+          rev = "b268a00821c79d7e4c5da0d7035356afb389b3a7";
+          sha256 = "0pjiiqads9xawcwldic4m7mfi533s3wmqafz4day92v9135xwczj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda";
@@ -9336,12 +9357,12 @@
     company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-ansible";
-        version = "20161119.1155";
+        version = "20170311.1313";
         src = fetchFromGitHub {
           owner = "krzysztof-magosa";
           repo = "company-ansible";
-          rev = "5e8b51b21d32d3d8929fc2e82dec8f584a863399";
-          sha256 = "0appxl6njgxmgpf9np5cpjym3ifgdwh0mzvsnxvx08pidrrnmm33";
+          rev = "f08c19e95e67c852512c30b6825dae3dbd3005a0";
+          sha256 = "0qypfla1j7c34syphh21nyswr363v6vwi87614wx9d1rz5v4h24n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible";
@@ -9586,8 +9607,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
-          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
+          rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459";
+          sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9880,8 +9901,8 @@
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee";
-          sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv";
+          rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
+          sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/company-nand2tetris";
@@ -9939,12 +9960,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20170306.659";
+        version = "20170308.1819";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "248d5d93a3d1a3c88c95a50217f316da7b10cfec";
-          sha256 = "03j32v5y2lc709fczza89p2ih3pj1fibvrrzd7cf9sij5yp28px9";
+          rev = "1f823b74622b1602c7336991c211b71d3f20b180";
+          sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10138,8 +10159,8 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-tern";
-          rev = "dfa3f39d67f011a78fe04ad5a1c7f54d8d788a0a";
-          sha256 = "125p6ipp9mrrc0va4a3pfc2wdnrsk945i9yv0p9lnmrrq69nnszr";
+          rev = "10ac058b065ae73c1f30e9fb7d969dd1a79387be";
+          sha256 = "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/company-tern";
@@ -10469,12 +10490,12 @@
     copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "copy-as-format";
-        version = "20170303.1916";
+        version = "20170310.1621";
         src = fetchFromGitHub {
           owner = "sshaw";
           repo = "copy-as-format";
-          rev = "a77b914ba99729ef618e9e86543da24a46be315a";
-          sha256 = "181d0fxzy228vvgjmfhfnxh9djyjhq4bpf4lklv0mxhzay03pzdx";
+          rev = "161feb918b104e87f1a284f5c4e5e507e0c177f8";
+          sha256 = "0y1j6f9xs877r4bv6dmcl2jsl27v0n6rsmpml719id2cfnh9sn4g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@@ -10578,8 +10599,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
-          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
+          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
+          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -10637,12 +10658,12 @@
     counsel-gtags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "counsel-gtags";
-        version = "20170305.600";
+        version = "20170310.536";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-counsel-gtags";
-          rev = "9d9061ece327a315ad9161e4fcc20c83638ccd10";
-          sha256 = "04h3hn1rs9i7cgdg393v12vqrm862bgiw64hyck7978d1w6n3a1b";
+          rev = "4ef27b1cf1075097e11c3bcfee43e0710950dbcb";
+          sha256 = "14rnccz8sm8zyghkh93id4iv65qwdix75rb5f6i2y23k94h2483f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ccc35632219dbec5fdad7401545e7c071b910c/recipes/counsel-gtags";
@@ -11614,8 +11635,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "56a44bf2944107cfdb178a90c14a6e8092471359";
-          sha256 = "1jg3bhm2ksa4ask2n8q80afpa027430gz5w7vq4iwqw5ij8cx4v8";
+          rev = "af4737d709a90cc867ed93447e5354ee250ad6ec";
+          sha256 = "0pz99wc7karlj4bvb6j6d1drfxmkb5f22pg27v4qqayl1hig0m14";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -11925,12 +11946,12 @@
     darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darktooth-theme";
-        version = "20170216.2034";
+        version = "20170313.317";
         src = fetchFromGitHub {
           owner = "emacsfodder";
           repo = "emacs-theme-darktooth";
-          rev = "53ee536cc912a900a16b768abd0f8e23e609ef5e";
-          sha256 = "04lj0161la9fb4fd7mdvr1raqnyarzp73dkfydvsaziggg8vnab8";
+          rev = "dde50661210d8610cd03526a6c9a922bb0e494a6";
+          sha256 = "1mab28rm175ylg17ziha2kndcqb9a23f8wrpydypa8k7iirhadp6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme";
@@ -12219,12 +12240,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170304.120";
+        version = "20170311.1248";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "651cdbca22d725958b4ee26f8f299f841005797d";
-          sha256 = "11gjzkmsbkf0nkiqiyapvk690vs3niw0ln627l3wcqkg1sfqmgkl";
+          rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd";
+          sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12343,12 +12364,12 @@
     decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "decl";
-        version = "20160608.2347";
+        version = "20170310.632";
         src = fetchFromGitHub {
           owner = "preetpalS";
           repo = "decl.el";
-          rev = "84a8c4d78e83629fb3100abf5408bd108e4cfcef";
-          sha256 = "0s0zk2hy8mi46rz949i241qsiy0s4aywzb3j0ch69jf3i6qdxh59";
+          rev = "c2b5ea44b77516b50e917ddc897f88dbf2a58894";
+          sha256 = "1y40cyb61ghjhxn03ipbsx08b5d5qa909zp27g8r9nck4i3ni5gq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl";
@@ -12530,12 +12551,12 @@
     demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "demangle-mode";
-        version = "20160822.924";
+        version = "20170311.1148";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "demangle-mode";
-          rev = "24a4a9a0f023c7b3fe5441783794185ba3954ffe";
-          sha256 = "04q7fv3qvh8a4p64hd9pqfvhnbclfbr1b9s0vi9m8jz9y5p86x8d";
+          rev = "0f9436f98225e0f5a5deecea4680c173e76f0322";
+          sha256 = "0n10c45lvdfczhd2mpkciggv4d83mcnbpmjhxzvmnf7n5ar6aw6a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode";
@@ -12973,8 +12994,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs";
@@ -13136,8 +13157,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter";
@@ -13157,8 +13178,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils";
@@ -13171,6 +13192,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-hide-dotfiles";
+        version = "20170312.1017";
+        src = fetchFromGitHub {
+          owner = "mattiasb";
+          repo = "dired-hide-dotfiles";
+          rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221";
+          sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles";
+          sha256 = "0yy131cvj9a9sz02ari7pzwf22r5y7acyg757h3jvih317v6jyp0";
+          name = "dired-hide-dotfiles";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/dired-hide-dotfiles";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-icon = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-icon";
@@ -13216,12 +13258,12 @@
     dired-k = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-k";
-        version = "20161116.116";
+        version = "20170313.803";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-dired-k";
-          rev = "3f0b9315f87b0f930d51089e311d41282d5f8b15";
-          sha256 = "09xh097v3fd0mjxqlmbfwjlr1v4a99mj4rvwdb6kqgajmlhgi9hx";
+          rev = "c50e8f73358060a448bff66db2d330b52bbeffc1";
+          sha256 = "14yvsv7cvfviszii0bj0qf094rmnwzssinrqrkpxg4jil2n4bb9d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k";
@@ -13241,8 +13283,8 @@
         src = fetchFromGitHub {
           owner = "thomp";
           repo = "dired-launch";
-          rev = "b62492c1a6404ed2ed32973d99cdcf8630cf7d02";
-          sha256 = "09nwzihg1v5p8c4jcjzl3w2il701lh3ps8c472g2iwmkihljs093";
+          rev = "58cf696c396c12d143387f4bf446ccb8398837b6";
+          sha256 = "1i7a3rjf62ksyfd161jw4x1zx3apjmra42vas7xpllkkhrk0cz08";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch";
@@ -13258,12 +13300,12 @@
     dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-narrow";
-        version = "20160918.740";
+        version = "20170309.329";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow";
@@ -13283,8 +13325,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open";
@@ -13343,8 +13385,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow";
@@ -13364,8 +13406,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger";
@@ -13461,8 +13503,8 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bef0c7eb03474defa02bbba5c15401a766c8ff7c";
-          sha256 = "1l7kay58ix9gmn06nws04f642svy0s1zplh86m7ihq4b6jb04hxj";
+          rev = "342d75f1240ebe17959ec25a5b050b40156e10cb";
+          sha256 = "18s8jax1k1p1x3r2rl398r1cxy0i2ss9vv23bgv3dna4hvwv65jc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree";
@@ -13538,22 +13580,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    direnv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    direnv = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "direnv";
-        version = "20161002.715";
+        version = "20170313.309";
         src = fetchFromGitHub {
-          owner = "jml";
-          repo = "direnv-el";
-          rev = "fc80f40a77553b3c8841abedc15a64771634cb35";
-          sha256 = "15lkpnklvgppj63q9qwjd6jbq8czyvjic81mkhf3bwcd7gdqar84";
+          owner = "wbolster";
+          repo = "emacs-direnv";
+          rev = "120d6e15cfef64b10ed599a5f748e7580eacaeac";
+          sha256 = "0vma9ar82841gwlgx3x2qywqwdm9ydx28di7k6c56v9z500jf9ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0f526b9cc7bc1495e5f5e9fb2e49af926aba8a7d/recipes/direnv";
-          sha256 = "12yl7hmb7kc8ycr8nr39xb35jhagv8mqn6xs0k8j0mcykpzf2h1g";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/5419809ee62b920463e359c8e1314cd0763657c1/recipes/direnv";
+          sha256 = "0zzmi5m6fh42kyf8dyjrjyrl03pkbipnh4mnssrhp83ljczxkyhd";
           name = "direnv";
         };
-        packageRequires = [];
+        packageRequires = [ dash emacs with-editor ];
         meta = {
           homepage = "https://melpa.org/#/direnv";
           license = lib.licenses.free;
@@ -14643,12 +14685,12 @@
     dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dracula-theme";
-        version = "20170303.1415";
+        version = "20170308.2107";
         src = fetchFromGitHub {
           owner = "dracula";
           repo = "emacs";
-          rev = "5db3f961644ea611682eab843a960eb3177ace48";
-          sha256 = "0rrxvvspz2l8byhnl052x59yd0yx7aajnc9b41846ng83kyb8dlm";
+          rev = "3c9efcc81ecb18c2ebd71aeb8da691a47a1fd49a";
+          sha256 = "10gz1pmpdxk2c7r47ac4vxc57bs703l9yqa9jp6q6wnldi2k0snd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme";
@@ -14852,7 +14894,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1785720";
+          rev = "1786710";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14953,12 +14995,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20161218.110";
+        version = "20170312.1831";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "0c7fed68916de6bcbbfbc6c9f787d610a3316b1e";
-          sha256 = "1a5jg1344s18bj6v33wfrxxg1cxlx6aha40wyw9dbwj1pjpw7vqd";
+          rev = "c5e81e4ef8baa92b4e7a0b5d91fb18cde1907923";
+          sha256 = "01fih3i17s8ih8n79bxgpknfh7z0wgrb6asvvp32bxmmkhwrppkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -15372,12 +15414,12 @@
     easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }:
     melpaBuild {
         pname = "easy-lentic";
-        version = "20161031.2119";
+        version = "20170309.2143";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "easy-lentic";
-          rev = "6f43c8d575274349757173b9bcad3bf5b59300ac";
-          sha256 = "0jw1m2ff23b99rz137ndy0gjbk3fs7srsyjd8f8fssl4xm8mzb39";
+          rev = "d2b600cc3bd3166c3e4543435070b511ae9bf148";
+          sha256 = "1p99yf1nlial254dyy9i30lfx2v4jwpahvi9pfjm5sv64212vp33";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic";
@@ -15516,12 +15558,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170305.1130";
+        version = "20170310.900";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "9a837ed1e26a2367ea6e4a401a8b35fc166e1bf7";
-          sha256 = "0ym1f369azqf81iybqf1hknvq6n87znylxrzd2wl8j8ss1q6z94k";
+          rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459";
+          sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15831,12 +15873,12 @@
     edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edit-indirect";
-        version = "20160528.651";
+        version = "20170310.1002";
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "edit-indirect";
-          rev = "1d1dae842505e5ff09644529deec87c056e1b14e";
-          sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz";
+          rev = "2fc8f382ee12fc8f7202288534258186bdf6068a";
+          sha256 = "1m40zi6dkq7m9386adrys5n7w8h9973svfmxl1c3n9vk9kjibb9k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect";
@@ -15936,12 +15978,12 @@
     editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20170222.2141";
+        version = "20170309.2006";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "1d69cffd1dd4709338fba7241f344a55cb61f59e";
-          sha256 = "1pv83biyiqkm5if3wkm071r5cl0ch1wv5yxzdqyxsq4k11s9z4qy";
+          rev = "0a6d9a3c0259aba57a332ac8db582c33e522f12f";
+          sha256 = "114zfk7p6p61mcphd1hn3r1hqj0j9ra0acmfx1k74d60npci25pj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig";
@@ -15957,12 +15999,12 @@
     editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-custom-majormode";
-        version = "20170102.751";
+        version = "20170309.2112";
         src = fetchFromGitHub {
           owner = "10sr";
           repo = "editorconfig-custom-majormode-el";
-          rev = "8216ce7d20703a8ce923b4c0284c098ae85621f9";
-          sha256 = "02qkvdgn78asz1i7gh8198z0as4yhax3yans96c8lxwmbac125kz";
+          rev = "f5b9e0932e861c71611b5dfbd2c04ce635d14e34";
+          sha256 = "0iql5c9a5qzzdwp3f1n5pb3zcglnby2hhx4nsplpjr0ffbqgad63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode";
@@ -16096,8 +16138,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "8b9bfc404818038b8dd93dd4d39f3b820f8fcd52";
-          sha256 = "0y6k54vz9r6b81aif9ags130wgk2v00yq6rv2l4nzswsifxy2r07";
+          rev = "d44a906db46f6708f3e02e5ae460c2b698593492";
+          sha256 = "0dw1jxzcxs47cq5sza28kz198zk0nhf0dv5ily262i5p0wl2kcjc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16283,8 +16325,8 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "e2b412ef6b6a6b6443314575609f730fce766e9b";
-          sha256 = "0hzx6g62sa7lqkgsq1bavq8b73ji4994n31lr8afzgdx885xw6kw";
+          rev = "b47a94877b8b621534403a533ad147a971caaf89";
+          sha256 = "0qhy7bxgs8gbbjww438jmmqhz20aczp3bvdpbywbwcmfkadv6086";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get";
@@ -16630,12 +16672,12 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20170304.453";
+        version = "20170311.533";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "57c00c08257794562e8b328adb7707c4aefe37a0";
-          sha256 = "1gymbxdw8z2sfh3k2apg197r7k0l37pxzj761lc5jps3wy4d6w1g";
+          rev = "13b5c19049bd7ac9529ee6fb6171f9141311f277";
+          sha256 = "0xpqynnl1dxylxgg7h42pamxn7iwa4jwcy355l0sxmra951j22wq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator";
@@ -16844,6 +16886,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    elisp-docstring-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elisp-docstring-mode";
+        version = "20170304.815";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "elisp-docstring-mode";
+          rev = "f512e509dd690f65133e55563ebbfd2dede5034f";
+          sha256 = "0al8m75p359h4n82rf0dsl22qfdg9cwwywn5pn7x6gb96c7qrqaa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/a5bf5c03ec4c26eb43703a49606450cbdb826996/recipes/elisp-docstring-mode";
+          sha256 = "0mrg4vszf3p09qz3dvj38dv00f3ca8hrm3vmnjsfq0cji0yipyy1";
+          name = "elisp-docstring-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/elisp-docstring-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     elisp-format = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elisp-format";
@@ -17036,12 +17099,12 @@
     elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elmacro";
-        version = "20170304.705";
+        version = "20170312.356";
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "fad4cee572cb4dbe670be8eb19f10646d02be854";
-          sha256 = "0zmg56gvq1hhhzzcx0d08r8ii56bn96ifaby6r6bgr6b094c2i59";
+          rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe";
+          sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -18091,12 +18154,12 @@
     emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "emojify";
-        version = "20170220.2247";
+        version = "20170313.640";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "emacs-emojify";
-          rev = "181d619e96cd3275e69e010486169553c13479e7";
-          sha256 = "1ms2pkjqdkwfvn8xq4dbm0585p2gdwcwplnx6rk7zjvir6nc6y5s";
+          rev = "00e8d01f114ad5ca95d5e9509ef327afa0087e0f";
+          sha256 = "171ic2qcrc0mwfjjn2v8894m0r5waq3qpmw80lqqc1a05yn656si";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify";
@@ -18950,12 +19013,12 @@
     erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "20170303.248";
+        version = "20170309.216";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "3300b3059d13cd204f553f0c7d46d784adc5a8ab";
-          sha256 = "1717hpj71kq9bgfwp30z8k2pns6n23vh3mybfsn6iz8wz424428x";
+          rev = "47e46069d01960b74cefeba648e98e6afbb79e59";
+          sha256 = "1319rs0cj396q3zdzfwiijynx8rgzy7zchqya8gjrqxfq5bh6p01";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19114,12 +19177,12 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, spark }:
     melpaBuild {
         pname = "es-mode";
-        version = "20170213.1137";
+        version = "20170307.2136";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "9fb395996316c140f3a6c77afb10dcd37cb49126";
-          sha256 = "0g2x3jwy3v45p6nqjfskj0w0c94gyvxm1xzi5yypnyhsj188fsyp";
+          rev = "527a2f70e1de7df46e59609b245e7e99c53708d1";
+          sha256 = "19kss3hrjf1cj4lgj68qw5zszar7c7pjbqj8sxlwicnrg831mj0n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode";
@@ -19324,12 +19387,12 @@
     eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-git-prompt";
-        version = "20161126.758";
+        version = "20170310.2205";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "eshell-git-prompt";
-          rev = "fb56e851c1baac68249c34043bd5db9c9420141e";
-          sha256 = "08mhjps17w3kfmmbdws1lqzphr2ayl160i0ckd4552jdyzd28vvs";
+          rev = "1e57eed52fad929f36ae5e3a9e3aa45ad019ee93";
+          sha256 = "0wa4whvhg6l7v8yis2hlil79dsjsp2qacvc81pbhf5j24fbfhd5x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
@@ -19429,12 +19492,12 @@
     eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eslintd-fix";
-        version = "20170227.1220";
+        version = "20170310.835";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "eslintd-fix";
-          rev = "9c1f697c95b16f623c24bbb9c63257068d834977";
-          sha256 = "0ddpr9brxigc22mzq4nc5x499bpkqq3xx28ygjcmc0z7kb03d0rk";
+          rev = "fe2ed976c79474baa2cdb2fc4477786cb42d5b22";
+          sha256 = "1y6c94kk4bb3y3dw7sbv7w6fj9c4j0hq0gsy1m1675zzv8ar1di9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
@@ -20452,12 +20515,12 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20170205.1355";
+        version = "20170312.2052";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "17a469799a5fe0df8d9b3589c6719634acd065eb";
-          sha256 = "0rwz0xg76kvyz959r8bywdbddxaxn69z9lqq95z71qq980w3d4g7";
+          rev = "62378695eb45990dec776864e16c28829136aeb6";
+          sha256 = "196ii51malqh2ahfk13rj6p4np0755zhx4pdk18090pwl4hgkzfz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc";
@@ -20536,12 +20599,12 @@
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20170305.1847";
+        version = "20170309.49";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "7c274dbb7ed4102ee06b998fa6f529c0f816fe9d";
-          sha256 = "0997szqya4ljjgmsx1w9zbj6h21wq6l46qk1bs0027zvqwcylsv8";
+          rev = "cac2f7945fc90f43d1282dfe4aca24ded9f7cd03";
+          sha256 = "1zjnscnj0zrxpdjikxwg4fw7m6yb39060cmn24xzs0hmnmbxnw9m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter";
@@ -21169,8 +21232,8 @@
         version = "20170301.232";
         src = fetchgit {
           url = "https://git.systemreboot.net/exiftool.el/";
-          rev = "ff6f30a005444269b985bbc28963c85ebcdaa835";
-          sha256 = "078xpnjqndlcaidzgdcvryqsrd5vpi2ckvlb6ihcym68611zqy7g";
+          rev = "240ae7b829733d5da1d2e255a3e7f5638f83c745";
+          sha256 = "00bkwaydh4j76gpxd77m3pyxrnqhws1rg70r1g7vmgm6h5ah9ndc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4835a76909d020781021e747fbc341111a94dbfa/recipes/exiftool";
@@ -21373,12 +21436,12 @@
     ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ez-query-replace";
-        version = "20160908.1329";
+        version = "20170311.139";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ez-query-replace.el";
-          rev = "4b3c6212dc8141a1f75d258e70657b62e4c96ab3";
-          sha256 = "0a1cgcbh969lchkqqxlxzg8rgdf1yiwaf1d15fk2z489lklqn5sx";
+          rev = "66381226da00cc4a87c7d5962aaabbc0eb325cb7";
+          sha256 = "1p5qg5pz87ym1gd0jmakkpkskmffl69694pkxbhhfxp10pyshzmc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace";
@@ -22590,11 +22653,11 @@
     flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flex-isearch";
-        version = "20160926.1630";
+        version = "20170308.1210";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/flex-isearch";
-          rev = "6a54f37be01f";
-          sha256 = "19wcfpgd5qrh3sbybrxvd1hx34j85y34dy19yb80nlh2nha2n5sk";
+          rev = "8b934ea6f1e4";
+          sha256 = "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/flex-isearch";
@@ -22691,12 +22754,12 @@
     flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
     melpaBuild {
         pname = "flow-mode";
-        version = "20170303.1146";
+        version = "20170312.422";
         src = fetchFromGitHub {
           owner = "an-sh";
           repo = "flow-mode";
-          rev = "eb2372b0acf740ed3c5f9c048addbb8048e04458";
-          sha256 = "0ajdzpjghm7iscv2c6nwwx4v1639map104ldsi978iw8hy7m1mmp";
+          rev = "111555a5edb1c3857e5767950a44cc08e14b8c30";
+          sha256 = "18bxzzq6s80kgfgj34v8429nwx6bcvvfk951mkzqjydba56bch62";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
@@ -22796,12 +22859,12 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20170223.247";
+        version = "20170309.145";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "da499ef6a7e3c8f4adec732703f34aea2a4e70a2";
-          sha256 = "0nyvkgva0qkk7hrsb2h3q22hxvc17r10hff87gv7bj82ia8lxqnl";
+          rev = "312f78cd712f696dc169a34cb45622ca154d097e";
+          sha256 = "1jlbsy9pdcg76r75ca7gpn2lpkvpy71z31713cl5a1sqgb26lc8d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -23888,12 +23951,12 @@
     flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-status-emoji";
-        version = "20160813.2038";
+        version = "20170311.1203";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "flycheck-status-emoji";
-          rev = "bfe40fec4695b6914d1ef36331dbd3eda384c92d";
-          sha256 = "06p38yqkdrb4ksm30yd7wj3i6vqkhgmys94dm33anslh8dz00flw";
+          rev = "2f323cb210a280fc05061f3fc689c627b40bfcb3";
+          sha256 = "0gz18jp5bcwm86w6ir8vyf8rb3l2h524zfvx0jpfk0k1mmxj9cs7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji";
@@ -25715,8 +25778,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "430317e5b2ea5005851ce7f03564aa8f8dba61c6";
-          sha256 = "0zsg5q1370fqswq5cysfc4lg74hyjxn5yjpqzyl9mwlips90y42l";
+          rev = "29e26503c13569de25268283dce534f111726643";
+          sha256 = "0g6xb811n4nd1vm7jraypaq2qarigd2chg2nbdx0nc23ga17f90q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -25894,12 +25957,12 @@
     gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gams-mode";
-        version = "20170121.203";
+        version = "20170309.2204";
         src = fetchFromGitHub {
           owner = "ShiroTakeda";
           repo = "gams-mode";
-          rev = "e8100f9694c1b85c12ed57d89f7efe408b9f933f";
-          sha256 = "14d6iiy2dk93ani1d3vm57nsd3pn170fk8brs5v7jpf1sqszjihw";
+          rev = "ce51aa1afec78bf96aedb4badf33463383b7593e";
+          sha256 = "182qrzs88wvkbbalmbdwpmzchkijvg1s6582qihgh29nn8lrl0l5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode";
@@ -26232,8 +26295,8 @@
         src = fetchFromGitHub {
           owner = "DanielG";
           repo = "ghc-mod";
-          rev = "fdd8ffb39098e38c0179dd647f05b846012f10a2";
-          sha256 = "1niq9vwdgyw0bwwcfbmkzs9z59adx0ly1ana8rjb7r39ii1am6ah";
+          rev = "472db909d1b11288885de6fe36c3691be7f175ec";
+          sha256 = "16ywm37y35rpvlzywyqyc2ga4l1h0fz4xy38j18a0z04w7xigkwz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc";
@@ -26522,12 +26585,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170214.347";
+        version = "20170308.146";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
-          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
+          rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e";
+          sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27198,8 +27261,8 @@
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "gmpl-mode";
-          rev = "c4cf8896aef89b4c08c0c8764c9f2330fc987f9e";
-          sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4";
+          rev = "a4481bcbd84f67cd87e7bc87456b6f5b3a95fcf6";
+          sha256 = "0w9dfxpiwwfk1iy83a214xpvqf858k668xkcdr2n25bccg1i148y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c89a523f87db358c477e5840b0e043e9f253e640/recipes/gmpl-mode";
@@ -27636,8 +27699,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3";
-          sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s";
+          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru";
@@ -27674,12 +27737,12 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20170228.916";
+        version = "20170308.1512";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3";
-          sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s";
+          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode";
@@ -27762,8 +27825,8 @@
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "5056b857a90d732d78162b3263a1dd94f7c5afe3";
-          sha256 = "1gf0i51j7rvml6m1rgai221lydx4x11p3y69cf0rryq3brzzmz3s";
+          rev = "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2";
+          sha256 = "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename";
@@ -28199,12 +28262,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20170305.942";
+        version = "20170310.349";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "aca1bdd18997759bd4d3618c9591cc38774ac16a";
-          sha256 = "1g59mwb1l8bvc66gsq8lprbrfbs238lp280k3xqda6z7dbrh9vq9";
+          rev = "50833e9579ac2ed2647708982477edf9a783113e";
+          sha256 = "0zcbmd3kdkcxx96mkl130j913y9mzcdxkbjd7x1vm48akirz598w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -28280,12 +28343,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170302.1450";
+        version = "20170310.1402";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "b4a3f7a1d0352866c03f42208cddceb53fe12d16";
-          sha256 = "1f5bpjzj92ac4jvpbahydf2k894man4v2riv8k7j7fwlaknlvcvj";
+          rev = "4e7a21e556f26c636141c95a4041baa141e971d1";
+          sha256 = "0l5dm0r44nchgn8vzzqsn7rhf5015ni5fp56fxnz8m4kkkas01lz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28913,6 +28976,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    gtk-pomodoro-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gtk-pomodoro-indicator";
+        version = "20170310.532";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "gtk-pomodoro-indicator";
+          rev = "f64fd33f95289e3c4c81e8496eb0bdafc0c42815";
+          sha256 = "0x8r0hamq1ws5l3z9jcxfmdqvm5qcig40knvwanjmkb2whbqlyk9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator";
+          sha256 = "0fg227yhj85xy0s32xzwg2ka9kc9ygl0wd33wypp6jban13ldasr";
+          name = "gtk-pomodoro-indicator";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/gtk-pomodoro-indicator";
+          license = lib.licenses.free;
+        };
+      }) {};
     guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "guess-language";
@@ -28979,12 +29063,12 @@
     guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "guix";
-        version = "20170227.656";
+        version = "20170313.813";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "guix.el";
-          rev = "c11094293d250bd6299c4eeb4dc64af223124aa9";
-          sha256 = "0ya4zacfrv3hl317l78jrj491hag36i4ishh0gcrz602qqdgw531";
+          rev = "61d6ce9b133fb57d4b7a12d007b2e2c8bc6a645f";
+          sha256 = "0jlzb06vcgdmj5yp0wnfq81bjdasnbrffvm3019b5yyx0cc7ysn3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix";
@@ -29466,8 +29550,8 @@
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "74351e8a14e6e8e1cdb77a4b677065ab81d98d8b";
-          sha256 = "0h6xrng4qmfkafd77pg1svzcsz5law6rcif95050c03w3fvy4syn";
+          rev = "775ff42884c0baab9da01fcdc87707c6c90480c8";
+          sha256 = "1w6sc6klkr5b9fbp38pngmn0icps5hi6z6cbs59zlzz5lmq7jr9d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode";
@@ -29730,12 +29814,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170304.206";
+        version = "20170312.2348";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "5d4d74c9ad506c33263df8a561289b621eda1546";
-          sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm";
+          rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0";
+          sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -29940,12 +30024,12 @@
     helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20170227.608";
+        version = "20170308.36";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "c4fd39864d0c9f770426a93319b492942c81b1e6";
-          sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr";
+          rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6";
+          sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex";
@@ -30276,12 +30360,12 @@
     helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-company";
-        version = "20161121.2111";
+        version = "20170306.2113";
         src = fetchFromGitHub {
           owner = "manuel-uberti";
           repo = "helm-company";
-          rev = "59e93396309fe3cb60913332d384d2f4706694c3";
-          sha256 = "0slp08dy9s40mqj6f64d8yw9si1a76mlhbmm3a7khf076b8ky02s";
+          rev = "64b3e341776dcb2fe7b329ad0a790629e4a7b800";
+          sha256 = "1h8yhvwh8973r9990mdizrva1g1c8r8xm5wrd3gpmllgx36mkkmv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company";
@@ -30297,12 +30381,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170301.2122";
+        version = "20170310.529";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "5d4d74c9ad506c33263df8a561289b621eda1546";
-          sha256 = "1xbwafzci0k36xsykhffpl72zycwj1i56z80jpw4cfwj8kwpdgvm";
+          rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0";
+          sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -30595,8 +30679,8 @@
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "helm-ext";
-          rev = "1546dbbfaac7729435226b4a7426c9e67032482a";
-          sha256 = "1a7kjibc2r26wxc2c12bymjxdx965blm39qfgcvmqy6if0bp6w7h";
+          rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c";
+          sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
@@ -31556,12 +31640,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20161112.1505";
+        version = "20170312.1524";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "4596ac225a90bc49d96a416d661f5da2a13b711d";
-          sha256 = "0snynrrrkhm7c3g2iwr5m4lq49lxfrkf7il1rm2k56r5lbzw7mkm";
+          rev = "dc697094c48f97d485c1898b7a5ff3df6d992910";
+          sha256 = "13r0x74yx1cyl2zwj76p867yj2x97pj5hxapc1v9fj3i9h9a99l6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32225,6 +32309,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }:
+    melpaBuild {
+        pname = "helm-spotify-plus";
+        version = "20170311.221";
+        src = fetchFromGitHub {
+          owner = "wandersoncferreira";
+          repo = "helm-spotify-plus";
+          rev = "a09f571ed5addbdb0a2b8354cf18b4d5551b5abb";
+          sha256 = "1c6dv92n9kkaizhswlm7hhk175c5ywvq2710d7hpn18cdj3isjsx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus";
+          sha256 = "1f39g2kgx4jr7ahhhswkrj0m5rbsykvkgh00d7jy8czpp8r4dl20";
+          name = "helm-spotify-plus";
+        };
+        packageRequires = [ emacs helm multi ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-spotify-plus";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-swoop";
@@ -32291,12 +32396,12 @@
     helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-tramp";
-        version = "20170208.546";
+        version = "20170313.139";
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "65e1f3ab12caa206402fad381cc75c7e844f9452";
-          sha256 = "0j07hrdws0n9s51a5z7b0q1lzivvmrpn0crsg5rwnm9jwa1a6vws";
+          rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523";
+          sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -32597,12 +32702,12 @@
     hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hexo";
-        version = "20170228.615";
+        version = "20170308.205";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "hexo.el";
-          rev = "fcc713565189eae4dc9f39ffd1944f4c192b512a";
-          sha256 = "0338j0wf5h3vxdrhsgdiqiczg97md3gapghabswpsk8r9k4nsjn1";
+          rev = "f7b8803fd81e738e25425e0eeeed4cf2adc6a5e8";
+          sha256 = "0hbfgzs4kg2vqm034falm9rhhin9ii0n0rc50qli5v3a85c7ayrw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo";
@@ -32885,6 +32990,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-context-line";
+        version = "20170310.1438";
+        src = fetchFromGitHub {
+          owner = "ska2342";
+          repo = "highlight-context-line";
+          rev = "18ca91d91f2a9e86311d8895c53741ad847180ba";
+          sha256 = "1a0mvkbdhdad4nd0bqpg0ldz10lh211w72gcd2x1ydijwvkphjdc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/00df721571ff67fe158251fa843c8f515ded3469/recipes/highlight-context-line";
+          sha256 = "0zmqcfsr2j0m2l76c8h6lmdqwrd1b38gi6yp5sdib0m4vj9d0pnd";
+          name = "highlight-context-line";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/highlight-context-line";
+          license = lib.licenses.free;
+        };
+      }) {};
     highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-current-line";
@@ -33243,8 +33369,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "c2ac3e3ce57c834525dc8ec5ca87d5e8d728b69b";
-          sha256 = "1zhggfmhk57v2yj6w9z8mrq8yjsdjg7nzljz1jwbk03jkf7zvwr8";
+          rev = "336a440749e626df015be58e4582f1f6ad179984";
+          sha256 = "0r8x7sjhx4l3yl5sfxl04qk8rmid4x7cmk3721zbbmsyzwzx1a2p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33320,6 +33446,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "historian";
+        version = "20170310.1001";
+        src = fetchFromGitHub {
+          owner = "PythonNut";
+          repo = "historian.el";
+          rev = "47106f8382f5d9032ab52c1dd48ede1a8fdc08ec";
+          sha256 = "04rqjk1mr1097sq0mnjc888ix4d4xcfl3dk8xw7b7b843fh7fbg2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/f16dacf64c52767c0c8aef653ac5d1a7a3bd0883/recipes/historian";
+          sha256 = "00cghcyb3liz2prgygjwsw82d9h70zjddnbf7dvglmj7ph9wn9ab";
+          name = "historian";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/historian";
+          license = lib.licenses.free;
+        };
+      }) {};
     history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "history";
@@ -33566,12 +33713,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170302.711";
+        version = "20170310.849";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "0e65583a7821e60882b8ce7934b1f1c34d4d1874";
-          sha256 = "12r0jxcipfbs77yr2svs60x1b52l6lyjgjax3kxaizjdjaxxwsdc";
+          rev = "ef211ab1ad75cb323adfd3b13de5832e5b7b180e";
+          sha256 = "1mz48jpr9af8p7yrplnbkkkgd3587nw28jigpdyik257v2787ayi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -35539,12 +35686,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170305.900";
+        version = "20170310.2255";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "2e1dd6c1e1540223f8cc4e3493c1e555144d5431";
-          sha256 = "0flfp8313xxw8c3wip0fqqz33n7gfn3fhppsrpz7wlxiqymsb20d";
+          rev = "d81e266e77316bc116ceca5dbc92fc3831825be3";
+          sha256 = "0hrz6809w0ardqgb5xraxpr6gj25jh2w7cbcpacc5xv90cv4p7ri";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36039,12 +36186,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170302.2354";
+        version = "20170308.2033";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "693e13fd3f19c05e906c234c692d77ac48d69fdc";
-          sha256 = "18xj5m6qglh4w903vcdxmw1sms51ansrai43sndcp6z4sbi02xpb";
+          rev = "5396b410c326f8685b473e3f38db7506b1616582";
+          sha256 = "10qnz73djzwr4lb96d1x51vhia5qicjr3c1ijdysh2dhbxpz2y02";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36309,12 +36456,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170223.515";
+        version = "20170312.1515";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "75b356b357e63a03c04e194e85f1925f198363dc";
-          sha256 = "0fsg79ww3aqy0m46xjdr3783zwc6vnxknh4k2yrizmm44zvy925z";
+          rev = "0c16cbe0038dcd5a2f70de2edd28a62a4008ac5e";
+          sha256 = "19r6jzs47h15kxjmpsk3ddb0gc331vnsvfa5xcabkf5gk3h36mh1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36597,12 +36744,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170225.351";
+        version = "20170312.844";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
-          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
+          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
+          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36618,12 +36765,12 @@
     ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }:
     melpaBuild {
         pname = "ivy-bibtex";
-        version = "20170227.608";
+        version = "20170308.36";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "c4fd39864d0c9f770426a93319b492942c81b1e6";
-          sha256 = "1h78akdfjfrabqzsiplc6lasd5jliqcjbsjnbd435ca2a4f4mzfr";
+          rev = "2e83867a39bbd4b7cb7901b897a66a131b5635e6";
+          sha256 = "0gr8mlxypk5n4s19src71s2g6s91by3vp6ci9yqqh1q9ns31a43h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex";
@@ -36678,6 +36825,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-historian = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, historian, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-historian";
+        version = "20170310.1006";
+        src = fetchFromGitHub {
+          owner = "PythonNut";
+          repo = "historian.el";
+          rev = "47106f8382f5d9032ab52c1dd48ede1a8fdc08ec";
+          sha256 = "04rqjk1mr1097sq0mnjc888ix4d4xcfl3dk8xw7b7b843fh7fbg2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fb79cbc9af6cd443b9de97817d24bcc9050d5940/recipes/ivy-historian";
+          sha256 = "0yzq3rr51q5d64pfc7x5jszz77x6nwpbjj0g74x5ga3bsw3i67d9";
+          name = "ivy-historian";
+        };
+        packageRequires = [ emacs flx historian ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-historian";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-hydra = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-hydra";
@@ -36685,8 +36853,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
-          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
+          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
+          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -36790,8 +36958,8 @@
         src = fetchFromGitHub {
           owner = "squiter";
           repo = "ivy-youtube";
-          rev = "32f609f1d1a3718739be5797e020d6266d8340d2";
-          sha256 = "0vvqp6aw83bxk7j835w267m1xyl7a9a5m45h50267ahvhd9vn1sd";
+          rev = "7e916dd531c52a2809188a99716aeff8446056cc";
+          sha256 = "1dia1m9fjxbd5lsf788bv7zpdbrwbjswd9m588iaijcdd2hnma8q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube";
@@ -38373,12 +38541,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170304.2103";
+        version = "20170307.549";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "5995aa56c9ccbb3eb78c49daba1e77a6aed354b0";
-          sha256 = "0aqmd5hkqphwv74n6y5yidhn21hl2hlnmfdm7m8wkwhcylylq6xi";
+          rev = "bfbcb88c7f107b85559562da5e7dc37af0ddb82e";
+          sha256 = "11vrsswn6bzfdvprcy7psgxdpkn4ayggqb851pj2vz12bqj17jf0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -38394,12 +38562,12 @@
     kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "kaomoji";
-        version = "20160218.20";
+        version = "20170311.2151";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "kaomoji.el";
-          rev = "cde86e7f27008dbe03230d63941a0f5bd0512c10";
-          sha256 = "0vqjbv3pqlbyibqylfsqqjzkvjhdg01hlxszfblpg72fziyzcci5";
+          rev = "91ab93cc7455486182d5e7f88e03d0de44c9953e";
+          sha256 = "19l3r2fbp895c46cklrjfwwa5d7i959nd6jc3gk14jyi35gjypyy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/140c65cb3cdf6c197b085ccf8ba079e1efd15f38/recipes/kaomoji";
@@ -38706,12 +38874,12 @@
     keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keyword-search";
-        version = "20160607.2238";
+        version = "20170309.2247";
         src = fetchFromGitHub {
           owner = "keyword-search";
           repo = "keyword-search";
-          rev = "d40633712cf4dbb1bdf95d8262b5a4138b29e049";
-          sha256 = "0g42yr331piv3r18ymz4kb8jqmslimq3xamkyqdn702xljmb2pad";
+          rev = "33682e93429027805ee7c51c5f6f608872b6f5dc";
+          sha256 = "03qz2sdyrlww1xc9bkarc07pf3rk42h7jjnl0dw76ffrci1z1mj1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ecdc51938f2300bf005e2d1b1819e0fa59e0bd7/recipes/keyword-search";
@@ -38878,8 +39046,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "ca9eb0bbb8e9a4b5b6e2b177b2b36ab024495587";
-          sha256 = "0kzh5q1dj7mqdjcp1di0lm8imxjlp1ak8licidfy0lz4h4fcqsch";
+          rev = "3bcc310e4f62eb567d5d568446058f7f5811ade8";
+          sha256 = "0zx73p4hdgpsvy2ifbi6zwi2ard1sjnkd1ig0habhzd5c7f52igr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39025,8 +39193,8 @@
         src = fetchFromGitHub {
           owner = "tttuuu888";
           repo = "korean-holidays";
-          rev = "aed79c24e3f91d8f9508367758b18e5fa3a9eaf4";
-          sha256 = "1kqbxnjmp7hxjcv8zhy9v8v6220l9vd7rgqicjln4yrjz82z4579";
+          rev = "6e94c2e071069aee9ed12ebbfd9b0ad863b8c78e";
+          sha256 = "1xs81yafp783sz1clb65yc9w2xlf2kmshbsjynnafqd6pfd0skps";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9453d96fb963973ff53884d31e060f1e98004acb/recipes/korean-holidays";
@@ -39230,10 +39398,10 @@
       }) {};
     lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "lacarte";
-        version = "20170101.1036";
+        version = "20170307.837";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lacarte.el";
-          sha256 = "0xlbv4hhmg85x8i2zzbma29r5674cbmjrqwda9bjxf00wfid0a76";
+          sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte";
@@ -39584,12 +39752,12 @@
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
-        version = "20170208.425";
+        version = "20170310.1705";
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "574093b4bdbf4854f7a661556ec9ebfe5a9a9611";
-          sha256 = "0irxj5w6yrqbyr9js1mp3fh19cfwijd7brpvzas6j7v3fb0mf7zx";
+          rev = "084849f8350a51224a968184cc2b1debdb75bc93";
+          sha256 = "0iy603ym4bx85gp44cndxzqpcn8xgbz9nrwiid9bmjicizv9xld8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -39773,12 +39941,12 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20170226.131";
+        version = "20170309.1340";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "51ca421f52839c62c6b4ed4cc70d55701ca2afdb";
-          sha256 = "08v2mx80ihcs4v2ydf4ksb5yhbsp222wwzzx26xw70icahsx67y4";
+          rev = "4b11c7d4ea4dbde316844d3c73be9bafe12ac911";
+          sha256 = "0saaakcs32i0bal2v6zcw1r27jzbs3hlhcsvr0k9dkhyi2kv2nwn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme";
@@ -39853,10 +40021,10 @@
       }) {};
     lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "lib-requires";
-        version = "20170101.1038";
+        version = "20170307.855";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/lib-requires.el";
-          sha256 = "03y99c1cg368c3647w8jypf2nlx26qkygrijw2vxcp4ha5v9f44z";
+          sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b3f0d443964f98bb65f2fe8f57048fbee844f2ba/recipes/lib-requires";
@@ -40150,12 +40318,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170302.1031";
+        version = "20170312.957";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "8794864744151b808c0f966b29c33c547be96d89";
-          sha256 = "0ii8092148a5mi59ssnl9hxzjx861vpb6ajma4anpzfjlv9wjjq7";
+          rev = "0ea4c086756e0f332821ca757ea884ea9ee0a81f";
+          sha256 = "0kf20hkav15r8dv9hdvbrn9x3x0dc3m0k15gnv3a99fi5qlnwh12";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40397,6 +40565,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    literal-string = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "literal-string";
+        version = "20170301.730";
+        src = fetchFromGitHub {
+          owner = "joodie";
+          repo = "literal-string-mode";
+          rev = "2ca4fc08b8e19e6183b1f1db747bb0a4aa4f98eb";
+          sha256 = "0wcz0lid05gnlmxpxm4ckw07cnxwjkyw6960nq7pylbjpg76g5ng";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6519bb53f409eeb0d557809b338849e473c193c4/recipes/literal-string";
+          sha256 = "0ylv9dpw17w272f92vn5cldklyz1d8daihi1fsh5ylvxqpinyrkn";
+          name = "literal-string";
+        };
+        packageRequires = [ emacs markdown-mode ];
+        meta = {
+          homepage = "https://melpa.org/#/literal-string";
+          license = lib.licenses.free;
+        };
+      }) {};
     literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "literate-coffee-mode";
@@ -40550,8 +40739,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "c7849f87280d549f3829a2c2fe4cd911c421a0db";
-          sha256 = "1anp1avlzl7xf2zhj9b8ixhwxmvprbiis7nmdnh9nq1xkpfjlmxm";
+          rev = "00ea544948006ad27602b656c5eb3e2b2051c1be";
+          sha256 = "1zibr3x6y7p6mynjivd55y102hjyl97sv2ipwgm9n1jsif2iz6ig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -40917,22 +41106,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "lsp-mode";
-        version = "20170302.1127";
+        version = "20170311.2126";
         src = fetchFromGitHub {
           owner = "vibhavp";
           repo = "emacs-lsp";
-          rev = "03f1bd56317557c398851757893522f25908cc7f";
-          sha256 = "1xmmh4a23naa7ipd673q52hv31wmi1j20sh5kcgw14r3pqymd8dh";
+          rev = "0fc5400562247b5d674ae8d18f78824de12ba6b0";
+          sha256 = "1zmpkpx2nhm1vvdagrp75jz6v3d4n7zv45xp49m81xzqsyw20im0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode";
           sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1";
           name = "lsp-mode";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ emacs flycheck ];
         meta = {
           homepage = "https://melpa.org/#/lsp-mode";
           license = lib.licenses.free;
@@ -41108,10 +41297,10 @@
       }) {};
     macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "macros-plus";
-        version = "20151231.1419";
+        version = "20170307.842";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/macros+.el";
-          sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d";
+          sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+";
@@ -41232,12 +41421,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170306.44";
+        version = "20170311.925";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
-          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
+          rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e";
+          sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41383,6 +41572,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    magit-lfs = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-lfs";
+        version = "20170312.1524";
+        src = fetchFromGitHub {
+          owner = "ailrun";
+          repo = "magit-lfs";
+          rev = "799282fce73b668d2cf6e4fa87f889fec8e25333";
+          sha256 = "11wv3j8b377sbfj1qhcr6rn05ns728ifrigjk7r60rd34lwyc8c4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1a92f0963d8df3e299a999948828173dac38a612/recipes/magit-lfs";
+          sha256 = "1im9skj74jdi7jh0fnyyk8a4g4sk48clgn107ggf69lnfpxh8xxa";
+          name = "magit-lfs";
+        };
+        packageRequires = [ dash emacs magit ];
+        meta = {
+          homepage = "https://melpa.org/#/magit-lfs";
+          license = lib.licenses.free;
+        };
+      }) {};
     magit-p4 = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild, p4 }:
     melpaBuild {
         pname = "magit-p4";
@@ -41407,12 +41617,12 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20170214.347";
+        version = "20170308.146";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "4f565039fd318ad5a90cd3c779785f25f540c652";
-          sha256 = "0zqqgycdvyq57lx6lxlg0zgfkwbihmk82zqmmpi5x1dmlcy1rwjr";
+          rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e";
+          sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41659,12 +41869,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20170304.348";
+        version = "20170313.206";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "af83a1be2bb800ebee4ab378f167075537eeb7ec";
-          sha256 = "1zbjaixbrhs39fmf58mxqmwlby531gfxzn2s8s10rm0m6sswbzii";
+          rev = "07dfde3f4236498fac31fe1ed5a9b87e92c484f8";
+          sha256 = "0dz8mijsfnzsi7bd928a55d7dmc04c45jx28zg9v0mmgx6fkkr28";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -41869,12 +42079,12 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20170301.1511";
+        version = "20170308.2031";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "b360948acf5a31b6cf6f0113ab5f30bc47f6b098";
-          sha256 = "016h6mq0650fw8ix1zh1j15i782g0bpmlsnsznzi5aspy8b391kn";
+          rev = "67c15f292515142c2417f147117ea2a3172cd195";
+          sha256 = "1kbr2x4s0ynwizm5hy3q4xdjs1jmfdsnpndcs0dlh0di0mhld6x0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku";
@@ -42419,10 +42629,10 @@
       }) {};
     mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mb-depth-plus";
-        version = "20170101.1046";
+        version = "20170307.844";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mb-depth+.el";
-          sha256 = "1sk8x91gxwk17kv7whwfh9szxmgyy9ys1h4hx17hyzlvhz9smncg";
+          sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+";
@@ -42752,10 +42962,10 @@
       }) {};
     menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "menu-bar-plus";
-        version = "20170101.1047";
+        version = "20170307.845";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/menu-bar+.el";
-          sha256 = "0s460zm9k8b76vih5wgyrg8a7w5alwd43ia00mp110ipq2sy9pd2";
+          sha256 = "1lvnsh45fh23pc49xfz8p5m7z82zzxsrdikmx6pbylzhlr0m3nc4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+";
@@ -42775,8 +42985,8 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "afc398a9e6787b9a8ece385f23bd94ae0ef71805";
-          sha256 = "0899yjw3zm8c0xrv1nk3vcn4rzng68kw5dlns4w6pmzv0pc3cq7q";
+          rev = "89f9643c08211a770454919551a7fd8605d1fca8";
+          sha256 = "13x0zjd297ssqmbvba32zk2p588kznd5ag4wh3nqb6fdgyzy4d63";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin";
@@ -43373,12 +43583,12 @@
     mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mips-mode";
-        version = "20161008.212";
+        version = "20170310.2149";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-mips-mode";
-          rev = "8857384be127b55bd7a20437e4592d8a0175ebc7";
-          sha256 = "0z9zlij7w51iz1ds7njvg8g2mqp80vi65fmxr67rhbfsb7i568cl";
+          rev = "a13d1fc5b583a29f059f7794f2d83e59da439fa1";
+          sha256 = "0ncvp52dnicy84wmnbxhm6djxhc8njrbxy6zwz2vylmy24z9948w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode";
@@ -43393,10 +43603,10 @@
       }) {};
     misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "misc-cmds";
-        version = "20170113.904";
+        version = "20170307.847";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/misc-cmds.el";
-          sha256 = "05ymqzikn16538iqjiwyhwhqzshx9kx9v8amarb8ybr96l1ci4bz";
+          sha256 = "1w58z2j95sycgkakgb9anlc3q73v77whspi9a4j1kf6lmcbpyms8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds";
@@ -43411,10 +43621,10 @@
       }) {};
     misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "misc-fns";
-        version = "20170101.1050";
+        version = "20170307.848";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/misc-fns.el";
-          sha256 = "0q5if5p0yy2b3h93lsrhy7z8f5mjmm3kkh1ql94jng4a0hl64jqr";
+          sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns";
@@ -43451,12 +43661,12 @@
     mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
     melpaBuild {
         pname = "mmm-jinja2";
-        version = "20170128.416";
+        version = "20170313.720";
         src = fetchFromGitHub {
           owner = "glynnforrest";
           repo = "mmm-jinja2";
-          rev = "f39a9bfe9e3001b0141ed3d6a156fbb60a76e25c";
-          sha256 = "0p83i4ikd1bj4r0hahwnlj2gliwcgfql5rzvv7phl3nhjinclj55";
+          rev = "c8cb763174fa2fb61b9a0e5e0ff8cb0210f8492f";
+          sha256 = "0big2i3bg4cm14f68ncaiz2h6dk6zqiisrz4l0bv10q9kaa9q2sj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/721b9a6f16fb8efd4d339ac7953cc07d7a234b53/recipes/mmm-jinja2";
@@ -43722,10 +43932,10 @@
       }) {};
     modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-char";
-        version = "20170101.1054";
+        version = "20170307.854";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-char.el";
-          sha256 = "0y5bjny8j9lvf94rfk3nrwdfmbp24i1b96909xpifn3l1r1xl6qr";
+          sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char";
@@ -43740,10 +43950,10 @@
       }) {};
     modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "modeline-posn";
-        version = "20170227.1124";
+        version = "20170307.856";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/modeline-posn.el";
-          sha256 = "0glwnfgch9li5z6051ia3f61csl3f6aa1cwkwmw9w7saw4d6q3m1";
+          sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn";
@@ -44094,10 +44304,10 @@
       }) {};
     mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mouse-plus";
-        version = "20170101.1057";
+        version = "20170307.859";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse+.el";
-          sha256 = "0drv4r30jj1bsgd9jv6znicc9jgxd0hzjd3xlsp7l2ynjbg86n4g";
+          sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+";
@@ -44133,10 +44343,10 @@
       }) {};
     mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "mouse3";
-        version = "20170101.1058";
+        version = "20170307.858";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/mouse3.el";
-          sha256 = "1d6192r5iqyvs21ip78wcsvwc4lpx2jiv6pljcm9blxr1bpsk3gl";
+          sha256 = "0as1d26m3r1vacccsdlbw0rp6jyhj054wv1lssiky6d0kqzn6wa6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3";
@@ -44362,12 +44572,12 @@
     mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mpg123";
-        version = "20151214.1150";
+        version = "20170313.715";
         src = fetchFromGitHub {
           owner = "emacsmirror";
           repo = "mpg123";
-          rev = "ed2307843ca54ebf0ca5e5d2e79b41e79527c45c";
-          sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb";
+          rev = "d1dd8c56428ae55df9e23ba26f102588001d55be";
+          sha256 = "1faqz3svh9l14617d39b8c7gfgf7kxf4q6d0k2q6y8whfljnbyvm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/714d40891ab697b6303a3e25df2cb8adf04942f3/recipes/mpg123";
@@ -45086,10 +45296,10 @@
       }) {};
     naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "naked";
-        version = "20170101.1100";
+        version = "20170307.920";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/naked.el";
-          sha256 = "06j2kijshd6ywx0rfvl4d08r0rh0b0rj69zypz63p418liymzcn6";
+          sha256 = "1l6r7vdhzlbv70in16qiyac81930srakr4d14dqda5j3h4w09hbg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked";
@@ -45252,12 +45462,12 @@
     nand2tetris = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nand2tetris";
-        version = "20170214.2248";
+        version = "20170306.1827";
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee";
-          sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv";
+          rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
+          sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris";
@@ -45277,8 +45487,8 @@
         src = fetchFromGitHub {
           owner = "CestDiego";
           repo = "nand2tetris.el";
-          rev = "b4dcb394f04b46206be729d0d8d32422ef8499ee";
-          sha256 = "1cmiy1zd8d6sx6xslwfmy6iw1knpij5pwn53h8kc1zd4ziyxpiyv";
+          rev = "9f7c605a1d030aed933e86b45c9f7232dbbcfb6e";
+          sha256 = "15myf8nbr6pf5qiwwz7xq8d7ys4mddxjb8b8yl7ci2pw7d03cr5z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90421372b3f60b59762279ac805c61a984606d11/recipes/nand2tetris-assembler";
@@ -45334,10 +45544,10 @@
       }) {};
     narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "narrow-indirect";
-        version = "20170101.1101";
+        version = "20170307.921";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el";
-          sha256 = "0rlj647azpj5v7lzap88992f7mf2y94708f4aw2cvnzj6hf1rsvy";
+          sha256 = "1sdyya2gmmd2h39kmijf514y3vln6ax5xdfsrkx1hcalw4l418gh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect";
@@ -45588,8 +45798,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "883bca8693d0d289c19ea62d55e5fbaa93e721ce";
-          sha256 = "0mr9x0fkza7l1427ib4cwab77vva2aghr7279rzh2hq0wlkzc5zj";
+          rev = "851a186de01369721042a1a9fa951f89c98a68fa";
+          sha256 = "1n67k2h919rjsn41qsnxm13a7qdasfh2hj5d52wqjf3ld8f88zqb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -45902,8 +46112,8 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "fb3c70049b82d53101fc6086a1699ecf16966792";
-          sha256 = "0amylb876720959hhsd31k025l1d3rv1i9i8qhf2k1skd8xfrvpj";
+          rev = "0b0374e831d9c050c6c9eb2ef48b73bc62a0f084";
+          sha256 = "0vyra2kr95msd103h3p8ya66l04wgn5c95vmz5g3l71jvmm9wx8k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode";
@@ -45944,8 +46154,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "1cf480110879ffc8aee94b4b75999da405b71d7c";
-          sha256 = "1iwpddz0yni7cz2g9asj6nmrwhaai3rhfmkq954hph8nx02c3l02";
+          rev = "96443e94a1932cff13f23d202839c53483b9290e";
+          sha256 = "027agsvbi6wmhdsdzxjvbhskjlgc20dzq13jb7sjvq5a330fgjsw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46066,12 +46276,12 @@
     no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "no-littering";
-        version = "20170226.1130";
+        version = "20170312.612";
         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";
@@ -46234,8 +46444,8 @@
         version = "20170304.1716";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "91524d5d6cafbab1c1d6bc5a75b02c4d86689e3b";
-          sha256 = "06135xc3i839hw4sa9gmvnb7qq4llv67q8h537vfgb9gixr40f1q";
+          rev = "c0c5645538d9dda84657602ee4189f4ff3ca1aeb";
+          sha256 = "092mv01pn5i7brn311zdcd74pspw5lsmq4vhvi3n80z9byrh6w1h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -46271,10 +46481,10 @@
       }) {};
     novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "novice-plus";
-        version = "20170101.1103";
+        version = "20170307.925";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/novice+.el";
-          sha256 = "04lsjzj0a0z7wn7jzlpzjdv9d2w591gs2mwvsh1j8hmgl4x5p9vp";
+          sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+";
@@ -47385,8 +47595,8 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "5dc0ab3bee633aad64967e79539cdd007bbcacac";
-          sha256 = "1d7q3gd6clyhpzy4phi6g5435iz50kba2mbn0jd403x3270gdk9y";
+          rev = "032599b162624a4b65c82c20be06433f24b00e8f";
+          sha256 = "1h9y597s3ag8w1z32zzv4dfk3ppq557s55bnlfw5a5wqwvia911f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent";
@@ -47788,10 +47998,10 @@
       }) {};
     oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
         pname = "oneonone";
-        version = "20170101.1104";
+        version = "20170307.932";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/oneonone.el";
-          sha256 = "04jjdfbn8ah3gk4fpc56il8j4q52l9raxkbkxivqn440as7nkrn4";
+          sha256 = "1fi006v0j5w993jf7hr2ywk9zhsy2v0hiscxlmjws2ihgcfmcslg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone";
@@ -48246,12 +48456,12 @@
     org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-chinese-utils";
-        version = "20160811.217";
+        version = "20170312.2316";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org-chinese-utils";
-          rev = "3818d03bde90433b49b8ef8cffdd242084af4058";
-          sha256 = "0rlqr0b54rv8p2015vgb730r3lqwxg3v0msiimwxlhfhgww1pg2b";
+          rev = "9f3ea014d049e026105055330500ee9ed82e9bc4";
+          sha256 = "1i05ds7dz5ra2vyzx3fd0038qnzgr527cnnnrhl4afr93cqgjp6a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils";
@@ -48878,8 +49088,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b";
-          sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb";
+          rev = "7b426972600154286ce6fddbaf9b7c7503845bbe";
+          sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -48898,8 +49108,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "eb1847e29c4216ec3b79029c3f143c9991e61a1b";
-          sha256 = "0sa8g830s2pw157giy7ylpa8vdsmjkqnwsffpxxvq9zmmdhmh7pb";
+          rev = "7b426972600154286ce6fddbaf9b7c7503845bbe";
+          sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -48975,6 +49185,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-notebook = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-notebook";
+        version = "20170311.1302";
+        src = fetchFromGitHub {
+          owner = "Rahi374";
+          repo = "org-notebook";
+          rev = "ea6e477015a5f25d41df25af25252f521b12691a";
+          sha256 = "1i1jchigh70z0ymil85plfx6wf9hwxlkl7jx9kxhv70zpc3m9mlg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/04149b1f158e857ea824fe120372ac52a000adcf/recipes/org-notebook";
+          sha256 = "045xqmrik1s83chl7l7fnlav2p76xrfj21kacpjj215saz1f8nld";
+          name = "org-notebook";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/org-notebook";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
     melpaBuild {
         pname = "org-octopress";
@@ -49020,12 +49251,12 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20170305.1948";
+        version = "20170310.240";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "493e9ac843eb44efd8a6f486a7cfa727d575f3af";
-          sha256 = "1amviznfqjb3z09bzv11yy2ickka43z7ffzjlbgk9wy066944p8l";
+          rev = "18c94764b6240344d4e147d881071876e9004e30";
+          sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page";
@@ -49285,12 +49516,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170306.638";
+        version = "20170313.713";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "1cf25da328ecfeac402aaa38dc3f50af8f462264";
-          sha256 = "17bw03c22khqxf8b5hmf4f0l2s7qbmjkkw6m3xvs30k5snq1wk8x";
+          rev = "2f8152e6e45885f68c01b39a227c625a441d6ded";
+          sha256 = "03ra8dr5qpmny3s293al8fckyrspkhbrgw31adz3x9z69c919qjn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49673,12 +49904,12 @@
     org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-webpage";
-        version = "20161030.100";
+        version = "20170311.1713";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org-webpage";
-          rev = "6a3c80ec00bb16707def17138e4230221511df3a";
-          sha256 = "1xr9rkkhijb3af2fqhphz7c869648l1hvf4g6qffi1kmla3djf9x";
+          rev = "bd7b0e896e250a7c330568b33520c347b6731890";
+          sha256 = "1l3smz4xx9s4jsr82isnh0hz6ivsf9y5jl87fcfkh98aqlym4z8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage";
@@ -50412,8 +50643,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "af3d973d90b779d93153f751c746f9ede85972dd";
-          sha256 = "0468if164skl0rwnk36ld3kjcmiqmj59jijgfw5w9mpd8j4mvwf0";
+          rev = "f9c485ecb08bd1820f47c6e5c160eae0776a1ed7";
+          sha256 = "0vwfhgsxgnwg0533359r5hng29k9wjs5j3yjx82y1qxdla13j51j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50426,6 +50657,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-epub";
+        version = "20170304.1600";
+        src = fetchFromGitHub {
+          owner = "ofosos";
+          repo = "ox-epub";
+          rev = "edc253b6f7397ac89a3a0b2d2a05e650baa483f8";
+          sha256 = "0kvs5kpkly45fqdb7mka1w2yn7pks95gxgiy2ayx12cgvn3inyw6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub";
+          sha256 = "15q6vsmgv76c0qfdxa3prqvgmr6n7k4rd4bpi05574ibi23y0ynh";
+          name = "ox-epub";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "https://melpa.org/#/ox-epub";
+          license = lib.licenses.free;
+        };
+      }) {};
     ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-gfm";
@@ -50534,12 +50786,12 @@
     ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-latex-chinese";
-        version = "20160928.2153";
+        version = "20170312.600";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ox-latex-chinese";
-          rev = "338b168bac4c44f8f4d212f67a2190a70eacd240";
-          sha256 = "1wh0ds7cznnvvh9rg3wsapdhxi8pplimszhzliglgj8sqfyb7kcx";
+          rev = "f4f49ed0c6de69b11739b62cd1ebc1351ad657f4";
+          sha256 = "1bppfj3zwkn5k11wk0845gf32k69c8jz5fsqq4iwvl89ijfjk5xn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese";
@@ -51121,10 +51373,10 @@
       }) {};
     palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
         pname = "palette";
-        version = "20170101.1109";
+        version = "20170307.936";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/palette.el";
-          sha256 = "0kx41b6axq9ba1mhp7icjq165aklskiq9ddmcn8yrcx480v4gf11";
+          sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette";
@@ -51474,12 +51726,12 @@
     parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsebib";
-        version = "20151006.232";
+        version = "20170311.1430";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "parsebib";
-          rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce";
-          sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
+          rev = "ee1dfbb53fff9fd5c4dc6571bf498516b7ffff01";
+          sha256 = "05rgi9hk17h2kjib5v68i4ikg7292f65qxxinaxkhsy0xsx6kybl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -52332,12 +52584,12 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20170302.712";
+        version = "20170311.716";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "5e440fb287897b97a0d13fc150df60b6860e4481";
-          sha256 = "1ff1h80hmkm3b1qj4y3hjzmmzcwp14qr8ankmi0qxymsz5z2jar8";
+          rev = "6b3987b6c085da52a4a1e1a8433bd4a6f3f411d4";
+          sha256 = "0w2wmy1mhpjfmm0js5h0nqwwmj2xzpasc1m40slwh0lcm9176w9c";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode";
@@ -52395,12 +52647,12 @@
     perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "perspeen";
-        version = "20170221.1910";
+        version = "20170312.19";
         src = fetchFromGitHub {
           owner = "seudut";
           repo = "perspeen";
-          rev = "cca16ec338454acbad26f4d1d57a463a034bdd44";
-          sha256 = "078mfmky682hbjkdxkawimxddzc2laz6xqrcpi1dli1vzgpkx7p9";
+          rev = "f093cfecde0e8ce0d5e390784c228831536aef72";
+          sha256 = "0gb8f23ls2f5zj9a9q3i39775g3zijwdnbl7gyqi4hi5v90rb0s4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen";
@@ -52584,12 +52836,12 @@
     phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "phi-search";
-        version = "20150807.112";
+        version = "20170310.237";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "phi-search";
-          rev = "40b86bfe9ae15377fbee842b1de3d93c2eb7dd69";
-          sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
+          rev = "a81c4ea203fcb572f6cc37cc658d6b01453bef9d";
+          sha256 = "1z3640walrdk2c90hj47xvlpm6xd5iblxvn7i16krdfz735i4rr5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0274300c33f19ca6f868e1d570ffee513dbdf7/recipes/phi-search";
@@ -52794,12 +53046,12 @@
     php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "php-mode";
-        version = "20170220.1707";
+        version = "20170307.1750";
         src = fetchFromGitHub {
           owner = "ejmr";
           repo = "php-mode";
-          rev = "aa69d062ea91e03ad84a378ed4f71c63846027d9";
-          sha256 = "0xpdzv2vigidnqv2pl9g614cqd8xykyln84pksifx2ldjbcs9xsc";
+          rev = "c761c97e53d50a015bf8d5d554f4917267b0f6dc";
+          sha256 = "0hy0bzscv3hakldmjynsm9rz91v5lyb7rp20ljzfvbzzbkbxzdai";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode";
@@ -53666,12 +53918,12 @@
     polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "polymode";
-        version = "20170216.615";
+        version = "20170307.322";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "polymode";
-          rev = "f72ab719c054ad2a46d175c77ad893bb6f476e36";
-          sha256 = "1pkhp3b1fv7zvsq8qnf06czyv3ax95kni7k6zjgnrwrvm3ks8fsn";
+          rev = "0340f5e7e55235832e59673f027cc79a23cbdcd6";
+          sha256 = "057cybkq3cy07n5s332k071sjiky3mziy003lza4rh75mgqkwhmh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode";
@@ -53684,6 +53936,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pomidor";
+        version = "20170310.634";
+        src = fetchFromGitHub {
+          owner = "TatriX";
+          repo = "pomidor";
+          rev = "c361814b1abbff2b213bd3cd5376efd3e749ce2e";
+          sha256 = "15ryj9hp9kc9fn6jwipwwgaj6f5cwwmjswq1017y0f69qf69dd1i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
+          sha256 = "0pdzipyza98dhnz6am8lrmz8fh3p1c21v2mhs56fb9lwyvcgv8fi";
+          name = "pomidor";
+        };
+        packageRequires = [ alert emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/pomidor";
+          license = lib.licenses.free;
+        };
+      }) {};
     pomodoro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pomodoro";
@@ -54085,10 +54358,10 @@
       }) {};
     pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "pp-c-l";
-        version = "20170101.1116";
+        version = "20170307.939";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pp-c-l.el";
-          sha256 = "07favccg34khq0rnkdmbmhagpn6sg0vrmxcql35vh1p0jalp208s";
+          sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l";
@@ -54103,10 +54376,10 @@
       }) {};
     pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "pp-plus";
-        version = "20170101.1114";
+        version = "20170307.938";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pp+.el";
-          sha256 = "0v8gm9z9dqxmqqvgz4dwmh79ssmir0zf4p3c6wbwrbak16b2ad6m";
+          sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+";
@@ -54226,10 +54499,10 @@
       }) {};
     pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "pretty-lambdada";
-        version = "20170101.1117";
+        version = "20170307.940";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el";
-          sha256 = "17vji7y92ahmhff6ax7znhi7dbfhi8zpghhnl408n5hzcvmqmf06";
+          sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada";
@@ -54596,22 +54869,43 @@
           license = lib.licenses.free;
         };
       }) {};
-    projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "project-shells";
+        version = "20170311.409";
+        src = fetchFromGitHub {
+          owner = "hying-caritas";
+          repo = "project-shells";
+          rev = "ab10fcd370781f684ca334f83fd70ed22a3f93b9";
+          sha256 = "0fh61myklzg514zlqasp09arxdg43lvyqv7sv2dr74ins29zc0lq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells";
+          sha256 = "0mhifxcpgsfwrhbs7axg6ja4klgzzy9pc0nqa7w3qg45xgi9s4m8";
+          name = "project-shells";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "https://melpa.org/#/project-shells";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20170225.2320";
+        version = "20170309.30";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "d9cc453b9e11c9b2f03413e3075e063a6143af69";
-          sha256 = "1zam1avzb5dcv0icjd8vs1p7k24szqx1n4b7qr17pikyvjz4g0xs";
+          rev = "0c307c8cbf6162fa992bcdbdd1940bf6eff28253";
+          sha256 = "18m35h9r1gs96hkgqmjhkwnlg5dj9knh227n2k9xckg161mld2fg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
-        packageRequires = [ pkg-info ];
+        packageRequires = [ emacs pkg-info ];
         meta = {
           homepage = "https://melpa.org/#/projectile";
           license = lib.licenses.free;
@@ -54645,8 +54939,8 @@
         src = fetchFromGitHub {
           owner = "christianromney";
           repo = "projectile-direnv";
-          rev = "33455b93576855065ba4ba9ed1b05dc36e692f1a";
-          sha256 = "09zyzfqy1i3i8knvh1ajr5jcidjx3jpsyx8qarxfr5kv16pwyfvj";
+          rev = "d5d29e5228f840b7a25358a2fd50353ef2dc9b16";
+          sha256 = "1bq47a6lckgin93cqy5wj277rlrw2cgfywgmbdpxvmbhygpg5hqr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/602485c251bc573e855dfd33e4e94052afbab93f/recipes/projectile-direnv";
@@ -54708,8 +55002,8 @@
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "038c7f9724f684c7862e108150e256a00ff9c5c6";
-          sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv";
+          rev = "4e5cecdf28e5c7a255648b246883adf6add987f6";
+          sha256 = "0wdbmsqw806qji12wwiw2blzldnpyj2lzqj3qcyxladq5w576xqs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -55002,8 +55296,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "0c0a8879c3dd7ee6925746d2206f3262689b5833";
-          sha256 = "1np5vkyzp5fjjzj8x3b55pj7mvanqsff726maj77mnixcs11vj7f";
+          rev = "a69bc9de75fe08f5fe7ad6e2339dfc5b0da5d8ef";
+          sha256 = "11b7wmzkm35bsbczhswl5495zz84ib2dm3syyyvyhbrgqrayppmq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -55745,8 +56039,8 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "7df8caaa3e1995018417ac2fd87afd89be6945ba";
-          sha256 = "0fj97k1h4yplz87pfcmbxcg7sam447k1rn6ggb227jlyvqbw30sm";
+          rev = "d78e0130720aba010a55e388ba16bd58debef828";
+          sha256 = "0my3a7h7v6x1b19d8fd6lpdzn32zav4nwpmc8f8pypf076kjaf82";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint";
@@ -55888,12 +56182,12 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20170219.809";
+        version = "20170307.457";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "52024dfb55354b3cc59f7115421bc130a7670c2d";
-          sha256 = "1v0qd7935nlxz7y9175xz8ygx1m6snd0nhgfs2k0bkfyv14ps5bg";
+          rev = "ac40376edcd2ca5a608f8aaa87b76fa020a2f3a3";
+          sha256 = "0z375bx4609c1p9bb1awvrzcqscmn4v5jzarkw9ps5y1r0770b1r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode";
@@ -56287,12 +56581,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170226.1906";
+        version = "20170308.1044";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "c50cd48edc74348bd89b09661ea325dac12fcb48";
-          sha256 = "1vxplnnp751lp4nm2vqdysr9b1ksqykrn6l02dn2priyy5hh29k4";
+          rev = "8cd8966db88de17d4c2f558540f1fe4b1b9e5a2e";
+          sha256 = "0lflbfrz90vkxmi33mw060vjimxsw6dr4fdpp2x38ykv97bwlpi1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -57378,12 +57672,12 @@
     refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }:
     melpaBuild {
         pname = "refine";
-        version = "20170219.807";
+        version = "20170311.114";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "refine";
-          rev = "9ac5ccaab861968ff54ce4a89efeb29ea3e4fae9";
-          sha256 = "1jqm4dmyzcknzpn6i00wgv1f7fa6acxg4b5vp6hzp8za8i9fzc6p";
+          rev = "e46948a3567a462094fcda227daa0f462e9f9120";
+          sha256 = "1damy0y5c4qnfvdmv9qzr7w6vs88dm71wsfv918p79a0drp7xrdb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine";
@@ -57733,10 +58027,10 @@
       }) {};
     replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "replace-plus";
-        version = "20170101.1119";
+        version = "20170307.942";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/replace+.el";
-          sha256 = "0cbm5g5d1d4bdfmx3nkldpq8k5ah0cz5ddq7cn4278rjx1h9ml5f";
+          sha256 = "0bbqmgz4grbg9g4kd5c85wn1icfgqapdkb2v7jmqwg4mc8s7piv5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+";
@@ -57920,12 +58214,12 @@
     restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restart-emacs";
-        version = "20170220.2245";
+        version = "20170306.2230";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "56f877fe86373df3eb048ac96d6deef7b9f60892";
-          sha256 = "1v4yvkp4f3rg8gi01y1gsfn7sikx4c3w0gisc3kdb3rs9kf1p8dd";
+          rev = "d7eacf44b643babce367076d91bef87cdf8e732e";
+          sha256 = "0gw5i62d74byj4zdas480cpylz9rnb4jishpzhpq1zvmdhh5sd0d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -58544,12 +58838,12 @@
     rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "rspec-mode";
-        version = "20170225.12";
+        version = "20170312.56";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "159afaf630be5fb13b3b0762f4c42ae6699dd143";
-          sha256 = "0pm0zzk7sdzvk3zwlqpkq5pg6p3kkny9a8104fpyszvd3f2ygsk2";
+          rev = "fe336636a57955b927b5994c8c738e21cacdc800";
+          sha256 = "07qjp6bb5rkcpbda7gb8g0zr2mr6cwplaspwc4ckidfcd8vzdn7b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode";
@@ -58569,8 +58863,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "ec6d0dcd9215fe9f29c7cf49685a60c3ebeeaf8d";
-          sha256 = "01br0l60ng8jx0wyvikjy96g6safdmr3vdr463jz61shif3xpirx";
+          rev = "606864f4e3f6e00426a69087b707cbc44d19404c";
+          sha256 = "1ga88cjjb91pma47r4hz3kg6080dk29lbvghlffh9x0r91w1y5pj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -58607,12 +58901,12 @@
     rubocop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rubocop";
-        version = "20170123.906";
+        version = "20170311.2211";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "rubocop-emacs";
-          rev = "d4dad3209f05288bdbe3a31f47794047b87fa424";
-          sha256 = "1w1mbp04sqsa4jl8ix05i8af9095zbblcjxkhgmj4x57s8yfsiap";
+          rev = "980bedb455e3551d35a212fae515c054888907c1";
+          sha256 = "152ara2p59imry2ymfnk5mycbc07rblcmfmqjgm5fijb2x94xv8p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00f2cf3e8e28bce5c26c86aba54390ffff48d7da/recipes/rubocop";
@@ -58631,7 +58925,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57789";
+          rev = "57962";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -58711,7 +59005,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57789";
+          rev = "57962";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59148,12 +59442,12 @@
     salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
     melpaBuild {
         pname = "salt-mode";
-        version = "20170128.424";
+        version = "20170313.725";
         src = fetchFromGitHub {
           owner = "glynnforrest";
           repo = "salt-mode";
-          rev = "28e72f05f2159f94d7fa3270eb35bfc1f06965df";
-          sha256 = "1dksmfvvza277dm245s9l8ydnbdqvl054hxsybynx05yb5c3sfgh";
+          rev = "e14ed8f2ce0ab7a783c4341879ec8c003e2b5c81";
+          sha256 = "19gw35qv13f2r4wif5fgqfhrph2r320n81faxx8980zds28x2q0x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode";
@@ -59316,12 +59610,12 @@
     sayid = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sayid";
-        version = "20170301.256";
+        version = "20170306.1733";
         src = fetchFromGitHub {
           owner = "bpiel";
           repo = "sayid";
-          rev = "5a85d5e98b7a23a1009dc089d604de9a32facedf";
-          sha256 = "1sxsf3f9rzlpm3pib39cdy4sbn2fg1l5k0iwcr3vpkrfiyzivbpd";
+          rev = "3e5456cade044f01eb0753aabc9e50868000bd14";
+          sha256 = "1asphbijh5y4ax03x1cn02l4ya8v44s23ani91a0d52msdaxbnyw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd2e05f9c9328d8f9ae434c86697a4a04af8b0d/recipes/sayid";
@@ -59362,8 +59656,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "14322d78b2be5148c2756d69e7a6c1e53b745569";
-          sha256 = "0ih1kahzr3n6rvmsv2jg9v1f5n119vn1qa6jjs27wpd39n3az3hj";
+          rev = "3a7dd67970c5ac57df24c40e18e77a99fd14e1c7";
+          sha256 = "0hk965ldfxybjjaw9sfyn4zw28178pdmaljk454y4y6xfnm2xcrw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -59920,10 +60214,10 @@
       }) {};
     second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "second-sel";
-        version = "20161210.820";
+        version = "20170307.946";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/second-sel.el";
-          sha256 = "0c9j1lbharzyvhvb6whcymra76y0nyqfnaw1s5qzd3xdq5c9sf7c";
+          sha256 = "1sgwza2ka3iqsajnppq2vd150h1wbkzzi04rk7bzpqj32dyh7gbx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel";
@@ -60001,12 +60295,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "20170115.237";
+        version = "20170309.543";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "001e205b37ae0dded430b9a809425dc7ed730366";
-          sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q";
+          rev = "09f7c7c75d8570909ecb45599d6f3ba75768321c";
+          sha256 = "0s6y3aqavc4lfqi84hkvbdyyjgw9j5n99272blj0878a0qmia658";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -60849,10 +61143,10 @@
       }) {};
     showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "showkey";
-        version = "20170101.1132";
+        version = "20170307.1528";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/showkey.el";
-          sha256 = "1mx48ly135wmqrr0srwnxby46b0mcnyw4vyd0jykih9ygd8kk4dj";
+          sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey";
@@ -61180,10 +61474,10 @@
     simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }:
     melpaBuild {
         pname = "simple-plus";
-        version = "20170101.1133";
+        version = "20170307.1529";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/simple+.el";
-          sha256 = "1z1l1lsddd865ma1q714hj4y9p89z1m3hr7z9fir53ipsa31cnl1";
+          sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+";
@@ -62182,12 +62476,12 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20170303.346";
+        version = "20170312.450";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "0c81107de550931466b11132b8c6286851615b5f";
-          sha256 = "1xmaxl7s8lh288vrqg6diakzldp615z41innkl13yjawnad4mxfk";
+          rev = "a212f777eea775a5c106b5022dea3bbb215bf98a";
+          sha256 = "19fpal1r0x11515s1lwgr5cjs0jk7pggfnv6y7jj4bvrvq87imnk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens";
@@ -62748,12 +63042,12 @@
     sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }:
     melpaBuild {
         pname = "sonic-pi";
-        version = "20170305.327";
+        version = "20170313.810";
         src = fetchFromGitHub {
           owner = "repl-electric";
           repo = "sonic-pi.el";
-          rev = "d2f6facaf012fc556498c90a4d1343fcb59a4628";
-          sha256 = "0hnjws9b4k0f6clcpcmvvlqnjkq09zrppkdylw334nhdbpkdhkxl";
+          rev = "494981aa8f7828392a930ef8533698944738090e";
+          sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0536c7e32ef145546e4014a1d418cbac8673eb5/recipes/sonic-pi";
@@ -63151,22 +63445,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    sparql-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sparql-mode";
-        version = "20161219.550";
+        version = "20170313.721";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "sparql-mode";
-          rev = "e5bedd0b1df135bb1e42b756da850dac5955aeb8";
-          sha256 = "11vpx9cq81ld6k4710nbvnfhpwq0v0bw0zg5aljr2j1pyfyh0pcs";
+          rev = "33da09b3895e03e64959005678d448ab82e527b6";
+          sha256 = "17fpfc0hc39y9h12mj62fwfga4mhk0c9fm2qnbnzf4i3ajhp7r2w";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
-        packageRequires = [ async cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://melpa.org/#/sparql-mode";
           license = lib.licenses.free;
@@ -63729,6 +64023,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ssass-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ssass-mode";
+        version = "20170310.2024";
+        src = fetchFromGitHub {
+          owner = "AdamNiederer";
+          repo = "ssass-mode";
+          rev = "c26852123436849367d826c370f24dd9f20cb501";
+          sha256 = "05wk2jfvzpzjpqz5vmv8b1yz8nnnix6lv9rh66vgddm794j92dkd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/3137f98aaa871a52f477b63d9c3b7b63f7271344/recipes/ssass-mode";
+          sha256 = "07aym4a7l70f1lb6yvwxkhsykrwbf0lcpwlwgcn5n44kavvdbzxm";
+          name = "ssass-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/ssass-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     ssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh";
@@ -64251,10 +64566,10 @@
       }) {};
     strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "strings";
-        version = "20170210.1925";
+        version = "20170307.1533";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/strings.el";
-          sha256 = "0am2w3p2igh0y5mdbmjfdzyrx3bngs4c3nibjjcky3pmvj4k3r4i";
+          sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings";
@@ -64477,10 +64792,10 @@
       }) {};
     subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "subr-plus";
-        version = "20170101.1138";
+        version = "20170307.1534";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/subr+.el";
-          sha256 = "057h7hshdvzm3qcwdnbyw0qb7ijw3jz38cff0n9ln4xgsma6cgm1";
+          sha256 = "191yqzkvvfnx8hx19ak20dvm9qjcm5r5yqcmnzw6nsc53m2pdwbx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/400c7aede8fee84660b5010eacb93536f1c0b0a4/recipes/subr+";
@@ -64977,8 +65292,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "e9219e7a7ed07965057e52e42bd56cc04fdffebc";
-          sha256 = "0yi5mpwsg2d5wmnqxs5fi9z2avzar47j1g5qw5ik2vxid9x7qf5m";
+          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
+          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -65224,10 +65539,10 @@
       }) {};
     synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "synonyms";
-        version = "20170101.1140";
+        version = "20170307.1537";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/synonyms.el";
-          sha256 = "0f1krqbmbdkpll6ggryblcr7gw0wqm3d9hvq145sdwhwi5jw8b4v";
+          sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fd538439982dd7bd281bf78e96373b93f4d4a6b8/recipes/synonyms";
@@ -65368,12 +65683,12 @@
     system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "system-packages";
-        version = "20170205.1305";
+        version = "20170311.2357";
         src = fetchFromGitHub {
           owner = "jabranham";
           repo = "system-packages";
-          rev = "5b3f7f5ae08d306604423f48e9a2ab5daaf58584";
-          sha256 = "0b7hjgxr6pv6dj3q233mxlm8ssxpvkhckibn0cfr5xb7ycfkd6rm";
+          rev = "ebfb6f9eb46c006a4488c1fbf9f46de48f5a788a";
+          sha256 = "199bmzxw6lrby6l9fgm01i92lvzzbz7sqpjrn9jjmpiwr718qxcf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages";
@@ -66537,10 +66852,10 @@
     thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
     melpaBuild {
         pname = "thing-cmds";
-        version = "20170101.1143";
+        version = "20170307.1538";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thing-cmds.el";
-          sha256 = "1qpszba6ajwqphhk39y6j4wlg7s5lch63lwfa9y28qipwkbn6zlq";
+          sha256 = "16bfjak7953mhmn7abd3pq8cqh8njir5x5x7acqs8zmd9n9qpni6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds";
@@ -66555,10 +66870,10 @@
       }) {};
     thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "thingatpt-plus";
-        version = "20170101.1144";
+        version = "20170307.1539";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thingatpt+.el";
-          sha256 = "0hb3fyqzq0312isid5vji0j74dmkh08p41sss32f4w60yhd8p19x";
+          sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+";
@@ -66641,8 +66956,8 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "431732d39e89f1661dc7dddffedb2c5c1e019cc7";
-          sha256 = "1mz2g5flz7yrsjzjfa9p6f5sinhd3xxf6nn3sjma7a9jcm626l7l";
+          rev = "6582757752e62efea3f9786dddf0260efaa1f450";
+          sha256 = "1c9miaq60d0l352yyxc2l3v927wzgadsyvfxyvs88qdk6pmz59ig";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift";
@@ -66658,10 +66973,10 @@
     thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "thumb-frm";
-        version = "20170101.1145";
+        version = "20170307.1540";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/thumb-frm.el";
-          sha256 = "19fiafq5nl29wr35l7nkzjs70fvnw0g27424x7xnm425gwaags8s";
+          sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm";
@@ -66698,12 +67013,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170303.1211";
+        version = "20170310.2151";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "616a93710a3bf882f75f61bd8f3438de698938c4";
-          sha256 = "19n1pc3igwbd1yz1cylnk46jvv723aab7505i8r7mw05zd5cnwpg";
+          rev = "70d859495d8bd76f338868f6fc1a89dbcabf7a2b";
+          sha256 = "0nd5lcs2lv5m0s56vga3d7j66zfy2w4dafv8g3jv3m3p5hll1dq4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67279,10 +67594,10 @@
       }) {};
     tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "tool-bar-plus";
-        version = "20170101.1147";
+        version = "20170307.1542";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/tool-bar+.el";
-          sha256 = "19ayc57vnv9348nfc10392kr4xd6wg0b6v2ya3x2zlpfsq3a6w2n";
+          sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+";
@@ -67531,12 +67846,12 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20170305.1155";
+        version = "20170312.1927";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "3c1b891f350a5c0b87d15d174203b9ba2bf3db2d";
-          sha256 = "0l2qqrxpfn4f0x9zdz0rsf5vw8238ycjmxnbjx7mcp3awm90pp46";
+          rev = "fd6334f795df409d8d854a0762ef2d2ac74556c0";
+          sha256 = "0mi3xrgsshds09j70mv42ngn1f702wswvrn4wm3xh8gv6sqfbz5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission";
@@ -68027,12 +68342,12 @@
     twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "twittering-mode";
-        version = "20160921.1038";
+        version = "20170312.735";
         src = fetchFromGitHub {
           owner = "hayamiz";
           repo = "twittering-mode";
-          rev = "08a810167d47852367e7e8d56916c794f7b0fd04";
-          sha256 = "15wghd8iiyrikahd7ayga9m0s993ghriwk44ylcycy3a6axaizmi";
+          rev = "63c96fb029033b1a300b90aa922e167c7c405bcb";
+          sha256 = "0kax42y0f1pa1pgybz3f57ig9g8fvmgcw8j7zl9nsw70dar4amqk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode";
@@ -68069,12 +68384,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20161130.1944";
+        version = "20170311.1208";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "3b0ace2a710cbe0a47617a2e4650f593c7282385";
-          sha256 = "15rghh1k657hiahaqb6isrxs1bwys220r0fzk7fxhv8jfbmb2a12";
+          rev = "ca510ab853feb45bb0a6fa5bfe01c96bb1da50ba";
+          sha256 = "11g98jy74bpkryb9y5kclndm1zv40rwg7cfpd782fp8f767f17rq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -68212,10 +68527,10 @@
       }) {};
     ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "ucs-cmds";
-        version = "20170101.1149";
+        version = "20170308.1512";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el";
-          sha256 = "0ql6qyzcj067vx2amwfh2m4vi056zf7qra4pkyskv829nxqg9mk8";
+          sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds";
@@ -68273,12 +68588,12 @@
     ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ujelly-theme";
-        version = "20170306.214";
+        version = "20170309.131";
         src = fetchFromGitHub {
           owner = "marktran";
           repo = "color-theme-ujelly";
-          rev = "69bbb941a6835137564b919109884d056429f2f0";
-          sha256 = "1dg642b8s9s0f97mqm7facqsg6lmaxi9nv0kpj33p58bqsjrq6hc";
+          rev = "c9ae717f38a7d01de30a8030f80032a5782aa88c";
+          sha256 = "0jx8rfm8jrpn7b8q0wkabjsnvlbzmgn2q60qscmvz1bggb01r9ak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme";
@@ -69911,10 +70226,10 @@
       }) {};
     w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "w32-browser";
-        version = "20170101.1154";
+        version = "20170308.1518";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/w32-browser.el";
-          sha256 = "0x30ldv2wbv3vhj85jss7hwf672m61f5r4z9l1sg3v0ibalqry45";
+          sha256 = "0pp3fl2r5g32qv8ysiwnznpc5na7cqh3vp5mq59yfhv5p6myayxj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser";
@@ -69930,10 +70245,10 @@
     w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "w32browser-dlgopen";
-        version = "20170101.1155";
+        version = "20170309.1433";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el";
-          sha256 = "1dv4l7rcm34p78cvyjv7b1lcc1d28pia18vj3swgnan9g1mi7zdf";
+          sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen";
@@ -70073,12 +70388,12 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20170204.530";
+        version = "20170309.1426";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "1a49ac05e9558edd4993d345c25cf2d166bfc17e";
-          sha256 = "1bvq0wwc013f6aapwql1rwv9r5nifgff2iwc17kaiwlwwqd6j70z";
+          rev = "40ea87cc62ac6d858235edf2e5d10e5867aa230e";
+          sha256 = "0kmw7rhx7d1a9vhabrfks5l95jafya4lw6yl937imkyxjb6kqdf5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust";
@@ -70304,12 +70619,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170225.1206";
+        version = "20170309.3";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "6e4d7e96f2a699c2df3056609584e586f4667b39";
-          sha256 = "10iwzjc697niwj0sqvazpi779ipsncpmn2pfy58lgglriq88ss8r";
+          rev = "b8b0dec9fb429012e530a36eb1aa918f84c6ee82";
+          sha256 = "1k7rzk04n7vw0dzxfl4fdlb88br1zxn8w3i2ld5abz2b0x87497p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -70786,10 +71101,10 @@
       }) {};
     wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "wid-edit-plus";
-        version = "20170101.1156";
+        version = "20170309.1434";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/wid-edit+.el";
-          sha256 = "0pzxarpwabbg67ajg340yrp1gqly8y71qrd5gcv9vjzgvvh9anws";
+          sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+";
@@ -70930,10 +71245,10 @@
       }) {};
     wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "wimpy-del";
-        version = "20161209.736";
+        version = "20170309.1436";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/wimpy-del.el";
-          sha256 = "19dsmchrgmrqnn0v81k3q6z0h3vnxx0wjyqzz27wc7ll1qrvjfyg";
+          sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del";
@@ -71092,10 +71407,10 @@
       }) {};
     window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "window-plus";
-        version = "20170101.1158";
+        version = "20170309.1437";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/window+.el";
-          sha256 = "06igqiwvnwm68k6gf9h85p4ppqab20sxl6qnxb57z8lpczpsssqa";
+          sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+";
@@ -71446,12 +71761,12 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "worf";
-        version = "20170225.405";
+        version = "20170306.1230";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "d543680243046f5f62d36f9e56debcfe414ba40a";
-          sha256 = "0hdd5yi6cnf7ry088wrq2xdm7f2hirhwrds56wvi0bdm9rizm6gs";
+          rev = "9dc5a0f5077e20ea3177376823a1fed18840d5f2";
+          sha256 = "076mz72qqfcbrs2gw9ng8gbzhr9kzc9mnjmv51n67dmd7hi5mmyc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf";
@@ -71761,12 +72076,12 @@
     xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-css-mode";
-        version = "20170116.919";
+        version = "20170312.151";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-css-mode";
-          rev = "ed4539971dd9c32752c7ff5a1d280150446bc769";
-          sha256 = "1nw7mwbiaq4i28his4l7hx1qrgqykr59sw1909s1l165ygl85jb2";
+          rev = "b710877056cc91641aff82d26af01db728131563";
+          sha256 = "0hmnbbdf2rsw24dspfbbdr0b0f4wlrrkw9pzc73dcn8y0pafavyg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode";
@@ -72703,12 +73018,12 @@
     yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yascroll";
-        version = "20150315.605";
+        version = "20170309.555";
         src = fetchFromGitHub {
           owner = "m2ym";
           repo = "yascroll-el";
-          rev = "f7743df1cf6d8e55607141d1ea5f50b562582c51";
-          sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5";
+          rev = "7b58febbc698e10b3714506a2ce09071fb172bff";
+          sha256 = "0zk8j1jbq2sba09kr8kn2mmsf2i78ng567s9823336b4s61279qx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll";
@@ -72724,12 +73039,12 @@
     yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20170226.1638";
+        version = "20170310.1724";
         src = fetchFromGitHub {
           owner = "joaotavora";
           repo = "yasnippet";
-          rev = "6e9b7f9432a87122cf9bb80a505be2fd9811a9cf";
-          sha256 = "0k5yv90530946zjs7xdq3017vcq688mz44r542l39hyd9skxq8ba";
+          rev = "7f337f4488da6e3ea4b92057ca1576d17bc51743";
+          sha256 = "0g1irdas5vvzjfrzvvzpz7kii52smn4aa58s6v10kchppxrrikzc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet";
@@ -72900,12 +73215,12 @@
     yoshi-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yoshi-theme";
-        version = "20170305.2158";
+        version = "20170307.906";
         src = fetchFromGitHub {
           owner = "ryuslash";
           repo = "yoshi-theme";
-          rev = "c76b1659a8e5cfccbdfcfe971ef6fcb3b7cd0263";
-          sha256 = "0k86b7lkkdlwd2570hc93ywbg60bxpx1axvzbvyvqiara7vq6njy";
+          rev = "7ab8df0bd646e0571a4d27cbaa4f62b60f625bad";
+          sha256 = "0qh8d14vpaj6hbhxv8zmr7sg85wfjqb2gf30b56lnrvkl783v50b";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6e9a549e31c4097ee24b4bff12ec5d20d3beac68/recipes/yoshi-theme";
@@ -73025,12 +73340,12 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20170306.429";
+        version = "20170306.2250";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "96f953cee3358fbc299662a3b3cbc087cb395b70";
-          sha256 = "0cp2n0a4g1x4py1ixf273k6nrymhxc4hy1ccvg0cv43jpka85xkf";
+          rev = "f031c785b469cf4356fddb997eccf60399e34235";
+          sha256 = "029955wp29wdrk1ddmhxixd76vhkp2li3mjaknw9d8iqz819vshc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme";
@@ -73275,10 +73590,10 @@
       }) {};
     zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "zones";
-        version = "20170101.1159";
+        version = "20170309.1440";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/zones.el";
-          sha256 = "1m88lqfmfayx2pj5ws14cfysf4pv8rm9v768x6xvsknjb4sl0q8l";
+          sha256 = "1mgfv9q4mwng0cqni13kmsridbfqsw66z5cgynlrvagga6v94bq0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones";
@@ -73315,10 +73630,10 @@
     zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "zoom-frm";
-        version = "20170101.1201";
+        version = "20170309.1439";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/zoom-frm.el";
-          sha256 = "1n16qx3ag9cdds04l4s2a79ijqg4k5gg1144vyn5p6ih10casw32";
+          sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm";
@@ -73460,11 +73775,11 @@
     zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }:
     melpaBuild {
         pname = "zpresent";
-        version = "20170305.2023";
+        version = "20170307.1646";
         src = fetchhg {
           url = "https://bitbucket.com/zck/zpresent.el";
-          rev = "d33bf30fd45c";
-          sha256 = "0wa2nw8q1pbmif1n7vxyzxf7zziwxdv60pa4rx1kxjnrd8aizzi7";
+          rev = "f79f9e8247da";
+          sha256 = "0mdajrwwcfgy6g330ca3s6a240wnj56ryag6h2ghwwclzy81nwdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent";

From f54813d7674ade872b8d79145d452d2d5011de87 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 13 Mar 2017 14:54:39 -0500
Subject: [PATCH 2232/3449] llvm4: rc4 -> release!

---
 pkgs/development/compilers/llvm/4/clang/default.nix  |  2 +-
 pkgs/development/compilers/llvm/4/default.nix        | 11 ++++-------
 pkgs/development/compilers/llvm/4/libc++/default.nix |  2 +-
 pkgs/development/compilers/llvm/4/libc++abi.nix      |  2 +-
 pkgs/development/compilers/llvm/4/lld.nix            |  2 +-
 pkgs/development/compilers/llvm/4/lldb.nix           |  2 +-
 pkgs/development/compilers/llvm/4/llvm.nix           |  2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index c0a33f03e0f2..88eafe983d3e 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -6,7 +6,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "062n17mfsn85dx3qy1qvq8rfxi7hcbr2nj70v2dah3xmy28i3yaq"}
+      unpackFile ${fetch "cfe" "12n99m60aa680cir3ql56s1jsv6lp61hq4w9rabf4c6vpn7gi9ff"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index aed77b7513ad..999ff858d020 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -3,18 +3,15 @@ let
   callPackage = newScope (self // { inherit stdenv isl release_version version fetch; });
 
   release_version = "4.0.0";
-  rc = "rc4";
-  version = "${release_version}${rc}";
+  version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
-    url = "http://llvm.org/pre-releases/${release_version}/${rc}/${name}-${version}.src.tar.xz";
-    # Once 4 is released, use this instead:
-    # url = "http://llvm.org/releases/${release-version}/${name}-${version}.src.tar.xz";
+    url = "http://llvm.org/releases/${release_version}/${name}-${version}.src.tar.xz";
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "1bxz2z9mxbx7211xfgsn5inwvpz53d1cqg76h8166dsli27xwkjm";
-  clang-tools-extra_src = fetch "clang-tools-extra" "0zkgnnv3srqxf44q4a5n3wpizf71mlq8w5rnwfwhdx777k94s5nx";
+  compiler-rt_src = fetch "compiler-rt" "059ipqq27gd928ay06f1ck3vw6y5h5z4zd766x8k0k7jpqimpwnk";
+  clang-tools-extra_src = fetch "clang-tools-extra" "16bwckgcxfn56mbqjlxi7fxja0zm9hjfa6s3ncm3dz98n5zd7ds1";
 
   self = {
     llvm = callPackage ./llvm.nix {
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 753aded54ff7..8e2c8eaa1768 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "052fc91y8084830ajfm8nkc0vghafhnfl7l89b68qsyz3ra93i3l";
+  src = fetch "libcxx" "15ngfcjc3pjakpwfq7d4n546jj0rgfdv5rpb1qv9xgv9mp236kag";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/4/libc++abi.nix b/pkgs/development/compilers/llvm/4/libc++abi.nix
index 23269f605f09..559b6b26bc52 100644
--- a/pkgs/development/compilers/llvm/4/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/4/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "02z8d0q42wfmnnd0rd1yg2x4y50rfrv1k9rq00a86b6803dc7p45";
+  src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw";
 
   buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
 
diff --git a/pkgs/development/compilers/llvm/4/lld.nix b/pkgs/development/compilers/llvm/4/lld.nix
index e62e50b2d316..549fa863c151 100644
--- a/pkgs/development/compilers/llvm/4/lld.nix
+++ b/pkgs/development/compilers/llvm/4/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "00wy4qczh4s6g49sbfmyk21845zx5qc2qpm39bznqz8ynpnh4phc";
+  src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k";
 
   buildInputs = [ cmake llvm ];
 
diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix
index 4fec3ad1a894..6e6fdf012dd6 100644
--- a/pkgs/development/compilers/llvm/4/lldb.nix
+++ b/pkgs/development/compilers/llvm/4/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "14dy1j48nw10w8brkpmla2vjjwfr1mrsl9wfabjfx1j85ywp3h69";
+  src = fetch "lldb" "0g83hbw1r4gd0z8hlph9i34xs6dlcc69vz3h2bqwkhb2qq2qzg9d";
 
   patchPhase = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index 1470e7d510fa..ac3fc6790d58 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  src = fetch "llvm" "1ljb5y5wgypk3sy8zcd5qdgsm5hw8vl7cy6874mbf4gnk9k809b1";
+  src = fetch "llvm" "1giklnw71wzsgbqg9wb5x7dxnbj39m6zpfvskvzvhwvfz4fm244d";
   shlib = if stdenv.isDarwin then "dylib" else "so";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib

From 369230cc760816fd2d7931bf05aac372b6bdea5a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Mar 2017 20:17:29 +0000
Subject: [PATCH 2233/3449] ocamlPackages.cpuid: init at 0.1.0

cpuid allows detection of CPU features from OCaml.

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

diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix
new file mode 100644
index 000000000000..1bdf70e86c5a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cpuid/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg, ocb-stubblr }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-cpuid-0.1.0";
+
+  src = fetchurl {
+    url = http://github.com/pqwy/cpuid/releases/download/v0.1.0/cpuid-0.1.0.tbz;
+    sha256 = "08k2558a3dnxn8msgpz8c93sfn0y027ganfdi2yvql0fp1ixv97p";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib ocamlbuild opam topkg ocb-stubblr ];
+
+  inherit (topkg) buildPhase installPhase;
+
+  meta = {
+    homepage = https://github.com/pqwy/cpuid;
+    description = "Detect CPU features from OCaml";
+    license = stdenv.lib.licenses.isc;
+    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 bb4d2abed22b..b695e0a073e6 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -138,6 +138,8 @@ let
 
     cppo = callPackage ../development/tools/ocaml/cppo { };
 
+    cpuid = callPackage ../development/ocaml-modules/cpuid { };
+
     cryptokit = callPackage ../development/ocaml-modules/cryptokit { };
 
     cstruct = callPackage ../development/ocaml-modules/cstruct {

From 5e701625de8d68c1436c71f69c098b33b0445808 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 12 Mar 2017 18:10:04 +0000
Subject: [PATCH 2234/3449] pythonPackages.first: init at 2.0.1

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

diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix
new file mode 100644
index 000000000000..5ecbff90442d
--- /dev/null
+++ b/pkgs/development/python-modules/first/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+let
+  pname = "first";
+  version = "2.0.1";
+in
+buildPythonPackage {
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pn9hl2y0pz61la1xhkdz6vl9i2dg3nh0ksizcf0f9ybh8sxxcrv";
+  };
+
+  doCheck = false; # no tests
+
+  meta = with stdenv.lib; {
+    description = "The function you always missed in Python";
+    homepage = https://github.com/hynek/first/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9260b8e73faa..9766255be73e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29044,6 +29044,8 @@ EOF
     };
   };
 
+  first = callPackage ../development/python-modules/first {};
+
   flaskbabel = buildPythonPackage rec {
     name = "Flask-Babel-0.11.1";
 

From 04290bbd143e36ef40cb97ae5a707f160f8f83c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 13 Mar 2017 18:16:38 -0300
Subject: [PATCH 2235/3449] mkvtoolnix: 9.8.0 -> 9.9.0 (#23827)

* mkvtoolnix: 9.8.0 -> 9.9.0

Starting with version 9.9.0 the man pages and their translations are
not pre-built and bundled with the source code. The tool "xsltproc"
and the DocBook XSL stylesheets for man pages are now required
dependencies to build them.
---
 pkgs/applications/video/mkvtoolnix/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index e8dc1227ef87..73d462a6f4d2 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoconf, automake
-, drake, ruby, file, xdg_utils, gettext, expat, qt5, boost
-, libebml, zlib, libmatroska, libogg, libvorbis, flac
+, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
+, libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt
 , withGUI ? true
 }:
 
@@ -10,16 +10,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "9.8.0";
+  version = "9.9.0";
 
   src = fetchFromGitHub {
     owner = "mbunkus";
     repo = "mkvtoolnix";
     rev = "release-${version}";
-    sha256 = "1hnk92ksgg290q4kwdl8jqrz7vzlwki4f85bb6kgdgzpjkblw76n";
+    sha256 = "1jiz23s52l3gpl84yx4yw3w445jqzcimvnvibvrv3a21k29hyik1";
   };
 
-  nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby ];
+  nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ];
 
   buildInputs = [
     expat file xdg_utils boost libebml zlib libmatroska libogg
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     "--disable-precompiled-headers"
     "--disable-static-qt"
     "--with-gettext"
+    "--with-docbook-xsl-root=${docbook_xsl}/share/xml/docbook-xsl"
     (enableFeature withGUI "qt")
   ];
 

From 7e9c815c23f9db7ddbd050f259c7d5233ac8e27c Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Mar 2017 22:17:08 +0100
Subject: [PATCH 2236/3449] libfilezilla: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 4df326e278cc..d6c0c538a8fe 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "0340v5xs48f28q2d16ldb9359dkzlhl4l449mgyv3qabnlz2pl21";
+    sha256 = "06ivj40bk5b76a36zwhnwqvg564hgccncnn5nb5cqc7kf4bkkchq";
   };
 
   meta = with stdenv.lib; {

From acef015a0ba9e16f36ea665bf766fa95993a5af6 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Mar 2017 22:18:03 +0100
Subject: [PATCH 2237/3449] filezilla: 3.24.0 -> 3.25.0

---
 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 984616173cb6..95e0c502749b 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.24.0"; in
+let version = "3.25.0"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1bacrl8lj90hqbh129hpbgqj78k1i84j83rkzn507jnykj4x8p9x";
+    sha256 = "1b1lb1zvm887xy3q9i5ziqvwk4ww2pd81a1msbwjrxzy5lq5ykhh";
   };
 
   configureFlags = [

From 88d7718a64d2f512b64f3d68a15761e2a237f912 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 13 Mar 2017 21:20:26 +0000
Subject: [PATCH 2238/3449] mkvtoolnix-cli: fix build on darwin

---
 pkgs/applications/video/mkvtoolnix/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 73d462a6f4d2..ce6935a26064 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libiconv
 , drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost
 , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt
 , withGUI ? true
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
     expat file xdg_utils boost libebml zlib libmatroska libogg
     libvorbis flac
-  ] ++ optional withGUI qt5.qtbase;
+  ]
+  ++ optional stdenv.isDarwin libiconv
+  ++ optional withGUI qt5.qtbase;
 
   preConfigure = "./autogen.sh; patchShebangs .";
   buildPhase   = "drake -j $NIX_BUILD_CORES";
@@ -48,6 +50,7 @@ stdenv.mkDerivation rec {
     homepage    = http://www.bunkus.org/videotools/mkvtoolnix/;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ codyopel fuuzetsu rnhmjoj ];
-    platforms   = platforms.linux;
+    platforms   = platforms.linux
+      ++ optionals (!withGUI) platforms.darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a35800184a5a..86058822f2a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8950,7 +8950,7 @@ with pkgs;
 
   mkvtoolnix = callPackage ../applications/video/mkvtoolnix { };
 
-  mkvtoolnix-cli = mkvtoolnix.override {
+  mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix {
     withGUI = false;
   };
 

From a3c03eb11fff8f0a0e6469890bcba8a6e5b96ae6 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 12 Mar 2017 18:10:19 +0000
Subject: [PATCH 2239/3449] pip-tools: init at 1.8.1rc3

---
 .../python-modules/pip-tools/default.nix      | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pip-tools/default.nix

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
new file mode 100644
index 000000000000..fe307513de7c
--- /dev/null
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, pip, pytest, click, six, first, glibcLocales }:
+buildPythonPackage rec {
+  pname = "pip-tools";
+  version = "1.8.1rc3";
+  name = "pip-tools-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "pip-tools";
+    rev = version;
+    sha256 = "09rbgzj71bfp1x1jfr1zx3vax4qjbw5l6vcd3fqvshsdvg9lcnpx";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+  buildInputs = [ pytest glibcLocales ];
+  propagatedBuildInputs = [ pip click six first ];
+
+  checkPhase = ''
+    export HOME=$(mktemp -d)
+    py.test -k "not test_realistic_complex_sub_dependencies" # requires network
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Keeps your pinned dependencies fresh";
+    homepage = https://github.com/jazzband/pip-tools/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9766255be73e..1bf736219f04 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18874,6 +18874,10 @@ in {
     };
   };
 
+  pip-tools = callPackage ../development/python-modules/pip-tools {
+    glibcLocales = pkgs.glibcLocales;
+  };
+
   pika = buildPythonPackage rec {
     name = "pika-${version}";
     version = "0.10.0";

From b806e25d65421d7aa0a524ce1601f0e51099df11 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 13 Mar 2017 17:34:33 -0400
Subject: [PATCH 2240/3449] nixos: build for aarch64-linux

---
 nixos/release-combined.nix | 2 +-
 nixos/release.nix          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 63ca39a9b602..1953fd1a26a7 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -4,7 +4,7 @@
 
 { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ]
 }:
 
 let
diff --git a/nixos/release.nix b/nixos/release.nix
index 8a5b41ca3bb3..0359d0907cca 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,6 +1,6 @@
 { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ]
 }:
 
 with import ../lib;

From f3dab1a1e9698d157163fb1e6916c1b7bbc775bb Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 11 Mar 2017 08:55:45 -0600
Subject: [PATCH 2241/3449] armadillo: 7.700.0 -> 7.800.0

armadillo: Added forgotton version update
---
 pkgs/development/libraries/armadillo/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 7f173b211565..bea592a6d20d 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,24 +1,25 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "7.700.0";
+  version = "7.800.1";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr";
+    sha256 = "1nxq2jp4jlvinynv0l04rpdzpnkzdsng0d5vi3hilc0hlsjnbnjs";
   };
 
-  buildInputs = [ cmake openblasCompat superlu hdf5 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openblasCompat superlu hdf5 ];
 
   cmakeFlags = [ "-DDETECT_HDF5=ON" ];
 
-  patches = [ ./use-unix-config-on-OS-X.patch ];
+ patches = [ ./use-unix-config-on-OS-X.patch ];
   
   meta = with stdenv.lib; {
     description = "C++ linear algebra library";
     homepage = http://arma.sourceforge.net;
-    license = licenses.mpl20;
+    license = licenses.apl2;
     platforms = platforms.unix;
     maintainers = with maintainers; [ juliendehos knedlsepp ];
   };

From 68a1dc63042f2d70c0fc90bf4d22da45ec391d8b Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Mar 2017 22:47:10 +0100
Subject: [PATCH 2242/3449] rustRegistry: 2017-02-19 -> 2017-03-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 faed3a218fc5..1659208f76f2 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-02-19";
-  rev = "d822c5853cb14caa5de84a71f6d4ed07ea5e31e1";
-  sha256 = "18m0smlqw3vkn0ljk01l333jj0x32m8rr1dgmpnq621vqvpk5mzp";
+  version = "2017-03-13";
+  rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82";
+  sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb";
 
   src = fetchFromGitHub {
       inherit rev;

From 363cfbd23dd6653a12fd2a5deba97befe8816426 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Mar 2017 22:48:38 +0100
Subject: [PATCH 2243/3449] ripgrep: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix
index 7ba43e38f382..e0bd0d3711f7 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.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = "${version}";
-    sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
+    sha256 = "13mg624867hqxp9pzpq1gn9kqkvbaqcphdjia3bz5wvff1cbxkfy";
   };
 
-  depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+  depsSha256 = "0glw8xk77w2h1xg6c451fg8cmwx3vz7dyzdrbf0i8d84yq8sh0i1";
 
   meta = with stdenv.lib; {
     description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";

From 61e8c0370d55cd9083e3dac85cf466633758ade0 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 13 Mar 2017 23:01:35 +0100
Subject: [PATCH 2244/3449] bluefish: 2.2.9 -> 2.2.10

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

diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix
index 59e8076c787b..1c2e3a425782 100644
--- a/pkgs/applications/editors/bluefish/default.nix
+++ b/pkgs/applications/editors/bluefish/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "bluefish-2.2.9";
+  name = "bluefish-2.2.10";
 
   src = fetchurl {
     url = "mirror://sourceforge/bluefish/${name}.tar.bz2";
-    sha256 = "1l7pg6h485yj84i34jr09y8qzc1yr4ih6w5jdhmnrg156db7nwav";
+    sha256 = "1ciygj79q6i3ga5x1j8aivc05nh6rhhnm7hrq8q8xd9vd4ms3v5g";
   };
 
   nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];

From 4aee4cc8a5a4d99e6013c667e01409be3123e395 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 13 Mar 2017 17:11:03 -0500
Subject: [PATCH 2245/3449] htmlcxx: 0.85 -> 0.86

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

diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
index 6557d8f80410..1537f9cc480b 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -2,19 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "htmlcxx-${version}";
-  version = "0.85";
+  version = "0.86";
 
   src = fetchurl {
     url = "mirror://sourceforge/htmlcxx/htmlcxx/${version}/${name}.tar.gz";
-    sha256 = "1rdsjrcjkf7mi3182lq4v5wn2wncw0ziczagaqnzi0nwmp2a00mb";
+    sha256 = "1hgmyiad3qgbpf2dvv2jygzj6jpz4dl3n8ds4nql68a4l9g2nm07";
   };
 
   patches = [ ./ptrdiff.patch ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://htmlcxx.sourceforge.net/;
-    description = "htmlcxx is a simple non-validating css1 and html parser for C++";
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.linux;
+    description = "A simple non-validating css1 and html parser for C++";
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
   };
 }

From 36bb2839410d425f9ad6560be2aed5475b204778 Mon Sep 17 00:00:00 2001
From: Thomas Bach <t.bach@ilexius.de>
Date: Mon, 13 Mar 2017 23:17:03 +0100
Subject: [PATCH 2246/3449] haproxy: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 1b917019662a..3b7a68fb972f 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   pname = "haproxy";
   majorVersion = "1.7";
-  minorVersion = "2";
+  minorVersion = "3";
   version = "${majorVersion}.${minorVersion}";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://www.haproxy.org/download/${majorVersion}/src/${name}.tar.gz";
-    sha256 = "0bsb5q3s1k5gqybv5p8zyvl6zh8iyidv3jb3wfmgwqad5bsl0nzr";
+    sha256 = "ebb31550a5261091034f1b6ac7f4a8b9d79a8ce2a3ddcd7be5b5eb355c35ba65";
   };
 
   buildInputs = [ openssl zlib ];

From dff0ba38a243603534c99f2cf1af81c793cad98e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 14 Mar 2017 00:30:01 +0200
Subject: [PATCH 2247/3449] bash: Set bash_cv_getcwd_malloc=yes when cross
 compiling

Because if you don't, the configure script assumes that your getcwd()
function is broken. Which then makes bash use it's own getcwd()
implementation, which doesn't work if the path to the current directory
contains bind mounts in its paths. This shows up as:

shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor

... and fails the aarch64 glibc build with sandboxes enabled.

Sigh.
---
 pkgs/shells/bash/4.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 7dbb18324972..682123d924e0 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     configureFlags = baseConfigureFlags +
-      " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" +
+      " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes" +
       optionalString stdenv.isCygwin ''
         --without-libintl-prefix --without-libiconv-prefix
         --with-installed-readline

From 46c9eac980e1d879d62c25499544c402feff3066 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 13 Mar 2017 23:23:09 +0100
Subject: [PATCH 2248/3449] guile: enable parallel building

civodul today on irc said that 2.0.13 likely has the parallel building
issue fixed (case equal-or-over 8 cores). Let's try.
---
 pkgs/development/interpreters/guile/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 6b4e6c2a7288..04f31dda26a0 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -30,9 +30,7 @@
   # A native Guile 2.0 is needed to cross-build Guile.
   selfNativeBuildInput = true;
 
-  # Guile 2.0.11 repeatable fails with 8-core parallel building because
-  # libguile/vm-i-system.i is not created in time
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
     (fetchpatch {

From 57463868db1f2955399da0309e062439b0d6a8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 14 Mar 2017 00:01:04 +0100
Subject: [PATCH 2249/3449] top-level llvm-4 attrs: drop lowPrio

Now the packages are properly released.
---
 pkgs/top-level/all-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a35800184a5a..9018e5044087 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4782,7 +4782,7 @@ with pkgs;
 
   clang = llvmPackages.clang;
 
-  clang_4 = lowPrio llvmPackages_4.clang;
+  clang_4  = llvmPackages_4.clang;
   clang_39 = llvmPackages_39.clang;
   clang_38 = llvmPackages_38.clang;
   clang_37 = llvmPackages_37.clang;
@@ -5338,13 +5338,13 @@ with pkgs;
 
   lizardfs = callPackage ../tools/filesystems/lizardfs { };
 
-  lld = lowPrio llvmPackages_4.lld;
+  lld = llvmPackages_4.lld;
 
   lldb = llvmPackages.lldb;
 
   llvm = llvmPackages.llvm;
 
-  llvm_4 = lowPrio llvmPackages_4.llvm;
+  llvm_4  = llvmPackages_4.llvm;
   llvm_39 = llvmPackages_39.llvm;
   llvm_38 = llvmPackages_38.llvm;
   llvm_37 = llvmPackages_37.llvm;

From 64218d61fc0b66722b1c97bab07cd1569d2d0471 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 13 Mar 2017 18:44:28 -0500
Subject: [PATCH 2250/3449] hwloc: 1.11.2 -> 1.11.6 (#23870)

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

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index 5d07cfe3a2bb..e1acacc328cc 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, pkgconfig, cairo, expat, ncurses, libX11
 , pciutils, numactl }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "hwloc-1.11.2";
+  name = "hwloc-1.11.6";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
-    sha1 = "3d68de060808f04349538be4e63cde501cd53b0a";
+    sha256 = "1yl7dm2qplwmnidd712zy12qfvxk28k8ccs694n42ybwdjwzg1bn";
   };
 
   # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
@@ -16,17 +18,17 @@ stdenv.mkDerivation rec {
   # derivation and set optional dependencies to `null'.
   buildInputs = stdenv.lib.filter (x: x != null)
    ([ expat ncurses ]
-     ++  (stdenv.lib.optionals (!stdenv.isCygwin) [ cairo libX11 ])
-     ++  (stdenv.lib.optionals stdenv.isLinux [ numactl ]));
+     ++  (optionals (!stdenv.isCygwin) [ cairo libX11 ])
+     ++  (optionals stdenv.isLinux [ numactl ]));
 
   propagatedBuildInputs =
     # Since `libpci' appears in `hwloc.pc', it must be propagated.
-    stdenv.lib.optional stdenv.isLinux pciutils;
+    optional stdenv.isLinux pciutils;
 
   enableParallelBuilding = true;
 
   postInstall =
-    stdenv.lib.optionalString (stdenv.isLinux && numactl != null)
+    optionalString (stdenv.isLinux && numactl != null)
       '' if [ -d "${numactl}/lib64" ]
          then
              numalibdir="${numactl}/lib64"
@@ -43,9 +45,8 @@ stdenv.mkDerivation rec {
   # fail on some build machines.
   doCheck = false;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Portable abstraction of hierarchical architectures for high-performance computing";
-
     longDescription = ''
        hwloc provides a portable abstraction (across OS,
        versions, architectures, ...) of the hierarchical topology of
@@ -64,9 +65,7 @@ stdenv.mkDerivation rec {
 
     # http://www.open-mpi.org/projects/hwloc/license.php
     license = licenses.bsd3;
-
     homepage = http://www.open-mpi.org/projects/hwloc/;
-
     maintainers = [ ];
     platforms = platforms.all;
   };

From 56fea1a8c08542e82035b0d4a6a772c2ea717424 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 13 Mar 2017 20:00:58 -0400
Subject: [PATCH 2251/3449] gradle: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 8d119371aa86..28b6601cab6f 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";
+    name = "gradle-3.4.1";
     nativeVersion = "0.13";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "0192yz1j59mvn6d3sch0yjx6i2fg4nyppkdpbqbbxqymrm6wvl3j";
+      sha256 = "1cpria3qry4778pxcmqvnaqcyq36abj1fgw4pq115k3rsj9v27fv";
     };
   };
 

From dd015a829fd7a47fc1609cd133a13bf80eb7838f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 13 Mar 2017 20:03:39 -0400
Subject: [PATCH 2252/3449] kotlin: 1.0.6 -> 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 0f2f3d12a1ce..33921ef02cd7 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.6";
+  version = "1.1";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "1dhliqd79hydd62xmrn2nwrcqy7lb5svkahkkpx9w3z9s5r0p8j2";
+    sha256 = "179m5y56fi50qvxsm075h0547swib7n2pfdn8a4axk9wpwldni5a";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 435b8ed1fc6f6e99ef80dbc16d794b97b7be5d23 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 13 Mar 2017 20:07:14 -0400
Subject: [PATCH 2253/3449] oh-my-zsh: 2017-02-20 -> 2017-02-27

---
 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 21e409b727b7..25dec429ff08 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-20";
+  version = "2017-02-27";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "98d8d3429f8b9fc2c4c109fb199a31c8d1735699";
-    sha256 = "1zdjb5dsbr8n7jfmib4a6rhcx9wrp5lw4b8b9xrh164s97hza2d0";
+    rev = "b908feebcfb0ca8a9a80360d177e716c24c317d6";
+    sha256 = "0b7gir2llv5212nwh9arzva2p714s39qzgk385s9pmalhspfc6c1";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 9ac82a773c9b4369bad77dc2dc24454c1afe2a34 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 13 Mar 2017 20:15:26 -0400
Subject: [PATCH 2254/3449] linux: 4.4.52 -> 4.4.53

---
 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 fba52eeaee5b..9c583fe30f88 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.52";
+  version = "4.4.53";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "01hz3g7j1m8dis6pyy9p8pi5ixl32g6cvgav0i7a7qbkrspdvlp8";
+    sha256 = "1rpkrlspxs3kfks0vg4dz8n570hpwdw5zymy9g2ky5vwskawvzky";
   };
 
   kernelPatches = args.kernelPatches;

From 18684a4892bc202590a51a8bee251dc1b4fcf3b7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 13 Mar 2017 20:15:42 -0400
Subject: [PATCH 2255/3449] linux: 4.1.38 -> 4.1.39

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 9c7354024ada..30c5ce7e569b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.38";
+  version = "4.1.39";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0mmx11z1wlnlaw2nhpdw76xzmqmfr8q52dv0jvy0pjq8rcbk3hmq";
+    sha256 = "0m48slb13ipnjnw4inhyb74xxpla94344wbc2y5lzb402n5jrs58";
   };
 
   kernelPatches = args.kernelPatches;

From 706bd194c7654bb0d5349305b5c9278748f794e0 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 13 Mar 2017 20:29:03 -0500
Subject: [PATCH 2256/3449] iso-codes: 3.56 -> 3.74

---
 .../libraries/iso-codes/default.nix            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix
index 9477aca59733..ed742888a0ef 100644
--- a/pkgs/development/libraries/iso-codes/default.nix
+++ b/pkgs/development/libraries/iso-codes/default.nix
@@ -1,24 +1,24 @@
-{stdenv, fetchurl, gettext, python, xz}:
+{stdenv, fetchurl, gettext, python3, xz}:
 
 stdenv.mkDerivation rec {
-  name = "iso-codes-3.56";
+  name = "iso-codes-3.74";
+
   src = fetchurl {
     url = "http://pkg-isocodes.alioth.debian.org/downloads/${name}.tar.xz";
-    sha256 = "0vnfygd03jg21i7r238n450wy2hp354f3ank0v3k34zchbjydl2m";
+    sha256 = "1vkaxkcx8h8lbg3z3jjfjs1x1rz1l01j6ll46ysza2gym37g7x11";
   };
   patchPhase = ''
     for i in `find . -name \*.py`
     do
-        sed -i -e "s|#!/usr/bin/env python|#!${python}/bin/python|" $i
+        sed -i -e "s|#!/usr/bin/env python|#!${python3}/bin/python|" $i
     done
   '';
-  buildInputs = [ gettext ];
-  nativeBuildInputs = [ xz ];
+  buildInputs = [ gettext python3 ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://pkg-isocodes.alioth.debian.org/;
     description = "Various ISO codes packaged as XML files";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.urkud ];
+    platforms = platforms.all;
   };
 }

From 25e75cd5805fe427b1588ed87b108a29cfb81e80 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Mon, 13 Mar 2017 22:20:38 -0400
Subject: [PATCH 2257/3449] kube-aws: 0.8.1 -> 0.9.4

Also, enable on Darwin
---
 pkgs/development/tools/kube-aws/default.nix | 22 +++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix
index 0a6d0ba32210..11f4a5c8bd0a 100644
--- a/pkgs/development/tools/kube-aws/default.nix
+++ b/pkgs/development/tools/kube-aws/default.nix
@@ -4,20 +4,26 @@ with lib;
 
 buildGoPackage rec {
   name = "kube-aws-${version}";
-  version = "0.8.1";
+  version = "0.9.4";
 
-  goPackagePath = "github.com/coreos/coreos-kubernetes";
+  goPackagePath = "github.com/coreos/kube-aws";
 
   src = fetchFromGitHub {
     owner = "coreos";
-    repo = "coreos-kubernetes";
+    repo = "kube-aws";
     rev = "v${version}";
-    sha256 = "067nc525km0f37w5km44fs5pr22a6zz3lkdwwg2akb4hhg6f45c2";
+    sha256 = "11h14fsnflbx76rmpp0fxahbxi2qgcamgyxy9s4rmw83j2m8csxp";
   };
 
-  preBuild = ''
-    (cd go/src/github.com/coreos/coreos-kubernetes
-     go generate multi-node/aws/pkg/config/config.go)
+  preBuild = ''(
+    cd go/src/${goPackagePath}
+    go generate ./core/controlplane/config
+    go generate ./core/nodepool/config
+    go generate ./core/root/config
+  )'';
+
+  buildFlagsArray = ''
+    -ldflags=-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version}
   '';
 
   meta = {
@@ -25,6 +31,6 @@ buildGoPackage rec {
     license = licenses.asl20;
     homepage = https://github.com/coreos/coreos-kubernetes;
     maintainers = with maintainers; [offline];
-    platforms = with platforms; linux;
+    platforms = with platforms; unix;
   };
 }

From 24b47526ce38e3ccb073c776b32c0ea220f3c0f2 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 13 Mar 2017 22:17:29 -0400
Subject: [PATCH 2258/3449] callCabal2nix: Don't rebuild unchanged cabal file

It can be quite annoying that callCabal2nix will build a new derivation
if anything in the source has changed, even if the cabal file hasn't.
---
 pkgs/development/haskell-modules/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index df17c769ea2d..6d15d5966245 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -84,7 +84,14 @@ 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: self.callPackage (haskellSrc2nix { inherit src name; });
+        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.
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From d4294265fd1fe752884d8d2c2cfa40f8bead6e80 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 8 Mar 2017 00:06:04 +0000
Subject: [PATCH 2259/3449] virt-viewer: 2.0 -> 5.0

---
 .../virtualization/virt-viewer/default.nix            | 11 ++++++-----
 pkgs/development/libraries/spice-gtk/default.nix      |  4 ++--
 pkgs/top-level/all-packages.nix                       |  4 +---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index f63eeb603068..b8de872d6ff4 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,6 +1,6 @@
 { 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
+, gsettings_desktop_schemas, makeWrapper, xen, numactl, libvirt-glib
 , spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
 }:
 
@@ -11,19 +11,20 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   baseName = "virt-viewer";
-  version = "2.0";
+  version = "5.0";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
-    sha256 = "0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9";
+    sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b";
   };
 
   buildInputs = [
     pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
     shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
-    xen numactl
-  ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
+    numactl libvirt-glib
+  ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm
+  ] ++ optional (stdenv.system == "x86_64-linux") xen;
 
   postInstall = ''
     for f in "$out"/bin/*; do
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 325d665aaf65..240de378afc7 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 let
   inherit (python2Packages) python pygtk;
 in stdenv.mkDerivation rec {
-  name = "spice-gtk-0.32";
+  name = "spice-gtk-0.33";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2";
-    sha256 = "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c";
+    sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f3766915e33..a27378e1f77c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15718,9 +15718,7 @@ with pkgs;
     inherit (lua52Packages) lpeg;
   };
 
-  virt-viewer = callPackage ../applications/virtualization/virt-viewer {
-    spice_gtk = spice_gtk;
-  };
+  virt-viewer = callPackage ../applications/virtualization/virt-viewer { };
 
   virt-top = callPackage ../applications/virtualization/virt-top {
     ocamlPackages = ocamlPackages_4_01_0;

From 1e8476c5b61c7d8b249738bee2128fb1ef49f7e2 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Tue, 14 Mar 2017 18:40:21 +1300
Subject: [PATCH 2260/3449] links2: build on all unix platforms

---
 .../networking/browsers/links2/default.nix            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index be2a836a085c..befe3cb21f93 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -16,10 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "1f24y83wa1vzzjq5kp857gjqdpnmf8pb29yw7fam0m8wxxw0c3gp";
   };
 
-  buildInputs =
-    [ libev librsvg libpng libjpeg libtiff gpm openssl xz bzip2 zlib ]
-    ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
-    ++ stdenv.lib.optional enableDirectFB [ directfb ];
+  buildInputs = with stdenv.lib;
+    [ libev librsvg libpng libjpeg libtiff openssl xz bzip2 zlib ]
+    ++ optionals stdenv.isLinux [ gpm ]
+    ++ optionals enableX11 [ libX11 libXau libXt ]
+    ++ optional enableDirectFB [ directfb ];
 
   nativeBuildInputs = [ pkgconfig bzip2 ];
 
@@ -39,6 +40,6 @@ stdenv.mkDerivation rec {
     homepage = http://links.twibright.com/;
     description = "A small browser with some graphics support";
     maintainers = with maintainers; [ raskin urkud viric ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 8498f979a1297a1392bb90b22ec329c8112905db Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 14 Mar 2017 07:55:34 +0000
Subject: [PATCH 2261/3449] ocaml-top: 1.1.2 -> 1.1.3

---
 .../tools/ocaml/ocaml-top/default.nix           | 17 ++++++++---------
 pkgs/top-level/all-packages.nix                 |  2 +-
 pkgs/top-level/ocaml-packages.nix               |  2 --
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index 5f3a2b884b16..e194a77fbe81 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchzip, ncurses
-, ocaml, ocpBuild, findlib, lablgtk, ocp-index
+, ocamlPackages
 , opam }:
 
 stdenv.mkDerivation {
-  name = "ocaml-top-1.1.2";
+  name = "ocaml-top-1.1.3";
   src = fetchzip {
-    url = https://github.com/OCamlPro/ocaml-top/archive/1.1.2.tar.gz;
-    sha256 = "10wfz8d6c1lbh31kayvlb5fj7qmgh5c6xhs3q595dnf9skrf091j";
+    url = https://github.com/OCamlPro/ocaml-top/archive/1.1.3.tar.gz;
+    sha256 = "0islyinv7lwhg8hkg4xn30wwz1nv50rj0wpsis8jpimw6jdsnax3";
   };
 
-  buildInputs = [ ncurses opam ocaml ocpBuild findlib lablgtk ocp-index ];
+  buildInputs = [ ncurses opam ]
+  ++ (with ocamlPackages; [ ocaml ocpBuild findlib lablgtk ocp-index ]);
 
   configurePhase = ''
     export TERM=xterm
@@ -18,15 +19,13 @@ stdenv.mkDerivation {
 
   buildPhase = "ocp-build ocaml-top";
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ocaml-top.install | sh
-  '';
+  installPhase = "opam-installer --prefix=$out";
 
   meta = {
     homepage = http://www.typerex.org/ocaml-top.html;
     license = stdenv.lib.licenses.gpl3;
     description = "A simple cross-platform OCaml code editor built for top-level evaluation";
-    platforms = ocaml.meta.platforms or [];
+    platforms = ocamlPackages.ocaml.meta.platforms or [];
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f3766915e33..2cc3e21d84f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5452,7 +5452,7 @@ with pkgs;
 
   ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { };
 
-  inherit (ocamlPackages) ocaml-top;
+  ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
 
   opa = callPackage ../development/compilers/opa {
     nodejs = nodejs-4_x;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b695e0a073e6..2a59dbd3293f 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -752,8 +752,6 @@ let
 
     haxe = callPackage ../development/compilers/haxe { };
 
-    ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
-
     ocamlnat = callPackage  ../development/ocaml-modules/ocamlnat { };
 
     trv = callPackage ../development/tools/misc/trv { };

From a6be98c9c116ff578f21c99a09544ee335884a64 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Mon, 13 Mar 2017 11:49:30 +0100
Subject: [PATCH 2262/3449] qt57.{qtdeclarative,qtscript,qttranslations}: fix
 darwin compat

Fixes duplicate linkings issue for Qt-Frameworks provided by qtbase
during configurePhase.
---
 pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
index 977c859e76d3..aa2d24a741ca 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
@@ -135,10 +135,14 @@ qt5LinkModuleDir() {
 
 qt5LinkDarwinModuleLibDir() {
   for fw in $(find "$1"/lib -maxdepth 1 -name '*.framework'); do
+    if [ ! -L "$fw" ]; then
       ln -s "$fw" "$NIX_QT5_TMP"/lib
+    fi
   done
   for file in $(find "$1"/lib -maxdepth 1 -type f); do
+    if [ ! -L "$file" ]; then
       ln -s "$file" "$NIX_QT5_TMP"/lib
+    fi
   done
   for dir in $(find "$1"/lib -maxdepth 1 -mindepth 1 -type d ! -name '*.framework'); do
       mkdir -p "$NIX_QT5_TMP"/lib/$(basename "$dir")
@@ -178,4 +182,3 @@ _qtFixCMakePaths() {
 if [ -n "$NIX_QT_SUBMODULE" ]; then
     postInstallHooks+=(_qtFixCMakePaths)
 fi
-

From d46fe334ca9c556ebc481c443330f7603658034b Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 15:00:42 -0500
Subject: [PATCH 2263/3449] ffmpegthumbnailer: 2.0.10 -> 2.2.0

---
 .../libraries/ffmpegthumbnailer/default.nix       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
index df1c532f6330..c6167252866a 100644
--- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix
+++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix
@@ -1,16 +1,19 @@
-{ pkgs, fetchurl, stdenv, ffmpeg, cmake, libpng, pkgconfig
+{ pkgs, fetchFromGitHub, stdenv, ffmpeg, cmake, libpng, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
   name = "ffmpegthumbnailer-${version}";
-  version = "2.0.10";
+  version = "2.2.0";
 
-  src = fetchurl {
-    url = "https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "0q7ws7ysw2rwr6ja8rhdjcc7x1hrlga7n514wi4lhw1yma32q0m3";
+  src = fetchFromGitHub {
+    owner = "dirkvdb";
+    repo = "ffmpegthumbnailer";
+    rev = version;
+    sha256 = "0kl8aa547icy9b05njps02a8sw4yn4f8fzs228kig247sn09s4cp";
   };
 
-  buildInputs = [ ffmpeg cmake libpng pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ ffmpeg libpng ];
 
   meta = with stdenv.lib;  {
     homepage = https://github.com/dirkvdb/ffmpegthumbnailer;

From f09a73896b93527a4e1d6480432805bfe243c27e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 16:45:05 +0800
Subject: [PATCH 2264/3449] crudini: init at 0.9

---
 pkgs/tools/misc/crudini/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/crudini/default.nix

diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
new file mode 100644
index 000000000000..ead18f8c31f2
--- /dev/null
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+  name = "crudini-${version}";
+  version = "0.9";
+
+  src = fetchFromGitHub {
+    owner  = "pixelb";
+    repo   = "crudini";
+    rev    = version;
+    sha256 = "0x9z9lsygripj88gadag398pc9zky23m16wmh8vbgw7ld1nhkiav";
+  };
+
+  propagatedBuildInputs = with python2Packages; [ iniparse ];
+
+  meta = with stdenv.lib; {
+    description = "A utility for manipulating ini files ";
+    homepage = http://www.pixelbeat.org/programs/crudini/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2cc3e21d84f2..182fcc617bb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -798,6 +798,8 @@ with pkgs;
 
   crunch = callPackage ../tools/security/crunch { };
 
+  crudini = callPackage ../tools/misc/crudini { };
+
   daemontools = callPackage ../tools/admin/daemontools { };
 
   dante = callPackage ../servers/dante { };

From 648db95651e99e5e2ce938bf5e776fc9f512c81a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 14 Mar 2017 12:28:36 +0300
Subject: [PATCH 2265/3449] python.pkgs.bleach: 1.5.0 -> 2.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a3debdf48b7..c8a52d3b4a48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2898,7 +2898,7 @@ in {
     };
   };
 
-  # Needed for bleach 1.5.0 and calibre 2.76.0
+  # Needed for FlexGet 1.2.337 and calibre 2.76.0
   html5lib_0_9999999 = self.html5lib.override rec {
     name = "html5lib-${version}";
     buildInputs = with self; [ nose flake8 ];
@@ -2916,21 +2916,16 @@ in {
 
   bleach = buildPythonPackage rec {
     pname = "bleach";
-    version = "1.5.0";
+    version = "2.0.0";
     name = "${pname}-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "978e758599b54cd3caa2e160d74102879b230ea8dc93871d0783721eef58bc65";
+      sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr";
     };
 
     buildInputs = with self; [ pytest pytestrunner ];
-    propagatedBuildInputs = with self; [ six html5lib_0_9999999 ];
-
-    postPatch = ''
-      substituteInPlace setup.py --replace "==3.0.3" ""
-      substituteInPlace setup.py --replace ">=0.999,!=0.9999,!=0.99999,<0.99999999" ""
-    '';
+    propagatedBuildInputs = with self; [ six html5lib ];
 
     meta = {
       description = "An easy, HTML5, whitelisting HTML sanitizer";

From a312abedeb1b935829f2b76e6bbaa494fbcf3f25 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 10:49:39 +0100
Subject: [PATCH 2266/3449] hypothesis: disabled for Python 3.3

---
 pkgs/development/python-modules/hypothesis.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/hypothesis.nix b/pkgs/development/python-modules/hypothesis.nix
index e961d56abcb6..271251b830e1 100644
--- a/pkgs/development/python-modules/hypothesis.nix
+++ b/pkgs/development/python-modules/hypothesis.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python
-, pythonOlder, enum34
+, pythonOlder, pythonAtLeast, enum34
 , doCheck ? true, pytest, flake8, flaky
 }:
 buildPythonPackage rec {
@@ -30,6 +30,10 @@ buildPythonPackage rec {
     ${python.interpreter} -m pytest tests/cover
   '';
 
+  # Unsupport by upstream on certain versions
+  # https://github.com/HypothesisWorks/hypothesis-python/issues/477
+  disabled = pythonOlder "3.4" && pythonAtLeast "2.8";
+
   meta = with stdenv.lib; {
     description = "A Python library for property based testing";
     homepage = https://github.com/DRMacIver/hypothesis;

From 638e1b82439e77e2d195ca768296dfd7ff3f35ff Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 13 Mar 2017 16:53:54 -0400
Subject: [PATCH 2267/3449] nixos: Add a menu launcher for the NixOS manual

---
 nixos/modules/services/misc/nixos-manual.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 306ee346523d..622607f3b32d 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -41,7 +41,7 @@ let
 
   entry = "${manual.manual}/share/doc/nixos/index.html";
 
-  help = pkgs.writeScriptBin "nixos-help"
+  helpScript = pkgs.writeScriptBin "nixos-help"
     ''
       #! ${pkgs.stdenv.shell} -e
       browser="$BROWSER"
@@ -58,6 +58,15 @@ let
       exec "$browser" ${entry}
     '';
 
+  desktopItem = pkgs.makeDesktopItem {
+    name = "nixos-manual";
+    desktopName = "NixOS Manual";
+    genericName = "View NixOS documentation in a web browser";
+    # TODO: find a better icon (Nix logo + help overlay?)
+    icon = "system-help";
+    exec = "${helpScript}/bin/nixos-help";
+    categories = "System";
+  };
 in
 
 {
@@ -105,7 +114,8 @@ in
     system.build.manual = manual;
 
     environment.systemPackages =
-      [ manual.manual help ]
+      [ manual.manual helpScript ]
+      ++ optional config.services.xserver.enable desktopItem
       ++ optional config.programs.man.enable manual.manpages;
 
     boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];

From 0c262a639e1f5754ebe0701b7f622e2ada26ddfa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 18:06:29 +0800
Subject: [PATCH 2268/3449] kmod-blacklist-ubuntu: 9.3 -> 22.1

---
 .../linux/kmod-blacklist-ubuntu/default.nix     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index ca1131146932..8154e37e3d5e 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, gnugrep, findutils }:
+
 let
-  version = "3ubuntu1"; # Saucy
-in
-stdenv.mkDerivation {
+  version = "22-1.1ubuntu1"; # Zesty
+
+in stdenv.mkDerivation {
   name = "kmod-blacklist-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
-    sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
+    sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi";
   };
 
   installPhase = ''
@@ -25,9 +26,9 @@ stdenv.mkDerivation {
       --replace " xargs " " ${findutils}/bin/xargs "
   '';
 
-  meta = {
-    homepage = http://packages.ubuntu.com/source/saucy/kmod;
+  meta = with stdenv.lib; {
+    homepage = http://packages.ubuntu.com/source/zesty/kmod;
     description = "Linux kernel module blacklists from Ubuntu";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From 605ee9e92b83554ef2e122c3ef254e4c3428cd00 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 18:06:44 +0800
Subject: [PATCH 2269/3449] kmod-blacklist-ubuntu: do not blacklist i2c_i801

---
 pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 8154e37e3d5e..c96d17b7a624 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -16,6 +16,8 @@ in stdenv.mkDerivation {
     for f in modprobe.d/*.conf; do
       echo "''\n''\n## file: "`basename "$f"`"''\n''\n" >> "$out"/modprobe.conf
       cat "$f" >> "$out"/modprobe.conf
+      # https://bugs.launchpad.net/ubuntu/+source/kmod/+bug/1475945
+      sed -i '/^blacklist i2c_801/d' $out/modprobe.conf
     done
 
     substituteInPlace "$out"/modprobe.conf \

From 89724f152a9ab933142f07dc9da0eafb2a7f42a6 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 18:06:55 +0800
Subject: [PATCH 2270/3449] kmod: 23 -> 24

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

diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 322df73e404f..138130fa82e4 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -6,11 +6,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "kmod-${version}";
-  version = "23";
+  version = "24";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/kernel/kmod/${name}.tar.xz";
-    sha256 = "0mc12sx06p8il1ym3hdmgxxb37apn9yv7xij26gddjdfkx8xa0yk";
+    sha256 = "15xkkkzvca9flvkm48gkh8y8f13vlm3sl7nz9ydc7b3jy4fqs2v1";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig libxslt ];

From b0c7df9fbc3920fc7cc215c80f1b620a67c31aae Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Mar 2017 18:44:00 +0800
Subject: [PATCH 2271/3449] crudini: fix maintainer and run tests

---
 pkgs/tools/misc/crudini/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix
index ead18f8c31f2..856138f046ae 100644
--- a/pkgs/tools/misc/crudini/default.nix
+++ b/pkgs/tools/misc/crudini/default.nix
@@ -13,10 +13,16 @@ python2Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python2Packages; [ iniparse ];
 
+  checkPhase = ''
+    patchShebangs .
+    pushd tests >/dev/null
+    ./test.sh
+  '';
+
   meta = with stdenv.lib; {
     description = "A utility for manipulating ini files ";
     homepage = http://www.pixelbeat.org/programs/crudini/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ bjornfor ];
+    maintainers = with maintainers; [ peterhoeg ];
   };
 }

From aed491879588bb92bc6e5c264dd336a631d83903 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 14 Mar 2017 08:02:35 -0400
Subject: [PATCH 2272/3449] docker: 1.13.1 -> 17.03.0-ce

---
 .../applications/virtualization/docker/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index f2db629336c2..b8667997b16e 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,14 +11,14 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.13.1";
-  rev = "092cba3"; # should match the version commit
+  version = "17.03.0-ce";
+  rev = "60ccb22"; # should match the version commit
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar";
+    sha256 = "0ml9aan8x4w8kfz7dm9vvl8b1a0vq09si9b7z50xz84040cjhnr9";
   };
 
   docker-runc = runc.overrideAttrs (oldAttrs: rec {
@@ -26,8 +26,8 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "docker";
       repo = "runc";
-      rev = "9df8b306d01f59d3a8029be411de015b7304dd8f";
-      sha256 = "1yvrk1w2409b90gk55k72z7l3jlkj682x4h3b7004mkl9bhscqd9";
+      rev = "a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70";
+      sha256 = "0n7vr47fhpyxx5vdnp453qp4cq50w4hwgq3ldyj5878d91iir7l1";
     };
     # docker/runc already include these patches / are not applicable
     patches = [];
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     src = fetchFromGitHub {
       owner = "docker";
       repo = "containerd";
-      rev = "aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1";
-      sha256 = "0vidbsgyn77m98kisrqnbykva0zmk1ljprgqhbfp5lw16ac6qj8c";
+      rev = "977c511eda0925a723debdc94d09459af49d082a";
+      sha256 = "0hmcj8i70vv3a3bbdawrgi84a442m09x5mpc7fgn8dd3v031lcbc";
     };
   });
   docker-tini = tini.overrideAttrs  (oldAttrs: rec {

From 065383cde82a2d0f9c5ee733a2a20e83073b2a39 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:24:21 +0100
Subject: [PATCH 2273/3449] pythonPackages.ipython: 5.2.1 -> 5.3.0

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

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

From 2a1cceac16bcf4586ee2cd9551bb56ac33f8048a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:24:33 +0100
Subject: [PATCH 2274/3449] pythonPackages.jupyter_client: 4.4.0 -> 5.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 c1df8f9c5150..6bd303e85cf8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13460,16 +13460,16 @@ in {
   };
 
   jupyter_client = buildPythonPackage rec {
-    version = "4.4.0";
+    version = "5.0.0";
     name = "jupyter_client-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/j/jupyter_client/${name}.tar.gz";
-      sha256 = "c99a52fac2e5b7a3b714e9252ebf72cbf97536d556ae2b5082baccc3e5cd52ee";
+      sha256 = "2766f9c2deb9ae826e65d53a56a36d69b184f63d0dcb7710835273327126bc5b";
     };
 
     buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py;
+    propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq dateutil] ++ optional isPyPy py;
 
     checkPhase = ''
       nosetests -v

From fbb30ee46f5044fcbdeab50e5f80f2b9a35ea05a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:24:47 +0100
Subject: [PATCH 2275/3449] pythonPackages.jupyter_core: 4.2.1 -> 4.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6bd303e85cf8..d34b73ce4ec3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13487,12 +13487,12 @@ in {
   };
 
   jupyter_core = buildPythonPackage rec {
-    version = "4.2.1";
+    version = "4.3.0";
     name = "jupyter_core-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/j/jupyter_core/${name}.tar.gz";
-      sha256 = "89c55399c8437f777197c2c82c1ff5639c7f71d4eb2f172a81afa120b68dc7b3";
+      sha256 = "a96b129e1641425bf057c3d46f4f44adce747a7d60107e8ad771045c36514d40";
     };
 
     buildInputs = with self; [ pytest mock ];

From 044014826be9daccac419650046d36cdaccd41a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:25:17 +0100
Subject: [PATCH 2276/3449] pythonPackages.nbformat: 4.2.0 -> 4.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d34b73ce4ec3..acd017d20033 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15599,12 +15599,12 @@ in {
   };
 
   nbformat = buildPythonPackage rec {
-    version = "4.2.0";
+    version = "4.3.0";
     name = "nbformat-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/nbformat/${name}.tar.gz";
-      sha256 = "389a5b630a30539074f238a48fb9864592f63d611baccfa2ffaf14ffe239de06";
+      sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
     };
     LC_ALL="en_US.UTF-8";
     buildInputs = with self; [ pytest pkgs.glibcLocales ];

From 0c11ce654187c9b00963df4e376437cbda38b634 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:25:31 +0100
Subject: [PATCH 2277/3449] pythonPackages.notebook: 4.3.2 -> 4.4.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 acd017d20033..12dfbebec88e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16047,12 +16047,12 @@ in {
   };
 
   notebook = buildPythonPackage rec {
-    version = "4.3.2";
+    version = "4.4.1";
     name = "notebook-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/notebook/${name}.tar.gz";
-      sha256 = "fc77edf4ec295542172aa66a3e9d527e75038fcaadd3ed20afbf8596e5629aa9";
+      sha256 = "dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765";
     };
 
     LC_ALL = "en_US.UTF-8";

From bd0a0c79080051d3b7238367adf31faa867cddbf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:25:48 +0100
Subject: [PATCH 2278/3449] pythonPackages.pathlib2: 2.1.0 -> 2.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12dfbebec88e..1208605ac491 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18442,14 +18442,14 @@ in {
 
   pathlib2 = if !(pythonOlder "3.4") then null else buildPythonPackage rec {
     name = "pathlib2-${version}";
-    version = "2.1.0";
+    version = "2.2.1";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pathlib2/${name}.tar.gz";
-      sha256 = "deb3a960c1d55868dfbcac98432358b92ba89d95029cddd4040db1f27405055c";
+      sha256 = "ce9007df617ef6b7bd8a31cd2089ed0c1fed1f7c23cf2bf1ba140b3dd563175d";
     };
 
-    propagatedBuildInputs = with self; [ six ];
+    propagatedBuildInputs = with self; [ six ] ++ optional (pythonOlder "3.5") scandir;
 
     meta = {
       description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems.";

From 47f77d6104b888f1f837662b61b9c88d25842c5d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:26:04 +0100
Subject: [PATCH 2279/3449] pythonPackages.pathpy: 8.1.2 -> 10.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 1208605ac491..51f5d00b299f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18460,12 +18460,12 @@ in {
   };
 
   pathpy = buildPythonPackage rec {
-    version = "8.1.2";
+    version = "10.1";
     name = "path.py-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/path.py/${name}.tar.gz";
-      sha256 = "ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2";
+      sha256 = "8b0ee56f6c1421a9038823926ee8da354ce70933424b408558bc6b48496587f3";
     };
 
     buildInputs = with self; [setuptools_scm pytestrunner pytest pkgs.glibcLocales ];

From c7268fa2a935ef691b04eabc78f47e926ce0805f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:26:17 +0100
Subject: [PATCH 2280/3449] pythonPackages.pickleshare: 0.5 -> 0.7.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 51f5d00b299f..e63dfad084ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18812,15 +18812,18 @@ in {
   };
 
   pickleshare = buildPythonPackage rec {
-    version = "0.5";
+    version = "0.7.4";
     name = "pickleshare-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pickleshare/${name}.tar.gz";
-      sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286";
+      sha256 = "84a9257227dfdd6fe1b4be1319096c20eb85ff1e82c7932f36efccfe1b09737b";
     };
 
-    propagatedBuildInputs = with self; [pathpy];
+    propagatedBuildInputs = with self; [pathpy] ++ optional (pythonOlder "3.4") pathlib2;
+
+    # No proper test suite
+    doCheck = false;
 
     meta = {
       description = "Tiny 'shelve'-like database with concurrency support";

From db512addefef7063325ec4c595f32b33731ed13a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:26:34 +0100
Subject: [PATCH 2281/3449] pythonPackages.prompt_toolkit: 1.0.9 -> 1.0.13

---
 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 e63dfad084ed..1f2fe71a0e05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19315,10 +19315,10 @@ in {
 
   prompt_toolkit = buildPythonPackage rec {
     name = "prompt_toolkit-${version}";
-    version = "1.0.9";
+    version = "1.0.13";
 
     src = pkgs.fetchurl {
-      sha256 = "172r15k9kwdw2lnajvpz1632dd16nqz1kcal1p0lq5ywdarj6rfd";
+      sha256 = "33d68ca09f76cd73287fde7df5748ffacf26a8238dd61ee81ac50860ea7c6776";
       url = "mirror://pypi/p/prompt_toolkit/${name}.tar.gz";
     };
     checkPhase = ''

From 88a3861c7bdbbc795c3897c8e84aba2334530962 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 13:26:44 +0100
Subject: [PATCH 2282/3449] pythonPackages.pyzmq: 15.2.0 -> 16.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f2fe71a0e05..52821234f410 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28215,10 +28215,10 @@ EOF
   };
 
   pyzmq = buildPythonPackage rec {
-    name = "pyzmq-15.2.0";
+    name = "pyzmq-16.0.2";
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pyzmq/${name}.tar.gz";
-      sha256 = "2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec";
+      sha256 = "0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d";
     };
     buildInputs = with self; [ pkgs.zeromq3 pytest tornado ];
     propagatedBuildInputs = [ self.py ];

From b63aab243349792b3ae7ff31d93594cf355cc583 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 14 Mar 2017 12:13:30 +0000
Subject: [PATCH 2283/3449] slack: 2.5.1 -> 2.5.2

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

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 59ce03cc0f45..c0d50a86c71f 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -4,7 +4,7 @@
 
 let
 
-  version = "2.5.1";
+  version = "2.5.2";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -45,7 +45,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "1rrhgqmz0ajv2135bzykv3dq0mifzf5kiycgrisk2sfxn6nwyyvj";
+        sha256 = "0mg8js18lnnwyvqksrhpym7d04bin16bh7sdmxbm36iijb9ajxmi";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";

From dc32b87082d5295a2cf5393235f76f703d6a48ad Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 14 Mar 2017 07:47:20 -0500
Subject: [PATCH 2284/3449] timewarrior: patch to install all themes; use
 default install target.

---
 .../applications/misc/timewarrior/default.nix |  6 +----
 .../misc/timewarrior/install-all-themes.patch | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/misc/timewarrior/install-all-themes.patch

diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
index 091d51d33059..d417140b29bf 100644
--- a/pkgs/applications/misc/timewarrior/default.nix
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -13,11 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    mkdir -p $out/{bin,share/man/man1}
-    cp -rv doc/man/*.1 $out/share/man/man1
-    cp src/timew $out/bin/
-  '';
+  patches = [ ./install-all-themes.patch ];
 
   meta = with stdenv.lib; {
     description = "A command-line time tracker";
diff --git a/pkgs/applications/misc/timewarrior/install-all-themes.patch b/pkgs/applications/misc/timewarrior/install-all-themes.patch
new file mode 100644
index 000000000000..c6e8d3b0dbf7
--- /dev/null
+++ b/pkgs/applications/misc/timewarrior/install-all-themes.patch
@@ -0,0 +1,27 @@
+From e4a14c61bff3a55de42718dc11b282c4d5342995 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Tue, 14 Mar 2017 07:51:02 -0500
+Subject: [PATCH] doc/themes: install all themes, not just 'dark.theme'.
+
+---
+ doc/themes/CMakeLists.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/doc/themes/CMakeLists.txt b/doc/themes/CMakeLists.txt
+index a954576..3a3b453 100644
+--- a/doc/themes/CMakeLists.txt
++++ b/doc/themes/CMakeLists.txt
+@@ -2,5 +2,8 @@ cmake_minimum_required (VERSION 2.8)
+ 
+ message ("-- Configuring theme documentation")
+ 
+-install (FILES README     DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+-install (FILES dark.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES README           DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark.theme       DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark_blue.theme  DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark_green.theme DESTINATION ${TIMEW_DOCDIR}/doc/themes)
++install (FILES dark_red.theme   DESTINATION ${TIMEW_DOCDIR}/doc/themes)
+-- 
+2.12.0
+

From 58807f75bc58ecdf23fdd93d423495feae9b60ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 14 Mar 2017 14:13:24 +0100
Subject: [PATCH 2285/3449] esniper: 2.32.0 -> 2.33.0

---
 pkgs/applications/networking/esniper/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index bf6da8c207a0..b7bc2c6c67a0 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, curl, coreutils, gawk, bash, which }:
 
-stdenv.mkDerivation {
-  name = "esniper-2.32.0";
+stdenv.mkDerivation rec {
+  name = "esniper-2.33.0";
 
   src = fetchurl {
-    url    = "mirror://sourceforge/esniper/esniper-2-32-0.tgz";
-    sha256 = "04lka4d0mnrwc369yzvq28n8qi1qbm8810ykx6d0a4kaghiybqsy";
+    url    = "mirror://sourceforge/esniper/${stdenv.lib.replaceStrings ["."] ["-"] name}.tgz";
+    sha256 = "1pck2x7mp7ip0b21v2sjvq86fz12gzw6kig4vvbrghz5xw5b3f69";
   };
 
   buildInputs = [ openssl curl ];

From 770794cbfeb2273c4116c7fc5ac9db485ba3540b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Mar 2017 14:41:28 +0100
Subject: [PATCH 2286/3449] urt: remove

---
 pkgs/development/libraries/urt/default.nix    |  61 ------
 pkgs/development/libraries/urt/gentoo-config  |  52 -----
 .../libraries/urt/urt-3.1b-build-fixes.patch  | 151 -------------
 .../urt/urt-3.1b-compile-updates.patch        | 141 ------------
 .../libraries/urt/urt-3.1b-make.patch         |  75 -------
 .../libraries/urt/urt-3.1b-rle-fixes.patch    | 203 ------------------
 .../libraries/urt/urt-3.1b-tempfile.patch     |  19 --
 pkgs/top-level/all-packages.nix               |   2 -
 8 files changed, 704 deletions(-)
 delete mode 100644 pkgs/development/libraries/urt/default.nix
 delete mode 100644 pkgs/development/libraries/urt/gentoo-config
 delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch
 delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch
 delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-make.patch
 delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch
 delete mode 100644 pkgs/development/libraries/urt/urt-3.1b-tempfile.patch

diff --git a/pkgs/development/libraries/urt/default.nix b/pkgs/development/libraries/urt/default.nix
deleted file mode 100644
index 090ca28d7c45..000000000000
--- a/pkgs/development/libraries/urt/default.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, ncompress}:
-
-stdenv.mkDerivation rec {
-  name = "urt-${version}";
-  version = "3.1b";
-  
-  src = fetchurl {
-    url = ftp://ftp.iastate.edu/pub/utah-raster/urt-3.1b.tar.Z;
-    sha256 = "0hbb3avgvkfb2cksqn6cmmgcr0278nb2qd1srayqx0876pq6g2vd";
-  };
-
-  buildInputs = [ ncompress ];
-
-  unpackPhase = ''
-      mkdir urt
-      tar xvf "$src" -C urt
-  '';
-  patchFlags = "-p0 -d urt";
-  patches = [ ./urt-3.1b-build-fixes.patch ./urt-3.1b-compile-updates.patch
-              ./urt-3.1b-make.patch ./urt-3.1b-rle-fixes.patch ./urt-3.1b-tempfile.patch ];
-  postPatch = ''
-      cd urt
-
-      rm bin/README
-      rm man/man1/template.1
-
-      # stupid OS X declares a stack_t type already 
-      sed -i -e 's:stack_t:_urt_stack:g' tools/clock/rleClock.c
-
-      sed -i -e '/^CFLAGS/s: -O : :' makefile.hdr
-
-      cp "${./gentoo-config}" config/gentoo
-  '';
-  configurePhase = ''
-      ./Configure config/gentoo
-  '';
-  postInstall = ''
-      mkdir -p $out/bin
-      cp bin/* $out/bin
-
-      mkdir -p $out/lib
-      cp lib/librle.a $out/lib
-
-      mkdir -p $out/include
-      cp include/rle*.h $out/include
-
-      mkdir -p $out/share/man/man1
-      cp man/man1/*.1 $out/share/man/man1
-
-      mkdir -p $out/share/man/man3
-      cp man/man3/*.3 $out/share/man/man3
-
-      mkdir -p $out/share/man/man5
-      cp man/man5/*.5 $out/share/man/man5
-  '';
-
-  meta = {
-    homepage = http://www.cs.utah.edu/gdc/projects/urt/;
-    description = "A library for dealing with raster images";
-  };
-}
\ No newline at end of file
diff --git a/pkgs/development/libraries/urt/gentoo-config b/pkgs/development/libraries/urt/gentoo-config
deleted file mode 100644
index a2d9ec3faf2f..000000000000
--- a/pkgs/development/libraries/urt/gentoo-config
+++ /dev/null
@@ -1,52 +0,0 @@
-#define ABEKASA60
-#define ABEKASA62
-#define ALIAS
-##define CGM
-#define CUBICOMP
-##define DVIRLE
-#define GRAYFILES
-#define MACPAINT
-##define PBMPLUS
-##define SUNRASTER
-#define TARGA
-#define VICAR
-#define WASATCH
-#define WAVEFRONT
-
-#define GCC
-
-#define CONST_DECL
-#define NO_MAKE_MAKEFILE
-#define USE_TIME_H
-#define SYS_V_SETPGRP
-#define USE_PROTOTYPES
-#define USE_RANDOM
-#define USE_STDARG
-#define USE_STDLIB_H
-#define USE_UNISTD_H
-#define USE_STRING_H
-#define VOID_STAR
-#define USE_XLIBINT_H
-#define X_SHARED_MEMORY
-
-#defpath DEST bin
-#defpath RI include
-#defpath RL lib
-
-ROFF = nroff
-ROFFOPT = -man
-ROFFPIPE = | lpr
-
-INCTIFF = 
-LIBTIFF = -ltiff
-INCX11 =
-LIBX11 = -lX11
-
-# Most people have migrated X11 to /usr/lib, but just in case ...
-check_x11=$(shell \
-	echo 'int main(){}' > test.c ; \
-	if ! $(CC) test.c -lX11 -o .urt-x11-test 2>/dev/null ; then \
-		echo "-L/usr/X11R6/lib" ; \
-	fi ; \
-	rm -f .urt-x11-test test.c)
-LIBX11 += $(call check_x11)
diff --git a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch
deleted file mode 100644
index fc2bacddb30c..000000000000
--- a/pkgs/development/libraries/urt/urt-3.1b-build-fixes.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-some hosts are more anal about ar usage than others
-http://bugs.gentoo.org/107428
-
-respect user LDFLAGS
-http://bugs.gentoo.org/126872
-
---- lib/makefile.src
-+++ lib/makefile.src
-@@ -181,8 +181,7 @@
- # Rebuild the library from all the .o files.
- buildlib: $(OBJS)
- 	-rm -f $(LIBNAME)
--	ar rc $(LIBNAME)
--	ar q $(LIBNAME) $(OBJS)
-+	ar rc $(LIBNAME) $(OBJS)
- #ifndef NO_RANLIB
- 	ranlib $(LIBNAME)
- #endif
---- tools/clock/makefile.src
-+++ tools/clock/makefile.src
-@@ -6,7 +6,7 @@ install: rleClock
- 	mv rleClock ../rleClock.out
- 
- rleClock:rleClock.o font.o
--	${CC} ${CFLAGS} rleClock.o font.o -lm ${LIBS} -o rleClock
-+	${CC} ${CFLAGS} ${LDFLAGS} rleClock.o font.o ${LIBS} -o rleClock -lm
- 
- font.c:font.src makeFont
- 	chmod +x makeFont
---- tools/makefile.src
-+++ tools/makefile.src
-@@ -62,21 +62,21 @@ applymap.out rlebg.out: $(RI)/rle_raw.h
- pyrlib.o: pyrlib.c $(RI)/pyramid.h $(RI)/rle.h $(RI)/rle_config.h
- 	$(CC) $(CFLAGS) pyrlib.c -c
- pyrmask.out: pyrlib.o pyrmask.c $(RI)/pyramid.h
--	$(CC) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) pyrmask.c pyrlib.o $(LIBS) -lm -o pyrmask.new
- 	mv pyrmask.new pyrmask.out
- 
- fant.out: fant.o mallocNd.o
--	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
- 	mv fant.new fant.out
- 	
- # rlebox and crop use some common code.
- rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
- 
- crop.out: crop.c rle_box.o
--	${CC} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
-+	${CC} ${LDFLAGS} ${CFLAGS} crop.c rle_box.o ${LIBS} -o crop.new
- 	mv crop.new crop.out
- rlebox.out: rlebox.c rle_box.o
--	${CC} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
-+	${CC} ${LDFLAGS} ${CFLAGS} rlebox.c rle_box.o ${LIBS} -o rlebox.new
- 	mv rlebox.new rlebox.out
- 
- # rleClock has it's own directory, must be built special
-@@ -100,7 +100,7 @@ clean:	clean-pgm
- .SUFFIXES:
- .SUFFIXES: .out .c .o
- .c.out:
--	$(CC) $(CFLAGS) $< $(LIBS) -lm -o $*.new
-+	$(CC) $(LDFLAGS) $(CFLAGS) $< $(LIBS) -lm -o $*.new
- 	mv $*.new $@
- 
- .c.o:
---- cnv/makefile.src
-+++ cnv/makefile.src
-@@ -76,13 +76,13 @@ PBMDIR = 
- # ppmtorle - ppm format to RLE
- # rletoppm - RLE to ppm format
- pgmtorle.out: pgmtorle.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- ppmtorle.out: ppmtorle.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- rletoppm.out: rletoppm.c
--	$(CC) $(CFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCPBMPLUS) $*.c $(LIBS) $(LIBPBMPLUS) -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -95,10 +95,10 @@ rletoppm.out: rletoppm.c
- # iristorle/rletoiris - Convert between RLE and SGI image format.
- #
- iristorle.out: iristorle.c
--	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
- 	mv $*.new $@
- rletoiris.out: rletoiris.c
--	$(CC) $(CFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) -I/usr/include/gl $*.c $(LIBS) -limage -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -108,10 +108,10 @@ TIFFDIR =
- # tifftorle - Convert TIFF images to RLE
- # rletotiff - Convert RLE images to TIFF
- rletotiff.out: rletotiff.c
--	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
- 	mv $*.new $@
- tifftorle.out: tifftorle.c
--	$(CC) $(CFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(INCTIFF) $*.c $(LIBS) $(LIBTIFF) -lm -o $*.new
- 	mv $*.new $@
- #endif
- 
-@@ -125,7 +125,7 @@ tifftorle.out: tifftorle.c
- # Will build with the default rule.
- # rletorla - RLE to Wavefront RLA
- rletorla.out: rletorla.c
--	$(CC) $(CFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) $(LIBWAVEFRONT) -lm -o $*.new
- 	mv $*.new $@
- #endif WAVEFRONT
- 
-@@ -144,7 +144,7 @@ pristine: pristine-pgm
- .SUFFIXES:
- .SUFFIXES: .out .c
- .c.out:
--	$(CC) $(CFLAGS) $*.c $(LIBS) -lm -o $*.new
-+	$(CC) $(CFLAGS) $(LDFLAGS) $*.c $(LIBS) -lm -o $*.new
- 	mv $*.new $@
- 
- # Dependency lines.  Make sure to #ifdef them.
---- cnv/rletoabA62/makefile.src
-+++ cnv/rletoabA62/makefile.src
-@@ -15,7 +15,7 @@ all		:	$(PGMS)
- # Executables.  The .out will be stripped off in the install action.
- 
- rletoabA62.out	:	rletoabA62.o rle.o
--			$(CC) $(CFLAGS) -o rletoabA62.new \
-+			$(CC) $(CFLAGS) $(LDFLAGS) -o rletoabA62.new \
- 			  rletoabA62.o rle.o $(LIBS)
- 			mv rletoabA62.new rletoabA62.out
- 
---- cnv/rletogif/makefile.src
-+++ cnv/rletogif/makefile.src
-@@ -15,7 +15,7 @@ all:	$(PGMS)
- # The executable.  The ".out" will be stripped off in the install action.
- 
- rletogif.out: ${OBJ}
--	${CC} ${CFLAGS} ${OBJ} ${LIBS} -o rletogif.new
-+	${CC} ${CFLAGS} ${LDFLAGS} ${OBJ} ${LIBS} -o rletogif.new
- 	mv rletogif.new rletogif.out
- 
- # Incremental install, copies executable to DEST dir.
diff --git a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch b/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch
deleted file mode 100644
index 105f7c41f6a7..000000000000
--- a/pkgs/development/libraries/urt/urt-3.1b-compile-updates.patch
+++ /dev/null
@@ -1,141 +0,0 @@
---- get/getx11/XGetHClrs.c
-+++ get/getx11/XGetHClrs.c
-@@ -1,5 +1,4 @@
- #ifndef XLIBINT_H_NOT_AVAILABLE
--#include <X11/copyright.h>
- 
- /* $XConsortium: XGetHClrs.c,v 11.10 88/09/06 16:07:50 martin Exp $ */
- /* Copyright    Massachusetts Institute of Technology    1986	*/
---- tools/mallocNd.c
-+++ tools/mallocNd.c
-@@ -67,7 +67,7 @@
- 
- /* Imports */
- #include <stdio.h>
--extern char *malloc();
-+#include <string.h>
- 
- /* Forward declarations */
- char *BuildIndirectionTable();
---- tools/into.c
-+++ tools/into.c
-@@ -40,8 +40,8 @@
- static char buf[MAXPATHLEN+1];
- short forceflg;				/* overwrite an unwritable file? */
- 
--extern int errno;
--extern char *sys_errlist[];
-+#include <errno.h>
-+#include <string.h>
- 
- void
- main(argc, argv)
-@@ -103,7 +103,7 @@
-     if (ferror(outf))
-     {
- 	fprintf(stderr, "into: %s, \"%s\" not modified\n",
--	    sys_errlist[errno], argv[1]);
-+	    strerror(errno), argv[1]);
- 	unlink(buf);
- 	exit(1);
-     }
---- cnv/tex/dvirle2.c
-+++ cnv/tex/dvirle2.c
-@@ -55,7 +55,6 @@
- void DumpTopOfBand(), MoveDown(), WriteBuf(), WriteBlanks();
- 
- char	*ProgName;
--extern int errno;
- extern char *optarg;
- extern int optind;
- 
---- cnv/wasatchrle.c
-+++ cnv/wasatchrle.c
-@@ -32,7 +32,6 @@
- #include <errno.h>
- #include "rle.h"
- 
--extern int errno;
- 
- /* "short" in our world is 16 bits.  Beware of swyte-bopping. */
- 
---- get/getx11/x11_stuff.c
-+++ get/getx11/x11_stuff.c
-@@ -155,7 +155,6 @@
- 			IPC_CREAT|0777 );
- 	    if ( img->shm_img.shmid < 0 )
- 	    {
--		extern int errno;
- 		if ( errno == ENOSPC )
- 		{
- 		    if ( !no_shared_space )
-@@ -361,7 +360,6 @@ Boolean reallocate;
- 	    XDestroyImage( image );
- 	    if ( img->shm_pix.shmid < 0 )
- 	    {
--		extern int errno;
- 		if ( errno == ENOSPC )
- 		{
- 		    if ( !no_shared_space )
---- get/qcr/qcr.h
-+++ get/qcr/qcr.h
-@@ -6,8 +6,6 @@
- #define GREEN 1
- #define BLUE 2
- 
--extern int errno;
--
- /* Command defs for QCR-Z Film Recorder */
- 
- /* These are for 8 bit Look Up Tables */
---- get/gettaac.c
-+++ get/gettaac.c
-@@ -24,6 +24,7 @@
-  * Send bug fixes and improvements to:  ksp@maxwell.nde.swri.edu
-  */
- 
-+#include <errno.h>
- #include <stdio.h>
- #include <strings.h>
- #include <signal.h>
-@@ -459,7 +460,6 @@ char    *template;
-      char    nonUnique;
-      char    twiddleUserCompletion;
- 
--     extern  int         errno;
-      struct  direct     *nameEntry;
-      DIR                *dirChan;
-      struct  passwd     *pwdEntry;
---- tools/clock/rleClock.c
-+++ tools/clock/rleClock.c
-@@ -598,7 +598,7 @@
-     { TRUE,  "-tf", STRING, "Text area format string", 	          (char *)&FormatString }, 
-     { FALSE, "-Xm", BOOL,   "Output the alpha channel on RGB",    (char *)&DebugAlpha },
-     { FALSE, "-D",  BOOL,   "Turn on debugging",	          (char *)&Debug },
--    NULL
-+    { FALSE, NULL }
- };
- 
- void
---- tools/to8.c
-+++ tools/to8.c
-@@ -175,7 +175,7 @@
- 	 * Give it a background color of black, since the real background
- 	 * will be dithered anyway.
- 	 */
--	if ( in_hdr.background != NULL )
-+	if ( in_hdr.background != 0 )
- 	{
- 	    out_hdr.bg_color = (int *)malloc( sizeof( int ) );
- 	    RLE_CHECK_ALLOC( cmd_name( argv ), out_hdr.bg_color, 0 );
---- cnv/rletoabA62/rletoabA62.c
-+++ cnv/rletoabA62/rletoabA62.c
-@@ -157,7 +157,7 @@
- 	exit(1);
-     }
-     if (optind < argc) {
--	if ((file = open(argv[optind], 0)) == NULL) {
-+	if ((file = open(argv[optind], 0)) == -1) {
- 	    perror(argv[optind]);
- 	    exit(1);
- 	}
diff --git a/pkgs/development/libraries/urt/urt-3.1b-make.patch b/pkgs/development/libraries/urt/urt-3.1b-make.patch
deleted file mode 100644
index 310675dd395d..000000000000
--- a/pkgs/development/libraries/urt/urt-3.1b-make.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: makefile.src
-===================================================================
---- makefile.src
-+++ makefile.src
-@@ -17,7 +17,7 @@ all: default
- # clean deletes all but source, pristine (below) deletes installed stuff, too
- default clean: doit
- 	@for d in $(DIRS) ; do \
--		( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
-+		( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
- 	done
- 
- # install puts library, binaries and documentation into global location
-@@ -29,7 +29,7 @@ MAKE_TARGET =
- 
- install $(MAKE_TARGET) pristine depend:: doit
- 	@for d in $(ALLDIRS) ; do \
--		( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
-+		( cd $$d ; echo $(MAKE) $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
- 	done
- 
- 
-Index: tools/makefile.src
-===================================================================
---- tools/makefile.src
-+++ tools/makefile.src
-@@ -82,7 +82,7 @@ rlebox.out: rlebox.c rle_box.o
- # rleClock has it's own directory, must be built special
- 
- rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c
--	(cd clock ; make)
-+	(cd clock ; $(MAKE))
- 
- # Incremental install, copies everything ("$?") since last install to DEST dir.
- install: $(PGMS) install-pgm
-Index: makefile.tlr
-===================================================================
---- makefile.tlr
-+++ makefile.tlr
-@@ -7,7 +7,7 @@ subdirs:
- 	@sh -c "if test 'x$(DIRS)' != x ; then eval \
- 		'set -e ; for dir in $(DIRS) ; do \
- 			(cd \$$dir ; echo Make ${HERE}\$$dir ; \
--			 	make $(MFLAGS) $(DIRMFLAGS) ) ; \
-+			 	$(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \
- 		done' ; \
- 	  else \
- 		true ; \
-@@ -46,7 +46,7 @@ install-subdirs: subdirs
- 	@sh -c "if test 'x$(DIRS)' != x  ; then eval \
- 		'for dir in $(DIRS) ; do \
- 			(cd \$$dir ; echo Install ${HERE}\$$dir ; \
--			 make $(MFLAGS) $(DIRMFLAGS) install) ; \
-+			 $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \
- 		done' ; \
- 	  else \
- 		true ; \
-@@ -105,7 +105,7 @@ pristine-pgm: clean-pgm
- 	    'for dir in $(ALLDIRS); do \
- 		if test -d $$dir ; then \
- 			(cd $$dir; echo Make ${HERE}$$dir pristine ; \
--			 make $(MFLAGS) pristine); \
-+			 $(MAKE) $(MFLAGS) pristine); \
- 		else \
- 			true; \
- 		fi; \
-@@ -124,7 +124,7 @@ clean-pgm:
- 	    'for dir in $(ALLDIRS); do \
- 		if test -d $$dir ; then \
- 			(cd $$dir; echo Clean ${HERE}$$dir ; \
--			 make $(MFLAGS) clean); \
-+			 $(MAKE) $(MFLAGS) clean); \
- 		else \
- 			true; \
- 		fi; \
diff --git a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch b/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch
deleted file mode 100644
index 3720806960fe..000000000000
--- a/pkgs/development/libraries/urt/urt-3.1b-rle-fixes.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-Fixes taken from netpbm
-
---- lib/rle_global.c
-+++ lib/rle_global.c
-@@ -76,7 +76,7 @@ rle_hdr rle_dflt_hdr = {
-     8,				/* cmaplen (log2 of length of color map) */
-     NULL,			/* pointer to color map */
-     NULL,			/* pointer to comment strings */
--    stdout,			/* output file */
-+    NULL,			/* output file -- must be set dynamically */
-     { 7 },			/* RGB channels only */
-     0L,				/* Can't free name and file fields. */
-     "Urt",			/* Default "program name". */
---- lib/rle_hdr.c
-+++ lib/rle_hdr.c
-@@ -269,6 +273,9 @@
- {
-     rle_hdr *ret_hdr;
- 
-+    rle_dflt_hdr.rle_file = stdout;
-+    /* The rest of rle_dflt_hdr is set by the loader's data initialization */
-+
-     if ( the_hdr == &rle_dflt_hdr )
- 	return the_hdr;
- 
---- lib/dither.c
-+++ lib/dither.c
-@@ -38,10 +38,10 @@ void	make_square();
- #endif
- 
- static int magic4x4[4][4] =  {
-- 	 0, 14,  3, 13,
--	11,  5,  8,  6,
--	12,  2, 15,  1,
--	 7,  9,  4, 10
-+{	 0, 14,  3, 13},
-+{	11,  5,  8,  6},
-+{	12,  2, 15,  1},
-+{	 7,  9,  4, 10}
- };
- 
- /* basic dithering macro */
---- lib/rle_open_f.c
-+++ lib/rle_open_f.c
-@@ -9,7 +9,11 @@
-  */
- 
- #include "rle_config.h"
-+#define _XOPEN_SOURCE  /* Make sure fdopen() is in stdio.h */
-+
- #include <stdio.h>
-+#include <unistd.h>
-+#include <fcntl.h>
- 
- #ifndef NO_OPEN_PIPES
- /* Need to have a SIGCLD signal catcher. */
-@@ -260,7 +260,6 @@
-     int pipefd[2];
-     int i;
-     char *argv[4];
--    extern int errno;
- 
-     /* Check args. */
-     if ( *mode != 'r' && *mode != 'w' )
---- lib/rle_getcom.c
-+++ lib/rle_getcom.c
-@@ -53,11 +53,12 @@
- {
-     for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
- 	;
--    if (*n == '\0' || *n == '=')
-+    if (*n == '\0' || *n == '=') {
- 	if ( *v == '\0' )
- 	    return v;
- 	else if ( *v == '=' )
- 	    return ++v;
-+    }
- 
-     return NULL;
- }
---- lib/scanargs.c
-+++ lib/scanargs.c
-@@ -128,10 +130,10 @@
- va_list argl;
- {
- 
--    register    check;			/* check counter to be sure all argvs
-+    int    check;			/* check counter to be sure all argvs
- 					   are processed */
-     register CONST_DECL char  *cp;
--    register    cnt;
-+    int    cnt;
-     int	    optarg = 0;			/* where optional args start */
-     int	    nopt = 0;
-     char    tmpflg,			/* temp flag */
-@@ -375,11 +377,12 @@
- 				if ( optarg > 0 ) /* end optional args? */
- 				{
- 				    /* Eat the arg, too, if necessary */
--				    if ( list_cnt == 0 )
-+				    if ( list_cnt == 0 ) {
- 					if ( typchr == 's' )
- 					    (void)va_arg( argl, char * );
- 					else
- 					    (void)va_arg( argl, ptr );
-+                    }
- 				    break;
- 				}
- 				else
-@@ -567,7 +570,7 @@
- 				     * Do conversion for n and N types
- 				     */
- 				    tmpflg = typchr;
--				    if (typchr == 'n' || typchr == 'N' )
-+				    if (typchr == 'n' || typchr == 'N' ) {
- 					if (*argp != '0')
- 					    tmpflg = 'd';
- 					else if (*(argp+1) == 'x' ||
-@@ -578,6 +581,7 @@
- 					}
- 					else
- 					    tmpflg = 'o';
-+                    }
- 				    if (typchr == 'N')
- 					tmpflg = toupper( tmpflg );
- 
---- lib/inv_cmap.c
-+++ lib/inv_cmap.c
-@@ -42,7 +42,7 @@
- static long cbinc, cginc, crinc;
- static unsigned long *gdp, *rdp, *cdp;
- static unsigned char *grgbp, *rrgbp, *crgbp;
--static gstride, rstride;
-+static long gstride, rstride;
- static long x, xsqr, colormax;
- static int cindex;
- #ifdef INSTRUMENT_IT
---- lib/rle_getrow.c
-+++ lib/rle_getrow.c
-@@ -351,7 +351,7 @@
- 	    bzero( (char *)scanline[-1] + the_hdr->xmin,
- 		   the_hdr->xmax - the_hdr->xmin + 1 );
- 	for ( nc = 0; nc < the_hdr->ncolors; nc++ )
--	    if ( RLE_BIT( *the_hdr, nc ) )
-+	    if ( RLE_BIT( *the_hdr, nc ) ) {
- 		/* Unless bg color given explicitly, use 0. */
- 		if ( the_hdr->background != 2 || the_hdr->bg_color[nc] == 0 )
- 		    bzero( (char *)scanline[nc] + the_hdr->xmin,
-@@ -360,6 +360,7 @@
- 		    bfill( (char *)scanline[nc] + the_hdr->xmin,
- 			   the_hdr->xmax - the_hdr->xmin + 1,
- 			   the_hdr->bg_color[nc] );
-+	    }
-     }
- 
-     /* If skipping, then just return */
-@@ -367,7 +368,7 @@
-     {
- 	the_hdr->priv.get.vert_skip--;
- 	the_hdr->priv.get.scan_y++;
--	if ( the_hdr->priv.get.vert_skip > 0 )
-+	if ( the_hdr->priv.get.vert_skip > 0 ) {
- 	    if ( the_hdr->priv.get.scan_y >= the_hdr->ymax )
- 	    {
- 		int y = the_hdr->priv.get.scan_y;
-@@ -377,6 +378,7 @@
- 	    }
- 	    else
- 		return the_hdr->priv.get.scan_y;
-+	}
-     }
- 
-     /* If EOF has been encountered, return also */
-@@ -457,11 +459,12 @@
- 	    else
- 		nc = DATUM(inst);
- 	    nc++;
--	    if ( debug_f )
-+	    if ( debug_f ) {
- 		if ( RLE_BIT( *the_hdr, channel ) )
- 		    fprintf( stderr, "Pixel data %d (to %d):", nc, scan_x+nc );
- 		else
- 		    fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x+nc);
-+	    }
- 	    if ( RLE_BIT( *the_hdr, channel ) )
- 	    {
- 		/* Don't fill past end of scanline! */
---- lib/rle_putcom.c
-+++ lib/rle_putcom.c
-@@ -53,11 +53,12 @@
- {
-     for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ )
- 	;
--    if (*n == '\0' || *n == '=')
-+    if (*n == '\0' || *n == '=') {
- 	if ( *v == '\0' )
- 	    return v;
- 	else if ( *v == '=' )
- 	    return ++v;
-+    }
- 
-     return NULL;
- }
diff --git a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch b/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch
deleted file mode 100644
index 12acce151b5d..000000000000
--- a/pkgs/development/libraries/urt/urt-3.1b-tempfile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tools/rlecat.c
-+++ tools/rlecat.c
-@@ -110,8 +110,14 @@
- 	    nflag = 0;		/* Not really repeating! */
- 	else
- 	{
--	    mktemp( temp );	/* Make a temporary file name */
--	    tmpfile = rle_open_f( cmd_name( argv ), temp, "w+" );
-+	    /* we dont have to use rle_open_f() because all it does in
-+	     * this case is run fopen() ... we're creating a file so all
-+	     * the checks for opening an existing file aren't needed */
-+	    int fd = mkstemp(temp);
-+	    if (fd == -1 || (tmpfile = fdopen(fd, "w+")) == NULL) {
-+		perror("Unable to open tempfile");
-+		exit(-1);
-+	    }
- 	}
-     }
- 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182fcc617bb0..09d3d3ecad31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9877,8 +9877,6 @@ with pkgs;
 
   unixODBCDrivers = recurseIntoAttrs (callPackages ../development/libraries/unixODBCDrivers {});
 
-  urt = callPackage ../development/libraries/urt { };
-
   ustr = callPackage ../development/libraries/ustr { };
 
   usbredir = callPackage ../development/libraries/usbredir {

From f70a896094025aa0a1129f368d3a380c69ca1d59 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Mar 2017 15:36:06 +0100
Subject: [PATCH 2287/3449] hol: mark as broken

---
 pkgs/applications/science/logic/hol/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index 40fb9bfb160b..e931c6fcf9d5 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -83,5 +83,6 @@ stdenv.mkDerivation {
     license = licenses.bsd3;
     maintainers = with maintainers; [ mudri ];
     platforms = with platforms; linux;
+    broken = true;
   };
 }

From c555556af518c3ee52d3f8233544a81c0746ccaa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 14 Mar 2017 15:36:35 +0100
Subject: [PATCH 2288/3449] refind: mark as broken

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

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index ecc6bec3005d..74ea097d2f30 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -139,6 +139,7 @@ EOF
     homepage = http://refind.sourceforge.net/;
     maintainers = [ maintainers.AndersonTorres ];
     platforms = [ "i686-linux" "x86_64-linux" ];
+    broken = true;
   };
 
 }

From fc55e80ee7754c02a51484a820001b0f57889561 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 15:41:10 +0100
Subject: [PATCH 2289/3449] pythonPackages.ipython_genutils: 0.1.0 -> 0.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 52821234f410..495a310fcd3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13118,21 +13118,14 @@ in {
   };
 
   ipython_genutils = buildPythonPackage rec {
-    version = "0.1.0";
+    version = "0.2.0";
     name = "ipython_genutils-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/i/ipython_genutils/${name}.tar.gz";
-      sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
+      sha256 = "eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8";
     };
 
-    patches = [
-      (pkgs.fetchpatch {
-        url = "https://github.com/ipython/ipython_genutils/commit/6d74d8cb34e49820e48ba8b4f5e5f8322824f4f7.patch";
-        sha256 = "13ah6a11qldzzywax50la6qwq02sk5929gjkzzn456lg1ja5gq35";
-      })
-    ];
-
     LC_ALL = "en_US.UTF-8";
     buildInputs = with self; [ nose pkgs.glibcLocales ];
 

From c3772678e95d1e803b3f791b4a60e2daae028e97 Mon Sep 17 00:00:00 2001
From: taku0 <taku0@users.noreply.github.com>
Date: Wed, 15 Mar 2017 00:02:08 +0900
Subject: [PATCH 2290/3449] flashplayer: 24.0.0.221 -> 25.0.0.127 (#23889)

---
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 .../mozilla-plugins/flashplayer/standalone.nix       | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 9e0b0852bf8a..72a1f171dec6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "24.0.0.221";
+  version = "25.0.0.127";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_npapi_linux_debug.${arch}.tar.gz"
       else
         "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "10f8m5zc8p4xbhihbl785lws1kpv6smnbhx4ydzf8ai3mlv3y241"
+          "0d37rwbqszl593pggph8pm8jwn05fppys7q8vk1jrk9jaz262iva"
         else
-          "1rz9rkbvln8wdkfmsnnq936xs6969qma141jc4qx408419q7v3hg"
+          "0lhngdx1q51kfpw3a961h9p9n1fnspk9pmg21i069hvd0h143arx"
       else
         if arch == "x86_64" then
-          "1cb4mvslphj3bcchgr7lcswz8kk8si0s60rl5266mi53byplhw08"
+          "1yasj9xzmb6ly9209b1hmrqrzxrr1bafsfjszsr3yf994hql6nzn"
         else
-          "1vcyp9041171xkcnz05dlk3n7bnbcb9qbh4sy5wfgjkqsyd6i5bl";
+          "02vs12cm6fpl2fif1lij9y15m89wk6aizc8sbjiw6w59wixn3p9d";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 248fe63ab0c6..178b86b61c66 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -57,19 +57,19 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "24.0.0.221";
+  version = "25.0.0.127";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/24/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/25/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "0cy81cml72ayx2wa0fd9vgp2wzny866jasahndg01v0jfxcxw5rz"
+        "07a8x1n997lmkxj74bkygh60shwzxzcvfxpz07pxj1nmvakmin51"
       else
-        "0xgiycd47mzmwvmhbi0ig3rd7prksfdpcd4h62as1m9gs1ax4d7l";
+        "0rzxfcvjjwbd1m6pyby8km4g5834zy5d5sih7xq3czds9x0a2jp2";
   };
 
   nativeBuildInputs = [ unzip ];

From 308c09d41f309e5055e45c66c07454581945d458 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 14 Mar 2017 16:11:51 +0100
Subject: [PATCH 2291/3449] wordpress: security upgrade: 4.7.2 -> 4.7.3 & other
 improvements (#23837)

* Moved the wordpress sources derivation to the attribute pkgs.wordpress. This
  makes it easier to override.

* Also introduce the `package` option for the wordpress virtual host config which
  defaults to pkgs.wordpress.

* Also fixed the test in nixos/tests/wordpress.nix.
---
 .../web-servers/apache-httpd/wordpress.nix    | 20 +++++++++----------
 nixos/tests/wordpress.nix                     | 12 ++++-------
 pkgs/servers/web-apps/wordpress/default.nix   | 12 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/servers/web-apps/wordpress/default.nix

diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
index a5b6548d3c53..b94ec14308be 100644
--- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -4,11 +4,6 @@
 with lib;
 
 let
-
-  # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
-  version = "4.7.2";
-  fullversion = "${version}";
-
   # Our bare-bones wp-config.php file using the above settings
   wordpressConfig = pkgs.writeText "wp-config.php" ''
     <?php
@@ -71,12 +66,7 @@ let
   # The wordpress package itself
   wordpressRoot = pkgs.stdenv.mkDerivation rec {
     name = "wordpress";
-    src = pkgs.fetchFromGitHub {
-      owner = "WordPress";
-      repo = "WordPress";
-      rev = "${fullversion}";
-      sha256 = "0vph12708drf8ww0xd05hpdvbyy7n5gj9ca598lhdhy2i1j6wy32";
-    };
+    src = config.package;
     installPhase = ''
       mkdir -p $out
       # copy all the wordpress files we downloaded
@@ -122,6 +112,14 @@ in
   enablePHP = true;
 
   options = {
+    package = mkOption {
+      type = types.path;
+      default = pkgs.wordpress;
+      description = ''
+        Path to the wordpress sources.
+        Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
+      '';
+    };
     dbHost = mkOption {
       default = "localhost";
       description = "The location of the database server.";
diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix
index afee1f7f6dd4..c51306a8c7a0 100644
--- a/nixos/tests/wordpress.nix
+++ b/nixos/tests/wordpress.nix
@@ -10,14 +10,10 @@ import ./make-test.nix ({ pkgs, ... }:
     { web =
         { config, pkgs, ... }:
         {
-          services.mysql.enable = true;
-          services.mysql.package = pkgs.mysql;
-          services.mysql.initialScript = pkgs.writeText "start.sql" ''
-            CREATE DATABASE wordpress;
-	    CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress';
-            GRANT ALL on wordpress.* TO 'wordpress'@'localhost';
-          '';
-
+          services.mysql = {
+            enable = true;
+            package = pkgs.mysql;
+          };
           services.httpd = {
             enable = true;
             logPerVirtualHost = true;
diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
new file mode 100644
index 000000000000..2d247148aee6
--- /dev/null
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -0,0 +1,12 @@
+  # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix
+{ fetchFromGitHub, lib } : fetchFromGitHub {
+  owner = "WordPress";
+  repo = "WordPress";
+  rev = "4.7.3";
+  sha256 = "05gggm40065abylp6bdc0zn0q6ahcggyh4q6rk0ak242q8v5fm5b";
+  meta = {
+    homepage = https://wordpress.org;
+    description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";
+    license = lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09d3d3ecad31..b580dfc042e3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18122,6 +18122,8 @@ with pkgs;
 
   wmutils-opt = callPackage ../tools/X11/wmutils-opt { };
 
+  wordpress = callPackage ../servers/web-apps/wordpress { };
+
   wraith = callPackage ../applications/networking/irc/wraith { };
 
   wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };

From 5b7b1f7aa44a283484f14921a58fdebf77512003 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 14 Mar 2017 16:11:03 +0100
Subject: [PATCH 2292/3449] alot: 0.5 -> 0.5.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 d189a4ff4cee..301554f823c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -905,7 +905,7 @@ in {
 
 
   alot = buildPythonPackage rec {
-    rev = "0.5";
+    rev = "0.5.1";
     name = "alot-${rev}";
 
     disabled = isPy3k;
@@ -914,7 +914,7 @@ in {
       owner = "pazz";
       repo = "alot";
       inherit rev;
-      sha256 = "1hzajfh0f21k97xip9blg7zifiv3y5k33swp2h9sc57qd7qkr5i6";
+      sha256 = "0ipkhc5wllfq78lg47aiq4qih0yjq8ad9xkrbgc88xk8pk9166i8";
     };
 
     postPatch = ''

From c9d9f072e541589475068005c090ea0e02ae7fb7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 16:40:52 +0100
Subject: [PATCH 2293/3449] pythonPackages.pytest-shutil: 1.1.1 -> 1.2.8

---
 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 495a310fcd3c..68712bcd8c94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5371,10 +5371,10 @@ in {
 
   pytest-shutil = buildPythonPackage rec {
     name = "pytest-shutil-${version}";
-    version = "1.1.1";
+    version = "1.2.8";
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/pytest-shutil/${name}.tar.gz";
-      sha256 = "bb3c4fc2dddaf70b38bd9bb7a710d07728fa14f88fbc89c2a07979b383ade5d4";
+      sha256 = "924accaec3f3781416139e580386ab4f849cb8662bc1072405a81d3a5e56bf3d";
     };
     buildInputs = with self; [ cmdline pytest ];
     propagatedBuildInputs = with self; [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 ];

From 4bfa709562eb8266d43e2afbe76a4f24b4439ba2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 16:41:07 +0100
Subject: [PATCH 2294/3449] pythonPackages.pytest-virtualenv: 1.1.0 -> 1.2.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68712bcd8c94..b9d97b05aed4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5386,12 +5386,9 @@ in {
       license = licenses.mit;
     };
 
-
     checkPhase = ''
       py.test
     '';
-    # Bunch of pickle errors
-    doCheck = false;
   };
 
   pytestcov = buildPythonPackage (rec {
@@ -5421,10 +5418,10 @@ in {
   pytest-virtualenv = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pytest-virtualenv";
-    version = "1.1.0";
+    version = "1.2.7";
     src = pkgs.fetchurl {
       url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-      sha256 = "093f5fa479ee6201e48db367c307531dc8b800609b0c3ddca9c01e0fd466a669";
+      sha256 = "51fb6468670624b2315aecaf1a2bbd698509e3ea6a1e28b094984c45e1376755";
     };
     buildInputs = with self; [ pytest pytestcov mock cmdline ];
     propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil ];

From d7378da0280ebc0b59d0d198fd86b2d4a9eace41 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 15:04:16 +0100
Subject: [PATCH 2295/3449] pythonPackages.configparser: fix with namespace
 packages

---
 .../configparser/0001-namespace-fix.patch     | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/configparser/0001-namespace-fix.patch

diff --git a/pkgs/development/python-modules/configparser/0001-namespace-fix.patch b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch
new file mode 100644
index 000000000000..05dbf4677182
--- /dev/null
+++ b/pkgs/development/python-modules/configparser/0001-namespace-fix.patch
@@ -0,0 +1,42 @@
+From daae1ae35e13bc8107dc97d9219dfb8e172d5d2a Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Tue, 14 Mar 2017 15:00:33 +0100
+Subject: [PATCH] namespace fix
+
+configparser broke other namespace packages
+https://github.com/NixOS/nixpkgs/issues/23855#issuecomment-286427428
+This patch seems to solve that issue.
+---
+ setup.py                  | 1 -
+ src/backports/__init__.py | 6 ------
+ 2 files changed, 7 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 3b07823..63ed25d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,7 +42,6 @@ setup(
+     py_modules=modules,
+     package_dir={'': 'src'},
+     packages=find_packages('src'),
+-    namespace_packages=['backports'],
+     include_package_data=True,
+     zip_safe=False,
+     install_requires=requirements,
+diff --git a/src/backports/__init__.py b/src/backports/__init__.py
+index f84d25c..febdb2f 100644
+--- a/src/backports/__init__.py
++++ b/src/backports/__init__.py
+@@ -3,9 +3,3 @@
+ 
+ from pkgutil import extend_path
+ __path__ = extend_path(__path__, __name__)
+-
+-try:
+-    import pkg_resources
+-    pkg_resources.declare_namespace(__name__)
+-except ImportError:
+-    pass
+-- 
+2.11.1
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9d97b05aed4..b6dbaac44114 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4171,6 +4171,12 @@ in {
     # No tests available
     doCheck = false;
 
+    # Fix issue when used together with other namespace packages
+    # https://github.com/NixOS/nixpkgs/issues/23855
+    patches = [
+      ./../development/python-modules/configparser/0001-namespace-fix.patch
+    ];
+
     meta = {
       maintainers = [ ];
       platforms = platforms.all;

From b27dfdbe66a63669ae9cdd4cf09cd1f188bd2bca Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 11 Mar 2017 12:52:57 +0100
Subject: [PATCH 2296/3449] pythonPackages.parsedatetime: 2.1 -> 2.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6dbaac44114..040ce68830a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18190,7 +18190,7 @@ in {
 
   parsedatetime = buildPythonPackage rec {
     name = "parsedatetime-${version}";
-    version = "2.1";
+    version = "2.3";
 
     meta = {
       description = "Parse human-readable date/time text";
@@ -18198,11 +18198,12 @@ in {
       license = licenses.asl20;
     };
 
-    buildInputs = with self; [ PyICU nose ];
+    buildInputs = with self; [ pytest pytestrunner ];
+    propagatedBuildInputs = with self; [ future ];
 
     src = pkgs.fetchurl {
         url = "mirror://pypi/p/parsedatetime/${name}.tar.gz";
-        sha256 = "0bdgyw6y3v7bcxlx0p50s8drxsh5bb5cy2afccqr3j90amvpii8p";
+        sha256 = "1vkrmd398s11h1zn3zaqqsiqhj9lwy1ikcg6irx2lrgjzjg3rjll";
     };
   };
 

From 47f7817037487c8acd1a7a25627ba75573c0ead3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 16:52:25 +0100
Subject: [PATCH 2297/3449] pythonPackages.typed-ast: 1.0.1 -> 1.0.2

---
 .../python-modules/typed-ast/default.nix        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 8d36d3c3a61f..02a603234205 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,13 +1,16 @@
-{ buildPythonPackage, fetchzip, isPy3k, lib, pythonOlder }:
+{ buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
 buildPythonPackage rec {
-  name = "typed-ast-${version}";
-  version = "1.0.1";
-  src = fetchzip {
-    url = "mirror://pypi/t/typed-ast/${name}.zip";
-    sha256 = "1q69czr9ghnbd81hay71kgynn6mqi5nsgand9yw6dyw5bim5l154";
+  pname = "typed-ast";
+  version = "1.0.2";
+  name = "${pname}-${version}";
+  src = fetchPypi{
+    inherit pname version;
+    sha256 = "13e02b10479ddff07eb546f9638743702ab9b175bfa3cdf2482688df91b5766d";
   };
   # Only works with Python 3.3 and newer;
-  disabled = !isPy3k && !(pythonOlder "3.3");
+  disabled = pythonOlder "3.3";
+  # No tests in archive
+  doCheck = false;
   meta = {
     homepage = "https://pypi.python.org/pypi/typed-ast";
     description = "a fork of Python 2 and 3 ast modules with type comment support";

From fd68cd4ed7dc3c00b85a4f677a446879f2b6c8fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 16:57:00 +0100
Subject: [PATCH 2298/3449] pythonPackages.pygal: 2.0.10 -> 2.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 040ce68830a4..44befee73268 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15329,16 +15329,15 @@ in {
   };
 
   pygal = buildPythonPackage rec {
-    version = "2.0.10";
-    name = "pygal-${version}";
+    pname = "pygal";
+    version = "2.3.1";
+    name = "${pname}-${version}";
 
     doCheck = !isPyPy;  # one check fails with pypy
 
-    src = pkgs.fetchFromGitHub {
-      owner = "Kozea";
-      repo = "pygal";
-      rev = version;
-      sha256 = "1j7qjgraapvfc80yp8xcbddqrw8379gqi7pwkvfml3qcqm0z0d33";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "7ba5a191233d0c2d8bf4b4d26b06e42bd77483a59ba7d3e5b884d81d1a870667";
     };
 
     buildInputs = with self; [ flask pyquery pytest ];

From 6a6d48be4e80a078e6969e9c565db32aec67dc62 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 17:07:09 +0100
Subject: [PATCH 2299/3449] pythonPackages.dateparser: mark as broken

---
 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 44befee73268..6f7d332dbe86 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5981,6 +5981,7 @@ in {
       description = "Date parsing library designed to parse dates from HTML pages";
       homepage = http://pypi.python.org/pypi/dateparser;
       license = licenses.bsd3;
+      broken = true;
     };
   };
 

From 6de3eb991894826c8836e6b025b1065a3a89dccd Mon Sep 17 00:00:00 2001
From: Leon Isenberg <ljli@users.noreply.github.com>
Date: Tue, 14 Mar 2017 16:33:39 +0100
Subject: [PATCH 2300/3449] nixbot: typo

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

diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix
index 6fb0b9c8201b..554aa0bccee2 100644
--- a/pkgs/tools/misc/nixbot/default.nix
+++ b/pkgs/tools/misc/nixbot/default.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    desciption = "Github bot for reviewing/testing pull requests with the help of Hydra";
+    description = "Github bot for reviewing/testing pull requests with the help of Hydra";
     maintainers = with maintainers; [ domenkozar fpletz globin ];
     license = licenses.asl20;
     homepage = https://github.com/domenkozar/nixbot;

From 4a615d90af98bbe6ad470479b77d3b4dd38af458 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Mar 2017 17:09:20 +0100
Subject: [PATCH 2301/3449] pythonPackages.pywatchman: disable python 3.x and
 disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f7d332dbe86..6ed90dbd1fe6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10059,6 +10059,11 @@ in {
       substituteInPlace pywatchman/__init__.py \
         --replace "'watchman'" "'${pkgs.watchman}/bin/watchman'"
     '';
+    # SyntaxError
+    disabled = isPy3k;
+    # No tests in archive
+    doCheck = false;
+
   };
 
   zope_tales = buildPythonPackage rec {

From 4f644cd00461422ebda43879fe0b356a4c4a99cd Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 14 Mar 2017 17:59:07 +0100
Subject: [PATCH 2302/3449] gdal: 2.1.1 -> 2.1.3

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

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 173e6411182d..9805bc17c443 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -6,12 +6,12 @@
  }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "2.1.1";
+  version = "2.1.3";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "55fc6ffbe76e9d2e7e6cf637010e5d4bba6a966d065f40194ff798544198236b";
+    sha256 = "0jh7filpf5dk5iz5acj7y3y49ihnzqypxckdlj0sjigbqq6hlsmf";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]

From 4e439b2393945c5a943a1e168dfe90de07a3f634 Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Fri, 10 Mar 2017 20:26:25 +0000
Subject: [PATCH 2303/3449] qutebrowser: 0.9.1 -> 0.10.1

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

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 4c186fcf5ea9..a07fc04b02ea 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -24,12 +24,12 @@ let
 
 in buildPythonApplication rec {
   name = "qutebrowser-${version}";
-  version = "0.9.1";
+  version = "0.10.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0pf91nc0xcykahc3x7ww525c9czm8zpg80nxl8n2mrzc4ilgvass";
+    sha256 = "57f4915f0f2b1509f3aa1cb9c47117fdaad35b4c895e9223c4eb0a6e8af51917";
   };
 
   # Needs tox

From 5228bc9f2e2a7e85a1ec433e6a0ea4eda40bd5e4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 14 Mar 2017 11:14:29 +0100
Subject: [PATCH 2304/3449] eclipses: add dependencies as build inputs

Having `glib` in the build inputs will allow its build hook to
trigger. Also adds `gsettings_desktop_schemas` as a dependency since
Eclipse appears to need the schemas under certain circumstances.
---
 pkgs/applications/editors/eclipse/build-eclipse.nix | 10 ++++++++--
 pkgs/applications/editors/eclipse/default.nix       |  5 +++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 74707c65b6ca..60bece1fafc4 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -1,4 +1,6 @@
-{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }:
+{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender
+, zlib, jdk, glib, gtk2, libXtst, gsettings_desktop_schemas, webkitgtk2
+, makeWrapper, ... }:
 
 { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
 
@@ -15,7 +17,10 @@ stdenv.mkDerivation rec {
     categories = "Application;Development;";
   };
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [
+    fontconfig freetype glib gsettings_desktop_schemas gtk2 jdk libX11
+    libXrender libXtst makeWrapper zlib
+  ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2;
 
   buildCommand = ''
     # Unpack tarball.
@@ -37,6 +42,7 @@ stdenv.mkDerivation rec {
     makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
       --prefix PATH : ${jdk}/bin \
       --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
       --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
 
     # Create desktop item.
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 9271579346aa..8ef855e48c8d 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
-, glib, gtk2, libXtst, jdk
+, glib, gtk2, libXtst, jdk, gsettings_desktop_schemas
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
 , callPackage
@@ -12,7 +12,8 @@ rec {
 
   buildEclipse = import ./build-eclipse.nix {
     inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib
-            jdk glib gtk2 libXtst webkitgtk2 makeWrapper;
+            jdk glib gtk2 libXtst gsettings_desktop_schemas webkitgtk2
+            makeWrapper;
   };
 
   ### Eclipse CPP

From d6f586bbffbc84e299302e9abec41317f2e82eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 13 Mar 2017 13:58:07 +0100
Subject: [PATCH 2305/3449] git-octopus: init at 1.4

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-octopus/default.nix     | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-octopus/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 b9b7f2e543ff..281a39149867 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -66,6 +66,8 @@ rec {
 
   git-imerge = callPackage ./git-imerge { };
 
+  git-octopus = callPackage ./git-octopus { };
+
   git-radar = callPackage ./git-radar { };
 
   git-remote-hg = callPackage ./git-remote-hg { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
new file mode 100644
index 000000000000..f8d871bdcf30
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-octopus/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, git, perl, makeWrapper }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "git-octopus-${version}";
+  version = "1.4";
+
+  installFlags = [ "prefix=$(out)" ];
+
+  buildInputs = [ makeWrapper ];
+
+  # perl provides shasum
+  postInstall = ''
+    for f in $out/bin/*; do
+      wrapProgram $f --prefix PATH : ${makeBinPath [ git perl ]}
+    done
+  '';
+
+  src = fetchFromGitHub {
+    owner = "lesfurets";
+    repo = "git-octopus";
+    rev = "v${version}";
+    sha256 = "14p61xk7jankp6gc26xciag9fnvm7r9vcbhclcy23f4ghf4q4sj1";
+  };
+
+  meta = {
+    homepage = https://github.com/lesfurets/git-octopus;
+    description = "The continuous merge workflow";
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+    maintainers = [maintainers.mic92];
+  };
+}

From 496120c19f710e1a317f606dc067664a6751370d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 14 Mar 2017 17:07:25 +0100
Subject: [PATCH 2306/3449] travis: 1.8.2 -> 1.8.8

---
 .../tools/misc/travis/Gemfile.lock            | 26 +++++++-------
 pkgs/development/tools/misc/travis/gemset.nix | 36 +++++++++----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock
index e84e87fb5232..529be0793605 100644
--- a/pkgs/development/tools/misc/travis/Gemfile.lock
+++ b/pkgs/development/tools/misc/travis/Gemfile.lock
@@ -3,32 +3,32 @@ GEM
   specs:
     addressable (2.4.0)
     backports (3.6.8)
-    ethon (0.8.1)
+    ethon (0.10.1)
       ffi (>= 1.3.0)
-    faraday (0.9.2)
+    faraday (0.11.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
-    ffi (1.9.10)
-    gh (0.14.0)
-      addressable
+    faraday_middleware (0.11.0.1)
+      faraday (>= 0.7.4, < 1.0)
+    ffi (1.9.18)
+    gh (0.15.1)
+      addressable (~> 2.4.0)
       backports
       faraday (~> 0.8)
       multi_json (~> 1.0)
-      net-http-persistent (>= 2.7)
+      net-http-persistent (~> 2.9)
       net-http-pipeline
     highline (1.7.8)
-    json (1.8.3)
+    json (2.0.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     multipart-post (2.0.0)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
-    travis (1.8.2)
+    travis (1.8.8)
       backports
       faraday (~> 0.9)
       faraday_middleware (~> 0.9, >= 0.9.1)
@@ -39,7 +39,7 @@ GEM
       typhoeus (~> 0.6, >= 0.6.8)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
-    websocket (1.2.2)
+    websocket (1.2.4)
 
 PLATFORMS
   ruby
@@ -48,4 +48,4 @@ DEPENDENCIES
   travis
 
 BUNDLED WITH
-   1.11.2
+   1.14.4
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix
index abfd352e90ec..148923848beb 100644
--- a/pkgs/development/tools/misc/travis/gemset.nix
+++ b/pkgs/development/tools/misc/travis/gemset.nix
@@ -18,42 +18,42 @@
   ethon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0afvvv4sxs330jhk4xz9kj6qgj70yvd4zsjnb9yvxhmaq49k8yij";
+      sha256 = "1i873cvma4j52xmij7kasjylh66vf60cy5prkp4cz4hcn9jlkznl";
       type = "gem";
     };
-    version = "0.8.1";
+    version = "0.10.1";
   };
   faraday = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
+      sha256 = "18p1csdivgwmshfw3mb698a3bn0yrykg30khk5qxjf6n168g91jr";
       type = "gem";
     };
-    version = "0.9.2";
+    version = "0.11.0";
   };
   faraday_middleware = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
+      sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00";
       type = "gem";
     };
-    version = "0.10.0";
+    version = "0.11.0.1";
   };
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
+      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
       type = "gem";
     };
-    version = "1.9.10";
+    version = "1.9.18";
   };
   gh = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j7m6jmxzkxvnqgnhmci33a89qpaxxcrm55kk5vz4bcpply04hx2";
+      sha256 = "0g4df0jsscq16g6f27flfmvk7p4sbq81d5mdylbz4ikqq60kywzg";
       type = "gem";
     };
-    version = "0.14.0";
+    version = "0.15.1";
   };
   highline = {
     source = {
@@ -66,10 +66,10 @@
   json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "2.0.3";
   };
   launchy = {
     source = {
@@ -82,10 +82,10 @@
   multi_json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
+      sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
       type = "gem";
     };
-    version = "1.11.2";
+    version = "1.12.1";
   };
   multipart-post = {
     source = {
@@ -122,10 +122,10 @@
   travis = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ph83whzw5hjkp1kgbkjd2g0vi6kdr9sif6vxvxgjf186id43q0s";
+      sha256 = "02bjz73f6r9b7nskwzcvcbr4hlvgwrf9rnr6d218d2i1rk4ww936";
       type = "gem";
     };
-    version = "1.8.2";
+    version = "1.8.8";
   };
   typhoeus = {
     source = {
@@ -138,9 +138,9 @@
   websocket = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1frcsgj4f984db920xwapflqwgrwncw86c1rv94pp5gs2q1iaap4";
+      sha256 = "1shymfaw14p8jdi74nwz4nsgc9cmpli166lkp5g5wbhjmhmpvrnh";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.4";
   };
 }
\ No newline at end of file

From 5fa84fb1a8cd1f5e6268f0276f572c54d106aa96 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 14 Mar 2017 16:31:08 -0400
Subject: [PATCH 2307/3449] terra{form,grunt}: Add some needed old versions

---
 .../networking/cluster/terraform/0.8.5.nix    | 34 +++++++++++++++++++
 .../networking/cluster/terragrunt/0.9.8.nix   | 31 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 3 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform/0.8.5.nix
 create mode 100644 pkgs/applications/networking/cluster/terragrunt/0.9.8.nix

diff --git a/pkgs/applications/networking/cluster/terraform/0.8.5.nix b/pkgs/applications/networking/cluster/terraform/0.8.5.nix
new file mode 100644
index 000000000000..7f927b586705
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform/0.8.5.nix
@@ -0,0 +1,34 @@
+{ 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
+    ];
+  };
+}
diff --git a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
new file mode 100644
index 000000000000..54ca1a9d7d0f
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }:
+
+buildGoPackage rec {
+  name = "terragrunt-${version}";
+  version = "0.9.8";
+
+  goPackagePath = "github.com/gruntwork-io/terragrunt";
+
+  src = fetchFromGitHub {
+    rev    = "v${version}";
+    owner  = "gruntwork-io";
+    repo   = "terragrunt";
+    sha256 = "0aakr17yzh5jzvlmg3pzpnsfwl31njg27bpck541492shqcqmkiz";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $bin/bin/terragrunt \
+      --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices.";
+    homepage = https://github.com/gruntwork-io/terragrunt/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b580dfc042e3..4a73c033c4ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17984,8 +17984,14 @@ with pkgs;
 
   terraform = callPackage ../applications/networking/cluster/terraform {};
 
+  terraform_0_8_5 = callPackage ../applications/networking/cluster/terraform/0.8.5.nix {};
+
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
 
+  terragrunt_0_9_8 = callPackage ../applications/networking/cluster/terragrunt/0.9.8.nix {
+    terraform = terraform_0_8_5;
+  };
+
   tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; };
 
   tewi-font = callPackage ../data/fonts/tewi  {};

From e721905d0f7c82be94a347f022bdd238b919de9d Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 18:47:22 -0500
Subject: [PATCH 2308/3449] google-gflags: 2.1.2 -> 2.2.0

google-gflags: Changed homepage
---
 .../libraries/google-gflags/default.nix           | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
index 1423a5a9efcf..0f089d16eadd 100644
--- a/pkgs/development/libraries/google-gflags/default.nix
+++ b/pkgs/development/libraries/google-gflags/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "google-gflags-${version}";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "gflags";
     repo = "gflags";
     rev = "v${version}";
-    sha256 = "0qxvr9cyxq3px60jglkm94pq5bil8dkjjdb99l3ypqcds7iypx9w";
+    sha256 = "1y5808ky8qhjwv1nf134czz0h2p2faqvjhxa9zxf8mg8hn4ns9wp";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -21,17 +21,16 @@ stdenv.mkDerivation rec {
 
   doCheck = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A C++ library that implements commandline flags processing";
     longDescription = ''
       The gflags package contains a C++ library that implements commandline flags processing.
       As such it's a replacement for getopt().
       It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community.
     '';
-    homepage = https://code.google.com/p/gflags/;
-    license = stdenv.lib.licenses.bsd3;
-
-    maintainers = [ stdenv.lib.maintainers.linquize ];
-    platforms = stdenv.lib.platforms.all;
+    homepage = https://gflags.github.io/gflags/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.linquize ];
+    platforms = platforms.all;
   };
 }

From cbf87bc2b25fb7c118348a65e72a5580972d1262 Mon Sep 17 00:00:00 2001
From: Markus Schneider <mschneider@linkdot.org>
Date: Mon, 13 Mar 2017 11:20:41 +0100
Subject: [PATCH 2309/3449] granite: 0.3.0 -> 0.4.0.1

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

diff --git a/pkgs/development/libraries/granite/default.nix b/pkgs/development/libraries/granite/default.nix
index 4d011ddd4638..ee453963376f 100644
--- a/pkgs/development/libraries/granite/default.nix
+++ b/pkgs/development/libraries/granite/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
+{ stdenv, fetchurl, perl, cmake, vala, pkgconfig, gobjectIntrospection, glib, gtk3, gnome3, gettext }:
 
 stdenv.mkDerivation rec {
-  majorVersion = "0.3";
-  minorVersion = "0";
+  majorVersion = "0.4";
+  minorVersion = "0.1";
   name = "granite-${majorVersion}.${minorVersion}";
   src = fetchurl {
-    url = "https://code.launchpad.net/granite/${majorVersion}/${majorVersion}/+download/${name}.tar.gz";
-    sha256 = "1laa109dz7kbd8zxddqw2p1b67yzva7cc5h3smqkj8a9jzbhv5fz";
+    url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz";
+    sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm";
   };
   cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0";
-  buildInputs = [perl cmake vala_0_23 pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext];
+  buildInputs = [perl cmake vala pkgconfig gobjectIntrospection glib gtk3 gnome3.libgee gettext];
   meta = {
     description = "An extension to GTK+ used by elementary OS";
     longDescription = "An extension to GTK+ that provides several useful widgets and classes to ease application development. Designed for elementary OS.";

From 961c73a78c95b783d4c235b9401ed4b2d0ec377f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 7 Mar 2017 20:59:39 +0100
Subject: [PATCH 2310/3449] qt56.full: add missing modules

qtquickcontrols2, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).

(The qt55 expression already has all modules in *full.)
---
 pkgs/development/libraries/qt-5/5.6/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 37b6eb7f3d3c..cc6475d31b64 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -114,9 +114,9 @@ let
       env = callPackage ../qt-env.nix {};
       full = env "qt-${qtbase.version}" [
         qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects
-        qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
-        qtsensors qtserialport qtsvg qttools qttranslations qtwayland
-        qtwebchannel qtwebengine qtwebsockets qtx11extras qtxmlpatterns
+        qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
+        qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland
+        qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns
       ];
 
       makeQtWrapper =

From db937b9d60c281ab34f329867f593cbacaa6866a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Tue, 7 Mar 2017 20:54:24 +0100
Subject: [PATCH 2311/3449] qt57.full: add missing modules

qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.

Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
---
 pkgs/development/libraries/qt-5/5.7/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.7/default.nix b/pkgs/development/libraries/qt-5/5.7/default.nix
index f468670674f0..f387a242101b 100644
--- a/pkgs/development/libraries/qt-5/5.7/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/default.nix
@@ -98,10 +98,11 @@ let
 
       env = callPackage ../qt-env.nix {};
       full = env "qt-${qtbase.version}" [
-        qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
-        qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
+        qtconnectivity qtdeclarative qtdoc qtgraphicaleffects qtimageformats
+        qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript
         qtsensors qtserialport qtsvg qttools qttranslations qtwayland
-        qtwebsockets qtx11extras qtxmlpatterns
+        qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras
+        qtxmlpatterns
       ];
 
       makeQtWrapper =

From a691c0655694fae5ec58019b402a61593cc52d37 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 13 Mar 2017 15:13:02 +0100
Subject: [PATCH 2312/3449] linux_testing: 4.11-rc1 -> 4.11-rc2

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 329f80d0e67e..c02b8209f2fe 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -456,7 +456,7 @@ with stdenv.lib;
   FTRACE_SYSCALLS y
   SCHED_TRACER y
   STACK_TRACER y
-  UPROBE_EVENT y
+  UPROBE_EVENT? y
   ${optionalString (versionAtLeast version "4.4") ''
     BPF_SYSCALL y
     BPF_EVENTS y
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 124486606637..b9f5d152bf6b 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-rc1";
-  modDirVersion = "4.11.0-rc1";
+  version = "4.11-rc2";
+  modDirVersion = "4.11.0-rc2";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "19zcyjqiw255d48k1mk33i1wgbiwv58nn3dw9i9079hfb843s28l";
+    sha256 = "1rfdnx7klrb8z9372ydmrsw6bk3i6xqa0am3vjqy75mjp54063vx";
   };
 
   features.iwlwifi = true;

From 44bd7c45dcbb2ef6f833aa17e4f51a6736d60136 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 13 Mar 2017 15:13:28 +0100
Subject: [PATCH 2313/3449] linux_4_10: 4.10.1 -> 4.10.2

---
 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 01ee7211ba6f..cdcd4ccc21f3 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.1";
+  version = "4.10.2";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hrmph137q4j2xfsv1fyayig47g4v8ivd2rqsw03dy7mzasnp83c";
+    sha256 = "1m5ahr1m36kdni80xj4imhhw26l8621rsaaa3z4gkjmnq6n0bnxr";
   };
 
   kernelPatches = args.kernelPatches;

From 5b946fdafcf752fd01a687acf784f99e013b66e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 13 Mar 2017 15:26:41 +0100
Subject: [PATCH 2314/3449] atlassian-crowd: 2.10.1 -> 2.11.1

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

diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 05b88cf9cf3b..d80691231c5e 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-crowd-${version}";
-  version = "2.10.1";
+  version = "2.11.1";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
-    sha256 = "1pl4wyqvzqb97ql23530amslrrsysi0fmmnzpihhgqhvhwf57sc6";
+    sha256 = "12gb9p5npcdr7mxyyir3xgjkc6n05zfi4i5dqkg8f7jrhi49nas7";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From a26c51116d681a2828ad836386b7698dc3876689 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 14 Mar 2017 23:18:23 +0100
Subject: [PATCH 2315/3449] disnix: 0.6 -> 0.7

---
 .../disnix/DisnixWebService/default.nix                |  6 +++---
 pkgs/tools/package-management/disnix/default.nix       | 10 ++++------
 .../package-management/disnix/disnixos/default.nix     |  8 +++-----
 .../package-management/disnix/dysnomia/default.nix     |  6 +++---
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 08847b999cfe..152dc7dcc040 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
 
 stdenv.mkDerivation {
-  name = "DisnixWebService-0.6";
+  name = "DisnixWebService-0.7";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/36899117/download/4/DisnixWebService-0.6.tar.bz2;
-    sha256 = "0yvwjnzk1q4y3wj8pi6z3i7akw83ah9xm2v93ni1ri70z5930mdz";
+    url = https://github.com/svanderburg/DisnixWebService/files/842861/DisnixWebService-0.7.tar.gz;
+    sha256 = "1zqy0badqqw8pzp9ky2aayi27v6znd64zafacvywjrn185fjz17g";
   };
   buildInputs = [ apacheAnt jdk ];
   PREFIX = ''''${env.out}'';
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 45bd2abe8ece..e83f8047f4ba 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,21 +1,19 @@
 { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.6.1";
+  name = "disnix-0.7";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz;
-    sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj";
+    url = https://github.com/svanderburg/disnix/files/842828/disnix-0.7.tar.gz;
+    sha256 = "120iaqpj7zcy94dpizzdxjwf8qb2rfrx5394jghmhc6jy88vdp71";
   };
   
   buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
 
-  dontStrip = true;
-  
   meta = {
     description = "A Nix-based distributed service deployment tool";
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [ stdenv.lib.maintainers.sander ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index eb0b7d2a4187..81be1549c83c 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.5";
+  name = "disnixos-0.6";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/36899006/download/3/disnixos-0.5.tar.gz;
-    sha256 = "0pl3j8kwcz90as5cs0yipfbg555lw3z6xsylk6g2ili878mni1aq";
+    url = https://github.com/svanderburg/disnixos/files/842874/disnixos-0.6.tar.gz;
+    sha256 = "0pgqsk8qndn614z02jq3vbxzpx6fmgsm6pr1g0iqz55pzwamw9j7";
   };
   
   buildInputs = [ socat pkgconfig dysnomia disnix getopt ];
   
-  dontStrip = true;
-  
   meta = {
     description = "Provides complementary NixOS infrastructure deployment to Disnix";
     license = stdenv.lib.licenses.lgpl21Plus;
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index 08f58f668ece..e33776eaa2b7 100644
--- a/pkgs/tools/package-management/disnix/dysnomia/default.nix
+++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix
@@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null;
 assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null);
 
 stdenv.mkDerivation {
-  name = "dysnomia-0.6.1";
+  name = "dysnomia-0.7";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz;
-    sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi";
+    url = https://github.com/svanderburg/dysnomia/files/842819/dysnomia-0.7.tar.gz;
+    sha256 = "0nlb7fvndnxs878aah30cac4gqf2w9qq4bdpqj4m0j3d9nhpak2j";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

From ee69ee419bc9afdb9a398f4a53e910f292d3165e Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 14 Mar 2017 22:02:43 +0100
Subject: [PATCH 2316/3449] liquid-dsp: init at 20170307

liquid-dsp is a dependency for the latest git version of inspectrum, therefore I
added it in order to be able to upgrade inspectrum.
---
 .../libraries/liquid-dsp/default.nix          | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/liquid-dsp/default.nix

diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix
new file mode 100644
index 000000000000..391606d59e68
--- /dev/null
+++ b/pkgs/development/libraries/liquid-dsp/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "liquid-dsp-${version}";
+  version = "20170307";
+
+  src = fetchFromGitHub {
+    owner = "jgaeddert";
+    repo = "liquid-dsp";
+    rev = "8c1978fa4f5662b8849fe712be716958f29cec0e";
+    sha256 = "0zpxvdsrw0vzzp3iaag3wh4z8ygl7fkswgjppp2fz2zhhqh93k2w";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = {
+    homepage = http://liquidsdr.org/;
+    description = "Digital signal processing library for software-defined radios";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.unix;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a73c033c4ee..0294b3671484 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8865,6 +8865,8 @@ with pkgs;
 
   lirc = callPackage ../development/libraries/lirc { };
 
+  liquid-dsp = callPackage ../development/libraries/liquid-dsp { };
+
   liquidfun = callPackage ../development/libraries/liquidfun { };
 
   live555 = callPackage ../development/libraries/live555 { };

From 2876cd7e98df572b900239539052badcfa44d438 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 14 Mar 2017 22:08:05 +0100
Subject: [PATCH 2317/3449] inspectrum: 20160403 -> 20170218

---
 pkgs/applications/misc/inspectrum/default.nix | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
index 536582e4ee71..6ec968ecc94d 100644
--- a/pkgs/applications/misc/inspectrum/default.nix
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -1,18 +1,35 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, boost, fftwFloat, qt5, gnuradio }:
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, cmake
+, boost
+, fftwFloat
+, qt5
+, gnuradio
+, liquid-dsp
+}:
 
 stdenv.mkDerivation rec {
   name = "inspectrum-${version}";
-  version = "20160403";
+  version = "20170218";
 
   src = fetchFromGitHub {
     owner = "miek";
     repo = "inspectrum";
-    rev = "27381dbb30f59267a429c04d17d792d3953a6b99";
-    sha256 = "0y4j62khq6fcv2qqlqi0kn2ix821m5gcqzg72nhc2zzfb3cdm9nm";
+    rev = "d8d1969a4cceeee0ebfd2f39e791fddd5155d4de";
+    sha256 = "05sarfin9wqkvgwn3fil1r4bay03cwzzhjwbdjslibc5chdrr2cn";
   };
 
-  buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat boost gnuradio ];
-  
+  buildInputs = [
+    pkgconfig
+    cmake
+    qt5.qtbase
+    fftwFloat
+    boost
+    gnuradio
+    liquid-dsp
+  ];
+
   meta = with stdenv.lib; {
     description = "Tool for analysing captured signals from sdr receivers";
     homepage = https://github.com/miek/inspectrum;

From 83052ef9db71b5f70e65b25e255d61da3eaaa0ac Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 13 Mar 2017 20:04:42 +0100
Subject: [PATCH 2318/3449] nixos/dnscrypt-proxy: support reload

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

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index beddaa076122..66fa5e6dd3c5 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -197,6 +197,7 @@ in
       serviceConfig = {
         NonBlocking = "true";
         ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy ${toString daemonArgs}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
 
         User = "dnscrypt-proxy";
 

From 9325c3a61646fb1da6ff7377da23c119523d038a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 12 Mar 2017 16:20:10 +0100
Subject: [PATCH 2319/3449] nixos/dnscrypt-proxy: simplify module logic related
 to apparmor

---
 .../modules/services/networking/dnscrypt-proxy.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 66fa5e6dd3c5..37d56f1c3c17 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -2,8 +2,6 @@
 with lib;
 
 let
-  apparmorEnabled = config.security.apparmor.enable;
-
   cfg = config.services.dnscrypt-proxy;
 
   stateDirectory = "/var/lib/dnscrypt-proxy";
@@ -187,12 +185,8 @@ in
       documentation = [ "man:dnscrypt-proxy(8)" ];
 
       before = [ "nss-lookup.target" ];
-
-      after = [ "network.target" ]
-        ++ optional apparmorEnabled "apparmor.service";
-
-      requires = [ "dnscrypt-proxy.socket "]
-        ++ optional apparmorEnabled "apparmor.service";
+      after = [ "network.target" ];
+      requires = [ "dnscrypt-proxy.socket "];
 
       serviceConfig = {
         NonBlocking = "true";
@@ -208,7 +202,9 @@ in
     };
     }
 
-    (mkIf apparmorEnabled {
+    (mkIf config.security.apparmor.enable {
+    systemd.services.dnscrypt-proxy.after = [ "apparmor.service" ];
+
     security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
       ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy {
         /dev/null rw,

From 719813caf6309441fcf502d4c88aabddc7d5ca70 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 15:36:13 +0100
Subject: [PATCH 2320/3449] nixos/dnscrypt-proxy: replace unimportant options
 with extraArgs

Removes tcpOnly and ephemeralKeys: reifying them as nixos
options adds little beyond improved discoverability.  Until
17.09 we'll automatically translate these options into extraArgs
for convenience.

Unless reifying an option is necessary for conditional
computation or greatly simplifies configuration/reduces risk of
misconfiguration, it should go into extraArgs instead.
---
 .../services/networking/dnscrypt-proxy.nix    | 79 +++++++++++--------
 1 file changed, 44 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 37d56f1c3c17..251097c160c7 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -6,8 +6,6 @@ let
 
   stateDirectory = "/var/lib/dnscrypt-proxy";
 
-  localAddress = "${cfg.localAddress}:${toString cfg.localPort}";
-
   # The minisign public key used to sign the upstream resolver list.
   # This is somewhat more flexible than preloading the key as an
   # embedded string.
@@ -16,31 +14,36 @@ let
     sha256 = "18lnp8qr6ghfc2sd46nn1rhcpr324fqlvgsp4zaigw396cd7vnnh";
   };
 
-  # Internal flag indicating whether the upstream resolver list is used
+  # Internal flag indicating whether the upstream resolver list is used.
   useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null;
 
+  # The final local address.
+  localAddress = "${cfg.localAddress}:${toString cfg.localPort}";
+
+  # The final resolvers list path.
   resolverList =
     if (cfg.resolverList != null)
       then cfg.resolverList
       else "${stateDirectory}/dnscrypt-resolvers.csv";
 
-  resolverArgs = if (cfg.customResolver != null)
-    then
-      [ "--resolver-address=${cfg.customResolver.address}:${toString cfg.customResolver.port}"
-        "--provider-name=${cfg.customResolver.name}"
-        "--provider-key=${cfg.customResolver.key}"
-      ]
-    else
-      [ "--resolvers-list=${resolverList}"
-        "--resolver-name=${cfg.resolverName}"
-      ];
+  # Build daemon command line
+
+  resolverArgs =
+    if (cfg.customResolver == null)
+      then
+        [ "-L ${resolverList}"
+          "-R ${cfg.resolverName}"
+        ]
+      else with cfg.customResolver;
+        [ "-N ${name}"
+          "-k ${key}"
+          "-r ${address}:${toString port}"
+        ];
 
-  # The final command line arguments passed to the daemon
   daemonArgs =
-    [ "--local-address=${localAddress}" ]
-    ++ optional cfg.tcpOnly "--tcp-only"
-    ++ optional cfg.ephemeralKeys "-E"
-    ++ resolverArgs;
+       [ "-a ${localAddress}" ]
+    ++ resolverArgs
+    ++ cfg.extraArgs;
 in
 
 {
@@ -50,6 +53,9 @@ in
   };
 
   options = {
+    # Before adding another option, consider whether it could
+    # equally well be passed via extraArgs.
+
     services.dnscrypt-proxy = {
       enable = mkOption {
         default = false;
@@ -131,24 +137,13 @@ in
         }; }));
       };
 
-      tcpOnly = mkOption {
-        default = false;
-        type = types.bool;
+      extraArgs = mkOption {
+        default = [];
+        type = types.listOf types.str;
         description = ''
-          Force sending encrypted DNS queries to the upstream resolver over
-          TCP instead of UDP (on port 443). Use only if the UDP port is blocked.
-        '';
-      };
-
-      ephemeralKeys = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Compute a new key pair for every query.  Enabling this option
-          increases CPU usage, but makes it more difficult for the upstream
-          resolver to track your usage of their service across IP addresses.
-          The default is to re-use the public key pair for all queries, making
-          tracking trivial.
+          Additional command-line arguments passed verbatim to the daemon.
+          See <citerefentry><refentrytitle>dnscrypt-proxy</refentrytitle>
+          <manvolnum>8</manvolnum></citerefentry> for details.
         '';
       };
     };
@@ -309,5 +304,19 @@ in
 
   imports = [
     (mkRenamedOptionModule [ "services" "dnscrypt-proxy" "port" ] [ "services" "dnscrypt-proxy" "localPort" ])
+
+    (mkChangedOptionModule
+      [ "services" "dnscrypt-proxy" "tcpOnly" ]
+      [ "services" "dnscrypt-proxy" "extraArgs" ]
+      (config:
+        let val = getAttrFromPath [ "services" "dnscrypt-proxy" "tcpOnly" ] config; in
+        optional val "-T"))
+
+    (mkChangedOptionModule
+      [ "services" "dnscrypt-proxy" "ephemeralKeys" ]
+      [ "services" "dnscrypt-proxy" "extraArgs" ]
+      (config:
+        let val = getAttrFromPath [ "services" "dnscrypt-proxy" "ephemeralKeys" ] config; in
+        optional val "-E"))
   ];
 }

From 540740598e6765e75a5f589928bb9b886f427341 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 18:45:11 +0100
Subject: [PATCH 2321/3449] nixos/dnscrypt-proxy: add example of how to use the
 cache plugin

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

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 251097c160c7..d0fc0a79c60a 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -145,6 +145,7 @@ in
           See <citerefentry><refentrytitle>dnscrypt-proxy</refentrytitle>
           <manvolnum>8</manvolnum></citerefentry> for details.
         '';
+        example = [ "-X libdcplugin_example_cache.so,--min-ttl=60" ];
       };
     };
   };

From 472002f2164916f3271918aa0470fac205e94518 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 10 Mar 2017 14:20:30 +0100
Subject: [PATCH 2322/3449] nixos/dnscrypt-proxy: remove the resolverList
 option

This option was initially added to make it easier to use an
up-to-date list, but now that we always use an up-to-date list
from upstream, there's no point to the option.

From now on, you can either use a resolver listed by dnscrypt
upstream or a custom resolver.
---
 .../services/networking/dnscrypt-proxy.nix    | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index d0fc0a79c60a..2be86df9ece1 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -15,16 +15,13 @@ let
   };
 
   # Internal flag indicating whether the upstream resolver list is used.
-  useUpstreamResolverList = cfg.resolverList == null && cfg.customResolver == null;
+  useUpstreamResolverList = cfg.customResolver == null;
 
   # The final local address.
   localAddress = "${cfg.localAddress}:${toString cfg.localPort}";
 
   # The final resolvers list path.
-  resolverList =
-    if (cfg.resolverList != null)
-      then cfg.resolverList
-      else "${stateDirectory}/dnscrypt-resolvers.csv";
+  resolverList = "${stateDirectory}/dnscrypt-resolvers.csv";
 
   # Build daemon command line
 
@@ -88,19 +85,11 @@ in
         default = "dnscrypt.eu-nl";
         type = types.nullOr types.str;
         description = ''
-          The name of the upstream DNSCrypt resolver to use, taken from
-          <filename>${resolverList}</filename>.  The default resolver is
-          located in Holland, supports DNS security extensions, and
-          <emphasis>claims</emphasis> to not keep logs.
-        '';
-      };
-
-      resolverList = mkOption {
-        default = null;
-        type = types.nullOr types.path;
-        description = ''
-          List of DNSCrypt resolvers.  The default is to use the list of
-          public resolvers provided by upstream.
+          The name of the DNSCrypt resolver to use, taken from
+          <filename>${resolverList}</filename>.  The default
+          resolver is located in Holland, supports DNS security
+          extensions, and <emphasis>claims</emphasis> to not
+          keep logs.
         '';
       };
 
@@ -319,5 +308,10 @@ in
       (config:
         let val = getAttrFromPath [ "services" "dnscrypt-proxy" "ephemeralKeys" ] config; in
         optional val "-E"))
+
+    (mkRemovedOptionModule [ "services" "dnscrypt-proxy" "resolverList" ] ''
+      The current resolver listing from upstream is always used
+      unless a custom resolver is specified.
+    '')
   ];
 }

From de15e7894b582efffceead81e437cd6992debb9f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 00:29:49 +0100
Subject: [PATCH 2323/3449] nixos/dnscrypt-proxy: get resolver list from github

The list has disappeared from its ordinary location at
download.dnscrypt.org.
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 2be86df9ece1..9183700a73dc 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -254,12 +254,12 @@ in
       path = with pkgs; [ curl diffutils dnscrypt-proxy minisign ];
       script = ''
         cd ${stateDirectory}
-        domain=download.dnscrypt.org
+        domain=raw.githubusercontent.com
         get="curl -fSs --resolve $domain:443:$(hostip -r 8.8.8.8 $domain | head -1)"
         $get -o dnscrypt-resolvers.csv.tmp \
-          https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv
+          https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv
         $get -o dnscrypt-resolvers.csv.minisig.tmp \
-          https://$domain/dnscrypt-proxy/dnscrypt-resolvers.csv.minisig
+          https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig
         mv dnscrypt-resolvers.csv.minisig{.tmp,}
         minisign -q -V -p ${upstreamResolverListPubKey} \
           -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig

From f122f0147bb0275bc4cb3eb5d62bbdb3ac34349f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 00:52:20 +0100
Subject: [PATCH 2324/3449] nixos/dnscrypt-proxy: log resolver list
 verification failure

Otherwise, the service unit just fails for no discernable
reason.  Verifcation failure is bad so it ought to be easily
discoverable.
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 9183700a73dc..d382fa8c9cb2 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -261,8 +261,11 @@ in
         $get -o dnscrypt-resolvers.csv.minisig.tmp \
           https://$domain/jedisct1/dnscrypt-proxy/master/dnscrypt-resolvers.csv.minisig
         mv dnscrypt-resolvers.csv.minisig{.tmp,}
-        minisign -q -V -p ${upstreamResolverListPubKey} \
-          -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig
+        if ! minisign -q -V -p ${upstreamResolverListPubKey} \
+          -m dnscrypt-resolvers.csv.tmp -x dnscrypt-resolvers.csv.minisig ; then
+          echo "failed to verify resolver list!" >&2
+          exit 1
+        fi
         [[ -f dnscrypt-resolvers.csv ]] && mv dnscrypt-resolvers.csv{,.old}
         mv dnscrypt-resolvers.csv{.tmp,}
         if cmp dnscrypt-resolvers.csv{,.old} ; then

From 541b3ec1bc9357fd5c2ff9bcd96a82920f3316c1 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 02:37:10 +0100
Subject: [PATCH 2325/3449] travis: send emails iff commit caused the build to
 start failing

This setting should ensure that email notifications are sent
*only* when the commit caused the build to start failing.  That
is, no more "the build is still failing" spam.

As an alternative we could consider disabling email
notifications outright and possibly enable IRC notifications
instead.
---
 .travis.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 802af69834d0..bed82810d469 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,3 +18,8 @@ matrix:
 env:
     global:
         - GITHUB_TOKEN=5edaaf1017f691ed34e7f80878f8f5fbd071603f
+
+notifications:
+    email:
+        on_success: never
+        on_failure: change

From 59b795c5901c0a60aa5dd973474e41520224a380 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 14 Mar 2017 22:36:21 -0400
Subject: [PATCH 2326/3449] apple-sdk: 10.9 -> 10.10

This is a slightly less ambitious version of the (now reverted) commit
377cef8d16c47df74d2653432d9bba968236c8a0, which had a bunch of issues
that I don't have time to resolve right now.
---
 pkgs/os-specific/darwin/apple-sdk/default.nix | 24 +++++++++++++++----
 .../darwin/apple-sdk/frameworks.nix           |  3 +++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix
index 1148fe5c4a16..19ae4569c1af 100644
--- a/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -1,17 +1,30 @@
-{ stdenv, fetchurl, xar, gzip, cpio, pkgs }:
+{ stdenv, fetchurl, xar, xz, cpio, pkgs, python }:
 
 let
+  # TODO: make this available to other packages and generalize the unpacking a bit
+  # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d
+  # This isn't needed until we get to SDK 10.11, but that presents other challenges
+  # unpbzx = fetchurl {
+  #   url    = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py";
+  #   sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc";
+  # };
+
   # sadly needs to be exported because security_tool needs it
   sdk = stdenv.mkDerivation rec {
-    version = "10.9";
+    version = "10.10";
     name    = "MacOS_SDK-${version}";
 
+    # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.10.merged-1.sucatalog, which we found by:
+    #  1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
+    #  2. In the resulting file, search for a file called DevSDK ending in .pkg
+    #  3. ???
+    #  4. Profit
     src = fetchurl {
-      url    = "http://swcdn.apple.com/content/downloads/27/02/031-06182/xxog8vxu8i6af781ivf4uhy6yt1lslex34/DevSDK_OSX109.pkg";
-      sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4";
+      url    = "http://swcdn.apple.com/content/downloads/22/52/031-45139/hcjjv7cm4n6yqk56ict73qqw15ikm5iaql/DevSDK_OSX1010.pkg";
+      sha256 = "08bxa93zw7r4vzs28j9giq2qyk3b68ky6jx1bb9850gflr3nvgq1";
     };
 
-    buildInputs = [ xar gzip cpio ];
+    buildInputs = [ xar xz cpio python ];
 
     phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
@@ -114,6 +127,7 @@ let
         popd >/dev/null
       }
 
+
       linkFramework "${name}.framework"
     '';
 
diff --git a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
index 9a3c3c556e3b..5475b6641707 100644
--- a/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
+++ b/pkgs/os-specific/darwin/apple-sdk/frameworks.nix
@@ -52,6 +52,7 @@ with frameworks; with libs; {
   GSS                     = [];
   GameController          = [];
   GameKit                 = [ Foundation ];
+  Hypervisor              = [];
   ICADevices              = [ Carbon CF IOBluetooth ];
   IMServicePlugIn         = [];
   IOBluetoothUI           = [ IOBluetooth ];
@@ -117,4 +118,6 @@ with frameworks; with libs; {
   OpenDirectory       = [];
   Quartz              = [ QuickLook QTKit ];
   QuartzCore          = [ ApplicationServices CF CoreVideo OpenCL ];
+
+  vmnet = [];
 }

From dc61ff31a75b76e02a6565e35fa21a11a3a9e5fe Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 14 Mar 2017 22:38:35 -0400
Subject: [PATCH 2327/3449] xhyve: update and fix to use our Hypervisor
 framework

(this is a cherry-picked version of f3b65f67d98a2e67c739d4b76b3340eda1dd06f4,
which got reverted because it depended on my 10.11 frameworks, which were
flawed)
---
 .../virtualization/xhyve/default.nix          | 20 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  6 +++++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix
index b7205ac000e2..c519784a6233 100644
--- a/pkgs/applications/virtualization/xhyve/default.nix
+++ b/pkgs/applications/virtualization/xhyve/default.nix
@@ -1,19 +1,25 @@
-{ stdenv, lib, fetchurl }:
+{ stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc }:
 
 stdenv.mkDerivation rec {
-  name = "xhyve-${version}";
-  version = "0.2.0";
+  name    = "xhyve-${version}";
+  version = "1f1dbe305";
 
   src = fetchurl {
-    url = "https://github.com/mist64/xhyve/archive/v${version}.tar.gz";
-    sha256 = "0g1vknnh88kxc8aaqv3j9wqhq45mm9xxxbn1vcrypj3kk9991hrj";
+    url    = "https://github.com/mist64/xhyve/archive/1f1dbe3059904f885e4ab2b3328f4bb350ea5c37.tar.gz";
+    sha256 = "0hfix8yr90szlv2yyqb2rlq5qsrxyam8kg52sly0adja0cpwfjvx";
   };
 
+  buildInputs = [ Hypervisor vmnet xpc libobjc ];
+
   # Don't use git to determine version
-  buildFlags = ''
-    CFLAGS=-DVERSION=\"${version}\"
+  prePatch = ''
+    substituteInPlace Makefile \
+      --replace 'shell git describe --abbrev=6 --dirty --always --tags' "$version"
   '';
 
+
+  makeFlags = [ "CFLAGS+=-Wno-shift-sign-overflow" ''CFLAGS+=-DVERSION=\"${version}\"'' ];
+
   installPhase = ''
     mkdir -p $out/bin
     cp build/xhyve $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a73c033c4ee..8879a1390afe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18148,7 +18148,11 @@ with pkgs;
 
   xcftools = callPackage ../tools/graphics/xcftools { };
 
-  xhyve = callPackage ../applications/virtualization/xhyve { };
+  xhyve = callPackage ../applications/virtualization/xhyve {
+    inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
+    inherit (darwin.apple_sdk.libs) xpc;
+    inherit (darwin) libobjc;
+  };
 
   xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { };
 

From d546966d7db702c458e75b4ebab2ef2512bd2411 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Wed, 15 Mar 2017 17:22:35 +1300
Subject: [PATCH 2328/3449] entr: upgrade to 3.7

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

diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 8ba92990b536..a68e2be6aebe 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4";
+    sha256 = "0bx2ivx9hwixjwmk7aqlx20mwmn3cvryppnmc285d7byiw6dbvwl";
   };
 
   postPatch = ''

From 9e60a17cb82b4387832fd563892c8ee1639a99c8 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 07:23:52 +0100
Subject: [PATCH 2329/3449] grsecurity: 4.9.14-201703121245 ->
 4.9.15-201703150049

Contains a fix for the n_hdlc double free bug.
---
 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 b10ef6a6a67d..540ec0e5699f 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.14";
+  version = "4.9.15";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "0qc78s1j3mm03qs5m3dkc1ah9zchwdkmnkl1bl516dr9gy9i386all5c3f9bxniy8dd3lsk7bgfyqnigav1gyaki7vf9jh9ywqz58vd";
+    sha512 = "3p0cfjfmq4r04w6bjyi2aphq171yavv9m06b29wjsglb1bbkyiy4v278r99cq913msmdp3xs0ba1rkc36qp7cv7hxc29pj0w06ajwls";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 25441c5a5d26..c3da24bdfac4 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.14";
-      grrev  = "201703121245";
-      sha512 = "1h9d1vvfwxn8flzhbii7xd808cmhw8az895sk3fam2vjy5ls1mxvrmvw0z9nzx5sq2hgjg9adyz52y5nj2rza09n3m2gn4i7lid81hh";
+    { kver   = "4.9.15";
+      grrev  = "201703150049";
+      sha512 = "1x02ncl94835n85kpp5bfvy6863sb482fw30x2pqszi4aivjc31i77vj135a7f508ni1b9rbbl8a0m3q4nb8gdbia75zcxbjdi9ij9m";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From c7669601505c46c695af7c6f6332f2f5a8ee3cb6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 8 Mar 2017 11:00:11 -0600
Subject: [PATCH 2330/3449] lit: init at 0.5

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

diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix
new file mode 100644
index 000000000000..adc5ba967583
--- /dev/null
+++ b/pkgs/development/tools/misc/lit/default.nix
@@ -0,0 +1,22 @@
+{ lib, python2 }:
+
+python2.pkgs.buildPythonApplication rec {
+  pname = "lit";
+  version = "0.5.0";
+  name = "${pname}-${version}";
+
+  src = python2.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "3ea4251e78ebeb2e07be2feb33243d1f8931d956efc96ccc2b0846ced212b58c";
+  };
+
+  # Non-standard test suite. Needs custom checkPhase.
+  doCheck = false;
+
+  meta = {
+    description = "Portable tool for executing LLVM and Clang style test suites";
+    homepage = "http://llvm.org/docs/CommandGuide/lit.html";
+    license = lib.licenses.ncsa;
+    maintainers = with lib.maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a73c033c4ee..533d1c1e7da8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6586,6 +6586,8 @@ with pkgs;
 
   libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
 
+  lit = callPackage ../development/tools/misc/lit { };
+
   lsof = callPackage ../development/tools/misc/lsof { };
 
   ltrace = callPackage ../development/tools/misc/ltrace { };

From ada3bcdcda6c0a1b6d1267f5dfebe76538f4545b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 15 Mar 2017 09:36:34 +0100
Subject: [PATCH 2331/3449] mpd: 0.20.5 -> 0.20.6

---
 pkgs/servers/mpd/default.nix |  6 ++----
 pkgs/servers/mpd/i386.patch  | 14 --------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/servers/mpd/i386.patch

diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 87a477ab057d..e3938ec71a84 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -33,17 +33,15 @@ let
   opt = stdenv.lib.optional;
   mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}";
   major = "0.20";
-  minor = "5";
+  minor = "6";
 
 in stdenv.mkDerivation rec {
   name = "mpd-${major}${if minor == "" then "" else "." + minor}";
   src = fetchurl {
     url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
-    sha256 = "11w9v0l9lf504nkxlb91y5r9x403ikl626mjd1lf4fj44yz76maj";
+    sha256 = "0isbpa79m7zf09w3s1ry638cw96rxasy1ch66zl01k75i48mw1gl";
   };
 
-  patches = [ ./i386.patch ];
-
   buildInputs = [ pkgconfig glib boost ]
     ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit
     ++ opt stdenv.isLinux systemd
diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/i386.patch
deleted file mode 100644
index dca8ea88a8b5..000000000000
--- a/pkgs/servers/mpd/i386.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
-index 6986453..167fc07 100644
---- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx
-+++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx
-@@ -20,8 +20,8 @@
- /* necessary because libavutil/common.h uses UINT64_C */
- #define __STDC_CONSTANT_MACROS
- 
--#include "lib/ffmpeg/Time.hxx"
- #include "config.h"
-+#include "lib/ffmpeg/Time.hxx"
- #include "FfmpegDecoderPlugin.hxx"
- #include "lib/ffmpeg/Domain.hxx"
- #include "lib/ffmpeg/Error.hxx"

From 61f20c94ca8486071cfc1ed0216e7efa3a6079f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 15 Mar 2017 10:12:25 +0100
Subject: [PATCH 2332/3449] taskjuggler: remove 2.x series

The version was released 8 years ago and does not build anymore
---
 .../misc/taskjuggler/2.x/default.nix          | 76 -------------------
 .../misc/taskjuggler/2.x/timezone-glibc.patch | 48 ------------
 .../misc/taskjuggler/{3.x => }/Gemfile        |  0
 .../misc/taskjuggler/{3.x => }/Gemfile.lock   |  0
 .../misc/taskjuggler/{3.x => }/default.nix    |  0
 .../misc/taskjuggler/{3.x => }/gemset.nix     |  0
 pkgs/top-level/all-packages.nix               |  8 +-
 7 files changed, 2 insertions(+), 130 deletions(-)
 delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/default.nix
 delete mode 100644 pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
 rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile (100%)
 rename pkgs/applications/misc/taskjuggler/{3.x => }/Gemfile.lock (100%)
 rename pkgs/applications/misc/taskjuggler/{3.x => }/default.nix (100%)
 rename pkgs/applications/misc/taskjuggler/{3.x => }/gemset.nix (100%)

diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix
deleted file mode 100644
index 2a199843cb3b..000000000000
--- a/pkgs/applications/misc/taskjuggler/2.x/default.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{stdenv, fetchurl,
-zlib, libpng, libjpeg, perl, expat, qt3,
-libX11, libXext, libSM, libICE,
-}:
-
-stdenv.mkDerivation rec {
-  name = "taskjuggler-2.4.3";
-  src = fetchurl {
-    url = "http://www.taskjuggler.org/download/${name}.tar.bz2";
-    sha256 = "14gkxa2vwfih5z7fffbavps7m44z5bq950qndigw2icam5ks83jl";
-  };
-
-  buildInputs =
-    [zlib libpng libX11 libXext libSM libICE perl expat libjpeg]
-    ;
-
-  patches = [ ./timezone-glibc.patch ];
-
-  preConfigure = ''
-    for i in $(grep -R "/bin/bash" .  | sed 's/:.*//'); do
-      substituteInPlace $i --replace /bin/bash $(type -Pp bash)
-    done
-    for i in $(grep -R "/usr/bin/perl" .  | sed 's/:.*//'); do
-      substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl
-    done
-
-    # Fix install
-    for i in docs/en/Makefile.in Examples/BigProject/Common/Makefile.in Examples/BigProject/Makefile.in Examples/BigProject/Project1/Makefile.in Examples/BigProject/Project2/Makefile.in Examples/FirstProject/Makefile.in Examples/ShiftSchedule/Makefile.in; do
-      # Do not use variable substitution because there is some text after the last '@'
-      substituteInPlace $i --replace 'docprefix = @PACKAGES_DIR@' 'docprefix = $(docdir)/'
-    done
-
-    # Comment because the ical export need the KDE support.
-    for i in Examples/FirstProject/AccountingSoftware.tjp; do
-      substituteInPlace $i --replace "icalreport" "# icalreport"
-    done
-
-    for i in TestSuite/testdir TestSuite/createrefs \
-      TestSuite/Scheduler/Correct/Expression.sh; do
-      substituteInPlace $i --replace '/bin/rm' 'rm'
-    done
-
-    # Some tests require writing at $HOME
-    HOME=$TMPDIR
-  '';
-
-  configureFlags = "
-    --without-arts --disable-docs
-    --x-includes=${libX11.dev}/include
-    --x-libraries=${libX11.out}/lib
-    --with-qt-dir=${qt3}
-  ";
-
-  preInstall = ''
-    mkdir -p $out/share/emacs/site-lisp/
-    cp Contrib/emacs/taskjug.el $out/share/emacs/site-lisp/
-  '';
-
-  installFlags =
-    # kde_locale is not defined when installing without kde.
-    "kde_locale=\${out}/share/locale";
-
-  meta = {
-    homepage = "http://www.taskjuggler.org";
-    license = stdenv.lib.licenses.gpl2;
-    description = "Project management tool";
-    longDescription = ''
-      TaskJuggler is a modern and powerful, Open Source project management
-      tool. Its new approach to project planing and tracking is more
-      flexible and superior to the commonly used Gantt chart editing
-      tools. It has already been successfully used in many projects and
-      scales easily to projects with hundreds of resources and thousands of
-      tasks.
-    '';
-  };
-}
diff --git a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch b/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
deleted file mode 100644
index f599e8a1730c..000000000000
--- a/pkgs/applications/misc/taskjuggler/2.x/timezone-glibc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From the discussion in http://groups.google.com/group/taskjuggler-users/browse_thread/thread/f65a3efd4dcae2fc/a44c711a9d28ebee?show_docid=a44c711a9d28ebee
-
-From: Chris Schlaeger <cs@kde.org>
-Date: Sat, 27 Feb 2010 06:33:35 +0000 (+0100)
-Subject: Try to fix time zone check for glibc 2.11.
-X-Git-Url: http://www.taskjuggler.org/cgi-bin/gitweb.cgi?p=taskjuggler.git;a=commitdiff_plain;h=2382ed54f90c3c899badb3f56aaa2b3b5dba361e;hp=c666c5068312fec7db75e17d1c567d94127d1dda
-
-Try to fix time zone check for glibc 2.11.
-
-Reported-by: Lee <pFQh8RQn4fqB@dyweni.com>
----
-
-diff --git a/taskjuggler/Utility.cpp b/taskjuggler/Utility.cpp
-index 5e2bf21..9b7fce2 100644
---- a/taskjuggler/Utility.cpp
-+++ b/taskjuggler/Utility.cpp
-@@ -206,16 +206,28 @@ setTimezone(const char* tZone)
- 
-     /* To validate the tZone value we call tzset(). It will convert the zone
-      * into a three-letter acronym in case the tZone value is good. If not, it
--     * will just copy the wrong value to tzname[0] (glibc < 2.5) or fall back
--     * to UTC. */
-+     * will
-+     * - copy the wrong value to tzname[0] (glibc < 2.5)
-+     * - or fall back to UTC (glibc >= 2.5 && < 2.11)
-+     * - copy the part before the '/' to tzname[0] (glibc >= 2.11).
-+     */
-     tzset();
-+    char* region = new(char[strlen(tZone) + 1]);
-+    region[0] = 0;
-+    if (strchr(tZone, '/'))
-+    {
-+        strcpy(region, tZone);
-+        *strchr(region, '/') = 0;
-+    }
-     if (timezone2tz(tZone) == 0 &&
--        (strcmp(tzname[0], tZone) == 0 ||
-+        (strcmp(tzname[0], tZone) == 0 || strcmp(tzname[0], region) == 0 ||
-          (strcmp(tZone, "UTC") != 0 && strcmp(tzname[0], "UTC") == 0)))
-     {
-         UtilityError = QString(i18n("Illegal timezone '%1'")).arg(tZone);
-+        delete region;
-         return false;
-     }
-+    delete region;
- 
-     if (!LtHashTab)
-         return true;
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile b/pkgs/applications/misc/taskjuggler/Gemfile
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile
rename to pkgs/applications/misc/taskjuggler/Gemfile
diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock
rename to pkgs/applications/misc/taskjuggler/Gemfile.lock
diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/default.nix
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/default.nix
rename to pkgs/applications/misc/taskjuggler/default.nix
diff --git a/pkgs/applications/misc/taskjuggler/3.x/gemset.nix b/pkgs/applications/misc/taskjuggler/gemset.nix
similarity index 100%
rename from pkgs/applications/misc/taskjuggler/3.x/gemset.nix
rename to pkgs/applications/misc/taskjuggler/gemset.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a35800184a5a..33459eb3ea5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4628,7 +4628,7 @@ with pkgs;
   yaft = callPackage ../applications/misc/yaft { };
 
   yarn = callPackage ../development/tools/yarn  { };
-  
+
   yasr = callPackage ../applications/audio/yasr { };
 
   yank = callPackage ../tools/misc/yank { };
@@ -15486,11 +15486,7 @@ with pkgs;
   teamspeak_client = libsForQt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
-  taskjuggler-2 = callPackage ../applications/misc/taskjuggler/2.x { };
-
-  taskjuggler = callPackage ../applications/misc/taskjuggler/3.x {
-    ruby = ruby_2_0;
-  };
+  taskjuggler = callPackage ../applications/misc/taskjuggler { ruby = ruby_2_0; };
 
   tasknc = callPackage ../applications/misc/tasknc { };
 

From 1893ed54dc1ee7cef56be1c2ce7839c9523ba17e Mon Sep 17 00:00:00 2001
From: Mogria <m0gr14@gmail.com>
Date: Wed, 15 Mar 2017 11:32:44 +0100
Subject: [PATCH 2333/3449] sublime3: fix hardcoded /bin/bash when executing
 commands for build systems (#23561)

* sublime3: replace hardcoded /bin/bash with /usr/bin/env

exec.py in Default.package-sublime calls /bin/bash with subprocess.
See Issue #12011. Because of this builds could not be started from
withtin Sublime Text.

* sublime3: use wrapped of bash to fix internal build system

Without the wrapped version of bash (a symlink to $bash/bin/bash)
with LD_PRELOAD to glibc an relocation error occurs when trying
to run builds from within Sublime Text 3.  See Issue #12011.
---
 .../applications/editors/sublime3/default.nix | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 8912aca0711d..0b8ecda62302 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2,
   pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
-  gksuSupport ? false, gksu}:
+  gksuSupport ? false, gksu, unzip, zip, bash }:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 assert gksuSupport -> gksu != null;
@@ -33,6 +33,21 @@ in let
     dontPatchELF = true;
     buildInputs = [ makeWrapper ];
 
+    # make exec.py in Default.sublime-package use own bash with
+    # an LD_PRELOAD instead of "/bin/bash"
+    patchPhase = ''
+      mkdir Default.sublime-package-fix
+      ( cd Default.sublime-package-fix
+        ${unzip}/bin/unzip ../Packages/Default.sublime-package > /dev/null
+        substituteInPlace "exec.py" --replace \
+          "[\"/bin/bash\"" \
+          "[\"$out/sublime_bash\""
+      )
+      ${zip}/bin/zip -j Default.sublime-package.zip Default.sublime-package-fix/* > /dev/null
+      mv Default.sublime-package.zip Packages/Default.sublime-package
+      rm -r Default.sublime-package-fix
+    '';
+
     buildPhase = ''
       for i in sublime_text plugin_host crash_reporter; do
         patchelf \
@@ -52,6 +67,12 @@ in let
       mkdir -p $out
       cp -prvd * $out/
 
+      # We can't just call /usr/bin/env bash because a relocation error occurs
+      # when trying to run a build from within Sublime Text
+      ln -s ${bash}/bin/bash $out/sublime_bash
+      wrapProgram $out/sublime_bash \
+        --set LD_PRELOAD "${stdenv.cc.cc.lib}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1"
+
       wrapProgram $out/sublime_text \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
         --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}

From bb3ef8a95c9659596b8a34d27881cd30ffea2f9f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 11 Mar 2017 15:52:12 +0100
Subject: [PATCH 2334/3449] physlock: fix issue 21935

---
 nixos/modules/services/security/physlock.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix
index 34d0be3b1beb..0881483967c6 100644
--- a/nixos/modules/services/security/physlock.nix
+++ b/nixos/modules/services/security/physlock.nix
@@ -26,17 +26,7 @@ in
           This will switch to a new virtual terminal, turn off console
           switching and disable SysRq mechanism (when
           <option>services.physlock.disableSysRq</option> is set)
-          until the root or <option>services.physlock.user</option>
-          password is given.
-        '';
-      };
-
-      user = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        description = ''
-          User whose password will be used to unlock the screen on par
-          with the root password.
+          until the root or user password is given.
         '';
       };
 
@@ -105,7 +95,7 @@ in
               ++ cfg.lockOn.extraTargets;
       serviceConfig.Type = "forking";
       script = ''
-        ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.user != null) " -u ${cfg.user}"}
+        ${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}
       '';
     };
 

From bcc4c261bea58cbababec413c1faa074d1a90efd Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 14 Mar 2017 11:34:04 +0000
Subject: [PATCH 2335/3449] lxc: ensure directory /var/lib/lxc/rootfs

---
 nixos/modules/virtualisation/lxc.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix
index 6759ff0f2fe9..2310fe984325 100644
--- a/nixos/modules/virtualisation/lxc.nix
+++ b/nixos/modules/virtualisation/lxc.nix
@@ -71,6 +71,7 @@ in
     environment.etc."lxc/lxc.conf".text = cfg.systemConfig;
     environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig;
     environment.etc."lxc/default.conf".text = cfg.defaultConfig;
+    systemd.tmpfiles.rules = [ "d /var/lib/lxc/rootfs 0755 root root -" ];
 
     security.apparmor.packages = [ pkgs.lxc ];
     security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ];

From c037f54ffb3aa31ceb6cab975eda7e1a135c5b4f Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 15 Mar 2017 08:46:19 -0300
Subject: [PATCH 2336/3449] firefox: fix debugBuild = true

---
 .../networking/browsers/firefox/default.nix   |  4 +
 .../browsers/firefox/fix-debug.patch          | 77 +++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/firefox/fix-debug.patch

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 68e3bf1b2022..71e8d056ebe9 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -30,6 +30,10 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
     inherit sha512;
   };
 
+  # 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 =
     [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2
       python dbus dbus_glib pango freetype fontconfig xorg.libXi
diff --git a/pkgs/applications/networking/browsers/firefox/fix-debug.patch b/pkgs/applications/networking/browsers/firefox/fix-debug.patch
new file mode 100644
index 000000000000..ba92bbc47403
--- /dev/null
+++ b/pkgs/applications/networking/browsers/firefox/fix-debug.patch
@@ -0,0 +1,77 @@
+
+# HG changeset patch
+# User Michelangelo De Simone <mdesimone@mozilla.com>
+# Date 1479198095 28800
+# Node ID fde6e9ccfc72fbc0fcd93af7a40436b216e7ea1a
+# Parent  687eac6845a77d2cac5505da9c8912885c2a9e57
+Bug 1013882 - TestInterfaceJS should be packaged only if it's available. r=glandium, a=jcristau
+
+MozReview-Commit-ID: IEHesdoU4Sz
+
+diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in
+--- a/b2g/installer/package-manifest.in
++++ b/b2g/installer/package-manifest.in
+@@ -570,17 +570,17 @@
+ @RESPATH@/components/InputMethod.manifest
+ #ifdef MOZ_B2G
+ @RESPATH@/components/inputmethod.xpt
+ #endif
+ 
+ @RESPATH@/components/SystemUpdate.manifest
+ @RESPATH@/components/SystemUpdateManager.js
+ 
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
+ @RESPATH@/components/TestInterfaceJSMaplike.js
+ #endif
+ 
+ ; Modules
+ @RESPATH@/modules/*
+ 
+diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
+--- a/browser/installer/package-manifest.in
++++ b/browser/installer/package-manifest.in
+@@ -554,17 +554,17 @@
+ @RESPATH@/components/PresentationControlService.js
+ @RESPATH@/components/PresentationDataChannelSessionTransport.js
+ @RESPATH@/components/PresentationDataChannelSessionTransport.manifest
+ 
+ ; InputMethod API
+ @RESPATH@/components/MozKeyboard.js
+ @RESPATH@/components/InputMethod.manifest
+ 
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
+ @RESPATH@/components/TestInterfaceJSMaplike.js
+ #endif
+ 
+ ; [Extensions]
+ @RESPATH@/components/extensions-toolkit.manifest
+ @RESPATH@/browser/components/extensions-browser.manifest
+diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
+--- a/mobile/android/installer/package-manifest.in
++++ b/mobile/android/installer/package-manifest.in
+@@ -381,17 +381,17 @@
+ 
+ @BINPATH@/components/CaptivePortalDetectComponents.manifest
+ @BINPATH@/components/captivedetect.js
+ 
+ #ifdef MOZ_WEBSPEECH
+ @BINPATH@/components/dom_webspeechsynth.xpt
+ #endif
+ 
+-#ifdef MOZ_DEBUG
++#if defined(ENABLE_TESTS) && defined(MOZ_DEBUG)
+ @BINPATH@/components/TestInterfaceJS.js
+ @BINPATH@/components/TestInterfaceJS.manifest
+ @BINPATH@/components/TestInterfaceJSMaplike.js
+ #endif
+ 
+ @BINPATH@/components/nsAsyncShutdown.manifest
+ @BINPATH@/components/nsAsyncShutdown.js
+ 
+

From 1ea6860cc7352ad739c5a4ac2244c5895a60a21b Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Wed, 15 Mar 2017 08:49:36 -0300
Subject: [PATCH 2337/3449] icu: fix crash in firefox

Fixes #23857
---
 pkgs/development/libraries/icu/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 1508f05db8b6..ea0919caa31f 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -3,6 +3,14 @@
 let
   pname = "icu4c";
   version = "58.2";
+
+  # this patch should no longer be needed in 58.3
+  # https://bugs.gentoo.org/show_bug.cgi?id=599142#c14
+  keywordFix = fetchurl {
+    url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff";
+    name = "icu-changeset-39484.diff";
+    sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8";
+  };
 in
 stdenv.mkDerivation ({
   name = pname + "-" + version;
@@ -32,6 +40,7 @@ stdenv.mkDerivation ({
   '';
   postPatch = ''
     popd
+    patch -p4 < ${keywordFix}
   '';
 
   patches = [

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 2338/3449] 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 63fc33ed17eb..6ae7d0c63911 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 2339/3449] 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 88a39400c77c..e5de7c4e2a42 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 2340/3449] 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 6ae7d0c63911..1ca0a76d6bb6 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 15ca6e149e1bab50f4571d755613f1cc919f7f39 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 17 Feb 2017 15:47:44 -0600
Subject: [PATCH 2341/3449] souper: bump to latest--using LLVM 4 and custom
 KLEE.

Add patch to fix the build when LLVM reports no system libs,
llvm-config's behavior changed in LLVM r291285.

Fixes #22920.
---
 .../compilers/souper/cmake-fix.patch          | 14 +++++++++++++
 pkgs/development/compilers/souper/default.nix | 20 ++++++++++---------
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/compilers/souper/cmake-fix.patch

diff --git a/pkgs/development/compilers/souper/cmake-fix.patch b/pkgs/development/compilers/souper/cmake-fix.patch
new file mode 100644
index 000000000000..5ef289f53e93
--- /dev/null
+++ b/pkgs/development/compilers/souper/cmake-fix.patch
@@ -0,0 +1,14 @@
+--- souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt.orig     2017-01-20 13:55:14.783632588 -0600
++++ souper-1be75fe6a96993b57dcba038798fe6d1c7d113eb-src/CMakeLists.txt  2017-01-20 13:55:20.505728456 -0600
+@@ -33,7 +33,10 @@
+   OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
+   OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+-set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
++
++if (LLVM_SYSTEM_LIBS)
++  set(LLVM_LIBS "${LLVM_LIBS} ${LLVM_SYSTEM_LIBS}")
++endif()
+
+ execute_process(
+   COMMAND ${LLVM_CONFIG_EXECUTABLE} --ldflags
diff --git a/pkgs/development/compilers/souper/default.nix b/pkgs/development/compilers/souper/default.nix
index 74e1cbf68d30..6ea135ea9906 100644
--- a/pkgs/development/compilers/souper/default.nix
+++ b/pkgs/development/compilers/souper/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchFromGitHub, cmake, makeWrapper
-, llvmPackages_39, hiredis, z3_opt, gtest
+, llvmPackages_4, hiredis, z3_opt, gtest
 }:
 
 let
   klee = fetchFromGitHub {
-    owner = "klee";
+    owner = "rsas";
     repo  = "klee";
-    rev   = "a743d7072d9ccf11f96e3df45f25ad07da6ad9d6";
-    sha256 = "0qwzs029vlba8xz362n4b00hdm2z3lzhzmvix1r8kpbfrvs8vv91";
+    rev   = "57cd3d43056b029d9da3c6b3c666c4153554c04f";
+    sha256 = "197wb7nbirlfpx2jr3afpjjhcj7slc4dxxi02j3kmazz9kcqaygz";
   };
 in stdenv.mkDerivation {
-  name = "souper-unstable-2017-01-05";
+  name = "souper-unstable-2017-03-07";
 
   src = fetchFromGitHub {
     owner  = "google";
     repo   = "souper";
-    rev    = "1be75fe6a96993b57dcba038798fe6d1c7d113eb";
-    sha256 = "0r8mjb88lwz9a3syx7gwsxlwfg0krffaml04ggaf3ad0cza2mvm8";
+    rev    = "5faed54ddc4a0e0e12647a0eac1da455a1067a47";
+    sha256 = "1v8ml94ryw5wdls9syvicx4sc9l34yaq8r7cf7is6x7y1q677rps";
   };
 
   nativeBuildInputs = [
@@ -25,12 +25,14 @@ in stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    llvmPackages_39.llvm
-    llvmPackages_39.clang-unwrapped
+    llvmPackages_4.llvm
+    llvmPackages_4.clang-unwrapped
     hiredis
     gtest
   ];
 
+  patches = [ ./cmake-fix.patch ];
+
   enableParallelBuilding = true;
 
   preConfigure = ''

From e7dca2c2309389699d510f7df4183331d827ea4c Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@my.jcu.edu.au>
Date: Wed, 15 Mar 2017 22:41:20 +1000
Subject: [PATCH 2342/3449] ITK build on darwin

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

diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix
index ae1f9996b78a..fab14e5d8b3c 100644
--- a/pkgs/development/libraries/itk/default.nix
+++ b/pkgs/development/libraries/itk/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.itk.org/;
     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 8d83fbe439c2a497acbfa67fd5c1758bf79f6136 Mon Sep 17 00:00:00 2001
From: Pradeep Chhetri <pradeep.chhetri89@gmail.com>
Date: Wed, 15 Mar 2017 18:55:03 +0545
Subject: [PATCH 2343/3449] nomad: 0.5.4 -> 0.5.5

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

diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix
index ae3415adef9a..1d39534bc16c 100644
--- a/pkgs/applications/networking/cluster/nomad/default.nix
+++ b/pkgs/applications/networking/cluster/nomad/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "nomad-${version}";
-  version = "0.5.4";
+  version = "0.5.5";
   rev = "v${version}";
 
   goPackagePath = "github.com/hashicorp/nomad";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "hashicorp";
     repo = "nomad";
     inherit rev;
-    sha256 = "0x7bi6wq7kpqv3wfhk5mqikj4hsb0f6lx867xz5l9cq3i39b5gj3";
+    sha256 = "17xq88ymm77b6y27l4v49i9hm6yjyrk61rdb2v7nvn8fa4bn6b65";
   };
 
   meta = with stdenv.lib; {

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 2344/3449] 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 e7b8ff7bf101..f7c11b2029ef 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 000000000000..afec616563cb
--- /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 000000000000..df51a5e8cd62
--- /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 99a797ea509a..9bcdeb3c1ca5 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 162845d5b159fbd1c53ec90e82c41464940df55e Mon Sep 17 00:00:00 2001
From: Andrzej Trzaska <atrzaska2@gmail.com>
Date: Wed, 15 Mar 2017 15:55:45 +0100
Subject: [PATCH 2345/3449] Use gem 2.6.10 (#23902)

---
 pkgs/development/interpreters/ruby/rubygems-src.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix
index 7ea52185d77b..7658c303a1e9 100644
--- a/pkgs/development/interpreters/ruby/rubygems-src.nix
+++ b/pkgs/development/interpreters/ruby/rubygems-src.nix
@@ -1,6 +1,6 @@
 { fetchurl
-, version ? "2.6.8"
-, sha256 ? "1v6n6s8cq5l0xyf1fbm1w4752b9vdk3p130ar59ig72p9vqvkbl1"
+, version ? "2.6.10"
+, sha256 ? "364c0eee8e0c9e8ab4879c5035832e5a27f0c97292d2264af5ae0020585280f0"
 }:
 fetchurl {
   url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz";

From d6c3e744259ad9e364c5f4d9072ce64f950f2dc3 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 15 Mar 2017 11:00:55 -0400
Subject: [PATCH 2346/3449] buildGoModule: share the buildFlagsArray with the
 parallel subprocesses

---
 pkgs/development/go-modules/generic/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index c707592e4ae3..985b4c9b9db1 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -116,6 +116,7 @@ go.stdenv.mkDerivation (
       local d; local cmd;
       cmd="$1"
       d="$2"
+      . $TMPDIR/buildFlagsArray
       echo "$d" | grep -q "\(/_\|examples\|Godeps\)" && return 0
       [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0
       local OUT
@@ -143,6 +144,11 @@ go.stdenv.mkDerivation (
       fi
     }
 
+    if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
+      declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
+    else
+      touch $TMPDIR/buildFlagsArray
+    fi
     export -f buildGoDir # parallel needs to see the function
     if [ -z "$enableParallelBuilding" ]; then
         export NIX_BUILD_CORES=1

From 0c928f4a1d645a5eea14f3940518ef9f0376f317 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 15 Mar 2017 11:01:09 -0400
Subject: [PATCH 2347/3449] terragrunt: Set the version variable properly

---
 pkgs/applications/networking/cluster/terragrunt/0.9.8.nix   | 4 ++++
 pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
index 54ca1a9d7d0f..ec13cbe35bca 100644
--- a/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/0.9.8.nix
@@ -17,6 +17,10 @@ buildGoPackage rec {
 
   buildInputs = [ makeWrapper ];
 
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
+  '';
+
   postInstall = ''
     wrapProgram $bin/bin/terragrunt \
       --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform
diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix
index e2641b2d6571..28fc7fcc6662 100644
--- a/pkgs/applications/networking/cluster/terragrunt/default.nix
+++ b/pkgs/applications/networking/cluster/terragrunt/default.nix
@@ -17,6 +17,10 @@ buildGoPackage rec {
 
   buildInputs = [ makeWrapper ];
 
+  preBuild = ''
+    buildFlagsArray+=("-ldflags" "-X main.VERSION=v${version}")
+  '';
+
   postInstall = ''
     wrapProgram $bin/bin/terragrunt \
       --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform

From d16b08ac85128c2a74cf21463987f4bab0f1dcab Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 15 Mar 2017 16:08:50 +0100
Subject: [PATCH 2348/3449] go2nix: 1.1.1 -> 1.2.0

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

diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 5a77ec7eaa6a..a6f5d62e29e3 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "go2nix-${version}";
-  version = "1.1.1";
+  version = "1.2.0";
   rev = "v${version}";
 
   goPackagePath = "github.com/kamilchm/go2nix";
@@ -12,11 +12,13 @@ buildGoPackage rec {
     inherit rev;
     owner = "kamilchm";
     repo = "go2nix";
-    sha256 = "1idxgn9yf8shw4mq4d7rhf8fvb2s1lli4r4ck0h8ddf1s9q8p63s";
+    sha256 = "1hlanw56r1phj89sicpsfcz6sdjba9qjwhiblcsqka4wfqkai8pn";
   };
 
   goDeps = ./deps.nix;
 
+  outputs = [ "bin" "out" "man" ];
+
   buildInputs = [ go-bindata goimports makeWrapper ];
   preBuild = ''go generate ./...'';
 
@@ -24,6 +26,9 @@ buildGoPackage rec {
     wrapProgram $bin/bin/go2nix \
       --prefix PATH : ${nix-prefetch-git}/bin \
       --prefix PATH : ${git}/bin
+
+    mkdir -p $man/share/man/man1
+    cp $src/go2nix.1 $man/share/man/man1
   '';
 
   allowGoReference = true;

From a8cca7037e445915b5c58a582eae270e65065678 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Tue, 7 Mar 2017 22:59:57 +0100
Subject: [PATCH 2349/3449] prometheus-fritzbox-exporter: init at 1.0

---
 nixos/modules/module-list.nix                 |  1 +
 .../prometheus/fritzbox-exporter.nix          | 76 +++++++++++++++++++
 .../prometheus/fritzbox-exporter.nix          | 24 ++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 102 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c9f1fad0d0e9..627807edb900 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -329,6 +329,7 @@
   ./services/monitoring/prometheus/default.nix
   ./services/monitoring/prometheus/alertmanager.nix
   ./services/monitoring/prometheus/blackbox-exporter.nix
+  ./services/monitoring/prometheus/fritzbox-exporter.nix
   ./services/monitoring/prometheus/json-exporter.nix
   ./services/monitoring/prometheus/nginx-exporter.nix
   ./services/monitoring/prometheus/node-exporter.nix
diff --git a/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
new file mode 100644
index 000000000000..6da39b6519cb
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/fritzbox-exporter.nix
@@ -0,0 +1,76 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.fritzboxExporter;
+in {
+  options = {
+    services.prometheus.fritzboxExporter = {
+      enable = mkEnableOption "prometheus fritzbox exporter";
+
+      port = mkOption {
+        type = types.int;
+        default = 9133;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      gatewayAddress = mkOption {
+        type = types.str;
+        default = "fritz.box";
+        description = ''
+          The hostname or IP of the FRITZ!Box.
+        '';
+      };
+
+      gatewayPort = mkOption {
+        type = types.int;
+        default = 49000;
+        description = ''
+          The port of the FRITZ!Box UPnP service.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the fritzbox exporter.
+        '';
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
+    systemd.services.prometheus-fritzbox-exporter = {
+      description = "Prometheus exporter for FRITZ!Box via UPnP";
+      unitConfig.Documentation = "https://github.com/ndecker/fritzbox_exporter";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "nobody";
+        Restart = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+        ExecStart = ''
+          ${pkgs.prometheus-fritzbox-exporter}/bin/fritzbox_exporter \
+            -listen-address :${toString cfg.port} \
+            -gateway-address ${cfg.gatewayAddress} \
+            -gateway-port ${toString cfg.gatewayPort} \
+            ${concatStringsSep " \\\n  " cfg.extraFlags}
+        '';
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
new file mode 100644
index 000000000000..2e7a4932de62
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "fritzbox-exporter-${version}";
+  version = "1.0";
+  rev = "v${version}";
+
+  goPackagePath = "github.com/ndecker/fritzbox_exporter";
+
+  src= fetchFromGitHub {
+    inherit rev;
+    owner = "ndecker";
+    repo = "fritzbox_exporter";
+    sha256 = "1qk3dgxxz3cnz52jzz0yvfkrkk4s5kdhc26nbfgdpn0ifzqj0awr";
+  };
+
+  meta = with stdenv.lib; {
+    description = "FRITZ!Box UPnP statistics exporter for prometheus";
+    homepage = https://github.com/ndecker/fritzbox_exporter;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ bachp ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 557f05b2577d..07df54e9341f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10808,6 +10808,7 @@ with pkgs;
   prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { };
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
+  prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };
   prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { };
   prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { };

From 14a3412048473e022e4bc2c687c66bb5f30c0e42 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 15 Mar 2017 16:49:08 +0100
Subject: [PATCH 2350/3449] nixos: tests: firefox: make more comprehensive

Run Firefox inside an XTerm, it doesn't crash mysteriously this way.
Also try opening developer tools and checking that Firefox doesn't
crash in the process.
---
 nixos/tests/firefox.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 1bdabe93fec1..e1b628c91445 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -8,15 +8,21 @@ import ./make-test.nix ({ pkgs, ... }: {
     { config, pkgs, ... }:
 
     { imports = [ ./common/x11.nix ];
-      environment.systemPackages = [ pkgs.firefox ];
+      environment.systemPackages = [ pkgs.firefox pkgs.xdotool ];
     };
 
   testScript =
     ''
       $machine->waitForX;
-      $machine->execute("firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html &");
+      $machine->execute("xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' &");
       $machine->waitForWindow(qr/Valgrind/);
       $machine->sleep(40); # wait until Firefox has finished loading the page
+      $machine->execute("xdotool key space"); # do I want to make Firefox the
+                             # default browser? I just want to close the dialog
+      $machine->sleep(2); # wait until Firefox hides the default browser window
+      $machine->execute("xdotool key F12");
+      $machine->sleep(10); # wait until Firefox draws the developer tool panel
+      $machine->succeed("xwininfo -root -tree | grep Valgrind");
       $machine->screenshot("screen");
     '';
 

From 6505c6e3df519bbf800f302e9ba14923b9dabee5 Mon Sep 17 00:00:00 2001
From: Leon Isenberg <leon.isenberg@t-online.de>
Date: Fri, 10 Mar 2017 16:36:36 +0100
Subject: [PATCH 2351/3449] keepass-keeagent: init at 0.8.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[Bjørn: change fetchurl indent 4 -> 2 spaces.]
---
 .../misc/keepass-plugins/keeagent/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/misc/keepass-plugins/keeagent/default.nix

diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
new file mode 100644
index 000000000000..cd83d2a44e1d
--- /dev/null
+++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, buildEnv, fetchzip, mono }:
+
+let
+  version = "0.8.1";
+  drv = stdenv.mkDerivation {
+    name = "keeagent-${version}";
+
+    src = fetchzip {
+      url = http://lechnology.com/wp-content/uploads/2016/07/KeeAgent_v0.8.1.zip;
+      sha256 = "16x1qrnzg0xkvi7w29wj3z0ldmql2vcbwxksbsmnidzmygwg98hk";
+      stripRoot = false;
+    };
+
+    meta = {
+      description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication";
+      homepage    = http://lechnology.com/software/keeagent;
+      platforms   = with stdenv.lib.platforms; linux;
+      license     = stdenv.lib.licenses.gpl2;
+      maintainers = [ ];
+    };
+
+    pluginFilename = "KeeAgent.plgx";
+
+    installPhase = ''
+      mkdir -p $out/lib/dotnet/keepass/
+      cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename
+    '';
+  };
+in
+  # Mono is required to compile plugin at runtime, after loading.
+  buildEnv { name = drv.name; paths = [ mono drv ]; }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07df54e9341f..f55fc5f54a6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13425,6 +13425,8 @@ with pkgs;
 
   keepass = callPackage ../applications/misc/keepass { };
 
+  keepass-keeagent = callPackage ../applications/misc/keepass-plugins/keeagent { };
+
   keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { };
 
   keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { };

From 20d9edff1723363b0df1d7f44301cefffd8b3881 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 15 Mar 2017 19:17:52 +0200
Subject: [PATCH 2352/3449] stdenv: aarch64: Update bootstrap tarballs

Hopefully fixes sandboxed build of glibc on aarch64, as discussed on
https://github.com/NixOS/nixpkgs/commit/8bfa9f528c88243578246798c7c2ddde045e0de0.

Picked from the following cross-trunk evaluation:
http://hydra.nixos.org/eval/1341395 based on nixpkgs
commit bb3ef8a95c9659596b8a34d27881cd30ffea2f9f.

build job: http://hydra.nixos.org/build/50125932

(busybox's hash not changing is not a bug!)
---
 pkgs/stdenv/linux/bootstrap-files/aarch64.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix
index 4e9c17da2d97..ca7e84502ab3 100644
--- a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix
@@ -1,11 +1,11 @@
 {
   busybox = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/busybox;
+    url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-03-11-bb3ef8/busybox;
     sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f";
     executable = true;
   };
   bootstrapTools = import <nix/fetchurl.nix> {
-    url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-01-27-264d42b9c/bootstrap-tools.tar.xz;
-    sha256 = "13h7lgkjyxrmfkx5k1w6rj3j4iqrk28pqagiwqcg8izrydy318bi";
+    url = http://nixos-arm.dezgeg.me/bootstrap-aarch64-2017-03-11-bb3ef8/bootstrap-tools.tar.xz;
+    sha256 = "1075d5n4yclbhgisi6ba50601mw3fhivlkjs462qlnq8hh0xc7nq";
   };
 }

From b052a3629463f2f064a0a3da50dbebd73b587651 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Mar 2017 18:29:33 +0100
Subject: [PATCH 2353/3449] lib/trivial: expand function docs

---
 lib/trivial.nix | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index abe5a16c67d6..40499b2b5092 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -1,17 +1,44 @@
 rec {
 
-  # Identity function.
+  /* The identity function
+     For when you need a function that does “nothing”.
+
+     Type: id :: a -> a
+  */
   id = x: x;
 
-  # Constant function.
+  /* The constant function
+     Ignores the second argument.
+     Or: Construct a function that always returns a static value.
+
+     Type: const :: a -> b -> a
+     Example:
+       let f = const 5; in f 10
+       => 5
+  */
   const = x: y: x;
 
-  # Named versions corresponding to some builtin operators.
+
+  ## Named versions corresponding to some builtin operators.
+
+  /* Concat two strings */
   concat = x: y: x ++ y;
+
+  /* boolean “or” */
   or = x: y: x || y;
+
+  /* boolean “and” */
   and = x: y: x && y;
+
+  /* Merge two attribute sets shallowly, right side trumps left
+
+     Example:
+       mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; }
+       => { a = 1; b = 3; c = 4; }
+  */
   mergeAttrs = x: y: x // y;
 
+
   # Compute the fixed point of the given function `f`, which is usually an
   # attribute set that expects its final, non-recursive representation as an
   # argument:

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 2354/3449] 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 1ca0a76d6bb6..15c1b2bbb285 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 12648a455bd9d7755b635f0732ce402590e1bd6f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 20:02:29 +0100
Subject: [PATCH 2355/3449] linux_4_9: 4.9.14 -> 4.9.15

---
 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 2327c882f2d0..18ac6b41c8cb 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.14";
+  version = "4.9.15";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0h5nnf9h00fsd7q66rapvwmfxs4pi0vjljk92ir5vid59hzk8kak";
+    sha256 = "14sfacaqkk9c66zrl8wkmy5331hczgz5j65yms6pnpwwi82sq3c2";
   };
 
   kernelPatches = args.kernelPatches;

From 331f5a886d2f4e3ebb282a71c7ab77d5facbdf0b Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:32 -0400
Subject: [PATCH 2356/3449] go1.4: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.4.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index b703a92f3ea5..f60077e89621 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, tzdata, iana_etc, libcCross
+{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana_etc, libcCross
 , pkgconfig
 , pcre
 , Security }:
@@ -114,6 +114,13 @@ stdenv.mkDerivation rec {
   patches = [
     ./remove-tools-1.4.patch
     ./creds-test-1.4.patch
+
+    # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
+    # actually works on old versions too.
+    (fetchpatch {
+      url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+      sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+    })
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";

From 08314598bb938682049fc5753da13648141c0230 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:39 -0400
Subject: [PATCH 2357/3449] go1.6: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.6.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index 7d78f5efd104..52ffbab6dcb8 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -113,6 +113,13 @@ stdenv.mkDerivation rec {
   patches = [
     ./remove-tools-1.5.patch
     ./creds-test.patch
+
+    # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
+    # actually works on old versions too.
+    (fetchpatch {
+      url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+      sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+    })
   ];
 
   GOOS = if stdenv.isDarwin then "darwin" else "linux";

From e6a5ab85b40b5ecbbcc18f518f7cd640f6c3a6e2 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:45 -0400
Subject: [PATCH 2358/3449] go1.7: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.7.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix
index 0df2e8d6f7e9..7fa35e1fcacb 100644
--- a/pkgs/development/compilers/go/1.7.nix
+++ b/pkgs/development/compilers/go/1.7.nix
@@ -107,6 +107,13 @@ stdenv.mkDerivation rec {
     [ ./remove-tools-1.7.patch
       ./cacert-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
+      # actually works on old versions too.
+      (fetchpatch {
+        url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+        sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+      })
     ];
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 2ffda66f11bfd7f12271ac44ac7010148f73a085 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 15:16:59 -0400
Subject: [PATCH 2359/3449] go1.8: patch test to work with recent tzdata

---
 pkgs/development/compilers/go/1.8.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/go/1.8.nix b/pkgs/development/compilers/go/1.8.nix
index 00ec11abc47b..6d9ee3de5501 100644
--- a/pkgs/development/compilers/go/1.8.nix
+++ b/pkgs/development/compilers/go/1.8.nix
@@ -80,11 +80,6 @@ stdenv.mkDerivation rec {
   '' + optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
   '' + optionalString stdenv.isDarwin ''
-
-    # Disabling `format_test.go` because it fails on Darwin for an
-    # unknown reason see: https://github.com/NixOS/nixpkgs/pull/23122#issuecomment-282188727
-    rm src/time/format_test.go
-
     substituteInPlace src/race.bash --replace \
       "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
     sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
@@ -115,6 +110,13 @@ stdenv.mkDerivation rec {
       ./cacert-1.8.patch
       ./creds-test.patch
       ./remove-test-pie-1.8.patch
+
+      # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
+      # works fine here for now.
+      (fetchpatch {
+        url    = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
+        sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
+      })
     ];
 
   SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";

From 77b7b7df33e05d5cf238b0e0a0fd73b7c48d27fa Mon Sep 17 00:00:00 2001
From: edanaher <github@edanaher.net>
Date: Wed, 15 Mar 2017 16:20:25 -0400
Subject: [PATCH 2360/3449] bup: 0.28.1 -> 0.29 (#23876)

---
 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 4e035ab67acb..baf9e4f4e394 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 376d960034d90c33b9a59db168151b18ccb8bdc5 Mon Sep 17 00:00:00 2001
From: Andrzej Trzaska <atrzaska2@gmail.com>
Date: Wed, 15 Mar 2017 21:34:35 +0100
Subject: [PATCH 2361/3449] bundler: 1.14.4 -> 1.14.6 (#23930)

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

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index f3737afdb222..9251c4d2a415 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.14.4";
-  sha256 = "1hafmb7p41pm40a2z7f4x5zpgrb72xvgwlvkxnflmzqkvq2prkfv";
+  version = "1.14.6";
+  sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
   dontPatchShebangs = true;
 
   postFixup = ''

From 0cfa1b0ddeb5fb4083eea532ea9eccfbc4ad9d98 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 16:37:48 -0400
Subject: [PATCH 2362/3449] openjdk-darwin: use a sensible crypto policy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We should really move to a source build of openjdk on Darwin, but that's
tricky so for now we continue to hack around it and do stuff like this,
even though crypto export polices are stupid and make no sense. No, I'm
not bitter at all that I need to do this 😩
---
 pkgs/development/compilers/openjdk-darwin/8.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/openjdk-darwin/8.nix b/pkgs/development/compilers/openjdk-darwin/8.nix
index 1d12d59998a1..2f3391f70e0d 100644
--- a/pkgs/development/compilers/openjdk-darwin/8.nix
+++ b/pkgs/development/compilers/openjdk-darwin/8.nix
@@ -1,10 +1,16 @@
 { stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
 let
+  jce-policies = fetchurl {
+    # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
+    url    = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
+    sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
+  };
+
   jdk = stdenv.mkDerivation {
     name = "zulu1.8.0_66-8.11.0.1";
 
     src = fetchurl {
-      url = http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip;
+      url = "http://cdn.azulsystems.com/zulu/bin/zulu1.8.0_66-8.11.0.1-macosx.zip";
       sha256 = "0pvbpb3vf0509xm2x1rh0p0w4wmx50zf15604p28z1k8ai1a23sz";
       curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
     };
@@ -15,6 +21,9 @@ let
       mkdir -p $out
       mv * $out
 
+      unzip ${jce-policies}
+      mv -f ZuluJCEPolicies/*.jar $out/jre/lib/security/
+
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/
     '';

From 1b674356261f7a6d29ce9dde42a75acd1bf7f4d7 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 16:15:42 -0500
Subject: [PATCH 2363/3449] libdc1394: 2.2.3 -> 2.2.5

---
 .../libraries/libdc1394/default.nix            | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index c96a2b7f051a..c1d11ce87ee5 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchurl, libraw1394, libusb1
-, CoreServices
-}:
+{ stdenv, fetchurl, libraw1394,
+libusb1, CoreServices }:
 
 stdenv.mkDerivation rec {
-  name = "libdc1394-2.2.3";
+  name = "libdc1394-${version}";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/libdc1394/${name}.tar.gz";
-    sha256 = "1p9b4ciy97s04gmp7656cybr1zfd79hlw0ffhfb52m3zcn07h6aa";
+    sha256 = "0drk4sqvaym9glaraia25mj60rmwqbhy4j9h3x7gqpzfib8ch31m";
   };
 
   buildInputs = [ libusb1 ]
     ++ stdenv.lib.optional stdenv.isLinux libraw1394
     ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/libdc1394/;
     description = "Capture and control API for IIDC compliant cameras";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.unix;
   };
 }

From da6619cffed4aae4da168a11ae46473ad397b07e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 15 Mar 2017 22:16:04 +0100
Subject: [PATCH 2364/3449] libs: make splitString also split last separator
 (#23851)

* libs: make splitString also split last separator

* libs: add tests for splitStrings
---
 lib/strings.nix |  2 +-
 lib/tests.nix   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 86af4d438344..eb3c2971ad59 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -291,7 +291,7 @@ rec {
 
       recurse = index: startAt:
         let cutUntil = i: [(substring startAt (i - startAt) s)]; in
-        if index < lastSearch then
+        if index <= lastSearch then
           if startWithSep index then
             let restartAt = index + sepLen; in
             cutUntil index ++ recurse restartAt restartAt
diff --git a/lib/tests.nix b/lib/tests.nix
index 251282d29904..bef9cdee696d 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -220,4 +220,34 @@ runTests {
       expected = builtins.toJSON val;
   };
 
+  testSplitStringsSimple = {
+    expr = strings.splitString "." "a.b.c.d";
+    expected = [ "a" "b" "c" "d" ];
+  };
+
+  testSplitStringsEmpty = {
+    expr = strings.splitString "." "a..b";
+    expected = [ "a" "" "b" ];
+  };
+
+  testSplitStringsOne = {
+    expr = strings.splitString ":" "a.b";
+    expected = [ "a.b" ];
+  };
+
+  testSplitStringsNone = {
+    expr = strings.splitString "." "";
+    expected = [ "" ];
+  };
+
+  testSplitStringsFirstEmpty = {
+    expr = strings.splitString "/" "/a/b/c";
+    expected = [ "" "a" "b" "c" ];
+  };
+
+  testSplitStringsLastEmpty = {
+    expr = strings.splitString ":" "2001:db8:0:0042::8a2e:370:";
+    expected = [ "2001" "db8" "0" "0042" "" "8a2e" "370" "" ];
+  };
+
 }

From 18a272ef756ee6901cce4726e97a9ddb495b15ad Mon Sep 17 00:00:00 2001
From: Sergii Paryzhskyi <parizhskiy@gmail.com>
Date: Wed, 15 Mar 2017 22:17:23 +0100
Subject: [PATCH 2365/3449] sbt-0.12.4: add an older stable version (#23933)

---
 lib/maintainers.nix                           |  1 +
 .../tools/build-managers/sbt/0.12.4.nix       | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/build-managers/sbt/0.12.4.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e7b8ff7bf101..a44f93e36cfa 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -204,6 +204,7 @@
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
   hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   hce = "Hans-Christian Esperer <hc@hcesperer.org>";
+  heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
diff --git a/pkgs/development/tools/build-managers/sbt/0.12.4.nix b/pkgs/development/tools/build-managers/sbt/0.12.4.nix
new file mode 100644
index 000000000000..9c02fcd0b3fb
--- /dev/null
+++ b/pkgs/development/tools/build-managers/sbt/0.12.4.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, jre }:
+
+stdenv.mkDerivation rec {
+  name = "sbt-${version}";
+  version = "0.12.14";
+
+  src = fetchurl {
+    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
+    sha256 = "5907af5a3db5e9090024c91e8b6189cd2143841b08c4688542a2efbc9023ac1a";
+  };
+
+  patchPhase = ''
+    echo -java-home ${jre.home} >>conf/sbtopts
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/sbt $out/bin
+    cp -ra . $out/share/sbt
+    ln -s $out/share/sbt/bin/sbt $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.scala-sbt.org/;
+    license = licenses.bsd3;
+    description = "A build tool for Scala, Java and more";
+    maintainers = with maintainers; [ heel ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f55fc5f54a6a..b18c0e7f1375 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4634,7 +4634,7 @@ with pkgs;
   yaft = callPackage ../applications/misc/yaft { };
 
   yarn = callPackage ../development/tools/yarn  { };
-  
+
   yasr = callPackage ../applications/audio/yasr { };
 
   yank = callPackage ../tools/misc/yank { };
@@ -6765,6 +6765,7 @@ with pkgs;
 
   scons = callPackage ../development/tools/build-managers/scons { };
 
+  sbt_0_12_4 = callPackage ../development/tools/build-managers/0.12.4.nix { };
   sbt = callPackage ../development/tools/build-managers/sbt { };
   simpleBuildTool = sbt;
 

From eba3900781ef0abd0a8eb478820280851d1e0fbb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 15 Mar 2017 20:04:40 +0000
Subject: [PATCH 2366/3449] ocamlPackages.rresult: init at 0.5.0

Rresult is an OCaml module for handling computation results and errors in an
explicit and declarative manner without resorting to exceptions.

Homepage: http://erratique.ch/software/rresult
---
 .../ocaml-modules/rresult/default.nix         | 24 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/rresult/default.nix

diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix
new file mode 100644
index 000000000000..f9951b56da2d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/rresult/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg }:
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-rresult-${version}";
+	version = "0.5.0";
+	src = fetchurl {
+		url = "http://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
+		sha256 = "1xxycxhdhaq8p9vhwi93s2mlxjwgm44fcxybx5vghzgbankz9yhm";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild topkg opam ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		license = stdenv.lib.licenses.isc;
+		homepage = http://erratique.ch/software/rresult;
+		description = "Result value combinators for OCaml";
+		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 2a59dbd3293f..aeef0a2859bb 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -494,6 +494,8 @@ let
 
     re = callPackage ../development/ocaml-modules/re { };
 
+    rresult = callPackage ../development/ocaml-modules/rresult { };
+
     safepass = callPackage ../development/ocaml-modules/safepass { };
 
     sedlex = callPackage ../development/ocaml-modules/sedlex { };

From a1ea2879f82f5836948cd65d3e37d0c3c71a2055 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 16:35:49 -0500
Subject: [PATCH 2367/3449] libdiscid: 0.6.1 -> 0.6.2

---
 pkgs/development/libraries/libdiscid/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix
index d0122d0283c5..c5da3816c41c 100644
--- a/pkgs/development/libraries/libdiscid/default.nix
+++ b/pkgs/development/libraries/libdiscid/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libdiscid-0.6.1";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake ];
+  name = "libdiscid-${version}";
+  version = "0.6.2";
 
+  nativeBuildInputs = [ cmake pkgconfig ];
+  
   src = fetchurl {
     url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz";
-    sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc";
+    sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";
   };
 
   meta = with stdenv.lib; {

From 3c57a37c55f35bbd9107c072e052781869f138fc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 15 Mar 2017 23:44:25 +0200
Subject: [PATCH 2368/3449] sbt_0_12_4: Fix eval

---
 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 b18c0e7f1375..b36db750d62f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6765,8 +6765,8 @@ with pkgs;
 
   scons = callPackage ../development/tools/build-managers/scons { };
 
-  sbt_0_12_4 = callPackage ../development/tools/build-managers/0.12.4.nix { };
   sbt = callPackage ../development/tools/build-managers/sbt { };
+  sbt_0_12_4 = callPackage ../development/tools/build-managers/sbt/0.12.4.nix { };
   simpleBuildTool = sbt;
 
   shards = callPackage ../development/tools/build-managers/shards { };

From ef56873e981bf919046c210f8ae44254885409ee Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Wed, 15 Mar 2017 10:33:32 +0800
Subject: [PATCH 2369/3449] emem: 0.2.35 -> 0.2.39

---
 pkgs/applications/misc/emem/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 76f2f03d159f..3b0ac2e54c80 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.35";
+  version = "0.2.39";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0y1jwfmqmmff3kh82j07p9j0l2hc7dxhy8vij4lz8wrv6pnxng7f";
+    sha256 = "068x3gj7arnl5s45rickq6pr6qjcddfg54xn6ywd5c2i5zklb89p";
   };
 
   buildInputs = [ ];
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
   phases = [ "buildPhase" "installPhase" ];
 
   buildPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/java
+    mkdir -p $out/bin $out/share/java
   '';
 
   installPhase = ''

From 545e267adfc796bcceeb5c6702075fb2890cabe2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 16 Mar 2017 00:53:32 +0300
Subject: [PATCH 2370/3449] wireshark-gtk: wrap properly

---
 .../networking/sniffers/wireshark/default.nix      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index fd709aa76603..375a948c1f20 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
 , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
 , libssh, zlib, cmake, extra-cmake-modules
-, withGtk ? false, gtk3 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
+, withGtk ? false, gtk3 ? null, librsvg ? null, gsettings_desktop_schemas ? null, wrapGAppsHook ? null
 , withQt ? false, qt5 ? null
 , ApplicationServices, SystemConfiguration, gmp
 }:
@@ -23,11 +23,15 @@ in stdenv.mkDerivation {
     sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2";
   };
 
+  nativeBuildInputs = [
+    bison cmake extra-cmake-modules flex
+  ] ++ optional withGtk wrapGAppsHook;
+
   buildInputs = [
-    bison cmake extra-cmake-modules flex gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt libgpgerror gnutls
-    geoip c-ares python glib zlib
-  ] ++ (optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ]))
-    ++ (optionals withGtk [ gtk3 pango cairo gdk_pixbuf ])
+    gettext pcre perl pkgconfig libpcap lua5 libssh openssl libgcrypt
+    libgpgerror gnutls geoip c-ares python glib zlib
+  ] ++ optionals withQt  (with qt5; [ qtbase qtmultimedia qtsvg qttools ])
+    ++ optionals withGtk [ gtk3 librsvg gsettings_desktop_schemas ]
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 

From cfc7a1877a1ff969e6d1dd18af74b467c3c6b5df Mon Sep 17 00:00:00 2001
From: Christopher League <league@contrapunctus.net>
Date: Thu, 9 Mar 2017 14:35:37 -0500
Subject: [PATCH 2371/3449] clips: init at 6.30

CLIPS is a language for building expert systems.
---
 .../interpreters/clips/default.nix            | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/interpreters/clips/default.nix

diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix
new file mode 100644
index 000000000000..cf923d409172
--- /dev/null
+++ b/pkgs/development/interpreters/clips/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "6.30";
+  name = "clips-${version}";
+  src = fetchurl {
+    url = "mirror://sourceforge/clipsrules/CLIPS/6.30/clips_core_source_630.tar.Z";
+    sha256 = "1r0m59l3mk9cwzq3nmyr5qxrlkzp3njls4hfv8ml85dmqh7n3ysy";
+  };
+  buildPhase = ''
+    make -C core -f ../makefiles/makefile.gcc
+  '';
+  installPhase = ''
+    install -D -t $out/bin core/clips
+  '';
+  meta = with stdenv.lib; {
+    description = "A Tool for Building Expert Systems";
+    homepage = "http://www.clipsrules.net/";
+    longDescription = ''
+      Developed at NASA's Johnson Space Center from 1985 to 1996,
+      CLIPS is a rule-based programming language useful for creating
+      expert systems and other programs where a heuristic solution is
+      easier to implement and maintain than an algorithmic solution.
+    '';
+    license = licenses.publicDomain;
+    maintainers = [maintainers.league];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b36db750d62f..2f0ffdd7de2f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5656,6 +5656,8 @@ with pkgs;
 
   ceptre = callPackage ../development/interpreters/ceptre { };
 
+  clips = callPackage ../development/interpreters/clips { };
+
   clisp = callPackage ../development/interpreters/clisp { };
   clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
 

From a8f269d014dde1eb60d81d0153602a204f95ff28 Mon Sep 17 00:00:00 2001
From: NWDD <nwdd+nixos@no.team>
Date: Thu, 9 Mar 2017 23:09:06 +0100
Subject: [PATCH 2372/3449] gitkraken: 2.1.0 -> 2.2.0

also added myself as a maintainer
---
 pkgs/applications/version-management/gitkraken/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 70ca7a74b236..28d89fb32d04 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.tar.gz";
-    sha256 = "56b5657f5c13fa1d8f6b7b9331194cbc8c48c0b913e5f0fb561d0e9af82f7999";
+    sha256 = "0a3ed917e6e937af4dd180144fbb4ad8b99b35b5d8c1f0684a55de38189a812d";
   };
 
   libPath = stdenv.lib.makeLibraryPath [
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ xnwdd ];
   };
 }

From 2a65628826d20fc21a2cc374fcc857f97eb87543 Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Wed, 15 Mar 2017 23:44:09 +0100
Subject: [PATCH 2373/3449] restic: init at 0.5.0

---
 pkgs/tools/backup/restic/default.nix | 32 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/backup/restic/default.nix

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
new file mode 100644
index 000000000000..b816aac99a1d
--- /dev/null
+++ b/pkgs/tools/backup/restic/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "restic-${version}";
+  version = "0.5.0";
+
+  goPackagePath = "github.com/restic/restic";
+
+  src = fetchFromGitHub {
+    owner = "restic";
+    repo = "restic";
+    rev = "v${version}";
+    sha256 = "0dj6zg4b00pwgs6nj7w5s0jxm6cfavd9kdcq0z4spypwdf211cgl";
+  };
+
+  buildPhase = ''
+    cd go/src/${goPackagePath}
+    go run build.go
+  '';
+
+  installPhase = ''
+    mkdir -p $bin/bin/
+    cp restic $bin/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://restic.github.io;
+    description = "A backup program that is fast, efficient and secure";
+    platforms = platforms.linux;
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f0ffdd7de2f..daa423830f33 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10851,6 +10851,8 @@ with pkgs;
 
   redstore = callPackage ../servers/http/redstore { };
 
+  restic = callPackage ../tools/backup/restic { };
+
   restund = callPackage ../servers/restund {};
 
   rethinkdb = callPackage ../servers/nosql/rethinkdb {

From 9b0a175af9639b062fdbd7fcf6b00d38db81b902 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Thu, 16 Mar 2017 06:52:19 +0800
Subject: [PATCH 2374/3449] emem: 0.2.40 -> 0.2.41

---
 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 3b0ac2e54c80..f748318407a3 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.39";
+  version = "0.2.41";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "068x3gj7arnl5s45rickq6pr6qjcddfg54xn6ywd5c2i5zklb89p";
+    sha256 = "0pg7m4fyrcbm8d5nj96xvvh1cvml501rw34hniqq384waifr2kqs";
   };
 
   buildInputs = [ ];

From a89e9e999b7d88f3e08e4c70cb31beac712068ba Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 18:19:11 -0500
Subject: [PATCH 2375/3449] libextractor: 1.2 -> 1.3

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

diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 6f1981d0ece7..0f21180f691c 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -7,11 +7,11 @@ assert gtkSupport -> glib != null && gtk3 != null;
 assert videoSupport -> ffmpeg != null && libmpeg2 != null;
 
 stdenv.mkDerivation rec {
-  name = "libextractor-1.2";
+  name = "libextractor-1.3";
 
   src = fetchurl {
     url = "mirror://gnu/libextractor/${name}.tar.gz";
-    sha256 = "1n7z6s5ils6xmf6b0z1xda41maxj94c1n6wlyyxmacs5lrkh2a96";
+    sha256 = "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6";
   };
 
   preConfigure =

From 00addcb95e67ea9e6c2a6429216233a9fa96b45d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 16 Mar 2017 00:43:58 +0100
Subject: [PATCH 2376/3449] pythonPackages.python-jose: init at 1.3.2

---
 .../python-modules/python-jose/default.nix    | 29 +++++++++++++++
 .../python-jose/pycryptodome.patch            | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +-
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/python-jose/default.nix
 create mode 100644 pkgs/development/python-modules/python-jose/pycryptodome.patch

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
new file mode 100644
index 000000000000..da4dd4107461
--- /dev/null
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, future, six, ecdsa, pycryptodome, pytest
+}:
+
+buildPythonPackage rec {
+  name = "python-jose-${version}";
+  version = "1.3.2";
+  src = fetchFromGitHub {
+    owner = "mpdavis";
+    repo = "python-jose";
+    rev = version;
+    sha256 = "0933pbflv2pvws5m0ksz8y1fqr8m123smmrbr5k9a71nssd502sv";
+  };
+
+  buildInputs = [ pytest ];
+  checkPhase = "py.test .";
+  patches = [
+    # to use pycryptodme instead of pycrypto
+    ./pycryptodome.patch
+  ];
+  propagatedBuildInputs = [ future six ecdsa pycryptodome ];
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mpdavis/python-jose";
+    description = "A JOSE implementation in Python";
+    platforms = platforms.all;
+    license = licenses.mit;
+    maintainers = [ maintainers.jhhuh ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-jose/pycryptodome.patch b/pkgs/development/python-modules/python-jose/pycryptodome.patch
new file mode 100644
index 000000000000..665ad5980343
--- /dev/null
+++ b/pkgs/development/python-modules/python-jose/pycryptodome.patch
@@ -0,0 +1,37 @@
+diff -ru python-jose-1.3.2/requirements.txt python-jose-1.3.2.new/requirements.txt
+--- python-jose-1.3.2/requirements.txt	2016-09-05 15:13:49.000000000 +0200
++++ python-jose-1.3.2.new/requirements.txt	2017-03-15 11:35:47.118001810 +0100
+@@ -1,3 +1,3 @@
+-pycrypto
++pycryptodome
+ six
+ future
+diff -ru python-jose-1.3.2/setup.py python-jose-1.3.2.new/setup.py
+--- python-jose-1.3.2/setup.py	2016-09-05 15:13:49.000000000 +0200
++++ python-jose-1.3.2.new/setup.py	2017-03-15 11:37:15.725077184 +0100
+@@ -25,12 +25,8 @@
+ 
+ 
+ def get_install_requires():
+-    if platform.python_implementation() == 'PyPy':
+-        crypto_lib = 'pycryptodome >=3.3.1, <3.4.0'
+-    else:
+-        crypto_lib = 'pycrypto >=2.6.0, <2.7.0'
+     return [
+-        crypto_lib,
++        'pycryptodome >=3.3.1, <3.5.0',
+         'six <2.0',
+         'ecdsa <1.0',
+         'future <1.0',
+diff -ru python-jose-1.3.2/tox.ini python-jose-1.3.2.new/tox.ini
+--- python-jose-1.3.2/tox.ini	2016-09-05 15:13:49.000000000 +0200
++++ python-jose-1.3.2.new/tox.ini	2017-03-15 11:36:50.423055657 +0100
+@@ -6,7 +6,7 @@
+     py.test --cov-report term-missing --cov jose
+ deps =
+     future
+-    pycrypto
++    pycryptodome
+     ecdsa
+     pytest
+     pytest-cov
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a797ea509a..9be1e5d38ab4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5063,6 +5063,8 @@ in {
     };
   };
 
+  python-jose = callPackage ../development/python-modules/python-jose {};
+
   pyhepmc = buildPythonPackage rec {
     name = "pyhepmc-${version}";
     version = "0.5.0";
@@ -19725,7 +19727,6 @@ in {
     };
   };
 
-
   Babel = buildPythonPackage (rec {
     name = "Babel-2.3.4";
 

From 09cfbc8cc33bb00c14bede0ee8f941200d0c69be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 16 Mar 2017 00:48:34 +0100
Subject: [PATCH 2377/3449] PyGithub: init at 1.32

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

diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix
new file mode 100644
index 000000000000..75fb75f93185
--- /dev/null
+++ b/pkgs/development/python-modules/pyGithub/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub
+, cacert
+, buildPythonPackage, python-jose }:
+
+buildPythonPackage rec {
+  name = "PyGithub-${version}";
+  version = "1.32";
+
+  src = fetchFromGitHub {
+    owner = "PyGithub";
+    repo = "PyGithub";
+    rev = "v${version}";
+    sha256 = "15dr9ja63zdxax9lg6q2kcakqa82dpffyhgpjr13wq3sfkcy5pdw";
+  };
+
+  postPatch = ''
+    # requires network
+    echo "" > github/tests/Issue142.py
+  '';
+  propagatedBuildInputs = [ python-jose ];
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/PyGithub/PyGithub";
+    description = "A Python (2 and 3) library to access the GitHub API v3";
+    platforms = platforms.all;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jhhuh ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9be1e5d38ab4..8f7fe7a872e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20339,6 +20339,8 @@ in {
     };
   };
 
+  PyGithub = callPackage ../development/python-modules/pyGithub {};
+
   pyglet = buildPythonPackage rec {
     name = "pyglet-${version}";
     version = "1.2.4";

From 26045faaaf3d6893518b329de1b8cb0c2f2673e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 16 Mar 2017 00:57:09 +0100
Subject: [PATCH 2378/3449] cligh: init at 0.3

fixes #23914
---
 .../tools/github/cligh/default.nix            | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/github/cligh/default.nix

diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
new file mode 100644
index 000000000000..09df42b2a45b
--- /dev/null
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+buildPythonApplication rec {
+  name = "cligh-${version}";
+  version = "0.3";
+
+  doCheck = false; # no tests
+
+  src = fetchFromGitHub {
+    owner = "CMB";
+    repo = "cligh";
+    rev = "v${version}";
+    sha256 = "0d1fd78rzl2n75xpmy1gnxh1shvcs4qm0j4qqszqvfriwkg2flxn";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ pyxdg PyGithub ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://the-brannons.com/software/cligh.html";
+    description = "A simple command-line interface to the facilities of Github";
+    longDescription = ''
+        Cligh is a simple command-line interface to the facilities of GitHub.
+        It is written by Christopher Brannon chris@the-brannons.com. The
+        current version is 0.3, released July 23, 2016. This program is still
+        in the early stage of development. It is by no means feature-complete.
+        A friend and I consider it useful, but others may not.
+    '';
+    platforms = platforms.all;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.jhhuh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f0ffdd7de2f..7e87d92ec3b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12960,6 +12960,8 @@ with pkgs;
 
   clfswm = callPackage ../applications/window-managers/clfswm { };
 
+  cligh = callPackage ../development/tools/github/cligh {};
+
   clipgrab = callPackage ../applications/video/clipgrab { };
 
   clipit = callPackage ../applications/misc/clipit { };

From bf5dc90f304b6dd047a031cd097ada3bc242b7e0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 16 Mar 2017 09:59:08 +0800
Subject: [PATCH 2379/3449] keybase: 20170209 -> 1.0.20

---
 pkgs/tools/security/keybase/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index b962a6409b45..5d212c0b80f5 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "20170209.17b641d";
+  version = "1.0.20";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -10,10 +10,10 @@ buildGoPackage rec {
   dontRenameImports = true;
 
   src = fetchFromGitHub {
-    owner = "keybase";
-    repo = "client";
-    rev = "17b641de629a85ad77621d0efa3e2442661b5ee7";
-    sha256 = "0y6kiwj690yd0alvcyd74wx2wlbh110k1rdcvimszyb9gqig8p11";
+    owner  = "keybase";
+    repo   = "client";
+    rev    = "v${version}";
+    sha256 = "1418x2z1j4bzq29qab8pmqrvg8piycqcabdjmq2inkvlll3s5n3v";
   };
 
   buildFlags = [ "-tags production" ];

From e3abe9c6faf2b65717867a3ec966667d9e83bfa7 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 15 Mar 2017 22:20:17 -0400
Subject: [PATCH 2380/3449] pythonPackages.pants13-pre: init

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f7fe7a872e9..2c71d0dfa178 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8562,9 +8562,44 @@ in {
 
     meta = {
       description = "A build system for software projects in a variety of languages";
-      homepage = "http://www.pantsbuild.org/";
-      license = licenses.asl20;
+      homepage    = "http://www.pantsbuild.org/";
+      license     = licenses.asl20;
       maintainers = with maintainers; [ copumpkin ];
+      platforms   = platforms.unix;
+    };
+  };
+
+  pants13-pre = buildPythonPackage rec {
+    pname   = "pantsbuild.pants";
+    version = "1.3.0.dev13";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "0gnz0f74s53xccfdn78v2dg1m3gx2mm0pdmmjvs5ikfbb9lidhz4";
+    };
+
+    prePatch = ''
+      sed -E -i "s/'([[:alnum:].-]+)[=><][[:digit:]=><.,]*'/'\\1'/g" setup.py
+    '';
+
+    # Unnecessary, and causes some really weird behavior around .class files, which
+    # this package bundles. See https://github.com/NixOS/nixpkgs/issues/22520.
+    dontStrip = true;
+
+    propagatedBuildInputs = with self; [
+      twitter-common-collections setproctitle setuptools six ansicolors
+      packaging pathspec scandir twitter-common-dirutil psutil requests2
+      pystache pex docutils markdown pygments twitter-common-confluence
+      fasteners coverage pywatchman futures cffi
+    ];
+
+    meta = {
+      description = "A build system for software projects in a variety of languages";
+      homepage    = "http://www.pantsbuild.org/";
+      license     = licenses.asl20;
+      maintainers = with maintainers; [ copumpkin ];
+      platforms   = platforms.unix;
     };
   };
 

From f60fec99d19f0f2181661d65f73aca3a85ca81c4 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Wed, 8 Mar 2017 04:45:22 -0800
Subject: [PATCH 2381/3449] SDL2_mixer: add optional fluidsynth support

also add flac support and mp3 support, and add myself as the maintainer,
since there is no current maintainer for this package
---
 pkgs/development/libraries/SDL2_mixer/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 0919970543c5..9fef76c799b9 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, enableNativeMidi ? false }:
+{ stdenv, lib, fetchurl, SDL2, libogg, libvorbis, smpeg, flac, enableNativeMidi ? false, fluidsynth ? null }:
 
 stdenv.mkDerivation rec {
   name = "SDL2_mixer-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s";
   };
 
-  propagatedBuildInputs = [ SDL2 libogg libvorbis ];
+  propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg flac ];
 
   configureFlags = [ "--disable-music-ogg-shared" ] ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
 
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "SDL multi-channel audio mixer library";
     platforms = platforms.linux;
     homepage = "https://www.libsdl.org/projects/SDL_mixer/";
+    maintainers = with maintainers; [ MP2E ];
     license = licenses.zlib;
   };
 }

From 49c18cc75d394c57acffa594b170d36014a88b3a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 16 Mar 2017 07:11:33 +0000
Subject: [PATCH 2382/3449] ocamlPackages.bos: init at 0.1.4

Bos provides support for basic and robust interaction
with the operating system in OCaml.

Homepage: http://erratique.ch/software/bos
---
 .../development/ocaml-modules/bos/default.nix | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/bos/default.nix

diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix
new file mode 100644
index 000000000000..eb1e8d15feab
--- /dev/null
+++ b/pkgs/development/ocaml-modules/bos/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, astring, fmt, fpath, logs, rresult
+}:
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-bos-${version}";
+	version = "0.1.4";
+	src = fetchurl {
+		url = "http://erratique.ch/software/bos/releases/bos-${version}.tbz";
+		sha256 = "1ly66lysk4w6mdy4k1n3ynlpfpq7lw4wshcpzgx58v6x613w5s7q";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+	propagatedBuildInputs = [ astring fmt fpath logs rresult ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		description = "Basic OS interaction for OCaml";
+		homepage = http://erratique.ch/software/bos;
+		license = stdenv.lib.licenses.isc;
+		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 aeef0a2859bb..43cd2e22e4e3 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -53,6 +53,8 @@ let
 
     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 { }

From 1ae9a7911ca7ca06be7d776621acd253f6c816b2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Thu, 16 Mar 2017 11:06:30 +0100
Subject: [PATCH 2383/3449] cligh: fix evaluation

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

diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix
index 09df42b2a45b..ded0aaa92424 100644
--- a/pkgs/development/tools/github/cligh/default.nix
+++ b/pkgs/development/tools/github/cligh/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "cligh-${version}";
   version = "0.3";
 

From aca073eb3a701358c5f75d9d2a502942a5eea781 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 16 Mar 2017 18:09:13 +0800
Subject: [PATCH 2384/3449] pytest-catchlog: init at 1.2.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 2c71d0dfa178..3f13e9abeddf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5140,6 +5140,24 @@ in {
     };
   };
 
+  pytest-catchlog = buildPythonPackage rec {
+    name = "pytest-catchlog-1.2.2";
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/p/pytest-catchlog/${name}.zip";
+      sha256 = "1w7wxh27sbqwm4jgwrjr9c2gy384aca5jzw9c0wzhl0pmk2mvqab";
+    };
+
+    buildInputs = with self; [ pytest ];
+
+    checkPhase = "make test";
+
+    meta = {
+      license = licenses.mit;
+      website = https://pypi.python.org/pypi/pytest-catchlog/;
+      description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog.";
+    };
+  };
+
   pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { };
 
   pytest-fixture-config = buildPythonPackage rec {

From 99c7aa45e762e4ef9a56a11ab10e961ec8874aff Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 16 Mar 2017 18:12:19 +0800
Subject: [PATCH 2385/3449] s3ql: 2.17.1 -> 2.21

---
 pkgs/tools/backup/s3ql/default.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index 9b2adc1d39f9..a90738d39a4c 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -1,17 +1,29 @@
-{ stdenv, fetchurl, python3Packages, sqlite  }:
+{ stdenv, fetchurl, python3Packages, sqlite, which }:
 
 python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "s3ql";
-  version = "2.17.1";
+  version = "2.21";
 
   src = fetchurl {
     url = "https://bitbucket.org/nikratio/${pname}/downloads/${name}.tar.bz2";
-    sha256 = "049vpvvkyia7v4v97rg2l01n43shrdxc1ik38bmjb2q4fvsh1pgx";
+    sha256 = "1mifmxbsxc2rcrydk2vs5cjfd5r0510q5y7rmavlzi8grpcqdf3d";
   };
 
-  propagatedBuildInputs = with python3Packages;
-    [ sqlite apsw pycrypto requests2 defusedxml dugong llfuse ];
+  buildInputs = [ which ]; # tests will fail without which
+  propagatedBuildInputs = with python3Packages; [
+    sqlite apsw pycrypto requests2 defusedxml dugong llfuse
+    cython pytest pytest-catchlog
+  ];
+
+  preBuild = ''
+    # https://bitbucket.org/nikratio/s3ql/issues/118/no-module-named-s3qldeltadump-running#comment-16951851
+    ${python3Packages.python.interpreter} ./setup.py build_cython build_ext --inplace
+  '';
+
+  checkPhase = ''
+    pytest tests
+  '';
 
   meta = with stdenv.lib; {
     description = "A full-featured file system for online data storage";

From 9bd988eb0f4c4aaa2c89d9898a846edb0dc9aa80 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Fri, 10 Mar 2017 20:46:22 +1100
Subject: [PATCH 2386/3449] sipp: 3.4-beta2 -> 3.5.1

fixes #23945
---
 pkgs/development/tools/misc/sipp/default.nix | 33 ++++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix
index 266a9824ed2a..a506831cd8ea 100644
--- a/pkgs/development/tools/misc/sipp/default.nix
+++ b/pkgs/development/tools/misc/sipp/default.nix
@@ -1,28 +1,41 @@
-{stdenv, fetchurl, ncurses, libpcap }:
+{stdenv, fetchFromGitHub, autoreconfHook, ncurses, libpcap }:
 
 stdenv.mkDerivation rec {
-
-  version = "3.4-beta2";
+  version = "3.5.1";
 
   name = "sipp-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/SIPp/sipp/archive/${version}.tar.gz";
-    sha256 = "0rr3slarh5dhpinif5aqji9c9krnpvl7z49w7qahvsww1niawwdv";
+  src = fetchFromGitHub {
+    owner = "SIPp";
+    repo = "sipp";
+    rev = "v${version}";
+    sha256 = "179a1fvqyk3jpxbi28l1xfw22cw9vgvxrn19w5f38w74x0jwqg5k";
   };
 
-  configurePhase = ''
-    export ac_cv_lib_curses_initscr=yes
-    export ac_cv_lib_pthread_pthread_mutex_init=yes
+  patchPhase = ''
     sed -i "s@pcap/\(.*\).pcap@$out/share/pcap/\1.pcap@g" src/scenario.cpp
-    ./configure --prefix=$out --with-pcap
+    sed -i -e "s|AC_CHECK_LIB(curses|AC_CHECK_LIB(ncurses|" configure.ac
+    echo "#define SIPP_VERSION \"v${version}\"" > include/version.h
   '';
 
+  configureFlags = [
+    "--with-pcap"
+  ];
+
   postInstall = ''
     mkdir -pv $out/share/pcap
     cp pcap/* $out/share/pcap
   '';
 
   buildInputs = [ncurses libpcap];
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    homepage = http://sipp.sf.net;
+    description = "The SIPp testing tool";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+  };
 }
 

From df3044cb2e7f01d5535700b173f61511805c44b8 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 16 Mar 2017 11:57:19 +0100
Subject: [PATCH 2387/3449] chromium: flashplayer: 24.0.0.221 -> 25.0.0.127

[Critical security fix]
https://github.com/NixOS/nixpkgs/pull/23889
---
 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 02b7ec34cfcd..f202aee38283 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 = "24.0.0.221";
+    version = "25.0.0.127";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "0vqvb098wms9v2r1xm9yq4cpn1h9dr1y7izfy2rwg3y7gr8ycv80";
+      sha256 = "1gf0ncclkk3h4vj9kkhbqj1nnnm54gwm5mdcs4p4pl8i339scs14";
       stripRoot = false;
     };
 

From 645c2189d14ee95d22efb08e42a2bb3ca7e74a04 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 16 Mar 2017 12:39:43 +0100
Subject: [PATCH 2388/3449] pythonPackages.pytest-django: unpin setuptools_scm

- unpin setuptools_scm
- move to file in folder following guidelines
- use PyPI/upstream name
---
 .../{pytestdjango.nix => pytest-django/default.nix}  | 12 ++++++++++++
 pkgs/top-level/python-packages.nix                   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 rename pkgs/development/python-modules/{pytestdjango.nix => pytest-django/default.nix} (64%)

diff --git a/pkgs/development/python-modules/pytestdjango.nix b/pkgs/development/python-modules/pytest-django/default.nix
similarity index 64%
rename from pkgs/development/python-modules/pytestdjango.nix
rename to pkgs/development/python-modules/pytest-django/default.nix
index 5a8dd85f4bdb..48a5c043841a 100644
--- a/pkgs/development/python-modules/pytestdjango.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -1,5 +1,6 @@
 { stdenv, buildPythonPackage, fetchurl
 , pytest, django, setuptools_scm
+, fetchpatch
 }:
 buildPythonPackage rec {
   name = "pytest-django-${version}";
@@ -13,6 +14,17 @@ buildPythonPackage rec {
   buildInputs = [ pytest setuptools_scm ];
   propagatedBuildInputs = [ django ];
 
+  patches = [
+    # Unpin setuptools-scm
+    (fetchpatch {
+      url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
+      sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
+    })
+  ];
+
+  # Complicated. Requires Django setup.
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "py.test plugin for testing of Django applications";
     homepage = http://pytest-django.readthedocs.org/en/latest/;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3f13e9abeddf..97dab697081d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5158,7 +5158,7 @@ in {
     };
   };
 
-  pytestdjango = callPackage ../development/python-modules/pytestdjango.nix { };
+  pytest-django = callPackage ../development/python-modules/pytest-django { };
 
   pytest-fixture-config = buildPythonPackage rec {
     name = "${pname}-${version}";

From 4f531a1d2baf41bdee13d65d6479315ce18a3818 Mon Sep 17 00:00:00 2001
From: rbasso <rbasso@sharpgeeks.net>
Date: Thu, 16 Mar 2017 12:56:55 +0900
Subject: [PATCH 2389/3449] sc-im: 0.4.0 -> 0.5.0

- Bump version to 0.5.0
- Enable support for reading '.xls' and '.xlsx' files.

The support for reading Excel files depends on:
  - libxml2, which was already a build input.
  - libzip
  - libxls
---
 pkgs/applications/misc/sc-im/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 75d08ec81883..6d9e1c9fcf23 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, pkgconfig }:
+{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.0";
+  version = "0.5.0";
   name = "sc-im-${version}";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "1v1cfmfqs5997bqlirp6p7smc3qrinq8dvsi33sk09r33zkzyar0";
+    sha256 = "1vdn9p9srvdksxznrn65pfigwrd7brlq8bac3pjfqsvf8gjnzq61";
   };
 
-  buildInputs = [ yacc ncurses libxml2 pkgconfig ];
+  buildInputs = [ yacc ncurses libxml2 libzip libxls pkgconfig ];
 
   buildPhase = ''
     cd src
 
-    sed -i "s,prefix=/usr,prefix=$out," Makefile
-    sed -i "s,-I/usr/include/libxml2,-I$libxml2," Makefile
+    sed -e "\|^prefix  = /usr/local|   s|/usr/local|$out|" \
+        -e "\|^#LDLIBS += -lxlsreader| s|^#||            " \
+        -e "\|^#CFLAGS += -DXLS|       s|^#||            " \
+        -i Makefile
 
     make
     export DESTDIR=$out

From a17e8e7e72de66bf62108f63348751f86a653d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 16 Mar 2017 15:13:04 +0100
Subject: [PATCH 2390/3449] servant-auth-server, servant-swagger: enable hydra
 build

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

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index cab70ea6f6d7..b693a55de55f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2248,7 +2248,6 @@ extra-packages:
   - QuickCheck < 2                      # required by test-framework-quickcheck and its users
   - 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
-  - servant-auth-server < 0.2.2.0       # https://github.com/plow-technologies/servant-auth/issues/25
   - split < 0.2                         # newer versions don't work with GHC 6.12.3
   - tar < 0.4.2.0                       # later versions don't work with GHC < 7.6.x
   - transformers == 0.4.3.*             # the latest version isn't supported by mtl yet
@@ -7302,8 +7301,6 @@ dont-distribute-packages:
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-subscriber:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-swagger:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-swagger-ui:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   server-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-persistent:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   serversession-backend-redis:                  [ i686-linux, x86_64-linux, x86_64-darwin ]

From 7ff6eec5fd80ece0d634f1353c96f6ba4fb11ec6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 5 Mar 2017 13:56:30 +0300
Subject: [PATCH 2391/3449] makeWrapper: quote paths

Fixes https://github.com/NixOS/nixpkgs/pull/22962#commitcomment-21144939

Also run ShellCheck.
---
 .../build-support/setup-hooks/make-wrapper.sh | 75 ++++++++++---------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
index 4f55493ae483..96e50773138b 100644
--- a/pkgs/build-support/setup-hooks/make-wrapper.sh
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -19,98 +19,100 @@
 #                                   are read first and used as VALS
 # --suffix-contents
 makeWrapper() {
-    local original=$1
-    local wrapper=$2
+    local original="$1"
+    local wrapper="$2"
     local params varName value command separator n fileNames
-    local argv0 flagsBefore flags extraFlagsArray
+    local argv0 flagsBefore flags
 
-    mkdir -p "$(dirname $wrapper)"
+    mkdir -p "$(dirname "$wrapper")"
 
-    echo "#! $SHELL -e" > $wrapper
+    echo "#! $SHELL -e" > "$wrapper"
 
     params=("$@")
     for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
+        p="${params[$n]}"
 
         if test "$p" = "--set"; then
-            varName=${params[$((n + 1))]}
-            value=${params[$((n + 2))]}
+            varName="${params[$((n + 1))]}"
+            value="${params[$((n + 2))]}"
             n=$((n + 2))
-            echo "export $varName=\"$value\"" >> $wrapper
+            echo "export $varName=\"$value\"" >> "$wrapper"
         fi
 
         if test "$p" = "--unset"; then
-            varName=${params[$((n + 1))]}
+            varName="${params[$((n + 1))]}"
             n=$((n + 1))
             echo "unset $varName" >> "$wrapper"
         fi
 
         if test "$p" = "--run"; then
-            command=${params[$((n + 1))]}
+            command="${params[$((n + 1))]}"
             n=$((n + 1))
-            echo "$command" >> $wrapper
+            echo "$command" >> "$wrapper"
         fi
 
         if test "$p" = "--suffix" -o "$p" = "--prefix"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            value=${params[$((n + 3))]}
+            varName="${params[$((n + 1))]}"
+            separator="${params[$((n + 2))]}"
+            value="${params[$((n + 3))]}"
             n=$((n + 3))
             if test -n "$value"; then
                 if test "$p" = "--suffix"; then
-                    echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+                    echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper"
                 else
-                    echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper
+                    echo "export $varName=$value\${$varName:+$separator}\$$varName" >> "$wrapper"
                 fi
             fi
         fi
 
         if test "$p" = "--suffix-each"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            values=${params[$((n + 3))]}
+            varName="${params[$((n + 1))]}"
+            separator="${params[$((n + 2))]}"
+            values="${params[$((n + 3))]}"
             n=$((n + 3))
             for value in $values; do
-                echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+                echo "export $varName=\$$varName\${$varName:+$separator}$value" >> "$wrapper"
             done
         fi
 
         if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            fileNames=${params[$((n + 3))]}
+            varName="${params[$((n + 1))]}"
+            separator="${params[$((n + 2))]}"
+            fileNames="${params[$((n + 3))]}"
             n=$((n + 3))
             for fileName in $fileNames; do
                 if test "$p" = "--suffix-contents"; then
-                    echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper
+                    echo "export $varName=\$$varName\${$varName:+$separator}$(cat "$fileName")" >> "$wrapper"
                 else
-                    echo "export $varName=$(cat $fileName)\${$varName:+$separator}\$$varName" >> $wrapper
+                    echo "export $varName=$(cat "$fileName")\${$varName:+$separator}\$$varName" >> "$wrapper"
                 fi
             done
         fi
 
         if test "$p" = "--add-flags"; then
-            flags=${params[$((n + 1))]}
+            flags="${params[$((n + 1))]}"
             n=$((n + 1))
             flagsBefore="$flagsBefore $flags"
         fi
 
         if test "$p" = "--argv0"; then
-            argv0=${params[$((n + 1))]}
+            argv0="${params[$((n + 1))]}"
             n=$((n + 1))
         fi
     done
 
     # Note: extraFlagsArray is an array containing additional flags
     # that may be set by --run actions.
-    echo exec ${argv0:+-a $argv0} "$original" \
-         $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
+    # Silence warning about unexpanded extraFlagsArray:
+    # shellcheck disable=SC2016
+    echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \
+         "$flagsBefore" '"${extraFlagsArray[@]}"' '"$@"' >> "$wrapper"
 
-    chmod +x $wrapper
+    chmod +x "$wrapper"
 }
 
 addSuffix() {
-    suffix=$1
+    suffix="$1"
     shift
     for name in "$@"; do
         echo "$name$suffix"
@@ -128,7 +130,10 @@ filterExisting() {
 # Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
 wrapProgram() {
     local prog="$1"
-    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
-    mv $prog $hidden
-    makeWrapper $hidden $prog --argv0 '"$0"' "$@"
+    local hidden
+    hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
+    mv "$prog" "$hidden"
+    # Silence warning about unexpanded $0:
+    # shellcheck disable=SC2016
+    makeWrapper "$hidden" "$prog" --argv0 '$0' "$@"
 }

From 3fac05b9515dbee23d8d33dad42d947204192483 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 16 Mar 2017 15:45:07 +0100
Subject: [PATCH 2392/3449] libsodium: 1.0.11 -> 1.0.12

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

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index e0ad21008046..bfe224d28cd6 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.11";
+  name = "libsodium-1.0.12";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "0rf7z6bgpnf8lyz8sph4h43fbb28pmj4dgybf0hsxxj97kdljid1";
+    sha256 = "159givfh5jgli3cifxgssivkklfyfq6lzyjgrx8h4jx5ncdqyr5q";
   };
 
   outputs = [ "out" "dev" ];

From 504b596e5558316240f19711909b0873f820cf7d Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 16 Mar 2017 11:01:02 -0400
Subject: [PATCH 2393/3449] pythonPackages.pathspec_0_5: init

The pre-release version of pants needs it. I'll kill the duplicated copy
once the new version of pants is final.
---
 pkgs/top-level/python-packages.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97dab697081d..e2fb54ede583 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8607,7 +8607,7 @@ in {
 
     propagatedBuildInputs = with self; [
       twitter-common-collections setproctitle setuptools six ansicolors
-      packaging pathspec scandir twitter-common-dirutil psutil requests2
+      packaging pathspec_0_5 scandir twitter-common-dirutil psutil requests2
       pystache pex docutils markdown pygments twitter-common-confluence
       fasteners coverage pywatchman futures cffi
     ];
@@ -8656,6 +8656,7 @@ in {
     };
   };
 
+  # Get rid of this when pants 1.3.0 is released and make 0.5 the default
   pathspec = buildPythonPackage rec {
     pname   = "pathspec";
     version = "0.3.4";
@@ -8674,6 +8675,24 @@ in {
     };
   };
 
+  pathspec_0_5 = buildPythonPackage rec {
+    pname   = "pathspec";
+    version = "0.5.0";
+    name    = "${pname}-${version}";
+
+    src = self.fetchPypi {
+      inherit pname version;
+      sha256 = "07yx1gxj9v1iyyiy5fhq2wsmh4qfbrx158wi7jb0nx6lah80ffma";
+    };
+
+    meta = {
+      description = "Utility library for gitignore-style pattern matching of file paths";
+      homepage = "https://github.com/cpburnz/python-path-specification";
+      license = licenses.mpl20;
+      maintainers = with maintainers; [ copumpkin ];
+    };
+  };
+
   pathtools = buildPythonPackage rec {
     name = "pathtools-${version}";
     version = "0.1.2";

From c317e5c85dd5bb239622ba6846b9ad5cec4c91da Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 15 Mar 2017 23:59:57 +0100
Subject: [PATCH 2394/3449] ldns: split man pages

Saves ~1.8MB
---
 pkgs/development/libraries/ldns/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index c35cc5883146..91eb7aecea90 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     patchShebangs doc/doxyparse.pl
   '';
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "man" ];
 
   nativeBuildInputs = [ perl ];
   buildInputs = [ openssl ];

From 0526467494476586a715e75c1ac37c5a800df011 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 16 Mar 2017 14:57:07 +0100
Subject: [PATCH 2395/3449] dnscrypt-proxy: enable additional plugins

Adding ldns builds additional plugins for rewriting DNS queries,
such as blocking and forwarding.

For example, to use a custom domain blocklist, you can do
```nix
let
  myBlockListFile = writeText "blocked-domains" ''
    *.example.com
  '';
in
{
  services.dnscrypt-proxy.extraArgs = [
    "-X libdcplugin_example_ldns_blocking.so,--domains=${myBlockListFile}"
  ];
}
```
---
 pkgs/tools/networking/dnscrypt-proxy/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 24aa3d4b829b..03d217440957 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libsodium, systemd }:
+{ stdenv, fetchurl, pkgconfig, libsodium, ldns, openssl, systemd }:
 
 with stdenv.lib;
 
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libsodium ] ++ optional stdenv.isLinux systemd;
+  # <ldns/ldns.h> depends on <openssl/ssl.h>
+  buildInputs = [ libsodium openssl.dev ldns ] ++ optional stdenv.isLinux systemd;
 
   postInstall = ''
     # Previous versions required libtool files to load plugins; they are

From 2e72372c05ee5a4e0c690178c5f6305878a3a777 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 16 Mar 2017 17:19:10 +0100
Subject: [PATCH 2396/3449] pythonPackages.django_guardian: fix eval

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

diff --git a/pkgs/development/python-modules/django_guardian.nix b/pkgs/development/python-modules/django_guardian.nix
index c9217955213d..1b31456162b0 100644
--- a/pkgs/development/python-modules/django_guardian.nix
+++ b/pkgs/development/python-modules/django_guardian.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, python, fetchurl
 , django_environ, mock, django, six
-, pytest, pytestrunner, pytestdjango, setuptools_scm
+, pytest, pytestrunner, pytest-django, setuptools_scm
 }:
 buildPythonPackage rec {
   name = "django-guardian-${version}";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "1r3xj0ik0hh6dfak4kjndxk5v73x95nfbppgr394nhnmiayv4zc5";
   };
 
-  buildInputs = [ pytest pytestrunner pytestdjango django_environ mock setuptools_scm ];
+  buildInputs = [ pytest pytestrunner pytest-django django_environ mock setuptools_scm ];
   propagatedBuildInputs = [ django six ];
 
   checkPhase = ''

From 12da885e45c6abe3bad371e70dcd1f2760e40735 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Thu, 16 Mar 2017 12:21:14 -0400
Subject: [PATCH 2397/3449] pdfpc: Add darwin support

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

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 2f023412faf5..49bcd4fe90a7 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig, vala, gtk3, libgee
-, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg }:
+, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig vala ];
   buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler
-    libpthreadstubs makeWrapper librsvg ];
+    libpthreadstubs makeWrapper librsvg pcre ];
+
+  cmakeFlags = stdenv.lib.optionalString stdenv.isDarwin "-DMOVIES=OFF";
 
   postInstall = ''
     wrapProgram $out/bin/pdfpc \
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = https://pdfpc.github.io/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ pSub ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 
 }

From 3cecb95a9debf0382db5103c9c22a9faa6ec4f85 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 15:55:43 -0500
Subject: [PATCH 2398/3449] libdap: 3.15.1 -> 3.18.3

---
 pkgs/development/libraries/libdap/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index 2e76c510bdda..e20b1c95a199 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -1,21 +1,22 @@
 { stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
 
 stdenv.mkDerivation rec {
-  version = "3.15.1";
+  version = "3.18.3";
   name = "libdap-${version}";
 
-  buildInputs = [ bison libuuid curl libxml2 flex ];
+  nativeBuildInputs = [ bison flex ];
+  buildInputs = [ libuuid curl libxml2 ];
 
   src = fetchurl {
     url = "http://www.opendap.org/pub/source/${name}.tar.gz";
-    sha256 = "6ee13cc69ae0b5e7552ddfd17013ebb385859bba66f42a2cfba3b3be7aa4ef0f";
+    sha256 = "0azjf4gjqvp1fdf1wb3s98x52zfy4viq1m3j9lggaidldfinmv8c";
   };
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "A C++ SDK which contains an implementation of DAP";
     homepage = http://www.opendap.org/download/libdap;
-    license = stdenv.lib.licenses.lgpl2;
-    maintainers = [ stdenv.lib.maintainers.bzizou ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.bzizou ];
+    platforms = platforms.linux;
   };
 }

From 00b6d820018a296b59076baf3d78995da8faf6c1 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 15 Mar 2017 15:40:47 -0500
Subject: [PATCH 2399/3449] libcouchbase: 2.5.2 -> 2.7.2

fixes #23932
---
 .../libraries/libcouchbase/default.nix        | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 2784cd90a5c6..24ec3d74d36f 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -1,21 +1,28 @@
-{ stdenv, fetchurl, cmake, pkgconfig, libevent, openssl}:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libevent, openssl}:
 
-stdenv.mkDerivation {
-  name = "libcouchbase-2.5.2";
-  src = fetchurl {
-    url = "https://github.com/couchbase/libcouchbase/archive/2.5.2.tar.gz";
-    sha256 = "0ka1hix38a2kdhxz6n8frssyznf78ra0irga9d8lr5683y73xw24";
+stdenv.mkDerivation rec {
+  name = "libcouchbase-${version}";
+  version = "2.7.2";
+
+  src = fetchFromGitHub {
+    owner = "couchbase";
+    repo ="libcouchbase";
+    rev = version;
+    sha256 = "1182r9z3cykkgx1vn36l0a50wvh5mr3yj89x0ynyjhfi3iwalrar";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libevent openssl];
+  buildInputs = [ libevent openssl ];
 
-  meta = {
+  doCheck = true;
+  checkPhase = "ctest";
+
+  meta = with stdenv.lib; {
     description = "C client library for Couchbase";
     homepage = "https://github.com/couchbase/libcouchbase";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.asl20;
+    platforms = platforms.unix;
   };
 }

From fd61a33d2b42d86215c1697c8da11218279ac802 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 16 Mar 2017 16:41:44 +0000
Subject: [PATCH 2400/3449] icewm: fix CFGDIR

---
 pkgs/applications/window-managers/icewm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 861313431b07..ef3ad8fda251 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    export cmakeFlags="-DPREFIX=$out"
+    export cmakeFlags="-DPREFIX=$out -DCFGDIR=/etc/icewm"
   '';
 
   meta = {

From 5d6ea2d64e759e30c5864ca2950c0b5ad9070437 Mon Sep 17 00:00:00 2001
From: Daniel Brockman <daniel@brockman.se>
Date: Fri, 10 Mar 2017 21:59:38 +0100
Subject: [PATCH 2401/3449] jshon: fix null termination in read_stream.

This fixes a somewhat critical (security?) bug.

We are trying to get it merged upstream but have had no response from
the ordinary maintainer in over a week.

(See <https://github.com/keenerd/jshon/issues/53>.)

fixes #23727
---
 pkgs/development/tools/parsing/jshon/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix
index 4b35ba0cce29..5406b4e9a0e5 100644
--- a/pkgs/development/tools/parsing/jshon/default.nix
+++ b/pkgs/development/tools/parsing/jshon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, jansson }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }:
 
 stdenv.mkDerivation rec {
   name = "jshon-20140712";
@@ -12,14 +12,23 @@ stdenv.mkDerivation rec {
     repo = "jshon";
   };
 
+  patches = [
+    # Fix null termination in read_stream.
+    # https://github.com/keenerd/jshon/issues/53
+    (fetchpatch {
+      url = https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch;
+      sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl";
+    })
+  ];
+
   buildInputs = [ jansson ];
 
-  patchPhase = 
+  patchPhase =
     ''
       substituteInPlace Makefile --replace "/usr/" "/"
     '';
 
-  preInstall = 
+  preInstall =
     ''
       export DESTDIR=$out
     '';

From 6da60bb10142ba2e63309da048044026f7158d0a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Mar 2017 17:35:18 +0100
Subject: [PATCH 2402/3449] modules/mlmmj: fix a typo in listaddress folder

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

diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index e2b37522cb16..4a01745eb8b6 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -18,7 +18,7 @@ let
   footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}";
   createList = d: l: ''
     ${pkgs.coreutils}/bin/mkdir -p ${listCtl d l}
-    echo ${listAddress d l} > ${listCtl d l}/listadress
+    echo ${listAddress d l} > ${listCtl d l}/listaddress
     echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > ${listCtl d l}/customheaders
     echo ${footer d l} > ${listCtl d l}/footer
     echo ${subjectPrefix l} > ${listCtl d l}/prefix

From 92bb91f72f649d49bacb55e3b735455d5a740771 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Mar 2017 17:35:50 +0100
Subject: [PATCH 2403/3449] mlmmj: add docfiles to output

---
 pkgs/servers/mail/mlmmj/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix
index 8955f40e565a..ddf4fd5d880d 100644
--- a/pkgs/servers/mail/mlmmj/default.nix
+++ b/pkgs/servers/mail/mlmmj/default.nix
@@ -10,6 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0";
   };
 
+  postInstall = ''
+    # grab all documentation files
+    docfiles=$(find -maxdepth 1 -name "[[:upper:]][[:upper:]]*")
+    install -vDm 644 -t $out/share/doc/mlmmj/ $docfiles
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://mlmmj.org;
     description = "Mailing List Management Made Joyful";
@@ -18,4 +24,4 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
   };
 
-}
\ No newline at end of file
+}

From f28fe4cfae06d8da440f5beef340762768fa9408 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 15 Mar 2017 14:50:16 +0100
Subject: [PATCH 2404/3449] pythonPackages.pycassa: init at 1.11.2

fixes #23920
---
 .../python-modules/pycassa/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/pycassa/default.nix

diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
new file mode 100644
index 000000000000..7d4be3226bd9
--- /dev/null
+++ b/pkgs/development/python-modules/pycassa/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, thrift, isPy3k }:
+
+buildPythonPackage rec {
+  pname = "pycassa";
+  version = "1.11.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nsqjzgn6v0rya60dihvbnrnq1zwaxl2qwf0sr08q9qlkr334hr6";
+  };
+
+  disabled = isPy3k;
+
+  # Tests are not executed since they require a cassandra up and
+  # running
+  doCheck = false;
+
+  propagatedBuildInputs = [ thrift ];
+
+  meta = {
+    description = "pycassa is a python client library for Apache Cassandra";
+    homepage = http://github.com/pycassa/pycassa;
+    license = stdenv.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2fb54ede583..64de0d30a74b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9022,7 +9022,9 @@ in {
     };
   };
 
-   pybluez = buildPythonPackage rec {
+  pycassa = callPackage ../development/python-modules/pycassa { };
+
+  pybluez = buildPythonPackage rec {
     version = "unstable-20160819";
     pname = "pybluez";
     name = "${pname}-${version}";

From b13f408d8bb0cde63a7f164dc0e3f63c72999bbc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 16 Mar 2017 19:43:09 +0000
Subject: [PATCH 2405/3449] pythonPackages.pycassa: fix evaluation

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

diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix
index 7d4be3226bd9..fc8fbcaa8d2d 100644
--- a/pkgs/development/python-modules/pycassa/default.nix
+++ b/pkgs/development/python-modules/pycassa/default.nix
@@ -19,8 +19,8 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ thrift ];
 
   meta = {
-    description = "pycassa is a python client library for Apache Cassandra";
+    description = "A python client library for Apache Cassandra";
     homepage = http://github.com/pycassa/pycassa;
-    license = stdenv.licenses.mit;
+    license = stdenv.lib.licenses.mit;
   };
 }

From 6d25f77a643762d718c49ab3fc86e0262d2d38fd Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 11 Mar 2017 17:55:12 +0000
Subject: [PATCH 2406/3449] nixos: tor: add enableGeoIP

---
 nixos/modules/services/security/tor.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 47f863b96df2..3b4d77a6f7b1 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -12,6 +12,10 @@ let
   torRc = ''
     User tor
     DataDirectory ${torDirectory}
+    ${optionalString cfg.enableGeoIP ''
+      GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip
+      GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6
+    ''}
 
     ${optint "ControlPort" cfg.controlPort}
   ''
@@ -58,6 +62,18 @@ in
         '';
       };
 
+      enableGeoIP = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whenever to configure Tor daemon to use GeoIP databases.
+
+          Disabling this will disable by-country statistics for
+          bridges and relays and some client and third-party software
+          functionality.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";

From a04782581a96d5ee8b4001701432599959ac2dc2 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 11 Mar 2017 18:04:08 +0000
Subject: [PATCH 2407/3449] nixos: torify: disable by default, add some
 documentation as of why

This `tsocks` wrapper leaks DNS requests to clearnet, meanwhile Tor comes with
`torsocks` which doesn't.

Previous commits to this file state that all of this still useful somehow.
Assuming that it's true, at least let's not confuse users with two different tools
and don't clash with the `tsocks` binary from nixpkgs by disabling this by default.
---
 nixos/modules/services/security/torify.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix
index a81cdbbc172f..a29cb3f33dae 100644
--- a/nixos/modules/services/security/torify.nix
+++ b/nixos/modules/services/security/torify.nix
@@ -19,15 +19,23 @@ in
 {
 
   ###### interface
-  
+
   options = {
-  
+
     services.tor.tsocks = {
 
       enable = mkOption {
-        default = cfg.enable && cfg.client.enable;
+        default = false;
         description = ''
-          Whether to build tsocks wrapper script to relay application traffic via TOR.
+          Whether to build tsocks wrapper script to relay application traffic via Tor.
+
+          <important>
+            <para>You shouldn't use this unless you know what you're
+            doing because your installation of Tor already comes with
+            its own superior (doesn't leak DNS queries)
+            <literal>torsocks</literal> wrapper which does pretty much
+            exactly the same thing as this.</para>
+          </important>
         '';
       };
 

From 14315cf4f59daf6efde281ac2be2e27602d39b41 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 10 Mar 2017 21:15:02 -0600
Subject: [PATCH 2408/3449] babl: 0.1.12 -> 0.1.24

---
 pkgs/development/libraries/babl/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 02b1af5ab521..545612d5c155 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.12";
+  name = "babl-0.1.24";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "01x4an6zixrhn0vibkxpcb7gg348gadydq8gpw82rdqp39zjp01g";
+    sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7";
   };
 
-  meta = { 
+  meta = with stdenv.lib; { 
     description = "Image pixel format conversion library";
     homepage = http://gegl.org/babl/;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
   };
 }

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 2409/3449] 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 aee0b3d7116c..5fb9cc36e962 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 2410/3449] 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 84638bc01ea6..8c8c181409d4 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 e022cc6541c6b6b9321e8eed001500671c495d9c Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Thu, 16 Mar 2017 18:13:42 -0400
Subject: [PATCH 2411/3449] gnome3.libgee: Add for Darwin

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

diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
index 7b49af3c50ff..d4697c99a938 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
     license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = gnome3.maintainers;
   };
 }

From ca8a0e3c802f51a1369fb9d72327db57bc3a94f9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 14 Mar 2017 19:03:41 -0500
Subject: [PATCH 2412/3449] libbson:1.1.10 -> 1.6.1

libbson: Removed un-needed deps
---
 pkgs/development/libraries/libbson/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 6d64df88d3f1..02e4529b759e 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -1,18 +1,18 @@
-{ autoconf, automake114x, fetchzip, libtool, perl, stdenv, which }:
-
-let
-  version = "1.1.10";
-in
+{ fetchFromGitHub, perl, stdenv, cmake }:
 
 stdenv.mkDerivation rec {
   name = "libbson-${version}";
+  version = "1.6.1";
 
-  src = fetchzip {
-    url = "https://github.com/mongodb/libbson/releases/download/${version}/libbson-${version}.tar.gz";
-    sha256 = "0zzca7zqvxf89fq7ji9626q8nnqyyh0dnmbk4xijzr9sq485xz0s";
+  src = fetchFromGitHub {
+    owner = "mongodb";
+    repo = "libbson";
+    rev = version;
+    sha256 = "1ilxbv4yjgf0vfzaa8lzn40hv5x1737ny2g2q1wmm8bl39m0viiw";
   };
 
-  buildInputs = [ autoconf automake114x libtool perl which ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ perl ];
 
   meta = with stdenv.lib; {
     description = "A C Library for parsing, editing, and creating BSON documents";

From bb728268b5f64f1a4ea708acc0a826d521baddd1 Mon Sep 17 00:00:00 2001
From: patternspandemic <patternspandemic@live.com>
Date: Wed, 8 Feb 2017 13:47:50 -0700
Subject: [PATCH 2413/3449] kodestudio: init at 17.1

---
 lib/maintainers.nix                           |   1 +
 .../editors/kodestudio/default.nix            | 133 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 136 insertions(+)
 create mode 100644 pkgs/applications/editors/kodestudio/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a44f93e36cfa..0c90d2cadd28 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -376,6 +376,7 @@
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
   paperdigits = "Mica Semrick <mica@silentumbrella.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
+  patternspandemic = "Brad Christensen <patternspandemic@live.com>";
   pawelpacana = "Paweł Pacana <pawel.pacana@gmail.com>";
   periklis = "theopompos@gmail.com";
   pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix
new file mode 100644
index 000000000000..a0e941289099
--- /dev/null
+++ b/pkgs/applications/editors/kodestudio/default.nix
@@ -0,0 +1,133 @@
+{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper
+, # Patchelf dependencies:
+  alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, mesa
+, openssl, xlibs, xorg, zlib
+}:
+
+let
+
+  version = "17.1";
+
+  sha256 = if stdenv.system == "x86_64-linux"  then "1kddisnvlk48jip6k59mw3wlkrl7rkck2lxpaghn0gfx02cvms5f"
+      else if stdenv.system == "i686-cygwin"   then "1izp42afrlh4yd322ax9w85ki388gnkqfqbw8dwnn4k3j7r5487z"
+      else throw "Unsupported system: ${stdenv.system}";
+
+  urlBase = "https://github.com/Kode/KodeStudio/releases/download/v${version}/KodeStudio-";
+
+  urlStr = if stdenv.system == "x86_64-linux"  then urlBase + "linux64.tar.gz"
+      else if stdenv.system == "i686-cygwin"   then urlBase + "win32.zip"
+      else throw "Unsupported system: ${stdenv.system}";
+
+in
+
+  stdenv.mkDerivation rec {
+    name = "kodestudio-${version}";
+
+    src = fetchurl {
+        url = urlStr;
+        inherit sha256;
+    };
+
+    buildInputs = [ makeWrapper libXScrnSaver ];
+
+    desktopItem = makeDesktopItem {
+      name = "kodestudio";
+      exec = "kodestudio";
+      icon = "kodestudio";
+      comment = "Kode Studio is an IDE for Kha based on Visual Studio Code";
+      desktopName = "Kode Studio";
+      genericName = "Text Editor";
+      categories = "GNOME;GTK;Utility;TextEditor;Development;";
+    };
+
+    sourceRoot = ".";
+
+    installPhase = ''
+      mkdir -p $out
+      cp -r ./* $out
+    '';
+
+    postFixup = lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") ''
+      # Patch Binaries
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath "$out:${atomEnv.libPath}" \
+          $out/kodestudio
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \
+          $out/resources/app/extensions/krom/Krom/linux/Krom
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath ".:${stdenv.cc.libc}/lib" \
+          $out/resources/app/extensions/kha/Kha/Kore/Tools/krafix/krafix-linux64
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath ".:${stdenv.cc.libc}/lib" \
+          $out/resources/app/extensions/kha/Kha/Kore/Tools/kraffiti/kraffiti-linux64
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" \
+          $out/resources/app/extensions/kha/Kha/Tools/kravur/kravur-linux64
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath ".:${stdenv.cc.libc}/lib:${zlib}/lib" \
+          $out/resources/app/extensions/kha/Kha/Tools/haxe/haxe-linux64
+      patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          --set-rpath ".:${stdenv.cc.libc}/lib:${libvorbis}/lib:${libogg}/lib:${flac.out}/lib" \
+          $out/resources/app/extensions/kha/Kha/Tools/oggenc/oggenc-linux64
+
+      # Patch Shared Objects
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/libnode.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib" $out/libffmpeg.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libplatform.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicuuc.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8_libbase.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libv8.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/extensions/krom/Krom/linux/libicui18n.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/RPi/libneko.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux64/libneko.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${boehmgc}/lib" $out/resources/app/extensions/kha/Kha/Backends/Kore/khacpp/project/libs/nekoapi/bin/Linux/libneko.so
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/pty.js/build/Release/pty.node
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/gcsignals.node
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/gc-signals/build/Release/obj.target/gcsignals.node
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/onig_scanner.node
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/resources/app/node_modules/oniguruma/build/Release/obj.target/onig_scanner.node
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/keymapping.node
+      patchelf --set-rpath ".:${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:${xorg.libX11}/lib" $out/resources/app/node_modules/native-keymap/build/Release/obj.target/keymapping.node
+
+      # Rewrite VSCODE_PATH inside bin/kodestudio to $out
+      substituteInPlace $out/bin/kodestudio --replace "/usr/share/kodestudio" $out
+
+      # Patch library calls that expects nix store files to be mode 644:
+      #   A stat is made on srcFile (in the nix store), and its mode used
+      #   for destFile, but it expects the mode to be read write, whereas
+      #   all regular files in the nix store are made read only.
+      #   (33188 is 100644 octal, the required mode)
+      substituteInPlace $out/resources/app/extensions/kha/Kha/Tools/khamake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188"
+      substituteInPlace $out/resources/app/extensions/kha/Kha/Kore/Tools/koremake/node_modules/fs-extra/lib/copy-sync/copy-file-sync.js --replace "stat.mode" "33188"
+
+      # Wrap preload libXss
+      wrapProgram $out/bin/kodestudio \
+          --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1
+    '';
+
+    meta = with stdenv.lib; {
+      description = ''
+        An IDE for Kha based on Visual Studio Code
+      '';
+      longDescription = ''
+        Kode Studio is an IDE for Kha based on Visual Studio Code.
+
+        Kha and Kore are multimedia frameworks for Haxe and C++ respectively
+        (with JavaScript coming soon). Using Kha or Kore you can access all
+        hardware at the lowest possible level in a completely portable way.
+      '';
+      homepage = http://kode.tech/;
+      downloadPage = https://github.com/Kode/KodeStudio/releases;
+      license = licenses.mit;
+      maintainers = [ maintainers.patternspandemic ];
+      platforms = [ "x86_64-linux" "i686-cygwin" ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d6ab328d22c..f8394ac39da4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14214,6 +14214,8 @@ with pkgs;
 
   kmplayer = kde4.callPackage ../applications/video/kmplayer { };
 
+  kodestudio = callPackage ../applications/editors/kodestudio { };
+
   konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };
 
   krita = libsForQt5.callPackage ../applications/graphics/krita {

From 7e902f5399aeec0b82baab2eb8ded0d6c05c6dce Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 16 Mar 2017 18:02:53 -0500
Subject: [PATCH 2414/3449] umockdev: init at 0.8.13

umockdev: all-packages cosmetic change
---
 .../libraries/umockdev/default.nix            | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/libraries/umockdev/default.nix

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
new file mode 100644
index 000000000000..e4c22c1af5d0
--- /dev/null
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, autoreconfHook
+, pkgconfig, glib, systemd, libgudev, vala  }:
+
+stdenv.mkDerivation rec {
+  name = "umockdev";
+  version = "0.8.13";
+
+  src = fetchFromGitHub {
+    owner = "martinpitt";
+    repo = "umockdev";
+    rev = version;
+    sha256 ="0bw2dpshlgbdwg5mhq4j22z474llpqix8pxii63r2bk5nhjc537k";
+  };
+
+  buildInputs = [ glib systemd libgudev vala ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  ### docs/gtk-doc.make not found
+  prePatch = ''
+    sed -i 's|include $(top_srcdir)/docs/gtk-doc.make||g' docs/reference/Makefile.am
+   sed -i 's|+=|=|g' docs/reference/Makefile.am
+   '';
+
+  preConfigure = ''
+    #  sed -i 's|gobject-2.0 >= 2.32.0 gio-2.0 >= 2.32.0 gio-unix-2.0 >= 2.32.0)|gobject-2.0 >= 2.32.0, gio-2.0 >= 2.32.0, gio-unix-2.0 >= 2.32.0)|g' configure
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Mock hardware devices for creating unit tests";
+    license = licenses.lgpl2;
+    maintainers = [ maintainers.ndowens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8645bb139d6..5c9e97bb8aba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9873,6 +9873,8 @@ with pkgs;
 
   uid_wrapper = callPackage ../development/libraries/uid_wrapper { };
 
+  umockdev = callPackage ../development/libraries/umockdev {  };
+
   unibilium = callPackage ../development/libraries/unibilium { };
 
   unicap = callPackage ../development/libraries/unicap {};

From ed7fb7a26534ae0e0ea4c186a4f7bba090033d56 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 16 Mar 2017 18:41:33 -0500
Subject: [PATCH 2415/3449] bobcat: 4.02.00 -> 4.07.00 (#23742)

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

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index dcd35613d545..c5a6f55681ab 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline
+{ stdenv, fetchFromGitHub, icmake
+, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
 stdenv.mkDerivation rec {
   name = "bobcat-${version}";
-  version = "4.03.00";
+  version = "4.07.00";
 
   src = fetchFromGitHub {
-    sha256 = "0jkwq3f6g3vbim2jg5wfzhin89r4crnypqggp8cqimjmpkyfqnv0";
+    sha256 = "0ja6rgdw4ng10acp2c0cv9k72i5sgng03i3xi2yshlm2811lgxcs";
     rev = version;
     repo = "bobcat";
     owner = "fbb-git";

From b760bfd9f67cff5230fd2f952de8ff771f19176b Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Fri, 17 Mar 2017 00:47:37 +0100
Subject: [PATCH 2416/3449] clementine: added switches for optional dependences
 (#23730)

Added switches for ipod, mtp, cd and cloud support.

The switch for ipod support, specifically, allows users to build it without libplist, wich is currently marked as insecure.
---
 pkgs/applications/audio/clementine/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 01c8ecaced0d..78841da46c59 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -5,6 +5,10 @@
 
 let
   withSpotify = config.clementine.spotify or false;
+  withIpod = config.clementine.ipod or false;
+  withMTP = config.clementine.mtp or true;
+  withCD = config.clementine.cd or true;
+  withCloud = config.clementine.cloud or true;
 
   version = "1.2.3";
 
@@ -30,21 +34,19 @@ let
     gst-plugins-base
     gstreamer
     gvfs
-    libcdio
-    libgpod
     liblastfm
-    libmtp
-    libplist
     pkgconfig
     protobuf
     qca2
     qjson
     qt4
-    sparsehash
     sqlite
     taglib
-    usbmuxd
-  ];
+  ]
+  ++ stdenv.lib.optionals (withIpod) [libgpod libplist usbmuxd]
+  ++ stdenv.lib.optionals (withMTP) [libmtp]
+  ++ stdenv.lib.optionals (withCD) [libcdio]
+  ++ stdenv.lib.optionals (withCloud) [sparsehash];
 
   free = stdenv.mkDerivation {
     name = "clementine-free-${version}";

From b2a37a79863e2004a7ae7842262ea0651bdb9343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Fri, 17 Mar 2017 01:36:12 +0100
Subject: [PATCH 2417/3449] hyper: 0.8.3 -> 1.3.1

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

diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 310f8feb2fd4..287efc898122 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -11,11 +11,11 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  version = "0.8.3";
+  version = "1.3.1";
   name = "hyper-${version}";
   src = fetchurl {
-    url = "https://github.com/zeit/hyper/releases/download/${version}/hyper-${version}-amd64.deb";
-    sha256 = "1683gc0fhifn89l9h67yz02pk1xz7p5l3qpiyddr9w21qr9h3lhq";
+    url = "https://github.com/zeit/hyper/releases/download/${version}/hyper_${version}.deb";
+    sha256 = "1i1rnq10a9kid8lggrd1gp9g08v98la8idnyk4kx4vn0svqy7nvl";
   };
   buildInputs = [ dpkg ];
   unpackPhase = ''
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/bin"
     mv opt "$out/"
-    ln -s "$out/opt/Hyper/Hyper" "$out/bin/Hyper"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/Hyper"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" "$out/opt/Hyper/resources/app/node_modules/child_pty/build/Release/exechelper"
+    ln -s "$out/opt/Hyper/hyper" "$out/bin/hyper"
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:\$ORIGIN" "$out/opt/Hyper/hyper"
     mv usr/* "$out/"
   '';
   dontPatchELF = true;

From c7826f4c9df876324cbc6ee8a048ca0c270950f6 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 16 Mar 2017 19:42:45 -0500
Subject: [PATCH 2418/3449] libibmad: 1.3.12 -> 1.3.13

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

diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix
index fad5c5d73f42..6a8af9ccac6d 100644
--- a/pkgs/development/libraries/libibmad/default.nix
+++ b/pkgs/development/libraries/libibmad/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libibumad }:
 
 stdenv.mkDerivation rec {
-  name = "libibmad-1.3.12";
+  name = "libibmad-1.3.13";
 
   src = fetchurl {
     url = "https://www.openfabrics.org/downloads/management/${name}.tar.gz";
-    sha256 = "0ywkz0rskci414r6h6jd4iz4qjbj37ga2k91z1mlj9xrnl9bbgzi";
+    sha256 = "02sj8k2jpcbiq8s0l2lqk4vwji2dbb2lc730cv1yzv0zr0hxgk8p";
   };
 
   buildInputs = [ libibumad ];

From 66e54f25a160ed1cd9d0a008c2c61f9c30a84eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 17 Mar 2017 01:56:13 +0100
Subject: [PATCH 2419/3449] dhparams module: condition on enable option
 (#23661)

Hence, the init/cleanup service only runs when the dhparams module is enabled.
---
 nixos/modules/security/dhparams.nix | 113 ++++++++++++++++------------
 1 file changed, 65 insertions(+), 48 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index c16cd2fafef4..55c75713101d 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -19,6 +19,12 @@ in
             Note: The name of the DH params is taken as being the name of the
             service it serves: the params will be generated before the said
             service is started.
+
+            Warning: If you are removing all dhparams from this list, you have
+            to leave security.dhparams.enable for at least one activation in
+            order to have them be cleaned up. This also means if you rollback to
+            a version without any dhparams the existing ones won't be cleaned
+            up.
           '';
         type = with types; attrsOf int;
         default = {};
@@ -34,57 +40,68 @@ in
         type = types.str;
         default = "/var/lib/dhparams";
       };
+
+      enable = mkOption {
+        description =
+          ''
+            Whether to generate new DH params and clean up old DH params.
+          '';
+        default = false;
+        type = types.bool;
+      };
     };
   };
 
-  config.systemd.services = {
-    dhparams-init = {
-      description = "Cleanup old Diffie-Hellman parameters";
-      wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set
-      serviceConfig.Type = "oneshot";
-      script =
-        # Create directory
-        ''
-          if [ ! -d ${cfg.path} ]; then
-            mkdir -p ${cfg.path}
-          fi
-        '' +
-        # Remove old dhparams
-        ''
-          for file in ${cfg.path}/*; do
-            if [ ! -f "$file" ]; then
-              continue
+  config = mkIf cfg.enable {
+    systemd.services = {
+      dhparams-init = {
+        description = "Cleanup old Diffie-Hellman parameters";
+        wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set
+        serviceConfig.Type = "oneshot";
+        script =
+          # Create directory
+          ''
+            if [ ! -d ${cfg.path} ]; then
+              mkdir -p ${cfg.path}
             fi
-        '' + concatStrings (mapAttrsToList (name: value:
-        ''
-            if [ "$file" == "${cfg.path}/${name}.pem" ] && \
-                ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then
-              continue
-            fi
-        ''
-        ) cfg.params) +
-        ''
-            rm $file
-          done
+          '' +
+          # Remove old dhparams
+          ''
+            for file in ${cfg.path}/*; do
+              if [ ! -f "$file" ]; then
+                continue
+              fi
+          '' + concatStrings (mapAttrsToList (name: value:
+          ''
+              if [ "$file" == "${cfg.path}/${name}.pem" ] && \
+                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then
+                continue
+              fi
+          ''
+          ) cfg.params) +
+          ''
+              rm $file
+            done
 
-          # TODO: Ideally this would be removing the *former* cfg.path, though this
-          # does not seem really important
-          rmdir -p --ignore-fail-on-non-empty ${cfg.path}
-        '';
-    };
-  } //
-    mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" {
-      description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
-      after = [ "dhparams-init.service" ];
-      before = [ "${name}.service" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig.Type = "oneshot";
-      script =
-        ''
-          mkdir -p ${cfg.path}
-          if [ ! -f ${cfg.path}/${name}.pem ]; then
-            ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value}
-          fi
-        '';
-    }) cfg.params;
+            # TODO: Ideally this would be removing the *former* cfg.path, though this
+            # does not seem really important as changes to it are quite unlikely
+            rmdir --ignore-fail-on-non-empty ${cfg.path}
+          '';
+      };
+    } //
+      mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" {
+        description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
+        after = [ "dhparams-init.service" ];
+        before = [ "${name}.service" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig.Type = "oneshot";
+        script =
+          ''
+            mkdir -p ${cfg.path}
+            if [ ! -f ${cfg.path}/${name}.pem ]; then
+              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value}
+            fi
+          '';
+      }) cfg.params;
+  };
 }

From e3a77dd49ab72150c8cf23e9603ed4f6a7fb2457 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 10:57:47 +0100
Subject: [PATCH 2420/3449] ocamlPackages.eliom: 6.0.0 -> 6.2.0

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

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index d7b0bbd3d48c..57f3477edf6b 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -10,12 +10,12 @@ assert stdenv.lib.versionAtLeast ocaml.version "4.02";
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.0.0";
+  version = "6.2.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "1yaqi5fdzvi2ga412chw5rk3533a3xamwfmias1crk793d43cmpc";
+    sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx";
   };
 
   patches = [ ./camlp4.patch ];

From 9fd4966429e188711844651360ffbb1e3042d93b Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 10:59:57 +0100
Subject: [PATCH 2421/3449] ocamlPackages.ocsigenserver: add pgocaml support

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

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 8d949497b465..8685097750b9 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,6 +1,7 @@
 {stdenv, fetchurl, ocaml, findlib, which, ocaml_react, ocaml_ssl,
 ocaml_lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
+, pgocaml
 }:
 
 let mkpath = p: n:
@@ -18,7 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ocaml which findlib ocaml_react ocaml_ssl ocaml_lwt
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
-  ocaml_sqlite3 tree uutf makeWrapper camlp4 ];
+  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml ];
 
   configureFlags = "--root $(out) --prefix /";
 

From bc26feb1d6edfce6b43d0d82e418e0a7c4551c78 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 14:32:19 +0100
Subject: [PATCH 2422/3449] ocamlPackages.ocsigen_toolkit: init at 1.0

---
 .../ocaml-modules/ocsigen-toolkit/default.nix | 33 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix

diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
new file mode 100644
index 000000000000..00416c92bb94
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }:
+
+buildOcaml rec
+{
+ name = "ocsigen-toolkit";
+ version = "1.0.0";
+
+ propagatedBuildInputs = [ eliom ];
+ buildInputs = [ opam ];
+
+ createFindlibDestdir = true;
+
+ installPhase =
+  ''
+    export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
+    make install
+    opam-installer --prefix=$out
+  '';
+
+  src = fetchurl {
+    sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2";
+    url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
+  };
+
+  meta = {
+    homepage = http://ocsigen.org/ocsigen-toolkit/;
+    description = " User interface widgets for Ocsigen applications";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+  };
+
+
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 43cd2e22e4e3..4cd041564f91 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -382,6 +382,8 @@ let
 
     ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
 
+    ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
+
     ojquery = callPackage ../development/ocaml-modules/ojquery { };
 
     omd = callPackage ../development/ocaml-modules/omd { };

From db05f414bd7eb37d34fbc6e9009e11ce638a3a16 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Thu, 16 Mar 2017 23:15:44 -0300
Subject: [PATCH 2423/3449] qtmultimedia-5.7: disable alsa on darwin

---
 pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
index 7c1cc5da07e3..a48dd38ae6d2 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtmultimedia.nix
@@ -1,4 +1,4 @@
-{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
+{ stdenv, qtSubmodule, qtbase, qtdeclarative, pkgconfig
 , alsaLib, gstreamer, gst-plugins-base, libpulseaudio
 }:
 
@@ -6,7 +6,7 @@ qtSubmodule {
   name = "qtmultimedia";
   qtInputs = [ qtbase qtdeclarative ];
   buildInputs = [
-    pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
-  ];
+    pkgconfig gstreamer gst-plugins-base libpulseaudio
+  ] ++ stdenv.lib.optional stdenv.isLinux alsaLib;
   qmakeFlags = [ "GST_VERSION=1.0" ];
 }

From cc012b227f47cb1913a446d95bb699967f027e71 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 17 Mar 2017 02:37:38 +0000
Subject: [PATCH 2424/3449] ocamlPackages.functoria: init at 2.0.2

Functoria is a DSL to describe a set of modules and functors, their
types and how to apply them in order to produce a complete application.

Homepage: https://github.com/mirage/functoria
---
 .../ocaml-modules/functoria/default.nix       | 27 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/functoria/default.nix

diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix
new file mode 100644
index 000000000000..bfcdd4168ca7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/functoria/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg
+, bos, cmdliner, ocamlgraph
+}:
+
+stdenv.mkDerivation rec {
+	name = "ocaml${ocaml.version}-functoria-${version}";
+	version = "2.0.2";
+	src = fetchurl {
+		url = "http://github.com/mirage/functoria/releases/download/${version}/functoria-${version}.tbz";
+		sha256 = "019rl4rir4lwgjyqj2wq3ylw4daih1kxxgbc6ld6kzcq66mwr747";
+	};
+
+	unpackCmd = "tar xjf $src";
+
+	buildInputs = [ ocaml findlib ocamlbuild opam topkg ];
+	propagatedBuildInputs = [ bos cmdliner ocamlgraph ];
+
+	inherit (topkg) buildPhase installPhase;
+
+	meta = {
+		description = "A DSL to organize functor applications";
+		homepage = https://github.com/mirage/functoria;
+		license = stdenv.lib.licenses.isc;
+		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 4cd041564f91..03afec1870fe 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -198,6 +198,8 @@ let
 
     fpath = callPackage ../development/ocaml-modules/fpath { };
 
+    functoria = callPackage ../development/ocaml-modules/functoria { };
+
     functory = callPackage ../development/ocaml-modules/functory { };
 
     gen = callPackage ../development/ocaml-modules/gen { };

From 088a1bc3110d0c0ccbd97570e851a5f4e22ab4c2 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 17 Mar 2017 07:34:25 +0000
Subject: [PATCH 2425/3449] pygame: 1.9.1 -> 1.9.3

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

diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index 226b613a8b4b..af7b7aca93cb 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,29 +1,24 @@
 { stdenv, lib, fetchurl, buildPythonPackage, python, smpeg, libX11
-, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, isPy3k,
+, SDL, SDL_image, SDL_mixer, SDL_ttf, libpng, libjpeg, portmidi, freetype
 }:
 
 buildPythonPackage rec {
   name = "pygame-${version}";
-  version = "1.9.1";
+  version = "1.9.3";
 
   src = fetchurl {
-    url = "http://www.pygame.org/ftp/pygame-1.9.1release.tar.gz";
-    sha256 = "0cyl0ww4fjlf289pjxa53q4klyn55ajvkgymw0qrdgp4593raq52";
+    url = "mirror://pypi/p/pygame/pygame-${version}.tar.gz";
+    sha256 = "1hlydiyygl444bq5m5g8n3jsxsgrdyxlm42ipmfbw36wkf0j243m";
   };
 
   buildInputs = [
     SDL SDL_image SDL_mixer SDL_ttf libpng libjpeg
-    smpeg portmidi libX11
+    portmidi libX11 freetype
   ];
 
-  # http://ubuntuforums.org/showthread.php?t=1960262
-  disabled = isPy3k;
-
   # Tests fail because of no audio device and display.
   doCheck = false;
 
-  patches = [ ./pygame-v4l.patch ];
-
   preConfigure = ''
     sed \
       -e "s/^origincdirs = .*/origincdirs = []/" \

From 934c8c7a93126090f786f9d061190cf84e7d4473 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 17 Mar 2017 04:32:34 -0400
Subject: [PATCH 2426/3449] callCabal2nix: Fixed indentation

---
 pkgs/development/haskell-modules/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index 6d15d5966245..7205f777bcf2 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -85,13 +85,13 @@ let
 
         # 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.
+          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.
 
         ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From c216a7121545d3e5f2b0f904fe7c3fc736d9b212 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Fri, 17 Mar 2017 17:05:16 +0800
Subject: [PATCH 2427/3449] terraform: use generic builder and add 0.9.0
 (#23979)

---
 .../networking/cluster/terraform/0.8.5.nix    | 34 ---------
 .../networking/cluster/terraform/default.nix  | 75 ++++++++++++-------
 pkgs/top-level/all-packages.nix               | 13 +++-
 3 files changed, 60 insertions(+), 62 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 7f927b586705..000000000000
--- 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
-    ];
-  };
-}
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 7dc2c5ed4982..7e5a1121be91 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -1,34 +1,59 @@
 { stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
-buildGoPackage rec {
-  name = "terraform-${version}";
-  version = "0.8.8";
+let
+  generic = { version, sha256 }:
+  buildGoPackage rec {
+    name = "terraform-${version}";
 
-  goPackagePath = "github.com/hashicorp/terraform";
+    goPackagePath = "github.com/hashicorp/terraform";
 
-  src = fetchFromGitHub {
-    owner  = "hashicorp";
-    repo   = "terraform";
-    rev    = "v${version}";
+    src = fetchFromGitHub {
+      owner  = "hashicorp";
+      repo   = "terraform";
+      rev    = "v${version}";
+      inherit sha256;
+    };
+
+    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
+    '';
+
+    preCheck = ''
+      export HOME=$TMP
+    '';
+
+    doCheck = true;
+
+    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 ];
+    };
+  };
+
+in rec {
+  terraform_0_8_5 = generic {
+    version = "0.8.5";
+    sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09";
+  };
+
+  terraform_0_8_8 = generic {
+    version = "0.8.8";
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  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
-    ];
+  terraform_0_9_0 = generic {
+    version = "0.9.0";
+    sha256 = "1v96qgc6pd1bkwvkz855625xdcy7xb5lk60lg70144idqmwfjb9g";
   };
+
+  terraform_0_8 = terraform_0_8_8;
+  terraform_0_9 = terraform_0_9_0;
+  terraform = terraform_0_9;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d6ab328d22c..bb00f2b07fd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17997,11 +17997,18 @@ with pkgs;
 
   sqsh = callPackage ../development/tools/sqsh { };
 
-  terraform = callPackage ../applications/networking/cluster/terraform {};
+  inherit (callPackage ../applications/networking/cluster/terraform {})
+    terraform_0_8_5
+    terraform_0_8_8
+    terraform_0_9_0;
 
-  terraform_0_8_5 = callPackage ../applications/networking/cluster/terraform/0.8.5.nix {};
+  terraform_0_8 = terraform_0_8_8;
+  terraform_0_9 = terraform_0_9_0;
+  terraform = terraform_0_8;
 
-  terragrunt = callPackage ../applications/networking/cluster/terragrunt {};
+  terragrunt = callPackage ../applications/networking/cluster/terragrunt {
+    terraform = terraform_0_8;
+  };
 
   terragrunt_0_9_8 = callPackage ../applications/networking/cluster/terragrunt/0.9.8.nix {
     terraform = terraform_0_8_5;

From 1fb21ca25c21a5ae8a81d4b302781f0f82fc3370 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Fri, 10 Mar 2017 11:52:42 +1300
Subject: [PATCH 2428/3449] kwakd: init at 0.5

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

diff --git a/pkgs/servers/kwakd/default.nix b/pkgs/servers/kwakd/default.nix
new file mode 100644
index 000000000000..7c7755dee482
--- /dev/null
+++ b/pkgs/servers/kwakd/default.nix
@@ -0,0 +1,28 @@
+{ lib, fetchFromGitHub, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "kwakd-${version}";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "fetchinson";
+    repo = "kwakd";
+    rev = "acdf0e1491204ae30622a60fde0bcae4769f78be";
+    sha256 = "1inf9ngrbxmkkdhqf1xday12nf0hxjxlx1810phkmivyyp6fl3nj";
+  };
+
+  postInstall = ''
+    serviceDir=$out/share/dbus-1/system-services
+    mkdir -p $serviceDir
+    cp kwakd.service $serviceDir/
+    substituteInPlace $serviceDir/kwakd.service \
+      --replace "kwakd -p 80" "$out/bin/kwakd -p 80"
+  '';
+
+  meta = with lib; {
+    description = "A super small webserver that serves blank pages";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.nicknovitski ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb00f2b07fd1..010738526545 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -533,6 +533,8 @@ with pkgs;
 
   oracle-instantclient = callPackage ../development/libraries/oracle-instantclient { };
 
+  kwakd = callPackage ../servers/kwakd { };
+
   kwm = callPackage ../os-specific/darwin/kwm { };
 
   khd = callPackage ../os-specific/darwin/khd {

From a3620396fd4ee36b212ac2d2be4864ade4a75d3d Mon Sep 17 00:00:00 2001
From: Nick Novitski <nicknovitski@gmail.com>
Date: Fri, 10 Mar 2017 15:42:29 +1300
Subject: [PATCH 2429/3449] hostsblock: init at 20161213

---
 pkgs/tools/misc/hostsblock/default.nix | 73 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/tools/misc/hostsblock/default.nix

diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix
new file mode 100644
index 000000000000..b6b2bc9a25cb
--- /dev/null
+++ b/pkgs/tools/misc/hostsblock/default.nix
@@ -0,0 +1,73 @@
+{ lib, coreutils, curl, fetchFromGitHub, unzip, p7zip, gnused, gnugrep, stdenv
+, blacklist ? [ "adwords.google.com" ]
+, whitelist ? [
+  ".dropbox.com"
+  " www.malwaredomainlists.com"
+  " www.arcamax.com"
+  " www.instructables.com"
+  " goo.gl"
+  " www.reddit.com"
+  " t.co"
+  " bit.ly"
+  " www.viddler.com"
+  " viddler.com"
+  " tinyurl.com"
+  " ompldr.org"
+  " www.ompldr.org"
+  "login.yahoo.com"
+  " l.yimg.com"
+  ".bp.blogspot.com"
+] }:
+
+stdenv.mkDerivation rec {
+  name = "hostsblock-${version}";
+  version = "20161213";
+
+  src = fetchFromGitHub {
+    owner = "gaenserich";
+    repo = "hostsblock";
+    rev = "91cacbdfbfb5e7ae9ba3babf8de41e135270c310";
+    sha256 = "1w91fbgf8v2nn0a6m8l6kd455km2j1lvpvqil4yxhrg018aigax0";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -Dm744 src/hostsblock.sh $out/bin/hostsblock
+    install -Dm744 src/hostsblock-urlcheck.sh $out/bin/hostsblock-urlcheck
+
+    mkdir -p $out/lib
+    install -Dm644 src/hostsblock-common.sh $out/lib/
+
+    mkdir -p $out/etc
+    install -Dm644 conf/hostsblock.conf $out/etc/
+    ${lib.concatMapStrings (d: "echo ${d} >> $out/etc/black.list\n") blacklist}
+    ${lib.concatMapStrings (d: "echo ${d} >> $out/etc/white.list\n") whitelist}
+    install -Dm644 conf/hosts.head $out/etc/
+
+    for f in $out/bin/* $out/lib/* $out/etc/hostsblock.conf; do
+      substituteInPlace $f --replace "/dev/shm" "/tmp"
+      substituteInPlace $f --replace "/usr/lib/" "$out/lib/"
+      substituteInPlace $f --replace "/etc/hostsblock/" "$out/etc/"
+      sed --in-place --regexp-extended "s|([\` ])curl |\1${curl}/bin/curl |g" $f
+      substituteInPlace $f --replace grep ${gnugrep}/bin/grep
+      substituteInPlace $f --replace " sed " " ${gnused}/bin/sed "
+      sed --in-place --regexp-extended "s|([^_])unzip |\1${unzip}/bin/unzip |" $f
+      sed --in-place --regexp-extended "s|7za([^,])|${p7zip}/bin/7za\1|g" $f
+    done
+
+    echo "postprocess(){ ${coreutils}/bin/true; }" >> $out/etc/hostsblock.conf
+
+    mkdir -p $out/share/dbus-1/system-services
+    install -Dm644 systemd/hostsblock.service $out/share/dbus-1/system-services
+    install -Dm644 systemd/hostsblock.timer $out/share/dbus-1/system-services
+  '';
+
+  meta = with lib; {
+    description = "An ad- and malware-blocking script for Linux";
+    website = http://gaenserich.github.io/hostsblock/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.nicknovitski ];
+    platforms = platforms.unix;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 010738526545..8472992b92eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -942,6 +942,8 @@ with pkgs;
 
   hexio = callPackage ../development/tools/hexio { };
 
+  hostsblock = callPackage ../tools/misc/hostsblock { };
+
   hr = callPackage ../applications/misc/hr { };
 
   interlock = callPackage ../servers/interlock {};

From f6c11331025252c95782ca6bafc6d50061fcc980 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Fri, 17 Mar 2017 11:01:55 +0100
Subject: [PATCH 2430/3449] ack: 2.14 -> 2.16

---
 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 db37a83154e4..d0b8417d99f1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -25,10 +25,10 @@ let self = _self // overrides; _self = with self; {
 
 
   ack = buildPerlPackage rec {
-    name = "ack-2.14";
+    name = "ack-2.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/P/PE/PETDANCE/${name}.tar.gz";
-      sha256 = "0gqv30666vlclnwylhk9i64s7raa70x4ncy6bg48s5gcxwrshjc5";
+      sha256 = "0ifbmbfvagfi76i7vjpggs2hrbqqisd14f5zizan6cbdn8dl5z2g";
     };
     outputs = ["out" "doc"];
     # use gnused so that the preCheck command passes

From 9b62e41c1e13c363b679f07f4f677cfa2e6c2acd Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 17 Mar 2017 10:07:12 +0000
Subject: [PATCH 2431/3449] renpy: mark as broken

---
 pkgs/development/interpreters/renpy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 57051bb951fc..934d3da6b1f6 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation {
     homepage = "http://renpy.org/";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
+    # This is an ancient version, last updated in 2014 (3d59f42ce); it fails to
+    # build with the most recent pygame version, and fails to run with 1.9.1.
+    broken = true;
   };
 
   src = fetchurl {

From b4fd04c395e868af9cc70cbc3729ff6cb230ad00 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 17 Mar 2017 14:13:16 +0100
Subject: [PATCH 2432/3449] pygame_sdl2: init at 6.99.10.1227

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64de0d30a74b..5e67aac39602 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -307,6 +307,37 @@ in {
 
   pygame-git = callPackage ../development/python-modules/pygame/git.nix { };
 
+  pygame_sdl2 = buildPythonPackage rec {
+    pname = "pygame_sdl2";
+    version = "6.99.10.1227";
+    name = "${pname}-${version}";
+
+    meta = {
+      description = "A reimplementation of parts of pygame API using SDL2";
+      homepage    = "https://github.com/renpy/pygame_sdl2";
+      # Some parts are also available under Zlib License
+      license     = licenses.lgpl2;
+      maintainers = with maintainers; [ raskin ];
+    };
+
+    propagatedBuildInputs = with self; [ ];
+    buildInputs = with pkgs; with self; [
+      SDL2 SDL2_image SDL2_ttf SDL2_mixer
+      cython libjpeg libpng ];
+
+    postInstall = ''
+      ( cd "$out"/include/python*/ ;
+        ln -s pygame-sdl2 pygame_sdl2 || true ; )
+    '';
+
+    src = pkgs.fetchFromGitHub {
+      owner = "renpy";
+      repo = "${pname}";
+      rev = "renpy-${version}";
+      sha256 = "10n6janvqh5adn7pcijqwqfh234sybjz788kb8ac6b4l11hy2lx1";
+    };
+  };
+
   pygobject2 = callPackage ../development/python-modules/pygobject { };
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { };
 

From 8388cb8bff25f2e0689e7fed239d84c1da5ad5e6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 17 Mar 2017 14:14:08 +0100
Subject: [PATCH 2433/3449] renpy: 6.17.6 -> 6.99.12.4; still a strange mistake
 on launch

---
 .../interpreters/renpy/default.nix            | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index 934d3da6b1f6..0d0cbbab2b52 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL
+{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2
 , libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib
+, glib
 }:
 
 with pythonPackages;
 
 stdenv.mkDerivation {
-  name = "renpy-6.17.6";
+  name = "renpy-6.99.12.4";
 
   meta = {
     description = "Ren'Py Visual Novel Engine";
@@ -18,19 +19,19 @@ stdenv.mkDerivation {
   };
 
   src = fetchurl {
-    url = "http://www.renpy.org/dl/6.17.6/renpy-6.17.6-source.tar.bz2";
-    sha256 = "0rkynw9cnr1zqdinz037d9zig6grhp2ca2pyxk80vhdpjb0xrkic";
+    url = "http://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2";
+    sha256 = "035342rr39zp7krp08z0xhcl73gqbqyilshgmljq0ynfrxxckn35";
   };
 
   buildInputs = [
     python cython pkgconfig wrapPython
-    SDL libpng ffmpeg freetype glew mesa fribidi zlib pygame
+    SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib
   ];
 
-  pythonPath = [ pygame ];
+  pythonPath = [ pygame_sdl2 ];
 
   RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
-    SDL SDL.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib
+    SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib
   ]);
 
   buildPhase = ''
@@ -42,12 +43,11 @@ stdenv.mkDerivation {
     cp -r renpy renpy.py $out/share/renpy
     python module/setup.py install --prefix=$out --install-lib=$out/share/renpy/module
 
-    wrapPythonPrograms
     makeWrapper ${python}/bin/python $out/bin/renpy \
-      --set PYTHONPATH $program_PYTHONPATH \
+      --set PYTHONPATH $PYTHONPATH \
       --set RENPY_BASE $out/share/renpy \
       --add-flags "-O $out/share/renpy/renpy.py"
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${pygame}/include/${python.libPrefix}";
+  NIX_CFLAGS_COMPILE = "-I${pygame_sdl2}/include/${python.libPrefix}";
 }

From 579219db498b9d3a01d7f62ccd1005ba96803e04 Mon Sep 17 00:00:00 2001
From: Sean Lee <freshdried@gmail.com>
Date: Sun, 12 Mar 2017 23:23:01 -0400
Subject: [PATCH 2434/3449] bitwig-studio: 1.3.12 -> 2.0

---
 pkgs/applications/audio/bitwig-studio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix
index 47c80af9fe0f..af0d2bbd0e9c 100644
--- a/pkgs/applications/audio/bitwig-studio/default.nix
+++ b/pkgs/applications/audio/bitwig-studio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
+{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, ffmpeg, freetype, gdk_pixbuf
 , glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp
 , libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb
 , libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "bitwig-studio-${version}";
-  version = "1.3.12";
+  version = "2.0";
 
   src = fetchurl {
     url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb";
-    sha256 = "01z6yia4a6lfsf3rqq379l7xzqfbpz27mf1mr8sx9z1a8rzzyhld";
+    sha256 = "1m7wdr0f9xi9s7q8vd66hy7fj1k0j3y5ln2yqbjwr76r9g6gkzas";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper ];
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ];
 
   binPath = lib.makeBinPath [
-    xdg_utils zenity
+    ffmpeg xdg_utils zenity
   ];
 
   installPhase = ''

From 918f33110425c1a82234b8718ea22753b932d6f6 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 17 Mar 2017 14:43:27 +0100
Subject: [PATCH 2435/3449] firefox: reenable ALSA backend

---
 pkgs/applications/networking/browsers/firefox/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 71e8d056ebe9..b991d647d0cc 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -61,6 +61,7 @@ common = { pname, version, sha512, updateScript }: stdenv.mkDerivation rec {
       "--with-system-libvpx"
       "--with-system-png" # needs APNG support
       "--with-system-icu"
+      "--enable-alsa"
       "--enable-system-ffi"
       "--enable-system-hunspell"
       "--enable-system-pixman"

From 273e480379b233b91c327e9e63746f387d764851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Fri, 17 Mar 2017 14:51:28 +0100
Subject: [PATCH 2436/3449] rustNightlyBin: 2017-01-26 -> 2017-03-16 (#23988)

thanks!
---
 pkgs/development/compilers/rust/nightlyBin.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/rust/nightlyBin.nix b/pkgs/development/compilers/rust/nightlyBin.nix
index 9916e4555c56..d8d0681a0c24 100644
--- a/pkgs/development/compilers/rust/nightlyBin.nix
+++ b/pkgs/development/compilers/rust/nightlyBin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage }:
+{ stdenv, fetchurl, makeWrapper, cacert, zlib, buildRustPackage, curl }:
 
 let
   inherit (stdenv.lib) optionalString;
@@ -9,7 +9,7 @@ let
 
   bootstrapHash =
     if stdenv.system == "x86_64-linux"
-    then "1v7jvwigb29m15wilzcrk5jmlpaccpzbkhlzf7z5qw08320gvc91"
+    then "1d5h34dkm1r1ff562szygn9xk2qll1pjryvypl0lazzanxdh5gv5"
     else throw "missing bootstrap hash for platform ${stdenv.system}";
 
   needsPatchelf = stdenv.isLinux;
@@ -19,7 +19,7 @@ let
      sha256 = bootstrapHash;
   };
 
-  version = "2017-01-26";
+  version = "2017-03-16";
 in
 
 rec {
@@ -69,7 +69,7 @@ rec {
       license = [ licenses.mit licenses.asl20 ];
     };
 
-    buildInputs = [ makeWrapper ];
+    buildInputs = [ makeWrapper curl ];
     phases = ["unpackPhase" "installPhase"];
 
     installPhase = ''
@@ -78,6 +78,7 @@ rec {
 
       ${optionalString needsPatchelf ''
         patchelf \
+          --set-rpath "${stdenv.lib.makeLibraryPath [ curl zlib ]}" \
           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
           "$out/bin/cargo"
       ''}

From f9f15fff56c669282b3e19eb4f471765e0ca6e7e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Mar 2017 17:01:29 -0500
Subject: [PATCH 2437/3449] irker: init at 2017-02-12

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

diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix
new file mode 100644
index 000000000000..fb5d49849f87
--- /dev/null
+++ b/pkgs/servers/irker/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitLab, python, pkgconfig
+, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_412 }:
+
+stdenv.mkDerivation rec {
+  name = "irker-${version}";
+  version = "2017-02-12";
+
+  src = fetchFromGitLab {
+    owner = "esr";
+    repo = "irker";
+    rev = "dc0f65a7846a3922338e72d8c6140053fe914b54";
+    sha256 = "1hslwqa0gqsnl3l6hd5hxpn0wlachxd51infifhlwhyhd6iwgx8p";
+  };
+
+  nativeBuildInputs = [ pkgconfig xmlto docbook2x ];
+
+  buildInputs = [
+    python
+    # Needed for proxy support I believe, which I haven't tested.
+    # Probably needs to be propagated and some wrapPython magic
+    # python.pkgs.pysocks
+  ];
+
+  preBuild = ''
+    export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml'
+  '';
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace '-o 0 -g 0' ""
+  '';
+
+  installFlags = [
+    "prefix=/"
+    "DESTDIR=$$out"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "IRC client that runs as a daemon accepting notification requests";
+    homepage = "https://gitlab.com/esr/irker";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d6ab328d22c..c5e24eef3c3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2383,6 +2383,8 @@ with pkgs;
 
   ipxe = callPackage ../tools/misc/ipxe { };
 
+  irker = callPackage ../servers/irker { };
+
   ised = callPackage ../tools/misc/ised {};
 
   isl = isl_0_17;

From 2807d75dca3121992a7857254727ce91228bc80e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 16 Mar 2017 17:01:56 -0500
Subject: [PATCH 2438/3449] irkerd service: init

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/services/misc/irkerd.nix | 67 ++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 nixos/modules/services/misc/irkerd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 627807edb900..740344dad369 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -273,6 +273,7 @@
   ./services/misc/gogs.nix
   ./services/misc/gpsd.nix
   #./services/misc/ihaskell.nix
+  ./services/misc/irkerd.nix
   ./services/misc/leaps.nix
   ./services/misc/mantisbt.nix
   ./services/misc/mathics.nix
diff --git a/nixos/modules/services/misc/irkerd.nix b/nixos/modules/services/misc/irkerd.nix
new file mode 100644
index 000000000000..993d77ba424c
--- /dev/null
+++ b/nixos/modules/services/misc/irkerd.nix
@@ -0,0 +1,67 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.irkerd;
+  ports = [ 6659 ];
+in
+{
+  options.services.irkerd = {
+    enable = mkOption {
+      description = "Whether to enable irker, an IRC notification daemon.";
+      default = false;
+      type = types.bool;
+    };
+
+    openPorts = mkOption {
+      description = "Open ports in the firewall for irkerd";
+      default = false;
+      type = types.bool;
+    };
+
+    listenAddress = mkOption {
+      default = "localhost";
+      example = "0.0.0.0";
+      type = types.str;
+      description = ''
+        Specifies the bind address on which the irker daemon listens.
+        The default is localhost.
+
+        Irker authors strongly warn about the risks of running this on
+        a publicly accessible interface, so change this with caution.
+      '';
+    };
+
+    nick = mkOption {
+      default = "irker";
+      type = types.str;
+      description = "Nick to use for irker";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.irkerd = {
+      description = "Internet Relay Chat (IRC) notification daemon";
+      documentation = [ "man:irkerd(8)" "man:irkerhook(1)" "man:irk(1)" ];
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = "${pkgs.irker}/bin/irkerd -H ${cfg.listenAddress} -n ${cfg.nick}";
+        User = "irkerd";
+      };
+    };
+
+    environment.systemPackages = [ pkgs.irker ];
+
+    users.users.irkerd = {
+      description = "Irker daemon user";
+      isSystemUser = true;
+      group = "irkerd";
+    };
+    users.groups.irkerd = {};
+
+    networking.firewall.allowedTCPPorts = mkIf cfg.openPorts ports;
+    networking.firewall.allowedUDPPorts = mkIf cfg.openPorts ports;
+  };
+}

From 017fddb4be7d5c074a0b3e2dfb26b88d5e90ceaf Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 14 Mar 2017 22:14:30 +0100
Subject: [PATCH 2439/3449] ponyc: 0.11.0 -> 0.11.3

---
 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 3f1aa85e0fcc..e70fee3605b6 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.0";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "0jjzc1711km53zkkxwy4r9ki9yxdx8mdjrp7g3mkr42p7q5h4w70";
+    sha256 = "08wh8rh17bf043glvn7778bwpxyzpm95kgfll645hf2m65n5ncsh";
   };
 
   buildInputs = [ llvm makeWrapper which ];
diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index cd4859acec21..6e669c97300c 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-2016-10-10";
+  name = "pony-stable-unstable-2017-01-03";
 
   src = fetchFromGitHub {
     owner = "jemc";
     repo = "pony-stable";
-    rev = "fdefa26fed93f4ff81c323f29abd47813c515703";
-    sha256 = "16inavy697icgryyvn9gcylgh639xxs7lnbrqdzcryvh0ck15qxk";
+    rev = "0054b429a54818d187100ed40f5525ec7931b31b";
+    sha256 = "0libx8byzwqjjgxxyiiahiprzzp845xgbk09sx9bzban5cd5j0g5";
   };
 
   buildInputs = [ ponyc ];

From 3728143cbcead48f387dd7297f76138a82ed04de Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Tue, 7 Mar 2017 23:47:05 +0100
Subject: [PATCH 2440/3449] prometheus-unifi-exporter: init at 0.4.0

---
 nixos/modules/module-list.nix                 |   1 +
 .../monitoring/prometheus/unifi-exporter.nix  | 104 ++++++++++++++++++
 .../prometheus/unifi-exporter/default.nix     |  26 +++++
 .../prometheus/unifi-exporter/deps.nix        |  75 +++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 5 files changed, 207 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 627807edb900..d6bc34be6864 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -334,6 +334,7 @@
   ./services/monitoring/prometheus/nginx-exporter.nix
   ./services/monitoring/prometheus/node-exporter.nix
   ./services/monitoring/prometheus/snmp-exporter.nix
+  ./services/monitoring/prometheus/unifi-exporter.nix
   ./services/monitoring/prometheus/varnish-exporter.nix
   ./services/monitoring/riemann.nix
   ./services/monitoring/riemann-dash.nix
diff --git a/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
new file mode 100644
index 000000000000..e3059e485098
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/unifi-exporter.nix
@@ -0,0 +1,104 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.unifiExporter;
+in {
+  options = {
+    services.prometheus.unifiExporter = {
+      enable = mkEnableOption "prometheus unifi exporter";
+
+      port = mkOption {
+        type = types.int;
+        default = 9130;
+        description = ''
+          Port to listen on.
+        '';
+      };
+
+      unifiAddress = mkOption {
+        type = types.str;
+        example = "https://10.0.0.1:8443";
+        description = ''
+          URL of the UniFi Controller API.
+        '';
+      };
+
+      unifiInsecure = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          If enabled skip the verification of the TLS certificate of the UniFi Controller API.
+          Use with caution.
+        '';
+      };
+      
+      unifiUsername = mkOption {
+        type = types.str;
+        example = "ReadOnlyUser";
+        description = ''
+          username for authentication against UniFi Controller API.
+        '';
+      };
+      
+      unifiPassword = mkOption {
+        type = types.str;
+        description = ''
+          Password for authentication against UniFi Controller API.
+        '';
+      };
+      
+      unifiTimeout = mkOption {
+        type = types.str;
+        default = "5s";
+        example = "2m";
+        description = ''
+          Timeout including unit for UniFi Controller API requests.
+        '';
+      };
+
+      extraFlags = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        description = ''
+          Extra commandline options when launching the unifi exporter.
+        '';
+      };
+
+      openFirewall = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Open port in firewall for incoming connections.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port;
+
+    systemd.services.prometheus-unifi-exporter = {
+      description = "Prometheus exporter for UniFi Controller metrics";
+      unitConfig.Documentation = "https://github.com/mdlayher/unifi_exporter";
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "nobody";
+        Restart = "always";
+        PrivateTmp = true;
+        WorkingDirectory = /tmp;
+        ExecStart = ''
+          ${pkgs.prometheus-unifi-exporter}/bin/unifi_exporter \
+            -telemetry.addr :${toString cfg.port} \
+            -unifi.addr ${cfg.unifiAddress} \
+            -unifi.username ${cfg.unifiUsername} \
+            -unifi.password ${cfg.unifiPassword} \
+            -unifi.timeout ${cfg.unifiTimeout} \
+            ${optionalString cfg.unifiInsecure "-unifi.insecure" } \
+            ${concatStringsSep " \\\n  " cfg.extraFlags}
+        '';
+      };
+    };
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
new file mode 100644
index 000000000000..f866df49b54d
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "unifi-exporter-${version}";
+  version = "0.4.0";
+  rev = version;
+
+  goPackagePath = "github.com/mdlayher/unifi_exporter";
+
+  src= fetchFromGitHub {
+    inherit rev;
+    owner = "mdlayher";
+    repo = "unifi_exporter";
+    sha256 = "0mbav3dkrwrgzzl80q590467nbq5j61v5v7mpsbhcn2p7ak0swx4";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices";
+    homepage = https://github.com/mdlayher/unifi_exporter;
+    license = licenses.mit;
+    maintainers = with maintainers; [ bachp ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix
new file mode 100644
index 000000000000..1de25a21d8cc
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/deps.nix
@@ -0,0 +1,75 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
+      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "c9c7427a2a70d2eb3bafa0ab2dc163e45f143317";
+      sha256 = "1xy0bj66qks2xlzxzlfma16w7m8g6rrwawmlhlv68bcw2k5hvvib";
+    };
+  }
+  {
+    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/mdlayher/unifi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mdlayher/unifi";
+      rev = "418aad77bdb31a9b97d13f79162b0bac1a38bb25";
+      sha256 = "16hv2mk2vl4lcj1qf2wp9psvffz26b5zsajs2yl21rbx0pcwkcp7";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "a5060f1eaab721946b185b2de468ff83ea5b89cb";
+      sha256 = "1v9qva9c0wrjkl71b0rvvi1qj7l42gvcsj349r4lg8pwni8i6did";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "6f3806018612930941127f2a7c6c453ba2c527d2";
+      sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "49fee292b27bfff7f354ee0f64e1bc4850462edf";
+      sha256 = "01vcjzkxs34yyy402rsbxw3md7ia85ls9yzsxhgddcisa3mq23cj";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "a1dba9ce8baed984a2495b658c82687f8157b98f";
+      sha256 = "1k2460bjzsm238sqx7wi42bym5bk7ybdr4qadk9szdbv65hh8vf6";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb00f2b07fd1..aedf54c708a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10825,6 +10825,7 @@ with pkgs;
   prometheus-pushgateway = callPackage ../servers/monitoring/prometheus/pushgateway.nix { };
   prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
   prometheus-statsd-bridge = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
+  prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
   prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
 
   psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { };

From 427edf1e5d677795d20ebd8c8729a5f1bee20c96 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 17 Mar 2017 16:45:09 +0100
Subject: [PATCH 2441/3449] robomongo: mark as broken

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

diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix
index ebd97f6621d4..41de15bca518 100644
--- a/pkgs/applications/misc/robomongo/default.nix
+++ b/pkgs/applications/misc/robomongo/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.amorsillo ];
+    broken = true;
   };
 }

From 7196d16e3fc4c214c94f8d5ff4ed515d27c17152 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <git@spam.works>
Date: Fri, 17 Mar 2017 12:05:34 -0500
Subject: [PATCH 2442/3449] shapelib: init at 1.4.0

---
 .../libraries/shapelib/default.nix            | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/shapelib/default.nix

diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix
new file mode 100644
index 000000000000..529dee9376a9
--- /dev/null
+++ b/pkgs/development/libraries/shapelib/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, proj }:
+
+stdenv.mkDerivation rec {
+  name = "shapelib-1.4.0";
+
+  src = fetchurl {
+    url = "https://download.osgeo.org/shapelib/${name}.tar.gz";
+    sha256 = "18d7j5pn5srika7q3f90j0l2l4526xsjd64pin6z2b0gd7rdbp9y";
+  };
+
+  buildInputs =  [ proj ];
+
+  meta = with stdenv.lib; {
+    description = "C Library for reading, writing and updating ESRI Shapefiles";
+    homepage = http://shapelib.maptools.org/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ehmry ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aedf54c708a0..39343a20fb2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9662,6 +9662,8 @@ with pkgs;
 
   sfml = callPackage ../development/libraries/sfml { };
 
+  shapelib = callPackage ../development/libraries/shapelib { };
+
   skalibs = callPackage ../development/libraries/skalibs { };
 
   slang = callPackage ../development/libraries/slang { };

From fa65cc067b3bbdf4d4cdfb21f24009c297334b28 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <git@spam.works>
Date: Fri, 17 Mar 2017 12:08:23 -0500
Subject: [PATCH 2443/3449] xaster: init at release 208

---
 pkgs/applications/misc/xastir/default.nix | 37 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/misc/xastir/default.nix

diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix
new file mode 100644
index 000000000000..9b27e8fc7947
--- /dev/null
+++ b/pkgs/applications/misc/xastir/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook
+, curl, db, gdal, libgeotiff
+, libXpm, libXt, motif, pcre
+, perl, proj, rastermagick, shapelib
+}:
+
+let
+  version = "208";
+in
+stdenv.mkDerivation {
+  name = "xastir-"+version;
+
+  src = fetchFromGitHub {
+    owner = "Xastir";
+    repo = "Xastir";
+    rev = "707f3aa8c7ca3e3fecd32d5a4af3f742437e5dce";
+    sha256 = "1mm22vn3hws7dmg9wpaj4s0zkzb77i3aqa2ay3q6kqjkdhv25brl";
+  };
+
+  buildInputs =
+    [ autoreconfHook
+      curl db gdal libgeotiff
+      libXpm libXt motif pcre
+      perl proj rastermagick shapelib
+    ];
+
+  configureFlags =
+    [ "--with-motif-includes=${motif}/include" ];
+
+  meta = with stdenv.lib; {
+    description = "Graphical APRS client";
+    homepage = https://xastir.org;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ehmry ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39343a20fb2d..2c0e8f3ded35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16001,6 +16001,11 @@ with pkgs;
 
   xara = callPackage ../applications/graphics/xara { };
 
+  xastir = callPackage ../applications/misc/xastir {
+    rastermagick = imagemagick;
+    inherit (xorg) libXt;
+  };
+
   xawtv = callPackage ../applications/video/xawtv { };
 
   xbindkeys = callPackage ../tools/X11/xbindkeys { };

From ff7506d665141f2df5527446df4196be30ed4e4c Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Fri, 17 Mar 2017 17:28:48 +0000
Subject: [PATCH 2444/3449] tvheadend: fix typo in package description

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

diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix
index ee51ace4b687..b05977a1e25d 100644
--- a/pkgs/servers/tvheadend/default.nix
+++ b/pkgs/servers/tvheadend/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "TV steaming server";
+    description = "TV streaming server";
     longDescription = ''
 	Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android 
         supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources.

From dbee6b6ef8c13e8eb0793b7f1616859d3683a894 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sat, 18 Mar 2017 01:39:03 +0800
Subject: [PATCH 2445/3449] emem: 0.2.41 -> 0.2.42

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

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index f748318407a3..57d3539d2719 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,18 +2,16 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.41";
+  version = "0.2.42";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0pg7m4fyrcbm8d5nj96xvvh1cvml501rw34hniqq384waifr2kqs";
+    sha256 = "0zm3sqgbiaj44nkgkjiifxwwyrcjs42nry6zmbg3dnnpd0v82v8j";
   };
 
-  buildInputs = [ ];
-
   phases = [ "buildPhase" "installPhase" ];
 
   buildPhase = ''

From 0a2ea18e85e1a2aa18526708c17aa8c780e1c5eb Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Wed, 15 Mar 2017 20:33:25 +0000
Subject: [PATCH 2446/3449] pythonPackages.zeep: init at 1.1.0

Works with both Python 2.7 and 3.5.

Tests won't work under Python 3.5 due to the testtools dependency.
---
 .../python-modules/zeep/default.nix           | 91 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  3 +
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/development/python-modules/zeep/default.nix

diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
new file mode 100644
index 000000000000..c6ae3881f1f4
--- /dev/null
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -0,0 +1,91 @@
+{ fetchPypi
+, lib
+, buildPythonPackage
+, python
+, isPy3k
+, appdirs
+, cached-property
+, defusedxml
+, isodate
+, lxml
+, pytz
+, requests_toolbelt
+, six
+# test dependencies
+, freezegun
+, mock
+, nose
+, pretend
+, pytest
+, pytestcov
+, requests-mock
+, testtools
+}:
+
+let
+  pname = "zeep";
+  version = "1.1.0";
+in buildPythonPackage {
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "83e82b6cb59e84bf4725add3771ed442bb099fad5959c887efe7c49a8a940ea5";
+  };
+
+  propagatedBuildInputs = [
+    appdirs
+    cached-property
+    defusedxml
+    isodate
+    lxml
+    pytz
+    requests_toolbelt
+    six
+  ];
+
+  # testtools dependency not supported for py3k
+  doCheck = !isPy3k;
+
+  buildInputs = if isPy3k then [] else [
+    freezegun
+    mock
+    nose
+    pretend
+    pytest
+    pytestcov
+    requests-mock
+  ];
+
+  patchPhase = ''
+    # remove overly strict bounds and lint requirements
+    sed -e "s/freezegun==.*'/freezegun'/" \
+        -e "s/pytest-cov==.*'/pytest-cov'/" \
+        -e "s/'isort.*//" \
+        -e "s/'flake8.*//" \
+        -i setup.py
+
+    # locale.preferredencoding() != 'utf-8'
+    sed -e "s/xsd', 'r')/xsd', 'r', encoding='utf-8')/" -i tests/*.py
+
+    # cache defaults to home directory, which doesn't exist
+    sed -e "s|SqliteCache()|SqliteCache(path='./zeeptest.db')|" \
+        -i tests/test_transports.py
+
+    # requires xmlsec python module
+    rm tests/test_wsse_signature.py
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    ${python.interpreter} -m pytest tests
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    homepage = "http://docs.python-zeep.org";
+    license = licenses.mit;
+    description = "A modern/fast Python SOAP client based on lxml / requests";
+    maintainers = with maintainers; [ rvl ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e67aac39602..0a9c43799976 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -32122,6 +32122,9 @@ EOF
   yenc = callPackage ../development/python-modules/yenc {
   };
 
+  zeep = callPackage ../development/python-modules/zeep {
+  };
+
   zeitgeist = if isPy3k then throw "zeitgeist not supported for interpreter ${python.executable}" else
     (pkgs.zeitgeist.override{python2Packages=self;}).py;
 

From 1129f92f6548b9436e16e9f0a776fdbf84c43752 Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Wed, 15 Mar 2017 22:01:39 +0100
Subject: [PATCH 2447/3449] file: 5.28 -> 5.30

---
 pkgs/tools/misc/file/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index b1e9990ea7d4..68e4210ad418 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,21 +1,26 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.28";
-
-  buildInputs = [ zlib ];
+  name = "file-${version}";
+  version = "5.30";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
-      "http://distfiles.macports.org/file/${name}.tar.gz"
+      "https://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "04p0w9ggqq6cqvwhyni0flji1z0rwrz896hmhkxd2mc6dca5xjqf";
+    sha256 = "694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214";
   };
 
-  meta = {
+  buildInputs = [ zlib ];
+
+  doCheck = true;
+
+
+  meta = with stdenv.lib; {
     homepage = "http://darwinsys.com/file";
     description = "A program that shows the type of files";
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsd2;
+    platforms = platforms.all;
   };
 }

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 2448/3449] 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 000000000000..8e41d3421173
--- /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 7d2ae4a571c4..a938ba6d0069 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 000000000000..aea3365aba4b
--- /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 f2eb80ec01d1..962506444fc6 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 2449/3449] 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 aa9c59ec551b..a137eab35344 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 4defb788ebec831f6a868f46b969755d7754cc4f Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Fri, 13 Jan 2017 15:23:34 -0700
Subject: [PATCH 2450/3449] rmilter service: Fix a couple of bugs

  * The module uses `stringSplit` but it should be `splitString`

  * `rmilter` doesn't actually support binding to multiple sockets.
    Therefore, bind to the last one specified if `socketActivation` is
    `false`.

I also believe there is a bug in this module related to systemd
`ListenStream`.  If `socketActivation` is true, Postfix gets
connection timeouts trying to connect to one of the `ListenStream`
inet addresses.  I don't know enough about `ListenStream` passing
connections on to `fd:3` to understand what's going on.

These changes are in production (with `socketActivation = false`) via NixOps.
---
 nixos/modules/services/mail/rmilter.nix | 45 +++++++++++++------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index 8f18b929c114..7fb4a5195821 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -7,32 +7,31 @@ let
   rspamdCfg = config.services.rspamd;
   cfg = config.services.rmilter;
 
-  inetSockets = map (sock: let s = stringSplit ":" sock; in "inet:${last s}:${head s}") cfg.bindInetSockets;
+  inetSockets = map (sock: let s = splitString ":" sock; in "inet:${last s}@${head s}") cfg.bindInetSockets;
   unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets;
 
   allSockets = unixSockets ++ inetSockets;
 
   rmilterConf = ''
-pidfile = /run/rmilter/rmilter.pid;
-bind_socket = ${if cfg.socketActivation then "fd:3" else concatStringsSep ", " allSockets};
-tempdir = /tmp;
-
+    pidfile = /run/rmilter/rmilter.pid;
+    bind_socket = ${if cfg.socketActivation then "fd:3" else last inetSockets};
+    tempdir = /tmp;
   '' + (with cfg.rspamd; if enable then ''
-spamd {
-        servers = ${concatStringsSep ", " servers};
-        connect_timeout = 1s;
-        results_timeout = 20s;
-        error_time = 10;
-        dead_time = 300;
-        maxerrors = 10;
-        reject_message = "${rejectMessage}";
-        ${optionalString (length whitelist != 0)  "whitelist = ${concatStringsSep ", " whitelist};"}
+    spamd {
+      servers = ${concatStringsSep ", " servers};
+      connect_timeout = 1s;
+      results_timeout = 20s;
+      error_time = 10;
+      dead_time = 300;
+      maxerrors = 10;
+      reject_message = "${rejectMessage}";
+      ${optionalString (length whitelist != 0)  "whitelist = ${concatStringsSep ", " whitelist};"}
 
-        # rspamd_metric - metric for using with rspamd
-        # Default: "default"
-        rspamd_metric = "default";
-        ${extraConfig}
-};
+      # rspamd_metric - metric for using with rspamd
+      # Default: "default"
+      rspamd_metric = "default";
+      ${extraConfig}
+    };
     '' else "") + cfg.extraConfig;
 
   rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf;
@@ -100,9 +99,11 @@ in
         default = true;
         description = ''
           Enable systemd socket activation for rmilter.
-          (disabling socket activation not recommended
-          when unix socket used, and follow to wrong
-          permissions on unix domain socket.)
+
+          Disabling socket activation is not recommended when a Unix
+          domain socket is used and could lead to incorrect
+          permissions.  Therefore, setting this to false will
+          configure rmilter to use an inet socket only.
         '';
       };
 

From 908e3ffd65cdedf651158053b92ba16fe16307ce Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 16 Mar 2017 21:03:15 +0100
Subject: [PATCH 2451/3449] znc: 1.6.4 -> 1.6.5

---
 pkgs/applications/networking/znc/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index f51b41d85686..88d1ae7fae13 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -9,14 +9,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchurl {
-    url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "070d6b1i3jy66m4ci4ypxkg4pbwqbzbzss1y1ycgq2w62zmrf423";
+    url = "http://znc.in/releases/archive/${name}.tar.gz";
+    sha256 = "1jia6kq6bp8yxfj02d5vj9vqb4pylqcldspyjj6iz82kkka2a0ig";
   };
 
-  buildInputs = [ openssl pkgconfig ]
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ openssl ]
     ++ optional withPerl perl
     ++ optional withPython python3
     ++ optional withTcl tcl

From acdcbf7b145176e46a04d014b081d562e3bc8757 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Fri, 17 Mar 2017 21:50:50 +0100
Subject: [PATCH 2452/3449] phraseapp-client: init at 1.4.3

---
 pkgs/tools/misc/phraseapp-client/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/phraseapp-client/default.nix

diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix
new file mode 100644
index 000000000000..1823c2cfad6b
--- /dev/null
+++ b/pkgs/tools/misc/phraseapp-client/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "phraseapp-client-${version}";
+  version = "1.4.3";
+
+  goPackagePath = "github.com/phrase/phraseapp-client";
+  subPackages = [ "." ];
+
+  src = fetchFromGitHub {
+    owner = "phrase";
+    repo = "phraseapp-client";
+    rev = version;
+    sha256 = "1nfab7y75vl0vg9vy8gc46h7wikk94nky1n415im1xbpsnqg77wz";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://docs.phraseapp.com;
+    description = "PhraseApp API v2 Command Line Client";
+    platforms = platforms.all;
+    license = licenses.mit;
+    maintainers = with maintainers; [ manveru ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c3a78d44f68..74f4f111eb5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14810,6 +14810,8 @@ with pkgs;
 
   phrasendrescher = callPackage ../tools/security/phrasendrescher { };
 
+  phraseapp-client = callPackage ../tools/misc/phraseapp-client { };
+
   phwmon = callPackage ../applications/misc/phwmon { };
 
   pianobar = callPackage ../applications/audio/pianobar { };

From 98edb2436861e18ef73076c5a894a6a90e7db71c Mon Sep 17 00:00:00 2001
From: Renaud <c0bw3b@users.noreply.github.com>
Date: Tue, 28 Feb 2017 23:55:18 +0100
Subject: [PATCH 2453/3449] libseccomp: 2.3.1  -> 2.3.2 + fixed
 scmp_sys_resolver

`libseccomp` is updated to 2.3.2
`scmp_sys_resolver` is fixed (it could not find libseccomp.so.2 shared library before)
---
 .../libraries/libseccomp/default.nix           | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix
index a086ae890bd0..1575a60ec699 100644
--- a/pkgs/development/libraries/libseccomp/default.nix
+++ b/pkgs/development/libraries/libseccomp/default.nix
@@ -1,26 +1,30 @@
-{ stdenv, fetchurl, getopt }:
-
-let version = "2.3.1"; in
+{ stdenv, fetchurl, getopt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "libseccomp-${version}";
+  version = "2.3.2";
 
   src = fetchurl {
     url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz";
-    sha256 = "0asnlkzqms520r0dra08dzcz5hh6hs7lkajfw9wij3vrd0hxsnzz";
+    sha256 = "3ddc8c037956c0a5ac19664ece4194743f59e1ccd4adde848f4f0dae7f77bca1";
   };
 
-  buildInputs = [ getopt ];
+  buildInputs = [ getopt makeWrapper ];
 
   patchPhase = ''
     patchShebangs .
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/scmp_sys_resolver --prefix LD_LIBRARY_PATH ":" $out/lib
+  '';
+
   meta = with stdenv.lib; {
     description = "High level library for the Linux Kernel seccomp filter";
-    homepage    = "http://sourceforge.net/projects/libseccomp";
-    license     = licenses.lgpl2;
+    homepage    = "https://github.com/seccomp/libseccomp";
+    license     = licenses.lgpl21;
     platforms   = platforms.linux;
     maintainers = with maintainers; [ thoughtpolice wkennington ];
   };
 }
+

From 81ad24d4d7ff93d0382f25ff8d963f4627c557fc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 17 Mar 2017 17:19:59 -0400
Subject: [PATCH 2454/3449] linux: 4.10.2 -> 4.10.3

---
 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 cdcd4ccc21f3..13052bf89139 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.2";
+  version = "4.10.3";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1m5ahr1m36kdni80xj4imhhw26l8621rsaaa3z4gkjmnq6n0bnxr";
+    sha256 = "1m18hlcimxj42lbg7mc9lh3hmmwpyk6y2c92xf0svmlfpzv6ah8r";
   };
 
   kernelPatches = args.kernelPatches;

From ca3fb4d1d406ab20f7fc3ade0fb92ec0a9d077d1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 17 Mar 2017 17:25:40 -0400
Subject: [PATCH 2455/3449] linux: 4.4.53 -> 4.4.54

---
 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 9c583fe30f88..7a6060456033 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.53";
+  version = "4.4.54";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1rpkrlspxs3kfks0vg4dz8n570hpwdw5zymy9g2ky5vwskawvzky";
+    sha256 = "0h2b0zv7dfa8nica7cxf2ysiqdva0bb2pmhi0kz4gyhvp2cm3rjk";
   };
 
   kernelPatches = args.kernelPatches;

From 8ab2d2ee27b84bfeb2e2077e87f5ccc7b0d129fe Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 28 Jan 2017 02:46:16 +0100
Subject: [PATCH 2456/3449] rmilter service: support only one socket

---
 nixos/doc/manual/release-notes/rl-1703.xml |  12 ++
 nixos/modules/rename.nix                   |   3 +
 nixos/modules/services/mail/rmilter.nix    | 157 ++++++++++++---------
 3 files changed, 103 insertions(+), 69 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index fda46217144c..c03bf33de8bd 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -237,6 +237,18 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      The socket handling of the <literal>services.rmilter</literal> module
+      has been fixed and refactored. As rmilter doesn't support binding to
+      more than one socket, the options <literal>bindUnixSockets</literal>
+      and <literal>bindInetSockets</literal> have been replaced by
+      <literal>services.rmilter.bindSocket.*</literal>. The default is still
+      a unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to
+      the options documentation for more information.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index af8b34b5e5cb..7b75ca85219c 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -35,6 +35,9 @@ with lib;
     (mkRemovedOptionModule [ "security" "setuidOwners" ] "Use security.wrappers instead")
     (mkRemovedOptionModule [ "security" "setuidPrograms" ] "Use security.wrappers instead")
 
+    (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead")
+    (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead")
+
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
     (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index 7fb4a5195821..3153b1c79124 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -7,14 +7,17 @@ let
   rspamdCfg = config.services.rspamd;
   cfg = config.services.rmilter;
 
-  inetSockets = map (sock: let s = splitString ":" sock; in "inet:${last s}@${head s}") cfg.bindInetSockets;
-  unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets;
+  inetSocket = addr: port: "inet:[${toString port}@${addr}]";
+  unixSocket = sock: "unix:${sock}";
 
-  allSockets = unixSockets ++ inetSockets;
+  systemdSocket = if cfg.bindSocket.type == "unix" then cfg.bindSocket.path
+    else "${cfg.bindSocket.address}:${toString cfg.bindSocket.port}";
+  rmilterSocket = if cfg.bindSocket.type == "unix" then unixSocket cfg.bindSocket.path
+    else inetSocket cfg.bindSocket.address cfg.bindSocket.port;
 
   rmilterConf = ''
     pidfile = /run/rmilter/rmilter.pid;
-    bind_socket = ${if cfg.socketActivation then "fd:3" else last inetSockets};
+    bind_socket = ${if cfg.socketActivation then "fd:3" else rmilterSocket};
     tempdir = /tmp;
   '' + (with cfg.rspamd; if enable then ''
     spamd {
@@ -32,7 +35,7 @@ let
       rspamd_metric = "default";
       ${extraConfig}
     };
-    '' else "") + cfg.extraConfig;
+  '' else "") + cfg.extraConfig;
 
   rmilterConfigFile = pkgs.writeText "rmilter.conf" rmilterConf;
 
@@ -47,11 +50,13 @@ in
     services.rmilter = {
 
       enable = mkOption {
+        type = types.bool;
         default = cfg.rspamd.enable;
         description = "Whether to run the rmilter daemon.";
       };
 
       debug = mkOption {
+        type = types.bool;
         default = false;
         description = "Whether to run the rmilter daemon in debug mode.";
       };
@@ -72,25 +77,37 @@ in
         '';
        };
 
-      bindUnixSockets =  mkOption {
-        type = types.listOf types.str;
-        default = ["/run/rmilter/rmilter.sock"];
+      bindSocket.type = mkOption {
+        type = types.enum [ "unix" "inet" ];
+        default = "unix";
         description = ''
-          Unix domain sockets to listen for MTA requests.
-        '';
-        example = ''
-            [ "/run/rmilter.sock"]
+          What kind of socket rmilter should listen on. Either "unix"
+          for an Unix domain socket or "inet" for a TCP socket.
         '';
       };
 
-      bindInetSockets = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = ''
-          Inet addresses to listen (in format accepted by systemd.socket)
+      bindSocket.path = mkOption {
+       type = types.str;
+       default = "/run/rmilter/rmilter.sock";
+       description = ''
+          Path to Unix domain socket to listen on.
         '';
-        example = ''
-            ["127.0.0.1:11990"]
+      };
+
+      bindSocket.address = mkOption {
+        type = types.str;
+        default = "::1";
+        example = "0.0.0.0";
+        description = ''
+          Inet address to listen on.
+        '';
+      };
+
+      bindSocket.port = mkOption {
+        type = types.int;
+        default = 11990;
+        description = ''
+          Inet port to listen on.
         '';
       };
 
@@ -102,13 +119,13 @@ in
 
           Disabling socket activation is not recommended when a Unix
           domain socket is used and could lead to incorrect
-          permissions.  Therefore, setting this to false will
-          configure rmilter to use an inet socket only.
+          permissions.
         '';
       };
 
       rspamd = {
         enable = mkOption {
+          type = types.bool;
           default = rspamdCfg.enable;
           description = "Whether to use rspamd to filter mails";
         };
@@ -158,13 +175,9 @@ in
           type = types.str;
           description = "Addon to postfix configuration";
           default = ''
-smtpd_milters = ${head allSockets}
-# or for TCP socket
-# # smtpd_milters = inet:localhost:9900
-milter_protocol = 6
-milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
-# skip mail without checks if milter will die
-milter_default_action = accept
+            smtpd_milters = ${rmilterSocket}
+            milter_protocol = 6
+            milter_mail_macros = i {mail_addr} {client_addr} {client_name} {auth_authen}
           '';
         };
       };
@@ -176,52 +189,58 @@ milter_default_action = accept
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = mkMerge [
 
-    users.extraUsers = singleton {
-      name = cfg.user;
-      description = "rspamd daemon";
-      uid = config.ids.uids.rmilter;
-      group = cfg.group;
-    };
+    (mkIf cfg.enable {
 
-    users.extraGroups = singleton {
-      name = cfg.group;
-      gid = config.ids.gids.rmilter;
-    };
-
-    systemd.services.rmilter = {
-      description = "Rmilter Service";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-
-      serviceConfig = {
-        ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}";
-        ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
-        User = cfg.user;
-        Group = cfg.group;
-        PermissionsStartOnly = true;
-        Restart = "always";
-        RuntimeDirectory = "rmilter";
-        RuntimeDirectoryMode = "0755";
+      users.extraUsers = singleton {
+        name = cfg.user;
+        description = "rmilter daemon";
+        uid = config.ids.uids.rmilter;
+        group = cfg.group;
       };
 
-    };
-
-    systemd.sockets.rmilter = mkIf cfg.socketActivation {
-      description = "Rmilter service socket";
-      wantedBy = [ "sockets.target" ];
-      socketConfig = {
-        ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
-        SocketUser = cfg.user;
-        SocketGroup = cfg.group;
-        SocketMode = "0666";
+      users.extraGroups = singleton {
+        name = cfg.group;
+        gid = config.ids.gids.rmilter;
       };
-    };
 
-    services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;
-    users.users.postfix.extraGroups = [ cfg.group ];
-  };
+      systemd.services.rmilter = {
+        description = "Rmilter Service";
 
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+
+        serviceConfig = {
+          ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}";
+          ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
+          User = cfg.user;
+          Group = cfg.group;
+          PermissionsStartOnly = true;
+          Restart = "always";
+          RuntimeDirectory = "rmilter";
+          RuntimeDirectoryMode = "0755";
+        };
+
+      };
+
+      systemd.sockets.rmilter = mkIf cfg.socketActivation {
+        description = "Rmilter service socket";
+        wantedBy = [ "sockets.target" ];
+        socketConfig = {
+          ListenStream = systemdSocket;
+          SocketUser = cfg.user;
+          SocketGroup = cfg.group;
+          SocketMode = "0666";
+        };
+      };
+    })
+
+    (mkIf (cfg.enable && cfg.postfix.enable) {
+
+      services.postfix.extraConfig = cfg.postfix.configFragment;
+      users.users.postfix.extraGroups = [ cfg.group ];
+
+    })
+  ];
 }

From 00239ce8e9baeef0ea55fd0995a55e0b15a25ac9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 17 Mar 2017 23:01:24 +0100
Subject: [PATCH 2457/3449] rmilter/rspamd service: tighten unix socket
 permissions

---
 nixos/modules/services/mail/rmilter.nix | 13 ++++++++-----
 nixos/modules/services/mail/rspamd.nix  |  5 ++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index 3153b1c79124..e17b7516bfff 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -5,6 +5,7 @@ with lib;
 let
 
   rspamdCfg = config.services.rspamd;
+  postfixCfg = config.services.postfix;
   cfg = config.services.rmilter;
 
   inetSocket = addr: port: "inet:[${toString port}@${addr}]";
@@ -219,7 +220,7 @@ in
           PermissionsStartOnly = true;
           Restart = "always";
           RuntimeDirectory = "rmilter";
-          RuntimeDirectoryMode = "0755";
+          RuntimeDirectoryMode = "0750";
         };
 
       };
@@ -231,16 +232,18 @@ in
           ListenStream = systemdSocket;
           SocketUser = cfg.user;
           SocketGroup = cfg.group;
-          SocketMode = "0666";
+          SocketMode = "0660";
         };
       };
     })
 
+    (mkIf (cfg.enable && cfg.rspamd.enable && rspamdCfg.enable) {
+      users.extraUsers.${cfg.user}.extraGroups = [ rspamdCfg.group ];
+    })
+
     (mkIf (cfg.enable && cfg.postfix.enable) {
-
       services.postfix.extraConfig = cfg.postfix.configFragment;
-      users.users.postfix.extraGroups = [ cfg.group ];
-
+      users.extraUsers.${postfixCfg.user}.extraGroups = [ cfg.group ];
     })
   ];
 }
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 98489df78517..6d403e448e04 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -53,8 +53,11 @@ in
       bindSocket = mkOption {
         type = types.listOf types.str;
         default = [
-          "/run/rspamd/rspamd.sock mode=0666 owner=${cfg.user}"
+          "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"
         ];
+        defaultText = ''[
+          "/run/rspamd/rspamd.sock mode=0660 owner=${cfg.user} group=${cfg.group}"
+        ]'';
         description = ''
           List of sockets to listen, in format acceptable by rspamd
         '';

From 6cc1200bd586dc8eeb930bbc3a25299ea27e5409 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Fri, 17 Mar 2017 21:38:10 +0100
Subject: [PATCH 2458/3449] marathonctl: init at 2017-03-06

---
 .../virtualization/marathonctl/default.nix    | 25 +++++++++++++++++++
 .../tools/virtualization/marathonctl/deps.nix | 12 +++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/virtualization/marathonctl/default.nix
 create mode 100644 pkgs/tools/virtualization/marathonctl/deps.nix

diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix
new file mode 100644
index 000000000000..66618e59122a
--- /dev/null
+++ b/pkgs/tools/virtualization/marathonctl/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "marathonctl-unstable-${version}";
+  version = "2017-03-06";
+
+  goPackagePath = "github.com/shoenig/marathonctl";
+  subPackages = [ "." ];
+  goDeps = ./deps.nix;
+
+  src = fetchFromGitHub {
+    owner = "shoenig";
+    repo = "marathonctl";
+    rev = "0867e66551fff5d81f25959baf914a8ee11a3a8b";
+    sha256 = "1fcc54hwpa8s3kz4gn26mc6nrv6zjrw869331nvm47khi23gpmxw";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/shoenig/marathonctl;
+    description = "CLI tool for Marathon";
+    platforms = platforms.all;
+    license = licenses.mit;
+    maintainers = with maintainers; [ manveru ];
+  };
+}
diff --git a/pkgs/tools/virtualization/marathonctl/deps.nix b/pkgs/tools/virtualization/marathonctl/deps.nix
new file mode 100644
index 000000000000..39efaab95358
--- /dev/null
+++ b/pkgs/tools/virtualization/marathonctl/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by go2nix.
+[
+  {
+    goPackagePath = "github.com/shoenig/config";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shoenig/config";
+      rev = "7d793e7ad7f175ef22743b1ea38acee8267788db";
+      sha256 = "1dhcv1j5xk30kj73dfnx3xqx8mcvk9r8ywp9khgf2kq6wh9sm1qr";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c0e8f3ded35..5fe47cdf560b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14396,6 +14396,7 @@ with pkgs;
   makeself = callPackage ../applications/misc/makeself { };
 
   marathon = callPackage ../applications/networking/cluster/marathon { };
+  marathonctl = callPackage ../tools/virtualization/marathonctl { } ;
 
   marp = callPackage ../applications/office/marp { };
 

From fbe960a635767af39e1c516b1d7e63c81045eb1a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 17 Mar 2017 17:30:49 -0500
Subject: [PATCH 2459/3449] transmission-remote-gtk: 1.2 -> 1.3.1

---
 .../p2p/transmission-remote-gtk/default.nix   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index dc80d7d34dec..694b7541bbaf 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -1,21 +1,26 @@
-{ stdenv, autoconf, automake, libtool, makeWrapper, fetchgit, pkgconfig
-, intltool, gtk3, json_glib, curl }:
+{ stdenv, autoconf, automake, libtool, makeWrapper, fetchFromGitHub, pkgconfig
+, intltool, gtk3, json_glib, curl, glib, autoconf-archive, appstream-glib }:
 
 
 stdenv.mkDerivation rec {
   name = "transmission-remote-gtk-${version}";
-  version = "1.2";
+  version = "1.3.1";
 
-  src = fetchgit {
-    url = "https://github.com/ajf8/transmission-remote-gtk.git";
-    rev = "aa4e0c7d836cfcc10d8effd10225abb050343fc8";
-    sha256 = "0qz0jzr5w5fik2awfps0q49blwm4z7diqca2405rr3fyhyjhx42b";
+  src = fetchFromGitHub {
+    owner = "transmission-remote-gtk";
+    repo = "transmission-remote-gtk";
+    rev = "${version}";
+    sha256 = "02q0vl7achx9rpd0iv0347h838bwzm7aj4k04y88g3bh8fi3cddh";
   };
 
-  buildInputs = [ libtool autoconf automake makeWrapper pkgconfig intltool
-                  gtk3 json_glib curl ];
+  preConfigure = "./autogen.sh";
 
-  preConfigure = "sh autogen.sh";
+  nativeBuildInputs= [ 
+    autoconf automake libtool makeWrapper 
+    pkgconfig intltool autoconf-archive 
+    appstream-glib
+  ];
+  buildInputs = [ gtk3 json_glib curl glib ];
 
   preFixup = ''
     wrapProgram "$out/bin/transmission-remote-gtk" \

From a8785daf0ea794f1791c598c6cac9db3858b45bb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 13 Mar 2017 22:06:17 +0300
Subject: [PATCH 2460/3449] emacs: fix runtime GTK3 dependencies

Fixes #23845.
---
 pkgs/applications/editors/emacs/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index fbf8895f971f..79c75e768205 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -4,7 +4,7 @@
 , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK2 ? false, gtk2 ? null
-, withGTK3 ? true, gtk3 ? null
+, withGTK3 ? true, gtk3 ? null, gsettings_desktop_schemas ? null
 , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null
 , withCsrc ? true
 , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
@@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkgconfig ]
-    ++ lib.optionals srcRepo [ autoconf automake texinfo ];
+    ++ lib.optionals srcRepo [ autoconf automake texinfo ]
+    ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
 
   buildInputs =
     [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
@@ -66,9 +67,9 @@ stdenv.mkDerivation rec {
       [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
         imagemagick gconf ]
     ++ lib.optional (withX && withGTK2) gtk2
-    ++ lib.optional (withX && withGTK3) gtk3
+    ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings_desktop_schemas ]
     ++ lib.optional (stdenv.isDarwin && withX) cairo
-    ++ lib.optionals withXwidgets [ webkitgtk24x wrapGAppsHook glib_networking ];
+    ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x glib_networking ];
 
   propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
 

From 953616907493c5b81ba3ec9dd86f1422f4d1fcd3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 17 Mar 2017 23:31:52 +0100
Subject: [PATCH 2461/3449] nixos/treewide: remove boolean examples for options

They contain no useful information and increase the length of the
autogenerated options documentation.

See discussion in #18816.
---
 nixos/modules/installer/cd-dvd/iso-image.nix             | 1 -
 nixos/modules/programs/adb.nix                           | 1 -
 nixos/modules/programs/gphoto2.nix                       | 1 -
 nixos/modules/programs/mosh.nix                          | 1 -
 nixos/modules/programs/ssmtp.nix                         | 3 ---
 nixos/modules/programs/tmux.nix                          | 5 -----
 nixos/modules/programs/vim.nix                           | 1 -
 nixos/modules/security/grsecurity.nix                    | 3 ---
 nixos/modules/services/backup/rsnapshot.nix              | 1 -
 nixos/modules/services/computing/boinc/client.nix        | 2 --
 nixos/modules/services/databases/cassandra.nix           | 1 -
 nixos/modules/services/databases/openldap.nix            | 1 -
 nixos/modules/services/editors/emacs.nix                 | 3 ---
 nixos/modules/services/mail/offlineimap.nix              | 1 -
 nixos/modules/services/misc/ihaskell.nix                 | 1 -
 nixos/modules/services/misc/taskserver/default.nix       | 1 -
 nixos/modules/services/monitoring/arbtt.nix              | 1 -
 nixos/modules/services/networking/aiccu.nix              | 9 ---------
 nixos/modules/services/networking/ferm.nix               | 1 -
 .../modules/services/networking/firefox/sync-server.nix  | 2 --
 nixos/modules/services/networking/mosquitto.nix          | 1 -
 nixos/modules/services/networking/quagga.nix             | 1 -
 nixos/modules/services/networking/znc.nix                | 3 ---
 nixos/modules/services/scheduling/cron.nix               | 2 +-
 nixos/modules/services/security/haka.nix                 | 1 -
 nixos/modules/services/torrent/deluge.nix                | 2 --
 nixos/modules/services/web-apps/atlassian/crowd.nix      | 1 -
 nixos/modules/services/web-apps/atlassian/jira.nix       | 1 -
 nixos/modules/services/web-servers/caddy.nix             | 1 -
 nixos/modules/services/x11/compton.nix                   | 3 ---
 .../services/x11/desktop-managers/enlightenment.nix      | 1 -
 nixos/modules/services/x11/desktop-managers/gnome3.nix   | 1 -
 nixos/modules/services/x11/desktop-managers/kodi.nix     | 1 -
 nixos/modules/services/x11/desktop-managers/xterm.nix    | 1 -
 nixos/modules/services/x11/hardware/libinput.nix         | 8 --------
 nixos/modules/services/x11/hardware/multitouch.nix       | 4 ----
 nixos/modules/services/x11/hardware/synaptics.nix        | 4 ----
 nixos/modules/services/x11/redshift.nix                  | 1 -
 nixos/modules/services/x11/unclutter-xfixes.nix          | 1 -
 nixos/modules/services/x11/unclutter.nix                 | 1 -
 nixos/modules/services/x11/urxvtd.nix                    | 1 -
 nixos/modules/services/x11/window-managers/exwm.nix      | 1 -
 nixos/modules/services/x11/window-managers/xmonad.nix    | 1 -
 nixos/modules/system/boot/loader/grub/grub.nix           | 1 -
 nixos/modules/tasks/filesystems/zfs.nix                  | 2 --
 nixos/modules/tasks/network-interfaces.nix               | 1 -
 nixos/modules/virtualisation/containers.nix              | 1 -
 47 files changed, 1 insertion(+), 86 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 85163305c1ef..d42174003526 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -172,7 +172,6 @@ in
 
     isoImage.includeSystemBuildDependencies = mkOption {
       default = false;
-      example = true;
       description = ''
         Set this option to include all the needed sources etc in the
         image. It significantly increases image size. Use that when
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 9ba81899e588..18290555b79d 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -10,7 +10,6 @@ with lib;
     programs.adb = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to configure system to use Android Debug Bridge (adb).
diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix
index 47822562aee1..ca7c6fb28f52 100644
--- a/nixos/modules/programs/gphoto2.nix
+++ b/nixos/modules/programs/gphoto2.nix
@@ -10,7 +10,6 @@ with lib;
     programs.gphoto2 = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to configure system to use gphoto2.
diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix
index 1c29eddf01d6..b3aa55e189a3 100644
--- a/nixos/modules/programs/mosh.nix
+++ b/nixos/modules/programs/mosh.nix
@@ -14,7 +14,6 @@ in
         Whether to enable mosh. Note, this will open ports in your firewall!
       '';
       default = false;
-      example = true;
       type = lib.types.bool;
     };
   };
diff --git a/nixos/modules/programs/ssmtp.nix b/nixos/modules/programs/ssmtp.nix
index f5d1873cc5c8..7d0cb3320995 100644
--- a/nixos/modules/programs/ssmtp.nix
+++ b/nixos/modules/programs/ssmtp.nix
@@ -22,7 +22,6 @@ in
       directDelivery = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Use the trivial Mail Transfer Agent (MTA)
           <command>ssmtp</command> package to allow programs to send
@@ -65,7 +64,6 @@ in
       useTLS = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether TLS should be used to connect to the default mail
           server.
@@ -75,7 +73,6 @@ in
       useSTARTTLS = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether the STARTTLS should be used to connect to the default
           mail server.  (This is needed for TLS-capable mail servers
diff --git a/nixos/modules/programs/tmux.nix b/nixos/modules/programs/tmux.nix
index f0f8d03505ac..ed1d88a420a2 100644
--- a/nixos/modules/programs/tmux.nix
+++ b/nixos/modules/programs/tmux.nix
@@ -65,7 +65,6 @@ in {
 
       aggressiveResize = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Resize the window to the size of the smallest session for which it is the current window.
@@ -81,14 +80,12 @@ in {
 
       clock24 = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Use 24 hour clock.";
       };
 
       customPaneNavigationAndResize = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Override the hjkl and HJKL bindings for pane navigation and resizing in VI mode.";
       };
@@ -124,14 +121,12 @@ in {
 
       newSession = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Automatically spawn a session if trying to attach and none are running.";
       };
 
       reverseSplit = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Reverse the window split shortcuts.";
       };
diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix
index 8476c1accd31..fe0e7f2c6d6b 100644
--- a/nixos/modules/programs/vim.nix
+++ b/nixos/modules/programs/vim.nix
@@ -9,7 +9,6 @@ in {
     defaultEditor = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         When enabled, installs vim and configures vim to be the default editor
         using the EDITOR environment variable.
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 3726b6c78185..657b059faf2e 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -21,7 +21,6 @@ in
 
     enable = mkOption {
       type = types.bool;
-      example = true;
       default = false;
       description = ''
         Enable grsecurity/PaX.
@@ -30,7 +29,6 @@ in
 
     lockTunables = mkOption {
       type = types.bool;
-      example = false;
       default = true;
       description = ''
         Whether to automatically lock grsecurity tunables
@@ -43,7 +41,6 @@ in
 
     disableEfiRuntimeServices = mkOption {
       type = types.bool;
-      example = false;
       default = true;
       description = ''
         Whether to disable access to EFI runtime services.  Enabling EFI runtime
diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix
index 16815bcc8605..bb5dcab1dcf2 100644
--- a/nixos/modules/services/backup/rsnapshot.nix
+++ b/nixos/modules/services/backup/rsnapshot.nix
@@ -26,7 +26,6 @@ in
       enableManualRsnapshot = mkOption {
         description = "Whether to enable manual usage of the rsnapshot command with this module.";
         default = true;
-        example = false;
         type = types.bool;
       };
 
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 91bd463732de..e43b6bbb2536 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -12,7 +12,6 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether to enable the BOINC distributed computing client. If this
           option is set to true, the boinc_client daemon will be run as a
@@ -41,7 +40,6 @@ in
       allowRemoteGuiRpc = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           If set to true, any remote host can connect to and control this BOINC
           client (subject to password authentication). If instead set to false,
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index b43b448ed7e1..5df4ae57f809 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -310,7 +310,6 @@ in {
     autoBootstrap = mkOption {
       description = "It makes new (non-seed) nodes automatically migrate the right data to themselves.";
       default = true;
-      example = true;
       type = types.bool;
     };
     streamingSocketTimoutInMS = mkOption {
diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index d76859bf3eb6..e884098cb08d 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -25,7 +25,6 @@ in
         description = "
           Whether to enable the ldap server.
         ";
-        example = true;
       };
 
       user = mkOption {
diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix
index 08fa6de6374c..2c5a0c4849ef 100644
--- a/nixos/modules/services/editors/emacs.nix
+++ b/nixos/modules/services/editors/emacs.nix
@@ -21,7 +21,6 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether to enable a user service for the Emacs daemon. Use <literal>emacsclient</literal> to connect to the
         daemon. If <literal>true</literal>, <varname>services.emacs.install</varname> is
@@ -32,7 +31,6 @@ in {
     install = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether to install a user service for the Emacs daemon. Once
         the service is started, use emacsclient to connect to the
@@ -57,7 +55,6 @@ in {
     defaultEditor = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         When enabled, configures emacsclient to be the default editor
         using the EDITOR environment variable.
diff --git a/nixos/modules/services/mail/offlineimap.nix b/nixos/modules/services/mail/offlineimap.nix
index 85ece020905b..4b24bd8d0813 100644
--- a/nixos/modules/services/mail/offlineimap.nix
+++ b/nixos/modules/services/mail/offlineimap.nix
@@ -12,7 +12,6 @@ in {
     install = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether to install a user service for Offlineimap. Once
         the service is started, emails will be fetched automatically.
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index df7b9be0db50..e07a4a44613a 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -16,7 +16,6 @@ in
     services.ihaskell = {
       enable = mkOption {
         default = false;
-        example = true;
         description = "Autostart an IHaskell notebook service.";
       };
 
diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix
index 826f463bbd75..ba9f52f1904b 100644
--- a/nixos/modules/services/misc/taskserver/default.nix
+++ b/nixos/modules/services/misc/taskserver/default.nix
@@ -148,7 +148,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether to enable the Taskwarrior server.
 
diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix
index 1135c2c441cb..a8d5e3b7fa07 100644
--- a/nixos/modules/services/monitoring/arbtt.nix
+++ b/nixos/modules/services/monitoring/arbtt.nix
@@ -10,7 +10,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Enable the arbtt statistics capture service.
         '';
diff --git a/nixos/modules/services/networking/aiccu.nix b/nixos/modules/services/networking/aiccu.nix
index 4301da288814..aeb0910d6246 100644
--- a/nixos/modules/services/networking/aiccu.nix
+++ b/nixos/modules/services/networking/aiccu.nix
@@ -35,7 +35,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel";
       };
 
@@ -88,21 +87,18 @@ in {
       verbose = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Be verbose?";
       };
 
       automatic = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Automatic Login and Tunnel activation";
       };
 
       requireTLS = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           When set to true, if TLS is not supported on the server
           the TIC transaction will fail.
@@ -124,7 +120,6 @@ in {
       defaultRoute = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Add a default route";
       };
 
@@ -138,7 +133,6 @@ in {
       makeHeartBeats = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           In general you don't want to turn this off
           Of course only applies to AYIYA and heartbeat tunnels not to static ones
@@ -148,21 +142,18 @@ in {
       noConfigure = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Don't configure anything";
       };
 
       behindNAT = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Notify the user that a NAT-kind network is detected";
       };
 
       localIPv4Override = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Overrides the IPv4 parameter received from TIC
           This allows one to configure a NAT into "DMZ" mode and then
diff --git a/nixos/modules/services/networking/ferm.nix b/nixos/modules/services/networking/ferm.nix
index 8933e166f59f..07338ccf4d9c 100644
--- a/nixos/modules/services/networking/ferm.nix
+++ b/nixos/modules/services/networking/ferm.nix
@@ -19,7 +19,6 @@ in {
     services.ferm = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to enable Ferm Firewall.
diff --git a/nixos/modules/services/networking/firefox/sync-server.nix b/nixos/modules/services/networking/firefox/sync-server.nix
index 70d2d72ca8b7..5c14ceff6a0d 100644
--- a/nixos/modules/services/networking/firefox/sync-server.nix
+++ b/nixos/modules/services/networking/firefox/sync-server.nix
@@ -33,7 +33,6 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = ''
           Whether to enable a Firefox Sync Server, this give the opportunity to
           Firefox users to store all synchronized data on their own server. To use this
@@ -78,7 +77,6 @@ in
       allowNewUsers = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           Whether to allow new-user signups on the server. Only request by
           existing accounts will be honored.
diff --git a/nixos/modules/services/networking/mosquitto.nix b/nixos/modules/services/networking/mosquitto.nix
index f926cd710c8d..2325424ff3c5 100644
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@@ -147,7 +147,6 @@ in
 
       allowAnonymous = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Allow clients to connect without authentication.
diff --git a/nixos/modules/services/networking/quagga.nix b/nixos/modules/services/networking/quagga.nix
index ac83da920638..aab58cc77b90 100644
--- a/nixos/modules/services/networking/quagga.nix
+++ b/nixos/modules/services/networking/quagga.nix
@@ -104,7 +104,6 @@ in
         enable = mkOption {
           type = types.bool;
           default = any isEnabled services;
-          example = true;
           description = ''
             Whether to enable the Zebra routing manager.
 
diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix
index 0d41e3ea92ce..6d68b790e869 100644
--- a/nixos/modules/services/networking/znc.nix
+++ b/nixos/modules/services/networking/znc.nix
@@ -132,7 +132,6 @@ in
     services.znc = {
       enable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Enable a ZNC service for a user.
@@ -251,7 +250,6 @@ in
 
         useSSL = mkOption {
           default = true;
-          example = true;
           type = types.bool;
           description = ''
             Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated.
@@ -278,7 +276,6 @@ in
  
       mutable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Indicates whether to allow the contents of the `dataDir` directory to be changed
diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix
index 6eb277d0a2f2..7b1a1599e141 100644
--- a/nixos/modules/services/scheduling/cron.nix
+++ b/nixos/modules/services/scheduling/cron.nix
@@ -39,7 +39,7 @@ in
 
       enable = mkOption {
         type = types.bool;
-        example = true;
+        default = false;
         description = "Whether to enable the Vixie cron daemon.";
       };
 
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
index f48a79b1f7f1..b64a1b4d03e0 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@@ -99,7 +99,6 @@ in
 
       pcap = mkOption {
         default = true;
-        example = false;
         type = types.bool;
         description = "Whether to enable pcap";
       };
diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index a9c08b66eb82..2534f09b555a 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -13,7 +13,6 @@ in {
       deluge = {
         enable = mkOption {
           default = false;
-          example = true;
           description = "Start the Deluge daemon";
         };
 
@@ -29,7 +28,6 @@ in {
       deluge.web = {
         enable = mkOption {
           default = false;
-          example = true;
           description = ''
             Start Deluge Web daemon.
           '';
diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index ada26f8057ba..7ff7dc4e5748 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -88,7 +88,6 @@ in
         secure = mkOption {
           type = types.bool;
           default = true;
-          example = false;
           description = "Whether the connections to the proxy should be considered secure.";
         };
       };
diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
index 6e31d20d0681..0ab94d95eee8 100644
--- a/nixos/modules/services/web-apps/atlassian/jira.nix
+++ b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -78,7 +78,6 @@ in
         secure = mkOption {
           type = types.bool;
           default = true;
-          example = false;
           description = "Whether the connections to the proxy should be considered secure.";
         };
       };
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index a49838c876f9..eec285f6bc44 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -29,7 +29,6 @@ in
 
     agree = mkOption {
       default = false;
-      example = true;
       type = types.bool;
       description = "Agree to Let's Encrypt Subscriber Agreement";
     };
diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix
index 7cbca1dcddfd..d1f7f164e641 100644
--- a/nixos/modules/services/x11/compton.nix
+++ b/nixos/modules/services/x11/compton.nix
@@ -43,7 +43,6 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Whether of not to enable Compton as the X.org composite manager.
       '';
@@ -52,7 +51,6 @@ in {
     fade = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Fade windows in and out.
       '';
@@ -93,7 +91,6 @@ in {
     shadow = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Draw window shadows.
       '';
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index d908553ccdf8..38e24e9b709a 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -20,7 +20,6 @@ in
 
     services.xserver.desktopManager.enlightenment.enable = mkOption {
       default = false;
-      example = true;
       description = "Enable the Enlightenment desktop environment.";
     };
 
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 21453d1917e8..a1790ccd675c 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -53,7 +53,6 @@ in {
     services.xserver.desktopManager.gnome3 = {
       enable = mkOption {
         default = false;
-        example = true;
         description = "Enable Gnome 3 desktop manager.";
       };
 
diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix
index de00ff93b17c..3ce49b9d2bf8 100644
--- a/nixos/modules/services/x11/desktop-managers/kodi.nix
+++ b/nixos/modules/services/x11/desktop-managers/kodi.nix
@@ -11,7 +11,6 @@ in
     services.xserver.desktopManager.kodi = {
       enable = mkOption {
         default = false;
-        example = true;
         description = "Enable the kodi multimedia center.";
       };
     };
diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index eab914071410..29752ff405e2 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -13,7 +13,6 @@ in
 
     services.xserver.desktopManager.xterm.enable = mkOption {
       default = true;
-      example = false;
       description = "Enable a xterm terminal as a desktop manager.";
     };
 
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index b358550ba41d..d75c785270b3 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -73,7 +73,6 @@ in {
       clickMethod = mkOption {
         type = types.nullOr (types.enum [ "none" "buttonareas" "clickfinger" ]);
         default = null;
-        example = "none";
         description =
           ''
             Enables a click method. Permitted values are none, buttonareas, clickfinger.
@@ -85,14 +84,12 @@ in {
       leftHanded = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Enables left-handed button orientation, i.e. swapping left and right buttons.";
       };
 
       middleEmulation = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Enables middle button emulation. When enabled, pressing the left and right buttons
@@ -103,7 +100,6 @@ in {
       naturalScrolling = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Enables or disables natural scrolling behavior.";
       };
 
@@ -131,7 +127,6 @@ in {
       horizontalScrolling = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Disables horizontal scrolling. When disabled, this driver will discard any horizontal scroll
@@ -153,7 +148,6 @@ in {
       tapping = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Enables or disables tap-to-click behavior.
@@ -163,7 +157,6 @@ in {
       tappingDragLock = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap-
@@ -175,7 +168,6 @@ in {
       disableWhileTyping = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description =
           ''
             Disable input method while typing.
diff --git a/nixos/modules/services/x11/hardware/multitouch.nix b/nixos/modules/services/x11/hardware/multitouch.nix
index f8386b5e333b..0e9eb0214947 100644
--- a/nixos/modules/services/x11/hardware/multitouch.nix
+++ b/nixos/modules/services/x11/hardware/multitouch.nix
@@ -18,20 +18,17 @@ in {
 
       enable = mkOption {
         default = false;
-        example = true;
         description = "Whether to enable multitouch touchpad support.";
       };
 
       invertScroll = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Whether to invert scrolling direction à la OSX Lion";
       };
 
       ignorePalm = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = "Whether to ignore touches detected as being the palm (i.e when typing)";
       };
@@ -39,7 +36,6 @@ in {
       tapButtons = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Whether to enable tap buttons.";
       };
 
diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 2a7f4e5cbcd1..54454c736c1d 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -29,7 +29,6 @@ in {
       enable = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Whether to enable touchpad support.";
       };
 
@@ -102,7 +101,6 @@ in {
       tapButtons = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Whether to enable tap buttons.";
       };
 
@@ -125,7 +123,6 @@ in {
       palmDetect = mkOption {
         type = types.bool;
         default = false;
-        example = true;
         description = "Whether to enable palm detection (hardware support required)";
       };
 
@@ -146,7 +143,6 @@ in {
       horizontalScroll = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = "Whether to enable horizontal scrolling (on touchpad)";
       };
 
diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix
index 78a97df98775..eb5dfdf95849 100644
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@@ -12,7 +12,6 @@ in {
     enable = mkOption {
       type = types.bool;
       default = false;
-      example = true;
       description = ''
         Enable Redshift to change your screen's colour temperature depending on
         the time of day.
diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix
index bd02c5ed9895..b94dfb1a26a6 100644
--- a/nixos/modules/services/x11/unclutter-xfixes.nix
+++ b/nixos/modules/services/x11/unclutter-xfixes.nix
@@ -11,7 +11,6 @@ in {
       description = "Enable unclutter-xfixes to hide your mouse cursor when inactive.";
       type = types.bool;
       default = false;
-      example = true;
     };
 
     package = mkOption {
diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix
index ebc195d108d0..6c789b7578fa 100644
--- a/nixos/modules/services/x11/unclutter.nix
+++ b/nixos/modules/services/x11/unclutter.nix
@@ -11,7 +11,6 @@ in {
       description = "Enable unclutter to hide your mouse cursor when inactive";
       type = types.bool;
       default = false;
-      example = true;
     };
 
     package = mkOption {
diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix
index be36efaa5897..57ad93f20174 100644
--- a/nixos/modules/services/x11/urxvtd.nix
+++ b/nixos/modules/services/x11/urxvtd.nix
@@ -11,7 +11,6 @@ in {
   options.services.urxvtd.enable = mkOption {
     type = types.bool;
     default = false;
-    example = true;
     description = ''
       Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run
       "urxvtc".
diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix
index dbbd8a125d66..dc1d957c1709 100644
--- a/nixos/modules/services/x11/window-managers/exwm.nix
+++ b/nixos/modules/services/x11/window-managers/exwm.nix
@@ -21,7 +21,6 @@ in
       enable = mkEnableOption "exwm";
       enableDefaultConfig = mkOption {
         default = true;
-        example = false;
         type = lib.types.bool;
         description = "Enable an uncustomised exwm configuration.";
       };
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 6af88d4f645b..e25a8ae22823 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -44,7 +44,6 @@ in
 
       enableContribAndExtras = mkOption {
         default = false;
-        example = true;
         type = lib.types.bool;
         description = "Enable xmonad-{contrib,extras} in Xmonad.";
       };
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 5ab2d0775518..2d6bf2d58a9e 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -381,7 +381,6 @@ in
 
       efiInstallAsRemovable = mkOption {
         default = false;
-        example = true;
         type = types.bool;
         description = ''
           Whether to invoke <literal>grub-install</literal> with
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c8fa6c21a4f6..d44209cfa0b3 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -109,7 +109,6 @@ in
       forceImportRoot = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           Forcibly import the ZFS root pool(s) during early boot.
 
@@ -128,7 +127,6 @@ in
       forceImportAll = mkOption {
         type = types.bool;
         default = true;
-        example = false;
         description = ''
           Forcibly import all ZFS pool(s).
 
diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index 6467259766ea..e9a3dca6418a 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -548,7 +548,6 @@ in
           };
 
           rstp = mkOption {
-            example = true;
             default = false;
             type = types.bool;
             description = "Whether the bridge interface should enable rstp.";
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index f79854967f1d..6adb2c1681a2 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -274,7 +274,6 @@ let
       };
       isReadOnly = mkOption {
         default = true;
-        example = true;
         type = types.bool;
         description = "Determine whether the mounted path will be accessed in read-only mode.";
       };

From 8b23d535d30b461a0ce455952172d237fb04817a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 17 Mar 2017 17:53:10 -0500
Subject: [PATCH 2462/3449] owncloud-client: 2.2.3 -> 2.3.0

---
 .../networking/owncloud-client/default.nix      | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index a35cfdffece2..1323c3121214 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,17 +1,16 @@
 { stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "owncloud-client" + "-" + version;
-
-  version = "2.2.3";
+  name = "owncloud-client-${version}";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "00bx9wrgvbdhi9vx30qfgkdz0k8nxlj313pac34cchx5xpij3jgq";
+    sha256 = "10ah4zmnv4hfi50k59qwk990h1a4g95d3yvxqqrv4x1dv8p2sscf";
   };
 
-  buildInputs =
-    [ cmake qt4 pkgconfig qtkeychain sqlite];
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ qt4 qtkeychain sqlite];
 
   cmakeFlags = [
   "-UCMAKE_INSTALL_LIBDIR"
@@ -19,10 +18,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Synchronise your ownCloud with your computer using this desktop client";
     homepage = https://owncloud.org;
-    maintainers = with stdenv.lib.maintainers; [ qknight ];
-    meta.platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.qknight ];
+    platforms = platforms.unix;
   };
 }

From 63f1a14ae551f650584ac7502b5ee159221d1f92 Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Fri, 17 Mar 2017 19:03:09 -0500
Subject: [PATCH 2463/3449] neo4j service: increase file limit, per warning
 emitted at startup (#23961)

---
 nixos/modules/services/databases/neo4j.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index cbba9c2a691c..205c8dc610ac 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -130,6 +130,7 @@ in {
         ExecStart = "${cfg.package}/bin/neo4j console";
         User = "neo4j";
         PermissionsStartOnly = true;
+        LimitNOFILE = 40000;
       };
       preStart = ''
         mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs}

From 3f175876e8f470b0860e37b926aa0e9776231556 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 18 Mar 2017 09:36:12 +0900
Subject: [PATCH 2464/3449] firefox, firefox-bin: 52.0 -> 52.0.1

---
 .../browsers/firefox-bin/sources.nix          | 738 +++++++++---------
 .../networking/browsers/firefox/default.nix   |   4 +-
 2 files changed, 371 insertions(+), 371 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 5e8891385d5e..06aca4b58e31 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";
+  version = "52.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ach/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ach/firefox-52.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "2fc16b1e570004de7dc43b52f6b0123fc650a7717bfcdd1bab161149f8ad7fab7558df6ce48b7a66cf06d773e5edc25087c2642e3a37d34c6c775660730ae7af";
+      sha512 = "9005c3ebc0eebb7e1b29384e931ed5c2b888d0d55c8a3f34133dda908b82df0a437c5f2a6f91288396306e161fd82df2cca4f2c49685f898760b125b6d7743dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/af/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/af/firefox-52.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "0f74ac773789bc2089b9280af5e995f46f92f34c4c90ef4d6d972bb6c67e8cf77857909b88f0419894edaf6057bd0affa4b4551d89e3e3b938b2ae84911a80b7";
+      sha512 = "8b5e3fba883af6b097ec61bb79d3e024e55c59e9f1c3f443f74e944b9b71d56ac8ce7199bbdabff06087e0082db618636d3fc832fdde926a35877046c7baf740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/an/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/an/firefox-52.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "fee74bac85e8b35ca16cbe81aca1d5e180ee6794ebee146d483315ee861f5c4f80797885a2a1a4d6d759fb787fa5e4a252ab66ad6cd5102a1dbaa346ed89d5ab";
+      sha512 = "cf0949e99606dc9f961da9f8324f96f5873ea3f7fc0454aebbf982b43704ae71575371fc8bad84b036348f206e9112ef251a0939185f39d3f0ff15aa3dcccbc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ar/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ar/firefox-52.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2d2f2daf74f829683959411f712c26ae232db3c3e079ef54ee4b12cea20b58a270df580f9256eda9bfb0cbf90bad3890c8d58a5576cea9f5a25e6c17dd581b67";
+      sha512 = "202e602cea8fab71cf3b0cad522986904fa328e181599d7005e7668a115edc3eedc3d03a66eee3a3f2ff3b07b36b43394ab90e5ddd915c89550302c203ce0a27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/as/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/as/firefox-52.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "4da8d96beadc799c27d72c56f1294dca5c8e76b5a8bbb2a9637bbbb16ecb47aa563abdc0bae5078eec040c019052e233608feac180596f8dd0787a42c8500222";
+      sha512 = "9eaaad262dbe64e70d21b651f847abeac51c66fc9ee6116847440e4217dae28bbc28d54c8d90ec7e35dc614170c86fd66bbe4d7d4e26359769d3022c3b1194fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ast/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ast/firefox-52.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "7184213214f8687a8de9bf1dd8326c98777e613a47c8e6b3bc283e94c09c5fd11d2360a4df334ca1447bd773614f6b8673ffb67a5323a2d0887efbfd3aad6f97";
+      sha512 = "93bbd1bffd278e0b9ad3f137bfaf28ba0defc95c7c9c646daf034be198051fff59e3905bac5fbddb7e6e4565e21424e0de7fa1d223ff9367d165877fcea88675";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/az/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/az/firefox-52.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "d9a791b2a679438686896ebcb995600138fb1cd88310f720afa33e302cb161550dbc628a8f3b2699217ec9275a54920197c2a2e8a9ff8671c0b6d29fe372c60e";
+      sha512 = "a7a431a8d9aff2ed8dec35b60c0802825a69ced5de4683c006feaaf2f7e05c5d19f3944fa2598be2dc6b3013e6483a0897a5924d648a8663e2a7f2647d86d491";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bg/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bg/firefox-52.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "1a1f7d34375273786cd2efe5c138aecf55839cc223520a6d31eab84446860f480521e380fa76003fff7a9fb5b41668bb20995c9f8ae50e11dc453e0ea6de3b4b";
+      sha512 = "edf77b166ce81c45f823d1e672ad17b9da4fa598322110c57866d32366e4df99c5b61ad96a5dd6696c5c7af4d8af941d32eedaa4e998e3cdfec1fb7512e2e503";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-BD/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-BD/firefox-52.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "283255c0527e44e43b9de32940886f038735537f04a83d6ed17dcee7c157ec3cedf1f6e043c7365782417040c9494560623d22552e9b9aebd5ef0a18c6dd38b8";
+      sha512 = "97b39ab362e5c99be87408bf69ac25fa9385a6fa9131e0cb653ab04993e379de1624df6cede9862535cb301244ab16e8356c243ce15970a0e292317c84399426";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bn-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bn-IN/firefox-52.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "973d32d9e8106964bd6fe15064e0bfa851e935f7fecd353e199f88a0dbe5287a2e65740f079a43dcdf35a76a8d0c98d2f24c45e8b92738e38b0a71766d980cd5";
+      sha512 = "8b49ee12c9e9516348268a595b51a808dedb505b94c35ac55e357046e9346998ccc2b94e7540a749dec2c87b3ad6be95dad2f00edf8873feacef2fed162bba2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/br/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/br/firefox-52.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "2b7180ecc0bdd038faabd837e6ce09442e8254d997f50d709fc1e4779f502ebe8d4bf0e3a90657601a9f67a09d88361da0cf354929a043116e613eb9c709f704";
+      sha512 = "b464d2da9bb8a734974e35740c8609ceafc7b731feffdc250fb16d9210c895f582f9e3faac3f70484d76b8c37f435163d6b3d1c0f9c1388f9bd1f473eaad42fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/bs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/bs/firefox-52.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "9033d98af42e5affe3f5b80dfc16ea6b08660c5a06326a50540b41463ba7356a51e9a1107fa1a698ebd0fb828100050a504a380811c8f1047aa580be28b7d9c9";
+      sha512 = "f323bfb8893c0899810e7f58ce72e569771de10e50d1f711a52df627bd074d95532d09bd9c3dc5579876ef32ba3302e3ec6799f7d8e93fa4830d6584d8a69e1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ca/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ca/firefox-52.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d0ab3be67b331f3a6c18cb1a4036820ecb7e67187ba0fd6fda59b9b6a707482c065dd21d3623796007e5b5cb492f16b95a0a759f950b830c45909910fef8ff74";
+      sha512 = "717cba2c2f690051e60a71f74e0b33d7792ddcf574cf65388de6780bf9bed90c231187a39357332bd389be83279a3b00778a04149adfaefbb6a1047077ff886c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cak/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cak/firefox-52.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6fe7403947b46fcd7535ff86259c4fd1beb36c22b4461f9ed676e38c01feaae6ae80a7711e15340e7a22605ce05b32ebd1786806c96a1e4a30b322d040acd868";
+      sha512 = "53c5a18b593450cac1336b6b16767bde7e3feb8575a5f32e00f57963daaea6a14276679378dddbeed4bf729ce55e929670ff79a65e2b3bc2da882d19a4c750af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cs/firefox-52.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "31c326df9d697dc5ddba65eb5d3c998c8ecbcda7a14712fda4909fc2ebaaa257247472d315e9d58e17cfa7feb75225cb1d8d20632381e35c3b65f47d21fa0885";
+      sha512 = "464b3b2d86256fa941a8cbbc04e68452961e8562194abc14e3e972a15ac7ccd59472e41e9a3c80ea92e5ddebaf2f56c6ff297efdfa25d3d9a892ce6d75612c14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/cy/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/cy/firefox-52.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "7c56c2780de97448f796763aef6df581639b27feced5c06e8184da2c242d0cc6500f0e1692e7e2c70f324bd9fba1f1b780146c6e969d89d2053c935cb120ef19";
+      sha512 = "00fc374e844bc59793e60d7813c7c2a255d6fcd62994455eb55a014743bec81b2eb5fa31ba39219d1d7ecfc79751f62913b3dd786d62227bdfb030f7c2d24c3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/da/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/da/firefox-52.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "e3033e0cf9100454e8fe93476a4b9935f1783f2f5489fabe9c2b495efa1af935546f8350178bb89ed71917f7fb11baedbbf90bc95922bb4c8d8214972bb61938";
+      sha512 = "d61608a98197a6c48bc38edbcdfa7cc821fba8221c16534ffe67e6a013e5b1ba23011c3524a8e8f2b07e6f5c86952854cadb4c8b8d04f945f2e6dbfb1fb4aeff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/de/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/de/firefox-52.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9aa9a36751e14d30e7ac34680e216785d657952254e67b1cf3de33288907019790bd4f865a142551118dbbe12ddbfd28129fc74bc83d3fd96f1c250874f680da";
+      sha512 = "af188724c00163656584d8e28bab102ac3660353a6f78c703b9fa336f1996e7b3598144d0862e31de595b0b40d5345527dbd2c515009f93af9c4452f7faafd25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/dsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/dsb/firefox-52.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "ac543d1f58c287979bc392618051c1d525d72cfd8d51a2eafb611954be12889f40b842ef30b37001686529f8d436d259a56ec37d50e14c096781a0c44de3ed2e";
+      sha512 = "a15754dab9300b45db4369e84f5adad3231763d0de944c589ebb90789b80116233ad159f90ce6ab5275e6e53266e09b1095905fcbca3b857318608174a776a13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/el/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/el/firefox-52.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "190d0f6eb4b9b34e8535b90444e90983fedc89aec81ae0fa3c22860bee552a1b165e3e3e0531698cbbcb0d24c175479b96a772891d099d39ea3654029dc5e36b";
+      sha512 = "fbefdf3d5f155e726132eac8eb61e2f94352a5377502b9f56e128c386e7950b4a9718c1c50782ef2e98cb2e4c5bb4eeacc11f200ca36c97baa0ad0adbe14b9ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-GB/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-GB/firefox-52.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "6dbbd4b3a0033fa0fa0eeeca1e141154f90cb1217371a4c5be89f468e8a3529dfac0d9cd624b9cd4d1f93ba52028de8cef3678605f68597e587f644215212bf3";
+      sha512 = "6d492447da62f9d0f759c67b50b88bad0346a9d932f3eea2959b105395488dceb2a773f51c3e75ca97fca4426c3110ce1209fbbed4900f9d7bab1d78e5ec6883";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-US/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-US/firefox-52.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "55e553adbb74b246a3638f8fb2db5ed4dfe9342d3f2b8fa8924290a45697b68b8cf56ff8b1722326511d6da700f181d686b9e9234a0becded70298b85d41e305";
+      sha512 = "186ddb8b223a968c4a4364dd0ea6a1492149e2290056f3fda58a1436f37312374c1e07775244debecd1044eb51586f43b893b82add94971eacbc86414757c0fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/en-ZA/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/en-ZA/firefox-52.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "fef8c97af1e77e077206527f6ec0e06c1176039caad06e9880958c3fc34f4cb121d0a234f1bb1c1beca12877e403b1995ff46ffafcd7ab7849966e961b13c913";
+      sha512 = "1aa8e9c6de59af862b0578b6ff44d3a0e98827c6ddb8ad31d4e6de3f26768b7e302252bb76a7c9c8e0494b49d820806b00d9d89c1618eb44d307bcece7345f01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eo/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eo/firefox-52.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "44d5497fd194c5743f2da30ebb19cfd5705c94469bba39803cc94e76b87a7a41c1e5f500b44fb28a7a36b1d4f3cd23c582fdf1c6769c226b4aff3808f31aa23e";
+      sha512 = "5f1b247a37d72c0587ade24f4f4a9fb79f25bd8395e5777524a877d0854cfbb921b62e07a4662d8992d02fc1de6c318d2e28cd3cbeef5ec26ee9f2ef25e87939";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-AR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-AR/firefox-52.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "56a43da6b90755174727734c7d5e2c73cb27c3d81d563b0e50a30e5c7314a6e7af0bec1f51087079caac92fb826c36001c2ca31d526ab4f1051be77a3140551e";
+      sha512 = "e6f1f54b43da0740b14bed00b45db2ae2d23735cbf9baff26b5d828f2e20161b8527d10ac2c2a63351122b7d3f8a2ac4b0d546f136ad063b75eab7255b16ab29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-CL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-CL/firefox-52.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "85a8bc7d4496703350e7c8652d8517ea719b4ff7600b2070f41d815eeaf184dc0110d1a75a8e7d85905d44eab7db1e5f98f6ae2f19efc51123fca79e8ac78b44";
+      sha512 = "9cb2f8c9aac77caeff715e687d239d9a57567e079c61efeec5647eaa65bde141251285509ea066a4f8a053986119cdf731a6d7ba182660ade5e2948cdee0352d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-ES/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-ES/firefox-52.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7ccf29e7fb6c4259e146601b6d3bce643b2b5424a5940804d6e8c1baa58c0c4b3ee3c1eeb58caef42e4c799c7b3ede6fcff8db117f3de042fb7a52638b658826";
+      sha512 = "21254e11b51050a422ba68ac9df14be6f7f672518a7473e874145f7ff07f9071ae315c0d7395940c38caa8735bf53242f63658f3c2a9cfe12320525e24ded2d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/es-MX/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/es-MX/firefox-52.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "dcf32d58b6fd5bb7b631305e7be42182a13b0abf0be1f5fc22c969449b152c536ca65892d20d85f5799bf14627449e0b61de3a67cc9f33e23f8494070f7ffa27";
+      sha512 = "98629639d6f6cf4c59ef294dc6b1bc3677babaf9130506e940e288beb4253406862484f1a0953accd25ee10492a5bb3578bbf692b61e7ee36a0b238e7ce6f317";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/et/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/et/firefox-52.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "d67c35211d0220d4f9961ae6fd2664b4e4d5e8341f97f1505c6acdd9bbc57ded445dd167d31efe938b00e2f64240e48bae06d7ae295032e5eef382412fc8ea60";
+      sha512 = "affc635c93901437f078bc4bb07c7f22939429ad20e0ef5171ee53762fe31124115892d77519d6ff59f86d19170ba239cd895273ac84f26aec4283323d7f7682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/eu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/eu/firefox-52.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "2ae3709537afaaf0bfce3d40ecbd38946258de2a246013c64ed6ba6fbd2ef2898c3c0ba2cb6ec512060353a0e1864b75c3358a709ee940713f45fcdff94e952a";
+      sha512 = "2891294c7e382ac55a9c210d7e824479baa281eec8fdbd6cad6d1dea0baf08caa9051f49530c1aca11b71ce5d50fa475a1e192490c232170ffdb9aafa47d1458";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fa/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fa/firefox-52.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ab880a914c5bb3ccfc99814c6c3ff53bb4b5fe151bd4db081cd7f84cbbfe5b85f14550fa83abedef140583d0084562dbf9fd46643716022e7155d19333f979b4";
+      sha512 = "b7df64d26a1155616ef70a8cb99192ab5d9624a4b0649f5829dccdd2fe833cf4aac3aaff86939adb228487b9a75e7fbddd6bbecb3345a3a42113863cf466cb0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ff/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ff/firefox-52.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "b3859fd606829d519fbd66c15cde7f22b21129e503e785666e2e76ed8ba9ddb4f2fdac99d0fd45a295f2384e6cb0a92b9b49641a9ec00842590d236a4b49bf43";
+      sha512 = "1341979a105df3a1cd5beca0e99ed6cf177e5245ee550decb2df3b06c867cf629522fda9826a69826a1e5676d728d16315e3822a71f523691d68a5114e68fb6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fi/firefox-52.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "b0bd095d475c786d2e5af898cbbde4e06cca3995363af180b7d56a03830aa30ddabaaae64ba685724778b613262074f5eb3ab17784b547f502ac9170919956cf";
+      sha512 = "01347d4f9d4cf31b3d2c2bca5206ef80123ef4f3b96cab6d9aaee503c497df2ae0a8099e28e9de410a3baee4d7b950f2c840056b690b528dbae5759fdad7e3cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fr/firefox-52.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "70cfef5874adcbfbedd07a7e6a838d3a7cc0bba3a14d009abb84ec6307b89c5568e5dee13ab435a69a5d8d16083f051da6d7fd01583001dfb4aa514d6820c082";
+      sha512 = "6d5eb134e9b75cdc0f0e4f4119c74f7aa73bd5c4512ebd0371c4ec330ca0c5414b9e6d398ae67284d73011e42ce6ab6e8ef4014cb7d6133d284abae159eae2cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/fy-NL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/fy-NL/firefox-52.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "e21d8d72c62f504cb46d13a4d386834f4c3fba4e13a7b7851f0a991d52ef68cd8a51283e3c2ab9d1edf18c6955126b0ac397de9f5fc2fbef2e31ffb1ae953964";
+      sha512 = "71e9ad99c3bfe723285ce4437a9b1a5506279186b8f144520e3479ff463d792ce3a53b7681a03de055d69849382616986f383ddc5e59eecd5502fd6a6f745819";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ga-IE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ga-IE/firefox-52.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "b341e6dd7e0506c9ebde9b21bf3a265b476bfbeb6b74f32eb6f062769ee8e70f58e64157165dd8d099fa444a6beff97092e4eb960a98f56938fa387a602cd794";
+      sha512 = "9fae8bdc0b63bc38672f9f7cd3fe6d995d2f2131d4d4ca5f18dca0be21294e8e2328dcca6e630467929764a300f6fd9b82c080afe02a072d4e81f1874894e1b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gd/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gd/firefox-52.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "fa799e7d9fea0e4ce8f9de26e0adbf113dc95a42174dc70386a1407dede25108d8d27dc41be2929947fec362bd6bb10cda3da0e506cb4c15b77c94cba896885d";
+      sha512 = "750dfe9668cc811e9b72e792223640bda908e5273f03b46e2af68614a070fee1fad999119d750e74eb42c6118dd5b4212c0cd75b3d8f9dc842c6af907938390e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gl/firefox-52.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f9ffa106084fb083173e07131cfdbde5a45513e14adb5e87d60710ddd43e7be909b212e11eb2c0f3062d973c509d14d89784deb6f68f9fbe83a5bb54efd0f706";
+      sha512 = "dda00c0b6f88dc20516f65781ff9d96e45934c1f92138a1444aa83264a2aea85ea075376af91f71c5311c684a5f9aa9cccb63d67b4a3f2a96045540a161d36df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gn/firefox-52.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "0e2656122941ab02a9fbd4c4614058851b1dbc9f3bc65935fdf357ae29a23bbacbaefcf24d610ae991058debaadd2d17ed308a2fb9c44d3b9430bf31702fed7d";
+      sha512 = "4638c96bb72a53c2c8add3c7f767d58a9dc62ac812665aaa1c46ce840d3f4367a9cd7024794b38ab7e8c2e21ecd2bc94ceb38606dbd1f53b8b2dc1751fd1bb5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/gu-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/gu-IN/firefox-52.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "1c440a46044ab52b547bb949ff10da02dcf156f6195b2ccde058ce9f43ea866cef96365132302609547969afb9c5ca267eb51c917f6794e23d98dd3f98df5cd6";
+      sha512 = "41af30d770df6c5dde5e55e61ac4f5ac8a6b28bac27c554ab023171ad5eaa973c3b80f64e3ca9fb5db9c7d7943c9c9438ab7b37880f673a1a418e70ddde74624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/he/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/he/firefox-52.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "22a01a470d56d22707987b84a0bf0a89b5f21c8b77c4255c0a5caa85b9549ac6a9af7f210ea7537d51f48c3ed84096de4df2474d8b2cd59e89b26f3f561d0d4c";
+      sha512 = "023359000792e3ad54764abbb46c3708f248730e5f1c8c067b1bdb81d1fbde83ef44233ab3177fad322b50329c5663aa7a0c89e820a2c8efdafe5b92f134a0e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hi-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hi-IN/firefox-52.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "89d11d581bfee9ef435226c367097270482da889df318e837230aeb28aa4d112bb357ecbe4a1a2c71d43286d10a0a9a1255ed0123f46793f3a121558d70a086c";
+      sha512 = "c2f26a610fec1c18333a01a5e7d44af1303366e9bb071ee945588b5886ce17670ea34c5bda3be647b4067dbb9a6e3f7c9c0751f7a39cc8463bf6c690e2460198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hr/firefox-52.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "b0b5a0263803b01ed338bd37350ca85184b7fdffc7296e5cbde6d4dc5e3ea1a25035602e8d00090643804f82d9006b6b300d7aebdfd7b58af1a588aa22419b0b";
+      sha512 = "68c04f03fe526b16552a734bc2ddad6dbbe276572586a3ffbe0ad90b8bda7f943fc107eccc9679f0778ca1fc61c475a3b519581c105ff526ff4d4896a6c41eaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hsb/firefox-52.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "0fedac52dab1961c98a90ccd981c9362aa7f5697c0a2654c0529f33cd8c2e7d7efb0a36589478431cd34b876388bbabb8eb1aafd455afa76d85945ee975a2c61";
+      sha512 = "b07a88ad8c041444a46ae81608de6048e05366fa0756270b4266c2a613246eaba0d7993e589556a92425558a106aa5e7a18d69423d680cd44cfaea6c64a64fc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hu/firefox-52.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "729c194c24228e008e7464d75b7572fc6287841e24c3cb83c94e0799f70428b405c9effb16cbe0e354c001756eff2c780987a909a2984e3a33a78d09b096164d";
+      sha512 = "14ac0e6a21bed1fd94f67bd04e4b93133c7a1e37b66b84effd2212df0561b88762dc1f4a218487077c060f72fa13cac14d5f8d0d70e016bcef624b6a2c2cef0b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/hy-AM/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/hy-AM/firefox-52.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "9fb96724588559e800cc39adba0619b6d1efeb0fb13f6e0b93e8a59cb1042bc73297bf97c46d838add2cadcd0ad3dcf97fe329c6447f11165770d573a24e7585";
+      sha512 = "8d7808b549c8faee13a06671bd81c46fd896ea479a15723af0e8c70874c70993df3bab9a6013efddc2932cce910a0b52ed5a3ba853bf44fb0b18da6d4251755f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/id/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/id/firefox-52.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "8958cfb1abbf21148c82dece6cf656b543df31bc9125e87f4de01b4c749cc5ef4e4190587b2a14c91ecb27c97f198f1de151c5c32683f61c0855120ad738ec9d";
+      sha512 = "ac3929a73f46bdc6ebc1d185fc53368590beadd0614e8447f390c52ee213459e49eb05a822128572fa2d4c4b128b93e7c1a4b94dfa4c2a4c071ea679d495db72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/is/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/is/firefox-52.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "14b989d96abd7a21aa5fdc222e803e73744c232d861b392da266e10b2f2be3e72eaa84f57665491c0c7b590ce3724805024c54262f1523c8debe48cb8b318027";
+      sha512 = "e9b49b02dfa2ca87a273803c6a84c981d731e0320fce30a4580fa31d93c9ff06ea4d55f49efe771b008a5af3539a3c8e0fb9ccbd855bef951846dc687219ea4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/it/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/it/firefox-52.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "1d9b164ae2b4c2265bc2101b409de63fd10f1181a660a61348ea1fd01171fca2f38e716f1a35c5f680fd246532debd18274919bc3dc2f421be0bcb0b7706d8f7";
+      sha512 = "4fe510002bdd30d0d713ea112819365f55fc41de024877dfc02b217fe7ce825e5283838f81acdd0456418b5cfa70c42f071ca36668908b257ada23659042cb12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ja/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ja/firefox-52.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "7cf13ec3bf7bb2e19096732ca8d2f1436296e4955302a8329d80d1ba295c2c622785b370dcc7253070fdbc133a4223e438d37d3b2c2b4fd823c84261907029de";
+      sha512 = "a56937787b4f6fe0fe079ee13a362a6cbbcf8160e0ce08d57d58bca7f14ca4fa34ea62c7ec1081aeefeb271c6f010a31a00ff31bb8d3d913b41382fceb9a3e3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ka/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ka/firefox-52.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "88a54a3c07aa02e1da990b93975879b29dd87b3c4743357a4a029bd58e793539a039695306de9abf4a01161d61f22049f5a7df2eddb8124b3034be68434412fb";
+      sha512 = "3138f39d4a346f1c38ac28c498bd27c34b541c1b389eb0bfcc1957e1da098fe9b2209d46e362eba66eb833a07e77e056e44c179651b7daa88e706c20f26ab0c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kab/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kab/firefox-52.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "31c9197ae7411208cf9fb543da9ea8e21a770ce160a1f109aeba0ee98beea8a760f74d3ba526d8c75b47510bb0475d523592379e511f3a881279b4af49ea2ba8";
+      sha512 = "8539be22d54dee4a51207bf686260a85c66eabc19efb17d397604d19711776c310f1ceb2bb7e67be797216ba52b8eb6fbafbc63561db8dbff1d62b02baafd6ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kk/firefox-52.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "62cf335828c4ee0f834187c99e2faf03ffe15693d5a7a6d0f9e2756f60f0f014aeb3fa507bbc8dd28a856c98254979c98d5756413c7a7d597b02a2f98bcb5ab9";
+      sha512 = "4df849e9011631763f6a16ebe2e1bee6a0dfc25acebdee417b0b023e1c6279f91ec73ed2703c206b66a55e220425037ed11bf0a4d022d5a94ba8506537c26fd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/km/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/km/firefox-52.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "efc614494cb18f21756bb25211c4bdce58af1f43ae927b63c655cd76605a1ee6ea95dedd6398fcf8ef81da2811d8a0e0c46a108a55882e7deea9b27ff089e1c3";
+      sha512 = "b9d063f695030b801502265ff5f93bd56a0812c45c032cfaba2354ff103e8e5c5ecc3ea43a23922c27b36e68887a9180746fe173de428c48c9a9069ab07e3c7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/kn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/kn/firefox-52.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "0bfcb783ae230f187133f2fa5eb1fc8d77712e34eb41f73bd64bac7501d28f11bbbf79e7fc0b9a8f00d499b27f7d77917050de7b4c90f0c71387cce149c6e745";
+      sha512 = "bad628d1438caaf285d14cd68ccd1f7d7021d1a7cbd28f6b86f3368e8eb7dd4c5eb60d5b75b645fa41b88ece5925e09b87eb69f2b187a1ce63e813537e0baaca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ko/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ko/firefox-52.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "de4d4f1982351f7013524ee8df8d394888755296724c7c578dc59c5adacf42845aafb31156f69828de49163d72a89f31003140d81b59934bc87ad35e856b9369";
+      sha512 = "d1069067daaee4a20eb41efaaeb211554e110b9ff35d3a71e48248eaa1da6c12242fe66f41a1e38bc53dceb731e1f46e0b77b25a128c4546b2103e817a895ceb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lij/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lij/firefox-52.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "c38525ef79e48ad5e9bc004f2e297598bd86c3aaa578dc525b66b26b5c6b2419daf99b6d45f64739a0d62a03dd281bba2d53b68d4eebdc9ea033b37adc840246";
+      sha512 = "eacc7cb06e9d2bf006c5de5ff52063d76198f0444e66e0352a5cf337f722ec7648baf8555ac5da115254f35471ba176d2f7f5ba3a166005534327481a3c566d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lt/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lt/firefox-52.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ce6a5628317e81dc1b61a2ff3b5a0347624921bda728ac8b4de19d43270bdf294b1e9f1c8f9460594d53a94707a041ec2a4cdfd7363e1a4c273edc9dd68095e1";
+      sha512 = "04e2984a9060fbb5315aea2f6cc822fb56c6bb73f44e95b410aea0e2748e15f31ff3e6ad869215d13df881300cf1caf55c6fdaf47fbc14472d103772d3ed06c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/lv/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/lv/firefox-52.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "43fb630b7202264d98cbefd1b9e7c30c804e6023251e161f5f0d3250d5975b385a3beee08142f32b2c140ab0ed223dbf1909294b3e82def4b0ff7794f5695daa";
+      sha512 = "2dfba1438c807e6f19bf659e17a6847f3d84cb6e1afde89026a5b54083ec5a040366a81a9a3d2653f121ab3ddaa8f2d9bf7c5d49d61370f29bad2f0c705137aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mai/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mai/firefox-52.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "3db01d1c2b2bc22ab8ad67fcee00c93106b48b2c8859c726d4efb0d66f86088ac2e31ccd4bac5ec76754a9948c77739e7e0473447b227d3ef11743f655705cff";
+      sha512 = "44ef596b16c11621b9064cef9c441be0d2a859429d59b7f6bdd760eeaaa7c487071da0610f1f2723ab1784a41931dcea31681ed91f9f5075b6dee3657e69feb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mk/firefox-52.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "75d8ca10d3ab0e28947e17a5f64ba5fcad21a9ac68784dc2d0cd80d02ff8faafe6aabcb7b26a7c1f05f665ab18fa276e2f28af0fa8487399e6c466ecbb0128a4";
+      sha512 = "52246cd03b0b9157a641ac25bd159a605ee2ae799c795f61fd5987b5057f0c364df07339e67cbe475fc0c053d1bb5f2244accdefb1e705b5201702272d210712";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ml/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ml/firefox-52.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "7fcf6674469b994b12c8e31fda52be57d8ea9947aeb32dd35f00ac4e0c66d651542b4efaa646c66099bd64c42aeb0358f3a52e4d164b7e91a10bd487eaf23e6e";
+      sha512 = "a5548a153520fe7b930aa2f5645c3b6c73a957d564aa811b548fcc4a4814357fa2f1ca701948aadc2109f0c6ecf5117cda0f0752fbf981f3f65a46ee71543234";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/mr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/mr/firefox-52.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "8784880ce70eb5d0ea160f9f26b4446ffb5ad6796299d36912440076f0cce5f59d3a59aaf7e79eb7b2dad5b5c5001498276891b72d77bc8e9a7df6aaab6bf412";
+      sha512 = "863e5c767b9c071f4cd24562b6259fd758b834f091d3e22be26ed7e81d242861fb6a0d401fcd1156b1a3d750243e37bdc4f0ff716024d3eff1dd783bf2153e06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ms/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ms/firefox-52.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "faaa9c67122e362d011db6b5c403375994f397b3a0270d70468154a8f6f1328dec85f6cb9f3fdb239f3b778a605bb83e64f9b5e1ee99d104fc3abd63fa7a1d17";
+      sha512 = "a60877264b3ff2d2b0343f6030f2da7b07f6c21a4d805cf1d125297f49c7bc2b93980293e428c6cbc955b39407def434e503654084e8f1054290786734d89cd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nb-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nb-NO/firefox-52.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "755275081354ab0dbd6ba801b918a59df40af7ea94760042c32dfd08c5625fe94104d0eab83a80baaf93b631d65cf9619fa93c49165521cf05e2fde738bf6edf";
+      sha512 = "2fbff650d3881898e6feb998bb00a77d320ac11d4974bc9ef3f77b6df0bdd07ba2486bf358691163e5cd11d11444c63aca728316bbb3e4ba15b1067d3a9b7962";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nl/firefox-52.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "05c4dabc37487d7ebc379ccab1c062b43124934c885b277d13b7f6adb8563bab04cc55e0c1824d4a66154db6ca6f10ace14deb962645098cc76ba7291db80e35";
+      sha512 = "9ebf1a1fbd185f1992793b8c13cacd4ef26b7b51c239d69395c02903ba412382bdf21638fb60723f1b3a407ff2591fcf95836a75d4f4d1a660968b9aac513708";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/nn-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/nn-NO/firefox-52.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "fde805c087400922a86557511bfdc8fde97843a7a8e0d138dc83c291219bd29dea404b356d0ff87c1ed907e6e749f73962772b1a3d821505451daf6356327d81";
+      sha512 = "9e9fa5784fb5d5f1239f511cdbbcebb7b2dce412f7a038d9dc4a3c5890764621d8949d788de1fd83a2f7bc83e909f0f60591ae1cdcf26d6c09600877cc540a5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/or/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/or/firefox-52.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "47e2bd4cc1c955429f5c28e9ae92833ff7e9211bb1251e01f55a6e0e1709c107d7012c4da3e367c2481e67ba3f2091c9145d93b2920362eea4c33be9904ceacc";
+      sha512 = "aba2e5b466aa4f84453937f7750933be5bd0d2005843d4d3c4589fe8a08c622432ad63f59c2fd9150c47591a949a7d1da565cafb6e835ade711f882a4d21114a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pa-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pa-IN/firefox-52.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "4fe0d44c5b3282b6788656a9d0da4681dae7e5737106fc18d10b339d95359035a8a746f3b5c4364b8beb321f82c9e17059d9eb51b79f5173b60aa0541f51359a";
+      sha512 = "698d2541b460bbda27aa1295d790e7c452d372ae32ddb311b6d80e3f90e298a836f86c4c26778ec5060913f716bf8d5bce2364d5d4df8ba74ca883a80770d461";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pl/firefox-52.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d7f1077f616b9d264ad62c04c1734fcf67729f6fdb0a7f3be4a36b33d9ba247550a42b93c8da0c7f2dc1f552278c104a3efaa80bf4cefb1aacf806025b1c1c12";
+      sha512 = "bf1025eed0a522a8fb9c05c08750d4c471c56181ade3bb3424e8031ca1510d3890484b4e911da8df5ed78956059f4d7bbffc1c82ea40864f96ec4bdc79f550e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-BR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-BR/firefox-52.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "5cadc49cbd2dbf2af20d99620c7015b2cafa687c1739badcbca0c2daa3435b454fa0fcb001e6ab45d685a950be91963d6649218eeabd6895f530a7f5d007bfd3";
+      sha512 = "07dd9bfe0e4f5d1ed239d512b2af4b4153f86c5f94f6464898263e6688daec1b4da5a9e8758f819034f17857a57417afd7a5fc67439fbad1153d5d2d9cafe28b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/pt-PT/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/pt-PT/firefox-52.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "f661dbf60b6b844e7fc085492905b2a568a36170150f1712e10ebcc32f9ab57a805b6b9292c2e4451ee72559120867b0b5c589e97ec4efa1ec64c60a2e283317";
+      sha512 = "7a21921dc0a45a2967e7ece3177f014b8d84e0e08634882785f30f28860a3d56b1b5b224da101bf1bdbd322a6ce354db566a1c51e99d7266a7f532509bc21688";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/rm/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/rm/firefox-52.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "bea3e8846a1030df7513e8d383cbb82f693951803bbc5954658996052f301747fe2a67cff3ffea2f5b7abdceb028c67c3e66a6189615bc2f90f9c03e53e0cf2e";
+      sha512 = "2fdc2e2ec175a6df36a26b5eb7be11455d51ef4d0d66b52f6036f4c743cbe95894aa6c9b904a3911801a798e4f7e53002879ba2f2aca3da14f23cc481276f7b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ro/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ro/firefox-52.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "9534563f065de5083af1eaff3ff4bd82079c848092f63fad4b0009e475bb4cc23a8a0c17085c00798b16ff2fb9e3b79f6c3b8e981d9ea083e6f3b8c5edcf3ab1";
+      sha512 = "ac4731507c44d65eaf156a4a783e1dd3603e0c86b735c3a488f8b4a7ea4f506db42ceb068a917e1a8f4452213f68ad9779a894180ab7f7856b5e55791660bb14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ru/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ru/firefox-52.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "0cd86a2595715c73a367cac8528abfc07b930274be56f2fe0672161aa27b9e409d9a241ff822d566fed8f4ea7d4795b358e10d929ec77c4992386ad31d49aca9";
+      sha512 = "8b67edacf0fc53168074da44c7a8b2452b0e22cef093b6573333e04df9fc2402d2a55b14ec3139e4cce6eb90d611ac1bb22e4f9f548aa65523941b9786ea23bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/si/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/si/firefox-52.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "44c760a5c134fe22d0df3e846913f126b2a93129c542e6e4a0d1ad2704d5f275148776568864af08fd4d1f5b50d03d67bb9ca4d07203061522c1974469a27a4b";
+      sha512 = "15b24357e2cbcc2d3903da8cac5179cf56e1b4bd68b693a154960614cca39ac0c55129905448c94f5adea063455c3edbc9b32f5f530c8979fbf48347c7fb359f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sk/firefox-52.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "1af8e84bb1e518e5d21a78a14f4adcbbadc0c3d08afc45923975a320e76492db97f3e0cdc90ea999ff6eb02ef7d717b817bf1ec6ce13d4bbd8e92cad3ce8c6e7";
+      sha512 = "5d5b398b8f0157cb84ac8dd8a0bb091504ad34d1ba4b6daa02b9082fd900878d8dbdd5a8069df7d8e8938d4062145132bce9edbc81238362f761a92d6bbcbe5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sl/firefox-52.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "9d7ca89124f2e1831a762ed210ce89a1ca4cd683382c38083744d1902d357fd7d34e3e573bd54d929a5f03633686f365bdca3ba750c950e97e14209eee65c4fd";
+      sha512 = "0add0946e185b8f926115f0699227b661784a94afc56b2c9c9e03f27b790da8d73748016e86ea9260b16278699cdd72b4603a5bca72e0d9955ccff2807ff82f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/son/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/son/firefox-52.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "aa1d0fc504c528e1f2984bf226285e452ded5ab1d650065cea7c3510b0b22c6c87d7cdc4ff4af902a10e471dfad9cb5d513951ef377c28bac250ebef2b67250d";
+      sha512 = "97140c16c3b77352c2e3f56b4afd61c575d6e302dd98c333375a01e75a487297bbf429ff42a88e291f1dd2883d4119611a7e524e535b73ccf6de3215de29dead";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sq/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sq/firefox-52.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "b2d59c0e085d7e5be9a81dce19e025d36898dd804a549c3304a5bd4853bc2884f3ad6b88ace53f320eb0f1648bb1be9034b8cd153bdca3a8b1a391d0a3c743fa";
+      sha512 = "9c97f6df5b0393ce34f33ee3ec06d21a70e6221c2aee65ff7c115ca5a7f7e82e3e3ccaef5e41c33d72281109ee03664f63240f20c15f6de254a712ad8a0187c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sr/firefox-52.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "1de0f66b93b22185a58ecae73c1be5497c4d5e2c2f62d9d91775717023e1793cc08fd2ee12e03a39aa008fce8c5a344de92777b00d53dbcf4c80948a627ab329";
+      sha512 = "dbe2f803ef838ea0da7188a566619cc547e272d458a138b5d3b7d1109e708d3d1c72901276f745bec2ad65ec68112ad88523400f805dad48841b9f2e6266aac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/sv-SE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/sv-SE/firefox-52.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2f763fc403c14032a2588a2aff730a04c8b3aa4f8b3fa3f812f316db99753a6e9238eba544102800192c879f6c6e5e30e94a1dd11f3cdc77ca79d95e59716d9b";
+      sha512 = "555206c262c0ffd953937ffd58ed840585345739ff2868fee0e81df93d2b7bcd8b22ae567a13ea5f67cf06f7065fdc09dcd321a326e974f58f86225dbae93627";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/ta/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/ta/firefox-52.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "e5096461c09ad9cb8e059772f9ccc90592cd11300ea2055746450b7a32b1d2e6a6ef07fc6c5cd31f7afbecbb23dc231b7608e85b3c1a7530599cd9523c3058b0";
+      sha512 = "fd577c71ec42c92a88fd05fc723fba543eeee80114e90b5939d053080574ebfefb2c9d31bd6f0d2625bd4113ec4ed94aa9dcf637a17a7bc0eeb5289552f41d01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/te/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/te/firefox-52.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "e2ff646646643faab7b63cc1114354e03ce1dafdd7f9aae23b0c56a61e64a707e684fc13707d20e8a00f191cf540afc985521cacc70e66cbd50ce06e78ebe6d0";
+      sha512 = "9b9f893c25394102f026d0be65173802aeee0999031cdf4a7c3e4964df5075bec2a1a3ebf029014b4a50623f8265672992ad78214a551fcaf776adf659ed5fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/th/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/th/firefox-52.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "724470cf2f1cc4b64f8e2b3c2b49a6fbe67702f76d123f171e637980ab0fadd28731ec31680389dab4ef216e5cd82ff2e3ae1f8eea86e9c8c329406fa41af44e";
+      sha512 = "6511ec6a5c1229181849af9040fb2cdf12d13907731522312bc130880c78d698d3b8d0ec8bb31d080399de7f3beb29c2fe45b6d9d9d3a9c550996c1cf9496607";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/tr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/tr/firefox-52.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "eadd1ff93b30212388e4bfb911ed7302badc30f64016366ca2eac69098fd4ab79c8bf7d352d9b91f1fd9c512693585b9673b2aee0ed739dac8db2cf913e1597e";
+      sha512 = "26a076902a0eefed3f893ea72da54e233dc13d5bc0abcbb95cd75c68778526eb961d23315018456539811548ee66030d7b1ba02049574b6b2f6eed9bac16b8be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uk/firefox-52.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2a01e79f7ca1a497605597a2fa164927d5ad6798aa70e8e4f2f72711a6f928ab3a06fe8be288ed220ea7e4e59d24d3283ff9a437ef5359e39392f35e053b33f7";
+      sha512 = "d9f4cc9900a77e7de0cc0859af7ed1c83447b9a3cac52c4453a6294a6b85bb3b95b6c6385b65014a73fd92fdc4b014eb5c28ed0ca1aa60a75eaccd3272f67157";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/uz/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/uz/firefox-52.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "882daeb95ec0d8ebd5d6c29b06fe55bc66284cbe0b3d8e404798e0db0d33f27cf3df12a7c4f74f122e8a15bbbcdcad3c97f699c66d813821758019d3e1dd0f3f";
+      sha512 = "a7cf647e57651ceee739af19008877b409791f86d75592e240dadeb0559cbce6316cca3c396f044a5b4d8daa3e0a11e96cc61e3f6c9addf3a22ef59dcaaf370f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/vi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/vi/firefox-52.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "bef28fbebef2fe622230d72176387bbf4aa115f4aec8b78b4276b1a7c23ad25bb2f92edefa44f989253e7235db6d69f595fa2467a00bd1813b7bc29077347b8c";
+      sha512 = "84e91aa0f8e92b0bb24ff53742e19869c3757343e1c05cbf2fc90aa14bf3917d3ec357f4757dc2932ffb1dd823104c42d6020e0f156a1f7cc21e696462c5d05d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/xh/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/xh/firefox-52.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "dcfdf95811886bea9baa8eb1a46eb4f9419bbeaf1f54d713efc5a3d7d7beaec0d18c79a77221eb7fc246b99aa16193f91de92225fc9c3e8cb795bc9e49887d93";
+      sha512 = "cf97e6aac1723263608a29df8df9e67c9ddeea18f3043f10a4c8f22331f519e6a30d76f2e2b2d42e1f5e24a31812e57387198391b14d726c6c5dd2488e94a820";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-CN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-CN/firefox-52.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "2650644609f4b2ce2a4d82072fcb95e188334cc0190b9dd2bc13e40a035f60029fffc65fea1a6d644eaa049d31503a68095aa1f8b1df8ac9435708f86741a13b";
+      sha512 = "74e10d0cf2e47f4133b25a9351a3a13cd634a4a17986dc896c32accd25fb4f09dab7c141faba5574015da83bb193087b64434a51fdd820b1ca6af82a2672beeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-x86_64/zh-TW/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-x86_64/zh-TW/firefox-52.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "3c2439185cb7935203dfb774e23dc0cb759f1357b599a026edd93d24c0617bbcb19eded53cb5c55ccadba3f4bc4fe85351c141337d94ee28c102b024e893ae2f";
+      sha512 = "2f024be661d830f179c5e19bb36415becefcdb2a98a750a09cd80f9a3a9e09f9c3ab113e51ac16ce185f42e3e4d00bfa906f7597f58b0282f3d5a98c690fc981";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ach/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ach/firefox-52.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "672908e232cb36c8d88229ff9c0cf427363a3e046cd3df21398b67897a179637972e01c08e89623bda23fa4ddbc7c76a2d7f1184a7299665269324f5fe0429fd";
+      sha512 = "520a791d0c86a60a7f789451f690fde6cab934e536b5acce4b47e56e95c8d775c9bb5bdeec32e4a694ddfc7bb0301758fbda5b575ca1baec6d134df39b6861ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/af/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/af/firefox-52.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a6f22c97a43b7ac6d001599f280d01e8cebc1910e6af958d0c9d2058ac2af5b42dab1dc3ac00aac1d2f61d068bff351beaf9514a6baf335a10f3efa0205b4ed7";
+      sha512 = "4fa7361db2a87f5c133e262e7006844f9d734765c589f97843fdd3b95127c37e040f9634e11f295ab67a1ceb08fefafc8592658e3730be7d1be7680decdecf61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/an/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/an/firefox-52.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "26b0b7629a11b8ffa20b10eb635c375088d1725a5c829b4f7dfb25d5df3c1a465ec7fc8ce56e36a81794c99ecb758b8462ead8ac4d6f79242c5f6931630e29da";
+      sha512 = "8cd72218d6b9eff75cc009224ca28da2b668c786b111f2761190eb85e5467f980b3ff577cb1de30806b049d92a820aebb854572489140c22e4509f165fb53943";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ar/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ar/firefox-52.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "cccc951ad72024eb5790d2a7d668d4103d76ccd6e760504ca7e2e0755d3e41e426f87c6720d53a7668e17cd7b74cfb0ec22d3ff5f23d6cd547e43f97c7f9c609";
+      sha512 = "a7fcfe0d20d28d15d40f15c6af83e1bef20db2ca8f74e669fb1912b3d7b411b83b8f2081e653048fcce0914800f71f3b07c8119c01f9ea9cc039f94c47681279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/as/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/as/firefox-52.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "1dc216d63a3ba302f532a35d523ff4a3c234c17ae5ad755586ead5fd18b7e530c48c4fd5f8d3a30b679d89a45ed927a5e5a1d6f911f2fe0528989bcaa9128ece";
+      sha512 = "ad2cd9bbfb85458108a2b32aa07a090d05554cf8d60e113035cd92ac877e0a0a7fa2f7ed6a3061bb17977464d635843c4e1902071496b1ba898c74458c2878b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ast/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ast/firefox-52.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "384211024df02a1a463a078a255093b8a43b728e7062025cefdc1409c7be63ea97ed74b2f843251b0df6622629d11d667a795e478f1eafdcb6ac5ad2a48cfdfd";
+      sha512 = "2fa3f46e646ab0a4774f827de282b8a54f324dd801d30b256988bab79bf2356723f0e0a1d401c04e429e8e4cf91a0a4b4c0b5ac0c793cb3d2fcf82b6bb311832";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/az/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/az/firefox-52.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "75bdd785a96262d00e7c2ae01cf7314cc6767f99e65e1e73b580fb7e16c93216a8e6180a3cd7dbb479bd5c2d172bfcfc9664cf8977aa9ae6678c0dc9aaca826e";
+      sha512 = "0d63c772859254b591e62ab45c542247eca411a8230afd8b0dea6b358d6db6e0dfdde43e05337be554c922caa40f13ff6db38e0526572531f32c9f0baa400bd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bg/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bg/firefox-52.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "888872d2c630a2e3966a50a1789a8d68f199431ae62b81dec5ac06c0fee37524fbba3fcfd035b7869a3bfcc076cdcab6344e449de3df226cfd6c819898e67e4c";
+      sha512 = "2eb0521db20b5cd659c733a18cbb04cf4c15ffdd89482e12df2886d388a85634848108b2ec6508637afae9e36b5ad0ae7b9ee611ba531605db4cae60f1e61ed2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-BD/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-BD/firefox-52.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "10277429342c915c2043f4865a5b22741bc729fb8592b9527a42f000943756e9ad8116af30857966d6cb6ae6877ddb6ba2a53e719a4ee42b19963548bf66d9b6";
+      sha512 = "f0d2ff957dfb93a11c2a374a30dfb800e39ffa309f2b50419fea33488d4098fcc7e1429d434825c4854a5d27240625f2c1643496d15eaa58853fdcc91a93a601";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bn-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bn-IN/firefox-52.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "31819eea3f2b0d2c90a3bc6f4a60207eba4d1eae568b45cb5d8f48dd500702161d5469c2ab3369358140a413041c1cfd9ce62e892fe5bb0db525b5481fc6a44b";
+      sha512 = "2ed01637decdc6e11c686665aaaf1628793590352d804b3f524778c7fc5f1af6e866d28dd1a90acdec105fca392f6aad3e37a4a8d32264e790436df401d60005";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/br/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/br/firefox-52.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "3320933ae550ab188c8f7f6ad8d317b19439ffe85089e37e23edd24f5ac088b67af4c0968646030683dc02f64ee5c2068cce6f8250114024c8e24f2a9eff0b77";
+      sha512 = "19172c0112eb0ddd67da1f2bd8b759a901f9ce29ee6a85b889317e6f8aa9ea85a9ca6bdab6bfefaa8d65a9b7081300acc5b4eb3bf69b8ffea2eb7de4ba448636";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/bs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/bs/firefox-52.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "9ac88212fb64d404c43a2292c8a4ab164ea1fae08249cab6fd8dfeded5e51304ae5b2d870a074c49e8ae14c820742d50700072fb6e5584dcd5ce2a06d7c85899";
+      sha512 = "eb4bf2dc8c9d74775a227254f0895d9b10c5e3f72a6c37bf9709eaef555a208b6b455e35e8122e5f96ade59956b7481df5807f4787092b642a6affaf870b8d52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ca/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ca/firefox-52.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "ea1b4565917e7ffba47a7a030cfa69b8405163ef533c01668a5a65159f2f82b9737f43796fb583306d81216f664afe090e8483c37f348d6d107b5924020d6580";
+      sha512 = "7bea06ab95279b5daba518d8d30a506f0f79c3b54f36796318213ac1c2e19aa0763774a0746315f564501930e4930105affacd4997b19f6142c1063b45e5427c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cak/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cak/firefox-52.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "a409ae71e157ca692d9919c00ba63679f2e3fe726537fcd49cf38ddae613806be5b9c773a0205013d48815055b6333110d283c48a9651ffb912ba6dedf74accd";
+      sha512 = "c5366697fa4d91ea125bf16073191174158497e548453c310292851fc582b05a70768339397a4076b5347c8f9b4d2ef0ff62a03217295f4eb8717a4027c8562a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cs/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cs/firefox-52.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f236da19b0bea73127a52997a461d704ff7472c3fbac29a57ba54ed18a765eceee6a0a46eceaa70d84de610f7dcdb53fcebdc5b2fb013fb0385e2ffd1fc602cf";
+      sha512 = "80fa7b6e3bff168c3b82d3fc188ec7dd33bac07d4d2629df205ebacd7b795638d4fca0ea80aed5d2ff9128d1bbd66ee48512a6b19c8934a8949db7e85f444642";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/cy/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/cy/firefox-52.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "ace481c656d40e5bb88cacc82220b8384ed7bbb686974caab399f52b362f86c2390306eccc5709ff48d5086493e16dbc8e8f387454eef01e8baeffc05dacc5f8";
+      sha512 = "5d7e8741b2880f96c9778e84a07e905ce5c31df4db703ead9f5a8aa23b6ec2a478b760adc02a6747adbcb1f8098716ab0bce2a0cd00de1379961f41682e980a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/da/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/da/firefox-52.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "50e87a5326f1fba31ae8fe289a022b778136483d0454e81e440198d8e71c29405fbd2c53ea7975b30430d7734298d7e01cc5a9fdc3d3d3adfe6ccb33b4ebda17";
+      sha512 = "ca122f0ab79a17d7c07df8607fb9b0018197319f8a644aec4b56328193009e2fa7f9f0b4a9b4a78027f13702c25061443e3412f9be62bbf4eaf793676b1e7fd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/de/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/de/firefox-52.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6cab0138fc67670dde0f1b3481d1a6f8d0126d8f336340a52cb87f0cd30942fabdc2a670351f09a63e875a6203f0893c995eec8a556e4240aaf599d0767f4d3e";
+      sha512 = "a813a51c347d34fd9c34d9d65289644946008000d8d93fc3df7ff3f7de66f3cb7fca134af2c6e139dbcb58bf5deecfbdb4b10208bd2f7c424fc00a1d48ece9ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/dsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/dsb/firefox-52.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "f31b7a88244f60f419bf9a4e64dfd1ee93f406ac0d10ad2c4e63e0cb6260f03fcce45b904433fccad0e3c17b9d6fb999b4810e843be645a9ef283e16e6ae1992";
+      sha512 = "bf2a32dc433dcfcf44d205ce54fe8e2697f1485abacf11fb4cb2b7a1a24d149f85b07684f3127db3a44f83b652db1d56fb416d1f809eaef83383a70dbff5bbbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/el/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/el/firefox-52.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "5a61e800101e0f550d1916fa5bc90fc0bbc201379d5f283cb01901385bc7949a658aab272fbec48d5732907ec7355d8e84c73a46611d46daae31439a64c0bcf0";
+      sha512 = "7d7192af4849b104c7b0c410ef27b708ecaac96fabed438baad76d086dcd2bd46e364a163f59b545d941510fbffa82c39785d9957f6cd6d99f0b3786b3d14a35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-GB/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-GB/firefox-52.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "226f999af2ab4274e7e1e83360b432d25609668814ff54480c3df4d081c0f52c617e89d79dafa86f949e7ef8b5b5ac4f873299c90eb97028ca68593179631452";
+      sha512 = "d19127e4e8ef347b50cff1c1960d0e6ad9e248810d9b346a9fa04b9ebcb8fd6207d3b313aa5ac3fb69fce1f096d5594584e9458f061948ca5efd242d779fcd33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-US/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-US/firefox-52.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "00cb5b343e186110d0e55fd28d9f11184af27b697a2e63dad0ea6bbacb274ce946574e6395dcd812ca8d1fdc0bf12968af7abddaa0183ba995452423b2a886aa";
+      sha512 = "10a22069e479cf6bb63c4ddaf796b557bc3ab557e17b88fbf4acad26280df5ad46af32d1d39ab85f5d16b58b5d4be5a9b79f5a081cb23a1c4ef9bf6ff69a054b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/en-ZA/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/en-ZA/firefox-52.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0c66e49588b1b73fdbed23a1de4eecf9a5920c378deb7ebab415d5f7a159983b198ae4191da177170b8015d4975d83271385e3ecce26148d7c0859442ed877a8";
+      sha512 = "d716e7f3b435234477c68c9ec92c8f1912db6d9e10b8d77519f4731e2423143ee2974fe187f69532e93d0994257844e374e05ee5829e8ffb9d73915eee8dd67d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eo/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eo/firefox-52.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "8246ee3309d4dbf8126132a97407f8af71915a3578f6ebf37693262e3be3658454eb12266b00acf62ee7c987985804bf7c4171225b5ec5ebf2cc97927e626049";
+      sha512 = "088fae14d0ccac9b243e0457ee842b260051a802d3b47318b4b9d6d723af8b272a0c0c0541deca98459c928c5b271e22cc500c70992d3b2e64655ab15bb397b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-AR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-AR/firefox-52.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b962232b534b0603b7bdcd7af4ac05fe136ca7920f9c37f889a203f42a50ead56053f93a49d153edd04e0d4e865ce71a210673514b86d624c1c4820217f76b8e";
+      sha512 = "aff8ffd7a042f1ef80ba7fd725efdd022b5a8862714888af1e736a1d08ca1df5974ff39f3b465061c3f6c60bdc975432f04dde651165309f9095ef98b51a53b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-CL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-CL/firefox-52.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "034e713a9c5f844fcd2f5911d96dd672c61a3fff9870ab38daab8561d9660b295deb6238b3acc31b0755a043d4c72ea914151a4ffac7a8199ff679d8b1b31272";
+      sha512 = "d8042352f0e54257ce7c96233832cd63d0cb4a0e4d6988a1299a81c9cad01190545c254045f993bff5ae5b2330a6b81baeff582a204674ec236e43ba6492e629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-ES/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-ES/firefox-52.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "8ed0e9d6215aea8c6ffb4212e400063674805329a4cc5135a0d016e04370190349bf166b111c67b43369e43833f8715e53268327696375fc68811e023f55694c";
+      sha512 = "5e6d4473335146bfdc9655b4d610ae94e5cda83e2411c495c4196690c029d7ad37775e727afebcca0ef3325f27278508fb51c61cb978392bee7723eb2e501b8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/es-MX/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/es-MX/firefox-52.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a33c8a1ba9e576ac05d3991979028a504cdeddec376fbaf2f2bcca6e4d9fc1edab2f8b34c12f282764b96c49a837bf9d5038a292bb96013233c8e9c60ae65fa7";
+      sha512 = "c59952163414d8a1147ea182ad70af0c2223c2f8497248e7e9585c378b95247c88a89c5c08fa6a80fd39bf71f7bbc60126fc9c103f4d8f4eb6dfd400675666b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/et/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/et/firefox-52.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "4647857b00ddfaf765d1d1cada904d35a2ffae0e0c1d3e2aad073090441d19c5e48b2e837a58ad9d1c20ecff7e44a3bb39f4486c8fb6d84720360e8a5b14827b";
+      sha512 = "a2f17512791b57a94f23a5581978517a9bdf817d313fb8378e7e4e34347fe67ac525ea50d19a73436dd0d8de7ca6a227d16bbbf5458c669fffd5731b868c9854";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/eu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/eu/firefox-52.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "327aeee163aa44517914a71971f620116fc68def75e8fc929401c696902f5b6dc35f9c4ca6bc3b4f93f0d116d499e1cf0c49e9296b8e730b3a6d7f644976f109";
+      sha512 = "df4cc75f28a3a0f58b2baa78505e4a9624301e42c3f263f0f46c73a5c36915488de98e8eeaa36544de6881a21fde33c8cb78500dd335a6e904c5fb30df3b6a85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fa/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fa/firefox-52.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "01e489e74b45cf8acb05ec87c4d853ebde51ca228487b8fee9dfece11aac9ed58f0e6a6c2fc6c9935189421d534b2f36e4b51016636c1010a4e93b670aaf9e3c";
+      sha512 = "faf68fba10608a010bec43cc0bd994fab084de47ed7dd4908bf33fbf90369f115ab6964481558763a06ef603ce6ffc4d97db48006a3dfc92fefaf13b8c97e6d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ff/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ff/firefox-52.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b561312de7a9b67ceee00ed5730d8c5951f69d134b93077da06d5bb78f0d26e6a2e89f3acf1141c410f590b1d04c0d50beb78f27007e7bf99255d1dd27fc7347";
+      sha512 = "199159e04b958f9e485a5d643dce371fc19840bd7e9a4f95d7f1281d5eb860e30950583e569e806e0eae90c757917d6bf1bd32d8cadf07ce7b3c82b5771e0f55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fi/firefox-52.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "c9fa17537106470d29c2a632df636efe33cccc44ee7cc496321b09dd0c69329fff0063d1a2fb52c336235327923f3ce564ea6bbf513148dceb8d647903663e7e";
+      sha512 = "a5ae3dd65552ddc5c8bb843c9860ce070e793ecf67b35a77e005e54c5bfef1174beb0df114b7fb380ad3635465f84e4167f2b247c34a82b9a2208cdfe55986b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fr/firefox-52.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "ec5639f4c9c0f1f6bb30aa8e1269b1d772277b34bd5beb965e52a7ab6558da1e481876765cffa21f04f5a13e6cbfef53150051ac0089c3e35949afeb79e1ba10";
+      sha512 = "a6f0d89b4a6d52fddbac39db1947f8671544bea26b8ed0b2759030398fa5d1e7865fa1200b67da6a8400a470e402bac0dcb97afc49c20de6a101c224ec9d00ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/fy-NL/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/fy-NL/firefox-52.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9a2b1e4df459dca591f20d5d389196c4d61ad90b968ade5bdbc006f80ffc7aecf4b6d004bba11bc196be490fa93fb0be5f26dba698518130c9cde120ef11f1cf";
+      sha512 = "0facf3356011c6300283eff40bd8311f7e3f75f0eaf46a673f06a0aab807498758d943adc8015e4e649f66041d35107509de402a2514d108075d4398e0201300";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ga-IE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ga-IE/firefox-52.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "ed90e0ac43699ddd648a99c008ec775a2cbb34c5de34fb9ce369e1cde7beb8cd98c3d1f56e45910e121bb91f39112a9e7ffeb97f8847bb7ffac76bbfb9aeb762";
+      sha512 = "7023456136343eb9aaf5ead84df355c03f5cf7d02928ae3ec8e7ba6d7ada3e6aa020bd8b79f9dbf8f8b5d9c2ea15a37d136cbcff215f77452ad75f40a3ff8001";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gd/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gd/firefox-52.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e79d439d2977b10027d6518b7e8dac32e3da9b38cf72a8ebe2521c255bb41682515db2809fac94bcdcddb5e172e090e76ee990f9670fd8b59cab85f17e61222e";
+      sha512 = "342b1ee75b201661fb588a5f6d8530014378512465ed9beb69608fb9fb32fc7f9308cfe4592ff16f325952b3224c27c16a6c5f0e2236b9eabf048f6b096c8510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gl/firefox-52.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "ebee1f0b709590d60451be8b8ade78340905b098f08f86214a5816e58f173830902717b68a393c91c5274cbbf8da0fa8915800069e5bb2e48c0973e54c07af9c";
+      sha512 = "af25290d169e7b0a4a52e71bbfd2b635347410cd1405a3433dbd14e500d16a8ffc311c25787c2a736abab0361dd1f601de770d8080b023544573e66a14652971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gn/firefox-52.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "479bae9554c8a8061fb98528ed80a7093444daad909820e7c2ffa3a13384a8b3711ff599fb767345f7edac1ba5eca5aba3cced9a7c1a60577a90c0b7db334813";
+      sha512 = "124f5bce4eecd640618e62707b16f8def80fc045c20fceba65a2dad488d60bc8a5ce2e112cb766dc2b463e3d6bd72b4eda612d7c66e727f36c4f3b85cec2b5af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/gu-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/gu-IN/firefox-52.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "ea7f2fa1f5d90e613496affc5f58dea0621fdd36a4c7b04d3559b72b2606941cd315d7de575c649678c3c0e454961c1d8b4a360d1661f6e4fd4e8426cd8aea62";
+      sha512 = "17d6e909835cfec67f1e3dd4971e1bdd80c07488e5390a21525604ed923be9b7bb3eae18c3d011cc85d83d10d124041c14af2cb49b79b4e8df94f6f38012963b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/he/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/he/firefox-52.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "b757a756643c0093757b843b784bafab71d1d7e50e5bc2b2b47b29479dc27ac754ab5d8cfed842cff58de309ec276fe0c0c0ce72adf87dabbcb46f0514eecef8";
+      sha512 = "70de0d3266df3f9665706f693faebd8c3c29fe1fd7e8c1f391d1366cb094c1178f18baa3947593a3674c2d3c21e1713a5161118c4f241e6c88c47e9b1ec818ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hi-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hi-IN/firefox-52.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7fc338870ecedd35d24ed8f20bfcc82d9ca26465704554f3d808f2fed855866d24cf68038651c4975f73a8ec6f90a297160a367132bf1e9b22a69797b311ab02";
+      sha512 = "fd8a3250fc495115b83b1b4d360c24ad263fe52f6333dccc527807c6a30060b1afbeda1b95e2a86b0f9ae8b6f63165e4c6c8b58f443bbc89f4c9291870a4d2de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hr/firefox-52.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "c7be8964891258fce40e7d9062914d6ef418f80ac94c864448e292720f14b58ff1dcedac9cd7aff125a2819ef45c7ebdbb277a1ff87b6e8f1b5ac5e4d4e445b6";
+      sha512 = "561996e2fc7a3c2b9450b87e57cb6cdb6bcf7f454b6736c7d9ca764a85834dea40673f7142513c58624c95ee4f70c21122e54d678c1b9d5edb7273ac3d63cb6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hsb/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hsb/firefox-52.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "6468362c84079699b82aa0899c4605241e9c55d42acaba84d80120b52aa81be339d9ebb90140ae06b2f33475b972aacf74c6c37fbe7a66b59db314bcd01b9313";
+      sha512 = "0ef7119929a28c267e94c5fa7afe583b5da6571753a437a7213c84cbfc18c6459da36595dade5187d7e7b8cfb83efd9430ef43400b85318b661512bc8c12a1bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hu/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hu/firefox-52.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "0c5f56ab09225ced4072e6852be50a352ceb6befda8ba8f420431a6ca3a7d376e73ad11c38044eb7fc1a3a5a8a3dc8f49eba1fea0f17c96401be5a94276e937a";
+      sha512 = "2f27911819f6a625ddf77e02da900f219563e6b070aca76f2c08b9f432c1f15b83eaf09558df4cc1e8a0186938ac4a328f1ceaafa109411dcd270db66f189099";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/hy-AM/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/hy-AM/firefox-52.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "c3af17826b66b8faf265c2f2bf8bfd565f916163f3050e8c7d83ca5426749f7c93174be34cfa8b0d0dce6d4ee175ad6977f0fff890f072af1419fd0c8c61145a";
+      sha512 = "dde5aede668eda9fbc212f3b18a2326b24a50f399bc70e2c21f65a1f4df574c614d95be6ef55642829c78507d1ae360fc476e599521a39419e2eede1b6cad586";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/id/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/id/firefox-52.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "c12627f8fdc7fce12b5803f989e2a038d041482a86f23ca279e2fc1c54509bc98cc11995dce4a5858b85d9755fe8c44c2171bc1c4371a3e86dba1926caa36553";
+      sha512 = "63155285ab64209dfbd71bd5357d754889414b99ff45e9eb393b0ca8938c17152ade97251e3ef48d1d3f197cfa9f2ab1cb57000940216748c43a08174f7d9447";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/is/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/is/firefox-52.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "4adf2f31a05f19cc0d075bc47be810cf813535c0152e2e131b0e0017478733e0db2d81cf26867d9701122d3494bc4bc1693e34351ea60e2ca261efea3634a599";
+      sha512 = "d01c9eaa33cba50f6fef6da0313eff25e2d45c025d0ed3694abaeed833cd84590ecf6d9b7bd7ee5dcfcbdf678b4ec0f39c6a8eddec670124c9a4d79711cd6d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/it/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/it/firefox-52.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "5fcae4a024210439ab71d41435768283e3cd4ff06d8cbd24e6482559797118398974d42753afb5ddab086cf41f46183827cd3532262625a036c5f22b7de3c9af";
+      sha512 = "40a3934d0c9ee388f80d20ccd38a718ee782aa0a8c1e02d14d68eda8c84454c05dcb944396f5c1b092c3fe8820176314e46f232f734079f84bfd04e4b7767618";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ja/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ja/firefox-52.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "4a881b1c24cd0d679799373c5b13b5e0c4f03f2ffe4128669db300963a19918b99453446e504f5c25e87331fdc09a300bd6ce567894bf56453a84937d8a4c882";
+      sha512 = "506302d0fe4d1198d10f6a12a38e7266585830d2648e1a4a8d5bd58c21836fcc55682137c3b706f4a3c6feee37f88828df8de850a8fba40d3d572e84381c8a1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ka/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ka/firefox-52.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "c6c120d64184c6171140c23e547b982419f3df12ff5c49ed0a5f7643feabd0d8af0899e9a764b3359d05492bd28598235ca6dc90d0af7dd7cde126243ebf47e1";
+      sha512 = "4d2719f82d245067f7c90da659081e7a5a9f083fae6456911aaeb042863a3796d739b08ff912a6c6ce163121e9b124d96ffd3e557afd2cc238ced8c62fdd4ea5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kab/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kab/firefox-52.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "f97796c3ed9fb03637decfa6e3fbf53373d8091668ad7adeb778eed173dc3e8e7665ca1aacfa13b2e09410bb5a93e3e3ecf4333292713c55013ba33a93998362";
+      sha512 = "8c173f08c9d83877fe96c270a22ed96dd101d5e7be0eb0225f592457f5a201946a4582147851058ee8c6bcf03890277ae225e145b7b6a824b412cb8ac3643a2f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kk/firefox-52.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "df59e8f662db504fe5368c135a265e0e6f985b14f3402ee0330dee218c699b9828790f3a37081cdf6fca95708770bd1ade2d3140f3c7c804ce624efc74cc2e27";
+      sha512 = "e08260dbd8c179eccf7ecf0fd036e94542652856360ce927a9430d7c9cd8e966c9b71496ac9b98dcf1a0f10b54800bb84b382b797e2d1daf5ea3742692dc6d5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/km/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/km/firefox-52.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "29a03004cce0216508ba7b6f9fdf6f2e9407293c0e95d142d30045cd4ecf347c713c07d12c486dbd7e619e57e500bee15ce6eb539fe9314b7101f6f4fd35cfa8";
+      sha512 = "1bb1d99790cbe604e7c6ffc00b9e29b971391257ff3a04787bdce35d79c2c2ebde81037d4597d5f854fccebf9d8e13b73eb3caa11ec2cc50ed82a7db1da6213f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/kn/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/kn/firefox-52.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "11af63e757722279bb71270349f952e35771a08c3fc182f5a24b02b192775b84d966393c10f19034ef762ea7105b79354642b735e04817465afe90c818ba78ff";
+      sha512 = "426b524506c6d50a7b4625fb3cb0737bfc0f40f1d620f8d59ca60f642d6d5072abeb279722916d285a32653c9d3dffdea480ed7b76bbe81b199082c3af88e3d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ko/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ko/firefox-52.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "51f8c8a08f605877dbfb44eaf2c552221458780cd5b3f8a4124b096c36543dbe9aef1e4dbf7d8b3775d31a5fdfde2d8b71d1f8b1f7beaa826efb211d8751b9bb";
+      sha512 = "f24bb055650deb5bafc50105e5eccd1dfd09cd114175ca727c7f955b9e7fecf2be1e9e43df80ca1b986e43c991b6e960281c33654b08ea10e1a7612306253a4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lij/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lij/firefox-52.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "a8420d626862c54ea298c75bcb19bd90e55c713ca3b6d6802e8a4d8e7c02ddcd260d11392c9011e6fe807c17b3cedfa579d356e766b531819c89e24cdd4d7977";
+      sha512 = "d53e5e7b56c38f514de40215304982fce5f1d6600ee18fb3cb1f7b9da41b419c74ce1afa2c27bc6b93fa77b7240a3eb020b016dc4f40c744c775626939982686";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lt/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lt/firefox-52.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0c577c917af487d700501205e3267d42db0c1b12c8a3168a053e90cabc1a2a4a111355c0f7a1331367afeaf8f20f662b155738ed9ebb1fc987d8086704b938a4";
+      sha512 = "0c8fe608177aa128573ee86e15788878ba431fb7436c041754d6107189bb46a323b8966402c31175089ab2b343bb44c4dceaf11ee170503817ffb0e2905fef9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/lv/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/lv/firefox-52.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "3df4ca413c2f388d65aef69600be089062731bc3521de3ccb706e1185b5cb40505ac5c9325c8f5d1d91fe8b366d461998eaadd42e090dee1dc4f8b81e0822182";
+      sha512 = "e3d831a73ced3e2e5bc41657c1d0628209f464884d44c242948e3a3c56c956af6f06e6cdd2e85b2ee25300a28aef09c755324db928ba6f7ba3582348afa44c73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mai/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mai/firefox-52.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "a614b5b82df1b71a3880a7ba75bfcf7bd0047b6be7a49126ce2620a6b76590a9798e142f23dff99a67d569978ba565ddd7a33e3ece69cd2c33cf74c3674cf27b";
+      sha512 = "74cde9da097068a888894d61bcaba89ff61efa003586e01083ca06f6d69aeda1831ca68d88b7e00b9eb917e0c2c7085c6486f50190ce50879a431670e347c0e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mk/firefox-52.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "029d1a4196ef641b4da250520f852bf2cd27a4396620fa699777a9f470a019070384098bcc25a8d01410cb2e353cc13df60ca7b8a4fdaf89bbcfe9cf50484e6e";
+      sha512 = "8c9394b7a4ec6cf251071eeee4ffb60ae74c2c0b0cc77ed7b87ed1933220503a9e24438d7f286bca8d667d174f0669573c55dbab961875fead0be92ac5a2ab10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ml/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ml/firefox-52.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "078cb38737ff67e92cfb56fa5a9b18ba39479a92d23e2d70c0a45ddf7533f422f8887db6d4c6483da761ef15b93798e1c8edcf9d469ab484b53bb02d256d531b";
+      sha512 = "68c76f6b39c4e43f618aaab34dde32c0ce35c846d0992098606d0103998a0f8ebd15c296569c7afba7bc85f8916f36a3ab0142a226f2468b74b588af1ffb9bb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/mr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/mr/firefox-52.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "e16481b30598b84768ceef0e3b50f4f022b0b19d48c01f24f4fb2848244a07c8dc3babfcaadfb237dad6f41434e2fec8a51217850fc6af3f2ce8025eb9b68352";
+      sha512 = "b9732c556ef495c208dc45287d578fc508436365f067f930a9ec44e8cd0c6a9b0e668a07d206d56a9234e37bb80edd1a3b86f97e8b97f102c9b665eb95f58e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ms/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ms/firefox-52.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "bee27e45bda71129c09ad7c26fc678713bbf1ae066d07adab661a96ea4fe0cb7a2ee561541932ae7869b5fdb2367332001aec45cb3a776c23fd98f96a376a770";
+      sha512 = "4c87190253012cdf66129820d50c7e039ae846e4d22564582f9e653847e99a17c4225e3dca222e4d88ae4971756e9e6a116c00bd3d54642709d0935212880ebc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nb-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nb-NO/firefox-52.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "e07bb11cc2158ae8d1d5d5c0d3d9380c50aa11091a55f444a7b84cdaa271cacbf2dac42a39f21aaa636bc51678707b54e2ed393f4c2156fa1e407dd0659ca1cb";
+      sha512 = "3e2b6d33fa7bb6d955781e33c09d36db223baec583ee84bf96d5cac1ea6adad8cde1c929dab075eb1ba44e425c6bb199028536ce1da9f49583508549a806155e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nl/firefox-52.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "b3fdc32a487c7c9f519f8f4de6c547054ed58ec85c76991d6268040844012b85b8a85aa7add09fab2e25fbb0a5f9a645cfc5b51d8a18b735f64678cf0ceddb3c";
+      sha512 = "d13f5483c76d27b10a1b6f95d8c6f45c1d46b606f10b73ea0f8fe182eb1e07e3a708eaf6c5f8e1cbaa8b8832f98613362f7b781f45be4ccb529e48bf25444408";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/nn-NO/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/nn-NO/firefox-52.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "b78a4caffd59c8610b783c743f6896db2bffd40a910c394473ec7258525557d922bcd8f993d12c2aacc49763f4f1afa0872658d5dc03be662a285b04b54872ff";
+      sha512 = "1e44236fe14462c0922114fc39d45c3b7ffc1d1f51a247d403447dc406820c66b4617f7646b358fb240d220ecda3317d05bb46f127f1bca0460e7be687671c1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/or/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/or/firefox-52.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "2c68f1b4c0becb38ebc75720a1af76a2dd1031bb05d4c9aab05b17d486ec18d3fd3733a4d729b29fc7d1dbcf8ca8a9cdde75429c790de62f3930bf3ab7a52bbf";
+      sha512 = "609ed1aae8c84d2aa1e4c4ce034dee90aee36a01599855b91949e422d63a39aecfe3a7a7038130a9cb93e1874cd0036ad809641c84bfde2ad8893f7c46cb6d39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pa-IN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pa-IN/firefox-52.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "69022b727226221c9f412ef47340fa4aa4d9495f617add10f343bac457353aa9bb3eee1ebbcbe16d06625e6fa4f77fbc1d6ce2ba021b90acbbfff8e4bc49e62d";
+      sha512 = "3c5689b2a6d594ceee2b52eedf22ef73fa9138a36abaf9f873b4cead3473dc51e2c53c436fcbeaf247d2b74cb7a880dce72086a99a24a3e19be8f37521d2a8ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pl/firefox-52.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "3852945b017f4d88f0dd59b824fe5d67a904d736d9b9e180d116ed77a4da66d9a5a624c7706b11885d50817aae3a8890b0e6fee0b01f121a5ffe9ceac4184541";
+      sha512 = "3222b352e3f9bc05fa1e5cd96c763cc6b4b7b119cee94886bb6191657789f30f31a49e786b3c46607129c639de658c0d3c53494d556d7d31a17204ec338868a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-BR/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-BR/firefox-52.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "59c7d15417a2f81dbadfa23e27b08fef1d9e4d37f93642ced7dad81158e47d12ea28b620af7ebadb419f90f2a340b9b87dbc5321a77a4580573cc8fa4e0b7368";
+      sha512 = "e2ec0b35ad75c2e8f4d8fea32ea84b59fcdc939d83aec878d84c1d5140d1884fa977fb767be203068a4073b5752f5a1a9b646ded10ad87a47bf8f14f8aa8bd09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/pt-PT/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/pt-PT/firefox-52.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ec95ff787a5dd3f7b736e97e50333828bbd1726b6c88f95502aa92b245d00eb8bb8ce43f665f75f993c530498ce49642aa99d2466fd7b65921390991859c50e0";
+      sha512 = "bff1ff7109c1da0954685031a25c397828b2ab299f82447a46f773179bda440ab35dd687375b12524d03c48ee46f24ef54ebf02449e332fcef20c84bed7c6394";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/rm/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/rm/firefox-52.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "88c28449200c951bbb8a08dccbff253176d62e61776c58900fff1f0bfb9daeb65e3d49f0e4a9bb8a962af40b1174d1878c4162cf6aafee65c643b35cd7535565";
+      sha512 = "98771e89b0747de5da54878fc112b4686006891dba3e213c1460f8ad4b8a97d16f68f6969105c4f6e920e78d0fba09326aaf1d4a5f3d3acb9c5aff699e3ffd73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ro/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ro/firefox-52.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ca333f714287da738d469b32285d9b1496268656206ae4f648896adca89007950548456340b8efbbae61f26b3692f474c1af9112a9d0bc8064502e25a447e6c0";
+      sha512 = "87445f515ab98e5363fd613e50c920d8545feb6e8dbd18eda15fd0e383e4d1525c7d80d6ea50ecae0fde1cb9880a6daabbdded058d009da6fedd3df8d224576c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ru/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ru/firefox-52.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "75a19e48ac59114456a6e32f1c7557d6ab9a21377c440e88cd018620f85d14d8ef2538e271f04052c47e311d9eeba78a99d5a0f7550d1c4223d86301365dc763";
+      sha512 = "8f7d007fbc550731a42817ae2a9e71eae660fa016e868ec076ef32404e2720d20edc9e56b54d1dff41b2d6771a96bca3052e178e8620646b9a798077135dd498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/si/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/si/firefox-52.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "6423857acae37915ebdd69b1e5868bbe7d8b578f48e7c87fc4ce2dadbb812098a37627c53cc7d56dc66a9431bb8a995e28dc837ebc50cc14ce3edc0cfc6e7733";
+      sha512 = "01ac64cd7a60d606ac9974b7ed1cf6a33d5ee7c99d3afd0514bad6580560e55cf5466c83b8309f09188a68335a556d9e2d5ed5e3d35da4d53fe34c31d4054f26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sk/firefox-52.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "19e49096ff410d3abf571895c73af14a1977ea2b44f9aab917f7d6df6cf172187f40e13faaaab095ff659b5ef17457ce315c7af8de60bf50e599048d2cac4a24";
+      sha512 = "516342913ad7e38f0f4ee2baeeb5cb0640a46d9aaa0d0f4fb9d0762cabb88639efaabe158bbdf1a22afed05f99b77271cb5e432eed2ff606f79fdb754d5a553e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sl/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sl/firefox-52.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "aa81792a46431668d7c73c937e88997adc1fc79f570d1984d48ef328ba2543aa4e3b0bba83084cad75c911566e762d8f6c689bd938367ce5940bef52fb218823";
+      sha512 = "239c2137bf2b2f873874f5d58d245179b55687e69f6d170c2f6d2acdfd90d0cc1a95383ea2a03de2a6a93dae6145651fbc18aefaf4a34ffbafdb9fb6fd30b7f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/son/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/son/firefox-52.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "db4e58058f5a96ff86716a94ac5cfd08d286770560ce9d2dd0b4e66c2b2cb2de49044d0add4e47afea815910435b89c4ded953d4c8908bcf2bd0b006d8eb2e1e";
+      sha512 = "a4f896919679ae68abace99a38a44b0b4c97ec190fd076fb732c5f4fdaf37dcebc0ba8d8ce79273fc1118f010bdefb304a6d1d6de0aecd7404795d31501af511";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sq/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sq/firefox-52.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "412b08900c697b8aacca05a0e8e972d5f8a94c659fcb43883ee53e5e70ebefa6ef96ae25b7053bc0652a1600b2fc552effa62add6ad126a2ff00614b7c956873";
+      sha512 = "9cab63ca40a6389d55ea3cc3fed3efb545784f7f3a257b79f440b72ac891e800f52aaf02e732ad2ecf99aa1810db7b88900f1f6b77cb2c6d2daa3a61210df62e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sr/firefox-52.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "2a6d6d5c4d8215b08e0de5f85c9bb20df27975a27ef81f7706c78d6315fa73adb99b7676237463d73a376ebfe1960702291b38100e9035d4f9961270e07a5a50";
+      sha512 = "22ac168005c7675d32f2e9524d0356e2de305289dffd0be60334663adbcab48584fdf1dc0990381561aca65711d01b4b007546152d30716fec97bf1486fb788d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/sv-SE/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/sv-SE/firefox-52.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "6c12add3fc10a2bba6603418662e02331d6266a4df5b05a25a921f5da3f5235366e7114dabf2cd8d41b27b43932f14ebfdf10d30baea9b065a1d6a419ec887ec";
+      sha512 = "a958aebdaaf7737000a4a6ce7d86b299287bdcfa810a230334ace7a25a277cb17193d373d54724dfb5acf64e78e3c573d2d0c2ce0921ca545e133bfdb20c167d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/ta/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/ta/firefox-52.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "63532f2d237a8533ce87872e939cab06345cafb7e51488972c51f9a63f16bcc768d21a13574b798bf09ae9412b827f95cf3acda33a08082e764a9fbbc026a044";
+      sha512 = "107e51b9990dd0438d6fd45fe02582474f5c14dc3a07a8fa2598cca25cacedcf7f7580f8f80c7094eeb7af9cfbda125d469d4da4c2091d8d7a6ae0eeb80fdbc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/te/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/te/firefox-52.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "42a37106d3921dbc65dd4ef1729513c6bc97cb9b0a7412c44223d07b49b5b2d48b3275fff1454cc022935d32741a434fbc45387a2151629c24f832a04b9baee8";
+      sha512 = "13f611011ee3c82df3aca2dfa4e6c4edf933bebe394f162e30af7c5bd27db3e141fdbb34e3491130605c6af9913a2a95d41d2b3a74cc4f31264e0bc7893bdb45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/th/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/th/firefox-52.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "6707469f29aad81f15e9522e49373b39988598f40ad4e4afee0fcdee9551e66aa74d94d31268fa0fb62f7ef69f6eda177d7b30408691af694ad6475db30c5612";
+      sha512 = "f7d474dbd9cec1c84406ff1f56249896c37e0d7f4c2e7b513dae1e2d2f1278c88cdfa56dd291e4d63746060f0d8e9a71d34f4e5b3004165b70e274e5bfa7e1b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/tr/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/tr/firefox-52.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "6c6ecc7d4fcbb967217b1c174a993b711485eec530cbc171d64b9f777b867b4ee1a6e17ea3fe054fa3c1e6255c28c3ffcdc3beccd28546977714f0d5cada7871";
+      sha512 = "51a785b556800301ad6a3dde8fee0606d74f00bab1b75fe188d83cfba67a4de2dde402e542cef62eae04059217d5e5acf29f62691c03d4e024f85264778872aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uk/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uk/firefox-52.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "d7cd7d0b100ad257c92444d9637e924d5900b9b99f04e205149e79e59c757fae741ec3f6cd01842efe1c7f219c594cece5d7a9345925a8765ee4d3245afe5215";
+      sha512 = "76f12345ce05edfebd0c5c14b894a0affdcae45899c46a229eeff1930bbd1302f7e1d80f007f0e3b831d8b1460b86a7f607924c24c39160768cf254825178a39";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/uz/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/uz/firefox-52.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "c1ded0aa9b6975a71b5132349521f745648bd2cf74aacf71764120cfb5c663ffc23615e62bfa662feab8c6e8c2cc40f8d0bc5b707c8cf7619de9b712d893a7f9";
+      sha512 = "7d6ec5c13514721741cfb569769137ea28516279b494b77fc066be89ebdef629d5c15f878ad62d794e5c1e345bc8e2851dbdfb9575f09c8d848d1a61c638463a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/vi/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/vi/firefox-52.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "fd19f568b5467df2f92ffb4367bbac35ff36979c875847433da573cee0f6fc24cac1c538e197a53c1a920bc274e4715a3f3734df131fc00ae8972b1a14218418";
+      sha512 = "c27e0109761f2199c7013abbd206abb24bc33a60d1b87f39ca50a05fc44c4436507b94cf72c7cac9dd30ee0613bf2b32b27272878a446185166f3c83e35ca1db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/xh/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/xh/firefox-52.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "58d10220a9ae70cddd7e814071a57f944654edd58abf8dba6a083a9de0d6b1887f09e3e6756896ca65d49622dd2981dc7abafdb655187650b7aff7023b87c60d";
+      sha512 = "8c46324dd71f3ef17e998911100c451701fdcbecc460facffd1ea43074ceec54b1b84070168496ef38706fd52a69306de76709ba100214c3c9d11252c1fe7d9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-CN/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-CN/firefox-52.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "59fd16400cde462fc339e5df5dd8c21dcea02cc8d46268ee01566d0a5e3188d51bb71ece2516fa2ca141b8f93fe35aa97af92841f0a7211760708f01d5cbcc36";
+      sha512 = "6bb1e84bdea7b61ac4cc4b145478a167993bc843a4171d97bc9f6a06969eee72f527c25f3b2add2ba5341aa1aa5995b3cfe6d691a4e1ed315cec0df522911313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0/linux-i686/zh-TW/firefox-52.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/52.0.1/linux-i686/zh-TW/firefox-52.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "f288f83fc827221d46e656c5217e16b2fe23d1d9cde279ccf64824ded9135c4ea0ea3d3657a22aaab6e42f679a7c1040fe5de0875f57ae568712f1e6287177b1";
+      sha512 = "172364ccbacf6918571440cb9910eabb43457deba65449d95adfff550ac3d56b3118d21f862050a6df97ff173f079e8f2c48b41a01ec160da263bf7903c737b3";
     }
     ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 71e8d056ebe9..96b62fc0d023 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -152,8 +152,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "52.0";
-    sha512 = "bffe5fd9eee240f252bf8a882c46f04551d21f6f58b8da68779cd106ed012ea77ee16bc287c847f8a7b959203c79f1b1d3f50151111f9610e1ca7a57c7b811f7";
+    version = "52.0.1";
+    sha512 = "535e2cc0ee645d4ebe9f1d2d1f4fbb16ff5d1745ce493add6b2e323ca3b0907c3054705c5a15eaadb314d5d6474ba1825554fd1ff0780ab7f76fd3f9672a6974";
     updateScript = import ./update.nix {
       attrPath = "firefox-unwrapped";
       inherit writeScript lib common-updater-scripts xidel coreutils gnused gnugrep curl;

From a038f918714efbb67b27574dff93b632f50c916e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 18 Mar 2017 09:36:27 +0900
Subject: [PATCH 2465/3449] firefox-esr: 52.0esr -> 52.0.1esr

---
 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 96b62fc0d023..66004787542d 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -162,8 +162,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "52.0esr";
-    sha512 = "7e191c37af98163131cbba4dcc820a4edc0913d81c3b2493d9aad0a2886e7aed41a990fa5281ccfb08566ecfdfd7df7353063a01ad92d2ec6e1ce19d277b6e67";
+    version = "52.0.1esr";
+    sha512 = "c1f0aea279254e7788f62bba7892840edd2b667f385a649d374c9e783b93ec7faf9e5ebfccd04cd94f46da37aeb6bd7785d17faca2ad441a0b6e8587917faab2";
     updateScript = import ./update.nix {
       attrPath = "firefox-esr-unwrapped";
       versionSuffix = "esr";

From d26775fce771dbce2f0478be4e0b665b7e14e89e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 17 Mar 2017 19:34:28 -0500
Subject: [PATCH 2466/3449] salut-a-toi: 0.2.0 -> 0.6.1

salut-a-toi: Removed un-needed python variable in function
---
 .../salut-a-toi/default.nix                   | 74 ++++++++++---------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index c035fc626651..f4f4aac5efa7 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -1,49 +1,53 @@
-{stdenv, fetchurl, pythonPackages}:
+{stdenv, fetchurl, python27Packages, file }:
 
 let
-  inherit (pythonPackages) python;
-in stdenv.mkDerivation rec {
-  url = "ftp://ftp.goffi.org/sat/sat-0.2.0.tar.bz2";
-  name = stdenv.lib.nameFromURL url ".tar";
-  src = fetchurl {
-    inherit url;
-    sha256 = "14qqgsgqns1xcp97nd3jcxrq54z1x5a6kimqxy029hh7ys813mf1";
-  };
+  inherit (python27Packages) python;
+in
+  stdenv.mkDerivation rec {
+    name = "salut-a-toi";
+    version = "0.6.1";
+    pname = "sat-${version}";
 
-  buildInputs = with pythonPackages; 
+    src = fetchurl {
+      url = "ftp://ftp.goffi.org/sat/${pname}.tar.bz2";
+      sha256 = "0kn9403n8fpzl0hsb9kkzicsmzq2fjl627l31yykbqzc4nsr780d";
+    };
+
+    buildInputs = with python27Packages; 
     [
       python twisted urwid beautifulsoup wxPython pygobject2
-      wokkel dbus-python pyfeed wrapPython setuptools
+      wokkel dbus-python pyfeed wrapPython setuptools file 
+      pycrypto pyxdg
     ];
 
-  configurePhase = ''
-    sed -i "/use_setuptools/d" setup.py
-    sed -e "s@sys.prefix@'$out'@g" -i setup.py
-    sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${pythonPackages.twisted}/bin\"" -i src/sat.sh
-    sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
+    configurePhase = ''
+      sed -i "/use_setuptools/d" setup.py
+      sed -e "s@sys.prefix@'$out'@g" -i setup.py
+      sed -e "1aexport PATH=\"\$PATH\":\"$out/bin\":\"${python27Packages.twisted}/bin\"" -i src/sat.sh
+      sed -e "1aexport PYTHONPATH=\"\$PYTHONPATHPATH\":\"$PYTHONPATH\":"$out/${python.sitePackages}"" -i src/sat.sh
 
-    echo 'import wokkel.muc' | python 
-  '';
+      echo 'import wokkel.muc' | python 
+    '';
 
-  buildPhase = ''
-    ${python.interpreter} setup.py build
-  '';
+    buildPhase = ''
+      ${python.interpreter} setup.py build
+    '';
 
-  installPhase = ''
-    ${python.interpreter} setup.py install --prefix="$out"
+    installPhase = ''
+      ${python.interpreter} setup.py install --prefix="$out"
 
-    for i in "$out/bin"/*; do
+      for i in "$out/bin"/*; do
       head -n 1 "$i" | grep -E '[/ ]python( |$)' && {
         wrapProgram "$i" --prefix PYTHONPATH : "$PYTHONPATH:$out/${python.sitePackages}"
       } || true 
-    done
-  '';
-  
-  meta = {
-    homepage = "http://sat.goffi.org/";
-    description = "A multi-frontend XMPP client";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    license = stdenv.lib.licenses.gpl3Plus;
-  };
-}
+      done
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://sat.goffi.org/;
+      description = "A multi-frontend XMPP client";
+      platforms = platforms.linux;
+      maintainers = [ maintainers.raskin ];
+      license = licenses.gpl3Plus;
+    };
+  }

From a4d6e2cf163202b438b2b1af732fa47ea5db5cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Sat, 18 Mar 2017 01:39:14 +0100
Subject: [PATCH 2467/3449] atom: avoid using LD_PRELOAD. Fixes glibc compat
 issues

The wrapper for Atom was loading libraries via LD_PRELOAD, for example
libxkbfile. Now, if you installed atom via nix-env and happened to use a newer
nixpkgs for that than what your system environment is build against, you could
end up with an error like this:

```
uname: relocation error:
/nix/store/68sa3m89shpfaqq1b9xp5p1360vqhwx6-glibc-2.25/lib/libdl.so.2:
symbol _dl_catch_error, version GLIBC_PRIVATE not defined in file libc.so.6
with link time reference
```

This happens because atom calls the `uname` executable from the system to
determine the platform. Because that inherits the `LD_PRELOAD` environment
variable, so the libxkbfile library that the `atom` wrapper was build against
is loaded into `uname`. But since `atom` comes from `nix-env`, the `libxkbfile`
it was built with might be compiled against a newer version of `glibc` than
`uname`, which comes from the system, was! Having two versions of glibc loaded
into the same processes results in chaos.

To fix this, we avoid setting `LD_PRELOAD` and instead use patchelf to set the
correct RPATH. RPATH is not inherited by child processes, so the above issue
can no longer occur.

The only small complication here is that the library that actually loads
libxkbfile is not the atom binary itself, but a node extension that atom uses.
So instead of setting the RPATH on `atom` only, we also set the `rpath` on all
node extensions (`*.node`) the output.
---
 pkgs/applications/editors/atom/default.nix | 9 +++++----
 pkgs/applications/editors/atom/env.nix     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 3eae877ff61a..60e17982b5be 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv, libXScrnSaver, libxkbfile }:
+{ stdenv, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
     rm -r $out/share/lintian
     rm -r $out/usr/
     wrapProgram $out/bin/atom \
-      --prefix "PATH" : "${gvfs}/bin" \
-      --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libXScrnSaver ]}/libXss.so.1 \
-      --prefix LD_PRELOAD : ${stdenv.lib.makeLibraryPath [ libxkbfile ]}/libxkbfile.so.1
+      --prefix "PATH" : "${gvfs}/bin"
 
     fixupPhase
 
@@ -33,8 +31,11 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${atomEnv.libPath}" \
       $out/share/atom/resources/app/apm/bin/node
+
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       $out/share/atom/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux
+
+    find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index 1285e46fb484..228a21dc4309 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -9,7 +9,7 @@ let
     fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
-    xorg.libXcursor libcap systemd libnotify
+    xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
   ];
 
   libPathNative = lib.makeLibraryPath packages;

From 8ef05d30105ae875429a3631bd4cfcf13286f338 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 17 Mar 2017 20:02:23 -0500
Subject: [PATCH 2468/3449] mpop: 1.2.4 -> 1.2.6

---
 pkgs/applications/networking/mpop/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix
index b2cc30b6f1f3..3d0d576bffb1 100644
--- a/pkgs/applications/networking/mpop/default.nix
+++ b/pkgs/applications/networking/mpop/default.nix
@@ -1,24 +1,27 @@
 { stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  version = "1.2.4";
+  version = "1.2.6";
   name = "mpop-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpop/${name}.tar.xz";
-    sha256 = "158zl6clxrl2id4kvdig2lvdvm0vg2byqcgn1dnxfjg5mw16ngwk";
+    sha256 = "0p1ix63jh64dibrlccch8q7gxl9nn18wd2qpyr5z1h4gs2fpmv4z";
   };
 
-  buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl gnutls gsasl libidn ]
+    ++ optional stdenv.isDarwin Security;
 
   configureFlags =
-    stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
+    optional stdenv.isDarwin [ "--with-macosx-keyring" ];
 
   meta = {
       description = "POP3 mail retrieval agent";
-      homepage = "http://mpop.sourceforge.net/";
-      license = stdenv.lib.licenses.gpl3Plus;
-      platforms = stdenv.lib.platforms.unix;
+      homepage = http://mpop.sourceforge.net/;
+      license = licenses.gpl3Plus;
+      platforms = platforms.unix;
     };
 }

From 17bfb6a08a0f77124bbe96e2908076c821bdeb46 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 18 Mar 2017 02:04:28 +0000
Subject: [PATCH 2469/3449] citrix-receiver: add link to webpage with all
 versions and adjust to change in nix-prefetch-url

Helps with #23975
---
 .../networking/remote/citrix-receiver/default.nix             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 57d04e528452..cf7afc37b8bb 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -41,10 +41,12 @@ stdenv.mkDerivation rec {
 
       ${homepage}
 
+      (if you do not find version ${version} there, try https://www.citrix.com/downloads/citrix-receiver/)
+
       Once you have downloaded the file, please use the following command and re-run the
       installation:
 
-      nix-prefetch-url file://${name}
+      nix-prefetch-url file://$PWD/${name}
     '';
   };
 

From ee20e8964429288df5f8186c4d6b0771633be86d Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 18 Mar 2017 12:32:49 +0800
Subject: [PATCH 2470/3449] virtmanager-qt: 0.39.60 -> 0.42.67

---
 pkgs/applications/virtualization/virt-manager/qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index d502ef06671e..1952102e71a2 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "virt-manager-qt-${version}";
-  version = "0.39.60";
+  version = "0.42.67";
 
   src = fetchFromGitHub {
     owner  = "F1ash";
     repo   = "qt-virt-manager";
     rev    = "${version}";
-    sha256 = "010lpw85m5sd613l281y4zxkp5v3k16pgnawskbi1ricsnj4k5mh";
+    sha256 = "0hskaffc84wf8h9qck5xg840jw8x2krfy6cw4hqnq946z9lbyanr";
   };
 
   cmakeFlags = [

From 05b1f8276bb10464944fb9dc901df5e4617bca95 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sat, 18 Mar 2017 00:24:18 -0500
Subject: [PATCH 2471/3449] erlangR19: 19.2.3 -> 19.3

---
 pkgs/development/interpreters/erlang/R19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index fc9db7d9bfb6..a8777f8f01f1 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -21,7 +21,7 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"
   + "${optionalString javacSupport "-javac"}";
-  version = "19.2.3";
+  version = "19.3";
 
   # Minor OTP releases are not always released as tarbals at
   # http://erlang.org/download/ So we have to download from
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "erlang";
     repo = "otp";
     rev = "OTP-${version}";
-    sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c";
+    sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
   };
 
   buildInputs =

From a91afef89e611cbdb3c26507d9115904177a3095 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sat, 18 Mar 2017 00:35:25 -0500
Subject: [PATCH 2472/3449] erlangR19: update maintainers

Use the list of direct committers:
https://github.com/NixOS/nixpkgs/commits/master/pkgs/development/interpreters/erlang/R19.nix

Originally, I just copied and pasted from R18.nix, I think.
---
 pkgs/development/interpreters/erlang/R19.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index a8777f8f01f1..11f50b40fb36 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny sjmackenzie couchemar ];
+    maintainers = with maintainers; [ yurrriq couchemar DerTim1 mdaiter ];
     license = licenses.asl20;
   };
 }

From f77ae4e72607a658bdfd117b7e6f32aa4504befc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Sat, 18 Mar 2017 09:36:08 +0100
Subject: [PATCH 2473/3449] amule: 2.3.1 -> 2.3.2

---
 pkgs/tools/networking/p2p/amule/default.nix |  6 +++---
 pkgs/tools/networking/p2p/amule/gcc47.patch | 21 ---------------------
 2 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/networking/p2p/amule/gcc47.patch

diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index d091af624463..c278cc989357 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -13,11 +13,11 @@ let
   edf = enabled: flag: if enabled then "--enable-" + flag else "--disable-" + flag;
 in
 mkDerivation rec {
-  name = "aMule-2.3.1";
+  name = "aMule-2.3.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/amule/${name}.tar.xz";
-    sha256 = "0hvpx3c005nvxsfand5bwfxxiq3mv0mpykajfm2lkygjh1rw2383";
+    sha256 = "0a1rd33hjl30qyzgb5y8m7dxs38asci3kjnlvims1ky6r3yj0izn";
   };
 
   buildInputs =
@@ -25,7 +25,7 @@ mkDerivation rec {
     ++ lib.optional httpServer libpng
     ++ lib.optional client libX11;
 
-  patches = [ ./gcc47.patch ]; # from Gentoo
+  enableParallelBuilding = true;
 
   configureFlags = ''
     --with-crypto-prefix=${cryptopp}
diff --git a/pkgs/tools/networking/p2p/amule/gcc47.patch b/pkgs/tools/networking/p2p/amule/gcc47.patch
deleted file mode 100644
index e776dda3240e..000000000000
--- a/pkgs/tools/networking/p2p/amule/gcc47.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# http://code.google.com/p/amule/source/detail?r=10772
-diff -ur aMule-2.3.1.orig//src/ObservableQueue.h aMule-2.3.1/src/ObservableQueue.h
---- aMule-2.3.1.orig//src/ObservableQueue.h	2012-04-22 19:40:05.560084120 +0200
-+++ aMule-2.3.1/src/ObservableQueue.h	2012-04-22 19:40:32.479085322 +0200
-@@ -331,14 +331,14 @@
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STARTING ), o );
-+	this->NotifyObservers( EventType( EventType::STARTING ), o );
- }
- 
- 
- template <typename ValueType>
- void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
- {
--	NotifyObservers( EventType( EventType::STOPPING ), o );
-+	this->NotifyObservers( EventType( EventType::STOPPING ), o );
- }
- 
- 
\ No newline at end of file

From 6022a79cbc2fd3c78a89a8ec02732781cceb4a59 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sat, 18 Mar 2017 11:10:49 +0100
Subject: [PATCH 2474/3449] nixos/release.nix: added tests.wordpress

---
 nixos/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index 0359d0907cca..325047ce10c4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -302,6 +302,7 @@ in rec {
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
   tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
+  tests.wordpress = callTest tests/wordpress.nix {};
   tests.xfce = callTest tests/xfce.nix {};
 
 

From 266fb8845a815785a18488401fefe21e31ca55f3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 12:19:10 +0100
Subject: [PATCH 2475/3449] xxdiff-tip: init at 4.0.1.20170111

Supports Qt5
---
 pkgs/development/tools/misc/xxdiff/tip.nix | 36 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/misc/xxdiff/tip.nix

diff --git a/pkgs/development/tools/misc/xxdiff/tip.nix b/pkgs/development/tools/misc/xxdiff/tip.nix
new file mode 100644
index 000000000000..b613508c5c05
--- /dev/null
+++ b/pkgs/development/tools/misc/xxdiff/tip.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromBitbucket, qt5, flex, bison, docutils }:
+
+stdenv.mkDerivation rec {
+  name = "xxdiff-4.0.1.20170101";
+
+  src = fetchFromBitbucket {
+    owner = "blais";
+    repo = "xxdiff";
+    rev = "1cf6b23ad30a845daba28a3409c65f93aec7f5e8";
+    sha256 = "0rq7grpndj85i7qzlj93jpzpfzk7bwsi55033fc63hb55rbdzz6z";
+  };
+
+  nativeBuildInputs = [ flex bison qt5.qtbase docutils ];
+
+  buildInputs = [ qt5.qtbase ];
+
+  preConfigure = ''
+    ln -s ${qt5.qtbase.dev}/mkspecs/* ../__nix_qt*__/mkspecs
+    ln -s ${qt5.qtbase.dev}/bin/* ../__nix_qt*__/bin || true
+  '';
+
+  NIX_CFLAGS_COMPILE="-I${qt5.qtbase.dev}/include/QtCore -I${qt5.qtbase.dev}/include/QtGui -I${qt5.qtbase.dev}/include/QtWidgets";
+  
+  configurePhase = "${preConfigure} cd src; make -f Makefile.bootstrap";
+
+  installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
+
+
+  meta = with stdenv.lib; {
+    homepage = http://furius.ca/xxdiff/;
+    description = "Graphical file and directories comparator and merge tool";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a79a8ccce0f4..b6476be0f5be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6909,6 +6909,7 @@ with pkgs;
   xxdiff = callPackage ../development/tools/misc/xxdiff {
     bison = bison2;
   };
+  xxdiff-tip = callPackage ../development/tools/misc/xxdiff/tip.nix { };
 
   yacc = bison;
 

From 6e74e165cbbd3355518688ada66a6aafc72cf33a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 12:25:06 +0100
Subject: [PATCH 2476/3449] xannotate: init at 20150301

---
 pkgs/tools/X11/xannotate/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/X11/xannotate/default.nix

diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix
new file mode 100644
index 000000000000..829d9b8ab2d3
--- /dev/null
+++ b/pkgs/tools/X11/xannotate/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchFromBitbucket, libX11}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "xannotate";
+  version = "20150301";
+  
+  src = fetchFromBitbucket {
+    owner = "blais";
+    repo = pname;
+    rev = "e5591c2ec67ca39988f1fb2966e94f0f623f9aa7";
+    sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik";
+  };
+
+  buildInputs = [ libX11 ];
+
+  meta = {
+    inherit version;
+    description = "A tool to scribble over X windows";
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://bitbucket.org/blais/xannotate";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6476be0f5be..0a85d118c9ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15999,6 +15999,8 @@ with pkgs;
 
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
+  xannotate = callPackage ../tools/X11/xannotate {};
+
   xaos = callPackage ../applications/graphics/xaos {
     libpng = libpng12;
   };

From 5833da6ad5aaecf5c8214768775e7f7ff07bfefa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 12:33:35 +0100
Subject: [PATCH 2477/3449] wayv: init at 0.3

---
 pkgs/tools/X11/wayv/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/X11/wayv/default.nix

diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix
new file mode 100644
index 000000000000..2b5b2975a955
--- /dev/null
+++ b/pkgs/tools/X11/wayv/default.nix
@@ -0,0 +1,24 @@
+{stdenv, fetchFromGitHub, libX11}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "wayv";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "mikemb";
+    repo = pname;
+    rev = "b716877603250f690f08b593bf30fd5e8a93a872";
+    sha256 = "046dvaq6na1fyxz5nrjg13aaz6ific9wbygck0dknqqfmmjrsv3b";
+  };
+
+  buildInputs = [ libX11 ];
+
+  meta = {
+    inherit version;
+    description = "A gesture control for X11";
+    license = stdenv.lib.licenses.gpl2Plus ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "https://github.com/mikemb/wayV";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a85d118c9ea..eccbf2365d92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15860,6 +15860,8 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
+  wayv = callPackage ../tools/X11/wayv {};
+
   weechat = callPackage ../applications/networking/irc/weechat {
     inherit (darwin) libobjc;
     inherit (darwin) libresolv;

From eeef599ced87b63c82191e2b51515c58a5e540b7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 12:41:00 +0100
Subject: [PATCH 2478/3449] wayv: install docs

---
 pkgs/tools/X11/wayv/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix
index 2b5b2975a955..bb4435d56e7e 100644
--- a/pkgs/tools/X11/wayv/default.nix
+++ b/pkgs/tools/X11/wayv/default.nix
@@ -13,6 +13,15 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 ];
 
+  postInstall = ''
+    make -C doc install
+    mkdir -p "$out"/share/doc/wayv
+    cp [A-Z][A-Z]* "$out"/share/doc/wayv
+    cp doc/[A-Z][A-Z]* "$out"/share/doc/wayv
+    cp doc/*.txt "$out"/share/doc/wayv
+    cp doc/*.jpg "$out"/share/doc/wayv
+  '';
+
   meta = {
     inherit version;
     description = "A gesture control for X11";

From 4e2f802ce815dea0a4625a8285f5c7e7f74cf8ab Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 18 Mar 2017 12:15:25 +0100
Subject: [PATCH 2479/3449] gnome_mplayer: fix src and build

---
 pkgs/applications/video/gnome-mplayer/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix
index 1096a64887b0..e2980c7108f4 100644
--- a/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/pkgs/applications/video/gnome-mplayer/default.nix
@@ -4,12 +4,14 @@ stdenv.mkDerivation rec {
   name = "gnome-mplayer-1.0.4";
 
   src = fetchurl {
-    url = "http://gnome-mplayer.googlecode.com/files/${name}.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/gnome-mplayer/${name}.tar.gz";
     sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2";
   };
 
   buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf];
-  
+
+  hardeningDisable = [ "format" ];
+
   meta = {
     homepage = http://kdekorte.googlepages.com/gnomemplayer;
     description = "Gnome MPlayer, a simple GUI for MPlayer";

From 3edf45526901ce33d43f774dff2eb36d6e283f96 Mon Sep 17 00:00:00 2001
From: Steven Taschuk <steven@amotlpaa.org>
Date: Sat, 18 Mar 2017 08:34:28 -0400
Subject: [PATCH 2480/3449] spambayes: Add bsddb build input

To reproduce the issue:
```
nix-build -E 'import <nixpkgs> {}' -A python27Packages.spambayes
result/bin/sb_filter.py </dev/null
```
Before this commit, this fails with
```
[...]
  File "/nix/store/vlgr1wrxd2wiw5ay5ch54365dzqvcwgq-python2.7-spambayes-1.1b1/lib/python2.7/site-packages/spambayes/dbmstorage.py", line 20, in open_dbhash
    return bsddb.hashopen(*args)
AttributeError: 'NoneType' object has no attribute 'hashopen'
```
After this commit, it doesn't.
---
 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 5e67aac39602..231d496f9d4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23922,7 +23922,7 @@ in {
       sha256 = "0kqvjb89b02wp41p650ydfspi1s8d7akx1igcrw62diidqbxp04n";
     };
 
-    propagatedBuildInputs = with self; [ pydns lockfile ];
+    propagatedBuildInputs = with self; [ bsddb3 pydns lockfile ];
 
     meta = {
       description = "Statistical anti-spam filter, initially based on the work of Paul Graham";

From 959064cfbea7fc0cf5d290c79f4b6aca832193fd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 18 Mar 2017 12:58:49 +0000
Subject: [PATCH 2481/3449] ocamlPackages.ppx_deriving_yojson: init at 3.0

deriving Yojson is a ppx_deriving plugin that generates JSON serializers and
deserializers that use the Yojson library from an OCaml type definition.

Homepage: https://github.com/whitequark/ppx_deriving_yojson
---
 .../ppx_deriving_yojson/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix

diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
new file mode 100644
index 000000000000..69276fb5a7d6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg, cppo
+, ppx_import, ppx_deriving, yojson, ounit
+}:
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}";
+  version = "3.0";
+
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "ppx_deriving_yojson";
+    rev = "v${version}";
+    sha256 = "1id1a29qq0ax9qp98b5hv6p2q2r0vp4fbkkwzm1bxdhnasw97msk";
+  };
+
+  buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ];
+
+  propagatedBuildInputs = [ ppx_deriving yojson ];
+
+  inherit (topkg) installPhase;
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = {
+    description = "A Yojson codec generator for OCaml >= 4.02.";
+    inherit (src.meta) homepage;
+    license = stdenv.lib.licenses.mit;
+    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 03afec1870fe..f46aa3a251c7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -483,6 +483,8 @@ let
       then callPackage ../development/ocaml-modules/ppx_deriving {}
       else null;
 
+    ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {};
+
     ppx_import = callPackage ../development/ocaml-modules/ppx_import {};
 
     ppx_tools =

From d4409817a63a398ba7cb18e577e4f8a1c02f08f5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Mar 2017 15:15:18 +0100
Subject: [PATCH 2482/3449] grsecurity: 4.9.15-201703150049 ->
 4.9.16-201703180820

---
 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 540ec0e5699f..d3874e9f929c 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.15";
+  version = "4.9.16";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "3p0cfjfmq4r04w6bjyi2aphq171yavv9m06b29wjsglb1bbkyiy4v278r99cq913msmdp3xs0ba1rkc36qp7cv7hxc29pj0w06ajwls";
+    sha512 = "3fhzfdiziad5blzcqfbrxjphcygmhd7jzrricpkn7mvg069csrq0yvlbsxksqii0ahk77wzs1nmkfx138y21v4745dk6rf0438jv7md";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c3da24bdfac4..aba4f54b5267 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.15";
-      grrev  = "201703150049";
-      sha512 = "1x02ncl94835n85kpp5bfvy6863sb482fw30x2pqszi4aivjc31i77vj135a7f508ni1b9rbbl8a0m3q4nb8gdbia75zcxbjdi9ij9m";
+    { kver   = "4.9.16";
+      grrev  = "201703180820";
+      sha512 = "114yqjffxnf412ypaq91r732mi4im2qakj07g0nbqx1qyg319qag5ckc5438kcny3qhzb9wyrwr6mhza51cq7js40ps2aw7alwjfgql";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From b5da6ca2131fff8406835e7ef350c43e2909078a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 18 Mar 2017 15:19:15 +0100
Subject: [PATCH 2483/3449] linux_4_9: 4.9.15 -> 4.9.16

---
 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 18ac6b41c8cb..f024099b8281 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.15";
+  version = "4.9.16";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14sfacaqkk9c66zrl8wkmy5331hczgz5j65yms6pnpwwi82sq3c2";
+    sha256 = "1r5spbinz8g3iclm9039cddaamj8q5vy455nnr3pvrmxbj8l9d23";
   };
 
   kernelPatches = args.kernelPatches;

From 8547fa1d5614aaf6f253db5cf5ce159ebf3d51f3 Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Sat, 18 Mar 2017 17:13:23 +0100
Subject: [PATCH 2484/3449] update powerline 2.4 -> 2.5.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e67aac39602..1d6b13e7f1c6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19258,12 +19258,12 @@ in {
   };
 
   powerline = buildPythonPackage rec {
-    rev  = "2.4";
+    rev  = "2.5.2";
     name = "powerline-${rev}";
     src = pkgs.fetchurl {
       url    = "https://github.com/powerline/powerline/archive/${rev}.tar.gz";
       name   = "${name}.tar.gz";
-      sha256 = "12fp3cpwgpkxcj4mfjdpsmf1h0b8pqy1icb07jdivz9kw18h0184";
+      sha256 = "064rp2jzz4vp1xqk3445qf08pq3aif00q1rjqaqx2pla15s27yrz";
     };
 
     propagatedBuildInputs = with self; [ pkgs.git pkgs.mercurial pkgs.bazaar self.psutil self.pygit2 ];

From 2478f7b92c8e5209d5b92490de7fad5b8248180b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 18 Mar 2017 16:42:24 +0100
Subject: [PATCH 2485/3449] kdelibs: remove sanitize patch

because its included in 4.14.30 which was part of Applications 16.12.3.
https://github.com/NixOS/nixpkgs/pull/23992#issuecomment-287553865
---
 pkgs/applications/kde/kdelibs/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index e7b7b0a0ec4d..8adcd4d1b472 100644
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -28,11 +28,6 @@ kdeApp {
     ./0001-old-kde4-cmake-policies.patch
     ./0002-polkit-install-path.patch
     ./0003-remove_xdg_impurities.patch
-    (fetchpatch {
-     name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch";
-     url = "https://cgit.kde.org/kdelibs.git/patch/?id=1804c2fde7bf4e432c6cf5bb8cce5701c7010559";
-     sha256 = "1y9951wgx35yf24i6gjz219fhspyqri1jvbw4fybd8nwwjb6ciz1";
-   })
   ];
 
   # cmake does not detect path to `ilmbase`

From 2cb440df726bb0995c5c5640353b7a7311bceb6c Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 18 Mar 2017 13:07:52 -0400
Subject: [PATCH 2486/3449] llvm-4: small improvements on Darwin and elsewhere

Split outputs because there's no point in keeping a reference to Python
and it causes trouble during the Darwin stdenv bootstrap. There's also
an unnecessary dependency on LLVM in libc++ which causes us to rebuild
LLVM several more times than necessary during bootstrap, and an awkward
dependency on XPC in the TSAN that we turn off. This is in preparation
for using LLVM 4 in the Darwin stdenv and by default across nixpkgs.
---
 .../compilers/llvm/4/clang/default.nix            | 11 +++++++++++
 .../compilers/llvm/4/libc++/default.nix           |  2 +-
 pkgs/development/compilers/llvm/4/llvm.nix        | 15 ++++++++-------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 88eafe983d3e..6ce63209935c 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/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/${release_version}/lib $out/lib/clang/${release_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/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index 8e2c8eaa1768..ba8302919e1e 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
   '';
 
-  buildInputs = [ cmake llvm libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
+  buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   cmakeFlags = [
       "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib"
diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix
index ac3fc6790d58..83a14b7fc4dd 100644
--- a/pkgs/development/compilers/llvm/4/llvm.nix
+++ b/pkgs/development/compilers/llvm/4/llvm.nix
@@ -41,16 +41,18 @@ 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 ];
 
-  # 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.
   postPatch = 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 +87,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 194ff8a538984e6641fbdb62ab702fc16af14462 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 18 Mar 2017 19:58:24 +0200
Subject: [PATCH 2487/3449] gcc-snapshot: Fix eval error

---
 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 50c08ff66508..8561f2059d01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5028,7 +5028,7 @@ with pkgs;
     # and host != build), `cross' must be null but the cross-libc must still
     # be passed.
     cross = null;
-    libcCross = if crossSystem != null then libcCross else null;
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
 
     isl = if !stdenv.isDarwin then isl_0_14 else null;
   }));

From 5658324d82b46cfb6561cd12f2754a4c10cacf20 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 18 Mar 2017 20:01:15 +0200
Subject: [PATCH 2488/3449] neovim: Fix eval error

Not sure at all if this is the right thing to do. cc @edanaher
---
 pkgs/applications/editors/neovim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 6d5a37509fc5..3f2058af1336 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -53,7 +53,7 @@ let
   rubyWrapper = ''--suffix PATH : \"${rubyEnv}/bin\" '' +
                 ''--suffix GEM_HOME : \"${rubyEnv}/${rubyEnv.ruby.gemPath}\" '';
 
-  pluginPythonPackages = builtins.concatLists
+  pluginPythonPackages = if configure == null then [] else builtins.concatLists
     (map ({ pythonDependencies ? [], ...}: pythonDependencies)
          (vimUtils.requiredPlugins configure));
   pythonEnv = pythonPackages.python.buildEnv.override {
@@ -66,7 +66,7 @@ let
   };
   pythonWrapper = ''--cmd \"let g:python_host_prog='$out/bin/nvim-python'\" '';
 
-  pluginPython3Packages = builtins.concatLists
+  pluginPython3Packages = if configure == null then [] else builtins.concatLists
     (map ({ python3Dependencies ? [], ...}: python3Dependencies)
          (vimUtils.requiredPlugins configure));
   python3Env = python3Packages.python.buildEnv.override {

From d221e40fd7f3beb8295b628122cd7e59beb09505 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 19:11:55 +0100
Subject: [PATCH 2489/3449] Clean up after freecell-solver update

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7d7b4a09c1a5..2841cedcda25 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5179,7 +5179,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ TextGlob ];
     meta = {
-      license = stdenv.lib.licenses.unknown;
+      license = stdenv.lib.licenses.free; # Same as Perl
     };
   };
 
@@ -13236,7 +13236,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302";
     };
     buildInputs = [ ModuleBuild ];
-    propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ]  moreInputs;
+    propagatedBuildInputs = [ MROCompat Moose TestRun TestRunCmdLine ] ++ moreInputs;
     moreInputs = [ TestTrap ]; # Added because tests were failing without it
     doCheck=true;
     meta = {
@@ -13253,7 +13253,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a";
     };
     buildInputs = [ ModuleBuild ];
-    propagatedBuildInputs = [ TestRun TestRunCmdLine ]  moreInputs;
+    propagatedBuildInputs = [ TestRun TestRunCmdLine ] ++ moreInputs;
     moreInputs = [ TestTrap ]; # Added because tests were failing without it
     doCheck=true;
     meta = {

From cba956152f1cc8d9beab057c351c7a079038ca7c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 18 Mar 2017 20:03:39 +0200
Subject: [PATCH 2490/3449] perl-packages: Fix syntax error

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 2841cedcda25..14cb544ac77f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13241,7 +13241,7 @@ let self = _self // overrides; _self = with self; {
     doCheck=true;
     meta = {
       homepage = http://web-cpan.shlomifish.org/modules/Test-Run/;
-      description = "Make the file verdict ("ok", "NOT OK")";
+      description = "Make the file verdict ('ok', 'NOT OK')";
       license = stdenv.lib.licenses.mit;
     };
   };

From 1a47f967112b080bc3e73bb627829754aaaf524d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 19:41:23 +0100
Subject: [PATCH 2491/3449] Update default.nix

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

diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix
index b049a8ba65df..26e754317df0 100644
--- a/pkgs/development/libraries/libp11/default.nix
+++ b/pkgs/development/libraries/libp11/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/OpenSC/libp11;
-    license = "LGPL";
+    license = licenses.lgpl21Plus;
     description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier";
     platforms = platforms.all;
   };

From 112a91c2f77dd2312b581a22b14e578ab013cacf Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 12 Mar 2017 13:45:02 -0500
Subject: [PATCH 2492/3449] enginepkcs11: libp11 version 0.4.0 and above
 contain enginepkcs11

enginepkcs11: Removed from all-packages.nix
---
 .../libraries/enginepkcs11/default.nix        | 21 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 23 deletions(-)
 delete mode 100644 pkgs/development/libraries/enginepkcs11/default.nix

diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix
deleted file mode 100644
index ff40a110a33e..000000000000
--- a/pkgs/development/libraries/enginepkcs11/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl, libp11, pkgconfig, openssl}:
-
-stdenv.mkDerivation rec {
-  name = "engine_pkcs11-0.1.8";
-  
-  src = fetchurl {
-    urls = [
-      "http://www.opensc-project.org/files/engine_pkcs11/${name}.tar.gz"
-      "http://www.openadk.org/distfiles/${name}.tar.gz"
-    ];
-    sha256 = "1rd20rxy12rfx3kwwvk5sqvc1ll87z60rqak1ksfwbf4wx0pwzfy";
-  };
-  
-  buildInputs = [ libp11 pkgconfig openssl ];
-
-  meta = {
-    homepage = http://www.opensc-project.org/engine_pkcs11/;
-    license = stdenv.lib.licenses.bsdOriginal;
-    description = "Engine for OpenSSL to use smart cards in PKCS#11 format";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d30d2197ce9..b15e1bd75349 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7225,8 +7225,6 @@ with pkgs;
 
   enet = callPackage ../development/libraries/enet { };
 
-  enginepkcs11 = callPackage ../development/libraries/enginepkcs11 { };
-
   epoxy = callPackage ../development/libraries/epoxy {};
 
   esdl = callPackage ../development/libraries/esdl { };

From 2e91b2d585afdb3b076b3ad655579774f100bad5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 18 Mar 2017 21:04:07 +0200
Subject: [PATCH 2493/3449] default.nix: Provide correct instructions how to
 upgrade Nix

Supersedes #17631.
---
 default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 8171f4149d2f..a4896a9bbeec 100644
--- a/default.nix
+++ b/default.nix
@@ -2,7 +2,17 @@ let requiredVersion = import ./lib/minver.nix; in
 
 if ! builtins ? nixVersion || builtins.compareVersions requiredVersion builtins.nixVersion == 1 then
 
-  abort "This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade! See https://nixos.org/wiki/How_to_update_when_Nix_is_too_old_to_evaluate_Nixpkgs"
+  abort ''
+
+    This version of Nixpkgs requires Nix >= ${requiredVersion}, please upgrade:
+
+    - If you are running NixOS, use `nixos-rebuild' to upgrade your system.
+
+    - If you installed Nix using the install script (https://nixos.org/nix/install),
+      it is safe to upgrade by running it again:
+
+          curl https://nixos.org/nix/install | sh
+  ''
 
 else
 

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 2494/3449] 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 677c4a526ea4..55938ca016e6 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 62f1514e2315..2c47ec5127f9 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 06db15a6cd6a663969887fca3a74211a70a99893 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 20:30:47 +0100
Subject: [PATCH 2495/3449] Update default.nix

---
 pkgs/development/libraries/umockdev/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index e4c22c1af5d0..fdf882ce817e 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
    sed -i 's|+=|=|g' docs/reference/Makefile.am
    '';
 
-  preConfigure = ''
-    #  sed -i 's|gobject-2.0 >= 2.32.0 gio-2.0 >= 2.32.0 gio-unix-2.0 >= 2.32.0)|gobject-2.0 >= 2.32.0, gio-2.0 >= 2.32.0, gio-unix-2.0 >= 2.32.0)|g' configure
-    '';
-
   meta = with stdenv.lib; {
     description = "Mock hardware devices for creating unit tests";
     license = licenses.lgpl2;

From d992619de2247084b4f28237a324952080cc9bb6 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 18 Mar 2017 20:21:50 +0000
Subject: [PATCH 2496/3449] libfixposix: 30b75609 -> 0.4.1

---
 .../libraries/libfixposix/default.nix         | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix
index a0b03c4c0057..f56dc60771d6 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/pkgs/development/libraries/libfixposix/default.nix
@@ -1,28 +1,23 @@
-{ stdenv, fetchurl, fetchgit, autoreconfHook, libtool }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name="libfixposix-${version}";
-  version="git-${src.rev}";
+  version="0.4.1";
 
-  src = fetchgit {
-    url = "https://github.com/sionescu/libfixposix";
-    rev = "30b75609d858588ea00b427015940351896867e9";
-    sha256 = "17spjz9vbgqllzlkws2abvqi0a71smhi4vgq3913aw0kq206mfxz";
+  src = fetchFromGitHub {
+    owner = "sionescu";
+    repo = "libfixposix";
+    rev = "v${version}";
+    sha256 = "19wjb43mn16f4lin5a2dfi3ym2hy7kqibs0z631d205b16vxas15";
   };
 
-  buildInputs = [ autoreconfHook libtool ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   meta = with stdenv.lib; {
-    description = "A set of workarounds for places in POSIX that get implemented differently";
-    maintainers = with maintainers;
-    [
-      raskin
-    ];
+    homepage = https://github.com/sionescu/libfixposix;
+    description = "Thin wrapper over POSIX syscalls and some replacement functionality";
+    license = licenses.boost;
+    maintainers = with maintainers; [ orivej raskin ];
     platforms = platforms.linux;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://gitorious.org/libfixposix/libfixposix";
-    };
-  };
 }

From 333c8c77829753b9cf79b9f58951986428d51300 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 20:10:18 +0100
Subject: [PATCH 2497/3449] icu_57: drop

---
 pkgs/development/libraries/icu/57.nix | 64 ---------------------------
 pkgs/top-level/all-packages.nix       |  2 -
 2 files changed, 66 deletions(-)
 delete mode 100644 pkgs/development/libraries/icu/57.nix

diff --git a/pkgs/development/libraries/icu/57.nix b/pkgs/development/libraries/icu/57.nix
deleted file mode 100644
index fbd5f512aee7..000000000000
--- a/pkgs/development/libraries/icu/57.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames }:
-
-let
-  pname = "icu4c";
-  version = "57.1";
-in
-stdenv.mkDerivation ({
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-"
-      + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz";
-    sha256 = "10cmkqigxh9f73y7q3p991q6j8pph0mrydgj11w1x6wlcp5ng37z";
-  };
-
-  outputs = [ "out" "dev" ];
-  outputBin = "dev";
-
-  # FIXME: This fixes dylib references in the dylibs themselves, but
-  # not in the programs in $out/bin.
-  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
-
-  postUnpack = ''
-    sourceRoot=''${sourceRoot}/source
-    echo Source root reset to ''${sourceRoot}
-  '';
-
-  # This pre/postPatch shenanigans is to handle that the patches expect
-  # to be outside of `source`.
-  prePatch = ''
-    pushd ..
-  '';
-  postPatch = ''
-    popd
-  '';
-
-  patches = [
-  ];
-
-  preConfigure = ''
-    sed -i -e "s|/bin/sh|${stdenv.shell}|" configure
-  '';
-
-  configureFlags = "--disable-debug" +
-    stdenv.lib.optionalString (stdenv.isFreeBSD || stdenv.isDarwin) " --enable-rpath";
-
-  # remove dependency on bootstrap-tools in early stdenv build
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-    sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
-  '';
-
-  postFixup = ''moveToOutput lib/icu "$dev" '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "Unicode and globalization support library";
-    homepage = http://site.icu-project.org/;
-    maintainers = with maintainers; [ raskin urkud ];
-    platforms = platforms.all;
-  };
-} // (if stdenv.isArm then {
-  patches = [ ./0001-Disable-LDFLAGSICUDT-for-Linux.patch ];
-} else {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a41c338d8662..21f292dca768 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7841,8 +7841,6 @@ with pkgs;
   hyena = callPackage ../development/libraries/hyena { };
 
   icu = callPackage ../development/libraries/icu { };
-  # Needed for LibreOffice Still as of 5.2.6.2
-  icu_57 = callPackage ../development/libraries/icu/57.nix { };
 
   id3lib = callPackage ../development/libraries/id3lib { };
 

From 28eb6681316c477c12c7aecf634a6a2d7482cddc Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 21:27:12 +0100
Subject: [PATCH 2498/3449] libreoffice-fresh: 5.3.0.3 -> 5.3.1.2

---
 .../libreoffice/default-primary-src.nix       |  6 +++---
 .../office/libreoffice/default.nix            |  4 ++--
 .../office/libreoffice/libreoffice-srcs.nix   | 20 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index 919ab01f5f6e..245d2a5fce1a 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,8 +3,8 @@
 rec {
   major = "5";
   minor = "3";
-  patch = "0";
-  tweak = "3";
+  patch = "1";
+  tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0vjmc8id9krpy9n4f0yil8k782cdzwmk53lvszi7r32b3ig23f84";
+    sha256 = "1zsl0z0i8pw532x2lmwd64ms6igibkkjhwf01zmm2kpnr9ycsijp";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f583660c6232..59389a69e7c8 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1ld1zj2f0cbyr0fkibsiazyrb4qkshc9yqkfmq7b64hhp9zsa8a3";
+      sha256 = "1r386qkfmlq7p1zly4xl0s0shp1d3rq9hwm1403ap22qpgrcgqyb";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0zqs9g6hqjv5z0yzi0ag4ii158249c70ppqhg1v60haip40xan6z";
+      sha256 = "03n2lj6zhjg585zq9z458mj29dshni25p1v959a2z1xa3jzwfjfz";
     };
 
   };
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 375db389da99..8ac7bc2eda02 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -112,11 +112,11 @@
     md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt";
   }
   {
-    name = "curl-7.51.0.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz";
-    sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c";
-    md5 = "490e19a8ccd1f4a244b50338a0eb9456";
-    md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz";
+    name = "curl-7.52.1.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz";
+    sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae";
+    md5 = "4e1ef056e117b4d25f4ec42ac609c0d4";
+    md5name = "4e1ef056e117b4d25f4ec42ac609c0d4-curl-7.52.1.tar.gz";
   }
   {
     name = "libe-book-0.1.2.tar.bz2";
@@ -294,11 +294,11 @@
     md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip";
   }
   {
-    name = "hunspell-1.4.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
-    sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb";
-    md5 = "33d370f7fe5a030985e445a5672b2067";
-    md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz";
+    name = "hunspell-1.6.0.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
+    sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2";
+    md5 = "047c3feb121261b76dc16cdb62f54483";
+    md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz";
   }
   {
     name = "hyphen-2.8.8.tar.gz";

From d016d4fea2f31701a4ebf07f31912b3b0e588f00 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 16:05:56 -0500
Subject: [PATCH 2499/3449] shout: 0.51.1 -> 0.53.0

---
 pkgs/applications/networking/irc/shout/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/shout/default.nix b/pkgs/applications/networking/irc/shout/default.nix
index 9d3e3ba449c3..bf041a8845a3 100644
--- a/pkgs/applications/networking/irc/shout/default.nix
+++ b/pkgs/applications/networking/irc/shout/default.nix
@@ -11,7 +11,7 @@ let
 
 in nodePackages.buildNodePackage rec {
   name = "shout-${version}";
-  version = "0.51.1";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "erming";

From f812e39fb46d1b4ec96391efc3a52e46bef4f6ef Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 7 Mar 2017 13:21:38 +0000
Subject: [PATCH 2500/3449] psi-plus: init at 0.16.575.639

---
 .../instant-messengers/psi-plus/default.nix   | 43 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/psi-plus/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
new file mode 100644
index 000000000000..281f86a5741a
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub
+, which, pkgconfig
+, qt4, libidn, qca2, libXScrnSaver, enchant
+}:
+
+stdenv.mkDerivation rec {
+  name = "psi-plus-${version}";
+  version = "0.16.575.639";
+
+  src = fetchFromGitHub {
+    owner = "psi-plus";
+    repo = "psi-plus-snapshots";
+    rev = "${version}";
+    sha256 = "0mn24y3y4qybw81rjy0hr46y7y96dvwdl6kk61kizwj32z1in8cg";
+  };
+
+  resources = fetchFromGitHub {
+    owner = "psi-plus";
+    repo = "resources";
+    rev = "8f5038380e1be884b04b5a1ad3cc3385e793f668";
+    sha256 = "1b8a2aixg966fzjwp9hz51rc31imyvpx014mp2fsm47k8na4470d";
+  };
+
+  postUnpack = ''
+    cp -a "${resources}/iconsets" "$sourceRoot"
+  '';
+
+  nativeBuildInputs = [ which pkgconfig ];
+
+  buildInputs = [ qt4 libidn qca2 libXScrnSaver enchant ];
+
+  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
+
+  NIX_LDFLAGS="-lqca";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "XMPP (Jabber) client";
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21f292dca768..46a72a0311be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15031,6 +15031,8 @@ with pkgs;
 
   psi = kde4.callPackage ../applications/networking/instant-messengers/psi { };
 
+  psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { };
+
   psol = callPackage ../development/libraries/psol/default.nix { };
 
   pstree = callPackage ../applications/misc/pstree { };

From 48bd3ae648688284d130448a252674a8b6ee27a7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 9 Mar 2017 01:33:32 +0000
Subject: [PATCH 2501/3449] psi-plus: switch to qt5

---
 .../instant-messengers/psi-plus/default.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 281f86a5741a..1693c4cdc555 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , which, pkgconfig
-, qt4, libidn, qca2, libXScrnSaver, enchant
+, qt5, libidn, qca2-qt5, libXScrnSaver, enchant
 }:
 
 stdenv.mkDerivation rec {
@@ -27,11 +27,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which pkgconfig ];
 
-  buildInputs = [ qt4 libidn qca2 libXScrnSaver enchant ];
-
-  NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
-
-  NIX_LDFLAGS="-lqca";
+  buildInputs = [
+    qt5.qtbase qt5.qtmultimedia qt5.qtx11extras
+    libidn qca2-qt5 libXScrnSaver enchant
+  ];
 
   enableParallelBuilding = true;
 

From cea6a24bfcfc4c35f993aaabad980e32023e0166 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 9 Mar 2017 02:17:40 +0000
Subject: [PATCH 2502/3449] psi-plus: enable plugins

---
 .../instant-messengers/psi-plus/default.nix     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index 1693c4cdc555..c4d13ac7643d 100644
--- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub
-, which, pkgconfig
-, qt5, libidn, qca2-qt5, libXScrnSaver, enchant
+{ stdenv, fetchFromGitHub, cmake
+, qt5, libidn, qca2-qt5, libXScrnSaver, hunspell
+, libgcrypt, libotr, html-tidy, libgpgerror
 }:
 
 stdenv.mkDerivation rec {
@@ -25,11 +25,16 @@ stdenv.mkDerivation rec {
     cp -a "${resources}/iconsets" "$sourceRoot"
   '';
 
-  nativeBuildInputs = [ which pkgconfig ];
+  cmakeFlags = [
+    "-DENABLE_PLUGINS=ON"
+  ];
+
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [
-    qt5.qtbase qt5.qtmultimedia qt5.qtx11extras
-    libidn qca2-qt5 libXScrnSaver enchant
+    qt5.qtbase qt5.qtmultimedia qt5.qtx11extras qt5.qttools qt5.qtwebkit
+    libidn qca2-qt5 libXScrnSaver hunspell
+    libgcrypt libotr html-tidy libgpgerror
   ];
 
   enableParallelBuilding = true;

From f6bae24590fa35b06d3a19f3f48f407b0c592d74 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 16:27:12 -0500
Subject: [PATCH 2503/3449] pythonmagick: 0.9.14 -> 0.9.16

---
 pkgs/applications/graphics/PythonMagick/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index a8d0d490f8bb..332bb8794e71 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -1,20 +1,16 @@
 {stdenv, fetchurl, python, boost, pkgconfig, imagemagick}:
 
-let
-
-  version = "0.9.14";
-
-in
-
 stdenv.mkDerivation rec {
   name = "pythonmagick-${version}";
+  version = "0.9.16";
 
   src = fetchurl {
     url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz";
-    sha256 = "1flkdfi3c19wy2qcfzax1cqvmmri10rvmhc2y85gmagqvv01zz22";
+    sha256 = "0vkgpmrdz530nyvmjahpdrvcj7fd7hvsp15d485hq6103qycisv8";
   };
 
-  buildInputs = [python boost pkgconfig imagemagick];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [python boost imagemagick];
 
   meta = {
     homepage = http://www.imagemagick.org/script/api.php;

From 98b9b07a98414805241944a9c7b7087a813099f9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 16:38:41 -0500
Subject: [PATCH 2504/3449] alchemy: 007 -> 008

---
 pkgs/applications/graphics/alchemy/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix
index 263c411a8dbf..848f132060fe 100644
--- a/pkgs/applications/graphics/alchemy/default.nix
+++ b/pkgs/applications/graphics/alchemy/default.nix
@@ -1,12 +1,14 @@
 {stdenv, fetchurl, jre}:
 
-stdenv.mkDerivation {
-  name = "alchemy-007";
+stdenv.mkDerivation rec {
+  name = "alchemy-${version}";
+  version = "008";
+
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = http://al.chemy.org/files/Alchemy-007.tar.gz;
-    sha256 = "1pk00m4iajvv9jzv96in10czpcf7zc3d4nmd9biqagpsg28mr70b";
+    url = "http://al.chemy.org/files/Alchemy-${version}.tar.gz";
+    sha256 = "0449bvdccgx1jqnws1bckzs4nv2d230523qs0jx015gi81s1q7li";
   };
 
   installPhase = ''
@@ -20,7 +22,7 @@ stdenv.mkDerivation {
     chmod +x $out/bin/alchemy
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Drawing application";
     longDescription = ''
       Alchemy is an open drawing project aimed at exploring how we can sketch,
@@ -31,8 +33,8 @@ stdenv.mkDerivation {
       an expanded range of ideas and possibilities in a serendipitous way.
     '';
     homepage = http://al.chemy.org/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.marcweber ];
+    platforms = platforms.linux;
   };
 }

From 7dccfd49aa6f78b3c550564a0614605c5b35fcb3 Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Sat, 18 Mar 2017 15:21:01 -0400
Subject: [PATCH 2505/3449] iosevka: 1.4.2 -> 1.11.4

1.11.4 contains numerous improvements including ligatures and fixes to
font weights.

I switched "default.nix" from using `fetchFromGitHub` to simply pulling
down the release as a zip via `fetchurl`. This seems like the best
approach given that the repositoriy no longer contains font files and
the alternative would be to build them from scratch.
---
 pkgs/data/fonts/iosevka/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index cbd963e903df..c8ce86b818bc 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "iosevka-${version}";
-  version = "1.4.2";
+  version = "1.11.4";
 
-  src = fetchFromGitHub {
-    owner  = "be5invis";
-    repo   = "Iosevka";
-    rev    = "v${version}";
-    sha256 = "1h1lmvjpjk0238bhdhnv2c149s98qpbndc8rxzlk6bhmxcy6rwsk";
+  buildInputs = [ unzip ];
+
+  src = fetchurl {
+    url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/01-iosevka-${version}.zip";
+    sha256 = "0mn9pqkambsal5cvz8hzlwx7qvcdfch8g1iy7mqhgghzflfhsy8x";
   };
 
+  sourceRoot = ".";
+
   installPhase = ''
     fontdir=$out/share/fonts/iosevka
 

From 35e7df6bee6dc67889771b01b7fed08fa7204922 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 16:42:47 -0500
Subject: [PATCH 2506/3449] ahoviewer: 1.4.6 -> 1.4.8

---
 .../graphics/ahoviewer/default.nix            | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
index 2a78f509429e..dc974aed0571 100644
--- a/pkgs/applications/graphics/ahoviewer/default.nix
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -1,15 +1,20 @@
 { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, 
   gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip,
   librsvg, gst_all_1, autoreconfHook, makeWrapper }:
-stdenv.mkDerivation {
-  name = "ahoviewer-1.4.6";
+
+stdenv.mkDerivation rec {
+  name = "ahoviewer-${version}";
+  version = "1.4.8";
+
   src = fetchFromGitHub {
     owner = "ahodesuka";
     repo = "ahoviewer";
-    rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa";
-    sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb";
+    rev = version;
+    sha256 = "0fsak22hpi2r8zqysswdyngaf3n635qvclqh1p0g0wrkfza4dbc4";
   };
+
   enableParallelBuilding = true; 
+  
   nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
   buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2
                   libsecret curl unrar libzip librsvg 
@@ -18,18 +23,21 @@ stdenv.mkDerivation {
                   gst_all_1.gst-plugins-bad 
                   gst_all_1.gst-libav
                   gst_all_1.gst-plugins-base ];
+  
   postPatch = ''patchShebangs version.sh'';
+  
   postInstall = ''
     wrapProgram $out/bin/ahoviewer \
     --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
     --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     homepage = "https://github.com/ahodesuka/ahoviewer";
     description = "A GTK2 image viewer, manga reader, and booru browser";
-    maintainers = [ stdenv.lib.maintainers.skrzyp ];
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ];
+    maintainers = [ maintainers.skrzyp ];
+    license = licenses.mit;
+    platforms = platforms.allBut [ "darwin" "cygwin" ];
   };
 }
 

From b79c28495213ce8b8038d7b85ac5ba850b378dc6 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 18 Mar 2017 17:51:11 -0400
Subject: [PATCH 2507/3449] nixos: Use xkbDir consistently so it has an effect

---
 nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 +-
 nixos/modules/services/x11/desktop-managers/plasma5.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 38e24e9b709a..b02eaf861a0d 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -64,7 +64,7 @@ in
     security.wrappers.e_freqset.source = "${e.enlightenment.out}/bin/e_freqset";
 
     environment.etc = singleton
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+      { source = xcfg.xkbDir;
         target = "X11/xkb";
       };
 
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index bc6e728169b4..993002a57795 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -176,7 +176,7 @@ in
       environment.pathsToLink = [ "/share" ];
 
       environment.etc = singleton {
-        source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        source = xcfg.xkbDir;
         target = "X11/xkb";
       };
 

From 16fff5ebce23c0f275abbabfb21ff4270100f674 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 18 Mar 2017 23:09:07 +0100
Subject: [PATCH 2508/3449] pylibmc: init at 1.5.1; patch by @risicle

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

diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
new file mode 100644
index 000000000000..c91930292c2e
--- /dev/null
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -0,0 +1,21 @@
+{ buildPythonPackage, fetchurl, stdenv, libmemcached, zlib }:
+buildPythonPackage rec {
+  name = "pylibmc-${version}";
+  version = "1.5.1";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/p/pylibmc/${name}.tar.gz";
+    sha256 = "1mnd8lng9wmcihl7mxd940hy1dzzvzsb971qclrvmqf3b4c2dfpc";
+  };
+
+  buildInputs = [ libmemcached zlib ];
+
+  # requires an external memcached server running
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Quick and small memcached client for Python";
+    homepage = http://sendapatch.se/projects/pylibmc/;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84149b0de266..076858cb6c0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19021,6 +19021,8 @@ in {
     };
   };
 
+  pylibmc = callPackage ../development/python-modules/pylibmc {};
+
   pymetar = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pymetar";

From 4024c6354e306c5cff511b7d352c249feef0d3ef Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 18:30:57 -0500
Subject: [PATCH 2509/3449] fontmatrix: Changed URL & homepage; they no longer
 exist

---
 .../graphics/fontmatrix/default.nix           | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index fc30a3559105..ced6a5f7258a 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -1,10 +1,14 @@
-{ stdenv, fetchurl, cmake, qt4 }:
+{ stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "fontmatrix-0.6.0";
-  src = fetchurl {
-    url = "http://fontmatrix.be/archives/${name}-Source.tar.gz";
-    sha256 = "bcc5e929d95d2a0c9481d185144095c4e660255220a7ae6640298163ee77042c";
+  name = "fontmatrix-${version}";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "fontmatrix";
+    repo = "fontmatrix";
+    rev = "v${version}";
+    sha256 = "0aqndj1jhm6hjpwmj1qm92z2ljh7w78a5ff5ag47qywqha1ngn05";
   };
 
   buildInputs = [ qt4 ];
@@ -13,10 +17,10 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
-    homepage = http://fontmatrix.be/;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = http://github.com/fontmatrix/fontmatrix;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }

From 3dfd03b38288b7c272bc6090cc4f86d076d31cee Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 18:38:47 -0500
Subject: [PATCH 2510/3449] glabels: 3.2.1 -> 3.4.0

---
 .../applications/graphics/glabels/default.nix | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
index cf1ab1942e58..6dcf8223777a 100644
--- a/pkgs/applications/graphics/glabels/default.nix
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3
+{ stdenv, fetchurl, barcode, gnome3, autoreconfHook
 , gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book
 , intltool, itstool, makeWrapper, pkgconfig, which
 }:
 
 stdenv.mkDerivation rec {
   name = "glabels-${version}";
-  version = "3.2.1";
-  src = fetchFromGitHub {
-    owner = "jimevins";
-    repo = "glabels";
-    rev = "glabels-3_2_1";
-    sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg";
+  version = "3.4.0";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/GNOME/sources/glabels/3.4/glabels-3.4.0.tar.xz";
+    sha256 = "04345crf5yrhq6rlrymz630rxnm8yw41vx04hb6xn2nkjn9hf3nl";
   };
 
+  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
   buildInputs = [
-    autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools
+    barcode gtk3 gtk_doc gnome3.yelp_tools
     gnome3.gnome_common gnome3.gsettings_desktop_schemas
-    intltool itstool libxml2 librsvg libe-book libtool
-    makeWrapper pkgconfig 
+    itstool libxml2 librsvg libe-book libtool
+    
   ];
 
   preFixup = ''
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  preConfigure = "./autogen.sh";
-
   meta = {
     description = "Create labels and business cards";
     homepage = http://glabels.org/;

From 1ef5a381082aa2be7dea59f129ccd90dc5c0b3a7 Mon Sep 17 00:00:00 2001
From: neeasade <nathanisom27@gmail.com>
Date: Sat, 18 Mar 2017 18:20:01 -0500
Subject: [PATCH 2511/3449] xrq: init at unstable-2016-01-15

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

diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix
new file mode 100644
index 000000000000..c0c5616db79a
--- /dev/null
+++ b/pkgs/applications/misc/xrq/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, libX11}:
+
+stdenv.mkDerivation rec {
+  name = "xrq-unstable-2016-01-15";
+
+  src = fetchFromGitHub {
+	  owner = "arianon";
+	  repo = "xrq";
+    rev = "d5dc19c63881ebdd1287a02968e3a1447dde14a9";
+    sha256 = "1bxf6h3fjw3kjraz7028m7p229l423y1ngy88lqvf0xl1g3dhp36";
+  };
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  outputs = [ "out" "doc" ];
+
+  buildInputs = [ libX11 ];
+
+  meta = {
+    description = "X utility for querying xrdb";
+    homepage = https://github.com/arianon/xrq;
+    license = stdenv.lib.licenses.mit;
+    platforms = with stdenv.lib.platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 648a232d010e..34ba3a7014ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18345,6 +18345,8 @@ with pkgs;
 
   xulrunner = firefox-unwrapped;
 
+  xrq = callPackage ../applications/misc/xrq { };
+
   nitrokey-app = callPackage ../tools/security/nitrokey-app { };
 
   fpm2 = callPackage ../tools/security/fpm2 { };

From 203e8fa205770fc6bbb9cb48d45e281d9f628710 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Mar 2017 01:08:11 +0100
Subject: [PATCH 2512/3449] wtftw: init at 0.0pre20161001; patch mostly by
 @kcomplexes

---
 .../window-managers/wtftw/default.nix         | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/window-managers/wtftw/default.nix

diff --git a/pkgs/applications/window-managers/wtftw/default.nix b/pkgs/applications/window-managers/wtftw/default.nix
new file mode 100644
index 000000000000..0ff3367e3aee
--- /dev/null
+++ b/pkgs/applications/window-managers/wtftw/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, rustPlatform, cargo, libXinerama, libX11, xlibs, pkgconfig }:
+
+rustPlatform.buildRustPackage rec {
+  name = "wtftw-0.0pre20161001";
+  src = fetchFromGitHub {
+    owner = "kintaro";
+    repo = "wtftw";
+    rev = "b72a1bd24430a614d953d6ecf61732805277cc0c";
+    sha256 = "1ajxkncqh4azyhmsdyk07r1kbhwv81vl1ix3w4iaz8cyln4gs0kp";
+  };
+
+  depsSha256 = "0z7h8ybh2db3xl8qxbzby5lncdaijixzmbn1j8a45lbky1xiix71";
+
+  buildInputs = [ libXinerama libX11 pkgconfig ];
+  libPath = stdenv.lib.makeLibraryPath [ libXinerama libX11 ];
+
+  preInstall = ''
+    cargo update
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/xsessions
+    cp -p target/release/wtftw $out/bin/
+    echo "[Desktop Entry]
+      Name=wtftw
+      Exec=/bin/wtftw
+      Type=XSession
+      DesktopName=wtftw" > $out/share/xsessions/wtftw.desktop
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tiling window manager in Rust";
+    homepage = https://github.com/Kintaro/wtftw;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 648a232d010e..bd6f62c54884 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16030,6 +16030,8 @@ with pkgs;
       );
   };
 
+  wtftw = callPackage ../applications/window-managers/wtftw {};
+
   wxhexeditor = callPackage ../applications/editors/wxhexeditor { };
 
   wxcam = callPackage ../applications/video/wxcam {

From 7364b6c2524ba70edbacc5525b5e2f612a8fba1a Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 19:09:17 -0500
Subject: [PATCH 2513/3449] jpegoptim: 1.4.3 -> 1.4.4

---
 pkgs/applications/graphics/jpegoptim/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
index 5bb577011e71..b7063a0c4e7f 100644
--- a/pkgs/applications/graphics/jpegoptim/default.nix
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.3";
+  version = "1.4.4";
   name = "jpegoptim-${version}";
 
   src = fetchurl {
     url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz";
-    sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93";
+    sha256 = "1cn1i0g1xjdwa12w0ifbnzgb1vqbpr8ji6h05vxksj79vyi3x849";
   };
 
   # There are no checks, it seems.
@@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libjpeg ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Optimize JPEG files";
     homepage = http://www.kokkonen.net/tjko/projects.html ;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.aristid ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.aristid ];
+    platforms = platforms.all;
   };
 }

From 7b1e1f3cd79e46ae83819a0d1324524be17c89d9 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 19:32:30 -0500
Subject: [PATCH 2514/3449] leocad: 0.81 -> 17.02

---
 pkgs/applications/graphics/leocad/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 96384765bd03..0de170a1cacb 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -3,24 +3,26 @@ To use aditional parts libraries
 set the variable LEOCAD_LIB=/path/to/libs/ or use option -l /path/to/libs/
 */
 
-{ stdenv, fetchsvn, qt4, qmake4Hook, zlib }:
+{ stdenv, fetchFromGitHub, qt4, qmake4Hook, zlib }:
 
 stdenv.mkDerivation rec {
   name = "leocad-${version}";
-  version = "0.81";
+  version = "17.02";
 
-  src = fetchsvn {
-    url = "http://svn.leocad.org/tags/${name}";
-    sha256 = "1190gb437ls51hhfiwa79fq131026kywpy3j3k4fkdgfr8a9v3q8";
+  src = fetchFromGitHub {
+    owner = "leozide";
+    repo = "leocad";
+    rev = "v${version}";
+    sha256 = "0d7l2il6r4swnmrmaf1bsrgpjgai5xwhwk2mkpcsddnk59790mmc";
   };
 
-  buildInputs = [ qt4 qmake4Hook zlib ];
-
+  nativeBuildInputs = [ qmake4Hook ];
+  buildInputs = [ qt4 zlib ];
   postPatch = ''
     sed '1i#include <cmath>' -i common/camera.cpp
     substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan("
     export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
-  '';
+   '';
 
   meta = with stdenv.lib; {
     description = "CAD program for creating virtual LEGO models";

From f5d6dd6e83a73392bb4ff4509a8a84e0bf240002 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 20:22:54 -0500
Subject: [PATCH 2515/3449] openimageio: 1.6.11 -> 1.7.12

---
 .../graphics/openimageio/default.nix             | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index d16800dc881d..44faeea007d6 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, boost, cmake, ilmbase, libjpeg, libpng, libtiff
+{ stdenv, fetchFromGitHub, boost, cmake, ilmbase, libjpeg, libpng, libtiff
 , opencolorio, openexr, unzip
 }:
 
 stdenv.mkDerivation rec {
   name = "openimageio-${version}";
-  version = "1.6.11";
+  version = "1.7.12";
 
-  src = fetchurl {
-    url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x";
+  src = fetchFromGitHub {
+    owner = "OpenImageIO";
+    repo = "oiio";
+    rev = "Release-${version}";
+    sha256 = "1ganx4f7zis5lkxxrwc83dbgngaxww2846bsc4vrg5dhjnns6n4y";
   };
 
   outputs = [ "bin" "out" "dev" "doc" ];
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr
+    boost ilmbase libjpeg libpng 
+    libtiff opencolorio openexr
     unzip
   ];
 

From 8f9e2c6e6bda21533f01c3dd5cad34b049e1cd1b Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sun, 19 Mar 2017 09:25:58 +0800
Subject: [PATCH 2516/3449] emem: 0.2.42 -> 0.2.43

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

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 57d3539d2719..0ac6f21b9fdb 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.42";
+  version = "0.2.43";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0zm3sqgbiaj44nkgkjiifxwwyrcjs42nry6zmbg3dnnpd0v82v8j";
+    sha256 = "0p3v28vjqyx961sfsd1h2cg2g2q0v03qd87dppbxqp7g5ppls91x";
   };
 
   phases = [ "buildPhase" "installPhase" ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     cp $src $out/share/java/${pname}.jar
 
-    cat > $out/bin/${pname} <<EOF
+    cat > $out/bin/${pname} << EOF
 #! $SHELL
 $jdk/bin/java -jar $out/share/java/${pname}.jar "\$@"
 EOF

From b9173e4e8cc9f15bec3a3588c7f16fc145cf0f4e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 18 Mar 2017 16:44:25 +0800
Subject: [PATCH 2517/3449] libbluray: 0.9.2 -> 1.0.0

---
 .../libraries/libbluray/default.nix           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index c5bf7fd7f982..8b67d52b875e 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -19,13 +19,15 @@ assert withFonts -> freetype != null;
 
 stdenv.mkDerivation rec {
   name = "libbluray-${version}";
-  version  = "0.9.2";
+  version  = "1.0.0";
 
   src = fetchurl {
     url = "http://get.videolan.org/libbluray/${version}/${name}.tar.bz2";
-    sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg";
+    sha256 = "1k3lag4lxi2jjd3zh4wcb5l3hadzm54j5kagh92yzfy76p9svqzp";
   };
 
+  patches = optional withJava ./BDJ-JARFILE-path.patch;
+
   nativeBuildInputs = [ pkgconfig autoreconfHook ]
                       ++ optionals withJava [ ant ]
                       ;
@@ -36,12 +38,15 @@ stdenv.mkDerivation rec {
                 ++ optional withFonts freetype
                 ;
 
-  propagatedBuildInputs = stdenv.lib.optional withAACS libaacs;
+  propagatedBuildInputs = optional withAACS libaacs;
+
+  NIX_LDFLAGS = [
+    (optionalString withAACS   "-L${libaacs}/lib -laacs")
+    (optionalString withBDplus "-L${libbdplus}/lib -lbdplus")
+  ];
 
   preConfigure = ''
     ${optionalString withJava ''export JDK_HOME="${jdk.home}"''}
-    ${optionalString withAACS ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libaacs}/lib -laacs"''}
-    ${optionalString withBDplus ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${libbdplus}/lib -lbdplus"''}
   '';
 
   configureFlags =  with stdenv.lib;
@@ -50,14 +55,11 @@ stdenv.mkDerivation rec {
                  ++ optional (! withFonts) "--without-freetype"
                  ;
 
-  # Fix search path for BDJ jarfile
-  patches = stdenv.lib.optional withJava ./BDJ-JARFILE-path.patch;
-
   meta = with stdenv.lib; {
-    homepage = "http://www.videolan.org/developers/libbluray.html";
+    homepage = http://www.videolan.org/developers/libbluray.html;
     description = "Library to access Blu-Ray disks for video playback";
     license = licenses.lgpl21;
-    maintainers = [ maintainers.abbradar ];
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
   };
 }

From f4f29bcd8b12308f6348dcb8cd452228d55a78b4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 18 Mar 2017 16:44:45 +0800
Subject: [PATCH 2518/3449] handbrake: 0.10.5 -> 1.0.3

---
 pkgs/applications/video/handbrake/default.nix | 94 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 50 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index b8a161649889..31d69536e522 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -8,64 +8,71 @@
 # making licenses more clear and reducing compile time/install size.
 #
 # Only tested on Linux
-#
-# TODO: package and use libappindicator
 
-{ stdenv, config, fetchurl,
-  python2, pkgconfig, yasm,
-  autoconf, automake, libtool, m4,
-  libass, libsamplerate, fribidi, libxml2, bzip2,
-  libogg, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
+{ stdenv, lib, fetchFromGitHub,
+  python2, pkgconfig, yasm, harfbuzz, zlib,
+  autoconf, automake, cmake, libtool, m4, jansson,
+  libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
+  libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec, fdk_aac,
   lame, ffmpeg, libdvdread, libdvdnav, libbluray,
   mp4v2, mpeg2dec, x264, x265, libmkv,
   fontconfig, freetype, hicolor_icon_theme,
   glib, gtk3, intltool, libnotify,
   gst_all_1, dbus_glib, udev, libgudev, libvpx,
-  wrapGAppsHook,
-  useGtk ? true
+  useGtk ? true, wrapGAppsHook ? null, libappindicator-gtk3 ? null
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.10.5";
+  version = "1.0.3";
   name = "handbrake-${version}";
 
-  buildInputsX = stdenv.lib.optionals useGtk [
-    glib gtk3 intltool libnotify
-    gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev
-    libgudev
-    wrapGAppsHook
-  ];
-
-  nativeBuildInputs = [ python2 pkgconfig yasm autoconf automake libtool m4 ];
-  buildInputs = [
-    fribidi fontconfig freetype hicolor_icon_theme
-    libass libsamplerate libxml2 bzip2
-    libogg libtheora libvorbis libdvdcss a52dec libmkv fdk_aac
-    lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
-  ] ++ buildInputsX;
-
-  src = fetchurl {
-    url = "http://download.handbrake.fr/releases/${version}/HandBrake-${version}.tar.bz2";
-    sha256 = "1w720y3bplkz187wgvy4a4xm0vpppg45mlni55l6yi8v2bfk14pv";
+  src = fetchFromGitHub {
+    owner  = "HandBrake";
+    repo   = "HandBrake";
+    rev    = "${version}";
+    sha256 = "1r8yzs0xih03p5ybx5096zkvlwxhcmg34047awmda1wq3z3rdjh5";
   };
 
+  nativeBuildInputs = [
+    cmake python2 pkgconfig yasm autoconf automake libtool m4
+  ] ++ (lib.optionals useGtk [
+    intltool wrapGAppsHook
+  ]);
+
+  buildInputs = [
+    fribidi fontconfig freetype jansson zlib
+    libass libiconv libsamplerate libxml2 bzip2
+    libogg libopus libtheora libvorbis libdvdcss a52dec libmkv fdk_aac
+    lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
+  ] ++ (lib.optionals useGtk [
+    glib gtk3 libappindicator-gtk3 libnotify
+    gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus_glib udev
+    libgudev
+  ]);
+
+  dontUseCmakeConfigure = true;
+
   preConfigure = ''
-    # Fake wget to prevent downloads
-    mkdir wget
-    echo "#!/bin/sh" > wget/wget
-    echo "echo ===== Not fetching \$*" >> wget/wget
-    echo "exit 1" >> wget/wget
-    chmod +x wget/wget
-    export PATH=$PATH:$PWD/wget
+    patchShebangs scripts
+
+    echo 'TAG=${version}' > version.txt
+
+    # `configure` errors out when trying to read the current year which is too low
+    substituteInPlace make/configure.py \
+      --replace developer release \
+      --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""'
+
+    substituteInPlace libhb/module.defs \
+      --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
 
     # Force using nixpkgs dependencies
     sed -i '/MODULES += contrib/d' make/include/main.defs
     sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules
-
-    patch -p1 -R < ${./handbrake-0.10.3-nolibav.patch}
   '';
 
   configureFlags = [
+    "--disable-df-fetch"
+    "--disable-df-verify"
     "--enable-fdk-aac"
     (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
   ];
@@ -74,21 +81,16 @@ stdenv.mkDerivation rec {
     cd build
   '';
 
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ x265 ];
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}")
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://handbrake.fr/;
     description = "A tool for ripping DVDs into video files";
     longDescription = ''
       Handbrake is a versatile transcoding DVD ripper. This package
       provides the cli HandbrakeCLI and the GTK+ version ghb.
     '';
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.wmertens ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ wmertens ];
     # Not tested on anything else
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd6f62c54884..316563071d03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14397,7 +14397,8 @@ with pkgs;
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 
   handbrake = callPackage ../applications/video/handbrake {
-    ffmpeg = ffmpeg_2;
+    # TODO: remove when 3.2 becomes default
+    ffmpeg = ffmpeg_3_2;
   };
 
   lilyterm = callPackage ../applications/misc/lilyterm {

From b29bc8d41c2b2e4013fe7528cc8db9ee38847d8c Mon Sep 17 00:00:00 2001
From: Michael Walker <mike@barrucadu.co.uk>
Date: Sun, 19 Mar 2017 01:52:06 +0000
Subject: [PATCH 2519/3449] vsftpd: Expose the no_anon_password flag.

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

diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix
index deff645d9bfd..6b3d658bd852 100644
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@@ -37,6 +37,9 @@ let
     (yesNoOption "anonymousUser" "anonymous_enable" false ''
       Whether to enable the anonymous FTP user.
     '')
+    (yesNoOption "anonymousUserNoPassword" "no_anon_password" false ''
+      Whether to disable the password for the anonymous FTP user.
+    '')
     (yesNoOption "localUsers" "local_enable" false ''
       Whether to enable FTP for local users.
     '')

From 9eed726b4fecdd6ea9a19260b8237e441bf4850b Mon Sep 17 00:00:00 2001
From: neeasade <nathanisom27@gmail.com>
Date: Sat, 18 Mar 2017 20:59:09 -0500
Subject: [PATCH 2520/3449] colort: init at unstable-2017-03-13

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

diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix
new file mode 100644
index 000000000000..1c2da306902e
--- /dev/null
+++ b/pkgs/applications/misc/colort/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "colort-unstable-2017-03-12";
+
+  src = fetchFromGitHub {
+    owner = "neeasade";
+    repo = "colort";
+    rev = "8470190706f358dc807b4c26ec3453db7f0306b6";
+    sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw";
+  };
+
+ installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = {
+    description = "A program for 'tinting' color values";
+    homepage = https://github.com/neeasade/colort;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 648a232d010e..5b3ff985a806 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17693,6 +17693,8 @@ with pkgs;
 
   crashplan = callPackage ../applications/backup/crashplan { };
 
+  colort = callPackage ../applications/misc/colort { };
+
   e17gtk = callPackage ../misc/themes/e17gtk { };
 
   epson-escpr = callPackage ../misc/drivers/epson-escpr { };

From afcea0c27ac34d07da2c5d6350258b5831276ea8 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sat, 18 Mar 2017 23:08:14 -0300
Subject: [PATCH 2521/3449] windowmaker: 0.95.7 -> 0.95.8

---
 pkgs/applications/window-managers/windowmaker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix
index a8b5be83234e..d83c4493accb 100644
--- a/pkgs/applications/window-managers/windowmaker/default.nix
+++ b/pkgs/applications/window-managers/windowmaker/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "windowmaker-${version}";
-  version = "0.95.7";
+  version = "0.95.8";
   srcName = "WindowMaker-${version}";
 
   src = fetchurl {
     url = "http://windowmaker.org/pub/source/release/${srcName}.tar.gz";
-    sha256 = "1acph0nq6fsb452sl7j7a7kcc87zqqaw7qms1p8ijar19dn4hbc4";
+    sha256 = "12p8kljqgx5hnic0zvs5mxwp7kg21sb6qjagb2qw8ydvf5amrgwx";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
       contributions being made by programmers from around the world.
     '';
     license = licenses.gpl2Plus;
-    maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.linux;
+    maintainers = [ maintainers.AndersonTorres ];
   };
 }
 

From 78a0bdfa98f2931d887f918f12848aed70efcddf Mon Sep 17 00:00:00 2001
From: neeasade <nathanisom27@gmail.com>
Date: Sat, 18 Mar 2017 17:34:47 -0500
Subject: [PATCH 2522/3449] meh: init at unstable-2015-04-11

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

diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix
new file mode 100644
index 000000000000..1b5fbc2271b5
--- /dev/null
+++ b/pkgs/applications/graphics/meh/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }:
+
+stdenv.mkDerivation rec {
+  name = "meh-unstable-2015-04-11";
+
+  src = fetchFromGitHub {
+    owner = "jhawthorn";
+    repo = "meh";
+    rev = "4ab1c75f97cb70543db388b3ed99bcfb7e94c758";
+    sha256 = "1j1n3m9hjhz4faryai97jq7cr6a322cqrd878gpkm9nrikap3bkk";
+  };
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  outputs = [ "out" "doc" ];
+
+  buildInputs = [ libXext libX11 libjpeg libpng giflib ];
+
+  meta = {
+    description = "A minimal image viewer using raw XLib";
+    homepage = http://www.johnhawthorn.com/meh/;
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 648a232d010e..894d8d587436 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14496,6 +14496,8 @@ with pkgs;
 
   mimms = callPackage ../applications/audio/mimms {};
 
+  meh = callPackage ../applications/graphics/meh {};
+
   mirage = callPackage ../applications/graphics/mirage { };
 
   mixxx = callPackage ../applications/audio/mixxx {

From 56504fcb2c548fc672e8c966f6dc41927e6c62b4 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 21:11:39 -0500
Subject: [PATCH 2523/3449] potrace: 1.13 -> 1.14

---
 pkgs/applications/graphics/potrace/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix
index 3cc5fe6fdd28..82fa4d5ee95b 100644
--- a/pkgs/applications/graphics/potrace/default.nix
+++ b/pkgs/applications/graphics/potrace/default.nix
@@ -2,22 +2,22 @@
 
 stdenv.mkDerivation rec {
   name = "potrace-${version}";
-  version = "1.13";
+  version = "1.14";
 
   src = fetchurl {
     url = "http://potrace.sourceforge.net/download/${version}/potrace-${version}.tar.gz";
-    sha256 = "115p2vgyq7p2mf4nidk2x3aa341nvv2v8ml056vbji36df5l6lk2";
+    sha256 = "0znr9i0ljb818qiwm22zw63g11a4v08gc5xkh0wbdp6g259vcwnv";
   };
 
   configureFlags = [ "--with-libpotrace" ];
 
   buildInputs = [ zlib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://potrace.sourceforge.net/;
     description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.pSub ];
-    license = stdenv.lib.licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.pSub ];
+    license = licenses.gpl2;
   };
 }

From 237ac13370287007ee3ea77d73eb21f0dd6bfa2e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 21:20:23 -0500
Subject: [PATCH 2524/3449] pqiv: 0.12 -> 2.8.3

---
 pkgs/applications/graphics/pqiv/default.nix | 30 ++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 25c6fc36c6c9..2023d9486bd8 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -1,26 +1,26 @@
-{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } :
+{ stdenv, fetchFromGitHub, getopt, which, pkgconfig, gtk2 } :
 
 stdenv.mkDerivation (rec {
-  name = "pqiv-0.12";
+  name = "pqiv-${version}";
+  version = "2.8.3";
 
-  src = fetchurl {
-    url = "https://github.com/downloads/phillipberndt/pqiv/${name}.tbz";
-    sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e";
+  src = fetchFromGitHub {
+    owner = "phillipberndt";
+    repo = "pqiv";
+    rev = version;
+    sha256 = "0fhmqa1q1y5y0ivrgx9xv864zqvd5dk4fiqi4bgi1ybdfx7vv2fy";
   };
 
-  buildInputs = [ getopt which pkgconfig gtk2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ getopt which gtk2 ];
 
-  preConfigure=''
-    substituteInPlace configure --replace /bin/bash "$shell"
-    sed -i -e 's|$(tempfile -s.*)|temp.c|' -e 's|tempfile|mktemp|' configure
-  '';
+  prePatch = "patchShebangs .";
 
-  unpackCmd = ''
-    tar -xf ${src}
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Rewrite of qiv (quick image viewer)";
     homepage = http://www.pberndt.com/Programme/Linux/pqiv;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.ndowens ];
+    platforms = platforms.unix;
   };
 })

From d18f55269c3a0d83c0c34875b6047adb12e4b581 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Sun, 19 Mar 2017 05:27:17 +0300
Subject: [PATCH 2525/3449] nvidia-x11:  don't patch things if libsOnly
 requested

---
 pkgs/os-specific/linux/nvidia-x11/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix
index eb4d3ae224a0..4573766b78ba 100644
--- a/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix
@@ -43,7 +43,7 @@ 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 versionOlder version "375"
+    patches = if libsOnly || versionOlder version "375"
               then null
               else [ (fetchurl {
                       url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/kernel_4.10.patch?h=packages/nvidia;  sha256 = "0zhpx3baq2pca2pmz1af5cp2nzjxjx0j9w5xrdy204mnv3v2708z";

From d860a68fd0f203983a734094ef6eb78707c586c2 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Sun, 19 Mar 2017 05:28:02 +0300
Subject: [PATCH 2526/3449] nvidia-x11:  $bin can be empty

---
 pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 24a2e2cf06ff..99813d38236b 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -78,7 +78,7 @@ installPhase() {
     fi
 
     # All libs except GUI-only are installed now, so fixup them.
-    for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'`
+    for libname in `find "$out/lib/" -name '*.so.*'` `test -z "$bin" || find "$bin/lib/" -name '*.so.*'`
     do
       # I'm lazy to differentiate needed libs per-library, as the closure is the same.
       # Unfortunately --shrink-rpath would strip too much.

From 8a8b80d289da2cf23abc7edb1465ae008a1bb80f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 21:52:04 -0500
Subject: [PATCH 2527/3449] gthumb: 3.4.4 -> 3.5.1

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

diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix
index 8aa2cf8f9f13..93894d0c6cb8 100644
--- a/pkgs/applications/graphics/gthumb/default.nix
+++ b/pkgs/applications/graphics/gthumb/default.nix
@@ -6,12 +6,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "gthumb";
-  version = "${major}.4";
-  major = "3.4";
+  version = "${major}.1";
+  major = "3.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz";
-    sha256 = "154bdc8c1940209f1e3d9c60184efef45b0d24f5f7f7f59b819e9c08e19c2981";
+    sha256 = "1hxnjskrq57d5ycn2fyif7363n1bav931pkjvq1fr2r4yrj0d202";
   };
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

From ec85bdb6c664a0bfdc067eeafde7630b29a4a93d Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 22:39:18 -0500
Subject: [PATCH 2528/3449] rapcad: 0.9.5 -> 0.9.8

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

diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index 55c083ba71f3..118630e96088 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchgit, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
+{ stdenv, fetchFromGitHub, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
 , qtbase, qmakeHook, mesa_glu
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.5";
+  version = "0.9.8";
   name = "rapcad-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/GilesBathgate/RapCAD.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "1i5h4sw7mdbpdbssmbjccwgidndrsc606zz4wy9pjsg2wzrabw7x";
+  src = fetchFromGitHub {
+    owner = "gilesbathgate";
+    repo = "rapcad";
+    rev = "v${version}";
+    sha256 = "0a0sqf6h227zalh0jrz6jpm8iwji7q3i31plqk76i4qm9vsgrhir";
   };
 
-  buildInputs = [ qtbase qmakeHook cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
+  nativeBuildInputs = [ qmakeHook ];
+  buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
 
-  meta = {
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with stdenv.lib.maintainers; [raskin];
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    license = licenses.gpl3;
+    maintainers = [ maintainers.raskin ];
+    platforms = platforms.linux;
     description = ''Constructive solid geometry package'';
   };
 }

From 63bd364cf9bf8ce24a2b0057e9b89b1b58e4b725 Mon Sep 17 00:00:00 2001
From: Shane Pearlman <shanemikel1@gmail.com>
Date: Sat, 18 Mar 2017 21:44:55 -0700
Subject: [PATCH 2529/3449] htmldoc: add darwin support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I also added a long description and updated the homepage to point to
the author’s new github.io site.
---
 lib/maintainers.nix                        |  1 +
 pkgs/applications/misc/htmldoc/default.nix | 16 -----------
 pkgs/tools/typesetting/htmldoc/default.nix | 32 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  8 +++---
 4 files changed, 37 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/applications/misc/htmldoc/default.nix
 create mode 100644 pkgs/tools/typesetting/htmldoc/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e7b8ff7bf101..3264d7fcba27 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -453,6 +453,7 @@
   scolobb = "Sergiu Ivanov <sivanov@colimite.fr>";
   sepi = "Raffael Mancini <raffael@mancini.lu>";
   seppeljordan = "Sebastian Jordan <sebastian.jordan.mail@googlemail.com>";
+  shanemikel = "Shane Pearlman <shanemikel1@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/misc/htmldoc/default.nix b/pkgs/applications/misc/htmldoc/default.nix
deleted file mode 100644
index e8274418ae16..000000000000
--- a/pkgs/applications/misc/htmldoc/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, fltk, openssl, libpng, libjpeg }:
-stdenv.mkDerivation rec {
-  name = "htmldoc-1.8.27";
-  src = fetchurl {
-    url = http://ftp.easysw.com/pub/htmldoc/1.8.27/htmldoc-1.8.27-source.tar.bz2;
-    sha256 = "04wnxgx6fxdxwiy9vbawdibngwf55mi01hjrr5fkfs22fcix5zw9";
-  };
-  buildInputs = [ fltk openssl libpng libjpeg ];
-  meta = {
-    homepage = http://www.htmldoc.org/;
-    description = "Converts HTML files to indexed HTML, PS or PDF";
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
new file mode 100644
index 000000000000..74abb8e60c6a
--- /dev/null
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+
+, SystemConfiguration ? null, Foundation ? null
+}:
+
+assert stdenv.isDarwin -> SystemConfiguration != null
+                       && Foundation != null;
+
+stdenv.mkDerivation {
+  name = "htmldoc-1.8.29";
+  src = fetchurl {
+    url = "https://github.com/michaelrsweet/htmldoc/releases/download"
+        + "/release-1.8.29/htmldoc-1.8.29-source.tar.gz";
+    md5 = "14d32bd772e2bc6af7b9b2233724c3ec";
+  };
+  buildInputs =
+    stdenv.lib.ifEnable stdenv.isDarwin [SystemConfiguration Foundation];
+
+  meta = with stdenv.lib; {
+    description = "Converts HTML files to PostScript and PDF";
+    homepage    = https://michaelrsweet.github.io/htmldoc;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ viric shanemikel ];
+    platforms   = with platforms; linux ++ darwin;
+
+    longDescription = ''
+      HTMLDOC is a program that reads HTML source files or web pages and
+      generates corresponding HTML, PostScript, or PDF files with an optional
+      table of contents.
+    '';
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9686b1c62d64..1957b18cb8cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4356,6 +4356,10 @@ with pkgs;
 
   html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
 
+  htmldoc = callPackage ../tools/typesetting/htmldoc {
+    inherit (darwin.apple_sdk.frameworks) SystemConfiguration Foundation;
+  };
+
   rcm = callPackage ../tools/misc/rcm {};
 
   tftp-hpa = callPackage ../tools/networking/tftp-hpa {};
@@ -13902,10 +13906,6 @@ with pkgs;
 
   ht = callPackage ../applications/editors/ht { };
 
-  htmldoc = callPackage ../applications/misc/htmldoc {
-    fltk = fltk13;
-  };
-
   hugin = callPackage ../applications/graphics/hugin { };
 
   hugo = callPackage ../applications/misc/hugo { };

From 3cb1faebc71b6ab74f489a71e91c6c05ff4d9870 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 19 Mar 2017 04:58:21 +0000
Subject: [PATCH 2530/3449] jam: 2.5 -> 2.6

---
 .../tools/build-managers/jam/default.nix      | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index 18cbe7731c00..c0d152ee7a2f 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -1,29 +1,32 @@
-{stdenv, fetchurl, yacc}:
+{ stdenv, fetchurl, yacc }:
 
-let
-  bindir = if stdenv.system == "i686-linux" then "bin.linuxx86"
-    else if stdenv.system == "x86_64-linux" then "bin.linux"
-    else throw "Unsupported platform by now";
-in
+stdenv.mkDerivation rec {
+  name = "jam-2.6";
 
-stdenv.mkDerivation {
-  name = "jam-2.5";
   src = fetchurl {
-    url = ftp://ftp.perforce.com/jam/jam-2.5.tar;
-    sha256 = "04c6khd7gdkqkvx4h3nbz99lyz7waid4fd221hq5chcygyx1sj3i";
+    url = "https://swarm.workshop.perforce.com/projects/perforce_software-jam/download/main/${name}.tar";
+    sha256 = "0j4r7xcjz15ksnnpjw56qi99q4lpjmx097pkwwkl1hq3hqml1zhn";
   };
 
-  buildInputs = [ yacc ];
+  nativeBuildInputs = [ yacc ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ${bindir}/jam $out/bin
+  buildPhase = ''
+    make jam0
+    ./jam0 -j$NIX_BUILD_CORES -sBINDIR=$out/bin install
   '';
 
-  meta = {
-    homepage = http://public.perforce.com/wiki/Jam;
-    license = stdenv.lib.licenses.free;
+  installPhase = ''
+    mkdir -p $out/doc/jam
+    cp *.html $out/doc/jam
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://www.perforce.com/resources/documentation/jam;
+    license = licenses.free;
     description = "Just Another Make";
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.unix;
   };
 }

From 14d676dfcf74c7057350d94dc1841125a8043d83 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 19 Mar 2017 03:39:40 -0400
Subject: [PATCH 2531/3449] colort: PR tweaks

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

diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix
index 1c2da306902e..a9e7e57fc8df 100644
--- a/pkgs/applications/misc/colort/default.nix
+++ b/pkgs/applications/misc/colort/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "colort-unstable-2017-03-12";
 
   src = fetchFromGitHub {
@@ -10,14 +10,12 @@ stdenv.mkDerivation rec {
     sha256 = "10n8rbr2h6hz86hcx73f86pjbbfiaw2rvxsk0yfajnma7bpxgdxw";
   };
 
- installPhase = ''
-    make install PREFIX=$out
-  '';
+  makeFlags = ["PREFIX=$(out)"];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A program for 'tinting' color values";
     homepage = https://github.com/neeasade/colort;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.mit;
+    platforms = platforms.all;
   };
 }

From 48deda9f367b24a9ca122f13a9f6659ed2bfe75d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 19 Mar 2017 10:09:01 +0100
Subject: [PATCH 2532/3449] pythonPackages.pytest-django: fix hash patch
 setuptools_scm

Do the files change over time..?
---
 pkgs/development/python-modules/pytest-django/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 48a5c043841a..56fc72ebccee 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     # Unpin setuptools-scm
     (fetchpatch {
       url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
-      sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
+      sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws";
     })
   ];
 

From 36de745e1b705644d22b0d7f8fc60fdedb49d2d3 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 10:16:44 +0100
Subject: [PATCH 2533/3449] readPathsFromFile: fixup after #23851

The final newline would produce an empty string;
let's filter all empty lines as well.
---
 lib/strings.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index eb3c2971ad59..44b6f8780c84 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -479,7 +479,7 @@ rec {
       lines =
         builtins.map (lib.removeSuffix "\n")
         (lib.splitString "\n" (builtins.readFile file));
-      removeComments = lib.filter (line: !(lib.hasPrefix "#" line));
+      removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
       relativePaths = removeComments lines;
       absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths;
     in

From 24308432b7bb851f4a5094197eb7db99419094ed Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sun, 19 Mar 2017 05:16:22 -0400
Subject: [PATCH 2534/3449] yubikey-manager: init at 0.3.1

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

diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix
new file mode 100644
index 000000000000..820f193e5e25
--- /dev/null
+++ b/pkgs/tools/misc/yubikey-manager/default.nix
@@ -0,0 +1,42 @@
+{ pythonPackages, fetchurl, lib,
+  yubikey-personalization, libu2f-host, libusb1 }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "yubikey-manager-0.3.1";
+
+  srcs = fetchurl {
+    url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz";
+    sha256 = "0vrhaqb8yc1qjq25k9dv8gmqxhbf6aa047i6dvz1lcraq6zwnq6g";
+  };
+
+  propagatedBuildInputs =
+    with pythonPackages;
+    lib.optional (!pythonPackages.pythonAtLeast "3.4") enum34 ++ [
+      click
+      cryptography
+      pyscard
+      pyusb
+      six
+    ] ++ [
+      libu2f-host
+      libusb1
+      yubikey-personalization
+    ];
+
+  makeWrapperArgs = [
+    "--prefix LD_LIBRARY_PATH : ${libu2f-host}/lib:${libusb1}/lib:${yubikey-personalization}/lib"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/etc/bash_completion.d
+    _YKMAN_COMPLETE=source $out/bin/ykman > $out/etc/bash_completion.d/ykman.sh ||true
+  '';
+
+  meta = with lib; {
+    homepage = https://developers.yubico.com/yubikey-manager;
+    description = "Command line tool for configuring any YubiKey over all USB transports.";
+    license = licenses.bsd2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ benley ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b26ef5cb553..4093a6701338 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10165,6 +10165,8 @@ with pkgs;
 
   yubico-piv-tool = callPackage ../tools/misc/yubico-piv-tool { };
 
+  yubikey-manager = callPackage ../tools/misc/yubikey-manager { };
+
   yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { };
 
   yubikey-personalization = callPackage ../tools/misc/yubikey-personalization {

From 705b2d9b66ec361b3f0a1a0c9e8d3050409f9bac Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 18 Mar 2017 18:10:44 -0500
Subject: [PATCH 2535/3449] feh: 2.18.1 -> 2.18.2

---
 pkgs/applications/graphics/feh/default.nix | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 5b385f2acbf1..3208f4273ff2 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -1,18 +1,22 @@
-{ stdenv, fetchurl, makeWrapper, xorg, imlib2, libjpeg, libpng
+{ stdenv, fetchurl, makeWrapper
+, xorg, imlib2, libjpeg, libpng
 , curl, libexif, perlPackages }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "feh-2.18.1";
+  name = "feh-${version}";
+  version = "2.18.2";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1ck55rhh5ax1d9k9gy2crvyjwffh6028f4kxaisd8ymgbql40f2c";
+    sha256 = "09f5rfzls4h5jcrp7ylwbiljp5qzc2nbw9p2csv0pnlaixj69gil";
   };
 
   outputs = [ "out" "doc" ];
 
   nativeBuildInputs = [ makeWrapper xorg.libXt ]
-    ++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
+    ++ optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ];
 
   buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ];
 
@@ -20,10 +24,12 @@ stdenv.mkDerivation rec {
     makeFlags="PREFIX=$out exif=1"
   '';
 
+  libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
+
   postInstall = ''
     wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
-                               --add-flags '--theme=feh'
-  '';
+                               --add-flags '--theme=feh' 
+    '';
 
   checkPhase = ''
     PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
@@ -33,8 +39,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A light-weight image viewer";
     homepage = https://derf.homelinux.org/projects/feh/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; unix;
+    license = licenses.mit;
+    maintainers = [ maintainers.viric ];
+    platforms = platforms.unix;
   };
 }

From 3ca0990da15ae8c9928b06d7e7f8bfb3a230981e 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 10:42:13 +0100
Subject: [PATCH 2536/3449] fetchsvn: fixup name guessing after #23851

I can't see any unfixed differences due to that PR,
at least in nix-env -qa output for the four Hydra platforms.
---
 pkgs/build-support/fetchsvn/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 05ed0505f81c..747052c1cb70 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -8,7 +8,9 @@ let
       fst = head;
       snd = l: head (tail l);
       trd = l: head (tail (tail l));
-      path_ = reverseList (splitString "/" url);
+      path_ =
+        (p: if head p == "" then tail p else p) # ~ drop final slash if any
+        (reverseList (splitString "/" url));
       path = [ (removeSuffix "/" (head path_)) ] ++ (tail path_);
     in
       # ../repo/trunk -> repo
@@ -31,7 +33,7 @@ stdenv.mkDerivation {
   outputHashAlgo = if sha256 == "" then "md5" else "sha256";
   outputHashMode = "recursive";
   outputHash = if sha256 == "" then md5 else sha256;
-  
+
   inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
 
   impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;

From 583e862d1131b6d431ad0b468f6afe672dfc0009 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 19 Mar 2017 11:02:06 +0100
Subject: [PATCH 2537/3449] qtbase-* nitpick: fix list nesting

Generalized from #24036, and leaving the authorship there.
---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.7/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index c4e7689efa29..ea04ca627284 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
-    ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
+    ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
   postPatch =
     ''
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 60a3896abafb..6f9ec5607122 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -39,7 +39,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.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
+    ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
   postPatch =
     ''
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 57b64bca1eab..4bf16004ce51 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -39,7 +39,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.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
+    ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
   postPatch =
     ''
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 a48c5dbb07a9..280d1f9c50b4 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
-    ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
+    ++ lib.optionals mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
   postPatch =
     ''

From d21c647ddb7258ba69476ba55b683f594758f877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 11:07:07 +0100
Subject: [PATCH 2538/3449] createrepo_c: fix build

(cc: @copumpkin)
---
 .../createrepo_c/default.nix                  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix
index ed46b2d302aa..c2fd1293b791 100644
--- a/pkgs/tools/package-management/createrepo_c/default.nix
+++ b/pkgs/tools/package-management/createrepo_c/default.nix
@@ -11,18 +11,21 @@ stdenv.mkDerivation rec {
     sha256 = "1sqzdkj9vigkvxsjlih1i0gylv53na2yic5if9w1s2sgxhqqz5zv";
   };
 
-  # FIXME: ugh, there has to be a better way to do this...
-  prePatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' \
-                "set (BASHCOMP_DIR "$out/share/bash-completion/completions")"
+  patches = [
+    ./fix-bash-completion-path.patch
+    ./fix-python-install-path.patch
+  ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace '@BASHCOMP_DIR@' "$out/share/bash-completion/completions"
     substituteInPlace src/python/CMakeLists.txt \
-      --replace 'EXECUTE_PROCESS(COMMAND ''${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python2_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)' \
-                "set (PYTHON_INSTALL_DIR "$out/${python2.sitePackages}")"
+      --replace "@PYTHON_INSTALL_PATH@" "$out/${python2.sitePackages}"
   '';
 
-  buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ bzip2 expat glib curl libxml2 python2 rpm openssl sqlite file xz pcre bash-completion ];
 
   meta = with stdenv.lib; {
     description = "C implementation of createrepo";

From 8565047bdd85a893d9bc840674d920eab90bbbfd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Mar 2017 12:16:21 +0100
Subject: [PATCH 2539/3449] kdiff3: fix build

---
 pkgs/tools/text/kdiff3/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index b53d619d837c..a35e09cfcda1 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -16,7 +16,11 @@ let
       inherit rev;
     };
 
-    preConfigure = "cd kdiff3";
+    setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
+
+    postPatch = ''
+      sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
+    '';
 
     nativeBuildInputs = [ extra-cmake-modules kdoctools ];
 

From 1b10483b5e217fd1725b90009a45c05443cba737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 13:31:13 +0100
Subject: [PATCH 2540/3449] htmldoc: use sha256 instead of md5

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

diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index 74abb8e60c6a..0cd1343dd4b5 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -6,12 +6,13 @@
 assert stdenv.isDarwin -> SystemConfiguration != null
                        && Foundation != null;
 
-stdenv.mkDerivation {
-  name = "htmldoc-1.8.29";
+stdenv.mkDerivation rec {
+  version = "1.8.29";
+  name = "htmldoc-${version}";
   src = fetchurl {
     url = "https://github.com/michaelrsweet/htmldoc/releases/download"
-        + "/release-1.8.29/htmldoc-1.8.29-source.tar.gz";
-    md5 = "14d32bd772e2bc6af7b9b2233724c3ec";
+      + "/release-${version}/htmldoc-${version}-source.tar.gz";
+    sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0";
   };
   buildInputs =
     stdenv.lib.ifEnable stdenv.isDarwin [SystemConfiguration Foundation];

From 474078ac05081076a28d389dafd26dcc7aff44b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Th=C3=B6rne?= <notrupertthorne@gmail.com>
Date: Sun, 19 Mar 2017 13:40:22 +0100
Subject: [PATCH 2541/3449] clog-cli: 0.9.2 -> 0.9.3

---
 pkgs/development/tools/clog-cli/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix
index 1d6ac8493f19..f64ead3e1078 100644
--- a/pkgs/development/tools/clog-cli/default.nix
+++ b/pkgs/development/tools/clog-cli/default.nix
@@ -4,16 +4,16 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "clog-cli-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "clog-tool";
     repo = "clog-cli";
-    rev = "${version}";
-    sha256 = "00sfbchyf50z6mb5dq1837hlrki88rrf043idy6qd1r90488jsbv";
+    rev = "v${version}";
+    sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
   };
 
-  depsSha256 = "0czv190r6xhbw33l0jhlri6rgspxb8f6dakcamh52qr3z9m0xs2x";
+  depsSha256 = "0gkg3bxx7nxsvff33n7pif731djfvlzk0msia27h0wq0mazq7kw3";
 
   meta = {
     description = "Generate changelogs from local git metadata";

From 64a880faa6c890ca11ed12b8b1aef4df8e5b1397 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 08:40:15 -0500
Subject: [PATCH 2542/3449] djview: 4.10.5 -> 4.10.6 (#24029)

---
 pkgs/applications/graphics/djview/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 2276b868b59a..2ce1ebb257dc 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, djvulibre, qt4, xorg, libtiff }:
+{ stdenv, fetchurl, pkgconfig
+, djvulibre, qt4, xorg, libtiff }:
 
-let
-  qt = qt4;
-  # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error
-in
 stdenv.mkDerivation rec {
-  name = "djview-4.10.5";
+  name = "djview-${version}";
+  version = "4.10.6";
+
   src = fetchurl {
     url = "mirror://sourceforge/djvu/${name}.tar.gz";
-    sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0";
+    sha256 = "08bwv8ppdzhryfcnifgzgdilb12jcnivl4ig6hd44f12d76z6il4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ djvulibre qt xorg.libXt libtiff ];
+  buildInputs = [ djvulibre qt4 xorg.libXt libtiff ];
 
   passthru = {
     mozillaPlugin = "/lib/netscape/plugins";
@@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://djvu.sourceforge.net/djview4.html;
     description = "A portable DjVu viewer and browser plugin";
     license = licenses.gpl2;
-    inherit (qt.meta) platforms;
+    platforms = platforms.unix;
     maintainers = [ maintainers.urkud ];
   };
 }

From 02126b69e5f5744cc677a0a025ccabb3b3ca865a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 19 Mar 2017 14:51:04 +0100
Subject: [PATCH 2543/3449] lib.readPathsFromFile: simplify, /cc #24036

This part isn't needed after 36de745e1b7.
---
 lib/strings.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 44b6f8780c84..ffa93c8e454a 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -476,9 +476,7 @@ rec {
   readPathsFromFile = rootPath: file:
     let
       root = toString rootPath;
-      lines =
-        builtins.map (lib.removeSuffix "\n")
-        (lib.splitString "\n" (builtins.readFile file));
+      lines = lib.splitString "\n" (builtins.readFile file);
       removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
       relativePaths = removeComments lines;
       absolutePaths = builtins.map (path: builtins.toPath (root + "/" + path)) relativePaths;

From b51093a75e979990c5869030c738a1afba49ae72 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 09:19:57 -0500
Subject: [PATCH 2544/3449] libevdev: 1.4.6 -> 1.5.6 (#23940)

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 3ff40141b164..fd7eef14b655 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.4.6";
+  name = "libevdev-1.5.6";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "1lrja526iyg48yw6i0dxdhyj63q9gwbgvj6xk1hskxzrqyhf2akv";
+    sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c";
   };
 
   buildInputs = [ python ];

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 2545/3449] 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 7fa35e1fcacb..6c1b868beba3 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 6d9ee3de5501..32e95c3c0491 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 57f09c975d9c..e35ad9e4b759 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 bf44e123711f..052655eed52c 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 bd0d64730a90c8447245e415a2d10982ca95ba35 Mon Sep 17 00:00:00 2001
From: Leandro Lisboa Penz <lpenz@lpenz.org>
Date: Sun, 19 Mar 2017 14:25:56 +0000
Subject: [PATCH 2546/3449] gnu global: set path of default gtags.conf in
 wrapper

GNU global's gtags and global tools were unable to find the default
gtags.conf, necessary to use gtagslabels. The error could be seen
when gtags was invoked with -v:
$ gtags -v --gtagslabel=pygments
[Sun Mar 19 14:13:17 UTC 2017] Gtags started.
 Using default configuration.
 GTAGSLABEL(--gtagslabel) ignored since configuration file not found.
 Using 'gtags.files' as a file list.
[Sun Mar 19 14:13:17 UTC 2017] Creating 'GTAGS' and 'GRTAGS'.
[Sun Mar 19 14:13:17 UTC 2017] Done.

The wrapper now points to the default gtags.conf using the
GTAGSCONF environment variable.
---
 pkgs/development/tools/misc/global/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index bd111c4ffbbd..62d96b2158f9 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -34,8 +34,10 @@ stdenv.mkDerivation rec {
     cp -v *.el "$out/share/emacs/site-lisp"
 
     wrapProgram $out/bin/gtags \
+      --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \
       --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
     wrapProgram $out/bin/global \
+      --prefix GTAGSCONF : "$out/share/gtags/gtags.conf" \
       --prefix PYTHONPATH : "$(toPythonPath ${pythonPackages.pygments})"
   '';
 

From 9c7b771a6e2cd72e2285d8402a7c15fd21a94347 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 19 Mar 2017 15:54:54 +0100
Subject: [PATCH 2547/3449] rapidsvn: fix build

---
 .../version-management/rapidsvn/default.nix   |  15 ++-
 .../rapidsvn/fix-build.patch                  | 122 ++++++++++++++++++
 2 files changed, 132 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/version-management/rapidsvn/fix-build.patch

diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 9397aa8a1e19..7b3c7aafa44e 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, wxGTK, subversion, apr, aprutil, python}:
+{ stdenv, fetchurl, fetchpatch, wxGTK, subversion, apr, aprutil, python }:
 
-stdenv.mkDerivation {
-  name = "rapidsvn-0.12.0-1";
+stdenv.mkDerivation rec {
+  name = "rapidsvn-${version}";
+  version = "0.12.1";
 
   src = fetchurl {
-    url = http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz;
-    sha256 = "1i3afjmx99ljw1bj54q47fs0g1q9dmxxvr4ciq7ncp5s52shszgg";
+    url = "http://www.rapidsvn.org/download/release/${version}/${name}.tar.gz";
+    sha256 = "1bmcqjc12k5w0z40k7fkk8iysqv4fw33i80gvcmbakby3d4d4i4p";
   };
 
   buildInputs = [ wxGTK subversion apr aprutil python ];
@@ -13,6 +14,10 @@ stdenv.mkDerivation {
   configureFlags = [ "--with-svn-include=${subversion.dev}/include"
     "--with-svn-lib=${subversion.out}/lib" ];
 
+  patches = [
+    ./fix-build.patch
+  ];
+
   meta = {
     description = "Multi-platform GUI front-end for the Subversion revision system";
     homepage = http://rapidsvn.tigris.org/;
diff --git a/pkgs/applications/version-management/rapidsvn/fix-build.patch b/pkgs/applications/version-management/rapidsvn/fix-build.patch
new file mode 100644
index 000000000000..ca4bc394c2c6
--- /dev/null
+++ b/pkgs/applications/version-management/rapidsvn/fix-build.patch
@@ -0,0 +1,122 @@
+--- a/src/svncpp/client_ls.cpp
++++ b/src/svncpp/client_ls.cpp
+@@ -25,6 +25,7 @@
+ #include "svn_client.h"
+ #include "svn_path.h"
+ #include "svn_sorts.h"
++#include "svn_version.h"
+ //#include "svn_utf.h"
+ 
+ // svncpp
+@@ -35,6 +36,7 @@
+ #include "m_is_empty.hpp"
+ 
+ 
++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
+ static int
+ compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
+ {
+@@ -84,6 +86,72 @@ namespace svn
+   }
+ }
+ 
++#else
++
++#include <algorithm>
++
++static svn_error_t* store_entry(
++        void *baton,
++        const char *path,
++        const svn_dirent_t *dirent,
++        const svn_lock_t *,
++        const char *abs_path,
++        const char *,
++        const char *,
++        apr_pool_t *scratch_pool)
++{
++  svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
++  if (path[0] == '\0') {
++    if (dirent->kind == svn_node_file) {
++      // for compatibility with svn_client_ls behaviour, listing a file
++      // stores that file name
++      entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
++    }
++  } else {
++    entries->push_back(svn::DirEntry(path, dirent));
++  }
++  return SVN_NO_ERROR;
++}
++
++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
++{
++  return svn_path_compare_paths(a.name(), b.name()) < 0;
++}
++
++namespace svn
++{
++  DirEntries
++  Client::list(const char * pathOrUrl,
++               svn_opt_revision_t * revision,
++               bool recurse) throw(ClientException)
++  {
++    Pool pool;
++    DirEntries entries;
++
++    svn_error_t * error =
++      svn_client_list3(pathOrUrl,
++                       revision,
++                       revision,
++                       SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
++                       SVN_DIRENT_ALL,
++                       FALSE, // fetch locks
++                       FALSE, // include externals
++                       &store_entry,
++                       &entries,
++                       *m_context,
++                       pool);
++
++    if (error != SVN_NO_ERROR)
++      throw ClientException(error);
++
++    std::sort(entries.begin(), entries.end(), &sort_by_path);
++
++    return entries;
++  }
++}
++
++#endif
++
+ /* -----------------------------------------------------------------
+  * local variables:
+  * eval: (load-file "../../rapidsvn-dev.el")
+--- a/src/svncpp/dirent.cpp	2017-03-19 15:48:58.956827337 +0100
++++ b/src/svncpp/dirent.cpp	2017-03-19 15:50:19.111527279 +0100
+@@ -47,7 +47,7 @@
+     {
+     }
+ 
+-    Data(const char * _name, svn_dirent_t * dirEntry)
++    Data(const char * _name, const svn_dirent_t * dirEntry)
+         : name(_name), kind(dirEntry->kind), size(dirEntry->size),
+         hasProps(dirEntry->has_props != 0),
+         createdRev(dirEntry->created_rev), time(dirEntry->time)
+@@ -78,7 +78,7 @@
+   {
+   }
+ 
+-  DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
++  DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
+       : m(new Data(name, DirEntry))
+   {
+   }
+--- a/include/svncpp/dirent.hpp	2017-03-19 15:50:54.860506116 +0100
++++ b/include/svncpp/dirent.hpp	2017-03-19 15:50:58.314407598 +0100
+@@ -41,7 +41,7 @@
+     /**
+      * constructor for existing @a svn_dirent_t entries
+      */
+-    DirEntry(const char * name, svn_dirent_t * dirEntry);
++    DirEntry(const char * name, const svn_dirent_t * dirEntry);
+ 
+     /**
+      * copy constructor

From a4c5fc068aa0bed04f1d17ba3630a0057c0b8499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 16:08:47 +0100
Subject: [PATCH 2548/3449] createrepo_c: add missing patches

---
 .../createrepo_c/fix-bash-completion-path.patch       | 11 +++++++++++
 .../createrepo_c/fix-python-install-path.patch        | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
 create mode 100644 pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch

diff --git a/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
new file mode 100644
index 000000000000..e184cc8facc0
--- /dev/null
+++ b/pkgs/tools/package-management/createrepo_c/fix-bash-completion-path.patch
@@ -0,0 +1,11 @@
+--- createrepo_c-0.10.0-src.orig/CMakeLists.txt	2017-03-19 11:01:02.703173617 +0100
++++ createrepo_c-0.10.0-src/CMakeLists.txt	2017-03-19 11:02:38.617448248 +0100
+@@ -100,7 +100,7 @@
+ 
+ pkg_check_modules(BASHCOMP bash-completion)
+ if (BASHCOMP_FOUND)
+-    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
++    SET(BASHCOMP_DIR "@BASHCOMP_DIR@")
+     message("Bash completion directory: ${BASHCOMP_DIR}")
+     INSTALL(FILES createrepo_c.bash DESTINATION ${BASHCOMP_DIR} RENAME createrepo_c)
+     INSTALL(CODE "
diff --git a/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
new file mode 100644
index 000000000000..a247c6d9fe47
--- /dev/null
+++ b/pkgs/tools/package-management/createrepo_c/fix-python-install-path.patch
@@ -0,0 +1,11 @@
+--- createrepo_c-0.10.0-src.orig/src/python/CMakeLists.txt	2017-03-19 10:50:33.796342953 +0100
++++ createrepo_c-0.10.0-src/src/python/CMakeLists.txt	2017-03-19 10:53:51.207580073 +0100
+@@ -19,7 +19,7 @@
+     FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
+ endif()
+ 
+-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@")
+ INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
+ 
+ MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")

From 3caba31f8e94da23d7038ed2918465a861a3d298 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 19 Mar 2017 15:09:02 +0000
Subject: [PATCH 2549/3449] libircclient: disable on darwin

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

diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix
index 14e41961e0a6..fef5e7278b81 100644
--- a/pkgs/development/libraries/libircclient/default.nix
+++ b/pkgs/development/libraries/libircclient/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     homepage    = http://www.ulduzsoft.com/libircclient/;
     license     = licenses.lgpl3;
     maintainers = with maintainers; [ obadz ];
-    platforms   = platforms.all;
+    platforms   = platforms.linux;
   };
 }

From 6a851cde94194abddf5d9ccfaa1b596e22fc8dd4 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 10:26:22 -0500
Subject: [PATCH 2550/3449] awesomewm: 4.0 -> 4.1

---
 .../window-managers/awesome/default.nix         | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 0a1256d67a48..8a088daec1ac 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
 , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
 , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
@@ -9,10 +9,13 @@
 
 with luaPackages; stdenv.mkDerivation rec {
   name = "awesome-${version}";
-  version = "4.0";
-  src = fetchurl {
-    url    = "http://github.com/awesomeWM/awesome-releases/raw/master/${name}.tar.xz";
-    sha256 = "0czkcz67sab63gf5m2p2pgg05yinjx60hfb9rfyzdkkg28q9f02w";
+  version = "4.1";
+  
+  src = fetchFromGitHub {
+    owner = "awesomewm";
+    repo = "awesome";
+    rev = "v${version}";
+    sha256 = "1qik8h5nwjq4535lpdpal85vas1k7am3s6l5r763kpdzxhfcyyaj";
   };
 
   nativeBuildInputs = [
@@ -22,8 +25,10 @@ with luaPackages; stdenv.mkDerivation rec {
     imagemagick
     makeWrapper
     pkgconfig
-    xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs
+    xmlto docbook_xml_dtd_45 
+    docbook_xsl findXMLCatalogs
   ];
+   
   propagatedUserEnvPkgs = [ hicolor_icon_theme ];
   buildInputs = [ cairo dbus gdk_pixbuf gobjectIntrospection
                   git lgi libpthreadstubs libstartup_notification

From 8e8302cc1f672fdf83ddc5a12a610550a354ebff Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 19 Mar 2017 11:56:59 -0400
Subject: [PATCH 2551/3449] rclone: 1.35 -> 1.36

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index adbadba411c9..93b4fc764674 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.35";
+  version = "1.36";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i";
+    sha256 = "1vx75ihg2j0chml8hwvngjkjw647cai9gicfy8ss6xsrm46w59b3";
   };
 
   meta = with stdenv.lib; {

From 9f21f4578c530b909b689d457d48e908b62f7d38 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 11:12:16 -0500
Subject: [PATCH 2552/3449] libevdev: Fix url

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index fd7eef14b655..a91acb230525 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libevdev-1.5.6";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
+    url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
     sha256 = "1256ypz93039n6km4macg158fpmjgylhmcmk20pnklxicsfpxv7c";
   };
 

From 6879d560cb1a20c15e9196c7b2df47ab4cad115b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 19 Mar 2017 12:13:36 -0400
Subject: [PATCH 2553/3449] linux: 4.10.3 -> 4.10.4

---
 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 13052bf89139..0311ea518c56 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.3";
+  version = "4.10.4";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1m18hlcimxj42lbg7mc9lh3hmmwpyk6y2c92xf0svmlfpzv6ah8r";
+    sha256 = "18cglngl42hcm0578hrsn962g2r1z9x6p5h9c6d3g0ac8siascqp";
   };
 
   kernelPatches = args.kernelPatches;

From bef5607e20f2568ca1bcfbd26caa65693c9bad36 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 19 Mar 2017 12:18:46 -0400
Subject: [PATCH 2554/3449] linux: 4.4.54 -> 4.4.55

---
 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 7a6060456033..dd6bba4567a8 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.54";
+  version = "4.4.55";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0h2b0zv7dfa8nica7cxf2ysiqdva0bb2pmhi0kz4gyhvp2cm3rjk";
+    sha256 = "14inh7ps6zkvkwifqgxnwj02a7907ighdj96dv66ydckwqcmyj4j";
   };
 
   kernelPatches = args.kernelPatches;

From b800655639b468fc0abe191de021b717245c060b Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Sat, 18 Mar 2017 20:20:24 -0700
Subject: [PATCH 2555/3449] emacs25Macport: fix for new macOS 10.10 frameworks.

See https://github.com/NixOS/nixpkgs/pull/23907#issuecomment-286627100.
---
 pkgs/applications/editors/emacs/macport.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 9169c12417ae..90812fb802c5 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     "--enable-mac-app=$$out/Applications"
   ];
 
-  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090 -DMAC_OS_X_VERSION_MIN_REQUIRED=1090";
+  CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
   LDFLAGS = "-O3 -L${ncurses.out}/lib";
 
   postInstall = ''

From b82f3f694388f23986a84240ea949c883155687f Mon Sep 17 00:00:00 2001
From: Nathan Isom <neeasade@users.noreply.github.com>
Date: Sun, 19 Mar 2017 12:17:52 -0500
Subject: [PATCH 2556/3449] mpvc: init at unstable-2017-03-18 (#24037)

* mpvc: init at unstable-2017-03-18

* mpvc: simplify build

* mpvc: add maintainer
---
 lib/maintainers.nix                     |  1 +
 pkgs/applications/misc/mpvc/default.nix | 29 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/misc/mpvc/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0c90d2cadd28..e8d6293ea97e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -344,6 +344,7 @@
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
   ndowens = "Nathan Owens <ndowens04@gmail.com>";
+  neeasade = "Nathan Isom <nathanisom27@gmail.com>";
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
   nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
   nhooyr = "Anmol Sethi <anmol@aubble.com>";
diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix
new file mode 100644
index 000000000000..fffa95952622
--- /dev/null
+++ b/pkgs/applications/misc/mpvc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, socat, fetchFromGitHub, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "mpvc-unstable-2017-03-18";
+
+  src = fetchFromGitHub {
+    owner = "wildefyr";
+    repo = "mpvc";
+    rev = "aea5c661455248cde7ac9ddba5f63cc790d26512";
+    sha256 = "0qiyvb3ck1wyd3izajwvlq4bwgsbq7x8ya3fgi5i0g2qr39a1qml";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    wrapProgram $out/bin/mpvc --prefix PATH : "${socat}/bin/"
+  '';
+
+  buildInputs = [ socat makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "A mpc-like control interface for mpv";
+    homepage = https://github.com/wildefyr/mpvc;
+    license = licenses.mit;
+    maintainers = [ maintainers.neeasade ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d8e6b2b987a..a5b1dcd757d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18322,6 +18322,8 @@ with pkgs;
 
   mg = callPackage ../applications/editors/mg { };
 
+  mpvc = callPackage ../applications/misc/mpvc { };
+
   aucdtect = callPackage ../tools/audio/aucdtect { };
 
   togglesg-download = callPackage ../tools/misc/togglesg-download { };

From 01f706b30b6016103401492bfa2c767cbc119650 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Sun, 19 Mar 2017 18:39:39 +0100
Subject: [PATCH 2557/3449] Geany: 1.30 -> 1.30.1

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

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 5a27a8efeb0e..85b7ccb0be6f 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
 
 let
-  version = "1.30";
+  version = "1.30.1";
 in
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.geany.org/${name}.tar.bz2";
-    sha256 = "b2dec920c77bc3e88d5f7b0f1dbe4f5200f36df3b346d1aba39323bc30afae6d";
+    sha256 = "0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

From 736ee614422a9333e71a844ead8f9d2504c58e95 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 12:41:36 -0500
Subject: [PATCH 2558/3449] dashpay: 0.12.055 -> 0.12.1.3 (#23761)

- fixed mistype
- Cosmetic change; camelCase
- removed gui option, causes build issue
- cmake flag issue fixed
---
 pkgs/applications/altcoins/dashpay.nix | 36 ++++++++++++++++----------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix
index ef42560ee9aa..ff0f2407cfec 100644
--- a/pkgs/applications/altcoins/dashpay.nix
+++ b/pkgs/applications/altcoins/dashpay.nix
@@ -1,25 +1,35 @@
-{ fetchzip, stdenv, pkgconfig, autoreconfHook
+{ fetchFromGitHub, stdenv, pkgconfig, autoreconfHook
 , openssl, db48, boost, zlib, miniupnpc
-, qt4, qrencode, glib, protobuf, yasm
-, utillinux }:
+, qrencode, glib, protobuf, yasm, libevent
+, utillinux
+, enable_Upnp ? false 
+, disable_Wallet ? false
+, disable_Daemon ? false }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
+  name = "dashpay-${version}";
+  version = "0.12.1.3";
 
-  name = "dashpay-${meta.version}";
-
-  src = fetchzip {
-    url = "https://github.com/dashpay/dash/archive/v${meta.version}.tar.gz";
-    sha256 = "19bk7cviy3n2dpj4kr3i6i0i3ac2l5ri8ln1a51nd3n90k016wnx";
+  src = fetchFromGitHub {
+    owner = "dashpay";
+    repo= "dash";
+    rev = "v${version}";
+    sha256 = "0h0fxhh30wy5vp06l1mkswhz565qs6j9y0dm84fmn28rdfvhv2aj";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm
-                  boost zlib miniupnpc protobuf qt4 qrencode utillinux ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ glib openssl db48 yasm boost zlib libevent 
+                  miniupnpc protobuf qrencode utillinux ];
+                  
 
-  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib --with-gui=no" ]
+                    ++ optional enable_Upnp "--enable-upnp-default"
+                    ++ optional disable_Wallet "--disable-wallet"
+                    ++ optional disable_Daemon "--disable-daemon"
+                    ;
 
-  meta = with stdenv.lib; {
-    version = "0.12.0.55";
+  meta = {
     description = "A decentralized key/value registration and transfer system";
     longDescription = ''
       Dash (DASH) is an open sourced, privacy-centric digital currency

From e8a395079a8d4cfee9c15e7687145a10abe7aaad Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 19 Mar 2017 18:42:12 +0100
Subject: [PATCH 2559/3449] opkg: 0.3.3 -> 0.3.4

---
 pkgs/tools/package-management/opkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index 9d99af2e59a5..3b636ab0e29b 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -2,11 +2,11 @@
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.3";
+  version = "0.3.4";
   name = "opkg-${version}";
   src = fetchurl {
     url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
-    sha256 = "03nhz0ralc3cqsrwyc310n8kbk2m9im0m2r2za8lqphs29rrxnqr";
+    sha256 = "1glkxjhsaaji172phd1gv8g0k0fs09pij6k01cl9namnac5r02vm";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 8afdae07b25afe6a7a70b1225f305a6519511f2c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 18 Mar 2017 23:44:34 +0100
Subject: [PATCH 2560/3449] nextcloud: 11.0.1 -> 11.0.2

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index d37b53398b6d..4bbff8b86ad2 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "11.0.1";
+  version = "11.0.2";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0aa6gzcbpjkk7ss3c1sg0scinhczvg4lgb59wv5jljliaks2n5h0";
+    sha256 = "0047kfl73720w7y2r7ivzj2gqg84rcfp98svq130nd0ziyfz27jx";
   };
 
   installPhase = ''

From 2baf0a568a142757feb58442525d8b1643da66d6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 19 Mar 2017 00:33:41 +0100
Subject: [PATCH 2561/3449] owncloud-client: build with qt5 instead of qt4

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

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 1323c3121214..ccd1b5cfeae4 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }:
+{ stdenv, fetchurl, cmake, qt5, pkgconfig, qtkeychain, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];
-  buildInputs = [ qt4 qtkeychain sqlite];
+  buildInputs = [ qt5.qtbase qt5.qtwebkit qtkeychain sqlite ];
 
   cmakeFlags = [
-  "-UCMAKE_INSTALL_LIBDIR"
+    "-UCMAKE_INSTALL_LIBDIR"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5b1dcd757d3..5c832dff9f28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3303,7 +3303,9 @@ with pkgs;
     owncloud90
     owncloud91;
 
-  owncloud-client = callPackage ../applications/networking/owncloud-client { };
+  owncloud-client = callPackage ../applications/networking/owncloud-client {
+    inherit (libsForQt5) qtkeychain;
+  };
 
   p2pvc = callPackage ../applications/video/p2pvc {};
 

From 64d9947c7644e8ff2dbed6b147f450a0dd8f3475 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Fri, 17 Mar 2017 16:44:16 -0500
Subject: [PATCH 2562/3449] cfitsio: 3.21 -> 3.41

cfitsio: Changed platforms to Linux, due to failing to build on Darwin

cfitsio: Fixed missing semicolon

cfitsio: Removed undefined variable
---
 pkgs/development/libraries/cfitsio/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index a3d1a46e818c..d49bd7eac1bc 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -1,24 +1,21 @@
 { fetchurl, stdenv }:
 
-stdenv.mkDerivation {
-  name = "cfitsio-3.21";
+ stdenv.mkDerivation {
+  name = "cfitsio-3.41";
 
   src = fetchurl {
-    url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz;
-    sha256 = "1ffr3p5dy2b1vj9j4li5zf22naavi9wcxsvqy236fc0ykfyip96i";
+    url = "ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3410.tar.gz";
+    sha256 = "0k3knn5hz1vhzzvm46xa1y6fnpliwkwgw76lnkf4amcnl5zaqmm5";
   };
 
   # Shared-only build
   buildFlags = "shared";
-  patchPhase =
-   '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
+  patchPhase = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
    '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://heasarc.gsfc.nasa.gov/fitsio/;
-
     description = "Library for reading and writing FITS data files";
-
     longDescription =
       '' CFITSIO is a library of C and Fortran subroutines for reading and
          writing data files in FITS (Flexible Image Transport System) data
@@ -28,9 +25,8 @@ stdenv.mkDerivation {
          advanced features for manipulating and filtering the information in
          FITS files.
       '';
-
     # Permissive BSD-style license.
     license = "permissive";
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.linux;
   };
 }

From 5498dd6364f102e1d5a15433f49c97447da45e65 Mon Sep 17 00:00:00 2001
From: Rahul Gopinath <rahul@gopinath.org>
Date: Sun, 19 Mar 2017 10:40:49 -0700
Subject: [PATCH 2563/3449] guile: 2.0 -> 2.2

---
 .../interpreters/guile/clang.patch            | 14 ---------
 .../interpreters/guile/default.nix            | 29 ++++++-------------
 .../guile/disable-gc-sensitive-tests.patch    | 25 ----------------
 .../{setup-hook-2.0.sh => setup-hook-2.2.sh}  |  6 ++--
 pkgs/top-level/all-packages.nix               |  4 +--
 5 files changed, 14 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/development/interpreters/guile/clang.patch
 delete mode 100644 pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
 rename pkgs/development/interpreters/guile/{setup-hook-2.0.sh => setup-hook-2.2.sh} (77%)

diff --git a/pkgs/development/interpreters/guile/clang.patch b/pkgs/development/interpreters/guile/clang.patch
deleted file mode 100644
index 4d0f342b211f..000000000000
--- a/pkgs/development/interpreters/guile/clang.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lib/stdint.in.h b/lib/stdint.in.h
-index 889bca7..15d39b0 100644
---- a/lib/stdint.in.h
-+++ b/lib/stdint.in.h
-@@ -74,7 +74,8 @@
-      in <inttypes.h> would reinclude us, skipping our contents because
-      _@GUARD_PREFIX@_STDINT_H is defined.
-      The include_next requires a split double-inclusion guard.  */
--# @INCLUDE_NEXT@ @NEXT_STDINT_H@
-+# include <inttypes.h>
-+// # @INCLUDE_NEXT@ @NEXT_STDINT_H@
- #endif
- 
- #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 04f31dda26a0..8a2deeddff60 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -7,11 +7,12 @@
  else stdenv.mkDerivation)
 
 (rec {
-  name = "guile-2.0.13";
+  name = "guile-${version}";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "mirror://gnu/guile/${name}.tar.xz";
-    sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
+    sha256 = "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1";
   };
 
   outputs = [ "out" "dev" "info" ];
@@ -32,12 +33,8 @@
 
   enableParallelBuilding = true;
 
-  patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
-    (fetchpatch {
-      # Fixes stability issues with 00-repl-server.test
-      url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
-      sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
-    })
+  patches = [
+    ./eai_system.patch
   ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
@@ -47,7 +44,7 @@
   # don't have "libgcc_s.so.1" on darwin
   LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
-  configureFlags = [ "--with-libreadline-prefix" ]
+  configureFlags = [ "--with-libreadline-prefix=${readline.dev}" ]
     ++ stdenv.lib.optionals stdenv.isSunOS [
       # Make sure the right <gmp.h> is found, and not the incompatible
       # /usr/include/mp.h from OpenSolaris.  See
@@ -56,7 +53,6 @@
       "--with-libgmp-prefix=${gmp.dev}"
 
       # Same for these (?).
-      "--with-libreadline-prefix=${readline.dev}"
       "--with-libunistring-prefix=${libunistring}"
 
       # See below.
@@ -69,7 +65,7 @@
     # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
     # why `--with-libunistring-prefix' and similar options coming from
     # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
+    sed -i "$out/lib/pkgconfig/guile-2.2.pc"    \
         -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
             s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
             s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
@@ -81,7 +77,7 @@
   # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
   doCheck = false;
 
-  setupHook = ./setup-hook-2.0.sh;
+  setupHook = ./setup-hook-2.2.sh;
 
   crossAttrs.preConfigure =
     stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
@@ -96,7 +92,7 @@
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
     license     = stdenv.lib.licenses.lgpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
+    maintainers = with stdenv.lib.maintainers; [ ludo lovek323 vrthra ];
     platforms   = stdenv.lib.platforms.all;
 
     longDescription = ''
@@ -111,10 +107,3 @@
   };
 })
 
-//
-
-(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
-  # Work around <http://bugs.gnu.org/14201>.
-  SHELL = "/bin/sh";
-  CONFIG_SHELL = "/bin/sh";
-})
diff --git a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
deleted file mode 100644
index 076091a702a2..000000000000
--- a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-This patch disable GC-sensitive tests.  This is particularly useful when
-compiling with `-O0' (as is done with coverage analysis) since there may
-be many false references held on the stack, leading to the failure of
-such tests.
-
---- a/test-suite/tests/gc.test
-+++ b/test-suite/tests/gc.test
-@@ -67,6 +67,7 @@
- 
- (with-test-prefix "gc"
-   (pass-if "Unused modules are removed"
-+    (throw 'unresolved)
-     (let* ((guard (make-guardian))
-            (total 1000))
-
---- a/test-suite/tests/threads.test
-+++ b/test-suite/tests/threads.test
-@@ -366,6 +366,7 @@
- 	    (not (mutex-owner m))))
- 
-         (pass-if "mutex with owner not retained (bug #27450)"
-+          (throw 'unresolved)
-           (let ((g (make-guardian)))
-             (g (let ((m (make-mutex))) (lock-mutex m) m))
- 
diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.2.sh
similarity index 77%
rename from pkgs/development/interpreters/guile/setup-hook-2.0.sh
rename to pkgs/development/interpreters/guile/setup-hook-2.2.sh
index fd1dc944ed44..86c1e0d3e4a9 100644
--- a/pkgs/development/interpreters/guile/setup-hook-2.0.sh
+++ b/pkgs/development/interpreters/guile/setup-hook-2.2.sh
@@ -1,8 +1,8 @@
 addGuileLibPath () {
-    if test -d "$1/share/guile/site/2.0"
+    if test -d "$1/share/guile/site/2.2"
     then
-        export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"
-        export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"
+        export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.2"
+        export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.2"
     elif test -d "$1/share/guile/site"
     then
         export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5b1dcd757d3..cdedfe71568c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5790,9 +5790,9 @@ with pkgs;
 
   guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
 
-  guile_2_0 = callPackage ../development/interpreters/guile { };
+  guile_2_2 = callPackage ../development/interpreters/guile { };
 
-  guile = guile_2_0;
+  guile = guile_2_2;
 
   hadoop = callPackage ../applications/networking/cluster/hadoop { };
 

From 9fae97b7199d2e9ef34e79ca6cae4e9ba9b7f92e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 13:02:08 -0500
Subject: [PATCH 2564/3449] Update default.nix

Cosmetic change
---
 pkgs/applications/editors/geany/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 85b7ccb0be6f..680542cfdfee 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
 
+with stdenv.lib;
+
 let
   version = "1.30.1";
 in
@@ -13,8 +15,9 @@ stdenv.mkDerivation rec {
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-
-  buildInputs = [ gtk2 which pkgconfig intltool file ];
+  
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 which intltool file ];
 
   doCheck = true;
 
@@ -47,9 +50,9 @@ stdenv.mkDerivation rec {
       - Simple project management
       - Plugin interface
     '';
-    homepage = "http://www.geany.org/";
+    homepage = http://www.geany.org/;
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.bbenoist ];
+    platforms = platforms.all;
   };
 }

From 6b71f32fb5985c9495c0164b4a5b9d272eb09a65 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 13:15:40 -0500
Subject: [PATCH 2565/3449] Move intltool to nativeBuildInputs

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

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 680542cfdfee..3649beb41c67 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
   
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 which intltool file ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ gtk2 which file ];
 
   doCheck = true;
 

From f66e06a828fb92581bd5e35024f23d406b9fa94b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 19:17:21 +0100
Subject: [PATCH 2566/3449] leocad: remove unnessary patches

---
 pkgs/applications/graphics/leocad/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 0de170a1cacb..5f27cb446994 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -19,10 +19,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ qmake4Hook ];
   buildInputs = [ qt4 zlib ];
   postPatch = ''
-    sed '1i#include <cmath>' -i common/camera.cpp
-    substituteInPlace common/camera.cpp --replace "isnan(" "std::isnan("
     export qmakeFlags="$qmakeFlags INSTALL_PREFIX=$out"
-   '';
+  '';
 
   meta = with stdenv.lib; {
     description = "CAD program for creating virtual LEGO models";

From 0cf93fda072ce44fe3a52420de8151b191ada680 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 19 Mar 2017 20:05:14 +0100
Subject: [PATCH 2567/3449] guile_2_0: init at 2.0.13

Reinstate guile 2.0.x. Use it for autogen
---
 pkgs/development/interpreters/guile/2.0.nix   | 120 ++++++++++++++++++
 .../interpreters/guile/clang.patch            |  14 ++
 .../guile/disable-gc-sensitive-tests.patch    |  25 ++++
 .../interpreters/guile/setup-hook-2.0.sh      |  13 ++
 pkgs/top-level/all-packages.nix               |   7 +-
 5 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/guile/2.0.nix
 create mode 100644 pkgs/development/interpreters/guile/clang.patch
 create mode 100644 pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
 create mode 100644 pkgs/development/interpreters/guile/setup-hook-2.0.sh

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
new file mode 100644
index 000000000000..04f31dda26a0
--- /dev/null
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -0,0 +1,120 @@
+{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
+, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null }:
+
+# Do either a coverage analysis build or a standard build.
+(if coverageAnalysis != null
+ then coverageAnalysis
+ else stdenv.mkDerivation)
+
+(rec {
+  name = "guile-2.0.13";
+
+  src = fetchurl {
+    url = "mirror://gnu/guile/${name}.tar.xz";
+    sha256 = "12yqkr974y91ylgw6jnmci2v90i90s7h9vxa4zk0sai8vjnz4i1p";
+  };
+
+  outputs = [ "out" "dev" "info" ];
+  setOutputFlags = false; # $dev gets into the library otherwise
+
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  buildInputs = [ readline libtool libunistring libffi ];
+  propagatedBuildInputs = [ gmp boehmgc ]
+
+    # XXX: These ones aren't normally needed here, but since
+    # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
+    # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
+    # see below.
+    ++ [ libtool libunistring ];
+
+  # A native Guile 2.0 is needed to cross-build Guile.
+  selfNativeBuildInput = true;
+
+  enableParallelBuilding = true;
+
+  patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
+    (fetchpatch {
+      # Fixes stability issues with 00-repl-server.test
+      url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
+      sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
+    })
+  ] ++
+    (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
+
+  # Explicitly link against libgcc_s, to work around the infamous
+  # "libgcc_s.so.1 must be installed for pthread_cancel to work".
+
+  # don't have "libgcc_s.so.1" on darwin
+  LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+
+  configureFlags = [ "--with-libreadline-prefix" ]
+    ++ stdenv.lib.optionals stdenv.isSunOS [
+      # Make sure the right <gmp.h> is found, and not the incompatible
+      # /usr/include/mp.h from OpenSolaris.  See
+      # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
+      # for details.
+      "--with-libgmp-prefix=${gmp.dev}"
+
+      # Same for these (?).
+      "--with-libreadline-prefix=${readline.dev}"
+      "--with-libunistring-prefix=${libunistring}"
+
+      # See below.
+      "--without-threads"
+    ];
+
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+
+    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+    # why `--with-libunistring-prefix' and similar options coming from
+    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+    sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
+        -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
+            s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
+            s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
+            s|includedir=$out|includedir=$dev|g
+            "
+  '';
+
+  # make check doesn't work on darwin
+  # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
+  doCheck = false;
+
+  setupHook = ./setup-hook-2.0.sh;
+
+  crossAttrs.preConfigure =
+    stdenv.lib.optionalString (stdenv.cross.config == "i586-pc-gnu")
+       # On GNU, libgc depends on libpthread, but the cross linker doesn't
+       # know where to find libpthread, which leads to erroneous test failures
+       # in `configure', where `-pthread' and `-lpthread' aren't explicitly
+       # passed.  So it needs some help (XXX).
+       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
+
+
+  meta = {
+    description = "Embeddable Scheme implementation";
+    homepage    = http://www.gnu.org/software/guile/;
+    license     = stdenv.lib.licenses.lgpl3Plus;
+    maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ];
+    platforms   = stdenv.lib.platforms.all;
+
+    longDescription = ''
+      GNU Guile is an implementation of the Scheme programming language, with
+      support for many SRFIs, packaged for use in a wide variety of
+      environments.  In addition to implementing the R5RS Scheme standard
+      and a large subset of R6RS, Guile includes a module system, full access
+      to POSIX system calls, networking support, multiple threads, dynamic
+      linking, a foreign function call interface, and powerful string
+      processing.
+    '';
+  };
+})
+
+//
+
+(stdenv.lib.optionalAttrs (!stdenv.isLinux) {
+  # Work around <http://bugs.gnu.org/14201>.
+  SHELL = "/bin/sh";
+  CONFIG_SHELL = "/bin/sh";
+})
diff --git a/pkgs/development/interpreters/guile/clang.patch b/pkgs/development/interpreters/guile/clang.patch
new file mode 100644
index 000000000000..4d0f342b211f
--- /dev/null
+++ b/pkgs/development/interpreters/guile/clang.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/stdint.in.h b/lib/stdint.in.h
+index 889bca7..15d39b0 100644
+--- a/lib/stdint.in.h
++++ b/lib/stdint.in.h
+@@ -74,7 +74,8 @@
+      in <inttypes.h> would reinclude us, skipping our contents because
+      _@GUARD_PREFIX@_STDINT_H is defined.
+      The include_next requires a split double-inclusion guard.  */
+-# @INCLUDE_NEXT@ @NEXT_STDINT_H@
++# include <inttypes.h>
++// # @INCLUDE_NEXT@ @NEXT_STDINT_H@
+ #endif
+ 
+ #if ! defined _@GUARD_PREFIX@_STDINT_H && ! defined _GL_JUST_INCLUDE_SYSTEM_STDINT_H
diff --git a/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
new file mode 100644
index 000000000000..076091a702a2
--- /dev/null
+++ b/pkgs/development/interpreters/guile/disable-gc-sensitive-tests.patch
@@ -0,0 +1,25 @@
+This patch disable GC-sensitive tests.  This is particularly useful when
+compiling with `-O0' (as is done with coverage analysis) since there may
+be many false references held on the stack, leading to the failure of
+such tests.
+
+--- a/test-suite/tests/gc.test
++++ b/test-suite/tests/gc.test
+@@ -67,6 +67,7 @@
+ 
+ (with-test-prefix "gc"
+   (pass-if "Unused modules are removed"
++    (throw 'unresolved)
+     (let* ((guard (make-guardian))
+            (total 1000))
+
+--- a/test-suite/tests/threads.test
++++ b/test-suite/tests/threads.test
+@@ -366,6 +366,7 @@
+ 	    (not (mutex-owner m))))
+ 
+         (pass-if "mutex with owner not retained (bug #27450)"
++          (throw 'unresolved)
+           (let ((g (make-guardian)))
+             (g (let ((m (make-mutex))) (lock-mutex m) m))
+ 
diff --git a/pkgs/development/interpreters/guile/setup-hook-2.0.sh b/pkgs/development/interpreters/guile/setup-hook-2.0.sh
new file mode 100644
index 000000000000..fd1dc944ed44
--- /dev/null
+++ b/pkgs/development/interpreters/guile/setup-hook-2.0.sh
@@ -0,0 +1,13 @@
+addGuileLibPath () {
+    if test -d "$1/share/guile/site/2.0"
+    then
+        export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site/2.0"
+        export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site/2.0"
+    elif test -d "$1/share/guile/site"
+    then
+        export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}${GUILE_LOAD_PATH:+:}$1/share/guile/site"
+        export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}${GUILE_LOAD_COMPILED_PATH:+:}$1/share/guile/site"
+    fi
+}
+
+envHooks+=(addGuileLibPath)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07384cf779cd..7347a0ea69ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -574,7 +574,9 @@ with pkgs;
 
   atftp = callPackage ../tools/networking/atftp { };
 
-  autogen = callPackage ../development/tools/misc/autogen { };
+  autogen = callPackage ../development/tools/misc/autogen {
+    guile = guile_2_0;
+  };
 
   autojump = callPackage ../tools/misc/autojump { };
 
@@ -5792,6 +5794,9 @@ with pkgs;
 
   guile_1_8 = callPackage ../development/interpreters/guile/1.8.nix { };
 
+  # Needed for autogen
+  guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
+
   guile_2_2 = callPackage ../development/interpreters/guile { };
 
   guile = guile_2_2;

From 5a81c669065f86eb657b60fd0f6513b8435170eb Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 19 Mar 2017 00:36:15 -0400
Subject: [PATCH 2568/3449] erlang: patch all versions to work with clang 4

---
 pkgs/development/interpreters/erlang/R16.nix  |  5 ++++
 .../interpreters/erlang/R16B02-8-basho.nix    | 27 +++++++++++--------
 pkgs/development/interpreters/erlang/R17.nix  |  7 ++++-
 pkgs/development/interpreters/erlang/R18.nix  |  7 ++++-
 pkgs/development/interpreters/erlang/R19.nix  |  3 +++
 5 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix
index ed30fe1522bf..e2e0151de371 100644
--- a/pkgs/development/interpreters/erlang/R16.nix
+++ b/pkgs/development/interpreters/erlang/R16.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
       ++ optional odbcSupport unixODBC
       ++ optionals stdenv.isDarwin [ Carbon Cocoa ];
 
+  # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
+  prePatch = ''
+    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
+  '';
+
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
   preConfigure = ''
diff --git a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
index 5745ea5d98b3..80f524019df0 100644
--- a/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
+++ b/pkgs/development/interpreters/erlang/R16B02-8-basho.nix
@@ -2,7 +2,7 @@
 , gnused, gawk, makeWrapper
 , odbcSupport ? false, unixODBC ? null
 , wxSupport ? false, mesa ? null, wxGTK ? null, xorg ? null
-, enableDebugInfo ? false 
+, enableDebugInfo ? false
 , Carbon ? null, Cocoa ? null }:
 
 assert wxSupport -> mesa != null && wxGTK != null && xorg != null;
@@ -24,11 +24,16 @@ stdenv.mkDerivation rec {
   debugInfo = enableDebugInfo;
 
   buildInputs =
-    [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc 
+    [ perl gnum4 ncurses openssl makeWrapper autoconf264 gcc
     ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ]
       ++ optional odbcSupport [ unixODBC ]
       ++ optionals stdenv.isDarwin [ Carbon Cocoa ];
 
+  # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
+  prePatch = ''
+    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
+  '';
+
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure.in erts/configure.in '';
 
   preConfigure = ''
@@ -36,22 +41,22 @@ stdenv.mkDerivation rec {
     export LANG=C
     export ERL_TOP=$(pwd)
     sed -e s@/bin/pwd@pwd@g -i otp_build
-    sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc 
+    sed -e s@"/usr/bin/env escript"@${erlang}/bin/escript@g -i lib/diameter/bin/diameterc
   '';
 
   configureFlags= [
     "--with-ssl=${openssl.dev}"
-    "--enable-smp-support" 
-    "--enable-threads" 
-    "--enable-kernel-poll" 
-    "--disable-hipe" 
-    "${optionalString odbcSupport "--with-odbc=${unixODBC}"}" 
-    "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}" 
+    "--enable-smp-support"
+    "--enable-threads"
+    "--enable-kernel-poll"
+    "--disable-hipe"
+    "${optionalString odbcSupport "--with-odbc=${unixODBC}"}"
+    "${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"
     "${optionalString stdenv.isLinux "--enable-m64-build"}"
   ];
 
   buildPhase = ''
-    ./otp_build autoconf 
+    ./otp_build autoconf
     ./otp_build setup -a --prefix=$out $configureFlags
   '';
 
@@ -89,7 +94,7 @@ stdenv.mkDerivation rec {
       telephony and instant messaging. Erlang's runtime system has
       built-in support for concurrency, distribution and fault
       tolerance.
-      This version of Erlang is Basho's version, forked from Ericsson's 
+      This version of Erlang is Basho's version, forked from Ericsson's
       repository.
     '';
 
diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index 57323a587f81..0869285d4965 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -35,7 +35,12 @@ stdenv.mkDerivation rec {
       ++ optional javacSupport openjdk
       ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 
-  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
+  patchPhase = ''
+    # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
+    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
+
+    sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure
+  '';
 
   debugInfo = enableDebugInfo;
 
diff --git a/pkgs/development/interpreters/erlang/R18.nix b/pkgs/development/interpreters/erlang/R18.nix
index f9b6edc3fa4b..1ed9bfbd70a2 100644
--- a/pkgs/development/interpreters/erlang/R18.nix
+++ b/pkgs/development/interpreters/erlang/R18.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchFromGitHub, perl, gnum4, ncurses, openssl
+{ stdenv, fetchurl, fetchpatch, fetchFromGitHub, perl, gnum4, ncurses, openssl
 , gnused, gawk, autoconf, libxslt, libxml2, makeWrapper
 , Carbon, Cocoa
 , odbcSupport ? false, unixODBC ? null
@@ -53,6 +53,11 @@ stdenv.mkDerivation rec {
      sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f";
   };
 
+  # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
+  prePatch = ''
+    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
+  '';
+
   patches = [
     rmAndPwdPatch
     envAndCpPatch
diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix
index 11f50b40fb36..4b1e3f4cb2f9 100644
--- a/pkgs/development/interpreters/erlang/R19.nix
+++ b/pkgs/development/interpreters/erlang/R19.nix
@@ -46,6 +46,9 @@ stdenv.mkDerivation rec {
   prePatch = ''
     substituteInPlace configure.in \
       --replace '`sw_vers -productVersion`' '10.10'
+
+    # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense
+    substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL'
   '';
 
   preConfigure = ''

From de0849d18098ba8521ef8ae33aa4971068ebb9e3 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 19 Mar 2017 14:41:55 -0400
Subject: [PATCH 2569/3449] erlangR14: delete unreferenced ancient file

---
 pkgs/development/interpreters/erlang/R14.nix | 64 --------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 pkgs/development/interpreters/erlang/R14.nix

diff --git a/pkgs/development/interpreters/erlang/R14.nix b/pkgs/development/interpreters/erlang/R14.nix
deleted file mode 100644
index 0a93726fc0af..000000000000
--- a/pkgs/development/interpreters/erlang/R14.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, perl, gnum4, ncurses, openssl
-, makeWrapper, gnused, gawk }:
-
-let version = "14B04"; in
-
-stdenv.mkDerivation {
-  name = "erlang-" + version;
-
-  src = fetchurl {
-    url = "http://www.erlang.org/download/otp_src_R${version}.tar.gz";
-    sha256 = "0vlvjlg8vzcy6inb4vj00bnj0aarvpchzxwhmi492nv31s8kb6q9";
-  };
-
-  buildInputs = [ perl gnum4 ncurses openssl makeWrapper ];
-
-  patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
-
-  preConfigure = ''
-    export HOME=$PWD/../
-    sed -e s@/bin/pwd@pwd@g -i otp_build
-  '';
-
-  configureFlags = "--with-ssl=${openssl.dev}";
-
-  hardeningDisable = [ "format" ];
-
-  postInstall = let
-    manpages = fetchurl {
-      url = "http://www.erlang.org/download/otp_doc_man_R${version}.tar.gz";
-      sha256 = "1nh7l7wilyyaxvlwkjxgm3cq7wpd90sk6vxhgpvg7hwai8g52545";
-    };
-  in ''
-    tar xf "${manpages}" -C "$out/lib/erlang"
-    for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
-      prefix="''${i%/*}"
-      ensureDir "$out/share/man/''${prefix##*/}"
-      ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
-    done
-  '';
-
-  # Some erlang bin/ scripts run sed and awk
-  postFixup = ''
-    wrapProgram $out/lib/erlang/bin/erl --prefix PATH ":" "${gnused}/bin/"
-    wrapProgram $out/lib/erlang/bin/start_erl --prefix PATH ":" "${gnused}/bin/:${gawk}/bin"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    homepage = "http://www.erlang.org/";
-    description = "Programming language used for massively scalable soft real-time systems";
-
-    longDescription = ''
-      Erlang is a programming language used to build massively scalable
-      soft real-time systems with requirements on high availability.
-      Some of its uses are in telecoms, banking, e-commerce, computer
-      telephony and instant messaging. Erlang's runtime system has
-      built-in support for concurrency, distribution and fault
-      tolerance.
-    '';
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

From 9748828e78c2b22d782321532b81de0f259d1860 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 19 Mar 2017 21:19:45 +0300
Subject: [PATCH 2570/3449] steamPackages.steam-runtime-wrapped: override
 vulkan-loader

This way we get /run/opengl-driver as a search path.
Fixes #24056.
---
 pkgs/games/steam/runtime-wrapped.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix
index 1988463d61a6..74548fcfb8cd 100644
--- a/pkgs/games/steam/runtime-wrapped.nix
+++ b/pkgs/games/steam/runtime-wrapped.nix
@@ -88,6 +88,7 @@ let
     openalSoft
     libva
     openssl-steam
+    vulkan-loader
   ] ++ lib.optional newStdcpp gcc.cc;
 
   ourRuntime = if runtimeOnly then []

From c883cefc6fa60feba83615bb7d77090855e12733 Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Sat, 18 Mar 2017 19:51:25 +0100
Subject: [PATCH 2571/3449] pythonPackages.libnacl: init at 1.5.0

---
 lib/maintainers.nix                           |  1 +
 .../python-modules/libnacl/default.nix        | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/libnacl/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e7b8ff7bf101..88a051cb57f5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -538,6 +538,7 @@
   wscott = "Wayne Scott <wsc9tt@gmail.com>";
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
   xnwdd = "Guillermo NWDD <nwdd+nixos@no.team>";
+  xvapx = "Marti Serra <marti.serra.coscollano@gmail.com>";
   xwvvvvwx = "David Terry <davidterry@posteo.de>";
   yarr = "Dmitry V. <savraz@gmail.com>";
   yochai = "Yochai <yochai@titat.info>";
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
new file mode 100644
index 000000000000..09d834c85687
--- /dev/null
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, buildPythonPackage, fetchPypi, pkgs }:
+
+buildPythonPackage rec {
+  pname = "libnacl";
+  version = "1.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1ph042x0cfysj16mmjif40pxn505rg5c9n94s972dgc0mfgvrwhs";
+  };
+
+  propagatedBuildInputs = [ pkgs.libsodium ];
+
+  postPatch = ''
+    substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium.so')" "ctypes.cdll.LoadLibrary('${pkgs.libsodium}/lib/libsodium.so')"
+  '';
+
+  meta = {
+    maintainers = with stdenv.lib.maintainers; [ xvapx ];
+    description = "Python bindings for libsodium based on ctypes";
+    homepage = "https://pypi.python.org/pypi/libnacl";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a3debdf48b7..a8edf1e7616c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13867,6 +13867,8 @@ in {
     clblas = pkgs.clblas-cuda;
   };
 
+  libnacl = callPackage ../development/python-modules/libnacl/default.nix { };
+
   libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else
     (pkgs.libplist.override{python2Packages=self; }).py;
 

From a4e736e2d1ca9c1bd5a0c6bea43f9e872548a4dd Mon Sep 17 00:00:00 2001
From: neeasade <nathanisom27@gmail.com>
Date: Sun, 19 Mar 2017 14:40:03 -0500
Subject: [PATCH 2572/3449] colort: add maintainer

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

diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix
index a9e7e57fc8df..554c7d8c78bb 100644
--- a/pkgs/applications/misc/colort/default.nix
+++ b/pkgs/applications/misc/colort/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation {
     homepage = https://github.com/neeasade/colort;
     license = licenses.mit;
     platforms = platforms.all;
+    maintainers = [ maintainers.neeasade ];
   };
 }

From 9ec0e9676f9c3c04fa779024310e51a6188b8561 Mon Sep 17 00:00:00 2001
From: Nathan Isom <neeasade@users.noreply.github.com>
Date: Sun, 19 Mar 2017 14:41:17 -0500
Subject: [PATCH 2573/3449] bevelbar: init at 16.11 (#24072)

* bevelbar: init at 16.11

* bevelbar: use fetchFromGitHub
---
 .../window-managers/bevelbar/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/window-managers/bevelbar/default.nix

diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
new file mode 100644
index 000000000000..b7bc76284880
--- /dev/null
+++ b/pkgs/applications/window-managers/bevelbar/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, libX11, libXrandr, libXft }:
+
+stdenv.mkDerivation rec {
+  name = "bevelbar-${version}";
+  version = "16.11";
+
+  src = fetchFromGitHub {
+    owner = "vain";
+    repo = "bevelbar";
+    rev = "v${version}";
+    sha256 = "1hbwg3vdxw9fyshy85skv476p0zr4ynvhcz2xkijydpzm2j3rmjm";
+  };
+
+  buildInputs = [ libX11 libXrandr libXft ];
+
+  makeFlags = [ "prefix=$(out)" ];
+  installFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "An X11 status bar with fancy schmancy 1985-ish beveled borders";
+    inherit (src.meta) homepage;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.neeasade ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7347a0ea69ff..11ccfd1a30ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12883,6 +12883,8 @@ with pkgs;
     guile = guile_1_8;
   };
 
+  bevelbar = callPackage ../applications/window-managers/bevelbar { };
+
   bibletime = callPackage ../applications/misc/bibletime { };
 
   bitkeeper = callPackage ../applications/version-management/bitkeeper {

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 2574/3449] 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 251387e7bd51..28034f9d5492 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 09a94458d3207093e819d4f2d243ebc9e188203a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 20:47:25 +0100
Subject: [PATCH 2575/3449] bevelbar: remove unnessary makeFlags

---
 pkgs/applications/window-managers/bevelbar/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/window-managers/bevelbar/default.nix b/pkgs/applications/window-managers/bevelbar/default.nix
index b7bc76284880..582f9cb61f8e 100644
--- a/pkgs/applications/window-managers/bevelbar/default.nix
+++ b/pkgs/applications/window-managers/bevelbar/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 libXrandr libXft ];
 
-  makeFlags = [ "prefix=$(out)" ];
   installFlags = [ "prefix=$(out)" ];
 
   meta = with stdenv.lib; {

From 597865725f89c56b5a7b4fb5eaa006174e82366d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 20:58:41 +0100
Subject: [PATCH 2576/3449] pythonPackages.libnacl: enable tests

---
 .../python-modules/libnacl/default.nix        | 21 ++++++++++++-------
 pkgs/top-level/python-packages.nix            |  4 +++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 09d834c85687..0aa3ed29f20b 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, pkgs }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, libsodium }:
 
 buildPythonPackage rec {
   pname = "libnacl";
@@ -10,17 +10,22 @@ buildPythonPackage rec {
     sha256 = "1ph042x0cfysj16mmjif40pxn505rg5c9n94s972dgc0mfgvrwhs";
   };
 
-  propagatedBuildInputs = [ pkgs.libsodium ];
+  buildInputs = [ pytest ];
+  propagatedBuildInputs = [ libsodium ];
 
   postPatch = ''
-    substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium.so')" "ctypes.cdll.LoadLibrary('${pkgs.libsodium}/lib/libsodium.so')"
+    substituteInPlace "./libnacl/__init__.py" --replace "ctypes.cdll.LoadLibrary('libsodium.so')" "ctypes.cdll.LoadLibrary('${libsodium}/lib/libsodium.so')"
   '';
 
-  meta = {
-    maintainers = with stdenv.lib.maintainers; [ xvapx ];
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ xvapx ];
     description = "Python bindings for libsodium based on ctypes";
     homepage = "https://pypi.python.org/pypi/libnacl";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.asl20;
+    platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8edf1e7616c..f59191e6be53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13867,7 +13867,9 @@ in {
     clblas = pkgs.clblas-cuda;
   };
 
-  libnacl = callPackage ../development/python-modules/libnacl/default.nix { };
+  libnacl = callPackage ../development/python-modules/libnacl/default.nix {
+    inherit (pkgs) libsodium;
+  };
 
   libplist = if isPy3k then throw "libplist not supported for interpreter ${python.executable}" else
     (pkgs.libplist.override{python2Packages=self; }).py;

From 82e760a3d613ec9e82ab48131f8b94b1119dc535 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 19 Mar 2017 21:04:43 +0100
Subject: [PATCH 2577/3449] armadillo: fix evaluation error

cc: @ndowens08
---
 pkgs/development/libraries/armadillo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index bea592a6d20d..d5a601f09ba0 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DDETECT_HDF5=ON" ];
 
  patches = [ ./use-unix-config-on-OS-X.patch ];
-  
+
   meta = with stdenv.lib; {
     description = "C++ linear algebra library";
     homepage = http://arma.sourceforge.net;
-    license = licenses.apl2;
+    license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [ juliendehos knedlsepp ];
   };

From 6ea3eefdfc9313c850304d01a398c6199805b726 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 19 Mar 2017 16:21:18 -0400
Subject: [PATCH 2578/3449] gcc5: fix for libc++ 3.8 and above

This is in preparation for the big Darwin LLVM 4.0 stdenv switchover
---
 pkgs/development/compilers/gcc/5/default.nix  |  5 +-
 .../compilers/gcc/5/libcxx38-and-above.patch  | 46 +++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/gcc/5/libcxx38-and-above.patch

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 1721eba325bf..da4f7a606705 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -74,7 +74,10 @@ let version = "5.4.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
+
+      # This could be applied unconditionally but I don't want to cause a full Linux rebuild.
+      ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch;
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
diff --git a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
new file mode 100644
index 000000000000..ee48901a6d0c
--- /dev/null
+++ b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
@@ -0,0 +1,46 @@
+This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958,
+which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths.
+
+--- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC
++++ b/gcc/auto-profile.c
+@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3.  
+ <http://www.gnu.org/licenses/>.  */
+ 
+ #include "config.h"
+-#include "system.h"
+-
+-#include <string.h>
+ #include <map>
+ #include <set>
++#include "system.h"
+ 
+ #include "coretypes.h"
+ #include "hash-set.h"
+--- a/gcc/graphite-isl-ast-to-gimple.c 2017-01-19 21:02:12 UTC
++++ b/gcc/graphite-isl-ast-to-gimple.c
+@@ -38,6 +38,7 @@ extern "C" {
+ #endif
+ #endif
+ 
++#include <map>
+ #include "system.h"
+ #include "coretypes.h"
+ #include "hash-set.h"
+@@ -75,7 +76,6 @@ extern "C" {
+ #include "tree-scalar-evolution.h"
+ #include "gimple-ssa.h"
+ #include "tree-into-ssa.h"
+-#include <map>
+ 
+ #ifdef HAVE_isl
+ #include "graphite-poly.h"
+--- a/gcc/system.h 2015-01-05 12:33:28 UTC
++++ b/gcc/system.h
+@@ -217,6 +217,7 @@ extern int errno;
+ #ifdef __cplusplus
+ # include <algorithm>
+ # include <cstring>
++# include <new>
+ # include <utility>
+ #endif
+ 

From 93ec1ad987e0d5130509c06e4eb2b3e9b7b5cb5f Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 15:22:57 -0500
Subject: [PATCH 2579/3449] highlight: 3.28 -> 3.35 (#24068)

* highlight: 3.28 -> 3.35

highlight: Add support for darwin, suspecting needs gcc

highlight: Fixed isDarwin [gcc]

* highlight: enable darwin build
---
 pkgs/tools/text/highlight/default.nix | 19 ++++++++++++++-----
 pkgs/top-level/all-packages.nix       |  7 +++++--
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 6f2a2df82f8d..666dae1db9b8 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, getopt, lua, boost, pkgconfig }:
+{ stdenv, fetchurl, getopt, lua, boost, pkgconfig, gcc }:
+
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "highlight-${version}";
@@ -9,16 +11,23 @@ stdenv.mkDerivation rec {
     sha256 = "8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin  gcc ;
 
   buildInputs = [ getopt lua boost ];
 
-  preConfigure = ''makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"'';
+  prePatch = stdenv.lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace src/makefile \
+        --replace 'CXX=g++' 'CXX=clang++'
+  '';
+
+  preConfigure = ''
+    makeFlags="PREFIX=$out conf_dir=$out/etc/highlight/"
+  '';
 
   meta = with stdenv.lib; {
     description = "Source code highlighting tool";
     homepage = "http://www.andre-simon.de/doku/highlight/en/highlight.php";
-    platforms = platforms.linux;
-    maintainers = maintainers.ndowens;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.ndowens ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11ccfd1a30ab..a2e5fe27b14a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2255,9 +2255,12 @@ with pkgs;
 
   hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
 
-  highlight = callPackage ../tools/text/highlight {
+  highlight = callPackage ../tools/text/highlight ({
     lua = lua5;
-  };
+  } // lib.optionalAttrs stdenv.isDarwin {
+    # doesn't build with clang_37
+    inherit (llvmPackages_38) stdenv;
+  });
 
   homesick = callPackage ../tools/misc/homesick { };
 

From d80a7210bb8ec1344796cce057e420ed46fb5e77 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 19 Mar 2017 16:33:52 -0400
Subject: [PATCH 2580/3449] nasm: 2.11.08 -> 2.12.02

Upgrading primarily because it works with newer LLVM (for the big Darwin
stdenv LLVM bump) but a newer version probably helps for other reasons :)
---
 pkgs/development/compilers/nasm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index a30a97ce9ce5..eb090e8b38ad 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nasm-${version}";
-  version = "2.11.08";
+  version = "2.12.02";
 
   src = fetchurl {
     url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
-    sha256 = "0ialkla6i63j8fpv840jy7k5mdf2wbqr98bvbcq0dp0b38ls18wx";
+    sha256 = "097318bjxvmffbjfd1k89parc04xf5jfxg2rr93581lccwf8kc00";
   };
 
   meta = with stdenv.lib; {

From 876dead5b6c3732642d3c70e2d071f2923372d0e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 15:41:35 -0500
Subject: [PATCH 2581/3449] joe: 4.2 -> 4.4

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

diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix
index 323059417ea8..d6c87c4991b9 100644
--- a/pkgs/applications/editors/joe/default.nix
+++ b/pkgs/applications/editors/joe/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  version = "4.2";
+  version = "4.4";
   name = "joe-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/joe-editor/${name}.tar.gz";
-    sha256 = "0x39x0qrwdbhl45wd8r8cpzigsip6m5j2crajsrbffk8qm5scpdw";
+    sha256 = "0y898r1xlrv75m00y598rvwwsricabplyh80wawsqafapcl4hw55";
   };
 
   meta = with stdenv.lib; {

From cb9ff8bfa73fdfa1a38b609e878a52650dfdb682 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 15 Mar 2017 19:05:01 +0100
Subject: [PATCH 2582/3449] lib/lists: rename fold to foldr & improve fold docs

In order to better distinguish foldr from foldl the default name is changed to
foldr, but fold is still a synonym.

Additionally the docs are improved and examples added.
---
 lib/lists.nix | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/lib/lists.nix b/lib/lists.nix
index 5e224921de81..82d5ba0124cb 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -16,17 +16,22 @@ rec {
   */
   singleton = x: [x];
 
-  /* "Fold" a binary function `op' between successive elements of
-     `list' with `nul' as the starting value, i.e., `fold op nul [x_1
-     x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.  (This is
-     Haskell's foldr).
+  /* “right fold” a binary function `op' between successive elements of
+     `list' with `nul' as the starting value, i.e.,
+     `foldr op nul [x_1 x_2 ... x_n] == op x_1 (op x_2 ... (op x_n nul))'.
+     Type:
+       foldr :: (a -> b -> b) -> b -> [a] -> b
 
      Example:
-       concat = fold (a: b: a + b) "z"
+       concat = foldr (a: b: a + b) "z"
        concat [ "a" "b" "c" ]
        => "abcz"
+       # different types
+       strange = foldr (int: str: toString (int + 1) + str) "a"
+       strange [ 1 2 3 4 ]
+       => "2345a"
   */
-  fold = op: nul: list:
+  foldr = op: nul: list:
     let
       len = length list;
       fold' = n:
@@ -35,13 +40,25 @@ rec {
         else op (elemAt list n) (fold' (n + 1));
     in fold' 0;
 
-  /* Left fold: `fold op nul [x_1 x_2 ... x_n] == op (... (op (op nul
-     x_1) x_2) ... x_n)'.
+  /* `fold' is an alias of `foldr' for historic reasons */
+  # FIXME(Profpatsch): deprecate?
+  fold = foldr;
+
+
+  /* “left fold”, like `foldr', but from the left:
+     `foldl op nul [x_1 x_2 ... x_n] == op (... (op (op nul x_1) x_2) ... x_n)`.
+
+     Type:
+       foldl :: (b -> a -> b) -> b -> [a] -> b
 
      Example:
        lconcat = foldl (a: b: a + b) "z"
        lconcat [ "a" "b" "c" ]
        => "zabc"
+       # different types
+       lstrange = foldl (str: int: str + toString (int + 1)) ""
+       strange [ 1 2 3 4 ]
+       => "a2345"
   */
   foldl = op: nul: list:
     let
@@ -52,7 +69,7 @@ rec {
         else op (foldl' (n - 1)) (elemAt list n);
     in foldl' (length list - 1);
 
-  /* Strict version of foldl.
+  /* Strict version of `foldl'.
 
      The difference is that evaluation is forced upon access. Usually used
      with small whole results (in contract with lazily-generated list or large
@@ -140,7 +157,7 @@ rec {
        any isString [ 1 { } ]
        => false
   */
-  any = builtins.any or (pred: fold (x: y: if pred x then true else y) false);
+  any = builtins.any or (pred: foldr (x: y: if pred x then true else y) false);
 
   /* Return true iff function `pred' returns true for all elements of
      `list'.
@@ -151,7 +168,7 @@ rec {
        all (x: x < 3) [ 1 2 3 ]
        => false
   */
-  all = builtins.all or (pred: fold (x: y: if pred x then y else false) true);
+  all = builtins.all or (pred: foldr (x: y: if pred x then y else false) true);
 
   /* Count how many times function `pred' returns true for the elements
      of `list'.
@@ -219,7 +236,7 @@ rec {
        => { right = [ 5 3 4 ]; wrong = [ 1 2 ]; }
   */
   partition = builtins.partition or (pred:
-    fold (h: t:
+    foldr (h: t:
       if pred h
       then { right = [h] ++ t.right; wrong = t.wrong; }
       else { right = t.right; wrong = [h] ++ t.wrong; }

From 4f1d977877b5477d84ca1204ec7a3f87d6bbf871 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 18 Mar 2017 20:41:02 +0100
Subject: [PATCH 2583/3449] lib/tests: add more tests for fold functions

Also the invocation of tests is documented.
---
 lib/tests.nix | 35 +++++++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/lib/tests.nix b/lib/tests.nix
index d33e3a824e34..f7119cf18ab6 100644
--- a/lib/tests.nix
+++ b/lib/tests.nix
@@ -1,3 +1,6 @@
+# to run these tests:
+# nix-instantiate --eval --strict nixpkgs/lib/tests.nix
+# if the resulting list is empty, all tests passed
 let inherit (builtins) add; in
 with import ./default.nix;
 
@@ -45,10 +48,34 @@ runTests {
     expected = ["b" "c"];
   };
 
-  testFold = {
-    expr = fold (builtins.add) 0 (range 0 100);
-    expected = 5050;
-  };
+  testFold =
+    let
+      f = op: fold: fold op 0 (range 0 100);
+      # fold with associative operator
+      assoc = f builtins.add;
+      # fold with non-associative operator
+      nonAssoc = f builtins.sub;
+    in {
+      expr = {
+        assocRight = assoc foldr;
+        # right fold with assoc operator is same as left fold
+        assocRightIsLeft = assoc foldr == assoc foldl;
+        nonAssocRight = nonAssoc foldr;
+        nonAssocLeft = nonAssoc foldl;
+        # with non-assoc operator the fold results are not the same
+        nonAssocRightIsNotLeft = nonAssoc foldl != nonAssoc foldr;
+        # fold is an alias for foldr
+        foldIsRight = nonAssoc fold == nonAssoc foldr;
+      };
+      expected = {
+        assocRight = 5050;
+        assocRightIsLeft = true;
+        nonAssocRight = 50;
+        nonAssocLeft = (-5050);
+        nonAssocRightIsNotLeft = true;
+        foldIsRight = true;
+      };
+    };
 
   testTake = testAllTrue [
     ([] == (take 0 [  1 2 3 ]))

From fa9400f16f9737ebb6cd1aec3a534a645db23fc7 Mon Sep 17 00:00:00 2001
From: Shane Pearlman <shanemikel1@gmail.com>
Date: Sun, 19 Mar 2017 14:21:29 -0700
Subject: [PATCH 2584/3449] htmldoc: use stdenv.lib.optional instead of
 stdenv.lib.enable

---
 pkgs/tools/typesetting/htmldoc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix
index 0cd1343dd4b5..b9d5407c68de 100644
--- a/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/pkgs/tools/typesetting/htmldoc/default.nix
@@ -14,8 +14,9 @@ stdenv.mkDerivation rec {
       + "/release-${version}/htmldoc-${version}-source.tar.gz";
     sha256 = "15x0xdf487j4i4gfap5yr83airxnbp2v4lxaz79a4s3iirrq39p0";
   };
-  buildInputs =
-    stdenv.lib.ifEnable stdenv.isDarwin [SystemConfiguration Foundation];
+  buildInputs = with stdenv;
+       lib.optional isDarwin SystemConfiguration
+    ++ lib.optional isDarwin Foundation;
 
   meta = with stdenv.lib; {
     description = "Converts HTML files to PostScript and PDF";

From b00bfb0401347637e512ef56acb4e34c266209b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Sun, 19 Mar 2017 17:15:21 -0400
Subject: [PATCH 2585/3449] cre2: init at 0.3.0

c wrapper for google's re2 regex library
---
 pkgs/development/libraries/cre2/default.nix | 39 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/libraries/cre2/default.nix

diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
new file mode 100644
index 000000000000..c1fe4686ce23
--- /dev/null
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, autoconf, automake,
+  libtool, pkgconfig, re2, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "cre2-${version}";
+
+  version = "0.3.0";
+    
+  src = fetchFromGitHub {
+    owner = "marcomaggi";
+    repo = "cre2";
+    rev = version;
+    sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkgconfig
+    re2
+    texinfo
+  ];
+
+  NIX_LDFLAGS="-lre2 -lpthread";
+
+  preConfigure = "sh autogen.sh";
+  
+  configureFlags = [
+    "--enable-maintainer-mode"
+  ];
+
+  meta = {
+    homepage = http://marcomaggi.github.io/docs/cre2.html;
+    description = "C Wrapper for RE2";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2e5fe27b14a..85df2db26826 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7195,6 +7195,8 @@ with pkgs;
 
   cracklib = callPackage ../development/libraries/cracklib { };
 
+  cre2 = callPackage ../development/libraries/cre2 { };
+
   cryptopp = callPackage ../development/libraries/crypto++ { };
 
   curlcpp = callPackage ../development/libraries/curlcpp { };

From d6114f6c6bd74c68829a4a586464b9a1633c76ac Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 16:07:12 -0500
Subject: [PATCH 2586/3449] mg: 20110905 -> 20161005; Remove un-needed
 configure patch

mg: 20110905 -> 20161005
---
 pkgs/applications/editors/mg/configure.patch | 35 --------------------
 pkgs/applications/editors/mg/default.nix     | 29 ++++++++--------
 2 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/editors/mg/configure.patch

diff --git a/pkgs/applications/editors/mg/configure.patch b/pkgs/applications/editors/mg/configure.patch
deleted file mode 100644
index 11105299eb4b..000000000000
--- a/pkgs/applications/editors/mg/configure.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.old	2013-07-30 19:42:51.000000000 +0200
-+++ configure	2013-07-30 19:47:26.000000000 +0200
-@@ -163,31 +163,7 @@
-     echo 'Fails.'
- fi
- 
--
--if [ ! -r /usr/include/term.h ]; then
--    note 'term.h'
--    if [ -r /usr/include/ncurses/term.h ]; then
--	echo "Found in /usr/include/ncurses"
--	extraflags="$extraflags -I/usr/include/ncurses"
--    else
--	for i in pkg local; do
--	    if [ -r /usr/$i/include/term.h ]; then
--		echo "Found in /usr/$i/include"
--		extralibs="$extralibs -L/usr/$i/lib"
--		extraflags="$extraflags -I/usr/$i/include"
--		break
--	    else
--		false
--	    fi
--	done ||
--	{
--	    echo 'Not found!' >&2
--	    echo 'Do you have the ncurses devel package installed?' >&2
--	    echo 'If you know where term.h is, please email the author!' >&2
--	    exit 1
--	}
--    fi
--fi
-+extraflags="$extraflags $NIX_CFLAGS_COMPILE"
- 
- note 'base and dirname'
- if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then
diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix
index 95a6205125b0..b8bfd40c079b 100644
--- a/pkgs/applications/editors/mg/default.nix
+++ b/pkgs/applications/editors/mg/default.nix
@@ -1,19 +1,19 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, stdenv, ncurses, pkgconfig, libbsd }:
 stdenv.mkDerivation rec {
-  name = "mg-20110905";
+  name = "mg-${version}";
+  version = "20161005";
 
   src = fetchurl {
-    url = http://homepage.boetes.org/software/mg/mg-20110905.tar.gz;
-    sha256 = "0ac2c7wy5kkcflm7cmiqm5xhb5c4yfw3i33iln8civ1yd9z7vlqw";
+    url = "http://homepage.boetes.org/software/mg/${name}.tar.gz";
+    sha256 = "0qaydk2cy765n9clghmi5gdnpwn15y2v0fj6r0jcm0v7d89vbz5p";
   };
 
-  dontAddPrefix = true;
-
-  patches = [ ./configure.patch ];
-  patchFlags = "-p0";
-
   NIX_CFLAGS_COMPILE = "-Wno-error";
-  buildFlags = [ "CC=cc" ];
+  
+  preConfigure = ''
+    substituteInPlace GNUmakefile \
+      --replace /usr/bin/pkg-config ${pkgconfig}/bin/pkg-config
+      '';
 
   installPhase = ''
     mkdir -p $out/bin
@@ -22,12 +22,13 @@ stdenv.mkDerivation rec {
     cp mg.1 $out/share/man/man1
   '';
 
-  buildInputs = [ ncurses ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ncurses libbsd ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://homepage.boetes.org/software/mg/;
     description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team";
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.publicDomain;
+    platforms = platforms.all;
   };
 }

From 685ac5287b7e76fe08bd39dc257706757a93efdf Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 16:36:48 -0500
Subject: [PATCH 2587/3449] nano: 2.7.3 -> 2.7.5

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

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 9814e697d22b..b1f581dc8417 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -17,23 +17,28 @@ let
     rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161";
     sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s";
   };
+
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.7.3";
+  version = "2.7.5";
+  
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1z0bfyc5cvv83l3bjmlcwl49mpxrp65k5ffsfpnayfyjc18fy9nr";
+    sha256 = "1r37gqx7hppqbgsbclchiis8wzzpb9srm3q3dlvlii2gpkk28kd6";
   };
+
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;
   buildInputs = [ ncurses ];
+  
   outputs = [ "out" "info" ];
+  
   configureFlags = ''
     --sysconfdir=/etc
     ${optionalString (!enableNls) "--disable-nls"}
     ${optionalString enableTiny "--enable-tiny"}
   '';
 
-  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  postPatch = optionalString stdenv.isDarwin ''
     substituteInPlace src/text.c --replace "__time_t" "time_t"
   '';
 

From 3ac089757a76008f75b563a0014bd94a9afbe6d4 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 16:50:06 -0500
Subject: [PATCH 2588/3449] Cosmetic change; Replaced automake autoconf

---
 pkgs/development/libraries/cre2/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix
index c1fe4686ce23..74619cbaaaed 100644
--- a/pkgs/development/libraries/cre2/default.nix
+++ b/pkgs/development/libraries/cre2/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, fetchFromGitHub, autoconf, automake,
+{ stdenv, fetchFromGitHub, autoreconfHook,
   libtool, pkgconfig, re2, texinfo }:
 
 stdenv.mkDerivation rec {
   name = "cre2-${version}";
-
   version = "0.3.0";
     
   src = fetchFromGitHub {
@@ -14,26 +13,22 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    autoconf
-    automake
+    autoreconfHook
     libtool
     pkgconfig
-    re2
-    texinfo
   ];
+  buildInputs = [ re2 texinfo ];
 
   NIX_LDFLAGS="-lre2 -lpthread";
 
-  preConfigure = "sh autogen.sh";
-  
   configureFlags = [
     "--enable-maintainer-mode"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://marcomaggi.github.io/docs/cre2.html;
     description = "C Wrapper for RE2";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = with stdenv.lib.platforms; all;
+    license = licenses.bsd3;
+    platforms = platforms.all;
   };
 }

From 5d849c72f162cf5282d3c966889a5b7cc26fcff3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 Mar 2017 16:40:27 -0500
Subject: [PATCH 2589/3449] neo4j: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index f6fcca16081b..a2158c9b5410 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
-    sha256 = "1jz257brrrblxq0jdh79mmqand6lwi632y8sy5j6dxl3ssd3hrkx";
+    sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From 515fc22263b22952e11632ff44c673dee25f48e1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 Mar 2017 16:40:41 -0500
Subject: [PATCH 2590/3449] neo4j service: fix package installed into env to
 match running service

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

diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 205c8dc610ac..7fba61fff594 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -140,7 +140,7 @@ in {
       '';
     };
 
-    environment.systemPackages = [ pkgs.neo4j ];
+    environment.systemPackages = [ cfg.package ];
 
     users.extraUsers = singleton {
       name = "neo4j";

From cb73cb9e6216a09d5d071e42cd3e0248efe905bd Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 Mar 2017 16:41:55 -0500
Subject: [PATCH 2591/3449] neo4j service: neo4j-wrapper is deprecated, merge
 into neo4j.conf

---
 nixos/modules/services/databases/neo4j.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix
index 7fba61fff594..424e08a6ee34 100644
--- a/nixos/modules/services/databases/neo4j.nix
+++ b/nixos/modules/services/databases/neo4j.nix
@@ -27,9 +27,7 @@ let
     ''}
     dbms.shell.enabled=true
     ${cfg.extraServerConfig}
-  '';
 
-  wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" ''
     # Default JVM parameters from neo4j.conf
     dbms.jvm.additional=-XX:+UseG1GC
     dbms.jvm.additional=-XX:-OmitStackTraceInFastThrow
@@ -135,7 +133,6 @@ in {
       preStart = ''
         mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf,logs}
         ln -fs ${serverConfig} ${cfg.dataDir}/conf/neo4j.conf
-        ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf
         if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi
       '';
     };

From 8ab037e0b5aec850db9025478f78f318e4979b60 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 17:18:26 -0500
Subject: [PATCH 2592/3449] nedit: 5.6a -> 5.7

---
 pkgs/applications/editors/nedit/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix
index d933a207cd4a..a15b557f0e57 100644
--- a/pkgs/applications/editors/nedit/default.nix
+++ b/pkgs/applications/editors/nedit/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
 
 stdenv.mkDerivation rec {
-  name = "nedit-5.6a";
+  name = "nedit-${version}";
+  version = "5.7";
   
   src = fetchurl {
     url = "mirror://sourceforge/nedit/nedit-source/${name}-src.tar.gz";
-    sha256 = "1v8y8vwj3kn91crsddqkz843y6csgw7wkjnd3zdcb4bcrf1pjrsk";
+    sha256 = "0ym1zhjx9976rf2z5nr7dj4mjkxcicimhs686snjhdcpzxwsrndd";
   };
 
   hardeningDisable = [ "format" ];
 
-  buildInputs = [ xlibsWrapper motif libXpm ];
+  nativeBuildInputs = [ xlibsWrapper ];
+  buildInputs = [ motif libXpm ];
 
   buildFlags = if stdenv.isLinux then "linux" else
                # the linux config works fine on darwin too!
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.nedit.org;
+    homepage = http://sourceforge.net/projects/nedit;
     platforms = with platforms; linux ++ darwin;
   };
 }

From e27a85709d97671747aff55a455ae0b720bed7d6 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 17:28:35 -0500
Subject: [PATCH 2593/3449] scite: 3.3.7 -> 3.7.3; Cosmetic changes

---
 pkgs/applications/editors/scite/default.nix | 22 ++++++++++-----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 989d3e42a6fa..d02a08a0a597 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchurl, pkgconfig, gtk2 }:
 
-let
-  version = "3.3.7";
-
-  version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "scite-${version}";
+  version = "3.7.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite${version_short}.tgz";
-    sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd";
+    url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite373.tgz";
+    sha256 = "05d81h1fqhjlw9apvrni3x2q4a562cd5ra1071qpna8h4ml0an9m";
   };
 
-  buildInputs = [ pkgconfig gtk2 ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gtk2 ];
   sourceRoot = "scintilla/gtk";
 
   buildPhase = ''
@@ -25,11 +23,11 @@ in stdenv.mkDerivation {
     make install prefix=$out/
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.scintilla.org/SciTE.html";
     description = "SCIntilla based Text Editor";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.rszibele ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.rszibele ];
   };
 }

From 9d38774a2834b32471bd69b0ec2034ff883d871c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 18 Mar 2017 23:22:48 +0000
Subject: [PATCH 2594/3449] gargoyle: init at 2017-03-12

---
 .../libraries/SDL_mixer/default.nix           |  2 +-
 pkgs/games/gargoyle/darwin.patch              | 97 +++++++++++++++++++
 pkgs/games/gargoyle/darwin.sh                 | 54 +++++++++++
 pkgs/games/gargoyle/default.nix               | 60 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/games/gargoyle/darwin.patch
 create mode 100644 pkgs/games/gargoyle/darwin.sh
 create mode 100644 pkgs/games/gargoyle/default.nix

diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index d3d57947464b..fe64569abbe2 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description = "SDL multi-channel audio mixer library";
     homepage    = http://www.libsdl.org/projects/SDL_mixer/;
     maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/games/gargoyle/darwin.patch b/pkgs/games/gargoyle/darwin.patch
new file mode 100644
index 000000000000..fa0337fc5850
--- /dev/null
+++ b/pkgs/games/gargoyle/darwin.patch
@@ -0,0 +1,97 @@
+From 06255a8b5a378a2484cd0faa1dd718d5b4e98042 Mon Sep 17 00:00:00 2001
+From: Orivej Desh <orivej@gmx.fr>
+Date: Fri, 17 Mar 2017 08:43:57 +0000
+Subject: [PATCH] darwin
+
+---
+ Jamrules        | 5 ++---
+ Jamshared       | 2 +-
+ support/Jamfile | 4 ++--
+ tads/Jamfile    | 4 ++--
+ terps/Jamfile   | 4 ++--
+ 5 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/Jamrules b/Jamrules
+index 698220d..2294dfc 100644
+--- a/Jamrules
++++ b/Jamrules
+@@ -141,8 +141,7 @@ switch $(OS)
+     case MACOSX :
+         Echo "OS is MACOSX (cocoa)" ;
+         SUFDLL = .dylib ;
+-        MAINARCH = -arch i386 ;
+-        CCFLAGS = -Wno-pointer-sign $(MAINARCH) $(ALTARCH) ;
++        CCFLAGS = -Wno-pointer-sign $(ALTARCH) ;
+         PKGCONFIG = "pkg-config freetype2" ;
+         GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" ;
+         SHRLINKLIBS += "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ;
+@@ -155,7 +154,7 @@ switch $(OS)
+             SHRLINKLIBS += -lSDL_mixer -lSDL -lsmpeg -lvorbisfile ;
+         }
+ 
+-        LINK = $(CC) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) ;
++        LINK = $(CC) $(FRAMEWORKS) $(ALTARCH) ;
+ 
+ 
+     case * :
+diff --git a/Jamshared b/Jamshared
+index 13db835..fd42928 100644
+--- a/Jamshared
++++ b/Jamshared
+@@ -79,7 +79,7 @@ if $(OS) = MACOSX
+ {
+     actions together SharedLink bind NEEDLIBS
+     {
+-        $(LINK) -headerpad_max_install_names $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS)
++        $(LINK) $(FRAMEWORKS) $(MAINARCH) $(ALTARCH) -dynamiclib $(SHRLINKFLAGS) -install_name @executable_path/$(<:D=) -o $(<) $(>) $(NEEDLIBS) $(SHRLINKLIBS)
+     }
+ }
+ else
+diff --git a/support/Jamfile b/support/Jamfile
+index aedf8fe..70cfefd 100644
+--- a/support/Jamfile
++++ b/support/Jamfile
+@@ -41,8 +41,8 @@ if $(USESDL) = yes
+         ;
+ 
+     if $(OS) = MINGW   { SubDirCcFlags -DSDL_SOUND_DLL_EXPORTS ; }
+-    if $(OS) = SOLARIS { SubDirCcFlags -I/usr/include/SDL -fPIC ; }
+-    if $(OS) = MACOSX  { SubDirCcFlags -I/opt/local/include/SDL -fPIC ; }
++    if $(OS) = SOLARIS { SubDirCcFlags -ISDL -fPIC ; }
++    if $(OS) = MACOSX  { SubDirCcFlags -ISDL -fPIC ; }
+ 
+     SEARCH_SOURCE =
+         [ FDirName $(TOP) support sdl_sound ]
+diff --git a/tads/Jamfile b/tads/Jamfile
+index 1f8829d..d8455eb 100644
+--- a/tads/Jamfile
++++ b/tads/Jamfile
+@@ -33,8 +33,8 @@ if $(OS) = LINUX || $(OS) = SOLARIS
+ 
+ if $(OS) = MACOSX
+ {
+-    SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
+-    LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
++    SubDirCcFlags $(MAINARCH) $(ALTARCH) ;
++    LINKFLAGS = $(MAINARCH) $(ALTARCH) ;
+ }
+ 
+ SEARCH_SOURCE =
+diff --git a/terps/Jamfile b/terps/Jamfile
+index b5f6d52..2d1ccdb 100644
+--- a/terps/Jamfile
++++ b/terps/Jamfile
+@@ -185,8 +185,8 @@ if $(MAKE_GEAS) = yes
+ 
+     if $(OS) = MACOSX
+     {
+-        SubDirCcFlags -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
+-        LINKFLAGS = -headerpad_max_install_names $(MAINARCH) $(ALTARCH) ;
++        SubDirCcFlags $(MAINARCH) $(ALTARCH) ;
++        LINKFLAGS = $(MAINARCH) $(ALTARCH) ;
+     }
+ 
+     SUBDIRC++FLAGS = $(SUBDIRCCFLAGS) ;
+-- 
+2.12.0
+
diff --git a/pkgs/games/gargoyle/darwin.sh b/pkgs/games/gargoyle/darwin.sh
new file mode 100644
index 000000000000..9bd45d0b1d54
--- /dev/null
+++ b/pkgs/games/gargoyle/darwin.sh
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+set -e
+
+GARGDIST=build/macosx.release
+BUNDLE=${out}/Applications/Gargoyle.app/Contents
+TERPS="
+advsys/advsys
+agility/agility
+alan2/alan2
+alan3/alan3
+bocfel/bocfel
+frotz/frotz
+garglk/gargoyle
+geas/geas
+git/git
+glulxe/glulxe
+hugo/hugo
+jacl/jacl
+level9/level9
+magnetic/magnetic
+nitfol/nitfol
+scare/scare
+scott/scott
+tads/tadsr
+"
+
+mkdir -p $BUNDLE/MacOS
+mkdir -p $BUNDLE/Frameworks
+mkdir -p $BUNDLE/Resources
+mkdir -p $BUNDLE/PlugIns
+
+install_name_tool -id @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/garglk/libgarglk.dylib
+for file in $TERPS
+do
+install_name_tool -change @executable_path/libgarglk.dylib @executable_path/../Frameworks/libgarglk.dylib $GARGDIST/$file || true
+cp -f $GARGDIST/$file $BUNDLE/PlugIns
+done
+
+cp -f garglk/launcher.plist $BUNDLE/Info.plist
+cp -f $GARGDIST/garglk/gargoyle $BUNDLE/MacOS/Gargoyle
+cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/Frameworks
+cp -f $GARGDIST/garglk/libgarglk.dylib $BUNDLE/PlugIns
+cp -f garglk/launchmac.nib $BUNDLE/Resources/MainMenu.nib
+cp -f garglk/garglk.ini $BUNDLE/Resources
+cp -f garglk/*.icns $BUNDLE/Resources
+cp -f licenses/* $BUNDLE/Resources
+
+mkdir $BUNDLE/Resources/Fonts
+cp fonts/LiberationMono*.ttf $BUNDLE/Resources/Fonts
+cp fonts/LinLibertine*.otf $BUNDLE/Resources/Fonts
+
+mkdir -p ${out}/bin
+ln -s $BUNDLE/MacOS/Gargoyle ${out}/bin/gargoyle
diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix
new file mode 100644
index 000000000000..ecee61513b42
--- /dev/null
+++ b/pkgs/games/gargoyle/default.nix
@@ -0,0 +1,60 @@
+{ stdenv, fetchFromGitHub, jam, pkgconfig, gtk2, SDL, SDL_mixer, SDL_sound, smpeg, libvorbis }:
+
+let
+
+  jamenv = if stdenv.isDarwin then ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
+    export GARGLKINI="$out/Applications/Gargoyle.app/Contents/Resources/garglk.ini"
+  '' else ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/libexec/gargoyle"
+    export DESTDIR="$out"
+    export _BINDIR=libexec/gargoyle
+    export _APPDIR=libexec/gargoyle
+    export _LIBDIR=libexec/gargoyle
+    export GARGLKINI="$out/etc/garglk.ini"
+  '';
+
+in
+
+stdenv.mkDerivation {
+  name = "gargoyle-2017-03-12";
+
+  src = fetchFromGitHub {
+    owner = "garglk";
+    repo = "garglk";
+    rev = "7d8fe875927c332ea30d75656bc982354b42f602";
+    sha256 = "00nac7j84gfql1cr11cs9ad4j1gsxrnkqfx6mis4ijf7d6px3sih";
+  };
+
+  nativeBuildInputs = [ jam pkgconfig ];
+
+  buildInputs = [ gtk2 SDL SDL_mixer ] ++ (
+    if stdenv.isDarwin then [ smpeg libvorbis ] else [ SDL_sound ]
+  );
+
+  patches = [ ./darwin.patch ];
+
+  buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
+
+  installPhase = if stdenv.isDarwin then (builtins.readFile ./darwin.sh) else jamenv + ''
+    jam -j$NIX_BUILD_CORES install
+    mkdir -p "$out/bin"
+    ln -s ../libexec/gargoyle/gargoyle "$out/bin"
+    mkdir -p "$out/etc"
+    cp garglk/garglk.ini "$out/etc"
+    mkdir -p "$out/share/applications"
+    cp garglk/gargoyle.desktop "$out/share/applications"
+    mkdir -p "$out/share/icons/hicolor/32x32/apps"
+    cp garglk/gargoyle-house.png "$out/share/icons/hicolor/32x32/apps"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://ccxvii.net/gargoyle/;
+    license = licenses.gpl2Plus;
+    description = "Interactive fiction interpreter GUI";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8541015746f..1796065475ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16513,6 +16513,8 @@ with pkgs;
 
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
 
+  gargoyle = callPackage ../games/gargoyle { };
+
   gav = callPackage ../games/gav { };
 
   gcs = callPackage ../games/gcs { };

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 2595/3449] 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 22098b68a558..87b2f9d3e188 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 d9f46aa58a3e40ab36cde54fd57dfddec15e6006 Mon Sep 17 00:00:00 2001
From: Shane Pearlman <shanemikel1@gmail.com>
Date: Wed, 25 Jan 2017 15:49:08 -0800
Subject: [PATCH 2596/3449] nix-diff.sh maintainer script: "diffs" Nix
 environment generations

This script was inspired by Guix.  Read the source for documentation, or
invoke it with `nix-diff.sh -h` for a usage summary.
---
 maintainers/scripts/nix-diff.sh | 277 ++++++++++++++++++++++++++++++++
 1 file changed, 277 insertions(+)
 create mode 100755 maintainers/scripts/nix-diff.sh

diff --git a/maintainers/scripts/nix-diff.sh b/maintainers/scripts/nix-diff.sh
new file mode 100755
index 000000000000..9e85b116bc92
--- /dev/null
+++ b/maintainers/scripts/nix-diff.sh
@@ -0,0 +1,277 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils gnugrep gnused
+
+################################################################################
+# nix-diff.sh                                                                  #
+################################################################################
+# This script "diffs" Nix profile generations.                                 #
+#                                                                              #
+# Example:                                                                     #
+################################################################################
+# > nix-diff.sh 90 92                                                          #
+# + gnumake-4.2.1                                                              #
+# + gnumake-4.2.1-doc                                                          #
+# - htmldoc-1.8.29                                                             #
+################################################################################
+# The example shows that as of generation 92 and since generation 90,          #
+# gnumake-4.2.1 and gnumake-4.2.1-doc have been installed, while               #
+# htmldoc-1.8.29 has been removed.                                             #
+#                                                                              #
+# The example above shows the default, minimal output mode of this script.     #
+# For more features, run `nix-diff.sh -h` for usage instructions.              #
+################################################################################
+
+usage() {
+    cat <<EOF
+usage: nix-diff.sh [-h] [-p profile | -s] [range]
+-h:         print this message before exiting
+-q:         list the derivations installed in the parent generation
+-l:         diff every available intermediate generation between parent and
+            child
+-p profile: specify the Nix profile to use
+            * defaults to ~/.nix-profile
+-s:         use the system profile
+            * equivalent to: -p /nix/var/nix/profiles/system
+profile:    * should be something like /nix/var/nix/profiles/default, not a
+              generation link like /nix/var/nix/profiles/default-2-link
+range:      the range of generations to diff
+            * the following patterns are allowed, where A, B, and N are positive
+              integers, and G is the currently active generation:
+                A..B => diffs from generation A to generation B
+                ~N   => diffs from the Nth newest generation (older than G) to G
+                A    => diffs from generation A to G
+            * defaults to ~1
+EOF
+}
+
+usage_tip() {
+    echo 'run `nix-diff.sh -h` for usage instructions' >&2
+    exit 1
+}
+
+while getopts :hqlp:s opt; do
+    case $opt in
+        h)
+            usage
+            exit
+            ;;
+        q)
+            opt_query=1
+            ;;
+        l)
+            opt_log=1
+            ;;
+        p)
+            opt_profile=$OPTARG
+            ;;
+        s)
+            opt_profile=/nix/var/nix/profiles/system
+            ;;
+        \?)
+            echo "error: invalid option -$OPTARG" >&2
+            usage_tip
+            ;;
+    esac
+done
+shift $((OPTIND-1))
+
+if [ -n "$opt_profile" ]; then
+    if ! [ -L "$opt_profile" ]; then
+        echo "error: expecting \`$opt_profile\` to be a symbolic link" >&2
+        usage_tip
+    fi
+else
+    opt_profile=$(readlink ~/.nix-profile)
+    if (( $? != 0 )); then
+        echo 'error: unable to dereference `~/.nix-profile`' >&2
+        echo 'specify the profile manually with the `-p` flag' >&2
+        usage_tip
+    fi
+fi
+
+list_gens() {
+    nix-env -p "$opt_profile" --list-generations \
+        | sed -r 's:^\s*::' \
+        | cut -d' ' -f1
+}
+
+current_gen() {
+    nix-env -p "$opt_profile" --list-generations \
+        | grep -E '\(current\)\s*$' \
+        | sed -r 's:^\s*::' \
+        | cut -d' ' -f1
+}
+
+neg_gen() {
+    local i=0 from=$1 n=$2 tmp
+    for gen in $(list_gens | sort -rn); do
+        if ((gen < from)); then
+            tmp=$gen
+            ((i++))
+            ((i == n)) && break
+        fi
+    done
+    if ((i < n)); then
+        echo -n "error: there aren't $n generation(s) older than" >&2
+        echo " generation $from" >&2
+        return 1
+    fi
+    echo $tmp
+}
+
+match() {
+    argv=("$@")
+    for i in $(seq $(($#-1))); do
+        if grep -E "^${argv[$i]}\$" <(echo "$1") >/dev/null; then
+            echo $i
+            return
+        fi
+    done
+    echo 0
+}
+
+case $(match "$1" '' '[0-9]+' '[0-9]+\.\.[0-9]+' '~[0-9]+') in
+    1)
+        diffTo=$(current_gen)
+        diffFrom=$(neg_gen $diffTo 1)
+        (($? == 1)) && usage_tip
+        ;;
+    2)
+        diffFrom=$1
+        diffTo=$(current_gen)
+        ;;
+    3)
+        diffFrom=${1%%.*}
+        diffTo=${1##*.}
+        ;;
+    4)
+        diffTo=$(current_gen)
+        diffFrom=$(neg_gen $diffTo ${1#*~})
+        (($? == 1)) && usage_tip
+        ;;
+    0)
+        echo 'error: invalid invocation' >&2
+        usage_tip
+        ;;
+esac
+
+dirA="${opt_profile}-${diffFrom}-link"
+dirB="${opt_profile}-${diffTo}-link"
+
+declare -a temp_files
+temp_length() {
+    echo -n ${#temp_files[@]}
+}
+temp_make() {
+    temp_files[$(temp_length)]=$(mktemp)
+}
+temp_clean() {
+    rm -f ${temp_files[@]}
+}
+temp_name() {
+    echo -n "${temp_files[$(($(temp_length)-1))]}"
+}
+trap 'temp_clean' EXIT
+
+temp_make
+versA=$(temp_name)
+refs=$(nix-store -q --references "$dirA")
+(( $? != 0 )) && exit 1
+echo "$refs" \
+    | grep -v env-manifest.nix \
+    | sort \
+          > "$versA"
+
+print_tag() {
+    local gen=$1
+    nix-env -p "$opt_profile" --list-generations \
+        | grep -E "^\s*${gen}" \
+        | sed -r 's:^\s*::' \
+        | sed -r 's:\s*$::'
+}
+
+if [ -n "$opt_query" ]; then
+    print_tag $diffFrom
+    cat "$versA" \
+        | sed -r 's:^[^-]+-(.*)$:    \1:'
+
+    print_line=1
+fi
+
+if [ -n "$opt_log" ]; then
+    gens=$(for gen in $(list_gens); do
+               ((diffFrom < gen && gen < diffTo)) && echo $gen
+           done)
+    # Force the $diffTo generation to be included in this list, instead of using
+    # `gen <= diffTo` in the preceding loop, so we encounter an error upon the
+    # event of its nonexistence.
+    gens=$(echo "$gens"
+           echo $diffTo)
+else
+    gens=$diffTo
+fi
+
+temp_make
+add=$(temp_name)
+temp_make
+rem=$(temp_name)
+temp_make
+out=$(temp_name)
+
+for gen in $gens; do
+
+    [ -n "$print_line" ] && echo
+
+    temp_make
+    versB=$(temp_name)
+
+    dirB="${opt_profile}-${gen}-link"
+    refs=$(nix-store -q --references "$dirB")
+    (( $? != 0 )) && exit 1
+    echo "$refs" \
+        | grep -v env-manifest.nix \
+        | sort \
+              > "$versB"
+
+    in=$(comm -3 -1 "$versA" "$versB")
+    sed -r 's:^[^-]*-(.*)$:\1+:' <(echo "$in") \
+        | sort -f \
+               > "$add"
+
+    un=$(comm -3 -2 "$versA" "$versB")
+    sed -r 's:^[^-]*-(.*)$:\1-:' <(echo "$un") \
+        | sort -f \
+               > "$rem"
+
+    cat "$rem" "$add" \
+        | sort -f \
+        | sed -r 's:(.*)-$:- \1:' \
+        | sed -r 's:(.*)\+$:\+ \1:' \
+        | grep -v '^$' \
+              > "$out"
+
+    if [ -n "$opt_query" -o -n "$opt_log" ]; then
+
+        lines=$(wc -l "$out" | cut -d' ' -f1)
+        tag=$(print_tag "$gen")
+        (( $? != 0 )) && exit 1
+        if [ $lines -eq 0 ]; then
+            echo "$tag   (no change)"
+        else
+            echo "$tag"
+        fi
+        cat "$out" \
+            | sed 's:^:    :'
+
+        print_line=1
+
+    else
+        echo "diffing from generation $diffFrom to $diffTo"
+        cat "$out"
+    fi
+
+    versA=$versB
+
+done
+
+exit 0

From a7c4c89138b34d4cd088dbb32afd65119eda20f6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 19 Mar 2017 18:10:40 -0500
Subject: [PATCH 2597/3449] Add top-level attr for lldb_4

---
 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 c8541015746f..51868b21d64b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5384,6 +5384,7 @@ with pkgs;
   lld = llvmPackages_4.lld;
 
   lldb = llvmPackages.lldb;
+  lldb_4 = llvmPackages_4.lldb;
 
   llvm = llvmPackages.llvm;
 

From cf3e1380242a9a216e62f247c73a45006b995186 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 12 Mar 2017 21:45:40 +0000
Subject: [PATCH 2598/3449] objconv: 2.16 -> 2.44

---
 .../tools/misc/objconv/default.nix            | 39 ++++++++++++-------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix
index bae9f07bda48..3c309493a33b 100644
--- a/pkgs/development/tools/misc/objconv/default.nix
+++ b/pkgs/development/tools/misc/objconv/default.nix
@@ -1,26 +1,39 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
   name = "objconv-${version}";
-  version = "2.16";
+  version = "2.44";
 
-  src = fetchFromGitHub {
-    owner  = "vertis";
-    repo   = "objconv";
-    rev    = "${version}";
-    sha256 = "1by2bbrampwv0qy8vn4hhs49rykczyj7q8g373ym38da3c95bym2";
+  src = fetchurl {
+    # Versioned archive of objconv sources maintained by orivej.
+    url = "https://archive.org/download/objconv/${name}.zip";
+    sha256 = "1dlnpv8qwz0rwivpbgk84kmsjz3vh1i149z44ha2dvg8afzyfhjl";
   };
 
-  buildPhase = "c++ -o objconv -O2 src/*.cpp";
+  nativeBuildInputs = [ unzip ];
 
-  installPhase = "mkdir -p $out/bin && mv objconv $out/bin";
+  outputs = [ "out" "doc" ];
+
+  unpackPhase = ''
+    mkdir -p "$name"
+    cd "$name"
+    unpackFile "$src"
+    unpackFile source.zip
+  '';
+
+  buildPhase = "c++ -o objconv -O2 *.cpp";
+
+  installPhase = ''
+    mkdir -p $out/bin $out/doc/objconv
+    mv objconv $out/bin
+    mv objconv-instructions.pdf $out/doc/objconv
+  '';
 
   meta = with stdenv.lib; {
-    description = "Used for converting object files between COFF/PE, OMF, ELF and Mach-O formats for all 32-bit and 64-bit x86 platforms.";
+    description = "Object and executable file converter, modifier and disassembler";
     homepage = http://www.agner.org/optimize/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ vrthra ];
-    platforms = with platforms; unix;
+    maintainers = with maintainers; [ orivej vrthra ];
+    platforms = platforms.unix;
   };
-
 }

From 86571294f5196af933146ce6e53fb02f9ef57ddf Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 18:32:47 -0500
Subject: [PATCH 2599/3449] calcurse: 4.0.0 -> 4.2.2

---
 pkgs/applications/misc/calcurse/default.nix | 25 ++++++++++++---------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix
index 9211ef0ab83e..3f22d1629e27 100644
--- a/pkgs/applications/misc/calcurse/default.nix
+++ b/pkgs/applications/misc/calcurse/default.nix
@@ -1,18 +1,23 @@
-{stdenv, fetchurl, ncurses, gettext}:
+{stdenv, fetchurl, ncurses, gettext, python3, makeWrapper }:
 
-stdenv.mkDerivation {
-  name = "calcurse-4.0.0";
+stdenv.mkDerivation rec {
+  name = "calcurse-${version}";
+  version = "4.2.2";
 
   src = fetchurl {
-    url = http://calcurse.org/files/calcurse-4.0.0.tar.gz;
-    sha256 = "0d33cpkbhyidvm3xx6iw9ljqdvl6477c2kcwix3bs63nj0ch06v2";
+    url = "http://calcurse.org/files/${name}.tar.gz";
+    sha256 = "0il0y06akdqgy0f9p40m4x6arn66nh7sr1w1i41bszycs7div266";
   };
 
-  buildInputs = [ncurses gettext];
+  buildInputs = [ncurses gettext python3 ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  meta = {
+  postInstall = ''
+    makeWrapper ${python3}/bin/python3 $out/bin/calcurse-caldav 
+      '';
+
+  meta = with stdenv.lib; {
     description = "A calendar and scheduling application for the command line";
-    version = "4.0.0";
     longDescription = ''
       calcurse is a calendar and scheduling application for the command line. It helps
       keep track of events, appointments and everyday tasks. A configurable notification
@@ -21,7 +26,7 @@ stdenv.mkDerivation {
       be used to filter and format appointments, making it suitable for use in scripts.
     '';
     homepage = http://calcurse.org/;
-    license = stdenv.lib.licenses.bsd2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
   };
 }

From a31041a1b999a7132ec97b57d08b060ec7c7950d Mon Sep 17 00:00:00 2001
From: Shane Pearlman <shanemikel1@gmail.com>
Date: Sun, 19 Mar 2017 16:30:59 -0700
Subject: [PATCH 2600/3449] nix-diff.sh maintainer script: update usage message
 for new flags

---
 maintainers/scripts/nix-diff.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/nix-diff.sh b/maintainers/scripts/nix-diff.sh
index 9e85b116bc92..0c65e29cf435 100755
--- a/maintainers/scripts/nix-diff.sh
+++ b/maintainers/scripts/nix-diff.sh
@@ -23,7 +23,7 @@
 
 usage() {
     cat <<EOF
-usage: nix-diff.sh [-h] [-p profile | -s] [range]
+usage: nix-diff.sh [-h | [-p profile | -s] [-q] [-l] [range]]
 -h:         print this message before exiting
 -q:         list the derivations installed in the parent generation
 -l:         diff every available intermediate generation between parent and

From c5ce21ec8042c99ad11572843416a58ea400b82c Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 18:34:46 -0500
Subject: [PATCH 2601/3449] tiled: 0.17.0 -> 0.18.2

---
 pkgs/applications/editors/tiled/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 5f2fffa5f508..be518b9336a8 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, qmakeHook
+{ stdenv, fetchFromGitHub, pkgconfig, qmakeHook
 , python, qtbase, qttools, zlib }:
 
 let
 #  qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ];
 in stdenv.mkDerivation rec {
   name = "tiled-${version}";
-  version = "0.17.0";
+  version = "0.18.2";
 
-  src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz";
-    sha256 = "0c9gykxmq0sk0yyfdq81g9psd922scqzn5asskjydj84d80f5z7p";
+  src = fetchFromGitHub {
+    owner = "bjorn";
+    repo = "tiled";
+    rev = "v${version}";
+    sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2";
   };
 
   nativeBuildInputs = [ pkgconfig qmakeHook ];
@@ -26,6 +27,6 @@ in stdenv.mkDerivation rec {
       gpl2Plus	# all the rest
     ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
+    maintainers = [ maintainers.nckx ];
   };
 }

From 86c173cd0297ec85bb36199e1ccd72887a68f61a Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sun, 19 Mar 2017 15:46:38 +0800
Subject: [PATCH 2602/3449] emem: 0.2.43 -> 0.2.44

---
 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 0ac6f21b9fdb..706f39ad2a1f 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.43";
+  version = "0.2.44";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0p3v28vjqyx961sfsd1h2cg2g2q0v03qd87dppbxqp7g5ppls91x";
+    sha256 = "1n91j0hd43nnc1bg2qyrx8kfzc2zkw6dvsf494aa82107r0rqbmf";
   };
 
   phases = [ "buildPhase" "installPhase" ];

From ed64de6295c2ccdaf5fe63ba4c2989aff52617fa Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 19:11:24 -0500
Subject: [PATCH 2603/3449] chirp: 20161018 -> 20170311

---
 pkgs/applications/misc/chirp/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 469da1f6ec42..77c21114ec56 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -1,24 +1,22 @@
 { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
 , python, pyserial, pygtk
 }:
-let
-  version = "20161018";
-in
+
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  inherit version;
+  version = "20170311";
 
   src = fetchurl {
-    url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/chirp-daily-${version}.tar.gz";
-    sha256 = "0f3r919az4vvcgxzqmxvhrxa2byzk5algy7srzzs15ihkvyxcwkb";
+    url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
+    sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
-    makeWrapper
     pyserial pygtk libxml2Python libxslt pyserial
   ];
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  # phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/chirp

From 103c918d719afae7aa82748d229d702383177efb Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 19:14:20 -0500
Subject: [PATCH 2604/3449] Revert "chirp: 20161018 -> 20170311"

---
 pkgs/applications/misc/chirp/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 77c21114ec56..469da1f6ec42 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -1,22 +1,24 @@
 { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
 , python, pyserial, pygtk
 }:
-
+let
+  version = "20161018";
+in
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20170311";
+  inherit version;
 
   src = fetchurl {
-    url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj";
+    url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/chirp-daily-${version}.tar.gz";
+    sha256 = "0f3r919az4vvcgxzqmxvhrxa2byzk5algy7srzzs15ihkvyxcwkb";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
+    makeWrapper
     pyserial pygtk libxml2Python libxslt pyserial
   ];
 
-  # phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/chirp

From c2630d203e26826bc33c77957144640c735b7be5 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 19:23:57 -0500
Subject: [PATCH 2605/3449] chirp: 20161018 -> 20170311

---
 pkgs/applications/misc/chirp/default.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 469da1f6ec42..67d37489feb0 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -1,25 +1,20 @@
 { stdenv, fetchurl, libxml2Python, libxslt, makeWrapper
-, python, pyserial, pygtk
-}:
-let
-  version = "20161018";
-in
+, python, pyserial, pygtk }:
+
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  inherit version;
+  version = "20170311";
 
   src = fetchurl {
-    url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/chirp-daily-${version}.tar.gz";
-    sha256 = "0f3r919az4vvcgxzqmxvhrxa2byzk5algy7srzzs15ihkvyxcwkb";
+    url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
+    sha256 = "0mvj650vm3bfk94b174gl99fj4jigrx38f1iciz1cp3gn8hcrcpj";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
-    makeWrapper
     pyserial pygtk libxml2Python libxslt pyserial
   ];
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   installPhase = ''
     mkdir -p $out/bin $out/share/chirp
     cp -r . $out/share/chirp/

From 00cc586f6fc24edfda18e3ba9c30a81fc0a9e124 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 19:37:21 -0500
Subject: [PATCH 2606/3449] sigil: 0.9.6 -> 0.9.7

---
 pkgs/applications/editors/sigil/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix
index 7a066b068e1a..0c716ed63c14 100644
--- a/pkgs/applications/editors/sigil/default.nix
+++ b/pkgs/applications/editors/sigil/default.nix
@@ -6,10 +6,10 @@
 
 stdenv.mkDerivation rec {
   name = "sigil-${version}";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
-    sha256 = "0hihd5f3avpdvxwp5j80qdg74zbw7p20y6j9q8cw7wd0bak58h9c";
+    sha256 = "17m2f7pj2sx5rxrbry6wk1lvviy8fi2m270h47sisywnrhddarh7";
     rev = version;
     repo = "Sigil";
     owner = "Sigil-Ebook";
@@ -19,11 +19,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = with python3Packages; [ lxml ];
 
+  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+
   buildInputs = [
-    cmake pkgconfig
     boost xercesc qtbase qttools qtwebkit qtxmlpatterns
-    python3 python3Packages.lxml makeWrapper
-  ];
+    python3 python3Packages.lxml ];
 
   preFixup = ''
     wrapProgram "$out/bin/sigil" \
@@ -32,12 +32,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Free, open source, multi-platform ebook (ePub) editor";
     homepage = https://github.com/Sigil-Ebook/Sigil/;
-    license = stdenv.lib.licenses.gpl3;
-    inherit version;
-    maintainers = with stdenv.lib.maintainers; [ ramkromberg ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.gpl3;
+    maintainers =[ maintainers.ramkromberg ];
+    platforms = platforms.linux;
   };
 }

From 501d9c71861b3797b96000a9ab83e32a6bd8d9e0 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 19 Mar 2017 21:46:35 -0300
Subject: [PATCH 2607/3449] lumina: fix kwindowsystem and oxygen-icons5
 attributes

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

diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix
index ed5ad4a2a001..ec5fbb13b323 100644
--- a/nixos/modules/services/x11/desktop-managers/lumina.nix
+++ b/nixos/modules/services/x11/desktop-managers/lumina.nix
@@ -32,8 +32,8 @@ in
 
     environment.systemPackages = [
       pkgs.fluxbox
-      pkgs.qt5.kwindowsystem
-      pkgs.qt5.oxygen-icons5
+      pkgs.libsForQt5.kwindowsystem
+      pkgs.kdeFrameworks.oxygen-icons5
       pkgs.lumina
       pkgs.numlockx
       pkgs.qt5.qtsvg

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 2608/3449] 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 6a62a6256b4f..d2be57b1a5fa 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 baf07b580cdc6358915d04d654cf2027ec845afd Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 20:02:30 -0500
Subject: [PATCH 2609/3449] devilspie2: 0.39 -> 0.42

---
 pkgs/applications/misc/devilspie2/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 96b429691155..4a7c4d7ec304 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -2,18 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "devilspie2-${version}";
-  version = "0.39";
+  version = "0.42";
 
   src = fetchurl {
-    url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_0.39-src.tar.gz";
-    sha256 = "07b74ffc078e5f01525d9da7a1978b4c1a9725b814b344f83a1a203cf4caae09";
+    url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz";
+    sha256 = "119zb9x5i3y4cp30h4113psqxb5d7zxiyijpq02g8kds1wqvrx8i";
   };
 
-  buildInputs = [ intltool pkgconfig glib gtk lua libwnck3 ];
-
-  patchPhase = ''
-    sed -i -e s@/usr/local@$out@ Makefile
-  '';
+  nativeBuildInputs = [ intltool pkgconfig ];
+  buildInputs = [ glib gtk lua libwnck3 ];
 
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
@@ -22,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Devilspie2 is a window matching utility";
+    description = "A window matching utility";
     longDescription = ''
       Devilspie2 is a window matching utility, allowing the user to
       perform scripted actions on windows as they are created. For

From 4c25a47cbd6d8d9f8911499f64669202e96ceff0 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sun, 19 Mar 2017 20:12:46 -0500
Subject: [PATCH 2610/3449] copyq: 2.5.0 -> 2.9.0

---
 pkgs/applications/misc/copyq/default.nix | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 0892f8899324..7461f6853f47 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -1,21 +1,25 @@
-{ stdenv, fetchurl, cmake, qt4, libXfixes, libXtst}:
+{ stdenv, fetchFromGitHub, cmake, qt4, libXfixes, libXtst}:
 
-let version = "2.5.0";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  src  = fetchurl {
-    url    = "https://github.com/hluk/CopyQ/archive/v${version}.tar.gz";
-    sha256 = "7726745056e8d82625531defc75b2a740d3c42131ecce1f3181bc0a0bae51fb1";
+  version = "2.9.0";
+
+  src  = fetchFromGitHub {
+    owner = "hluk";
+    repo = "CopyQ";
+    rev = "v${version}";
+    sha256 = "1gnqsfh50w3qcnbghkpjr5qs42fgl6643lmg4mg4wam8a852s64f";
   };
 
-  buildInputs = [ cmake qt4 libXfixes libXtst ];
+  nativeBuildInputs = [ cmake ];
+  
+  buildInputs = [ qt4 libXfixes libXtst ];
 
   meta = with stdenv.lib; {
-    homepage    = "https://hluk.github.io/CopyQ";
+    homepage    = https://hluk.github.io/CopyQ;
     description = "Clipboard Manager with Advanced Features";
     license     = licenses.gpl3;
-    maintainers = with maintainers; [ willtim ];
+    maintainers = [ maintainers.willtim ];
     # NOTE: CopyQ supports windows and osx, but I cannot test these.
     # OSX build requires QT5.
     platforms   = platforms.linux;

From 8cf11d9c1cecacc5f768848b899f1305a8fc465c Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Mon, 20 Mar 2017 09:24:10 +0800
Subject: [PATCH 2611/3449] emem: 0.2.44 -> 0.2.45

---
 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 706f39ad2a1f..b3424f367f1a 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.44";
+  version = "0.2.45";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1n91j0hd43nnc1bg2qyrx8kfzc2zkw6dvsf494aa82107r0rqbmf";
+    sha256 = "1qjlz0sqjhx11vw8cc39h0sjgnfkrhgh94pv84z37b8hn42qingb";
   };
 
   phases = [ "buildPhase" "installPhase" ];

From 9634d9e4fc30b456bf0be117c49524d6a81bf63c Mon Sep 17 00:00:00 2001
From: Adelbert Chang <adelbertc@gmail.com>
Date: Sun, 19 Mar 2017 20:58:24 -0700
Subject: [PATCH 2612/3449] coursier: init at 1.0.0-M15

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

diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
new file mode 100644
index 000000000000..70003bc8802e
--- /dev/null
+++ b/pkgs/development/tools/coursier/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name    = "coursier-${version}";
+  version = "1.0.0-M15-5";
+
+  src = fetchurl {
+    url    = "https://github.com/coursier/coursier/raw/v${version}/coursier";
+    sha256 = "610c5fc08d0137c5270cefd14623120ab10cd81b9f48e43093893ac8d00484c9";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = "installPhase";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${src} $out/bin/coursier
+    chmod +x $out/bin/coursier
+    wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin ;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage    = http://get-coursier.io/;
+    description = "A Scala library to fetch dependencies from Maven / Ivy repositories";
+    license     = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63821dedc2b1..2577697f69ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -804,6 +804,8 @@ with pkgs;
 
   coturn = callPackage ../servers/coturn { };
 
+  coursier = callPackage ../development/tools/coursier {};
+
   crunch = callPackage ../tools/security/crunch { };
 
   crudini = callPackage ../tools/misc/crudini { };

From 93446a20600cd3b6c19182ea3f653a1ea2b2d305 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 20 Mar 2017 06:37:01 +0200
Subject: [PATCH 2613/3449] release.nix: Don't block release on aarch64
 failures

---
 pkgs/top-level/release.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3a9a304a72d2..b5207879a5e6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -41,23 +41,18 @@ let
               jobs.lib-tests
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
-              jobs.stdenv.aarch64-linux
               jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.linux.i686-linux
-              jobs.linux.aarch64-linux
               jobs.python.x86_64-linux
               jobs.python.i686-linux
-              jobs.python.aarch64-linux
               jobs.python.x86_64-darwin
               jobs.python3.x86_64-linux
               jobs.python3.i686-linux
-              jobs.python3.aarch64-linux
               jobs.python3.x86_64-darwin
               # Many developers use nix-repl
               jobs.nix-repl.x86_64-linux
               jobs.nix-repl.i686-linux
-              jobs.nix-repl.aarch64-linux
               jobs.nix-repl.x86_64-darwin
               # Needed by travis-ci to test PRs
               jobs.nox.i686-linux
@@ -66,7 +61,6 @@ let
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
               jobs.thunderbird.i686-linux
-              jobs.thunderbird.aarch64-linux
               # Ensure that basic stuff works on darwin
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin

From fee7e73538a25cac95e705c605f438df7e7eb71d Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Mon, 20 Mar 2017 00:23:06 -0400
Subject: [PATCH 2614/3449] Adding self as maintainer

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d6cb2722b33c..514e62bb916b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -82,6 +82,7 @@
   bzizou = "Bruno Bzeznik <Bruno@bzizou.net>";
   c0dehero = "CodeHero <codehero@nerdpol.ch>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
+  calvertvl = "Victor Calvert <calvertvl@gmail.com>";
   campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
   canndrew = "Andrew Cann <shum@canndrew.org>";
   carlsverre = "Carl Sverre <accounts@carlsverre.com>";

From bae9315a33e825cfb0a625fcdf91bec8df2ccad8 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Mon, 20 Mar 2017 00:25:50 -0400
Subject: [PATCH 2615/3449] src: 1.11 -> 1.12

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

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index 2bff15adc69d..d2bb68873720 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, python, rcs, git }:
 
 stdenv.mkDerivation rec {
-  name = "src-1.11";
+  name = "src-${version}";
+  version = "1.12";
 
   src = fetchurl {
     url = "http://www.catb.org/~esr/src/${name}.tar.gz";
-    sha256 = "07kj0ri0s0vn8s54yvkyzaag332spxs0379r718b80y31c4mgbyl";
+    sha256 = "1m6rjbizx9win3jkciyx176sfy98r5arb1g3l6aqnqam9gpr44zm";
   };
 
   buildInputs = [ python rcs git ];
@@ -16,10 +17,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Simple single-file revision control";
     homepage = http://www.catb.org/~esr/src/;
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ calvertvl ];
   };
 }

From 6e587c29dc78bb7944a685cfafbe4b6663a3cf97 Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Mon, 20 Mar 2017 00:27:49 -0400
Subject: [PATCH 2616/3449] src: wrap to properly resolve rcs at runtime

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

diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix
index d2bb68873720..2fd45ec7fc02 100644
--- a/pkgs/applications/version-management/src/default.nix
+++ b/pkgs/applications/version-management/src/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, rcs, git }:
+{ stdenv, fetchurl, python, rcs, git, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "src-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1m6rjbizx9win3jkciyx176sfy98r5arb1g3l6aqnqam9gpr44zm";
   };
 
-  buildInputs = [ python rcs git ];
+  buildInputs = [ python rcs git makeWrapper ];
 
   preConfigure = ''
     patchShebangs .
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "prefix=$(out)" ];
 
+  postInstall = ''
+    wrapProgram $out/bin/src \
+      --suffix PATH ":" "${rcs}/bin"
+  '';
+
   meta = with stdenv.lib; {
     description = "Simple single-file revision control";
     homepage = http://www.catb.org/~esr/src/;

From addffa41b4bd8db87c67fa999d1c1b3f1b168ef4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 11 Mar 2017 16:36:56 +0200
Subject: [PATCH 2617/3449] kmscube: 2016-09-19 -> 2017-03-19

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

diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index 0b707ef7239a..079bfb7c5be1 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }:
+{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "kmscube-2016-09-19";
+  name = "kmscube-2017-03-19";
 
-  src = fetchFromGitHub {
-    owner = "robclark";
-    repo = "kmscube";
-    rev = "8c6a20901f95e1b465bbca127f9d47fcfb8762e6";
-    sha256 = "045pf4q3g5b54cdbxppn1dxpcn81h630vmhrixz1d5bcl822nhwj";
+  src = fetchgit {
+    url = git://anongit.freedesktop.org/mesa/kmscube;
+    rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
+    sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 031332ca9d864528ac1f0c75121b4be4a911e2f8 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Mon, 20 Mar 2017 08:18:34 +0100
Subject: [PATCH 2618/3449] update rustPackages

---
 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 1659208f76f2..ad147179f68f 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-13";
-  rev = "e5b7b45fa4e1168715a1132a65ad89fbc1d5ed82";
-  sha256 = "1glwd7b5ckiw2nzc28djyarml21cqdajc1jn03vzf4sl58bvahyb";
+  version = "2017-03-19";
+  rev = "6ac4724ed839594a132f5199d70d40fa15bd6b7a";
+  sha256 = "159b82zma3y0kcg55c6zm6ddsw4jm0c4y85b6l1ny108l9k3hy79";
 
   src = fetchFromGitHub {
       inherit rev;

From ac87d9ba8bb2a6602bd267c90ddcf25cfe29498f Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 18 Mar 2017 21:15:27 +0100
Subject: [PATCH 2619/3449] Add a setup-hook to ocamlPackages.eliom, to look
 for distillery templates

---
 pkgs/development/ocaml-modules/eliom/default.nix   | 2 ++
 pkgs/development/ocaml-modules/eliom/setup-hook.sh | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/eliom/setup-hook.sh

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 57f3477edf6b..d21bd5977ee5 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec
 
   createFindlibDestdir = true;
 
+  setupHook = [ ./setup-hook.sh ];
+
   meta = {
     homepage = http://ocsigen.org/eliom/;
     description = "Ocaml Framework for programming Web sites and client/server Web applications";
diff --git a/pkgs/development/ocaml-modules/eliom/setup-hook.sh b/pkgs/development/ocaml-modules/eliom/setup-hook.sh
new file mode 100644
index 000000000000..096d8f8bf635
--- /dev/null
+++ b/pkgs/development/ocaml-modules/eliom/setup-hook.sh
@@ -0,0 +1,5 @@
+addOcsigenDistilleryTemplate() {
+    addToSearchPathWithCustomDelimiter : ELIOM_DISTILLERY_PATH $1/eliom-distillery-templates
+}
+
+envHooks+=(addOcsigenDistilleryTemplate)

From 15d3f8e7835b5d9b3fe17c3712bfbfc841339228 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 02:54:54 +0300
Subject: [PATCH 2620/3449] sd-image-armv7l-multiplatform module: enable
 ODROID-XU3 console

---
 .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 0b858746ff0a..118ed20d47f5 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -28,7 +28,7 @@ in
   boot.loader.generic-extlinux-compatible.enable = true;
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"];
+  boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=ttySAC2,115200n8" "console=tty0"];
 
   # FIXME: this probably should be in installation-device.nix
   users.extraUsers.root.initialHashedPassword = "";

From a9d44b5c308c022ab198394e315d04f49a542fb6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 11:06:20 +0300
Subject: [PATCH 2621/3449] ubootOdroidXU3: init

---
 pkgs/misc/uboot/default.nix     | 6 ++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index f0ec5f483d40..5d9c83059c76 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -83,6 +83,12 @@ in rec {
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
+  ubootOdroidXU3 = buildUBoot rec {
+    defconfig = "odroid-xu3_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
     targetPlatforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63821dedc2b1..6128efa6c498 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12131,6 +12131,7 @@ with pkgs;
     ubootBananaPi
     ubootBeagleboneBlack
     ubootJetsonTK1
+    ubootOdroidXU3
     ubootPcduino3Nano
     ubootRaspberryPi
     ubootRaspberryPi2

From 091073819a8e1cf98b7bb02f4a8d2e3af97b67e4 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 14:44:15 +0100
Subject: [PATCH 2622/3449] ocamlPackages.ocsigen-start: init at 1.0.0

---
 .../ocaml-modules/ocsigen-start/default.nix   | 34 +++++++++++++++++++
 .../ocsigen-start/templates-dir.patch         | 13 +++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocsigen-start/default.nix
 create mode 100644 pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch

diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
new file mode 100644
index 000000000000..13794602af4f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }:
+
+buildOcaml rec
+{
+  name = "ocsigen-start";
+  version = "1.0.0";
+
+  buildInputs = [ eliom ];
+  propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ];
+
+  patches = [ ./templates-dir.patch ];
+
+  postPatch = ''
+  substituteInPlace "src/os_db.ml" --replace "citext" "text"
+  '';
+  
+  src = fetchurl {
+    url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
+    sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll";
+  };
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = http://ocsigen.org/ocsigen-start;
+    description = "Eliom application skeleton";
+    longDescription =''
+     An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc.
+      '';
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+  };
+
+}
diff --git a/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch
new file mode 100644
index 000000000000..38365a26b99a
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocsigen-start/templates-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/install.sh b/scripts/install.sh
+index f88ae11..d6aae70 100755
+--- a/scripts/install.sh
++++ b/scripts/install.sh
+@@ -11,9 +11,9 @@ fi
+ 
+ TPL_DIR=$1
+ TPL_NAME=$2
+-DEST0=$DESTDIR/$(eliom-distillery -dir)
++DEST0=$out/eliom-distillery-templates
+ DEST=$DEST0/$TPL_NAME
+ 
+ mkdir -p $DEST0
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f46aa3a251c7..2291a4995152 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -384,6 +384,8 @@ let
 
     ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
 
+    ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
+
     ocsigen-toolkit = callPackage ../development/ocaml-modules/ocsigen-toolkit { };
 
     ojquery = callPackage ../development/ocaml-modules/ojquery { };

From e4d39749f288680c44152cdef7d438fe06534479 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 4 Mar 2017 14:46:04 +0100
Subject: [PATCH 2623/3449] ocsigen-i18n: init at 3.1

---
 .../tools/ocaml/ocsigen-i18n/default.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/ocsigen-i18n/default.nix

diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
new file mode 100644
index 000000000000..c212ce324b33
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ocamlPackages }:
+
+stdenv.mkDerivation rec
+{
+  name = "ocsigen-i18n";
+  version = "3.1.0";
+
+  buildInputs = with ocamlPackages; [ ocaml findlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make bindir=$out/bin install
+  '';
+
+  src = fetchurl {
+    url = "https://github.com/besport/${name}/archive/${version}.tar.gz";
+    sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178";
+  };
+
+  meta = {
+    homepage = https://github.com/besport/ocsigen-i18n;
+    description = "I18n made easy for web sites written with eliom";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.gal_bolle ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63821dedc2b1..9fc039398556 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5496,6 +5496,10 @@ with pkgs;
 
   ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { };
 
+  ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n {
+    ocamlPackages = ocamlPackages_4_03;
+  };
+
   opa = callPackage ../development/compilers/opa {
     nodejs = nodejs-4_x;
     ocamlPackages = ocamlPackages_4_02;

From 74c4e30842657d09ec1cf000af89f95df27c6632 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 20 Mar 2017 10:30:51 +0200
Subject: [PATCH 2624/3449] Revert "nixos: build for aarch64-linux"

This reverts commit b806e25d65421d7aa0a524ce1601f0e51099df11.

This seems to push Hydra's memory usage out of the roof fail nixos
evaluating with:

Too many heap sections: Increase MAXHINCR or MAX_HEAP_SECTS

Let's revert this for now. It's not a big deal at all since the
nixpkgs-unstable jobset is still building the packages.
---
 nixos/release-combined.nix | 2 +-
 nixos/release.nix          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 1953fd1a26a7..63ca39a9b602 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -4,7 +4,7 @@
 
 { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ]
+, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
 }:
 
 let
diff --git a/nixos/release.nix b/nixos/release.nix
index 325047ce10c4..d5cea1fe96c8 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -1,6 +1,6 @@
 { nixpkgs ? { outPath = ./..; revCount = 56789; shortRev = "gfedcba"; }
 , stableBranch ? false
-, supportedSystems ? [ "x86_64-linux" "i686-linux" "aarch64-linux" ]
+, supportedSystems ? [ "x86_64-linux" "i686-linux" ]
 }:
 
 with import ../lib;

From c1e279046b7517c803d4339f82a48ccf3c3405c8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 11:52:08 +0300
Subject: [PATCH 2625/3449] odroid-xu3-bootloader: init at 2015-12-04

---
 .../misc/odroid-xu3-bootloader/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/odroid-xu3-bootloader/default.nix

diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
new file mode 100644
index 000000000000..595b0d84ff57
--- /dev/null
+++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, coreutils, ubootOdroidXU3 }:
+
+stdenv.mkDerivation {
+  name = "odroid-xu3-bootloader-2015-12-04";
+
+  src = fetchFromGitHub {
+    owner = "hardkernel";
+    repo = "u-boot";
+    rev = "bbdea1841c4fbf767dcaf9d7ae8d3a46af235c4d";
+    sha256 = "03rvyfj147xh83w8hlvbxix131l3nnvk8n517fdhv9nil1l8dd71";
+  };
+
+  buildCommand = ''
+    install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/*.hardkernel
+    ln -sf ${ubootOdroidXU3}/u-boot.bin $out/lib/sd_fuse-xu3/u-boot.bin.hardkernel
+
+    install -Dm755 $src/sd_fuse/hardkernel/sd_fusing.sh $out/bin/sd_fuse-xu3
+    sed -i \
+      -e '1i#!${stdenv.shell}' \
+      -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \
+      -e "s,if=\./,if=$out/lib/sd_fuse-xu3/,g" \
+      $out/bin/sd_fuse-xu3
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    license = licenses.unfreeRedistributableFirmware;
+    description = "Secure boot enabled boot loader for ODROID-XU{3,4}";
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6128efa6c498..c7188bc7f3a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11935,6 +11935,8 @@ with pkgs;
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
 
+  odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
+
   pagemon = callPackage ../os-specific/linux/pagemon { };
 
   pam = callPackage ../os-specific/linux/pam { };

From d3028ba6b5a15ee3085434f3761f5737790e079f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 14 Mar 2017 09:57:49 +0100
Subject: [PATCH 2626/3449] LTS Haskell 8.5

---
 .../configuration-hackage2nix.yaml            | 133 +++++++++++++-----
 1 file changed, 99 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b693a55de55f..a2383d48eee0 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.4
+  # LTS Haskell 8.5
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
   - AC-Vector ==2.3.2
@@ -65,7 +65,7 @@ default-package-overrides:
   - airship ==0.6.0
   - alarmclock ==0.4.0.2
   - alex ==3.2.1
-  - alternators ==0.1.1.0
+  - alternators ==0.1.1.1
   - ALUT ==2.4.0.2
   - amazonka ==1.4.5
   - amazonka-apigateway ==1.4.5
@@ -209,9 +209,11 @@ default-package-overrides:
   - base64-string ==0.2
   - basic-prelude ==0.6.1.1
   - bcrypt ==0.0.10
+  - bench ==1.0.3
   - benchpress ==0.2.2.9
   - bencode ==0.6.0.0
   - bento ==0.1.0
+  - between ==0.11.0.0
   - bifunctors ==5.4.1
   - bimap ==0.3.2
   - bimap-server ==0.1.0.1
@@ -235,6 +237,8 @@ default-package-overrides:
   - biofastq ==0.1
   - biopsl ==0.4
   - bitarray ==0.0.1.1
+  - bitcoin-api ==0.12.1
+  - bitcoin-api-extra ==0.9.1
   - bitcoin-block ==0.13.1
   - bitcoin-script ==0.11.1
   - bitcoin-tx ==0.13.1
@@ -256,6 +260,8 @@ default-package-overrides:
   - bloodhound ==0.12.1.0
   - blosum ==0.1.1.4
   - bmp ==1.2.6.3
+  - boltzmann-samplers ==0.1.0.0
+  - bookkeeping ==0.2.1.1
   - bool-extras ==0.4.0
   - Boolean ==0.2.4
   - boolean-like ==0.1.1.0
@@ -296,7 +302,7 @@ default-package-overrides:
   - cabal-helper ==0.7.3.0
   - cabal-rpm ==0.11
   - cache ==0.1.0.0
-  - cacophony ==0.9.1
+  - cacophony ==0.9.2
   - cairo ==0.13.3.1
   - call-stack ==0.1.0
   - camfort ==0.901
@@ -365,7 +371,7 @@ default-package-overrides:
   - cmark ==0.5.5
   - cmark-highlight ==0.2.0.0
   - cmark-lucid ==0.1.0.0
-  - cmdargs ==0.10.14
+  - cmdargs ==0.10.15
   - code-builder ==0.1.3
   - code-page ==0.1.2
   - codo-notation ==0.5.2
@@ -382,7 +388,7 @@ default-package-overrides:
   - concurrent-output ==1.7.9
   - concurrent-supply ==0.1.8
   - conduit ==1.2.9
-  - conduit-combinators ==1.1.0
+  - conduit-combinators ==1.1.1
   - conduit-connection ==0.1.0.3
   - conduit-extra ==1.1.15
   - conduit-iconv ==0.1.1.1
@@ -392,6 +398,7 @@ default-package-overrides:
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - connection ==0.2.7
+  - connection-pool ==0.2.1
   - console-style ==0.0.2.1
   - constraints ==0.9
   - consul-haskell ==0.4.2
@@ -402,6 +409,10 @@ default-package-overrides:
   - control-monad-free ==0.6.1
   - control-monad-loop ==0.1
   - control-monad-omega ==0.3.1
+  - conversion ==1.2.1
+  - conversion-bytestring ==1.0.1
+  - conversion-case-insensitive ==1.0.0.0
+  - conversion-text ==1.0.1
   - convert-annotation ==0.5.0.1
   - convertible ==1.1.1.0
   - cookie ==0.4.2.1
@@ -437,6 +448,7 @@ default-package-overrides:
   - cryptonite ==0.21
   - cryptonite-conduit ==0.2.0
   - cryptonite-openssl ==0.5
+  - csp ==1.3.1
   - css-syntax ==0.0.5
   - css-text ==0.1.2.2
   - csv ==0.1.2
@@ -500,11 +512,13 @@ default-package-overrides:
   - directory-tree ==0.12.1
   - discount ==0.1.1
   - disk-free-space ==0.1.0.1
+  - disposable ==0.2.0.0
   - distance ==0.1.0.0
   - distributed-closure ==0.3.3.0
   - distributed-process ==0.6.6
   - distributed-process-simplelocalnet ==0.2.3.3
   - distributed-static ==0.3.5.0
+  - distribution ==1.1.0.0
   - distribution-nixpkgs ==1.0.0.1
   - distributive ==0.5.2
   - diversity ==0.8.0.2
@@ -533,6 +547,7 @@ default-package-overrides:
   - drifter ==0.2.2
   - drifter-postgresql ==0.1.0
   - dual-tree ==0.2.0.9
+  - dvorak ==0.1.0.0
   - dynamic-state ==0.2.2.0
   - dyre ==0.8.12
   - Earley ==0.11.0.1
@@ -546,12 +561,14 @@ default-package-overrides:
   - edit-distance ==0.2.2.1
   - editor-open ==0.6.0.0
   - effect-handlers ==0.1.0.8
+  - effin ==0.3.0.2
   - either ==4.4.1.1
   - either-unwrap ==1.1
   - ekg ==0.4.0.12
   - ekg-core ==0.1.1.1
   - ekg-json ==0.1.0.4
   - ekg-statsd ==0.2.1.0
+  - ekg-wai ==0.1.0.0
   - elerea ==2.9.0
   - elm-bridge ==0.4.0
   - elm-core-sources ==1.0.0
@@ -561,6 +578,8 @@ default-package-overrides:
   - emailaddress ==0.2.0.0
   - enclosed-exceptions ==1.0.2
   - encoding-io ==0.0.1
+  - engine-io ==1.2.15
+  - engine-io-wai ==1.0.6
   - EntrezHTTP ==1.0.3
   - entropy ==0.3.7
   - enummapset-th ==0.6.1.1
@@ -594,6 +613,7 @@ default-package-overrides:
   - extensible-effects ==1.11.0.4
   - extensible-exceptions ==0.1.1.4
   - extra ==1.5.1
+  - extract-dependencies ==0.2.0.1
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
   - fast-builder ==0.0.0.6
@@ -650,6 +670,8 @@ default-package-overrides:
   - free ==4.12.4
   - free-vl ==0.1.4
   - freenect ==1.2.1
+  - freer ==0.2.4.1
+  - freer-effects ==0.3.0.0
   - friendly-time ==0.4
   - frisby ==0.2
   - from-sum ==0.2.1.0
@@ -660,9 +682,10 @@ default-package-overrides:
   - fuzzcheck ==0.1.1
   - gd ==3000.7.3
   - Genbank ==1.0.3
+  - general-games ==1.0.3
   - generic-aeson ==0.2.0.8
   - generic-deriving ==1.11.1
-  - generic-random ==0.4.0.0
+  - generic-random ==0.4.1.0
   - generic-xmlpickler ==0.1.0.5
   - GenericPretty ==1.2.1
   - generics-eot ==0.2.1.1
@@ -701,6 +724,7 @@ default-package-overrides:
   - gio ==0.13.3.1
   - gipeda ==0.3.3.1
   - giphy-api ==0.5.2.0
+  - git ==0.2.0
   - github ==0.15.0
   - github-release ==1.0.1
   - github-types ==0.2.1
@@ -832,6 +856,12 @@ default-package-overrides:
   - gravatar ==0.8.0
   - graylog ==0.1.0.1
   - groom ==0.1.2
+  - groundhog ==0.8
+  - groundhog-inspector ==0.8
+  - groundhog-mysql ==0.8
+  - groundhog-postgresql ==0.8
+  - groundhog-sqlite ==0.8
+  - groundhog-th ==0.8
   - grouped-list ==0.2.1.2
   - groupoids ==4.0
   - groups ==0.4.0.0
@@ -851,14 +881,16 @@ default-package-overrides:
   - hamilton ==0.1.0.0
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
+  - handwriting ==0.1.0.3
   - hapistrano ==0.2.1.2
   - happstack-authenticate ==2.3.4.7
   - happstack-clientsession ==7.3.1
-  - happstack-hsp ==7.3.7.1
+  - happstack-hsp ==7.3.7.2
   - happstack-jmacro ==7.0.11
-  - happstack-server ==7.4.6.3
+  - happstack-server ==7.4.6.4
   - happstack-server-tls ==7.1.6.2
   - happy ==1.19.5
+  - HaRe ==0.8.4.0
   - harp ==0.4.2
   - hasbolt ==0.1.1.1
   - hashable ==1.2.5.0
@@ -868,6 +900,7 @@ default-package-overrides:
   - haskeline ==0.7.3.1
   - haskell-gi ==0.20
   - haskell-gi-base ==0.20
+  - haskell-import-graph ==1.0.1
   - haskell-lexer ==1.0.1
   - haskell-names ==0.8.0
   - haskell-neo4j-client ==0.3.2.4
@@ -916,6 +949,7 @@ default-package-overrides:
   - heterocephalus ==1.0.4.0
   - hex ==0.1.2
   - hexml ==0.3.1
+  - hexpat ==0.20.10
   - hexstring ==0.11.1
   - hflags ==0.4.2
   - hformat ==0.1.0.1
@@ -953,6 +987,7 @@ default-package-overrides:
   - hOpenPGP ==2.5.5
   - hopenpgp-tools ==0.19.4
   - hopenssl ==1.7
+  - hopfli ==0.2.1.1
   - hosc ==0.15
   - hostname ==1.0
   - hostname-validate ==1.0.0
@@ -1113,6 +1148,7 @@ default-package-overrides:
   - iso3166-country-codes ==0.20140203.8
   - iso639 ==0.1.0.3
   - iso8601-time ==0.1.4
+  - isotope ==0.4.0.0
   - iterable ==3.0
   - ix-shapable ==0.1.0
   - ixset ==1.0.7
@@ -1132,7 +1168,7 @@ default-package-overrides:
   - json-rpc-generic ==0.2.1.2
   - json-schema ==0.7.4.1
   - json-stream ==0.4.1.3
-  - JuicyPixels ==3.2.8
+  - JuicyPixels ==3.2.8.1
   - JuicyPixels-extra ==0.1.1
   - JuicyPixels-scale-dct ==0.1.1.2
   - jvm ==0.1.2
@@ -1151,11 +1187,11 @@ default-package-overrides:
   - knob ==0.1.1
   - koofr-client ==1.0.0.3
   - kraken ==0.0.3
-  - l10n ==0.1.0.0
+  - l10n ==0.1.0.1
   - labels ==0.3.2
   - lackey ==0.4.2
   - language-c ==0.5.0
-  - language-c-quote ==0.11.7.1
+  - language-c-quote ==0.11.7.3
   - language-dockerfile ==0.3.5.0
   - language-ecmascript ==0.17.1.0
   - language-fortran ==0.5.1
@@ -1229,7 +1265,7 @@ default-package-overrides:
   - lzma-conduit ==1.1.3.1
   - machines ==0.6.1
   - machines-binary ==0.3.0.3
-  - machines-directory ==0.2.0.10
+  - machines-directory ==0.2.1.0
   - machines-io ==0.2.0.13
   - machines-process ==0.2.0.8
   - magic ==1.1
@@ -1240,8 +1276,11 @@ default-package-overrides:
   - markdown ==0.1.16
   - markdown-unlit ==0.4.0
   - markup ==3.1.0
+  - marvin ==0.2.3
+  - marvin-interpolate ==1.1
   - math-functions ==0.2.1.0
   - mathexpr ==0.3.0.0
+  - matplotlib ==0.4.1
   - matrices ==0.4.4
   - matrix ==0.3.5.0
   - matrix-market-attoparsec ==0.1.0.5
@@ -1249,7 +1288,7 @@ default-package-overrides:
   - mbox ==0.3.3
   - mcmc-types ==1.0.3
   - median-stream ==0.7.0.0
-  - mega-sdist ==0.3.0
+  - mega-sdist ==0.3.0.2
   - megaparsec ==5.2.0
   - memory ==0.14.1
   - MemoTrie ==0.6.7
@@ -1262,21 +1301,22 @@ default-package-overrides:
   - mfsolve ==0.3.2.0
   - microbench ==0.1
   - microformats2-parser ==1.0.1.6
-  - microlens ==0.4.7.0
+  - microlens ==0.4.8.0
   - microlens-aeson ==2.2.0
   - microlens-contra ==0.1.0.1
-  - microlens-ghc ==0.4.7.0
+  - microlens-ghc ==0.4.8.0
   - microlens-mtl ==0.1.10.0
-  - microlens-platform ==0.3.7.1
+  - microlens-platform ==0.3.8.0
   - microlens-th ==0.4.1.1
   - mighty-metropolis ==1.2.0
-  - mime-mail ==0.4.13
+  - mime-mail ==0.4.13.1
   - mime-mail-ses ==0.3.2.3
   - mime-types ==0.1.0.7
   - mintty ==0.1
   - misfortune ==0.1.1.2
   - missing-foreign ==0.1.1
   - MissingH ==1.4.0.1
+  - mixed-types-num ==0.1.0.1
   - mmap ==0.5.9
   - mmorph ==1.0.9
   - mockery ==0.3.4
@@ -1330,6 +1370,7 @@ default-package-overrides:
   - multistate ==0.7.1.1
   - murmur-hash ==0.1.0.9
   - MusicBrainz ==0.2.4
+  - mustache ==2.1.2
   - mutable-containers ==0.3.3
   - mwc-probability ==1.3.0
   - mwc-random ==0.13.5.0
@@ -1380,6 +1421,7 @@ default-package-overrides:
   - nix-paths ==1.0.0.1
   - non-empty-sequence ==0.2.0.2
   - nonce ==1.0.2
+  - nondeterminism ==1.4
   - NoTrace ==0.3.0.1
   - nsis ==0.3.1
   - numbers ==3000.2.0.1
@@ -1413,13 +1455,14 @@ default-package-overrides:
   - opml-conduit ==0.6.0.1
   - optional-args ==1.0.1
   - options ==1.2.1.1
-  - optparse-applicative ==0.13.1.0
+  - optparse-applicative ==0.13.2.0
   - optparse-generic ==1.1.4
   - optparse-helper ==0.2.1.1
   - optparse-simple ==0.0.3
   - optparse-text ==0.1.1.0
   - osdkeys ==0.0
   - overloaded-records ==0.4.2.0
+  - package-description-remote ==0.2.0.0
   - packdeps ==0.4.3
   - pager ==0.1.1.0
   - pagerduty ==0.0.8
@@ -1457,13 +1500,13 @@ default-package-overrides:
   - permutation ==0.5.0.5
   - persistable-record ==0.4.1.1
   - persistable-types-HDBC-pg ==0.0.1.4
-  - persistent ==2.6
-  - persistent-mysql ==2.6
-  - persistent-postgresql ==2.6
+  - persistent ==2.6.1
+  - persistent-mysql ==2.6.0.1
+  - persistent-postgresql ==2.6.1
   - persistent-redis ==2.5.2
   - persistent-refs ==0.4
-  - persistent-sqlite ==2.6.0.1
-  - persistent-template ==2.5.1.6
+  - persistent-sqlite ==2.6.2
+  - persistent-template ==2.5.2
   - pgp-wordlist ==0.1.0.2
   - phantom-state ==0.2.1.2
   - picedit ==0.2.3.0
@@ -1473,7 +1516,7 @@ default-package-overrides:
   - pinch ==0.3.0.2
   - pinchot ==0.24.0.0
   - pipes ==4.3.2
-  - pipes-attoparsec ==0.5.1.4
+  - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.4
   - pipes-cacophony ==0.4.1
   - pipes-category ==0.2.0.1
@@ -1509,6 +1552,7 @@ default-package-overrides:
   - post-mess-age ==0.2.1.0
   - postgresql-binary ==0.9.3
   - postgresql-libpq ==0.9.3.0
+  - postgresql-schema ==0.1.10
   - postgresql-simple ==0.5.2.1
   - postgresql-simple-migration ==0.1.9.0
   - postgresql-simple-url ==0.2.0.0
@@ -1567,9 +1611,10 @@ default-package-overrides:
   - quickcheck-instances ==0.3.12
   - quickcheck-io ==0.1.4
   - quickcheck-simple ==0.1.0.1
-  - quickcheck-special ==0.1.0.3
+  - quickcheck-special ==0.1.0.4
   - quickcheck-text ==0.1.2.1
   - quickcheck-unicode ==1.0.0.1
+  - raaz ==0.1.1
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
   - ramus ==0.1.2
@@ -1611,6 +1656,7 @@ default-package-overrides:
   - reform-happstack ==0.2.5.1
   - reform-hsp ==0.2.7.1
   - RefSerialize ==0.4.0
+  - regex ==0.5.0.0
   - regex-applicative ==0.3.3
   - regex-applicative-text ==0.1.0.1
   - regex-base ==0.93.2
@@ -1666,9 +1712,9 @@ default-package-overrides:
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
   - safe ==0.3.14
-  - safe-exceptions ==0.1.4.0
+  - safe-exceptions ==0.1.5.0
   - safe-exceptions-checked ==0.1.0
-  - safecopy ==0.9.2
+  - safecopy ==0.9.3
   - SafeSemaphore ==0.10.1
   - sampling ==0.3.2
   - sandi ==0.4.0
@@ -1680,11 +1726,13 @@ default-package-overrides:
   - scanner ==0.2
   - scientific ==0.3.4.10
   - scotty ==0.11.0
+  - scrape-changes ==0.1.0.5
   - scrypt ==0.5.0
   - sdl2 ==2.2.0
   - sdl2-gfx ==0.2
   - sdl2-image ==2.0.0
   - sdl2-mixer ==0.1
+  - search-algorithms ==0.1.0
   - securemem ==0.1.9
   - SegmentTree ==0.3
   - semigroupoid-extras ==5
@@ -1729,6 +1777,7 @@ default-package-overrides:
   - shake-language-c ==0.10.0
   - shakespeare ==2.0.12.1
   - shell-conduit ==4.5.2
+  - shelly ==1.6.8.3
   - shortcut-links ==0.4.2.0
   - should-not-typecheck ==2.1.0
   - show-prettyprint ==0.1.2
@@ -1790,7 +1839,8 @@ default-package-overrides:
   - sqlite-simple ==0.4.13.0
   - sqlite-simple-errors ==0.6.0.0
   - srcloc ==0.5.1.0
-  - stache ==0.2.0
+  - stache ==0.2.1
+  - stack-run-auto ==0.1.1.4
   - stack-type ==0.1.0.0
   - state-plus ==0.1.2
   - stateref ==0.3
@@ -1806,7 +1856,7 @@ default-package-overrides:
   - stm-conduit ==3.0.0
   - stm-containers ==0.2.15
   - stm-delay ==0.1.1.1
-  - stm-extras ==0.1.0.1
+  - stm-extras ==0.1.0.2
   - stm-stats ==0.2.0.0
   - stm-supply ==0.2.0.0
   - STMonadTrans ==0.4.3
@@ -1814,6 +1864,7 @@ default-package-overrides:
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.3.1
+  - store-core ==0.4
   - Strafunski-StrategyLib ==5.0.0.10
   - stratosphere ==0.4.1
   - streaming ==0.1.4.5
@@ -1885,6 +1936,7 @@ default-package-overrides:
   - tasty-rerun ==1.1.6
   - tasty-silver ==3.1.9
   - tasty-smallcheck ==0.8.1
+  - tasty-stats ==0.2.0.2
   - tasty-tap ==0.0.4
   - tasty-th ==0.1.4
   - Taxonomy ==1.0.2
@@ -1892,7 +1944,7 @@ default-package-overrides:
   - tce-conf ==1.3
   - tcp-streams ==0.6.0.0
   - tcp-streams-openssl ==0.6.0.0
-  - telegram-api ==0.6.0.2
+  - telegram-api ==0.6.1.0
   - template ==0.2.0.10
   - temporary ==1.2.0.4
   - temporary-rc ==1.2.0.3
@@ -1907,7 +1959,7 @@ default-package-overrides:
   - test-framework-th ==0.2.4
   - test-simple ==0.1.9
   - testing-feat ==0.4.0.3
-  - texmath ==0.9.1
+  - texmath ==0.9.3
   - text ==1.2.2.1
   - text-all ==0.3.0.2
   - text-binary ==0.2.1.1
@@ -1935,10 +1987,12 @@ default-package-overrides:
   - th-reify-compat ==0.0.1.1
   - th-reify-many ==0.1.6
   - th-to-exp ==0.0.1.0
+  - th-utilities ==0.2.0.1
   - these ==0.7.3
   - thread-local-storage ==0.1.1
   - threads ==0.5.1.4
   - threepenny-gui ==0.7.0.1
+  - threepenny-gui-flexbox ==0.3.0.2
   - through-text ==0.1.0.0
   - thumbnail-plus ==1.0.5
   - thyme ==0.3.5.5
@@ -1971,6 +2025,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
   - ttrie ==0.1.2.1
   - tttool ==1.7.0.1
   - tuple ==0.3.0.2
@@ -2007,6 +2062,7 @@ default-package-overrides:
   - union ==0.1.1.1
   - union-find ==0.2
   - uniplate ==1.6.12
+  - uniq-deep ==1.1.0.0
   - Unique ==0.4.6.1
   - units ==2.4
   - units-defs ==2.0.1.1
@@ -2042,6 +2098,7 @@ default-package-overrides:
   - uuid-types ==1.0.3
   - vado ==0.0.8
   - validate-input ==0.4.0.0
+  - validation ==0.5.4
   - varying ==0.7.0.3
   - vault ==0.3.0.6
   - vcswrapper ==0.1.5
@@ -2056,6 +2113,7 @@ default-package-overrides:
   - vector-split ==1.0.0.2
   - vector-th-unbox ==0.2.1.6
   - vectortiles ==1.2.0.2
+  - verbosity ==0.2.3.0
   - versions ==3.0.0
   - vhd ==0.2.2
   - ViennaRNAParser ==1.3.2
@@ -2072,6 +2130,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-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
   - wai-middleware-caching-redis ==0.2.0.0
@@ -2139,13 +2198,15 @@ default-package-overrides:
   - wordpass ==1.0.0.7
   - Workflow ==0.8.3
   - wrap ==0.0.0
+  - wreq ==0.5.0.0
   - writer-cps-full ==0.1.0.0
-  - writer-cps-lens ==0.1.0.0
-  - writer-cps-morph ==0.1.0.1
+  - writer-cps-lens ==0.1.0.1
+  - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.2
   - writer-cps-transformers ==0.1.1.2
   - wuss ==1.1.3
   - X11 ==1.8
+  - X11-xft ==0.3.1
   - x509 ==1.6.5
   - x509-store ==1.6.2
   - x509-system ==1.6.4
@@ -2153,6 +2214,7 @@ default-package-overrides:
   - Xauth ==0.1
   - xdcc ==1.1.3
   - xdg-basedir ==0.2.2
+  - xeno ==0.1
   - xenstore ==0.1.1
   - xhtml ==3000.2.1
   - xlsior ==0.1.0.1
@@ -2164,6 +2226,7 @@ default-package-overrides:
   - xml-conduit-writer ==0.1.1.1
   - xml-hamlet ==0.4.1
   - xml-html-qq ==0.1.0.1
+  - xml-indexed-cursor ==0.1.1.0
   - xml-lens ==0.1.6.3
   - xml-picklers ==0.3.6
   - xml-to-json-fast ==2.0.0
@@ -2171,6 +2234,7 @@ default-package-overrides:
   - xmlgen ==0.6.2.1
   - xmlhtml ==0.2.3.5
   - xmonad ==0.13
+  - xmonad-contrib ==0.13
   - xss-sanitize ==0.3.5.7
   - yackage ==0.8.1
   - yahoo-finance-api ==0.2.0.1
@@ -2183,7 +2247,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
+  - yesod-bin ==1.5.2.1
   - yesod-core ==1.4.32
   - yesod-eventsource ==1.4.1
   - yesod-fay ==0.8.0
@@ -2191,6 +2255,7 @@ default-package-overrides:
   - yesod-form-richtext ==0.1.0.0
   - yesod-gitrepo ==0.2.1.0
   - yesod-gitrev ==0.1.0.0
+  - yesod-markdown ==0.11.4
   - yesod-newsfeed ==1.6
   - yesod-persistent ==1.4.2
   - yesod-sitemap ==1.4.0.1

From c3b0cb1acef2e0a4f633f0d19c688c78bbd2694a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 18 Mar 2017 18:29:36 +0100
Subject: [PATCH 2627/3449] hackage2nix: keep binary 0.8.x around

---
 .../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 a2383d48eee0..b8ff822726d7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2293,7 +2293,8 @@ extra-packages:
   - aeson < 0.8                         # newer versions don't work with GHC 6.12.3
   - aeson < 1.1                         # required by stack
   - aeson-pretty < 0.8                  # required by elm compiler
-  - binary > 0.7 && < 0.8               # binary 0.8.x is the latest, but it's largely unsupported so far
+  - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
+  - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - containers < 0.5                    # required to build alex with GHC 6.12.3

From 8f45ea61751509107a35dc00cad6721e56aa995a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 8 Mar 2017 15:19:32 +0100
Subject: [PATCH 2628/3449] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.1-7-g490c7d5 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/abc129b4f13a6b801b1a1e019f58b9db5ecc4cce.
---
 .../haskell-modules/hackage-packages.nix      | 4876 +++++++++++------
 1 file changed, 3175 insertions(+), 1701 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c50f9a12731a..0b033b61b3ab 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -247,14 +247,14 @@ self: {
 
   "ADPfusion" = callPackage
     ({ mkDerivation, base, bits, containers, DPutils, mmorph, mtl
-     , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict
-     , template-haskell, test-framework, test-framework-quickcheck2
-     , test-framework-th, th-orphans, transformers, tuple, vector
+     , OrderedBits, primitive, PrimitiveArray, QuickCheck, strict, tasty
+     , tasty-quickcheck, tasty-th, template-haskell, th-orphans
+     , transformers, tuple, vector
      }:
      mkDerivation {
        pname = "ADPfusion";
-       version = "0.5.2.0";
-       sha256 = "264284d9a7bb0978caec240c98d8cabbe89772248bd8e7514f53b277f902a61d";
+       version = "0.5.2.2";
+       sha256 = "90720d382870d77918f10c5c5a3cdcfe671e91ce3bfab52399bec307f9ba07e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -263,8 +263,8 @@ self: {
          transformers tuple vector
        ];
        testHaskellDepends = [
-         base bits OrderedBits PrimitiveArray QuickCheck strict
-         test-framework test-framework-quickcheck2 test-framework-th vector
+         base bits OrderedBits PrimitiveArray QuickCheck strict tasty
+         tasty-quickcheck tasty-th vector
        ];
        homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
@@ -272,6 +272,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ADPfusionSet" = callPackage
+    ({ mkDerivation, ADPfusion, base, bits, containers, DPutils, mmorph
+     , mtl, OrderedBits, primitive, PrimitiveArray, QuickCheck
+     , smallcheck, strict, tasty, tasty-quickcheck, tasty-smallcheck
+     , tasty-th, template-haskell, th-orphans, transformers, tuple
+     , vector
+     }:
+     mkDerivation {
+       pname = "ADPfusionSet";
+       version = "0.0.0.1";
+       sha256 = "cb5b430b49e6fb239f30a289def77ecd5197a33a5ec9768e163f21f2f6ef305f";
+       libraryHaskellDepends = [
+         ADPfusion base bits containers DPutils mmorph mtl OrderedBits
+         primitive PrimitiveArray QuickCheck strict template-haskell
+         th-orphans transformers tuple vector
+       ];
+       testHaskellDepends = [
+         base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
+         tasty-th
+       ];
+       homepage = "https://github.com/choener/ADPfusionSet";
+       description = "Dynamic programming for Set data structures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "AERN-Basics" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, directory
      , QuickCheck, random, test-framework, test-framework-quickcheck2
@@ -802,8 +827,8 @@ self: {
      }:
      mkDerivation {
        pname = "AlignmentAlgorithms";
-       version = "0.0.2.1";
-       sha256 = "8d6118e9cd863cde4ac78f726d36105979ed9f463aa56a25ff4a20cfe881c99a";
+       version = "0.1.0.0";
+       sha256 = "e84cfd84634113be381bd066c8acfce326c88b8ccb3dcaa05bd2b923a7a4dc4c";
        libraryHaskellDepends = [
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
@@ -1352,8 +1377,8 @@ self: {
      }:
      mkDerivation {
        pname = "BioHMM";
-       version = "1.0.5";
-       sha256 = "f32d7c8e0433c38e77c3c06c08fd30bfc6eccaa8a4ccc074638de016ab13793f";
+       version = "1.0.6";
+       sha256 = "81728f5329327dce9f586fad4fc6c8d2da30964f6f9b5a1309c4d20f9eed3ac5";
        libraryHaskellDepends = [
          base colour diagrams-cairo diagrams-lib directory either-unwrap
          filepath parsec ParsecTools StockholmAlignment SVGFonts text vector
@@ -1450,21 +1475,40 @@ self: {
      }) {};
 
   "BiobaseInfernal" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-conduit, base, BiobaseXNA
-     , biocore, bytestring, bytestring-lexing, conduit, containers
-     , either-unwrap, lens, primitive, PrimitiveArray, repa
-     , transformers, tuple, vector
+    ({ mkDerivation, aeson, attoparsec, base, binary, BiobaseTypes
+     , BiobaseXNA, bytestring, cereal, cereal-text, cereal-vector
+     , cmdargs, containers, criterion, data-default, deepseq, DPutils
+     , filepath, hashable, HUnit, lens, parallel, pipes
+     , pipes-attoparsec, pipes-bytestring, pipes-parse, pipes-safe
+     , pipes-zlib, primitive, PrimitiveArray, QuickCheck, strict
+     , string-conversions, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th, text, text-binary, transformers, tuple
+     , unordered-containers, utf8-string, vector, vector-th-unbox, zlib
      }:
      mkDerivation {
        pname = "BiobaseInfernal";
-       version = "0.7.1.0";
-       sha256 = "5a3417356d462b64c10516fe898923373bb07bc6e1225b479b725c871546eaa5";
+       version = "0.8.1.0";
+       sha256 = "0f64adaac1795c537f4b535f904d484e7922eba197d115bf206392f6f225cf78";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec attoparsec-conduit base BiobaseXNA biocore bytestring
-         bytestring-lexing conduit containers either-unwrap lens primitive
-         PrimitiveArray repa transformers tuple vector
+         aeson attoparsec base binary BiobaseTypes BiobaseXNA bytestring
+         cereal cereal-text cereal-vector containers data-default deepseq
+         DPutils filepath hashable lens parallel pipes pipes-attoparsec
+         pipes-bytestring pipes-parse pipes-safe pipes-zlib primitive
+         PrimitiveArray strict string-conversions text text-binary
+         transformers tuple unordered-containers utf8-string vector
+         vector-th-unbox zlib
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
+       executableHaskellDepends = [ base cmdargs ];
+       testHaskellDepends = [
+         base HUnit lens QuickCheck tasty tasty-hunit tasty-quickcheck
+         tasty-th
+       ];
+       benchmarkHaskellDepends = [
+         base criterion lens text transformers
+       ];
+       homepage = "https://github.com/choener/BiobaseInfernal";
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1549,19 +1593,19 @@ self: {
 
   "BiobaseTypes" = callPackage
     ({ mkDerivation, aeson, base, bimaps, binary, cereal, cereal-text
-     , cereal-vector, data-default, deepseq, hashable, intern
-     , log-domain, primitive, PrimitiveArray, QuickCheck, stringable
-     , tasty, tasty-quickcheck, tasty-th, text, text-binary, vector
+     , cereal-vector, data-default, deepseq, hashable, intern, primitive
+     , PrimitiveArray, QuickCheck, string-conversions, tasty
+     , tasty-quickcheck, tasty-th, text, text-binary, vector
      , vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "BiobaseTypes";
-       version = "0.1.2.0";
-       sha256 = "b1086f4228edfad9cddfb7abdbeca079bef5517a3629552069f3dfcd8378e84e";
+       version = "0.1.2.1";
+       sha256 = "92cbf8028151a61bb1e0ad70b5d83ce9a420146f72645d3bd2fbd8f4a1e58c87";
        libraryHaskellDepends = [
          aeson base bimaps binary cereal cereal-text cereal-vector
-         data-default deepseq hashable intern log-domain primitive
-         PrimitiveArray QuickCheck stringable text text-binary vector
+         data-default deepseq hashable intern primitive PrimitiveArray
+         QuickCheck string-conversions text text-binary vector
          vector-binary-instances vector-th-unbox
        ];
        testHaskellDepends = [
@@ -1593,22 +1637,26 @@ self: {
   "BiobaseXNA" = callPackage
     ({ mkDerivation, aeson, base, bimaps, binary, bytes, bytestring
      , cereal, cereal-vector, cmdargs, containers, csv, deepseq
-     , file-embed, hashable, lens, primitive, PrimitiveArray, split
-     , text, tuple, vector, vector-binary-instances, vector-th-unbox
+     , file-embed, hashable, lens, primitive, PrimitiveArray, QuickCheck
+     , split, tasty, tasty-quickcheck, tasty-th, text, tuple, vector
+     , vector-binary-instances, vector-th-unbox
      }:
      mkDerivation {
        pname = "BiobaseXNA";
-       version = "0.9.3.0";
-       sha256 = "c5175ce6473b6f46885834acf600b11ca196d62ae0c5de2c598b8f01c07f3e45";
+       version = "0.9.3.1";
+       sha256 = "d0cca46d67b08b414f266d29660604615ce62c35704042322fed60aa416b8c4a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bimaps binary bytes bytestring cereal cereal-vector
          containers csv deepseq file-embed hashable lens primitive
-         PrimitiveArray split text tuple vector vector-binary-instances
-         vector-th-unbox
+         PrimitiveArray QuickCheck split text tuple vector
+         vector-binary-instances vector-th-unbox
        ];
        executableHaskellDepends = [ base cmdargs ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th vector
+       ];
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
@@ -5410,13 +5458,14 @@ self: {
   "FormalGrammars" = callPackage
     ({ mkDerivation, ADPfusion, ansi-wl-pprint, base, bytestring
      , cmdargs, containers, data-default, HaTeX, lens, mtl, parsers
-     , PrimitiveArray, semigroups, template-haskell, text, transformers
-     , trifecta, unordered-containers, vector
+     , PrimitiveArray, QuickCheck, semigroups, smallcheck, tasty
+     , tasty-quickcheck, tasty-smallcheck, tasty-th, template-haskell
+     , text, transformers, trifecta, unordered-containers, vector
      }:
      mkDerivation {
        pname = "FormalGrammars";
-       version = "0.3.1.0";
-       sha256 = "cc6d92eeda014b8f1b89eed81e11f9b7c4b9c150771f330e43092644754fbac8";
+       version = "0.3.1.1";
+       sha256 = "5af499a9bbd43121d46e19be1c15eb2edddf20384487b9df76c2bc45fc69164e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5427,6 +5476,10 @@ self: {
        executableHaskellDepends = [
          ansi-wl-pprint base cmdargs trifecta
        ];
+       testHaskellDepends = [
+         base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
+         tasty-th
+       ];
        homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
@@ -6417,8 +6470,8 @@ self: {
      }:
      mkDerivation {
        pname = "GrammarProducts";
-       version = "0.1.1.2";
-       sha256 = "9023283298ad178efaf9ba965e7a0005ff41a8a01d2e0f581ed3c29e414f15a2";
+       version = "0.1.1.3";
+       sha256 = "20ff8fe82f9a4927bcb318e9c7ac6fb7a05adc99ad1fbc4f4a3a5f0b6abb25d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -8247,6 +8300,30 @@ self: {
        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
+     , test-framework-hunit, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.3.6";
+       sha256 = "18c4887aac6268712fb4733b00a0681efc0527c1354601be1568ce7845f9ba48";
+       libraryHaskellDepends = [
+         array base bytestring mtl network network-uri parsec time
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
+         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
+         test-framework test-framework-hunit wai warp
+       ];
+       homepage = "https://github.com/haskell/HTTP";
+       description = "A library for client-side HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HTTP-Simple" = callPackage
     ({ mkDerivation, base, HTTP, network }:
      mkDerivation {
@@ -8732,6 +8809,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "HasCacBDD" = callPackage
+    ({ mkDerivation, base, Cabal, CacBDD, directory, process
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "HasCacBDD";
+       version = "0.1.0.0";
+       sha256 = "be9d36029cbb47b03093bfc96a0ea48525f1fd8180f8310556308eb61d7de4b6";
+       setupHaskellDepends = [ base Cabal directory ];
+       libraryHaskellDepends = [ base process QuickCheck ];
+       librarySystemDepends = [ CacBDD ];
+       testHaskellDepends = [ base QuickCheck ];
+       homepage = "https://github.com/m4lvin/HasCacBDD";
+       description = "Haskell bindings for CacBDD";
+       license = stdenv.lib.licenses.gpl2;
+     }) {CacBDD = null;};
+
   "HasGP" = callPackage
     ({ mkDerivation, base, haskell98, hmatrix, hmatrix-special, mtl
      , parsec, random
@@ -9495,6 +9589,25 @@ self: {
        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";
+       libraryHaskellDepends = [
+         base bytestring integer-gmp network time
+       ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       homepage = "https://github.com/vshabanov/HsOpenSSL";
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -10150,10 +10263,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.8";
-       sha256 = "038c6547d543442a93b2028be4b84c225bb7a6fa913e1fc57325c58d043d5644";
-       revision = "1";
-       editedCabalFile = "5211841fbb8a9a7fe19ce715a749149ab03c28344531bc3163f8580b611a2e3e";
+       version = "3.2.8.1";
+       sha256 = "b325ed50b887d65af7175bba03a2df5ef04a1e0f73adf2e3aa62d1676fa27104";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -10909,22 +11020,26 @@ self: {
 
   "LinguisticsTypes" = callPackage
     ({ mkDerivation, aeson, base, bimaps, binary, bytestring, cereal
-     , cereal-text, deepseq, hashable, intern, log-domain, QuickCheck
-     , stringable, test-framework, test-framework-quickcheck2
-     , test-framework-th, text, text-binary, vector-th-unbox
+     , cereal-text, containers, criterion, deepseq, hashable, intern
+     , log-domain, QuickCheck, string-conversions, tasty
+     , tasty-quickcheck, tasty-th, text, text-binary, utf8-string
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "LinguisticsTypes";
-       version = "0.0.0.2";
-       sha256 = "9f5a722b1f88207b42801a72b6fc95453f134b7a4252251876a4ef069b7b4bcb";
+       version = "0.0.0.3";
+       sha256 = "2db4b10d3d9d1be5646627aaac8a12e117813aa5696bc52a9ae8cdabbeec42a7";
        libraryHaskellDepends = [
          aeson base bimaps binary bytestring cereal cereal-text deepseq
-         hashable intern log-domain QuickCheck stringable text text-binary
-         vector-th-unbox
+         hashable intern log-domain QuickCheck string-conversions text
+         text-binary utf8-string vector-th-unbox
        ];
        testHaskellDepends = [
-         aeson base binary cereal QuickCheck stringable test-framework
-         test-framework-quickcheck2 test-framework-th
+         aeson base binary cereal QuickCheck string-conversions tasty
+         tasty-quickcheck tasty-th
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion deepseq text
        ];
        homepage = "https://github.com/choener/LinguisticsTypes";
        description = "Collection of types for natural language";
@@ -12097,6 +12212,41 @@ self: {
        license = "LGPL";
      }) {};
 
+  "MutationOrder" = callPackage
+    ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps
+     , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs
+     , containers, deepseq, directory, DPutils, file-embed, filepath
+     , FormalGrammars, log-domain, parallel, PrimitiveArray
+     , PrimitiveArray-Pretty, QuickCheck, serialize-instances
+     , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text
+     , unordered-containers, vector, vector-strategies
+     , ViennaRNA-bindings, zlib
+     }:
+     mkDerivation {
+       pname = "MutationOrder";
+       version = "0.0.0.2";
+       sha256 = "0019590415bbcec4f8e4d8a04af277a3a9360b28255eb44290810b499015f32f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring
+         cereal cereal-vector containers deepseq directory DPutils filepath
+         FormalGrammars log-domain parallel PrimitiveArray
+         PrimitiveArray-Pretty serialize-instances ShortestPathProblems text
+         unordered-containers vector vector-strategies ViennaRNA-bindings
+         zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring cmdargs file-embed filepath
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th vector
+       ];
+       homepage = "https://github.com/choener/MutationOrder";
+       description = "Most likely order of mutation events in RNA";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "MyPrimes" = callPackage
     ({ mkDerivation, base, containers, time }:
      mkDerivation {
@@ -12231,27 +12381,22 @@ self: {
      }) {};
 
   "NaturalLanguageAlphabets" = callPackage
-    ({ mkDerivation, aeson, array, attoparsec, base, bimaps, binary
-     , bytestring, cereal, cereal-text, containers, criterion, deepseq
-     , file-embed, hashable, hashtables, intern, LinguisticsTypes
-     , mwc-random, QuickCheck, random, stringable, system-filepath
-     , test-framework, test-framework-quickcheck2, test-framework-th
-     , text, text-binary, unordered-containers, vector, vector-th-unbox
+    ({ mkDerivation, aeson, attoparsec, base, binary, cereal
+     , containers, criterion, deepseq, file-embed, hashtables
+     , LinguisticsTypes, mwc-random, QuickCheck, random, tasty
+     , tasty-quickcheck, tasty-th, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "NaturalLanguageAlphabets";
-       version = "0.1.0.0";
-       sha256 = "c233d60b74a4131705e36b5873fae2973f168b8c1c0717055c6d546d40ac6215";
+       version = "0.1.1.0";
+       sha256 = "ffd069f7cbd6f48db278a15805e6ab2a6cc60c24cacd133ecd0c359eae23db8b";
        libraryHaskellDepends = [
-         aeson array attoparsec base bimaps binary bytestring cereal
-         cereal-text deepseq file-embed hashable intern LinguisticsTypes
-         QuickCheck stringable system-filepath text text-binary
-         unordered-containers vector vector-th-unbox
+         aeson attoparsec base file-embed LinguisticsTypes text
+         unordered-containers
        ];
        testHaskellDepends = [
-         aeson base binary cereal LinguisticsTypes QuickCheck stringable
-         test-framework test-framework-quickcheck2 test-framework-th text
-         unordered-containers
+         aeson base binary cereal LinguisticsTypes QuickCheck tasty
+         tasty-quickcheck tasty-th text unordered-containers
        ];
        benchmarkHaskellDepends = [
          base containers criterion deepseq hashtables LinguisticsTypes
@@ -13782,8 +13927,8 @@ self: {
      }:
      mkDerivation {
        pname = "PrimitiveArray";
-       version = "0.8.0.0";
-       sha256 = "b4af0d0d8502dc8ba8985cd70b69a0220a70e8d44a2ee4dfa73db1bce5774445";
+       version = "0.8.0.1";
+       sha256 = "91e77d0f115514fd13f03e185b73bd437a57838cabaebed4d98d04bc52ad38f5";
        libraryHaskellDepends = [
          aeson base binary bits cereal cereal-vector deepseq DPutils
          hashable log-domain OrderedBits primitive QuickCheck smallcheck
@@ -14462,6 +14607,39 @@ self: {
        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
+     , 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.7";
+       sha256 = "de54278982eecd9568ee155a3155f632b503776fff7634b8b3746e29d28248a5";
+       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;
+     }) {};
+
   "RNAwolf" = callPackage
     ({ mkDerivation, base, BiobaseTrainingData, BiobaseXNA, bytestring
      , cmdargs, containers, deepseq, directory, parallel, PrimitiveArray
@@ -14863,6 +15041,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "RtMidi" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "RtMidi";
+       version = "0.1.0.0";
+       sha256 = "c6534f2f1c279d1cbb2eccd085ca52121d6c94d00f322a4cf2a6c455ab26f720";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/riottracker/RtMidi";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "RxHaskell" = callPackage
     ({ mkDerivation, base, containers, stm, transformers }:
      mkDerivation {
@@ -15578,6 +15767,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ShortestPathProblems" = callPackage
+    ({ mkDerivation, ADPfusion, ADPfusionSet, base, FormalGrammars
+     , log-domain, PrimitiveArray, QuickCheck, tasty, tasty-quickcheck
+     , tasty-th, text, vector
+     }:
+     mkDerivation {
+       pname = "ShortestPathProblems";
+       version = "0.0.0.1";
+       sha256 = "0ec13f0863757534aca0e0c739aac1510f48178b14e84d64cc758409595e1ddd";
+       libraryHaskellDepends = [
+         ADPfusion ADPfusionSet base FormalGrammars log-domain
+         PrimitiveArray text vector
+       ];
+       testHaskellDepends = [
+         base QuickCheck tasty tasty-quickcheck tasty-th vector
+       ];
+       homepage = "https://github.com/choener/ShortestPathProblems";
+       description = "grammars for TSP and SHP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ShowF" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -17509,13 +17719,14 @@ self: {
      }:
      mkDerivation {
        pname = "ViennaRNA-bindings";
-       version = "0.233.1.1";
-       sha256 = "8435afc87b0265175eef88b586e69934e8404bd5126b6d6f5969c6486ce31b1a";
+       version = "0.233.1.2";
+       sha256 = "6d3c1e8288727500bd07e2dc4c64bf0a0861e7cf9b8d6862d1ae5efb4b7004c7";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
          array base QuickCheck tasty tasty-hunit tasty-silver tasty-th
        ];
+       testToolDepends = [ c2hs ];
        homepage = "https://github.com/choener/ViennaRNA-bindings";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
@@ -17861,26 +18072,25 @@ self: {
      }) {advapi32 = null; gdi32 = null; shell32 = null; 
          shfolder = null; user32 = null; winmm = null;};
 
-  "Win32_2_5_1_0" = callPackage
+  "Win32_2_5_3_0" = callPackage
     ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
-     , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm
+     , msimg32, shell32, shfolder, shlwapi, user32, winmm
      }:
      mkDerivation {
        pname = "Win32";
-       version = "2.5.1.0";
-       sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52";
+       version = "2.5.3.0";
+       sha256 = "fd66d7feafc7863cbd0726c8dbf605a007804e009fe4e5b5ebdf4f4727257c31";
        libraryHaskellDepends = [ base bytestring filepath ];
        librarySystemDepends = [
-         advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32
-         winmm
+         advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm
        ];
        homepage = "https://github.com/haskell/win32";
        description = "A binding to part of the Win32 library";
        license = stdenv.lib.licenses.bsd3;
        platforms = stdenv.lib.platforms.none;
      }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; 
-         ntdll = null; shell32 = null; shfolder = null; shlwapi = null; 
-         user32 = null; winmm = null;};
+         shell32 = null; shfolder = null; shlwapi = null; user32 = null; 
+         winmm = null;};
 
   "Win32-console" = callPackage
     ({ mkDerivation, base, Win32 }:
@@ -18039,38 +18249,39 @@ self: {
      }) {};
 
   "WordAlignment" = callPackage
-    ({ mkDerivation, ADPfusion, AlignmentAlgorithms, ascii-progress
-     , attoparsec, base, bytestring, cmdargs, containers
-     , control-monad-omega, deepseq, file-embed, fmlist, FormalGrammars
+    ({ mkDerivation, ADPfusion, aeson, AlignmentAlgorithms, attoparsec
+     , base, bimaps, bytestring, cmdargs, containers, data-default
+     , deepseq, DPutils, file-embed, filepath, fmlist, FormalGrammars
      , ghc-prim, GrammarProducts, hashable, intern, lens
-     , LinguisticsTypes, NaturalLanguageAlphabets, parallel, primitive
-     , PrimitiveArray, QuickCheck, strict, stringable, template-haskell
-     , test-framework, test-framework-quickcheck2, test-framework-th
-     , text, text-format, transformers, tuple-th, unordered-containers
-     , vector
+     , LinguisticsTypes, mtl, NaturalLanguageAlphabets, parallel, pipes
+     , primitive, PrimitiveArray, split, strict, tasty, tasty-quickcheck
+     , tasty-silver, tasty-th, template-haskell, text, text-format
+     , transformers, tuple-th, unordered-containers, vector
      }:
      mkDerivation {
        pname = "WordAlignment";
-       version = "0.1.0.0";
-       sha256 = "0182ffbf3dfddcabd73dce16eef232fce5c680125391ce881ddf2b81c97593d0";
+       version = "0.2.0.0";
+       sha256 = "9ccd32606db500ecec43b74d8c6fbb84cfe2df7fcb0e50619a155d55d74511cc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ADPfusion AlignmentAlgorithms attoparsec base bytestring containers
-         control-monad-omega deepseq file-embed fmlist FormalGrammars
-         ghc-prim GrammarProducts hashable intern lens LinguisticsTypes
-         NaturalLanguageAlphabets primitive PrimitiveArray strict stringable
-         template-haskell text text-format transformers tuple-th
-         unordered-containers vector
+         ADPfusion aeson AlignmentAlgorithms attoparsec base bimaps
+         bytestring containers data-default deepseq DPutils file-embed
+         fmlist FormalGrammars ghc-prim GrammarProducts hashable intern lens
+         LinguisticsTypes mtl NaturalLanguageAlphabets pipes primitive
+         PrimitiveArray strict template-haskell text text-format
+         transformers tuple-th unordered-containers vector
        ];
        executableHaskellDepends = [
-         ascii-progress base bytestring cmdargs containers file-embed intern
-         LinguisticsTypes NaturalLanguageAlphabets parallel strict text
-         unordered-containers vector
+         aeson base bytestring cmdargs containers data-default DPutils
+         file-embed intern lens LinguisticsTypes mtl
+         NaturalLanguageAlphabets parallel pipes strict text text-format
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-         test-framework-th
+         base bytestring containers DPutils filepath
+         NaturalLanguageAlphabets split tasty tasty-quickcheck tasty-silver
+         tasty-th text
        ];
        homepage = "https://github.com/choener/WordAlignment";
        description = "Bigram word pair alignments";
@@ -19472,6 +19683,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "acme-functors" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acme-functors";
+       version = "0.1.0.0";
+       sha256 = "381a686e8eecb39c4997205dcb9a43146ca7d1abae03c13301a9f0a26570292d";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/chris-martin/acme-functors";
+       description = "The best applicative functors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-grawlix" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -20282,19 +20505,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_1_0_0" = callPackage
+  "aeson_1_1_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
-     , hashable-time, HUnit, 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
+     , 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
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.1.0.0";
-       sha256 = "5810fc5f664855ba6457d119fffd176ee93e60a27e88f5eedc349d7d75f18880";
+       version = "1.1.1.0";
+       sha256 = "083791ed61fd5d2ce613ba9d54dd37e598a376fab63c9df0abfaa69e802272d6";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text time
@@ -20303,7 +20527,7 @@ self: {
        testHaskellDepends = [
          attoparsec base base-compat base-orphans base16-bytestring
          bytestring containers directory dlist filepath generic-deriving
-         ghc-prim hashable hashable-time HUnit QuickCheck
+         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
@@ -20872,16 +21096,17 @@ self: {
      }) {};
 
   "aeson-value-parser" = callPackage
-    ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific
-     , success, text, unordered-containers, vector
+    ({ mkDerivation, aeson, base-prelude, json-pointer
+     , json-pointer-aeson, mtl-prelude, scientific, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.11.4";
-       sha256 = "f5a31e1aa81eaf7eed3b1a5ad3e793478f51043792435e537ff6649f4cad3c8e";
+       version = "0.12.1";
+       sha256 = "11096d66a70d036bbe5d685aa516e454623f2f6de98693dbb36e1016dce8ac8d";
        libraryHaskellDepends = [
-         aeson base-prelude mtl-prelude scientific success text
-         unordered-containers vector
+         aeson base-prelude json-pointer json-pointer-aeson mtl-prelude
+         scientific text transformers unordered-containers vector
        ];
        homepage = "https://github.com/sannsyn/aeson-value-parser";
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
@@ -21212,8 +21437,8 @@ self: {
      }:
      mkDerivation {
        pname = "airtable-api";
-       version = "0.2.0.1";
-       sha256 = "e17565f18a0ecee13f9650a350f4731e20a21df03c350a8aa6bfe30b37233230";
+       version = "0.3.2.4";
+       sha256 = "f44423ee40e66e35ad1ede9481e2c0148600c73001c1316b3f496a6be79ade3a";
        libraryHaskellDepends = [
          aeson base bytestring hashable lens text time unordered-containers
          wreq
@@ -22054,8 +22279,8 @@ self: {
     ({ mkDerivation, base, mmorph, transformers }:
      mkDerivation {
        pname = "alternators";
-       version = "0.1.1.0";
-       sha256 = "f95d9a4826c57194e2a22e41a9f0eaef0e96cf95f6372179aa7c47bc3ca8f627";
+       version = "0.1.1.1";
+       sha256 = "9650d4126bfc2548e20e1ac3855b22568e19f7a40a6c0fa92ece3fcc63d03b0e";
        libraryHaskellDepends = [ base mmorph transformers ];
        homepage = "https://github.com/louispan/alternators#readme";
        description = "Handy functions when using transformers";
@@ -25975,6 +26200,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "arrow-extras" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "arrow-extras";
+       version = "0.1.0.1";
+       sha256 = "c13c3aba839d1ec78a49991fa4038a68c5eb9ef6da61eceb6e68bc3ce0586a6c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/louispan/arrow-extras#readme";
+       description = "Extra functions for Control.Arrow";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "arrow-improve" = callPackage
     ({ mkDerivation, arrows, base, pointed, profunctors, semigroupoids
      }:
@@ -26300,24 +26537,6 @@ self: {
      }) {};
 
   "asn1-encoding" = callPackage
-    ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl
-     , tasty, tasty-quickcheck, text
-     }:
-     mkDerivation {
-       pname = "asn1-encoding";
-       version = "0.9.4";
-       sha256 = "a78058f7db08fbd72f2b40c72af324a4d31ea95d70b4bfa372107b980394dde8";
-       libraryHaskellDepends = [ asn1-types base bytestring hourglass ];
-       testHaskellDepends = [
-         asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
-         text
-       ];
-       homepage = "http://github.com/vincenthz/hs-asn1";
-       description = "ASN1 data reader and writer in RAW, BER and DER forms";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "asn1-encoding_0_9_5" = callPackage
     ({ mkDerivation, asn1-types, base, bytestring, hourglass, mtl
      , tasty, tasty-quickcheck, text
      }:
@@ -26333,7 +26552,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-asn1";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asn1-parse" = callPackage
@@ -26697,12 +26915,12 @@ self: {
      , configurator, containers, cryptohash, hostname, http-client
      , http-client-tls, http-media, http-types, jwt, mtl, network
      , network-api-support, network-uri, snap, snap-core, split, text
-     , time, time-units, transformers
+     , time, time-units, transformers, zlib
      }:
      mkDerivation {
        pname = "atlassian-connect-core";
-       version = "0.7.0.1";
-       sha256 = "febe860cd0151f4b26c9180c71ca7526b99c204e20dc5b03e8a63b827214ee9a";
+       version = "0.7.0.2";
+       sha256 = "6872f0ca4a70c50942b239828621fda3923a3763921130150be20c568c40ff50";
        libraryHaskellDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
@@ -26710,11 +26928,12 @@ self: {
          http-types jwt mtl network network-api-support network-uri snap
          snap-core split text time time-units transformers
        ];
+       libraryPkgconfigDepends = [ zlib ];
        homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core";
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) zlib;};
 
   "atlassian-connect-descriptor" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, cases, HUnit
@@ -26723,8 +26942,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.4.1";
-       sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8";
+       version = "0.4.4.2";
+       sha256 = "9352e134c720358694b7e839c5056ce62334303d0db9cb94e151c086da123598";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -27252,13 +27471,13 @@ self: {
      }:
      mkDerivation {
        pname = "attoparsec-time";
-       version = "0.1.1";
-       sha256 = "9789759199654f3767823b62bb48182b5f83226ebde3ec74e31863309a77a362";
+       version = "0.1.1.1";
+       sha256 = "8d1ae65e5798e451ca692b0492dd58cde17b33c1a1239bb635215728de7419bb";
        libraryHaskellDepends = [ attoparsec base-prelude text time ];
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
-       homepage = "https://github.com/sannsyn/attoparsec-time";
+       homepage = "https://github.com/nikita-volkov/attoparsec-time";
        description = "Attoparsec parsers of time";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -28398,16 +28617,16 @@ self: {
 
   "aws-simple" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, amazonka-sqs
-     , base, blaze-builder, bytestring, conduit, lens, mtl, resourcet
-     , text, unordered-containers
+     , base, bytestring, conduit, lens, mtl, resourcet, text, timespan
+     , unordered-containers
      }:
      mkDerivation {
        pname = "aws-simple";
-       version = "0.3.0.0";
-       sha256 = "52fe1741cb4685b56bf9690273e2dc68626165aff4f59a13d82005c15962076d";
+       version = "0.4.0.0";
+       sha256 = "af86437bb0c29e177e85297fd9f431d8a91b9f75a7db853bf6cd52b26092bc60";
        libraryHaskellDepends = [
-         amazonka amazonka-core amazonka-s3 amazonka-sqs base blaze-builder
-         bytestring conduit lens mtl resourcet text unordered-containers
+         amazonka amazonka-core amazonka-s3 amazonka-sqs base bytestring
+         conduit lens mtl resourcet text timespan unordered-containers
        ];
        homepage = "https://github.com/agrafix/aws-simple#readme";
        description = "Dead simple bindings to commonly used AWS Services";
@@ -28671,6 +28890,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "backprop" = callPackage
+    ({ mkDerivation, ad, base, bifunctors, criterion, deepseq
+     , directory, generics-sop, hmatrix, microlens, microlens-mtl
+     , microlens-th, mnist-idx, mtl, mwc-random, profunctors, reflection
+     , tagged, time, transformers, transformers-base, type-combinators
+     , vector
+     }:
+     mkDerivation {
+       pname = "backprop";
+       version = "0.0.3.0";
+       sha256 = "ae199a345a134f2251deec151cd7d32cbe28f327a142fb3c5ed883e992d858e6";
+       libraryHaskellDepends = [
+         ad base generics-sop microlens microlens-mtl microlens-th mtl
+         profunctors reflection tagged transformers-base type-combinators
+       ];
+       benchmarkHaskellDepends = [
+         base bifunctors criterion deepseq directory generics-sop hmatrix
+         mnist-idx mwc-random time transformers type-combinators vector
+       ];
+       homepage = "https://github.com/mstksg/backprop";
+       description = "Heterogeneous, type-safe automatic backpropagation in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "backtracking-exceptions" = callPackage
     ({ mkDerivation, base, either, free, kan-extensions, mtl
      , semigroupoids, semigroups, transformers
@@ -29094,6 +29337,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-compat_0_9_2" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, unix }:
+     mkDerivation {
+       pname = "base-compat";
+       version = "0.9.2";
+       sha256 = "b47c4cec234f9ec83c292e7e213ebcfb4e0418db142f151fd8c370ccd5e2b21b";
+       libraryHaskellDepends = [ base unix ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       description = "A compatibility layer for base";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-generics" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -29158,6 +29414,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-prelude_1_2_0_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-prelude";
+       version = "1.2.0.1";
+       sha256 = "811a494f5996ff1012be15a1236cc4afb6a67fc2a9f54fdb53f4e94a8fde119e";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/base-prelude";
+       description = "The most complete prelude formed solely from the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-unicode-symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -29365,38 +29634,17 @@ self: {
      }) {};
 
   "basic-lens" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "basic-lens";
-       version = "0.0.0";
-       sha256 = "d2ee8a48909db7f6bbf3deae03d9cfbbdfcce86932f0cae8fb59bf6d0c10ed61";
-       revision = "1";
-       editedCabalFile = "dcb1e49555431b94fedf161e3a2169213eea59167a34eb20b91be22baac9e170";
-       libraryHaskellDepends = [ base ];
+       version = "0.0.2";
+       sha256 = "dae71ad00f4934019c724d057e63a924753e9c06baa3c3353ad0a5cf57ffd4e2";
+       libraryHaskellDepends = [ base template-haskell ];
        description = "Basic lens type and functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "basic-prelude" = callPackage
-    ({ mkDerivation, base, bytestring, containers, filepath, hashable
-     , lifted-base, ReadArgs, safe, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "basic-prelude";
-       version = "0.6.1";
-       sha256 = "6c2b905777d6e22157da48d7e3d5f3862e0698736afbf4f237fff9d14e803061";
-       libraryHaskellDepends = [
-         base bytestring containers filepath hashable lifted-base ReadArgs
-         safe text transformers unordered-containers vector
-       ];
-       homepage = "https://github.com/snoyberg/basic-prelude";
-       description = "An enhanced core prelude; a common foundation for alternate preludes";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "basic-prelude_0_6_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, filepath, hashable
      , lifted-base, ReadArgs, safe, text, transformers
      , unordered-containers, vector
@@ -29773,8 +30021,8 @@ self: {
      }:
      mkDerivation {
        pname = "bench";
-       version = "1.0.2";
-       sha256 = "9fac082305cc27d9ec7ee351ae1d301fc0a434c77cf1b121f51f2ca46d3a462e";
+       version = "1.0.3";
+       sha256 = "3107b94eee51a728da8d5e4f1a6b72e474840668029a6c6ddc287b73de4960c6";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30417,6 +30665,31 @@ self: {
        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";
+       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-bits" = callPackage
     ({ mkDerivation, base, binary, bytestring, QuickCheck, random
      , test-framework, test-framework-quickcheck2
@@ -31832,21 +32105,21 @@ self: {
   "biohazard" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base-prelude
      , binary, bytestring, bytestring-mmap, containers, directory
-     , exceptions, filepath, hashable, iteratee, ListLike, primitive
-     , random, scientific, stm, text, transformers, unix
-     , unordered-containers, vector, vector-algorithms, vector-th-unbox
-     , zlib
+     , exceptions, filepath, hashable, ListLike, monad-control
+     , primitive, random, scientific, stm, text, transformers
+     , transformers-base, unix, unordered-containers, vector
+     , vector-algorithms, vector-th-unbox, zlib
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.10";
-       sha256 = "d966220ae495fb0b4ac792ac02aea3a8786f7a792ce7dcf0e88d4ee27378ebda";
+       version = "0.6.13";
+       sha256 = "a5e8015219273869d4d7b4971b12e707626dc599ca3b8455a2402538149d3a71";
        libraryHaskellDepends = [
          aeson async attoparsec base base-prelude binary bytestring
          bytestring-mmap containers directory exceptions filepath hashable
-         iteratee ListLike primitive random scientific stm text transformers
-         unix unordered-containers vector vector-algorithms vector-th-unbox
-         zlib
+         ListLike monad-control primitive random scientific stm text
+         transformers transformers-base unix unordered-containers vector
+         vector-algorithms vector-th-unbox zlib
        ];
        homepage = "http://github.com/udo-stenzel/biohazard";
        description = "bioinformatics support library";
@@ -32550,6 +32823,31 @@ self: {
        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
+     , scientific, split, text, time
+     }:
+     mkDerivation {
+       pname = "bitx-bitcoin";
+       version = "0.11.0.1";
+       sha256 = "926a57fb85bd42185c2e8abb00e6ff309062abb6b24fce2eef61507896fb219c";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bizzlelude" = callPackage
     ({ mkDerivation, base, containers, directory, text }:
      mkDerivation {
@@ -33097,6 +33395,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-svg_0_3_6_1" = callPackage
+    ({ mkDerivation, base, blaze-markup, mtl }:
+     mkDerivation {
+       pname = "blaze-svg";
+       version = "0.3.6.1";
+       sha256 = "f6a4f1bba1e973b336e94de73369f4562778fde43b6ac7c0b32d6a501527aa60";
+       libraryHaskellDepends = [ base blaze-markup mtl ];
+       homepage = "https://github.com/deepakjois/blaze-svg";
+       description = "SVG combinator library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-textual" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, double-conversion
      , ghc-prim, integer-gmp, old-locale, QuickCheck, test-framework
@@ -33828,12 +34139,16 @@ self: {
      }) {};
 
   "bookkeeping-jp" = callPackage
-    ({ mkDerivation, base, bookkeeping, doctest, Glob }:
+    ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable
+     , text, time
+     }:
      mkDerivation {
        pname = "bookkeeping-jp";
-       version = "0.1.0.1";
-       sha256 = "10cb27933f689d38c0bc6e24ae6b1a06cdd9f69aef83dc6aa779c9872410cde5";
-       libraryHaskellDepends = [ base bookkeeping ];
+       version = "0.1.1.0";
+       sha256 = "b5afda1702307402f950346400d293609e3d066afc728fca260edc400046b0c2";
+       libraryHaskellDepends = [
+         base bookkeeping mono-traversable text time
+       ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme";
        description = "Helper functions for Japanese bookkeeping";
@@ -34407,6 +34722,28 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "brick";
+       version = "0.17.2";
+       sha256 = "ad154e23b4c38d045c3621de45b876e41eebdde7cae510b733930f0f59ae1c2a";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brillig" = callPackage
     ({ mkDerivation, base, binary, cmdargs, containers, directory
      , filepath, ListZipper, text
@@ -35690,6 +36027,31 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "c2hs_0_28_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , dlist, filepath, HUnit, language-c, pretty, process, shelly
+     , test-framework, test-framework-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "c2hs";
+       version = "0.28.2";
+       sha256 = "f4171478cafe9f4906735763c2e0bc1ca0a9f56b50e9d59aac07520434920f9e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring containers directory dlist filepath
+         language-c pretty process
+       ];
+       testHaskellDepends = [
+         base filepath HUnit shelly test-framework test-framework-hunit text
+         transformers
+       ];
+       homepage = "https://github.com/haskell/c2hs";
+       description = "C->Haskell FFI tool that gives some cross-language type safety";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "c2hs-extra" = callPackage
     ({ mkDerivation, base, c2hs }:
      mkDerivation {
@@ -35787,8 +36149,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.0.5";
-       sha256 = "10a81b97a6d993c37778b5840be9a7a67ab47feb59cec3550e345ab5239c8e62";
+       version = "1.1.0";
+       sha256 = "74114ed6e439566fcb0dd466efe011c6f16defb1dba6c2345bd4184c1698e58a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -36331,6 +36693,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cabal-rpm_0_11_1" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, old-locale
+     , process, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.11.1";
+       sha256 = "db4e85d9490fe054af792d454004e8537de52c9bd506efe077a6b328440c12df";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal directory filepath old-locale process time unix
+       ];
+       homepage = "https://github.com/juhp/cabal-rpm";
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -36817,8 +37198,8 @@ self: {
      }:
      mkDerivation {
        pname = "cacophony";
-       version = "0.9.1";
-       sha256 = "cb60834c8b0571f2b2b54b6f9847960c71ffe5350c60791c439de6ba54c67c02";
+       version = "0.9.2";
+       sha256 = "fb66334322e6b6c1d0896f1a780724fa4624c90f8e8d5a3c7ca21ace7a040316";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -37276,8 +37657,8 @@ self: {
      }:
      mkDerivation {
        pname = "canteven-http";
-       version = "0.1.3.0";
-       sha256 = "d427d5bc77861c2a648a604443f2a5ca882b911487ac313dbb5db6b0271870d4";
+       version = "0.1.4.0";
+       sha256 = "46e1b58deb3c18ea9b85377466f4fbe0ad7998e0130fab1208eb8fed2343ba7f";
        libraryHaskellDepends = [
          base bytestring canteven-log directory exceptions filepath
          http-types mime-types monad-logger template-haskell text time
@@ -37488,6 +37869,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "carbonara" = callPackage
+    ({ mkDerivation, base, mysql-simple, postgresql-simple, split, time
+     }:
+     mkDerivation {
+       pname = "carbonara";
+       version = "0.0.1";
+       sha256 = "76974d0c8d12e744db649a8c55e6b310ea96550d60677b79f9249c71d033bf27";
+       libraryHaskellDepends = [
+         base mysql-simple postgresql-simple split time
+       ];
+       homepage = "https://github.com/szehk/Haskell-Carbonara-Library";
+       description = "some spaghetti code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "carboncopy" = callPackage
     ({ mkDerivation, base, bytestring, filepath, haskell98, IfElse
      , MissingH
@@ -39358,20 +39754,6 @@ self: {
      }) {};
 
   "check-email" = callPackage
-    ({ mkDerivation, base, bytestring, email-validate, resolv }:
-     mkDerivation {
-       pname = "check-email";
-       version = "1.0";
-       sha256 = "dfbba577c18ca1180d8d4b38cd0a54a6f0ca5a886e502cb83c8ab07675463cb7";
-       revision = "1";
-       editedCabalFile = "39f8616eeee765838400cd6754f864e9e65e8a89123327161227b6a424c20d75";
-       libraryHaskellDepends = [ base bytestring email-validate ];
-       librarySystemDepends = [ resolv ];
-       description = "Confirm whether an email is valid and probably existant";
-       license = stdenv.lib.licenses.bsd3;
-     }) {resolv = null;};
-
-  "check-email_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, email-validate, resolv }:
      mkDerivation {
        pname = "check-email";
@@ -39382,7 +39764,6 @@ self: {
        homepage = "https://github.com/qoelet/check-email#readme";
        description = "Confirm whether an email is valid and probably existant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {resolv = null;};
 
   "check-pvp" = callPackage
@@ -40233,8 +40614,8 @@ self: {
      }:
      mkDerivation {
        pname = "clafer";
-       version = "0.4.4";
-       sha256 = "285e0dc889526f37f7bcc6418699b5465c269a9e6cb17a9219405089c644f21f";
+       version = "0.4.5";
+       sha256 = "0b19b7dd173851200a2a55ccb491e58c6239f838d2da476fb2ba22486d3d99d2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40267,8 +40648,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferIG";
-       version = "0.4.4";
-       sha256 = "7eecfddae7d82ba90fba1e68ab19513f5eb056ed3741f6b577b5b41d8728eeb4";
+       version = "0.4.5";
+       sha256 = "52369e39c556ecc20b6f426ac53ec9f346986008c612f3c08450adef125d61cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40298,8 +40679,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferwiki";
-       version = "0.4.4";
-       sha256 = "993d093d554939dd4570ce7d54df818b5c249f7434c90d68d89f5e537dbff028";
+       version = "0.4.5";
+       sha256 = "e012350a1575d7a5f2eab664ccbe79d3ca7f166004d3295142c3a9df7bbb5766";
        libraryHaskellDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers transformers-compat
@@ -40591,38 +40972,6 @@ self: {
      }) {};
 
   "classy-prelude" = callPackage
-    ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
-     , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
-     , hashable, hspec, lifted-async, lifted-base, monad-unlift
-     , mono-traversable, mono-traversable-instances, mtl
-     , mutable-containers, primitive, QuickCheck, safe-exceptions, say
-     , semigroups, stm, stm-chans, text, time, time-locale-compat
-     , transformers, transformers-base, unordered-containers, vector
-     , vector-instances
-     }:
-     mkDerivation {
-       pname = "classy-prelude";
-       version = "1.2.0";
-       sha256 = "74ca864563ae2b6e048f86ec3be256192e81d12fbef0723d2aa2ee3d1d71fd70";
-       libraryHaskellDepends = [
-         async base basic-prelude bifunctors bytestring chunked-data
-         containers deepseq dlist exceptions ghc-prim hashable lifted-async
-         lifted-base monad-unlift mono-traversable
-         mono-traversable-instances mtl mutable-containers primitive
-         safe-exceptions say semigroups stm stm-chans text time
-         time-locale-compat transformers transformers-base
-         unordered-containers vector vector-instances
-       ];
-       testHaskellDepends = [
-         base containers hspec QuickCheck transformers unordered-containers
-       ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "A typeclass-based Prelude";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "classy-prelude_1_2_0_1" = callPackage
     ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim
      , hashable, hspec, lifted-async, lifted-base, monad-unlift
@@ -41216,6 +41565,8 @@ self: {
        pname = "clist";
        version = "0.1.0.0";
        sha256 = "eddf07964751b51550c5197f39cc772418b0fa7d2ad6cf762af589ce9bd973cb";
+       revision = "1";
+       editedCabalFile = "5508b5f87701885103461d4e1b28594051e698fd6f09254cddd4b37676809d02";
        libraryHaskellDepends = [ base base-unicode-symbols peano ];
        homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
@@ -41231,8 +41582,8 @@ self: {
      }:
      mkDerivation {
        pname = "clit";
-       version = "0.3.1.0";
-       sha256 = "1e8f6dfb1c868b979722ec855b8b75165a61bf41a210a2c29a408573c9bc8085";
+       version = "0.4.0.3";
+       sha256 = "de42b5f458969a651aa4b40bb47f169eefbf2195f21f31586a39e249ecbc7d6c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41680,8 +42031,8 @@ self: {
      }:
      mkDerivation {
        pname = "cmdargs";
-       version = "0.10.14";
-       sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58";
+       version = "0.10.15";
+       sha256 = "c80306ee127532fe4f852b690da470e7f5d8e58dce7122368c7e1b5b4629a55f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41865,6 +42216,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "code-page_0_1_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "code-page";
+       version = "0.1.3";
+       sha256 = "e65c86600e06d85f2e2c2a9df4b3d68e2dbd3adb2df9e922a4cd744966762191";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       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
     ({ mkDerivation, aeson, base, binary, binary-bits, bytestring
      , data-default-class, mtl, template-haskell, text, transformers
@@ -42883,6 +43248,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "compactable" = callPackage
+    ({ mkDerivation, base, containers, transformers, vector }:
+     mkDerivation {
+       pname = "compactable";
+       version = "0.1.0.1";
+       sha256 = "67c806a237be7fba93da9d91b5d20c8586f647f97cb4408be8bd44173b8609c0";
+       libraryHaskellDepends = [ base containers transformers vector ];
+       description = "A generalization for containers that can be stripped of Nothings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "compactmap" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, vector }:
      mkDerivation {
@@ -43130,6 +43506,60 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "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 {
+       pname = "composite-aeson";
+       version = "0.1.0.0";
+       sha256 = "dbefe06c854762ec1f9fe0920cd9e2373caf20c49c1cbe9c0641d8c2ce36f288";
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base basic-prelude composite-base
+         containers contravariant generic-deriving lens profunctors
+         scientific text unordered-containers vinyl
+       ];
+       homepage = "https://github.com/ConferHealth/composite#readme";
+       description = "JSON for Vinyl/Frames records";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "composite-base" = callPackage
+    ({ mkDerivation, base, basic-prelude, Frames, lens
+     , template-haskell, text, vinyl
+     }:
+     mkDerivation {
+       pname = "composite-base";
+       version = "0.1.0.0";
+       sha256 = "18686bd5a539a5ca82be8ebc6ffb374578d9ff5334cf4959e00c1998e1cd18ea";
+       libraryHaskellDepends = [
+         base basic-prelude Frames lens template-haskell text vinyl
+       ];
+       homepage = "https://github.com/ConferHealth/composite#readme";
+       description = "Shared utilities for composite-* packages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "composite-opaleye" = callPackage
+    ({ mkDerivation, base, basic-prelude, bytestring, composite-base
+     , Frames, lens, opaleye, postgresql-simple, product-profunctors
+     , profunctors, template-haskell, text, vinyl
+     }:
+     mkDerivation {
+       pname = "composite-opaleye";
+       version = "0.1.0.0";
+       sha256 = "1a2687c59106ebbd3d4ec0b8d9bd31f63b19d1a328a458bb05e9083c7a32008c";
+       libraryHaskellDepends = [
+         base basic-prelude bytestring composite-base Frames lens opaleye
+         postgresql-simple product-profunctors profunctors template-haskell
+         text vinyl
+       ];
+       homepage = "https://github.com/ConferHealth/composite#readme";
+       description = "Opaleye SQL for Frames records";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "composition" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -43565,8 +43995,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.2.3.3";
-       sha256 = "e5204231e35181e56b9313f6dbe83d531b3f6c3f6dfbe3a1c465e5b6b2a24924";
+       version = "0.3.0";
+       sha256 = "c5ef38498f89f794cf9065841bf0e865b871a14874cde2f51aad3194e61a0ad2";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -43896,8 +44326,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "1.1.0";
-       sha256 = "ff1f16f24e2c186ce5d61f079b318e2f58c4bc3a4a2c8d9011d001512786335a";
+       version = "1.1.1";
+       sha256 = "a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918";
        libraryHaskellDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra filepath monad-control mono-traversable
@@ -44594,8 +45024,8 @@ self: {
      }:
      mkDerivation {
        pname = "constrained-monads";
-       version = "0.1.0.0";
-       sha256 = "1822fb5f5bec60b9c7efc11b776718bcdc66399a8c34687fe6173975ec010184";
+       version = "0.4.0.0";
+       sha256 = "335432d74b02ada378b2815a57ba9b840fe24474e2d5c25fa2aac32c3a431cc1";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [
          base containers doctest QuickCheck transformers
@@ -44630,6 +45060,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "constraint-manip" = callPackage
+    ({ mkDerivation, base, indextype }:
+     mkDerivation {
+       pname = "constraint-manip";
+       version = "0.1.0.0";
+       sha256 = "48baa31f15760a8688a00f5eacca8acbccd8c6b16895e17d08d2b26851a556c9";
+       libraryHaskellDepends = [ base indextype ];
+       description = "Some conviencience type functions for manipulating constraints";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "constraints" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
      , transformers, transformers-compat
@@ -44647,6 +45088,24 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "constraints_0_9_1" = callPackage
+    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "constraints";
+       version = "0.9.1";
+       sha256 = "276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785";
+       libraryHaskellDepends = [
+         base binary deepseq ghc-prim hashable mtl transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/constraints/";
+       description = "Constraint manipulation";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -46010,26 +46469,6 @@ self: {
      }) {};
 
   "cpphs" = callPackage
-    ({ mkDerivation, base, directory, old-locale, old-time, polyparse
-     }:
-     mkDerivation {
-       pname = "cpphs";
-       version = "1.20.3";
-       sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base directory old-locale old-time polyparse
-       ];
-       executableHaskellDepends = [
-         base directory old-locale old-time polyparse
-       ];
-       homepage = "http://projects.haskell.org/cpphs/";
-       description = "A liberalised re-implementation of cpp, the C pre-processor";
-       license = "LGPL";
-     }) {};
-
-  "cpphs_1_20_4" = callPackage
     ({ mkDerivation, base, directory, filepath, old-locale, old-time
      , polyparse
      }:
@@ -46048,7 +46487,6 @@ self: {
        homepage = "http://projects.haskell.org/cpphs/";
        description = "A liberalised re-implementation of cpp, the C pre-processor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cprng-aes" = callPackage
@@ -48482,8 +48920,8 @@ self: {
      }:
      mkDerivation {
        pname = "d-bus";
-       version = "0.1.5";
-       sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06";
+       version = "0.1.6";
+       sha256 = "16223d22697eda3d52a0e6643c2ad6d98b3d957680990403bed64878a8bc3b63";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51084,6 +51522,8 @@ self: {
        pname = "dbus";
        version = "0.10.12";
        sha256 = "f6d7b5640eb03e9598e38b1a2b2e7af1e9d357f3f845fc9528f9750965b92d54";
+       revision = "1";
+       editedCabalFile = "056e9977d3cf251022d8f4013531c0dd6b62afa68719b5567756386e1503271e";
        libraryHaskellDepends = [
          base bytestring cereal containers libxml-sax network parsec random
          text transformers unix vector xml-types
@@ -52509,8 +52949,8 @@ self: {
      }:
      mkDerivation {
        pname = "derive";
-       version = "2.6.1";
-       sha256 = "8544ac13c09059acd2914da86506206879e3feb375361fc5e312548c4d9b6d72";
+       version = "2.6.2";
+       sha256 = "2f98205548dec0b9cafb9ff39a80628798e72f693acdb9b522d23442ed791132";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -53589,15 +54029,16 @@ self: {
 
   "dictionaries" = callPackage
     ({ mkDerivation, attoparsec, base, binary, bytestring, containers
-     , data-default, directory, exceptions, filepath, text, time, zlib
+     , data-default, directory, exceptions, filepath, text, time
+     , transformers, zlib
      }:
      mkDerivation {
        pname = "dictionaries";
-       version = "0.1.0.0";
-       sha256 = "28b3ba1e9ad52ccf4f333861e22830da77ad915622fa1ffca87cff6e9716c0ab";
+       version = "0.1.0.1";
+       sha256 = "89712a700212f922671f3784f785ccf1e53865570fab48471b02ef409e73be35";
        libraryHaskellDepends = [
          attoparsec base binary bytestring containers data-default directory
-         exceptions filepath text time zlib
+         exceptions filepath text time transformers zlib
        ];
        description = "Tools to handle StarDict dictionaries";
        license = stdenv.lib.licenses.bsd3;
@@ -54333,12 +54774,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_1_0" = callPackage
+  "directory_1_3_1_1" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.1.0";
-       sha256 = "94b0d06aba8311e3b9dc8e460d4ad5b25fdfcc361eecb8e7ad68a18f171aa7f2";
+       version = "1.3.1.1";
+       sha256 = "5354dd7644237d312f2a223446e0adc11a7ec36c72e1925cae11159869de8b42";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -54578,6 +55019,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "disjoint-set-stateful" = callPackage
+    ({ mkDerivation, base, hspec, primitive, ref-tf, vector }:
+     mkDerivation {
+       pname = "disjoint-set-stateful";
+       version = "0.1.0.0";
+       sha256 = "addb5ab47b17356cd79fd4232db23c2ef09292cfd4c1ef04f2595416df0132f1";
+       libraryHaskellDepends = [ base primitive ref-tf vector ];
+       testHaskellDepends = [ base hspec primitive ref-tf vector ];
+       homepage = "https://github.com/clintonmead/disjoint-set-stateful";
+       description = "Monadic disjoint set";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "disjoint-sets-st" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -54620,14 +55074,27 @@ self: {
     ({ mkDerivation, base, dlist }:
      mkDerivation {
        pname = "disposable";
-       version = "0.1.1.0";
-       sha256 = "719e8e28cfe3345c441478f9d88949767122d2708241a0e232e9fe672c662b12";
+       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";
+       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
     ({ mkDerivation, base, Cabal, directory, filepath, process }:
      mkDerivation {
@@ -54767,31 +55234,29 @@ self: {
      }) {};
 
   "distributed-process-client-server" = callPackage
-    ({ mkDerivation, ansi-terminal, base, binary, containers
-     , data-accessor, deepseq, distributed-process
-     , distributed-process-async, distributed-process-extras
-     , distributed-process-tests, fingertree, ghc-prim, hashable, HUnit
-     , mtl, network, network-transport, network-transport-tcp, rematch
-     , stm, test-framework, test-framework-hunit, time, transformers
+    ({ mkDerivation, ansi-terminal, base, binary, containers, deepseq
+     , distributed-process, distributed-process-async
+     , distributed-process-extras, distributed-process-systest
+     , exceptions, fingertree, ghc-prim, hashable, HUnit, mtl, network
+     , network-transport, network-transport-tcp, rematch, stm
+     , test-framework, test-framework-hunit, time, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "distributed-process-client-server";
-       version = "0.1.3.2";
-       sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f";
-       revision = "2";
-       editedCabalFile = "aedbbade08de4e7483cc9bc84e41ca9e6227a279480e025a27c78f31f1775413";
+       version = "0.2.0";
+       sha256 = "de26c3cfcf8c290c0ffd8f8fa330cdd85c421e237dc0ce0530ede71a58b09b15";
        libraryHaskellDepends = [
-         base binary containers data-accessor deepseq distributed-process
-         distributed-process-async distributed-process-extras fingertree
-         hashable mtl stm time transformers unordered-containers
+         base binary containers deepseq distributed-process
+         distributed-process-async distributed-process-extras exceptions
+         fingertree hashable mtl stm time transformers unordered-containers
        ];
        testHaskellDepends = [
          ansi-terminal base binary containers deepseq distributed-process
          distributed-process-async distributed-process-extras
-         distributed-process-tests fingertree ghc-prim HUnit mtl network
-         network-transport network-transport-tcp rematch stm test-framework
-         test-framework-hunit transformers
+         distributed-process-systest exceptions fingertree ghc-prim HUnit
+         mtl network network-transport network-transport-tcp rematch stm
+         test-framework test-framework-hunit transformers
        ];
        homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
@@ -56630,12 +57095,12 @@ self: {
      }) {};
 
   "drmaa" = callPackage
-    ({ mkDerivation, base, drmaa, inline-c, shelly, text }:
+    ({ mkDerivation, base, directory, drmaa, inline-c }:
      mkDerivation {
        pname = "drmaa";
-       version = "0.1.1";
-       sha256 = "66b095d3b94ed531e2a704fba319002e8d3b7b6f9b3f68102a4b4d0f7a048567";
-       libraryHaskellDepends = [ base inline-c shelly text ];
+       version = "0.2.0";
+       sha256 = "e65d76b31c8041e553081f5fe500b5f3fffe7919731126a1956cc88639fdbe42";
+       libraryHaskellDepends = [ base directory inline-c ];
        librarySystemDepends = [ drmaa ];
        description = "A minimal Haskell bindings to DRMAA C library";
        license = stdenv.lib.licenses.bsd3;
@@ -57259,8 +57724,8 @@ self: {
     ({ mkDerivation, base, primitive, vector }:
      mkDerivation {
        pname = "dynamic-mvector";
-       version = "0.1.0.4";
-       sha256 = "a36fc29ba4b91d52beb1f2df6ba8a837c6f112ef31358b20f5d0056f20d788a6";
+       version = "0.1.0.5";
+       sha256 = "22b69e25f7bdeb51dc9071e352eeed58c292ebe3c9f88e2749ce0b6a5f4d5e43";
        libraryHaskellDepends = [ base primitive vector ];
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
@@ -57718,6 +58183,8 @@ self: {
        pname = "echo";
        version = "0.1.3";
        sha256 = "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef";
+       revision = "1";
+       editedCabalFile = "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
@@ -59045,6 +59512,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "elsa" = callPackage
+    ({ mkDerivation, array, base, dequeue, directory, filepath
+     , hashable, json, megaparsec, mtl, tasty, tasty-hunit
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "elsa";
+       version = "0.2.0.0";
+       sha256 = "79d83d3ab692b21920189ea780ab4418e06330959165b29f4d9940e1e03e64af";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base dequeue directory filepath hashable json megaparsec mtl
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
+       homepage = "http://github.com/ucsd-progsys/elsa";
+       description = "A tiny language for understanding the lambda-calculus";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "emacs-keys" = callPackage
     ({ mkDerivation, base, doctest, split, tasty, tasty-hspec
      , tasty-quickcheck, template-haskell, th-lift, xkbcommon
@@ -59348,6 +59837,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "encode-string" = callPackage
+    ({ mkDerivation, base, bytestring, QuickCheck, quickcheck-instances
+     , text
+     }:
+     mkDerivation {
+       pname = "encode-string";
+       version = "0.1.0.0";
+       sha256 = "fb13bf53058bff828555f76421d0c0e195ea8ac0d92c6e73ce43055d680cb990";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base bytestring QuickCheck quickcheck-instances text
+       ];
+       homepage = "https://github.com/minad/encode-string#readme";
+       description = "Safe string conversion and encoding";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "encoding" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , extensible-exceptions, ghc-prim, HaXml, mtl, regex-compat
@@ -60240,6 +60746,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_2_0" = callPackage
+    ({ mkDerivation, base, exceptions, safe, text, transformers
+     , transformers-compat, unexceptionalio
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.2.0";
+       sha256 = "fda1c9e91950d7dc4d8483e2dc65085f12de5c2819b815799b6e75846fc9617c";
+       libraryHaskellDepends = [
+         base exceptions safe text transformers transformers-compat
+         unexceptionalio
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersaconcat" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, HTTP
      , network-uri, process, QuickCheck, tagsoup, template-haskell
@@ -60507,6 +61030,8 @@ self: {
        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
@@ -60691,15 +61216,14 @@ self: {
 
   "eve" = callPackage
     ({ mkDerivation, base, containers, data-default, free, hspec
-     , hspec-core, lens, mtl, pipes, pipes-concurrency, pipes-parse
+     , hspec-core, lens, mtl
      }:
      mkDerivation {
        pname = "eve";
-       version = "0.1.0";
-       sha256 = "18cc10498a3c663fed847eaa5caf910f613cca4c817e05a3e884b077b2122ed9";
+       version = "0.1.7";
+       sha256 = "b1d4ad466224f3cad47bce852e5c1605e3353b57adb1a4dc57591ee89e99b237";
        libraryHaskellDepends = [
-         base containers data-default free lens mtl pipes pipes-concurrency
-         pipes-parse
+         base containers data-default free lens mtl
        ];
        testHaskellDepends = [
          base data-default hspec hspec-core lens mtl
@@ -61297,25 +61821,25 @@ self: {
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
-    ({ mkDerivation, aeson, base, bytes, constraints, deepseq
-     , generic-random, hashable, profunctors, QuickCheck, singletons
-     , tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, aeson, base, binary, bytes, bytestring, cereal
+     , constraints, deepseq, hashable, profunctors, QuickCheck
+     , singletons, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "exinst";
-       version = "0.3";
-       sha256 = "3edfe07ca71b4c296349661f8f2d496100d3b44ae72af8ce1ab7f76f1adddb11";
+       version = "0.3.0.1";
+       sha256 = "7a7351355ac5bf1f0bf1fb1028993399f7f644b661579a62bbc88853a55c796b";
        libraryHaskellDepends = [
-         aeson base bytes constraints deepseq hashable profunctors
-         QuickCheck singletons
+         aeson base binary bytes cereal constraints deepseq hashable
+         profunctors QuickCheck singletons
        ];
        testHaskellDepends = [
-         aeson base bytes constraints deepseq generic-random hashable
-         profunctors QuickCheck singletons tasty tasty-hunit
+         aeson base binary bytes bytestring cereal constraints deepseq
+         hashable profunctors QuickCheck singletons tasty tasty-hunit
          tasty-quickcheck
        ];
        homepage = "https://github.com/k0001/exinst";
-       description = "Derive instances for your existential types";
+       description = "Recover instances for your existential types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -61758,7 +62282,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extensible_0_4" = callPackage
+  "extensible_0_4_1" = callPackage
     ({ mkDerivation, base, comonad, constraints, criterion, deepseq
      , effin, extensible-effects, freer, ghc-prim, lens, monad-skeleton
      , mtl, primitive, profunctors, semigroups, tagged, template-haskell
@@ -61766,8 +62290,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible";
-       version = "0.4";
-       sha256 = "f9fbd703c2ac7b2790446cb04281d3577848797d53413374e5c1987afcec3a1c";
+       version = "0.4.1";
+       sha256 = "4982d227fa1dc75ec7ade1ecb81d2611f35cace2bc79a9b68cbdf4305453648a";
        libraryHaskellDepends = [
          base comonad constraints deepseq ghc-prim monad-skeleton mtl
          primitive profunctors semigroups tagged template-haskell
@@ -63314,22 +63838,6 @@ self: {
      }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
-    ({ mkDerivation, array, base, containers, deepseq, hspec
-     , QuickCheck, transformers
-     }:
-     mkDerivation {
-       pname = "fgl";
-       version = "5.5.3.0";
-       sha256 = "d70cd8e2694311fae0b44fe0d1b342c95706ceffd3be66767e9027dfa5597e39";
-       libraryHaskellDepends = [
-         array base containers deepseq transformers
-       ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
-       description = "Martin Erwig's Functional Graph Library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fgl_5_5_3_1" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, hspec
      , microbench, QuickCheck, transformers
      }:
@@ -63344,22 +63852,9 @@ self: {
        benchmarkHaskellDepends = [ base deepseq microbench ];
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-arbitrary" = callPackage
-    ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "fgl-arbitrary";
-       version = "0.2.0.2";
-       sha256 = "501d77f1f5efd952aaf06d35fc95bfd3a9bc93906f78a363766ec74d14d50b8b";
-       libraryHaskellDepends = [ base fgl QuickCheck ];
-       testHaskellDepends = [ base containers fgl hspec QuickCheck ];
-       description = "QuickCheck support for fgl";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fgl-arbitrary_0_2_0_3" = callPackage
     ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }:
      mkDerivation {
        pname = "fgl-arbitrary";
@@ -63369,7 +63864,6 @@ self: {
        testHaskellDepends = [ base containers fgl hspec QuickCheck ];
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fgl-extras-decompositions" = callPackage
@@ -65008,8 +65502,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.1.3";
-       sha256 = "391f97abb8acac97b82d3b8a3ee3d62e2f76b566c01be2dff8835932fd85ae29";
+       version = "0.5.1.4";
+       sha256 = "a512cfb0cdad3873c4457eec90c25e7e8a8042e6b98fedb50d883235a55711e3";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -66006,10 +66500,10 @@ self: {
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.3";
-       sha256 = "72d7f2af963d42cb7e1164b854978ad3f351175449ba2d27c6b639ffca0b75fa";
-       revision = "1";
-       editedCabalFile = "d3e2dc092452ec38bd2b555ecb5c5aceecb21880810c115973bf5cf2b4e0da5b";
+       version = "0.0.4";
+       sha256 = "a86d2383d2be673593c4862ce082bb2662ce1e2f32d5187f351d47105b95921b";
+       revision = "3";
+       editedCabalFile = "bd8219e3179c900cc49b70d006c8844fcda618f33867d2e8b5679fed9afd360b";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -68314,8 +68808,8 @@ self: {
      }:
      mkDerivation {
        pname = "general-games";
-       version = "1.0.2";
-       sha256 = "1415c6cb8a2d37322e7568ae53ffca5d658aed6e47bbbefa5c59ed88c09b384e";
+       version = "1.0.3";
+       sha256 = "3be96a6b56f39e6d122b57759802cd8de36210f72192a1dfee24247bdfe0c7ef";
        libraryHaskellDepends = [
          base monad-loops MonadRandom random random-shuffle
        ];
@@ -68402,6 +68896,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-arbitrary" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "generic-arbitrary";
+       version = "0.1.0";
+       sha256 = "69f30a54e7a3d0a45288778e22e6d0d03cfc3b525dfe0a663cd4f559a619bcc6";
+       libraryHaskellDepends = [ base QuickCheck ];
+       description = "Generic implementation for QuickCheck's Arbitrary";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "generic-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, ghc-prim }:
      mkDerivation {
@@ -68475,6 +68980,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-enum" = callPackage
+    ({ mkDerivation, array, base, bytestring, hspec }:
+     mkDerivation {
+       pname = "generic-enum";
+       version = "0.1.1.0";
+       sha256 = "bea3687bf956cbcc4dbe24ad52a9f916f76a564f8cc046341568b176708a94d4";
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ array base bytestring hspec ];
+       description = "An Enum class that fixes some deficiences with Prelude's Enum";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "generic-lucid-scaffold" = callPackage
     ({ mkDerivation, base, lucid, text }:
      mkDerivation {
@@ -68530,24 +69047,6 @@ self: {
      }) {};
 
   "generic-random" = callPackage
-    ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754
-     , MonadRandom, mtl, QuickCheck, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "generic-random";
-       version = "0.4.0.0";
-       sha256 = "68c5036f55584c5164c79a6adf6d9dc4435844fc98d206be80a1683cc4929f22";
-       libraryHaskellDepends = [
-         ad base containers hashable hmatrix ieee754 MonadRandom mtl
-         QuickCheck transformers unordered-containers vector
-       ];
-       homepage = "http://github.com/lysxia/generic-random";
-       description = "Generic random generators";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "generic-random_0_4_1_0" = callPackage
     ({ mkDerivation, base, boltzmann-samplers, QuickCheck }:
      mkDerivation {
        pname = "generic-random";
@@ -68557,7 +69056,6 @@ self: {
        homepage = "http://github.com/lysxia/generic-random";
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-records" = callPackage
@@ -68878,8 +69376,10 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.3.1.0";
-       sha256 = "fd79841970e8d29a204e8cdf540478760f2a488bde21583668a3e7d8526f588a";
+       version = "0.3.2.0";
+       sha256 = "1a92621a1d9f09e134891fe408cd6c17af866a80648ec53f014eed9604b9905b";
+       revision = "1";
+       editedCabalFile = "08fd437bc922f93c1122c58d0dca3e93befe76c800e117b729da975836ba8f26";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -68887,14 +69387,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
+     , hspec, QuickCheck, validity, validity-bytestring
+     }:
+     mkDerivation {
+       pname = "genvalidity-bytestring";
+       version = "0.0.0.1";
+       sha256 = "314e531c902db8e36df9f23c8e8a9b355cabf8377ddb1b24410e25f96f806d67";
+       libraryHaskellDepends = [
+         base bytestring genvalidity QuickCheck validity validity-bytestring
+       ];
+       testHaskellDepends = [
+         base bytestring genvalidity genvalidity-hspec hspec QuickCheck
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for ByteString";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-containers" = callPackage
     ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-containers
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.2.0.0";
-       sha256 = "79cccb5ac44193287e65aaf751617e213e71b012cc96e31e42428cdfd9c63ce1";
+       version = "0.2.0.1";
+       sha256 = "97fa168074201195a57ad36f4ae678435f2595e071f9ec259bca72eacf0eaf29";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -68908,15 +69427,15 @@ self: {
      }) {};
 
   "genvalidity-hspec" = callPackage
-    ({ mkDerivation, base, doctest, genvalidity, hspec, hspec-core
-     , QuickCheck, validity
+    ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
+     , hspec, hspec-core, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.3.1.0";
-       sha256 = "abead88444f51c39f59cf2b959ad0d9532f4b58b87cb9f53b6e6c0bc6f62ef5d";
+       version = "0.4.0.0";
+       sha256 = "4e3f5370e5945cb63a4063b9fc810384df7ce9bf9b0aa6f6f1549739897067ad";
        libraryHaskellDepends = [
-         base genvalidity hspec QuickCheck validity
+         base genvalidity genvalidity-property hspec QuickCheck validity
        ];
        testHaskellDepends = [
          base doctest genvalidity hspec hspec-core QuickCheck
@@ -68934,8 +69453,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.0.1.0";
-       sha256 = "58da64350fb137c8fae3a62450fe541adf66ddc4f2d42791350cb6085ac1b2b0";
+       version = "0.0.1.1";
+       sha256 = "78c874a190dd0a92005a1c2d8ca2b05ae6682d3486dc1d5a9feeb0daab393d37";
        libraryHaskellDepends = [
          aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
          QuickCheck
@@ -68955,8 +69474,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-hspec-cereal";
-       version = "0.0.0.0";
-       sha256 = "1cbb1d37aed02b8aa75092b0ff7065bdd0238a02fd735a2b1e548be9e11e48de";
+       version = "0.0.0.1";
+       sha256 = "72da16d069acb00176f0e17844b1991c86769feb4157ba0afa204f4dfb21fd78";
        libraryHaskellDepends = [
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -68973,8 +69492,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-path";
-       version = "0.1.0.0";
-       sha256 = "0b955a1e244c9fa2915212447b75ec862c3677a43e8b2654e368568ef6244b38";
+       version = "0.1.0.2";
+       sha256 = "3dbdb8e37bfedce8f0a09a5bd3ef9d2968ee79cc1dbadb92deec231887aeebbe";
        libraryHaskellDepends = [ base genvalidity path validity-path ];
        testHaskellDepends = [ base genvalidity-hspec hspec path ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -68983,14 +69502,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-property" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, genvalidity
+     , hspec, QuickCheck, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-property";
+       version = "0.0.0.0";
+       sha256 = "5d202e8245c3658630273469730f2601414b466165da92392e6dc0c85c728f10";
+       libraryHaskellDepends = [
+         base genvalidity hspec QuickCheck validity
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Standard properties for functions on `Validity` types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "genvalidity-text" = callPackage
     ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, text, validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.3.1.0";
-       sha256 = "84ca3ffc6717a1cf9c535a53e4f8451ae4878370870555bced73ea33fd724a02";
+       version = "0.3.1.1";
+       sha256 = "07a1a3faede82fb451a111ae7f6b2c44b67c8665369b440fa3ece9b630b4ae7a";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -69009,8 +69545,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.0.0.0";
-       sha256 = "6f0a0872e4163afbe03ebdca19cc3411ba60cfc8ff44db03cd06c66c4b974e3e";
+       version = "0.0.0.1";
+       sha256 = "b2afbab45a899b0827e30ea6c147f62cb2ad1b6199dd1b517016679d65b5a082";
        libraryHaskellDepends = [ base genvalidity time validity-time ];
        testHaskellDepends = [ base genvalidity-hspec hspec time ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -70108,6 +70644,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-usage" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-paths, unix }:
+     mkDerivation {
+       pname = "ghc-usage";
+       version = "0.1.0.1";
+       sha256 = "dddd7072f2955da4ce29fbb7d8904523fa4d3b563837432889e7e2920f09acf4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ghc ];
+       executableHaskellDepends = [ base ghc-paths unix ];
+       description = "Print minimal export lists";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-vis" = callPackage
     ({ mkDerivation, base, cairo, containers, deepseq, fgl
      , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers
@@ -70277,6 +70827,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ghcjs-base-stub" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, deepseq, ghc-prim
+     , primitive, scientific, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "ghcjs-base-stub";
+       version = "0.1.0.2";
+       sha256 = "629089740c7fd2349b39a3899bad3692667dfd2ff6443b3e815d2bf3cad60ff5";
+       libraryHaskellDepends = [
+         aeson attoparsec base deepseq ghc-prim primitive scientific text
+         transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/louispan/javascript-stub#readme";
+       description = "Allow GHCJS projects to compile under GHC and develop using intero";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghcjs-codemirror" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -70556,8 +71124,7 @@ self: {
 
   "gi-cairo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
+     , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-cairo";
@@ -70568,9 +71135,8 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ cairo gobjectIntrospection ];
+       libraryPkgconfigDepends = [ cairo ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
        preCompileBuildDriver = ''
          PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
@@ -70578,7 +71144,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) cairo;};
 
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -70596,7 +71162,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
@@ -70605,8 +71170,8 @@ self: {
 
   "gi-gdkpixbuf" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
-     , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
-     , haskell-gi-base, text, transformers
+     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
@@ -70617,22 +71182,16 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ];
+       libraryPkgconfigDepends = [ gdk_pixbuf ];
        doHaddock = false;
-       preConfigure = ''
-         export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0
-         export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0
-       '';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk_pixbuf; 
-         inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) gdk_pixbuf;};
 
   "gi-gio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, glib, gobjectIntrospection, haskell-gi
-     , haskell-gi-base, text, transformers
+     , gi-gobject, glib, haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gio";
@@ -70643,13 +71202,12 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       libraryPkgconfigDepends = [ glib ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
@@ -70675,8 +71233,7 @@ self: {
 
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, glib
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
+     , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-glib";
@@ -70687,18 +71244,16 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       libraryPkgconfigDepends = [ glib ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) glib;};
 
   "gi-gobject" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib
-     , gobjectIntrospection, haskell-gi, haskell-gi-base, text
-     , transformers
+     , haskell-gi, haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gobject";
@@ -70709,13 +71264,12 @@ self: {
          base bytestring containers gi-glib haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       libraryPkgconfigDepends = [ glib ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;};
+     }) {inherit (pkgs) glib;};
 
   "gi-gst" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
@@ -70741,8 +71295,8 @@ self: {
 
   "gi-gstaudio" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
+     , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi
+     , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstaudio";
@@ -70753,19 +71307,18 @@ self: {
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
          haskell-gi haskell-gi-base text transformers
        ];
-       librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst_plugins_base ];
+       libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
+     }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstbase" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base
-     , haskell-gi, haskell-gi-base, text, transformers
+     , gi-gobject, gi-gst, gst-plugins-base, haskell-gi, haskell-gi-base
+     , text, transformers
      }:
      mkDerivation {
        pname = "gi-gstbase";
@@ -70776,19 +71329,18 @@ self: {
          base bytestring containers gi-glib gi-gobject gi-gst haskell-gi
          haskell-gi-base text transformers
        ];
-       librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst_plugins_base ];
+       libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
+     }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gstvideo" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
-     , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection
-     , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers
+     , gi-gobject, gi-gst, gi-gstbase, gst-plugins-base, haskell-gi
+     , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-gstvideo";
@@ -70799,14 +71351,13 @@ self: {
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
          haskell-gi haskell-gi-base text transformers
        ];
-       librarySystemDepends = [ gobjectIntrospection ];
-       libraryPkgconfigDepends = [ gst_plugins_base ];
+       libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; gst_plugins_base = null;};
+     }) {inherit (pkgs.gst_all_1) gst-plugins-base;};
 
   "gi-gtk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
@@ -70825,7 +71376,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
@@ -70899,7 +71449,7 @@ self: {
 
   "gi-javascriptcore" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
+     , haskell-gi-base, text, transformers, webkitgtk24x
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -70910,18 +71460,17 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk24x ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs) webkitgtk24x;};
 
   "gi-javascriptcore_4_0_11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi
-     , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk
+     , haskell-gi-base, text, transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
@@ -70932,14 +71481,13 @@ self: {
          base bytestring containers haskell-gi haskell-gi-base text
          transformers
        ];
-       libraryPkgconfigDepends = [ javascriptcoregtk webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {javascriptcoregtk = null; inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs.gnome3) webkitgtk;};
 
   "gi-notify" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf
@@ -70965,8 +71513,8 @@ self: {
 
   "gi-pango" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi
-     , haskell-gi-base, pango, text, transformers
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, pango, text
+     , transformers
      }:
      mkDerivation {
        pname = "gi-pango";
@@ -70977,9 +71525,8 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ];
+       libraryPkgconfigDepends = [ cairo pango ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0'';
        preCompileBuildDriver = ''
          PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
@@ -70988,14 +71535,12 @@ self: {
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; 
-         inherit (pkgs.gnome2) pango;};
+     }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-pangocairo" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
-     , gi-glib, gi-gobject, gi-pango, gobjectIntrospection, haskell-gi
-     , haskell-gi-base, pango, system-cairo, system-pango, text
-     , transformers
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , gi-cairo, gi-glib, gi-gobject, gi-pango, haskell-gi
+     , haskell-gi-base, pango, text, transformers
      }:
      mkDerivation {
        pname = "gi-pangocairo";
@@ -71006,22 +71551,17 @@ self: {
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
          haskell-gi haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [
-         gobjectIntrospection pango system-cairo system-pango
-       ];
+       libraryPkgconfigDepends = [ cairo pango ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${system-pango.dev}/share/gir-1.0'';
        preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${system-pango.dev}/lib/pkgconfig:${system-cairo.dev}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs pangocairo cairo-gobject)"
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gobjectIntrospection; 
-         inherit (pkgs.gnome2) pango; system-cairo = pkgs.cairo; 
-         system-pango = pkgs.pango;};
+     }) {inherit (pkgs) cairo; inherit (pkgs.gnome2) pango;};
 
   "gi-poppler" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -71045,6 +71585,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) poppler;};
 
+  "gi-secret" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsecret, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-secret";
+       version = "0.0.1";
+       sha256 = "877f0d508b6bcdd46b2e2ab285de6cd96e687f3085c9b2bb7b23600834b29f9a";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ libsecret ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Libsecret bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) libsecret;};
+
   "gi-soup" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
      , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text
@@ -71092,7 +71653,7 @@ self: {
     ({ 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, webkit
+     , text, transformers, webkitgtk24x
      }:
      mkDerivation {
        pname = "gi-webkit";
@@ -71104,19 +71665,19 @@ self: {
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
          haskell-gi haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ webkit ];
+       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;
-     }) {webkit = null;};
+     }) {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
      , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text
-     , transformers, webkit2gtk, webkitgtk
+     , transformers, webkitgtk
      }:
      mkDerivation {
        pname = "gi-webkit2";
@@ -71128,19 +71689,18 @@ self: {
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi
          haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ webkit2gtk webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit2gtk = null; inherit (pkgs) webkitgtk;};
+     }) {inherit (pkgs.gnome3) webkitgtk;};
 
   "gi-webkit2webextension" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
      , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base
-     , text, transformers, webkit2gtk-web-extension, webkitgtk
+     , text, transformers, webkitgtk-web-extension
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
@@ -71151,14 +71711,13 @@ self: {
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
          gi-soup haskell-gi haskell-gi-base text transformers
        ];
-       libraryPkgconfigDepends = [ webkit2gtk-web-extension webkitgtk ];
+       libraryPkgconfigDepends = [ webkitgtk-web-extension ];
        doHaddock = false;
-       preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0'';
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2-WebExtension bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit2gtk-web-extension = null; inherit (pkgs) webkitgtk;};
+     }) {webkitgtk-web-extension = null;};
 
   "giak" = callPackage
     ({ mkDerivation, async, base, bytestring, Cabal, containers
@@ -72256,6 +72815,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gitrev_1_3_1" = callPackage
+    ({ mkDerivation, base, base-compat, directory, filepath, process
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "gitrev";
+       version = "1.3.1";
+       sha256 = "a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332";
+       libraryHaskellDepends = [
+         base base-compat directory filepath process template-haskell
+       ];
+       homepage = "https://github.com/acfoltzer/gitrev";
+       description = "Compile git revision info into Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gitson" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring
      , conduit-combinators, conduit-extra, criterion, directory, doctest
@@ -72487,6 +73063,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glaze_0_3_0_1" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "glaze";
+       version = "0.3.0.1";
+       sha256 = "bbb184408bcf24e8c4f89a960cf7a69ab0c51e98bf84c5fa9901aae1702e22a1";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/louispan/glaze#readme";
+       description = "Framework for rendering things with metadata/headers and values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glazier" = callPackage
     ({ mkDerivation, base, lens, mmorph, mtl, profunctors
      , semigroupoids, transformers
@@ -72537,6 +73126,63 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glazier-pipes_0_1_5_1" = callPackage
+    ({ mkDerivation, base, glazier, mmorph, pipes, stm, stm-extras
+     , transformers
+     }:
+     mkDerivation {
+       pname = "glazier-pipes";
+       version = "0.1.5.1";
+       sha256 = "9d1d044a4d8641a0da09d6447298530a8a785bb3e29c0177a0b682f9bbf4d1ac";
+       libraryHaskellDepends = [
+         base glazier mmorph pipes stm stm-extras transformers
+       ];
+       homepage = "https://github.com/louispan/glazier-pipes#readme";
+       description = "A threaded rendering framework using glaizer and pipes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "glazier-react" = callPackage
+    ({ mkDerivation, base, containers, deepseq, disposable, dlist, free
+     , ghcjs-base-stub, glazier, javascript-extras, lens, mmorph, mtl
+     , pipes-concurrency, profunctors, semigroupoids, stm, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "glazier-react";
+       version = "0.2.0.0";
+       sha256 = "ab19e2b5fc513c2be8d6ea5ec361eefc6be338ec76dd081566be344b41261467";
+       libraryHaskellDepends = [
+         base containers deepseq disposable dlist free ghcjs-base-stub
+         glazier javascript-extras lens mmorph mtl pipes-concurrency
+         profunctors semigroupoids stm text transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/louispan/glazier-react#readme";
+       description = "ReactJS binding using Glazier and Pipes.Fluid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "glazier-react-widget" = callPackage
+    ({ mkDerivation, base, containers, disposable, dlist, free
+     , ghcjs-base-stub, glazier, glazier-react, javascript-extras, lens
+     , mmorph, mtl, pipes-concurrency, stm, transformers
+     }:
+     mkDerivation {
+       pname = "glazier-react-widget";
+       version = "0.2.0.0";
+       sha256 = "5326958b5590c76cfee47eac0445cc66cca0a85480c6dee4c80fc736f4329fa4";
+       libraryHaskellDepends = [
+         base containers disposable dlist free ghcjs-base-stub glazier
+         glazier-react javascript-extras lens mmorph mtl pipes-concurrency
+         stm transformers
+       ];
+       homepage = "https://github.com/louispan/glazier-react-widget#readme";
+       description = "Generic widget library using glazier-react";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gli" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , friendly-time, http-client, http-client-tls, http-conduit
@@ -72812,6 +73458,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss_1_11_1_1" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, ghc-prim
+     , gloss-rendering, GLUT, OpenGL
+     }:
+     mkDerivation {
+       pname = "gloss";
+       version = "1.11.1.1";
+       sha256 = "14e09540ba120c4d0d9153655c35602de4657aa40ad2add693ca12f825d1d653";
+       libraryHaskellDepends = [
+         base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
+       ];
+       homepage = "http://gloss.ouroborus.net";
+       description = "Painless 2D vector graphics, animations and simulations";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-accelerate" = callPackage
     ({ mkDerivation, accelerate, base, gloss, gloss-rendering }:
      mkDerivation {
@@ -72830,8 +73493,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, gloss }:
      mkDerivation {
        pname = "gloss-algorithms";
-       version = "1.10.2.3";
-       sha256 = "8874065cdd7184ebf0fea50543ad31de6bca8f9d264e018f9d8a458e8bdbc675";
+       version = "1.11.1.1";
+       sha256 = "e1a7561c87a2d105054017d1c4fd393f597ddfcf0409aad097ba7e8e7aae23f2";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
@@ -72872,8 +73535,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-examples";
-       version = "1.10.2.4";
-       sha256 = "ef1adf43066757d82adc16b4bde4f19a73653b837112ca41713ad16e230cac62";
+       version = "1.11.1.1";
+       sha256 = "41be02978633f00d377c7d2378b2d510da343a91b634770b14cb4d834bf6bd54";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -72923,8 +73586,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-raster";
-       version = "1.10.2.4";
-       sha256 = "f9875344822a1bbb4b937605e1b1483b25559c186db94033c97117f6148cdef5";
+       version = "1.11.1.1";
+       sha256 = "277897eb2646fb66e23391796ed9e92360467ddf3acac196f658203cd9787c46";
        libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
@@ -72962,6 +73625,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "gloss-rendering_1_11_1_1" = callPackage
+    ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
+     mkDerivation {
+       pname = "gloss-rendering";
+       version = "1.11.1.1";
+       sha256 = "1f0a9a6d2124d4cbfb30821f1654d2cd9d7c1766310cf7f9009ccc9808474af4";
+       libraryHaskellDepends = [
+         base bmp bytestring containers GLUT OpenGL
+       ];
+       description = "Gloss picture data types and rendering functions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "gloss-sodium" = callPackage
     ({ mkDerivation, base, gloss, sodium }:
      mkDerivation {
@@ -76171,15 +76848,16 @@ self: {
      }) {};
 
   "google-maps-geocoding" = callPackage
-    ({ mkDerivation, aeson, base, http-client, servant, servant-client
-     , text
+    ({ mkDerivation, aeson, base, google-static-maps, http-client
+     , servant, servant-client, text
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.1.0.1";
-       sha256 = "58cd8efd50ebeaf4a5630f4548065c1e05ce6a39367d9ccaa0e1ccc67be3f531";
+       version = "0.2.0.0";
+       sha256 = "73a2560c6fb927d689e826cbd4ec1aba6a9f35bb3ba0b66b0d693614bfc492b3";
        libraryHaskellDepends = [
-         aeson base http-client servant servant-client text
+         aeson base google-static-maps http-client servant servant-client
+         text
        ];
        homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme";
        description = "Google Maps Geocoding API bindings";
@@ -76253,6 +76931,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "google-static-maps" = callPackage
+    ({ mkDerivation, aeson, base, bytedump, double-conversion
+     , http-client, JuicyPixels, network-uri, servant, servant-client
+     , servant-JuicyPixels, text
+     }:
+     mkDerivation {
+       pname = "google-static-maps";
+       version = "0.3.0.0";
+       sha256 = "4344c0b1470dd2025bae93a0a9e29c43826c00a16b618513515d696eab96c196";
+       libraryHaskellDepends = [
+         aeson base bytedump double-conversion http-client JuicyPixels
+         network-uri servant servant-client servant-JuicyPixels text
+       ];
+       homepage = "https://github.com/mpilgrem/google-static-maps#readme";
+       description = "Bindings to the Google Static Maps API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "google-translate" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-api-data
      , http-client, servant, servant-client, text, transformers
@@ -77561,8 +78257,8 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.7";
-       sha256 = "5369d0ab7b98b926951e81a65a349f11ab6badd71f65555d713428664c1e017c";
+       version = "7.8.8";
+       sha256 = "20a93f4fc42dd2082e991eac5dce282c00511abff66e9bd02c6753a748379d9c";
        libraryHaskellDepends = [ base cereal containers ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
@@ -77985,8 +78681,8 @@ self: {
     ({ mkDerivation, base, vector }:
      mkDerivation {
        pname = "gsl-random";
-       version = "0.5.0";
-       sha256 = "d2adccfe625d3cb5046ae5bb3c7a23d23697d1fc2c6a717df75f75aba2881c2e";
+       version = "0.5.1";
+       sha256 = "4b4e8d498b2c664c9219f6381b790f50192d77432a393d405052205d3e8d46e8";
        libraryHaskellDepends = [ base vector ];
        homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
@@ -78062,7 +78758,7 @@ self: {
 
   "gstreamer" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, directory, glib
-     , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl
+     , gst-plugins-base, gstreamer, gtk2hs-buildtools, mtl
      }:
      mkDerivation {
        pname = "gstreamer";
@@ -78072,12 +78768,12 @@ self: {
        libraryHaskellDepends = [
          array base bytestring directory glib mtl
        ];
-       libraryPkgconfigDepends = [ gst_plugins_base gstreamer ];
+       libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gst_plugins_base = null; inherit (pkgs) gstreamer;};
+     }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, haskeline
@@ -81941,8 +82637,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-hsp";
-       version = "7.3.7.1";
-       sha256 = "bbc884e4a5ca78faf08e17799c1d037622e377915ece889674004e0e54109617";
+       version = "7.3.7.2";
+       sha256 = "3c5de37dc150695fda04b3143396d9030772c8a72a204f49c243b160ffa295e4";
        libraryHaskellDepends = [
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
@@ -82065,8 +82761,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.4.6.3";
-       sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef";
+       version = "7.4.6.4";
+       sha256 = "b4c6c9503deeff37751af9ab9700158347658f28f1712933f9f1c8763b4ea1b9";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -82752,6 +83448,33 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "hashable";
+       version = "1.2.6.0";
+       sha256 = "429b663c827af52f64b0f376ee6e7a990e57ec54a59107857311054ade6e0a52";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp text
+       ];
+       testHaskellDepends = [
+         base bytestring ghc-prim HUnit QuickCheck random test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim integer-gmp siphash text
+       ];
+       homepage = "http://github.com/tibbe/hashable";
+       description = "A class for types that can be converted to a hash value";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashable-extras" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, hashable, transformers, transformers-compat
@@ -85625,8 +86348,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasmin";
-       version = "0.3.1.3";
-       sha256 = "b5297b795fba11f2644c9211b60cf535ca8d67aea6059714e7948d8261ddc9d8";
+       version = "0.3.2";
+       sha256 = "2e9473b11870b5a5a585fa453d4b5873f2e3885e0927653dcd50151eb513859b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85641,7 +86364,7 @@ self: {
          attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl
          QuickCheck text
        ];
-       homepage = "https://github.com/contivero/hasmin/";
+       homepage = "https://github.com/contivero/hasmin#readme";
        description = "\"A CSS Minifier\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85708,6 +86431,43 @@ 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
+     , 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
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.17.1";
+       sha256 = "d9e9a38256637f1bebb96898a91780f1b977c737c5933903b582f2e93bd81156";
+       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
+       ];
+       testHaskellDepends = [
+         data-default-class QuickCheck quickcheck-instances rebase rerebase
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         criterion data-default-class deepseq dlist either hashable
+         profunctors scientific text time transformers uuid vector
+       ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "An efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -86866,6 +87626,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hcoord" = callPackage
+    ({ mkDerivation, base, data-default, HUnit, ieee754, mtl
+     , regex-pcre
+     }:
+     mkDerivation {
+       pname = "hcoord";
+       version = "1.0.0.0";
+       sha256 = "f5c26d445dbcc5df8a164a40ab209a9879e9c5f61fb34f839bf38e6df3be8037";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base mtl regex-pcre ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base data-default HUnit ieee754 mtl ];
+       homepage = "https://github.com/danfran/hcoord#readme";
+       description = "Easily convert between latitude/longitude, UTM and OSGB";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hcron" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , old-locale, pretty, process, random, stm, time
@@ -87261,6 +88039,8 @@ self: {
        pname = "hdocs";
        version = "0.5.1.0";
        sha256 = "bb4a43b479b1731105b7c6195bff59a3763042daf1102765c4f78d075a5ba2df";
+       revision = "1";
+       editedCabalFile = "5be14f612b7dfcc066e9fceeac312deb162c08f043f8929b0d2649c76d4f6b0f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87434,24 +88214,20 @@ self: {
      }) {};
 
   "heckle" = callPackage
-    ({ mkDerivation, base, blaze-html, directory, filepath
-     , optparse-applicative, optparse-generic, pandoc, pandoc-types
+    ({ mkDerivation, base, blaze-html, directory, pandoc, pandoc-types
      , process, split, tagsoup, time
      }:
      mkDerivation {
        pname = "heckle";
-       version = "2.0.1.9";
-       sha256 = "b8a14e8e80dfc0190088e8f05baf9b47c46ac72e6b8ec5f36be244087b0469ba";
+       version = "2.0.2.1";
+       sha256 = "964d64df847910a5db1bd126b89a658e0ef7dd01f9db7a84244ac3f2451938be";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-html directory filepath pandoc pandoc-types process
-         split tagsoup time
-       ];
-       executableHaskellDepends = [
-         base directory filepath optparse-applicative optparse-generic
-         process split
+         base blaze-html directory pandoc pandoc-types process split tagsoup
+         time
        ];
+       executableHaskellDepends = [ base directory process split ];
        homepage = "https://github.com/2016rshah/heckle";
        description = "Jekyll in Haskell (feat. LaTeX)";
        license = stdenv.lib.licenses.mit;
@@ -88333,24 +89109,26 @@ self: {
      }) {};
 
   "hesh" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdtheline
-     , containers, cryptohash, directory, filemanip, filepath
-     , hackage-db, haskell-src-exts, parsec, process, template-haskell
-     , text, time, transformers, uniplate
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdargs
+     , containers, cryptohash, data-default, directory, exceptions
+     , filemanip, filepath, hackage-db, haskell-src-exts, parsec
+     , process, template-haskell, text, time, transformers, uniplate
+     , unix
      }:
      mkDerivation {
        pname = "hesh";
-       version = "1.5.0";
-       sha256 = "1e79b396d448fd7e98c293c14efed69e65ece14a5fd77bb408b8e4d0a5a024f6";
+       version = "1.11.0";
+       sha256 = "4bec3fe05382272c9c089615200271f416a944035ec74cd4417269314327e0b0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base filemanip parsec process template-haskell text transformers
+         base exceptions filemanip parsec process template-haskell text
+         transformers
        ];
        executableHaskellDepends = [
-         aeson base bytestring Cabal cartel cmdtheline containers cryptohash
-         directory filepath hackage-db haskell-src-exts parsec process text
-         time uniplate
+         aeson base bytestring Cabal cartel cmdargs containers cryptohash
+         data-default directory filepath hackage-db haskell-src-exts parsec
+         process text time uniplate unix
        ];
        homepage = "https://github.com/jekor/hesh";
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
@@ -88424,6 +89202,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "heterolist" = callPackage
+    ({ mkDerivation, base, constraint-manip, hspec, indextype, polydata
+     }:
+     mkDerivation {
+       pname = "heterolist";
+       version = "0.2.0.0";
+       sha256 = "f2a14a202ab78321de4e5433523dbdabe7f8c4bcaed0a31e6c281e9f092dc15d";
+       libraryHaskellDepends = [
+         base constraint-manip indextype polydata
+       ];
+       testHaskellDepends = [
+         base constraint-manip hspec indextype polydata
+       ];
+       description = "A heterogeneous list type";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hetris" = callPackage
     ({ mkDerivation, array, base, hscurses, ncurses, old-time, random
      }:
@@ -89135,8 +89930,8 @@ self: {
      }:
      mkDerivation {
        pname = "hgis";
-       version = "0.1.1.2";
-       sha256 = "fe9ba90e951533980aff909f6c53a33d2e1960ddb5eb547a4650564a0ee4bb5f";
+       version = "0.1.2.0";
+       sha256 = "d1a976e0e8373e9448944200b77408dabbb04fb2221232832574244bb19935cc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91377,8 +92172,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-svdlibc";
-       version = "0.4.0";
-       sha256 = "774504e862542f90441701122638c4ce11aa94792d270045eb0f0997e6f874a2";
+       version = "0.4.1";
+       sha256 = "4a36946603633e0185cd2729292e6a24051f81c0b840ea63a65a75031acfd2ef";
        libraryHaskellDepends = [ base hmatrix vector ];
        testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
@@ -93925,6 +94720,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hriemann" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , hostname, kazura-queue, network, protocol-buffers
+     , protocol-buffers-descriptor, text, time, unagi-chan
+     }:
+     mkDerivation {
+       pname = "hriemann";
+       version = "0.2.1.0";
+       sha256 = "73503679ae0ef115b4e6d7fcbeb757bcbba5182572365d039a720791e7cb261b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers criterion hostname kazura-queue
+         network protocol-buffers protocol-buffers-descriptor text time
+         unagi-chan
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/shmish111/hriemann";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hruby" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
      , ruby, scientific, stm, text, unordered-containers, vector
@@ -94361,8 +95179,8 @@ self: {
        pname = "hs-pkg-config";
        version = "0.2.1.0";
        sha256 = "104e39324e9ece701a21bf3f428b5d0382fd8f426b65b4ef1f54ab41cc9d6227";
-       revision = "1";
-       editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784";
+       revision = "2";
+       editedCabalFile = "014d1b8e4375de3e7d154b6996b9e54917fde4d3d7fec917feaf262576a645ce";
        libraryHaskellDepends = [ base data-default-class text ];
        homepage = "https://github.com/trskop/hs-pkg-config";
        description = "Create pkg-config configuration files";
@@ -94441,6 +95259,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hs-server-starter" = callPackage
+    ({ mkDerivation, base, directory, HUnit, network, temporary, unix
+     }:
+     mkDerivation {
+       pname = "hs-server-starter";
+       version = "0.1.0.1";
+       sha256 = "6e120890191f091a76629aab51a00c309c1bf039f22e87ee0c70a30c088e380f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory network ];
+       testHaskellDepends = [ base HUnit network temporary unix ];
+       homepage = "https://github.com/hiratara/hs-server-starter";
+       description = "Write a server supporting Server::Starter's protocol in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hs-twitter" = callPackage
     ({ mkDerivation, base, HTTP, json, mime, network, old-locale
      , old-time, random, utf8-string
@@ -95323,6 +96157,8 @@ self: {
        pname = "hsdev";
        version = "0.2.2.0";
        sha256 = "844973b82ed0a0a7321d8106755e71db229889af4b0516e5da861bf6474bb932";
+       revision = "1";
+       editedCabalFile = "18e2c175baf6aa0fef8e7fcf7126e19d8df085bab6ed405bb4d55b6f98121a3b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96302,8 +97138,8 @@ self: {
     ({ mkDerivation, base, checkers, hspec }:
      mkDerivation {
        pname = "hspec-checkers";
-       version = "0.1.0.1";
-       sha256 = "9703ad134d1711b17301d760cebc36814c48a0e4e5712590514c93e6ec278dab";
+       version = "0.1.0.2";
+       sha256 = "e7db79dc527cf5b806723bbe3d511a074297976a0c7042968b9abc57f8337e99";
        libraryHaskellDepends = [ base checkers hspec ];
        testHaskellDepends = [ base checkers hspec ];
        description = "Allows to use checkers properties from hspec";
@@ -97819,8 +98655,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.1.3";
-       sha256 = "6bb2ae9f6b65b5652854e78ece26d7c78e4c5eef6c7f5a75ee88e6730469bc1d";
+       version = "1.1.4";
+       sha256 = "0d5c21b4d6b82f85fa4ad867db99b25fb948becd37a6841391cc7dec829792c0";
        libraryHaskellDepends = [
          attoparsec base-prelude text unordered-containers
        ];
@@ -98868,6 +99704,34 @@ self: {
        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
+     , 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-server" = callPackage
     ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
      , url, utf8-string
@@ -101675,8 +102539,8 @@ self: {
      }:
      mkDerivation {
        pname = "identifiers";
-       version = "0.4.0.0";
-       sha256 = "0e9504c56888e35664840027b8fa38f9cd16ef6b19adf0a1aee7a86208436552";
+       version = "0.4.1.0";
+       sha256 = "8ba63f3a52712f2296d8dc1737593560c38055a54f2745d3a9c465269d25b38c";
        libraryHaskellDepends = [
          base binary cereal containers deepseq hashable ListLike text
          unordered-containers
@@ -101764,31 +102628,31 @@ self: {
   "idris" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal
      , ansi-wl-pprint, array, async, base, base64-bytestring, binary
-     , blaze-html, blaze-markup, bytestring, cheapskate, containers
-     , deepseq, directory, filepath, fingertree, fsnotify, gmp
-     , haskeline, ieee754, libffi, mtl, network, optparse-applicative
-     , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty
-     , tasty-golden, tasty-rerun, terminal-size, text, time
-     , transformers, transformers-compat, trifecta, uniplate, unix
-     , unordered-containers, utf8-string, vector
+     , blaze-html, blaze-markup, bytestring, cheapskate, code-page
+     , containers, deepseq, directory, filepath, fingertree, fsnotify
+     , gmp, haskeline, ieee754, libffi, mtl, network
+     , optparse-applicative, parsers, pretty, process, regex-tdfa, safe
+     , split, tagged, tasty, tasty-golden, tasty-rerun, terminal-size
+     , text, time, transformers, transformers-compat, trifecta, uniplate
+     , unix, unordered-containers, utf8-string, vector
      , vector-binary-instances, zip-archive
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.99";
-       sha256 = "f124c22a56d3547f878fdcfcddb36884bf69279411a724bb18b7829e8bdfa4e9";
+       version = "0.99.1";
+       sha256 = "199018612112180778da0d6b75f602848e6b8b4ce4747163a385daac44217c8a";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async
          base base64-bytestring binary blaze-html blaze-markup bytestring
-         cheapskate containers deepseq directory filepath fingertree
-         fsnotify haskeline ieee754 libffi mtl network optparse-applicative
-         parsers pretty process regex-tdfa safe split terminal-size text
-         time transformers transformers-compat trifecta uniplate unix
-         unordered-containers utf8-string vector vector-binary-instances
-         zip-archive
+         cheapskate code-page containers deepseq directory filepath
+         fingertree fsnotify haskeline ieee754 libffi mtl network
+         optparse-applicative parsers pretty process regex-tdfa safe split
+         terminal-size text time transformers transformers-compat trifecta
+         uniplate unix unordered-containers utf8-string vector
+         vector-binary-instances zip-archive
        ];
        librarySystemDepends = [ gmp ];
        executableHaskellDepends = [
@@ -102727,6 +103591,49 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "imprevu" = callPackage
+    ({ mkDerivation, aeson, base, Boolean, Cabal, containers
+     , DebugTraceHelpers, ghc, Imprevu, lens, monad-loops, mtl, NoTrace
+     , old-locale, random, safe, semigroups, shortcut, stm, time
+     , time-recurrence, validation
+     }:
+     mkDerivation {
+       pname = "imprevu";
+       version = "0.1.0";
+       sha256 = "38d48f6634effa51d039a880cf6fbd595f6868e637e261413caef95c65d30aa9";
+       libraryHaskellDepends = [
+         aeson base Boolean containers DebugTraceHelpers ghc lens
+         monad-loops mtl NoTrace old-locale random safe semigroups shortcut
+         stm time time-recurrence validation
+       ];
+       testHaskellDepends = [ base Cabal Imprevu ];
+       homepage = "http://www.nomyx.net";
+       description = "Reactive programming language based on a DSL";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {Imprevu = null;};
+
+  "imprevu-happstack" = callPackage
+    ({ mkDerivation, base, blaze-html, Cabal, containers
+     , DebugTraceHelpers, ghc, happstack-server, HTTP, imprevu, lens
+     , monad-extras, mtl, NoTrace, old-locale, reform, reform-blaze
+     , reform-happstack, safe, stm, text
+     }:
+     mkDerivation {
+       pname = "imprevu-happstack";
+       version = "0.1.0";
+       sha256 = "5925745029fe381ad5b13c755ac2b6b3d0f201531cfee86293406863fb64f01b";
+       libraryHaskellDepends = [
+         base blaze-html containers DebugTraceHelpers ghc happstack-server
+         HTTP imprevu lens monad-extras mtl NoTrace old-locale reform
+         reform-blaze reform-happstack safe stm text
+       ];
+       testHaskellDepends = [ base Cabal ];
+       homepage = "http://www.nomyx.net";
+       description = "Imprevu support for Happstack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "improve" = callPackage
     ({ mkDerivation, base, mtl, yices }:
      mkDerivation {
@@ -103078,10 +103985,8 @@ self: {
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "indextype";
-       version = "0.1.0.0";
-       sha256 = "7be4ceac4ac1dea5f8c47cf0ae638029d7ab62b0df6ec6d215aac4a1e9ae0498";
-       revision = "2";
-       editedCabalFile = "daa67f59c54d4c61f73317a1edc7ee86e59327df0eade3a8db6e348a80b8d2d5";
+       version = "0.2.0.0";
+       sha256 = "9b680b0a7fb25429238b00b3c0e87faad0a5f90c9bef73ab80a4726aebf397bb";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        description = "A series of type families and constraints for \"indexable\" types";
@@ -103489,7 +104394,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "inline-java_0_6_2" = callPackage
+  "inline-java_0_6_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, containers
      , directory, distributed-closure, filepath, ghc-heap-view, hspec
      , inline-c, jni, jvm, language-java, process, singletons, syb
@@ -103497,8 +104402,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-java";
-       version = "0.6.2";
-       sha256 = "9c162f26c77d1030f0f5054394265aab7fded1c83df67b3ea8fe7e4bb68aa8c5";
+       version = "0.6.3";
+       sha256 = "a9d5742b78b22ea4190269d73e2cc6f74a5f45e150ee9582bdbb31ba966c657c";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers directory
          distributed-closure filepath ghc-heap-view inline-c jni jvm
@@ -104230,8 +105135,8 @@ self: {
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.8";
-       sha256 = "09c570361dddf8c67572acffc7fd6c93bdfa1c8143d2f7eb9aec0ad5db4f21bf";
+       version = "0.1.0.10";
+       sha256 = "1c8c6c7bd6ff10eb10d26cea7a04c2a048b8128eb7fc154d931f7c17201741d9";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe string-conversions tagged text transformers
@@ -104248,25 +105153,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intro_0_1_0_10" = callPackage
+  "intro_0_2_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
-     , deepseq, dlist, extra, hashable, lens, mtl, safe
-     , string-conversions, tagged, text, transformers
+     , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck
+     , quickcheck-instances, safe, tagged, text, transformers
      , unordered-containers, writer-cps-mtl
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.1.0.10";
-       sha256 = "1c8c6c7bd6ff10eb10d26cea7a04c2a048b8128eb7fc154d931f7c17201741d9";
+       version = "0.2.0.1";
+       sha256 = "d26082b3304e6940f6a486b0a00aa95264b4045762c3586fac4de7cbf60a4073";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
-         hashable mtl safe string-conversions tagged text transformers
-         unordered-containers writer-cps-mtl
+         hashable mtl safe tagged text transformers unordered-containers
+         writer-cps-mtl
        ];
        testHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
-         hashable lens mtl safe string-conversions tagged text transformers
-         unordered-containers writer-cps-mtl
+         hashable lens mtl 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";
@@ -104386,6 +105291,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "invertible-hlist" = callPackage
+    ({ mkDerivation, base, HList, invertible }:
+     mkDerivation {
+       pname = "invertible-hlist";
+       version = "0.2.0.2";
+       sha256 = "c50f1f10c75476893d117c0cc4b29129e427ceaa0386e9b709b6168f269144a0";
+       libraryHaskellDepends = [ base HList invertible ];
+       description = "invertible functions and instances for HList";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "invertible-hxt" = callPackage
+    ({ mkDerivation, base, hxt, hxt-charproperties, invertible, mtl }:
+     mkDerivation {
+       pname = "invertible-hxt";
+       version = "0.1";
+       sha256 = "add3ba846667b933d8fd4bbe20a1f68be02716e6e047eb711b96a14975a88e94";
+       libraryHaskellDepends = [
+         base hxt hxt-charproperties invertible mtl
+       ];
+       description = "invertible transformer instances for HXT Picklers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "invertible-syntax" = callPackage
     ({ mkDerivation, base, partial-isomorphisms }:
      mkDerivation {
@@ -104817,7 +105746,7 @@ self: {
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) ipopt; nlopt = null;};
+     }) {inherit (pkgs) ipopt; inherit (pkgs) nlopt;};
 
   "ipprint" = callPackage
     ({ mkDerivation, base, haskell-src, sr-extra }:
@@ -104977,25 +105906,6 @@ self: {
      }) {};
 
   "irc-conduit" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
-     , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
-     , time, tls, transformers, x509-validation
-     }:
-     mkDerivation {
-       pname = "irc-conduit";
-       version = "0.2.2.0";
-       sha256 = "b66e058a66e9cd782f065be6b100bb80157c55d733db6691112a70e9aab13065";
-       libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra connection irc irc-ctcp
-         network-conduit-tls profunctors text time tls transformers
-         x509-validation
-       ];
-       homepage = "https://github.com/barrucadu/irc-conduit";
-       description = "Streaming IRC message library using conduits";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "irc-conduit_0_2_2_1" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text
      , time, tls, transformers, x509-validation
@@ -105012,7 +105922,6 @@ self: {
        homepage = "https://github.com/barrucadu/irc-conduit";
        description = "Streaming IRC message library using conduits";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-core" = callPackage
@@ -105265,11 +106174,11 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "is";
-       version = "0.2";
-       sha256 = "502c962d45859050455057be9886e8944e300ef690a56605c91aca76fdcd19c6";
+       version = "0.4";
+       sha256 = "7f628b7fe4d1acc8f7b043cebb3da597faa83802166b3efbf08ad6ef778ee72d";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
-       description = "Pattern predicates using TH";
+       description = "Generic pattern predicates";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -105451,8 +106360,8 @@ self: {
      }:
      mkDerivation {
        pname = "isotope";
-       version = "0.3.3.0";
-       sha256 = "e08fac7483c11f37786f5f98f6f7d1e58a456d1470c3f0f35bc9326e88c1fa2e";
+       version = "0.4.0.0";
+       sha256 = "040dc0ab7b47f478351bdd491acb6ed7e6f5aad2845f3cf29dfdd89041129ea7";
        libraryHaskellDepends = [
          base containers megaparsec template-haskell th-lift
        ];
@@ -106377,12 +107286,14 @@ self: {
      }) {};
 
   "javascript-extras" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
      mkDerivation {
        pname = "javascript-extras";
-       version = "0.1.0.0";
-       sha256 = "cf74b6c2be87ee5bc96b5ff47335a8eb2d879d7ec83bf6c83be609293f40f4be";
-       libraryHaskellDepends = [ base ];
+       version = "0.2.0.0";
+       sha256 = "28a191b67d0047a34d1d1f7dc8c8ad03abe725a9a75319746b9eecfbf1cb96e1";
+       libraryHaskellDepends = [
+         base deepseq ghcjs-base-stub parallel text
+       ];
        homepage = "https://github.com/louispan/javascript-extras#readme";
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
@@ -107818,8 +108729,8 @@ self: {
      }:
      mkDerivation {
        pname = "juicy-gcode";
-       version = "0.1.0.1";
-       sha256 = "4393aae302e034c95e2c3cff57f432c322db7ecf21580295310648c73bc09bbf";
+       version = "0.1.0.2";
+       sha256 = "6088c4602591b4f9b94e17ef42a6fada27abacb1e2ddd3a666848020d3b0ca0b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107839,8 +108750,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.16";
-       sha256 = "5eac14b5102b5be904142843977560cddf4829182637e059cd09e7a384b7052f";
+       version = "0.2.17";
+       sha256 = "3952d52d54fbacfff9a001d00a7627955c9429304ca08b1f4edcde201e5ba764";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109697,6 +110608,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "ksystools" = callPackage
+    ({ mkDerivation, base, directory }:
+     mkDerivation {
+       pname = "ksystools";
+       version = "0.1.0.0";
+       sha256 = "61bf58d8d7464cdcd565fc80cf91b62190daff6ea3c99dad66a5da71fe586d53";
+       libraryHaskellDepends = [ base directory ];
+       homepage = "https://github.com/kisom/ksystools#readme";
+       description = "System management tooling";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ktx" = callPackage
     ({ mkDerivation, base, bytestring, egl, glew, OpenGL }:
      mkDerivation {
@@ -109767,8 +110690,8 @@ self: {
     ({ mkDerivation, base, text, time }:
      mkDerivation {
        pname = "l10n";
-       version = "0.1.0.0";
-       sha256 = "56f935a18248473cada2bca5cef2c5e98fbab77a02f5bb075ecdc90750de6531";
+       version = "0.1.0.1";
+       sha256 = "0a7032476d257981eb7c274600bef809b4a515ab162a1772a7887f0113455ca0";
        libraryHaskellDepends = [ base text time ];
        homepage = "https://github.com/louispan/l10n#readme";
        description = "Enables providing localization as typeclass instances in separate files";
@@ -110801,14 +111724,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "language-c_0_6" = callPackage
+  "language-c_0_6_1" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, filepath, happy, pretty, process, syb
      }:
      mkDerivation {
        pname = "language-c";
-       version = "0.6";
-       sha256 = "5699cd7d386ae5a583d703bbc1c83b46faa618f3e53ff7fe9a97f6c7acb36be6";
+       version = "0.6.1";
+       sha256 = "23cadc9d04e46490ec57f56b79ecdc2a709ebf57571345905e6e30db29fa37e8";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath pretty process
          syb
@@ -110861,8 +111784,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.11.7.1";
-       sha256 = "5583e92748e6b4cac01536bff86eb119e424e136e03bb3ea0d2db3217328f88c";
+       version = "0.11.7.3";
+       sha256 = "8e1bdc55d7c146e3d58feba03388f679933a8e033aaf15087e73d4d45e344152";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -110878,32 +111801,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "language-c-quote_0_11_7_2" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, containers
-     , exception-mtl, exception-transformers, filepath, happy
-     , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb
-     , symbol, template-haskell, test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "language-c-quote";
-       version = "0.11.7.2";
-       sha256 = "5654187eaa82afe2b7ad959436b35c561fa5bc5b68af5624ab204e9db3591508";
-       libraryHaskellDepends = [
-         array base bytestring containers exception-mtl
-         exception-transformers filepath haskell-src-meta mainland-pretty
-         mtl srcloc syb symbol template-haskell
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         base bytestring HUnit mainland-pretty srcloc symbol test-framework
-         test-framework-hunit
-       ];
-       homepage = "http://www.drexel.edu/~mainland/";
-       description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "language-cil" = callPackage
     ({ mkDerivation, base, bool-extras }:
      mkDerivation {
@@ -111434,8 +112331,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.5.1";
-       sha256 = "4c33feba8e2b3654d25d7cb3d7a881b1f1228196db2d0335a0a83c995b5f19d4";
+       version = "1.3.6";
+       sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111464,7 +112361,7 @@ self: {
        hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
-  "language-puppet_1_3_6" = callPackage
+  "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
@@ -111478,8 +112375,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.3.6";
-       sha256 = "25acf7b9449999beb8b65c8f594c51171f94b074fb5a5228ce267f96f50d2be2";
+       version = "1.3.7";
+       sha256 = "9b549422aed7b8a4b0d1fb1ed62e8648d2b16646c29d3736aeef1008035955ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112300,8 +113197,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "leancheck";
-       version = "0.6.0";
-       sha256 = "15651a9e1bb9b20e805a012be57082c5e2c1f59dde51c25f9fb88299150853ed";
+       version = "0.6.1";
+       sha256 = "0a298956b9f26dafae56c377f3a30e48dca2f9bc91084076344ad81f54399d18";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/rudymatela/leancheck#readme";
@@ -112454,8 +113351,8 @@ self: {
      }:
      mkDerivation {
        pname = "legion";
-       version = "0.9.0.0";
-       sha256 = "a40c85edad14c4dca15d3d4ef6b3c240c5afb30a3798ab63acc43f6f1d5a08ce";
+       version = "0.9.0.1";
+       sha256 = "413e8097861e841555335c0c0027eb4291a6aead9bf41d8799d7626a0d9890bd";
        libraryHaskellDepends = [
          aeson base binary binary-conduit bytestring canteven-http conduit
          conduit-extra containers data-default-class data-dword directory
@@ -112471,22 +113368,21 @@ self: {
   "legion-discovery" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, Cabal
      , canteven-http, canteven-log, conduit, containers
-     , data-default-class, ekg, graphviz, http-types, legion
-     , legion-extra, monad-logger, scotty, scotty-format
-     , scotty-resource, SHA, text, time, transformers, wai, wai-extra
-     , warp
+     , data-default-class, ekg, graphviz, http-api-data, http-grammar
+     , legion, legion-extra, monad-logger, mtl, servant-server, SHA
+     , text, time, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "legion-discovery";
-       version = "0.3.0.0";
-       sha256 = "a5bcbbcaec065c4f833b51c05e0379bce3e1f22ca70585b63878ef57dbabfc61";
+       version = "0.3.0.2";
+       sha256 = "4e9b4ece222d4cc3eb0a0f14bfba1b0f9f2a517d3471d9f61936faf953f74191";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base binary bytestring Cabal canteven-http
          canteven-log conduit containers data-default-class ekg graphviz
-         http-types legion legion-extra monad-logger scotty scotty-format
-         scotty-resource SHA text time transformers wai wai-extra warp
+         http-api-data http-grammar legion legion-extra monad-logger mtl
+         servant-server SHA text time wai wai-extra warp
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
@@ -112498,17 +113394,16 @@ self: {
 
   "legion-discovery-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
-     , data-default-class, http-client, http-types, load-balancing
-     , network, resourcet, text, transformers
+     , http-client, http-types, load-balancing, resourcet, text
+     , transformers
      }:
      mkDerivation {
        pname = "legion-discovery-client";
-       version = "0.1.0.3";
-       sha256 = "4fd1c98dcade6f1251418f14537df3cffb4af814eca8074f7a06e0efdd67189b";
+       version = "0.1.1.1";
+       sha256 = "257150e35dddb8e67fa48dc61b740ec73e216cd59ce21bbe898c0fc3f290df24";
        libraryHaskellDepends = [
-         aeson base bytestring Cabal containers data-default-class
-         http-client http-types load-balancing network resourcet text
-         transformers
+         aeson base bytestring Cabal containers http-client http-types
+         load-balancing resourcet text transformers
        ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
@@ -113513,25 +114408,27 @@ self: {
 
   "liblawless" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, binary
-     , boomerang, bytestring, containers, containers-unicode-symbols
-     , contravariant, data-default, data-textual, dns, exceptions
-     , filepath, hjsonschema, lens, machines, managed, mtl, network
-     , network-ip, parsers, pathtype, protolude, QuickCheck, random
-     , semigroups, stm, stm-containers, temporary, test-framework
+     , 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
      }:
      mkDerivation {
        pname = "liblawless";
-       version = "0.17.1";
-       sha256 = "dbba3ab5865c0f957daf3ead4e3f7c16a44ba2e3c4fbbe4ced429f1c88e6f397";
+       version = "0.18.3";
+       sha256 = "55b460995913b582f3f4df876bb9877598e7b8b27bae49fa1a2a4af4b08645d3";
        libraryHaskellDepends = [
          aeson base base-unicode-symbols binary boomerang bytestring
-         containers containers-unicode-symbols contravariant data-default
-         data-textual dns exceptions hjsonschema lens machines managed 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
+         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
        ];
        testHaskellDepends = [
          aeson base binary bytestring exceptions filepath network QuickCheck
@@ -115824,12 +116721,12 @@ self: {
      }) {};
 
   "llvm-pretty" = callPackage
-    ({ mkDerivation, base, containers, monadLib, pretty }:
+    ({ mkDerivation, base, containers, monadLib, parsec, pretty }:
      mkDerivation {
        pname = "llvm-pretty";
-       version = "0.6.0.0";
-       sha256 = "f9b50885551a48624a0577c6dabaef1fc77245367d6d9afdb84d548ada328e66";
-       libraryHaskellDepends = [ base containers monadLib pretty ];
+       version = "0.7.1.0";
+       sha256 = "5805bbb6a0408dad250eaee5ebd15bc8fbeccbca8b54fa50aa1de94ea95d2c60";
+       libraryHaskellDepends = [ base containers monadLib parsec pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115841,8 +116738,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-pretty-bc-parser";
-       version = "0.3.0.1";
-       sha256 = "def47c50959ae7b270987bcf53af87e07a290275bfd34f01e3d3c50b8edf1178";
+       version = "0.3.2.0";
+       sha256 = "198a7985b2c263427a9a216d2b4074e3ac44b5100a3b8580be926ea5c4ed1440";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116142,8 +117039,8 @@ self: {
        pname = "lock-file";
        version = "0.5.0.2";
        sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0";
-       revision = "3";
-       editedCabalFile = "565e73c14184f1760473a10e35d2a04f354dbec33abcf185d217754ad63709b6";
+       revision = "4";
+       editedCabalFile = "2c6bc79db0f2cdeb55396860867b462995047699a66e4b0cb31724f961ae443b";
        libraryHaskellDepends = [
          base data-default-class directory exceptions tagged-exception-core
          transformers
@@ -116225,6 +117122,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log_0_8" = callPackage
+    ({ mkDerivation, aeson, base, bloodhound, bytestring, exceptions
+     , http-client, http-types, log-base, log-elasticsearch
+     , log-postgres, process, random, tasty, tasty-hunit, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "log";
+       version = "0.8";
+       sha256 = "3c48e377d8e25cb6874c1496d8635342dc3c57843d45f1347b4fdfb110d42a52";
+       libraryHaskellDepends = [
+         base log-base log-elasticsearch log-postgres
+       ];
+       testHaskellDepends = [
+         aeson base bloodhound bytestring exceptions http-client http-types
+         process random tasty tasty-hunit text time transformers
+       ];
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution with multiple backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-base" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, deepseq
      , exceptions, monad-control, monad-time, mtl, semigroups, stm, text
@@ -116244,6 +117164,26 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "log-base";
+       version = "0.7.1";
+       sha256 = "63eb485d51edb8f76d1cf3feeab379afe19546f8e52e284db51e5ae4c690a2bf";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-domain" = callPackage
     ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq
      , directory, distributive, doctest, filepath, generic-deriving
@@ -116307,6 +117247,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log-elasticsearch_0_8" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
+     , bloodhound, bytestring, deepseq, http-client, http-client-tls
+     , log-base, semigroups, text, text-show, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "log-elasticsearch";
+       version = "0.8";
+       sha256 = "b63079eec72b56b5ab0078ca83609ecc0620eee3b253a6657a4df79fa8b44d95";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base64-bytestring bloodhound bytestring
+         deepseq http-client http-client-tls log-base semigroups text
+         text-show time transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/scrive/log";
+       description = "Structured logging solution (Elasticsearch back end)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "log-postgres" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bytestring, deepseq, hpqtypes, http-client, lifted-base, log-base
@@ -116355,24 +117316,25 @@ self: {
   "log-warper" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring
      , containers, data-default, directory, dlist, errors, exceptions
-     , extra, filepath, formatting, hashable, hslogger, hspec, HUnit
-     , lens, monad-control, monad-loops, mtl, QuickCheck, safecopy, text
-     , text-format, time, transformers, transformers-base, universum
-     , unordered-containers, yaml
+     , 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 = "0.5.1";
-       sha256 = "8645928457c46ca217c2a9ebc75819176643552876c832ad3691a66e762798ea";
+       version = "1.0.4";
+       sha256 = "c2024e6a5c01d2862d05ea47273e659c3ee31afeeb2f69e67b52fec0749f0990";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring containers directory dlist
-         errors exceptions extra filepath formatting hashable hslogger lens
-         monad-control monad-loops mtl safecopy text text-format time
-         transformers transformers-base universum unordered-containers yaml
+         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 hslogger text ];
+       executableHaskellDepends = [ base exceptions text ];
        testHaskellDepends = [
          async base data-default directory filepath hspec HUnit lens
          QuickCheck universum unordered-containers
@@ -117475,30 +118437,6 @@ self: {
      }) {};
 
   "lucid" = callPackage
-    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
-     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
-     , mtl, parsec, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lucid";
-       version = "2.9.7";
-       sha256 = "a087af27ad196e3a41ccb6b954a12d384589a14b2ac55614e6a27817f65e0608";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers hashable mmorph mtl text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base bifunctors hspec HUnit mtl parsec text
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq text
-       ];
-       homepage = "https://github.com/chrisdone/lucid";
-       description = "Clear to write, read and edit DSL for HTML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lucid_2_9_8_1" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
      , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
      , mtl, parsec, text, transformers, unordered-containers
@@ -117520,7 +118458,6 @@ self: {
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lucid-foundation" = callPackage
@@ -118021,18 +118958,18 @@ self: {
      }) {};
 
   "machinecell" = callPackage
-    ({ mkDerivation, arrows, base, free, hspec, mtl, profunctors
-     , QuickCheck, semigroups, transformers
+    ({ mkDerivation, base, free, hspec, mtl, profunctors, QuickCheck
+     , semigroups, transformers
      }:
      mkDerivation {
        pname = "machinecell";
-       version = "3.3.1";
-       sha256 = "5911832fa471797e5cbc5b4c98c1078f0bad799ba8cb33dbf0e19c6fae35619c";
+       version = "3.3.2";
+       sha256 = "6625464ab50569d1c8bf285f7ae360ff46bd9b282fa512e77d94f19822b15f3e";
        libraryHaskellDepends = [
-         arrows base free mtl profunctors semigroups transformers
+         base free mtl profunctors semigroups transformers
        ];
        testHaskellDepends = [
-         arrows base hspec mtl profunctors QuickCheck semigroups
+         base hspec mtl profunctors QuickCheck semigroups
        ];
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
@@ -118104,8 +119041,8 @@ self: {
      }:
      mkDerivation {
        pname = "machines-directory";
-       version = "0.2.0.10";
-       sha256 = "2ee750f86d1658635095c35e94799d06a921e641bf4daa55676fd06e8e9a98a4";
+       version = "0.2.1.0";
+       sha256 = "849c07db6ff6cfd88348d228a7a3f8ccb16e99568230ee0d20faa5670474deb4";
        libraryHaskellDepends = [
          base directory filepath machines machines-io transformers
        ];
@@ -118243,19 +119180,19 @@ self: {
      }) {};
 
   "madlang" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, gitrev, hspec
+    ({ mkDerivation, ansi-wl-pprint, base, containers, hspec
      , hspec-megaparsec, lens, megaparsec, mtl, mwc-random
-     , optparse-generic, text
+     , optparse-applicative, text
      }:
      mkDerivation {
        pname = "madlang";
-       version = "1.0.0.1";
-       sha256 = "edeea8b9d3cabfaf5392fbe7ad307754e20fe8ef90294b5a846c9a7f8edb5af8";
+       version = "2.0.0.1";
+       sha256 = "c7723b24bb564f3a5b4a3ab5641a4264005476bf59d19d91ee074c92f5ee62bf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base gitrev lens megaparsec mtl mwc-random
-         optparse-generic text
+         ansi-wl-pprint base containers lens megaparsec mtl mwc-random
+         optparse-applicative text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -118531,6 +119468,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "make-monofoldable-foldable" = callPackage
+    ({ mkDerivation, base, mono-traversable }:
+     mkDerivation {
+       pname = "make-monofoldable-foldable";
+       version = "0.1.0.0";
+       sha256 = "2a776a84e4bb9bee57194f844eef373767b136619436f140c26a73dadc4b9aae";
+       libraryHaskellDepends = [ base mono-traversable ];
+       description = "Make a MonoFoldable type into an ordinary Foldable type";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "make-package" = callPackage
     ({ mkDerivation, async, base, bytestring, configurator, containers
      , directory, filepath, github, haskeline, lens, lens-datetime, mtl
@@ -119722,22 +120670,48 @@ self: {
      }) {eng = null; mat = null; mx = null;};
 
   "matplotlib" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, process, tasty
-     , tasty-hunit, temporary
+    ({ 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.1.0.0";
-       sha256 = "8001811170e201741eca52a0926c78810f451b104cc1ef055779b1b7351dee0d";
+       version = "0.4.1";
+       sha256 = "7a0d0ac10ff394c8ee4a673dbc6454cb5218c9189d9312a4c4af64efe255b97b";
        libraryHaskellDepends = [
-         aeson base bytestring process temporary
+         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
        ];
-       testHaskellDepends = [ base tasty 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
+     }:
+     mkDerivation {
+       pname = "matplotlib";
+       version = "0.4.3";
+       sha256 = "9491d76f4dc4237c6af73bb33c31cdc6608e1fcb8fe6fb00a94f3fceb3939873";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrices" = callPackage
     ({ mkDerivation, base, criterion, deepseq, primitive, tasty
      , tasty-hunit, tasty-quickcheck, vector
@@ -120248,20 +121222,21 @@ self: {
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
      , data-default, deepseq, hspec, lens, lifted-async, monad-control
-     , mtl, network, parallel, primitive, process, QuickCheck, random
-     , resourcet, singletons, spool, stm, streaming-commons, tagged
-     , template-haskell, text, time, transformers, type-spec, vector
+     , 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.2.0.2";
-       sha256 = "3dd4d11c4253eebe2ff21368222661341b64e8176171fb4be77b9ee45402f7d1";
+       version = "0.3.2.1";
+       sha256 = "ac1fc31e78c001a3cf58b7acec59c08b83e063414650f5995e1a590cc728045d";
        libraryHaskellDepends = [
          array async base bytestring cereal conduit conduit-combinators
          conduit-extra containers data-default deepseq lens lifted-async
-         monad-control mtl network parallel primitive process QuickCheck
-         random resourcet spool stm streaming-commons tagged text time
-         transformers vector
+         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
@@ -120275,38 +121250,66 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "mediabus-fdk-aac" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-combinators
+     , containers, criterion, deepseq, fdk-aac, ghc-prim, inline-c, lens
+     , mediabus, monad-logger, random, resourcet, spool, tagged, text
+     , time, transformers, vector
+     }:
+     mkDerivation {
+       pname = "mediabus-fdk-aac";
+       version = "0.3.2.1";
+       sha256 = "197213a3645fda298d0a7ff9b123445df3464e70b9f2396f093b44119cfeba15";
+       libraryHaskellDepends = [
+         base bytestring conduit conduit-combinators containers deepseq
+         inline-c lens mediabus monad-logger random resourcet spool tagged
+         text time transformers vector
+       ];
+       libraryPkgconfigDepends = [ fdk-aac ];
+       testHaskellDepends = [
+         base conduit deepseq ghc-prim lens mediabus monad-logger vector
+       ];
+       benchmarkHaskellDepends = [
+         base conduit criterion deepseq ghc-prim lens mediabus monad-logger
+         vector
+       ];
+       homepage = "https://github.com/lindenbaum/mediabus-fdk-aac";
+       description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
+       license = stdenv.lib.licenses.bsd3;
+     }) {fdk-aac = null;};
+
   "mediabus-rtp" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, cereal
      , conduit, conduit-combinators, conduit-extra, containers
      , data-default, deepseq, hspec, lens, lifted-async, mediabus
-     , monad-control, mtl, network, parallel, primitive, process
-     , QuickCheck, random, resourcet, singletons, spool, stm
+     , 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.2.0.0";
-       sha256 = "f802521f6f504e1ea56a2c694a216a8b92087f21aa4d493d3c6bf11d27063d27";
+       version = "0.3.2.1";
+       sha256 = "05752dd0721a4620ff5810c5dcbc420cc3b3a4a0a9d10402967d937e3823624d";
        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 mtl network parallel primitive process
-         QuickCheck random resourcet spool stm streaming-commons tagged text
-         time transformers vector
+         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 mtl parallel QuickCheck
-         random stm streaming-commons tagged time vector
+         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 mtl QuickCheck singletons spool stm tagged
-         template-haskell text time transformers type-spec vector
+         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";
@@ -120410,19 +121413,20 @@ self: {
      }) {};
 
   "mega-sdist" = callPackage
-    ({ mkDerivation, base, classy-prelude-conduit, conduit-extra
-     , directory, filepath, http-conduit, tar-conduit, typed-process
-     , yaml
+    ({ mkDerivation, base, bytestring, classy-prelude-conduit
+     , conduit-extra, directory, filepath, http-conduit, optparse-simple
+     , tar-conduit, temporary, typed-process, yaml
      }:
      mkDerivation {
        pname = "mega-sdist";
-       version = "0.3.0";
-       sha256 = "afbfc37f2ebbf8bbe880297f784e81a63886dc14aacb2ed921d6c63c66abbf81";
+       version = "0.3.0.2";
+       sha256 = "f06c0decd916515b947062beb4a981fd867a15caeaa248637cdee0a83ea5b17f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base classy-prelude-conduit conduit-extra directory filepath
-         http-conduit tar-conduit typed-process yaml
+         base bytestring classy-prelude-conduit conduit-extra directory
+         filepath http-conduit optparse-simple tar-conduit temporary
+         typed-process yaml
        ];
        homepage = "https://github.com/snoyberg/mega-sdist";
        description = "Handles uploading to Hackage from mega repos";
@@ -120667,6 +121671,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "meminfo" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers }:
+     mkDerivation {
+       pname = "meminfo";
+       version = "0.2.0.0";
+       sha256 = "7da81f784616e45ea4a3b3b0f77a8425301b4c4ba0514cbe36333492f129b3d7";
+       libraryHaskellDepends = [ attoparsec base bytestring containers ];
+       description = "Library for reading `/proc/meminfo`";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "memis" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, filemanip, filepath, http-types
@@ -120764,6 +121779,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memory_0_14_2" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "memorypool" = callPackage
     ({ mkDerivation, base, containers, transformers, unsafe, vector }:
      mkDerivation {
@@ -121046,6 +122077,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mezzo" = callPackage
+    ({ mkDerivation, base, boxes, ghc-typelits-natnormalise, HCodecs
+     , hspec, QuickCheck, should-not-typecheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mezzo";
+       version = "0.2.0.2";
+       sha256 = "9c0c9c1933d3f8875bcf6f85fbce269c8a224947fa9e775929b298b71763a0ac";
+       libraryHaskellDepends = [
+         base boxes ghc-typelits-natnormalise HCodecs template-haskell
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck should-not-typecheck
+       ];
+       homepage = "https://github.com/DimaSamoz/mezzo";
+       description = "Typesafe music composition";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mezzolens" = callPackage
     ({ mkDerivation, base, containers, mtl, transformers }:
      mkDerivation {
@@ -121177,8 +122227,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.4.7.0";
-       sha256 = "c149874a5cf038c1dde51b79b22733116817619e5ed11c7787aadb9d8ea31e26";
+       version = "0.4.8.0";
+       sha256 = "aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
@@ -121239,8 +122289,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-ghc";
-       version = "0.4.7.0";
-       sha256 = "ef1f68645d0f62e9f108852dd0637109625703175eb571c7f183aa3244bf0cdf";
+       version = "0.4.8.0";
+       sha256 = "dea1ea2fa61dea6ebb431e95b36ae4e2011ddb94ad3e0693173fd41f1858697a";
        libraryHaskellDepends = [
          array base bytestring containers microlens transformers
        ];
@@ -121271,8 +122321,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.3.7.1";
-       sha256 = "e242c6f454305e5a310f7f3b4e8b3ee00158fe7160321e27a56b47ffaa2c4493";
+       version = "0.3.8.0";
+       sha256 = "e31b5a10962dde72e4e7c5d6136028973116abee8d0901aa934e19193f086f84";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -121712,8 +122762,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.13";
-       sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440";
+       version = "0.4.13.1";
+       sha256 = "9481671092739dab1d963c9db0dce56a0187390fb24c9badeeded6afb5895917";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -121927,18 +122977,18 @@ self: {
      , http-client, http-conduit, http-types, lifted-async, lifted-base
      , memory, monad-control, protolude, QuickCheck, resourcet, tasty
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text
-     , time, transformers, transformers-base, xml-conduit
+     , text-format, time, transformers, transformers-base, xml-conduit
      }:
      mkDerivation {
        pname = "minio-hs";
-       version = "0.1.0";
-       sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908";
+       version = "0.2.1";
+       sha256 = "484b7b61d479b5377ad0894c3c45f71f8d69eaa0a11664d0ae3ac7f9685035c1";
        libraryHaskellDepends = [
          async base bytestring case-insensitive conduit conduit-combinators
          conduit-extra containers cryptonite cryptonite-conduit data-default
          exceptions filepath http-client http-conduit http-types
          lifted-async lifted-base memory monad-control protolude resourcet
-         text time transformers transformers-base xml-conduit
+         text text-format time transformers transformers-base xml-conduit
        ];
        testHaskellDepends = [
          async base bytestring case-insensitive conduit conduit-combinators
@@ -121946,9 +122996,10 @@ self: {
          directory exceptions filepath http-client http-conduit http-types
          lifted-async lifted-base memory monad-control protolude QuickCheck
          resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck
-         temporary text time transformers transformers-base xml-conduit
+         temporary text text-format time transformers transformers-base
+         xml-conduit
        ];
-       homepage = "https://github.com/donatello/minio-hs#readme";
+       homepage = "https://github.com/minio/minio-hs#readme";
        description = "A Minio client library, compatible with S3 like services";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122132,6 +123183,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mintty_0_1_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mintty";
+       version = "0.1.1";
+       sha256 = "c87f349f1999e8dee25f636428fc1742f50bcd2b51c9288578c60c58102e9f83";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mios" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, vector }:
      mkDerivation {
@@ -122245,6 +123309,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mixed-types-num" = callPackage
+    ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
+     , QuickCheck, smallcheck
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.1.0.1";
+       sha256 = "9c42ecb9382ab2848eb9b9d889ed4bee1c3b25fbfba7848b639ab146112bf78e";
+       libraryHaskellDepends = [
+         base convertible hspec hspec-smallcheck QuickCheck smallcheck
+       ];
+       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
+       homepage = "https://github.com/michalkonecny/mixed-types-num";
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mkbndl" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell98 }:
      mkDerivation {
@@ -122812,6 +123893,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monad-classes-logging" = callPackage
+    ({ mkDerivation, base, ghc-prim, logging-effect, monad-classes
+     , tasty, tasty-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "monad-classes-logging";
+       version = "0.1.0.0";
+       sha256 = "beabe968a16ccc3c0d2477b2cbe8ba9e2c23b5d7ecc99f25229958580b9fe3b1";
+       libraryHaskellDepends = [
+         base ghc-prim logging-effect monad-classes transformers
+       ];
+       testHaskellDepends = [
+         base logging-effect monad-classes tasty tasty-hunit transformers
+       ];
+       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;
+     }) {};
+
   "monad-codec" = callPackage
     ({ mkDerivation, base, binary, containers, data-lens, mtl }:
      mkDerivation {
@@ -123088,6 +124188,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_21" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -123350,26 +124473,6 @@ self: {
      }) {};
 
   "monad-peel" = callPackage
-    ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework
-     , test-framework-hunit, transformers
-     }:
-     mkDerivation {
-       pname = "monad-peel";
-       version = "0.2.1.1";
-       sha256 = "f591f54910a117bba2fc963d5502de668ece69181b605cf9db353fbcfa9fe394";
-       libraryHaskellDepends = [
-         base extensible-exceptions transformers
-       ];
-       testHaskellDepends = [
-         base extensible-exceptions HUnit test-framework
-         test-framework-hunit transformers
-       ];
-       homepage = "http://andersk.mit.edu/haskell/monad-peel/";
-       description = "Lift control operations like exception catching through monad transformers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-peel_0_2_1_2" = callPackage
     ({ mkDerivation, base, extensible-exceptions, HUnit, test-framework
      , test-framework-hunit, transformers
      }:
@@ -123387,7 +124490,6 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/monad-peel/";
        description = "Lift control operations like exception catching through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-primitive" = callPackage
@@ -123440,18 +124542,6 @@ self: {
      }) {};
 
   "monad-skeleton" = callPackage
-    ({ mkDerivation, base, containers, ghc-prim }:
-     mkDerivation {
-       pname = "monad-skeleton";
-       version = "0.1.2.2";
-       sha256 = "b1cc4f0b9e308374c76902942b8381e0af869b0915735d380f792bb11e362de3";
-       libraryHaskellDepends = [ base containers ghc-prim ];
-       homepage = "https://github.com/fumieval/monad-skeleton";
-       description = "An undead monad";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monad-skeleton_0_1_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "monad-skeleton";
@@ -123461,6 +124551,18 @@ self: {
        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";
+       version = "0.1.3.2";
+       sha256 = "2564f0a1124f0def0684cf25ad0e29de0e6b485b544590817374967045cb81b1";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/fumieval/monad-skeleton";
+       description = "Monads of program skeleta";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -124134,30 +125236,6 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, foldl
-     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
-     , text, transformers, unordered-containers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "mono-traversable";
-       version = "1.0.1.3";
-       sha256 = "2861eca0d69c759b02cb7e9669b7a3f8a6b0ede2d96984cba295b69bc9c70a72";
-       libraryHaskellDepends = [
-         base bytestring containers hashable split text transformers
-         unordered-containers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec HUnit QuickCheck semigroups
-         text transformers unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
-       homepage = "https://github.com/snoyberg/mono-traversable";
-       description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mono-traversable_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, foldl
      , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
      , text, transformers, unordered-containers, vector
@@ -124179,7 +125257,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -129700,6 +130777,139 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nomyx-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, either
+     , hslogger, lens, mtl, network-uri, nomyx-core, nomyx-language
+     , QuickCheck, resourcet, safe, servant, servant-client
+     , servant-server, servant-swagger, split, stm, swagger2, text
+     , transformers, wai, wai-cors, wai-extra, warp, yaml
+     }:
+     mkDerivation {
+       pname = "nomyx-api";
+       version = "0.1.0";
+       sha256 = "2ed761b1bf0ecc4b9892e98d41aa458a88102217a6fcaea3b217a6bc0462a3b8";
+       libraryHaskellDepends = [
+         aeson base bytestring containers either hslogger lens mtl
+         network-uri nomyx-core nomyx-language QuickCheck resourcet safe
+         servant servant-client servant-server servant-swagger split stm
+         swagger2 text transformers wai wai-cors wai-extra warp yaml
+       ];
+       homepage = "http://www.nomyx.net";
+       description = "REST API for Nomyx";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "nomyx-core" = callPackage
+    ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup
+     , bytestring, Cabal, DebugTraceHelpers, deepseq, directory
+     , either-unwrap, exceptions, filepath, HaskellNet, HaskellNet-SSL
+     , hint, hint-server, hscolour, hslogger, imprevu, ixset, lens
+     , mime-mail, MissingH, mtl, network, nomyx-language, nomyx-library
+     , NoTrace, old-locale, random, safe, safecopy, shortcut, stm, tar
+     , template-haskell, temporary, text, time, unix, yaml
+     }:
+     mkDerivation {
+       pname = "nomyx-core";
+       version = "1.0.0";
+       sha256 = "a28504ddf5858cb710c54828cf1b9531ca7471bc4f918aab5c48a590c424b931";
+       libraryHaskellDepends = [
+         acid-state aeson base blaze-html blaze-markup bytestring
+         DebugTraceHelpers deepseq directory either-unwrap exceptions
+         filepath HaskellNet HaskellNet-SSL hint hint-server hscolour
+         hslogger imprevu ixset lens mime-mail MissingH mtl network
+         nomyx-language nomyx-library NoTrace old-locale random safe
+         safecopy shortcut stm tar template-haskell temporary text time unix
+         yaml
+       ];
+       testHaskellDepends = [ base Cabal ];
+       homepage = "http://www.nomyx.net";
+       description = "A Nomic game in haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "nomyx-language" = callPackage
+    ({ mkDerivation, base, Boolean, containers, DebugTraceHelpers, ghc
+     , imprevu, lens, monad-loops, mtl, old-locale, random, safe
+     , shortcut, text, time, time-recurrence
+     }:
+     mkDerivation {
+       pname = "nomyx-language";
+       version = "1.0.0";
+       sha256 = "131200f5c2b0b1893d29a697ae2e80108e0f99b3b5d20d4324cc3b2b207839bd";
+       libraryHaskellDepends = [
+         base Boolean containers DebugTraceHelpers ghc imprevu lens
+         monad-loops mtl old-locale random safe shortcut text time
+         time-recurrence
+       ];
+       homepage = "http://www.nomyx.net";
+       description = "Language to express rules for Nomic";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "nomyx-library" = callPackage
+    ({ mkDerivation, base, containers, ghc, lens, mtl, nomyx-language
+     , old-locale, safe, shortcut, time, time-recurrence
+     }:
+     mkDerivation {
+       pname = "nomyx-library";
+       version = "1.0.0";
+       sha256 = "14d7ce8365492bb5aa3d7581d4fe629f7f56d9bcbd26f82608e5e1dcb53a64e9";
+       libraryHaskellDepends = [
+         base containers ghc lens mtl nomyx-language old-locale safe
+         shortcut time time-recurrence
+       ];
+       homepage = "http://www.nomyx.net";
+       description = "Library of rules for Nomyx";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "nomyx-server" = callPackage
+    ({ mkDerivation, base, Cabal, directory, exceptions, filepath
+     , hslogger, imprevu, lens, mtl, network, nomyx-api, nomyx-core
+     , nomyx-language, nomyx-library, nomyx-web, safe, stm, time
+     }:
+     mkDerivation {
+       pname = "nomyx-server";
+       version = "1.0.0";
+       sha256 = "601a55a28842a8e4fdad53e7cdf20fd79a817a4c27978db802098b7256a95218";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base directory exceptions filepath hslogger imprevu lens mtl
+         network nomyx-api nomyx-core nomyx-language nomyx-library nomyx-web
+         safe stm time
+       ];
+       testHaskellDepends = [ base Cabal ];
+       homepage = "http://www.nomyx.net";
+       description = "A Nomic game in haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "nomyx-web" = callPackage
+    ({ mkDerivation, acid-state, base, blaze-html, blaze-markup
+     , bytestring, filepath, happstack-authenticate, happstack-server
+     , hscolour, HTTP, http-types, imprevu, imprevu-happstack, jmacro
+     , lens, mtl, nomyx-auth, nomyx-core, nomyx-language, old-locale
+     , reform, reform-blaze, reform-happstack, safe, split, stm, text
+     , time, web-routes, web-routes-happstack, web-routes-th
+     }:
+     mkDerivation {
+       pname = "nomyx-web";
+       version = "1.0.0";
+       sha256 = "387d235cd62d3ff11a2576a2ad2f20aff0853a2d880c7a2809f28f5dc79eacda";
+       libraryHaskellDepends = [
+         acid-state base blaze-html blaze-markup bytestring filepath
+         happstack-authenticate happstack-server hscolour HTTP http-types
+         imprevu imprevu-happstack jmacro lens mtl nomyx-auth nomyx-core
+         nomyx-language old-locale reform reform-blaze reform-happstack safe
+         split stm text time web-routes web-routes-happstack web-routes-th
+       ];
+       homepage = "http://www.nomyx.net";
+       description = "Web gui for Nomyx";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {nomyx-auth = null;};
+
   "non-empty" = callPackage
     ({ mkDerivation, base, containers, deepseq, QuickCheck, utility-ht
      }:
@@ -129887,6 +131097,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "normalize-imports" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "normalize-imports";
+       version = "0.1.0";
+       sha256 = "34cdd6f575cbc98419a1c31e7d8390494ea9708915811aa9d0d1d556f9945264";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/qoelet/normalize-imports#readme";
+       description = "Sort and align Haskell import statements";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "not-gloss" = callPackage
     ({ mkDerivation, base, binary, bmp, bytestring, GLUT, OpenGL
      , OpenGLRaw, spatial-math, time, vector, vector-binary-instances
@@ -131378,8 +132603,8 @@ self: {
      }:
      mkDerivation {
        pname = "one-liner";
-       version = "0.8";
-       sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6";
+       version = "0.8.1";
+       sha256 = "b9136bd0502b2fb1ec171b1cc2b8b2dff4fe3f42e8ae9e7e49306e2bb4624455";
        libraryHaskellDepends = [
          base bifunctors contravariant ghc-prim profunctors tagged
          transformers
@@ -132558,7 +133783,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "optparse-applicative" = callPackage
+  "optparse-applicative_0_13_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
      , transformers, transformers-compat
      }:
@@ -132573,6 +133798,41 @@ self: {
        homepage = "https://github.com/pcapriotti/optparse-applicative";
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "optparse-applicative" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "optparse-applicative";
+       version = "0.13.2.0";
+       sha256 = "5c83cfce7e53f4d3b1f5d53f082e7e61959bf14e6be704c698c3ab7f1b956ca2";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base process transformers transformers-compat
+       ];
+       testHaskellDepends = [ base QuickCheck ];
+       homepage = "https://github.com/pcapriotti/optparse-applicative";
+       description = "Utilities and combinators for parsing command line options";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "optparse-applicative-simple" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-data, base-prelude
+     , optparse-applicative, rerebase, text
+     }:
+     mkDerivation {
+       pname = "optparse-applicative-simple";
+       version = "1";
+       sha256 = "8708357dbaef4aff4024342011bfc36219ad325148d707c2dad51f88aefc8f65";
+       libraryHaskellDepends = [
+         attoparsec base-prelude optparse-applicative text
+       ];
+       testHaskellDepends = [ attoparsec-data rerebase ];
+       homepage = "https://github.com/nikita-volkov/optparse-applicative-simple";
+       description = "Simple command line interface arguments parser";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -135372,8 +136632,8 @@ self: {
        pname = "path";
        version = "0.5.12";
        sha256 = "52f0dae7e3d72d26fa62ff55de65b6697744dd0c5b96f48625cb00df1cf1055d";
-       revision = "1";
-       editedCabalFile = "540d42d3ea3169520a788d6771a3f907f01e5410bd87deea8bb57cb76b536ca0";
+       revision = "2";
+       editedCabalFile = "b4b398831f283efea1eb8dd53cb41ddf0c0fe25eab8b809f82f463a7d72496b9";
        libraryHaskellDepends = [
          aeson base deepseq exceptions filepath hashable template-haskell
        ];
@@ -135384,6 +136644,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path_0_5_13" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions
+     , filepath, hashable, hspec, mtl, template-haskell
+     }:
+     mkDerivation {
+       pname = "path";
+       version = "0.5.13";
+       sha256 = "1968303e1632499890c3c760ade68e91e848cb45de552090d86e6c75b93e7d51";
+       libraryHaskellDepends = [
+         aeson base deepseq exceptions filepath hashable template-haskell
+       ];
+       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
     ({ mkDerivation, base, exceptions, path }:
      mkDerivation {
@@ -136467,42 +137744,6 @@ self: {
      }) {};
 
   "persistent" = 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.6";
-       sha256 = "42423362de94599581d18be644ba77181e87417087b3953daec2e8512d408e3e";
-       revision = "2";
-       editedCabalFile = "34e03865c3d882d04c3a03e289007cd6a8669b941b5fdac27c2628a2d976b2b6";
-       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;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent_2_6_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
      , exceptions, fast-logger, hspec, http-api-data, lifted-base
@@ -136533,7 +137774,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -136697,28 +137937,6 @@ self: {
      }) {};
 
   "persistent-mysql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-control, monad-logger, mysql, mysql-simple
-     , persistent, resource-pool, resourcet, text, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-mysql";
-       version = "2.6";
-       sha256 = "a34c9f34feab49af156870a4c09df98d9cda54a3dd08944e3e0d326e86993be7";
-       revision = "2";
-       editedCabalFile = "58089479bffd093a76438ed244837a885f9b0a78fa814c92d3a6aad86ed3d206";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers
-         monad-control monad-logger mysql mysql-simple persistent
-         resource-pool resourcet text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "persistent-mysql_2_6_0_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-control, monad-logger, mysql, mysql-simple
      , persistent, resource-pool, resourcet, text, transformers
@@ -136774,27 +137992,6 @@ self: {
      }) {};
 
   "persistent-postgresql" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , containers, monad-control, monad-logger, persistent
-     , postgresql-libpq, postgresql-simple, resource-pool, resourcet
-     , text, time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-postgresql";
-       version = "2.6";
-       sha256 = "d640eecc5c8528c5ab42f08a01b74d409ca2b8e67259f477f3cd3686bc3aaae2";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit containers
-         monad-control monad-logger persistent postgresql-libpq
-         postgresql-simple resource-pool resourcet text time transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using postgresql";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-postgresql_2_6_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-control, monad-logger, persistent
      , postgresql-libpq, postgresql-simple, resource-pool, resourcet
@@ -136812,7 +138009,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -136910,33 +138106,6 @@ self: {
      }) {};
 
   "persistent-sqlite" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , hspec, monad-control, monad-logger, old-locale, persistent
-     , persistent-template, resource-pool, resourcet, temporary, text
-     , time, transformers
-     }:
-     mkDerivation {
-       pname = "persistent-sqlite";
-       version = "2.6.0.1";
-       sha256 = "84df1475478f8c4aa7790152c89ffca43a08a32cd933e4062cb219a023e4768c";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers monad-control monad-logger
-         old-locale persistent resource-pool resourcet text time
-         transformers
-       ];
-       testHaskellDepends = [
-         base hspec persistent persistent-template temporary text time
-         transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Backend for the persistent library using sqlite3";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-sqlite_2_6_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , hspec, microlens-th, monad-control, monad-logger, old-locale
      , persistent, persistent-template, resource-pool, resourcet
@@ -136960,37 +138129,10 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-template" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
-     , ghc-prim, hspec, http-api-data, monad-control, monad-logger
-     , path-pieces, persistent, QuickCheck, tagged, template-haskell
-     , text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "persistent-template";
-       version = "2.5.1.6";
-       sha256 = "f88a8735173ba197f8d698a9c1fd5c649234fd60efe493f401432926a55e7b44";
-       revision = "2";
-       editedCabalFile = "18eae1801d9742facf54aada319dfde737a1cc758b39bb2f237a4d15c98b65c6";
-       libraryHaskellDepends = [
-         aeson aeson-compat base bytestring containers ghc-prim
-         http-api-data monad-control monad-logger path-pieces persistent
-         tagged template-haskell text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec persistent QuickCheck text transformers
-       ];
-       homepage = "http://www.yesodweb.com/book/persistent";
-       description = "Type-safe, non-relational, multi-backend persistence";
-       license = stdenv.lib.licenses.mit;
-       maintainers = with stdenv.lib.maintainers; [ psibi ];
-     }) {};
-
-  "persistent-template_2_5_2" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, bytestring, containers
      , ghc-prim, hspec, http-api-data, monad-control, monad-logger
      , path-pieces, persistent, QuickCheck, tagged, template-haskell
@@ -137011,7 +138153,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -138021,10 +139162,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-aeson";
-       version = "0.4.1.7";
-       sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd";
-       revision = "1";
-       editedCabalFile = "7ce776e074de974988cd06b5b26062b4f5f1647c07fc2ecdd2992c482c0d286d";
+       version = "0.4.1.8";
+       sha256 = "350411f492fefa8d5a2554e7521d22b7ee88bacbea9d27c0d22468f6355ebe75";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
@@ -138062,10 +139201,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-attoparsec";
-       version = "0.5.1.4";
-       sha256 = "fab0a84f9f81e6ae06eae85fd895f0cb8c698723cab7f33addaf5d14cd553507";
-       revision = "1";
-       editedCabalFile = "c90218d8e50e98ed17267f3f96a6e0382fd20c6143892470a6eeb6eda4f34edd";
+       version = "0.5.1.5";
+       sha256 = "fe9eb446289dbc4c4acdde39620877b885417990d9774f622fa9d1daa591cafd";
        libraryHaskellDepends = [
          attoparsec base bytestring pipes pipes-parse text transformers
        ];
@@ -138138,6 +139275,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-break" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, pipes, pipes-group
+     , pipes-parse, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "pipes-break";
+       version = "0.2.0.6";
+       sha256 = "c75a9c0707475e9f127f2820d8b04c7858648e503454c496470c575499f098b2";
+       libraryHaskellDepends = [
+         base bytestring pipes pipes-group pipes-parse text
+       ];
+       testHaskellDepends = [ base bytestring mtl pipes QuickCheck ];
+       homepage = "https://github.com/mindreader/pipes-break";
+       description = "Pipes to group by any delimiter (such as lines with carriage returns)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse
      , transformers
@@ -138594,8 +139748,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-lines";
-       version = "1.0.3.1";
-       sha256 = "6781737f9686f4e53d48eabffe8079b3cc608a4603da98ebdb34d34bf24a1efc";
+       version = "1.0.3.4";
+       sha256 = "41bf6e9aa081ad26d4c9ed1c309aca5e2250ad2c60dac18a9bc45fa1eb7508ae";
        libraryHaskellDepends = [ base bytestring pipes pipes-group text ];
        testHaskellDepends = [
          base bytestring lens mtl pipes pipes-group QuickCheck
@@ -139830,8 +140984,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointfree";
-       version = "1.1.1.2";
-       sha256 = "5d398b4769b47918df05ef5693c182fb5d070f75414e65e7110b98f1328ba92b";
+       version = "1.1.1.3";
+       sha256 = "b212674cba309fa1a09a330bd33b72bb337509c848ea1d5ec2ec3bd2c480de56";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -140095,6 +141249,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "polydata" = callPackage
+    ({ mkDerivation, base, constraint-manip, hspec, indextype }:
+     mkDerivation {
+       pname = "polydata";
+       version = "0.1.0.0";
+       sha256 = "1e1785b31d8fac68db19771440e564cec451a7cf0d4a8ac9f3bb634b4a2db7bb";
+       libraryHaskellDepends = [ base constraint-manip indextype ];
+       testHaskellDepends = [ base constraint-manip hspec indextype ];
+       description = "Wrap together data and it's constraints";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "polymap" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -140801,6 +141967,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-binary_0_10" = 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
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.10";
+       sha256 = "28816184fb287ddafcd8344f4d8cdba678be2fb29f06005cc7f597ee4386e7c6";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         network-ip placeholders scientific text time transformers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         aeson conversion conversion-bytestring conversion-text json-ast
+         loch-th network-ip placeholders postgresql-libpq QuickCheck
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -140922,8 +142118,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "3.0.1";
-       sha256 = "2e9ff10732967eabc091a0f7d45a3b9777a20ae23ab3fffb8827bae646fcc1a4";
+       version = "3.1.0";
+       sha256 = "32fbc4c4dc73c6338bfb58c61a2f823b6b6b0113b87735748a53a3e38ca7ba87";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
@@ -140933,7 +142129,7 @@ self: {
          transformers-compat type-fun
        ];
        testHaskellDepends = [
-         attoparsec base derive inflections postgresql-simple QuickCheck
+         attoparsec base derive postgresql-simple QuickCheck
          quickcheck-assertions quickcheck-instances tasty tasty-hunit
          tasty-quickcheck tasty-th text time
        ];
@@ -141106,6 +142302,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-syntax" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, pg_query, rerebase
+     , text
+     }:
+     mkDerivation {
+       pname = "postgresql-syntax";
+       version = "0.1";
+       sha256 = "f3b442738809521d312fccd8fe6cfab247da2326a2a2571018f680029e44c5f4";
+       libraryHaskellDepends = [ base base-prelude bytestring text ];
+       librarySystemDepends = [ pg_query ];
+       testHaskellDepends = [ rerebase ];
+       homepage = "https://github.com/nikita-volkov/postgresql-syntax";
+       description = "PostgreSQL SQL syntax utilities";
+       license = stdenv.lib.licenses.mit;
+     }) {pg_query = null;};
+
   "postgresql-transactional" = callPackage
     ({ mkDerivation, base, monad-control, mtl, postgresql-simple }:
      mkDerivation {
@@ -141370,30 +142582,51 @@ self: {
      }) {};
 
   "powerqueue" = callPackage
-    ({ mkDerivation, async, base, contravariant, hspec, stm }:
+    ({ mkDerivation, async, base, contravariant, hspec, stm, timespan
+     }:
      mkDerivation {
        pname = "powerqueue";
-       version = "0.1.0.0";
-       sha256 = "91835dd0495cb47b5a589703e7904104e7001597f06039f87067192fcdb8254c";
-       libraryHaskellDepends = [ async base contravariant ];
+       version = "0.2.0.0";
+       sha256 = "d9c40dd39a57689dd2efef1f561e2ca8c771e9db5fab829df06c00795fda14f6";
+       libraryHaskellDepends = [ async base contravariant timespan ];
        testHaskellDepends = [ async base hspec stm ];
        homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A flexible job queue with exchangeable backends";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "powerqueue-distributed" = callPackage
+    ({ mkDerivation, async, base, bytestring, cereal, cereal-conduit
+     , conduit, conduit-extra, hspec, mtl, powerqueue, stm, text
+     , timespan
+     }:
+     mkDerivation {
+       pname = "powerqueue-distributed";
+       version = "0.1.0.0";
+       sha256 = "fb20cbbb2cae4dc8d19b16820e04c566a3a47a61bffa785e4e0eab3f7483769f";
+       libraryHaskellDepends = [
+         base bytestring cereal cereal-conduit conduit conduit-extra mtl
+         powerqueue text timespan
+       ];
+       testHaskellDepends = [ async base hspec powerqueue stm timespan ];
+       homepage = "https://github.com/agrafix/powerqueue#readme";
+       description = "A distributed worker backend for powerqueu";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "powerqueue-levelmem" = callPackage
     ({ mkDerivation, async, base, bytestring, cereal, criterion, dlist
      , filepath, focus, hspec, leveldb, leveldb-haskell, list-t
-     , powerqueue, snappy, stm, stm-containers, temporary, unagi-chan
+     , powerqueue, snappy, stm, stm-containers, temporary, timespan
+     , unagi-chan
      }:
      mkDerivation {
        pname = "powerqueue-levelmem";
-       version = "0.1.0.0";
-       sha256 = "b23d92c0b70b06e4168f03cdfedf7d38f12c85bcf493fb8874e66bd5ddc7ee76";
+       version = "0.1.1.0";
+       sha256 = "941fa5e052189a89ac445b027b59b599182c76c638050143a4dcd49d7cd677b8";
        libraryHaskellDepends = [
          async base bytestring cereal dlist filepath focus leveldb-haskell
-         list-t powerqueue stm stm-containers unagi-chan
+         list-t powerqueue stm stm-containers timespan unagi-chan
        ];
        testHaskellDepends = [
          async base cereal hspec powerqueue temporary
@@ -141408,6 +142641,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
 
+  "powerqueue-sqs" = callPackage
+    ({ mkDerivation, aws-simple, base, powerqueue, text, timespan }:
+     mkDerivation {
+       pname = "powerqueue-sqs";
+       version = "0.1.0.0";
+       sha256 = "dbb927967e79c83d699691cb7fd411a180a23142aeb4cd86beade92aa3e994ab";
+       libraryHaskellDepends = [
+         aws-simple base powerqueue text timespan
+       ];
+       homepage = "https://github.com/agrafix/powerqueue#readme";
+       description = "A Amazon SQS backend for powerqueue";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ppm" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -141466,6 +142713,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pqueue_1_3_2_2" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "pqueue";
+       version = "1.3.2.2";
+       sha256 = "27b5b57945325c0fb8b8447178ae27bfe243174da2d9b1ad38639e450b515035";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       description = "Reliable, persistent, fast priority queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pqueue-mtl" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, MaybeT, mtl
      , stateful-mtl, uvector
@@ -142466,20 +143726,21 @@ self: {
      }) {};
 
   "prizm" = callPackage
-    ({ mkDerivation, base, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text
+    ({ mkDerivation, base, convertible, HUnit, mono-traversable
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text
      }:
      mkDerivation {
        pname = "prizm";
-       version = "0.3.1.2";
-       sha256 = "6909454f9aa0a10aed4dfb3d4625df3a2271bed80c1a5f6922c32387228c1758";
-       libraryHaskellDepends = [ base text ];
+       version = "2.0.1";
+       sha256 = "2f35547b8041c51890cadfd072838140f8ed808491272e77e51b2e90097106ef";
+       libraryHaskellDepends = [ base convertible mono-traversable text ];
        testHaskellDepends = [
-         base QuickCheck test-framework test-framework-hunit
-         test-framework-quickcheck2
+         base convertible HUnit mono-traversable QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "https://github.com/ixmatus/prizm";
-       description = "Compute with colors and differenct color spaces";
+       description = "Convert colors to different color spaces, interpolate colors, and transform colors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -143280,8 +144541,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.4.1";
-       sha256 = "b5d8f9773d4f58ab68fc036dacf7368b450e0535769bb1df28e80166cd3d2116";
+       version = "4.0.0";
+       sha256 = "da1b4e26e28232907d351dc7e1abe7cfcef77e31b723a49da7822557472ba074";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145022,6 +146283,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "qm-interpolated-string" = callPackage
+    ({ mkDerivation, base, bytestring, haskell-src-meta, hspec
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "qm-interpolated-string";
+       version = "0.1.0.0";
+       sha256 = "ad1dc7b40665023d553f781e2ddb67d169db6c50595cf99ff43b013495d19ef9";
+       libraryHaskellDepends = [
+         base bytestring haskell-src-meta template-haskell text
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/unclechu/haskell-qm-interpolated-string";
+       description = "Implementation of interpolated multiline strings";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "qr-imager" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
      , haskell-qrencode, hspec, jose-jwt, JuicyPixels, lens, libqrencode
@@ -145692,23 +146970,6 @@ self: {
      }) {};
 
   "quickcheck-special" = callPackage
-    ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific
-     , text
-     }:
-     mkDerivation {
-       pname = "quickcheck-special";
-       version = "0.1.0.3";
-       sha256 = "8dbe5c2cdefb35880433902402110c1d9927b96d2363df8382fb6ee7e8d3e2f7";
-       libraryHaskellDepends = [
-         base bytestring ieee754 QuickCheck scientific text
-       ];
-       homepage = "https://github.com/minad/quickcheck-special#readme";
-       description = "Edge cases and special values for QuickCheck Arbitrary instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "quickcheck-special_0_1_0_4" = callPackage
     ({ mkDerivation, base, bytestring, ieee754, QuickCheck, scientific
      , text
      }:
@@ -146984,21 +148245,21 @@ self: {
 
   "rasa" = callPackage
     ({ mkDerivation, async, base, bifunctors, containers, data-default
-     , free, hspec, lens, mtl, pipes, pipes-concurrency, pipes-parse
-     , profunctors, QuickCheck, quickcheck-instances, text, text-lens
-     , transformers, yi-rope
+     , eve, free, hspec, lens, mtl, pipes, pipes-concurrency
+     , pipes-parse, profunctors, QuickCheck, quickcheck-instances, text
+     , text-lens, transformers, yi-rope
      }:
      mkDerivation {
        pname = "rasa";
-       version = "0.1.10";
-       sha256 = "970bd5b3dfac3a8050e2daea281d15b3b1dc499824cad392225d1e4d483527e8";
+       version = "0.1.12";
+       sha256 = "5ae77122fd34c6c87ec9137c7d686106ee57baaef164090c55efd2d0bbe85f21";
        libraryHaskellDepends = [
-         async base bifunctors containers data-default free hspec lens mtl
-         pipes pipes-concurrency pipes-parse profunctors text text-lens
+         async base bifunctors containers data-default eve free hspec lens
+         mtl pipes pipes-concurrency pipes-parse profunctors text text-lens
          transformers yi-rope
        ];
        testHaskellDepends = [
-         base hspec lens QuickCheck quickcheck-instances text yi-rope
+         base eve hspec lens QuickCheck quickcheck-instances text yi-rope
        ];
        homepage = "https://github.com/ChrisPenner/rasa#readme";
        description = "A modular text editor";
@@ -147048,8 +148309,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-cmd";
-       version = "0.1.2";
-       sha256 = "f328cc06d7fca6ac2bb301aaa18b057b0404319dc0072963f27a90750644b3e9";
+       version = "0.1.3";
+       sha256 = "91c0a74068dfda1b661be2c64bc683428eb6b8ff6456841659ebe893b6fd23ac";
        libraryHaskellDepends = [
          base containers data-default lens rasa text
        ];
@@ -147065,8 +148326,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-cursors";
-       version = "0.1.6";
-       sha256 = "c1407b36255825f4708ccffb9b04cdb1cd93da417cc2c337033b10306626390e";
+       version = "0.1.7";
+       sha256 = "9c28c15968615731107ff8238fca5bce281f3dd2f24cfdb2f5539ff8744fec05";
        libraryHaskellDepends = [
          base data-default lens mtl rasa text text-lens yi-rope
        ];
@@ -147082,8 +148343,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-files";
-       version = "0.1.4";
-       sha256 = "d824e1eec8ce6b92453e957c10859351c23306463b08bdcdfc5d635471147957";
+       version = "0.1.5";
+       sha256 = "975995a63285aeac0a4366f25994f27a429fb80891b614b78105318525c8497a";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text
          yi-rope
@@ -147098,8 +148359,8 @@ self: {
     ({ mkDerivation, base, lens, mtl, rasa }:
      mkDerivation {
        pname = "rasa-ext-logger";
-       version = "0.1.3";
-       sha256 = "8648adfd280b15ddfed693bb771745de6311bcfe3fb3066fa3ce89694a12eb5d";
+       version = "0.1.4";
+       sha256 = "3ec3b328893895debaa4e4bdf90f9c62dd2523c3bf22d4435a078a84dd5c63f3";
        libraryHaskellDepends = [ base lens mtl rasa ];
        homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for logging state/actions";
@@ -147113,8 +148374,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-slate";
-       version = "0.1.7";
-       sha256 = "6773e509862723cc02776cd05db0dea70a179433a57ab635f37124964738d312";
+       version = "0.1.8";
+       sha256 = "bf1741d7059a5ea39ca48624006c5ade1e9909441d2f68c6109773fd4a983484";
        libraryHaskellDepends = [
          base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes
          text vty yi-rope
@@ -147157,8 +148418,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-views";
-       version = "0.1.4";
-       sha256 = "5542a37a779efe0e97ecbadbed2409414c99705a9298d0dfc5915f56682e11c0";
+       version = "0.1.6";
+       sha256 = "f46547242b5f08a6b10aea20ee0ec471d3691fc7c7cec51d4af1a0f86a6d4024";
        libraryHaskellDepends = [
          base bifunctors data-default lens mtl rasa recursion-schemes
          yi-rope
@@ -147176,8 +148437,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasa-ext-vim";
-       version = "0.1.6";
-       sha256 = "e97e6d096eee5f02ed022407276653ed33657f82ef708ad8095a3caf1fddb22a";
+       version = "0.1.8";
+       sha256 = "fe8f447e65ad88b6dd4e0f7f14aa436dc2b1940f38886aa96eae5ed55b1a7e02";
        libraryHaskellDepends = [
          base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
          rasa-ext-views text text-lens yi-rope
@@ -148146,8 +149407,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "readcsv";
-       version = "0.1";
-       sha256 = "dc30c00dd05156749ff38d42eed15c73a493fc0b66b630eab256c4e359456c88";
+       version = "0.1.1";
+       sha256 = "de463ca78f757a19e97ea7e1764daf4652aa6311e34de3592dfac1352ae1ddb4";
+       revision = "1";
+       editedCabalFile = "ba0cb06393f608d7f7cc1de9797235202bc2e766478c09bd566a864d65bb8fd1";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/george-steel/readcsv";
        description = "Lightweight CSV parser/emitter based on ReadP";
@@ -149291,6 +150554,8 @@ self: {
        pname = "regex";
        version = "0.5.0.0";
        sha256 = "422392384ce3986d1c5627b30c8dc9dfb05fe41044820739d11da51ff1a8c27f";
+       revision = "1";
+       editedCabalFile = "0ace4a3d369511cdbabee677172dd1174288af160415699626829f25c8720a91";
        libraryHaskellDepends = [
          array base base-compat bytestring containers hashable heredoc
          regex-base regex-pcre-builtin regex-tdfa regex-tdfa-text
@@ -149303,6 +150568,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "regex_0_8_0_0" = callPackage
+    ({ mkDerivation, array, base, base-compat, bytestring, containers
+     , hashable, heredoc, 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";
+       libraryHaskellDepends = [
+         array base base-compat bytestring containers hashable heredoc
+         regex-base regex-tdfa regex-tdfa-text template-haskell text time
+         time-locale-compat transformers unordered-containers
+       ];
+       homepage = "http://regex.uk";
+       description = "Toolkit for regex-base";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "regex-applicative" = callPackage
     ({ mkDerivation, base, containers, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
@@ -149441,28 +150727,28 @@ 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, shelly
-     , smallcheck, tasty, tasty-hunit, tasty-smallcheck
+     , 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.5.0.0";
-       sha256 = "bfc94f67d1723fd833247512549aa2e0a9d18070aaf9409feaef87388a48a1bb";
+       version = "0.8.0.0";
+       sha256 = "0ba7b0c30259818a48952d3218b0b89bba19979f4d2882c77e752091f654dddd";
        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 shelly smallcheck tasty tasty-hunit
+         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 shelly smallcheck tasty tasty-hunit
+         regex-tdfa-text regex-with-pcre shelly smallcheck tasty tasty-hunit
          tasty-smallcheck template-haskell text time time-locale-compat
          transformers unordered-containers
        ];
@@ -149719,6 +151005,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "regex-with-pcre" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, regex
+     , regex-base, regex-pcre-builtin, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "regex-with-pcre";
+       version = "0.8.0.0";
+       sha256 = "c965675df2d1b52bc9e0f1a5df0da150f47103a41494deba0ae985b2707ecd6b";
+       libraryHaskellDepends = [
+         base base-compat bytestring containers regex regex-base
+         regex-pcre-builtin template-haskell transformers
+       ];
+       homepage = "http://regex.uk";
+       description = "Toolkit for regex-base";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-xmlschema" = callPackage
     ({ mkDerivation, base, haskell98, parsec }:
      mkDerivation {
@@ -150111,8 +151414,8 @@ self: {
      }:
      mkDerivation {
        pname = "relapse";
-       version = "0.1.0.1";
-       sha256 = "4e6e2bb0c4c420f184c9cc928659e3bbbbce0215f2681e7641a9a6f2eb31e631";
+       version = "0.1.1.1";
+       sha256 = "613a385a54ba9d9fa95562121aa0ef94614fbb984b319477e2ef49512ef1a20a";
        libraryHaskellDepends = [ attoparsec base bytestring ];
        testHaskellDepends = [
          aeson base base16-bytestring bytestring containers include-file
@@ -151066,6 +152369,8 @@ self: {
        pname = "req";
        version = "0.2.0";
        sha256 = "e64e56622f1ec06df83e2c8516effa49058b4d7196c28127ab98190cc320ebbc";
+       revision = "1";
+       editedCabalFile = "b37d82306c1346da0bbaa129073d8cc8d7fa86df7ae938fb45de47925b8ed6b0";
        libraryHaskellDepends = [
          aeson authenticate-oauth base blaze-builder bytestring
          case-insensitive connection data-default-class http-api-data
@@ -151679,30 +152984,6 @@ self: {
      }) {};
 
   "rethinkdb" = callPackage
-    ({ mkDerivation, aeson, async, base, base64-bytestring, binary
-     , bytestring, containers, criterion, data-default, doctest, mtl
-     , network, scientific, text, time, unordered-containers
-     , utf8-string, vector
-     }:
-     mkDerivation {
-       pname = "rethinkdb";
-       version = "2.2.0.8";
-       sha256 = "444938d62cba4cbe8606507e3c0abd341f45fd9acf6000102f1743ddb5a0e50f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring binary bytestring containers
-         data-default mtl network scientific text time unordered-containers
-         utf8-string vector
-       ];
-       testHaskellDepends = [ base doctest ];
-       benchmarkHaskellDepends = [ aeson async base criterion text ];
-       homepage = "http://github.com/atnnn/haskell-rethinkdb";
-       description = "A driver for RethinkDB 2.2";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "rethinkdb_2_2_0_9" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, binary
      , bytestring, containers, criterion, data-default, doctest, mtl
      , network, scientific, text, time, unordered-containers
@@ -151724,7 +153005,6 @@ self: {
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -153301,29 +154581,29 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "rss-conduit_0_3_0_1" = callPackage
+  "rss-conduit_0_3_1_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
-     , conduit-extra, containers, data-default, hlint, lens-simple
-     , mono-traversable, QuickCheck, quickcheck-instances, resourcet
-     , safe, safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, timerep, uri-bytestring, xml-conduit, xml-types
+     , containers, data-default, hlint, lens-simple, mono-traversable
+     , QuickCheck, quickcheck-instances, resourcet, safe
+     , safe-exceptions, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , timerep, uri-bytestring, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "rss-conduit";
-       version = "0.3.0.1";
-       sha256 = "d30265d4e68f7563580e6dd3a2b39c0017145d111c60def1d9667fdb6ca3aae6";
+       version = "0.3.1.0";
+       sha256 = "3a12df089512275e3fcf590b91e13f2c821eaef09d60829c5244c3dd94eb3cc9";
        libraryHaskellDepends = [
          base conduit conduit-combinators containers lens-simple
          mono-traversable safe safe-exceptions text time timerep
          uri-bytestring xml-conduit xml-types
        ];
        testHaskellDepends = [
-         base bytestring conduit conduit-extra data-default hlint
+         base bytestring conduit conduit-combinators data-default hlint
          lens-simple mono-traversable QuickCheck quickcheck-instances
          resourcet safe-exceptions tasty tasty-hunit tasty-quickcheck text
          time uri-bytestring xml-conduit xml-types
        ];
-       description = "Streaming parser/renderer for the RSS 2.0 standard.";
+       description = "Streaming parser/renderer for the RSS standard";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -153771,8 +155051,8 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "safe-access";
-       version = "0.3.1.0";
-       sha256 = "936ddafc0664e4b62f11ebb6b2c3169f06c67e107a0d8f05e27896940eb4bf9f";
+       version = "0.3.2.0";
+       sha256 = "346c5ab460d9011f8dce0bc7481d0baa3ddb71666528eb63b607263f62af0b6c";
        libraryHaskellDepends = [ base mtl transformers ];
        homepage = "http://darcs.redspline.com/safe-access";
        description = "A simple environment to control access to data";
@@ -153786,8 +155066,8 @@ self: {
      }:
      mkDerivation {
        pname = "safe-exceptions";
-       version = "0.1.4.0";
-       sha256 = "c52078c8457f8233a3796f84a3ae3f336f4668a013ba935e74c7218eeb9a41a6";
+       version = "0.1.5.0";
+       sha256 = "70efec3691b296c7af21b01b87c838b6f54a55af63429746dad1184c08cd1a19";
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
        homepage = "https://github.com/fpco/safe-exceptions#readme";
@@ -153803,6 +155083,8 @@ self: {
        pname = "safe-exceptions-checked";
        version = "0.1.0";
        sha256 = "d807552b828de308d80805f65ee41f3e25571506b10e6b28b0b81de4aec0ca3f";
+       revision = "1";
+       editedCabalFile = "eb73db3a495242ccc5bea2cc4aef48e91693dcd43301ea9e531f1c0aaea4d6da";
        libraryHaskellDepends = [
          base deepseq safe-exceptions transformers
        ];
@@ -153961,8 +155243,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.9.2";
-       sha256 = "ba666b242653d6b23fc9bc19dfa9d4367148aeb9235baf3738b91150ac9b6ed3";
+       version = "0.9.3";
+       sha256 = "7ec166f50363eef698c884b3495405f1705e974c8dfaf54b9374977b334f6ec8";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -155952,15 +157234,17 @@ self: {
      }:
      mkDerivation {
        pname = "sdl2-compositor";
-       version = "1.2.0.5";
-       sha256 = "233b6fa622703849d4f7d69ac2202a0787b4e1048341b09767a3b5fa2e3ee255";
+       version = "1.2.0.6";
+       sha256 = "32face1df14f6944165365b383cf01ea15688711395def00f02d7774bd53b014";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base lens linear lrucache QuickCheck sdl2 StateVar stm text
          transformers
        ];
-       testHaskellDepends = [ base Cabal hspec hspec-core QuickCheck ];
+       testHaskellDepends = [
+         base Cabal hspec hspec-core lrucache QuickCheck stm
+       ];
        description = "image compositing with sdl2 - declarative style";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156037,6 +157321,8 @@ self: {
        pname = "sdl2-ttf";
        version = "1.0.0";
        sha256 = "349b155e0992e2e05695d380145bdb28a9a9bd6089ca03973dca6948883fe51f";
+       revision = "1";
+       editedCabalFile = "d7cfd13b2e073a6c23c5433e883ab04ad527bb694e9bc2caa24050335f81e004";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base sdl2 transformers ];
@@ -156120,8 +157406,8 @@ self: {
     ({ mkDerivation, base, bytestring, free, mtl, text }:
      mkDerivation {
        pname = "seakale";
-       version = "0.2.0.0";
-       sha256 = "cdbab7220b1935ef18dd78113fd87981371492d904a1e07d2911c94dcf2b2349";
+       version = "0.2.1.0";
+       sha256 = "421133a7081f9b107e57cb1e055cb2b71d9ccfbb63fcb13b1b447e2ca777c72f";
        libraryHaskellDepends = [ base bytestring free mtl text ];
        description = "Pure SQL layer on top of other libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -156148,8 +157434,8 @@ self: {
      }:
      mkDerivation {
        pname = "seakale-tests";
-       version = "0.1.0.1";
-       sha256 = "ac54690de63000b5492d85b4009e5e6d3baab645726e06d4f099b990ce707508";
+       version = "0.1.0.2";
+       sha256 = "70bc6f129086ea030f260babe3c8228ee8462720a3fef72d9071c4e0795d2c29";
        libraryHaskellDepends = [
          base bytestring free mtl recursion-schemes seakale
        ];
@@ -156186,6 +157472,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "search-algorithms" = callPackage
+    ({ mkDerivation, base, containers, doctest, hspec }:
+     mkDerivation {
+       pname = "search-algorithms";
+       version = "0.1.0";
+       sha256 = "4c93f0a145aefccbeee9b61e56f6c79a5a29c6398a3cff962e087d08d9ab636a";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base containers doctest hspec ];
+       homepage = "https://github.com/devonhollowood/search-algorithms#readme";
+       description = "Common graph search algorithms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sec" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -157163,8 +158462,8 @@ self: {
      }:
      mkDerivation {
        pname = "serokell-util";
-       version = "0.1.4.0";
-       sha256 = "ab37e7b6833fa3499501c82133dfd640875326c1b0ba96df3cf7b0380c2215cf";
+       version = "0.1.5.0";
+       sha256 = "c8dbcdf8c6650a45fa6c5bf2a95a1d754818ac2dd276a29291fa942e831bc74a";
        libraryHaskellDepends = [
          acid-state aeson aeson-extra ansi-terminal base base16-bytestring
          base64-bytestring binary binary-orphans bytestring cereal
@@ -157357,8 +158656,8 @@ self: {
     ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }:
      mkDerivation {
        pname = "servant-auth";
-       version = "0.2.6.0";
-       sha256 = "ca70089cb1560dc8b990437c3eb6ff4a8cea0aba387fc7cb7ef1bd0b9f17113d";
+       version = "0.2.6.1";
+       sha256 = "25c5d31edca69294229bc0aaeb359e8c97f4ba2014cb95cd55265ec7cc7fad59";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ];
        homepage = "http://github.com/plow-technologies/servant-auth#readme";
@@ -157374,8 +158673,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-client";
-       version = "0.2.6.0";
-       sha256 = "928cd5a1e546e38f76f161332ea6591f885d62c052fd8a6cee5e4e22f35e5c36";
+       version = "0.2.6.1";
+       sha256 = "53855164942526c019c5b88c6b3c11ee9b80200b204b083b4313016e0960775f";
        libraryHaskellDepends = [
          base bytestring servant servant-auth servant-client text
        ];
@@ -157425,8 +158724,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-docs";
-       version = "0.2.6.0";
-       sha256 = "333d3fabb345a2892aa803e5e5558356a66382032693d68e762fb95dd75cb4b2";
+       version = "0.2.6.1";
+       sha256 = "76c6a4e9cf4979df461de017d43df6944c837aec90bc0543b17f66ee6d280d77";
        libraryHaskellDepends = [
          base lens servant servant-auth servant-docs text
        ];
@@ -157527,8 +158826,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-server";
-       version = "0.2.6.0";
-       sha256 = "d78ab2c470731d2e18f19c2b45b8cc398541cda56ba947cdb032081737c55ea8";
+       version = "0.2.6.1";
+       sha256 = "5a850a6c011a72a5c3fea1285122fd8f295f31591a413b977385736d3fd8b877";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157558,6 +158857,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-auth-swagger" = callPackage
+    ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck
+     , servant, servant-auth, servant-swagger, swagger2, text, yaml
+     }:
+     mkDerivation {
+       pname = "servant-auth-swagger";
+       version = "0.2.6.1";
+       sha256 = "ef8001b5f9301522264ed06fdd3ef5772c23d7ae08abe8656047ba950e461a4d";
+       libraryHaskellDepends = [
+         base lens servant servant-auth servant-swagger swagger2 text
+       ];
+       testHaskellDepends = [
+         base doctest Glob hspec lens QuickCheck servant servant-auth
+         servant-swagger swagger2 text yaml
+       ];
+       homepage = "http://github.com/plow-technologies/servant-auth#readme";
+       description = "servant-swagger/servant-auth compatibility";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-auth-token" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl
      , pwstore-fast, servant-auth-token-api, servant-server, text, time
@@ -157565,8 +158884,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token";
-       version = "0.4.1.1";
-       sha256 = "06a2f6928bd558ad6d22542bf212ac0acdb60d68febe70eab917d37812bb3e84";
+       version = "0.4.2.0";
+       sha256 = "4e43edd4241521b366c9a55cfd1fce1e8f9e3963037257f3552f8c946d8ed668";
        libraryHaskellDepends = [
          aeson-injector base bytestring containers mtl pwstore-fast
          servant-auth-token-api servant-server text time transformers uuid
@@ -157606,8 +158925,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-api";
-       version = "0.4.0.1";
-       sha256 = "0850d95cc86d0893069887f2e30ed0cb22eef0bdf7f82a6d28e1c51f551e3d83";
+       version = "0.4.1.1";
+       sha256 = "70c5ab5e1bbd3b29e9b8dcc558d08c6688fdd4fee4412ffef964454386dadfda";
        libraryHaskellDepends = [
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
@@ -157618,6 +158937,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "servant-auth-token-leveldb" = callPackage
+    ({ mkDerivation, aeson-injector, base, bytestring, concurrent-extra
+     , containers, exceptions, lens, leveldb-haskell, monad-control, mtl
+     , resourcet, safe, safecopy-store, servant-auth-token
+     , servant-auth-token-api, servant-server, store, text, time
+     , transformers, transformers-base, uuid, vector
+     }:
+     mkDerivation {
+       pname = "servant-auth-token-leveldb";
+       version = "0.4.1.2";
+       sha256 = "516fb304f56be33491f7cc1c319acb05b30e3fb24a8c971598627a948a802fb2";
+       libraryHaskellDepends = [
+         aeson-injector base bytestring concurrent-extra containers
+         exceptions lens leveldb-haskell monad-control mtl resourcet safe
+         safecopy-store servant-auth-token servant-auth-token-api
+         servant-server store text time transformers transformers-base uuid
+         vector
+       ];
+       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
+       description = "Leveldb backend for servant-auth-token server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-auth-token-persistent" = callPackage
     ({ mkDerivation, aeson-injector, base, bytestring, containers
      , ghc-prim, monad-control, mtl, persistent, persistent-postgresql
@@ -157770,8 +159112,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-db-postgresql";
-       version = "0.2.1.0";
-       sha256 = "6f3cefb7b24bf3d4e50efe84d903e79edc936b85950cc260855af4a50ac11071";
+       version = "0.2.2.0";
+       sha256 = "ed718a452f4981a83ec7db630659ba802ee6ca1bf88495603abc1b7517a22e80";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157783,6 +159125,7 @@ self: {
          optparse-applicative postgresql-query QuickCheck
          quickcheck-instances servant-db text time transformers-base
        ];
+       homepage = "https://github.com/NCrashed/servant-db-postgresql";
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158060,29 +159403,6 @@ self: {
      }) {};
 
   "servant-js" = callPackage
-    ({ mkDerivation, base, base-compat, charset, hspec
-     , hspec-expectations, language-ecmascript, lens, QuickCheck
-     , servant, servant-foreign, text
-     }:
-     mkDerivation {
-       pname = "servant-js";
-       version = "0.9.2";
-       sha256 = "ad4676667cdd72f5bafac5c2d6de710b9c0082131b72dd117026fecb0d544369";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base-compat charset lens servant servant-foreign text
-       ];
-       testHaskellDepends = [
-         base base-compat hspec hspec-expectations language-ecmascript lens
-         QuickCheck servant text
-       ];
-       homepage = "http://haskell-servant.readthedocs.org/";
-       description = "Automatically derive javascript functions to query servant webservices";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-js_0_9_3" = callPackage
     ({ mkDerivation, base, base-compat, charset, hspec
      , hspec-expectations, language-ecmascript, lens, QuickCheck
      , servant, servant-foreign, text
@@ -158103,7 +159423,6 @@ self: {
        homepage = "http://haskell-servant.readthedocs.org/";
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-lucid" = callPackage
@@ -158372,8 +159691,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.2.2";
-       sha256 = "72878553ed9d7f134bd10e11ca7eaf69ba3d341e591aa3af4c73c43c7af866c5";
+       version = "0.0.2.4";
+       sha256 = "628d944e9185f3c60e7711034c7535ae2772df75cace718a744aaca478cac7c9";
        libraryHaskellDepends = [
          aeson base base-compat bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
@@ -159098,6 +160417,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "setoid" = callPackage
+    ({ mkDerivation, base, containers, mtl, smallcheck, tasty
+     , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "setoid";
+       version = "0.1.0.0";
+       sha256 = "165047a4ff8b20f0fbb404ee658a42c0836f354b8bc3477b86e8ee0e430a4b3c";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base containers mtl smallcheck tasty tasty-discover tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       description = "A Haskell implementation of setoid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "setops" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -159556,6 +160892,26 @@ self: {
        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
+     }:
+     mkDerivation {
+       pname = "shake-language-c";
+       version = "0.10.1";
+       sha256 = "ca464474f7a4d4807b6cd594bc9477549f1b17feb565f0c52c7249183d640220";
+       libraryHaskellDepends = [
+         base data-default-class fclabels process shake split
+         unordered-containers
+       ];
+       testHaskellDepends = [ base directory doctest hspec shake ];
+       doCheck = false;
+       homepage = "https://github.com/samplecount/shake-language-c";
+       description = "Utilities for cross-compiling with Shake";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shake-minify" = callPackage
     ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }:
      mkDerivation {
@@ -159949,7 +161305,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "shell-conduit_4_6_0" = callPackage
+  "shell-conduit_4_6_1" = callPackage
     ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
      , control-monad-loop, directory, filepath, hspec
      , hspec-expectations, monad-control, monads-tf, process, resourcet
@@ -159958,8 +161314,8 @@ self: {
      }:
      mkDerivation {
        pname = "shell-conduit";
-       version = "4.6.0";
-       sha256 = "9ce6230efb78589b5b28dd82396d73afbc832bbb8213f51c28ab6c946a9a12a1";
+       version = "4.6.1";
+       sha256 = "86d161f8b05ae72e5464fe4ade42443d750fc9ffbd5ba98d7d5587287076ad42";
        libraryHaskellDepends = [
          async base bytestring conduit conduit-extra control-monad-loop
          directory filepath monad-control monads-tf process resourcet
@@ -160257,6 +161613,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shortcut" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "shortcut";
+       version = "0.1";
+       sha256 = "0a29d75028071579ad855b592cce687fc9f0ad2e78aeaec36152082db9f92ff1";
+       revision = "1";
+       editedCabalFile = "87266ab5d90db03edb789b97534f17901c77b435d95a6724e7832bebef00d793";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://www.nomyx.net";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shortcut-links" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -160855,8 +162224,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.7.0.1";
-       sha256 = "be3d3ca1fbfc2aee432190f0e737b73478116493beb176216dcad0b1a8c0bc4d";
+       version = "0.7.0.2";
+       sha256 = "367158bb1e97fea1bd5f61e9390bb0a50a0ad26ab11c97c16a0fdc495be17f4c";
        libraryHaskellDepends = [
          array base exceptions list-t monad-control MonadRandom mtl text
          transformers transformers-base
@@ -162937,8 +164306,8 @@ self: {
     ({ mkDerivation, base, blaze-html, snap-core }:
      mkDerivation {
        pname = "snap-blaze";
-       version = "0.2.1.4";
-       sha256 = "381a8cf8f211be77b9d52c2aa6b880e7059384fe0124c69d704040b0c016302b";
+       version = "0.2.1.5";
+       sha256 = "b36e35bd4ba3087b3de92702e488ba6570675719243b5dbdf4eae0b819988841";
        libraryHaskellDepends = [ base blaze-html snap-core ];
        homepage = "http://github.com/jaspervdj/snap-blaze";
        description = "blaze-html integration for Snap";
@@ -164197,6 +165566,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "snipcheck" = callPackage
+    ({ mkDerivation, base, pandoc, process }:
+     mkDerivation {
+       pname = "snipcheck";
+       version = "0.1.0.0";
+       sha256 = "139097708760baee65463781237f2294f74a399832283d32756a26ab05ba846c";
+       libraryHaskellDepends = [ base pandoc process ];
+       homepage = "https://github.com/nmattia/snipcheck#readme";
+       description = "Markdown tester";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "snippet-extractor" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -164702,21 +166083,24 @@ self: {
      }) {};
 
   "solr" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring
+    ({ mkDerivation, attoparsec-data, base, base-prelude, bytestring
      , bytestring-tree-builder, case-insensitive, contravariant
-     , http-client, http-response-decoder, json-encoder
-     , json-incremental-decoder, matcher, profunctors, semigroups, text
+     , http-client, http-client-tls, http-response-decoder, json-encoder
+     , json-incremental-decoder, managed, matcher
+     , optparse-applicative-simple, profunctors, semigroups, text
      , transformers, uri-encode
      }:
      mkDerivation {
        pname = "solr";
-       version = "0.3.3";
-       sha256 = "5703365d767023c7dd9fe5584968655f0115a5ad6b65bf28762dfeb959ed325c";
+       version = "0.4.1";
+       sha256 = "b9499555ee76c3a185384570b8d207f707a9dfa7d3529f06413d76fb164f4016";
        libraryHaskellDepends = [
-         base base-prelude bytestring bytestring-tree-builder
-         case-insensitive contravariant http-client http-response-decoder
-         json-encoder json-incremental-decoder matcher profunctors
-         semigroups text transformers uri-encode
+         attoparsec-data base base-prelude bytestring
+         bytestring-tree-builder case-insensitive contravariant http-client
+         http-client-tls http-response-decoder json-encoder
+         json-incremental-decoder managed matcher
+         optparse-applicative-simple profunctors semigroups text
+         transformers uri-encode
        ];
        homepage = "https://github.com/sannsyn/solr";
        description = "A minimal Solr client library";
@@ -165364,6 +166748,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "speculate" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, leancheck }:
+     mkDerivation {
+       pname = "speculate";
+       version = "0.2.3";
+       sha256 = "d7db98c9cf05b393469f843535e3255d6f16ab3cc82244ccdb77c25a36e9a127";
+       libraryHaskellDepends = [ base cmdargs containers leancheck ];
+       testHaskellDepends = [ base cmdargs containers leancheck ];
+       benchmarkHaskellDepends = [ base cmdargs containers leancheck ];
+       homepage = "https://github.com/rudymatela/speculate#readme";
+       description = "discovery of properties about Haskell functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "speculation" = callPackage
     ({ mkDerivation, base, ghc-prim, stm, transformers }:
      mkDerivation {
@@ -166278,6 +167676,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sscan" = callPackage
+    ({ mkDerivation, async, base, brick, directory, filepath, microlens
+     , microlens-th, process, temporary, text, time, vty
+     }:
+     mkDerivation {
+       pname = "sscan";
+       version = "0.1";
+       sha256 = "47fadd088d4eb2d2580491975a4d7a7d0574ddda8576192c1c4b8b369d353bfb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base brick directory filepath microlens microlens-th process
+         temporary text time vty
+       ];
+       description = "text UI for scanning with SANE";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "sscgi" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, case-insensitive
      , containers, Glob, MonadCatchIO-mtl, mtl, transformers
@@ -166548,35 +167964,6 @@ self: {
      }) {};
 
   "stache" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, criterion
-     , deepseq, directory, exceptions, file-embed, filepath, hspec
-     , hspec-megaparsec, megaparsec, mtl, template-haskell, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "stache";
-       version = "0.2.0";
-       sha256 = "0952d6849a297d3ef020feaeb128be4af7d25ab97fa948eb0339a7f75d0a1831";
-       revision = "2";
-       editedCabalFile = "4899a9a2a56b3e2524b0166f8875f7f823419c64ec1f2a74f2ff7b6010472d01";
-       libraryHaskellDepends = [
-         aeson base bytestring containers deepseq directory exceptions
-         filepath megaparsec mtl template-haskell text unordered-containers
-         vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers file-embed hspec hspec-megaparsec
-         megaparsec text yaml
-       ];
-       benchmarkHaskellDepends = [
-         aeson base criterion deepseq megaparsec text
-       ];
-       homepage = "https://github.com/stackbuilders/stache";
-       description = "Mustache templates for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stache_0_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, criterion
      , deepseq, directory, exceptions, file-embed, filepath, hspec
      , hspec-megaparsec, megaparsec, mtl, template-haskell, text
@@ -166601,70 +167988,67 @@ self: {
        homepage = "https://github.com/stackbuilders/stache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
-     , attoparsec, base, base-compat, base16-bytestring
-     , base64-bytestring, binary, binary-tagged, blaze-builder, byteable
-     , bytestring, Cabal, clock, conduit, conduit-extra, containers
-     , cryptohash, cryptohash-conduit, deepseq, directory, either
-     , errors, exceptions, extra, fast-logger, file-embed, filelock
-     , filepath, fsnotify, generic-deriving, gitrev, hashable, hastache
+     , attoparsec, base, base-compat, base64-bytestring, binary
+     , binary-tagged, blaze-builder, bytestring, Cabal, clock, conduit
+     , conduit-extra, containers, cryptonite, cryptonite-conduit
+     , deepseq, directory, either, errors, exceptions, extra
+     , fast-logger, file-embed, filelock, filepath, fsnotify
+     , generic-deriving, gitrev, hackage-security, hashable, hastache
      , hit, hpack, hpc, hspec, http-client, http-client-tls
-     , http-conduit, http-types, lifted-async, lifted-base, microlens
-     , monad-control, monad-logger, monad-unlift, mono-traversable, mtl
-     , neat-interpolation, open-browser, optparse-applicative
-     , optparse-simple, path, path-io, persistent, persistent-sqlite
-     , persistent-template, pid1, pretty, process, project-template
-     , QuickCheck, regex-applicative-text, resourcet, retry, safe
-     , safe-exceptions, semigroups, smallcheck, split, stm, store
-     , streaming-commons, tar, template-haskell, temporary, text
-     , text-binary, text-metrics, th-reify-many, time, tls, transformers
-     , transformers-base, unicode-transforms, unix, unix-compat
-     , unordered-containers, vector, vector-binary-instances, yaml
-     , zip-archive, zlib
+     , http-conduit, http-types, lifted-async, lifted-base, memory
+     , microlens, microlens-mtl, monad-control, monad-logger
+     , monad-unlift, mono-traversable, mtl, neat-interpolation
+     , network-uri, open-browser, optparse-applicative, optparse-simple
+     , path, path-io, persistent, persistent-sqlite, persistent-template
+     , pid1, pretty, process, project-template, QuickCheck
+     , regex-applicative-text, resourcet, retry, safe, safe-exceptions
+     , semigroups, smallcheck, split, stm, store, streaming-commons, tar
+     , template-haskell, temporary, text, text-binary, text-metrics
+     , th-reify-many, time, tls, transformers, transformers-base
+     , unicode-transforms, unix, unix-compat, unordered-containers
+     , vector, vector-binary-instances, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.3.2";
-       sha256 = "488b9292ea605c92f6ebf79b233e8e374d857b21053051cb44b305dad8f0d3f7";
-       revision = "2";
-       editedCabalFile = "c15bab02b5aa26847ce94aab4bca3ac7bbd38e7e3c56039364f70bb107cb7968";
+       version = "1.4.0";
+       sha256 = "f10d6f031aa0e682da3e1f61fa12b9c31f1617150b0f99f691c873a0ce19e8b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base-compat base16-bytestring base64-bytestring binary
-         binary-tagged blaze-builder byteable bytestring Cabal clock conduit
-         conduit-extra containers cryptohash cryptohash-conduit deepseq
-         directory either errors exceptions extra fast-logger file-embed
-         filelock filepath fsnotify generic-deriving hashable hastache hit
-         hpack hpc http-client http-client-tls http-conduit http-types
-         lifted-async lifted-base microlens monad-control monad-logger
-         monad-unlift mtl open-browser optparse-applicative path path-io
-         persistent persistent-sqlite persistent-template pid1 pretty
-         process project-template regex-applicative-text resourcet retry
-         safe safe-exceptions semigroups split stm store streaming-commons
-         tar template-haskell temporary text text-binary text-metrics time
-         tls transformers transformers-base unicode-transforms unix
-         unix-compat unordered-containers vector vector-binary-instances
-         yaml zip-archive zlib
+         base-compat base64-bytestring binary binary-tagged blaze-builder
+         bytestring Cabal clock conduit conduit-extra containers cryptonite
+         cryptonite-conduit deepseq directory either errors exceptions extra
+         fast-logger file-embed filelock filepath fsnotify generic-deriving
+         hackage-security hashable hastache hit hpack hpc http-client
+         http-client-tls http-conduit http-types lifted-async lifted-base
+         memory microlens microlens-mtl monad-control monad-logger
+         monad-unlift mtl network-uri open-browser optparse-applicative path
+         path-io persistent persistent-sqlite persistent-template pid1
+         pretty process project-template regex-applicative-text resourcet
+         retry safe safe-exceptions semigroups split stm store
+         streaming-commons tar template-haskell temporary text text-binary
+         text-metrics time tls transformers transformers-base
+         unicode-transforms unix unix-compat unordered-containers vector
+         vector-binary-instances yaml zip-archive zlib
        ];
        executableHaskellDepends = [
-         base bytestring Cabal containers directory either filelock filepath
-         gitrev hpack http-client lifted-base microlens monad-control
-         monad-logger mtl optparse-applicative optparse-simple path path-io
-         text transformers
+         base bytestring Cabal conduit containers directory either filelock
+         filepath gitrev hpack http-client lifted-base microlens
+         monad-control monad-logger mtl optparse-applicative optparse-simple
+         path path-io split text transformers
        ];
        testHaskellDepends = [
          attoparsec base bytestring Cabal conduit conduit-extra containers
-         cryptohash directory exceptions filepath hspec http-client-tls
-         http-conduit monad-logger mono-traversable neat-interpolation path
-         path-io QuickCheck resourcet retry smallcheck store
-         template-haskell temporary text th-reify-many transformers vector
-         yaml
+         cryptonite directory exceptions filepath hashable hspec
+         http-client-tls http-conduit monad-logger mono-traversable
+         neat-interpolation optparse-applicative path path-io QuickCheck
+         resourcet retry smallcheck store template-haskell temporary text
+         th-reify-many transformers unordered-containers vector yaml
        ];
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
@@ -167924,8 +169308,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "stm-extras";
-       version = "0.1.0.1";
-       sha256 = "ffa81349733b1631c1bad5ce3e5d4bcd35eb76dee10e4790fa050d40cb98e9cd";
+       version = "0.1.0.2";
+       sha256 = "7ebcc998326e404e4935679db87e4961412b176756603adccb91bbf946618621";
        libraryHaskellDepends = [ base stm ];
        homepage = "https://github.com/louispan/stm-extras#readme";
        description = "Extra STM functions";
@@ -168463,30 +169847,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.0";
-       sha256 = "27c7b48ff3f78231711eab021b4a54b82b3b58e0dfa43e02b8c41a8be9c4527d";
-       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_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text
      , unordered-containers
@@ -168508,7 +169868,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
@@ -168758,8 +170117,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-eversion";
-       version = "0.3.1.0";
-       sha256 = "39bb9f601dfe578abd11933d4707f1a031669384375f2167b3da34740f1add01";
+       version = "0.3.1.1";
+       sha256 = "4277a6cd32bef41230f4a74cb1786c57f9bb09b3ec57edf7acdec6c9eaa1da8d";
        libraryHaskellDepends = [
          base foldl pipes streaming transformers
        ];
@@ -168894,18 +170253,21 @@ self: {
      }) {};
 
   "strelka" = callPackage
-    ({ mkDerivation, attoparsec, base, base-prelude, base64-bytestring
-     , bifunctors, bytestring, hashable, http-media, mtl, semigroups
-     , strelka-core, text, transformers, unordered-containers
+    ({ mkDerivation, attoparsec, attoparsec-data, base, base-prelude
+     , base64-bytestring, bifunctors, bytestring
+     , bytestring-tree-builder, hashable, http-media, mtl, scientific
+     , semigroups, strelka-core, text, text-builder, time, transformers
+     , unordered-containers, url-decoders
      }:
      mkDerivation {
        pname = "strelka";
-       version = "1";
-       sha256 = "a29e67ccb1929d3f1455ae80472098219ec3dc58b9b5bc9534cb61869ee831d5";
+       version = "2";
+       sha256 = "8273953fc6d54a7e1dc2c3f23c78c8ed6f4986c5e9a46222fc7e6831b2e24432";
        libraryHaskellDepends = [
-         attoparsec base base-prelude base64-bytestring bifunctors
-         bytestring hashable http-media mtl semigroups strelka-core text
-         transformers unordered-containers
+         attoparsec attoparsec-data base base-prelude base64-bytestring
+         bifunctors bytestring bytestring-tree-builder hashable http-media
+         mtl scientific semigroups strelka-core text text-builder time
+         transformers unordered-containers url-decoders
        ];
        homepage = "https://github.com/nikita-volkov/strelka";
        description = "A simple, flexible and composable web-router";
@@ -168919,8 +170281,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka-core";
-       version = "0.1";
-       sha256 = "9cccd19850c9b6afd0a544041476988520b035ec519061d7b92f1f781be69221";
+       version = "0.3";
+       sha256 = "94794ca8b44a7407bbf0256c01cbf703250fb5b06b1d06e32468f62147b30c3c";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring hashable mtl semigroups
          text transformers unordered-containers
@@ -168936,8 +170298,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka-wai";
-       version = "1";
-       sha256 = "b30e1e4732acb5c5db772609655a23e8311a627b788dcbcf99dce8cbb3f16137";
+       version = "1.0.1";
+       sha256 = "8c0de42044d5df2e8c7aa3d5c62ef973be6017baf35f9f57f104ee5794427f7d";
        libraryHaskellDepends = [
          base base-prelude bytestring case-insensitive http-types
          strelka-core text unordered-containers wai warp
@@ -168959,6 +170321,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "strict-base" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "strict-base";
+       version = "0.4.0.0";
+       sha256 = "98e3776d1f4e5752629d1b14a38017bdcac46ae95b578ce3aa136719983c455a";
+       revision = "1";
+       editedCabalFile = "2ff4e43cb95eedf2995558d7fc34d19362846413dd39e6aa6a5b3ea8228fef9f";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/minad/strict-base";
+       description = "Strict versions of base data types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "strict-base-types" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
      , hashable, lens, QuickCheck, strict
@@ -169034,8 +170410,8 @@ self: {
     ({ mkDerivation, base, deepseq, extensible-exceptions }:
      mkDerivation {
        pname = "strict-io";
-       version = "0.2.1";
-       sha256 = "ad265e5707c8badaea8b2a89457917d38ae3cf7c19ac46bac704a81ee5777700";
+       version = "0.2.2";
+       sha256 = "f9a9eb58e2253d9b76c41e123d3d91ca7d26dcdb30e25dedaabd2daac30d95c9";
        libraryHaskellDepends = [ base deepseq extensible-exceptions ];
        description = "A library wrapping standard IO modules to provide strict IO";
        license = stdenv.lib.licenses.bsd3;
@@ -169668,6 +171044,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stutter" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit
+     , conduit-combinators, conduit-extra, mtl, optparse-applicative
+     , resourcet, snipcheck, tasty, tasty-ant-xml, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "stutter";
+       version = "0.1.0.0";
+       sha256 = "a3038e5881220d46a9403f6aca06944802b124e18fc04d78b1f7b51a64a1ca11";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit conduit-combinators
+         conduit-extra mtl resourcet text
+       ];
+       executableHaskellDepends = [
+         attoparsec base conduit conduit-combinators optparse-applicative
+         text
+       ];
+       testHaskellDepends = [
+         attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit
+       ];
+       homepage = "https://github.com/nmattia/stutter#readme";
+       description = "(Stutter Text|String)-Utterer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stylish-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
@@ -172731,8 +174134,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-ant-xml";
-       version = "1.0.4";
-       sha256 = "4d91c509e0e80919d96c16eaa3ee11089b7ee7c87fbe59a947d26bf0c5aef188";
+       version = "1.0.5";
+       sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving ghc-prim mtl
          stm tagged tasty transformers xml
@@ -172742,15 +174145,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tasty-ant-xml_1_0_5" = callPackage
+  "tasty-ant-xml_1_1_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
      , xml
      }:
      mkDerivation {
        pname = "tasty-ant-xml";
-       version = "1.0.5";
-       sha256 = "642d440fcce4c4025b7d33ac49d2c4f017d72397f494bae0401843bb42925436";
+       version = "1.1.0";
+       sha256 = "0dfdacf8b78ed897c2943d9a4aeeb56f3e33152d19062b5008a292f8bd27d0f6";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving ghc-prim mtl
          stm tagged tasty transformers xml
@@ -172852,6 +174255,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tasty-discover_2_0_1" = callPackage
+    ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-discover";
+       version = "2.0.1";
+       sha256 = "b4a9be2c27ee29de6ee41bf2a43abcc5f155ef263f3ae3c48d9a5a281e78242c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/lwm/tasty-discover#readme";
+       description = "Test discovery for the tasty framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-expected-failure" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
@@ -173457,35 +174882,49 @@ self: {
      }) {};
 
   "tdigest" = callPackage
-    ({ mkDerivation, base, base-compat, binary, bytes, Cabal
-     , cabal-doctest, Chart, Chart-diagrams, deepseq, directory, doctest
-     , filepath, machines, mwc-random, optparse-applicative, parallel
-     , reducers, semigroups, statistics, tasty, tasty-quickcheck, time
-     , vector, vector-algorithms
+    ({ mkDerivation, base, base-compat, binary, Cabal, cabal-doctest
+     , deepseq, doctest, reducers, semigroupoids, semigroups, tasty
+     , tasty-quickcheck, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "tdigest";
-       version = "0";
-       sha256 = "bfadc69c58f576831b60da5c141f66eb8e0e0ed7d7b9353e04a39cb44fde37ff";
+       version = "0.1";
+       sha256 = "0036b3aebe6556ced3a108579846346c9123d65c9dcd09c1d44435a64e3dc54b";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
-         base base-compat binary deepseq reducers semigroups vector
-         vector-algorithms
+         base base-compat binary deepseq reducers semigroupoids semigroups
+         vector vector-algorithms
        ];
        testHaskellDepends = [
-         base base-compat binary bytes deepseq directory doctest filepath
-         semigroups tasty tasty-quickcheck vector vector-algorithms
-       ];
-       benchmarkHaskellDepends = [
-         base base-compat binary Chart Chart-diagrams deepseq machines
-         mwc-random optparse-applicative parallel semigroups statistics time
-         vector vector-algorithms
+         base base-compat binary deepseq doctest semigroups tasty
+         tasty-quickcheck vector vector-algorithms
        ];
        homepage = "https://github.com/futurice/haskell-tdigest#readme";
        description = "On-line accumulation of rank-based statistics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tdigest-Chart" = callPackage
+    ({ mkDerivation, base, base-compat, Chart, Chart-diagrams, colour
+     , lens, mwc-random, semigroupoids, semigroups, statistics, tdigest
+     , vector
+     }:
+     mkDerivation {
+       pname = "tdigest-Chart";
+       version = "0";
+       sha256 = "74a806695cba25ebc96d80944b832d3423be4175496e319a52b6efc7c5f470a7";
+       libraryHaskellDepends = [
+         base base-compat Chart colour lens semigroupoids semigroups tdigest
+       ];
+       testHaskellDepends = [
+         base base-compat Chart Chart-diagrams lens mwc-random statistics
+         tdigest vector
+       ];
+       homepage = "https://github.com/futurice/haskell-tdigest#readme";
+       description = "Chart generation from tdigest";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tdoc" = callPackage
     ({ mkDerivation, base, bytestring, template-haskell, transformers
      , xhtml
@@ -173553,8 +174992,8 @@ self: {
      }:
      mkDerivation {
        pname = "telegram-api";
-       version = "0.6.0.2";
-       sha256 = "e5a29e558d5a5930be9c7d79cb16c66499fe12d9c5ffe663f830be683d3527f7";
+       version = "0.6.1.0";
+       sha256 = "8eef15f861aa178b8df0766ebf45ff6badf8cf4920af8e0d1ba31f9074cf67db";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client http-media
          http-types mime-types mtl servant servant-client string-conversions
@@ -174733,8 +176172,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.9.1";
-       sha256 = "cafb98d25da63bdd76f75b29bf395c9e023cf46d753db9a1534e84879cb8697e";
+       version = "0.9.3";
+       sha256 = "541624a64a2dee55e87ce361a66fdd3c82856437b19e2a7c113a04cb7cbc8a7e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -174844,8 +176283,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-builder";
-       version = "0.4";
-       sha256 = "0931b5988b5f86fbfe9055bb4d21fa1fceaaa8b1619aa951b53921ba2b8ce0b7";
+       version = "0.4.1";
+       sha256 = "63b16fe4b9ad73cfa58e5dbfe493f6955742cb079ce25dd24e128c42c4fa3321";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups text
        ];
@@ -176637,7 +178076,7 @@ self: {
      , gi-gtk, gi-webkit2, gtk3, haskell-gi-base, http-types, lens
      , mime-types, mtl, network, process, random, scientific, split
      , tasty, tasty-quickcheck, text, transformers, unordered-containers
-     , utf8-string, vector, webkit2gtk, xdg-basedir, xmonad
+     , utf8-string, vector, webkitgtk, xdg-basedir, xmonad
      , xmonad-contrib
      }:
      mkDerivation {
@@ -176655,7 +178094,7 @@ self: {
          mime-types mtl network process random scientific split text
          transformers unordered-containers utf8-string vector xdg-basedir
        ];
-       executablePkgconfigDepends = [ gtk3 webkit2gtk ];
+       executablePkgconfigDepends = [ gtk3 webkitgtk ];
        testHaskellDepends = [
          aeson base bytestring containers dbus directory filepath gi-gdk
          gi-gio gi-glib gi-gtk gi-webkit2 haskell-gi-base http-types lens
@@ -176667,7 +178106,7 @@ self: {
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gtk3 = pkgs.gnome3.gtk; webkit2gtk = null;};
+     }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs.gnome3) webkitgtk;};
 
   "tibetan-utils" = callPackage
     ({ mkDerivation, base, composition, either, hspec, hspec-megaparsec
@@ -176758,14 +178197,32 @@ 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
+     }:
+     mkDerivation {
+       pname = "tidal";
+       version = "0.9";
+       sha256 = "7578110ee03cf8716cadf16a8ee25c7e963a1b9cbf7d678dc2361a03bdabac86";
+       libraryHaskellDepends = [
+         base colour containers hashable hosc mersenne-random-pure64 mtl
+         parsec safe text time websockets
+       ];
+       homepage = "http://tidal.lurk.org/";
+       description = "Pattern language for improvised music";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tidal-midi" = callPackage
     ({ mkDerivation, base, containers, PortMidi, tidal, time
      , transformers
      }:
      mkDerivation {
        pname = "tidal-midi";
-       version = "0.8.2";
-       sha256 = "3638e4d7f853d1a73929624ec34b2364469339b0c821567cf8b46c78971c8339";
+       version = "0.9";
+       sha256 = "09d0d4893f73f93439c571dbb2365f80d72a41d28fecb21ad76d51c5dee4e9c0";
        libraryHaskellDepends = [
          base containers PortMidi tidal time transformers
        ];
@@ -176924,17 +178381,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "time_1_8" = callPackage
-    ({ mkDerivation, base, deepseq, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, unix
+  "time_1_8_0_1" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, unix
      }:
      mkDerivation {
        pname = "time";
-       version = "1.8";
-       sha256 = "38631adfbcd176a3f62fe3b14d9e03a44cc95e1971e4eeb7d46e1018e9e59aff";
+       version = "1.8.0.1";
+       sha256 = "2baa9fdc280604413ecaf9761f7fd3443fe69019eec6fdc3e0333501fe701701";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
-         base deepseq QuickCheck tasty tasty-hunit tasty-quickcheck unix
+         base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
+         unix
        ];
        homepage = "https://github.com/haskell/time";
        description = "A time library";
@@ -177234,8 +178692,8 @@ self: {
      }:
      mkDerivation {
        pname = "time-warp";
-       version = "1.1.1.1";
-       sha256 = "df2721daeee24eac57f2ba1f1eff4b0f87260340537cd5e3cbe8d6c27b1094fd";
+       version = "1.1.1.2";
+       sha256 = "35665ccf7bd1f5be2d50b5df2c29aa4431b266d2bc7a044ec93953d833129c59";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -177248,12 +178706,6 @@ self: {
          streaming-commons template-haskell text text-format time time-units
          transformers transformers-base unordered-containers
        ];
-       executableHaskellDepends = [
-         async base binary binary-conduit conduit data-default data-msgpack
-         exceptions formatting hspec lens log-warper MonadRandom mtl
-         QuickCheck random serokell-util stm text text-format time-units
-         transformers
-       ];
        testHaskellDepends = [
          async base data-default data-msgpack exceptions hspec lens
          log-warper mtl QuickCheck random serokell-util stm text text-format
@@ -177946,6 +179398,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tls_1_3_10" = 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
+     }:
+     mkDerivation {
+       pname = "tls";
+       version = "1.3.10";
+       sha256 = "9f057d0f40dda5ce8d0f0e0f2a06087be8007c41462c6cab19774538c35e0171";
+       revision = "1";
+       editedCabalFile = "34c1efff5206b28c0e67bbde8ea7d3428aafb572a623b832b08928d5bb72f9be";
+       libraryHaskellDepends = [
+         asn1-encoding asn1-types async base bytestring cereal cryptonite
+         data-default-class memory mtl network transformers x509 x509-store
+         x509-validation
+       ];
+       testHaskellDepends = [
+         base bytestring cereal cryptonite data-default-class hourglass mtl
+         QuickCheck tasty tasty-quickcheck x509 x509-validation
+       ];
+       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)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tls-debug" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, pem, time, tls, x509, x509-store, x509-system
@@ -178887,6 +180370,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "transformers-continue" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "transformers-continue";
+       version = "0.0.1";
+       sha256 = "bdac850adeed1a39aec13119a2a50386e36ce250cf886a001c959375265c1840";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "http://github.com/nhibberd/transformers-continue";
+       description = "Control flow data type and monad transformer";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "transformers-convert" = callPackage
     ({ mkDerivation, base, data-easy, directory, either, errors
      , haskell-src-exts, hlint, hspec, HUnit, QuickCheck, text
@@ -178947,6 +180442,8 @@ self: {
        pname = "transformers-lift";
        version = "0.1.0.1";
        sha256 = "c29d11f58fb9b2c1011c162f8f9f98cb0f2d12ca1317f40f4c88d9881840aa74";
+       revision = "1";
+       editedCabalFile = "dcc6d44fa2d58bcd6da22372824833aa78a5522a0d503e224ca03e428a2f664a";
        libraryHaskellDepends = [ base transformers ];
        description = "Ad-hoc type classes for lifting";
        license = stdenv.lib.licenses.bsd3;
@@ -179633,6 +181130,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tsne" = callPackage
+    ({ mkDerivation, base, data-default, deepseq, hspec
+     , normaldistribution, pipes, time
+     }:
+     mkDerivation {
+       pname = "tsne";
+       version = "1.3.0";
+       sha256 = "28583af6f0e0bf218457885ab1ae9083c26135ab81d011185ca2e2cf7ca39869";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-default deepseq normaldistribution pipes
+       ];
+       executableHaskellDepends = [ base data-default pipes time ];
+       testHaskellDepends = [ base data-default hspec ];
+       homepage = "https://bitbucket.org/robagar/haskell-tsne";
+       description = "t-SNE";
+       license = "LGPL";
+     }) {};
+
   "tsp-viz" = callPackage
     ({ mkDerivation, base, gloss, stm, vector }:
      mkDerivation {
@@ -180066,6 +181583,30 @@ self: {
        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
+     , system-filepath, temporary, text, time, transformers, unix
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.3.2";
+       sha256 = "f8163bcc08be06883964907391b88c2da0480f4764668629f4ada908319e7b5d";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "turtle-options" = callPackage
     ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
      }:
@@ -181300,6 +182841,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "typed-streams" = callPackage
+    ({ mkDerivation, array, base, bytestring, criterion, generic-enum
+     , ghc-typelits-knownnat, make-monofoldable-foldable
+     , mono-traversable, vector
+     }:
+     mkDerivation {
+       pname = "typed-streams";
+       version = "0.1.0.1";
+       sha256 = "046e226e18de70e34bbaeee8e652d283ab733d87b4e305dc322f9800b51a034d";
+       libraryHaskellDepends = [
+         array base bytestring generic-enum ghc-typelits-knownnat
+         make-monofoldable-foldable mono-traversable vector
+       ];
+       testHaskellDepends = [
+         array base bytestring criterion generic-enum ghc-typelits-knownnat
+         make-monofoldable-foldable mono-traversable vector
+       ];
+       description = "A stream based replacement for lists";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "typed-wire" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, gitrev, HTF, http-types, mtl, optparse-applicative
@@ -182526,6 +184088,8 @@ self: {
        pname = "union";
        version = "0.1.1.1";
        sha256 = "819e57439061cde958467e6a52ca9f9aeac6e61c84b8ead4f8c2489995ca44f4";
+       revision = "1";
+       editedCabalFile = "89e02322d70363ef5425b9c6380e5f3edab21e090d97affcb39f42bcad334c0d";
        libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ];
        benchmarkHaskellDepends = [ base criterion deepseq lens ];
        description = "Extensible type-safe unions";
@@ -182941,19 +184505,19 @@ self: {
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl
-     , safe, stm, text, text-format, transformers, unordered-containers
-     , utf8-string, vector
+    ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
+     , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe, stm
+     , text, text-format, transformers, type-operators
+     , unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "universum";
-       version = "0.2.1";
-       sha256 = "e5f8c58824cbf559fb3632ff5a00190870e254262a0f4db9dfde7bc2bc423d21";
+       version = "0.3";
+       sha256 = "cc5b5056e4a0c930a40bb9e015c90a3adf8d15e483d6da586fcf9ea23693acb5";
        libraryHaskellDepends = [
-         async base bytestring containers deepseq exceptions ghc-prim
-         hashable microlens microlens-mtl mtl safe stm text text-format
-         transformers unordered-containers utf8-string vector
+         base bytestring containers deepseq exceptions ghc-prim hashable
+         microlens microlens-mtl mtl safe stm text text-format transformers
+         type-operators unordered-containers utf8-string vector
        ];
        homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
@@ -183199,6 +184763,31 @@ self: {
        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
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "unordered-containers";
+       version = "0.2.8.0";
+       sha256 = "a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unordered-containers-rematch" = callPackage
     ({ mkDerivation, base, hashable, hspec, HUnit, rematch
      , unordered-containers
@@ -183341,6 +184930,8 @@ self: {
        pname = "unsequential";
        version = "0.5.2";
        sha256 = "89e70fc1bcdb982cf832e20c5fe540524d885a22210b832d3e3ea7307e3c7b4a";
+       revision = "1";
+       editedCabalFile = "c74a7fd593a4e843d8d77e57180a71e5ed13a91fa8bfc2ea70453fc0f448f49e";
        libraryHaskellDepends = [ base base-prelude dlist transformers ];
        testHaskellDepends = [
          attoparsec interspersed QuickCheck quickcheck-instances rebase
@@ -183579,35 +185170,6 @@ self: {
      }) {};
 
   "uri-bytestring" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
-     , containers, criterion, deepseq, deepseq-generics, generics-sop
-     , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
-     , semigroups, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, th-lift-instances
-     }:
-     mkDerivation {
-       pname = "uri-bytestring";
-       version = "0.2.3.0";
-       sha256 = "50178faac44a67095602412846682040b8b72ae8af5289e73dabe2cc49a639dd";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder bytestring containers
-         template-haskell th-lift-instances
-       ];
-       testHaskellDepends = [
-         attoparsec base blaze-builder bytestring containers generics-sop
-         HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq deepseq-generics
-         network-uri
-       ];
-       homepage = "https://github.com/Soostone/uri-bytestring";
-       description = "Haskell URI parsing as ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uri-bytestring_0_2_3_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, criterion, deepseq, deepseq-generics, generics-sop
      , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances
@@ -183634,7 +185196,6 @@ self: {
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -183758,6 +185319,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "url-decoders" = callPackage
+    ({ mkDerivation, base, base-prelude, binary-parser, bytestring
+     , criterion, http-types, QuickCheck, quickcheck-instances, rerebase
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "url-decoders";
+       version = "0.2";
+       sha256 = "f2ec809f09152873a7a517cf3d72cbaf68d4c180fccf63a2d5ad802af0052732";
+       libraryHaskellDepends = [
+         base base-prelude binary-parser bytestring text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         http-types QuickCheck quickcheck-instances rerebase tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ criterion http-types rerebase ];
+       homepage = "https://github.com/nikita-volkov/url-decoders";
+       description = "Decoders for URL-encoding (aka Percent-encoding)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "url-generic" = callPackage
     ({ mkDerivation, base, mtl, syb }:
      mkDerivation {
@@ -184759,8 +186343,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "validity";
-       version = "0.3.2.0";
-       sha256 = "e6ac32bfc76284be81817098be5192d91aac84ff9985b26ecd41a0cded54729e";
+       version = "0.3.3.0";
+       sha256 = "ff175f51fde2f2e928e284ece4564cfc98ddf16a96483445cc49baca3c845eb1";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
@@ -184771,8 +186355,8 @@ self: {
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
-       version = "0.1.0.0";
-       sha256 = "1322e47ffd6e192b9b322799c8fd8218e3de07274b5263cbd503f280f1a5d9a3";
+       version = "0.1.0.1";
+       sha256 = "bc4ed52d89c54a55ab859b231d58ba999ffb80d5b197fb26eee7a8281f4ae9cf";
        libraryHaskellDepends = [ base bytestring validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for bytestring";
@@ -184783,8 +186367,8 @@ self: {
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.1.0.2";
-       sha256 = "22f2084de274b01e0d0dc42fc609b651b979e899123b84a8702a2fca61468cdd";
+       version = "0.1.0.3";
+       sha256 = "ad7104429da47cdb7701ccafa87b73e98c2cb212f9838d8600bbd5635a49458f";
        libraryHaskellDepends = [ base containers validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
@@ -184795,8 +186379,8 @@ self: {
     ({ mkDerivation, base, filepath, path, validity }:
      mkDerivation {
        pname = "validity-path";
-       version = "0.1.0.0";
-       sha256 = "cb93616b60ba80dc051474f8dd0a67c605d4388a316561b29bf0d56117fb32e0";
+       version = "0.1.0.1";
+       sha256 = "1fd07205e1bd953e232d9722020d46181893fb21308959d0b75c718784670e57";
        libraryHaskellDepends = [ base filepath path validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for Path";
@@ -184807,8 +186391,8 @@ self: {
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.1.2.0";
-       sha256 = "f08e3a0f3ebdfe57419dfc6eef7e119d2a6ce7b8d0948297384c73ad8de0913f";
+       version = "0.1.2.1";
+       sha256 = "59d58521c9cfd3c438d01e23a636053821b7d03aef8179138ac9bb8184c39d1b";
        libraryHaskellDepends = [ base bytestring text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
@@ -184819,8 +186403,10 @@ self: {
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
-       version = "0.0.0.0";
-       sha256 = "4c061a1c238c846e2e6e9838355c9a340ffc6080fb9185b18fb3c8667178af3d";
+       version = "0.0.0.1";
+       sha256 = "175d75b95741323047afa14f3984bab93a20ee525e5a521a01ee94fbe8c5bb69";
+       revision = "1";
+       editedCabalFile = "a9f20c04242b73f552159675c78028323db8b0b0db6dabb5757538997597faf0";
        libraryHaskellDepends = [ base time validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for time";
@@ -185258,15 +186844,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector_0_12_0_0" = callPackage
+  "vector_0_12_0_1" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, HUnit, primitive
      , QuickCheck, random, template-haskell, test-framework
      , test-framework-hunit, test-framework-quickcheck2, transformers
      }:
      mkDerivation {
        pname = "vector";
-       version = "0.12.0.0";
-       sha256 = "27bf375d0efbff61acaeb75a2047afcbdac930191069a59da4a474b9bf80ec95";
+       version = "0.12.0.1";
+       sha256 = "b100ee79b9da2651276278cd3e0f08a3c152505cc52982beda507515af173d7b";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
        testHaskellDepends = [
          base HUnit QuickCheck random template-haskell test-framework
@@ -187162,8 +188748,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-auth";
-       version = "0.1.1.0";
-       sha256 = "f951faa7f3b143b36268b3c3b0250779d229490b0a4bad8722cda3ea0a60a1a1";
+       version = "0.1.1.1";
+       sha256 = "591a7c723aac4916eec000d81c14c593d7ffbc497fc5afe7f41affa0f6975988";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -189054,22 +190640,23 @@ self: {
      }) {webkit = null;};
 
   "webkit2gtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit2gtk }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk }:
      mkDerivation {
        pname = "webkit2gtk3-javascriptcore";
        version = "0.14.2.1";
        sha256 = "b24b110013f96c770a2c1683d3b35d73da31f9777dbe6e09ac704aff3ae442f8";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkit2gtk ];
+       libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit2gtk = null;};
+     }) {inherit (pkgs.gnome3) webkitgtk;};
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, glib
-     , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit
+     , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers
+     , webkitgtk24x
      }:
      mkDerivation {
        pname = "webkitgtk3";
@@ -189079,26 +190666,26 @@ self: {
        libraryHaskellDepends = [
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
-       libraryPkgconfigDepends = [ webkit ];
+       libraryPkgconfigDepends = [ webkitgtk24x ];
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit = null;};
+     }) {inherit (pkgs) webkitgtk24x;};
 
   "webkitgtk3-javascriptcore" = callPackage
-    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }:
+    ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkitgtk24x }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
        version = "0.14.2.1";
        sha256 = "922080150c96c9276ea3ddd9ef19d867f5e179017b56e8fec02e2606d4cc924d";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base ];
-       libraryPkgconfigDepends = [ webkit ];
+       libraryPkgconfigDepends = [ webkitgtk24x ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {webkit = null;};
+     }) {inherit (pkgs) webkitgtk24x;};
 
   "webpage" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
@@ -189215,20 +190802,21 @@ self: {
      }) {};
 
   "websockets-rpc" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, exceptions
-     , mtl, QuickCheck, quickcheck-instances, stm, tasty
-     , tasty-quickcheck, text, unordered-containers, wai-transformers
-     , websockets
+    ({ 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-rpc";
-       version = "0.0.0";
-       sha256 = "e8a97330230f178fede76701fd2335fe18f48a124bd020c4be8120fa75ddf5bb";
+       version = "0.0.2";
+       sha256 = "78100b408e6e793812034ce356bdbde893f51679d7d37db8ec2b773b26cfca12";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers exceptions mtl QuickCheck stm text
-         unordered-containers wai-transformers websockets
+         aeson async base bytestring containers exceptions mtl QuickCheck
+         stm text transformers unordered-containers wai-transformers
+         websockets
        ];
        testHaskellDepends = [
          aeson base QuickCheck quickcheck-instances tasty tasty-quickcheck
@@ -189911,6 +191499,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "witherable_0_1_3_4" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, hashable
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "witherable";
+       version = "0.1.3.4";
+       sha256 = "f45b124f2b7c7afd69512c09e91ebe3e3c4030caafad72fc762ba051685f0d67";
+       libraryHaskellDepends = [
+         base base-orphans containers hashable transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/fumieval/witherable";
+       description = "filterable traversable";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "witness" = callPackage
     ({ mkDerivation, base, constraints, semigroupoids, transformers }:
      mkDerivation {
@@ -190668,8 +192274,8 @@ self: {
      }:
      mkDerivation {
        pname = "writer-cps-lens";
-       version = "0.1.0.0";
-       sha256 = "23daa611fc16cddc8b8df3436818870c34ec87795b960b3cea2a3e3c408e3448";
+       version = "0.1.0.1";
+       sha256 = "2d6b8b6f4f86dcb3cc75bdd25d4ab186d09c2859023f3a6ef2171576b0d306ef";
        libraryHaskellDepends = [
          base lens profunctors transformers writer-cps-mtl
          writer-cps-transformers
@@ -190700,8 +192306,8 @@ self: {
     ({ mkDerivation, base, mmorph, writer-cps-transformers }:
      mkDerivation {
        pname = "writer-cps-morph";
-       version = "0.1.0.1";
-       sha256 = "bd685fa9dec074ef7d0f545f95eaf20bd0b600d2fb067f3dcfdc3a3b0e678cee";
+       version = "0.1.0.2";
+       sha256 = "e91d07b7dce83973c8ad8f489e161ea8092bd3c7d161f4e57cddeedd2f3fd5d8";
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
        homepage = "https://github.com/louispan/writer-cps-morph#readme";
        description = "MFunctor instance for CPS style WriterT and RWST";
@@ -192760,8 +194366,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.0.6";
-       sha256 = "7abfe1bdaf7a9bbecdfa89b36b7144fe590d5b6344cc4838fb287e8f5ded52c4";
+       version = "0.1.1.0";
+       sha256 = "775497b9cad69caee9c96f7049b4e865783b54a7fc3d4c07a0b7745a8934f439";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193781,30 +195387,6 @@ self: {
      }) {};
 
   "yesod" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , conduit, conduit-extra, data-default-class, directory
-     , fast-logger, monad-control, monad-logger, resourcet, semigroups
-     , shakespeare, streaming-commons, template-haskell, text
-     , transformers, unix, unordered-containers, wai, wai-extra
-     , wai-logger, warp, yaml, yesod-core, yesod-form, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod";
-       version = "1.4.4";
-       sha256 = "5f2caade2435754ff35060c3ae58390ad87650b975e83a65f8013e80ea7bea2c";
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring conduit conduit-extra
-         data-default-class directory fast-logger monad-control monad-logger
-         resourcet semigroups shakespeare streaming-commons template-haskell
-         text transformers unix unordered-containers wai wai-extra
-         wai-logger warp yaml yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod_1_4_5" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , conduit, conduit-extra, data-default-class, directory
      , fast-logger, monad-control, monad-logger, resourcet, semigroups
@@ -193826,7 +195408,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-angular" = callPackage
@@ -193865,35 +195446,6 @@ self: {
      }) {};
 
   "yesod-auth" = callPackage
-    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
-     , base64-bytestring, binary, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptohash, data-default, email-validate, file-embed
-     , http-client, http-conduit, http-types, lifted-base, mime-mail
-     , network-uri, nonce, persistent, persistent-template, random
-     , resourcet, safe, shakespeare, template-haskell, text, time
-     , transformers, unordered-containers, wai, yesod-core, yesod-form
-     , yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-auth";
-       version = "1.4.16";
-       sha256 = "a2c76409522ac276b92d31e13ffa94ae51194ffdb902a41f979d25181a5182d2";
-       libraryHaskellDepends = [
-         aeson authenticate base base16-bytestring base64-bytestring binary
-         blaze-builder blaze-html blaze-markup byteable bytestring conduit
-         conduit-extra containers cryptohash data-default email-validate
-         file-embed http-client http-conduit http-types lifted-base
-         mime-mail network-uri nonce persistent persistent-template random
-         resourcet safe shakespeare template-haskell text time transformers
-         unordered-containers wai yesod-core yesod-form yesod-persistent
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Authentication for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-auth_1_4_17" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -193920,7 +195472,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -194275,8 +195826,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.5.1";
-       sha256 = "034114dade5a23ec39ffeb9f78a04b7bd9fc0b8942b1a11118475e4c594863cd";
+       version = "1.5.2.1";
+       sha256 = "21e10e0f15af8505ae575103e3bad4f660a9ded28baccf275255c3f55d59ce57";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -194295,7 +195846,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "yesod-bin_1_5_2" = callPackage
+  "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
@@ -194309,8 +195860,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.5.2";
-       sha256 = "b37087eb7e167c2250dd23452e8f4858190db11570e540df44809c197219439a";
+       version = "1.5.2.2";
+       sha256 = "313344ed5230298436500b809c294700cf251c3b5198b6d58169fe89fe6d1438";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -194428,49 +195979,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
-     , cereal, clientsession, conduit, conduit-extra, containers, cookie
-     , criterion, data-default, deepseq, deepseq-generics, directory
-     , exceptions, fast-logger, hspec, hspec-expectations, http-types
-     , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random
-     , network, old-locale, parsec, path-pieces, primitive, QuickCheck
-     , random, resourcet, safe, semigroups, shakespeare
-     , streaming-commons, template-haskell, text, time, transformers
-     , transformers-base, unix-compat, unordered-containers, vector, wai
-     , wai-extra, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.4.31";
-       sha256 = "9a2e4c39c9ce66c2881d5da6c9a621c07492c950d935231aa7e12ed3a008d7af";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-builder blaze-html blaze-markup
-         byteable bytestring case-insensitive cereal clientsession conduit
-         conduit-extra containers cookie data-default deepseq
-         deepseq-generics directory exceptions fast-logger http-types
-         lifted-base monad-control monad-logger mtl mwc-random old-locale
-         parsec path-pieces primitive random resourcet safe semigroups
-         shakespeare template-haskell text time transformers
-         transformers-base unix-compat unordered-containers vector wai
-         wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring clientsession conduit
-         conduit-extra containers cookie hspec hspec-expectations http-types
-         HUnit lifted-base mwc-random network path-pieces QuickCheck random
-         resourcet shakespeare streaming-commons template-haskell text
-         transformers wai wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_4_32" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -194511,7 +196019,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -194653,23 +196160,6 @@ self: {
      }) {};
 
   "yesod-eventsource" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
-     , wai-eventsource, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-eventsource";
-       version = "1.4.0.1";
-       sha256 = "a5ec061ca8c426c4a8179bace45edd8100de96c947b8294445aae890dd175d48";
-       libraryHaskellDepends = [
-         base blaze-builder conduit transformers wai wai-eventsource
-         wai-extra yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Server-sent events support for Yesod apps";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-eventsource_1_4_1" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, transformers, wai
      , wai-eventsource, wai-extra, yesod-core
      }:
@@ -194684,7 +196174,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Server-sent events support for Yesod apps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-examples" = callPackage
@@ -194749,30 +196238,6 @@ self: {
      }) {};
 
   "yesod-form" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, byteable, bytestring, containers, data-default
-     , email-validate, hspec, network-uri, persistent, resourcet
-     , semigroups, shakespeare, template-haskell, text, time
-     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
-     }:
-     mkDerivation {
-       pname = "yesod-form";
-       version = "1.4.10";
-       sha256 = "ddeb72988e1dffb1c3766c35941520aa6ff6a8b09d6bdeb453d9c75d11ad8e43";
-       libraryHaskellDepends = [
-         aeson attoparsec base blaze-builder blaze-html blaze-markup
-         byteable bytestring containers data-default email-validate
-         network-uri persistent resourcet semigroups shakespeare
-         template-haskell text time transformers wai xss-sanitize yesod-core
-         yesod-persistent
-       ];
-       testHaskellDepends = [ base hspec text time ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Form handling support for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-form_1_4_11" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -194794,7 +196259,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-form-json" = callPackage
@@ -195102,28 +196566,6 @@ self: {
      }) {};
 
   "yesod-persistent" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
-     , persistent-sqlite, persistent-template, resource-pool, resourcet
-     , text, transformers, wai-extra, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-persistent";
-       version = "1.4.1.1";
-       sha256 = "dffd2604fc37a6b518c06391c44059df96895e3b484d4de8fbff9ff0869e7551";
-       libraryHaskellDepends = [
-         base blaze-builder conduit persistent persistent-template
-         resource-pool resourcet transformers yesod-core
-       ];
-       testHaskellDepends = [
-         base blaze-builder conduit hspec persistent persistent-sqlite text
-         wai-extra yesod-core
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Some helpers for using Persistent from Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-persistent_1_4_2" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -195143,7 +196585,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-platform" = callPackage
@@ -195528,41 +196969,6 @@ self: {
      }) {};
 
   "yesod-static" = callPackage
-    ({ mkDerivation, async, attoparsec, base, base64-bytestring
-     , blaze-builder, byteable, bytestring, conduit, conduit-extra
-     , containers, cryptohash, cryptohash-conduit, css-text
-     , data-default, directory, exceptions, file-embed, filepath
-     , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time
-     , process, resourcet, template-haskell, text, transformers
-     , unix-compat, unordered-containers, wai, wai-app-static, wai-extra
-     , yesod-core, yesod-test
-     }:
-     mkDerivation {
-       pname = "yesod-static";
-       version = "1.5.1.1";
-       sha256 = "cdb50763c4cbd2b8fcdb2b9f2f2526648e82454c62d49bfd6d165af80a192a92";
-       libraryHaskellDepends = [
-         async attoparsec base base64-bytestring blaze-builder byteable
-         bytestring conduit conduit-extra containers cryptohash
-         cryptohash-conduit css-text data-default directory exceptions
-         file-embed filepath hashable hjsmin http-types mime-types old-time
-         process resourcet template-haskell text transformers unix-compat
-         unordered-containers wai wai-app-static yesod-core
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring byteable bytestring conduit
-         conduit-extra containers cryptohash cryptohash-conduit data-default
-         directory exceptions file-embed filepath hjsmin hspec http-types
-         HUnit mime-types old-time process resourcet template-haskell text
-         transformers unix-compat unordered-containers wai wai-app-static
-         wai-extra yesod-core yesod-test
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Static file serving subsite for Yesod Web Framework";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-static_1_5_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, byteable, bytestring, conduit, conduit-extra
      , containers, cryptohash, cryptohash-conduit, css-text
@@ -195595,7 +197001,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-static-angular" = callPackage
@@ -195653,33 +197058,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, containers, cookie
-     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
-     , monad-control, network, persistent, pretty-show, text, time
-     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.5.4.1";
-       sha256 = "36c08c34d5fef656bb3469194b77b0802c60db4120af0f6dfd2b08f4a9d9659d";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive containers cookie hspec-core html-conduit
-         http-types HUnit monad-control network persistent pretty-show text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit
-         lifted-base text wai xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_5_5" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -195704,7 +197082,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -195808,24 +197185,6 @@ self: {
      }) {};
 
   "yesod-websockets" = callPackage
-    ({ mkDerivation, async, base, conduit, enclosed-exceptions
-     , monad-control, transformers, wai, wai-websockets, websockets
-     , yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-websockets";
-       version = "0.2.5";
-       sha256 = "c5f609aea82035a8bd43998f29bb2fc8547f72260dafdc9fdc44a7706975c944";
-       libraryHaskellDepends = [
-         async base conduit enclosed-exceptions monad-control transformers
-         wai wai-websockets websockets yesod-core
-       ];
-       homepage = "https://github.com/yesodweb/yesod";
-       description = "WebSockets support for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-websockets_0_2_6" = callPackage
     ({ mkDerivation, async, base, conduit, enclosed-exceptions
      , monad-control, transformers, wai, wai-websockets, websockets
      , yesod-core
@@ -195841,7 +197200,6 @@ self: {
        homepage = "https://github.com/yesodweb/yesod";
        description = "WebSockets support for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-websockets-extra" = callPackage
@@ -196956,6 +198314,105 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zifter" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
+     , filepath, genvalidity, genvalidity-hspec, hspec
+     , optparse-applicative, path, path-io, process, QuickCheck, safe
+     , stm, validity, validity-path
+     }:
+     mkDerivation {
+       pname = "zifter";
+       version = "0.0.1.0";
+       sha256 = "f161fdbc1db3ccfe65bb47552cabc883a7b5a99e12fb4c27015264fab7ac958a";
+       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
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "zifter";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "zifter-cabal" = callPackage
+    ({ mkDerivation, base, directory, filepath, path, path-io, process
+     , zifter
+     }:
+     mkDerivation {
+       pname = "zifter-cabal";
+       version = "0.0.0.0";
+       sha256 = "3ea3b662b68174f44d7e7eb2b5032d928743ecad3e7fa3a466194159c47929e4";
+       libraryHaskellDepends = [
+         base directory filepath path path-io process zifter
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "zifter-cabal";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "zifter-git" = callPackage
+    ({ mkDerivation, base, path, process, zifter }:
+     mkDerivation {
+       pname = "zifter-git";
+       version = "0.0.0.0";
+       sha256 = "92440ad0ca1e4b831d988b6b2fc339e45413ec9f8824bd6b7c6d496a8f520557";
+       libraryHaskellDepends = [ base path process zifter ];
+       homepage = "http://cs-syd.eu";
+       description = "zifter-git";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "zifter-hindent" = callPackage
+    ({ mkDerivation, base, directory, filepath, path, path-io, process
+     , safe, zifter
+     }:
+     mkDerivation {
+       pname = "zifter-hindent";
+       version = "0.0.0.0";
+       sha256 = "39ade41a13e0aa8b675a15cfeb34605eb4caa78f035fdd2470681c4814b16d06";
+       libraryHaskellDepends = [
+         base directory filepath path path-io process safe zifter
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "zifter-hindent";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "zifter-hlint" = callPackage
+    ({ mkDerivation, base, filepath, hlint, path, path-io, safe, zifter
+     }:
+     mkDerivation {
+       pname = "zifter-hlint";
+       version = "0.0.0.0";
+       sha256 = "d7588cfa7dc22acc664a1438881abca0b38789e787e1014d4a9a0a320b35772f";
+       libraryHaskellDepends = [
+         base filepath hlint path path-io safe zifter
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "zifter-hlint";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "zifter-stack" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, path, path-io
+     , process, zifter
+     }:
+     mkDerivation {
+       pname = "zifter-stack";
+       version = "0.0.0.2";
+       sha256 = "b4f1152e575692a270375ff925c01b6e11b6d63e45c60ff3a02a661da9ebaad7";
+       libraryHaskellDepends = [
+         base Cabal directory filepath path path-io process zifter
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "zifter-stack";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "zigbee-znet25" = callPackage
     ({ mkDerivation, base, bytestring, cereal, MissingH, mtl
      , QuickCheck, random, transformers
@@ -196996,31 +198453,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.8";
-       sha256 = "3b6addaaf314df1587baf8b5e0423cbfa9fc256a09a20c70e1a746a8067370d1";
-       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_9" = callPackage
     ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
      , cereal, conduit, conduit-extra, containers, digest, exceptions
      , filepath, hspec, mtl, path, path-io, plan-b, QuickCheck
@@ -197042,7 +198474,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
@@ -197175,6 +198607,48 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ziptastic-client" = 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.1";
+       sha256 = "dbe176c9a0bbb2b612fdabdde49ef92b89b5313913133b6582a170b692b0649a";
+       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;
+     }) {};
+
+  "ziptastic-core" = 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.1";
+       sha256 = "1512fe53b08e157895d5ae449cfe3ba65c859057394fa0bd9b4158f8c4502532";
+       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;
+     }) {};
+
   "zlib_0_5_4_2" = callPackage
     ({ mkDerivation, base, bytestring, zlib }:
      mkDerivation {

From 6236cd47166a1e35ed7712e480065ec4e3ebc180 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sun, 12 Mar 2017 18:12:35 -0400
Subject: [PATCH 2629/3449] pointfree: patch is no longer needed

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 85839b6492a2..1f38ebac54a9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -824,12 +824,6 @@ self: super: {
   # https://github.com/xmonad/xmonad-extras/issues/3
   xmonad-extras = doJailbreak super.xmonad-extras;
 
-  # https://github.com/bmillwood/pointfree/issues/21
-  pointfree = appendPatch super.pointfree (pkgs.fetchpatch {
-    url = "https://github.com/bmillwood/pointfree/pull/22.patch";
-    sha256 = "04q0b5d78ill2yrpflkphvk2y38qc50si2qff4bllp47wj42aqmp";
-  });
-
   # https://github.com/int-e/QuickCheck-safe/issues/2
   QuickCheck-safe = doJailbreak super.QuickCheck-safe;
 

From d59fe189fd5c2c1094086e847cef3b5b7fb84a31 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 18 Mar 2017 18:36:45 +0100
Subject: [PATCH 2630/3449] haskell-configuration-nix: drop obsolete
 webkit-related overrides

---
 pkgs/development/haskell-modules/configuration-nix.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 981a48055bcc..017f2ea7637a 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -131,8 +131,6 @@ self: super: builtins.intersectAttrs super {
 
   # Need WebkitGTK, not just webkit.
   webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
-  webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
-  webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
 
   hs-mesos = overrideCabal super.hs-mesos (drv: {
@@ -433,10 +431,6 @@ self: super: builtins.intersectAttrs super {
   # This propagates this to everything depending on haskell-gi-base
   haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
 
-  # requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
-  gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
-  gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
-
   # Requires gi-javascriptcore API version 4
   gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; };
 

From ea80c91bd3ed42f74dee05a9d3c4866f1ba8cede Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Mon, 20 Mar 2017 08:19:05 +0100
Subject: [PATCH 2631/3449] pijul: init at 0.3.0 (re-init)

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

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
new file mode 100644
index 000000000000..3bbb9ba1bbf6
--- /dev/null
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, rustPlatform, perl, darwin }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "pijul-${version}";
+  version = "0.3";
+
+  src = fetchurl {
+    url = "https://pijul.org/releases/${name}.tar.gz";
+    sha256 = "2c7b354b4ab142ac50a85d70c80949ff864377b37727b862d103d3407e2c7818";
+  };
+
+  sourceRoot = "pijul/pijul";
+
+  buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin
+    (with darwin.apple_sdk.frameworks; [ Security ]);
+
+  doCheck = false;
+  
+  depsSha256 = "03bb92mn16d38l49x4p1z21k7gvq3l3ki10brr13p7yv45rwvmzc";
+
+  meta = with stdenv.lib; {
+    description = "A distributed version control system";
+    homepage = https://pijul.org;
+    license = with licenses; [ gpl2Plus ];
+    maintainers = [ maintainers.gal_bolle ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63821dedc2b1..3a7e73cc6f91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14713,6 +14713,8 @@ with pkgs;
 
   pig = callPackage ../applications/networking/cluster/pig { };
 
+  pijul = callPackage ../applications/version-management/pijul {};
+
   planner = callPackage ../applications/office/planner { };
 
   playonlinux = callPackage ../applications/misc/playonlinux {

From 6c0569e3891189a62ed27dce361f5d05f650d023 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 20 Mar 2017 12:08:43 +0800
Subject: [PATCH 2632/3449] terraform: 0.9.0 -> 0.9.1

---
 .../networking/cluster/terraform/default.nix           | 10 +++-------
 pkgs/top-level/all-packages.nix                        |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 7e5a1121be91..a1bcd027f6ad 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -48,12 +48,8 @@ in rec {
     sha256 = "0ibgpcpvz0bmn3cw60nzsabsrxrbmmym1hv7fx6zmjxiwd68w5gb";
   };
 
-  terraform_0_9_0 = generic {
-    version = "0.9.0";
-    sha256 = "1v96qgc6pd1bkwvkz855625xdcy7xb5lk60lg70144idqmwfjb9g";
+  terraform_0_9_1 = generic {
+    version = "0.9.1";
+    sha256 = "081p6dlvkg9mgaz49ichxzlk1ks0rxa7nvilaq8jj1gq3jvylqnh";
   };
-
-  terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_0;
-  terraform = terraform_0_9;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9fc039398556..341bb0286257 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18095,10 +18095,10 @@ with pkgs;
   inherit (callPackage ../applications/networking/cluster/terraform {})
     terraform_0_8_5
     terraform_0_8_8
-    terraform_0_9_0;
+    terraform_0_9_1;
 
   terraform_0_8 = terraform_0_8_8;
-  terraform_0_9 = terraform_0_9_0;
+  terraform_0_9 = terraform_0_9_1;
   terraform = terraform_0_8;
 
   terragrunt = callPackage ../applications/networking/cluster/terragrunt {

From 20194e2696a276937bfe7b448951036831c69700 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 20 Mar 2017 10:42:43 +0100
Subject: [PATCH 2633/3449] dd-agent: bind to pymongo 2.9.1 to fix the MongoDB
 monitoring

---
 pkgs/tools/networking/dd-agent/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index ddef8a70012d..fa18e6c0ce56 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
     pythonPackages.ntplib
     pythonPackages.simplejson
     pythonPackages.pyyaml
-    pythonPackages.pymongo
+    pythonPackages.pymongo_2_9_1
     pythonPackages.python-etcd
     pythonPackages.consul
     docker_1_10

From c031adedbac742d15478ea987a45bb33763188e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 20 Mar 2017 10:55:52 +0100
Subject: [PATCH 2634/3449] hplip: 3.16.5 -> 3.16.11

fixes #24109
---
 pkgs/misc/drivers/hplip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index c0a6c0a9baa0..0e53bdf7f656 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -10,16 +10,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.16.5";
+  version = "3.16.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "1nay65q1zmx2jxiwn66n7mlr73azacz5097gw98kqqf90dh522f6";
+    sha256 = "094vkyr0rjng72m13dgr824cdl7q20x23qjxzih4w7l9njn0rqpn";
   };
 
   plugin = fetchurl {
     url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "15qrcd3ndnxri6pfdfmsjyv2f3zfkig80yghs76jbsm106rp8g3q";
+    sha256 = "1y3wdax2wb6kdd8bi40wl7v9s8ffyjz95bz42sjcpzzddmlhcaxg";
   };
 
   hplipState =

From a3b3a7ffb18e6abd33cd30206791e0cfd29a48d4 Mon Sep 17 00:00:00 2001
From: 2chilled <matthias.mh.herrmann@googlemail.com>
Date: Mon, 20 Mar 2017 11:39:53 +0100
Subject: [PATCH 2635/3449] rawtherapee: 5.0-r1 -> 5.0-r1 with gtk3 support
 (#22911)

---
 pkgs/applications/graphics/rawtherapee/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index 53fdc67cf242..97d04b036228 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau
-, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm3, libXau
+, libXdmcp, lcms2, libiptcdata, libcanberra_gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -9,15 +9,17 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Beep6581";
     repo = "RawTherapee";
-    rev = "1077c4ba2e2dbe249884e6974c6050db8eb5e9c2";
-    sha256 = "1xqmkwprk3h9nhy6q562mkjdpynyg9ff7a92sdga50k56gi0aj0s";
+    rev = version + "-gtk3";
+    sha256 = "06v3ir5562yg4zk9z8kc8a7sw7da88193sizjlk74gh5d3smgr4q";
   };
 
   buildInputs = [
-    pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp
-    lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx
+    pkgconfig cmake pixman libpthreadstubs gtkmm3 libXau libXdmcp
+    lcms2 libiptcdata libcanberra_gtk3 fftw expat pcre libsigcxx
   ];
 
+  nativeBuildInputs = [ wrapGAppsHook ];
+
   cmakeFlags = [
     "-DPROC_TARGET_NUMBER=2"
   ];

From 596e10c2368afef49eeb2288637e656ed17f3057 Mon Sep 17 00:00:00 2001
From: mimadrid <mimadrid@ucm.es>
Date: Mon, 20 Mar 2017 11:40:32 +0100
Subject: [PATCH 2636/3449] yed: 3.16.2.1 -> 3.17

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

diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index d97a970df2a5..9af46f5cb358 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "yEd-${version}";
-  version = "3.16.2.1";
+  version = "3.17";
 
   src = requireFile {
     name = "${name}.zip";
     url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "019qfmdifqsrc9h4g3zbn7ivdc0dzlp3isa5ixdkgdhfsdm79b27";
+    sha256 = "1wk58cql90y3i5l7jlxqfjjgf26i0zrv5cn0p9npgagaw6aiw2za";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];

From 21439ef4168c3e1b363d3cba471ff2b50b195a9b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 15:20:54 +0300
Subject: [PATCH 2637/3449] samba: enable parallel building

---
 pkgs/servers/samba/4.x.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 51bee4f0b4c9..31867bee1055 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -66,7 +66,8 @@ stdenv.mkDerivation rec {
     ++ optional (!enableDomainController) "--without-ad-dc"
     ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
 
-  enableParallelBuilding = true;
+  # To build in parallel.
+  buildPhase = "python buildtools/bin/waf build -j $NIX_BUILD_CORES";
 
   # Some libraries don't have /lib/samba in RPATH but need it.
   # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \;

From 428a6ddf4f5a4715766e143457dd0db5e8169538 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Mon, 20 Mar 2017 21:48:38 +0900
Subject: [PATCH 2638/3449] albert: 0.9.4 -> 0.10.0

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

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index 986b3fe8f77c..2bbac699a3e3 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.9.4";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
-    owner  = "manuelschneid3r";
+    owner  = "albertlauncher";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "131ij525rgh2j9m2vydh79wm4bs0p3x27crar9f16rqhz15gkcpl";
+    sha256 = "1r8m0b6lqljy314ilpi58sdpqyb9rr502nzx3pgmx2g2xz4izsfj";
   };
 
   nativeBuildInputs = [ cmake makeQtWrapper ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage    = https://github.com/manuelSchneid3r/albert;
+    homepage    = https://albertlauncher.github.io/;
     description = "Desktop agnostic launcher";
     license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ ericsagnes ];

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 2639/3449] 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 bafd65e8c93e..0e0697dfb211 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 2591a43f1d47..947c0e30f993 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 000000000000..b615f1482b7c
--- /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 bb9316512ecd..f8d1506cca34 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 000000000000..20c408bfae23
--- /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 1f0ce0eaf8ca840e769615acc7581bd71268ca44 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 20 Mar 2017 16:15:38 +0300
Subject: [PATCH 2640/3449] makeTest: don't rely on makeWrapper not quoting
 newlines

---
 nixos/lib/testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index c1cb5072acad..8539fef0a19d 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -108,16 +108,16 @@ rec {
           mkdir -p $out/bin
           echo "$testScript" > $out/test-script
           ln -s ${testDriver}/bin/nixos-test-driver $out/bin/
-          vms="$(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)"
+          vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done))
           wrapProgram $out/bin/nixos-test-driver \
-            --add-flags "$vms" \
+            --add-flags "''${vms[*]}" \
             ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
             --run "testScript=\"\$(cat $out/test-script)\"" \
             --set testScript '$testScript' \
             --set VLANS '${toString vlans}'
           ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
           wrapProgram $out/bin/nixos-run-vms \
-            --add-flags "$vms" \
+            --add-flags "''${vms[*]}" \
             ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \
             --set tests 'startAll; joinAll;' \
             --set VLANS '${toString vlans}' \

From f9e8ef7e6d8b9df759a9cb6f7a1c3218684331ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20S=C3=B8holm?= <k.soeholm@gmail.com>
Date: Mon, 20 Mar 2017 14:28:02 +0100
Subject: [PATCH 2641/3449] nixos/bluetooth: add extraConfig option (#23427)

---
 nixos/modules/services/hardware/bluetooth.nix | 29 +++++++++++++++----
 pkgs/os-specific/linux/bluez/bluez5.nix       |  4 +++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 71b3a93a2e0d..f1fcb4369346 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -14,12 +14,26 @@ in
 
   options = {
 
-    hardware.bluetooth.enable = mkEnableOption "support for Bluetooth.";
+    hardware.bluetooth = {
+      enable = mkEnableOption "support for Bluetooth.";
 
-    hardware.bluetooth.powerOnBoot = mkOption {
-      type    = types.bool;
-      default = true;
-      description = "Whether to power up the default Bluetooth controller on boot.";
+      powerOnBoot = mkOption {
+        type    = types.bool;
+        default = true;
+        description = "Whether to power up the default Bluetooth controller on boot.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          [General]
+          ControllerMode = bredr
+        '';
+        description = ''
+          Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
+        '';
+      };
     };
 
   };
@@ -30,6 +44,11 @@ in
 
     environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
 
+    environment.etc = singleton {
+      source = pkgs.writeText "main.conf" cfg.extraConfig;
+      target = "bluetooth/main.conf";
+    };
+
     services.udev.packages = [ bluez-bluetooth ];
     services.dbus.packages = [ bluez-bluetooth ];
     systemd.packages       = [ bluez-bluetooth ];
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 6185e22fb875..9149f6da033b 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
     mkdir $out/sbin
     ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
     ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
+
+    # Add extra configuration
+    mkdir $out/etc/bluetooth
+    ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
   '';
 
   enableParallelBuilding = true;

From 72de3d7d6eca340b206f487845ce9140c00871a8 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Mon, 20 Mar 2017 14:41:41 +0100
Subject: [PATCH 2642/3449] yaws: erlang R17 -> R18

---
 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 166a0dfc16e1..f6073b15ede0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11096,7 +11096,7 @@ with pkgs;
 
   xwayland = callPackage ../servers/x11/xorg/xwayland.nix { };
 
-  yaws = callPackage ../servers/http/yaws { erlang = erlangR17; };
+  yaws = callPackage ../servers/http/yaws { };
 
   zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {});
 

From 7b27e1c3c9b3069239b11f8c62f8ef6e95a4fb48 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 20 Mar 2017 14:37:22 +0100
Subject: [PATCH 2643/3449] wireshark: 2.2.4 -> 2.2.5 for multiple CVEs

Fixes:

  * CVE-2017-5596
  * CVE-2017-5597
  * CVE-2017-6467
  * CVE-2017-6468
  * CVE-2017-6469
  * CVE-2017-6470
  * CVE-2017-6471
  * CVE-2017-6472
  * CVE-2017-6473
  * CVE-2017-6474
---
 .../networking/sniffers/wireshark/default.nix        | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 375a948c1f20..c8880e630a6d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.2.4";
+  version = "2.2.5";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "049r5962yrajhhz9r4dsnx403dab50d6091y2mw298ymxqszp9s2";
+    sha256 = "1j4sc3pmy8l6k41007spglcqiabjlzc7f85pn3jmjr9ksv9qipbm";
   };
 
   nativeBuildInputs = [
@@ -35,13 +35,7 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isLinux  [ libcap libnl ]
     ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ];
 
-  patches = [ ./wireshark-lookup-dumpcap-in-path.patch
-  (fetchurl {
-    url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=c7042bedbb3b12c5f4e19e59e52da370d4ffe62f;hp=bc2b135677110d8065ba1174f09bc7f5ba73b9e9";
-    sha256 = "1m70akywf2r52lhlvzr720vl1i7ng9cqbzaiif8s81xs4g4nn2rz";
-    name = "wireshark-CVE-2017-6014.patch";
-  })
-  ];
+  patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
 
   postInstall = optionalString (withQt || withGtk) ''
     ${optionalString withGtk ''

From 82969c69d3b2df0215d9e46ec70323b89f0a4079 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Mon, 20 Mar 2017 15:01:07 +0100
Subject: [PATCH 2644/3449] couchdb: R16 -> R17

---
 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 f6073b15ede0..e34a1ae29101 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10531,7 +10531,7 @@ with pkgs;
     spidermonkey = spidermonkey_1_8_5;
     python = python27;
     sphinx = python27Packages.sphinx;
-    erlang = erlangR16;
+    erlang = erlangR17;
   };
 
   couchdb2 = callPackage ../servers/http/couchdb/2.0.0.nix {

From ed59de18b5e98f6e71a5fd8efa2ff5104353cd8b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 15:05:21 +0100
Subject: [PATCH 2645/3449] fast-neural-doodle: mark as broken

---
 pkgs/tools/graphics/fast-neural-doodle/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix
index 5769336693d4..5d42482b3091 100644
--- a/pkgs/tools/graphics/fast-neural-doodle/default.nix
+++ b/pkgs/tools/graphics/fast-neural-doodle/default.nix
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.mit;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;
+    broken = true;
   };
 }

From d709cdd8291cdab2e3fbfc979025e1de2005d332 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 20 Mar 2017 09:22:04 -0500
Subject: [PATCH 2646/3449] nixos/plasma5: do not set kimpanel as default IBus
 panel

kimpanel does not show installed IBus engines or allow switching input
methods. kimpanel does show configured keyboard layouts through kxkb, so I
believe there is some problem communicating with IBus. No error messages are
produced in the log and I have been unable to discover the cause. I have no
intention of continuing to work on kimpanel at this time, so it should be
disabled. The GTK+ 3-based panel provided by IBus is perfectly serviceable in
the interim.
---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index bc6e728169b4..f923d86265f2 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -225,11 +225,6 @@ in
       security.pam.services.sddm.enableKwallet = true;
       security.pam.services.slim.enableKwallet = true;
 
-      # use kimpanel as the default IBus panel
-      i18n.inputMethod.ibus.panel =
-        lib.mkDefault
-        "${plasma5.plasma-desktop}/lib/libexec/kimpanel-ibus-panel";
-
     })
   ];
 

From 07252dc83bac056fbca0e646228853350ef33f64 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 16:04:37 +0100
Subject: [PATCH 2647/3449] virtualbox: 5.1.14 -> 5.1.18

---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 14121660fa85..257c419d88cf 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,10 +18,10 @@ let
   python = python2;
   buildType = "release";
 
-  extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85";
-  extpackRev = 112924;
-  main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a";
-  version = "5.1.14";
+  extpack = "996f783996a597d3936fc5f1ccf56edd31ae1f8fb4d527009647d9a2c8c853cd";
+  extpackRev = "114002";
+  main = "7ed0959bbbd02826b86b3d5dc8348931ddfab267c31f8ed36ee53c12f5522cd9";
+  version = "5.1.18";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 6e58d42a1cb5..df59f3e0e2e1 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a";
+    sha256 = "f2951b49f48a560fbc1afe9d135d1f3f82a3e158b9002278d05d978428adca8a";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

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 2648/3449] 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 3705fd468f61..66b88eab09bc 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 2649/3449] 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 682123d924e0..988b4f711cb3 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 c3ef5470aebf..741fb675d614 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 8d182a7e6b61c9487e0a7012a4511a3863f214e3 Mon Sep 17 00:00:00 2001
From: Adelbert Chang <adelbertc@gmail.com>
Date: Mon, 20 Mar 2017 09:04:40 -0700
Subject: [PATCH 2650/3449] coursier: makeWrapper as nativeBuildInputs, add
 adelbertc and nequissimus as maintainers

---
 lib/maintainers.nix                         | 1 +
 pkgs/development/tools/coursier/default.nix | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d6cb2722b33c..7efb328c0833 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -14,6 +14,7 @@
   aboseley = "Adam Boseley <adam.boseley@gmail.com>";
   abuibrahim = "Ruslan Babayev <ruslan@babayev.com>";
   acowley = "Anthony Cowley <acowley@gmail.com>";
+  adelbertc = "Adelbert Chang <adelbertc@gmail.com>";
   adev = "Adrien Devresse <adev@adev.name>";
   Adjective-Object = "Maxwell Huang-Hobbs <mhuan13@gmail.com>";
   adnelson = "Allen Nelson <ithinkican@gmail.com>";
diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix
index 70003bc8802e..7a2b3e8e1d97 100644
--- a/pkgs/development/tools/coursier/default.nix
+++ b/pkgs/development/tools/coursier/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "610c5fc08d0137c5270cefd14623120ab10cd81b9f48e43093893ac8d00484c9";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   phases = "installPhase";
 
@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     homepage    = http://get-coursier.io/;
     description = "A Scala library to fetch dependencies from Maven / Ivy repositories";
     license     = licenses.asl20;
+    maintainers = with maintainers; [ adelbertc nequissimus ];
   };
 }

From 853d01fe4164936175854a7fdb814deda63d60ce Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 20 Mar 2017 12:18:04 -0400
Subject: [PATCH 2651/3449] terraform: disable tests on old versions

---
 pkgs/applications/networking/cluster/terraform/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a1bcd027f6ad..a91a28deba12 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -27,7 +27,7 @@ let
       export HOME=$TMP
     '';
 
-    doCheck = true;
+    doCheck = builtins.compareVersions version "0.8.8" >= 0;
 
     meta = with stdenv.lib; {
       description = "Tool for building, changing, and versioning infrastructure";

From cd426e66b83c2f0487bca8e4b5ca157faf5d9e30 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 19 Mar 2017 17:21:34 -0400
Subject: [PATCH 2652/3449] friday-juicypixels: disable tests

the tarball from
https://hackage.haskell.org/package/friday-juicypixels-0.1.2/friday-juicypixels-0.1.2.tar.gz
does not include the test/rgba8.png file, which causes the test
code to fail
---
 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 8811a7b093ab..e8e573bb8319 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -282,6 +282,7 @@ self: super: {
   etcd = dontCheck super.etcd;
   fb = dontCheck super.fb;                              # needs credentials for Facebook
   fptest = dontCheck super.fptest;                      # http://hydra.cryp.to/build/499124/log/raw
+  friday-juicypixels = dontCheck super.friday-juicypixels; #tarball missing test/rgba8.png
   ghc-events = dontCheck super.ghc-events;              # http://hydra.cryp.to/build/498226/log/raw
   ghc-events-parallel = dontCheck super.ghc-events-parallel;    # http://hydra.cryp.to/build/496828/log/raw
   ghc-imported-from = dontCheck super.ghc-imported-from;

From 4e5461127dd045be941d7bcf194c5794246241f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 14:04:46 +0100
Subject: [PATCH 2653/3449] apache-httpd: Strip modules

We did this for 2.2 (cc61d31902d67b94333f53a5ab5772330bbc21cc) but
lost this for 2.4. This reduces the Apache closure size from 312 MiB
to 102 MiB (primarily by getting rid of -dev outputs).
---
 pkgs/servers/http/apache-httpd/2.4.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index e9c1ec8b7242..f70d6266e8d7 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     configureFlags="$configureFlags --includedir=$dev/include"
   '';
+
   configureFlags = ''
     --with-apr=${apr.dev}
     --with-apr-util=${aprutil.dev}
@@ -67,6 +68,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  stripDebugList = "lib modules bin";
+
   postInstall = ''
     mkdir -p $doc/share/doc/httpd
     mv $out/manual $doc/share/doc/httpd

From 96d7f35e96f5b8baa249ce1d7b237a3f34ee87ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 14:19:50 +0100
Subject: [PATCH 2654/3449] diffoscope: Don't propagate build inputs

This reduces the runtime closure size from 297 to 132 MiB.
---
 pkgs/tools/misc/diffoscope/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 6a9763666d3b..4f0a9ba12c11 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -29,11 +29,13 @@ python3.pkgs.buildPythonApplication rec {
   # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
-  propagatedBuildInputs = (with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ]) ++
+  buildInputs =
     map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils sng sqlite squashfsTools unzip vim xz colordiff
     ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]);
 
+  pythonPath = with python3.pkgs; [ debian libarchive-c python_magic tlsh rpm ];
+
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 
   postInstall = ''

From 3ab897c6cf3668b96f8e02c4da7108c1d6f2ea4c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 14:41:25 +0100
Subject: [PATCH 2655/3449] gconf: Use a dev output

This reduces the closure size of gconf from 225 to 63 MiB.
---
 pkgs/desktops/gnome-3/3.22/core/gconf/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
index a4cb3e8c1464..d3b2d814b164 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
 
   # ToDo: ldap reported as not found but afterwards reported as supported
 
+  outputs = [ "out" "dev" ];
+
   meta = with stdenv.lib; {
     homepage = http://projects.gnome.org/gconf/;
     description = "A system for storing application preferences";

From 1824832e177e440d2489333f17deca12e4e08f5a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 14:43:55 +0100
Subject: [PATCH 2656/3449] rtmpdump: Use multiple outputs

This reduces the runtime closure size from 80 to 23 MiB.
---
 pkgs/tools/video/rtmpdump/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix
index 547700639bb9..4eec47e9e759 100644
--- a/pkgs/tools/video/rtmpdump/default.nix
+++ b/pkgs/tools/video/rtmpdump/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     ++ optionals gnutlsSupport [ gnutls nettle ]
     ++ optional opensslSupport openssl;
 
+  outputs = [ "out" "dev" ];
+
   meta = {
     description = "Toolkit for RTMP streams";
     homepage    = http://rtmpdump.mplayerhq.hu/;

From f6c73f1e37c735abb686d07449f349b796c54cf8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 15:04:18 +0100
Subject: [PATCH 2657/3449] subversion: Clean up more *.la files

This removes some -dev paths from the closure of subversionClient and
gitFull.
---
 pkgs/applications/version-management/subversion/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index eddbc0e56dd6..17ff3e4b19f3 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -26,8 +26,8 @@ let
       inherit sha256;
     };
 
-  # Can't do separate $lib and $bin, as libs reference bins
-  outputs = [ "out" "dev" "man" ];
+    # Can't do separate $lib and $bin, as libs reference bins
+    outputs = [ "out" "dev" "man" ];
 
     buildInputs = [ zlib apr aprutil sqlite openssl ]
       ++ stdenv.lib.optional httpSupport serf
@@ -75,7 +75,7 @@ let
       mkdir -p $out/share/bash-completion/completions
       cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
 
-      for f in $out/lib/*.la; do
+      for f in $out/lib/*.la $out/lib/python*/site-packages/*/*.la; do
         substituteInPlace $f \
           --replace "${expat.dev}/lib" "${expat.out}/lib" \
           --replace "${zlib.dev}/lib" "${zlib.out}/lib" \

From 7c60ba1d41485676d86fe4acf277878e3bcb9554 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 15:18:56 +0100
Subject: [PATCH 2658/3449] ibus: Use dev output

This removes glib.dev from the runtime closure, reducing its size from
357 to 253 MiB.
---
 pkgs/tools/inputmethods/ibus/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 58afb638b470..de375ed4529d 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
+  outputs = [ "out" "dev" ];
+
   preConfigure = ''
     # Fix hard-coded installation paths, so make does not try to overwrite our
     # Python installation.

From 6dd5846f1bdd759b25a754b5d47d2d495b8bf39b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 16:24:16 +0100
Subject: [PATCH 2659/3449] system-config-printer: Strip binaries in $out/etc

This reduces its closure size from 484 to 281 MiB.
---
 pkgs/tools/misc/system-config-printer/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index fc4a24ec355b..a828a5fc43c0 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -35,6 +35,8 @@ in stdenv.mkDerivation rec {
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     ];
 
+  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 ];

From 5897aa771c18de45551d23dd45d0cc9f0935c6fb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 16:26:04 +0100
Subject: [PATCH 2660/3449] system-config-printer: Remove -dev paths from
 closure

Workaround for #24128.
---
 pkgs/tools/misc/system-config-printer/default.nix | 5 ++---
 pkgs/top-level/python-packages.nix                | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index a828a5fc43c0..f1a9c4b4640a 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -16,8 +16,6 @@ in stdenv.mkDerivation rec {
     sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn";
   };
 
-  propagatedBuildInputs = [ pythonPackages.pycurl ];
-
   patches = [ ./detect_serverbindir.patch ];
 
   buildInputs =
@@ -27,7 +25,7 @@ in stdenv.mkDerivation rec {
     ];
 
   pythonPath = with pythonPackages;
-    [ pycups pycurl dbus-python pygobject3 requests2 pycairo ];
+    [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ];
 
   configureFlags =
     [ "--with-udev-rules"
@@ -46,6 +44,7 @@ in stdenv.mkDerivation rec {
           --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" \
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf06f64421e1..5923b06960a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20080,7 +20080,7 @@ in {
       sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf";
     };
 
-    propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
+    buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
 
     # error: invalid command 'test'
     doCheck = false;

From 3ff08d6f135b670e657d913404896e75109ded27 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 16:49:45 +0100
Subject: [PATCH 2661/3449] php: Strip modules

This reduces the closure size from 566 to 438 MiB.
---
 pkgs/development/interpreters/php/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 116d4adf204d..7b1379ae6d7c 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -306,6 +306,8 @@ let
         substituteInPlace configure --replace "-lstdc++" "-lc++"
       '';
 
+      stripDebugList = "bin sbin lib modules";
+
     });
 
 in {

From b751036a747222822594e875604c0d9cdc3f798e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Mar 2017 16:56:12 +0100
Subject: [PATCH 2662/3449] php: Add a dev output

This reduces the closure size from 438 to 174 MiB.
---
 pkgs/development/interpreters/php/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7b1379ae6d7c..c3f56b4c6649 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -308,6 +308,8 @@ let
 
       stripDebugList = "bin sbin lib modules";
 
+      outputs = [ "out" "dev" ];
+
     });
 
 in {

From 7151e7488378e8b23de8623a11524139939a30fb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 20 Mar 2017 19:05:22 +0100
Subject: [PATCH 2663/3449] nixos: enable nginx test

cc #23279
---
 nixos/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index d5cea1fe96c8..cf7f0a63f4b2 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -280,6 +280,7 @@ in rec {
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
   tests.nfs4 = callTest tests/nfs.nix { version = 4; };
+  tests.nginx = callTest tests/nginx.nix { };
   tests.leaps = callTest tests/leaps.nix { };
   tests.nsd = callTest tests/nsd.nix {};
   tests.openssh = callTest tests/openssh.nix {};

From 68c6d90417c5fc0d75c140e5e51e4f026cd6edff Mon Sep 17 00:00:00 2001
From: Philipp Steinpass <philipp@xndr.de>
Date: Mon, 20 Mar 2017 19:06:16 +0100
Subject: [PATCH 2664/3449] Added option and description for nix store
 auto-optimisation.

---
 nixos/modules/services/misc/nix-daemon.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 5088c4e60691..fed646aadac4 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -46,6 +46,7 @@ let
         binary-caches = ${toString cfg.binaryCaches}
         trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
         binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys}
+        auto-optimise-store = ${toString cfg.autoOptimiseStore}
         ${optionalString cfg.requireSignedBinaryCaches ''
           signed-binary-caches = *
         ''}
@@ -86,6 +87,18 @@ in
         '';
       };
 
+      autoOptimiseStore = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = ''
+         If set to true, Nix automatically detects files in the store that have
+         identical contents, and replaces them with hard links to a single copy.
+         This saves disk space. If set to false (the default), you can still run
+         nix-store --optimise to get rid of duplicate files.
+        '';
+      };
+
       buildCores = mkOption {
         type = types.int;
         default = 1;

From c13922f0120d43f491ee286fd9362dd12833b9e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 20 Mar 2017 19:58:52 +0100
Subject: [PATCH 2665/3449] nginx: explicitly use stable version

Also updates the documention of the NixOS option `services.nginx.package`
that upstream recommends using the mainline version instead.

Fixes #21665.
---
 nixos/modules/services/web-servers/nginx/default.nix | 8 +++++---
 pkgs/servers/http/nginx/generic.nix                  | 2 +-
 pkgs/top-level/all-packages.nix                      | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 548467ae7856..4e57b920a7d8 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -246,11 +246,13 @@ in
       };
 
       package = mkOption {
-        default = pkgs.nginx;
-        defaultText = "pkgs.nginx";
+        default = pkgs.nginxStable;
+        defaultText = "pkgs.nginxStable";
         type = types.package;
         description = "
-          Nginx package to use.
+          Nginx package to use. This defaults to the stable version. Note
+          that the nginx team recommends to use the mainline version which
+          available in nixpkgs as <literal>nginxMainline</literal>.
         ";
       };
 
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 5d5a98ad8a8f..dfde20452723 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -62,6 +62,6 @@ stdenv.mkDerivation {
     homepage    = http://nginx.org;
     license     = licenses.bsd2;
     platforms   = platforms.all;
-    maintainers = with maintainers; [ thoughtpolice raskin ];
+    maintainers = with maintainers; [ thoughtpolice raskin fpletz ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 144fcbd27295..2e72eda08f5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10687,7 +10687,9 @@ with pkgs;
 
   neard = callPackage ../servers/neard { };
 
-  nginx = callPackage ../servers/http/nginx/stable.nix {
+  nginx = nginxStable;
+
+  nginxStable = callPackage ../servers/http/nginx/stable.nix {
     # We don't use `with` statement here on purpose!
     # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334
     modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];

From 315e1a23c0ae1e8d30cee4de5908ce2bd2337968 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 20 Mar 2017 20:41:37 +0100
Subject: [PATCH 2666/3449] doc: Add rust documentation (#23510)

---
 doc/default.nix                    |  4 ++
 doc/languages-frameworks/index.xml |  1 +
 doc/languages-frameworks/rust.md   | 91 ++++++++++++++++++++++++++++++
 3 files changed, 96 insertions(+)
 create mode 100644 doc/languages-frameworks/rust.md

diff --git a/doc/default.nix b/doc/default.nix
index eaf3bb8d7a89..540a209c2ac9 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -68,6 +68,10 @@ pkgs.stdenv.mkDerivation {
       inputFile = ../pkgs/development/r-modules/README.md;
       outputFile = "languages-frameworks/r.xml";
     }
+  + toDocbook {
+      inputFile = ./languages-frameworks/rust.md;
+      outputFile = "./languages-frameworks/rust.xml";
+    }
   + toDocbook {
       inputFile = ./languages-frameworks/vim.md;
       outputFile = "./languages-frameworks/vim.xml";
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 32a89860ec84..fc15d847d15f 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -27,6 +27,7 @@ such as Perl or Haskell.  These are described in this chapter.</para>
 <xi:include href="qt.xml" />
 <xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md  -->
 <xi:include href="ruby.xml" />
+<xi:include href="rust.xml" />
 <xi:include href="texlive.xml" />
 <xi:include href="vim.xml" />
 
diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
new file mode 100644
index 000000000000..f4370d5e7067
--- /dev/null
+++ b/doc/languages-frameworks/rust.md
@@ -0,0 +1,91 @@
+---
+title: Rust
+author: Matthias Beyer
+date: 2017-03-05
+---
+
+# User's Guide to the Rust Infrastructure
+
+To install the rust compiler and cargo put
+
+```
+rustStable.rustc
+rustStable.cargo
+```
+
+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)
+
+## Packaging Rust applications
+
+Rust applications are packaged by using the `buildRustPackage` helper from `rustPlatform`:
+
+```
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "ripgrep-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "BurntSushi";
+    repo = "ripgrep";
+    rev = "${version}";
+    sha256 = "0y5d1n6hkw85jb3rblcxqas2fp82h3nghssa4xqrhqnz25l799pj";
+  };
+
+  depsSha256 = "0q68qyl2h6i0qsz82z840myxlnjay8p1w5z7hfyr8fqp7wgwa9cx";
+
+  meta = with stdenv.lib; {
+    description = "A utility that combines the usability of The Silver Searcher with the raw speed of grep";
+    homepage = https://github.com/BurntSushi/ripgrep;
+    license = with licenses; [ unlicense ];
+    maintainers = [ maintainers.tailhook ];
+    platforms = platforms.all;
+  };
+}
+```
+
+`buildRustPackage` requires a `depsSha256` attribute which is computed over
+all crate sources of this package. Currently it is obtained by inserting a
+fake checksum into the expression and building the package once. The correct
+checksum can be then take from the failed build.
+
+To install crates with nix there is also an experimental project called
+[nixcrates](https://github.com/fractalide/nixcrates).
+
+## Using the Rust nightlies overlay
+
+Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.
+This overlay can _also_ be used to install recent unstable or stable versions
+of Rust, if desired.
+
+To use this overlay, clone
+[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla),
+and create a symbolic link to the file
+[rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix)
+in the `~/.config/nixpkgs/overlays` directory.
+
+    $ git clone https://github.com/mozilla/nixpkgs-mozilla.git
+    $ mkdir -p  ~/.config/nixpkgs/overlays
+    $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
+
+The latest version can be installed with the following command:
+
+    $ nix-env -Ai nixos.rustChannels.stable.rust
+
+Or using the attribute with nix-shell:
+
+    $ nix-shell -p nixos.rustChannels.stable.rust
+
+To install the beta or nightly channel, "stable" should be substituted by
+"nightly" or "beta", or
+use the function provided by this overlay to pull a version based on a
+build date.
+
+The overlay automatically updates itself as it uses the same source as
+[rustup](https://www.rustup.rs/).

From 6393d433803f84e02cc340645481dcd85231083b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 20:47:13 +0100
Subject: [PATCH 2667/3449] doc: remove double space

---
 doc/languages-frameworks/rust.md              |  2 +-
 pkgs/development/libraries/tclgpg/default.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index f4370d5e7067..657e1642d2df 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -71,7 +71,7 @@ and create a symbolic link to the file
 in the `~/.config/nixpkgs/overlays` directory.
 
     $ git clone https://github.com/mozilla/nixpkgs-mozilla.git
-    $ mkdir -p  ~/.config/nixpkgs/overlays
+    $ mkdir -p ~/.config/nixpkgs/overlays
     $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
 
 The latest version can be installed with the following command:
diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix
index d8bea7f14e3e..e156982b6aba 100644
--- a/pkgs/development/libraries/tclgpg/default.nix
+++ b/pkgs/development/libraries/tclgpg/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }:
+{ stdenv, fetchfossil, autoreconfHook, 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";
+  src = fetchfossil {
+    url = "https://chiselapp.com/user/sgolovan/repository/tclgpg";
+    rev = "c5384e400f4a6efa";
+    sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4fa7c7e7b54ec27c5";
   };
 
   configureFlags = "--with-tcl=" + tcl + "/lib "
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     configureFlags="--exec_prefix=$prefix $configureFlags"
     sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in
-    autoreconf -vfi
   '';
 
   prePatch = ''
@@ -27,7 +26,8 @@ stdenv.mkDerivation rec {
     libPrefix = "gpg1.0";
   };
 
-  buildInputs = [ autoconf automake tcl tcllib ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ tcl tcllib ];
 
   meta = {
     homepage = http://code.google.com/p/tclgpg/;

From 88341c4d2b289eefdaa94c6390975a14f15b4fb7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 20:57:36 +0100
Subject: [PATCH 2668/3449] Revert "doc: remove double space"

This reverts commit 6393d433803f84e02cc340645481dcd85231083b.

Commit added too much changes.
---
 doc/languages-frameworks/rust.md              |  2 +-
 pkgs/development/libraries/tclgpg/default.nix | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index 657e1642d2df..f4370d5e7067 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -71,7 +71,7 @@ and create a symbolic link to the file
 in the `~/.config/nixpkgs/overlays` directory.
 
     $ git clone https://github.com/mozilla/nixpkgs-mozilla.git
-    $ mkdir -p ~/.config/nixpkgs/overlays
+    $ mkdir -p  ~/.config/nixpkgs/overlays
     $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
 
 The latest version can be installed with the following command:
diff --git a/pkgs/development/libraries/tclgpg/default.nix b/pkgs/development/libraries/tclgpg/default.nix
index e156982b6aba..d8bea7f14e3e 100644
--- a/pkgs/development/libraries/tclgpg/default.nix
+++ b/pkgs/development/libraries/tclgpg/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchfossil, autoreconfHook, tcl, tcllib, gnupg }:
+{ stdenv, fetchsvn, autoconf, automake, tcl, tcllib, gnupg }:
 
 stdenv.mkDerivation rec {
   name = "tclgpg-${version}";
   version = "1.0pre";
 
-  src = fetchfossil {
-    url = "https://chiselapp.com/user/sgolovan/repository/tclgpg";
-    rev = "c5384e400f4a6efa";
-    sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4fa7c7e7b54ec27c5";
+  src = fetchsvn {
+    url = "http://tclgpg.googlecode.com/svn/trunk";
+    rev = 74;
+    sha256 = "5207b1d246fea6d4527e8c044579dae45a2e31eeaa5633f4f97c7e7b54ec27c5";
   };
 
   configureFlags = "--with-tcl=" + tcl + "/lib "
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     configureFlags="--exec_prefix=$prefix $configureFlags"
     sed -i -e 's|dtplite|TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" &|' Makefile.in
+    autoreconf -vfi
   '';
 
   prePatch = ''
@@ -26,8 +27,7 @@ stdenv.mkDerivation rec {
     libPrefix = "gpg1.0";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ tcl tcllib ];
+  buildInputs = [ autoconf automake tcl tcllib ];
 
   meta = {
     homepage = http://code.google.com/p/tclgpg/;

From 72a5cf11ccdd0cd0fc4a335587abd38b2af7857a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 20:59:43 +0100
Subject: [PATCH 2669/3449] doc: remove double space

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

diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md
index f4370d5e7067..657e1642d2df 100644
--- a/doc/languages-frameworks/rust.md
+++ b/doc/languages-frameworks/rust.md
@@ -71,7 +71,7 @@ and create a symbolic link to the file
 in the `~/.config/nixpkgs/overlays` directory.
 
     $ git clone https://github.com/mozilla/nixpkgs-mozilla.git
-    $ mkdir -p  ~/.config/nixpkgs/overlays
+    $ mkdir -p ~/.config/nixpkgs/overlays
     $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix
 
 The latest version can be installed with the following command:

From 1c3308e9c1dcbfc939b8cfd6d4f6e7b1c4b40748 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 21:29:47 +0100
Subject: [PATCH 2670/3449] jdepend: 2.9.0 -> 2.9.1, fix build

---
 .../tools/analysis/jdepend/default.nix        | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 586e9d5cd5d3..bf1d1357f5e7 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -1,24 +1,34 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchFromGitHub, ant, jdk }:
 
-stdenv.mkDerivation {
-  name = "jdepend-2.9";
-  buildInputs = [unzip] ;
+stdenv.mkDerivation rec {
+  name = "jdepend-${version}";
+  version = "2.9.1";
 
-  src = fetchurl {
-    url = http://www.clarkware.com/software/jdepend-2.9.zip ;
-    sha256 = "1915fk9w9mjv9i6hlkn2grv2kjqcgn4xa8278v66f1ix5wpfcb90";
+  src = fetchFromGitHub {
+    owner = "clarkware";
+    repo = "jdepend";
+    rev = version;
+    sha256 = "1sxkgj4k4dhg8vb772pvisyzb8x0gwvlfqqir30ma4zvz3rfz60p";
   };
 
+  nativeBuildInputs = [ ant jdk ];
+  buildPhase = "ant jar";
+
   installPhase = ''
-    mkdir -p $out
-    cp -R * $out
+    mkdir -p $out/bin $out/share
+    install dist/${name}.jar $out/share
+
+    cat > "$out/bin/jdepend" <<EOF
+    #!${stdenv.shell}
+    exec ${jdk.jre}/bin/java -classpath "$out/share/*" "\$@"
+    EOF
+    chmod a+x $out/bin/jdepend
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Traverses Java class file directories and generates design quality metrics for each Java package";
-    homepage = http://www.clarkware.com/software/JDepend.html ;
+    homepage = http://www.clarkware.com/software/JDepend.html;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 }
-
-
-

From 7a130be3e4cba4a8926b19b55892f8bb27287487 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 20 Mar 2017 16:20:37 -0500
Subject: [PATCH 2671/3449] bitcoin-xt: 0.11D -> 0.11F (#23581)

---
 pkgs/applications/altcoins/bitcoin-xt.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index fd2d2f35bcb4..be4ea1fd6b66 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
+{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
 , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl
 , withGui }:
 
@@ -6,14 +6,17 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
-  version = "0.11D";
+  version = "0.11F";
 
-  src = fetchurl {
-    url = "https://github.com/bitcoinxt/bitcoinxt/archive/v${version}.tar.gz";
-    sha256 = "09r2i88wzqaj6mh66l3ngyfkm1a0dhwm5ibalj6y55wbxm9bvd36";
+  src = fetchFromGitHub {
+    owner = "bitcoinxt";
+    repo = "bitcoinxt";
+    rev = "v${version}";
+    sha256 = "13s5k9mxmlbf49p5hc546x20y5dslfp6g9hi6nw5yja5bngbwr24";
   };
 
-  buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
                   miniupnpc utillinux protobuf curl ]
                   ++ optionals withGui [ qt4 qrencode ];
 

From f57185db953670d6e4f334b7ad2dc79a96d703c4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 13 Mar 2017 13:31:44 +0100
Subject: [PATCH 2672/3449] fetch-*: remove md5 support

fixes #4491
---
 pkgs/build-support/fetchdarcs/default.nix  |  9 ++++++---
 pkgs/build-support/fetchegg/default.nix    |  7 +++++--
 pkgs/build-support/fetchgit/default.nix    |  8 +++++---
 pkgs/build-support/fetchhg/default.nix     | 10 +++++-----
 pkgs/build-support/fetchnuget/default.nix  |  5 ++++-
 pkgs/build-support/fetchsvn/default.nix    |  7 +++++--
 pkgs/build-support/fetchsvnssh/default.nix | 12 ++++++++----
 pkgs/build-support/fetchurl/default.nix    | 10 ++++++----
 8 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix
index 3c2e0524eea5..2644a20d0a53 100644
--- a/pkgs/build-support/fetchdarcs/default.nix
+++ b/pkgs/build-support/fetchdarcs/default.nix
@@ -1,13 +1,16 @@
 {stdenv, darcs, nix}: {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";
   builder = ./builder.sh;
   buildInputs = [darcs];
 
-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
-  
+  outputHash = sha256;
+
   inherit url rev context;
 }
diff --git a/pkgs/build-support/fetchegg/default.nix b/pkgs/build-support/fetchegg/default.nix
index 3e0d5d566ad7..41d2c936e01e 100644
--- a/pkgs/build-support/fetchegg/default.nix
+++ b/pkgs/build-support/fetchegg/default.nix
@@ -4,14 +4,17 @@
 { stdenv, chicken }:
 { name, version, md5 ? "", sha256 ? "" }:
 
+if md5 != "" then
+  throw "fetchegg does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
   name = "chicken-${name}-export";
   builder = ./builder.sh;
   buildInputs = [ chicken ];
 
-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
+  outputHash = sha256;
 
   inherit version;
 
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index e40b460d390a..d85d2c893c52 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -39,18 +39,20 @@ in
    server admins start using the new version?
 */
 
-assert md5 != "" || sha256 != "";
 assert deepClone -> leaveDotGit;
 
+if md5 != "" then
+  throw "fetchgit does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
   inherit name;
   builder = ./builder.sh;
   fetcher = "${./nix-prefetch-git}";  # This must be a string to ensure it's called with bash.
   buildInputs = [git];
 
-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
+  outputHash = sha256;
 
   inherit url rev leaveDotGit fetchSubmodules deepClone branchName;
 
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 79f610166a79..aba12317963a 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -1,5 +1,8 @@
 {stdenv, mercurial, nix}: {name ? null, url, rev ? null, md5 ? null, sha256 ? null, fetchSubrepos ? false}:
 
+if md5 != null then
+  throw "fetchhg does not support md5 anymore, please use sha256"
+else
 # TODO: statically check if mercurial as the https support if the url starts woth https.
 stdenv.mkDerivation {
   name = "hg-archive" + (if name != null then "-${name}" else "");
@@ -8,14 +11,11 @@ stdenv.mkDerivation {
 
   impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars;
 
-  # Nix <= 0.7 compatibility.
-  id = md5;
-
   subrepoClause = if fetchSubrepos then "S" else "";
 
-  outputHashAlgo = if md5 != null then "md5" else "sha256";
+  outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = if md5 != null then md5 else sha256;
+  outputHash = sha256;
 
   inherit url rev;
   preferLocalBuild = true;
diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix
index 95bb7b7cd8da..62b700dd81b5 100644
--- a/pkgs/build-support/fetchnuget/default.nix
+++ b/pkgs/build-support/fetchnuget/default.nix
@@ -8,9 +8,12 @@ attrs @
 , md5 ? ""
 , ...
 }:
+if md5 != "" then
+  throw "fetchnuget does not support md5 anymore, please use sha256"
+else
   buildDotnetPackage ({
     src = fetchurl {
-      inherit url sha256 md5;
+      inherit url sha256;
       name = "${baseName}.${version}.zip";
     };
 
diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix
index 747052c1cb70..6ed34ec02763 100644
--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@@ -25,14 +25,17 @@ let
   name_ = if name == null then "${repoName}-r${toString rev}" else name;
 in
 
+if md5 != "" then
+  throw "fetchsvn does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
   name = name_;
   builder = ./builder.sh;
   buildInputs = [subversion];
 
-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
+  outputHash = sha256;
 
   inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
 
diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix
index 6c6c03d68732..a6f3d3469f09 100644
--- a/pkgs/build-support/fetchsvnssh/default.nix
+++ b/pkgs/build-support/fetchsvnssh/default.nix
@@ -1,16 +1,20 @@
 {stdenv, subversion, sshSupport ? false, openssh ? null, expect}: 
 {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
 
+
+if md5 != "" then
+  throw "fetchsvnssh does not support md5 anymore, please use sha256"
+else
 stdenv.mkDerivation {
   name = "svn-export-ssh";
   builder = ./builder.sh;
   buildInputs = [subversion expect];
 
-  outputHashAlgo = if sha256 == "" then "md5" else "sha256";
+  outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = if sha256 == "" then md5 else sha256;
-  
+  outputHash = sha256;
+
   sshSubversion = ./sshsubversion.exp;
-  
+
   inherit username password url rev sshSupport openssh;
 }
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 00f485ce6975..1e872fbc57a4 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -87,12 +87,14 @@ assert sha512 != "" -> builtins.compareVersions "1.11" builtins.nixVersion <= 0;
 let
 
   hasHash = showURLs || (outputHash != "" && outputHashAlgo != "")
-    || md5 != "" || sha1 != "" || sha256 != "" || sha512 != "";
+    || sha1 != "" || sha256 != "" || sha512 != "";
   urls_ = if urls != [] then urls else [url];
 
 in
 
-if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else stdenv.mkDerivation {
+if md5 != "" then throw "fetchsvnssh 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 =
     if showURLs then "urls"
     else if name != "" then name
@@ -110,9 +112,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
 
   # New-style output content requirements.
   outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
-      if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
+      if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else "sha1";
   outputHash = if outputHash != "" then outputHash else
-      if sha512 != "" then sha512 else if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
+      if sha512 != "" then sha512 else if sha256 != "" then sha256 else sha1;
 
   outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
 

From 8c0074dd9f02daffe7b11b5ce427fd899e189b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Mon, 20 Mar 2017 22:25:10 +0100
Subject: [PATCH 2673/3449] drbd: fix output file location (#23541)

drbd was installing files into $out/nix/store/... due to the usage of DESTDIR
(setting both DESTDIR + prefix to $out will cause files to be installed into $out/$out/...)
---
 pkgs/os-specific/linux/drbd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 60615fb1e5be..ead0d41ab8d9 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -19,17 +19,17 @@ stdenv.mkDerivation rec {
   preConfigure =
     ''
       export PATH=${systemd.udev.bin}/sbin:$PATH
-      substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/
+      substituteInPlace user/Makefile.in \
+        --replace /sbin '$(sbindir)'
       substituteInPlace user/legacy/Makefile.in \
-        --replace /sbin/ $out/sbin/ \
-        --replace '$(DESTDIR)/lib/drbd' $out/lib/drbd
+        --replace '$(DESTDIR)/lib/drbd' '$(DESTDIR)$(LIBDIR)'
       substituteInPlace user/drbdadm_usage_cnt.c --replace /lib/drbd $out/lib/drbd
       substituteInPlace scripts/drbd.rules --replace /sbin/drbdadm $out/sbin/drbdadm
     '';
 
   makeFlags = "SHELL=${stdenv.shell}";
 
-  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)";
+  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d";
 
   meta = {
     homepage = http://www.drbd.org/;

From c066dc8416a6e5c3f5ae82b894a90154a6b06e37 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 22:26:02 +0100
Subject: [PATCH 2674/3449] fetch-*: add md5 support removal to rl-notes

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

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index c03bf33de8bd..76b6792aac45 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -249,6 +249,13 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      The <literal>fetch*</literal> functions no longer support md5,
+      please use sha256 instead.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From 9dfb7e42ad71c4415d3f8a638748eccbfb1f6652 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sun, 26 Feb 2017 21:40:11 +0100
Subject: [PATCH 2675/3449] heartbeat: init at 5.2.1

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

diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix
new file mode 100644
index 000000000000..905fbf5fb757
--- /dev/null
+++ b/pkgs/misc/logging/heartbeat/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "heartbeat-${version}";
+  version = "5.2.1";
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/beats/heartbeat/${name}-linux-x86_64.tar.gz";
+    sha256 = "1sq3va0kbpqsjbd0bnziv2hwnp6nc2vk32hc9drjk7bhcxkp440l";
+  };
+
+  # statically linked binary, no need to build anything
+  dontBuild = true;
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp heartbeat $out/bin/
+  '';
+
+  meta = {
+    description = "Lightweight shipper for uptime monitoring";
+    homepage = https://www.elastic.co/products/beats;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e72eda08f5c..37fe947468da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -944,6 +944,8 @@ with pkgs;
 
   gti = callPackage ../tools/misc/gti { };
 
+  heartbeat = callPackage ../misc/logging/heartbeat { };
+
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
   hexio = callPackage ../development/tools/hexio { };

From 9fce67264d8709bedb4ca86ba3752ca634933dc7 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sun, 26 Feb 2017 21:37:05 +0100
Subject: [PATCH 2676/3449] metricbeat: init at 5.2.1

---
 pkgs/misc/logging/metricbeat/default.nix | 33 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/misc/logging/metricbeat/default.nix

diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix
new file mode 100644
index 000000000000..c925dee7da97
--- /dev/null
+++ b/pkgs/misc/logging/metricbeat/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "metricbeat-${version}";
+  version = "5.2.1";
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/beats/metricbeat/${name}-linux-x86_64.tar.gz";
+    sha256 = "0shpyqgrqiiqv9anipqms1xy0wn5n2m11fvicdzr3x1v3jygm1ds";
+  };
+
+  # statically linked binary, no need to build anything
+  dontBuild = true;
+  doCheck = false;
+
+  # need to patch interpreter to be able to run on NixOS
+  patchPhase = ''
+    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) metricbeat
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp metricbeat $out/bin/
+  '';
+
+  meta = {
+    description = "Lightweight shipper for metrics";
+    homepage = https://www.elastic.co/products/beats;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37fe947468da..6d1025b29f85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -972,6 +972,8 @@ with pkgs;
 
   meson = callPackage ../development/tools/build-managers/meson { };
 
+  metricbeat = callPackage ../misc/logging/metricbeat { };
+
   mp3fs = callPackage ../tools/filesystems/mp3fs { };
 
   mpdcron = callPackage ../tools/audio/mpdcron { };

From 9fe3b0eb13405bd209527b8c2230170f229bd970 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Sun, 4 Dec 2016 19:59:46 +0100
Subject: [PATCH 2677/3449] filebeat: init at 5.2.1

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

diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix
new file mode 100644
index 000000000000..94d3c0d849f5
--- /dev/null
+++ b/pkgs/misc/logging/filebeat/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "filebeat-${version}";
+  version = "5.2.1";
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/beats/filebeat/${name}-linux-x86_64.tar.gz";
+    sha256 = "0kwkd3n6jmd0mwbvk2dng8843mxyq4mfvlm3hc8d1vd2m1m9wlhi";
+  };
+
+  # statically linked binary, no need to build anything
+  dontBuild = true;
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp filebeat $out/bin/
+  '';
+
+  meta = {
+    description = "Lightweight shipper for logfiles";
+    homepage = https://www.elastic.co/products/beats;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d1025b29f85..289bfa010f61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -902,6 +902,8 @@ with pkgs;
 
   fastJson = callPackage ../development/libraries/fastjson { };
 
+  filebeat = callPackage ../misc/logging/filebeat { };
+
   filebench = callPackage ../tools/misc/filebench { };
 
   fsmon = callPackage ../tools/misc/fsmon { };

From 8338506abe09be5135fcc29b13ac764e199c36b7 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 29 Nov 2016 22:07:13 +0100
Subject: [PATCH 2678/3449] packetbeat: init at 5.2.1

---
 pkgs/misc/logging/packetbeat/default.nix | 38 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/misc/logging/packetbeat/default.nix

diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix
new file mode 100644
index 000000000000..bc871a4e278e
--- /dev/null
+++ b/pkgs/misc/logging/packetbeat/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "packetbeat-${version}";
+  version = "5.2.1";
+
+  src = fetchurl {
+    url = "https://artifacts.elastic.co/downloads/beats/packetbeat/${name}-linux-x86_64.tar.gz";
+    sha256 = "14ff466ban8pfsw750r8jkz1brczfrbcrwfhqvi5i8smfg56m9rl";
+  };
+
+  dontBuild = true;
+  doCheck = false;
+
+  # need to patch interpreter to be able to run on NixOS
+  patchPhase = ''
+    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) packetbeat
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp packetbeat $out/bin/
+  '';
+
+  meta = {
+    description = "Network packet analyzer that ships data to Elasticsearch";
+    longDescription = ''
+      Packetbeat is an open source network packet analyzer that ships the data to Elasticsearch.
+
+      Think of it like a distributed real-time Wireshark with a lot more analytics features.
+      The Packetbeat shippers sniff the traffic between your application processes, parse on the fly protocols like HTTP, MySQL, PostgreSQL, Redis or Thrift and correlate the messages into transactions.
+    '';
+    homepage = https://www.elastic.co/products/beats;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 289bfa010f61..1e089956fdbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3326,6 +3326,8 @@ with pkgs;
     nix = nixUnstable;
   };
 
+  packetbeat = callPackage ../misc/logging/packetbeat { };
+
   packetdrill = callPackage ../tools/networking/packetdrill { };
 
   pakcs = callPackage ../development/compilers/pakcs {};

From 4bfde8f5b47895af68823fc8600d230813f4473d Mon Sep 17 00:00:00 2001
From: Willi Butz <wbutz@cyberfnord.de>
Date: Mon, 20 Mar 2017 22:09:59 +0100
Subject: [PATCH 2679/3449] martyr: fixed build, removed build.sh, added meta
 (see #23253)

---
 pkgs/development/libraries/martyr/builder.sh  |  7 ------
 pkgs/development/libraries/martyr/default.nix | 25 ++++++++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/martyr/builder.sh

diff --git a/pkgs/development/libraries/martyr/builder.sh b/pkgs/development/libraries/martyr/builder.sh
deleted file mode 100644
index 3ee7fc012d97..000000000000
--- a/pkgs/development/libraries/martyr/builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-unpackPhase
-cd $name
-$apacheAnt/bin/ant
-cp -R ./* $out
diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix
index 7fbd44b3fa4a..3b6102715391 100644
--- a/pkgs/development/libraries/martyr/default.nix
+++ b/pkgs/development/libraries/martyr/default.nix
@@ -1,11 +1,24 @@
-{stdenv, fetchurl, apacheAnt}:
+{stdenv, fetchurl, ant, jdk}:
 
-stdenv.mkDerivation {
-	name = "martyr-0.3.9";
-	builder = ./builder.sh;
+stdenv.mkDerivation rec {
+	name = "martyr-${version}";
+  version = "0.3.9";
 	src = fetchurl {
-		url = "mirror://sourceforge/martyr/martyr-0.3.9.tar.gz";
+		url = "mirror://sourceforge/martyr/${name}.tar.gz";
 		sha256 = "1ks8j413bcby345kmq1i7av8kwjvz5vxdn1zpv0p7ywxq54i4z59";
 	};
-	inherit stdenv apacheAnt;
+
+  buildInputs = [ ant jdk ];
+
+  buildPhase = "ant";
+
+  installPhase = ''
+    mkdir -p "$out/share/java"
+    cp -v *.jar "$out/share/java"
+  '';
+
+  meta = {
+    description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state";
+    homepage = http://martyr.sourceforge.net/;
+  };
 }

From a0d087b6fe8cf366a5b44a803f25ec350af21d97 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 22:54:35 +0100
Subject: [PATCH 2680/3449] filebeat: 5.2.1 -> 5.2.2, build from source

---
 pkgs/misc/logging/filebeat/default.nix | 31 ++++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/misc/logging/filebeat/default.nix b/pkgs/misc/logging/filebeat/default.nix
index 94d3c0d849f5..c33f34c6dc4d 100644
--- a/pkgs/misc/logging/filebeat/default.nix
+++ b/pkgs/misc/logging/filebeat/default.nix
@@ -1,28 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, buildGoPackage }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "filebeat-${version}";
-  version = "5.2.1";
+  version = "5.2.2";
 
-  src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/beats/filebeat/${name}-linux-x86_64.tar.gz";
-    sha256 = "0kwkd3n6jmd0mwbvk2dng8843mxyq4mfvlm3hc8d1vd2m1m9wlhi";
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
   };
 
-  # statically linked binary, no need to build anything
-  dontBuild = true;
-  doCheck = false;
+  goPackagePath = "github.com/elastic/beats";
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp filebeat $out/bin/
-  '';
+  subPackages = [ "filebeat" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lightweight shipper for logfiles";
     homepage = https://www.elastic.co/products/beats;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.fadenb ];
-    platforms = [ "x86_64-linux" ];
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
   };
 }

From 66d0c4b1bd2e947a95aa2795fb4a933429470219 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 22:54:59 +0100
Subject: [PATCH 2681/3449] heartbeat: 5.2.1 -> 5.2.2, build from source

---
 pkgs/misc/logging/heartbeat/default.nix | 31 +++++++++++--------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/misc/logging/heartbeat/default.nix b/pkgs/misc/logging/heartbeat/default.nix
index 905fbf5fb757..faa558589f25 100644
--- a/pkgs/misc/logging/heartbeat/default.nix
+++ b/pkgs/misc/logging/heartbeat/default.nix
@@ -1,28 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, buildGoPackage }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "heartbeat-${version}";
-  version = "5.2.1";
+  version = "5.2.2";
 
-  src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/beats/heartbeat/${name}-linux-x86_64.tar.gz";
-    sha256 = "1sq3va0kbpqsjbd0bnziv2hwnp6nc2vk32hc9drjk7bhcxkp440l";
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
   };
 
-  # statically linked binary, no need to build anything
-  dontBuild = true;
-  doCheck = false;
+  goPackagePath = "github.com/elastic/beats";
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp heartbeat $out/bin/
-  '';
+  subPackages = [ "heartbeat" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lightweight shipper for uptime monitoring";
     homepage = https://www.elastic.co/products/beats;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.fadenb ];
-    platforms = [ "x86_64-linux" ];
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
   };
 }

From 4d08d1aa8f44876b3c068384c5b03332aa134a29 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 22:55:13 +0100
Subject: [PATCH 2682/3449] metricbeat: 5.2.1 -> 5.2.2, build from source

---
 pkgs/misc/logging/metricbeat/default.nix | 36 +++++++++---------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/pkgs/misc/logging/metricbeat/default.nix b/pkgs/misc/logging/metricbeat/default.nix
index c925dee7da97..fcb2376a93d7 100644
--- a/pkgs/misc/logging/metricbeat/default.nix
+++ b/pkgs/misc/logging/metricbeat/default.nix
@@ -1,33 +1,25 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, buildGoPackage }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "metricbeat-${version}";
-  version = "5.2.1";
+  version = "5.2.2";
 
-  src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/beats/metricbeat/${name}-linux-x86_64.tar.gz";
-    sha256 = "0shpyqgrqiiqv9anipqms1xy0wn5n2m11fvicdzr3x1v3jygm1ds";
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
   };
 
-  # statically linked binary, no need to build anything
-  dontBuild = true;
-  doCheck = false;
+  goPackagePath = "github.com/elastic/beats";
 
-  # need to patch interpreter to be able to run on NixOS
-  patchPhase = ''
-    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) metricbeat
-  '';
+  subPackages = [ "metricbeat" ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp metricbeat $out/bin/
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lightweight shipper for metrics";
     homepage = https://www.elastic.co/products/beats;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.fadenb ];
-    platforms = [ "x86_64-linux" ];
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
   };
 }

From 10239a084f2eaf63d63228dd7d3e4473c3489dfb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 22:55:19 +0100
Subject: [PATCH 2683/3449] packetbeat: 5.2.1 -> 5.2.2, build from source

---
 pkgs/misc/logging/packetbeat/default.nix | 44 +++++++++++-------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/misc/logging/packetbeat/default.nix b/pkgs/misc/logging/packetbeat/default.nix
index bc871a4e278e..d4445bec9980 100644
--- a/pkgs/misc/logging/packetbeat/default.nix
+++ b/pkgs/misc/logging/packetbeat/default.nix
@@ -1,38 +1,36 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, buildGoPackage, libpcap }:
 
-stdenv.mkDerivation rec {
+buildGoPackage rec {
   name = "packetbeat-${version}";
-  version = "5.2.1";
+  version = "5.2.2";
 
-  src = fetchurl {
-    url = "https://artifacts.elastic.co/downloads/beats/packetbeat/${name}-linux-x86_64.tar.gz";
-    sha256 = "14ff466ban8pfsw750r8jkz1brczfrbcrwfhqvi5i8smfg56m9rl";
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    rev = "v${version}";
+    sha256 = "19hkq19xpi3c9y5g1yq77sm2d5vzybn6mxxf0s5l6sw4l98aak5q";
   };
 
-  dontBuild = true;
-  doCheck = false;
+  goPackagePath = "github.com/elastic/beats";
 
-  # need to patch interpreter to be able to run on NixOS
-  patchPhase = ''
-    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) packetbeat
-  '';
+  subPackages = [ "packetbeat" ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp packetbeat $out/bin/
-  '';
+  buildInputs = [ libpcap ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Network packet analyzer that ships data to Elasticsearch";
     longDescription = ''
-      Packetbeat is an open source network packet analyzer that ships the data to Elasticsearch.
+      Packetbeat is an open source network packet analyzer that ships the
+      data to Elasticsearch.
 
-      Think of it like a distributed real-time Wireshark with a lot more analytics features.
-      The Packetbeat shippers sniff the traffic between your application processes, parse on the fly protocols like HTTP, MySQL, PostgreSQL, Redis or Thrift and correlate the messages into transactions.
+      Think of it like a distributed real-time Wireshark with a lot more
+      analytics features. The Packetbeat shippers sniff the traffic between
+      your application processes, parse on the fly protocols like HTTP, MySQL,
+      PostgreSQL, Redis or Thrift and correlate the messages into transactions.
     '';
     homepage = https://www.elastic.co/products/beats;
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [ stdenv.lib.maintainers.fadenb ];
-    platforms = [ "x86_64-linux" ];
+    license = licenses.asl20;
+    maintainers = [ maintainers.fadenb ];
+    platforms = platforms.linux;
   };
 }

From 4a53b2eaf7400c295b298aea8600553d8e360a24 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 20 Mar 2017 23:22:28 +0100
Subject: [PATCH 2684/3449] crda: Add usage hint to longDescription.

Reported by samae on #nixos.
---
 pkgs/os-specific/linux/crda/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index ac6117cd599f..5e63524e7dcb 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -40,7 +40,13 @@ stdenv.mkDerivation rec {
     longDescription = ''
       CRDA acts as the udev helper for communication between the kernel and
       userspace for regulatory compliance. It relies on nl80211 for communication.
+
       CRDA is intended to be run only through udev communication from the kernel.
+      To use it under NixOS, add
+
+        services.udev.packages = [ pkgs.crda ];
+
+      to the system configuration.
     '';
     homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/;
     license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site

From 5e0f932de0d040c93c268f8aea601bd6b3a7bfd6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 20 Mar 2017 23:27:16 +0100
Subject: [PATCH 2685/3449] rl-notes 17.03: info on python module location

closes #11567
---
 nixos/doc/manual/release-notes/rl-1703.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index c03bf33de8bd..f6e8e9a4515b 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -252,7 +252,7 @@ following incompatible changes:</para>
 </itemizedlist>
 
 
-<para>Other notable improvements:</para>
+<para>Other notable changes:</para>
 
 <itemizedlist>
 
@@ -283,6 +283,14 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>
+      When adding new or updating current libraries, the expressions should be put
+      in separate files in <literal>pkgs/development/python-modules</literal> and 
+      called from <literal>python-packages.nix</literal>.
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 

From 91debcb482b0b6b6b8ce017d3d22eefdc90092a7 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Tue, 21 Mar 2017 00:06:51 +0100
Subject: [PATCH 2686/3449] Update python.md (#23669)

* Update python.md

this makes it clear how to alter `attributes` by using `packageOverrides`

* Update python.md

* Update python.md

* Update python.md

* Update python.md

* Update python.md

* Update python.md
---
 doc/languages-frameworks/python.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 87b5668740d1..cbb979e87881 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -897,6 +897,27 @@ is executed it will attempt to download the python modules listed in
 requirements.txt. However these will be cached locally within the `virtualenv`
 folder and not downloaded again.
 
+### How to override a Python package from `configuration.nix`?
+
+If you need to change a package's attribute(s) from `configuration.nix` you could do:
+
+```nix
+  nixpkgs.config.packageOverrides = superP: {
+    pythonPackages = superP.pythonPackages.override {
+      overrides = self: super: {
+        bepasty-server = super.bepasty-server.overrideAttrs ( oldAttrs: {
+          src = pkgs.fetchgit {
+            url = "https://github.com/bepasty/bepasty-server";
+            sha256 = "9ziqshmsf0rjvdhhca55sm0x8jz76fsf2q4rwh4m6lpcf8wr0nps";
+            rev = "e2516e8cf4f2afb5185337073607eb9e84a61d2d";
+          };
+        });
+      };
+    };
+  };
+```
+
+If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). 
 
 ## Contributing
 

From 818a37598cc2e5c195bc5e28049018ee91398978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Mar 2017 01:40:31 +0100
Subject: [PATCH 2687/3449] wireguard: 0.0.20170223 -> 0.0.20170320.1

---
 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 59b9475160ef..435653c19fdc 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.20170223";
+  version = "0.0.20170320.1";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "6d2c8cd29c4f9fb404546a4749ec050739a26b4a49b5864f1dec531377c3c50d";
+    sha256 = "19rcsmwcb9jp4lrfrkf1x78y4i6dcqx5p7kmcbjnbwl0nkc48vr8";
   };
 
   meta = with stdenv.lib; {

From c808801937ec73e7df2e1cf671ecaecb04431eeb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 21 Mar 2017 02:16:29 +0100
Subject: [PATCH 2688/3449] nix-daemon: fix autoOptimiseStore option

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

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index fed646aadac4..cfb6a860178a 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -46,7 +46,7 @@ let
         binary-caches = ${toString cfg.binaryCaches}
         trusted-binary-caches = ${toString cfg.trustedBinaryCaches}
         binary-cache-public-keys = ${toString cfg.binaryCachePublicKeys}
-        auto-optimise-store = ${toString cfg.autoOptimiseStore}
+        auto-optimise-store = ${if cfg.autoOptimiseStore then "true" else "false"}
         ${optionalString cfg.requireSignedBinaryCaches ''
           signed-binary-caches = *
         ''}

From 8eabb34e5f336b262e918e2398bfd04d2a6c7a59 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 04:23:02 +0300
Subject: [PATCH 2689/3449] odroid-xu3-bootloader: use 1MB-capable bootloader

(cherry picked from commit 7d66259a777fd1b1930eca26f08236f657529e25)
---
 pkgs/misc/uboot/default.nix                       |  2 +-
 pkgs/tools/misc/odroid-xu3-bootloader/default.nix | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 5d9c83059c76..9e133e9f3323 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -86,7 +86,7 @@ in rec {
   ubootOdroidXU3 = buildUBoot rec {
     defconfig = "odroid-xu3_defconfig";
     targetPlatforms = ["armv7l-linux"];
-    filesToInstall = ["u-boot.bin"];
+    filesToInstall = ["u-boot-dtb.bin"];
   };
 
   ubootPcduino3Nano = buildUBoot rec {
diff --git a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
index 595b0d84ff57..3cce28df4f3d 100644
--- a/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
+++ b/pkgs/tools/misc/odroid-xu3-bootloader/default.nix
@@ -6,19 +6,22 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "hardkernel";
     repo = "u-boot";
-    rev = "bbdea1841c4fbf767dcaf9d7ae8d3a46af235c4d";
-    sha256 = "03rvyfj147xh83w8hlvbxix131l3nnvk8n517fdhv9nil1l8dd71";
+    rev = "fe2f831fd44a4071f58a42f260164544697aa666";
+    sha256 = "1h5yvawzla0vqhkk98gxcwc824bhc936bh6j77qkyspvqcw761fr";
   };
 
   buildCommand = ''
-    install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/*.hardkernel
-    ln -sf ${ubootOdroidXU3}/u-boot.bin $out/lib/sd_fuse-xu3/u-boot.bin.hardkernel
+    install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel_1mb_uboot/{bl2,tzsw}.*
+    install -Dm644 -t $out/lib/sd_fuse-xu3 $src/sd_fuse/hardkernel/bl1.*
+    ln -sf ${ubootOdroidXU3}/u-boot-dtb.bin $out/lib/sd_fuse-xu3/u-boot-dtb.bin
 
-    install -Dm755 $src/sd_fuse/hardkernel/sd_fusing.sh $out/bin/sd_fuse-xu3
+    install -Dm755 $src/sd_fuse/hardkernel_1mb_uboot/sd_fusing.1M.sh $out/bin/sd_fuse-xu3
     sed -i \
       -e '1i#!${stdenv.shell}' \
       -e '1iPATH=${lib.makeBinPath [ coreutils ]}:$PATH' \
-      -e "s,if=\./,if=$out/lib/sd_fuse-xu3/,g" \
+      -e '/set -x/d' \
+      -e 's,.\/sd_fusing\.sh,sd_fuse-xu3,g' \
+      -e "s,\./,$out/lib/sd_fuse-xu3/,g" \
       $out/bin/sd_fuse-xu3
   '';
 

From 1cd8addae145ea95173f4b319e5f53c0ec6abd7f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 21 Mar 2017 09:39:50 +0800
Subject: [PATCH 2690/3449] syncthing: 0.14.24 -> 0.14.25

---
 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 2cb4f0a5922e..0f696d788552 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.24";
+  version = "0.14.25";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "15jjk49ibry7crc3sw5zg09zsm5ir0ph5c0f3acas66wd02rnvl1";
+    sha256 = "1if92y32h1wp5sz2lnlw5fqibzbik7bklq850j9wcxfvr6ahck0w";
   };
 
   buildInputs = [ go removeReferencesTo ];

From 497b34cb7ca3a87fbc39140a141d075fe2f64094 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 21 Mar 2017 10:04:21 +0800
Subject: [PATCH 2691/3449] qtox: 1.8.1 -> 1.9.0

---
 .../networking/instant-messengers/qtox/default.nix        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 036d7fb3ce52..41286331eb14 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "qtox-${version}";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner  = "tux3";
     repo   = "qTox";
     rev    = "v${version}";
-    sha256 = "073kwfaw5n7vvcpwrpdbw5mlswbbwjipx7yy4a95r9z0gjljqnhq";
+    sha256 = "0l008mzrs1wsv5cbzxjkv3k48lghlcdsp8blqrkihjv5gcn3psml";
   };
 
   buildInputs = [
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
 
+  cmakeFlags = [
+    "-DGIT_DESCRIBE=${version}"
+  ];
+
   installPhase = ''
     runHook preInstall
 

From 5177f891f39f701e72627796407ee2ef7c0db2c1 Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Tue, 21 Mar 2017 02:11:08 +0000
Subject: [PATCH 2692/3449] rustfmt: 0.7.1 -> 0.8

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

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index ad2d01cc5720..e636c72b4208 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
 with rustPlatform;
 
 buildRustPackage rec {
   name = "rustfmt-${version}";
-  version = "0.7.1";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustfmt";
-    rev = "907134c2d10c0f11608dc4820b023f8040ad655a";
-    sha256 = "1sn590x6x93wjzkb78akqjim734hxynck3gmp8fx7gcrk5cch9mc";
+    rev = version;
+    sha256 = "0a613x1ckwl30yamba9m7xi3xrn8pg92p2w3v7k723whyivmjk1s";
   };
 
-  depsSha256 = "1djpzgchl93radi52m89sjk2nbl9f4y15pwn4x78lqas0jlc6nlr";
+  depsSha256 = "1vach2xf0cs7nivbakhmrm2aqdif3i5vg1syffrs2ghcix9hd21p";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From add75b63c8bd8afc0060757c1aa77ec4282add12 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 21 Mar 2017 12:41:22 +0900
Subject: [PATCH 2693/3449] j4-dmenu-desktop: 2.14 -> 2.15 (#24119)

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

diff --git a/pkgs/applications/misc/j4-dmenu-desktop/default.nix b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
index 9a60cd060f56..9896fd15b85c 100644
--- a/pkgs/applications/misc/j4-dmenu-desktop/default.nix
+++ b/pkgs/applications/misc/j4-dmenu-desktop/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "j4-dmenu-desktop-${version}";
-  version = "2.14";
+  version = "2.15";
 
   src = fetchFromGitHub {
     owner  = "enkore";
     repo   = "j4-dmenu-desktop";
     rev    = "r${version}";
-    sha256 = "14srrkz4qx8qplgrrjv38ri4pnkxaxaq6jy89j13xhna492bq128";
+    sha256 = "1yn45i3hpim2hriaqkq7wmawwsmkynvy2xgz7dg6p5r0ikw5bn1r";
   };
 
   postPatch = ''

From 93005b82dc4f6e2f5372987005d7dffd2f1b3ea6 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 21 Mar 2017 00:42:26 -0400
Subject: [PATCH 2694/3449] google-gflags: fix on Darwin

e721905d0f7c82be94a347f022bdd238b919de9d updated to a version that added
a BUILD file that breaks on case-insensitive filesystems.
---
 pkgs/development/libraries/google-gflags/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/google-gflags/default.nix b/pkgs/development/libraries/google-gflags/default.nix
index 0f089d16eadd..1a3a16587274 100644
--- a/pkgs/development/libraries/google-gflags/default.nix
+++ b/pkgs/development/libraries/google-gflags/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin)
+  preConfigure = "rm BUILD";
+
   cmakeFlags = [
     "-DBUILD_SHARED_LIBS=ON"
     "-DBUILD_STATIC_LIBS=ON"

From 7ad3fd7ca72113d2790aa223afdb9faa70e9fb7d Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 21 Mar 2017 01:00:18 -0400
Subject: [PATCH 2695/3449] neuron: fix on clang 3.8 and above

This is in preparation for upgrading Darwin stdenv to LLVM 4
---
 .../science/biology/neuron/default.nix        | 41 +++++++++++--------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 5d69b1f29e73..136fba47eb78 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -1,5 +1,5 @@
-{ stdenv 
-, fetchurl 
+{ stdenv
+, fetchurl
 , pkgconfig
 , automake
 , autoconf
@@ -7,14 +7,14 @@
 , ncurses
 , readline
 , which
-, python ? null 
+, python ? null
 , mpi ? null
 }:
 
 stdenv.mkDerivation rec {
   name = "neuron-${version}";
   version = "7.4";
-  
+
   nativeBuildInputs = [ which pkgconfig automake autoconf libtool ];
   buildInputs = [ ncurses readline python mpi  ];
 
@@ -25,23 +25,32 @@ stdenv.mkDerivation rec {
 
   patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]);
 
+  # With LLVM 3.8 and above, clang (really libc++) gets upset if you attempt to redefine these...
+  postPatch = stdenv.lib.optionalString stdenv.cc.isClang ''
+    substituteInPlace src/gnu/neuron_gnu_builtin.h \
+      --replace 'double abs(double arg);' "" \
+      --replace 'float abs(float arg);' "" \
+      --replace 'short abs(short arg);' "" \
+      --replace 'long abs(long arg);' ""
+  '';
+
   enableParallelBuilding = true;
 
   ## neuron install by default everything under prefix/${host_arch}/*
-  ## override this to support nix standard file hierarchy 
+  ## override this to support nix standard file hierarchy
   ## without issues: install everything under prefix/
   preConfigure = ''
     ./build.sh
-    export prefix="''${prefix} --exec-prefix=''${out}" 
+    export prefix="''${prefix} --exec-prefix=''${out}"
   '';
 
   configureFlags = with stdenv.lib;
                     [ "--without-x" "--with-readline=${readline}" ]
                     ++  optionals (python != null)  [ "--with-nrnpython=${python.interpreter}" ]
-                    ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] 
+                    ++ (if mpi != null then ["--with-mpi" "--with-paranrn"]
                         else ["--without-mpi"]);
-                        
-                        
+
+
   postInstall = stdenv.lib.optionals (python != null) [ ''
     ## standardise python neuron install dir if any
     if [[ -d $out/lib/python ]]; then
@@ -49,22 +58,22 @@ stdenv.mkDerivation rec {
         mv ''${out}/lib/python/*  ''${out}/${python.sitePackages}/
     fi
   ''];
-  
-  propagatedBuildInputs = [ readline ncurses which libtool ];  
+
+  propagatedBuildInputs = [ readline ncurses which libtool ];
 
   meta = with stdenv.lib; {
     description = "Simulation environment for empirically-based simulations of neurons and networks of neurons";
 
-    longDescription = "NEURON is a simulation environment for developing and exercising models of 
-                neurons and networks of neurons. It is particularly well-suited to problems where 
-                cable properties of cells play an important role, possibly including extracellular 
-                potential close to the membrane), and where cell membrane properties are complex, 
+    longDescription = "NEURON is a simulation environment for developing and exercising models of
+                neurons and networks of neurons. It is particularly well-suited to problems where
+                cable properties of cells play an important role, possibly including extracellular
+                potential close to the membrane), and where cell membrane properties are complex,
                 involving many ion-specific channels, ion accumulation, and second messengers";
 
     license     = licenses.bsd3;
     homepage    = http://www.neuron.yale.edu/neuron;
     maintainers = [ maintainers.adev ];
     platforms   = platforms.all;
-  };  
+  };
 }
 

From a2a82db7cf3eda1a17abe2f673291852c4a85ba9 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 21 Mar 2017 01:36:28 -0400
Subject: [PATCH 2696/3449] gfortran/gcc: simplify & clean up on Darwin

This should eliminate the branched logic for gfortran on Darwin, as well
as preventing accidental inclusion of impure paths in gcc and gfortran
builds.
---
 pkgs/development/compilers/gcc/5/default.nix  | 10 +++-
 .../compilers/gcc/gfortran-darwin.nix         | 52 -------------------
 .../compilers/gcc/gfortran-darwin.patch       | 26 ----------
 pkgs/top-level/all-packages.nix               |  5 +-
 4 files changed, 10 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/gfortran-darwin.nix
 delete mode 100644 pkgs/development/compilers/gcc/gfortran-darwin.patch

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index da4f7a606705..3e9104a82fbc 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -76,7 +76,8 @@ let version = "5.4.0";
       ++ optional langAda ../gnat-cflags.patch
       ++ optional langFortran ../gfortran-driving.patch
 
-      # This could be applied unconditionally but I don't want to cause a full Linux rebuild.
+      # This could be applied unconditionally but I don't want to cause a full
+      # Linux rebuild.
       ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch;
 
     javaEcj = fetchurl {
@@ -234,6 +235,13 @@ stdenv.mkDerivation ({
 
   libc_dev = stdenv.cc.libc_dev;
 
+  # This should kill all the stdinc frameworks that gcc and friends like to
+  # insert into default search paths.
+  prePatch = if stdenv.isDarwin then ''
+    substituteInPlace gcc/config/darwin-c.c \
+      --replace 'if (stdinc)' 'if (0)'
+  '' else null;
+
   postPatch =
     if (stdenv.isGNU
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix
deleted file mode 100644
index 48caeea5f1ff..000000000000
--- a/pkgs/development/compilers/gcc/gfortran-darwin.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-# This is a derivation specific to OS X (Darwin)
-{gmp, mpfr, libmpc, isl_0_14, cloog, zlib, fetchurl, stdenv
-
-, Libsystem
-}:
-
-stdenv.mkDerivation rec {
-  name = "gfortran-${version}";
-  version = "5.1.0";
-
-  buildInputs = [ gmp mpfr libmpc isl_0_14 cloog zlib ];
-
-  src = fetchurl {
-    url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
-    sha256 = "1bd5vj4px3s8nlakbgrh38ynxq4s654m6nxz7lrj03mvkkwgvnmp";
-  };
-
-  patches = ./gfortran-darwin.patch;
-
-  hardeningDisable = [ "format" ];
-
-  configureFlags = ''
-    --disable-bootstrap
-    --disable-cloog-version-check
-    --disable-isl-version-check
-    --disable-multilib
-    --enable-checking=release
-    --enable-languages=fortran
-    --with-cloog=${cloog}
-    --with-gmp=${gmp.dev}
-    --with-isl=${isl_0_14}
-    --with-mpc=${libmpc}
-    --with-mpfr=${mpfr.dev}
-    --with-native-system-header-dir=${Libsystem}/include
-    --with-system-zlib
-  '';
-
-  postConfigure = ''
-    export DYLD_LIBRARY_PATH=`pwd`/`uname -m`-apple-darwin`uname -r`/libgcc
-  '';
-
-  makeFlags = [ "CC=clang" ];
-
-  passthru.cc = stdenv.cc.cc;
-
-  meta = with stdenv.lib; {
-    description = "GNU Fortran compiler, part of the GNU Compiler Collection";
-    homepage    = "https://gcc.gnu.org/fortran/";
-    license     = licenses.gpl3Plus;
-    platforms   = platforms.darwin;
-  };
-}
diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.patch b/pkgs/development/compilers/gcc/gfortran-darwin.patch
deleted file mode 100644
index 73c5d35153b0..000000000000
--- a/pkgs/development/compilers/gcc/gfortran-darwin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/gcc/config/darwin-c.c	2015-01-09 22:18:42.000000000 +0200
-+++ b/gcc/config/darwin-c.c	2015-06-27 04:17:58.000000000 +0300
-@@ -490,8 +490,7 @@
- 
- static const char *framework_defaults [] =
-   {
--    "/System/Library/Frameworks",
--    "/Library/Frameworks",
-+// stdenvDarwinPure
-   };
- 
- /* Register the GNU objective-C runtime include path if STDINC.  */
- 
- /* Register the GNU objective-C runtime include path if STDINC.  */
---- a/gcc/cppdefault.c	2015-01-05 14:33:28.000000000 +0200
-+++ b/gcc/cppdefault.c	2015-06-27 04:16:15.000000000 +0300
-@@ -35,6 +35,9 @@
- # undef CROSS_INCLUDE_DIR
- #endif
- 
-+// stdenvDarwinPure
-+# undef LOCAL_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e089956fdbf..7ce142534bc4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5058,10 +5058,7 @@ with pkgs;
     isl = if !stdenv.isDarwin then isl_0_14 else null;
   }));
 
-  gfortran = if !stdenv.isDarwin then gfortran5
-             else callPackage ../development/compilers/gcc/gfortran-darwin.nix {
-    inherit (darwin) Libsystem;
-  };
+  gfortran = gfortran5;
 
   gfortran48 = wrapCC (gcc48.cc.override {
     name = "gfortran";

From 2adb9f8e1bd129bc43311422b998f8ed476cece2 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Mon, 20 Mar 2017 17:43:51 +0100
Subject: [PATCH 2697/3449] scalafmt: 0.6.2 -> 0.6.6

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

diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix
index 59a16bfc27cb..2c763072c294 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.2";
+  version = "0.6.6";
   baseName = "scalafmt";
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
-    sha256 = "0xafl7vmncdycapi9shxqf73nhb24llgxjd2x98irmr9bvzg844q";
+    url = "https://github.com/scalameta/scalafmt/releases/download/v${version}/${baseName}.tar.gz";
+    sha256 = "143g288m6xr93pavbym2y6f8gvihsf53fnzjra6ln1s39n9h205n";
   };
 
   unpackPhase = "tar xvzf $src";

From fb50cde71e3ffd149faca1a1762c245542a24875 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 21 Mar 2017 08:27:56 +0100
Subject: [PATCH 2698/3449] nixos/treewide: systemd.time is in manvolume 7

cc #23396
---
 nixos/modules/installer/tools/auto-upgrade.nix     | 2 +-
 nixos/modules/programs/venus.nix                   | 2 +-
 nixos/modules/security/acme.nix                    | 2 +-
 nixos/modules/services/logging/awstats.nix         | 2 +-
 nixos/modules/services/misc/nix-gc.nix             | 2 +-
 nixos/modules/services/misc/nix-optimise.nix       | 2 +-
 nixos/modules/system/boot/systemd-unit-options.nix | 6 +++---
 nixos/modules/tasks/filesystems/zfs.nix            | 2 +-
 nixos/modules/virtualisation/rkt.nix               | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index dfb43d1a1db9..a4d4f16d1d96 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -48,7 +48,7 @@ let cfg = config.system.autoUpgrade; in
         description = ''
           Specification (in the format described by
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          <manvolnum>7</manvolnum></citerefentry>) of the time at
           which the update will occur.
         '';
       };
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 731ebed14c7b..110570ac3f06 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -45,7 +45,7 @@ in
         description = ''
           Specification (in the format described by
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          <manvolnum>7</manvolnum></citerefentry>) of the time at
           which the Venus will collect feeds.
         '';
       };
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 78bd09441f83..703d5ddbd0e2 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -110,7 +110,7 @@ in
         description = ''
           Systemd calendar expression when to check for renewal. See
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>.
+          <manvolnum>7</manvolnum></citerefentry>.
         '';
       };
 
diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix
index 8ab7e6acd98e..612ae06d0a79 100644
--- a/nixos/modules/services/logging/awstats.nix
+++ b/nixos/modules/services/logging/awstats.nix
@@ -38,7 +38,7 @@ in
         Specification of the time at which awstats will get updated.
         (in the format described by <citerefentry>
           <refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>)
+          <manvolnum>7</manvolnum></citerefentry>)
       '';
     };
 
diff --git a/nixos/modules/services/misc/nix-gc.nix b/nixos/modules/services/misc/nix-gc.nix
index 304168c65b0b..8b493041b2c9 100644
--- a/nixos/modules/services/misc/nix-gc.nix
+++ b/nixos/modules/services/misc/nix-gc.nix
@@ -26,7 +26,7 @@ in
         description = ''
           Specification (in the format described by
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          <manvolnum>7</manvolnum></citerefentry>) of the time at
           which the garbage collector will run.
         '';
       };
diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix
index a76bfd9f1f19..295e7fb0ba03 100644
--- a/nixos/modules/services/misc/nix-optimise.nix
+++ b/nixos/modules/services/misc/nix-optimise.nix
@@ -26,7 +26,7 @@ in
         description = ''
           Specification (in the format described by
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          <manvolnum>7</manvolnum></citerefentry>) of the time at
           which the optimiser will run.
         '';
       };
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 904e41b019fb..9be10a8283ed 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -328,7 +328,7 @@ in rec {
         Automatically start this unit at the given date/time, which
         must be in the format described in
         <citerefentry><refentrytitle>systemd.time</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry>.  This is equivalent
+        <manvolnum>7</manvolnum></citerefentry>.  This is equivalent
         to adding a corresponding timer unit with
         <option>OnCalendar</option> set to the value given here.
       '';
@@ -375,9 +375,9 @@ in rec {
         Each attribute in this set specifies an option in the
         <literal>[Timer]</literal> section of the unit.  See
         <citerefentry><refentrytitle>systemd.timer</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> and
+        <manvolnum>7</manvolnum></citerefentry> and
         <citerefentry><refentrytitle>systemd.time</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
+        <manvolnum>7</manvolnum></citerefentry> for details.
       '';
     };
 
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index d44209cfa0b3..518fe0a97d27 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -234,7 +234,7 @@ in
         description = ''
           Systemd calendar expression when to scrub ZFS pools. See
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>.
+          <manvolnum>7</manvolnum></citerefentry>.
         '';
       };
 
diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix
index c4c5cb3380e8..98be4f680c3a 100644
--- a/nixos/modules/virtualisation/rkt.nix
+++ b/nixos/modules/virtualisation/rkt.nix
@@ -22,7 +22,7 @@ in
         description = ''
           Specification (in the format described by
           <citerefentry><refentrytitle>systemd.time</refentrytitle>
-          <manvolnum>5</manvolnum></citerefentry>) of the time at
+          <manvolnum>7</manvolnum></citerefentry>) of the time at
           which the garbage collector will run.
         '';
       };

From 4e749683e65588028d134628ed70eb129c3df87c Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Tue, 21 Mar 2017 10:20:55 +0100
Subject: [PATCH 2699/3449] virt-manager: 1.4.0 -> 1.4.1 (#24149)

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

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index bd003df57f85..787729d3afc9 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -9,12 +9,12 @@ with python2Packages;
 
 buildPythonApplication rec {
   name = "virt-manager-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
-    sha256 = "1jnawqjmcqd2db78ngx05x7cxxn3iy1sb4qfgbwcn045qh6a8cdz";
+    sha256 = "0i1rkxz730vw1nqghrp189jhhp53pw81k0h71hhxmyqlkyclkig6";
   };
 
   propagatedBuildInputs =

From 9c730bc40bb134aa6b0d420947a3077379aedb29 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 21 Mar 2017 11:00:49 +0100
Subject: [PATCH 2700/3449] clooj: fix url

---
 pkgs/development/interpreters/clojure/clooj.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index 3dfb800afe10..527a5b2e5700 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "clooj-${version}";
 
   jar = fetchurl {
-    url = "http://download1492.mediafire.com/dptomdxrjaag/prkf64humftrmz3/clooj-0.4.4-standalone.jar";
+    url = "http://download1492.mediafire.com/5bbi05sxgxog/prkf64humftrmz3/clooj-0.4.4-standalone.jar";
     sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd";
   };
 

From 4263c53f668058e0f1a16ddc3703c2e3c72805fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 14 Feb 2017 09:55:06 +0100
Subject: [PATCH 2701/3449] Python changelog

---
 nixos/doc/manual/release-notes/rl-1703.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index f6e8e9a4515b..49ae296c40c8 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -273,6 +273,14 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
+  <listitem>
+    <para>Python 2.6 interpreter and package set have been removed.</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>
+  </listitem>
+
   <listitem>
     <para>
       Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
@@ -283,9 +291,17 @@ following incompatible changes:</para>
     </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>
+  </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>
+  </listitem>
+
   <listitem>
     <para>
-      When adding new or updating current libraries, the expressions should be put
+      When adding new or updating current Python libraries, the expressions should be put
       in separate files in <literal>pkgs/development/python-modules</literal> and 
       called from <literal>python-packages.nix</literal>.
     </para>

From b9f56c9f49db7542807b4b7cc814032e9b479ae3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 21 Mar 2017 18:28:50 +0800
Subject: [PATCH 2702/3449] handbrake: force link libx265

---
 pkgs/applications/video/handbrake/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 31d69536e522..f62e274874c1 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -77,6 +77,10 @@ stdenv.mkDerivation rec {
     (if useGtk then "--disable-gtk-update-checks" else "--disable-gtk")
   ];
 
+  NIX_LDFLAGS = [
+    "-lx265"
+  ];
+
   preBuild = ''
     cd build
   '';

From 8ebe71541f74caa19ed075d70240ce30a19488c3 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Tue, 21 Mar 2017 11:33:00 +0100
Subject: [PATCH 2703/3449] riak: switch interpreter version

---
 pkgs/servers/nosql/riak/2.2.0.nix | 4 ++--
 pkgs/top-level/all-packages.nix   | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index b18650fbbca8..5ad1e9f7a37c 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, erlangR16, which, pam, coreutils }:
+{ stdenv, lib, fetchurl, unzip, erlang, which, pam, coreutils }:
 
 let
   solrName = "solr-4.10.4-yz-2.tgz";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   name = "riak-2.2.0";
 
   buildInputs = [
-    which unzip erlangR16 pam
+    which unzip erlang pam
   ];
 
   src = srcs.riak;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e089956fdbf..ea51d9b53dbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10801,7 +10801,9 @@ with pkgs;
 
   mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
 
-  riak = callPackage ../servers/nosql/riak/2.2.0.nix { };
+  riak = callPackage ../servers/nosql/riak/2.2.0.nix { 
+    erlang = erlang_basho_R16B02;
+  };
 
   riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;

From b71b1b6e9af51c1103480d6f4c379ff447566469 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 21 Mar 2017 06:56:09 -0400
Subject: [PATCH 2704/3449] elpa-packages: 2017-03-20

---
 .../editors/emacs-modes/elpa-generated.nix       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 400b1cd42468..e80e8db08f08 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -1058,27 +1058,29 @@
           license = lib.licenses.free;
         };
       }) {};
-    lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    lmc = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
         pname = "lmc";
         version = "1.4";
         src = fetchurl {
           url = "https://elpa.gnu.org/packages/lmc-1.4.el";
           sha256 = "0fm4sclx9gg0d0615smz105x320sk45y4ivpjk3nbc67c5l0sh2h";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/lmc.html";
           license = lib.licenses.free;
         };
       }) {};
-    load-dir = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    load-dir = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
         pname = "load-dir";
-        version = "0.0.3";
+        version = "0.0.5";
         src = fetchurl {
-          url = "https://elpa.gnu.org/packages/load-dir-0.0.3.el";
-          sha256 = "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32";
+          url = "https://elpa.gnu.org/packages/load-dir-0.0.5.el";
+          sha256 = "1575ipn155nzzb5yghblxc7v1vpq4i16w1ff7y56qw2498ligpc5";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "https://elpa.gnu.org/packages/load-dir.html";
           license = lib.licenses.free;

From 2126246bff1ef4bd6202b5a2086c1511dca935bc Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 21 Mar 2017 06:57:38 -0400
Subject: [PATCH 2705/3449] melpa-stable-packages: 2017-03-20

---
 .../emacs-modes/melpa-stable-generated.nix    | 177 ++++++++++++------
 1 file changed, 120 insertions(+), 57 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index 8a5d293ab055..e63c11a9da5a 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -2746,12 +2746,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "0.4";
+        version = "1.0";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "c72d26ca2f9c0672192b5f40302ad0ebfc2d6db6";
-          sha256 = "1grsaajfbhgq1wlraq8v21sfqdnk9ja3gj7y982hh44671haqjvw";
+          rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56";
+          sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -5892,12 +5892,12 @@
     datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "datetime";
-        version = "0.2";
+        version = "0.2.1";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "datetime";
-          rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457";
-          sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg";
+          rev = "3ecf9985250ecd441e91614b44cf12323af907c0";
+          sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -7052,12 +7052,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "0.4.3";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "3f15f30a7330dd13a1d88891345ab382e9bee7cd";
-          sha256 = "12y5gf65jdmh1m0fygzx4snfixlgc1laaax0w7ajkbhahyn8dwzc";
+          rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0";
+          sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -9070,8 +9070,8 @@
         version = "0.1";
         src = fetchhg {
           url = "https://bitbucket.com/seanfarley/erc-hipchatify";
-          rev = "2b93fb7103f5";
-          sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p";
+          rev = "a53227513692";
+          sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
@@ -9213,12 +9213,12 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "19.2.3";
+        version = "19.3";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "aa315e1cf1b79ab782e5b4c944595495ebf4e2f4";
-          sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c";
+          rev = "a748cafdc7063d9f181ba12088db6458793ced2f";
+          sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -9839,6 +9839,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-embrace = callPackage ({ emacs, embrace, evil-surround, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-embrace";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "evil-embrace.el";
+          rev = "4379adea032b25e359d01a36301b4a5afdd0d1b7";
+          sha256 = "0rj1ippc6yi560xalhd91r7a00lk3d0jk13w464myznkpnasfw3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d4886f068766514deab5673b4366d6bdd311e3b6/recipes/evil-embrace";
+          sha256 = "10cfkksh3llyfk26x36b7ri0x6a6hrcv275pxk7ckhs1pyhb14y7";
+          name = "evil-embrace";
+        };
+        packageRequires = [ emacs embrace evil-surround ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-embrace";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-escape";
@@ -10513,12 +10534,12 @@
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
-        version = "0.7.4";
+        version = "0.7.5";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "eyebrowse";
-          rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef";
-          sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl";
+          rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20";
+          sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -15466,6 +15487,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ext";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "helm-ext";
+          rev = "115a3ca9a466fa84c1874ac6175fdf2256c3765c";
+          sha256 = "19bcrgj531par1ayhgwxvzz28fyd7dx5flslxf1vl4qawhn173fz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext";
+          sha256 = "0la2i0b7nialib4wq26cxcak8nq1jzavsw8f0mvbavsb7hfwkpgw";
+          name = "helm-ext";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-firefox";
@@ -17275,12 +17317,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "3.15";
+        version = "3.16";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
-          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
+          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -17380,12 +17422,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "3.15";
+        version = "3.16";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "950afaed5d36fc4447dd3a517ddb0dd281d8aaf6";
-          sha256 = "0gk1bkllzs3fil2fcj3iha43y43370sgrrs5r6j7hzyhnxqmp965";
+          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
+          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -21031,12 +21073,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "0.6.6";
+        version = "0.7.0";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9";
-          sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp";
+          rev = "7a6e26ae74c86cc2afffc21de7567a63feb19a7d";
+          sha256 = "1l23nj6fsnqf2xc766rnz5ib6578rvsbn0cdwmw5li6waqbzvla2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -21450,12 +21492,12 @@
     mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mmt";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "mmt";
-          rev = "e77b809e39b9ab437b662ee759e990163bc89377";
-          sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
+          rev = "f7db836a10720ee50217012e7e2597ebcf624f90";
+          sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -21618,12 +21660,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "3.2.1";
+        version = "3.3.0";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "fc5822fcb11c3c6af67b5fb152f92c3e6e3c49d3";
-          sha256 = "0r81jdwfmgzivfpkxqr425qajgw3dzzs8y2v5lsiwl1d5z8rz52a";
+          rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36";
+          sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -23363,6 +23405,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-board";
+        version = "1000";
+        src = fetchFromGitHub {
+          owner = "scallywag";
+          repo = "org-board";
+          rev = "ed62187790f415a006194f69bf86c6ca6959b2e4";
+          sha256 = "0kh32xkqiy4bh72mykswpi20x1fvr6m7751d4lnjczx836ncmggy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
+          sha256 = "00jsrxc8f85cvrh7364n7337frdj12yknlfp28fhdgk2ph6d7bp4";
+          name = "org-board";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/org-board";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-bookmark-heading";
@@ -24760,12 +24823,12 @@
     packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "d2f01bffc987b226f618dda0663a1e233161518d";
-          sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f";
+          rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
+          sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
@@ -25010,12 +25073,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "0.4.7";
+        version = "0.4.9";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b";
-          sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx";
+          rev = "c67686b24cf14064931d812f29f4114b30696d12";
+          sha256 = "0lpj81hkzw24v1f3s13rw22sm1nm0i177di5v2b8kwy50pjirs8v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -26496,12 +26559,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.13.1";
+        version = "0.14.0";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "038c7f9724f684c7862e108150e256a00ff9c5c6";
-          sha256 = "0hjf54nn08ifd8cd3y19g47lwyvacqjx1fmy8x4kpn14fwzs4xnv";
+          rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1";
+          sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -27858,22 +27921,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, use-package }:
+    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
     melpaBuild {
         pname = "req-package";
-        version = "0.9";
+        version = "1.0";
         src = fetchFromGitHub {
           owner = "edvorg";
           repo = "req-package";
-          rev = "374c6d1a81b5448a66295be8c132c42ca44eeddb";
-          sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
+          rev = "30f76a9c52994562191c90c315002410706f6c0b";
+          sha256 = "0qdr2pshfq6v75s9hx9wgvn56pd7b65vaqaa64dryr7v4yzd4r15";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
-        packageRequires = [ dash log4e use-package ];
+        packageRequires = [ dash ht log4e use-package ];
         meta = {
           homepage = "https://melpa.org/#/req-package";
           license = lib.licenses.free;
@@ -28867,12 +28930,12 @@
     sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "sekka";
-        version = "1.6.5";
+        version = "1.6.6";
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "001e205b37ae0dded430b9a809425dc7ed730366";
-          sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q";
+          rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
+          sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -32816,12 +32879,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "5.3";
+        version = "5.4";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7";
-          sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42";
+          rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
+          sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -33446,12 +33509,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "2.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "ea6f1dc5aacff2f3d909e410db05af01966555aa";
-          sha256 = "0pckvxk2vpwqfypz5vyk0ig6g5697ibnlk8vspvqpanahvgaj0nh";
+          rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512";
+          sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -33722,8 +33785,8 @@
         version = "0.9.1";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "3a654cfe6632";
-          sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d";
+          rev = "3447d48e8562";
+          sha256 = "1qym4wfcr3hiq0a1z3myvzalblwwp5xalq9sjx090w3ag3ghgjrg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";

From 06795f757de24e00c30ebe1e9b3a002f458108cf Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 21 Mar 2017 07:00:15 -0400
Subject: [PATCH 2706/3449] melpa-packages: 2017-03-20

---
 .../editors/emacs-modes/melpa-generated.nix   | 1317 ++++++++++-------
 1 file changed, 795 insertions(+), 522 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index 844dfa9fcb80..3cd7db90654e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -380,8 +380,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459";
-          sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx";
+          rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
+          sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
         };
         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 = "1f823b74622b1602c7336991c211b71d3f20b180";
-          sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6";
+          rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
+          sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@@ -758,8 +758,8 @@
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "1f823b74622b1602c7336991c211b71d3f20b180";
-          sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6";
+          rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
+          sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@@ -985,12 +985,12 @@
     ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-link";
-        version = "20161203.1059";
+        version = "20170319.553";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "ace-link";
-          rev = "3691a0ca4d897d1b5f51795a14dc33b4ee48dd4a";
-          sha256 = "0yhy6cq19zllc8cycpq5assdgdmhl77ybs7xr3q99m0jqx20g5xx";
+          rev = "0b6e06e0b5222a57e5e6f1d9af6436eb12102e3e";
+          sha256 = "1h8j1dl9xyybm0pj3j2j6fcq7bryby2h1s64r6ijcsgrqgimq66i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link";
@@ -1299,12 +1299,12 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20170310.828";
+        version = "20170314.1428";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "0492172a766971405fb6dea19371a3c97db8dc3c";
-          sha256 = "12s14diivykwfmkp5429j1y5ry8is81wmnmw048wy3jlh4zwrxnc";
+          rev = "d5417f449af0dc13c402e6d9949ba002aa8b83af";
+          sha256 = "0sn7706b9zfj0ry9mzml7rmxprg9q01bkyp9v68xx767jgl9mcf8";
         };
         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 = "20170311.1021";
+        version = "20170314.112";
         src = fetchFromGitHub {
           owner = "domtronn";
           repo = "all-the-icons.el";
-          rev = "7b799f901ceecf1aeb101ebeef5f785c2e4d6d03";
-          sha256 = "10sd8m8ym7c47fkdawkiss3cfrm9kwh0ysknrws1g108zpmszsij";
+          rev = "ceba445b3307822309b10a7de54bd500e9ec3be9";
+          sha256 = "08gfr9wixnpmz7pvf3yg0qwbzrffhn8vja2nzvvci6qk1b0sy2zc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons";
@@ -3527,6 +3527,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    auto-read-only = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-read-only";
+        version = "20170305.2043";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "auto-read-only.el";
+          rev = "79654f8fc024f383ae7af05487c1345738236500";
+          sha256 = "123822s9xkzw25swn1h1szxmmajnn9rq85vasygvy5cn2l6lar3l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/189e394eb9fac09783c75ff1b64facdd745a0454/recipes/auto-read-only";
+          sha256 = "1cvh2c7pgdxgnl0fr1lymz9pf573hj6dn8cjcb64wdczkrci7yk5";
+          name = "auto-read-only";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "https://melpa.org/#/auto-read-only";
+          license = lib.licenses.free;
+        };
+      }) {};
     auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-save-buffers-enhanced";
@@ -3597,8 +3618,8 @@
         src = fetchFromGitHub {
           owner = "robert-zaremba";
           repo = "auto-virtualenvwrapper.el";
-          rev = "bfe512270cd6471346f149d46e9f724569dd10a9";
-          sha256 = "1mw61d29z8p847qmlyjqpl1lmnpla40xh5sxgqg5hjp9scwwwp8w";
+          rev = "114a096561ac3a3b10165d05a6e763cb3c39a9b3";
+          sha256 = "0j392l0kb6h5ckmpvhd71blw7ad9i2r7fc6laqq6vsibnw899wy5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper";
@@ -4263,12 +4284,12 @@
     base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "base16-theme";
-        version = "20170307.143";
+        version = "20170317.1130";
         src = fetchFromGitHub {
           owner = "belak";
           repo = "base16-emacs";
-          rev = "f6d3d45a88d8fa2d70eaa26d8ebcef741b370dd1";
-          sha256 = "19jbvz07qc325mqdzk0q1ycvpibndw0mb7s7bpr0f0nblla0l0sv";
+          rev = "858c067dd05b1e1ef57e083504b094972ad3a318";
+          sha256 = "08fsil8k7m2rs7471basxwpaihrjys1g4fdv3fb2xf2wwfcv08s3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme";
@@ -4973,8 +4994,8 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "53bf803f1d3efc61653f94fe56ff30a72304861e";
-          sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp";
+          rev = "bf9a73f919cbd677e4015f82e90099d7cabe5011";
+          sha256 = "079vvhv0wjk0nqisk86z1nkxm9hgwnv93dsb3rlqnzjdijw6z2s2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key";
@@ -5427,10 +5448,10 @@
       }) {};
     bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "bookmark-plus";
-        version = "20170312.1134";
+        version = "20170312.1135";
         src = fetchurl {
           url = "https://www.emacswiki.org/emacs/download/bookmark+.el";
-          sha256 = "14xkhc0x5ac2b0np5hvb0f4d1rap4yysbvm3fnmaaq4kylriysad";
+          sha256 = "0vr5v6laav6hhx8g9v4pjdmfjcc2bylvvjwzfby9a4s838dakgkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+";
@@ -5467,12 +5488,12 @@
     boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20170214.1228";
+        version = "20170318.1312";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "bb751855aa099ea3d6f4573534e0d3fa010aaea8";
-          sha256 = "09bfmds8xfjafcqpn6fc5qjaixd0pvjn42jyr4kkgb8pi5c4vkvv";
+          rev = "d9f0545708bbbbe3df23b2b91cdd2824beb0df56";
+          sha256 = "0crqwyhzkwpi7c0rqcgmgqx6g4f8fw9gd9nh0ii6p5agiw140yj8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon";
@@ -6235,12 +6256,12 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20161209.154";
+        version = "20170316.1516";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "07c525eaf9c1a9f1b48928b64e1802b1f1b25be3";
-          sha256 = "1l4hjb21283mrb9v67k2xl83plq18ri7pqcp2kgs2ygbfnbwwqcs";
+          rev = "677d6d3c253e69bee9e310911605833e79253ee3";
+          sha256 = "0h8kq3p2ksyiqn4f6z7flq15q3dxps2fp5a8zzfpxbs67k13nrf3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup";
@@ -6505,22 +6526,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }:
+    calfw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "calfw";
-        version = "20160302.1858";
+        version = "20170320.506";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-calfw";
-          rev = "e03ae470788778e7714b73520014eadc03a88abd";
-          sha256 = "0rhasr818qijd2pcgifi0j3q4fkbiw2ck1nivajk7m810p53bxbj";
+          rev = "136dce009a26e7d8a8064af422c2cf8170e852c5";
+          sha256 = "1hiip8hfl7myimgba7ggs1ki1pk3ag7nyfa8j2zzm87n93g5xia4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1d1aaab9844413a5fff992509935b399b5154c3d/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
-        packageRequires = [ google-maps ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/calfw";
           license = lib.licenses.free;
@@ -6804,8 +6825,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd";
-          sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna";
+          rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
+          sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc";
@@ -6846,8 +6867,8 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd";
-          sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna";
+          rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
+          sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb";
@@ -7073,7 +7094,7 @@
         version = "20170201.347";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "12051";
+          rev = "12069";
           sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k";
         };
         recipeFile = fetchurl {
@@ -7658,8 +7679,8 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "f5a1ade83c0299df9ae99bbb5a2bb843e0168452";
-          sha256 = "14zdnvjjlqgw6y23lgs5mjf3b0g5z04xqzvn3fyjgbjzw77pa9ya";
+          rev = "d528100ecb1441933b0c9ef1920d147cf6c9a40b";
+          sha256 = "0a5vbiajw602i83f1j95jiqn1gyv0srmbnf2l878n2ha3qcgx9mr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider";
@@ -7930,7 +7951,7 @@
         version = "20170120.137";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "297625";
+          rev = "298328";
           sha256 = "0011wlqjkr1x58y0v5nf600nn7dj44cllp2m1dyj90aixjx4saq2";
         };
         recipeFile = fetchurl {
@@ -8547,12 +8568,12 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20170202.1402";
+        version = "20170316.643";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "916f35e775c721a97fca8e11565c12207448c2f1";
-          sha256 = "1c7y2zyk8ihzn2za9mlpvjv5fp559rd2a5b42jz7lm2zkyn5a8b8";
+          rev = "66059dabe9eb8aea24a56ef7e8d0b457cd814663";
+          sha256 = "1vlrp1an7p61xzmsk5w48yjd5m89yg52jcbxfckmi40rz22j81lh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide";
@@ -8572,8 +8593,8 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "ccec62c6aa8ac44aaa9908ca5d72c396c5f068c0";
-          sha256 = "1wdhyrx7ddqrj0fwqpdqrgnbdmcbk0z83jsn9lkqqv5bnw0l5k5r";
+          rev = "3be5896e013492cbe1cf65c1c61822b68d9d59c4";
+          sha256 = "1ka86imvs9wx4bx3k8dmkg4sm83pvzcajfv84qld2i20j2f5qbsn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@@ -8737,8 +8758,8 @@
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "code-library";
-          rev = "3c79338eae5c892bfb4e4882298422d9fd65d2d7";
-          sha256 = "0gc56pdyzcnv3q1a82c79i8w58q9r6ccfix9s1s6msjxzxkznap5";
+          rev = "32d59c5c845d6dbdda18f9bd1c03a58d55417fc5";
+          sha256 = "1n00bb39jgx02zdgla85zx0a338xir0zh0af6xca14kg5bx07vsv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/197bdc508c4fd9712125553a108ca6c9fedcaefc/recipes/code-library";
@@ -8838,12 +8859,12 @@
     coffee-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "coffee-mode";
-        version = "20161124.832";
+        version = "20170315.2046";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "coffee-mode";
-          rev = "231eccd8cf662516159359ed24d1b27d068ec7f8";
-          sha256 = "1anidih1kbwqifrb7v90ga172alqhxizwz1vrf87cnj5ns1h1hx8";
+          rev = "ea6dc5fb2b3ba3818b91a4e5ca5d593145fb571f";
+          sha256 = "0bjxvw000r95vzic38savispx3j5dx3d3ni9w7j4zb9hv78kjbnr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode";
@@ -9165,6 +9186,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "comint-intercept";
+        version = "20170317.528";
+        src = fetchFromGitHub {
+          owner = "hying-caritas";
+          repo = "comint-intercept";
+          rev = "a329abf01fa8e0c6b02b46b29bcb421a21120dc5";
+          sha256 = "0qswlafav415fh1dwqjsjmqlbnsjdl9gl3nzzya76ql5f0gb7svb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/7d38188ec2d6e16714de9bb24ebd1ea89c7df3da/recipes/comint-intercept";
+          sha256 = "1m2fn02n7aphlqmiaxgwp8jqg60sq4001cnkdxn5wb3w1hxy5qvq";
+          name = "comint-intercept";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/comint-intercept";
+          license = lib.licenses.free;
+        };
+      }) {};
     command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "command-log-mode";
@@ -9315,12 +9357,12 @@
     company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20170218.1913";
+        version = "20170315.1754";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "bc2ce4e23ff2a3bd4a8ffa766acc5efb0643a7d1";
-          sha256 = "0s246gaa85g6mmvzrk6293qni39rg43lmdgkfn5hwz2zrbp9blfx";
+          rev = "e19e53eacca9624981068939b00b8d630c987d53";
+          sha256 = "1nxk64pnq4a7flazyrk179v9m25jm2sw2bn0s9viw26vhvm7y3lk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company";
@@ -9607,8 +9649,8 @@
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459";
-          sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx";
+          rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
+          sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim";
@@ -9754,8 +9796,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "d09cef6327ed848a446636a857cd851dc7e63d19";
-          sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw";
+          rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18";
+          sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go";
@@ -9960,12 +10002,12 @@
     company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company-php";
-        version = "20170308.1819";
+        version = "20170314.2141";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "1f823b74622b1602c7336991c211b71d3f20b180";
-          sha256 = "0wnw1cbxjp0yvkpba01dngvbzplwnq52bll9lryq58wmqi6iwmx6";
+          rev = "c1fb9dcf6d656618d22e97f305349e360a6e9d39";
+          sha256 = "1v97hghn39p4wjmy7y9cvv4v0d2n44s1zrw5hvpmh7ix19i4347h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@@ -10260,12 +10302,12 @@
     composable = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "composable";
-        version = "20160519.1057";
+        version = "20170319.644";
         src = fetchFromGitHub {
           owner = "paldepind";
           repo = "composable.el";
-          rev = "73f46689cc298f87d2986fe634dadc930581addd";
-          sha256 = "0phqphcgygy2amwy6lm96mxxhwac03p177lyklksy71gwlr3zxb5";
+          rev = "30bdd343f846d71c280189a1236324591b10d9ce";
+          sha256 = "1pnawyjr6r80nlbh8mncvr42kwr9kha18sslnzx6agm0zzil36ib";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1fc0f076198e4be46a33a26eea9f2d273dda12b8/recipes/composable";
@@ -10595,12 +10637,12 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20170225.356";
+        version = "20170320.434";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
-          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
+          rev = "beffa78885517beaad2da50accc339f9346f94ee";
+          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel";
@@ -11635,8 +11677,8 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "af4737d709a90cc867ed93447e5354ee250ad6ec";
-          sha256 = "0pz99wc7karlj4bvb6j6d1drfxmkb5f22pg27v4qqayl1hig0m14";
+          rev = "c94245482141cf891a1cd8a4fa57b8bd61359a5d";
+          sha256 = "1vm8ijk6x0h20366mdnwf5hxj8zbyms06c3dh8msrchvrhd52prz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode";
@@ -12114,12 +12156,12 @@
     datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "datetime";
-        version = "20161007.1137";
+        version = "20170318.254";
         src = fetchFromGitHub {
           owner = "doublep";
           repo = "datetime";
-          rev = "6585b2dcb0b3871a2a63656d01baa0c9a300d457";
-          sha256 = "07rb8r3j8293h0ffpwhf7mxnshqi08pb63swhmdzb34hn57cx4jg";
+          rev = "3ecf9985250ecd441e91614b44cf12323af907c0";
+          sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime";
@@ -12240,12 +12282,12 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20170311.1248";
+        version = "20170318.2238";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "0cffdc4f3aa11634088b7ceac51a93b32f0501bd";
-          sha256 = "1fwz12j86izrp9dfqsb6cw6007rdsaisps0c67div1szf11plhna";
+          rev = "b0c56cc59cc184bd88f20f00714b256c4b4a9c2b";
+          sha256 = "12yzs19nl89lqbyyzcl1vygf0m2x5sxjw9vg7zc6ix9m59ig2q42";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk";
@@ -12364,12 +12406,12 @@
     decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "decl";
-        version = "20170310.632";
+        version = "20170314.23";
         src = fetchFromGitHub {
           owner = "preetpalS";
           repo = "decl.el";
-          rev = "c2b5ea44b77516b50e917ddc897f88dbf2a58894";
-          sha256 = "1y40cyb61ghjhxn03ipbsx08b5d5qa909zp27g8r9nck4i3ni5gq";
+          rev = "500ae2da41c65f4e35abf5cd352411ce7ed3f9df";
+          sha256 = "1slfh4sjvprmg0pa4pq1h5jiwiszak7l8hakbvjy1ycbh97gnd17";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ecd46180643a0c493e05ec86fe50bc1e55146/recipes/decl";
@@ -12698,11 +12740,11 @@
     dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }:
     melpaBuild {
         pname = "dic-lookup-w3m";
-        version = "20160722.2319";
+        version = "20170315.709";
         src = fetchsvn {
           url = "http://svn.osdn.jp/svnroot/dic-lookup-w3m/";
-          rev = "95";
-          sha256 = "1lr236vz38mlzgqdcfx3adrnbfv55f1a6r2xgfkla0m2vq09v3bn";
+          rev = "96";
+          sha256 = "17g0bl94qmzalh3m6r6q10q06864d1h1nx5i7fddsamakmg89ziw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6627b66fff02513ee467ed0f4436fb5cd400a81d/recipes/dic-lookup-w3m";
@@ -12718,12 +12760,12 @@
     dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "dictcc";
-        version = "20170207.835";
+        version = "20170318.1232";
         src = fetchFromGitHub {
           owner = "cqql";
           repo = "dictcc.el";
-          rev = "a1e87dad68faee956e4614c4f0f0bb98ba81ab6a";
-          sha256 = "086nq9ngn06n605s21733456knna2py5dfymm8824zslzz39i8fy";
+          rev = "24fb40d0822f97c3d796ae81cb6684cd97263248";
+          sha256 = "1faj9c4x306s3ml430s01c9zcg9xgj9p34v630046y4lh4i25qc8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc";
@@ -13195,12 +13237,12 @@
     dired-hide-dotfiles = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-hide-dotfiles";
-        version = "20170312.1017";
+        version = "20170314.1339";
         src = fetchFromGitHub {
           owner = "mattiasb";
           repo = "dired-hide-dotfiles";
-          rev = "32cf3b6f90dc56f6ff271c28d827aab303bc6221";
-          sha256 = "1fpzgmvbgfgl6wdrynlpvvdlbm8npgrmnzfz2133zvf5x3zfzq6r";
+          rev = "b715f643ec805b3b8aca334595e6589320f04a49";
+          sha256 = "1n6l25lrhp1x8nhc54kqal96wq96kkfyvz5yzvlw1qd3yk4s567i";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ba64a50f85fdb0ad54149dfed4051b4c1a719cbb/recipes/dired-hide-dotfiles";
@@ -14274,8 +14316,8 @@
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "docker.el";
-          rev = "2c2f3c68f8136caeef67c4e74cc84d52a7664535";
-          sha256 = "0qyksf5svcpz263ah197bcmpnfn2rfq8x049wbalxi638bmbvzfg";
+          rev = "b565a66d7fb8b41363fb90172b9882d4768ddd47";
+          sha256 = "185mw8yaxpq7327nyyqjbc4bipx6shhmbl1dzdl3bfhc11vp1xfn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker";
@@ -14446,12 +14488,12 @@
     doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom-themes";
-        version = "20170222.1412";
+        version = "20170316.1237";
         src = fetchFromGitHub {
           owner = "hlissner";
           repo = "emacs-doom-theme";
-          rev = "f6a5a148851183b2e3a92d21bc179cc637b5fcdd";
-          sha256 = "0w53gar82avmwx6rlhnn2p2vlmpghrn7hy83lggiawgr4h3yw4dw";
+          rev = "2266ef462d3c0a4b79887d71447a45cf57b6a1d7";
+          sha256 = "0p3f364f5p5wgma5c5iyknm73bvqvkfakndrn2r0k7phn29vw9fb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes";
@@ -14752,8 +14794,8 @@
         src = fetchFromGitHub {
           owner = "sshbio";
           repo = "drawille";
-          rev = "d582b455c01432bc80933650c52a1f586bd1b5ad";
-          sha256 = "1z3akh0ywzihr0ghk6f8x9z38mwqy3zg29p0q69h4i6yzhxpdmxa";
+          rev = "d914845725719d8293e2f0dea3c9c7e0a1e0e62a";
+          sha256 = "1ynjxfvx8b6rq6d4gm1sl96rmlk5pi8j5s1rd1y0p8x2lwqcfv77";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e0920232421bf177f2ab8595fab7e203f40b1a34/recipes/drawille";
@@ -14894,7 +14936,7 @@
         version = "20130120.1257";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1786710";
+          rev = "1787893";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
@@ -14995,12 +15037,12 @@
     dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
     melpaBuild {
         pname = "dumb-jump";
-        version = "20170312.1831";
+        version = "20170318.1423";
         src = fetchFromGitHub {
           owner = "jacktasia";
           repo = "dumb-jump";
-          rev = "c5e81e4ef8baa92b4e7a0b5d91fb18cde1907923";
-          sha256 = "01fih3i17s8ih8n79bxgpknfh7z0wgrb6asvvp32bxmmkhwrppkr";
+          rev = "05fa8564d5f9a567f682e1efcc2d3bcdb9ba247d";
+          sha256 = "0pwlz8g170x7dp46cshjvqsxsrz7snqy0dhpwf61ysbapflylyi8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump";
@@ -15558,12 +15600,12 @@
     eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }:
     melpaBuild {
         pname = "eclim";
-        version = "20170310.900";
+        version = "20170317.1328";
         src = fetchFromGitHub {
           owner = "emacs-eclim";
           repo = "emacs-eclim";
-          rev = "1d35c6a213f439ff0da10359af456cf0ee5fa459";
-          sha256 = "189a8na2ymf9is5sr93ilp0r9jj94a7ms5ykjj4ws4w5cd9vx7cx";
+          rev = "e9391a70b8add187fc7c0a22f083ca1ac42e289b";
+          sha256 = "1z71rdr4p6bnm8flbqsmds2f2lk587x90qls01zb1fn6w4lsl4zl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim";
@@ -15751,8 +15793,8 @@
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "ede-php-autoload";
-          rev = "dfabfc775ab3288ac91aac855de4b64e5279f0a2";
-          sha256 = "0nb2yfbw3zsxpygy8ksz55k720lymy2fbfszh1qfd4yi0hkmbm5i";
+          rev = "8ab5c333ded9110ed2dce90ca7fd89dcb3912dd4";
+          sha256 = "127a5rf21ynw96lw1ydzdvpjpxzccn3dhvc6f24s96sg8r04hpbw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload";
@@ -15789,12 +15831,12 @@
     ede-php-autoload-drupal = callPackage ({ ede-php-autoload, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ede-php-autoload-drupal";
-        version = "20170225.1448";
+        version = "20170316.1458";
         src = fetchFromGitHub {
           owner = "xendk";
           repo = "ede-php-autoload-drupal";
-          rev = "2989b39067d5b556abb2977e52f1f0775fff3bbc";
-          sha256 = "0j9nz2w3mg895nvfqnmxhl41xr6ijfrpqrf044mrz5h97hgk3g7w";
+          rev = "54a04241d94fabc4f4d16ae4dc8ba4f0c6e3b435";
+          sha256 = "1ckfja95zk4f7fgvycia7nxhxjgz4byrz30ic63f6kcq4dx78scs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/532fec4788350cc11893c32e3895f06510a39d35/recipes/ede-php-autoload-drupal";
@@ -16138,8 +16180,8 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "d44a906db46f6708f3e02e5ae460c2b698593492";
-          sha256 = "0dw1jxzcxs47cq5sza28kz198zk0nhf0dv5ily262i5p0wl2kcjc";
+          rev = "b196db4ca284abfbc63416582fe17cc357551fc2";
+          sha256 = "0sw0cf69yswhgnyp10qjirrb2w2p9y6pc7ni8wbw8l16pmc7vgg0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode";
@@ -16216,12 +16258,12 @@
     ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20170224.1115";
+        version = "20170320.1222";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "4578772ff1a64fa50f225646a9f4cd2c3070bffb";
-          sha256 = "0dcn3wkb1hvmk9jy5s28nyfw7hrxslzjlylxxrf8g454swkmx0i8";
+          rev = "12e522c05f215ecf75541b07cc77cf89fea63c2d";
+          sha256 = "18hb0b3wh681nqmlfn0xysr933mpb3cphlkp88rq8jg0wgw9psni";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein";
@@ -16405,12 +16447,12 @@
     el-patch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-patch";
-        version = "20170227.2208";
+        version = "20170310.2128";
         src = fetchFromGitHub {
           owner = "raxod502";
           repo = "el-patch";
-          rev = "0cbcbc0ddf2f65ce02a4b0b027990d7131828a9b";
-          sha256 = "1nzzjb5q58f5p0jpa3rg9mmnkmnlbs19ws993sn5fcb1161hhg7r";
+          rev = "26d1b4f7920ca32e0e76a3ffa23784a80253c9f4";
+          sha256 = "0rk1qvgdnx1xn7pmb2713i68xm05kp3cfkwvd5smbkzjj2nvbi20";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch";
@@ -16588,6 +16630,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el2org";
+        version = "20170320.1534";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "el2org";
+          rev = "1b2f01585bce80b2bb503e8b21e373ad5e946eed";
+          sha256 = "0jinjrl2fgxixdkkayvajd7pzqz8vmqdkni8pm4shn781n660b2g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/dcbeff073f03d03b306f1d96ba2dcf140b57a634/recipes/el2org";
+          sha256 = "1fshlq06psmfnp1gcmkqiw0hrm25dgl67ijb9sb3m6q1z9wml674";
+          name = "el2org";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/el2org";
+          license = lib.licenses.free;
+        };
+      }) {};
     eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eldoc-eval";
@@ -17103,8 +17166,8 @@
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "elmacro";
-          rev = "9ed19a362b63d9c7436a78feb91bc694194cfefe";
-          sha256 = "00qqa9p9z50gxna4qrsvph4nj41gldl1qj210ywk3lgwn0jjm0k9";
+          rev = "97c8ca4041e5082df243ad6371a091759c30d0f7";
+          sha256 = "0kqnnp7kfdgizs18zhsaxci210bgpr73w39dhb2y09yj40ja3yx4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro";
@@ -18376,12 +18439,12 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20170128.359";
+        version = "20170318.1059";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "ee16c7a91b9ac1585be287ecf94e4b20aaaea3f5";
-          sha256 = "15ldbviaxd9nlb11c3aw7dnp8xxyldm67dmbnsv6f3rpafy1gmzv";
+          rev = "9ccf54cddb1d7884f36de9d7d077cee55eae410e";
+          sha256 = "0y6v9bmhspfmr3bmqf5av4n1xdwj0nx9fws0gw8n9ln92yz6w3sz";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime";
@@ -18657,11 +18720,11 @@
     erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }:
     melpaBuild {
         pname = "erc-hipchatify";
-        version = "20170228.1151";
+        version = "20170314.937";
         src = fetchhg {
           url = "https://bitbucket.com/seanfarley/erc-hipchatify";
-          rev = "2b93fb7103f5";
-          sha256 = "1z2vqy8wg5fhv0vfai0zla8swvld3j4378q72knnkyzjqrbn4s5p";
+          rev = "a53227513692";
+          sha256 = "0av0y65hz7fbiiqzmk5mmw6jv7fivhcd1w3s2xn5y5jpgps56mrc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify";
@@ -19017,8 +19080,8 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "47e46069d01960b74cefeba648e98e6afbb79e59";
-          sha256 = "1319rs0cj396q3zdzfwiijynx8rgzy7zchqya8gjrqxfq5bh6p01";
+          rev = "a85efc31824b4d59f4ed1eefcd19e9d7c6ef021f";
+          sha256 = "1w8m12s8cjy20nssp5ya83zi3jkxk4f6fv4d7xr9gzgvrsqcq2rx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@@ -19387,12 +19450,12 @@
     eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-git-prompt";
-        version = "20170310.2205";
+        version = "20170316.1051";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "eshell-git-prompt";
-          rev = "1e57eed52fad929f36ae5e3a9e3aa45ad019ee93";
-          sha256 = "0wa4whvhg6l7v8yis2hlil79dsjsp2qacvc81pbhf5j24fbfhd5x";
+          rev = "ec246fa4c27ecb7df10c93b0710e6a64fa5ef4c9";
+          sha256 = "0dc1d6z8m3dvgqvp16nsw84g4fwzqv3nh21k1v2mr3iy8nmdf0l2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt";
@@ -19492,12 +19555,12 @@
     eslintd-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eslintd-fix";
-        version = "20170310.835";
+        version = "20170313.1943";
         src = fetchFromGitHub {
           owner = "aaronjensen";
           repo = "eslintd-fix";
-          rev = "fe2ed976c79474baa2cdb2fc4477786cb42d5b22";
-          sha256 = "1y6c94kk4bb3y3dw7sbv7w6fj9c4j0hq0gsy1m1675zzv8ar1di9";
+          rev = "afa5cd1c1fb644a918e410ef396392b841146632";
+          sha256 = "04ixmv1y7zi32xwywn4dz0nvsvpmdk2m80y9fbaxi5skkx9r30g0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c72d2b3ee9b8066d51d09e165e58e9846ca879cc/recipes/eslintd-fix";
@@ -19843,12 +19906,12 @@
     euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "euslisp-mode";
-        version = "20161226.840";
+        version = "20170315.2046";
         src = fetchFromGitHub {
           owner = "iory";
           repo = "euslisp-mode";
-          rev = "cbbb60cf7d301c19906678bae933060af21c1a86";
-          sha256 = "0xz4asnwg52f02jmyz2flmkl748isacvjylfwi23xdcxqiab454a";
+          rev = "fbaa35e77eee91da5ce86fbf5342648722b97d7c";
+          sha256 = "0y9l6h1824a7sd4w26s1ql8ffim42pcz8szadmwk2v4p64cya76l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode";
@@ -20407,6 +20470,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-lion = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-lion";
+        version = "20170319.143";
+        src = fetchFromGitHub {
+          owner = "edkolev";
+          repo = "evil-lion";
+          rev = "039c82f5183a01b6e008b1028b48f1ec33f74eff";
+          sha256 = "1zgk0xmvfnqvh0d0925c8sfpr53frgk5ixbxis72r04p0hz4833v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8a7a0691775afec6d2c7be3d6739b55bd1d2053d/recipes/evil-lion";
+          sha256 = "1rwmpc5ifblb41c1yhhv26ayff4nk9iza7w0wb5ganny2r82fg2v";
+          name = "evil-lion";
+        };
+        packageRequires = [ emacs evil ];
+        meta = {
+          homepage = "https://melpa.org/#/evil-lion";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
     melpaBuild {
         pname = "evil-lisp-state";
@@ -21354,12 +21438,12 @@
     exwm-x = callPackage ({ cl-lib ? null, dmenu, exwm, fetchFromGitHub, fetchurl, lib, melpaBuild, start-menu, switch-window }:
     melpaBuild {
         pname = "exwm-x";
-        version = "20160307.55";
+        version = "20170313.1538";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "exwm-x";
-          rev = "cda2bc2b3b3347af34349e5f33d2d90f1ef27157";
-          sha256 = "1i9lklzg7fyi4rl0vv1lidx0shlhih0474bbjsvc74p19p5cmlrq";
+          rev = "b916c87ef43b6983d76334c2321ba57f4ec102ad";
+          sha256 = "1ng7bd2gbn9ns6hhva66ibq4kqsjijxbqw30cay8xvn4m6kklmvp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x";
@@ -21375,12 +21459,12 @@
     eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eyebrowse";
-        version = "20161226.1438";
+        version = "20170318.1418";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "eyebrowse";
-          rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef";
-          sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl";
+          rev = "56af9e96cfc8c03cfdcf3a60b581a8db9fdcbb20";
+          sha256 = "0wdqvzq847mn3aday87wz0jnbnpl0j4b81y8y5gd7qj1vac1vndn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse";
@@ -21457,12 +21541,12 @@
     eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eziam-theme";
-        version = "20170306.534";
+        version = "20170320.325";
         src = fetchFromGitHub {
           owner = "thblt";
           repo = "eziam-theme-emacs";
-          rev = "3e888e489774e1f6e5ce15fda46296d2fee0de1f";
-          sha256 = "1rxyah6xcdjf3zx1b0gn56wi6gsk95ifsarca67ir3lc1797ldwk";
+          rev = "2cc09d6041dfef6e86113aef21897b9536fbfb54";
+          sha256 = "181chqhqh3n6yh24qki3x8if1xgvqr739v8dags0kq8xbsnlzkcv";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme";
@@ -22751,22 +22835,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    flow-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-mode }:
+    flow-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "flow-mode";
-        version = "20170312.422";
+        version = "20170320.1043";
         src = fetchFromGitHub {
           owner = "an-sh";
           repo = "flow-mode";
-          rev = "111555a5edb1c3857e5767950a44cc08e14b8c30";
-          sha256 = "18bxzzq6s80kgfgj34v8429nwx6bcvvfk951mkzqjydba56bch62";
+          rev = "072efa15255146cf39450dd71fd8f35e9f6fe621";
+          sha256 = "0cga2vzi82b93l8j54jx5krfcxksx64h1m6y18p9gjgqd424g014";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3eca3f0c0a4dda79d00cbd0045eb0925bb3ce2e4/recipes/flow-mode";
           sha256 = "0hq1lkn4mn6r8ih74d52hba1a6gb6pg4qcv60sfsiga4b737yla8";
           name = "flow-mode";
         };
-        packageRequires = [ emacs web-mode ];
+        packageRequires = [];
         meta = {
           homepage = "https://melpa.org/#/flow-mode";
           license = lib.licenses.free;
@@ -22863,8 +22947,8 @@
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "312f78cd712f696dc169a34cb45622ca154d097e";
-          sha256 = "1jlbsy9pdcg76r75ca7gpn2lpkvpy71z31713cl5a1sqgb26lc8d";
+          rev = "f8addaf0529a3060de65de9a86db26976d2a8372";
+          sha256 = "1k2slk6h3av7hiqhzk8gpamd8r23r79y8jap9vy9xcl81z47l5g0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck";
@@ -25628,12 +25712,12 @@
     fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20170224.912";
+        version = "20170314.1321";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "f7b982007e26e34e43debd8759346874966e6924";
-          sha256 = "1mh1qv8vxipxyi060xzniq3y8h7b0as9j5si4ql6hs742fhpd2zk";
+          rev = "a06f0fb63c3ddf2d66128f0dcfb32040472fbf0a";
+          sha256 = "0k5mb8sss2smdr45lhxhvck2pcbscgidjfdr7b7jb7i2l9jfc8jp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode";
@@ -25652,8 +25736,8 @@
         version = "20170107.626";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "d60970c0a5de8cb16eba55fe71441e9de35d6299";
-          sha256 = "0bhw69yh1jxlyny5w5dxpvd3r6s0rnp54il2q32dark22s75w72x";
+          rev = "692f49d92ec108f15159da220ad8a7e79984a5a7";
+          sha256 = "1czx0c1yb338wxm8njsgx6qdx23ym52nvcx7jp38zlp5h5lzw9p1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel";
@@ -25778,8 +25862,8 @@
         src = fetchFromGitHub {
           owner = "HIPERFIT";
           repo = "futhark";
-          rev = "29e26503c13569de25268283dce534f111726643";
-          sha256 = "0g6xb811n4nd1vm7jraypaq2qarigd2chg2nbdx0nc23ga17f90q";
+          rev = "37097c273d9100e66b97755054f71366f30ef60b";
+          sha256 = "027id8r9vsksdnbd4j9pb67zmjlfp8v7y9227xby4hqxxzzgxiv8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode";
@@ -26123,12 +26207,12 @@
     general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "general";
-        version = "20170202.1509";
+        version = "20170317.2017";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "general.el";
-          rev = "b626fae4f0fbf2ec2bf7df850dd1c8ad15e70b65";
-          sha256 = "1p9kwh9yadai0ijn98rag0sln18fj9ciy51p88967bgvbx1rx8x3";
+          rev = "a0d994ce04e66f17dadf17f985433ccb1581d58c";
+          sha256 = "16h668kf90plf460yn2kc40vqysd0rappblyr680sdn2b08k0sbw";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general";
@@ -26585,12 +26669,12 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20170308.146";
+        version = "20170314.1414";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e";
-          sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n";
+          rev = "0344413a09537d1063917527634987bb4e0d9c31";
+          sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit";
@@ -27552,8 +27636,8 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "d09cef6327ed848a446636a857cd851dc7e63d19";
-          sha256 = "1izc2f136v82zi9b8w606302xgvaf4jn6dqg2s3yq0pqabydl8zw";
+          rev = "007b034ad7b6d5b70bd18348fc7609a9fdcbad18";
+          sha256 = "1cy7fjbip8c9pmv91bk4kcjcl5qdz3an2i78ywlb3b2qhsac21kc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete";
@@ -28262,12 +28346,12 @@
     gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gotham-theme";
-        version = "20170310.349";
+        version = "20170320.1245";
         src = fetchFromGitHub {
           owner = "wasamasa";
           repo = "gotham-theme";
-          rev = "50833e9579ac2ed2647708982477edf9a783113e";
-          sha256 = "0zcbmd3kdkcxx96mkl130j913y9mzcdxkbjd7x1vm48akirz598w";
+          rev = "7baaee3002bf0be8848e87271b988e39cbd08588";
+          sha256 = "13afqqkzlfww0w0ixckgbqyf68d2268s3cpfvc46j1cm8lzchya9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme";
@@ -28343,12 +28427,12 @@
     govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
     melpaBuild {
         pname = "govc";
-        version = "20170310.1402";
+        version = "20170316.1124";
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "4e7a21e556f26c636141c95a4041baa141e971d1";
-          sha256 = "0l5dm0r44nchgn8vzzqsn7rhf5015ni5fp56fxnz8m4kkkas01lz";
+          rev = "c6b709f23dc29a0ad6204ce05e88def4acffad6e";
+          sha256 = "14569d8bi0ibk8pq6fdbbbmagzx5lnm2791ndpyn6y62h54lyhq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc";
@@ -28473,8 +28557,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "48f64589005d79f64beef367fc9a83afb6e26b1e";
-          sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8";
+          rev = "3db11a26384ce39651a2806193d7e2cda545f1aa";
+          sha256 = "0y0bj4pid1hd1k26cv9hk0chx1as10qgl25acijxv60r0crayhyn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode";
@@ -28857,8 +28941,8 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "48f64589005d79f64beef367fc9a83afb6e26b1e";
-          sha256 = "1fdn519hpr43h40d55qdang127bhw6zg4fr20886a4ia3ngw7iz8";
+          rev = "3db11a26384ce39651a2806193d7e2cda545f1aa";
+          sha256 = "0y0bj4pid1hd1k26cv9hk0chx1as10qgl25acijxv60r0crayhyn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode";
@@ -28983,8 +29067,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "gtk-pomodoro-indicator";
-          rev = "f64fd33f95289e3c4c81e8496eb0bdafc0c42815";
-          sha256 = "0x8r0hamq1ws5l3z9jcxfmdqvm5qcig40knvwanjmkb2whbqlyk9";
+          rev = "902f5c8b2563ff6805f89505419b68ed0ff1e397";
+          sha256 = "1fmnpavcz8s6m2sxbpk38l45q9kckc5w6sqray0i9hw4a1qc3fvf";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b98ec72605077f3b3f587713a681eb2144f29645/recipes/gtk-pomodoro-indicator";
@@ -29186,6 +29270,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hack-time-mode = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hack-time-mode";
+        version = "20170319.412";
+        src = fetchFromGitLab {
+          owner = "marcowahl";
+          repo = "hack-time-mode";
+          rev = "87dda91b314ad2bde31b3b2fd405059dcecba52c";
+          sha256 = "1hy07laa12r7gcfsc03b1qggqsm2zriahravj0ydix99jcjyikbv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6481dc9f487c5677f2baf1bffdf8f2297185345e/recipes/hack-time-mode";
+          sha256 = "0vz72ykl679a69sb0r2h9ymcr3xms7bij1w6vxndlfw5v9hg3hk5";
+          name = "hack-time-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/hack-time-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hacker-typer";
@@ -29814,12 +29919,12 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20170312.2348";
+        version = "20170320.1242";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0";
-          sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj";
+          rev = "53ee9b05c855546b474b7255062b6aa8edbc325b";
+          sha256 = "0w0yrwpxgdd9kl4fx7rsa3crrs8d760iss7ib8xjs4zhf1av3a4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@@ -30364,8 +30469,8 @@
         src = fetchFromGitHub {
           owner = "manuel-uberti";
           repo = "helm-company";
-          rev = "64b3e341776dcb2fe7b329ad0a790629e4a7b800";
-          sha256 = "1h8yhvwh8973r9990mdizrva1g1c8r8xm5wrd3gpmllgx36mkkmv";
+          rev = "df67d41adb08488957804e1f3f0105186bcab26a";
+          sha256 = "0n5a4h62b1z7v1lf43p3x10vqscra75ri023gi9z7nc27qai27fh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78ff0a6cf493ff148406140f3e4902bfafd83e4a/recipes/helm-company";
@@ -30381,12 +30486,12 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20170310.529";
+        version = "20170320.231";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "7ff2e13591657fe92c39de4938a9aa30ad9fead0";
-          sha256 = "15z4ikk9y8p0ra91qygglvjazagx5530wp9ab1lqv4ibnrkns4kj";
+          rev = "53ee9b05c855546b474b7255062b6aa8edbc325b";
+          sha256 = "0w0yrwpxgdd9kl4fx7rsa3crrs8d760iss7ib8xjs4zhf1av3a4z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@@ -31053,12 +31158,12 @@
     helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-google";
-        version = "20160620.1149";
+        version = "20170318.527";
         src = fetchFromGitHub {
           owner = "steckerhalter";
           repo = "helm-google";
-          rev = "c83f395e0876b4355bd7d0cd346b506cc53deb8f";
-          sha256 = "1k8fl81jiaanyqyz8icl2wprlrv5i68kwjgvw5hgfk75cjbhj2lv";
+          rev = "27e619d3bd9974a8e1aebd2e10ebf658f49e620b";
+          sha256 = "01bw1papl2cblqd6kciw9aha7jkj3rilxb8mzi0avpxgm1g3d1fb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/88ed6db7b53d1ac75c40d12c21de1dec6d717fbe/recipes/helm-google";
@@ -31640,12 +31745,12 @@
     helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-org-rifle";
-        version = "20170312.1524";
+        version = "20170320.1620";
         src = fetchFromGitHub {
           owner = "alphapapa";
           repo = "helm-org-rifle";
-          rev = "dc697094c48f97d485c1898b7a5ff3df6d992910";
-          sha256 = "13r0x74yx1cyl2zwj76p867yj2x97pj5hxapc1v9fj3i9h9a99l6";
+          rev = "aa628be91f6f2c492891b102cda0f27023661ee6";
+          sha256 = "1dnws9fpf33hp561kgr1ybax13xj4ci6qabvyn0qkm3ihw0cbfdp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle";
@@ -32312,12 +32417,12 @@
     helm-spotify-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }:
     melpaBuild {
         pname = "helm-spotify-plus";
-        version = "20170311.221";
+        version = "20170320.609";
         src = fetchFromGitHub {
           owner = "wandersoncferreira";
           repo = "helm-spotify-plus";
-          rev = "a09f571ed5addbdb0a2b8354cf18b4d5551b5abb";
-          sha256 = "1c6dv92n9kkaizhswlm7hhk175c5ywvq2710d7hpn18cdj3isjsx";
+          rev = "847dfafbb5e5d65a44464b0ec8e2b7d88864a9aa";
+          sha256 = "0i1vnaiqcs220nc1mjbx0959aa0nbjxhrqkvbrj3zy7ybsya22gq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/306aa9fd29f1495eef71476dfcba3b494223b0a9/recipes/helm-spotify-plus";
@@ -32330,6 +32435,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-sql-connect = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-sql-connect";
+        version = "20170319.551";
+        src = fetchFromGitHub {
+          owner = "eric-hansen";
+          repo = "helm-sql-connect";
+          rev = "5aead55b6f8636140945714d8c332b287ab9ef10";
+          sha256 = "037gri2r9y135av8gbgi9d8k90qs8jlax0bimzcbwdkyhibhzrcp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/58347c583dcf4a915c1af1262a5348755f28fe03/recipes/helm-sql-connect";
+          sha256 = "1av42580c68iq694yr532hhcq0jn7m58x3cib4ix5c8b4ljvnnvd";
+          name = "helm-sql-connect";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "https://melpa.org/#/helm-sql-connect";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-swoop";
@@ -32400,8 +32526,8 @@
         src = fetchFromGitHub {
           owner = "masasam";
           repo = "emacs-helm-tramp";
-          rev = "87d323306a79bf5d71b0f556a7aefdfe5824f523";
-          sha256 = "08rzgfzd70xf1hh54py325p9kf5war40qi5w21anzs4wwg86rz1v";
+          rev = "affc1299eed800713bef422a72780c00cbfb3a65";
+          sha256 = "1lb1vlqcj3139yp1h19d96izpxy6ybhkbdqgy52igk1v904ab44a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp";
@@ -32993,12 +33119,12 @@
     highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-context-line";
-        version = "20170310.1438";
+        version = "20170319.1442";
         src = fetchFromGitHub {
           owner = "ska2342";
           repo = "highlight-context-line";
-          rev = "18ca91d91f2a9e86311d8895c53741ad847180ba";
-          sha256 = "1a0mvkbdhdad4nd0bqpg0ldz10lh211w72gcd2x1ydijwvkphjdc";
+          rev = "716e10a0c7b703b5f1d9c6ca1481524a4d06b7b8";
+          sha256 = "1ipj5l6d3d0mck3k8qsr685phk3zc7k4366vzvjyxvhgp5g2385l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/00df721571ff67fe158251fa843c8f515ded3469/recipes/highlight-context-line";
@@ -33246,8 +33372,8 @@
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "highlight-stages";
-          rev = "87c476f8ca0474912af41680a8de243c0c8d5b46";
-          sha256 = "1s7hxv4vpbrpk4makdjn3589flddgfy35scyd3kac629fbqiiz79";
+          rev = "29cbc5b78261916da042ddb107420083da49b271";
+          sha256 = "0r6nbcrr0dqpgm8dir8ahzjy7rw4nrac48byamzrq96r7ajlxlv0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/46884aa6588f55d6f688477a5e9f528f57673131/recipes/highlight-stages";
@@ -33369,8 +33495,8 @@
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "hindent";
-          rev = "336a440749e626df015be58e4582f1f6ad179984";
-          sha256 = "0r8x7sjhx4l3yl5sfxl04qk8rmid4x7cmk3721zbbmsyzwzx1a2p";
+          rev = "712ab8c48759dddc2b3f0c752db3c1e2f90b142b";
+          sha256 = "1rrvcdqmgmk033bb5zvyrnbbwhbhkpmhi5rv9bbikci49ka4jy5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent";
@@ -33407,12 +33533,12 @@
     hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hippie-expand-slime";
-        version = "20130907.132";
+        version = "20170317.0";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "hippie-expand-slime";
-          rev = "66665b65f9053ada47c0283caea0a7db3eaf2f5f";
-          sha256 = "0xdbqillrxap29zg35mpxgilz66kjvhx7yvv7hblwj6j30p7bbkq";
+          rev = "ed6c91a0600550788dc78a3ab32040ac28f7c8d4";
+          sha256 = "0nqrz1wmg84xk08mi5w8h9mrymr23v8i39s2kdqsrmn6qpw37fpl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime";
@@ -33713,12 +33839,12 @@
     hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "hledger-mode";
-        version = "20170310.849";
+        version = "20170315.1829";
         src = fetchFromGitHub {
           owner = "narendraj9";
           repo = "hledger-mode";
-          rev = "ef211ab1ad75cb323adfd3b13de5832e5b7b180e";
-          sha256 = "1mz48jpr9af8p7yrplnbkkkgd3587nw28jigpdyik257v2787ayi";
+          rev = "9b671c6ca7a2d76338d6f4e38966e9cdb78bd991";
+          sha256 = "1v3bd43kaihwbxvflg5kfiw2wmwjmvh5hhdzmdjlvmvqrhwsnxdc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode";
@@ -33863,8 +33989,8 @@
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "hookify";
-          rev = "b4aa586b24ff63f84baa8de4ed2fd93be6479ade";
-          sha256 = "1d3dlkrv95xrpv4rv3jgn58mxs71f6vi2lr88bddhxz702vb11d8";
+          rev = "21baae7393b07257de5796402fde0ca72fb00d77";
+          sha256 = "0sg4h0m1ds3f6kpzd3vk30g6x2xl74r5j9bidw658f3mmai7m1l8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aa04ccd0ac05beed5de8d51ed96ccbf0071fdea1/recipes/hookify";
@@ -34540,12 +34666,12 @@
     id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "id-manager";
-        version = "20161124.2045";
+        version = "20170320.546";
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-id-manager";
-          rev = "98bd85db17914af59e7b75c89e82117323965af2";
-          sha256 = "0fj3gsjpm58p7526c95g8fqkch51ic3h2rvr36fhmxqxd5baj5xf";
+          rev = "14ebc35db298aac4dedc8aa188bc46bacab81f3b";
+          sha256 = "0k9b12gzvjw06y5ycjkigkj8vcmj4rz57d4hyzip27g1v93vvimc";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/64a61b3801a0cafec87b1875eaec5950746f716d/recipes/id-manager";
@@ -34708,12 +34834,12 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20161211.910";
+        version = "20170313.1603";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1";
-          sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af";
+          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
+          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-completing-read+";
@@ -35002,12 +35128,12 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20170211.1432";
+        version = "20170313.1603";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "2d6d38edc0798d9552fc3430bc2dd7ff5025ced1";
-          sha256 = "0cks67cgbcv19hjim2jbvpqcgfwg61bssvm5d864bb32ygdg51af";
+          rev = "2bd3a2722d8df0db9dfe25f5763f7dfaf0734624";
+          sha256 = "1zz0k5ddcwkg0wjdzihklgnxq5f6rlsxldhn7h9jzyss5bsgykhj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4a227a6d44f1981e8a3f73b253d2c33eb18ef72f/recipes/ido-ubiquitous";
@@ -35686,12 +35812,12 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20170310.2255";
+        version = "20170319.24";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "d81e266e77316bc116ceca5dbc92fc3831825be3";
-          sha256 = "0hrz6809w0ardqgb5xraxpr6gj25jh2w7cbcpacc5xv90cv4p7ri";
+          rev = "5ef6bdf09e8716340f09a08d5fa957ca3ebeef18";
+          sha256 = "1n9jrdad3jcn94x1wrkwzd0dk7p09nhnvww2j151bpj2ggzpyqbr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure";
@@ -36186,12 +36312,12 @@
     intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "intero";
-        version = "20170308.2033";
+        version = "20170317.1852";
         src = fetchFromGitHub {
           owner = "commercialhaskell";
           repo = "intero";
-          rev = "5396b410c326f8685b473e3f38db7506b1616582";
-          sha256 = "10qnz73djzwr4lb96d1x51vhia5qicjr3c1ijdysh2dhbxpz2y02";
+          rev = "d33d4a44b130595658439f1274db91a544792704";
+          sha256 = "17slghcgvqb80ffl31g6a6z7b5hza1dbqybqhl37qjpfxa3i6pak";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero";
@@ -36456,12 +36582,12 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20170312.1515";
+        version = "20170313.1437";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "0c16cbe0038dcd5a2f70de2edd28a62a4008ac5e";
-          sha256 = "19r6jzs47h15kxjmpsk3ddb0gc331vnsvfa5xcabkf5gk3h36mh1";
+          rev = "4d64ecc0970ff43290b4b27e0c7d2176d1890c71";
+          sha256 = "0g0m19x2flzm3pz9k19j9hp41wqihk1hbzbmrihn2sz4cgbrg98f";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony";
@@ -36744,12 +36870,12 @@
     ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy";
-        version = "20170312.844";
+        version = "20170320.422";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
-          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
+          rev = "beffa78885517beaad2da50accc339f9346f94ee";
+          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy";
@@ -36786,12 +36912,12 @@
     ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-erlang-complete";
-        version = "20170216.952";
+        version = "20170316.2112";
         src = fetchFromGitHub {
           owner = "s-kostyaev";
           repo = "ivy-erlang-complete";
-          rev = "ead155b5474b0d5b21d78ae735aea74df1e4c3af";
-          sha256 = "1lwb8hwbvalwdj1gybc4aw3w5li81mhxagkpxa0dlwxs08lq7v2y";
+          rev = "9d67a7e65408c5e218bff24b2dd6ce78257a66e4";
+          sha256 = "06p14ga0k687mnavxczdmkij0945cm70zhcbm93b1a6gykbzvd0j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete";
@@ -36853,8 +36979,8 @@
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
-          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
+          rev = "beffa78885517beaad2da50accc339f9346f94ee";
+          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra";
@@ -36930,6 +37056,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ivy-todo = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivy-todo";
+        version = "20170315.334";
+        src = fetchFromGitHub {
+          owner = "Kungsgeten";
+          repo = "ivy-todo";
+          rev = "7c72deff0ffa15c7d9a3389bd4386aec2dec9372";
+          sha256 = "1y6ilcwzz2rbsdy0fj6yjs75mxks6asha8cv5i129ylcapj9ygdy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/97909da7899d4187e8eb6b3284f6225ebec7fa51/recipes/ivy-todo";
+          sha256 = "12sfg2rbnk73a34ap94g4g70gx13llcgsrmfdrgrzk83a2274a2r";
+          name = "ivy-todo";
+        };
+        packageRequires = [ emacs ivy ];
+        meta = {
+          homepage = "https://melpa.org/#/ivy-todo";
+          license = lib.licenses.free;
+        };
+      }) {};
     ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "ivy-xcdoc";
@@ -37099,12 +37246,12 @@
     jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }:
     melpaBuild {
         pname = "jade";
-        version = "20170224.922";
+        version = "20170320.655";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "jade";
-          rev = "83ad172b96bb011bb705add136a7571b08f6c4c2";
-          sha256 = "16l17sldq68492xa2nbkr956hcpncalmjr1spbf1avi9z910d17l";
+          rev = "3e41fa6f132f2b3130d9abd250a52cfea7655d17";
+          sha256 = "1sqpb227qky1lj552nwmyxjmbjqp0agxjs3arq329xi3c7ywkhj9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade";
@@ -37477,12 +37624,12 @@
     jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }:
     melpaBuild {
         pname = "jdee";
-        version = "20170303.1253";
+        version = "20170319.26";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "481b040c227e60c645094d0ec193a53adac7b09a";
-          sha256 = "0qbiqjr2nkmvf1m874mdfwsszzcv32rfdvrp7bs62fw9q95wcrhb";
+          rev = "e3a3ba35be0dcf5fef1bff965c6cfe92386c0835";
+          sha256 = "11g73qclz1l77h7prrrl3akh7skxbz325yc4yb65cbnbz0bm30m3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee";
@@ -37502,8 +37649,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "de1f5597b600c0cb7661b5f451da2af4cb722571";
-          sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp";
+          rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c";
+          sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi";
@@ -37523,8 +37670,8 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "de1f5597b600c0cb7661b5f451da2af4cb722571";
-          sha256 = "120l9zfh432ffj5n6q4x16msvnqwcazkaxib2n19k4pdyvpd1gbp";
+          rev = "b0764f425766786dfb1bff910ed1d1670f11eb9c";
+          sha256 = "19q1bii0dg3q566bwm63rw3fnnmwvas9i2ibjrlnni8laavc9r5p";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/bded1840a39fbf1e014c01276eb2f9c5a4fc218f/recipes/jedi-core";
@@ -37999,12 +38146,12 @@
     js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
     melpaBuild {
         pname = "js2-refactor";
-        version = "20161102.1108";
+        version = "20170315.1315";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "js2-refactor.el";
-          rev = "5633ee969c4644bde96c7f4134b02de463f910e1";
-          sha256 = "0jwirj3aaigr8d5hnb5gpi447y2yl6ashxaqcagbasy6gvdf1knc";
+          rev = "1f0ffe0a3948d7a610f20544c31de91fb08a8bb5";
+          sha256 = "0rf2lagzw8qnglnmgq73np829j2i7n8hzz3y8d8ragkaz8gipsi1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor";
@@ -38253,8 +38400,8 @@
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia-emacs";
-          rev = "9c36479c83039c4fc26e583bb1c4dc27de058a4e";
-          sha256 = "1w9fhc8k8zxxiscpyip39rrwd2yr1xpxias16scj470mviwh7j26";
+          rev = "9067194d9df9c856ae6cff4060b19810759f74d4";
+          sha256 = "0vaq2dv77pj9xkn8vfk4wv2lxxn1fy0a473blblzrhgcifd7dfv4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode";
@@ -38541,12 +38688,12 @@
     kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaolin-theme";
-        version = "20170307.549";
+        version = "20170320.530";
         src = fetchFromGitHub {
           owner = "0rdy";
           repo = "kaolin-theme";
-          rev = "bfbcb88c7f107b85559562da5e7dc37af0ddb82e";
-          sha256 = "11vrsswn6bzfdvprcy7psgxdpkn4ayggqb851pj2vz12bqj17jf0";
+          rev = "236d827c68d502d1ee8866d6038518590a5f7449";
+          sha256 = "1kq0km53ysl7xapc7ayhav2k69yvgpf402hgri5522v01cmmfgg9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme";
@@ -38937,12 +39084,12 @@
     kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kill-or-bury-alive";
-        version = "20161231.1559";
+        version = "20170316.509";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "beadb20a0f436b5f3413a0dee215a20f614f070e";
-          sha256 = "1ck9v01xih9ik85q46ijhl1m3ppazkr6f9fjcamxgxcwxrniwj4j";
+          rev = "23f911c35414b0157f23c0b01fac898ef0740fdb";
+          sha256 = "0ay9x6vk505p67hsf8hijxvm5nf8qwf6k67hv7cq9z4cxfmyzpl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive";
@@ -39046,8 +39193,8 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "3bcc310e4f62eb567d5d568446058f7f5811ade8";
-          sha256 = "0zx73p4hdgpsvy2ifbi6zwi2ard1sjnkd1ig0habhzd5c7f52igr";
+          rev = "b1248776c6ffc9f91a7c862dd2c1650a3de7f990";
+          sha256 = "0pi805ii3w38vy3064yvf845m05wpnj2fmfwkngdx9jwpifgsavq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode";
@@ -39498,6 +39645,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    lastpass = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lastpass";
+        version = "20170318.205";
+        src = fetchFromGitHub {
+          owner = "storvik";
+          repo = "emacs-lastpass";
+          rev = "d65d0e0b03d39556d998fb3843058b1ab2addd45";
+          sha256 = "0kdzklnmcwyy0l0564rxjc0frn9333syip5048l5q86fxm5y46vw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/46e5e8735baab7728bddce2693cea6bcee0e6360/recipes/lastpass";
+          sha256 = "0x4c9c110nqv3v6kzcxdg9a9zcg7yn1hj6ffgrbsd8c3wbrdxrlj";
+          name = "lastpass";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/lastpass";
+          license = lib.licenses.free;
+        };
+      }) {};
     latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-extra";
@@ -39756,8 +39924,8 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger-mode";
-          rev = "084849f8350a51224a968184cc2b1debdb75bc93";
-          sha256 = "0iy603ym4bx85gp44cndxzqpcn8xgbz9nrwiid9bmjicizv9xld8";
+          rev = "a1b17719db89af5f865bbe72866ecb65210a6b52";
+          sha256 = "1v4jkmmxy27090bcjjvxmqr64izql5zx951vzh5r3f4c48dn0ig6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode";
@@ -40145,12 +40313,12 @@
     link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "link-hint";
-        version = "20161216.857";
+        version = "20170313.1945";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "link-hint.el";
-          rev = "5c3bac30fea5ff74493712273a64a1a6a9f72957";
-          sha256 = "18s5frmaf7d3l15by9yvr8hzgnk9fing4bjpfj53bcck2nmfd7qj";
+          rev = "6b926a6fbb7288eb062b28747a32644c5c8fea4f";
+          sha256 = "047y75wkqiv1vlrgg6fy78xsfms14drfwmil2sb7j5p5p0cw5xc7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint";
@@ -40318,12 +40486,12 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }:
     melpaBuild {
         pname = "lispy";
-        version = "20170312.957";
+        version = "20170320.1442";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "0ea4c086756e0f332821ca757ea884ea9ee0a81f";
-          sha256 = "0kf20hkav15r8dv9hdvbrn9x3x0dc3m0k15gnv3a99fi5qlnwh12";
+          rev = "0d2f382dca335d4b65bc91d840293ff2a83db999";
+          sha256 = "14xshiwv3hqp68w297kjcvx1gmnd6v3yqhbs7ynm1i24xmgznigg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy";
@@ -40739,8 +40907,8 @@
         version = "20150910.644";
         src = fetchgit {
           url = "http://llvm.org/git/llvm";
-          rev = "00ea544948006ad27602b656c5eb3e2b2051c1be";
-          sha256 = "1zibr3x6y7p6mynjivd55y102hjyl97sv2ipwgm9n1jsif2iz6ig";
+          rev = "9fe7c740276213df8a0a2eb419b227bf3a7f3227";
+          sha256 = "0zr8hpc7dlmyd1x1xlwampjhw1k99jyrnh28kxqjw59nv3x1hpbx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode";
@@ -41135,7 +41303,7 @@
           owner = "immerrr";
           repo = "lua-mode";
           rev = "652e299cb967fccca827dda381d61a9c144d97de";
-          sha256 = "1had9sj3pbbmdb66mw1dxs7i866ck0af7pak3wi6213v5vip7w6b";
+          sha256 = "1k64cjzylmfw89pyfjza8s9sxijraknwg573vh619wvnggflc7lb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode";
@@ -41421,12 +41589,12 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20170311.925";
+        version = "20170317.903";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e";
-          sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n";
+          rev = "0344413a09537d1063917527634987bb4e0d9c31";
+          sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit";
@@ -41621,8 +41789,8 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "eb4258ea2b721cfa0c5b32f67a14b5703a4dbe0e";
-          sha256 = "009wabnqblgn5sgs410lpb8rbzci7lkpp7nl1kfvyk22zg1jyd4n";
+          rev = "0344413a09537d1063917527634987bb4e0d9c31";
+          sha256 = "0392hcxnc8rbafk3v7fl3v21la8ac30wqcxbray6kyw202gg0qp0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup";
@@ -41869,12 +42037,12 @@
     make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "make-it-so";
-        version = "20170313.206";
+        version = "20170320.415";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "make-it-so";
-          rev = "07dfde3f4236498fac31fe1ed5a9b87e92c484f8";
-          sha256 = "0dz8mijsfnzsi7bd928a55d7dmc04c45jx28zg9v0mmgx6fkkr28";
+          rev = "b20bac2335596302d70a1dd9575517a81363966c";
+          sha256 = "1xhg5pfm5qds6njdm464w95z9zfsf84ihkj68nvzr2qv73ihqzqg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so";
@@ -42226,12 +42394,12 @@
     markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20161222.1416";
+        version = "20170317.1202";
         src = fetchFromGitHub {
           owner = "jrblevin";
           repo = "markdown-mode";
-          rev = "df4ac404ce92abdf1a0b78da8ef1675f1cd1f196";
-          sha256 = "1k5bxqbcz174b6g3av6hr2q828bybinq96avab0561zqwqxlhkql";
+          rev = "0f88075c9091b4120fac96aaf091ec647d2ea555";
+          sha256 = "0cjchpnfwj06y4whnlj3a005ckn3l6ylpv1zmhxv5233znnp6zhs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode";
@@ -42247,12 +42415,12 @@
     markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode-plus";
-        version = "20120829.510";
+        version = "20170320.1404";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "markdown-mode-plus";
-          rev = "f35e63284c5caed19b29501730e134018a78e441";
-          sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
+          rev = "411d079f4430a33c34ec0bbcb1535fe1145a2509";
+          sha256 = "0427cxvykmz8kz1gnn27yc9c4z8djyy6m9qz6wbd4np1cgqlmly2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/markdown-mode+";
@@ -42711,12 +42879,12 @@
     mbsync = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mbsync";
-        version = "20170303.206";
+        version = "20170320.503";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "mbsync-el";
-          rev = "8e34a059445b70a18ee5546921385d1636aeda09";
-          sha256 = "1w1kjpi2gnhmvkay71q2rkc92bcibdrdjx8r7p979sds5pgaq332";
+          rev = "046a745ea1ea85152e27efd4c83fd3487aacffaa";
+          sha256 = "1s5zxv4qvy2lqh090lb2bc61y4y67mr22j0b02y69wd61s1w3ppx";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3ef6ffa53bb0ce2ba796555e39f59534fc134aa5/recipes/mbsync";
@@ -42795,12 +42963,12 @@
     meghanada = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "meghanada";
-        version = "20170228.1746";
+        version = "20170315.1652";
         src = fetchFromGitHub {
           owner = "mopemope";
           repo = "meghanada-emacs";
-          rev = "67e7ca4488aa39eaa8b5236db392730efdac91a9";
-          sha256 = "0k9bv4wdik3lqqpd2ijz3xnlcnjjy589rmqs6z8pwzxsx0vd7wlp";
+          rev = "7a6e26ae74c86cc2afffc21de7567a63feb19a7d";
+          sha256 = "1l23nj6fsnqf2xc766rnz5ib6578rvsbn0cdwmw5li6waqbzvla2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada";
@@ -43188,12 +43356,12 @@
     mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mhc";
-        version = "20160526.18";
+        version = "20160704.633";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "81c63fbd49d8267124fbfc775dc7cf06d2ebf7a0";
-          sha256 = "1gvwcgxj7f9a8zrp01mcbj07692kg1pi8fi2srwg09jls4j84xnb";
+          rev = "d5f7c5abe90831248581c26ef3abfec70b2c2b9c";
+          sha256 = "0f5ilbl6dc5hf9s4lfp027qjdlwd0kzb7sni7lda6v5597vhsnb4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8d3efa0fcd6cd4af94bc99b35614ef6402cbdba/recipes/mhc";
@@ -43723,12 +43891,12 @@
     mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mmt";
-        version = "20161231.1556";
+        version = "20170319.434";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "mmt";
-          rev = "66adeeeccc52121fae7350698c11583b31cbb5c3";
-          sha256 = "01s1i7cc653yzxdmnlamz177sjlgjbknmz717kvrwd6wixgn2p08";
+          rev = "f7db836a10720ee50217012e7e2597ebcf624f90";
+          sha256 = "13vbfc5597v0gd87qyhn10f93nb477vjpg3jlpphbax9fvkf4gav";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt";
@@ -43807,12 +43975,12 @@
     mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "mocha";
-        version = "20161214.839";
+        version = "20170320.1128";
         src = fetchFromGitHub {
           owner = "scottaj";
           repo = "mocha.el";
-          rev = "23831bab8290a90e9253b648176d99385a438568";
-          sha256 = "0v8d0605c31x1crjhgr73x5372rhxlrbap29j0j3zlbv0shd39v7";
+          rev = "55f1e6afd100891ffd7008f5c5efbc5a9ab1c22d";
+          sha256 = "1jqygkn02vawynfnymvnjnglj7gscfinwyk7vbkbh2dp932wsl02";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha";
@@ -44137,12 +44305,12 @@
     monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "monokai-theme";
-        version = "20161216.628";
+        version = "20170314.1612";
         src = fetchFromGitHub {
           owner = "oneKelvinSmith";
           repo = "monokai-emacs";
-          rev = "1a921469d0d3a974bf626a76bc5e9fb342fb32d6";
-          sha256 = "1xby4jxxjwcgpai242y5c6ha2cj07hs1nndvxa6f1ncfkh5a7azx";
+          rev = "46fe076b5943ccc6fdc9cdacc7e8ad02b64bcd36";
+          sha256 = "03aw9ab54a5fljhwygg62hr2n9kk82xfwcdq17ln5z0951gqi99r";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme";
@@ -45714,8 +45882,8 @@
         src = fetchFromGitHub {
           owner = "naota";
           repo = "navi2ch";
-          rev = "faebfd15184de9df6903eae436dafb52c38ee86e";
-          sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
+          rev = "f39d93c32acd5b9c3a7fb1a9fe14c5e1c4b5288e";
+          sha256 = "0i0icyaa2zzzl0cr9n1zv44pg2lric8gic58dkjxjv8yyk6y01cn";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/36bea1eca58de15d6106cbd293d941d12ee3d21c/recipes/navi2ch";
@@ -45798,8 +45966,8 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "851a186de01369721042a1a9fa951f89c98a68fa";
-          sha256 = "1n67k2h919rjsn41qsnxm13a7qdasfh2hj5d52wqjf3ld8f88zqb";
+          rev = "d0777b677c50714415174e407a321efc1e9bfdae";
+          sha256 = "19darrq975w11n4809f5blrc3paaxpdxmvwmsd96k8g5gwi0yf5m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle";
@@ -46105,6 +46273,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nimbus-theme";
+        version = "20170320.1512";
+        src = fetchFromGitHub {
+          owner = "m-cat";
+          repo = "nimbus-theme";
+          rev = "3a05714be2a5f1e87ba1dcd30959c7ec03900a3a";
+          sha256 = "0hfqhcy9bzw5jsbcz11dh1b94l9m5jishdywxy3javlcjwqhjdi4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme";
+          sha256 = "1hy4rc1v5wg7n6nazdq09gadirb0qvn887mmdavwjnnac45xyi18";
+          name = "nimbus-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "https://melpa.org/#/nimbus-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ninja-mode";
@@ -46154,8 +46343,8 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "96443e94a1932cff13f23d202839c53483b9290e";
-          sha256 = "027agsvbi6wmhdsdzxjvbhskjlgc20dzq13jb7sjvq5a330fgjsw";
+          rev = "dc931fe1cd6e426bbb8392872a10f3b308ed008a";
+          sha256 = "1dmavg2w3gdbg0607llzgl45h42m1pcnidfmgalmwb29snk9b33m";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@@ -46441,11 +46630,11 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20170304.1716";
+        version = "20170313.1712";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "c0c5645538d9dda84657602ee4189f4ff3ca1aeb";
-          sha256 = "092mv01pn5i7brn311zdcd74pspw5lsmq4vhvi3n80z9byrh6w1h";
+          rev = "c39f6361d0798aa8d0dcd0b91f6b86ab9dc21c75";
+          sha256 = "0dknkvpwa9fvvn512rij4vfdm7ifyddls5fh06i6cydw3id7dbid";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@@ -48351,12 +48540,12 @@
     org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-board";
-        version = "20170228.1156";
+        version = "20170318.754";
         src = fetchFromGitHub {
           owner = "scallywag";
           repo = "org-board";
-          rev = "346140fcd727964dbac623dde856addb08d9ddd3";
-          sha256 = "04ax2c6rg197i6is24gfm7cwdgkr98ic5r8x5h4dlqkr36f43f9m";
+          rev = "ed62187790f415a006194f69bf86c6ca6959b2e4";
+          sha256 = "0kh32xkqiy4bh72mykswpi20x1fvr6m7751d4lnjczx836ncmggy";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board";
@@ -48456,12 +48645,12 @@
     org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-chinese-utils";
-        version = "20170312.2316";
+        version = "20170313.2148";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org-chinese-utils";
-          rev = "9f3ea014d049e026105055330500ee9ed82e9bc4";
-          sha256 = "1i05ds7dz5ra2vyzx3fd0038qnzgr527cnnnrhl4afr93cqgjp6a";
+          rev = "f44d7114899102f1e1109bb7aeeab4330281ff94";
+          sha256 = "127nnjdd7p3sy38pd39ivrpxgnzdhbh6sf99667s7qxryfx837y8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils";
@@ -49088,8 +49277,8 @@
         version = "20140107.519";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "7b426972600154286ce6fddbaf9b7c7503845bbe";
-          sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2";
+          rev = "f64fd2a8f1ac57f0185fc82833b2a773644616ff";
+          sha256 = "0gx6x65b46pw8k6hngc6y6akdqkwdrjy8vxsq1v4w1rs4vil8a9d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal";
@@ -49108,8 +49297,8 @@
         version = "20170105.1723";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "7b426972600154286ce6fddbaf9b7c7503845bbe";
-          sha256 = "0q6paa8x0i92sdggiv525hfi17cysmpv636q7rikf92v10qmxrw2";
+          rev = "f64fd2a8f1ac57f0185fc82833b2a773644616ff";
+          sha256 = "0gx6x65b46pw8k6hngc6y6akdqkwdrjy8vxsq1v4w1rs4vil8a9d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link";
@@ -49164,6 +49353,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-mru-clock = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mru-clock";
+        version = "20170314.1357";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "org-mru-clock";
+          rev = "471d206fb2f1d4fd974ec51474bf952141dfde5b";
+          sha256 = "1zjn0knncj9yizhw664yg0a0n2qmjpjs6zn4jiqgd5452mambjy4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/b36bf1c1faa4d7e38254416a293e56af96214136/recipes/org-mru-clock";
+          sha256 = "1arww5x6vdyyn1bwxry91w88phbr9l6nk8xxrw40iqmmbhggahgm";
+          name = "org-mru-clock";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "https://melpa.org/#/org-mru-clock";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-multiple-keymap";
@@ -49209,12 +49419,12 @@
     org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
     melpaBuild {
         pname = "org-octopress";
-        version = "20150826.416";
+        version = "20170315.441";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "org-octopress";
-          rev = "e04d55c3f4bb88e5661ee136cb3a55f998dca931";
-          sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr";
+          rev = "a8a251d6940623daae58453dd91630593c2536c0";
+          sha256 = "14iqxg75x7iq0wbjsir6ijbmbkapzfcxjc64kzncwa5ixgdxph3j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fba6c3c645ba903f636814b5a2bb1baca0b5283b/recipes/org-octopress";
@@ -49278,21 +49488,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-parser = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-parser";
-        version = "20170302.2113";
+        version = "20170317.2238";
         src = fetchhg {
           url = "https://bitbucket.com/zck/org-parser.el";
-          rev = "690b6d4e1b83";
-          sha256 = "0smla8pxnqdzgfhxhs6hsqv8par5xcvfcww857i691gya6scslnb";
+          rev = "a1dd102b9cb5";
+          sha256 = "06qwqfv0lz7l1fy5i2r4dbc8alkzshxcv8r3s4iy2866z2lgl7pi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser";
           sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h";
           name = "org-parser";
         };
-        packageRequires = [ emacs ];
+        packageRequires = [ dash emacs ];
         meta = {
           homepage = "https://melpa.org/#/org-parser";
           license = lib.licenses.free;
@@ -49516,12 +49726,12 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20170313.713";
+        version = "20170320.728";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "2f8152e6e45885f68c01b39a227c625a441d6ded";
-          sha256 = "03ra8dr5qpmny3s293al8fckyrspkhbrgw31adz3x9z69c919qjn";
+          rev = "292a6d5ef0e169f41d745ea2d3083f189a59444b";
+          sha256 = "0skj5f73qa5qxzpjhpkx65fk2pzhkn63ji3kgw7k76p5mw56i90h";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref";
@@ -49673,12 +49883,12 @@
     org-table-sticky-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-table-sticky-header";
-        version = "20170227.1242";
+        version = "20170317.1913";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org-table-sticky-header";
-          rev = "4dba2dc9a3ed63f58aa946aeec84a52d46ca4043";
-          sha256 = "0az4lzd9qk4cx7jjfj36r2fvlkwyrhn3xqhha5d1pydglnhd9amy";
+          rev = "4048357d4ac42885b207677eb6f118e167a0f20f";
+          sha256 = "1x5b931khl89yfnknndqfwhpqqqy6i8fylr59dpsffsrfp7pbqs1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5dd0e18bf4c3f3263eff8aff6d7c743a554243b5/recipes/org-table-sticky-header";
@@ -49904,12 +50114,12 @@
     org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-webpage";
-        version = "20170311.1713";
+        version = "20170318.450";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "org-webpage";
-          rev = "bd7b0e896e250a7c330568b33520c347b6731890";
-          sha256 = "1l3smz4xx9s4jsr82isnh0hz6ivsf9y5jl87fcfkh98aqlym4z8a";
+          rev = "c71042f16bf33120d0d3d40e107f3f4de044ae53";
+          sha256 = "1jy55qapc8fqf6r3wz4v489iyw4pxzj2hadkwsgsv1m1ha1sdvyk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage";
@@ -49967,12 +50177,12 @@
     org2elcomment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org2elcomment";
-        version = "20170216.1455";
+        version = "20170313.1845";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "org2elcomment";
-          rev = "c97c8934c8df20873ce1bc7023740b69beeb2d30";
-          sha256 = "1995w31na7g4agyknbm9jgxzs4mwbz0mli43cj8aqlbnq5py31hg";
+          rev = "e10e159d502aa7ab9c0d988c50c298a340ba2fcc";
+          sha256 = "022ayjrsc2v5qw4xd7jxjw45lbryibwc6b68qi5555gjwd0mi3f5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8af13650de8b4a814832638d4182bf8ce576244c/recipes/org2elcomment";
@@ -50643,8 +50853,8 @@
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "scimax";
-          rev = "f9c485ecb08bd1820f47c6e5c160eae0776a1ed7";
-          sha256 = "0vwfhgsxgnwg0533359r5hng29k9wjs5j3yjx82y1qxdla13j51j";
+          rev = "170a9d843f990f45c167ab62c12e342459110d19";
+          sha256 = "1397s2qfn4b9b1b7s93sh131a36ifv9ydnpg6j5ihrwwa7556nng";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip";
@@ -50765,12 +50975,12 @@
     ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-jira";
-        version = "20170112.1537";
+        version = "20170320.621";
         src = fetchFromGitHub {
           owner = "stig";
           repo = "ox-jira.el";
-          rev = "3a2467d4050637a0551e1fac957f85644147d280";
-          sha256 = "1c09rfwx5ywcdbjsmkb4a6ixmqn1f289986dx96pvh26jnh2k2vp";
+          rev = "700736da7a42a56cc24864efa9863393c966121e";
+          sha256 = "1x7k1pwjh4y07c0ln7d4rl10kvgfjddqd57414d6a010n7xr92m3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira";
@@ -50786,12 +50996,12 @@
     ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-latex-chinese";
-        version = "20170312.600";
+        version = "20170313.2146";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "ox-latex-chinese";
-          rev = "f4f49ed0c6de69b11739b62cd1ebc1351ad657f4";
-          sha256 = "1bppfj3zwkn5k11wk0845gf32k69c8jz5fsqq4iwvl89ijfjk5xn";
+          rev = "7bc56542dc488d24f22f2653232b1cf5dab17c5f";
+          sha256 = "1hs0rrk8bcyskay945d7phjj5ln8j8gr01qybqnl6a6mfrcpv2b2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese";
@@ -51231,8 +51441,8 @@
         src = fetchFromGitHub {
           owner = "Silex";
           repo = "package-utils";
-          rev = "4ee0d996d4c1a6fed0689361bd9524661339ebdd";
-          sha256 = "0a1wvjlr176dbkqgf44f0iwvx865wl2isns36gllcq5fsh4g1q1c";
+          rev = "3cbbc2ff50ecb5e6fb20a309cb07d74ca10d4d42";
+          sha256 = "1bp04c2ljcgxf590yv05wzvqz7b7ih22h343g7rwdd5l3cli43km";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a1bb884a0299408daa716eba42cb39f79622766c/recipes/package-utils";
@@ -51248,12 +51458,12 @@
     packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "20170130.1015";
+        version = "20170314.1340";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "d2f01bffc987b226f618dda0663a1e233161518d";
-          sha256 = "16xwgi0zkbbvkbxf0ld6g4xlfd95j45sca57h162wld6l27jrv4f";
+          rev = "536f4a3bda06cc09759fed1aa0cdebb068ff75a1";
+          sha256 = "1ayizqkhxjd3rv3chnl51sl12gsfhxcqqnz0p6r0xbwglx4n3vzi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee9e95c00f791010f77720068a7f3cd76133a1c/recipes/packed";
@@ -51476,12 +51686,12 @@
     pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pangu-spacing";
-        version = "20150927.24";
+        version = "20170317.157";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "pangu-spacing";
-          rev = "e3dbbe87b91ab3e368fdcbcd0761ce403020db36";
-          sha256 = "0bcqc4r0v02v99llphk8s0mj38gxk87a3jqcp8v4sb9040dkm8gd";
+          rev = "a4463dbb74abdeddb6c1c132a1f8fcf67ed87498";
+          sha256 = "143ywxgaf5y52ynd4wcqp40c5pgy61ng431y77l46iix10vasslq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c0b00eda1d20ff2cbffe3ac606e5fd60d915a5d6/recipes/pangu-spacing";
@@ -51684,12 +51894,12 @@
     parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parinfer";
-        version = "20170126.2111";
+        version = "20170315.2109";
         src = fetchFromGitHub {
           owner = "DogLooksGood";
           repo = "parinfer-mode";
-          rev = "12f54f661180f894be9bc0fd956b30a69b3f39e0";
-          sha256 = "0w44w2qgvbv1m5dwyqa7863r1r32fva5rgc0w14srpak41nn3bj2";
+          rev = "c67686b24cf14064931d812f29f4114b30696d12";
+          sha256 = "0lpj81hkzw24v1f3s13rw22sm1nm0i177di5v2b8kwy50pjirs8v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@@ -51726,12 +51936,12 @@
     parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "parsebib";
-        version = "20170311.1430";
+        version = "20170317.706";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "parsebib";
-          rev = "ee1dfbb53fff9fd5c4dc6571bf498516b7ffff01";
-          sha256 = "05rgi9hk17h2kjib5v68i4ikg7292f65qxxinaxkhsy0xsx6kybl";
+          rev = "96e9320c3d09923fd4bd3bfbca3d4d4891273cfd";
+          sha256 = "0nja6nmw5sqnaryr8f7isyp8iliz4y6kml4nc11cs88zpr6fq40q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/c39633957475dcd6a033760ba20a957716cce59c/recipes/parsebib";
@@ -51855,8 +52065,8 @@
         version = "20151027.1449";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "6c7425b16895c6925c4f1ec875dac4576574b34c";
-          sha256 = "1i4g5qhsp426jkxn4z1kps4cnb97lsrbfd2yk7x456v7dkrd6fn8";
+          rev = "6f867674272a03273212259b9039c9356a6ed90f";
+          sha256 = "1cn6iwkh19brz0wzxgf65lnb6wg4v87g66kbzd7fw52qv0xh4q7j";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store";
@@ -52312,12 +52522,12 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20170228.2312";
+        version = "20170317.810";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "7cca03bd2fc534a6b42eafc2afef20099bf83dbf";
-          sha256 = "05m282b4n2pgj3qgmdms8i8yxb2h2sdlvd7r9xlfp3j5xb35pk27";
+          rev = "c01c8673338c73e92a88d2aa7e3a26ca8417fbfa";
+          sha256 = "05lyzvxcghyv3jd4vcxk6jm88bq10sss0nvbhk4arbjf4wlmmf1z";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools";
@@ -52602,6 +52812,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    persp-mode-projectile-bridge = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode, projectile }:
+    melpaBuild {
+        pname = "persp-mode-projectile-bridge";
+        version = "20170315.420";
+        src = fetchFromGitHub {
+          owner = "Bad-ptr";
+          repo = "persp-mode-projectile-bridge.el";
+          rev = "f6453cd7b8b4352c06e771706f2c5b7e2cdff1ce";
+          sha256 = "1gyfn2fhx3bqzr9m1r4b8nyak8pmpcgj7yz2bagnjs21vfngr18c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/2c049b0067b70577511114dc8abac0a00a9e0588/recipes/persp-mode-projectile-bridge";
+          sha256 = "169mpikixa33ljmh2n9sm186yibrik3f5p8m1hcisnzdsc3wgxmp";
+          name = "persp-mode-projectile-bridge";
+        };
+        packageRequires = [ cl-lib persp-mode projectile ];
+        meta = {
+          homepage = "https://melpa.org/#/persp-mode-projectile-bridge";
+          license = lib.licenses.free;
+        };
+      }) {};
     persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }:
     melpaBuild {
         pname = "persp-projectile";
@@ -53400,6 +53631,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pippel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "pippel";
+        version = "20170320.1703";
+        src = fetchFromGitHub {
+          owner = "brotzeitmacher";
+          repo = "pippel";
+          rev = "a96b5cb4d6e74766d8d92b343aa4f86fd45d208a";
+          sha256 = "0ryw6cd1snjb1jyzbddx0c2gxfpvxyzw1ilbzhr8xd0hc87z01iw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/8dbdb25c8344c96048a7863333ace6dc07d8154c/recipes/pippel";
+          sha256 = "1yxy0z5377xmb9gjpm16rybi8wr8x95k5hcf8g23690vr9ndjw67";
+          name = "pippel";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "https://melpa.org/#/pippel";
+          license = lib.licenses.free;
+        };
+      }) {};
     pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pivotal-tracker";
@@ -53778,8 +54030,8 @@
         version = "20160827.857";
         src = fetchgit {
           url = "git://git.savannah.gnu.org/gettext.git";
-          rev = "e5a008ae54ffa54a5343632f88f10ba2e63c4595";
-          sha256 = "0fvr0bybqyaix3qcbaj06r61gw69wff63vgsflkc36a92pj971b1";
+          rev = "41e5199f0e4a3e9d518d6f95a3efdfae5e2c7913";
+          sha256 = "06ww6081aicw2d4rprig8ab5g1rx7dqx7cl9xh444k746c8a554d";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode";
@@ -53795,12 +54047,12 @@
     pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "pocket-api";
-        version = "20160530.738";
+        version = "20170315.1934";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "pocket-api.el";
-          rev = "355424350e9367c67aa8b4e430568390e3960b67";
-          sha256 = "1m3rczp5jyh83gfmv4rq11ya5vqly5zf7h4h6za3s5s3n38lldyc";
+          rev = "de4c14122ffe6a04c93590da0ad4b8411801c6f5";
+          sha256 = "1f1frnxsi8pgbmiycssq1jh1qjp12yfy1hq6zqscj0v510c4kzcq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/04e3be76aef4d1b6d5bb3eda533b5deffcc8a5bc/recipes/pocket-api";
@@ -53813,6 +54065,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }:
+    melpaBuild {
+        pname = "pocket-mode";
+        version = "20170320.627";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "pocket-mode";
+          rev = "36128b4c1785f94da52e3c7d98ca44da8911996e";
+          sha256 = "0mr1acblwfm67x1v7wgz77djr81gv8bb8jd2giwbs8qxqic56zcn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/6aa3d04058bfc0bc1da3393d17429d517275e97c/recipes/pocket-mode";
+          sha256 = "04zxll5yg021m13vr54w2pnrmqb87ykdbpa8nx2wn9myg2rywh0v";
+          name = "pocket-mode";
+        };
+        packageRequires = [ emacs pocket-api ];
+        meta = {
+          homepage = "https://melpa.org/#/pocket-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "podcaster";
@@ -53943,8 +54216,8 @@
         src = fetchFromGitHub {
           owner = "TatriX";
           repo = "pomidor";
-          rev = "c361814b1abbff2b213bd3cd5376efd3e749ce2e";
-          sha256 = "15ryj9hp9kc9fn6jwipwwgaj6f5cwwmjswq1017y0f69qf69dd1i";
+          rev = "bac68f7a1c72da3db6020d3bda45e38576c9c488";
+          sha256 = "13bq9cm9aclnlsjzw66kig2618xr2v5sfb12dff8ja5hmw0j2jla";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor";
@@ -54872,12 +55145,12 @@
     project-shells = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "project-shells";
-        version = "20170311.409";
+        version = "20170312.1912";
         src = fetchFromGitHub {
           owner = "hying-caritas";
           repo = "project-shells";
-          rev = "ab10fcd370781f684ca334f83fd70ed22a3f93b9";
-          sha256 = "0fh61myklzg514zlqasp09arxdg43lvyqv7sv2dr74ins29zc0lq";
+          rev = "1baec678ff04c2970591a2cb477c00b0182d6db1";
+          sha256 = "05x0i3zyqgx72r9mzs98anzwdy7l1v2p5m6k4sffp1fcsp78b80v";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/becf54de5ae9582d7c76382dff16d40b04b1a464/recipes/project-shells";
@@ -54998,12 +55271,12 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20170301.1407";
+        version = "20170315.730";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "4e5cecdf28e5c7a255648b246883adf6add987f6";
-          sha256 = "0wdbmsqw806qji12wwiw2blzldnpyj2lzqj3qcyxladq5w576xqs";
+          rev = "fb28fc8710b614e9ab535788ee58f9a9070561f1";
+          sha256 = "0v7ddlk8mzqa8gvxrrcvd15klap5m31df8vn14z99s3ybj3zk0yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails";
@@ -55296,8 +55569,8 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "a69bc9de75fe08f5fe7ad6e2339dfc5b0da5d8ef";
-          sha256 = "11b7wmzkm35bsbczhswl5495zz84ib2dm3syyyvyhbrgqrayppmq";
+          rev = "ffa932bf10d958fc3dff3ac9153f1b4ef55d6024";
+          sha256 = "1d6j2al7vz1a4dpzmn3vl62f2vsprjiddjlj4ww4j6g2lpphrik0";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode";
@@ -55533,12 +55806,12 @@
     puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "puppet-mode";
-        version = "20170213.207";
+        version = "20170315.1112";
         src = fetchFromGitHub {
           owner = "voxpupuli";
           repo = "puppet-mode";
-          rev = "03f608234ed0cf403966454de6758ec7fc9c784d";
-          sha256 = "11kqbi4bjwn9cb48wn1nfy4d8rln07wmpj263cpb3npm1y6hfvpp";
+          rev = "d7f25ade2266927356ae20053eb353c099ab233e";
+          sha256 = "0hk5ikf5jnbmwn6jm2drpn3wv9agmcl2wp9dhlhc8c23pqrjv1hk";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode";
@@ -55658,12 +55931,12 @@
     px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "px";
-        version = "20170123.851";
+        version = "20170317.1630";
         src = fetchFromGitHub {
           owner = "aaptel";
           repo = "preview-latex";
-          rev = "446f2c4670ae5a0e62393871190423333c531660";
-          sha256 = "02rr4akm93c42zvlm5l1q8q7wipa051bcfv6h52p6fksw18ablha";
+          rev = "0c52f7933eab3ca1642ab0df151db9950430c9e2";
+          sha256 = "0f741a2gpc2mdl85ivbiskga620b6ci2x0dwjs7m8c1vk6xrxbpi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/326fc9b057a5016248ac36ca166e9a38f13babf6/recipes/px";
@@ -56119,12 +56392,12 @@
     python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-docstring";
-        version = "20160509.315";
+        version = "20170314.43";
         src = fetchFromGitHub {
           owner = "glyph";
           repo = "python-docstring-mode";
-          rev = "a07bad8498a995d3389711a1989a7fe3502c82d2";
-          sha256 = "0y554x7gpjnw2l8yr70h4b0fj2adsl55lndfq6hba5xdiv7y3wkn";
+          rev = "6ac0b4cab3beb7cb8923f2b273526183179ccf86";
+          sha256 = "0vhhni9wxcwdv7lfdp12a223dvn5w3i5y62cv0gmlsgcr9qdy3cq";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring";
@@ -56581,12 +56854,12 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20170308.1044";
+        version = "20170315.1216";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "8cd8966db88de17d4c2f558540f1fe4b1b9e5a2e";
-          sha256 = "0lflbfrz90vkxmi33mw060vjimxsw6dr4fdpp2x38ykv97bwlpi1";
+          rev = "1c2c8964c5d16bf5c4ead2be8d19abc0244f59e6";
+          sha256 = "0cxi81rgqv4ri96gbzr2p2mnwyp3jn3klsvds9jkmgw6dd5q4b8a";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode";
@@ -56665,12 +56938,12 @@
     railscasts-reloaded-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "railscasts-reloaded-theme";
-        version = "20170214.116";
+        version = "20170314.146";
         src = fetchFromGitHub {
           owner = "thegeorgeous";
           repo = "railscasts-reloaded-theme";
-          rev = "077af9cb791d9eba4c561cd7cb3b10d2fcfc39d2";
-          sha256 = "1wd6j7m3w81rks6q8mrq5n6p6in0bc93szksds7sx2j2rz6vhfkn";
+          rev = "bd6e385752c89760fdee7bdf331e24d1d80ee7e9";
+          sha256 = "17vr2mbz1v20w7r52iqb7hicy131yaqhifbksvknx8xnm6z27pnm";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/9817851bd06cbae30fb8f429401f1bbc0dc7be09/recipes/railscasts-reloaded-theme";
@@ -56837,8 +57110,8 @@
         src = fetchFromGitHub {
           owner = "kakakaya";
           repo = "random-splash-image";
-          rev = "907e2db5ceff781ac7f4dbdd65fe71736c36aa22";
-          sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
+          rev = "53a39ebfd8ac6be066a652a508a717870f94218a";
+          sha256 = "1mky9xhghzz34sswqm2v3jhfc25fdrjx4hh4a1hs4h45g1v58lm9";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2bfbfe83143299b86f867c4d7faf6a0d7a070e1e/recipes/random-splash-image";
@@ -56854,12 +57127,12 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20170207.2133";
+        version = "20170315.2037";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "efd54e6090114138f6b3acaf21168eca29363cd4";
-          sha256 = "02hi45xd6vgaj98v772nmwhwqzlz68d9h5ywndp3i18zddnpr9y7";
+          rev = "e0429a06d55b3f11b369da61aa9043bb2843fa12";
+          sha256 = "171r9iljbp0pz7lvqsrnhdnir0bq2ynmhlb1ikf4k3i02w95i4v6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@@ -57257,8 +57530,8 @@
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "f7012d43f55957256ca81612c2ab5ae496b5a9da";
-          sha256 = "0irhzy52vyg7363m0z3d0m9pymzdjwspaffi1j5ahi0lma18c438";
+          rev = "2328ede5bbe6f20c69c0696e9f6ed4692ca4b4f0";
+          sha256 = "04fa6sbw7hwwmrs0s94l1bdb4gw9q5xs3y26ngqqx0y6a211pb6q";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
@@ -57284,8 +57557,8 @@
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-byebug";
-          rev = "5f45e790cc8261caccc8f30b99b36c303e2c78f5";
-          sha256 = "1gqszhdgrqcrlb3b7i1ng3qxkd8s1fxa69rh652ggwssy0ss8qsc";
+          rev = "cb75d6bd9abbe04afa4c74a7ce9c66852814e0c3";
+          sha256 = "04fn27a079zsdrf08w4rrvw9xd473ni1bh57gbizdznnvgjldfkr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug";
@@ -57301,12 +57574,12 @@
     realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }:
     melpaBuild {
         pname = "realgud-old-debuggers";
-        version = "20161225.626";
+        version = "20170316.31";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-old-debuggers";
-          rev = "fd38ebe7d4a59786d34b0cf972c315278871bf47";
-          sha256 = "1p3dk81f1cyisv6fb7fny6a9nij4c0yljypcdwiy79zq3fniskhp";
+          rev = "1e1d573a6ba731afbe68c1309a316457ca3fbb94";
+          sha256 = "1gk8k9lqbvqq4ngw0ffp3sqhkaj23n54m3ndh2ba9gvlmx7mxm7g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers";
@@ -57326,8 +57599,8 @@
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-pry";
-          rev = "fca36075a223f6a4a643764199babe3d1dfde2ac";
-          sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp";
+          rev = "4c903439b6292f51037d4a12ea54897e3a23541f";
+          sha256 = "0nm9w3w2k7v2nbdp8q6k37ysahr34iprnqjfag631xhlswshiwrl";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry";
@@ -57347,8 +57620,8 @@
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "realgud-ruby-debugger2";
-          rev = "8d1bf53e250d10bc4b051b32ee6a89161706c66a";
-          sha256 = "1ip22z48vj6a6xh54s26ss10pxhqrdm5k9h28i1vgv5x75kqgxii";
+          rev = "b394bee61e75b7c6a5fa565594aa79b74887f5df";
+          sha256 = "17lspprzaxv6lmwxgqr0vazkvh6dm2cpqs5yildczlr843k90vv5";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-rdb2";
@@ -58088,12 +58361,12 @@
     req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
     melpaBuild {
         pname = "req-package";
-        version = "20161012.427";
+        version = "20170314.2342";
         src = fetchFromGitHub {
           owner = "edvorg";
           repo = "req-package";
-          rev = "f0a81e86ede9896b4653839d5b3ca23f784d3678";
-          sha256 = "1mk9wl63yhk0pjnbpsk0awvgxh31r6k98jik1b96adid77jxqj76";
+          rev = "e7108177d05fc6f674b1766f1154d0652654b1af";
+          sha256 = "1pv3yvglfq09rc2vxhy48hglppydsz0ji92564xba5kngqbbjw34";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f58a801f0791566d0c39493a5f82ff0d15d7ab41/recipes/req-package";
@@ -58214,12 +58487,12 @@
     restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "restart-emacs";
-        version = "20170306.2230";
+        version = "20170313.939";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "restart-emacs";
-          rev = "d7eacf44b643babce367076d91bef87cdf8e732e";
-          sha256 = "0gw5i62d74byj4zdas480cpylz9rnb4jishpzhpq1zvmdhh5sd0d";
+          rev = "38603b019b703f6e78f640478ee6412ba743f7b1";
+          sha256 = "0zvknsakxfzkbfi7sg61q1m3484h1a0h6clzxd8hg4xifw6crf9y";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs";
@@ -58239,8 +58512,8 @@
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d";
-          sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp";
+          rev = "87c4f25155abef1ee8678e2137c1d8b3b2154ff5";
+          sha256 = "18ym81hmcj83qsw96y6amb84wxjk63a9fgij6hbkq7d6vp970x5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient";
@@ -58256,12 +58529,12 @@
     restclient-helm = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, restclient }:
     melpaBuild {
         pname = "restclient-helm";
-        version = "20160407.249";
+        version = "20170314.854";
         src = fetchFromGitHub {
           owner = "pashky";
           repo = "restclient.el";
-          rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d";
-          sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp";
+          rev = "87c4f25155abef1ee8678e2137c1d8b3b2154ff5";
+          sha256 = "18ym81hmcj83qsw96y6amb84wxjk63a9fgij6hbkq7d6vp970x5g";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm";
@@ -58457,22 +58730,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 = "20170212.938";
+        version = "20170318.657";
         src = fetchFromGitHub {
           owner = "dajva";
           repo = "rg.el";
-          rev = "fd0f056a5912caeeb2d4f668969d9df81c9e22db";
-          sha256 = "1lig93lj5mnm2fjvwac42kfw8bhq8ggs4jfc73fmclm6s5dg8661";
+          rev = "6c85ce6974b67644dce5a607285f04197fe4874e";
+          sha256 = "09r5rnnwxyqkf9kzpragwqxhhlgpr49kbvxc6ci18bkcs44vvcnw";
         };
         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;
@@ -58649,12 +58922,12 @@
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "20160926.656";
+        version = "20170316.511";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "0c6d8b52293dea80e62b73204871d177c8896c0c";
-          sha256 = "0brhw5fl5xhmmwx27aj1yqjslqvk0qdj4akpgq1ikpx8y4gac95d";
+          rev = "53360f55df3857933a483af652aefe33187f5304";
+          sha256 = "1na2h4pxrs0l3i5bsyn2c5mf5nbpr90lyhxav57wc2jcqz24nz4l";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe";
@@ -58863,8 +59136,8 @@
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "606864f4e3f6e00426a69087b707cbc44d19404c";
-          sha256 = "1ga88cjjb91pma47r4hz3kg6080dk29lbvghlffh9x0r91w1y5pj";
+          rev = "81ac739febae408d593e2d743ac64c8c068fdb78";
+          sha256 = "161nbshas80qxgpck5mnpa0y0v9bx9rdph2g87wr95lzw9dm3cyb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags";
@@ -58925,7 +59198,7 @@
         version = "20161115.2259";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57962";
+          rev = "58039";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59005,7 +59278,7 @@
         version = "20150424.752";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "57962";
+          rev = "58039";
           sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf";
         };
         recipeFile = fetchurl {
@@ -59631,12 +59904,12 @@
     sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20170201.246";
+        version = "20170317.330";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "c8fb801958e7c628ae618e8e1e4e04434ca41110";
-          sha256 = "0acbsf5srdpk7gl27wyqkqg56akbg0xff3wzi07yw4hwaspcbm0s";
+          rev = "c92cf327f49d9bf8a146dec64b72baf7d341d80c";
+          sha256 = "1iysw66g3nxsfl3svxi2j7ish3hzi4b8qy30wcj27jjwfjn2mywp";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode";
@@ -59656,8 +59929,8 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "3a7dd67970c5ac57df24c40e18e77a99fd14e1c7";
-          sha256 = "0hk965ldfxybjjaw9sfyn4zw28178pdmaljk454y4y6xfnm2xcrw";
+          rev = "714e14e4a6b8eb62677784de6213e1cde79a6554";
+          sha256 = "0yq86lm8754899lvx9g9w4y34gsw91xw51m9rsk59x7jfd2lfq6x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode";
@@ -60299,8 +60572,8 @@
         src = fetchFromGitHub {
           owner = "kiyoka";
           repo = "sekka";
-          rev = "09f7c7c75d8570909ecb45599d6f3ba75768321c";
-          sha256 = "0s6y3aqavc4lfqi84hkvbdyyjgw9j5n99272blj0878a0qmia658";
+          rev = "987c1cce65c8f30b12cdb5991e1b1ad9da766916";
+          sha256 = "03930cfqq97f7m6z9da2y9388iyymc56b1vdrl5a6mpggv3wifn7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka";
@@ -60482,12 +60755,12 @@
     seoul256-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "seoul256-theme";
-        version = "20161121.1247";
+        version = "20170320.1311";
         src = fetchFromGitHub {
           owner = "anandpiyer";
           repo = "seoul256-emacs";
-          rev = "4ec545214b137bd0062d53108b8a523250bda875";
-          sha256 = "0hwvsxq7cba2bqanjmlln8cx63nhsq3rlg9p12lwbqrfppmlfj18";
+          rev = "8afaf6aa2c63a003e2899e3e5ba8be85f6fdd350";
+          sha256 = "0viwqym1vns2l3lrxv0sdrbvadn6apk8gip26a3ln4pzq1723qxh";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/664fc68d7b0eb92940fc188f5b9bee7ac7e0c674/recipes/seoul256-theme";
@@ -61577,12 +61850,12 @@
     simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
     melpaBuild {
         pname = "simplenote2";
-        version = "20170106.2358";
+        version = "20170317.335";
         src = fetchFromGitHub {
           owner = "alpha22jp";
           repo = "simplenote2.el";
-          rev = "9a97863bc8e089b2a751d8659a7fa2d19876d9bc";
-          sha256 = "0vd1n2wsgzhwz6ir5cr90cl844r1yph28iav0kwa6bmk6zkfd3c6";
+          rev = "5f267d6289b103d77feb2f038baedeae39deee75";
+          sha256 = "07rmwga7qd8g71km5p3g3vjmmiy8cr5snyrvhiwi9lcnai83kc50";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2";
@@ -61745,12 +62018,12 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20170306.718";
+        version = "20170318.627";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "e64753db3c989ba12f6b52796e9dbcf8c285fbea";
-          sha256 = "0bxn7nngc851h5z8bwmc61cl3yps6w6zwf26af6fpcj7d4i8435r";
+          rev = "0474bbf2d446ef706c5779b2f42d0d10375bdd7e";
+          sha256 = "1q0bq9s38q0wba34gdngs3zhybdnzb2c840sivnqdlj5kp74wcq8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack";
@@ -61808,12 +62081,12 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20170209.1240";
+        version = "20170319.1601";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "9eeb7163f07a88450871fff2be78446ee7a4fd52";
-          sha256 = "0pxc5ygjc3jz42nxim5l0yc0wns4rfzs2rxwpxy027rqwkk0ap6j";
+          rev = "0f3459f558bb71daab2416102b99a8ce39947d83";
+          sha256 = "0sqjsc7gbiqivi9f8y53fc3nys61dhs8lq1zz57yg24qvv3hxqi3";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime";
@@ -61997,12 +62270,12 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20170305.1423";
+        version = "20170317.1656";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "f419ab5294015368ef30e658f94894ff2084f5b9";
-          sha256 = "0llax80z1d5kn03ip6d4jclnd2x8ydx8q3y8kyx8ypzyvx1ya43n";
+          rev = "d3f586a99e1d3ecb225b2a7c56435eaac2e5527c";
+          sha256 = "00wyvc34mcdqrb7cnayc0biw4rz92jad9vpv4w38zbs8331lkh5k";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly";
@@ -63368,8 +63641,8 @@
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "80f40d21ff3350f6dbd3e572e49e177f734391fe";
-          sha256 = "0yavgzricvgrvqgnjwxhw4vlphkglh9bb91j78wsmqr11l1sl66n";
+          rev = "9358c37ee9c90a3d13a43afcd6917fea8eef144b";
+          sha256 = "1k711ppzkd9c5ial8cs0aazsi0zig6r9acmbhr0h9zizbrsw5sl1";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme";
@@ -64110,12 +64383,12 @@
     ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ssh-deploy";
-        version = "20170109.2256";
+        version = "20170315.844";
         src = fetchFromGitHub {
           owner = "cjohansson";
           repo = "emacs-ssh-deploy";
-          rev = "1c1e379b153bc6206985c765969fd6a9f56aec25";
-          sha256 = "10p5yaagv5lhv6d0jcfk8pynqcw6njkjgjmgicl32nwrkgfapa6f";
+          rev = "4c1a539e6f95e4847c13685d2b752e40d2b8aad8";
+          sha256 = "1zkxiy66d34v09krfajx6y8i2s5jdp99sxfzbvzi854s9hldl58x";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy";
@@ -64916,12 +65189,12 @@
     suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }:
     melpaBuild {
         pname = "suggest";
-        version = "20161205.450";
+        version = "20170320.113";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "suggest.el";
-          rev = "19bfa7d6c2356a62647c7fe85876a88ab3b6475f";
-          sha256 = "0sh3nryhcr2spxjh7p0jsjyfhvmqnwjayzz2zrwv3xi2vdgg8gb8";
+          rev = "c0470316543091b4f64b334c51538acd95dffc9c";
+          sha256 = "1f3w6qzbw1ksm9sxqcxygr1n6g9ddd7xx0b29yvp2s94mia3rbs7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest";
@@ -65288,12 +65561,12 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20170225.356";
+        version = "20170320.358";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "1ac1cc1378eeaec2eb47a21dabbb1f6d775e7823";
-          sha256 = "0024zry02vwzhdip5s5g55wlicakj4815yy8s617jzmj840x97mc";
+          rev = "beffa78885517beaad2da50accc339f9346f94ee";
+          sha256 = "18bxh67xdkbxpmxdqidrnqwlzffdywmf9vwz4zcynagj7yscx3yb";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper";
@@ -66022,8 +66295,8 @@
         src = fetchFromGitHub {
           owner = "11111000000";
           repo = "tao-theme-emacs";
-          rev = "df36a5b37928855f013d40bd47c87e2ed281727c";
-          sha256 = "0qn1z4cxc3v4s6fl0j7k95zdnfs5r860nd0ah0w9yn7ic71jl9ib";
+          rev = "1d68f51db69ed096a6e13b036755f0c4b6ad3e8f";
+          sha256 = "0nh0yrn2jgccifh2xvrfly6n145flvxx76wxc5jjdkgg2xy7alys";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme";
@@ -66463,8 +66736,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
-          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
+          rev = "df0c000f7b94faf3c451c855acbd30631167c41b";
+          sha256 = "0s3j9pyjnry06lfz7jrd79vrd0mlw6vj9i62xs81zi6v4vf002wr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern";
@@ -66484,8 +66757,8 @@
         src = fetchFromGitHub {
           owner = "ternjs";
           repo = "tern";
-          rev = "e6a7777f273050098fa7074577ac196bae59d80b";
-          sha256 = "0qyw5zzqqbbah7k3axyqyk78iy9h6ndw5rmajsm033nj9a9d8rxv";
+          rev = "df0c000f7b94faf3c451c855acbd30631167c41b";
+          sha256 = "0s3j9pyjnry06lfz7jrd79vrd0mlw6vj9i62xs81zi6v4vf002wr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete";
@@ -66564,12 +66837,12 @@
     test-c = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "test-c";
-        version = "20170123.950";
+        version = "20170316.1432";
         src = fetchFromGitHub {
           owner = "aaptel";
           repo = "test-c";
-          rev = "94e9f76659c45100a9b0e2a9fecf6482427cbbac";
-          sha256 = "0lnx9fidpfpmwi7xa2ik5mc72lcfc9g8cm9r25s5x7sfy9vr3q8c";
+          rev = "5a8c22a0e5ae6e2b0157bf1c41f0fe798c562a21";
+          sha256 = "0g1xbb8n3006cqzb6awiqk7n0b6h54dlm7iz5r1n48zaf7mp6046";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/ef915dc2d3bc09ef79eb8edde02101c89733c0b2/recipes/test-c";
@@ -67013,12 +67286,12 @@
     tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20170310.2151";
+        version = "20170318.822";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "70d859495d8bd76f338868f6fc1a89dbcabf7a2b";
-          sha256 = "0nd5lcs2lv5m0s56vga3d7j66zfy2w4dafv8g3jv3m3p5hll1dq4";
+          rev = "96b35dda1ff9fe5b185618edddd4787b4821f9e5";
+          sha256 = "1jq1iyg0h4ddgkbsba0yw1h95xjh5dqnjdjdjsyx3ky8ir562la2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide";
@@ -67718,8 +67991,8 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-traad";
-          rev = "de76278e77d26ab8c400c03cef7bc3326be1e257";
-          sha256 = "1l092pxpm02wr0wp5j1027s8wdd0qjaj5rl2gfl9b2qskw4qh8f2";
+          rev = "6d797f124fd4e037df7727d7696328a95748b9af";
+          sha256 = "1r3s7qjlf943h3wqc5plw0la0p54xmxzdj3iwaz9lymfxx6n3h72";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad";
@@ -68384,12 +68657,12 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20170311.1208";
+        version = "20170314.658";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "ca510ab853feb45bb0a6fa5bfe01c96bb1da50ba";
-          sha256 = "11g98jy74bpkryb9y5kclndm1zv40rwg7cfpd782fp8f767f17rq";
+          rev = "5931f2776d07f361a9aa58075dcea721b9480416";
+          sha256 = "12cw0nphc7xkzphwmflp2r2jbvixqhmb4lvvgp52qsy8b8n1hamr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode";
@@ -69159,12 +69432,12 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20170218.132";
+        version = "20170319.12";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "53bf803f1d3efc61653f94fe56ff30a72304861e";
-          sha256 = "1knyd7gf975akjkzn3dh3jckvk377x3n1b6b1d425rw9clwnginp";
+          rev = "bf9a73f919cbd677e4015f82e90099d7cabe5011";
+          sha256 = "079vvhv0wjk0nqisk86z1nkxm9hgwnv93dsb3rlqnzjdijw6z2s2";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package";
@@ -69558,12 +69831,12 @@
     vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "vdiff";
-        version = "20170204.1636";
+        version = "20170320.1805";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-vdiff";
-          rev = "d243767ed4b1ac68515c9276f53cc3ea407456a3";
-          sha256 = "1xg4jxz1nxsmfwdqwzz35mkvd3afa28dlxgd5rw19m0wqsb0miim";
+          rev = "f11c7c2eeef33a0b75fe4e025818e7e672c57397";
+          sha256 = "1shkjk38piwrsn78bcy557zvm68xznlk4kg5l2fgiwfmmzdnvj13";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff";
@@ -69705,12 +69978,12 @@
     vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }:
     melpaBuild {
         pname = "vhdl-tools";
-        version = "20161010.239";
+        version = "20170315.1525";
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "c964571c38fd3a6bfadc88fd9def3ed03132a052";
-          sha256 = "01sdkhljh7mdwv4mvm37gimjvl3i0jpn4xzmd9sdjll0dbc8rxki";
+          rev = "6f3f8ba58432dfdac59122164c732ccc0dfc475b";
+          sha256 = "076v5zafalv1r14ms90zs1p7yq11fzff4vywrda6dh63i0yk2vxs";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools";
@@ -70325,12 +70598,12 @@
     wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wakatime-mode";
-        version = "20161019.602";
+        version = "20170319.2117";
         src = fetchFromGitHub {
           owner = "wakatime";
           repo = "wakatime-mode";
-          rev = "4a99c5ad1e25135a086cab63ad797fae9b03afbb";
-          sha256 = "0y4ydwqvjnkf8iav0c08zpmqm1zja7r5c6cjwnk07rsnb5zhpzjw";
+          rev = "ac31d0def2a9c03c3aa2cbe9cdd94d61de5a6ecc";
+          sha256 = "07grqwh71x4jd1vpah6lxz3vh3q9rxkn4dli2165db7cazpv1ym8";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode";
@@ -70619,12 +70892,12 @@
     web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20170309.3";
+        version = "20170320.1240";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "b8b0dec9fb429012e530a36eb1aa918f84c6ee82";
-          sha256 = "1k7rzk04n7vw0dzxfl4fdlb88br1zxn8w3i2ld5abz2b0x87497p";
+          rev = "4d16489eb14e47f3d63b4bdd4d9f7177133a973c";
+          sha256 = "0xgij4ln7r8q56c79m729nayr66bzmlkfbmmy8pr33rca6m66hfr";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode";
@@ -70703,12 +70976,12 @@
     webpaste = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "webpaste";
-        version = "20170306.946";
+        version = "20170320.1251";
         src = fetchFromGitHub {
           owner = "etu";
           repo = "webpaste.el";
-          rev = "92a586752b7fbc4089a6d92750c70274448aa496";
-          sha256 = "00b6sbcp827n5d8ql87503m3k1wnlx6rbr3xgrr41aq0b0xj6z7k";
+          rev = "8e9f4e05503b8751736ee4db78e78cc8edbe9f8a";
+          sha256 = "0gs1b2yvg2742vpjc4gaj5g2yf81br3456pi5yfz6cwkxk4adfyi";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/13847d91c1780783e516943adee8a3530c757e17/recipes/webpaste";
@@ -70955,12 +71228,12 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20170209.729";
+        version = "20170315.1055";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "0d56e4369b53af2c5960af4827b56b06d9162d62";
-          sha256 = "08dw13hn1w9m37gd2cch3z9af504x55w0hlinn05j1jgvja50c7f";
+          rev = "3c7ecc69d48258af66978a685aedcbc8d1ada512";
+          sha256 = "1q6v4bnw9sl6f138lxkqp979xpbgsb57gxj8a1k7clms16kkn5ci";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key";
@@ -71145,8 +71418,8 @@
         src = fetchFromGitHub {
           owner = "kiwanami";
           repo = "emacs-widget-mvc";
-          rev = "ef5648d7dd6dbb88ca946e42011fe8eccadb524e";
-          sha256 = "1wlybqs45firifk7w7yndh70wmsimdrw6pv7hyaciyy0ghidya3n";
+          rev = "ff5a85880df7b87f9f480fe3c28438a0712b7b87";
+          sha256 = "1s0srhklmkmj3lfs8vr1dqi3s48z7fwx9mxqxckk5njld317hqg7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/76d3c38e205076a22628f490d8e8ddd80d091eab/recipes/widget-mvc";
@@ -71166,8 +71439,8 @@
         src = fetchFromGitHub {
           owner = "foretagsplatsen";
           repo = "emacs-js";
-          rev = "83bce5f49e49e526a66e528445f54889cd57dbb6";
-          sha256 = "02dmmw20jqcx1ij2kj3aam9fhwqcb52sjhcx7k4faryzdbx6zvwd";
+          rev = "92d6b0e8d81715c33b9926fc51adb74d8fa8a323";
+          sha256 = "02ny5ygm7hlm5jx8hl0r10pf3bfvlyfnp2cvkhqz66mfhrv6f7yj";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs";
@@ -71534,8 +71807,8 @@
         version = "20160419.1232";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "3a654cfe6632";
-          sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d";
+          rev = "3447d48e8562";
+          sha256 = "1qym4wfcr3hiq0a1z3myvzalblwwp5xalq9sjx090w3ag3ghgjrg";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@@ -72139,12 +72412,12 @@
     xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20170213.321";
+        version = "20170317.2237";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "073190840e6a07566f75a6dcabd1d3c120b0639e";
-          sha256 = "19b8d4a5g43n9y2y0r8l12ds5badns9zlky0j201bzz3yrcid7xb";
+          rev = "4d61f0b6d9209c17e6834aaced28cd7d8aabaad1";
+          sha256 = "1i1f30yy6hzhlpsn2836zk2cv6rbcvapwzp310l28ngr4wd6k4x7";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys";
@@ -73018,12 +73291,12 @@
     yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yascroll";
-        version = "20170309.555";
+        version = "20170315.1206";
         src = fetchFromGitHub {
           owner = "m2ym";
           repo = "yascroll-el";
-          rev = "7b58febbc698e10b3714506a2ce09071fb172bff";
-          sha256 = "0zk8j1jbq2sba09kr8kn2mmsf2i78ng567s9823336b4s61279qx";
+          rev = "fe4494e5f4faf2832e665c7de0fed99cdbb39478";
+          sha256 = "09y8phmvqdwp1k9w84rf6p609jrg0mhgx6akwda8rsvxrrbsh6j4";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/yascroll";

From 2a65244cce534b5d853927b6733ec8ebd40da2f3 Mon Sep 17 00:00:00 2001
From: Matthew Daiter <matthew@nomoko.camera>
Date: Tue, 21 Mar 2017 12:19:54 +0100
Subject: [PATCH 2707/3449] riak: adding myself as maintainer

---
 pkgs/servers/nosql/riak/2.2.0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/nosql/riak/2.2.0.nix b/pkgs/servers/nosql/riak/2.2.0.nix
index 5ad1e9f7a37c..9998d34a2dae 100644
--- a/pkgs/servers/nosql/riak/2.2.0.nix
+++ b/pkgs/servers/nosql/riak/2.2.0.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    maintainers = with maintainers; [ cstrahan ];
+    maintainers = with maintainers; [ cstrahan mdaiter ];
     description = "Dynamo inspired NoSQL DB by Basho";
     platforms   = [ "x86_64-linux" ];
   };

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 2708/3449] 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 034eb5344234..1c97f7252f56 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 f3f897ac9e79..d2e1d2dc86fd 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 262ea74d4a34..28b5e11223ff 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 fa79cfa3be5c..79eb8ab2f83c 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 e7cf3b4c4489..5d002c096239 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 33bb1d5a4cab..984b11844342 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 6723ba6b6a58..a3658a96bf3d 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 133cbdb34fd2..499634236acd 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 dc3dd69ac02e..a5ae0aaa137d 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 ee3419eed0e9..880edfbab079 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 6473ebf22b13..4aff09b8f8f5 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 abea143d11da..b85b20423697 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 99d3c89e1f9d..29295de66b7e 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 18933426db0a..ef339d47ea05 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 2ada782563e5..4fec00a2fd7e 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 c0a6c0a9baa0..1c40493e4ae9 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 ccedc381504f..366cc9787f28 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 cf06f64421e1..d80c36842352 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 37c31c635d77c319c151905678983ae12789188e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 21 Mar 2017 13:12:24 +0100
Subject: [PATCH 2709/3449] ponyc: segfaults on i686

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

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index e70fee3605b6..f78eafa68afa 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -79,11 +79,11 @@ stdenv.mkDerivation ( rec {
   # Stripping breaks linking for ponyc
   dontStrip = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
     homepage = http://www.ponylang.org;
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ doublec kamilchm ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ doublec kamilchm ];
+    platforms = subtractLists platforms.i686 platforms.unix;
   };
 })

From 29f57ac4479fa5baed5bbbf29fe1b4eac7a86b4d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 2 Mar 2017 04:18:19 +0100
Subject: [PATCH 2710/3449] gitlab: 8.16.6 -> 8.17.4 for CVE-2017-0882

---
 .../version-management/gitlab/Gemfile         |  17 +--
 .../version-management/gitlab/Gemfile.lock    |  52 ++++-----
 .../version-management/gitlab/default.nix     |  30 +++--
 .../version-management/gitlab/gemset.nix      | 108 ++++++++----------
 4 files changed, 101 insertions(+), 106 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 6d6564ea5f9b..db1ac67a6667 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -7,7 +7,6 @@ gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 gem 'responders', '~> 2.0'
 
 gem 'sprockets', '~> 3.7.0'
-gem 'sprockets-es6', '~> 0.9.2'
 
 # Default values for AR models
 gem 'default_value_for', '~> 3.0.0'
@@ -36,7 +35,7 @@ gem 'omniauth-twitter',       '~> 1.2.0'
 gem 'omniauth_crowd',         '~> 2.2.0'
 gem 'omniauth-authentiq',     '~> 0.2.0'
 gem 'rack-oauth2',            '~> 1.2.1'
-gem 'jwt'
+gem 'jwt',                    '~> 1.5.6'
 
 # Spam and anti-bot protection
 gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'
@@ -48,6 +47,9 @@ gem 'rqrcode-rails3', '~> 0.1.7'
 gem 'attr_encrypted', '~> 3.0.0'
 gem 'u2f', '~> 0.2.1'
 
+# GitLab Pages
+gem 'validates_hostname', '~> 1.0.6'
+
 # Browser detection
 gem 'browser', '~> 2.2'
 
@@ -109,7 +111,7 @@ gem 'org-ruby',             '~> 0.9.12'
 gem 'creole',               '~> 0.5.0'
 gem 'wikicloth',            '0.8.1'
 gem 'asciidoctor',          '~> 1.5.2'
-gem 'asciidoctor-plantuml', '0.0.6'
+gem 'asciidoctor-plantuml', '0.0.7'
 gem 'rouge',                '~> 2.0'
 gem 'truncato',             '~> 0.7.8'
 
@@ -219,10 +221,12 @@ gem 'oj', '~> 2.17.4'
 gem 'chronic', '~> 0.10.2'
 gem 'chronic_duration', '~> 0.10.6'
 
+gem 'webpack-rails', '~> 0.9.9'
+gem 'rack-proxy', '~> 0.6.0'
+
 gem 'sass-rails', '~> 5.0.6'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'uglifier', '~> 2.7.2'
-gem 'gitlab-turbolinks-classic', '~> 2.5', '>= 2.5.6'
 
 gem 'addressable',        '~> 2.3.8'
 gem 'bootstrap-sass',     '~> 3.3.0'
@@ -280,6 +284,7 @@ group :development, :test do
   gem 'rspec-retry',        '~> 0.4.5'
   gem 'spinach-rails',      '~> 0.2.1'
   gem 'spinach-rerun-reporter', '~> 0.0.2'
+  gem 'rspec_profiling'
 
   # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
   gem 'minitest', '~> 5.7.0'
@@ -291,13 +296,9 @@ group :development, :test do
   gem 'capybara-screenshot', '~> 1.0.0'
   gem 'poltergeist',         '~> 1.9.0'
 
-  gem 'teaspoon', '~> 1.1.0'
-  gem 'teaspoon-jasmine', '~> 2.2.0'
-
   gem 'spring',                   '~> 1.7.0'
   gem 'spring-commands-rspec',    '~> 1.0.4'
   gem 'spring-commands-spinach',  '~> 1.1.0'
-  gem 'spring-commands-teaspoon', '~> 0.0.2'
 
   gem 'rubocop', '~> 0.46.0', require: false
   gem 'rubocop-rspec', '~> 1.9.1', require: false
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 80cdf9d3258d..1916267bb89b 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -56,7 +56,7 @@ GEM
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.0)
     asciidoctor (1.5.3)
-    asciidoctor-plantuml (0.0.6)
+    asciidoctor-plantuml (0.0.7)
       asciidoctor (~> 1.5)
     ast (2.3.0)
     attr_encrypted (3.0.3)
@@ -74,10 +74,6 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
     babosa (1.0.2)
     base32 (0.3.2)
     bcrypt (3.1.11)
@@ -268,8 +264,6 @@ GEM
       mime-types (>= 1.16, < 3)
       posix-spawn (~> 0.3)
     gitlab-markup (1.5.1)
-    gitlab-turbolinks-classic (2.5.6)
-      coffee-rails
     gitlab_omniauth-ldap (1.2.1)
       net-ldap (~> 0.9)
       omniauth (~> 1.0)
@@ -381,7 +375,7 @@ GEM
     json (1.8.3)
     json-schema (2.6.2)
       addressable (~> 2.3.8)
-    jwt (1.5.4)
+    jwt (1.5.6)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -550,6 +544,8 @@ GEM
       rack (>= 1.1)
     rack-protection (1.5.3)
       rack
+    rack-proxy (0.6.0)
+      rack
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.7.1)
@@ -644,6 +640,11 @@ GEM
     rspec-retry (0.4.5)
       rspec-core
     rspec-support (3.5.0)
+    rspec_profiling (0.0.4)
+      activerecord
+      pg
+      rails
+      sqlite3
     rubocop (0.46.0)
       parser (>= 2.3.1.1, < 3.0)
       powerpack (~> 0.1)
@@ -662,7 +663,7 @@ GEM
       sexp_processor (~> 4.1)
     rubyntlm (0.5.2)
     rubypants (0.2.0)
-    rubyzip (1.2.0)
+    rubyzip (1.2.1)
     rufus-scheduler (3.1.10)
     rugged (0.24.0)
     safe_yaml (1.0.4)
@@ -732,19 +733,14 @@ GEM
       spring (>= 0.9.1)
     spring-commands-spinach (1.1.0)
       spring (>= 0.9.1)
-    spring-commands-teaspoon (0.0.2)
-      spring (>= 0.9.1)
     sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-es6 (0.9.2)
-      babel-source (>= 5.8.11)
-      babel-transpiler
-      sprockets (>= 3.0.0)
     sprockets-rails (3.1.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sqlite3 (1.3.11)
     stackprof (0.2.10)
     state_machines (0.4.0)
     state_machines-activemodel (0.4.0)
@@ -757,10 +753,6 @@ GEM
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
-    teaspoon (1.1.5)
-      railties (>= 3.2.5, < 6)
-    teaspoon-jasmine (2.2.0)
-      teaspoon (>= 1.0.0)
     temple (0.7.7)
     test_after_commit (1.1.0)
       activerecord (>= 3.2)
@@ -795,6 +787,9 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
     uniform_notifier (1.10.0)
+    validates_hostname (1.0.6)
+      activerecord (>= 3.0)
+      activesupport (>= 3.0)
     version_sorter (2.1.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -812,6 +807,8 @@ GEM
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
+    webpack-rails (0.9.9)
+      rails (>= 3.2.0)
     websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
@@ -838,7 +835,7 @@ DEPENDENCIES
   allocations (~> 1.0)
   asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
-  asciidoctor-plantuml (= 0.0.6)
+  asciidoctor-plantuml (= 0.0.7)
   attr_encrypted (~> 3.0.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
@@ -888,7 +885,6 @@ DEPENDENCIES
   github-linguist (~> 4.7.0)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.5.1)
-  gitlab-turbolinks-classic (~> 2.5, >= 2.5.6)
   gitlab_omniauth-ldap (~> 1.2.1)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.2)
@@ -909,7 +905,7 @@ DEPENDENCIES
   jquery-rails (~> 4.1.0)
   jquery-ui-rails (~> 5.0.0)
   json-schema (~> 2.6.2)
-  jwt
+  jwt (~> 1.5.6)
   kaminari (~> 0.17.0)
   knapsack (~> 1.11.0)
   kubeclient (~> 2.2.0)
@@ -952,6 +948,7 @@ DEPENDENCIES
   rack-attack (~> 4.4.1)
   rack-cors (~> 0.4.0)
   rack-oauth2 (~> 1.2.1)
+  rack-proxy (~> 0.6.0)
   rails (= 4.2.7.1)
   rails-deprecated_sanitizer (~> 1.0.3)
   rainbow (~> 2.1.0)
@@ -968,6 +965,7 @@ DEPENDENCIES
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.5.0)
   rspec-retry (~> 0.4.5)
+  rspec_profiling
   rubocop (~> 0.46.0)
   rubocop-rspec (~> 1.9.1)
   ruby-fogbugz (~> 0.2.1)
@@ -992,15 +990,11 @@ DEPENDENCIES
   spring (~> 1.7.0)
   spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.1.0)
-  spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.7.0)
-  sprockets-es6 (~> 0.9.2)
   stackprof (~> 0.2.10)
   state_machines-activerecord (~> 0.4.0)
   sys-filesystem (~> 1.1.6)
-  teaspoon (~> 1.1.0)
-  teaspoon-jasmine (~> 2.2.0)
-  test_after_commit (~> 0.4.2)
+  test_after_commit (~> 1.1)
   thin (~> 1.7.0)
   timecop (~> 0.8.0)
   truncato (~> 0.7.8)
@@ -1010,12 +1004,14 @@ DEPENDENCIES
   unf (~> 0.1.4)
   unicorn (~> 5.1.0)
   unicorn-worker-killer (~> 0.4.4)
+  validates_hostname (~> 1.0.6)
   version_sorter (~> 2.1.0)
   virtus (~> 1.0.1)
   vmstat (~> 2.3.0)
   web-console (~> 2.0)
   webmock (~> 1.21.0)
+  webpack-rails (~> 0.9.9)
   wikicloth (= 0.8.1)
 
 BUNDLED WITH
-   1.13.7
+   1.14.5
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 60921fc54886..0e078950e665 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, libiconv, ruby
-, tzdata, git, nodejs, procps
+{ stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv, ruby
+, tzdata, git, nodejs, procps, dpkg
 }:
 
 /* When updating the Gemfile add `gem "activerecord-nulldb-adapter"`
@@ -18,19 +18,27 @@ let
     };
   };
 
+  version = "8.17.4";
+
+  gitlabDeb = fetchurl {
+    url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
+    sha256 = "1fd6y9lyavzsm2ac10sip01dnvcd73ymcn2rqdljr4sq4f222mry";
+  };
+
 in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.16.6";
 
-  buildInputs = [ env ruby bundler tzdata git nodejs procps ];
+  buildInputs = [
+    env ruby bundler tzdata git nodejs procps dpkg
+  ];
 
   src = fetchFromGitHub {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "03rzms2frwx4c09l2rig1amlxj965s2iq421i52j8wj2khb7pd7g";
+    sha256 = "1yrbbf55pz7863xngl2mxwj9w4imdlqvmqywd1zpnswdsjqxa5xj";
   };
 
   patches = [
@@ -64,9 +72,15 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     mv config/gitlab.yml.example config/gitlab.yml
-    GITLAB_DATABASE_ADAPTER=nulldb \
-      SKIP_STORAGE_VALIDATION=true \
-      rake assets:precompile RAILS_ENV=production
+
+    dpkg -x ${gitlabDeb} .
+    mv -v opt/gitlab/embedded/service/gitlab-rails/public/assets public
+    rm -rf opt
+
+    export GITLAB_DATABASE_ADAPTER=nulldb
+    export SKIP_STORAGE_VALIDATION=true
+    rake assets:precompile RAILS_ENV=production
+
     mv config/gitlab.yml config/gitlab.yml.example
     rm config/secrets.yml
     mv config config.dist
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 1ebb7c5b1fa1..4bc57f6bd08e 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -146,10 +146,10 @@
   asciidoctor-plantuml = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rd8yh0by5sxhg1c3cb1mzkp4jp3j8v6vzbyv1mx492s9ml451fx";
+      sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88";
       type = "gem";
     };
-    version = "0.0.6";
+    version = "0.0.7";
   };
   ast = {
     source = {
@@ -207,22 +207,6 @@
     };
     version = "0.1.1";
   };
-  babel-source = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1ncq8h82k6hypzfb5dk7z95mmcdwnhsxmc53xz17m1nbklm25vvr";
-      type = "gem";
-    };
-    version = "5.8.35";
-  };
-  babel-transpiler = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0w0minwxj56w96xps1msm6n75fs0y7r1vqcr9zlsn74fksnz81jc";
-      type = "gem";
-    };
-    version = "0.7.0";
-  };
   babosa = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -944,14 +928,6 @@
     };
     version = "1.5.1";
   };
-  gitlab-turbolinks-classic = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1zfqwa1pahhcz1yxvwigg94bck2zsqk2jsrc0wdcybhr0iwi5jra";
-      type = "gem";
-    };
-    version = "2.5.6";
-  };
   gitlab_omniauth-ldap = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1235,10 +1211,10 @@
   jwt = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0s5llb4mhpy0phzbrc4jd2jd2b91h1axy4bhci7g1bdz1w2m3a2i";
+      sha256 = "124zz1142bi2if7hl5pcrcamwchv4icyr5kaal9m2q6wqbdl6aw4";
       type = "gem";
     };
-    version = "1.5.4";
+    version = "1.5.6";
   };
   kaminari = {
     source = {
@@ -1848,6 +1824,14 @@
     };
     version = "1.5.3";
   };
+  rack-proxy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bpbcb9ch94ha2q7gdri88ry7ch0z6ian289kah9ayxyqg19j6f4";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
   rack-test = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2152,6 +2136,14 @@
     };
     version = "3.5.0";
   };
+  rspec_profiling = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01qrs189r0q08ys8vax269ff858q9ypsc94n1d700m9da44zi3wg";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
   rubocop = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2227,10 +2219,10 @@
   rubyzip = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10a9p1m68lpn8pwqp972lv61140flvahm3g9yzbxzjks2z3qlb2s";
+      sha256 = "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.2.1";
   };
   rufus-scheduler = {
     source = {
@@ -2464,14 +2456,6 @@
     };
     version = "1.1.0";
   };
-  spring-commands-teaspoon = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
   sprockets = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2480,14 +2464,6 @@
     };
     version = "3.7.0";
   };
-  sprockets-es6 = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0508h3vnjz08c64k11za6cqnbvvifka9pmdrycamzzjd4dmf10y3";
-      type = "gem";
-    };
-    version = "0.9.2";
-  };
   sprockets-rails = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2496,6 +2472,14 @@
     };
     version = "3.1.1";
   };
+  sqlite3 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19r06wglnm6479ffj9dl0fa4p5j2wi6dj7k6k3d0rbx7036cv3ny";
+      type = "gem";
+    };
+    version = "1.3.11";
+  };
   stackprof = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2552,22 +2536,6 @@
     };
     version = "1.2.0";
   };
-  teaspoon = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1xz5f1w8jm2fg1g194kf17gh36imd7sgs9cx0adqx1l22p7jrkvv";
-      type = "gem";
-    };
-    version = "1.1.5";
-  };
-  teaspoon-jasmine = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
   temple = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2728,6 +2696,14 @@
     };
     version = "1.10.0";
   };
+  validates_hostname = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04p1l0v98j4ffvaks1ig9mygx5grpbpdgz7haq3mygva9iy8ykja";
+      type = "gem";
+    };
+    version = "1.0.6";
+  };
   version_sorter = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -2776,6 +2752,14 @@
     };
     version = "1.21.0";
   };
+  webpack-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02jxkpdbi48yhcgldgl5jxnhnad83rdgpkkcwh8w1h6iyg04d42j";
+      type = "gem";
+    };
+    version = "0.9.9";
+  };
   websocket-driver = {
     source = {
       remotes = ["https://rubygems.org"];

From 4bd12fa7b2f3361be5f4c3288f37bb02d9fc8f9a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 6 Mar 2017 15:57:49 +0100
Subject: [PATCH 2711/3449] gitlab module: explicitely create pages shared path

Fixes creation of backups.
---
 nixos/modules/services/misc/gitlab.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 36db4fb96606..ee881edb5ab0 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -481,6 +481,7 @@ in {
         mkdir -p ${cfg.statePath}/repositories
         mkdir -p ${gitlabConfig.production.shared.path}/artifacts
         mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects
+        mkdir -p ${gitlabConfig.production.shared.path}/pages
         mkdir -p ${cfg.statePath}/log
         mkdir -p ${cfg.statePath}/shell
         mkdir -p ${cfg.statePath}/tmp/pids

From 219e91b4c620ce2b13e61086d5d0cee1706d7222 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 21 Mar 2017 12:52:39 +0100
Subject: [PATCH 2712/3449] gitlab: add rake task to delete tokens

The information disclosure was caued by CVE-2017-0882.
---
 .../version-management/gitlab/default.nix     |  4 ++
 .../gitlab/reset_token.rake                   | 43 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/version-management/gitlab/reset_token.rake

diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 0e078950e665..f04d0c89da35 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -91,6 +91,10 @@ stdenv.mkDerivation rec {
     cp -r . $out/share/gitlab
     ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads
     ln -sf /run/gitlab/config $out/share/gitlab/config
+
+    # rake tasks to mitigate CVE-2017-0882
+    # see https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
+    cp ${./reset_token.rake} $out/share/gitlab/lib/tasks/reset_token.rake
   '';
 
   passthru = {
diff --git a/pkgs/applications/version-management/gitlab/reset_token.rake b/pkgs/applications/version-management/gitlab/reset_token.rake
new file mode 100644
index 000000000000..705b5830edfc
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/reset_token.rake
@@ -0,0 +1,43 @@
+# Taken from:
+# https://about.gitlab.com/2017/03/20/gitlab-8-dot-17-dot-4-security-release/
+
+# lib/tasks/reset_token.rake
+require_relative '../../app/models/concerns/token_authenticatable.rb'
+
+STDOUT.sync = true
+
+namespace :tokens do
+  desc "Reset all GitLab user auth tokens"
+  task reset_all: :environment do
+    reset_all_users_token(:reset_authentication_token!)
+  end
+
+  desc "Reset all GitLab email tokens"
+  task reset_all_email: :environment do
+    reset_all_users_token(:reset_incoming_email_token!)
+  end
+
+  def reset_all_users_token(token)
+    TmpUser.find_in_batches do |batch|
+      puts "Processing batch starting with user ID: #{batch.first.id}"
+
+      batch.each(&token)
+    end
+  end
+end
+
+class TmpUser < ActiveRecord::Base
+  include TokenAuthenticatable
+
+  self.table_name = 'users'
+
+  def reset_authentication_token!
+    write_new_token(:authentication_token)
+    save!(validate: false)
+  end
+
+  def reset_incoming_email_token!
+    write_new_token(:incoming_email_token)
+    save!(validate: false)
+  end
+end

From 8aacf212ed911a29966a9280b226ca228108b8d6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Tue, 21 Mar 2017 13:35:57 +0100
Subject: [PATCH 2713/3449] fbida: 2.12 -> 2.13

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

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 75033cf0f9d6..25f32f788426 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -3,11 +3,11 @@
 , epoxy, poppler }:
 
 stdenv.mkDerivation rec {
-  name = "fbida-2.12";
+  name = "fbida-2.13";
   
   src = fetchurl {
     url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
-    sha256 = "0bw224vb7jh0lrqaf4jgxk48xglvxs674qcpj5y0axyfbh896cfk";
+    sha256 = "01yv4qqqfbz9v281y2jlxhxdym3ricyb0zkqkgp5b40qrmfik1x8";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
@@ -21,10 +21,8 @@ stdenv.mkDerivation rec {
     sed -e 's@ cpp\>@ gcc -E -@' -i GNUmakefile
     '';
 
-  configurePhase = "make config $makeFlags";
-
   crossAttrs = {
-    makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP="];
+    makeFlags = makeFlags ++ [ "CC=${stdenv.cross.config}-gcc" "STRIP=" ];
   };
 
   meta = with stdenv.lib; {

From a20fa00de71055ec4cce5686031bf6f464fcf6b2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Tue, 21 Mar 2017 13:39:52 +0100
Subject: [PATCH 2714/3449] fbida: add dependency to lirc

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

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index 25f32f788426..5f0605bbf87c 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm
 , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends, libXpm
-, epoxy, poppler }:
+, epoxy, poppler, lirc }:
 
 stdenv.mkDerivation rec {
   name = "fbida-2.13";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig which ];
   buildInputs = [ libexif libjpeg libpng libungif freetype fontconfig libtiff
-   libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler ];
+   libwebp imagemagick curl sane-backends libdrm libXpm epoxy poppler lirc ];
   
   makeFlags = [ "prefix=$(out)" "verbose=yes" ];
 

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 2715/3449] 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 1987bbd323ee..d79d9b2859e8 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 3411061002638e0f53e94caa2e42ec78b5e85173 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Tue, 21 Mar 2017 13:51:31 +0100
Subject: [PATCH 2716/3449] xlockmore: 5.50 -> 5.51

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

diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix
index ceb0d0a6c441..427338db8d7e 100644
--- a/pkgs/misc/screensavers/xlockmore/default.nix
+++ b/pkgs/misc/screensavers/xlockmore/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
 
-  name = "xlockmore-5.50";
+  name = "xlockmore-5.51";
   src = fetchurl {
     url = "http://sillycycle.com/xlock/${name}.tar.xz";
-    sha256 = "0a9sargn36b5lxil777p35z8m5jr744h9xmc021057aq8kgp4pv3";
+    sha256 = "13b088pp75c071ycas37d51jcnb5zk6g87xjxi92x2awirqqw4a7";
     curlOpts = "--user-agent 'Mozilla/5.0'";
   };
 

From e1ac3a99df05b634e572223ecdc89532e986ab4a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Tue, 21 Mar 2017 13:55:48 +0100
Subject: [PATCH 2717/3449] pdfpc: 4.0.5 -> 4.0.6

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

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 49bcd4fe90a7..3c42e8d8fcc0 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.0.5";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s";
+    sha256 = "05cfx45i0xnwvclrbwlmqsjj2sk1galk62dc0mrkhr6293mbp1mx";
   };
 
   nativeBuildInputs = [ cmake pkgconfig vala ];

From b27b83eff73c4437f00e16355fb3243dcc259f75 Mon Sep 17 00:00:00 2001
From: HeeL <parizhskiy@gmail.com>
Date: Tue, 21 Mar 2017 11:04:35 +0100
Subject: [PATCH 2718/3449] terminal-parrot: init at 1.1.0

---
 .../misc/terminal-parrot/default.nix          | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/misc/terminal-parrot/default.nix

diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix
new file mode 100644
index 000000000000..a34c5e4766ac
--- /dev/null
+++ b/pkgs/applications/misc/terminal-parrot/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+    name = "terminal-parrot-1.1.0";
+    version = "1.1.0";
+    goPackagePath = "github.com/jmhobbs/terminal-parrot";
+
+    src = fetchFromGitHub {
+        owner = "jmhobbs";
+        repo = "terminal-parrot";
+        rev = "22c9bde916c12d8b13cf80ab252995dbf47837d1";
+        sha256 = "1mrxmifsmndf6hdq1956p1gyrrp3abh3rmwjcmxar8x2wqbv748y";
+    };
+
+    meta = with stdenv.lib; {
+        description = "Shows colorful, animated party parrot in your terminial";
+        homepage = https://github.com/jmhobbs/terminal-parrot;
+        license = licenses.mit;
+        platforms = platforms.all;
+        maintainers = [ maintainers.heel ];
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e089956fdbf..c6e387ea4ec9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17740,6 +17740,8 @@ with pkgs;
 
   colort = callPackage ../applications/misc/colort { };
 
+  terminal-parrot = callPackage ../applications/misc/terminal-parrot { };
+
   e17gtk = callPackage ../misc/themes/e17gtk { };
 
   epson-escpr = callPackage ../misc/drivers/epson-escpr { };

From 2cb25f8b5944e2d62ad52305d9d09c692b060d8b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Mar 2017 14:49:23 +0100
Subject: [PATCH 2719/3449] nix: 1.11.7 -> 1.11.8

---
 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 07623fd591de..0c9981470d72 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/4ssykr786d0wp7y6m4xd4qwqs4nrry1z-nix-1.11.7";
-  i686-linux = "/nix/store/61ggxx2072y2g877m01asy0lsn7xpn06-nix-1.11.7";
-  x86_64-darwin = "/nix/store/pxf5ri5kdbfqkhd10sw4lpj8sn385ks5-nix-1.11.7";
+  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";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index e755507356d7..3aa555f19160 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -103,10 +103,10 @@ in rec {
   nix = nixStable;
 
   nixStable = common rec {
-    name = "nix-1.11.7";
+    name = "nix-1.11.8";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d";
+      sha256 = "69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67";
     };
   };
 

From 4764c2b72fade0efd6e41239dc8c5838d9a0c6fc Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 21 Mar 2017 15:16:23 +0100
Subject: [PATCH 2720/3449] emby: 3.2.5 -> 3.2.8

---
 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 a9b1333fb0fa..780baa018a7b 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.5";
+  version = "3.2.8";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "1vgn3k57pgj4prndhjshzkwchj9igpagmmlrbkvqdj4axw762i9g";
+    sha256 = "0jscbaznacp44cz9mjswd3fkyf2y9cx78mqm2dkf26rnfmwbx7vq";
   };
 
   buildInputs = with pkgs; [

From cd2627da0dabdb5e856c43299bbf4e1b2fd28bdf Mon Sep 17 00:00:00 2001
From: HeeL <parizhskiy@gmail.com>
Date: Tue, 21 Mar 2017 14:25:49 +0100
Subject: [PATCH 2721/3449] Fix mkdir for fetchgx to not throw an exception

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

diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix
index c72bbec66321..6d209cec2549 100644
--- a/pkgs/build-support/fetchgx/default.nix
+++ b/pkgs/build-support/fetchgx/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   buildPhase = ''
     export GOPATH=$(pwd)/vendor
-    mkdir vendor
+    mkdir -p vendor
     gx install
   '';
 

From f646d1606455d91685b56adda40ccc5d891bf494 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 21 Mar 2017 02:52:35 +0000
Subject: [PATCH 2722/3449] far2l: init at 2.1

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

diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix
new file mode 100644
index 000000000000..de22e08c705e
--- /dev/null
+++ b/pkgs/applications/misc/far2l/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchFromGitHub, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash,
+  xdg_utils, xterm, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz }:
+
+stdenv.mkDerivation rec {
+  rev = "c2f2b89db31b1c3cb9bed53267873f4cd7bc996d";
+  build = "2017-03-18-${builtins.substring 0 10 rev}";
+  name = "far2l-2.1.${build}";
+
+  src = fetchFromGitHub {
+    owner = "elfmz";
+    repo = "far2l";
+    rev = rev;
+    sha256 = "1172ajg4n8g4ag14b6nb9lclwh2r6v7ccndmvhnj066w35ixnqgb";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper ];
+
+  buildInputs = [ wxGTK30 glib pcre ];
+
+  postPatch = ''
+    echo 'echo ${build}' > far2l/bootstrap/scripts/vbuild.sh
+
+    substituteInPlace far2l/bootstrap/open.sh              \
+      --replace 'gvfs-trash'  '${gvfs}/bin/gvfs-trash'
+    substituteInPlace far2l/bootstrap/open.sh              \
+      --replace 'xdg-open'    '${xdg_utils}/bin/xdg-open'  \
+      --replace 'xterm'       '${xterm}/bin/xterm'
+    substituteInPlace far2l/vtcompletor.cpp                \
+      --replace '"/bin/bash"' '"${bash}/bin/bash"'
+    substituteInPlace multiarc/src/formats/zip/zip.cpp     \
+      --replace '"unzip '     '"${unzip}/bin/unzip '       \
+      --replace '"zip '       '"${zip}/bin/zip '
+    substituteInPlace multiarc/src/formats/7z/7z.cpp       \
+      --replace '"^7z '       '"^${p7zip}/lib/p7zip/7z '   \
+      --replace '"7z '        '"${p7zip}/lib/p7zip/7z '
+    substituteInPlace multiarc/src/formats/targz/targz.cpp \
+      --replace '"xz '        '"${xz}/bin/xz '             \
+      --replace '"gzip '      '"${gzip}/bin/gzip '         \
+      --replace '"bzip2 '     '"${bzip2}/bin/bzip2 '       \
+      --replace '"tar '       '"${gnutar}/bin/tar '
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,share}
+    rm install/{far2l_askpass,far2l_sudoapp}
+    mv install/far2l $out/bin/far2l
+    mv install $out/share/far2l
+    ln -s -r $out/bin/far2l $out/share/far2l/far2l_askpass
+    ln -s -r $out/bin/far2l $out/share/far2l/far2l_sudoapp
+  '';
+
+  stripDebugList = "bin share";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "An orthodox file manager";
+    homepage = http://github.com/elfmz/far2l;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.volth ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f716234dea2b..7b90db47bd32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7319,6 +7319,8 @@ with pkgs;
     inherit (pkgs.gnome2) gtkglext;
   };
 
+  far2l = callPackage ../applications/misc/far2l { };
+
   farbfeld = callPackage ../development/libraries/farbfeld { };
 
   farsight2 = callPackage ../development/libraries/farsight2 { };

From cb49c1432417f9576ed12613f0374b3bc23587c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Mar 2017 16:45:47 +0100
Subject: [PATCH 2723/3449] Revert "nixos-container: Use machinectl shell
 (#18825)"

This reverts commit
c37e76b4d2ac59139df8956cc2b1ec6921bea11d. Unfortunately, using
"machinectl shell" has two bad side effects:

* It sends the command's stderr to stdout.

* It doesn't propagate the command's exit status.

This broke NixOps.

PR #18825.
---
 .../nixos-container/default.nix               |  2 ++
 .../nixos-container/nixos-container.pl        | 23 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix
index 19394ea45d30..0763536533f0 100644
--- a/pkgs/tools/virtualization/nixos-container/default.nix
+++ b/pkgs/tools/virtualization/nixos-container/default.nix
@@ -6,6 +6,8 @@ substituteAll {
     isExecutable = true;
     src = ./nixos-container.pl;
     perl = "${perl}/bin/perl -I${perlPackages.FileSlurp}/lib/perl5/site_perl";
+    su = "${shadow.su}/bin/su";
+    inherit utillinux;
 
     postInstall = ''
       t=$out/etc/bash_completion.d
diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 65a9c3f5814b..754715cddd0b 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -8,6 +8,9 @@ use Fcntl ':flock';
 use Getopt::Long qw(:config gnu_getopt);
 use Cwd 'abs_path';
 
+my $nsenter = "@utillinux@/bin/nsenter";
+my $su = "@su@";
+
 # Ensure a consistent umask.
 umask 0022;
 
@@ -223,6 +226,22 @@ sub stopContainer {
         or die "$0: failed to stop container\n";
 }
 
+# Return the PID of the init process of the container.
+sub getLeader {
+    my $s = `machinectl show "$containerName" -p Leader`;
+    chomp $s;
+    $s =~ /^Leader=(\d+)$/ or die "unable to get container's main PID\n";
+    return int($1);
+}
+
+# Run a command in the container.
+sub runInContainer {
+    my @args = @_;
+    my $leader = getLeader;
+    exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args);
+    die "cannot run ‘nsenter’: $!\n";
+}
+
 # Remove a directory while recursively unmounting all mounted filesystems within
 # that directory and unmounting/removing that directory afterwards as well.
 #
@@ -297,14 +316,14 @@ elsif ($action eq "login") {
 }
 
 elsif ($action eq "root-login") {
-    exec("machinectl", "shell", $containerName, "/bin/sh", "-l");
+    runInContainer("@su@", "root", "-l");
 }
 
 elsif ($action eq "run") {
     shift @ARGV; shift @ARGV;
     # Escape command.
     my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV);
-    exec("machinectl", "--quiet", "shell", $containerName, "/bin/sh", "-l", "-c", $s);
+    runInContainer("@su@", "root", "-l", "-c", "exec " . $s);
 }
 
 elsif ($action eq "show-ip") {

From 64218457c48ad2f9ffcc9f1551b3afd7ebf562ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Mar 2017 15:56:51 +0100
Subject: [PATCH 2724/3449] pythonPackages.podcastparser: init at 0.6.1

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

diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix
new file mode 100644
index 000000000000..ffdfa7a323ac
--- /dev/null
+++ b/pkgs/development/python-modules/podcastparser/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub, nose }:
+
+buildPythonPackage rec {
+  pname = "podcastparser";
+  version = "0.6.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "gpodder";
+    repo = "podcastparser";
+    rev = version;
+    sha256 = "0q3qc8adykmm692ha0c37xd6wbj830zlq900fyw6vrfan9bgdj5y";
+  };
+
+  propagatedBuildInputs = [ ];
+
+  buildInputs = [ nose ];
+
+  checkPhase = "nosetests test_*.py";
+
+  meta = {
+    description = "podcastparser is a simple, fast and efficient podcast parser written in Python.";
+    homepage = http://gpodder.org/podcastparser/;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5923b06960a6..dac72011054d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8949,6 +8949,7 @@ in {
     };
   };
 
+  podcastparser = callPackage ../development/python-modules/podcastparser { };
 
   poppler-qt4 = buildPythonPackage rec {
     name = "poppler-qt4-${version}";

From a3bce1b041f542c3f796267e558f11485c55ba92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Mar 2017 15:58:10 +0100
Subject: [PATCH 2725/3449] gpodder: 3.9.1 -> 3.9.3

---
 pkgs/applications/audio/gpodder/default.nix | 26 +++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 1fe2c46d236b..68fe362f2fe6 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages, mygpoclient, intltool
+{ stdenv, fetchurl, fetchpatch, python2Packages, mygpoclient, intltool
 , ipodSupport ? false, libgpod
 , gnome3
 }:
@@ -6,13 +6,31 @@
 python2Packages.buildPythonApplication rec {
   name = "gpodder-${version}";
 
-  version = "3.9.1";
+  version = "3.9.3";
 
   src = fetchurl {
     url = "http://gpodder.org/src/${name}.tar.gz";
-    sha256 = "036p9vnkr3if0k548xhhjmcwdaimy3yd24s3xd8vzlp0wdzkzrhn";
+    sha256 = "1s83m90dic2zphwwv6wrvqx950y12v5sakm7q5nj5bnh5k9l2hgl";
   };
 
+  patches = [
+    (fetchpatch {
+     sha256 = "1xkl1wnp46546jrzsnb9p0yj23776byg3nvsqwbblhqbsfipl48w";
+     name = "Fix-soundcloud-feeds.patch";
+     url = "https://github.com/gpodder/gpodder/commit/e7f34ad090cd276d75c0cd8d92ed97243d75db38.patch";
+    })
+    (fetchpatch {
+     sha256 = "1jlldbinlxis1pi9p2lyczgbcv8nmdj66fxll6ph0klln0w8gvg4";
+     name = "use-https-urls-for-soundcloud.patch";
+     url = "https://github.com/gpodder/gpodder/commit/ef915dd3b6828174bf4f6f0911da410d9aca1b67.patch";
+    })
+    (fetchpatch {
+     sha256 = "1l37ihzk7gfqcl5nnphv0sv80psm6fsg4qkxn6abc6v476axyj9b";
+     name = "updates-soundcloud-support-to-recognize-https";
+     url = "https://github.com/gpodder/gpodder/commit/5c1507671d93096ad0118f908c20dd1f182a72e0.patch";
+    })
+  ];
+
   postPatch = with stdenv.lib; ''
     sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder
 
@@ -30,7 +48,7 @@ python2Packages.buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = with python2Packages; [
-    feedparser dbus-python mygpoclient pygtk eyeD3
+    feedparser dbus-python mygpoclient pygtk eyeD3 podcastparser html5lib
   ] ++ stdenv.lib.optional ipodSupport libgpod;
 
   checkPhase = ''

From 13ede040f1a7d552fd1d52ecdfa9b842f2d200d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Mar 2017 17:10:41 +0100
Subject: [PATCH 2726/3449] pythonPackages.podcastparser: correct license

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

diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix
index ffdfa7a323ac..25682099225c 100644
--- a/pkgs/development/python-modules/podcastparser/default.nix
+++ b/pkgs/development/python-modules/podcastparser/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "podcastparser is a simple, fast and efficient podcast parser written in Python.";
     homepage = http://gpodder.org/podcastparser/;
-    license = lib.licenses.gpl3;
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ mic92 ];
   };
 }

From dd13d24e30e5d1cd62d1ab28f0267765a00d7ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Mar 2017 17:12:07 +0100
Subject: [PATCH 2727/3449] gpodder: add myself as maintainer

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

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 68fe362f2fe6..5a10d1262f4a 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -55,15 +55,15 @@ python2Packages.buildPythonApplication rec {
     LC_ALL=C python -m gpodder.unittests
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A podcatcher written in python";
     longDescription = ''
       gPodder downloads and manages free audio and video content (podcasts)
       for you. Listen directly on your computer or on your mobile devices.
     '';
     homepage = "http://gpodder.org/";
-    license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = [ stdenv.lib.maintainers.skeidel ];
+    license = licenses.gpl3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ skeidel mic92 ];
   };
 }

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 2728/3449] 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 aea3365aba4b..f9d60d6600dc 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 a1b7dd62d4e41cdd2155fa2d134d948a7ef7fdf0 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Tue, 21 Mar 2017 12:24:08 -0400
Subject: [PATCH 2729/3449] idea.idea-community: 2016.3.4 -> 2016.3.5

---
 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 c9f5aa1e024a..6ea5590106b4 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.4";
+    version = "2016.3.5";
     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 = "712dccd726b43e2187e8025a6effb711d35310b36d553dbf7bf85400ec1cec15";
+      sha256 = "0v5wxjbzrax688knjsf7xd956i8pq5i4svkgnrrc4s390f0ixnl5";
     };
     wmClass = "jetbrains-idea-ce";
   };

From e6a02918ce04f5c2cdda0983626753cd06ec0d3d Mon Sep 17 00:00:00 2001
From: Carlos D <carlos.dagostino@gmail.com>
Date: Tue, 21 Mar 2017 17:31:10 +0100
Subject: [PATCH 2730/3449] Expand on creating USB bootable for OS X

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

diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index a4b5dafbed16..dae733060569 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -11,7 +11,9 @@ a USB stick. You can use the <command>dd</command> utility to write the image:
 <command>dd if=<replaceable>path-to-image</replaceable>
 of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the
 correct drive; you can use the <command>lsblk</command> command to get a list of
-block devices.</para>
+block devices. If you're on OS X you can run <command>diskutil list</command>
+to see the list of devices; the device you'll use for the USB must be ejected
+before writing the image.</para>
 
 <para>The <command>dd</command> utility will write the image verbatim to the drive,
 making it the recommended option for both UEFI and non-UEFI installations. For

From af0b7afd059527fb3bb37b8dc755bbee02ae4ff3 Mon Sep 17 00:00:00 2001
From: Sergii Paryzhskyi <parizhskiy@gmail.com>
Date: Tue, 21 Mar 2017 18:12:19 +0100
Subject: [PATCH 2731/3449] sbt_0_12_4: remove old version of sbt

---
 .../tools/build-managers/sbt/0.12.4.nix       | 29 -------------------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/sbt/0.12.4.nix

diff --git a/pkgs/development/tools/build-managers/sbt/0.12.4.nix b/pkgs/development/tools/build-managers/sbt/0.12.4.nix
deleted file mode 100644
index 9c02fcd0b3fb..000000000000
--- a/pkgs/development/tools/build-managers/sbt/0.12.4.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, jre }:
-
-stdenv.mkDerivation rec {
-  name = "sbt-${version}";
-  version = "0.12.14";
-
-  src = fetchurl {
-    url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "5907af5a3db5e9090024c91e8b6189cd2143841b08c4688542a2efbc9023ac1a";
-  };
-
-  patchPhase = ''
-    echo -java-home ${jre.home} >>conf/sbtopts
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/sbt $out/bin
-    cp -ra . $out/share/sbt
-    ln -s $out/share/sbt/bin/sbt $out/bin/
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.scala-sbt.org/;
-    license = licenses.bsd3;
-    description = "A build tool for Scala, Java and more";
-    maintainers = with maintainers; [ heel ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f716234dea2b..8cbc4eee2cb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6824,7 +6824,6 @@ with pkgs;
   scons = callPackage ../development/tools/build-managers/scons { };
 
   sbt = callPackage ../development/tools/build-managers/sbt { };
-  sbt_0_12_4 = callPackage ../development/tools/build-managers/sbt/0.12.4.nix { };
   simpleBuildTool = sbt;
 
   shards = callPackage ../development/tools/build-managers/shards { };
@@ -10800,7 +10799,7 @@ with pkgs;
 
   mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
 
-  riak = callPackage ../servers/nosql/riak/2.2.0.nix { 
+  riak = callPackage ../servers/nosql/riak/2.2.0.nix {
     erlang = erlang_basho_R16B02;
   };
 

From c7ee41bc136bcb403b7699f7d2f3b6586951122c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 17:30:48 +0300
Subject: [PATCH 2732/3449] python.pkgs.sockjs-tornado: init at 1.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dac72011054d..168355d7c823 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24609,6 +24609,25 @@ in {
     };
   };
 
+  sockjs-tornado = buildPythonPackage rec {
+    name = "sockjs-tornado-${version}";
+    version = "1.0.3";
+
+    src = pkgs.fetchurl {
+      url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
+      sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";
+    };
+
+    propagatedBuildInputs = with self; [ tornado ];
+
+    meta = {
+      homepage = "http://github.com/mrjoes/sockjs-tornado/";
+      description = "SockJS python server implementation on top of Tornado framework";
+      license = licenses.mit;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   sorl_thumbnail = buildPythonPackage rec {
     name = "sorl-thumbnail-11.12";
 

From 6f884349e64220a5080e595c624a900b40252396 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 17:43:42 +0300
Subject: [PATCH 2733/3449] python.pkgs.websocket_client: 0.32.0 -> 0.40.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 168355d7c823..d1d2a3983007 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -28477,11 +28477,11 @@ EOF
 
 
   websocket_client = buildPythonPackage rec {
-    name = "websocket_client-0.32.0";
+    name = "websocket_client-0.40.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/w/websocket-client/${name}.tar.gz";
-      sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040";
+      sha256 = "1yz67wdjijrvwpx0a0f6wdfy8ajsvr9xbj5514ld452fqnh19b20";
     };
 
     propagatedBuildInputs = with self; [ six backports_ssl_match_hostname unittest2 argparse ];

From d3e2957c90ee172f53f7ad34c4da1c6380c8f4c8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 17:31:08 +0300
Subject: [PATCH 2734/3449] octoprint: 1.3.1 -> 1.3.2

Fix startup wizard and cleanup dependencies.
---
 nixos/modules/services/misc/octoprint.nix    |   2 +-
 pkgs/applications/misc/octoprint/default.nix | 125 +++++++++----------
 2 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 8faad46a49f1..6883993a893b 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -117,7 +117,7 @@ in
       '';
 
       serviceConfig = {
-        ExecStart = "${pkgs.octoprint}/bin/octoprint -b ${cfg.stateDir}";
+        ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}";
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = true;
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index e5c35c5290d6..661f8dfe48f0 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -1,101 +1,100 @@
-{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }:
+{ stdenv, fetchFromGitHub, python2, fetchurl }:
 
 let
 
-  tornado_4_0_2 = pythonPackages.buildPythonPackage rec {
-    name = "tornado-${version}";
-    version = "4.0.2";
+  pythonPackages = python2.pkgs.override {
+    overrides = self: super: with self; {
+      backports_ssl_match_hostname = self.backports_ssl_match_hostname_3_4_0_2;
 
-    propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
+      tornado = buildPythonPackage rec {
+        name = "tornado-${version}";
+        version = "4.0.2";
 
-    src = fetchurl {
-      url = "mirror://pypi/t/tornado/${name}.tar.gz";
-      sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
+        propagatedBuildInputs = [ backports_ssl_match_hostname certifi ];
+
+        src = fetchurl {
+          url = "mirror://pypi/t/tornado/${name}.tar.gz";
+          sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h";
+        };
+      };
+
+      flask_login = buildPythonPackage rec {
+        name = "Flask-Login-${version}";
+        version = "0.2.2";
+
+        src = fetchurl {
+          url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
+          sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
+        };
+
+        propagatedBuildInputs = [ flask ];
+        buildInputs = [ nose ];
+
+        # No tests included
+        doCheck = false;
+      };
+
+      jinja2 = buildPythonPackage rec {
+        pname = "Jinja2";
+        version = "2.8.1";
+        name = "${pname}-${version}";
+
+        src = fetchurl {
+          url = "mirror://pypi/J/Jinja2/${name}.tar.gz";
+          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
+        };
+
+        propagatedBuildInputs = [ markupsafe ];
+
+        # No tests included
+        doCheck = false;
+      };
     };
   };
 
-  sockjs-tornado = pythonPackages.buildPythonPackage rec {
-    name = "sockjs-tornado-${version}";
-    version = "1.0.3";
-
-    src = fetchurl {
-      url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz";
-      sha256 = "16cff40nniqsyvda1pb2j3b4zwmrw7y2g1vqq78lp20xpmhnwwkd";
-    };
-
-    # This is needed for compatibility with OctoPrint
-    propagatedBuildInputs = [ tornado_4_0_2 ];
-  };
-
-  websocket_client = pythonPackages.buildPythonPackage rec {
-    name = "websocket_client-0.32.0";
-
-    src = fetchurl {
-      url = "mirror://pypi/w/websocket-client/${name}.tar.gz";
-      sha256 = "cb3ab95617ed2098d24723e3ad04ed06c4fde661400b96daa1859af965bfe040";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ six backports_ssl_match_hostname_3_4_0_2 unittest2 argparse ];
-  };
-
-  flask_login = pythonPackages.buildPythonPackage rec {
-    name = "Flask-Login-${version}";
-    version = "0.2.2";
-
-    src = fetchurl {
-      url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
-      sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
-    };
-
-    propagatedBuildInputs = with pythonPackages; [ flask ];
-
-    # FIXME
-    doCheck = false;
-  };
-
 in pythonPackages.buildPythonApplication rec {
   name = "OctoPrint-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "foosel";
     repo = "OctoPrint";
     rev = version;
-    sha256 = "1av755agyym1k5ig9av0q9ysf26ldfixz82x73v3g47a1m28pxq9";
+    sha256 = "0wyrxi754xa111b88fqvaw2s5ib2a925dlrgym5mn93i027m50wk";
   };
 
   # We need old Tornado
   propagatedBuildInputs = with pythonPackages; [
     awesome-slugify flask_assets rsa requests2 pkginfo watchdog
-    semantic-version flask_principal werkzeug flaskbabel tornado_4_0_2
+    semantic-version flask_principal werkzeug flaskbabel tornado
     psutil pyserial flask_login netaddr markdown sockjs-tornado
     pylru pyyaml sarge feedparser netifaces click websocket_client
     scandir chainmap future
   ];
 
+  buildInputs = with pythonPackages; [ nose mock ddt ];
+
   # Jailbreak dependencies.
-  # Currently broken for new: tornado, pyserial, flask_login
   postPatch = ''
     sed -i \
-      -e 's,werkzeug>=[^"]*,werkzeug,g' \
-      -e 's,requests>=[^"]*,requests,g' \
       -e 's,pkginfo>=[^"]*,pkginfo,g' \
-      -e 's,semantic_version>=[^"]*,semantic_version,g' \
-      -e 's,psutil>=[^"]*,psutil,g' \
-      -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
       -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \
-      -e 's,markdown>=[^"]*,markdown,g' \
-      -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
-      -e 's,rsa>=[^"]*,rsa,g' \
-      -e 's,PyYAML>=[^"]*,PyYAML,g' \
-      -e 's,flask>=[^"]*,flask,g' \
-      -e 's,Click>=[^"]*,Click,g' \
       -e 's,websocket-client>=[^"]*,websocket-client,g' \
+      -e 's,Click>=[^"]*,Click,g' \
+      -e 's,rsa>=[^"]*,rsa,g' \
+      -e 's,flask>=[^"]*,flask,g' \
+      -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \
+      -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \
+      -e 's,PyYAML>=[^"]*,PyYAML,g' \
       -e 's,scandir>=[^"]*,scandir,g' \
-      -e 's,Jinja2>=[^"]*,Jinja2,g' \
+      -e 's,werkzeug>=[^"]*,werkzeug,g' \
+      -e 's,psutil>=[^"]*,psutil,g' \
+      -e 's,requests>=[^"]*,requests,g' \
       setup.py
   '';
 
+  checkPhase = "nosetests";
+
   meta = with stdenv.lib; {
     homepage = "http://octoprint.org/";
     description = "The snappy web interface for your 3D printer";

From 6555ec03c30fe4221c3de8f6293a3e902c155c4c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 21 Mar 2017 19:41:25 +0300
Subject: [PATCH 2735/3449] udev module: filter duplicate udev paths

Fixes #24174
---
 nixos/modules/services/hardware/udev.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 028907693a5a..9f42f9e59ad5 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -35,6 +35,7 @@ let
   udevRules = pkgs.runCommand "udev-rules"
     { preferLocalBuild = true;
       allowSubstitutes = false;
+      packages = unique (map toString cfg.packages);
     }
     ''
       mkdir -p $out
@@ -45,7 +46,7 @@ let
       echo 'ENV{PATH}="${udevPath}/bin:${udevPath}/sbin"' > $out/00-path.rules
 
       # Add the udev rules from other packages.
-      for i in ${toString cfg.packages}; do
+      for i in $packages; do
         echo "Adding rules for package $i"
         for j in $i/{etc,lib}/udev/rules.d/*; do
           echo "Copying $j to $out/$(basename $j)"
@@ -132,10 +133,11 @@ let
   hwdbBin = pkgs.runCommand "hwdb.bin"
     { preferLocalBuild = true;
       allowSubstitutes = false;
+      packages = unique (map toString ([udev] ++ cfg.packages));
     }
     ''
       mkdir -p etc/udev/hwdb.d
-      for i in ${toString ([udev] ++ cfg.packages)}; do
+      for i in $packages; do
         echo "Adding hwdb files for package $i"
         for j in $i/{etc,lib}/udev/hwdb.d/*; do
           ln -s $j etc/udev/hwdb.d/$(basename $j)

From 78bb734452a76c7719f2224e5add5b2a12b3fbf6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Mar 2017 18:41:41 +0100
Subject: [PATCH 2736/3449] nix-daemon.nix: Make the 1.12 check less strict

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

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index cfb6a860178a..4fe89838e29d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -8,7 +8,7 @@ let
 
   nix = cfg.package.out;
 
-  isNix112 = versionAtLeast (getVersion nix) "1.12pre4997";
+  isNix112 = versionAtLeast (getVersion nix) "1.12pre";
 
   makeNixBuildUser = nr:
     { name = "nixbld${toString nr}";

From 86721a5f78718caf10c578e9501f8b4d19c0eb44 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 21 Mar 2017 18:41:58 +0100
Subject: [PATCH 2737/3449] Allow attaching to non-child processes by default

The inability to run strace or gdb is the kind of
developer-unfriendliness that we're used to from OS X, let's not do it
on NixOS.

This restriction can be re-enabled by setting

  boot.kernel.sysctl."kernel.yama.ptrace_scope" = 1;

It might be nice to have a NixOS module for enabling hardened defaults.

Xref #14392.

Thanks @abbradar.
---
 nixos/doc/manual/release-notes/rl-1703.xml | 9 ---------
 nixos/modules/config/sysctl.nix            | 4 ++++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 3697b69fcf50..cae46258b808 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -95,15 +95,6 @@ following incompatible changes:</para>
     </para>
   </listitem>
 
-  <listitem>
-    <para>
-      The Yama LSM is now enabled by default in the kernel,
-      which prevents ptracing non-child processes.
-      This means you will not be able to attach gdb to an existing process,
-      but will need to start that process from gdb (so it is a child).
-    </para>
-  </listitem>
-
   <listitem>
     <para>
       The <literal>stripHash</literal> bash function in <literal>stdenv</literal>
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 61b02c5ffa6a..a3f7e8f722f0 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -64,5 +64,9 @@ in
     # Removed under grsecurity.
     boot.kernel.sysctl."kernel.kptr_restrict" =
       if (config.boot.kernelPackages.kernel.features.grsecurity or false) then null else 1;
+
+    # Disable YAMA by default to allow easy debugging.
+    boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkDefault 0;
+
   };
 }

From 5cfe361079c5557afd2fe9a2a13bdd4e219e5b76 Mon Sep 17 00:00:00 2001
From: Elmar Athmer <elmar@athmer.org>
Date: Tue, 21 Mar 2017 12:54:34 +0100
Subject: [PATCH 2738/3449] vultr: 1.12.0 -> 1.13.0

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

diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix
index fe4b65846511..aac773b11e60 100644
--- a/pkgs/development/tools/vultr/default.nix
+++ b/pkgs/development/tools/vultr/default.nix
@@ -2,14 +2,14 @@
 
 buildGoPackage rec {
   name = "vultr-${version}";
-  version = "1.12.0";
+  version = "1.13.0";
   goPackagePath = "github.com/JamesClonk/vultr";
 
   src = fetchFromGitHub {
     owner = "JamesClonk";
     repo = "vultr";
     rev = "${version}";
-    sha256 = "0fzwzp0vhf3cgl9ij5zpdyn29w9rwwxghr50jjfbagpkfpy4g686";
+    sha256 = "0xjalxl2yncrhbh4m2gyg3cahv3wvq782qd668vim6qks676d9nx";
   };
 
   meta = {

From a7732d6f541d82cbfc8777dfe007efb62bf69656 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Sun, 5 Feb 2017 05:46:34 +0000
Subject: [PATCH 2739/3449] babelstone-han: init at 9.0.2

---
 pkgs/data/fonts/babelstone-han/default.nix | 30 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/data/fonts/babelstone-han/default.nix

diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix
new file mode 100644
index 000000000000..16534d4d6cbe
--- /dev/null
+++ b/pkgs/data/fonts/babelstone-han/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "babelstone-han-${version}";
+  version = "9.0.2";
+
+  src = fetchurl {
+    url = "http://www.babelstone.co.uk/Fonts/8672/BabelStoneHan.zip";
+    sha256 = "09zlrp3mqdsbxpq4sssd8gj5isnxfbr56pcdp7mnr27nv4pvp6ha";
+  };
+
+  buildInputs = [ unzip ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -v *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Unicode CJK font with over 32600 Han characters";
+    homepage = http://www.babelstone.co.uk/Fonts/Han.html;
+
+    license = licenses.free;
+    platforms = platforms.all;
+    hydraPlatforms = [];
+    maintainers = [ maintainers.volth ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8cbc4eee2cb4..4d34feef0ab0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12308,6 +12308,8 @@ with pkgs;
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
 
+  babelstone-han = callPackage ../data/fonts/babelstone-han { };
+
   baekmuk-ttf = callPackage ../data/fonts/baekmuk-ttf { };
 
   bakoma_ttf = callPackage ../data/fonts/bakoma-ttf { };

From f61ead6ee27c222f006e84ff7d0ad9cf6d07db54 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2017 18:12:06 +0000
Subject: [PATCH 2740/3449] ocamlPackages.inifiles: init at 1.2

inifiles is a library to read and write .ini files
---
 .../ocaml-modules/inifiles/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/inifiles/default.nix

diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix
new file mode 100644
index 000000000000..1860e585b59f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/inifiles/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, fetchpatch, ocaml, findlib, ocaml_pcre }:
+
+stdenv.mkDerivation {
+	name = "ocaml${ocaml.version}-inifiles-1.2";
+
+	src = fetchurl {
+		url = http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz;
+		sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
+	};
+
+	patches = [ (fetchpatch {
+		url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff;
+		sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn";
+	})];
+
+	buildInputs = [ ocaml findlib ];
+	propagatedBuildInputs = [ ocaml_pcre ];
+
+	buildFlags = [ "all" "opt" ];
+
+	createFindlibDestdir = true;
+
+	meta = {
+		description = "A small OCaml library to read and write .ini files";
+		license = stdenv.lib.licenses.lgpl21Plus;
+		inherit (ocaml.meta) platforms;
+	};
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 2291a4995152..281375b7fdf0 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -233,6 +233,8 @@ let
 
     hex = callPackage ../development/ocaml-modules/hex { };
 
+    inifiles = callPackage ../development/ocaml-modules/inifiles { };
+
     jingoo = callPackage ../development/ocaml-modules/jingoo {
       batteries = ocaml_batteries;
       pcre = ocaml_pcre;

From 34809eb214285705fcfa3b7be4b65405fdb2d385 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Mar 2017 18:13:32 +0000
Subject: [PATCH 2741/3449] ocamlPackages.ocamlbuild: 0.9.3 -> 0.11.0

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

diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index df6c66cb98f0..5062f53cd71a 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4,
  ocamlmod, ocamlify, ounit, expect}:
 let
-  version = "0.9.3";
+  version = "0.11.0";
 in
 stdenv.mkDerivation {
   name = "ocamlbuild-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     owner = "ocaml";
     repo = "ocamlbuild";
     rev = version;
-    sha256 = "1ikm51lx4jz5vmbvrdwsm5p59bwbz3pi22vqkyz5lmqcciyn69i3";
+    sha256 = "0c8lv15ngmrc471jmkv0jp3d573chibwnjlavps047d9hd8gwxak";
   };
 
   createFindlibDestdir = true;
@@ -22,6 +22,7 @@ stdenv.mkDerivation {
   make -f configure.make Makefile.config \
     "OCAMLBUILD_PREFIX=$out" \
     "OCAMLBUILD_BINDIR=$out/bin" \
+    "OCAMLBUILD_MANDIR=$out/share/man" \
     "OCAMLBUILD_LIBDIR=$OCAMLFIND_DESTDIR"
   '';
 
@@ -33,4 +34,3 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ vbgl ];
   };
 }
-

From 4e00fcf068d4330b8bb4bc72feb1dda31cbf6eed Mon Sep 17 00:00:00 2001
From: Fatih Altinok <fatih@picussecurity.com>
Date: Tue, 21 Mar 2017 21:36:51 +0300
Subject: [PATCH 2742/3449] flow: 0.41.0 -> 0.42.0

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

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 1b41a10bb9c4..71ffb35a9f0f 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -3,14 +3,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.41.0";
+  version = "0.42.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0v3dhvvj4k35h7g42rmpwc9hqi2z0ccg7rmk8ad00l0djs13l18z";
+    sha256 = "1mzl13z3c512b3jrrkzm5wmd9wjpnr173pan0vvpgf23333yvigq";
   };
 
   installPhase = ''

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 2743/3449] 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 d79d9b2859e8..6a5c72f04c3a 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 458858cfeb01..fcfdd22630cf 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 2744/3449] 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 6a5c72f04c3a..eac07ddbfb19 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 f9e688e8a14425c098cf1ccf4fa982750fbab676 Mon Sep 17 00:00:00 2001
From: jansol <jhs@psonet.com>
Date: Tue, 21 Mar 2017 22:36:26 +0200
Subject: [PATCH 2745/3449] renderdoc: init at version 0.34pre (#23769)

* renderdoc: init at version 0.34pre

Initialising a few commits after the latest release due to some upstream
improvements to the build system.

* fix maintainer
---
 lib/maintainers.nix                           |  1 +
 .../graphics/renderdoc/default.nix            | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/graphics/renderdoc/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8eb30c9884c8..0a3d3ff55f88 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -217,6 +217,7 @@
   ivan-tkatchev = "Ivan Tkatchev <tkatchev@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
   jagajaga = "Arseniy Seroka <ars.seroka@gmail.com>";
+  jansol = "Jan Solanti <jan.solanti@paivola.fi>";
   javaguirre = "Javier Aguirre <contacto@javaguirre.net>";
   jb55 = "William Casarin <bill@casarin.me>";
   jbedo = "Justin Bedő <cu@cua0.org>";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
new file mode 100644
index 000000000000..be4457c932fa
--- /dev/null
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras
+, pkgconfig, xorg, makeQtWrapper, vulkan-loader
+}:
+
+stdenv.mkDerivation rec {
+  name = "renderdoc-${version}";
+  version = "0.34pre";
+
+  src = fetchFromGitHub {
+    owner = "baldurk";
+    repo = "renderdoc";
+    rev = "5e2717daec53e5b51517d3231fb6120bebbe6b7a";
+    sha256 = "1zpvjvsj5c441kyjpmd2d2r0ykb190rbq474nkmp1jk72cggnpq0";
+  };
+
+  buildInputs = [
+    qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
+  ];
+  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+
+  cmakeFlags = [
+    "-DBUILD_VERSION_HASH=${src.rev}-distro-nix"
+    # TODO: use this instead of preConfigure once placeholders land
+    #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/"
+  ];
+  preConfigure = ''
+    cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/"
+  '';
+  preFixup = ''
+    mkdir $out/bin/.bin
+    mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc
+    ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc
+    wrapQtProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+    mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd
+    ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd
+    wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+  '';
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A single-frame graphics debugger";
+    homepage = https://renderdoc.org/;
+    license = licenses.mit;
+    longDescription = ''
+      RenderDoc is a free MIT licensed stand-alone graphics debugger that
+      allows quick and easy single-frame capture and detailed introspection
+      of any application using Vulkan, D3D11, OpenGL or D3D12 across
+      Windows 7 - 10, Linux or Android.
+    '';
+    maintainers = [maintainers.jansol];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c7dbab71a88..ee3ede2c8efb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3720,6 +3720,8 @@ with pkgs;
 
   renameutils = callPackage ../tools/misc/renameutils { };
 
+  renderdoc = libsForQt5.callPackage ../applications/graphics/renderdoc { };
+
   replace = callPackage ../tools/text/replace { };
 
   reckon = callPackage ../tools/text/reckon { };

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 2746/3449] 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 a3658a96bf3d..b72bd8b9b529 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 8796b87a77c56be3a434e11051585195616cccce Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 21 Mar 2017 22:00:06 +0100
Subject: [PATCH 2747/3449] sonarr: 2.0.0.4613 -> 2.0.0.4645

---
 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 1e7ddb53e23a..af0b17bfb3a4 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.4613";
+  version = "2.0.0.4645";
 
   src = fetchurl {
     url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz";
-    sha256 = "1a8wm50aw7yyigvywx7hgy58w60mi4s60dqvwwlgrbavl4z5jphl";
+    sha256 = "13a1ly2rm0ha355h4q2x8v699d43arcq3iyn7nm921rkswajvvb8";
   };
 
   buildInputs = [

From 6b9471f32b5e2499d994096e8df12981a77220fc Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 21 Mar 2017 16:27:55 -0500
Subject: [PATCH 2748/3449] feh: Remove un-needed libPath

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

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 3208f4273ff2..035a275618cf 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -22,18 +22,17 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     makeFlags="PREFIX=$out exif=1"
-  '';
-
-  libPath = makeLibraryPath ([ imlib2 curl xorg.libXinerama libjpeg libpng libexif xorg.libX11 ]);
+      '';
 
   postInstall = ''
     wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
                                --add-flags '--theme=feh' 
-    '';
-
+        '';
+  
   checkPhase = ''
     PERL5LIB="${perlPackages.TestCommand}/lib/perl5/site_perl" make test
   '';
+
   doCheck = true;
 
   meta = {

From 2e06a585bce2860c4a8bf6ae832b0dbdb4fbc3b7 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 21 Mar 2017 16:41:38 -0500
Subject: [PATCH 2749/3449] munin: 2.0.30 -> 2.0.33; for CVE-2017-6188

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

diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix
index 5d7d2e787735..7882572b6c88 100644
--- a/pkgs/servers/monitoring/munin/default.nix
+++ b/pkgs/servers/monitoring/munin/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.30";
+  version = "2.0.33";
   name = "munin-${version}";
 
   src = fetchFromGitHub {
     owner = "munin-monitoring";
     repo = "munin";
     rev = version;
-    sha256 = "1sxsdfq9a5d8b13jigr06gs7n4m3c95645sfyyl49bkfy0n5cxrg";
+    sha256 = "0rs05b7926mjd58sdry33i91m1h3v3svl0wg2gmhljl8wqidac5w";
   };
 
   buildInputs = [ 

From 872770286d04cadb9816cd1665d3d5f17adce456 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 20 Mar 2017 17:11:17 +0100
Subject: [PATCH 2750/3449] gpgme: Drop multiple outputs (dev and info)

This shouldn't break anything as currently neither dev nor info will be
generated anyway (since both directories don't actually exist at the
install phase - "mv bin dev" would produce the dev output).

This change is required for building fwknop with GnuPG support.
---
 pkgs/development/libraries/gpgme/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 2ab0977004c4..e4bb0c52c771 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -16,9 +16,6 @@ stdenv.mkDerivation rec {
     sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r";
   };
 
-  outputs = [ "out" "dev" "info" ];
-  outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
-
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
 
   nativeBuildInputs = [ pkgconfig gnupg ];

From b27652148a5d22a94933d4b72475bcc9d17c0333 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 20 Mar 2017 17:20:22 +0100
Subject: [PATCH 2751/3449] fwknop: init at 2.6.9

fwknop stands for the "FireWall KNock OPerator", and implements an
authorization scheme called Single Packet Authorization (SPA).
---
 pkgs/tools/security/fwknop/default.nix | 66 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/tools/security/fwknop/default.nix

diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
new file mode 100644
index 000000000000..325d220a5235
--- /dev/null
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -0,0 +1,66 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, lib
+, libpcap, texinfo
+, iptables
+, gnupgSupport ? true, gnupg, gpgme # Increases dependencies!
+, wgetSupport ? true, wget
+, buildServer ? true
+, buildClient ? true }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "fwknop";
+  version = "2.6.9";
+
+  src = fetchFromGitHub {
+    owner = "mrash";
+    repo = pname;
+    rev = version;
+    sha256 = "1509d1lzfmhavdwi65dwb0jaglpy8ciccgpcnhx9ks6s7irn923c";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libpcap texinfo ]
+    ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme ]
+    ++ stdenv.lib.optional wgetSupport [ wget ];
+
+  configureFlags = ''
+    --sysconfdir=/etc
+    --localstatedir=/run
+    --with-iptables=${iptables}/sbin/iptables
+    ${lib.optionalString (!buildServer) "--disable-server"}
+    ${lib.optionalString (!buildClient) "--disable-client"}
+    ${lib.optionalString gnupgSupport ''
+      --with-gpgme
+      --with-gpgme-prefix=${gpgme}
+      --with-gpg=${gnupg}
+    ''}
+    ${lib.optionalString wgetSupport ''
+      --with-wget=${wget}/bin/wget
+    ''}
+  '';
+
+  # Temporary hack to copy the example configuration files into the nix-store,
+  # this'll probably be helpful until there's a NixOS module for that (feel free
+  # to ping me (@primeos) if you want to help).
+  preInstall = ''
+    substituteInPlace Makefile --replace\
+      "sysconfdir = /etc"\
+      "sysconfdir = $out/etc"
+    substituteInPlace server/Makefile --replace\
+      "wknopddir = /etc/fwknop"\
+      "wknopddir = $out/etc/fwknop"
+  '';
+
+  meta = with stdenv.lib; {
+    description =
+      "Single Packet Authorization (and Port Knocking) server/client";
+    longDescription = ''
+      fwknop stands for the "FireWall KNock OPerator", and implements an
+      authorization scheme called Single Packet Authorization (SPA).
+    '';
+    homepage = "https://www.cipherdyne.org/fwknop/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3ede2c8efb..640d4bfcf45c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1867,6 +1867,8 @@ with pkgs;
 
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
+  fwknop = callPackage ../tools/security/fwknop { };
+
   exfat = callPackage ../tools/filesystems/exfat { };
 
   dos2unix = callPackage ../tools/text/dos2unix { };

From 4c4b91d54ea9b3e8667f720f363ad7976e94d24c Mon Sep 17 00:00:00 2001
From: Victor Calvert <calvertvl@gmail.com>
Date: Sun, 19 Mar 2017 22:09:35 -0400
Subject: [PATCH 2752/3449] loccount: init at 1.0

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

diff --git a/pkgs/development/tools/misc/loccount/default.nix b/pkgs/development/tools/misc/loccount/default.nix
new file mode 100644
index 000000000000..d0458c304679
--- /dev/null
+++ b/pkgs/development/tools/misc/loccount/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitLab }:
+buildGoPackage rec {
+  name = "loccount-${version}";
+  version = "1.0";
+
+  goPackagePath = "gitlab.com/esr/loccount";
+  excludedPackages = "tests";
+
+  src = fetchFromGitLab {
+    owner = "esr";
+    repo = "loccount";
+    rev = version;
+    sha256 = "081wf7fckn76m4x0jwq4h2fsbhpb6f67dha77ni3p6wg7q6sihqx";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Re-implementation of sloccount in Go";
+    longDescription = ''
+      loccount is a re-implementation of David A. Wheeler's sloccount tool
+      in Go.  It is faster and handles more different languages. Because
+      it's one source file in Go, it is easier to maintain and extend than the
+      multi-file, multi-language implementation of the original.
+
+      The algorithms are largely unchanged and can be expected to produce
+      identical numbers for languages supported by both tools.  Python is
+      an exception; loccount corrects buggy counting of single-quote multiline
+      literals in sloccount 2.26.
+    '';
+    homepage="https://gitlab.com/esr/loccount";
+    downloadPage="https://gitlab.com/esr/loccount/tree/master";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ calvertvl ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d34feef0ab0..db34d4225eee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -968,6 +968,8 @@ with pkgs;
 
   languagetool = callPackage ../tools/text/languagetool {  };
 
+  loccount = callPackage ../development/tools/misc/loccount { };
+
   long-shebang = callPackage ../misc/long-shebang {};
 
   iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { };

From 41abf78fc04215a44675a7b2c992ce4027d716ae Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 21 Mar 2017 16:56:01 -0500
Subject: [PATCH 2753/3449] tnef: 1.4.12 - > 1.4.14; Advisory X41-2017-004

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

diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix
index 9e3cf011316a..604c9f59e601 100644
--- a/pkgs/applications/misc/tnef/default.nix
+++ b/pkgs/applications/misc/tnef/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, lib, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.12";
+  version = "1.4.14";
   name = "tnef-${version}";
 
   src = fetchFromGitHub {
     owner = "verdammelt";
     repo = "tnef";
     rev = "${version}";
-    sha256 = "02hwdaaa3yk0lbzb40fgxlkyhc1wicl6ncajpvfcz888z6yxps2c";
+    sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2";
   };
 
   doCheck = true;

From 2676d48ff8e7cd908d02a3b6668d8914c1d2b238 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 21 Mar 2017 23:35:54 +0100
Subject: [PATCH 2754/3449] atomicparsley: fix build with llvm 4

---
 pkgs/tools/video/atomicparsley/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix
index 835cacf0098c..b2eb53666181 100644
--- a/pkgs/tools/video/atomicparsley/default.nix
+++ b/pkgs/tools/video/atomicparsley/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, fetchurl }:
+{ stdenv, fetchurl, unzip, darwin }:
 
 stdenv.mkDerivation rec {
   name = "atomicparsley-${version}";
@@ -10,10 +10,13 @@ stdenv.mkDerivation rec {
     sha256 = "de83f219f95e6fe59099b277e3ced86f0430ad9468e845783092821dff15a72e";
   };
 
-  buildInputs = with pkgs; [ unzip ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ];
-  patches = [ ./casts.patch ];
+  patches = stdenv.lib.optional (!stdenv.cc.isClang) ./casts.patch;
+
+  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";
 

From dec8fb077fdc06429c786ffe3cda21a6fdc7ba03 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 22 Mar 2017 01:35:54 +0300
Subject: [PATCH 2755/3449] qt5.qtwebengine: fix library paths

Without this it would try to find files in qtbase

Ported to Qt 5.8.
---
 .../development/libraries/qt-5/5.8/qtwebengine/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

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 9d63f848cba8..7b6660bf7668 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -35,6 +35,13 @@ qtSubmodule {
     # fix default SSL bundle location
     sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
 
+    # 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
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \

From 242031a34e27b626832ee86f884db27266b6c12e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 21 Mar 2017 23:49:42 +0100
Subject: [PATCH 2756/3449] mutter: fix on i686-linux

---
 pkgs/desktops/gnome-3/3.22/core/mutter/default.nix |  4 ++--
 pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch   | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
index 9fad1873fbd6..4818d05517ba 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -Wno-error=format -Wno-error=sign-compare";
 
   configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [
-  #./x86.patch ./math.patch
+    ./x86.patch # ./math.patch
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
index a997b27540ee..93df1e7f2831 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
+++ b/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
@@ -18,16 +18,3 @@
    MetaRectangle unconstrained_rect;
    MetaRectangle constrained_rect;
    MetaMoveResizeResultFlags result = 0;
---- a/src/core/startup-notification.c	2016-06-06 12:13:27.100251933 +0200
-+++ b/src/core/startup-notification.c	2016-06-06 12:13:42.554956773 +0200
-@@ -418,7 +418,7 @@
-   elapsed = ctod->now - timestamp;
- 
-   meta_topic (META_DEBUG_STARTUP,
--              "Sequence used %ld ms vs. %d max: %s\n",
-+              "Sequence used %" G_GINT64_FORMAT " ms vs. %d max: %s\n",
-               elapsed, STARTUP_TIMEOUT,
-               meta_startup_notification_sequence_get_id (sequence));
- 
-[?25l[?25h[?1049h[?1h=[?25h[?25l~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              ~                                                                                              [?25h[?25lType  :quit<Enter>  to exit Vim[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h[?25l[?25h
-[?1l>[?1049l

From 4e296383236cb8ba443a08704a44140aaef6eba7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 21 Mar 2017 23:50:53 +0100
Subject: [PATCH 2757/3449] Revert "gpgme: Drop multiple outputs (dev and
 info)"

This reverts commit 872770286d04cadb9816cd1665d3d5f17adce456.

This will fix fwknop as well (should have done it like this in the first
place, where was my mind...).

Conclusion: Did something stupid... :o - I am *so incredibly sorry*,
will be way more careful (was already careful, but apparently not
enought...) next time and use nox.

Sorry @everyone and thanks @calvertvl for noticing this.
---
 pkgs/development/libraries/gpgme/default.nix | 3 +++
 pkgs/tools/security/fwknop/default.nix       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index e4bb0c52c771..2ab0977004c4 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
     sha256 = "0csx3qnycwm0n90ql6gs65if5xi4gqyzzy21fxs2xqicghjrfq2r";
   };
 
+  outputs = [ "out" "dev" "info" ];
+  outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
+
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
 
   nativeBuildInputs = [ pkgconfig gnupg ];
diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix
index 325d220a5235..823bdbbffb5d 100644
--- a/pkgs/tools/security/fwknop/default.nix
+++ b/pkgs/tools/security/fwknop/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ libpcap texinfo ]
-    ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme ]
+    ++ stdenv.lib.optional gnupgSupport [ gnupg gpgme.dev ]
     ++ stdenv.lib.optional wgetSupport [ wget ];
 
   configureFlags = ''
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     ${lib.optionalString (!buildClient) "--disable-client"}
     ${lib.optionalString gnupgSupport ''
       --with-gpgme
-      --with-gpgme-prefix=${gpgme}
+      --with-gpgme-prefix=${gpgme.dev}
       --with-gpg=${gnupg}
     ''}
     ${lib.optionalString wgetSupport ''

From b4169bb8dde4a4afa829132703455e4def13a633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 22 Mar 2017 00:08:41 +0100
Subject: [PATCH 2758/3449] munin: fix tests by replacing cron with systemd
 timer

---
 nixos/modules/services/monitoring/munin.nix | 20 ++++++++++++++++----
 nixos/tests/munin.nix                       |  1 +
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix
index 364f18e7543d..b8c26a5c89ba 100644
--- a/nixos/modules/services/monitoring/munin.nix
+++ b/nixos/modules/services/monitoring/munin.nix
@@ -193,14 +193,26 @@ in
 
   }) (mkIf cronCfg.enable {
 
-    services.cron.systemCronJobs = [
-      "*/5 * * * * munin ${pkgs.munin}/bin/munin-cron --config ${muninConf}"
-    ];
+    systemd.timers.munin-cron = {
+      description = "batch Munin master programs";
+      wantedBy = [ "timers.target" ];
+      timerConfig.OnCalendar = "*:0/5";
+    };
+
+    systemd.services.munin-cron = {
+      description = "batch Munin master programs";
+      unitConfig.Documentation = "man:munin-cron(8)";
+
+      serviceConfig = {
+        Type = "oneshot";
+        User = "munin";
+        ExecStart = "${pkgs.munin}/bin/munin-cron --config ${muninConf}";
+      };
+    };
 
     system.activationScripts.munin-cron = stringAfter [ "users" "groups" ] ''
       mkdir -p /var/{run,log,www,lib}/munin
       chown -R munin:munin /var/{run,log,www,lib}/munin
     '';
-
   })];
 }
diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix
index 50746d17b451..40fafc625146 100644
--- a/nixos/tests/munin.nix
+++ b/nixos/tests/munin.nix
@@ -29,6 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     startAll;
 
     $one->waitForUnit("munin-node.service");
+    $one->succeed('systemctl start munin-cron');
     $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd");
     $one->waitForFile("/var/www/munin/one/index.html");
   '';

From c5f818f74d05f7e87a24ec7db63f0d68ecd137d3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 22 Mar 2017 00:44:57 +0100
Subject: [PATCH 2759/3449] elvis: fix build

---
 pkgs/applications/editors/elvis/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix
index 8774b1b461fc..b9bd529930f2 100644
--- a/pkgs/applications/editors/elvis/default.nix
+++ b/pkgs/applications/editors/elvis/default.nix
@@ -1,15 +1,25 @@
-{ fetchurl, stdenv, ncurses }:
+{ fetchurl, fetchpatch, stdenv, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "elvis-2.2_0";
 
   src = fetchurl {
-    url = ftp://ftp.cs.pdx.edu/pub/elvis/elvis-2.2_0.tar.gz;
+    url = "http://www.the-little-red-haired-girl.org/pub/elvis/elvis-2.2_0.tar.gz";
     sha256 = "182fj9qzyq6cjq1r849gpam6nq9smwv9f9xwaq84961p56r6d14s";
   };
 
   buildInputs = [ ncurses ];
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/mbert/elvis/commit/076cf4ad5cc993be0c6195ec0d5d57e5ad8ac1eb.patch";
+    sha256 = "0yzkc1mxjwg09mfmrk20ksa0vfnb2x83ndybwvawq4xjm1qkcahc";
+  }) ];
+
+  postPatch = ''
+    substituteInPlace configure \
+      --replace '-lcurses' '-lncurses'
+  '';
+
   preConfigure = ''
     mkdir -p $out/share/man/man1
   '';

From 7069b8938d3b9427db40c544131a39597e40a105 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 21 Feb 2017 16:17:57 +0100
Subject: [PATCH 2760/3449] wine: 2.1 -> 2.2

---
 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 e8409a631c3c..355dc2c7c722 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.1";
+    version = "2.2";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz";
+    sha256 = "1x2ifxgm74vai7pd6l2f1yffzlzjjjs46rzjkv4ga1xav3hmgjv4";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs";
+    sha256 = "19nsixv1fqfp5s5m0g97bwgklj3m37iadbjm1d4csn6559nka7bh";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From e9a1fc72e0fa9cdaf739bf46c8392178608c3907 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 9 Mar 2017 16:37:56 +0100
Subject: [PATCH 2761/3449] wine: 2.2 -> 2.3

---
 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 355dc2c7c722..14fe7079813e 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.2";
+    version = "2.3";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "1x2ifxgm74vai7pd6l2f1yffzlzjjjs46rzjkv4ga1xav3hmgjv4";
+    sha256 = "0zh6kvs4d6d99x5qgxbb5jq2wilwzifhmib2nhq0g3ychxx5rjdg";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "19nsixv1fqfp5s5m0g97bwgklj3m37iadbjm1d4csn6559nka7bh";
+    sha256 = "0lr0bfkfi8bgsrrif77363b7gyw5gccr00ggwcxrn1dzvf8asnpp";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From a634f0b12cbbe3359242dfef2e77175f9553d0d2 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 22 Mar 2017 01:13:05 +0100
Subject: [PATCH 2762/3449] wine: 2.3 -> 2.4

winetricks: 20170207 -> 20170316
---
 pkgs/misc/emulators/wine/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 14fe7079813e..4419d8025a87 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -31,23 +31,23 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "2.3";
+    version = "2.4";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0zh6kvs4d6d99x5qgxbb5jq2wilwzifhmib2nhq0g3ychxx5rjdg";
+    sha256 = "13klfadvd44zdfrzh38al99s53i02x3mlhcj5z7fq7vqwh3xzdc7";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0lr0bfkfi8bgsrrif77363b7gyw5gccr00ggwcxrn1dzvf8asnpp";
+    sha256 = "052s4y7d8lw2k0hk17zwz9bgbsl013g8953ad001y2kqjxwcnilh";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20170207";
-    sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw";
+    version = "20170316";
+    sha256 = "193g3b6rfbxkxmq1y0rawrkrzb225ly71hprif3lv09gmi2bf95a";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 92985364e1532f241d886e19b06acd5f82899757 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Fri, 17 Mar 2017 03:40:08 +0100
Subject: [PATCH 2763/3449] chromium: 57.0.2987.98 -> 57.0.2987.110

---
 .../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 20a7743439a0..176784ea7a42 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 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n";
-    sha256bin64 = "0dx9ivjc7avm0zgw0jcx5mmlzapwc2lp1sdjpwgd4y0iai1zr3yw";
-    version = "57.0.2987.98";
+    sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz";
+    sha256bin64 = "1xj1fl0k0ck4pxl4q0cdhi55sqfmwbb1vcjj70idlz166ll8lpxh";
+    version = "58.0.3029.19";
   };
   dev = {
-    sha256 = "1i6qr1ypjww3q59lqg60xpns8xqxxrkd0yrpyx96alb1bp22x85p";
-    sha256bin64 = "1ahp99p4hi8r2bvkdpnkakwkpmmnndjn299axc7cafz85zs6z9vl";
-    version = "58.0.3029.14";
+    sha256 = "1rpmi9dl98948a2ll7q0sagyx8v27mmwa2j6fmvfx6r1mwpvbrgz";
+    sha256bin64 = "1wx5r3vmmki419llki0ls6y4z6r93zm66v2h4vnxswjb77svl578";
+    version = "58.0.3029.19";
   };
   stable = {
-    sha256 = "0bbr5wr5icrw5101dlhyn20pg28mah7w4vk365i4gf6a1zvyrd8n";
-    sha256bin64 = "1qs8pmfasf3j84pjf4fnf6yb0pfa2hdgicskvfmr1sqy7c7yg348";
-    version = "57.0.2987.98";
+    sha256 = "1r495ffcwxsd4pxn5akfr7k9iiv1dj0zq6w9i6xxii8knf8a40va";
+    sha256bin64 = "04ig9q8j4xbgq749qprfddlgpm6g28jjvwwnqmvinymnrh4vc7cn";
+    version = "57.0.2987.110";
   };
 }

From 693d0e7fea78270cb45392dcf2b4b381dbdd3ef1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 22 Mar 2017 01:25:47 +0100
Subject: [PATCH 2764/3449] haskellPackages.yi-keymap-vim: dontCheck

Tries to access path outside of sandbox.
---
 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 e83f4e6aaecd..b2d678edada9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -753,6 +753,9 @@ self: super: {
   # https://github.com/pontarius/pontarius-xmpp/issues/105
   pontarius-xmpp = dontCheck super.pontarius-xmpp;
 
+  # fails with sandbox
+  yi-keymap-vim = dontCheck super.yi-keymap-vim;
+
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = doJailbreak super.applicative-quoters;
 

From c60102d177e6e2e95e16f396662c9c65d9751a49 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 21 Mar 2017 20:30:37 -0400
Subject: [PATCH 2765/3449] linux: 4.11-rc2 -> 4.11-rc3

---
 pkgs/os-specific/linux/kernel/common-config.nix | 15 ++++++++++++---
 pkgs/os-specific/linux/kernel/linux-testing.nix |  6 +++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index c02b8209f2fe..09e4d9e1ecdc 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -33,7 +33,6 @@ with stdenv.lib;
   DEBUG_KERNEL y
   DYNAMIC_DEBUG y
   BACKTRACE_SELF_TEST n
-  CPU_NOTIFIER_ERROR_INJECT? n
   DEBUG_DEVRES n
   DEBUG_STACK_USAGE n
   DEBUG_STACKOVERFLOW n
@@ -41,6 +40,10 @@ with stdenv.lib;
   SCHEDSTATS n
   DETECT_HUNG_TASK y
 
+  ${optionalString (versionOlder version "4.10") ''
+    CPU_NOTIFIER_ERROR_INJECT? n
+  ''}
+
   ${optionalString (versionOlder version "4.11") ''
     TIMER_STATS y
     DEBUG_NX_TEST n
@@ -308,7 +311,9 @@ with stdenv.lib;
   NLS_ISO8859_1 m    # VFAT default for the iocharset= mount option
 
   # Runtime security tests
-  DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages
+  ${optionalString (versionOlder version "4.11") ''
+    DEBUG_SET_MODULE_RONX? y # Detect writes to read-only module pages
+  ''}
 
   # Security related features.
   RANDOMIZE_BASE? y
@@ -456,7 +461,11 @@ with stdenv.lib;
   FTRACE_SYSCALLS y
   SCHED_TRACER y
   STACK_TRACER y
-  UPROBE_EVENT? y
+
+  ${optionalString (versionOlder version "4.11") ''
+    UPROBE_EVENT? y
+  ''}
+
   ${optionalString (versionAtLeast version "4.4") ''
     BPF_SYSCALL y
     BPF_EVENTS y
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index b9f5d152bf6b..5f0d2db27f25 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-rc2";
-  modDirVersion = "4.11.0-rc2";
+  version = "4.11-rc3";
+  modDirVersion = "4.11.0-rc3";
   extraMeta.branch = "4.11";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1rfdnx7klrb8z9372ydmrsw6bk3i6xqa0am3vjqy75mjp54063vx";
+    sha256 = "07y54bl2i4qsz36hwbp3k56k8hzjyvs82cimrg0hnp2xca537vxz";
   };
 
   features.iwlwifi = true;

From 56aeb271c929bb108ba27592ec635965a38817e7 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Wed, 22 Mar 2017 12:00:24 +1100
Subject: [PATCH 2766/3449] bedtools: fix clang build

---
 pkgs/applications/science/biology/bedtools/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix
index cd5c980b0016..d6e00659c1a9 100644
--- a/pkgs/applications/science/biology/bedtools/default.nix
+++ b/pkgs/applications/science/biology/bedtools/default.nix
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ zlib python ];
-  buildPhase = "make prefix=$out SHELL=${stdenv.shell} -j $NIX_BUILD_CORES";
-  installPhase = "make prefix=$out SHELL=${stdenv.shell} install";
+  cc = if stdenv.cc.isClang then "clang++" else "g++";
+  buildPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} -j $NIX_BUILD_CORES";
+  installPhase = "make prefix=$out SHELL=${stdenv.shell} CXX=${cc} install";
 
   meta = with stdenv.lib; {
     description = "A powerful toolset for genome arithmetic.";

From 8a84ef9efc19177fa7c7c0dbc6c95d3305be0a8a Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Wed, 22 Mar 2017 01:04:17 +0000
Subject: [PATCH 2767/3449] tokei: 4.0.0 -> 6.0.0

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

diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix
index d88a06c64048..057c01a1885b 100644
--- a/pkgs/development/tools/misc/tokei/default.nix
+++ b/pkgs/development/tools/misc/tokei/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "tokei-${version}";
-  version = "4.0.0";
-  src = fetchurl {
-    url = "https://github.com/Aaronepower/tokei/archive/${version}.tar.gz";
-    sha256 = "1c7z3dgxr76dq6cvan3hgqlkcv61gmg6fkv6b98viymh4fy9if68";
+  version = "6.0.0";
+
+  src = fetchFromGitHub {
+    owner = "Aaronepower";
+    repo = "tokei";
+    rev = "v${version}";
+    sha256 = "1j8k2i25c989mf15jwy4a4vazjc7x7pm8zywycg8xvv4ik1im7m7";
   };
 
-  depsSha256 = "0v4gplk7mkkik9vr1lqsr0yl1kqkqh14ncw95yb9iv7hcxvmcqn3";
+  depsSha256 = "184x6lwma3lawr2dcc7ivkp1j049af9w040dyzca6i56i2s9998p";
 
   installPhase = ''
     mkdir -p $out/bin

From 95eaa3aec3f380a092cfaf14b4d8dccbfb2d241b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 19 Mar 2017 22:18:50 +0100
Subject: [PATCH 2768/3449] nixos/tor: add missing option type

---
 nixos/modules/services/security/tor.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 3b4d77a6f7b1..10596d6431d0 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -140,6 +140,7 @@ in
         };
 
         privoxy.enable = mkOption {
+          type = types.bool;
           default = true;
           description = ''
             Whether to enable and configure the system Privoxy to use Tor's

From 41e2ffa1d7d778b2fd49a16832a3c6c7371ec3cf Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 22 Mar 2017 02:13:39 +0100
Subject: [PATCH 2769/3449] pax-utils: meta cleanups

- Description from upstream
- A more informative homepage
- Per upstream, pax-utils should work for unix-likes beyond linux
---
 pkgs/os-specific/linux/pax-utils/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 956492ba747b..5de0081a411c 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "pax-utils-${version}";
@@ -9,15 +9,19 @@ stdenv.mkDerivation rec {
     sha512 = "26f7lqr1s2iywj8qfbf24sm18bl6f7cwsf77nxwwvgij1z88gvh6yx3gp65zap92l0xjdp8kwq9y96xld39p86zd9dmkm447czykbvb";
   };
 
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
+  makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    description = "A suite of tools for PaX/grsecurity";
-    homepage    = "https://dev.gentoo.org/~vapier/dist/";
-    license     = licenses.gpl2;
-    platforms   = platforms.linux;
+    description = "ELF utils that can check files for security relevant properties";
+    longDescription = ''
+      A suite of ELF tools to aid auditing systems. Contains
+      various ELF related utils for ELF32, ELF64 binaries useful
+      for displaying PaX and security info on a large groups of
+      binary files.
+    '';
+    homepage = https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ thoughtpolice joachifm ];
   };
 }

From 856a7e7646e39b2491ee34ba56851c824a482632 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Tue, 21 Mar 2017 20:29:47 -0500
Subject: [PATCH 2770/3449] augeas: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index 63bb8c1f9851..e3f743766140 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "augeas-${version}";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchurl {
     url = "http://download.augeas.net/${name}.tar.gz";
-    sha256 = "0qwpjz23z1x7dkf5k2y9f1cppryzhx4hpxprla6a4yvzs1smacdr";
+    sha256 = "1iac5lwi1q10r343ii9v5p2fdplvh06yv9svsi8zz6cd2c2fjp2i";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ readline libxml2 ];

From 09e814c6810e26901fbb68659d858c9f3ed2de3e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2017 01:34:24 +0000
Subject: [PATCH 2771/3449] proofgeneral_HEAD: Bump

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

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
index fabf8ac4ce4c..5d44173729db 100644
--- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation (rec {
 
   src = fetchgit {
     url = "https://github.com/ProofGeneral/PG.git";
-    rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4";
-    sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64";
+    rev = "62ec846fcaaef8f3ae94302cbef2972f88a0804f";
+    sha256 = "0vln1bc884qynbl5yci0dkr6ckz3p46q4jrhxgylcx4w0jkhizhm";
   };
 
   buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;

From eb9f76911f1fee6ebd519220bc9843d3adac5ee7 Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Wed, 22 Mar 2017 01:45:55 +0000
Subject: [PATCH 2772/3449] rustracer: 2.0.5 -> 2.0.6

---
 pkgs/development/tools/rust/racer/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index a44ba43051ae..d1cb4a8cd2e1 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -1,18 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform, makeWrapper }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "racer-${version}";
-  version = "2.0.5";
+  version = "2.0.6";
+
   src = fetchFromGitHub {
     owner = "phildawes";
     repo = "racer";
-    rev = "93eac5cd633c937a05d4138559afe6fb054c7c28";
-    sha256 = "0smp5dv0f5bymficrg0dz8h9x4lhklrz6f31fbcy0vhg8l70di2n";
+    rev = version;
+    sha256 = "09wgfrb0z2d2icfk11f1jal5p93sqjv3jzmzcgw0pgw3zvffhni3";
   };
 
-  depsSha256 = "1qq2fpjg1wfb7z2s8p4i2aw9swcpqsp9m5jmhbyvwnd281ag4z6a";
+  depsSha256 = "0mnq7dk9wz2k9jhzciknybwc471sy8f71cd15m752b5ng6v1f5kn";
 
   buildInputs = [ makeWrapper ];
 
@@ -31,7 +30,7 @@ buildRustPackage rec {
   meta = with stdenv.lib; {
     description = "A utility intended to provide Rust code completion for editors and IDEs";
     homepage = https://github.com/phildawes/racer;
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     maintainers = with maintainers; [ jagajaga globin ];
     platforms = platforms.all;
   };

From 6661730f92c9eaa4cfd91dd95228bb5ecb4e13bf Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Wed, 22 Mar 2017 02:00:11 +0000
Subject: [PATCH 2773/3449] rust-bindgen: 0.19.1 -> 0.22.1

---
 pkgs/development/tools/rust/bindgen/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index adecf7f3bd13..232be1fea384 100644
--- a/pkgs/development/tools/rust/bindgen/default.nix
+++ b/pkgs/development/tools/rust/bindgen/default.nix
@@ -1,18 +1,16 @@
 { stdenv, fetchFromGitHub, rustPlatform, llvmPackages }:
 
-with rustPlatform;
-
 # Future work: Automatically communicate NIX_CFLAGS_COMPILE to bindgen's tests and the bindgen executable itself.
 
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "rust-bindgen-${version}";
-  version = "0.19.1";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
-    owner = "Yamakaky";
+    owner = "servo";
     repo = "rust-bindgen";
-    rev = "${version}";
-    sha256 = "0pv1vcgp455hys8hb0yj4vrh2k01zysayswkasxq4hca8s2p7qj9";
+    rev = "v${version}";
+    sha256 = "10cavj6rrbdqi4ldfmhxy6xxp0q65pxiypdgq2ckz0c37g04qqqs";
   };
 
   buildInputs = [ llvmPackages.clang-unwrapped ];
@@ -21,13 +19,13 @@ buildRustPackage rec {
     export LIBCLANG_PATH="${llvmPackages.clang-unwrapped}/lib"
   '';
 
-  depsSha256 = "0rlmdiqjg9ha9yzhcy33abvhrck6sphczc2gbab9zhfa95gxprv8";
+  depsSha256 = "1gvva6f64ndzsswv1a7c31wym12yp4cg1la4zjwlzkrx62kgyk8x";
 
   doCheck = false; # A test fails because it can't find standard headers in NixOS
 
   meta = with stdenv.lib; {
     description = "C binding generator";
-    homepage = https://github.com/Yamakaky/rust-bindgen;
+    homepage = https://github.com/servo/rust-bindgen;
     license = with licenses; [ bsd3 ];
     maintainers = [ maintainers.ralith ];
   };

From 5561abd5569e67f04479fe767bcea5038b3618ec Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 21 Mar 2017 22:24:12 -0400
Subject: [PATCH 2774/3449] libauto: more obscene hackery to make it work on
 LLVM 4

This sort of thing is going to get revamped to be less hackish soon but
for now I want it to work. In this particular case, libc++ 4 (and maybe
earlier) gets very upset if we're imprecise about our const markers, and
I guess libauto was careless. This fixes it (PtrPtrMap) to be correct.
---
 .../darwin/apple-source-releases/libauto/default.nix           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
index 2003bb6e55e4..7d6ab403a47a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libauto/default.nix
@@ -13,7 +13,8 @@ appleDerivation {
       --replace "#include <msgtracer_client.h>" ''$'#include <asl.h>\nstatic void msgtracer_log_with_keys(...) { };'
 
     substituteInPlace Definitions.h \
-      --replace "#include <System/pthread_machdep.h>" ""
+      --replace "#include <System/pthread_machdep.h>" "" \
+      --replace 'void * const, void * const' 'void * const, void *'
 
     # getspecific_direct is more efficient, but this should be equivalent...
     substituteInPlace Zone.h \

From 3263d02626cadc95a2ddc4e949128d4925c77b02 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 21 Mar 2017 23:22:15 -0400
Subject: [PATCH 2775/3449] xcbuild: assorted fixes and cleanups

This is in preparation for the LLVM 4 upgrade (which gets more strict
about e.g., return false in xcbuild itself) and also for using xcbuild
more extensively in the Darwin stdenv bootstrap process, which is why I
killed the unnecessary gcc dependency in the toolchain. llvm-cov pretends
to be gcov anyway, so we're fine.
---
 .../compilers/llvm/3.7/clang/default.nix      |  1 +
 .../compilers/llvm/3.8/clang/default.nix      |  1 +
 .../compilers/llvm/3.9/clang/default.nix      |  1 +
 .../compilers/llvm/4/clang/default.nix        |  1 +
 pkgs/development/tools/xcbuild/default.nix    |  3 +++
 .../tools/xcbuild/return-false.patch          | 13 ++++++++++
 pkgs/development/tools/xcbuild/toolchain.nix  | 25 +++++++++++++------
 pkgs/development/tools/xcbuild/wrapper.nix    |  4 +--
 8 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/xcbuild/return-false.patch

diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index 535dbbc93d51..f27e3f0089e2 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -42,6 +42,7 @@ let
     passthru = {
       lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
       isClang = true;
+      inherit llvm;
     } // stdenv.lib.optionalAttrs stdenv.isLinux {
       inherit gcc;
     };
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 41e515249eb3..90b8ea2581e8 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -53,6 +53,7 @@ let
     passthru = {
       lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
       isClang = true;
+      inherit llvm;
     } // stdenv.lib.optionalAttrs stdenv.isLinux {
       inherit gcc;
     };
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index 677c4a526ea4..b3616a0e86b6 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -42,6 +42,7 @@ let
     passthru = {
       lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
       isClang = true;
+      inherit llvm;
     } // stdenv.lib.optionalAttrs stdenv.isLinux {
       inherit gcc;
     };
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 6ce63209935c..c93871592830 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -53,6 +53,7 @@ let
     passthru = {
       lib = self; # compatibility with gcc, so that `stdenv.cc.cc.lib` works on both
       isClang = true;
+      inherit llvm;
     } // stdenv.lib.optionalAttrs stdenv.isLinux {
       inherit gcc;
     };
diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix
index f2be61bd2139..649c7d14927e 100644
--- a/pkgs/development/tools/xcbuild/default.nix
+++ b/pkgs/development/tools/xcbuild/default.nix
@@ -31,6 +31,9 @@ in stdenv.mkDerivation rec {
     cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise
   '';
 
+  # See https://github.com/facebook/xcbuild/issues/238 and remove once that's in
+  patches = [ ./return-false.patch ];
+
   # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
   postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed 1i'#include <sys/sysmacros.h>' \
diff --git a/pkgs/development/tools/xcbuild/return-false.patch b/pkgs/development/tools/xcbuild/return-false.patch
new file mode 100644
index 000000000000..8ec81b5e97ca
--- /dev/null
+++ b/pkgs/development/tools/xcbuild/return-false.patch
@@ -0,0 +1,13 @@
+diff --git a/Libraries/dependency/Tools/dependency-info-tool.cpp b/Libraries/dependency/Tools/dependency-info-tool.cpp
+index 006f53c7..d469f068 100644
+--- a/Libraries/dependency/Tools/dependency-info-tool.cpp
++++ b/Libraries/dependency/Tools/dependency-info-tool.cpp
+@@ -271,7 +271,7 @@ main(int argc, char **argv)
+      */
+     std::vector<uint8_t> makefileContents = std::vector<uint8_t>(contents.begin(), contents.end());
+     if (!filesystem.write(makefileContents, *options.output())) {
+-        return false;
++        return -1;
+     }
+ 
+     return 0;
diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix
index 386f67a9d631..4313f0051473 100644
--- a/pkgs/development/tools/xcbuild/toolchain.nix
+++ b/pkgs/development/tools/xcbuild/toolchain.nix
@@ -1,4 +1,4 @@
-{stdenv, writeText, toolchainName, xcbuild
+{stdenv, writeText, toolchainName, xcbuild, fetchurl
 , llvm, cctools, gcc, bootstrap_cmds, binutils
 , yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}:
 
@@ -8,15 +8,20 @@ let
     Identifier = toolchainName;
   };
 
+  # We could pull this out of developer_cmds but it adds an annoying loop if we want to bootstrap and
+  # this is just a tiny script so I'm not going to bother
+  mkdep-darwin-src = fetchurl {
+    url        = "https://opensource.apple.com/source/developer_cmds/developer_cmds-63/mkdep/mkdep.sh";
+    sha256     = "0n4wpqfslfjs5zbys5yri8pfi2awyhlmknsf6laa5jzqbzq9x541";
+    executable = true;
+  };
 in
 
 stdenv.mkDerivation {
   name = "nixpkgs.xctoolchain";
   buildInputs = [ xcbuild makeWrapper ];
 
-  propagatedBuildInputs = [ llvm gcc yacc flex m4 unifdef gperf indent ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ cctools bootstrap_cmds binutils ];
-  ## cctools should build on Linux but it doesn't currentl
+  ## cctools should build on Linux but it doesn't currently
 
   buildCommand = ''
     mkdir -p $out
@@ -58,8 +63,6 @@ stdenv.mkDerivation {
     ln -s ${unifdef}/bin/unifdefall
 
     ln -s ${gperf}/bin/gperf
-    ln -s ${gcc}/bin/gcov
-    ln -s ${gcc}/bin/mkdep
     ln -s ${indent}/bin/indent
     ln -s ${ctags}/bin/ctags
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
@@ -86,7 +89,15 @@ stdenv.mkDerivation {
     ln -s ${cctools}/bin/pagestuff
     ln -s ${cctools}/bin/ranlib
     ln -s ${cctools}/bin/redo_prebinding
-  '';
+  '' +
+    # No point including the entire gcc closure if we don't already have it
+    (if stdenv.cc.isClang then ''
+      ln -s ${stdenv.cc.cc.llvm}/bin/llvm-cov gcov
+      ln -s ${mkdep-darwin-src}               mkdep
+    '' else ''
+      ln -s ${gcc}/bin/gcov
+      ln -s ${gcc}/bin/mkdep
+    '');
 }
 
 # other commands in /bin/
diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index 0da733b8078e..6840694f6991 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -50,10 +50,10 @@ stdenv.mkDerivation {
     ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications
 
     mkdir -p $out/Platforms/
-    ln -s ${platform} $out/Platforms/
+    ln -s ${platform} $out/Platforms/nixpkgs.platform
 
     mkdir -p $out/Toolchains/
-    ln -s ${toolchain} $out/Toolchains/
+    ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolahin
 
     wrapProgram $out/bin/xcodebuild \
       --add-flags "-xcconfig ${xcconfig}" \

From 938df03ed1ae250fd21a7615763b1ecabb041b66 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 18 Mar 2017 01:27:11 +0100
Subject: [PATCH 2776/3449] radare2: fix hash

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

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 5befd5e620d5..a3267d8d9ea5 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://cloud.radare.org/get/${version}/${name}.tar.gz";
-    sha256 = "08p2vhv6vkqvknwq18xl5wgf843lbpbmb111x23gkkxm6vxvpydd";
+    sha256 = "1kwp0i5sqk5almnx4g8claimqz8rwvv1fn8x66k4az1s8k7g9kiv";
   };
 
 

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 2777/3449] 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 af5fc8a8be46..d6cc205bbae4 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 0e0697dfb211..000000000000
--- 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 20c408bfae23..14eaea7071bf 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 2778/3449] 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 f8d1506cca34..4f8daf38d467 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 14eaea7071bf..000000000000
--- 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 2779/3449] 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 947c0e30f993..a9f8c32dde9b 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 000000000000..3d9ee7e6a822
--- /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 ce6cd33c65d11c43e911d38724dde778d3674f6d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 21 Mar 2017 10:42:58 +0100
Subject: [PATCH 2780/3449] Python docs: small fixes

---
 doc/languages-frameworks/python.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index cbb979e87881..da7706726b4c 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -3,7 +3,7 @@
 ## User Guide
 
 Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 3.5.
+packages. The default interpreter is CPython 2.7.
 
 ### Using Python
 
@@ -131,7 +131,7 @@ specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap
 
 The output of the function is a derivation, which is an attribute with the name
 `toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
-so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
+so e.g. `python27Packages`, `python35Packages` and `pypyPackages`.
 
 The above example works when you're directly working on
 `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
@@ -422,8 +422,8 @@ and in this case the `python35` interpreter is automatically used.
 
 ### Interpreters
 
-Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available as respectively
-`python26`, `python27`, `python33`, `python34` and `python35`. The PyPy interpreter
+Versions 2.7, 3.3, 3.4, 3.5 and 3.6 of the CPython interpreter are available as
+respectively `python27`, `python33`, `python34`, `python35` and `python36`. The PyPy interpreter
 is available as `pypy`. The aliases `python2` and `python3` correspond to respectively `python27` and
 `python35`. The default interpreter, `python`, maps to `python2`.
 The Nix expressions for the interpreters can be found in
@@ -472,6 +472,7 @@ sets are
 * `pkgs.python33Packages`
 * `pkgs.python34Packages`
 * `pkgs.python35Packages`
+* `pkgs.python36Packages`
 * `pkgs.pypyPackages`
 
 and the aliases
@@ -674,8 +675,8 @@ deterministic bytecode. This has security implications and is relevant for
 those using Python in a `nix-shell`.
 
 When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will have timestamp 1.
-The `buildPythonPackage` function sets `DETERMINISTIC_BUILD` as well as
-[PYTHONHASHSEED](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
+The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and
+[PYTHONHASHSEED=0](https://docs.python.org/3.5/using/cmdline.html#envvar-PYTHONHASHSEED).
 Both are also exported in `nix-shell`.
 
 

From ede70972a471796e020532f9e1873e42d28ec1a7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 22 Mar 2017 13:18:36 +0100
Subject: [PATCH 2781/3449] oneteam: fix fixable problems, mark broken as it
 fell behind Firefox too much

---
 .../instant-messengers/oneteam/default.nix     | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
index 3d70990f4620..f7e4fa4cff63 100644
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig
+, perl, firefox, perlPackages, zip, unzip, pkgconfig
 , libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver
 , scrnsaverproto
 }:
@@ -14,25 +14,20 @@ stdenv.mkDerivation rec {
     sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3";
   };
 
-  nativeBuildInputs = [ pkgconfig cmake zip unzip ];
+  nativeBuildInputs = [ pkgconfig zip unzip ];
 
   buildInputs =
-    [ perl xulrunner libpulseaudio glib gtk2 pixman nspr
+    [ perl firefox libpulseaudio glib gtk2 pixman nspr
       nss libXScrnSaver scrnsaverproto
     ] ++ [ perlPackages.SubName gtk2 glib ];
 
   postPatch = ''
-    sed -e '1i#include <netinet/in.h>' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp
+    sed -e '1i#include <netinet/in.h>' -i src/components/src/rtp/otRTPDecoder.cpp src/components/src/rtp/otRTPEncoder.cpp
   '';
 
-  cmakeBuildDir = "cmake-build";
-  cmakeFlags = ["-D XPCOM_GECKO_SDK=${xulrunner}/lib/xulrunner-devel-${xulrunner.version}"];
-
   buildPhase = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
-    cd src/components
     perl build.pl XULAPP 1
-    cd ../../
   '';
 
   installPhase = ''
@@ -43,7 +38,8 @@ stdenv.mkDerivation rec {
     unzip "$BUILD_DIR/oneteam.xulapp"
     mkdir -p "$out/bin"
     echo "#! ${stdenv.shell}" > "$out/bin/oneteam"
-    echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
+    sed -re 's@MaxVersion=[0-9.]+@MaxVersion=999.0@' -i "$TARGET_DIR/application.ini"
+    echo "\"${firefox}/bin/firefox\" -app \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
     chmod a+x "$out/bin/oneteam"
     mkdir -p "$out/share/doc"
     cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
@@ -54,6 +50,8 @@ stdenv.mkDerivation rec {
     maintainers = with stdenv.lib.maintainers; [ raskin ];
     license = stdenv.lib.licenses.gpl2;
     homepage="http://oneteam.im";
+    # Fell behind the Firefox development
+    broken = true;
   };
 
   passthru = {

From d2cd304ad74f9d804f0a23e51a38510fbd6648f4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 22 Mar 2017 13:19:19 +0100
Subject: [PATCH 2782/3449] oneteam: remove

---
 .../instant-messengers/oneteam/default.nix    | 62 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 64 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/oneteam/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
deleted file mode 100644
index f7e4fa4cff63..000000000000
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchFromGitHub
-, perl, firefox, perlPackages, zip, unzip, pkgconfig
-, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver
-, scrnsaverproto
-}:
-
-stdenv.mkDerivation rec {
-  name = "oneteam-unstable-2013-02-21";
-
-  src = fetchFromGitHub {
-    repo = "oneteam";
-    owner = "processone";
-    rev = "c51bc545c3a32db4ea8b96e43b84fcfc6b8d3d2a";
-    sha256 = "19104fwdaf0nnsr5w755fg8wwww5sh96wmn939gxa5ah155nf2w3";
-  };
-
-  nativeBuildInputs = [ pkgconfig zip unzip ];
-
-  buildInputs =
-    [ perl firefox libpulseaudio glib gtk2 pixman nspr
-      nss libXScrnSaver scrnsaverproto
-    ] ++ [ perlPackages.SubName gtk2 glib ];
-
-  postPatch = ''
-    sed -e '1i#include <netinet/in.h>' -i src/components/src/rtp/otRTPDecoder.cpp src/components/src/rtp/otRTPEncoder.cpp
-  '';
-
-  buildPhase = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
-    perl build.pl XULAPP 1
-  '';
-
-  installPhase = ''
-    TARGET_DIR="$out/share/oneteam/app"
-    BUILD_DIR="$PWD"
-    mkdir -p "$TARGET_DIR"
-    cd "$TARGET_DIR"
-    unzip "$BUILD_DIR/oneteam.xulapp"
-    mkdir -p "$out/bin"
-    echo "#! ${stdenv.shell}" > "$out/bin/oneteam"
-    sed -re 's@MaxVersion=[0-9.]+@MaxVersion=999.0@' -i "$TARGET_DIR/application.ini"
-    echo "\"${firefox}/bin/firefox\" -app \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
-    chmod a+x "$out/bin/oneteam"
-    mkdir -p "$out/share/doc"
-    cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
-  '';
-
-  meta = {
-    description = "An XMPP client";
-    maintainers = with stdenv.lib.maintainers; [ raskin ];
-    license = stdenv.lib.licenses.gpl2;
-    homepage="http://oneteam.im";
-    # Fell behind the Firefox development
-    broken = true;
-  };
-
-  passthru = {
-    updateInfo = {
-      downloadPage = "git://github.com/processone/oneteam";
-    };
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 385030188e9c..ecafbf2de90a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14878,8 +14878,6 @@ with pkgs;
 
   omxplayer = callPackage ../applications/video/omxplayer { };
 
-  oneteam = callPackage ../applications/networking/instant-messengers/oneteam { };
-
   openbox = callPackage ../applications/window-managers/openbox { };
 
   openbox-menu = callPackage ../applications/misc/openbox-menu { };

From 7aee677a1093aa5869a6a1bf5ecd6121f87534c8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 07:14:05 -0500
Subject: [PATCH 2783/3449] makeQtWrapper: wrap with runtime XDG dirs

---
 pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh | 4 ++--
 pkgs/development/libraries/qt-5/make-qt-wrapper.sh        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
index cc88d2ca35d4..576c03d8c760 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
@@ -31,8 +31,8 @@ _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="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share"
-    export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
+    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
+    export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
 }
 
 prePhases+=(_makeQtWrapperSetup)
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
index b0d0bec9e3f6..d716a8765263 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
@@ -29,8 +29,8 @@ _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="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputBin}/share"
-    export RUNTIME_XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
+    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
+    export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
 }
 
 prePhases+=(_makeQtWrapperSetup)

From 3de6ccd5b21e391c4fa324c94dd150e331a8474e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 07:14:59 -0500
Subject: [PATCH 2784/3449] sddm: propagate qtbase input

---
 .../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 9fd56a49b5f5..019d3e97a6f7 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,13 @@ let
     nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
     buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
+      libxcb libpthreadstubs libXdmcp libXau pam systemd
+      qtbase qtdeclarative
     ];
 
-    propagatedBuildInputs = [ qtdeclarative ];
+    propagatedUserEnvPkgs = builtins.map lib.getBin [
+      qtbase qtdeclarative
+    ];
 
     cmakeFlags = [
       "-DCONFIG_FILE=/etc/sddm.conf"
@@ -80,6 +83,21 @@ 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 7ca62935bb7d8a1617a1c12e6735ecf45441aced Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 07:15:08 -0500
Subject: [PATCH 2785/3449] nixos/plasma5: do not include extra-cmake-modules
 in sddm

Fixes #24126.
---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index f923d86265f2..e3fc3340c953 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -209,7 +209,6 @@ in
       services.xserver.displayManager.sddm = {
         theme = "breeze";
         themes = [
-          pkgs.extra-cmake-modules # for the setup-hook
           plasma5.plasma-workspace
           pkgs.breeze-icons
         ];

From 203c4926e3251c91299eb122d48d250e5232ba9a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 07:33:26 -0500
Subject: [PATCH 2786/3449] sddmPlasma5: provide top-level package for theme

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ecafbf2de90a..1f07cf3f99c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15470,6 +15470,13 @@ with pkgs;
     themes = [];  # extra themes, etc.
   };
 
+  sddmPlasma5 = sddm.override {
+    themes = [
+      plasma5.plasma-workspace
+      pkgs.breeze-icons
+    ];
+  };
+
   skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
 
   slim = callPackage ../applications/display-managers/slim {

From a96e047b31ca1f64cd80301f520471f4fd8de854 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 07:39:50 -0500
Subject: [PATCH 2787/3449] nixos/sddm: replace `themes` option with `package`
 option

---
 nixos/modules/rename.nix                              |  2 ++
 .../modules/services/x11/desktop-managers/plasma5.nix |  5 +----
 nixos/modules/services/x11/display-managers/sddm.nix  | 11 ++++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 7b75ca85219c..d9d399e3481d 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -202,5 +202,7 @@ with lib;
       "See the 16.09 release notes for more information.")
     (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
     (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
+    (mkRemovedOptionModule [ "services" "xserver" "displayManager" "sddm" "themes" ]
+      "Set the option `services.xserver.displayManager.sddm.package' instead.")
   ];
 }
diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index e3fc3340c953..918841e8f168 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -208,10 +208,7 @@ in
 
       services.xserver.displayManager.sddm = {
         theme = "breeze";
-        themes = [
-          plasma5.plasma-workspace
-          pkgs.breeze-icons
-        ];
+        package = pkgs.sddmPlasma5;
       };
 
       security.pam.services.kde = { allowNullPassword = true; };
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 6630b8257e4e..affc1261d196 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -9,7 +9,7 @@ let
   cfg = dmcfg.sddm;
   xEnv = config.systemd.services."display-manager".environment;
 
-  sddm = pkgs.sddm.override { inherit (cfg) themes; };
+  sddm = cfg.package;
 
   xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
     #!/bin/sh
@@ -105,11 +105,12 @@ in
         '';
       };
 
-      themes = mkOption {
-        type = types.listOf types.package;
-        default = [];
+      package = mkOption {
+        type = types.package;
+        default = pkgs.sddm;
         description = ''
-          Extra packages providing themes.
+          The SDDM package to install.
+          The default package can be overridden to provide extra themes.
         '';
       };
 

From 403b87f0d58f3dd17b5bcf4f378bb4894b50d987 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 07:14:27 -0500
Subject: [PATCH 2788/3449] plasma-workspace: do not propagate non-KDE inputs

---
 pkgs/desktops/plasma-5/plasma-workspace/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 5463e017d23c..8759c7d8c1e7 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -17,12 +17,15 @@ plasmaPackage {
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
+    isocodes libdbusmenu libSM libXcursor pam wayland
+  ];
+  propagatedBuildInputs = [
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
     kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
-    plasma-framework qtgraphicaleffects qtquickcontrols qtquickcontrols2
-    qtscript qtx11extras solid isocodes libdbusmenu libSM libXcursor pam wayland
+    plasma-framework solid qtgraphicaleffects qtquickcontrols qtquickcontrols2
+    qtscript qtx11extras
   ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

From 66c384ab4a60eb266c5552464fce983205e1deec Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 22 Mar 2017 14:06:43 +0100
Subject: [PATCH 2789/3449] mailcore2: fix build with newer icu

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

diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index 4259e52510bc..03a940801e98 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
+       --replace " icule iculx" "" \
        --replace "tidy/tidy.h" "tidy.h" \
        --replace "/usr/include/tidy" "${libtidy}/include" \
        --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"

From 28a4c998faaf979189c261d0dee70131a11ced64 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 22 Mar 2017 12:57:14 +0100
Subject: [PATCH 2790/3449] matrix-synapse: 0.19.2 -> 0.19.3

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 863f7afd159f..2d5ad9e2742c 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.2";
+  version = "0.19.3";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "03gnz7rb7yncykqy0irl1y5lhk1cs0b4snpas8s1c9r0vsw1bmhr";
+    sha256 = "0dnlv2rgda94zlgwkpryjsypcf995l7zdp19d2xiq7zpd13x6yag";
   };
 
   patches = [ ./matrix-synapse.patch ];

From 1dadbe7e278ad7c2a9a2cab9fa846c2596cdce22 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 22 Mar 2017 13:02:07 +0100
Subject: [PATCH 2791/3449] pythonPackages.searx: update version bounds of
 dateutil

---
 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 d1d2a3983007..2283847ddefc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29119,7 +29119,8 @@ EOF
         --replace 'lxml==3.7.1' 'lxml' \
         --replace 'pyopenssl==16.2.0' 'pyopenssl' \
         --replace 'requests[socks]==2.12.4' 'requests[socks]' \
-        --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0'
+        --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \
+        --replace 'python-dateutil==2.5.3' 'python-dateutil>=2.5,<3.0'
     '';
 
     propagatedBuildInputs = with self; [

From a453aa0033a549071a9d738349c9ce5c397de89e Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Wed, 22 Mar 2017 09:38:24 +0800
Subject: [PATCH 2792/3449] emem: 0.2.45 -> 0.2.46

---
 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 b3424f367f1a..ed96ad759438 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.45";
+  version = "0.2.46";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1qjlz0sqjhx11vw8cc39h0sjgnfkrhgh94pv84z37b8hn42qingb";
+    sha256 = "1wyckyh8jknkrcd8bvlf9m16xpi85hvhz42zv80by0hvsxgsibvy";
   };
 
   phases = [ "buildPhase" "installPhase" ];

From c2ab1fa35063a51592f1b485d032ad2f5b35530d Mon Sep 17 00:00:00 2001
From: c74d <8573dd@gmail.com>
Date: Wed, 22 Mar 2017 01:17:22 +0000
Subject: [PATCH 2793/3449] heatseeker: 1.4.0 -> 1.5.1

This patch updates the `heatseeker` package from version 1.4.0 to
version 1.5.1.

I have tested this change per nixpkgs manual section 11.1 ("Making
patches").
---
 pkgs/tools/misc/heatseeker/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix
index 20f199ae73f9..499b4a87bc43 100644
--- a/pkgs/tools/misc/heatseeker/default.nix
+++ b/pkgs/tools/misc/heatseeker/default.nix
@@ -4,25 +4,25 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "heatseeker-${version}";
-  version = "1.4.0";
-
-  depsSha256 = "1acimdkl6ra9jlyiydzzd6ccdygr5is2xf9gw8i45xzh0xnsq226";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "rschmitt";
     repo = "heatseeker";
     rev = "v${version}";
-    sha256 = "1v2p6l4bdmvn9jggb12p0j5ajjvnbcdjsiavlcqiijz2w8wcdgs8";
+    sha256 = "1fcrbjwnhcz71i70ppy0rcgk5crwwmbkm9nrk1kapvks33pv0az7";
   };
 
+  depsSha256 = "05mj84a5k65ai492grwg03c3wq6ardhs114bv951fgysc9rs07p5";
+
   # some tests require a tty, this variable turns them off for Travis CI,
   # which we can also make use of
-  TRAVIS= "true";
+  TRAVIS = "true";
 
   meta = with stdenv.lib; {
     description = "A general-purpose fuzzy selector";
     homepage = https://github.com/rschmitt/heatseeker;
-    license = stdenv.lib.licenses.mit;
+    license = licenses.mit;
     maintainers = [ maintainers.michaelpj ];
     platforms = platforms.linux;
   };

From 9b9416cca48bb47488717cac4ae25e550a38e6d7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 22 Mar 2017 14:59:25 +0100
Subject: [PATCH 2794/3449] nixos-container: don't use host's $NIXOS_CONFIG

fixes #22948
---
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 754715cddd0b..677abdb8bc71 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -14,6 +14,9 @@ my $su = "@su@";
 # Ensure a consistent umask.
 umask 0022;
 
+# Ensure $NIXOS_CONFIG is not set.
+$ENV{"NIXOS_CONFIG"} = "";
+
 # Parse the command line.
 
 sub showHelp {

From 3ac02dfc400588cfe3ecaa16f0a492d469140041 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 22 Mar 2017 15:10:54 +0100
Subject: [PATCH 2795/3449] nixos-container: allow `_` in container name

fixes #15089
---
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 677abdb8bc71..84cfc9aa5867 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -82,7 +82,7 @@ if ($action eq "list") {
 }
 
 my $containerName = $ARGV[1] or die "$0: no container name specified\n";
-$containerName =~ /^[a-zA-Z0-9\-]+$/ or die "$0: invalid container name\n";
+$containerName =~ /^[a-zA-Z0-9_-]+$/ or die "$0: invalid container name\n";
 
 sub writeNixOSConfig {
     my ($nixosConfigFile) = @_;

From 91e74ed3b2b54e03647e2a3345d22e18b59eafd6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 22 Mar 2017 15:11:19 +0100
Subject: [PATCH 2796/3449] nixos-container: check for correct path for chattr

Could fail on destroy if the container wasn't created correctly
---
 pkgs/tools/virtualization/nixos-container/nixos-container.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 84cfc9aa5867..207177133a57 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -270,7 +270,7 @@ if ($action eq "destroy") {
 
     safeRemoveTree($profileDir) if -e $profileDir;
     safeRemoveTree($gcRootsDir) if -e $gcRootsDir;
-    system("chattr", "-i", "$root/var/empty") if -e $root;
+    system("chattr", "-i", "$root/var/empty") if -e "$root/var/empty";
     safeRemoveTree($root) if -e $root;
     unlink($confFile) or die;
 }

From 77b5d22df3af5a231f6abafcb35839eebe8dc315 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 22 Mar 2017 14:20:16 +0000
Subject: [PATCH 2797/3449] gmtp: init at 1.3.10 (#24178)

---
 lib/maintainers.nix                     |  1 +
 pkgs/applications/misc/gmtp/default.nix | 27 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/misc/gmtp/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 0a3d3ff55f88..3baf99b1fd48 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -382,6 +382,7 @@
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   patternspandemic = "Brad Christensen <patternspandemic@live.com>";
   pawelpacana = "Paweł Pacana <pawel.pacana@gmail.com>";
+  pbogdan = "Piotr Bogdan <ppbogdan@gmail.com>";
   periklis = "theopompos@gmail.com";
   pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
   peterhoeg = "Peter Hoeg <peter@hoeg.com>";
diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix
new file mode 100644
index 000000000000..a86cf268801d
--- /dev/null
+++ b/pkgs/applications/misc/gmtp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3
+, gsettings_desktop_schemas, wrapGAppsHook
+}:
+
+let version = "1.3.10"; in
+
+stdenv.mkDerivation {
+  name = "gmtp-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gmtp/gMTP-${version}/gmtp-${version}.tar.gz";
+    sha256 = "b21b9a8e66ae7bb09fc70ac7e317a0e32aff3917371a7241dea73c41db1dd13b";
+  };
+
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings_desktop_schemas ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "A simple MP3 and Media player client for UNIX and UNIX like systems.";
+    homepage = "https://gmtp.sourceforge.io";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.pbogdan ];
+    license = stdenv.lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f07cf3f99c1..e0a23910a461 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13934,6 +13934,8 @@ with pkgs;
 
   gmpc = callPackage ../applications/audio/gmpc {};
 
+  gmtp = callPackage ../applications/misc/gmtp {};
+
   gnome-mpv = callPackage ../applications/video/gnome-mpv { };
 
   gollum = callPackage ../applications/misc/gollum { };

From 07e6fe3e57898fd56dab0ba7a492733eab66f55d Mon Sep 17 00:00:00 2001
From: Jacek Smolak <jacek.smolak@holidaycheck.com>
Date: Tue, 21 Mar 2017 11:19:42 +0100
Subject: [PATCH 2798/3449] nodejs-7_x: 7.7.2 -> 7.7.3

---
 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 a93cd16e00e1..b0b0869dce27 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.2";
+    version = "7.7.3";
     name = "${baseName}-${version}";
     src = fetchurl {
       url = "https://nodejs.org/download/release/v${version}/node-v${version}.tar.xz";
-      sha256 = "117mqhvnvipyaq02knq75ikbk1swrw42b0kw6iijqb6k8j78si77";
+      sha256 = "1pqfrvz06nz88jdp1vsrxfy5z0v8yas1c6pkvl45afvl3zqxlhal";
     };
 
   })

From a4b4cd0710c7d92f6e84ac5655c61154714f198a Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Wed, 22 Mar 2017 14:33:22 +0000
Subject: [PATCH 2799/3449] lightdm-greeters service: add extraConfig option
 (#24135)

---
 .../x11/display-managers/lightdm-greeters/gtk.nix      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
index dfda90978b1e..1d5dcb2c7cbe 100644
--- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
@@ -45,6 +45,7 @@ let
     theme-name = ${cfg.theme.name}
     icon-theme-name = ${cfg.iconTheme.name}
     background = ${ldmcfg.background}
+    ${cfg.extraConfig}
     '';
 
 in
@@ -103,6 +104,15 @@ in
 
       };
 
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra configuration that should be put in the lightdm-gtk-greeter.conf
+          configuration file.
+        '';
+      };
+
     };
 
   };

From ad75bffb06e5feec5e13fa39f2032708ceea021c Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Wed, 22 Mar 2017 01:01:51 +0100
Subject: [PATCH 2800/3449] tribler: from 6.4.3 to 7.0.0-beta

removed old unused dependencies,
changed enablePlayer to true by default,
added myself as maintainer.
---
 .../networking/p2p/tribler/default.nix        | 79 +++++++++++--------
 1 file changed, 48 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 890271916544..a8d360c41564 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
-, enablePlayer ? false, vlc ? null }:
-
+{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
+, enablePlayer ? true, vlc ? null }:
 
 stdenv.mkDerivation rec {
-  name = "tribler-${version}";
-  version = "v6.4.3";
+  pname = "tribler";
+  name = "${pname}-${version}";
+  version = "7.0.0-beta";
+  revision = "1d3ddb8";
 
-  src = fetchurl {
-    url = "https://github.com/Tribler/tribler/releases/download/${version}/Tribler-${version}.tar.xz";
-    sha256 = "1n5qi3jlby41w60zg6dvl933ypyiflq3rb0qkwhxi4b26s3vwvgr";
+  src = fetchgit {
+    url = "https://github.com/Tribler/tribler";
+    rev = "v${revision}";
+    sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845";
+    fetchSubmodules = true;
   };
 
   buildInputs = [
@@ -20,42 +23,56 @@ stdenv.mkDerivation rec {
 
   pythonPath = [
     libtorrentRasterbar
-    pythonPackages.wxPython
     pythonPackages.apsw
     pythonPackages.twisted
-    pythonPackages.gmpy
     pythonPackages.netifaces
-    pythonPackages.pillow
     pythonPackages.pycrypto
     pythonPackages.pyasn1
     pythonPackages.requests
     pythonPackages.setuptools
     pythonPackages.m2crypto
+    pythonPackages.pyqt5
+    pythonPackages.chardet
+    pythonPackages.cherrypy
+    pythonPackages.cryptography
+    pythonPackages.libnacl
+    pythonPackages.configobj
+    pythonPackages.matplotlib
+    pythonPackages.plyvel
+    pythonPackages.decorator
+    pythonPackages.feedparser
   ];
 
-  installPhase =
-    ''
-      find . -name '*.png' -exec convert -strip {} {} \;
-      # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
-      wrapPythonPrograms
+  postPatch = ''
+    ${stdenv.lib.optionalString enablePlayer ''
+      substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')"
+      substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc"
+      substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'"
+    ''}
+  '';
 
-      mkdir -p $out/share/tribler
-      cp -prvd Tribler $out/share/tribler/
+  installPhase = ''
+    find . -name '*.png' -exec convert -strip {} {} \;
+    mkdir -pv $out
+    # Nasty hack; call wrapPythonPrograms to set program_PYTHONPATH.
+    wrapPythonPrograms
+    cp -prvd ./* $out/
+    makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
+        --set _TRIBLERPATH $out \
+        --set PYTHONPATH $out:$program_PYTHONPATH \
+        --set NO_AT_BRIDGE 1 \
+        --run 'cd $_TRIBLERPATH' \
+        --add-flags "-O $out/run_tribler.py" \
+        ${stdenv.lib.optionalString enablePlayer ''
+          --prefix LD_LIBRARY_PATH : ${vlc}/lib
+        ''}
+  '';
 
-      makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \
-          --set _TRIBLERPATH $out/share/tribler \
-          --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
-          --run 'cd $_TRIBLERPATH' \
-          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \
-          ${stdenv.lib.optionalString enablePlayer ''
-            --prefix LD_LIBRARY_PATH : ${vlc}/lib
-          ''}
-    '';
-
-  meta = {
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ xvapx ];
     homepage = http://www.tribler.org/;
     description = "A completely decentralised P2P filesharing client based on the Bittorrent protocol";
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
   };
 }

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 2801/3449] 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 000000000000..271f8a5467ba
--- /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 d1d2a3983007..0fb356ee1db3 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 506a5df01421715376c0985ea9cb417aae5c3e56 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Wed, 22 Mar 2017 10:49:10 -0400
Subject: [PATCH 2802/3449] octave: fix on darwin

This change is required on darwin, but did not make it into the 4.2.1
release of Octave. It is a very small change, and a comment on the
patch includes a link for more information and a note that it should
be removed from subsequent releases.
---
 pkgs/development/interpreters/octave/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 1c8644b18899..3233baea8f40 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -41,6 +41,12 @@ stdenv.mkDerivation rec {
     ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ])
     ;
 
+  # 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 ''
+    sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc
+  '';
+
   doCheck = !stdenv.isDarwin;
 
   enableParallelBuilding = true;

From 47183c813eaa1d96bc76dce41c873f18eead4454 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 22 Mar 2017 17:02:41 +0100
Subject: [PATCH 2803/3449] golly-beta: init at 2.9b2 to test GL issues

---
 pkgs/applications/science/misc/golly/beta.nix | 59 +++++++++++++++++++
 .../science/misc/golly/default.upstream       |  1 +
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 61 insertions(+)
 create mode 100644 pkgs/applications/science/misc/golly/beta.nix

diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix
new file mode 100644
index 000000000000..5fe72e44842d
--- /dev/null
+++ b/pkgs/applications/science/misc/golly/beta.nix
@@ -0,0 +1,59 @@
+{stdenv, fetchurl, fetchgit
+, wxGTK, perl, python2, zlib, mesa, libX11
+, automake, autoconf
+}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="golly";
+    version="2.8";
+    name="${baseName}-${version}";
+    hash="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "golly-${version}";
+  version = "2.8.99.2.20161122";
+  #src = fetchurl {
+  #  url="mirror://sourceforge/project/golly/golly/golly-2.8/golly-2.8-src.tar.gz";
+  #  sha256="0a4vn2hm7h4b47v2iwip1z3n9y8isf79v08aipl2iqms2m3p5204";
+  #};
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/golly/code";
+    rev = "93495edf3c9639332c6eb43ca7149c69629ee5d8";
+    sha256 = "1j308s9zlqkr3wnl1l32s5zk7r3g4ijwawkkysl8j5ik9sibi2gk";
+  };
+
+  setSourceRoot = ''
+    export sourceRoot="$(echo */gui-wx/configure)"
+  '';
+
+  nativeBuildInputs = [autoconf automake];
+
+  buildInputs = [
+    wxGTK perl python2 zlib mesa libX11
+  ];
+
+  # Link against Python explicitly as it is needed for scripts
+  makeFlags=[
+    "AM_LDFLAGS="
+  ];
+  NIX_LDFLAGS="-lpython${python2.majorVersion} -lperl";
+  preConfigure=''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -L$(dirname "$(find ${perl} -name libperl.so)")"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE
+      -DPYTHON_SHLIB=$(basename "$(
+        readlink -f ${python2}/lib/libpython*.so)")"
+
+    sh autogen.sh
+  '';
+
+  meta = {
+    inherit version;
+    description = "Cellular automata simulation program";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    downloadPage = "http://sourceforge.net/projects/golly/files/golly";
+  };
+}
diff --git a/pkgs/applications/science/misc/golly/default.upstream b/pkgs/applications/science/misc/golly/default.upstream
index 24032de56684..ab9fb03e7b18 100644
--- a/pkgs/applications/science/misc/golly/default.upstream
+++ b/pkgs/applications/science/misc/golly/default.upstream
@@ -2,3 +2,4 @@ url http://sourceforge.net/projects/golly/files/golly/
 version_link '[-][0-9.]+/$'
 SF_version_tarball 'src'
 SF_redirect
+minimize_overwrite
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e0a23910a461..1fa764218088 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17648,6 +17648,7 @@ with pkgs;
   gravit = callPackage ../applications/science/astronomy/gravit { };
 
   golly = callPackage ../applications/science/misc/golly { };
+  golly-beta = callPackage ../applications/science/misc/golly/beta.nix { };
 
   megam = callPackage ../applications/science/misc/megam { };
 

From a92dfe78e95ebe86736c6b02a0cadf939948f18c Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@mayflower.de>
Date: Sun, 12 Mar 2017 21:54:14 +0100
Subject: [PATCH 2804/3449] qcachegrind: init at 16.12.3

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

diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
new file mode 100644
index 000000000000..865b3ad6797d
--- /dev/null
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, cmake, qt, qmakeHook, makeQtWrapper, perl, python, php }:
+
+stdenv.mkDerivation rec {
+  name = "qcachegrind-${version}";
+  version = "16.12.3";
+
+  src = fetchurl {
+    url = "http://download.kde.org/stable/applications/${version}/src/kcachegrind-${version}.tar.xz";
+    sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
+  };
+
+  buildInputs = [ qt.qtbase perl python php ];
+
+  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+
+  postInstall = ''
+     mkdir -p $out/bin
+     cp -p converters/dprof2calltree $out/bin/dprof2calltree
+     cp -p converters/hotshot2calltree.cmake $out/bin/hotshot2calltree
+     cp -p converters/memprof2calltree $out/bin/memprof2calltree
+     cp -p converters/op2calltree $out/bin/op2calltree
+     cp -p converters/pprof2calltree $out/bin/pprof2calltree
+     chmod -R +x $out/bin/
+  '' + (if stdenv.isDarwin then ''
+    mkdir -p $out/Applications
+    cp cgview/cgview.app/Contents/MacOS/cgview $out/bin
+    cp -a qcachegrind/qcachegrind.app $out/Applications
+    wrapQtProgram $out/Applications/qcachegrind.app/Contents/MacOS/qcachegrind
+  '' else ''
+    install qcachegrind/qcachegrind cgview/cgview -t "$out/bin"
+    wrapQtProgram "$out/bin/qcachegrind"
+    install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications"
+    install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
+    install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
+  '');
+
+  meta = with stdenv.lib; {
+    description = "A Qt GUI to visualize profiling data";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ periklis ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fa764218088..e086fd0b153e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6945,6 +6945,10 @@ with pkgs;
 
   valkyrie = callPackage ../development/tools/analysis/valkyrie { };
 
+  qcachegrind = libsForQt57.callPackage ../development/tools/analysis/qcachegrind {
+    qt = qt57;
+  };
+
   verasco = ocaml-ng.ocamlPackages_4_02.verasco.override {
     coq = coq_8_4;
   };

From 6d7eb3b903657987054eb3f963cd96701b785307 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Wed, 22 Mar 2017 17:25:52 +0100
Subject: [PATCH 2805/3449] 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 ad147179f68f..6fcd0fca17a0 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-19";
-  rev = "6ac4724ed839594a132f5199d70d40fa15bd6b7a";
-  sha256 = "159b82zma3y0kcg55c6zm6ddsw4jm0c4y85b6l1ny108l9k3hy79";
+  version = "2017-03-22";
+  rev = "2458be6157706b6c92e37baa19703c15d89f6b3a";
+  sha256 = "19ij0fqy5j4lz73w4p29wv4gsxhs345ajxm4bxpq6gx2h4x6qk06";
 
   src = fetchFromGitHub {
       inherit rev;

From 20542a202839da12fd6e8a22b825ab507d082872 Mon Sep 17 00:00:00 2001
From: Florent Becker <Florent.Becker@ens-lyon.org>
Date: Wed, 22 Mar 2017 17:26:04 +0100
Subject: [PATCH 2806/3449] pijul: 0.3 -> 0.3.3

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

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index 3bbb9ba1bbf6..aed907b2dcde 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -4,21 +4,21 @@ with rustPlatform;
 
 buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.3";
+  version = "0.3.3";
 
   src = fetchurl {
     url = "https://pijul.org/releases/${name}.tar.gz";
-    sha256 = "2c7b354b4ab142ac50a85d70c80949ff864377b37727b862d103d3407e2c7818";
+    sha256 = "933e68703916ee7b50cd09f928bb072bdfc3388b69ff657578c23080f7df22b8";
   };
 
-  sourceRoot = "pijul/pijul";
+  sourceRoot = "${name}/pijul";
 
   buildInputs = [ perl ]++ stdenv.lib.optionals stdenv.isDarwin
     (with darwin.apple_sdk.frameworks; [ Security ]);
 
   doCheck = false;
   
-  depsSha256 = "03bb92mn16d38l49x4p1z21k7gvq3l3ki10brr13p7yv45rwvmzc";
+  depsSha256 = "1aiyjl8jbmr8yys5bsd2mg1i7jryzb8kxqlmxp7kjn2qx7b4q2zd";
 
   meta = with stdenv.lib; {
     description = "A distributed version control system";

From 9e95fb05c5b37fb10d8aa865390fd1a9e52b7175 Mon Sep 17 00:00:00 2001
From: Daniel Peebles <copumpkin@users.noreply.github.com>
Date: Wed, 22 Mar 2017 12:33:37 -0400
Subject: [PATCH 2807/3449] Fix typo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I should learn to type properly 🙃
---
 pkgs/development/tools/xcbuild/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix
index 6840694f6991..ab6605e91b10 100644
--- a/pkgs/development/tools/xcbuild/wrapper.nix
+++ b/pkgs/development/tools/xcbuild/wrapper.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
     ln -s ${platform} $out/Platforms/nixpkgs.platform
 
     mkdir -p $out/Toolchains/
-    ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolahin
+    ln -s ${toolchain} $out/Toolchains/nixpkgs.xctoolchain
 
     wrapProgram $out/bin/xcodebuild \
       --add-flags "-xcconfig ${xcconfig}" \

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 2808/3449] 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 02c60256e15b..f67dc7e32ae0 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 2809/3449] 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 e086fd0b153e..4b209fb0f0a0 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 2810/3449] 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 f5add12e8eca..228eb696bd9a 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 f387a242101b..91364dd65bb8 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 85b38c6fc6ce..f02b80706380 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 d716a8765263..8f42682fa23e 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 4b209fb0f0a0..a929c2b85758 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 2811/3449] 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 710641281e52..02d65597f749 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 be1c8c4d634d7b8240e062f3b8d48d8cc0f70e68 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 22 Mar 2017 20:08:56 +0100
Subject: [PATCH 2812/3449] fox: fix build with clang >=4 and possibly other
 versions

---
 pkgs/development/libraries/fox/clang.patch | 13 +++++++++++
 pkgs/development/libraries/fox/default.nix | 27 +++++++++++-----------
 2 files changed, 26 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/libraries/fox/clang.patch

diff --git a/pkgs/development/libraries/fox/clang.patch b/pkgs/development/libraries/fox/clang.patch
new file mode 100644
index 000000000000..0ca2ebf0d8da
--- /dev/null
+++ b/pkgs/development/libraries/fox/clang.patch
@@ -0,0 +1,13 @@
+diff --git a/src/FXReactor.cpp b/src/FXReactor.cpp
+index 1ecdb45..9058a30 100644
+--- a/src/FXReactor.cpp
++++ b/src/FXReactor.cpp
+@@ -452,7 +452,7 @@ FXint FXReactor::processActiveHandles(FXTime block,FXuint flags){
+     }
+ 
+   // Normal case
+-  if(0<=hand){
++  if(0==hand){
+ 
+     // Any handles active?
+     if(0<nhand){
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 8969e4bd5ba8..1ad765486995 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -1,20 +1,19 @@
 { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
 , CoreServices ? null }:
 
-let
-  version = "1.7.9";
-in
-
 stdenv.mkDerivation rec {
   name = "fox-${version}";
+  version = "1.7.9";
 
   src = fetchurl {
     url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
     sha256 = "1jb9368xsin3ppdf6979n5s7in3s9klbxqbwcp0z8misjixl7nzg";
   };
 
+  patches = [ ./clang.patch ];
+
   buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
+    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
   doCheck = true;
 
@@ -22,17 +21,17 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "C++ based class library for building Graphical User Interfaces";
     longDescription = ''
-        FOX stands for Free Objects for X.
-        It is a C++ based class library for building Graphical User Interfaces.
-        Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
-        Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
-      '';
+      FOX stands for Free Objects for X.
+      It is a C++ based class library for building Graphical User Interfaces.
+      Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious.
+      Current aims are to make FOX completely platform independent, and thus programs written against the FOX library will be only a compile away from running on a variety of platforms.
+    '';
     homepage = "http://fox-toolkit.org";
-    license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.bbenoist ];
+    platforms = platforms.all;
   };
 }

From 8c410f4b1877d3de7be5255972ef8177cdb81b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 22 Mar 2017 21:44:06 +0100
Subject: [PATCH 2813/3449] Revert "kmod-blacklist-ubuntu: 9.3 -> 22.1"

This reverts commit 0c262a639e1f5754ebe0701b7f622e2ada26ddfa.
It broke X tests, though it's not clear why ATM.  Discussion:
https://github.com/NixOS/nixpkgs/pull/23890#issuecomment-288528788
---
 .../linux/kmod-blacklist-ubuntu/default.nix     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index c96d17b7a624..35bf40bf835b 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,14 +1,13 @@
 { stdenv, fetchurl, gnugrep, findutils }:
-
 let
-  version = "22-1.1ubuntu1"; # Zesty
-
-in stdenv.mkDerivation {
+  version = "3ubuntu1"; # Saucy
+in
+stdenv.mkDerivation {
   name = "kmod-blacklist-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
-    sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
+    sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
   };
 
   installPhase = ''
@@ -28,9 +27,9 @@ in stdenv.mkDerivation {
       --replace " xargs " " ${findutils}/bin/xargs "
   '';
 
-  meta = with stdenv.lib; {
-    homepage = http://packages.ubuntu.com/source/zesty/kmod;
+  meta = {
+    homepage = http://packages.ubuntu.com/source/saucy/kmod;
     description = "Linux kernel module blacklists from Ubuntu";
-    platforms = platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From a7a858aa52636971ea03164020104d295a72e4ce Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 22 Mar 2017 19:10:15 +0300
Subject: [PATCH 2814/3449] qt5.qtwebengine: patch more library paths

Adapted from chromium derivation. Fixes qutebrowser crash.
---
 .../development/libraries/qt-5/5.7/qtwebengine/default.nix | 7 +++++++
 .../development/libraries/qt-5/5.8/qtwebengine/default.nix | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
index a42dda1b36cb..3966840c5d26 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
@@ -6,6 +6,7 @@
 , alsaLib
 , libcap
 , pciutils
+, systemd
 
 , bison, flex, git, which, gperf
 , coreutils
@@ -42,6 +43,12 @@ qtSubmodule {
       -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
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \
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 7b6660bf7668..410b6847e3dc 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -6,6 +6,7 @@
 , alsaLib
 , libcap
 , pciutils
+, systemd
 
 , bison, flex, git, which, gperf
 , coreutils
@@ -42,6 +43,12 @@ qtSubmodule {
       -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
+
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \

From 1715e3643bc6224eb0a60332635d17fd932188d5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 22 Mar 2017 21:47:51 +0300
Subject: [PATCH 2815/3449] nss: propagate nspr

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 294371dde7ad..e378c5b8a8aa 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -16,7 +16,9 @@ in stdenv.mkDerivation rec {
     sha256 = "1wrx2ig6yvgywjs25hzy4szgml21hwhd7ds0ghyfybhkiq7lyg6x";
   };
 
-  buildInputs = [ nspr perl zlib sqlite ];
+  buildInputs = [ perl zlib sqlite ];
+
+  propagatedBuildInputs = [ nspr ];
 
   prePatch = ''
     xz -d < ${nssPEM} | patch -p1

From 5a04d38ca62119e4669d829a9f0c0adfd1e77902 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 22 Mar 2017 21:49:41 +0300
Subject: [PATCH 2816/3449] srtp: build as shared library

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

diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index ba213dc98e76..27194aabd1bb 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     "--disable-debug"
   ] ++ optional (openssl != null) "--enable-openssl";
 
+  buildFlags = [ "shared_library" ];
+
   postInstall = ''
     rm -rf $out/bin
   '';

From 3a948e6b07707c93e3cbf57e8679d89ade2546a5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 22 Mar 2017 23:56:59 +0300
Subject: [PATCH 2817/3449] qt5.qtwebengine: add proprietary codecs support

---
 .../libraries/qt-5/5.7/qtwebengine/default.nix     | 14 ++++++--------
 .../libraries/qt-5/5.8/qtwebengine/default.nix     | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
index 3966840c5d26..7cdb957b2ab6 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
@@ -11,8 +11,9 @@
 , bison, flex, git, which, gperf
 , coreutils
 , pkgconfig, python2
+, enableProprietaryCodecs ? true
 
-, stdenv # lib.optional, needsPax
+, lib, stdenv # lib.optional, needsPax
 }:
 
 qtSubmodule {
@@ -48,13 +49,10 @@ qtSubmodule {
 
     sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
       src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-
-    configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
   '';
+
+  qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
+
   propagatedBuildInputs = [
     dbus zlib alsaLib
 
@@ -71,7 +69,7 @@ qtSubmodule {
     libcap
     pciutils
   ];
-  patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
+  patches = lib.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/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
index 410b6847e3dc..dec3c36c7e0c 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -11,8 +11,9 @@
 , bison, flex, git, which, gperf
 , coreutils
 , pkgconfig, python2
+, enableProprietaryCodecs ? true
 
-, stdenv # lib.optional, needsPax
+, lib, stdenv # lib.optional, needsPax
 }:
 
 qtSubmodule {
@@ -48,13 +49,10 @@ qtSubmodule {
 
     sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
       src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
-
-    configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
   '';
+
+  qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
+
   propagatedBuildInputs = [
     dbus zlib alsaLib
 
@@ -71,7 +69,7 @@ qtSubmodule {
     libcap
     pciutils
   ];
-  patches = stdenv.lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
+  patches = lib.optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch;
   postInstall = ''
     cat > $out/libexec/qt.conf <<EOF
     [Paths]

From 040b86a96e8cc5125762f2b026734e9c760caad9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 22 Mar 2017 23:57:37 +0300
Subject: [PATCH 2818/3449] qt5.qtwebengine: use system libraries where
 possible

Fixes #23987.
---
 .../libraries/qt-5/5.7/qtwebengine/default.nix   | 16 ++++++++++------
 .../libraries/qt-5/5.8/qtwebengine/default.nix   | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
index 7cdb957b2ab6..3ce7db5a9321 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/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
@@ -34,9 +35,6 @@ qtSubmodule {
     substituteInPlace ./src/3rdparty/chromium/v8/build/standalone.gypi \
       --replace /bin/echo ${coreutils}/bin/echo
 
-    # fix default SSL bundle location
-    sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
-
     # Fix library paths
     sed -i \
       -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
@@ -54,10 +52,16 @@ qtSubmodule {
   qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
 
   propagatedBuildInputs = [
-    dbus zlib alsaLib
+    dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
 
     # Image formats
-    libjpeg libpng libtiff
+    libjpeg libpng libtiff libwebp
+
+    # Video formats
+    srtp libvpx
+
+    # Audio formats
+    alsaLib libopus
 
     # Text rendering
     fontconfig freetype harfbuzz icu
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 dec3c36c7e0c..1edb0846029e 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/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
@@ -34,9 +35,6 @@ qtSubmodule {
     substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \
       --replace /bin/echo ${coreutils}/bin/echo
 
-    # fix default SSL bundle location
-    sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
-
     # Fix library paths
     sed -i \
       -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \
@@ -54,10 +52,16 @@ qtSubmodule {
   qmakeFlags = lib.optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
 
   propagatedBuildInputs = [
-    dbus zlib alsaLib
+    dbus zlib minizip alsaLib snappy nss protobuf jsoncpp libevent
 
     # Image formats
-    libjpeg libpng libtiff
+    libjpeg libpng libtiff libwebp
+
+    # Video formats
+    srtp libvpx
+
+    # Audio formats
+    alsaLib libopus
 
     # Text rendering
     fontconfig freetype harfbuzz icu

From 8eb87d0f1a1e26be3c4eb2c0cd6afa4abcc55b47 Mon Sep 17 00:00:00 2001
From: Richard Lupton <richard.lupton@gmail.com>
Date: Wed, 22 Mar 2017 21:34:29 +0000
Subject: [PATCH 2819/3449] kubernetes-helm: 2.1.3 -> 2.2.3

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

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index f54964571575..31ed8946529c 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -4,12 +4,12 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if stdenv.isLinux
-             then "8bb6f9d336ca7913556e463c5b65eb8d69778c518df2fab0d20be943fbf0efc1"
-             else "94c9f2d511aec3d4b7dcc5f0ce6f846506169b4eb7235e1dc137d08edf408098";
+             then "fa434644d1afd92637369a033fd65b717d8dfa910127d335e8a82c8fad74cc35"
+             else "64420d467e03ceb666a4f22b89e08b93c06f76f5917fe539860b04cd5e5e515f";
 in
 stdenv.mkDerivation rec {
   pname = "helm";
-  version = "2.1.3";
+  version = "2.2.3";
   name = "${pname}-${version}";
 
   src = fetchurl {

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 2820/3449] 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 b9a1f2e7a843..4ab97cc06d2a 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 646f0c706e7f2b2c64e47615e8332b18488cf67b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2017 22:06:25 +0000
Subject: [PATCH 2821/3449] jbuilder: 1.0+beta2 -> 1.0+beta5

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

diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index 9d6485841fae..3fa0c2685ee1 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+beta2";
+  name = "jbuilder-1.0+beta5";
   src = fetchzip {
-    url = http://github.com/janestreet/jbuilder/archive/1.0+beta2.tar.gz;
-    sha256 = "0xbq6p0n4a740l3jvq4a0a58mwfcal0q37vi8ix053f3jiqki6ng";
+    url = http://github.com/janestreet/jbuilder/archive/1.0+beta5.tar.gz;
+    sha256 = "00kh83n3216g1n7rhh14mcmw9bj5vzq7kiixm1abrc09dhwh4m7a";
   };
 
   buildInputs = [ ocaml ];

From c9bcbaa75aa6a418f81b71b2ce6a927568cf982e Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 17:14:30 -0500
Subject: [PATCH 2822/3449] recoll: 1.21.3 -> 1.23.1

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

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 345b1341c0f4..649b34e75692 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -7,16 +7,14 @@
 assert stdenv.system != "powerpc-linux";
 
 stdenv.mkDerivation rec {
-  ver = "1.21.3";
+  ver = "1.23.1";
   name = "recoll-${ver}";
 
   src = fetchurl {
     url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
-    sha256 = "66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a";
+    sha256 = "0si407qm47ndy0l6zv57lqb5za4aiv0lyghnzb211g03szjkfpg8";
   };
 
-  patches = [ ./nodeblayout.patch ./versionawk.patch ];
-
   configureFlags = [ "--with-inotify" ];
 
   buildInputs = [ qt4 xapian file python bison];
@@ -61,6 +59,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.lesbonscomptes.com/recoll/;
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ jcumming ];
+    maintainers = [ maintainers.jcumming ];
   };
 }

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 2823/3449] 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 000000000000..8261cc9e4cfa
--- /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 e086fd0b153e..489eddb0a151 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 2824/3449] 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 1d9b897188d7..9c19be3cc524 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 000000000000..f7cd04f1be4e
--- /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 b4e71d4bbc75..000000000000
--- 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 e086fd0b153e..6e5a2afa1044 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 c6322a28d410eb5f4f5c0fc4da15acf168ebe514 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 23 Mar 2017 00:54:40 +0100
Subject: [PATCH 2825/3449] electrum: 2.8.1 -> 2.8.2

Release 2.8.2
  * show paid invoices in history tab
  * improve CPFP dialog
  * fixes for trezor, keepkey
  * other minor bugfixes
https://github.com/spesmilo/electrum/blob/master/RELEASE-NOTES
---
 pkgs/applications/misc/electrum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 0fde5c8644eb..a2d39f2d486b 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.8.1";
+  version = "2.8.2";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "1398s9d8j04is24il2xjb6xkj666pj21bsr90xglpsmfa1js9z7g";
+    sha256 = "01xphbi7lx64s9380zjfakz5h8blqmxp0ryqlll7px66qpmjn5fq";
   };
 
   propagatedBuildInputs = with python2Packages; [

From a2fdf72ec45303d36b1435fd5da1b39b34a14868 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 23 Mar 2017 00:58:34 +0100
Subject: [PATCH 2826/3449] linux_4_9: 4.9.16 -> 4.9.17

---
 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 f024099b8281..688a08ceb8eb 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.16";
+  version = "4.9.17";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1r5spbinz8g3iclm9039cddaamj8q5vy455nnr3pvrmxbj8l9d23";
+    sha256 = "0zxcz7h8sy58qibqh1n1f39diywmdl8hd9vr16z9rbpba1jw35ch";
   };
 
   kernelPatches = args.kernelPatches;

From 94ab4932aee749da8b4045f3611886af88de924d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 23 Mar 2017 00:58:55 +0100
Subject: [PATCH 2827/3449] grsecurity: 4.9.16-201703180820 ->
 4.9.17-201703221829

---
 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 d3874e9f929c..b17209bca0e3 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.16";
+  version = "4.9.17";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha512 = "3fhzfdiziad5blzcqfbrxjphcygmhd7jzrricpkn7mvg069csrq0yvlbsxksqii0ahk77wzs1nmkfx138y21v4745dk6rf0438jv7md";
+    sha512 = "35mcvjl686xjgnbxrz2z84gg4q1m9y7wp541sg9k3jadlgsdyqrynz09j3lx3f5v40a83xmr5j3clavjaij16bl4imi716z7vjkfryx";
   };
 
   kernelPatches = args.kernelPatches;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index aba4f54b5267..0520a0425bfc 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.16";
-      grrev  = "201703180820";
-      sha512 = "114yqjffxnf412ypaq91r732mi4im2qakj07g0nbqx1qyg319qag5ckc5438kcny3qhzb9wyrwr6mhza51cq7js40ps2aw7alwjfgql";
+    { kver   = "4.9.17";
+      grrev  = "201703221829";
+      sha512 = "3br0xdjj95k8qnri83jj67s1lb4q6ws6irhdlr9kcyxj1384kipkfz8ciafs7zd3vqyfgsmdc56lmfpiyq5cx4dggy95qykx86ip787";
     };
 
   # This patch relaxes grsec constraints on the location of usermode helpers,

From bd0f070b98b87ce65baafe2007b0ef52a0bc88cd Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 20:27:43 -0500
Subject: [PATCH 2828/3449] get_iplayer: 2.97 -> 2.99

---
 .../applications/misc/get_iplayer/default.nix | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index a858fefa8c2b..d024b0fce99e 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,9 +1,20 @@
-{stdenv, fetchurl, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
+{stdenv, fetchFromGitHub, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}:
+
+with stdenv.lib;
+
 buildPerlPackage rec {
   name = "get_iplayer-${version}";
-  version = "2.97";
+  version = "2.99";
+  
+  src = fetchFromGitHub {
+    owner = "get-iplayer";
+    repo = "get_iplayer";
+    rev = "v${version}";
+    sha256 = "085bgwkjnaqp96gvd2s8qmkw69rz91si1sgzqdqbplkzj9bk2qii";
+  };
 
-  buildInputs = [makeWrapper perl];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ perl ];
   propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLLibXML XMLSimple];
 
   preConfigure = "touch Makefile.PL";
@@ -13,21 +24,15 @@ buildPerlPackage rec {
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
     cp get_iplayer $out/bin
-    wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/get_iplayer --suffix PATH : ${makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB
     cp get_iplayer.1 $out/share/man/man1
   '';
-  
-  src = fetchurl {
-    url = "https://github.com/get-iplayer/get_iplayer/archive/v${version}.tar.gz";
-    sha256 = "0bb6kmzjmazwfxq5ip7yxm39vssfgz3v5vfx1114wfssp6pw0r44";
-  };
 
   meta = {
     description = "Downloads TV and radio from BBC iPlayer";
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
     homepage = https://squarepenguin.co.uk/;
-    downloadPage = https://github.com/get-iplayer/get_iplayer/releases;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
   
 }

From 5fbdb796cd8a1e5a87a71f3846ed0fe852f96cf2 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 20:35:44 -0500
Subject: [PATCH 2829/3449] gkrellm: 2.3.5 -> 2.3.10

---
 pkgs/applications/misc/gkrellm/default.nix | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index d6a59a89be65..86b6d532be45 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -1,15 +1,19 @@
 { fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE
 , IOKit ? null }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
-  name = "gkrellm-2.3.5";
+  name = "gkrellm-2.3.10";
+
   src = fetchurl {
-    url = "http://members.dslextreme.com/users/billw/gkrellm/${name}.tar.bz2";
-    sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh";
+    url = "http://gkrellm.srcbox.net/releases/${name}.tar.bz2";
+    sha256 = "0rnpzjr0ys0ypm078y63q4aplcgdr5nshjzhmz330n6dmnxci7lb";
   };
 
-  buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [gettext glib gtk2 libX11 libSM libICE]
+    ++ optionals stdenv.isDarwin [ IOKit ];
 
   hardeningDisable = [ "format" ];
 
@@ -22,12 +26,11 @@ stdenv.mkDerivation rec {
        sed -i "$i" -e "s|/usr/X11R6|${libX11.dev}|g ; s|-lICE|-lX11 -lICE|g"
      done '';
 
-  buildPhase = ''
-     make PREFIX="$out" '';
-  installPhase = ''
-     make install PREFIX="$out" '';
+   installPhase = ''
+     make DESTDIR=$out install
+     '';
 
-  meta = {
+   meta = {
     description = "Themeable process stack of system monitors";
     longDescription =
       '' GKrellM is a single process stack of system monitors which supports
@@ -36,9 +39,8 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html;
-    license = stdenv.lib.licenses.gpl3Plus;
-
+    license = licenses.gpl3Plus;
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = platforms.unix;
   };
 }

From 2477196fb1f4693d85844a63b714ddeb5b0453ee Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 20:44:55 -0500
Subject: [PATCH 2830/3449] gpa: 0.9.9 -> 0.9.10

---
 pkgs/applications/misc/gpa/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index 600a54931217..ef805a31567a 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }:
 
 stdenv.mkDerivation rec {
-  name = "gpa-0.9.9";
+  name = "gpa-0.9.10";
 
   src = fetchurl {
     url = "mirror://gnupg/gpa/${name}.tar.bz2";
-    sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38";
+    sha256 = "09xphbi2456qynwqq5n0yh0zdmdi2ggrj3wk4hsyh5lrzlvcrff3";
   };
 
-  buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ];
+  nativeBuildInputs = [ intltool pkgconfig ];
+  buildInputs = [ gtk2 gpgme libgpgerror libassuan ];
 
   meta = with stdenv.lib; {
     description = "Graphical user interface for the GnuPG";

From edf32f90e6ab4af0e6a53466654dae4a4447aced Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 14:46:55 -0500
Subject: [PATCH 2831/3449] plasma5: 5.9.3 -> 5.9.4

---
 pkgs/desktops/plasma-5/fetch.sh               |   2 +-
 pkgs/desktops/plasma-5/srcs.nix               | 320 +++++++++---------
 .../libraries/kde-frameworks/kio/default.nix  |   9 +-
 3 files changed, 162 insertions(+), 169 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index acf7f54f0ed8..cf9327d7a60d 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.3/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index eff7a816a09a..c156de40caed 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,323 +3,323 @@
 
 {
   bluedevil = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/bluedevil-5.9.3.tar.xz";
-      sha256 = "0cfk0khcd62ficsmpxhiqwfdgwzv771ndlf0s7b8ghqqyckq6bld";
-      name = "bluedevil-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/bluedevil-5.9.4.tar.xz";
+      sha256 = "1a31vsaiy7kzbw79kjiia5a966xc9ba3phxhyqmdzvllf9jw5xdc";
+      name = "bluedevil-5.9.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-5.9.3.tar.xz";
-      sha256 = "0f1h7ky9chsnbm8r85lwipc1sh7kb32jdaj3wl9qd7k0q4j115x0";
-      name = "breeze-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-5.9.4.tar.xz";
+      sha256 = "07i13g9iyq9j2vx22z7krnkahil3qljxpzgmqai8m67gwhgvn1zj";
+      name = "breeze-5.9.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-grub-5.9.3.tar.xz";
-      sha256 = "1hbvmyj1f5f8v0pc70w93ck27xw25m4x70vnbhgqi91y5dd1gh49";
-      name = "breeze-grub-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-grub-5.9.4.tar.xz";
+      sha256 = "0rn7dgmw495575lcsnlgvx8r8sjjaaw3b1s0l43d2r186zay0nkr";
+      name = "breeze-grub-5.9.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-gtk-5.9.3.tar.xz";
-      sha256 = "12qa4wllgr52ycdprlxq0h4pgykbbs0vbmmmiardpzlrplm0an26";
-      name = "breeze-gtk-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-gtk-5.9.4.tar.xz";
+      sha256 = "1xjrhi6cq5dd5qslphdjrg018ni1z9xdac7cg33wl8bsvzcl0xgl";
+      name = "breeze-gtk-5.9.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/breeze-plymouth-5.9.3.tar.xz";
-      sha256 = "0vz0hgx3hl03h4rkfrcaydaddljam3jbg6gd7n600a068p74s2mm";
-      name = "breeze-plymouth-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/breeze-plymouth-5.9.4.tar.xz";
+      sha256 = "1vwlvnbsc67xzqvrpgkva1rlim075x9ffjlsxfk38gmq00b7s88g";
+      name = "breeze-plymouth-5.9.4.tar.xz";
     };
   };
   discover = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/discover-5.9.3.tar.xz";
-      sha256 = "0xkf08k4jz5ym406bpnjf3xsx0il9wka4jp2k38bkl3sxh2s900f";
-      name = "discover-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/discover-5.9.4.tar.xz";
+      sha256 = "1pf2qawa32x94ljqscfbpmkbxk5awlqbf9jw9w7rfqwd5z9cgzzf";
+      name = "discover-5.9.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kactivitymanagerd-5.9.3.tar.xz";
-      sha256 = "0ywby3ijq4hjljy5qwd7rybpk2x4scairjffiy5n1jg7lq6sm44r";
-      name = "kactivitymanagerd-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kactivitymanagerd-5.9.4.tar.xz";
+      sha256 = "04i4zmbblsx3xz3vq4m88qd3ky0r5v26ivjchzpcpgkczqv85x1j";
+      name = "kactivitymanagerd-5.9.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kde-cli-tools-5.9.3.tar.xz";
-      sha256 = "1p9zjp9jmknyh82d6av3xhy461fsdppjxrxbmrlm9z6nsjyp0m0a";
-      name = "kde-cli-tools-5.9.3.tar.xz";
+      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";
     };
   };
   kdecoration = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kdecoration-5.9.3.tar.xz";
-      sha256 = "1z37llaqf9mrb4aif75dfvbhr51rrgfpncv70v916jddcf90q4i9";
-      name = "kdecoration-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kdecoration-5.9.4.tar.xz";
+      sha256 = "12cfp4svhxfygbjhymnmwyryx6r117mkdy2iq9adbq5af3gak972";
+      name = "kdecoration-5.9.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kde-gtk-config-5.9.3.tar.xz";
-      sha256 = "1wxk3brwq105258ndx5l98n78q2h2idigkpp5s2xzmzw05m3gg6r";
-      name = "kde-gtk-config-5.9.3.tar.xz";
+      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";
     };
   };
   kdeplasma-addons = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kdeplasma-addons-5.9.3.tar.xz";
-      sha256 = "1k3fsrafrd72qymyi2ij36al7k92mnssz90kmmh830pszif16js3";
-      name = "kdeplasma-addons-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kdeplasma-addons-5.9.4.tar.xz";
+      sha256 = "019d3d3pkw1c6l7dggasr7g7yj9kl3xd2hsawch1s9ba420fd6fp";
+      name = "kdeplasma-addons-5.9.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kgamma5-5.9.3.tar.xz";
-      sha256 = "02s3j1c5gjcv7b79448sizs6hdw91jysq9prkzznprw6jbb615v1";
-      name = "kgamma5-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kgamma5-5.9.4.tar.xz";
+      sha256 = "0qwgjdrjfc48d8j62iwz6d61nxd7ddcsxn7wmxgbgl3l36p5j0jv";
+      name = "kgamma5-5.9.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/khotkeys-5.9.3.tar.xz";
-      sha256 = "0jv77rpx01cl15qf9vzndpks2q2lgq8dhjq4pg34zh8khr03snlf";
-      name = "khotkeys-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/khotkeys-5.9.4.tar.xz";
+      sha256 = "0lhgkvnrzsxpw6vpn0xam1a4dgkfb0k9h3nchaf93fyl8745j4q0";
+      name = "khotkeys-5.9.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kinfocenter-5.9.3.tar.xz";
-      sha256 = "14zaqrjf77008dc5c071hw75vd4dwvvmgkyz74vhs94i7bspzy6a";
-      name = "kinfocenter-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kinfocenter-5.9.4.tar.xz";
+      sha256 = "14vf27s501r6ac2gxashwi3ynlcncjp03rahz61wry1dsm9wsc4x";
+      name = "kinfocenter-5.9.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kmenuedit-5.9.3.tar.xz";
-      sha256 = "1m7naiy6jq031psdx4jsxq7vsldn9j4girq820m24inh2ky105zk";
-      name = "kmenuedit-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kmenuedit-5.9.4.tar.xz";
+      sha256 = "1lx7g67qc7amx8jsna7b13hhq85pv4969d9824qfciwywj19sx4x";
+      name = "kmenuedit-5.9.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kscreen-5.9.3.tar.xz";
-      sha256 = "1z3cihgjqrkg5h4y4gm1ah60r0vfpxrngry10fcc6343arbyk1bb";
-      name = "kscreen-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kscreen-5.9.4.tar.xz";
+      sha256 = "1g4i4rwnmni3q3crbywkp0s199bp0bl8cx97d37cp9qh6drsgrxx";
+      name = "kscreen-5.9.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kscreenlocker-5.9.3.tar.xz";
-      sha256 = "0ccpgfp1gz07yiw98sqjlc097cac4z9qdcrwxm65bvqjj777by1a";
-      name = "kscreenlocker-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kscreenlocker-5.9.4.tar.xz";
+      sha256 = "0cn194bmab7qgv1x7gg81l0mj3k9x1is9whn8h7g02pzn5c6gqlj";
+      name = "kscreenlocker-5.9.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/ksshaskpass-5.9.3.tar.xz";
-      sha256 = "0jk6k5bn2aqjjl3li5qpmihk57d5hc197cpqjaj61a0bapab42hw";
-      name = "ksshaskpass-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/ksshaskpass-5.9.4.tar.xz";
+      sha256 = "1w1m55i8i9f3npcczqiy1knarbh2j4cp8ispif1s4j6k3vixqnka";
+      name = "ksshaskpass-5.9.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/ksysguard-5.9.3.tar.xz";
-      sha256 = "0paypcwah41p2ygmfwzhw8mdfh47a6x0190yngxn8j0jhzfyllca";
-      name = "ksysguard-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/ksysguard-5.9.4.tar.xz";
+      sha256 = "04hzqkna22vsa12z04cy50s2jzglllfhd5vz33vk2wj6zgghwd0h";
+      name = "ksysguard-5.9.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwallet-pam-5.9.3.tar.xz";
-      sha256 = "1pmsfp6pn1r3crg5z5v7sz413v9qvn0j4n9l88zbw538lz2scpna";
-      name = "kwallet-pam-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwallet-pam-5.9.4.tar.xz";
+      sha256 = "0l6ganmp2ml0icfkrqcq4vngm8f4pl76p6w13a3m8x2k2wrsbynw";
+      name = "kwallet-pam-5.9.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwayland-integration-5.9.3.tar.xz";
-      sha256 = "1r3cryv10lkvl1nrpq21w4kj9jd270m3p3dw07d888b891rgmzb7";
-      name = "kwayland-integration-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwayland-integration-5.9.4.tar.xz";
+      sha256 = "11vqi293azv5cpz2rrngxsqqaj7swcmxivgm688yz6wzbm8gyd1x";
+      name = "kwayland-integration-5.9.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwin-5.9.3.tar.xz";
-      sha256 = "119cy472x5ssrr54v14pbs85gfrsjhz99ms8flb1xp38jb14xxhk";
-      name = "kwin-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwin-5.9.4.tar.xz";
+      sha256 = "0qckhk6vd31mwhawb0i636l4vx99v0v84nam2dhpd0rcdk2b0dm1";
+      name = "kwin-5.9.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/kwrited-5.9.3.tar.xz";
-      sha256 = "0liqspd4m6xly48vv85abnaxfvsjcbgg58843j9fpnzkk9nlj98q";
-      name = "kwrited-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/kwrited-5.9.4.tar.xz";
+      sha256 = "1prbn0f6a1cywn2ivzv39bxfc5nxmgxp7gqlxqg87ajig43gvdb7";
+      name = "kwrited-5.9.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/libkscreen-5.9.3.tar.xz";
-      sha256 = "1nxhbxmr0kmyp745bf3vd21xcjpv7jac9bdagraiqfcmwj4f86gb";
-      name = "libkscreen-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/libkscreen-5.9.4.tar.xz";
+      sha256 = "1h39910ry59wd179fk02ck10ydaby3il4q3rnxlnn9qph0kiy3pv";
+      name = "libkscreen-5.9.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/libksysguard-5.9.3.tar.xz";
-      sha256 = "0fj7rycawarg7iydml0xw20nkyxlwa2nl5chxbbcs5mnmvpfv6ig";
-      name = "libksysguard-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/libksysguard-5.9.4.tar.xz";
+      sha256 = "1gpfqr8prk96vwy9dkxlgf4lc3ck04a31src9mix8a6wrr01ppqm";
+      name = "libksysguard-5.9.4.tar.xz";
     };
   };
   milou = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/milou-5.9.3.tar.xz";
-      sha256 = "1pmk9czmpz0mfqmkv7gl9wdlj8b7wwixv1zb43q24a471qby2xf3";
-      name = "milou-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/milou-5.9.4.tar.xz";
+      sha256 = "18xzx99ml6gcglly9p98rscs6dxhdgn9pkc5mn7apwnp7865kbfw";
+      name = "milou-5.9.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/oxygen-5.9.3.tar.xz";
-      sha256 = "1v529wp9ll1hzb48xswigzf2r23k84f4cd7am2fnj73p3a0rg5ia";
-      name = "oxygen-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/oxygen-5.9.4.tar.xz";
+      sha256 = "0fmysq3j0v18hz6hfp7qgrj3ghmaf3c1gam9c9263sf9q1dghk0q";
+      name = "oxygen-5.9.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-desktop-5.9.3.tar.xz";
-      sha256 = "0582n21nd15834mxc54pq1nx9a5z8ds3yz0x0lc5m35ps7abh7im";
-      name = "plasma-desktop-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-desktop-5.9.4.tar.xz";
+      sha256 = "1p3iq5rmfznsi4174zjavs945wysf763ha46vd83mz0w7583j6cd";
+      name = "plasma-desktop-5.9.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-integration-5.9.3.tar.xz";
-      sha256 = "1yq3i0sqsn0m2y62npyad1nv17hgc0fm35cfq5fdjd96sr356znl";
-      name = "plasma-integration-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-integration-5.9.4.tar.xz";
+      sha256 = "1mk59p214184m2q8wfik8gkfxxikrvric0v8c09lamybg15pas8m";
+      name = "plasma-integration-5.9.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-nm-5.9.3.tar.xz";
-      sha256 = "1i5djnbimkwcbjh6bi0cdw98qskli4jd1c8a8dbwqqh5pyqbrf66";
-      name = "plasma-nm-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-nm-5.9.4.tar.xz";
+      sha256 = "0sbvyyhx7gxg1li5y1h7jv1s3krp2ch6zzhm9ad1l17w589kij9x";
+      name = "plasma-nm-5.9.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-pa-5.9.3.tar.xz";
-      sha256 = "0br83bnm6g7lzw4hwkppk8l6scbzblr3m3mi64a852lnxxvdwn01";
-      name = "plasma-pa-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-pa-5.9.4.tar.xz";
+      sha256 = "0hincgm6x613sw3mywq64i27laahqzy7qjiv24g8h3ppw75a32i8";
+      name = "plasma-pa-5.9.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-sdk-5.9.3.tar.xz";
-      sha256 = "104rhybchdjqnglzp3bpjv8052n2gi44bn58nyb6wz6gkzg3xzrb";
-      name = "plasma-sdk-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-sdk-5.9.4.tar.xz";
+      sha256 = "0nw49kaw7323dmaq8hh4zrhvy6ga6svg2g0zhxj0cjjwgbk31pfw";
+      name = "plasma-sdk-5.9.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-tests-5.9.3.tar.xz";
-      sha256 = "1wpbfna9yjvzc5fhgnw2hwnq04vzb3qfy42zrwbijy8sl6csgzzp";
-      name = "plasma-tests-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-tests-5.9.4.tar.xz";
+      sha256 = "0m6dlx29785kh1pxm0xyym85k475s8gdjds6ywgpblj9lh5rm4v5";
+      name = "plasma-tests-5.9.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-5.9.3.tar.xz";
-      sha256 = "0lnb36qnkw5z7w1y5ykiz6xfhc4h21dzlbhddipvd97bxycad6vg";
-      name = "plasma-workspace-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/plasma-workspace-5.9.4.tar.xz";
+      sha256 = "0pazgn45a445wknd3xp7jnsg6k5ddqv4pjrz2ggkbaz9mrllgbqm";
+      name = "plasma-workspace-5.9.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-wallpapers-5.9.3.tar.xz";
-      sha256 = "1ikjj41nn5hn9r3glfhqsizawhkpw3cvybqq0ym4zky9lvbxzxb0";
-      name = "plasma-workspace-wallpapers-5.9.3.tar.xz";
+      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";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.9.3";
+    version = "1-5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/polkit-kde-agent-1-5.9.3.tar.xz";
-      sha256 = "0kfafag3bqp03aaa5dn7f8mkc174s80mwn98linl1dn12np2wv2q";
-      name = "polkit-kde-agent-1-5.9.3.tar.xz";
+      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";
     };
   };
   powerdevil = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/powerdevil-5.9.3.tar.xz";
-      sha256 = "1sphmngckfns5sx0n95njf39m02fg3q7bdafwrw8i4lv2svb1axj";
-      name = "powerdevil-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/powerdevil-5.9.4.tar.xz";
+      sha256 = "1fpp06criw51lpg21f3xm4gd9yzjj08lr5j8908qz2dywqlp91rv";
+      name = "powerdevil-5.9.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/sddm-kcm-5.9.3.tar.xz";
-      sha256 = "142na2cnx5v459798fq6gx30k9v0i10myfyvgv562n1x79nbkyl0";
-      name = "sddm-kcm-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/sddm-kcm-5.9.4.tar.xz";
+      sha256 = "1zrda4vzvqh6vs93yl2g4b63siqb5cqhrp4kknzm571djiar26ll";
+      name = "sddm-kcm-5.9.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/systemsettings-5.9.3.tar.xz";
-      sha256 = "15ihvbkp91dz1z1z5dqgqyziiklzq2zkl3ns8dqzs3pbpki7jbqc";
-      name = "systemsettings-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/systemsettings-5.9.4.tar.xz";
+      sha256 = "03h5dagghjg6qhjbf0fnlhwh2v1nh7w22g00g1qzi8yrads1icy1";
+      name = "systemsettings-5.9.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.9.3";
+    version = "5.9.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.3/user-manager-5.9.3.tar.xz";
-      sha256 = "1s91zgh1rcqrpyh9fiklwqj2m78ify5fv83kh9zvyl4bapgyb0gn";
-      name = "user-manager-5.9.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.9.4/user-manager-5.9.4.tar.xz";
+      sha256 = "1cjwkxb5qzj8sbkhcyyzw1axzddb2pwbd16wmaqpiz9qh2k4mr64";
+      name = "user-manager-5.9.4.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 1d37c794674b..3f4ae5a25c2b 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -17,12 +17,5 @@ kdeFramework {
     ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
     qtx11extras
   ];
-  patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series))
-    ++ [
-      (fetchpatch {
-        name = "SanitizeURLsBeforePassingThemToFindProxyForURL.patch";
-        url = "https://cgit.kde.org/kio.git/patch/?id=f9d0cb47cf94e209f6171ac0e8d774e68156a6e4";
-        sha256 = "1s6rcp8rrlhc6rgy3b303y0qq0s8371n12r5lk9zbkw14wjvbix0";
-      })
-    ];
+  patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
 }

From 6a1e5cc2fa1c607197778b0574237f74f6180bec Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 22 Mar 2017 15:10:38 -0500
Subject: [PATCH 2832/3449] kdeFrameworks: 5.31 -> 5.32

---
 .../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 263f811ebc62..7343b408dff9 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.31/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.32/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index f879005da1d0..4b902d4d57e5 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/attica-5.31.0.tar.xz";
-      sha256 = "0gfqxaqvw05rdgjqs2cn5bgnmijcsl16myf919fdc75xkdpg1h56";
-      name = "attica-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/attica-5.32.0.tar.xz";
+      sha256 = "16vl3gpwqcvfms82grv1bvqlxj085bqssv5ixjx007826pd8qhp5";
+      name = "attica-5.32.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/baloo-5.31.0.tar.xz";
-      sha256 = "0n3cwq7g9zik3xjp895vl1j62b538rg6zcsm2x4h2nnq3njrnfbz";
-      name = "baloo-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/baloo-5.32.0.tar.xz";
+      sha256 = "0a4qwinkp4gmcbx4j0qxbj5qb40h7594s39za7sc7bymadicasy1";
+      name = "baloo-5.32.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/bluez-qt-5.31.0.tar.xz";
-      sha256 = "12g9jc6b8f03dka5sbjf19g536y8d1xvzkrwp2m0w98zcd0q33jl";
-      name = "bluez-qt-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/bluez-qt-5.32.0.tar.xz";
+      sha256 = "0pl6cp0rgjkh7d06ik35rw7qd96j5sh2flgjx4vi21zl5vf3vgyh";
+      name = "bluez-qt-5.32.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/breeze-icons-5.31.0.tar.xz";
-      sha256 = "1ylask25jrwyk53c81jy73k9i8cylnab3a42yyrf3f25qbvhr845";
-      name = "breeze-icons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/breeze-icons-5.32.0.tar.xz";
+      sha256 = "1n51kahzk09v52yhi7k4kqgavqlz3ghqv5cx2ssz2djpyavs18r3";
+      name = "breeze-icons-5.32.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/extra-cmake-modules-5.31.0.tar.xz";
-      sha256 = "1srdvjgn72687r48f0x32vn7q5czvk9k1w1393bcws2l0icil9w4";
-      name = "extra-cmake-modules-5.31.0.tar.xz";
+      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";
     };
   };
   frameworkintegration = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/frameworkintegration-5.31.0.tar.xz";
-      sha256 = "1wfiny11fm0k6w1ly7ca7xj3f7a1mn3b1gpvlcpaqbrib6b3dgcj";
-      name = "frameworkintegration-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/frameworkintegration-5.32.0.tar.xz";
+      sha256 = "022scc4pgl68973wq29l1kc9j9lspvlmpr3bc6zlyg57m8agapwa";
+      name = "frameworkintegration-5.32.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kactivities-5.31.0.tar.xz";
-      sha256 = "1v33pkjwjjp6lrqhch7l66xyyvln1pgbs0wbgi8q9c024s92jqqz";
-      name = "kactivities-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kactivities-5.32.0.tar.xz";
+      sha256 = "0xin4shaj0zsfsww84mwk5n4ldaqy730jhc369px2j2nq57sg9g7";
+      name = "kactivities-5.32.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kactivities-stats-5.31.0.tar.xz";
-      sha256 = "1ngydmby0dzf802bjszhn3qsc0vgrhc0ya511x7jc9h49mgbp2jy";
-      name = "kactivities-stats-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kactivities-stats-5.32.0.tar.xz";
+      sha256 = "1b3z7bcap3vjc0155y0a9xkbd477fklmpj8dr3rs0ccyc6qxxbvw";
+      name = "kactivities-stats-5.32.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kapidox-5.31.0.tar.xz";
-      sha256 = "1lnqcgmxdy8l0qzn2jb9kww2lg1a33izw0hy78fkm7drg67g26za";
-      name = "kapidox-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kapidox-5.32.0.tar.xz";
+      sha256 = "1z6hdsppwrmqkcanrppxhqcrjvblg9i02rh3bz5m3pn66wwz0sdw";
+      name = "kapidox-5.32.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/karchive-5.31.0.tar.xz";
-      sha256 = "1yafkgd5q9j1y3shivh5jayc4pss1skzyf3f1rmzl4psn2r6rsay";
-      name = "karchive-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/karchive-5.32.0.tar.xz";
+      sha256 = "1dzvphqnc09mmaydqggpxg6zwwyr56p6l4jdf1rf6ns90fzxy0m4";
+      name = "karchive-5.32.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kauth-5.31.0.tar.xz";
-      sha256 = "0y4gc3n8d36wrpdmgq2jif82lkqr3xhb7v8lgg6kgaxb1d7fi2r8";
-      name = "kauth-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kauth-5.32.0.tar.xz";
+      sha256 = "00kdq16n9w6nf1bpwzl5lp5c2xq74g8nn6081kvnjcd4ld66ncmq";
+      name = "kauth-5.32.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kbookmarks-5.31.0.tar.xz";
-      sha256 = "0xdrx3gr291gkrfj360pw3aax0mz0zhhvjw7c4fcp35m0sqg1kvp";
-      name = "kbookmarks-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kbookmarks-5.32.0.tar.xz";
+      sha256 = "03a024phcjv46afbp5lbmj2p8hb6srfzyaslc6ln6ms473bf5k4w";
+      name = "kbookmarks-5.32.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcmutils-5.31.0.tar.xz";
-      sha256 = "00ngh556sxswrfhhy5vkfi8sk5jbb0srvx4np49xwpmh5xb6qzk9";
-      name = "kcmutils-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcmutils-5.32.0.tar.xz";
+      sha256 = "1mr9h7wc22bfrbm92ajsjfcs16c5xpkrxbxzcma3a0s7jhy6qrm9";
+      name = "kcmutils-5.32.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcodecs-5.31.0.tar.xz";
-      sha256 = "1nyn4b61ymbxv1xnbq3z79dbvapsy6jg51w52l0gnqkiy2zlbz13";
-      name = "kcodecs-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcodecs-5.32.0.tar.xz";
+      sha256 = "0yybkp52i8nm4qjady6jqswn6v70cqbvjqwgrghjnc88b2cly253";
+      name = "kcodecs-5.32.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcompletion-5.31.0.tar.xz";
-      sha256 = "0jx1lsz1fh8h20a5ixdv9q5yx6r5r7jr8hi68v7b66anmpnh2m3g";
-      name = "kcompletion-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcompletion-5.32.0.tar.xz";
+      sha256 = "0fn8imr3m219r38a0rafbnylcpjq4rqhz1w66mx80sc7l10mhcni";
+      name = "kcompletion-5.32.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kconfig-5.31.0.tar.xz";
-      sha256 = "1z9jf5rizdj7c7x918zmdv4v01glpl3z44mrx7yfp2cqnjniwhxi";
-      name = "kconfig-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kconfig-5.32.0.tar.xz";
+      sha256 = "1pajh1l08b995shp6l75ri9z4vr6wjapvrkmrmv8hksnxvfi97dp";
+      name = "kconfig-5.32.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kconfigwidgets-5.31.0.tar.xz";
-      sha256 = "19y3s5qcb3mzw8xiyp57zb2sjclcmxzj3xp0iwzs41r4lqmlwajs";
-      name = "kconfigwidgets-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kconfigwidgets-5.32.0.tar.xz";
+      sha256 = "1cq0a3k6pvl9f098ssqqk2rddxh0xn1kk4p5kfyd7w0m3c604zw3";
+      name = "kconfigwidgets-5.32.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcoreaddons-5.31.0.tar.xz";
-      sha256 = "0175vgii8l5yx1bbbjljblkkq03nqfhb3v7in2657glag6imcb7m";
-      name = "kcoreaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcoreaddons-5.32.0.tar.xz";
+      sha256 = "1n1xzvwwji9pwyxrvwp4rmpc7qzp9nlis26xmn81k607jn587ksx";
+      name = "kcoreaddons-5.32.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kcrash-5.31.0.tar.xz";
-      sha256 = "0mj6dahalwks39d881nvmrd3rqm2aid06iq6s8p2grhnncf6cd4j";
-      name = "kcrash-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kcrash-5.32.0.tar.xz";
+      sha256 = "1zrkjrpj88ymdy5vbn9db73vxppswvmbn2gkn4gpx773dsmflhz3";
+      name = "kcrash-5.32.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdbusaddons-5.31.0.tar.xz";
-      sha256 = "1dv9yzicd2d1k0qjgjbryks0f6s0v76hr0csdb7j22nwn9pb4cfk";
-      name = "kdbusaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdbusaddons-5.32.0.tar.xz";
+      sha256 = "1a15jjsrkza0ll2viyk834pgdxsdgdacm0982xxwl5z937f75609";
+      name = "kdbusaddons-5.32.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdeclarative-5.31.0.tar.xz";
-      sha256 = "0hw3rkmlw6j056b3wvhpaj778xfxajcqidpf5x3nyfjmqjvxsgw1";
-      name = "kdeclarative-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdeclarative-5.32.0.tar.xz";
+      sha256 = "1y5g3yi1l0g1mkqhhakg265r25zm23qc2fqg55rq0g7l9ss7w7g9";
+      name = "kdeclarative-5.32.0.tar.xz";
     };
   };
   kded = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kded-5.31.0.tar.xz";
-      sha256 = "0zsikbzi8i8bmlpa4kgdpcpsifkwwclsfdgafd7yf5svc4hyyl51";
-      name = "kded-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kded-5.32.0.tar.xz";
+      sha256 = "0pmmsvqwkw86yvxxf9i6lg13vg80m0kmhjjs88lbm60cgvr5jhq6";
+      name = "kded-5.32.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kdelibs4support-5.31.0.tar.xz";
-      sha256 = "1yh4lr56mnwsbc0gysj1c58w1r62dlxxds16xnp5j0lyir7wx0pl";
-      name = "kdelibs4support-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kdelibs4support-5.32.0.tar.xz";
+      sha256 = "1wan5ad5rhhrwvwjjjd87n790r6d8r118gs2kw49s91pdj3iv9pb";
+      name = "kdelibs4support-5.32.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdesignerplugin-5.31.0.tar.xz";
-      sha256 = "1g510f8dfvaddcq5hrvsaiwayp2hzkdryzn62zff29ipd7qpcd2x";
-      name = "kdesignerplugin-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdesignerplugin-5.32.0.tar.xz";
+      sha256 = "1hapj8x8nky3m6lx2ianmxwprf00jqyjsknjz3pi4vk3i714vhnf";
+      name = "kdesignerplugin-5.32.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdesu-5.31.0.tar.xz";
-      sha256 = "0mzvvr3zz28pgp42i3f54g5k3wplvjdg41d8jb9k6m5qcj8aryax";
-      name = "kdesu-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdesu-5.32.0.tar.xz";
+      sha256 = "0zsy1hivy5bbczrpkpgj72mlx0km2nm53kpgrj2hfdy3ss0vn3hl";
+      name = "kdesu-5.32.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdewebkit-5.31.0.tar.xz";
-      sha256 = "0x9v8i37apbik2krxr9n2pgq5xmcgjlhzflbrwwqaq30c2l8aid0";
-      name = "kdewebkit-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdewebkit-5.32.0.tar.xz";
+      sha256 = "0y7262pqzdx0hxkyqrbawgx99rn6q85m1slr4nbn914kn350xpy0";
+      name = "kdewebkit-5.32.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdnssd-5.31.0.tar.xz";
-      sha256 = "1bbk9qsvx49zbjvdg0xi9s2x51f331n8wnyd320j3ay0mp4yq2kk";
-      name = "kdnssd-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdnssd-5.32.0.tar.xz";
+      sha256 = "1xakbs2wm627zn01ni8fyrz64xl5jw4by0pdrb70aad7w37dijrw";
+      name = "kdnssd-5.32.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kdoctools-5.31.0.tar.xz";
-      sha256 = "1m7l4bk5h75mcrgislp4rc7fj1szv1ij30y5yizncg2c3aq2czxk";
-      name = "kdoctools-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kdoctools-5.32.0.tar.xz";
+      sha256 = "0i7zgg7iw6w0sdr6cv3yf4blcr61i8zczgmyqa964ka6p3ywwjs9";
+      name = "kdoctools-5.32.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kemoticons-5.31.0.tar.xz";
-      sha256 = "0zvps3jrx02dzy82mwf5l7dirpnj616081yhkp2m0xw3qa3i16xk";
-      name = "kemoticons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kemoticons-5.32.0.tar.xz";
+      sha256 = "1ncjs9iy6z6rhk83ff7fj1b68rkylnry0h698rh4jvs98gpw8sgj";
+      name = "kemoticons-5.32.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kfilemetadata-5.31.0.tar.xz";
-      sha256 = "123cin3fhai85zzz5hfr6h87cjrqvsyl9i809j7q0fshjx8c9wpd";
-      name = "kfilemetadata-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kfilemetadata-5.32.0.tar.xz";
+      sha256 = "01d91gmrxlax0g13ib841vc4qwmv6r4qdr10wfs77rrxsvw7z08f";
+      name = "kfilemetadata-5.32.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kglobalaccel-5.31.0.tar.xz";
-      sha256 = "1l7phfk17z9rrdlcjz97zyyqlj9pps0gdpphrfqrz1fyx5ifybmc";
-      name = "kglobalaccel-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kglobalaccel-5.32.0.tar.xz";
+      sha256 = "0dxwjznnqlgnvn15pl34rxlzk3i21cvzn8xbgqmxakny8qiib9ry";
+      name = "kglobalaccel-5.32.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kguiaddons-5.31.0.tar.xz";
-      sha256 = "0bvjnbsskps2pfh0y72klxfanm54c0iflll5awaps750flb3bbp3";
-      name = "kguiaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kguiaddons-5.32.0.tar.xz";
+      sha256 = "0rbfd0rykmwl9hs1q22pqg2by8vi9y1pgs2ishgnan4sc4w87wjb";
+      name = "kguiaddons-5.32.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/khtml-5.31.0.tar.xz";
-      sha256 = "19pf3ir3r8igrx3h90sn383kxmyjdxgmwaw66p6vjb83243dy57h";
-      name = "khtml-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/khtml-5.32.0.tar.xz";
+      sha256 = "1bkxfldw55khycbpcqpwi86rpv6qyqsndvjncfd5a5knnsynwdyf";
+      name = "khtml-5.32.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/ki18n-5.31.0.tar.xz";
-      sha256 = "1q496i4a3kq2bfxpfnz6bfxk2shfdshrxcf253ab58l76l3jcy9g";
-      name = "ki18n-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/ki18n-5.32.0.tar.xz";
+      sha256 = "068xvw2hy4hlpj85wgjjdj0nc37fygpd8wb1dnpqcvzzy8rc1rsf";
+      name = "ki18n-5.32.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kiconthemes-5.31.0.tar.xz";
-      sha256 = "0kangszmlhzbwvvplnxk2i938xl8j8jpd8kpf2n9skxkqfd19qr5";
-      name = "kiconthemes-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kiconthemes-5.32.0.tar.xz";
+      sha256 = "00azbyk5y3jgdqv03a2nd0627kdkhq1bkghvw7w62kcnih9k8lq5";
+      name = "kiconthemes-5.32.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kidletime-5.31.0.tar.xz";
-      sha256 = "03ajdhxv2jdggqhy02s6xgbaf4pa2chj0f6d5kgz9r0wx6kxmh25";
-      name = "kidletime-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kidletime-5.32.0.tar.xz";
+      sha256 = "0rkxx3bnspjwm4vcy4rdfahk6vcfpkh8fldww0zfdn7s7pigqwch";
+      name = "kidletime-5.32.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kimageformats-5.31.0.tar.xz";
-      sha256 = "17cz2xmmm5g55kndq983vy6cg7adpbiw7ahn0lpvviinnsf53s12";
-      name = "kimageformats-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kimageformats-5.32.0.tar.xz";
+      sha256 = "05hn8n4sc3rj5c30ki068f76k1gfgvq19zcw5jlqpnn1l5db5fvz";
+      name = "kimageformats-5.32.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kinit-5.31.0.tar.xz";
-      sha256 = "082kq25163x40bq12x84ccrk3zrzmn5xpb5m4zgi06zcvzb8rl9l";
-      name = "kinit-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kinit-5.32.0.tar.xz";
+      sha256 = "0103lflppdw55l9xiqs68lzaq9897m5qnkmy6fp7dm9wfh9aplqn";
+      name = "kinit-5.32.0.tar.xz";
     };
   };
   kio = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kio-5.31.0.tar.xz";
-      sha256 = "1rry7v9g2430hkz44b4xjcbs3lr64srs8822a52vx1w69jpkn5s9";
-      name = "kio-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kio-5.32.0.tar.xz";
+      sha256 = "19da02l0aj0l07x9bbklhvx9slci3v1d8q80jvam4vyzs4qdyjin";
+      name = "kio-5.32.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kitemmodels-5.31.0.tar.xz";
-      sha256 = "0zb9cm5v3ylqhg8l5sp3jskghm5izzihha5ik09y7fabl52cd6v5";
-      name = "kitemmodels-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kitemmodels-5.32.0.tar.xz";
+      sha256 = "0lxld7jdixpq23sycv8n4ckzmdr34aycrsf2zffziw6r59f0mzki";
+      name = "kitemmodels-5.32.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kitemviews-5.31.0.tar.xz";
-      sha256 = "04r4pd5rkdgbszyg7l050r53f38skhh2p2mi3xkz4ckci132srlv";
-      name = "kitemviews-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kitemviews-5.32.0.tar.xz";
+      sha256 = "1h1zgawdi4vbgymdl5215lx7hpcx9jqxy7vjf5hwgs6b2cls1sws";
+      name = "kitemviews-5.32.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kjobwidgets-5.31.0.tar.xz";
-      sha256 = "16grnlccmqcs84gpz62s1iz5amdwsprr76gd0q845bd49crgacfa";
-      name = "kjobwidgets-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kjobwidgets-5.32.0.tar.xz";
+      sha256 = "0lhv3mg2liija0g8x14jpv1mdhb0zjh868p1cs24bs9xrw1l8984";
+      name = "kjobwidgets-5.32.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kjs-5.31.0.tar.xz";
-      sha256 = "027n2ivh5kfmrm06xgcryxm14hbxyf83cx6rbc34093kk905ghg1";
-      name = "kjs-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kjs-5.32.0.tar.xz";
+      sha256 = "022n2hl1s5kap3pqaz4y28wn5z5qh6jcypz5kini2ic94xf7ydrg";
+      name = "kjs-5.32.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kjsembed-5.31.0.tar.xz";
-      sha256 = "1mss7lahczvwhmybxnbcynqwa56gjrxiyq79fcicybp7h7rvqw14";
-      name = "kjsembed-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kjsembed-5.32.0.tar.xz";
+      sha256 = "0h0p4mcvmdgvjv2xd8s4x2i554nh08mc258gxhb41bs6vm3yhiz4";
+      name = "kjsembed-5.32.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kmediaplayer-5.31.0.tar.xz";
-      sha256 = "0vxzw5grw53bxp0nvwmiqyw9sbpglhrnfg4d1ldlg4a1gibfijx4";
-      name = "kmediaplayer-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kmediaplayer-5.32.0.tar.xz";
+      sha256 = "1s86dfzrqxrmbqmxq4yyyy1p507d9ns6d7sy6z67dhykgahacqf4";
+      name = "kmediaplayer-5.32.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/knewstuff-5.31.0.tar.xz";
-      sha256 = "06qrgzfxrpmckyjq21ajvw08n5f5bdyqqgrnrbr1cjsfcx7xwdfl";
-      name = "knewstuff-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/knewstuff-5.32.0.tar.xz";
+      sha256 = "1i3ldy9wwnjhpgdd2d0bg4304k88riin89zqzdl52lpqa6hjl3fp";
+      name = "knewstuff-5.32.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/knotifications-5.31.0.tar.xz";
-      sha256 = "0nz5dkzgkv4mzcsg2mn9zzcqh484cyh5n1y8sx1831r808jd2wly";
-      name = "knotifications-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/knotifications-5.32.0.tar.xz";
+      sha256 = "06ap7m8c2py49pqrnhadbyl69y3nsyamzahbpwipqgh9k62sy34y";
+      name = "knotifications-5.32.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/knotifyconfig-5.31.0.tar.xz";
-      sha256 = "1zdzfqqd32ykd5ibrkssl3p47v704jxs16br1rhrr32ymv4qcbpi";
-      name = "knotifyconfig-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/knotifyconfig-5.32.0.tar.xz";
+      sha256 = "14qc6wj4j5i45vzqsvl2wlc07c6x30hb2680gwfqsvwgiaszkzv4";
+      name = "knotifyconfig-5.32.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kpackage-5.31.0.tar.xz";
-      sha256 = "1hg8f2i10wcs31xhvw40dwgbgfrwx93w5bi5wlbrw55jcs040dfr";
-      name = "kpackage-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kpackage-5.32.0.tar.xz";
+      sha256 = "070zasl5c58n01fk18mjgccfizymc9griwicxizqjgzzbgvkns3r";
+      name = "kpackage-5.32.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kparts-5.31.0.tar.xz";
-      sha256 = "093g5zsdqqyx9z69afsmgyszd807pv3wpzwn37x1glg399dsv7fa";
-      name = "kparts-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kparts-5.32.0.tar.xz";
+      sha256 = "0hrx0mdvw301nbdyw5fkvgkw60ya6kmfw6hfzmj48bws8mi33rs5";
+      name = "kparts-5.32.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kpeople-5.31.0.tar.xz";
-      sha256 = "1f71c2q8a9m463ghpq50gbhkvf5szkvvfwbamlrwwygpb89fzfjy";
-      name = "kpeople-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kpeople-5.32.0.tar.xz";
+      sha256 = "1xqi8zr76hajgyv016iaqlmnr5b84s71fbx412q153g92jglp4mk";
+      name = "kpeople-5.32.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kplotting-5.31.0.tar.xz";
-      sha256 = "15yv1rh1vlxhv77j50inq9kkwalhs2r1mjba82fnxy8z569i66cm";
-      name = "kplotting-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kplotting-5.32.0.tar.xz";
+      sha256 = "0a0pfmdlx84526lb2jvx94i2pf85km57fm2ygis4z5mjgbzsmb6v";
+      name = "kplotting-5.32.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kpty-5.31.0.tar.xz";
-      sha256 = "0hfs1gdi1fqaaki5aa9b93j4pl33g4s82yxpbyc0h9k2891aq196";
-      name = "kpty-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kpty-5.32.0.tar.xz";
+      sha256 = "0h4318rc9902cvqj69capb8lh7s84y44jd59d11fyhq21jhy152s";
+      name = "kpty-5.32.0.tar.xz";
     };
   };
   kross = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/portingAids/kross-5.31.0.tar.xz";
-      sha256 = "0lc9ijn60bw0y9nrlva2fd0hf0b4x6488jjmymrnrc8zzjnigyqp";
-      name = "kross-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/portingAids/kross-5.32.0.tar.xz";
+      sha256 = "0mgicb2rfhzp0hr1zckp1qzqzbdx0zy82mcjibrlsp7spmvynw5a";
+      name = "kross-5.32.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/krunner-5.31.0.tar.xz";
-      sha256 = "0xqayhd179387m02arxdcl1lgk8f2h0fxlzyigy6ja6wylbwphrw";
-      name = "krunner-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/krunner-5.32.0.tar.xz";
+      sha256 = "1k4rg9vqr6h5aj7v51fx3i5z9kxlfpacahs81hkwksi6if8ik4kr";
+      name = "krunner-5.32.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kservice-5.31.0.tar.xz";
-      sha256 = "0hjlcnypg96np88hgfvqd8g5z4cxgi4a0j5mnlfx65jrzpv5hsjg";
-      name = "kservice-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kservice-5.32.0.tar.xz";
+      sha256 = "02xk3ajspprmx964zhwh2l3axm4gns9h0m0pvcb1v5j8pfh9v70q";
+      name = "kservice-5.32.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/ktexteditor-5.31.0.tar.xz";
-      sha256 = "099axcwl8z4npvcrirycc82zg7sf9ac3yxrwpsp0f337gdl1qvln";
-      name = "ktexteditor-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/ktexteditor-5.32.0.tar.xz";
+      sha256 = "1sybw8k3f36mcs5qh3b51v7ynbqn4pbiiabkyxfmyi82i09m2jgw";
+      name = "ktexteditor-5.32.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/ktextwidgets-5.31.0.tar.xz";
-      sha256 = "0n0v42b4bq1f6f120bjhr69qwgnvwlhnnqsh75nl9jvv8g3lyspy";
-      name = "ktextwidgets-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/ktextwidgets-5.32.0.tar.xz";
+      sha256 = "1s2fd4n4hfkzscxv0cdfjynjzi1f57pfi9a3fp6rrm5c5645zk7r";
+      name = "ktextwidgets-5.32.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kunitconversion-5.31.0.tar.xz";
-      sha256 = "190d2v3bv7ccg2wqjmd6p46d4zz59r1mf86l2wkqw212rr59pafx";
-      name = "kunitconversion-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kunitconversion-5.32.0.tar.xz";
+      sha256 = "0crc8riwafcx6fwhgrc8vfbwmdygd6vlz1fbbgni09gamm8mbcin";
+      name = "kunitconversion-5.32.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwallet-5.31.0.tar.xz";
-      sha256 = "0r7n49ii8y1ygc7ncysjif4mrmsd9jq4yfm251m7lrp82drza26n";
-      name = "kwallet-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwallet-5.32.0.tar.xz";
+      sha256 = "0psc4n6lck9gbx2nn7mgv33x4z2r0xp1mx1xcsgy8smvalrfv5xa";
+      name = "kwallet-5.32.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwayland-5.31.0.tar.xz";
-      sha256 = "0f134spj1vz3f43bdrb93kr54s50x4a9xvkfhl3inlxmglbk3h8b";
-      name = "kwayland-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwayland-5.32.0.tar.xz";
+      sha256 = "1kzvq7qx102rfdv975x5sd37lsl6wn0mzm2m1f9fnnn2rvii3h5d";
+      name = "kwayland-5.32.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwidgetsaddons-5.31.0.tar.xz";
-      sha256 = "0yrhss1x8q4nanpq2gbzqjds9s7hjl3zzkwnd8hahh9fyg8w9815";
-      name = "kwidgetsaddons-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwidgetsaddons-5.32.0.tar.xz";
+      sha256 = "1aksy326ppdfcx20zl9hxsd8j0br32j6dlx4i1xxbd976csys9b2";
+      name = "kwidgetsaddons-5.32.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kwindowsystem-5.31.0.tar.xz";
-      sha256 = "0jzhsdfzzhxfgjqd4pl98ckbbqfwkv6qy5szh82078gxc2rf1wna";
-      name = "kwindowsystem-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kwindowsystem-5.32.0.tar.xz";
+      sha256 = "1c3kd23c4wwzdhfcyhv41czw3y2kk1492xn6ah9n3r98akrhgar1";
+      name = "kwindowsystem-5.32.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kxmlgui-5.31.0.tar.xz";
-      sha256 = "1rnznapp1vflg66k0jk8n8v9zci20bs0v88hci3rf0qfd5cmgnzr";
-      name = "kxmlgui-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kxmlgui-5.32.0.tar.xz";
+      sha256 = "1pxi4z7z3bzwcnfwq0pvjsmds401fkisyr353lyxf4rvcpwj3a65";
+      name = "kxmlgui-5.32.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/kxmlrpcclient-5.31.0.tar.xz";
-      sha256 = "1lrv1qxbfm1ss2hb171p9s3f3iwn8zfrsipin0gvfwnjrldi4fkb";
-      name = "kxmlrpcclient-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/kxmlrpcclient-5.32.0.tar.xz";
+      sha256 = "1kaczibdfdph5mpg1dldsmqb1six57w7ch3v0v7av5h6j6sx0xaq";
+      name = "kxmlrpcclient-5.32.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/modemmanager-qt-5.31.0.tar.xz";
-      sha256 = "0s2dfz9zvn6f9xpzs412iniipaai5zs9m06lpxss0w1nq5ig856r";
-      name = "modemmanager-qt-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/modemmanager-qt-5.32.0.tar.xz";
+      sha256 = "0ywyiq1kj4ya5knn0r12j9m1ig9mlyfypnrzihlvipddjrqs7jyd";
+      name = "modemmanager-qt-5.32.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/networkmanager-qt-5.31.0.tar.xz";
-      sha256 = "18wbmd4nsgwzqlp254k1ahy8iyydx59fshb3wci5sgxnsn435np4";
-      name = "networkmanager-qt-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/networkmanager-qt-5.32.0.tar.xz";
+      sha256 = "0bcy7nzfvx2xah3kxklmrjn08qbjddiny7wf7nkxsbc3kkhrxqyd";
+      name = "networkmanager-qt-5.32.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/oxygen-icons5-5.31.0.tar.xz";
-      sha256 = "0ka4zll8v8wahqg50vpm9mrxlyh9244y0yrprbwxzl9xpx113ppi";
-      name = "oxygen-icons5-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/oxygen-icons5-5.32.0.tar.xz";
+      sha256 = "05v3blgs4qbjl8s6470baahy9a98cfi3mplzp462axcgkqdj1nwf";
+      name = "oxygen-icons5-5.32.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/plasma-framework-5.31.0.tar.xz";
-      sha256 = "0hq3d96d9xhx6wqrrhnyygwajg69vfxbjc8dlpf5nwc3kqv2wim2";
-      name = "plasma-framework-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/plasma-framework-5.32.0.tar.xz";
+      sha256 = "1hrnmilc30d1kh20cky329i5ji3qyy7m4f8jzax5cgl7nrjca31h";
+      name = "plasma-framework-5.32.0.tar.xz";
     };
   };
   prison = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/prison-5.31.0.tar.xz";
-      sha256 = "0qaqj5gazby4fdq9yii67cmr04i007blhl27h9c5p169khh9ck2s";
-      name = "prison-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/prison-5.32.0.tar.xz";
+      sha256 = "0q5cs60293bdm3mynhx39rjsh87mfxngxsqa2fqm2gsqjvlciyvr";
+      name = "prison-5.32.0.tar.xz";
     };
   };
   solid = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/solid-5.31.0.tar.xz";
-      sha256 = "05rgzdzwbnmnvzkf4gz3z5i1ggwyd21y0yli7shas4i8l29kjd7m";
-      name = "solid-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/solid-5.32.0.tar.xz";
+      sha256 = "1jhymivravgix0sa0szkax50j09l5fl55xi3fbyjxlb4cil114v5";
+      name = "solid-5.32.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/sonnet-5.31.0.tar.xz";
-      sha256 = "16vzdhppb2w5vyfr332bcvw4dyw9cz4apxain28d43p0ir03xxz3";
-      name = "sonnet-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/sonnet-5.32.0.tar.xz";
+      sha256 = "17sjv48b3z5fgplsy16ilcw6p7mlqjs61ib6jqd1mqzv4xrr27yi";
+      name = "sonnet-5.32.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/syntax-highlighting-5.31.0.tar.xz";
-      sha256 = "0igd6jpbck94gl8gs5a5dgj2cxbv370prnk22037clqry6y38v1a";
-      name = "syntax-highlighting-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/syntax-highlighting-5.32.0.tar.xz";
+      sha256 = "1d9m7x53mwggwmhhba1c7b8v4f8qjql889y674ldpzs2nrk5y7x3";
+      name = "syntax-highlighting-5.32.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.31.0";
+    version = "5.32.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.31/threadweaver-5.31.0.tar.xz";
-      sha256 = "0wsdv135mxpka0rfg9zwhnzp0svfkvd4idyj38rgipxbada0hb7f";
-      name = "threadweaver-5.31.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.32/threadweaver-5.32.0.tar.xz";
+      sha256 = "1qpy2rzqyd4ap5fibkfk87z66ijh2h79cd7f0h506jh2dbx20g0h";
+      name = "threadweaver-5.32.0.tar.xz";
     };
   };
 }

From 89e2a4c390ff2a0daeadc09477958805f4d205fb Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Wed, 22 Mar 2017 20:52:41 -0500
Subject: [PATCH 2833/3449] gphoto2: 2.5.8 -> 2.5.11

---
 pkgs/applications/misc/gphoto2/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 742bdaad9966..46278f42e7bb 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,17 +3,17 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.8";
+  name = "gphoto2-2.5.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9";
+    sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r";
   };
 
-  nativeBuildInputs = [ pkgconfig gettext ];
-  buildInputs = [ libgphoto2 libexif popt libjpeg readline libtool ];
+  nativeBuildInputs = [ pkgconfig gettext libtool ];
+  buildInputs = [ libgphoto2 libexif popt libjpeg readline ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A ready to use set of digital camera software applications";
     longDescription = ''
 
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
     '';
     homepage = http://www.gphoto.org/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.jcumming ];
   };
 }

From 7d72b9b74ef70f65bd46389f59e76569301d514d Mon Sep 17 00:00:00 2001
From: Baptist BENOIST <return_0@live.com>
Date: Thu, 23 Mar 2017 03:02:09 +0100
Subject: [PATCH 2834/3449] Remove bbenoist from maintainers

Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
---
 .mention-bot                                           | 3 ++-
 lib/maintainers.nix                                    | 1 -
 pkgs/applications/editors/geany/default.nix            | 2 +-
 pkgs/applications/misc/gmrun/default.nix               | 2 +-
 pkgs/applications/misc/xfe/default.nix                 | 2 +-
 pkgs/development/libraries/fox/default.nix             | 2 +-
 pkgs/development/libraries/fox/fox-1.6.nix             | 2 +-
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.7/qtbase/default.nix | 2 +-
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix | 2 +-
 pkgs/development/libraries/vtk/default.nix             | 2 +-
 pkgs/development/qtcreator/default.nix                 | 2 +-
 pkgs/tools/text/numdiff/default.nix                    | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.mention-bot b/.mention-bot
index d8529bd9123e..33c7e41c1dc7 100644
--- a/.mention-bot
+++ b/.mention-bot
@@ -2,7 +2,8 @@
   "userBlacklist": [
     "civodul",
     "jhasse",
-    "shlevy"
+    "shlevy",
+    "bbenoist"
   ],
   "alwaysNotifyForPaths": [
     { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] },
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3baf99b1fd48..8253caa808cb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -60,7 +60,6 @@
   badi = "Badi' Abdul-Wahid <abdulwahidc@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
   Baughn = "Svein Ove Aas <sveina@gmail.com>";
-  bbenoist = "Baptist BENOIST <return_0@live.com>";
   bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
   bcdarwin = "Ben Darwin <bcdarwin@gmail.com>";
   bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>";
diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 3649beb41c67..89235514bb82 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.geany.org/;
     license = "GPL";
-    maintainers = [ maintainers.bbenoist ];
+    maintainers = [];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix
index dbff65d36518..6c712db01a5a 100644
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://sourceforge.net/projects/gmrun/";
     license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix
index 0ea1159208f4..b372cd5b2dd2 100644
--- a/pkgs/applications/misc/xfe/default.nix
+++ b/pkgs/applications/misc/xfe/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://sourceforge.net/projects/xfe/";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 8969e4bd5ba8..8ab5e7b62599 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = "http://fox-toolkit.org";
     license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index ce778e4a3473..87c6739e2e02 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = "http://fox-toolkit.org";
     license = stdenv.lib.licenses.lgpl3;
-    maintainers = [ stdenv.lib.maintainers.bbenoist ];
+    maintainers = [];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index ea04ca627284..141acfc3e574 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -286,7 +286,7 @@ 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; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
     platforms = platforms.linux;
   };
 
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 6f9ec5607122..dae1139d9615 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -307,7 +307,7 @@ 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; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
index 4bf16004ce51..f41e8da11931 100644
--- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
@@ -306,7 +306,7 @@ 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; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
     platforms = platforms.unix;
   };
 
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 280d1f9c50b4..7da02525f2de 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -265,7 +265,7 @@ 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; [ bbenoist qknight ttuegel ];
+    maintainers = with maintainers; [ qknight ttuegel ];
     platforms = platforms.linux;
   };
 
diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix
index 083f4a9140a1..5b0bdb4ee741 100644
--- a/pkgs/development/libraries/vtk/default.nix
+++ b/pkgs/development/libraries/vtk/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     description = "Open source libraries for 3D computer graphics, image processing and visualization";
     homepage = http://www.vtk.org/;
     license = stdenv.lib.licenses.bsd3;
-    maintainers = with stdenv.lib.maintainers; [ viric bbenoist ];
+    maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = with stdenv.lib.platforms; unix;
   };
 }
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index ea7e7d0fb8e3..f66070be6944 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://wiki.qt.io/Category:Tools::QtCreator";
     license = "LGPL";
-    maintainers = [ maintainers.akaWolf maintainers.bbenoist ];
+    maintainers = [ maintainers.akaWolf ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 8f22a9e7600e..96c91def9ac7 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.nongnu.org/numdiff/;
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ bbenoist ndowens ];
+    maintainers = with maintainers; [ ndowens ];
     platforms = platforms.gnu;
   };
 }

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 2835/3449] 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 5026fea0e358..e691c79d85c0 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 e68eeb29ae7f81bc3f4d057a68fecc282ec171da Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Thu, 23 Mar 2017 11:04:08 +0800
Subject: [PATCH 2836/3449] emem: 0.2.46 -> 0.2.47

---
 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 ed96ad759438..5c163fe8c441 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.46";
+  version = "0.2.47";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "1wyckyh8jknkrcd8bvlf9m16xpi85hvhz42zv80by0hvsxgsibvy";
+    sha256 = "0hz862g7k42kik9vgzskqr99321llmmakl54ay9vsykvcxs632mx";
   };
 
   phases = [ "buildPhase" "installPhase" ];

From 55ac21e81d5787428be4fa9ec0e50329eacb1f79 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Mar 2017 22:53:28 +0000
Subject: [PATCH 2837/3449] ocamlPackages.nocrypto: 0.5.3 -> 0.5.4

---
 .../ocaml-modules/nocrypto/default.nix        | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index d7f7ae0e3655..f9240f7507cf 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -1,32 +1,33 @@
-{ stdenv, buildOcaml, fetchFromGitHub, ocaml, findlib
-, cstruct, zarith, ounit, ocaml_oasis, ppx_sexp_conv, sexplib
-, lwt ? null}:
+{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, opam, topkg
+, cpuid, ocb-stubblr
+, cstruct, zarith, ocaml_oasis, ppx_sexp_conv, sexplib
+, lwt ? null
+}:
 
 with stdenv.lib;
 let withLwt = lwt != null; in
 
-buildOcaml rec {
-  name = "nocrypto";
-  version = "0.5.3";
-
-  minimumSupportedOcamlVersion = "4.02";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-nocrypto-${version}";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner  = "mirleft";
     repo   = "ocaml-nocrypto";
     rev    = "v${version}";
-    sha256 = "0m3yvqpgfffqp15mcl08b78cv8zw25rnp6z1pkj5aimz6xg3gqbl";
+    sha256 = "0nhnlpbqh3mf9y2cxivlvfb70yfbdpvg6jslzq64xblpgjyg443p";
   };
 
-  buildInputs = [ ocaml ocaml_oasis findlib ounit ppx_sexp_conv ];
+  buildInputs = [ ocaml ocaml_oasis findlib ocamlbuild topkg opam cpuid ocb-stubblr
+    ppx_sexp_conv ];
   propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt lwt;
 
-  configureFlags = [ "--enable-tests" ] ++ optional withLwt ["--enable-lwt"];
+  buildPhase = ''
+    LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \
+    ${topkg.buildPhase} --with-lwt ${if withLwt then "true" else "false"}
+  '';
+  inherit (topkg) installPhase;
 
-  configurePhase = "./configure --prefix $out $configureFlags";
-
-  doCheck = true;
-  checkTarget = "test";
   createFindlibDestdir = true;
 
   meta = {

From a81e25336978af759f5e4f24c8ce1755f54481bc Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 23 Mar 2017 06:39:50 +0000
Subject: [PATCH 2838/3449] ocamlPackages.base: init at 0.9.0

Base is a complete and portable alternative to the OCaml standard library.

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

diff --git a/pkgs/development/ocaml-modules/base/default.nix b/pkgs/development/ocaml-modules/base/default.nix
new file mode 100644
index 000000000000..4c92c7f1ca1b
--- /dev/null
+++ b/pkgs/development/ocaml-modules/base/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml, jbuilder, findlib }:
+
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-base-0.9.0";
+
+  src = fetchurl {
+    url = http://ocaml.janestreet.com/ocaml-core/v0.9/files/base-v0.9.0.tar.gz;
+    sha256 = "0pdpa3hflbqn978ppvv5y08cjya0k8xpf1h0kcak6bdrmnmiwlyx";
+  };
+
+  buildInputs = [ ocaml jbuilder findlib ];
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    license = stdenv.lib.licenses.asl20;
+    inherit (ocaml.meta) platforms;
+    homepage = https://github.com/janestreet/base;
+    description = "Full standard library replacement for OCaml";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 281375b7fdf0..8471d1a1ced7 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -49,6 +49,8 @@ let
 
     atdgen = callPackage ../development/ocaml-modules/atdgen { };
 
+    base = callPackage ../development/ocaml-modules/base { };
+
     base64 = callPackage ../development/ocaml-modules/base64 { };
 
     bolt = callPackage ../development/ocaml-modules/bolt { };

From c6c92a1d0411de000c325a5187b5b5079556ffed Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 23 Mar 2017 15:01:44 +0800
Subject: [PATCH 2839/3449] terraform: only run tests from 0.9.0 onwards

---
 pkgs/applications/networking/cluster/terraform/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index a91a28deba12..ab0771656b59 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -27,7 +27,7 @@ let
       export HOME=$TMP
     '';
 
-    doCheck = builtins.compareVersions version "0.8.8" >= 0;
+    doCheck = builtins.compareVersions version "0.9.0" >= 0;
 
     meta = with stdenv.lib; {
       description = "Tool for building, changing, and versioning infrastructure";

From 785e45ac06209295531955c0da302f72cb01e4ff Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Mar 2017 10:10:04 +0100
Subject: [PATCH 2840/3449] Revert "Revert "kmod-blacklist-ubuntu: 9.3 ->
 22.1""

This reverts commit 8c410f4b1877d3de7be5255972ef8177cdb81b9a with a fix
to make the tests run correctly. bochs-drm must not be blacklisted for
that.
---
 .../linux/kmod-blacklist-ubuntu/default.nix    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 35bf40bf835b..7137390ecabc 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, gnugrep, findutils }:
+
 let
-  version = "3ubuntu1"; # Saucy
-in
-stdenv.mkDerivation {
+  version = "22-1.1ubuntu1"; # Zesty
+
+in stdenv.mkDerivation {
   name = "kmod-blacklist-${version}";
 
   src = fetchurl {
-    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
-    sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz";
+    sha256 = "1k749g707ccb82l4xmrkp53khl71f57cpj9fzd1qyzrz147fjyhi";
   };
 
   installPhase = ''
@@ -20,6 +21,7 @@ stdenv.mkDerivation {
     done
 
     substituteInPlace "$out"/modprobe.conf \
+      --replace "blacklist bochs-drm" "" \
       --replace /sbin/lsmod /run/booted-system/sw/bin/lsmod \
       --replace /sbin/rmmod /run/booted-system/sw/bin/rmmod \
       --replace /sbin/modprobe /run/booted-system/sw/bin/modprobe \
@@ -27,9 +29,9 @@ stdenv.mkDerivation {
       --replace " xargs " " ${findutils}/bin/xargs "
   '';
 
-  meta = {
-    homepage = http://packages.ubuntu.com/source/saucy/kmod;
+  meta = with stdenv.lib; {
+    homepage = http://packages.ubuntu.com/source/zesty/kmod;
     description = "Linux kernel module blacklists from Ubuntu";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From 817d8a671cdf4eb1ba23c6f092446506c8372486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Mar 2017 11:52:37 +0100
Subject: [PATCH 2841/3449] gkrellm: fix homepage

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

diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix
index 86b6d532be45..8654e7f3a261 100644
--- a/pkgs/applications/misc/gkrellm/default.nix
+++ b/pkgs/applications/misc/gkrellm/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
          or any other theme.
       '';
 
-    homepage = http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html;
+    homepage = http://gkrellm.srcbox.net;
     license = licenses.gpl3Plus;
     maintainers = [ ];
     platforms = platforms.unix;

From a6665adde8242162d94ef69b8d387fae9c6b1b14 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 22 Mar 2017 15:40:22 +0100
Subject: [PATCH 2842/3449] grub module: fix useOSProber when installing grub
 as EFI

---
 .../system/boot/loader/grub/install-grub.pl   | 62 ++++++++++---------
 1 file changed, 32 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index c7559cd634a2..5fcac5c8c6a4 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -443,9 +443,40 @@ my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/g
 my $tmpFile = $confFile . ".tmp";
 writeFile($tmpFile, $conf);
 
+
+# check whether to install GRUB EFI or not
+sub getEfiTarget {
+    if ($grubVersion == 1) {
+        return "no"
+    } elsif (($grub ne "") && ($grubEfi ne "")) {
+        # EFI can only be installed when target is set;
+        # A target is also required then for non-EFI grub
+        if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die }
+        else { return "both" }
+    } elsif (($grub ne "") && ($grubEfi eq "")) {
+        # TODO: It would be safer to disallow non-EFI grub installation if no taget is given.
+        #       If no target is given, then grub auto-detects the target which can lead to errors.
+        #       E.g. it seems as if grub would auto-detect a EFI target based on the availability
+        #       of a EFI partition.
+        #       However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386
+        #       architectures in NixOS. That would have to be fixed in the nixos modules first.
+        return "no"
+    } elsif (($grub eq "") && ($grubEfi ne "")) {
+        # EFI can only be installed when target is set;
+        if ($grubTargetEfi eq "") { die }
+        else {return "only" }
+    } else {
+        # prevent an installation if neither grub nor grubEfi is given
+        return "neither"
+    }
+}
+
+my $efiTarget = getEfiTarget();
+
 # Append entries detected by os-prober
 if (get("useOSProber") eq "true") {
-    system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile");
+    my $targetpackage = ($efiTarget eq "no") ? $grub : $grubEfi;
+    system(get("shell"), "-c", "pkgdatadir=$targetpackage/share/grub $targetpackage/etc/grub.d/30_os-prober >> $tmpFile");
 }
 
 # Atomically switch to the new config
@@ -498,36 +529,7 @@ sub getDeviceTargets {
     }
     return @devices;
 }
-
-# check whether to install GRUB EFI or not
-sub getEfiTarget {
-    if ($grubVersion == 1) {
-        return "no"
-    } elsif (($grub ne "") && ($grubEfi ne "")) {
-        # EFI can only be installed when target is set;
-        # A target is also required then for non-EFI grub
-        if (($grubTarget eq "") || ($grubTargetEfi eq "")) { die }
-        else { return "both" }
-    } elsif (($grub ne "") && ($grubEfi eq "")) {
-        # TODO: It would be safer to disallow non-EFI grub installation if no taget is given.
-        #       If no target is given, then grub auto-detects the target which can lead to errors.
-        #       E.g. it seems as if grub would auto-detect a EFI target based on the availability
-        #       of a EFI partition.
-        #       However, it seems as auto-detection is currently relied on for non-x86_64 and non-i386
-        #       architectures in NixOS. That would have to be fixed in the nixos modules first.
-        return "no"
-    } elsif (($grub eq "") && ($grubEfi ne "")) {
-        # EFI can only be installed when target is set;
-        if ($grubTargetEfi eq "") { die }
-        else {return "only" }
-    } else {
-        # prevent an installation if neither grub nor grubEfi is given
-        return "neither"
-    }
-}
-
 my @deviceTargets = getDeviceTargets();
-my $efiTarget = getEfiTarget();
 my $prevGrubState = readGrubState();
 my @prevDeviceTargets = split/,/, $prevGrubState->devices;
 

From a49df2a8942b1ccb3a8280a8887e8c76436525f0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 23 Mar 2017 12:53:10 +0100
Subject: [PATCH 2843/3449] tribler: fixup revision

Using `rev = "v${revision}"` results in a "bad reference" error;
use the plain revision instead.
---
 pkgs/applications/networking/p2p/tribler/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index a8d360c41564..8e99d5159f87 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/Tribler/tribler";
-    rev = "v${revision}";
+    rev = revision;
     sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845";
     fetchSubmodules = true;
   };

From 632e81083caf8821c1c37e8476dac94910237d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 23 Mar 2017 10:22:42 +0100
Subject: [PATCH 2844/3449] spice: 0.12.8 -> 0.13.3

(we can use upstream security patches again)
---
 ...lowing-patch-from-http-pkgs.fedorapr.patch | 56 -------------------
 pkgs/development/libraries/spice/default.nix  | 13 +++--
 2 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch

diff --git a/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch b/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch
deleted file mode 100644
index 8098f568e21a..000000000000
--- a/pkgs/development/libraries/spice/0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 75e8685740199537bfefcbd9996ec3ff9f6342e6 Mon Sep 17 00:00:00 2001
-From: Graham Christensen <graham@grahamc.com>
-Date: Wed, 8 Feb 2017 21:58:43 -0500
-Subject: [PATCH] Adapting the following patch, from
- http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d
-
-> From: Frediano Ziglio <fziglio@redhat.com>
-> Date: Tue, 29 Nov 2016 16:46:56 +0000
-> Subject: [spice-server 3/3] main-channel: Prevent overflow reading messages
->  from client
->
-> Caller is supposed the function return a buffer able to store
-> size bytes.
->
-> Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
-> Acked-by: Christophe Fergeau <cfergeau@redhat.com>
-> ---
->  server/main-channel.c | 3 +++
->  1 file changed, 3 insertions(+)
->
-> diff --git a/server/main-channel.c b/server/main-channel.c
-> index 24dd448..1124506 100644
-> --- a/server/main-channel.c
-> +++ b/server/main-channel.c
-> @@ -258,6 +258,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc,
->
->      if (type == SPICE_MSGC_MAIN_AGENT_DATA) {
->          return reds_get_agent_data_buffer(red_channel_get_server(channel), mcc, size);
-> +    } else if (size > sizeof(main_chan->recv_buf)) {
-> +        /* message too large, caller will log a message and close the connection */
-> +        return NULL;
->      } else {
->          return main_chan->recv_buf;
->      }
-> --
-> 2.9.3
-> ---
- server/main_channel.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/server/main_channel.c b/server/main_channel.c
-index 0ecc9df..1fc3915 100644
---- a/server/main_channel.c
-+++ b/server/main_channel.c
-@@ -1026,6 +1026,9 @@ static uint8_t *main_channel_alloc_msg_rcv_buf(RedChannelClient *rcc,
-
-     if (type == SPICE_MSGC_MAIN_AGENT_DATA) {
-         return reds_get_agent_data_buffer(mcc, size);
-+    } else if (size > sizeof(main_chan->recv_buf)) {
-+        /* message too large, caller will log a message and close the connection */
-+        return NULL;
-     } else {
-         return main_chan->recv_buf;
-     }
---
-2.10.0
diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 61952c3b3238..808bfd4f811d 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -6,14 +6,15 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-0.12.8";
+  name = "spice-0.13.3";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr";
+    sha256 = "17mqgwamdhj8sx8vhahrjl5937x693kjnw6cp6v0akjrwz011xrh";
   };
 
   patches = [
+    # the following three patches fix CVE-2016-9577 and CVE-2016-9578
     (fetchpatch {
       name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch";
       url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
@@ -24,9 +25,11 @@ stdenv.mkDerivation rec {
       url = "http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
       sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5";
     })
-    # Originally from http://pkgs.fedoraproject.org/cgit/rpms/spice.git/plain/0003-main-channel-Prevent-overflow-reading-messages-from-.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d
-    # but main-channel.c was renamed to main_channel.c
-    ./0001-Adapting-the-following-patch-from-http-pkgs.fedorapr.patch
+    (fetchpatch {
+      name = "0003-main-channel-Prevent-overflow-reading-messages-from.patch";
+      url = "https://cgit.freedesktop.org/spice/spice/patch/?id=1d3e26c0ee75712fa4bbbcfa09d8d5866b66c8af";
+      sha256 = "030mm551aipck99rqiz39vsvk071pn8715zynr5j6chwzgpflwm3";
+    })
   ];
 
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib

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 2845/3449] 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 05cc33f8bce1..c65836c1ae0f 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 f9add54f281391aca361230db96d15ec684b7a99 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 23 Mar 2017 15:10:34 +0100
Subject: [PATCH 2846/3449] fontforge-fonttools: init at 20160404

---
 pkgs/tools/misc/fontforge/default.nix         |  1 +
 .../misc/fontforge/fontforge-fonttools.nix    | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/fontforge/fontforge-fonttools.nix

diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 2cccee0a4e3b..cecd2ef3cf36 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
     description = "A font editor";
     homepage = http://fontforge.github.io;
     platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.bsd3;
   };
 }
 
diff --git a/pkgs/tools/misc/fontforge/fontforge-fonttools.nix b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
new file mode 100644
index 000000000000..046c1d449201
--- /dev/null
+++ b/pkgs/tools/misc/fontforge/fontforge-fonttools.nix
@@ -0,0 +1,24 @@
+{stdenv, fontforge, zlib}:
+stdenv.mkDerivation rec {
+  name = "fontforge-fonttools-${fontforge.version}";
+  src = fontforge.src;
+
+  buildInputs = [zlib];
+
+  setSourceRoot = ''export sourceRoot="$(echo */contrib/fonttools)"'';
+
+  installPhase = ''
+    mkdir -p "$out"/{bin,share/doc/fontforge-fonttools}
+    for i in *.c; do
+      gcc "$i" -lz -lm --std=c99 -o "$out"/bin/$(basename "$i" .c)
+    done
+    cp README* "$out/share/doc/fontforge-fonttools"
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''Small font tools shipped in FontForge contrib'';
+    license = fontforge.meta.license;
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e086fd0b153e..f28f672eaba2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1818,6 +1818,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
+  fontforge-fonttools = callPackage ../tools/misc/fontforge/fontforge-fonttools.nix {};
+
   fontmatrix = callPackage ../applications/graphics/fontmatrix {};
 
   foremost = callPackage ../tools/system/foremost { };

From 45f486f096bb3f3fe030571d2bcfd561f921b0cc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Mar 2017 13:29:08 +0100
Subject: [PATCH 2847/3449] Revert "security-wrapper: Don't remove the old
 paths yet as that can create migration pain"

This reverts commit 4c751ced376e0042ddd4f2aa8bd40754b9ea8926.

This does not fix the issue as /run is now mounted with nosuid.
---
 nixos/modules/security/wrappers/default.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 0aca39fd6bed..65d875c3a375 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -177,6 +177,25 @@ in
           # programs to be wrapped.
           WRAPPER_PATH=${config.system.path}/bin:${config.system.path}/sbin
 
+          # Remove the old /var/setuid-wrappers path from the system...
+          #
+          # TODO: this is only necessary for ugprades 16.09 => 17.x;
+          # this conditional removal block needs to be removed after
+          # the release.
+          if [ -d /var/setuid-wrappers ]; then
+            rm -rf /var/setuid-wrappers
+          fi
+
+          # Remove the old /run/setuid-wrappers-dir path from the
+          # system as well...
+          #
+          # TODO: this is only necessary for ugprades 16.09 => 17.x;
+          # this conditional removal block needs to be removed after
+          # the release.
+          if [ -d /run/setuid-wrapper-dirs ]; then
+            rm -rf /run/setuid-wrapper-dirs
+          fi
+
           # We want to place the tmpdirs for the wrappers to the parent dir.
           wrapperDir=$(mktemp --directory --tmpdir="${parentWrapperDir}" wrappers.XXXXXXXXXX)
           chmod a+rx $wrapperDir

From e82baf043e25abbb354c7ab4415a40a4155df398 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Mar 2017 13:32:10 +0100
Subject: [PATCH 2848/3449] security-wrapper: link old wrapper dir to new one

This makes setuid wrappers not fail after upgrading.

references #23641, #22914, #19862, #16654
---
 nixos/modules/security/wrappers/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 65d875c3a375..c051b7d49e3f 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -179,21 +179,31 @@ in
 
           # Remove the old /var/setuid-wrappers path from the system...
           #
-          # TODO: this is only necessary for ugprades 16.09 => 17.x;
+          # TODO: this is only necessary for upgrades 16.09 => 17.x;
           # this conditional removal block needs to be removed after
           # the release.
           if [ -d /var/setuid-wrappers ]; then
             rm -rf /var/setuid-wrappers
+            ln -s /run/wrappers/bin /var/setuid-wrappers
           fi
 
           # Remove the old /run/setuid-wrappers-dir path from the
           # system as well...
           #
-          # TODO: this is only necessary for ugprades 16.09 => 17.x;
+          # TODO: this is only necessary for upgrades 16.09 => 17.x;
           # this conditional removal block needs to be removed after
           # the release.
           if [ -d /run/setuid-wrapper-dirs ]; then
             rm -rf /run/setuid-wrapper-dirs
+            ln -s /run/wrappers/bin /run/setuid-wrapper-dirs
+          fi
+
+          # TODO: this is only necessary for upgrades 16.09 => 17.x;
+          # this conditional removal block needs to be removed after
+          # the release.
+          if readlink -f /run/booted-system | grep nixos-17 > /dev/null; then
+            rm -rf /run/setuid-wrapper-dirs
+            rm -rf /var/setuid-wrappers
           fi
 
           # We want to place the tmpdirs for the wrappers to the parent dir.

From bf7847ec7c3a11a4ccc03d72f995d78fb8133add Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Thu, 23 Mar 2017 10:00:32 -0500
Subject: [PATCH 2849/3449] galculator: 2.1.3 -> 2.1.4 (#24230)

---
 pkgs/applications/misc/galculator/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 5d5f83a2370f..44071b328758 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -1,17 +1,20 @@
-{ stdenv, fetchurl
-, intltool, pkgconfig, gtk }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, intltool
+, gtk, pkgconfig, flex }:
 
 stdenv.mkDerivation rec {
-  
   name = "galculator-${version}";
-  version = "2.1.3";
+  version = "2.1.4";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/galculator/${name}.tar.gz";
-    sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17";
+  src = fetchFromGitHub {
+    owner = "galculator";
+    repo = "galculator";
+    rev = "v${version}";
+    sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w";
   };
 
-  buildInputs = [ intltool pkgconfig gtk ];
+  nativeBuildInputs = [ autoreconfHook intltool pkgconfig ];
+  buildInputs = [ gtk flex ];
 
   meta = with stdenv.lib; {
     description = "A GTK 2/3 algebraic and RPN calculator";

From c71f8f6ead73c082143e9db2b921a6fb7bbfecc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Mar 2017 16:10:04 +0100
Subject: [PATCH 2850/3449] release-combined: disable plasma tests temporarily

... to get a channel bump after a long time; see #24240.
---
 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 63ca39a9b602..00abbcacf8c9 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)
+        #(all nixos.tests.plasma5) # temporarily, see #24240
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)
         (all nixos.tests.misc)

From 070ae18422a2aeb3da20b0cc715bf7bfe8daa825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 23 Mar 2017 16:34:11 +0100
Subject: [PATCH 2851/3449] knot-dns: maintenance 2.4.1 -> 2.4.2

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

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 94d5ee9f5c71..1174f5badba0 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ with { inherit (stdenv.lib) optional optionals; };
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.4.1";
+  version = "2.4.2";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c";
+    sha256 = "37da7fcf1f194bd6376c63d8c4fa28a21899b56a3f3b63dba7095740a5752c52";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 73a6832ad86755ae4dfb7717b4d1e37b2691fb4f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 23 Mar 2017 16:45:39 +0100
Subject: [PATCH 2852/3449] golly: use wxGTK 3.0

---
 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 f28f672eaba2..165761611132 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17653,8 +17653,8 @@ with pkgs;
 
   gravit = callPackage ../applications/science/astronomy/gravit { };
 
-  golly = callPackage ../applications/science/misc/golly { };
-  golly-beta = callPackage ../applications/science/misc/golly/beta.nix { };
+  golly = callPackage ../applications/science/misc/golly { wxGTK = wxGTK30; };
+  golly-beta = callPackage ../applications/science/misc/golly/beta.nix { wxGTK = wxGTK30; };
 
   megam = callPackage ../applications/science/misc/megam { };
 

From b1a9bcfb161043297a63d9c6b5887b92debfcf3b Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Wed, 22 Mar 2017 06:55:34 -0300
Subject: [PATCH 2853/3449] awesome: menubar should take XDG_HOME_DIR and
 XDG_DATA_DIRS into account

---
 pkgs/applications/window-managers/awesome/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 8a088daec1ac..eccb1a19538a 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchurl, fetchFromGitHub, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf
 , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
 , xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter
 , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, xterm
@@ -38,6 +38,13 @@ with luaPackages; stdenv.mkDerivation rec {
                   xorg.xcbutilrenderutil xorg.xcbutilwm libxkbcommon
                   xcbutilxrm ];
 
+  patches = [
+    (fetchurl {
+      url = "https://patch-diff.githubusercontent.com/raw/awesomeWM/awesome/pull/1639.patch";
+      sha256 = "00piynmbxajd2xbg960gmf0zlqn7m489f4ww482y49ravfy1jhsj";
+    })
+  ];
+
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
 
   LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";

From a20602d8e22ae1aed9ff57815ab1d0bad71080ac Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 23 Mar 2017 16:38:46 -0400
Subject: [PATCH 2854/3449] linux: 4.4.55 -> 4.4.56

---
 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 dd6bba4567a8..5a0366eb4ea6 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.55";
+  version = "4.4.56";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14inh7ps6zkvkwifqgxnwj02a7907ighdj96dv66ydckwqcmyj4j";
+    sha256 = "1dm2qas6v73pkq787x2pqhl44xznnhdcvvjnyw75ajwyhqj1w62m";
   };
 
   kernelPatches = args.kernelPatches;

From 37a965c1debe2a9a951448b8ce7c25b9ebde2c50 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 23 Mar 2017 16:43:31 -0400
Subject: [PATCH 2855/3449] linux: 4.10.4 -> 4.10.5

---
 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 0311ea518c56..d0f891cb00c1 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.4";
+  version = "4.10.5";
   extraMeta.branch = "4.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18cglngl42hcm0578hrsn962g2r1z9x6p5h9c6d3g0ac8siascqp";
+    sha256 = "04gwdqsngzddxvw34lcy9r03179l6s25qbxmsv5jz5kbczivzg6x";
   };
 
   kernelPatches = args.kernelPatches;

From a4d285616dac3147529dac22fadc515435cd7e49 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Thu, 23 Mar 2017 19:52:59 +0000
Subject: [PATCH 2856/3449] atanks: 6.2 -> 6.5

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

diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index 4b9b097bbb7e..88a9026e3bd1 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atanks-${version}";
-  version = "6.2";
+  version = "6.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/atanks/atanks/${name}/${name}.tar.gz";
-    sha256 = "1s1lb87ind0y9d6hmfaf1b9wks8q3hd6w5n9dibq75rxqmcfvlpy";
+    sha256 = "0bijsbd51j4wsnmdxj54r92m7h8zqnvh9z3qqdig6zx7a8kjn61j";
   };
 
   buildInputs = [ allegro ];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace /usr $out
   '';
 
-  makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" ];
+  makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" "CXX=g++" ];
 
   meta = with stdenv.lib; {
     description = "Atomic Tanks ballistics game";

From f92d08020dc5bb33622f83fade68b407f3a52378 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 23 Mar 2017 21:52:09 +0100
Subject: [PATCH 2857/3449] atanks: remove unnecessary patch phase

---
 pkgs/games/atanks/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix
index 88a9026e3bd1..05b645ee326b 100644
--- a/pkgs/games/atanks/default.nix
+++ b/pkgs/games/atanks/default.nix
@@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ allegro ];
 
-  patchPhase = ''
-    substituteInPlace Makefile --replace /usr $out
-  '';
-
   makeFlags = [ "PREFIX=$(out)/" "INSTALL=install" "CXX=g++" ];
 
   meta = with stdenv.lib; {

From 37f7470269f14cf7d368bcbd80017b0511413966 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 23 Mar 2017 22:04:19 +0100
Subject: [PATCH 2858/3449] linux: drop 3.12 and 4.1

Support ends before 17.09 is released:
https://www.kernel.org/category/releases.html
---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 18 --------------
 pkgs/os-specific/linux/kernel/linux-4.1.nix  | 18 --------------
 pkgs/top-level/all-packages.nix              | 25 --------------------
 3 files changed, 61 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-3.12.nix
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.1.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
deleted file mode 100644
index f82eb073de9a..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "3.12.71";
-  extraMeta.branch = "3.12";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "11wmrj2zqb3x2az22q7ggdp6ibhqmlngy7v01fm8vrhz7f6lwf87";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-})
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
deleted file mode 100644
index 30c5ce7e569b..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.1.39";
-  extraMeta.branch = "4.1";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0m48slb13ipnjnw4inhyb74xxpla94344wbc2y5lzb402n5jrs58";
-  };
-
-  kernelPatches = args.kernelPatches;
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 165761611132..93d79b1e0ed3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11537,29 +11537,6 @@ with pkgs;
       ];
   };
 
-  linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
-    kernelPatches = with kernelPatches;
-      [ bridge_stp_helper
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
-  linux_4_1 = callPackage ../os-specific/linux/kernel/linux-4.1.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        kernelPatches.DCCP_double_free_vulnerability_CVE-2017-6074
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -11787,8 +11764,6 @@ with pkgs;
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);
-  linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12);
-  linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_10);

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 2859/3449] 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 5e46b079aaa1..d49221d6e6aa 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 2860/3449] 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 d49221d6e6aa..97e195f592e9 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 2861/3449] 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 0768f5a12e09..8a2f4f46e03f 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 2862/3449] 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 93d79b1e0ed3..a6ec9a784651 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 2863/3449] 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 e3938ec71a84..1883764e24ff 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 000000000000..3e4c036418d2
--- /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 2864/3449] 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 8261cc9e4cfa..17150c75466e 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 2865/3449] 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 6e18e1dba1dd..0e4842ec24d2 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 2866/3449] 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 d7625b8ebacc..9c421e0c8280 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 2867/3449] 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 019d3e97a6f7..9fd56a49b5f5 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 2868/3449] 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 041d88fbeae6..a1bd8f14d23b 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 2869/3449] 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 57487f704519..1f5b6bd1d808 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 2870/3449] 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 556454c6b5f8..a03c45bfeff0 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 2871/3449] 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 2873225b26f1..735e73d5d490 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 2872/3449] 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 9bcfcf392f40..d1cb7221615f 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 2873/3449] 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 02f93eb931d5..ae94c3de41b2 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 2874/3449] 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 000000000000..f0bc02cf66df
--- /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 e086fd0b153e..6a50aa3e07f6 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 2875/3449] 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 000000000000..128f3eac2635
--- /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 b3cf517303d4..dd127ea6a476 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 2876/3449] 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 435653c19fdc..68966dd03998 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 2877/3449] 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 000000000000..7d7e44ab9cc1
--- /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 8471d1a1ced7..12ddbfafa10e 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 2878/3449] 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 7f8580f058b6..75daad36f762 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 2d1eb7b6b3ca..000000000000
--- 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 235eadfd2556..000000000000
--- 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 dd127ea6a476..e07efc74838f 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 2879/3449] 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 f0bc02cf66df..01d7fe1d0f55 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 2880/3449] 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 f87d81bd8fb8..6587b25ef94a 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 2881/3449] 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 6c63fede857f..1bf4fd3c089e 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 2882/3449] 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 77e47d670b9b..000000000000
--- 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 000000000000..44e96b5ff307
--- /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 afec616563cb..55defd680909 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 df51a5e8cd62..952dc1ce652f 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 533d1c1e7da8..576746834af3 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 9bcdeb3c1ca5..1bf271838fd6 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 2883/3449] 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 b08bb0768f2c..313167b1ae27 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 2884/3449] 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 6ea5590106b4..02189206dc69 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 2885/3449] 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 2f894514c519..8bc4a22bc923 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 2886/3449] 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 bed82810d469..7474cce72727 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 2887/3449] 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 d382fa8c9cb2..077aeca457ea 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 2888/3449] 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 1c347655ebed..e045dc67a507 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 765a384bf634..d4247f51b3e3 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 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 2889/3449] 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 ca787e9c7b9b..f561fc8c3c4c 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 2890/3449] 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 9fd56a49b5f5..f675febafb56 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 2891/3449] 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 b4f01bc642bf..2585b5545482 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 2892/3449] 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 00abbcacf8c9..63ca39a9b602 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 2893/3449] 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 63ca39a9b602..5c1112a1c6d6 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 cf7f0a63f4b2..3535690a8e69 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 a1bd8f14d23b..82be9bc1d727 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 2894/3449] 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 0c8753085029..60ef20177a37 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 2895/3449] 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 60ef20177a37..50a011e00576 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 2896/3449] 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 0341ffc64af8..d4c8b1ada6c3 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 2897/3449] 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 7474cce72727..2bd784ed30a0 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 2898/3449] 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 334423660a03..33de9cd0d975 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 96e4840b35bf..923676aa1545 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 2899/3449] 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 9cab87e9ed24..8ee08f576556 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 2900/3449] 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 91364dd65bb8..3af342aad935 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 2901/3449] 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 3f02304c0d42..611cc84325c1 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 2902/3449] 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 77bba1efa41c..a44dc4f2e42d 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 72b80afebbb6..f0414b1b1ae3 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 2903/3449] 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 000000000000..33f1766cb4a6
--- /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 12ddbfafa10e..54460f855db6 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 2904/3449] 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 000000000000..4fa2f42c39dc
--- /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 923676aa1545..552f9d4158e3 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 2905/3449] 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 a92f8633c3a8..3031fa1cb0c1 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 2906/3449] 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 44e96b5ff307..8e69a207628e 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 2907/3449] 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 83a73eb388f8..d75b50bca1af 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 2908/3449] 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 e07930a94db0..221427e08514 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 2909/3449] 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 6ea5590106b4..17cdd2276d70 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 2910/3449] 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 aee4831034d8..916f0dc360f3 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 2911/3449] 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 28d89fb32d04..6cc84c9e0987 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 2912/3449] 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 927648febc50..0d3eaa8bb1fb 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 2913/3449] 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 90812fb802c5..f0f19dce6e30 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 2914/3449] 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 610c2a2b758a..a55c2c4565e2 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 000000000000..daa46838bfa8
--- /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 2915/3449] 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 4640e3c4a615..47aaadc9ccf0 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 2916/3449] 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 01d7fe1d0f55..33adb5ab1dd4 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 2917/3449] 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 33adb5ab1dd4..78a46d4ac9bd 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 2918/3449] 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 cd6e72755dea..663ff24c81f1 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 2919/3449] 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 9c19be3cc524..d304019953ae 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 2920/3449] 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 5737f1eca15f..2f4b56ffcaf9 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 2921/3449] 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 000000000000..d84983ed6348
--- /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 54460f855db6..bca0c1dc2161 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 2922/3449] 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 000000000000..873823300222
--- /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 bca0c1dc2161..41347a2607db 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 2923/3449] 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 f02b80706380..eb26f88f7258 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 000000000000..da7f36542ef9
--- /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 7da02525f2de..f881c76c3ad9 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 44e2d9040807..2196d8383752 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 2924/3449] 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 f78eafa68afa..a386abec95bd 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 2925/3449] 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 755724bc8b82..fadb55907bfe 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 2926/3449] 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 9eafa055b240..3fa8e9d46b40 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 2927/3449] 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 028e5d6b725a..fa2ac38d383b 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 2928/3449] 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 4a7b3d44e797..929bf7dbcb2f 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 2929/3449] 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 7ba3c3734f84..0d8e46aeeced 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 2930/3449] 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 8f525945a6af..80f2dde534ec 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 2931/3449] 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 6cc84c9e0987..d17af6f5188b 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 2932/3449] 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 0906492ad101..4b0768af1e20 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 3aa555f19160..5603ae1b3243 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 2933/3449] 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 33b782098c5f..760ad521cef6 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 2934/3449] 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 8b85ff0057f9..a365a01bfb1e 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 2935/3449] 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 865b3ad6797d..64bb39aaf45d 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 217137c210f2..51dd9d3f5619 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 2936/3449] 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 51dd9d3f5619..7c9fa253ee5b 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 2937/3449] 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 7c9fa253ee5b..9263671fa8df 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 2938/3449] 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 9263671fa8df..cabeb8579c95 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 2939/3449] 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 3af342aad935..000000000000
--- 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 6a6a34d520d6..000000000000
--- 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 2fda5ed8cf0c..000000000000
--- 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 0d5c2d510929..000000000000
--- 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 a0e344a7bc68..000000000000
--- 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 495db07cfbb5..000000000000
--- 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 f41e8da11931..000000000000
--- 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 10b0b6701ddc..000000000000
--- 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 ea3073ced50a..000000000000
--- 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 755b0965cf5f..000000000000
--- 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 02b7efb73d22..000000000000
--- 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 9891bfeac5bf..000000000000
--- 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 98a3610f5fbd..000000000000
--- 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 4390db977a71..000000000000
--- 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 fda3d3e36533..000000000000
--- 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 ebaf3651a6d0..000000000000
--- 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 2196d8383752..000000000000
--- 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 f4056dd9cc97..000000000000
--- 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 1f2f316c5b26..000000000000
--- 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 95cd6fea79b4..000000000000
--- 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 9b6a6c46176c..000000000000
--- 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 06b244b974ff..000000000000
--- 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 7dbe197c56e0..000000000000
--- 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 578ea6ba0b22..000000000000
--- 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 3273f12eb830..000000000000
--- 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 03d0fffbe80e..000000000000
--- 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 1e134057c4b4..000000000000
--- 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 a48dd38ae6d2..000000000000
--- 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 93a864621b82..000000000000
--- 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 19750f2fd99d..000000000000
--- 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 887e107b6c1b..000000000000
--- 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 127766e2ebd6..000000000000
--- 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 61e64dc47e4d..000000000000
--- 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 3a813dc80074..000000000000
--- 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 2bffd0a2bd61..000000000000
--- 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 b9ccac7cf933..000000000000
--- 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 e3db17e978c2..000000000000
--- 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 d72d7b6c64cb..000000000000
--- 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 6cc1d3b87bca..000000000000
--- 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 50fc8cf6826a..000000000000
--- 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 6d887f7c650b..000000000000
--- 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 fd7a3c52026e..000000000000
--- 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 3ce7db5a9321..000000000000
--- 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 b3316188f7d9..000000000000
--- 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 0eeacce1bc05..000000000000
--- 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 bb5d1f74364c..000000000000
--- 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 1c360cd81aa2..000000000000
--- 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 915a6bcae8a8..000000000000
--- 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 fbdfbbcf0dbe..000000000000
--- 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 a765161e2d7e..000000000000
--- 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 9a8ddbba2bd2..000000000000
--- 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 3fc4fab4ea54..000000000000
--- 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 cabeb8579c95..1311d3898b4c 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 2940/3449] 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 1311d3898b4c..ce03724903b3 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 2941/3449] 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 ce03724903b3..2c3c85f49cd4 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 2942/3449] 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 2c3c85f49cd4..beccac841273 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 2943/3449] 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 f0c99841c1b0..d05ff845ebb0 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 beccac841273..dd1bb3e553c0 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 2944/3449] 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 dd1bb3e553c0..59f1fc6ad89e 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 2945/3449] 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 59f1fc6ad89e..129fc1b8610e 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 2946/3449] 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 129fc1b8610e..e9d6231c9eb8 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 2947/3449] 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 c719080c7427..463bd64495d5 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 e9d6231c9eb8..fe28a4ab4aed 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 2948/3449] 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 fe28a4ab4aed..2004b75dda09 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 2949/3449] 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 0de33d6d1949..b553e09ed5e2 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 2004b75dda09..3842d1381821 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 2950/3449] 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 98567c340bc4..e323b42d7ae6 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 3842d1381821..e4a2f02b6b2b 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 2951/3449] 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 118630e96088..16c9e9fdff2d 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 e4a2f02b6b2b..290ae99a17b8 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 2952/3449] 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 290ae99a17b8..17da4d575028 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 2953/3449] 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 17da4d575028..ad192720cb96 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 2954/3449] 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 ad192720cb96..781035109f19 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 2955/3449] 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 781035109f19..ac190349e5af 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 2956/3449] 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 ac190349e5af..51a4fbe38221 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 2957/3449] 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 f32cb9db02a8..f8c98c727f49 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 51a4fbe38221..d9c3c7947dc0 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 2958/3449] 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 ca44742b0461..a1d8cb0f01ea 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 b0891a3d69f3..de4a0cf1dcdd 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 d9c3c7947dc0..598dd204ba1a 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 2959/3449] 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 b7e8fb33387e..000000000000
--- 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 512d985f346a..000000000000
--- 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 63c4ab7256a6..000000000000
--- 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 08d12087f080..000000000000
--- 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 2cb3f7dfa700..000000000000
--- 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 141acfc3e574..000000000000
--- 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 401cfd5c295e..000000000000
--- 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 59f510ac54da..000000000000
--- 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 e66ce1676d30..000000000000
--- 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 1cc6fac583b7..000000000000
--- 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 20e56bf3149e..000000000000
--- 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 e483ad14e05e..000000000000
--- 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 56ee0a411d4d..000000000000
--- 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 b4561db6e77d..000000000000
--- 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 1dfd8ac2683c..000000000000
--- 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 92adeda82735..000000000000
--- 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 24dc3bde148d..000000000000
--- 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 95cd6fea79b4..000000000000
--- 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 9b6a6c46176c..000000000000
--- 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 06b244b974ff..000000000000
--- 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 7dbe197c56e0..000000000000
--- 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 578ea6ba0b22..000000000000
--- 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 b860a73ef890..000000000000
--- 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 3273f12eb830..000000000000
--- 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 03d0fffbe80e..000000000000
--- 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 1e134057c4b4..000000000000
--- 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 7c1cc5da07e3..000000000000
--- 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 64937b3dcd37..000000000000
--- 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 c01061d3378b..000000000000
--- 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 7dbe197c56e0..000000000000
--- 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 93a864621b82..000000000000
--- 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 887e107b6c1b..000000000000
--- 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 127766e2ebd6..000000000000
--- 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 61e64dc47e4d..000000000000
--- 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 3a813dc80074..000000000000
--- 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 2bffd0a2bd61..000000000000
--- 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 b9ccac7cf933..000000000000
--- 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 fe5bcadbe9a8..000000000000
--- 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 d72d7b6c64cb..000000000000
--- 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 6cc1d3b87bca..000000000000
--- 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 50fc8cf6826a..000000000000
--- 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 64f85c42d198..000000000000
--- 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 0eeacce1bc05..000000000000
--- 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 bb5d1f74364c..000000000000
--- 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 1c360cd81aa2..000000000000
--- 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 35568c1eb2f3..000000000000
--- 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 fbdfbbcf0dbe..000000000000
--- 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 a765161e2d7e..000000000000
--- 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 9a8ddbba2bd2..000000000000
--- 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 20aa28a55dae..000000000000
--- 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 598dd204ba1a..4929814647f8 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 2960/3449] 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 efb721c5773f..26f546022035 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 2961/3449] 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 5fcdd153c99c..2c5d6350315b 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 3bc3732d9f0d..9f6d1b9ddb71 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 2962/3449] 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 787729d3afc9..3efcf6e582c6 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 2963/3449] 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 0018e38a9f95..8cebaeee2afd 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 2c5d6350315b..08a70b5514d3 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 2964/3449] 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 067b1c7884a7..000000000000
--- 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 4929814647f8..7760e29a5208 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 2965/3449] 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 101ea9a4f51b..c0cebaddec8d 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 08a70b5514d3..aa044c885ea5 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 2966/3449] 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 16c9e9fdff2d..b7672a39d0df 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 2967/3449] 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 d6cc205bbae4..e1e01c1ed287 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 2968/3449] 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 962d8f8b31f3..d0b98863d203 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 2969/3449] 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 000000000000..da051c227d23
--- /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 80a92b4a932e..000000000000
--- 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 217137c210f2..7970732ce3f6 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 2970/3449] 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 33921ef02cd7..508ac254f0ac 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 2971/3449] 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 ad72f50a1b31..000000000000
--- 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 7e8312549da9..d068d744f203 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 2972/3449] 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 fca1a433ff33..0bf155807980 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 2973/3449] 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 1cbac0709a66..6c5e0570fd0d 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 2974/3449] 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 3721f7ed4af6..6d3c34b48d59 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 7760e29a5208..b0e4dfe1e605 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 2975/3449] 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 029c3df89932..56b942054140 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 2976/3449] 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 eaf02bd2689e..a52301c34d7d 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 2977/3449] 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 0a2e293d90be..064feeb02a39 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 2978/3449] 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 9a142a89677f..edef6f7663cc 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 2979/3449] 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 d068d744f203..795830e0e707 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 2980/3449] 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 7cd5ce0002c2..0b2528e9a779 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 c974523f886c..aee6523345c4 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 2981/3449] 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 f32e6d684526..3285456a3485 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 2982/3449] 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 d46539a88b7d..7ab6a4438f3e 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 2983/3449] 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 000000000000..dd375143277a
--- /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 f655979c2ccc..0858dfba8b40 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 2984/3449] 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 6f51e287910a..f7c58c928633 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 2985/3449] 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 610c2a2b758a..145cf140847b 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 000000000000..e467e7ee85b8
--- /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 000000000000..3b3f2e0cc0f1
--- /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 7970732ce3f6..3676d3c499c5 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 2986/3449] 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 145cf140847b..4e9154f1740e 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 000000000000..cc5efffca448
--- /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 000000000000..446927745a90
--- /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 3676d3c499c5..86205f329f04 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 2987/3449] 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 c5bd9afd2cf6..a5defaf5c29b 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 2988/3449] 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 b7527cf97cec..7f7d68fd5753 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 2989/3449] 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 abfe951a33fe..c783316c6d55 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 2990/3449] 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 de375ed4529d..1654f57c8ed5 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 86205f329f04..43c2e553f0bd 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 2991/3449] 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 50059e9477a9..5d130d7ad807 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 1ada62580dbc..74253fa09fc0 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 799d66aac9b2..6293fa30d7a7 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 2dbab7129555..2d25e6bf4304 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 644725c29107..aa346f452749 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 c5090e5b949b..8900ebc120cf 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 161982ac6186..1ea7ef4251fe 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 43c2e553f0bd..c33e8cf3c95d 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 2992/3449] 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 6b4d8e33b503..8821da4362bb 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 2993/3449] 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 a6238d9e808a..539314867ab9 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 c66b07bb57ad..000000000000
--- 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 2994/3449] 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 4e035ab67acb..baf9e4f4e394 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 2995/3449] 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 000000000000..f3967b0d9235
--- /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 217137c210f2..c78b1f6164ab 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 2996/3449] 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 382219a0a3a3..2c34a9aff32b 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 2997/3449] 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 f0bc02cf66df..8d5259908d79 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 2998/3449] 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 13a281b12d73..289171aa1ca4 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 2999/3449] 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 289171aa1ca4..e8ec0c1f4d46 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 3000/3449] 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 8901fef21fd0..69bd6702ef56 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 3001/3449] 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 36b2c469eaf4..34e7e4a761f4 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 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 3002/3449] 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 cf7afc37b8bb..c656ff24df84 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 3003/3449] 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 688a08ceb8eb..586627c5925f 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 3004/3449] 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 d0f891cb00c1..01fa2a8fb637 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 3005/3449] 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 bdcb0a846259..702009723770 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 ead43cdab3f8..4883b293143d 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 3006/3449] 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 5a0366eb4ea6..c6a220b9c52c 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 3007/3449] 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 9994d156a4c2..469f808947ab 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 3008/3449] 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 418de6daefbb..1730a60a9a91 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 3009/3449] 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 000000000000..e9e1997e47c9
--- /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 d3499f3e15c1..21de038f7d63 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 3010/3449] 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 da051c227d23..79eea625ade9 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 3011/3449] 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 79eea625ade9..3b5173aa91d3 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 3012/3449] 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 d226a51d0f8e..8df18530472a 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 3013/3449] 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 b4a9282e1851..1928d51d3e58 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 3014/3449] 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 ba8302919e1e..a43826d7a310 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 000000000000..8c71f1b815db
--- /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 3015/3449] 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 f6760895b572..921018531ea4 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 3016/3449] 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 3571e00d04ec..f30906b84a24 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 3535690a8e69..523d6e291ac4 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 000000000000..086d056c51cd
--- /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 3017/3449] 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 6ea5590106b4..6c956dde3951 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 3018/3449] 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 95e0c502749b..ffc22429d1e7 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 3019/3449] 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 6d3c34b48d59..028ca2e73977 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 3020/3449] 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 4f9754445fa9..e6c44aa81b12 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 000000000000..d9d84e834304
--- /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 1730a60a9a91..87cf7d19665a 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 3021/3449] 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 a03c45bfeff0..a3dd3bd55d14 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 3022/3449] 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 ea6b7411c4e7..e6abb72b43da 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 f790bbf29ed0..dfecb3f72122 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 87cf7d19665a..4da7d503d45d 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 3023/3449] 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 dfbd39acaa35..d2faf9c0eee4 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 3024/3449] 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 93142c269c2d..3c137872707c 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 c6065dbfca2d..52d7446e48cb 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 f34c9b6db230..6dbc2290f01e 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 b16806139b45..c3156650551f 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 a8bbe8b71ab4..067f80c42a9f 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 fa7994e8f8f3..1ddd4fad4dc0 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 02c76798fd77..31c01409eb2d 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 84e79442ffa0..19045a8c790b 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 3025/3449] 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 b17209bca0e3..d009a4fd11fe 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 0520a0425bfc..cd535a522d3a 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 3026/3449] 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 000000000000..942a284e2c0d
--- /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 e3a1d42be71d..62380c21e1ba 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 3027/3449] 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 000000000000..e83abe9f433a
--- /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 839d48e488f0..0a5df88efdb9 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 3028/3449] 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 921018531ea4..291c7b1b412d 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 3029/3449] 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 3c137872707c..b87662a6e342 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 6dbc2290f01e..5010343d3c71 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 c3156650551f..bf5a158625c5 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 067f80c42a9f..8ea134843c3e 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 1ddd4fad4dc0..6574a02bb921 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 31c01409eb2d..763d44066685 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 19045a8c790b..67acb8ac3dca 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 3030/3449] 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 5f0d2db27f25..4606fc922a62 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 3031/3449] 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 000000000000..0f971cff64d4
--- /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 fdfdf4181c7a..8ab57716d491 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 3032/3449] 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 13f8cedc673d..c0fd6c973cd3 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 3033/3449] 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 376c4f21dc04..4f7cb176d96f 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 3034/3449] 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 5c163fe8c441..7248fe2c8754 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 3035/3449] 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 e8ec0c1f4d46..8c55db5372d9 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 3036/3449] 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 7205f777bcf2..df17c769ea2d 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 3037/3449] 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 b2d678edada9..fe11b9901564 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 3038/3449] 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 3b7a68fb972f..88c750525b26 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 3039/3449] 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 f0f19dce6e30..34729783cce4 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 3040/3449] 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 892d8fa33009..18c55c80fc08 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 3041/3449] 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 3b5173aa91d3..5ce7c4780c82 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 3042/3449] 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 2f3391f70e0d..51effd2c7841 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 3043/3449] 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 db474f688e59..d1042723a71a 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 3044/3449] 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 000000000000..83466b693f59
--- /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 9cd7dfafdc0b..9407531963f5 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 3045/3449] 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 3a00408c7ca3..d92674e59ef8 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 3046/3449] 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 aa044c885ea5..73c2a0ae919e 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 3047/3449] 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 1bf4fd3c089e..6c63fede857f 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 3048/3449] 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 3d24f6fb4340..2b1b34429c57 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 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 3049/3449] 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 f47ba022c352..38440bac81a4 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 3050/3449] 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 acc440b34ed4..6e6fbed2dbff 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 3051/3449] 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 e6c44aa81b12..087c2463957f 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 a8f38d61f9df..8d8e36a8bc89 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 2ce1ebb257dc..85c0f58174a4 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 093382e13e6a..6e158f5696c1 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 bda647659416..072685b81944 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 8ce74850e1a4..1137d6c07f6a 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 75b2da6e8a25..ed74eae46f3a 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 3882f679cae4..a1744f7a2c03 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 befe3cb21f93..f504c3c2b333 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 592fc2b5934d..0a5a309c27da 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 2ade2fd3edd0..4cf0d2a04492 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 154ff33c8449..76027f29a707 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 71f38bb8d3cc..0cf85840db62 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 bdb93c992262..9c79bfe1a55d 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 1e9f3ee521b1..878dfde8f4e2 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 9ea43023d57c..ee67af62bb19 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 60625412617a..ba02583a2744 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 0c4e5bc2a134..95c66ed029ef 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 beac81051993..59f4724e1bee 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 831028467f42..72895653479b 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 5238744cc7b9..ecfb4913a429 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 277886d717ac..4433a3df45d4 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 e44ad424e0cf..cd2ffe556647 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 3174dc57667d..d883100fd3ce 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 c6523921fb56..9d7c9c4f30f8 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 ef2ac6f93853..39296f86d8e1 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 fc80b0ec2b29..af7acb35aac2 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 df983ff3471c..4d27552d7351 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 04e7b5e38cbe..8841855a24ed 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 b4cb1029001e..582b4fed9df9 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 374f52c9cb06..5869276a7977 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 260a424038f2..034738813395 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 161d836bf311..d0850128ebcc 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 9eb71fc708f0..5d8d98af8d35 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 7154db626aac..4773cc380002 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 b4aa9414163a..fb6af9c895d3 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 bb2461a98a15..3944d2ecab69 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 d21fef3e6746..10f012943017 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 39d5b2c792a2..5a1af01c3b1d 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 eebd105a00db..424ffd184994 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 ea0919caa31f..b64d8c84e22c 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 ed742888a0ef..7d07408236e6 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 776a7646bd70..bd740b757584 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 3528edcba123..b3345c477323 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 d49f4cc6a722..34ba39d799ed 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 68bd72f3e0f5..20e74cdc1517 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 26cf2c023ebd..390bb4ea9e45 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 e35da9e80872..60400712e30e 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 aee95b1f1af0..7a3eb9caa661 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 ad578ac272b1..0beb689090a0 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 3af1227c69b4..e505871eb02e 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 441b4ea7f9a2..d1dd7860de4e 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 103595bc035d..ff627499855c 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 e1902263ac20..b187c213bee1 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 4cad0c0f9f64..f12b854e7783 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 5ec8f80f7e02..4765e90c6df7 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 99c253cdb358..596399c4fa8f 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 cdde02c361fa..fe38755f10c5 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 396e8e92acfd..7927dba89838 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 0689be2c6216..83bb80cc3203 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 b98fdbdb470d..7ff44db52a8b 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 734760c8830b..abc0eb4a2287 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 f84cfa044c6a..1271089060b7 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 6a5e4578cac7..8a0ca6f000d4 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 025a2ee37ff5..1db053ef398b 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 0e53d27c8892..4320cacc590a 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 947a10c0e470..5a76a93b8e3d 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 0cb405d48375..57dfe34132f5 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 48abf2b61513..741ca96348d0 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 564bf9f62e3d..3483d4bed778 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 b124e592f367..61024a33113e 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 fc63c1942c23..0888fba4ecac 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 22cf7be84d03..b90ff39dc1f7 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 d7569c017a7a..5f5dcfb71e6a 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 27482743d2cf..c1f8725f6f7c 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 7beb93eb4620..29ff988a2266 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 6a951fddb79c..2265d0df3949 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 1d4da00bf4cf..6ab134a03064 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 5a448d330671..48a63e412343 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 d4b85e0dfe43..b03b8896a5fc 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 3221fec4b4bc..103b495f8e2c 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 7736eab511e9..4739c7363979 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 faba57d155fb..1961160cbc95 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 41087044e49d..71b8a764eed1 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 0937b2fe8cfe..602aab852ccc 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 95ba2a05ad9b..931d40644000 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 29295de66b7e..76652954cf08 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 a197c69edff5..590de68d52f7 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 9f607a60b596..00d76fbff9fe 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 608c17f9214b..e6c7dcbd3624 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 8c2686d9a229..70ed9cd0570e 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 21da4b21a4ba..6dbaca26c818 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 dfcfe7c9e897..2a6b6880183a 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 b1b9a6dee4ef..1706b5448e14 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 f47ba022c352..5dbebeeb7096 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 36b580bb16df..14ceb405d687 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 276c311fa455..cd437bfe452b 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 4bf243c4f036..dc0dadf92e0e 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 fe0d2ca28f99..1cac0911b246 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 b308a5ec3c35..e231e3a59892 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 5f6b39041551..b0b8f926d9ec 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 2087829084f5..a24daa708123 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 145b81c95bc8..3c841aa621fe 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 01d9b81d0389..a5c858ecbae5 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 b8cdb64da878..66d3a1100804 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 936956cbd177..40f612533068 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 7db7ebf96d6d..6a76906a805f 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 accd3b8070ad..fc8c40ea4e06 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 9fe4b4421a7f..dc4e246c02fb 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 cca111db67d5..d2240984d9f6 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 1ad1e54e7fb6..cac37bce280f 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 8fcdb49b2b1e..c2c41d92acbe 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 fd79419d82ac..06fdc4a2a442 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 38d47e742a29..e8709130015f 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 e0f30b2db731..c1c4527d0a0a 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 b9db2eba5cd6..fb0309e75325 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 2fafec02d816..da246832b93b 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 a35e09cfcda1..4303fe82a45b 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 85f0f24b3874..42f80f29073f 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 3052/3449] 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 d24c59b87d99..0a14a87cf560 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 3053/3449] 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 b2801c7ae671..9c187a8f378d 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 000000000000..fa7df5591dda
--- /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 3054/3449] 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 257c419d88cf..48000271d12c 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 3055/3449] 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 48000271d12c..6c49e95b6b94 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 3056/3449] 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 6b20c0e499c6..be75c7e3f8d7 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 3057/3449] 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 b020351afe21..7bd7a3f27701 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 3058/3449] 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 ab699c78c0ef..e41a1c217105 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 3059/3449] 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 d9370f318d72..3d820553b4ac 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 3060/3449] 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 343148da0bc8..cf78009708b2 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 3061/3449] 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 fcb66c9ad799..2afd700d9333 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 3062/3449] 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 dd380f39477a..fd907c562806 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 3063/3449] 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 b167b59f03cf..bd334356df5c 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 3064/3449] 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 9a59bef617b5..0e53d58a083b 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 3065/3449] 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 5603ae1b3243..dbd6a3521329 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 3066/3449] 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 000000000000..aea006fc4867
--- /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 4d662cf52a99..d9565e8f4d1a 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 3067/3449] 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 06aca4b58e31..69b14db7047d 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 3068/3449] 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 d44e11ec853b..9021b430ef87 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 3069/3449] 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 9021b430ef87..1ca50ec8954c 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 3070/3449] 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 b94ec14308be..c6f4bcd0f666 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 3071/3449] 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 98b91964e640..15701d3c429b 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 3072/3449] 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 bf69eac318dc..69fe6a1730aa 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 3073/3449] 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 eb148311be0b..0278b0f26558 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 3074/3449] 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 ed058d82a0ed..24aa25570829 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 3075/3449] 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 3efcf6e582c6..9bc2bc3db08e 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 b8de872d6ff4..3b8d0a7cf63e 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 a9bb4514a3a2..cb8bf49254ba 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 73c2a0ae919e..96649a0927ee 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 3076/3449] 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 258a81570c03..303204c9c21e 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 3077/3449] 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 bc2bbb13c448..28b6136d90ea 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 3078/3449] 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 260bf412062a..824bc3f9a186 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 ee47ee118551..2de2aeeff8fa 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 3079/3449] 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 be75c7e3f8d7..d3156147d3cb 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 3080/3449] 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 d3156147d3cb..2435c3a704e1 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 3081/3449] 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 04b42f6d7228..c254490555cf 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 3082/3449] 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 36be2517fbd0..6693550bd3b0 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 3083/3449] 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 17d66ba60439..c008c478d22b 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 3084/3449] 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 1fe4d28f9f35..ba90b1b1a2c0 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 000000000000..d49221d6e6aa
--- /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 165761611132..b013482de914 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 3085/3449] 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 07d89b53fa49..36b46030577b 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 3086/3449] 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 14efe29442bc..ee36a9be43b2 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 b36f9cc80ab1..20cc897ae19c 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 3087/3449] 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 bdcb0a846259..7ba8a2ea1cd1 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 3088/3449] 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 0cbe1d1cb375..49245c73f2c4 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 3089/3449] 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 9dfffbf48c55..6265a4b90cae 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 3090/3449] 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 a0d04638504c..47f58aeee85d 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 3091/3449] 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 baa907b21262..000000000000
--- 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 9ac227ac0063..eb02d0e79dde 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 000000000000..6af691426bb7
--- /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 7970732ce3f6..b650d4f5af12 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 3092/3449] 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 e6abb72b43da..7be136944c6d 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 3093/3449] 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 91d7cda1c00a..afab703ae5b5 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 20cc897ae19c..601c1d411308 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 3094/3449] 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 0dbea6529597..9c4f98a740bf 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 0fe294e5a117..c4cc68dcca38 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 06fdc4a2a442..6b011a00eb76 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 0f021c6b4a12..72786247af41 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 3095/3449] 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 000000000000..da4482b463ec
--- /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 000000000000..6ef83754a674
--- /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 000000000000..0e18e8812a84
--- /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 000000000000..f647d9189dd2
--- /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 000000000000..5493196303cd
--- /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 000000000000..9f1976a2d88d
--- /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 000000000000..f5fb4c73af47
--- /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 000000000000..34ab70e0adcd
--- /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 20cc897ae19c..dc2074d10bec 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 3096/3449] 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 f20b992ab727..01203f9b0bd0 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 3097/3449] 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 efe2590ddfb4..4e7159638cae 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 4431dfb40859..ae30a710bf6f 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 f60077e89621..2a1944debd91 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 52ffbab6dcb8..4a777d7b4f14 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 6c1b868beba3..76f6141e2e34 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 32e95c3c0491..60125b2e22a9 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 dfecb3f72122..324e2d35cfd2 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 20cc897ae19c..9484dc06bc1e 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 86fbb0bf1b81..8872d7c676ef 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 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 3098/3449] 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 cae46258b808..2ffc488c0c12 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 3099/3449] 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 c44373625e0f..14983b744df9 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 24aa6e5aaa1e..000000000000
--- 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 f966965fa5fa..146fd66deff1 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 000000000000..e3dfe4aabd60
--- /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 000000000000..95ed83c60f8f
--- /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 000000000000..c1685c5116cc
--- /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 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 3100/3449] 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 985b4c9b9db1..adac53f78282 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 3101/3449] 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 8693a304899a..d2d846b78f2b 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 000000000000..8da74224ae24
--- /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 000000000000..34173f0ac4b4
--- /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 000000000000..392912d77e4e
--- /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 000000000000..263134570103
--- /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 000000000000..582b0c394937
--- /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 000000000000..e737843d1675
--- /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 000000000000..bd4f4b58fb17
--- /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 000000000000..c9d62c62b019
--- /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 000000000000..9fea4c0f01db
--- /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 000000000000..2f44fbc416b2
--- /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 000000000000..5e9f1a6e473d
--- /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 000000000000..2d24e2d87e36
--- /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 000000000000..1611b7b74fec
--- /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 000000000000..e05713da15b7
--- /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 000000000000..12da2cbacb9f
--- /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 000000000000..0eadf54320a8
--- /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 000000000000..469c8439246f
--- /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 000000000000..275dd3577ddc
--- /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 000000000000..82b31efea27d
--- /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 000000000000..085e215e0244
--- /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 000000000000..910cce74f8aa
--- /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 000000000000..fc83804f5e11
--- /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 000000000000..97d6b0cf2c0e
--- /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 000000000000..6a057bdcc101
--- /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 000000000000..b234da11c37c
--- /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 000000000000..110edbb9f186
--- /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 000000000000..e80cbc99e8cf
--- /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 000000000000..7797cb4e7977
--- /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 000000000000..b1928c5bc775
--- /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 000000000000..f68a6a37f8ba
--- /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 000000000000..99b038db9611
--- /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 000000000000..78e88d4b9fa9
--- /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 000000000000..b54f555180d6
--- /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 000000000000..ded802ca693a
--- /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 000000000000..2cbe73c89ca3
--- /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 10d52275490f..aa06bf990cc9 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 3102/3449] 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 000000000000..5356a1111129
--- /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 c1d11ce87ee5..036adcef74cb 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 3103/3449] 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 087c2463957f..4f5ee4b0801a 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 000000000000..f12a14c5c926
--- /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 aa06bf990cc9..6cac7bed908c 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 3104/3449] 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 09909f6546a4..8fa974a95e24 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 3105/3449] 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 26b41a75146f..d6909efe4a6d 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 3106/3449] 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 68ce28c40bd5..000000000000
--- 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 920c78007bb0..000000000000
--- 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 78f44cbe15f5..000000000000
--- 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 41347a2607db..eba346920822 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 3107/3449] 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 731d66974c6e..c1490c3bf196 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 ab0d3528c8c2..000000000000
--- 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 3108/3449] 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 98607501e032..e9a3ecaac5b3 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 3109/3449] 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 4f7c79142019..f6379c8b5a75 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 3110/3449] 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 488a13ecf161..165a566b1b71 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 273cd8f1862c..f8126f91d876 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 3111/3449] 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 a7252b9e28a3..f4e5998c0375 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 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 3112/3449] 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 2435c3a704e1..e5f0a2411785 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 3113/3449] 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 88c750525b26..b7c8111751a6 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 3114/3449] 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 e6c44aa81b12..9bc0c2fd5d2d 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 b7c8111751a6..dda4452f6448 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 3115/3449] 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 028ca2e73977..de419398ad5d 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 61ff664d446d..a487579e41c3 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 3116/3449] 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 de419398ad5d..9e1469d95b28 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 3117/3449] 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 9e1469d95b28..c262d9014430 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 3118/3449] 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 c262d9014430..6b6c31d9db6f 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 3119/3449] 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 6b6c31d9db6f..1a9a83ac9572 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 3120/3449] 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 1a9a83ac9572..097ff84a7046 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 3121/3449] 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 da4482b463ec..9764ede7281c 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 3122/3449] 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 99f54cebddd1..10fc7bf10ac7 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 3123/3449] 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 fa18e6c0ce56..10b7b47b3f4c 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 2435c3a704e1..4d0b08c508b0 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 3124/3449] 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 30e8af85b2ae..2863ee876e7a 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 3125/3449] 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 8821da4362bb..1d1d0d6a6f01 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 3126/3449] 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 4ca8a83554ad..ef5e6346f02e 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 3127/3449] 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 e4589088e7ff..e914b6964b56 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 3128/3449] 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 e914b6964b56..df84a0188c96 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 3129/3449] 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 000000000000..02d8ba70baf5
--- /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 000000000000..a64a62078ecc
--- /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 000000000000..1b8378d5d55f
--- /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 000000000000..b86c42054072
--- /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 f68a6a37f8ba..c5c075f1ebdd 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 99b038db9611..da30352e7181 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 78e88d4b9fa9..d3e8e91bfbde 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 3130/3449] 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 b8ff822726d7..5f6a7470a7c8 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 3131/3449] 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 5f6a7470a7c8..91460eb4019c 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 3132/3449] 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 0b033b61b3ab..d52c47bbe9e7 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 3133/3449] 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 2ca2ff7e75ef..2f21d2a5d74a 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 3134/3449] 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 fe11b9901564..d189ba2aeb85 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 3135/3449] 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 d189ba2aeb85..edd4760140c3 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 3136/3449] 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 edd4760140c3..ef3725fb50f0 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 3137/3449] 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 8c68b6f15a67..b88051113b55 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 4ed6d8a957fb..d6d7277cc9d9 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 df17c769ea2d..8242990fe745 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 42678e342be4..1f5d97941ce5 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 2093ec2b218b..912d26c806c7 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 3138/3449] 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 1be8f16a7d58..13ce111c8f81 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 3139/3449] 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 13ce111c8f81..f63d31c9efdc 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 3140/3449] 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 f63d31c9efdc..1a151efcf382 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 3141/3449] 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 3bbfa34fb502..4c2fb69ec806 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 3142/3449] 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 5bf375a4eff5..90fa48814a2e 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 3143/3449] 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 492b10bb09b3..6c2cb894b542 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 3144/3449] 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 e4589088e7ff..dc40d40d14e8 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 3145/3449] 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 6fcd0fca17a0..6ca18ed46686 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 3146/3449] 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 e636c72b4208..a7164b14d3f1 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 3147/3449] 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 9e133e9f3323..d2fadad8852e 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 3148/3449] 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 eac07ddbfb19..ea8bd57766bf 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 3149/3449] 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 b1cdd509f98e..509a2ab01182 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 3150/3449] 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 e64310f6db8d..aaddc7b08d5d 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 3151/3449] 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 2bace35aa8b6..000000000000
--- 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 000000000000..5cd4c6064e08
--- /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 eba346920822..7adf1495eb23 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 3152/3449] 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 7560a8bfeb40..d3ba5a97333a 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 3153/3449] =?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 bfd4e11ccac1..5645e1cebaa8 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 3154/3449] 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 000000000000..11be8a13a575
--- /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 7adf1495eb23..aa2c8fd87da9 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 3155/3449] 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 000000000000..c3d7637e870d
--- /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 aa2c8fd87da9..9c105847581f 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 3156/3449] 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 000000000000..1e3a9713406b
--- /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 000000000000..bbdaace293bf
--- /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 9c105847581f..54a8c5338797 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 3157/3449] 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 000000000000..fa160c51fe23
--- /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 000000000000..a2407d3079f5
--- /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 7567b54977f0..4d7ee99c6888 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 54a8c5338797..232f13318651 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 3158/3449] 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 b32f8f43146f..33990921786b 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 3159/3449] 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 33990921786b..e2f2f51ccfb9 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 3160/3449] 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 a1d8cb0f01ea..3232e9c089bc 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 069c3ba7800b..82c7f247189e 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 de4a0cf1dcdd..dd1410431695 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 61ff664d446d..995cd24662e6 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 3161/3449] 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 47f58aeee85d..4f6db509a57e 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 3162/3449] 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 c1bd764c70dc..f9e6b7495fc5 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 175cb7472bf6..c834cc8e6534 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 8ee08f576556..20c2623e034c 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 12692b9566f9..6feeacc675a0 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 59389a69e7c8..c43a06838b84 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 b973a4192bba..7a2174b557e1 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 e1b87fafd8e8..3db8b719f77d 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 f966965fa5fa..6a2d226e6084 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 b5cd936ce4f2..14104b30d12d 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 4d12ed8a8b18..bb4e40dd3a7e 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 6d81a284040c..e0b4babc9709 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 a22b99be8da9..588d0b8dadca 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 5fb9cc36e962..3033c4301afe 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 52a2ab8f36a0..7587fb3e0c48 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 89faa1d952d9..7b71a8e95d90 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 7a23c4dc966b..d637c1595954 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 8dc062b75043..ab14ee92a24c 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 1174f5badba0..97c0da86ec9b 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 7215cccbfed8..176f8aa1f510 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 3163/3449] 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 47f58aeee85d..a6440634e50c 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 3164/3449] 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 c4db48248f33..553ddb7d3b79 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 3165/3449] 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 0aeb7d7eb8fc..4f95879d5eb2 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 3166/3449] 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 fbb95efb27ac..3024d3ed59ff 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 248e39151524..850e13fb011e 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 3167/3449] 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 36b46030577b..b4197a12db3f 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 3168/3449] 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 156def09187a..7ca54365be5b 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 3169/3449] 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 5cb79fa92997..4c3d22571b17 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 3170/3449] 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 35e94d0fab93..000000000000
--- 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 1d8ae80572a1..000000000000
--- 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 4d7ee99c6888..23b1c2c1c11e 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 3171/3449] 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 af4cda874730..e6630815ba16 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 3172/3449] 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 4e9154f1740e..9d25cc680f81 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 6e4721ded68b..000000000000
--- 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 5667744ef221..000000000000
--- 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 bddcbde95e13..000000000000
--- 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 23b1c2c1c11e..cdfb4e6d9971 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 3173/3449] =?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 8053020a3f27..bd38389eb47e 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 3174/3449] 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 8623032ed375..a3368e336e6c 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 000000000000..feacb1264af7
--- /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 000000000000..5badc04f2015
--- /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 000000000000..f6a78c85da92
--- /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 000000000000..642e26e278ae
--- /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 000000000000..59fdbdc85d05
--- /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 000000000000..0a0631caf447
--- /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 000000000000..e7c2d780f4e9
--- /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 000000000000..07324035052d
--- /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 000000000000..b956d3ece216
--- /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 000000000000..267dbd8e6dec
--- /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 000000000000..395b3d53934b
--- /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 000000000000..cb1e293919b4
--- /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 b1928c5bc775..cf1cdec327b9 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 c5c075f1ebdd..12ec2d1f4e5c 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 da30352e7181..0f7f58df4b84 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 d3e8e91bfbde..a13cedf3dfe4 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 b54f555180d6..1be5345b3277 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 ded802ca693a..dc4b14c1f60b 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 3175/3449] 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 000000000000..01cfca0d1fdc
--- /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 000000000000..f3da61e286ed
--- /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 cdfb4e6d9971..d4a38faed288 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 3176/3449] 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 90fa48814a2e..d7485936941c 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 172af31f834e..978e16fd9988 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 3177/3449] 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 cf1cdec327b9..1c6b1e05adfb 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 3178/3449] 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 e80e8db08f08..868f9619ce2e 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 3179/3449] 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 e63c11a9da5a..488699f8a793 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 3180/3449] 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 3cd7db90654e..70ea1d58cf80 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 3181/3449] 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 26409949ec62..845623368250 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 3182/3449] 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 2ffc488c0c12..e0c7d0c25e20 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 3183/3449] 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 0c8b0f5ce601..15c51af005f3 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 3184/3449] 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 a69ef5c6b07f..91569d0c070a 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 3185/3449] 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 42425b57ba33..2c9c745021af 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 f14c16775f8d..000000000000
--- 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 d4a38faed288..2fb97372a484 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 3186/3449] 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 9d25cc680f81..0035368273ca 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 523d6e291ac4..5f9a5b0e0641 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 3187/3449] 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 6ecf6546e361..cfd8c03af6d3 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 3188/3449] 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 231b8eabb071..6d0222207944 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 3189/3449] 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 6cd66c62a0ad..9cd72c2fd501 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 3190/3449] 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 85a13f7ac377..5a19f73d9cf9 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 3191/3449] 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 7c773b0db8ba..0de567e7a746 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 3192/3449] 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 775e2ec3cc8c..e9d99aeb254c 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 3193/3449] 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 296176148c7b..78eb04601cd8 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 3194/3449] 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 72068bb1f7bc..a2630b9343e4 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 3195/3449] 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 a693afb8b597..f2fe7fbca7a9 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 3196/3449] 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 b4403a780ed2..000000000000
--- 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 2fb97372a484..d12ac401fca0 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 3197/3449] 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 d8bea7f14e3e..000000000000
--- 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 d12ac401fca0..e797ae3402f4 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 3198/3449] 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 7d06d57ca9ac..000000000000
--- 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 e797ae3402f4..51bf8bb4dba8 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 3199/3449] 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 5027abedcf4f..9810d5186b0e 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 3200/3449] 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 39db1dd1f6d8..023008183ffb 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 3201/3449] 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 aec498b899e4..ff0dc5164b58 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 3202/3449] 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 f038673f4c0b..3a50196456c0 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 3203/3449] 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 d009a4fd11fe..70cda7502798 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 cd535a522d3a..ee4c161d739d 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 3204/3449] 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 b03b8896a5fc..46bb7a4e8faa 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 3205/3449] 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 d3e655676e64..d3b6722b36cd 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 3206/3449] 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 ff0dc5164b58..e13abb6fe2b6 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 3207/3449] 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 002caa3a1719..1d5fbd218e22 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 6122dabb1e85..6bbc0a45e44d 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 3208/3449] 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 d298fbd7fc33..74b1417e0694 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 a2630b9343e4..72068bb1f7bc 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 3209/3449] 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 000000000000..e3f5ec7dbe67
--- /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 f005decfa33c..42785b251587 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 000000000000..50c342269c71
--- /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 51bf8bb4dba8..8c9b87a3afe7 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 3210/3449] 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 d52c47bbe9e7..e709108e9d86 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 3211/3449] 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 8e11a2862841..6678b11df023 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 3212/3449] 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 67fffd10a0f4..210b72292fd6 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 3213/3449] 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 ea3a849c7ac5..71aef7544dd1 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 3214/3449] 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 916f0dc360f3..d37d5c160915 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 3215/3449] 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 222dfc27256c..302992fc8c8a 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 3216/3449] 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 000000000000..9a3db92adcc2
--- /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 8c9b87a3afe7..6a8ea3a623c1 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 3217/3449] 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 b48f916ac7a0..bc5a6b348665 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 3218/3449] 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 1be5345b3277..3a0070509247 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 3219/3449] 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 8da74224ae24..000000000000
--- 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 34173f0ac4b4..8404bd0717d4 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 000000000000..2319134b32e7
--- /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 000000000000..d26282accaf7
--- /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 000000000000..70e4b600c972
--- /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 392912d77e4e..e6a4fad3b262 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 000000000000..91200e4e2ce3
--- /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 263134570103..819e3c0bc461 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 000000000000..a10ec4693767
--- /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 000000000000..aaf511fa27af
--- /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 000000000000..fefbef57f7e6
--- /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 582b0c394937..c303727ba6d3 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 02d8ba70baf5..fb7922a689aa 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 e737843d1675..e29d6818f013 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 000000000000..95438b96c73a
--- /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 bd4f4b58fb17..004afe7bd04f 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 000000000000..9bdb4f65c422
--- /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 000000000000..bf706f957d92
--- /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 000000000000..1e0a6e7a50a7
--- /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 000000000000..58a459031c6f
--- /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 000000000000..9c53b3d43f56
--- /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 c9d62c62b019..81e5920a0c62 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 000000000000..d7d0bf211ea5
--- /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 000000000000..eca4c14eddab
--- /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 000000000000..f42d4d6bff4b
--- /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 9fea4c0f01db..3c4c1e72e194 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 2f44fbc416b2..6beba38befd3 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 000000000000..babfcf6e3a58
--- /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 000000000000..0bb3c38312ad
--- /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 000000000000..72d3a294aa7d
--- /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 000000000000..bb100cc393fe
--- /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 5e9f1a6e473d..257417af0fe3 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 000000000000..3573bbb5251c
--- /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 000000000000..1d523f550877
--- /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 000000000000..e6673ecddbc7
--- /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 000000000000..6c76f0ea380d
--- /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 000000000000..e2144a41fb02
--- /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 2d24e2d87e36..edb7fc3efc94 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 000000000000..33a4ae2f38f0
--- /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 000000000000..4d96ad8c86fd
--- /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 000000000000..c812f485ceb0
--- /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 000000000000..a231a2454832
--- /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 000000000000..f176bb6e1df8
--- /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 000000000000..3c89603d9cb0
--- /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 1611b7b74fec..e4303bca2d30 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 000000000000..8b2357fc7e09
--- /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 000000000000..56d6a42d93d3
--- /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 000000000000..b118d276dd2c
--- /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 000000000000..e8f2bb5d8b33
--- /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 000000000000..85d60abf7469
--- /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 000000000000..54d02e035bcc
--- /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 000000000000..d4c3ff3a1c4f
--- /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 000000000000..699e5a1458f0
--- /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 000000000000..37a7e979058b
--- /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 a64a62078ecc..c9845af97646 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 e05713da15b7..93864948f116 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 1b8378d5d55f..4143957416a4 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 000000000000..17cc9bc020ab
--- /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 000000000000..69201b7044bf
--- /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 12da2cbacb9f..90dcbbc83f87 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 000000000000..7aa65c3b84b4
--- /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 000000000000..958c899bbe9e
--- /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 0eadf54320a8..6f0aa151c15d 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 feacb1264af7..c0b325123cf4 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 5badc04f2015..4d76399a9119 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 f6a78c85da92..000000000000
--- 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 642e26e278ae..000000000000
--- 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 59fdbdc85d05..000000000000
--- 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 0a0631caf447..000000000000
--- 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 e7c2d780f4e9..000000000000
--- 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 07324035052d..000000000000
--- 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 b956d3ece216..000000000000
--- 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 267dbd8e6dec..000000000000
--- 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 395b3d53934b..000000000000
--- 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 000000000000..cf1d4ac077cd
--- /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 469c8439246f..5fffe95309ea 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 000000000000..6f77708ade53
--- /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 000000000000..6580fc6760b8
--- /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 000000000000..113a920348e9
--- /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 000000000000..7f41d0ac2768
--- /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 000000000000..f99372a37ec1
--- /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 000000000000..61e6703dea40
--- /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 000000000000..f2cab2b59fbd
--- /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 000000000000..0b8d97def2fe
--- /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 000000000000..a9a4a2d5852a
--- /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 000000000000..65b7465873f1
--- /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 275dd3577ddc..bf39f4b3c3bf 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 000000000000..daf966dadabd
--- /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 000000000000..7f0a2fe11395
--- /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 000000000000..636f4cea7c78
--- /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 000000000000..cfd8dba13fb8
--- /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 000000000000..6d6981c85862
--- /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 000000000000..a81494bc88fb
--- /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 000000000000..99cc86ea6fa9
--- /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 000000000000..fe3bdb8649ef
--- /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 000000000000..47d253b16be2
--- /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 000000000000..2c2865b8bde4
--- /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 000000000000..6c780e5a5418
--- /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 000000000000..fb9f5d7d5642
--- /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 b86c42054072..2ae7b5e8703a 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 000000000000..a96d145b2afe
--- /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 82b31efea27d..8216bcca9f73 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 000000000000..c4be68aa80bb
--- /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 000000000000..689f83a93a6a
--- /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 085e215e0244..afb5a59fc89c 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 000000000000..ed2aa3ab4875
--- /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 910cce74f8aa..2927e6f8b383 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 cb1e293919b4..8dc37b52342c 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 fc83804f5e11..ef3c2754a047 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 97d6b0cf2c0e..d9f4a0bba06c 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 6a057bdcc101..93ecccf6fd22 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 b234da11c37c..91390088ebae 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 000000000000..47c0468617a4
--- /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 000000000000..75be29e69ce4
--- /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 000000000000..6d59de6fbe5c
--- /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 110edbb9f186..80c320dffbc8 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 e80cbc99e8cf..f14e70f3c0c5 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 7797cb4e7977..3e121514fc09 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 000000000000..d18e1f116ed8
--- /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 000000000000..8674970d0c1c
--- /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 000000000000..91325de816d2
--- /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 000000000000..a0700c190876
--- /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 000000000000..7eab70d4d8fb
--- /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 000000000000..c2b1ed9b5566
--- /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 000000000000..f03c34f53315
--- /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 1c6b1e05adfb..c073b40b14c1 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 12ec2d1f4e5c..a32dd823a7e1 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 0f7f58df4b84..2b9afcf286e0 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 dc4b14c1f60b..3711ab957e00 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 3220/3449] 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 586627c5925f..54358a06491d 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 3221/3449] 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 e0c7d0c25e20..8bee9e63bb70 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 ae696ba3d6ffbd3c5c285363dbd0b0f9db846909 Mon Sep 17 00:00:00 2001
From: pmahoney <pat@polycrystal.org>
Date: Thu, 30 Mar 2017 17:09:42 -0500
Subject: [PATCH 3222/3449] 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 c8315d0c3f5f..226180196fd7 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 3223/3449] 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 538d8d4ab837..ab40099fc2ce 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 3224/3449] 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 9cd8c28c7f07..0865044eac63 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 3225/3449] 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 000000000000..8792a07e3e9b
--- /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 8c9b87a3afe7..c41c5ebff5a2 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 3226/3449] 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 c6a220b9c52c..dfa5093bedc5 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 3227/3449] 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 01fa2a8fb637..fb2ddcca5bea 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 3228/3449] 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 69bd6702ef56..02e75788d01e 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 3229/3449] 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 b1e24884557a..9abb20a1c6a8 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 3230/3449] 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 bfb975f152a7..4d38545a44f0 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 3231/3449] 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 a386abec95bd..6cd407374db6 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 6e669c97300c..9bee8e299c02 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 3232/3449] 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 fb8e1ccab667..bc82bfd066c3 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 000000000000..d8d4c37fd886
--- /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 a487579e41c3..14a6b54c3de6 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 3233/3449] 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 d7485936941c..2e136530cd1c 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 3234/3449] 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 ef3725fb50f0..d84db5279519 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 3235/3449] 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 537e754d57aa..70234d385a60 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 000000000000..0606f8878213
--- /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 000000000000..e0722a8a7bba
--- /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 000000000000..e26f205c4f45
--- /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 000000000000..836b523f556d
--- /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 000000000000..fff81d9411f9
--- /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 000000000000..79a841314f7a
--- /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 000000000000..88ca12f7bfb7
--- /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 000000000000..5b399bfc9ee6
--- /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 000000000000..4bb11260f2ba
--- /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 000000000000..1c672aaa4be6
--- /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 000000000000..5cbef72e3dc9
--- /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 000000000000..6e19879b29d1
--- /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 000000000000..06068e36dfb3
--- /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 000000000000..8962c687d864
--- /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 000000000000..ee860285e7b4
--- /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 000000000000..896b9bba8a60
--- /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 c073b40b14c1..f4ccf19d2d9f 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 a32dd823a7e1..581ccf77d995 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 2b9afcf286e0..672dda1b096b 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 42de4fd80e1d..6e6471ca83ab 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 3236/3449] 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 8900ebc120cf..8c842dbc841e 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 3237/3449] 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 780baa018a7b..9e0de290143f 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 3238/3449] 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 8bee9e63bb70..639b23b229b6 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 3239/3449] 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 54358a06491d..e8facc96ebce 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 3240/3449] 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 fb2ddcca5bea..a4fa8f65c391 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 3241/3449] 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 dfa5093bedc5..da633753e705 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 3242/3449] 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 25dec429ff08..ea1aa6ed26cf 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 3243/3449] 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 66b88eab09bc..bd999b600133 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 3244/3449] 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 80659f19c597..7e43ab98674a 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 3245/3449] 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 7e43ab98674a..42b50d0426a9 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 3246/3449] 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 33f8fa64a0f3..603df0407eaa 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 3247/3449] 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 ab0771656b59..42a8465bf8a3 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 6e6471ca83ab..ae7f46acea84 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 3248/3449] 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 6e6471ca83ab..e403f303d126 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 3249/3449] 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 70234d385a60..67decd721fbc 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 3250/3449] 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 3031fa1cb0c1..c46640602141 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 3251/3449] 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 d4247f51b3e3..5808891d4303 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 3252/3449] 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 b78bbda5d5e7..8c4a5390f554 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 1c21b47b92c9..ea30c5b04c4d 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 613293e850be..f5675623c2c6 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 e8328252a117..356e78f027bf 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 af5e09054e29..a9bdefd03a40 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 dba0e9d82c20..08070fe0e5f1 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 7e8a3160b31f..2e17d72ea9ee 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 54f8fe0c728d..751638e02da8 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 d413475389fc..ee4dab5ad64a 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 a275ef4ca402..ca27c79fab90 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 d413475389fc..ee4dab5ad64a 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 74707ae015fd..cdb2df808041 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 3253/3449] 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 e724d00e4d39..6a5faa68ced0 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 3254/3449] 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 0de567e7a746..ce9d1ac34abf 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 3255/3449] 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 ce9d1ac34abf..adcfa656eb98 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 3256/3449] 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 5dc4294ba3bc..90b2695f0039 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 3257/3449] 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 978e16fd9988..2a4fd7f0e397 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 bc5a6b348665..b2d5308c580e 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 a3368e336e6c..58f4ab6d21df 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 67decd721fbc..334d801302c1 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 8404bd0717d4..9a59765aac87 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 2319134b32e7..2d28e1d18249 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 d26282accaf7..eac6cbd3fd26 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 70e4b600c972..c089b4251c37 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 e6a4fad3b262..ef2ab2b041b0 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 91200e4e2ce3..16f5143df4b2 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 819e3c0bc461..2035c90725e4 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 a10ec4693767..202f3b594c09 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 aaf511fa27af..43c3ced1d8cf 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 fefbef57f7e6..e762e32a4e0c 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 c303727ba6d3..6b5643220216 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 fb7922a689aa..c86ccad4d124 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 e29d6818f013..30200cdb0b10 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 95438b96c73a..482d5f18d1ca 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 004afe7bd04f..5e68159115f4 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 0606f8878213..dd1bccaf9aa6 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 9bdb4f65c422..b8948dff0a5f 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 bf706f957d92..a0058e1c0d20 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 1e0a6e7a50a7..2638663c9555 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 58a459031c6f..b1f8d9448dd9 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 9c53b3d43f56..2733d9352ba1 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 81e5920a0c62..8926f34db59b 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 d7d0bf211ea5..60db32f72458 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 eca4c14eddab..b9109b828b58 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 f42d4d6bff4b..b1db2691ecda 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 3c4c1e72e194..152b7eb5d33b 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 e0722a8a7bba..8bd039bb7af4 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 6beba38befd3..081a1a5dfb71 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 babfcf6e3a58..aff77cb559bd 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 0bb3c38312ad..e0960eb40715 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 72d3a294aa7d..220467242a9a 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 bb100cc393fe..1db65ecc513b 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 e26f205c4f45..2da3ff061805 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 836b523f556d..0eb720646749 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 257417af0fe3..d9eef7b08469 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 3573bbb5251c..66a0cf743aee 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 1d523f550877..f8e50f167bb4 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 fff81d9411f9..7471c8ba82ca 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 79a841314f7a..ebc8a989edf7 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 e6673ecddbc7..887e93660112 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 6c76f0ea380d..1458a3566c35 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 e2144a41fb02..f34904fef679 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 88ca12f7bfb7..868c3c8e1820 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 edb7fc3efc94..c253fa87c75a 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 5b399bfc9ee6..2f203e1317c4 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 33a4ae2f38f0..0dc90c2579e5 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 4d96ad8c86fd..9e70252554ed 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 c812f485ceb0..2b2f0f92f76b 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 a231a2454832..b2c2db32f764 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 f176bb6e1df8..be36d5c05c72 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 4bb11260f2ba..040f7987af0d 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 3c89603d9cb0..ac965df6e47c 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 1c672aaa4be6..13ee7781c922 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 e4303bca2d30..7b42b7c729b4 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 5cbef72e3dc9..1d18be3ea834 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 8b2357fc7e09..4c7e53dee736 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 56d6a42d93d3..270cf0d9f4a0 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 b118d276dd2c..6d89a60baca9 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 e8f2bb5d8b33..9352cd1650a1 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 85d60abf7469..116a1fba7f75 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 54d02e035bcc..3d579753893a 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 d4c3ff3a1c4f..2026fdea0ddb 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 699e5a1458f0..eb10795d0555 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 37a7e979058b..4adc20dd002a 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 c9845af97646..b1dd76536c19 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 93864948f116..f3f217d545af 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 4143957416a4..5fb808f64c3b 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 17cc9bc020ab..7bd25dda4039 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 69201b7044bf..22616f75adc1 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 90dcbbc83f87..26a7ce83f7f6 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 7aa65c3b84b4..aa2fbb70282c 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 958c899bbe9e..2c361812da60 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 6f0aa151c15d..eafcffa9b1bb 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 c0b325123cf4..2a36fa821f0f 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 4d76399a9119..a6b5574b119f 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 cf1d4ac077cd..4f8f9e02752a 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 5fffe95309ea..1eb9b549287b 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 6f77708ade53..055d9eebc232 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 6580fc6760b8..1116efadc5ac 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 113a920348e9..20d920dfad50 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 7f41d0ac2768..330c696a66ac 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 f99372a37ec1..1dfc69ea6d85 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 61e6703dea40..9aaae6501905 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 f2cab2b59fbd..8e3ea32d75b2 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 0b8d97def2fe..4432119493a6 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 a9a4a2d5852a..ac55a3bbbef9 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 65b7465873f1..b15949ad6ecc 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 bf39f4b3c3bf..9450a0431aba 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 daf966dadabd..5e824e691869 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 7f0a2fe11395..92d2c10c3bee 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 636f4cea7c78..24edc30f20b9 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 cfd8dba13fb8..83c2b5a7bc20 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 6d6981c85862..f73e6ea083b8 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 a81494bc88fb..3307536bb75c 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 6e19879b29d1..f834554de957 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 06068e36dfb3..f8a61f5b87d2 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 99cc86ea6fa9..aed7c42b6815 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 fe3bdb8649ef..fe975e9f52df 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 47d253b16be2..941924d461e9 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 2c2865b8bde4..5410889987b4 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 6c780e5a5418..1c42d0688e20 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 fb9f5d7d5642..0cf49862065e 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 2ae7b5e8703a..7f219ba6a9ac 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 8962c687d864..087be682f5d9 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 a96d145b2afe..aea88cf61efe 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 8216bcca9f73..56c2d630c4dc 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 c4be68aa80bb..19c5d84a26b7 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 689f83a93a6a..5f0f316dda4d 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 afb5a59fc89c..70ec54457352 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 ed2aa3ab4875..7e0b5231ea3b 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 2927e6f8b383..20a57e86967b 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 8dc37b52342c..ab003701039e 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 ef3c2754a047..36de0955f556 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 d9f4a0bba06c..4c8c7db0b0b4 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 93ecccf6fd22..f8f77eaee39f 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 91390088ebae..2a2a9be1b858 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 47c0468617a4..d0e61f55abfb 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 75be29e69ce4..717d9d3d3ca7 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 6d59de6fbe5c..93bfedd45bf7 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 80c320dffbc8..d666f2382a38 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 ee860285e7b4..30831df086fd 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 f14e70f3c0c5..6dbbcbe20ef8 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 3e121514fc09..4fe40ae24951 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 d18e1f116ed8..d8a429b13922 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 8674970d0c1c..c9624b2a5f26 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 91325de816d2..3e91bd9eb6cd 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 a0700c190876..ce0ae7043a74 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 7eab70d4d8fb..f433eb8cfd8f 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 c2b1ed9b5566..7917646810c0 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 896b9bba8a60..ad347623618e 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 3a0070509247..774d64a0a3ca 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 3258/3449] 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 67f0a87df659..e438008b19c2 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 39d0076f16a7..000000000000
--- 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 3259/3449] 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 70cda7502798..b32dfbc4b351 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 ee4c161d739d..5bb9d2d39ac2 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 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 3260/3449] 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 0774bbc9a624..7b36a142d15d 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 3261/3449] 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 a00aebef2969..2be39df61472 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 3262/3449] 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 9b41a06c9355..31549729cfe7 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 3263/3449] 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 01cfca0d1fdc..2afdf05546fe 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 f3da61e286ed..0e5c6a400872 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 7e05dfa585a2..ef07a65f96bc 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 2a4fd7f0e397..799fb0b5d69e 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 b2d5308c580e..4e582e0d5b06 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 58f4ab6d21df..268511815310 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 334d801302c1..275a6d405c89 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 000000000000..7135766cf954
--- /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 000000000000..251f7b33b650
--- /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 000000000000..802212e3d2f9
--- /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 000000000000..67ec24a56684
--- /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 9a59765aac87..e3a6c52bc00e 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 2d28e1d18249..102fd0d4ce56 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 eac6cbd3fd26..9cd1f486af2f 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 c089b4251c37..ad0931dec0b3 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 ef2ab2b041b0..2ae08f2ca60c 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 16f5143df4b2..e10ee3cfc35f 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 2035c90725e4..165f2e955aca 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 202f3b594c09..bbd50ab7026e 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 000000000000..7947f1f02cc9
--- /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 43c3ced1d8cf..51c9046c7644 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 000000000000..be3a8d2087e5
--- /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 e762e32a4e0c..bca3b17578ff 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 000000000000..3c68d026272d
--- /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 6b5643220216..923f68043270 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 c86ccad4d124..1e2588394ed8 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 30200cdb0b10..f5be78349d5b 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 482d5f18d1ca..73b10972a6ad 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 5e68159115f4..76f5c61314ce 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 dd1bccaf9aa6..db5cecf3c193 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 b8948dff0a5f..b00646e96e08 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 000000000000..cd4b5e3cacea
--- /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 a0058e1c0d20..c5d76714dd45 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 2638663c9555..eb13e385ee87 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 000000000000..2d211eb8d18c
--- /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 000000000000..140b0157d374
--- /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 b1f8d9448dd9..979cb5ee9b7f 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 2733d9352ba1..a2ea0c38bf53 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 8926f34db59b..c2799e37e2ef 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 60db32f72458..710799e095c0 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 b9109b828b58..cbfb425eee17 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 000000000000..d7798a6eb1f9
--- /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 b1db2691ecda..f2aab01ef5ef 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 152b7eb5d33b..f731a13e7823 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 8bd039bb7af4..35fb1fbc0731 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 081a1a5dfb71..01c01c57bb88 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 aff77cb559bd..a89a341715c9 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 e0960eb40715..463232d14191 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 220467242a9a..9c8c1cc05b2e 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 1db65ecc513b..bc45a29b4b49 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 000000000000..93de92d71f67
--- /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 000000000000..7aed84cec64e
--- /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 2da3ff061805..e2fd4222b512 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 0eb720646749..000000000000
--- 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 000000000000..76fe21bfb76c
--- /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 000000000000..ef75212c0f9a
--- /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 d9eef7b08469..6bcd357bfc47 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 66a0cf743aee..eeb4d4023e2b 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 f8e50f167bb4..303ed95f662e 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 7471c8ba82ca..6ef4a1854750 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 ebc8a989edf7..667f644b33ce 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 887e93660112..533e48b189f3 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 000000000000..d6ee6e602e7b
--- /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 000000000000..4af6c8a19f84
--- /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 1458a3566c35..4ad90aeb5ff0 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 000000000000..65681df3e2d3
--- /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 f34904fef679..e67a8e36994d 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 868c3c8e1820..059d9f1abee3 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 c253fa87c75a..5e6ee1198745 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 2f203e1317c4..9ac50b755574 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 0dc90c2579e5..2f8923206c74 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 9e70252554ed..af1f2c8b8fa6 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 2b2f0f92f76b..5fd364a58790 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 b2c2db32f764..725d2544e6b0 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 be36d5c05c72..9dccf964a263 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 040f7987af0d..a0f0ad2a035a 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 ac965df6e47c..701f98eec15a 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 13ee7781c922..c5930fe0b156 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 7b42b7c729b4..5e24696e8c76 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 1d18be3ea834..9c13409fe7d9 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 4c7e53dee736..fc1b09601de0 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 270cf0d9f4a0..9b7bced0d901 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 6d89a60baca9..e54cffb0ec4a 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 9352cd1650a1..ddf0dfab8411 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 116a1fba7f75..1ac10de31d08 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 3d579753893a..89513dd9a387 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 000000000000..3f05586200d3
--- /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 000000000000..cc30e7aafce9
--- /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 000000000000..deb018bbc8ae
--- /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 2026fdea0ddb..c5c823422fdb 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 eb10795d0555..5da87698061b 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 4adc20dd002a..0fca95c1e9fe 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 b1dd76536c19..0cc14057d518 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 f3f217d545af..6ca810098d8a 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 5fb808f64c3b..c716e9a35ea3 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 7bd25dda4039..17255e56a261 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 22616f75adc1..8dddfd65f013 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 26a7ce83f7f6..4f7f8927919e 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 aa2fbb70282c..354055aa1124 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 2c361812da60..dd7a876a28de 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 000000000000..2ea3132e6feb
--- /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 000000000000..d7d6bf5611e6
--- /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 eafcffa9b1bb..b38796148a78 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 2a36fa821f0f..7e2f33ddfa98 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 a6b5574b119f..5a5f1c8c34cd 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 4f8f9e02752a..af1cbc8f1b6b 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 1eb9b549287b..b3ec955fead2 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 055d9eebc232..e3cfd9047b67 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 1116efadc5ac..000000000000
--- 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 20d920dfad50..000000000000
--- 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 330c696a66ac..7f1f4899f04b 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 1dfc69ea6d85..07b106dde993 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 9aaae6501905..8ccb243d1af6 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 8e3ea32d75b2..65ffbf88233e 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 4432119493a6..068d0b9b1e71 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 ac55a3bbbef9..d2545b9a2694 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 b15949ad6ecc..ed49719ecf61 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 9450a0431aba..e568fd1cce8b 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 5e824e691869..e585c2bd298e 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 92d2c10c3bee..477d54f1c810 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 24edc30f20b9..a5a8e79c2ada 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 83c2b5a7bc20..607a8e54d678 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 f73e6ea083b8..5b04344c6352 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 3307536bb75c..01d1b384b265 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 f834554de957..000000000000
--- 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 f8a61f5b87d2..4d42a9a49b65 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 aed7c42b6815..000000000000
--- 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 fe975e9f52df..000000000000
--- 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 941924d461e9..000000000000
--- 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 5410889987b4..5d6e7a34a35c 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 1c42d0688e20..4d79313d9836 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 0cf49862065e..32c10118f3ca 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 7f219ba6a9ac..b6ef82f95201 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 087be682f5d9..51ff8bdb022c 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 aea88cf61efe..1eb40822b9cd 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 56c2d630c4dc..290850ced7d8 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 19c5d84a26b7..963133feb8d1 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 5f0f316dda4d..1a610eaacbed 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 70ec54457352..b6f1d8ec9661 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 000000000000..c514fd815768
--- /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 7e0b5231ea3b..879d2c3e815e 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 20a57e86967b..529f989c5b05 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 ab003701039e..6f8cf8c2a2a9 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 36de0955f556..e9c8ba354e70 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 4c8c7db0b0b4..d1ccd2ea2c70 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 f8f77eaee39f..3aeb11fdf9db 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 2a2a9be1b858..80ca1d6ea9bd 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 d0e61f55abfb..18cfe65db37f 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 717d9d3d3ca7..964745528282 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 93bfedd45bf7..4f9851247ebb 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 d666f2382a38..814f4c1a6dc4 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 30831df086fd..382df53eeb01 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 6dbbcbe20ef8..a1ad7daf1792 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 4fe40ae24951..d88c0a847493 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 d8a429b13922..5563786b07e1 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 c9624b2a5f26..dce3e50c192a 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 3e91bd9eb6cd..9efaa93d2bfc 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 ce0ae7043a74..564477d84d61 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 f433eb8cfd8f..59a92bb04a20 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 7917646810c0..5d346aef40b8 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 ad347623618e..1bbf51cbda50 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 f03c34f53315..7b11b6b0b9de 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 f4ccf19d2d9f..01f734538b51 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 581ccf77d995..8522ed79c56c 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 672dda1b096b..a4b6c90aa081 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 774d64a0a3ca..a798a452365c 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 3711ab957e00..18cf6d097a21 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 3264/3449] 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 5dbc74ef5436..2d1746bde0f1 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 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 3265/3449] 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 5d002c096239..2919506e9316 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 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 3266/3449] 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 c29a5da9f21a..d0085752623d 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 3267/3449] 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 000000000000..d144b80e3385
--- /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 f30bd175daac..5d710fcad882 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 3268/3449] 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 d144b80e3385..000000000000
--- 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 5d710fcad882..f30bd175daac 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 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 3269/3449] 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 64519ce17d5b..674cf60161db 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 3270/3449] 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 df7f6903cd24..dc84ea34337e 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 3271/3449] 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 11be8a13a575..4da9fb45d332 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 c3d7637e870d..86c9974c9316 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 ae034020aa18455d86202be50bff0939aebfb18c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 1 Apr 2017 12:54:24 +0100
Subject: [PATCH 3272/3449] 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 42a8465bf8a3..93a9894ba6b8 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 3273/3449] 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 b348010c61f1..93e10fbe5664 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 ed41d50e9fe3d942cfde37e84de781c096309e5b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Mon, 20 Mar 2017 23:24:54 +0000
Subject: [PATCH 3274/3449] 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 000000000000..f6061b60667a
--- /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 5bb9d2d39ac2..d8676413e82e 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 e403f303d126..a3ba43b95c3b 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 3275/3449] 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 e07a89fc1e64..55162e54f4dc 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 3276/3449] 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 703d5ddbd0e2..ada198e0e586 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 3277/3449] 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 dd781143d862..aa4001f62dea 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 3278/3449] 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 000000000000..01c24838f616
--- /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 a3ba43b95c3b..853d37d3c9ff 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 3279/3449] 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 ac23635441d4..3be1d194d82b 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 3280/3449] 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 01c24838f616..d8e6cdd86ea9 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 3281/3449] 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 c65836c1ae0f..547cc289c3cd 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 3282/3449] 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 0b2528e9a779..a2896cd7a135 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 3283/3449] 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 d9f87a8d8940..a4ec2324b8b3 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 3284/3449] 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 a4ec2324b8b3..493626765843 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 3285/3449] 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 493626765843..fb56bdf86793 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 3286/3449] 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 fb56bdf86793..f312f4770b54 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 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 3287/3449] 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 394b2f9da094..9af3431b8c60 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 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 3288/3449] 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 200d900e3828..7cf38aa43fcf 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 000000000000..b6d0739c6bf1
--- /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 d304019953ae..fbc3d1c36f91 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 3289/3449] 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 d17af6f5188b..023343f59cbe 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 3290/3449] 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 c6490cf67df5..ddbe7104f1d9 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 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 3291/3449] 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 000000000000..e6f6622f85ac
--- /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 45431fc8fdcc..f21f6a153306 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 3292/3449] 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 2ab0977004c4..5601a8854ef1 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 f21f6a153306..5cf7986ca015 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 3293/3449] 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 7616a75b0214..db58a2f5c857 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 3294/3449] 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 f02c6138df77..48181040a757 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 3d53b36bc3fa088e59716c51d9cf0891efb0a017 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Sat, 1 Apr 2017 20:58:13 -0500
Subject: [PATCH 3295/3449] 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 65fb927d48ea..81f9ddd96d29 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 3296/3449] 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 91180b33cde9..49856552aa3b 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 3297/3449] 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 f61f9fe6d2af..3b10c3305efc 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 3298/3449] 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 fc0374985cd7..39f3a12b90aa 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 3299/3449] 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 540c83e0a39b..4b95f3e72880 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 3300/3449] 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 b3dd9f91ec89..191ec84f87bf 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 56930418caca..000000000000
--- 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 3301/3449] 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 3d557c4c023b..dfcba9045a75 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 3302/3449] 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 49e71614bf93..32dfc11250ba 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 4aeace9f0c22..f99de7c7eac4 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 3303/3449] 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 32dfc11250ba..298c57eac15b 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 f99de7c7eac4..2bfa3d596214 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 3304/3449] 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 298c57eac15b..5455798b5494 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 2bfa3d596214..ce5a3c1b1d2c 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 3305/3449] 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 5455798b5494..bb805e6add03 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 c7a4ff20a73d..99c9ffa14c2d 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 ce5a3c1b1d2c..04622d6e2d03 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 3306/3449] 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 cf7f6b82ce2a..2a9ea0715e03 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 3307/3449] maintainers: add dsferruzza

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 087c2463957f..4e62799373a6 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 3308/3449] 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 000000000000..8e817b5a815b
--- /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 9484dc06bc1e..92ebdb0194bf 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 3309/3449] 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 8e817b5a815b..a3fa8924df74 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 3310/3449] 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 30fedec1a4bb..c4cb25dfe987 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 3311/3449] 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 bb805e6add03..2ba0055c735b 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 04622d6e2d03..38574bf681fe 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 3312/3449] 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 2ba0055c735b..a4de1ecda438 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 38574bf681fe..ee85de75b40c 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 3313/3449] 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 9dca8f983a4b..3d5676033593 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 3314/3449] 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 a8d35680dbde..61b0357bb9d0 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 3315/3449] 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 4a9c2b60006b..170e2385d4af 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 3316/3449] 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 ae6ce3dd2c30..04d475f36f07 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 929bf7dbcb2f..000000000000
--- 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 324e2d35cfd2..9dca8e7e26cd 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 8a96fade045f..840cfb3c4fb4 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 3317/3449] 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 1d8412a25f36..053cdd059916 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 3318/3449] 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 64f4b9008b1e..37078d39fe6a 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 000000000000..28de2f01d073
--- /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 3319/3449] 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 588d0b8dadca..f2f062785b69 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 3320/3449] 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 2e51492f142e..a28936fee491 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 5b255bd2d2b0..1d56d58c68d3 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 3321/3449] 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 aa92e66d98fb..b9548a5bff52 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 3322/3449] 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 aa4b83c59b59..3b1837d16f1b 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 3323/3449] 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 84c23bed3e3b..e9897cc01b6a 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 f0699ad9832b..c75e637124a9 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 61def24efd88..e3a3b6f88cf2 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 3324/3449] 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 04cf17c1b0b4..d5e00129a82c 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 ec02f73cada2..a5a88a99be8f 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 3325/3449] 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 59ecaf8d5a6d..d78775c27582 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 3326/3449] 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 000000000000..e01956e36119
--- /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 840cfb3c4fb4..af43369ea563 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 3327/3449] 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 11a9808392aa..c0e065b3b555 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 af43369ea563..1fb20dab34d7 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 3328/3449] 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 64f4b9008b1e..b4053c7a956c 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 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 3329/3449] 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 2fd45ec7fc02..e75223c6c363 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 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 3330/3449] 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 7f927b586705..000000000000
--- 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 3331/3449] 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 e639eb5aefb2..fb526ec05ba4 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 000000000000..738eceb20a0e
--- /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 1fb20dab34d7..6ae96cf5f149 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 3332/3449] 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 74548fcfb8cd..5cf55535db1b 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 3333/3449] 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 a9f8c32dde9b..2009daa1cc86 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 4a2384ca3da0..000000000000
--- 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 1fb20dab34d7..fe3cc43f2087 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 3334/3449] 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 8872d7c676ef..b12eda6f150d 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 3335/3449] 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 fb526ec05ba4..776b87c80f7a 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 000000000000..0f0e0984a873
--- /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 000000000000..cdeed56f496d
--- /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 43368d834724..e6b4b7ee6f3c 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 3336/3449] 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 bbaad516ebe0..ccb20e9f1bd0 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 969ed8832c9897d57d7d1678efeea04beb20d1c6 Mon Sep 17 00:00:00 2001
From: ndowens <ndowens04@gmail.com>
Date: Mon, 3 Apr 2017 04:43:08 -0500
Subject: [PATCH 3337/3449] 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 09bef975c85b..b6c10dbebcad 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 3338/3449] 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 8242990fe745..694556123ab3 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 3339/3449] 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 000000000000..3b5be589f331
--- /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 000000000000..e59b9f239a68
--- /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 e6b4b7ee6f3c..1f1287a35767 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 3340/3449] 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 a20fa2fe7371..4adcaf2b9da1 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 3341/3449] 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 4606fc922a62..f56b1df61841 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 3342/3449] 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 6ca18ed46686..fea4e7c9160b 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 3343/3449] 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 aed907b2dcde..134e6998670c 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 3344/3449] 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 4b30a38f832f..f1101d7ea66e 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 3345/3449] 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 1b57a94a05d4..9096a5868f6c 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 3346/3449] 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 4d3cc26365fc..93c5f2df725a 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 3347/3449] 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 93c5f2df725a..affb46c2ca03 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 54433e205973..4cf48e1e2cb5 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 3348/3449] 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 affb46c2ca03..1cf5cb6e0396 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 4cf48e1e2cb5..0174fe544e35 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 3349/3449] 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 1eeb5dc31517..1f9e82f866ee 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 3350/3449] 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 8e41d3421173..83d6532774e3 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 1cf5cb6e0396..d44b583447a3 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 f9d60d6600dc..a42e5d9109b6 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 3351/3449] 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 02004061b83a..911680b1eb8d 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 3352/3449] 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 ff256fb73c84..0c1c51d6f47a 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 3353/3449] 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 67d86571b885..d64b5be816aa 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 1f1287a35767..50aa1b0e8afb 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 3354/3449] 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 e552ac9777f2..138ee397d3fd 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 3355/3449] 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 1e397b0f1761..ac43d7dc31a2 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 3356/3449] 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 ac43d7dc31a2..24ced8da531a 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 34a50dcab16f..cba77d3edd1d 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 3357/3449] 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 d592a23c303f..745518f85972 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 3358/3449] 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 c8ce86b818bc..ac7dcea31b13 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 75319eb2035e7c9ec0a8f45ab816dd34689fd77a Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Mon, 3 Apr 2017 11:04:04 +0200
Subject: [PATCH 3359/3449] 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 0f0e0984a873..669e46c6a842 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 3360/3449] 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 98be02da3b26..6818a7271558 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 f1b82210aec2..f8326ed325cc 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 51db26b78236..c60d6e3728d0 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 50aa1b0e8afb..19a0c5cef0f4 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 3361/3449] 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 6818a7271558..906328eb458f 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 f8326ed325cc..b67c102628a4 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 19a0c5cef0f4..00fa8b5dbc03 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 3362/3449] 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 906328eb458f..52cae9bb64e6 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 b67c102628a4..f6ecb7c8e285 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 00fa8b5dbc03..272c31641f5d 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 3363/3449] 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 52cae9bb64e6..a552b2719bb2 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 3364/3449] 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 639b23b229b6..28c573e6d231 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 3365/3449] 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 41a0bea1cddb..cc566e712c29 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 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 3366/3449] 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 61e884366aa2..4a2db8227f4e 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 3367/3449] 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 d26eb8f45aea..c49f11a72a9e 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 3368/3449] 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 24ced8da531a..ac43d7dc31a2 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 cba77d3edd1d..34a50dcab16f 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 3369/3449] 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 fea4e7c9160b..1bebf222ac5e 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 3370/3449] 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 b23da5451d1c..185d54b420bb 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 3371/3449] 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 ac43d7dc31a2..24ced8da531a 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 34a50dcab16f..cba77d3edd1d 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 3372/3449] 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 80e481d79b9e..3e47710361a8 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 cba77d3edd1d..349fd3adfc96 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 3373/3449] 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 44f922906e89..4f396e26bf94 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 536e62f777e2..73126ce1f5c1 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 3374/3449] 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 8d9d53480630..7e59408a5b0b 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 f30906b84a24..720891d518a7 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 3375/3449] 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 f7a0ff473cc1..15db270e80c5 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 3376/3449] 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 91460eb4019c..fb9efff32243 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 3377/3449] 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 fb9efff32243..2e0b75ce56fe 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 3378/3449] 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 e709108e9d86..509f6449e02b 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 3379/3449] 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 03a905ea3d11..6be7ae16572a 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 ee6e59c65ef3..18ebe5c8e1ad 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 4c2fb69ec806..111852ab34b9 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 27fed51e6fc8..10e1410ff598 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 3380/3449] 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 10e1410ff598..4ef1aa562118 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 3381/3449] 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 76385312385b..0202541da400 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 3382/3449] 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 c4cc68dcca38..da700fe9f227 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 3383/3449] 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 bff6739db616..32e18ff0052d 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 3384/3449] 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 3ea108808f50..df47c1a477b9 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 3385/3449] 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 97929d29b377..163357a0c0f8 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 3386/3449] 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 98c1308e4dbf..4850d93716de 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 cac37bce280f..fd470143a3c5 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 3387/3449] 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 d2240984d9f6..c596ea63f4d3 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 3388/3449] 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 591994ddccf6..6a4f31e5e19f 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 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 3389/3449] 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 8a5d54952606..647f30f98280 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 182f9b196ff4..e83ef1781b89 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 3390/3449] 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 8be5ee3c775a..93ff39bde64f 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 3391/3449] 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 f4e0faffb0e1..e3c9cbf2e69f 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 3392/3449] 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 2bbac699a3e3..4a42c55c2493 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 3393/3449] 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 32e18ff0052d..f798862513cb 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 3394/3449] 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 a07fc04b02ea..eb26811cfb81 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 3395/3449] 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 000000000000..25564a0a3009
--- /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 232f13318651..cf2b676a5d4f 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 3396/3449] 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 000000000000..9362729af447
--- /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 5bb2b28d0019..22a3f56a6d46 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 3397/3449] 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 000000000000..83bd81456c07
--- /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 1fb20dab34d7..665e78c004c5 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 3398/3449] 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 b8667997b16e..0fafb7fe3172 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 f83222222637..6760a85952b3 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 3399/3449] 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 3520c6d3f7da..e0eef9ed96f6 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 3400/3449] 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 023343f59cbe..076a78bd5b6e 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 3401/3449] 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 647f30f98280..6b61dbf75187 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 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 3402/3449] 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 000000000000..46b790afd30a
--- /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 6b9631bfccfe..ff311b9fae2f 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 3403/3449] 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 79077b477b44..64899e555c7d 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 3404/3449] 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 4850d7d9f5f5..c3c0de149668 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 3405/3449] 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 b1f581dc8417..3d089c1cec19 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 3406/3449] 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 6b61dbf75187..c808ca616b18 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 3407/3449] 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 c808ca616b18..2dcc7e9a53dd 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 3408/3449] 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 943707c0c5ee..15feb30743b2 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 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 3409/3449] 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 017f2ea7637a..f03fc73387f3 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 3410/3449] 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 64899e555c7d..f392945b36dd 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 3411/3449] 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 72786247af41..230ace078234 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 3412/3449] 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 bc9e35f88c4b..b916207e01fd 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 3413/3449] 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 11132710a905..bcfa082fb57e 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 3414/3449] 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 b916207e01fd..c58b66d42f27 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 3415/3449] 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 000000000000..6b92db9efa55
--- /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 67ca563cdacd..24745919f54b 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 3416/3449] 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 f005decfa33c..6d30fd3f4d67 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 000000000000..9a51b9cd6602
--- /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 3417/3449] 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 36d81ae9c441..6238cf9c9754 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 3418/3449] 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 8978b73749b7..6e867b674398 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 3419/3449] 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 2c763072c294..b0d02cb8233a 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 3420/3449] 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 50b127fa9dc2..bc293a881079 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 bb833702aacde5207eebb3d077a51cbb3304256b Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Wed, 5 Apr 2017 01:39:03 +0000
Subject: [PATCH 3421/3449] 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 000000000000..80cf7dd28c5d
--- /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 36ef85aeb124..c6ac89734047 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 3422/3449] 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 185d54b420bb..b23da5451d1c 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 3423/3449] 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 0fafb7fe3172..6f3feddfda0b 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 67ca563cdacd..6ed920fd6c83 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 3424/3449] 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 94cc2929c1ee..d41aa432cf35 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 10ee8272f380..f44927beb98e 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 000000000000..22b49a5a2ffe
--- /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 3425/3449] 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 f44927beb98e..950ce210c063 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 3426/3449] 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 1f5d97941ce5..d39e1bacd71d 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 3427/3449] 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 82be9bc1d727..f78a77efbf06 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 3428/3449] 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 77066cfc8e15..fbb21a8b7c65 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 000000000000..534d6c1d6ef7
--- /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 3429/3449] 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 868540fcbc3b..2947515652e2 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 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 3430/3449] 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 9f30eb611466..3951d617f6f1 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 3431/3449] 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 642cbbd23f62..6073008d541d 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 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 3432/3449] 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 776b87c80f7a..edfdc6e5c3f5 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 11132710a905..b69358c2c75a 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 000000000000..148f5a4538f5
--- /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 f83222222637..4cf2e215dc10 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 3433/3449] 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 b374c9829318..f8c8a59f6f61 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 3434/3449] 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 7da47e339d08..5a9cf8f1f4b1 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 3435/3449] 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 776b87c80f7a..d1d47062caa0 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 000000000000..6f9e4579a147
--- /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 c9a492a5c596..e55a22a05797 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 3436/3449] 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 2e136530cd1c..97add524d176 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 43349cc7f8a2..9f5a2b806891 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 799fb0b5d69e..4599c630d83c 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 4e582e0d5b06..7ac8c70d59f8 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 268511815310..520e224e6da2 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 000000000000..cdcfde8eb332
--- /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 7135766cf954..000000000000
--- 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 251f7b33b650..000000000000
--- 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 802212e3d2f9..000000000000
--- 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 67ec24a56684..e04b3032091e 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 e3a6c52bc00e..d72835e88c64 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 102fd0d4ce56..fde774a9b24d 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 9cd1f486af2f..0f51b69e2000 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 ad0931dec0b3..4ad9f00b1507 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 2ae08f2ca60c..a88e60824d1a 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 e10ee3cfc35f..352538cd353c 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 165f2e955aca..adcf9fa5a720 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 bbd50ab7026e..e5d895adb635 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 7947f1f02cc9..000000000000
--- 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 51c9046c7644..fdb2ab5b869c 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 be3a8d2087e5..000000000000
--- 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 bca3b17578ff..000000000000
--- 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 3c68d026272d..000000000000
--- 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 923f68043270..81f3dfad8aad 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 1e2588394ed8..0a1d054b05ee 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 f5be78349d5b..6f38719781eb 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 73b10972a6ad..ff69c56e8a6e 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 76f5c61314ce..9b19aa516787 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 db5cecf3c193..2988906735af 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 b00646e96e08..bdf0dbdf48a4 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 cd4b5e3cacea..dae0666a7270 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 c5d76714dd45..2530203e3b71 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 eb13e385ee87..ea9c89dffb71 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 2d211eb8d18c..ccc138a9b5e8 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 140b0157d374..dbd056059f75 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 979cb5ee9b7f..b72be6f88bf9 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 a2ea0c38bf53..e484e1d991a6 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 c2799e37e2ef..0ca5f7149f22 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 710799e095c0..237fbfaea385 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 cbfb425eee17..4d2b56ac7759 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 d7798a6eb1f9..781ae6c1d33a 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 f2aab01ef5ef..7b4c40632a5b 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 f731a13e7823..2063f2f4be38 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 35fb1fbc0731..9d3d779ab486 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 01c01c57bb88..576edbfdbf23 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 a89a341715c9..7babd1a459fb 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 463232d14191..f782c99a68a2 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 9c8c1cc05b2e..6c465f14858f 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 bc45a29b4b49..cca51585e5d7 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 93de92d71f67..282b05fefd89 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 7aed84cec64e..f54fc00950ae 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 e2fd4222b512..38f57fc61b14 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 76fe21bfb76c..66b42fec1757 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 ef75212c0f9a..8e687ce64a85 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 000000000000..3872bfd5f93b
--- /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 6bcd357bfc47..ecf4a5de399d 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 eeb4d4023e2b..3a933d2b11d7 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 303ed95f662e..cad670acab10 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 6ef4a1854750..0098abf59d3c 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 667f644b33ce..ba16a64a9f65 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 533e48b189f3..abdfc65ec1fb 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 d6ee6e602e7b..32c1a0c0cccc 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 4af6c8a19f84..34c5a2e66284 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 4ad90aeb5ff0..bccba7ca8eaa 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 65681df3e2d3..c0d004c4009b 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 e67a8e36994d..d514c1f26a4d 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 059d9f1abee3..4c0b0c5c762c 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 5e6ee1198745..099c63daf286 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 9ac50b755574..e2e2c956e7d5 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 2f8923206c74..ca1303e9d1d9 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 af1f2c8b8fa6..b9d894e3f476 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 5fd364a58790..2d0d3b3d0bc7 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 725d2544e6b0..432da3069d29 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 9dccf964a263..4e7579dba88b 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 a0f0ad2a035a..f5dba03d08e8 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 701f98eec15a..e8af9d041e08 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 c5930fe0b156..bf1b1a5e00c8 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 5e24696e8c76..e9e1acfcefc0 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 9c13409fe7d9..62010efd0472 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 fc1b09601de0..3f8886915a02 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 9b7bced0d901..041cc5b84815 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 e54cffb0ec4a..15dd75fbfa6a 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 ddf0dfab8411..4a872802ecb5 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 1ac10de31d08..9674eca3d1a0 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 89513dd9a387..3c17f72b42a4 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 3f05586200d3..4ba68b6c545c 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 cc30e7aafce9..0d0c3f153ef9 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 deb018bbc8ae..f4c38e485f9a 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 c5c823422fdb..95672b7296f7 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 5da87698061b..608cd6b38961 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 0fca95c1e9fe..43f6343b7ebe 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 0cc14057d518..82695e74bfe7 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 6ca810098d8a..60db24e57d04 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 c716e9a35ea3..aa7963f32438 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 17255e56a261..1f83d5629674 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 8dddfd65f013..52cbc8ddcdb8 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 4f7f8927919e..2348167ba657 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 354055aa1124..e12f3efb59ac 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 dd7a876a28de..ed38c44b0c11 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 2ea3132e6feb..c37de8f6f8dd 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 d7d6bf5611e6..0649edb6fd34 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 b38796148a78..e77e977ea3f5 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 7e2f33ddfa98..ea7dd30df0b9 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 5a5f1c8c34cd..55dd6b2a3731 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 af1cbc8f1b6b..de5528bca5e6 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 b3ec955fead2..446b54a455a6 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 e3cfd9047b67..905a14b785c7 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 000000000000..ba24d7dd78c3
--- /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 000000000000..9b60f52c87f7
--- /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 7f1f4899f04b..ceed43659662 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 07b106dde993..c01500f0c3da 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 8ccb243d1af6..9d4aa874d4cc 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 65ffbf88233e..e2e7e71aadda 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 068d0b9b1e71..473581c31841 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 d2545b9a2694..ad159edc5c9d 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 ed49719ecf61..cb5041b6029f 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 e568fd1cce8b..a24e9d99a2c5 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 e585c2bd298e..708fa41ca51a 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 477d54f1c810..186550a15df0 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 a5a8e79c2ada..c952ab5a1f7e 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 607a8e54d678..c5300698e540 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 5b04344c6352..48bd3b7e542c 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 01d1b384b265..56ae3473e2ce 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 4d42a9a49b65..dae0d011e752 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 5d6e7a34a35c..17795e3a92a1 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 4d79313d9836..9e4e2effbd32 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 32c10118f3ca..cf6fd03ba12e 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 b6ef82f95201..fe48a580ee9b 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 51ff8bdb022c..2a1219e48e71 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 1eb40822b9cd..1c351669c9a9 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 290850ced7d8..572cd29c75bb 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 963133feb8d1..38e9e4ecabd5 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 1a610eaacbed..597f8fcfe3ad 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 b6f1d8ec9661..2712a1b8e1d4 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 c514fd815768..1d2f8fd01228 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 879d2c3e815e..1a7056e3fa2d 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 529f989c5b05..aaef5095dbba 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 6f8cf8c2a2a9..8ae38c456865 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 e9c8ba354e70..e28637849af1 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 d1ccd2ea2c70..7b44cb903376 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 3aeb11fdf9db..3c439aae2e4e 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 80ca1d6ea9bd..120f384a7a50 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 18cfe65db37f..d091ad3250fd 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 964745528282..e9d090a84aa1 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 4f9851247ebb..064e67fef50f 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 814f4c1a6dc4..d7a8721f2986 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 382df53eeb01..f3528d605246 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 a1ad7daf1792..3b340be7c1d5 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 d88c0a847493..5b6a7fafd015 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 5563786b07e1..ca9680ebd00e 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 dce3e50c192a..a225b323f36f 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 9efaa93d2bfc..3744526b25ae 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 564477d84d61..11fa1931f0b9 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 59a92bb04a20..da2611d1f39f 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 5d346aef40b8..32c7198b99f8 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 1bbf51cbda50..06fc8502d6ce 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 7b11b6b0b9de..a710d25ab5cd 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 01f734538b51..6228f9c5fec0 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 8522ed79c56c..3d15319ad06f 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 a4b6c90aa081..118045015e2d 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 a798a452365c..3b71ade03f7c 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 2cbe73c89ca3..95b60df0d017 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 3437/3449] 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 f04d0c89da35..442edc04fa27 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 3438/3449] 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 8cd1a04e977d..0c77857e66b6 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 3439/3449] 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 856da9f742e4..7dae614a8f78 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 3440/3449] 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 0c22cc9ff9fd..8cc06f9269eb 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 3441/3449] 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 a8f7d00b6b62..1f8e559b4152 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 3442/3449] 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 dae1139d9615..b26fc7faf9d7 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 f881c76c3ad9..9642b6136770 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 8335e54a02e9..26187bf7e552 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 3443/3449] 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 3d089c1cec19..f3a5a27bd366 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 3444/3449] 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 c46640602141..bdd8bd441678 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 3445/3449] 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 921802166718..111d41256840 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 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 3446/3449] 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 bdd8bd441678..a2854208a493 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 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 3447/3449] 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 000000000000..a9b9b85acab2
--- /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 c6fac16a76ca..b4e588f6b143 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 3448/3449] 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 5f5dcfb71e6a..1ba823540334 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 3449/3449] 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 a2854208a493..b6734d09d0e7 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
     '';